From 2357ab721d452785eff1d8253ce3d4995a38a1ff Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sun, 9 Aug 2015 20:20:48 +0200
Subject: [PATCH 001/353] Move auth/headers/DB/config in middleware

---
 Slim/Extras/Middleware/FeatherBB.php | 430 ++++++++++++++++++++++++++-
 include/common.php                   | 191 ------------
 index.php                            |  24 +-
 3 files changed, 424 insertions(+), 221 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 2ebb1aaf..a884ae65 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -1,36 +1,116 @@
 <?php
 /**
- * FeatherBB
  *
- *
- * USAGE
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  *
  * $app = new \Slim\Slim();
- * $app->add(new \Slim\Extras\Middleware\FeatherBB());
+ * $app->add(new \Slim\Extras\Middleware\FeatherBB($params));
  *
  */
+
 namespace Slim\Extras\Middleware;
 
 class FeatherBB extends \Slim\Middleware
 {
-	protected $settings = array();
+    protected $data = array();
 
-	public function __construct()
+	public function __construct(array $user_forum_settings = array())
 	{
+        $this->data['forum_env'] = array(
+                                    'FEATHER' => true,
+                                    'FEATHER_ROOT' => dirname(__FILE__).'/../../../',
+                                    'FORUM_VERSION' => '1.0.0',
+                                    'FORUM_NAME' => 'FeatherBB',
+                                    'FORUM_DB_REVISION' => 21,
+                                    'FORUM_SI_REVISION' => 2,
+                                    'FORUM_PARSER_REVISION' => 2,
+                                    'FORUM_CACHE_DIR' => dirname(__FILE__).'/../../../cache/', // TODO : Move in user settings
+                                    'FEATHER_UNVERIFIED' => 0,
+                                    'FEATHER_ADMIN' => 1,
+                                    'FEATHER_MOD' => 2,
+                                    'FEATHER_GUEST' => 3,
+                                    'FEATHER_MEMBER' => 4,
+                                    'FEATHER_MAX_POSTSIZE' => 32768,
+                                    'FEATHER_SEARCH_MIN_WORD' => 3,
+                                    'FEATHER_SEARCH_MAX_WORD' => 20,
+                                    'FORUM_MAX_COOKIE_SIZE' => 4048
+                                    );
 
+        $this->data['forum_settings'] = array_merge(self::load_default_settings(), $this->load_forum_config(), $user_forum_settings);
 	}
 
-    public function call() 
+    public function load_forum_config()
     {
-        $feather = $this->app;
+        global $feather_config; // Legacy
 
-       	// Block prefetch requests
-        $this->app->hook('slim.before', function () use ($feather) {
-        	if ((isset($feather->environment['HTTP_X_MOZ'])) && ($feather->environment['HTTP_X_MOZ'] == 'prefetch')) {
-                $feather->halt(403, 'Prefetch forbidden');
-        	}
-        });
+        if (file_exists($this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php')) {
+            include $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php';
+        } else {
+            require_once $this->data['forum_env']['FEATHER_ROOT'].'include/cache.php';
+            generate_config_cache();
+            require $this->data['forum_env']['FEATHER_ROOT'].'cache_config.php';
+        }
+        return $feather_config;
+    }
+
+    public static function load_default_settings()
+    {
+        return array(
+                // Database
+                'db_type' => 'mysqli',
+                'db_host' => '',
+                'db_name' => '',
+                'db_user' => '',
+                'db_pass' => '',
+                'db_prefix' => '',
+                // Cookies
+                'cookie_name' => 'feather_cookie',
+                'cookie_seed' => 'changeme', // MUST BE CHANGED
+                );
+    }
+
+    // Getters / setters for Slim container (avoid magic get error)
+
+    public function set_forum_env($key, $value = null)
+    {
+        $tmp = (!is_array($key) && !is_null($value)) ? array($key, $value) : $key;
+        foreach ($tmp as $key => $value) {
+            $this->app->container->get('forum_env')[$key] = $value;
+        }
+
+    }
+
+    public function set_forum_settings($key, $value = null)
+    {
+        $tmp = (!is_array($key) && !is_null($value)) ? array($key, $value) : $key;
+        foreach ($tmp as $key => $value) {
+            $this->app->container->get('forum_settings')[$key] = $value;
+        }
+
+    }
+
+    public function hydrate($data)
+    {
+        foreach ($data as $key => $value) {
+            $this->app->container[$key] = $value;
+        }
+    }
+
+    // Legacy function, to ensure constants backward compatibility
+    public function env_to_globals(array $vars)
+    {
+        foreach ($vars as $key => $value) {
+            define($key, $value);
+        }
+    }
+
+    //
 
+    public function set_headers()
+    {
         // No cache headers
         $this->app->response->headers->set('Cache-Control', 'no-cache, no-store, must-revalidate');
         $this->app->response->headers->set('Pragma', 'no-cache');
@@ -41,9 +121,327 @@ public function call()
         // Prevent the site to be embedded in iFrame
         $this->app->response->headers->set('X-Frame-Options', 'deny');
         // Yeah !
-        $this->app->response->headers->set('X-Powered-By', 'FeatherBB');
+        $this->app->response->headers->set('X-Powered-By', $this->app->forum_env['FORUM_NAME']);
+    }
+
+    public function init_db()
+    {
+        // Include IdiORM
+        require_once $this->data['forum_env']['FEATHER_ROOT'].'include/idiorm.php';
+
+        // TODO: handle drivers
+        \ORM::configure('mysql:host='.$this->data['forum_settings']['db_host'].';dbname='.$this->data['forum_settings']['db_name']);
+        \ORM::configure('username', $this->app->forum_settings['db_user']);
+        \ORM::configure('password', $this->app->forum_settings['db_pass']);
+        \ORM::configure('logging', true);
+        \ORM::configure('driver_options', array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+        \ORM::configure('id_column_overrides', array(
+            $this->app->forum_settings['db_prefix'].'groups' => 'g_id',
+        ));
+    }
+
+    public function authenticate()
+    {
+        $now = time();
+
+        // Get FeatherBB cookie
+        $cookie_raw = $this->app->getCookie($this->data['forum_settings']['cookie_name']);
+
+        // Check if cookie exists and is valid (getCookie method returns false if the data has been tampered locally so it can't decrypt the cookie);
+        if (isset($cookie_raw)) {
+            $cookie = json_decode($cookie_raw, true);
+            $checksum = hash_hmac('sha1', $cookie['user_id'].$cookie['expires'], $this->data['forum_settings']['cookie_seed'].'_checksum');
+
+            // If cookie has a non-guest user, hasn't expired and is legit
+            if ($cookie['user_id'] > 1 && $cookie['expires'] > $now && $checksum == $cookie['checksum']) {
+
+                // Get user info from db
+                $select_check_cookie = array('u.*', 'g.*', 'o.logged', 'o.idle');
+                $where_check_cookie = array('u.id' => intval($cookie['user_id']));
+
+                $result = \ORM::for_table($this->data['forum_settings']['db_prefix'].'users')
+                    ->table_alias('u')
+                    ->select_many($select_check_cookie)
+                    ->inner_join($this->data['forum_settings']['db_prefix'].'groups', array('u.group_id', '=', 'g.g_id'), 'g')
+                    ->left_outer_join($this->data['forum_settings']['db_prefix'].'online', array('o.user_id', '=', 'u.id'), 'o')
+                    ->where($where_check_cookie)
+                    ->find_result_set();
+
+                foreach ($result as $this->app->user);
+
+                // Another security check, to prevent identity fraud by changing the user id in the cookie) (might be useless considering the strength of encryption)
+                if (isset($this->app->user->id) && hash_hmac('sha1', $this->app->user->password, $this->data['forum_settings']['cookie_seed'].'_password_hash') === $cookie['password_hash']) {
+                    $expires = ($cookie['expires'] > $now + $this->data['forum_settings']['o_timeout_visit']) ? $now + 1209600 : $now + $this->data['forum_settings']['o_timeout_visit'];
+                    $this->app->user->is_guest = false;
+                    $this->app->user->is_admmod = $this->app->user->g_id == FEATHER_ADMIN || $this->app->g_moderator == '1';
+                    if (!$this->app->user->disp_topics) {
+                        $this->app->user->disp_topics = $this->data['forum_settings']['o_disp_topics_default'];
+                    }
+                    if (!$this->app->user->disp_posts) {
+                        $this->app->user->disp_posts = $this->data['forum_settings']['o_disp_posts_default'];
+                    }
+                    if (!file_exists($this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language)) {
+                        $this->app->user->language = $this->data['forum_settings']['o_default_lang'];
+                    }
+                    if (!file_exists($this->data['forum_env']['FEATHER_ROOT'].'style/'.$this->app->user->style.'.css')) {
+                        $this->app->user->style = $this->data['forum_settings']['o_default_style'];
+                    }
+                    feather_setcookie($this->app->user->id, $this->app->user->password, $expires);
+                    $this->update_online();
+                    return true;
+                }
+            }
+        }
+        // If there is no cookie, or cookie is guest or expired, let's reconnect.
+        $expires = $now + 31536000; // The cookie expires after a year
+        $remote_addr = get_remote_address();
+
+        // Fetch guest user
+        $select_set_default_user = array('u.*', 'g.*', 'o.logged', 'o.last_post', 'o.last_search');
+        $where_set_default_user = array('u.id' => '1');
+
+        $result = \ORM::for_table($this->data['forum_settings']['db_prefix'].'users')
+            ->table_alias('u')
+            ->select_many($select_set_default_user)
+            ->inner_join($this->data['forum_settings']['db_prefix'].'groups', array('u.group_id', '=', 'g.g_id'), 'g')
+            ->left_outer_join($this->data['forum_settings']['db_prefix'].'online', array('o.ident', '=', $remote_addr), 'o', true)
+            ->where($where_set_default_user)
+            ->find_result_set();
+
+        if (!$result) {
+            exit('Unable to fetch guest information. Your database must contain both a guest user and a guest user group.');
+        }
+
+        foreach ($result as $this->app->user);
+
+        $this->app->user->disp_topics = $this->data['forum_settings']['o_disp_topics_default'];
+        $this->app->user->disp_posts = $this->data['forum_settings']['o_disp_posts_default'];
+        $this->app->user->timezone = $this->data['forum_settings']['o_default_timezone'];
+        $this->app->user->dst = $this->data['forum_settings']['o_default_dst'];
+        $this->app->user->language = $this->data['forum_settings']['o_default_lang'];
+        $this->app->user->style = $this->data['forum_settings']['o_default_style'];
+        $this->app->user->is_guest = true;
+        $this->app->user->is_admmod = false;
+
+        // Update online list
+        if (!$this->app->user->logged) {
+            $this->app->user->logged = time();
+
+            // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
+            switch ($this->data['forum_settings']['db_type']) {
+                case 'mysql':
+                case 'mysqli':
+                case 'mysql_innodb':
+                case 'mysqli_innodb':
+                case 'sqlite':
+                case 'sqlite3':
+                \ORM::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('REPLACE INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $remote_addr, ':logged' => $this->app->user->logged));
+                    break;
+
+                default:
+                    \ORM::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('INSERT INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE ident=:ident)', array(':ident' => $remote_addr, ':logged' => $this->app->user->logged));
+                    break;
+            }
+        } else {
+            \ORM::for_table($this->data['forum_settings']['db_prefix'].'online')->where('ident', $remote_addr)
+                 ->update_many('logged', time());
+        }
+
+        feather_setcookie(1, feather_hash(uniqid(rand(), true)), $expires);
+        return true;
+    }
+
+    public function update_online()
+    {
+        $now = time();
+
+        // Define this if you want this visit to affect the online list and the users last visit data
+        if (!defined('FEATHER_QUIET_VISIT')) {
+            // Update the online list
+            if (!$this->app->user->logged) {
+                $this->app->user->logged = $now;
+
+                // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
+                switch ($this->data['forum_settings']['db_type']) {
+                    case 'mysql':
+                    case 'mysqli':
+                    case 'mysql_innodb':
+                    case 'mysqli_innodb':
+                    case 'sqlite':
+                    case 'sqlite3':
+                        \ORM::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('REPLACE INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) VALUES(:user_id, :ident, :logged)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
+                        break;
+
+                    default:
+                        \ORM::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('INSERT INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) SELECT :user_id, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE user_id=:user_id)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
+                        break;
+                }
+
+                // Reset tracked topics
+                set_tracked_topics(null);
+
+            } else {
+                // Special case: We've timed out, but no other user has browsed the forums since we timed out
+                if ($this->app->user->logged < ($now-$this->data['forum_settings']['o_timeout_visit'])) {
+                    \ORM::for_table($this->data['forum_settings']['db_prefix'].'users')->where('id', $this->app->user->id)
+                        ->find_one()
+                        ->set('last_visit', $this->app->user->logged)
+                        ->save();
+                    $this->app->user->last_visit = $this->app->user->logged;
+                }
+
+                $idle_sql = ($this->app->user->idle == '1') ? ', idle=0' : '';
+
+                \ORM::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('UPDATE '.$this->data['forum_settings']['db_prefix'].'online SET logged='.$now.$idle_sql.' WHERE user_id=:user_id', array(':user_id' => $this->app->user->id));
+
+                // Update tracked topics with the current expire time
+                $cookie_tracked_topics = $this->app->getCookie($this->data['forum_settings']['cookie_name'].'_track');
+                if (isset($cookie_tracked_topics)) {
+                    set_tracked_topics(json_decode($cookie_tracked_topics, true));
+                }
+            }
+        } else {
+            if (!$this->app->user->logged) {
+                $this->app->user->logged = $this->app->user->last_visit;
+            }
+        }
+    }
+
+    //
+
+    public function init_db_legacy()
+    {
+        switch ($this->app->forum_settings['db_type']) {
+            case 'mysql':
+                require_once FEATHER_ROOT.'include/dblayer/mysql.php';
+                break;
+
+            case 'mysql_innodb':
+                require_once FEATHER_ROOT.'include/dblayer/mysql_innodb.php';
+                break;
+
+            case 'mysqli':
+                require_once FEATHER_ROOT.'include/dblayer/mysqli.php';
+                break;
+
+            case 'mysqli_innodb':
+                require_once FEATHER_ROOT.'include/dblayer/mysqli_innodb.php';
+                break;
+
+            case 'pgsql':
+                require_once FEATHER_ROOT.'include/dblayer/pgsql.php';
+                break;
+
+            case 'sqlite':
+                require_once FEATHER_ROOT.'include/dblayer/sqlite.php';
+                break;
+
+            case 'sqlite3':
+                require_once FEATHER_ROOT.'include/dblayer/sqlite3.php';
+                break;
+
+            default:
+                error('\''.$db_type.'\' is not a valid database type. Please check settings in config.php.', __FILE__, __LINE__);
+                break;
+        }
+
+        $this->app->container->singleton('db', function () {
+            // Create the database adapter object (and open/connect to/select db)
+            return new \DBLayer($this->app->forum_settings['db_host'],
+                               $this->app->forum_settings['db_user'],
+                               $this->app->forum_settings['db_pass'],
+                               $this->app->forum_settings['db_name'],
+                               $this->app->forum_settings['db_prefix'],
+                               false);
+        });
+        $this->app->db->start_transaction();
+        $this->app->prefix = $this->app->forum_settings['db_prefix']; // But, why ? *insert GIF here*
+    }
+
+    public function call()
+    {
+        global $lang_common, $feather_bans, $db_type, $cookie_name, $cookie_seed;
+
+        // Configure Slim
+        $this->app->config('cookies.encrypt', true);
+        $this->app->config('debug', true); // As long as we're developing FeatherBB
+
+        // Populate Feather object
+        $this->hydrate($this->data);
+
+        // Legacy
+        $this->env_to_globals($this->app->forum_env);
+        $this->app->config = $this->data['forum_settings'];
+        extract($this->data['forum_settings']);
+
+        // Block prefetch requests
+        $this->app->hook('slim.before', function () {
+        	if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) {
+                $this->app->halt(403, 'Prefetch forbidden');
+        	}
+        });
+
+        $this->set_headers();
+        $this->init_db();
+        $this->init_db_legacy();
+
+        require_once $this->app->forum_env['FEATHER_ROOT'].'include/utf8/utf8.php';
+        require_once $this->app->forum_env['FEATHER_ROOT'].'include/functions.php';
+
+        // TODO : check useness
+        // Strip out "bad" UTF-8 characters
+        forum_remove_bad_characters();
+        // Reverse the effect of register_globals
+        forum_unregister_globals();
+
+        // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
+        setlocale(LC_CTYPE, 'C');
+
+        // TODO : magic quotes
+        // Turn off magic_quotes_runtime
+        if (get_magic_quotes_runtime()) {
+            set_magic_quotes_runtime(0);
+        }
+
+        // Define time formats
+        $forum_time_formats = array($this->app->config['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
+        $forum_date_formats = array($this->app->config['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
+
+        $this->authenticate();
+
+        // Attempt to load the common language file
+        if (file_exists($this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php')) {
+            include $this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php';
+        } else {
+            die('There is no valid language pack \''.feather_escape($this->app->user->language).'\' installed. Please reinstall a language of that name');
+        }
+
+        // Check if we are to display a maintenance message
+        if ($this->app->config['o_maintenance'] && $this->app->user->g_id > FEATHER_ADMIN && !defined('FEATHER_TURN_OFF_MAINT')) {
+            maintenance_message();
+        }
+
+        // Load cached bans
+        if (file_exists($this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php')) {
+            include $this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php';
+        }
+
+        if (!defined('FEATHER_BANS_LOADED')) {
+            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
+                require_once $this->app->forum_env['FEATHER_ROOT'].'include/cache.php';
+            }
+
+            generate_bans_cache();
+            require_once $this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php';
+        }
+
+        // Check if current user is banned
+        check_bans();
+
+        // Update online list
+        update_users_online();
 
-        // Call next middleware.
+        $this->app->config('templates.path', get_path_view());
         $this->next->call();
     }
 
diff --git a/include/common.php b/include/common.php
index dec6ca65..1da5cfea 100644
--- a/include/common.php
+++ b/include/common.php
@@ -7,195 +7,4 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-if (!defined('FEATHER_ROOT')) {
-    exit('The constant FEATHER_ROOT must be defined and point to a valid FeatherBB installation root directory.');
-}
 
-// Define the version and database revision that this code was written for
-define('FORUM_VERSION', '1.0.0');
-
-define('FORUM_DB_REVISION', 21);
-define('FORUM_SI_REVISION', 2);
-define('FORUM_PARSER_REVISION', 2);
-
-// Attempt to load the configuration file config.php
-if (file_exists(FEATHER_ROOT.'include/config.php')) {
-    require FEATHER_ROOT.'include/config.php';
-}
-
-// Load the functions script
-require FEATHER_ROOT.'include/functions.php';
-
-// Load UTF-8 functions
-require FEATHER_ROOT.'include/utf8/utf8.php';
-
-// Strip out "bad" UTF-8 characters
-forum_remove_bad_characters();
-
-// Reverse the effect of register_globals
-forum_unregister_globals();
-
-// If FEATHER isn't defined, config.php is missing or corrupt
-if (!defined('FEATHER')) {
-    header('Location: install.php');
-    exit;
-}
-
-// Record the start time (will be used to calculate the generation time for the page)
-$feather->start = get_microtime();
-
-// Make sure PHP reports all errors except E_NOTICE. FluxBB supports E_ALL, but a lot of scripts it may interact with, do not
-//error_reporting(E_ALL ^ E_NOTICE);
-error_reporting(E_ALL); // Let's report everything for development
-
-// Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
-setlocale(LC_CTYPE, 'C');
-
-// Turn off magic_quotes_runtime
-if (get_magic_quotes_runtime()) {
-    set_magic_quotes_runtime(0);
-}
-
-// If a cookie name is not specified in config.php, we use the default (pun_cookie)
-if (empty($cookie_name)) {
-    $cookie_name = 'feather_cookie';
-}
-
-// If the cache directory is not specified, we use the default setting
-if (!defined('FORUM_CACHE_DIR')) {
-    define('FORUM_CACHE_DIR', FEATHER_ROOT.'cache/');
-}
-
-// Define a few commonly used constants
-define('FEATHER_UNVERIFIED', 0);
-define('FEATHER_ADMIN', 1);
-define('FEATHER_MOD', 2);
-define('FEATHER_GUEST', 3);
-define('FEATHER_MEMBER', 4);
-
-// Load DB abstraction layer and connect
-require FEATHER_ROOT.'include/dblayer/common_db.php';
-
- // Inject DB dependency into SlimFramework
-$feather->container->singleton('db', function () use ($db_host, $db_username, $db_password, $db_name, $db_prefix, $p_connect) {
-    // Create the database adapter object (and open/connect to/select db)
-    return new DBLayer($db_host, $db_username, $db_password, $db_name, $db_prefix, $p_connect);
-});
-
-// Backward compatibility - to be removed soon
-$db = $feather->db;
-
-// Start a transaction
-$feather->db->start_transaction();
-
-// Include Idiorm
-require FEATHER_ROOT.'include/idiorm.php';
-
-// TODO: handle drivers
-\ORM::configure('mysql:host='.$db_host.';dbname='.$db_name);
-\ORM::configure('username', $db_username);
-\ORM::configure('password', $db_password);
-\ORM::configure('logging', true);
-\ORM::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-\ORM::configure('id_column_overrides', array(
-    $db_prefix.'groups' => 'g_id',
-));
-
-// Inject DB prefix to SlimFramework
-$feather->prefix = $db_prefix;
-
-// Load cached config
-if (file_exists(FORUM_CACHE_DIR.'cache_config.php')) {
-    include FORUM_CACHE_DIR.'cache_config.php';
-}
-
-if (!defined('FEATHER_CONFIG_LOADED')) {
-    if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-        require FEATHER_ROOT.'include/cache.php';
-    }
-
-    generate_config_cache();
-    require FORUM_CACHE_DIR.'cache_config.php';
-}
-
-// Inject config to SlimFramework
-$feather->config = $feather_config;
-
-// Verify that we are running the proper database schema revision
-if (!isset($feather->config['o_database_revision']) || $feather->config['o_database_revision'] < FORUM_DB_REVISION ||
-    !isset($feather->config['o_searchindex_revision']) || $feather->config['o_searchindex_revision'] < FORUM_SI_REVISION ||
-    !isset($feather->config['o_parser_revision']) || $feather->config['o_parser_revision'] < FORUM_PARSER_REVISION ||
-    version_compare($feather->config['o_cur_version'], FORUM_VERSION, '<')) {
-    header('Location: db_update.php');
-    exit;
-}
-
-// Enable output buffering
-if (!defined('FEATHER_DISABLE_BUFFERING')) {
-    // Should we use gzip output compression?
-    if ($feather->config['o_gzip'] && extension_loaded('zlib')) {
-        ob_start('ob_gzhandler');
-    } else {
-        ob_start();
-    }
-}
-
-// Define standard date/time formats
-$forum_time_formats = array($feather->config['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
-$forum_date_formats = array($feather->config['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
-
-// Check/update/set cookie and fetch user info
-check_cookie();
-
-// Attempt to load the common language file
-if (file_exists(FEATHER_ROOT.'lang/'.$feather->user->language.'/common.php')) {
-    include FEATHER_ROOT.'lang/'.$feather->user->language.'/common.php';
-} else {
-    die('There is no valid language pack \''.feather_escape($feather->user->language).'\' installed. Please reinstall a language of that name');
-}
-
-// Check if we are to display a maintenance message
-if ($feather->config['o_maintenance'] && $feather->user->g_id > FEATHER_ADMIN && !defined('FEATHER_TURN_OFF_MAINT')) {
-    maintenance_message();
-}
-
-// Load cached bans
-if (file_exists(FORUM_CACHE_DIR.'cache_bans.php')) {
-    include FORUM_CACHE_DIR.'cache_bans.php';
-}
-
-if (!defined('FEATHER_BANS_LOADED')) {
-    if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-        require FEATHER_ROOT.'include/cache.php';
-    }
-
-    generate_bans_cache();
-    require FORUM_CACHE_DIR.'cache_bans.php';
-}
-
-// Check if current user is banned
-check_bans();
-
-// Update online list
-update_users_online();
-
-// Check to see if we logged in without a cookie being set
-if ($feather->user->is_guest && isset($_GET['login'])) {
-    message($lang_common['No cookie']);
-}
-
-// 32kb should be more than enough for forum posts
-if (!defined('FEATHER_MAX_POSTSIZE')) {
-    define('FEATHER_MAX_POSTSIZE', 32768);
-}
-
-if (!defined('FEATHER_SEARCH_MIN_WORD')) {
-    define('FEATHER_SEARCH_MIN_WORD', 3);
-}
-if (!defined('FEATHER_SEARCH_MAX_WORD')) {
-    define('FEATHER_SEARCH_MAX_WORD', 20);
-}
-
-if (!defined('FORUM_MAX_COOKIE_SIZE')) {
-    define('FORUM_MAX_COOKIE_SIZE', 4048);
-}
diff --git a/index.php b/index.php
index bfb68e1f..460159e8 100644
--- a/index.php
+++ b/index.php
@@ -10,6 +10,7 @@
 // Start a session for flash messages
 session_cache_limiter(false);
 session_start();
+error_reporting(E_ALL); // Let's report everything for development
 
 // Load Slim Framework
 require 'Slim/Slim.php';
@@ -17,25 +18,20 @@
 
 // Instantiate Slim
 $feather = new \Slim\Slim();
+$feather_user_settings = array(
+							'db_name' => 'featherbb',
+							'db_host' => 'localhost',
+							'db_user' => 'featherbb',
+							'db_pass' => 'featherbb',
+							'cookie_name' => 'feather_cookie_45ef0b',
+							'cookie_seed' => '0f320ab07f4afbc5');
 
 // Load middlewares
 $feather->add(new \Slim\Extras\Middleware\CsrfGuard('featherbb_csrf')); // CSRF
-$feather->add(new \Slim\Extras\Middleware\FeatherBB()); // FeatherBB
-
-// Cookie encryption
-$feather->config('cookies.encrypt', true);
-
-// Load FeatherBB common file
-define('FEATHER_ROOT', dirname(__FILE__).'/');
-require FEATHER_ROOT.'include/common.php';
+$feather->add(new \Slim\Extras\Middleware\FeatherBB($feather_user_settings)); // FeatherBB
 
 // Load the routes
-require FEATHER_ROOT.'include/routes.php';
-
-// Specify where to load the views
-$feather->config('templates.path', get_path_view());
-
-$feather->config('debug', true); // As long as we're developing FeatherBB
+require 'include/routes.php';
 
 // Run it, baby!
 $feather->run();

From 95761c2805ae58cf0f0bf9b9ca00e0e87282d90f Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sun, 9 Aug 2015 20:20:59 +0200
Subject: [PATCH 002/353] Remove functions

---
 include/functions.php | 274 ++++--------------------------------------
 1 file changed, 26 insertions(+), 248 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 7c0dcf09..09eb72f3 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -7,8 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-
-
 //
 // Return current timestamp (with microseconds) as a float
 //
@@ -18,140 +16,6 @@ function get_microtime()
     return ((float)$usec + (float)$sec);
 }
 
-//
-// Cookie stuff!
-//
-function check_cookie()
-{
-    global $cookie_name, $cookie_seed;
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-    $now = time();
-
-    // Get FeatherBB cookie
-    $cookie_raw = $feather->getCookie($cookie_name);
-
-    // Check if cookie exists and is valid (getCookie method returns false if the data has been tampered locally so it can't decrypt the cookie);
-    if (isset($cookie_raw)) {
-        $cookie = json_decode($cookie_raw, true);
-        $checksum = hash_hmac('sha1', $cookie['user_id'].$cookie['expires'], $cookie_seed . '_checksum');
-
-        // If cookie has a non-guest user, hasn't expired and is legit
-        if ($cookie['user_id'] > 1 && $cookie['expires'] > $now && $checksum == $cookie['checksum']) {
-
-            // Get user info from db
-            $select_check_cookie = array('u.*', 'g.*', 'o.logged', 'o.idle');
-            $where_check_cookie = array('u.id' => intval($cookie['user_id']));
-
-            $result = ORM::for_table($feather->prefix.'users')
-                ->table_alias('u')
-                ->select_many($select_check_cookie)
-                ->inner_join($feather->prefix.'groups', array('u.group_id', '=', 'g.g_id'), 'g')
-                ->left_outer_join($feather->prefix.'online', array('o.user_id', '=', 'u.id'), 'o')
-                ->where($where_check_cookie)
-                ->find_result_set();
-
-            foreach ($result as $feather->user);
-
-            // Another security check, to prevent identity fraud by changing the user id in the cookie) (might be useless considering the strength of encryption)
-            if (isset($feather->user->id) && hash_hmac('sha1', $feather->user->password, $cookie_seed.'_password_hash') === $cookie['password_hash']) {
-                $expires = ($cookie['expires'] > $now + $feather->config['o_timeout_visit']) ? $now + 1209600 : $now + $feather->config['o_timeout_visit'];
-                $feather->user->is_guest = false;
-                $feather->user->is_admmod = $feather->user->g_id == FEATHER_ADMIN || $feather->user->g_moderator == '1';
-                feather_setcookie($feather->user->id, $feather->user->password, $expires);
-                set_preferences();
-                return true;
-            }
-        }
-    }
-    // If there is no cookie, or cookie is guest or expired, let's reconnect.
-    $expires = $now + 31536000; // The cookie expires after a year
-    feather_setcookie(1, feather_hash(uniqid(rand(), true)), $expires);
-    return set_default_user();
-}
-
-//
-// Set preferences
-//
-function set_preferences()
-{
-    global $db_type, $cookie_name;
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-    $now = time();
-
-    // Set a default language if the user selected language no longer exists
-    if (!file_exists(FEATHER_ROOT.'lang/'.$feather->user->language)) {
-        $feather->user->language = $feather->config['o_default_lang'];
-    }
-
-    // Set a default style if the user selected style no longer exists
-    if (!file_exists(FEATHER_ROOT.'style/'.$feather->user->style.'.css')) {
-        $feather->user->style = $feather->config['o_default_style'];
-    }
-
-    if (!$feather->user->disp_topics) {
-        $feather->user->disp_topics = $feather->config['o_disp_topics_default'];
-    }
-    if (!$feather->user->disp_posts) {
-        $feather->user->disp_posts = $feather->config['o_disp_posts_default'];
-    }
-
-    // Define this if you want this visit to affect the online list and the users last visit data
-    if (!defined('FEATHER_QUIET_VISIT')) {
-        // Update the online list
-        if (!$feather->user->logged) {
-            $feather->user->logged = $now;
-
-            // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
-            switch ($db_type) {
-                case 'mysql':
-                case 'mysqli':
-                case 'mysql_innodb':
-                case 'mysqli_innodb':
-                case 'sqlite':
-                case 'sqlite3':
-                    \ORM::for_table($feather->db->prefix.'online')->raw_execute('REPLACE INTO '.$feather->db->prefix.'online (user_id, ident, logged) VALUES(:user_id, :ident, :logged)', array(':user_id' => $feather->user->id, ':ident' => $feather->user->username, ':logged' => $feather->user->logged));
-                    break;
-
-                default:
-                    \ORM::for_table($feather->db->prefix.'online')->raw_execute('INSERT INTO '.$feather->db->prefix.'online (user_id, ident, logged) SELECT :user_id, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$feather->db->prefix.'online WHERE user_id=:user_id)', array(':user_id' => $feather->user->id, ':ident' => $feather->user->username, ':logged' => $feather->user->logged));
-                    break;
-            }
-
-            // Reset tracked topics
-            set_tracked_topics(null);
-
-        } else {
-            // Special case: We've timed out, but no other user has browsed the forums since we timed out
-            if ($feather->user->logged < ($now-$feather->config['o_timeout_visit'])) {
-                \ORM::for_table($feather->db->prefix.'users')->where('id', $feather->user->id)
-                    ->find_one()
-                    ->set('last_visit', $feather->user->logged)
-                    ->save();
-                $feather->user->last_visit = $feather->user->logged;
-            }
-
-            $idle_sql = ($feather->user->idle == '1') ? ', idle=0' : '';
-
-            \ORM::for_table($feather->db->prefix.'online')->raw_execute('UPDATE '.$feather->db->prefix.'online SET logged='.$now.$idle_sql.' WHERE user_id=:user_id', array(':user_id' => $feather->user->id));
-
-            // Update tracked topics with the current expire time
-            $cookie_tracked_topics = $feather->getCookie($cookie_name.'_track');
-            if (isset($cookie_tracked_topics)) {
-                set_tracked_topics(json_decode($cookie_tracked_topics, true));
-            }
-        }
-    } else {
-        if (!$feather->user->logged) {
-            $feather->user->logged = $feather->user->last_visit;
-        }
-    }
-}
-
-
 //
 // Try to determine the current URL
 //
@@ -220,7 +84,6 @@ function get_base_url($support_https = false)
     return $base_url;
 }
 
-
 //
 // Fetch admin IDs
 //
@@ -243,71 +106,6 @@ function get_admin_ids()
 }
 
 
-//
-// Fill $feather->user with default values (for guests)
-//
-function set_default_user()
-{
-    global $db, $db_type, $feather_config;
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    $remote_addr = get_remote_address();
-
-    // Fetch guest user
-    $select_set_default_user = array('u.*', 'g.*', 'o.logged', 'o.last_post', 'o.last_search');
-    $where_set_default_user = array('u.id' => '1');
-
-    $result = ORM::for_table($feather->prefix.'users')
-        ->table_alias('u')
-        ->select_many($select_set_default_user)
-        ->inner_join($feather->prefix.'groups', array('u.group_id', '=', 'g.g_id'), 'g')
-        ->left_outer_join($feather->prefix.'online', array('o.ident', '=', $remote_addr), 'o', true)
-        ->where($where_set_default_user)
-        ->find_result_set();
-
-    if (!$result) {
-        exit('Unable to fetch guest information. Your database must contain both a guest user and a guest user group.');
-    }
-
-    foreach ($result as $feather->user);
-
-    // Update online list
-    if (!$feather->user->logged) {
-        $feather->user->logged = time();
-
-        // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
-        switch ($db_type) {
-            case 'mysql':
-            case 'mysqli':
-            case 'mysql_innodb':
-            case 'mysqli_innodb':
-            case 'sqlite':
-            case 'sqlite3':
-            \ORM::for_table($db->prefix.'online')->raw_execute('REPLACE INTO '.$db->prefix.'online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $remote_addr, ':logged' => $feather->user->logged));
-                break;
-
-            default:
-                \ORM::for_table($db->prefix.'online')->raw_execute('INSERT INTO '.$db->prefix.'online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$db->prefix.'online WHERE ident=:ident)', array(':ident' => $remote_addr, ':logged' => $feather->user->logged));
-                break;
-        }
-    } else {
-        \ORM::for_table($db->prefix.'online')->where('ident', $remote_addr)
-             ->update_many('logged', time());
-    }
-
-    $feather->user->disp_topics = $feather_config['o_disp_topics_default'];
-    $feather->user->disp_posts = $feather_config['o_disp_posts_default'];
-    $feather->user->timezone = $feather_config['o_default_timezone'];
-    $feather->user->dst = $feather_config['o_default_dst'];
-    $feather->user->language = $feather_config['o_default_lang'];
-    $feather->user->style = $feather_config['o_default_style'];
-    $feather->user->is_guest = true;
-    $feather->user->is_admmod = false;
-}
-
-
 //
 // Wrapper for Slim setCookie method
 //
@@ -324,29 +122,6 @@ function feather_setcookie($user_id, $password, $expires)
     $feather->setCookie($cookie_name, json_encode($cookie_data), $expires);
 }
 
-
-//
-// Set a cookie, FluxBB style!
-
-function forum_setcookie($name, $value, $expire)
-{
-    global $cookie_path, $cookie_domain, $cookie_secure, $feather_config;
-
-    if ($expire - time() - $feather_config['o_timeout_visit'] < 1) {
-        $expire = 0;
-    }
-
-    // Enable sending of a P3P header
-    header('P3P: CP="CUR ADM"');
-
-    if (version_compare(PHP_VERSION, '5.2.0', '>=')) {
-        setcookie($name, $value, $expire, $cookie_path, $cookie_domain, $cookie_secure, true);
-    } else {
-        setcookie($name, $value, $expire, $cookie_path.'; HttpOnly', $cookie_domain, $cookie_secure);
-    }
-}
-
-
 //
 // Check whether the connecting user is banned (and delete any expired bans while we're at it)
 //
@@ -373,7 +148,7 @@ function check_bans()
     foreach ($feather_bans as $cur_ban) {
         // Has this ban expired?
         if ($cur_ban['expire'] != '' && $cur_ban['expire'] <= time()) {
-            \ORM::for_table($db->prefix.'bans')->where('id', $cur_ban['id'])
+            \ORM::for_table($feather->db->prefix.'bans')->where('id', $cur_ban['id'])
                                                ->delete_many();
             $bans_altered = true;
             continue;
@@ -403,7 +178,7 @@ function check_bans()
         }
 
         if ($is_banned) {
-            \ORM::for_table($db->prefix.'online')->where('ident', $feather->user->username)
+            \ORM::for_table($feather->db->prefix.'online')->where('ident', $feather->user->username)
                                                  ->delete_many();
             message($lang_common['Ban message'].' '.(($cur_ban['expire'] != '') ? $lang_common['Ban message 2'].' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? $lang_common['Ban message 3'].'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').$lang_common['Ban message 4'].' <a href="mailto:'.feather_escape($feather_config['o_admin_email']).'">'.feather_escape($feather_config['o_admin_email']).'</a>.', true, true, true);
         }
@@ -456,7 +231,7 @@ function check_username($username, $errors, $exclude_id = null)
     // Check that the username (or a too similar username) is not already registered
     $query = (!is_null($exclude_id)) ? ' AND id!='.$exclude_id : '';
 
-    $result = \ORM::for_table($db->prefix.'online')->raw_query('SELECT username FROM '.$db->prefix.'users WHERE (UPPER(username)=UPPER(:username1) OR UPPER(username)=UPPER(:username2)) AND id>1'.$query, array(':username1' => $username, ':username2' => ucp_preg_replace('%[^\p{L}\p{N}]%u', '', $username)))->find_one();
+    $result = \ORM::for_table($feather->db->prefix.'online')->raw_query('SELECT username FROM '.$feather->db->prefix.'users WHERE (UPPER(username)=UPPER(:username1) OR UPPER(username)=UPPER(:username2)) AND id>1'.$query, array(':username1' => $username, ':username2' => ucp_preg_replace('%[^\p{L}\p{N}]%u', '', $username)))->find_one();
 
     if ($result) {
         $busy = $db->result($result);
@@ -480,33 +255,36 @@ function check_username($username, $errors, $exclude_id = null)
 //
 function update_users_online()
 {
-    global $db, $feather_config;
+    global $db;
 
     $now = time();
 
+    // Get Slim current session
+    $feather = \Slim\Slim::getInstance();
+
     // Fetch all online list entries that are older than "o_timeout_online"
     $select_update_users_online = array('user_id', 'ident', 'logged', 'idle');
 
-    $result = \ORM::for_table($db->prefix.'online')->select_many($select_update_users_online)
-        ->where_lt('logged', $now-$feather_config['o_timeout_online'])
+    $result = \ORM::for_table($feather->db->prefix.'online')->select_many($select_update_users_online)
+        ->where_lt('logged', $now - $feather->config['o_timeout_online'])
         ->find_many();
 
     foreach ($result as $cur_user) {
         // If the entry is a guest, delete it
         if ($cur_user['user_id'] == '1') {
-            \ORM::for_table($db->prefix.'online')->where('ident', $cur_user['ident'])
+            \ORM::for_table($feather->db->prefix.'online')->where('ident', $cur_user['ident'])
                                                  ->delete_many();
         } else {
             // If the entry is older than "o_timeout_visit", update last_visit for the user in question, then delete him/her from the online list
-            if ($cur_user['logged'] < ($now-$feather_config['o_timeout_visit'])) {
-                \ORM::for_table($db->prefix.'users')->where('id', $cur_user['user_id'])
+            if ($cur_user['logged'] < ($now-$feather->config['o_timeout_visit'])) {
+                \ORM::for_table($feather->db->prefix.'users')->where('id', $cur_user['user_id'])
                         ->find_one()
                         ->set('last_visit', $cur_user['logged'])
                         ->save();
-                \ORM::for_table($db->prefix.'online')->where('user_id', $cur_user['user_id'])
+                \ORM::for_table($feather->db->prefix.'online')->where('user_id', $cur_user['user_id'])
                     ->delete_many();
             } elseif ($cur_user['idle'] == '0') {
-                \ORM::for_table($db->prefix.'online')->where('user_id', $cur_user['user_id'])
+                \ORM::for_table($feather->db->prefix.'online')->where('user_id', $cur_user['user_id'])
                         ->update_many('idle', 1);
             }
         }
@@ -609,7 +387,7 @@ function update_forum($forum_id)
 {
     global $db;
 
-    $stats_query = \ORM::for_table($db->prefix.'topics')
+    $stats_query = \ORM::for_table($feather->db->prefix.'topics')
                     ->where('forum_id', $forum_id)
                     ->select_expr('COUNT(id)', 'total_topics')
                     ->select_expr('SUM(num_replies)', 'total_replies')
@@ -622,7 +400,7 @@ function update_forum($forum_id)
 
     $select_update_forum = array('last_post', 'last_post_id', 'last_poster');
 
-    $result = \ORM::for_table($db->prefix.'topics')->select_many($select_update_forum)
+    $result = \ORM::for_table($feather->db->prefix.'topics')->select_many($select_update_forum)
         ->where('forum_id', $forum_id)
         ->where_null('moved_to')
         ->order_by_desc('last_post')
@@ -647,7 +425,7 @@ function update_forum($forum_id)
             'last_poster'  => 'NULL',
         );
     }
-        \ORM::for_table($db->prefix.'forums')
+        \ORM::for_table($feather->db->prefix.'forums')
             ->where('id', $forum_id)
             ->find_one()
             ->set($insert_update_forum)
@@ -686,17 +464,17 @@ function delete_topic($topic_id)
             array('moved_to' => $topic_id)
         );
 
-    \ORM::for_table($db->prefix.'topics')
+    \ORM::for_table($feather->db->prefix.'topics')
         ->where_any_is($where_delete_topic)
         ->delete_many();
 
     // Delete posts in topic
-    \ORM::for_table($db->prefix.'posts')
+    \ORM::for_table($feather->db->prefix.'posts')
         ->where('topic_id', $topic_id)
         ->delete_many();
 
     // Delete any subscriptions for this topic
-    \ORM::for_table($db->prefix.'topic_subscriptions')
+    \ORM::for_table($feather->db->prefix.'topic_subscriptions')
         ->where('topic_id', $topic_id)
         ->delete_many();
 }
@@ -709,7 +487,7 @@ function delete_post($post_id, $topic_id)
 {
     global $db;
 
-    $result = \ORM::for_table($db->prefix.'posts')
+    $result = \ORM::for_table($feather->db->prefix.'posts')
                   ->select_many('id', 'poster', 'posted')
                   ->where('topic_id', $topic_id)
                   ->order_by_desc('id')
@@ -730,7 +508,7 @@ function delete_post($post_id, $topic_id)
    }
 
     // Delete the post
-    \ORM::for_table($db->prefix.'posts')
+    \ORM::for_table($feather->db->prefix.'posts')
         ->where('id', $post_id)
         ->find_one()
         ->delete();
@@ -738,7 +516,7 @@ function delete_post($post_id, $topic_id)
     strip_search_index($post_id);
 
     // Count number of replies in the topic
-    $num_replies = \ORM::for_table($db->prefix.'posts')->where('topic_id', $topic_id)->count() - 1;
+    $num_replies = \ORM::for_table($feather->db->prefix.'posts')->where('topic_id', $topic_id)->count() - 1;
 
     // If the message we deleted is the most recent in the topic (at the end of the topic)
     if ($last_id == $post_id) {
@@ -750,14 +528,14 @@ function delete_post($post_id, $topic_id)
                 'last_poster'  => $second_poster,
                 'num_replies'  => $num_replies,
             );
-            \ORM::for_table($db->prefix.'topics')
+            \ORM::for_table($feather->db->prefix.'topics')
                 ->where('id', $topic_id)
                 ->find_one()
                 ->set($update_topic)
                 ->save();
         } else {
             // We deleted the only reply, so now last_post/last_post_id/last_poster is posted/id/poster from the topic itself
-            \ORM::for_table($db->prefix.'topics')
+            \ORM::for_table($feather->db->prefix.'topics')
                 ->where('id', $topic_id)
                 ->find_one()
                 ->set_expr('last_post', 'posted')
@@ -768,7 +546,7 @@ function delete_post($post_id, $topic_id)
         }
     } else {
         // Otherwise we just decrement the reply counter
-        \ORM::for_table($db->prefix.'topics')
+        \ORM::for_table($feather->db->prefix.'topics')
             ->where('id', $topic_id)
             ->find_one()
             ->set('num_replies', $num_replies)

From ccc25888fc1946f7284f61a7911f5bbfeac24736 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sun, 9 Aug 2015 20:22:13 +0200
Subject: [PATCH 003/353] Generic 404 page

---
 include/routes.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/routes.php b/include/routes.php
index 48acac72..f9419640 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 
 // Index
 $feather->get('/', '\controller\index:display');
@@ -92,7 +92,7 @@
 
     // Admin index
     $feather->get('(/action/:action)(/)', '\controller\admin\index:display');
-    
+
     // Admin bans
     $feather->group('/bans', function() use ($feather) {
         $feather->get('(/)', '\controller\admin\bans:display');
@@ -156,10 +156,10 @@
         $feather->get('/ip-stats/id/:id(/)', '\controller\admin\users:ipstats')->conditions(array('id' => '[0-9]+'));
         $feather->get('/show-users/ip/:ip(/)', '\controller\admin\users:showusers');
     });
-    
+
 });
 
 // 404 not found
-$feather->notFound(function () use ($lang_common) {
-    message($lang_common['Bad request'], '404');
+$feather->notFound(function () use ($feather) {
+    $feather->halt(404, 'Not found');
 });

From 663766150b17832efd9772ba541f4fe2decb8c61 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 10 Aug 2015 10:44:14 +0200
Subject: [PATCH 004/353] Remove common file

---
 include/common.php | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 include/common.php

diff --git a/include/common.php b/include/common.php
deleted file mode 100644
index 1da5cfea..00000000
--- a/include/common.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-

From 0485cce517979de373541a62bceb52fdacceca6e Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 10 Aug 2015 11:34:09 +0200
Subject: [PATCH 005/353] Fix block prefetch feature

---
 Slim/Extras/Middleware/FeatherBB.php | 139 +++++++++++++--------------
 1 file changed, 68 insertions(+), 71 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index a884ae65..27a90c99 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -362,88 +362,85 @@ public function call()
     {
         global $lang_common, $feather_bans, $db_type, $cookie_name, $cookie_seed;
 
-        // Configure Slim
-        $this->app->config('cookies.encrypt', true);
-        $this->app->config('debug', true); // As long as we're developing FeatherBB
-
-        // Populate Feather object
-        $this->hydrate($this->data);
-
-        // Legacy
-        $this->env_to_globals($this->app->forum_env);
-        $this->app->config = $this->data['forum_settings'];
-        extract($this->data['forum_settings']);
-
         // Block prefetch requests
-        $this->app->hook('slim.before', function () {
-        	if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) {
-                $this->app->halt(403, 'Prefetch forbidden');
-        	}
-        });
-
-        $this->set_headers();
-        $this->init_db();
-        $this->init_db_legacy();
-
-        require_once $this->app->forum_env['FEATHER_ROOT'].'include/utf8/utf8.php';
-        require_once $this->app->forum_env['FEATHER_ROOT'].'include/functions.php';
-
-        // TODO : check useness
-        // Strip out "bad" UTF-8 characters
-        forum_remove_bad_characters();
-        // Reverse the effect of register_globals
-        forum_unregister_globals();
-
-        // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
-        setlocale(LC_CTYPE, 'C');
+        if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch') || true) {
+            $this->set_headers();
+            $this->app->response->setStatus(403);
+        } else {
+            // Configure Slim
+            $this->app->config('cookies.encrypt', true);
+            $this->app->config('debug', true); // As long as we're developing FeatherBB
+
+            // Populate Feather object
+            $this->hydrate($this->data);
+
+            // Legacy
+            $this->env_to_globals($this->app->forum_env);
+            $this->app->config = $this->data['forum_settings'];
+            extract($this->data['forum_settings']);
+
+            $this->set_headers();
+            $this->init_db();
+            $this->init_db_legacy();
+
+            require_once $this->app->forum_env['FEATHER_ROOT'].'include/utf8/utf8.php';
+            require_once $this->app->forum_env['FEATHER_ROOT'].'include/functions.php';
+
+            // TODO : check useness
+            // Strip out "bad" UTF-8 characters
+            forum_remove_bad_characters();
+            // Reverse the effect of register_globals
+            forum_unregister_globals();
+
+            // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
+            setlocale(LC_CTYPE, 'C');
+
+            // TODO : magic quotes
+            // Turn off magic_quotes_runtime
+            if (get_magic_quotes_runtime()) {
+                set_magic_quotes_runtime(0);
+            }
 
-        // TODO : magic quotes
-        // Turn off magic_quotes_runtime
-        if (get_magic_quotes_runtime()) {
-            set_magic_quotes_runtime(0);
-        }
+            // Define time formats
+            $forum_time_formats = array($this->app->config['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
+            $forum_date_formats = array($this->app->config['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
 
-        // Define time formats
-        $forum_time_formats = array($this->app->config['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
-        $forum_date_formats = array($this->app->config['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
+            $this->authenticate();
 
-        $this->authenticate();
+            // Attempt to load the common language file
+            if (file_exists($this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php')) {
+                include $this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php';
+            } else {
+                die('There is no valid language pack \''.feather_escape($this->app->user->language).'\' installed. Please reinstall a language of that name');
+            }
 
-        // Attempt to load the common language file
-        if (file_exists($this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php')) {
-            include $this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php';
-        } else {
-            die('There is no valid language pack \''.feather_escape($this->app->user->language).'\' installed. Please reinstall a language of that name');
-        }
+            // Check if we are to display a maintenance message
+            if ($this->app->config['o_maintenance'] && $this->app->user->g_id > FEATHER_ADMIN && !defined('FEATHER_TURN_OFF_MAINT')) {
+                maintenance_message();
+            }
 
-        // Check if we are to display a maintenance message
-        if ($this->app->config['o_maintenance'] && $this->app->user->g_id > FEATHER_ADMIN && !defined('FEATHER_TURN_OFF_MAINT')) {
-            maintenance_message();
-        }
+            // Load cached bans
+            if (file_exists($this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php')) {
+                include $this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php';
+            }
 
-        // Load cached bans
-        if (file_exists($this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php')) {
-            include $this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php';
-        }
+            if (!defined('FEATHER_BANS_LOADED')) {
+                if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
+                    require_once $this->app->forum_env['FEATHER_ROOT'].'include/cache.php';
+                }
 
-        if (!defined('FEATHER_BANS_LOADED')) {
-            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                require_once $this->app->forum_env['FEATHER_ROOT'].'include/cache.php';
+                generate_bans_cache();
+                require_once $this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php';
             }
 
-            generate_bans_cache();
-            require_once $this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php';
-        }
-
-        // Check if current user is banned
-        check_bans();
+            // Check if current user is banned
+            check_bans();
 
-        // Update online list
-        update_users_online();
+            // Update online list
+            update_users_online();
 
-        $this->app->config('templates.path', get_path_view());
-        $this->next->call();
+            $this->app->config('templates.path', get_path_view());
+            $this->next->call();
+        }
     }
-
-
 }

From e37b3cd76909de1a8034f1c7f9828aeed3298042 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 10 Aug 2015 11:43:08 +0200
Subject: [PATCH 006/353] Fix prefetch for production

---
 Slim/Extras/Middleware/FeatherBB.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 27a90c99..fac15f32 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -363,7 +363,7 @@ public function call()
         global $lang_common, $feather_bans, $db_type, $cookie_name, $cookie_seed;
 
         // Block prefetch requests
-        if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch') || true) {
+        if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) {
             $this->set_headers();
             $this->app->response->setStatus(403);
         } else {

From 8ae517512184651ea2b706f2aa033f566ab6bdde Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 10 Aug 2015 11:48:11 +0200
Subject: [PATCH 007/353] Tweak get template path function

---
 Slim/Extras/Middleware/FeatherBB.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index fac15f32..becb5752 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -367,10 +367,6 @@ public function call()
             $this->set_headers();
             $this->app->response->setStatus(403);
         } else {
-            // Configure Slim
-            $this->app->config('cookies.encrypt', true);
-            $this->app->config('debug', true); // As long as we're developing FeatherBB
-
             // Populate Feather object
             $this->hydrate($this->data);
 
@@ -439,7 +435,10 @@ public function call()
             // Update online list
             update_users_online();
 
-            $this->app->config('templates.path', get_path_view());
+            // Configure Slim
+            $this->app->config('cookies.encrypt', true);
+            $this->app->config('debug', true); // As long as we're developing FeatherBB
+            $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? FEATHER_ROOT.'style/'.$this->app->user->style.'/view' : FEATHER_ROOT.'view');
             $this->next->call();
         }
     }

From 6343d5295dea4b7b4ce4570c3dcf5dfddf1e088c Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 11 Aug 2015 12:42:03 +0200
Subject: [PATCH 008/353] Resolve route conflicts

---
 include/routes.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/routes.php b/include/routes.php
index d0ec30f0..50a4074a 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -92,10 +92,7 @@
 
     // Admin index
     $feather->get('(/action/:action)(/)', '\controller\admin\index:display');
-<<<<<<< HEAD
-=======
     $feather->get('/index(/)', '\controller\admin\index:display');
->>>>>>> featherbb/master
 
     // Admin bans
     $feather->group('/bans', function() use ($feather) {

From 12484630003a417cd8cb09fff282962e33f2c3fa Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 11 Aug 2015 12:45:50 +0200
Subject: [PATCH 009/353] Remove legacy DB layer

---
 Slim/Extras/Middleware/FeatherBB.php | 81 ++++++----------------------
 1 file changed, 16 insertions(+), 65 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index becb5752..9bc90f93 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -12,6 +12,7 @@
  */
 
 namespace Slim\Extras\Middleware;
+use DB;
 
 class FeatherBB extends \Slim\Middleware
 {
@@ -130,12 +131,12 @@ public function init_db()
         require_once $this->data['forum_env']['FEATHER_ROOT'].'include/idiorm.php';
 
         // TODO: handle drivers
-        \ORM::configure('mysql:host='.$this->data['forum_settings']['db_host'].';dbname='.$this->data['forum_settings']['db_name']);
-        \ORM::configure('username', $this->app->forum_settings['db_user']);
-        \ORM::configure('password', $this->app->forum_settings['db_pass']);
-        \ORM::configure('logging', true);
-        \ORM::configure('driver_options', array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-        \ORM::configure('id_column_overrides', array(
+        DB::configure('mysql:host='.$this->data['forum_settings']['db_host'].';dbname='.$this->data['forum_settings']['db_name']);
+        DB::configure('username', $this->app->forum_settings['db_user']);
+        DB::configure('password', $this->app->forum_settings['db_pass']);
+        DB::configure('logging', true);
+        DB::configure('driver_options', array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+        DB::configure('id_column_overrides', array(
             $this->app->forum_settings['db_prefix'].'groups' => 'g_id',
         ));
     }
@@ -159,7 +160,7 @@ public function authenticate()
                 $select_check_cookie = array('u.*', 'g.*', 'o.logged', 'o.idle');
                 $where_check_cookie = array('u.id' => intval($cookie['user_id']));
 
-                $result = \ORM::for_table($this->data['forum_settings']['db_prefix'].'users')
+                $result = DB::for_table($this->data['forum_settings']['db_prefix'].'users')
                     ->table_alias('u')
                     ->select_many($select_check_cookie)
                     ->inner_join($this->data['forum_settings']['db_prefix'].'groups', array('u.group_id', '=', 'g.g_id'), 'g')
@@ -200,7 +201,7 @@ public function authenticate()
         $select_set_default_user = array('u.*', 'g.*', 'o.logged', 'o.last_post', 'o.last_search');
         $where_set_default_user = array('u.id' => '1');
 
-        $result = \ORM::for_table($this->data['forum_settings']['db_prefix'].'users')
+        $result = DB::for_table($this->data['forum_settings']['db_prefix'].'users')
             ->table_alias('u')
             ->select_many($select_set_default_user)
             ->inner_join($this->data['forum_settings']['db_prefix'].'groups', array('u.group_id', '=', 'g.g_id'), 'g')
@@ -235,15 +236,15 @@ public function authenticate()
                 case 'mysqli_innodb':
                 case 'sqlite':
                 case 'sqlite3':
-                \ORM::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('REPLACE INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $remote_addr, ':logged' => $this->app->user->logged));
+                DB::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('REPLACE INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $remote_addr, ':logged' => $this->app->user->logged));
                     break;
 
                 default:
-                    \ORM::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('INSERT INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE ident=:ident)', array(':ident' => $remote_addr, ':logged' => $this->app->user->logged));
+                    DB::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('INSERT INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE ident=:ident)', array(':ident' => $remote_addr, ':logged' => $this->app->user->logged));
                     break;
             }
         } else {
-            \ORM::for_table($this->data['forum_settings']['db_prefix'].'online')->where('ident', $remote_addr)
+            DB::for_table($this->data['forum_settings']['db_prefix'].'online')->where('ident', $remote_addr)
                  ->update_many('logged', time());
         }
 
@@ -269,11 +270,11 @@ public function update_online()
                     case 'mysqli_innodb':
                     case 'sqlite':
                     case 'sqlite3':
-                        \ORM::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('REPLACE INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) VALUES(:user_id, :ident, :logged)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
+                        DB::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('REPLACE INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) VALUES(:user_id, :ident, :logged)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
                         break;
 
                     default:
-                        \ORM::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('INSERT INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) SELECT :user_id, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE user_id=:user_id)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
+                        DB::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('INSERT INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) SELECT :user_id, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE user_id=:user_id)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
                         break;
                 }
 
@@ -283,7 +284,7 @@ public function update_online()
             } else {
                 // Special case: We've timed out, but no other user has browsed the forums since we timed out
                 if ($this->app->user->logged < ($now-$this->data['forum_settings']['o_timeout_visit'])) {
-                    \ORM::for_table($this->data['forum_settings']['db_prefix'].'users')->where('id', $this->app->user->id)
+                    DB::for_table($this->data['forum_settings']['db_prefix'].'users')->where('id', $this->app->user->id)
                         ->find_one()
                         ->set('last_visit', $this->app->user->logged)
                         ->save();
@@ -292,7 +293,7 @@ public function update_online()
 
                 $idle_sql = ($this->app->user->idle == '1') ? ', idle=0' : '';
 
-                \ORM::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('UPDATE '.$this->data['forum_settings']['db_prefix'].'online SET logged='.$now.$idle_sql.' WHERE user_id=:user_id', array(':user_id' => $this->app->user->id));
+                DB::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('UPDATE '.$this->data['forum_settings']['db_prefix'].'online SET logged='.$now.$idle_sql.' WHERE user_id=:user_id', array(':user_id' => $this->app->user->id));
 
                 // Update tracked topics with the current expire time
                 $cookie_tracked_topics = $this->app->getCookie($this->data['forum_settings']['cookie_name'].'_track');
@@ -309,55 +310,6 @@ public function update_online()
 
     //
 
-    public function init_db_legacy()
-    {
-        switch ($this->app->forum_settings['db_type']) {
-            case 'mysql':
-                require_once FEATHER_ROOT.'include/dblayer/mysql.php';
-                break;
-
-            case 'mysql_innodb':
-                require_once FEATHER_ROOT.'include/dblayer/mysql_innodb.php';
-                break;
-
-            case 'mysqli':
-                require_once FEATHER_ROOT.'include/dblayer/mysqli.php';
-                break;
-
-            case 'mysqli_innodb':
-                require_once FEATHER_ROOT.'include/dblayer/mysqli_innodb.php';
-                break;
-
-            case 'pgsql':
-                require_once FEATHER_ROOT.'include/dblayer/pgsql.php';
-                break;
-
-            case 'sqlite':
-                require_once FEATHER_ROOT.'include/dblayer/sqlite.php';
-                break;
-
-            case 'sqlite3':
-                require_once FEATHER_ROOT.'include/dblayer/sqlite3.php';
-                break;
-
-            default:
-                error('\''.$db_type.'\' is not a valid database type. Please check settings in config.php.', __FILE__, __LINE__);
-                break;
-        }
-
-        $this->app->container->singleton('db', function () {
-            // Create the database adapter object (and open/connect to/select db)
-            return new \DBLayer($this->app->forum_settings['db_host'],
-                               $this->app->forum_settings['db_user'],
-                               $this->app->forum_settings['db_pass'],
-                               $this->app->forum_settings['db_name'],
-                               $this->app->forum_settings['db_prefix'],
-                               false);
-        });
-        $this->app->db->start_transaction();
-        $this->app->prefix = $this->app->forum_settings['db_prefix']; // But, why ? *insert GIF here*
-    }
-
     public function call()
     {
         global $lang_common, $feather_bans, $db_type, $cookie_name, $cookie_seed;
@@ -377,7 +329,6 @@ public function call()
 
             $this->set_headers();
             $this->init_db();
-            $this->init_db_legacy();
 
             require_once $this->app->forum_env['FEATHER_ROOT'].'include/utf8/utf8.php';
             require_once $this->app->forum_env['FEATHER_ROOT'].'include/functions.php';

From 96adbe4c3ac99625ecd1b8ae23d0b5142502f769 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 11 Aug 2015 12:46:30 +0200
Subject: [PATCH 010/353] Fix functions conflicts

---
 include/functions.php | 102 ++----------------------------------------
 1 file changed, 4 insertions(+), 98 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index ff769a27..37daba59 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+
+
 //
 // Return current timestamp (with microseconds) as a float
 //
@@ -17,8 +19,6 @@ function get_microtime()
 }
 
 //
-<<<<<<< HEAD
-=======
 // Cookie stuff!
 //
 function check_cookie()
@@ -27,7 +27,7 @@ function check_cookie()
 
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
-    
+
     $now = time();
 
     // Get FeatherBB cookie
@@ -154,7 +154,6 @@ function set_preferences()
 
 
 //
->>>>>>> featherbb/master
 // Try to determine the current URL
 //
 function get_current_url($max_length = 0)
@@ -222,6 +221,7 @@ function get_base_url($support_https = false)
     return $base_url;
 }
 
+
 //
 // Fetch admin IDs
 //
@@ -245,8 +245,6 @@ function get_admin_ids()
 
 
 //
-<<<<<<< HEAD
-=======
 // Fill $feather->user with default values (for guests)
 //
 function set_default_user()
@@ -312,7 +310,6 @@ function set_default_user()
 
 
 //
->>>>>>> featherbb/master
 // Wrapper for Slim setCookie method
 //
 function feather_setcookie($user_id, $password, $expires)
@@ -328,10 +325,7 @@ function feather_setcookie($user_id, $password, $expires)
     $feather->setCookie($cookie_name, json_encode($cookie_data), $expires);
 }
 
-<<<<<<< HEAD
-=======
 
->>>>>>> featherbb/master
 //
 // Check whether the connecting user is banned (and delete any expired bans while we're at it)
 //
@@ -358,11 +352,7 @@ function check_bans()
     foreach ($feather_bans as $cur_ban) {
         // Has this ban expired?
         if ($cur_ban['expire'] != '' && $cur_ban['expire'] <= time()) {
-<<<<<<< HEAD
-            \ORM::for_table($feather->db->prefix.'bans')->where('id', $cur_ban['id'])
-=======
             \DB::for_table('bans')->where('id', $cur_ban['id'])
->>>>>>> featherbb/master
                                                ->delete_many();
             $bans_altered = true;
             continue;
@@ -392,11 +382,7 @@ function check_bans()
         }
 
         if ($is_banned) {
-<<<<<<< HEAD
-            \ORM::for_table($feather->db->prefix.'online')->where('ident', $feather->user->username)
-=======
             \DB::for_table('online')->where('ident', $feather->user->username)
->>>>>>> featherbb/master
                                                  ->delete_many();
             message($lang_common['Ban message'].' '.(($cur_ban['expire'] != '') ? $lang_common['Ban message 2'].' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? $lang_common['Ban message 3'].'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').$lang_common['Ban message 4'].' <a href="mailto:'.feather_escape($feather_config['o_admin_email']).'">'.feather_escape($feather_config['o_admin_email']).'</a>.', true, true, true);
         }
@@ -449,11 +435,7 @@ function check_username($username, $errors, $exclude_id = null)
     // Check that the username (or a too similar username) is not already registered
     $query = (!is_null($exclude_id)) ? ' AND id!='.$exclude_id : '';
 
-<<<<<<< HEAD
-    $result = \ORM::for_table($feather->db->prefix.'online')->raw_query('SELECT username FROM '.$feather->db->prefix.'users WHERE (UPPER(username)=UPPER(:username1) OR UPPER(username)=UPPER(:username2)) AND id>1'.$query, array(':username1' => $username, ':username2' => ucp_preg_replace('%[^\p{L}\p{N}]%u', '', $username)))->find_one();
-=======
     $result = \DB::for_table('online')->raw_query('SELECT username FROM '.$feather->prefix.'users WHERE (UPPER(username)=UPPER(:username1) OR UPPER(username)=UPPER(:username2)) AND id>1'.$query, array(':username1' => $username, ':username2' => ucp_preg_replace('%[^\p{L}\p{N}]%u', '', $username)))->find_one();
->>>>>>> featherbb/master
 
     if ($result) {
         $busy = $result['username'];
@@ -477,47 +459,20 @@ function check_username($username, $errors, $exclude_id = null)
 //
 function update_users_online()
 {
-<<<<<<< HEAD
-    global $db;
-=======
     global $feather, $feather_config;
->>>>>>> featherbb/master
 
     $now = time();
 
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
     // Fetch all online list entries that are older than "o_timeout_online"
     $select_update_users_online = array('user_id', 'ident', 'logged', 'idle');
 
-<<<<<<< HEAD
-    $result = \ORM::for_table($feather->db->prefix.'online')->select_many($select_update_users_online)
-        ->where_lt('logged', $now - $feather->config['o_timeout_online'])
-=======
     $result = \DB::for_table('online')->select_many($select_update_users_online)
         ->where_lt('logged', $now-$feather_config['o_timeout_online'])
->>>>>>> featherbb/master
         ->find_many();
 
     foreach ($result as $cur_user) {
         // If the entry is a guest, delete it
         if ($cur_user['user_id'] == '1') {
-<<<<<<< HEAD
-            \ORM::for_table($feather->db->prefix.'online')->where('ident', $cur_user['ident'])
-                                                 ->delete_many();
-        } else {
-            // If the entry is older than "o_timeout_visit", update last_visit for the user in question, then delete him/her from the online list
-            if ($cur_user['logged'] < ($now-$feather->config['o_timeout_visit'])) {
-                \ORM::for_table($feather->db->prefix.'users')->where('id', $cur_user['user_id'])
-                        ->find_one()
-                        ->set('last_visit', $cur_user['logged'])
-                        ->save();
-                \ORM::for_table($feather->db->prefix.'online')->where('user_id', $cur_user['user_id'])
-                    ->delete_many();
-            } elseif ($cur_user['idle'] == '0') {
-                \ORM::for_table($feather->db->prefix.'online')->where('user_id', $cur_user['user_id'])
-=======
             \DB::for_table('online')->where('ident', $cur_user['ident'])
                                                  ->delete_many();
         } else {
@@ -531,7 +486,6 @@ function update_users_online()
                     ->delete_many();
             } elseif ($cur_user['idle'] == '0') {
                 \DB::for_table('online')->where('user_id', $cur_user['user_id'])
->>>>>>> featherbb/master
                         ->update_many('idle', 1);
             }
         }
@@ -635,11 +589,7 @@ function update_forum($forum_id)
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
 
-<<<<<<< HEAD
-    $stats_query = \ORM::for_table($feather->db->prefix.'topics')
-=======
     $stats_query = \DB::for_table('topics')
->>>>>>> featherbb/master
                     ->where('forum_id', $forum_id)
                     ->select_expr('COUNT(id)', 'total_topics')
                     ->select_expr('SUM(num_replies)', 'total_replies')
@@ -652,11 +602,7 @@ function update_forum($forum_id)
 
     $select_update_forum = array('last_post', 'last_post_id', 'last_poster');
 
-<<<<<<< HEAD
-    $result = \ORM::for_table($feather->db->prefix.'topics')->select_many($select_update_forum)
-=======
     $result = \DB::for_table('topics')->select_many($select_update_forum)
->>>>>>> featherbb/master
         ->where('forum_id', $forum_id)
         ->where_null('moved_to')
         ->order_by_desc('last_post')
@@ -681,11 +627,7 @@ function update_forum($forum_id)
             'last_poster'  => 'NULL',
         );
     }
-<<<<<<< HEAD
-        \ORM::for_table($feather->db->prefix.'forums')
-=======
         \DB::for_table('forums')
->>>>>>> featherbb/master
             ->where('id', $forum_id)
             ->find_one()
             ->set($insert_update_forum)
@@ -725,29 +667,17 @@ function delete_topic($topic_id)
             array('moved_to' => $topic_id)
         );
 
-<<<<<<< HEAD
-    \ORM::for_table($feather->db->prefix.'topics')
-=======
     \DB::for_table('topics')
->>>>>>> featherbb/master
         ->where_any_is($where_delete_topic)
         ->delete_many();
 
     // Delete posts in topic
-<<<<<<< HEAD
-    \ORM::for_table($feather->db->prefix.'posts')
-=======
     \DB::for_table('posts')
->>>>>>> featherbb/master
         ->where('topic_id', $topic_id)
         ->delete_many();
 
     // Delete any subscriptions for this topic
-<<<<<<< HEAD
-    \ORM::for_table($feather->db->prefix.'topic_subscriptions')
-=======
     \DB::for_table('topic_subscriptions')
->>>>>>> featherbb/master
         ->where('topic_id', $topic_id)
         ->delete_many();
 }
@@ -761,11 +691,7 @@ function delete_post($post_id, $topic_id)
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
 
-<<<<<<< HEAD
-    $result = \ORM::for_table($feather->db->prefix.'posts')
-=======
     $result = \DB::for_table('posts')
->>>>>>> featherbb/master
                   ->select_many('id', 'poster', 'posted')
                   ->where('topic_id', $topic_id)
                   ->order_by_desc('id')
@@ -786,11 +712,7 @@ function delete_post($post_id, $topic_id)
    }
 
     // Delete the post
-<<<<<<< HEAD
-    \ORM::for_table($feather->db->prefix.'posts')
-=======
     \DB::for_table('posts')
->>>>>>> featherbb/master
         ->where('id', $post_id)
         ->find_one()
         ->delete();
@@ -798,11 +720,7 @@ function delete_post($post_id, $topic_id)
     strip_search_index($post_id);
 
     // Count number of replies in the topic
-<<<<<<< HEAD
-    $num_replies = \ORM::for_table($feather->db->prefix.'posts')->where('topic_id', $topic_id)->count() - 1;
-=======
     $num_replies = \DB::for_table('posts')->where('topic_id', $topic_id)->count() - 1;
->>>>>>> featherbb/master
 
     // If the message we deleted is the most recent in the topic (at the end of the topic)
     if ($last_id == $post_id) {
@@ -814,22 +732,14 @@ function delete_post($post_id, $topic_id)
                 'last_poster'  => $second_poster,
                 'num_replies'  => $num_replies,
             );
-<<<<<<< HEAD
-            \ORM::for_table($feather->db->prefix.'topics')
-=======
             \DB::for_table('topics')
->>>>>>> featherbb/master
                 ->where('id', $topic_id)
                 ->find_one()
                 ->set($update_topic)
                 ->save();
         } else {
             // We deleted the only reply, so now last_post/last_post_id/last_poster is posted/id/poster from the topic itself
-<<<<<<< HEAD
-            \ORM::for_table($feather->db->prefix.'topics')
-=======
             \DB::for_table('topics')
->>>>>>> featherbb/master
                 ->where('id', $topic_id)
                 ->find_one()
                 ->set_expr('last_post', 'posted')
@@ -840,11 +750,7 @@ function delete_post($post_id, $topic_id)
         }
     } else {
         // Otherwise we just decrement the reply counter
-<<<<<<< HEAD
-        \ORM::for_table($feather->db->prefix.'topics')
-=======
         \DB::for_table('topics')
->>>>>>> featherbb/master
             ->where('id', $topic_id)
             ->find_one()
             ->set('num_replies', $num_replies)

From 6f249c46acbd72b4f266f9af13bf4bcbc3d9e045 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 11 Aug 2015 12:47:24 +0200
Subject: [PATCH 011/353] Remove common file

---
 include/common.php | 177 ---------------------------------------------
 1 file changed, 177 deletions(-)
 delete mode 100644 include/common.php

diff --git a/include/common.php b/include/common.php
deleted file mode 100644
index 5839de44..00000000
--- a/include/common.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-if (!defined('FEATHER_ROOT')) {
-    exit('The constant FEATHER_ROOT must be defined and point to a valid FeatherBB installation root directory.');
-}
-
-// Define the version and database revision that this code was written for
-define('FORUM_VERSION', '1.0.0');
-
-define('FORUM_DB_REVISION', 21);
-define('FORUM_SI_REVISION', 2);
-define('FORUM_PARSER_REVISION', 2);
-
-// Attempt to load the configuration file config.php
-if (file_exists(FEATHER_ROOT.'include/config.php')) {
-    require FEATHER_ROOT.'include/config.php';
-}
-
-// Load the functions script
-require FEATHER_ROOT.'include/functions.php';
-
-// Load UTF-8 functions
-require FEATHER_ROOT.'include/utf8/utf8.php';
-
-// Strip out "bad" UTF-8 characters
-forum_remove_bad_characters();
-
-// Reverse the effect of register_globals
-forum_unregister_globals();
-
-// If FEATHER isn't defined, config.php is missing or corrupt
-if (!defined('FEATHER')) {
-    header('Location: '.$feather->request->getPath().'install/index.php');
-    exit;
-}
-
-// Record the start time (will be used to calculate the generation time for the page)
-$feather->start = get_microtime();
-
-// Make sure PHP reports all errors except E_NOTICE. FluxBB supports E_ALL, but a lot of scripts it may interact with, do not
-//error_reporting(E_ALL ^ E_NOTICE);
-error_reporting(E_ALL); // Let's report everything for development
-
-// Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
-setlocale(LC_CTYPE, 'C');
-
-// Turn off magic_quotes_runtime
-if (get_magic_quotes_runtime()) {
-    set_magic_quotes_runtime(0);
-}
-
-// If a cookie name is not specified in config.php, we use the default (pun_cookie)
-if (empty($cookie_name)) {
-    $cookie_name = 'feather_cookie';
-}
-
-// If the cache directory is not specified, we use the default setting
-if (!defined('FORUM_CACHE_DIR')) {
-    define('FORUM_CACHE_DIR', FEATHER_ROOT.'cache/');
-}
-
-// Define a few commonly used constants
-define('FEATHER_UNVERIFIED', 0);
-define('FEATHER_ADMIN', 1);
-define('FEATHER_MOD', 2);
-define('FEATHER_GUEST', 3);
-define('FEATHER_MEMBER', 4);
-
-// Inject DB prefix to SlimFramework
-$feather->prefix = $db_prefix;
-
-// Include Idiorm
-require FEATHER_ROOT.'include/idiorm.php';
-
-// TODO: handle drivers
-\DB::configure('mysql:host='.$db_host.';dbname='.$db_name);
-\DB::configure('username', $db_username);
-\DB::configure('password', $db_password);
-\DB::configure('logging', true);
-\DB::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-\DB::configure('id_column_overrides', array(
-    $db_prefix.'groups' => 'g_id',
-));
-
-// Load cached config
-if (file_exists(FORUM_CACHE_DIR.'cache_config.php')) {
-    include FORUM_CACHE_DIR.'cache_config.php';
-}
-
-if (!defined('FEATHER_CONFIG_LOADED')) {
-    if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-        require FEATHER_ROOT.'include/cache.php';
-    }
-
-    generate_config_cache();
-    require FORUM_CACHE_DIR.'cache_config.php';
-}
-
-// Inject config to SlimFramework
-$feather->config = $feather_config;
-
-// Enable output buffering
-if (!defined('FEATHER_DISABLE_BUFFERING')) {
-    // Should we use gzip output compression?
-    if ($feather->config['o_gzip'] && extension_loaded('zlib')) {
-        ob_start('ob_gzhandler');
-    } else {
-        ob_start();
-    }
-}
-
-// Define standard date/time formats
-$forum_time_formats = array($feather->config['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
-$forum_date_formats = array($feather->config['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
-
-// Check/update/set cookie and fetch user info
-check_cookie();
-
-// Attempt to load the common language file
-if (file_exists(FEATHER_ROOT.'lang/'.$feather->user->language.'/common.php')) {
-    include FEATHER_ROOT.'lang/'.$feather->user->language.'/common.php';
-} else {
-    die('There is no valid language pack \''.feather_escape($feather->user->language).'\' installed. Please reinstall a language of that name');
-}
-
-// Check if we are to display a maintenance message
-if ($feather->config['o_maintenance'] && $feather->user->g_id > FEATHER_ADMIN && !defined('FEATHER_TURN_OFF_MAINT')) {
-    maintenance_message();
-}
-
-// Load cached bans
-if (file_exists(FORUM_CACHE_DIR.'cache_bans.php')) {
-    include FORUM_CACHE_DIR.'cache_bans.php';
-}
-
-if (!defined('FEATHER_BANS_LOADED')) {
-    if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-        require FEATHER_ROOT.'include/cache.php';
-    }
-
-    generate_bans_cache();
-    require FORUM_CACHE_DIR.'cache_bans.php';
-}
-
-// Check if current user is banned
-check_bans();
-
-// Update online list
-update_users_online();
-
-// Check to see if we logged in without a cookie being set
-if ($feather->user->is_guest && isset($_GET['login'])) {
-    message($lang_common['No cookie']);
-}
-
-// 32kb should be more than enough for forum posts
-if (!defined('FEATHER_MAX_POSTSIZE')) {
-    define('FEATHER_MAX_POSTSIZE', 32768);
-}
-
-if (!defined('FEATHER_SEARCH_MIN_WORD')) {
-    define('FEATHER_SEARCH_MIN_WORD', 3);
-}
-if (!defined('FEATHER_SEARCH_MAX_WORD')) {
-    define('FEATHER_SEARCH_MAX_WORD', 20);
-}
-
-if (!defined('FORUM_MAX_COOKIE_SIZE')) {
-    define('FORUM_MAX_COOKIE_SIZE', 4048);
-}

From 2796630b7d55f53d4ab81b6b32082fda8ff6d368 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 11 Aug 2015 12:57:26 +0200
Subject: [PATCH 012/353] Prefer use of forum_settings array

---
 Slim/Extras/Middleware/FeatherBB.php | 31 ++++++++++++++--------------
 include/idiorm.php                   | 22 ++++++++++----------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 9bc90f93..0477c4b1 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -37,7 +37,8 @@ public function __construct(array $user_forum_settings = array())
                                     'FEATHER_MAX_POSTSIZE' => 32768,
                                     'FEATHER_SEARCH_MIN_WORD' => 3,
                                     'FEATHER_SEARCH_MAX_WORD' => 20,
-                                    'FORUM_MAX_COOKIE_SIZE' => 4048
+                                    'FORUM_MAX_COOKIE_SIZE' => 4048,
+                                    'FEATHER_SHOW_QUERIES' => 1
                                     );
 
         $this->data['forum_settings'] = array_merge(self::load_default_settings(), $this->load_forum_config(), $user_forum_settings);
@@ -137,7 +138,7 @@ public function init_db()
         DB::configure('logging', true);
         DB::configure('driver_options', array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
         DB::configure('id_column_overrides', array(
-            $this->app->forum_settings['db_prefix'].'groups' => 'g_id',
+            'groups' => 'g_id',
         ));
     }
 
@@ -160,11 +161,11 @@ public function authenticate()
                 $select_check_cookie = array('u.*', 'g.*', 'o.logged', 'o.idle');
                 $where_check_cookie = array('u.id' => intval($cookie['user_id']));
 
-                $result = DB::for_table($this->data['forum_settings']['db_prefix'].'users')
+                $result = DB::for_table('users')
                     ->table_alias('u')
                     ->select_many($select_check_cookie)
-                    ->inner_join($this->data['forum_settings']['db_prefix'].'groups', array('u.group_id', '=', 'g.g_id'), 'g')
-                    ->left_outer_join($this->data['forum_settings']['db_prefix'].'online', array('o.user_id', '=', 'u.id'), 'o')
+                    ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
+                    ->left_outer_join('online', array('o.user_id', '=', 'u.id'), 'o')
                     ->where($where_check_cookie)
                     ->find_result_set();
 
@@ -201,11 +202,11 @@ public function authenticate()
         $select_set_default_user = array('u.*', 'g.*', 'o.logged', 'o.last_post', 'o.last_search');
         $where_set_default_user = array('u.id' => '1');
 
-        $result = DB::for_table($this->data['forum_settings']['db_prefix'].'users')
+        $result = DB::for_table('users')
             ->table_alias('u')
             ->select_many($select_set_default_user)
-            ->inner_join($this->data['forum_settings']['db_prefix'].'groups', array('u.group_id', '=', 'g.g_id'), 'g')
-            ->left_outer_join($this->data['forum_settings']['db_prefix'].'online', array('o.ident', '=', $remote_addr), 'o', true)
+            ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
+            ->left_outer_join('online', array('o.ident', '=', $remote_addr), 'o', true)
             ->where($where_set_default_user)
             ->find_result_set();
 
@@ -236,15 +237,15 @@ public function authenticate()
                 case 'mysqli_innodb':
                 case 'sqlite':
                 case 'sqlite3':
-                DB::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('REPLACE INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $remote_addr, ':logged' => $this->app->user->logged));
+                DB::for_table('online')->raw_execute('REPLACE INTO online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $remote_addr, ':logged' => $this->app->user->logged));
                     break;
 
                 default:
-                    DB::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('INSERT INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE ident=:ident)', array(':ident' => $remote_addr, ':logged' => $this->app->user->logged));
+                    DB::for_table('online')->raw_execute('INSERT INTO online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE ident=:ident)', array(':ident' => $remote_addr, ':logged' => $this->app->user->logged));
                     break;
             }
         } else {
-            DB::for_table($this->data['forum_settings']['db_prefix'].'online')->where('ident', $remote_addr)
+            DB::for_table('online')->where('ident', $remote_addr)
                  ->update_many('logged', time());
         }
 
@@ -270,11 +271,11 @@ public function update_online()
                     case 'mysqli_innodb':
                     case 'sqlite':
                     case 'sqlite3':
-                        DB::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('REPLACE INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) VALUES(:user_id, :ident, :logged)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
+                        DB::for_table('online')->raw_execute('REPLACE INTO online (user_id, ident, logged) VALUES(:user_id, :ident, :logged)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
                         break;
 
                     default:
-                        DB::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('INSERT INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) SELECT :user_id, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE user_id=:user_id)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
+                        DB::for_table('online')->raw_execute('INSERT INTO online (user_id, ident, logged) SELECT :user_id, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE user_id=:user_id)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
                         break;
                 }
 
@@ -284,7 +285,7 @@ public function update_online()
             } else {
                 // Special case: We've timed out, but no other user has browsed the forums since we timed out
                 if ($this->app->user->logged < ($now-$this->data['forum_settings']['o_timeout_visit'])) {
-                    DB::for_table($this->data['forum_settings']['db_prefix'].'users')->where('id', $this->app->user->id)
+                    DB::for_table('users')->where('id', $this->app->user->id)
                         ->find_one()
                         ->set('last_visit', $this->app->user->logged)
                         ->save();
@@ -293,7 +294,7 @@ public function update_online()
 
                 $idle_sql = ($this->app->user->idle == '1') ? ', idle=0' : '';
 
-                DB::for_table($this->data['forum_settings']['db_prefix'].'online')->raw_execute('UPDATE '.$this->data['forum_settings']['db_prefix'].'online SET logged='.$now.$idle_sql.' WHERE user_id=:user_id', array(':user_id' => $this->app->user->id));
+                DB::for_table('online')->raw_execute('UPDATE online SET logged='.$now.$idle_sql.' WHERE user_id=:user_id', array(':user_id' => $this->app->user->id));
 
                 // Update tracked topics with the current expire time
                 $cookie_tracked_topics = $this->app->getCookie($this->data['forum_settings']['cookie_name'].'_track');
diff --git a/include/idiorm.php b/include/idiorm.php
index 64768fd3..5e1c7f20 100644
--- a/include/idiorm.php
+++ b/include/idiorm.php
@@ -225,7 +225,7 @@ public static function reset_config()
         {
             self::$_config = array();
         }
-        
+
         /**
          * Despite its slightly odd name, this is actually the factory
          * method used to acquire instances of the class. It is named
@@ -239,7 +239,7 @@ public static function reset_config()
         public static function for_table($table_name, $connection_name = self::DEFAULT_CONNECTION)
         {
             $feather = \Slim\Slim::getInstance();
-            $table_name = $feather->prefix.$table_name;
+            $table_name = $feather->forum_settings['db_prefix'].$table_name;
             self::_setup_db($connection_name);
             return new self($table_name, array(), $connection_name);
         }
@@ -507,12 +507,12 @@ protected static function _log_query($query, $parameters, $connection_name, $que
             self::$_last_query = $bound_query;
             self::$_query_log[$connection_name][0][] = $query_time;
             self::$_query_log[$connection_name][1][] = $bound_query;
-            
+
             if(is_callable(self::$_config[$connection_name]['logger'])){
                 $logger = self::$_config[$connection_name]['logger'];
                 $logger($bound_query, $query_time);
             }
-            
+
             return true;
         }
 
@@ -1020,7 +1020,7 @@ public function distinct()
          * ON `user`.`id` = `profile`.`user_id`
          *
          * The fourth argument specifies an alias for the joined table.
-         * 
+         *
          * The final argument specifies is the last column should be escaped
          */
         protected function _add_join_source($join_operator, $table, $constraint, $table_alias=null, $no_escape_second_col=false)
@@ -1286,7 +1286,7 @@ protected function _create_placeholders($fields)
                 return implode(', ', $db_fields);
             }
         }
-        
+
         /**
          * Helper method that filters a column/value array returning only those
          * columns that belong to a compound primary key.
@@ -1518,7 +1518,7 @@ public function where_raw($clause, $parameters=array())
         {
             return $this->_add_where($clause, $parameters);
         }
-        
+
         /**
          * Add a LIMIT to the query
          */
@@ -1570,7 +1570,7 @@ public function order_by($column_name, $dir=null)
         {
             return $this->_add_order_by($column_name, $dir);
         }
-        
+
         /**
          * Add columns to the list of columns returned by the ORDER BY
          * query. This defaults to '*'. Many columns can be supplied
@@ -1596,7 +1596,7 @@ public function order_by_many()
             }
             return $this;
         }
-        
+
         /**
          * Add an unquoted expression as an ORDER BY clause
          */
@@ -2653,7 +2653,7 @@ public function as_array()
         {
             return $this->get_results();
         }
-        
+
         /**
          * Get the number of records in the result set
          * @return int
@@ -2692,7 +2692,7 @@ public function offsetGet($offset)
         {
             return $this->_results[$offset];
         }
-        
+
         /**
          * ArrayAccess
          * @param int|string $offset

From d5ec8bb253bcbe313332d11de06d5900486f7c61 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 11 Aug 2015 17:06:00 +0200
Subject: [PATCH 013/353] Fix cookie not decrypted

---
 Slim/Extras/Middleware/FeatherBB.php | 44 ++++++++++++----------------
 index.php                            |  5 +++-
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 0477c4b1..2aed6af0 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -41,7 +41,8 @@ public function __construct(array $user_forum_settings = array())
                                     'FEATHER_SHOW_QUERIES' => 1
                                     );
 
-        $this->data['forum_settings'] = array_merge(self::load_default_settings(), $this->load_forum_config(), $user_forum_settings);
+        $this->data['forum_settings'] = array_merge(self::load_default_settings(), $user_forum_settings);
+        $this->init_db();
 	}
 
     public function load_forum_config()
@@ -53,7 +54,7 @@ public function load_forum_config()
         } else {
             require_once $this->data['forum_env']['FEATHER_ROOT'].'include/cache.php';
             generate_config_cache();
-            require $this->data['forum_env']['FEATHER_ROOT'].'cache_config.php';
+            require $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php';
         }
         return $feather_config;
     }
@@ -91,7 +92,6 @@ public function set_forum_settings($key, $value = null)
         foreach ($tmp as $key => $value) {
             $this->app->container->get('forum_settings')[$key] = $value;
         }
-
     }
 
     public function hydrate($data)
@@ -109,8 +109,6 @@ public function env_to_globals(array $vars)
         }
     }
 
-    //
-
     public function set_headers()
     {
         // No cache headers
@@ -128,13 +126,13 @@ public function set_headers()
 
     public function init_db()
     {
-        // Include IdiORM
+        // Include ORM
         require_once $this->data['forum_env']['FEATHER_ROOT'].'include/idiorm.php';
 
         // TODO: handle drivers
         DB::configure('mysql:host='.$this->data['forum_settings']['db_host'].';dbname='.$this->data['forum_settings']['db_name']);
-        DB::configure('username', $this->app->forum_settings['db_user']);
-        DB::configure('password', $this->app->forum_settings['db_pass']);
+        DB::configure('username', $this->data['forum_settings']['db_user']);
+        DB::configure('password', $this->data['forum_settings']['db_pass']);
         DB::configure('logging', true);
         DB::configure('driver_options', array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
         DB::configure('id_column_overrides', array(
@@ -148,15 +146,13 @@ public function authenticate()
 
         // Get FeatherBB cookie
         $cookie_raw = $this->app->getCookie($this->data['forum_settings']['cookie_name']);
-
+        var_dump($cookie_raw);
         // Check if cookie exists and is valid (getCookie method returns false if the data has been tampered locally so it can't decrypt the cookie);
         if (isset($cookie_raw)) {
             $cookie = json_decode($cookie_raw, true);
             $checksum = hash_hmac('sha1', $cookie['user_id'].$cookie['expires'], $this->data['forum_settings']['cookie_seed'].'_checksum');
-
             // If cookie has a non-guest user, hasn't expired and is legit
             if ($cookie['user_id'] > 1 && $cookie['expires'] > $now && $checksum == $cookie['checksum']) {
-
                 // Get user info from db
                 $select_check_cookie = array('u.*', 'g.*', 'o.logged', 'o.idle');
                 $where_check_cookie = array('u.id' => intval($cookie['user_id']));
@@ -194,6 +190,7 @@ public function authenticate()
                 }
             }
         }
+
         // If there is no cookie, or cookie is guest or expired, let's reconnect.
         $expires = $now + 31536000; // The cookie expires after a year
         $remote_addr = get_remote_address();
@@ -313,28 +310,27 @@ public function update_online()
 
     public function call()
     {
-        global $lang_common, $feather_bans, $db_type, $cookie_name, $cookie_seed;
+        global $lang_common, $feather_bans, $db_type, $cookie_name, $cookie_seed; // Legacy
 
-        // Block prefetch requests
-        if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) {
+        if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) { // Block prefetch requests
             $this->set_headers();
             $this->app->response->setStatus(403);
         } else {
+            $this->env_to_globals($this->data['forum_env']); // Legacy : define globals from forum_env
+
+            require_once $this->app->forum_env['FEATHER_ROOT'].'include/utf8/utf8.php';
+            require_once $this->app->forum_env['FEATHER_ROOT'].'include/functions.php';
+
             // Populate Feather object
+            $this->data['forum_settings'] = array_merge($this->load_forum_config(), $this->data['forum_settings']);
             $this->hydrate($this->data);
 
-            // Legacy
-            $this->env_to_globals($this->app->forum_env);
-            $this->app->config = $this->data['forum_settings'];
-            extract($this->data['forum_settings']);
+            $this->app->config = $this->data['forum_settings']; // Legacy
+            extract($this->data['forum_settings']); // Legacy
 
             $this->set_headers();
-            $this->init_db();
-
-            require_once $this->app->forum_env['FEATHER_ROOT'].'include/utf8/utf8.php';
-            require_once $this->app->forum_env['FEATHER_ROOT'].'include/functions.php';
 
-            // TODO : check useness
+            // TODO : check usefulness
             // Strip out "bad" UTF-8 characters
             forum_remove_bad_characters();
             // Reverse the effect of register_globals
@@ -388,8 +384,6 @@ public function call()
             update_users_online();
 
             // Configure Slim
-            $this->app->config('cookies.encrypt', true);
-            $this->app->config('debug', true); // As long as we're developing FeatherBB
             $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? FEATHER_ROOT.'style/'.$this->app->user->style.'/view' : FEATHER_ROOT.'view');
             $this->next->call();
         }
diff --git a/index.php b/index.php
index 460159e8..b53037f2 100644
--- a/index.php
+++ b/index.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Start a session for flash messages
 session_cache_limiter(false);
 session_start();
@@ -33,5 +33,8 @@
 // Load the routes
 require 'include/routes.php';
 
+$feather->config('cookies.encrypt', true);
+$feather->config('debug', true); // As long as we're developing FeatherBB
+
 // Run it, baby!
 $feather->run();

From 46642be49b0df465f206da0df0c117371b43f698 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 11 Aug 2015 17:16:03 +0200
Subject: [PATCH 014/353] Tweaks and fixes

---
 Slim/Extras/Middleware/FeatherBB.php | 63 ++++++++++++++--------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 2aed6af0..a55887fd 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -20,6 +20,7 @@ class FeatherBB extends \Slim\Middleware
 
 	public function __construct(array $user_forum_settings = array())
 	{
+        // Define forum env constants
         $this->data['forum_env'] = array(
                                     'FEATHER' => true,
                                     'FEATHER_ROOT' => dirname(__FILE__).'/../../../',
@@ -41,8 +42,19 @@ public function __construct(array $user_forum_settings = array())
                                     'FEATHER_SHOW_QUERIES' => 1
                                     );
 
+        // Define forum settings / TODO : handle settings with a class / User input overrides all previous settings
         $this->data['forum_settings'] = array_merge(self::load_default_settings(), $user_forum_settings);
-        $this->init_db();
+
+        // Load DB settings
+        require_once $this->data['forum_env']['FEATHER_ROOT'].'include/idiorm.php';
+        DB::configure('mysql:host='.$this->data['forum_settings']['db_host'].';dbname='.$this->data['forum_settings']['db_name']);
+        DB::configure('username', $this->data['forum_settings']['db_user']);
+        DB::configure('password', $this->data['forum_settings']['db_pass']);
+        DB::configure('logging', true);
+        DB::configure('driver_options', array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+        DB::configure('id_column_overrides', array(
+            'groups' => 'g_id',
+        ));
 	}
 
     public function load_forum_config()
@@ -71,7 +83,9 @@ public static function load_default_settings()
                 'db_prefix' => '',
                 // Cookies
                 'cookie_name' => 'feather_cookie',
-                'cookie_seed' => 'changeme', // MUST BE CHANGED
+                'cookie_seed' => 'changeme', // MUST BE CHANGED !!!
+                // Debug
+                'debug' => false,
                 );
     }
 
@@ -101,7 +115,7 @@ public function hydrate($data)
         }
     }
 
-    // Legacy function, to ensure constants backward compatibility
+    // Legacy function, to ensure backward compatibility with globals
     public function env_to_globals(array $vars)
     {
         foreach ($vars as $key => $value) {
@@ -109,6 +123,8 @@ public function env_to_globals(array $vars)
         }
     }
 
+    // Headers
+
     public function set_headers()
     {
         // No cache headers
@@ -124,21 +140,7 @@ public function set_headers()
         $this->app->response->headers->set('X-Powered-By', $this->app->forum_env['FORUM_NAME']);
     }
 
-    public function init_db()
-    {
-        // Include ORM
-        require_once $this->data['forum_env']['FEATHER_ROOT'].'include/idiorm.php';
-
-        // TODO: handle drivers
-        DB::configure('mysql:host='.$this->data['forum_settings']['db_host'].';dbname='.$this->data['forum_settings']['db_name']);
-        DB::configure('username', $this->data['forum_settings']['db_user']);
-        DB::configure('password', $this->data['forum_settings']['db_pass']);
-        DB::configure('logging', true);
-        DB::configure('driver_options', array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-        DB::configure('id_column_overrides', array(
-            'groups' => 'g_id',
-        ));
-    }
+    // Auth
 
     public function authenticate()
     {
@@ -146,7 +148,6 @@ public function authenticate()
 
         // Get FeatherBB cookie
         $cookie_raw = $this->app->getCookie($this->data['forum_settings']['cookie_name']);
-        var_dump($cookie_raw);
         // Check if cookie exists and is valid (getCookie method returns false if the data has been tampered locally so it can't decrypt the cookie);
         if (isset($cookie_raw)) {
             $cookie = json_decode($cookie_raw, true);
@@ -193,7 +194,6 @@ public function authenticate()
 
         // If there is no cookie, or cookie is guest or expired, let's reconnect.
         $expires = $now + 31536000; // The cookie expires after a year
-        $remote_addr = get_remote_address();
 
         // Fetch guest user
         $select_set_default_user = array('u.*', 'g.*', 'o.logged', 'o.last_post', 'o.last_search');
@@ -203,7 +203,7 @@ public function authenticate()
             ->table_alias('u')
             ->select_many($select_set_default_user)
             ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
-            ->left_outer_join('online', array('o.ident', '=', $remote_addr), 'o', true)
+            ->left_outer_join('online', array('o.ident', '=', get_remote_address()), 'o', true)
             ->where($where_set_default_user)
             ->find_result_set();
 
@@ -310,7 +310,7 @@ public function update_online()
 
     public function call()
     {
-        global $lang_common, $feather_bans, $db_type, $cookie_name, $cookie_seed; // Legacy
+        global $lang_common, $feather_bans, $db_type, $cookie_name, $cookie_seed, $forum_time_formats, $forum_date_formats; // Legacy
 
         if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) { // Block prefetch requests
             $this->set_headers();
@@ -318,11 +318,12 @@ public function call()
         } else {
             $this->env_to_globals($this->data['forum_env']); // Legacy : define globals from forum_env
 
-            require_once $this->app->forum_env['FEATHER_ROOT'].'include/utf8/utf8.php';
-            require_once $this->app->forum_env['FEATHER_ROOT'].'include/functions.php';
+            require_once $this->data['forum_env']['FEATHER_ROOT'].'include/utf8/utf8.php';
+            require_once $this->data['forum_env']['FEATHER_ROOT'].'include/functions.php';
 
-            // Populate Feather object
+            // Get forum config
             $this->data['forum_settings'] = array_merge($this->load_forum_config(), $this->data['forum_settings']);
+            // Populate Feather object (Slim instance)
             $this->hydrate($this->data);
 
             $this->app->config = $this->data['forum_settings']; // Legacy
@@ -352,8 +353,8 @@ public function call()
             $this->authenticate();
 
             // Attempt to load the common language file
-            if (file_exists($this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php')) {
-                include $this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php';
+            if (file_exists($this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php')) {
+                include $this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php';
             } else {
                 die('There is no valid language pack \''.feather_escape($this->app->user->language).'\' installed. Please reinstall a language of that name');
             }
@@ -364,17 +365,17 @@ public function call()
             }
 
             // Load cached bans
-            if (file_exists($this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php')) {
-                include $this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php';
+            if (file_exists($this->data['forum_env']['FORUM_CACHE_DIR'].'cache_bans.php')) {
+                include $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_bans.php';
             }
 
             if (!defined('FEATHER_BANS_LOADED')) {
                 if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                    require_once $this->app->forum_env['FEATHER_ROOT'].'include/cache.php';
+                    require_once $this->data['forum_env']['FEATHER_ROOT'].'include/cache.php';
                 }
 
                 generate_bans_cache();
-                require_once $this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php';
+                require_once $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_bans.php';
             }
 
             // Check if current user is banned

From 58faf33be95939f1be8b400fc5fc9370b1512df8 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 11 Aug 2015 17:48:33 +0200
Subject: [PATCH 015/353] Drop "remove_bad_characters" and "unregister_globals"
 functions

UTF 8 is handled by Slim
register_globals is disabled as of PHP 5.3+
---
 Slim/Extras/Middleware/FeatherBB.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index a55887fd..e7c8cc55 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -331,11 +331,11 @@ public function call()
 
             $this->set_headers();
 
-            // TODO : check usefulness
-            // Strip out "bad" UTF-8 characters
-            forum_remove_bad_characters();
-            // Reverse the effect of register_globals
-            forum_unregister_globals();
+            // // TODO : check usefulness
+            // // Strip out "bad" UTF-8 characters
+            // forum_remove_bad_characters();
+            // // Reverse the effect of register_globals
+            // forum_unregister_globals();
 
             // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
             setlocale(LC_CTYPE, 'C');

From 98407d656a0ccabb2f5b224758b4695dd42d1bd8 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 11 Aug 2015 17:58:05 +0200
Subject: [PATCH 016/353] Drop magic quotes runtime check

Slim handles magic quotes
---
 Slim/Extras/Middleware/FeatherBB.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index e7c8cc55..27a81d5d 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -331,21 +331,9 @@ public function call()
 
             $this->set_headers();
 
-            // // TODO : check usefulness
-            // // Strip out "bad" UTF-8 characters
-            // forum_remove_bad_characters();
-            // // Reverse the effect of register_globals
-            // forum_unregister_globals();
-
             // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
             setlocale(LC_CTYPE, 'C');
 
-            // TODO : magic quotes
-            // Turn off magic_quotes_runtime
-            if (get_magic_quotes_runtime()) {
-                set_magic_quotes_runtime(0);
-            }
-
             // Define time formats
             $forum_time_formats = array($this->app->config['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
             $forum_date_formats = array($this->app->config['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');

From 90f0bf0aac57fed4ce4005fe6b4da071dabeb9c3 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 11 Aug 2015 18:00:40 +0200
Subject: [PATCH 017/353] Various typos

---
 Slim/Extras/Middleware/FeatherBB.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 27a81d5d..17e0b35c 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -172,7 +172,7 @@ public function authenticate()
                 if (isset($this->app->user->id) && hash_hmac('sha1', $this->app->user->password, $this->data['forum_settings']['cookie_seed'].'_password_hash') === $cookie['password_hash']) {
                     $expires = ($cookie['expires'] > $now + $this->data['forum_settings']['o_timeout_visit']) ? $now + 1209600 : $now + $this->data['forum_settings']['o_timeout_visit'];
                     $this->app->user->is_guest = false;
-                    $this->app->user->is_admmod = $this->app->user->g_id == FEATHER_ADMIN || $this->app->g_moderator == '1';
+                    $this->app->user->is_admmod = $this->app->user->g_id == $this->data['forum_env']['FEATHER_ADMIN'] || $this->app->g_moderator == '1';
                     if (!$this->app->user->disp_topics) {
                         $this->app->user->disp_topics = $this->data['forum_settings']['o_disp_topics_default'];
                     }
@@ -323,6 +323,9 @@ public function call()
 
             // Get forum config
             $this->data['forum_settings'] = array_merge($this->load_forum_config(), $this->data['forum_settings']);
+            // Define time formats
+            $forum_time_formats = array($this->data['forum_settings']['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
+            $forum_date_formats = array($this->data['forum_settings']['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
             // Populate Feather object (Slim instance)
             $this->hydrate($this->data);
 
@@ -334,10 +337,6 @@ public function call()
             // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
             setlocale(LC_CTYPE, 'C');
 
-            // Define time formats
-            $forum_time_formats = array($this->app->config['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
-            $forum_date_formats = array($this->app->config['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
-
             $this->authenticate();
 
             // Attempt to load the common language file
@@ -348,7 +347,7 @@ public function call()
             }
 
             // Check if we are to display a maintenance message
-            if ($this->app->config['o_maintenance'] && $this->app->user->g_id > FEATHER_ADMIN && !defined('FEATHER_TURN_OFF_MAINT')) {
+            if ($this->data['forum_settings']['o_maintenance'] && $this->app->user->g_id > $this->data['forum_env']['FEATHER_ADMIN'] && !defined('FEATHER_TURN_OFF_MAINT')) {
                 maintenance_message();
             }
 

From 86906209fa766cfb84e05ccd53b568f27e6cd7c9 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 11 Aug 2015 18:06:14 +0200
Subject: [PATCH 018/353] Fix get remote ip feature

---
 Slim/Extras/Middleware/FeatherBB.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 17e0b35c..8772b38b 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -203,7 +203,7 @@ public function authenticate()
             ->table_alias('u')
             ->select_many($select_set_default_user)
             ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
-            ->left_outer_join('online', array('o.ident', '=', get_remote_address()), 'o', true)
+            ->left_outer_join('online', array('o.ident', '=', $this->app->request->getIp()), 'o', true)
             ->where($where_set_default_user)
             ->find_result_set();
 
@@ -234,15 +234,15 @@ public function authenticate()
                 case 'mysqli_innodb':
                 case 'sqlite':
                 case 'sqlite3':
-                DB::for_table('online')->raw_execute('REPLACE INTO online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $remote_addr, ':logged' => $this->app->user->logged));
+                DB::for_table('online')->raw_execute('REPLACE INTO online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
                     break;
 
                 default:
-                    DB::for_table('online')->raw_execute('INSERT INTO online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE ident=:ident)', array(':ident' => $remote_addr, ':logged' => $this->app->user->logged));
+                    DB::for_table('online')->raw_execute('INSERT INTO online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE ident=:ident)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
                     break;
             }
         } else {
-            DB::for_table('online')->where('ident', $remote_addr)
+            DB::for_table('online')->where('ident', $this->app->request->getIp())
                  ->update_many('logged', time());
         }
 
@@ -317,7 +317,7 @@ public function call()
             $this->app->response->setStatus(403);
         } else {
             $this->env_to_globals($this->data['forum_env']); // Legacy : define globals from forum_env
-
+            
             require_once $this->data['forum_env']['FEATHER_ROOT'].'include/utf8/utf8.php';
             require_once $this->data['forum_env']['FEATHER_ROOT'].'include/functions.php';
 

From 498083b80d84f53683c89394bf0b081de815008d Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 12 Aug 2015 18:39:40 +0200
Subject: [PATCH 019/353] Remove whitespace

---
 include/routes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/routes.php b/include/routes.php
index 30ba1bb2..98449c5a 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 
 // Index
 $feather->get('/', '\controller\index:display');

From 78ec00e37cfa1a45aa778ef66a4f6804d040e514 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 12 Aug 2015 23:52:30 +0200
Subject: [PATCH 020/353] Start to switch to gettext

---
 controller/admin/bans.php                     |  18 +-
 controller/admin/categories.php               |  20 +-
 controller/admin/censoring.php                |   4 +-
 controller/admin/forums.php                   |  16 +-
 controller/admin/groups.php                   |  14 +-
 controller/admin/index.php                    |   4 +-
 controller/admin/maintenance.php              |   4 +-
 controller/admin/options.php                  |   4 +-
 controller/admin/parser.php                   |   4 +-
 controller/admin/permissions.php              |   4 +-
 controller/admin/plugins.php                  |   8 +-
 controller/admin/reports.php                  |   4 +-
 controller/admin/statistics.php               |   8 +-
 controller/admin/users.php                    |  24 +-
 controller/delete.php                         |   9 +-
 controller/edit.php                           |  11 +-
 controller/footer.php                         |   3 -
 controller/header.php                         |  41 +-
 controller/help.php                           |   5 +-
 controller/index.php                          |   5 +-
 controller/login.php                          |  16 +-
 controller/misc.php                           |  39 +-
 controller/moderate.php                       |  47 +-
 controller/post.php                           |  13 +-
 controller/profile.php                        |  94 ++--
 controller/register.php                       |   7 +-
 controller/search.php                         |   8 +-
 controller/userlist.php                       |  11 +-
 controller/viewforum.php                      |   9 +-
 controller/viewtopic.php                      |  20 +-
 extern.php                                    |  24 +-
 include/cache.php                             |   6 +-
 include/common.php                            |  15 +-
 include/email.php                             |   4 +-
 include/functions.php                         |  78 ++-
 include/l10n.php                              |  75 +++
 include/parser.php                            |  70 +--
 include/pomo/.editorconfig                    |  16 +
 include/pomo/MO.php                           | 313 +++++++++++
 include/pomo/PO.php                           | 494 ++++++++++++++++++
 include/pomo/Streams/CachedFileReader.php     |  25 +
 include/pomo/Streams/CachedIntFileReader.php  |  20 +
 include/pomo/Streams/FileReader.php           |  60 +++
 include/pomo/Streams/Reader.php               | 120 +++++
 include/pomo/Streams/StringReader.php         |  61 +++
 .../pomo/Translations/EntryTranslations.php   |  89 ++++
 .../pomo/Translations/GettextTranslations.php | 127 +++++
 .../pomo/Translations/NOOPTranslations.php    | 104 ++++
 include/pomo/Translations/Translations.php    | 173 ++++++
 .../Translations/TranslationsInterface.php    |  94 ++++
 include/routes.php                            |   4 +-
 install/index.php                             |   9 +-
 lang/English/common.mo                        | Bin 0 -> 9404 bytes
 lang/English/common.php                       | 184 -------
 lang/English/common.po                        | 473 +++++++++++++++++
 lang/English/convertor.php                    |  20 +
 model/admin/bans.php                          |   8 +-
 model/admin/groups.php                        |  10 +-
 model/admin/options.php                       |  14 +-
 model/admin/users.php                         |   6 +-
 model/delete.php                              |   4 +-
 model/edit.php                                |  10 +-
 model/index.php                               |  20 +-
 model/login.php                               |   4 +-
 model/misc.php                                |  34 +-
 model/moderate.php                            |  68 +--
 model/post.php                                |  22 +-
 model/profile.php                             |  72 +--
 model/register.php                            |   6 +-
 model/search.php                              |  34 +-
 model/viewforum.php                           |  26 +-
 model/viewtopic.php                           |  30 +-
 .../view/admin/groups/add_edit_group.php      |   2 +-
 style/FeatherBB/view/delete.php               |   4 +-
 style/FeatherBB/view/edit.php                 |  18 +-
 style/FeatherBB/view/footer.php               |  38 +-
 style/FeatherBB/view/header.php               |  10 +-
 style/FeatherBB/view/help.php                 |   4 +-
 style/FeatherBB/view/index.php                |   6 +-
 style/FeatherBB/view/login/form.php           |   8 +-
 .../view/login/password_forgotten.php         |   4 +-
 style/FeatherBB/view/message.php              |   4 +-
 style/FeatherBB/view/misc/email.php           |   6 +-
 style/FeatherBB/view/misc/report.php          |   6 +-
 .../FeatherBB/view/moderate/delete_posts.php  |   2 +-
 .../FeatherBB/view/moderate/delete_topics.php |   2 +-
 .../FeatherBB/view/moderate/merge_topics.php  |   2 +-
 .../view/moderate/moderator_forum.php         |  10 +-
 style/FeatherBB/view/moderate/move_topics.php |   2 +-
 style/FeatherBB/view/moderate/posts_view.php  |   6 +-
 style/FeatherBB/view/moderate/split_posts.php |   4 +-
 style/FeatherBB/view/post.php                 |  26 +-
 style/FeatherBB/view/profile/change_mail.php  |   6 +-
 style/FeatherBB/view/profile/change_pass.php  |   8 +-
 style/FeatherBB/view/profile/delete_user.php  |   2 +-
 .../view/profile/section_display.php          |   2 +-
 .../view/profile/section_essentials.php       |   2 +-
 .../view/profile/section_messaging.php        |   2 +-
 .../view/profile/section_personal.php         |   2 +-
 .../view/profile/section_personality.php      |  10 +-
 .../view/profile/section_privacy.php          |   2 +-
 .../FeatherBB/view/profile/upload_avatar.php  |   6 +-
 style/FeatherBB/view/profile/view_profile.php |   2 +-
 style/FeatherBB/view/register/email.php       |   6 +-
 style/FeatherBB/view/register/form.php        |  14 +-
 style/FeatherBB/view/search/footer.php        |   2 +-
 style/FeatherBB/view/search/form.php          |   2 +-
 style/FeatherBB/view/search/header.php        |  10 +-
 style/FeatherBB/view/search/topics.php        |   2 +-
 style/FeatherBB/view/userlist.php             |  18 +-
 style/FeatherBB/view/viewforum.php            |  10 +-
 style/FeatherBB/view/viewtopic.php            |  24 +-
 view/admin/groups/add_edit_group.php          |   2 +-
 view/delete.php                               |   4 +-
 view/edit.php                                 |  18 +-
 view/footer.php                               |  38 +-
 view/header.php                               |   8 +-
 view/help.php                                 |   4 +-
 view/index.php                                |   6 +-
 view/login/form.php                           |   8 +-
 view/login/password_forgotten.php             |   4 +-
 view/message.php                              |   4 +-
 view/misc/email.php                           |   6 +-
 view/misc/report.php                          |   6 +-
 view/moderate/delete_posts.php                |   2 +-
 view/moderate/delete_topics.php               |   2 +-
 view/moderate/merge_topics.php                |   2 +-
 view/moderate/moderator_forum.php             |  10 +-
 view/moderate/move_topics.php                 |   2 +-
 view/moderate/posts_view.php                  |   6 +-
 view/moderate/split_posts.php                 |   4 +-
 view/post.php                                 |  26 +-
 view/profile/change_mail.php                  |   6 +-
 view/profile/change_pass.php                  |   8 +-
 view/profile/delete_user.php                  |   2 +-
 view/profile/section_display.php              |   2 +-
 view/profile/section_essentials.php           |   2 +-
 view/profile/section_messaging.php            |   2 +-
 view/profile/section_personal.php             |   2 +-
 view/profile/section_personality.php          |  10 +-
 view/profile/section_privacy.php              |   2 +-
 view/profile/upload_avatar.php                |   6 +-
 view/profile/view_profile.php                 |   2 +-
 view/register/email.php                       |   6 +-
 view/register/form.php                        |  14 +-
 view/search/footer.php                        |   2 +-
 view/search/form.php                          |   2 +-
 view/search/header.php                        |  10 +-
 view/search/topics.php                        |   2 +-
 view/userlist.php                             |  18 +-
 view/viewforum.php                            |  10 +-
 view/viewtopic.php                            |  24 +-
 152 files changed, 3054 insertions(+), 1036 deletions(-)
 create mode 100644 include/l10n.php
 create mode 100644 include/pomo/.editorconfig
 create mode 100644 include/pomo/MO.php
 create mode 100644 include/pomo/PO.php
 create mode 100644 include/pomo/Streams/CachedFileReader.php
 create mode 100644 include/pomo/Streams/CachedIntFileReader.php
 create mode 100644 include/pomo/Streams/FileReader.php
 create mode 100644 include/pomo/Streams/Reader.php
 create mode 100644 include/pomo/Streams/StringReader.php
 create mode 100644 include/pomo/Translations/EntryTranslations.php
 create mode 100644 include/pomo/Translations/GettextTranslations.php
 create mode 100644 include/pomo/Translations/NOOPTranslations.php
 create mode 100644 include/pomo/Translations/Translations.php
 create mode 100644 include/pomo/Translations/TranslationsInterface.php
 create mode 100644 lang/English/common.mo
 delete mode 100644 lang/English/common.php
 create mode 100644 lang/English/common.po
 create mode 100644 lang/English/convertor.php

diff --git a/controller/admin/bans.php b/controller/admin/bans.php
index 7b2544f0..6e544bc1 100644
--- a/controller/admin/bans.php
+++ b/controller/admin/bans.php
@@ -30,14 +30,14 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_bans;
+        global $lang_admin_common, $lang_admin_bans;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_bans.php language file
@@ -54,7 +54,7 @@ public function display()
             $start_from = 50 * ($p - 1);
 
             // Generate paging links
-            $paging_links = '<span class="pages-label">' . $lang_common['Pages'] . ' </span>' . paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str']));
+            $paging_links = '<span class="pages-label">' . __('Pages') . ' </span>' . paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str']));
 
             $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Bans'], $lang_admin_bans['Results head']);
             define('FEATHER_ACTIVE_PAGE', 'admin');
@@ -93,14 +93,14 @@ public function display()
 
     public function add($id = null)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_bans;
+        global $lang_admin_common, $lang_admin_bans;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_bans.php language file
@@ -131,12 +131,12 @@ public function add($id = null)
 
     public function delete($id)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_bans;
+        global $lang_admin_common, $lang_admin_bans;
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_bans.php language file
@@ -148,14 +148,14 @@ public function delete($id)
 
     public function edit($id)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_bans;
+        global $lang_admin_common, $lang_admin_bans;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_bans.php language file
diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index 8edac8f6..07ddbe5b 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -30,10 +30,10 @@ public function __autoload($class_name)
 
     public function add_category()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_categories;
+        global $lang_admin_common, $lang_admin_categories;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_options.php language file
@@ -54,10 +54,10 @@ public function add_category()
 
     public function edit_categories()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_categories;
+        global $lang_admin_common, $lang_admin_categories;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_options.php language file
@@ -65,7 +65,7 @@ public function edit_categories()
         require FEATHER_ROOT.'lang/'.$admin_language.'/categories.php';
 
         if (empty($this->request->post('cat'))) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $categories = array();
@@ -90,10 +90,10 @@ public function edit_categories()
 
     public function delete_category()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_categories;
+        global $lang_admin_common, $lang_admin_categories;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_options.php language file
@@ -103,7 +103,7 @@ public function delete_category()
         $cat_to_delete = (int) $this->request->post('cat_to_delete');
 
         if ($cat_to_delete < 1) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         if (intval($this->request->post('disclaimer')) != 1) {
@@ -119,12 +119,12 @@ public function delete_category()
 
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_categories;
+        global $lang_admin_common, $lang_admin_categories;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/censoring.php b/controller/admin/censoring.php
index 1c9a2872..469ef9cc 100644
--- a/controller/admin/censoring.php
+++ b/controller/admin/censoring.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_censoring;
+        global $lang_admin_common, $lang_admin_censoring;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index f204e2c7..3d0e3610 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -34,10 +34,10 @@ public function __autoload($class_name)
 
     public function add_forum()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_forums;
+        global $lang_admin_common, $lang_admin_forums;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_options.php language file
@@ -66,10 +66,10 @@ public function add_forum()
 
     public function edit_forum($forum_id)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_forums;
+        global $lang_admin_common, $lang_admin_forums;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_options.php language file
@@ -172,10 +172,10 @@ public function edit_forum($forum_id)
 
     public function delete_forum($forum_id)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_forums;
+        global $lang_admin_common, $lang_admin_forums;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -239,12 +239,12 @@ public function edit_positions()
     
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_forums;
+        global $lang_admin_common, $lang_admin_forums;
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index 2a42b0d9..efae5d16 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_groups;
+        global $lang_admin_common, $lang_admin_groups;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -72,12 +72,12 @@ public function display()
 
     public function delete($id)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_groups;
+        global $lang_admin_common, $lang_admin_groups;
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -86,7 +86,7 @@ public function delete($id)
         require FEATHER_ROOT . 'lang/' . $admin_language . '/groups.php';
 
         if ($id < 5) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Make sure we don't remove the default group
@@ -145,12 +145,12 @@ public function delete($id)
 
     public function addedit($id = '')
     {
-        global $lang_common, $lang_admin_common, $lang_admin_groups;
+        global $lang_admin_common, $lang_admin_groups;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/index.php b/controller/admin/index.php
index 47dc4129..08dedaa1 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -44,12 +44,12 @@ public function remove_install_folder($directory)
     
     public function display($action = null)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_index;
+        global $lang_admin_common, $lang_admin_index;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_index.php language file
diff --git a/controller/admin/maintenance.php b/controller/admin/maintenance.php
index e1527431..a5bfbc11 100644
--- a/controller/admin/maintenance.php
+++ b/controller/admin/maintenance.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_maintenance, $lang_admin_common;
+        global $lang_admin_maintenance, $lang_admin_common;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/options.php b/controller/admin/options.php
index c20d44d3..07e43253 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common;
+        global $lang_admin_common;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index 38b0e084..650869f3 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_parser, $lang_admin_common;
+        global $lang_admin_parser, $lang_admin_common;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/permissions.php b/controller/admin/permissions.php
index 16adc0f5..f503b775 100644
--- a/controller/admin/permissions.php
+++ b/controller/admin/permissions.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_permissions;
+        global $lang_admin_common, $lang_admin_permissions;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index 9cd51a51..ef747bd9 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common;
+        global $lang_admin_common;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -43,13 +43,13 @@ public function display()
         // The plugin to load should be supplied via GET
         $plugin = $this->request->get('plugin') ? $this->request->get('plugin') : '';
         if (!preg_match('%^AM?P_(\w*?)\.php$%i', $plugin)) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // AP_ == Admins only, AMP_ == admins and moderators
         $prefix = substr($plugin, 0, strpos($plugin, '_'));
         if ($this->user->g_moderator == '1' && $prefix == 'AP') {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Make sure the file actually exists
diff --git a/controller/admin/reports.php b/controller/admin/reports.php
index 070ed31d..681f2838 100644
--- a/controller/admin/reports.php
+++ b/controller/admin/reports.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_reports;
+        global $lang_admin_common, $lang_admin_reports;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index 8e11a0fe..6b442a66 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_index;
+        global $lang_admin_common, $lang_admin_index;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -72,7 +72,7 @@ public function display()
 
     public function phpinfo()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_index;
+        global $lang_admin_common, $lang_admin_index;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
@@ -80,7 +80,7 @@ public function phpinfo()
         require FEATHER_ROOT.'lang/'.$admin_language.'/index.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Show phpinfo() output
diff --git a/controller/admin/users.php b/controller/admin/users.php
index 17e7b580..e6e9250f 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -30,14 +30,14 @@ public function __autoload($class_name)
 
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_users;
+        global $lang_admin_common, $lang_admin_users;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_bans.php language file
@@ -46,7 +46,7 @@ public function display()
         // Move multiple users to other user groups
         if ($this->request->post('move_users') || $this->request->post('move_users_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $move = $this->model->move_users();
@@ -73,7 +73,7 @@ public function display()
         // Delete multiple users
         if ($this->request->post('delete_users') || $this->request->post('delete_users_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $user_ids = $this->model->delete_users();
@@ -100,7 +100,7 @@ public function display()
         // Ban multiple users
         if ($this->request->post('ban_users') || $this->request->post('ban_users_comply')) {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $user_ids = $this->model->ban_users();
@@ -140,7 +140,7 @@ public function display()
             $start_from = 50 * ($p - 1);
 
             // Generate paging links
-            $paging_links = '<span class="pages-label">' . $lang_common['Pages'] . ' </span>' . paginate_old($num_pages, $p, '?find_user=&amp;'.implode('&amp;', $search['query_str']));
+            $paging_links = '<span class="pages-label">' . __('Pages') . ' </span>' . paginate_old($num_pages, $p, '?find_user=&amp;'.implode('&amp;', $search['query_str']));
 
             // Some helper variables for permissions
             $can_delete = $can_move = $this->user->g_id == FEATHER_ADMIN;
@@ -192,14 +192,14 @@ public function display()
     // Show IP statistics for a certain user ID
     public function ipstats($id)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_users;
+        global $lang_admin_common, $lang_admin_users;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_bans.php language file
@@ -215,7 +215,7 @@ public function ipstats($id)
         $start_from = 50 * ($p - 1);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$id);
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$id);
 
         $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Users'], $lang_admin_users['Results head']);
 
@@ -237,14 +237,14 @@ public function ipstats($id)
     // Show IP statistics for a certain user IP
     public function showusers($ip)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_users;
+        global $lang_admin_common, $lang_admin_users;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_bans.php language file
@@ -264,7 +264,7 @@ public function showusers($ip)
         $start_from = 50 * ($p - 1);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$ip);
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$ip);
 
         $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Users'], $lang_admin_users['Results head']);
 
diff --git a/controller/delete.php b/controller/delete.php
index b228c4ac..a933ad39 100644
--- a/controller/delete.php
+++ b/controller/delete.php
@@ -30,10 +30,10 @@ public function __autoload($class_name)
     
     public function deletepost($id)
     {
-        global $lang_common, $lang_post, $pd;
+        global $lang_post, $pd;
 
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Fetch some informations about the post, the topic and the forum
@@ -55,11 +55,11 @@ public function deletepost($id)
                 $cur_post['poster_id'] != $this->user->id ||
                 $cur_post['closed'] == '1') &&
                 !$is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the delete.php language file
@@ -81,7 +81,6 @@ public function deletepost($id)
         $cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
 
         $this->feather->render('delete.php', array(
-                            'lang_common' => $lang_common,
                             'lang_delete' => $lang_delete,
                             'cur_post' => $cur_post,
                             'id' => $id,
diff --git a/controller/edit.php b/controller/edit.php
index b2f60660..57c02123 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -30,10 +30,10 @@ public function __autoload($class_name)
     
     public function editpost($id)
     {
-        global $lang_common, $lang_prof_reg, $lang_post, $lang_register;
+        global $lang_prof_reg, $lang_post, $lang_register;
 
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Fetch some informations about the post, the topic and the forum
@@ -52,11 +52,11 @@ public function editpost($id)
 
         // Do we have permission to edit this post?
         if (($this->user->g_edit_posts == '0' || $cur_post['poster_id'] != $this->user->id || $cur_post['closed'] == '1') && !$is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the post.php language file
@@ -88,7 +88,7 @@ public function editpost($id)
 
 
         $page_title = array(feather_escape($this->config['o_board_title']), $lang_post['Edit post']);
-        $required_fields = array('req_subject' => $lang_common['Subject'], 'req_message' => $lang_common['Message']);
+        $required_fields = array('req_subject' => __('Subject'), 'req_message' => __('Message'));
         $focus_element = array('edit', 'req_message');
 
         define('FEATHER_ACTIVE_PAGE', 'edit');
@@ -103,7 +103,6 @@ public function editpost($id)
         }
 
         $this->feather->render('edit.php', array(
-                            'lang_common' => $lang_common,
                             'cur_post' => $cur_post,
                             'lang_post' => $lang_post,
                             'errors' => $errors,
diff --git a/controller/footer.php b/controller/footer.php
index 40f7964a..b852a21a 100644
--- a/controller/footer.php
+++ b/controller/footer.php
@@ -27,8 +27,6 @@ public function dontStop() {
 
     public function display($footer_style = null, $id = null, $p = null, $pid = null, $forum_id = null, $num_pages = null)
     {
-        global $lang_common;
-
         // Render the footer
         // If no footer style has been specified, we use the default (only copyright/debug info)
         $footer_style = isset($footer_style) ? $footer_style : null;
@@ -42,7 +40,6 @@ public function display($footer_style = null, $id = null, $p = null, $pid = null
         $num_pages = isset($num_pages) ? $num_pages : null;
 
         $this->feather->render('footer.php', array(
-                            'lang_common' => $lang_common,
                             'id' => $id,
                             'p' => $p,
                             'pid' => $pid,
diff --git a/controller/header.php b/controller/header.php
index 5ee52832..c49878a1 100644
--- a/controller/header.php
+++ b/controller/header.php
@@ -77,8 +77,6 @@ public function setPageHead($page_head)
 
     public function display()
     {
-        global $lang_common;
-
         // START SUBST - <body> TODO
         /*if (isset($focus_element)) {
             $tpl_main = str_replace('<body onload="', '<body onload="document.getElementById(\''.$focus_element[0].'\').elements[\''.$focus_element[1].'\'].focus();', $tpl_main);
@@ -90,31 +88,31 @@ public function display()
         $links = array();
 
         // Index should always be displayed
-        $links[] = '<li id="navindex"'.((FEATHER_ACTIVE_PAGE == 'index') ? ' class="isactive"' : '').'><a href="'.get_base_url().'/">'.$lang_common['Index'].'</a></li>';
+        $links[] = '<li id="navindex"'.((FEATHER_ACTIVE_PAGE == 'index') ? ' class="isactive"' : '').'><a href="'.get_base_url().'/">'.__('Index').'</a></li>';
 
         if ($this->user->g_read_board == '1' && $this->user->g_view_users == '1') {
-            $links[] = '<li id="navuserlist"'.((FEATHER_ACTIVE_PAGE == 'userlist') ? ' class="isactive"' : '').'><a href="'.get_link('userlist/').'">'.$lang_common['User list'].'</a></li>';
+            $links[] = '<li id="navuserlist"'.((FEATHER_ACTIVE_PAGE == 'userlist') ? ' class="isactive"' : '').'><a href="'.get_link('userlist/').'">'.__('User list').'</a></li>';
         }
 
         if ($this->config['o_rules'] == '1' && (!$this->user->is_guest || $this->user->g_read_board == '1' || $this->config['o_regs_allow'] == '1')) {
-            $links[] = '<li id="navrules"'.((FEATHER_ACTIVE_PAGE == 'rules') ? ' class="isactive"' : '').'><a href="'.get_link('rules/').'">'.$lang_common['Rules'].'</a></li>';
+            $links[] = '<li id="navrules"'.((FEATHER_ACTIVE_PAGE == 'rules') ? ' class="isactive"' : '').'><a href="'.get_link('rules/').'">'.__('Rules').'</a></li>';
         }
 
         if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-            $links[] = '<li id="navsearch"'.((FEATHER_ACTIVE_PAGE == 'search') ? ' class="isactive"' : '').'><a href="'.get_link('search/').'">'.$lang_common['Search'].'</a></li>';
+            $links[] = '<li id="navsearch"'.((FEATHER_ACTIVE_PAGE == 'search') ? ' class="isactive"' : '').'><a href="'.get_link('search/').'">'.__('Search').'</a></li>';
         }
 
         if ($this->user->is_guest) {
-            $links[] = '<li id="navregister"'.((FEATHER_ACTIVE_PAGE == 'register') ? ' class="isactive"' : '').'><a href="'.get_link('register/').'">'.$lang_common['Register'].'</a></li>';
-            $links[] = '<li id="navlogin"'.((FEATHER_ACTIVE_PAGE == 'login') ? ' class="isactive"' : '').'><a href="'.get_link('login/').'">'.$lang_common['Login'].'</a></li>';
+            $links[] = '<li id="navregister"'.((FEATHER_ACTIVE_PAGE == 'register') ? ' class="isactive"' : '').'><a href="'.get_link('register/').'">'.__('Register').'</a></li>';
+            $links[] = '<li id="navlogin"'.((FEATHER_ACTIVE_PAGE == 'login') ? ' class="isactive"' : '').'><a href="'.get_link('login/').'">'.__('Login').'</a></li>';
         } else {
-            $links[] = '<li id="navprofile"'.((FEATHER_ACTIVE_PAGE == 'profile') ? ' class="isactive"' : '').'><a href="'.get_link('user/'.$this->user->id.'/').'">'.$lang_common['Profile'].'</a></li>';
+            $links[] = '<li id="navprofile"'.((FEATHER_ACTIVE_PAGE == 'profile') ? ' class="isactive"' : '').'><a href="'.get_link('user/'.$this->user->id.'/').'">'.__('Profile').'</a></li>';
 
             if ($this->user->is_admmod) {
-                $links[] = '<li id="navadmin"'.((FEATHER_ACTIVE_PAGE == 'admin') ? ' class="isactive"' : '').'><a href="'.get_link('admin/').'">'.$lang_common['Admin'].'</a></li>';
+                $links[] = '<li id="navadmin"'.((FEATHER_ACTIVE_PAGE == 'admin') ? ' class="isactive"' : '').'><a href="'.get_link('admin/').'">'.__('Admin').'</a></li>';
             }
 
-            $links[] = '<li id="navlogout"><a href="'.get_link('logout/id/'.$this->user->id.'/token/'.feather_hash($this->user->id.feather_hash(get_remote_address()))).'/">'.$lang_common['Logout'].'</a></li>';
+            $links[] = '<li id="navlogout"><a href="'.get_link('logout/id/'.$this->user->id.'/token/'.feather_hash($this->user->id.feather_hash(get_remote_address()))).'/">'.__('Logout').'</a></li>';
         }
 
         // Are there any additional navlinks we should insert into the array before imploding it?
@@ -136,33 +134,33 @@ public function display()
         $page_statusinfo = $page_topicsearches = array();
 
         if ($this->user->is_guest) {
-            $page_statusinfo = '<p class="conl">'.$lang_common['Not logged in'].'</p>';
+            $page_statusinfo = '<p class="conl">'.__('Not logged in').'</p>';
         } else {
-            $page_statusinfo[] = '<li><span>'.$lang_common['Logged in as'].' <strong>'.feather_escape($this->user->username).'</strong></span></li>';
-            $page_statusinfo[] = '<li><span>'.sprintf($lang_common['Last visit'], format_time($this->user->last_visit)).'</span></li>';
+            $page_statusinfo[] = '<li><span>'.__('Logged in as').' <strong>'.feather_escape($this->user->username).'</strong></span></li>';
+            $page_statusinfo[] = '<li><span>'.sprintf(__('Last visit'), format_time($this->user->last_visit)).'</span></li>';
 
             if ($this->user->is_admmod) {
                 if ($this->config['o_report_method'] == '0' || $this->config['o_report_method'] == '2') {
                     if ($this->model->get_reports()) {
-                        $page_statusinfo[] = '<li class="reportlink"><span><strong><a href="'.get_link('admin/reports/').'">'.$lang_common['New reports'].'</a></strong></span></li>';
+                        $page_statusinfo[] = '<li class="reportlink"><span><strong><a href="'.get_link('admin/reports/').'">'.__('New reports').'</a></strong></span></li>';
                     }
                 }
 
                 if ($this->config['o_maintenance'] == '1') {
-                    $page_statusinfo[] = '<li class="maintenancelink"><span><strong><a href="'.get_link('admin/maintenance/').'">'.$lang_common['Maintenance mode enabled'].'</a></strong></span></li>';
+                    $page_statusinfo[] = '<li class="maintenancelink"><span><strong><a href="'.get_link('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>';
                 }
             }
 
             if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-                $page_topicsearches[] = '<a href="'.get_link('search/show/replies/').'" title="'.$lang_common['Show posted topics'].'">'.$lang_common['Posted topics'].'</a>';
-                $page_topicsearches[] = '<a href="'.get_link('search/show/new/').'" title="'.$lang_common['Show new posts'].'">'.$lang_common['New posts header'].'</a>';
+                $page_topicsearches[] = '<a href="'.get_link('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a>';
+                $page_topicsearches[] = '<a href="'.get_link('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a>';
             }
         }
 
         // Quick searches
         if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-            $page_topicsearches[] = '<a href="'.get_link('search/show/recent/').'" title="'.$lang_common['Show active topics'].'">'.$lang_common['Active topics'].'</a>';
-            $page_topicsearches[] = '<a href="'.get_link('search/show/unanswered/').'" title="'.$lang_common['Show unanswered topics'].'">'.$lang_common['Unanswered topics'].'</a>';
+            $page_topicsearches[] = '<a href="'.get_link('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a>';
+            $page_topicsearches[] = '<a href="'.get_link('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
         }
 
 
@@ -181,7 +179,7 @@ public function display()
         // Generate quicklinks
         if (!empty($page_topicsearches)) {
             $page_info .= "\n\t\t\t".'<ul class="conr">';
-            $page_info .= "\n\t\t\t\t".'<li><span>'.$lang_common['Topic searches'].' '.implode(' | ', $page_topicsearches).'</span></li>';
+            $page_info .= "\n\t\t\t\t".'<li><span>'.__('Topic searches').' '.implode(' | ', $page_topicsearches).'</span></li>';
             $page_info .= "\n\t\t\t".'</ul>';
         }
 
@@ -207,7 +205,6 @@ public function display()
         $this->required_fields = isset($this->required_fields) ? $this->required_fields : null;
 
         $this->feather->render('header.php', array(
-                'lang_common' => $lang_common,
                 'page_title' => $this->title,
                 'focus_element' => $this->focus_element,
                 'p' => $this->page,
diff --git a/controller/help.php b/controller/help.php
index 7cdff2af..114a545f 100644
--- a/controller/help.php
+++ b/controller/help.php
@@ -29,10 +29,10 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common;
+
 
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
 
@@ -48,7 +48,6 @@ public function display()
 
         $this->feather->render('help.php', array(
                             'lang_help' => $lang_help,
-                            'lang_common' => $lang_common,
                             )
                     );
 
diff --git a/controller/index.php b/controller/index.php
index 4e4f750c..1d68cbfe 100644
--- a/controller/index.php
+++ b/controller/index.php
@@ -30,10 +30,8 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common;
-
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Load the index.php language file
@@ -48,7 +46,6 @@ public function display()
 
         $this->feather->render('index.php', array(
                             'index_data' => $this->model->print_categories_forums(),
-                            'lang_common' => $lang_common,
                             'lang_index' => $lang_index,
                             'stats' => $this->model->collect_stats(),
                             'feather_config' => $this->config,
diff --git a/controller/login.php b/controller/login.php
index 828a2914..69b43cf9 100644
--- a/controller/login.php
+++ b/controller/login.php
@@ -30,8 +30,6 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common;
-
         if (!$this->user->is_guest) {
             header('Location: '.get_base_url());
             exit;
@@ -43,8 +41,8 @@ public function display()
         // TODO?: Try to determine if the data in HTTP_REFERER is valid (if not, we redirect to index.php after login)
         $redirect_url = $this->model->get_redirect_url($_SERVER);
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Login']);
-        $required_fields = array('req_username' => $lang_common['Username'], 'req_password' => $lang_common['Password']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Login'));
+        $required_fields = array('req_username' => __('Username'), 'req_password' => __('Password'));
         $focus_element = array('login', 'req_username');
 
         define('FEATHER_ACTIVE_PAGE', 'login');
@@ -52,7 +50,6 @@ public function display()
         $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         $this->feather->render('login/form.php', array(
-                            'lang_common' => $lang_common,
                             'lang_login' => $lang_login,
                             'redirect_url'    =>    $redirect_url,
                             )
@@ -63,7 +60,7 @@ public function display()
 
     public function logmein()
     {
-        global $lang_common, $lang_login;
+        global $lang_login;
 
         define('FEATHER_QUIET_VISIT', 1);
 
@@ -80,7 +77,7 @@ public function logmein()
 
     public function logmeout($id, $token)
     {
-        global $lang_common;
+
 
         define('FEATHER_QUIET_VISIT', 1);
 
@@ -92,7 +89,7 @@ public function logmeout($id, $token)
 
     public function forget()
     {
-        global $lang_common, $lang_login;
+        global $lang_login;
 
         define('FEATHER_QUIET_VISIT', 1);
 
@@ -107,7 +104,7 @@ public function forget()
         $errors = $this->model->password_forgotten();
 
         $page_title = array(feather_escape($this->config['o_board_title']), $lang_login['Request pass']);
-        $required_fields = array('req_email' => $lang_common['Email']);
+        $required_fields = array('req_email' => __('Email'));
         $focus_element = array('request_pass', 'req_email');
 
         define('FEATHER_ACTIVE_PAGE', 'login');
@@ -117,7 +114,6 @@ public function forget()
         $this->feather->render('login/password_forgotten.php', array(
                             'errors'    =>    $errors,
                             'lang_login'    =>    $lang_login,
-                            'lang_common'    =>    $lang_common,
                             )
                     );
 
diff --git a/controller/misc.php b/controller/misc.php
index 39543856..9ebb3158 100644
--- a/controller/misc.php
+++ b/controller/misc.php
@@ -30,10 +30,10 @@ public function __autoload($class_name)
     
     public function rules()
     {
-        global $lang_common;
+
 
         if ($this->config['o_rules'] == '0' || ($this->user->is_guest && $this->user->g_read_board == '0' && $this->config['o_regs_allow'] == '0')) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Load the register.php language file
@@ -54,10 +54,10 @@ public function rules()
 
     public function markread()
     {
-        global $lang_common;
+
 
         if ($this->user->is_guest) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the misc.php language file
@@ -73,10 +73,10 @@ public function markread()
 
     public function markforumread($id)
     {
-        global $lang_common;
+
 
         if ($this->user->is_guest) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the misc.php language file
@@ -91,10 +91,10 @@ public function markforumread($id)
 
     public function subscribeforum($id)
     {
-        global $lang_common, $lang_misc;
+        global $lang_misc;
 
         if ($this->user->is_guest) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the misc.php language file
@@ -105,10 +105,10 @@ public function subscribeforum($id)
 
     public function subscribetopic($id)
     {
-        global $lang_common, $lang_misc;
+        global $lang_misc;
 
         if ($this->user->is_guest) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the misc.php language file
@@ -119,10 +119,10 @@ public function subscribetopic($id)
 
     public function unsubscribeforum($id)
     {
-        global $lang_common, $lang_misc;
+        global $lang_misc;
 
         if ($this->user->is_guest) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the misc.php language file
@@ -133,10 +133,10 @@ public function unsubscribeforum($id)
 
     public function unsubscribetopic($id)
     {
-        global $lang_common, $lang_misc;
+        global $lang_misc;
 
         if ($this->user->is_guest) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the misc.php language file
@@ -147,14 +147,14 @@ public function unsubscribetopic($id)
 
     public function email($id)
     {
-        global $lang_common;
+
 
         if ($this->user->is_guest || $this->user->g_send_email == '0') {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         if ($id < 2) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Load the misc.php language file
@@ -191,10 +191,10 @@ public function email($id)
 
     public function report($id)
     {
-        global $lang_common;
+
 
         if ($this->user->is_guest) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the misc.php language file
@@ -222,7 +222,6 @@ public function report($id)
         $this->feather->render('misc/report.php', array(
                 'lang_misc' => $lang_misc,
                 'id' => $id,
-                'lang_common' => $lang_common,
                 'cur_post' => $cur_post,
                 )
         );
diff --git a/controller/moderate.php b/controller/moderate.php
index d258d2da..098e50f1 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -30,10 +30,10 @@ public function __autoload($class_name)
     
     public function gethostpost($pid)
     {
-        global $lang_common;
+
 
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Load the viewforum.php language file
@@ -45,7 +45,7 @@ public function gethostpost($pid)
         // This particular function doesn't require forum-based moderator access. It can be used
         // by all moderators and admins
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         $this->model->display_ip_address_post($pid);
@@ -53,10 +53,10 @@ public function gethostpost($pid)
 
     public function gethostip($ip)
     {
-        global $lang_common;
+
 
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Load the viewforum.php language file
@@ -68,7 +68,7 @@ public function gethostip($ip)
         // This particular function doesn't require forum-based moderator access. It can be used
         // by all moderators and admins
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         $this->model->display_ip_info($ip);
@@ -76,10 +76,10 @@ public function gethostip($ip)
 
     public function moderatetopic($id = null, $fid = null, $action = null, $param = null)
     {
-        global $lang_common, $lang_topic, $lang_misc;
+        global $lang_topic, $lang_misc;
 
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Load the viewforum.php language file
@@ -92,7 +92,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         // by all moderators and admins
         if ($action == 'get_host') {
             if (!$this->user->is_admmod) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $this->model->display_ip_address();
@@ -103,7 +103,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         $url_subject = url_friendly($this->model->get_subject_tid($id));
@@ -135,7 +135,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                     'id'    =>    $fid,
                     'topics'    =>    $topics,
                     'lang_misc'    =>    $lang_misc,
-                    'lang_common'    =>    $lang_common,
                     'list_forums'   => $this->model->get_forum_list_move($fid),
                 )
             );
@@ -205,7 +204,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                         'id'    =>    $id,
                         'topics'    =>    $id,
                         'lang_misc'    =>    $lang_misc,
-                        'lang_common'    =>    $lang_common,
                         'list_forums'   => $this->model->get_forum_list_move($fid),
                         )
                 );
@@ -227,7 +225,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                     $this->header->setTitle($page_title)->setPage($p)->display();
 
                     $this->feather->render('moderate/delete_posts.php', array(
-                        'lang_common' => $lang_common,
                         'lang_misc' => $lang_misc,
                         'id' => $id,
                         'posts' => $posts,
@@ -247,7 +244,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 $this->header->setTitle($page_title)->setPage($p)->setFocusElement($focus_element)->display();
 
                 $this->feather->render('moderate/split_posts.php', array(
-                        'lang_common' => $lang_common,
                         'lang_misc' => $lang_misc,
                         'id' => $id,
                         'posts' => $posts,
@@ -271,7 +267,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 }*/
 
                 // Generate paging links
-                $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/#');
+                $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/#');
 
             if ($this->config['o_censoring'] == '1') {
                 $cur_topic['subject'] = censor_words($cur_topic['subject']);
@@ -284,7 +280,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
 
             $this->feather->render('moderate/posts_view.php', array(
-                        'lang_common' => $lang_common,
                         'lang_topic' => $lang_topic,
                         'lang_misc' => $lang_misc,
                         'cur_topic' => $cur_topic,
@@ -305,10 +300,10 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
     public function display($id, $name = null, $page = null)
     {
-        global $lang_common, $lang_forum, $lang_misc;
+        global $lang_forum, $lang_misc;
 
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Load the viewforum.php language file
@@ -322,7 +317,7 @@ public function display($id, $name = null, $page = null)
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Fetch some info about the forum
@@ -330,7 +325,7 @@ public function display($id, $name = null, $page = null)
 
         // Is this a redirect forum? In that case, abort!
         if ($cur_forum['redirect_url'] != '') {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $sort_by = $this->model->forum_sort_by($cur_forum['sort_by']);
@@ -343,7 +338,7 @@ public function display($id, $name = null, $page = null)
         $url_forum = url_friendly($cur_forum['forum_name']);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'moderate/forum/'.$id.'/#');
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/forum/'.$id.'/#');
 
         $page_title = array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name']));
 
@@ -352,7 +347,6 @@ public function display($id, $name = null, $page = null)
         $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
 
         $this->feather->render('moderate/moderator_forum.php', array(
-                            'lang_common' => $lang_common,
                             'lang_misc' => $lang_misc,
                             'id' => $id,
                             'p' => $p,
@@ -371,10 +365,10 @@ public function display($id, $name = null, $page = null)
 
     public function dealposts($fid)
     {
-        global $lang_common, $lang_forum, $lang_topic, $lang_misc;
+        global $lang_forum, $lang_topic, $lang_misc;
 
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Load the viewforum.php language file
@@ -388,7 +382,7 @@ public function dealposts($fid)
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Move one or more topics
@@ -418,7 +412,6 @@ public function dealposts($fid)
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
                         'lang_misc'    =>    $lang_misc,
-                        'lang_common'    =>    $lang_common,
                         'list_forums'   => $this->model->get_forum_list_move($fid),
                         )
                 );
@@ -447,7 +440,6 @@ public function dealposts($fid)
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
                         'lang_misc'    =>    $lang_misc,
-                        'lang_common'    =>    $lang_common,
                         )
                 );
 
@@ -475,7 +467,6 @@ public function dealposts($fid)
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
                         'lang_misc'    =>    $lang_misc,
-                        'lang_common'    =>    $lang_common,
                         )
                 );
 
diff --git a/controller/post.php b/controller/post.php
index cb64d507..e7bca948 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -35,7 +35,7 @@ public function newreply($fid = null, $tid = null, $qid = null)
 
     public function newpost($fid = null, $tid = null, $qid = null)
     {
-        global $lang_common, $lang_prof_reg, $lang_antispam_questions, $lang_antispam, $lang_post, $lang_register, $lang_bbeditor;
+        global $lang_prof_reg, $lang_antispam_questions, $lang_antispam, $lang_post, $lang_register, $lang_bbeditor;
 
         // Load the register.php/profile.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
@@ -55,7 +55,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // If $_POST['username'] is filled, we are facing a bot
         if ($this->request->post('username')) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Fetch some info about the topic and/or the forum
@@ -65,7 +65,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // Is someone trying to post into a redirect forum?
         if ($cur_posting['redirect_url'] != '') {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
@@ -77,7 +77,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
                 ($fid && (($cur_posting['post_topics'] == '' && $this->user->g_post_topics == '0') || $cur_posting['post_topics'] == '0')) ||
                 (isset($cur_posting['closed']) && $cur_posting['closed'] == '1')) &&
                 !$is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the post.php language file
@@ -174,7 +174,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
             $action = $lang_post['Post new topic'];
             $form = '<form id="post" method="post" action="'.get_link('post/new-topic/'.$fid.'/').'" onsubmit="return process_form(this)">';
         } else {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $url_forum = url_friendly($cur_posting['forum_name']);
@@ -188,7 +188,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
         }
 
         $page_title = array(feather_escape($this->config['o_board_title']), $action);
-        $required_fields = array('req_email' => $lang_common['Email'], 'req_subject' => $lang_common['Subject'], 'req_message' => $lang_common['Message']);
+        $required_fields = array('req_email' => __('Email'), 'req_subject' => __('Subject'), 'req_message' => __('Message'));
         if ($this->user->is_guest) {
             $required_fields['captcha'] = $lang_antispam['Robot title'];
         }
@@ -215,7 +215,6 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             'feather_config' => $this->config,
                             'feather_user' => $this->user,
                             'cur_posting' => $cur_posting,
-                            'lang_common' => $lang_common,
                             'lang_post' => $lang_post,
                             'lang_antispam' => $lang_antispam,
                             'lang_antispam_questions' => $lang_antispam_questions,
diff --git a/controller/profile.php b/controller/profile.php
index 3abb7e51..02b44ff5 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -30,7 +30,7 @@ public function __autoload($class_name)
     
     public function display($id, $section = null)
     {
-        global $lang_common, $lang_prof_reg, $lang_profile, $pd, $forum_time_formats, $forum_date_formats;
+        global $lang_prof_reg, $lang_profile, $pd, $forum_time_formats, $forum_date_formats;
 
         // Include UTF-8 function
         require FEATHER_ROOT.'include/utf8/substr_replace.php';
@@ -45,38 +45,37 @@ public function display($id, $section = null)
 
         if ($this->request->post('update_group_membership')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $this->model->update_group_membership($id, $this->feather);
         } elseif ($this->request->post('update_forums')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $this->model->update_mod_forums($id, $this->feather);
         } elseif ($this->request->post('ban')) {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $this->model->ban_user($id);
         } elseif ($this->request->post('delete_user') || $this->request->post('delete_user_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $this->model->delete_user($id, $this->feather);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Confirm delete user']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Confirm delete user']);
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
 
             $this->header->setTitle($page_title)->display();
 
             $this->feather->render('profile/delete_user.php', array(
-                                    'lang_common' => $lang_common,
-                                    'username' => $this->model->get_username($id),
+                                            'username' => $this->model->get_username($id),
                                     'lang_profile' => $lang_profile,
                                     'id' => $id,
                                     )
@@ -95,7 +94,7 @@ public function display($id, $section = null)
                                     ($this->user->g_mod_edit_users == '0' ||                         // mods aren't allowed to edit users
                                     $info['group_id'] == FEATHER_ADMIN ||                            // or the user is an admin
                                     $info['is_moderator'])))) {                                      // or the user is another mod
-                                    message($lang_common['No permission'], '403');
+                                    message(__('No permission'), '403');
             }
 
             $this->model->update_profile($id, $info, $section, $this->feather);
@@ -128,7 +127,6 @@ public function display($id, $section = null)
             $this->header->setTitle($page_title)->display();
 
             $this->feather->render('profile/view_profile.php', array(
-                        'lang_common' => $lang_common,
                         'lang_profile' => $lang_profile,
                         'user_info' => $user_info,
                         )
@@ -139,8 +137,8 @@ public function display($id, $section = null)
             if (!$section || $section == 'essentials') {
                 $user_disp = $this->model->edit_essentials($id, $user);
 
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section essentials']);
-                $required_fields = array('req_username' => $lang_common['Username'], 'req_email' => $lang_common['Email']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Section essentials']);
+                $required_fields = array('req_username' => __('Username'), 'req_email' => __('Email'));
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -149,8 +147,7 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('essentials', $id);
 
                 $this->feather->render('profile/section_essentials.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_profile' => $lang_profile,
+                                    'lang_profile' => $lang_profile,
                                 'lang_prof_reg' => $lang_prof_reg,
                                 'feather' => $this->feather,
                                 'id' => $id,
@@ -162,10 +159,10 @@ public function display($id, $section = null)
                         );
             } elseif ($section == 'personal') {
                 if ($this->user->g_set_title == '1') {
-                    $title_field = '<label>'.$lang_common['Title'].' <em>('.$lang_profile['Leave blank'].')</em><br /><input type="text" name="title" value="'.feather_escape($user['title']).'" size="30" maxlength="50" /><br /></label>'."\n";
+                    $title_field = '<label>'.__('Title').' <em>('.$lang_profile['Leave blank'].')</em><br /><input type="text" name="title" value="'.feather_escape($user['title']).'" size="30" maxlength="50" /><br /></label>'."\n";
                 }
 
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section personal']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Section personal']);
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -174,15 +171,14 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('personal', $id);
 
                 $this->feather->render('profile/section_personal.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_profile' => $lang_profile,
+                                    'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 'feather' => $this->feather,
                                 )
                         );
                 
             } elseif ($section == 'messaging') {
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section messaging']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Section messaging']);
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -191,15 +187,14 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('messaging', $id);
 
                 $this->feather->render('profile/section_messaging.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_profile' => $lang_profile,
+                                    'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 )
                         );
                 
             } elseif ($section == 'personality') {
                 if ($this->config['o_avatars'] == '0' && $this->config['o_signatures'] == '0') {
-                    message($lang_common['Bad request'], '404');
+                    message(__('Bad request'), '404');
                 }
 
                 $avatar_field = '<span><a href="'.get_link('user/'.$id.'/action/upload_avatar/').'">'.$lang_profile['Change avatar'].'</a></span>';
@@ -217,7 +212,7 @@ public function display($id, $section = null)
                     $signature_preview = '<p>'.$lang_profile['No sig'].'</p>'."\n";
                 }
 
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section personality']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Section personality']);
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -226,8 +221,7 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('personality', $id);
 
                 $this->feather->render('profile/section_personality.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_profile' => $lang_profile,
+                                    'lang_profile' => $lang_profile,
                                 'user_avatar' => $user_avatar,
                                 'avatar_field' => $avatar_field,
                                 'signature_preview' => $signature_preview,
@@ -237,7 +231,7 @@ public function display($id, $section = null)
                         );
                 
             } elseif ($section == 'display') {
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section display']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Section display']);
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -246,14 +240,13 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('display', $id);
 
                 $this->feather->render('profile/section_display.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_profile' => $lang_profile,
+                                    'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 )
                         );
                 
             } elseif ($section == 'privacy') {
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section privacy']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Section privacy']);
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -262,8 +255,7 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('privacy', $id);
 
                 $this->feather->render('profile/section_privacy.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_profile' => $lang_profile,
+                                    'lang_profile' => $lang_profile,
                                 'lang_prof_reg' => $lang_prof_reg,
                                 'user' => $user,
                                 )
@@ -271,10 +263,10 @@ public function display($id, $section = null)
                 
             } elseif ($section == 'admin') {
                 if (!$this->user->is_admmod || ($this->user->g_moderator == '1' && $this->user->g_mod_ban_users == '0')) {
-                    message($lang_common['Bad request'], false, '403 Forbidden');
+                    message(__('Bad request'), false, '403 Forbidden');
                 }
 
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section admin']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Section admin']);
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -283,8 +275,7 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('admin', $id);
 
                 $this->feather->render('profile/section_admin.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_profile' => $lang_profile,
+                                    'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 'forum_list' => $this->model->get_forum_list($id),
                                 'group_list' => $this->model->get_group_list($user),
@@ -293,7 +284,7 @@ public function display($id, $section = null)
                         );
                 
             } else {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             $this->footer->display();
@@ -302,7 +293,7 @@ public function display($id, $section = null)
 
     public function action($id, $action)
     {
-        global $lang_common, $lang_prof_reg, $lang_profile;
+        global $lang_prof_reg, $lang_profile;
 
         // Include UTF-8 function
         require FEATHER_ROOT.'include/utf8/substr_replace.php';
@@ -317,16 +308,16 @@ public function action($id, $action)
 
         if ($action != 'change_pass' || !$this->request->get('key')) {
             if ($this->user->g_read_board == '0') {
-                message($lang_common['No view'], '403');
+                message(__('No view'), '403');
             } elseif ($this->user->g_view_users == '0' && ($this->user->is_guest || $this->user->id != $id)) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
         }
 
         if ($action == 'change_pass') {
             $this->model->change_pass($id, $this->feather);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Change pass']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Change pass']);
             $required_fields = array('req_old_password' => $lang_profile['Old pass'], 'req_new_password1' => $lang_profile['New pass'], 'req_new_password2' => $lang_profile['Confirm new pass']);
             $focus_element = array('change_pass', ((!$this->user->is_admmod) ? 'req_old_password' : 'req_new_password1'));
 
@@ -335,8 +326,7 @@ public function action($id, $action)
             $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             $this->feather->render('profile/change_pass.php', array(
-                                    'lang_common' => $lang_common,
-                                    'feather' => $this->feather,
+                                            'feather' => $this->feather,
                                     'lang_profile' => $lang_profile,
                                     'id' => $id,
                                     )
@@ -346,8 +336,8 @@ public function action($id, $action)
         } elseif ($action == 'change_email') {
             $this->model->change_email($id, $this->feather);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Change email']);
-            $required_fields = array('req_new_email' => $lang_profile['New email'], 'req_password' => $lang_common['Password']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Change email']);
+            $required_fields = array('req_new_email' => $lang_profile['New email'], 'req_password' => __('Password'));
             $focus_element = array('change_email', 'req_new_email');
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
@@ -355,8 +345,7 @@ public function action($id, $action)
             $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             $this->feather->render('profile/change_mail.php', array(
-                                    'lang_common' => $lang_common,
-                                    'lang_profile' => $lang_profile,
+                                            'lang_profile' => $lang_profile,
                                     'id' => $id,
                                     )
                             );
@@ -368,14 +357,14 @@ public function action($id, $action)
             }
 
             if ($this->user->id != $id && !$this->user->is_admmod) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             if ($this->feather->request()->isPost()) {
                 $this->model->upload_avatar($id, $_FILES);
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Upload avatar']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Upload avatar']);
             $required_fields = array('req_file' => $lang_profile['File']);
             $focus_element = array('upload_avatar', 'req_file');
 
@@ -384,8 +373,7 @@ public function action($id, $action)
             $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             $this->feather->render('profile/upload_avatar.php', array(
-                                    'lang_common' => $lang_common,
-                                    'lang_profile' => $lang_profile,
+                                            'lang_profile' => $lang_profile,
                                     'feather_config' => $this->config,
                                     'lang_profile' => $lang_profile,
                                     'id' => $id,
@@ -396,7 +384,7 @@ public function action($id, $action)
             
         } elseif ($action == 'delete_avatar') {
             if ($this->user->id != $id && !$this->user->is_admmod) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             
@@ -406,12 +394,12 @@ public function action($id, $action)
             redirect(get_link('user/'.$id.'/section/personality/'), $lang_profile['Avatar deleted redirect']);
         } elseif ($action == 'promote') {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_promote_users == '0')) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $this->model->promote_user($id, $this->feather);
         } else {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
     }
 }
diff --git a/controller/register.php b/controller/register.php
index 3ab047bc..8683d1c1 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -30,7 +30,7 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_antispam_questions, $lang_antispam, $lang_register, $lang_prof_reg;
+        global $lang_antispam_questions, $lang_antispam, $lang_register, $lang_prof_reg;
 
         if (!$this->user->is_guest) {
             header('Location: '.get_base_url());
@@ -54,7 +54,7 @@ public function display()
         }
 
         $page_title = array(feather_escape($this->config['o_board_title']), $lang_register['Register']);
-        $required_fields = array('req_user' => $lang_common['Username'], 'req_password1' => $lang_common['Password'], 'req_password2' => $lang_prof_reg['Confirm pass'], 'req_email1' => $lang_common['Email'], 'req_email2' => $lang_common['Email'].' 2', 'captcha' => $lang_antispam['Robot title']);
+        $required_fields = array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => $lang_prof_reg['Confirm pass'], 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => $lang_antispam['Robot title']);
         $focus_element = array('register', 'req_user');
 
         define('FEATHER_ACTIVE_PAGE', 'register');
@@ -79,7 +79,6 @@ public function display()
                             'errors' => $user['errors'],
                             'feather_config' => $this->config,
                             'lang_register' => $lang_register,
-                            'lang_common' => $lang_common,
                             'lang_prof_reg' => $lang_prof_reg,
                             'lang_antispam' => $lang_antispam,
                             'lang_antispam_questions'    =>    $lang_antispam_questions,
@@ -102,7 +101,7 @@ public function cancel()
     public function rules()
     { // TODO: fix $_GET w/ URL rewriting
 
-        global $lang_common, $lang_login, $lang_register;
+        global $lang_login, $lang_register;
 
         // If we are logged in, we shouldn't be here
         if (!$this->user->is_guest) {
diff --git a/controller/search.php b/controller/search.php
index 8cfda6d3..df7712b6 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -30,14 +30,14 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_search, $lang_forum, $lang_topic, $pd;
+        global $lang_search, $lang_forum, $lang_topic, $pd;
 
         // Load the search.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/search.php';
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         } elseif ($this->user->g_search == '0') {
             message($lang_search['No search permission'], false, '403 Forbidden');
         }
@@ -57,8 +57,7 @@ public function display()
                     $this->header->setTitle($page_title)->display();
 
                     $this->feather->render('search/header.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_search' => $lang_search,
+                                    'lang_search' => $lang_search,
                                 'search' => $search,
                                 )
                         );
@@ -89,7 +88,6 @@ public function display()
         $this->header->setTitle($page_title)->setFocusElement($focus_element)->display();
 
         $this->feather->render('search/form.php', array(
-                            'lang_common' => $lang_common,
                             'lang_search' => $lang_search,
                             'feather_config' => $this->config,
                             'feather' => $this->feather,
diff --git a/controller/userlist.php b/controller/userlist.php
index 5fda0733..7de8f1c8 100644
--- a/controller/userlist.php
+++ b/controller/userlist.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common;
+
 
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         } elseif ($this->user->g_view_users == '0') {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the userlist.php language file
@@ -61,13 +61,13 @@ public function display()
         $p = (!$this->request->get('p') || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
         $start_from = 50 * ($p - 1);
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['User list']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('User list'));
         if ($this->user->g_search_users == '1') {
             $focus_element = array('userlist', 'username');
         }
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
 
         define('FEATHER_ALLOW_INDEX', 1);
 
@@ -76,7 +76,6 @@ public function display()
         $this->header->setTitle($page_title)->setPage($p)->setFocusElement($focus_element)->setPagingLinks($paging_links)->display();
 
         $this->feather->render('userlist.php', array(
-                            'lang_common' => $lang_common,
                             'lang_search' => $lang_search,
                             'lang_ul' => $lang_ul,
                             'feather' => $this->feather,
diff --git a/controller/viewforum.php b/controller/viewforum.php
index a8802107..c500a8bd 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -30,14 +30,14 @@ public function __autoload($class_name)
     
     public function display($id, $name = null, $page = null)
     {
-        global $lang_common, $lang_forum;
+        global $lang_forum;
 
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         if ($id < 1) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Load the viewforum.php language file
@@ -73,7 +73,7 @@ public function display($id, $name = null, $page = null)
         $url_forum = url_friendly($cur_forum['forum_name']);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'forum/'.$id.'/'.$url_forum.'/#');
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'forum/'.$id.'/'.$url_forum.'/#');
 
         $forum_actions = $this->model->get_forum_actions($id, $this->config['o_forum_subscriptions'], $cur_forum['is_subscribed']);
 
@@ -90,7 +90,6 @@ public function display($id, $name = null, $page = null)
         $this->feather->render('viewforum.php', array(
                             'id' => $id,
                             'forum_data' => $this->model->print_topics($id, $sort_by, $start_from),
-                            'lang_common' => $lang_common,
                             'lang_forum' => $lang_forum,
                             'cur_forum' => $cur_forum,
                             'paging_links' => $paging_links,
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index bbbefaa8..385d6523 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -30,10 +30,10 @@ public function __autoload($class_name)
 
     public function display($id = null, $name = null, $page = null, $pid = null)
     {
-        global $lang_common, $lang_post, $lang_topic, $lang_bbeditor, $pd;
+        global $lang_post, $lang_topic, $lang_bbeditor, $pd;
 
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Load the viewtopic.php language file
@@ -47,12 +47,12 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
         // BBcode toolbar feature
-        require FEATHER_ROOT.'lang/'.$this->user['language'].'/bbeditor.php';
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.php';
 
         // Load the viewtopic.php model file
         require_once FEATHER_ROOT.'model/viewtopic.php';
 
-        // Fetch some informations about the topic TODO
+        // Fetch some informations about the topic
         $cur_topic = $this->model->get_info_topic($id);
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
@@ -82,8 +82,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         $url_forum = url_friendly($cur_topic['forum_name']);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'topic/'.$id.'/'.$url_topic.'/#');
-
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'topic/'.$id.'/'.$url_topic.'/#');
 
         if ($this->config['o_censoring'] == '1') {
             $cur_topic['subject'] = censor_words($cur_topic['subject']);
@@ -103,15 +102,12 @@ public function display($id = null, $name = null, $page = null, $pid = null)
 
         $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->display();
 
-        $forum_id = $cur_topic['forum_id'];
-
         require FEATHER_ROOT.'include/parser.php';
 
         $this->feather->render('viewtopic.php', array(
                             'id' => $id,
                             'p' => $p,
                             'post_data' => $this->model->print_posts($id, $start_from, $cur_topic, $is_admmod),
-                            'lang_common' => $lang_common,
                             'lang_topic' => $lang_topic,
                             'lang_post' => $lang_post,
                             'lang_bbeditor' => $lang_bbeditor,
@@ -141,17 +137,13 @@ public function display($id = null, $name = null, $page = null, $pid = null)
 
     public function viewpost($pid)
     {
-        global $lang_common;
-
         $post = $this->model->redirect_to_post($pid);
 
-        return self::display($post['topic_id'], null, $post['get_p'], $pid);
+        return $this->display($post['topic_id'], null, $post['get_p'], $pid);
     }
 
     public function action($id, $action)
     {
-        global $lang_common;
-
         $this->model->handle_actions($id, $action);
     }
 }
diff --git a/extern.php b/extern.php
index f88c3107..29da2f32 100644
--- a/extern.php
+++ b/extern.php
@@ -128,7 +128,7 @@ function authenticate_user($user, $password, $password_is_hash = false)
 
 if ($feather->user->g_read_board == '0') {
     http_authenticate_user();
-    exit($lang_common['No view']);
+    exit(__('No view'));
 }
 
 $action = isset($_GET['action']) ? strtolower($_GET['action']) : 'feed';
@@ -167,7 +167,7 @@ function http_authenticate_user()
 //
 function output_rss($feed)
 {
-    global $lang_common, $feather_config;
+    global $feather_config;
 
     // Send XML/no cache headers
     header('Content-Type: application/xml; charset=utf-8');
@@ -212,7 +212,7 @@ function output_rss($feed)
 //
 function output_atom($feed)
 {
-    global $lang_common, $feather_config;
+    global $feather_config;
 
     // Send XML/no cache headers
     header('Content-Type: application/atom+xml; charset=utf-8');
@@ -270,7 +270,7 @@ function output_atom($feed)
 //
 function output_xml($feed)
 {
-    global $lang_common, $feather_config;
+    global $feather_config;
 
     // Send XML/no cache headers
     header('Content-Type: application/xml; charset=utf-8');
@@ -370,7 +370,7 @@ function output_html($feed)
 
         if (!$cur_topic) {
             http_authenticate_user();
-            exit($lang_common['Bad request']);
+            exit(__('Bad request'));
         }
 
         if ($feather_config['o_censoring'] == '1') {
@@ -379,9 +379,9 @@ function output_html($feed)
 
         // Setup the feed
         $feed = array(
-            'title'        =>    $feather_config['o_board_title'].$lang_common['Title separator'].$cur_topic['subject'],
+            'title'        =>    $feather_config['o_board_title'].__('Title separator').$cur_topic['subject'],
             'link'            =>    get_link('topic/'.$tid.'/'.url_friendly($cur_topic['subject']).'/'),
-            'description'        =>    sprintf($lang_common['RSS description topic'], $cur_topic['subject']),
+            'description'        =>    sprintf(__('RSS description topic'), $cur_topic['subject']),
             'items'            =>    array(),
             'type'            =>    'posts'
         );
@@ -403,7 +403,7 @@ function output_html($feed)
 
             $item = array(
                 'id'            =>    $cur_post['id'],
-                'title'            =>    $cur_topic['first_post_id'] == $cur_post['id'] ? $cur_topic['subject'] : $lang_common['RSS reply'].$cur_topic['subject'],
+                'title'            =>    $cur_topic['first_post_id'] == $cur_post['id'] ? $cur_topic['subject'] : __('RSS reply').$cur_topic['subject'],
                 'link'            =>    get_link('post/'.$cur_post['id'].'/#p'.$cur_post['id']),
                 'description'        =>    $cur_post['message'],
                 'author'        =>    array(
@@ -458,7 +458,7 @@ function output_html($feed)
                     ->find_one_col('f.forum_name');
 
                 if ($cur_topic) {
-                    $forum_name = $lang_common['Title separator'].$cur_topic;
+                    $forum_name = __('Title separator').$cur_topic;
                 }
             }
         }
@@ -475,7 +475,7 @@ function output_html($feed)
 
         // Only attempt to cache if caching is enabled and we have all or a single forum
         if ($feather_config['o_feed_ttl'] > 0 && ($forum_sql == '' || ($forum_name != '' && !isset($_GET['nfid'])))) {
-            $cache_id = 'feed'.sha1($feather->user->g_id.'|'.$lang_common['lang_identifier'].'|'.($order_posted ? '1' : '0').($forum_name == '' ? '' : '|'.$fids[0]));
+            $cache_id = 'feed'.sha1($feather->user->g_id.'|'.__('lang_identifier').'|'.($order_posted ? '1' : '0').($forum_name == '' ? '' : '|'.$fids[0]));
         }
 
         // Load cached feed
@@ -489,7 +489,7 @@ function output_html($feed)
             $feed = array(
                 'title'        =>    $feather_config['o_board_title'].$forum_name,
                 'link'            =>    '/index.php',
-                'description'    =>    sprintf($lang_common['RSS description'], $feather_config['o_board_title']),
+                'description'    =>    sprintf(__('RSS description'), $feather_config['o_board_title']),
                 'items'            =>    array(),
                 'type'            =>    'topics'
             );
@@ -663,4 +663,4 @@ function output_html($feed)
     exit;
 }
 // If we end up here, the script was called with some wacky parameters
-exit($lang_common['Bad request']);
+exit(__('Bad request'));
diff --git a/include/cache.php b/include/cache.php
index dba2e878..b275e400 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -56,7 +56,7 @@ function generate_bans_cache()
 //
 function generate_quickjump_cache($group_id = false)
 {
-    global $lang_common;
+
 
     $groups = array();
 
@@ -103,7 +103,7 @@ function generate_quickjump_cache($group_id = false)
                             ->find_many();
 
             if ($result) {
-                $output .= "\t\t\t\t".'<form id="qjump" method="get" action="">'."\n\t\t\t\t\t".'<div><label><span><?php echo $lang_common[\'Jump to\'] ?>'.'<br /></span>'."\n\t\t\t\t\t".'<select name="id" onchange="window.location=(\''.get_link('forum/').'\'+this.options[this.selectedIndex].value)">'."\n";
+                $output .= "\t\t\t\t".'<form id="qjump" method="get" action="">'."\n\t\t\t\t\t".'<div><label><span><?php echo __(\'Jump to\') ?>'.'<br /></span>'."\n\t\t\t\t\t".'<select name="id" onchange="window.location=(\''.get_link('forum/').'\'+this.options[this.selectedIndex].value)">'."\n";
 
                 $cur_category = 0;
                 foreach ($result as $cur_forum) {
@@ -122,7 +122,7 @@ function generate_quickjump_cache($group_id = false)
                     $output .= "\t\t\t\t\t\t\t".'<option value="'.$cur_forum['fid'].'/'.url_friendly($cur_forum['forum_name']).'/'.'"<?php echo ($forum_id == '.$cur_forum['fid'].') ? \' selected="selected"\' : \'\' ?>>'.feather_escape($cur_forum['forum_name']).$redirect_tag.'</option>'."\n";
                 }
 
-                $output .= "\t\t\t\t\t\t".'</optgroup>'."\n\t\t\t\t\t".'</select></label>'."\n\t\t\t\t\t".'<input type="submit" value="<?php echo $lang_common[\'Go\'] ?>" accesskey="g" />'."\n\t\t\t\t\t".'</div>'."\n\t\t\t\t".'</form>'."\n";
+                $output .= "\t\t\t\t\t\t".'</optgroup>'."\n\t\t\t\t\t".'</select></label>'."\n\t\t\t\t\t".'<input type="submit" value="<?php echo __(\'Go\') ?>" accesskey="g" />'."\n\t\t\t\t\t".'</div>'."\n\t\t\t\t".'</form>'."\n";
             }
         }
 
diff --git a/include/common.php b/include/common.php
index ad95a092..d617810b 100644
--- a/include/common.php
+++ b/include/common.php
@@ -145,10 +145,15 @@
 // Check/update/set cookie and fetch user info
 check_cookie();
 
-// Attempt to load the common language file
-if (file_exists(FEATHER_ROOT.'lang/'.$feather->user->language.'/common.php')) {
-    include FEATHER_ROOT.'lang/'.$feather->user->language.'/common.php';
-} else {
+// Load l10n
+require_once FEATHER_ROOT.'include/pomo/MO.php';
+require_once FEATHER_ROOT.'include/l10n.php';
+
+// Attempt to load the language file
+if (file_exists(FEATHER_ROOT.'lang/'.$feather->user->language.'/common.mo')) {
+    load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/common.mo');
+}
+else {
     die('There is no valid language pack \''.feather_escape($feather->user->language).'\' installed. Please reinstall a language of that name');
 }
 
@@ -179,7 +184,7 @@
 
 // Check to see if we logged in without a cookie being set
 if ($feather->user->is_guest && isset($_GET['login'])) {
-    message($lang_common['No cookie']);
+    message(__('No cookie'));
 }
 
 // 32kb should be more than enough for forum posts
diff --git a/include/email.php b/include/email.php
index 4300cf85..619d9736 100644
--- a/include/email.php
+++ b/include/email.php
@@ -261,14 +261,14 @@ function bbcode2email($text, $wrap_length = 72)
 //
 function pun_mail($to, $subject, $message, $reply_to_email = '', $reply_to_name = '')
 {
-    global $feather_config, $lang_common;
+    global $feather_config;
 
     // Use \r\n for SMTP servers, the system's line ending for local mailers
     $smtp = $feather_config['o_smtp_host'] != '';
     $EOL = $smtp ? "\r\n" : FORUM_EOL;
 
     // Default sender/return address
-    $from_name = sprintf($lang_common['Mailer'], $feather_config['o_board_title']);
+    $from_name = sprintf(__('Mailer'), $feather_config['o_board_title']);
     $from_email = $feather_config['o_webmaster_email'];
 
     // Do a little spring cleaning
diff --git a/include/functions.php b/include/functions.php
index 49937c1d..ab906f78 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -331,7 +331,7 @@ function feather_setcookie($user_id, $password, $expires)
 //
 function check_bans()
 {
-    global $feather_config, $lang_common, $feather_bans;
+    global $feather_config, $feather_bans;
 
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
@@ -384,7 +384,7 @@ function check_bans()
         if ($is_banned) {
             \DB::for_table('online')->where('ident', $feather->user->username)
                                                  ->delete_many();
-            message($lang_common['Ban message'].' '.(($cur_ban['expire'] != '') ? $lang_common['Ban message 2'].' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? $lang_common['Ban message 3'].'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').$lang_common['Ban message 4'].' <a href="mailto:'.feather_escape($feather_config['o_admin_email']).'">'.feather_escape($feather_config['o_admin_email']).'</a>.', true, true, true);
+            message(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.feather_escape($feather_config['o_admin_email']).'">'.feather_escape($feather_config['o_admin_email']).'</a>.', true, true, true);
         }
     }
 
@@ -404,7 +404,7 @@ function check_bans()
 //
 function check_username($username, $errors, $exclude_id = null)
 {
-    global $feather, $feather_config, $errors, $lang_prof_reg, $lang_register, $lang_common, $feather_bans;
+    global $feather, $feather_config, $errors, $lang_prof_reg, $lang_register, $feather_bans;
 
     // Include UTF-8 function
     require_once FEATHER_ROOT.'include/utf8/strcasecmp.php';
@@ -417,7 +417,7 @@ function check_username($username, $errors, $exclude_id = null)
         $errors[] = $lang_prof_reg['Username too short'];
     } elseif (feather_strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
         $errors[] = $lang_prof_reg['Username too long'];
-    } elseif (!strcasecmp($username, 'Guest') || !utf8_strcasecmp($username, $lang_common['Guest'])) {
+    } elseif (!strcasecmp($username, 'Guest') || !utf8_strcasecmp($username, __('Guest'))) {
         $errors[] = $lang_prof_reg['Username guest'];
     } elseif (preg_match('%[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}%', $username) || preg_match('%((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))%', $username)) {
         $errors[] = $lang_prof_reg['Username IP'];
@@ -521,7 +521,7 @@ function generate_avatar_markup($user_id)
 //
 function generate_page_title($page_title, $p = null)
 {
-    global $lang_common;
+
 
     if (!is_array($page_title)) {
         $page_title = array($page_title);
@@ -530,10 +530,10 @@ function generate_page_title($page_title, $p = null)
     $page_title = array_reverse($page_title);
 
     if ($p > 1) {
-        $page_title[0] .= ' ('.sprintf($lang_common['Page'], forum_number_format($p)).')';
+        $page_title[0] .= ' ('.sprintf(__('Page'), forum_number_format($p)).')';
     }
 
-    $crumbs = implode($lang_common['Title separator'], $page_title);
+    $crumbs = implode(__('Title separator'), $page_title);
 
     return $crumbs;
 }
@@ -796,7 +796,7 @@ function censor_words($text)
 //
 function get_title($user)
 {
-    global $feather_bans, $lang_common;
+    global $feather_bans;
     static $ban_list;
 
     // If not already built in a previous call, build an array of lowercase banned usernames
@@ -814,7 +814,7 @@ function get_title($user)
     }
     // If the user is banned
     elseif (in_array(utf8_strtolower($user['username']), $ban_list)) {
-        $user_title = $lang_common['Banned'];
+        $user_title = __('Banned');
     }
     // If the user group has a default user title
     elseif ($user['g_user_title'] != '') {
@@ -822,11 +822,11 @@ function get_title($user)
     }
     // If the user is a guest
     elseif ($user['g_id'] == FEATHER_GUEST) {
-        $user_title = $lang_common['Guest'];
+        $user_title = __('Guest');
     }
     // If nothing else helps, we assign the default
     else {
-        $user_title = $lang_common['Member'];
+        $user_title = __('Member');
     }
 
     return $user_title;
@@ -838,7 +838,7 @@ function get_title($user)
 //
 function paginate($num_pages, $cur_page, $link, $args = null)
 {
-    global $lang_common;
+
 
     $pages = array();
     $link_to_all = false;
@@ -854,14 +854,14 @@ function paginate($num_pages, $cur_page, $link, $args = null)
     } else {
         // Add a previous page link
         if ($num_pages > 1 && $cur_page > 1) {
-            $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', ($cur_page - 1), $args).'">'.$lang_common['Previous'].'</a>';
+            $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', ($cur_page - 1), $args).'">'.__('Previous').'</a>';
         }
 
         if ($cur_page > 3) {
             $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'">1</a>';
 
             if ($cur_page > 5) {
-                $pages[] = '<span class="spacer">'.$lang_common['Spacer'].'</span>';
+                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
             }
         }
 
@@ -878,7 +878,7 @@ function paginate($num_pages, $cur_page, $link, $args = null)
 
         if ($cur_page <= ($num_pages-3)) {
             if ($cur_page != ($num_pages-3) && $cur_page != ($num_pages-4)) {
-                $pages[] = '<span class="spacer">'.$lang_common['Spacer'].'</span>';
+                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
             }
 
             $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', $num_pages, $args).'">'.forum_number_format($num_pages).'</a>';
@@ -886,7 +886,7 @@ function paginate($num_pages, $cur_page, $link, $args = null)
 
         // Add a next page link
         if ($num_pages > 1 && !$link_to_all && $cur_page < $num_pages) {
-            $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', ($cur_page + 1), $args).'">'.$lang_common['Next'].'</a>';
+            $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', ($cur_page + 1), $args).'">'.__('Next').'</a>';
         }
     }
 
@@ -899,7 +899,7 @@ function paginate($num_pages, $cur_page, $link, $args = null)
 //
 function paginate_old($num_pages, $cur_page, $link)
 {
-    global $lang_common;
+
 
     $pages = array();
     $link_to_all = false;
@@ -915,14 +915,14 @@ function paginate_old($num_pages, $cur_page, $link)
     } else {
         // Add a previous page link
         if ($num_pages > 1 && $cur_page > 1) {
-            $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.($cur_page == 2 ? '' : '&amp;p='.($cur_page - 1)).'">'.$lang_common['Previous'].'</a>';
+            $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.($cur_page == 2 ? '' : '&amp;p='.($cur_page - 1)).'">'.__('Previous').'</a>';
         }
 
         if ($cur_page > 3) {
             $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'">1</a>';
 
             if ($cur_page > 5) {
-                $pages[] = '<span class="spacer">'.$lang_common['Spacer'].'</span>';
+                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
             }
         }
 
@@ -939,7 +939,7 @@ function paginate_old($num_pages, $cur_page, $link)
 
         if ($cur_page <= ($num_pages-3)) {
             if ($cur_page != ($num_pages-3) && $cur_page != ($num_pages-4)) {
-                $pages[] = '<span class="spacer">'.$lang_common['Spacer'].'</span>';
+                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
             }
 
             $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.$num_pages.'">'.forum_number_format($num_pages).'</a>';
@@ -947,7 +947,7 @@ function paginate_old($num_pages, $cur_page, $link)
 
         // Add a next page link
         if ($num_pages > 1 && !$link_to_all && $cur_page < $num_pages) {
-            $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.($cur_page +1).'">'.$lang_common['Next'].'</a>';
+            $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.($cur_page +1).'">'.__('Next').'</a>';
         }
     }
 
@@ -961,7 +961,7 @@ function paginate_old($num_pages, $cur_page, $link)
 
 function message($msg, $http_status = null, $no_back_link = false, $dontStop = false)
 {
-    global $lang_common;
+
 
     // Did we receive a custom header?
     if (!is_null($http_status)) {
@@ -980,7 +980,7 @@ function message($msg, $http_status = null, $no_back_link = false, $dontStop = f
     $feather->response->setBody('');
 
     if (!defined('FEATHER_HEADER')) {
-        $page_title = array(feather_escape($feather->config['o_board_title']), $lang_common['Info']);
+        $page_title = array(feather_escape($feather->config['o_board_title']), __('Info'));
 
         if (!defined('FEATHER_ACTIVE_PAGE')) {
             define('FEATHER_ACTIVE_PAGE', 'index');
@@ -996,7 +996,6 @@ function message($msg, $http_status = null, $no_back_link = false, $dontStop = f
     }
 
     $feather->render('message.php', array(
-        'lang_common' => $lang_common,
         'message'    =>    $msg,
         'no_back_link'    => $no_back_link,
         ));
@@ -1018,10 +1017,10 @@ function message($msg, $http_status = null, $no_back_link = false, $dontStop = f
 //
 function format_time($timestamp, $date_only = false, $date_format = null, $time_format = null, $time_only = false, $no_text = false)
 {
-    global $lang_common, $forum_date_formats, $forum_time_formats;
+    global $forum_date_formats, $forum_time_formats;
 
     if ($timestamp == '') {
-        return $lang_common['Never'];
+        return __('Never');
     }
 
     // Get Slim current session
@@ -1045,9 +1044,9 @@ function format_time($timestamp, $date_only = false, $date_format = null, $time_
 
     if (!$no_text) {
         if ($date == $today) {
-            $date = $lang_common['Today'];
+            $date = __('Today');
         } elseif ($date == $yesterday) {
-            $date = $lang_common['Yesterday'];
+            $date = __('Yesterday');
         }
     }
 
@@ -1066,9 +1065,9 @@ function format_time($timestamp, $date_only = false, $date_format = null, $time_
 //
 function forum_number_format($number, $decimals = 0)
 {
-    global $lang_common;
 
-    return is_numeric($number) ? number_format($number, $decimals, $lang_common['lang_decimal_point'], $lang_common['lang_thousands_sep']) : $number;
+
+    return is_numeric($number) ? number_format($number, $decimals, __('lang_decimal_point'), __('lang_thousands_sep')) : $number;
 }
 
 
@@ -1243,7 +1242,7 @@ function is_all_uppercase($string)
 //
 function maintenance_message()
 {
-    global $lang_common, $feather_config, $tpl_main;
+    global $feather_config, $tpl_main;
 
     // Deal with newlines, tabs and multiple spaces
     $pattern = array("\t", '  ', '  ');
@@ -1253,7 +1252,7 @@ function maintenance_message()
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
 
-    $page_title = array(feather_escape($feather_config['o_board_title']), $lang_common['Maintenance']);
+    $page_title = array(feather_escape($feather_config['o_board_title']), __('Maintenance'));
 
     if (!defined('FEATHER_ACTIVE_PAGE')) {
         define('FEATHER_ACTIVE_PAGE', 'index');
@@ -1269,7 +1268,6 @@ function maintenance_message()
     $header->setTitle($page_title)->display();
 
     $feather->render('message.php', array(
-            'lang_common' => $lang_common,
             'message'    =>    $message,
             'no_back_link'    =>    '',
         )
@@ -1411,15 +1409,13 @@ function remove_bad_characters($array)
 //
 function file_size($size)
 {
-    global $lang_common;
-
     $units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB');
 
     for ($i = 0; $size > 1024; $i++) {
         $size /= 1024;
     }
 
-    return sprintf($lang_common['Size unit '.$units[$i]], round($size, 2));
+    return sprintf(__('Size unit '.$units[$i]), round($size, 2));
 }
 
 
@@ -1707,19 +1703,19 @@ function forum_is_writable($path)
 //
 function display_saved_queries()
 {
-    global $lang_common;
+
 
     ?>
 
 <div id="debug" class="blocktable">
-	<h2><span><?php echo $lang_common['Debug table'] ?></span></h2>
+	<h2><span><?php echo __('Debug table') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Query times'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_common['Query'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Query times') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Query') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -1738,7 +1734,7 @@ function display_saved_queries()
     }
         ?>
 				<tr>
-					<td class="tcl" colspan="2"><?php printf($lang_common['Total query time'], $query_time_total.' s') ?></td>
+					<td class="tcl" colspan="2"><?php printf(__('Total query time'), $query_time_total.' s') ?></td>
 				</tr>
 			</tbody>
 			</table>
diff --git a/include/l10n.php b/include/l10n.php
new file mode 100644
index 00000000..ce27af92
--- /dev/null
+++ b/include/l10n.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Load a .mo file into the text domain $domain.
+ *
+ * If the text domain already exists, the translations will be merged. If both
+ * sets have the same string, the translation from the original value will be taken.
+ *
+ * On success, the .mo file will be placed in the $l10n global by $domain
+ * and will be a MO object.
+ *
+ * @param    string     $domain Text domain. Unique identifier for retrieving translated strings.
+ * @param    string     $mofile Path to the .mo file.
+ * 
+ * @return   boolean    True on success, false on failure.
+ *
+ * Inspired from Luna <http://getluna.org>
+ */
+function load_textdomain($domain, $mofile) {
+
+	global $l10n;
+
+	if (!is_readable($mofile)) {
+		return false;
+	}
+
+	$mo = new MO();
+	if (!$mo->import_from_file($mofile)) {
+		return false;
+	}
+
+	if (isset($l10n[$domain])) {
+		$mo->merge_with($l10n[$domain]);
+	}
+
+	$l10n[$domain] = &$mo;
+
+	return true;
+}
+
+function __($text, $domain = 'featherbb') {
+
+	return luna_translate($text, $domain);
+}
+
+function _e($text, $domain = 'featherbb') {
+
+	echo luna_translate($text, $domain);
+}
+
+function _n($single, $plural, $number, $domain = 'featherbb') {
+
+	$translations = load_translations($domain);
+	$translation = $translations->translate_plural($single, $plural, $number);
+
+	return $translation;
+}
+
+function luna_translate($text, $domain = 'featherbb') {
+
+	$translations = load_translations($domain);
+	$translations = $translations->translate($text);
+
+	return $translations;
+}
+
+function load_translations($domain) {
+
+	global $l10n;
+
+	if (!isset($l10n[$domain])) {
+		$l10n[$domain] = new NOOPTranslations;
+	}
+
+	return $l10n[$domain];
+}
\ No newline at end of file
diff --git a/include/parser.php b/include/parser.php
index 69e287dc..69ee422d 100644
--- a/include/parser.php
+++ b/include/parser.php
@@ -118,7 +118,7 @@ function matches one BBCode open/close pair. The BBCode tag components are
 *********************************************************** */
 function _preparse_bbcode_callback($matches)
 {
-    global $lang_common, $errors, $pd;
+    global $errors, $pd;
     
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
@@ -143,7 +143,7 @@ function _preparse_bbcode_callback($matches)
         if ($contents === null) {
             // On error, preg_replace_callback returns NULL.
  // Error #1: '(%s) Message is too long or too complex. Please shorten.'
-            $new_errors[] = sprintf($lang_common['BBerr pcre'], preg_error());
+            $new_errors[] = sprintf(__('BBerr pcre'), preg_error());
             $contents = ''; // Zero out the contents.
         }
     }
@@ -179,22 +179,22 @@ function _preparse_bbcode_callback($matches)
             // which is either unexpected or unrecognized.
  // Error #2: 'Unexpected attribute: "%1$s". (No attribute allowed for [%2$s].'.
             $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = sprintf($lang_common['BBerr unexpected attribute'], $attribute, $tagname);
+            $new_errors[] = sprintf(__('BBerr unexpected attribute'), $attribute, $tagname);
         } else { // Error #3: 'Unrecognized attribute: "%1$s", is not valid for [%2$s].'
             $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = sprintf($lang_common['BBerr unrecognized attribute'], $attribute, $tagname);
+            $new_errors[] = sprintf(__('BBerr unrecognized attribute'), $attribute, $tagname);
         }
         // Make sure attribute does nor contain a valid BBcode tag.
         if (preg_match($pd['re_bbtag'], $attribute)) { // Error #4: 'Attribute may NOT contain open or close bbcode tags'
             $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = $lang_common['BBerr bbcode attribute'];
+            $new_errors[] = __('BBerr bbcode attribute');
         }
         // Validate and filter tag's attribute value if and according to custom attribute regex.
         if (isset($handler['a_regex'])) { // Check if this tag has an attribute regex? (very rare)
             if (preg_match($handler['a_regex'], $attribute, $m)) { // Yes. Check if regex matches attribute?
                 $attribute = $m[1];
             } else { // Error #4b: 'Invalid attribute, [%s] requires specific attribute.'
-                $new_errors[] = sprintf($lang_common['BBerr invalid attrib'], $tagname);
+                $new_errors[] = sprintf(__('BBerr invalid attrib'), $tagname);
             }
         }
     } else { // Attribute not specified. Use the NO_ATTRIB handler if it exixts else error.
@@ -204,7 +204,7 @@ function _preparse_bbcode_callback($matches)
             $handler =& $tag['handlers']['NO_ATTRIB'];        // no-attribute handler. Otherwise...
         } else { // Error #5: '[%1$s] is missing a required attribute.'.
             $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = sprintf($lang_common['BBerr missing attribute'], $tagname);
+            $new_errors[] = sprintf(__('BBerr missing attribute'), $tagname);
         }
     }
     // -------------------------------------------------------
@@ -220,7 +220,7 @@ function _preparse_bbcode_callback($matches)
             $fmt_open = $fmt_close = '';
             break;
         case 'err':    // Error #6: '[%1$s] tag nesting depth: %2$d exceeds allowable limit: %3$d.'.
-            $new_errors[] = sprintf($lang_common['BBerr nesting overflow'],
+            $new_errors[] = sprintf(__('BBerr nesting overflow'),
                                 $tagname, $tag['depth'], $tag['depth_max']);
             break;
         default:
@@ -231,14 +231,14 @@ function _preparse_bbcode_callback($matches)
         // Are we illegitimate?
     // Yes. Pick between error #6 and #7.
         if ($parent === $tagname) { // Error #7: '[%s] was opened within itself, this is not allowed.'
-            $new_errors[] = sprintf($lang_common['BBerr self-nesting'], $tagname);
+            $new_errors[] = sprintf(__('BBerr self-nesting'), $tagname);
         } else { // Error #8: '[%1$s] was opened within [%2$s], this is not allowed.'
-            $new_errors[] = sprintf($lang_common['BBerr invalid nesting'], $tagname, $parent);
+            $new_errors[] = sprintf(__('BBerr invalid nesting'), $tagname, $parent);
         }
     }
     // Verfify our parent tag is in our 'parents' allowable array if it exists.
     if (isset($tag['parents']) && !isset($tag['parents'][$parent])) { // Error #9: '[%1$s] cannot be within: [%2$s]. Allowable parent tags: %3$s.'.
-        $new_errors[] = sprintf($lang_common['BBerr invalid parent'],
+        $new_errors[] = sprintf(__('BBerr invalid parent'),
             $tagname, $parent, '('. implode('), (', array_keys($tag['parents'])) .')');
     }
     // -----------------------------------------
@@ -266,18 +266,18 @@ function _preparse_bbcode_callback($matches)
         $contents = preg_replace(array('/^\s+/', '/\s+$/S'), '', $contents);
         // Handle special case link to a
         if ($feather->user->g_post_links != '1') {
-            $new_errors[] = $lang_common['BBerr cannot post URLs'];
+            $new_errors[] = __('BBerr cannot post URLs');
         }
         else if (($m = url_valid($contents))) {
             $contents = $m['url']; // Fetch possibly more complete url address.
         } else { // Error #10a: 'Invalid URL name: %s'.
-            $new_errors[] = sprintf($lang_common['BBerr Invalid URL name'], $contents);
+            $new_errors[] = sprintf(__('BBerr Invalid URL name'), $contents);
         }
         break;
 
     case 'email':
         if (filter_var($contents, FILTER_VALIDATE_EMAIL)) { // Error #10c: 'Invalid email address: %s'.
-            $new_errors[] = sprintf($lang_common['BBerr Invalid email address'], $contents);
+            $new_errors[] = sprintf(__('BBerr Invalid email address'), $contents);
         }
         break;
 
@@ -308,20 +308,20 @@ function _preparse_bbcode_callback($matches)
         if (($m = url_valid($attribute))) {
             $attribute = $m['url']; // Fetch possibly more complete url address.
         } else { // Error #10b: 'Invalid URL name: %s'.
-            $new_errors[] = sprintf($lang_common['BBerr Invalid URL name'], $attribute);
+            $new_errors[] = sprintf(__('BBerr Invalid URL name'), $attribute);
         }
         break;
 
     case 'color':
         if (!preg_match($pd['re_color'], $attribute)) { // Error #11: 'Invalid color attribute: %s'.
-            $new_errors[] = sprintf($lang_common['BBerr Invalid color'], $attribute);
+            $new_errors[] = sprintf(__('BBerr Invalid color'), $attribute);
         }
         break;
 
     case 'email':
         // TODO: improve this quick-n-dirty email check.
         if (!preg_match('/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,6}$/i', $attribute)) { // Error #10c: 'Invalid email address: %s'.
-            $new_errors[] = sprintf($lang_common['BBerr Invalid email address'], $attribute);
+            $new_errors[] = sprintf(__('BBerr Invalid email address'), $attribute);
         }
         break;
 
@@ -376,13 +376,13 @@ function _preparse_bbcode_callback($matches)
                                             } // Else remote image fits. Do nothing special with width and height.
                                         }
                                     } else { // Error #13: 'Unable to retrieve image data from remote url: %s'.
-                                        $new_errors[] = sprintf($lang_common['BBerr bad meta data'], $contents);
+                                        $new_errors[] = sprintf(__('BBerr bad meta data'), $contents);
                                     } // NOTE: cannot generate this error.
                                 } else { // Filesize of remote image is too big. Silently convert to link if possible.
                                     if (isset($pd['bbcd']['url']) && $pd['bbcd']['url']['depth'] === 0) {
                                         $fmt_open  = '{[url='. $contents .']';
                                         $fmt_close = '[/url]}';
-                                        $contents = $lang_common['BBmsg big image'];
+                                        $contents = __('BBmsg big image');
                                     } else { // Image within a url cannot be linkified. Just display url name.
                                         $contents = '{'. $contents .'}';
                                         $fmt_open  = '';
@@ -392,16 +392,16 @@ function _preparse_bbcode_callback($matches)
                             } else {
                                 // $size not set.
  // Error #14: 'Unable to determine remote file size.'.
-                                $new_errors[] = $lang_common['BBerr no file size'];
+                                $new_errors[] = __('BBerr no file size');
                             } // NOTE: cannot generate this error.
                         } else { // Error #15: 'Remote url does not have Content-Type: "image".'
-                            $new_errors[] = $lang_common['BBerr non image'];
+                            $new_errors[] = __('BBerr non image');
                         }
                     } else { // Error #16: 'Bad HTTP response header: "%s"'.
-                        $new_errors[] = sprintf($lang_common['BBerr bad http response'], $http[0]);
+                        $new_errors[] = sprintf(__('BBerr bad http response'), $http[0]);
                     }
                 } else { // Error #17: 'Unable to read remote image http headers.'.
-                    $new_errors[] = $lang_common['BBerr bad headers'];
+                    $new_errors[] = __('BBerr bad headers');
                 }
             } // Image validation turned off. Do nothing.
         } else { // Non-Error: IMG tag self nesting. Handle by silently stripping tags with no error.
@@ -507,7 +507,7 @@ function _preparse_bbcode_callback($matches)
         if (preg_match($handler['c_regex'], $contents, $m)) {
             $contents = $m[1];
         } else { // Error #12: 'Invalid content, [%s] requires specific content.'
-            $new_errors[] = sprintf($lang_common['BBerr invalid content'], $tagname);
+            $new_errors[] = sprintf(__('BBerr invalid content'), $tagname);
         }
     }
     // Silently strip empty or all-white tags:
@@ -572,7 +572,7 @@ function _preparse_bbcode_callback($matches)
  */
 function preparse_bbcode($text, &$errors, $is_signature = false)
 {
-    global $lang_common, $feather_config, $pd;
+    global $feather_config, $pd;
 
     $pd['new_errors'] = array(); // Reset the parser error message stack.
     $pd['in_signature'] = ($is_signature) ? true : false;
@@ -581,7 +581,7 @@ function preparse_bbcode($text, &$errors, $is_signature = false)
     if ($newtext === null) {
         // On error, preg_replace_callback returns NULL.
  // Error #1: '(%s) Message is too long or too complex. Please shorten.'
-        $errors[] = sprintf($lang_common['BBerr pcre'], preg_error());
+        $errors[] = sprintf(__('BBerr pcre'), preg_error());
         return $text;
     }
     $newtext = str_replace("\3", '[', $newtext); // Fixup CODE sections.
@@ -628,11 +628,11 @@ function preparse_bbcode($text, &$errors, $is_signature = false)
 //
 function _orphan_callback($matches)
 {
-    global $pd, $lang_common;
+    global $pd;
     if ($matches[0][1] === '/') { // Error #18: 'Orphan close tag: [/%s] is missing its open tag.'
-        $errmsg = sprintf($lang_common['BBerr orphan close'], $matches[1]);
+        $errmsg = sprintf(__('BBerr orphan close'), $matches[1]);
     } else { // Error #19: 'Orphan open tag: [%s] is missing its close tag.'
-        $errmsg = sprintf($lang_common['BBerr orphan open'], $matches[1]);
+        $errmsg = sprintf(__('BBerr orphan open'), $matches[1]);
     }
     $pd['new_errors'][] = $errmsg;    // Append to array of errors so far.
     return '[err='. $errmsg .']'. $matches[0] .'[/err]';
@@ -731,7 +731,7 @@ function preg_error()
 *********************************************************** */
 function _parse_bbcode_callback($matches)
 {
-    global $pd, $lang_common;
+    global $pd;
     $tagname =& $matches[1];            // TAGNAME we are currently servicing.
     $contents =& $matches[6];            // Shortcut to contents.
     $tag =& $pd['bbcd'][$tagname];        // Shortcut to bbcd array entry.
@@ -852,10 +852,10 @@ function _parse_bbcode_callback($matches)
                 $format = "{%c_str%}";
             } else {
                 if ($attribute) {
-                    $format = '{<a href="%c_str%" title="%a_str%">'. $lang_common['Image link'] .'</a>}';
+                    $format = '{<a href="%c_str%" title="%a_str%">'. __('Image link') .'</a>}';
                 } else {
-                    $format = '{<a href="%c_str%" title="'. $lang_common['BBmsg images disabled'] .'">'.
-                    $lang_common['Image link'] .'</a>}';
+                    $format = '{<a href="%c_str%" title="'. __('BBmsg images disabled') .'">'.
+                    __('Image link') .'</a>}';
                 }
                 $enabled = true; // Re-enable to override defauslt disabled handling (i.e. dont delete.)
             }
@@ -879,12 +879,12 @@ function _parse_bbcode_callback($matches)
                 // Check for optional embedded post id.
  // Attribute has optional '#1234' quoted post ID number. Convert to link back to quoted post.
                 $attribute = preg_replace('/\s*#\d++$/S', '', $attribute); // Strip post id from attribute.
-                $attribute .= ' '. $lang_common['wrote'];  // Append language-specific "wrote:".
+                $attribute .= ' '. __('wrote');  // Append language-specific "wrote:".
                 if ($pd['config']['quote_links']) {
                     $attribute = ' <a href="'. get_link('post/'.$m[1].'/#p'.$m[1]) .'">'. $attribute .'</a>';
                 }
             } else {
-                $attribute .= ' '. $lang_common['wrote'];
+                $attribute .= ' '. __('wrote');
             } // If no post id, just add "wrote:".
         }
         break;
diff --git a/include/pomo/.editorconfig b/include/pomo/.editorconfig
new file mode 100644
index 00000000..a6c9cc43
--- /dev/null
+++ b/include/pomo/.editorconfig
@@ -0,0 +1,16 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.php]
+indent_size = 4
diff --git a/include/pomo/MO.php b/include/pomo/MO.php
new file mode 100644
index 00000000..d3a25de3
--- /dev/null
+++ b/include/pomo/MO.php
@@ -0,0 +1,313 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+require_once dirname(__FILE__) . '/Streams/Reader.php';
+require_once dirname(__FILE__) . '/Streams/FileReader.php';
+require_once dirname(__FILE__) . '/Translations/NOOPTranslations.php';
+require_once dirname(__FILE__) . '/Translations/GettextTranslations.php';
+require_once dirname(__FILE__) . '/Translations/EntryTranslations.php';
+
+/**
+ * Class for working with MO files
+ */
+class MO extends GettextTranslations
+{
+    public $_nplurals = 2;
+
+    /**
+     * Fills up with the entries from MO file $filename
+     *
+     * @param  string $filename MO file to load
+     * @return bool   Success
+     */
+    public function import_from_file($filename)
+    {
+        $reader = new FileReader($filename);
+        if (!$reader->is_resource()) {
+            return false;
+        }
+
+        return $this->import_from_reader($reader);
+    }
+
+    public function export_to_file($filename)
+    {
+        $fh = fopen($filename, 'wb');
+        if (!$fh) {
+            return false;
+        }
+        $res = $this->export_to_file_handle($fh);
+        fclose($fh);
+
+        return $res;
+    }
+
+    public function export()
+    {
+        $tmp_fh = fopen("php://temp", 'r+');
+        if (!$tmp_fh) {
+            return false;
+        }
+        $this->export_to_file_handle($tmp_fh);
+        rewind($tmp_fh);
+
+        return stream_get_contents($tmp_fh);
+    }
+
+    public function is_entry_good_for_export($entry)
+    {
+        if (empty($entry->translations)) {
+            return false;
+        }
+
+        if (!array_filter($entry->translations)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function export_to_file_handle($fh)
+    {
+        $entries = array_filter(
+            $this->entries,
+            array($this, 'is_entry_good_for_export')
+        );
+        ksort($entries);
+        $magic = 0x950412de;
+        $revision = 0;
+        $total = count($entries) + 1; // all the headers are one entry
+        $originals_lenghts_addr = 28;
+        $translations_lenghts_addr = $originals_lenghts_addr + 8 * $total;
+        $size_of_hash = 0;
+        $hash_addr = $translations_lenghts_addr + 8 * $total;
+        $current_addr = $hash_addr;
+        fwrite($fh, pack(
+                'V*',
+                $magic,
+                $revision,
+                $total,
+                $originals_lenghts_addr,
+                $translations_lenghts_addr,
+                $size_of_hash,
+                $hash_addr
+            ));
+        fseek($fh, $originals_lenghts_addr);
+
+        // headers' msgid is an empty string
+        fwrite($fh, pack('VV', 0, $current_addr));
+        $current_addr++;
+        $originals_table = chr(0);
+
+        $reader = new Reader();
+
+        foreach ($entries as $entry) {
+            $originals_table .= $this->export_original($entry) . chr(0);
+            $length = $reader->strlen($this->export_original($entry));
+            fwrite($fh, pack('VV', $length, $current_addr));
+            $current_addr += $length + 1; // account for the NULL byte after
+        }
+
+        $exported_headers = $this->export_headers();
+        fwrite($fh, pack(
+            'VV',
+            $reader->strlen($exported_headers),
+            $current_addr)
+        );
+        $current_addr += strlen($exported_headers) + 1;
+        $translations_table = $exported_headers . chr(0);
+
+        foreach ($entries as $entry) {
+            $translations_table .= $this->export_translations($entry).chr(0);
+            $length = $reader->strlen($this->export_translations($entry));
+            fwrite($fh, pack('VV', $length, $current_addr));
+            $current_addr += $length + 1;
+        }
+
+        fwrite($fh, $originals_table);
+        fwrite($fh, $translations_table);
+
+        return true;
+    }
+
+    public function export_original($entry)
+    {
+        //TODO: warnings for control characters
+        $exported = $entry->singular;
+        if ($entry->is_plural) {
+            $exported .= chr(0).$entry->plural;
+        }
+        if (!is_null($entry->context)) {
+            $exported = $entry->context.chr(4).$exported;
+        }
+
+        return $exported;
+    }
+
+    public function export_translations($entry)
+    {
+        //TODO: warnings for control characters
+        return implode(chr(0), $entry->translations);
+    }
+
+    public function export_headers()
+    {
+        $exported = '';
+        foreach ($this->headers as $header => $value) {
+            $exported .= "$header: $value\n";
+        }
+
+        return $exported;
+    }
+
+    public function get_byteorder($magic)
+    {
+        // The magic is 0x950412de
+        $magic_little = (int) - 1794895138;
+        $magic_little_64 = (int) 2500072158;
+        // 0xde120495
+        $magic_big = ((int) - 569244523) & 0xFFFFFFFF;
+        if ($magic_little == $magic || $magic_little_64 == $magic) {
+            return 'little';
+        } elseif ($magic_big == $magic) {
+            return 'big';
+        } else {
+            return false;
+        }
+    }
+
+    public function import_from_reader($reader)
+    {
+        $endian_string = $this->get_byteorder($reader->readint32());
+        if (false === $endian_string) {
+            return false;
+        }
+        $reader->setEndian($endian_string);
+
+        $endian = ('big' == $endian_string) ? 'N' : 'V';
+
+        $header = $reader->read(24);
+        if ($reader->strlen($header) != 24) {
+            return false;
+        }
+
+        // parse header
+        $header = unpack("{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header);
+        if (!is_array($header)) {
+            return false;
+        }
+
+        // support revision 0 of MO format specs, only
+        if ($header['revision'] != 0) {
+            return false;
+        }
+
+        // seek to data blocks
+        $reader->seekto($header['originals_lenghts_addr']);
+
+        // read originals' indices
+        $originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr'];
+        if ($originals_lengths_length != $header['total'] * 8) {
+            return false;
+        }
+
+        $originals = $reader->read($originals_lengths_length);
+        if ($reader->strlen($originals) != $originals_lengths_length) {
+            return false;
+        }
+
+        // read translations' indices
+        $translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr'];
+        if ($translations_lenghts_length != $header['total'] * 8) {
+            return false;
+        }
+
+        $translations = $reader->read($translations_lenghts_length);
+        if ($reader->strlen($translations) != $translations_lenghts_length) {
+            return false;
+        }
+
+        // transform raw data into set of indices
+        $originals    = $reader->str_split($originals, 8);
+        $translations = $reader->str_split($translations, 8);
+
+        // skip hash table
+        $strings_addr = $header['hash_addr'] + $header['hash_length'] * 4;
+
+        $reader->seekto($strings_addr);
+
+        $strings = $reader->read_all();
+        $reader->close();
+
+        for ($i = 0; $i < $header['total']; $i++) {
+            $o = unpack("{$endian}length/{$endian}pos", $originals[$i]);
+            $t = unpack("{$endian}length/{$endian}pos", $translations[$i]);
+            if (!$o || !$t) {
+                return false;
+            }
+
+            // adjust offset due to reading strings to separate space before
+            $o['pos'] -= $strings_addr;
+            $t['pos'] -= $strings_addr;
+
+            $original    = $reader->substr($strings, $o['pos'], $o['length']);
+            $translation = $reader->substr($strings, $t['pos'], $t['length']);
+
+            if ('' === $original) {
+                $this->set_headers($this->make_headers($translation));
+            } else {
+                $entry = &$this->make_entry($original, $translation);
+                $this->entries[$entry->key()] = &$entry;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Build a EntryTranslations from original string and translation strings,
+     * found in a MO file
+     *
+     * @param string $original    original string to translate from MO file.
+     *                            Might contain 0x04 as context separator or
+     *                            0x00 as singular/plural separator
+     * @param string $translation translation string from MO file.Might contain
+     *                            0x00 as a plural translations separator
+     * @retrun EntryTranslations New entry
+     */
+    public static function &make_entry($original, $translation) {
+        $entry = new EntryTranslations();
+        // look for context
+        $parts = explode(chr(4), $original);
+        if (isset($parts[1])) {
+            $original = $parts[1];
+            $entry->context = $parts[0];
+        }
+        // look for plural original
+        $parts = explode(chr(0), $original);
+        $entry->singular = $parts[0];
+        if (isset($parts[1])) {
+            $entry->is_plural = true;
+            $entry->plural = $parts[1];
+        }
+        // plural translations are also separated by \0
+        $entry->translations = explode(chr(0), $translation);
+
+        return $entry;
+    }
+
+    public function select_plural_form($count)
+    {
+        return $this->gettext_select_plural_form($count);
+    }
+
+    public function get_plural_forms_count()
+    {
+        return $this->_nplurals;
+    }
+}
diff --git a/include/pomo/PO.php b/include/pomo/PO.php
new file mode 100644
index 00000000..6a057631
--- /dev/null
+++ b/include/pomo/PO.php
@@ -0,0 +1,494 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+ini_set('auto_detect_line_endings', 1);
+
+/**
+ * Class for working with PO files
+ */
+class PO extends GettextTranslations
+{
+    const MAX_LINE_LEN = 79;
+
+    public $comments_before_headers = '';
+
+    /**
+     * Exports headers to a PO entry
+     *
+     * @return string msgid/msgstr PO entry for this PO file headers, doesn't
+     *                contain newline at the end
+     */
+    public function export_headers()
+    {
+        $header_string = '';
+        foreach ($this->headers as $header => $value) {
+            $header_string.= "$header: $value\n";
+        }
+        $poified = PO::poify($header_string);
+        if ($this->comments_before_headers) {
+            $before_headers = PO::prepend_each_line(rtrim(
+                $this->comments_before_headers)."\n", '# '
+            );
+        } else {
+            $before_headers = '';
+        }
+
+        return rtrim("{$before_headers}msgid \"\"\nmsgstr $poified");
+    }
+
+    /**
+     * Exports all entries to PO format
+     *
+     * @return string sequence of mgsgid/msgstr PO strings, doesn't containt
+     *                newline at the end
+     */
+    public function export_entries()
+    {
+        //TODO: sorting
+        return implode("\n\n", array_map(
+            array(__CLASS__, 'export_entry'),
+            $this->entries)
+        );
+    }
+
+    /**
+     * Exports the whole PO file as a string
+     *
+     * @param  bool   $include_headers whether to include the headers in the
+     *                                 export
+     * @return string ready for inclusion in PO file string for headers and all
+     *                                the enrtries
+     */
+    public function export($include_headers = true)
+    {
+        $res = '';
+        if ($include_headers) {
+            $res .= $this->export_headers();
+            $res .= "\n\n";
+        }
+        $res .= $this->export_entries();
+
+        return $res;
+    }
+
+    /**
+     * Same as {@link export}, but writes the result to a file
+     *
+     * @param  string $filename        where to write the PO string
+     * @param  bool   $include_headers whether to include tje headers in the
+     *                                 export
+     * @return bool   true on success, false on error
+     */
+    public function export_to_file($filename, $include_headers = true)
+    {
+        $fh = fopen($filename, 'w');
+        if (false === $fh) {
+            return false;
+        }
+        $export = $this->export($include_headers);
+        $res = fwrite($fh, $export);
+        if (false === $res) {
+            return false;
+        }
+
+        return fclose($fh);
+    }
+
+    /**
+     * Text to include as a comment before the start of the PO contents
+     *
+     * Doesn't need to include # in the beginning of lines, these are added
+     * automatically
+     *
+     * @param string $text Comment text
+     */
+    public function set_comment_before_headers($text)
+    {
+        $this->comments_before_headers = $text;
+    }
+
+    /**
+     * Formats a string in PO-style
+     *
+     * @param  string $string the string to format
+     * @return string the poified string
+     */
+    public static function poify($string)
+    {
+        $quote = '"';
+        $slash = '\\';
+        $newline = "\n";
+
+        $replaces = array(
+            "$slash"    => "$slash$slash",
+            "$quote"    => "$slash$quote",
+            "\t"        => '\t',
+        );
+
+        $string = str_replace(
+            array_keys($replaces),
+            array_values($replaces),
+            $string
+        );
+
+        $po = $quote.implode(
+            "${slash}n$quote$newline$quote",
+            explode($newline, $string)
+        ).$quote;
+        // add empty string on first line for readbility
+        if (false !== strpos($string, $newline) &&
+                (substr_count($string, $newline) > 1 ||
+                !($newline === substr($string, -strlen($newline))))) {
+            $po = "$quote$quote$newline$po";
+        }
+        // remove empty strings
+        $po = str_replace("$newline$quote$quote", '', $po);
+
+        return $po;
+    }
+
+    /**
+     * Gives back the original string from a PO-formatted string
+     *
+     * @param  string $string PO-formatted string
+     * @return string enascaped string
+     */
+    public static function unpoify($string)
+    {
+        $escapes = array('t' => "\t", 'n' => "\n", '\\' => '\\');
+        $lines = array_map('trim', explode("\n", $string));
+        $lines = array_map(array(__CLASS__, 'trim_quotes'), $lines);
+        $unpoified = '';
+        $previous_is_backslash = false;
+        foreach ($lines as $line) {
+            preg_match_all('/./u', $line, $chars);
+            $chars = $chars[0];
+            foreach ($chars as $char) {
+                if (!$previous_is_backslash) {
+                    if ('\\' == $char) {
+                        $previous_is_backslash = true;
+                    } else {
+                        $unpoified .= $char;
+                    }
+                } else {
+                    $previous_is_backslash = false;
+                    $unpoified .= isset($escapes[$char]) ?
+                        $escapes[$char] :
+                        $char;
+                }
+            }
+        }
+
+        return $unpoified;
+    }
+
+    /**
+     * Inserts $with in the beginning of every new line of $string and
+     * returns the modified string
+     *
+     * @param  string $string prepend lines in this string
+     * @param  string $with   prepend lines with this string
+     * @return string The modified string
+     */
+    public static function prepend_each_line($string, $with)
+    {
+        $php_with = var_export($with, true);
+        $lines = explode("\n", $string);
+        // do not prepend the string on the last empty line, artefact by explode
+        if ("\n" == substr($string, -1)) {
+            unset($lines[count($lines) - 1]);
+        }
+        $res = implode("\n", array_map(
+                create_function('$x', "return $php_with.\$x;"),
+                $lines
+            ));
+        // give back the empty line, we ignored above
+        if ("\n" == substr($string, -1)) {
+            $res .= "\n";
+        }
+
+        return $res;
+    }
+
+    /**
+     * Prepare a text as a comment -- wraps the lines and prepends #
+     * and a special character to each line
+     *
+     * @param  string $text the comment text
+     * @param  string $char character to denote a special PO comment,
+     *                      like :, default is a space
+     * @return string The modified string
+     */
+    private static function comment_block($text, $char=' ')
+    {
+        $text = wordwrap($text, self::MAX_LINE_LEN - 3);
+
+        return self::prepend_each_line($text, "#$char ");
+    }
+
+    /**
+     * Builds a string from the entry for inclusion in PO file
+     *
+     * @param  object      &$entry the entry to convert to po string
+     * @return string|bool PO-style formatted string for the entry or
+     *                            false if the entry is empty
+     */
+    public static function export_entry(&$entry)
+    {
+        if (is_null($entry->singular)) {
+            return false;
+        }
+        $po = array();
+        if (!empty($entry->translator_comments)) {
+            $po[] = self::comment_block($entry->translator_comments);
+        }
+        if (!empty($entry->extracted_comments)) {
+            $po[] = self::comment_block($entry->extracted_comments, '.');
+        }
+        if (!empty($entry->references)) {
+            $po[] = self::comment_block(implode(' ', $entry->references), ':');
+        }
+        if (!empty($entry->flags)) {
+            $po[] = self::comment_block(implode(", ", $entry->flags), ',');
+        }
+        if (!is_null($entry->context)) {
+            $po[] = 'msgctxt '.self::poify($entry->context);
+        }
+        $po[] = 'msgid '.self::poify($entry->singular);
+        if (!$entry->is_plural) {
+            $translation = empty($entry->translations) ?
+                '' :
+                $entry->translations[0];
+            $po[] = 'msgstr '.self::poify($translation);
+        } else {
+            $po[] = 'msgid_plural '.self::poify($entry->plural);
+            $translations = empty($entry->translations) ?
+                array('', '') :
+                $entry->translations;
+            foreach ($translations as $i => $translation) {
+                $po[] = "msgstr[$i] ".self::poify($translation);
+            }
+        }
+
+        return implode("\n", $po);
+    }
+
+    public function import_from_file($filename)
+    {
+        $f = fopen($filename, 'r');
+        if (!$f) {
+            return false;
+        }
+        $lineno = 0;
+        while (true) {
+            $res = $this->read_entry($f, $lineno);
+            if (!$res) {
+                break;
+            }
+            if ($res['entry']->singular == '') {
+                $this->set_headers(
+                    $this->make_headers($res['entry']->translations[0])
+                );
+            } else {
+                $this->add_entry($res['entry']);
+            }
+        }
+        PO::read_line($f, 'clear');
+        if (false === $res) {
+            return false;
+        }
+        if (! $this->headers && ! $this->entries) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function read_entry($f, $lineno = 0)
+    {
+        $entry = new EntryTranslations();
+        // where were we in the last step
+        // can be: comment, msgctxt, msgid, msgid_plural, msgstr, msgstr_plural
+        $context = '';
+        $msgstr_index = 0;
+        $is_final = create_function('$context', 'return $context == "msgstr" || $context == "msgstr_plural";');
+        while (true) {
+            $lineno++;
+            $line = PO::read_line($f);
+            if (!$line) {
+                if (feof($f)) {
+                    if ($is_final($context)) {
+                        break;
+                    } elseif (!$context) {// we haven't read a line and eof came
+
+                        return null;
+                    } else {
+                        return false;
+                    }
+                } else {
+                    return false;
+                }
+            }
+            if ($line == "\n") {
+                continue;
+            }
+
+            $line = trim($line);
+            if (preg_match('/^#/', $line, $m)) {
+                // the comment is the start of a new entry
+                if ($is_final($context)) {
+                    PO::read_line($f, 'put-back');
+                    $lineno--;
+                    break;
+                }
+                // comments have to be at the beginning
+                if ($context && $context != 'comment') {
+                    return false;
+                }
+                // add comment
+                $this->add_comment_to_entry($entry, $line);
+            } elseif (preg_match('/^msgctxt\s+(".*")/', $line, $m)) {
+                if ($is_final($context)) {
+                    PO::read_line($f, 'put-back');
+                    $lineno--;
+                    break;
+                }
+                if ($context && $context != 'comment') {
+                    return false;
+                }
+                $context = 'msgctxt';
+                $entry->context .= PO::unpoify($m[1]);
+            } elseif (preg_match('/^msgid\s+(".*")/', $line, $m)) {
+                if ($is_final($context)) {
+                    PO::read_line($f, 'put-back');
+                    $lineno--;
+                    break;
+                }
+                if ($context &&
+                    $context != 'msgctxt' &&
+                    $context != 'comment') {
+                    return false;
+                }
+                $context = 'msgid';
+                $entry->singular .= PO::unpoify($m[1]);
+            } elseif (preg_match('/^msgid_plural\s+(".*")/', $line, $m)) {
+                if ($context != 'msgid') {
+                    return false;
+                }
+                $context = 'msgid_plural';
+                $entry->is_plural = true;
+                $entry->plural .= PO::unpoify($m[1]);
+            } elseif (preg_match('/^msgstr\s+(".*")/', $line, $m)) {
+                if ($context != 'msgid') {
+                    return false;
+                }
+                $context = 'msgstr';
+                $entry->translations = array(PO::unpoify($m[1]));
+            } elseif (preg_match('/^msgstr\[(\d+)\]\s+(".*")/', $line, $m)) {
+                if ($context != 'msgid_plural' && $context != 'msgstr_plural') {
+                    return false;
+                }
+                $context = 'msgstr_plural';
+                $msgstr_index = $m[1];
+                $entry->translations[$m[1]] = PO::unpoify($m[2]);
+            } elseif (preg_match('/^".*"$/', $line)) {
+                $unpoified = PO::unpoify($line);
+                switch ($context) {
+                    case 'msgid':
+                        $entry->singular .= $unpoified;
+                        break;
+                    case 'msgctxt':
+                        $entry->context .= $unpoified;
+                        break;
+                    case 'msgid_plural':
+                        $entry->plural .= $unpoified;
+                        break;
+                    case 'msgstr':
+                        $entry->translations[0] .= $unpoified;
+                        break;
+                    case 'msgstr_plural':
+                        $entry->translations[$msgstr_index] .= $unpoified;
+                        break;
+                    default:
+                        return false;
+                }
+            } else {
+                return false;
+            }
+        }
+        if (array() == array_filter(
+                $entry->translations,
+                create_function('$t', 'return $t || "0" === $t;'))
+            ) {
+            $entry->translations = array();
+        }
+
+        return array('entry' => $entry, 'lineno' => $lineno);
+    }
+
+    public static function read_line($f, $action = 'read')
+    {
+        static $last_line = '';
+        static $use_last_line = false;
+        if ('clear' == $action) {
+            $last_line = '';
+
+            return true;
+        }
+        if ('put-back' == $action) {
+            $use_last_line = true;
+
+            return true;
+        }
+        $line = $use_last_line ? $last_line : fgets($f);
+        $line = ( "\r\n" == substr( $line, -2 ) ) ?
+            rtrim( $line, "\r\n" ) . "\n" :
+            $line;
+        $last_line = $line;
+        $use_last_line = false;
+
+        return $line;
+    }
+
+    public function add_comment_to_entry(&$entry, $po_comment_line)
+    {
+        $first_two = substr($po_comment_line, 0, 2);
+        $comment = trim(substr($po_comment_line, 2));
+        if ('#:' == $first_two) {
+            $entry->references = array_merge(
+                $entry->references,
+                preg_split('/\s+/', $comment)
+            );
+        } elseif ('#.' == $first_two) {
+            $entry->extracted_comments = trim(
+                $entry->extracted_comments . "\n" . $comment
+            );
+        } elseif ('#,' == $first_two) {
+            $entry->flags = array_merge(
+                $entry->flags,
+                preg_split('/,\s*/', $comment)
+            );
+        } else {
+            $entry->translator_comments = trim(
+                $entry->translator_comments . "\n" . $comment
+            );
+        }
+    }
+
+    public static function trim_quotes($s)
+    {
+        if ( substr($s, 0, 1) == '"') {
+            $s = substr($s, 1);
+        }
+        if ( substr($s, -1, 1) == '"') {
+            $s = substr($s, 0, -1);
+        }
+
+        return $s;
+    }
+}
diff --git a/include/pomo/Streams/CachedFileReader.php b/include/pomo/Streams/CachedFileReader.php
new file mode 100644
index 00000000..5d93121e
--- /dev/null
+++ b/include/pomo/Streams/CachedFileReader.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+/**
+ * Reads the contents of the file in the beginning.
+ *
+ * @author Danilo Segan <danilo@kvota.net>
+ */
+class CachedFileReader extends StringReader
+{
+    public function __construct($filename)
+    {
+        parent::__construct();
+        $this->_str = file_get_contents($filename);
+        if (false === $this->_str) {
+            return false;
+        }
+        $this->_pos = 0;
+    }
+}
diff --git a/include/pomo/Streams/CachedIntFileReader.php b/include/pomo/Streams/CachedIntFileReader.php
new file mode 100644
index 00000000..17a8e50e
--- /dev/null
+++ b/include/pomo/Streams/CachedIntFileReader.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+/**
+ * Reads the contents of the file in the beginning.
+ *
+ * @author Danilo Segan <danilo@kvota.net>
+ */
+class CachedIntFileReader extends CachedFileReader
+{
+    public function __construct($filename)
+    {
+        parent::__construct($filename);
+    }
+}
diff --git a/include/pomo/Streams/FileReader.php b/include/pomo/Streams/FileReader.php
new file mode 100644
index 00000000..983df271
--- /dev/null
+++ b/include/pomo/Streams/FileReader.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+/**
+ * Classes, which help reading streams of data from files.
+ *
+ * @author Danilo Segan <danilo@kvota.net>
+ */
+class FileReader extends Reader
+{
+    public function __construct($filename)
+    {
+        parent::__construct();
+        $this->_f = fopen($filename, 'rb');
+    }
+
+    public function read($bytes)
+    {
+        return fread($this->_f, $bytes);
+    }
+
+    public function seekto($pos)
+    {
+        if (-1 == fseek($this->_f, $pos, SEEK_SET)) {
+            return false;
+        }
+        $this->_pos = $pos;
+
+        return true;
+    }
+
+    public function is_resource()
+    {
+        return is_resource($this->_f);
+    }
+
+    public function feof()
+    {
+        return feof($this->_f);
+    }
+
+    public function close()
+    {
+        return fclose($this->_f);
+    }
+
+    public function read_all()
+    {
+        $all = '';
+        while (!$this->feof())
+            $all .= $this->read(4096);
+
+        return $all;
+    }
+}
diff --git a/include/pomo/Streams/Reader.php b/include/pomo/Streams/Reader.php
new file mode 100644
index 00000000..ced42eb6
--- /dev/null
+++ b/include/pomo/Streams/Reader.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+/**
+ * Classes, which help reading streams of data from files.
+ *
+ * @author Danilo Segan <danilo@kvota.net>
+ */
+class Reader
+{
+    public $endian = 'little';
+    public $_post = '';
+
+    public function __construct()
+    {
+        $this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) &&
+            function_exists('mb_substr');
+        $this->_pos = 0;
+    }
+
+    /**
+     * Sets the endianness of the file.
+     *
+     * @param $endian string 'big' or 'little'
+     */
+    public function setEndian($endian)
+    {
+        $this->endian = $endian;
+    }
+
+    /**
+     * Reads a 32bit Integer from the Stream
+     *
+     * @return mixed The integer, corresponding to the next 32 bits from the
+     *               stream of false if there are not enough bytes or on error
+     */
+    public function readint32()
+    {
+        $bytes = $this->read(4);
+        if (4 != $this->strlen($bytes)) {
+            return false;
+        }
+        $endian_letter = ('big' == $this->endian) ? 'N' : 'V';
+        $int = unpack($endian_letter, $bytes);
+
+        return array_shift($int);
+    }
+
+    /**
+     * Reads an array of 32-bit Integers from the Stream
+     *
+     * @param integer count How many elements should be read
+     * @return mixed Array of integers or false if there isn't
+     *               enough data or on error
+     */
+    public function readint32array($count)
+    {
+        $bytes = $this->read(4 * $count);
+        if (4*$count != $this->strlen($bytes)) {
+            return false;
+        }
+        $endian_letter = ('big' == $this->endian) ? 'N' : 'V';
+
+        return unpack($endian_letter.$count, $bytes);
+    }
+
+
+    public function substr($string, $start, $length)
+    {
+        if ($this->is_overloaded) {
+            return mb_substr($string, $start, $length, 'ascii');
+        } else {
+            return substr($string, $start, $length);
+        }
+    }
+
+    public function strlen($string)
+    {
+        if ($this->is_overloaded) {
+            return mb_strlen($string, 'ascii');
+        } else {
+            return strlen($string);
+        }
+    }
+
+    public function str_split($string, $chunk_size)
+    {
+        if (!function_exists('str_split')) {
+            $length = $this->strlen($string);
+            $out = array();
+            for ($i = 0; $i < $length; $i += $chunk_size) {
+                $out[] = $this->substr($string, $i, $chunk_size);
+            }
+
+            return $out;
+        } else {
+            return str_split($string, $chunk_size);
+        }
+    }
+
+    public function pos()
+    {
+        return $this->_pos;
+    }
+
+    public function is_resource()
+    {
+        return true;
+    }
+
+    public function close()
+    {
+        return true;
+    }
+}
diff --git a/include/pomo/Streams/StringReader.php b/include/pomo/Streams/StringReader.php
new file mode 100644
index 00000000..c0d1c3bb
--- /dev/null
+++ b/include/pomo/Streams/StringReader.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+/**
+ * Provides file-like methods for manipulating a string instead
+ * of a physical file.
+ *
+ * @author Danilo Segan <danilo@kvota.net>
+ */
+class StringReader extends Reader
+{
+    public $_str = '';
+
+    public function __construct($str = '')
+    {
+        parent::__construct();
+        $this->_str = $str;
+        $this->_pos = 0;
+    }
+
+    public function read($bytes)
+    {
+        $data = $this->substr($this->_str, $this->_pos, $bytes);
+        $this->_pos += $bytes;
+        if ($this->strlen($this->_str) < $this->_pos) {
+            $this->_pos = $this->strlen($this->_str);
+        }
+
+        return $data;
+    }
+
+    public function seekto($pos)
+    {
+        $this->_pos = $pos;
+        if ($this->strlen($this->_str) < $this->_pos) {
+            $this->_pos = $this->strlen($this->_str);
+        }
+
+        return $this->_pos;
+    }
+
+    public function length()
+    {
+        return $this->strlen($this->_str);
+    }
+
+    public function read_all()
+    {
+        return $this->substr(
+            $this->_str,
+            $this->_pos,
+            $this->strlen($this->_str)
+        );
+    }
+
+}
diff --git a/include/pomo/Translations/EntryTranslations.php b/include/pomo/Translations/EntryTranslations.php
new file mode 100644
index 00000000..892a2718
--- /dev/null
+++ b/include/pomo/Translations/EntryTranslations.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+/**
+ * Contains EntryTranslations class
+ * EntryTranslations class encapsulates a translatable string
+ */
+class EntryTranslations
+{
+    /**
+     * Whether the entry contains a string and its plural form, default is false
+     *
+     * @var boolean
+     */
+    public $is_plural = false;
+
+    public $context = null;
+    public $singular = null;
+    public $plural = null;
+    public $translations = array();
+    public $translator_comments = '';
+    public $extracted_comments = '';
+    public $references = array();
+    public $flags = array();
+
+    /**
+     * @param array $args associative array, support following keys:
+     *                    - singular (string) -- the string to translate, if omitted and empty entry will be created
+     *                    - plural (string) -- the plural form of the string, setting this will set {@link $is_plural} to true
+     *                    - translations (array) -- translations of the string and possibly -- its plural forms
+     *                    - context (string) -- a string differentiating two equal strings used in different contexts
+     *                    - translator_comments (string) -- comments left by translators
+     *                    - extracted_comments (string) -- comments left by developers
+     *                    - references (array) -- places in the code this strings is used, in relative_to_root_path/file.php:linenum form
+     *                    - flags (array) -- flags like php-format
+     */
+    public function __construct($args=array())
+    {
+        // if no singular -- empty object
+        if (!isset($args['singular'])) {
+            return;
+        }
+        // get member variable values from args hash
+        foreach ($args as $varname => $value) {
+            $this->$varname = $value;
+        }
+        if (isset($args['plural'])) {
+            $this->is_plural = true;
+        }
+        if (!is_array($this->translations)) {
+            $this->translations = array();
+        }
+        if (!is_array($this->references)) {
+            $this->references = array();
+        }
+        if (!is_array($this->flags)) {
+            $this->flags = array();
+        }
+    }
+
+    /**
+     * Generates a unique key for this entry
+     *
+     * @return string|bool the key or false if the entry is empty
+     */
+    public function key()
+    {
+        if (is_null($this->singular)) {
+            return false;
+        }
+        // prepend context and EOT, like in MO files
+        return is_null($this->context) ? $this->singular : $this->context.chr(4).$this->singular;
+    }
+
+    public function merge_with(&$other)
+    {
+        $this->flags = array_unique(array_merge($this->flags, $other->flags));
+        $this->references = array_unique(array_merge($this->references, $other->references));
+        if ($this->extracted_comments != $other->extracted_comments) {
+            $this->extracted_comments .= $other->extracted_comments;
+        }
+
+    }
+}
diff --git a/include/pomo/Translations/GettextTranslations.php b/include/pomo/Translations/GettextTranslations.php
new file mode 100644
index 00000000..857e05f7
--- /dev/null
+++ b/include/pomo/Translations/GettextTranslations.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+require_once dirname(__FILE__) . '/Translations.php';
+
+/**
+ * Class for a set of entries for translation and their associated headers
+ */
+class GettextTranslations extends Translations
+{
+    /**
+     * The gettext implementation of select_plural_form.
+     *
+     * It lives in this class, because there are more than one descendand,
+     * which will use it and they can't share it effectively.
+     *
+     * @param integer $count Items count
+     */
+    public function gettext_select_plural_form($count)
+    {
+        if (!isset($this->_gettext_select_plural_form)
+            || is_null($this->_gettext_select_plural_form)) {
+            list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
+            $this->_nplurals = $nplurals;
+            $this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
+        }
+
+        return call_user_func($this->_gettext_select_plural_form, $count);
+    }
+
+    public function nplurals_and_expression_from_header($header)
+    {
+        if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches)) {
+            $nplurals = (int) $matches[1];
+            $expression = trim($this->parenthesize_plural_exression($matches[2]));
+
+            return array($nplurals, $expression);
+        } else {
+            return array(2, 'n != 1');
+        }
+    }
+
+    /**
+     * Makes a function, which will return the right translation index,
+     * according to the plural forms header
+     *
+     * @param  integer $nplurals
+     * @param  string  $expression
+     * @return integer The right translation index
+     */
+    public function make_plural_form_function($nplurals, $expression)
+    {
+        $expression = str_replace('n', '$n', $expression);
+        $func_body = "
+            \$index = (int) ($expression);
+
+            return (\$index < $nplurals) ? \$index : $nplurals - 1;";
+        return create_function('$n', $func_body);
+    }
+
+    /**
+     * Adds parantheses to the inner parts of ternary operators in
+     * plural expressions, because PHP evaluates ternary oerators
+     * from left to right
+     *
+     * @param  string $expression the expression without parentheses
+     * @return string the expression with parentheses added
+     */
+    public function parenthesize_plural_exression($expression)
+    {
+        $expression .= ';';
+        $res = '';
+        $depth = 0;
+        for ($i = 0; $i < strlen($expression); ++$i) {
+            $char = $expression[$i];
+            switch ($char) {
+                case '?':
+                    $res .= ' ? (';
+                    $depth++;
+                    break;
+                case ':':
+                    $res .= ') : (';
+                    break;
+                case ';':
+                    $res .= str_repeat(')', $depth) . ';';
+                    $depth= 0;
+                    break;
+                default:
+                    $res .= $char;
+            }
+        }
+
+        return rtrim($res, ';');
+    }
+
+    public function make_headers($translation)
+    {
+        $headers = array();
+        // sometimes \ns are used instead of real new lines
+        $translation = str_replace('\n', "\n", $translation);
+        $lines = explode("\n", $translation);
+        foreach ($lines as $line) {
+            $parts = explode(':', $line, 2);
+            if (!isset($parts[1])) {
+                continue;
+            }
+            $headers[trim($parts[0])] = trim($parts[1]);
+        }
+
+        return $headers;
+    }
+
+    public function set_header($header, $value)
+    {
+        parent::set_header($header, $value);
+        if ('Plural-Forms' == $header) {
+            list($nplurals, $expression) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
+            $this->_nplurals = $nplurals;
+            $this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
+        }
+    }
+}
diff --git a/include/pomo/Translations/NOOPTranslations.php b/include/pomo/Translations/NOOPTranslations.php
new file mode 100644
index 00000000..f656f860
--- /dev/null
+++ b/include/pomo/Translations/NOOPTranslations.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+require_once dirname(__FILE__) . '/Translations.php';
+
+/**
+ * Provides the same interface as Translations, but doesn't do anything
+ */
+class NOOPTranslations implements TranslationsInterface
+{
+    /**
+     * Entries provided availible
+     *
+     * @var array
+     */
+    public $entries = array();
+    public $headers = array();
+
+    /**
+     * {@inheritdoc}
+     */
+    public function add_entry($entry)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function set_header($header, $value)
+    {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function set_headers($headers)
+    {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_header($header)
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function translate_entry(&$entry)
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function translate($singular, $context = null)
+    {
+        return $singular;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function select_plural_form($count)
+    {
+        return 1 == $count ? 0 : 1;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_plural_forms_count()
+    {
+        return 2;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function translate_plural(
+        $singular,
+        $plural,
+        $count,
+        $context = null
+    ) {
+        return 1 == $count ? $singular : $plural;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function merge_with(&$other)
+    {
+    }
+}
diff --git a/include/pomo/Translations/Translations.php b/include/pomo/Translations/Translations.php
new file mode 100644
index 00000000..4daea42b
--- /dev/null
+++ b/include/pomo/Translations/Translations.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+require_once dirname(__FILE__) . '/TranslationsInterface.php';
+
+/**
+ * Class for a set of entries for translation and their associated headers
+ */
+class Translations implements TranslationsInterface
+{
+    /**
+     * Entries provided availible
+     *
+     * @var array
+     */
+    public $entries = array();
+    public $headers = array();
+
+    /**
+     * {@inheritdoc}
+     */
+    public function add_entry($entry)
+    {
+        if (is_array($entry)) {
+            $entry = new EntryTranslations($entry);
+        }
+        $key = $entry->key();
+        if (false === $key) {
+            return false;
+        }
+        $this->entries[$key] = &$entry;
+
+        return true;
+    }
+
+    public function add_entry_or_merge($entry)
+    {
+        if (is_array($entry)) {
+            $entry = new EntryTranslations($entry);
+        }
+        $key = $entry->key();
+        if (false === $key) {
+            return false;
+        }
+        if (isset($this->entries[$key])) {
+            $this->entries[$key]->merge_with($entry);
+        } else {
+            $this->entries[$key] = &$entry;
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function set_header($header, $value)
+    {
+        $this->headers[$header] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function set_headers($headers)
+    {
+        foreach ($headers as $header => $value) {
+            $this->set_header($header, $value);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_header($header)
+    {
+        return isset($this->headers[$header]) ? $this->headers[$header] : false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function translate_entry(&$entry)
+    {
+        $key = $entry->key();
+
+        return isset($this->entries[$key]) ? $this->entries[$key] : false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function translate($singular, $context = null)
+    {
+        $entry = new EntryTranslations(array(
+                'singular' => $singular,
+                'context' => $context
+            ));
+        $translated = $this->translate_entry($entry);
+
+        return ($translated && !empty($translated->translations)) ?
+            $translated->translations[0] :
+            $singular;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function select_plural_form($count)
+    {
+        return 1 == $count ? 0 : 1;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_plural_forms_count()
+    {
+        return 2;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function translate_plural(
+        $singular,
+        $plural,
+        $count,
+        $context = null
+    ) {
+        $entry = new EntryTranslations(array(
+                'singular' => $singular,
+                'plural' => $plural,
+                'context' => $context
+            ));
+        $translated = $this->translate_entry($entry);
+        $index = $this->select_plural_form($count);
+        $total_plural_forms = $this->get_plural_forms_count();
+        if ($translated && 0 <= $index && $index < $total_plural_forms &&
+                is_array($translated->translations) &&
+                isset($translated->translations[$index])) {
+            return $translated->translations[$index];
+        } else {
+            return 1 == $count ? $singular : $plural;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function merge_with(&$other)
+    {
+        foreach ($other->entries as $entry) {
+            $this->entries[$entry->key()] = $entry;
+        }
+    }
+
+    public function merge_originals_with(&$other)
+    {
+        foreach ($other->entries as $entry) {
+            if ( !isset( $this->entries[$entry->key()] )) {
+                $this->entries[$entry->key()] = $entry;
+            } else {
+                $this->entries[$entry->key()]->merge_with($entry);
+            }
+        }
+    }
+}
diff --git a/include/pomo/Translations/TranslationsInterface.php b/include/pomo/Translations/TranslationsInterface.php
new file mode 100644
index 00000000..401194d9
--- /dev/null
+++ b/include/pomo/Translations/TranslationsInterface.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+/**
+ * Translations Interface that all POMO Translators must implement
+ *
+ * @author Léo Colombaro <git@colombaro.fr>
+ */
+interface TranslationsInterface
+{
+    /**
+     * Add entry to the PO structure
+     *
+     * @param  object &$entry
+     * @return bool   true on success, false if the entry doesn't have a key
+     */
+    public function add_entry($entry);
+
+    /**
+     * Sets $header PO header to $value
+     *
+     * If the header already exists, it will be overwritten
+     *
+     * @todo This should be out of this class, it is gettext specific
+     * @param string $header header name, without trailing :
+     * @param string $value  header value, without trailing \n
+     */
+    public function set_header($header, $value);
+
+    public function set_headers($headers);
+
+    public function get_header($header);
+
+    public function translate_entry(&$entry);
+
+    /**
+     * Translate an entry in the singular way
+     *
+     * @param  string $singular Singular form of the entry
+     * @param  mixed  $context
+     * @return string The translation
+     */
+    public function translate($singular, $context = null);
+
+    /**
+     * Given the number of items, returns the 0-based index of the plural form
+     * to use
+     *
+     * Here, in the base Translations class, the common logic for English is
+     * implemented:
+     * 	0 if there is one element, 1 otherwise
+     *
+     * This function should be overrided by the sub-classes. For example MO/PO
+     * can derive the logic from their headers.
+     *
+     * @param integer $count number of items
+     */
+    public function select_plural_form($count);
+
+    public function get_plural_forms_count();
+
+    /**
+     * Plural sensitive tranlation of an entry
+     *
+     * Same behavior as {@link translate()} but with plural analyser, provide by
+     * {@link select_plural_form()} parser.
+     *
+     * @param  string  $singular Singular form of the entry
+     * @param  string  $plural   Plural form of the entry
+     * @param  integer $count    Number of items for the plural context
+     * @param  mixed   $context
+     * @return string  The correct translation
+     */
+    public function translate_plural(
+        $singular,
+        $plural,
+        $count,
+        $context = null
+    );
+
+    /**
+     * Merge $other in the current object.
+     *
+     * @param  Object &$other Another Translation object, whose translations
+     *                        will be merged in this one
+     * @return void
+     **/
+    public function merge_with(&$other);
+}
diff --git a/include/routes.php b/include/routes.php
index 98449c5a..85afa86f 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -161,6 +161,6 @@
 });
 
 // 404 not found
-$feather->notFound(function () use ($lang_common) {
-    message($lang_common['Bad request'], '404');
+$feather->notFound(function () {
+    message(__('Bad request'), '404');
 });
diff --git a/install/index.php b/install/index.php
index 873973c2..898a86a7 100644
--- a/install/index.php
+++ b/install/index.php
@@ -115,7 +115,7 @@ function stripslashes_array($array)
 //
 function error($message, $file = null, $line = null, $db_error = false)
 {
-    global $feather_config, $lang_common;
+    global $feather_config;
     // Set some default settings if the script failed before $feather_config could be populated
     if (empty($feather_config)) {
         $feather_config = array(
@@ -123,13 +123,6 @@ function error($message, $file = null, $line = null, $db_error = false)
             'o_gzip'        => '0'
         );
     }
-    // Set some default translations if the script failed before $lang_common could be populated
-    if (empty($lang_common)) {
-        $lang_common = array(
-            'Title separator'    => ' / ',
-            'Page'                => 'Page %s'
-        );
-    }
     // Empty all output buffers and stop buffering
     while (@ob_end_clean());
     // "Restart" output buffering if we are using ob_gzhandler (since the gzip header is already sent)
diff --git a/lang/English/common.mo b/lang/English/common.mo
new file mode 100644
index 0000000000000000000000000000000000000000..fc08237e6da5b22b1f2d17b687732e820380b425
GIT binary patch
literal 9404
zcmcJUdypK*UB}yz@~{ZDF;46}-I8_DU7}lA@&j>}?CA8eY&|Y_Cp)%dl-b?hyODNh
z)-$uZJKMx@9!L-ygTW36Cq)G#!0?9+1;HdmVg)J`sS1>1C|3niR2dAFa!4s8#l!r;
z=iAe>w=2omq>8Qk&1br&AHV+1ue*Oe_pOUpK4SQtK;DVGw9=Swz%QQ9h2NWg)ENHE
z`CMKPFAeE;!4;(62j2`gz)Rs4cp;n(Y{EB?F5p|?J@Cij!|)yOB>XXW3ab8d;rUBY
z<;?{pFNJR*Sqt0&FCl$9RJ|0c{4sbj{4A6nPlfa|Q2jgySHTxU{%QDj(km&f@m~&A
zZwnXow-;)Bb@(GN4ZH`UqB$1$NZ@ZkjrS?2dVdV*!u&Z@{pSMz0m_~)1%3~{j`V-P
zH^P@g{)&rAeb0x|=Mt!T?}fZ7b0w4>*Fe?V4)yA8h8pKVC_O$5Rj&i3UmkcjlwSA4
z%ix2MKXZ}`DwxkhmH#SKJ70(D=bKRDdLi(8;rV$OS^ZxC)&FHs{az9B#~?+`RZ#VJ
zK=nTZHJ(FI^_x)RN}&3?H>5uS)$YR~|1(haeiN#nC*YgllThWJhHB@}!t-ZC{_{}f
zUVv)<B`EuTAM$5b;Y3Qm6RO=!P<n2L(r*WpzwL*zlY=VXgBsVTpvs*H>Bph!{{d9L
zUxL!_FQEGWM#%prRDb^nW%qAGl{*djGyly+?O(_wQu^IcdTfMh|3;|s&IZ;4yMZ4G
zd?4@yRR6yX)!&m)?R-Aue<kF94N9+Pp~m}sNdHUVze4HteW>@lg2^d6UIL}hd!X!b
zHPra8hy0n{A^$^A>q!f09vp_!s{=L89#s3sq5A)H$p0;<dVc~{?@yu1Jp)z$uc7pQ
z9!{NS%(tM%xdEf8+_g~p?SyJ)2FlNGg<4mdQ2pH-_yAP9k3pI;k3+3vPs6vtzky@$
zyYSucZ8WkGZiZLE!*DhHEW8qa8D0ZV!>w=~lW-k$Q0WKZ2>cq{08c~JTTN$5Ps7dd
zV^HmX0p0+=8}c`>xXJGGP|q`X19mtGw~&4j<u8X<u=u?TZihF)2>vAeJt%v<2xXV=
zz<KyzP=3;&lHPL)W#{_?k3r4L2chisaL7Lq`0G&f<zz^I5vu$tDEoaCs@`cR{r?l{
zeXYQ#(&J*N{w{~oZv?8`dMLfFg{WvIA*MBl0vDjlKLq7hk3#kHJ5cRE75HVSe*Oxo
z-M@pHhc80)dphL*JCxs?hY|JOUJo^{aj5ZZhmXM<q2AX&LA}4X*mB<Pf@=3pC_Ux_
zyHI*ALd}=^p!7KomH!Bo9*;r!@8_V(Jqgv$)9@Df415q?hSTkbC!y;70IK}UQ2MM~
zQ|faK#MEXll>H7v+2t72cpeSuUxTvq6Hx8^5!5)o1l9jvhV-*g{rx?Z-Y<mwZ$nIH
zegHK;F1e!g!(CAQwxIg^I8?pkfe!^f8u*#O#{+*CN}t~k=`TR(c?wFeuZR4<g<dbX
zg8Uak`kw>816BUtpyv6@P~*F3ZE5d!K>5WORDV}N*=<Y6za6e1-Gr}$^HBAV!1LhI
z@O&{mzc=LH7xM29`JaTmB6A$7{u5C4_(Q06egRoP?m|9<Smb^rMx@sgGLNtvnD-((
zk)z0AWC!xIh(mr6`7okiihLT;{J#y+Ph;5Y@5;+oFg}ph?XMv6CH?jwvb*NO4am<U
z`rTK;uNk^M9@59)&mfws*N41^VGX$lk*~0|_}?#c9YNlMtV385{n`f1c3t@4R%VyK
zGv)w{kPjfggvgF7k=4i)@&NJ(QvL4W=21lJ!=WlO@F(CbBA?ao-V$asum?9G^^nGG
z%+<(TNDDK_$B-s+5i*JFMjD8IEkwTARwDe~2X8{wBkxD9L$)EBD`)=3$T%PAAfE^i
z-xw&o0l69JB0q=dCm+{OK76geEB!p&nvYgD@Cd@T;eWr%burwpfcwJz#{&heJ10W=
z8hAJIX5_6QuY%U81YwCZKaE_7WXPRJj(ifi0NIR8AX-oLyB&E5DUh|ut;pMv8xj4c
zkz0^YDZ%d`@)6{N$QI<M5VNgO#7CVi(r(<y&9-JIPReVX7g<!Knc3EEn{7#w_L7F{
zxTG-KinL>+!FsmkT(it?rCF~tkoFCi>B-6MY15g>Ntb1IPjWPB$4z^1daq5Q&Y9Vb
zv`yE;MO`O~+cs)8GneP#Sv_jnc^5TZHk4BoT}!EMn&ef>D%o*GWSdbDRkiC4G_p}q
zWO2P$R7D#R!!2w#%?s&QwHybP8);I=4yATgZsPJHPUg<Y?MB&h(N3J_6gjKEP}QbK
zUDj%+3!#l9wXL}AY#!fTX_lmkjXTj?l}@wne3aNmJME7%WTjn~gm$`(tSX<oc58fC
z(_Z2hyRK2V=2?36lFT*IxrF|QA9nINTaV}ZswnN%%55{wqk0=}n8e<hYw@lfFVZLO
z>R}`96JA7~`%x_4+f9Q{>{UaltCdRBY8qut+e*`dR=2m~#t}Mc#^_m)#0sS+n;ov+
zo3n*fF+1fqW|th(>`wW!^{8>g?DpF1ku_~QPL7y8oo<>HQBv4A!Hqjn5vPgSlQi8T
z*H+4<^jYtS=B8e!OK)axgqz4$%Dba+9&?+{&0(}Su~DuBvx;llE6hHWL3bc8ikMV`
z_qHR4B;VU`Uz8oOQ5&bv8D`X^BpKxtE7Pu1S7WY|W=po`ZMrYmb{{P<gI!tP^pk!@
z_LEIpU#b$!xPACwFyVfOJDUA&!4EE9z6%p>AVc=@$;`=wD!W*i{i$uF>5<s!uIn=I
z{#caM(bz4(!nP|rnFBa%==nfbme0+UTtpY$=J`UJHO-WZj)Z|uVRLL8mM*0zmo7LQ
zLW7#h+|fAgk(Z^KM`o(W<VhOs9u_WL2BQt-;;h(UupHxXNiIM5K+jRyUu_ZNz~#Me
z&GgL7xfVoaH(lPyVm}~XY#<#*t5O52rjnSkz2u7zET7ZC&$Y-*yE)cpUQczy)R?AH
zj9Sy~t{xMDj9#1MjEl0yJV=_hbljQwbYWOs<Fk_ftM*B`^s;$<Ru6y8O9Kb1&#*Sw
zUJ@5}(k$Qaj0aP@hf+5WrS=V_riN0pN_ApCsF`lmV7N1dW_;<vGrjs@O?%j3#?8hB
z@7P~$?pSyI<~5r(qa`z|-L1UxO!mMqvuP2vEo%}p$G^pcXN~S)!kXUi@L=vTRthG%
z?);{8YZf!X!fIyQZVoG(+gRmXrhX$*cw*eqQZ#4UQ8IU^=^8AR?L*y^1t4Vk^-E6X
zOT<mKjJOpuUY{=J@nV|F4>2y2wpxagS$NBA5w6`dy{zrKSjboz%~ZRWMeT8xyiPu0
zldezZTQ^;2%iFD^iCw+bZXCOA6_Z0&9N*I%zlBW{B_`}H7Zvj^o19!VbzpXUJ1dRm
z<M<91lL<@S_%t(1MXM|=f#b6o&e4|DDYTcN_L#Zjvo7ikv}m_P3NhZ_D!ZuHYiTxj
z{i=O?_U&Bme`D>+Rolx=c6@fJOQ!|%a6`Avnt7dV%tu-7imeA{ca3jeE~nnvZN_&d
z?CH#r3A?!-7kx!0SX5ViaD2B*v?xl)sgwy-*p0Q#wX1njCdX&eUe<8i%RVM-*-40!
z1_L9#EgvoYf5k}?{q3d-ktXa&-p}*_((;Zy^lT_l@=tJWHWVg~-$uA}aFcS&w(|;>
zLJU=7pKaP3XJ@A<Q-)9B(S%(ylCLp?4G}c4MTAxqRoPZXWEdL9BYoG~s^H3Yq9wck
zz$}|WQt&3NLKK^3W%Od}Wh}-#$<1wP&qkTEio)3bSktx4mjRi!>OnL3SZuu=9m&V&
z+An>%&53B3K@Hy*v#DlAM>ejd!~#31`lZ2zxR^(a(UDC&SZ_(>mcM~M`?W$qSa+e)
zM5tA>1jp%uw{02eX%aH!My^_$_iNK=Kk}<o9Ehj-<)~__P_XH`#XRk7TFa`v*dV;l
zOH25^+A%Ah@1<EAcqL88y2I>p)jQ~ik2Q7$|H`#aG*ed&b3Wqr4NtT+K8#yaGY1AD
zOAU%4Z;*)x1``*hE%mrx!N1h9{5gvIK(#FIUs#A$)M}BYL<2;}c!cg7X{XzEi#0pd
zb`f!1K2K!f5?Sk<?-6YXZeQU&9y~{oE04w}*3|4M5lR0H(04fY<mxqJ<8wvARSWAY
zzbV7R!HSdpD7g$Y36ELEmb{lWdc?*_(O#<JJ%x+j4gCp&2&$Tlho*P#+Bv;*x@I*q
zv;p&meQ53Hg|E|99P1|_F*O@?k8LCKk$di!w3^-1qIGAxS;|__QAC!rc;)N~-oTyc
z2v+XVb}=6ncHN|`&f2q1qidw-+K{d+z0%XKeH%igX4##}T1#Q(`Y2du9raj7H+4oG
z9gXMMOq8FN73iR5_oehY5Og!TIpX}Peszps>38hL%tp&pY;hv>5w^P6)$T1$PU6~)
zp3bO#!zvdutqE+%H9Jc&Egn`nw$iYyFg9Ysa&&S%LUfig$GoZ*p}IeLl&1BT_QR<e
zwZ}82XP5n(=~?)}D$Yt<{;A*Us{KKYE4cT&PdWC`vh-=YR$0ANOd}6b#RR*#e?Mi&
zim8{-SnC|YUTMb4!o&SV{;2f|hbFdnEZ*|AXr|sB7j*LBwJb#Jit0tPk%(s$#mkbJ
zt!L?iqM-f~f}5o}C^cB7m-M0+bUtH5W9K-I4ZPu@Lz(4BcE+*HFGH_>BGWq<+U@*+
zZ~%V@@bA{o$=d&VTJ!tVE1%d#a{F2iZS)q-ZL7<3nhtJdm^^%bTXv%5{Ikz-D8=f;
z(XKox_m6Mh`>GRLbylmM{+~{BGP$3I_)na1h^-C)n%`bYuf6wlyv1+G91(`jcz%*}
zyTsIL%5NzBBOQxLqk;OZ9=@^Oa_Z2D(nc&MIu%m7+=l9oIDloPztor094E?@t>uE*
zrMcd+QI|tbL!03GVC~RaF6S$?UT}4e;I5p(!MVL=%V$t28+ql*Dq1{Wt-Q{xly<C&
z{vEKv`_W?>#SHynvlX8ED68<zpJtiT)p2%I=h^aAk8ya_iOXZ~B<t&)d6-=e#8}T|
zWe&v{w>sbAvwklq9J{DK0*vG}yThL|^re7Ld%TLA^ABD-5b+EI6R*8lCZQG+HKbQQ
zUw*a1hZ0AKg;HFI;DaLllQ+esuYWqEd%wgFrH#T=uK_+2UQGxg!x4U#6T2PF$4od2
z5DKD&CL7+y&fCn_EAGnu(NJrwTXYRR4sxJA_c5RGv$8XP*dbYZ`g6XJ(fvj+_*BPg
z?K%G8nP-2FIzQ~Of3!OHkG<l-e^;z++JEWwfo!F)SE**sdR(ms7zV#`T3a~)>vNai
z-iK@Ou$=$>?*_xq6>iHz^lbyH)(kE>sf#`q0DUC@`aA&iT>$8V02ufZFk!y(xl<oK
zb@J6e1=tOiGyWOJ|9s-CbH88xnNH!$22S^y4*lL3VUPB!Q(k_DIP3I(2gm<AeF)8e
qb=pN{_%OS^I>s|=B1}?#u_@2;<(%LFt4yb6?jU3j)&1dq!u$_5vOzQe

literal 0
HcmV?d00001

diff --git a/lang/English/common.php b/lang/English/common.php
deleted file mode 100644
index 59632561..00000000
--- a/lang/English/common.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-
-// Language definitions for frequently used strings
-$lang_common = array(
-
-// Text orientation and encoding
-'lang_direction'                    =>    'ltr', // ltr (Left-To-Right) or rtl (Right-To-Left)
-'lang_identifier'                    =>    'en',
-
-// Number formatting
-'lang_decimal_point'                =>    '.',
-'lang_thousands_sep'                =>    ',',
-
-// Notices
-'Bad request'                        =>    'Bad request. The link you followed is incorrect or outdated.',
-'No view'                            =>    'You do not have permission to view these forums.',
-'No permission'                        =>    'You do not have permission to access this page.',
-'Bad referrer'                        =>    'Bad HTTP_REFERER. You were referred to this page from an unauthorized source. If the problem persists please make sure that \'Base URL\' is correctly set in Admin/Options and that you are visiting the forum by navigating to that URL. More information regarding the referrer check can be found in the FluxBB documentation.',
-'No cookie'                            =>    'You appear to have logged in successfully, however a cookie has not been set. Please check your settings and if applicable, enable cookies for this website.',
-'Pun include extension'            =>    'Unable to process user include %s from template %s. "%s" files are not allowed',
-'Pun include directory'                =>    'Unable to process user include %s from template %s. Directory traversal is not allowed',
-'Pun include error'                    =>    'Unable to process user include %s from template %s. There is no such file in neither the template directory nor in the user include directory',
-
-// Miscellaneous
-'Announcement'                        =>    'Announcement',
-'Options'                            =>    'Options',
-'Submit'                            =>    'Submit', // "Name" of submit buttons
-'Ban message'                        =>    'You are banned from this forum.',
-'Ban message 2'                        =>    'The ban expires at the end of',
-'Ban message 3'                        =>    'The administrator or moderator that banned you left the following message:',
-'Ban message 4'                        =>    'Please direct any inquiries to the forum administrator at',
-'Never'                                =>    'Never',
-'Today'                                =>    'Today',
-'Yesterday'                            =>    'Yesterday',
-'Info'                                =>    'Info', // A common table header
-'Go back'                            =>    'Go back',
-'Maintenance'                        =>    'Maintenance',
-'Redirecting'                        =>    'Redirecting',
-'Click redirect'                    =>    'Click here if you do not want to wait any longer (or if your browser does not automatically forward you)',
-'on'                                =>    'on', // As in "BBCode is on"
-'off'                                =>    'off',
-'Invalid email'                        =>    'The email address you entered is invalid.',
-'Required'                            =>    '(Required)',
-'required field'                    =>    'is a required field in this form.', // For javascript form validation
-'Last post'                            =>    'Last post',
-'by'                                =>    'by', // As in last post by some user
-'New posts'                            =>    'New posts', // The link that leads to the first new post
-'New posts info'                    =>    'Go to the first new post in this topic.', // The popup text for new posts links
-'Username'                            =>    'Username',
-'Password'                            =>    'Password',
-'Email'                                =>    'Email',
-'Send email'                        =>    'Send email',
-'Moderated by'                        =>    'Moderated by',
-'Registered'                        =>    'Registered',
-'Subject'                            =>    'Subject',
-'Message'                            =>    'Message',
-'Topic'                                =>    'Topic',
-'Forum'                                =>    'Forum',
-'Posts'                                =>    'Posts',
-'Replies'                            =>    'Replies',
-'Pages'                                =>    'Pages:',
-'Page'                                =>    'Page %s',
-'BBCode'                            =>    'BBCode:', // You probably shouldn't change this
-'url tag'                            =>    '[url] tag:',
-'img tag'                            =>    '[img] tag:',
-'Smilies'                            =>    'Smilies:',
-'and'                                =>    'and',
-'Image link'                        =>    'image', // This is displayed (i.e. <image>) instead of images when "Show images" is disabled in the profile
-'wrote'                                =>    'wrote:', // For [quote]'s
-'Mailer'                            =>    '%s Mailer', // As in "MyForums Mailer" in the signature of outgoing emails
-'Important information'                =>    'Important information',
-'Write message legend'                =>    'Write your message and submit',
-'Previous'                            =>    'Previous',
-'Next'                                =>    'Next',
-'Spacer'                            =>    '…', // Ellipsis for paginate
-
-// Title
-'Title'                                =>    'Title',
-'Member'                            =>    'Member', // Default title
-'Moderator'                            =>    'Moderator',
-'Administrator'                        =>    'Administrator',
-'Banned'                            =>    'Banned',
-'Guest'                                =>    'Guest',
-
-// Stuff for include/parser.php
-'BBerr pcre'                        =>    '(%s) Message is too long or too complex. Please shorten.',            // Error 1
-'BBerr unexpected attribute'        =>    'Unexpected attribute: "%1$s". (No attribute allowed for (%2$s).',    // Error 2
-'BBerr unrecognized attribute'        =>    'Unrecognized attribute: "%1$s", is not valid for (%2$s).',            // Error 3
-'BBerr bbcode attribute'            =>    'Attribute may NOT contain open or close bbcode tags',                // Error 4
-'BBerr missing attribute'            =>    '(%1$s) is missing a required attribute.',                            // Error 5
-'BBerr nesting overflow'            =>    '(%1$s) tag nesting depth: %2$d exceeds allowable limit: %3$d.',    // Error 6
-'BBerr self-nesting'                =>    '(%s) was opened within itself, this is not allowed.',                // Error 7
-'BBerr invalid nesting'                =>    '(%1$s) was opened within (%2$s), this is not allowed.',            // Error 8
-'BBerr invalid parent'                =>    '(%1$s) cannot be within: (%2$s). Allowable parent tags: %3$s.',    // Error 9
-'BBerr Invalid URL name'            =>    'Invalid URL name: %s',                                                // Error 10
-'BBerr cannot post URLs'            =>    'You are not allowed to post links',                                                // Error 10
-'BBerr Invalid email address'        =>    'Invalid email address: %s',                                        // Error 10c
-'BBerr Invalid color'                =>    'Invalid color attribute: %s',                                        // Error 11
-'BBerr invalid content'                =>    'Invalid content, (%s) requires specific content.',                    // Error 12
-'BBerr bad meta data'                =>    'Unable to retrieve image data from remote url: %s',                // Error 13
-'BBerr no file size'                =>    'Unable to determine remote file size.',                            // Error 14
-'BBerr non image'                    =>    'Remote url does not have Content-Type: "image".',                    // Error 15
-'BBerr bad http response'            =>    'Bad HTTP response header: "%s"',                                    // Error 16
-'BBerr bad headers'                    =>    'Unable to read remote image http headers.',                        // Error 17
-'BBerr orphan close'                =>    'Orphan close tag: (/%s) is missing its open tag.',                    // Error 18
-'BBerr orphan open'                    =>    'Orphan open tag: (%s) is missing its close tag.',                    // Error 19
-
-'BBmsg big image'                    =>    'Big image',                                                        // Msg 1
-'BBmsg images disabled'                =>    'Image display not currently enabled in this context',                // Msg 2
-
-// Stuff for the navigator (top of every page)
-'Index'                                =>    'Index',
-'User list'                            =>    'User list',
-'Rules'                                =>    'Rules',
-'Search'                            =>    'Search',
-'Register'                            =>    'Register',
-'Login'                                =>    'Login',
-'Not logged in'                        =>    'You are not logged in.',
-'Profile'                            =>    'Profile',
-'Logout'                            =>    'Logout',
-'Logged in as'                        =>    'Logged in as',
-'Admin'                                =>    'Administration',
-'Last visit'                        =>    'Last visit: %s',
-'Topic searches'                    =>    'Topics:',
-'New posts header'                    =>    'New',
-'Active topics'                        =>    'Active',
-'Unanswered topics'                    =>    'Unanswered',
-'Posted topics'                        =>    'Posted',
-'Show new posts'                    =>    'Find topics with new posts since your last visit.',
-'Show active topics'                =>    'Find topics with recent posts.',
-'Show unanswered topics'            =>    'Find topics with no replies.',
-'Show posted topics'                =>    'Find topics you have posted to.',
-'Mark all as read'                    =>    'Mark all topics as read',
-'Mark forum read'                    =>    'Mark this forum as read',
-'Title separator'                    =>    ' / ',
-
-// Stuff for the page footer
-'Board footer'                        =>    'Board footer',
-'Jump to'                            =>    'Jump to',
-'Go'                                =>    ' Go ', // Submit button in forum jump
-'Moderate topic'                    =>    'Moderate topic',
-'All'                    =>    'All',
-'Move topic'                        =>    'Move topic',
-'Open topic'                        =>    'Open topic',
-'Close topic'                        =>    'Close topic',
-'Unstick topic'                        =>    'Unstick topic',
-'Stick topic'                        =>    'Stick topic',
-'Moderate forum'                    =>    'Moderate forum',
-'Powered by'                        =>    'Powered by %s',
-
-// Debug information
-'Debug table'                        =>    'Debug information',
-'Querytime'                            =>    'Generated in %1$s seconds, %2$s queries executed',
-'Memory usage'                        =>    'Memory usage: %1$s',
-'Peak usage'                        =>    '(Peak: %1$s)',
-'Query times'                        =>    'Time (s)',
-'Query'                                =>    'Query',
-'Total query time'                    =>    'Total query time: %s',
-
-// For extern.php RSS feed
-'RSS description'                    =>    'The most recent topics at %s.',
-'RSS description topic'                =>    'The most recent posts in %s.',
-'RSS reply'                            =>    'Re: ', // The topic subject will be appended to this string (to signify a reply)
-'RSS active topics feed'            =>    'RSS active topics feed',
-'Atom active topics feed'            =>    'Atom active topics feed',
-'RSS forum feed'                    =>    'RSS forum feed',
-'Atom forum feed'                    =>    'Atom forum feed',
-'RSS topic feed'                    =>    'RSS topic feed',
-'Atom topic feed'                    =>    'Atom topic feed',
-
-// Admin related stuff in the header
-'New reports'                        =>    'There are new reports',
-'Maintenance mode enabled'            =>    'Maintenance mode is enabled!',
-
-// Units for file sizes
-'Size unit B'                        =>    '%s B',
-'Size unit KiB'                        =>    '%s KiB',
-'Size unit MiB'                        =>    '%s MiB',
-'Size unit GiB'                        =>    '%s GiB',
-'Size unit TiB'                        =>    '%s TiB',
-'Size unit PiB'                        =>    '%s PiB',
-'Size unit EiB'                        =>    '%s EiB',
-
-);
diff --git a/lang/English/common.po b/lang/English/common.po
new file mode 100644
index 00000000..8d5a40cd
--- /dev/null
+++ b/lang/English/common.po
@@ -0,0 +1,473 @@
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "lang_direction"
+msgstr "ltr"
+
+msgid "lang_identifier"
+msgstr "en"
+
+msgid "lang_decimal_point"
+msgstr "."
+
+msgid "lang_thousands_sep"
+msgstr ","
+
+msgid "Bad request"
+msgstr "Bad request. The link you followed is incorrect or outdated."
+
+msgid "No view"
+msgstr "You do not have permission to view these forums."
+
+msgid "No permission"
+msgstr "You do not have permission to access this page."
+
+msgid "Bad referrer"
+msgstr "Bad HTTP_REFERER. You were referred to this page from an unauthorized source. If the problem persists please make sure that 'Base URL' is correctly set in Admin/Options and that you are visiting the forum by navigating to that URL. More information regarding the referrer check can be found in the FluxBB documentation."
+
+msgid "No cookie"
+msgstr "You appear to have logged in successfully, however a cookie has not been set. Please check your settings and if applicable, enable cookies for this website."
+
+msgid "Pun include extension"
+msgstr "Unable to process user include %s from template %s. \"%s\" files are not allowed"
+
+msgid "Pun include directory"
+msgstr "Unable to process user include %s from template %s. Directory traversal is not allowed"
+
+msgid "Pun include error"
+msgstr "Unable to process user include %s from template %s. There is no such file in neither the template directory nor in the user include directory"
+
+msgid "Announcement"
+msgstr "Announcement"
+
+msgid "Options"
+msgstr "Options"
+
+msgid "Submit"
+msgstr "Submit"
+
+msgid "Ban message"
+msgstr "You are banned from this forum."
+
+msgid "Ban message 2"
+msgstr "The ban expires at the end of"
+
+msgid "Ban message 3"
+msgstr "The administrator or moderator that banned you left the following message:"
+
+msgid "Ban message 4"
+msgstr "Please direct any inquiries to the forum administrator at"
+
+msgid "Never"
+msgstr "Never"
+
+msgid "Today"
+msgstr "Today"
+
+msgid "Yesterday"
+msgstr "Yesterday"
+
+msgid "Info"
+msgstr "Info"
+
+msgid "Go back"
+msgstr "Go back"
+
+msgid "Maintenance"
+msgstr "Maintenance"
+
+msgid "Redirecting"
+msgstr "Redirecting"
+
+msgid "Click redirect"
+msgstr "Click here if you do not want to wait any longer (or if your browser does not automatically forward you)"
+
+msgid "on"
+msgstr "on"
+
+msgid "off"
+msgstr "off"
+
+msgid "Invalid email"
+msgstr "The email address you entered is invalid."
+
+msgid "Required"
+msgstr "(Required)"
+
+msgid "required field"
+msgstr "is a required field in this form."
+
+msgid "Last post"
+msgstr "Last post"
+
+msgid "by"
+msgstr "by"
+
+msgid "New posts"
+msgstr "New posts"
+
+msgid "New posts info"
+msgstr "Go to the first new post in this topic."
+
+msgid "Username"
+msgstr "Username"
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Email"
+msgstr "Email"
+
+msgid "Send email"
+msgstr "Send email"
+
+msgid "Moderated by"
+msgstr "Moderated by"
+
+msgid "Registered"
+msgstr "Registered"
+
+msgid "Subject"
+msgstr "Subject"
+
+msgid "Message"
+msgstr "Message"
+
+msgid "Topic"
+msgstr "Topic"
+
+msgid "Forum"
+msgstr "Forum"
+
+msgid "Posts"
+msgstr "Posts"
+
+msgid "Replies"
+msgstr "Replies"
+
+msgid "Pages"
+msgstr "Pages:"
+
+msgid "Page"
+msgstr "Page %s"
+
+msgid "BBCode"
+msgstr "BBCode:"
+
+msgid "url tag"
+msgstr "[url] tag:"
+
+msgid "img tag"
+msgstr "[img] tag:"
+
+msgid "Smilies"
+msgstr "Smilies:"
+
+msgid "and"
+msgstr "and"
+
+msgid "Image link"
+msgstr "image"
+
+msgid "wrote"
+msgstr "wrote:"
+
+msgid "Mailer"
+msgstr "%s Mailer"
+
+msgid "Important information"
+msgstr "Important information"
+
+msgid "Write message legend"
+msgstr "Write your message and submit"
+
+msgid "Previous"
+msgstr "Previous"
+
+msgid "Next"
+msgstr "Next"
+
+msgid "Spacer"
+msgstr "…"
+
+msgid "Title"
+msgstr "Title"
+
+msgid "Member"
+msgstr "Member"
+
+msgid "Moderator"
+msgstr "Moderator"
+
+msgid "Administrator"
+msgstr "Administrator"
+
+msgid "Banned"
+msgstr "Banned"
+
+msgid "Guest"
+msgstr "Guest"
+
+msgid "BBerr pcre"
+msgstr "(%s) Message is too long or too complex. Please shorten."
+
+msgid "BBerr unexpected attribute"
+msgstr "Unexpected attribute: \"%1$s\". (No attribute allowed for (%2$s)."
+
+msgid "BBerr unrecognized attribute"
+msgstr "Unrecognized attribute: \"%1$s\", is not valid for (%2$s)."
+
+msgid "BBerr bbcode attribute"
+msgstr "Attribute may NOT contain open or close bbcode tags"
+
+msgid "BBerr missing attribute"
+msgstr "(%1$s) is missing a required attribute."
+
+msgid "BBerr nesting overflow"
+msgstr "(%1$s) tag nesting depth: %2$d exceeds allowable limit: %3$d."
+
+msgid "BBerr self-nesting"
+msgstr "(%s) was opened within itself, this is not allowed."
+
+msgid "BBerr invalid nesting"
+msgstr "(%1$s) was opened within (%2$s), this is not allowed."
+
+msgid "BBerr invalid parent"
+msgstr "(%1$s) cannot be within: (%2$s). Allowable parent tags: %3$s."
+
+msgid "BBerr Invalid URL name"
+msgstr "Invalid URL name: %s"
+
+msgid "BBerr cannot post URLs"
+msgstr "You are not allowed to post links"
+
+msgid "BBerr Invalid email address"
+msgstr "Invalid email address: %s"
+
+msgid "BBerr Invalid color"
+msgstr "Invalid color attribute: %s"
+
+msgid "BBerr invalid content"
+msgstr "Invalid content, (%s) requires specific content."
+
+msgid "BBerr bad meta data"
+msgstr "Unable to retrieve image data from remote url: %s"
+
+msgid "BBerr no file size"
+msgstr "Unable to determine remote file size."
+
+msgid "BBerr non image"
+msgstr "Remote url does not have Content-Type: \"image\"."
+
+msgid "BBerr bad http response"
+msgstr "Bad HTTP response header: \"%s\""
+
+msgid "BBerr bad headers"
+msgstr "Unable to read remote image http headers."
+
+msgid "BBerr orphan close"
+msgstr "Orphan close tag: (/%s) is missing its open tag."
+
+msgid "BBerr orphan open"
+msgstr "Orphan open tag: (%s) is missing its close tag."
+
+msgid "BBmsg big image"
+msgstr "Big image"
+
+msgid "BBmsg images disabled"
+msgstr "Image display not currently enabled in this context"
+
+msgid "Index"
+msgstr "Index"
+
+msgid "User list"
+msgstr "User list"
+
+msgid "Rules"
+msgstr "Rules"
+
+msgid "Search"
+msgstr "Search"
+
+msgid "Register"
+msgstr "Register"
+
+msgid "Login"
+msgstr "Login"
+
+msgid "Not logged in"
+msgstr "You are not logged in."
+
+msgid "Profile"
+msgstr "Profile"
+
+msgid "Logout"
+msgstr "Logout"
+
+msgid "Logged in as"
+msgstr "Logged in as"
+
+msgid "Admin"
+msgstr "Administration"
+
+msgid "Last visit"
+msgstr "Last visit: %s"
+
+msgid "Topic searches"
+msgstr "Topics:"
+
+msgid "New posts header"
+msgstr "New"
+
+msgid "Active topics"
+msgstr "Active"
+
+msgid "Unanswered topics"
+msgstr "Unanswered"
+
+msgid "Posted topics"
+msgstr "Posted"
+
+msgid "Show new posts"
+msgstr "Find topics with new posts since your last visit."
+
+msgid "Show active topics"
+msgstr "Find topics with recent posts."
+
+msgid "Show unanswered topics"
+msgstr "Find topics with no replies."
+
+msgid "Show posted topics"
+msgstr "Find topics you have posted to."
+
+msgid "Mark all as read"
+msgstr "Mark all topics as read"
+
+msgid "Mark forum read"
+msgstr "Mark this forum as read"
+
+msgid "Title separator"
+msgstr " / "
+
+msgid "Board footer"
+msgstr "Board footer"
+
+msgid "Jump to"
+msgstr "Jump to"
+
+msgid "Go"
+msgstr " Go "
+
+msgid "Moderate topic"
+msgstr "Moderate topic"
+
+msgid "All"
+msgstr "All"
+
+msgid "Move topic"
+msgstr "Move topic"
+
+msgid "Open topic"
+msgstr "Open topic"
+
+msgid "Close topic"
+msgstr "Close topic"
+
+msgid "Unstick topic"
+msgstr "Unstick topic"
+
+msgid "Stick topic"
+msgstr "Stick topic"
+
+msgid "Moderate forum"
+msgstr "Moderate forum"
+
+msgid "Powered by"
+msgstr "Powered by %s"
+
+msgid "Debug table"
+msgstr "Debug information"
+
+msgid "Querytime"
+msgstr "Generated in %1$s seconds, %2$s queries executed"
+
+msgid "Memory usage"
+msgstr "Memory usage: %1$s"
+
+msgid "Peak usage"
+msgstr "(Peak: %1$s)"
+
+msgid "Query times"
+msgstr "Time (s)"
+
+msgid "Query"
+msgstr "Query"
+
+msgid "Total query time"
+msgstr "Total query time: %s"
+
+msgid "RSS description"
+msgstr "The most recent topics at %s."
+
+msgid "RSS description topic"
+msgstr "The most recent posts in %s."
+
+msgid "RSS reply"
+msgstr "Re: "
+
+msgid "RSS active topics feed"
+msgstr "RSS active topics feed"
+
+msgid "Atom active topics feed"
+msgstr "Atom active topics feed"
+
+msgid "RSS forum feed"
+msgstr "RSS forum feed"
+
+msgid "Atom forum feed"
+msgstr "Atom forum feed"
+
+msgid "RSS topic feed"
+msgstr "RSS topic feed"
+
+msgid "Atom topic feed"
+msgstr "Atom topic feed"
+
+msgid "New reports"
+msgstr "There are new reports"
+
+msgid "Maintenance mode enabled"
+msgstr "Maintenance mode is enabled!"
+
+msgid "Size unit B"
+msgstr "%s B"
+
+msgid "Size unit KiB"
+msgstr "%s KiB"
+
+msgid "Size unit MiB"
+msgstr "%s MiB"
+
+msgid "Size unit GiB"
+msgstr "%s GiB"
+
+msgid "Size unit TiB"
+msgstr "%s TiB"
+
+msgid "Size unit PiB"
+msgstr "%s PiB"
+
+msgid "Size unit EiB"
+msgstr "%s EiB"
diff --git a/lang/English/convertor.php b/lang/English/convertor.php
new file mode 100644
index 00000000..f2c0326a
--- /dev/null
+++ b/lang/English/convertor.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * PHP arrays to po file
+ */
+
+$fh = fopen("common.po", 'w');
+fwrite($fh, "#\n");
+fwrite($fh, "msgid \"\"\n");
+fwrite($fh,  "msgstr \"\"\n");
+
+include 'common.php';
+
+foreach ($lang_common as $key => $value) {
+    $key = addslashes($key);
+    $value = addslashes($value);
+    fwrite($fh, "\n");
+    fwrite($fh, "msgid \"$key\"\n");
+    fwrite($fh, "msgstr \"$value\"\n");
+}
+fclose($fh);
\ No newline at end of file
diff --git a/model/admin/bans.php b/model/admin/bans.php
index db3a1b0e..52ba33a9 100644
--- a/model/admin/bans.php
+++ b/model/admin/bans.php
@@ -24,7 +24,7 @@ public function __construct()
  
     public function add_ban_info($id = null)
     {
-        global $lang_common, $lang_admin_bans;
+        global $lang_admin_bans;
 
         $ban = array();
 
@@ -32,7 +32,7 @@ public function add_ban_info($id = null)
         if (is_numeric($id)) {
             $ban['user_id'] = $id;
             if ($ban['user_id'] < 2) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             $select_add_ban_info = array('group_id', 'username', 'email');
@@ -102,7 +102,7 @@ public function add_ban_info($id = null)
 
     public function edit_ban_info($id)
     {
-        global $lang_common;
+
 
         $ban = array();
 
@@ -120,7 +120,7 @@ public function edit_ban_info($id)
             $ban['message'] = $result['message'];
             $ban['expire'] = $result['expire'];
         } else {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $diff = ($this->user->timezone + $this->user->dst) * 3600;
diff --git a/model/admin/groups.php b/model/admin/groups.php
index 6769a13c..6ce1b905 100644
--- a/model/admin/groups.php
+++ b/model/admin/groups.php
@@ -35,7 +35,7 @@ public function fetch_groups()
 
     public function info_add_group($groups, $id)
     {
-        global $lang_common;
+
 
         $group = array();
 
@@ -47,7 +47,7 @@ public function info_add_group($groups, $id)
         } else {
             // We are editing a group
             if (!isset($groups[$id])) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             $group['info'] = $groups[$id];
@@ -246,18 +246,18 @@ public function add_edit_group($groups)
 
     public function set_default_group($groups)
     {
-        global $lang_admin_groups, $lang_common;
+        global $lang_admin_groups;
 
         $group_id = intval($this->request->post('default_group'));
 
         // Make sure it's not the admin or guest groups
         if ($group_id == FEATHER_ADMIN || $group_id == FEATHER_GUEST) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Make sure it's not a moderator group
         if ($groups[$group_id]['g_moderator'] != 0) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         DB::for_table('config')->where('conf_name', 'o_default_user_group')
diff --git a/model/admin/options.php b/model/admin/options.php
index d9f29c05..c0cdc83e 100644
--- a/model/admin/options.php
+++ b/model/admin/options.php
@@ -24,7 +24,7 @@ public function __construct()
  
     public function update_options()
     {
-        global $lang_admin_options, $lang_common;
+        global $lang_admin_options;
 
         
 
@@ -110,12 +110,12 @@ public function update_options()
 
         $languages = forum_list_langs();
         if (!in_array($form['default_lang'], $languages)) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $styles = forum_list_styles();
         if (!in_array($form['default_style'], $styles)) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         if ($form['time_format'] == '') {
@@ -197,19 +197,19 @@ public function update_options()
         }
 
         if ($form['feed_type'] < 0 || $form['feed_type'] > 2) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         if ($form['feed_ttl'] < 0) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         if ($form['report_method'] < 0 || $form['report_method'] > 2) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         if ($form['default_email_setting'] < 0 || $form['default_email_setting'] > 2) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         if ($form['timeout_online'] >= $form['timeout_visit']) {
diff --git a/model/admin/users.php b/model/admin/users.php
index bf9b81d6..5f0e27fe 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -499,7 +499,7 @@ public function ban_users()
 
     public function get_user_search()
     {
-        global $db_type, $lang_common, $lang_admin_users;
+        global $db_type, $lang_admin_users;
 
         $form = $this->request->get('form') ? $this->request->get('form') : array();
 
@@ -618,7 +618,7 @@ public function get_user_search()
 
     public function print_users($conditions, $order_by, $direction, $start_from)
     {
-        global $lang_common, $lang_admin_users;
+        global $lang_admin_users;
 
         $user_data = array();
 
@@ -637,7 +637,7 @@ public function print_users($conditions, $order_by, $direction, $start_from)
                 $cur_user['user_title'] = get_title($cur_user);
 
                 // This script is a special case in that we want to display "Not verified" for non-verified users
-                if (($cur_user['g_id'] == '' || $cur_user['g_id'] == FEATHER_UNVERIFIED) && $cur_user['user_title'] != $lang_common['Banned']) {
+                if (($cur_user['g_id'] == '' || $cur_user['g_id'] == FEATHER_UNVERIFIED) && $cur_user['user_title'] != __('Banned')) {
                     $cur_user['user_title'] = '<span class="warntext">'.$lang_admin_users['Not verified'].'</span>';
                 }
 
diff --git a/model/delete.php b/model/delete.php
index 0ac3cc9b..aa711016 100644
--- a/model/delete.php
+++ b/model/delete.php
@@ -24,7 +24,7 @@ public function __construct()
  
     public function get_info_delete($id)
     {
-        global $lang_common;
+
         
         $select_get_info_delete = array('fid' => 'f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_replies',  'fp.post_topics', 'tid' => 't.id', 't.subject', 't.first_post_id', 't.closed', 'p.poster', 'p.posted', 'p.poster_id', 'p.message', 'p.hide_smilies');
         $where_get_info_delete = array(
@@ -44,7 +44,7 @@ public function get_info_delete($id)
             ->find_one();
         
         if (!$cur_post) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_post;
diff --git a/model/edit.php b/model/edit.php
index 61410dd3..18bf6b02 100644
--- a/model/edit.php
+++ b/model/edit.php
@@ -25,7 +25,7 @@ public function __construct()
     // Fetch some info about the post, the topic and the forum
     public function get_info_edit($id)
     {
-        global $lang_common;
+
      
         $select_get_info_edit = array('fid' => 'f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_topics', 'tid' => 't.id', 't.subject', 't.posted', 't.first_post_id', 't.sticky', 't.closed', 'p.poster', 'p.poster_id', 'p.message', 'p.hide_smilies');
         $where_get_info_edit = array(
@@ -45,7 +45,7 @@ public function get_info_edit($id)
             ->find_one();
 
         if (!$cur_post) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_post;
@@ -186,15 +186,15 @@ public function edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod)
 
     public function get_checkboxes($can_edit_subject, $is_admmod, $cur_post, $cur_index)
     {
-        global $lang_post, $lang_common;
+        global $lang_post;
 
         $checkboxes = array();
 
         if ($can_edit_subject && $is_admmod) {
             if ($this->request->post('stick_topic') || $cur_post['sticky'] == '1') {
-                $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.$lang_common['Stick topic'].'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.__('Stick topic').'<br /></label>';
             } else {
-                $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" tabindex="'.($cur_index++).'" />'.$lang_common['Stick topic'].'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" tabindex="'.($cur_index++).'" />'.__('Stick topic').'<br /></label>';
             }
         }
 
diff --git a/model/index.php b/model/index.php
index 6d85307c..5e773df5 100644
--- a/model/index.php
+++ b/model/index.php
@@ -26,12 +26,12 @@ public function __construct()
     // Returns page head
     public function get_page_head()
     {
-        global $lang_common;
+
         
         if ($this->config['o_feed_type'] == '1') {
-            $page_head = array('feed' => '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;type=rss" title="'.$lang_common['RSS active topics feed'].'" />');
+            $page_head = array('feed' => '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;type=rss" title="'.__('RSS active topics feed').'" />');
         } elseif ($this->config['o_feed_type'] == '2') {
-            $page_head = array('feed' => '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;type=atom" title="'.$lang_common['Atom active topics feed'].'" />');
+            $page_head = array('feed' => '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;type=atom" title="'.__('Atom active topics feed').'" />');
         }
 
         return $page_head;
@@ -40,13 +40,11 @@ public function get_page_head()
     // Returns forum action
     public function get_forum_actions()
     {
-        global $lang_common;
-
         $forum_actions = array();
 
         // Display a "mark all as read" link
         if (!$this->user->is_guest) {
-            $forum_actions[] = '<a href="'.get_link('mark-read/').'">'.$lang_common['Mark all as read'].'</a>';
+            $forum_actions[] = '<a href="'.get_link('mark-read/').'">'.__('Mark all as read').'</a>';
         }
 
         return $forum_actions;
@@ -106,7 +104,7 @@ public function get_new_posts()
     // Returns the elements needed to display categories and their forums
     public function print_categories_forums()
     {
-        global $lang_common, $lang_index;
+        global $lang_index;
 
         // Get list of forums and topics with new posts since last visit
         if (!$this->user->is_guest) {
@@ -162,7 +160,7 @@ public function print_categories_forums()
             // Are there new posts since our last visit?
             if (isset($new_topics[$cur_forum->fid])) {
                 $cur_forum->item_status .= ' inew';
-                $forum_field_new = '<span class="newtext">[ <a href="'.get_link('search/?action=show_new&amp;fid='.$cur_forum->fid).'">'.$lang_common['New posts'].'</a> ]</span>';
+                $forum_field_new = '<span class="newtext">[ <a href="'.get_link('search/?action=show_new&amp;fid='.$cur_forum->fid).'">'.__('New posts').'</a> ]</span>';
                 $cur_forum->icon_type = 'icon icon-new';
             }
 
@@ -184,11 +182,11 @@ public function print_categories_forums()
 
             // If there is a last_post/last_poster
             if ($cur_forum->last_post != '') {
-                $cur_forum->last_post_formatted = '<a href="'.get_link('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.format_time($cur_forum->last_post).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_forum->last_poster).'</span>';
+                $cur_forum->last_post_formatted = '<a href="'.get_link('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.format_time($cur_forum->last_post).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_forum->last_poster).'</span>';
             } elseif ($cur_forum->redirect_url != '') {
                 $cur_forum->last_post_formatted = '- - -';
             } else {
-                $cur_forum->last_post_formatted = $lang_common['Never'];
+                $cur_forum->last_post_formatted = __('Never');
             }
 
             if ($cur_forum->moderators != '') {
@@ -203,7 +201,7 @@ public function print_categories_forums()
                     }
                 }
 
-                $cur_forum->moderators_formatted = "\t\t\t\t\t\t\t\t".'<p class="modlist">(<em>'.$lang_common['Moderated by'].'</em> '.implode(', ', $moderators).')</p>'."\n";
+                $cur_forum->moderators_formatted = "\t\t\t\t\t\t\t\t".'<p class="modlist">(<em>'.__('Moderated by').'</em> '.implode(', ', $moderators).')</p>'."\n";
             } else {
                 $cur_forum->moderators_formatted = '';
             }
diff --git a/model/login.php b/model/login.php
index 0e934b01..14a06e67 100644
--- a/model/login.php
+++ b/model/login.php
@@ -118,7 +118,7 @@ public function logout($id, $token)
 
     public function password_forgotten()
     {
-        global $lang_common, $lang_login;
+        global $lang_login;
 
         if (!$this->user->is_guest) {
             header('Location: '.get_base_url());
@@ -133,7 +133,7 @@ public function password_forgotten()
             // Validate the email address
             $email = strtolower(feather_trim($this->request->post('req_email')));
             if (!is_valid_email($email)) {
-                $errors[] = $lang_common['Invalid email'];
+                $errors[] = __('Invalid email');
             }
 
             // Did everything go according to plan?
diff --git a/model/misc.php b/model/misc.php
index db1b8d60..9e431f2d 100644
--- a/model/misc.php
+++ b/model/misc.php
@@ -32,7 +32,7 @@ public function update_last_visit()
 
     public function get_info_mail($recipient_id)
     {
-        global $lang_common;
+
         
         $select_get_info_mail = array('username', 'email', 'email_setting');
         
@@ -42,7 +42,7 @@ public function get_info_mail($recipient_id)
                 ->find_one();
         
         if (!$mail) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
         
         $mail['recipient'] = $mail['username'];
@@ -121,7 +121,7 @@ public function get_redirect_url($recipient_id)
 
     public function insert_report($post_id)
     {
-        global $lang_misc, $lang_common;
+        global $lang_misc;
 
         // Clean up reason from POST
         $reason = feather_linebreaks(feather_trim($this->request->post('req_reason')));
@@ -141,7 +141,7 @@ public function insert_report($post_id)
                                                               ->find_one();
 
         if (!$topic) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $select_report = array('subject', 'forum_id');
@@ -152,7 +152,7 @@ public function insert_report($post_id)
             ->find_one();
 
         if (!$report) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Should we use the internal report handling?
@@ -208,7 +208,7 @@ public function insert_report($post_id)
 
     public function get_info_report($post_id)
     {
-        global $lang_common;
+
 
         $select_get_info_report = array('fid' => 'f.id', 'f.forum_name', 'tid' => 't.id', 't.subject');
         $where_get_info_report = array(
@@ -228,7 +228,7 @@ public function get_info_report($post_id)
             ->find_one();
 
         if (!$cur_post) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_post;
@@ -236,10 +236,10 @@ public function get_info_report($post_id)
 
     public function subscribe_topic($topic_id)
     {
-        global $lang_common, $lang_misc;
+        global $lang_misc;
 
         if ($this->config['o_topic_subscriptions'] != '1') {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Make sure the user can view the topic
@@ -258,7 +258,7 @@ public function subscribe_topic($topic_id)
                     ->find_one();
 
         if (!$authorized) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $is_subscribed = DB::for_table('topic_subscriptions')
@@ -286,10 +286,10 @@ public function subscribe_topic($topic_id)
 
     public function unsubscribe_topic($topic_id)
     {
-        global $lang_common, $lang_misc;
+        global $lang_misc;
 
         if ($this->config['o_topic_subscriptions'] != '1') {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         $is_subscribed = DB::for_table('topic_subscriptions')
@@ -312,10 +312,10 @@ public function unsubscribe_topic($topic_id)
 
     public function unsubscribe_forum($forum_id)
     {
-        global $lang_common, $lang_misc;
+        global $lang_misc;
 
         if ($this->config['o_forum_subscriptions'] != '1') {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         $is_subscribed = DB::for_table('forum_subscriptions')
@@ -338,10 +338,10 @@ public function unsubscribe_forum($forum_id)
 
     public function subscribe_forum($forum_id)
     {
-        global $lang_common, $lang_misc;
+        global $lang_misc;
 
         if ($this->config['o_forum_subscriptions'] != '1') {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Make sure the user can view the forum
@@ -359,7 +359,7 @@ public function subscribe_forum($forum_id)
             ->find_one();
 
         if (!$authorized) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $is_subscribed = DB::for_table('forum_subscriptions')
diff --git a/model/moderate.php b/model/moderate.php
index 81a29caf..438dd280 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -34,14 +34,14 @@ public function display_ip_info($ip)
 
     public function display_ip_address_post($pid)
     {
-        global $lang_common;
+
 
         $ip = DB::for_table('posts')
             ->where('id', $pid)
             ->find_one_col('poster_ip');
 
         if (!$ip) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Load the misc.php language file
@@ -61,7 +61,7 @@ public function get_moderators($fid)
 
     public function get_topic_info($fid, $tid)
     {
-        global $lang_common;
+
         
         // Fetch some info about the topic
         $select_get_topic_info = array('forum_id' => 'f.id', 'f.forum_name', 't.subject', 't.num_replies', 't.first_post_id');
@@ -83,7 +83,7 @@ public function get_topic_info($fid, $tid)
             ->find_one();
 
         if (!$cur_topic) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_topic;
@@ -91,7 +91,7 @@ public function get_topic_info($fid, $tid)
 
     public function delete_posts($tid, $fid, $p = null)
     {
-        global $lang_common, $lang_misc;
+        global $lang_misc;
 
         $posts = $this->request->post('posts') ? $this->request->post('posts') : array();
         if (empty($posts)) {
@@ -100,7 +100,7 @@ public function delete_posts($tid, $fid, $p = null)
 
         if ($this->request->post('delete_posts_comply')) {
             if (@preg_match('%[^0-9,]%', $posts)) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             // Verify that the post IDs are valid
@@ -116,7 +116,7 @@ public function delete_posts($tid, $fid, $p = null)
             }
 
             if (count($result) != substr_count($posts, ',') + 1) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             // Delete the posts
@@ -161,7 +161,7 @@ public function delete_posts($tid, $fid, $p = null)
 
     public function split_posts($tid, $fid, $p = null)
     {
-        global $lang_common, $lang_misc, $lang_post;
+        global $lang_misc, $lang_post;
 
         $posts = $this->request->post('posts') ? $this->request->post('posts') : array();
         if (empty($posts)) {
@@ -170,12 +170,12 @@ public function split_posts($tid, $fid, $p = null)
 
         if ($this->request->post('split_posts_comply')) {
             if (@preg_match('%[^0-9,]%', $posts)) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             $move_to_forum = $this->request->post('move_to_forum') ? intval($this->request->post('move_to_forum')) : 0;
             if ($move_to_forum < 1) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             // How many posts did we just split off?
@@ -190,7 +190,7 @@ public function split_posts($tid, $fid, $p = null)
                 ->find_many();
 
             if (count($result) != $num_posts_splitted) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             // Verify that the move to forum ID is valid
@@ -208,7 +208,7 @@ public function split_posts($tid, $fid, $p = null)
                 ->find_one();
 
             if (!$result) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             // Load the post.php language file
@@ -468,16 +468,16 @@ public function display_posts_view($tid, $start_from)
 
     public function move_topics_to($fid, $tfid = null, $param = null)
     {
-        global $lang_common, $lang_misc;
+        global $lang_misc;
 
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $topics = explode(',', $this->request->post('topics'));
         $move_to_forum = $this->request->post('move_to_forum') ? intval($this->request->post('move_to_forum')) : 0;
         if (empty($topics) || $move_to_forum < 1) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Verify that the topic IDs are valid
@@ -487,7 +487,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
             ->find_many();
 
         if (count($result) != count($topics)) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
 
@@ -506,7 +506,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
             ->find_one();
 
         if (!$authorized) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Delete any redirect topics if there are any (only if we moved/copied the topic back to where it was once moved from)
@@ -586,10 +586,10 @@ public function check_move_possible()
 
     public function merge_topics($fid)
     {
-        global $lang_common, $lang_misc;
+        global $lang_misc;
 
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $topics = explode(',', $this->request->post('topics'));
@@ -604,7 +604,7 @@ public function merge_topics($fid)
             ->find_many();
 
         if (count($result) != count($topics)) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // The topic that we are merging into is the one with the smallest ID
@@ -697,11 +697,11 @@ public function merge_topics($fid)
 
     public function delete_topics($topics, $fid)
     {
-        global $lang_misc, $lang_common;
+        global $lang_misc;
         
 
         if (@preg_match('%[^0-9,]%', $topics)) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         require FEATHER_ROOT.'include/search_idx.php';
@@ -715,7 +715,7 @@ public function delete_topics($topics, $fid)
             ->find_many();
 
         if (count($result) != substr_count($topics, ',') + 1) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Verify that the posts are not by admins
@@ -725,7 +725,7 @@ public function delete_topics($topics, $fid)
                 ->where('poster_id', get_admin_ids())
                 ->find_many();
             if ($authorized) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
         }
 
@@ -772,7 +772,7 @@ public function delete_topics($topics, $fid)
 
     public function get_forum_info($fid)
     {
-        global $lang_common;
+
 
         $select_get_forum_info = array('f.forum_name', 'f.redirect_url', 'f.num_topics', 'f.sort_by');
         $where_get_forum_info = array(
@@ -790,7 +790,7 @@ public function get_forum_info($fid)
             ->find_one();
 
         if (!$cur_forum) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_forum;
@@ -819,7 +819,7 @@ public function forum_sort_by($forum_sort)
 
     public function display_topics($fid, $sort_by, $start_from)
     {
-        global $lang_forum, $lang_common;
+        global $lang_forum;
 
         $topic_data = array();
 
@@ -861,7 +861,7 @@ public function display_topics($fid, $sort_by, $start_from)
                 $url_topic = url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_disp'] = '<a href="'.get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_disp'] = '<a href="'.get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
                     $cur_topic['ghost_topic'] = false;
                 } else {
                     $cur_topic['last_post_disp'] = '- - -';
@@ -878,13 +878,13 @@ public function display_topics($fid, $sort_by, $start_from)
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="movedtext">'.$lang_forum['Moved'].'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="closedtext">'.$lang_forum['Closed'].'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
@@ -893,7 +893,7 @@ public function display_topics($fid, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_disp'] = '<strong>'.$cur_topic['subject_disp'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.$lang_common['New posts info'].'">'.$lang_common['New posts'].'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
@@ -963,14 +963,14 @@ public function close_multiple_topics($action, $topics, $fid)
     
     public function get_subject_tid($id)
     {
-        global $lang_common;
+
 
         $subject = DB::for_table('topics')
             ->where('id', $id)
             ->find_one_col('subject');
 
         if (!$subject) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $subject;
diff --git a/model/post.php b/model/post.php
index 39fbba15..f5630676 100644
--- a/model/post.php
+++ b/model/post.php
@@ -25,7 +25,7 @@ public function __construct()
     //  Get some info about the post
     public function get_info_post($tid, $fid)
     {
-        global $lang_common;
+
 
         if ($tid) {
             $select_get_info_post = array('f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_replies', 'fp.post_topics', 't.subject', 't.closed', 'is_subscribed' => 's.user_id');
@@ -64,7 +64,7 @@ public function get_info_post($tid, $fid)
         }
 
         if (!$cur_posting) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_posting;
@@ -73,7 +73,7 @@ public function get_info_post($tid, $fid)
     // Checks the post for errors before posting
     public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
     {
-        global $lang_post, $lang_common, $lang_prof_reg, $lang_register, $lang_antispam, $lang_antispam_questions, $pd;
+        global $lang_post, $lang_prof_reg, $lang_register, $lang_antispam, $lang_antispam_questions, $pd;
 
         // Antispam feature
         if ($this->user->is_guest) {
@@ -105,13 +105,13 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
                 ->find_one_col('subject');
 
             if (!$subject_tid) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
             $url_subject = url_friendly($subject_tid);
         } else {
             $url_subject = '';
         }
-        
+
         // If it's a new topic
         if ($fid) {
             $subject = feather_trim($this->request->post('req_subject'));
@@ -141,7 +141,7 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
             if ($this->config['p_force_guest_email'] == '1' || $email != '') {
                 require FEATHER_ROOT.'include/email.php';
                 if (!is_valid_email($email)) {
-                    $errors[] = $lang_common['Invalid email'];
+                    $errors[] = __('Invalid email');
                 }
 
                 // Check if it's a banned email address
@@ -693,7 +693,7 @@ public function split_text($text, $start, $end, $retab = true)
     // If we are quoting a message
     public function get_quote_message($qid, $tid)
     {
-        global $lang_common;
+
 
         $select_get_quote_message = array('poster', 'message');
 
@@ -703,7 +703,7 @@ public function get_quote_message($qid, $tid)
                  ->find_one();
 
         if (!$quote) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // If the message contains a code tag we have to split it up (text within [code][/code] shouldn't be touched)
@@ -756,7 +756,7 @@ public function get_quote_message($qid, $tid)
                 }
             $quote = '[quote='. $quote['poster'] .']'.$quote['message'].'[/quote]'."\n";
         } else {
-            $quote = '> '.$quote['poster'].' '.$lang_common['wrote']."\n\n".'> '.$quote['message']."\n";
+            $quote = '> '.$quote['poster'].' '.__('wrote')."\n\n".'> '.$quote['message']."\n";
         }
 
         return $quote;
@@ -765,13 +765,13 @@ public function get_quote_message($qid, $tid)
     // Get the current state of checkboxes
     public function get_checkboxes($fid, $is_admmod, $is_subscribed)
     {
-        global $lang_post, $lang_common;
+        global $lang_post;
 
         $cur_index = 1;
 
         $checkboxes = array();
         if ($fid && $is_admmod) {
-            $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('stick_topic') ? ' checked="checked"' : '').' />'.$lang_common['Stick topic'].'<br /></label>';
+            $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('stick_topic') ? ' checked="checked"' : '').' />'.__('Stick topic').'<br /></label>';
         }
 
         if (!$this->user->is_guest) {
diff --git a/model/profile.php b/model/profile.php
index ff440fad..7492f190 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -24,7 +24,7 @@ public function __construct()
  
     public function change_pass($id)
     {
-        global $lang_profile, $lang_common, $lang_prof_reg;
+        global $lang_profile, $lang_prof_reg;
 
         if ($this->request->get('key')) {
             // If the user is already logged in we shouldn't be here :)
@@ -57,7 +57,7 @@ public function change_pass($id)
         // Make sure we are allowed to change this user's password
         if ($this->user->id != $id) {
             if (!$this->user->is_admmod) { // A regular user trying to change another user's password?
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's password?
 
@@ -71,11 +71,11 @@ public function change_pass($id)
                     ->find_one();
 
                 if (!$user) {
-                    message($lang_common['Bad request'], '404');
+                    message(__('Bad request'), '404');
                 }
 
                 if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == FEATHER_ADMIN || $user['g_moderator'] == '1') {
-                    message($lang_common['No permission'], '403');
+                    message(__('No permission'), '403');
                 }
             }
         }
@@ -127,12 +127,12 @@ public function change_pass($id)
 
     public function change_email($id)
     {
-        global $lang_profile, $lang_common, $lang_prof_reg;
+        global $lang_profile, $lang_prof_reg;
 
         // Make sure we are allowed to change this user's email
         if ($this->user->id != $id) {
             if (!$this->user->is_admmod) { // A regular user trying to change another user's email?
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's email?
 
@@ -146,11 +146,11 @@ public function change_email($id)
                     ->find_one();
 
                 if (!$user) {
-                    message($lang_common['Bad request'], '404');
+                    message(__('Bad request'), '404');
                 }
 
                 if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == FEATHER_ADMIN || $user['g_moderator'] == '1') {
-                    message($lang_common['No permission'], '403');
+                    message(__('No permission'), '403');
                 }
             }
         }
@@ -185,7 +185,7 @@ public function change_email($id)
             // Validate the email address
             $new_email = strtolower(feather_trim($this->request->post('req_new_email')));
             if (!is_valid_email($new_email)) {
-                message($lang_common['Invalid email']);
+                message(__('Invalid email'));
             }
 
             // Check if it's a banned email address
@@ -509,7 +509,7 @@ public function ban_user($id)
 
     public function promote_user($id)
     {
-        global $lang_profile, $lang_common;
+        global $lang_profile;
 
         $pid = $this->request->get('pid') ? intval($this->request->get('pid')) : 0;
 
@@ -521,7 +521,7 @@ public function promote_user($id)
             ->find_one_col('g.g_promote_next_group');
         
         if (!$next_group_id) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Update the user
@@ -664,7 +664,7 @@ public function delete_user($id)
 
     public function fetch_user_group($id)
     {
-        global $lang_common;
+
 
         $info = array();
         
@@ -678,7 +678,7 @@ public function fetch_user_group($id)
             ->find_one();
 
         if (!$info) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $info;
@@ -686,7 +686,7 @@ public function fetch_user_group($id)
 
     public function update_profile($id, $info, $section)
     {
-        global $lang_common, $lang_profile, $lang_prof_reg, $pd;
+        global $lang_profile, $lang_prof_reg, $pd;
 
         $username_updated = false;
 
@@ -706,7 +706,7 @@ public function update_profile($id, $info, $section)
                     $languages = forum_list_langs();
                     $form['language'] = feather_trim($this->request->post('form_language'));
                     if (!in_array($form['language'], $languages)) {
-                        message($lang_common['Bad request'], '404');
+                        message(__('Bad request'), '404');
                     }
                 }
 
@@ -743,7 +743,7 @@ public function update_profile($id, $info, $section)
                     // Validate the email address
                     $form['email'] = strtolower(feather_trim($this->request->post('req_email')));
                     if (!is_valid_email($form['email'])) {
-                        message($lang_common['Invalid email']);
+                        message(__('Invalid email'));
                     }
                 }
 
@@ -785,7 +785,7 @@ public function update_profile($id, $info, $section)
                     if ($form['title'] != '') {
                         // A list of words that the title may not contain
                         // If the language is English, there will be some duplicates, but it's not the end of the world
-                        $forbidden = array('member', 'moderator', 'administrator', 'banned', 'guest', utf8_strtolower($lang_common['Member']), utf8_strtolower($lang_common['Moderator']), utf8_strtolower($lang_common['Administrator']), utf8_strtolower($lang_common['Banned']), utf8_strtolower($lang_common['Guest']));
+                        $forbidden = array('member', 'moderator', 'administrator', 'banned', 'guest', utf8_strtolower(__('Member')), utf8_strtolower(__('Moderator')), utf8_strtolower(__('Administrator')), utf8_strtolower(__('Banned')), utf8_strtolower(__('Guest')));
 
                         if (in_array(utf8_strtolower($form['title']), $forbidden)) {
                             message($lang_profile['Forbidden title']);
@@ -883,7 +883,7 @@ public function update_profile($id, $info, $section)
                     $styles = forum_list_styles();
                     $form['style'] = feather_trim($this->request->post('form_style'));
                     if (!in_array($form['style'], $styles)) {
-                        message($lang_common['Bad request'], '404');
+                        message(__('Bad request'), '404');
                     }
                 }
 
@@ -906,7 +906,7 @@ public function update_profile($id, $info, $section)
             }
 
             default:
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
         }
 
 
@@ -917,7 +917,7 @@ public function update_profile($id, $info, $section)
         }
 
         if (empty($temp)) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         DB::for_table('users')->where('id', $id)
@@ -1004,7 +1004,7 @@ public function update_profile($id, $info, $section)
 
     public function get_user_info($id)
     {
-        global $lang_common;
+
 
         $select_get_user_info = array('u.id', 'u.username', 'u.email', 'u.title', 'u.realname', 'u.url', 'u.jabber', 'u.icq', 'u.msn', 'u.aim', 'u.yahoo', 'u.location', 'u.signature', 'u.disp_topics', 'u.disp_posts', 'u.email_setting', 'u.notify_with_post', 'u.auto_notify', 'u.show_smilies', 'u.show_img', 'u.show_img_sig', 'u.show_avatars', 'u.show_sig', 'u.timezone', 'u.dst', 'u.language', 'u.style', 'u.num_posts', 'u.last_post', 'u.registered', 'u.registration_ip', 'u.admin_note', 'u.date_format', 'u.time_format', 'u.last_visit', 'g.g_id', 'g.g_user_title', 'g.g_moderator');
 
@@ -1016,7 +1016,7 @@ public function get_user_info($id)
             ->find_one();
 
         if (!$user) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $user;
@@ -1024,15 +1024,15 @@ public function get_user_info($id)
 
     public function parse_user_info($user)
     {
-        global $lang_common, $lang_profile;
+        global $lang_profile;
 
         $user_info = array();
 
-        $user_info['personal'][] = '<dt>'.$lang_common['Username'].'</dt>';
+        $user_info['personal'][] = '<dt>'.__('Username').'</dt>';
         $user_info['personal'][] = '<dd>'.feather_escape($user['username']).'</dd>';
 
         $user_title_field = get_title($user);
-        $user_info['personal'][] = '<dt>'.$lang_common['Title'].'</dt>';
+        $user_info['personal'][] = '<dt>'.__('Title').'</dt>';
         $user_info['personal'][] = '<dd>'.(($this->config['o_censoring'] == '1') ? censor_words($user_title_field) : $user_title_field).'</dd>';
 
         if ($user['realname'] != '') {
@@ -1054,12 +1054,12 @@ public function parse_user_info($user)
         if ($user['email_setting'] == '0' && !$this->user->is_guest && $this->user->g_send_email == '1') {
             $user['email_field'] = '<a href="mailto:'.feather_escape($user['email']).'">'.feather_escape($user['email']).'</a>';
         } elseif ($user['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-            $user['email_field'] = '<a href="'.get_link('email/'.$user['id'].'/').'">'.$lang_common['Send email'].'</a>';
+            $user['email_field'] = '<a href="'.get_link('email/'.$user['id'].'/').'">'.__('Send email').'</a>';
         } else {
             $user['email_field'] = '';
         }
         if ($user['email_field'] != '') {
-            $user_info['personal'][] = '<dt>'.$lang_common['Email'].'</dt>';
+            $user_info['personal'][] = '<dt>'.__('Email').'</dt>';
             $user_info['personal'][] = '<dd><span class="email">'.$user['email_field'].'</span></dd>';
         }
 
@@ -1122,16 +1122,16 @@ public function parse_user_info($user)
             }
         }
         if ($posts_field != '') {
-            $user_info['activity'][] = '<dt>'.$lang_common['Posts'].'</dt>';
+            $user_info['activity'][] = '<dt>'.__('Posts').'</dt>';
             $user_info['activity'][] = '<dd>'.$posts_field.'</dd>';
         }
 
         if ($user['num_posts'] > 0) {
-            $user_info['activity'][] = '<dt>'.$lang_common['Last post'].'</dt>';
+            $user_info['activity'][] = '<dt>'.__('Last post').'</dt>';
             $user_info['activity'][] = '<dd>'.format_time($user['last_post']).'</dd>';
         }
 
-        $user_info['activity'][] = '<dt>'.$lang_common['Registered'].'</dt>';
+        $user_info['activity'][] = '<dt>'.__('Registered').'</dt>';
         $user_info['activity'][] = '<dd>'.format_time($user['registered'], true).'</dd>';
 
         return $user_info;
@@ -1139,25 +1139,25 @@ public function parse_user_info($user)
 
     public function edit_essentials($id, $user)
     {
-        global $lang_profile, $lang_common;
+        global $lang_profile;
 
         $user_disp = array();
 
         if ($this->user->is_admmod) {
             if ($this->user->g_id == FEATHER_ADMIN || $this->user->g_mod_rename_users == '1') {
-                $user_disp['username_field'] = '<label class="required"><strong>'.$lang_common['Username'].' <span>'.$lang_common['Required'].'</span></strong><br /><input type="text" name="req_username" value="'.feather_escape($user['username']).'" size="25" maxlength="25" /><br /></label>'."\n";
+                $user_disp['username_field'] = '<label class="required"><strong>'.__('Username').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_username" value="'.feather_escape($user['username']).'" size="25" maxlength="25" /><br /></label>'."\n";
             } else {
                 $user_disp['username_field'] = '<p>'.sprintf($lang_profile['Username info'], feather_escape($user['username'])).'</p>'."\n";
             }
 
-            $user_disp['email_field'] = '<label class="required"><strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong><br /><input type="text" name="req_email" value="'.feather_escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.get_link('email/'.$id.'/').'">'.$lang_common['Send email'].'</a></span></p>'."\n";
+            $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.feather_escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.get_link('email/'.$id.'/').'">'.__('Send email').'</a></span></p>'."\n";
         } else {
-            $user_disp['username_field'] = '<p>'.$lang_common['Username'].': '.feather_escape($user['username']).'</p>'."\n";
+            $user_disp['username_field'] = '<p>'.__('Username').': '.feather_escape($user['username']).'</p>'."\n";
 
             if ($this->config['o_regs_verify'] == '1') {
                 $user_disp['email_field'] = '<p>'.sprintf($lang_profile['Email info'], feather_escape($user['email']).' - <a href="'.get_link('user/'.$id.'/action/change_email/').'">'.$lang_profile['Change email'].'</a>').'</p>'."\n";
             } else {
-                $user_disp['email_field'] = '<label class="required"><strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong><br /><input type="text" name="req_email" value="'.$user['email'].'" size="40" maxlength="80" /><br /></label>'."\n";
+                $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.$user['email'].'" size="40" maxlength="80" /><br /></label>'."\n";
             }
         }
 
@@ -1165,7 +1165,7 @@ public function edit_essentials($id, $user)
         $posts_actions = array();
 
         if ($this->user->g_id == FEATHER_ADMIN) {
-            $user_disp['posts_field'] .= '<label>'.$lang_common['Posts'].'<br /><input type="text" name="num_posts" value="'.$user['num_posts'].'" size="8" maxlength="8" /><br /></label>';
+            $user_disp['posts_field'] .= '<label>'.__('Posts').'<br /><input type="text" name="num_posts" value="'.$user['num_posts'].'" size="8" maxlength="8" /><br /></label>';
         } elseif ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) {
             $posts_actions[] = sprintf($lang_profile['Posts info'], forum_number_format($user['num_posts']));
         }
diff --git a/model/register.php b/model/register.php
index 9c61b0a7..53de5d86 100644
--- a/model/register.php
+++ b/model/register.php
@@ -24,7 +24,7 @@ public function __construct()
  
     public function check_for_errors()
     {
-        global $lang_register, $lang_prof_reg, $lang_common, $lang_antispam, $lang_antispam_questions;
+        global $lang_register, $lang_prof_reg, $lang_antispam, $lang_antispam_questions;
 
         $user = array();
         $user['errors'] = '';
@@ -78,7 +78,7 @@ public function check_for_errors()
         require FEATHER_ROOT.'include/email.php';
 
         if (!is_valid_email($user['email1'])) {
-            $user['errors'][] = $lang_common['Invalid email'];
+            $user['errors'][] = __('Invalid email');
         } elseif ($this->config['o_regs_verify'] == '1' && $user['email1'] != $email2) {
             $user['errors'][] = $lang_register['Email not match'];
         }
@@ -112,7 +112,7 @@ public function check_for_errors()
         if ($this->request->post('language')) {
             $user['language'] = preg_replace('%[\.\\\/]%', '', $this->request->post('language'));
             if (!file_exists(FEATHER_ROOT.'lang/'.$user['language'].'/common.php')) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
         } else {
             $user['language'] = $this->config['o_default_lang'];
diff --git a/model/search.php b/model/search.php
index fdf13f44..a510335a 100644
--- a/model/search.php
+++ b/model/search.php
@@ -25,7 +25,7 @@ public function __construct()
  
     public function get_search_results()
     {
-        global $db_type, $lang_common, $lang_search;
+        global $db_type, $lang_search;
 
         $search = array();
 
@@ -46,7 +46,7 @@ public function get_search_results()
         if ($this->request->get('search_id')) {
             $search_id = intval($this->request->get('search_id'));
             if ($search_id < 1) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
         }
         // If it's a regular search (keywords and/or author)
@@ -78,21 +78,21 @@ public function get_search_results()
         elseif ($action == 'show_user_posts' || $action == 'show_user_topics' || $action == 'show_subscriptions') {
             $user_id = ($this->request->get('user_id')) ? intval($this->request->get('user_id')) : $this->user->id;
             if ($user_id < 2) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             // Subscribed topics can only be viewed by admins, moderators and the users themselves
             if ($action == 'show_subscriptions' && !$this->user->is_admmod && $user_id != $this->user->id) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
         } elseif ($action == 'show_recent') {
             $interval = $this->request->get('value') ? intval($this->request->get('value')) : 86400;
         } elseif ($action == 'show_replies') {
             if ($this->user->is_guest) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
         } elseif ($action != 'show_new' && $action != 'show_unanswered') {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
 
@@ -252,7 +252,7 @@ public function get_search_results()
                 }
 
                 // If it's a search for author name (and that author name isn't Guest)
-                if ($author && $author != 'guest' && $author != utf8_strtolower($lang_common['Guest'])) {
+                if ($author && $author != 'guest' && $author != utf8_strtolower(__('Guest'))) {
                     $username_exists = DB::for_table('users')->select('id')->where_like('username', $author)->find_many();
 
                     if ($username_exists) {
@@ -313,7 +313,7 @@ public function get_search_results()
                 // If it's a search for new posts since last visit
                 if ($action == 'show_new') {
                     if ($this->user->is_guest) {
-                        message($lang_common['No permission'], '403');
+                        message(__('No permission'), '403');
                     }
 
                     $result = DB::for_table('topics')
@@ -438,7 +438,7 @@ public function get_search_results()
                 // If it's a search for subscribed topics
                 elseif ($action == 'show_subscriptions') {
                     if ($this->user->is_guest) {
-                        message($lang_common['Bad request'], '404');
+                        message(__('Bad request'), '404');
                     }
 
                     $result = DB::for_table('topics')
@@ -491,7 +491,7 @@ public function get_search_results()
                 $pdo = DB::get_db();
                 $pdo = null;
             } else {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
 
@@ -543,7 +543,7 @@ public function get_search_results()
 
         // If we're on the new posts search, display a "mark all as read" link
         if (!$this->user->is_guest && $search_type[0] == 'action' && $search_type[1] == 'show_new') {
-            $search['forum_actions'][] = '<a href="'.get_link('mark-read/').'">'.$lang_common['Mark all as read'].'</a>';
+            $search['forum_actions'][] = '<a href="'.get_link('mark-read/').'">'.__('Mark all as read').'</a>';
         }
 
         // Fetch results to display
@@ -578,7 +578,7 @@ public function get_search_results()
             $search['start_from'] = $start_from;
 
             // Generate paging links
-            $search['paging_links'] = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate_old($num_pages, $p, '?search_id='.$search_id);
+            $search['paging_links'] = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?search_id='.$search_id);
 
             // throw away the first $start_from of $search_ids, only keep the top $per_page of $search_ids
             $search_ids = array_slice($search_ids, $start_from, $per_page);
@@ -627,7 +627,7 @@ public function get_search_results()
                     $subscriber_name = DB::for_table('users')->where('id', $subscriber_id)->find_one_col('username');
 
                     if (!$subscriber_name) {
-                        message($lang_common['Bad request'], '404');
+                        message(__('Bad request'), '404');
                     }
 
                     $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf($lang_search['Quick search show_subscriptions'], feather_escape($subscriber_name)).'</a>';
@@ -660,7 +660,7 @@ public function get_search_results()
 
     public function display_search_results($search)
     {
-        global $lang_forum, $lang_common, $lang_topic, $lang_search, $pd;
+        global $lang_forum, $lang_topic, $lang_search, $pd;
 
         // Get topic/forum tracking data
         if (!$this->user->is_guest) {
@@ -708,7 +708,6 @@ public function display_search_results($search)
                     'url_topic' => $url_topic,
                     'cur_search' => $cur_search,
                     'forum' => $forum,
-                    'lang_common' => $lang_common,
                     'lang_search' => $lang_search,
                     'lang_topic' => $lang_topic,
                     )
@@ -719,7 +718,7 @@ public function display_search_results($search)
                 $cur_search['item_status'] = ($topic_count % 2 == 0) ? 'roweven' : 'rowodd';
                 $cur_search['icon_type'] = 'icon';
 
-                $subject = '<a href="'.get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.feather_escape($cur_search['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_search['poster']).'</span>';
+                $subject = '<a href="'.get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.feather_escape($cur_search['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['poster']).'</span>';
 
                 if ($cur_search['sticky'] == '1') {
                     $cur_search['item_status'] .= ' isticky';
@@ -735,7 +734,7 @@ public function display_search_results($search)
                     $cur_search['item_status'] .= ' inew';
                     $cur_search['icon_type'] = 'icon icon-new';
                     $subject = '<strong>'.$subject.'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_search['tid'].'/action/new/').'" title="'.$lang_common['New posts info'].'">'.$lang_common['New posts'].'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_search['tid'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
@@ -769,7 +768,6 @@ public function display_search_results($search)
                     'topic_count' => $topic_count,
                     'subject' => $subject,
                     'forum' => $forum,
-                    'lang_common' => $lang_common,
                     )
                 );
             }
diff --git a/model/viewforum.php b/model/viewforum.php
index 1f87ec5d..790d5384 100644
--- a/model/viewforum.php
+++ b/model/viewforum.php
@@ -25,7 +25,7 @@ public function __construct()
     // Returns basic informations about the forum
     public function get_info_forum($id)
     {
-        global $lang_common;
+
 
         $where_get_info_forum = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -58,7 +58,7 @@ public function get_info_forum($id)
         }
 
         if (!$cur_forum) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_forum;
@@ -87,7 +87,7 @@ public function sort_forum_by($sort_by_sql)
     // Adds relationship meta tags
     public function get_page_head($forum_id, $num_pages, $p, $url_forum)
     {
-        global $lang_common;
+
 
         $page_head = array();
         $page_head['canonical'] = "\t".'<link href="'.get_link('forum/'.$forum_id.'/'.$url_forum.'/').'" rel="canonical" />';
@@ -102,9 +102,9 @@ public function get_page_head($forum_id, $num_pages, $p, $url_forum)
         }
 
         if ($this->config['o_feed_type'] == '1') {
-            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss" title="'.$lang_common['RSS forum feed'].'" />';
+            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss" title="'.__('RSS forum feed').'" />';
         } elseif ($this->config['o_feed_type'] == '2') {
-            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom" title="'.$lang_common['Atom forum feed'].'" />';
+            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom" title="'.__('Atom forum feed').'" />';
         }
 
         return $page_head;
@@ -113,7 +113,7 @@ public function get_page_head($forum_id, $num_pages, $p, $url_forum)
     // Returns forum action
     public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
     {
-        global $lang_forum, $lang_common;
+        global $lang_forum;
 
         $forum_actions = array();
 
@@ -126,7 +126,7 @@ public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
                 }
             }
 
-            $forum_actions[] = '<a href="'.get_link('mark-forum-read/'.$forum_id.'/').'">'.$lang_common['Mark forum read'].'</a>';
+            $forum_actions[] = '<a href="'.get_link('mark-forum-read/'.$forum_id.'/').'">'.__('Mark forum read').'</a>';
         }
 
         return $forum_actions;
@@ -135,7 +135,7 @@ public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
     // Returns the elements needed to display topics
     public function print_topics($forum_id, $sort_by, $start_from)
     {
-        global $lang_common, $lang_forum;
+        global $lang_forum;
 
         // Get topic/forum tracking data
         if (!$this->user->is_guest) {
@@ -197,7 +197,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 $url_subject = url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_formatted'] = '<a href="'.get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_formatted'] = '<a href="'.get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
                 } else {
                     $cur_topic['last_post_formatted'] = '- - -';
                 }
@@ -212,13 +212,13 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="movedtext">'.$lang_forum['Moved'].'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="closedtext">'.$lang_forum['Closed'].'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
@@ -227,7 +227,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_formatted'] = '<strong>'.$cur_topic['subject_formatted'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.$lang_common['New posts info'].'">'.$lang_common['New posts'].'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
diff --git a/model/viewtopic.php b/model/viewtopic.php
index c3006d89..81e48413 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -25,7 +25,7 @@ public function __construct()
     // Redirects to a post in particular
     public function redirect_to_post($post_id)
     {
-        global $lang_common;
+
 
         $select_info_topic = array('topic_id', 'posted');
 
@@ -35,7 +35,7 @@ public function redirect_to_post($post_id)
                       ->find_one();
 
         if (!$result) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $post['topic_id'] = $result['topic_id'];
@@ -55,7 +55,7 @@ public function redirect_to_post($post_id)
     // Redirects to new posts or last post
     public function handle_actions($topic_id, $action)
     {
-        
+
         // If action=new, we redirect to the first new post (if any)
         if ($action == 'new') {
             if (!$this->user->is_guest) {
@@ -94,7 +94,7 @@ public function handle_actions($topic_id, $action)
     // Gets some info about the topic
     public function get_info_topic($id)
     {
-        global $lang_common;
+
 
         $where_get_info_topic = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -133,7 +133,7 @@ public function get_info_topic($id)
         }
 
         if (!$cur_topic) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_topic;
@@ -166,18 +166,18 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
     // Should we display the quickpost?
     public function is_quickpost($post_replies, $closed, $is_admmod)
     {
-        global $lang_common;
+
 
         $quickpost = false;
         if ($this->config['o_quickpost'] == '1' && ($post_replies == '1' || ($post_replies == '' && $this->user->g_post_replies == '1')) && ($closed == '0' || $is_admmod)) {
             // Load the post.php language file
             require FEATHER_ROOT.'lang/'.$this->user->language.'/post.php';
 
-            $required_fields = array('req_message' => $lang_common['Message']);
+            $required_fields = array('req_message' => __('Message'));
             if ($this->user->is_guest) {
                 $required_fields['req_username'] = $lang_post['Guest name'];
                 if ($this->config['p_force_guest_email'] == '1') {
-                    $required_fields['req_email'] = $lang_common['Email'];
+                    $required_fields['req_email'] = __('Email');
                 }
             }
             $quickpost = true;
@@ -208,7 +208,7 @@ public function get_subscraction($is_subscribed, $topic_id)
     // Adds relationship meta tags
     public function get_page_head($topic_id, $num_pages, $p, $url_topic)
     {
-        global $lang_common;
+
 
         $page_head = array();
         $page_head['canonical'] = "\t".'<link href="'.get_link('topic/'.$topic_id.'/'.$url_topic.'/').'" rel="canonical" />';
@@ -223,9 +223,9 @@ public function get_page_head($topic_id, $num_pages, $p, $url_topic)
         }
 
         if ($this->config['o_feed_type'] == '1') {
-            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=rss" title="'.$lang_common['RSS topic feed'].'" />';
+            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=rss" title="'.__('RSS topic feed').'" />';
         } elseif ($this->config['o_feed_type'] == '2') {
-            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=atom" title="'.$lang_common['Atom topic feed'].'" />';
+            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=atom" title="'.__('Atom topic feed').'" />';
         }
 
         return $page_head;
@@ -234,7 +234,7 @@ public function get_page_head($topic_id, $num_pages, $p, $url_topic)
     // Prints the posts
     public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
     {
-        global $lang_topic, $lang_common, $pd;
+        global $lang_topic, $pd;
 
         $post_data = array();
 
@@ -322,9 +322,9 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
 
                     // Now let's deal with the contact links (Email and URL)
                     if ((($cur_post['email_setting'] == '0' && !$this->user->is_guest) || $this->user->is_admmod) && $this->user->g_send_email == '1') {
-                        $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['email']).'">'.$lang_common['Email'].'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['email']).'">'.__('Email').'</a></span>';
                     } elseif ($cur_post['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.get_link('mail/'.$cur_post['poster_id'].'/').'">'.$lang_common['Email'].'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.get_link('mail/'.$cur_post['poster_id'].'/').'">'.__('Email').'</a></span>';
                     }
 
                     if ($cur_post['url'] != '') {
@@ -360,7 +360,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 }
 
                 if ($this->config['o_show_user_info'] == '1' && $cur_post['poster_email'] != '' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-                    $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['poster_email']).'">'.$lang_common['Email'].'</a></span>';
+                    $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['poster_email']).'">'.__('Email').'</a></span>';
                 }
             }
 
diff --git a/style/FeatherBB/view/admin/groups/add_edit_group.php b/style/FeatherBB/view/admin/groups/add_edit_group.php
index 8c4ddb91..3bd8018c 100644
--- a/style/FeatherBB/view/admin/groups/add_edit_group.php
+++ b/style/FeatherBB/view/admin/groups/add_edit_group.php
@@ -40,7 +40,7 @@
 									<th scope="row"><?php echo $lang_admin_groups['User title label'] ?></th>
 									<td>
 										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
-										<span><?php printf($lang_admin_groups['User title help'], ($group['info']['g_id'] != FEATHER_GUEST ? $lang_common['Member'] : $lang_common['Guest'])) ?></span>
+										<span><?php printf($lang_admin_groups['User title help'], ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
 									</td>
 								</tr>
 <?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
diff --git a/style/FeatherBB/view/delete.php b/style/FeatherBB/view/delete.php
index 9d6afff9..fc4f5f0a 100644
--- a/style/FeatherBB/view/delete.php
+++ b/style/FeatherBB/view/delete.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="index.php"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="index.php"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $lang_delete['Delete post'] ?></strong></li>
@@ -35,7 +35,7 @@
 					<p><?php echo($is_topic_post) ? '<strong>'.$lang_delete['Topic warning'].'</strong>' : '<strong>'.$lang_delete['Warning'].'</strong>' ?><br /><?php echo $lang_delete['Delete info'] ?></p>
 				</div>
 			</div>
-			<p class="buttons"><input type="submit" name="delete" value="<?php echo $lang_delete['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete" value="<?php echo $lang_delete['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/edit.php b/style/FeatherBB/view/edit.php
index 3d91e362..d4199e10 100644
--- a/style/FeatherBB/view/edit.php
+++ b/style/FeatherBB/view/edit.php
@@ -19,7 +19,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $lang_post['Edit post'] ?></strong></li>
@@ -83,16 +83,16 @@
 					<legend><?php echo $lang_post['Edit post legend'] ?></legend>
 					<input type="hidden" name="form_sent" value="1" />
 					<div class="infldset txtarea">
-<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo $lang_common['Subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="help.php#img" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="help.php#smilies" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="help.php#img" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="help.php#smilies" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -102,7 +102,7 @@
 ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_common['Options'] ?></legend>
+					<legend><?php echo __('Options') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
@@ -113,7 +113,7 @@
 <?php
 endif;
 ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
index 6249ae34..80259a3b 100644
--- a/style/FeatherBB/view/footer.php
+++ b/style/FeatherBB/view/footer.php
@@ -11,7 +11,7 @@
 </div>
 
 <div id="brdfooter" class="block">
-	<h2><span><?php echo $lang_common['Board footer'] ?></span></h2>
+	<h2><span><?php echo __('Board footer') ?></span></h2>
 	<div class="box">
 <?php
 
@@ -21,7 +21,7 @@
     if ($footer_style == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.$lang_forum['Mod controls'].'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.$lang_common['Moderate forum'].'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($footer_style == 'viewtopic') {
         if (isset($pid)) {
@@ -36,20 +36,20 @@
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.$lang_topic['Mod controls'].'</strong></dt>'."\n";
         // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.$lang_common['Moderate topic'].'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.$lang_common['All'].'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.$lang_common['Moderate topic'].'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.$lang_common['Move topic'].'</a></span></dd>'."\n";
+        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
 
         if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.$lang_common['Open topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.$lang_common['Close topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
         }
 
         if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.$lang_common['Unstick topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.$lang_common['Stick topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
         }
 
         echo "\t\t\t".'</dl>'."\n";
@@ -89,26 +89,26 @@
 
 if ($footer_style == 'index') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.$lang_common['RSS active topics feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.$lang_common['Atom active topics feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewforum') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.$lang_common['RSS forum feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.$lang_common['Atom forum feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewtopic') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.$lang_common['RSS topic feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.$lang_common['Atom topic feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
     }
 }
 
 ?>
-				<p id="poweredby"><?php printf($lang_common['Powered by'], '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
+				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
 			</div>
 			<div class="clearer"></div>
 		</div>
@@ -122,13 +122,13 @@
 
     // Calculate script generation time
     $time_diff = sprintf('%.3f', get_microtime() - $feather_start);
-    echo sprintf($lang_common['Querytime'], $time_diff, count(\DB::get_query_log()[0]));
+    echo sprintf(__('Querytime'), $time_diff, count(\DB::get_query_log()[0]));
 
     if (function_exists('memory_get_usage')) {
-        echo ' - '.sprintf($lang_common['Memory usage'], file_size(memory_get_usage()));
+        echo ' - '.sprintf(__('Memory usage'), file_size(memory_get_usage()));
 
         if (function_exists('memory_get_peak_usage')) {
-            echo ' '.sprintf($lang_common['Peak usage'], file_size(memory_get_peak_usage()));
+            echo ' '.sprintf(__('Peak usage'), file_size(memory_get_peak_usage()));
         }
     }
 
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
index ec4c4b49..7b2b8d28 100644
--- a/style/FeatherBB/view/header.php
+++ b/style/FeatherBB/view/header.php
@@ -9,7 +9,7 @@
 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang_common['lang_identifier'] ?>" lang="<?php echo $lang_common['lang_identifier'] ?>" dir="<?php echo $lang_common['lang_direction'] ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo __('lang_identifier') ?>" lang="<?php echo __('lang_identifier') ?>" dir="<?php echo __('lang_direction') ?>">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -57,7 +57,7 @@ function process_form(the_form)
                         var elem = the_form.elements[i];
                         if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
                         {
-                            alert('"' + required_fields[elem.name] + '" <?php echo $lang_common['required field'] ?>');
+                            alert('"' + required_fields[elem.name] + '" <?php echo __('required field') ?>');
                             elem.focus();
                             return false;
                         }
@@ -89,7 +89,7 @@ function process_form(the_form)
                 <div class="navbar-right">
                     <form method="get" action="search" class="nav-search">
                         <input type="hidden" name="action" value="search">
-                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php echo $lang_common['Search'] ?>">
+                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php echo __('Search') ?>">
                     </form>
                 </div>
             </div>
@@ -111,7 +111,7 @@ function process_form(the_form)
         </div>
         <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
             <div id="announce" class="block">
-                <div class="hd"><h2><span><?php echo $lang_common['Announcement'] ?></span></h2></div>
+                <div class="hd"><h2><span><?php echo __('Announcement') ?></span></h2></div>
                 <div class="box">
                     <div id="announce-block" class="inbox">
                         <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
@@ -122,7 +122,7 @@ function process_form(the_form)
         <?php if (isset($flash['message'])) : ?>
             <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
             <div id="msgflash" class="block">
-                <h2><span><?php echo $lang_common['Info'] ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
+                <h2><span><?php echo __('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
                 <div class="box">
                     <div class="inbox">
                         <p><?php echo feather_escape($flash['message']) ?></p>
diff --git a/style/FeatherBB/view/help.php b/style/FeatherBB/view/help.php
index fd511285..65353802 100644
--- a/style/FeatherBB/view/help.php
+++ b/style/FeatherBB/view/help.php
@@ -67,7 +67,7 @@
 		<p><code>[quote=James]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
 		<p><?php echo $lang_help['produces quote box'] ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><cite>James <?php echo $lang_common['wrote'] ?></cite><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
+			<div class="quotebox"><cite>James <?php echo __('wrote') ?></cite><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
 		</div>
 		<p><?php echo $lang_help['Quotes info 2'] ?></p>
 		<p><code>[quote]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
@@ -133,7 +133,7 @@
 }
 
 foreach ($smiley_groups as $smiley_img => $smiley_texts) {
-    echo "\t\t<p><code>". implode('</code> ' .$lang_common['and']. ' <code>', $smiley_texts).'</code> <span>' .$lang_help['produces']. '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
+    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .$lang_help['produces']. '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
 }
 
 ?>
diff --git a/style/FeatherBB/view/index.php b/style/FeatherBB/view/index.php
index 1ffce864..73d0ec3b 100644
--- a/style/FeatherBB/view/index.php
+++ b/style/FeatherBB/view/index.php
@@ -33,10 +33,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Forum'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Forum') ?></th>
 					<th class="tc2" scope="col"><?php echo $lang_index['Topics'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_common['Posts'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
+					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/style/FeatherBB/view/login/form.php b/style/FeatherBB/view/login/form.php
index 8d35d8b7..221f02db 100644
--- a/style/FeatherBB/view/login/form.php
+++ b/style/FeatherBB/view/login/form.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_common['Login'] ?></span></h2>
+	<h2><span><?php echo __('Login') ?></span></h2>
 	<div class="box">
 		<form id="login" method="post" action="<?php echo get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -24,8 +24,8 @@
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="conl required"><strong><?php echo $lang_common['Username'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
+						<label class="conl required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
+						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
 
 						<div class="rbox clearb">
 							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo $lang_login['Remember me'] ?><br /></label>
@@ -36,7 +36,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="login" value="<?php echo $lang_common['Login'] ?>" tabindex="4" /></p>
+			<p class="buttons"><input type="submit" name="login" value="<?php echo __('Login') ?>" tabindex="4" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/login/password_forgotten.php b/style/FeatherBB/view/login/password_forgotten.php
index 2712f630..7387bc54 100644
--- a/style/FeatherBB/view/login/password_forgotten.php
+++ b/style/FeatherBB/view/login/password_forgotten.php
@@ -46,12 +46,12 @@
 					<legend><?php echo $lang_login['Request pass legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_common['Email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
+						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
 						<p><?php echo $lang_login['Request pass info'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="request_pass" value="<?php echo $lang_common['Submit'] ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a><?php endif; ?></p>
+			<p class="buttons"><input type="submit" name="request_pass" value="<?php echo __('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a><?php endif; ?></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/message.php b/style/FeatherBB/view/message.php
index 7f26edad..d376bd09 100644
--- a/style/FeatherBB/view/message.php
+++ b/style/FeatherBB/view/message.php
@@ -14,11 +14,11 @@
 
 ?>
 <div id="msg" class="block">
-	<h2><span><?php echo $lang_common['Info'] ?></span></h2>
+	<h2><span><?php echo __('Info') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<p><?php echo $message ?></p>
-<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php echo __('Go back') ?></a></p>
 <?php endif;
     ?>		</div>
 	</div>
diff --git a/style/FeatherBB/view/misc/email.php b/style/FeatherBB/view/misc/email.php
index 054c7f34..0cd4f3c8 100644
--- a/style/FeatherBB/view/misc/email.php
+++ b/style/FeatherBB/view/misc/email.php
@@ -23,15 +23,15 @@
 					<legend><?php echo $lang_misc['Write email'] ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
 						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/misc/report.php b/style/FeatherBB/view/misc/report.php
index 6cf01c90..adbb619f 100644
--- a/style/FeatherBB/view/misc/report.php
+++ b/style/FeatherBB/view/misc/report.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $lang_misc['Report post'] ?></strong></li>
@@ -34,11 +34,11 @@
 					<legend><?php echo $lang_misc['Reason desc'] ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_misc['Reason'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
+						<label class="required"><strong><?php echo $lang_misc['Reason'] ?> <span><?php echo __('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/delete_posts.php b/style/FeatherBB/view/moderate/delete_posts.php
index d3a8ea76..01269ca7 100644
--- a/style/FeatherBB/view/moderate/delete_posts.php
+++ b/style/FeatherBB/view/moderate/delete_posts.php
@@ -27,7 +27,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/delete_topics.php b/style/FeatherBB/view/moderate/delete_topics.php
index d18c7394..9b04ddaf 100644
--- a/style/FeatherBB/view/moderate/delete_topics.php
+++ b/style/FeatherBB/view/moderate/delete_topics.php
@@ -28,7 +28,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/merge_topics.php b/style/FeatherBB/view/moderate/merge_topics.php
index 1c5cc5a4..0e328f1d 100644
--- a/style/FeatherBB/view/moderate/merge_topics.php
+++ b/style/FeatherBB/view/moderate/merge_topics.php
@@ -30,7 +30,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo $lang_misc['Merge'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo $lang_misc['Merge'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/moderator_forum.php b/style/FeatherBB/view/moderate/moderator_forum.php
index af90498d..114df22e 100644
--- a/style/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/FeatherBB/view/moderate/moderator_forum.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
 		</ul>
@@ -38,10 +38,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Replies'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
 <?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
-<?php endif; ?>					<th class="tcr"><?php echo $lang_common['Last post'] ?></th>
+<?php endif; ?>					<th class="tcr"><?php echo __('Last post') ?></th>
 					<th class="tcmod" scope="col"><?php echo $lang_misc['Select'] ?></th>
 				</tr>
 			</thead>
@@ -91,7 +91,7 @@
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
 		</ul>
diff --git a/style/FeatherBB/view/moderate/move_topics.php b/style/FeatherBB/view/moderate/move_topics.php
index 8dfedeaf..b792cf68 100644
--- a/style/FeatherBB/view/moderate/move_topics.php
+++ b/style/FeatherBB/view/moderate/move_topics.php
@@ -38,7 +38,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo $lang_misc['Move'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo $lang_misc['Move'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/posts_view.php b/style/FeatherBB/view/moderate/posts_view.php
index 87d23e24..60477a50 100644
--- a/style/FeatherBB/view/moderate/posts_view.php
+++ b/style/FeatherBB/view/moderate/posts_view.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
@@ -53,7 +53,7 @@
 						</dl>
 					</div>
 					<div class="postright">
-						<h3 class="nosize"><?php echo $lang_common['Message'] ?></h3>
+						<h3 class="nosize"><?php echo __('Message') ?></h3>
 						<div class="postmsg">
 							<?php echo $post['message']."\n" ?>
 	<?php if ($post['edited'] != '') {
@@ -84,7 +84,7 @@
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
diff --git a/style/FeatherBB/view/moderate/split_posts.php b/style/FeatherBB/view/moderate/split_posts.php
index f3f5d88e..244c7fb8 100644
--- a/style/FeatherBB/view/moderate/split_posts.php
+++ b/style/FeatherBB/view/moderate/split_posts.php
@@ -23,7 +23,7 @@
 					<legend><?php echo $lang_misc['Confirm split legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<label class="required"><strong><?php echo $lang_misc['New subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
+						<label class="required"><strong><?php echo $lang_misc['New subject'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
 						<label><?php echo $lang_misc['Move to'] ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
@@ -34,7 +34,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo $lang_misc['Split'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo $lang_misc['Split'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/post.php b/style/FeatherBB/view/post.php
index 7bdfc449..603d4cac 100644
--- a/style/FeatherBB/view/post.php
+++ b/style/FeatherBB/view/post.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
@@ -92,16 +92,16 @@
 		<?php echo $form."\n" ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_common['Write message legend'] ?></legend>
+					<legend><?php echo __('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
                                                 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if ($feather->user->is_guest) {
-    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong>' : $lang_common['Email'];
+    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
     $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
-						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
+						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
     echo feather_escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
@@ -114,17 +114,17 @@
 
 }
 if ($fid): ?>
-						<label class="required"><strong><?php echo $lang_common['Subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
+						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
     echo feather_escape($post['subject']);
 } ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -134,7 +134,7 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_common['Options'] ?></legend>
+					<legend><?php echo __('Options') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
@@ -157,7 +157,7 @@
                              $question = array_keys($lang_antispam_questions);
                              $qencoded = md5($question[$index_questions]);
                              echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);?>
-							 <span><?php echo $lang_common['Required'] ?></span></strong>
+							 <span><?php echo __('Required') ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -165,7 +165,7 @@
 				</fieldset>
 			</div>
 			<?php endif; ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/change_mail.php b/style/FeatherBB/view/profile/change_mail.php
index 68ae0012..f425e499 100644
--- a/style/FeatherBB/view/profile/change_mail.php
+++ b/style/FeatherBB/view/profile/change_mail.php
@@ -23,13 +23,13 @@
 					<legend><?php echo $lang_profile['Email legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_profile['New email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
-						<label class="required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
+						<label class="required"><strong><?php echo $lang_profile['New email'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
+						<label class="required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
 						<p><?php echo $lang_profile['Email instructions'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="new_email" value="<?php echo $lang_common['Submit'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="new_email" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/change_pass.php b/style/FeatherBB/view/profile/change_pass.php
index 0231efa2..f5344967 100644
--- a/style/FeatherBB/view/profile/change_pass.php
+++ b/style/FeatherBB/view/profile/change_pass.php
@@ -23,17 +23,17 @@
 				<fieldset>
 					<legend><?php echo $lang_profile['Change pass legend'] ?></legend>
 					<div class="infldset">
-<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo $lang_profile['Old pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo $lang_profile['Old pass'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_old_password" size="16" /><br /></label>
-<?php endif; ?>						<label class="conl required"><strong><?php echo $lang_profile['New pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php endif; ?>						<label class="conl required"><strong><?php echo $lang_profile['New pass'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password1" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_profile['Confirm new pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="conl required"><strong><?php echo $lang_profile['Confirm new pass'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password2" size="16" /><br /></label>
 						<p class="clearb"><?php echo $lang_profile['Pass info'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/delete_user.php b/style/FeatherBB/view/profile/delete_user.php
index 55c707c5..0f0ebc14 100644
--- a/style/FeatherBB/view/profile/delete_user.php
+++ b/style/FeatherBB/view/profile/delete_user.php
@@ -30,7 +30,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo $lang_profile['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo $lang_profile['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/section_display.php b/style/FeatherBB/view/profile/section_display.php
index 8ac8fd27..7aacc2f0 100644
--- a/style/FeatherBB/view/profile/section_display.php
+++ b/style/FeatherBB/view/profile/section_display.php
@@ -93,7 +93,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_essentials.php b/style/FeatherBB/view/profile/section_essentials.php
index 25deccf6..364d5d8e 100644
--- a/style/FeatherBB/view/profile/section_essentials.php
+++ b/style/FeatherBB/view/profile/section_essentials.php
@@ -250,7 +250,7 @@
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_messaging.php b/style/FeatherBB/view/profile/section_messaging.php
index 3a5be1a2..1ba9e14f 100644
--- a/style/FeatherBB/view/profile/section_messaging.php
+++ b/style/FeatherBB/view/profile/section_messaging.php
@@ -31,7 +31,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_personal.php b/style/FeatherBB/view/profile/section_personal.php
index 3accb5f7..6e2fd1e6 100644
--- a/style/FeatherBB/view/profile/section_personal.php
+++ b/style/FeatherBB/view/profile/section_personal.php
@@ -31,7 +31,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_personality.php b/style/FeatherBB/view/profile/section_personality.php
index d3e67cd6..cfb1d445 100644
--- a/style/FeatherBB/view/profile/section_personality.php
+++ b/style/FeatherBB/view/profile/section_personality.php
@@ -39,16 +39,16 @@
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_privacy.php b/style/FeatherBB/view/profile/section_privacy.php
index 34715516..030520e0 100644
--- a/style/FeatherBB/view/profile/section_privacy.php
+++ b/style/FeatherBB/view/profile/section_privacy.php
@@ -54,7 +54,7 @@
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/upload_avatar.php b/style/FeatherBB/view/profile/upload_avatar.php
index 60487560..7a74e367 100644
--- a/style/FeatherBB/view/profile/upload_avatar.php
+++ b/style/FeatherBB/view/profile/upload_avatar.php
@@ -24,12 +24,12 @@
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-						<label class="required"><strong><?php echo $lang_profile['File'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php echo $lang_profile['Avatar desc'].' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.$lang_profile['pixels'].' '.$lang_common['and'].' '.forum_number_format($feather_config['o_avatars_size']).' '.$lang_profile['bytes'].' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
+						<label class="required"><strong><?php echo $lang_profile['File'] ?> <span><?php echo __('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
+						<p><?php echo $lang_profile['Avatar desc'].' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.$lang_profile['pixels'].' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.$lang_profile['bytes'].' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="upload" value="<?php echo $lang_profile['Upload'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="upload" value="<?php echo $lang_profile['Upload'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/view_profile.php b/style/FeatherBB/view/profile/view_profile.php
index da66b788..d9a5079e 100644
--- a/style/FeatherBB/view/profile/view_profile.php
+++ b/style/FeatherBB/view/profile/view_profile.php
@@ -14,7 +14,7 @@
 
 ?>
 <div id="viewprofile" class="block">
-	<h2><span><?php echo $lang_common['Profile'] ?></span></h2>
+	<h2><span><?php echo __('Profile') ?></span></h2>
 	<div class="box">
 		<div class="fakeform">
 			<div class="inform">
diff --git a/style/FeatherBB/view/register/email.php b/style/FeatherBB/view/register/email.php
index e6355cb6..e8c36fe7 100644
--- a/style/FeatherBB/view/register/email.php
+++ b/style/FeatherBB/view/register/email.php
@@ -25,15 +25,15 @@
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
 						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/register/form.php b/style/FeatherBB/view/register/form.php
index 3344af93..a088cc25 100644
--- a/style/FeatherBB/view/register/form.php
+++ b/style/FeatherBB/view/register/form.php
@@ -43,7 +43,7 @@
 		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><?php echo $lang_common['Important information'] ?></h3>
+					<h3><?php echo __('Important information') ?></h3>
 					<p><?php echo $lang_register['Desc 1'] ?></p>
 					<p><?php echo $lang_register['Desc 2'] ?></p>
 				</div>
@@ -53,7 +53,7 @@
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="username" value="" />
 						<input type="hidden" name="password" value="" />
-						<label class="required"><strong><?php echo $lang_common['Username'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
+						<label class="required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
     echo feather_escape($feather->request->post('req_user'));
 } ?>" size="25" maxlength="25" /><br /></label>
 					</div>
@@ -63,10 +63,10 @@
 				<fieldset>
 					<legend><?php echo $lang_register['Pass legend'] ?></legend>
 					<div class="infldset">
-						<label class="conl required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
+						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
     echo feather_escape($feather->request->post('req_password1'));
 } ?>" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_prof_reg['Confirm pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
+						<label class="conl required"><strong><?php echo $lang_prof_reg['Confirm pass'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
     echo feather_escape($feather->request->post('req_password2'));
 } ?>" size="16" /><br /></label>
 						<p class="clearb"><?php echo $lang_register['Pass info'] ?></p>
@@ -78,11 +78,11 @@
 					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? $lang_prof_reg['Email legend 2'] : $lang_prof_reg['Email legend'] ?></legend>
 					<div class="infldset">
 <?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo $lang_register['Email info'] ?></p>
-<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php endif; ?>						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
     echo feather_escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo $lang_register['Confirm email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo $lang_register['Confirm email'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
     echo feather_escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
@@ -124,7 +124,7 @@
 					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
 					<div class="infldset">
 						<p><?php echo $lang_antispam['Robot info']    ?></p>
-						<label class="required"><strong><?php echo sprintf($lang_antispam['Robot question'], $question[$index_questions]) ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
+						<label class="required"><strong><?php echo sprintf($lang_antispam['Robot question'], $question[$index_questions]) ?> <span><?php echo __('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/search/footer.php b/style/FeatherBB/view/search/footer.php
index 73ff5d13..a64e1cdf 100644
--- a/style/FeatherBB/view/search/footer.php
+++ b/style/FeatherBB/view/search/footer.php
@@ -30,7 +30,7 @@
 			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
diff --git a/style/FeatherBB/view/search/form.php b/style/FeatherBB/view/search/form.php
index 642fb380..262bf4d9 100644
--- a/style/FeatherBB/view/search/form.php
+++ b/style/FeatherBB/view/search/form.php
@@ -73,7 +73,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/header.php b/style/FeatherBB/view/search/header.php
index 47706687..79f9ee84 100644
--- a/style/FeatherBB/view/search/header.php
+++ b/style/FeatherBB/view/search/header.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
@@ -37,10 +37,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Forum'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_common['Replies'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Forum') ?></th>
+					<th class="tc3" scope="col"><?php echo __('Replies') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/style/FeatherBB/view/search/topics.php b/style/FeatherBB/view/search/topics.php
index d60dce31..af843193 100644
--- a/style/FeatherBB/view/search/topics.php
+++ b/style/FeatherBB/view/search/topics.php
@@ -25,5 +25,5 @@
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
 	<td class="tc3"><?php echo forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_search['last_poster']) ?></span></td>
+	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
 </tr>
\ No newline at end of file
diff --git a/style/FeatherBB/view/userlist.php b/style/FeatherBB/view/userlist.php
index 66e2a20d..33594426 100644
--- a/style/FeatherBB/view/userlist.php
+++ b/style/FeatherBB/view/userlist.php
@@ -21,7 +21,7 @@
 				<fieldset>
 					<legend><?php echo $lang_ul['User find legend'] ?></legend>
 					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo $lang_common['Username'] ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
+<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo __('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
 <?php endif; ?>						<label class="conl"><?php echo $lang_ul['User group']."\n" ?>
 						<br /><select name="show_group">
 							<option value="-1"<?php if ($show_group == -1) {
@@ -34,10 +34,10 @@
 						<br /><select name="sort_by">
 							<option value="username"<?php if ($sort_by == 'username') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_common['Username'] ?></option>
+} ?>><?php echo __('Username') ?></option>
 							<option value="registered"<?php if ($sort_by == 'registered') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_common['Registered'] ?></option>
+} ?>><?php echo __('Registered') ?></option>
 <?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
     echo ' selected="selected"';
 } ?>><?php echo $lang_ul['No of posts'] ?></option>
@@ -57,7 +57,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
@@ -70,16 +70,16 @@
 </div>
 
 <div id="users1" class="blocktable">
-	<h2><span><?php echo $lang_common['User list'] ?></span></h2>
+	<h2><span><?php echo __('User list') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Username'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Title'] ?></th>
-<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php echo $lang_common['Posts'] ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo $lang_common['Registered'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Username') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Title') ?></th>
+<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Registered') ?></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/style/FeatherBB/view/viewforum.php b/style/FeatherBB/view/viewforum.php
index 332987ae..7f4a55b7 100644
--- a/style/FeatherBB/view/viewforum.php
+++ b/style/FeatherBB/view/viewforum.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -34,10 +34,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Replies'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
 <?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -91,7 +91,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
diff --git a/style/FeatherBB/view/viewtopic.php b/style/FeatherBB/view/viewtopic.php
index e5f55ab0..733bb59b 100644
--- a/style/FeatherBB/view/viewtopic.php
+++ b/style/FeatherBB/view/viewtopic.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -107,7 +107,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -130,7 +130,7 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_common['Write message legend'] ?></legend>
+					<legend><?php echo __('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
@@ -139,15 +139,15 @@
 <?php endif;
 
     if ($feather->user->is_guest) {
-        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong>' : $lang_common['Email'];
+        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
         $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
         ?>
-						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
 <?php
 
-    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.$lang_common['Message'].' <span>'.$lang_common['Required'].'</span></strong><br />';
+    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.__('Message').' <span>'.__('Required').'</span></strong><br />';
     } else {
         echo "\t\t\t\t\t\t".'<label>';
     }
@@ -163,13 +163,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>
@@ -186,7 +186,7 @@
     $qencoded = md5($question[$index_questions]);
     echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);
     ?>
-							 <span><?php echo $lang_common['Required'] ?></span></strong>
+							 <span><?php echo __('Required') ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -195,7 +195,7 @@
 			</div>
 			<?php endif;
     ?>
-			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_topic['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
+			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo __('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_topic['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
 		</form>
 	</div>
 </div>
diff --git a/view/admin/groups/add_edit_group.php b/view/admin/groups/add_edit_group.php
index e2f0c0e8..26c9881c 100644
--- a/view/admin/groups/add_edit_group.php
+++ b/view/admin/groups/add_edit_group.php
@@ -40,7 +40,7 @@
 								<th scope="row"><?php echo $lang_admin_groups['User title label'] ?></th>
 								<td>
 									<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
-									<span><?php printf($lang_admin_groups['User title help'], ($group['info']['g_id'] != FEATHER_GUEST ? $lang_common['Member'] : $lang_common['Guest'])) ?></span>
+									<span><?php printf($lang_admin_groups['User title help'], ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
 								</td>
 							</tr>
 							<?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
diff --git a/view/delete.php b/view/delete.php
index 9d6afff9..fc4f5f0a 100644
--- a/view/delete.php
+++ b/view/delete.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="index.php"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="index.php"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $lang_delete['Delete post'] ?></strong></li>
@@ -35,7 +35,7 @@
 					<p><?php echo($is_topic_post) ? '<strong>'.$lang_delete['Topic warning'].'</strong>' : '<strong>'.$lang_delete['Warning'].'</strong>' ?><br /><?php echo $lang_delete['Delete info'] ?></p>
 				</div>
 			</div>
-			<p class="buttons"><input type="submit" name="delete" value="<?php echo $lang_delete['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete" value="<?php echo $lang_delete['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
diff --git a/view/edit.php b/view/edit.php
index 3d91e362..d4199e10 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -19,7 +19,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $lang_post['Edit post'] ?></strong></li>
@@ -83,16 +83,16 @@
 					<legend><?php echo $lang_post['Edit post legend'] ?></legend>
 					<input type="hidden" name="form_sent" value="1" />
 					<div class="infldset txtarea">
-<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo $lang_common['Subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="help.php#img" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="help.php#smilies" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="help.php#img" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="help.php#smilies" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -102,7 +102,7 @@
 ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_common['Options'] ?></legend>
+					<legend><?php echo __('Options') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
@@ -113,7 +113,7 @@
 <?php
 endif;
 ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/footer.php b/view/footer.php
index dde5eb31..98104ea5 100644
--- a/view/footer.php
+++ b/view/footer.php
@@ -11,7 +11,7 @@
 </div>
 
 <div id="brdfooter" class="block">
-	<h2><span><?php echo $lang_common['Board footer'] ?></span></h2>
+	<h2><span><?php echo __('Board footer') ?></span></h2>
 	<div class="box">
 <?php
 
@@ -21,7 +21,7 @@
     if ($footer_style == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.$lang_forum['Mod controls'].'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.$lang_common['Moderate forum'].'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($footer_style == 'viewtopic') {
         if (isset($pid)) {
@@ -36,20 +36,20 @@
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.$lang_topic['Mod controls'].'</strong></dt>'."\n";
         // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.$lang_common['Moderate topic'].'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.$lang_common['All'].'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.$lang_common['Moderate topic'].'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.$lang_common['Move topic'].'</a></span></dd>'."\n";
+        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
 
         if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.$lang_common['Open topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.$lang_common['Close topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
         }
 
         if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.$lang_common['Unstick topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.$lang_common['Stick topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
         }
 
         echo "\t\t\t".'</dl>'."\n";
@@ -89,26 +89,26 @@
 
 if ($footer_style == 'index') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.$lang_common['RSS active topics feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.$lang_common['Atom active topics feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewforum') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.$lang_common['RSS forum feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.$lang_common['Atom forum feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewtopic') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.$lang_common['RSS topic feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.$lang_common['Atom topic feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
     }
 }
 
 ?>
-				<p id="poweredby"><?php printf($lang_common['Powered by'], '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
+				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
 			</div>
 			<div class="clearer"></div>
 		</div>
@@ -122,13 +122,13 @@
 
     // Calculate script generation time
     $time_diff = sprintf('%.3f', get_microtime() - $feather_start);
-    echo sprintf($lang_common['Querytime'], $time_diff, count(\DB::get_query_log()[0]));
+    echo sprintf(__('Querytime'), $time_diff, count(\DB::get_query_log()[0]));
 
     if (function_exists('memory_get_usage')) {
-        echo ' - '.sprintf($lang_common['Memory usage'], file_size(memory_get_usage()));
+        echo ' - '.sprintf(__('Memory usage'), file_size(memory_get_usage()));
 
         if (function_exists('memory_get_peak_usage')) {
-            echo ' '.sprintf($lang_common['Peak usage'], file_size(memory_get_peak_usage()));
+            echo ' '.sprintf(__('Peak usage'), file_size(memory_get_peak_usage()));
         }
     }
 
diff --git a/view/header.php b/view/header.php
index 4492eaa0..88f0260a 100644
--- a/view/header.php
+++ b/view/header.php
@@ -9,7 +9,7 @@
 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang_common['lang_identifier'] ?>" lang="<?php echo $lang_common['lang_identifier'] ?>" dir="<?php echo $lang_common['lang_direction'] ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo __('lang_identifier') ?>" lang="<?php echo __('lang_identifier') ?>" dir="<?php echo __('lang_direction') ?>">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title><?php echo generate_page_title($page_title, $p) ?></title>
@@ -55,7 +55,7 @@ function process_form(the_form)
 			var elem = the_form.elements[i];
 			if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
 			{
-				alert('"' + required_fields[elem.name] + '" <?php echo $lang_common['required field'] ?>');
+				alert('"' + required_fields[elem.name] + '" <?php echo __('required field') ?>');
 				elem.focus();
 				return false;
 			}
@@ -92,7 +92,7 @@ function process_form(the_form)
 
 <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
 <div id="announce" class="block">
-    <div class="hd"><h2><span><?php echo $lang_common['Announcement'] ?></span></h2></div>
+    <div class="hd"><h2><span><?php echo __('Announcement') ?></span></h2></div>
     <div class="box">
         <div id="announce-block" class="inbox">
             <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
@@ -104,7 +104,7 @@ function process_form(the_form)
 <?php if (isset($flash['message'])) : ?>
 <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
 <div id="msgflash" class="block">
-    <h2><span><?php echo $lang_common['Info'] ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
+    <h2><span><?php echo __('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
     <div class="box">
         <div class="inbox">
             <p><?php echo feather_escape($flash['message']) ?></p>
diff --git a/view/help.php b/view/help.php
index fd511285..65353802 100644
--- a/view/help.php
+++ b/view/help.php
@@ -67,7 +67,7 @@
 		<p><code>[quote=James]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
 		<p><?php echo $lang_help['produces quote box'] ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><cite>James <?php echo $lang_common['wrote'] ?></cite><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
+			<div class="quotebox"><cite>James <?php echo __('wrote') ?></cite><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
 		</div>
 		<p><?php echo $lang_help['Quotes info 2'] ?></p>
 		<p><code>[quote]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
@@ -133,7 +133,7 @@
 }
 
 foreach ($smiley_groups as $smiley_img => $smiley_texts) {
-    echo "\t\t<p><code>". implode('</code> ' .$lang_common['and']. ' <code>', $smiley_texts).'</code> <span>' .$lang_help['produces']. '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
+    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .$lang_help['produces']. '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
 }
 
 ?>
diff --git a/view/index.php b/view/index.php
index 1ffce864..73d0ec3b 100644
--- a/view/index.php
+++ b/view/index.php
@@ -33,10 +33,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Forum'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Forum') ?></th>
 					<th class="tc2" scope="col"><?php echo $lang_index['Topics'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_common['Posts'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
+					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/view/login/form.php b/view/login/form.php
index 8d35d8b7..221f02db 100644
--- a/view/login/form.php
+++ b/view/login/form.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_common['Login'] ?></span></h2>
+	<h2><span><?php echo __('Login') ?></span></h2>
 	<div class="box">
 		<form id="login" method="post" action="<?php echo get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -24,8 +24,8 @@
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="conl required"><strong><?php echo $lang_common['Username'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
+						<label class="conl required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
+						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
 
 						<div class="rbox clearb">
 							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo $lang_login['Remember me'] ?><br /></label>
@@ -36,7 +36,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="login" value="<?php echo $lang_common['Login'] ?>" tabindex="4" /></p>
+			<p class="buttons"><input type="submit" name="login" value="<?php echo __('Login') ?>" tabindex="4" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/login/password_forgotten.php b/view/login/password_forgotten.php
index 2712f630..7387bc54 100644
--- a/view/login/password_forgotten.php
+++ b/view/login/password_forgotten.php
@@ -46,12 +46,12 @@
 					<legend><?php echo $lang_login['Request pass legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_common['Email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
+						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
 						<p><?php echo $lang_login['Request pass info'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="request_pass" value="<?php echo $lang_common['Submit'] ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a><?php endif; ?></p>
+			<p class="buttons"><input type="submit" name="request_pass" value="<?php echo __('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a><?php endif; ?></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/message.php b/view/message.php
index 7f26edad..d376bd09 100644
--- a/view/message.php
+++ b/view/message.php
@@ -14,11 +14,11 @@
 
 ?>
 <div id="msg" class="block">
-	<h2><span><?php echo $lang_common['Info'] ?></span></h2>
+	<h2><span><?php echo __('Info') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<p><?php echo $message ?></p>
-<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php echo __('Go back') ?></a></p>
 <?php endif;
     ?>		</div>
 	</div>
diff --git a/view/misc/email.php b/view/misc/email.php
index 054c7f34..0cd4f3c8 100644
--- a/view/misc/email.php
+++ b/view/misc/email.php
@@ -23,15 +23,15 @@
 					<legend><?php echo $lang_misc['Write email'] ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
 						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/misc/report.php b/view/misc/report.php
index 6cf01c90..adbb619f 100644
--- a/view/misc/report.php
+++ b/view/misc/report.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $lang_misc['Report post'] ?></strong></li>
@@ -34,11 +34,11 @@
 					<legend><?php echo $lang_misc['Reason desc'] ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_misc['Reason'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
+						<label class="required"><strong><?php echo $lang_misc['Reason'] ?> <span><?php echo __('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/delete_posts.php b/view/moderate/delete_posts.php
index d3a8ea76..01269ca7 100644
--- a/view/moderate/delete_posts.php
+++ b/view/moderate/delete_posts.php
@@ -27,7 +27,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/delete_topics.php b/view/moderate/delete_topics.php
index d18c7394..9b04ddaf 100644
--- a/view/moderate/delete_topics.php
+++ b/view/moderate/delete_topics.php
@@ -28,7 +28,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/merge_topics.php b/view/moderate/merge_topics.php
index 1c5cc5a4..0e328f1d 100644
--- a/view/moderate/merge_topics.php
+++ b/view/moderate/merge_topics.php
@@ -30,7 +30,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo $lang_misc['Merge'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo $lang_misc['Merge'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
index af90498d..114df22e 100644
--- a/view/moderate/moderator_forum.php
+++ b/view/moderate/moderator_forum.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
 		</ul>
@@ -38,10 +38,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Replies'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
 <?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
-<?php endif; ?>					<th class="tcr"><?php echo $lang_common['Last post'] ?></th>
+<?php endif; ?>					<th class="tcr"><?php echo __('Last post') ?></th>
 					<th class="tcmod" scope="col"><?php echo $lang_misc['Select'] ?></th>
 				</tr>
 			</thead>
@@ -91,7 +91,7 @@
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
 		</ul>
diff --git a/view/moderate/move_topics.php b/view/moderate/move_topics.php
index 8dfedeaf..b792cf68 100644
--- a/view/moderate/move_topics.php
+++ b/view/moderate/move_topics.php
@@ -38,7 +38,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo $lang_misc['Move'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo $lang_misc['Move'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/posts_view.php b/view/moderate/posts_view.php
index 87d23e24..60477a50 100644
--- a/view/moderate/posts_view.php
+++ b/view/moderate/posts_view.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
@@ -53,7 +53,7 @@
 						</dl>
 					</div>
 					<div class="postright">
-						<h3 class="nosize"><?php echo $lang_common['Message'] ?></h3>
+						<h3 class="nosize"><?php echo __('Message') ?></h3>
 						<div class="postmsg">
 							<?php echo $post['message']."\n" ?>
 	<?php if ($post['edited'] != '') {
@@ -84,7 +84,7 @@
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
diff --git a/view/moderate/split_posts.php b/view/moderate/split_posts.php
index f3f5d88e..244c7fb8 100644
--- a/view/moderate/split_posts.php
+++ b/view/moderate/split_posts.php
@@ -23,7 +23,7 @@
 					<legend><?php echo $lang_misc['Confirm split legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<label class="required"><strong><?php echo $lang_misc['New subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
+						<label class="required"><strong><?php echo $lang_misc['New subject'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
 						<label><?php echo $lang_misc['Move to'] ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
@@ -34,7 +34,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo $lang_misc['Split'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo $lang_misc['Split'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/post.php b/view/post.php
index 7bdfc449..603d4cac 100644
--- a/view/post.php
+++ b/view/post.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
@@ -92,16 +92,16 @@
 		<?php echo $form."\n" ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_common['Write message legend'] ?></legend>
+					<legend><?php echo __('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
                                                 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if ($feather->user->is_guest) {
-    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong>' : $lang_common['Email'];
+    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
     $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
-						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
+						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
     echo feather_escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
@@ -114,17 +114,17 @@
 
 }
 if ($fid): ?>
-						<label class="required"><strong><?php echo $lang_common['Subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
+						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
     echo feather_escape($post['subject']);
 } ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -134,7 +134,7 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_common['Options'] ?></legend>
+					<legend><?php echo __('Options') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
@@ -157,7 +157,7 @@
                              $question = array_keys($lang_antispam_questions);
                              $qencoded = md5($question[$index_questions]);
                              echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);?>
-							 <span><?php echo $lang_common['Required'] ?></span></strong>
+							 <span><?php echo __('Required') ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -165,7 +165,7 @@
 				</fieldset>
 			</div>
 			<?php endif; ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/change_mail.php b/view/profile/change_mail.php
index 68ae0012..f425e499 100644
--- a/view/profile/change_mail.php
+++ b/view/profile/change_mail.php
@@ -23,13 +23,13 @@
 					<legend><?php echo $lang_profile['Email legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_profile['New email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
-						<label class="required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
+						<label class="required"><strong><?php echo $lang_profile['New email'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
+						<label class="required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
 						<p><?php echo $lang_profile['Email instructions'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="new_email" value="<?php echo $lang_common['Submit'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="new_email" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/change_pass.php b/view/profile/change_pass.php
index 0231efa2..f5344967 100644
--- a/view/profile/change_pass.php
+++ b/view/profile/change_pass.php
@@ -23,17 +23,17 @@
 				<fieldset>
 					<legend><?php echo $lang_profile['Change pass legend'] ?></legend>
 					<div class="infldset">
-<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo $lang_profile['Old pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo $lang_profile['Old pass'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_old_password" size="16" /><br /></label>
-<?php endif; ?>						<label class="conl required"><strong><?php echo $lang_profile['New pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php endif; ?>						<label class="conl required"><strong><?php echo $lang_profile['New pass'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password1" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_profile['Confirm new pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="conl required"><strong><?php echo $lang_profile['Confirm new pass'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password2" size="16" /><br /></label>
 						<p class="clearb"><?php echo $lang_profile['Pass info'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/delete_user.php b/view/profile/delete_user.php
index 55c707c5..0f0ebc14 100644
--- a/view/profile/delete_user.php
+++ b/view/profile/delete_user.php
@@ -30,7 +30,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo $lang_profile['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo $lang_profile['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
index 8ac8fd27..7aacc2f0 100644
--- a/view/profile/section_display.php
+++ b/view/profile/section_display.php
@@ -93,7 +93,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_essentials.php b/view/profile/section_essentials.php
index 25deccf6..364d5d8e 100644
--- a/view/profile/section_essentials.php
+++ b/view/profile/section_essentials.php
@@ -250,7 +250,7 @@
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_messaging.php b/view/profile/section_messaging.php
index 3a5be1a2..1ba9e14f 100644
--- a/view/profile/section_messaging.php
+++ b/view/profile/section_messaging.php
@@ -31,7 +31,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_personal.php b/view/profile/section_personal.php
index 3accb5f7..6e2fd1e6 100644
--- a/view/profile/section_personal.php
+++ b/view/profile/section_personal.php
@@ -31,7 +31,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_personality.php b/view/profile/section_personality.php
index d3e67cd6..cfb1d445 100644
--- a/view/profile/section_personality.php
+++ b/view/profile/section_personality.php
@@ -39,16 +39,16 @@
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_privacy.php b/view/profile/section_privacy.php
index 34715516..030520e0 100644
--- a/view/profile/section_privacy.php
+++ b/view/profile/section_privacy.php
@@ -54,7 +54,7 @@
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
index 60487560..7a74e367 100644
--- a/view/profile/upload_avatar.php
+++ b/view/profile/upload_avatar.php
@@ -24,12 +24,12 @@
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-						<label class="required"><strong><?php echo $lang_profile['File'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php echo $lang_profile['Avatar desc'].' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.$lang_profile['pixels'].' '.$lang_common['and'].' '.forum_number_format($feather_config['o_avatars_size']).' '.$lang_profile['bytes'].' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
+						<label class="required"><strong><?php echo $lang_profile['File'] ?> <span><?php echo __('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
+						<p><?php echo $lang_profile['Avatar desc'].' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.$lang_profile['pixels'].' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.$lang_profile['bytes'].' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="upload" value="<?php echo $lang_profile['Upload'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="upload" value="<?php echo $lang_profile['Upload'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/view_profile.php b/view/profile/view_profile.php
index da66b788..d9a5079e 100644
--- a/view/profile/view_profile.php
+++ b/view/profile/view_profile.php
@@ -14,7 +14,7 @@
 
 ?>
 <div id="viewprofile" class="block">
-	<h2><span><?php echo $lang_common['Profile'] ?></span></h2>
+	<h2><span><?php echo __('Profile') ?></span></h2>
 	<div class="box">
 		<div class="fakeform">
 			<div class="inform">
diff --git a/view/register/email.php b/view/register/email.php
index e6355cb6..e8c36fe7 100644
--- a/view/register/email.php
+++ b/view/register/email.php
@@ -25,15 +25,15 @@
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
 						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/register/form.php b/view/register/form.php
index 3344af93..a088cc25 100644
--- a/view/register/form.php
+++ b/view/register/form.php
@@ -43,7 +43,7 @@
 		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><?php echo $lang_common['Important information'] ?></h3>
+					<h3><?php echo __('Important information') ?></h3>
 					<p><?php echo $lang_register['Desc 1'] ?></p>
 					<p><?php echo $lang_register['Desc 2'] ?></p>
 				</div>
@@ -53,7 +53,7 @@
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="username" value="" />
 						<input type="hidden" name="password" value="" />
-						<label class="required"><strong><?php echo $lang_common['Username'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
+						<label class="required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
     echo feather_escape($feather->request->post('req_user'));
 } ?>" size="25" maxlength="25" /><br /></label>
 					</div>
@@ -63,10 +63,10 @@
 				<fieldset>
 					<legend><?php echo $lang_register['Pass legend'] ?></legend>
 					<div class="infldset">
-						<label class="conl required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
+						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
     echo feather_escape($feather->request->post('req_password1'));
 } ?>" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_prof_reg['Confirm pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
+						<label class="conl required"><strong><?php echo $lang_prof_reg['Confirm pass'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
     echo feather_escape($feather->request->post('req_password2'));
 } ?>" size="16" /><br /></label>
 						<p class="clearb"><?php echo $lang_register['Pass info'] ?></p>
@@ -78,11 +78,11 @@
 					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? $lang_prof_reg['Email legend 2'] : $lang_prof_reg['Email legend'] ?></legend>
 					<div class="infldset">
 <?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo $lang_register['Email info'] ?></p>
-<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php endif; ?>						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
     echo feather_escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo $lang_register['Confirm email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo $lang_register['Confirm email'] ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
     echo feather_escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
@@ -124,7 +124,7 @@
 					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
 					<div class="infldset">
 						<p><?php echo $lang_antispam['Robot info']    ?></p>
-						<label class="required"><strong><?php echo sprintf($lang_antispam['Robot question'], $question[$index_questions]) ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
+						<label class="required"><strong><?php echo sprintf($lang_antispam['Robot question'], $question[$index_questions]) ?> <span><?php echo __('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/search/footer.php b/view/search/footer.php
index 73ff5d13..a64e1cdf 100644
--- a/view/search/footer.php
+++ b/view/search/footer.php
@@ -30,7 +30,7 @@
 			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
diff --git a/view/search/form.php b/view/search/form.php
index 642fb380..262bf4d9 100644
--- a/view/search/form.php
+++ b/view/search/form.php
@@ -73,7 +73,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/search/header.php b/view/search/header.php
index 47706687..79f9ee84 100644
--- a/view/search/header.php
+++ b/view/search/header.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
@@ -37,10 +37,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Forum'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_common['Replies'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Forum') ?></th>
+					<th class="tc3" scope="col"><?php echo __('Replies') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/view/search/topics.php b/view/search/topics.php
index d60dce31..af843193 100644
--- a/view/search/topics.php
+++ b/view/search/topics.php
@@ -25,5 +25,5 @@
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
 	<td class="tc3"><?php echo forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_search['last_poster']) ?></span></td>
+	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
 </tr>
\ No newline at end of file
diff --git a/view/userlist.php b/view/userlist.php
index 66e2a20d..33594426 100644
--- a/view/userlist.php
+++ b/view/userlist.php
@@ -21,7 +21,7 @@
 				<fieldset>
 					<legend><?php echo $lang_ul['User find legend'] ?></legend>
 					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo $lang_common['Username'] ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
+<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo __('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
 <?php endif; ?>						<label class="conl"><?php echo $lang_ul['User group']."\n" ?>
 						<br /><select name="show_group">
 							<option value="-1"<?php if ($show_group == -1) {
@@ -34,10 +34,10 @@
 						<br /><select name="sort_by">
 							<option value="username"<?php if ($sort_by == 'username') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_common['Username'] ?></option>
+} ?>><?php echo __('Username') ?></option>
 							<option value="registered"<?php if ($sort_by == 'registered') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_common['Registered'] ?></option>
+} ?>><?php echo __('Registered') ?></option>
 <?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
     echo ' selected="selected"';
 } ?>><?php echo $lang_ul['No of posts'] ?></option>
@@ -57,7 +57,7 @@
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
@@ -70,16 +70,16 @@
 </div>
 
 <div id="users1" class="blocktable">
-	<h2><span><?php echo $lang_common['User list'] ?></span></h2>
+	<h2><span><?php echo __('User list') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Username'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Title'] ?></th>
-<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php echo $lang_common['Posts'] ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo $lang_common['Registered'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Username') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Title') ?></th>
+<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Registered') ?></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/view/viewforum.php b/view/viewforum.php
index 332987ae..7f4a55b7 100644
--- a/view/viewforum.php
+++ b/view/viewforum.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -34,10 +34,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Replies'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
 <?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -91,7 +91,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
diff --git a/view/viewtopic.php b/view/viewtopic.php
index e5f55ab0..733bb59b 100644
--- a/view/viewtopic.php
+++ b/view/viewtopic.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -107,7 +107,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -130,7 +130,7 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_common['Write message legend'] ?></legend>
+					<legend><?php echo __('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
@@ -139,15 +139,15 @@
 <?php endif;
 
     if ($feather->user->is_guest) {
-        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong>' : $lang_common['Email'];
+        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
         $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
         ?>
-						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
 <?php
 
-    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.$lang_common['Message'].' <span>'.$lang_common['Required'].'</span></strong><br />';
+    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.__('Message').' <span>'.__('Required').'</span></strong><br />';
     } else {
         echo "\t\t\t\t\t\t".'<label>';
     }
@@ -163,13 +163,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>
@@ -186,7 +186,7 @@
     $qencoded = md5($question[$index_questions]);
     echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);
     ?>
-							 <span><?php echo $lang_common['Required'] ?></span></strong>
+							 <span><?php echo __('Required') ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -195,7 +195,7 @@
 			</div>
 			<?php endif;
     ?>
-			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_topic['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
+			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo __('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_topic['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
 		</form>
 	</div>
 </div>

From b3252fbbf6ec08134c35ddad66e9acd03030cb5f Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 13 Aug 2015 12:11:48 +0200
Subject: [PATCH 021/353] Implement gettext for user view

---
 controller/delete.php                         |  10 +-
 controller/edit.php                           |  15 +-
 controller/help.php                           |  15 +-
 controller/index.php                          |   5 +-
 controller/login.php                          |  23 +-
 controller/misc.php                           |  51 +--
 controller/moderate.php                       |  76 +---
 controller/post.php                           |  35 +-
 controller/profile.php                        |  83 ++--
 controller/register.php                       |  35 +-
 controller/search.php                         |  20 +-
 controller/userlist.php                       |  13 +-
 controller/viewforum.php                      |   9 +-
 controller/viewtopic.php                      |  17 +-
 extern.php                                    |  16 +-
 include/functions.php                         |  23 +-
 install/index.php                             | 210 +++++-----
 lang/English/antispam.mo                      | Bin 0 -> 751 bytes
 lang/English/antispam.po                      |  27 ++
 lang/English/antispam_questions.mo            | Bin 0 -> 765 bytes
 lang/English/antispam_questions.po            |  43 ++
 lang/English/bbeditor.mo                      | Bin 0 -> 1082 bytes
 lang/English/bbeditor.php                     |  25 --
 lang/English/bbeditor.po                      |  63 +++
 lang/English/convertor.php                    |   6 +-
 lang/English/delete.mo                        | Bin 0 -> 1003 bytes
 lang/English/delete.php                       |  16 -
 lang/English/delete.po                        |  42 ++
 lang/English/forum.mo                         | Bin 0 -> 866 bytes
 lang/English/forum.php                        |  17 -
 lang/English/forum.po                         |  45 +++
 lang/English/help.mo                          | Bin 0 -> 4255 bytes
 lang/English/help.php                         |  66 ---
 lang/English/help.po                          | 165 ++++++++
 lang/English/index.mo                         | Bin 0 -> 1064 bytes
 lang/English/index.php                        |  20 -
 lang/English/index.po                         |  54 +++
 lang/English/install.mo                       | Bin 0 -> 9441 bytes
 lang/English/install.php                      | 100 -----
 lang/English/install.po                       | 291 ++++++++++++++
 lang/English/login.mo                         | Bin 0 -> 1877 bytes
 lang/English/login.php                        |  26 --
 lang/English/login.po                         |  63 +++
 lang/English/misc.mo                          | Bin 0 -> 5068 bytes
 lang/English/misc.php                         |  93 -----
 lang/English/misc.po                          | 225 +++++++++++
 lang/English/post.mo                          | Bin 0 -> 2395 bytes
 lang/English/post.php                         |  38 --
 lang/English/post.po                          |  93 +++++
 lang/English/prof_reg.mo                      | Bin 0 -> 5891 bytes
 lang/English/prof_reg.php                     |  79 ----
 lang/English/prof_reg.po                      | 225 +++++++++++
 lang/English/profile.mo                       | Bin 0 -> 9585 bytes
 lang/English/profile.php                      | 143 -------
 lang/English/profile.po                       | 378 ++++++++++++++++++
 lang/English/register.mo                      | Bin 0 -> 3064 bytes
 lang/English/register.php                     |  37 --
 lang/English/register.po                      |  84 ++++
 lang/English/search.mo                        | Bin 0 -> 4068 bytes
 lang/English/search.php                       |  64 ---
 lang/English/search.po                        | 174 ++++++++
 lang/English/topic.mo                         | Bin 0 -> 1475 bytes
 lang/English/topic.php                        |  33 --
 lang/English/topic.po                         |  93 +++++
 lang/English/update.mo                        | Bin 0 -> 7678 bytes
 lang/English/update.php                       |  74 ----
 lang/English/update.po                        | 195 +++++++++
 lang/English/userlist.mo                      | Bin 0 -> 898 bytes
 lang/English/userlist.php                     |  13 -
 lang/English/userlist.po                      |  33 ++
 model/delete.php                              |   8 +-
 model/edit.php                                |  28 +-
 model/index.php                               |   4 +-
 model/login.php                               |  18 +-
 model/misc.php                                |  50 +--
 model/moderate.php                            |  58 ++-
 model/post.php                                |  32 +-
 model/profile.php                             | 141 +++----
 model/register.php                            |  22 +-
 model/search.php                              |  45 +--
 model/viewforum.php                           |  14 +-
 model/viewtopic.php                           |  56 ++-
 style/FeatherBB/view/delete.php               |  10 +-
 style/FeatherBB/view/edit.php                 |  23 +-
 style/FeatherBB/view/footer.php               |   4 +-
 style/FeatherBB/view/help.php                 | 128 +++---
 style/FeatherBB/view/index.php                |  24 +-
 style/FeatherBB/view/login/form.php           |   8 +-
 .../view/login/password_forgotten.php         |  10 +-
 style/FeatherBB/view/misc/email.php           |  10 +-
 style/FeatherBB/view/misc/report.php          |   8 +-
 style/FeatherBB/view/misc/rules.php           |   2 +-
 .../FeatherBB/view/moderate/delete_posts.php  |   8 +-
 .../FeatherBB/view/moderate/delete_topics.php |   8 +-
 .../FeatherBB/view/moderate/merge_topics.php  |   8 +-
 .../view/moderate/moderator_forum.php         |  12 +-
 style/FeatherBB/view/moderate/move_topics.php |  10 +-
 style/FeatherBB/view/moderate/posts_view.php  |  10 +-
 style/FeatherBB/view/moderate/split_posts.php |  12 +-
 style/FeatherBB/view/post.php                 |  19 +-
 style/FeatherBB/view/profile/change_mail.php  |   8 +-
 style/FeatherBB/view/profile/change_pass.php  |  12 +-
 style/FeatherBB/view/profile/delete_user.php  |  12 +-
 style/FeatherBB/view/profile/menu.php         |  16 +-
 .../FeatherBB/view/profile/section_admin.php  |  20 +-
 .../view/profile/section_display.php          |  30 +-
 .../view/profile/section_essentials.php       | 118 +++---
 .../view/profile/section_messaging.php        |  16 +-
 .../view/profile/section_personal.php         |  12 +-
 .../view/profile/section_personality.php      |  14 +-
 .../view/profile/section_privacy.php          |  20 +-
 .../FeatherBB/view/profile/upload_avatar.php  |  10 +-
 style/FeatherBB/view/profile/view_profile.php |   8 +-
 style/FeatherBB/view/register/email.php       |  10 +-
 style/FeatherBB/view/register/form.php        |  36 +-
 style/FeatherBB/view/register/rules.php       |   6 +-
 style/FeatherBB/view/search/form.php          |  50 +--
 style/FeatherBB/view/search/header.php        |   2 +-
 style/FeatherBB/view/search/posts.php         |   8 +-
 style/FeatherBB/view/userlist.php             |  22 +-
 style/FeatherBB/view/viewforum.php            |   4 +-
 style/FeatherBB/view/viewtopic.php            |  17 +-
 view/delete.php                               |  10 +-
 view/edit.php                                 | 117 +++---
 view/footer.php                               |   4 +-
 view/help.php                                 | 128 +++---
 view/index.php                                |  24 +-
 view/login/form.php                           |   8 +-
 view/login/password_forgotten.php             |  10 +-
 view/misc/email.php                           |  10 +-
 view/misc/report.php                          |   8 +-
 view/misc/rules.php                           |   2 +-
 view/moderate/delete_posts.php                |   8 +-
 view/moderate/delete_topics.php               |   8 +-
 view/moderate/merge_topics.php                |   8 +-
 view/moderate/moderator_forum.php             |  12 +-
 view/moderate/move_topics.php                 |  10 +-
 view/moderate/posts_view.php                  |  10 +-
 view/moderate/split_posts.php                 |  12 +-
 view/post.php                                 |  19 +-
 view/profile/change_mail.php                  |   8 +-
 view/profile/change_pass.php                  |  12 +-
 view/profile/delete_user.php                  |  12 +-
 view/profile/menu.php                         |  16 +-
 view/profile/section_admin.php                |  20 +-
 view/profile/section_display.php              |  30 +-
 view/profile/section_essentials.php           | 118 +++---
 view/profile/section_messaging.php            |  16 +-
 view/profile/section_personal.php             |  12 +-
 view/profile/section_personality.php          |  14 +-
 view/profile/section_privacy.php              |  20 +-
 view/profile/upload_avatar.php                |  10 +-
 view/profile/view_profile.php                 |   8 +-
 view/register/email.php                       |  10 +-
 view/register/form.php                        |  36 +-
 view/register/rules.php                       |   6 +-
 view/search/form.php                          |  50 +--
 view/search/header.php                        |   2 +-
 view/search/posts.php                         |   8 +-
 view/userlist.php                             |  22 +-
 view/viewforum.php                            |   4 +-
 view/viewtopic.php                            |  17 +-
 162 files changed, 3551 insertions(+), 2348 deletions(-)
 create mode 100644 lang/English/antispam.mo
 create mode 100644 lang/English/antispam.po
 create mode 100644 lang/English/antispam_questions.mo
 create mode 100644 lang/English/antispam_questions.po
 create mode 100644 lang/English/bbeditor.mo
 delete mode 100644 lang/English/bbeditor.php
 create mode 100644 lang/English/bbeditor.po
 create mode 100644 lang/English/delete.mo
 delete mode 100644 lang/English/delete.php
 create mode 100644 lang/English/delete.po
 create mode 100644 lang/English/forum.mo
 delete mode 100644 lang/English/forum.php
 create mode 100644 lang/English/forum.po
 create mode 100644 lang/English/help.mo
 delete mode 100644 lang/English/help.php
 create mode 100644 lang/English/help.po
 create mode 100644 lang/English/index.mo
 delete mode 100644 lang/English/index.php
 create mode 100644 lang/English/index.po
 create mode 100644 lang/English/install.mo
 delete mode 100644 lang/English/install.php
 create mode 100644 lang/English/install.po
 create mode 100644 lang/English/login.mo
 delete mode 100644 lang/English/login.php
 create mode 100644 lang/English/login.po
 create mode 100644 lang/English/misc.mo
 delete mode 100644 lang/English/misc.php
 create mode 100644 lang/English/misc.po
 create mode 100644 lang/English/post.mo
 delete mode 100644 lang/English/post.php
 create mode 100644 lang/English/post.po
 create mode 100644 lang/English/prof_reg.mo
 delete mode 100644 lang/English/prof_reg.php
 create mode 100644 lang/English/prof_reg.po
 create mode 100644 lang/English/profile.mo
 delete mode 100644 lang/English/profile.php
 create mode 100644 lang/English/profile.po
 create mode 100644 lang/English/register.mo
 delete mode 100644 lang/English/register.php
 create mode 100644 lang/English/register.po
 create mode 100644 lang/English/search.mo
 delete mode 100644 lang/English/search.php
 create mode 100644 lang/English/search.po
 create mode 100644 lang/English/topic.mo
 delete mode 100644 lang/English/topic.php
 create mode 100644 lang/English/topic.po
 create mode 100644 lang/English/update.mo
 delete mode 100644 lang/English/update.php
 create mode 100644 lang/English/update.po
 create mode 100644 lang/English/userlist.mo
 delete mode 100644 lang/English/userlist.php
 create mode 100644 lang/English/userlist.po

diff --git a/controller/delete.php b/controller/delete.php
index a933ad39..1c0848b4 100644
--- a/controller/delete.php
+++ b/controller/delete.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\delete();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/delete.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
     }
 
     public function __autoload($class_name)
@@ -30,7 +32,7 @@ public function __autoload($class_name)
     
     public function deletepost($id)
     {
-        global $lang_post, $pd;
+        global $pd;
 
         if ($this->user->g_read_board == '0') {
             message(__('No view'), '403');
@@ -62,16 +64,13 @@ public function deletepost($id)
             message(__('No permission'), '403');
         }
 
-        // Load the delete.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/delete.php';
-
 
         if ($this->feather->request()->isPost()) {
             $this->model->handle_deletion($is_topic_post, $id, $cur_post['tid'], $cur_post['fid']);
         }
 
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_delete['Delete post']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Delete post'));
 
         define('FEATHER_ACTIVE_PAGE', 'delete');
 
@@ -81,7 +80,6 @@ public function deletepost($id)
         $cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
 
         $this->feather->render('delete.php', array(
-                            'lang_delete' => $lang_delete,
                             'cur_post' => $cur_post,
                             'id' => $id,
                             'is_topic_post' => $is_topic_post,
diff --git a/controller/edit.php b/controller/edit.php
index 57c02123..e412751a 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -21,6 +21,10 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\edit();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.mo');
     }
 
     public function __autoload($class_name)
@@ -30,8 +34,6 @@ public function __autoload($class_name)
     
     public function editpost($id)
     {
-        global $lang_prof_reg, $lang_post, $lang_register;
-
         if ($this->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
@@ -58,9 +60,6 @@ public function editpost($id)
         if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
             message(__('No permission'), '403');
         }
-
-        // Load the post.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/post.php';
         
         // Load the bbeditor.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.php';
@@ -80,14 +79,14 @@ public function editpost($id)
                 // Edit the post
                 $this->model->edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod);
 
-                redirect(get_link('post/'.$id.'/#p'.$id), $lang_post['Post redirect']);
+                redirect(get_link('post/'.$id.'/#p'.$id), __('Post redirect'));
             }
         } else {
             $post = '';
         }
 
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_post['Edit post']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Edit post'));
         $required_fields = array('req_subject' => __('Subject'), 'req_message' => __('Message'));
         $focus_element = array('edit', 'req_message');
 
@@ -104,7 +103,6 @@ public function editpost($id)
 
         $this->feather->render('edit.php', array(
                             'cur_post' => $cur_post,
-                            'lang_post' => $lang_post,
                             'errors' => $errors,
                             'preview_message' => $preview_message,
                             'id' => $id,
@@ -114,7 +112,6 @@ public function editpost($id)
                             'feather' => $this->feather,
                             'can_edit_subject' => $can_edit_subject,
                             'post' => $post,
-                            'lang_bbeditor' => $lang_bbeditor,
                             )
                     );
 
diff --git a/controller/help.php b/controller/help.php
index 114a545f..3add1eb0 100644
--- a/controller/help.php
+++ b/controller/help.php
@@ -20,6 +20,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/help.mo');
     }
 
     public function __autoload($class_name)
@@ -29,27 +30,17 @@ public function __autoload($class_name)
     
     public function display()
     {
-
-
         if ($this->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
 
-
-        // Load the help.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/help.php';
-
-
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_help['Help']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Help'));
 
         define('FEATHER_ACTIVE_PAGE', 'help');
 
         $this->header->setTitle($page_title)->display();
 
-        $this->feather->render('help.php', array(
-                            'lang_help' => $lang_help,
-                            )
-                    );
+        $this->feather->render('help.php');
 
         $this->footer->display();
     }
diff --git a/controller/index.php b/controller/index.php
index 1d68cbfe..b94aed63 100644
--- a/controller/index.php
+++ b/controller/index.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\index();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/index.mo');
     }
     
     public function __autoload($class_name)
@@ -34,9 +35,6 @@ public function display()
             message(__('No view'), '403');
         }
 
-        // Load the index.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/index.php';
-
         $page_title = array(feather_escape($this->config['o_board_title']));
         define('FEATHER_ALLOW_INDEX', 1);
 
@@ -46,7 +44,6 @@ public function display()
 
         $this->feather->render('index.php', array(
                             'index_data' => $this->model->print_categories_forums(),
-                            'lang_index' => $lang_index,
                             'stats' => $this->model->collect_stats(),
                             'feather_config' => $this->config,
                             'online'    =>    $this->model->fetch_users_online(),
diff --git a/controller/login.php b/controller/login.php
index 69b43cf9..277e6378 100644
--- a/controller/login.php
+++ b/controller/login.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\login();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/login.mo');
     }
 
     public function __autoload($class_name)
@@ -35,9 +36,6 @@ public function display()
             exit;
         }
 
-        // Load the login.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/login.php';
-
         // TODO?: Try to determine if the data in HTTP_REFERER is valid (if not, we redirect to index.php after login)
         $redirect_url = $this->model->get_redirect_url($_SERVER);
 
@@ -50,7 +48,6 @@ public function display()
         $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         $this->feather->render('login/form.php', array(
-                            'lang_login' => $lang_login,
                             'redirect_url'    =>    $redirect_url,
                             )
                     );
@@ -60,8 +57,6 @@ public function display()
 
     public function logmein()
     {
-        global $lang_login;
-
         define('FEATHER_QUIET_VISIT', 1);
 
         if (!$this->user->is_guest) {
@@ -69,28 +64,18 @@ public function logmein()
             exit;
         }
 
-        // Load the login.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/login.php';
-
         $this->model->login();
     }
 
     public function logmeout($id, $token)
     {
-
-
         define('FEATHER_QUIET_VISIT', 1);
 
-        // Load the login.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/login.php';
-
         $this->model->logout($id, $token);
     }
 
     public function forget()
     {
-        global $lang_login;
-
         define('FEATHER_QUIET_VISIT', 1);
 
         if (!$this->user->is_guest) {
@@ -98,12 +83,9 @@ public function forget()
             exit;
         }
 
-        // Load the login.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/login.php';
-
         $errors = $this->model->password_forgotten();
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_login['Request pass']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Request pass'));
         $required_fields = array('req_email' => __('Email'));
         $focus_element = array('request_pass', 'req_email');
 
@@ -113,7 +95,6 @@ public function forget()
 
         $this->feather->render('login/password_forgotten.php', array(
                             'errors'    =>    $errors,
-                            'lang_login'    =>    $lang_login,
                             )
                     );
 
diff --git a/controller/misc.php b/controller/misc.php
index 9ebb3158..7ecadf0a 100644
--- a/controller/misc.php
+++ b/controller/misc.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\misc();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/misc.mo');
     }
 
     public function __autoload($class_name)
@@ -30,21 +32,17 @@ public function __autoload($class_name)
     
     public function rules()
     {
-
-
         if ($this->config['o_rules'] == '0' || ($this->user->is_guest && $this->user->g_read_board == '0' && $this->config['o_regs_allow'] == '0')) {
             message(__('Bad request'), '404');
         }
 
-        // Load the register.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/register.php';
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Forum rules'));
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_register['Forum rules']);
+        $this->header->setTitle($page_title)->display();
 
         define('FEATHER_ACTIVE_PAGE', 'rules');
 
         $this->feather->render('misc/rules.php', array(
-                'lang_register' => $lang_register,
                 'feather_config' => $this->config,
                 )
         );
@@ -54,45 +52,33 @@ public function rules()
 
     public function markread()
     {
-
-
         if ($this->user->is_guest) {
             message(__('No permission'), '403');
         }
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         $this->model->update_last_visit();
 
         // Reset tracked topics
         set_tracked_topics(null);
 
-        redirect(get_base_url(), $lang_misc['Mark read redirect']);
+        redirect(get_base_url(), __('Mark read redirect'));
     }
 
     public function markforumread($id)
     {
-
-
         if ($this->user->is_guest) {
             message(__('No permission'), '403');
         }
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         $tracked_topics = get_tracked_topics();
         $tracked_topics['forums'][$id] = time();
         set_tracked_topics($tracked_topics);
 
-        redirect(get_link('forum/'.$id.'/'), $lang_misc['Mark forum read redirect']);
+        redirect(get_link('forum/'.$id.'/'), __('Mark forum read redirect'));
     }
 
     public function subscribeforum($id)
     {
-        global $lang_misc;
-
         if ($this->user->is_guest) {
             message(__('No permission'), '403');
         }
@@ -105,8 +91,6 @@ public function subscribeforum($id)
 
     public function subscribetopic($id)
     {
-        global $lang_misc;
-
         if ($this->user->is_guest) {
             message(__('No permission'), '403');
         }
@@ -119,8 +103,6 @@ public function subscribetopic($id)
 
     public function unsubscribeforum($id)
     {
-        global $lang_misc;
-
         if ($this->user->is_guest) {
             message(__('No permission'), '403');
         }
@@ -133,8 +115,6 @@ public function unsubscribeforum($id)
 
     public function unsubscribetopic($id)
     {
-        global $lang_misc;
-
         if ($this->user->is_guest) {
             message(__('No permission'), '403');
         }
@@ -147,8 +127,6 @@ public function unsubscribetopic($id)
 
     public function email($id)
     {
-
-
         if ($this->user->is_guest || $this->user->g_send_email == '0') {
             message(__('No permission'), '403');
         }
@@ -163,7 +141,7 @@ public function email($id)
         $mail = $this->model->get_info_mail($id);
 
         if ($mail['email_setting'] == 2 && !$this->user->is_admmod) {
-            message($lang_misc['Form email disabled']);
+            message(__('Form email disabled'));
         }
 
 
@@ -171,8 +149,8 @@ public function email($id)
             $this->model->send_email($mail, $id);
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Send email to'].' '.feather_escape($mail['recipient']));
-        $required_fields = array('req_subject' => $lang_misc['Email subject'], 'req_message' => $lang_misc['Email message']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Send email to').' '.feather_escape($mail['recipient']));
+        $required_fields = array('req_subject' => __('Email subject'), 'req_message' => __('Email message'));
         $focus_element = array('email', 'req_subject');
 
         define('FEATHER_ACTIVE_PAGE', 'email');
@@ -180,7 +158,6 @@ public function email($id)
         $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         $this->feather->render('misc/email.php', array(
-                'lang_misc' => $lang_misc,
                 'id' => $id,
                 'mail' => $mail,
                 )
@@ -191,15 +168,10 @@ public function email($id)
 
     public function report($id)
     {
-
-
         if ($this->user->is_guest) {
             message(__('No permission'), '403');
         }
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         if ($this->feather->request()->isPost()) {
             $this->model->insert_report($id);
         }
@@ -211,8 +183,8 @@ public function report($id)
             $cur_post['subject'] = censor_words($cur_post['subject']);
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Report post']);
-        $required_fields = array('req_reason' => $lang_misc['Reason']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Report post'));
+        $required_fields = array('req_reason' => __('Reason'));
         $focus_element = array('report', 'req_reason');
 
         define('FEATHER_ACTIVE_PAGE', 'report');
@@ -220,7 +192,6 @@ public function report($id)
         $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         $this->feather->render('misc/report.php', array(
-                'lang_misc' => $lang_misc,
                 'id' => $id,
                 'cur_post' => $cur_post,
                 )
diff --git a/controller/moderate.php b/controller/moderate.php
index 098e50f1..541b3de7 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -21,6 +21,9 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\moderate();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/topic.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/misc.mo');
     }
 
     public function __autoload($class_name)
@@ -30,8 +33,6 @@ public function __autoload($class_name)
     
     public function gethostpost($pid)
     {
-
-
         if ($this->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
@@ -39,9 +40,6 @@ public function gethostpost($pid)
         // Load the viewforum.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         // This particular function doesn't require forum-based moderator access. It can be used
         // by all moderators and admins
         if (!$this->user->is_admmod) {
@@ -53,8 +51,6 @@ public function gethostpost($pid)
 
     public function gethostip($ip)
     {
-
-
         if ($this->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
@@ -62,9 +58,6 @@ public function gethostip($ip)
         // Load the viewforum.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         // This particular function doesn't require forum-based moderator access. It can be used
         // by all moderators and admins
         if (!$this->user->is_admmod) {
@@ -76,8 +69,6 @@ public function gethostip($ip)
 
     public function moderatetopic($id = null, $fid = null, $action = null, $param = null)
     {
-        global $lang_topic, $lang_misc;
-
         if ($this->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
@@ -85,9 +76,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         // Load the viewforum.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         // This particular function doesn't require forum-based moderator access. It can be used
         // by all moderators and admins
         if ($action == 'get_host') {
@@ -116,7 +104,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                message($lang_misc['No topics selected']);
+                message(__('No topics selected'));
             }
 
             $topics = implode(',', array_map('intval', array_keys($topics)));
@@ -124,7 +112,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -134,7 +122,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                     'action'    =>    'multi',
                     'id'    =>    $fid,
                     'topics'    =>    $topics,
-                    'lang_misc'    =>    $lang_misc,
                     'list_forums'   => $this->model->get_forum_list_move($fid),
                 )
             );
@@ -148,7 +135,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $this->model->stick_topic($id, $fid);
  
-            redirect(get_link('topic/'.$id.'/'), $lang_misc['Stick topic redirect']);
+            redirect(get_link('topic/'.$id.'/'), __('Stick topic redirect'));
         }
 
 
@@ -158,7 +145,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $this->model->unstick_topic($id, $fid);
 
-            redirect(get_link('topic/'.$id.'/'), $lang_misc['Unstick topic redirect']);
+            redirect(get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
         }
 
         // Open a topic
@@ -167,7 +154,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             
             $this->model->open_topic($id, $fid);
 
-            redirect(get_link('topic/'.$id.'/'), $lang_misc['Unstick topic redirect']);
+            redirect(get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
         }
 
         // Close a topic
@@ -176,7 +163,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $this->model->close_topic($id, $fid);
 
-            redirect(get_link('topic/'.$id.'/'), $lang_misc['Unstick topic redirect']);
+            redirect(get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
         }
 
         $cur_topic = $this->model->get_topic_info($fid, $id);
@@ -193,7 +180,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -203,7 +190,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                         'action'    =>    'single',
                         'id'    =>    $id,
                         'topics'    =>    $id,
-                        'lang_misc'    =>    $lang_misc,
                         'list_forums'   => $this->model->get_forum_list_move($fid),
                         )
                 );
@@ -218,14 +204,13 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 if ($this->request->post('delete_posts') || $this->request->post('delete_posts_comply')) {
                     $posts = $this->model->delete_posts($id, $fid, $p);
 
-                    $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
+                    $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
                     define('FEATHER_ACTIVE_PAGE', 'moderate');
 
                     $this->header->setTitle($page_title)->setPage($p)->display();
 
                     $this->feather->render('moderate/delete_posts.php', array(
-                        'lang_misc' => $lang_misc,
                         'id' => $id,
                         'posts' => $posts,
                         )
@@ -236,7 +221,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             if ($this->request->post('split_posts') || $this->request->post('split_posts_comply')) {
                 $posts = $this->model->split_posts($id, $fid, $p);
 
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
                 $focus_element = array('subject','new_subject');
 
                 define('FEATHER_ACTIVE_PAGE', 'moderate');
@@ -244,7 +229,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 $this->header->setTitle($page_title)->setPage($p)->setFocusElement($focus_element)->display();
 
                 $this->feather->render('moderate/split_posts.php', array(
-                        'lang_misc' => $lang_misc,
                         'id' => $id,
                         'posts' => $posts,
                         'list_forums' => $this->model->get_forum_list_split($id),
@@ -256,9 +240,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
                 // Show the moderate posts view
 
-                // Load the viewtopic.php language file
-                require FEATHER_ROOT.'lang/'.$this->user->language.'/topic.php';
-
                 // Used to disable the Move and Delete buttons if there are no replies to this topic
                 $button_status = ($cur_topic['num_replies'] == 0) ? ' disabled="disabled"' : '';
 
@@ -280,8 +261,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
 
             $this->feather->render('moderate/posts_view.php', array(
-                        'lang_topic' => $lang_topic,
-                        'lang_misc' => $lang_misc,
                         'cur_topic' => $cur_topic,
                         'url_topic' => url_friendly($cur_topic['subject']),
                         'url_forum' => url_friendly($cur_topic['forum_name']),
@@ -300,8 +279,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
     public function display($id, $name = null, $page = null)
     {
-        global $lang_forum, $lang_misc;
-
         if ($this->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
@@ -309,9 +286,6 @@ public function display($id, $name = null, $page = null)
         // Load the viewforum.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         // Make sure that only admmods allowed access this page
         $moderators = $this->model->get_moderators($id);
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
@@ -347,14 +321,12 @@ public function display($id, $name = null, $page = null)
         $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
 
         $this->feather->render('moderate/moderator_forum.php', array(
-                            'lang_misc' => $lang_misc,
                             'id' => $id,
                             'p' => $p,
                             'url_forum' => $url_forum,
                             'cur_forum' => $cur_forum,
                             'paging_links' => $paging_links,
                             'feather_config' => $this->config,
-                            'lang_forum' => $lang_forum,
                             'topic_data' => $this->model->display_topics($id, $sort_by, $start_from),
                             'start_from' => $start_from,
                             )
@@ -365,8 +337,6 @@ public function display($id, $name = null, $page = null)
 
     public function dealposts($fid)
     {
-        global $lang_forum, $lang_topic, $lang_misc;
-
         if ($this->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
@@ -374,9 +344,6 @@ public function dealposts($fid)
         // Load the viewforum.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         // Make sure that only admmods allowed access this page
         $moderators = $this->model->get_moderators($fid);
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
@@ -393,7 +360,7 @@ public function dealposts($fid)
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                message($lang_misc['No topics selected']);
+                message(__('No topics selected'));
             }
 
             $topics = implode(',', array_map('intval', array_keys($topics)));
@@ -401,7 +368,7 @@ public function dealposts($fid)
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -411,7 +378,6 @@ public function dealposts($fid)
                         'action'    =>    'multi',
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
-                        'lang_misc'    =>    $lang_misc,
                         'list_forums'   => $this->model->get_forum_list_move($fid),
                         )
                 );
@@ -427,10 +393,10 @@ public function dealposts($fid)
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (count($topics) < 2) {
-                message($lang_misc['Not enough topics selected']);
+                message(__('Not enough topics selected'));
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -439,7 +405,6 @@ public function dealposts($fid)
             $this->feather->render('moderate/merge_topics.php', array(
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
-                        'lang_misc'    =>    $lang_misc,
                         )
                 );
 
@@ -450,14 +415,14 @@ public function dealposts($fid)
         elseif ($this->request->post('delete_topics') || $this->request->post('delete_topics_comply')) {
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                message($lang_misc['No topics selected']);
+                message(__('No topics selected'));
             }
 
             if ($this->request->post('delete_topics_comply')) {
                 $this->model->delete_topics($topics, $fid);
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -466,7 +431,6 @@ public function dealposts($fid)
             $this->feather->render('moderate/delete_topics.php', array(
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
-                        'lang_misc'    =>    $lang_misc,
                         )
                 );
 
@@ -482,12 +446,12 @@ public function dealposts($fid)
             if ($this->request->post('open') || $this->request->post('close')) {
                 $topics = $this->request->post('topics') ? @array_map('intval', @array_keys($this->request->post('topics'))) : array();
                 if (empty($topics)) {
-                    message($lang_misc['No topics selected']);
+                    message(__('No topics selected'));
                 }
 
                 $this->model->close_multiple_topics($action, $topics, $fid);
 
-                $redirect_msg = ($action) ? $lang_misc['Close topics redirect'] : $lang_misc['Open topics redirect'];
+                $redirect_msg = ($action) ? __('Close topics redirect') : __('Open topics redirect');
                 redirect(get_link('moderate/forum/'.$fid.'/'), $redirect_msg);
             }
         }
diff --git a/controller/post.php b/controller/post.php
index e7bca948..99616fa1 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -21,6 +21,9 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\post();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.mo');
     }
 
     public function __autoload($class_name)
@@ -30,29 +33,17 @@ public function __autoload($class_name)
 
     public function newreply($fid = null, $tid = null, $qid = null)
     {
-        self::newpost('', $fid, $tid);
+        $this->newpost('', $fid, $tid);
     }
 
     public function newpost($fid = null, $tid = null, $qid = null)
     {
-        global $lang_prof_reg, $lang_antispam_questions, $lang_antispam, $lang_post, $lang_register, $lang_bbeditor;
-
-        // Load the register.php/profile.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
-
-        // Load the register.php/profile.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/register.php';
-        
-        // Load the bbeditor.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.php';
+        global $lang_antispam_questions, $lang_antispam;
 
         // Antispam feature
         require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
-        // BBcode toolbar feature
-        require FEATHER_ROOT.'lang/'.$this->user['language'].'/bbeditor.php';
-
         // If $_POST['username'] is filled, we are facing a bot
         if ($this->request->post('username')) {
             message(__('Bad request'), '404');
@@ -80,9 +71,6 @@ public function newpost($fid = null, $tid = null, $qid = null)
             message(__('No permission'), '403');
         }
 
-        // Load the post.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/post.php';
-
         // Start with a clean slate
         $errors = array();
 
@@ -91,7 +79,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
         if (!$this->user->is_guest) {
             $focus_element[] = ($fid) ? 'req_subject' : 'req_message';
         } else {
-            $required_fields['req_username'] = $lang_post['Guest name'];
+            $required_fields['req_username'] = __('Guest name');
             $focus_element[] = 'req_username';
         }
 
@@ -152,7 +140,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             $this->model->increment_post_count($post, $new['tid']);
                         }
 
-                    redirect(get_link('post/'.$new['pid'].'/#p'.$new['pid']), $lang_post['Post redirect']);
+                    redirect(get_link('post/'.$new['pid'].'/#p'.$new['pid']), __('Post redirect'));
                 }
         }
 
@@ -160,7 +148,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // If a topic ID was specified in the url (it's a reply)
         if ($tid) {
-            $action = $lang_post['Post a reply'];
+            $action = __('Post a reply');
             $form = '<form id="post" method="post" action="'.get_link('post/reply/'.$tid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
 
                 // If a quote ID was specified in the url
@@ -171,7 +159,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
         }
         // If a forum ID was specified in the url (new topic)
         elseif ($fid) {
-            $action = $lang_post['Post new topic'];
+            $action = __('Post new topic');
             $form = '<form id="post" method="post" action="'.get_link('post/new-topic/'.$fid.'/').'" onsubmit="return process_form(this)">';
         } else {
             message(__('Bad request'), '404');
@@ -190,7 +178,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
         $page_title = array(feather_escape($this->config['o_board_title']), $action);
         $required_fields = array('req_email' => __('Email'), 'req_subject' => __('Subject'), 'req_message' => __('Message'));
         if ($this->user->is_guest) {
-            $required_fields['captcha'] = $lang_antispam['Robot title'];
+            $required_fields['captcha'] = __('Robot title');
         }
         $focus_element = array('post');
 
@@ -215,10 +203,8 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             'feather_config' => $this->config,
                             'feather_user' => $this->user,
                             'cur_posting' => $cur_posting,
-                            'lang_post' => $lang_post,
                             'lang_antispam' => $lang_antispam,
                             'lang_antispam_questions' => $lang_antispam_questions,
-                            'lang_bbeditor' => $lang_bbeditor,
                             'index_questions' => $index_questions,
                             'checkboxes' => $checkboxes,
                             'cur_posting' => $cur_posting,
@@ -230,7 +216,6 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             'url_topic' => $url_topic,
                             'quote' => $quote,
                             'errors'    =>    $errors,
-                            'lang_bbeditor' => $lang_bbeditor,
                             )
                     );
 
diff --git a/controller/profile.php b/controller/profile.php
index 02b44ff5..7c47382e 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\profile();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/profile.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
     }
 
     public function __autoload($class_name)
@@ -30,19 +32,13 @@ public function __autoload($class_name)
     
     public function display($id, $section = null)
     {
-        global $lang_prof_reg, $lang_profile, $pd, $forum_time_formats, $forum_date_formats;
+        global $lang_profile, $pd, $forum_time_formats, $forum_date_formats;
 
         // Include UTF-8 function
         require FEATHER_ROOT.'include/utf8/substr_replace.php';
         require FEATHER_ROOT.'include/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
         require FEATHER_ROOT.'include/utf8/strcasecmp.php';
 
-        // Load the prof_reg.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
-
-        // Load the profile.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/profile.php';
-
         if ($this->request->post('update_group_membership')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
                 message(__('No permission'), '403');
@@ -68,15 +64,14 @@ public function display($id, $section = null)
 
             $this->model->delete_user($id, $this->feather);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Confirm delete user']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Confirm delete user'));
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
 
             $this->header->setTitle($page_title)->display();
 
             $this->feather->render('profile/delete_user.php', array(
-                                            'username' => $this->model->get_username($id),
-                                    'lang_profile' => $lang_profile,
+                                    'username' => $this->model->get_username($id),
                                     'id' => $id,
                                     )
                             );
@@ -119,7 +114,7 @@ public function display($id, $section = null)
             // or the user is another mod
                 $user_info = $this->model->parse_user_info($user);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), sprintf($lang_profile['Users profile'], feather_escape($user['username'])));
+            $page_title = array(feather_escape($this->config['o_board_title']), sprintf(__('Users profile'), feather_escape($user['username'])));
             define('FEATHER_ALLOW_INDEX', 1);
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
@@ -127,7 +122,6 @@ public function display($id, $section = null)
             $this->header->setTitle($page_title)->display();
 
             $this->feather->render('profile/view_profile.php', array(
-                        'lang_profile' => $lang_profile,
                         'user_info' => $user_info,
                         )
                 );
@@ -137,7 +131,7 @@ public function display($id, $section = null)
             if (!$section || $section == 'essentials') {
                 $user_disp = $this->model->edit_essentials($id, $user);
 
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Section essentials']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section essentials'));
                 $required_fields = array('req_username' => __('Username'), 'req_email' => __('Email'));
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
@@ -147,8 +141,6 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('essentials', $id);
 
                 $this->feather->render('profile/section_essentials.php', array(
-                                    'lang_profile' => $lang_profile,
-                                'lang_prof_reg' => $lang_prof_reg,
                                 'feather' => $this->feather,
                                 'id' => $id,
                                 'user' => $user,
@@ -159,10 +151,10 @@ public function display($id, $section = null)
                         );
             } elseif ($section == 'personal') {
                 if ($this->user->g_set_title == '1') {
-                    $title_field = '<label>'.__('Title').' <em>('.$lang_profile['Leave blank'].')</em><br /><input type="text" name="title" value="'.feather_escape($user['title']).'" size="30" maxlength="50" /><br /></label>'."\n";
+                    $title_field = '<label>'.__('Title').' <em>('.__('Leave blank').')</em><br /><input type="text" name="title" value="'.feather_escape($user['title']).'" size="30" maxlength="50" /><br /></label>'."\n";
                 }
 
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Section personal']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personal'));
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -171,14 +163,13 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('personal', $id);
 
                 $this->feather->render('profile/section_personal.php', array(
-                                    'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 'feather' => $this->feather,
                                 )
                         );
                 
             } elseif ($section == 'messaging') {
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Section messaging']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section messaging'));
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -187,7 +178,6 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('messaging', $id);
 
                 $this->feather->render('profile/section_messaging.php', array(
-                                    'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 )
                         );
@@ -197,22 +187,22 @@ public function display($id, $section = null)
                     message(__('Bad request'), '404');
                 }
 
-                $avatar_field = '<span><a href="'.get_link('user/'.$id.'/action/upload_avatar/').'">'.$lang_profile['Change avatar'].'</a></span>';
+                $avatar_field = '<span><a href="'.get_link('user/'.$id.'/action/upload_avatar/').'">'.__('Change avatar').'</a></span>';
 
                 $user_avatar = generate_avatar_markup($id);
                 if ($user_avatar) {
-                    $avatar_field .= ' <span><a href="'.get_link('user/'.$id.'/action/delete_avatar/').'">'.$lang_profile['Delete avatar'].'</a></span>';
+                    $avatar_field .= ' <span><a href="'.get_link('user/'.$id.'/action/delete_avatar/').'">'.__('Delete avatar').'</a></span>';
                 } else {
-                    $avatar_field = '<span><a href="'.get_link('user/'.$id.'/action/upload_avatar/').'">'.$lang_profile['Upload avatar'].'</a></span>';
+                    $avatar_field = '<span><a href="'.get_link('user/'.$id.'/action/upload_avatar/').'">'.__('Upload avatar').'</a></span>';
                 }
 
                 if ($user['signature'] != '') {
-                    $signature_preview = '<p>'.$lang_profile['Sig preview'].'</p>'."\n\t\t\t\t\t\t\t".'<div class="postsignature postmsg">'."\n\t\t\t\t\t\t\t\t".'<hr />'."\n\t\t\t\t\t\t\t\t".$parsed_signature."\n\t\t\t\t\t\t\t".'</div>'."\n";
+                    $signature_preview = '<p>'.__('Sig preview').'</p>'."\n\t\t\t\t\t\t\t".'<div class="postsignature postmsg">'."\n\t\t\t\t\t\t\t\t".'<hr />'."\n\t\t\t\t\t\t\t\t".$parsed_signature."\n\t\t\t\t\t\t\t".'</div>'."\n";
                 } else {
-                    $signature_preview = '<p>'.$lang_profile['No sig'].'</p>'."\n";
+                    $signature_preview = '<p>'.__('No sig').'</p>'."\n";
                 }
 
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Section personality']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personality'));
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -221,7 +211,6 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('personality', $id);
 
                 $this->feather->render('profile/section_personality.php', array(
-                                    'lang_profile' => $lang_profile,
                                 'user_avatar' => $user_avatar,
                                 'avatar_field' => $avatar_field,
                                 'signature_preview' => $signature_preview,
@@ -231,7 +220,7 @@ public function display($id, $section = null)
                         );
                 
             } elseif ($section == 'display') {
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Section display']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section display'));
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -240,13 +229,12 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('display', $id);
 
                 $this->feather->render('profile/section_display.php', array(
-                                    'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 )
                         );
                 
             } elseif ($section == 'privacy') {
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Section privacy']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section privacy'));
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -255,8 +243,6 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('privacy', $id);
 
                 $this->feather->render('profile/section_privacy.php', array(
-                                    'lang_profile' => $lang_profile,
-                                'lang_prof_reg' => $lang_prof_reg,
                                 'user' => $user,
                                 )
                         );
@@ -266,7 +252,7 @@ public function display($id, $section = null)
                     message(__('Bad request'), false, '403 Forbidden');
                 }
 
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Section admin']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section admin'));
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -275,7 +261,6 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('admin', $id);
 
                 $this->feather->render('profile/section_admin.php', array(
-                                    'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 'forum_list' => $this->model->get_forum_list($id),
                                 'group_list' => $this->model->get_group_list($user),
@@ -293,19 +278,13 @@ public function display($id, $section = null)
 
     public function action($id, $action)
     {
-        global $lang_prof_reg, $lang_profile;
+        global $lang_profile;
 
         // Include UTF-8 function
         require FEATHER_ROOT.'include/utf8/substr_replace.php';
         require FEATHER_ROOT.'include/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
         require FEATHER_ROOT.'include/utf8/strcasecmp.php';
 
-        // Load the prof_reg.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
-
-        // Load the profile.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/profile.php';
-
         if ($action != 'change_pass' || !$this->request->get('key')) {
             if ($this->user->g_read_board == '0') {
                 message(__('No view'), '403');
@@ -317,8 +296,8 @@ public function action($id, $action)
         if ($action == 'change_pass') {
             $this->model->change_pass($id, $this->feather);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Change pass']);
-            $required_fields = array('req_old_password' => $lang_profile['Old pass'], 'req_new_password1' => $lang_profile['New pass'], 'req_new_password2' => $lang_profile['Confirm new pass']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Change pass'));
+            $required_fields = array('req_old_password' => __('Old pass'), 'req_new_password1' => __('New pass'), 'req_new_password2' => __('Confirm new pass'));
             $focus_element = array('change_pass', ((!$this->user->is_admmod) ? 'req_old_password' : 'req_new_password1'));
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
@@ -326,8 +305,7 @@ public function action($id, $action)
             $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             $this->feather->render('profile/change_pass.php', array(
-                                            'feather' => $this->feather,
-                                    'lang_profile' => $lang_profile,
+                                    'feather' => $this->feather,
                                     'id' => $id,
                                     )
                             );
@@ -336,8 +314,8 @@ public function action($id, $action)
         } elseif ($action == 'change_email') {
             $this->model->change_email($id, $this->feather);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Change email']);
-            $required_fields = array('req_new_email' => $lang_profile['New email'], 'req_password' => __('Password'));
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Change email'));
+            $required_fields = array('req_new_email' => __('New email'), 'req_password' => __('Password'));
             $focus_element = array('change_email', 'req_new_email');
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
@@ -345,7 +323,6 @@ public function action($id, $action)
             $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             $this->feather->render('profile/change_mail.php', array(
-                                            'lang_profile' => $lang_profile,
                                     'id' => $id,
                                     )
                             );
@@ -353,7 +330,7 @@ public function action($id, $action)
             $this->footer->display();
         } elseif ($action == 'upload_avatar' || $action == 'upload_avatar2') {
             if ($this->config['o_avatars'] == '0') {
-                message($lang_profile['Avatars disabled']);
+                message(__('Avatars disabled'));
             }
 
             if ($this->user->id != $id && !$this->user->is_admmod) {
@@ -364,8 +341,8 @@ public function action($id, $action)
                 $this->model->upload_avatar($id, $_FILES);
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), $lang_profile['Upload avatar']);
-            $required_fields = array('req_file' => $lang_profile['File']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Upload avatar'));
+            $required_fields = array('req_file' => __('File'));
             $focus_element = array('upload_avatar', 'req_file');
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
@@ -373,9 +350,7 @@ public function action($id, $action)
             $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             $this->feather->render('profile/upload_avatar.php', array(
-                                            'lang_profile' => $lang_profile,
                                     'feather_config' => $this->config,
-                                    'lang_profile' => $lang_profile,
                                     'id' => $id,
                                     )
                             );
@@ -391,7 +366,7 @@ public function action($id, $action)
 
             $this->model->delete_avatar($id);
 
-            redirect(get_link('user/'.$id.'/section/personality/'), $lang_profile['Avatar deleted redirect']);
+            redirect(get_link('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
         } elseif ($action == 'promote') {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_promote_users == '0')) {
                 message(__('No permission'), '403');
diff --git a/controller/register.php b/controller/register.php
index 8683d1c1..691635c4 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -21,6 +21,9 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\register();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.mo');
     }
 
     public function __autoload($class_name)
@@ -30,19 +33,13 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_antispam_questions, $lang_antispam, $lang_register, $lang_prof_reg;
+        global $lang_antispam_questions, $lang_antispam;
 
         if (!$this->user->is_guest) {
             header('Location: '.get_base_url());
             exit;
         }
 
-        // Load the register.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/register.php';
-
-        // Load the register.php/profile.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
-
         // Antispam feature
         require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
@@ -50,11 +47,11 @@ public function display()
         // Display an error message if new registrations are disabled
         // If $_REQUEST['username'] or $_REQUEST['password'] are filled, we are facing a bot
         if ($this->config['o_regs_allow'] == '0' || $this->request->post('username') || $this->request->post('password')) {
-            message($lang_register['No new regs']);
+            message(__('No new regs'));
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_register['Register']);
-        $required_fields = array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => $lang_prof_reg['Confirm pass'], 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => $lang_antispam['Robot title']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Register'));
+        $required_fields = array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => __('Confirm pass'), 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => __('Robot title'));
         $focus_element = array('register', 'req_user');
 
         define('FEATHER_ACTIVE_PAGE', 'register');
@@ -78,8 +75,6 @@ public function display()
         $this->feather->render('register/form.php', array(
                             'errors' => $user['errors'],
                             'feather_config' => $this->config,
-                            'lang_register' => $lang_register,
-                            'lang_prof_reg' => $lang_prof_reg,
                             'lang_antispam' => $lang_antispam,
                             'lang_antispam_questions'    =>    $lang_antispam_questions,
                             'index_questions'    =>    $index_questions,
@@ -99,9 +94,8 @@ public function cancel()
     }
 
     public function rules()
-    { // TODO: fix $_GET w/ URL rewriting
-
-        global $lang_login, $lang_register;
+    {
+        // TODO: fix $_GET w/ URL rewriting
 
         // If we are logged in, we shouldn't be here
         if (!$this->user->is_guest) {
@@ -111,27 +105,20 @@ public function rules()
 
         // Display an error message if new registrations are disabled
         if ($this->config['o_regs_allow'] == '0') {
-            message($lang_register['No new regs']);
+            message(__('No new regs'));
         }
 
-        // Load the register.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/register.php';
-
-        // Load the register.php/profile.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
-
         if ($this->config['o_rules'] != '1') {
             redirect(get_link('register/agree/'));
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_register['Register'], $lang_register['Forum rules']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Register'), __('Forum rules'));
 
         define('FEATHER_ACTIVE_PAGE', 'register');
 
         $this->header->setTitle($page_title)->display();
 
         $this->feather->render('register/rules.php', array(
-                            'lang_register'    =>    $lang_register,
                             'feather_config'    =>    $this->config,
                             )
                     );
diff --git a/controller/search.php b/controller/search.php
index df7712b6..24672375 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -21,6 +21,9 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\search();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/search.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
     }
 
     public function __autoload($class_name)
@@ -30,16 +33,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_search, $lang_forum, $lang_topic, $pd;
-
-        // Load the search.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/search.php';
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
+        global $pd;
 
         if ($this->user->g_read_board == '0') {
             message(__('No view'), '403');
         } elseif ($this->user->g_search == '0') {
-            message($lang_search['No search permission'], false, '403 Forbidden');
+            message(__('No search permission'), false, '403 Forbidden');
         }
 
         require FEATHER_ROOT.'include/search_idx.php';
@@ -50,20 +49,18 @@ public function display()
 
                 // We have results to display
                 if (isset($search['is_result'])) {
-                    $page_title = array(feather_escape($this->config['o_board_title']), $lang_search['Search results']);
+                    $page_title = array(feather_escape($this->config['o_board_title']), __('Search results'));
 
                     define('FEATHER_ACTIVE_PAGE', 'search');
 
                     $this->header->setTitle($page_title)->display();
 
                     $this->feather->render('search/header.php', array(
-                                    'lang_search' => $lang_search,
                                 'search' => $search,
                                 )
                         );
 
                     if ($search['show_as'] == 'posts') {
-                        require FEATHER_ROOT.'lang/'.$this->user->language.'/topic.php';
                         require FEATHER_ROOT.'include/parser.php';
                     }
 
@@ -76,11 +73,11 @@ public function display()
 
                     $this->footer->display();
                 } else {
-                    message($lang_search['No hits']);
+                    message(__('No hits'));
                 }
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_search['Search']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Search'));
         $focus_element = array('search', 'keywords');
 
         define('FEATHER_ACTIVE_PAGE', 'search');
@@ -88,7 +85,6 @@ public function display()
         $this->header->setTitle($page_title)->setFocusElement($focus_element)->display();
 
         $this->feather->render('search/form.php', array(
-                            'lang_search' => $lang_search,
                             'feather_config' => $this->config,
                             'feather' => $this->feather,
                             'forums' => $this->model->get_list_forums(),
diff --git a/controller/userlist.php b/controller/userlist.php
index 7de8f1c8..a22d849b 100644
--- a/controller/userlist.php
+++ b/controller/userlist.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\userlist();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/search.mo');
     }
 
     public function __autoload($class_name)
@@ -30,21 +32,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-
-
         if ($this->user->g_read_board == '0') {
             message(__('No view'), '403');
         } elseif ($this->user->g_view_users == '0') {
             message(__('No permission'), '403');
         }
 
-        // Load the userlist.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.php';
-
-        // Load the search.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/search.php';
-
-
         // Determine if we are allowed to view post counts
         $show_post_count = ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) ? true : false;
 
@@ -76,8 +69,6 @@ public function display()
         $this->header->setTitle($page_title)->setPage($p)->setFocusElement($focus_element)->setPagingLinks($paging_links)->display();
 
         $this->feather->render('userlist.php', array(
-                            'lang_search' => $lang_search,
-                            'lang_ul' => $lang_ul,
                             'feather' => $this->feather,
                             'username' => $username,
                             'show_group' => $show_group,
diff --git a/controller/viewforum.php b/controller/viewforum.php
index c500a8bd..5b9d207a 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\viewforum();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
     }
 
     public function __autoload($class_name)
@@ -30,8 +31,6 @@ public function __autoload($class_name)
     
     public function display($id, $name = null, $page = null)
     {
-        global $lang_forum;
-
         if ($this->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
@@ -40,9 +39,6 @@ public function display($id, $name = null, $page = null)
             message(__('Bad request'), '404');
         }
 
-        // Load the viewforum.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
-
         // Fetch some informations about the forum
         $cur_forum = $this->model->get_info_forum($id);
 
@@ -60,7 +56,7 @@ public function display($id, $name = null, $page = null)
 
         // Can we or can we not post new topics?
         if (($cur_forum['post_topics'] == '' && $this->user->g_post_topics == '1') || $cur_forum['post_topics'] == '1' || $is_admmod) {
-            $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/new-topic/'.$id.'/').'">'.$lang_forum['Post topic'].'</a></p>'."\n";
+            $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/new-topic/'.$id.'/').'">'.__('Post topic').'</a></p>'."\n";
         } else {
             $post_link = '';
         }
@@ -90,7 +86,6 @@ public function display($id, $name = null, $page = null)
         $this->feather->render('viewforum.php', array(
                             'id' => $id,
                             'forum_data' => $this->model->print_topics($id, $sort_by, $start_from),
-                            'lang_forum' => $lang_forum,
                             'cur_forum' => $cur_forum,
                             'paging_links' => $paging_links,
                             'post_link' => $post_link,
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index 385d6523..3cede850 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -21,6 +21,9 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\viewtopic();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.mo');
     }
 
     public function __autoload($class_name)
@@ -30,25 +33,16 @@ public function __autoload($class_name)
 
     public function display($id = null, $name = null, $page = null, $pid = null)
     {
-        global $lang_post, $lang_topic, $lang_bbeditor, $pd;
+        global $pd;
 
         if ($this->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
 
-        // Load the viewtopic.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/topic.php';
-
-        // Load the post.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/post.php';
-
         // Antispam feature
         require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
-        // BBcode toolbar feature
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.php';
-
         // Load the viewtopic.php model file
         require_once FEATHER_ROOT.'model/viewtopic.php';
 
@@ -108,9 +102,6 @@ public function display($id = null, $name = null, $page = null, $pid = null)
                             'id' => $id,
                             'p' => $p,
                             'post_data' => $this->model->print_posts($id, $start_from, $cur_topic, $is_admmod),
-                            'lang_topic' => $lang_topic,
-                            'lang_post' => $lang_post,
-                            'lang_bbeditor' => $lang_bbeditor,
                             'cur_topic'    =>    $cur_topic,
                             'subscraction'    =>    $subscraction,
                             'is_admmod'    =>    $is_admmod,
diff --git a/extern.php b/extern.php
index 29da2f32..06d17a61 100644
--- a/extern.php
+++ b/extern.php
@@ -70,6 +70,8 @@
 
 require FEATHER_ROOT.'include/common.php';
 
+load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/common.mo');
+
 // The length at which topic subjects will be truncated (for HTML output)
 if (!defined('FORUM_EXTERN_MAX_SUBJECT_LENGTH')) {
     define('FORUM_EXTERN_MAX_SUBJECT_LENGTH', 30);
@@ -611,12 +613,12 @@ function output_html($feed)
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
 
-    echo sprintf($lang_index['Guests online'], forum_number_format($num_guests)).'<br />'."\n";
+    echo sprintf(__('Guests online'), forum_number_format($num_guests)).'<br />'."\n";
 
     if ($action == 'online_full' && !empty($users)) {
-        echo sprintf($lang_index['Users online'], implode(', ', $users)).'<br />'."\n";
+        echo sprintf(__('Users online'), implode(', ', $users)).'<br />'."\n";
     } else {
-        echo sprintf($lang_index['Users online'], forum_number_format($num_users)).'<br />'."\n";
+        echo sprintf(__('Users online'), forum_number_format($num_users)).'<br />'."\n";
     }
 
     exit;
@@ -655,10 +657,10 @@ function output_html($feed)
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
 
-    echo sprintf($lang_index['No of users'], forum_number_format($stats['total_users'])).'<br />'."\n";
-    echo sprintf($lang_index['Newest user'], (($feather->user->g_view_users == '1') ? '<a href="'.get_link('user/'.$stats['last_user']['id'].'/').'">'.feather_escape($stats['last_user']['username']).'</a>' : feather_escape($stats['last_user']['username']))).'<br />'."\n";
-    echo sprintf($lang_index['No of topics'], forum_number_format($stats['total_topics'])).'<br />'."\n";
-    echo sprintf($lang_index['No of posts'], forum_number_format($stats['total_posts'])).'<br />'."\n";
+    echo sprintf(__('No of users'), forum_number_format($stats['total_users'])).'<br />'."\n";
+    echo sprintf(__('Newest user'), (($feather->user->g_view_users == '1') ? '<a href="'.get_link('user/'.$stats['last_user']['id'].'/').'">'.feather_escape($stats['last_user']['username']).'</a>' : feather_escape($stats['last_user']['username']))).'<br />'."\n";
+    echo sprintf(__('No of topics'), forum_number_format($stats['total_topics'])).'<br />'."\n";
+    echo sprintf(__('No of posts'), forum_number_format($stats['total_posts'])).'<br />'."\n";
 
     exit;
 }
diff --git a/include/functions.php b/include/functions.php
index ab906f78..2a61dcee 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -404,32 +404,35 @@ function check_bans()
 //
 function check_username($username, $errors, $exclude_id = null)
 {
-    global $feather, $feather_config, $errors, $lang_prof_reg, $lang_register, $feather_bans;
+    global $feather, $feather_config, $errors, $feather_bans;
 
     // Include UTF-8 function
     require_once FEATHER_ROOT.'include/utf8/strcasecmp.php';
 
+    load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/register.mo');
+    load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/prof_reg.mo');
+
     // Convert multiple whitespace characters into one (to prevent people from registering with indistinguishable usernames)
     $username = preg_replace('%\s+%s', ' ', $username);
 
     // Validate username
     if (feather_strlen($username) < 2) {
-        $errors[] = $lang_prof_reg['Username too short'];
+        $errors[] = __('Username too short');
     } elseif (feather_strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
-        $errors[] = $lang_prof_reg['Username too long'];
+        $errors[] = __('Username too long');
     } elseif (!strcasecmp($username, 'Guest') || !utf8_strcasecmp($username, __('Guest'))) {
-        $errors[] = $lang_prof_reg['Username guest'];
+        $errors[] = __('Username guest');
     } elseif (preg_match('%[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}%', $username) || preg_match('%((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))%', $username)) {
-        $errors[] = $lang_prof_reg['Username IP'];
+        $errors[] = __('Username IP');
     } elseif ((strpos($username, '[') !== false || strpos($username, ']') !== false) && strpos($username, '\'') !== false && strpos($username, '"') !== false) {
-        $errors[] = $lang_prof_reg['Username reserved chars'];
+        $errors[] = __('Username reserved chars');
     } elseif (preg_match('%(?:\[/?(?:b|u|s|ins|del|em|i|h|colou?r|quote|code|img|url|email|list|\*|topic|post|forum|user)\]|\[(?:img|url|quote|list)=)%i', $username)) {
-        $errors[] = $lang_prof_reg['Username BBCode'];
+        $errors[] = __('Username BBCode');
     }
 
     // Check username for any censored words
     if ($feather_config['o_censoring'] == '1' && censor_words($username) != $username) {
-        $errors[] = $lang_register['Username censor'];
+        $errors[] = __('Username censor');
     }
 
     // Check that the username (or a too similar username) is not already registered
@@ -439,13 +442,13 @@ function check_username($username, $errors, $exclude_id = null)
 
     if ($result) {
         $busy = $result['username'];
-        $errors[] = $lang_register['Username dupe 1'].' '.feather_escape($busy).'. '.$lang_register['Username dupe 2'];
+        $errors[] = __('Username dupe 1').' '.feather_escape($busy).'. '.__('Username dupe 2');
     }
 
     // Check username for any banned usernames
     foreach ($feather_bans as $cur_ban) {
         if ($cur_ban['username'] != '' && utf8_strtolower($username) == utf8_strtolower($cur_ban['username'])) {
-            $errors[] = $lang_prof_reg['Banned username'];
+            $errors[] = __('Banned username');
             break;
         }
     }
diff --git a/install/index.php b/install/index.php
index 898a86a7..540f1681 100644
--- a/install/index.php
+++ b/install/index.php
@@ -79,11 +79,15 @@ function stripslashes_array($array)
 $install_lang = preg_replace('%[\.\\\/]%', '', $install_lang);
 
 // If such a language pack doesn't exist, or isn't up-to-date enough to translate this page, default to English
-if (!file_exists(FEATHER_ROOT.'lang/'.$install_lang.'/install.php')) {
+if (!file_exists(FEATHER_ROOT.'lang/'.$feather->user->language.'/install.mo')) {
     $install_lang = 'English';
 }
 
-require FEATHER_ROOT.'lang/'.$install_lang.'/install.php';
+// Load l10n
+require_once FEATHER_ROOT.'include/pomo/MO.php';
+require_once FEATHER_ROOT.'include/l10n.php';
+
+load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$install_lang.'/install.mo');
 
 if (file_exists(FEATHER_ROOT.'include/config.php')) {
     // Check to see whether FeatherBB is already installed
@@ -91,7 +95,7 @@ function stripslashes_array($array)
 
     // If FEATHER is defined, config.php is probably valid and thus the software is installed
     if (defined('FEATHER')) {
-        exit($lang_install['Already installed']);
+        exit(__('Already installed'));
     }
 }
 
@@ -105,7 +109,7 @@ function stripslashes_array($array)
 
 // Make sure we are running at least MIN_PHP_VERSION
 if (!function_exists('version_compare') || version_compare(PHP_VERSION, MIN_PHP_VERSION, '<')) {
-    exit(sprintf($lang_install['You are running error'], 'PHP', PHP_VERSION, FORUM_VERSION, MIN_PHP_VERSION));
+    exit(sprintf(__('You are running error'), 'PHP', PHP_VERSION, FORUM_VERSION, MIN_PHP_VERSION));
 }
 
 
@@ -226,8 +230,8 @@ function generate_config_file()
 
     $db_type = $db_name = $db_username = $db_prefix = $username = $email = '';
     $db_host = 'localhost';
-    $title = $lang_install['My FeatherBB Forum'];
-    $description = '<p><span>'.$lang_install['Description'].'</span></p>';
+    $title = __('My FeatherBB Forum');
+    $description = '<p><span>'.__('Description').'</span></p>';
     $default_lang = $install_lang;
     $default_style = 'FeatherBB';
 } else {
@@ -255,55 +259,55 @@ function generate_config_file()
 
     // Validate username and passwords
     if (feather_strlen($username) < 2) {
-        $alerts[] = $lang_install['Username 1'];
+        $alerts[] = __('Username 1');
     } elseif (feather_strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
-        $alerts[] = $lang_install['Username 2'];
+        $alerts[] = __('Username 2');
     } elseif (!strcasecmp($username, 'Guest')) {
-        $alerts[] = $lang_install['Username 3'];
+        $alerts[] = __('Username 3');
     } elseif (preg_match('%[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}%', $username) || preg_match('%((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))%', $username)) {
-        $alerts[] = $lang_install['Username 4'];
+        $alerts[] = __('Username 4');
     } elseif ((strpos($username, '[') !== false || strpos($username, ']') !== false) && strpos($username, '\'') !== false && strpos($username, '"') !== false) {
-        $alerts[] = $lang_install['Username 5'];
+        $alerts[] = __('Username 5');
     } elseif (preg_match('%(?:\[/?(?:b|u|i|h|colou?r|quote|code|img|url|email|list)\]|\[(?:code|quote|list)=)%i', $username)) {
-        $alerts[] = $lang_install['Username 6'];
+        $alerts[] = __('Username 6');
     }
 
     if (feather_strlen($password1) < 6) {
-        $alerts[] = $lang_install['Short password'];
+        $alerts[] = __('Short password');
     } elseif ($password1 != $password2) {
-        $alerts[] = $lang_install['Passwords not match'];
+        $alerts[] = __('Passwords not match');
     }
 
     // Validate email
     require FEATHER_ROOT.'include/email.php';
 
     if (!is_valid_email($email)) {
-        $alerts[] = $lang_install['Wrong email'];
+        $alerts[] = __('Wrong email');
     }
 
     if ($title == '') {
-        $alerts[] = $lang_install['No board title'];
+        $alerts[] = __('No board title');
     }
 
     $languages = forum_list_langs();
     if (!in_array($default_lang, $languages)) {
-        $alerts[] = $lang_install['Error default language'];
+        $alerts[] = __('Error default language');
     }
 
     $styles = forum_list_styles();
     if (!in_array($default_style, $styles)) {
-        $alerts[] = $lang_install['Error default style'];
+        $alerts[] = __('Error default style');
     }
 }
 
 // Check if the cache directory is writable
 if (!forum_is_writable(FORUM_CACHE_DIR)) {
-    $alerts[] = sprintf($lang_install['Alert cache'], FORUM_CACHE_DIR);
+    $alerts[] = sprintf(__('Alert cache'), FORUM_CACHE_DIR);
 }
 
 // Check if default avatar directory is writable
 if (!forum_is_writable(FEATHER_ROOT.'img/avatars/')) {
-    $alerts[] = sprintf($lang_install['Alert avatar'], FEATHER_ROOT.'img/avatars/');
+    $alerts[] = sprintf(__('Alert avatar'), FEATHER_ROOT.'img/avatars/');
 }
 
 if (!isset($_POST['form_sent']) || !empty($alerts)) {
@@ -336,7 +340,7 @@ function generate_config_file()
     }
 
     if (empty($db_extensions)) {
-        error($lang_install['No DB extensions']);
+        error(__('No DB extensions'));
     }
 
     // Fetch a list of installed languages
@@ -347,22 +351,22 @@ function generate_config_file()
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><?php echo $lang_install['FeatherBB Installation'] ?></title>
+<title><?php echo __('FeatherBB Installation') ?></title>
 <link rel="stylesheet" type="text/css" href="../style/<?php echo $default_style ?>.css" />
 <script type="text/javascript">
 /* <![CDATA[ */
 function process_form(the_form)
 {
 	var required_fields = {
-		"req_db_type": "<?php echo $lang_install['Database type'] ?>",
-		"req_db_host": "<?php echo $lang_install['Database server hostname'] ?>",
-		"req_db_name": "<?php echo $lang_install['Database name'] ?>",
-		"req_username": "<?php echo $lang_install['Administrator username'] ?>",
-		"req_password1": "<?php echo $lang_install['Password'] ?>",
-		"req_password2": "<?php echo $lang_install['Confirm password'] ?>",
-		"req_email": "<?php echo $lang_install['Administrator email'] ?>",
-		"req_title": "<?php echo $lang_install['Board title'] ?>",
-		"req_base_url": "<?php echo $lang_install['Base URL'] ?>"
+		"req_db_type": "<?php echo __('Database type') ?>",
+		"req_db_host": "<?php echo __('Database server hostname') ?>",
+		"req_db_name": "<?php echo __('Database name') ?>",
+		"req_username": "<?php echo __('Administrator username') ?>",
+		"req_password1": "<?php echo __('Password') ?>",
+		"req_password2": "<?php echo __('Confirm password') ?>",
+		"req_email": "<?php echo __('Administrator email') ?>",
+		"req_title": "<?php echo __('Board title') ?>",
+		"req_base_url": "<?php echo __('Base URL') ?>"
 	};
 	if (document.all || document.getElementById)
 	{
@@ -371,7 +375,7 @@ function process_form(the_form)
 			var elem = the_form.elements[i];
 			if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
 			{
-				alert('"' + required_fields[elem.name] + '" <?php echo $lang_install['Required field'] ?>');
+				alert('"' + required_fields[elem.name] + '" <?php echo __('Required field') ?>');
 				elem.focus();
 				return false;
 			}
@@ -392,8 +396,8 @@ function process_form(the_form)
 	<div id="brdheader" class="block">
 		<div class="box">
 			<div id="brdtitle" class="inbox">
-				<h1><span><?php echo $lang_install['FeatherBB Installation'] ?></span></h1>
-				<div id="brddesc"><p><?php echo $lang_install['Welcome'] ?></p></div>
+				<h1><span><?php echo __('FeatherBB Installation') ?></span></h1>
+				<div id="brddesc"><p><?php echo __('Welcome') ?></p></div>
 			</div>
 		</div>
 	</div>
@@ -402,15 +406,15 @@ function process_form(the_form)
 <section class="container">
 	<div id="brdmain">
 	<?php if (count($languages) > 1): ?><div class="blockform">
-		<h2><span><?php echo $lang_install['Choose install language'] ?></span></h2>
+		<h2><span><?php echo __('Choose install language') ?></span></h2>
 		<div class="box">
 			<form id="install" method="post" action="">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_install['Install language'] ?></legend>
+						<legend><?php echo __('Install language') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_install['Choose install language info'] ?></p>
-							<label><strong><?php echo $lang_install['Install language'] ?></strong>
+							<p><?php echo __('Choose install language info') ?></p>
+							<label><strong><?php echo __('Install language') ?></strong>
 							<br /><select name="install_lang">
 <?php
 
@@ -428,7 +432,7 @@ function process_form(the_form)
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="start" value="<?php echo $lang_install['Change language'] ?>" /></p>
+				<p class="buttons"><input type="submit" name="start" value="<?php echo __('Change language') ?>" /></p>
 			</form>
 		</div>
 	</div>
@@ -436,13 +440,13 @@ function process_form(the_form)
     ?>
 
 	<div class="blockform">
-		<h2><span><?php echo sprintf($lang_install['Install'], FORUM_VERSION) ?></span></h2>
+		<h2><span><?php echo sprintf(__('Install'), FORUM_VERSION) ?></span></h2>
 		<div class="box">
 			<form id="install" method="post" action="" onsubmit="this.start.disabled=true;if(process_form(this)){return true;}else{this.start.disabled=false;return false;}">
 			<div><input type="hidden" name="form_sent" value="1" /><input type="hidden" name="install_lang" value="<?php echo feather_escape($install_lang) ?>" /></div>
 				<div class="inform">
 	<?php if (!empty($alerts)): ?>				<div class="forminfo error-info">
-						<h3><?php echo $lang_install['Errors'] ?></h3>
+						<h3><?php echo __('Errors') ?></h3>
 						<ul class="error-list">
 <?php
 
@@ -456,14 +460,14 @@ function process_form(the_form)
     ?>			</div>
 				<div class="inform">
 					<div class="forminfo">
-						<h3><?php echo $lang_install['Database setup'] ?></h3>
-						<p><?php echo $lang_install['Info 1'] ?></p>
+						<h3><?php echo __('Database setup') ?></h3>
+						<p><?php echo __('Info 1') ?></p>
 					</div>
 					<fieldset>
-					<legend><?php echo $lang_install['Select database'] ?></legend>
+					<legend><?php echo __('Select database') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_install['Info 2'] ?></p>
-							<label class="required"><strong><?php echo $lang_install['Database type'] ?> <span><?php echo $lang_install['Required'] ?></span></strong>
+							<p><?php echo __('Info 2') ?></p>
+							<label class="required"><strong><?php echo __('Database type') ?> <span><?php echo __('Required') ?></span></strong>
 							<br /><select name="req_db_type">
 <?php
 
@@ -483,71 +487,71 @@ function process_form(the_form)
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_install['Database hostname'] ?></legend>
+						<legend><?php echo __('Database hostname') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_install['Info 3'] ?></p>
-							<label class="required"><strong><?php echo $lang_install['Database server hostname'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input type="text" name="req_db_host" value="<?php echo feather_escape($db_host) ?>" size="50" /><br /></label>
+							<p><?php echo __('Info 3') ?></p>
+							<label class="required"><strong><?php echo __('Database server hostname') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_db_host" value="<?php echo feather_escape($db_host) ?>" size="50" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_install['Database enter name'] ?></legend>
+						<legend><?php echo __('Database enter name') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_install['Info 4'] ?></p>
-							<label class="required"><strong><?php echo $lang_install['Database name'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input id="req_db_name" type="text" name="req_db_name" value="<?php echo feather_escape($db_name) ?>" size="30" /><br /></label>
+							<p><?php echo __('Info 4') ?></p>
+							<label class="required"><strong><?php echo __('Database name') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_db_name" type="text" name="req_db_name" value="<?php echo feather_escape($db_name) ?>" size="30" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_install['Database enter informations'] ?></legend>
+						<legend><?php echo __('Database enter informations') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_install['Info 5'] ?></p>
-							<label class="conl"><?php echo $lang_install['Database username'] ?><br /><input type="text" name="db_username" value="<?php echo feather_escape($db_username) ?>" size="30" /><br /></label>
-							<label class="conl"><?php echo $lang_install['Database password'] ?><br /><input type="password" name="db_password" size="30" /><br /></label>
+							<p><?php echo __('Info 5') ?></p>
+							<label class="conl"><?php echo __('Database username') ?><br /><input type="text" name="db_username" value="<?php echo feather_escape($db_username) ?>" size="30" /><br /></label>
+							<label class="conl"><?php echo __('Database password') ?><br /><input type="password" name="db_password" size="30" /><br /></label>
 							<div class="clearer"></div>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_install['Database enter prefix'] ?></legend>
+						<legend><?php echo __('Database enter prefix') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_install['Info 6'] ?></p>
-							<label><?php echo $lang_install['Table prefix'] ?><br /><input id="db_prefix" type="text" name="db_prefix" value="<?php echo feather_escape($db_prefix) ?>" size="20" maxlength="30" /><br /></label>
+							<p><?php echo __('Info 6') ?></p>
+							<label><?php echo __('Table prefix') ?><br /><input id="db_prefix" type="text" name="db_prefix" value="<?php echo feather_escape($db_prefix) ?>" size="20" maxlength="30" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<div class="forminfo">
-						<h3><?php echo $lang_install['Administration setup'] ?></h3>
-						<p><?php echo $lang_install['Info 7'] ?></p>
+						<h3><?php echo __('Administration setup') ?></h3>
+						<p><?php echo __('Info 7') ?></p>
 					</div>
 					<fieldset>
-						<legend><?php echo $lang_install['Administration setup'] ?></legend>
+						<legend><?php echo __('Administration setup') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_install['Info 8'] ?></p>
-							<label class="required"><strong><?php echo $lang_install['Administrator username'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input type="text" name="req_username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
-							<label class="conl required"><strong><?php echo $lang_install['Password'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input id="req_password1" type="password" name="req_password1" size="16" /><br /></label>
-							<label class="conl required"><strong><?php echo $lang_install['Confirm password'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input type="password" name="req_password2" size="16" /><br /></label>
+							<p><?php echo __('Info 8') ?></p>
+							<label class="required"><strong><?php echo __('Administrator username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
+							<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_password1" type="password" name="req_password1" size="16" /><br /></label>
+							<label class="conl required"><strong><?php echo __('Confirm password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" size="16" /><br /></label>
 							<div class="clearer"></div>
-							<label class="required"><strong><?php echo $lang_install['Administrator email'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input id="req_email" type="text" name="req_email" value="<?php echo feather_escape($email) ?>" size="50" maxlength="80" /><br /></label>
+							<label class="required"><strong><?php echo __('Administrator email') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" value="<?php echo feather_escape($email) ?>" size="50" maxlength="80" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<div class="forminfo">
-						<h3><?php echo $lang_install['Board setup'] ?></h3>
-						<p><?php echo $lang_install['Info 11'] ?></p>
+						<h3><?php echo __('Board setup') ?></h3>
+						<p><?php echo __('Info 11') ?></p>
 					</div>
 					<fieldset>
-						<legend><?php echo $lang_install['General information'] ?></legend>
+						<legend><?php echo __('General information') ?></legend>
 						<div class="infldset">
-							<label class="required"><strong><?php echo $lang_install['Board title'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input id="req_title" type="text" name="req_title" value="<?php echo feather_escape($title) ?>" size="60" maxlength="255" /><br /></label>
-							<label><?php echo $lang_install['Board description'] ?><br /><input id="desc" type="text" name="desc" value="<?php echo feather_escape($description) ?>" size="60" maxlength="255" /><br /></label>
-							<label class="required"><strong><?php echo $lang_install['Base URL'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input id="req_base_url" type="text" name="req_base_url" value="<?php echo feather_escape($base_url) ?>" size="60" maxlength="100" /><br /></label>
-							<label class="required"><strong><?php echo $lang_install['Default language'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><select id="req_default_lang" name="req_default_lang">
+							<label class="required"><strong><?php echo __('Board title') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_title" type="text" name="req_title" value="<?php echo feather_escape($title) ?>" size="60" maxlength="255" /><br /></label>
+							<label><?php echo __('Board description') ?><br /><input id="desc" type="text" name="desc" value="<?php echo feather_escape($description) ?>" size="60" maxlength="255" /><br /></label>
+							<label class="required"><strong><?php echo __('Base URL') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_base_url" type="text" name="req_base_url" value="<?php echo feather_escape($base_url) ?>" size="60" maxlength="100" /><br /></label>
+							<label class="required"><strong><?php echo __('Default language') ?> <span><?php echo __('Required') ?></span></strong><br /><select id="req_default_lang" name="req_default_lang">
 <?php
 
             $languages = forum_list_langs();
@@ -564,7 +568,7 @@ function process_form(the_form)
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="start" value="<?php echo $lang_install['Start install'] ?>" /></p>
+				<p class="buttons"><input type="submit" name="start" value="<?php echo __('Start install') ?>" /></p>
 			</form>
 		</div>
 	</div>
@@ -611,7 +615,7 @@ function process_form(the_form)
             break;
 
         default:
-            error(sprintf($lang_install['DB type not valid'], feather_escape($db_type)));
+            error(sprintf(__('DB type not valid'), feather_escape($db_type)));
     }
 
     // Create the database object (and connect/select db)
@@ -619,7 +623,7 @@ function process_form(the_form)
 
     // Validate prefix
     if (strlen($db_prefix) > 0 && (!preg_match('%^[a-zA-Z_][a-zA-Z0-9_]*$%', $db_prefix) || strlen($db_prefix) > 40)) {
-        error(sprintf($lang_install['Table prefix error'], $db->prefix));
+        error(sprintf(__('Table prefix error'), $db->prefix));
     }
 
     // Do some DB type specific checks
@@ -630,21 +634,21 @@ function process_form(the_form)
         case 'mysqli_innodb':
             $mysql_info = $db->get_version();
             if (version_compare($mysql_info['version'], MIN_MYSQL_VERSION, '<')) {
-                error(sprintf($lang_install['You are running error'], 'MySQL', $mysql_info['version'], FORUM_VERSION, MIN_MYSQL_VERSION));
+                error(sprintf(__('You are running error'), 'MySQL', $mysql_info['version'], FORUM_VERSION, MIN_MYSQL_VERSION));
             }
             break;
 
         case 'pgsql':
             $pgsql_info = $db->get_version();
             if (version_compare($pgsql_info['version'], MIN_PGSQL_VERSION, '<')) {
-                error(sprintf($lang_install['You are running error'], 'PostgreSQL', $pgsql_info['version'], FORUM_VERSION, MIN_PGSQL_VERSION));
+                error(sprintf(__('You are running error'), 'PostgreSQL', $pgsql_info['version'], FORUM_VERSION, MIN_PGSQL_VERSION));
             }
             break;
 
         case 'sqlite':
         case 'sqlite3':
             if (strtolower($db_prefix) == 'sqlite_') {
-                error($lang_install['Prefix reserved']);
+                error(__('Prefix reserved'));
             }
             break;
     }
@@ -653,7 +657,7 @@ function process_form(the_form)
     // Make sure FeatherBB isn't already installed
     $result = $db->query('SELECT 1 FROM '.$db_prefix.'users WHERE id=1');
     if ($db->num_rows($result)) {
-        error(sprintf($lang_install['Existing table error'], $db_prefix, $db_name));
+        error(sprintf(__('Existing table error'), $db_prefix, $db_name));
     }
 
     // Check if InnoDB is available
@@ -661,7 +665,7 @@ function process_form(the_form)
         $result = $db->query('SHOW VARIABLES LIKE \'have_innodb\'');
         list(, $result) = $db->fetch_row($result);
         if ((strtoupper($result) != 'YES')) {
-            error($lang_install['InnoDB off']);
+            error(__('InnoDB off'));
         }
     }
 
@@ -1606,16 +1610,16 @@ function process_form(the_form)
     $now = time();
 
     // Insert the four preset groups
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '1, ' : '').'\''.$db->escape($lang_install['Administrators']).'\', \''.$db->escape($lang_install['Administrator']).'\', 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
+    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '1, ' : '').'\''.$db->escape(__('Administrators')).'\', \''.$db->escape(__('Administrator')).'\', 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
 
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_mod_promote_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '2, ' : '').'\''.$db->escape($lang_install['Moderators']).'\', \''.$db->escape($lang_install['Moderator']).'\', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
+    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_mod_promote_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '2, ' : '').'\''.$db->escape(__('Moderators')).'\', \''.$db->escape(__('Moderator')).'\', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
 
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '3, ' : '').'\''.$db->escape($lang_install['Guests']).'\', NULL, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 60, 30, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
+    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '3, ' : '').'\''.$db->escape(__('Guests')).'\', NULL, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 60, 30, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
 
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '4, ' : '').'\''.$db->escape($lang_install['Members']).'\', NULL, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 60, 30, 60, 60)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
+    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '4, ' : '').'\''.$db->escape(__('Members')).'\', NULL, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 60, 30, 60, 60)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
 
     // Insert guest and first admin user
-    $db->query('INSERT INTO '.$db_prefix.'users (group_id, username, password, email) VALUES(3, \''.$db->escape($lang_install['Guest']).'\', \''.$db->escape($lang_install['Guest']).'\', \''.$db->escape($lang_install['Guest']).'\')')
+    $db->query('INSERT INTO '.$db_prefix.'users (group_id, username, password, email) VALUES(3, \''.$db->escape(__('Guest')).'\', \''.$db->escape(__('Guest')).'\', \''.$db->escape(__('Guest')).'\')')
         or error('Unable to add guest user. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
 
     $db->query('INSERT INTO '.$db_prefix.'users (group_id, username, password, email, language, style, num_posts, last_post, registered, registration_ip, last_visit) VALUES(1, \''.$db->escape($username).'\', \''.feather_hash($password1).'\', \''.$email.'\', \''.$db->escape($default_lang).'\', \''.$db->escape($default_style).'\', 1, '.$now.', '.$now.', \''.$db->escape(get_remote_address()).'\', '.$now.')')
@@ -1683,11 +1687,11 @@ function process_form(the_form)
         'o_regs_allow'                => 1,
         'o_regs_verify'                => 0,
         'o_announcement'            => 0,
-        'o_announcement_message'    => $lang_install['Announcement'],
+        'o_announcement_message'    => __('Announcement'),
         'o_rules'                    => 0,
-        'o_rules_message'            => $lang_install['Rules'],
+        'o_rules_message'            => __('Rules'),
         'o_maintenance'                => 0,
-        'o_maintenance_message'        => $lang_install['Maintenance message'],
+        'o_maintenance_message'        => __('Maintenance message'),
         'o_default_dst'                => 0,
         'o_feed_type'                => 2,
         'o_feed_ttl'                => 0,
@@ -1711,13 +1715,13 @@ function process_form(the_form)
     }
 
     // Insert some other default data
-    $subject = $lang_install['Test post'];
-    $message = $lang_install['Message'];
+    $subject = __('Test post');
+    $message = __('Message');
 
-    $db->query('INSERT INTO '.$db_prefix.'categories (cat_name, disp_position) VALUES(\''.$db->escape($lang_install['Test category']).'\', 1)')
+    $db->query('INSERT INTO '.$db_prefix.'categories (cat_name, disp_position) VALUES(\''.$db->escape(__('Test category')).'\', 1)')
         or error('Unable to insert into table '.$db_prefix.'categories. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
 
-    $db->query('INSERT INTO '.$db_prefix.'forums (forum_name, forum_desc, num_topics, num_posts, last_post, last_post_id, last_poster, disp_position, cat_id) VALUES(\''.$db->escape($lang_install['Test forum']).'\', \''.$db->escape($lang_install['This is just a test forum']).'\', 1, 1, '.$now.', 1, \''.$db->escape($username).'\', 1, 1)')
+    $db->query('INSERT INTO '.$db_prefix.'forums (forum_name, forum_desc, num_topics, num_posts, last_post, last_post_id, last_poster, disp_position, cat_id) VALUES(\''.$db->escape(__('Test forum')).'\', \''.$db->escape(__('This is just a test forum')).'\', 1, 1, '.$now.', 1, \''.$db->escape($username).'\', 1, 1)')
         or error('Unable to insert into table '.$db_prefix.'forums. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
 
     $db->query('INSERT INTO '.$db_prefix.'topics (poster, subject, posted, first_post_id, last_post, last_post_id, last_poster, forum_id) VALUES(\''.$db->escape($username).'\', \''.$db->escape($subject).'\', '.$now.', 1, '.$now.', 1, \''.$db->escape($username).'\', 1)')
@@ -1733,7 +1737,7 @@ function process_form(the_form)
 
     // Check if we disabled uploading avatars because file_uploads was disabled
     if ($avatars == '0') {
-        $alerts[] = $lang_install['Alert upload'];
+        $alerts[] = __('Alert upload');
     }
 
     // Add some random bytes at the end of the cookie name to prevent collisions
@@ -1766,7 +1770,7 @@ function process_form(the_form)
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><?php echo $lang_install['FeatherBB Installation'] ?></title>
+<title><?php echo __('FeatherBB Installation') ?></title>
 <link rel="stylesheet" type="text/css" href="../style/<?php echo $default_style ?>.css" />
 </head>
 <body>
@@ -1779,8 +1783,8 @@ function process_form(the_form)
     <div id="brdheader" class="block">
             <div class="box">
                     <div id="brdtitle" class="inbox">
-                            <h1><span><?php echo $lang_install['FeatherBB Installation'] ?></span></h1>
-                            <div id="brddesc"><p><?php echo $lang_install['FeatherBB has been installed'] ?></p></div>
+                            <h1><span><?php echo __('FeatherBB Installation') ?></span></h1>
+                            <div id="brddesc"><p><?php echo __('FeatherBB has been installed') ?></p></div>
                     </div>
             </div>
     </div>
@@ -1788,7 +1792,7 @@ function process_form(the_form)
     <div id="brdmain">
 
     <div class="blockform">
-            <h2><span><?php echo $lang_install['Final instructions'] ?></span></h2>
+            <h2><span><?php echo __('Final instructions') ?></span></h2>
             <div class="box">
     <?php
 
@@ -1797,8 +1801,8 @@ function process_form(the_form)
                     <form method="post" action="">
                             <div class="inform">
                                     <div class="forminfo">
-                                            <p><?php echo $lang_install['Info 17'] ?></p>
-                                            <p><?php echo $lang_install['Info 18'] ?></p>
+                                            <p><?php echo __('Info 17') ?></p>
+                                            <p><?php echo __('Info 18') ?></p>
                                     </div>
                                     <input type="hidden" name="generate_config" value="1" />
                                     <input type="hidden" name="db_type" value="<?php echo $db_type;
@@ -1830,7 +1834,7 @@ function process_form(the_form)
                                     </div>
     <?php endif;
         ?>			</div>
-                            <p class="buttons"><input type="submit" value="<?php echo $lang_install['Download config.php file'] ?>" /></p>
+                            <p class="buttons"><input type="submit" value="<?php echo __('Download config.php file') ?>" /></p>
                     </form>
 
     <?php
@@ -1840,7 +1844,7 @@ function process_form(the_form)
                     <div class="fakeform">
                             <div class="inform">
                                     <div class="forminfo">
-                                            <p><?php echo $lang_install['FeatherBB fully installed'] ?></p>
+                                            <p><?php echo __('FeatherBB fully installed') ?></p>
                                     </div>
                             </div>
                     </div>
diff --git a/lang/English/antispam.mo b/lang/English/antispam.mo
new file mode 100644
index 0000000000000000000000000000000000000000..2d884422712f3935e89b7acbab004e1cdb67f9c4
GIT binary patch
literal 751
zcmYk4!EVz)5QYsDAsGn}7cLxzN=R^6mmm(2n*?auK&4bfB_KF(SjUrO!QM5qYf9b#
z?r`JABk%w`1~;CC-*MBj^5@yvotfX>*}pfpzDF3B!ELY)u7CnG;|qwvS8xq{1J}V%
za25OllM7Mw8+HtCT#TXt>^s;L_6O`O*gvoci!K37*LpDPvDLhfUFHHAJ9nqkk2U*X
zoIP~|Jeq4$Y<v?6jwVGdx=<r0rBBILYuEQ5?ovDL-?Mb5Po4X_@kHEvo&|N7tJf?Z
zl~WqA4ojB3y?F9ss)hm=>uO&IP6=!3m_L~&bh9+pKB%c^>kA#6AZV=ZqSgymQ`Y5w
z6{)B5(%2{SRwBz1CyPORba-@duHQ)>#6xETTU1?D5Dok}>{Nv|c9&*LEuKUF)pVq~
z=W&htoJAejnahn`q}0t!IQx*4*v4<vGqx=4H%=VqCQv8oCXcYwy6UB?WyZr+Bc)a(
z8ZLSE0Y%BoDJ+dAJi_Z<a8B8ZG+bR!g(Gy9w9Uz)ZyM7&xDp4KQzdR8x=hd=)}E2z
zD~G@n6PC#DWdmE68B1>`8&Gi2VcK*%ZMN_FW-EH@Y83V-EGTO5w<2g@vD)NpKd(y&
aJE8UE**+_hL{Eijh4kenLYnLKIQj?9tlQE6

literal 0
HcmV?d00001

diff --git a/lang/English/antispam.po b/lang/English/antispam.po
new file mode 100644
index 00000000..75fa1d31
--- /dev/null
+++ b/lang/English/antispam.po
@@ -0,0 +1,27 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Robot title"
+msgstr "Are you human or robot?"
+
+msgid "Robot question"
+msgstr "Please respond with a <b>number</b> to the question: <b>%s</b>"
+
+msgid "Robot info"
+msgstr "Checking if this is requested by a real person and not an automated program."
+
+msgid "Robot test fail"
+msgstr "You answered incorrectly to the \"Human or Robot\" question."
diff --git a/lang/English/antispam_questions.mo b/lang/English/antispam_questions.mo
new file mode 100644
index 0000000000000000000000000000000000000000..f3ff0a71bb65c8f0a8a5a078d57338b2408dd0e7
GIT binary patch
literal 765
zcmZ{f&uUXa6vn5u{=06h;6LbM*1|+@ZOUy#3bsWGEd~iH?#ARKnUc(enUh!_!et+!
zZ{Z`jbnU88C?X<-BHj4i^rR_L=iV>B`+alf%*ppVb9)Nw7PJ5{G!K1+%5{52sR!UZ
zcprQud;va$e=qwi`DgGR@_q4Nz`O9@#2<kN@UycJc!(cF>PYxQ_*3{x_#4Elj>Vq{
z{|HZo*HANAH{_%IZ&#rVx-QvG@QQqwn1j$lskdFr+9ge{(`C)BPf7E~uzJ4Hb|cb#
z=ZF91VHhP3o~HHQ`AL1E5&7xP*j{!dxm`Wzl^1j)U1(M2mrOLSk^>hf#n}Hz&ziI`
z@v5rFutQBYn=SK(VsgRPbXI@WFl&)4!<u!=G|tRx8o9D!5^dSUrV*`AJ<B1YXv_M}
z(00f)$oAp4H@7#Yee=qbY%O>uk7J((=*qOqj|V;L{4?F`+L(x+yA(`OR98$sEiUh9
zQ#2dC8CuSFYP$H~`24z>CZD}CFUeCpo1`A7<yhyHqOz2!d|5rkv#6HUipm#NRV}GP
F{RM6Rwd?=@

literal 0
HcmV?d00001

diff --git a/lang/English/antispam_questions.po b/lang/English/antispam_questions.po
new file mode 100644
index 00000000..384893e1
--- /dev/null
+++ b/lang/English/antispam_questions.po
@@ -0,0 +1,43 @@
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+
+msgid "What is two plus two?"
+msgstr "4"
+
+msgid "What is four minus one?"
+msgstr "3"
+
+msgid "What is three plus two?"
+msgstr "5"
+
+msgid "What is two times four?"
+msgstr "8"
+
+msgid "What is five minus two?"
+msgstr "3"
+
+msgid "What is six plus three?"
+msgstr "9"
+
+msgid "What is seven minus one?"
+msgstr "6"
+
+msgid "What is eight times two?"
+msgstr "16"
+
+msgid "What is six times two?"
+msgstr "12"
+
+msgid "What is nine minus seven?"
+msgstr "2"
diff --git a/lang/English/bbeditor.mo b/lang/English/bbeditor.mo
new file mode 100644
index 0000000000000000000000000000000000000000..a176f079a551314464013f06d3593a9f9617a8a5
GIT binary patch
literal 1082
zcmYk4J!}&(6vq!*zQRWVAu+&U2BadmKr4poN)T#jQBW#ENf4`(dr3_%cJTQsDmE5i
zU_gQi76c;;3p0!i42Y=<3#_b&k^i$V1WUf3-+T6Z&;H-{qth=Uj3byQG2dby$2_+K
zAB@M~9`Fgc4}4bIFTuUA-<1A$U<LMvGXAOL=aOH`_%_JrewO?N9)SHD+z(Fe44eVE
z-U+aU*lBPY_U2R+?FJu!Y(E5dfsac6Q;_?8UdCU6Gq7KShrstB*ZT<axi2NZfn0AJ
zJO=&%=fOW9pF4|UXv3f3w}RW};TR9@g$KXEVZWMu_`ZBM?gQ8Gb%5v~CilwsiMmcN
znJi`2NjtKBWl{>vjCVAg%v6tE*Nfb#{uVEr)OVgrZv^JvZmFIttWR*WFwQU5)L`8Q
zJ31wsDNWJHn&HSbhH@}ohuy*7v02p03M;dC#n@q<2tD#<UYlPOVOg8i;#5t{oms53
zthq})7dO)QHrZSmoro2ZZk_DXQl)jH9oH>P_~Wb6Q6k`r*JxAm*0HN8a~HR*)OjYI
zvDnm<dQhOjxJ`2SUq*3BrbDH#^h1emw`%O*a%Hu#x;&{rSG`cF8@#DT)~ykWI=b)9
zk20zBqUfzlo0F?`+AHzGWFJ@WlZ}^k&!kEZ60y)#?q4H`AYHi=Un5O6^w=_#DktWu
z3)PE=1T(&63frT4sF8?JB=Sm^GS^w-x?zD!b;r_rT^l+l>qKX*DVnTrM;i;}D1`}`
z%WzOH=oTcN=)25+lYj!k@8VPmBqf;>E-{W3D5K?&#6A91QZZ|+z@AMK-Aw9@Gf6bb
H<1_pPbWa9S

literal 0
HcmV?d00001

diff --git a/lang/English/bbeditor.php b/lang/English/bbeditor.php
deleted file mode 100644
index 7e1990a3..00000000
--- a/lang/English/bbeditor.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-// Language definitions used in viewtopic.php and post.php
-$lang_bbeditor = array(
-
-    'btnBold'           => 'Bold',
-    'btnItalic'         => 'Italic',
-    'btnUnderline'      => 'Underline',
-    'btnColor'          => 'Color',
-    'btnLeft'           => 'Left',
-    'btnRight'          => 'Right',
-    'btnJustify'        => 'Justify',
-    'btnCenter'         => 'Center',
-    'btnLink'           => 'Insert URL Link',
-    'btnPicture'        => 'Insert Image',
-    'btnList'           => 'Ordered List',
-    'btnList'           => 'Unordered List',
-    'btnQuote'          => 'Quote',
-    'btnCode'           => 'Code',
-
-    'promptImage'       => 'Enter the Image URL:',
-    'promptUrl'         => 'Enter the URL:',
-    'promptQuote'         => 'Please enter the username quoted (or leave blank):'
-
-);
diff --git a/lang/English/bbeditor.po b/lang/English/bbeditor.po
new file mode 100644
index 00000000..3deedec3
--- /dev/null
+++ b/lang/English/bbeditor.po
@@ -0,0 +1,63 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "btnBold"
+msgstr "Bold"
+
+msgid "btnItalic"
+msgstr "Italic"
+
+msgid "btnUnderline"
+msgstr "Underline"
+
+msgid "btnColor"
+msgstr "Color"
+
+msgid "btnLeft"
+msgstr "Left"
+
+msgid "btnRight"
+msgstr "Right"
+
+msgid "btnJustify"
+msgstr "Justify"
+
+msgid "btnCenter"
+msgstr "Center"
+
+msgid "btnLink"
+msgstr "Insert URL Link"
+
+msgid "btnPicture"
+msgstr "Insert Image"
+
+msgid "btnList"
+msgstr "Unordered List"
+
+msgid "btnQuote"
+msgstr "Quote"
+
+msgid "btnCode"
+msgstr "Code"
+
+msgid "promptImage"
+msgstr "Enter the Image URL:"
+
+msgid "promptUrl"
+msgstr "Enter the URL:"
+
+msgid "promptQuote"
+msgstr "Please enter the username quoted (or leave blank):"
diff --git a/lang/English/convertor.php b/lang/English/convertor.php
index f2c0326a..ebca4650 100644
--- a/lang/English/convertor.php
+++ b/lang/English/convertor.php
@@ -3,14 +3,14 @@
  * PHP arrays to po file
  */
 
-$fh = fopen("common.po", 'w');
+$fh = fopen("antispam_questions.po", 'w');
 fwrite($fh, "#\n");
 fwrite($fh, "msgid \"\"\n");
 fwrite($fh,  "msgstr \"\"\n");
 
-include 'common.php';
+include 'antispam.php';
 
-foreach ($lang_common as $key => $value) {
+foreach ($lang_antispam_questions as $key => $value) {
     $key = addslashes($key);
     $value = addslashes($value);
     fwrite($fh, "\n");
diff --git a/lang/English/delete.mo b/lang/English/delete.mo
new file mode 100644
index 0000000000000000000000000000000000000000..6597bd8e9691f8fca8dfc14430312b9b6eff0bb9
GIT binary patch
literal 1003
zcmZuv&2AGh5H=A0f~ZPQ2yvJqAr*laf_exEL8xg{Rcb|4wos5bIGaggw6RxSry&o*
zYjES%XW<#(#*xq2O~Rj*Z@-!GWPUvJZKLv8;8cOTKnmOh&Vg{g16P0_zzyJM$(0L2
z+=9Fgz6QQm@<Z?j^lfm6vk$%sJ^^=u4?u|b<)RR$;IH5ickNQ)e+Rq{eG7aW{0zJX
zJ_f%BD{urp2P4${AcTM_E*I*&mmr3^LhcH19SC{FE~o6dB+_PJ7jkBEFS__ppHp(&
z*Nzh}jyX$b)SHReW;$63e>fF)Q{{{{L-DrcZaQ%)l^yHGd4o(gSM%1>CKY09%g|<v
zY7d&#uCpJJO&;{+8+N(2ra>K6e#CBPr`mlL%eI3GyWCZt8w8s?<})2!7p6m%dl@@r
z@>F^2;B=_WaH57RV^-teBGPl!A8Ye+P^9SfBI|}Psz(P$d#n7l=t;G0jc0?XvkXZ+
zfAWvBRB6+sWTafqzI76JWPRlqvJcqFJ(Jiz9-~3^p7zT^8pNi0D)-s2D{AaoytJoU
zRFAfCQ>gN_ow$VCMUDm)NfyJ4M@(T_G_w;LsWV0~HfKZLhS_1hq;o=XWG9|_oZ2Z3
zted;T#o^g_3Oj5F<ZQwy!3?ASZUUn9qvaOR{hTB|<u>GAIox9_{<<j2z#q$9*ra%b
zn()I&X`mgdpSPe<H7q_X*Q2>O9oe)r&{U@>3Z;zQSQ!igtGEpP4&5tspn9QAH1@9-
K0wQHd6p3HzG7?h&

literal 0
HcmV?d00001

diff --git a/lang/English/delete.php b/lang/English/delete.php
deleted file mode 100644
index 71dca256..00000000
--- a/lang/English/delete.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-// Language definitions used in delete.php
-$lang_delete = array(
-
-'Delete post'            =>    'Delete post',
-'Warning'                =>    'You are about to permanently delete this post.',
-'Topic warning'            =>    'Warning! This is the first post in the topic, the whole topic will be permanently deleted.',
-'Delete info'            =>    'The post you have chosen to delete is set out below for you to review before proceeding.',
-'Reply by'                =>    'Reply by %s - %s',
-'Topic by'                =>    'Topic started by %s - %s',
-'Delete'                =>    'Delete', // The submit button
-'Post del redirect'        =>    'Post deleted.',
-'Topic del redirect'    =>    'Topic deleted.'
-
-);
diff --git a/lang/English/delete.po b/lang/English/delete.po
new file mode 100644
index 00000000..208f9bdc
--- /dev/null
+++ b/lang/English/delete.po
@@ -0,0 +1,42 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Delete post"
+msgstr "Delete post"
+
+msgid "Warning"
+msgstr "You are about to permanently delete this post."
+
+msgid "Topic warning"
+msgstr "Warning! This is the first post in the topic, the whole topic will be permanently deleted."
+
+msgid "Delete info"
+msgstr "The post you have chosen to delete is set out below for you to review before proceeding."
+
+msgid "Reply by"
+msgstr "Reply by %s - %s"
+
+msgid "Topic by"
+msgstr "Topic started by %s - %s"
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "Post del redirect"
+msgstr "Post deleted."
+
+msgid "Topic del redirect"
+msgstr "Topic deleted."
diff --git a/lang/English/forum.mo b/lang/English/forum.mo
new file mode 100644
index 0000000000000000000000000000000000000000..b0b3a1649e976c79f203ea4e3c0c3d235a87f124
GIT binary patch
literal 866
zcmZXR&u$Yj5XKD@3d`U20zw>Ii31=xG!=(vLjW}-C{iO<BrPEI;_OZmx4U*^dt34#
zyb;Gf0^(WtoK2fjMjHJ*<MGVwet$OCelply_%pbNZ@|ys!5&>>>=w8IhMFhfeegMW
z58MH7g73iy?0}&@0q=lc!SGIkp{@YKorA9<{&k(Phu|6b3j7Ujg6lV`K2O01h_}E{
zzYRVH8(`?0fT8aph?WdkSeU)GJcqq*FV6uOv9QoDSa=_H4*gg=H;yvaDQ14o$HtZg
z>pAYqkxQ)_;ihjgo*M0~$sK|dq!Qyi_hzP2Ht;Gvp0mMuJ=@n8Z`pyOQ^%6Lv@#c6
zV+$8^JzIpXwbSI)vGqdptroApY(|MSN0fTe%fta$r;Ltym!zMP-QA6n&qL9+2$2^b
zrKgx9C%({$3Z>_%J?Xp{TB%(wy|F0TlX_Ch35g-e;!;QcR%V6LAI8;)(WqwZ<XzP7
z^*gKi_1bpS#`lv(*ZB-XJ^k>nXSr0m$<wK{j(lr>*cFXcU6?*5D>^zgnbMP(H%7`|
zEE03l(KqplG}&s$#89R@uh$y2H@K-nF)*b~sa?&8c{OAyS<LW9%YrM%DTr5N-%ZJ-
qC7zbnV%vOvNk+)U{S>v8#1OTbd_~&0(pJ;yKl;Wifv+_BU+%xIH`nR_

literal 0
HcmV?d00001

diff --git a/lang/English/forum.php b/lang/English/forum.php
deleted file mode 100644
index 60dbef30..00000000
--- a/lang/English/forum.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-// Language definitions used in viewforum.php
-$lang_forum = array(
-
-'Post topic'    =>    'Post new topic',
-'Views'            =>    'Views',
-'Moved'            =>    'Moved:',
-'Sticky'        =>    'Sticky:',
-'Closed'        =>    'Closed:',
-'Empty forum'    =>    'Forum is empty.',
-'Mod controls'    =>    'Moderator controls',
-'Is subscribed'    =>    'You are currently subscribed to this forum',
-'Unsubscribe'    =>    'Unsubscribe',
-'Subscribe'        =>    'Subscribe to this forum'
-
-);
diff --git a/lang/English/forum.po b/lang/English/forum.po
new file mode 100644
index 00000000..4a2b8880
--- /dev/null
+++ b/lang/English/forum.po
@@ -0,0 +1,45 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Post topic"
+msgstr "Post new topic"
+
+msgid "Views"
+msgstr "Views"
+
+msgid "Moved"
+msgstr "Moved:"
+
+msgid "Sticky"
+msgstr "Sticky:"
+
+msgid "Closed"
+msgstr "Closed:"
+
+msgid "Empty forum"
+msgstr "Forum is empty."
+
+msgid "Mod controls"
+msgstr "Moderator controls"
+
+msgid "Is subscribed"
+msgstr "You are currently subscribed to this forum"
+
+msgid "Unsubscribe"
+msgstr "Unsubscribe"
+
+msgid "Subscribe"
+msgstr "Subscribe to this forum"
diff --git a/lang/English/help.mo b/lang/English/help.mo
new file mode 100644
index 0000000000000000000000000000000000000000..2d7673164737d5e1eb6a7b3ff25813f9d4072fa3
GIT binary patch
literal 4255
zcmb`JPl#kk9mi`mCT0?i`J+b7#@aO|vu3)Jol#t8Ga=4qW@lhFj=QraK_XOlS9ib6
zdsWZ(XJ^}kC<tD1i;71f;z{sg1kr;8MDP+sFqbF_9z=p*z>5m;^Q)@v>DlbTg*;xp
zZ&kgjU;X}k>sR%syKeff;#r~GNBQY7rOtyp@8-iZzDcQ@!3=yKSSI{Bcq{D}5`GW-
zAnhN3yy|DE{}%~=4c<=wtKc2r>)>7B8>#;-kXPOQ9;I#r?*wJN<Ei~H_yO9V1sA|A
zP}aYc{y&#6OW1<E>YIFI-nUc#_fz|apvZX{6#IUa{{IG)b$<`O7yJu&3;1_X^nVk)
z8+;3t`FAr}^td0C_F`(Ur1lyp_HKdi2cJpp5h(HxK#}(i@J{eMp!o4epy=^SQ2g{;
zP~`s++$BbT19{cw5b_`J3Gij`F_aN~-c0ykP~_drWbyBP;7`C4pve6lD0cl76g~f$
z`i~I=>Awe*c_+Z1gAanD*PlUN^$$Mc-+zNogSRp1D_|eI2Ye;rYYE=~ah*Db5Se!i
zD01!vH^2wL6X5fp*!Kc>7JL!3;H#kc?K3!2;_^873b+Z1A8*A7Oi;%`@xx+jFQ@ie
zYM%#B^Zz0!arqX=t6t<I@?Qc^fj<WC2mb(m1pHURJ5c`Pv`>MT!EKPR%pTcKk5C?@
z$h><gpQMP6pP-0t)92AtkvPfoA<Bm-h*S?y<Po1tpHEQ{-IggQDWb2Y9H)qHmnid(
z_*Wj;--{Gn7<30hj0J^z4@-sTqY=XQV|*nJn5{Y#@$EyDcTvRu;+rl-d?=5^TvCT{
zM))N@4$u1fIX|!}g3jE~>(fVC%W6Gut#0hqMy>mNa9CT?tsB@X&zw!YL6m%gAQft1
z;*&PF&2-d8QI1WW)zkK7-d<f_*S%g}W;V8N)Rr}a%#Gq&TQ)D%c40=gj&iqMZL68M
z?Z)I;KMvi=+<vW%8|W;ISFuCPqFOg`eyE9Fn0i=Wo~y5fdaW)@v@J}QYcm*BwyxDv
zXeWA`(UE$T`^DBb$y1?Ps|a&{qXl|dU7T8fsmSuo)+%8fd#S0iecNfqm2XGmXxko3
z>!GjOLWOGSaa5=^zRdcu+Ts~%m{vEF+|E^_;JtBH>oE@1CH_>GuL)pT`9a%9n`uRx
zoM7o3-yQaaIQ9J1!=8cd<M8~NaYtu;HF!s+#hSxeYBz5ylXo_KRn)86m7!U$EuYn~
zy0+-_i8X!t)Y*mI%0F-WO=o-1`I4>b%)3>+X-zY>)%yCv?icnt=PH`?cb+tjUDfn;
zF4`-Z44roEn7ZlgRmRo1X?(??9pgqVzUb^(Q_M-!kC{P{xhIBkiC(YktI^{N7q%~K
z9Ik)5`{=?s?;7inIw@IHX!S^$o6Mcn{jsTP+pJyQ+w7b<94D&}ZPnRuI1-kx>NCBp
znJKcWty_4ebKW{zMICp&9b}NTd#3wo{={bIl5eZNJr~zl)p3!ub!R)6&7k`}&v6`H
z(0(WkDooRa-35zvGd7JjmDNxOVtdirjiB+^>fHN%nG^O(=IDbxfr4E<%^0=r8JUT6
znNpj=>axmQKPw@Gsh8q*to0RJO>~_>cT=&>lHS_8u!9_%`vZ;K$TC^Z<av-~uCVn?
zFSlv2w6k5^RBf=QmQ}}0M{U%XNkvzEUg8E}gZE&&xe~20J$70%k-^plvA)uSte#t;
ztDp6)?i*~eD3J~4%#3p|bT)~4D=8%?o7-Wd3sa3~AB+he_UZ}JWS?SOLHdAZGCf3-
zUlr~cIn%V2?cQjXeVQdid8js#Sk{3J#F`W;tJY)RlB^4}PfS<<9f`C2Nsfv`Nn~9e
z@<ozGBoDHNltV0IJ~ktIaE8po4DWnhnm*%(5I+Pr{AN4r9wUZBxW?b!M0<n~YFO4)
zA@LC9+QSbK+*R+up)d><9T*fLs>uX&is?W6lweLx&I*o{U@_JOQk$~02DXk+yb)#j
zadPcs2+TCHzO*iF7vU+w#P&GW<hY<ATlZR0zZ^Wt@wkFLkhcSI=#&mnq0ZoQSKYu7
z_H1HgU$Pr}G8}PO8@)U5{k9<euoYxi9X+l%Fxxt)j#)#}fImov)T?TbtsX_DohRg&
z_m-sZ=&oy2SkVo+junR?;m<EJo1-?anxbUuhMugk1^Meboy*tjT<QKl=WohDqB7og
z>13W+Rd`r$23L%WWSyqHuI9ASHmZjkB&YF8<O3zP^^{NHoa&}STx}mETRg;s&feLj
z`8_vfTO1*Lo6a40_fT_GJe-*zK)6<#s>%8-=`o6%kHt(@*qxGg>XI{e81}x=j;z~#
z`<)`GoO74Zi{Vx@)Ep#Oo08e7rC@hR=^^%g@5oz{ueeBXEs+@4@rEMoinl6V*^=83
ztP96&7!=ZrjI<LH%IutAXy1=q_BBL_hYv|Ol`3i>FDIphAw|qTaivxD&fSELtS(7u
z{-ld}K&Uc3?-Da^=&t1Ab*X2GBZt^Tb9!-(kOE{EbPw-KawwCixeW1#;K;$cI{(|X
zMbB2(o7ig+C<*p$A|pqxk@*z2tW^yWj3ll~h{D=LE^{#=a!D~{?5fsZmK^fjENfcw
SmnZ29W1NoCIpFrm=KlkVWs<i5

literal 0
HcmV?d00001

diff --git a/lang/English/help.php b/lang/English/help.php
deleted file mode 100644
index 2c3ff0fc..00000000
--- a/lang/English/help.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-// Language definitions used in help.php
-$lang_help = array(
-
-'Help'                    =>    'Help',
-'produces'                =>    'produces',
-
-'BBCode'                =>    'BBCode',
-'BBCode info 1'            =>    'BBCode is a collection of formatting tags that are used to change the look of text in this forum. BBCode is based on the same principal as, and is very similar to, HTML. Below is a list of all the available BBCodes and instructions on how to use them.',
-'BBCode info 2'            =>    'Administrators have the ability to enable or disable BBCode. You can tell if BBCode is enabled or disabled out in the left margin whenever you post a message or edit your signature.',
-
-'Text style'            =>    'Text style',
-'Text style info'        =>    'The following tags change the appearance of text:',
-'Bold text'                =>    'Bold text',
-'Underlined text'        =>    'Underlined text',
-'Italic text'            =>    'Italic text',
-'Strike-through text'    =>    'Strike-through text',
-'Red text'                =>    'Red text',
-'Blue text'                =>    'Blue text',
-'Heading text'            =>    'Heading text',
-'Deleted text'            =>    'Deleted text',
-'Inserted text'            =>    'Inserted text',
-'Emphasised text'        =>    'Emphasised text',
-
-'Links and images'        =>    'Links and images',
-'Links info'            =>    'You can create links to other documents or to email addresses using the following tags:',
-'This help page'        =>    'This help page',
-'My email address'        =>    'My email address',
-'Images info'            =>    'If you want to display an image you can use the img tag. The text appearing after the "=" sign in the opening tag is used for the alt attribute and should be included whenever possible.',
-'FluxBB bbcode test'    =>    'FluxBB bbcode test',
-
-'Test topic'            =>    'Test topic',
-'Test post'                =>    'Test post',
-'Test forum'            =>    'Test forum',
-'Test user'                =>    'Test user',
-
-'Quotes'                =>    'Quotes',
-'Quotes info'            =>    'If you want to quote someone, you should use the quote tag.',
-'Quotes info 2'            =>    'If you don\'t want to quote anyone in particular, you can use the quote tag without specifying a name.',
-'Quote text'            =>    'This is the text I want to quote.',
-'produces quote box'    =>    'produces a quote box like this:',
-'quote note'            =>    'Note: If a username contains the characters [ or ] you can enclose it in quote marks.',
-
-'Code'                    =>    'Code',
-'Code info'                =>    'When displaying source code you should make sure that you use the code tag. Text displayed with the code tag will use a monospaced font and will not be affected by other tags.',
-'Code text'                =>    'This is some code.',
-'produces code box'        =>    'produces a code box like this:',
-
-'Nested tags'            =>    'Nested tags',
-'Nested tags info'        =>    'BBCode can be nested to create more advanced formatting. For example:',
-'Bold, underlined text'    =>    'Bold, underlined text',
-
-'Lists'                    =>    'Lists',
-'List info'                =>    'To create a list you can use the list tag. You can create 3 types of lists using the list tag.',
-'List text 1'            =>    'Example list item 1.',
-'List text 2'            =>    'Example list item 2.',
-'List text 3'            =>    'Example list item 3.',
-'produces list'            =>    'produces a bulleted list.',
-'produces decimal list'    =>    'produces a numbered list.',
-'produces alpha list'    =>    'produces an alphabetically labelled list.',
-
-'Smilies'                =>    'Smilies',
-'Smilies info'            =>    'If you like (and if it is enabled), the forum can convert a series of smilies to images representations of that smiley. This forum recognizes the following smilies and replaces them with images:'
-
-);
diff --git a/lang/English/help.po b/lang/English/help.po
new file mode 100644
index 00000000..8947956a
--- /dev/null
+++ b/lang/English/help.po
@@ -0,0 +1,165 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Help"
+msgstr "Help"
+
+msgid "produces"
+msgstr "produces"
+
+msgid "BBCode"
+msgstr "BBCode"
+
+msgid "BBCode info 1"
+msgstr "BBCode is a collection of formatting tags that are used to change the look of text in this forum. BBCode is based on the same principal as, and is very similar to, HTML. Below is a list of all the available BBCodes and instructions on how to use them."
+
+msgid "BBCode info 2"
+msgstr "Administrators have the ability to enable or disable BBCode. You can tell if BBCode is enabled or disabled out in the left margin whenever you post a message or edit your signature."
+
+msgid "Text style"
+msgstr "Text style"
+
+msgid "Text style info"
+msgstr "The following tags change the appearance of text:"
+
+msgid "Bold text"
+msgstr "Bold text"
+
+msgid "Underlined text"
+msgstr "Underlined text"
+
+msgid "Italic text"
+msgstr "Italic text"
+
+msgid "Strike-through text"
+msgstr "Strike-through text"
+
+msgid "Red text"
+msgstr "Red text"
+
+msgid "Blue text"
+msgstr "Blue text"
+
+msgid "Heading text"
+msgstr "Heading text"
+
+msgid "Deleted text"
+msgstr "Deleted text"
+
+msgid "Inserted text"
+msgstr "Inserted text"
+
+msgid "Emphasised text"
+msgstr "Emphasised text"
+
+msgid "Links and images"
+msgstr "Links and images"
+
+msgid "Links info"
+msgstr "You can create links to other documents or to email addresses using the following tags:"
+
+msgid "This help page"
+msgstr "This help page"
+
+msgid "My email address"
+msgstr "My email address"
+
+msgid "Images info"
+msgstr "If you want to display an image you can use the img tag. The text appearing after the \"=\" sign in the opening tag is used for the alt attribute and should be included whenever possible."
+
+msgid "FluxBB bbcode test"
+msgstr "FluxBB bbcode test"
+
+msgid "Test topic"
+msgstr "Test topic"
+
+msgid "Test post"
+msgstr "Test post"
+
+msgid "Test forum"
+msgstr "Test forum"
+
+msgid "Test user"
+msgstr "Test user"
+
+msgid "Quotes"
+msgstr "Quotes"
+
+msgid "Quotes info"
+msgstr "If you want to quote someone, you should use the quote tag."
+
+msgid "Quotes info 2"
+msgstr "If you don't want to quote anyone in particular, you can use the quote tag without specifying a name."
+
+msgid "Quote text"
+msgstr "This is the text I want to quote."
+
+msgid "produces quote box"
+msgstr "produces a quote box like this:"
+
+msgid "quote note"
+msgstr "Note: If a username contains the characters [ or ] you can enclose it in quote marks."
+
+msgid "Code"
+msgstr "Code"
+
+msgid "Code info"
+msgstr "When displaying source code you should make sure that you use the code tag. Text displayed with the code tag will use a monospaced font and will not be affected by other tags."
+
+msgid "Code text"
+msgstr "This is some code."
+
+msgid "produces code box"
+msgstr "produces a code box like this:"
+
+msgid "Nested tags"
+msgstr "Nested tags"
+
+msgid "Nested tags info"
+msgstr "BBCode can be nested to create more advanced formatting. For example:"
+
+msgid "Bold, underlined text"
+msgstr "Bold, underlined text"
+
+msgid "Lists"
+msgstr "Lists"
+
+msgid "List info"
+msgstr "To create a list you can use the list tag. You can create 3 types of lists using the list tag."
+
+msgid "List text 1"
+msgstr "Example list item 1."
+
+msgid "List text 2"
+msgstr "Example list item 2."
+
+msgid "List text 3"
+msgstr "Example list item 3."
+
+msgid "produces list"
+msgstr "produces a bulleted list."
+
+msgid "produces decimal list"
+msgstr "produces a numbered list."
+
+msgid "produces alpha list"
+msgstr "produces an alphabetically labelled list."
+
+msgid "Smilies"
+msgstr "Smilies"
+
+msgid "Smilies info"
+msgstr "If you like (and if it is enabled), the forum can convert a series of smilies to images representations of that smiley. This forum recognizes the following smilies and replaces them with images:"
diff --git a/lang/English/index.mo b/lang/English/index.mo
new file mode 100644
index 0000000000000000000000000000000000000000..c8ab6fe21fdf82315b9166c34d7355ba818d7dc1
GIT binary patch
literal 1064
zcmZvaJC74F5XTK1ujP1GJPIR$#1#$%QA8VpP(pG<%H2iB9-_DcC+p-EcJ0XaavUW!
zqCleI3((Nf(NR(G1*rH0lyp$=_j>nUI!mLUXFQ%6d*;`Lxeo;E4CE^0E#xBPAH=Ok
zhX@J4K6na@N<ITmLr=lu;Oo-<rsO+t9`=u={s}w={Y%NO;7RD;K<D=Z9729V&O=`~
zLdZF=37!Q9ptG-oCqM~a1~<V=;QLbl3|@!+9dvd523_7ipo{kxyaLY85rS03yPcm~
zFcoh)T4;nE2H{@ZcR8!&>UMwO{>9Z^thVAhriq*=;<v_fYe+Yn*)2M9hh#Aq#u}<*
znn*zgiF`q=BFkbEW||wJ$+DtqLT3tY<=(1UGOiToW5|lXANi9t*nC>I+m1d=bInuM
zQ#vytm9s)MtvgNXx2>C!UTe|%LNgd@^<0cC>&NT~A|y(Nv?sXT5W3wChAR>4XsEEW
zhun&g!p2s`%fz`>rU5sWMVd>Ka;r3)23$^aJ{2qyJlhqK-s5qW$OjXjVl=8LJ-r_+
z^_RLk`RldYK}Sg|B%*H3kkpD-_SP)riEPsG2G>T|)>_nKjU7LieIhjL%CU+QISpxJ
zl-TV;LMmkNlr0J=w6AffM4VV!uQh6SapG0>Smk;wIzC58eUh@NuD?1fK4Vv#6JuSI
z$`LSBxTe?k_B*6EOx5$SYPuFv+!b2HMgI$*NLijznP($3wwi_mPyB2gc(gAtMgZCU
T;DluV<Wvt@-CIpHOU2#);DZp(

literal 0
HcmV?d00001

diff --git a/lang/English/index.php b/lang/English/index.php
deleted file mode 100644
index 2089a2bb..00000000
--- a/lang/English/index.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-// Language definitions used in index.php
-$lang_index = array(
-
-'Topics'        =>    'Topics',
-'Link to'        =>    'Link to:', // As in "Link to: http://fluxbb.org/"
-'Empty board'    =>    'Board is empty.',
-'Newest user'    =>    'Newest registered user: %s',
-'Users online'    =>    'Registered users online: %s',
-'Guests online'    =>    'Guests online: %s',
-'No of users'    =>    'Total number of registered users: %s',
-'No of topics'    =>    'Total number of topics: %s',
-'No of posts'    =>    'Total number of posts: %s',
-'Online'        =>    'Online:', // As in "Online: User A, User B etc."
-'Board info'    =>    'Board information',
-'Board stats'    =>    'Board statistics',
-'User info'        =>    'User information'
-
-);
diff --git a/lang/English/index.po b/lang/English/index.po
new file mode 100644
index 00000000..1413e4ae
--- /dev/null
+++ b/lang/English/index.po
@@ -0,0 +1,54 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Topics"
+msgstr "Topics"
+
+msgid "Link to"
+msgstr "Link to:"
+
+msgid "Empty board"
+msgstr "Board is empty."
+
+msgid "Newest user"
+msgstr "Newest registered user: %s"
+
+msgid "Users online"
+msgstr "Registered users online: %s"
+
+msgid "Guests online"
+msgstr "Guests online: %s"
+
+msgid "No of users"
+msgstr "Total number of registered users: %s"
+
+msgid "No of topics"
+msgstr "Total number of topics: %s"
+
+msgid "No of posts"
+msgstr "Total number of posts: %s"
+
+msgid "Online"
+msgstr "Online:"
+
+msgid "Board info"
+msgstr "Board information"
+
+msgid "Board stats"
+msgstr "Board statistics"
+
+msgid "User info"
+msgstr "User information"
diff --git a/lang/English/install.mo b/lang/English/install.mo
new file mode 100644
index 0000000000000000000000000000000000000000..1052a5282505b5b50a975dbac3799dc91ed6dd13
GIT binary patch
literal 9441
zcmc(kS&SV=6^1(`0b&A#gq;9olVNO_xsG=;UdW7>WMC#9>~R)C2t9r4-rKlu_och9
z#}h#S<q5G!2$4iY3IYiM4+sGgFA)zQfgleE1QJ4Gd4nLaDDZ$lV)@Rg>SY!?@PN2-
z&EH#9ojT_~OO=0h<29cS_}x#tnRd<9LGVHF_t)}=-_y?vf|r87178UK6TAt${`o=h
za?pS;0uO=LgQvk4fam=E1K>-zPyGEu;5P0*3i2;_gg^5Bv!L|*n#XT}FXsLS;48qN
zgCgHE;0@r5u5<lf559)`J)p?72)+yq{rgo=<o<}ie-wNr_g@A@?(g{bKlbl`4a)e>
z_~*|-Sdr@nQ2N~r%DNALGT#FDT<|@h=&A4DzaM-R_n!hq?yrD1f=_|c@0Xyc_!&_8
z|JCC^K~x-E%cO!Y^!PH5uLb4%36E1A_j#Q0IP38ak7q!J4(<YF+z^y?#-Paapnv`e
zkB@+;Ab0|leqRDb{%?TN?|Y!=?`I$;34R00IDZ1gZdXGFd43Zp-`xz#dfyDn`#t{o
zEGYI_0{Iubn?Ewo1^@gZQ0D&_DDpfCie5kGpFipGdmex6@fRL{>+#Q^tot7zA_mto
zsqo|_;L=q=FbRtNE+MSQ^Knq#KMsoBzXtLzc#1zc-~Sx^3-=2s<4xS(28p}eUqJZR
zf<FR9?mvQOz`udp!FiM<^I!0|3W`1+26up;0xy8y1Vzs~5K8*(19ySv!PkQy1cmpX
z1>XQZ35wjm2F0KL0E*oI0!8juvKV<k3CjBepp1XJe|`@re%1q}-$USD@KJC#_!Rgi
z@bBP#takz@5I^`ZokH+2@ICS#WU0Y@3?lNTpxFH}P<Z<UI0t?K+y_1lo&;~ksNV)d
z@Dt!0UL6ESz^{Ynz(0aB;2ewI4}Ji=OWuQ1;B`3Jqu@dCqu>ugmL9wlW5_x)P{#QX
zC_MNn_(|{=pztbvowL^^P~?9Y{4V$i$S1+OP`dE>L69W|4}%tb927fWWt^R^2T@Vb
z0fnb0!D;Z_py>Z&AQTKf13nKuei4-CU)}D;`Ig7;gVO&ep!EL(DEfL0Bw@<n3@G-=
zz*FGo!Mnky!S92&L5f4*b+^C~a2C7@6xrk_91#1+@2msm$#eYmtsp8_+ljow0nxkY
z;vntKG=>b`LKC|z(T>rM(5|70?&WvdLC^t3|Lvcw?|A!xzZQMo=dZ;UV&?<2J881k
zx6{OiduWGgb2QP3{BEKhrM;1M4-K`ceF4=Yv``)|gKv|E{NCX}^>?1@MH*&TyW9(+
zQss~VPte{;6Wv0+V1g#RxS#e`+9XZ<S$=0|SJQ-_^1I!E@_pW4w?X_#ezOkrFYXa6
z&|W~>NfRHEpV(gb(EbT8@1VWQKfKK&RAA8VFizv5%)>IyQd8J+JZeA8^7VJd4#POv
z@N8VzJPn6-{o^8-O>AD8@M2ho45K$u7!CMNug9Y#3%lIpHtepMI4#OBNi0v&G#jUp
z9on=EW=A6%<{`JiTv%9h{_H|9mxX!PbZrsk@kj*sPn`JfZ5fw|4NeTgv~Nwq-*MQN
z`z&J+Ki9K9=fhqWoXFB%oDa<?EQ-}E?*=F5Ou06)Ce2E7F-&5fu*MY;50P!I-SVO8
zwAlDgHMQaUQEq$jrRK{)R+Q_%TYuL`Qq7AAE;8}vj!q}_d?I%<Pi?uAwik|*vQbF&
zpeWZ+<H?q)PiCvB7|ukZmVRe67@1zoN2l^U%dyIak=8$U<LR>^ICTl?#cAK5yae6J
z0KsV+mIIs5&6#<}2vuY2ac`U?ZMrla24P`VtW7KX!ll!38YX(5k0YT<5!`N5o9n|~
z=8Y8GKDI^a{uaSJMmKvrRCvJOAM$wE;a&&(9PD@Czdh*gd=Kf6W>6>V^|(~BSJ>!%
zF^pkQDttFXTNFatMLS%vc>((StjhvQbhTJr@p8>Hia4F+<6&@TW|+=iV!T3E&Vv<o
z9p@ZN6`!k%LKzKjqd~Bwlr*_jW_5$J_I=|xN2ApRMz;yK<HQ!hIh)w1G+j@};M^d?
z^=q1*BLb9_Rf1);w&#5N#xr0UTbL*;Z9mJ`0=>ghEJ!a$_(rfihzrBN_m25AG^O-#
z-<<cs2m{uadz;IB&E@{)@<4NWFu2<$QARYoJI|n|3wZZtV-x1q<l{6I!aAxhC1Z#*
zjkbryj7dj&TO8Ya#JJ02J5#g$nAx-I$hM_CdoLQAp6^cIg)K41Ok=NYOJ|m+PY?!$
zpwsxOoiRL{K5H+=@@e&GAuP)2WrAUmi23<w!3VbKWg8A#BbuY3ME2Wy&Y4zLI$7R7
zzHM=S@l-Sap3be?h;7h=QHcvP=<!mydz8SzBPJSzIl<%D`Q_8ohnw$Y_MXkBPo+`T
zMHMsV@Jd|Pg3J&Bx7{=Cd`x9r%4|0-&7RKT&VJsw+v#)JIFBshS>~8AZjyEaVcE}~
zjwXw(5)x1Az}8A|87_2`REJfMFAuCwOr{H~BP1oH6eb$yIqD$3NNiutV~tGPkM8#U
z%zV$R!G+Z@Ep?K@lsFZGNdV*0B{f3?i*rMytY(RacyghAhr-#y>gOn?9E9@6wgfq9
zhsP(1qq_kSsuIJjteK@dmO4h*7=<ZOLy}G8avGBt;l+Ace!>_D7`cbZSXXO~og#s1
zXZIP+p~bF_!DAS1m~~|-7)Ip^N25F&<uQ}B`j2crj0=q`9nlICb+hqGIn@ks>!Cx3
zI_p%f>Ay9|f28r$kaJll{@u8Y2-u@Y(6UA3vw5;Mbp<`D)-lv3W&SVMe44!IDNz{o
zNG0R>(v1s>oov;14MZ;`oVgVKKj0eaMA-?)BvC)$I11S{ffK@1iI`h+F@{u<oskqI
z-`5Km2)#7Fx)Hlm6}#&ZAtgHYuZ0sW|HGpzs_m9kH72)of_e3YVPTT^f^FFsg@hX`
zL&yALkd2eB>1PBvGayYJ+tKOlj?=EaB*n;%<5Um!=<X2TA<I%*c7jt{mEpL#30uXb
zkuN*#5>w&=6{gv_8kbCi1LV}Z67dPS#b6i7TYR`pL`^##qZz3pS(Fh*qO!BOQZ+k^
z@n}SHEX*CtiwnE{+sah}MOD4J^0%oSMEI)GmEhD>mr-u5?;_IT%Nr`Sb{Fidg+g2w
zHtA`w!LAY!RxGUTY_5qXCyGf4RuVTuR~6UgfL6<GBUE)l9j7r%w<#B#xn!wQ_SQPD
zdijy6TVFl;dZK0O`h&|B$N%4|dLix)B!H6vBue{S-3cyRVQ*<Q!hb=@+s$l|PC93j
z7-OZj?ocQ-hSu6!(#5lU-^(O2)nyJgwQz|sp@3($?al<VUh$Fc+6)Actm{}%xh_Uw
zGAaFBXs)&^!WQo{k$Uscq61BZO%=OU2p|`@&q9cX`<hW~iBq^`k@d<|snO`>>5kOG
zD;{J~G#;(VlCqSqb2H5Nl3qeGxBCz-6s-W1yMnjS>{jP|v{3odkPTBjB0feLLNG_K
z)!Q$)5dKy?oNCg)&)MzN?4<B4Zj>;;^(Ls^>TK8zZP(&p7)k-Ndbt2e=wuzTbPZmt
zh}bC+vlBEE*E7`0#9$;{*-*s~qBXkvS1y5|3fTcW_SCPdZC4dIw%CxhTvnqF^_y-`
z)Of93erNqQZ8njO9V>7fZL><a@I;NImZlVv6qgc+rI?h6?qYXkj}F@w&3T0eN{#C(
zKvQ8+1k3q>#?VBntxm8QlBe`rr#!iYBqv-I7B&%Bs23XNbbRXixbcH4DbmrTUP=;2
z7hH`%P#%{hOVJoCChS&waiWK0YVV58&fKj8Q>C?T>IxON&`zETc}C=Jis8+Pu5Ij2
zpyh$Mg;oV_Q2ec#daC6Ot1-4BdTb)=tgnAZ8QWg(A8_|FiTw(^^&3ze%7>VaxtoOL
za;-V{j)l0iQ)Y3EE2Y&EyU2cSx$Ok^vI<{RAY)a@_qF`hV8U@gFVBX~f~$5#k6ETn
z+%rjr%H_~S<FDH^WcdXbcdO(jo>GY=W4PS|YWEs#DJn}<oZL$)0aZt7r$@6h?x#L{
zxrObbjB4#m7@2*lspC`Q(`^$<loWmv6k$#!pOo)4<w^6-kz@rNFRekCTsGVhL7S)!
z6@~q-R`7z?A~zacvE{0q%IsCm?>!(><Y9z2QT4GKQ<4(N{c!|>Gly7$^C&_}X%24g
zahB6TITgV*`K;<n%}7{}2t(7Pogyydi_~}i+(j~^T8N#`(5EwBsdmhg3tmlJt};~;
zu2r+t11RPFsGed|l2m-5U7hoI?Ksl88l*n(X>2kf2Tpn#REG}D+8SNlf=WB2WDN6|
zeW|#-hN~gFbbnG*i(g`*u+Ix;+n!xDoC1tF9wBb|QzT)#E}$4k5hqF;e6k@URKPgw
z4#q@2B51MQ+(}MJvc8T^bQ@4yn@r9feGJh<hvqn${%p4s%#+$gzH!lk!r$>mmxyH5
zDOPi}<$0Et*z8Tv^Tn8Lyqpg=e&^Su#kDFZOxLOmU$L9SB6Mk#UlrqMkZ~pE>V|&P
zSeE3$GS!q*rU@Qmb?1YklgsQ=p|W>8%U(qEuM9_eh78+Ba-Cpl^O;;XQ`YLSoC_@N
zQo&3X?@I`74`}sW9oMM>a78&X5a;zW+O!|1wx&zN_WFRp*B?8pQ@&jR5isN!(4GDf
z066rMwQ5SlfWvjWt6WY4bz4;(32K0-^zSwT)f$Wc#M6T-ogK2W^}3Kvh_DV9AinXx
z34IQFTj2(Cv7R!^eBfDT1h-@}B=7jHs<MRIKq3^Ui<x<ltuAy*$9fX0aZJ=Yrf|v&
zYGQ&;71N}wwQFu^12*{L9<nLI#W@4jDkSs+>8DJ5DISi8#JaRkiGqClZ*7L7wAd7z
zHd;&1MK60`T2h`ygcM0-S2{7>!W?^BayX6E2c`aNSsDD+a$5H>TZDHFXLVla%Tc>X
zQgOA@9#acf9a1@_73xsjnC-#*k_o$Ax)IIJ`^<<KzDs30b|Y%P+8~9QoH9GqX7`D|
z-Y<zI<8<SSqcp)o4n@VEa6tc`75&2OoSQpA*xJQZj3!*rU?v+{q!S;POcbu@8NwEs
zo?S&1FQAtX4^3cdZxym3l{M9@pJb@pa2eNa#j7Jp%YiIOSwaf3%aLCk$qog7RMJUz
zKaYm<DGsT%VCMvdPCkNnvuG@FRX=gjrWMpB$B}oE$_`r1XdI*T6Mm)o-(igcs`K)R
zJ+~B6LCATbnb>;^tZstv#6DhD+pQ++YoCezyhAoAXsTmASJY|@9gj#*U7t?0Lwkv6
R2&?E@J;D%*kPb2YzX2gx-ueIl

literal 0
HcmV?d00001

diff --git a/lang/English/install.php b/lang/English/install.php
deleted file mode 100644
index 595480f9..00000000
--- a/lang/English/install.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-// Language definitions used in install.php, localized by adaur
-
-$lang_install = array(
-
-'Choose install language'        =>    'Choose the install script language',
-'Choose install language info'    =>    'The language used for this install script. The default language used for the board itself can be set below.',
-'Install language'                =>    'Install language',
-'Change language'                =>    'Change language',
-'Already installed'                =>    'It seems like FeatherBB is already installed. You should go <a href="../index.php">here</a> instead.',
-'You are running error'            =>    'You are running %1$s version %2$s. FeatherBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue.',
-'My FeatherBB Forum'            =>    'My FeatherBB Forum',
-'Description'                    =>    'Lighter than a feather.',
-'Username 1'                    =>    'Usernames must be at least 2 characters long.',
-'Username 2'                    =>    'Usernames must not be more than 25 characters long.',
-'Username 3'                    =>    'The username guest is reserved.',
-'Username 4'                    =>    'Usernames may not be in the form of an IP address.',
-'Username 5'                    =>    'Usernames may not contain all the characters \', " and [ or ] at once.',
-'Username 6'                    =>    'Usernames may not contain any of the text formatting tags (BBCode) that the forum uses.',
-'Short password'                =>    'Passwords must be at least 6 characters long.',
-'Passwords not match'            =>    'Passwords do not match.',
-'Wrong email'                    =>    'The administrator email address you entered is invalid.',
-'No board title'                =>    'You must enter a board title.',
-'Error default language'        =>    'The default language chosen doesn\'t seem to exist.',
-'Error default style'            =>    'The default style chosen doesn\'t seem to exist.',
-'No DB extensions'                =>    'This PHP environment does not have support for any of the databases that FeatherBB supports. PHP needs to have support for either MySQL, PostgreSQL or SQLite in order for FeatherBB to be installed.',
-'Administrator username'        =>    'Administrator\'s username',
-'Administrator email'            =>    'Administrator\'s email',
-'Board title'                    =>    'Board title',
-'Base URL'                        =>    'The URL (without trailing slash) of your FeatherBB forum. This must be correct.',
-'Required field'                =>    'is a required field in this form.',
-'FeatherBB Installation'            =>    'FeatherBB Installation',
-'Welcome'                        =>    'You are about to install FeatherBB. In order to install FeatherBB, you must complete the form set out below. If you encounter any difficulties with the installation, please refer to the documentation.',
-'Install'                        =>    'Install FeatherBB %s',
-'Errors'                        =>    'The following errors need to be corrected:',
-'Database setup'                =>    'Database setup',
-'Info 1'                        =>    'All information we need to create a connection with your database.',
-'Select database'                =>    'Select your database type',
-'Info 2'                        =>    'Select a database. We support SQLite, MySQL and PostgreSQL.',
-'Database type'                    =>    'Database type',
-'Required'                        =>    '(Required)',
-'Database hostname'                =>    'Enter your database server hostname',
-'Info 3'                        =>    'You should be able to get this info from your web host, if localhost does not work.',
-'Database server hostname'        =>    'Database server hostname',
-'Database enter name'            =>    'Enter the name of your database',
-'Info 4'                        =>    'The name of the database you want to install FeatherBB on.',
-'Database name'                    =>    'Database name',
-'Database enter informations'    =>    'Enter your database username and password',
-'Database username'                =>    'Database username',
-'Info 5'                        =>    'Your MySQL username and password (ignore of SQLite).',
-'Database password'                =>    'Database password',
-'Database enter prefix'            =>    'Enter database table prefix',
-'Info 6'                        =>    'If you want to run multiple FeatherBB installations in a single database, change this.',
-'Table prefix'                    =>    'Table prefix',
-'Administration setup'            =>    'Administration setup',
-'Info 7'                        =>    'Create the very first account on your board.',
-'Info 8'                        =>    'Your username should be between 2 and 25 characters long. Your password must be at least 6 characters long. Remember that passwords are case-sensitive.',
-'Password'                        =>    'Password',
-'Confirm password'                =>    'Confirm password',
-'Board setup'                    =>    'Board setup',
-'Info 11'                        =>    'Settings for your board. You can change this later.',
-'General information'            =>    'Enter your board\'s title and description.',
-'Board description'                =>    'Board description (supports HTML)',
-'Appearance'                    =>    'Appearance',
-'Info 15'                        =>    'Make your forum yours. Choose a language and a style for your board.',
-'Default language'                =>    'Default language',
-'Default style'                    =>    'Default style',
-'Start install'                    =>    'Start install',
-'DB type not valid'                =>    '\'%s\' is not a valid database type',
-'Table prefix error'            =>    'The table prefix \'%s\' contains illegal characters or is too long. The prefix may contain the letters a to z, any numbers and the underscore character. They must however not start with a number. The maximum length is 40 characters. Please choose a different prefix',
-'Prefix reserved'                =>    'The table prefix \'sqlite_\' is reserved for use by the SQLite engine. Please choose a different prefix',
-'Existing table error'            =>    'A table called \'%susers\' is already present in the database \'%s\'. This could mean that FeatherBB is already installed or that another piece of software is installed and is occupying one or more of the table names FeatherBB requires. If you want to install multiple copies of FeatherBB in the same database, you must choose a different table prefix',
-'InnoDB off'                    =>    'InnoDB does not seem to be enabled. Please choose a database layer that does not have InnoDB support, or enable InnoDB on your MySQL server',
-'Administrators'                =>    'Administrators',
-'Administrator'                    =>    'Administrator',
-'Moderators'                    =>    'Moderators',
-'Moderator'                        =>    'Moderator',
-'Guests'                        =>    'Guests',
-'Guest'                            =>    'Guest',
-'Members'                        =>    'Members',
-'Announcement'                    =>    'Enter your announcement here.',
-'Rules'                            =>    'Enter your rules here',
-'Maintenance message'            =>    'The forums are temporarily down for maintenance. Please try again in a few minutes.',
-'Test post'                        =>    'Test topic',
-'Message'                        =>    'You have successfully installed FeatherBB, congratulations! Now log in and head over to the administration control panel to configure your forum.',
-'Test category'                    =>    'Test category',
-'Test forum'                    =>    'Test forum',
-'This is just a test forum'        =>    'This is just a test forum',
-'Alert cache'                    =>    '<strong>The cache directory is currently not writable!</strong> In order for FeatherBB to function properly, the directory <em>%s</em> must be writable by PHP. Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777.',
-'Alert avatar'                    =>    '<strong>The avatar directory is currently not writable!</strong> If you want users to be able to upload their own avatar images you must see to it that the directory <em>%s</em> is writable by PHP. You can later choose to save avatar images in a different directory (see Admin/Options). Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777.',
-'Alert upload'                    =>    '<strong>File uploads appear to be disallowed on this server!</strong> If you want users to be able to upload their own avatar images you must enable the file_uploads configuration setting in PHP. Once file uploads have been enabled, avatar uploads can be enabled in Administration/Options/Features.',
-'FeatherBB has been installed'        =>    'FeatherBB has been installed. To finalize the installation please follow the instructions below.',
-'Final instructions'            =>    'Final instructions',
-'Info 17'                        =>    'To finalize the installation, you need to click on the button below to download a file called config.php. You then need to upload this file to the root directory of your FeatherBB installation.',
-'Info 18'                        =>    'Once you have uploaded config.php, FeatherBB will be fully installed! At that point, you may <a href="../index.php">go to the forum index</a>.',
-'Download config.php file'        =>    'Download config.php file',
-'FeatherBB fully installed'        =>    'FeatherBB has been fully installed! You may now <a href="../index.php">go to the forum index</a>.',
-
-);
diff --git a/lang/English/install.po b/lang/English/install.po
new file mode 100644
index 00000000..03f10123
--- /dev/null
+++ b/lang/English/install.po
@@ -0,0 +1,291 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Choose install language"
+msgstr "Choose the install script language"
+
+msgid "Choose install language info"
+msgstr "The language used for this install script. The default language used for the board itself can be set below."
+
+msgid "Install language"
+msgstr "Install language"
+
+msgid "Change language"
+msgstr "Change language"
+
+msgid "Already installed"
+msgstr "It seems like FeatherBB is already installed. You should go <a href=\"../index.php\">here</a> instead."
+
+msgid "You are running error"
+msgstr "You are running %1$s version %2$s. FeatherBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue."
+
+msgid "My FeatherBB Forum"
+msgstr "My FeatherBB Forum"
+
+msgid "Description"
+msgstr "Lighter than a feather."
+
+msgid "Username 1"
+msgstr "Usernames must be at least 2 characters long."
+
+msgid "Username 2"
+msgstr "Usernames must not be more than 25 characters long."
+
+msgid "Username 3"
+msgstr "The username guest is reserved."
+
+msgid "Username 4"
+msgstr "Usernames may not be in the form of an IP address."
+
+msgid "Username 5"
+msgstr "Usernames may not contain all the characters ', \" and [ or ] at once."
+
+msgid "Username 6"
+msgstr "Usernames may not contain any of the text formatting tags (BBCode) that the forum uses."
+
+msgid "Short password"
+msgstr "Passwords must be at least 6 characters long."
+
+msgid "Passwords not match"
+msgstr "Passwords do not match."
+
+msgid "Wrong email"
+msgstr "The administrator email address you entered is invalid."
+
+msgid "No board title"
+msgstr "You must enter a board title."
+
+msgid "Error default language"
+msgstr "The default language chosen doesn't seem to exist."
+
+msgid "Error default style"
+msgstr "The default style chosen doesn't seem to exist."
+
+msgid "No DB extensions"
+msgstr "This PHP environment does not have support for any of the databases that FeatherBB supports. PHP needs to have support for either MySQL, PostgreSQL or SQLite in order for FeatherBB to be installed."
+
+msgid "Administrator username"
+msgstr "Administrator's username"
+
+msgid "Administrator email"
+msgstr "Administrator's email"
+
+msgid "Board title"
+msgstr "Board title"
+
+msgid "Base URL"
+msgstr "The URL (without trailing slash) of your FeatherBB forum. This must be correct."
+
+msgid "Required field"
+msgstr "is a required field in this form."
+
+msgid "FeatherBB Installation"
+msgstr "FeatherBB Installation"
+
+msgid "Welcome"
+msgstr "You are about to install FeatherBB. In order to install FeatherBB, you must complete the form set out below. If you encounter any difficulties with the installation, please refer to the documentation."
+
+msgid "Install"
+msgstr "Install FeatherBB %s"
+
+msgid "Errors"
+msgstr "The following errors need to be corrected:"
+
+msgid "Database setup"
+msgstr "Database setup"
+
+msgid "Info 1"
+msgstr "All information we need to create a connection with your database."
+
+msgid "Select database"
+msgstr "Select your database type"
+
+msgid "Info 2"
+msgstr "Select a database. We support SQLite, MySQL and PostgreSQL."
+
+msgid "Database type"
+msgstr "Database type"
+
+msgid "Required"
+msgstr "(Required)"
+
+msgid "Database hostname"
+msgstr "Enter your database server hostname"
+
+msgid "Info 3"
+msgstr "You should be able to get this info from your web host, if localhost does not work."
+
+msgid "Database server hostname"
+msgstr "Database server hostname"
+
+msgid "Database enter name"
+msgstr "Enter the name of your database"
+
+msgid "Info 4"
+msgstr "The name of the database you want to install FeatherBB on."
+
+msgid "Database name"
+msgstr "Database name"
+
+msgid "Database enter informations"
+msgstr "Enter your database username and password"
+
+msgid "Database username"
+msgstr "Database username"
+
+msgid "Info 5"
+msgstr "Your MySQL username and password (ignore of SQLite)."
+
+msgid "Database password"
+msgstr "Database password"
+
+msgid "Database enter prefix"
+msgstr "Enter database table prefix"
+
+msgid "Info 6"
+msgstr "If you want to run multiple FeatherBB installations in a single database, change this."
+
+msgid "Table prefix"
+msgstr "Table prefix"
+
+msgid "Administration setup"
+msgstr "Administration setup"
+
+msgid "Info 7"
+msgstr "Create the very first account on your board."
+
+msgid "Info 8"
+msgstr "Your username should be between 2 and 25 characters long. Your password must be at least 6 characters long. Remember that passwords are case-sensitive."
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Confirm password"
+msgstr "Confirm password"
+
+msgid "Board setup"
+msgstr "Board setup"
+
+msgid "Info 11"
+msgstr "Settings for your board. You can change this later."
+
+msgid "General information"
+msgstr "Enter your board's title and description."
+
+msgid "Board description"
+msgstr "Board description (supports HTML)"
+
+msgid "Appearance"
+msgstr "Appearance"
+
+msgid "Info 15"
+msgstr "Make your forum yours. Choose a language and a style for your board."
+
+msgid "Default language"
+msgstr "Default language"
+
+msgid "Default style"
+msgstr "Default style"
+
+msgid "Start install"
+msgstr "Start install"
+
+msgid "DB type not valid"
+msgstr "'%s' is not a valid database type"
+
+msgid "Table prefix error"
+msgstr "The table prefix '%s' contains illegal characters or is too long. The prefix may contain the letters a to z, any numbers and the underscore character. They must however not start with a number. The maximum length is 40 characters. Please choose a different prefix"
+
+msgid "Prefix reserved"
+msgstr "The table prefix 'sqlite_' is reserved for use by the SQLite engine. Please choose a different prefix"
+
+msgid "Existing table error"
+msgstr "A table called '%susers' is already present in the database '%s'. This could mean that FeatherBB is already installed or that another piece of software is installed and is occupying one or more of the table names FeatherBB requires. If you want to install multiple copies of FeatherBB in the same database, you must choose a different table prefix"
+
+msgid "InnoDB off"
+msgstr "InnoDB does not seem to be enabled. Please choose a database layer that does not have InnoDB support, or enable InnoDB on your MySQL server"
+
+msgid "Administrators"
+msgstr "Administrators"
+
+msgid "Administrator"
+msgstr "Administrator"
+
+msgid "Moderators"
+msgstr "Moderators"
+
+msgid "Moderator"
+msgstr "Moderator"
+
+msgid "Guests"
+msgstr "Guests"
+
+msgid "Guest"
+msgstr "Guest"
+
+msgid "Members"
+msgstr "Members"
+
+msgid "Announcement"
+msgstr "Enter your announcement here."
+
+msgid "Rules"
+msgstr "Enter your rules here"
+
+msgid "Maintenance message"
+msgstr "The forums are temporarily down for maintenance. Please try again in a few minutes."
+
+msgid "Test post"
+msgstr "Test topic"
+
+msgid "Message"
+msgstr "You have successfully installed FeatherBB, congratulations! Now log in and head over to the administration control panel to configure your forum."
+
+msgid "Test category"
+msgstr "Test category"
+
+msgid "Test forum"
+msgstr "Test forum"
+
+msgid "This is just a test forum"
+msgstr "This is just a test forum"
+
+msgid "Alert cache"
+msgstr "<strong>The cache directory is currently not writable!</strong> In order for FeatherBB to function properly, the directory <em>%s</em> must be writable by PHP. Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777."
+
+msgid "Alert avatar"
+msgstr "<strong>The avatar directory is currently not writable!</strong> If you want users to be able to upload their own avatar images you must see to it that the directory <em>%s</em> is writable by PHP. You can later choose to save avatar images in a different directory (see Admin/Options). Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777."
+
+msgid "Alert upload"
+msgstr "<strong>File uploads appear to be disallowed on this server!</strong> If you want users to be able to upload their own avatar images you must enable the file_uploads configuration setting in PHP. Once file uploads have been enabled, avatar uploads can be enabled in Administration/Options/Features."
+
+msgid "FeatherBB has been installed"
+msgstr "FeatherBB has been installed. To finalize the installation please follow the instructions below."
+
+msgid "Final instructions"
+msgstr "Final instructions"
+
+msgid "Info 17"
+msgstr "To finalize the installation, you need to click on the button below to download a file called config.php. You then need to upload this file to the root directory of your FeatherBB installation."
+
+msgid "Info 18"
+msgstr "Once you have uploaded config.php, FeatherBB will be fully installed! At that point, you may <a href=\"../index.php\">go to the forum index</a>."
+
+msgid "Download config.php file"
+msgstr "Download config.php file"
+
+msgid "FeatherBB fully installed"
+msgstr "FeatherBB has been fully installed! You may now <a href=\"../index.php\">go to the forum index</a>."
diff --git a/lang/English/login.mo b/lang/English/login.mo
new file mode 100644
index 0000000000000000000000000000000000000000..cef79b30ccc81bc7fe3d011101c52b6cfabb7959
GIT binary patch
literal 1877
zcmZWp%Z?m16g4Egns*`r3nXrkK!B(kIs$3bLlcr=1`V1Ft<VG(2;{E1U2RfrH@0h<
z*|A^&Ym@~`P(A?Gh&@{*BzA212E>MQ%l!-`RUP}5eeSsr`>zY<Z!0`c;(ZqH9lTHD
zef1uE@O%S&82If1Zv!90{0CqM_!ICE;4cgNZ@|Yf{}Xr-_%~4a{$2dPcyHSOJWzPM
zK-u31iiY=qvhNe1@XUY%?EMP(HRivcQ|d?H&GSk<1N;a08Suh=O1%j5K=JoIQ22ia
zJ_Y<0cntglco}%<{^Vx}d<F9f@Co2|z)yj9fL-9Z2b6ja_y!O%6lAmy+_wB!rXEVB
z)%Q`1;HHg7as<h%M`8k1>r3+ZAYO@I9Za>UX<R#3szc{1jwF_L>|$g~GaZ6Dc9pSY
z?AR@aHCJrQ#l&-IJQq=>u8FjopYXihKX<+)_TKrRHf_n2cuyR0D`u)=F;OQ@cq$Vj
zgHGMxDNjf2Y04OX(Qt@K+2$k>ZCMsNKl092)CBfBZ9Idz@w(0s@ig?v&f00{U*4lM
z?7w8`QlGjn?{x;=eU8|&qcXe6J{V_vbjUhR*k8NW8N5Ht_C2PsXYc69J%TN}!KX%+
zE=|We#BAub4YiKWW6`m;Rii7;hODO>jP#~1r^dcLPA*2H994O%bN%T0!P<W}f336c
zEXo7cvl*O5{xa^&YHjQu6%*|P$Nq=I!)$lGPP~uVX9u=$rLk3yc1I?zg!G7Q=i}^M
zw(OI}fkRy*b@Sc)b^J-w>;u>Mg7=e;9wjGgI5B~AQMkrNnrMt`WTiYq4clUINqXH1
zo}mxbB4kml*aFs^1~u!zG}mzZLLlU!i5zIeW9NBE1?k|jo2{iQ1fHv_cF{s2V8m$N
zfDBP|t)DRC!i<e5DN85_G&gYq6(RbjkOBsB7E0!_14*<M(;0NFbmw$5CP*tCL|HVb
z_THSfi>T0+3Y0__aEPd&xS7HeVn7eK86_Pz&eaz46$NHkkUH=Q^}6@T`D6xVmCoeW
zUMgx++!E>HSI=hN&AdS?Qf=%l<e_%+TpgfWd<sX7fz?y2wdE?dv`$WNg$$uIp(zR^
zY24KHS-!O6bmwY-8=*bXi`u4>jTVroYj~3iwMQFO;xb4&M~v)vxg@~8sOMcplni2-
zl&mLYs5pAcy7t&^=A$i}#G3AlMK$lbG3bor6_Je_L&DKbbhueep%D+UE+!NWejSmV
zR7ACTZAf(L>UNJshszPFQrGB|TttR~n^VcQDB9}ExvA@AM5zfiS|;`0vLOEpBhk+%
Z1_Gra)_tJXm)Np;J7^8L&qQyo{sSF<EA0RP

literal 0
HcmV?d00001

diff --git a/lang/English/login.php b/lang/English/login.php
deleted file mode 100644
index d4a10755..00000000
--- a/lang/English/login.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-// Language definitions used in login.php
-$lang_login = array(
-
-// Miscellaneous
-'Wrong user/pass'            =>    'Wrong username and/or password.',
-'Forgotten pass'            =>    'Forgotten your password?',
-'Login redirect'            =>    'Logged in successfully.',
-'Logout redirect'            =>    'Logged out.',
-'No email match'            =>    'There is no user registered with the email address',
-'Request pass'                =>    'Request password',
-'Request pass legend'        =>    'Enter the email address with which you registered',
-'Request pass info'            =>    'A new password together with a link to activate the new password will be sent to that address.',
-'Not registered'            =>    'Not registered yet?',
-'Login legend'                =>    'Enter your username and password below',
-'Remember me'                =>    'Log me in automatically each time I visit.',
-'Login info'                =>    'If you have not registered or have forgotten your password click on the appropriate link below.',
-'New password errors'        =>    'Password request error',
-'New passworderrors info'    =>    'The following error needs to be corrected before a new password can be sent:',
-
-// Forget password mail stuff
-'Forget mail'                =>    'An email has been sent to the specified address with instructions on how to change your password. If it does not arrive you can contact the forum administrator at',
-'Email flood'                =>    'This account has already requested a password reset in the past hour. Please wait %s minutes before requesting a new password again.'
-
-);
diff --git a/lang/English/login.po b/lang/English/login.po
new file mode 100644
index 00000000..059c8920
--- /dev/null
+++ b/lang/English/login.po
@@ -0,0 +1,63 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Wrong user/pass"
+msgstr "Wrong username and/or password."
+
+msgid "Forgotten pass"
+msgstr "Forgotten your password?"
+
+msgid "Login redirect"
+msgstr "Logged in successfully."
+
+msgid "Logout redirect"
+msgstr "Logged out."
+
+msgid "No email match"
+msgstr "There is no user registered with the email address"
+
+msgid "Request pass"
+msgstr "Request password"
+
+msgid "Request pass legend"
+msgstr "Enter the email address with which you registered"
+
+msgid "Request pass info"
+msgstr "A new password together with a link to activate the new password will be sent to that address."
+
+msgid "Not registered"
+msgstr "Not registered yet?"
+
+msgid "Login legend"
+msgstr "Enter your username and password below"
+
+msgid "Remember me"
+msgstr "Log me in automatically each time I visit."
+
+msgid "Login info"
+msgstr "If you have not registered or have forgotten your password click on the appropriate link below."
+
+msgid "New password errors"
+msgstr "Password request error"
+
+msgid "New passworderrors info"
+msgstr "The following error needs to be corrected before a new password can be sent:"
+
+msgid "Forget mail"
+msgstr "An email has been sent to the specified address with instructions on how to change your password. If it does not arrive you can contact the forum administrator at"
+
+msgid "Email flood"
+msgstr "This account has already requested a password reset in the past hour. Please wait %s minutes before requesting a new password again."
diff --git a/lang/English/misc.mo b/lang/English/misc.mo
new file mode 100644
index 0000000000000000000000000000000000000000..9a3f7859ab142662a032fa3356390c5918b31c2d
GIT binary patch
literal 5068
zcmb7`O^h5z701gE3|Rt+O(5aB65`;EGqYZQ#q8Sg$J!e#y!I-)i9rFOo|)R+#xvbR
zcaJxVkU3xhhbRI>;1VIYAS8r@l0!}*7myGVAcRm3AS8qY95_Hu1cBi9ud1Gz-L*;F
zn(E(Fb$z^g@6~(thuyb4V|X5+ypOW{24fQV)GfSt?$~L}-Eddr1MnTx=ir;*C3q+N
z6nrNvBEJ&bza9BJ<Y#`y>o)i+sCj-5HSX{5ZE)wC!+dwbcTt~&`hF6=6+RBtuLU)}
zAM4j*{p(Quz8Co%d^`0YL+#@ia5wxjl>Dzk$@5>Rb#8l$G5pNEyrhDCQ1k7FbTP-^
z1Uv(^{>Avc4W)-X)~~@ksDCx`yKoov=isgICs1<y621ri5o-LuBX`m1cIx*-$#Dc~
zy;-P!7a=M$9Vq!OL-k*W+Rv9``!{0yccA+J2ugo1#P**;>EX9f^ZX7<uD?L7^RLL;
z*|gg4gR;v*kr$x)IjHfUgNr+i`4XI@{xXf?4uqP5`=Hi)0!oeq%04-~3tokq@0)NQ
z{s2nuS0F$0DzAfZCxbO^25O#jybi%jP<nU@J^`PFZTL?p`+br@lCuL<@53|jNhtfj
z2(|uipyc^0oQ0ZH@*jhezY8T#0qJ7C05P3;8p>YZg0kzgQ0u$^QHgm8YTVDE<aik(
zn)y?#{{z08`hOzt!ilusX(<17@L_lrHsOnK5Byu?Zk$a0k3z}Og_{4f(8~#>&!?gG
z^$eVXzlNWNJ20~3N}&4pp!$CvYMw8`_rkA1>EVY^{hx;i;7d^c@e0)VTXEWZ;N9>j
zoPmgHO86moE%N&ixA9}u?*WP)#iSDy*`|KHJ*e!Z5U#vmN+<F&J(5$pIj#!N`zibU
zzwo*rNQRRX$$W~U=U{+;AK`tLA|1Ywavw#HeB-qL7h<OVO8@dbJ@b?gP(DmKOp)#7
z7uu`*NjkF>)a~^nUuaNdgEJJ=U_L_8BfWF{%rVLwWrp$~Wk02Ua1--EihOJ9Gfl%o
zTN-5x`Q^P7*-btrf72tonp54vC7lgh4q9cqNL#LBSMp-eyWWQ?@271umt<L9+0u1g
zyRs{3QC4QIo0l%Ut?y+E*GUUHj5n5Jt$D`Cp6xJ8<!sljx~ya7Vr$P8tJ@mOemAY^
zo@e|x6JYy!S(TeAww?F--Hpv{Lz&_*FX?bxsBIY-8;2v$_L8(~J89Ww$AiLIRN+i$
zUFqg|C;sobvP@R%FQv<>(cVLE6#g0MXFf*_uAVk&bzR4Nl>OK=TgmP8*#86Oyi2aQ
z(L@VLaXDCvwxqM=!<Htg)GT<##(j@h#>VCyS0rp|A-@t{wa(Rmb^V86<*~ox6Zmep
zN;&p@%=Q=Dy4=n0{z4x2UMp<aFxJDHH#!{Jp$mH}^GyGufr2;skCk;<K3HA5?x$^T
zenGB0@_j!Y^RBNsj9cZlCoNp;yUf4BoTI(!L%q(>M;;Br1>oUj+r<A>p4)Doty1sj
z1&7CbOsr^^^@rhHOa7FZB~C|F6b4vY%hwSM0SBckO0%Ss5#I4A_?Ga$cIfe@(ezc?
zzPxo)OSL*i`&^EKZ!y+mS$Vw)Xx=`>r6T2^dq+2m-9eFb8*=?}#%6tAEsr0Vwc+pa
zy_vn|xSgJyomeb#IZESPr|~#@P4jHV&by?-KBrGlEM8o0%;5|b?Ts^d?Tn?Z@u<6!
zs%zbJJ}Illa*<?ZH>vW1PUn+sb-)2_EW4yPHlsb3bb4uaawRO$YBlp>_2G$ya|>rj
z>rXfLPY|jqPIY5>qtBw1d$OA9cat=mwe7W}C|z~@vE}*3(NRCGzT%3;*{q#+(rk6c
z9&M%7P>>nCcH-lWM_i`UCm9!WLTF{Dn@5|6_!6p(rF>Ad-CS5>#)d`AC-Q+!@P}l3
zG{=XlwX_UzqWOAy`ZLfp^NQ@=hip59{FWOYLQQ9VM4k#Eycu)AvT}q~bab7j@wIYT
zUF>o+93D9q{4o>$u&LdL|E-OFF`KW9L<nIa;bg>I#8Io#%sYcR>gYCO2H2Dc%qdj0
zfy#UY*Pr!-0F9=?UQpQBPW>_`%%XBk?7+@8r;wYP(CfE6Q7b2`$&^tG$|y*XRJOIj
z0moH_2JAg3v5R;LlTN1~&Diy{+qKvxW+gJXx49BUJME`<Y15oi=HwLEJtf-00G-mV
zDVfl<pD;<wRqKvm=2MkFrDfAbiPjVRaBQGdUKQLKh)NPKS;g_2B$ur@uW5)SKF%+r
zQ3Wfnc6ln}{mybfi%qg&ctbAqoR&Tn%FkkY#G9Dp+@h`bof13tl)iOM2{TK2&c?>g
znKDGUz2zjgnr^6+<kw*5K3ZBy>w8boN=vHfkzQ#=8X^q#85=7NAlaZ7wRqkBKEG~G
zx$!)B2WQ5GO}RG2dL@jlUR>wVn!1LCgC-yM6OD3iy+-&lo@^B*dIL0tOJIt`#-tmf
z!lo|-aM^9_OFUz^WpJcCb0Iivj|AJ+L4Ty{*O<&73m;dssTfwKax(0c4=4X;c(p#f
z2uK>Q-q2mH=5MQYLW+lDdqBKFFE5pMJ%v|4TW$F?<M6DnrR_EE)dWc&a-x4V!>u8h
zNxK+}hjlev3+jVkTcupn-5}_U`8S4Vrtr6hVL<Q~26U|r`;!-pOC%U%+~Mqz!-o$Z
zCWut7w0o}}Idr)-c@u#kEOygDVEi(pkjXxD)zRi(&t1mb-{-4yi`Ti=+%V3D>~Q0_
z?PHxkrM_p(Ox9mtB%4=bytVXooA6P{4<Ow5BNlW_G8-mCUFFa-u{w*&R_;&Q94<6|
n<dFT?X*3=@U=XfKud!C);(-pgC7;^{tsdcbV-)x6tMdN<ZOB62

literal 0
HcmV?d00001

diff --git a/lang/English/misc.php b/lang/English/misc.php
deleted file mode 100644
index 493b52ca..00000000
--- a/lang/English/misc.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-// Language definitions used in various scripts
-$lang_misc = array(
-
-'Mark read redirect'            =>    'All topics and forums have been marked as read.',
-'Mark forum read redirect'        =>    'All topics in the specified forum have been marked as read.',
-
-// Send email
-'Form email disabled'            =>    'The user you are trying to send an email to has disabled form email.',
-'No email subject'                =>    'You must enter a subject.',
-'No email message'                =>    'You must enter a message.',
-'Too long email message'        =>    'Messages cannot be longer than 65535 characters (64 KB).',
-'Email flood'                    =>    'At least %s seconds have to pass between sent emails. Please wait %s seconds and try sending again.',
-'Email sent redirect'            =>    'Email sent.',
-'Send email to'                    =>    'Send email to',
-'Email subject'                    =>    'Subject',
-'Email message'                    =>    'Message',
-'Email disclosure note'            =>    'Please note that by using this form, your email address will be disclosed to the recipient.',
-'Write email'                    =>    'Write and submit your email message',
-
-// Report
-'No reason'                        =>    'You must enter a reason.',
-'Reason too long'                =>    'Your message must be under 65535 bytes (~64kb).',
-'Report flood'                    =>    'At least %s seconds have to pass between reports. Please wait %s seconds and try sending again.',
-'Report redirect'                =>    'Post reported.',
-'Report post'                    =>    'Report post',
-'Reason'                        =>    'Reason',
-'Reason desc'                    =>    'Please enter a short reason why you are reporting this post',
-
-// Subscriptions
-'Already subscribed topic'        =>    'You are already subscribed to this topic.',
-'Already subscribed forum'        =>    'You are already subscribed to this forum.',
-'Subscribe redirect'            =>    'Your subscription has been added.',
-'Not subscribed topic'            =>    'You are not subscribed to this topic.',
-'Not subscribed forum'            =>    'You are not subscribed to this forum.',
-'Unsubscribe redirect'            =>    'Your subscription has been removed.',
-
-// General forum and topic moderation
-'Moderate'                        =>    'Moderate',
-'Select'                        =>    'Select', // the header of a column of checkboxes
-'Move'                            =>    'Move',
-'Split'                            =>    'Split',
-'Delete'                        =>    'Delete',
-'Merge'                            =>    'Merge',
-
-// Moderate forum
-'Open'                            =>    'Open',
-'Close'                            =>    'Close',
-'Move topic'                    =>    'Move topic',
-'Move topics'                    =>    'Move topics',
-'Move legend'                    =>    'Select destination of move',
-'Move to'                        =>    'Move to',
-'Nowhere to move'                =>    'There are no forums into which you can move topics.',
-'Leave redirect'                =>    'Leave redirect topic(s)',
-'Move topic redirect'            =>    'Topic moved.',
-'Move topics redirect'            =>    'Topics moved.',
-'Confirm delete legend'            =>    'Please confirm deletion',
-'Delete topics'                    =>    'Delete topics',
-'Delete topics comply'            =>    'Are you sure you want to delete the selected topics?',
-'Delete topics redirect'        =>    'Topics deleted.',
-'Open topic redirect'            =>    'Topic opened.',
-'Open topics redirect'            =>    'Topics opened.',
-'Close topic redirect'            =>    'Topic closed.',
-'Close topics redirect'            =>    'Topics closed.',
-'No topics selected'            =>    'You must select at least one topic for move/delete/open/close.',
-'Not enough topics selected'    =>    'You must select at least two topics for merge.',
-'Stick topic redirect'            =>    'Topic sticked.',
-'Unstick topic redirect'        =>    'Topic unsticked.',
-'Merge topics'                    =>    'Merge topics',
-'Merge topics redirect'            =>    'Topics merged.',
-'Confirm merge legend'            =>    'Please confirm merge',
-'New subject'                    =>    'New subject',
-
-// Split multiple posts in topic
-'Confirm split legend'            =>    'Please confirm split of selected posts and select destination of move.',
-'Split posts'                    =>    'Split posts',
-'Split posts comply'            =>    'Are you sure you want to split the selected posts?',
-'Split posts redirect'            =>    'Posts have been split.',
-
-// Delete multiple posts in topic
-'Delete posts'                    =>    'Delete posts',
-'Cannot select first'            =>    'First post cannot be selected for split/delete.',
-'Delete posts comply'            =>    'Are you sure you want to delete the selected posts?',
-'Delete posts redirect'            =>    'Posts deleted.',
-'No posts selected'                =>    'You must select at least one post for split/delete.',
-
-// Get host
-'Host info 1'                    =>    'The IP address is: %s',
-'Host info 2'                    =>    'The host name is: %s',
-'Show more users'                =>    'Show more users for this IP',
-
-);
diff --git a/lang/English/misc.po b/lang/English/misc.po
new file mode 100644
index 00000000..68516bb7
--- /dev/null
+++ b/lang/English/misc.po
@@ -0,0 +1,225 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Mark read redirect"
+msgstr "All topics and forums have been marked as read."
+
+msgid "Mark forum read redirect"
+msgstr "All topics in the specified forum have been marked as read."
+
+msgid "Form email disabled"
+msgstr "The user you are trying to send an email to has disabled form email."
+
+msgid "No email subject"
+msgstr "You must enter a subject."
+
+msgid "No email message"
+msgstr "You must enter a message."
+
+msgid "Too long email message"
+msgstr "Messages cannot be longer than 65535 characters (64 KB)."
+
+msgid "Email flood"
+msgstr "At least %s seconds have to pass between sent emails. Please wait %s seconds and try sending again."
+
+msgid "Email sent redirect"
+msgstr "Email sent."
+
+msgid "Send email to"
+msgstr "Send email to"
+
+msgid "Email subject"
+msgstr "Subject"
+
+msgid "Email message"
+msgstr "Message"
+
+msgid "Email disclosure note"
+msgstr "Please note that by using this form, your email address will be disclosed to the recipient."
+
+msgid "Write email"
+msgstr "Write and submit your email message"
+
+msgid "No reason"
+msgstr "You must enter a reason."
+
+msgid "Reason too long"
+msgstr "Your message must be under 65535 bytes (~64kb)."
+
+msgid "Report flood"
+msgstr "At least %s seconds have to pass between reports. Please wait %s seconds and try sending again."
+
+msgid "Report redirect"
+msgstr "Post reported."
+
+msgid "Report post"
+msgstr "Report post"
+
+msgid "Reason"
+msgstr "Reason"
+
+msgid "Reason desc"
+msgstr "Please enter a short reason why you are reporting this post"
+
+msgid "Already subscribed topic"
+msgstr "You are already subscribed to this topic."
+
+msgid "Already subscribed forum"
+msgstr "You are already subscribed to this forum."
+
+msgid "Subscribe redirect"
+msgstr "Your subscription has been added."
+
+msgid "Not subscribed topic"
+msgstr "You are not subscribed to this topic."
+
+msgid "Not subscribed forum"
+msgstr "You are not subscribed to this forum."
+
+msgid "Unsubscribe redirect"
+msgstr "Your subscription has been removed."
+
+msgid "Moderate"
+msgstr "Moderate"
+
+msgid "Select"
+msgstr "Select"
+
+msgid "Move"
+msgstr "Move"
+
+msgid "Split"
+msgstr "Split"
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "Merge"
+msgstr "Merge"
+
+msgid "Open"
+msgstr "Open"
+
+msgid "Close"
+msgstr "Close"
+
+msgid "Move topic"
+msgstr "Move topic"
+
+msgid "Move topics"
+msgstr "Move topics"
+
+msgid "Move legend"
+msgstr "Select destination of move"
+
+msgid "Move to"
+msgstr "Move to"
+
+msgid "Nowhere to move"
+msgstr "There are no forums into which you can move topics."
+
+msgid "Leave redirect"
+msgstr "Leave redirect topic(s)"
+
+msgid "Move topic redirect"
+msgstr "Topic moved."
+
+msgid "Move topics redirect"
+msgstr "Topics moved."
+
+msgid "Confirm delete legend"
+msgstr "Please confirm deletion"
+
+msgid "Delete topics"
+msgstr "Delete topics"
+
+msgid "Delete topics comply"
+msgstr "Are you sure you want to delete the selected topics?"
+
+msgid "Delete topics redirect"
+msgstr "Topics deleted."
+
+msgid "Open topic redirect"
+msgstr "Topic opened."
+
+msgid "Open topics redirect"
+msgstr "Topics opened."
+
+msgid "Close topic redirect"
+msgstr "Topic closed."
+
+msgid "Close topics redirect"
+msgstr "Topics closed."
+
+msgid "No topics selected"
+msgstr "You must select at least one topic for move/delete/open/close."
+
+msgid "Not enough topics selected"
+msgstr "You must select at least two topics for merge."
+
+msgid "Stick topic redirect"
+msgstr "Topic sticked."
+
+msgid "Unstick topic redirect"
+msgstr "Topic unsticked."
+
+msgid "Merge topics"
+msgstr "Merge topics"
+
+msgid "Merge topics redirect"
+msgstr "Topics merged."
+
+msgid "Confirm merge legend"
+msgstr "Please confirm merge"
+
+msgid "New subject"
+msgstr "New subject"
+
+msgid "Confirm split legend"
+msgstr "Please confirm split of selected posts and select destination of move."
+
+msgid "Split posts"
+msgstr "Split posts"
+
+msgid "Split posts comply"
+msgstr "Are you sure you want to split the selected posts?"
+
+msgid "Split posts redirect"
+msgstr "Posts have been split."
+
+msgid "Delete posts"
+msgstr "Delete posts"
+
+msgid "Cannot select first"
+msgstr "First post cannot be selected for split/delete."
+
+msgid "Delete posts comply"
+msgstr "Are you sure you want to delete the selected posts?"
+
+msgid "Delete posts redirect"
+msgstr "Posts deleted."
+
+msgid "No posts selected"
+msgstr "You must select at least one post for split/delete."
+
+msgid "Host info 1"
+msgstr "The IP address is: %s"
+
+msgid "Host info 2"
+msgstr "The host name is: %s"
+
+msgid "Show more users"
+msgstr "Show more users for this IP"
diff --git a/lang/English/post.mo b/lang/English/post.mo
new file mode 100644
index 0000000000000000000000000000000000000000..58fde8300077007e4b07e61d358b4877b2e39f52
GIT binary patch
literal 2395
zcma)-O=u)V6vta#bsax<*N^p+=fYwlcAJP`oESBUNeu4B!Hg0S!J6qeGbP<sy;aqj
z9lYsD#gpjKqbCs$dKL62g5bwhLA;3v!K>o`b<a$O7<C(Ze)Xze^?UW+t2aNMJoa9M
z=T5wL;r#>eS-f9gh95kyTpmR?foe<#UIY1!vHT8rJ>(C-6W~YSwczJq1N;iS4*X#(
z{|w#%`M0rr{EAvW1&Uq*%Kl|g>~4WKfP3ThJ}CAAcs2MsDEe=KH-hhj;@^j$?EhrU
zFF^VJw_por`w6@s^1_u-6oW5;vhPihz;{8h^C|c-_$Bx<c;TujItG3N&V%2Bw}XFy
zyWnX!bq|<<d*Iuk*!=|*KYs_G0sjQ$T-(R%^*vDRF^HwegO7r*fp>$SfwzI*foH*A
zLGk+poR-`@0gh7^orXMlWRJu}Vu2$^x8S`QFWjyCLK>=b1696+_;mG68H>-7FL~tL
zl4J2t&Ww;$X8<bSg}358h4-Wg@~mbVbyeXhXYW;?4<>xsd6l~%+DLVv!upvJW!z_z
z)=Q34?JC8*2qRLxz>a)yx`;M2Yg3Gs3(;1|K9Es4M^EdN$>%!L?4un!HGMD~f2GUD
zTc=H5v?l%>4F93kf|sPoagmLpN?_-#^Rr{prf2I3!$S(T(A`=r9Peu$*245ut?}%x
z&e#OPVMDYV)JXjCU8g&oM!S<?)V7u~Yx>hOO(!Pqx5Xe_tW9O5Q(3%eUGAG?ic0h=
z4=qzYT$wX;?+Pu>FE?7wN;=~0G=71d*VZ&?lT{e7TU%?io^8kL4kG5`r&Qo3VJ?0S
zW<+%|bx!#Zx1BORQ^7hYol~Y?BJXjVRX+1YdQ7FcHc$3y6P-?CUH|dM`R(%?2lf|}
zg~qxy0fC9zqXI?)UkncxnbKyNx&!4rhn45soAJ_to>=d(i#JTyrpRrRmO4629cdDq
z#$LR|hF$Gr%SzB`F<D9;#!4;5yS8*)UaxI5sWwvO&ZD4>v4Og94W5uS*+`092bH08
z0}9k9k~9hEC2AkK1qgd}CrB9-c-hI}AkJ(0sOYNj$|6M;(j?jr<e76%BRE{|fnQ#G
ztdi{!SGQ(uZQZ8qD_0Z39_>Zf>rTcL1}fkOQv+2L2uw;H?yAx=anet)#Heb-E0_Ae
zP};yWRGw1pyUL|A>aZuuxw@$HG9Rm^T!aDQvd>u(tp<!xC3M!qZ+M!D)qOZ&sZid-
zau_n3>Lfm)mS~GP1Yl;1geAC9rG*@m>LU?Jv?JGl2bRzw26i}U0t9EZM1^|R)hET_
zL-e98DKFs+3JhD+<W?pBzCx>2|3RFxkr<w~5bEhn68}J*h;h5C;#8#|!QI8pL?aY~
zlhRR>w)20>muh$124?M6^>S3#Y9m!Wn`L$=C#hQ*8Ad*lj1I#|CylqtF9Iipg51`9
zT<(DANE|tB)<yYW4X+BZ6zmZVkLFTq?h8^-xZ5K-Bey}!jwnfzGbp~gkCHUC`NQo|
zysfIY?zOmgb>BQRFJYKoMtCl56iG+%8>y_$DDV-t_K@Nu3su`uh>G0t*=9>~IKKP`
K^|bS0KKdIOKcS%j

literal 0
HcmV?d00001

diff --git a/lang/English/post.php b/lang/English/post.php
deleted file mode 100644
index c4ea7a76..00000000
--- a/lang/English/post.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-// Language definitions used in post.php and edit.php
-$lang_post = array(
-
-// Post validation stuff (many are similiar to those in edit.php)
-'No subject'        =>    'Topics must contain a subject.',
-'No subject after censoring'    =>    'Topics must contain a subject. After applying censoring filters, your subject was empty.',
-'Too long subject'    =>    'Subjects cannot be longer than 70 characters.',
-'No message'        =>    'You must enter a message.',
-'No message after censoring'    =>    'You must enter a message. After applying censoring filters, your message was empty.',
-'Too long message'    =>    'Posts cannot be longer than %s bytes.',
-'All caps subject'    =>    'Subjects cannot contain only capital letters.',
-'All caps message'    =>    'Posts cannot contain only capital letters.',
-'Empty after strip'    =>    'It seems your post consisted of empty BBCodes only. It is possible that this happened because e.g. the innermost quote was discarded because of the maximum quote depth level.',
-
-// Posting
-'Post errors'        =>    'Post errors',
-'Post errors info'    =>    'The following errors need to be corrected before the message can be posted:',
-'Post preview'        =>    'Post preview',
-'Guest name'        =>    'Name', // For guests (instead of Username)
-'Post redirect'        =>    'Post entered.',
-'Post a reply'        =>    'Post a reply',
-'Post new topic'    =>    'Post new topic',
-'Hide smilies'        =>    'Never show smilies as icons for this post',
-'Subscribe'            =>    'Subscribe to this topic',
-'Stay subscribed'    =>    'Stay subscribed to this topic',
-'Topic review'        =>    'Topic review (newest first)',
-'Flood start'        =>    'At least %s seconds have to pass between posts. Please wait %s seconds and try posting again.',
-'Preview'            =>    'Preview', // submit button to preview message
-
-// Edit post
-'Edit post legend'    =>    'Edit the post and submit changes',
-'Silent edit'        =>    'Silent edit (don\'t display "Edited by ..." in topic view)',
-'Edit post'            =>    'Edit post',
-'Edit redirect'        =>    'Post updated.'
-
-);
diff --git a/lang/English/post.po b/lang/English/post.po
new file mode 100644
index 00000000..5472cbc5
--- /dev/null
+++ b/lang/English/post.po
@@ -0,0 +1,93 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "No subject"
+msgstr "Topics must contain a subject."
+
+msgid "No subject after censoring"
+msgstr "Topics must contain a subject. After applying censoring filters, your subject was empty."
+
+msgid "Too long subject"
+msgstr "Subjects cannot be longer than 70 characters."
+
+msgid "No message"
+msgstr "You must enter a message."
+
+msgid "No message after censoring"
+msgstr "You must enter a message. After applying censoring filters, your message was empty."
+
+msgid "Too long message"
+msgstr "Posts cannot be longer than %s bytes."
+
+msgid "All caps subject"
+msgstr "Subjects cannot contain only capital letters."
+
+msgid "All caps message"
+msgstr "Posts cannot contain only capital letters."
+
+msgid "Empty after strip"
+msgstr "It seems your post consisted of empty BBCodes only. It is possible that this happened because e.g. the innermost quote was discarded because of the maximum quote depth level."
+
+msgid "Post errors"
+msgstr "Post errors"
+
+msgid "Post errors info"
+msgstr "The following errors need to be corrected before the message can be posted:"
+
+msgid "Post preview"
+msgstr "Post preview"
+
+msgid "Guest name"
+msgstr "Name"
+
+msgid "Post redirect"
+msgstr "Post entered."
+
+msgid "Post a reply"
+msgstr "Post a reply"
+
+msgid "Post new topic"
+msgstr "Post new topic"
+
+msgid "Hide smilies"
+msgstr "Never show smilies as icons for this post"
+
+msgid "Subscribe"
+msgstr "Subscribe to this topic"
+
+msgid "Stay subscribed"
+msgstr "Stay subscribed to this topic"
+
+msgid "Topic review"
+msgstr "Topic review (newest first)"
+
+msgid "Flood start"
+msgstr "At least %s seconds have to pass between posts. Please wait %s seconds and try posting again."
+
+msgid "Preview"
+msgstr "Preview"
+
+msgid "Edit post legend"
+msgstr "Edit the post and submit changes"
+
+msgid "Silent edit"
+msgstr "Silent edit (don't display \"Edited by ...\" in topic view)"
+
+msgid "Edit post"
+msgstr "Edit post"
+
+msgid "Edit redirect"
+msgstr "Post updated."
diff --git a/lang/English/prof_reg.mo b/lang/English/prof_reg.mo
new file mode 100644
index 0000000000000000000000000000000000000000..c20bbbd19e3f9ba8d8b6e49836bffc40de556cb9
GIT binary patch
literal 5891
zcmbuCU5sQ!702%`iytEhiy$s47O)G`(zmyJc4t3kc9EIhnc0z@vDum31r`#j`&M_?
z&h1<6y>+{Hcrb?epa~C#L>`m`Vxlo>A~8H^^nsx92@_u21mpn|qY-0#;nDa%^>MqW
z89t0RQ}er3x9U{YIj8EJe(RQf-wW`ppnL&kb8irE@R@!1hv(*x1;NL`{ooDY0q`d9
zUROT`UWa-e{1mtXQvVHb3cL)`xHkA{Fav4)(~i$N{t&zc?Y{&+0sapB4EP#I<KA}s
zH~3l9X%doqJ4oXWf;9he@RML2q;YE?t?zNy{-om-NA36x$8S46>-fCmj~!of{FURY
zj;}dhb9~$J9mjVaX>+u`DaTtK?{u7YoN+wmxa`<)e9SR&OdPK|KJEC7<8zKLI{wu0
zWyjw-{=xBe$2UQ;*Iz->@4F!BbuTt?JGdX*50*f(!#vp769ntvJnApN2`+<gfDePm
zA>?N8JK!ns`yk2v6aGO(!C$~9!GD0C2hYLC_kmsT%iwpx5d1Y*1^*8I47}q;>o>m#
zzli!DL0aEG!HeMaSoG(>$H69;gCy@7h^d0>ut_XAxCwj(JOJJWz6nyl|9~M_!s2ON
zmq6M_hJOtF7D)5`2)q^i4M^wdb&&M)FObIXLFI1nu;Y1f4)q+Qd0qmi!8gD=!F^CF
z@gDFta1kVZJObVUeiOVG`~gVodIh9;-U4aAH{cM}z(XL_FM)@^zN<e6(t3XZ;xBmB
z@tSLY$JO_s6Yb|Vkk&r~lAbSswB8J){Xg&OFM~tW{|ug|epvihz@LBu{2TZLxQ@e2
z_W3yow=oZncu+#2eH=qMfii<a_MknSMmdV&pX>2bMj<^dqAa1*QRoUIolHJ3g?VVb
zq#Lq7J$q4L=HPymWt0_^BPgU_|Il4R`~MP31%+$}Q<;bM_W%l1Z){2aTt!(xIgWAw
z#Xo28a@beEd)zzel<W()4sJw&dzy!AcF?^;rREN#^D~QrBWZkh9z2Oc_Miu*Gd^M}
z6aSd2!wkWLC{rk8-(ZnPY_<L{m?R=%qQ_<ID|sf;g!e>HS4mr@J=W)07M$7G49;*Z
zSX-q%u7fk8&GQ({`@)T1A}K5u9g#%Ac!kZlY9_RnNr%-Y>XYA(OnjF~TLtHM(#d&8
z1m{$X$1>wus>Dy%z#3ViG{f3j-N00}QY`DLR0oYz4tQ&usXmR#{GbilVbm#BNhk1?
z9#6JeEEACho3dBz*StTa5@B2EjhSU#*sKRA_g8Ck)vA4)Dc+8Zy&Z91j}~o5=X~32
z(Kb8Qc68RtJ63!>R(w5Pw4E4x^CM0cZ72PRTGhAV&COdY){HmbR;<1@Gw0;hihb1l
z>ce8cVbzZatG*w-S$Sb~G{WyPtoj{=Rlkq0>i0o!eyra|SoQk|i+zN}>O-uQbnhIO
zEiTqoBu4es#^}A1i%gHIslcECjzFu+(`?jUxJ4m!%$wpo<#D)-gOJU!q;IO(>6v+E
zUr$db?5@+SR+^t`r0R-j>2Ng)FN!pS^Ubkk!F5-pi;Gi@uWg3)6jii`bhzdi+QRc<
zAgQZwI>$2|Zl*lRVy;z+PW~u_n}YYoB(hUH>dEB6ww<Ectf;i}z|`96+R|wLTBSOL
zqpd{(soQ-_s>M}(xF2(w%v(JOefq-Ya(H6Yk7jR+G+atrD#8(-V<(zY7YmtVBAI$5
zToH*#?HU_OL{hU_<wWHuzSwHGq4KmP>ZEI-=a`)&cvR&WuSE(w@C3(dfb(rGD0X3W
zy}}x?;F(|@#hSdeg)T6cN>eDd5^Q$e^}~1+!I~M{9+M_B3^7-nOqlMXit8)y6(U<*
zr68H(=734;J>~^j+5R^Cf5dtjl^s{=P^A&B)a_Vyx|(h90o0l?bI)L%Sg&Zeu|+n`
zqXAD^f@!*rn%k_#x=>@Ovg>`kp?ZSuCJ|#_ki%m*ShUSj(UF-|@lfh6l)?4He!ZSQ
zSSd?nD8`w!k%=5$V}bi->|<lc?)}cl4DPl~I-O8D?qg<cK}yRi!C4uJ-TF0ijlIQc
zXabVm$@}*vmx&NE-ZNlB#H8b4R~QE%-x=~m?=~Y=))Z_Y#gI2+SYyXRnMzIgp^0SM
zIE#@pwig-!0e*0XC~5jx6%HhaO-#7Sdu*Dbtld<}iLQ(S;D&GujK?FP3vMR%k#A)z
zQlpSq8Efz5nKnz&h=jOY*fDeLc?*_Ba6~kGzXLK&A4OU+IRQ;l35vz^cLrGss0r6O
z&LnH$3?epT_jWvaU&0R64&oE;0y}XrC$51U?rxkT^Fqk+56$cxu*(!(J`k*@QrO2#
zf$dNz$64Mrmg5c|(>e?UCo!H$XAO(9w@hq2l^L~V)?v)zjQZ`dq<o;lR@>|&9B6Vf
z<Ry8G+b+%&R3LDxk@2kwSwB?+xP1h-l&vls$~eXm8(jjp)ch?_38s;Jl-MOiHKc89
zDNj{j@TAOEQX!Hd#+x2CJt?s|?pXw{v3@j?Ewob!Be|{=O-pPEp0QJ;AH1_S#r#q4
z$!|ySZ57eOiKb+r#MV^SQbVjUkK1KjeLeU<(Sb%Rv^y{#F05i8<qjp*;9ENzjrb&z
z9AZ+*5E!?-q*-JyCAKd5Ja)1v>nJhgyq%awBI}mfVmHSWW%j7pLikN((#+FN(VK+V
zRZC@T6`?nYvNBuS<_T8ox=`|h?In?Fb!CDztgC^_WK*Wumg_=UO^J*_@>$(>TfhN?
z6(kOUGhCTHl=3W5+lY*#p|k;nOt^-#g*S5{z|BH=Qi*+)_h~Z^!Tqro%%y?VbSu||
zOiH7m-qHNdrdE#0t#*8NPEdTN(dTgP*;zFdu9cEVT4$_!NXV_K%IqR^ETIjp+<r`o
z34^G#t>P`$&xx=ew=Rb4F~LdIWwtD@Na&k)c;ubHB&0A2LRXjfyiuG8>xP@SpRnmh
zSBXSk^<AJ7-os6!y>pl}7CXV+;QJUcHmijOo`Mcx?mEY>8)R;gC>Q6!94uO+8)4VJ
zCZljcqgl(A`(RhJ(BrrqAj+M*$>EeJlba6PDo>&@x%Q|`$h5~`+$uJiE>5<a+j{02
zL~5jUuF?8pgSTY6SS01zI9F1)xWxV89Ni7DZnY5eYzs<V;k~AW6WcyT7aG6D)2}13
z=EX^|U!6al<wGuIxDbn6!{?z3rFJ-gP355lnM2XI50pK`HnFD@MmLeklW}*MpP|Nd
zbR3GDJ;QImZ4>ZX$ZoM~q;>eo*ETmRrMT{=tN8`0IdZLO`$M5bu|ki<0i+&T5sfCY
zp;0b(!TsDA&5QVE(oFlKk*3B0Uv2pG=)*;BA_n*gnE9nbDV+a}^5Ns(yQD%Dacnj?
z3b*XOGP~R4(w8a2c!EI%3Tfv5Gz%pXF0zk;?#%31RR7>~!u&j^e8TU#GH%YvG-c)^
L%k^o>NbG+B>1OB{

literal 0
HcmV?d00001

diff --git a/lang/English/prof_reg.php b/lang/English/prof_reg.php
deleted file mode 100644
index 0745348e..00000000
--- a/lang/English/prof_reg.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-// Language definitions used in both profile.php and register.php
-$lang_prof_reg = array(
-
-'Email legend'                =>    'Enter a valid email address',
-'Email legend 2'            =>    'Enter and confirm a valid email address',
-'Localisation legend'        =>    'Set your localisation options',
-'Time zone'                    =>    'Time zone',
-'Time zone info'            =>    'For the forum to display times correctly you must select your local time zone. If Daylight Savings Time is in effect you should also check the option provided which will advance times by 1 hour.',
-'DST'                        =>    'Daylight Savings Time is in effect (advance time by 1 hour).',
-'Time format'                =>    'Time format',
-'Date format'                =>    'Date format',
-'Default'                    =>    'Default',
-'Language'                    =>    'Language',
-'Email setting info'        =>    'Select whether you want your email address to be viewable to other users or not and if you want other users to be able to send you email via the forum (form email) or not.',
-'Email setting 1'            =>    'Display your email address to other users.',
-'Email setting 2'            =>    'Hide your email address but allow form email.',
-'Email setting 3'            =>    'Hide your email address and disallow form email.',
-'Privacy options legend'    =>    'Set your privacy options',
-'Confirm pass'                =>    'Confirm password',
-
-'Username too short'        =>    'Usernames must be at least 2 characters long. Please choose another (longer) username.',
-'Username too long'            =>    'Usernames must not be more than 25 characters long. Please choose another (shorter) username.',
-'Username guest'            =>    'The username guest is reserved. Please choose another username.',
-'Username IP'                =>    'Usernames may not be in the form of an IP address. Please choose another username.',
-'Username reserved chars'    =>    'Usernames may not contain all the characters \', " and [ or ] at once. Please choose another username.',
-'Username BBCode'            =>    'Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username.',
-'Banned username'            =>    'The username you entered is banned in this forum. Please choose another username.',
-'Pass too short'            =>    'Passwords must be at least 6 characters long. Please choose another (longer) password.',
-'Pass not match'            =>    'Passwords do not match.',
-'Banned email'                =>    'The email address you entered is banned in this forum. Please choose another email address.',
-'Dupe email'                =>    'Someone else is already registered with that email address. Please choose another email address.',
-'Sig too long'                =>    'Signatures cannot be longer than %1$s characters. Please reduce your signature by %2$s characters.',
-'Sig too many lines'        =>    'Signatures cannot have more than %s lines.',
-'Bad ICQ'                    =>    'You entered an invalid ICQ UIN. Please go back and correct.',
-
-'UTC-12:00'                    =>    '(UTC-12:00) International Date Line West',
-'UTC-11:00'                    =>    '(UTC-11:00) Niue, Samoa',
-'UTC-10:00'                    =>    '(UTC-10:00) Hawaii-Aleutian, Cook Island',
-'UTC-09:30'                    =>    '(UTC-09:30) Marquesas Islands',
-'UTC-09:00'                    =>    '(UTC-09:00) Alaska, Gambier Island',
-'UTC-08:30'                    =>    '(UTC-08:30) Pitcairn Islands',
-'UTC-08:00'                    =>    '(UTC-08:00) Pacific',
-'UTC-07:00'                    =>    '(UTC-07:00) Mountain',
-'UTC-06:00'                    =>    '(UTC-06:00) Central',
-'UTC-05:00'                    =>    '(UTC-05:00) Eastern',
-'UTC-04:00'                    =>    '(UTC-04:00) Atlantic',
-'UTC-03:30'                    =>    '(UTC-03:30) Newfoundland',
-'UTC-03:00'                    =>    '(UTC-03:00) Amazon, Central Greenland',
-'UTC-02:00'                    =>    '(UTC-02:00) Mid-Atlantic',
-'UTC-01:00'                    =>    '(UTC-01:00) Azores, Cape Verde, Eastern Greenland',
-'UTC'                        =>    '(UTC) Western European, Greenwich',
-'UTC+01:00'                    =>    '(UTC+01:00) Central European, West African',
-'UTC+02:00'                    =>    '(UTC+02:00) Eastern European, Central African',
-'UTC+03:00'                    =>    '(UTC+03:00) Eastern African',
-'UTC+03:30'                    =>    '(UTC+03:30) Iran',
-'UTC+04:00'                    =>    '(UTC+04:00) Moscow, Gulf, Samara',
-'UTC+04:30'                    =>    '(UTC+04:30) Afghanistan',
-'UTC+05:00'                    =>    '(UTC+05:00) Pakistan',
-'UTC+05:30'                    =>    '(UTC+05:30) India, Sri Lanka',
-'UTC+05:45'                    =>    '(UTC+05:45) Nepal',
-'UTC+06:00'                    =>    '(UTC+06:00) Bangladesh, Bhutan, Yekaterinburg',
-'UTC+06:30'                    =>    '(UTC+06:30) Cocos Islands, Myanmar',
-'UTC+07:00'                    =>    '(UTC+07:00) Indochina, Novosibirsk',
-'UTC+08:00'                    =>    '(UTC+08:00) Greater China, Australian Western, Krasnoyarsk',
-'UTC+08:45'                    =>    '(UTC+08:45) Southeastern Western Australia',
-'UTC+09:00'                    =>    '(UTC+09:00) Japan, Korea, Chita, Irkutsk',
-'UTC+09:30'                    =>    '(UTC+09:30) Australian Central',
-'UTC+10:00'                    =>    '(UTC+10:00) Australian Eastern',
-'UTC+10:30'                    =>    '(UTC+10:30) Lord Howe',
-'UTC+11:00'                    =>    '(UTC+11:00) Solomon Island, Vladivostok',
-'UTC+11:30'                    =>    '(UTC+11:30) Norfolk Island',
-'UTC+12:00'                    =>    '(UTC+12:00) New Zealand, Fiji, Magadan',
-'UTC+12:45'                    =>    '(UTC+12:45) Chatham Islands',
-'UTC+13:00'                    =>    '(UTC+13:00) Tonga, Phoenix Islands, Kamchatka',
-'UTC+14:00'                    =>    '(UTC+14:00) Line Islands'
-
-);
diff --git a/lang/English/prof_reg.po b/lang/English/prof_reg.po
new file mode 100644
index 00000000..9409aa33
--- /dev/null
+++ b/lang/English/prof_reg.po
@@ -0,0 +1,225 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Email legend"
+msgstr "Enter a valid email address"
+
+msgid "Email legend 2"
+msgstr "Enter and confirm a valid email address"
+
+msgid "Localisation legend"
+msgstr "Set your localisation options"
+
+msgid "Time zone"
+msgstr "Time zone"
+
+msgid "Time zone info"
+msgstr "For the forum to display times correctly you must select your local time zone. If Daylight Savings Time is in effect you should also check the option provided which will advance times by 1 hour."
+
+msgid "DST"
+msgstr "Daylight Savings Time is in effect (advance time by 1 hour)."
+
+msgid "Time format"
+msgstr "Time format"
+
+msgid "Date format"
+msgstr "Date format"
+
+msgid "Default"
+msgstr "Default"
+
+msgid "Language"
+msgstr "Language"
+
+msgid "Email setting info"
+msgstr "Select whether you want your email address to be viewable to other users or not and if you want other users to be able to send you email via the forum (form email) or not."
+
+msgid "Email setting 1"
+msgstr "Display your email address to other users."
+
+msgid "Email setting 2"
+msgstr "Hide your email address but allow form email."
+
+msgid "Email setting 3"
+msgstr "Hide your email address and disallow form email."
+
+msgid "Privacy options legend"
+msgstr "Set your privacy options"
+
+msgid "Confirm pass"
+msgstr "Confirm password"
+
+msgid "Username too short"
+msgstr "Usernames must be at least 2 characters long. Please choose another (longer) username."
+
+msgid "Username too long"
+msgstr "Usernames must not be more than 25 characters long. Please choose another (shorter) username."
+
+msgid "Username guest"
+msgstr "The username guest is reserved. Please choose another username."
+
+msgid "Username IP"
+msgstr "Usernames may not be in the form of an IP address. Please choose another username."
+
+msgid "Username reserved chars"
+msgstr "Usernames may not contain all the characters ', \" and [ or ] at once. Please choose another username."
+
+msgid "Username BBCode"
+msgstr "Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username."
+
+msgid "Banned username"
+msgstr "The username you entered is banned in this forum. Please choose another username."
+
+msgid "Pass too short"
+msgstr "Passwords must be at least 6 characters long. Please choose another (longer) password."
+
+msgid "Pass not match"
+msgstr "Passwords do not match."
+
+msgid "Banned email"
+msgstr "The email address you entered is banned in this forum. Please choose another email address."
+
+msgid "Dupe email"
+msgstr "Someone else is already registered with that email address. Please choose another email address."
+
+msgid "Sig too long"
+msgstr "Signatures cannot be longer than %1$s characters. Please reduce your signature by %2$s characters."
+
+msgid "Sig too many lines"
+msgstr "Signatures cannot have more than %s lines."
+
+msgid "Bad ICQ"
+msgstr "You entered an invalid ICQ UIN. Please go back and correct."
+
+msgid "UTC-12:00"
+msgstr "(UTC-12:00) International Date Line West"
+
+msgid "UTC-11:00"
+msgstr "(UTC-11:00) Niue, Samoa"
+
+msgid "UTC-10:00"
+msgstr "(UTC-10:00) Hawaii-Aleutian, Cook Island"
+
+msgid "UTC-09:30"
+msgstr "(UTC-09:30) Marquesas Islands"
+
+msgid "UTC-09:00"
+msgstr "(UTC-09:00) Alaska, Gambier Island"
+
+msgid "UTC-08:30"
+msgstr "(UTC-08:30) Pitcairn Islands"
+
+msgid "UTC-08:00"
+msgstr "(UTC-08:00) Pacific"
+
+msgid "UTC-07:00"
+msgstr "(UTC-07:00) Mountain"
+
+msgid "UTC-06:00"
+msgstr "(UTC-06:00) Central"
+
+msgid "UTC-05:00"
+msgstr "(UTC-05:00) Eastern"
+
+msgid "UTC-04:00"
+msgstr "(UTC-04:00) Atlantic"
+
+msgid "UTC-03:30"
+msgstr "(UTC-03:30) Newfoundland"
+
+msgid "UTC-03:00"
+msgstr "(UTC-03:00) Amazon, Central Greenland"
+
+msgid "UTC-02:00"
+msgstr "(UTC-02:00) Mid-Atlantic"
+
+msgid "UTC-01:00"
+msgstr "(UTC-01:00) Azores, Cape Verde, Eastern Greenland"
+
+msgid "UTC"
+msgstr "(UTC) Western European, Greenwich"
+
+msgid "UTC+01:00"
+msgstr "(UTC+01:00) Central European, West African"
+
+msgid "UTC+02:00"
+msgstr "(UTC+02:00) Eastern European, Central African"
+
+msgid "UTC+03:00"
+msgstr "(UTC+03:00) Eastern African"
+
+msgid "UTC+03:30"
+msgstr "(UTC+03:30) Iran"
+
+msgid "UTC+04:00"
+msgstr "(UTC+04:00) Moscow, Gulf, Samara"
+
+msgid "UTC+04:30"
+msgstr "(UTC+04:30) Afghanistan"
+
+msgid "UTC+05:00"
+msgstr "(UTC+05:00) Pakistan"
+
+msgid "UTC+05:30"
+msgstr "(UTC+05:30) India, Sri Lanka"
+
+msgid "UTC+05:45"
+msgstr "(UTC+05:45) Nepal"
+
+msgid "UTC+06:00"
+msgstr "(UTC+06:00) Bangladesh, Bhutan, Yekaterinburg"
+
+msgid "UTC+06:30"
+msgstr "(UTC+06:30) Cocos Islands, Myanmar"
+
+msgid "UTC+07:00"
+msgstr "(UTC+07:00) Indochina, Novosibirsk"
+
+msgid "UTC+08:00"
+msgstr "(UTC+08:00) Greater China, Australian Western, Krasnoyarsk"
+
+msgid "UTC+08:45"
+msgstr "(UTC+08:45) Southeastern Western Australia"
+
+msgid "UTC+09:00"
+msgstr "(UTC+09:00) Japan, Korea, Chita, Irkutsk"
+
+msgid "UTC+09:30"
+msgstr "(UTC+09:30) Australian Central"
+
+msgid "UTC+10:00"
+msgstr "(UTC+10:00) Australian Eastern"
+
+msgid "UTC+10:30"
+msgstr "(UTC+10:30) Lord Howe"
+
+msgid "UTC+11:00"
+msgstr "(UTC+11:00) Solomon Island, Vladivostok"
+
+msgid "UTC+11:30"
+msgstr "(UTC+11:30) Norfolk Island"
+
+msgid "UTC+12:00"
+msgstr "(UTC+12:00) New Zealand, Fiji, Magadan"
+
+msgid "UTC+12:45"
+msgstr "(UTC+12:45) Chatham Islands"
+
+msgid "UTC+13:00"
+msgstr "(UTC+13:00) Tonga, Phoenix Islands, Kamchatka"
+
+msgid "UTC+14:00"
+msgstr "(UTC+14:00) Line Islands"
diff --git a/lang/English/profile.mo b/lang/English/profile.mo
new file mode 100644
index 0000000000000000000000000000000000000000..59c8f7e636ece29c768e9fb9322345b6a5d0afad
GIT binary patch
literal 9585
zcmbW6dyFK<UB^3q;P{9k*yQ0PKwXmK?!xYD{77u?*~#tgy*AvQ*LS<VTrecPGc_}P
zH`6`t?zz1^_`?wq5f~6CLbeD=5D`yD3XzdOktL*vC{hGbhy(&DSP)*416KZuf*=x~
z@2{%oaqC2uTU+z(s;<Yce($P%{`Q-GE8)3Dc?;#gZcLI-gU{W<56|g+N%8~W8h8h|
z0rHo0_<1c@fcpLf_y+K!;17bIiueq88}&a2Uk`o})VQyMuLl1cd=2>RSih0M>i-&0
z?Qa4#-$8zE2k!x22c85)&tstG8-YIpei+m`9|J|#pMaY0bMgCMf|~blLH?5G`S~I6
z1rQRF{{gkmO?1+@H-PGYAlB~&Z=!w_{9*6}sC{pNcY;F@7A7AB`AeSUM|3_7ik{Da
zTJKp<<G%okj<12@$Mc}Z|0k&Zd^3LkE_f^TTOmsQ?f|v!TR@5GUQqKt2#O!8pyu5K
z)&D~ve@VuV=G_5B$1j7L_i2zNlHZH?Sx|g_4%9kd12ygiQ2Y5mQ2cr=lW3kd^P}<a
z0JZ*opw>MNYM+mQ;#&$bH0j3n8Wg`j0&4!JK#l)nQ0sgi)cCJNd>+&~FM`_N|AOj&
z3!OyI8$s>oZJ_!sf|`FBRR8tZelga&p!$~}QzgFuYQ87IH-o<eYM#FU#osT2qU*0g
zjr(U%`*{J>xbJ}cCAU%$-U;gaVNiN`AE<fG#`Z1nN2#}C{c5cL5-9$E9DF1Ax%mCd
z5&r>{-2Vd<JuiaV{|zwlX7IL%cYs>&PH^K@N#bJtahUQ9?N>pKdpncd11^E;-v&kh
zC9ndofj<wv2>yiHA(|zVUjbX-$HB+IFM}F)5aK2O`#|mgD9ESeEU52o@NHlPz8!oD
zWa{KOQ2o9NE`k3J$}hbR=83MmLCyC7cnCZNs^18de18}GBk(hz<g<nH{s#C#@Dt#-
zK+X5-Fjeb514=Ky3Z4i54unO?VT@UNe*~00o(E5X7r=wyr$Ev3B~bKy1(g1L9o!Fo
z6V(21dsCS2_24I|9|AuBehCzPZ$-(ZUkl(B@B#1u_^04u@bAGDP(+^vj)Cg`o8T(=
zN$|(OZ-7TZRel;+0iObY4O{~c{CJ?F0GTrRF!&_+3Gl7pVT3Ar&VbUNM?tOg7$`Ys
z@%uGU`}_zfzI`m#p9ZCme+WvSJ_~BT&x7K_UxAX(-+=1(kD%oIFQDl8Hi)Q`+g;GF
zL!j0<4XXVD2&u^sM6}7Tg3_Z;gNMOqL0Fpn6R35+13rPi-+(aG{}<Wh8u;6w*84Y5
z@{<yZf46||1rLDYvj@+Be+H`Gt5B8&@YSH?{VoualT}dP+p+x;C_1mk`cn~qAJl%H
z1s(VWQ2hPZh~EOmm+yiPfH$KAvWNGA;{SP2a_N9t?-I!NtS^w<Mfq9EaaDMvOZQPu
zQ|_m{gQDjViuNm;d6c3@@)B*@xAr8x7f&H&?)jNmYk@t=yC|q#a)ct=d7L61>5&d%
zO3At^@p(7cr#wdaNlHp-o_l$DI94#7<Oa%7iuV3NO7pyjm#a+$ly5&r*`%~7&9lgh
z^kX+RY=M_3;<27pisUFB>+u0hr}Zjbk)BAG4pQDp8B-i(hw>1mdAhvFXXug6AR6-l
zsyB~xy{7zJY`6>#C<O%-OD<4urfg6SQSPQlZ-0uiLeY~`9;95OpuUqwdbCZE{#KNd
zau4MM<^7cRQ8J3`<3@_?@fc-Dk!|Ve1V~2Ua(owjfFga<b1Hz@v2^?-<wKN<lw{@M
zGj44?S!vhVm9+NG57TVmDxcTMN@tkmE-z}Itc>eIZ&`QOb;pB2vO?#yjNm$c;A`J;
zrSD{=Z!^?B(_Xck_bl%g&HKRjeBNnl<I$i<_YAIFC#%x!f$t>8_*(CdJTLil4OPaK
zFO$`Nn)kd*14*%F`)EFm(yE$$caebABJXD9Fw*}$TEiN#XYO}gm@PD<bynog_Qqs&
z+OC<bhJ{r#+i~Mf5}+Y6*0$L~Bqg?timI-f&bD&=u#=W~miLkqCLdd{d9CVljQEPY
zieE4LUALWfVl6HZdXGmPq})kPW&@v`EXwVy)A6~hvzq#;vKWut&=0qLS@p9~L))JA
ziJaF~A4%5o83NYwE9oHXxE;S;WvJ8ExiiW8(rqS8&ZJfCw7<YEt6s_I73)5|;@$Qj
z%`YcsincK}SwDX^SuZ-iOzWbgU+B7C(6bAZ*~nQ05@fA66V2J85ol@}JoHtS_IyHn
zSK9`wtS6|4BeYB!Ta>#rO!fQWK_^VMk@m7&hG8s^HOV}(bt5h7EFHL@#K{Jl)^z2q
zk%Tojyq~R1)p-M+7dbOsr#~Cw7^W~9q`PtE*_MV3>CN<W<wm|_1MGUEEVOIHnvW-y
zi2%>}bdaY*pPci(tg1a9!Yt>JMsgm`Xs^b{Ni7mHsl#5}1x%<WO@Zao*JcXnvF+_?
z$m-o`TZt2Dt6sZd(V5uL`F^nzO@}p9$%gE0?p-pC4Z(=4-?XtBW`nF5QjNE(cA1TW
z)mYEE7-elH$a-#=US+mx?4Qc0^j9*!qj&URTv}^*i=1jcG%7La=^h{BJeS%i@X`S8
zF7=c1^)9lALbD1>&Jfdl+AIn;NK525d1JNAYCBoSJItY<_4+i3?5Vi7^2>R#lbd;n
z*ex@7*DcENu$r$;b#Kc&Fkj6PM@KqWYv|g-;X1rrc13ctTE`sR%w*~^DvKd|pKq0-
zxik-!H9MnyFay(!>?Y`Jav^w;1{Hx^Iv5l?82*K_$dQgb`^B_h6v_5(jd(}dRgWTW
z48~<TSj58(t7VsutXe&E_YoIfA3Bt~{SUdj4j<Wvfm}k*7uPzAkFq%WzU)r=wC?-z
z*s*;Z4{t86mQ-n9JdPt+cC;;?Ln+j?X_7Zv+$__)8pu`A=?p<>jFK*H`gAxmqkGV-
z>1a1BvAx|Y%HDhSt*@=0n67_U>z(@)Pq3@SO(Ng2tNqn_2_KN<M_jv~mX)s`+S)w1
zc>lDYR`2?9@kEZsVSCH&{_U)u5VGuizVH2ur+gmV>9X4>h}X5dt95_tUcQ9t;`w4+
zwmo4~Yb?94$Rtn5V}{UAE4S?l9kP8#b^yOzHS+DOo8d#!PN&2#xSg!-qqx%u;czE1
zU`Ci4$+c>z0;~D)W@yW;bsf}o3SZ?1k$Z`A@NTylyEb979iy$rnsNsxg_VU^k?zS~
zhRCpu_UyW7{oAZuIDf^LyS!jVHhGLtt(cuONlMW24$Zj3klkdJOI<Z&%HWRJM_RLE
z>P#KIB)k~s1Tf8ATD}sMJv5lBVypPOF@9bO&e$|3fM>lP!<aLF1#24LMVT!dSGgE@
z7h)BwG&|Yeb?rgczKqhCFa}wE89Feumic0vB<{KiMMZR;D}fndP7i}Nk%+1IL>AH&
zhFLP#ELn|5qoS-scMDJ~;_6b$gH$4kuvjc9x<+iUd`kseZe^y1AWH9gS$Dx*8u?!E
zF?p{=R14u<8~er+e_#ouWmVrhXKeIuHecK+O0p@;5#NXVLia3fG`2Juq4ilCYEx;B
z-QY7i@DSZZ7vv&ELs)x0>zr$wn{8v@)5=elGxZXec3416ik?>{V3Pz2jjBliZqkXE
zQ#Pq(^zp}o?>;mquL>I->>gH#QG#ky$Bt4=Qzqj>2$^UMVp1<BK@Zc8Z#B!<*b5<b
z-S5IA7=$@_IJv|UVLD7Y>OO7*2Z|!e{<YgS&K)l3^ZcH}NUi5k;0YBAroxkHZ8K(&
zw$}~>=3{dM7;8$9l~n6&2+@`zFS`Sk3@$jM#+n;1Hxc=qgOeqN1C+8QSx?JdgmklM
zv#hCEk;F=1VS4S4^wZ0;vAI1SF|HD<Wa?d`qns|OJaY%;XSn`S`K;v!H2A9{@>`f0
zb*c1=rGI=3j}=99Y{ItUbirjC-%Zt&VOI+;$J5Rz-X1@mz=(2w3DXk`9x)|uh4Y9!
zhn+-B?!*;KN6pg{LJ$_l6b~%2wpktr9Z7LBT|yv3!$d8t*tEygv#0aT-cwFRs*B&!
zS>{5Yh$f)~!lL&K*~o%@XcPjb+Q9*LwVk#vOM0e(%DIEMW{yB}`@vYUa7t?JIU1Sr
zO;1LlIz1R^6?PH>UdMOS@c<V(JuYSKvZ#t~?N-|DV$2ynZhxnrwfiv%40IYps(vx%
zpreS>c+*0Ow-N;3a%ailmffbzTOPrsqmfc*Q4u>8WrZi!DXVezh-t8s?pDZHhcxaA
zl$#E-O4*WjuB9R+QLTMR2sZT{=ZX=UUotT}Y2u0<-6m@MGNS+4CZVt+qVh!Z(AN<=
z^*h0t%I)MBk0Lf?gvKeyf)1Ej69F)yp^l>cY`8?Wr~$JYIMun9i~!y2m=~*XL|7>5
ztaBMU9iv?<o=oH6qCLiv^IG|eIYjX;CdRE~<MhVM;#i=m_KHg>dCnl7tWo#8Js9IU
zQ!-+*N=q;uf{>i#6f6?OQ)QDeS;*HONb<r7Js5V?N}2=nOsJHb%g4G*(0nmiSo&|%
z%FK4MsxK0C!cu1FQ`9t=(2P%^L1%CyEM^^Y6@iZ!pz%@e&$M(DPUP^d(VdCf)Nml}
zv0E4z6@q}J#7ibnb0pCn#k(!R#uw`-GT@ZK_(^Xi8f`^oA_8|8IPUA6bE9gFHy7Ej
z#6PD&1aak8;+D<xPRN;L?2Xg45T#t210(x{$01!uFy;K(6K+Mnh_{>-4}6-vxkzH*
z7OU7hIWmc)!bl#j6Bc4J7_&`y8FR@6M9*zXd(6pKYR@@AeZpDa)ZY|GDpWOxZUU6K
z<Y9W*o90MlWL{k)>C2h)HLhXyCUw)ymLwz_n$=vby-hAj=59<Hrjb%|M|0hki4C?J
zlNtAd+>_(s-X=LQy&_q++bC8~nj4?Vi;mPA^H(78<|}Qt85XWS%&mm{&HSltf{jkE
zMJBA;(;B?~gm>|~JaS-#P4d#6;{A!k%z9-yBA~bonPU1jNOQczt%{n1<tOXhstkPI
ztNUWttc@)>`<CTCh+#E&zNwI#OPJ-ETbPxZ&jhIEBsR)Or_A4QV8(G{)%sd<HQNtI
z3sdjFH2M0h4o+Q$fV;(6U6Mmcw~H~q`7Ti%O_8%2WS0qwNUfias*ns=_*A=`SQu^7
zchf5vkuE^(3P{<QwO3r48{L?5eUPkqq=9_eFH%C6Mmn~Fs6rm@*s)c@vdip9tPRC@
zEyu0+JT;sUTSIQ7(UlK@RQC;B2ob%-6WL~*W64|8?XW*gM%jSOb%#tyM`NSHt_kL;
zBeN<9Dv&ncZpS~{v@*wzU$AKx?7YzDNF-*4&9DiGP+C8;nW<f)S0PT?{M^Ek*O7D)
z47ouI_h=Xd7lmQ{**mo6XsRIb{f?G)!4{6#aD^+<^lCO74;y-HD|>@X-CWH{bRopF
zNRkv0ERiA1+kJ&3WYfkzHr@9lNB4Smz|^rwmwVI@RyZ&0p)FijuAm<A#t-%|u4r4{
zFwOX9V&2x=UEoPw2~HC^SF$2^$P-7m^-`CD!R<p+ybZAZO!yEk1nm@a-Sr?5V@oH*
zcrQ2~K;&@d?glN1P=B?Wb3IUDE!STQUc@M`*CA-((1bf^((hnjwsK&;Cu0tmhef>P
Wx5GrZMcnV?pYc-s!(#42@&5r|czkyN

literal 0
HcmV?d00001

diff --git a/lang/English/profile.php b/lang/English/profile.php
deleted file mode 100644
index 2d19ba6c..00000000
--- a/lang/English/profile.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-// Language definitions used in profile.php
-$lang_profile = array(
-
-// Navigation and sections
-'Profile menu'                    =>    'Profile menu',
-'Section essentials'            =>    'Essentials',
-'Section personal'                =>    'Personal',
-'Section messaging'                =>    'Messaging',
-'Section personality'            =>    'Personality',
-'Section display'                =>    'Display',
-'Section privacy'                =>    'Privacy',
-'Section admin'                    =>    'Administration',
-
-// Miscellaneous
-'Username and pass legend'        =>    'Enter your username and password',
-'Personal details legend'        =>    'Enter your personal details',
-'Contact details legend'        =>    'Enter your messaging details',
-'User activity'                    =>    'User activity',
-'Paginate info'                    =>    'Enter the number of topics and posts you wish to view on each page.',
-
-// Password stuff
-'Pass key bad'                    =>    'The specified password activation key was incorrect or has expired. Please re-request a new password. If that fails, contact the forum administrator at',
-'Pass updated'                    =>    'Your password has been updated. You can now login with your new password.',
-'Pass updated redirect'            =>    'Password updated.',
-'Wrong pass'                    =>    'Wrong old password.',
-'Change pass'                    =>    'Change password',
-'Change pass legend'            =>    'Enter and confirm your new password',
-'Old pass'                        =>    'Old password',
-'New pass'                        =>    'New password',
-'Confirm new pass'                =>    'Confirm new password',
-'Pass info'                        =>    'Passwords must be at least 6 characters long. Passwords are case sensitive.',
-
-// Email stuff
-'Email key bad'                    =>    'The specified email activation key was incorrect or has expired. Please re-request change of email address. If that fails, contact the forum administrator at',
-'Email updated'                    =>    'Your email address has been updated.',
-'Activate email sent'            =>    'An email has been sent to the specified address with instructions on how to activate the new email address. If it doesn\'t arrive you can contact the forum administrator at',
-'Email legend'                    =>    'Enter your new email address',
-'Email instructions'            =>    'An email will be sent to your new address with an activation link. You must click the link in the email you receive to activate the new address.',
-'Change email'                    =>    'Change email address',
-'New email'                        =>    'New email',
-
-// Avatar upload stuff
-'Avatars disabled'                =>    'The administrator has disabled avatar support.',
-'Too large ini'                    =>    'The selected file was too large to upload. The server didn\'t allow the upload.',
-'Partial upload'                =>    'The selected file was only partially uploaded. Please try again.',
-'No tmp directory'                =>    'PHP was unable to save the uploaded file to a temporary location.',
-'No file'                        =>    'You did not select a file for upload.',
-'Bad type'                        =>    'The file you tried to upload is not of an allowed type. Allowed types are gif, jpeg and png.',
-'Too wide or high'                =>    'The file you tried to upload is wider and/or higher than the maximum allowed',
-'Too large'                        =>    'The file you tried to upload is larger than the maximum allowed',
-'pixels'                        =>    'pixels',
-'bytes'                            =>    'bytes',
-'Move failed'                    =>    'The server was unable to save the uploaded file. Please contact the forum administrator at',
-'Unknown failure'                =>    'An unknown error occurred. Please try again.',
-'Avatar upload redirect'        =>    'Avatar uploaded.',
-'Avatar deleted redirect'        =>    'Avatar deleted.',
-'Avatar desc'                    =>    'An avatar is a small image that will be displayed under your username in your posts. It must not be any bigger than',
-'Upload avatar'                    =>    'Upload avatar',
-'Upload avatar legend'            =>    'Enter an avatar file to upload',
-'Delete avatar'                    =>    'Delete avatar', // only for admins
-'File'                            =>    'File',
-'Upload'                        =>    'Upload', // submit button
-
-// Form validation stuff
-'Forbidden title'                =>    'The title you entered contains a forbidden word. You must choose a different title.',
-'Profile redirect'                =>    'Profile updated.',
-
-// Profile display stuff
-'Users profile'                    =>    '%s\'s profile',
-'Username info'                    =>    'Username: %s',
-'Email info'                    =>    'Email: %s',
-'Posts info'                    =>    'Posts: %s',
-'Registered info'                =>    'Registered: %s',
-'Last post info'                =>    'Last post: %s',
-'Last visit info'                =>    'Last visit: %s',
-'Show posts'                    =>    'Show all posts',
-'Show topics'                    =>    'Show all topics',
-'Show subscriptions'            =>    'Show all subscriptions',
-'Realname'                        =>    'Real name',
-'Location'                        =>    'Location',
-'Website'                        =>    'Website',
-'Invalid website URL'            =>    'The website URL you entered is invalid.',
-'Website not allowed'            =>    'You are not allowed to add a website to your profile yet.',
-'Jabber'                        =>    'Jabber',
-'ICQ'                            =>    'ICQ',
-'MSN'                            =>    'Microsoft Account',
-'AOL IM'                        =>    'AOL IM',
-'Yahoo'                            =>    'Yahoo! Messenger',
-'Avatar'                        =>    'Avatar',
-'Signature'                        =>    'Signature',
-'Sig max size'                    =>    'Max length: %s characters / Max lines: %s',
-'Avatar legend'                    =>    'Set your avatar display options',
-'Avatar info'                    =>    'An avatar is a small image that will be displayed with all your posts. You can upload an avatar by clicking the link below.',
-'Change avatar'                    =>    'Change avatar',
-'Signature legend'                =>    'Compose your signature',
-'Signature info'                =>    'A signature is a small piece of text that is attached to your posts. In it, you can enter just about anything you like. Perhaps you would like to enter your favourite quote or your star sign. It\'s up to you! In your signature you can use BBCode if it is allowed in this particular forum. You can see the features that are allowed/enabled listed below whenever you edit your signature.',
-'Sig preview'                    =>    'Current signature preview:',
-'No sig'                        =>    'No signature currently stored in profile.',
-'Signature quote/code/list/h'    =>    'The quote, code, list, and heading BBCodes are not allowed in signatures.',
-'Topics per page'                =>    'Topics',
-'Posts per page'                =>    'Posts',
-'Leave blank'                    =>    'Leave blank to use forum default.',
-'Subscription legend'            =>    'Set your subscription options',
-'Notify full'                    =>    'Include a plain text version of new posts in subscription notification emails.',
-'Auto notify full'                =>    'Automatically subscribe to every topic you post in.',
-'Show smilies'                    =>    'Show smilies as graphic icons.',
-'Show images'                    =>    'Show images in posts.',
-'Show images sigs'                =>    'Show images in user signatures.',
-'Show avatars'                    =>    'Show user avatars in posts.',
-'Show sigs'                        =>    'Show user signatures.',
-'Style legend'                    =>    'Select your preferred style',
-'Styles'                        =>    'Styles',
-'Admin note'                    =>    'Admin note',
-'Pagination legend'                =>    'Enter your pagination options',
-'Post display legend'            =>    'Set your options for viewing posts',
-'Post display info'                =>    'If you are on a slow connection, disabling these options, particularly showing images in posts and signatures, will make pages load faster.',
-'Instructions'                    =>    'When you update your profile, you will be redirected back to this page.',
-
-// Administration stuff
-'Group membership legend'        =>    'Choose user group',
-'Save'                            =>    'Save',
-'Set mods legend'                =>    'Set moderator access',
-'Moderator in info'                =>    'Choose which forums this user should be allowed to moderate. Note: This only applies to moderators. Administrators always have full permissions in all forums.',
-'Update forums'                    =>    'Update forums',
-'Delete ban legend'                =>    'Delete (administrators only) or ban user',
-'Delete user'                    =>    'Delete user',
-'Ban user'                        =>    'Ban user',
-'Confirm delete legend'            =>    'Important: read before deleting user',
-'Confirm delete user'            =>    'Confirm delete user',
-'Confirmation info'                =>    'Please confirm that you want to delete the user', // the username will be appended to this string
-'Delete warning'                =>    'Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by this user, the posts can only be deleted manually at a later time.',
-'Delete posts'                    =>    'Delete any posts and topics this user has made.',
-'Delete'                        =>    'Delete', // submit button (confirm user delete)
-'User delete redirect'            =>    'User deleted.',
-'User promote redirect'            =>    'User promoted.',
-'Group membership redirect'        =>    'Group membership saved.',
-'Update forums redirect'        =>    'Forum moderator rights updated.',
-'Ban redirect'                    =>    'Redirecting …',
-'No delete admin message'        =>    'Administrators cannot be deleted. In order to delete this user, you must first move him/her to a different user group.',
-
-);
diff --git a/lang/English/profile.po b/lang/English/profile.po
new file mode 100644
index 00000000..bbd7f00b
--- /dev/null
+++ b/lang/English/profile.po
@@ -0,0 +1,378 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Profile menu"
+msgstr "Profile menu"
+
+msgid "Section essentials"
+msgstr "Essentials"
+
+msgid "Section personal"
+msgstr "Personal"
+
+msgid "Section messaging"
+msgstr "Messaging"
+
+msgid "Section personality"
+msgstr "Personality"
+
+msgid "Section display"
+msgstr "Display"
+
+msgid "Section privacy"
+msgstr "Privacy"
+
+msgid "Section admin"
+msgstr "Administration"
+
+msgid "Username and pass legend"
+msgstr "Enter your username and password"
+
+msgid "Personal details legend"
+msgstr "Enter your personal details"
+
+msgid "Contact details legend"
+msgstr "Enter your messaging details"
+
+msgid "User activity"
+msgstr "User activity"
+
+msgid "Paginate info"
+msgstr "Enter the number of topics and posts you wish to view on each page."
+
+msgid "Pass key bad"
+msgstr "The specified password activation key was incorrect or has expired. Please re-request a new password. If that fails, contact the forum administrator at"
+
+msgid "Pass updated"
+msgstr "Your password has been updated. You can now login with your new password."
+
+msgid "Pass updated redirect"
+msgstr "Password updated."
+
+msgid "Wrong pass"
+msgstr "Wrong old password."
+
+msgid "Change pass"
+msgstr "Change password"
+
+msgid "Change pass legend"
+msgstr "Enter and confirm your new password"
+
+msgid "Old pass"
+msgstr "Old password"
+
+msgid "New pass"
+msgstr "New password"
+
+msgid "Confirm new pass"
+msgstr "Confirm new password"
+
+msgid "Pass info"
+msgstr "Passwords must be at least 6 characters long. Passwords are case sensitive."
+
+msgid "Email key bad"
+msgstr "The specified email activation key was incorrect or has expired. Please re-request change of email address. If that fails, contact the forum administrator at"
+
+msgid "Email updated"
+msgstr "Your email address has been updated."
+
+msgid "Activate email sent"
+msgstr "An email has been sent to the specified address with instructions on how to activate the new email address. If it doesn't arrive you can contact the forum administrator at"
+
+msgid "Email legend"
+msgstr "Enter your new email address"
+
+msgid "Email instructions"
+msgstr "An email will be sent to your new address with an activation link. You must click the link in the email you receive to activate the new address."
+
+msgid "Change email"
+msgstr "Change email address"
+
+msgid "New email"
+msgstr "New email"
+
+msgid "Avatars disabled"
+msgstr "The administrator has disabled avatar support."
+
+msgid "Too large ini"
+msgstr "The selected file was too large to upload. The server didn't allow the upload."
+
+msgid "Partial upload"
+msgstr "The selected file was only partially uploaded. Please try again."
+
+msgid "No tmp directory"
+msgstr "PHP was unable to save the uploaded file to a temporary location."
+
+msgid "No file"
+msgstr "You did not select a file for upload."
+
+msgid "Bad type"
+msgstr "The file you tried to upload is not of an allowed type. Allowed types are gif, jpeg and png."
+
+msgid "Too wide or high"
+msgstr "The file you tried to upload is wider and/or higher than the maximum allowed"
+
+msgid "Too large"
+msgstr "The file you tried to upload is larger than the maximum allowed"
+
+msgid "pixels"
+msgstr "pixels"
+
+msgid "bytes"
+msgstr "bytes"
+
+msgid "Move failed"
+msgstr "The server was unable to save the uploaded file. Please contact the forum administrator at"
+
+msgid "Unknown failure"
+msgstr "An unknown error occurred. Please try again."
+
+msgid "Avatar upload redirect"
+msgstr "Avatar uploaded."
+
+msgid "Avatar deleted redirect"
+msgstr "Avatar deleted."
+
+msgid "Avatar desc"
+msgstr "An avatar is a small image that will be displayed under your username in your posts. It must not be any bigger than"
+
+msgid "Upload avatar"
+msgstr "Upload avatar"
+
+msgid "Upload avatar legend"
+msgstr "Enter an avatar file to upload"
+
+msgid "Delete avatar"
+msgstr "Delete avatar"
+
+msgid "File"
+msgstr "File"
+
+msgid "Upload"
+msgstr "Upload"
+
+msgid "Forbidden title"
+msgstr "The title you entered contains a forbidden word. You must choose a different title."
+
+msgid "Profile redirect"
+msgstr "Profile updated."
+
+msgid "Users profile"
+msgstr "%s's profile"
+
+msgid "Username info"
+msgstr "Username: %s"
+
+msgid "Email info"
+msgstr "Email: %s"
+
+msgid "Posts info"
+msgstr "Posts: %s"
+
+msgid "Registered info"
+msgstr "Registered: %s"
+
+msgid "Last post info"
+msgstr "Last post: %s"
+
+msgid "Last visit info"
+msgstr "Last visit: %s"
+
+msgid "Show posts"
+msgstr "Show all posts"
+
+msgid "Show topics"
+msgstr "Show all topics"
+
+msgid "Show subscriptions"
+msgstr "Show all subscriptions"
+
+msgid "Realname"
+msgstr "Real name"
+
+msgid "Location"
+msgstr "Location"
+
+msgid "Website"
+msgstr "Website"
+
+msgid "Invalid website URL"
+msgstr "The website URL you entered is invalid."
+
+msgid "Website not allowed"
+msgstr "You are not allowed to add a website to your profile yet."
+
+msgid "Jabber"
+msgstr "Jabber"
+
+msgid "ICQ"
+msgstr "ICQ"
+
+msgid "MSN"
+msgstr "Microsoft Account"
+
+msgid "AOL IM"
+msgstr "AOL IM"
+
+msgid "Yahoo"
+msgstr "Yahoo! Messenger"
+
+msgid "Avatar"
+msgstr "Avatar"
+
+msgid "Signature"
+msgstr "Signature"
+
+msgid "Sig max size"
+msgstr "Max length: %s characters / Max lines: %s"
+
+msgid "Avatar legend"
+msgstr "Set your avatar display options"
+
+msgid "Avatar info"
+msgstr "An avatar is a small image that will be displayed with all your posts. You can upload an avatar by clicking the link below."
+
+msgid "Change avatar"
+msgstr "Change avatar"
+
+msgid "Signature legend"
+msgstr "Compose your signature"
+
+msgid "Signature info"
+msgstr "A signature is a small piece of text that is attached to your posts. In it, you can enter just about anything you like. Perhaps you would like to enter your favourite quote or your star sign. It's up to you! In your signature you can use BBCode if it is allowed in this particular forum. You can see the features that are allowed/enabled listed below whenever you edit your signature."
+
+msgid "Sig preview"
+msgstr "Current signature preview:"
+
+msgid "No sig"
+msgstr "No signature currently stored in profile."
+
+msgid "Signature quote/code/list/h"
+msgstr "The quote, code, list, and heading BBCodes are not allowed in signatures."
+
+msgid "Topics per page"
+msgstr "Topics"
+
+msgid "Posts per page"
+msgstr "Posts"
+
+msgid "Leave blank"
+msgstr "Leave blank to use forum default."
+
+msgid "Subscription legend"
+msgstr "Set your subscription options"
+
+msgid "Notify full"
+msgstr "Include a plain text version of new posts in subscription notification emails."
+
+msgid "Auto notify full"
+msgstr "Automatically subscribe to every topic you post in."
+
+msgid "Show smilies"
+msgstr "Show smilies as graphic icons."
+
+msgid "Show images"
+msgstr "Show images in posts."
+
+msgid "Show images sigs"
+msgstr "Show images in user signatures."
+
+msgid "Show avatars"
+msgstr "Show user avatars in posts."
+
+msgid "Show sigs"
+msgstr "Show user signatures."
+
+msgid "Style legend"
+msgstr "Select your preferred style"
+
+msgid "Styles"
+msgstr "Styles"
+
+msgid "Admin note"
+msgstr "Admin note"
+
+msgid "Pagination legend"
+msgstr "Enter your pagination options"
+
+msgid "Post display legend"
+msgstr "Set your options for viewing posts"
+
+msgid "Post display info"
+msgstr "If you are on a slow connection, disabling these options, particularly showing images in posts and signatures, will make pages load faster."
+
+msgid "Instructions"
+msgstr "When you update your profile, you will be redirected back to this page."
+
+msgid "Group membership legend"
+msgstr "Choose user group"
+
+msgid "Save"
+msgstr "Save"
+
+msgid "Set mods legend"
+msgstr "Set moderator access"
+
+msgid "Moderator in info"
+msgstr "Choose which forums this user should be allowed to moderate. Note: This only applies to moderators. Administrators always have full permissions in all forums."
+
+msgid "Update forums"
+msgstr "Update forums"
+
+msgid "Delete ban legend"
+msgstr "Delete (administrators only) or ban user"
+
+msgid "Delete user"
+msgstr "Delete user"
+
+msgid "Ban user"
+msgstr "Ban user"
+
+msgid "Confirm delete legend"
+msgstr "Important: read before deleting user"
+
+msgid "Confirm delete user"
+msgstr "Confirm delete user"
+
+msgid "Confirmation info"
+msgstr "Please confirm that you want to delete the user"
+
+msgid "Delete warning"
+msgstr "Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by this user, the posts can only be deleted manually at a later time."
+
+msgid "Delete posts"
+msgstr "Delete any posts and topics this user has made."
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "User delete redirect"
+msgstr "User deleted."
+
+msgid "User promote redirect"
+msgstr "User promoted."
+
+msgid "Group membership redirect"
+msgstr "Group membership saved."
+
+msgid "Update forums redirect"
+msgstr "Forum moderator rights updated."
+
+msgid "Ban redirect"
+msgstr "Redirecting …"
+
+msgid "No delete admin message"
+msgstr "Administrators cannot be deleted. In order to delete this user, you must first move him/her to a different user group."
diff --git a/lang/English/register.mo b/lang/English/register.mo
new file mode 100644
index 0000000000000000000000000000000000000000..f076b7ec197bfa69d341ed5f2390572d16f257ad
GIT binary patch
literal 3064
zcma)8O>Z1U5FH?VnGhg+BnKiD5+8|_nZ#BCW`iSQCq@<tG4Tcg2c+Ja+SwsJ-Anh3
zmqp^hg%e0{KwRL2#6LhBI3OX8hzkceAkIkq1|(i}&wB0PAVwL#?Vj$gS5>d7^T*)>
zpCx#X;(Z+N?|7fW`^9begXi?^NpdG}5qKByIpF=k^WFGzhg-k}%)beI0LZ}mfNh5#
z0Pn^4<8J&p@L`O<0v-f@+kO8Lcn`)uci(>n3b((2hk*y~i0h94#m<u*p6T#nhkf8C
zd?<jz|C<Am|98MgG5!H~7T<pZ{*Cb=I5z|yygNyb0X<Ooe+tZiUjknS{sc^cM?vxk
za2+V)w}77jKLX-katzLje@_Effj!_a!1sY?fUhE03iu)L6!1^r*TADNx(xgtC@FXZ
z?}K>d5r089_#?T1Yrz&E#7OueOgj&#247`DxJcd}lEEz=P)iQ&`X+gioJ!mu!z=zK
z7fQ#RtSOVTPS&g$R<0(lRi%@Q>~mU-u#{YqIjYRic0Y}6s8&rrO4hAwYjUk-pS)tp
z@Pr(fKG{^>#~tC9=8{d3T;r1RU=OQ`%5mPrIa`l4Hyj3$0hU(2VJB1g;Z##uL+qS&
ze!sbBY|rAMwiY&p8+8P(dv-?EOgS5GU9vMS+A+i7z2l|%xZA&}Tc>miuWR2UGY&()
zvUHB(&z0kbo>-y96XzB-oqZerr5i>18aog6Jz8hgjM%NNE^J=yr)v&F%%>Ms!#%=W
zdX2X$Svs4#tbCL9oibjl#yTvztW4RelG8q`de@2cf-36Dyf};|27}DH^8CV;jVqVt
z_7}6$3rKXs2B%KPFxv3D&8e|gl{rWGNIB2V%Ju$wx;$Se)`#rUOD4BPWy&5c52|K|
zNRQYoyq><qhLI%UxM`8wh8DBs><qrdVY+2om-AY*(W7YOKQu_HC>;Bnl0B)krV^AI
zn%b6Bo?{6$mK2$`9<U=jB#A+by`)S5y^YnN(p6Jo!b<ojm1k;=+J>stKyya@5o2oD
znq2ZB!p(JCFkv;t%~P=v+>$d37PZpY`o^Ec$XBHiKCnJ9B%?q8`&A<xA#Y{GepnN>
z1#WelkEpf|6gGyzp^@5#Ni(H)TK18Q<5D>ZJdUe84MW9=^L}JoU6ArOumj;j`eUV7
zmnEyL?S!yi$&NZ4UbnuXp+wNO4V)zF3PcQ^!A7XIjIN>^gvHA7&NLTcsxv4O4dHh*
zb{6Le;{uDfE0n*)tf+=i3{*zYQv>S3b18ihnJHt)L4|eUX%MJdqo-&pH;|e!Nc&oW
z=UBN$GAh62;C~&bG<t-%5+fVwWXT%{Pw*BT@Lkci(p3?g+e}ypT-*gU6}E<T^eE9V
zyd9%`O%NRldK-vgID<gNj7DW<T{rB6iu4xffV0+^?dgsEdFqf8StQaOOKfIMbEnJs
zEVNIt@1qwW03m5cH=t)jovIvup{-d{W+W{(u9l?b3R(tVB&phFoF)4hRT?58716c&
z5VCw^v3AGdy{$F&YRyG<(|p&jGm=1yQ3J7QTb77jWwNA?EZ+#4f%tZ01ZTqz=w=q*
z5t1-q5SRxT<j0&>5C^o~MOw-Onky`O^9*9=99#?M2Th@+As|5^u{`z^17g?F=l!n}
zls}3@qhKT*@s2@OU>_Mr>~rhns=|1{IDc+<RyMulLdar^>xCw8Y4!nICRH<v+Le1}
zV{_(HC%^C=`W1C+$uEl9p(9z;7H^B{;#u7V816K%JUJHxic0p7gc5uuwBXrHB&xgj
zqIEc1@1~N`7Cf6ug9y`Td)B~a#b^S%ib%<S6r%cf2Wr0tg3P0UXSXaA7IlX>;OGX|
z40^C(G@j7*x@%aXBw~k>qgEkGs1jv6ZzQubvt-NGEN4h>)3`#5>AvBfZMZcf9MD*c
zc3tBhkeKhL9=b;~KZ_ema4?<6T{tK`hSJ-bU6m_6uS`0w()Yy6)9Ldk{-0ZW%XA*Y
RSt^%8lU+JHHxkP~`3D%zqaXkP

literal 0
HcmV?d00001

diff --git a/lang/English/register.php b/lang/English/register.php
deleted file mode 100644
index b1a80018..00000000
--- a/lang/English/register.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-// Language definitions used in register.php
-$lang_register = array(
-
-// Miscellaneous
-'No new regs'                =>    'This forum is not accepting new registrations.',
-'Reg cancel redirect'        =>    'Registration cancelled.',
-'Forum rules'                =>    'Forum rules',
-'Rules legend'                =>    'You must agree to the following in order to register',
-'Registration flood'        =>    'A new user was registered with the same IP address as you within the last hour. To prevent registration flooding, at least an hour has to pass between registrations from the same IP. Sorry for the inconvenience.',
-'Agree'                        =>    'Agree',
-'Cancel'                    =>    'Cancel',
-'Register'                    =>    'Register',
-
-// Form validation stuff (some of these are also used in post.php)
-'Registration errors'        =>    'Registration errors',
-'Registration errors info'    =>    'The following errors need to be corrected before you can register:',
-'Username censor'            =>    'The username you entered contains one or more censored words. Please choose a different username.',
-'Username dupe 1'            =>    'Someone is already registered with the username',
-'Username dupe 2'            =>    'The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username.',
-'Email not match'            =>    'Email addresses do not match.',
-
-// Registration email stuff
-'Reg email'                    =>    'Thank you for registering. Your password has been sent to the specified address. If it doesn\'t arrive you can contact the forum administrator at',
-'Reg complete'                =>    'Registration complete. You are now logged in.',
-
-// Register info
-'Desc 1'                    =>    'Registration will grant you access to a number of features and capabilities otherwise unavailable. These functions include the ability to edit and delete posts, design your own signature that accompanies your posts and much more. If you have any questions regarding this forum you should ask an administrator.',
-'Desc 2'                    =>    'Below is a form you must fill out in order to register. Once you are registered you should visit your profile and review the different settings you can change. The fields below only make up a small part of all the settings you can alter in your profile.',
-'Username legend'            =>    'Please enter a username between 2 and 25 characters long',
-'Pass legend'                =>    'Please enter and confirm your chosen password',
-'Pass info'                    =>    'Passwords must be at least 6 characters long. Passwords are case sensitive.',
-'Email info'                =>    'You must enter a valid email address as your randomly generated password will be sent to that address.',
-'Confirm email'                =>    'Confirm email address',
-
-);
diff --git a/lang/English/register.po b/lang/English/register.po
new file mode 100644
index 00000000..7cde2e42
--- /dev/null
+++ b/lang/English/register.po
@@ -0,0 +1,84 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "No new regs"
+msgstr "This forum is not accepting new registrations."
+
+msgid "Reg cancel redirect"
+msgstr "Registration cancelled."
+
+msgid "Forum rules"
+msgstr "Forum rules"
+
+msgid "Rules legend"
+msgstr "You must agree to the following in order to register"
+
+msgid "Registration flood"
+msgstr "A new user was registered with the same IP address as you within the last hour. To prevent registration flooding, at least an hour has to pass between registrations from the same IP. Sorry for the inconvenience."
+
+msgid "Agree"
+msgstr "Agree"
+
+msgid "Cancel"
+msgstr "Cancel"
+
+msgid "Register"
+msgstr "Register"
+
+msgid "Registration errors"
+msgstr "Registration errors"
+
+msgid "Registration errors info"
+msgstr "The following errors need to be corrected before you can register:"
+
+msgid "Username censor"
+msgstr "The username you entered contains one or more censored words. Please choose a different username."
+
+msgid "Username dupe 1"
+msgstr "Someone is already registered with the username"
+
+msgid "Username dupe 2"
+msgstr "The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username."
+
+msgid "Email not match"
+msgstr "Email addresses do not match."
+
+msgid "Reg email"
+msgstr "Thank you for registering. Your password has been sent to the specified address. If it doesn't arrive you can contact the forum administrator at"
+
+msgid "Reg complete"
+msgstr "Registration complete. You are now logged in."
+
+msgid "Desc 1"
+msgstr "Registration will grant you access to a number of features and capabilities otherwise unavailable. These functions include the ability to edit and delete posts, design your own signature that accompanies your posts and much more. If you have any questions regarding this forum you should ask an administrator."
+
+msgid "Desc 2"
+msgstr "Below is a form you must fill out in order to register. Once you are registered you should visit your profile and review the different settings you can change. The fields below only make up a small part of all the settings you can alter in your profile."
+
+msgid "Username legend"
+msgstr "Please enter a username between 2 and 25 characters long"
+
+msgid "Pass legend"
+msgstr "Please enter and confirm your chosen password"
+
+msgid "Pass info"
+msgstr "Passwords must be at least 6 characters long. Passwords are case sensitive."
+
+msgid "Email info"
+msgstr "You must enter a valid email address as your randomly generated password will be sent to that address."
+
+msgid "Confirm email"
+msgstr "Confirm email address"
diff --git a/lang/English/search.mo b/lang/English/search.mo
new file mode 100644
index 0000000000000000000000000000000000000000..1f68f853019433a51326c94ee5a3f1f980c6b99e
GIT binary patch
literal 4068
zcma);Pi$009LGlmh2r0eB7!ie<?rs6B34|ep%e;@P%7OTxrnpx&2}Gs``$V;+jSGp
zc)@s3qtR&8Xf)BpfEP8KOgvynO!T52NW93+7!M}Ki{IbOyxnfMRVO>|v-AHqzxn-s
zGuQf8yvC4*kvAe=y@9a_@Z3%KAicYSvDM&v;BDY1;631%;Jx5?;Ck>^@P3f3bnP2J
zY99joz+>R8;IuD42d+VR4!j*~f_H=GLF)G=cnkQEFMkH!f%0W=EqE2Y6Z{2S1^xk&
ze1ChczS+&Y4kUTEg7<+3K$3R`+zh55?fYfVPr(OJz5?RMuH!@d_zfhvRzfJ!M?Xk%
zZv;t>T_Ek}0Js4>=G#M%_N76R<3$iZ_BK8w?}s4G^SQ78+Lyoe?LUEcq5V2Y`~M3h
zeXho)iEBYxcQZJJv)cudeCP0?`Oky2zgNNS;6;$+_!-;+{tnXkeoVFw+yv6R!}vgz
zY}A*Jg4FL6Nb)`lZUSo{$#(%Hy}biI4qgTy1^@KSVenp*%iuWpI+z2mfdz04lsgC(
zK{CCwAn8BxY=ETab0DT<FM$}!-T?7qAK*j%FM?!;Uw~!s2M}9i!%)Wa;6aei^AflU
z`nm!>hVu8=6z!`IN-l!yLDEkN#E;G6L;5%m(mEGF90hyDm*4X3?}N17$G-g%Nb-IK
z_JiMmB=?UXmbZ1JcS@wMJ;<cj8<8oIF38@=riPJ8CQ4*ev_2(FWfRFyiR_!wpo9IA
zOmzNGhqZ?x5L>r<B7IPL1bHVi$xG>B<gLg9$Ye8=wjt9w>_Fzo*5^Um6WIaj=0Rlg
zEjriT$a!S)J+hA+GNoM()+P`-x)My-ribV|ssovXQ8LR$8>X5nuBA{xl^tsFa%!qv
zSJNgJn%7fpbWg2G>rr5<=VYsys!;b1=xON;YG{cC7q8G&>pLHoZ8^tN)u?4+9!<GP
zt#Hi!wf)(XPMWOO38}T1m0Tnt*NyU785ow;rAgdklPRx8*dLh4rr#_IN<urPQ+CSX
zb*XBR)=`?!2+XJh71a&Ob_#=L`=^nJL^q|9A@#HSa(c{4es@nbqF~MoYxQvkQn21y
zC(e=$^*EAxiI#5RdZ%0<;u4KGpEFM4Wg7hkrk&9^a3}*Rhy;)2ER2i!>PnoZ?Lw4f
z)ltHuq>?Tub`M+FSZl;4s>hO7$Ov@TKqWO=bvBPLF4d(im$N)J-DQDUDcf4A3@^9X
zv?CYRP1;2(NV`P3;wGxec1>n(b~qeFDpn$=;nwbEtOGdZO~nl*;ylc|ri(nO+oB%X
zv!A=aBij?cWrPpy*xxs$QnKOvM3{eCDzd{OAD6;Zr8;z|Z|Y<zKc-Mbeg3d8vdB@F
zKPBfQ>Y7y@7uw`Y3Kkj*lPYvNE|S>>{3KtJqPAd0en5n^C^=YhOO(rnRLwrocVgni
zk<R)<h24E)X=30n`BJNnMU8yH4Ax^2CHr|$6-rApGE*AQ@9XrV)hklvk0e1#L8!?0
zl_S#@q{wB`_e}n%Or&x$PNg!83?C}&E9^y!E9R%uh6?1ETcgO`BFl!hDGFsgfUFP=
zi}Gy)dRq=>%m=hP9L<{%VxP7A<vK1o%YP4NZrpN<x%$P?&c`;A=l_H`QoN0I)`WW^
zo^7_~cN%)j!j6)rp%NML#Kpn_E5V!)Gm%l{yus<E9U{4ol0fnnO%ubMI9Zq}bcIn~
z74wpprA&BDgwoCcmxryoA$#`nD#q&qgETxu08Wh?(}}Va;}JdWARmIs78^>El#zC!
z6$~0m!2siyoyEt#GB$+?MAGuRa7$UaP>=q&g@i#=pe>|{<o?Pc9S-736p8nGnkHL6
zRf{y#iKO0e>@Fdc4H1hvJJZ5xn~wOTlx4bm?f+Z<N!%Etfr;j&H8ET{)9zlP?K`uY
z>0C!kSfT6VVl_Krm0}OpZ#WC;Y&6r<04{q8H^QZ#>9Q`g##x&t9k&}Ob%9TjYH{=e
zuDf6qUB^bXd`I#`F$<S0WFZ`P#8@>=F%qh5R->TmbV&xsn`t8sc^u8bEZV0+Ge#BH
zE^u*oTIeur-1Pxj=XlM(3Y<SE``)3oV}w>LN5<bC568|<9(wZjk;`lcp-$B}EXCgZ
zolzuifltf2K={IJ^e%8Nr0XIe&ENvyqmzeo{NyR?v6ClDG+fC_1Up=y{{rulz}-TA
zeexxGTqL3<d0Me<;yW~}q&{bDR%?;2E|!mEXhv}u2o>5uEduh0og_Vn=q3^|eAfh3
zNX#ZG6b`ISYa1N2RhSHOT*PtKfcat=LS_SD`%JT2`ZSI(fMW&jfawPAl8<g%`&{!a
z3Ocd(d;5f_0jiph@L=;cnoVx6@azE~w2QeuHfJ}pfA6w!dP&$G{^IuU!=4M<8&2=V
F{STjGN0I;l

literal 0
HcmV?d00001

diff --git a/lang/English/search.php b/lang/English/search.php
deleted file mode 100644
index 17c7d546..00000000
--- a/lang/English/search.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-// Language definitions used in search.php
-$lang_search = array(
-
-// The search form
-'User search'                        =>    'User search',
-'No search permission'                =>    'You do not have permission to use the search feature.',
-'Search flood'                        =>    'At least %s seconds have to pass between searches. Please wait %s seconds and try searching again.',
-'Search'                            =>    'Search',
-'Search criteria legend'            =>    'Enter your search criteria',
-'Search info'                        =>    'To search by keyword, enter a term or terms to search for. Separate terms with spaces. Use AND, OR and NOT to refine your search. To search by author enter the username of the author whose posts you wish to search for. Use wildcard character * for partial matches.',
-'Keyword search'                    =>    'Keyword search',
-'Author search'                        =>    'Author search',
-'Search in legend'                    =>    'Select where to search',
-'Search in info'                    =>    'Choose in which forum you would like to search and if you want to search in topic subjects, message text or both.',
-'Search multiple forums info'        =>    'If no forums are selected, all forums will be searched.',
-'Forum search'                        =>    'Forum',
-'Search in'                            =>    'Search in',
-'Message and subject'                =>    'Message text and topic subject',
-'Message only'                        =>    'Message text only',
-'Topic only'                        =>    'Topic subject only',
-'Sort by'                            =>    'Sort by',
-'Sort order'                        =>    'Sort order',
-'Search results legend'                =>    'Select how to view search results',
-'Search results info'                =>    'You can choose how you wish to sort and show your results.',
-'Sort by post time'                    =>    'Post time',
-'Sort by author'                    =>    'Author',
-'Sort by subject'                    =>    'Subject',
-'Sort by forum'                        =>    'Forum',
-'Ascending'                            =>    'Ascending',
-'Descending'                        =>    'Descending',
-'Show as'                            =>    'Show results as',
-'Show as topics'                    =>    'Topics',
-'Show as posts'                        =>    'Posts',
-
-// Results
-'Search'                            =>    'Search',
-'Search results'                    =>    'Search results',
-'Quick search show_new'                =>    'New',
-'Quick search show_recent'            =>    'Active',
-'Quick search show_unanswered'        =>    'Unanswered',
-'Quick search show_replies'            =>    'Posted',
-'Quick search show_user_topics'        =>    'Topics by %s',
-'Quick search show_user_posts'        =>    'Posts by %s',
-'Quick search show_subscriptions'    =>    'Subscribed by %s',
-'By keywords show as topics'        =>    'Topics with posts containing \'%s\'',
-'By keywords show as posts'            =>    'Posts containing \'%s\'',
-'By user show as topics'            =>    'Topics with posts by %s',
-'By user show as posts'                =>    'Posts by %s',
-'By both show as topics'            =>    'Topics with posts containing \'%s\', by %s',
-'By both show as posts'                =>    'Posts containing \'%s\', by %s',
-'No terms'                            =>    'You have to enter at least one keyword and/or an author to search for.',
-'No hits'                            =>    'Your search returned no hits.',
-'No user posts'                        =>    'There are no posts by this user in this forum.',
-'No user topics'                    =>    'There are no topics by this user in this forum.',
-'No subscriptions'                    =>    'This user is currently not subscribed to any topics.',
-'No new posts'                        =>    'There are no topics with new posts since your last visit.',
-'No recent posts'                    =>    'No new posts have been made within the last 24 hours.',
-'No unanswered'                        =>    'There are no unanswered posts in this forum.',
-'Go to post'                        =>    'Go to post',
-'Go to topic'                        =>    'Go to topic'
-
-);
diff --git a/lang/English/search.po b/lang/English/search.po
new file mode 100644
index 00000000..0f2f643b
--- /dev/null
+++ b/lang/English/search.po
@@ -0,0 +1,174 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "User search"
+msgstr "User search"
+
+msgid "No search permission"
+msgstr "You do not have permission to use the search feature."
+
+msgid "Search flood"
+msgstr "At least %s seconds have to pass between searches. Please wait %s seconds and try searching again."
+
+msgid "Search"
+msgstr "Search"
+
+msgid "Search criteria legend"
+msgstr "Enter your search criteria"
+
+msgid "Search info"
+msgstr "To search by keyword, enter a term or terms to search for. Separate terms with spaces. Use AND, OR and NOT to refine your search. To search by author enter the username of the author whose posts you wish to search for. Use wildcard character * for partial matches."
+
+msgid "Keyword search"
+msgstr "Keyword search"
+
+msgid "Author search"
+msgstr "Author search"
+
+msgid "Search in legend"
+msgstr "Select where to search"
+
+msgid "Search in info"
+msgstr "Choose in which forum you would like to search and if you want to search in topic subjects, message text or both."
+
+msgid "Search multiple forums info"
+msgstr "If no forums are selected, all forums will be searched."
+
+msgid "Forum search"
+msgstr "Forum"
+
+msgid "Search in"
+msgstr "Search in"
+
+msgid "Message and subject"
+msgstr "Message text and topic subject"
+
+msgid "Message only"
+msgstr "Message text only"
+
+msgid "Topic only"
+msgstr "Topic subject only"
+
+msgid "Sort by"
+msgstr "Sort by"
+
+msgid "Sort order"
+msgstr "Sort order"
+
+msgid "Search results legend"
+msgstr "Select how to view search results"
+
+msgid "Search results info"
+msgstr "You can choose how you wish to sort and show your results."
+
+msgid "Sort by post time"
+msgstr "Post time"
+
+msgid "Sort by author"
+msgstr "Author"
+
+msgid "Sort by subject"
+msgstr "Subject"
+
+msgid "Sort by forum"
+msgstr "Forum"
+
+msgid "Ascending"
+msgstr "Ascending"
+
+msgid "Descending"
+msgstr "Descending"
+
+msgid "Show as"
+msgstr "Show results as"
+
+msgid "Show as topics"
+msgstr "Topics"
+
+msgid "Show as posts"
+msgstr "Posts"
+
+msgid "Search results"
+msgstr "Search results"
+
+msgid "Quick search show_new"
+msgstr "New"
+
+msgid "Quick search show_recent"
+msgstr "Active"
+
+msgid "Quick search show_unanswered"
+msgstr "Unanswered"
+
+msgid "Quick search show_replies"
+msgstr "Posted"
+
+msgid "Quick search show_user_topics"
+msgstr "Topics by %s"
+
+msgid "Quick search show_user_posts"
+msgstr "Posts by %s"
+
+msgid "Quick search show_subscriptions"
+msgstr "Subscribed by %s"
+
+msgid "By keywords show as topics"
+msgstr "Topics with posts containing '%s'"
+
+msgid "By keywords show as posts"
+msgstr "Posts containing '%s'"
+
+msgid "By user show as topics"
+msgstr "Topics with posts by %s"
+
+msgid "By user show as posts"
+msgstr "Posts by %s"
+
+msgid "By both show as topics"
+msgstr "Topics with posts containing '%s', by %s"
+
+msgid "By both show as posts"
+msgstr "Posts containing '%s', by %s"
+
+msgid "No terms"
+msgstr "You have to enter at least one keyword and/or an author to search for."
+
+msgid "No hits"
+msgstr "Your search returned no hits."
+
+msgid "No user posts"
+msgstr "There are no posts by this user in this forum."
+
+msgid "No user topics"
+msgstr "There are no topics by this user in this forum."
+
+msgid "No subscriptions"
+msgstr "This user is currently not subscribed to any topics."
+
+msgid "No new posts"
+msgstr "There are no topics with new posts since your last visit."
+
+msgid "No recent posts"
+msgstr "No new posts have been made within the last 24 hours."
+
+msgid "No unanswered"
+msgstr "There are no unanswered posts in this forum."
+
+msgid "Go to post"
+msgstr "Go to post"
+
+msgid "Go to topic"
+msgstr "Go to topic"
diff --git a/lang/English/topic.mo b/lang/English/topic.mo
new file mode 100644
index 0000000000000000000000000000000000000000..680eb6f72a32f79359530e4da6cac94432ef590e
GIT binary patch
literal 1475
zcmaiyxo;FP6vhn+0hTifS0IH!LV`%Mun380l0_(+L#td%vVqVsJLBw5n6+27hh%B#
z(j!q&K|@6v3M51cReCDu_ya(+NPKT*a!L?uJU<`r_-w!LJ)JKY+9mXU^xx=L(Kim@
zhxYg&V_l#Jc7lzJP4E!r8tevF!4u#bcocjI9tU58N5FNE{6Bz)!A~H?{S4;74Upn}
z&Gx^6<o_ev|CR0k0r9bpj?}LUq<GyR#p?qpKL^Qw06YfX0m-feR&cgSknCSU6zO_{
zALW0W@f}F#dJhhOU%->#Pp}6hV>(waNPhkJQT!_)#T@|YT!m~tob8uD(lrT^u0;?Z
z3-E&^ww$d?km5fBDc*DNJh%oX_X?8#I!Jjxg7jpR^8$JwIyKUatt1xBPovX2Q9GL=
zxvx_gQ(QXR#cZ9>n~mu%s79z!-gD@riyFNLX(JuDp5z>7z@&|eNLazfg3z*Yt(t5i
z7RIu2g?mAug)ux*^|}aH*>DrrjIYBQW>cQAT#(bW3b?PN)haS<My&7<Gd80TbarVe
z3MD8LR1|!)Xhm&CL&GXsJPpMPsG6|nu@Rcxk3;_nZ@~aViZVxEJv3HmB%XtRC=5|)
z%jP#Fv8rl?KKCPKV6`B(w6ceyW<tcNM6vcFXI$x~ak*?IQ&YS(#M5E%n&g*@yl{Oe
z2SLliw@x{59tdqhC0#x)Jlha@WF%LatvV%*Db}4)&kC1g&6&et$aHgwuE?osPnyWH
zO2cT%ll9oE3#Tf)=8lMb*bADWytkC5sMYdH*YD=0%hO}q`3w1*xf1SKNJMS7kkpD*
zd!rS3p&a6V!_!9C;zD)Y8Qiv`>`OvBW71baDC;gCtc7+<h|7h{EjklI3Y}`KD0)<0
z$PeakV<(+D^D5T9D5W`Eo+e>?OUM0Z?L1O3_q5=CtTpsU?H#4Wt>U&38W0b-U05RE
twKi2(Ds6X-CFMai=I&Qy?*FPREym3<b9dAkjgvx42D>V4kKldl?l0XCOUM8K

literal 0
HcmV?d00001

diff --git a/lang/English/topic.php b/lang/English/topic.php
deleted file mode 100644
index 0ef0df93..00000000
--- a/lang/English/topic.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-// Language definitions used in viewtopic.php
-$lang_topic = array(
-
-'Post reply'        =>    'Post reply',
-'Topic closed'        =>    'Topic closed',
-'From'                =>    'From:', // User location
-'Promote user'        =>    'Promote user',
-'IP address logged'    =>    'IP address logged',
-'Note'                =>    'Note:', // Admin note
-'Posts'                =>    'Posts:',
-'Registered'        =>    'Registered:',
-'Replies'            =>    'Replies:',
-'Website'            =>    'Website',
-'Guest'                =>    'Guest',
-'Online'            =>    'Online',
-'Offline'            =>    'Offline',
-'Last edit'            =>    'Last edited by',
-'Report'            =>    'Report',
-'Delete'            =>    'Delete',
-'Edit'                =>    'Edit',
-'Quote'                =>    'Quote',
-'Is subscribed'        =>    'You are currently subscribed to this topic',
-'Unsubscribe'        =>    'Unsubscribe',
-'Subscribe'            =>    'Subscribe to this topic',
-'Quick post'        =>    'Quick reply',
-'Mod controls'        =>    'Moderator controls',
-'New icon'            =>    'New post',
-'Re'                =>    'Re:',
-'Preview'            =>    'Preview'
-
-);
diff --git a/lang/English/topic.po b/lang/English/topic.po
new file mode 100644
index 00000000..4f143767
--- /dev/null
+++ b/lang/English/topic.po
@@ -0,0 +1,93 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Post reply"
+msgstr "Post reply"
+
+msgid "Topic closed"
+msgstr "Topic closed"
+
+msgid "From"
+msgstr "From:"
+
+msgid "Promote user"
+msgstr "Promote user"
+
+msgid "IP address logged"
+msgstr "IP address logged"
+
+msgid "Note"
+msgstr "Note:"
+
+msgid "Posts"
+msgstr "Posts:"
+
+msgid "Registered"
+msgstr "Registered:"
+
+msgid "Replies"
+msgstr "Replies:"
+
+msgid "Website"
+msgstr "Website"
+
+msgid "Guest"
+msgstr "Guest"
+
+msgid "Online"
+msgstr "Online"
+
+msgid "Offline"
+msgstr "Offline"
+
+msgid "Last edit"
+msgstr "Last edited by"
+
+msgid "Report"
+msgstr "Report"
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "Edit"
+msgstr "Edit"
+
+msgid "Quote"
+msgstr "Quote"
+
+msgid "Is subscribed"
+msgstr "You are currently subscribed to this topic"
+
+msgid "Unsubscribe"
+msgstr "Unsubscribe"
+
+msgid "Subscribe"
+msgstr "Subscribe to this topic"
+
+msgid "Quick post"
+msgstr "Quick reply"
+
+msgid "Mod controls"
+msgstr "Moderator controls"
+
+msgid "New icon"
+msgstr "New post"
+
+msgid "Re"
+msgstr "Re:"
+
+msgid "Preview"
+msgstr "Preview"
diff --git a/lang/English/update.mo b/lang/English/update.mo
new file mode 100644
index 0000000000000000000000000000000000000000..18d61df2ff3d7f864483f458fe703aa3bbddb701
GIT binary patch
literal 7678
zcmbW5TZ|-C8OIO0URXpF<f3>vyRys-PWSFC7k6hbz}{fuUdG*7kPu?3yH0l(R9E%Z
zshZi@CyDWaXwU?CFc>e1nivve)L@VYP0*O&i-`$F6L=sRg^*~}7<^FtednC2>6spM
zwKLWKIj5`6`L6%(JN4p~TOL<@4sgAnYs;IIIs?A?X1@6Bd5cn4f_noV2e&f*BzOh*
zAox!30(dp}2>3qmtKjwEkHB|>&x6;1e+>9~n7`(&N?ptRG$_B{0lovgH((6Djq$mF
ztDwm9Fevwb5xfk161)ohA$T453sB_y9VqMl4HWq<VKI^CT2OwU0k?pA!}uU5_nidg
zxfpyqcn*~3E`<5df$w4brGVc7*+M-FiankKWu4!E9{~RZid>hon2c`(Wqbq_{T~S9
z3KYE_1?Bl~g5rv2K(YIeL6Pe@@N)3ipzQm5Q0(w(7{3OJUayDomP?i5PhG|rrdL;k
z^85AR;w4IHu+8`!n}~hC28zDl2Sv`Gfj5CKf)8{5rEGRT<If_D$oU6Q?*AwF4e$zt
zdj|XgcpdkTFv<esM=-kR_bc!z@D=cT;Md=!)Zf7+7C8le3?Wv)C%_843g?P`kAULm
z$N72;{5JR*@Bq#byF3d%$9}&A#m-N#*+KAWQ1pHc6n*{$eh|DC<I8imfvBbqgO7qI
z!~6@N<i;!D7r<#A7P~(Uei!^XxB{MkuTr;ze+Ey3yGQ~9ej5BO_%iqa_*0VN9&kI!
zb{<>>zYP8b6hD6+p+%0zK#}V!pzQY~D1Lq#6np<9jGqU^k1vGrOCYXPFN31*U&HVJ
z05OaE$hy;9a^GGqR8u!|-NyAHE==xhydRw9n&G;EOYB7$yExea%BSVQeedQQbEutM
zH*yhrj#B`IS=2tRU0k?YX)f_6Zg6@7YMu)*Cq5q@n-QHp8pdJ=%;`RobMnE=?lToo
zY$Ns*8$xX^Mz?|T`3TodTzj}~;UW~>N9;To{;%Nx|7_>Fm5b0)>dttWWQi?{sLTtU
zXX&asJctTwO5M$~WmDKB&(vY}Z<%EMv43?^njzz&Fx^s{qR0!Y4p$5_9%hlKTbe?%
z)aJ7~$$I%4{FFu=ld2<88FeCS^eD1+B`@O18NbNHjXKLqqmE`#CpF`WOw4G%(@~K=
z+$d`5%A&gR(;}yy8z1ae3t3snq(>PqM`;r4Uc!dX7R^*Ge3(8FC0S{*DC-(E_P-t)
zYoq?Ab6&|4X4pZf=Ejp|#fh0kL!(aS&g2{X#_WdOnW;u`RMtYC6gw>zW`xg0Z|Bp~
zrc)(p?8aGa&eyZDQ?SfwbFNAX6RR`bA{mvss4^QAJX1zR8Fo=;s%{s>dR3aPhPhas
z^?oUHo#x$#!eeKhSjt1A<XQaSwmo#{a30rEH?wzD#<IELu4NO~E7i{|Eb3lf45JX8
zs(Gvv#cL5-%ia7MSEDrPuGy&hq0B{MtmGZMZr%=ZwDv#T<I_eD6U*k^L72WTuXI!x
zu~jCv^*48-Ovz^byhw~yU6WZtQKFqep7oM`MRH0OqDwWjs-J5tmxyCjzsReRRioUN
z3MV3hvPnOS%BnD`%tuLARaiqUrYw@Sj$sWuud|UG+5@}yY5(tm=}d1spyy`xZCxz#
z2TADGLfi^^%<E$&DhH-GbZG11sioH8f*}I6NINsHnQNUk%ZV^WJ#{>?WoxO3GMfsq
zaMST9>sQ2gYso~zu@&|HNGRxzp5LO=Y3D`%;MNlhCyuV|KiA&16%Hb8Sao&8rlmPw
z?i{7$(!M(I51d^(*4ndnpX}Z<MeAtR%_WxS^`1^rHiFD+lWqM(>n@WSM}G5qF*k8i
z>bdrw_AUJ4hpjVtRdh`t#d+;FQA>lwYFnC-262qWKDv`fMXa4Z>nL^Gf96!Z!|Inl
z^{sJg-7$BA)jM|cB|j{&b}vuUe5DB+t20Bu69^q4ILE;zo>%*!aw7ELraU~qe`okv
zFZ7(mqaqnb#VRc5y+c^(RTLJLs-ft1H0!5{9n8wK?naqTO|)!ynBPb&Q9Cxhs7gx>
z16HQ3@6J~Yg=1DHy$x$+1jxGeNSZ1oZSkzP;JUJ*^EVK36u}zAbu8kF1Wwwv-fxBn
z?=qz$a3|o3*uqIICaT~mryTs}>x#{FoM%&|ez1Z@`jCm;wtpw9XyL_q?YxYlMPNIP
zVwvbAo90N~ti(+&GTQ1+2#<|wqeyH7oxPY==R94kB-Axo=HgXuZ(b}Xi=tYB_f5gp
zL+_wk-$4B%e8}!=W^dGJs>MoD4)n?(fxM2T)%in*^h#tgw=JVIHE~-4C`1IM76T1k
zb(&>AOu?Te?Y)DX$)`M(wMT=|lq-^L6;>E$#4{g1P65)>Q5Nfgp+f3`1Y3riY87e;
zXJ9U;1#z%mNmqhh%@A=-gs{$!L-DaWPgg=I^1LkeZ&qG=uAewJhg4Wc!a?>r%_jPZ
zu@t)(4Y0AaAS9}oC79p(lDU$k>8y@=68q530Q(LjN}LGQ1RVKVbz$=;l|ae*#!AkQ
z%RO7SEgH`_UaYfXO|v5RfzaKoJCg-{?0P$)Z|M8PkBuZgo2RH>)u>-Yt~=<-!u8E_
z?cME$e<lpGMm^JYXg2am3asy3X4;|M^1_U@WJ~0Zalr@|xe8kAFWhMJx<d(07skrF
z=uI%=j<MyO>>;+7kzLYy2#qDgm2Yx<@D-*HnX_rET~eU#s<z26Nu$EuC!uC%CAlTK
zhVuCKPTtwBC5pFqo_(sby{!%z*jwxwY3Q^RYLmij5i8fdh_2C*d62KI7kzMd2YF6>
zN3i``v*)*pNKILyt<N?Kxm+UThE7<*A*#xpP^X)b{)<v!r8yVN4cU{3F-2fYGpy;>
z$61@IBWb)At9AIge0Gf6<c=6y;sTG-tQUFL#55rEKm7qEB6<i7vQ<(54>_|($bqU(
zWl8{Mh|S1kE~au%>2@UbEmQy$#O%(X68bi|0R4Iv-YCcs$LGxUIl>UxL$|x`P%^4f
z{ZJEm9mAdOgn$_;<ZG)Vbn(J$G&z#Cjaot`l8baXLWDjC^KLc7qOKjfT{sakoQ3<O
z1LoPnKy%?_(CpdpOj|pOs9fV6s82SWypzBrW^kXQZ0u6gm~b-w9E}VaBvN^@-C?ID
z_pO-|XUQQza@f@5E(&{obfws>(uh$%crm+<ooF^a-7KMBIO$*@8VF%Q(JW3Z?cAzQ
z1D_hikVH)50~xsBvNmM5bb)>aDMG9w#~7AK6GD!}tt3aKIVSHU+6I+y?5fZ}N$aTZ
zUOI6+1bSFlQk0O`td*m1b3AS;pX6GEE^;XIzLsZ^!-YAKM+*;AM4h}Ub<1htVwIE+
zDoadicWy{mx2bi<xw^hAoLD?{dg;!SOSC0*>lQdm>P2iyT6M9Rn9|jl#k&`YlI4WX
zM<SE{hLR!Hah23oBRM2E6~(U9Sl1h)hon8{l`+Oghd7jmK%COz`wSM!ZqE0ir4cDI
zy>RAKYtNor_qOIFzH70DhHhL8<Rpb^W%td?k+<U5I<s|@uDIOB&F)x_c!4f`)I000
zB@aKls^&Z|@$Jm+tl$+RafVS=2{Yo<@$8lWh;s=ye?xu37`K8H79{EA6@eA#AQ0d<
zQ?%t|KAA~G+j0_fe7<j8vmK?vIs}dM3av74@g&-c)v!w7V%gcTT2it&ZR+^>ef_~<
z;vg@YHMgkKu2lF!q^9d5{ft^zqm(B3U|nAd5Tq8fW5h<Bvvh}&Na@WpLMpW!0-!=C
zb8x2fHa+KT-L=)0Cxlai*oA{5#wobVC#xh+pDb1DUMP$itTC&!rgoDT4Q<WcF5xqZ
z?+)7@d-JeTNT(S*Ca)oyn(J(9rG7~+Nt*e4BljkwX}@^;(WS>-)s4hi-l`2CkshL(
zx?3OkCya?ezGnKI_R$dXyU~uNppaJH3(-Kl)#V_txC=mD7zh!$q>y6fogjfPOeI@y
zay)JP;g6T@w(;;K#HDX>t4e1RJQemud@8f+e}a|WTSG^!6#Tl{I+iB#XheLo5%sN}
z_Ahj1*fJa=ef~oIu=|GgM_3i*q%6p8LfO7YlaV{Om16PwJ<xxDeo}67Ib^X&DxwRQ
zEpnQVS@t4Cnq0E3GOjNdx~n<U>Zw`n`@{P+8To*mq;rlt|6TAiA<NLV&cclis*AE<
zDG7Sto7EE%5Oo*9BJxTrG_xCSbTJkuJzk-B%6E<;(UDb}Q;`^MN=J}BO;8~{=9-F}
z;aV3&w_UBhGZSi2?PXo5PisCMGoW-kQnPT%Q2H}hSa#pKw!C%k;U?A%aWd_SswrmP
zcy%cvwH~`KdR=+>w|?1sHoWTdMr?A|af6g#dC6c6O*W~--Zdjcb!ls!u-yT@IdtX<
zHKiSkJ0=ZO<yp8bRI%=5qGR>?C?;=?+V#>qZss*oIK~k*wbs52+`?~&ggnw(aWa!)
u=vY&HP<M$0O{g0}4#cx-cu|C0G4*=@*Ht;<QUB*VO^IC30{`3F&3^;$i$!<<

literal 0
HcmV?d00001

diff --git a/lang/English/update.php b/lang/English/update.php
deleted file mode 100644
index 96b19a23..00000000
--- a/lang/English/update.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-// Language definitions used in db_update.php
-
-$lang_update = array(
-
-'Update'                        =>    'Update FluxBB',
-'Update message'                =>    'Your FluxBB database is out-of-date and must be upgraded in order to continue. If you are the board administrator, please follow the instructions below to complete the upgrade.',
-'Note'                            =>    'Note:',
-'Members message'                =>    'This process is for board administrators only. If you are a member there is nothing to worry about - the forums will be back shortly!',
-'Administrator only'            =>    'This step is for the board administrator only!',
-'Database password info'        =>    'To perform the database update please enter the database password with which FluxBB was installed. If you cannot remember, this is stored in your \'config.php\' file.',
-'Database password note'        =>    'If you are running SQLite (and hence have no database password) please use the database file name instead. This must exactly match the database file name given in your configuration file.',
-'Database password'                =>    'Database password',
-'Maintenance'                    =>    'Maintenance',
-'Maintenance message info'        =>    'The message that will be displayed to users during the updating process. This text will not be parsed like regular posts and thus may contain HTML.',
-'Maintenance message'            =>    'Maintenance message',
-
-'You are running error'            =>    'You are running %1$s version %2$s. FluxBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue.',
-'Version mismatch error'        =>    'Version mismatch. The database \'%s\' doesn\'t seem to be running a FluxBB database schema supported by this update script.',
-'Invalid file error'            =>    'Invalid database file name. When using SQLite the database file name must be entered exactly as it appears in your \'%s\'',
-'Invalid password error'        =>    'Invalid database password. To upgrade FluxBB you must enter your database password exactly as it appears in your \'%s\'',
-'No password error'                =>    'No database password provided',
-'Script runs error'                =>    'It appears the update script is already being ran by someone else. If this is not the case, please manually delete the file \'%s\' and try again',
-'No update error'                =>    'Your forum is already as up-to-date as this script can make it',
-
-'Intro 1'                        =>    'This script will update your forum database. The update procedure might take anything from a second to hours depending on the speed of the server and the size of the forum database. Don\'t forget to make a backup of the database before continuing.',
-'Intro 2'                        =>    'Did you read the update instructions in the documentation? If not, start there.',
-'No charset conversion'            =>    '<strong>IMPORTANT!</strong> FluxBB has detected that this PHP environment does not have support for the encoding mechanisms required to do UTF-8 conversion from character sets other than ISO-8859-1. What this means is that if the current character set is not ISO-8859-1, FluxBB won\'t be able to convert your forum database to UTF-8 and you will have to do it manually. Instructions for doing manual charset conversion can be found in the update instructions.',
-'Enable conversion'                =>    '<strong>Enable conversion:</strong> When enabled this update script will, after it has made the required structural changes to the database, convert all text in the database from the current character set to UTF-8. This conversion is required if you\'re upgrading from version 1.2.',
-'Current character set'            =>    '<strong>Current character set:</strong> If the primary language in your forum is English, you can leave this at the default value. However, if your forum is non-English, you should enter the character set of the primary language pack used in the forum. <em>Getting this wrong can corrupt your database so don\'t just guess!</em> Note: This is required even if the old database is UTF-8.',
-'Charset conversion'            =>    'Charset conversion',
-'Enable conversion label'        =>    '<strong>Enable conversion</strong> (perform database charset conversion).',
-'Current character set label'    =>    'Current character set',
-'Current character set info'    =>    'Accept default for English forums otherwise the character set of the primary language pack.',
-'Start update'                    =>    'Start update',
-'Error converting users'        =>    'Error converting users',
-'Error info 1'                    =>    'There was an error converting some users. This can occur when converting from FluxBB v1.2 if multiple users have registered with very similar usernames, for example "bob" and "böb".',
-'Error info 2'                    =>    'Below is a list of users who failed to convert. Please choose a new username for each user. Users who are renamed will automatically be sent an email alerting them of the change.',
-'New username'                    =>    'New username',
-'Required'                        =>    '(Required)',
-'Correct errors'                =>    'The following errors need to be corrected:',
-'Rename users'                    =>    'Rename users',
-'Successfully updated'            =>    'Your forum database was successfully updated. You may now %s.',
-'go to index'                    =>    'go to the forum index',
-
-'Unable to lock error'            =>    'Unable to write update lock. Please make sure PHP has write access to the directory \'%s\' and no-one else is currently running the update script.',
-
-'Converting'                    =>    'Converting %s …',
-'Converting item'                =>    'Converting %1$s %2$s …',
-'Preparsing item'                =>    'Preparsing %1$s %2$s …',
-'Rebuilding index item'            =>    'Rebuilding index for %1$s %2$s',
-
-'ban'                            =>    'ban',
-'categories'                    =>    'categories',
-'censor words'                    =>    'censor words',
-'configuration'                    =>    'configuration',
-'forums'                        =>    'forums',
-'groups'                        =>    'groups',
-'post'                            =>    'post',
-'report'                        =>    'report',
-'topic'                            =>    'topic',
-'user'                            =>    'user',
-'signature'                        =>    'signature',
-
-'Username too short error'        =>    'Usernames must be at least 2 characters long. Please choose another (longer) username.',
-'Username too long error'        =>    'Usernames must not be more than 25 characters long. Please choose another (shorter) username.',
-'Username Guest reserved error'    =>    'The username guest is reserved. Please choose another username.',
-'Username IP format error'        =>    'Usernames may not be in the form of an IP address. Please choose another username.',
-'Username bad characters error'    =>    'Usernames may not contain all the characters \', " and [ or ] at once. Please choose another username.',
-'Username BBCode error'            =>    'Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username.',
-'Username duplicate error'        =>    'Someone is already registered with the username %s. The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username.',
-
-);
diff --git a/lang/English/update.po b/lang/English/update.po
new file mode 100644
index 00000000..6611a073
--- /dev/null
+++ b/lang/English/update.po
@@ -0,0 +1,195 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Update"
+msgstr "Update FluxBB"
+
+msgid "Update message"
+msgstr "Your FluxBB database is out-of-date and must be upgraded in order to continue. If you are the board administrator, please follow the instructions below to complete the upgrade."
+
+msgid "Note"
+msgstr "Note:"
+
+msgid "Members message"
+msgstr "This process is for board administrators only. If you are a member there is nothing to worry about - the forums will be back shortly!"
+
+msgid "Administrator only"
+msgstr "This step is for the board administrator only!"
+
+msgid "Database password info"
+msgstr "To perform the database update please enter the database password with which FluxBB was installed. If you cannot remember, this is stored in your 'config.php' file."
+
+msgid "Database password note"
+msgstr "If you are running SQLite (and hence have no database password) please use the database file name instead. This must exactly match the database file name given in your configuration file."
+
+msgid "Database password"
+msgstr "Database password"
+
+msgid "Maintenance"
+msgstr "Maintenance"
+
+msgid "Maintenance message info"
+msgstr "The message that will be displayed to users during the updating process. This text will not be parsed like regular posts and thus may contain HTML."
+
+msgid "Maintenance message"
+msgstr "Maintenance message"
+
+msgid "You are running error"
+msgstr "You are running %1$s version %2$s. FluxBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue."
+
+msgid "Version mismatch error"
+msgstr "Version mismatch. The database '%s' doesn't seem to be running a FluxBB database schema supported by this update script."
+
+msgid "Invalid file error"
+msgstr "Invalid database file name. When using SQLite the database file name must be entered exactly as it appears in your '%s'"
+
+msgid "Invalid password error"
+msgstr "Invalid database password. To upgrade FluxBB you must enter your database password exactly as it appears in your '%s'"
+
+msgid "No password error"
+msgstr "No database password provided"
+
+msgid "Script runs error"
+msgstr "It appears the update script is already being ran by someone else. If this is not the case, please manually delete the file '%s' and try again"
+
+msgid "No update error"
+msgstr "Your forum is already as up-to-date as this script can make it"
+
+msgid "Intro 1"
+msgstr "This script will update your forum database. The update procedure might take anything from a second to hours depending on the speed of the server and the size of the forum database. Don't forget to make a backup of the database before continuing."
+
+msgid "Intro 2"
+msgstr "Did you read the update instructions in the documentation? If not, start there."
+
+msgid "No charset conversion"
+msgstr "<strong>IMPORTANT!</strong> FluxBB has detected that this PHP environment does not have support for the encoding mechanisms required to do UTF-8 conversion from character sets other than ISO-8859-1. What this means is that if the current character set is not ISO-8859-1, FluxBB won't be able to convert your forum database to UTF-8 and you will have to do it manually. Instructions for doing manual charset conversion can be found in the update instructions."
+
+msgid "Enable conversion"
+msgstr "<strong>Enable conversion:</strong> When enabled this update script will, after it has made the required structural changes to the database, convert all text in the database from the current character set to UTF-8. This conversion is required if you're upgrading from version 1.2."
+
+msgid "Current character set"
+msgstr "<strong>Current character set:</strong> If the primary language in your forum is English, you can leave this at the default value. However, if your forum is non-English, you should enter the character set of the primary language pack used in the forum. <em>Getting this wrong can corrupt your database so don't just guess!</em> Note: This is required even if the old database is UTF-8."
+
+msgid "Charset conversion"
+msgstr "Charset conversion"
+
+msgid "Enable conversion label"
+msgstr "<strong>Enable conversion</strong> (perform database charset conversion)."
+
+msgid "Current character set label"
+msgstr "Current character set"
+
+msgid "Current character set info"
+msgstr "Accept default for English forums otherwise the character set of the primary language pack."
+
+msgid "Start update"
+msgstr "Start update"
+
+msgid "Error converting users"
+msgstr "Error converting users"
+
+msgid "Error info 1"
+msgstr "There was an error converting some users. This can occur when converting from FluxBB v1.2 if multiple users have registered with very similar usernames, for example \"bob\" and \"böb\"."
+
+msgid "Error info 2"
+msgstr "Below is a list of users who failed to convert. Please choose a new username for each user. Users who are renamed will automatically be sent an email alerting them of the change."
+
+msgid "New username"
+msgstr "New username"
+
+msgid "Required"
+msgstr "(Required)"
+
+msgid "Correct errors"
+msgstr "The following errors need to be corrected:"
+
+msgid "Rename users"
+msgstr "Rename users"
+
+msgid "Successfully updated"
+msgstr "Your forum database was successfully updated. You may now %s."
+
+msgid "go to index"
+msgstr "go to the forum index"
+
+msgid "Unable to lock error"
+msgstr "Unable to write update lock. Please make sure PHP has write access to the directory '%s' and no-one else is currently running the update script."
+
+msgid "Converting"
+msgstr "Converting %s …"
+
+msgid "Converting item"
+msgstr "Converting %1$s %2$s …"
+
+msgid "Preparsing item"
+msgstr "Preparsing %1$s %2$s …"
+
+msgid "Rebuilding index item"
+msgstr "Rebuilding index for %1$s %2$s"
+
+msgid "ban"
+msgstr "ban"
+
+msgid "categories"
+msgstr "categories"
+
+msgid "censor words"
+msgstr "censor words"
+
+msgid "configuration"
+msgstr "configuration"
+
+msgid "forums"
+msgstr "forums"
+
+msgid "groups"
+msgstr "groups"
+
+msgid "post"
+msgstr "post"
+
+msgid "report"
+msgstr "report"
+
+msgid "topic"
+msgstr "topic"
+
+msgid "user"
+msgstr "user"
+
+msgid "signature"
+msgstr "signature"
+
+msgid "Username too short error"
+msgstr "Usernames must be at least 2 characters long. Please choose another (longer) username."
+
+msgid "Username too long error"
+msgstr "Usernames must not be more than 25 characters long. Please choose another (shorter) username."
+
+msgid "Username Guest reserved error"
+msgstr "The username guest is reserved. Please choose another username."
+
+msgid "Username IP format error"
+msgstr "Usernames may not be in the form of an IP address. Please choose another username."
+
+msgid "Username bad characters error"
+msgstr "Usernames may not contain all the characters ', \" and [ or ] at once. Please choose another username."
+
+msgid "Username BBCode error"
+msgstr "Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username."
+
+msgid "Username duplicate error"
+msgstr "Someone is already registered with the username %s. The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username."
diff --git a/lang/English/userlist.mo b/lang/English/userlist.mo
new file mode 100644
index 0000000000000000000000000000000000000000..74d6b6eaf7013ca1abd4270b4dcbf6b1c58fd784
GIT binary patch
literal 898
zcmY+C!H&}~5QYORAc6!4t{jHjf=EgchbpBAwzO!a-KAo?2qX?T@gy~*c4WK2-Z>(1
zLgG>2%meTSh&!*qf#1z;yIA@(p7D%llHb3sZhVQb&V%b<3NC_AAgpiT0{9L>{0F!K
zeu5bM2EqRWE`h&batgWN4EC>1N6}^2*Ra=M8`x0y5%w$WXV{mpn@C1UbQXlQ0m4k@
zf^%YpJ5drvkLsEhj;)LK44IM|<GhOw5TR0ONi|ojWgDohSv2j|v9QIAlrGItz*yh9
zlX_uAos5m0yNq<Rblu=?pW5wUQ`3zBb#M0Li8XJy@X5AJo?`@MbVg$qe#UldE1o=^
zCPNDs@#L}aoDpKlGk&K+>TzgCIG;?d(5@EVSS0NTT`fe#$&|(X#Eo=c$hp!F%eF<H
zr^Z$f;@$1t(Yk*(y%P_O_N;O1VS}cgKln~l3#I#1%!GC92M5z}(p%?+?j_q~qzfaJ
zt}^Q7%C82=h;{rTdBU1)JLAN#RGzwNFTID8)=l=!!WKMidt}r$2@*wni+K)7RsxNK
zHUhZt-&+BfqO}^0Fux_SJkVm!<P9B3RvH{=*$HNOPRo*zQK~wW<%cOvXS^;h71xpq
zp($rPh|*JD3;i}FbR>vH?^P`eVUdH;MG-E!MWIn6tXHC@x$wn|T^jAL#zh+nqunM6
kX~}Y>912+y>h%AgyZln6Nw@-!5&yR%`FM+T$u^Dt0lG5+eE<Le

literal 0
HcmV?d00001

diff --git a/lang/English/userlist.php b/lang/English/userlist.php
deleted file mode 100644
index fc089f34..00000000
--- a/lang/English/userlist.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-// Language definitions used in userlist.php
-$lang_ul = array(
-
-'User find legend'    =>    'Find and sort users',
-'User search info'    =>    'Enter a username to search for and/or a user group to filter by. The username field can be left blank. Use the wildcard character * for partial matches.',
-'User sort info'    =>    'Sort users by name, date registered or number of posts and in ascending/descending order.',
-'User group'        =>    'User group',
-'No of posts'        =>    'Number of posts',
-'All users'            =>    'All'
-
-);
diff --git a/lang/English/userlist.po b/lang/English/userlist.po
new file mode 100644
index 00000000..4f7d81df
--- /dev/null
+++ b/lang/English/userlist.po
@@ -0,0 +1,33 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "User find legend"
+msgstr "Find and sort users"
+
+msgid "User search info"
+msgstr "Enter a username to search for and/or a user group to filter by. The username field can be left blank. Use the wildcard character * for partial matches."
+
+msgid "User sort info"
+msgstr "Sort users by name, date registered or number of posts and in ascending/descending order."
+
+msgid "User group"
+msgstr "User group"
+
+msgid "No of posts"
+msgstr "Number of posts"
+
+msgid "All users"
+msgstr "All"
diff --git a/model/delete.php b/model/delete.php
index aa711016..f2b4f523 100644
--- a/model/delete.php
+++ b/model/delete.php
@@ -24,8 +24,6 @@ public function __construct()
  
     public function get_info_delete($id)
     {
-
-        
         $select_get_info_delete = array('fid' => 'f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_replies',  'fp.post_topics', 'tid' => 't.id', 't.subject', 't.first_post_id', 't.closed', 'p.poster', 'p.posted', 'p.poster_id', 'p.message', 'p.hide_smilies');
         $where_get_info_delete = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -52,8 +50,6 @@ public function get_info_delete($id)
 
     public function handle_deletion($is_topic_post, $id, $tid, $fid)
     {
-        global $lang_delete;
-
         require FEATHER_ROOT.'include/search_idx.php';
 
         if ($is_topic_post) {
@@ -61,7 +57,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
             delete_topic($tid);
             update_forum($fid);
 
-            redirect(get_link('forum/'.$fid.'/'), $lang_delete['Topic del redirect']);
+            redirect(get_link('forum/'.$fid.'/'), __('Topic del redirect'));
         } else {
             // Delete just this one post
             delete_post($id, $tid);
@@ -75,7 +71,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
                 ->order_by_desc('id')
                 ->find_one();
 
-            redirect(get_link('post/'.$post['id'].'/#p'.$post['id']), $lang_delete['Post del redirect']);
+            redirect(get_link('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
         }
     }
 }
diff --git a/model/edit.php b/model/edit.php
index 18bf6b02..b14e870b 100644
--- a/model/edit.php
+++ b/model/edit.php
@@ -53,7 +53,7 @@ public function get_info_edit($id)
 
     public function check_errors_before_edit($id, $can_edit_subject, $errors)
     {
-        global $lang_post, $pd;
+        global $pd;
 
         // If it's a topic it must contain a subject
         if ($can_edit_subject) {
@@ -64,13 +64,13 @@ public function check_errors_before_edit($id, $can_edit_subject, $errors)
             }
 
             if ($subject == '') {
-                $errors[] = $lang_post['No subject'];
+                $errors[] = __('No subject');
             } elseif ($this->config['o_censoring'] == '1' && $censored_subject == '') {
-                $errors[] = $lang_post['No subject after censoring'];
+                $errors[] = __('No subject after censoring');
             } elseif (feather_strlen($subject) > 70) {
-                $errors[] = $lang_post['Too long subject'];
+                $errors[] = __('Too long subject');
             } elseif ($this->config['p_subject_all_caps'] == '0' && is_all_uppercase($subject) && !$this->user->is_admmod) {
-                $errors[] = $lang_post['All caps subject'];
+                $errors[] = __('All caps subject');
             }
         }
 
@@ -79,9 +79,9 @@ public function check_errors_before_edit($id, $can_edit_subject, $errors)
 
         // Here we use strlen() not feather_strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         if (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            $errors[] = sprintf($lang_post['Too long message'], forum_number_format(FEATHER_MAX_POSTSIZE));
+            $errors[] = sprintf(__('Too long message'), forum_number_format(FEATHER_MAX_POSTSIZE));
         } elseif ($this->config['p_message_all_caps'] == '0' && is_all_uppercase($message) && !$this->user->is_admmod) {
-            $errors[] = $lang_post['All caps message'];
+            $errors[] = __('All caps message');
         }
 
         // Validate BBCode syntax
@@ -92,13 +92,13 @@ public function check_errors_before_edit($id, $can_edit_subject, $errors)
 
         if (empty($errors)) {
             if ($message == '') {
-                $errors[] = $lang_post['No message'];
+                $errors[] = __('No message');
             } elseif ($this->config['o_censoring'] == '1') {
                 // Censor message to see if that causes problems
                 $censored_message = feather_trim(censor_words($message));
 
                 if ($censored_message == '') {
-                    $errors[] = $lang_post['No message after censoring'];
+                    $errors[] = __('No message after censoring');
                 }
             }
         }
@@ -186,8 +186,6 @@ public function edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod)
 
     public function get_checkboxes($can_edit_subject, $is_admmod, $cur_post, $cur_index)
     {
-        global $lang_post;
-
         $checkboxes = array();
 
         if ($can_edit_subject && $is_admmod) {
@@ -200,17 +198,17 @@ public function get_checkboxes($can_edit_subject, $is_admmod, $cur_post, $cur_in
 
         if ($this->config['o_smilies'] == '1') {
             if ($this->request->post('hide_smilies') || $cur_post['hide_smilies'] == '1') {
-                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.$lang_post['Hide smilies'].'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.__('Hide smilies').'<br /></label>';
             } else {
-                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'" />'.$lang_post['Hide smilies'].'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'" />'.__('Hide smilies').'<br /></label>';
             }
         }
 
         if ($is_admmod) {
             if ($this->request->isPost() && $this->request->post('silent') || $this->request->isPost() == '') {
-                $checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" checked="checked" />'.$lang_post['Silent edit'].'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" checked="checked" />'.__('Silent edit').'<br /></label>';
             } else {
-                $checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" />'.$lang_post['Silent edit'].'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" />'.__('Silent edit').'<br /></label>';
             }
         }
 
diff --git a/model/index.php b/model/index.php
index 5e773df5..228ea44c 100644
--- a/model/index.php
+++ b/model/index.php
@@ -104,8 +104,6 @@ public function get_new_posts()
     // Returns the elements needed to display categories and their forums
     public function print_categories_forums()
     {
-        global $lang_index;
-
         // Get list of forums and topics with new posts since last visit
         if (!$this->user->is_guest) {
             $new_topics = $this->get_new_posts();
@@ -166,7 +164,7 @@ public function print_categories_forums()
 
             // Is this a redirect forum?
             if ($cur_forum->redirect_url != '') {
-                $cur_forum->forum_field = '<h3><span class="redirtext">'.$lang_index['Link to'].'</span> <a href="'.feather_escape($cur_forum->redirect_url).'" title="'.$lang_index['Link to'].' '.feather_escape($cur_forum->redirect_url).'">'.feather_escape($cur_forum->forum_name).'</a></h3>';
+                $cur_forum->forum_field = '<h3><span class="redirtext">'.__('Link to').'</span> <a href="'.feather_escape($cur_forum->redirect_url).'" title="'.__('Link to').' '.feather_escape($cur_forum->redirect_url).'">'.feather_escape($cur_forum->forum_name).'</a></h3>';
                 $cur_forum->num_topics_formatted = $cur_forum->num_posts_formatted = '-';
                 $cur_forum->item_status .= ' iredirect';
                 $cur_forum->icon_type = 'icon';
diff --git a/model/login.php b/model/login.php
index 14a06e67..5c5ac99d 100644
--- a/model/login.php
+++ b/model/login.php
@@ -24,8 +24,6 @@ public function __construct()
  
     public function login()
     {
-        global $db_type, $lang_login;
-
         $form_username = feather_trim($this->request->post('req_username'));
         $form_password = feather_trim($this->request->post('req_password'));
         $save_pass = $this->request->post('save_pass');
@@ -56,7 +54,7 @@ public function login()
         }
 
         if (!$authorized) {
-            message($lang_login['Wrong user/pass'].' <a href="'.get_link('login/action/forget/').'">'.$lang_login['Forgotten pass'].'</a>');
+            message(__('Wrong user/pass').' <a href="'.get_link('login/action/forget/').'">'.__('Forgotten pass').'</a>');
         }
 
         // Update the status if this is the first time the user logged in
@@ -87,13 +85,11 @@ public function login()
         // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after login)
         $redirect_url = validate_redirect($this->request->post('redirect_url'), get_base_url());
 
-        redirect(feather_escape($redirect_url), $lang_login['Login redirect']);
+        redirect(feather_escape($redirect_url), __('Login redirect'));
     }
 
     public function logout($id, $token)
     {
-        global $lang_login;
-
         if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != feather_hash($this->user->id.feather_hash(get_remote_address()))) {
             header('Location: '.get_base_url());
             exit;
@@ -113,13 +109,11 @@ public function logout($id, $token)
 
         feather_setcookie(1, feather_hash(uniqid(rand(), true)), time() + 31536000);
 
-        redirect(get_base_url(), $lang_login['Logout redirect']);
+        redirect(get_base_url(), __('Logout redirect'));
     }
 
     public function password_forgotten()
     {
-        global $lang_login;
-
         if (!$this->user->is_guest) {
             header('Location: '.get_base_url());
             exit;
@@ -161,7 +155,7 @@ public function password_forgotten()
                     // Loop through users we found
                     foreach($result as $cur_hit) {
                         if ($cur_hit->last_email_sent != '' && (time() - $cur_hit->last_email_sent) < 3600 && (time() - $cur_hit->last_email_sent) >= 0) {
-                            message(sprintf($lang_login['Email flood'], intval((3600 - (time() - $cur_hit->last_email_sent)) / 60)), true);
+                            message(sprintf(__('Email flood'), intval((3600 - (time() - $cur_hit->last_email_sent)) / 60)), true);
                         }
 
                         // Generate a new password and a new password activation code
@@ -187,9 +181,9 @@ public function password_forgotten()
                         pun_mail($email, $mail_subject, $cur_mail_message);
                     }
 
-                    message($lang_login['Forget mail'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
+                    message(__('Forget mail').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
                 } else {
-                    $errors[] = $lang_login['No email match'].' '.htmlspecialchars($email).'.';
+                    $errors[] = __('No email match').' '.htmlspecialchars($email).'.';
                 }
             }
         }
diff --git a/model/misc.php b/model/misc.php
index 9e431f2d..e836c72d 100644
--- a/model/misc.php
+++ b/model/misc.php
@@ -32,8 +32,6 @@ public function update_last_visit()
 
     public function get_info_mail($recipient_id)
     {
-
-        
         $select_get_info_mail = array('username', 'email', 'email_setting');
         
         $mail = DB::for_table('users')
@@ -53,24 +51,22 @@ public function get_info_mail($recipient_id)
 
     public function send_email($mail, $id)
     {
-        global $lang_misc;
-
         // Clean up message and subject from POST
         $subject = feather_trim($this->request->post('req_subject'));
         $message = feather_trim($this->request->post('req_message'));
 
         if ($subject == '') {
-            message($lang_misc['No email subject']);
+            message(__('No email subject'));
         } elseif ($message == '') {
-            message($lang_misc['No email message']);
+            message(__('No email message'));
         }
         // Here we use strlen() not feather_strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         elseif (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            message($lang_misc['Too long email message']);
+            message(__('Too long email message'));
         }
 
         if ($this->user->last_email_sent != '' && (time() - $this->user->last_email_sent) < $this->user->g_email_flood && (time() - $this->user->last_email_sent) >= 0) {
-            message(sprintf($lang_misc['Email flood'], $this->user->g_email_flood, $this->user->g_email_flood - (time() - $this->user->last_email_sent)));
+            message(sprintf(__('Email flood'), $this->user->g_email_flood, $this->user->g_email_flood - (time() - $this->user->last_email_sent)));
         }
 
         // Load the "form email" template
@@ -99,7 +95,7 @@ public function send_email($mail, $id)
         // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after the email is sent)
         //$redirect_url = validate_redirect($this->request->post('redirect_url'), 'index.php');
 
-        redirect(get_base_url(), $lang_misc['Email sent redirect']);
+        redirect(get_base_url(), __('Email sent redirect'));
     }
 
     public function get_redirect_url($recipient_id)
@@ -121,18 +117,16 @@ public function get_redirect_url($recipient_id)
 
     public function insert_report($post_id)
     {
-        global $lang_misc;
-
         // Clean up reason from POST
         $reason = feather_linebreaks(feather_trim($this->request->post('req_reason')));
         if ($reason == '') {
-            message($lang_misc['No reason']);
+            message(__('No reason'));
         } elseif (strlen($reason) > 65535) { // TEXT field can only hold 65535 bytes
-            message($lang_misc['Reason too long']);
+            message(__('Reason too long'));
         }
 
         if ($this->user->last_report_sent != '' && (time() - $this->user->last_report_sent) < $this->user->g_report_flood && (time() - $this->user->last_report_sent) >= 0) {
-            message(sprintf($lang_misc['Report flood'], $this->user->g_report_flood, $this->user->g_report_flood - (time() - $this->user->last_report_sent)));
+            message(sprintf(__('Report flood'), $this->user->g_report_flood, $this->user->g_report_flood - (time() - $this->user->last_report_sent)));
         }
 
         // Get the topic ID
@@ -203,13 +197,11 @@ public function insert_report($post_id)
             ->set('last_report_sent', time())
             ->save();
 
-        redirect(get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['subject']).'/'), $lang_misc['Report redirect']);
+        redirect(get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['subject']).'/'), __('Report redirect'));
     }
 
     public function get_info_report($post_id)
     {
-
-
         $select_get_info_report = array('fid' => 'f.id', 'f.forum_name', 'tid' => 't.id', 't.subject');
         $where_get_info_report = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -236,8 +228,6 @@ public function get_info_report($post_id)
 
     public function subscribe_topic($topic_id)
     {
-        global $lang_misc;
-
         if ($this->config['o_topic_subscriptions'] != '1') {
             message(__('No permission'), '403');
         }
@@ -267,7 +257,7 @@ public function subscribe_topic($topic_id)
                         ->find_one();
 
         if ($is_subscribed) {
-            message($lang_misc['Already subscribed topic']);
+            message(__('Already subscribed topic'));
         }
 
         $insert_subscribe_topic = array(
@@ -281,13 +271,11 @@ public function subscribe_topic($topic_id)
             ->set($insert_subscribe_topic)
             ->save();
 
-        redirect(get_link('topic/'.$topic_id.'/'), $lang_misc['Subscribe redirect']);
+        redirect(get_link('topic/'.$topic_id.'/'), __('Subscribe redirect'));
     }
 
     public function unsubscribe_topic($topic_id)
     {
-        global $lang_misc;
-
         if ($this->config['o_topic_subscriptions'] != '1') {
             message(__('No permission'), '403');
         }
@@ -298,7 +286,7 @@ public function unsubscribe_topic($topic_id)
             ->find_one();
 
         if (!$is_subscribed) {
-            message($lang_misc['Not subscribed topic']);
+            message(__('Not subscribed topic'));
         }
 
         // Delete the subscription
@@ -307,13 +295,11 @@ public function unsubscribe_topic($topic_id)
             ->where('topic_id', $topic_id)
             ->delete_many();
 
-        redirect(get_link('topic/'.$topic_id.'/'), $lang_misc['Unsubscribe redirect']);
+        redirect(get_link('topic/'.$topic_id.'/'), __('Unsubscribe redirect'));
     }
 
     public function unsubscribe_forum($forum_id)
     {
-        global $lang_misc;
-
         if ($this->config['o_forum_subscriptions'] != '1') {
             message(__('No permission'), '403');
         }
@@ -324,7 +310,7 @@ public function unsubscribe_forum($forum_id)
             ->find_one();
 
         if (!$is_subscribed) {
-            message($lang_misc['Not subscribed forum']);
+            message(__('Not subscribed forum'));
         }
 
         // Delete the subscription
@@ -333,13 +319,11 @@ public function unsubscribe_forum($forum_id)
             ->where('forum_id', $forum_id)
             ->delete_many();
 
-        redirect(get_link('forum/'.$forum_id.'/'), $lang_misc['Unsubscribe redirect']);
+        redirect(get_link('forum/'.$forum_id.'/'), __('Unsubscribe redirect'));
     }
 
     public function subscribe_forum($forum_id)
     {
-        global $lang_misc;
-
         if ($this->config['o_forum_subscriptions'] != '1') {
             message(__('No permission'), '403');
         }
@@ -368,7 +352,7 @@ public function subscribe_forum($forum_id)
             ->find_one();
 
         if ($is_subscribed) {
-            message($lang_misc['Already subscribed forum']);
+            message(__('Already subscribed forum'));
         }
 
         $insert_subscribe_forum = array(
@@ -382,6 +366,6 @@ public function subscribe_forum($forum_id)
             ->set($insert_subscribe_forum)
             ->save();
 
-        redirect(get_link('forum/'.$forum_id.'/'), $lang_misc['Subscribe redirect']);
+        redirect(get_link('forum/'.$forum_id.'/'), __('Subscribe redirect'));
     }
 }
diff --git a/model/moderate.php b/model/moderate.php
index 438dd280..df7fe2d8 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -24,12 +24,10 @@ public function __construct()
  
     public function display_ip_info($ip)
     {
-        global $lang_misc;
-
         // Load the misc.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
 
-        message(sprintf($lang_misc['Host info 1'], $ip).'<br />'.sprintf($lang_misc['Host info 2'], @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.$lang_misc['Show more users'].'</a>');
+        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function display_ip_address_post($pid)
@@ -47,7 +45,7 @@ public function display_ip_address_post($pid)
         // Load the misc.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
 
-        message(sprintf($lang_misc['Host info 1'], $ip).'<br />'.sprintf($lang_misc['Host info 2'], @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.$lang_misc['Show more users'].'</a>');
+        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function get_moderators($fid)
@@ -91,11 +89,10 @@ public function get_topic_info($fid, $tid)
 
     public function delete_posts($tid, $fid, $p = null)
     {
-        global $lang_misc;
-
+        
         $posts = $this->request->post('posts') ? $this->request->post('posts') : array();
         if (empty($posts)) {
-            message($lang_misc['No posts selected']);
+            message(__('No posts selected'));
         }
 
         if ($this->request->post('delete_posts_comply')) {
@@ -153,7 +150,7 @@ public function delete_posts($tid, $fid, $p = null)
 
             update_forum($fid);
 
-            redirect(get_link('topic/'.$tid.'/'), $lang_misc['Delete posts redirect']);
+            redirect(get_link('topic/'.$tid.'/'), __('Delete posts redirect'));
         }
 
         return $posts;
@@ -161,11 +158,10 @@ public function delete_posts($tid, $fid, $p = null)
 
     public function split_posts($tid, $fid, $p = null)
     {
-        global $lang_misc, $lang_post;
-
+        
         $posts = $this->request->post('posts') ? $this->request->post('posts') : array();
         if (empty($posts)) {
-            message($lang_misc['No posts selected']);
+            message(__('No posts selected'));
         }
 
         if ($this->request->post('split_posts_comply')) {
@@ -218,9 +214,9 @@ public function split_posts($tid, $fid, $p = null)
             $new_subject = $this->request->post('new_subject') ? feather_trim($this->request->post('new_subject')) : '';
 
             if ($new_subject == '') {
-                message($lang_post['No subject']);
+                message(__('No subject'));
             } elseif (feather_strlen($new_subject) > 70) {
-                message($lang_post['Too long subject']);
+                message(__('Too long subject'));
             }
 
             // Get data from the new first post
@@ -306,7 +302,7 @@ public function split_posts($tid, $fid, $p = null)
             update_forum($fid);
             update_forum($move_to_forum);
 
-            redirect(get_link('topic/'.$new_tid.'/'), $lang_misc['Split posts redirect']);
+            redirect(get_link('topic/'.$new_tid.'/'), __('Split posts redirect'));
         }
 
         return $posts;
@@ -400,7 +396,7 @@ public function get_forum_list_move($id)
 
     public function display_posts_view($tid, $start_from)
     {
-        global $pd, $lang_topic;
+        global $pd;
 
         $post_data = array();
 
@@ -454,7 +450,7 @@ public function display_posts_view($tid, $start_from)
             // If the poster is a guest (or a user that has been deleted)
             else {
                 $cur_post->poster_disp = feather_escape($cur_post->poster);
-                $cur_post->user_title = $lang_topic['Guest'];
+                $cur_post->user_title = __('Guest');
             }
 
             // Perform the main parsing of the message (BBCode, smilies, censor words etc)
@@ -468,8 +464,7 @@ public function display_posts_view($tid, $start_from)
 
     public function move_topics_to($fid, $tfid = null, $param = null)
     {
-        global $lang_misc;
-
+        
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
             message(__('Bad request'), '404');
         }
@@ -553,14 +548,13 @@ public function move_topics_to($fid, $tfid = null, $param = null)
         update_forum($fid); // Update the forum FROM which the topic was moved
         update_forum($move_to_forum); // Update the forum TO which the topic was moved
 
-        $redirect_msg = (count($topics) > 1) ? $lang_misc['Move topics redirect'] : $lang_misc['Move topic redirect'];
+        $redirect_msg = (count($topics) > 1) ? __('Move topics redirect') : __('Move topic redirect');
         redirect(get_link('forum/'.$move_to_forum.'/'), $redirect_msg);
     }
 
     public function check_move_possible()
     {
-        global $lang_misc;
-
+        
         $select_check_move_possible = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name');
         $where_check_move_possible = array(
             array('fp.post_topics' => 'IS NULL'),
@@ -580,21 +574,20 @@ public function check_move_possible()
             ->find_many();
 
         if (count($result) < 2) {
-            message($lang_misc['Nowhere to move']);
+            message(__('Nowhere to move'));
         }
     }
 
     public function merge_topics($fid)
     {
-        global $lang_misc;
-
+        
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
             message(__('Bad request'), '404');
         }
 
         $topics = explode(',', $this->request->post('topics'));
         if (count($topics) < 2) {
-            message($lang_misc['Not enough topics selected']);
+            message(__('Not enough topics selected'));
         }
 
         // Verify that the topic IDs are valid (redirect links will point to the merged topic after the merge)
@@ -692,13 +685,12 @@ public function merge_topics($fid)
 
         // Update the forum FROM which the topic was moved and redirect
         update_forum($fid);
-        redirect(get_link('forum/'.$fid.'/'), $lang_misc['Merge topics redirect']);
+        redirect(get_link('forum/'.$fid.'/'), __('Merge topics redirect'));
     }
 
     public function delete_topics($topics, $fid)
     {
-        global $lang_misc;
-        
+                
 
         if (@preg_match('%[^0-9,]%', $topics)) {
             message(__('Bad request'), '404');
@@ -767,7 +759,7 @@ public function delete_topics($topics, $fid)
 
         update_forum($fid);
 
-        redirect(get_link('forum/'.$fid.'/'), $lang_misc['Delete topics redirect']);
+        redirect(get_link('forum/'.$fid.'/'), __('Delete topics redirect'));
     }
 
     public function get_forum_info($fid)
@@ -819,8 +811,6 @@ public function forum_sort_by($forum_sort)
 
     public function display_topics($fid, $sort_by, $start_from)
     {
-        global $lang_forum;
-
         $topic_data = array();
 
         // Get topic/forum tracking data
@@ -874,18 +864,18 @@ public function display_topics($fid, $sort_by, $start_from)
 
                 if ($cur_topic['sticky'] == '1') {
                     $cur_topic['item_status'] .= ' isticky';
-                    $status_text[] = '<span class="stickytext">'.$lang_forum['Sticky'].'</span>';
+                    $status_text[] = '<span class="stickytext">'.__('Sticky').'</span>';
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
                     $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
-                    $status_text[] = '<span class="movedtext">'.$lang_forum['Moved'].'</span>';
+                    $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
                     $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                 } else {
                     $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
-                    $status_text[] = '<span class="closedtext">'.$lang_forum['Closed'].'</span>';
+                    $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
 
diff --git a/model/post.php b/model/post.php
index f5630676..0c55d616 100644
--- a/model/post.php
+++ b/model/post.php
@@ -73,7 +73,7 @@ public function get_info_post($tid, $fid)
     // Checks the post for errors before posting
     public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
     {
-        global $lang_post, $lang_prof_reg, $lang_register, $lang_antispam, $lang_antispam_questions, $pd;
+        global $lang_antispam, $lang_antispam_questions, $pd;
 
         // Antispam feature
         if ($this->user->is_guest) {
@@ -90,13 +90,13 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
             }
 
             if (empty($lang_antispam_questions_array[$question]) || $lang_antispam_questions_array[$question] != $answer) {
-                $errors[] = $lang_antispam['Robot test fail'];
+                $errors[] = __('Robot test fail');
             }
         }
 
         // Flood protection
         if ($this->request->post('preview') != '' && $this->user->last_post != '' && (time() - $this->user->last_post) < $this->user->g_post_flood) {
-            $errors[] = sprintf($lang_post['Flood start'], $this->user->g_post_flood, $this->user->g_post_flood - (time() - $this->user->last_post));
+            $errors[] = sprintf(__('Flood start'), $this->user->g_post_flood, $this->user->g_post_flood - (time() - $this->user->last_post));
         }
 
         if ($tid) {
@@ -121,13 +121,13 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
             }
 
             if ($subject == '') {
-                $errors[] = $lang_post['No subject'];
+                $errors[] = __('No subject');
             } elseif ($this->config['o_censoring'] == '1' && $censored_subject == '') {
-                $errors[] = $lang_post['No subject after censoring'];
+                $errors[] = __('No subject after censoring');
             } elseif (feather_strlen($subject) > 70) {
-                $errors[] = $lang_post['Too long subject'];
+                $errors[] = __('Too long subject');
             } elseif ($this->config['p_subject_all_caps'] == '0' && is_all_uppercase($subject) && !$this->user->is_admmod) {
-                $errors[] = $lang_post['All caps subject'];
+                $errors[] = __('All caps subject');
             }
         }
 
@@ -148,7 +148,7 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
                 // we should only check guests because members' addresses are already verified
                 if ($this->user->is_guest && is_banned_email($email)) {
                     if ($this->config['p_allow_banned_email'] == '0') {
-                        $errors[] = $lang_prof_reg['Banned email'];
+                        $errors[] = __('Banned email');
                     }
 
                     $errors['banned_email'] = 1; // Used later when we send an alert email
@@ -161,9 +161,9 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
 
         // Here we use strlen() not feather_strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         if (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            $errors[] = sprintf($lang_post['Too long message'], forum_number_format(FEATHER_MAX_POSTSIZE));
+            $errors[] = sprintf(__('Too long message'), forum_number_format(FEATHER_MAX_POSTSIZE));
         } elseif ($this->config['p_message_all_caps'] == '0' && is_all_uppercase($message) && !$this->user->is_admmod) {
-            $errors[] = $lang_post['All caps message'];
+            $errors[] = __('All caps message');
         }
 
         // Validate BBCode syntax
@@ -174,13 +174,13 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
 
         if (empty($errors)) {
             if ($message == '') {
-                $errors[] = $lang_post['No message'];
+                $errors[] = __('No message');
             } elseif ($this->config['o_censoring'] == '1') {
                 // Censor message to see if that causes problems
                 $censored_message = feather_trim(censor_words($message));
 
                 if ($censored_message == '') {
-                    $errors[] = $lang_post['No message after censoring'];
+                    $errors[] = __('No message after censoring');
                 }
             }
         }
@@ -765,8 +765,6 @@ public function get_quote_message($qid, $tid)
     // Get the current state of checkboxes
     public function get_checkboxes($fid, $is_admmod, $is_subscribed)
     {
-        global $lang_post;
-
         $cur_index = 1;
 
         $checkboxes = array();
@@ -776,7 +774,7 @@ public function get_checkboxes($fid, $is_admmod, $is_subscribed)
 
         if (!$this->user->is_guest) {
             if ($this->config['o_smilies'] == '1') {
-                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('hide_smilies') ? ' checked="checked"' : '').' />'.$lang_post['Hide smilies'].'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('hide_smilies') ? ' checked="checked"' : '').' />'.__('Hide smilies').'<br /></label>';
             }
 
             if ($this->config['o_topic_subscriptions'] == '1') {
@@ -795,10 +793,10 @@ public function get_checkboxes($fid, $is_admmod, $is_subscribed)
                     $subscr_checked = true;
                 }
 
-                $checkboxes[] = '<label><input type="checkbox" name="subscribe" value="1" tabindex="'.($cur_index++).'"'.($subscr_checked ? ' checked="checked"' : '').' />'.($is_subscribed ? $lang_post['Stay subscribed'] : $lang_post['Subscribe']).'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="subscribe" value="1" tabindex="'.($cur_index++).'"'.($subscr_checked ? ' checked="checked"' : '').' />'.($is_subscribed ? __('Stay subscribed') : __('Subscribe')).'<br /></label>';
             }
         } elseif ($this->config['o_smilies'] == '1') {
-            $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('hide_smilies') ? ' checked="checked"' : '').' />'.$lang_post['Hide smilies'].'<br /></label>';
+            $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('hide_smilies') ? ' checked="checked"' : '').' />'.__('Hide smilies').'<br /></label>';
         }
 
         return $checkboxes;
diff --git a/model/profile.php b/model/profile.php
index 7492f190..49e8fe69 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -24,8 +24,6 @@ public function __construct()
  
     public function change_pass($id)
     {
-        global $lang_profile, $lang_prof_reg;
-
         if ($this->request->get('key')) {
             // If the user is already logged in we shouldn't be here :)
             if (!$this->user->is_guest) {
@@ -40,7 +38,7 @@ public function change_pass($id)
                 ->find_one();
 
             if ($key == '' || $key != $cur_user['activate_key']) {
-                message($lang_profile['Pass key bad'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
+                message(__('Pass key bad').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
             } else {
                 DB::for_table('users')
                     ->where('id', $id)
@@ -50,7 +48,7 @@ public function change_pass($id)
                     ->set_expr('activate_key', 'NULL')
                     ->save();
 
-                message($lang_profile['Pass updated'], true);
+                message(__('Pass updated'), true);
             }
         }
 
@@ -86,10 +84,10 @@ public function change_pass($id)
             $new_password2 = feather_trim($this->request->post('req_new_password2'));
 
             if ($new_password1 != $new_password2) {
-                message($lang_prof_reg['Pass not match']);
+                message(__('Pass not match'));
             }
             if (feather_strlen($new_password1) < 6) {
-                message($lang_prof_reg['Pass too short']);
+                message(__('Pass too short'));
             }
 
             $cur_user = DB::for_table('users')
@@ -107,7 +105,7 @@ public function change_pass($id)
             }
 
             if (!$authorized) {
-                message($lang_profile['Wrong pass']);
+                message(__('Wrong pass'));
             }
 
             $new_password_hash = feather_hash($new_password1);
@@ -121,14 +119,12 @@ public function change_pass($id)
                 feather_setcookie($this->user->id, $new_password_hash, time() + $this->config['o_timeout_visit']);
             }
 
-            redirect(get_link('user/'.$id.'/section/essentials/'), $lang_profile['Pass updated redirect']);
+            redirect(get_link('user/'.$id.'/section/essentials/'), __('Pass updated redirect'));
         }
     }
 
     public function change_email($id)
     {
-        global $lang_profile, $lang_prof_reg;
-
         // Make sure we are allowed to change this user's email
         if ($this->user->id != $id) {
             if (!$this->user->is_admmod) { // A regular user trying to change another user's email?
@@ -163,7 +159,7 @@ public function change_email($id)
                 ->find_one_col('activate_key');
 
             if ($key == '' || $key != $new_email_key) {
-                message($lang_profile['Email key bad'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
+                message(__('Email key bad').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
             } else {
                 DB::for_table('users')
                     ->where('id', $id)
@@ -173,11 +169,11 @@ public function change_email($id)
                     ->set_expr('activate_key', 'NULL')
                     ->save();
 
-                message($lang_profile['Email updated'], true);
+                message(__('Email updated'), true);
             }
         } elseif ($this->request->isPost()) {
             if (feather_hash($this->request->post('req_password')) !== $this->user->password) {
-                message($lang_profile['Wrong pass']);
+                message(__('Wrong pass'));
             }
 
             require FEATHER_ROOT.'include/email.php';
@@ -191,7 +187,7 @@ public function change_email($id)
             // Check if it's a banned email address
             if (is_banned_email($new_email)) {
                 if ($this->config['p_allow_banned_email'] == '0') {
-                    message($lang_prof_reg['Banned email']);
+                    message(__('Banned email'));
                 } elseif ($this->config['o_mailing_list'] != '') {
                     // Load the "banned email change" template
                     $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/banned_email_change.tpl'));
@@ -220,7 +216,7 @@ public function change_email($id)
 
             if ($result) {
                 if ($this->config['p_allow_dupe_email'] == '0') {
-                    message($lang_prof_reg['Dupe email']);
+                    message(__('Dupe email'));
                 } elseif ($this->config['o_mailing_list'] != '') {
                     foreach($result as $cur_dupe) {
                         $dupe_list[] = $cur_dupe['username'];
@@ -272,16 +268,14 @@ public function change_email($id)
 
             pun_mail($new_email, $mail_subject, $mail_message);
 
-            message($lang_profile['Activate email sent'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
+            message(__('Activate email sent').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
         }
     }
 
     public function upload_avatar($id, $files_data)
     {
-        global $lang_profile;
-
         if (!isset($files_data['req_file'])) {
-            message($lang_profile['No file']);
+            message(__('No file'));
         }
 
         $uploaded_file = $files_data['req_file'];
@@ -291,25 +285,25 @@ public function upload_avatar($id, $files_data)
             switch ($uploaded_file['error']) {
                 case 1: // UPLOAD_ERR_INI_SIZE
                 case 2: // UPLOAD_ERR_FORM_SIZE
-                    message($lang_profile['Too large ini']);
+                    message(__('Too large ini'));
                     break;
 
                 case 3: // UPLOAD_ERR_PARTIAL
-                    message($lang_profile['Partial upload']);
+                    message(__('Partial upload'));
                     break;
 
                 case 4: // UPLOAD_ERR_NO_FILE
-                    message($lang_profile['No file']);
+                    message(__('No file'));
                     break;
 
                 case 6: // UPLOAD_ERR_NO_TMP_DIR
-                    message($lang_profile['No tmp directory']);
+                    message(__('No tmp directory'));
                     break;
 
                 default:
                     // No error occured, but was something actually uploaded?
                     if ($uploaded_file['size'] == 0) {
-                        message($lang_profile['No file']);
+                        message(__('No file'));
                     }
                     break;
             }
@@ -319,17 +313,17 @@ public function upload_avatar($id, $files_data)
             // Preliminary file check, adequate in most cases
             $allowed_types = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/png', 'image/x-png');
             if (!in_array($uploaded_file['type'], $allowed_types)) {
-                message($lang_profile['Bad type']);
+                message(__('Bad type'));
             }
 
             // Make sure the file isn't too big
             if ($uploaded_file['size'] > $this->config['o_avatars_size']) {
-                message($lang_profile['Too large'].' '.forum_number_format($this->config['o_avatars_size']).' '.$lang_profile['bytes'].'.');
+                message(__('Too large').' '.forum_number_format($this->config['o_avatars_size']).' '.__('bytes').'.');
             }
 
             // Move the file to the avatar directory. We do this before checking the width/height to circumvent open_basedir restrictions
             if (!@move_uploaded_file($uploaded_file['tmp_name'], FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp')) {
-                message($lang_profile['Move failed'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
+                message(__('Move failed').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
             }
 
             list($width, $height, $type, ) = @getimagesize(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
@@ -344,13 +338,13 @@ public function upload_avatar($id, $files_data)
             } else {
                 // Invalid type
                 @unlink(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
-                message($lang_profile['Bad type']);
+                message(__('Bad type'));
             }
 
             // Now check the width/height
             if (empty($width) || empty($height) || $width > $this->config['o_avatars_width'] || $height > $this->config['o_avatars_height']) {
                 @unlink(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
-                message($lang_profile['Too wide or high'].' '.$this->config['o_avatars_width'].'x'.$this->config['o_avatars_height'].' '.$lang_profile['pixels'].'.');
+                message(__('Too wide or high').' '.$this->config['o_avatars_width'].'x'.$this->config['o_avatars_height'].' '.__('pixels').'.');
             }
 
             // Delete any old avatars and put the new one in place
@@ -358,16 +352,14 @@ public function upload_avatar($id, $files_data)
             @rename(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp', FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.$extension);
             @chmod(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.$extension, 0644);
         } else {
-            message($lang_profile['Unknown failure']);
+            message(__('Unknown failure'));
         }
 
-        redirect(get_link('user/'.$id.'/section/personality/'), $lang_profile['Avatar upload redirect']);
+        redirect(get_link('user/'.$id.'/section/personality/'), __('Avatar upload redirect'));
     }
 
     public function update_group_membership($id)
     {
-        global $lang_profile;
-
         $new_group_id = intval($this->request->post('group_id'));
 
         $old_group_id = DB::for_table('users')
@@ -425,7 +417,7 @@ public function update_group_membership($id)
             }
         }
 
-        redirect(get_link('user/'.$id.'/section/admin/'), $lang_profile['Group membership redirect']);
+        redirect(get_link('user/'.$id.'/section/admin/'), __('Group membership redirect'));
     }
 
     public function get_username($id)
@@ -440,8 +432,6 @@ public function get_username($id)
 
     public function update_mod_forums($id)
     {
-        global $lang_profile;
-
         $username = $this->get_username($id);
 
         $moderator_in = ($this->request->post('moderator_in')) ? array_keys($this->request->post('moderator_in')) : array();
@@ -483,13 +473,11 @@ public function update_mod_forums($id)
             }
         }
 
-        redirect(get_link('user/'.$id.'/section/admin/'), $lang_profile['Update forums redirect']);
+        redirect(get_link('user/'.$id.'/section/admin/'), __('Update forums redirect'));
     }
 
     public function ban_user($id)
     {
-        global $lang_profile;
-
         // Get the username of the user we are banning
         $username = $this->get_username($id);
 
@@ -501,16 +489,14 @@ public function ban_user($id)
             ->find_one_col('id');
 
         if ($ban_id) {
-            redirect(get_link('admin/bans/edit/'.$ban_id.'/'), $lang_profile['Ban redirect']);
+            redirect(get_link('admin/bans/edit/'.$ban_id.'/'), __('Ban redirect'));
         } else {
-            redirect(get_link('admin/bans/add/'.$id.'/'), $lang_profile['Ban redirect']);
+            redirect(get_link('admin/bans/add/'.$id.'/'), __('Ban redirect'));
         }
     }
 
     public function promote_user($id)
     {
-        global $lang_profile;
-
         $pid = $this->request->get('pid') ? intval($this->request->get('pid')) : 0;
 
         // Find the group ID to promote the user to
@@ -530,13 +516,11 @@ public function promote_user($id)
             ->set('group_id', $next_group_id)
             ->save();
         
-        redirect(get_link('post/'.$pid.'/#p'.$pid), $lang_profile['User promote redirect']);
+        redirect(get_link('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
     }
 
     public function delete_user($id)
     {
-        global $lang_profile;
-
         // Get the username and group of the user we are deleting
         $select_info_delete_user = array('group_id', 'username');
 
@@ -548,7 +532,7 @@ public function delete_user($id)
         $username = $result['username'];
         
         if ($group_id == FEATHER_ADMIN) {
-            message($lang_profile['No delete admin message']);
+            message(__('No delete admin message'));
         }
 
         if ($this->request->post('delete_user_comply')) {
@@ -658,7 +642,7 @@ public function delete_user($id)
                 generate_admins_cache();
             }
 
-            redirect(get_base_url(), $lang_profile['User delete redirect']);
+            redirect(get_base_url(), __('User delete redirect'));
         }
     }
 
@@ -686,7 +670,7 @@ public function fetch_user_group($id)
 
     public function update_profile($id, $info, $section)
     {
-        global $lang_profile, $lang_prof_reg, $pd;
+        global $pd;
 
         $username_updated = false;
 
@@ -764,14 +748,14 @@ public function update_profile($id, $info, $section)
                         $url = url_valid($form['url']);
 
                         if ($url === false) {
-                            message($lang_profile['Invalid website URL']);
+                            message(__('Invalid website URL'));
                         }
 
                         $form['url'] = $url['url'];
                     }
                 } else {
                     if (!empty($form['url'])) {
-                        message($lang_profile['Website not allowed']);
+                        message(__('Website not allowed'));
                     }
 
                     $form['url'] = '';
@@ -788,7 +772,7 @@ public function update_profile($id, $info, $section)
                         $forbidden = array('member', 'moderator', 'administrator', 'banned', 'guest', utf8_strtolower(__('Member')), utf8_strtolower(__('Moderator')), utf8_strtolower(__('Administrator')), utf8_strtolower(__('Banned')), utf8_strtolower(__('Guest')));
 
                         if (in_array(utf8_strtolower($form['title']), $forbidden)) {
-                            message($lang_profile['Forbidden title']);
+                            message(__('Forbidden title'));
                         }
                     }
                 }
@@ -808,7 +792,7 @@ public function update_profile($id, $info, $section)
 
                 // If the ICQ UIN contains anything other than digits it's invalid
                 if (preg_match('%[^0-9]%', $form['icq'])) {
-                    message($lang_prof_reg['Bad ICQ']);
+                    message(__('Bad ICQ'));
                 }
 
                 break;
@@ -824,9 +808,9 @@ public function update_profile($id, $info, $section)
 
                     // Validate signature
                     if (feather_strlen($form['signature']) > $this->config['p_sig_length']) {
-                        message(sprintf($lang_prof_reg['Sig too long'], $this->config['p_sig_length'], feather_strlen($form['signature']) - $this->config['p_sig_length']));
+                        message(sprintf(__('Sig too long'), $this->config['p_sig_length'], feather_strlen($form['signature']) - $this->config['p_sig_length']));
                     } elseif (substr_count($form['signature'], "\n") > ($this->config['p_sig_lines']-1)) {
-                        message(sprintf($lang_prof_reg['Sig too many lines'], $this->config['p_sig_lines']));
+                        message(sprintf(__('Sig too many lines'), $this->config['p_sig_lines']));
                     } elseif ($form['signature'] && $this->config['p_sig_all_caps'] == '0' && is_all_uppercase($form['signature']) && !$this->user->is_admmod) {
                         $form['signature'] = utf8_ucwords(utf8_strtolower($form['signature']));
                     }
@@ -999,7 +983,7 @@ public function update_profile($id, $info, $section)
             }
         }
 
-        redirect(get_link('user/'.$id.'/section/'.$section.'/'), $lang_profile['Profile redirect']);
+        redirect(get_link('user/'.$id.'/section/'.$section.'/'), __('Profile redirect'));
     }
 
     public function get_user_info($id)
@@ -1024,8 +1008,6 @@ public function get_user_info($id)
 
     public function parse_user_info($user)
     {
-        global $lang_profile;
-
         $user_info = array();
 
         $user_info['personal'][] = '<dt>'.__('Username').'</dt>';
@@ -1036,18 +1018,18 @@ public function parse_user_info($user)
         $user_info['personal'][] = '<dd>'.(($this->config['o_censoring'] == '1') ? censor_words($user_title_field) : $user_title_field).'</dd>';
 
         if ($user['realname'] != '') {
-            $user_info['personal'][] = '<dt>'.$lang_profile['Realname'].'</dt>';
+            $user_info['personal'][] = '<dt>'.__('Realname').'</dt>';
             $user_info['personal'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['realname']) : $user['realname']).'</dd>';
         }
 
         if ($user['location'] != '') {
-            $user_info['personal'][] = '<dt>'.$lang_profile['Location'].'</dt>';
+            $user_info['personal'][] = '<dt>'.__('Location').'</dt>';
             $user_info['personal'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['location']) : $user['location']).'</dd>';
         }
 
         if ($user['url'] != '') {
             $user['url'] = feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['url']) : $user['url']);
-            $user_info['personal'][] = '<dt>'.$lang_profile['Website'].'</dt>';
+            $user_info['personal'][] = '<dt>'.__('Website').'</dt>';
             $user_info['personal'][] = '<dd><span class="website"><a href="'.$user['url'].'" rel="nofollow">'.$user['url'].'</a></span></dd>';
         }
 
@@ -1064,41 +1046,41 @@ public function parse_user_info($user)
         }
 
         if ($user['jabber'] != '') {
-            $user_info['messaging'][] = '<dt>'.$lang_profile['Jabber'].'</dt>';
+            $user_info['messaging'][] = '<dt>'.__('Jabber').'</dt>';
             $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['jabber']) : $user['jabber']).'</dd>';
         }
 
         if ($user['icq'] != '') {
-            $user_info['messaging'][] = '<dt>'.$lang_profile['ICQ'].'</dt>';
+            $user_info['messaging'][] = '<dt>'.__('ICQ').'</dt>';
             $user_info['messaging'][] = '<dd>'.$user['icq'].'</dd>';
         }
 
         if ($user['msn'] != '') {
-            $user_info['messaging'][] = '<dt>'.$lang_profile['MSN'].'</dt>';
+            $user_info['messaging'][] = '<dt>'.__('MSN').'</dt>';
             $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['msn']) : $user['msn']).'</dd>';
         }
 
         if ($user['aim'] != '') {
-            $user_info['messaging'][] = '<dt>'.$lang_profile['AOL IM'].'</dt>';
+            $user_info['messaging'][] = '<dt>'.__('AOL IM').'</dt>';
             $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['aim']) : $user['aim']).'</dd>';
         }
 
         if ($user['yahoo'] != '') {
-            $user_info['messaging'][] = '<dt>'.$lang_profile['Yahoo'].'</dt>';
+            $user_info['messaging'][] = '<dt>'.__('Yahoo').'</dt>';
             $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['yahoo']) : $user['yahoo']).'</dd>';
         }
 
         if ($this->config['o_avatars'] == '1') {
             $avatar_field = generate_avatar_markup($user['id']);
             if ($avatar_field != '') {
-                $user_info['personality'][] = '<dt>'.$lang_profile['Avatar'].'</dt>';
+                $user_info['personality'][] = '<dt>'.__('Avatar').'</dt>';
                 $user_info['personality'][] = '<dd>'.$avatar_field.'</dd>';
             }
         }
 
         if ($this->config['o_signatures'] == '1') {
             if (isset($parsed_signature)) {
-                $user_info['personality'][] = '<dt>'.$lang_profile['Signature'].'</dt>';
+                $user_info['personality'][] = '<dt>'.__('Signature').'</dt>';
                 $user_info['personality'][] = '<dd><div class="postsignature postmsg">'.$parsed_signature.'</div></dd>';
             }
         }
@@ -1110,11 +1092,11 @@ public function parse_user_info($user)
         if ($this->user->g_search == '1') {
             $quick_searches = array();
             if ($user['num_posts'] > 0) {
-                $quick_searches[] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$user['id']).'">'.$lang_profile['Show topics'].'</a>';
-                $quick_searches[] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.$lang_profile['Show posts'].'</a>';
+                $quick_searches[] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$user['id']).'">'.__('Show topics').'</a>';
+                $quick_searches[] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Show posts').'</a>';
             }
             if ($this->user->is_admmod && $this->config['o_topic_subscriptions'] == '1') {
-                $quick_searches[] = '<a href="'.get_link('search/?action=show_subscriptions&amp;user_id='.$user['id']).'">'.$lang_profile['Show subscriptions'].'</a>';
+                $quick_searches[] = '<a href="'.get_link('search/?action=show_subscriptions&amp;user_id='.$user['id']).'">'.__('Show subscriptions').'</a>';
             }
 
             if (!empty($quick_searches)) {
@@ -1139,15 +1121,13 @@ public function parse_user_info($user)
 
     public function edit_essentials($id, $user)
     {
-        global $lang_profile;
-
         $user_disp = array();
 
         if ($this->user->is_admmod) {
             if ($this->user->g_id == FEATHER_ADMIN || $this->user->g_mod_rename_users == '1') {
                 $user_disp['username_field'] = '<label class="required"><strong>'.__('Username').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_username" value="'.feather_escape($user['username']).'" size="25" maxlength="25" /><br /></label>'."\n";
             } else {
-                $user_disp['username_field'] = '<p>'.sprintf($lang_profile['Username info'], feather_escape($user['username'])).'</p>'."\n";
+                $user_disp['username_field'] = '<p>'.sprintf(__('Username info'), feather_escape($user['username'])).'</p>'."\n";
             }
 
             $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.feather_escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.get_link('email/'.$id.'/').'">'.__('Send email').'</a></span></p>'."\n";
@@ -1155,7 +1135,7 @@ public function edit_essentials($id, $user)
             $user_disp['username_field'] = '<p>'.__('Username').': '.feather_escape($user['username']).'</p>'."\n";
 
             if ($this->config['o_regs_verify'] == '1') {
-                $user_disp['email_field'] = '<p>'.sprintf($lang_profile['Email info'], feather_escape($user['email']).' - <a href="'.get_link('user/'.$id.'/action/change_email/').'">'.$lang_profile['Change email'].'</a>').'</p>'."\n";
+                $user_disp['email_field'] = '<p>'.sprintf(__('Email info'), feather_escape($user['email']).' - <a href="'.get_link('user/'.$id.'/action/change_email/').'">'.__('Change email').'</a>').'</p>'."\n";
             } else {
                 $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.$user['email'].'" size="40" maxlength="80" /><br /></label>'."\n";
             }
@@ -1167,15 +1147,15 @@ public function edit_essentials($id, $user)
         if ($this->user->g_id == FEATHER_ADMIN) {
             $user_disp['posts_field'] .= '<label>'.__('Posts').'<br /><input type="text" name="num_posts" value="'.$user['num_posts'].'" size="8" maxlength="8" /><br /></label>';
         } elseif ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) {
-            $posts_actions[] = sprintf($lang_profile['Posts info'], forum_number_format($user['num_posts']));
+            $posts_actions[] = sprintf(__('Posts info'), forum_number_format($user['num_posts']));
         }
 
         if ($this->user->g_search == '1' || $this->user->g_id == FEATHER_ADMIN) {
-            $posts_actions[] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$id).'">'.$lang_profile['Show topics'].'</a>';
-            $posts_actions[] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$id).'">'.$lang_profile['Show posts'].'</a>';
+            $posts_actions[] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$id).'">'.__('Show topics').'</a>';
+            $posts_actions[] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$id).'">'.__('Show posts').'</a>';
 
             if ($this->config['o_topic_subscriptions'] == '1') {
-                $posts_actions[] = '<a href="'.get_link('search/?action=show_subscriptions&amp;user_id='.$id).'">'.$lang_profile['Show subscriptions'].'</a>';
+                $posts_actions[] = '<a href="'.get_link('search/?action=show_subscriptions&amp;user_id='.$id).'">'.__('Show subscriptions').'</a>';
             }
         }
 
@@ -1251,10 +1231,7 @@ public function get_forum_list($id)
     //
     public function generate_profile_menu($page = '', $id)
     {
-        global $lang_profile;
-
         $this->feather->render('profile/menu.php', array(
-            'lang_profile' => $lang_profile,
             'id' => $id,
             'feather_config' => $this->config,
             'feather_user' => $this->user,
diff --git a/model/register.php b/model/register.php
index 53de5d86..d88001fd 100644
--- a/model/register.php
+++ b/model/register.php
@@ -24,7 +24,7 @@ public function __construct()
  
     public function check_for_errors()
     {
-        global $lang_register, $lang_prof_reg, $lang_antispam, $lang_antispam_questions;
+        global $lang_register, $lang_antispam, $lang_antispam_questions;
 
         $user = array();
         $user['errors'] = '';
@@ -36,7 +36,7 @@ public function check_for_errors()
                                   ->find_one();
 
         if ($already_registered) {
-            message($lang_register['Registration flood']);
+            message(__('Registration flood'));
         }
 
 
@@ -57,9 +57,9 @@ public function check_for_errors()
         $user['errors'] = check_username($user['username'], $user['errors']);
 
         if (feather_strlen($user['password1']) < 6) {
-            $user['errors'][] = $lang_prof_reg['Pass too short'];
+            $user['errors'][] = __('Pass too short');
         } elseif ($user['password1'] != $password2) {
-            $user['errors'][] = $lang_prof_reg['Pass not match'];
+            $user['errors'][] = __('Pass not match');
         }
 
         // Antispam feature
@@ -71,7 +71,7 @@ public function check_for_errors()
             $lang_antispam_questions_array[md5($k)] = strtoupper($v);
         }
         if (empty($lang_antispam_questions_array[$question]) || $lang_antispam_questions_array[$question] != $answer) {
-            $user['errors'][] = $lang_antispam['Robot test fail'];
+            $user['errors'][] = __('Robot test fail');
         }
 
         // Validate email
@@ -80,13 +80,13 @@ public function check_for_errors()
         if (!is_valid_email($user['email1'])) {
             $user['errors'][] = __('Invalid email');
         } elseif ($this->config['o_regs_verify'] == '1' && $user['email1'] != $email2) {
-            $user['errors'][] = $lang_register['Email not match'];
+            $user['errors'][] = __('Email not match');
         }
 
         // Check if it's a banned email address
         if (is_banned_email($user['email1'])) {
             if ($this->config['p_allow_banned_email'] == '0') {
-                $user['errors'][] = $lang_prof_reg['Banned email'];
+                $user['errors'][] = __('Banned email');
             }
             $user['banned_email'] = 1; // Used later when we send an alert email
         }
@@ -100,7 +100,7 @@ public function check_for_errors()
 
         if ($dupe_mail) {
             if ($this->config['p_allow_dupe_email'] == '0') {
-                $user['errors'][] = $lang_prof_reg['Dupe email'];
+                $user['errors'][] = __('Dupe email');
             }
 
             foreach($dupe_mail as $cur_dupe) {
@@ -123,8 +123,6 @@ public function check_for_errors()
 
     public function insert_user($user)
     {
-        global $lang_register;
-
         // Insert the new user into the database. We do this now to get the last inserted ID for later use
         $now = time();
 
@@ -241,11 +239,11 @@ public function insert_user($user)
 
             pun_mail($user['email1'], $mail_subject, $mail_message);
 
-            message($lang_register['Reg email'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
+            message(__('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
         }
 
         feather_setcookie($new_uid, $password_hash, time() + $this->config['o_timeout_visit']);
 
-        redirect(get_base_url(), $lang_register['Reg complete']);
+        redirect(get_base_url(), __('Reg complete'));
     }
 }
diff --git a/model/search.php b/model/search.php
index a510335a..9904dc3a 100644
--- a/model/search.php
+++ b/model/search.php
@@ -63,7 +63,7 @@ public function get_search_results()
             }
 
             if (!$keywords && !$author) {
-                message($lang_search['No terms']);
+                message(__('No terms'));
             }
 
             if ($author) {
@@ -117,7 +117,7 @@ public function get_search_results()
 
                 unset($temp);
             } else {
-                message($lang_search['No hits']);
+                message(__('No hits'));
             }
         } else {
             $keyword_results = $author_results = array();
@@ -128,7 +128,7 @@ public function get_search_results()
             if (!empty($author) || !empty($keywords)) {
                 // Flood protection
                 if ($this->user->last_search && (time() - $this->user->last_search) < $this->user->g_search_flood && (time() - $this->user->last_search) >= 0) {
-                    message(sprintf($lang_search['Search flood'], $this->user->g_search_flood, $this->user->g_search_flood - (time() - $this->user->last_search)));
+                    message(sprintf(__('Search flood'), $this->user->g_search_flood, $this->user->g_search_flood - (time() - $this->user->last_search)));
                 }
 
                 if (!$this->user->is_guest) {
@@ -172,7 +172,7 @@ public function get_search_results()
                     $keywords_array = split_words($keywords, false);
 
                     if (empty($keywords_array)) {
-                        message($lang_search['No hits']);
+                        message(__('No hits'));
                     }
 
                     // Should we search in message body or topic subject specifically?
@@ -296,7 +296,7 @@ public function get_search_results()
 
                 $num_hits = count($search_ids);
                 if (!$num_hits) {
-                    message($lang_search['No hits']);
+                    message(__('No hits'));
                 }
             } elseif ($action == 'show_new' || $action == 'show_recent' || $action == 'show_replies' || $action == 'show_user_posts' || $action == 'show_user_topics' || $action == 'show_subscriptions' || $action == 'show_unanswered') {
                 $search_type = array('action', $action);
@@ -336,7 +336,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message($lang_search['No new posts']);
+                        message(__('No new posts'));
                     }
                 }
                 // If it's a search for recent posts (in a certain time interval)
@@ -360,7 +360,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message($lang_search['No recent posts']);
+                        message(__('No recent posts'));
                     }
                 }
                 // If it's a search for topics in which the user has posted
@@ -384,7 +384,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message($lang_search['No user posts']);
+                        message(__('No user posts'));
                     }
                 }
                 // If it's a search for posts by a specific user ID
@@ -406,7 +406,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message($lang_search['No user posts']);
+                        message(__('No user posts'));
                     }
 
                     // Pass on the user ID so that we can later know whose posts we're searching for
@@ -429,7 +429,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message($lang_search['No user topics']);
+                        message(__('No user topics'));
                     }
 
                     // Pass on the user ID so that we can later know whose topics we're searching for
@@ -456,7 +456,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message($lang_search['No subscriptions']);
+                        message(__('No subscriptions'));
                     }
 
                     // Pass on user ID so that we can later know whose subscriptions we're searching for
@@ -479,7 +479,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message($lang_search['No unanswered']);
+                        message(__('No unanswered'));
                     }
                 }
 
@@ -614,13 +614,13 @@ public function get_search_results()
                 $search['search_set'][] = $row;
             }
 
-            $search['crumbs_text']['show_as'] = $lang_search['Search'];
+            $search['crumbs_text']['show_as'] = __('Search');
 
             if ($search_type[0] == 'action') {
                 if ($search_type[1] == 'show_user_topics') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf($lang_search['Quick search show_user_topics'], feather_escape($search['search_set'][0]['poster'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_topics'), feather_escape($search['search_set'][0]['poster'])).'</a>';
                 } elseif ($search_type[1] == 'show_user_posts') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf($lang_search['Quick search show_user_posts'], feather_escape($search['search_set'][0]['pposter'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_posts'), feather_escape($search['search_set'][0]['pposter'])).'</a>';
                 } elseif ($search_type[1] == 'show_subscriptions') {
                     // Fetch username of subscriber
                     $subscriber_id = $search_type[2];
@@ -630,7 +630,7 @@ public function get_search_results()
                         message(__('Bad request'), '404');
                     }
 
-                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf($lang_search['Quick search show_subscriptions'], feather_escape($subscriber_name)).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), feather_escape($subscriber_name)).'</a>';
                 } else {
                     $search_url = str_replace('_', '/', $search_type[1]);
                     $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/'.$search_url.'/').'">'.$lang_search['Quick search '.$search_type[1]].'</a>';
@@ -660,7 +660,7 @@ public function get_search_results()
 
     public function display_search_results($search)
     {
-        global $lang_forum, $lang_topic, $lang_search, $pd;
+        global $lang_search, $pd;
 
         // Get topic/forum tracking data
         if (!$this->user->is_guest) {
@@ -684,7 +684,7 @@ public function display_search_results($search)
                 if (!$this->user->is_guest && $cur_search['last_post'] > $this->user->last_visit && (!isset($tracked_topics['topics'][$cur_search['tid']]) || $tracked_topics['topics'][$cur_search['tid']] < $cur_search['last_post']) && (!isset($tracked_topics['forums'][$cur_search['forum_id']]) || $tracked_topics['forums'][$cur_search['forum_id']] < $cur_search['last_post'])) {
                     $cur_search['item_status'] = 'inew';
                     $cur_search['icon_type'] = 'icon icon-new';
-                    $cur_search['icon_text'] = $lang_topic['New icon'];
+                    $cur_search['icon_text'] = __('New icon');
                 } else {
                     $cur_search['item_status'] = '';
                     $cur_search['icon_text'] = '<!-- -->';
@@ -709,7 +709,6 @@ public function display_search_results($search)
                     'cur_search' => $cur_search,
                     'forum' => $forum,
                     'lang_search' => $lang_search,
-                    'lang_topic' => $lang_topic,
                     )
                 );
             } else {
@@ -722,11 +721,11 @@ public function display_search_results($search)
 
                 if ($cur_search['sticky'] == '1') {
                     $cur_search['item_status'] .= ' isticky';
-                    $status_text[] = '<span class="stickytext">'.$lang_forum['Sticky'].'</span>';
+                    $status_text[] = '<span class="stickytext">'.__('Sticky').'</span>';
                 }
 
                 if ($cur_search['closed'] != '0') {
-                    $status_text[] = '<span class="closedtext">'.$lang_forum['Closed'].'</span>';
+                    $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_search['item_status'] .= ' iclosed';
                 }
 
@@ -800,7 +799,7 @@ public function get_list_forums()
 
         // We either show a list of forums of which multiple can be selected
         if ($this->config['o_search_all_forums'] == '1' || $this->user->is_admmod) {
-            $output .= "\t\t\t\t\t\t".'<div class="conl multiselect">'.$lang_search['Forum search']."\n";
+            $output .= "\t\t\t\t\t\t".'<div class="conl multiselect">'.__('Forum search')."\n";
             $output .= "\t\t\t\t\t\t".'<br />'."\n";
             $output .= "\t\t\t\t\t\t".'<div class="checklist">'."\n";
 
@@ -832,7 +831,7 @@ public function get_list_forums()
         }
         // ... or a simple select list for one forum only
         else {
-            $output .= "\t\t\t\t\t\t".'<label class="conl">'.$lang_search['Forum search']."\n";
+            $output .= "\t\t\t\t\t\t".'<label class="conl">'.__('Forum search')."\n";
             $output .= "\t\t\t\t\t\t".'<br />'."\n";
             $output .= "\t\t\t\t\t\t".'<select id="forum" name="forum">'."\n";
 
diff --git a/model/viewforum.php b/model/viewforum.php
index 790d5384..7eee1586 100644
--- a/model/viewforum.php
+++ b/model/viewforum.php
@@ -113,16 +113,14 @@ public function get_page_head($forum_id, $num_pages, $p, $url_forum)
     // Returns forum action
     public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
     {
-        global $lang_forum;
-
         $forum_actions = array();
 
         if (!$this->user->is_guest) {
             if ($subscriptions == 1) {
                 if ($is_subscribed) {
-                    $forum_actions[] = '<span>'.$lang_forum['Is subscribed'].' - </span><a href="'.get_link('unsubscribe/forum/'.$forum_id.'/').'">'.$lang_forum['Unsubscribe'].'</a>';
+                    $forum_actions[] = '<span>'.__('Is subscribed').' - </span><a href="'.get_link('unsubscribe/forum/'.$forum_id.'/').'">'.__('Unsubscribe').'</a>';
                 } else {
-                    $forum_actions[] = '<a href="'.get_link('subscribe/forum/'.$forum_id.'/').'">'.$lang_forum['Subscribe'].'</a>';
+                    $forum_actions[] = '<a href="'.get_link('subscribe/forum/'.$forum_id.'/').'">'.__('Subscribe').'</a>';
                 }
             }
 
@@ -135,8 +133,6 @@ public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
     // Returns the elements needed to display topics
     public function print_topics($forum_id, $sort_by, $start_from)
     {
-        global $lang_forum;
-
         // Get topic/forum tracking data
         if (!$this->user->is_guest) {
             $tracked_topics = get_tracked_topics();
@@ -208,18 +204,18 @@ public function print_topics($forum_id, $sort_by, $start_from)
 
                 if ($cur_topic['sticky'] == '1') {
                     $cur_topic['item_status'] .= ' isticky';
-                    $status_text[] = '<span class="stickytext">'.$lang_forum['Sticky'].'</span>';
+                    $status_text[] = '<span class="stickytext">'.__('Sticky').'</span>';
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
                     $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
-                    $status_text[] = '<span class="movedtext">'.$lang_forum['Moved'].'</span>';
+                    $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
                     $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                 } else {
                     $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
-                    $status_text[] = '<span class="closedtext">'.$lang_forum['Closed'].'</span>';
+                    $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
 
diff --git a/model/viewtopic.php b/model/viewtopic.php
index 81e48413..baa99464 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -25,8 +25,6 @@ public function __construct()
     // Redirects to a post in particular
     public function redirect_to_post($post_id)
     {
-
-
         $select_info_topic = array('topic_id', 'posted');
 
         $result = DB::for_table('posts')
@@ -142,19 +140,17 @@ public function get_info_topic($id)
     // Generates the post link
     public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
     {
-        global $lang_topic;
-
         if ($closed == '0') {
             if (($post_replies == '' && $this->user->g_post_replies == '1') || $post_replies == '1' || $is_admmod) {
-                $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/reply/'.$topic_id.'/').'">'.$lang_topic['Post reply'].'</a></p>'."\n";
+                $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a></p>'."\n";
             } else {
                 $post_link = '';
             }
         } else {
-            $post_link = $lang_topic['Topic closed'];
+            $post_link = __('Topic closed');
 
             if ($is_admmod) {
-                $post_link .= ' / <a href="'.get_link('post/reply/'.$topic_id.'/').'">'.$lang_topic['Post reply'].'</a>';
+                $post_link .= ' / <a href="'.get_link('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a>';
             }
 
             $post_link = "\t\t\t".'<p class="postlink conr">'.$post_link.'</p>'."\n";
@@ -170,12 +166,10 @@ public function is_quickpost($post_replies, $closed, $is_admmod)
 
         $quickpost = false;
         if ($this->config['o_quickpost'] == '1' && ($post_replies == '1' || ($post_replies == '' && $this->user->g_post_replies == '1')) && ($closed == '0' || $is_admmod)) {
-            // Load the post.php language file
-            require FEATHER_ROOT.'lang/'.$this->user->language.'/post.php';
 
             $required_fields = array('req_message' => __('Message'));
             if ($this->user->is_guest) {
-                $required_fields['req_username'] = $lang_post['Guest name'];
+                $required_fields['req_username'] = __('Guest name');
                 if ($this->config['p_force_guest_email'] == '1') {
                     $required_fields['req_email'] = __('Email');
                 }
@@ -189,14 +183,12 @@ public function is_quickpost($post_replies, $closed, $is_admmod)
     // Subscraction link
     public function get_subscraction($is_subscribed, $topic_id)
     {
-        global $lang_topic;
-
         if (!$this->user->is_guest && $this->config['o_topic_subscriptions'] == '1') {
             if ($is_subscribed) {
                 // I apologize for the variable naming here. It's a mix of subscription and action I guess :-)
-                $subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.$lang_topic['Is subscribed'].' - </span><a href="'.get_link('unsubscribe/topic/'.$topic_id.'/').'">'.$lang_topic['Unsubscribe'].'</a></p>'."\n";
+                $subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.__('Is subscribed').' - </span><a href="'.get_link('unsubscribe/topic/'.$topic_id.'/').'">'.__('Unsubscribe').'</a></p>'."\n";
             } else {
-                $subscraction = "\t\t".'<p class="subscribelink clearb"><a href="'.get_link('subscribe/topic/'.$topic_id.'/').'">'.$lang_topic['Subscribe'].'</a></p>'."\n";
+                $subscraction = "\t\t".'<p class="subscribelink clearb"><a href="'.get_link('subscribe/topic/'.$topic_id.'/').'">'.__('Subscribe').'</a></p>'."\n";
             }
         } else {
             $subscraction = '';
@@ -234,7 +226,7 @@ public function get_page_head($topic_id, $num_pages, $p, $url_topic)
     // Prints the posts
     public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
     {
-        global $lang_topic, $pd;
+        global $pd;
 
         $post_data = array();
 
@@ -294,7 +286,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 }
 
                 // Format the online indicator
-                $cur_post['is_online_formatted'] = ($cur_post['is_online'] == $cur_post['poster_id']) ? '<strong>'.$lang_topic['Online'].'</strong>' : '<span>'.$lang_topic['Offline'].'</span>';
+                $cur_post['is_online_formatted'] = ($cur_post['is_online'] == $cur_post['poster_id']) ? '<strong>'.__('Online').'</strong>' : '<span>'.__('Offline').'</span>';
 
                 if ($this->config['o_avatars'] == '1' && $this->user->show_avatars != '0') {
                     if (isset($avatar_cache[$cur_post['poster_id']])) {
@@ -311,13 +303,13 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                             $cur_post['location'] = censor_words($cur_post['location']);
                         }
 
-                        $cur_post['user_info'][] = '<dd><span>'.$lang_topic['From'].' '.feather_escape($cur_post['location']).'</span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.__('From').' '.feather_escape($cur_post['location']).'</span></dd>';
                     }
 
-                    $cur_post['user_info'][] = '<dd><span>'.$lang_topic['Registered'].' '.format_time($cur_post['registered'], true).'</span></dd>';
+                    $cur_post['user_info'][] = '<dd><span>'.__('Registered').' '.format_time($cur_post['registered'], true).'</span></dd>';
 
                     if ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) {
-                        $cur_post['user_info'][] = '<dd><span>'.$lang_topic['Posts'].' '.forum_number_format($cur_post['num_posts']).'</span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.__('Posts').' '.forum_number_format($cur_post['num_posts']).'</span></dd>';
                     }
 
                     // Now let's deal with the contact links (Email and URL)
@@ -332,21 +324,21 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                             $cur_post['url'] = censor_words($cur_post['url']);
                         }
 
-                        $cur_post['user_contacts'][] = '<span class="website"><a href="'.feather_escape($cur_post['url']).'" rel="nofollow">'.$lang_topic['Website'].'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="website"><a href="'.feather_escape($cur_post['url']).'" rel="nofollow">'.__('Website').'</a></span>';
                     }
                 }
 
                 if ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && $this->user->g_mod_promote_users == '1')) {
                     if ($cur_post['g_promote_next_group']) {
-                        $cur_post['user_info'][] = '<dd><span><a href="'.get_base_url().'/user/'.$cur_post['poster_id'].'/action/promote/pid/'.$cur_post['id'].'">'.$lang_topic['Promote user'].'</a></span></dd>';
+                        $cur_post['user_info'][] = '<dd><span><a href="'.get_base_url().'/user/'.$cur_post['poster_id'].'/action/promote/pid/'.$cur_post['id'].'">'.__('Promote user').'</a></span></dd>';
                     }
                 }
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="'.get_link('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.$lang_topic['IP address logged'].'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.get_link('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
 
                     if ($cur_post['admin_note'] != '') {
-                        $cur_post['user_info'][] = '<dd><span>'.$lang_topic['Note'].' <strong>'.feather_escape($cur_post['admin_note']).'</strong></span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.__('Note').' <strong>'.feather_escape($cur_post['admin_note']).'</strong></span></dd>';
                     }
                 }
             }
@@ -356,7 +348,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 $cur_post['user_title_formatted'] = get_title($cur_post);
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="moderate.php?get_host='.$cur_post['id'].'" title="'.feather_escape($cur_post['poster_ip']).'">'.$lang_topic['IP address logged'].'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="moderate.php?get_host='.$cur_post['id'].'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
                 }
 
                 if ($this->config['o_show_user_info'] == '1' && $cur_post['poster_email'] != '' && !$this->user->is_guest && $this->user->g_send_email == '1') {
@@ -367,30 +359,30 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
             // Generation post action array (quote, edit, delete etc.)
             if (!$is_admmod) {
                 if (!$this->user->is_guest) {
-                    $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.get_link('report/'.$cur_post['id'].'/').'">'.$lang_topic['Report'].'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.get_link('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
                 }
 
                 if ($cur_topic['closed'] == '0') {
                     if ($cur_post['poster_id'] == $this->user->id) {
                         if ((($start_from + $post_count) == 1 && $this->user->g_delete_topics == '1') || (($start_from + $post_count) > 1 && $this->user->g_delete_posts == '1')) {
-                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.$lang_topic['Delete'].'</a></span></li>';
+                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
                         }
                         if ($this->user->g_edit_posts == '1') {
-                            $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.$lang_topic['Edit'].'</a></span></li>';
+                            $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
                         }
                     }
 
                     if (($cur_topic['post_replies'] == '' && $this->user->g_post_replies == '1') || $cur_topic['post_replies'] == '1') {
-                        $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.$lang_topic['Quote'].'</a></span></li>';
+                        $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
                     }
                 }
             } else {
-                $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.get_link('report/'.$cur_post['id'].'/').'">'.$lang_topic['Report'].'</a></span></li>';
+                $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.get_link('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
                 if ($this->user->g_id == FEATHER_ADMIN || !in_array($cur_post['poster_id'], $admin_ids)) {
-                    $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('delete/'.$cur_post['id'].'/').'">'.$lang_topic['Delete'].'</a></span></li>';
-                    $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.$lang_topic['Edit'].'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
                 }
-                $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.$lang_topic['Quote'].'</a></span></li>';
+                $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
             }
 
             // Perform the main parsing of the message (BBCode, smilies, censor words etc)
diff --git a/style/FeatherBB/view/delete.php b/style/FeatherBB/view/delete.php
index fc4f5f0a..65f2440b 100644
--- a/style/FeatherBB/view/delete.php
+++ b/style/FeatherBB/view/delete.php
@@ -19,23 +19,23 @@
 			<li><a href="index.php"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_delete['Delete post'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Delete post') ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_delete['Delete post'] ?></span></h2>
+	<h2><span><?php echo __('Delete post') ?></span></h2>
 	<div class="box">
 		<form method="post" action="<?php echo get_link('delete/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? $lang_delete['Topic by'] : $lang_delete['Reply by'], '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
-					<p><?php echo($is_topic_post) ? '<strong>'.$lang_delete['Topic warning'].'</strong>' : '<strong>'.$lang_delete['Warning'].'</strong>' ?><br /><?php echo $lang_delete['Delete info'] ?></p>
+					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
+					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php echo __('Delete info') ?></p>
 				</div>
 			</div>
-			<p class="buttons"><input type="submit" name="delete" value="<?php echo $lang_delete['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/edit.php b/style/FeatherBB/view/edit.php
index d4199e10..92ed1fe1 100644
--- a/style/FeatherBB/view/edit.php
+++ b/style/FeatherBB/view/edit.php
@@ -22,7 +22,7 @@
 			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_post['Edit post'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Edit post') ?></strong></li>
 		</ul>
 	</div>
 </div>
@@ -33,10 +33,10 @@
 if (!empty($errors)) :
 ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo $lang_post['Post errors'] ?></span></h2>
+	<h2><span><?php echo __('Post errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo $lang_post['Post errors info'] ?></p>
+			<p><?php echo __('Post errors info') ?></p>
 			<ul class="error-list">
 <?php
     foreach ($errors as $cur_error) {
@@ -51,7 +51,7 @@
 elseif ($feather->request->post('preview')):
 ?>
 <div id="postpreview" class="blockpost">
-	<h2><span><?php echo $lang_post['Post preview'] ?></span></h2>
+	<h2><span><?php echo __('Post preview') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -68,19 +68,20 @@
 endif;
 ?>
 <!-- Init BBcode editor toolbar -->
+<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
 </script>
 <script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
 <div id="editform" class="blockform">
-	<h2><span><?php echo $lang_post['Edit post'] ?></span></h2>
+	<h2><span><?php echo __('Edit post') ?></span></h2>
 	<div class="box">
 		<form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_post['Edit post legend'] ?></legend>
+					<legend><?php echo __('Edit post legend') ?></legend>
 					<input type="hidden" name="form_sent" value="1" />
 					<div class="infldset txtarea">
 <?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br />
@@ -89,10 +90,10 @@
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="help.php#img" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="help.php#smilies" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -113,7 +114,7 @@
 <?php
 endif;
 ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
index 80259a3b..0b1d2ae7 100644
--- a/style/FeatherBB/view/footer.php
+++ b/style/FeatherBB/view/footer.php
@@ -20,7 +20,7 @@
 
     if ($footer_style == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.$lang_forum['Mod controls'].'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($footer_style == 'viewtopic') {
@@ -34,7 +34,7 @@
 
 
         echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.$lang_topic['Mod controls'].'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         // TODO: all
         //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
         echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
diff --git a/style/FeatherBB/view/help.php b/style/FeatherBB/view/help.php
index 65353802..a7f9300d 100644
--- a/style/FeatherBB/view/help.php
+++ b/style/FeatherBB/view/help.php
@@ -14,113 +14,113 @@
 
 ?>
 
-<h2><span><?php echo $lang_help['BBCode'] ?></span></h2>
+<h2><span><?php echo __('BBCode') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="bbcode"></a><?php echo $lang_help['BBCode info 1'] ?></p>
-		<p><?php echo $lang_help['BBCode info 2'] ?></p>
+		<p><a name="bbcode"></a><?php echo __('BBCode info 1') ?></p>
+		<p><?php echo __('BBCode info 2') ?></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Text style'] ?></span></h2>
+<h2><span><?php echo __('Text style') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Text style info'] ?></p>
-		<p><code>[b]<?php echo $lang_help['Bold text'] ?>[/b]</code> <?php echo $lang_help['produces'] ?> <samp><strong><?php echo $lang_help['Bold text'] ?></strong></samp></p>
-		<p><code>[u]<?php echo $lang_help['Underlined text'] ?>[/u]</code> <?php echo $lang_help['produces'] ?> <samp><span class="bbu"><?php echo $lang_help['Underlined text'] ?></span></samp></p>
-		<p><code>[i]<?php echo $lang_help['Italic text'] ?>[/i]</code> <?php echo $lang_help['produces'] ?> <samp><em><?php echo $lang_help['Italic text'] ?></em></samp></p>
-		<p><code>[s]<?php echo $lang_help['Strike-through text'] ?>[/s]</code> <?php echo $lang_help['produces'] ?> <samp><span class="bbs"><?php echo $lang_help['Strike-through text'] ?></span></samp></p>
-		<p><code>[del]<?php echo $lang_help['Deleted text'] ?>[/del]</code> <?php echo $lang_help['produces'] ?> <samp><del><?php echo $lang_help['Deleted text'] ?></del></samp></p>
-		<p><code>[ins]<?php echo $lang_help['Inserted text'] ?>[/ins]</code> <?php echo $lang_help['produces'] ?> <samp><ins><?php echo $lang_help['Inserted text'] ?></ins></samp></p>
-		<p><code>[em]<?php echo $lang_help['Emphasised text'] ?>[/em]</code> <?php echo $lang_help['produces'] ?> <samp><em><?php echo $lang_help['Emphasised text'] ?></em></samp></p>
-		<p><code>[color=#FF0000]<?php echo $lang_help['Red text'] ?>[/color]</code> <?php echo $lang_help['produces'] ?> <samp><span style="color: #ff0000"><?php echo $lang_help['Red text'] ?></span></samp></p>
-		<p><code>[color=blue]<?php echo $lang_help['Blue text'] ?>[/color]</code> <?php echo $lang_help['produces'] ?> <samp><span style="color: blue"><?php echo $lang_help['Blue text'] ?></span></samp></p>
-		<p><code>[h]<?php echo $lang_help['Heading text'] ?>[/h]</code> <?php echo $lang_help['produces'] ?></p> <div class="postmsg"><h5><?php echo $lang_help['Heading text'] ?></h5></div>
+		<p><?php echo __('Text style info') ?></p>
+		<p><code>[b]<?php echo __('Bold text') ?>[/b]</code> <?php echo __('produces') ?> <samp><strong><?php echo __('Bold text') ?></strong></samp></p>
+		<p><code>[u]<?php echo __('Underlined text') ?>[/u]</code> <?php echo __('produces') ?> <samp><span class="bbu"><?php echo __('Underlined text') ?></span></samp></p>
+		<p><code>[i]<?php echo __('Italic text') ?>[/i]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Italic text') ?></em></samp></p>
+		<p><code>[s]<?php echo __('Strike-through text') ?>[/s]</code> <?php echo __('produces') ?> <samp><span class="bbs"><?php echo __('Strike-through text') ?></span></samp></p>
+		<p><code>[del]<?php echo __('Deleted text') ?>[/del]</code> <?php echo __('produces') ?> <samp><del><?php echo __('Deleted text') ?></del></samp></p>
+		<p><code>[ins]<?php echo __('Inserted text') ?>[/ins]</code> <?php echo __('produces') ?> <samp><ins><?php echo __('Inserted text') ?></ins></samp></p>
+		<p><code>[em]<?php echo __('Emphasised text') ?>[/em]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Emphasised text') ?></em></samp></p>
+		<p><code>[color=#FF0000]<?php echo __('Red text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: #ff0000"><?php echo __('Red text') ?></span></samp></p>
+		<p><code>[color=blue]<?php echo __('Blue text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: blue"><?php echo __('Blue text') ?></span></samp></p>
+		<p><code>[h]<?php echo __('Heading text') ?>[/h]</code> <?php echo __('produces') ?></p> <div class="postmsg"><h5><?php echo __('Heading text') ?></h5></div>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Links and images'] ?></span></h2>
+<h2><span><?php echo __('Links and images') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Links info'] ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php echo $lang_help['This help page'] ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('/help') ?>"><?php echo $lang_help['This help page'] ?></a></samp></p>
-		<p><code>[email]myname@example.com[/email]</code> <?php echo $lang_help['produces'] ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
-		<p><code>[email=myname@example.com]<?php echo $lang_help['My email address'] ?>[/email]</code> <?php echo $lang_help['produces'] ?> <samp><a href="mailto:myname@example.com"><?php echo $lang_help['My email address'] ?></a></samp></p>
-		<p><code>[topic=1]<?php echo $lang_help['Test topic'] ?>[/topic]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo $lang_help['Test topic'] ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php echo $lang_help['Test post'] ?>[/post]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo $lang_help['Test post'] ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php echo $lang_help['Test forum'] ?>[/forum]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo $lang_help['Test forum'] ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php echo $lang_help['Test user'] ?>[/user]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo $lang_help['Test user'] ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
+		<p><?php echo __('Links info') ?></p>
+		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
+		<p><code>[url=/help/]<?php echo __('This help page') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php echo __('This help page') ?></a></samp></p>
+		<p><code>[email]myname@example.com[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
+		<p><code>[email=myname@example.com]<?php echo __('My email address') ?>[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com"><?php echo __('My email address') ?></a></samp></p>
+		<p><code>[topic=1]<?php echo __('Test topic') ?>[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test topic') ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php echo __('Test post') ?>[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo __('Test post') ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php echo __('Test forum') ?>[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test forum') ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php echo __('Test user') ?>[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo __('Test user') ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
 	</div>
 	<div class="inbox">
-		<p><a name="img"></a><?php echo $lang_help['Images info'] ?></p>
-		<p><code>[img=<?php echo $lang_help['FluxBB bbcode test'] ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php echo $lang_help['produces'] ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php echo $lang_help['FluxBB bbcode test'] ?>" /></samp></p>
+		<p><a name="img"></a><?php echo __('Images info') ?></p>
+		<p><code>[img=<?php echo __('FluxBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php echo __('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php echo __('FluxBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Quotes'] ?></span></h2>
+<h2><span><?php echo __('Quotes') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Quotes info'] ?></p>
-		<p><code>[quote=James]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
-		<p><?php echo $lang_help['produces quote box'] ?></p>
+		<p><?php echo __('Quotes info') ?></p>
+		<p><code>[quote=James]<?php echo __('Quote text') ?>[/quote]</code></p>
+		<p><?php echo __('produces quote box') ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><cite>James <?php echo __('wrote') ?></cite><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
+			<div class="quotebox"><cite>James <?php echo __('wrote') ?></cite><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo $lang_help['Quotes info 2'] ?></p>
-		<p><code>[quote]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
-		<p><?php echo $lang_help['produces quote box'] ?></p>
+		<p><?php echo __('Quotes info 2') ?></p>
+		<p><code>[quote]<?php echo __('Quote text') ?>[/quote]</code></p>
+		<p><?php echo __('produces quote box') ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
+			<div class="quotebox"><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo $lang_help['quote note'] ?></p>
+		<p><?php echo __('quote note') ?></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Code'] ?></span></h2>
+<h2><span><?php echo __('Code') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Code info'] ?></p>
-		<p><code>[code]<?php echo $lang_help['Code text'] ?>[/code]</code></p>
-		<p><?php echo $lang_help['produces code box'] ?></p>
+		<p><?php echo __('Code info') ?></p>
+		<p><code>[code]<?php echo __('Code text') ?>[/code]</code></p>
+		<p><?php echo __('produces code box') ?></p>
 		<div class="postmsg">
-			<div class="codebox"><pre><code><?php echo $lang_help['Code text'] ?></code></pre></div>
+			<div class="codebox"><pre><code><?php echo __('Code text') ?></code></pre></div>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Lists'] ?></span></h2>
+<h2><span><?php echo __('Lists') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="lists"></a><?php echo $lang_help['List info'] ?></p>
-		<p><code>[list][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
-		<br /><span><?php echo $lang_help['produces list'] ?></span></p>
+		<p><a name="lists"></a><?php echo __('List info') ?></p>
+		<p><code>[list][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php echo __('produces list') ?></span></p>
 		<div class="postmsg">
-			<ul><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ul>
+			<ul><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ul>
 		</div>
-		<p><code>[list=1][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
-		<br /><span><?php echo $lang_help['produces decimal list'] ?></span></p>
+		<p><code>[list=1][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php echo __('produces decimal list') ?></span></p>
 		<div class="postmsg">
-			<ol class="decimal"><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ol>
+			<ol class="decimal"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
 		</div>
-		<p><code>[list=a][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
-		<br /><span><?php echo $lang_help['produces alpha list'] ?></span></p>
+		<p><code>[list=a][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php echo __('produces alpha list') ?></span></p>
 		<div class="postmsg">
-			<ol class="alpha"><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ol>
+			<ol class="alpha"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Nested tags'] ?></span></h2>
+<h2><span><?php echo __('Nested tags') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Nested tags info'] ?></p>
-		<p><code>[b][u]<?php echo $lang_help['Bold, underlined text'] ?>[/u][/b]</code> <?php echo $lang_help['produces'] ?> <samp><strong><span class="bbu"><?php echo $lang_help['Bold, underlined text'] ?></span></strong></samp></p>
+		<p><?php echo __('Nested tags info') ?></p>
+		<p><code>[b][u]<?php echo __('Bold, underlined text') ?>[/u][/b]</code> <?php echo __('produces') ?> <samp><strong><span class="bbu"><?php echo __('Bold, underlined text') ?></span></strong></samp></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Smilies'] ?></span></h2>
+<h2><span><?php echo __('Smilies') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="smilies"></a><?php echo $lang_help['Smilies info'] ?></p>
+		<p><a name="smilies"></a><?php echo __('Smilies info') ?></p>
 <?php
 
 // Display the smiley set
@@ -133,7 +133,7 @@
 }
 
 foreach ($smiley_groups as $smiley_img => $smiley_texts) {
-    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .$lang_help['produces']. '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
+    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
 }
 
 ?>
diff --git a/style/FeatherBB/view/index.php b/style/FeatherBB/view/index.php
index 73d0ec3b..d9d5ca64 100644
--- a/style/FeatherBB/view/index.php
+++ b/style/FeatherBB/view/index.php
@@ -13,7 +13,7 @@
 }
 
 if (empty($index_data)): ?>
-    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php echo $lang_index['Empty board'] ?></p></div></div></div>
+    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php echo __('Empty board') ?></p></div></div></div>
 <?php endif;
 foreach ($index_data as $forum) {
     if ($forum->cid != $cur_cat) :
@@ -34,7 +34,7 @@
 			<thead>
 				<tr>
 					<th class="tcl" scope="col"><?php echo __('Forum') ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_index['Topics'] ?></th>
+					<th class="tc2" scope="col"><?php echo __('Topics') ?></th>
 					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
 					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
@@ -80,27 +80,27 @@
 endif;
 ?>
 <div id="brdstats" class="block">
-	<h2><span><?php echo $lang_index['Board info'] ?></span></h2>
+	<h2><span><?php echo __('Board info') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<dl class="conr">
-				<dt><strong><?php echo $lang_index['Board stats'] ?></strong></dt>
-				<dd><span><?php printf($lang_index['No of users'], '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf($lang_index['No of topics'], '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
-				<dd><span><?php printf($lang_index['No of posts'], '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
+				<dt><strong><?php echo __('Board stats') ?></strong></dt>
+				<dd><span><?php printf(__('No of users'), '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of topics'), '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of posts'), '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
 			</dl>
 			<dl class="conl">
-				<dt><strong><?php echo $lang_index['User info'] ?></strong></dt>
-				<dd><span><?php printf($lang_index['Newest user'], $stats['newest_user']) ?></span></dd>
+				<dt><strong><?php echo __('User info') ?></strong></dt>
+				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
 				<?php if ($feather_config['o_users_online'] == 1) : ?>
-				<dd><span><?php printf($lang_index['Users online'], '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf($lang_index['Guests online'], '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Guests online'), '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
 				<?php endif; ?>
 			</dl>
 			<?php
             if ($feather_config['o_users_online'] == 1) :
                 if ($online['num_users'] > 0) {
-                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.$lang_index['Online'].' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
+                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
                 } else {
                     echo "\t\t\t".'<div class="clearer"></div>'."\n";
                 }
diff --git a/style/FeatherBB/view/login/form.php b/style/FeatherBB/view/login/form.php
index 221f02db..fb8f2404 100644
--- a/style/FeatherBB/view/login/form.php
+++ b/style/FeatherBB/view/login/form.php
@@ -20,7 +20,7 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_login['Login legend'] ?></legend>
+					<legend><?php echo __('Login legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
@@ -28,11 +28,11 @@
 						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
 
 						<div class="rbox clearb">
-							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo $lang_login['Remember me'] ?><br /></label>
+							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo __('Remember me') ?><br /></label>
 						</div>
 
-						<p class="clearb"><?php echo $lang_login['Login info'] ?></p>
-						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php echo $lang_login['Not registered'] ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php echo $lang_login['Forgotten pass'] ?></a></span></p>
+						<p class="clearb"><?php echo __('Login info') ?></p>
+						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php echo __('Not registered') ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php echo __('Forgotten pass') ?></a></span></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/login/password_forgotten.php b/style/FeatherBB/view/login/password_forgotten.php
index 7387bc54..979b915c 100644
--- a/style/FeatherBB/view/login/password_forgotten.php
+++ b/style/FeatherBB/view/login/password_forgotten.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo $lang_login['New password errors'] ?></span></h2>
+	<h2><span><?php echo __('New password errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo $lang_login['New passworderrors info'] ?></p>
+			<p><?php echo __('New passworderrors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,17 +37,17 @@
 }
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_login['Request pass'] ?></span></h2>
+	<h2><span><?php echo __('Request pass') ?></span></h2>
 	<div class="box">
 		<form id="request_pass" method="post" action="<?php echo get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_login['Request pass legend'] ?></legend>
+					<legend><?php echo __('Request pass legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
-						<p><?php echo $lang_login['Request pass info'] ?></p>
+						<p><?php echo __('Request pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/misc/email.php b/style/FeatherBB/view/misc/email.php
index 0cd4f3c8..7004040d 100644
--- a/style/FeatherBB/view/misc/email.php
+++ b/style/FeatherBB/view/misc/email.php
@@ -14,20 +14,20 @@
 
 ?>
 <div id="emailform" class="blockform">
-	<h2><span><?php echo $lang_misc['Send email to'] ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
+	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="<?php echo get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Write email'] ?></legend>
+					<legend><?php echo __('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
+						<p><?php echo __('Email disclosure note') ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/misc/report.php b/style/FeatherBB/view/misc/report.php
index adbb619f..121feac2 100644
--- a/style/FeatherBB/view/misc/report.php
+++ b/style/FeatherBB/view/misc/report.php
@@ -19,22 +19,22 @@
 			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Report post'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Report post') ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div id="reportform" class="blockform">
-	<h2><span><?php echo $lang_misc['Report post'] ?></span></h2>
+	<h2><span><?php echo __('Report post') ?></span></h2>
 	<div class="box">
 		<form id="report" method="post" action="<?php echo get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Reason desc'] ?></legend>
+					<legend><?php echo __('Reason desc') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_misc['Reason'] ?> <span><?php echo __('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
+						<label class="required"><strong><?php echo __('Reason') ?> <span><?php echo __('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/misc/rules.php b/style/FeatherBB/view/misc/rules.php
index 00cff256..d32a805e 100644
--- a/style/FeatherBB/view/misc/rules.php
+++ b/style/FeatherBB/view/misc/rules.php
@@ -14,7 +14,7 @@
 
 ?>
 <div id="rules" class="block">
-	<div class="hd"><h2><span><?php echo $lang_register['Forum rules'] ?></span></h2></div>
+	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<div id="rules-block" class="inbox">
 			<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
diff --git a/style/FeatherBB/view/moderate/delete_posts.php b/style/FeatherBB/view/moderate/delete_posts.php
index 01269ca7..4b95a5f1 100644
--- a/style/FeatherBB/view/moderate/delete_posts.php
+++ b/style/FeatherBB/view/moderate/delete_posts.php
@@ -14,20 +14,20 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Delete posts'] ?></span></h2>
+	<h2><span><?php echo __('Delete posts') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm delete legend'] ?></legend>
+					<legend><?php echo __('Confirm delete legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<p><?php echo $lang_misc['Delete posts comply'] ?></p>
+						<p><?php echo __('Delete posts comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/delete_topics.php b/style/FeatherBB/view/moderate/delete_topics.php
index 9b04ddaf..e414f734 100644
--- a/style/FeatherBB/view/moderate/delete_topics.php
+++ b/style/FeatherBB/view/moderate/delete_topics.php
@@ -15,20 +15,20 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Delete topics'] ?></span></h2>
+	<h2><span><?php echo __('Delete topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm delete legend'] ?></legend>
+					<legend><?php echo __('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_misc['Delete topics comply'] ?></p>
+						<p><?php echo __('Delete topics comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/merge_topics.php b/style/FeatherBB/view/moderate/merge_topics.php
index 0e328f1d..b55f586b 100644
--- a/style/FeatherBB/view/moderate/merge_topics.php
+++ b/style/FeatherBB/view/moderate/merge_topics.php
@@ -15,22 +15,22 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Merge topics'] ?></span></h2>
+	<h2><span><?php echo __('Merge topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm merge legend'] ?></legend>
+					<legend><?php echo __('Confirm merge legend') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1" /><?php echo $lang_misc['Leave redirect'] ?><br /></label>
+							<label><input type="checkbox" name="with_redirect" value="1" /><?php echo __('Leave redirect') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo $lang_misc['Merge'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo __('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/moderator_forum.php b/style/FeatherBB/view/moderate/moderator_forum.php
index 114df22e..bf893ce4 100644
--- a/style/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/FeatherBB/view/moderate/moderator_forum.php
@@ -19,7 +19,7 @@
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -40,9 +40,9 @@
 				<tr>
 					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
 					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
 <?php endif; ?>					<th class="tcr"><?php echo __('Last post') ?></th>
-					<th class="tcmod" scope="col"><?php echo $lang_misc['Select'] ?></th>
+					<th class="tcmod" scope="col"><?php echo __('Select') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -74,7 +74,7 @@
             if (empty($topic_data)):
                 $colspan = ($feather_config['o_topic_views'] == '1') ? 5 : 4;
                 $button_status = ' disabled="disabled"';
-                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.$lang_forum['Empty forum'].'</td></tr>'."\n";
+                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
             endif;
             ?>
 			</tbody>
@@ -87,13 +87,13 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php echo $lang_misc['Move'] ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php echo $lang_misc['Delete'] ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php echo $lang_misc['Merge'] ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php echo $lang_misc['Open'] ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php echo $lang_misc['Close'] ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php echo __('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php echo __('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php echo __('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php echo __('Close') ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/style/FeatherBB/view/moderate/move_topics.php b/style/FeatherBB/view/moderate/move_topics.php
index b792cf68..389f1f05 100644
--- a/style/FeatherBB/view/moderate/move_topics.php
+++ b/style/FeatherBB/view/moderate/move_topics.php
@@ -15,16 +15,16 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo($action == 'single') ? $lang_misc['Move topic'] : $lang_misc['Move topics'] ?></span></h2>
+	<h2><span><?php echo($action == 'single') ? __('Move topic') : __('Move topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 			<input type="hidden" name="topics" value="<?php echo $topics ?>" />
 				<fieldset>
-					<legend><?php echo $lang_misc['Move legend'] ?></legend>
+					<legend><?php echo __('Move legend') ?></legend>
 					<div class="infldset">
-						<label><?php echo $lang_misc['Move to'] ?>
+						<label><?php echo __('Move to') ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
@@ -33,12 +33,12 @@
 						<div class="rbox">
 							<label><input type="checkbox" name="with_redirect" value="1"<?php if ($action == 'single') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_misc['Leave redirect'] ?><br /></label>
+} ?> /><?php echo __('Leave redirect') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo $lang_misc['Move'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo __('Move') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/posts_view.php b/style/FeatherBB/view/moderate/posts_view.php
index 60477a50..f957ce8f 100644
--- a/style/FeatherBB/view/moderate/posts_view.php
+++ b/style/FeatherBB/view/moderate/posts_view.php
@@ -19,7 +19,7 @@
 			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -57,7 +57,7 @@
 						<div class="postmsg">
 							<?php echo $post['message']."\n" ?>
 	<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.$lang_topic['Last edit'].' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 						</div>
@@ -66,7 +66,7 @@
 			</div>
 			<div class="inbox">
 				<div class="postfoot clearb">
-					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.$lang_misc['Select'].'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.$lang_misc['Cannot select first'].'</p>' ?></div>
+					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.__('Select').'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.__('Cannot select first').'</p>' ?></div>
 				</div>
 			</div>
 		</div>
@@ -80,14 +80,14 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php echo $lang_misc['Split'] ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php echo $lang_misc['Delete'] ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php echo __('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/style/FeatherBB/view/moderate/split_posts.php b/style/FeatherBB/view/moderate/split_posts.php
index 244c7fb8..ac012ff3 100644
--- a/style/FeatherBB/view/moderate/split_posts.php
+++ b/style/FeatherBB/view/moderate/split_posts.php
@@ -14,27 +14,27 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Split posts'] ?></span></h2>
+	<h2><span><?php echo __('Split posts') ?></span></h2>
 	<div class="box">
 		<form id="subject" method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm split legend'] ?></legend>
+					<legend><?php echo __('Confirm split legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<label class="required"><strong><?php echo $lang_misc['New subject'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
-						<label><?php echo $lang_misc['Move to'] ?>
+						<label class="required"><strong><?php echo __('New subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
+						<label><?php echo __('Move to') ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
 						</select>
 						<br /></label>
-						<p><?php echo $lang_misc['Split posts comply'] ?></p>
+						<p><?php echo __('Split posts comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo $lang_misc['Split'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo __('Split') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/post.php b/style/FeatherBB/view/post.php
index 603d4cac..0c341fd0 100644
--- a/style/FeatherBB/view/post.php
+++ b/style/FeatherBB/view/post.php
@@ -33,10 +33,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo $lang_post['Post errors'] ?></span></h2>
+	<h2><span><?php echo __('Post errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo $lang_post['Post errors info'] ?></p>
+			<p><?php echo __('Post errors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -57,7 +57,7 @@
 
     ?>
 <div id="postpreview" class="blockpost">
-	<h2><span><?php echo $lang_post['Post preview'] ?></span></h2>
+	<h2><span><?php echo __('Post preview') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -80,6 +80,7 @@
 
 ?>
 <!-- Init BBcode editor toolbar -->
+<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
@@ -101,7 +102,7 @@
     $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
     $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
-						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
+						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
     echo feather_escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
@@ -150,13 +151,13 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
+					<legend><?php echo __('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_antispam['Robot info']    ?></p>
+						<p><?php echo __('Robot info')    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
                              $qencoded = md5($question[$index_questions]);
-                             echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);?>
+                             echo sprintf(__('Robot question'), $question[$index_questions]);?>
 							 <span><?php echo __('Required') ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
@@ -165,7 +166,7 @@
 				</fieldset>
 			</div>
 			<?php endif; ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
@@ -175,7 +176,7 @@
 if ($tid && $feather_config['o_topic_review'] != '0') :
 ?>
 <div id="postreview">
-	<h2><span><?php echo $lang_post['Topic review'] ?></span></h2>
+	<h2><span><?php echo __('Topic review') ?></span></h2>
 
 	<?php
     // Set background switching on
diff --git a/style/FeatherBB/view/profile/change_mail.php b/style/FeatherBB/view/profile/change_mail.php
index f425e499..de0f8d3b 100644
--- a/style/FeatherBB/view/profile/change_mail.php
+++ b/style/FeatherBB/view/profile/change_mail.php
@@ -14,18 +14,18 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Change email'] ?></span></h2>
+	<h2><span><?php echo __('Change email') ?></span></h2>
 	<div class="box">
 		<form id="change_email" method="post" action="<?php echo get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Email legend'] ?></legend>
+					<legend><?php echo __('Email legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_profile['New email'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
+						<label class="required"><strong><?php echo __('New email') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
 						<label class="required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
-						<p><?php echo $lang_profile['Email instructions'] ?></p>
+						<p><?php echo __('Email instructions') ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/profile/change_pass.php b/style/FeatherBB/view/profile/change_pass.php
index f5344967..0f0ab452 100644
--- a/style/FeatherBB/view/profile/change_pass.php
+++ b/style/FeatherBB/view/profile/change_pass.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Change pass'] ?></span></h2>
+	<h2><span><?php echo __('Change pass') ?></span></h2>
 	<div class="box">
 		<form id="change_pass" method="post" action="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
 				<fieldset>
-					<legend><?php echo $lang_profile['Change pass legend'] ?></legend>
+					<legend><?php echo __('Change pass legend') ?></legend>
 					<div class="infldset">
-<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo $lang_profile['Old pass'] ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo __('Old pass') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_old_password" size="16" /><br /></label>
-<?php endif; ?>						<label class="conl required"><strong><?php echo $lang_profile['New pass'] ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php endif; ?>						<label class="conl required"><strong><?php echo __('New pass') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password1" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_profile['Confirm new pass'] ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="conl required"><strong><?php echo __('Confirm new pass') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password2" size="16" /><br /></label>
-						<p class="clearb"><?php echo $lang_profile['Pass info'] ?></p>
+						<p class="clearb"><?php echo __('Pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/profile/delete_user.php b/style/FeatherBB/view/profile/delete_user.php
index 0f0ebc14..d5d5bde2 100644
--- a/style/FeatherBB/view/profile/delete_user.php
+++ b/style/FeatherBB/view/profile/delete_user.php
@@ -14,23 +14,23 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Confirm delete user'] ?></span></h2>
+	<h2><span><?php echo __('Confirm delete user') ?></span></h2>
 	<div class="box">
 		<form id="confirm_del_user" method="post" action="<?php echo get_link('user/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Confirm delete legend'] ?></legend>
+					<legend><?php echo __('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_profile['Confirmation info'].' <strong>'.feather_escape($username).'</strong>.' ?></p>
+						<p><?php echo __('Confirmation info').' <strong>'.feather_escape($username).'</strong>.' ?></p>
 						<div class="rbox">
-							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo $lang_profile['Delete posts'] ?><br /></label>
+							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo __('Delete posts') ?><br /></label>
 						</div>
-						<p class="warntext"><strong><?php echo $lang_profile['Delete warning'] ?></strong></p>
+						<p class="warntext"><strong><?php echo __('Delete warning') ?></strong></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo $lang_profile['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/menu.php b/style/FeatherBB/view/profile/menu.php
index bcf803e1..e78d2c30 100644
--- a/style/FeatherBB/view/profile/menu.php
+++ b/style/FeatherBB/view/profile/menu.php
@@ -15,39 +15,39 @@
 ?>
 <div id="profile" class="block2col">
 	<div class="blockmenu">
-		<h2><span><?php echo $lang_profile['Profile menu'] ?></span></h2>
+		<h2><span><?php echo __('Profile menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'essentials') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php echo $lang_profile['Section essentials'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php echo __('Section essentials') ?></a></li>
 					<li<?php if ($page == 'personal') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php echo $lang_profile['Section personal'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php echo __('Section personal') ?></a></li>
 					<li<?php if ($page == 'messaging') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php echo $lang_profile['Section messaging'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php echo __('Section messaging') ?></a></li>
 <?php if ($feather_config['o_avatars'] == '1' || $feather_config['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php echo $lang_profile['Section personality'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php echo __('Section personality') ?></a></li>
 <?php endif;
     ?>					<li<?php if ($page == 'display') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php echo $lang_profile['Section display'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php echo __('Section display') ?></a></li>
 					<li<?php if ($page == 'privacy') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php echo $lang_profile['Section privacy'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php echo __('Section privacy') ?></a></li>
 <?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php echo $lang_profile['Section admin'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php echo __('Section admin') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
diff --git a/style/FeatherBB/view/profile/section_admin.php b/style/FeatherBB/view/profile/section_admin.php
index 16b4f80a..52a0ad54 100644
--- a/style/FeatherBB/view/profile/section_admin.php
+++ b/style/FeatherBB/view/profile/section_admin.php
@@ -14,7 +14,7 @@
 
 ?>
 	<div class="blockform">
-		<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section admin'] ?></span></h2>
+		<h2><span><?php echo feather_escape($user['username']).' - '.__('Section admin') ?></span></h2>
 		<div class="box">
 			<form id="profile7" method="post" action="<?php echo get_link('user/'.$id.'/section/admin/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -25,9 +25,9 @@
 
         if ($feather->user->g_moderator == '1') {
             ?>
-						<legend><?php echo $lang_profile['Delete ban legend'] ?></legend>
+						<legend><?php echo __('Delete ban legend') ?></legend>
 						<div class="infldset">
-							<p><input type="submit" name="ban" value="<?php echo $lang_profile['Ban user'] ?>" /></p>
+							<p><input type="submit" name="ban" value="<?php echo __('Ban user') ?>" /></p>
 						</div>
 					</fieldset>
 				</div>
@@ -36,12 +36,12 @@
         } else {
             if ($feather->user->id != $id) {
                 ?>
-						<legend><?php echo $lang_profile['Group membership legend'] ?></legend>
+						<legend><?php echo __('Group membership legend') ?></legend>
 						<div class="infldset">
 							<select id="group_id" name="group_id">
                                                             <?php echo $group_list ?>
 							</select>
-							<input type="submit" name="update_group_membership" value="<?php echo $lang_profile['Save'] ?>" />
+							<input type="submit" name="update_group_membership" value="<?php echo __('Save') ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -52,9 +52,9 @@
             }
 
             ?>
-						<legend><?php echo $lang_profile['Delete ban legend'] ?></legend>
+						<legend><?php echo __('Delete ban legend') ?></legend>
 						<div class="infldset">
-							<input type="submit" name="delete_user" value="<?php echo $lang_profile['Delete user'] ?>" /> <input type="submit" name="ban" value="<?php echo $lang_profile['Ban user'] ?>" />
+							<input type="submit" name="delete_user" value="<?php echo __('Delete user') ?>" /> <input type="submit" name="ban" value="<?php echo __('Ban user') ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -64,13 +64,13 @@
                 ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_profile['Set mods legend'] ?></legend>
+						<legend><?php echo __('Set mods legend') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_profile['Moderator in info'] ?></p>
+							<p><?php echo __('Moderator in info') ?></p>
                                                         <?php echo $forum_list ?>
 								</div>
 							</div>
-							<br class="clearb" /><input type="submit" name="update_forums" value="<?php echo $lang_profile['Update forums'] ?>" />
+							<br class="clearb" /><input type="submit" name="update_forums" value="<?php echo __('Update forums') ?>" />
 						</div>
 					</fieldset>
 				</div>
diff --git a/style/FeatherBB/view/profile/section_display.php b/style/FeatherBB/view/profile/section_display.php
index 7aacc2f0..506dd146 100644
--- a/style/FeatherBB/view/profile/section_display.php
+++ b/style/FeatherBB/view/profile/section_display.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section display'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section display') ?></span></h2>
 	<div class="box">
 		<form id="profile5" method="post" action="<?php echo get_link('user/'.$id.'/section/display/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -30,9 +30,9 @@
         ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Style legend'] ?></legend>
+					<legend><?php echo __('Style legend') ?></legend>
 					<div class="infldset">
-						<label><?php echo $lang_profile['Styles'] ?><br />
+						<label><?php echo __('Styles') ?><br />
 						<select name="form_style">
 <?php
 
@@ -58,25 +58,25 @@
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1' || $feather_config['o_signatures'] == '1' || $feather_config['o_avatars'] == '1' || ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1')): ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Post display legend'] ?></legend>
+					<legend><?php echo __('Post display legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_profile['Post display info'] ?></p>
+						<p><?php echo __('Post display info') ?></p>
 						<div class="rbox">
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show smilies'] ?><br /></label>
+} ?> /><?php echo __('Show smilies') ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show sigs'] ?><br /></label>
+} ?> /><?php echo __('Show sigs') ?><br /></label>
 <?php endif; if ($feather_config['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show avatars'] ?><br /></label>
+} ?> /><?php echo __('Show avatars') ?><br /></label>
 <?php endif; if ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show images'] ?><br /></label>
+} ?> /><?php echo __('Show images') ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1' && $feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show images sigs'] ?><br /></label>
+} ?> /><?php echo __('Show images sigs') ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
@@ -85,15 +85,15 @@
 <?php endif; ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Pagination legend'] ?></legend>
+					<legend><?php echo __('Pagination legend') ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo $lang_profile['Topics per page'] ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
-						<label class="conl"><?php echo $lang_profile['Posts per page'] ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
-						<p class="clearb"><?php echo $lang_profile['Paginate info'] ?> <?php echo $lang_profile['Leave blank'] ?></p>
+						<label class="conl"><?php echo __('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
+						<label class="conl"><?php echo __('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
+						<p class="clearb"><?php echo __('Paginate info') ?> <?php echo __('Leave blank') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_essentials.php b/style/FeatherBB/view/profile/section_essentials.php
index 364d5d8e..4f507a8c 100644
--- a/style/FeatherBB/view/profile/section_essentials.php
+++ b/style/FeatherBB/view/profile/section_essentials.php
@@ -14,23 +14,23 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section essentials'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section essentials') ?></span></h2>
 	<div class="box">
 		<form id="profile1" method="post" action="<?php echo get_link('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Username and pass legend'] ?></legend>
+					<legend><?php echo __('Username and pass legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php echo $lang_profile['Change pass'] ?></a></span></p>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php echo __('Change pass') ?></a></span></p>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Email legend'] ?></legend>
+					<legend><?php echo __('Email legend') ?></legend>
 					<div class="infldset">
 						<?php echo $user_disp['email_field'] ?>
 					</div>
@@ -38,139 +38,139 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Localisation legend'] ?></legend>
+					<legend><?php echo __('Localisation legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_prof_reg['Time zone info'] ?></p>
-						<label><?php echo $lang_prof_reg['Time zone']."\n" ?>
+						<p><?php echo __('Time zone info') ?></p>
+						<label><?php echo __('Time zone')."\n" ?>
 						<br /><select name="form_timezone">
 							<option value="-12"<?php if ($user['timezone'] == -12) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-12:00'] ?></option>
+} ?>><?php echo __('UTC-12:00') ?></option>
 							<option value="-11"<?php if ($user['timezone'] == -11) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-11:00'] ?></option>
+} ?>><?php echo __('UTC-11:00') ?></option>
 							<option value="-10"<?php if ($user['timezone'] == -10) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-10:00'] ?></option>
+} ?>><?php echo __('UTC-10:00') ?></option>
 							<option value="-9.5"<?php if ($user['timezone'] == -9.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-09:30'] ?></option>
+} ?>><?php echo __('UTC-09:30') ?></option>
 							<option value="-9"<?php if ($user['timezone'] == -9) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-09:00'] ?></option>
+} ?>><?php echo __('UTC-09:00') ?></option>
 							<option value="-8.5"<?php if ($user['timezone'] == -8.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-08:30'] ?></option>
+} ?>><?php echo __('UTC-08:30') ?></option>
 							<option value="-8"<?php if ($user['timezone'] == -8) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-08:00'] ?></option>
+} ?>><?php echo __('UTC-08:00') ?></option>
 							<option value="-7"<?php if ($user['timezone'] == -7) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-07:00'] ?></option>
+} ?>><?php echo __('UTC-07:00') ?></option>
 							<option value="-6"<?php if ($user['timezone'] == -6) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-06:00'] ?></option>
+} ?>><?php echo __('UTC-06:00') ?></option>
 							<option value="-5"<?php if ($user['timezone'] == -5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-05:00'] ?></option>
+} ?>><?php echo __('UTC-05:00') ?></option>
 							<option value="-4"<?php if ($user['timezone'] == -4) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-04:00'] ?></option>
+} ?>><?php echo __('UTC-04:00') ?></option>
 							<option value="-3.5"<?php if ($user['timezone'] == -3.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-03:30'] ?></option>
+} ?>><?php echo __('UTC-03:30') ?></option>
 							<option value="-3"<?php if ($user['timezone'] == -3) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-03:00'] ?></option>
+} ?>><?php echo __('UTC-03:00') ?></option>
 							<option value="-2"<?php if ($user['timezone'] == -2) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-02:00'] ?></option>
+} ?>><?php echo __('UTC-02:00') ?></option>
 							<option value="-1"<?php if ($user['timezone'] == -1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-01:00'] ?></option>
+} ?>><?php echo __('UTC-01:00') ?></option>
 							<option value="0"<?php if ($user['timezone'] == 0) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC'] ?></option>
+} ?>><?php echo __('UTC') ?></option>
 							<option value="1"<?php if ($user['timezone'] == 1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+01:00'] ?></option>
+} ?>><?php echo __('UTC+01:00') ?></option>
 							<option value="2"<?php if ($user['timezone'] == 2) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+02:00'] ?></option>
+} ?>><?php echo __('UTC+02:00') ?></option>
 							<option value="3"<?php if ($user['timezone'] == 3) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+03:00'] ?></option>
+} ?>><?php echo __('UTC+03:00') ?></option>
 							<option value="3.5"<?php if ($user['timezone'] == 3.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+03:30'] ?></option>
+} ?>><?php echo __('UTC+03:30') ?></option>
 							<option value="4"<?php if ($user['timezone'] == 4) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+04:00'] ?></option>
+} ?>><?php echo __('UTC+04:00') ?></option>
 							<option value="4.5"<?php if ($user['timezone'] == 4.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+04:30'] ?></option>
+} ?>><?php echo __('UTC+04:30') ?></option>
 							<option value="5"<?php if ($user['timezone'] == 5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+05:00'] ?></option>
+} ?>><?php echo __('UTC+05:00') ?></option>
 							<option value="5.5"<?php if ($user['timezone'] == 5.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+05:30'] ?></option>
+} ?>><?php echo __('UTC+05:30') ?></option>
 							<option value="5.75"<?php if ($user['timezone'] == 5.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+05:45'] ?></option>
+} ?>><?php echo __('UTC+05:45') ?></option>
 							<option value="6"<?php if ($user['timezone'] == 6) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+06:00'] ?></option>
+} ?>><?php echo __('UTC+06:00') ?></option>
 							<option value="6.5"<?php if ($user['timezone'] == 6.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+06:30'] ?></option>
+} ?>><?php echo __('UTC+06:30') ?></option>
 							<option value="7"<?php if ($user['timezone'] == 7) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+07:00'] ?></option>
+} ?>><?php echo __('UTC+07:00') ?></option>
 							<option value="8"<?php if ($user['timezone'] == 8) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+08:00'] ?></option>
+} ?>><?php echo __('UTC+08:00') ?></option>
 							<option value="8.75"<?php if ($user['timezone'] == 8.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+08:45'] ?></option>
+} ?>><?php echo __('UTC+08:45') ?></option>
 							<option value="9"<?php if ($user['timezone'] == 9) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+09:00'] ?></option>
+} ?>><?php echo __('UTC+09:00') ?></option>
 							<option value="9.5"<?php if ($user['timezone'] == 9.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+09:30'] ?></option>
+} ?>><?php echo __('UTC+09:30') ?></option>
 							<option value="10"<?php if ($user['timezone'] == 10) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+10:00'] ?></option>
+} ?>><?php echo __('UTC+10:00') ?></option>
 							<option value="10.5"<?php if ($user['timezone'] == 10.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+10:30'] ?></option>
+} ?>><?php echo __('UTC+10:30') ?></option>
 							<option value="11"<?php if ($user['timezone'] == 11) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+11:00'] ?></option>
+} ?>><?php echo __('UTC+11:00') ?></option>
 							<option value="11.5"<?php if ($user['timezone'] == 11.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+11:30'] ?></option>
+} ?>><?php echo __('UTC+11:30') ?></option>
 							<option value="12"<?php if ($user['timezone'] == 12) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+12:00'] ?></option>
+} ?>><?php echo __('UTC+12:00') ?></option>
 							<option value="12.75"<?php if ($user['timezone'] == 12.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+12:45'] ?></option>
+} ?>><?php echo __('UTC+12:45') ?></option>
 							<option value="13"<?php if ($user['timezone'] == 13) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+13:00'] ?></option>
+} ?>><?php echo __('UTC+13:00') ?></option>
 							<option value="14"<?php if ($user['timezone'] == 14) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+14:00'] ?></option>
+} ?>><?php echo __('UTC+14:00') ?></option>
 						</select>
 						<br /></label>
 						<div class="rbox">
 							<label><input type="checkbox" name="form_dst" value="1"<?php if ($user['dst'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['DST'] ?><br /></label>
+} ?> /><?php echo __('DST') ?><br /></label>
 						</div>
-						<label><?php echo $lang_prof_reg['Time format'] ?>
+						<label><?php echo __('Time format') ?>
 
 						<br /><select name="form_time_format">
 <?php
@@ -181,14 +181,14 @@
                                 }
                                 echo '>'. format_time(time(), false, null, $time_format, true, true);
                                 if ($key == 0) {
-                                    echo ' ('.$lang_prof_reg['Default'].')';
+                                    echo ' ('.__('Default').')';
                                 }
                                 echo "</option>\n";
                             }
                             ?>
 						</select>
 						<br /></label>
-						<label><?php echo $lang_prof_reg['Date format'] ?>
+						<label><?php echo __('Date format') ?>
 
 						<br /><select name="form_date_format">
 <?php
@@ -199,7 +199,7 @@
                                 }
                                 echo '>'. format_time(time(), true, $date_format, null, false, true);
                                 if ($key == 0) {
-                                    echo ' ('.$lang_prof_reg['Default'].')';
+                                    echo ' ('.__('Default').')';
                                 }
                                 echo "</option>\n";
                             }
@@ -214,7 +214,7 @@
     // Only display the language selection box if there's more than one language available
     if (count($languages) > 1) {
         ?>
-						<label><?php echo $lang_prof_reg['Language'] ?>
+						<label><?php echo __('Language') ?>
 						<br /><select name="form_language">
 <?php
 
@@ -239,18 +239,18 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['User activity'] ?></legend>
+					<legend><?php echo __('User activity') ?></legend>
 					<div class="infldset">
-						<p><?php printf($lang_profile['Registered info'], format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
-						<p><?php printf($lang_profile['Last post info'], format_time($user['last_post'])) ?></p>
-						<p><?php printf($lang_profile['Last visit info'], format_time($user['last_visit'])) ?></p>
+						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
+						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
-<?php if ($feather->user->is_admmod): ?>							<label><?php echo $lang_profile['Admin note'] ?><br />
+<?php if ($feather->user->is_admmod): ?>							<label><?php echo __('Admin note') ?><br />
 						<input id="admin_note" type="text" name="admin_note" value="<?php echo feather_escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_messaging.php b/style/FeatherBB/view/profile/section_messaging.php
index 1ba9e14f..148a78cf 100644
--- a/style/FeatherBB/view/profile/section_messaging.php
+++ b/style/FeatherBB/view/profile/section_messaging.php
@@ -14,24 +14,24 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section messaging'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section messaging') ?></span></h2>
 	<div class="box">
 		<form id="profile3" method="post" action="<?php echo get_link('user/'.$id.'/section/messaging/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Contact details legend'] ?></legend>
+					<legend><?php echo __('Contact details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo $lang_profile['Jabber'] ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
-						<label><?php echo $lang_profile['ICQ'] ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php echo $lang_profile['MSN'] ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php echo $lang_profile['AOL IM'] ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php echo $lang_profile['Yahoo'] ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php echo __('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
+						<label><?php echo __('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
+						<label><?php echo __('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
+						<label><?php echo __('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php echo __('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_personal.php b/style/FeatherBB/view/profile/section_personal.php
index 6e2fd1e6..7358bc85 100644
--- a/style/FeatherBB/view/profile/section_personal.php
+++ b/style/FeatherBB/view/profile/section_personal.php
@@ -14,24 +14,24 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section personal'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personal') ?></span></h2>
 	<div class="box">
 		<form id="profile2" method="post" action="<?php echo get_link('user/'.$id.'/section/personal/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Personal details legend'] ?></legend>
+					<legend><?php echo __('Personal details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo $lang_profile['Realname'] ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
+						<label><?php echo __('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
 <?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php echo $lang_profile['Location'] ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php echo $lang_profile['Website'] ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>							<label><?php echo __('Location') ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php echo __('Website') ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_personality.php b/style/FeatherBB/view/profile/section_personality.php
index cfb1d445..9bd9440b 100644
--- a/style/FeatherBB/view/profile/section_personality.php
+++ b/style/FeatherBB/view/profile/section_personality.php
@@ -14,28 +14,28 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section personality'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personality') ?></span></h2>
 	<div class="box">
 		<form id="profile4" method="post" action="<?php echo get_link('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php if ($feather_config['o_avatars'] == '1'): ?>				<div class="inform">
 				<fieldset id="profileavatar">
-					<legend><?php echo $lang_profile['Avatar legend'] ?></legend>
+					<legend><?php echo __('Avatar legend') ?></legend>
 					<div class="infldset">
 <?php if ($user_avatar): ?>							<div class="useravatar"><?php echo $user_avatar ?></div>
-<?php endif; ?>							<p><?php echo $lang_profile['Avatar info'] ?></p>
+<?php endif; ?>							<p><?php echo __('Avatar info') ?></p>
 						<p class="clearb actions"><?php echo $avatar_field ?></p>
 					</div>
 				</fieldset>
 			</div>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Signature legend'] ?></legend>
+					<legend><?php echo __('Signature legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_profile['Signature info'] ?></p>
+						<p><?php echo __('Signature info') ?></p>
 						<div class="txtarea">
-							<label><?php printf($lang_profile['Sig max size'], forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
+							<label><?php printf(__('Sig max size'), forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
@@ -48,7 +48,7 @@
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_privacy.php b/style/FeatherBB/view/profile/section_privacy.php
index 030520e0..6c1ab357 100644
--- a/style/FeatherBB/view/profile/section_privacy.php
+++ b/style/FeatherBB/view/profile/section_privacy.php
@@ -14,47 +14,47 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section privacy'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section privacy') ?></span></h2>
 	<div class="box">
 		<form id="profile6" method="post" action="<?php echo get_link('user/'.$id.'/section/privacy/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Privacy options legend'] ?></legend>
+					<legend><?php echo __('Privacy options legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<p><?php echo $lang_prof_reg['Email setting info'] ?></p>
+						<p><?php echo __('Email setting info') ?></p>
 						<div class="rbox">
 							<label><input type="radio" name="form_email_setting" value="0"<?php if ($user['email_setting'] == '0') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['Email setting 1'] ?><br /></label>
+} ?> /><?php echo __('Email setting 1') ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="1"<?php if ($user['email_setting'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['Email setting 2'] ?><br /></label>
+} ?> /><?php echo __('Email setting 2') ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="2"<?php if ($user['email_setting'] == '2') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['Email setting 3'] ?><br /></label>
+} ?> /><?php echo __('Email setting 3') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
 <?php if ($feather_config['o_forum_subscriptions'] == '1' || $feather_config['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Subscription legend'] ?></legend>
+					<legend><?php echo __('Subscription legend') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Notify full'] ?><br /></label>
+} ?> /><?php echo __('Notify full') ?><br /></label>
 <?php if ($feather_config['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Auto notify full'] ?><br /></label>
+} ?> /><?php echo __('Auto notify full') ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/upload_avatar.php b/style/FeatherBB/view/profile/upload_avatar.php
index 7a74e367..3f74f092 100644
--- a/style/FeatherBB/view/profile/upload_avatar.php
+++ b/style/FeatherBB/view/profile/upload_avatar.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Upload avatar'] ?></span></h2>
+	<h2><span><?php echo __('Upload avatar') ?></span></h2>
 	<div class="box">
 		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Upload avatar legend'] ?></legend>
+					<legend><?php echo __('Upload avatar legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-						<label class="required"><strong><?php echo $lang_profile['File'] ?> <span><?php echo __('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php echo $lang_profile['Avatar desc'].' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.$lang_profile['pixels'].' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.$lang_profile['bytes'].' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
+						<label class="required"><strong><?php echo __('File') ?> <span><?php echo __('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
+						<p><?php echo __('Avatar desc').' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.__('bytes').' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="upload" value="<?php echo $lang_profile['Upload'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="upload" value="<?php echo __('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/view_profile.php b/style/FeatherBB/view/profile/view_profile.php
index d9a5079e..ad1c5959 100644
--- a/style/FeatherBB/view/profile/view_profile.php
+++ b/style/FeatherBB/view/profile/view_profile.php
@@ -19,7 +19,7 @@
 		<div class="fakeform">
 			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['Section personal'] ?></legend>
+				<legend><?php echo __('Section personal') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personal'])."\n" ?>
@@ -30,7 +30,7 @@
 			</div>
 <?php if (!empty($user_info['messaging'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['Section messaging'] ?></legend>
+				<legend><?php echo __('Section messaging') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['messaging'])."\n" ?>
@@ -41,7 +41,7 @@
 			</div>
 <?php endif; if (!empty($user_info['personality'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['Section personality'] ?></legend>
+				<legend><?php echo __('Section personality') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personality'])."\n" ?>
@@ -52,7 +52,7 @@
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['User activity'] ?></legend>
+				<legend><?php echo __('User activity') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['activity'])."\n" ?>
diff --git a/style/FeatherBB/view/register/email.php b/style/FeatherBB/view/register/email.php
index e8c36fe7..9f9b3424 100644
--- a/style/FeatherBB/view/register/email.php
+++ b/style/FeatherBB/view/register/email.php
@@ -15,21 +15,21 @@
 ?>
 
 <div id="emailform" class="blockform">
-	<h2><span><?php echo $lang_misc['Send email to'] ?> <?php echo feather_escape($recipient) ?></span></h2>
+	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($recipient) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Write email'] ?></legend>
+					<legend><?php echo __('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
+						<p><?php echo __('Email disclosure note') ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/register/form.php b/style/FeatherBB/view/register/form.php
index a088cc25..fa2d2457 100644
--- a/style/FeatherBB/view/register/form.php
+++ b/style/FeatherBB/view/register/form.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo $lang_register['Registration errors'] ?></span></h2>
+	<h2><span><?php echo __('Registration errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo $lang_register['Registration errors info'] ?></p>
+			<p><?php echo __('Registration errors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,18 +37,18 @@
 }
 ?>
 <div id="regform" class="blockform">
-	<h2><span><?php echo $lang_register['Register'] ?></span></h2>
+	<h2><span><?php echo __('Register') ?></span></h2>
 	<div class="box">
 		<form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
 		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
 					<h3><?php echo __('Important information') ?></h3>
-					<p><?php echo $lang_register['Desc 1'] ?></p>
-					<p><?php echo $lang_register['Desc 2'] ?></p>
+					<p><?php echo __('Desc 1') ?></p>
+					<p><?php echo __('Desc 2') ?></p>
 				</div>
 				<fieldset>
-					<legend><?php echo $lang_register['Username legend'] ?></legend>
+					<legend><?php echo __('Username legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="username" value="" />
@@ -61,28 +61,28 @@
 			</div>
 <?php if ($feather_config['o_regs_verify'] == '0'): ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_register['Pass legend'] ?></legend>
+					<legend><?php echo __('Pass legend') ?></legend>
 					<div class="infldset">
 						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
     echo feather_escape($feather->request->post('req_password1'));
 } ?>" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_prof_reg['Confirm pass'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
+						<label class="conl required"><strong><?php echo __('Confirm pass') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
     echo feather_escape($feather->request->post('req_password2'));
 } ?>" size="16" /><br /></label>
-						<p class="clearb"><?php echo $lang_register['Pass info'] ?></p>
+						<p class="clearb"><?php echo __('Pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? $lang_prof_reg['Email legend 2'] : $lang_prof_reg['Email legend'] ?></legend>
+					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo $lang_register['Email info'] ?></p>
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo __('Email info') ?></p>
 <?php endif; ?>						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
     echo feather_escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo $lang_register['Confirm email'] ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo __('Confirm email') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
     echo feather_escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
@@ -95,9 +95,9 @@
             ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Localisation legend'] ?></legend>
+					<legend><?php echo __('Localisation legend') ?></legend>
 					<div class="infldset">
-							<label><?php echo $lang_prof_reg['Language'] ?>
+							<label><?php echo __('Language') ?>
 							<br /><select name="language">
 <?php
 
@@ -121,14 +121,14 @@
 ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
+					<legend><?php echo __('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_antispam['Robot info']    ?></p>
-						<label class="required"><strong><?php echo sprintf($lang_antispam['Robot question'], $question[$index_questions]) ?> <span><?php echo __('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
+						<p><?php echo __('Robot info')    ?></p>
+						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php echo __('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="register" value="<?php echo $lang_register['Register'] ?>" /></p>
+			<p class="buttons"><input type="submit" name="register" value="<?php echo __('Register') ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/register/rules.php b/style/FeatherBB/view/register/rules.php
index d86c8c54..3a2fd06c 100644
--- a/style/FeatherBB/view/register/rules.php
+++ b/style/FeatherBB/view/register/rules.php
@@ -15,18 +15,18 @@
 ?>
 
 <div id="rules" class="blockform">
-	<div class="hd"><h2><span><?php echo $lang_register['Forum rules'] ?></span></h2></div>
+	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<form method="get" action="<?php echo get_link('register/') ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_register['Rules legend'] ?></legend>
+					<legend><?php echo __('Rules legend') ?></legend>
 					<div class="infldset">
 						<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="agree" value="<?php echo $lang_register['Agree'] ?>" /> <input type="submit" name="cancel" value="<?php echo $lang_register['Cancel'] ?>" /></p>
+			<p class="buttons"><input type="submit" name="agree" value="<?php echo __('Agree') ?>" /> <input type="submit" name="cancel" value="<?php echo __('Cancel') ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/form.php b/style/FeatherBB/view/search/form.php
index 262bf4d9..bb39c614 100644
--- a/style/FeatherBB/view/search/form.php
+++ b/style/FeatherBB/view/search/form.php
@@ -14,62 +14,62 @@
 ?>
 
 <div id="searchform" class="blockform">
-	<h2><span><?php echo $lang_search['Search'] ?></span></h2>
+	<h2><span><?php echo __('Search') ?></span></h2>
 	<div class="box">
 		<form id="search" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_search['Search criteria legend'] ?></legend>
+					<legend><?php echo __('Search criteria legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="action" value="search" />
-						<label class="conl"><?php echo $lang_search['Keyword search'] ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
-						<label class="conl"><?php echo $lang_search['Author search'] ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
-						<p class="clearb"><?php echo $lang_search['Search info'] ?></p>
+						<label class="conl"><?php echo __('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
+						<label class="conl"><?php echo __('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
+						<p class="clearb"><?php echo __('Search info') ?></p>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_search['Search in legend'] ?></legend>
+					<legend><?php echo __('Search in legend') ?></legend>
 					<div class="infldset">
 					<?php echo $forums ?>
-						<label class="conl"><?php echo $lang_search['Search in']."\n" ?>
+						<label class="conl"><?php echo __('Search in')."\n" ?>
 						<br /><select id="search_in" name="search_in">
-							<option value="0"><?php echo $lang_search['Message and subject'] ?></option>
-							<option value="1"><?php echo $lang_search['Message only'] ?></option>
-							<option value="-1"><?php echo $lang_search['Topic only'] ?></option>
+							<option value="0"><?php echo __('Message and subject') ?></option>
+							<option value="1"><?php echo __('Message only') ?></option>
+							<option value="-1"><?php echo __('Topic only') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearl"><?php echo $lang_search['Search in info'] ?></p>
-<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.$lang_search['Search multiple forums info'].'</p>' : '') ?>
+						<p class="clearl"><?php echo __('Search in info') ?></p>
+<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_search['Search results legend'] ?></legend>
+					<legend><?php echo __('Search results legend') ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo $lang_search['Sort by']."\n" ?>
+						<label class="conl"><?php echo __('Sort by')."\n" ?>
 						<br /><select name="sort_by">
-							<option value="0"><?php echo $lang_search['Sort by post time'] ?></option>
-							<option value="1"><?php echo $lang_search['Sort by author'] ?></option>
-							<option value="2"><?php echo $lang_search['Sort by subject'] ?></option>
-							<option value="3"><?php echo $lang_search['Sort by forum'] ?></option>
+							<option value="0"><?php echo __('Sort by post time') ?></option>
+							<option value="1"><?php echo __('Sort by author') ?></option>
+							<option value="2"><?php echo __('Sort by subject') ?></option>
+							<option value="3"><?php echo __('Sort by forum') ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Sort order']."\n" ?>
+						<label class="conl"><?php echo __('Sort order')."\n" ?>
 						<br /><select name="sort_dir">
-							<option value="DESC"><?php echo $lang_search['Descending'] ?></option>
-							<option value="ASC"><?php echo $lang_search['Ascending'] ?></option>
+							<option value="DESC"><?php echo __('Descending') ?></option>
+							<option value="ASC"><?php echo __('Ascending') ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Show as']."\n" ?>
+						<label class="conl"><?php echo __('Show as')."\n" ?>
 						<br /><select name="show_as">
-							<option value="topics"><?php echo $lang_search['Show as topics'] ?></option>
-							<option value="posts"><?php echo $lang_search['Show as posts'] ?></option>
+							<option value="topics"><?php echo __('Show as topics') ?></option>
+							<option value="posts"><?php echo __('Show as posts') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearb"><?php echo $lang_search['Search results info'] ?></p>
+						<p class="clearb"><?php echo __('Search results info') ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/search/header.php b/style/FeatherBB/view/search/header.php
index 79f9ee84..909a2108 100644
--- a/style/FeatherBB/view/search/header.php
+++ b/style/FeatherBB/view/search/header.php
@@ -31,7 +31,7 @@
 if ($search['show_as'] == 'topics') :
 ?>
 <div id="vf" class="blocktable">
-	<h2><span><?php echo $lang_search['Search results'] ?></span></h2>
+	<h2><span><?php echo __('Search results') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
diff --git a/style/FeatherBB/view/search/posts.php b/style/FeatherBB/view/search/posts.php
index a1247133..872c349e 100644
--- a/style/FeatherBB/view/search/posts.php
+++ b/style/FeatherBB/view/search/posts.php
@@ -21,7 +21,7 @@
     echo ' '.$cur_search['item_status'];
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
-    echo $lang_topic['Re'].' ';
+    echo __('Re').' ';
 } ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
@@ -29,7 +29,7 @@
 			<div class="postleft">
 				<dl>
 					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php echo $lang_topic['Replies'].' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
+<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php echo __('Replies').' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
 <?php endif; ?>
 					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
 				</dl>
@@ -46,8 +46,8 @@
 		<div class="postfoot clearb">
 			<div class="postfootright">
 				<ul>
-					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo $lang_search['Go to topic'] ?></a></span></li>
-					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $lang_search['Go to post'] ?></a></span></li>
+					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo __('Go to topic') ?></a></span></li>
+					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo __('Go to post') ?></a></span></li>
 				</ul>
 			</div>
 		</div>
diff --git a/style/FeatherBB/view/userlist.php b/style/FeatherBB/view/userlist.php
index 33594426..0bbedae6 100644
--- a/style/FeatherBB/view/userlist.php
+++ b/style/FeatherBB/view/userlist.php
@@ -14,23 +14,23 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_search['User search'] ?></span></h2>
+	<h2><span><?php echo __('User search') ?></span></h2>
 	<div class="box">
 		<form id="userlist" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_ul['User find legend'] ?></legend>
+					<legend><?php echo __('User find legend') ?></legend>
 					<div class="infldset">
 <?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo __('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
-<?php endif; ?>						<label class="conl"><?php echo $lang_ul['User group']."\n" ?>
+<?php endif; ?>						<label class="conl"><?php echo __('User group')."\n" ?>
 						<br /><select name="show_group">
 							<option value="-1"<?php if ($show_group == -1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_ul['All users'] ?></option>
+} ?>><?php echo __('All users') ?></option>
 <?php echo $dropdown_menu ?>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Sort by']."\n" ?>
+						<label class="conl"><?php echo __('Sort by')."\n" ?>
 						<br /><select name="sort_by">
 							<option value="username"<?php if ($sort_by == 'username') {
     echo ' selected="selected"';
@@ -40,20 +40,20 @@
 } ?>><?php echo __('Registered') ?></option>
 <?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_ul['No of posts'] ?></option>
+} ?>><?php echo __('No of posts') ?></option>
 <?php endif; ?>						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Sort order']."\n" ?>
+						<label class="conl"><?php echo __('Sort order')."\n" ?>
 						<br /><select name="sort_dir">
 							<option value="ASC"<?php if ($sort_dir == 'ASC') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_search['Ascending'] ?></option>
+} ?>><?php echo __('Ascending') ?></option>
 							<option value="DESC"<?php if ($sort_dir == 'DESC') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_search['Descending'] ?></option>
+} ?>><?php echo __('Descending') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? $lang_ul['User search info'].' ' : '').$lang_ul['User sort info']; ?></p>
+						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? __('User search info').' ' : '').__('User sort info'); ?></p>
 					</div>
 				</fieldset>
 			</div>
@@ -98,7 +98,7 @@
 
             }
             if (empty($userlist_data)) {
-                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.$lang_search['No hits'].'</td></tr>'."\n";
+                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.__('No hits').'</td></tr>'."\n";
             }
             ?>
 			</tbody>
diff --git a/style/FeatherBB/view/viewforum.php b/style/FeatherBB/view/viewforum.php
index 7f4a55b7..b9d04a1d 100644
--- a/style/FeatherBB/view/viewforum.php
+++ b/style/FeatherBB/view/viewforum.php
@@ -36,7 +36,7 @@
 				<tr>
 					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
 					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
 <?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
 			</thead>
@@ -70,7 +70,7 @@
 							<div class="icon inone"><div class="nosize"><!-- --></div></div>
 							<div class="tclcon">
 								<div>
-									<strong><?php echo $lang_forum['Empty forum'] ?></strong>
+									<strong><?php echo __('Empty forum') ?></strong>
 								</div>
 							</div>
 						</td>
diff --git a/style/FeatherBB/view/viewtopic.php b/style/FeatherBB/view/viewtopic.php
index 733bb59b..16535ff1 100644
--- a/style/FeatherBB/view/viewtopic.php
+++ b/style/FeatherBB/view/viewtopic.php
@@ -64,13 +64,13 @@
 				</div>
 				<div class="postright">
 					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
-    echo $lang_topic['Re'].' ';
+    echo __('Re').' ';
 }
     ?><?php echo feather_escape($cur_topic['subject']) ?></h3>
 					<div class="postmsg">
 						<?php echo $post['message']."\n" ?>
 <?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.$lang_topic['Last edit'].' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 					</div>
@@ -124,7 +124,7 @@
 
     ?>
 <div id="quickpost" class="blockform">
-	<h2><span><?php echo $lang_topic['Quick post'] ?></span></h2>
+	<h2><span><?php echo __('Quick post') ?></span></h2>
 	<div class="box">
 		<form id="quickpostform" method="post" action="<?php echo get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -142,7 +142,7 @@
         $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
         $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
         ?>
-						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
 <?php
@@ -154,6 +154,7 @@
 
     ?>
 <!-- Init BBcode editor toolbar -->
+<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
@@ -178,13 +179,13 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
+					<legend><?php echo __('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_antispam['Robot info']    ?></p>
+						<p><?php echo __('Robot info')    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
     $qencoded = md5($question[$index_questions]);
-    echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);
+    echo sprintf(__('Robot question'), $question[$index_questions]);
     ?>
 							 <span><?php echo __('Required') ?></span></strong>
 							 <br />
@@ -195,7 +196,7 @@
 			</div>
 			<?php endif;
     ?>
-			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo __('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_topic['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
+			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo __('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
 		</form>
 	</div>
 </div>
diff --git a/view/delete.php b/view/delete.php
index fc4f5f0a..65f2440b 100644
--- a/view/delete.php
+++ b/view/delete.php
@@ -19,23 +19,23 @@
 			<li><a href="index.php"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_delete['Delete post'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Delete post') ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_delete['Delete post'] ?></span></h2>
+	<h2><span><?php echo __('Delete post') ?></span></h2>
 	<div class="box">
 		<form method="post" action="<?php echo get_link('delete/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? $lang_delete['Topic by'] : $lang_delete['Reply by'], '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
-					<p><?php echo($is_topic_post) ? '<strong>'.$lang_delete['Topic warning'].'</strong>' : '<strong>'.$lang_delete['Warning'].'</strong>' ?><br /><?php echo $lang_delete['Delete info'] ?></p>
+					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
+					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php echo __('Delete info') ?></p>
 				</div>
 			</div>
-			<p class="buttons"><input type="submit" name="delete" value="<?php echo $lang_delete['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
diff --git a/view/edit.php b/view/edit.php
index d4199e10..8f2fe702 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -6,10 +6,10 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
-    exit;
+	exit;
 }
 
 $cur_index = 1;
@@ -22,7 +22,7 @@
 			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_post['Edit post'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Edit post') ?></strong></li>
 		</ul>
 	</div>
 </div>
@@ -31,89 +31,90 @@
 
 // If there are errors, we display them
 if (!empty($errors)) :
-?>
-<div id="posterror" class="block">
-	<h2><span><?php echo $lang_post['Post errors'] ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php echo $lang_post['Post errors info'] ?></p>
-			<ul class="error-list">
-<?php
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-?>
-			</ul>
+	?>
+	<div id="posterror" class="block">
+		<h2><span><?php echo __('Post errors') ?></span></h2>
+		<div class="box">
+			<div class="inbox error-info">
+				<p><?php echo __('Post errors info') ?></p>
+				<ul class="error-list">
+					<?php
+					foreach ($errors as $cur_error) {
+						echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+					}
+					?>
+				</ul>
+			</div>
 		</div>
 	</div>
-</div>
-<?php
+	<?php
 elseif ($feather->request->post('preview')):
-?>
-<div id="postpreview" class="blockpost">
-	<h2><span><?php echo $lang_post['Post preview'] ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postright">
-					<div class="postmsg">
-						<?php echo $preview_message."\n" ?>
+	?>
+	<div id="postpreview" class="blockpost">
+		<h2><span><?php echo __('Post preview') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<div class="postbody">
+					<div class="postright">
+						<div class="postmsg">
+							<?php echo $preview_message."\n" ?>
+						</div>
 					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-</div>
-<?php
+	<?php
 endif;
 ?>
 <!-- Init BBcode editor toolbar -->
+<?php $lang_bbeditor = ''; ?>
 <script>
-    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
-        langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
+	var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
+		langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
 </script>
 <script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
 <div id="editform" class="blockform">
-	<h2><span><?php echo $lang_post['Edit post'] ?></span></h2>
+	<h2><span><?php echo __('Edit post') ?></span></h2>
 	<div class="box">
 		<form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_post['Edit post legend'] ?></legend>
+					<legend><?php echo __('Edit post legend') ?></legend>
 					<input type="hidden" name="form_sent" value="1" />
 					<div class="infldset txtarea">
-<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
-						<script>postEditorToolbar('req_message');</script>
-                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
+						<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br />
+							<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
+						<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
+							<script>postEditorToolbar('req_message');</script>
+							<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="help.php#img" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="help.php#smilies" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
 			</div>
-<?php
-if (!empty($checkboxes)):
-?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php echo __('Options') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
+			<?php
+			if (!empty($checkboxes)):
+				?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php echo __('Options') ?></legend>
+						<div class="infldset">
+							<div class="rbox">
+								<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
+							</div>
 						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php
-endif;
-?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+					</fieldset>
+				</div>
+				<?php
+			endif;
+			?>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/footer.php b/view/footer.php
index 98104ea5..6d9b7934 100644
--- a/view/footer.php
+++ b/view/footer.php
@@ -20,7 +20,7 @@
 
     if ($footer_style == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.$lang_forum['Mod controls'].'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($footer_style == 'viewtopic') {
@@ -34,7 +34,7 @@
         
         
         echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.$lang_topic['Mod controls'].'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         // TODO: all
         //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
         echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
diff --git a/view/help.php b/view/help.php
index 65353802..a7f9300d 100644
--- a/view/help.php
+++ b/view/help.php
@@ -14,113 +14,113 @@
 
 ?>
 
-<h2><span><?php echo $lang_help['BBCode'] ?></span></h2>
+<h2><span><?php echo __('BBCode') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="bbcode"></a><?php echo $lang_help['BBCode info 1'] ?></p>
-		<p><?php echo $lang_help['BBCode info 2'] ?></p>
+		<p><a name="bbcode"></a><?php echo __('BBCode info 1') ?></p>
+		<p><?php echo __('BBCode info 2') ?></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Text style'] ?></span></h2>
+<h2><span><?php echo __('Text style') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Text style info'] ?></p>
-		<p><code>[b]<?php echo $lang_help['Bold text'] ?>[/b]</code> <?php echo $lang_help['produces'] ?> <samp><strong><?php echo $lang_help['Bold text'] ?></strong></samp></p>
-		<p><code>[u]<?php echo $lang_help['Underlined text'] ?>[/u]</code> <?php echo $lang_help['produces'] ?> <samp><span class="bbu"><?php echo $lang_help['Underlined text'] ?></span></samp></p>
-		<p><code>[i]<?php echo $lang_help['Italic text'] ?>[/i]</code> <?php echo $lang_help['produces'] ?> <samp><em><?php echo $lang_help['Italic text'] ?></em></samp></p>
-		<p><code>[s]<?php echo $lang_help['Strike-through text'] ?>[/s]</code> <?php echo $lang_help['produces'] ?> <samp><span class="bbs"><?php echo $lang_help['Strike-through text'] ?></span></samp></p>
-		<p><code>[del]<?php echo $lang_help['Deleted text'] ?>[/del]</code> <?php echo $lang_help['produces'] ?> <samp><del><?php echo $lang_help['Deleted text'] ?></del></samp></p>
-		<p><code>[ins]<?php echo $lang_help['Inserted text'] ?>[/ins]</code> <?php echo $lang_help['produces'] ?> <samp><ins><?php echo $lang_help['Inserted text'] ?></ins></samp></p>
-		<p><code>[em]<?php echo $lang_help['Emphasised text'] ?>[/em]</code> <?php echo $lang_help['produces'] ?> <samp><em><?php echo $lang_help['Emphasised text'] ?></em></samp></p>
-		<p><code>[color=#FF0000]<?php echo $lang_help['Red text'] ?>[/color]</code> <?php echo $lang_help['produces'] ?> <samp><span style="color: #ff0000"><?php echo $lang_help['Red text'] ?></span></samp></p>
-		<p><code>[color=blue]<?php echo $lang_help['Blue text'] ?>[/color]</code> <?php echo $lang_help['produces'] ?> <samp><span style="color: blue"><?php echo $lang_help['Blue text'] ?></span></samp></p>
-		<p><code>[h]<?php echo $lang_help['Heading text'] ?>[/h]</code> <?php echo $lang_help['produces'] ?></p> <div class="postmsg"><h5><?php echo $lang_help['Heading text'] ?></h5></div>
+		<p><?php echo __('Text style info') ?></p>
+		<p><code>[b]<?php echo __('Bold text') ?>[/b]</code> <?php echo __('produces') ?> <samp><strong><?php echo __('Bold text') ?></strong></samp></p>
+		<p><code>[u]<?php echo __('Underlined text') ?>[/u]</code> <?php echo __('produces') ?> <samp><span class="bbu"><?php echo __('Underlined text') ?></span></samp></p>
+		<p><code>[i]<?php echo __('Italic text') ?>[/i]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Italic text') ?></em></samp></p>
+		<p><code>[s]<?php echo __('Strike-through text') ?>[/s]</code> <?php echo __('produces') ?> <samp><span class="bbs"><?php echo __('Strike-through text') ?></span></samp></p>
+		<p><code>[del]<?php echo __('Deleted text') ?>[/del]</code> <?php echo __('produces') ?> <samp><del><?php echo __('Deleted text') ?></del></samp></p>
+		<p><code>[ins]<?php echo __('Inserted text') ?>[/ins]</code> <?php echo __('produces') ?> <samp><ins><?php echo __('Inserted text') ?></ins></samp></p>
+		<p><code>[em]<?php echo __('Emphasised text') ?>[/em]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Emphasised text') ?></em></samp></p>
+		<p><code>[color=#FF0000]<?php echo __('Red text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: #ff0000"><?php echo __('Red text') ?></span></samp></p>
+		<p><code>[color=blue]<?php echo __('Blue text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: blue"><?php echo __('Blue text') ?></span></samp></p>
+		<p><code>[h]<?php echo __('Heading text') ?>[/h]</code> <?php echo __('produces') ?></p> <div class="postmsg"><h5><?php echo __('Heading text') ?></h5></div>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Links and images'] ?></span></h2>
+<h2><span><?php echo __('Links and images') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Links info'] ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php echo $lang_help['This help page'] ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('/help') ?>"><?php echo $lang_help['This help page'] ?></a></samp></p>
-		<p><code>[email]myname@example.com[/email]</code> <?php echo $lang_help['produces'] ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
-		<p><code>[email=myname@example.com]<?php echo $lang_help['My email address'] ?>[/email]</code> <?php echo $lang_help['produces'] ?> <samp><a href="mailto:myname@example.com"><?php echo $lang_help['My email address'] ?></a></samp></p>
-		<p><code>[topic=1]<?php echo $lang_help['Test topic'] ?>[/topic]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo $lang_help['Test topic'] ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php echo $lang_help['Test post'] ?>[/post]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo $lang_help['Test post'] ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php echo $lang_help['Test forum'] ?>[/forum]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo $lang_help['Test forum'] ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php echo $lang_help['Test user'] ?>[/user]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo $lang_help['Test user'] ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
+		<p><?php echo __('Links info') ?></p>
+		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
+		<p><code>[url=/help/]<?php echo __('This help page') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php echo __('This help page') ?></a></samp></p>
+		<p><code>[email]myname@example.com[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
+		<p><code>[email=myname@example.com]<?php echo __('My email address') ?>[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com"><?php echo __('My email address') ?></a></samp></p>
+		<p><code>[topic=1]<?php echo __('Test topic') ?>[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test topic') ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php echo __('Test post') ?>[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo __('Test post') ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php echo __('Test forum') ?>[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test forum') ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php echo __('Test user') ?>[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo __('Test user') ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
 	</div>
 	<div class="inbox">
-		<p><a name="img"></a><?php echo $lang_help['Images info'] ?></p>
-		<p><code>[img=<?php echo $lang_help['FluxBB bbcode test'] ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php echo $lang_help['produces'] ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php echo $lang_help['FluxBB bbcode test'] ?>" /></samp></p>
+		<p><a name="img"></a><?php echo __('Images info') ?></p>
+		<p><code>[img=<?php echo __('FluxBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php echo __('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php echo __('FluxBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Quotes'] ?></span></h2>
+<h2><span><?php echo __('Quotes') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Quotes info'] ?></p>
-		<p><code>[quote=James]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
-		<p><?php echo $lang_help['produces quote box'] ?></p>
+		<p><?php echo __('Quotes info') ?></p>
+		<p><code>[quote=James]<?php echo __('Quote text') ?>[/quote]</code></p>
+		<p><?php echo __('produces quote box') ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><cite>James <?php echo __('wrote') ?></cite><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
+			<div class="quotebox"><cite>James <?php echo __('wrote') ?></cite><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo $lang_help['Quotes info 2'] ?></p>
-		<p><code>[quote]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
-		<p><?php echo $lang_help['produces quote box'] ?></p>
+		<p><?php echo __('Quotes info 2') ?></p>
+		<p><code>[quote]<?php echo __('Quote text') ?>[/quote]</code></p>
+		<p><?php echo __('produces quote box') ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
+			<div class="quotebox"><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo $lang_help['quote note'] ?></p>
+		<p><?php echo __('quote note') ?></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Code'] ?></span></h2>
+<h2><span><?php echo __('Code') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Code info'] ?></p>
-		<p><code>[code]<?php echo $lang_help['Code text'] ?>[/code]</code></p>
-		<p><?php echo $lang_help['produces code box'] ?></p>
+		<p><?php echo __('Code info') ?></p>
+		<p><code>[code]<?php echo __('Code text') ?>[/code]</code></p>
+		<p><?php echo __('produces code box') ?></p>
 		<div class="postmsg">
-			<div class="codebox"><pre><code><?php echo $lang_help['Code text'] ?></code></pre></div>
+			<div class="codebox"><pre><code><?php echo __('Code text') ?></code></pre></div>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Lists'] ?></span></h2>
+<h2><span><?php echo __('Lists') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="lists"></a><?php echo $lang_help['List info'] ?></p>
-		<p><code>[list][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
-		<br /><span><?php echo $lang_help['produces list'] ?></span></p>
+		<p><a name="lists"></a><?php echo __('List info') ?></p>
+		<p><code>[list][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php echo __('produces list') ?></span></p>
 		<div class="postmsg">
-			<ul><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ul>
+			<ul><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ul>
 		</div>
-		<p><code>[list=1][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
-		<br /><span><?php echo $lang_help['produces decimal list'] ?></span></p>
+		<p><code>[list=1][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php echo __('produces decimal list') ?></span></p>
 		<div class="postmsg">
-			<ol class="decimal"><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ol>
+			<ol class="decimal"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
 		</div>
-		<p><code>[list=a][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
-		<br /><span><?php echo $lang_help['produces alpha list'] ?></span></p>
+		<p><code>[list=a][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php echo __('produces alpha list') ?></span></p>
 		<div class="postmsg">
-			<ol class="alpha"><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ol>
+			<ol class="alpha"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Nested tags'] ?></span></h2>
+<h2><span><?php echo __('Nested tags') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Nested tags info'] ?></p>
-		<p><code>[b][u]<?php echo $lang_help['Bold, underlined text'] ?>[/u][/b]</code> <?php echo $lang_help['produces'] ?> <samp><strong><span class="bbu"><?php echo $lang_help['Bold, underlined text'] ?></span></strong></samp></p>
+		<p><?php echo __('Nested tags info') ?></p>
+		<p><code>[b][u]<?php echo __('Bold, underlined text') ?>[/u][/b]</code> <?php echo __('produces') ?> <samp><strong><span class="bbu"><?php echo __('Bold, underlined text') ?></span></strong></samp></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Smilies'] ?></span></h2>
+<h2><span><?php echo __('Smilies') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="smilies"></a><?php echo $lang_help['Smilies info'] ?></p>
+		<p><a name="smilies"></a><?php echo __('Smilies info') ?></p>
 <?php
 
 // Display the smiley set
@@ -133,7 +133,7 @@
 }
 
 foreach ($smiley_groups as $smiley_img => $smiley_texts) {
-    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .$lang_help['produces']. '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
+    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
 }
 
 ?>
diff --git a/view/index.php b/view/index.php
index 73d0ec3b..d9d5ca64 100644
--- a/view/index.php
+++ b/view/index.php
@@ -13,7 +13,7 @@
 }
 
 if (empty($index_data)): ?>
-    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php echo $lang_index['Empty board'] ?></p></div></div></div>
+    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php echo __('Empty board') ?></p></div></div></div>
 <?php endif;
 foreach ($index_data as $forum) {
     if ($forum->cid != $cur_cat) :
@@ -34,7 +34,7 @@
 			<thead>
 				<tr>
 					<th class="tcl" scope="col"><?php echo __('Forum') ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_index['Topics'] ?></th>
+					<th class="tc2" scope="col"><?php echo __('Topics') ?></th>
 					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
 					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
@@ -80,27 +80,27 @@
 endif;
 ?>
 <div id="brdstats" class="block">
-	<h2><span><?php echo $lang_index['Board info'] ?></span></h2>
+	<h2><span><?php echo __('Board info') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<dl class="conr">
-				<dt><strong><?php echo $lang_index['Board stats'] ?></strong></dt>
-				<dd><span><?php printf($lang_index['No of users'], '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf($lang_index['No of topics'], '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
-				<dd><span><?php printf($lang_index['No of posts'], '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
+				<dt><strong><?php echo __('Board stats') ?></strong></dt>
+				<dd><span><?php printf(__('No of users'), '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of topics'), '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of posts'), '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
 			</dl>
 			<dl class="conl">
-				<dt><strong><?php echo $lang_index['User info'] ?></strong></dt>
-				<dd><span><?php printf($lang_index['Newest user'], $stats['newest_user']) ?></span></dd>
+				<dt><strong><?php echo __('User info') ?></strong></dt>
+				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
 				<?php if ($feather_config['o_users_online'] == 1) : ?>
-				<dd><span><?php printf($lang_index['Users online'], '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf($lang_index['Guests online'], '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Guests online'), '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
 				<?php endif; ?>
 			</dl>
 			<?php
             if ($feather_config['o_users_online'] == 1) :
                 if ($online['num_users'] > 0) {
-                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.$lang_index['Online'].' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
+                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
                 } else {
                     echo "\t\t\t".'<div class="clearer"></div>'."\n";
                 }
diff --git a/view/login/form.php b/view/login/form.php
index 221f02db..fb8f2404 100644
--- a/view/login/form.php
+++ b/view/login/form.php
@@ -20,7 +20,7 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_login['Login legend'] ?></legend>
+					<legend><?php echo __('Login legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
@@ -28,11 +28,11 @@
 						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
 
 						<div class="rbox clearb">
-							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo $lang_login['Remember me'] ?><br /></label>
+							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo __('Remember me') ?><br /></label>
 						</div>
 
-						<p class="clearb"><?php echo $lang_login['Login info'] ?></p>
-						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php echo $lang_login['Not registered'] ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php echo $lang_login['Forgotten pass'] ?></a></span></p>
+						<p class="clearb"><?php echo __('Login info') ?></p>
+						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php echo __('Not registered') ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php echo __('Forgotten pass') ?></a></span></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/login/password_forgotten.php b/view/login/password_forgotten.php
index 7387bc54..979b915c 100644
--- a/view/login/password_forgotten.php
+++ b/view/login/password_forgotten.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo $lang_login['New password errors'] ?></span></h2>
+	<h2><span><?php echo __('New password errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo $lang_login['New passworderrors info'] ?></p>
+			<p><?php echo __('New passworderrors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,17 +37,17 @@
 }
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_login['Request pass'] ?></span></h2>
+	<h2><span><?php echo __('Request pass') ?></span></h2>
 	<div class="box">
 		<form id="request_pass" method="post" action="<?php echo get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_login['Request pass legend'] ?></legend>
+					<legend><?php echo __('Request pass legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
-						<p><?php echo $lang_login['Request pass info'] ?></p>
+						<p><?php echo __('Request pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/misc/email.php b/view/misc/email.php
index 0cd4f3c8..7004040d 100644
--- a/view/misc/email.php
+++ b/view/misc/email.php
@@ -14,20 +14,20 @@
 
 ?>
 <div id="emailform" class="blockform">
-	<h2><span><?php echo $lang_misc['Send email to'] ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
+	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="<?php echo get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Write email'] ?></legend>
+					<legend><?php echo __('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
+						<p><?php echo __('Email disclosure note') ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/misc/report.php b/view/misc/report.php
index adbb619f..121feac2 100644
--- a/view/misc/report.php
+++ b/view/misc/report.php
@@ -19,22 +19,22 @@
 			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Report post'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Report post') ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div id="reportform" class="blockform">
-	<h2><span><?php echo $lang_misc['Report post'] ?></span></h2>
+	<h2><span><?php echo __('Report post') ?></span></h2>
 	<div class="box">
 		<form id="report" method="post" action="<?php echo get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Reason desc'] ?></legend>
+					<legend><?php echo __('Reason desc') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_misc['Reason'] ?> <span><?php echo __('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
+						<label class="required"><strong><?php echo __('Reason') ?> <span><?php echo __('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/misc/rules.php b/view/misc/rules.php
index 00cff256..d32a805e 100644
--- a/view/misc/rules.php
+++ b/view/misc/rules.php
@@ -14,7 +14,7 @@
 
 ?>
 <div id="rules" class="block">
-	<div class="hd"><h2><span><?php echo $lang_register['Forum rules'] ?></span></h2></div>
+	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<div id="rules-block" class="inbox">
 			<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
diff --git a/view/moderate/delete_posts.php b/view/moderate/delete_posts.php
index 01269ca7..4b95a5f1 100644
--- a/view/moderate/delete_posts.php
+++ b/view/moderate/delete_posts.php
@@ -14,20 +14,20 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Delete posts'] ?></span></h2>
+	<h2><span><?php echo __('Delete posts') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm delete legend'] ?></legend>
+					<legend><?php echo __('Confirm delete legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<p><?php echo $lang_misc['Delete posts comply'] ?></p>
+						<p><?php echo __('Delete posts comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/delete_topics.php b/view/moderate/delete_topics.php
index 9b04ddaf..e414f734 100644
--- a/view/moderate/delete_topics.php
+++ b/view/moderate/delete_topics.php
@@ -15,20 +15,20 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Delete topics'] ?></span></h2>
+	<h2><span><?php echo __('Delete topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm delete legend'] ?></legend>
+					<legend><?php echo __('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_misc['Delete topics comply'] ?></p>
+						<p><?php echo __('Delete topics comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/merge_topics.php b/view/moderate/merge_topics.php
index 0e328f1d..b55f586b 100644
--- a/view/moderate/merge_topics.php
+++ b/view/moderate/merge_topics.php
@@ -15,22 +15,22 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Merge topics'] ?></span></h2>
+	<h2><span><?php echo __('Merge topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm merge legend'] ?></legend>
+					<legend><?php echo __('Confirm merge legend') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1" /><?php echo $lang_misc['Leave redirect'] ?><br /></label>
+							<label><input type="checkbox" name="with_redirect" value="1" /><?php echo __('Leave redirect') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo $lang_misc['Merge'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo __('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
index 114df22e..bf893ce4 100644
--- a/view/moderate/moderator_forum.php
+++ b/view/moderate/moderator_forum.php
@@ -19,7 +19,7 @@
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -40,9 +40,9 @@
 				<tr>
 					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
 					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
 <?php endif; ?>					<th class="tcr"><?php echo __('Last post') ?></th>
-					<th class="tcmod" scope="col"><?php echo $lang_misc['Select'] ?></th>
+					<th class="tcmod" scope="col"><?php echo __('Select') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -74,7 +74,7 @@
             if (empty($topic_data)):
                 $colspan = ($feather_config['o_topic_views'] == '1') ? 5 : 4;
                 $button_status = ' disabled="disabled"';
-                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.$lang_forum['Empty forum'].'</td></tr>'."\n";
+                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
             endif;
             ?>
 			</tbody>
@@ -87,13 +87,13 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php echo $lang_misc['Move'] ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php echo $lang_misc['Delete'] ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php echo $lang_misc['Merge'] ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php echo $lang_misc['Open'] ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php echo $lang_misc['Close'] ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php echo __('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php echo __('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php echo __('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php echo __('Close') ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/moderate/move_topics.php b/view/moderate/move_topics.php
index b792cf68..389f1f05 100644
--- a/view/moderate/move_topics.php
+++ b/view/moderate/move_topics.php
@@ -15,16 +15,16 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo($action == 'single') ? $lang_misc['Move topic'] : $lang_misc['Move topics'] ?></span></h2>
+	<h2><span><?php echo($action == 'single') ? __('Move topic') : __('Move topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 			<input type="hidden" name="topics" value="<?php echo $topics ?>" />
 				<fieldset>
-					<legend><?php echo $lang_misc['Move legend'] ?></legend>
+					<legend><?php echo __('Move legend') ?></legend>
 					<div class="infldset">
-						<label><?php echo $lang_misc['Move to'] ?>
+						<label><?php echo __('Move to') ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
@@ -33,12 +33,12 @@
 						<div class="rbox">
 							<label><input type="checkbox" name="with_redirect" value="1"<?php if ($action == 'single') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_misc['Leave redirect'] ?><br /></label>
+} ?> /><?php echo __('Leave redirect') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo $lang_misc['Move'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo __('Move') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/posts_view.php b/view/moderate/posts_view.php
index 60477a50..f957ce8f 100644
--- a/view/moderate/posts_view.php
+++ b/view/moderate/posts_view.php
@@ -19,7 +19,7 @@
 			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -57,7 +57,7 @@
 						<div class="postmsg">
 							<?php echo $post['message']."\n" ?>
 	<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.$lang_topic['Last edit'].' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 						</div>
@@ -66,7 +66,7 @@
 			</div>
 			<div class="inbox">
 				<div class="postfoot clearb">
-					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.$lang_misc['Select'].'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.$lang_misc['Cannot select first'].'</p>' ?></div>
+					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.__('Select').'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.__('Cannot select first').'</p>' ?></div>
 				</div>
 			</div>
 		</div>
@@ -80,14 +80,14 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php echo $lang_misc['Split'] ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php echo $lang_misc['Delete'] ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php echo __('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/moderate/split_posts.php b/view/moderate/split_posts.php
index 244c7fb8..ac012ff3 100644
--- a/view/moderate/split_posts.php
+++ b/view/moderate/split_posts.php
@@ -14,27 +14,27 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Split posts'] ?></span></h2>
+	<h2><span><?php echo __('Split posts') ?></span></h2>
 	<div class="box">
 		<form id="subject" method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm split legend'] ?></legend>
+					<legend><?php echo __('Confirm split legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<label class="required"><strong><?php echo $lang_misc['New subject'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
-						<label><?php echo $lang_misc['Move to'] ?>
+						<label class="required"><strong><?php echo __('New subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
+						<label><?php echo __('Move to') ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
 						</select>
 						<br /></label>
-						<p><?php echo $lang_misc['Split posts comply'] ?></p>
+						<p><?php echo __('Split posts comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo $lang_misc['Split'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo __('Split') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/post.php b/view/post.php
index 603d4cac..0c341fd0 100644
--- a/view/post.php
+++ b/view/post.php
@@ -33,10 +33,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo $lang_post['Post errors'] ?></span></h2>
+	<h2><span><?php echo __('Post errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo $lang_post['Post errors info'] ?></p>
+			<p><?php echo __('Post errors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -57,7 +57,7 @@
 
     ?>
 <div id="postpreview" class="blockpost">
-	<h2><span><?php echo $lang_post['Post preview'] ?></span></h2>
+	<h2><span><?php echo __('Post preview') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -80,6 +80,7 @@
 
 ?>
 <!-- Init BBcode editor toolbar -->
+<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
@@ -101,7 +102,7 @@
     $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
     $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
-						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
+						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
     echo feather_escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
@@ -150,13 +151,13 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
+					<legend><?php echo __('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_antispam['Robot info']    ?></p>
+						<p><?php echo __('Robot info')    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
                              $qencoded = md5($question[$index_questions]);
-                             echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);?>
+                             echo sprintf(__('Robot question'), $question[$index_questions]);?>
 							 <span><?php echo __('Required') ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
@@ -165,7 +166,7 @@
 				</fieldset>
 			</div>
 			<?php endif; ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
@@ -175,7 +176,7 @@
 if ($tid && $feather_config['o_topic_review'] != '0') :
 ?>
 <div id="postreview">
-	<h2><span><?php echo $lang_post['Topic review'] ?></span></h2>
+	<h2><span><?php echo __('Topic review') ?></span></h2>
 
 	<?php
     // Set background switching on
diff --git a/view/profile/change_mail.php b/view/profile/change_mail.php
index f425e499..de0f8d3b 100644
--- a/view/profile/change_mail.php
+++ b/view/profile/change_mail.php
@@ -14,18 +14,18 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Change email'] ?></span></h2>
+	<h2><span><?php echo __('Change email') ?></span></h2>
 	<div class="box">
 		<form id="change_email" method="post" action="<?php echo get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Email legend'] ?></legend>
+					<legend><?php echo __('Email legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_profile['New email'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
+						<label class="required"><strong><?php echo __('New email') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
 						<label class="required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
-						<p><?php echo $lang_profile['Email instructions'] ?></p>
+						<p><?php echo __('Email instructions') ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/profile/change_pass.php b/view/profile/change_pass.php
index f5344967..0f0ab452 100644
--- a/view/profile/change_pass.php
+++ b/view/profile/change_pass.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Change pass'] ?></span></h2>
+	<h2><span><?php echo __('Change pass') ?></span></h2>
 	<div class="box">
 		<form id="change_pass" method="post" action="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
 				<fieldset>
-					<legend><?php echo $lang_profile['Change pass legend'] ?></legend>
+					<legend><?php echo __('Change pass legend') ?></legend>
 					<div class="infldset">
-<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo $lang_profile['Old pass'] ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo __('Old pass') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_old_password" size="16" /><br /></label>
-<?php endif; ?>						<label class="conl required"><strong><?php echo $lang_profile['New pass'] ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php endif; ?>						<label class="conl required"><strong><?php echo __('New pass') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password1" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_profile['Confirm new pass'] ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="conl required"><strong><?php echo __('Confirm new pass') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password2" size="16" /><br /></label>
-						<p class="clearb"><?php echo $lang_profile['Pass info'] ?></p>
+						<p class="clearb"><?php echo __('Pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/profile/delete_user.php b/view/profile/delete_user.php
index 0f0ebc14..d5d5bde2 100644
--- a/view/profile/delete_user.php
+++ b/view/profile/delete_user.php
@@ -14,23 +14,23 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Confirm delete user'] ?></span></h2>
+	<h2><span><?php echo __('Confirm delete user') ?></span></h2>
 	<div class="box">
 		<form id="confirm_del_user" method="post" action="<?php echo get_link('user/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Confirm delete legend'] ?></legend>
+					<legend><?php echo __('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_profile['Confirmation info'].' <strong>'.feather_escape($username).'</strong>.' ?></p>
+						<p><?php echo __('Confirmation info').' <strong>'.feather_escape($username).'</strong>.' ?></p>
 						<div class="rbox">
-							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo $lang_profile['Delete posts'] ?><br /></label>
+							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo __('Delete posts') ?><br /></label>
 						</div>
-						<p class="warntext"><strong><?php echo $lang_profile['Delete warning'] ?></strong></p>
+						<p class="warntext"><strong><?php echo __('Delete warning') ?></strong></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo $lang_profile['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/menu.php b/view/profile/menu.php
index bcf803e1..e78d2c30 100644
--- a/view/profile/menu.php
+++ b/view/profile/menu.php
@@ -15,39 +15,39 @@
 ?>
 <div id="profile" class="block2col">
 	<div class="blockmenu">
-		<h2><span><?php echo $lang_profile['Profile menu'] ?></span></h2>
+		<h2><span><?php echo __('Profile menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'essentials') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php echo $lang_profile['Section essentials'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php echo __('Section essentials') ?></a></li>
 					<li<?php if ($page == 'personal') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php echo $lang_profile['Section personal'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php echo __('Section personal') ?></a></li>
 					<li<?php if ($page == 'messaging') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php echo $lang_profile['Section messaging'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php echo __('Section messaging') ?></a></li>
 <?php if ($feather_config['o_avatars'] == '1' || $feather_config['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php echo $lang_profile['Section personality'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php echo __('Section personality') ?></a></li>
 <?php endif;
     ?>					<li<?php if ($page == 'display') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php echo $lang_profile['Section display'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php echo __('Section display') ?></a></li>
 					<li<?php if ($page == 'privacy') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php echo $lang_profile['Section privacy'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php echo __('Section privacy') ?></a></li>
 <?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php echo $lang_profile['Section admin'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php echo __('Section admin') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
diff --git a/view/profile/section_admin.php b/view/profile/section_admin.php
index 16b4f80a..52a0ad54 100644
--- a/view/profile/section_admin.php
+++ b/view/profile/section_admin.php
@@ -14,7 +14,7 @@
 
 ?>
 	<div class="blockform">
-		<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section admin'] ?></span></h2>
+		<h2><span><?php echo feather_escape($user['username']).' - '.__('Section admin') ?></span></h2>
 		<div class="box">
 			<form id="profile7" method="post" action="<?php echo get_link('user/'.$id.'/section/admin/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -25,9 +25,9 @@
 
         if ($feather->user->g_moderator == '1') {
             ?>
-						<legend><?php echo $lang_profile['Delete ban legend'] ?></legend>
+						<legend><?php echo __('Delete ban legend') ?></legend>
 						<div class="infldset">
-							<p><input type="submit" name="ban" value="<?php echo $lang_profile['Ban user'] ?>" /></p>
+							<p><input type="submit" name="ban" value="<?php echo __('Ban user') ?>" /></p>
 						</div>
 					</fieldset>
 				</div>
@@ -36,12 +36,12 @@
         } else {
             if ($feather->user->id != $id) {
                 ?>
-						<legend><?php echo $lang_profile['Group membership legend'] ?></legend>
+						<legend><?php echo __('Group membership legend') ?></legend>
 						<div class="infldset">
 							<select id="group_id" name="group_id">
                                                             <?php echo $group_list ?>
 							</select>
-							<input type="submit" name="update_group_membership" value="<?php echo $lang_profile['Save'] ?>" />
+							<input type="submit" name="update_group_membership" value="<?php echo __('Save') ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -52,9 +52,9 @@
             }
 
             ?>
-						<legend><?php echo $lang_profile['Delete ban legend'] ?></legend>
+						<legend><?php echo __('Delete ban legend') ?></legend>
 						<div class="infldset">
-							<input type="submit" name="delete_user" value="<?php echo $lang_profile['Delete user'] ?>" /> <input type="submit" name="ban" value="<?php echo $lang_profile['Ban user'] ?>" />
+							<input type="submit" name="delete_user" value="<?php echo __('Delete user') ?>" /> <input type="submit" name="ban" value="<?php echo __('Ban user') ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -64,13 +64,13 @@
                 ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_profile['Set mods legend'] ?></legend>
+						<legend><?php echo __('Set mods legend') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_profile['Moderator in info'] ?></p>
+							<p><?php echo __('Moderator in info') ?></p>
                                                         <?php echo $forum_list ?>
 								</div>
 							</div>
-							<br class="clearb" /><input type="submit" name="update_forums" value="<?php echo $lang_profile['Update forums'] ?>" />
+							<br class="clearb" /><input type="submit" name="update_forums" value="<?php echo __('Update forums') ?>" />
 						</div>
 					</fieldset>
 				</div>
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
index 7aacc2f0..506dd146 100644
--- a/view/profile/section_display.php
+++ b/view/profile/section_display.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section display'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section display') ?></span></h2>
 	<div class="box">
 		<form id="profile5" method="post" action="<?php echo get_link('user/'.$id.'/section/display/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -30,9 +30,9 @@
         ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Style legend'] ?></legend>
+					<legend><?php echo __('Style legend') ?></legend>
 					<div class="infldset">
-						<label><?php echo $lang_profile['Styles'] ?><br />
+						<label><?php echo __('Styles') ?><br />
 						<select name="form_style">
 <?php
 
@@ -58,25 +58,25 @@
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1' || $feather_config['o_signatures'] == '1' || $feather_config['o_avatars'] == '1' || ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1')): ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Post display legend'] ?></legend>
+					<legend><?php echo __('Post display legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_profile['Post display info'] ?></p>
+						<p><?php echo __('Post display info') ?></p>
 						<div class="rbox">
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show smilies'] ?><br /></label>
+} ?> /><?php echo __('Show smilies') ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show sigs'] ?><br /></label>
+} ?> /><?php echo __('Show sigs') ?><br /></label>
 <?php endif; if ($feather_config['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show avatars'] ?><br /></label>
+} ?> /><?php echo __('Show avatars') ?><br /></label>
 <?php endif; if ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show images'] ?><br /></label>
+} ?> /><?php echo __('Show images') ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1' && $feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show images sigs'] ?><br /></label>
+} ?> /><?php echo __('Show images sigs') ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
@@ -85,15 +85,15 @@
 <?php endif; ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Pagination legend'] ?></legend>
+					<legend><?php echo __('Pagination legend') ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo $lang_profile['Topics per page'] ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
-						<label class="conl"><?php echo $lang_profile['Posts per page'] ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
-						<p class="clearb"><?php echo $lang_profile['Paginate info'] ?> <?php echo $lang_profile['Leave blank'] ?></p>
+						<label class="conl"><?php echo __('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
+						<label class="conl"><?php echo __('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
+						<p class="clearb"><?php echo __('Paginate info') ?> <?php echo __('Leave blank') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_essentials.php b/view/profile/section_essentials.php
index 364d5d8e..4f507a8c 100644
--- a/view/profile/section_essentials.php
+++ b/view/profile/section_essentials.php
@@ -14,23 +14,23 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section essentials'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section essentials') ?></span></h2>
 	<div class="box">
 		<form id="profile1" method="post" action="<?php echo get_link('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Username and pass legend'] ?></legend>
+					<legend><?php echo __('Username and pass legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php echo $lang_profile['Change pass'] ?></a></span></p>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php echo __('Change pass') ?></a></span></p>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Email legend'] ?></legend>
+					<legend><?php echo __('Email legend') ?></legend>
 					<div class="infldset">
 						<?php echo $user_disp['email_field'] ?>
 					</div>
@@ -38,139 +38,139 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Localisation legend'] ?></legend>
+					<legend><?php echo __('Localisation legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_prof_reg['Time zone info'] ?></p>
-						<label><?php echo $lang_prof_reg['Time zone']."\n" ?>
+						<p><?php echo __('Time zone info') ?></p>
+						<label><?php echo __('Time zone')."\n" ?>
 						<br /><select name="form_timezone">
 							<option value="-12"<?php if ($user['timezone'] == -12) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-12:00'] ?></option>
+} ?>><?php echo __('UTC-12:00') ?></option>
 							<option value="-11"<?php if ($user['timezone'] == -11) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-11:00'] ?></option>
+} ?>><?php echo __('UTC-11:00') ?></option>
 							<option value="-10"<?php if ($user['timezone'] == -10) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-10:00'] ?></option>
+} ?>><?php echo __('UTC-10:00') ?></option>
 							<option value="-9.5"<?php if ($user['timezone'] == -9.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-09:30'] ?></option>
+} ?>><?php echo __('UTC-09:30') ?></option>
 							<option value="-9"<?php if ($user['timezone'] == -9) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-09:00'] ?></option>
+} ?>><?php echo __('UTC-09:00') ?></option>
 							<option value="-8.5"<?php if ($user['timezone'] == -8.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-08:30'] ?></option>
+} ?>><?php echo __('UTC-08:30') ?></option>
 							<option value="-8"<?php if ($user['timezone'] == -8) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-08:00'] ?></option>
+} ?>><?php echo __('UTC-08:00') ?></option>
 							<option value="-7"<?php if ($user['timezone'] == -7) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-07:00'] ?></option>
+} ?>><?php echo __('UTC-07:00') ?></option>
 							<option value="-6"<?php if ($user['timezone'] == -6) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-06:00'] ?></option>
+} ?>><?php echo __('UTC-06:00') ?></option>
 							<option value="-5"<?php if ($user['timezone'] == -5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-05:00'] ?></option>
+} ?>><?php echo __('UTC-05:00') ?></option>
 							<option value="-4"<?php if ($user['timezone'] == -4) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-04:00'] ?></option>
+} ?>><?php echo __('UTC-04:00') ?></option>
 							<option value="-3.5"<?php if ($user['timezone'] == -3.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-03:30'] ?></option>
+} ?>><?php echo __('UTC-03:30') ?></option>
 							<option value="-3"<?php if ($user['timezone'] == -3) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-03:00'] ?></option>
+} ?>><?php echo __('UTC-03:00') ?></option>
 							<option value="-2"<?php if ($user['timezone'] == -2) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-02:00'] ?></option>
+} ?>><?php echo __('UTC-02:00') ?></option>
 							<option value="-1"<?php if ($user['timezone'] == -1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-01:00'] ?></option>
+} ?>><?php echo __('UTC-01:00') ?></option>
 							<option value="0"<?php if ($user['timezone'] == 0) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC'] ?></option>
+} ?>><?php echo __('UTC') ?></option>
 							<option value="1"<?php if ($user['timezone'] == 1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+01:00'] ?></option>
+} ?>><?php echo __('UTC+01:00') ?></option>
 							<option value="2"<?php if ($user['timezone'] == 2) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+02:00'] ?></option>
+} ?>><?php echo __('UTC+02:00') ?></option>
 							<option value="3"<?php if ($user['timezone'] == 3) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+03:00'] ?></option>
+} ?>><?php echo __('UTC+03:00') ?></option>
 							<option value="3.5"<?php if ($user['timezone'] == 3.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+03:30'] ?></option>
+} ?>><?php echo __('UTC+03:30') ?></option>
 							<option value="4"<?php if ($user['timezone'] == 4) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+04:00'] ?></option>
+} ?>><?php echo __('UTC+04:00') ?></option>
 							<option value="4.5"<?php if ($user['timezone'] == 4.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+04:30'] ?></option>
+} ?>><?php echo __('UTC+04:30') ?></option>
 							<option value="5"<?php if ($user['timezone'] == 5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+05:00'] ?></option>
+} ?>><?php echo __('UTC+05:00') ?></option>
 							<option value="5.5"<?php if ($user['timezone'] == 5.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+05:30'] ?></option>
+} ?>><?php echo __('UTC+05:30') ?></option>
 							<option value="5.75"<?php if ($user['timezone'] == 5.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+05:45'] ?></option>
+} ?>><?php echo __('UTC+05:45') ?></option>
 							<option value="6"<?php if ($user['timezone'] == 6) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+06:00'] ?></option>
+} ?>><?php echo __('UTC+06:00') ?></option>
 							<option value="6.5"<?php if ($user['timezone'] == 6.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+06:30'] ?></option>
+} ?>><?php echo __('UTC+06:30') ?></option>
 							<option value="7"<?php if ($user['timezone'] == 7) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+07:00'] ?></option>
+} ?>><?php echo __('UTC+07:00') ?></option>
 							<option value="8"<?php if ($user['timezone'] == 8) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+08:00'] ?></option>
+} ?>><?php echo __('UTC+08:00') ?></option>
 							<option value="8.75"<?php if ($user['timezone'] == 8.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+08:45'] ?></option>
+} ?>><?php echo __('UTC+08:45') ?></option>
 							<option value="9"<?php if ($user['timezone'] == 9) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+09:00'] ?></option>
+} ?>><?php echo __('UTC+09:00') ?></option>
 							<option value="9.5"<?php if ($user['timezone'] == 9.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+09:30'] ?></option>
+} ?>><?php echo __('UTC+09:30') ?></option>
 							<option value="10"<?php if ($user['timezone'] == 10) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+10:00'] ?></option>
+} ?>><?php echo __('UTC+10:00') ?></option>
 							<option value="10.5"<?php if ($user['timezone'] == 10.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+10:30'] ?></option>
+} ?>><?php echo __('UTC+10:30') ?></option>
 							<option value="11"<?php if ($user['timezone'] == 11) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+11:00'] ?></option>
+} ?>><?php echo __('UTC+11:00') ?></option>
 							<option value="11.5"<?php if ($user['timezone'] == 11.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+11:30'] ?></option>
+} ?>><?php echo __('UTC+11:30') ?></option>
 							<option value="12"<?php if ($user['timezone'] == 12) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+12:00'] ?></option>
+} ?>><?php echo __('UTC+12:00') ?></option>
 							<option value="12.75"<?php if ($user['timezone'] == 12.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+12:45'] ?></option>
+} ?>><?php echo __('UTC+12:45') ?></option>
 							<option value="13"<?php if ($user['timezone'] == 13) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+13:00'] ?></option>
+} ?>><?php echo __('UTC+13:00') ?></option>
 							<option value="14"<?php if ($user['timezone'] == 14) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+14:00'] ?></option>
+} ?>><?php echo __('UTC+14:00') ?></option>
 						</select>
 						<br /></label>
 						<div class="rbox">
 							<label><input type="checkbox" name="form_dst" value="1"<?php if ($user['dst'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['DST'] ?><br /></label>
+} ?> /><?php echo __('DST') ?><br /></label>
 						</div>
-						<label><?php echo $lang_prof_reg['Time format'] ?>
+						<label><?php echo __('Time format') ?>
 
 						<br /><select name="form_time_format">
 <?php
@@ -181,14 +181,14 @@
                                 }
                                 echo '>'. format_time(time(), false, null, $time_format, true, true);
                                 if ($key == 0) {
-                                    echo ' ('.$lang_prof_reg['Default'].')';
+                                    echo ' ('.__('Default').')';
                                 }
                                 echo "</option>\n";
                             }
                             ?>
 						</select>
 						<br /></label>
-						<label><?php echo $lang_prof_reg['Date format'] ?>
+						<label><?php echo __('Date format') ?>
 
 						<br /><select name="form_date_format">
 <?php
@@ -199,7 +199,7 @@
                                 }
                                 echo '>'. format_time(time(), true, $date_format, null, false, true);
                                 if ($key == 0) {
-                                    echo ' ('.$lang_prof_reg['Default'].')';
+                                    echo ' ('.__('Default').')';
                                 }
                                 echo "</option>\n";
                             }
@@ -214,7 +214,7 @@
     // Only display the language selection box if there's more than one language available
     if (count($languages) > 1) {
         ?>
-						<label><?php echo $lang_prof_reg['Language'] ?>
+						<label><?php echo __('Language') ?>
 						<br /><select name="form_language">
 <?php
 
@@ -239,18 +239,18 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['User activity'] ?></legend>
+					<legend><?php echo __('User activity') ?></legend>
 					<div class="infldset">
-						<p><?php printf($lang_profile['Registered info'], format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
-						<p><?php printf($lang_profile['Last post info'], format_time($user['last_post'])) ?></p>
-						<p><?php printf($lang_profile['Last visit info'], format_time($user['last_visit'])) ?></p>
+						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
+						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
-<?php if ($feather->user->is_admmod): ?>							<label><?php echo $lang_profile['Admin note'] ?><br />
+<?php if ($feather->user->is_admmod): ?>							<label><?php echo __('Admin note') ?><br />
 						<input id="admin_note" type="text" name="admin_note" value="<?php echo feather_escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_messaging.php b/view/profile/section_messaging.php
index 1ba9e14f..148a78cf 100644
--- a/view/profile/section_messaging.php
+++ b/view/profile/section_messaging.php
@@ -14,24 +14,24 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section messaging'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section messaging') ?></span></h2>
 	<div class="box">
 		<form id="profile3" method="post" action="<?php echo get_link('user/'.$id.'/section/messaging/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Contact details legend'] ?></legend>
+					<legend><?php echo __('Contact details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo $lang_profile['Jabber'] ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
-						<label><?php echo $lang_profile['ICQ'] ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php echo $lang_profile['MSN'] ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php echo $lang_profile['AOL IM'] ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php echo $lang_profile['Yahoo'] ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php echo __('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
+						<label><?php echo __('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
+						<label><?php echo __('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
+						<label><?php echo __('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php echo __('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_personal.php b/view/profile/section_personal.php
index 6e2fd1e6..7358bc85 100644
--- a/view/profile/section_personal.php
+++ b/view/profile/section_personal.php
@@ -14,24 +14,24 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section personal'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personal') ?></span></h2>
 	<div class="box">
 		<form id="profile2" method="post" action="<?php echo get_link('user/'.$id.'/section/personal/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Personal details legend'] ?></legend>
+					<legend><?php echo __('Personal details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo $lang_profile['Realname'] ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
+						<label><?php echo __('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
 <?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php echo $lang_profile['Location'] ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php echo $lang_profile['Website'] ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>							<label><?php echo __('Location') ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php echo __('Website') ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_personality.php b/view/profile/section_personality.php
index cfb1d445..9bd9440b 100644
--- a/view/profile/section_personality.php
+++ b/view/profile/section_personality.php
@@ -14,28 +14,28 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section personality'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personality') ?></span></h2>
 	<div class="box">
 		<form id="profile4" method="post" action="<?php echo get_link('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php if ($feather_config['o_avatars'] == '1'): ?>				<div class="inform">
 				<fieldset id="profileavatar">
-					<legend><?php echo $lang_profile['Avatar legend'] ?></legend>
+					<legend><?php echo __('Avatar legend') ?></legend>
 					<div class="infldset">
 <?php if ($user_avatar): ?>							<div class="useravatar"><?php echo $user_avatar ?></div>
-<?php endif; ?>							<p><?php echo $lang_profile['Avatar info'] ?></p>
+<?php endif; ?>							<p><?php echo __('Avatar info') ?></p>
 						<p class="clearb actions"><?php echo $avatar_field ?></p>
 					</div>
 				</fieldset>
 			</div>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Signature legend'] ?></legend>
+					<legend><?php echo __('Signature legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_profile['Signature info'] ?></p>
+						<p><?php echo __('Signature info') ?></p>
 						<div class="txtarea">
-							<label><?php printf($lang_profile['Sig max size'], forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
+							<label><?php printf(__('Sig max size'), forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
@@ -48,7 +48,7 @@
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_privacy.php b/view/profile/section_privacy.php
index 030520e0..6c1ab357 100644
--- a/view/profile/section_privacy.php
+++ b/view/profile/section_privacy.php
@@ -14,47 +14,47 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section privacy'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section privacy') ?></span></h2>
 	<div class="box">
 		<form id="profile6" method="post" action="<?php echo get_link('user/'.$id.'/section/privacy/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Privacy options legend'] ?></legend>
+					<legend><?php echo __('Privacy options legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<p><?php echo $lang_prof_reg['Email setting info'] ?></p>
+						<p><?php echo __('Email setting info') ?></p>
 						<div class="rbox">
 							<label><input type="radio" name="form_email_setting" value="0"<?php if ($user['email_setting'] == '0') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['Email setting 1'] ?><br /></label>
+} ?> /><?php echo __('Email setting 1') ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="1"<?php if ($user['email_setting'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['Email setting 2'] ?><br /></label>
+} ?> /><?php echo __('Email setting 2') ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="2"<?php if ($user['email_setting'] == '2') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['Email setting 3'] ?><br /></label>
+} ?> /><?php echo __('Email setting 3') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
 <?php if ($feather_config['o_forum_subscriptions'] == '1' || $feather_config['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Subscription legend'] ?></legend>
+					<legend><?php echo __('Subscription legend') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Notify full'] ?><br /></label>
+} ?> /><?php echo __('Notify full') ?><br /></label>
 <?php if ($feather_config['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Auto notify full'] ?><br /></label>
+} ?> /><?php echo __('Auto notify full') ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
index 7a74e367..3f74f092 100644
--- a/view/profile/upload_avatar.php
+++ b/view/profile/upload_avatar.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Upload avatar'] ?></span></h2>
+	<h2><span><?php echo __('Upload avatar') ?></span></h2>
 	<div class="box">
 		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Upload avatar legend'] ?></legend>
+					<legend><?php echo __('Upload avatar legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-						<label class="required"><strong><?php echo $lang_profile['File'] ?> <span><?php echo __('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php echo $lang_profile['Avatar desc'].' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.$lang_profile['pixels'].' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.$lang_profile['bytes'].' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
+						<label class="required"><strong><?php echo __('File') ?> <span><?php echo __('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
+						<p><?php echo __('Avatar desc').' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.__('bytes').' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="upload" value="<?php echo $lang_profile['Upload'] ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="upload" value="<?php echo __('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/view_profile.php b/view/profile/view_profile.php
index d9a5079e..ad1c5959 100644
--- a/view/profile/view_profile.php
+++ b/view/profile/view_profile.php
@@ -19,7 +19,7 @@
 		<div class="fakeform">
 			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['Section personal'] ?></legend>
+				<legend><?php echo __('Section personal') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personal'])."\n" ?>
@@ -30,7 +30,7 @@
 			</div>
 <?php if (!empty($user_info['messaging'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['Section messaging'] ?></legend>
+				<legend><?php echo __('Section messaging') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['messaging'])."\n" ?>
@@ -41,7 +41,7 @@
 			</div>
 <?php endif; if (!empty($user_info['personality'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['Section personality'] ?></legend>
+				<legend><?php echo __('Section personality') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personality'])."\n" ?>
@@ -52,7 +52,7 @@
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['User activity'] ?></legend>
+				<legend><?php echo __('User activity') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['activity'])."\n" ?>
diff --git a/view/register/email.php b/view/register/email.php
index e8c36fe7..9f9b3424 100644
--- a/view/register/email.php
+++ b/view/register/email.php
@@ -15,21 +15,21 @@
 ?>
 
 <div id="emailform" class="blockform">
-	<h2><span><?php echo $lang_misc['Send email to'] ?> <?php echo feather_escape($recipient) ?></span></h2>
+	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($recipient) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Write email'] ?></legend>
+					<legend><?php echo __('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
+						<p><?php echo __('Email disclosure note') ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/register/form.php b/view/register/form.php
index a088cc25..fa2d2457 100644
--- a/view/register/form.php
+++ b/view/register/form.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo $lang_register['Registration errors'] ?></span></h2>
+	<h2><span><?php echo __('Registration errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo $lang_register['Registration errors info'] ?></p>
+			<p><?php echo __('Registration errors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,18 +37,18 @@
 }
 ?>
 <div id="regform" class="blockform">
-	<h2><span><?php echo $lang_register['Register'] ?></span></h2>
+	<h2><span><?php echo __('Register') ?></span></h2>
 	<div class="box">
 		<form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
 		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
 					<h3><?php echo __('Important information') ?></h3>
-					<p><?php echo $lang_register['Desc 1'] ?></p>
-					<p><?php echo $lang_register['Desc 2'] ?></p>
+					<p><?php echo __('Desc 1') ?></p>
+					<p><?php echo __('Desc 2') ?></p>
 				</div>
 				<fieldset>
-					<legend><?php echo $lang_register['Username legend'] ?></legend>
+					<legend><?php echo __('Username legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="username" value="" />
@@ -61,28 +61,28 @@
 			</div>
 <?php if ($feather_config['o_regs_verify'] == '0'): ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_register['Pass legend'] ?></legend>
+					<legend><?php echo __('Pass legend') ?></legend>
 					<div class="infldset">
 						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
     echo feather_escape($feather->request->post('req_password1'));
 } ?>" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_prof_reg['Confirm pass'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
+						<label class="conl required"><strong><?php echo __('Confirm pass') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
     echo feather_escape($feather->request->post('req_password2'));
 } ?>" size="16" /><br /></label>
-						<p class="clearb"><?php echo $lang_register['Pass info'] ?></p>
+						<p class="clearb"><?php echo __('Pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? $lang_prof_reg['Email legend 2'] : $lang_prof_reg['Email legend'] ?></legend>
+					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo $lang_register['Email info'] ?></p>
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo __('Email info') ?></p>
 <?php endif; ?>						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
     echo feather_escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo $lang_register['Confirm email'] ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo __('Confirm email') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
     echo feather_escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
@@ -95,9 +95,9 @@
             ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Localisation legend'] ?></legend>
+					<legend><?php echo __('Localisation legend') ?></legend>
 					<div class="infldset">
-							<label><?php echo $lang_prof_reg['Language'] ?>
+							<label><?php echo __('Language') ?>
 							<br /><select name="language">
 <?php
 
@@ -121,14 +121,14 @@
 ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
+					<legend><?php echo __('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_antispam['Robot info']    ?></p>
-						<label class="required"><strong><?php echo sprintf($lang_antispam['Robot question'], $question[$index_questions]) ?> <span><?php echo __('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
+						<p><?php echo __('Robot info')    ?></p>
+						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php echo __('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="register" value="<?php echo $lang_register['Register'] ?>" /></p>
+			<p class="buttons"><input type="submit" name="register" value="<?php echo __('Register') ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/register/rules.php b/view/register/rules.php
index d86c8c54..3a2fd06c 100644
--- a/view/register/rules.php
+++ b/view/register/rules.php
@@ -15,18 +15,18 @@
 ?>
 
 <div id="rules" class="blockform">
-	<div class="hd"><h2><span><?php echo $lang_register['Forum rules'] ?></span></h2></div>
+	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<form method="get" action="<?php echo get_link('register/') ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_register['Rules legend'] ?></legend>
+					<legend><?php echo __('Rules legend') ?></legend>
 					<div class="infldset">
 						<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="agree" value="<?php echo $lang_register['Agree'] ?>" /> <input type="submit" name="cancel" value="<?php echo $lang_register['Cancel'] ?>" /></p>
+			<p class="buttons"><input type="submit" name="agree" value="<?php echo __('Agree') ?>" /> <input type="submit" name="cancel" value="<?php echo __('Cancel') ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/search/form.php b/view/search/form.php
index 262bf4d9..bb39c614 100644
--- a/view/search/form.php
+++ b/view/search/form.php
@@ -14,62 +14,62 @@
 ?>
 
 <div id="searchform" class="blockform">
-	<h2><span><?php echo $lang_search['Search'] ?></span></h2>
+	<h2><span><?php echo __('Search') ?></span></h2>
 	<div class="box">
 		<form id="search" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_search['Search criteria legend'] ?></legend>
+					<legend><?php echo __('Search criteria legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="action" value="search" />
-						<label class="conl"><?php echo $lang_search['Keyword search'] ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
-						<label class="conl"><?php echo $lang_search['Author search'] ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
-						<p class="clearb"><?php echo $lang_search['Search info'] ?></p>
+						<label class="conl"><?php echo __('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
+						<label class="conl"><?php echo __('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
+						<p class="clearb"><?php echo __('Search info') ?></p>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_search['Search in legend'] ?></legend>
+					<legend><?php echo __('Search in legend') ?></legend>
 					<div class="infldset">
 					<?php echo $forums ?>
-						<label class="conl"><?php echo $lang_search['Search in']."\n" ?>
+						<label class="conl"><?php echo __('Search in')."\n" ?>
 						<br /><select id="search_in" name="search_in">
-							<option value="0"><?php echo $lang_search['Message and subject'] ?></option>
-							<option value="1"><?php echo $lang_search['Message only'] ?></option>
-							<option value="-1"><?php echo $lang_search['Topic only'] ?></option>
+							<option value="0"><?php echo __('Message and subject') ?></option>
+							<option value="1"><?php echo __('Message only') ?></option>
+							<option value="-1"><?php echo __('Topic only') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearl"><?php echo $lang_search['Search in info'] ?></p>
-<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.$lang_search['Search multiple forums info'].'</p>' : '') ?>
+						<p class="clearl"><?php echo __('Search in info') ?></p>
+<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_search['Search results legend'] ?></legend>
+					<legend><?php echo __('Search results legend') ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo $lang_search['Sort by']."\n" ?>
+						<label class="conl"><?php echo __('Sort by')."\n" ?>
 						<br /><select name="sort_by">
-							<option value="0"><?php echo $lang_search['Sort by post time'] ?></option>
-							<option value="1"><?php echo $lang_search['Sort by author'] ?></option>
-							<option value="2"><?php echo $lang_search['Sort by subject'] ?></option>
-							<option value="3"><?php echo $lang_search['Sort by forum'] ?></option>
+							<option value="0"><?php echo __('Sort by post time') ?></option>
+							<option value="1"><?php echo __('Sort by author') ?></option>
+							<option value="2"><?php echo __('Sort by subject') ?></option>
+							<option value="3"><?php echo __('Sort by forum') ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Sort order']."\n" ?>
+						<label class="conl"><?php echo __('Sort order')."\n" ?>
 						<br /><select name="sort_dir">
-							<option value="DESC"><?php echo $lang_search['Descending'] ?></option>
-							<option value="ASC"><?php echo $lang_search['Ascending'] ?></option>
+							<option value="DESC"><?php echo __('Descending') ?></option>
+							<option value="ASC"><?php echo __('Ascending') ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Show as']."\n" ?>
+						<label class="conl"><?php echo __('Show as')."\n" ?>
 						<br /><select name="show_as">
-							<option value="topics"><?php echo $lang_search['Show as topics'] ?></option>
-							<option value="posts"><?php echo $lang_search['Show as posts'] ?></option>
+							<option value="topics"><?php echo __('Show as topics') ?></option>
+							<option value="posts"><?php echo __('Show as posts') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearb"><?php echo $lang_search['Search results info'] ?></p>
+						<p class="clearb"><?php echo __('Search results info') ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/search/header.php b/view/search/header.php
index 79f9ee84..909a2108 100644
--- a/view/search/header.php
+++ b/view/search/header.php
@@ -31,7 +31,7 @@
 if ($search['show_as'] == 'topics') :
 ?>
 <div id="vf" class="blocktable">
-	<h2><span><?php echo $lang_search['Search results'] ?></span></h2>
+	<h2><span><?php echo __('Search results') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
diff --git a/view/search/posts.php b/view/search/posts.php
index a1247133..872c349e 100644
--- a/view/search/posts.php
+++ b/view/search/posts.php
@@ -21,7 +21,7 @@
     echo ' '.$cur_search['item_status'];
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
-    echo $lang_topic['Re'].' ';
+    echo __('Re').' ';
 } ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
@@ -29,7 +29,7 @@
 			<div class="postleft">
 				<dl>
 					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php echo $lang_topic['Replies'].' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
+<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php echo __('Replies').' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
 <?php endif; ?>
 					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
 				</dl>
@@ -46,8 +46,8 @@
 		<div class="postfoot clearb">
 			<div class="postfootright">
 				<ul>
-					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo $lang_search['Go to topic'] ?></a></span></li>
-					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $lang_search['Go to post'] ?></a></span></li>
+					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo __('Go to topic') ?></a></span></li>
+					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo __('Go to post') ?></a></span></li>
 				</ul>
 			</div>
 		</div>
diff --git a/view/userlist.php b/view/userlist.php
index 33594426..0bbedae6 100644
--- a/view/userlist.php
+++ b/view/userlist.php
@@ -14,23 +14,23 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_search['User search'] ?></span></h2>
+	<h2><span><?php echo __('User search') ?></span></h2>
 	<div class="box">
 		<form id="userlist" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_ul['User find legend'] ?></legend>
+					<legend><?php echo __('User find legend') ?></legend>
 					<div class="infldset">
 <?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo __('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
-<?php endif; ?>						<label class="conl"><?php echo $lang_ul['User group']."\n" ?>
+<?php endif; ?>						<label class="conl"><?php echo __('User group')."\n" ?>
 						<br /><select name="show_group">
 							<option value="-1"<?php if ($show_group == -1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_ul['All users'] ?></option>
+} ?>><?php echo __('All users') ?></option>
 <?php echo $dropdown_menu ?>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Sort by']."\n" ?>
+						<label class="conl"><?php echo __('Sort by')."\n" ?>
 						<br /><select name="sort_by">
 							<option value="username"<?php if ($sort_by == 'username') {
     echo ' selected="selected"';
@@ -40,20 +40,20 @@
 } ?>><?php echo __('Registered') ?></option>
 <?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_ul['No of posts'] ?></option>
+} ?>><?php echo __('No of posts') ?></option>
 <?php endif; ?>						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Sort order']."\n" ?>
+						<label class="conl"><?php echo __('Sort order')."\n" ?>
 						<br /><select name="sort_dir">
 							<option value="ASC"<?php if ($sort_dir == 'ASC') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_search['Ascending'] ?></option>
+} ?>><?php echo __('Ascending') ?></option>
 							<option value="DESC"<?php if ($sort_dir == 'DESC') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_search['Descending'] ?></option>
+} ?>><?php echo __('Descending') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? $lang_ul['User search info'].' ' : '').$lang_ul['User sort info']; ?></p>
+						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? __('User search info').' ' : '').__('User sort info'); ?></p>
 					</div>
 				</fieldset>
 			</div>
@@ -98,7 +98,7 @@
 
             }
             if (empty($userlist_data)) {
-                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.$lang_search['No hits'].'</td></tr>'."\n";
+                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.__('No hits').'</td></tr>'."\n";
             }
             ?>
 			</tbody>
diff --git a/view/viewforum.php b/view/viewforum.php
index 7f4a55b7..b9d04a1d 100644
--- a/view/viewforum.php
+++ b/view/viewforum.php
@@ -36,7 +36,7 @@
 				<tr>
 					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
 					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
 <?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
 			</thead>
@@ -70,7 +70,7 @@
 							<div class="icon inone"><div class="nosize"><!-- --></div></div>
 							<div class="tclcon">
 								<div>
-									<strong><?php echo $lang_forum['Empty forum'] ?></strong>
+									<strong><?php echo __('Empty forum') ?></strong>
 								</div>
 							</div>
 						</td>
diff --git a/view/viewtopic.php b/view/viewtopic.php
index 733bb59b..16535ff1 100644
--- a/view/viewtopic.php
+++ b/view/viewtopic.php
@@ -64,13 +64,13 @@
 				</div>
 				<div class="postright">
 					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
-    echo $lang_topic['Re'].' ';
+    echo __('Re').' ';
 }
     ?><?php echo feather_escape($cur_topic['subject']) ?></h3>
 					<div class="postmsg">
 						<?php echo $post['message']."\n" ?>
 <?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.$lang_topic['Last edit'].' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 					</div>
@@ -124,7 +124,7 @@
 
     ?>
 <div id="quickpost" class="blockform">
-	<h2><span><?php echo $lang_topic['Quick post'] ?></span></h2>
+	<h2><span><?php echo __('Quick post') ?></span></h2>
 	<div class="box">
 		<form id="quickpostform" method="post" action="<?php echo get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -142,7 +142,7 @@
         $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
         $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
         ?>
-						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
 <?php
@@ -154,6 +154,7 @@
 
     ?>
 <!-- Init BBcode editor toolbar -->
+<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
@@ -178,13 +179,13 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
+					<legend><?php echo __('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_antispam['Robot info']    ?></p>
+						<p><?php echo __('Robot info')    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
     $qencoded = md5($question[$index_questions]);
-    echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);
+    echo sprintf(__('Robot question'), $question[$index_questions]);
     ?>
 							 <span><?php echo __('Required') ?></span></strong>
 							 <br />
@@ -195,7 +196,7 @@
 			</div>
 			<?php endif;
     ?>
-			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo __('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_topic['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
+			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo __('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
 		</form>
 	</div>
 </div>

From e7e16f9a57fe74eb7b3a9b561939aa345c60a34f Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 13 Aug 2015 14:19:28 +0200
Subject: [PATCH 022/353] Handle PDO drivers in middleware

---
 Slim/Extras/Middleware/FeatherBB.php | 38 ++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 8772b38b..82328149 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -46,15 +46,7 @@ public function __construct(array $user_forum_settings = array())
         $this->data['forum_settings'] = array_merge(self::load_default_settings(), $user_forum_settings);
 
         // Load DB settings
-        require_once $this->data['forum_env']['FEATHER_ROOT'].'include/idiorm.php';
-        DB::configure('mysql:host='.$this->data['forum_settings']['db_host'].';dbname='.$this->data['forum_settings']['db_name']);
-        DB::configure('username', $this->data['forum_settings']['db_user']);
-        DB::configure('password', $this->data['forum_settings']['db_pass']);
-        DB::configure('logging', true);
-        DB::configure('driver_options', array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-        DB::configure('id_column_overrides', array(
-            'groups' => 'g_id',
-        ));
+        $this->init_db();
 	}
 
     public function load_forum_config()
@@ -89,6 +81,32 @@ public static function load_default_settings()
                 );
     }
 
+    public function init_db()
+    {
+        require_once $this->data['forum_env']['FEATHER_ROOT'].'include/idiorm.php';
+        switch ($this->data['forum_settings']['db_type']) {
+            case 'mysql':
+            case 'mysqli':
+            case 'mysql_innodb':
+            case 'mysqli_innodb':
+                DB::configure('mysql:host='.$this->data['forum_settings']['db_host'].';dbname='.$this->data['forum_settings']['db_name']);
+                DB::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+                break;
+            case 'sqlite';
+            case 'sqlite3';
+                DB::configure('sqlite:./'.$this->data['forum_settings']['db_name']);
+                break;
+            case 'pgsql':
+                \DB::configure('pgsql:host='.$this->data['forum_settings']['db_host'].'dbname='.$this->data['forum_settings']['db_name']);
+                break;
+        }
+        DB::configure('username', $this->data['forum_settings']['db_user']);
+        DB::configure('password', $this->data['forum_settings']['db_pass']);
+        DB::configure('id_column_overrides', array(
+            'groups' => 'g_id',
+        ));
+    }
+
     // Getters / setters for Slim container (avoid magic get error)
 
     public function set_forum_env($key, $value = null)
@@ -317,7 +335,7 @@ public function call()
             $this->app->response->setStatus(403);
         } else {
             $this->env_to_globals($this->data['forum_env']); // Legacy : define globals from forum_env
-            
+
             require_once $this->data['forum_env']['FEATHER_ROOT'].'include/utf8/utf8.php';
             require_once $this->data['forum_env']['FEATHER_ROOT'].'include/functions.php';
 

From 87157a208ffdccea6b2bba02d5a7a9938dfbfab7 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 13 Aug 2015 14:22:38 +0200
Subject: [PATCH 023/353] Fix PDO namespace

---
 Slim/Extras/Middleware/FeatherBB.php | 29 +++++++++++-----------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 82328149..9d70e136 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -49,20 +49,6 @@ public function __construct(array $user_forum_settings = array())
         $this->init_db();
 	}
 
-    public function load_forum_config()
-    {
-        global $feather_config; // Legacy
-
-        if (file_exists($this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php')) {
-            include $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php';
-        } else {
-            require_once $this->data['forum_env']['FEATHER_ROOT'].'include/cache.php';
-            generate_config_cache();
-            require $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php';
-        }
-        return $feather_config;
-    }
-
     public static function load_default_settings()
     {
         return array(
@@ -90,7 +76,7 @@ public function init_db()
             case 'mysql_innodb':
             case 'mysqli_innodb':
                 DB::configure('mysql:host='.$this->data['forum_settings']['db_host'].';dbname='.$this->data['forum_settings']['db_name']);
-                DB::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+                DB::configure('driver_options', array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
                 break;
             case 'sqlite';
             case 'sqlite3';
@@ -328,7 +314,7 @@ public function update_online()
 
     public function call()
     {
-        global $lang_common, $feather_bans, $db_type, $cookie_name, $cookie_seed, $forum_time_formats, $forum_date_formats; // Legacy
+        global $lang_common, $feather_bans, $db_type, $cookie_name, $cookie_seed, $forum_time_formats, $forum_date_formats, $feather_config; // Legacy
 
         if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) { // Block prefetch requests
             $this->set_headers();
@@ -339,8 +325,15 @@ public function call()
             require_once $this->data['forum_env']['FEATHER_ROOT'].'include/utf8/utf8.php';
             require_once $this->data['forum_env']['FEATHER_ROOT'].'include/functions.php';
 
-            // Get forum config
-            $this->data['forum_settings'] = array_merge($this->load_forum_config(), $this->data['forum_settings']);
+            // Get forum config and load it into forum_settings array
+            if (file_exists($this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php')) {
+                include $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php';
+            } else {
+                require_once $this->data['forum_env']['FEATHER_ROOT'].'include/cache.php';
+                generate_config_cache();
+                require $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php';
+            }
+            $this->data['forum_settings'] = array_merge($feather_config, $this->data['forum_settings']);
             // Define time formats
             $forum_time_formats = array($this->data['forum_settings']['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
             $forum_date_formats = array($this->data['forum_settings']['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');

From bb5298386c594c0450bb4af5b0a6e2b9e44fd6a1 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 13 Aug 2015 14:25:35 +0200
Subject: [PATCH 024/353] Force query logging atm

Pending rewrite of the debug feature
---
 Slim/Extras/Middleware/FeatherBB.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 9d70e136..c240ed60 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -88,6 +88,7 @@ public function init_db()
         }
         DB::configure('username', $this->data['forum_settings']['db_user']);
         DB::configure('password', $this->data['forum_settings']['db_pass']);
+        DB::configure('logging', true);
         DB::configure('id_column_overrides', array(
             'groups' => 'g_id',
         ));

From 33f2f43943db237b7e5685f4327890c81faca0c0 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 13 Aug 2015 14:26:19 +0200
Subject: [PATCH 025/353] Remove get_path_view function

---
 include/functions.php | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 37daba59..41646e03 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1749,24 +1749,6 @@ function display_saved_queries()
 
 }
 
-//
-// Return the path to load the view file
-//
-function get_path_view($file = null)
-{
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    if ($file && is_file('style/'.$feather->user->style)) {
-        return FEATHER_ROOT.'style/'.$feather->user->style.'/view';
-    }
-    elseif (is_dir('style/'.$feather->user->style.'/view')) {
-        return FEATHER_ROOT.'style/'.$feather->user->style.'/view';
-    } else {
-        return FEATHER_ROOT.'view';
-    }
-}
-
 //
 // Make a string safe to use in a URL
 // Inspired by (c) Panther <http://www.pantherforum.org/>

From 6807cb5cd3d5d81c4420df1a0f9323e713807950 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 13 Aug 2015 14:49:42 +0200
Subject: [PATCH 026/353] Merge development

---
 Slim/Extras/Middleware/FeatherBB.php          | 374 +------------
 controller/admin/bans.php                     |  18 +-
 controller/admin/categories.php               |  20 +-
 controller/admin/censoring.php                |   4 +-
 controller/admin/forums.php                   |  16 +-
 controller/admin/groups.php                   |  14 +-
 controller/admin/index.php                    |   4 +-
 controller/admin/maintenance.php              |   4 +-
 controller/admin/options.php                  |   4 +-
 controller/admin/parser.php                   |   4 +-
 controller/admin/permissions.php              |   4 +-
 controller/admin/plugins.php                  |   8 +-
 controller/admin/reports.php                  |   4 +-
 controller/admin/statistics.php               |   8 +-
 controller/admin/users.php                    |  24 +-
 controller/delete.php                         |  17 +-
 controller/edit.php                           |  24 +-
 controller/footer.php                         |   3 -
 controller/header.php                         |  41 +-
 controller/help.php                           |  18 +-
 controller/index.php                          |  10 +-
 controller/login.php                          |  33 +-
 controller/misc.php                           |  72 +--
 controller/moderate.php                       | 113 ++--
 controller/post.php                           |  46 +-
 controller/profile.php                        | 121 ++---
 controller/register.php                       |  36 +-
 controller/search.php                         |  24 +-
 controller/userlist.php                       |  22 +-
 controller/viewforum.php                      |  16 +-
 controller/viewtopic.php                      |  33 +-
 extern.php                                    |  40 +-
 include/cache.php                             |   6 +-
 include/common.php                            | 204 ++++++++
 include/email.php                             |   4 +-
 include/functions.php                         | 119 +++--
 include/idiorm.php                            |  25 +-
 include/l10n.php                              |  75 +++
 include/parser.php                            |  70 +--
 include/pomo/.editorconfig                    |  16 +
 include/pomo/MO.php                           | 313 +++++++++++
 include/pomo/PO.php                           | 494 ++++++++++++++++++
 include/pomo/Streams/CachedFileReader.php     |  25 +
 include/pomo/Streams/CachedIntFileReader.php  |  20 +
 include/pomo/Streams/FileReader.php           |  60 +++
 include/pomo/Streams/Reader.php               | 120 +++++
 include/pomo/Streams/StringReader.php         |  61 +++
 .../pomo/Translations/EntryTranslations.php   |  89 ++++
 .../pomo/Translations/GettextTranslations.php | 127 +++++
 .../pomo/Translations/NOOPTranslations.php    | 104 ++++
 include/pomo/Translations/Translations.php    | 173 ++++++
 .../Translations/TranslationsInterface.php    |  94 ++++
 include/routes.php                            |   6 +-
 index.php                                     |  25 +-
 install/index.php                             | 219 ++++----
 lang/English/antispam.mo                      | Bin 0 -> 751 bytes
 lang/English/antispam.po                      |  27 +
 lang/English/antispam_questions.mo            | Bin 0 -> 765 bytes
 lang/English/antispam_questions.po            |  43 ++
 lang/English/bbeditor.mo                      | Bin 0 -> 1082 bytes
 lang/English/bbeditor.php                     |  25 -
 lang/English/bbeditor.po                      |  63 +++
 lang/English/common.mo                        | Bin 0 -> 9404 bytes
 lang/English/common.php                       | 184 -------
 lang/English/common.po                        | 473 +++++++++++++++++
 lang/English/convertor.php                    |  20 +
 lang/English/delete.mo                        | Bin 0 -> 1003 bytes
 lang/English/delete.php                       |  16 -
 lang/English/delete.po                        |  42 ++
 lang/English/forum.mo                         | Bin 0 -> 866 bytes
 lang/English/forum.php                        |  17 -
 lang/English/forum.po                         |  45 ++
 lang/English/help.mo                          | Bin 0 -> 4255 bytes
 lang/English/help.php                         |  66 ---
 lang/English/help.po                          | 165 ++++++
 lang/English/index.mo                         | Bin 0 -> 1064 bytes
 lang/English/index.php                        |  20 -
 lang/English/index.po                         |  54 ++
 lang/English/install.mo                       | Bin 0 -> 9441 bytes
 lang/English/install.php                      | 100 ----
 lang/English/install.po                       | 291 +++++++++++
 lang/English/login.mo                         | Bin 0 -> 1877 bytes
 lang/English/login.php                        |  26 -
 lang/English/login.po                         |  63 +++
 lang/English/misc.mo                          | Bin 0 -> 5068 bytes
 lang/English/misc.php                         |  93 ----
 lang/English/misc.po                          | 225 ++++++++
 lang/English/post.mo                          | Bin 0 -> 2395 bytes
 lang/English/post.php                         |  38 --
 lang/English/post.po                          |  93 ++++
 lang/English/prof_reg.mo                      | Bin 0 -> 5891 bytes
 lang/English/prof_reg.php                     |  79 ---
 lang/English/prof_reg.po                      | 225 ++++++++
 lang/English/profile.mo                       | Bin 0 -> 9585 bytes
 lang/English/profile.php                      | 143 -----
 lang/English/profile.po                       | 378 ++++++++++++++
 lang/English/register.mo                      | Bin 0 -> 3064 bytes
 lang/English/register.php                     |  37 --
 lang/English/register.po                      |  84 +++
 lang/English/search.mo                        | Bin 0 -> 4068 bytes
 lang/English/search.php                       |  64 ---
 lang/English/search.po                        | 174 ++++++
 lang/English/topic.mo                         | Bin 0 -> 1475 bytes
 lang/English/topic.php                        |  33 --
 lang/English/topic.po                         |  93 ++++
 lang/English/update.mo                        | Bin 0 -> 7678 bytes
 lang/English/update.php                       |  74 ---
 lang/English/update.po                        | 195 +++++++
 lang/English/userlist.mo                      | Bin 0 -> 898 bytes
 lang/English/userlist.php                     |  13 -
 lang/English/userlist.po                      |  33 ++
 model/admin/bans.php                          |   8 +-
 model/admin/groups.php                        |  10 +-
 model/admin/options.php                       |  14 +-
 model/admin/users.php                         |   6 +-
 model/delete.php                              |  10 +-
 model/edit.php                                |  36 +-
 model/index.php                               |  22 +-
 model/login.php                               |  20 +-
 model/misc.php                                |  70 +--
 model/moderate.php                            | 114 ++--
 model/post.php                                |  50 +-
 model/profile.php                             | 201 ++++---
 model/register.php                            |  26 +-
 model/search.php                              |  77 ++-
 model/viewforum.php                           |  36 +-
 model/viewtopic.php                           |  86 ++-
 readme.md                                     |  42 +-
 .../view/admin/groups/add_edit_group.php      |   2 +-
 style/FeatherBB/view/delete.php               |  12 +-
 style/FeatherBB/view/edit.php                 |  31 +-
 style/FeatherBB/view/footer.php               |  42 +-
 style/FeatherBB/view/header.php               |  10 +-
 style/FeatherBB/view/help.php                 | 128 ++---
 style/FeatherBB/view/index.php                |  30 +-
 style/FeatherBB/view/login/form.php           |  16 +-
 .../view/login/password_forgotten.php         |  14 +-
 style/FeatherBB/view/message.php              |   4 +-
 style/FeatherBB/view/misc/email.php           |  12 +-
 style/FeatherBB/view/misc/report.php          |  12 +-
 style/FeatherBB/view/misc/rules.php           |   2 +-
 .../FeatherBB/view/moderate/delete_posts.php  |   8 +-
 .../FeatherBB/view/moderate/delete_topics.php |   8 +-
 .../FeatherBB/view/moderate/merge_topics.php  |   8 +-
 .../view/moderate/moderator_forum.php         |  22 +-
 style/FeatherBB/view/moderate/move_topics.php |  10 +-
 style/FeatherBB/view/moderate/posts_view.php  |  16 +-
 style/FeatherBB/view/moderate/split_posts.php |  12 +-
 style/FeatherBB/view/post.php                 |  41 +-
 style/FeatherBB/view/profile/change_mail.php  |  12 +-
 style/FeatherBB/view/profile/change_pass.php  |  14 +-
 style/FeatherBB/view/profile/delete_user.php  |  12 +-
 style/FeatherBB/view/profile/menu.php         |  16 +-
 .../FeatherBB/view/profile/section_admin.php  |  20 +-
 .../view/profile/section_display.php          |  30 +-
 .../view/profile/section_essentials.php       | 118 ++---
 .../view/profile/section_messaging.php        |  16 +-
 .../view/profile/section_personal.php         |  12 +-
 .../view/profile/section_personality.php      |  22 +-
 .../view/profile/section_privacy.php          |  20 +-
 .../FeatherBB/view/profile/upload_avatar.php  |  10 +-
 style/FeatherBB/view/profile/view_profile.php |  10 +-
 style/FeatherBB/view/register/email.php       |  12 +-
 style/FeatherBB/view/register/form.php        |  44 +-
 style/FeatherBB/view/register/rules.php       |   6 +-
 style/FeatherBB/view/search/footer.php        |   2 +-
 style/FeatherBB/view/search/form.php          |  52 +-
 style/FeatherBB/view/search/header.php        |  12 +-
 style/FeatherBB/view/search/posts.php         |   8 +-
 style/FeatherBB/view/search/topics.php        |   2 +-
 style/FeatherBB/view/userlist.php             |  40 +-
 style/FeatherBB/view/viewforum.php            |  14 +-
 style/FeatherBB/view/viewtopic.php            |  37 +-
 view/admin/groups/add_edit_group.php          |   2 +-
 view/delete.php                               |  12 +-
 view/edit.php                                 | 119 ++---
 view/footer.php                               |  42 +-
 view/header.php                               |   8 +-
 view/help.php                                 | 128 ++---
 view/index.php                                |  30 +-
 view/login/form.php                           |  16 +-
 view/login/password_forgotten.php             |  14 +-
 view/message.php                              |   4 +-
 view/misc/email.php                           |  12 +-
 view/misc/report.php                          |  12 +-
 view/misc/rules.php                           |   2 +-
 view/moderate/delete_posts.php                |   8 +-
 view/moderate/delete_topics.php               |   8 +-
 view/moderate/merge_topics.php                |   8 +-
 view/moderate/moderator_forum.php             |  22 +-
 view/moderate/move_topics.php                 |  10 +-
 view/moderate/posts_view.php                  |  16 +-
 view/moderate/split_posts.php                 |  12 +-
 view/post.php                                 |  41 +-
 view/profile/change_mail.php                  |  12 +-
 view/profile/change_pass.php                  |  14 +-
 view/profile/delete_user.php                  |  12 +-
 view/profile/menu.php                         |  16 +-
 view/profile/section_admin.php                |  20 +-
 view/profile/section_display.php              |  30 +-
 view/profile/section_essentials.php           | 118 ++---
 view/profile/section_messaging.php            |  16 +-
 view/profile/section_personal.php             |  12 +-
 view/profile/section_personality.php          |  22 +-
 view/profile/section_privacy.php              |  20 +-
 view/profile/upload_avatar.php                |  10 +-
 view/profile/view_profile.php                 |  10 +-
 view/register/email.php                       |  12 +-
 view/register/form.php                        |  44 +-
 view/register/rules.php                       |   6 +-
 view/search/footer.php                        |   2 +-
 view/search/form.php                          |  52 +-
 view/search/header.php                        |  12 +-
 view/search/posts.php                         |   8 +-
 view/search/topics.php                        |   2 +-
 view/userlist.php                             |  40 +-
 view/viewforum.php                            |  14 +-
 view/viewtopic.php                            |  37 +-
 218 files changed, 6715 insertions(+), 3603 deletions(-)
 create mode 100644 include/common.php
 create mode 100644 include/l10n.php
 create mode 100644 include/pomo/.editorconfig
 create mode 100644 include/pomo/MO.php
 create mode 100644 include/pomo/PO.php
 create mode 100644 include/pomo/Streams/CachedFileReader.php
 create mode 100644 include/pomo/Streams/CachedIntFileReader.php
 create mode 100644 include/pomo/Streams/FileReader.php
 create mode 100644 include/pomo/Streams/Reader.php
 create mode 100644 include/pomo/Streams/StringReader.php
 create mode 100644 include/pomo/Translations/EntryTranslations.php
 create mode 100644 include/pomo/Translations/GettextTranslations.php
 create mode 100644 include/pomo/Translations/NOOPTranslations.php
 create mode 100644 include/pomo/Translations/Translations.php
 create mode 100644 include/pomo/Translations/TranslationsInterface.php
 create mode 100644 lang/English/antispam.mo
 create mode 100644 lang/English/antispam.po
 create mode 100644 lang/English/antispam_questions.mo
 create mode 100644 lang/English/antispam_questions.po
 create mode 100644 lang/English/bbeditor.mo
 delete mode 100644 lang/English/bbeditor.php
 create mode 100644 lang/English/bbeditor.po
 create mode 100644 lang/English/common.mo
 delete mode 100644 lang/English/common.php
 create mode 100644 lang/English/common.po
 create mode 100644 lang/English/convertor.php
 create mode 100644 lang/English/delete.mo
 delete mode 100644 lang/English/delete.php
 create mode 100644 lang/English/delete.po
 create mode 100644 lang/English/forum.mo
 delete mode 100644 lang/English/forum.php
 create mode 100644 lang/English/forum.po
 create mode 100644 lang/English/help.mo
 delete mode 100644 lang/English/help.php
 create mode 100644 lang/English/help.po
 create mode 100644 lang/English/index.mo
 delete mode 100644 lang/English/index.php
 create mode 100644 lang/English/index.po
 create mode 100644 lang/English/install.mo
 delete mode 100644 lang/English/install.php
 create mode 100644 lang/English/install.po
 create mode 100644 lang/English/login.mo
 delete mode 100644 lang/English/login.php
 create mode 100644 lang/English/login.po
 create mode 100644 lang/English/misc.mo
 delete mode 100644 lang/English/misc.php
 create mode 100644 lang/English/misc.po
 create mode 100644 lang/English/post.mo
 delete mode 100644 lang/English/post.php
 create mode 100644 lang/English/post.po
 create mode 100644 lang/English/prof_reg.mo
 delete mode 100644 lang/English/prof_reg.php
 create mode 100644 lang/English/prof_reg.po
 create mode 100644 lang/English/profile.mo
 delete mode 100644 lang/English/profile.php
 create mode 100644 lang/English/profile.po
 create mode 100644 lang/English/register.mo
 delete mode 100644 lang/English/register.php
 create mode 100644 lang/English/register.po
 create mode 100644 lang/English/search.mo
 delete mode 100644 lang/English/search.php
 create mode 100644 lang/English/search.po
 create mode 100644 lang/English/topic.mo
 delete mode 100644 lang/English/topic.php
 create mode 100644 lang/English/topic.po
 create mode 100644 lang/English/update.mo
 delete mode 100644 lang/English/update.php
 create mode 100644 lang/English/update.po
 create mode 100644 lang/English/userlist.mo
 delete mode 100644 lang/English/userlist.php
 create mode 100644 lang/English/userlist.po

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index c240ed60..2ebb1aaf 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -1,137 +1,36 @@
 <?php
 /**
+ * FeatherBB
  *
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ *
+ * USAGE
  *
  * $app = new \Slim\Slim();
- * $app->add(new \Slim\Extras\Middleware\FeatherBB($params));
+ * $app->add(new \Slim\Extras\Middleware\FeatherBB());
  *
  */
-
 namespace Slim\Extras\Middleware;
-use DB;
 
 class FeatherBB extends \Slim\Middleware
 {
-    protected $data = array();
+	protected $settings = array();
 
-	public function __construct(array $user_forum_settings = array())
+	public function __construct()
 	{
-        // Define forum env constants
-        $this->data['forum_env'] = array(
-                                    'FEATHER' => true,
-                                    'FEATHER_ROOT' => dirname(__FILE__).'/../../../',
-                                    'FORUM_VERSION' => '1.0.0',
-                                    'FORUM_NAME' => 'FeatherBB',
-                                    'FORUM_DB_REVISION' => 21,
-                                    'FORUM_SI_REVISION' => 2,
-                                    'FORUM_PARSER_REVISION' => 2,
-                                    'FORUM_CACHE_DIR' => dirname(__FILE__).'/../../../cache/', // TODO : Move in user settings
-                                    'FEATHER_UNVERIFIED' => 0,
-                                    'FEATHER_ADMIN' => 1,
-                                    'FEATHER_MOD' => 2,
-                                    'FEATHER_GUEST' => 3,
-                                    'FEATHER_MEMBER' => 4,
-                                    'FEATHER_MAX_POSTSIZE' => 32768,
-                                    'FEATHER_SEARCH_MIN_WORD' => 3,
-                                    'FEATHER_SEARCH_MAX_WORD' => 20,
-                                    'FORUM_MAX_COOKIE_SIZE' => 4048,
-                                    'FEATHER_SHOW_QUERIES' => 1
-                                    );
-
-        // Define forum settings / TODO : handle settings with a class / User input overrides all previous settings
-        $this->data['forum_settings'] = array_merge(self::load_default_settings(), $user_forum_settings);
 
-        // Load DB settings
-        $this->init_db();
 	}
 
-    public static function load_default_settings()
-    {
-        return array(
-                // Database
-                'db_type' => 'mysqli',
-                'db_host' => '',
-                'db_name' => '',
-                'db_user' => '',
-                'db_pass' => '',
-                'db_prefix' => '',
-                // Cookies
-                'cookie_name' => 'feather_cookie',
-                'cookie_seed' => 'changeme', // MUST BE CHANGED !!!
-                // Debug
-                'debug' => false,
-                );
-    }
-
-    public function init_db()
-    {
-        require_once $this->data['forum_env']['FEATHER_ROOT'].'include/idiorm.php';
-        switch ($this->data['forum_settings']['db_type']) {
-            case 'mysql':
-            case 'mysqli':
-            case 'mysql_innodb':
-            case 'mysqli_innodb':
-                DB::configure('mysql:host='.$this->data['forum_settings']['db_host'].';dbname='.$this->data['forum_settings']['db_name']);
-                DB::configure('driver_options', array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-                break;
-            case 'sqlite';
-            case 'sqlite3';
-                DB::configure('sqlite:./'.$this->data['forum_settings']['db_name']);
-                break;
-            case 'pgsql':
-                \DB::configure('pgsql:host='.$this->data['forum_settings']['db_host'].'dbname='.$this->data['forum_settings']['db_name']);
-                break;
-        }
-        DB::configure('username', $this->data['forum_settings']['db_user']);
-        DB::configure('password', $this->data['forum_settings']['db_pass']);
-        DB::configure('logging', true);
-        DB::configure('id_column_overrides', array(
-            'groups' => 'g_id',
-        ));
-    }
-
-    // Getters / setters for Slim container (avoid magic get error)
-
-    public function set_forum_env($key, $value = null)
-    {
-        $tmp = (!is_array($key) && !is_null($value)) ? array($key, $value) : $key;
-        foreach ($tmp as $key => $value) {
-            $this->app->container->get('forum_env')[$key] = $value;
-        }
-
-    }
-
-    public function set_forum_settings($key, $value = null)
-    {
-        $tmp = (!is_array($key) && !is_null($value)) ? array($key, $value) : $key;
-        foreach ($tmp as $key => $value) {
-            $this->app->container->get('forum_settings')[$key] = $value;
-        }
-    }
-
-    public function hydrate($data)
+    public function call() 
     {
-        foreach ($data as $key => $value) {
-            $this->app->container[$key] = $value;
-        }
-    }
+        $feather = $this->app;
 
-    // Legacy function, to ensure backward compatibility with globals
-    public function env_to_globals(array $vars)
-    {
-        foreach ($vars as $key => $value) {
-            define($key, $value);
-        }
-    }
+       	// Block prefetch requests
+        $this->app->hook('slim.before', function () use ($feather) {
+        	if ((isset($feather->environment['HTTP_X_MOZ'])) && ($feather->environment['HTTP_X_MOZ'] == 'prefetch')) {
+                $feather->halt(403, 'Prefetch forbidden');
+        	}
+        });
 
-    // Headers
-
-    public function set_headers()
-    {
         // No cache headers
         $this->app->response->headers->set('Cache-Control', 'no-cache, no-store, must-revalidate');
         $this->app->response->headers->set('Pragma', 'no-cache');
@@ -142,250 +41,11 @@ public function set_headers()
         // Prevent the site to be embedded in iFrame
         $this->app->response->headers->set('X-Frame-Options', 'deny');
         // Yeah !
-        $this->app->response->headers->set('X-Powered-By', $this->app->forum_env['FORUM_NAME']);
-    }
-
-    // Auth
-
-    public function authenticate()
-    {
-        $now = time();
-
-        // Get FeatherBB cookie
-        $cookie_raw = $this->app->getCookie($this->data['forum_settings']['cookie_name']);
-        // Check if cookie exists and is valid (getCookie method returns false if the data has been tampered locally so it can't decrypt the cookie);
-        if (isset($cookie_raw)) {
-            $cookie = json_decode($cookie_raw, true);
-            $checksum = hash_hmac('sha1', $cookie['user_id'].$cookie['expires'], $this->data['forum_settings']['cookie_seed'].'_checksum');
-            // If cookie has a non-guest user, hasn't expired and is legit
-            if ($cookie['user_id'] > 1 && $cookie['expires'] > $now && $checksum == $cookie['checksum']) {
-                // Get user info from db
-                $select_check_cookie = array('u.*', 'g.*', 'o.logged', 'o.idle');
-                $where_check_cookie = array('u.id' => intval($cookie['user_id']));
-
-                $result = DB::for_table('users')
-                    ->table_alias('u')
-                    ->select_many($select_check_cookie)
-                    ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
-                    ->left_outer_join('online', array('o.user_id', '=', 'u.id'), 'o')
-                    ->where($where_check_cookie)
-                    ->find_result_set();
-
-                foreach ($result as $this->app->user);
-
-                // Another security check, to prevent identity fraud by changing the user id in the cookie) (might be useless considering the strength of encryption)
-                if (isset($this->app->user->id) && hash_hmac('sha1', $this->app->user->password, $this->data['forum_settings']['cookie_seed'].'_password_hash') === $cookie['password_hash']) {
-                    $expires = ($cookie['expires'] > $now + $this->data['forum_settings']['o_timeout_visit']) ? $now + 1209600 : $now + $this->data['forum_settings']['o_timeout_visit'];
-                    $this->app->user->is_guest = false;
-                    $this->app->user->is_admmod = $this->app->user->g_id == $this->data['forum_env']['FEATHER_ADMIN'] || $this->app->g_moderator == '1';
-                    if (!$this->app->user->disp_topics) {
-                        $this->app->user->disp_topics = $this->data['forum_settings']['o_disp_topics_default'];
-                    }
-                    if (!$this->app->user->disp_posts) {
-                        $this->app->user->disp_posts = $this->data['forum_settings']['o_disp_posts_default'];
-                    }
-                    if (!file_exists($this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language)) {
-                        $this->app->user->language = $this->data['forum_settings']['o_default_lang'];
-                    }
-                    if (!file_exists($this->data['forum_env']['FEATHER_ROOT'].'style/'.$this->app->user->style.'.css')) {
-                        $this->app->user->style = $this->data['forum_settings']['o_default_style'];
-                    }
-                    feather_setcookie($this->app->user->id, $this->app->user->password, $expires);
-                    $this->update_online();
-                    return true;
-                }
-            }
-        }
-
-        // If there is no cookie, or cookie is guest or expired, let's reconnect.
-        $expires = $now + 31536000; // The cookie expires after a year
-
-        // Fetch guest user
-        $select_set_default_user = array('u.*', 'g.*', 'o.logged', 'o.last_post', 'o.last_search');
-        $where_set_default_user = array('u.id' => '1');
-
-        $result = DB::for_table('users')
-            ->table_alias('u')
-            ->select_many($select_set_default_user)
-            ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
-            ->left_outer_join('online', array('o.ident', '=', $this->app->request->getIp()), 'o', true)
-            ->where($where_set_default_user)
-            ->find_result_set();
-
-        if (!$result) {
-            exit('Unable to fetch guest information. Your database must contain both a guest user and a guest user group.');
-        }
+        $this->app->response->headers->set('X-Powered-By', 'FeatherBB');
 
-        foreach ($result as $this->app->user);
-
-        $this->app->user->disp_topics = $this->data['forum_settings']['o_disp_topics_default'];
-        $this->app->user->disp_posts = $this->data['forum_settings']['o_disp_posts_default'];
-        $this->app->user->timezone = $this->data['forum_settings']['o_default_timezone'];
-        $this->app->user->dst = $this->data['forum_settings']['o_default_dst'];
-        $this->app->user->language = $this->data['forum_settings']['o_default_lang'];
-        $this->app->user->style = $this->data['forum_settings']['o_default_style'];
-        $this->app->user->is_guest = true;
-        $this->app->user->is_admmod = false;
-
-        // Update online list
-        if (!$this->app->user->logged) {
-            $this->app->user->logged = time();
-
-            // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
-            switch ($this->data['forum_settings']['db_type']) {
-                case 'mysql':
-                case 'mysqli':
-                case 'mysql_innodb':
-                case 'mysqli_innodb':
-                case 'sqlite':
-                case 'sqlite3':
-                DB::for_table('online')->raw_execute('REPLACE INTO online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
-                    break;
-
-                default:
-                    DB::for_table('online')->raw_execute('INSERT INTO online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE ident=:ident)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
-                    break;
-            }
-        } else {
-            DB::for_table('online')->where('ident', $this->app->request->getIp())
-                 ->update_many('logged', time());
-        }
-
-        feather_setcookie(1, feather_hash(uniqid(rand(), true)), $expires);
-        return true;
+        // Call next middleware.
+        $this->next->call();
     }
 
-    public function update_online()
-    {
-        $now = time();
-
-        // Define this if you want this visit to affect the online list and the users last visit data
-        if (!defined('FEATHER_QUIET_VISIT')) {
-            // Update the online list
-            if (!$this->app->user->logged) {
-                $this->app->user->logged = $now;
-
-                // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
-                switch ($this->data['forum_settings']['db_type']) {
-                    case 'mysql':
-                    case 'mysqli':
-                    case 'mysql_innodb':
-                    case 'mysqli_innodb':
-                    case 'sqlite':
-                    case 'sqlite3':
-                        DB::for_table('online')->raw_execute('REPLACE INTO online (user_id, ident, logged) VALUES(:user_id, :ident, :logged)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
-                        break;
-
-                    default:
-                        DB::for_table('online')->raw_execute('INSERT INTO online (user_id, ident, logged) SELECT :user_id, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE user_id=:user_id)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
-                        break;
-                }
 
-                // Reset tracked topics
-                set_tracked_topics(null);
-
-            } else {
-                // Special case: We've timed out, but no other user has browsed the forums since we timed out
-                if ($this->app->user->logged < ($now-$this->data['forum_settings']['o_timeout_visit'])) {
-                    DB::for_table('users')->where('id', $this->app->user->id)
-                        ->find_one()
-                        ->set('last_visit', $this->app->user->logged)
-                        ->save();
-                    $this->app->user->last_visit = $this->app->user->logged;
-                }
-
-                $idle_sql = ($this->app->user->idle == '1') ? ', idle=0' : '';
-
-                DB::for_table('online')->raw_execute('UPDATE online SET logged='.$now.$idle_sql.' WHERE user_id=:user_id', array(':user_id' => $this->app->user->id));
-
-                // Update tracked topics with the current expire time
-                $cookie_tracked_topics = $this->app->getCookie($this->data['forum_settings']['cookie_name'].'_track');
-                if (isset($cookie_tracked_topics)) {
-                    set_tracked_topics(json_decode($cookie_tracked_topics, true));
-                }
-            }
-        } else {
-            if (!$this->app->user->logged) {
-                $this->app->user->logged = $this->app->user->last_visit;
-            }
-        }
-    }
-
-    //
-
-    public function call()
-    {
-        global $lang_common, $feather_bans, $db_type, $cookie_name, $cookie_seed, $forum_time_formats, $forum_date_formats, $feather_config; // Legacy
-
-        if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) { // Block prefetch requests
-            $this->set_headers();
-            $this->app->response->setStatus(403);
-        } else {
-            $this->env_to_globals($this->data['forum_env']); // Legacy : define globals from forum_env
-
-            require_once $this->data['forum_env']['FEATHER_ROOT'].'include/utf8/utf8.php';
-            require_once $this->data['forum_env']['FEATHER_ROOT'].'include/functions.php';
-
-            // Get forum config and load it into forum_settings array
-            if (file_exists($this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php')) {
-                include $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php';
-            } else {
-                require_once $this->data['forum_env']['FEATHER_ROOT'].'include/cache.php';
-                generate_config_cache();
-                require $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php';
-            }
-            $this->data['forum_settings'] = array_merge($feather_config, $this->data['forum_settings']);
-            // Define time formats
-            $forum_time_formats = array($this->data['forum_settings']['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
-            $forum_date_formats = array($this->data['forum_settings']['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
-            // Populate Feather object (Slim instance)
-            $this->hydrate($this->data);
-
-            $this->app->config = $this->data['forum_settings']; // Legacy
-            extract($this->data['forum_settings']); // Legacy
-
-            $this->set_headers();
-
-            // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
-            setlocale(LC_CTYPE, 'C');
-
-            $this->authenticate();
-
-            // Attempt to load the common language file
-            if (file_exists($this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php')) {
-                include $this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php';
-            } else {
-                die('There is no valid language pack \''.feather_escape($this->app->user->language).'\' installed. Please reinstall a language of that name');
-            }
-
-            // Check if we are to display a maintenance message
-            if ($this->data['forum_settings']['o_maintenance'] && $this->app->user->g_id > $this->data['forum_env']['FEATHER_ADMIN'] && !defined('FEATHER_TURN_OFF_MAINT')) {
-                maintenance_message();
-            }
-
-            // Load cached bans
-            if (file_exists($this->data['forum_env']['FORUM_CACHE_DIR'].'cache_bans.php')) {
-                include $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_bans.php';
-            }
-
-            if (!defined('FEATHER_BANS_LOADED')) {
-                if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                    require_once $this->data['forum_env']['FEATHER_ROOT'].'include/cache.php';
-                }
-
-                generate_bans_cache();
-                require_once $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_bans.php';
-            }
-
-            // Check if current user is banned
-            check_bans();
-
-            // Update online list
-            update_users_online();
-
-            // Configure Slim
-            $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? FEATHER_ROOT.'style/'.$this->app->user->style.'/view' : FEATHER_ROOT.'view');
-            $this->next->call();
-        }
-    }
 }
diff --git a/controller/admin/bans.php b/controller/admin/bans.php
index 7b2544f0..6e544bc1 100644
--- a/controller/admin/bans.php
+++ b/controller/admin/bans.php
@@ -30,14 +30,14 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_bans;
+        global $lang_admin_common, $lang_admin_bans;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_bans.php language file
@@ -54,7 +54,7 @@ public function display()
             $start_from = 50 * ($p - 1);
 
             // Generate paging links
-            $paging_links = '<span class="pages-label">' . $lang_common['Pages'] . ' </span>' . paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str']));
+            $paging_links = '<span class="pages-label">' . __('Pages') . ' </span>' . paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str']));
 
             $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Bans'], $lang_admin_bans['Results head']);
             define('FEATHER_ACTIVE_PAGE', 'admin');
@@ -93,14 +93,14 @@ public function display()
 
     public function add($id = null)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_bans;
+        global $lang_admin_common, $lang_admin_bans;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_bans.php language file
@@ -131,12 +131,12 @@ public function add($id = null)
 
     public function delete($id)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_bans;
+        global $lang_admin_common, $lang_admin_bans;
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_bans.php language file
@@ -148,14 +148,14 @@ public function delete($id)
 
     public function edit($id)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_bans;
+        global $lang_admin_common, $lang_admin_bans;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_bans.php language file
diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index 8edac8f6..07ddbe5b 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -30,10 +30,10 @@ public function __autoload($class_name)
 
     public function add_category()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_categories;
+        global $lang_admin_common, $lang_admin_categories;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_options.php language file
@@ -54,10 +54,10 @@ public function add_category()
 
     public function edit_categories()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_categories;
+        global $lang_admin_common, $lang_admin_categories;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_options.php language file
@@ -65,7 +65,7 @@ public function edit_categories()
         require FEATHER_ROOT.'lang/'.$admin_language.'/categories.php';
 
         if (empty($this->request->post('cat'))) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $categories = array();
@@ -90,10 +90,10 @@ public function edit_categories()
 
     public function delete_category()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_categories;
+        global $lang_admin_common, $lang_admin_categories;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_options.php language file
@@ -103,7 +103,7 @@ public function delete_category()
         $cat_to_delete = (int) $this->request->post('cat_to_delete');
 
         if ($cat_to_delete < 1) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         if (intval($this->request->post('disclaimer')) != 1) {
@@ -119,12 +119,12 @@ public function delete_category()
 
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_categories;
+        global $lang_admin_common, $lang_admin_categories;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/censoring.php b/controller/admin/censoring.php
index 1c9a2872..469ef9cc 100644
--- a/controller/admin/censoring.php
+++ b/controller/admin/censoring.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_censoring;
+        global $lang_admin_common, $lang_admin_censoring;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index f204e2c7..3d0e3610 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -34,10 +34,10 @@ public function __autoload($class_name)
 
     public function add_forum()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_forums;
+        global $lang_admin_common, $lang_admin_forums;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_options.php language file
@@ -66,10 +66,10 @@ public function add_forum()
 
     public function edit_forum($forum_id)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_forums;
+        global $lang_admin_common, $lang_admin_forums;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_options.php language file
@@ -172,10 +172,10 @@ public function edit_forum($forum_id)
 
     public function delete_forum($forum_id)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_forums;
+        global $lang_admin_common, $lang_admin_forums;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -239,12 +239,12 @@ public function edit_positions()
     
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_forums;
+        global $lang_admin_common, $lang_admin_forums;
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index 2a42b0d9..efae5d16 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_groups;
+        global $lang_admin_common, $lang_admin_groups;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -72,12 +72,12 @@ public function display()
 
     public function delete($id)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_groups;
+        global $lang_admin_common, $lang_admin_groups;
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -86,7 +86,7 @@ public function delete($id)
         require FEATHER_ROOT . 'lang/' . $admin_language . '/groups.php';
 
         if ($id < 5) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Make sure we don't remove the default group
@@ -145,12 +145,12 @@ public function delete($id)
 
     public function addedit($id = '')
     {
-        global $lang_common, $lang_admin_common, $lang_admin_groups;
+        global $lang_admin_common, $lang_admin_groups;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/index.php b/controller/admin/index.php
index 47dc4129..08dedaa1 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -44,12 +44,12 @@ public function remove_install_folder($directory)
     
     public function display($action = null)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_index;
+        global $lang_admin_common, $lang_admin_index;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_index.php language file
diff --git a/controller/admin/maintenance.php b/controller/admin/maintenance.php
index e1527431..a5bfbc11 100644
--- a/controller/admin/maintenance.php
+++ b/controller/admin/maintenance.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_maintenance, $lang_admin_common;
+        global $lang_admin_maintenance, $lang_admin_common;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/options.php b/controller/admin/options.php
index c20d44d3..07e43253 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common;
+        global $lang_admin_common;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index 38b0e084..650869f3 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_parser, $lang_admin_common;
+        global $lang_admin_parser, $lang_admin_common;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/permissions.php b/controller/admin/permissions.php
index 16adc0f5..f503b775 100644
--- a/controller/admin/permissions.php
+++ b/controller/admin/permissions.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_permissions;
+        global $lang_admin_common, $lang_admin_permissions;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index 9cd51a51..ef747bd9 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common;
+        global $lang_admin_common;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -43,13 +43,13 @@ public function display()
         // The plugin to load should be supplied via GET
         $plugin = $this->request->get('plugin') ? $this->request->get('plugin') : '';
         if (!preg_match('%^AM?P_(\w*?)\.php$%i', $plugin)) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // AP_ == Admins only, AMP_ == admins and moderators
         $prefix = substr($plugin, 0, strpos($plugin, '_'));
         if ($this->user->g_moderator == '1' && $prefix == 'AP') {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Make sure the file actually exists
diff --git a/controller/admin/reports.php b/controller/admin/reports.php
index 070ed31d..681f2838 100644
--- a/controller/admin/reports.php
+++ b/controller/admin/reports.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_reports;
+        global $lang_admin_common, $lang_admin_reports;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index 8e11a0fe..6b442a66 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_index;
+        global $lang_admin_common, $lang_admin_index;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -72,7 +72,7 @@ public function display()
 
     public function phpinfo()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_index;
+        global $lang_admin_common, $lang_admin_index;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
@@ -80,7 +80,7 @@ public function phpinfo()
         require FEATHER_ROOT.'lang/'.$admin_language.'/index.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Show phpinfo() output
diff --git a/controller/admin/users.php b/controller/admin/users.php
index 17e7b580..e6e9250f 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -30,14 +30,14 @@ public function __autoload($class_name)
 
     public function display()
     {
-        global $lang_common, $lang_admin_common, $lang_admin_users;
+        global $lang_admin_common, $lang_admin_users;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_bans.php language file
@@ -46,7 +46,7 @@ public function display()
         // Move multiple users to other user groups
         if ($this->request->post('move_users') || $this->request->post('move_users_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $move = $this->model->move_users();
@@ -73,7 +73,7 @@ public function display()
         // Delete multiple users
         if ($this->request->post('delete_users') || $this->request->post('delete_users_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $user_ids = $this->model->delete_users();
@@ -100,7 +100,7 @@ public function display()
         // Ban multiple users
         if ($this->request->post('ban_users') || $this->request->post('ban_users_comply')) {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $user_ids = $this->model->ban_users();
@@ -140,7 +140,7 @@ public function display()
             $start_from = 50 * ($p - 1);
 
             // Generate paging links
-            $paging_links = '<span class="pages-label">' . $lang_common['Pages'] . ' </span>' . paginate_old($num_pages, $p, '?find_user=&amp;'.implode('&amp;', $search['query_str']));
+            $paging_links = '<span class="pages-label">' . __('Pages') . ' </span>' . paginate_old($num_pages, $p, '?find_user=&amp;'.implode('&amp;', $search['query_str']));
 
             // Some helper variables for permissions
             $can_delete = $can_move = $this->user->g_id == FEATHER_ADMIN;
@@ -192,14 +192,14 @@ public function display()
     // Show IP statistics for a certain user ID
     public function ipstats($id)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_users;
+        global $lang_admin_common, $lang_admin_users;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_bans.php language file
@@ -215,7 +215,7 @@ public function ipstats($id)
         $start_from = 50 * ($p - 1);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$id);
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$id);
 
         $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Users'], $lang_admin_users['Results head']);
 
@@ -237,14 +237,14 @@ public function ipstats($id)
     // Show IP statistics for a certain user IP
     public function showusers($ip)
     {
-        global $lang_common, $lang_admin_common, $lang_admin_users;
+        global $lang_admin_common, $lang_admin_users;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the admin_bans.php language file
@@ -264,7 +264,7 @@ public function showusers($ip)
         $start_from = 50 * ($p - 1);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$ip);
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$ip);
 
         $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Users'], $lang_admin_users['Results head']);
 
diff --git a/controller/delete.php b/controller/delete.php
index b228c4ac..1c0848b4 100644
--- a/controller/delete.php
+++ b/controller/delete.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\delete();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/delete.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
     }
 
     public function __autoload($class_name)
@@ -30,10 +32,10 @@ public function __autoload($class_name)
     
     public function deletepost($id)
     {
-        global $lang_common, $lang_post, $pd;
+        global $pd;
 
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Fetch some informations about the post, the topic and the forum
@@ -55,23 +57,20 @@ public function deletepost($id)
                 $cur_post['poster_id'] != $this->user->id ||
                 $cur_post['closed'] == '1') &&
                 !$is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
-        // Load the delete.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/delete.php';
-
 
         if ($this->feather->request()->isPost()) {
             $this->model->handle_deletion($is_topic_post, $id, $cur_post['tid'], $cur_post['fid']);
         }
 
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_delete['Delete post']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Delete post'));
 
         define('FEATHER_ACTIVE_PAGE', 'delete');
 
@@ -81,8 +80,6 @@ public function deletepost($id)
         $cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
 
         $this->feather->render('delete.php', array(
-                            'lang_common' => $lang_common,
-                            'lang_delete' => $lang_delete,
                             'cur_post' => $cur_post,
                             'id' => $id,
                             'is_topic_post' => $is_topic_post,
diff --git a/controller/edit.php b/controller/edit.php
index b2f60660..e412751a 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -21,6 +21,10 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\edit();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.mo');
     }
 
     public function __autoload($class_name)
@@ -30,10 +34,8 @@ public function __autoload($class_name)
     
     public function editpost($id)
     {
-        global $lang_common, $lang_prof_reg, $lang_post, $lang_register;
-
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Fetch some informations about the post, the topic and the forum
@@ -52,15 +54,12 @@ public function editpost($id)
 
         // Do we have permission to edit this post?
         if (($this->user->g_edit_posts == '0' || $cur_post['poster_id'] != $this->user->id || $cur_post['closed'] == '1') && !$is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
-
-        // Load the post.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/post.php';
         
         // Load the bbeditor.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.php';
@@ -80,15 +79,15 @@ public function editpost($id)
                 // Edit the post
                 $this->model->edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod);
 
-                redirect(get_link('post/'.$id.'/#p'.$id), $lang_post['Post redirect']);
+                redirect(get_link('post/'.$id.'/#p'.$id), __('Post redirect'));
             }
         } else {
             $post = '';
         }
 
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_post['Edit post']);
-        $required_fields = array('req_subject' => $lang_common['Subject'], 'req_message' => $lang_common['Message']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Edit post'));
+        $required_fields = array('req_subject' => __('Subject'), 'req_message' => __('Message'));
         $focus_element = array('edit', 'req_message');
 
         define('FEATHER_ACTIVE_PAGE', 'edit');
@@ -103,9 +102,7 @@ public function editpost($id)
         }
 
         $this->feather->render('edit.php', array(
-                            'lang_common' => $lang_common,
                             'cur_post' => $cur_post,
-                            'lang_post' => $lang_post,
                             'errors' => $errors,
                             'preview_message' => $preview_message,
                             'id' => $id,
@@ -115,7 +112,6 @@ public function editpost($id)
                             'feather' => $this->feather,
                             'can_edit_subject' => $can_edit_subject,
                             'post' => $post,
-                            'lang_bbeditor' => $lang_bbeditor,
                             )
                     );
 
diff --git a/controller/footer.php b/controller/footer.php
index 40f7964a..b852a21a 100644
--- a/controller/footer.php
+++ b/controller/footer.php
@@ -27,8 +27,6 @@ public function dontStop() {
 
     public function display($footer_style = null, $id = null, $p = null, $pid = null, $forum_id = null, $num_pages = null)
     {
-        global $lang_common;
-
         // Render the footer
         // If no footer style has been specified, we use the default (only copyright/debug info)
         $footer_style = isset($footer_style) ? $footer_style : null;
@@ -42,7 +40,6 @@ public function display($footer_style = null, $id = null, $p = null, $pid = null
         $num_pages = isset($num_pages) ? $num_pages : null;
 
         $this->feather->render('footer.php', array(
-                            'lang_common' => $lang_common,
                             'id' => $id,
                             'p' => $p,
                             'pid' => $pid,
diff --git a/controller/header.php b/controller/header.php
index 5ee52832..c49878a1 100644
--- a/controller/header.php
+++ b/controller/header.php
@@ -77,8 +77,6 @@ public function setPageHead($page_head)
 
     public function display()
     {
-        global $lang_common;
-
         // START SUBST - <body> TODO
         /*if (isset($focus_element)) {
             $tpl_main = str_replace('<body onload="', '<body onload="document.getElementById(\''.$focus_element[0].'\').elements[\''.$focus_element[1].'\'].focus();', $tpl_main);
@@ -90,31 +88,31 @@ public function display()
         $links = array();
 
         // Index should always be displayed
-        $links[] = '<li id="navindex"'.((FEATHER_ACTIVE_PAGE == 'index') ? ' class="isactive"' : '').'><a href="'.get_base_url().'/">'.$lang_common['Index'].'</a></li>';
+        $links[] = '<li id="navindex"'.((FEATHER_ACTIVE_PAGE == 'index') ? ' class="isactive"' : '').'><a href="'.get_base_url().'/">'.__('Index').'</a></li>';
 
         if ($this->user->g_read_board == '1' && $this->user->g_view_users == '1') {
-            $links[] = '<li id="navuserlist"'.((FEATHER_ACTIVE_PAGE == 'userlist') ? ' class="isactive"' : '').'><a href="'.get_link('userlist/').'">'.$lang_common['User list'].'</a></li>';
+            $links[] = '<li id="navuserlist"'.((FEATHER_ACTIVE_PAGE == 'userlist') ? ' class="isactive"' : '').'><a href="'.get_link('userlist/').'">'.__('User list').'</a></li>';
         }
 
         if ($this->config['o_rules'] == '1' && (!$this->user->is_guest || $this->user->g_read_board == '1' || $this->config['o_regs_allow'] == '1')) {
-            $links[] = '<li id="navrules"'.((FEATHER_ACTIVE_PAGE == 'rules') ? ' class="isactive"' : '').'><a href="'.get_link('rules/').'">'.$lang_common['Rules'].'</a></li>';
+            $links[] = '<li id="navrules"'.((FEATHER_ACTIVE_PAGE == 'rules') ? ' class="isactive"' : '').'><a href="'.get_link('rules/').'">'.__('Rules').'</a></li>';
         }
 
         if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-            $links[] = '<li id="navsearch"'.((FEATHER_ACTIVE_PAGE == 'search') ? ' class="isactive"' : '').'><a href="'.get_link('search/').'">'.$lang_common['Search'].'</a></li>';
+            $links[] = '<li id="navsearch"'.((FEATHER_ACTIVE_PAGE == 'search') ? ' class="isactive"' : '').'><a href="'.get_link('search/').'">'.__('Search').'</a></li>';
         }
 
         if ($this->user->is_guest) {
-            $links[] = '<li id="navregister"'.((FEATHER_ACTIVE_PAGE == 'register') ? ' class="isactive"' : '').'><a href="'.get_link('register/').'">'.$lang_common['Register'].'</a></li>';
-            $links[] = '<li id="navlogin"'.((FEATHER_ACTIVE_PAGE == 'login') ? ' class="isactive"' : '').'><a href="'.get_link('login/').'">'.$lang_common['Login'].'</a></li>';
+            $links[] = '<li id="navregister"'.((FEATHER_ACTIVE_PAGE == 'register') ? ' class="isactive"' : '').'><a href="'.get_link('register/').'">'.__('Register').'</a></li>';
+            $links[] = '<li id="navlogin"'.((FEATHER_ACTIVE_PAGE == 'login') ? ' class="isactive"' : '').'><a href="'.get_link('login/').'">'.__('Login').'</a></li>';
         } else {
-            $links[] = '<li id="navprofile"'.((FEATHER_ACTIVE_PAGE == 'profile') ? ' class="isactive"' : '').'><a href="'.get_link('user/'.$this->user->id.'/').'">'.$lang_common['Profile'].'</a></li>';
+            $links[] = '<li id="navprofile"'.((FEATHER_ACTIVE_PAGE == 'profile') ? ' class="isactive"' : '').'><a href="'.get_link('user/'.$this->user->id.'/').'">'.__('Profile').'</a></li>';
 
             if ($this->user->is_admmod) {
-                $links[] = '<li id="navadmin"'.((FEATHER_ACTIVE_PAGE == 'admin') ? ' class="isactive"' : '').'><a href="'.get_link('admin/').'">'.$lang_common['Admin'].'</a></li>';
+                $links[] = '<li id="navadmin"'.((FEATHER_ACTIVE_PAGE == 'admin') ? ' class="isactive"' : '').'><a href="'.get_link('admin/').'">'.__('Admin').'</a></li>';
             }
 
-            $links[] = '<li id="navlogout"><a href="'.get_link('logout/id/'.$this->user->id.'/token/'.feather_hash($this->user->id.feather_hash(get_remote_address()))).'/">'.$lang_common['Logout'].'</a></li>';
+            $links[] = '<li id="navlogout"><a href="'.get_link('logout/id/'.$this->user->id.'/token/'.feather_hash($this->user->id.feather_hash(get_remote_address()))).'/">'.__('Logout').'</a></li>';
         }
 
         // Are there any additional navlinks we should insert into the array before imploding it?
@@ -136,33 +134,33 @@ public function display()
         $page_statusinfo = $page_topicsearches = array();
 
         if ($this->user->is_guest) {
-            $page_statusinfo = '<p class="conl">'.$lang_common['Not logged in'].'</p>';
+            $page_statusinfo = '<p class="conl">'.__('Not logged in').'</p>';
         } else {
-            $page_statusinfo[] = '<li><span>'.$lang_common['Logged in as'].' <strong>'.feather_escape($this->user->username).'</strong></span></li>';
-            $page_statusinfo[] = '<li><span>'.sprintf($lang_common['Last visit'], format_time($this->user->last_visit)).'</span></li>';
+            $page_statusinfo[] = '<li><span>'.__('Logged in as').' <strong>'.feather_escape($this->user->username).'</strong></span></li>';
+            $page_statusinfo[] = '<li><span>'.sprintf(__('Last visit'), format_time($this->user->last_visit)).'</span></li>';
 
             if ($this->user->is_admmod) {
                 if ($this->config['o_report_method'] == '0' || $this->config['o_report_method'] == '2') {
                     if ($this->model->get_reports()) {
-                        $page_statusinfo[] = '<li class="reportlink"><span><strong><a href="'.get_link('admin/reports/').'">'.$lang_common['New reports'].'</a></strong></span></li>';
+                        $page_statusinfo[] = '<li class="reportlink"><span><strong><a href="'.get_link('admin/reports/').'">'.__('New reports').'</a></strong></span></li>';
                     }
                 }
 
                 if ($this->config['o_maintenance'] == '1') {
-                    $page_statusinfo[] = '<li class="maintenancelink"><span><strong><a href="'.get_link('admin/maintenance/').'">'.$lang_common['Maintenance mode enabled'].'</a></strong></span></li>';
+                    $page_statusinfo[] = '<li class="maintenancelink"><span><strong><a href="'.get_link('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>';
                 }
             }
 
             if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-                $page_topicsearches[] = '<a href="'.get_link('search/show/replies/').'" title="'.$lang_common['Show posted topics'].'">'.$lang_common['Posted topics'].'</a>';
-                $page_topicsearches[] = '<a href="'.get_link('search/show/new/').'" title="'.$lang_common['Show new posts'].'">'.$lang_common['New posts header'].'</a>';
+                $page_topicsearches[] = '<a href="'.get_link('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a>';
+                $page_topicsearches[] = '<a href="'.get_link('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a>';
             }
         }
 
         // Quick searches
         if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-            $page_topicsearches[] = '<a href="'.get_link('search/show/recent/').'" title="'.$lang_common['Show active topics'].'">'.$lang_common['Active topics'].'</a>';
-            $page_topicsearches[] = '<a href="'.get_link('search/show/unanswered/').'" title="'.$lang_common['Show unanswered topics'].'">'.$lang_common['Unanswered topics'].'</a>';
+            $page_topicsearches[] = '<a href="'.get_link('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a>';
+            $page_topicsearches[] = '<a href="'.get_link('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
         }
 
 
@@ -181,7 +179,7 @@ public function display()
         // Generate quicklinks
         if (!empty($page_topicsearches)) {
             $page_info .= "\n\t\t\t".'<ul class="conr">';
-            $page_info .= "\n\t\t\t\t".'<li><span>'.$lang_common['Topic searches'].' '.implode(' | ', $page_topicsearches).'</span></li>';
+            $page_info .= "\n\t\t\t\t".'<li><span>'.__('Topic searches').' '.implode(' | ', $page_topicsearches).'</span></li>';
             $page_info .= "\n\t\t\t".'</ul>';
         }
 
@@ -207,7 +205,6 @@ public function display()
         $this->required_fields = isset($this->required_fields) ? $this->required_fields : null;
 
         $this->feather->render('header.php', array(
-                'lang_common' => $lang_common,
                 'page_title' => $this->title,
                 'focus_element' => $this->focus_element,
                 'p' => $this->page,
diff --git a/controller/help.php b/controller/help.php
index 7cdff2af..3add1eb0 100644
--- a/controller/help.php
+++ b/controller/help.php
@@ -20,6 +20,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/help.mo');
     }
 
     public function __autoload($class_name)
@@ -29,28 +30,17 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common;
-
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
-
-        // Load the help.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/help.php';
-
-
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_help['Help']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Help'));
 
         define('FEATHER_ACTIVE_PAGE', 'help');
 
         $this->header->setTitle($page_title)->display();
 
-        $this->feather->render('help.php', array(
-                            'lang_help' => $lang_help,
-                            'lang_common' => $lang_common,
-                            )
-                    );
+        $this->feather->render('help.php');
 
         $this->footer->display();
     }
diff --git a/controller/index.php b/controller/index.php
index 4e4f750c..b94aed63 100644
--- a/controller/index.php
+++ b/controller/index.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\index();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/index.mo');
     }
     
     public function __autoload($class_name)
@@ -30,15 +31,10 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common;
-
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
-        // Load the index.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/index.php';
-
         $page_title = array(feather_escape($this->config['o_board_title']));
         define('FEATHER_ALLOW_INDEX', 1);
 
@@ -48,8 +44,6 @@ public function display()
 
         $this->feather->render('index.php', array(
                             'index_data' => $this->model->print_categories_forums(),
-                            'lang_common' => $lang_common,
-                            'lang_index' => $lang_index,
                             'stats' => $this->model->collect_stats(),
                             'feather_config' => $this->config,
                             'online'    =>    $this->model->fetch_users_online(),
diff --git a/controller/login.php b/controller/login.php
index 828a2914..277e6378 100644
--- a/controller/login.php
+++ b/controller/login.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\login();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/login.mo');
     }
 
     public function __autoload($class_name)
@@ -30,21 +31,16 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common;
-
         if (!$this->user->is_guest) {
             header('Location: '.get_base_url());
             exit;
         }
 
-        // Load the login.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/login.php';
-
         // TODO?: Try to determine if the data in HTTP_REFERER is valid (if not, we redirect to index.php after login)
         $redirect_url = $this->model->get_redirect_url($_SERVER);
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Login']);
-        $required_fields = array('req_username' => $lang_common['Username'], 'req_password' => $lang_common['Password']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Login'));
+        $required_fields = array('req_username' => __('Username'), 'req_password' => __('Password'));
         $focus_element = array('login', 'req_username');
 
         define('FEATHER_ACTIVE_PAGE', 'login');
@@ -52,8 +48,6 @@ public function display()
         $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         $this->feather->render('login/form.php', array(
-                            'lang_common' => $lang_common,
-                            'lang_login' => $lang_login,
                             'redirect_url'    =>    $redirect_url,
                             )
                     );
@@ -63,8 +57,6 @@ public function display()
 
     public function logmein()
     {
-        global $lang_common, $lang_login;
-
         define('FEATHER_QUIET_VISIT', 1);
 
         if (!$this->user->is_guest) {
@@ -72,28 +64,18 @@ public function logmein()
             exit;
         }
 
-        // Load the login.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/login.php';
-
         $this->model->login();
     }
 
     public function logmeout($id, $token)
     {
-        global $lang_common;
-
         define('FEATHER_QUIET_VISIT', 1);
 
-        // Load the login.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/login.php';
-
         $this->model->logout($id, $token);
     }
 
     public function forget()
     {
-        global $lang_common, $lang_login;
-
         define('FEATHER_QUIET_VISIT', 1);
 
         if (!$this->user->is_guest) {
@@ -101,13 +83,10 @@ public function forget()
             exit;
         }
 
-        // Load the login.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/login.php';
-
         $errors = $this->model->password_forgotten();
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_login['Request pass']);
-        $required_fields = array('req_email' => $lang_common['Email']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Request pass'));
+        $required_fields = array('req_email' => __('Email'));
         $focus_element = array('request_pass', 'req_email');
 
         define('FEATHER_ACTIVE_PAGE', 'login');
@@ -116,8 +95,6 @@ public function forget()
 
         $this->feather->render('login/password_forgotten.php', array(
                             'errors'    =>    $errors,
-                            'lang_login'    =>    $lang_login,
-                            'lang_common'    =>    $lang_common,
                             )
                     );
 
diff --git a/controller/misc.php b/controller/misc.php
index 39543856..7ecadf0a 100644
--- a/controller/misc.php
+++ b/controller/misc.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\misc();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/misc.mo');
     }
 
     public function __autoload($class_name)
@@ -30,21 +32,17 @@ public function __autoload($class_name)
     
     public function rules()
     {
-        global $lang_common;
-
         if ($this->config['o_rules'] == '0' || ($this->user->is_guest && $this->user->g_read_board == '0' && $this->config['o_regs_allow'] == '0')) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
-        // Load the register.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/register.php';
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Forum rules'));
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_register['Forum rules']);
+        $this->header->setTitle($page_title)->display();
 
         define('FEATHER_ACTIVE_PAGE', 'rules');
 
         $this->feather->render('misc/rules.php', array(
-                'lang_register' => $lang_register,
                 'feather_config' => $this->config,
                 )
         );
@@ -54,47 +52,35 @@ public function rules()
 
     public function markread()
     {
-        global $lang_common;
-
         if ($this->user->is_guest) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         $this->model->update_last_visit();
 
         // Reset tracked topics
         set_tracked_topics(null);
 
-        redirect(get_base_url(), $lang_misc['Mark read redirect']);
+        redirect(get_base_url(), __('Mark read redirect'));
     }
 
     public function markforumread($id)
     {
-        global $lang_common;
-
         if ($this->user->is_guest) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         $tracked_topics = get_tracked_topics();
         $tracked_topics['forums'][$id] = time();
         set_tracked_topics($tracked_topics);
 
-        redirect(get_link('forum/'.$id.'/'), $lang_misc['Mark forum read redirect']);
+        redirect(get_link('forum/'.$id.'/'), __('Mark forum read redirect'));
     }
 
     public function subscribeforum($id)
     {
-        global $lang_common, $lang_misc;
-
         if ($this->user->is_guest) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the misc.php language file
@@ -105,10 +91,8 @@ public function subscribeforum($id)
 
     public function subscribetopic($id)
     {
-        global $lang_common, $lang_misc;
-
         if ($this->user->is_guest) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the misc.php language file
@@ -119,10 +103,8 @@ public function subscribetopic($id)
 
     public function unsubscribeforum($id)
     {
-        global $lang_common, $lang_misc;
-
         if ($this->user->is_guest) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the misc.php language file
@@ -133,10 +115,8 @@ public function unsubscribeforum($id)
 
     public function unsubscribetopic($id)
     {
-        global $lang_common, $lang_misc;
-
         if ($this->user->is_guest) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Load the misc.php language file
@@ -147,14 +127,12 @@ public function unsubscribetopic($id)
 
     public function email($id)
     {
-        global $lang_common;
-
         if ($this->user->is_guest || $this->user->g_send_email == '0') {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         if ($id < 2) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Load the misc.php language file
@@ -163,7 +141,7 @@ public function email($id)
         $mail = $this->model->get_info_mail($id);
 
         if ($mail['email_setting'] == 2 && !$this->user->is_admmod) {
-            message($lang_misc['Form email disabled']);
+            message(__('Form email disabled'));
         }
 
 
@@ -171,8 +149,8 @@ public function email($id)
             $this->model->send_email($mail, $id);
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Send email to'].' '.feather_escape($mail['recipient']));
-        $required_fields = array('req_subject' => $lang_misc['Email subject'], 'req_message' => $lang_misc['Email message']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Send email to').' '.feather_escape($mail['recipient']));
+        $required_fields = array('req_subject' => __('Email subject'), 'req_message' => __('Email message'));
         $focus_element = array('email', 'req_subject');
 
         define('FEATHER_ACTIVE_PAGE', 'email');
@@ -180,7 +158,6 @@ public function email($id)
         $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         $this->feather->render('misc/email.php', array(
-                'lang_misc' => $lang_misc,
                 'id' => $id,
                 'mail' => $mail,
                 )
@@ -191,15 +168,10 @@ public function email($id)
 
     public function report($id)
     {
-        global $lang_common;
-
         if ($this->user->is_guest) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         if ($this->feather->request()->isPost()) {
             $this->model->insert_report($id);
         }
@@ -211,8 +183,8 @@ public function report($id)
             $cur_post['subject'] = censor_words($cur_post['subject']);
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Report post']);
-        $required_fields = array('req_reason' => $lang_misc['Reason']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Report post'));
+        $required_fields = array('req_reason' => __('Reason'));
         $focus_element = array('report', 'req_reason');
 
         define('FEATHER_ACTIVE_PAGE', 'report');
@@ -220,9 +192,7 @@ public function report($id)
         $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         $this->feather->render('misc/report.php', array(
-                'lang_misc' => $lang_misc,
                 'id' => $id,
-                'lang_common' => $lang_common,
                 'cur_post' => $cur_post,
                 )
         );
diff --git a/controller/moderate.php b/controller/moderate.php
index d258d2da..541b3de7 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -21,6 +21,9 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\moderate();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/topic.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/misc.mo');
     }
 
     public function __autoload($class_name)
@@ -30,22 +33,17 @@ public function __autoload($class_name)
     
     public function gethostpost($pid)
     {
-        global $lang_common;
-
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Load the viewforum.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         // This particular function doesn't require forum-based moderator access. It can be used
         // by all moderators and admins
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         $this->model->display_ip_address_post($pid);
@@ -53,22 +51,17 @@ public function gethostpost($pid)
 
     public function gethostip($ip)
     {
-        global $lang_common;
-
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Load the viewforum.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         // This particular function doesn't require forum-based moderator access. It can be used
         // by all moderators and admins
         if (!$this->user->is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         $this->model->display_ip_info($ip);
@@ -76,23 +69,18 @@ public function gethostip($ip)
 
     public function moderatetopic($id = null, $fid = null, $action = null, $param = null)
     {
-        global $lang_common, $lang_topic, $lang_misc;
-
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Load the viewforum.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         // This particular function doesn't require forum-based moderator access. It can be used
         // by all moderators and admins
         if ($action == 'get_host') {
             if (!$this->user->is_admmod) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $this->model->display_ip_address();
@@ -103,7 +91,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         $url_subject = url_friendly($this->model->get_subject_tid($id));
@@ -116,7 +104,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                message($lang_misc['No topics selected']);
+                message(__('No topics selected'));
             }
 
             $topics = implode(',', array_map('intval', array_keys($topics)));
@@ -124,7 +112,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -134,8 +122,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                     'action'    =>    'multi',
                     'id'    =>    $fid,
                     'topics'    =>    $topics,
-                    'lang_misc'    =>    $lang_misc,
-                    'lang_common'    =>    $lang_common,
                     'list_forums'   => $this->model->get_forum_list_move($fid),
                 )
             );
@@ -149,7 +135,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $this->model->stick_topic($id, $fid);
  
-            redirect(get_link('topic/'.$id.'/'), $lang_misc['Stick topic redirect']);
+            redirect(get_link('topic/'.$id.'/'), __('Stick topic redirect'));
         }
 
 
@@ -159,7 +145,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $this->model->unstick_topic($id, $fid);
 
-            redirect(get_link('topic/'.$id.'/'), $lang_misc['Unstick topic redirect']);
+            redirect(get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
         }
 
         // Open a topic
@@ -168,7 +154,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             
             $this->model->open_topic($id, $fid);
 
-            redirect(get_link('topic/'.$id.'/'), $lang_misc['Unstick topic redirect']);
+            redirect(get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
         }
 
         // Close a topic
@@ -177,7 +163,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $this->model->close_topic($id, $fid);
 
-            redirect(get_link('topic/'.$id.'/'), $lang_misc['Unstick topic redirect']);
+            redirect(get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
         }
 
         $cur_topic = $this->model->get_topic_info($fid, $id);
@@ -194,7 +180,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -204,8 +190,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                         'action'    =>    'single',
                         'id'    =>    $id,
                         'topics'    =>    $id,
-                        'lang_misc'    =>    $lang_misc,
-                        'lang_common'    =>    $lang_common,
                         'list_forums'   => $this->model->get_forum_list_move($fid),
                         )
                 );
@@ -220,15 +204,13 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 if ($this->request->post('delete_posts') || $this->request->post('delete_posts_comply')) {
                     $posts = $this->model->delete_posts($id, $fid, $p);
 
-                    $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
+                    $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
                     define('FEATHER_ACTIVE_PAGE', 'moderate');
 
                     $this->header->setTitle($page_title)->setPage($p)->display();
 
                     $this->feather->render('moderate/delete_posts.php', array(
-                        'lang_common' => $lang_common,
-                        'lang_misc' => $lang_misc,
                         'id' => $id,
                         'posts' => $posts,
                         )
@@ -239,7 +221,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             if ($this->request->post('split_posts') || $this->request->post('split_posts_comply')) {
                 $posts = $this->model->split_posts($id, $fid, $p);
 
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
                 $focus_element = array('subject','new_subject');
 
                 define('FEATHER_ACTIVE_PAGE', 'moderate');
@@ -247,8 +229,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 $this->header->setTitle($page_title)->setPage($p)->setFocusElement($focus_element)->display();
 
                 $this->feather->render('moderate/split_posts.php', array(
-                        'lang_common' => $lang_common,
-                        'lang_misc' => $lang_misc,
                         'id' => $id,
                         'posts' => $posts,
                         'list_forums' => $this->model->get_forum_list_split($id),
@@ -260,9 +240,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
                 // Show the moderate posts view
 
-                // Load the viewtopic.php language file
-                require FEATHER_ROOT.'lang/'.$this->user->language.'/topic.php';
-
                 // Used to disable the Move and Delete buttons if there are no replies to this topic
                 $button_status = ($cur_topic['num_replies'] == 0) ? ' disabled="disabled"' : '';
 
@@ -271,7 +248,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 }*/
 
                 // Generate paging links
-                $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/#');
+                $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/#');
 
             if ($this->config['o_censoring'] == '1') {
                 $cur_topic['subject'] = censor_words($cur_topic['subject']);
@@ -284,9 +261,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
 
             $this->feather->render('moderate/posts_view.php', array(
-                        'lang_common' => $lang_common,
-                        'lang_topic' => $lang_topic,
-                        'lang_misc' => $lang_misc,
                         'cur_topic' => $cur_topic,
                         'url_topic' => url_friendly($cur_topic['subject']),
                         'url_forum' => url_friendly($cur_topic['forum_name']),
@@ -305,24 +279,19 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
     public function display($id, $name = null, $page = null)
     {
-        global $lang_common, $lang_forum, $lang_misc;
-
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Load the viewforum.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         // Make sure that only admmods allowed access this page
         $moderators = $this->model->get_moderators($id);
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Fetch some info about the forum
@@ -330,7 +299,7 @@ public function display($id, $name = null, $page = null)
 
         // Is this a redirect forum? In that case, abort!
         if ($cur_forum['redirect_url'] != '') {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $sort_by = $this->model->forum_sort_by($cur_forum['sort_by']);
@@ -343,7 +312,7 @@ public function display($id, $name = null, $page = null)
         $url_forum = url_friendly($cur_forum['forum_name']);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'moderate/forum/'.$id.'/#');
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/forum/'.$id.'/#');
 
         $page_title = array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name']));
 
@@ -352,15 +321,12 @@ public function display($id, $name = null, $page = null)
         $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
 
         $this->feather->render('moderate/moderator_forum.php', array(
-                            'lang_common' => $lang_common,
-                            'lang_misc' => $lang_misc,
                             'id' => $id,
                             'p' => $p,
                             'url_forum' => $url_forum,
                             'cur_forum' => $cur_forum,
                             'paging_links' => $paging_links,
                             'feather_config' => $this->config,
-                            'lang_forum' => $lang_forum,
                             'topic_data' => $this->model->display_topics($id, $sort_by, $start_from),
                             'start_from' => $start_from,
                             )
@@ -371,24 +337,19 @@ public function display($id, $name = null, $page = null)
 
     public function dealposts($fid)
     {
-        global $lang_common, $lang_forum, $lang_topic, $lang_misc;
-
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         // Load the viewforum.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         // Make sure that only admmods allowed access this page
         $moderators = $this->model->get_moderators($fid);
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Move one or more topics
@@ -399,7 +360,7 @@ public function dealposts($fid)
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                message($lang_misc['No topics selected']);
+                message(__('No topics selected'));
             }
 
             $topics = implode(',', array_map('intval', array_keys($topics)));
@@ -407,7 +368,7 @@ public function dealposts($fid)
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -417,8 +378,6 @@ public function dealposts($fid)
                         'action'    =>    'multi',
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
-                        'lang_misc'    =>    $lang_misc,
-                        'lang_common'    =>    $lang_common,
                         'list_forums'   => $this->model->get_forum_list_move($fid),
                         )
                 );
@@ -434,10 +393,10 @@ public function dealposts($fid)
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (count($topics) < 2) {
-                message($lang_misc['Not enough topics selected']);
+                message(__('Not enough topics selected'));
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -446,8 +405,6 @@ public function dealposts($fid)
             $this->feather->render('moderate/merge_topics.php', array(
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
-                        'lang_misc'    =>    $lang_misc,
-                        'lang_common'    =>    $lang_common,
                         )
                 );
 
@@ -458,14 +415,14 @@ public function dealposts($fid)
         elseif ($this->request->post('delete_topics') || $this->request->post('delete_topics_comply')) {
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                message($lang_misc['No topics selected']);
+                message(__('No topics selected'));
             }
 
             if ($this->request->post('delete_topics_comply')) {
                 $this->model->delete_topics($topics, $fid);
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -474,8 +431,6 @@ public function dealposts($fid)
             $this->feather->render('moderate/delete_topics.php', array(
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
-                        'lang_misc'    =>    $lang_misc,
-                        'lang_common'    =>    $lang_common,
                         )
                 );
 
@@ -491,12 +446,12 @@ public function dealposts($fid)
             if ($this->request->post('open') || $this->request->post('close')) {
                 $topics = $this->request->post('topics') ? @array_map('intval', @array_keys($this->request->post('topics'))) : array();
                 if (empty($topics)) {
-                    message($lang_misc['No topics selected']);
+                    message(__('No topics selected'));
                 }
 
                 $this->model->close_multiple_topics($action, $topics, $fid);
 
-                $redirect_msg = ($action) ? $lang_misc['Close topics redirect'] : $lang_misc['Open topics redirect'];
+                $redirect_msg = ($action) ? __('Close topics redirect') : __('Open topics redirect');
                 redirect(get_link('moderate/forum/'.$fid.'/'), $redirect_msg);
             }
         }
diff --git a/controller/post.php b/controller/post.php
index cb64d507..99616fa1 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -21,6 +21,9 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\post();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.mo');
     }
 
     public function __autoload($class_name)
@@ -30,32 +33,20 @@ public function __autoload($class_name)
 
     public function newreply($fid = null, $tid = null, $qid = null)
     {
-        self::newpost('', $fid, $tid);
+        $this->newpost('', $fid, $tid);
     }
 
     public function newpost($fid = null, $tid = null, $qid = null)
     {
-        global $lang_common, $lang_prof_reg, $lang_antispam_questions, $lang_antispam, $lang_post, $lang_register, $lang_bbeditor;
-
-        // Load the register.php/profile.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
-
-        // Load the register.php/profile.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/register.php';
-        
-        // Load the bbeditor.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.php';
+        global $lang_antispam_questions, $lang_antispam;
 
         // Antispam feature
         require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
-        // BBcode toolbar feature
-        require FEATHER_ROOT.'lang/'.$this->user['language'].'/bbeditor.php';
-
         // If $_POST['username'] is filled, we are facing a bot
         if ($this->request->post('username')) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Fetch some info about the topic and/or the forum
@@ -65,7 +56,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // Is someone trying to post into a redirect forum?
         if ($cur_posting['redirect_url'] != '') {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
@@ -77,12 +68,9 @@ public function newpost($fid = null, $tid = null, $qid = null)
                 ($fid && (($cur_posting['post_topics'] == '' && $this->user->g_post_topics == '0') || $cur_posting['post_topics'] == '0')) ||
                 (isset($cur_posting['closed']) && $cur_posting['closed'] == '1')) &&
                 !$is_admmod) {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
-        // Load the post.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/post.php';
-
         // Start with a clean slate
         $errors = array();
 
@@ -91,7 +79,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
         if (!$this->user->is_guest) {
             $focus_element[] = ($fid) ? 'req_subject' : 'req_message';
         } else {
-            $required_fields['req_username'] = $lang_post['Guest name'];
+            $required_fields['req_username'] = __('Guest name');
             $focus_element[] = 'req_username';
         }
 
@@ -152,7 +140,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             $this->model->increment_post_count($post, $new['tid']);
                         }
 
-                    redirect(get_link('post/'.$new['pid'].'/#p'.$new['pid']), $lang_post['Post redirect']);
+                    redirect(get_link('post/'.$new['pid'].'/#p'.$new['pid']), __('Post redirect'));
                 }
         }
 
@@ -160,7 +148,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // If a topic ID was specified in the url (it's a reply)
         if ($tid) {
-            $action = $lang_post['Post a reply'];
+            $action = __('Post a reply');
             $form = '<form id="post" method="post" action="'.get_link('post/reply/'.$tid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
 
                 // If a quote ID was specified in the url
@@ -171,10 +159,10 @@ public function newpost($fid = null, $tid = null, $qid = null)
         }
         // If a forum ID was specified in the url (new topic)
         elseif ($fid) {
-            $action = $lang_post['Post new topic'];
+            $action = __('Post new topic');
             $form = '<form id="post" method="post" action="'.get_link('post/new-topic/'.$fid.'/').'" onsubmit="return process_form(this)">';
         } else {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $url_forum = url_friendly($cur_posting['forum_name']);
@@ -188,9 +176,9 @@ public function newpost($fid = null, $tid = null, $qid = null)
         }
 
         $page_title = array(feather_escape($this->config['o_board_title']), $action);
-        $required_fields = array('req_email' => $lang_common['Email'], 'req_subject' => $lang_common['Subject'], 'req_message' => $lang_common['Message']);
+        $required_fields = array('req_email' => __('Email'), 'req_subject' => __('Subject'), 'req_message' => __('Message'));
         if ($this->user->is_guest) {
-            $required_fields['captcha'] = $lang_antispam['Robot title'];
+            $required_fields['captcha'] = __('Robot title');
         }
         $focus_element = array('post');
 
@@ -215,11 +203,8 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             'feather_config' => $this->config,
                             'feather_user' => $this->user,
                             'cur_posting' => $cur_posting,
-                            'lang_common' => $lang_common,
-                            'lang_post' => $lang_post,
                             'lang_antispam' => $lang_antispam,
                             'lang_antispam_questions' => $lang_antispam_questions,
-                            'lang_bbeditor' => $lang_bbeditor,
                             'index_questions' => $index_questions,
                             'checkboxes' => $checkboxes,
                             'cur_posting' => $cur_posting,
@@ -231,7 +216,6 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             'url_topic' => $url_topic,
                             'quote' => $quote,
                             'errors'    =>    $errors,
-                            'lang_bbeditor' => $lang_bbeditor,
                             )
                     );
 
diff --git a/controller/profile.php b/controller/profile.php
index 3abb7e51..7c47382e 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\profile();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/profile.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
     }
 
     public function __autoload($class_name)
@@ -30,54 +32,46 @@ public function __autoload($class_name)
     
     public function display($id, $section = null)
     {
-        global $lang_common, $lang_prof_reg, $lang_profile, $pd, $forum_time_formats, $forum_date_formats;
+        global $lang_profile, $pd, $forum_time_formats, $forum_date_formats;
 
         // Include UTF-8 function
         require FEATHER_ROOT.'include/utf8/substr_replace.php';
         require FEATHER_ROOT.'include/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
         require FEATHER_ROOT.'include/utf8/strcasecmp.php';
 
-        // Load the prof_reg.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
-
-        // Load the profile.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/profile.php';
-
         if ($this->request->post('update_group_membership')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $this->model->update_group_membership($id, $this->feather);
         } elseif ($this->request->post('update_forums')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $this->model->update_mod_forums($id, $this->feather);
         } elseif ($this->request->post('ban')) {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $this->model->ban_user($id);
         } elseif ($this->request->post('delete_user') || $this->request->post('delete_user_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $this->model->delete_user($id, $this->feather);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Confirm delete user']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Confirm delete user'));
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
 
             $this->header->setTitle($page_title)->display();
 
             $this->feather->render('profile/delete_user.php', array(
-                                    'lang_common' => $lang_common,
                                     'username' => $this->model->get_username($id),
-                                    'lang_profile' => $lang_profile,
                                     'id' => $id,
                                     )
                             );
@@ -95,7 +89,7 @@ public function display($id, $section = null)
                                     ($this->user->g_mod_edit_users == '0' ||                         // mods aren't allowed to edit users
                                     $info['group_id'] == FEATHER_ADMIN ||                            // or the user is an admin
                                     $info['is_moderator'])))) {                                      // or the user is another mod
-                                    message($lang_common['No permission'], '403');
+                                    message(__('No permission'), '403');
             }
 
             $this->model->update_profile($id, $info, $section, $this->feather);
@@ -120,7 +114,7 @@ public function display($id, $section = null)
             // or the user is another mod
                 $user_info = $this->model->parse_user_info($user);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), sprintf($lang_profile['Users profile'], feather_escape($user['username'])));
+            $page_title = array(feather_escape($this->config['o_board_title']), sprintf(__('Users profile'), feather_escape($user['username'])));
             define('FEATHER_ALLOW_INDEX', 1);
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
@@ -128,8 +122,6 @@ public function display($id, $section = null)
             $this->header->setTitle($page_title)->display();
 
             $this->feather->render('profile/view_profile.php', array(
-                        'lang_common' => $lang_common,
-                        'lang_profile' => $lang_profile,
                         'user_info' => $user_info,
                         )
                 );
@@ -139,8 +131,8 @@ public function display($id, $section = null)
             if (!$section || $section == 'essentials') {
                 $user_disp = $this->model->edit_essentials($id, $user);
 
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section essentials']);
-                $required_fields = array('req_username' => $lang_common['Username'], 'req_email' => $lang_common['Email']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section essentials'));
+                $required_fields = array('req_username' => __('Username'), 'req_email' => __('Email'));
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -149,9 +141,6 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('essentials', $id);
 
                 $this->feather->render('profile/section_essentials.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_profile' => $lang_profile,
-                                'lang_prof_reg' => $lang_prof_reg,
                                 'feather' => $this->feather,
                                 'id' => $id,
                                 'user' => $user,
@@ -162,10 +151,10 @@ public function display($id, $section = null)
                         );
             } elseif ($section == 'personal') {
                 if ($this->user->g_set_title == '1') {
-                    $title_field = '<label>'.$lang_common['Title'].' <em>('.$lang_profile['Leave blank'].')</em><br /><input type="text" name="title" value="'.feather_escape($user['title']).'" size="30" maxlength="50" /><br /></label>'."\n";
+                    $title_field = '<label>'.__('Title').' <em>('.__('Leave blank').')</em><br /><input type="text" name="title" value="'.feather_escape($user['title']).'" size="30" maxlength="50" /><br /></label>'."\n";
                 }
 
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section personal']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personal'));
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -174,15 +163,13 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('personal', $id);
 
                 $this->feather->render('profile/section_personal.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 'feather' => $this->feather,
                                 )
                         );
                 
             } elseif ($section == 'messaging') {
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section messaging']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section messaging'));
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -191,33 +178,31 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('messaging', $id);
 
                 $this->feather->render('profile/section_messaging.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 )
                         );
                 
             } elseif ($section == 'personality') {
                 if ($this->config['o_avatars'] == '0' && $this->config['o_signatures'] == '0') {
-                    message($lang_common['Bad request'], '404');
+                    message(__('Bad request'), '404');
                 }
 
-                $avatar_field = '<span><a href="'.get_link('user/'.$id.'/action/upload_avatar/').'">'.$lang_profile['Change avatar'].'</a></span>';
+                $avatar_field = '<span><a href="'.get_link('user/'.$id.'/action/upload_avatar/').'">'.__('Change avatar').'</a></span>';
 
                 $user_avatar = generate_avatar_markup($id);
                 if ($user_avatar) {
-                    $avatar_field .= ' <span><a href="'.get_link('user/'.$id.'/action/delete_avatar/').'">'.$lang_profile['Delete avatar'].'</a></span>';
+                    $avatar_field .= ' <span><a href="'.get_link('user/'.$id.'/action/delete_avatar/').'">'.__('Delete avatar').'</a></span>';
                 } else {
-                    $avatar_field = '<span><a href="'.get_link('user/'.$id.'/action/upload_avatar/').'">'.$lang_profile['Upload avatar'].'</a></span>';
+                    $avatar_field = '<span><a href="'.get_link('user/'.$id.'/action/upload_avatar/').'">'.__('Upload avatar').'</a></span>';
                 }
 
                 if ($user['signature'] != '') {
-                    $signature_preview = '<p>'.$lang_profile['Sig preview'].'</p>'."\n\t\t\t\t\t\t\t".'<div class="postsignature postmsg">'."\n\t\t\t\t\t\t\t\t".'<hr />'."\n\t\t\t\t\t\t\t\t".$parsed_signature."\n\t\t\t\t\t\t\t".'</div>'."\n";
+                    $signature_preview = '<p>'.__('Sig preview').'</p>'."\n\t\t\t\t\t\t\t".'<div class="postsignature postmsg">'."\n\t\t\t\t\t\t\t\t".'<hr />'."\n\t\t\t\t\t\t\t\t".$parsed_signature."\n\t\t\t\t\t\t\t".'</div>'."\n";
                 } else {
-                    $signature_preview = '<p>'.$lang_profile['No sig'].'</p>'."\n";
+                    $signature_preview = '<p>'.__('No sig').'</p>'."\n";
                 }
 
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section personality']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personality'));
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -226,8 +211,6 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('personality', $id);
 
                 $this->feather->render('profile/section_personality.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_profile' => $lang_profile,
                                 'user_avatar' => $user_avatar,
                                 'avatar_field' => $avatar_field,
                                 'signature_preview' => $signature_preview,
@@ -237,7 +220,7 @@ public function display($id, $section = null)
                         );
                 
             } elseif ($section == 'display') {
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section display']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section display'));
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -246,14 +229,12 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('display', $id);
 
                 $this->feather->render('profile/section_display.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 )
                         );
                 
             } elseif ($section == 'privacy') {
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section privacy']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section privacy'));
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -262,19 +243,16 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('privacy', $id);
 
                 $this->feather->render('profile/section_privacy.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_profile' => $lang_profile,
-                                'lang_prof_reg' => $lang_prof_reg,
                                 'user' => $user,
                                 )
                         );
                 
             } elseif ($section == 'admin') {
                 if (!$this->user->is_admmod || ($this->user->g_moderator == '1' && $this->user->g_mod_ban_users == '0')) {
-                    message($lang_common['Bad request'], false, '403 Forbidden');
+                    message(__('Bad request'), false, '403 Forbidden');
                 }
 
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section admin']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section admin'));
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -283,8 +261,6 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('admin', $id);
 
                 $this->feather->render('profile/section_admin.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 'forum_list' => $this->model->get_forum_list($id),
                                 'group_list' => $this->model->get_group_list($user),
@@ -293,7 +269,7 @@ public function display($id, $section = null)
                         );
                 
             } else {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             $this->footer->display();
@@ -302,32 +278,26 @@ public function display($id, $section = null)
 
     public function action($id, $action)
     {
-        global $lang_common, $lang_prof_reg, $lang_profile;
+        global $lang_profile;
 
         // Include UTF-8 function
         require FEATHER_ROOT.'include/utf8/substr_replace.php';
         require FEATHER_ROOT.'include/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
         require FEATHER_ROOT.'include/utf8/strcasecmp.php';
 
-        // Load the prof_reg.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
-
-        // Load the profile.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/profile.php';
-
         if ($action != 'change_pass' || !$this->request->get('key')) {
             if ($this->user->g_read_board == '0') {
-                message($lang_common['No view'], '403');
+                message(__('No view'), '403');
             } elseif ($this->user->g_view_users == '0' && ($this->user->is_guest || $this->user->id != $id)) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
         }
 
         if ($action == 'change_pass') {
             $this->model->change_pass($id, $this->feather);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Change pass']);
-            $required_fields = array('req_old_password' => $lang_profile['Old pass'], 'req_new_password1' => $lang_profile['New pass'], 'req_new_password2' => $lang_profile['Confirm new pass']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Change pass'));
+            $required_fields = array('req_old_password' => __('Old pass'), 'req_new_password1' => __('New pass'), 'req_new_password2' => __('Confirm new pass'));
             $focus_element = array('change_pass', ((!$this->user->is_admmod) ? 'req_old_password' : 'req_new_password1'));
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
@@ -335,9 +305,7 @@ public function action($id, $action)
             $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             $this->feather->render('profile/change_pass.php', array(
-                                    'lang_common' => $lang_common,
                                     'feather' => $this->feather,
-                                    'lang_profile' => $lang_profile,
                                     'id' => $id,
                                     )
                             );
@@ -346,8 +314,8 @@ public function action($id, $action)
         } elseif ($action == 'change_email') {
             $this->model->change_email($id, $this->feather);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Change email']);
-            $required_fields = array('req_new_email' => $lang_profile['New email'], 'req_password' => $lang_common['Password']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Change email'));
+            $required_fields = array('req_new_email' => __('New email'), 'req_password' => __('Password'));
             $focus_element = array('change_email', 'req_new_email');
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
@@ -355,8 +323,6 @@ public function action($id, $action)
             $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             $this->feather->render('profile/change_mail.php', array(
-                                    'lang_common' => $lang_common,
-                                    'lang_profile' => $lang_profile,
                                     'id' => $id,
                                     )
                             );
@@ -364,19 +330,19 @@ public function action($id, $action)
             $this->footer->display();
         } elseif ($action == 'upload_avatar' || $action == 'upload_avatar2') {
             if ($this->config['o_avatars'] == '0') {
-                message($lang_profile['Avatars disabled']);
+                message(__('Avatars disabled'));
             }
 
             if ($this->user->id != $id && !$this->user->is_admmod) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             if ($this->feather->request()->isPost()) {
                 $this->model->upload_avatar($id, $_FILES);
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Upload avatar']);
-            $required_fields = array('req_file' => $lang_profile['File']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Upload avatar'));
+            $required_fields = array('req_file' => __('File'));
             $focus_element = array('upload_avatar', 'req_file');
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
@@ -384,10 +350,7 @@ public function action($id, $action)
             $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             $this->feather->render('profile/upload_avatar.php', array(
-                                    'lang_common' => $lang_common,
-                                    'lang_profile' => $lang_profile,
                                     'feather_config' => $this->config,
-                                    'lang_profile' => $lang_profile,
                                     'id' => $id,
                                     )
                             );
@@ -396,22 +359,22 @@ public function action($id, $action)
             
         } elseif ($action == 'delete_avatar') {
             if ($this->user->id != $id && !$this->user->is_admmod) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             
 
             $this->model->delete_avatar($id);
 
-            redirect(get_link('user/'.$id.'/section/personality/'), $lang_profile['Avatar deleted redirect']);
+            redirect(get_link('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
         } elseif ($action == 'promote') {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_promote_users == '0')) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
 
             $this->model->promote_user($id, $this->feather);
         } else {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
     }
 }
diff --git a/controller/register.php b/controller/register.php
index 3ab047bc..691635c4 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -21,6 +21,9 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\register();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.mo');
     }
 
     public function __autoload($class_name)
@@ -30,19 +33,13 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_antispam_questions, $lang_antispam, $lang_register, $lang_prof_reg;
+        global $lang_antispam_questions, $lang_antispam;
 
         if (!$this->user->is_guest) {
             header('Location: '.get_base_url());
             exit;
         }
 
-        // Load the register.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/register.php';
-
-        // Load the register.php/profile.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
-
         // Antispam feature
         require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
@@ -50,11 +47,11 @@ public function display()
         // Display an error message if new registrations are disabled
         // If $_REQUEST['username'] or $_REQUEST['password'] are filled, we are facing a bot
         if ($this->config['o_regs_allow'] == '0' || $this->request->post('username') || $this->request->post('password')) {
-            message($lang_register['No new regs']);
+            message(__('No new regs'));
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_register['Register']);
-        $required_fields = array('req_user' => $lang_common['Username'], 'req_password1' => $lang_common['Password'], 'req_password2' => $lang_prof_reg['Confirm pass'], 'req_email1' => $lang_common['Email'], 'req_email2' => $lang_common['Email'].' 2', 'captcha' => $lang_antispam['Robot title']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Register'));
+        $required_fields = array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => __('Confirm pass'), 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => __('Robot title'));
         $focus_element = array('register', 'req_user');
 
         define('FEATHER_ACTIVE_PAGE', 'register');
@@ -78,9 +75,6 @@ public function display()
         $this->feather->render('register/form.php', array(
                             'errors' => $user['errors'],
                             'feather_config' => $this->config,
-                            'lang_register' => $lang_register,
-                            'lang_common' => $lang_common,
-                            'lang_prof_reg' => $lang_prof_reg,
                             'lang_antispam' => $lang_antispam,
                             'lang_antispam_questions'    =>    $lang_antispam_questions,
                             'index_questions'    =>    $index_questions,
@@ -100,9 +94,8 @@ public function cancel()
     }
 
     public function rules()
-    { // TODO: fix $_GET w/ URL rewriting
-
-        global $lang_common, $lang_login, $lang_register;
+    {
+        // TODO: fix $_GET w/ URL rewriting
 
         // If we are logged in, we shouldn't be here
         if (!$this->user->is_guest) {
@@ -112,27 +105,20 @@ public function rules()
 
         // Display an error message if new registrations are disabled
         if ($this->config['o_regs_allow'] == '0') {
-            message($lang_register['No new regs']);
+            message(__('No new regs'));
         }
 
-        // Load the register.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/register.php';
-
-        // Load the register.php/profile.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
-
         if ($this->config['o_rules'] != '1') {
             redirect(get_link('register/agree/'));
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_register['Register'], $lang_register['Forum rules']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Register'), __('Forum rules'));
 
         define('FEATHER_ACTIVE_PAGE', 'register');
 
         $this->header->setTitle($page_title)->display();
 
         $this->feather->render('register/rules.php', array(
-                            'lang_register'    =>    $lang_register,
                             'feather_config'    =>    $this->config,
                             )
                     );
diff --git a/controller/search.php b/controller/search.php
index 8cfda6d3..24672375 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -21,6 +21,9 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\search();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/search.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
     }
 
     public function __autoload($class_name)
@@ -30,16 +33,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common, $lang_search, $lang_forum, $lang_topic, $pd;
-
-        // Load the search.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/search.php';
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
+        global $pd;
 
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         } elseif ($this->user->g_search == '0') {
-            message($lang_search['No search permission'], false, '403 Forbidden');
+            message(__('No search permission'), false, '403 Forbidden');
         }
 
         require FEATHER_ROOT.'include/search_idx.php';
@@ -50,21 +49,18 @@ public function display()
 
                 // We have results to display
                 if (isset($search['is_result'])) {
-                    $page_title = array(feather_escape($this->config['o_board_title']), $lang_search['Search results']);
+                    $page_title = array(feather_escape($this->config['o_board_title']), __('Search results'));
 
                     define('FEATHER_ACTIVE_PAGE', 'search');
 
                     $this->header->setTitle($page_title)->display();
 
                     $this->feather->render('search/header.php', array(
-                                'lang_common' => $lang_common,
-                                'lang_search' => $lang_search,
                                 'search' => $search,
                                 )
                         );
 
                     if ($search['show_as'] == 'posts') {
-                        require FEATHER_ROOT.'lang/'.$this->user->language.'/topic.php';
                         require FEATHER_ROOT.'include/parser.php';
                     }
 
@@ -77,11 +73,11 @@ public function display()
 
                     $this->footer->display();
                 } else {
-                    message($lang_search['No hits']);
+                    message(__('No hits'));
                 }
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_search['Search']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Search'));
         $focus_element = array('search', 'keywords');
 
         define('FEATHER_ACTIVE_PAGE', 'search');
@@ -89,8 +85,6 @@ public function display()
         $this->header->setTitle($page_title)->setFocusElement($focus_element)->display();
 
         $this->feather->render('search/form.php', array(
-                            'lang_common' => $lang_common,
-                            'lang_search' => $lang_search,
                             'feather_config' => $this->config,
                             'feather' => $this->feather,
                             'forums' => $this->model->get_list_forums(),
diff --git a/controller/userlist.php b/controller/userlist.php
index 5fda0733..a22d849b 100644
--- a/controller/userlist.php
+++ b/controller/userlist.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\userlist();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/search.mo');
     }
 
     public function __autoload($class_name)
@@ -30,21 +32,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_common;
-
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         } elseif ($this->user->g_view_users == '0') {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
-        // Load the userlist.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.php';
-
-        // Load the search.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/search.php';
-
-
         // Determine if we are allowed to view post counts
         $show_post_count = ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) ? true : false;
 
@@ -61,13 +54,13 @@ public function display()
         $p = (!$this->request->get('p') || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
         $start_from = 50 * ($p - 1);
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['User list']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('User list'));
         if ($this->user->g_search_users == '1') {
             $focus_element = array('userlist', 'username');
         }
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
 
         define('FEATHER_ALLOW_INDEX', 1);
 
@@ -76,9 +69,6 @@ public function display()
         $this->header->setTitle($page_title)->setPage($p)->setFocusElement($focus_element)->setPagingLinks($paging_links)->display();
 
         $this->feather->render('userlist.php', array(
-                            'lang_common' => $lang_common,
-                            'lang_search' => $lang_search,
-                            'lang_ul' => $lang_ul,
                             'feather' => $this->feather,
                             'username' => $username,
                             'show_group' => $show_group,
diff --git a/controller/viewforum.php b/controller/viewforum.php
index a8802107..5b9d207a 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\viewforum();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
     }
 
     public function __autoload($class_name)
@@ -30,19 +31,14 @@ public function __autoload($class_name)
     
     public function display($id, $name = null, $page = null)
     {
-        global $lang_common, $lang_forum;
-
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
         if ($id < 1) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
-        // Load the viewforum.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
-
         // Fetch some informations about the forum
         $cur_forum = $this->model->get_info_forum($id);
 
@@ -60,7 +56,7 @@ public function display($id, $name = null, $page = null)
 
         // Can we or can we not post new topics?
         if (($cur_forum['post_topics'] == '' && $this->user->g_post_topics == '1') || $cur_forum['post_topics'] == '1' || $is_admmod) {
-            $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/new-topic/'.$id.'/').'">'.$lang_forum['Post topic'].'</a></p>'."\n";
+            $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/new-topic/'.$id.'/').'">'.__('Post topic').'</a></p>'."\n";
         } else {
             $post_link = '';
         }
@@ -73,7 +69,7 @@ public function display($id, $name = null, $page = null)
         $url_forum = url_friendly($cur_forum['forum_name']);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'forum/'.$id.'/'.$url_forum.'/#');
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'forum/'.$id.'/'.$url_forum.'/#');
 
         $forum_actions = $this->model->get_forum_actions($id, $this->config['o_forum_subscriptions'], $cur_forum['is_subscribed']);
 
@@ -90,8 +86,6 @@ public function display($id, $name = null, $page = null)
         $this->feather->render('viewforum.php', array(
                             'id' => $id,
                             'forum_data' => $this->model->print_topics($id, $sort_by, $start_from),
-                            'lang_common' => $lang_common,
-                            'lang_forum' => $lang_forum,
                             'cur_forum' => $cur_forum,
                             'paging_links' => $paging_links,
                             'post_link' => $post_link,
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index bbbefaa8..3cede850 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -21,6 +21,9 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\viewtopic();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.mo');
     }
 
     public function __autoload($class_name)
@@ -30,29 +33,20 @@ public function __autoload($class_name)
 
     public function display($id = null, $name = null, $page = null, $pid = null)
     {
-        global $lang_common, $lang_post, $lang_topic, $lang_bbeditor, $pd;
+        global $pd;
 
         if ($this->user->g_read_board == '0') {
-            message($lang_common['No view'], '403');
+            message(__('No view'), '403');
         }
 
-        // Load the viewtopic.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/topic.php';
-
-        // Load the post.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/post.php';
-
         // Antispam feature
         require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
-        // BBcode toolbar feature
-        require FEATHER_ROOT.'lang/'.$this->user['language'].'/bbeditor.php';
-
         // Load the viewtopic.php model file
         require_once FEATHER_ROOT.'model/viewtopic.php';
 
-        // Fetch some informations about the topic TODO
+        // Fetch some informations about the topic
         $cur_topic = $this->model->get_info_topic($id);
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
@@ -82,8 +76,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         $url_forum = url_friendly($cur_topic['forum_name']);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'topic/'.$id.'/'.$url_topic.'/#');
-
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'topic/'.$id.'/'.$url_topic.'/#');
 
         if ($this->config['o_censoring'] == '1') {
             $cur_topic['subject'] = censor_words($cur_topic['subject']);
@@ -103,18 +96,12 @@ public function display($id = null, $name = null, $page = null, $pid = null)
 
         $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->display();
 
-        $forum_id = $cur_topic['forum_id'];
-
         require FEATHER_ROOT.'include/parser.php';
 
         $this->feather->render('viewtopic.php', array(
                             'id' => $id,
                             'p' => $p,
                             'post_data' => $this->model->print_posts($id, $start_from, $cur_topic, $is_admmod),
-                            'lang_common' => $lang_common,
-                            'lang_topic' => $lang_topic,
-                            'lang_post' => $lang_post,
-                            'lang_bbeditor' => $lang_bbeditor,
                             'cur_topic'    =>    $cur_topic,
                             'subscraction'    =>    $subscraction,
                             'is_admmod'    =>    $is_admmod,
@@ -141,17 +128,13 @@ public function display($id = null, $name = null, $page = null, $pid = null)
 
     public function viewpost($pid)
     {
-        global $lang_common;
-
         $post = $this->model->redirect_to_post($pid);
 
-        return self::display($post['topic_id'], null, $post['get_p'], $pid);
+        return $this->display($post['topic_id'], null, $post['get_p'], $pid);
     }
 
     public function action($id, $action)
     {
-        global $lang_common;
-
         $this->model->handle_actions($id, $action);
     }
 }
diff --git a/extern.php b/extern.php
index f88c3107..06d17a61 100644
--- a/extern.php
+++ b/extern.php
@@ -70,6 +70,8 @@
 
 require FEATHER_ROOT.'include/common.php';
 
+load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/common.mo');
+
 // The length at which topic subjects will be truncated (for HTML output)
 if (!defined('FORUM_EXTERN_MAX_SUBJECT_LENGTH')) {
     define('FORUM_EXTERN_MAX_SUBJECT_LENGTH', 30);
@@ -128,7 +130,7 @@ function authenticate_user($user, $password, $password_is_hash = false)
 
 if ($feather->user->g_read_board == '0') {
     http_authenticate_user();
-    exit($lang_common['No view']);
+    exit(__('No view'));
 }
 
 $action = isset($_GET['action']) ? strtolower($_GET['action']) : 'feed';
@@ -167,7 +169,7 @@ function http_authenticate_user()
 //
 function output_rss($feed)
 {
-    global $lang_common, $feather_config;
+    global $feather_config;
 
     // Send XML/no cache headers
     header('Content-Type: application/xml; charset=utf-8');
@@ -212,7 +214,7 @@ function output_rss($feed)
 //
 function output_atom($feed)
 {
-    global $lang_common, $feather_config;
+    global $feather_config;
 
     // Send XML/no cache headers
     header('Content-Type: application/atom+xml; charset=utf-8');
@@ -270,7 +272,7 @@ function output_atom($feed)
 //
 function output_xml($feed)
 {
-    global $lang_common, $feather_config;
+    global $feather_config;
 
     // Send XML/no cache headers
     header('Content-Type: application/xml; charset=utf-8');
@@ -370,7 +372,7 @@ function output_html($feed)
 
         if (!$cur_topic) {
             http_authenticate_user();
-            exit($lang_common['Bad request']);
+            exit(__('Bad request'));
         }
 
         if ($feather_config['o_censoring'] == '1') {
@@ -379,9 +381,9 @@ function output_html($feed)
 
         // Setup the feed
         $feed = array(
-            'title'        =>    $feather_config['o_board_title'].$lang_common['Title separator'].$cur_topic['subject'],
+            'title'        =>    $feather_config['o_board_title'].__('Title separator').$cur_topic['subject'],
             'link'            =>    get_link('topic/'.$tid.'/'.url_friendly($cur_topic['subject']).'/'),
-            'description'        =>    sprintf($lang_common['RSS description topic'], $cur_topic['subject']),
+            'description'        =>    sprintf(__('RSS description topic'), $cur_topic['subject']),
             'items'            =>    array(),
             'type'            =>    'posts'
         );
@@ -403,7 +405,7 @@ function output_html($feed)
 
             $item = array(
                 'id'            =>    $cur_post['id'],
-                'title'            =>    $cur_topic['first_post_id'] == $cur_post['id'] ? $cur_topic['subject'] : $lang_common['RSS reply'].$cur_topic['subject'],
+                'title'            =>    $cur_topic['first_post_id'] == $cur_post['id'] ? $cur_topic['subject'] : __('RSS reply').$cur_topic['subject'],
                 'link'            =>    get_link('post/'.$cur_post['id'].'/#p'.$cur_post['id']),
                 'description'        =>    $cur_post['message'],
                 'author'        =>    array(
@@ -458,7 +460,7 @@ function output_html($feed)
                     ->find_one_col('f.forum_name');
 
                 if ($cur_topic) {
-                    $forum_name = $lang_common['Title separator'].$cur_topic;
+                    $forum_name = __('Title separator').$cur_topic;
                 }
             }
         }
@@ -475,7 +477,7 @@ function output_html($feed)
 
         // Only attempt to cache if caching is enabled and we have all or a single forum
         if ($feather_config['o_feed_ttl'] > 0 && ($forum_sql == '' || ($forum_name != '' && !isset($_GET['nfid'])))) {
-            $cache_id = 'feed'.sha1($feather->user->g_id.'|'.$lang_common['lang_identifier'].'|'.($order_posted ? '1' : '0').($forum_name == '' ? '' : '|'.$fids[0]));
+            $cache_id = 'feed'.sha1($feather->user->g_id.'|'.__('lang_identifier').'|'.($order_posted ? '1' : '0').($forum_name == '' ? '' : '|'.$fids[0]));
         }
 
         // Load cached feed
@@ -489,7 +491,7 @@ function output_html($feed)
             $feed = array(
                 'title'        =>    $feather_config['o_board_title'].$forum_name,
                 'link'            =>    '/index.php',
-                'description'    =>    sprintf($lang_common['RSS description'], $feather_config['o_board_title']),
+                'description'    =>    sprintf(__('RSS description'), $feather_config['o_board_title']),
                 'items'            =>    array(),
                 'type'            =>    'topics'
             );
@@ -611,12 +613,12 @@ function output_html($feed)
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
 
-    echo sprintf($lang_index['Guests online'], forum_number_format($num_guests)).'<br />'."\n";
+    echo sprintf(__('Guests online'), forum_number_format($num_guests)).'<br />'."\n";
 
     if ($action == 'online_full' && !empty($users)) {
-        echo sprintf($lang_index['Users online'], implode(', ', $users)).'<br />'."\n";
+        echo sprintf(__('Users online'), implode(', ', $users)).'<br />'."\n";
     } else {
-        echo sprintf($lang_index['Users online'], forum_number_format($num_users)).'<br />'."\n";
+        echo sprintf(__('Users online'), forum_number_format($num_users)).'<br />'."\n";
     }
 
     exit;
@@ -655,12 +657,12 @@ function output_html($feed)
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
 
-    echo sprintf($lang_index['No of users'], forum_number_format($stats['total_users'])).'<br />'."\n";
-    echo sprintf($lang_index['Newest user'], (($feather->user->g_view_users == '1') ? '<a href="'.get_link('user/'.$stats['last_user']['id'].'/').'">'.feather_escape($stats['last_user']['username']).'</a>' : feather_escape($stats['last_user']['username']))).'<br />'."\n";
-    echo sprintf($lang_index['No of topics'], forum_number_format($stats['total_topics'])).'<br />'."\n";
-    echo sprintf($lang_index['No of posts'], forum_number_format($stats['total_posts'])).'<br />'."\n";
+    echo sprintf(__('No of users'), forum_number_format($stats['total_users'])).'<br />'."\n";
+    echo sprintf(__('Newest user'), (($feather->user->g_view_users == '1') ? '<a href="'.get_link('user/'.$stats['last_user']['id'].'/').'">'.feather_escape($stats['last_user']['username']).'</a>' : feather_escape($stats['last_user']['username']))).'<br />'."\n";
+    echo sprintf(__('No of topics'), forum_number_format($stats['total_topics'])).'<br />'."\n";
+    echo sprintf(__('No of posts'), forum_number_format($stats['total_posts'])).'<br />'."\n";
 
     exit;
 }
 // If we end up here, the script was called with some wacky parameters
-exit($lang_common['Bad request']);
+exit(__('Bad request'));
diff --git a/include/cache.php b/include/cache.php
index dba2e878..b275e400 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -56,7 +56,7 @@ function generate_bans_cache()
 //
 function generate_quickjump_cache($group_id = false)
 {
-    global $lang_common;
+
 
     $groups = array();
 
@@ -103,7 +103,7 @@ function generate_quickjump_cache($group_id = false)
                             ->find_many();
 
             if ($result) {
-                $output .= "\t\t\t\t".'<form id="qjump" method="get" action="">'."\n\t\t\t\t\t".'<div><label><span><?php echo $lang_common[\'Jump to\'] ?>'.'<br /></span>'."\n\t\t\t\t\t".'<select name="id" onchange="window.location=(\''.get_link('forum/').'\'+this.options[this.selectedIndex].value)">'."\n";
+                $output .= "\t\t\t\t".'<form id="qjump" method="get" action="">'."\n\t\t\t\t\t".'<div><label><span><?php echo __(\'Jump to\') ?>'.'<br /></span>'."\n\t\t\t\t\t".'<select name="id" onchange="window.location=(\''.get_link('forum/').'\'+this.options[this.selectedIndex].value)">'."\n";
 
                 $cur_category = 0;
                 foreach ($result as $cur_forum) {
@@ -122,7 +122,7 @@ function generate_quickjump_cache($group_id = false)
                     $output .= "\t\t\t\t\t\t\t".'<option value="'.$cur_forum['fid'].'/'.url_friendly($cur_forum['forum_name']).'/'.'"<?php echo ($forum_id == '.$cur_forum['fid'].') ? \' selected="selected"\' : \'\' ?>>'.feather_escape($cur_forum['forum_name']).$redirect_tag.'</option>'."\n";
                 }
 
-                $output .= "\t\t\t\t\t\t".'</optgroup>'."\n\t\t\t\t\t".'</select></label>'."\n\t\t\t\t\t".'<input type="submit" value="<?php echo $lang_common[\'Go\'] ?>" accesskey="g" />'."\n\t\t\t\t\t".'</div>'."\n\t\t\t\t".'</form>'."\n";
+                $output .= "\t\t\t\t\t\t".'</optgroup>'."\n\t\t\t\t\t".'</select></label>'."\n\t\t\t\t\t".'<input type="submit" value="<?php echo __(\'Go\') ?>" accesskey="g" />'."\n\t\t\t\t\t".'</div>'."\n\t\t\t\t".'</form>'."\n";
             }
         }
 
diff --git a/include/common.php b/include/common.php
new file mode 100644
index 00000000..d617810b
--- /dev/null
+++ b/include/common.php
@@ -0,0 +1,204 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+if (!defined('FEATHER_ROOT')) {
+    exit('The constant FEATHER_ROOT must be defined and point to a valid FeatherBB installation root directory.');
+}
+
+// Define the version and database revision that this code was written for
+define('FORUM_VERSION', '1.0.0');
+
+define('FORUM_DB_REVISION', 21);
+define('FORUM_SI_REVISION', 2);
+define('FORUM_PARSER_REVISION', 2);
+
+// Attempt to load the configuration file config.php
+if (file_exists(FEATHER_ROOT.'include/config.php')) {
+    require FEATHER_ROOT.'include/config.php';
+}
+
+// Load the functions script
+require FEATHER_ROOT.'include/functions.php';
+
+// Load UTF-8 functions
+require FEATHER_ROOT.'include/utf8/utf8.php';
+
+// Strip out "bad" UTF-8 characters
+forum_remove_bad_characters();
+
+// Reverse the effect of register_globals
+forum_unregister_globals();
+
+// If FEATHER isn't defined, config.php is missing or corrupt
+if (!defined('FEATHER')) {
+    header('Location: '.$feather->request->getPath().'install/index.php');
+    exit;
+}
+
+// Record the start time (will be used to calculate the generation time for the page)
+$feather->start = get_microtime();
+
+// Make sure PHP reports all errors except E_NOTICE. FluxBB supports E_ALL, but a lot of scripts it may interact with, do not
+//error_reporting(E_ALL ^ E_NOTICE);
+error_reporting(E_ALL); // Let's report everything for development
+
+// Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
+setlocale(LC_CTYPE, 'C');
+
+// Turn off magic_quotes_runtime
+if (get_magic_quotes_runtime()) {
+    set_magic_quotes_runtime(0);
+}
+
+// If a cookie name is not specified in config.php, we use the default (pun_cookie)
+if (empty($cookie_name)) {
+    $cookie_name = 'feather_cookie';
+}
+
+// If the cache directory is not specified, we use the default setting
+if (!defined('FORUM_CACHE_DIR')) {
+    define('FORUM_CACHE_DIR', FEATHER_ROOT.'cache/');
+}
+
+// Define a few commonly used constants
+define('FEATHER_UNVERIFIED', 0);
+define('FEATHER_ADMIN', 1);
+define('FEATHER_MOD', 2);
+define('FEATHER_GUEST', 3);
+define('FEATHER_MEMBER', 4);
+
+// Inject DB prefix to SlimFramework
+$feather->prefix = $db_prefix;
+
+// Include Idiorm and set it up
+require FEATHER_ROOT.'include/idiorm.php';
+
+switch ($db_type) {
+    case 'mysql':
+    case 'mysqli':
+    case 'mysql_innodb':
+    case 'mysqli_innodb':
+        \DB::configure('mysql:host='.$db_host.';dbname='.$db_name);
+        \DB::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+        break;
+    case 'sqlite';
+    case 'sqlite3';
+        \DB::configure('sqlite:./'.$db_name);
+        break;
+    case 'pgsql':
+        \DB::configure('pgsql:host='.$db_host.'dbname='.$db_name);
+        break;
+}
+\DB::configure('username', $db_username);
+\DB::configure('password', $db_password);
+\DB::configure('id_column_overrides', array(
+    $db_prefix.'groups' => 'g_id',
+));
+
+// Log queries if needed
+if (defined('FEATHER_SHOW_QUERIES')) {
+    \DB::configure('logging', true);
+}
+
+// Cache queries if needed
+if (defined('FEATHER_CACHE_QUERIES')) {
+    \DB::configure('caching', true);
+}
+
+// Load cached config
+if (file_exists(FORUM_CACHE_DIR.'cache_config.php')) {
+    include FORUM_CACHE_DIR.'cache_config.php';
+}
+
+if (!defined('FEATHER_CONFIG_LOADED')) {
+    if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
+        require FEATHER_ROOT.'include/cache.php';
+    }
+
+    generate_config_cache();
+    require FORUM_CACHE_DIR.'cache_config.php';
+}
+
+// Inject config to SlimFramework
+$feather->config = $feather_config;
+
+// Enable output buffering
+if (!defined('FEATHER_DISABLE_BUFFERING')) {
+    // Should we use gzip output compression?
+    if ($feather->config['o_gzip'] && extension_loaded('zlib')) {
+        ob_start('ob_gzhandler');
+    } else {
+        ob_start();
+    }
+}
+
+// Define standard date/time formats
+$forum_time_formats = array($feather->config['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
+$forum_date_formats = array($feather->config['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
+
+// Check/update/set cookie and fetch user info
+check_cookie();
+
+// Load l10n
+require_once FEATHER_ROOT.'include/pomo/MO.php';
+require_once FEATHER_ROOT.'include/l10n.php';
+
+// Attempt to load the language file
+if (file_exists(FEATHER_ROOT.'lang/'.$feather->user->language.'/common.mo')) {
+    load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/common.mo');
+}
+else {
+    die('There is no valid language pack \''.feather_escape($feather->user->language).'\' installed. Please reinstall a language of that name');
+}
+
+// Check if we are to display a maintenance message
+if ($feather->config['o_maintenance'] && $feather->user->g_id > FEATHER_ADMIN && !defined('FEATHER_TURN_OFF_MAINT')) {
+    maintenance_message();
+}
+
+// Load cached bans
+if (file_exists(FORUM_CACHE_DIR.'cache_bans.php')) {
+    include FORUM_CACHE_DIR.'cache_bans.php';
+}
+
+if (!defined('FEATHER_BANS_LOADED')) {
+    if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
+        require FEATHER_ROOT.'include/cache.php';
+    }
+
+    generate_bans_cache();
+    require FORUM_CACHE_DIR.'cache_bans.php';
+}
+
+// Check if current user is banned
+check_bans();
+
+// Update online list
+update_users_online();
+
+// Check to see if we logged in without a cookie being set
+if ($feather->user->is_guest && isset($_GET['login'])) {
+    message(__('No cookie'));
+}
+
+// 32kb should be more than enough for forum posts
+if (!defined('FEATHER_MAX_POSTSIZE')) {
+    define('FEATHER_MAX_POSTSIZE', 32768);
+}
+
+if (!defined('FEATHER_SEARCH_MIN_WORD')) {
+    define('FEATHER_SEARCH_MIN_WORD', 3);
+}
+if (!defined('FEATHER_SEARCH_MAX_WORD')) {
+    define('FEATHER_SEARCH_MAX_WORD', 20);
+}
+
+if (!defined('FORUM_MAX_COOKIE_SIZE')) {
+    define('FORUM_MAX_COOKIE_SIZE', 4048);
+}
diff --git a/include/email.php b/include/email.php
index 4300cf85..619d9736 100644
--- a/include/email.php
+++ b/include/email.php
@@ -261,14 +261,14 @@ function bbcode2email($text, $wrap_length = 72)
 //
 function pun_mail($to, $subject, $message, $reply_to_email = '', $reply_to_name = '')
 {
-    global $feather_config, $lang_common;
+    global $feather_config;
 
     // Use \r\n for SMTP servers, the system's line ending for local mailers
     $smtp = $feather_config['o_smtp_host'] != '';
     $EOL = $smtp ? "\r\n" : FORUM_EOL;
 
     // Default sender/return address
-    $from_name = sprintf($lang_common['Mailer'], $feather_config['o_board_title']);
+    $from_name = sprintf(__('Mailer'), $feather_config['o_board_title']);
     $from_email = $feather_config['o_webmaster_email'];
 
     // Do a little spring cleaning
diff --git a/include/functions.php b/include/functions.php
index 41646e03..2a61dcee 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -27,7 +27,7 @@ function check_cookie()
 
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
-
+    
     $now = time();
 
     // Get FeatherBB cookie
@@ -331,7 +331,7 @@ function feather_setcookie($user_id, $password, $expires)
 //
 function check_bans()
 {
-    global $feather_config, $lang_common, $feather_bans;
+    global $feather_config, $feather_bans;
 
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
@@ -384,7 +384,7 @@ function check_bans()
         if ($is_banned) {
             \DB::for_table('online')->where('ident', $feather->user->username)
                                                  ->delete_many();
-            message($lang_common['Ban message'].' '.(($cur_ban['expire'] != '') ? $lang_common['Ban message 2'].' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? $lang_common['Ban message 3'].'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').$lang_common['Ban message 4'].' <a href="mailto:'.feather_escape($feather_config['o_admin_email']).'">'.feather_escape($feather_config['o_admin_email']).'</a>.', true, true, true);
+            message(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.feather_escape($feather_config['o_admin_email']).'">'.feather_escape($feather_config['o_admin_email']).'</a>.', true, true, true);
         }
     }
 
@@ -404,32 +404,35 @@ function check_bans()
 //
 function check_username($username, $errors, $exclude_id = null)
 {
-    global $feather, $feather_config, $errors, $lang_prof_reg, $lang_register, $lang_common, $feather_bans;
+    global $feather, $feather_config, $errors, $feather_bans;
 
     // Include UTF-8 function
     require_once FEATHER_ROOT.'include/utf8/strcasecmp.php';
 
+    load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/register.mo');
+    load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/prof_reg.mo');
+
     // Convert multiple whitespace characters into one (to prevent people from registering with indistinguishable usernames)
     $username = preg_replace('%\s+%s', ' ', $username);
 
     // Validate username
     if (feather_strlen($username) < 2) {
-        $errors[] = $lang_prof_reg['Username too short'];
+        $errors[] = __('Username too short');
     } elseif (feather_strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
-        $errors[] = $lang_prof_reg['Username too long'];
-    } elseif (!strcasecmp($username, 'Guest') || !utf8_strcasecmp($username, $lang_common['Guest'])) {
-        $errors[] = $lang_prof_reg['Username guest'];
+        $errors[] = __('Username too long');
+    } elseif (!strcasecmp($username, 'Guest') || !utf8_strcasecmp($username, __('Guest'))) {
+        $errors[] = __('Username guest');
     } elseif (preg_match('%[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}%', $username) || preg_match('%((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))%', $username)) {
-        $errors[] = $lang_prof_reg['Username IP'];
+        $errors[] = __('Username IP');
     } elseif ((strpos($username, '[') !== false || strpos($username, ']') !== false) && strpos($username, '\'') !== false && strpos($username, '"') !== false) {
-        $errors[] = $lang_prof_reg['Username reserved chars'];
+        $errors[] = __('Username reserved chars');
     } elseif (preg_match('%(?:\[/?(?:b|u|s|ins|del|em|i|h|colou?r|quote|code|img|url|email|list|\*|topic|post|forum|user)\]|\[(?:img|url|quote|list)=)%i', $username)) {
-        $errors[] = $lang_prof_reg['Username BBCode'];
+        $errors[] = __('Username BBCode');
     }
 
     // Check username for any censored words
     if ($feather_config['o_censoring'] == '1' && censor_words($username) != $username) {
-        $errors[] = $lang_register['Username censor'];
+        $errors[] = __('Username censor');
     }
 
     // Check that the username (or a too similar username) is not already registered
@@ -439,13 +442,13 @@ function check_username($username, $errors, $exclude_id = null)
 
     if ($result) {
         $busy = $result['username'];
-        $errors[] = $lang_register['Username dupe 1'].' '.feather_escape($busy).'. '.$lang_register['Username dupe 2'];
+        $errors[] = __('Username dupe 1').' '.feather_escape($busy).'. '.__('Username dupe 2');
     }
 
     // Check username for any banned usernames
     foreach ($feather_bans as $cur_ban) {
         if ($cur_ban['username'] != '' && utf8_strtolower($username) == utf8_strtolower($cur_ban['username'])) {
-            $errors[] = $lang_prof_reg['Banned username'];
+            $errors[] = __('Banned username');
             break;
         }
     }
@@ -521,7 +524,7 @@ function generate_avatar_markup($user_id)
 //
 function generate_page_title($page_title, $p = null)
 {
-    global $lang_common;
+
 
     if (!is_array($page_title)) {
         $page_title = array($page_title);
@@ -530,10 +533,10 @@ function generate_page_title($page_title, $p = null)
     $page_title = array_reverse($page_title);
 
     if ($p > 1) {
-        $page_title[0] .= ' ('.sprintf($lang_common['Page'], forum_number_format($p)).')';
+        $page_title[0] .= ' ('.sprintf(__('Page'), forum_number_format($p)).')';
     }
 
-    $crumbs = implode($lang_common['Title separator'], $page_title);
+    $crumbs = implode(__('Title separator'), $page_title);
 
     return $crumbs;
 }
@@ -796,7 +799,7 @@ function censor_words($text)
 //
 function get_title($user)
 {
-    global $feather_bans, $lang_common;
+    global $feather_bans;
     static $ban_list;
 
     // If not already built in a previous call, build an array of lowercase banned usernames
@@ -814,7 +817,7 @@ function get_title($user)
     }
     // If the user is banned
     elseif (in_array(utf8_strtolower($user['username']), $ban_list)) {
-        $user_title = $lang_common['Banned'];
+        $user_title = __('Banned');
     }
     // If the user group has a default user title
     elseif ($user['g_user_title'] != '') {
@@ -822,11 +825,11 @@ function get_title($user)
     }
     // If the user is a guest
     elseif ($user['g_id'] == FEATHER_GUEST) {
-        $user_title = $lang_common['Guest'];
+        $user_title = __('Guest');
     }
     // If nothing else helps, we assign the default
     else {
-        $user_title = $lang_common['Member'];
+        $user_title = __('Member');
     }
 
     return $user_title;
@@ -838,7 +841,7 @@ function get_title($user)
 //
 function paginate($num_pages, $cur_page, $link, $args = null)
 {
-    global $lang_common;
+
 
     $pages = array();
     $link_to_all = false;
@@ -854,14 +857,14 @@ function paginate($num_pages, $cur_page, $link, $args = null)
     } else {
         // Add a previous page link
         if ($num_pages > 1 && $cur_page > 1) {
-            $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', ($cur_page - 1), $args).'">'.$lang_common['Previous'].'</a>';
+            $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', ($cur_page - 1), $args).'">'.__('Previous').'</a>';
         }
 
         if ($cur_page > 3) {
             $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'">1</a>';
 
             if ($cur_page > 5) {
-                $pages[] = '<span class="spacer">'.$lang_common['Spacer'].'</span>';
+                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
             }
         }
 
@@ -878,7 +881,7 @@ function paginate($num_pages, $cur_page, $link, $args = null)
 
         if ($cur_page <= ($num_pages-3)) {
             if ($cur_page != ($num_pages-3) && $cur_page != ($num_pages-4)) {
-                $pages[] = '<span class="spacer">'.$lang_common['Spacer'].'</span>';
+                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
             }
 
             $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', $num_pages, $args).'">'.forum_number_format($num_pages).'</a>';
@@ -886,7 +889,7 @@ function paginate($num_pages, $cur_page, $link, $args = null)
 
         // Add a next page link
         if ($num_pages > 1 && !$link_to_all && $cur_page < $num_pages) {
-            $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', ($cur_page + 1), $args).'">'.$lang_common['Next'].'</a>';
+            $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', ($cur_page + 1), $args).'">'.__('Next').'</a>';
         }
     }
 
@@ -899,7 +902,7 @@ function paginate($num_pages, $cur_page, $link, $args = null)
 //
 function paginate_old($num_pages, $cur_page, $link)
 {
-    global $lang_common;
+
 
     $pages = array();
     $link_to_all = false;
@@ -915,14 +918,14 @@ function paginate_old($num_pages, $cur_page, $link)
     } else {
         // Add a previous page link
         if ($num_pages > 1 && $cur_page > 1) {
-            $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.($cur_page == 2 ? '' : '&amp;p='.($cur_page - 1)).'">'.$lang_common['Previous'].'</a>';
+            $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.($cur_page == 2 ? '' : '&amp;p='.($cur_page - 1)).'">'.__('Previous').'</a>';
         }
 
         if ($cur_page > 3) {
             $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'">1</a>';
 
             if ($cur_page > 5) {
-                $pages[] = '<span class="spacer">'.$lang_common['Spacer'].'</span>';
+                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
             }
         }
 
@@ -939,7 +942,7 @@ function paginate_old($num_pages, $cur_page, $link)
 
         if ($cur_page <= ($num_pages-3)) {
             if ($cur_page != ($num_pages-3) && $cur_page != ($num_pages-4)) {
-                $pages[] = '<span class="spacer">'.$lang_common['Spacer'].'</span>';
+                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
             }
 
             $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.$num_pages.'">'.forum_number_format($num_pages).'</a>';
@@ -947,7 +950,7 @@ function paginate_old($num_pages, $cur_page, $link)
 
         // Add a next page link
         if ($num_pages > 1 && !$link_to_all && $cur_page < $num_pages) {
-            $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.($cur_page +1).'">'.$lang_common['Next'].'</a>';
+            $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.($cur_page +1).'">'.__('Next').'</a>';
         }
     }
 
@@ -961,7 +964,7 @@ function paginate_old($num_pages, $cur_page, $link)
 
 function message($msg, $http_status = null, $no_back_link = false, $dontStop = false)
 {
-    global $lang_common;
+
 
     // Did we receive a custom header?
     if (!is_null($http_status)) {
@@ -980,7 +983,7 @@ function message($msg, $http_status = null, $no_back_link = false, $dontStop = f
     $feather->response->setBody('');
 
     if (!defined('FEATHER_HEADER')) {
-        $page_title = array(feather_escape($feather->config['o_board_title']), $lang_common['Info']);
+        $page_title = array(feather_escape($feather->config['o_board_title']), __('Info'));
 
         if (!defined('FEATHER_ACTIVE_PAGE')) {
             define('FEATHER_ACTIVE_PAGE', 'index');
@@ -996,7 +999,6 @@ function message($msg, $http_status = null, $no_back_link = false, $dontStop = f
     }
 
     $feather->render('message.php', array(
-        'lang_common' => $lang_common,
         'message'    =>    $msg,
         'no_back_link'    => $no_back_link,
         ));
@@ -1018,10 +1020,10 @@ function message($msg, $http_status = null, $no_back_link = false, $dontStop = f
 //
 function format_time($timestamp, $date_only = false, $date_format = null, $time_format = null, $time_only = false, $no_text = false)
 {
-    global $lang_common, $forum_date_formats, $forum_time_formats;
+    global $forum_date_formats, $forum_time_formats;
 
     if ($timestamp == '') {
-        return $lang_common['Never'];
+        return __('Never');
     }
 
     // Get Slim current session
@@ -1045,9 +1047,9 @@ function format_time($timestamp, $date_only = false, $date_format = null, $time_
 
     if (!$no_text) {
         if ($date == $today) {
-            $date = $lang_common['Today'];
+            $date = __('Today');
         } elseif ($date == $yesterday) {
-            $date = $lang_common['Yesterday'];
+            $date = __('Yesterday');
         }
     }
 
@@ -1066,9 +1068,9 @@ function format_time($timestamp, $date_only = false, $date_format = null, $time_
 //
 function forum_number_format($number, $decimals = 0)
 {
-    global $lang_common;
 
-    return is_numeric($number) ? number_format($number, $decimals, $lang_common['lang_decimal_point'], $lang_common['lang_thousands_sep']) : $number;
+
+    return is_numeric($number) ? number_format($number, $decimals, __('lang_decimal_point'), __('lang_thousands_sep')) : $number;
 }
 
 
@@ -1243,7 +1245,7 @@ function is_all_uppercase($string)
 //
 function maintenance_message()
 {
-    global $lang_common, $feather_config, $tpl_main;
+    global $feather_config, $tpl_main;
 
     // Deal with newlines, tabs and multiple spaces
     $pattern = array("\t", '  ', '  ');
@@ -1253,7 +1255,7 @@ function maintenance_message()
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
 
-    $page_title = array(feather_escape($feather_config['o_board_title']), $lang_common['Maintenance']);
+    $page_title = array(feather_escape($feather_config['o_board_title']), __('Maintenance'));
 
     if (!defined('FEATHER_ACTIVE_PAGE')) {
         define('FEATHER_ACTIVE_PAGE', 'index');
@@ -1269,7 +1271,6 @@ function maintenance_message()
     $header->setTitle($page_title)->display();
 
     $feather->render('message.php', array(
-            'lang_common' => $lang_common,
             'message'    =>    $message,
             'no_back_link'    =>    '',
         )
@@ -1411,15 +1412,13 @@ function remove_bad_characters($array)
 //
 function file_size($size)
 {
-    global $lang_common;
-
     $units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB');
 
     for ($i = 0; $size > 1024; $i++) {
         $size /= 1024;
     }
 
-    return sprintf($lang_common['Size unit '.$units[$i]], round($size, 2));
+    return sprintf(__('Size unit '.$units[$i]), round($size, 2));
 }
 
 
@@ -1707,19 +1706,19 @@ function forum_is_writable($path)
 //
 function display_saved_queries()
 {
-    global $lang_common;
+
 
     ?>
 
 <div id="debug" class="blocktable">
-	<h2><span><?php echo $lang_common['Debug table'] ?></span></h2>
+	<h2><span><?php echo __('Debug table') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Query times'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_common['Query'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Query times') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Query') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -1738,7 +1737,7 @@ function display_saved_queries()
     }
         ?>
 				<tr>
-					<td class="tcl" colspan="2"><?php printf($lang_common['Total query time'], $query_time_total.' s') ?></td>
+					<td class="tcl" colspan="2"><?php printf(__('Total query time'), $query_time_total.' s') ?></td>
 				</tr>
 			</tbody>
 			</table>
@@ -1749,6 +1748,24 @@ function display_saved_queries()
 
 }
 
+//
+// Return the path to load the view file
+//
+function get_path_view($file = null)
+{
+    // Get Slim current session
+    $feather = \Slim\Slim::getInstance();
+
+    if ($file && is_file('style/'.$feather->user->style)) {
+        return FEATHER_ROOT.'style/'.$feather->user->style.'/view';
+    }
+    elseif (is_dir('style/'.$feather->user->style.'/view')) {
+        return FEATHER_ROOT.'style/'.$feather->user->style.'/view';
+    } else {
+        return FEATHER_ROOT.'view';
+    }
+}
+
 //
 // Make a string safe to use in a URL
 // Inspired by (c) Panther <http://www.pantherforum.org/>
diff --git a/include/idiorm.php b/include/idiorm.php
index 5e1c7f20..22675040 100644
--- a/include/idiorm.php
+++ b/include/idiorm.php
@@ -225,7 +225,7 @@ public static function reset_config()
         {
             self::$_config = array();
         }
-
+        
         /**
          * Despite its slightly odd name, this is actually the factory
          * method used to acquire instances of the class. It is named
@@ -239,7 +239,7 @@ public static function reset_config()
         public static function for_table($table_name, $connection_name = self::DEFAULT_CONNECTION)
         {
             $feather = \Slim\Slim::getInstance();
-            $table_name = $feather->forum_settings['db_prefix'].$table_name;
+            $table_name = $feather->prefix.$table_name;
             self::_setup_db($connection_name);
             return new self($table_name, array(), $connection_name);
         }
@@ -507,12 +507,12 @@ protected static function _log_query($query, $parameters, $connection_name, $que
             self::$_last_query = $bound_query;
             self::$_query_log[$connection_name][0][] = $query_time;
             self::$_query_log[$connection_name][1][] = $bound_query;
-
+            
             if(is_callable(self::$_config[$connection_name]['logger'])){
                 $logger = self::$_config[$connection_name]['logger'];
                 $logger($bound_query, $query_time);
             }
-
+            
             return true;
         }
 
@@ -1020,7 +1020,7 @@ public function distinct()
          * ON `user`.`id` = `profile`.`user_id`
          *
          * The fourth argument specifies an alias for the joined table.
-         *
+         * 
          * The final argument specifies is the last column should be escaped
          */
         protected function _add_join_source($join_operator, $table, $constraint, $table_alias=null, $no_escape_second_col=false)
@@ -1061,9 +1061,6 @@ protected function _add_join_source($join_operator, $table, $constraint, $table_
          */
         public function raw_join($table, $constraint, $table_alias, $parameters = array())
         {
-            $feather = \Slim\Slim::getInstance();
-            $table = $feather->prefix.$table;
-
             // Add table alias if present
             if (!is_null($table_alias)) {
                 $table_alias = $this->_quote_identifier($table_alias);
@@ -1286,7 +1283,7 @@ protected function _create_placeholders($fields)
                 return implode(', ', $db_fields);
             }
         }
-
+        
         /**
          * Helper method that filters a column/value array returning only those
          * columns that belong to a compound primary key.
@@ -1518,7 +1515,7 @@ public function where_raw($clause, $parameters=array())
         {
             return $this->_add_where($clause, $parameters);
         }
-
+        
         /**
          * Add a LIMIT to the query
          */
@@ -1570,7 +1567,7 @@ public function order_by($column_name, $dir=null)
         {
             return $this->_add_order_by($column_name, $dir);
         }
-
+        
         /**
          * Add columns to the list of columns returned by the ORDER BY
          * query. This defaults to '*'. Many columns can be supplied
@@ -1596,7 +1593,7 @@ public function order_by_many()
             }
             return $this;
         }
-
+        
         /**
          * Add an unquoted expression as an ORDER BY clause
          */
@@ -2653,7 +2650,7 @@ public function as_array()
         {
             return $this->get_results();
         }
-
+        
         /**
          * Get the number of records in the result set
          * @return int
@@ -2692,7 +2689,7 @@ public function offsetGet($offset)
         {
             return $this->_results[$offset];
         }
-
+        
         /**
          * ArrayAccess
          * @param int|string $offset
diff --git a/include/l10n.php b/include/l10n.php
new file mode 100644
index 00000000..ce27af92
--- /dev/null
+++ b/include/l10n.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Load a .mo file into the text domain $domain.
+ *
+ * If the text domain already exists, the translations will be merged. If both
+ * sets have the same string, the translation from the original value will be taken.
+ *
+ * On success, the .mo file will be placed in the $l10n global by $domain
+ * and will be a MO object.
+ *
+ * @param    string     $domain Text domain. Unique identifier for retrieving translated strings.
+ * @param    string     $mofile Path to the .mo file.
+ * 
+ * @return   boolean    True on success, false on failure.
+ *
+ * Inspired from Luna <http://getluna.org>
+ */
+function load_textdomain($domain, $mofile) {
+
+	global $l10n;
+
+	if (!is_readable($mofile)) {
+		return false;
+	}
+
+	$mo = new MO();
+	if (!$mo->import_from_file($mofile)) {
+		return false;
+	}
+
+	if (isset($l10n[$domain])) {
+		$mo->merge_with($l10n[$domain]);
+	}
+
+	$l10n[$domain] = &$mo;
+
+	return true;
+}
+
+function __($text, $domain = 'featherbb') {
+
+	return luna_translate($text, $domain);
+}
+
+function _e($text, $domain = 'featherbb') {
+
+	echo luna_translate($text, $domain);
+}
+
+function _n($single, $plural, $number, $domain = 'featherbb') {
+
+	$translations = load_translations($domain);
+	$translation = $translations->translate_plural($single, $plural, $number);
+
+	return $translation;
+}
+
+function luna_translate($text, $domain = 'featherbb') {
+
+	$translations = load_translations($domain);
+	$translations = $translations->translate($text);
+
+	return $translations;
+}
+
+function load_translations($domain) {
+
+	global $l10n;
+
+	if (!isset($l10n[$domain])) {
+		$l10n[$domain] = new NOOPTranslations;
+	}
+
+	return $l10n[$domain];
+}
\ No newline at end of file
diff --git a/include/parser.php b/include/parser.php
index 69e287dc..69ee422d 100644
--- a/include/parser.php
+++ b/include/parser.php
@@ -118,7 +118,7 @@ function matches one BBCode open/close pair. The BBCode tag components are
 *********************************************************** */
 function _preparse_bbcode_callback($matches)
 {
-    global $lang_common, $errors, $pd;
+    global $errors, $pd;
     
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
@@ -143,7 +143,7 @@ function _preparse_bbcode_callback($matches)
         if ($contents === null) {
             // On error, preg_replace_callback returns NULL.
  // Error #1: '(%s) Message is too long or too complex. Please shorten.'
-            $new_errors[] = sprintf($lang_common['BBerr pcre'], preg_error());
+            $new_errors[] = sprintf(__('BBerr pcre'), preg_error());
             $contents = ''; // Zero out the contents.
         }
     }
@@ -179,22 +179,22 @@ function _preparse_bbcode_callback($matches)
             // which is either unexpected or unrecognized.
  // Error #2: 'Unexpected attribute: "%1$s". (No attribute allowed for [%2$s].'.
             $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = sprintf($lang_common['BBerr unexpected attribute'], $attribute, $tagname);
+            $new_errors[] = sprintf(__('BBerr unexpected attribute'), $attribute, $tagname);
         } else { // Error #3: 'Unrecognized attribute: "%1$s", is not valid for [%2$s].'
             $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = sprintf($lang_common['BBerr unrecognized attribute'], $attribute, $tagname);
+            $new_errors[] = sprintf(__('BBerr unrecognized attribute'), $attribute, $tagname);
         }
         // Make sure attribute does nor contain a valid BBcode tag.
         if (preg_match($pd['re_bbtag'], $attribute)) { // Error #4: 'Attribute may NOT contain open or close bbcode tags'
             $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = $lang_common['BBerr bbcode attribute'];
+            $new_errors[] = __('BBerr bbcode attribute');
         }
         // Validate and filter tag's attribute value if and according to custom attribute regex.
         if (isset($handler['a_regex'])) { // Check if this tag has an attribute regex? (very rare)
             if (preg_match($handler['a_regex'], $attribute, $m)) { // Yes. Check if regex matches attribute?
                 $attribute = $m[1];
             } else { // Error #4b: 'Invalid attribute, [%s] requires specific attribute.'
-                $new_errors[] = sprintf($lang_common['BBerr invalid attrib'], $tagname);
+                $new_errors[] = sprintf(__('BBerr invalid attrib'), $tagname);
             }
         }
     } else { // Attribute not specified. Use the NO_ATTRIB handler if it exixts else error.
@@ -204,7 +204,7 @@ function _preparse_bbcode_callback($matches)
             $handler =& $tag['handlers']['NO_ATTRIB'];        // no-attribute handler. Otherwise...
         } else { // Error #5: '[%1$s] is missing a required attribute.'.
             $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = sprintf($lang_common['BBerr missing attribute'], $tagname);
+            $new_errors[] = sprintf(__('BBerr missing attribute'), $tagname);
         }
     }
     // -------------------------------------------------------
@@ -220,7 +220,7 @@ function _preparse_bbcode_callback($matches)
             $fmt_open = $fmt_close = '';
             break;
         case 'err':    // Error #6: '[%1$s] tag nesting depth: %2$d exceeds allowable limit: %3$d.'.
-            $new_errors[] = sprintf($lang_common['BBerr nesting overflow'],
+            $new_errors[] = sprintf(__('BBerr nesting overflow'),
                                 $tagname, $tag['depth'], $tag['depth_max']);
             break;
         default:
@@ -231,14 +231,14 @@ function _preparse_bbcode_callback($matches)
         // Are we illegitimate?
     // Yes. Pick between error #6 and #7.
         if ($parent === $tagname) { // Error #7: '[%s] was opened within itself, this is not allowed.'
-            $new_errors[] = sprintf($lang_common['BBerr self-nesting'], $tagname);
+            $new_errors[] = sprintf(__('BBerr self-nesting'), $tagname);
         } else { // Error #8: '[%1$s] was opened within [%2$s], this is not allowed.'
-            $new_errors[] = sprintf($lang_common['BBerr invalid nesting'], $tagname, $parent);
+            $new_errors[] = sprintf(__('BBerr invalid nesting'), $tagname, $parent);
         }
     }
     // Verfify our parent tag is in our 'parents' allowable array if it exists.
     if (isset($tag['parents']) && !isset($tag['parents'][$parent])) { // Error #9: '[%1$s] cannot be within: [%2$s]. Allowable parent tags: %3$s.'.
-        $new_errors[] = sprintf($lang_common['BBerr invalid parent'],
+        $new_errors[] = sprintf(__('BBerr invalid parent'),
             $tagname, $parent, '('. implode('), (', array_keys($tag['parents'])) .')');
     }
     // -----------------------------------------
@@ -266,18 +266,18 @@ function _preparse_bbcode_callback($matches)
         $contents = preg_replace(array('/^\s+/', '/\s+$/S'), '', $contents);
         // Handle special case link to a
         if ($feather->user->g_post_links != '1') {
-            $new_errors[] = $lang_common['BBerr cannot post URLs'];
+            $new_errors[] = __('BBerr cannot post URLs');
         }
         else if (($m = url_valid($contents))) {
             $contents = $m['url']; // Fetch possibly more complete url address.
         } else { // Error #10a: 'Invalid URL name: %s'.
-            $new_errors[] = sprintf($lang_common['BBerr Invalid URL name'], $contents);
+            $new_errors[] = sprintf(__('BBerr Invalid URL name'), $contents);
         }
         break;
 
     case 'email':
         if (filter_var($contents, FILTER_VALIDATE_EMAIL)) { // Error #10c: 'Invalid email address: %s'.
-            $new_errors[] = sprintf($lang_common['BBerr Invalid email address'], $contents);
+            $new_errors[] = sprintf(__('BBerr Invalid email address'), $contents);
         }
         break;
 
@@ -308,20 +308,20 @@ function _preparse_bbcode_callback($matches)
         if (($m = url_valid($attribute))) {
             $attribute = $m['url']; // Fetch possibly more complete url address.
         } else { // Error #10b: 'Invalid URL name: %s'.
-            $new_errors[] = sprintf($lang_common['BBerr Invalid URL name'], $attribute);
+            $new_errors[] = sprintf(__('BBerr Invalid URL name'), $attribute);
         }
         break;
 
     case 'color':
         if (!preg_match($pd['re_color'], $attribute)) { // Error #11: 'Invalid color attribute: %s'.
-            $new_errors[] = sprintf($lang_common['BBerr Invalid color'], $attribute);
+            $new_errors[] = sprintf(__('BBerr Invalid color'), $attribute);
         }
         break;
 
     case 'email':
         // TODO: improve this quick-n-dirty email check.
         if (!preg_match('/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,6}$/i', $attribute)) { // Error #10c: 'Invalid email address: %s'.
-            $new_errors[] = sprintf($lang_common['BBerr Invalid email address'], $attribute);
+            $new_errors[] = sprintf(__('BBerr Invalid email address'), $attribute);
         }
         break;
 
@@ -376,13 +376,13 @@ function _preparse_bbcode_callback($matches)
                                             } // Else remote image fits. Do nothing special with width and height.
                                         }
                                     } else { // Error #13: 'Unable to retrieve image data from remote url: %s'.
-                                        $new_errors[] = sprintf($lang_common['BBerr bad meta data'], $contents);
+                                        $new_errors[] = sprintf(__('BBerr bad meta data'), $contents);
                                     } // NOTE: cannot generate this error.
                                 } else { // Filesize of remote image is too big. Silently convert to link if possible.
                                     if (isset($pd['bbcd']['url']) && $pd['bbcd']['url']['depth'] === 0) {
                                         $fmt_open  = '{[url='. $contents .']';
                                         $fmt_close = '[/url]}';
-                                        $contents = $lang_common['BBmsg big image'];
+                                        $contents = __('BBmsg big image');
                                     } else { // Image within a url cannot be linkified. Just display url name.
                                         $contents = '{'. $contents .'}';
                                         $fmt_open  = '';
@@ -392,16 +392,16 @@ function _preparse_bbcode_callback($matches)
                             } else {
                                 // $size not set.
  // Error #14: 'Unable to determine remote file size.'.
-                                $new_errors[] = $lang_common['BBerr no file size'];
+                                $new_errors[] = __('BBerr no file size');
                             } // NOTE: cannot generate this error.
                         } else { // Error #15: 'Remote url does not have Content-Type: "image".'
-                            $new_errors[] = $lang_common['BBerr non image'];
+                            $new_errors[] = __('BBerr non image');
                         }
                     } else { // Error #16: 'Bad HTTP response header: "%s"'.
-                        $new_errors[] = sprintf($lang_common['BBerr bad http response'], $http[0]);
+                        $new_errors[] = sprintf(__('BBerr bad http response'), $http[0]);
                     }
                 } else { // Error #17: 'Unable to read remote image http headers.'.
-                    $new_errors[] = $lang_common['BBerr bad headers'];
+                    $new_errors[] = __('BBerr bad headers');
                 }
             } // Image validation turned off. Do nothing.
         } else { // Non-Error: IMG tag self nesting. Handle by silently stripping tags with no error.
@@ -507,7 +507,7 @@ function _preparse_bbcode_callback($matches)
         if (preg_match($handler['c_regex'], $contents, $m)) {
             $contents = $m[1];
         } else { // Error #12: 'Invalid content, [%s] requires specific content.'
-            $new_errors[] = sprintf($lang_common['BBerr invalid content'], $tagname);
+            $new_errors[] = sprintf(__('BBerr invalid content'), $tagname);
         }
     }
     // Silently strip empty or all-white tags:
@@ -572,7 +572,7 @@ function _preparse_bbcode_callback($matches)
  */
 function preparse_bbcode($text, &$errors, $is_signature = false)
 {
-    global $lang_common, $feather_config, $pd;
+    global $feather_config, $pd;
 
     $pd['new_errors'] = array(); // Reset the parser error message stack.
     $pd['in_signature'] = ($is_signature) ? true : false;
@@ -581,7 +581,7 @@ function preparse_bbcode($text, &$errors, $is_signature = false)
     if ($newtext === null) {
         // On error, preg_replace_callback returns NULL.
  // Error #1: '(%s) Message is too long or too complex. Please shorten.'
-        $errors[] = sprintf($lang_common['BBerr pcre'], preg_error());
+        $errors[] = sprintf(__('BBerr pcre'), preg_error());
         return $text;
     }
     $newtext = str_replace("\3", '[', $newtext); // Fixup CODE sections.
@@ -628,11 +628,11 @@ function preparse_bbcode($text, &$errors, $is_signature = false)
 //
 function _orphan_callback($matches)
 {
-    global $pd, $lang_common;
+    global $pd;
     if ($matches[0][1] === '/') { // Error #18: 'Orphan close tag: [/%s] is missing its open tag.'
-        $errmsg = sprintf($lang_common['BBerr orphan close'], $matches[1]);
+        $errmsg = sprintf(__('BBerr orphan close'), $matches[1]);
     } else { // Error #19: 'Orphan open tag: [%s] is missing its close tag.'
-        $errmsg = sprintf($lang_common['BBerr orphan open'], $matches[1]);
+        $errmsg = sprintf(__('BBerr orphan open'), $matches[1]);
     }
     $pd['new_errors'][] = $errmsg;    // Append to array of errors so far.
     return '[err='. $errmsg .']'. $matches[0] .'[/err]';
@@ -731,7 +731,7 @@ function preg_error()
 *********************************************************** */
 function _parse_bbcode_callback($matches)
 {
-    global $pd, $lang_common;
+    global $pd;
     $tagname =& $matches[1];            // TAGNAME we are currently servicing.
     $contents =& $matches[6];            // Shortcut to contents.
     $tag =& $pd['bbcd'][$tagname];        // Shortcut to bbcd array entry.
@@ -852,10 +852,10 @@ function _parse_bbcode_callback($matches)
                 $format = "{%c_str%}";
             } else {
                 if ($attribute) {
-                    $format = '{<a href="%c_str%" title="%a_str%">'. $lang_common['Image link'] .'</a>}';
+                    $format = '{<a href="%c_str%" title="%a_str%">'. __('Image link') .'</a>}';
                 } else {
-                    $format = '{<a href="%c_str%" title="'. $lang_common['BBmsg images disabled'] .'">'.
-                    $lang_common['Image link'] .'</a>}';
+                    $format = '{<a href="%c_str%" title="'. __('BBmsg images disabled') .'">'.
+                    __('Image link') .'</a>}';
                 }
                 $enabled = true; // Re-enable to override defauslt disabled handling (i.e. dont delete.)
             }
@@ -879,12 +879,12 @@ function _parse_bbcode_callback($matches)
                 // Check for optional embedded post id.
  // Attribute has optional '#1234' quoted post ID number. Convert to link back to quoted post.
                 $attribute = preg_replace('/\s*#\d++$/S', '', $attribute); // Strip post id from attribute.
-                $attribute .= ' '. $lang_common['wrote'];  // Append language-specific "wrote:".
+                $attribute .= ' '. __('wrote');  // Append language-specific "wrote:".
                 if ($pd['config']['quote_links']) {
                     $attribute = ' <a href="'. get_link('post/'.$m[1].'/#p'.$m[1]) .'">'. $attribute .'</a>';
                 }
             } else {
-                $attribute .= ' '. $lang_common['wrote'];
+                $attribute .= ' '. __('wrote');
             } // If no post id, just add "wrote:".
         }
         break;
diff --git a/include/pomo/.editorconfig b/include/pomo/.editorconfig
new file mode 100644
index 00000000..a6c9cc43
--- /dev/null
+++ b/include/pomo/.editorconfig
@@ -0,0 +1,16 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.php]
+indent_size = 4
diff --git a/include/pomo/MO.php b/include/pomo/MO.php
new file mode 100644
index 00000000..d3a25de3
--- /dev/null
+++ b/include/pomo/MO.php
@@ -0,0 +1,313 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+require_once dirname(__FILE__) . '/Streams/Reader.php';
+require_once dirname(__FILE__) . '/Streams/FileReader.php';
+require_once dirname(__FILE__) . '/Translations/NOOPTranslations.php';
+require_once dirname(__FILE__) . '/Translations/GettextTranslations.php';
+require_once dirname(__FILE__) . '/Translations/EntryTranslations.php';
+
+/**
+ * Class for working with MO files
+ */
+class MO extends GettextTranslations
+{
+    public $_nplurals = 2;
+
+    /**
+     * Fills up with the entries from MO file $filename
+     *
+     * @param  string $filename MO file to load
+     * @return bool   Success
+     */
+    public function import_from_file($filename)
+    {
+        $reader = new FileReader($filename);
+        if (!$reader->is_resource()) {
+            return false;
+        }
+
+        return $this->import_from_reader($reader);
+    }
+
+    public function export_to_file($filename)
+    {
+        $fh = fopen($filename, 'wb');
+        if (!$fh) {
+            return false;
+        }
+        $res = $this->export_to_file_handle($fh);
+        fclose($fh);
+
+        return $res;
+    }
+
+    public function export()
+    {
+        $tmp_fh = fopen("php://temp", 'r+');
+        if (!$tmp_fh) {
+            return false;
+        }
+        $this->export_to_file_handle($tmp_fh);
+        rewind($tmp_fh);
+
+        return stream_get_contents($tmp_fh);
+    }
+
+    public function is_entry_good_for_export($entry)
+    {
+        if (empty($entry->translations)) {
+            return false;
+        }
+
+        if (!array_filter($entry->translations)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function export_to_file_handle($fh)
+    {
+        $entries = array_filter(
+            $this->entries,
+            array($this, 'is_entry_good_for_export')
+        );
+        ksort($entries);
+        $magic = 0x950412de;
+        $revision = 0;
+        $total = count($entries) + 1; // all the headers are one entry
+        $originals_lenghts_addr = 28;
+        $translations_lenghts_addr = $originals_lenghts_addr + 8 * $total;
+        $size_of_hash = 0;
+        $hash_addr = $translations_lenghts_addr + 8 * $total;
+        $current_addr = $hash_addr;
+        fwrite($fh, pack(
+                'V*',
+                $magic,
+                $revision,
+                $total,
+                $originals_lenghts_addr,
+                $translations_lenghts_addr,
+                $size_of_hash,
+                $hash_addr
+            ));
+        fseek($fh, $originals_lenghts_addr);
+
+        // headers' msgid is an empty string
+        fwrite($fh, pack('VV', 0, $current_addr));
+        $current_addr++;
+        $originals_table = chr(0);
+
+        $reader = new Reader();
+
+        foreach ($entries as $entry) {
+            $originals_table .= $this->export_original($entry) . chr(0);
+            $length = $reader->strlen($this->export_original($entry));
+            fwrite($fh, pack('VV', $length, $current_addr));
+            $current_addr += $length + 1; // account for the NULL byte after
+        }
+
+        $exported_headers = $this->export_headers();
+        fwrite($fh, pack(
+            'VV',
+            $reader->strlen($exported_headers),
+            $current_addr)
+        );
+        $current_addr += strlen($exported_headers) + 1;
+        $translations_table = $exported_headers . chr(0);
+
+        foreach ($entries as $entry) {
+            $translations_table .= $this->export_translations($entry).chr(0);
+            $length = $reader->strlen($this->export_translations($entry));
+            fwrite($fh, pack('VV', $length, $current_addr));
+            $current_addr += $length + 1;
+        }
+
+        fwrite($fh, $originals_table);
+        fwrite($fh, $translations_table);
+
+        return true;
+    }
+
+    public function export_original($entry)
+    {
+        //TODO: warnings for control characters
+        $exported = $entry->singular;
+        if ($entry->is_plural) {
+            $exported .= chr(0).$entry->plural;
+        }
+        if (!is_null($entry->context)) {
+            $exported = $entry->context.chr(4).$exported;
+        }
+
+        return $exported;
+    }
+
+    public function export_translations($entry)
+    {
+        //TODO: warnings for control characters
+        return implode(chr(0), $entry->translations);
+    }
+
+    public function export_headers()
+    {
+        $exported = '';
+        foreach ($this->headers as $header => $value) {
+            $exported .= "$header: $value\n";
+        }
+
+        return $exported;
+    }
+
+    public function get_byteorder($magic)
+    {
+        // The magic is 0x950412de
+        $magic_little = (int) - 1794895138;
+        $magic_little_64 = (int) 2500072158;
+        // 0xde120495
+        $magic_big = ((int) - 569244523) & 0xFFFFFFFF;
+        if ($magic_little == $magic || $magic_little_64 == $magic) {
+            return 'little';
+        } elseif ($magic_big == $magic) {
+            return 'big';
+        } else {
+            return false;
+        }
+    }
+
+    public function import_from_reader($reader)
+    {
+        $endian_string = $this->get_byteorder($reader->readint32());
+        if (false === $endian_string) {
+            return false;
+        }
+        $reader->setEndian($endian_string);
+
+        $endian = ('big' == $endian_string) ? 'N' : 'V';
+
+        $header = $reader->read(24);
+        if ($reader->strlen($header) != 24) {
+            return false;
+        }
+
+        // parse header
+        $header = unpack("{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header);
+        if (!is_array($header)) {
+            return false;
+        }
+
+        // support revision 0 of MO format specs, only
+        if ($header['revision'] != 0) {
+            return false;
+        }
+
+        // seek to data blocks
+        $reader->seekto($header['originals_lenghts_addr']);
+
+        // read originals' indices
+        $originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr'];
+        if ($originals_lengths_length != $header['total'] * 8) {
+            return false;
+        }
+
+        $originals = $reader->read($originals_lengths_length);
+        if ($reader->strlen($originals) != $originals_lengths_length) {
+            return false;
+        }
+
+        // read translations' indices
+        $translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr'];
+        if ($translations_lenghts_length != $header['total'] * 8) {
+            return false;
+        }
+
+        $translations = $reader->read($translations_lenghts_length);
+        if ($reader->strlen($translations) != $translations_lenghts_length) {
+            return false;
+        }
+
+        // transform raw data into set of indices
+        $originals    = $reader->str_split($originals, 8);
+        $translations = $reader->str_split($translations, 8);
+
+        // skip hash table
+        $strings_addr = $header['hash_addr'] + $header['hash_length'] * 4;
+
+        $reader->seekto($strings_addr);
+
+        $strings = $reader->read_all();
+        $reader->close();
+
+        for ($i = 0; $i < $header['total']; $i++) {
+            $o = unpack("{$endian}length/{$endian}pos", $originals[$i]);
+            $t = unpack("{$endian}length/{$endian}pos", $translations[$i]);
+            if (!$o || !$t) {
+                return false;
+            }
+
+            // adjust offset due to reading strings to separate space before
+            $o['pos'] -= $strings_addr;
+            $t['pos'] -= $strings_addr;
+
+            $original    = $reader->substr($strings, $o['pos'], $o['length']);
+            $translation = $reader->substr($strings, $t['pos'], $t['length']);
+
+            if ('' === $original) {
+                $this->set_headers($this->make_headers($translation));
+            } else {
+                $entry = &$this->make_entry($original, $translation);
+                $this->entries[$entry->key()] = &$entry;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Build a EntryTranslations from original string and translation strings,
+     * found in a MO file
+     *
+     * @param string $original    original string to translate from MO file.
+     *                            Might contain 0x04 as context separator or
+     *                            0x00 as singular/plural separator
+     * @param string $translation translation string from MO file.Might contain
+     *                            0x00 as a plural translations separator
+     * @retrun EntryTranslations New entry
+     */
+    public static function &make_entry($original, $translation) {
+        $entry = new EntryTranslations();
+        // look for context
+        $parts = explode(chr(4), $original);
+        if (isset($parts[1])) {
+            $original = $parts[1];
+            $entry->context = $parts[0];
+        }
+        // look for plural original
+        $parts = explode(chr(0), $original);
+        $entry->singular = $parts[0];
+        if (isset($parts[1])) {
+            $entry->is_plural = true;
+            $entry->plural = $parts[1];
+        }
+        // plural translations are also separated by \0
+        $entry->translations = explode(chr(0), $translation);
+
+        return $entry;
+    }
+
+    public function select_plural_form($count)
+    {
+        return $this->gettext_select_plural_form($count);
+    }
+
+    public function get_plural_forms_count()
+    {
+        return $this->_nplurals;
+    }
+}
diff --git a/include/pomo/PO.php b/include/pomo/PO.php
new file mode 100644
index 00000000..6a057631
--- /dev/null
+++ b/include/pomo/PO.php
@@ -0,0 +1,494 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+ini_set('auto_detect_line_endings', 1);
+
+/**
+ * Class for working with PO files
+ */
+class PO extends GettextTranslations
+{
+    const MAX_LINE_LEN = 79;
+
+    public $comments_before_headers = '';
+
+    /**
+     * Exports headers to a PO entry
+     *
+     * @return string msgid/msgstr PO entry for this PO file headers, doesn't
+     *                contain newline at the end
+     */
+    public function export_headers()
+    {
+        $header_string = '';
+        foreach ($this->headers as $header => $value) {
+            $header_string.= "$header: $value\n";
+        }
+        $poified = PO::poify($header_string);
+        if ($this->comments_before_headers) {
+            $before_headers = PO::prepend_each_line(rtrim(
+                $this->comments_before_headers)."\n", '# '
+            );
+        } else {
+            $before_headers = '';
+        }
+
+        return rtrim("{$before_headers}msgid \"\"\nmsgstr $poified");
+    }
+
+    /**
+     * Exports all entries to PO format
+     *
+     * @return string sequence of mgsgid/msgstr PO strings, doesn't containt
+     *                newline at the end
+     */
+    public function export_entries()
+    {
+        //TODO: sorting
+        return implode("\n\n", array_map(
+            array(__CLASS__, 'export_entry'),
+            $this->entries)
+        );
+    }
+
+    /**
+     * Exports the whole PO file as a string
+     *
+     * @param  bool   $include_headers whether to include the headers in the
+     *                                 export
+     * @return string ready for inclusion in PO file string for headers and all
+     *                                the enrtries
+     */
+    public function export($include_headers = true)
+    {
+        $res = '';
+        if ($include_headers) {
+            $res .= $this->export_headers();
+            $res .= "\n\n";
+        }
+        $res .= $this->export_entries();
+
+        return $res;
+    }
+
+    /**
+     * Same as {@link export}, but writes the result to a file
+     *
+     * @param  string $filename        where to write the PO string
+     * @param  bool   $include_headers whether to include tje headers in the
+     *                                 export
+     * @return bool   true on success, false on error
+     */
+    public function export_to_file($filename, $include_headers = true)
+    {
+        $fh = fopen($filename, 'w');
+        if (false === $fh) {
+            return false;
+        }
+        $export = $this->export($include_headers);
+        $res = fwrite($fh, $export);
+        if (false === $res) {
+            return false;
+        }
+
+        return fclose($fh);
+    }
+
+    /**
+     * Text to include as a comment before the start of the PO contents
+     *
+     * Doesn't need to include # in the beginning of lines, these are added
+     * automatically
+     *
+     * @param string $text Comment text
+     */
+    public function set_comment_before_headers($text)
+    {
+        $this->comments_before_headers = $text;
+    }
+
+    /**
+     * Formats a string in PO-style
+     *
+     * @param  string $string the string to format
+     * @return string the poified string
+     */
+    public static function poify($string)
+    {
+        $quote = '"';
+        $slash = '\\';
+        $newline = "\n";
+
+        $replaces = array(
+            "$slash"    => "$slash$slash",
+            "$quote"    => "$slash$quote",
+            "\t"        => '\t',
+        );
+
+        $string = str_replace(
+            array_keys($replaces),
+            array_values($replaces),
+            $string
+        );
+
+        $po = $quote.implode(
+            "${slash}n$quote$newline$quote",
+            explode($newline, $string)
+        ).$quote;
+        // add empty string on first line for readbility
+        if (false !== strpos($string, $newline) &&
+                (substr_count($string, $newline) > 1 ||
+                !($newline === substr($string, -strlen($newline))))) {
+            $po = "$quote$quote$newline$po";
+        }
+        // remove empty strings
+        $po = str_replace("$newline$quote$quote", '', $po);
+
+        return $po;
+    }
+
+    /**
+     * Gives back the original string from a PO-formatted string
+     *
+     * @param  string $string PO-formatted string
+     * @return string enascaped string
+     */
+    public static function unpoify($string)
+    {
+        $escapes = array('t' => "\t", 'n' => "\n", '\\' => '\\');
+        $lines = array_map('trim', explode("\n", $string));
+        $lines = array_map(array(__CLASS__, 'trim_quotes'), $lines);
+        $unpoified = '';
+        $previous_is_backslash = false;
+        foreach ($lines as $line) {
+            preg_match_all('/./u', $line, $chars);
+            $chars = $chars[0];
+            foreach ($chars as $char) {
+                if (!$previous_is_backslash) {
+                    if ('\\' == $char) {
+                        $previous_is_backslash = true;
+                    } else {
+                        $unpoified .= $char;
+                    }
+                } else {
+                    $previous_is_backslash = false;
+                    $unpoified .= isset($escapes[$char]) ?
+                        $escapes[$char] :
+                        $char;
+                }
+            }
+        }
+
+        return $unpoified;
+    }
+
+    /**
+     * Inserts $with in the beginning of every new line of $string and
+     * returns the modified string
+     *
+     * @param  string $string prepend lines in this string
+     * @param  string $with   prepend lines with this string
+     * @return string The modified string
+     */
+    public static function prepend_each_line($string, $with)
+    {
+        $php_with = var_export($with, true);
+        $lines = explode("\n", $string);
+        // do not prepend the string on the last empty line, artefact by explode
+        if ("\n" == substr($string, -1)) {
+            unset($lines[count($lines) - 1]);
+        }
+        $res = implode("\n", array_map(
+                create_function('$x', "return $php_with.\$x;"),
+                $lines
+            ));
+        // give back the empty line, we ignored above
+        if ("\n" == substr($string, -1)) {
+            $res .= "\n";
+        }
+
+        return $res;
+    }
+
+    /**
+     * Prepare a text as a comment -- wraps the lines and prepends #
+     * and a special character to each line
+     *
+     * @param  string $text the comment text
+     * @param  string $char character to denote a special PO comment,
+     *                      like :, default is a space
+     * @return string The modified string
+     */
+    private static function comment_block($text, $char=' ')
+    {
+        $text = wordwrap($text, self::MAX_LINE_LEN - 3);
+
+        return self::prepend_each_line($text, "#$char ");
+    }
+
+    /**
+     * Builds a string from the entry for inclusion in PO file
+     *
+     * @param  object      &$entry the entry to convert to po string
+     * @return string|bool PO-style formatted string for the entry or
+     *                            false if the entry is empty
+     */
+    public static function export_entry(&$entry)
+    {
+        if (is_null($entry->singular)) {
+            return false;
+        }
+        $po = array();
+        if (!empty($entry->translator_comments)) {
+            $po[] = self::comment_block($entry->translator_comments);
+        }
+        if (!empty($entry->extracted_comments)) {
+            $po[] = self::comment_block($entry->extracted_comments, '.');
+        }
+        if (!empty($entry->references)) {
+            $po[] = self::comment_block(implode(' ', $entry->references), ':');
+        }
+        if (!empty($entry->flags)) {
+            $po[] = self::comment_block(implode(", ", $entry->flags), ',');
+        }
+        if (!is_null($entry->context)) {
+            $po[] = 'msgctxt '.self::poify($entry->context);
+        }
+        $po[] = 'msgid '.self::poify($entry->singular);
+        if (!$entry->is_plural) {
+            $translation = empty($entry->translations) ?
+                '' :
+                $entry->translations[0];
+            $po[] = 'msgstr '.self::poify($translation);
+        } else {
+            $po[] = 'msgid_plural '.self::poify($entry->plural);
+            $translations = empty($entry->translations) ?
+                array('', '') :
+                $entry->translations;
+            foreach ($translations as $i => $translation) {
+                $po[] = "msgstr[$i] ".self::poify($translation);
+            }
+        }
+
+        return implode("\n", $po);
+    }
+
+    public function import_from_file($filename)
+    {
+        $f = fopen($filename, 'r');
+        if (!$f) {
+            return false;
+        }
+        $lineno = 0;
+        while (true) {
+            $res = $this->read_entry($f, $lineno);
+            if (!$res) {
+                break;
+            }
+            if ($res['entry']->singular == '') {
+                $this->set_headers(
+                    $this->make_headers($res['entry']->translations[0])
+                );
+            } else {
+                $this->add_entry($res['entry']);
+            }
+        }
+        PO::read_line($f, 'clear');
+        if (false === $res) {
+            return false;
+        }
+        if (! $this->headers && ! $this->entries) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function read_entry($f, $lineno = 0)
+    {
+        $entry = new EntryTranslations();
+        // where were we in the last step
+        // can be: comment, msgctxt, msgid, msgid_plural, msgstr, msgstr_plural
+        $context = '';
+        $msgstr_index = 0;
+        $is_final = create_function('$context', 'return $context == "msgstr" || $context == "msgstr_plural";');
+        while (true) {
+            $lineno++;
+            $line = PO::read_line($f);
+            if (!$line) {
+                if (feof($f)) {
+                    if ($is_final($context)) {
+                        break;
+                    } elseif (!$context) {// we haven't read a line and eof came
+
+                        return null;
+                    } else {
+                        return false;
+                    }
+                } else {
+                    return false;
+                }
+            }
+            if ($line == "\n") {
+                continue;
+            }
+
+            $line = trim($line);
+            if (preg_match('/^#/', $line, $m)) {
+                // the comment is the start of a new entry
+                if ($is_final($context)) {
+                    PO::read_line($f, 'put-back');
+                    $lineno--;
+                    break;
+                }
+                // comments have to be at the beginning
+                if ($context && $context != 'comment') {
+                    return false;
+                }
+                // add comment
+                $this->add_comment_to_entry($entry, $line);
+            } elseif (preg_match('/^msgctxt\s+(".*")/', $line, $m)) {
+                if ($is_final($context)) {
+                    PO::read_line($f, 'put-back');
+                    $lineno--;
+                    break;
+                }
+                if ($context && $context != 'comment') {
+                    return false;
+                }
+                $context = 'msgctxt';
+                $entry->context .= PO::unpoify($m[1]);
+            } elseif (preg_match('/^msgid\s+(".*")/', $line, $m)) {
+                if ($is_final($context)) {
+                    PO::read_line($f, 'put-back');
+                    $lineno--;
+                    break;
+                }
+                if ($context &&
+                    $context != 'msgctxt' &&
+                    $context != 'comment') {
+                    return false;
+                }
+                $context = 'msgid';
+                $entry->singular .= PO::unpoify($m[1]);
+            } elseif (preg_match('/^msgid_plural\s+(".*")/', $line, $m)) {
+                if ($context != 'msgid') {
+                    return false;
+                }
+                $context = 'msgid_plural';
+                $entry->is_plural = true;
+                $entry->plural .= PO::unpoify($m[1]);
+            } elseif (preg_match('/^msgstr\s+(".*")/', $line, $m)) {
+                if ($context != 'msgid') {
+                    return false;
+                }
+                $context = 'msgstr';
+                $entry->translations = array(PO::unpoify($m[1]));
+            } elseif (preg_match('/^msgstr\[(\d+)\]\s+(".*")/', $line, $m)) {
+                if ($context != 'msgid_plural' && $context != 'msgstr_plural') {
+                    return false;
+                }
+                $context = 'msgstr_plural';
+                $msgstr_index = $m[1];
+                $entry->translations[$m[1]] = PO::unpoify($m[2]);
+            } elseif (preg_match('/^".*"$/', $line)) {
+                $unpoified = PO::unpoify($line);
+                switch ($context) {
+                    case 'msgid':
+                        $entry->singular .= $unpoified;
+                        break;
+                    case 'msgctxt':
+                        $entry->context .= $unpoified;
+                        break;
+                    case 'msgid_plural':
+                        $entry->plural .= $unpoified;
+                        break;
+                    case 'msgstr':
+                        $entry->translations[0] .= $unpoified;
+                        break;
+                    case 'msgstr_plural':
+                        $entry->translations[$msgstr_index] .= $unpoified;
+                        break;
+                    default:
+                        return false;
+                }
+            } else {
+                return false;
+            }
+        }
+        if (array() == array_filter(
+                $entry->translations,
+                create_function('$t', 'return $t || "0" === $t;'))
+            ) {
+            $entry->translations = array();
+        }
+
+        return array('entry' => $entry, 'lineno' => $lineno);
+    }
+
+    public static function read_line($f, $action = 'read')
+    {
+        static $last_line = '';
+        static $use_last_line = false;
+        if ('clear' == $action) {
+            $last_line = '';
+
+            return true;
+        }
+        if ('put-back' == $action) {
+            $use_last_line = true;
+
+            return true;
+        }
+        $line = $use_last_line ? $last_line : fgets($f);
+        $line = ( "\r\n" == substr( $line, -2 ) ) ?
+            rtrim( $line, "\r\n" ) . "\n" :
+            $line;
+        $last_line = $line;
+        $use_last_line = false;
+
+        return $line;
+    }
+
+    public function add_comment_to_entry(&$entry, $po_comment_line)
+    {
+        $first_two = substr($po_comment_line, 0, 2);
+        $comment = trim(substr($po_comment_line, 2));
+        if ('#:' == $first_two) {
+            $entry->references = array_merge(
+                $entry->references,
+                preg_split('/\s+/', $comment)
+            );
+        } elseif ('#.' == $first_two) {
+            $entry->extracted_comments = trim(
+                $entry->extracted_comments . "\n" . $comment
+            );
+        } elseif ('#,' == $first_two) {
+            $entry->flags = array_merge(
+                $entry->flags,
+                preg_split('/,\s*/', $comment)
+            );
+        } else {
+            $entry->translator_comments = trim(
+                $entry->translator_comments . "\n" . $comment
+            );
+        }
+    }
+
+    public static function trim_quotes($s)
+    {
+        if ( substr($s, 0, 1) == '"') {
+            $s = substr($s, 1);
+        }
+        if ( substr($s, -1, 1) == '"') {
+            $s = substr($s, 0, -1);
+        }
+
+        return $s;
+    }
+}
diff --git a/include/pomo/Streams/CachedFileReader.php b/include/pomo/Streams/CachedFileReader.php
new file mode 100644
index 00000000..5d93121e
--- /dev/null
+++ b/include/pomo/Streams/CachedFileReader.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+/**
+ * Reads the contents of the file in the beginning.
+ *
+ * @author Danilo Segan <danilo@kvota.net>
+ */
+class CachedFileReader extends StringReader
+{
+    public function __construct($filename)
+    {
+        parent::__construct();
+        $this->_str = file_get_contents($filename);
+        if (false === $this->_str) {
+            return false;
+        }
+        $this->_pos = 0;
+    }
+}
diff --git a/include/pomo/Streams/CachedIntFileReader.php b/include/pomo/Streams/CachedIntFileReader.php
new file mode 100644
index 00000000..17a8e50e
--- /dev/null
+++ b/include/pomo/Streams/CachedIntFileReader.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+/**
+ * Reads the contents of the file in the beginning.
+ *
+ * @author Danilo Segan <danilo@kvota.net>
+ */
+class CachedIntFileReader extends CachedFileReader
+{
+    public function __construct($filename)
+    {
+        parent::__construct($filename);
+    }
+}
diff --git a/include/pomo/Streams/FileReader.php b/include/pomo/Streams/FileReader.php
new file mode 100644
index 00000000..983df271
--- /dev/null
+++ b/include/pomo/Streams/FileReader.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+/**
+ * Classes, which help reading streams of data from files.
+ *
+ * @author Danilo Segan <danilo@kvota.net>
+ */
+class FileReader extends Reader
+{
+    public function __construct($filename)
+    {
+        parent::__construct();
+        $this->_f = fopen($filename, 'rb');
+    }
+
+    public function read($bytes)
+    {
+        return fread($this->_f, $bytes);
+    }
+
+    public function seekto($pos)
+    {
+        if (-1 == fseek($this->_f, $pos, SEEK_SET)) {
+            return false;
+        }
+        $this->_pos = $pos;
+
+        return true;
+    }
+
+    public function is_resource()
+    {
+        return is_resource($this->_f);
+    }
+
+    public function feof()
+    {
+        return feof($this->_f);
+    }
+
+    public function close()
+    {
+        return fclose($this->_f);
+    }
+
+    public function read_all()
+    {
+        $all = '';
+        while (!$this->feof())
+            $all .= $this->read(4096);
+
+        return $all;
+    }
+}
diff --git a/include/pomo/Streams/Reader.php b/include/pomo/Streams/Reader.php
new file mode 100644
index 00000000..ced42eb6
--- /dev/null
+++ b/include/pomo/Streams/Reader.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+/**
+ * Classes, which help reading streams of data from files.
+ *
+ * @author Danilo Segan <danilo@kvota.net>
+ */
+class Reader
+{
+    public $endian = 'little';
+    public $_post = '';
+
+    public function __construct()
+    {
+        $this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) &&
+            function_exists('mb_substr');
+        $this->_pos = 0;
+    }
+
+    /**
+     * Sets the endianness of the file.
+     *
+     * @param $endian string 'big' or 'little'
+     */
+    public function setEndian($endian)
+    {
+        $this->endian = $endian;
+    }
+
+    /**
+     * Reads a 32bit Integer from the Stream
+     *
+     * @return mixed The integer, corresponding to the next 32 bits from the
+     *               stream of false if there are not enough bytes or on error
+     */
+    public function readint32()
+    {
+        $bytes = $this->read(4);
+        if (4 != $this->strlen($bytes)) {
+            return false;
+        }
+        $endian_letter = ('big' == $this->endian) ? 'N' : 'V';
+        $int = unpack($endian_letter, $bytes);
+
+        return array_shift($int);
+    }
+
+    /**
+     * Reads an array of 32-bit Integers from the Stream
+     *
+     * @param integer count How many elements should be read
+     * @return mixed Array of integers or false if there isn't
+     *               enough data or on error
+     */
+    public function readint32array($count)
+    {
+        $bytes = $this->read(4 * $count);
+        if (4*$count != $this->strlen($bytes)) {
+            return false;
+        }
+        $endian_letter = ('big' == $this->endian) ? 'N' : 'V';
+
+        return unpack($endian_letter.$count, $bytes);
+    }
+
+
+    public function substr($string, $start, $length)
+    {
+        if ($this->is_overloaded) {
+            return mb_substr($string, $start, $length, 'ascii');
+        } else {
+            return substr($string, $start, $length);
+        }
+    }
+
+    public function strlen($string)
+    {
+        if ($this->is_overloaded) {
+            return mb_strlen($string, 'ascii');
+        } else {
+            return strlen($string);
+        }
+    }
+
+    public function str_split($string, $chunk_size)
+    {
+        if (!function_exists('str_split')) {
+            $length = $this->strlen($string);
+            $out = array();
+            for ($i = 0; $i < $length; $i += $chunk_size) {
+                $out[] = $this->substr($string, $i, $chunk_size);
+            }
+
+            return $out;
+        } else {
+            return str_split($string, $chunk_size);
+        }
+    }
+
+    public function pos()
+    {
+        return $this->_pos;
+    }
+
+    public function is_resource()
+    {
+        return true;
+    }
+
+    public function close()
+    {
+        return true;
+    }
+}
diff --git a/include/pomo/Streams/StringReader.php b/include/pomo/Streams/StringReader.php
new file mode 100644
index 00000000..c0d1c3bb
--- /dev/null
+++ b/include/pomo/Streams/StringReader.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+/**
+ * Provides file-like methods for manipulating a string instead
+ * of a physical file.
+ *
+ * @author Danilo Segan <danilo@kvota.net>
+ */
+class StringReader extends Reader
+{
+    public $_str = '';
+
+    public function __construct($str = '')
+    {
+        parent::__construct();
+        $this->_str = $str;
+        $this->_pos = 0;
+    }
+
+    public function read($bytes)
+    {
+        $data = $this->substr($this->_str, $this->_pos, $bytes);
+        $this->_pos += $bytes;
+        if ($this->strlen($this->_str) < $this->_pos) {
+            $this->_pos = $this->strlen($this->_str);
+        }
+
+        return $data;
+    }
+
+    public function seekto($pos)
+    {
+        $this->_pos = $pos;
+        if ($this->strlen($this->_str) < $this->_pos) {
+            $this->_pos = $this->strlen($this->_str);
+        }
+
+        return $this->_pos;
+    }
+
+    public function length()
+    {
+        return $this->strlen($this->_str);
+    }
+
+    public function read_all()
+    {
+        return $this->substr(
+            $this->_str,
+            $this->_pos,
+            $this->strlen($this->_str)
+        );
+    }
+
+}
diff --git a/include/pomo/Translations/EntryTranslations.php b/include/pomo/Translations/EntryTranslations.php
new file mode 100644
index 00000000..892a2718
--- /dev/null
+++ b/include/pomo/Translations/EntryTranslations.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+/**
+ * Contains EntryTranslations class
+ * EntryTranslations class encapsulates a translatable string
+ */
+class EntryTranslations
+{
+    /**
+     * Whether the entry contains a string and its plural form, default is false
+     *
+     * @var boolean
+     */
+    public $is_plural = false;
+
+    public $context = null;
+    public $singular = null;
+    public $plural = null;
+    public $translations = array();
+    public $translator_comments = '';
+    public $extracted_comments = '';
+    public $references = array();
+    public $flags = array();
+
+    /**
+     * @param array $args associative array, support following keys:
+     *                    - singular (string) -- the string to translate, if omitted and empty entry will be created
+     *                    - plural (string) -- the plural form of the string, setting this will set {@link $is_plural} to true
+     *                    - translations (array) -- translations of the string and possibly -- its plural forms
+     *                    - context (string) -- a string differentiating two equal strings used in different contexts
+     *                    - translator_comments (string) -- comments left by translators
+     *                    - extracted_comments (string) -- comments left by developers
+     *                    - references (array) -- places in the code this strings is used, in relative_to_root_path/file.php:linenum form
+     *                    - flags (array) -- flags like php-format
+     */
+    public function __construct($args=array())
+    {
+        // if no singular -- empty object
+        if (!isset($args['singular'])) {
+            return;
+        }
+        // get member variable values from args hash
+        foreach ($args as $varname => $value) {
+            $this->$varname = $value;
+        }
+        if (isset($args['plural'])) {
+            $this->is_plural = true;
+        }
+        if (!is_array($this->translations)) {
+            $this->translations = array();
+        }
+        if (!is_array($this->references)) {
+            $this->references = array();
+        }
+        if (!is_array($this->flags)) {
+            $this->flags = array();
+        }
+    }
+
+    /**
+     * Generates a unique key for this entry
+     *
+     * @return string|bool the key or false if the entry is empty
+     */
+    public function key()
+    {
+        if (is_null($this->singular)) {
+            return false;
+        }
+        // prepend context and EOT, like in MO files
+        return is_null($this->context) ? $this->singular : $this->context.chr(4).$this->singular;
+    }
+
+    public function merge_with(&$other)
+    {
+        $this->flags = array_unique(array_merge($this->flags, $other->flags));
+        $this->references = array_unique(array_merge($this->references, $other->references));
+        if ($this->extracted_comments != $other->extracted_comments) {
+            $this->extracted_comments .= $other->extracted_comments;
+        }
+
+    }
+}
diff --git a/include/pomo/Translations/GettextTranslations.php b/include/pomo/Translations/GettextTranslations.php
new file mode 100644
index 00000000..857e05f7
--- /dev/null
+++ b/include/pomo/Translations/GettextTranslations.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+require_once dirname(__FILE__) . '/Translations.php';
+
+/**
+ * Class for a set of entries for translation and their associated headers
+ */
+class GettextTranslations extends Translations
+{
+    /**
+     * The gettext implementation of select_plural_form.
+     *
+     * It lives in this class, because there are more than one descendand,
+     * which will use it and they can't share it effectively.
+     *
+     * @param integer $count Items count
+     */
+    public function gettext_select_plural_form($count)
+    {
+        if (!isset($this->_gettext_select_plural_form)
+            || is_null($this->_gettext_select_plural_form)) {
+            list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
+            $this->_nplurals = $nplurals;
+            $this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
+        }
+
+        return call_user_func($this->_gettext_select_plural_form, $count);
+    }
+
+    public function nplurals_and_expression_from_header($header)
+    {
+        if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches)) {
+            $nplurals = (int) $matches[1];
+            $expression = trim($this->parenthesize_plural_exression($matches[2]));
+
+            return array($nplurals, $expression);
+        } else {
+            return array(2, 'n != 1');
+        }
+    }
+
+    /**
+     * Makes a function, which will return the right translation index,
+     * according to the plural forms header
+     *
+     * @param  integer $nplurals
+     * @param  string  $expression
+     * @return integer The right translation index
+     */
+    public function make_plural_form_function($nplurals, $expression)
+    {
+        $expression = str_replace('n', '$n', $expression);
+        $func_body = "
+            \$index = (int) ($expression);
+
+            return (\$index < $nplurals) ? \$index : $nplurals - 1;";
+        return create_function('$n', $func_body);
+    }
+
+    /**
+     * Adds parantheses to the inner parts of ternary operators in
+     * plural expressions, because PHP evaluates ternary oerators
+     * from left to right
+     *
+     * @param  string $expression the expression without parentheses
+     * @return string the expression with parentheses added
+     */
+    public function parenthesize_plural_exression($expression)
+    {
+        $expression .= ';';
+        $res = '';
+        $depth = 0;
+        for ($i = 0; $i < strlen($expression); ++$i) {
+            $char = $expression[$i];
+            switch ($char) {
+                case '?':
+                    $res .= ' ? (';
+                    $depth++;
+                    break;
+                case ':':
+                    $res .= ') : (';
+                    break;
+                case ';':
+                    $res .= str_repeat(')', $depth) . ';';
+                    $depth= 0;
+                    break;
+                default:
+                    $res .= $char;
+            }
+        }
+
+        return rtrim($res, ';');
+    }
+
+    public function make_headers($translation)
+    {
+        $headers = array();
+        // sometimes \ns are used instead of real new lines
+        $translation = str_replace('\n', "\n", $translation);
+        $lines = explode("\n", $translation);
+        foreach ($lines as $line) {
+            $parts = explode(':', $line, 2);
+            if (!isset($parts[1])) {
+                continue;
+            }
+            $headers[trim($parts[0])] = trim($parts[1]);
+        }
+
+        return $headers;
+    }
+
+    public function set_header($header, $value)
+    {
+        parent::set_header($header, $value);
+        if ('Plural-Forms' == $header) {
+            list($nplurals, $expression) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
+            $this->_nplurals = $nplurals;
+            $this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
+        }
+    }
+}
diff --git a/include/pomo/Translations/NOOPTranslations.php b/include/pomo/Translations/NOOPTranslations.php
new file mode 100644
index 00000000..f656f860
--- /dev/null
+++ b/include/pomo/Translations/NOOPTranslations.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+require_once dirname(__FILE__) . '/Translations.php';
+
+/**
+ * Provides the same interface as Translations, but doesn't do anything
+ */
+class NOOPTranslations implements TranslationsInterface
+{
+    /**
+     * Entries provided availible
+     *
+     * @var array
+     */
+    public $entries = array();
+    public $headers = array();
+
+    /**
+     * {@inheritdoc}
+     */
+    public function add_entry($entry)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function set_header($header, $value)
+    {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function set_headers($headers)
+    {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_header($header)
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function translate_entry(&$entry)
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function translate($singular, $context = null)
+    {
+        return $singular;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function select_plural_form($count)
+    {
+        return 1 == $count ? 0 : 1;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_plural_forms_count()
+    {
+        return 2;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function translate_plural(
+        $singular,
+        $plural,
+        $count,
+        $context = null
+    ) {
+        return 1 == $count ? $singular : $plural;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function merge_with(&$other)
+    {
+    }
+}
diff --git a/include/pomo/Translations/Translations.php b/include/pomo/Translations/Translations.php
new file mode 100644
index 00000000..4daea42b
--- /dev/null
+++ b/include/pomo/Translations/Translations.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+require_once dirname(__FILE__) . '/TranslationsInterface.php';
+
+/**
+ * Class for a set of entries for translation and their associated headers
+ */
+class Translations implements TranslationsInterface
+{
+    /**
+     * Entries provided availible
+     *
+     * @var array
+     */
+    public $entries = array();
+    public $headers = array();
+
+    /**
+     * {@inheritdoc}
+     */
+    public function add_entry($entry)
+    {
+        if (is_array($entry)) {
+            $entry = new EntryTranslations($entry);
+        }
+        $key = $entry->key();
+        if (false === $key) {
+            return false;
+        }
+        $this->entries[$key] = &$entry;
+
+        return true;
+    }
+
+    public function add_entry_or_merge($entry)
+    {
+        if (is_array($entry)) {
+            $entry = new EntryTranslations($entry);
+        }
+        $key = $entry->key();
+        if (false === $key) {
+            return false;
+        }
+        if (isset($this->entries[$key])) {
+            $this->entries[$key]->merge_with($entry);
+        } else {
+            $this->entries[$key] = &$entry;
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function set_header($header, $value)
+    {
+        $this->headers[$header] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function set_headers($headers)
+    {
+        foreach ($headers as $header => $value) {
+            $this->set_header($header, $value);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_header($header)
+    {
+        return isset($this->headers[$header]) ? $this->headers[$header] : false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function translate_entry(&$entry)
+    {
+        $key = $entry->key();
+
+        return isset($this->entries[$key]) ? $this->entries[$key] : false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function translate($singular, $context = null)
+    {
+        $entry = new EntryTranslations(array(
+                'singular' => $singular,
+                'context' => $context
+            ));
+        $translated = $this->translate_entry($entry);
+
+        return ($translated && !empty($translated->translations)) ?
+            $translated->translations[0] :
+            $singular;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function select_plural_form($count)
+    {
+        return 1 == $count ? 0 : 1;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_plural_forms_count()
+    {
+        return 2;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function translate_plural(
+        $singular,
+        $plural,
+        $count,
+        $context = null
+    ) {
+        $entry = new EntryTranslations(array(
+                'singular' => $singular,
+                'plural' => $plural,
+                'context' => $context
+            ));
+        $translated = $this->translate_entry($entry);
+        $index = $this->select_plural_form($count);
+        $total_plural_forms = $this->get_plural_forms_count();
+        if ($translated && 0 <= $index && $index < $total_plural_forms &&
+                is_array($translated->translations) &&
+                isset($translated->translations[$index])) {
+            return $translated->translations[$index];
+        } else {
+            return 1 == $count ? $singular : $plural;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function merge_with(&$other)
+    {
+        foreach ($other->entries as $entry) {
+            $this->entries[$entry->key()] = $entry;
+        }
+    }
+
+    public function merge_originals_with(&$other)
+    {
+        foreach ($other->entries as $entry) {
+            if ( !isset( $this->entries[$entry->key()] )) {
+                $this->entries[$entry->key()] = $entry;
+            } else {
+                $this->entries[$entry->key()]->merge_with($entry);
+            }
+        }
+    }
+}
diff --git a/include/pomo/Translations/TranslationsInterface.php b/include/pomo/Translations/TranslationsInterface.php
new file mode 100644
index 00000000..401194d9
--- /dev/null
+++ b/include/pomo/Translations/TranslationsInterface.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * This file is part of the POMO package.
+ *
+ * @copyright 2014 POMO
+ * @license GPL
+ */
+
+/**
+ * Translations Interface that all POMO Translators must implement
+ *
+ * @author Léo Colombaro <git@colombaro.fr>
+ */
+interface TranslationsInterface
+{
+    /**
+     * Add entry to the PO structure
+     *
+     * @param  object &$entry
+     * @return bool   true on success, false if the entry doesn't have a key
+     */
+    public function add_entry($entry);
+
+    /**
+     * Sets $header PO header to $value
+     *
+     * If the header already exists, it will be overwritten
+     *
+     * @todo This should be out of this class, it is gettext specific
+     * @param string $header header name, without trailing :
+     * @param string $value  header value, without trailing \n
+     */
+    public function set_header($header, $value);
+
+    public function set_headers($headers);
+
+    public function get_header($header);
+
+    public function translate_entry(&$entry);
+
+    /**
+     * Translate an entry in the singular way
+     *
+     * @param  string $singular Singular form of the entry
+     * @param  mixed  $context
+     * @return string The translation
+     */
+    public function translate($singular, $context = null);
+
+    /**
+     * Given the number of items, returns the 0-based index of the plural form
+     * to use
+     *
+     * Here, in the base Translations class, the common logic for English is
+     * implemented:
+     * 	0 if there is one element, 1 otherwise
+     *
+     * This function should be overrided by the sub-classes. For example MO/PO
+     * can derive the logic from their headers.
+     *
+     * @param integer $count number of items
+     */
+    public function select_plural_form($count);
+
+    public function get_plural_forms_count();
+
+    /**
+     * Plural sensitive tranlation of an entry
+     *
+     * Same behavior as {@link translate()} but with plural analyser, provide by
+     * {@link select_plural_form()} parser.
+     *
+     * @param  string  $singular Singular form of the entry
+     * @param  string  $plural   Plural form of the entry
+     * @param  integer $count    Number of items for the plural context
+     * @param  mixed   $context
+     * @return string  The correct translation
+     */
+    public function translate_plural(
+        $singular,
+        $plural,
+        $count,
+        $context = null
+    );
+
+    /**
+     * Merge $other in the current object.
+     *
+     * @param  Object &$other Another Translation object, whose translations
+     *                        will be merged in this one
+     * @return void
+     **/
+    public function merge_with(&$other);
+}
diff --git a/include/routes.php b/include/routes.php
index 50a4074a..85afa86f 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -157,10 +157,10 @@
         $feather->get('/ip-stats/id/:id(/)', '\controller\admin\users:ipstats')->conditions(array('id' => '[0-9]+'));
         $feather->get('/show-users/ip/:ip(/)', '\controller\admin\users:showusers');
     });
-
+    
 });
 
 // 404 not found
-$feather->notFound(function () use ($feather) {
-    $feather->halt(404, 'Not found');
+$feather->notFound(function () {
+    message(__('Bad request'), '404');
 });
diff --git a/index.php b/index.php
index b53037f2..bfb68e1f 100644
--- a/index.php
+++ b/index.php
@@ -6,11 +6,10 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
-
+ 
 // Start a session for flash messages
 session_cache_limiter(false);
 session_start();
-error_reporting(E_ALL); // Let's report everything for development
 
 // Load Slim Framework
 require 'Slim/Slim.php';
@@ -18,22 +17,24 @@
 
 // Instantiate Slim
 $feather = new \Slim\Slim();
-$feather_user_settings = array(
-							'db_name' => 'featherbb',
-							'db_host' => 'localhost',
-							'db_user' => 'featherbb',
-							'db_pass' => 'featherbb',
-							'cookie_name' => 'feather_cookie_45ef0b',
-							'cookie_seed' => '0f320ab07f4afbc5');
 
 // Load middlewares
 $feather->add(new \Slim\Extras\Middleware\CsrfGuard('featherbb_csrf')); // CSRF
-$feather->add(new \Slim\Extras\Middleware\FeatherBB($feather_user_settings)); // FeatherBB
+$feather->add(new \Slim\Extras\Middleware\FeatherBB()); // FeatherBB
+
+// Cookie encryption
+$feather->config('cookies.encrypt', true);
+
+// Load FeatherBB common file
+define('FEATHER_ROOT', dirname(__FILE__).'/');
+require FEATHER_ROOT.'include/common.php';
 
 // Load the routes
-require 'include/routes.php';
+require FEATHER_ROOT.'include/routes.php';
+
+// Specify where to load the views
+$feather->config('templates.path', get_path_view());
 
-$feather->config('cookies.encrypt', true);
 $feather->config('debug', true); // As long as we're developing FeatherBB
 
 // Run it, baby!
diff --git a/install/index.php b/install/index.php
index 873973c2..540f1681 100644
--- a/install/index.php
+++ b/install/index.php
@@ -79,11 +79,15 @@ function stripslashes_array($array)
 $install_lang = preg_replace('%[\.\\\/]%', '', $install_lang);
 
 // If such a language pack doesn't exist, or isn't up-to-date enough to translate this page, default to English
-if (!file_exists(FEATHER_ROOT.'lang/'.$install_lang.'/install.php')) {
+if (!file_exists(FEATHER_ROOT.'lang/'.$feather->user->language.'/install.mo')) {
     $install_lang = 'English';
 }
 
-require FEATHER_ROOT.'lang/'.$install_lang.'/install.php';
+// Load l10n
+require_once FEATHER_ROOT.'include/pomo/MO.php';
+require_once FEATHER_ROOT.'include/l10n.php';
+
+load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$install_lang.'/install.mo');
 
 if (file_exists(FEATHER_ROOT.'include/config.php')) {
     // Check to see whether FeatherBB is already installed
@@ -91,7 +95,7 @@ function stripslashes_array($array)
 
     // If FEATHER is defined, config.php is probably valid and thus the software is installed
     if (defined('FEATHER')) {
-        exit($lang_install['Already installed']);
+        exit(__('Already installed'));
     }
 }
 
@@ -105,7 +109,7 @@ function stripslashes_array($array)
 
 // Make sure we are running at least MIN_PHP_VERSION
 if (!function_exists('version_compare') || version_compare(PHP_VERSION, MIN_PHP_VERSION, '<')) {
-    exit(sprintf($lang_install['You are running error'], 'PHP', PHP_VERSION, FORUM_VERSION, MIN_PHP_VERSION));
+    exit(sprintf(__('You are running error'), 'PHP', PHP_VERSION, FORUM_VERSION, MIN_PHP_VERSION));
 }
 
 
@@ -115,7 +119,7 @@ function stripslashes_array($array)
 //
 function error($message, $file = null, $line = null, $db_error = false)
 {
-    global $feather_config, $lang_common;
+    global $feather_config;
     // Set some default settings if the script failed before $feather_config could be populated
     if (empty($feather_config)) {
         $feather_config = array(
@@ -123,13 +127,6 @@ function error($message, $file = null, $line = null, $db_error = false)
             'o_gzip'        => '0'
         );
     }
-    // Set some default translations if the script failed before $lang_common could be populated
-    if (empty($lang_common)) {
-        $lang_common = array(
-            'Title separator'    => ' / ',
-            'Page'                => 'Page %s'
-        );
-    }
     // Empty all output buffers and stop buffering
     while (@ob_end_clean());
     // "Restart" output buffering if we are using ob_gzhandler (since the gzip header is already sent)
@@ -233,8 +230,8 @@ function generate_config_file()
 
     $db_type = $db_name = $db_username = $db_prefix = $username = $email = '';
     $db_host = 'localhost';
-    $title = $lang_install['My FeatherBB Forum'];
-    $description = '<p><span>'.$lang_install['Description'].'</span></p>';
+    $title = __('My FeatherBB Forum');
+    $description = '<p><span>'.__('Description').'</span></p>';
     $default_lang = $install_lang;
     $default_style = 'FeatherBB';
 } else {
@@ -262,55 +259,55 @@ function generate_config_file()
 
     // Validate username and passwords
     if (feather_strlen($username) < 2) {
-        $alerts[] = $lang_install['Username 1'];
+        $alerts[] = __('Username 1');
     } elseif (feather_strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
-        $alerts[] = $lang_install['Username 2'];
+        $alerts[] = __('Username 2');
     } elseif (!strcasecmp($username, 'Guest')) {
-        $alerts[] = $lang_install['Username 3'];
+        $alerts[] = __('Username 3');
     } elseif (preg_match('%[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}%', $username) || preg_match('%((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))%', $username)) {
-        $alerts[] = $lang_install['Username 4'];
+        $alerts[] = __('Username 4');
     } elseif ((strpos($username, '[') !== false || strpos($username, ']') !== false) && strpos($username, '\'') !== false && strpos($username, '"') !== false) {
-        $alerts[] = $lang_install['Username 5'];
+        $alerts[] = __('Username 5');
     } elseif (preg_match('%(?:\[/?(?:b|u|i|h|colou?r|quote|code|img|url|email|list)\]|\[(?:code|quote|list)=)%i', $username)) {
-        $alerts[] = $lang_install['Username 6'];
+        $alerts[] = __('Username 6');
     }
 
     if (feather_strlen($password1) < 6) {
-        $alerts[] = $lang_install['Short password'];
+        $alerts[] = __('Short password');
     } elseif ($password1 != $password2) {
-        $alerts[] = $lang_install['Passwords not match'];
+        $alerts[] = __('Passwords not match');
     }
 
     // Validate email
     require FEATHER_ROOT.'include/email.php';
 
     if (!is_valid_email($email)) {
-        $alerts[] = $lang_install['Wrong email'];
+        $alerts[] = __('Wrong email');
     }
 
     if ($title == '') {
-        $alerts[] = $lang_install['No board title'];
+        $alerts[] = __('No board title');
     }
 
     $languages = forum_list_langs();
     if (!in_array($default_lang, $languages)) {
-        $alerts[] = $lang_install['Error default language'];
+        $alerts[] = __('Error default language');
     }
 
     $styles = forum_list_styles();
     if (!in_array($default_style, $styles)) {
-        $alerts[] = $lang_install['Error default style'];
+        $alerts[] = __('Error default style');
     }
 }
 
 // Check if the cache directory is writable
 if (!forum_is_writable(FORUM_CACHE_DIR)) {
-    $alerts[] = sprintf($lang_install['Alert cache'], FORUM_CACHE_DIR);
+    $alerts[] = sprintf(__('Alert cache'), FORUM_CACHE_DIR);
 }
 
 // Check if default avatar directory is writable
 if (!forum_is_writable(FEATHER_ROOT.'img/avatars/')) {
-    $alerts[] = sprintf($lang_install['Alert avatar'], FEATHER_ROOT.'img/avatars/');
+    $alerts[] = sprintf(__('Alert avatar'), FEATHER_ROOT.'img/avatars/');
 }
 
 if (!isset($_POST['form_sent']) || !empty($alerts)) {
@@ -343,7 +340,7 @@ function generate_config_file()
     }
 
     if (empty($db_extensions)) {
-        error($lang_install['No DB extensions']);
+        error(__('No DB extensions'));
     }
 
     // Fetch a list of installed languages
@@ -354,22 +351,22 @@ function generate_config_file()
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><?php echo $lang_install['FeatherBB Installation'] ?></title>
+<title><?php echo __('FeatherBB Installation') ?></title>
 <link rel="stylesheet" type="text/css" href="../style/<?php echo $default_style ?>.css" />
 <script type="text/javascript">
 /* <![CDATA[ */
 function process_form(the_form)
 {
 	var required_fields = {
-		"req_db_type": "<?php echo $lang_install['Database type'] ?>",
-		"req_db_host": "<?php echo $lang_install['Database server hostname'] ?>",
-		"req_db_name": "<?php echo $lang_install['Database name'] ?>",
-		"req_username": "<?php echo $lang_install['Administrator username'] ?>",
-		"req_password1": "<?php echo $lang_install['Password'] ?>",
-		"req_password2": "<?php echo $lang_install['Confirm password'] ?>",
-		"req_email": "<?php echo $lang_install['Administrator email'] ?>",
-		"req_title": "<?php echo $lang_install['Board title'] ?>",
-		"req_base_url": "<?php echo $lang_install['Base URL'] ?>"
+		"req_db_type": "<?php echo __('Database type') ?>",
+		"req_db_host": "<?php echo __('Database server hostname') ?>",
+		"req_db_name": "<?php echo __('Database name') ?>",
+		"req_username": "<?php echo __('Administrator username') ?>",
+		"req_password1": "<?php echo __('Password') ?>",
+		"req_password2": "<?php echo __('Confirm password') ?>",
+		"req_email": "<?php echo __('Administrator email') ?>",
+		"req_title": "<?php echo __('Board title') ?>",
+		"req_base_url": "<?php echo __('Base URL') ?>"
 	};
 	if (document.all || document.getElementById)
 	{
@@ -378,7 +375,7 @@ function process_form(the_form)
 			var elem = the_form.elements[i];
 			if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
 			{
-				alert('"' + required_fields[elem.name] + '" <?php echo $lang_install['Required field'] ?>');
+				alert('"' + required_fields[elem.name] + '" <?php echo __('Required field') ?>');
 				elem.focus();
 				return false;
 			}
@@ -399,8 +396,8 @@ function process_form(the_form)
 	<div id="brdheader" class="block">
 		<div class="box">
 			<div id="brdtitle" class="inbox">
-				<h1><span><?php echo $lang_install['FeatherBB Installation'] ?></span></h1>
-				<div id="brddesc"><p><?php echo $lang_install['Welcome'] ?></p></div>
+				<h1><span><?php echo __('FeatherBB Installation') ?></span></h1>
+				<div id="brddesc"><p><?php echo __('Welcome') ?></p></div>
 			</div>
 		</div>
 	</div>
@@ -409,15 +406,15 @@ function process_form(the_form)
 <section class="container">
 	<div id="brdmain">
 	<?php if (count($languages) > 1): ?><div class="blockform">
-		<h2><span><?php echo $lang_install['Choose install language'] ?></span></h2>
+		<h2><span><?php echo __('Choose install language') ?></span></h2>
 		<div class="box">
 			<form id="install" method="post" action="">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_install['Install language'] ?></legend>
+						<legend><?php echo __('Install language') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_install['Choose install language info'] ?></p>
-							<label><strong><?php echo $lang_install['Install language'] ?></strong>
+							<p><?php echo __('Choose install language info') ?></p>
+							<label><strong><?php echo __('Install language') ?></strong>
 							<br /><select name="install_lang">
 <?php
 
@@ -435,7 +432,7 @@ function process_form(the_form)
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="start" value="<?php echo $lang_install['Change language'] ?>" /></p>
+				<p class="buttons"><input type="submit" name="start" value="<?php echo __('Change language') ?>" /></p>
 			</form>
 		</div>
 	</div>
@@ -443,13 +440,13 @@ function process_form(the_form)
     ?>
 
 	<div class="blockform">
-		<h2><span><?php echo sprintf($lang_install['Install'], FORUM_VERSION) ?></span></h2>
+		<h2><span><?php echo sprintf(__('Install'), FORUM_VERSION) ?></span></h2>
 		<div class="box">
 			<form id="install" method="post" action="" onsubmit="this.start.disabled=true;if(process_form(this)){return true;}else{this.start.disabled=false;return false;}">
 			<div><input type="hidden" name="form_sent" value="1" /><input type="hidden" name="install_lang" value="<?php echo feather_escape($install_lang) ?>" /></div>
 				<div class="inform">
 	<?php if (!empty($alerts)): ?>				<div class="forminfo error-info">
-						<h3><?php echo $lang_install['Errors'] ?></h3>
+						<h3><?php echo __('Errors') ?></h3>
 						<ul class="error-list">
 <?php
 
@@ -463,14 +460,14 @@ function process_form(the_form)
     ?>			</div>
 				<div class="inform">
 					<div class="forminfo">
-						<h3><?php echo $lang_install['Database setup'] ?></h3>
-						<p><?php echo $lang_install['Info 1'] ?></p>
+						<h3><?php echo __('Database setup') ?></h3>
+						<p><?php echo __('Info 1') ?></p>
 					</div>
 					<fieldset>
-					<legend><?php echo $lang_install['Select database'] ?></legend>
+					<legend><?php echo __('Select database') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_install['Info 2'] ?></p>
-							<label class="required"><strong><?php echo $lang_install['Database type'] ?> <span><?php echo $lang_install['Required'] ?></span></strong>
+							<p><?php echo __('Info 2') ?></p>
+							<label class="required"><strong><?php echo __('Database type') ?> <span><?php echo __('Required') ?></span></strong>
 							<br /><select name="req_db_type">
 <?php
 
@@ -490,71 +487,71 @@ function process_form(the_form)
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_install['Database hostname'] ?></legend>
+						<legend><?php echo __('Database hostname') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_install['Info 3'] ?></p>
-							<label class="required"><strong><?php echo $lang_install['Database server hostname'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input type="text" name="req_db_host" value="<?php echo feather_escape($db_host) ?>" size="50" /><br /></label>
+							<p><?php echo __('Info 3') ?></p>
+							<label class="required"><strong><?php echo __('Database server hostname') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_db_host" value="<?php echo feather_escape($db_host) ?>" size="50" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_install['Database enter name'] ?></legend>
+						<legend><?php echo __('Database enter name') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_install['Info 4'] ?></p>
-							<label class="required"><strong><?php echo $lang_install['Database name'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input id="req_db_name" type="text" name="req_db_name" value="<?php echo feather_escape($db_name) ?>" size="30" /><br /></label>
+							<p><?php echo __('Info 4') ?></p>
+							<label class="required"><strong><?php echo __('Database name') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_db_name" type="text" name="req_db_name" value="<?php echo feather_escape($db_name) ?>" size="30" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_install['Database enter informations'] ?></legend>
+						<legend><?php echo __('Database enter informations') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_install['Info 5'] ?></p>
-							<label class="conl"><?php echo $lang_install['Database username'] ?><br /><input type="text" name="db_username" value="<?php echo feather_escape($db_username) ?>" size="30" /><br /></label>
-							<label class="conl"><?php echo $lang_install['Database password'] ?><br /><input type="password" name="db_password" size="30" /><br /></label>
+							<p><?php echo __('Info 5') ?></p>
+							<label class="conl"><?php echo __('Database username') ?><br /><input type="text" name="db_username" value="<?php echo feather_escape($db_username) ?>" size="30" /><br /></label>
+							<label class="conl"><?php echo __('Database password') ?><br /><input type="password" name="db_password" size="30" /><br /></label>
 							<div class="clearer"></div>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_install['Database enter prefix'] ?></legend>
+						<legend><?php echo __('Database enter prefix') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_install['Info 6'] ?></p>
-							<label><?php echo $lang_install['Table prefix'] ?><br /><input id="db_prefix" type="text" name="db_prefix" value="<?php echo feather_escape($db_prefix) ?>" size="20" maxlength="30" /><br /></label>
+							<p><?php echo __('Info 6') ?></p>
+							<label><?php echo __('Table prefix') ?><br /><input id="db_prefix" type="text" name="db_prefix" value="<?php echo feather_escape($db_prefix) ?>" size="20" maxlength="30" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<div class="forminfo">
-						<h3><?php echo $lang_install['Administration setup'] ?></h3>
-						<p><?php echo $lang_install['Info 7'] ?></p>
+						<h3><?php echo __('Administration setup') ?></h3>
+						<p><?php echo __('Info 7') ?></p>
 					</div>
 					<fieldset>
-						<legend><?php echo $lang_install['Administration setup'] ?></legend>
+						<legend><?php echo __('Administration setup') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_install['Info 8'] ?></p>
-							<label class="required"><strong><?php echo $lang_install['Administrator username'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input type="text" name="req_username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
-							<label class="conl required"><strong><?php echo $lang_install['Password'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input id="req_password1" type="password" name="req_password1" size="16" /><br /></label>
-							<label class="conl required"><strong><?php echo $lang_install['Confirm password'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input type="password" name="req_password2" size="16" /><br /></label>
+							<p><?php echo __('Info 8') ?></p>
+							<label class="required"><strong><?php echo __('Administrator username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
+							<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_password1" type="password" name="req_password1" size="16" /><br /></label>
+							<label class="conl required"><strong><?php echo __('Confirm password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" size="16" /><br /></label>
 							<div class="clearer"></div>
-							<label class="required"><strong><?php echo $lang_install['Administrator email'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input id="req_email" type="text" name="req_email" value="<?php echo feather_escape($email) ?>" size="50" maxlength="80" /><br /></label>
+							<label class="required"><strong><?php echo __('Administrator email') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" value="<?php echo feather_escape($email) ?>" size="50" maxlength="80" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<div class="forminfo">
-						<h3><?php echo $lang_install['Board setup'] ?></h3>
-						<p><?php echo $lang_install['Info 11'] ?></p>
+						<h3><?php echo __('Board setup') ?></h3>
+						<p><?php echo __('Info 11') ?></p>
 					</div>
 					<fieldset>
-						<legend><?php echo $lang_install['General information'] ?></legend>
+						<legend><?php echo __('General information') ?></legend>
 						<div class="infldset">
-							<label class="required"><strong><?php echo $lang_install['Board title'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input id="req_title" type="text" name="req_title" value="<?php echo feather_escape($title) ?>" size="60" maxlength="255" /><br /></label>
-							<label><?php echo $lang_install['Board description'] ?><br /><input id="desc" type="text" name="desc" value="<?php echo feather_escape($description) ?>" size="60" maxlength="255" /><br /></label>
-							<label class="required"><strong><?php echo $lang_install['Base URL'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input id="req_base_url" type="text" name="req_base_url" value="<?php echo feather_escape($base_url) ?>" size="60" maxlength="100" /><br /></label>
-							<label class="required"><strong><?php echo $lang_install['Default language'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><select id="req_default_lang" name="req_default_lang">
+							<label class="required"><strong><?php echo __('Board title') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_title" type="text" name="req_title" value="<?php echo feather_escape($title) ?>" size="60" maxlength="255" /><br /></label>
+							<label><?php echo __('Board description') ?><br /><input id="desc" type="text" name="desc" value="<?php echo feather_escape($description) ?>" size="60" maxlength="255" /><br /></label>
+							<label class="required"><strong><?php echo __('Base URL') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_base_url" type="text" name="req_base_url" value="<?php echo feather_escape($base_url) ?>" size="60" maxlength="100" /><br /></label>
+							<label class="required"><strong><?php echo __('Default language') ?> <span><?php echo __('Required') ?></span></strong><br /><select id="req_default_lang" name="req_default_lang">
 <?php
 
             $languages = forum_list_langs();
@@ -571,7 +568,7 @@ function process_form(the_form)
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="start" value="<?php echo $lang_install['Start install'] ?>" /></p>
+				<p class="buttons"><input type="submit" name="start" value="<?php echo __('Start install') ?>" /></p>
 			</form>
 		</div>
 	</div>
@@ -618,7 +615,7 @@ function process_form(the_form)
             break;
 
         default:
-            error(sprintf($lang_install['DB type not valid'], feather_escape($db_type)));
+            error(sprintf(__('DB type not valid'), feather_escape($db_type)));
     }
 
     // Create the database object (and connect/select db)
@@ -626,7 +623,7 @@ function process_form(the_form)
 
     // Validate prefix
     if (strlen($db_prefix) > 0 && (!preg_match('%^[a-zA-Z_][a-zA-Z0-9_]*$%', $db_prefix) || strlen($db_prefix) > 40)) {
-        error(sprintf($lang_install['Table prefix error'], $db->prefix));
+        error(sprintf(__('Table prefix error'), $db->prefix));
     }
 
     // Do some DB type specific checks
@@ -637,21 +634,21 @@ function process_form(the_form)
         case 'mysqli_innodb':
             $mysql_info = $db->get_version();
             if (version_compare($mysql_info['version'], MIN_MYSQL_VERSION, '<')) {
-                error(sprintf($lang_install['You are running error'], 'MySQL', $mysql_info['version'], FORUM_VERSION, MIN_MYSQL_VERSION));
+                error(sprintf(__('You are running error'), 'MySQL', $mysql_info['version'], FORUM_VERSION, MIN_MYSQL_VERSION));
             }
             break;
 
         case 'pgsql':
             $pgsql_info = $db->get_version();
             if (version_compare($pgsql_info['version'], MIN_PGSQL_VERSION, '<')) {
-                error(sprintf($lang_install['You are running error'], 'PostgreSQL', $pgsql_info['version'], FORUM_VERSION, MIN_PGSQL_VERSION));
+                error(sprintf(__('You are running error'), 'PostgreSQL', $pgsql_info['version'], FORUM_VERSION, MIN_PGSQL_VERSION));
             }
             break;
 
         case 'sqlite':
         case 'sqlite3':
             if (strtolower($db_prefix) == 'sqlite_') {
-                error($lang_install['Prefix reserved']);
+                error(__('Prefix reserved'));
             }
             break;
     }
@@ -660,7 +657,7 @@ function process_form(the_form)
     // Make sure FeatherBB isn't already installed
     $result = $db->query('SELECT 1 FROM '.$db_prefix.'users WHERE id=1');
     if ($db->num_rows($result)) {
-        error(sprintf($lang_install['Existing table error'], $db_prefix, $db_name));
+        error(sprintf(__('Existing table error'), $db_prefix, $db_name));
     }
 
     // Check if InnoDB is available
@@ -668,7 +665,7 @@ function process_form(the_form)
         $result = $db->query('SHOW VARIABLES LIKE \'have_innodb\'');
         list(, $result) = $db->fetch_row($result);
         if ((strtoupper($result) != 'YES')) {
-            error($lang_install['InnoDB off']);
+            error(__('InnoDB off'));
         }
     }
 
@@ -1613,16 +1610,16 @@ function process_form(the_form)
     $now = time();
 
     // Insert the four preset groups
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '1, ' : '').'\''.$db->escape($lang_install['Administrators']).'\', \''.$db->escape($lang_install['Administrator']).'\', 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
+    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '1, ' : '').'\''.$db->escape(__('Administrators')).'\', \''.$db->escape(__('Administrator')).'\', 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
 
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_mod_promote_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '2, ' : '').'\''.$db->escape($lang_install['Moderators']).'\', \''.$db->escape($lang_install['Moderator']).'\', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
+    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_mod_promote_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '2, ' : '').'\''.$db->escape(__('Moderators')).'\', \''.$db->escape(__('Moderator')).'\', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
 
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '3, ' : '').'\''.$db->escape($lang_install['Guests']).'\', NULL, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 60, 30, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
+    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '3, ' : '').'\''.$db->escape(__('Guests')).'\', NULL, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 60, 30, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
 
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '4, ' : '').'\''.$db->escape($lang_install['Members']).'\', NULL, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 60, 30, 60, 60)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
+    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '4, ' : '').'\''.$db->escape(__('Members')).'\', NULL, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 60, 30, 60, 60)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
 
     // Insert guest and first admin user
-    $db->query('INSERT INTO '.$db_prefix.'users (group_id, username, password, email) VALUES(3, \''.$db->escape($lang_install['Guest']).'\', \''.$db->escape($lang_install['Guest']).'\', \''.$db->escape($lang_install['Guest']).'\')')
+    $db->query('INSERT INTO '.$db_prefix.'users (group_id, username, password, email) VALUES(3, \''.$db->escape(__('Guest')).'\', \''.$db->escape(__('Guest')).'\', \''.$db->escape(__('Guest')).'\')')
         or error('Unable to add guest user. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
 
     $db->query('INSERT INTO '.$db_prefix.'users (group_id, username, password, email, language, style, num_posts, last_post, registered, registration_ip, last_visit) VALUES(1, \''.$db->escape($username).'\', \''.feather_hash($password1).'\', \''.$email.'\', \''.$db->escape($default_lang).'\', \''.$db->escape($default_style).'\', 1, '.$now.', '.$now.', \''.$db->escape(get_remote_address()).'\', '.$now.')')
@@ -1690,11 +1687,11 @@ function process_form(the_form)
         'o_regs_allow'                => 1,
         'o_regs_verify'                => 0,
         'o_announcement'            => 0,
-        'o_announcement_message'    => $lang_install['Announcement'],
+        'o_announcement_message'    => __('Announcement'),
         'o_rules'                    => 0,
-        'o_rules_message'            => $lang_install['Rules'],
+        'o_rules_message'            => __('Rules'),
         'o_maintenance'                => 0,
-        'o_maintenance_message'        => $lang_install['Maintenance message'],
+        'o_maintenance_message'        => __('Maintenance message'),
         'o_default_dst'                => 0,
         'o_feed_type'                => 2,
         'o_feed_ttl'                => 0,
@@ -1718,13 +1715,13 @@ function process_form(the_form)
     }
 
     // Insert some other default data
-    $subject = $lang_install['Test post'];
-    $message = $lang_install['Message'];
+    $subject = __('Test post');
+    $message = __('Message');
 
-    $db->query('INSERT INTO '.$db_prefix.'categories (cat_name, disp_position) VALUES(\''.$db->escape($lang_install['Test category']).'\', 1)')
+    $db->query('INSERT INTO '.$db_prefix.'categories (cat_name, disp_position) VALUES(\''.$db->escape(__('Test category')).'\', 1)')
         or error('Unable to insert into table '.$db_prefix.'categories. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
 
-    $db->query('INSERT INTO '.$db_prefix.'forums (forum_name, forum_desc, num_topics, num_posts, last_post, last_post_id, last_poster, disp_position, cat_id) VALUES(\''.$db->escape($lang_install['Test forum']).'\', \''.$db->escape($lang_install['This is just a test forum']).'\', 1, 1, '.$now.', 1, \''.$db->escape($username).'\', 1, 1)')
+    $db->query('INSERT INTO '.$db_prefix.'forums (forum_name, forum_desc, num_topics, num_posts, last_post, last_post_id, last_poster, disp_position, cat_id) VALUES(\''.$db->escape(__('Test forum')).'\', \''.$db->escape(__('This is just a test forum')).'\', 1, 1, '.$now.', 1, \''.$db->escape($username).'\', 1, 1)')
         or error('Unable to insert into table '.$db_prefix.'forums. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
 
     $db->query('INSERT INTO '.$db_prefix.'topics (poster, subject, posted, first_post_id, last_post, last_post_id, last_poster, forum_id) VALUES(\''.$db->escape($username).'\', \''.$db->escape($subject).'\', '.$now.', 1, '.$now.', 1, \''.$db->escape($username).'\', 1)')
@@ -1740,7 +1737,7 @@ function process_form(the_form)
 
     // Check if we disabled uploading avatars because file_uploads was disabled
     if ($avatars == '0') {
-        $alerts[] = $lang_install['Alert upload'];
+        $alerts[] = __('Alert upload');
     }
 
     // Add some random bytes at the end of the cookie name to prevent collisions
@@ -1773,7 +1770,7 @@ function process_form(the_form)
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><?php echo $lang_install['FeatherBB Installation'] ?></title>
+<title><?php echo __('FeatherBB Installation') ?></title>
 <link rel="stylesheet" type="text/css" href="../style/<?php echo $default_style ?>.css" />
 </head>
 <body>
@@ -1786,8 +1783,8 @@ function process_form(the_form)
     <div id="brdheader" class="block">
             <div class="box">
                     <div id="brdtitle" class="inbox">
-                            <h1><span><?php echo $lang_install['FeatherBB Installation'] ?></span></h1>
-                            <div id="brddesc"><p><?php echo $lang_install['FeatherBB has been installed'] ?></p></div>
+                            <h1><span><?php echo __('FeatherBB Installation') ?></span></h1>
+                            <div id="brddesc"><p><?php echo __('FeatherBB has been installed') ?></p></div>
                     </div>
             </div>
     </div>
@@ -1795,7 +1792,7 @@ function process_form(the_form)
     <div id="brdmain">
 
     <div class="blockform">
-            <h2><span><?php echo $lang_install['Final instructions'] ?></span></h2>
+            <h2><span><?php echo __('Final instructions') ?></span></h2>
             <div class="box">
     <?php
 
@@ -1804,8 +1801,8 @@ function process_form(the_form)
                     <form method="post" action="">
                             <div class="inform">
                                     <div class="forminfo">
-                                            <p><?php echo $lang_install['Info 17'] ?></p>
-                                            <p><?php echo $lang_install['Info 18'] ?></p>
+                                            <p><?php echo __('Info 17') ?></p>
+                                            <p><?php echo __('Info 18') ?></p>
                                     </div>
                                     <input type="hidden" name="generate_config" value="1" />
                                     <input type="hidden" name="db_type" value="<?php echo $db_type;
@@ -1837,7 +1834,7 @@ function process_form(the_form)
                                     </div>
     <?php endif;
         ?>			</div>
-                            <p class="buttons"><input type="submit" value="<?php echo $lang_install['Download config.php file'] ?>" /></p>
+                            <p class="buttons"><input type="submit" value="<?php echo __('Download config.php file') ?>" /></p>
                     </form>
 
     <?php
@@ -1847,7 +1844,7 @@ function process_form(the_form)
                     <div class="fakeform">
                             <div class="inform">
                                     <div class="forminfo">
-                                            <p><?php echo $lang_install['FeatherBB fully installed'] ?></p>
+                                            <p><?php echo __('FeatherBB fully installed') ?></p>
                                     </div>
                             </div>
                     </div>
diff --git a/lang/English/antispam.mo b/lang/English/antispam.mo
new file mode 100644
index 0000000000000000000000000000000000000000..2d884422712f3935e89b7acbab004e1cdb67f9c4
GIT binary patch
literal 751
zcmYk4!EVz)5QYsDAsGn}7cLxzN=R^6mmm(2n*?auK&4bfB_KF(SjUrO!QM5qYf9b#
z?r`JABk%w`1~;CC-*MBj^5@yvotfX>*}pfpzDF3B!ELY)u7CnG;|qwvS8xq{1J}V%
za25OllM7Mw8+HtCT#TXt>^s;L_6O`O*gvoci!K37*LpDPvDLhfUFHHAJ9nqkk2U*X
zoIP~|Jeq4$Y<v?6jwVGdx=<r0rBBILYuEQ5?ovDL-?Mb5Po4X_@kHEvo&|N7tJf?Z
zl~WqA4ojB3y?F9ss)hm=>uO&IP6=!3m_L~&bh9+pKB%c^>kA#6AZV=ZqSgymQ`Y5w
z6{)B5(%2{SRwBz1CyPORba-@duHQ)>#6xETTU1?D5Dok}>{Nv|c9&*LEuKUF)pVq~
z=W&htoJAejnahn`q}0t!IQx*4*v4<vGqx=4H%=VqCQv8oCXcYwy6UB?WyZr+Bc)a(
z8ZLSE0Y%BoDJ+dAJi_Z<a8B8ZG+bR!g(Gy9w9Uz)ZyM7&xDp4KQzdR8x=hd=)}E2z
zD~G@n6PC#DWdmE68B1>`8&Gi2VcK*%ZMN_FW-EH@Y83V-EGTO5w<2g@vD)NpKd(y&
aJE8UE**+_hL{Eijh4kenLYnLKIQj?9tlQE6

literal 0
HcmV?d00001

diff --git a/lang/English/antispam.po b/lang/English/antispam.po
new file mode 100644
index 00000000..75fa1d31
--- /dev/null
+++ b/lang/English/antispam.po
@@ -0,0 +1,27 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Robot title"
+msgstr "Are you human or robot?"
+
+msgid "Robot question"
+msgstr "Please respond with a <b>number</b> to the question: <b>%s</b>"
+
+msgid "Robot info"
+msgstr "Checking if this is requested by a real person and not an automated program."
+
+msgid "Robot test fail"
+msgstr "You answered incorrectly to the \"Human or Robot\" question."
diff --git a/lang/English/antispam_questions.mo b/lang/English/antispam_questions.mo
new file mode 100644
index 0000000000000000000000000000000000000000..f3ff0a71bb65c8f0a8a5a078d57338b2408dd0e7
GIT binary patch
literal 765
zcmZ{f&uUXa6vn5u{=06h;6LbM*1|+@ZOUy#3bsWGEd~iH?#ARKnUc(enUh!_!et+!
zZ{Z`jbnU88C?X<-BHj4i^rR_L=iV>B`+alf%*ppVb9)Nw7PJ5{G!K1+%5{52sR!UZ
zcprQud;va$e=qwi`DgGR@_q4Nz`O9@#2<kN@UycJc!(cF>PYxQ_*3{x_#4Elj>Vq{
z{|HZo*HANAH{_%IZ&#rVx-QvG@QQqwn1j$lskdFr+9ge{(`C)BPf7E~uzJ4Hb|cb#
z=ZF91VHhP3o~HHQ`AL1E5&7xP*j{!dxm`Wzl^1j)U1(M2mrOLSk^>hf#n}Hz&ziI`
z@v5rFutQBYn=SK(VsgRPbXI@WFl&)4!<u!=G|tRx8o9D!5^dSUrV*`AJ<B1YXv_M}
z(00f)$oAp4H@7#Yee=qbY%O>uk7J((=*qOqj|V;L{4?F`+L(x+yA(`OR98$sEiUh9
zQ#2dC8CuSFYP$H~`24z>CZD}CFUeCpo1`A7<yhyHqOz2!d|5rkv#6HUipm#NRV}GP
F{RM6Rwd?=@

literal 0
HcmV?d00001

diff --git a/lang/English/antispam_questions.po b/lang/English/antispam_questions.po
new file mode 100644
index 00000000..384893e1
--- /dev/null
+++ b/lang/English/antispam_questions.po
@@ -0,0 +1,43 @@
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+
+msgid "What is two plus two?"
+msgstr "4"
+
+msgid "What is four minus one?"
+msgstr "3"
+
+msgid "What is three plus two?"
+msgstr "5"
+
+msgid "What is two times four?"
+msgstr "8"
+
+msgid "What is five minus two?"
+msgstr "3"
+
+msgid "What is six plus three?"
+msgstr "9"
+
+msgid "What is seven minus one?"
+msgstr "6"
+
+msgid "What is eight times two?"
+msgstr "16"
+
+msgid "What is six times two?"
+msgstr "12"
+
+msgid "What is nine minus seven?"
+msgstr "2"
diff --git a/lang/English/bbeditor.mo b/lang/English/bbeditor.mo
new file mode 100644
index 0000000000000000000000000000000000000000..a176f079a551314464013f06d3593a9f9617a8a5
GIT binary patch
literal 1082
zcmYk4J!}&(6vq!*zQRWVAu+&U2BadmKr4poN)T#jQBW#ENf4`(dr3_%cJTQsDmE5i
zU_gQi76c;;3p0!i42Y=<3#_b&k^i$V1WUf3-+T6Z&;H-{qth=Uj3byQG2dby$2_+K
zAB@M~9`Fgc4}4bIFTuUA-<1A$U<LMvGXAOL=aOH`_%_JrewO?N9)SHD+z(Fe44eVE
z-U+aU*lBPY_U2R+?FJu!Y(E5dfsac6Q;_?8UdCU6Gq7KShrstB*ZT<axi2NZfn0AJ
zJO=&%=fOW9pF4|UXv3f3w}RW};TR9@g$KXEVZWMu_`ZBM?gQ8Gb%5v~CilwsiMmcN
znJi`2NjtKBWl{>vjCVAg%v6tE*Nfb#{uVEr)OVgrZv^JvZmFIttWR*WFwQU5)L`8Q
zJ31wsDNWJHn&HSbhH@}ohuy*7v02p03M;dC#n@q<2tD#<UYlPOVOg8i;#5t{oms53
zthq})7dO)QHrZSmoro2ZZk_DXQl)jH9oH>P_~Wb6Q6k`r*JxAm*0HN8a~HR*)OjYI
zvDnm<dQhOjxJ`2SUq*3BrbDH#^h1emw`%O*a%Hu#x;&{rSG`cF8@#DT)~ykWI=b)9
zk20zBqUfzlo0F?`+AHzGWFJ@WlZ}^k&!kEZ60y)#?q4H`AYHi=Un5O6^w=_#DktWu
z3)PE=1T(&63frT4sF8?JB=Sm^GS^w-x?zD!b;r_rT^l+l>qKX*DVnTrM;i;}D1`}`
z%WzOH=oTcN=)25+lYj!k@8VPmBqf;>E-{W3D5K?&#6A91QZZ|+z@AMK-Aw9@Gf6bb
H<1_pPbWa9S

literal 0
HcmV?d00001

diff --git a/lang/English/bbeditor.php b/lang/English/bbeditor.php
deleted file mode 100644
index 7e1990a3..00000000
--- a/lang/English/bbeditor.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-// Language definitions used in viewtopic.php and post.php
-$lang_bbeditor = array(
-
-    'btnBold'           => 'Bold',
-    'btnItalic'         => 'Italic',
-    'btnUnderline'      => 'Underline',
-    'btnColor'          => 'Color',
-    'btnLeft'           => 'Left',
-    'btnRight'          => 'Right',
-    'btnJustify'        => 'Justify',
-    'btnCenter'         => 'Center',
-    'btnLink'           => 'Insert URL Link',
-    'btnPicture'        => 'Insert Image',
-    'btnList'           => 'Ordered List',
-    'btnList'           => 'Unordered List',
-    'btnQuote'          => 'Quote',
-    'btnCode'           => 'Code',
-
-    'promptImage'       => 'Enter the Image URL:',
-    'promptUrl'         => 'Enter the URL:',
-    'promptQuote'         => 'Please enter the username quoted (or leave blank):'
-
-);
diff --git a/lang/English/bbeditor.po b/lang/English/bbeditor.po
new file mode 100644
index 00000000..3deedec3
--- /dev/null
+++ b/lang/English/bbeditor.po
@@ -0,0 +1,63 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "btnBold"
+msgstr "Bold"
+
+msgid "btnItalic"
+msgstr "Italic"
+
+msgid "btnUnderline"
+msgstr "Underline"
+
+msgid "btnColor"
+msgstr "Color"
+
+msgid "btnLeft"
+msgstr "Left"
+
+msgid "btnRight"
+msgstr "Right"
+
+msgid "btnJustify"
+msgstr "Justify"
+
+msgid "btnCenter"
+msgstr "Center"
+
+msgid "btnLink"
+msgstr "Insert URL Link"
+
+msgid "btnPicture"
+msgstr "Insert Image"
+
+msgid "btnList"
+msgstr "Unordered List"
+
+msgid "btnQuote"
+msgstr "Quote"
+
+msgid "btnCode"
+msgstr "Code"
+
+msgid "promptImage"
+msgstr "Enter the Image URL:"
+
+msgid "promptUrl"
+msgstr "Enter the URL:"
+
+msgid "promptQuote"
+msgstr "Please enter the username quoted (or leave blank):"
diff --git a/lang/English/common.mo b/lang/English/common.mo
new file mode 100644
index 0000000000000000000000000000000000000000..fc08237e6da5b22b1f2d17b687732e820380b425
GIT binary patch
literal 9404
zcmcJUdypK*UB}yz@~{ZDF;46}-I8_DU7}lA@&j>}?CA8eY&|Y_Cp)%dl-b?hyODNh
z)-$uZJKMx@9!L-ygTW36Cq)G#!0?9+1;HdmVg)J`sS1>1C|3niR2dAFa!4s8#l!r;
z=iAe>w=2omq>8Qk&1br&AHV+1ue*Oe_pOUpK4SQtK;DVGw9=Swz%QQ9h2NWg)ENHE
z`CMKPFAeE;!4;(62j2`gz)Rs4cp;n(Y{EB?F5p|?J@Cij!|)yOB>XXW3ab8d;rUBY
z<;?{pFNJR*Sqt0&FCl$9RJ|0c{4sbj{4A6nPlfa|Q2jgySHTxU{%QDj(km&f@m~&A
zZwnXow-;)Bb@(GN4ZH`UqB$1$NZ@ZkjrS?2dVdV*!u&Z@{pSMz0m_~)1%3~{j`V-P
zH^P@g{)&rAeb0x|=Mt!T?}fZ7b0w4>*Fe?V4)yA8h8pKVC_O$5Rj&i3UmkcjlwSA4
z%ix2MKXZ}`DwxkhmH#SKJ70(D=bKRDdLi(8;rV$OS^ZxC)&FHs{az9B#~?+`RZ#VJ
zK=nTZHJ(FI^_x)RN}&3?H>5uS)$YR~|1(haeiN#nC*YgllThWJhHB@}!t-ZC{_{}f
zUVv)<B`EuTAM$5b;Y3Qm6RO=!P<n2L(r*WpzwL*zlY=VXgBsVTpvs*H>Bph!{{d9L
zUxL!_FQEGWM#%prRDb^nW%qAGl{*djGyly+?O(_wQu^IcdTfMh|3;|s&IZ;4yMZ4G
zd?4@yRR6yX)!&m)?R-Aue<kF94N9+Pp~m}sNdHUVze4HteW>@lg2^d6UIL}hd!X!b
zHPra8hy0n{A^$^A>q!f09vp_!s{=L89#s3sq5A)H$p0;<dVc~{?@yu1Jp)z$uc7pQ
z9!{NS%(tM%xdEf8+_g~p?SyJ)2FlNGg<4mdQ2pH-_yAP9k3pI;k3+3vPs6vtzky@$
zyYSucZ8WkGZiZLE!*DhHEW8qa8D0ZV!>w=~lW-k$Q0WKZ2>cq{08c~JTTN$5Ps7dd
zV^HmX0p0+=8}c`>xXJGGP|q`X19mtGw~&4j<u8X<u=u?TZihF)2>vAeJt%v<2xXV=
zz<KyzP=3;&lHPL)W#{_?k3r4L2chisaL7Lq`0G&f<zz^I5vu$tDEoaCs@`cR{r?l{
zeXYQ#(&J*N{w{~oZv?8`dMLfFg{WvIA*MBl0vDjlKLq7hk3#kHJ5cRE75HVSe*Oxo
z-M@pHhc80)dphL*JCxs?hY|JOUJo^{aj5ZZhmXM<q2AX&LA}4X*mB<Pf@=3pC_Ux_
zyHI*ALd}=^p!7KomH!Bo9*;r!@8_V(Jqgv$)9@Df415q?hSTkbC!y;70IK}UQ2MM~
zQ|faK#MEXll>H7v+2t72cpeSuUxTvq6Hx8^5!5)o1l9jvhV-*g{rx?Z-Y<mwZ$nIH
zegHK;F1e!g!(CAQwxIg^I8?pkfe!^f8u*#O#{+*CN}t~k=`TR(c?wFeuZR4<g<dbX
zg8Uak`kw>816BUtpyv6@P~*F3ZE5d!K>5WORDV}N*=<Y6za6e1-Gr}$^HBAV!1LhI
z@O&{mzc=LH7xM29`JaTmB6A$7{u5C4_(Q06egRoP?m|9<Smb^rMx@sgGLNtvnD-((
zk)z0AWC!xIh(mr6`7okiihLT;{J#y+Ph;5Y@5;+oFg}ph?XMv6CH?jwvb*NO4am<U
z`rTK;uNk^M9@59)&mfws*N41^VGX$lk*~0|_}?#c9YNlMtV385{n`f1c3t@4R%VyK
zGv)w{kPjfggvgF7k=4i)@&NJ(QvL4W=21lJ!=WlO@F(CbBA?ao-V$asum?9G^^nGG
z%+<(TNDDK_$B-s+5i*JFMjD8IEkwTARwDe~2X8{wBkxD9L$)EBD`)=3$T%PAAfE^i
z-xw&o0l69JB0q=dCm+{OK76geEB!p&nvYgD@Cd@T;eWr%burwpfcwJz#{&heJ10W=
z8hAJIX5_6QuY%U81YwCZKaE_7WXPRJj(ifi0NIR8AX-oLyB&E5DUh|ut;pMv8xj4c
zkz0^YDZ%d`@)6{N$QI<M5VNgO#7CVi(r(<y&9-JIPReVX7g<!Knc3EEn{7#w_L7F{
zxTG-KinL>+!FsmkT(it?rCF~tkoFCi>B-6MY15g>Ntb1IPjWPB$4z^1daq5Q&Y9Vb
zv`yE;MO`O~+cs)8GneP#Sv_jnc^5TZHk4BoT}!EMn&ef>D%o*GWSdbDRkiC4G_p}q
zWO2P$R7D#R!!2w#%?s&QwHybP8);I=4yATgZsPJHPUg<Y?MB&h(N3J_6gjKEP}QbK
zUDj%+3!#l9wXL}AY#!fTX_lmkjXTj?l}@wne3aNmJME7%WTjn~gm$`(tSX<oc58fC
z(_Z2hyRK2V=2?36lFT*IxrF|QA9nINTaV}ZswnN%%55{wqk0=}n8e<hYw@lfFVZLO
z>R}`96JA7~`%x_4+f9Q{>{UaltCdRBY8qut+e*`dR=2m~#t}Mc#^_m)#0sS+n;ov+
zo3n*fF+1fqW|th(>`wW!^{8>g?DpF1ku_~QPL7y8oo<>HQBv4A!Hqjn5vPgSlQi8T
z*H+4<^jYtS=B8e!OK)axgqz4$%Dba+9&?+{&0(}Su~DuBvx;llE6hHWL3bc8ikMV`
z_qHR4B;VU`Uz8oOQ5&bv8D`X^BpKxtE7Pu1S7WY|W=po`ZMrYmb{{P<gI!tP^pk!@
z_LEIpU#b$!xPACwFyVfOJDUA&!4EE9z6%p>AVc=@$;`=wD!W*i{i$uF>5<s!uIn=I
z{#caM(bz4(!nP|rnFBa%==nfbme0+UTtpY$=J`UJHO-WZj)Z|uVRLL8mM*0zmo7LQ
zLW7#h+|fAgk(Z^KM`o(W<VhOs9u_WL2BQt-;;h(UupHxXNiIM5K+jRyUu_ZNz~#Me
z&GgL7xfVoaH(lPyVm}~XY#<#*t5O52rjnSkz2u7zET7ZC&$Y-*yE)cpUQczy)R?AH
zj9Sy~t{xMDj9#1MjEl0yJV=_hbljQwbYWOs<Fk_ftM*B`^s;$<Ru6y8O9Kb1&#*Sw
zUJ@5}(k$Qaj0aP@hf+5WrS=V_riN0pN_ApCsF`lmV7N1dW_;<vGrjs@O?%j3#?8hB
z@7P~$?pSyI<~5r(qa`z|-L1UxO!mMqvuP2vEo%}p$G^pcXN~S)!kXUi@L=vTRthG%
z?);{8YZf!X!fIyQZVoG(+gRmXrhX$*cw*eqQZ#4UQ8IU^=^8AR?L*y^1t4Vk^-E6X
zOT<mKjJOpuUY{=J@nV|F4>2y2wpxagS$NBA5w6`dy{zrKSjboz%~ZRWMeT8xyiPu0
zldezZTQ^;2%iFD^iCw+bZXCOA6_Z0&9N*I%zlBW{B_`}H7Zvj^o19!VbzpXUJ1dRm
z<M<91lL<@S_%t(1MXM|=f#b6o&e4|DDYTcN_L#Zjvo7ikv}m_P3NhZ_D!ZuHYiTxj
z{i=O?_U&Bme`D>+Rolx=c6@fJOQ!|%a6`Avnt7dV%tu-7imeA{ca3jeE~nnvZN_&d
z?CH#r3A?!-7kx!0SX5ViaD2B*v?xl)sgwy-*p0Q#wX1njCdX&eUe<8i%RVM-*-40!
z1_L9#EgvoYf5k}?{q3d-ktXa&-p}*_((;Zy^lT_l@=tJWHWVg~-$uA}aFcS&w(|;>
zLJU=7pKaP3XJ@A<Q-)9B(S%(ylCLp?4G}c4MTAxqRoPZXWEdL9BYoG~s^H3Yq9wck
zz$}|WQt&3NLKK^3W%Od}Wh}-#$<1wP&qkTEio)3bSktx4mjRi!>OnL3SZuu=9m&V&
z+An>%&53B3K@Hy*v#DlAM>ejd!~#31`lZ2zxR^(a(UDC&SZ_(>mcM~M`?W$qSa+e)
zM5tA>1jp%uw{02eX%aH!My^_$_iNK=Kk}<o9Ehj-<)~__P_XH`#XRk7TFa`v*dV;l
zOH25^+A%Ah@1<EAcqL88y2I>p)jQ~ik2Q7$|H`#aG*ed&b3Wqr4NtT+K8#yaGY1AD
zOAU%4Z;*)x1``*hE%mrx!N1h9{5gvIK(#FIUs#A$)M}BYL<2;}c!cg7X{XzEi#0pd
zb`f!1K2K!f5?Sk<?-6YXZeQU&9y~{oE04w}*3|4M5lR0H(04fY<mxqJ<8wvARSWAY
zzbV7R!HSdpD7g$Y36ELEmb{lWdc?*_(O#<JJ%x+j4gCp&2&$Tlho*P#+Bv;*x@I*q
zv;p&meQ53Hg|E|99P1|_F*O@?k8LCKk$di!w3^-1qIGAxS;|__QAC!rc;)N~-oTyc
z2v+XVb}=6ncHN|`&f2q1qidw-+K{d+z0%XKeH%igX4##}T1#Q(`Y2du9raj7H+4oG
z9gXMMOq8FN73iR5_oehY5Og!TIpX}Peszps>38hL%tp&pY;hv>5w^P6)$T1$PU6~)
zp3bO#!zvdutqE+%H9Jc&Egn`nw$iYyFg9Ysa&&S%LUfig$GoZ*p}IeLl&1BT_QR<e
zwZ}82XP5n(=~?)}D$Yt<{;A*Us{KKYE4cT&PdWC`vh-=YR$0ANOd}6b#RR*#e?Mi&
zim8{-SnC|YUTMb4!o&SV{;2f|hbFdnEZ*|AXr|sB7j*LBwJb#Jit0tPk%(s$#mkbJ
zt!L?iqM-f~f}5o}C^cB7m-M0+bUtH5W9K-I4ZPu@Lz(4BcE+*HFGH_>BGWq<+U@*+
zZ~%V@@bA{o$=d&VTJ!tVE1%d#a{F2iZS)q-ZL7<3nhtJdm^^%bTXv%5{Ikz-D8=f;
z(XKox_m6Mh`>GRLbylmM{+~{BGP$3I_)na1h^-C)n%`bYuf6wlyv1+G91(`jcz%*}
zyTsIL%5NzBBOQxLqk;OZ9=@^Oa_Z2D(nc&MIu%m7+=l9oIDloPztor094E?@t>uE*
zrMcd+QI|tbL!03GVC~RaF6S$?UT}4e;I5p(!MVL=%V$t28+ql*Dq1{Wt-Q{xly<C&
z{vEKv`_W?>#SHynvlX8ED68<zpJtiT)p2%I=h^aAk8ya_iOXZ~B<t&)d6-=e#8}T|
zWe&v{w>sbAvwklq9J{DK0*vG}yThL|^re7Ld%TLA^ABD-5b+EI6R*8lCZQG+HKbQQ
zUw*a1hZ0AKg;HFI;DaLllQ+esuYWqEd%wgFrH#T=uK_+2UQGxg!x4U#6T2PF$4od2
z5DKD&CL7+y&fCn_EAGnu(NJrwTXYRR4sxJA_c5RGv$8XP*dbYZ`g6XJ(fvj+_*BPg
z?K%G8nP-2FIzQ~Of3!OHkG<l-e^;z++JEWwfo!F)SE**sdR(ms7zV#`T3a~)>vNai
z-iK@Ou$=$>?*_xq6>iHz^lbyH)(kE>sf#`q0DUC@`aA&iT>$8V02ufZFk!y(xl<oK
zb@J6e1=tOiGyWOJ|9s-CbH88xnNH!$22S^y4*lL3VUPB!Q(k_DIP3I(2gm<AeF)8e
qb=pN{_%OS^I>s|=B1}?#u_@2;<(%LFt4yb6?jU3j)&1dq!u$_5vOzQe

literal 0
HcmV?d00001

diff --git a/lang/English/common.php b/lang/English/common.php
deleted file mode 100644
index 59632561..00000000
--- a/lang/English/common.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-
-// Language definitions for frequently used strings
-$lang_common = array(
-
-// Text orientation and encoding
-'lang_direction'                    =>    'ltr', // ltr (Left-To-Right) or rtl (Right-To-Left)
-'lang_identifier'                    =>    'en',
-
-// Number formatting
-'lang_decimal_point'                =>    '.',
-'lang_thousands_sep'                =>    ',',
-
-// Notices
-'Bad request'                        =>    'Bad request. The link you followed is incorrect or outdated.',
-'No view'                            =>    'You do not have permission to view these forums.',
-'No permission'                        =>    'You do not have permission to access this page.',
-'Bad referrer'                        =>    'Bad HTTP_REFERER. You were referred to this page from an unauthorized source. If the problem persists please make sure that \'Base URL\' is correctly set in Admin/Options and that you are visiting the forum by navigating to that URL. More information regarding the referrer check can be found in the FluxBB documentation.',
-'No cookie'                            =>    'You appear to have logged in successfully, however a cookie has not been set. Please check your settings and if applicable, enable cookies for this website.',
-'Pun include extension'            =>    'Unable to process user include %s from template %s. "%s" files are not allowed',
-'Pun include directory'                =>    'Unable to process user include %s from template %s. Directory traversal is not allowed',
-'Pun include error'                    =>    'Unable to process user include %s from template %s. There is no such file in neither the template directory nor in the user include directory',
-
-// Miscellaneous
-'Announcement'                        =>    'Announcement',
-'Options'                            =>    'Options',
-'Submit'                            =>    'Submit', // "Name" of submit buttons
-'Ban message'                        =>    'You are banned from this forum.',
-'Ban message 2'                        =>    'The ban expires at the end of',
-'Ban message 3'                        =>    'The administrator or moderator that banned you left the following message:',
-'Ban message 4'                        =>    'Please direct any inquiries to the forum administrator at',
-'Never'                                =>    'Never',
-'Today'                                =>    'Today',
-'Yesterday'                            =>    'Yesterday',
-'Info'                                =>    'Info', // A common table header
-'Go back'                            =>    'Go back',
-'Maintenance'                        =>    'Maintenance',
-'Redirecting'                        =>    'Redirecting',
-'Click redirect'                    =>    'Click here if you do not want to wait any longer (or if your browser does not automatically forward you)',
-'on'                                =>    'on', // As in "BBCode is on"
-'off'                                =>    'off',
-'Invalid email'                        =>    'The email address you entered is invalid.',
-'Required'                            =>    '(Required)',
-'required field'                    =>    'is a required field in this form.', // For javascript form validation
-'Last post'                            =>    'Last post',
-'by'                                =>    'by', // As in last post by some user
-'New posts'                            =>    'New posts', // The link that leads to the first new post
-'New posts info'                    =>    'Go to the first new post in this topic.', // The popup text for new posts links
-'Username'                            =>    'Username',
-'Password'                            =>    'Password',
-'Email'                                =>    'Email',
-'Send email'                        =>    'Send email',
-'Moderated by'                        =>    'Moderated by',
-'Registered'                        =>    'Registered',
-'Subject'                            =>    'Subject',
-'Message'                            =>    'Message',
-'Topic'                                =>    'Topic',
-'Forum'                                =>    'Forum',
-'Posts'                                =>    'Posts',
-'Replies'                            =>    'Replies',
-'Pages'                                =>    'Pages:',
-'Page'                                =>    'Page %s',
-'BBCode'                            =>    'BBCode:', // You probably shouldn't change this
-'url tag'                            =>    '[url] tag:',
-'img tag'                            =>    '[img] tag:',
-'Smilies'                            =>    'Smilies:',
-'and'                                =>    'and',
-'Image link'                        =>    'image', // This is displayed (i.e. <image>) instead of images when "Show images" is disabled in the profile
-'wrote'                                =>    'wrote:', // For [quote]'s
-'Mailer'                            =>    '%s Mailer', // As in "MyForums Mailer" in the signature of outgoing emails
-'Important information'                =>    'Important information',
-'Write message legend'                =>    'Write your message and submit',
-'Previous'                            =>    'Previous',
-'Next'                                =>    'Next',
-'Spacer'                            =>    '…', // Ellipsis for paginate
-
-// Title
-'Title'                                =>    'Title',
-'Member'                            =>    'Member', // Default title
-'Moderator'                            =>    'Moderator',
-'Administrator'                        =>    'Administrator',
-'Banned'                            =>    'Banned',
-'Guest'                                =>    'Guest',
-
-// Stuff for include/parser.php
-'BBerr pcre'                        =>    '(%s) Message is too long or too complex. Please shorten.',            // Error 1
-'BBerr unexpected attribute'        =>    'Unexpected attribute: "%1$s". (No attribute allowed for (%2$s).',    // Error 2
-'BBerr unrecognized attribute'        =>    'Unrecognized attribute: "%1$s", is not valid for (%2$s).',            // Error 3
-'BBerr bbcode attribute'            =>    'Attribute may NOT contain open or close bbcode tags',                // Error 4
-'BBerr missing attribute'            =>    '(%1$s) is missing a required attribute.',                            // Error 5
-'BBerr nesting overflow'            =>    '(%1$s) tag nesting depth: %2$d exceeds allowable limit: %3$d.',    // Error 6
-'BBerr self-nesting'                =>    '(%s) was opened within itself, this is not allowed.',                // Error 7
-'BBerr invalid nesting'                =>    '(%1$s) was opened within (%2$s), this is not allowed.',            // Error 8
-'BBerr invalid parent'                =>    '(%1$s) cannot be within: (%2$s). Allowable parent tags: %3$s.',    // Error 9
-'BBerr Invalid URL name'            =>    'Invalid URL name: %s',                                                // Error 10
-'BBerr cannot post URLs'            =>    'You are not allowed to post links',                                                // Error 10
-'BBerr Invalid email address'        =>    'Invalid email address: %s',                                        // Error 10c
-'BBerr Invalid color'                =>    'Invalid color attribute: %s',                                        // Error 11
-'BBerr invalid content'                =>    'Invalid content, (%s) requires specific content.',                    // Error 12
-'BBerr bad meta data'                =>    'Unable to retrieve image data from remote url: %s',                // Error 13
-'BBerr no file size'                =>    'Unable to determine remote file size.',                            // Error 14
-'BBerr non image'                    =>    'Remote url does not have Content-Type: "image".',                    // Error 15
-'BBerr bad http response'            =>    'Bad HTTP response header: "%s"',                                    // Error 16
-'BBerr bad headers'                    =>    'Unable to read remote image http headers.',                        // Error 17
-'BBerr orphan close'                =>    'Orphan close tag: (/%s) is missing its open tag.',                    // Error 18
-'BBerr orphan open'                    =>    'Orphan open tag: (%s) is missing its close tag.',                    // Error 19
-
-'BBmsg big image'                    =>    'Big image',                                                        // Msg 1
-'BBmsg images disabled'                =>    'Image display not currently enabled in this context',                // Msg 2
-
-// Stuff for the navigator (top of every page)
-'Index'                                =>    'Index',
-'User list'                            =>    'User list',
-'Rules'                                =>    'Rules',
-'Search'                            =>    'Search',
-'Register'                            =>    'Register',
-'Login'                                =>    'Login',
-'Not logged in'                        =>    'You are not logged in.',
-'Profile'                            =>    'Profile',
-'Logout'                            =>    'Logout',
-'Logged in as'                        =>    'Logged in as',
-'Admin'                                =>    'Administration',
-'Last visit'                        =>    'Last visit: %s',
-'Topic searches'                    =>    'Topics:',
-'New posts header'                    =>    'New',
-'Active topics'                        =>    'Active',
-'Unanswered topics'                    =>    'Unanswered',
-'Posted topics'                        =>    'Posted',
-'Show new posts'                    =>    'Find topics with new posts since your last visit.',
-'Show active topics'                =>    'Find topics with recent posts.',
-'Show unanswered topics'            =>    'Find topics with no replies.',
-'Show posted topics'                =>    'Find topics you have posted to.',
-'Mark all as read'                    =>    'Mark all topics as read',
-'Mark forum read'                    =>    'Mark this forum as read',
-'Title separator'                    =>    ' / ',
-
-// Stuff for the page footer
-'Board footer'                        =>    'Board footer',
-'Jump to'                            =>    'Jump to',
-'Go'                                =>    ' Go ', // Submit button in forum jump
-'Moderate topic'                    =>    'Moderate topic',
-'All'                    =>    'All',
-'Move topic'                        =>    'Move topic',
-'Open topic'                        =>    'Open topic',
-'Close topic'                        =>    'Close topic',
-'Unstick topic'                        =>    'Unstick topic',
-'Stick topic'                        =>    'Stick topic',
-'Moderate forum'                    =>    'Moderate forum',
-'Powered by'                        =>    'Powered by %s',
-
-// Debug information
-'Debug table'                        =>    'Debug information',
-'Querytime'                            =>    'Generated in %1$s seconds, %2$s queries executed',
-'Memory usage'                        =>    'Memory usage: %1$s',
-'Peak usage'                        =>    '(Peak: %1$s)',
-'Query times'                        =>    'Time (s)',
-'Query'                                =>    'Query',
-'Total query time'                    =>    'Total query time: %s',
-
-// For extern.php RSS feed
-'RSS description'                    =>    'The most recent topics at %s.',
-'RSS description topic'                =>    'The most recent posts in %s.',
-'RSS reply'                            =>    'Re: ', // The topic subject will be appended to this string (to signify a reply)
-'RSS active topics feed'            =>    'RSS active topics feed',
-'Atom active topics feed'            =>    'Atom active topics feed',
-'RSS forum feed'                    =>    'RSS forum feed',
-'Atom forum feed'                    =>    'Atom forum feed',
-'RSS topic feed'                    =>    'RSS topic feed',
-'Atom topic feed'                    =>    'Atom topic feed',
-
-// Admin related stuff in the header
-'New reports'                        =>    'There are new reports',
-'Maintenance mode enabled'            =>    'Maintenance mode is enabled!',
-
-// Units for file sizes
-'Size unit B'                        =>    '%s B',
-'Size unit KiB'                        =>    '%s KiB',
-'Size unit MiB'                        =>    '%s MiB',
-'Size unit GiB'                        =>    '%s GiB',
-'Size unit TiB'                        =>    '%s TiB',
-'Size unit PiB'                        =>    '%s PiB',
-'Size unit EiB'                        =>    '%s EiB',
-
-);
diff --git a/lang/English/common.po b/lang/English/common.po
new file mode 100644
index 00000000..8d5a40cd
--- /dev/null
+++ b/lang/English/common.po
@@ -0,0 +1,473 @@
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "lang_direction"
+msgstr "ltr"
+
+msgid "lang_identifier"
+msgstr "en"
+
+msgid "lang_decimal_point"
+msgstr "."
+
+msgid "lang_thousands_sep"
+msgstr ","
+
+msgid "Bad request"
+msgstr "Bad request. The link you followed is incorrect or outdated."
+
+msgid "No view"
+msgstr "You do not have permission to view these forums."
+
+msgid "No permission"
+msgstr "You do not have permission to access this page."
+
+msgid "Bad referrer"
+msgstr "Bad HTTP_REFERER. You were referred to this page from an unauthorized source. If the problem persists please make sure that 'Base URL' is correctly set in Admin/Options and that you are visiting the forum by navigating to that URL. More information regarding the referrer check can be found in the FluxBB documentation."
+
+msgid "No cookie"
+msgstr "You appear to have logged in successfully, however a cookie has not been set. Please check your settings and if applicable, enable cookies for this website."
+
+msgid "Pun include extension"
+msgstr "Unable to process user include %s from template %s. \"%s\" files are not allowed"
+
+msgid "Pun include directory"
+msgstr "Unable to process user include %s from template %s. Directory traversal is not allowed"
+
+msgid "Pun include error"
+msgstr "Unable to process user include %s from template %s. There is no such file in neither the template directory nor in the user include directory"
+
+msgid "Announcement"
+msgstr "Announcement"
+
+msgid "Options"
+msgstr "Options"
+
+msgid "Submit"
+msgstr "Submit"
+
+msgid "Ban message"
+msgstr "You are banned from this forum."
+
+msgid "Ban message 2"
+msgstr "The ban expires at the end of"
+
+msgid "Ban message 3"
+msgstr "The administrator or moderator that banned you left the following message:"
+
+msgid "Ban message 4"
+msgstr "Please direct any inquiries to the forum administrator at"
+
+msgid "Never"
+msgstr "Never"
+
+msgid "Today"
+msgstr "Today"
+
+msgid "Yesterday"
+msgstr "Yesterday"
+
+msgid "Info"
+msgstr "Info"
+
+msgid "Go back"
+msgstr "Go back"
+
+msgid "Maintenance"
+msgstr "Maintenance"
+
+msgid "Redirecting"
+msgstr "Redirecting"
+
+msgid "Click redirect"
+msgstr "Click here if you do not want to wait any longer (or if your browser does not automatically forward you)"
+
+msgid "on"
+msgstr "on"
+
+msgid "off"
+msgstr "off"
+
+msgid "Invalid email"
+msgstr "The email address you entered is invalid."
+
+msgid "Required"
+msgstr "(Required)"
+
+msgid "required field"
+msgstr "is a required field in this form."
+
+msgid "Last post"
+msgstr "Last post"
+
+msgid "by"
+msgstr "by"
+
+msgid "New posts"
+msgstr "New posts"
+
+msgid "New posts info"
+msgstr "Go to the first new post in this topic."
+
+msgid "Username"
+msgstr "Username"
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Email"
+msgstr "Email"
+
+msgid "Send email"
+msgstr "Send email"
+
+msgid "Moderated by"
+msgstr "Moderated by"
+
+msgid "Registered"
+msgstr "Registered"
+
+msgid "Subject"
+msgstr "Subject"
+
+msgid "Message"
+msgstr "Message"
+
+msgid "Topic"
+msgstr "Topic"
+
+msgid "Forum"
+msgstr "Forum"
+
+msgid "Posts"
+msgstr "Posts"
+
+msgid "Replies"
+msgstr "Replies"
+
+msgid "Pages"
+msgstr "Pages:"
+
+msgid "Page"
+msgstr "Page %s"
+
+msgid "BBCode"
+msgstr "BBCode:"
+
+msgid "url tag"
+msgstr "[url] tag:"
+
+msgid "img tag"
+msgstr "[img] tag:"
+
+msgid "Smilies"
+msgstr "Smilies:"
+
+msgid "and"
+msgstr "and"
+
+msgid "Image link"
+msgstr "image"
+
+msgid "wrote"
+msgstr "wrote:"
+
+msgid "Mailer"
+msgstr "%s Mailer"
+
+msgid "Important information"
+msgstr "Important information"
+
+msgid "Write message legend"
+msgstr "Write your message and submit"
+
+msgid "Previous"
+msgstr "Previous"
+
+msgid "Next"
+msgstr "Next"
+
+msgid "Spacer"
+msgstr "…"
+
+msgid "Title"
+msgstr "Title"
+
+msgid "Member"
+msgstr "Member"
+
+msgid "Moderator"
+msgstr "Moderator"
+
+msgid "Administrator"
+msgstr "Administrator"
+
+msgid "Banned"
+msgstr "Banned"
+
+msgid "Guest"
+msgstr "Guest"
+
+msgid "BBerr pcre"
+msgstr "(%s) Message is too long or too complex. Please shorten."
+
+msgid "BBerr unexpected attribute"
+msgstr "Unexpected attribute: \"%1$s\". (No attribute allowed for (%2$s)."
+
+msgid "BBerr unrecognized attribute"
+msgstr "Unrecognized attribute: \"%1$s\", is not valid for (%2$s)."
+
+msgid "BBerr bbcode attribute"
+msgstr "Attribute may NOT contain open or close bbcode tags"
+
+msgid "BBerr missing attribute"
+msgstr "(%1$s) is missing a required attribute."
+
+msgid "BBerr nesting overflow"
+msgstr "(%1$s) tag nesting depth: %2$d exceeds allowable limit: %3$d."
+
+msgid "BBerr self-nesting"
+msgstr "(%s) was opened within itself, this is not allowed."
+
+msgid "BBerr invalid nesting"
+msgstr "(%1$s) was opened within (%2$s), this is not allowed."
+
+msgid "BBerr invalid parent"
+msgstr "(%1$s) cannot be within: (%2$s). Allowable parent tags: %3$s."
+
+msgid "BBerr Invalid URL name"
+msgstr "Invalid URL name: %s"
+
+msgid "BBerr cannot post URLs"
+msgstr "You are not allowed to post links"
+
+msgid "BBerr Invalid email address"
+msgstr "Invalid email address: %s"
+
+msgid "BBerr Invalid color"
+msgstr "Invalid color attribute: %s"
+
+msgid "BBerr invalid content"
+msgstr "Invalid content, (%s) requires specific content."
+
+msgid "BBerr bad meta data"
+msgstr "Unable to retrieve image data from remote url: %s"
+
+msgid "BBerr no file size"
+msgstr "Unable to determine remote file size."
+
+msgid "BBerr non image"
+msgstr "Remote url does not have Content-Type: \"image\"."
+
+msgid "BBerr bad http response"
+msgstr "Bad HTTP response header: \"%s\""
+
+msgid "BBerr bad headers"
+msgstr "Unable to read remote image http headers."
+
+msgid "BBerr orphan close"
+msgstr "Orphan close tag: (/%s) is missing its open tag."
+
+msgid "BBerr orphan open"
+msgstr "Orphan open tag: (%s) is missing its close tag."
+
+msgid "BBmsg big image"
+msgstr "Big image"
+
+msgid "BBmsg images disabled"
+msgstr "Image display not currently enabled in this context"
+
+msgid "Index"
+msgstr "Index"
+
+msgid "User list"
+msgstr "User list"
+
+msgid "Rules"
+msgstr "Rules"
+
+msgid "Search"
+msgstr "Search"
+
+msgid "Register"
+msgstr "Register"
+
+msgid "Login"
+msgstr "Login"
+
+msgid "Not logged in"
+msgstr "You are not logged in."
+
+msgid "Profile"
+msgstr "Profile"
+
+msgid "Logout"
+msgstr "Logout"
+
+msgid "Logged in as"
+msgstr "Logged in as"
+
+msgid "Admin"
+msgstr "Administration"
+
+msgid "Last visit"
+msgstr "Last visit: %s"
+
+msgid "Topic searches"
+msgstr "Topics:"
+
+msgid "New posts header"
+msgstr "New"
+
+msgid "Active topics"
+msgstr "Active"
+
+msgid "Unanswered topics"
+msgstr "Unanswered"
+
+msgid "Posted topics"
+msgstr "Posted"
+
+msgid "Show new posts"
+msgstr "Find topics with new posts since your last visit."
+
+msgid "Show active topics"
+msgstr "Find topics with recent posts."
+
+msgid "Show unanswered topics"
+msgstr "Find topics with no replies."
+
+msgid "Show posted topics"
+msgstr "Find topics you have posted to."
+
+msgid "Mark all as read"
+msgstr "Mark all topics as read"
+
+msgid "Mark forum read"
+msgstr "Mark this forum as read"
+
+msgid "Title separator"
+msgstr " / "
+
+msgid "Board footer"
+msgstr "Board footer"
+
+msgid "Jump to"
+msgstr "Jump to"
+
+msgid "Go"
+msgstr " Go "
+
+msgid "Moderate topic"
+msgstr "Moderate topic"
+
+msgid "All"
+msgstr "All"
+
+msgid "Move topic"
+msgstr "Move topic"
+
+msgid "Open topic"
+msgstr "Open topic"
+
+msgid "Close topic"
+msgstr "Close topic"
+
+msgid "Unstick topic"
+msgstr "Unstick topic"
+
+msgid "Stick topic"
+msgstr "Stick topic"
+
+msgid "Moderate forum"
+msgstr "Moderate forum"
+
+msgid "Powered by"
+msgstr "Powered by %s"
+
+msgid "Debug table"
+msgstr "Debug information"
+
+msgid "Querytime"
+msgstr "Generated in %1$s seconds, %2$s queries executed"
+
+msgid "Memory usage"
+msgstr "Memory usage: %1$s"
+
+msgid "Peak usage"
+msgstr "(Peak: %1$s)"
+
+msgid "Query times"
+msgstr "Time (s)"
+
+msgid "Query"
+msgstr "Query"
+
+msgid "Total query time"
+msgstr "Total query time: %s"
+
+msgid "RSS description"
+msgstr "The most recent topics at %s."
+
+msgid "RSS description topic"
+msgstr "The most recent posts in %s."
+
+msgid "RSS reply"
+msgstr "Re: "
+
+msgid "RSS active topics feed"
+msgstr "RSS active topics feed"
+
+msgid "Atom active topics feed"
+msgstr "Atom active topics feed"
+
+msgid "RSS forum feed"
+msgstr "RSS forum feed"
+
+msgid "Atom forum feed"
+msgstr "Atom forum feed"
+
+msgid "RSS topic feed"
+msgstr "RSS topic feed"
+
+msgid "Atom topic feed"
+msgstr "Atom topic feed"
+
+msgid "New reports"
+msgstr "There are new reports"
+
+msgid "Maintenance mode enabled"
+msgstr "Maintenance mode is enabled!"
+
+msgid "Size unit B"
+msgstr "%s B"
+
+msgid "Size unit KiB"
+msgstr "%s KiB"
+
+msgid "Size unit MiB"
+msgstr "%s MiB"
+
+msgid "Size unit GiB"
+msgstr "%s GiB"
+
+msgid "Size unit TiB"
+msgstr "%s TiB"
+
+msgid "Size unit PiB"
+msgstr "%s PiB"
+
+msgid "Size unit EiB"
+msgstr "%s EiB"
diff --git a/lang/English/convertor.php b/lang/English/convertor.php
new file mode 100644
index 00000000..ebca4650
--- /dev/null
+++ b/lang/English/convertor.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * PHP arrays to po file
+ */
+
+$fh = fopen("antispam_questions.po", 'w');
+fwrite($fh, "#\n");
+fwrite($fh, "msgid \"\"\n");
+fwrite($fh,  "msgstr \"\"\n");
+
+include 'antispam.php';
+
+foreach ($lang_antispam_questions as $key => $value) {
+    $key = addslashes($key);
+    $value = addslashes($value);
+    fwrite($fh, "\n");
+    fwrite($fh, "msgid \"$key\"\n");
+    fwrite($fh, "msgstr \"$value\"\n");
+}
+fclose($fh);
\ No newline at end of file
diff --git a/lang/English/delete.mo b/lang/English/delete.mo
new file mode 100644
index 0000000000000000000000000000000000000000..6597bd8e9691f8fca8dfc14430312b9b6eff0bb9
GIT binary patch
literal 1003
zcmZuv&2AGh5H=A0f~ZPQ2yvJqAr*laf_exEL8xg{Rcb|4wos5bIGaggw6RxSry&o*
zYjES%XW<#(#*xq2O~Rj*Z@-!GWPUvJZKLv8;8cOTKnmOh&Vg{g16P0_zzyJM$(0L2
z+=9Fgz6QQm@<Z?j^lfm6vk$%sJ^^=u4?u|b<)RR$;IH5ickNQ)e+Rq{eG7aW{0zJX
zJ_f%BD{urp2P4${AcTM_E*I*&mmr3^LhcH19SC{FE~o6dB+_PJ7jkBEFS__ppHp(&
z*Nzh}jyX$b)SHReW;$63e>fF)Q{{{{L-DrcZaQ%)l^yHGd4o(gSM%1>CKY09%g|<v
zY7d&#uCpJJO&;{+8+N(2ra>K6e#CBPr`mlL%eI3GyWCZt8w8s?<})2!7p6m%dl@@r
z@>F^2;B=_WaH57RV^-teBGPl!A8Ye+P^9SfBI|}Psz(P$d#n7l=t;G0jc0?XvkXZ+
zfAWvBRB6+sWTafqzI76JWPRlqvJcqFJ(Jiz9-~3^p7zT^8pNi0D)-s2D{AaoytJoU
zRFAfCQ>gN_ow$VCMUDm)NfyJ4M@(T_G_w;LsWV0~HfKZLhS_1hq;o=XWG9|_oZ2Z3
zted;T#o^g_3Oj5F<ZQwy!3?ASZUUn9qvaOR{hTB|<u>GAIox9_{<<j2z#q$9*ra%b
zn()I&X`mgdpSPe<H7q_X*Q2>O9oe)r&{U@>3Z;zQSQ!igtGEpP4&5tspn9QAH1@9-
K0wQHd6p3HzG7?h&

literal 0
HcmV?d00001

diff --git a/lang/English/delete.php b/lang/English/delete.php
deleted file mode 100644
index 71dca256..00000000
--- a/lang/English/delete.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-// Language definitions used in delete.php
-$lang_delete = array(
-
-'Delete post'            =>    'Delete post',
-'Warning'                =>    'You are about to permanently delete this post.',
-'Topic warning'            =>    'Warning! This is the first post in the topic, the whole topic will be permanently deleted.',
-'Delete info'            =>    'The post you have chosen to delete is set out below for you to review before proceeding.',
-'Reply by'                =>    'Reply by %s - %s',
-'Topic by'                =>    'Topic started by %s - %s',
-'Delete'                =>    'Delete', // The submit button
-'Post del redirect'        =>    'Post deleted.',
-'Topic del redirect'    =>    'Topic deleted.'
-
-);
diff --git a/lang/English/delete.po b/lang/English/delete.po
new file mode 100644
index 00000000..208f9bdc
--- /dev/null
+++ b/lang/English/delete.po
@@ -0,0 +1,42 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Delete post"
+msgstr "Delete post"
+
+msgid "Warning"
+msgstr "You are about to permanently delete this post."
+
+msgid "Topic warning"
+msgstr "Warning! This is the first post in the topic, the whole topic will be permanently deleted."
+
+msgid "Delete info"
+msgstr "The post you have chosen to delete is set out below for you to review before proceeding."
+
+msgid "Reply by"
+msgstr "Reply by %s - %s"
+
+msgid "Topic by"
+msgstr "Topic started by %s - %s"
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "Post del redirect"
+msgstr "Post deleted."
+
+msgid "Topic del redirect"
+msgstr "Topic deleted."
diff --git a/lang/English/forum.mo b/lang/English/forum.mo
new file mode 100644
index 0000000000000000000000000000000000000000..b0b3a1649e976c79f203ea4e3c0c3d235a87f124
GIT binary patch
literal 866
zcmZXR&u$Yj5XKD@3d`U20zw>Ii31=xG!=(vLjW}-C{iO<BrPEI;_OZmx4U*^dt34#
zyb;Gf0^(WtoK2fjMjHJ*<MGVwet$OCelply_%pbNZ@|ys!5&>>>=w8IhMFhfeegMW
z58MH7g73iy?0}&@0q=lc!SGIkp{@YKorA9<{&k(Phu|6b3j7Ujg6lV`K2O01h_}E{
zzYRVH8(`?0fT8aph?WdkSeU)GJcqq*FV6uOv9QoDSa=_H4*gg=H;yvaDQ14o$HtZg
z>pAYqkxQ)_;ihjgo*M0~$sK|dq!Qyi_hzP2Ht;Gvp0mMuJ=@n8Z`pyOQ^%6Lv@#c6
zV+$8^JzIpXwbSI)vGqdptroApY(|MSN0fTe%fta$r;Ltym!zMP-QA6n&qL9+2$2^b
zrKgx9C%({$3Z>_%J?Xp{TB%(wy|F0TlX_Ch35g-e;!;QcR%V6LAI8;)(WqwZ<XzP7
z^*gKi_1bpS#`lv(*ZB-XJ^k>nXSr0m$<wK{j(lr>*cFXcU6?*5D>^zgnbMP(H%7`|
zEE03l(KqplG}&s$#89R@uh$y2H@K-nF)*b~sa?&8c{OAyS<LW9%YrM%DTr5N-%ZJ-
qC7zbnV%vOvNk+)U{S>v8#1OTbd_~&0(pJ;yKl;Wifv+_BU+%xIH`nR_

literal 0
HcmV?d00001

diff --git a/lang/English/forum.php b/lang/English/forum.php
deleted file mode 100644
index 60dbef30..00000000
--- a/lang/English/forum.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-// Language definitions used in viewforum.php
-$lang_forum = array(
-
-'Post topic'    =>    'Post new topic',
-'Views'            =>    'Views',
-'Moved'            =>    'Moved:',
-'Sticky'        =>    'Sticky:',
-'Closed'        =>    'Closed:',
-'Empty forum'    =>    'Forum is empty.',
-'Mod controls'    =>    'Moderator controls',
-'Is subscribed'    =>    'You are currently subscribed to this forum',
-'Unsubscribe'    =>    'Unsubscribe',
-'Subscribe'        =>    'Subscribe to this forum'
-
-);
diff --git a/lang/English/forum.po b/lang/English/forum.po
new file mode 100644
index 00000000..4a2b8880
--- /dev/null
+++ b/lang/English/forum.po
@@ -0,0 +1,45 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Post topic"
+msgstr "Post new topic"
+
+msgid "Views"
+msgstr "Views"
+
+msgid "Moved"
+msgstr "Moved:"
+
+msgid "Sticky"
+msgstr "Sticky:"
+
+msgid "Closed"
+msgstr "Closed:"
+
+msgid "Empty forum"
+msgstr "Forum is empty."
+
+msgid "Mod controls"
+msgstr "Moderator controls"
+
+msgid "Is subscribed"
+msgstr "You are currently subscribed to this forum"
+
+msgid "Unsubscribe"
+msgstr "Unsubscribe"
+
+msgid "Subscribe"
+msgstr "Subscribe to this forum"
diff --git a/lang/English/help.mo b/lang/English/help.mo
new file mode 100644
index 0000000000000000000000000000000000000000..2d7673164737d5e1eb6a7b3ff25813f9d4072fa3
GIT binary patch
literal 4255
zcmb`JPl#kk9mi`mCT0?i`J+b7#@aO|vu3)Jol#t8Ga=4qW@lhFj=QraK_XOlS9ib6
zdsWZ(XJ^}kC<tD1i;71f;z{sg1kr;8MDP+sFqbF_9z=p*z>5m;^Q)@v>DlbTg*;xp
zZ&kgjU;X}k>sR%syKeff;#r~GNBQY7rOtyp@8-iZzDcQ@!3=yKSSI{Bcq{D}5`GW-
zAnhN3yy|DE{}%~=4c<=wtKc2r>)>7B8>#;-kXPOQ9;I#r?*wJN<Ei~H_yO9V1sA|A
zP}aYc{y&#6OW1<E>YIFI-nUc#_fz|apvZX{6#IUa{{IG)b$<`O7yJu&3;1_X^nVk)
z8+;3t`FAr}^td0C_F`(Ur1lyp_HKdi2cJpp5h(HxK#}(i@J{eMp!o4epy=^SQ2g{;
zP~`s++$BbT19{cw5b_`J3Gij`F_aN~-c0ykP~_drWbyBP;7`C4pve6lD0cl76g~f$
z`i~I=>Awe*c_+Z1gAanD*PlUN^$$Mc-+zNogSRp1D_|eI2Ye;rYYE=~ah*Db5Se!i
zD01!vH^2wL6X5fp*!Kc>7JL!3;H#kc?K3!2;_^873b+Z1A8*A7Oi;%`@xx+jFQ@ie
zYM%#B^Zz0!arqX=t6t<I@?Qc^fj<WC2mb(m1pHURJ5c`Pv`>MT!EKPR%pTcKk5C?@
z$h><gpQMP6pP-0t)92AtkvPfoA<Bm-h*S?y<Po1tpHEQ{-IggQDWb2Y9H)qHmnid(
z_*Wj;--{Gn7<30hj0J^z4@-sTqY=XQV|*nJn5{Y#@$EyDcTvRu;+rl-d?=5^TvCT{
zM))N@4$u1fIX|!}g3jE~>(fVC%W6Gut#0hqMy>mNa9CT?tsB@X&zw!YL6m%gAQft1
z;*&PF&2-d8QI1WW)zkK7-d<f_*S%g}W;V8N)Rr}a%#Gq&TQ)D%c40=gj&iqMZL68M
z?Z)I;KMvi=+<vW%8|W;ISFuCPqFOg`eyE9Fn0i=Wo~y5fdaW)@v@J}QYcm*BwyxDv
zXeWA`(UE$T`^DBb$y1?Ps|a&{qXl|dU7T8fsmSuo)+%8fd#S0iecNfqm2XGmXxko3
z>!GjOLWOGSaa5=^zRdcu+Ts~%m{vEF+|E^_;JtBH>oE@1CH_>GuL)pT`9a%9n`uRx
zoM7o3-yQaaIQ9J1!=8cd<M8~NaYtu;HF!s+#hSxeYBz5ylXo_KRn)86m7!U$EuYn~
zy0+-_i8X!t)Y*mI%0F-WO=o-1`I4>b%)3>+X-zY>)%yCv?icnt=PH`?cb+tjUDfn;
zF4`-Z44roEn7ZlgRmRo1X?(??9pgqVzUb^(Q_M-!kC{P{xhIBkiC(YktI^{N7q%~K
z9Ik)5`{=?s?;7inIw@IHX!S^$o6Mcn{jsTP+pJyQ+w7b<94D&}ZPnRuI1-kx>NCBp
znJKcWty_4ebKW{zMICp&9b}NTd#3wo{={bIl5eZNJr~zl)p3!ub!R)6&7k`}&v6`H
z(0(WkDooRa-35zvGd7JjmDNxOVtdirjiB+^>fHN%nG^O(=IDbxfr4E<%^0=r8JUT6
znNpj=>axmQKPw@Gsh8q*to0RJO>~_>cT=&>lHS_8u!9_%`vZ;K$TC^Z<av-~uCVn?
zFSlv2w6k5^RBf=QmQ}}0M{U%XNkvzEUg8E}gZE&&xe~20J$70%k-^plvA)uSte#t;
ztDp6)?i*~eD3J~4%#3p|bT)~4D=8%?o7-Wd3sa3~AB+he_UZ}JWS?SOLHdAZGCf3-
zUlr~cIn%V2?cQjXeVQdid8js#Sk{3J#F`W;tJY)RlB^4}PfS<<9f`C2Nsfv`Nn~9e
z@<ozGBoDHNltV0IJ~ktIaE8po4DWnhnm*%(5I+Pr{AN4r9wUZBxW?b!M0<n~YFO4)
zA@LC9+QSbK+*R+up)d><9T*fLs>uX&is?W6lweLx&I*o{U@_JOQk$~02DXk+yb)#j
zadPcs2+TCHzO*iF7vU+w#P&GW<hY<ATlZR0zZ^Wt@wkFLkhcSI=#&mnq0ZoQSKYu7
z_H1HgU$Pr}G8}PO8@)U5{k9<euoYxi9X+l%Fxxt)j#)#}fImov)T?TbtsX_DohRg&
z_m-sZ=&oy2SkVo+junR?;m<EJo1-?anxbUuhMugk1^Meboy*tjT<QKl=WohDqB7og
z>13W+Rd`r$23L%WWSyqHuI9ASHmZjkB&YF8<O3zP^^{NHoa&}STx}mETRg;s&feLj
z`8_vfTO1*Lo6a40_fT_GJe-*zK)6<#s>%8-=`o6%kHt(@*qxGg>XI{e81}x=j;z~#
z`<)`GoO74Zi{Vx@)Ep#Oo08e7rC@hR=^^%g@5oz{ueeBXEs+@4@rEMoinl6V*^=83
ztP96&7!=ZrjI<LH%IutAXy1=q_BBL_hYv|Ol`3i>FDIphAw|qTaivxD&fSELtS(7u
z{-ld}K&Uc3?-Da^=&t1Ab*X2GBZt^Tb9!-(kOE{EbPw-KawwCixeW1#;K;$cI{(|X
zMbB2(o7ig+C<*p$A|pqxk@*z2tW^yWj3ll~h{D=LE^{#=a!D~{?5fsZmK^fjENfcw
SmnZ29W1NoCIpFrm=KlkVWs<i5

literal 0
HcmV?d00001

diff --git a/lang/English/help.php b/lang/English/help.php
deleted file mode 100644
index 2c3ff0fc..00000000
--- a/lang/English/help.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-// Language definitions used in help.php
-$lang_help = array(
-
-'Help'                    =>    'Help',
-'produces'                =>    'produces',
-
-'BBCode'                =>    'BBCode',
-'BBCode info 1'            =>    'BBCode is a collection of formatting tags that are used to change the look of text in this forum. BBCode is based on the same principal as, and is very similar to, HTML. Below is a list of all the available BBCodes and instructions on how to use them.',
-'BBCode info 2'            =>    'Administrators have the ability to enable or disable BBCode. You can tell if BBCode is enabled or disabled out in the left margin whenever you post a message or edit your signature.',
-
-'Text style'            =>    'Text style',
-'Text style info'        =>    'The following tags change the appearance of text:',
-'Bold text'                =>    'Bold text',
-'Underlined text'        =>    'Underlined text',
-'Italic text'            =>    'Italic text',
-'Strike-through text'    =>    'Strike-through text',
-'Red text'                =>    'Red text',
-'Blue text'                =>    'Blue text',
-'Heading text'            =>    'Heading text',
-'Deleted text'            =>    'Deleted text',
-'Inserted text'            =>    'Inserted text',
-'Emphasised text'        =>    'Emphasised text',
-
-'Links and images'        =>    'Links and images',
-'Links info'            =>    'You can create links to other documents or to email addresses using the following tags:',
-'This help page'        =>    'This help page',
-'My email address'        =>    'My email address',
-'Images info'            =>    'If you want to display an image you can use the img tag. The text appearing after the "=" sign in the opening tag is used for the alt attribute and should be included whenever possible.',
-'FluxBB bbcode test'    =>    'FluxBB bbcode test',
-
-'Test topic'            =>    'Test topic',
-'Test post'                =>    'Test post',
-'Test forum'            =>    'Test forum',
-'Test user'                =>    'Test user',
-
-'Quotes'                =>    'Quotes',
-'Quotes info'            =>    'If you want to quote someone, you should use the quote tag.',
-'Quotes info 2'            =>    'If you don\'t want to quote anyone in particular, you can use the quote tag without specifying a name.',
-'Quote text'            =>    'This is the text I want to quote.',
-'produces quote box'    =>    'produces a quote box like this:',
-'quote note'            =>    'Note: If a username contains the characters [ or ] you can enclose it in quote marks.',
-
-'Code'                    =>    'Code',
-'Code info'                =>    'When displaying source code you should make sure that you use the code tag. Text displayed with the code tag will use a monospaced font and will not be affected by other tags.',
-'Code text'                =>    'This is some code.',
-'produces code box'        =>    'produces a code box like this:',
-
-'Nested tags'            =>    'Nested tags',
-'Nested tags info'        =>    'BBCode can be nested to create more advanced formatting. For example:',
-'Bold, underlined text'    =>    'Bold, underlined text',
-
-'Lists'                    =>    'Lists',
-'List info'                =>    'To create a list you can use the list tag. You can create 3 types of lists using the list tag.',
-'List text 1'            =>    'Example list item 1.',
-'List text 2'            =>    'Example list item 2.',
-'List text 3'            =>    'Example list item 3.',
-'produces list'            =>    'produces a bulleted list.',
-'produces decimal list'    =>    'produces a numbered list.',
-'produces alpha list'    =>    'produces an alphabetically labelled list.',
-
-'Smilies'                =>    'Smilies',
-'Smilies info'            =>    'If you like (and if it is enabled), the forum can convert a series of smilies to images representations of that smiley. This forum recognizes the following smilies and replaces them with images:'
-
-);
diff --git a/lang/English/help.po b/lang/English/help.po
new file mode 100644
index 00000000..8947956a
--- /dev/null
+++ b/lang/English/help.po
@@ -0,0 +1,165 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Help"
+msgstr "Help"
+
+msgid "produces"
+msgstr "produces"
+
+msgid "BBCode"
+msgstr "BBCode"
+
+msgid "BBCode info 1"
+msgstr "BBCode is a collection of formatting tags that are used to change the look of text in this forum. BBCode is based on the same principal as, and is very similar to, HTML. Below is a list of all the available BBCodes and instructions on how to use them."
+
+msgid "BBCode info 2"
+msgstr "Administrators have the ability to enable or disable BBCode. You can tell if BBCode is enabled or disabled out in the left margin whenever you post a message or edit your signature."
+
+msgid "Text style"
+msgstr "Text style"
+
+msgid "Text style info"
+msgstr "The following tags change the appearance of text:"
+
+msgid "Bold text"
+msgstr "Bold text"
+
+msgid "Underlined text"
+msgstr "Underlined text"
+
+msgid "Italic text"
+msgstr "Italic text"
+
+msgid "Strike-through text"
+msgstr "Strike-through text"
+
+msgid "Red text"
+msgstr "Red text"
+
+msgid "Blue text"
+msgstr "Blue text"
+
+msgid "Heading text"
+msgstr "Heading text"
+
+msgid "Deleted text"
+msgstr "Deleted text"
+
+msgid "Inserted text"
+msgstr "Inserted text"
+
+msgid "Emphasised text"
+msgstr "Emphasised text"
+
+msgid "Links and images"
+msgstr "Links and images"
+
+msgid "Links info"
+msgstr "You can create links to other documents or to email addresses using the following tags:"
+
+msgid "This help page"
+msgstr "This help page"
+
+msgid "My email address"
+msgstr "My email address"
+
+msgid "Images info"
+msgstr "If you want to display an image you can use the img tag. The text appearing after the \"=\" sign in the opening tag is used for the alt attribute and should be included whenever possible."
+
+msgid "FluxBB bbcode test"
+msgstr "FluxBB bbcode test"
+
+msgid "Test topic"
+msgstr "Test topic"
+
+msgid "Test post"
+msgstr "Test post"
+
+msgid "Test forum"
+msgstr "Test forum"
+
+msgid "Test user"
+msgstr "Test user"
+
+msgid "Quotes"
+msgstr "Quotes"
+
+msgid "Quotes info"
+msgstr "If you want to quote someone, you should use the quote tag."
+
+msgid "Quotes info 2"
+msgstr "If you don't want to quote anyone in particular, you can use the quote tag without specifying a name."
+
+msgid "Quote text"
+msgstr "This is the text I want to quote."
+
+msgid "produces quote box"
+msgstr "produces a quote box like this:"
+
+msgid "quote note"
+msgstr "Note: If a username contains the characters [ or ] you can enclose it in quote marks."
+
+msgid "Code"
+msgstr "Code"
+
+msgid "Code info"
+msgstr "When displaying source code you should make sure that you use the code tag. Text displayed with the code tag will use a monospaced font and will not be affected by other tags."
+
+msgid "Code text"
+msgstr "This is some code."
+
+msgid "produces code box"
+msgstr "produces a code box like this:"
+
+msgid "Nested tags"
+msgstr "Nested tags"
+
+msgid "Nested tags info"
+msgstr "BBCode can be nested to create more advanced formatting. For example:"
+
+msgid "Bold, underlined text"
+msgstr "Bold, underlined text"
+
+msgid "Lists"
+msgstr "Lists"
+
+msgid "List info"
+msgstr "To create a list you can use the list tag. You can create 3 types of lists using the list tag."
+
+msgid "List text 1"
+msgstr "Example list item 1."
+
+msgid "List text 2"
+msgstr "Example list item 2."
+
+msgid "List text 3"
+msgstr "Example list item 3."
+
+msgid "produces list"
+msgstr "produces a bulleted list."
+
+msgid "produces decimal list"
+msgstr "produces a numbered list."
+
+msgid "produces alpha list"
+msgstr "produces an alphabetically labelled list."
+
+msgid "Smilies"
+msgstr "Smilies"
+
+msgid "Smilies info"
+msgstr "If you like (and if it is enabled), the forum can convert a series of smilies to images representations of that smiley. This forum recognizes the following smilies and replaces them with images:"
diff --git a/lang/English/index.mo b/lang/English/index.mo
new file mode 100644
index 0000000000000000000000000000000000000000..c8ab6fe21fdf82315b9166c34d7355ba818d7dc1
GIT binary patch
literal 1064
zcmZvaJC74F5XTK1ujP1GJPIR$#1#$%QA8VpP(pG<%H2iB9-_DcC+p-EcJ0XaavUW!
zqCleI3((Nf(NR(G1*rH0lyp$=_j>nUI!mLUXFQ%6d*;`Lxeo;E4CE^0E#xBPAH=Ok
zhX@J4K6na@N<ITmLr=lu;Oo-<rsO+t9`=u={s}w={Y%NO;7RD;K<D=Z9729V&O=`~
zLdZF=37!Q9ptG-oCqM~a1~<V=;QLbl3|@!+9dvd523_7ipo{kxyaLY85rS03yPcm~
zFcoh)T4;nE2H{@ZcR8!&>UMwO{>9Z^thVAhriq*=;<v_fYe+Yn*)2M9hh#Aq#u}<*
znn*zgiF`q=BFkbEW||wJ$+DtqLT3tY<=(1UGOiToW5|lXANi9t*nC>I+m1d=bInuM
zQ#vytm9s)MtvgNXx2>C!UTe|%LNgd@^<0cC>&NT~A|y(Nv?sXT5W3wChAR>4XsEEW
zhun&g!p2s`%fz`>rU5sWMVd>Ka;r3)23$^aJ{2qyJlhqK-s5qW$OjXjVl=8LJ-r_+
z^_RLk`RldYK}Sg|B%*H3kkpD-_SP)riEPsG2G>T|)>_nKjU7LieIhjL%CU+QISpxJ
zl-TV;LMmkNlr0J=w6AffM4VV!uQh6SapG0>Smk;wIzC58eUh@NuD?1fK4Vv#6JuSI
z$`LSBxTe?k_B*6EOx5$SYPuFv+!b2HMgI$*NLijznP($3wwi_mPyB2gc(gAtMgZCU
T;DluV<Wvt@-CIpHOU2#);DZp(

literal 0
HcmV?d00001

diff --git a/lang/English/index.php b/lang/English/index.php
deleted file mode 100644
index 2089a2bb..00000000
--- a/lang/English/index.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-// Language definitions used in index.php
-$lang_index = array(
-
-'Topics'        =>    'Topics',
-'Link to'        =>    'Link to:', // As in "Link to: http://fluxbb.org/"
-'Empty board'    =>    'Board is empty.',
-'Newest user'    =>    'Newest registered user: %s',
-'Users online'    =>    'Registered users online: %s',
-'Guests online'    =>    'Guests online: %s',
-'No of users'    =>    'Total number of registered users: %s',
-'No of topics'    =>    'Total number of topics: %s',
-'No of posts'    =>    'Total number of posts: %s',
-'Online'        =>    'Online:', // As in "Online: User A, User B etc."
-'Board info'    =>    'Board information',
-'Board stats'    =>    'Board statistics',
-'User info'        =>    'User information'
-
-);
diff --git a/lang/English/index.po b/lang/English/index.po
new file mode 100644
index 00000000..1413e4ae
--- /dev/null
+++ b/lang/English/index.po
@@ -0,0 +1,54 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Topics"
+msgstr "Topics"
+
+msgid "Link to"
+msgstr "Link to:"
+
+msgid "Empty board"
+msgstr "Board is empty."
+
+msgid "Newest user"
+msgstr "Newest registered user: %s"
+
+msgid "Users online"
+msgstr "Registered users online: %s"
+
+msgid "Guests online"
+msgstr "Guests online: %s"
+
+msgid "No of users"
+msgstr "Total number of registered users: %s"
+
+msgid "No of topics"
+msgstr "Total number of topics: %s"
+
+msgid "No of posts"
+msgstr "Total number of posts: %s"
+
+msgid "Online"
+msgstr "Online:"
+
+msgid "Board info"
+msgstr "Board information"
+
+msgid "Board stats"
+msgstr "Board statistics"
+
+msgid "User info"
+msgstr "User information"
diff --git a/lang/English/install.mo b/lang/English/install.mo
new file mode 100644
index 0000000000000000000000000000000000000000..1052a5282505b5b50a975dbac3799dc91ed6dd13
GIT binary patch
literal 9441
zcmc(kS&SV=6^1(`0b&A#gq;9olVNO_xsG=;UdW7>WMC#9>~R)C2t9r4-rKlu_och9
z#}h#S<q5G!2$4iY3IYiM4+sGgFA)zQfgleE1QJ4Gd4nLaDDZ$lV)@Rg>SY!?@PN2-
z&EH#9ojT_~OO=0h<29cS_}x#tnRd<9LGVHF_t)}=-_y?vf|r87178UK6TAt${`o=h
za?pS;0uO=LgQvk4fam=E1K>-zPyGEu;5P0*3i2;_gg^5Bv!L|*n#XT}FXsLS;48qN
zgCgHE;0@r5u5<lf559)`J)p?72)+yq{rgo=<o<}ie-wNr_g@A@?(g{bKlbl`4a)e>
z_~*|-Sdr@nQ2N~r%DNALGT#FDT<|@h=&A4DzaM-R_n!hq?yrD1f=_|c@0Xyc_!&_8
z|JCC^K~x-E%cO!Y^!PH5uLb4%36E1A_j#Q0IP38ak7q!J4(<YF+z^y?#-Paapnv`e
zkB@+;Ab0|leqRDb{%?TN?|Y!=?`I$;34R00IDZ1gZdXGFd43Zp-`xz#dfyDn`#t{o
zEGYI_0{Iubn?Ewo1^@gZQ0D&_DDpfCie5kGpFipGdmex6@fRL{>+#Q^tot7zA_mto
zsqo|_;L=q=FbRtNE+MSQ^Knq#KMsoBzXtLzc#1zc-~Sx^3-=2s<4xS(28p}eUqJZR
zf<FR9?mvQOz`udp!FiM<^I!0|3W`1+26up;0xy8y1Vzs~5K8*(19ySv!PkQy1cmpX
z1>XQZ35wjm2F0KL0E*oI0!8juvKV<k3CjBepp1XJe|`@re%1q}-$USD@KJC#_!Rgi
z@bBP#takz@5I^`ZokH+2@ICS#WU0Y@3?lNTpxFH}P<Z<UI0t?K+y_1lo&;~ksNV)d
z@Dt!0UL6ESz^{Ynz(0aB;2ewI4}Ji=OWuQ1;B`3Jqu@dCqu>ugmL9wlW5_x)P{#QX
zC_MNn_(|{=pztbvowL^^P~?9Y{4V$i$S1+OP`dE>L69W|4}%tb927fWWt^R^2T@Vb
z0fnb0!D;Z_py>Z&AQTKf13nKuei4-CU)}D;`Ig7;gVO&ep!EL(DEfL0Bw@<n3@G-=
zz*FGo!Mnky!S92&L5f4*b+^C~a2C7@6xrk_91#1+@2msm$#eYmtsp8_+ljow0nxkY
z;vntKG=>b`LKC|z(T>rM(5|70?&WvdLC^t3|Lvcw?|A!xzZQMo=dZ;UV&?<2J881k
zx6{OiduWGgb2QP3{BEKhrM;1M4-K`ceF4=Yv``)|gKv|E{NCX}^>?1@MH*&TyW9(+
zQss~VPte{;6Wv0+V1g#RxS#e`+9XZ<S$=0|SJQ-_^1I!E@_pW4w?X_#ezOkrFYXa6
z&|W~>NfRHEpV(gb(EbT8@1VWQKfKK&RAA8VFizv5%)>IyQd8J+JZeA8^7VJd4#POv
z@N8VzJPn6-{o^8-O>AD8@M2ho45K$u7!CMNug9Y#3%lIpHtepMI4#OBNi0v&G#jUp
z9on=EW=A6%<{`JiTv%9h{_H|9mxX!PbZrsk@kj*sPn`JfZ5fw|4NeTgv~Nwq-*MQN
z`z&J+Ki9K9=fhqWoXFB%oDa<?EQ-}E?*=F5Ou06)Ce2E7F-&5fu*MY;50P!I-SVO8
zwAlDgHMQaUQEq$jrRK{)R+Q_%TYuL`Qq7AAE;8}vj!q}_d?I%<Pi?uAwik|*vQbF&
zpeWZ+<H?q)PiCvB7|ukZmVRe67@1zoN2l^U%dyIak=8$U<LR>^ICTl?#cAK5yae6J
z0KsV+mIIs5&6#<}2vuY2ac`U?ZMrla24P`VtW7KX!ll!38YX(5k0YT<5!`N5o9n|~
z=8Y8GKDI^a{uaSJMmKvrRCvJOAM$wE;a&&(9PD@Czdh*gd=Kf6W>6>V^|(~BSJ>!%
zF^pkQDttFXTNFatMLS%vc>((StjhvQbhTJr@p8>Hia4F+<6&@TW|+=iV!T3E&Vv<o
z9p@ZN6`!k%LKzKjqd~Bwlr*_jW_5$J_I=|xN2ApRMz;yK<HQ!hIh)w1G+j@};M^d?
z^=q1*BLb9_Rf1);w&#5N#xr0UTbL*;Z9mJ`0=>ghEJ!a$_(rfihzrBN_m25AG^O-#
z-<<cs2m{uadz;IB&E@{)@<4NWFu2<$QARYoJI|n|3wZZtV-x1q<l{6I!aAxhC1Z#*
zjkbryj7dj&TO8Ya#JJ02J5#g$nAx-I$hM_CdoLQAp6^cIg)K41Ok=NYOJ|m+PY?!$
zpwsxOoiRL{K5H+=@@e&GAuP)2WrAUmi23<w!3VbKWg8A#BbuY3ME2Wy&Y4zLI$7R7
zzHM=S@l-Sap3be?h;7h=QHcvP=<!mydz8SzBPJSzIl<%D`Q_8ohnw$Y_MXkBPo+`T
zMHMsV@Jd|Pg3J&Bx7{=Cd`x9r%4|0-&7RKT&VJsw+v#)JIFBshS>~8AZjyEaVcE}~
zjwXw(5)x1Az}8A|87_2`REJfMFAuCwOr{H~BP1oH6eb$yIqD$3NNiutV~tGPkM8#U
z%zV$R!G+Z@Ep?K@lsFZGNdV*0B{f3?i*rMytY(RacyghAhr-#y>gOn?9E9@6wgfq9
zhsP(1qq_kSsuIJjteK@dmO4h*7=<ZOLy}G8avGBt;l+Ace!>_D7`cbZSXXO~og#s1
zXZIP+p~bF_!DAS1m~~|-7)Ip^N25F&<uQ}B`j2crj0=q`9nlICb+hqGIn@ks>!Cx3
zI_p%f>Ay9|f28r$kaJll{@u8Y2-u@Y(6UA3vw5;Mbp<`D)-lv3W&SVMe44!IDNz{o
zNG0R>(v1s>oov;14MZ;`oVgVKKj0eaMA-?)BvC)$I11S{ffK@1iI`h+F@{u<oskqI
z-`5Km2)#7Fx)Hlm6}#&ZAtgHYuZ0sW|HGpzs_m9kH72)of_e3YVPTT^f^FFsg@hX`
zL&yALkd2eB>1PBvGayYJ+tKOlj?=EaB*n;%<5Um!=<X2TA<I%*c7jt{mEpL#30uXb
zkuN*#5>w&=6{gv_8kbCi1LV}Z67dPS#b6i7TYR`pL`^##qZz3pS(Fh*qO!BOQZ+k^
z@n}SHEX*CtiwnE{+sah}MOD4J^0%oSMEI)GmEhD>mr-u5?;_IT%Nr`Sb{Fidg+g2w
zHtA`w!LAY!RxGUTY_5qXCyGf4RuVTuR~6UgfL6<GBUE)l9j7r%w<#B#xn!wQ_SQPD
zdijy6TVFl;dZK0O`h&|B$N%4|dLix)B!H6vBue{S-3cyRVQ*<Q!hb=@+s$l|PC93j
z7-OZj?ocQ-hSu6!(#5lU-^(O2)nyJgwQz|sp@3($?al<VUh$Fc+6)Actm{}%xh_Uw
zGAaFBXs)&^!WQo{k$Uscq61BZO%=OU2p|`@&q9cX`<hW~iBq^`k@d<|snO`>>5kOG
zD;{J~G#;(VlCqSqb2H5Nl3qeGxBCz-6s-W1yMnjS>{jP|v{3odkPTBjB0feLLNG_K
z)!Q$)5dKy?oNCg)&)MzN?4<B4Zj>;;^(Ls^>TK8zZP(&p7)k-Ndbt2e=wuzTbPZmt
zh}bC+vlBEE*E7`0#9$;{*-*s~qBXkvS1y5|3fTcW_SCPdZC4dIw%CxhTvnqF^_y-`
z)Of93erNqQZ8njO9V>7fZL><a@I;NImZlVv6qgc+rI?h6?qYXkj}F@w&3T0eN{#C(
zKvQ8+1k3q>#?VBntxm8QlBe`rr#!iYBqv-I7B&%Bs23XNbbRXixbcH4DbmrTUP=;2
z7hH`%P#%{hOVJoCChS&waiWK0YVV58&fKj8Q>C?T>IxON&`zETc}C=Jis8+Pu5Ij2
zpyh$Mg;oV_Q2ec#daC6Ot1-4BdTb)=tgnAZ8QWg(A8_|FiTw(^^&3ze%7>VaxtoOL
za;-V{j)l0iQ)Y3EE2Y&EyU2cSx$Ok^vI<{RAY)a@_qF`hV8U@gFVBX~f~$5#k6ETn
z+%rjr%H_~S<FDH^WcdXbcdO(jo>GY=W4PS|YWEs#DJn}<oZL$)0aZt7r$@6h?x#L{
zxrObbjB4#m7@2*lspC`Q(`^$<loWmv6k$#!pOo)4<w^6-kz@rNFRekCTsGVhL7S)!
z6@~q-R`7z?A~zacvE{0q%IsCm?>!(><Y9z2QT4GKQ<4(N{c!|>Gly7$^C&_}X%24g
zahB6TITgV*`K;<n%}7{}2t(7Pogyydi_~}i+(j~^T8N#`(5EwBsdmhg3tmlJt};~;
zu2r+t11RPFsGed|l2m-5U7hoI?Ksl88l*n(X>2kf2Tpn#REG}D+8SNlf=WB2WDN6|
zeW|#-hN~gFbbnG*i(g`*u+Ix;+n!xDoC1tF9wBb|QzT)#E}$4k5hqF;e6k@URKPgw
z4#q@2B51MQ+(}MJvc8T^bQ@4yn@r9feGJh<hvqn${%p4s%#+$gzH!lk!r$>mmxyH5
zDOPi}<$0Et*z8Tv^Tn8Lyqpg=e&^Su#kDFZOxLOmU$L9SB6Mk#UlrqMkZ~pE>V|&P
zSeE3$GS!q*rU@Qmb?1YklgsQ=p|W>8%U(qEuM9_eh78+Ba-Cpl^O;;XQ`YLSoC_@N
zQo&3X?@I`74`}sW9oMM>a78&X5a;zW+O!|1wx&zN_WFRp*B?8pQ@&jR5isN!(4GDf
z066rMwQ5SlfWvjWt6WY4bz4;(32K0-^zSwT)f$Wc#M6T-ogK2W^}3Kvh_DV9AinXx
z34IQFTj2(Cv7R!^eBfDT1h-@}B=7jHs<MRIKq3^Ui<x<ltuAy*$9fX0aZJ=Yrf|v&
zYGQ&;71N}wwQFu^12*{L9<nLI#W@4jDkSs+>8DJ5DISi8#JaRkiGqClZ*7L7wAd7z
zHd;&1MK60`T2h`ygcM0-S2{7>!W?^BayX6E2c`aNSsDD+a$5H>TZDHFXLVla%Tc>X
zQgOA@9#acf9a1@_73xsjnC-#*k_o$Ax)IIJ`^<<KzDs30b|Y%P+8~9QoH9GqX7`D|
z-Y<zI<8<SSqcp)o4n@VEa6tc`75&2OoSQpA*xJQZj3!*rU?v+{q!S;POcbu@8NwEs
zo?S&1FQAtX4^3cdZxym3l{M9@pJb@pa2eNa#j7Jp%YiIOSwaf3%aLCk$qog7RMJUz
zKaYm<DGsT%VCMvdPCkNnvuG@FRX=gjrWMpB$B}oE$_`r1XdI*T6Mm)o-(igcs`K)R
zJ+~B6LCATbnb>;^tZstv#6DhD+pQ++YoCezyhAoAXsTmASJY|@9gj#*U7t?0Lwkv6
R2&?E@J;D%*kPb2YzX2gx-ueIl

literal 0
HcmV?d00001

diff --git a/lang/English/install.php b/lang/English/install.php
deleted file mode 100644
index 595480f9..00000000
--- a/lang/English/install.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-// Language definitions used in install.php, localized by adaur
-
-$lang_install = array(
-
-'Choose install language'        =>    'Choose the install script language',
-'Choose install language info'    =>    'The language used for this install script. The default language used for the board itself can be set below.',
-'Install language'                =>    'Install language',
-'Change language'                =>    'Change language',
-'Already installed'                =>    'It seems like FeatherBB is already installed. You should go <a href="../index.php">here</a> instead.',
-'You are running error'            =>    'You are running %1$s version %2$s. FeatherBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue.',
-'My FeatherBB Forum'            =>    'My FeatherBB Forum',
-'Description'                    =>    'Lighter than a feather.',
-'Username 1'                    =>    'Usernames must be at least 2 characters long.',
-'Username 2'                    =>    'Usernames must not be more than 25 characters long.',
-'Username 3'                    =>    'The username guest is reserved.',
-'Username 4'                    =>    'Usernames may not be in the form of an IP address.',
-'Username 5'                    =>    'Usernames may not contain all the characters \', " and [ or ] at once.',
-'Username 6'                    =>    'Usernames may not contain any of the text formatting tags (BBCode) that the forum uses.',
-'Short password'                =>    'Passwords must be at least 6 characters long.',
-'Passwords not match'            =>    'Passwords do not match.',
-'Wrong email'                    =>    'The administrator email address you entered is invalid.',
-'No board title'                =>    'You must enter a board title.',
-'Error default language'        =>    'The default language chosen doesn\'t seem to exist.',
-'Error default style'            =>    'The default style chosen doesn\'t seem to exist.',
-'No DB extensions'                =>    'This PHP environment does not have support for any of the databases that FeatherBB supports. PHP needs to have support for either MySQL, PostgreSQL or SQLite in order for FeatherBB to be installed.',
-'Administrator username'        =>    'Administrator\'s username',
-'Administrator email'            =>    'Administrator\'s email',
-'Board title'                    =>    'Board title',
-'Base URL'                        =>    'The URL (without trailing slash) of your FeatherBB forum. This must be correct.',
-'Required field'                =>    'is a required field in this form.',
-'FeatherBB Installation'            =>    'FeatherBB Installation',
-'Welcome'                        =>    'You are about to install FeatherBB. In order to install FeatherBB, you must complete the form set out below. If you encounter any difficulties with the installation, please refer to the documentation.',
-'Install'                        =>    'Install FeatherBB %s',
-'Errors'                        =>    'The following errors need to be corrected:',
-'Database setup'                =>    'Database setup',
-'Info 1'                        =>    'All information we need to create a connection with your database.',
-'Select database'                =>    'Select your database type',
-'Info 2'                        =>    'Select a database. We support SQLite, MySQL and PostgreSQL.',
-'Database type'                    =>    'Database type',
-'Required'                        =>    '(Required)',
-'Database hostname'                =>    'Enter your database server hostname',
-'Info 3'                        =>    'You should be able to get this info from your web host, if localhost does not work.',
-'Database server hostname'        =>    'Database server hostname',
-'Database enter name'            =>    'Enter the name of your database',
-'Info 4'                        =>    'The name of the database you want to install FeatherBB on.',
-'Database name'                    =>    'Database name',
-'Database enter informations'    =>    'Enter your database username and password',
-'Database username'                =>    'Database username',
-'Info 5'                        =>    'Your MySQL username and password (ignore of SQLite).',
-'Database password'                =>    'Database password',
-'Database enter prefix'            =>    'Enter database table prefix',
-'Info 6'                        =>    'If you want to run multiple FeatherBB installations in a single database, change this.',
-'Table prefix'                    =>    'Table prefix',
-'Administration setup'            =>    'Administration setup',
-'Info 7'                        =>    'Create the very first account on your board.',
-'Info 8'                        =>    'Your username should be between 2 and 25 characters long. Your password must be at least 6 characters long. Remember that passwords are case-sensitive.',
-'Password'                        =>    'Password',
-'Confirm password'                =>    'Confirm password',
-'Board setup'                    =>    'Board setup',
-'Info 11'                        =>    'Settings for your board. You can change this later.',
-'General information'            =>    'Enter your board\'s title and description.',
-'Board description'                =>    'Board description (supports HTML)',
-'Appearance'                    =>    'Appearance',
-'Info 15'                        =>    'Make your forum yours. Choose a language and a style for your board.',
-'Default language'                =>    'Default language',
-'Default style'                    =>    'Default style',
-'Start install'                    =>    'Start install',
-'DB type not valid'                =>    '\'%s\' is not a valid database type',
-'Table prefix error'            =>    'The table prefix \'%s\' contains illegal characters or is too long. The prefix may contain the letters a to z, any numbers and the underscore character. They must however not start with a number. The maximum length is 40 characters. Please choose a different prefix',
-'Prefix reserved'                =>    'The table prefix \'sqlite_\' is reserved for use by the SQLite engine. Please choose a different prefix',
-'Existing table error'            =>    'A table called \'%susers\' is already present in the database \'%s\'. This could mean that FeatherBB is already installed or that another piece of software is installed and is occupying one or more of the table names FeatherBB requires. If you want to install multiple copies of FeatherBB in the same database, you must choose a different table prefix',
-'InnoDB off'                    =>    'InnoDB does not seem to be enabled. Please choose a database layer that does not have InnoDB support, or enable InnoDB on your MySQL server',
-'Administrators'                =>    'Administrators',
-'Administrator'                    =>    'Administrator',
-'Moderators'                    =>    'Moderators',
-'Moderator'                        =>    'Moderator',
-'Guests'                        =>    'Guests',
-'Guest'                            =>    'Guest',
-'Members'                        =>    'Members',
-'Announcement'                    =>    'Enter your announcement here.',
-'Rules'                            =>    'Enter your rules here',
-'Maintenance message'            =>    'The forums are temporarily down for maintenance. Please try again in a few minutes.',
-'Test post'                        =>    'Test topic',
-'Message'                        =>    'You have successfully installed FeatherBB, congratulations! Now log in and head over to the administration control panel to configure your forum.',
-'Test category'                    =>    'Test category',
-'Test forum'                    =>    'Test forum',
-'This is just a test forum'        =>    'This is just a test forum',
-'Alert cache'                    =>    '<strong>The cache directory is currently not writable!</strong> In order for FeatherBB to function properly, the directory <em>%s</em> must be writable by PHP. Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777.',
-'Alert avatar'                    =>    '<strong>The avatar directory is currently not writable!</strong> If you want users to be able to upload their own avatar images you must see to it that the directory <em>%s</em> is writable by PHP. You can later choose to save avatar images in a different directory (see Admin/Options). Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777.',
-'Alert upload'                    =>    '<strong>File uploads appear to be disallowed on this server!</strong> If you want users to be able to upload their own avatar images you must enable the file_uploads configuration setting in PHP. Once file uploads have been enabled, avatar uploads can be enabled in Administration/Options/Features.',
-'FeatherBB has been installed'        =>    'FeatherBB has been installed. To finalize the installation please follow the instructions below.',
-'Final instructions'            =>    'Final instructions',
-'Info 17'                        =>    'To finalize the installation, you need to click on the button below to download a file called config.php. You then need to upload this file to the root directory of your FeatherBB installation.',
-'Info 18'                        =>    'Once you have uploaded config.php, FeatherBB will be fully installed! At that point, you may <a href="../index.php">go to the forum index</a>.',
-'Download config.php file'        =>    'Download config.php file',
-'FeatherBB fully installed'        =>    'FeatherBB has been fully installed! You may now <a href="../index.php">go to the forum index</a>.',
-
-);
diff --git a/lang/English/install.po b/lang/English/install.po
new file mode 100644
index 00000000..03f10123
--- /dev/null
+++ b/lang/English/install.po
@@ -0,0 +1,291 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Choose install language"
+msgstr "Choose the install script language"
+
+msgid "Choose install language info"
+msgstr "The language used for this install script. The default language used for the board itself can be set below."
+
+msgid "Install language"
+msgstr "Install language"
+
+msgid "Change language"
+msgstr "Change language"
+
+msgid "Already installed"
+msgstr "It seems like FeatherBB is already installed. You should go <a href=\"../index.php\">here</a> instead."
+
+msgid "You are running error"
+msgstr "You are running %1$s version %2$s. FeatherBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue."
+
+msgid "My FeatherBB Forum"
+msgstr "My FeatherBB Forum"
+
+msgid "Description"
+msgstr "Lighter than a feather."
+
+msgid "Username 1"
+msgstr "Usernames must be at least 2 characters long."
+
+msgid "Username 2"
+msgstr "Usernames must not be more than 25 characters long."
+
+msgid "Username 3"
+msgstr "The username guest is reserved."
+
+msgid "Username 4"
+msgstr "Usernames may not be in the form of an IP address."
+
+msgid "Username 5"
+msgstr "Usernames may not contain all the characters ', \" and [ or ] at once."
+
+msgid "Username 6"
+msgstr "Usernames may not contain any of the text formatting tags (BBCode) that the forum uses."
+
+msgid "Short password"
+msgstr "Passwords must be at least 6 characters long."
+
+msgid "Passwords not match"
+msgstr "Passwords do not match."
+
+msgid "Wrong email"
+msgstr "The administrator email address you entered is invalid."
+
+msgid "No board title"
+msgstr "You must enter a board title."
+
+msgid "Error default language"
+msgstr "The default language chosen doesn't seem to exist."
+
+msgid "Error default style"
+msgstr "The default style chosen doesn't seem to exist."
+
+msgid "No DB extensions"
+msgstr "This PHP environment does not have support for any of the databases that FeatherBB supports. PHP needs to have support for either MySQL, PostgreSQL or SQLite in order for FeatherBB to be installed."
+
+msgid "Administrator username"
+msgstr "Administrator's username"
+
+msgid "Administrator email"
+msgstr "Administrator's email"
+
+msgid "Board title"
+msgstr "Board title"
+
+msgid "Base URL"
+msgstr "The URL (without trailing slash) of your FeatherBB forum. This must be correct."
+
+msgid "Required field"
+msgstr "is a required field in this form."
+
+msgid "FeatherBB Installation"
+msgstr "FeatherBB Installation"
+
+msgid "Welcome"
+msgstr "You are about to install FeatherBB. In order to install FeatherBB, you must complete the form set out below. If you encounter any difficulties with the installation, please refer to the documentation."
+
+msgid "Install"
+msgstr "Install FeatherBB %s"
+
+msgid "Errors"
+msgstr "The following errors need to be corrected:"
+
+msgid "Database setup"
+msgstr "Database setup"
+
+msgid "Info 1"
+msgstr "All information we need to create a connection with your database."
+
+msgid "Select database"
+msgstr "Select your database type"
+
+msgid "Info 2"
+msgstr "Select a database. We support SQLite, MySQL and PostgreSQL."
+
+msgid "Database type"
+msgstr "Database type"
+
+msgid "Required"
+msgstr "(Required)"
+
+msgid "Database hostname"
+msgstr "Enter your database server hostname"
+
+msgid "Info 3"
+msgstr "You should be able to get this info from your web host, if localhost does not work."
+
+msgid "Database server hostname"
+msgstr "Database server hostname"
+
+msgid "Database enter name"
+msgstr "Enter the name of your database"
+
+msgid "Info 4"
+msgstr "The name of the database you want to install FeatherBB on."
+
+msgid "Database name"
+msgstr "Database name"
+
+msgid "Database enter informations"
+msgstr "Enter your database username and password"
+
+msgid "Database username"
+msgstr "Database username"
+
+msgid "Info 5"
+msgstr "Your MySQL username and password (ignore of SQLite)."
+
+msgid "Database password"
+msgstr "Database password"
+
+msgid "Database enter prefix"
+msgstr "Enter database table prefix"
+
+msgid "Info 6"
+msgstr "If you want to run multiple FeatherBB installations in a single database, change this."
+
+msgid "Table prefix"
+msgstr "Table prefix"
+
+msgid "Administration setup"
+msgstr "Administration setup"
+
+msgid "Info 7"
+msgstr "Create the very first account on your board."
+
+msgid "Info 8"
+msgstr "Your username should be between 2 and 25 characters long. Your password must be at least 6 characters long. Remember that passwords are case-sensitive."
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Confirm password"
+msgstr "Confirm password"
+
+msgid "Board setup"
+msgstr "Board setup"
+
+msgid "Info 11"
+msgstr "Settings for your board. You can change this later."
+
+msgid "General information"
+msgstr "Enter your board's title and description."
+
+msgid "Board description"
+msgstr "Board description (supports HTML)"
+
+msgid "Appearance"
+msgstr "Appearance"
+
+msgid "Info 15"
+msgstr "Make your forum yours. Choose a language and a style for your board."
+
+msgid "Default language"
+msgstr "Default language"
+
+msgid "Default style"
+msgstr "Default style"
+
+msgid "Start install"
+msgstr "Start install"
+
+msgid "DB type not valid"
+msgstr "'%s' is not a valid database type"
+
+msgid "Table prefix error"
+msgstr "The table prefix '%s' contains illegal characters or is too long. The prefix may contain the letters a to z, any numbers and the underscore character. They must however not start with a number. The maximum length is 40 characters. Please choose a different prefix"
+
+msgid "Prefix reserved"
+msgstr "The table prefix 'sqlite_' is reserved for use by the SQLite engine. Please choose a different prefix"
+
+msgid "Existing table error"
+msgstr "A table called '%susers' is already present in the database '%s'. This could mean that FeatherBB is already installed or that another piece of software is installed and is occupying one or more of the table names FeatherBB requires. If you want to install multiple copies of FeatherBB in the same database, you must choose a different table prefix"
+
+msgid "InnoDB off"
+msgstr "InnoDB does not seem to be enabled. Please choose a database layer that does not have InnoDB support, or enable InnoDB on your MySQL server"
+
+msgid "Administrators"
+msgstr "Administrators"
+
+msgid "Administrator"
+msgstr "Administrator"
+
+msgid "Moderators"
+msgstr "Moderators"
+
+msgid "Moderator"
+msgstr "Moderator"
+
+msgid "Guests"
+msgstr "Guests"
+
+msgid "Guest"
+msgstr "Guest"
+
+msgid "Members"
+msgstr "Members"
+
+msgid "Announcement"
+msgstr "Enter your announcement here."
+
+msgid "Rules"
+msgstr "Enter your rules here"
+
+msgid "Maintenance message"
+msgstr "The forums are temporarily down for maintenance. Please try again in a few minutes."
+
+msgid "Test post"
+msgstr "Test topic"
+
+msgid "Message"
+msgstr "You have successfully installed FeatherBB, congratulations! Now log in and head over to the administration control panel to configure your forum."
+
+msgid "Test category"
+msgstr "Test category"
+
+msgid "Test forum"
+msgstr "Test forum"
+
+msgid "This is just a test forum"
+msgstr "This is just a test forum"
+
+msgid "Alert cache"
+msgstr "<strong>The cache directory is currently not writable!</strong> In order for FeatherBB to function properly, the directory <em>%s</em> must be writable by PHP. Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777."
+
+msgid "Alert avatar"
+msgstr "<strong>The avatar directory is currently not writable!</strong> If you want users to be able to upload their own avatar images you must see to it that the directory <em>%s</em> is writable by PHP. You can later choose to save avatar images in a different directory (see Admin/Options). Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777."
+
+msgid "Alert upload"
+msgstr "<strong>File uploads appear to be disallowed on this server!</strong> If you want users to be able to upload their own avatar images you must enable the file_uploads configuration setting in PHP. Once file uploads have been enabled, avatar uploads can be enabled in Administration/Options/Features."
+
+msgid "FeatherBB has been installed"
+msgstr "FeatherBB has been installed. To finalize the installation please follow the instructions below."
+
+msgid "Final instructions"
+msgstr "Final instructions"
+
+msgid "Info 17"
+msgstr "To finalize the installation, you need to click on the button below to download a file called config.php. You then need to upload this file to the root directory of your FeatherBB installation."
+
+msgid "Info 18"
+msgstr "Once you have uploaded config.php, FeatherBB will be fully installed! At that point, you may <a href=\"../index.php\">go to the forum index</a>."
+
+msgid "Download config.php file"
+msgstr "Download config.php file"
+
+msgid "FeatherBB fully installed"
+msgstr "FeatherBB has been fully installed! You may now <a href=\"../index.php\">go to the forum index</a>."
diff --git a/lang/English/login.mo b/lang/English/login.mo
new file mode 100644
index 0000000000000000000000000000000000000000..cef79b30ccc81bc7fe3d011101c52b6cfabb7959
GIT binary patch
literal 1877
zcmZWp%Z?m16g4Egns*`r3nXrkK!B(kIs$3bLlcr=1`V1Ft<VG(2;{E1U2RfrH@0h<
z*|A^&Ym@~`P(A?Gh&@{*BzA212E>MQ%l!-`RUP}5eeSsr`>zY<Z!0`c;(ZqH9lTHD
zef1uE@O%S&82If1Zv!90{0CqM_!ICE;4cgNZ@|Yf{}Xr-_%~4a{$2dPcyHSOJWzPM
zK-u31iiY=qvhNe1@XUY%?EMP(HRivcQ|d?H&GSk<1N;a08Suh=O1%j5K=JoIQ22ia
zJ_Y<0cntglco}%<{^Vx}d<F9f@Co2|z)yj9fL-9Z2b6ja_y!O%6lAmy+_wB!rXEVB
z)%Q`1;HHg7as<h%M`8k1>r3+ZAYO@I9Za>UX<R#3szc{1jwF_L>|$g~GaZ6Dc9pSY
z?AR@aHCJrQ#l&-IJQq=>u8FjopYXihKX<+)_TKrRHf_n2cuyR0D`u)=F;OQ@cq$Vj
zgHGMxDNjf2Y04OX(Qt@K+2$k>ZCMsNKl092)CBfBZ9Idz@w(0s@ig?v&f00{U*4lM
z?7w8`QlGjn?{x;=eU8|&qcXe6J{V_vbjUhR*k8NW8N5Ht_C2PsXYc69J%TN}!KX%+
zE=|We#BAub4YiKWW6`m;Rii7;hODO>jP#~1r^dcLPA*2H994O%bN%T0!P<W}f336c
zEXo7cvl*O5{xa^&YHjQu6%*|P$Nq=I!)$lGPP~uVX9u=$rLk3yc1I?zg!G7Q=i}^M
zw(OI}fkRy*b@Sc)b^J-w>;u>Mg7=e;9wjGgI5B~AQMkrNnrMt`WTiYq4clUINqXH1
zo}mxbB4kml*aFs^1~u!zG}mzZLLlU!i5zIeW9NBE1?k|jo2{iQ1fHv_cF{s2V8m$N
zfDBP|t)DRC!i<e5DN85_G&gYq6(RbjkOBsB7E0!_14*<M(;0NFbmw$5CP*tCL|HVb
z_THSfi>T0+3Y0__aEPd&xS7HeVn7eK86_Pz&eaz46$NHkkUH=Q^}6@T`D6xVmCoeW
zUMgx++!E>HSI=hN&AdS?Qf=%l<e_%+TpgfWd<sX7fz?y2wdE?dv`$WNg$$uIp(zR^
zY24KHS-!O6bmwY-8=*bXi`u4>jTVroYj~3iwMQFO;xb4&M~v)vxg@~8sOMcplni2-
zl&mLYs5pAcy7t&^=A$i}#G3AlMK$lbG3bor6_Je_L&DKbbhueep%D+UE+!NWejSmV
zR7ACTZAf(L>UNJshszPFQrGB|TttR~n^VcQDB9}ExvA@AM5zfiS|;`0vLOEpBhk+%
Z1_Gra)_tJXm)Np;J7^8L&qQyo{sSF<EA0RP

literal 0
HcmV?d00001

diff --git a/lang/English/login.php b/lang/English/login.php
deleted file mode 100644
index d4a10755..00000000
--- a/lang/English/login.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-// Language definitions used in login.php
-$lang_login = array(
-
-// Miscellaneous
-'Wrong user/pass'            =>    'Wrong username and/or password.',
-'Forgotten pass'            =>    'Forgotten your password?',
-'Login redirect'            =>    'Logged in successfully.',
-'Logout redirect'            =>    'Logged out.',
-'No email match'            =>    'There is no user registered with the email address',
-'Request pass'                =>    'Request password',
-'Request pass legend'        =>    'Enter the email address with which you registered',
-'Request pass info'            =>    'A new password together with a link to activate the new password will be sent to that address.',
-'Not registered'            =>    'Not registered yet?',
-'Login legend'                =>    'Enter your username and password below',
-'Remember me'                =>    'Log me in automatically each time I visit.',
-'Login info'                =>    'If you have not registered or have forgotten your password click on the appropriate link below.',
-'New password errors'        =>    'Password request error',
-'New passworderrors info'    =>    'The following error needs to be corrected before a new password can be sent:',
-
-// Forget password mail stuff
-'Forget mail'                =>    'An email has been sent to the specified address with instructions on how to change your password. If it does not arrive you can contact the forum administrator at',
-'Email flood'                =>    'This account has already requested a password reset in the past hour. Please wait %s minutes before requesting a new password again.'
-
-);
diff --git a/lang/English/login.po b/lang/English/login.po
new file mode 100644
index 00000000..059c8920
--- /dev/null
+++ b/lang/English/login.po
@@ -0,0 +1,63 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Wrong user/pass"
+msgstr "Wrong username and/or password."
+
+msgid "Forgotten pass"
+msgstr "Forgotten your password?"
+
+msgid "Login redirect"
+msgstr "Logged in successfully."
+
+msgid "Logout redirect"
+msgstr "Logged out."
+
+msgid "No email match"
+msgstr "There is no user registered with the email address"
+
+msgid "Request pass"
+msgstr "Request password"
+
+msgid "Request pass legend"
+msgstr "Enter the email address with which you registered"
+
+msgid "Request pass info"
+msgstr "A new password together with a link to activate the new password will be sent to that address."
+
+msgid "Not registered"
+msgstr "Not registered yet?"
+
+msgid "Login legend"
+msgstr "Enter your username and password below"
+
+msgid "Remember me"
+msgstr "Log me in automatically each time I visit."
+
+msgid "Login info"
+msgstr "If you have not registered or have forgotten your password click on the appropriate link below."
+
+msgid "New password errors"
+msgstr "Password request error"
+
+msgid "New passworderrors info"
+msgstr "The following error needs to be corrected before a new password can be sent:"
+
+msgid "Forget mail"
+msgstr "An email has been sent to the specified address with instructions on how to change your password. If it does not arrive you can contact the forum administrator at"
+
+msgid "Email flood"
+msgstr "This account has already requested a password reset in the past hour. Please wait %s minutes before requesting a new password again."
diff --git a/lang/English/misc.mo b/lang/English/misc.mo
new file mode 100644
index 0000000000000000000000000000000000000000..9a3f7859ab142662a032fa3356390c5918b31c2d
GIT binary patch
literal 5068
zcmb7`O^h5z701gE3|Rt+O(5aB65`;EGqYZQ#q8Sg$J!e#y!I-)i9rFOo|)R+#xvbR
zcaJxVkU3xhhbRI>;1VIYAS8r@l0!}*7myGVAcRm3AS8qY95_Hu1cBi9ud1Gz-L*;F
zn(E(Fb$z^g@6~(thuyb4V|X5+ypOW{24fQV)GfSt?$~L}-Eddr1MnTx=ir;*C3q+N
z6nrNvBEJ&bza9BJ<Y#`y>o)i+sCj-5HSX{5ZE)wC!+dwbcTt~&`hF6=6+RBtuLU)}
zAM4j*{p(Quz8Co%d^`0YL+#@ia5wxjl>Dzk$@5>Rb#8l$G5pNEyrhDCQ1k7FbTP-^
z1Uv(^{>Avc4W)-X)~~@ksDCx`yKoov=isgICs1<y621ri5o-LuBX`m1cIx*-$#Dc~
zy;-P!7a=M$9Vq!OL-k*W+Rv9``!{0yccA+J2ugo1#P**;>EX9f^ZX7<uD?L7^RLL;
z*|gg4gR;v*kr$x)IjHfUgNr+i`4XI@{xXf?4uqP5`=Hi)0!oeq%04-~3tokq@0)NQ
z{s2nuS0F$0DzAfZCxbO^25O#jybi%jP<nU@J^`PFZTL?p`+br@lCuL<@53|jNhtfj
z2(|uipyc^0oQ0ZH@*jhezY8T#0qJ7C05P3;8p>YZg0kzgQ0u$^QHgm8YTVDE<aik(
zn)y?#{{z08`hOzt!ilusX(<17@L_lrHsOnK5Byu?Zk$a0k3z}Og_{4f(8~#>&!?gG
z^$eVXzlNWNJ20~3N}&4pp!$CvYMw8`_rkA1>EVY^{hx;i;7d^c@e0)VTXEWZ;N9>j
zoPmgHO86moE%N&ixA9}u?*WP)#iSDy*`|KHJ*e!Z5U#vmN+<F&J(5$pIj#!N`zibU
zzwo*rNQRRX$$W~U=U{+;AK`tLA|1Ywavw#HeB-qL7h<OVO8@dbJ@b?gP(DmKOp)#7
z7uu`*NjkF>)a~^nUuaNdgEJJ=U_L_8BfWF{%rVLwWrp$~Wk02Ua1--EihOJ9Gfl%o
zTN-5x`Q^P7*-btrf72tonp54vC7lgh4q9cqNL#LBSMp-eyWWQ?@271umt<L9+0u1g
zyRs{3QC4QIo0l%Ut?y+E*GUUHj5n5Jt$D`Cp6xJ8<!sljx~ya7Vr$P8tJ@mOemAY^
zo@e|x6JYy!S(TeAww?F--Hpv{Lz&_*FX?bxsBIY-8;2v$_L8(~J89Ww$AiLIRN+i$
zUFqg|C;sobvP@R%FQv<>(cVLE6#g0MXFf*_uAVk&bzR4Nl>OK=TgmP8*#86Oyi2aQ
z(L@VLaXDCvwxqM=!<Htg)GT<##(j@h#>VCyS0rp|A-@t{wa(Rmb^V86<*~ox6Zmep
zN;&p@%=Q=Dy4=n0{z4x2UMp<aFxJDHH#!{Jp$mH}^GyGufr2;skCk;<K3HA5?x$^T
zenGB0@_j!Y^RBNsj9cZlCoNp;yUf4BoTI(!L%q(>M;;Br1>oUj+r<A>p4)Doty1sj
z1&7CbOsr^^^@rhHOa7FZB~C|F6b4vY%hwSM0SBckO0%Ss5#I4A_?Ga$cIfe@(ezc?
zzPxo)OSL*i`&^EKZ!y+mS$Vw)Xx=`>r6T2^dq+2m-9eFb8*=?}#%6tAEsr0Vwc+pa
zy_vn|xSgJyomeb#IZESPr|~#@P4jHV&by?-KBrGlEM8o0%;5|b?Ts^d?Tn?Z@u<6!
zs%zbJJ}Illa*<?ZH>vW1PUn+sb-)2_EW4yPHlsb3bb4uaawRO$YBlp>_2G$ya|>rj
z>rXfLPY|jqPIY5>qtBw1d$OA9cat=mwe7W}C|z~@vE}*3(NRCGzT%3;*{q#+(rk6c
z9&M%7P>>nCcH-lWM_i`UCm9!WLTF{Dn@5|6_!6p(rF>Ad-CS5>#)d`AC-Q+!@P}l3
zG{=XlwX_UzqWOAy`ZLfp^NQ@=hip59{FWOYLQQ9VM4k#Eycu)AvT}q~bab7j@wIYT
zUF>o+93D9q{4o>$u&LdL|E-OFF`KW9L<nIa;bg>I#8Io#%sYcR>gYCO2H2Dc%qdj0
zfy#UY*Pr!-0F9=?UQpQBPW>_`%%XBk?7+@8r;wYP(CfE6Q7b2`$&^tG$|y*XRJOIj
z0moH_2JAg3v5R;LlTN1~&Diy{+qKvxW+gJXx49BUJME`<Y15oi=HwLEJtf-00G-mV
zDVfl<pD;<wRqKvm=2MkFrDfAbiPjVRaBQGdUKQLKh)NPKS;g_2B$ur@uW5)SKF%+r
zQ3Wfnc6ln}{mybfi%qg&ctbAqoR&Tn%FkkY#G9Dp+@h`bof13tl)iOM2{TK2&c?>g
znKDGUz2zjgnr^6+<kw*5K3ZBy>w8boN=vHfkzQ#=8X^q#85=7NAlaZ7wRqkBKEG~G
zx$!)B2WQ5GO}RG2dL@jlUR>wVn!1LCgC-yM6OD3iy+-&lo@^B*dIL0tOJIt`#-tmf
z!lo|-aM^9_OFUz^WpJcCb0Iivj|AJ+L4Ty{*O<&73m;dssTfwKax(0c4=4X;c(p#f
z2uK>Q-q2mH=5MQYLW+lDdqBKFFE5pMJ%v|4TW$F?<M6DnrR_EE)dWc&a-x4V!>u8h
zNxK+}hjlev3+jVkTcupn-5}_U`8S4Vrtr6hVL<Q~26U|r`;!-pOC%U%+~Mqz!-o$Z
zCWut7w0o}}Idr)-c@u#kEOygDVEi(pkjXxD)zRi(&t1mb-{-4yi`Ti=+%V3D>~Q0_
z?PHxkrM_p(Ox9mtB%4=bytVXooA6P{4<Ow5BNlW_G8-mCUFFa-u{w*&R_;&Q94<6|
n<dFT?X*3=@U=XfKud!C);(-pgC7;^{tsdcbV-)x6tMdN<ZOB62

literal 0
HcmV?d00001

diff --git a/lang/English/misc.php b/lang/English/misc.php
deleted file mode 100644
index 493b52ca..00000000
--- a/lang/English/misc.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-// Language definitions used in various scripts
-$lang_misc = array(
-
-'Mark read redirect'            =>    'All topics and forums have been marked as read.',
-'Mark forum read redirect'        =>    'All topics in the specified forum have been marked as read.',
-
-// Send email
-'Form email disabled'            =>    'The user you are trying to send an email to has disabled form email.',
-'No email subject'                =>    'You must enter a subject.',
-'No email message'                =>    'You must enter a message.',
-'Too long email message'        =>    'Messages cannot be longer than 65535 characters (64 KB).',
-'Email flood'                    =>    'At least %s seconds have to pass between sent emails. Please wait %s seconds and try sending again.',
-'Email sent redirect'            =>    'Email sent.',
-'Send email to'                    =>    'Send email to',
-'Email subject'                    =>    'Subject',
-'Email message'                    =>    'Message',
-'Email disclosure note'            =>    'Please note that by using this form, your email address will be disclosed to the recipient.',
-'Write email'                    =>    'Write and submit your email message',
-
-// Report
-'No reason'                        =>    'You must enter a reason.',
-'Reason too long'                =>    'Your message must be under 65535 bytes (~64kb).',
-'Report flood'                    =>    'At least %s seconds have to pass between reports. Please wait %s seconds and try sending again.',
-'Report redirect'                =>    'Post reported.',
-'Report post'                    =>    'Report post',
-'Reason'                        =>    'Reason',
-'Reason desc'                    =>    'Please enter a short reason why you are reporting this post',
-
-// Subscriptions
-'Already subscribed topic'        =>    'You are already subscribed to this topic.',
-'Already subscribed forum'        =>    'You are already subscribed to this forum.',
-'Subscribe redirect'            =>    'Your subscription has been added.',
-'Not subscribed topic'            =>    'You are not subscribed to this topic.',
-'Not subscribed forum'            =>    'You are not subscribed to this forum.',
-'Unsubscribe redirect'            =>    'Your subscription has been removed.',
-
-// General forum and topic moderation
-'Moderate'                        =>    'Moderate',
-'Select'                        =>    'Select', // the header of a column of checkboxes
-'Move'                            =>    'Move',
-'Split'                            =>    'Split',
-'Delete'                        =>    'Delete',
-'Merge'                            =>    'Merge',
-
-// Moderate forum
-'Open'                            =>    'Open',
-'Close'                            =>    'Close',
-'Move topic'                    =>    'Move topic',
-'Move topics'                    =>    'Move topics',
-'Move legend'                    =>    'Select destination of move',
-'Move to'                        =>    'Move to',
-'Nowhere to move'                =>    'There are no forums into which you can move topics.',
-'Leave redirect'                =>    'Leave redirect topic(s)',
-'Move topic redirect'            =>    'Topic moved.',
-'Move topics redirect'            =>    'Topics moved.',
-'Confirm delete legend'            =>    'Please confirm deletion',
-'Delete topics'                    =>    'Delete topics',
-'Delete topics comply'            =>    'Are you sure you want to delete the selected topics?',
-'Delete topics redirect'        =>    'Topics deleted.',
-'Open topic redirect'            =>    'Topic opened.',
-'Open topics redirect'            =>    'Topics opened.',
-'Close topic redirect'            =>    'Topic closed.',
-'Close topics redirect'            =>    'Topics closed.',
-'No topics selected'            =>    'You must select at least one topic for move/delete/open/close.',
-'Not enough topics selected'    =>    'You must select at least two topics for merge.',
-'Stick topic redirect'            =>    'Topic sticked.',
-'Unstick topic redirect'        =>    'Topic unsticked.',
-'Merge topics'                    =>    'Merge topics',
-'Merge topics redirect'            =>    'Topics merged.',
-'Confirm merge legend'            =>    'Please confirm merge',
-'New subject'                    =>    'New subject',
-
-// Split multiple posts in topic
-'Confirm split legend'            =>    'Please confirm split of selected posts and select destination of move.',
-'Split posts'                    =>    'Split posts',
-'Split posts comply'            =>    'Are you sure you want to split the selected posts?',
-'Split posts redirect'            =>    'Posts have been split.',
-
-// Delete multiple posts in topic
-'Delete posts'                    =>    'Delete posts',
-'Cannot select first'            =>    'First post cannot be selected for split/delete.',
-'Delete posts comply'            =>    'Are you sure you want to delete the selected posts?',
-'Delete posts redirect'            =>    'Posts deleted.',
-'No posts selected'                =>    'You must select at least one post for split/delete.',
-
-// Get host
-'Host info 1'                    =>    'The IP address is: %s',
-'Host info 2'                    =>    'The host name is: %s',
-'Show more users'                =>    'Show more users for this IP',
-
-);
diff --git a/lang/English/misc.po b/lang/English/misc.po
new file mode 100644
index 00000000..68516bb7
--- /dev/null
+++ b/lang/English/misc.po
@@ -0,0 +1,225 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Mark read redirect"
+msgstr "All topics and forums have been marked as read."
+
+msgid "Mark forum read redirect"
+msgstr "All topics in the specified forum have been marked as read."
+
+msgid "Form email disabled"
+msgstr "The user you are trying to send an email to has disabled form email."
+
+msgid "No email subject"
+msgstr "You must enter a subject."
+
+msgid "No email message"
+msgstr "You must enter a message."
+
+msgid "Too long email message"
+msgstr "Messages cannot be longer than 65535 characters (64 KB)."
+
+msgid "Email flood"
+msgstr "At least %s seconds have to pass between sent emails. Please wait %s seconds and try sending again."
+
+msgid "Email sent redirect"
+msgstr "Email sent."
+
+msgid "Send email to"
+msgstr "Send email to"
+
+msgid "Email subject"
+msgstr "Subject"
+
+msgid "Email message"
+msgstr "Message"
+
+msgid "Email disclosure note"
+msgstr "Please note that by using this form, your email address will be disclosed to the recipient."
+
+msgid "Write email"
+msgstr "Write and submit your email message"
+
+msgid "No reason"
+msgstr "You must enter a reason."
+
+msgid "Reason too long"
+msgstr "Your message must be under 65535 bytes (~64kb)."
+
+msgid "Report flood"
+msgstr "At least %s seconds have to pass between reports. Please wait %s seconds and try sending again."
+
+msgid "Report redirect"
+msgstr "Post reported."
+
+msgid "Report post"
+msgstr "Report post"
+
+msgid "Reason"
+msgstr "Reason"
+
+msgid "Reason desc"
+msgstr "Please enter a short reason why you are reporting this post"
+
+msgid "Already subscribed topic"
+msgstr "You are already subscribed to this topic."
+
+msgid "Already subscribed forum"
+msgstr "You are already subscribed to this forum."
+
+msgid "Subscribe redirect"
+msgstr "Your subscription has been added."
+
+msgid "Not subscribed topic"
+msgstr "You are not subscribed to this topic."
+
+msgid "Not subscribed forum"
+msgstr "You are not subscribed to this forum."
+
+msgid "Unsubscribe redirect"
+msgstr "Your subscription has been removed."
+
+msgid "Moderate"
+msgstr "Moderate"
+
+msgid "Select"
+msgstr "Select"
+
+msgid "Move"
+msgstr "Move"
+
+msgid "Split"
+msgstr "Split"
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "Merge"
+msgstr "Merge"
+
+msgid "Open"
+msgstr "Open"
+
+msgid "Close"
+msgstr "Close"
+
+msgid "Move topic"
+msgstr "Move topic"
+
+msgid "Move topics"
+msgstr "Move topics"
+
+msgid "Move legend"
+msgstr "Select destination of move"
+
+msgid "Move to"
+msgstr "Move to"
+
+msgid "Nowhere to move"
+msgstr "There are no forums into which you can move topics."
+
+msgid "Leave redirect"
+msgstr "Leave redirect topic(s)"
+
+msgid "Move topic redirect"
+msgstr "Topic moved."
+
+msgid "Move topics redirect"
+msgstr "Topics moved."
+
+msgid "Confirm delete legend"
+msgstr "Please confirm deletion"
+
+msgid "Delete topics"
+msgstr "Delete topics"
+
+msgid "Delete topics comply"
+msgstr "Are you sure you want to delete the selected topics?"
+
+msgid "Delete topics redirect"
+msgstr "Topics deleted."
+
+msgid "Open topic redirect"
+msgstr "Topic opened."
+
+msgid "Open topics redirect"
+msgstr "Topics opened."
+
+msgid "Close topic redirect"
+msgstr "Topic closed."
+
+msgid "Close topics redirect"
+msgstr "Topics closed."
+
+msgid "No topics selected"
+msgstr "You must select at least one topic for move/delete/open/close."
+
+msgid "Not enough topics selected"
+msgstr "You must select at least two topics for merge."
+
+msgid "Stick topic redirect"
+msgstr "Topic sticked."
+
+msgid "Unstick topic redirect"
+msgstr "Topic unsticked."
+
+msgid "Merge topics"
+msgstr "Merge topics"
+
+msgid "Merge topics redirect"
+msgstr "Topics merged."
+
+msgid "Confirm merge legend"
+msgstr "Please confirm merge"
+
+msgid "New subject"
+msgstr "New subject"
+
+msgid "Confirm split legend"
+msgstr "Please confirm split of selected posts and select destination of move."
+
+msgid "Split posts"
+msgstr "Split posts"
+
+msgid "Split posts comply"
+msgstr "Are you sure you want to split the selected posts?"
+
+msgid "Split posts redirect"
+msgstr "Posts have been split."
+
+msgid "Delete posts"
+msgstr "Delete posts"
+
+msgid "Cannot select first"
+msgstr "First post cannot be selected for split/delete."
+
+msgid "Delete posts comply"
+msgstr "Are you sure you want to delete the selected posts?"
+
+msgid "Delete posts redirect"
+msgstr "Posts deleted."
+
+msgid "No posts selected"
+msgstr "You must select at least one post for split/delete."
+
+msgid "Host info 1"
+msgstr "The IP address is: %s"
+
+msgid "Host info 2"
+msgstr "The host name is: %s"
+
+msgid "Show more users"
+msgstr "Show more users for this IP"
diff --git a/lang/English/post.mo b/lang/English/post.mo
new file mode 100644
index 0000000000000000000000000000000000000000..58fde8300077007e4b07e61d358b4877b2e39f52
GIT binary patch
literal 2395
zcma)-O=u)V6vta#bsax<*N^p+=fYwlcAJP`oESBUNeu4B!Hg0S!J6qeGbP<sy;aqj
z9lYsD#gpjKqbCs$dKL62g5bwhLA;3v!K>o`b<a$O7<C(Ze)Xze^?UW+t2aNMJoa9M
z=T5wL;r#>eS-f9gh95kyTpmR?foe<#UIY1!vHT8rJ>(C-6W~YSwczJq1N;iS4*X#(
z{|w#%`M0rr{EAvW1&Uq*%Kl|g>~4WKfP3ThJ}CAAcs2MsDEe=KH-hhj;@^j$?EhrU
zFF^VJw_por`w6@s^1_u-6oW5;vhPihz;{8h^C|c-_$Bx<c;TujItG3N&V%2Bw}XFy
zyWnX!bq|<<d*Iuk*!=|*KYs_G0sjQ$T-(R%^*vDRF^HwegO7r*fp>$SfwzI*foH*A
zLGk+poR-`@0gh7^orXMlWRJu}Vu2$^x8S`QFWjyCLK>=b1696+_;mG68H>-7FL~tL
zl4J2t&Ww;$X8<bSg}358h4-Wg@~mbVbyeXhXYW;?4<>xsd6l~%+DLVv!upvJW!z_z
z)=Q34?JC8*2qRLxz>a)yx`;M2Yg3Gs3(;1|K9Es4M^EdN$>%!L?4un!HGMD~f2GUD
zTc=H5v?l%>4F93kf|sPoagmLpN?_-#^Rr{prf2I3!$S(T(A`=r9Peu$*245ut?}%x
z&e#OPVMDYV)JXjCU8g&oM!S<?)V7u~Yx>hOO(!Pqx5Xe_tW9O5Q(3%eUGAG?ic0h=
z4=qzYT$wX;?+Pu>FE?7wN;=~0G=71d*VZ&?lT{e7TU%?io^8kL4kG5`r&Qo3VJ?0S
zW<+%|bx!#Zx1BORQ^7hYol~Y?BJXjVRX+1YdQ7FcHc$3y6P-?CUH|dM`R(%?2lf|}
zg~qxy0fC9zqXI?)UkncxnbKyNx&!4rhn45soAJ_to>=d(i#JTyrpRrRmO4629cdDq
z#$LR|hF$Gr%SzB`F<D9;#!4;5yS8*)UaxI5sWwvO&ZD4>v4Og94W5uS*+`092bH08
z0}9k9k~9hEC2AkK1qgd}CrB9-c-hI}AkJ(0sOYNj$|6M;(j?jr<e76%BRE{|fnQ#G
ztdi{!SGQ(uZQZ8qD_0Z39_>Zf>rTcL1}fkOQv+2L2uw;H?yAx=anet)#Heb-E0_Ae
zP};yWRGw1pyUL|A>aZuuxw@$HG9Rm^T!aDQvd>u(tp<!xC3M!qZ+M!D)qOZ&sZid-
zau_n3>Lfm)mS~GP1Yl;1geAC9rG*@m>LU?Jv?JGl2bRzw26i}U0t9EZM1^|R)hET_
zL-e98DKFs+3JhD+<W?pBzCx>2|3RFxkr<w~5bEhn68}J*h;h5C;#8#|!QI8pL?aY~
zlhRR>w)20>muh$124?M6^>S3#Y9m!Wn`L$=C#hQ*8Ad*lj1I#|CylqtF9Iipg51`9
zT<(DANE|tB)<yYW4X+BZ6zmZVkLFTq?h8^-xZ5K-Bey}!jwnfzGbp~gkCHUC`NQo|
zysfIY?zOmgb>BQRFJYKoMtCl56iG+%8>y_$DDV-t_K@Nu3su`uh>G0t*=9>~IKKP`
K^|bS0KKdIOKcS%j

literal 0
HcmV?d00001

diff --git a/lang/English/post.php b/lang/English/post.php
deleted file mode 100644
index c4ea7a76..00000000
--- a/lang/English/post.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-// Language definitions used in post.php and edit.php
-$lang_post = array(
-
-// Post validation stuff (many are similiar to those in edit.php)
-'No subject'        =>    'Topics must contain a subject.',
-'No subject after censoring'    =>    'Topics must contain a subject. After applying censoring filters, your subject was empty.',
-'Too long subject'    =>    'Subjects cannot be longer than 70 characters.',
-'No message'        =>    'You must enter a message.',
-'No message after censoring'    =>    'You must enter a message. After applying censoring filters, your message was empty.',
-'Too long message'    =>    'Posts cannot be longer than %s bytes.',
-'All caps subject'    =>    'Subjects cannot contain only capital letters.',
-'All caps message'    =>    'Posts cannot contain only capital letters.',
-'Empty after strip'    =>    'It seems your post consisted of empty BBCodes only. It is possible that this happened because e.g. the innermost quote was discarded because of the maximum quote depth level.',
-
-// Posting
-'Post errors'        =>    'Post errors',
-'Post errors info'    =>    'The following errors need to be corrected before the message can be posted:',
-'Post preview'        =>    'Post preview',
-'Guest name'        =>    'Name', // For guests (instead of Username)
-'Post redirect'        =>    'Post entered.',
-'Post a reply'        =>    'Post a reply',
-'Post new topic'    =>    'Post new topic',
-'Hide smilies'        =>    'Never show smilies as icons for this post',
-'Subscribe'            =>    'Subscribe to this topic',
-'Stay subscribed'    =>    'Stay subscribed to this topic',
-'Topic review'        =>    'Topic review (newest first)',
-'Flood start'        =>    'At least %s seconds have to pass between posts. Please wait %s seconds and try posting again.',
-'Preview'            =>    'Preview', // submit button to preview message
-
-// Edit post
-'Edit post legend'    =>    'Edit the post and submit changes',
-'Silent edit'        =>    'Silent edit (don\'t display "Edited by ..." in topic view)',
-'Edit post'            =>    'Edit post',
-'Edit redirect'        =>    'Post updated.'
-
-);
diff --git a/lang/English/post.po b/lang/English/post.po
new file mode 100644
index 00000000..5472cbc5
--- /dev/null
+++ b/lang/English/post.po
@@ -0,0 +1,93 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "No subject"
+msgstr "Topics must contain a subject."
+
+msgid "No subject after censoring"
+msgstr "Topics must contain a subject. After applying censoring filters, your subject was empty."
+
+msgid "Too long subject"
+msgstr "Subjects cannot be longer than 70 characters."
+
+msgid "No message"
+msgstr "You must enter a message."
+
+msgid "No message after censoring"
+msgstr "You must enter a message. After applying censoring filters, your message was empty."
+
+msgid "Too long message"
+msgstr "Posts cannot be longer than %s bytes."
+
+msgid "All caps subject"
+msgstr "Subjects cannot contain only capital letters."
+
+msgid "All caps message"
+msgstr "Posts cannot contain only capital letters."
+
+msgid "Empty after strip"
+msgstr "It seems your post consisted of empty BBCodes only. It is possible that this happened because e.g. the innermost quote was discarded because of the maximum quote depth level."
+
+msgid "Post errors"
+msgstr "Post errors"
+
+msgid "Post errors info"
+msgstr "The following errors need to be corrected before the message can be posted:"
+
+msgid "Post preview"
+msgstr "Post preview"
+
+msgid "Guest name"
+msgstr "Name"
+
+msgid "Post redirect"
+msgstr "Post entered."
+
+msgid "Post a reply"
+msgstr "Post a reply"
+
+msgid "Post new topic"
+msgstr "Post new topic"
+
+msgid "Hide smilies"
+msgstr "Never show smilies as icons for this post"
+
+msgid "Subscribe"
+msgstr "Subscribe to this topic"
+
+msgid "Stay subscribed"
+msgstr "Stay subscribed to this topic"
+
+msgid "Topic review"
+msgstr "Topic review (newest first)"
+
+msgid "Flood start"
+msgstr "At least %s seconds have to pass between posts. Please wait %s seconds and try posting again."
+
+msgid "Preview"
+msgstr "Preview"
+
+msgid "Edit post legend"
+msgstr "Edit the post and submit changes"
+
+msgid "Silent edit"
+msgstr "Silent edit (don't display \"Edited by ...\" in topic view)"
+
+msgid "Edit post"
+msgstr "Edit post"
+
+msgid "Edit redirect"
+msgstr "Post updated."
diff --git a/lang/English/prof_reg.mo b/lang/English/prof_reg.mo
new file mode 100644
index 0000000000000000000000000000000000000000..c20bbbd19e3f9ba8d8b6e49836bffc40de556cb9
GIT binary patch
literal 5891
zcmbuCU5sQ!702%`iytEhiy$s47O)G`(zmyJc4t3kc9EIhnc0z@vDum31r`#j`&M_?
z&h1<6y>+{Hcrb?epa~C#L>`m`Vxlo>A~8H^^nsx92@_u21mpn|qY-0#;nDa%^>MqW
z89t0RQ}er3x9U{YIj8EJe(RQf-wW`ppnL&kb8irE@R@!1hv(*x1;NL`{ooDY0q`d9
zUROT`UWa-e{1mtXQvVHb3cL)`xHkA{Fav4)(~i$N{t&zc?Y{&+0sapB4EP#I<KA}s
zH~3l9X%doqJ4oXWf;9he@RML2q;YE?t?zNy{-om-NA36x$8S46>-fCmj~!of{FURY
zj;}dhb9~$J9mjVaX>+u`DaTtK?{u7YoN+wmxa`<)e9SR&OdPK|KJEC7<8zKLI{wu0
zWyjw-{=xBe$2UQ;*Iz->@4F!BbuTt?JGdX*50*f(!#vp769ntvJnApN2`+<gfDePm
zA>?N8JK!ns`yk2v6aGO(!C$~9!GD0C2hYLC_kmsT%iwpx5d1Y*1^*8I47}q;>o>m#
zzli!DL0aEG!HeMaSoG(>$H69;gCy@7h^d0>ut_XAxCwj(JOJJWz6nyl|9~M_!s2ON
zmq6M_hJOtF7D)5`2)q^i4M^wdb&&M)FObIXLFI1nu;Y1f4)q+Qd0qmi!8gD=!F^CF
z@gDFta1kVZJObVUeiOVG`~gVodIh9;-U4aAH{cM}z(XL_FM)@^zN<e6(t3XZ;xBmB
z@tSLY$JO_s6Yb|Vkk&r~lAbSswB8J){Xg&OFM~tW{|ug|epvihz@LBu{2TZLxQ@e2
z_W3yow=oZncu+#2eH=qMfii<a_MknSMmdV&pX>2bMj<^dqAa1*QRoUIolHJ3g?VVb
zq#Lq7J$q4L=HPymWt0_^BPgU_|Il4R`~MP31%+$}Q<;bM_W%l1Z){2aTt!(xIgWAw
z#Xo28a@beEd)zzel<W()4sJw&dzy!AcF?^;rREN#^D~QrBWZkh9z2Oc_Miu*Gd^M}
z6aSd2!wkWLC{rk8-(ZnPY_<L{m?R=%qQ_<ID|sf;g!e>HS4mr@J=W)07M$7G49;*Z
zSX-q%u7fk8&GQ({`@)T1A}K5u9g#%Ac!kZlY9_RnNr%-Y>XYA(OnjF~TLtHM(#d&8
z1m{$X$1>wus>Dy%z#3ViG{f3j-N00}QY`DLR0oYz4tQ&usXmR#{GbilVbm#BNhk1?
z9#6JeEEACho3dBz*StTa5@B2EjhSU#*sKRA_g8Ck)vA4)Dc+8Zy&Z91j}~o5=X~32
z(Kb8Qc68RtJ63!>R(w5Pw4E4x^CM0cZ72PRTGhAV&COdY){HmbR;<1@Gw0;hihb1l
z>ce8cVbzZatG*w-S$Sb~G{WyPtoj{=Rlkq0>i0o!eyra|SoQk|i+zN}>O-uQbnhIO
zEiTqoBu4es#^}A1i%gHIslcECjzFu+(`?jUxJ4m!%$wpo<#D)-gOJU!q;IO(>6v+E
zUr$db?5@+SR+^t`r0R-j>2Ng)FN!pS^Ubkk!F5-pi;Gi@uWg3)6jii`bhzdi+QRc<
zAgQZwI>$2|Zl*lRVy;z+PW~u_n}YYoB(hUH>dEB6ww<Ectf;i}z|`96+R|wLTBSOL
zqpd{(soQ-_s>M}(xF2(w%v(JOefq-Ya(H6Yk7jR+G+atrD#8(-V<(zY7YmtVBAI$5
zToH*#?HU_OL{hU_<wWHuzSwHGq4KmP>ZEI-=a`)&cvR&WuSE(w@C3(dfb(rGD0X3W
zy}}x?;F(|@#hSdeg)T6cN>eDd5^Q$e^}~1+!I~M{9+M_B3^7-nOqlMXit8)y6(U<*
zr68H(=734;J>~^j+5R^Cf5dtjl^s{=P^A&B)a_Vyx|(h90o0l?bI)L%Sg&Zeu|+n`
zqXAD^f@!*rn%k_#x=>@Ovg>`kp?ZSuCJ|#_ki%m*ShUSj(UF-|@lfh6l)?4He!ZSQ
zSSd?nD8`w!k%=5$V}bi->|<lc?)}cl4DPl~I-O8D?qg<cK}yRi!C4uJ-TF0ijlIQc
zXabVm$@}*vmx&NE-ZNlB#H8b4R~QE%-x=~m?=~Y=))Z_Y#gI2+SYyXRnMzIgp^0SM
zIE#@pwig-!0e*0XC~5jx6%HhaO-#7Sdu*Dbtld<}iLQ(S;D&GujK?FP3vMR%k#A)z
zQlpSq8Efz5nKnz&h=jOY*fDeLc?*_Ba6~kGzXLK&A4OU+IRQ;l35vz^cLrGss0r6O
z&LnH$3?epT_jWvaU&0R64&oE;0y}XrC$51U?rxkT^Fqk+56$cxu*(!(J`k*@QrO2#
zf$dNz$64Mrmg5c|(>e?UCo!H$XAO(9w@hq2l^L~V)?v)zjQZ`dq<o;lR@>|&9B6Vf
z<Ry8G+b+%&R3LDxk@2kwSwB?+xP1h-l&vls$~eXm8(jjp)ch?_38s;Jl-MOiHKc89
zDNj{j@TAOEQX!Hd#+x2CJt?s|?pXw{v3@j?Ewob!Be|{=O-pPEp0QJ;AH1_S#r#q4
z$!|ySZ57eOiKb+r#MV^SQbVjUkK1KjeLeU<(Sb%Rv^y{#F05i8<qjp*;9ENzjrb&z
z9AZ+*5E!?-q*-JyCAKd5Ja)1v>nJhgyq%awBI}mfVmHSWW%j7pLikN((#+FN(VK+V
zRZC@T6`?nYvNBuS<_T8ox=`|h?In?Fb!CDztgC^_WK*Wumg_=UO^J*_@>$(>TfhN?
z6(kOUGhCTHl=3W5+lY*#p|k;nOt^-#g*S5{z|BH=Qi*+)_h~Z^!Tqro%%y?VbSu||
zOiH7m-qHNdrdE#0t#*8NPEdTN(dTgP*;zFdu9cEVT4$_!NXV_K%IqR^ETIjp+<r`o
z34^G#t>P`$&xx=ew=Rb4F~LdIWwtD@Na&k)c;ubHB&0A2LRXjfyiuG8>xP@SpRnmh
zSBXSk^<AJ7-os6!y>pl}7CXV+;QJUcHmijOo`Mcx?mEY>8)R;gC>Q6!94uO+8)4VJ
zCZljcqgl(A`(RhJ(BrrqAj+M*$>EeJlba6PDo>&@x%Q|`$h5~`+$uJiE>5<a+j{02
zL~5jUuF?8pgSTY6SS01zI9F1)xWxV89Ni7DZnY5eYzs<V;k~AW6WcyT7aG6D)2}13
z=EX^|U!6al<wGuIxDbn6!{?z3rFJ-gP355lnM2XI50pK`HnFD@MmLeklW}*MpP|Nd
zbR3GDJ;QImZ4>ZX$ZoM~q;>eo*ETmRrMT{=tN8`0IdZLO`$M5bu|ki<0i+&T5sfCY
zp;0b(!TsDA&5QVE(oFlKk*3B0Uv2pG=)*;BA_n*gnE9nbDV+a}^5Ns(yQD%Dacnj?
z3b*XOGP~R4(w8a2c!EI%3Tfv5Gz%pXF0zk;?#%31RR7>~!u&j^e8TU#GH%YvG-c)^
L%k^o>NbG+B>1OB{

literal 0
HcmV?d00001

diff --git a/lang/English/prof_reg.php b/lang/English/prof_reg.php
deleted file mode 100644
index 0745348e..00000000
--- a/lang/English/prof_reg.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-// Language definitions used in both profile.php and register.php
-$lang_prof_reg = array(
-
-'Email legend'                =>    'Enter a valid email address',
-'Email legend 2'            =>    'Enter and confirm a valid email address',
-'Localisation legend'        =>    'Set your localisation options',
-'Time zone'                    =>    'Time zone',
-'Time zone info'            =>    'For the forum to display times correctly you must select your local time zone. If Daylight Savings Time is in effect you should also check the option provided which will advance times by 1 hour.',
-'DST'                        =>    'Daylight Savings Time is in effect (advance time by 1 hour).',
-'Time format'                =>    'Time format',
-'Date format'                =>    'Date format',
-'Default'                    =>    'Default',
-'Language'                    =>    'Language',
-'Email setting info'        =>    'Select whether you want your email address to be viewable to other users or not and if you want other users to be able to send you email via the forum (form email) or not.',
-'Email setting 1'            =>    'Display your email address to other users.',
-'Email setting 2'            =>    'Hide your email address but allow form email.',
-'Email setting 3'            =>    'Hide your email address and disallow form email.',
-'Privacy options legend'    =>    'Set your privacy options',
-'Confirm pass'                =>    'Confirm password',
-
-'Username too short'        =>    'Usernames must be at least 2 characters long. Please choose another (longer) username.',
-'Username too long'            =>    'Usernames must not be more than 25 characters long. Please choose another (shorter) username.',
-'Username guest'            =>    'The username guest is reserved. Please choose another username.',
-'Username IP'                =>    'Usernames may not be in the form of an IP address. Please choose another username.',
-'Username reserved chars'    =>    'Usernames may not contain all the characters \', " and [ or ] at once. Please choose another username.',
-'Username BBCode'            =>    'Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username.',
-'Banned username'            =>    'The username you entered is banned in this forum. Please choose another username.',
-'Pass too short'            =>    'Passwords must be at least 6 characters long. Please choose another (longer) password.',
-'Pass not match'            =>    'Passwords do not match.',
-'Banned email'                =>    'The email address you entered is banned in this forum. Please choose another email address.',
-'Dupe email'                =>    'Someone else is already registered with that email address. Please choose another email address.',
-'Sig too long'                =>    'Signatures cannot be longer than %1$s characters. Please reduce your signature by %2$s characters.',
-'Sig too many lines'        =>    'Signatures cannot have more than %s lines.',
-'Bad ICQ'                    =>    'You entered an invalid ICQ UIN. Please go back and correct.',
-
-'UTC-12:00'                    =>    '(UTC-12:00) International Date Line West',
-'UTC-11:00'                    =>    '(UTC-11:00) Niue, Samoa',
-'UTC-10:00'                    =>    '(UTC-10:00) Hawaii-Aleutian, Cook Island',
-'UTC-09:30'                    =>    '(UTC-09:30) Marquesas Islands',
-'UTC-09:00'                    =>    '(UTC-09:00) Alaska, Gambier Island',
-'UTC-08:30'                    =>    '(UTC-08:30) Pitcairn Islands',
-'UTC-08:00'                    =>    '(UTC-08:00) Pacific',
-'UTC-07:00'                    =>    '(UTC-07:00) Mountain',
-'UTC-06:00'                    =>    '(UTC-06:00) Central',
-'UTC-05:00'                    =>    '(UTC-05:00) Eastern',
-'UTC-04:00'                    =>    '(UTC-04:00) Atlantic',
-'UTC-03:30'                    =>    '(UTC-03:30) Newfoundland',
-'UTC-03:00'                    =>    '(UTC-03:00) Amazon, Central Greenland',
-'UTC-02:00'                    =>    '(UTC-02:00) Mid-Atlantic',
-'UTC-01:00'                    =>    '(UTC-01:00) Azores, Cape Verde, Eastern Greenland',
-'UTC'                        =>    '(UTC) Western European, Greenwich',
-'UTC+01:00'                    =>    '(UTC+01:00) Central European, West African',
-'UTC+02:00'                    =>    '(UTC+02:00) Eastern European, Central African',
-'UTC+03:00'                    =>    '(UTC+03:00) Eastern African',
-'UTC+03:30'                    =>    '(UTC+03:30) Iran',
-'UTC+04:00'                    =>    '(UTC+04:00) Moscow, Gulf, Samara',
-'UTC+04:30'                    =>    '(UTC+04:30) Afghanistan',
-'UTC+05:00'                    =>    '(UTC+05:00) Pakistan',
-'UTC+05:30'                    =>    '(UTC+05:30) India, Sri Lanka',
-'UTC+05:45'                    =>    '(UTC+05:45) Nepal',
-'UTC+06:00'                    =>    '(UTC+06:00) Bangladesh, Bhutan, Yekaterinburg',
-'UTC+06:30'                    =>    '(UTC+06:30) Cocos Islands, Myanmar',
-'UTC+07:00'                    =>    '(UTC+07:00) Indochina, Novosibirsk',
-'UTC+08:00'                    =>    '(UTC+08:00) Greater China, Australian Western, Krasnoyarsk',
-'UTC+08:45'                    =>    '(UTC+08:45) Southeastern Western Australia',
-'UTC+09:00'                    =>    '(UTC+09:00) Japan, Korea, Chita, Irkutsk',
-'UTC+09:30'                    =>    '(UTC+09:30) Australian Central',
-'UTC+10:00'                    =>    '(UTC+10:00) Australian Eastern',
-'UTC+10:30'                    =>    '(UTC+10:30) Lord Howe',
-'UTC+11:00'                    =>    '(UTC+11:00) Solomon Island, Vladivostok',
-'UTC+11:30'                    =>    '(UTC+11:30) Norfolk Island',
-'UTC+12:00'                    =>    '(UTC+12:00) New Zealand, Fiji, Magadan',
-'UTC+12:45'                    =>    '(UTC+12:45) Chatham Islands',
-'UTC+13:00'                    =>    '(UTC+13:00) Tonga, Phoenix Islands, Kamchatka',
-'UTC+14:00'                    =>    '(UTC+14:00) Line Islands'
-
-);
diff --git a/lang/English/prof_reg.po b/lang/English/prof_reg.po
new file mode 100644
index 00000000..9409aa33
--- /dev/null
+++ b/lang/English/prof_reg.po
@@ -0,0 +1,225 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Email legend"
+msgstr "Enter a valid email address"
+
+msgid "Email legend 2"
+msgstr "Enter and confirm a valid email address"
+
+msgid "Localisation legend"
+msgstr "Set your localisation options"
+
+msgid "Time zone"
+msgstr "Time zone"
+
+msgid "Time zone info"
+msgstr "For the forum to display times correctly you must select your local time zone. If Daylight Savings Time is in effect you should also check the option provided which will advance times by 1 hour."
+
+msgid "DST"
+msgstr "Daylight Savings Time is in effect (advance time by 1 hour)."
+
+msgid "Time format"
+msgstr "Time format"
+
+msgid "Date format"
+msgstr "Date format"
+
+msgid "Default"
+msgstr "Default"
+
+msgid "Language"
+msgstr "Language"
+
+msgid "Email setting info"
+msgstr "Select whether you want your email address to be viewable to other users or not and if you want other users to be able to send you email via the forum (form email) or not."
+
+msgid "Email setting 1"
+msgstr "Display your email address to other users."
+
+msgid "Email setting 2"
+msgstr "Hide your email address but allow form email."
+
+msgid "Email setting 3"
+msgstr "Hide your email address and disallow form email."
+
+msgid "Privacy options legend"
+msgstr "Set your privacy options"
+
+msgid "Confirm pass"
+msgstr "Confirm password"
+
+msgid "Username too short"
+msgstr "Usernames must be at least 2 characters long. Please choose another (longer) username."
+
+msgid "Username too long"
+msgstr "Usernames must not be more than 25 characters long. Please choose another (shorter) username."
+
+msgid "Username guest"
+msgstr "The username guest is reserved. Please choose another username."
+
+msgid "Username IP"
+msgstr "Usernames may not be in the form of an IP address. Please choose another username."
+
+msgid "Username reserved chars"
+msgstr "Usernames may not contain all the characters ', \" and [ or ] at once. Please choose another username."
+
+msgid "Username BBCode"
+msgstr "Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username."
+
+msgid "Banned username"
+msgstr "The username you entered is banned in this forum. Please choose another username."
+
+msgid "Pass too short"
+msgstr "Passwords must be at least 6 characters long. Please choose another (longer) password."
+
+msgid "Pass not match"
+msgstr "Passwords do not match."
+
+msgid "Banned email"
+msgstr "The email address you entered is banned in this forum. Please choose another email address."
+
+msgid "Dupe email"
+msgstr "Someone else is already registered with that email address. Please choose another email address."
+
+msgid "Sig too long"
+msgstr "Signatures cannot be longer than %1$s characters. Please reduce your signature by %2$s characters."
+
+msgid "Sig too many lines"
+msgstr "Signatures cannot have more than %s lines."
+
+msgid "Bad ICQ"
+msgstr "You entered an invalid ICQ UIN. Please go back and correct."
+
+msgid "UTC-12:00"
+msgstr "(UTC-12:00) International Date Line West"
+
+msgid "UTC-11:00"
+msgstr "(UTC-11:00) Niue, Samoa"
+
+msgid "UTC-10:00"
+msgstr "(UTC-10:00) Hawaii-Aleutian, Cook Island"
+
+msgid "UTC-09:30"
+msgstr "(UTC-09:30) Marquesas Islands"
+
+msgid "UTC-09:00"
+msgstr "(UTC-09:00) Alaska, Gambier Island"
+
+msgid "UTC-08:30"
+msgstr "(UTC-08:30) Pitcairn Islands"
+
+msgid "UTC-08:00"
+msgstr "(UTC-08:00) Pacific"
+
+msgid "UTC-07:00"
+msgstr "(UTC-07:00) Mountain"
+
+msgid "UTC-06:00"
+msgstr "(UTC-06:00) Central"
+
+msgid "UTC-05:00"
+msgstr "(UTC-05:00) Eastern"
+
+msgid "UTC-04:00"
+msgstr "(UTC-04:00) Atlantic"
+
+msgid "UTC-03:30"
+msgstr "(UTC-03:30) Newfoundland"
+
+msgid "UTC-03:00"
+msgstr "(UTC-03:00) Amazon, Central Greenland"
+
+msgid "UTC-02:00"
+msgstr "(UTC-02:00) Mid-Atlantic"
+
+msgid "UTC-01:00"
+msgstr "(UTC-01:00) Azores, Cape Verde, Eastern Greenland"
+
+msgid "UTC"
+msgstr "(UTC) Western European, Greenwich"
+
+msgid "UTC+01:00"
+msgstr "(UTC+01:00) Central European, West African"
+
+msgid "UTC+02:00"
+msgstr "(UTC+02:00) Eastern European, Central African"
+
+msgid "UTC+03:00"
+msgstr "(UTC+03:00) Eastern African"
+
+msgid "UTC+03:30"
+msgstr "(UTC+03:30) Iran"
+
+msgid "UTC+04:00"
+msgstr "(UTC+04:00) Moscow, Gulf, Samara"
+
+msgid "UTC+04:30"
+msgstr "(UTC+04:30) Afghanistan"
+
+msgid "UTC+05:00"
+msgstr "(UTC+05:00) Pakistan"
+
+msgid "UTC+05:30"
+msgstr "(UTC+05:30) India, Sri Lanka"
+
+msgid "UTC+05:45"
+msgstr "(UTC+05:45) Nepal"
+
+msgid "UTC+06:00"
+msgstr "(UTC+06:00) Bangladesh, Bhutan, Yekaterinburg"
+
+msgid "UTC+06:30"
+msgstr "(UTC+06:30) Cocos Islands, Myanmar"
+
+msgid "UTC+07:00"
+msgstr "(UTC+07:00) Indochina, Novosibirsk"
+
+msgid "UTC+08:00"
+msgstr "(UTC+08:00) Greater China, Australian Western, Krasnoyarsk"
+
+msgid "UTC+08:45"
+msgstr "(UTC+08:45) Southeastern Western Australia"
+
+msgid "UTC+09:00"
+msgstr "(UTC+09:00) Japan, Korea, Chita, Irkutsk"
+
+msgid "UTC+09:30"
+msgstr "(UTC+09:30) Australian Central"
+
+msgid "UTC+10:00"
+msgstr "(UTC+10:00) Australian Eastern"
+
+msgid "UTC+10:30"
+msgstr "(UTC+10:30) Lord Howe"
+
+msgid "UTC+11:00"
+msgstr "(UTC+11:00) Solomon Island, Vladivostok"
+
+msgid "UTC+11:30"
+msgstr "(UTC+11:30) Norfolk Island"
+
+msgid "UTC+12:00"
+msgstr "(UTC+12:00) New Zealand, Fiji, Magadan"
+
+msgid "UTC+12:45"
+msgstr "(UTC+12:45) Chatham Islands"
+
+msgid "UTC+13:00"
+msgstr "(UTC+13:00) Tonga, Phoenix Islands, Kamchatka"
+
+msgid "UTC+14:00"
+msgstr "(UTC+14:00) Line Islands"
diff --git a/lang/English/profile.mo b/lang/English/profile.mo
new file mode 100644
index 0000000000000000000000000000000000000000..59c8f7e636ece29c768e9fb9322345b6a5d0afad
GIT binary patch
literal 9585
zcmbW6dyFK<UB^3q;P{9k*yQ0PKwXmK?!xYD{77u?*~#tgy*AvQ*LS<VTrecPGc_}P
zH`6`t?zz1^_`?wq5f~6CLbeD=5D`yD3XzdOktL*vC{hGbhy(&DSP)*416KZuf*=x~
z@2{%oaqC2uTU+z(s;<Yce($P%{`Q-GE8)3Dc?;#gZcLI-gU{W<56|g+N%8~W8h8h|
z0rHo0_<1c@fcpLf_y+K!;17bIiueq88}&a2Uk`o})VQyMuLl1cd=2>RSih0M>i-&0
z?Qa4#-$8zE2k!x22c85)&tstG8-YIpei+m`9|J|#pMaY0bMgCMf|~blLH?5G`S~I6
z1rQRF{{gkmO?1+@H-PGYAlB~&Z=!w_{9*6}sC{pNcY;F@7A7AB`AeSUM|3_7ik{Da
zTJKp<<G%okj<12@$Mc}Z|0k&Zd^3LkE_f^TTOmsQ?f|v!TR@5GUQqKt2#O!8pyu5K
z)&D~ve@VuV=G_5B$1j7L_i2zNlHZH?Sx|g_4%9kd12ygiQ2Y5mQ2cr=lW3kd^P}<a
z0JZ*opw>MNYM+mQ;#&$bH0j3n8Wg`j0&4!JK#l)nQ0sgi)cCJNd>+&~FM`_N|AOj&
z3!OyI8$s>oZJ_!sf|`FBRR8tZelga&p!$~}QzgFuYQ87IH-o<eYM#FU#osT2qU*0g
zjr(U%`*{J>xbJ}cCAU%$-U;gaVNiN`AE<fG#`Z1nN2#}C{c5cL5-9$E9DF1Ax%mCd
z5&r>{-2Vd<JuiaV{|zwlX7IL%cYs>&PH^K@N#bJtahUQ9?N>pKdpncd11^E;-v&kh
zC9ndofj<wv2>yiHA(|zVUjbX-$HB+IFM}F)5aK2O`#|mgD9ESeEU52o@NHlPz8!oD
zWa{KOQ2o9NE`k3J$}hbR=83MmLCyC7cnCZNs^18de18}GBk(hz<g<nH{s#C#@Dt#-
zK+X5-Fjeb514=Ky3Z4i54unO?VT@UNe*~00o(E5X7r=wyr$Ev3B~bKy1(g1L9o!Fo
z6V(21dsCS2_24I|9|AuBehCzPZ$-(ZUkl(B@B#1u_^04u@bAGDP(+^vj)Cg`o8T(=
zN$|(OZ-7TZRel;+0iObY4O{~c{CJ?F0GTrRF!&_+3Gl7pVT3Ar&VbUNM?tOg7$`Ys
z@%uGU`}_zfzI`m#p9ZCme+WvSJ_~BT&x7K_UxAX(-+=1(kD%oIFQDl8Hi)Q`+g;GF
zL!j0<4XXVD2&u^sM6}7Tg3_Z;gNMOqL0Fpn6R35+13rPi-+(aG{}<Wh8u;6w*84Y5
z@{<yZf46||1rLDYvj@+Be+H`Gt5B8&@YSH?{VoualT}dP+p+x;C_1mk`cn~qAJl%H
z1s(VWQ2hPZh~EOmm+yiPfH$KAvWNGA;{SP2a_N9t?-I!NtS^w<Mfq9EaaDMvOZQPu
zQ|_m{gQDjViuNm;d6c3@@)B*@xAr8x7f&H&?)jNmYk@t=yC|q#a)ct=d7L61>5&d%
zO3At^@p(7cr#wdaNlHp-o_l$DI94#7<Oa%7iuV3NO7pyjm#a+$ly5&r*`%~7&9lgh
z^kX+RY=M_3;<27pisUFB>+u0hr}Zjbk)BAG4pQDp8B-i(hw>1mdAhvFXXug6AR6-l
zsyB~xy{7zJY`6>#C<O%-OD<4urfg6SQSPQlZ-0uiLeY~`9;95OpuUqwdbCZE{#KNd
zau4MM<^7cRQ8J3`<3@_?@fc-Dk!|Ve1V~2Ua(owjfFga<b1Hz@v2^?-<wKN<lw{@M
zGj44?S!vhVm9+NG57TVmDxcTMN@tkmE-z}Itc>eIZ&`QOb;pB2vO?#yjNm$c;A`J;
zrSD{=Z!^?B(_Xck_bl%g&HKRjeBNnl<I$i<_YAIFC#%x!f$t>8_*(CdJTLil4OPaK
zFO$`Nn)kd*14*%F`)EFm(yE$$caebABJXD9Fw*}$TEiN#XYO}gm@PD<bynog_Qqs&
z+OC<bhJ{r#+i~Mf5}+Y6*0$L~Bqg?timI-f&bD&=u#=W~miLkqCLdd{d9CVljQEPY
zieE4LUALWfVl6HZdXGmPq})kPW&@v`EXwVy)A6~hvzq#;vKWut&=0qLS@p9~L))JA
ziJaF~A4%5o83NYwE9oHXxE;S;WvJ8ExiiW8(rqS8&ZJfCw7<YEt6s_I73)5|;@$Qj
z%`YcsincK}SwDX^SuZ-iOzWbgU+B7C(6bAZ*~nQ05@fA66V2J85ol@}JoHtS_IyHn
zSK9`wtS6|4BeYB!Ta>#rO!fQWK_^VMk@m7&hG8s^HOV}(bt5h7EFHL@#K{Jl)^z2q
zk%Tojyq~R1)p-M+7dbOsr#~Cw7^W~9q`PtE*_MV3>CN<W<wm|_1MGUEEVOIHnvW-y
zi2%>}bdaY*pPci(tg1a9!Yt>JMsgm`Xs^b{Ni7mHsl#5}1x%<WO@Zao*JcXnvF+_?
z$m-o`TZt2Dt6sZd(V5uL`F^nzO@}p9$%gE0?p-pC4Z(=4-?XtBW`nF5QjNE(cA1TW
z)mYEE7-elH$a-#=US+mx?4Qc0^j9*!qj&URTv}^*i=1jcG%7La=^h{BJeS%i@X`S8
zF7=c1^)9lALbD1>&Jfdl+AIn;NK525d1JNAYCBoSJItY<_4+i3?5Vi7^2>R#lbd;n
z*ex@7*DcENu$r$;b#Kc&Fkj6PM@KqWYv|g-;X1rrc13ctTE`sR%w*~^DvKd|pKq0-
zxik-!H9MnyFay(!>?Y`Jav^w;1{Hx^Iv5l?82*K_$dQgb`^B_h6v_5(jd(}dRgWTW
z48~<TSj58(t7VsutXe&E_YoIfA3Bt~{SUdj4j<Wvfm}k*7uPzAkFq%WzU)r=wC?-z
z*s*;Z4{t86mQ-n9JdPt+cC;;?Ln+j?X_7Zv+$__)8pu`A=?p<>jFK*H`gAxmqkGV-
z>1a1BvAx|Y%HDhSt*@=0n67_U>z(@)Pq3@SO(Ng2tNqn_2_KN<M_jv~mX)s`+S)w1
zc>lDYR`2?9@kEZsVSCH&{_U)u5VGuizVH2ur+gmV>9X4>h}X5dt95_tUcQ9t;`w4+
zwmo4~Yb?94$Rtn5V}{UAE4S?l9kP8#b^yOzHS+DOo8d#!PN&2#xSg!-qqx%u;czE1
zU`Ci4$+c>z0;~D)W@yW;bsf}o3SZ?1k$Z`A@NTylyEb979iy$rnsNsxg_VU^k?zS~
zhRCpu_UyW7{oAZuIDf^LyS!jVHhGLtt(cuONlMW24$Zj3klkdJOI<Z&%HWRJM_RLE
z>P#KIB)k~s1Tf8ATD}sMJv5lBVypPOF@9bO&e$|3fM>lP!<aLF1#24LMVT!dSGgE@
z7h)BwG&|Yeb?rgczKqhCFa}wE89Feumic0vB<{KiMMZR;D}fndP7i}Nk%+1IL>AH&
zhFLP#ELn|5qoS-scMDJ~;_6b$gH$4kuvjc9x<+iUd`kseZe^y1AWH9gS$Dx*8u?!E
zF?p{=R14u<8~er+e_#ouWmVrhXKeIuHecK+O0p@;5#NXVLia3fG`2Juq4ilCYEx;B
z-QY7i@DSZZ7vv&ELs)x0>zr$wn{8v@)5=elGxZXec3416ik?>{V3Pz2jjBliZqkXE
zQ#Pq(^zp}o?>;mquL>I->>gH#QG#ky$Bt4=Qzqj>2$^UMVp1<BK@Zc8Z#B!<*b5<b
z-S5IA7=$@_IJv|UVLD7Y>OO7*2Z|!e{<YgS&K)l3^ZcH}NUi5k;0YBAroxkHZ8K(&
zw$}~>=3{dM7;8$9l~n6&2+@`zFS`Sk3@$jM#+n;1Hxc=qgOeqN1C+8QSx?JdgmklM
zv#hCEk;F=1VS4S4^wZ0;vAI1SF|HD<Wa?d`qns|OJaY%;XSn`S`K;v!H2A9{@>`f0
zb*c1=rGI=3j}=99Y{ItUbirjC-%Zt&VOI+;$J5Rz-X1@mz=(2w3DXk`9x)|uh4Y9!
zhn+-B?!*;KN6pg{LJ$_l6b~%2wpktr9Z7LBT|yv3!$d8t*tEygv#0aT-cwFRs*B&!
zS>{5Yh$f)~!lL&K*~o%@XcPjb+Q9*LwVk#vOM0e(%DIEMW{yB}`@vYUa7t?JIU1Sr
zO;1LlIz1R^6?PH>UdMOS@c<V(JuYSKvZ#t~?N-|DV$2ynZhxnrwfiv%40IYps(vx%
zpreS>c+*0Ow-N;3a%ailmffbzTOPrsqmfc*Q4u>8WrZi!DXVezh-t8s?pDZHhcxaA
zl$#E-O4*WjuB9R+QLTMR2sZT{=ZX=UUotT}Y2u0<-6m@MGNS+4CZVt+qVh!Z(AN<=
z^*h0t%I)MBk0Lf?gvKeyf)1Ej69F)yp^l>cY`8?Wr~$JYIMun9i~!y2m=~*XL|7>5
ztaBMU9iv?<o=oH6qCLiv^IG|eIYjX;CdRE~<MhVM;#i=m_KHg>dCnl7tWo#8Js9IU
zQ!-+*N=q;uf{>i#6f6?OQ)QDeS;*HONb<r7Js5V?N}2=nOsJHb%g4G*(0nmiSo&|%
z%FK4MsxK0C!cu1FQ`9t=(2P%^L1%CyEM^^Y6@iZ!pz%@e&$M(DPUP^d(VdCf)Nml}
zv0E4z6@q}J#7ibnb0pCn#k(!R#uw`-GT@ZK_(^Xi8f`^oA_8|8IPUA6bE9gFHy7Ej
z#6PD&1aak8;+D<xPRN;L?2Xg45T#t210(x{$01!uFy;K(6K+Mnh_{>-4}6-vxkzH*
z7OU7hIWmc)!bl#j6Bc4J7_&`y8FR@6M9*zXd(6pKYR@@AeZpDa)ZY|GDpWOxZUU6K
z<Y9W*o90MlWL{k)>C2h)HLhXyCUw)ymLwz_n$=vby-hAj=59<Hrjb%|M|0hki4C?J
zlNtAd+>_(s-X=LQy&_q++bC8~nj4?Vi;mPA^H(78<|}Qt85XWS%&mm{&HSltf{jkE
zMJBA;(;B?~gm>|~JaS-#P4d#6;{A!k%z9-yBA~bonPU1jNOQczt%{n1<tOXhstkPI
ztNUWttc@)>`<CTCh+#E&zNwI#OPJ-ETbPxZ&jhIEBsR)Or_A4QV8(G{)%sd<HQNtI
z3sdjFH2M0h4o+Q$fV;(6U6Mmcw~H~q`7Ti%O_8%2WS0qwNUfias*ns=_*A=`SQu^7
zchf5vkuE^(3P{<QwO3r48{L?5eUPkqq=9_eFH%C6Mmn~Fs6rm@*s)c@vdip9tPRC@
zEyu0+JT;sUTSIQ7(UlK@RQC;B2ob%-6WL~*W64|8?XW*gM%jSOb%#tyM`NSHt_kL;
zBeN<9Dv&ncZpS~{v@*wzU$AKx?7YzDNF-*4&9DiGP+C8;nW<f)S0PT?{M^Ek*O7D)
z47ouI_h=Xd7lmQ{**mo6XsRIb{f?G)!4{6#aD^+<^lCO74;y-HD|>@X-CWH{bRopF
zNRkv0ERiA1+kJ&3WYfkzHr@9lNB4Smz|^rwmwVI@RyZ&0p)FijuAm<A#t-%|u4r4{
zFwOX9V&2x=UEoPw2~HC^SF$2^$P-7m^-`CD!R<p+ybZAZO!yEk1nm@a-Sr?5V@oH*
zcrQ2~K;&@d?glN1P=B?Wb3IUDE!STQUc@M`*CA-((1bf^((hnjwsK&;Cu0tmhef>P
Wx5GrZMcnV?pYc-s!(#42@&5r|czkyN

literal 0
HcmV?d00001

diff --git a/lang/English/profile.php b/lang/English/profile.php
deleted file mode 100644
index 2d19ba6c..00000000
--- a/lang/English/profile.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-// Language definitions used in profile.php
-$lang_profile = array(
-
-// Navigation and sections
-'Profile menu'                    =>    'Profile menu',
-'Section essentials'            =>    'Essentials',
-'Section personal'                =>    'Personal',
-'Section messaging'                =>    'Messaging',
-'Section personality'            =>    'Personality',
-'Section display'                =>    'Display',
-'Section privacy'                =>    'Privacy',
-'Section admin'                    =>    'Administration',
-
-// Miscellaneous
-'Username and pass legend'        =>    'Enter your username and password',
-'Personal details legend'        =>    'Enter your personal details',
-'Contact details legend'        =>    'Enter your messaging details',
-'User activity'                    =>    'User activity',
-'Paginate info'                    =>    'Enter the number of topics and posts you wish to view on each page.',
-
-// Password stuff
-'Pass key bad'                    =>    'The specified password activation key was incorrect or has expired. Please re-request a new password. If that fails, contact the forum administrator at',
-'Pass updated'                    =>    'Your password has been updated. You can now login with your new password.',
-'Pass updated redirect'            =>    'Password updated.',
-'Wrong pass'                    =>    'Wrong old password.',
-'Change pass'                    =>    'Change password',
-'Change pass legend'            =>    'Enter and confirm your new password',
-'Old pass'                        =>    'Old password',
-'New pass'                        =>    'New password',
-'Confirm new pass'                =>    'Confirm new password',
-'Pass info'                        =>    'Passwords must be at least 6 characters long. Passwords are case sensitive.',
-
-// Email stuff
-'Email key bad'                    =>    'The specified email activation key was incorrect or has expired. Please re-request change of email address. If that fails, contact the forum administrator at',
-'Email updated'                    =>    'Your email address has been updated.',
-'Activate email sent'            =>    'An email has been sent to the specified address with instructions on how to activate the new email address. If it doesn\'t arrive you can contact the forum administrator at',
-'Email legend'                    =>    'Enter your new email address',
-'Email instructions'            =>    'An email will be sent to your new address with an activation link. You must click the link in the email you receive to activate the new address.',
-'Change email'                    =>    'Change email address',
-'New email'                        =>    'New email',
-
-// Avatar upload stuff
-'Avatars disabled'                =>    'The administrator has disabled avatar support.',
-'Too large ini'                    =>    'The selected file was too large to upload. The server didn\'t allow the upload.',
-'Partial upload'                =>    'The selected file was only partially uploaded. Please try again.',
-'No tmp directory'                =>    'PHP was unable to save the uploaded file to a temporary location.',
-'No file'                        =>    'You did not select a file for upload.',
-'Bad type'                        =>    'The file you tried to upload is not of an allowed type. Allowed types are gif, jpeg and png.',
-'Too wide or high'                =>    'The file you tried to upload is wider and/or higher than the maximum allowed',
-'Too large'                        =>    'The file you tried to upload is larger than the maximum allowed',
-'pixels'                        =>    'pixels',
-'bytes'                            =>    'bytes',
-'Move failed'                    =>    'The server was unable to save the uploaded file. Please contact the forum administrator at',
-'Unknown failure'                =>    'An unknown error occurred. Please try again.',
-'Avatar upload redirect'        =>    'Avatar uploaded.',
-'Avatar deleted redirect'        =>    'Avatar deleted.',
-'Avatar desc'                    =>    'An avatar is a small image that will be displayed under your username in your posts. It must not be any bigger than',
-'Upload avatar'                    =>    'Upload avatar',
-'Upload avatar legend'            =>    'Enter an avatar file to upload',
-'Delete avatar'                    =>    'Delete avatar', // only for admins
-'File'                            =>    'File',
-'Upload'                        =>    'Upload', // submit button
-
-// Form validation stuff
-'Forbidden title'                =>    'The title you entered contains a forbidden word. You must choose a different title.',
-'Profile redirect'                =>    'Profile updated.',
-
-// Profile display stuff
-'Users profile'                    =>    '%s\'s profile',
-'Username info'                    =>    'Username: %s',
-'Email info'                    =>    'Email: %s',
-'Posts info'                    =>    'Posts: %s',
-'Registered info'                =>    'Registered: %s',
-'Last post info'                =>    'Last post: %s',
-'Last visit info'                =>    'Last visit: %s',
-'Show posts'                    =>    'Show all posts',
-'Show topics'                    =>    'Show all topics',
-'Show subscriptions'            =>    'Show all subscriptions',
-'Realname'                        =>    'Real name',
-'Location'                        =>    'Location',
-'Website'                        =>    'Website',
-'Invalid website URL'            =>    'The website URL you entered is invalid.',
-'Website not allowed'            =>    'You are not allowed to add a website to your profile yet.',
-'Jabber'                        =>    'Jabber',
-'ICQ'                            =>    'ICQ',
-'MSN'                            =>    'Microsoft Account',
-'AOL IM'                        =>    'AOL IM',
-'Yahoo'                            =>    'Yahoo! Messenger',
-'Avatar'                        =>    'Avatar',
-'Signature'                        =>    'Signature',
-'Sig max size'                    =>    'Max length: %s characters / Max lines: %s',
-'Avatar legend'                    =>    'Set your avatar display options',
-'Avatar info'                    =>    'An avatar is a small image that will be displayed with all your posts. You can upload an avatar by clicking the link below.',
-'Change avatar'                    =>    'Change avatar',
-'Signature legend'                =>    'Compose your signature',
-'Signature info'                =>    'A signature is a small piece of text that is attached to your posts. In it, you can enter just about anything you like. Perhaps you would like to enter your favourite quote or your star sign. It\'s up to you! In your signature you can use BBCode if it is allowed in this particular forum. You can see the features that are allowed/enabled listed below whenever you edit your signature.',
-'Sig preview'                    =>    'Current signature preview:',
-'No sig'                        =>    'No signature currently stored in profile.',
-'Signature quote/code/list/h'    =>    'The quote, code, list, and heading BBCodes are not allowed in signatures.',
-'Topics per page'                =>    'Topics',
-'Posts per page'                =>    'Posts',
-'Leave blank'                    =>    'Leave blank to use forum default.',
-'Subscription legend'            =>    'Set your subscription options',
-'Notify full'                    =>    'Include a plain text version of new posts in subscription notification emails.',
-'Auto notify full'                =>    'Automatically subscribe to every topic you post in.',
-'Show smilies'                    =>    'Show smilies as graphic icons.',
-'Show images'                    =>    'Show images in posts.',
-'Show images sigs'                =>    'Show images in user signatures.',
-'Show avatars'                    =>    'Show user avatars in posts.',
-'Show sigs'                        =>    'Show user signatures.',
-'Style legend'                    =>    'Select your preferred style',
-'Styles'                        =>    'Styles',
-'Admin note'                    =>    'Admin note',
-'Pagination legend'                =>    'Enter your pagination options',
-'Post display legend'            =>    'Set your options for viewing posts',
-'Post display info'                =>    'If you are on a slow connection, disabling these options, particularly showing images in posts and signatures, will make pages load faster.',
-'Instructions'                    =>    'When you update your profile, you will be redirected back to this page.',
-
-// Administration stuff
-'Group membership legend'        =>    'Choose user group',
-'Save'                            =>    'Save',
-'Set mods legend'                =>    'Set moderator access',
-'Moderator in info'                =>    'Choose which forums this user should be allowed to moderate. Note: This only applies to moderators. Administrators always have full permissions in all forums.',
-'Update forums'                    =>    'Update forums',
-'Delete ban legend'                =>    'Delete (administrators only) or ban user',
-'Delete user'                    =>    'Delete user',
-'Ban user'                        =>    'Ban user',
-'Confirm delete legend'            =>    'Important: read before deleting user',
-'Confirm delete user'            =>    'Confirm delete user',
-'Confirmation info'                =>    'Please confirm that you want to delete the user', // the username will be appended to this string
-'Delete warning'                =>    'Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by this user, the posts can only be deleted manually at a later time.',
-'Delete posts'                    =>    'Delete any posts and topics this user has made.',
-'Delete'                        =>    'Delete', // submit button (confirm user delete)
-'User delete redirect'            =>    'User deleted.',
-'User promote redirect'            =>    'User promoted.',
-'Group membership redirect'        =>    'Group membership saved.',
-'Update forums redirect'        =>    'Forum moderator rights updated.',
-'Ban redirect'                    =>    'Redirecting …',
-'No delete admin message'        =>    'Administrators cannot be deleted. In order to delete this user, you must first move him/her to a different user group.',
-
-);
diff --git a/lang/English/profile.po b/lang/English/profile.po
new file mode 100644
index 00000000..bbd7f00b
--- /dev/null
+++ b/lang/English/profile.po
@@ -0,0 +1,378 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Profile menu"
+msgstr "Profile menu"
+
+msgid "Section essentials"
+msgstr "Essentials"
+
+msgid "Section personal"
+msgstr "Personal"
+
+msgid "Section messaging"
+msgstr "Messaging"
+
+msgid "Section personality"
+msgstr "Personality"
+
+msgid "Section display"
+msgstr "Display"
+
+msgid "Section privacy"
+msgstr "Privacy"
+
+msgid "Section admin"
+msgstr "Administration"
+
+msgid "Username and pass legend"
+msgstr "Enter your username and password"
+
+msgid "Personal details legend"
+msgstr "Enter your personal details"
+
+msgid "Contact details legend"
+msgstr "Enter your messaging details"
+
+msgid "User activity"
+msgstr "User activity"
+
+msgid "Paginate info"
+msgstr "Enter the number of topics and posts you wish to view on each page."
+
+msgid "Pass key bad"
+msgstr "The specified password activation key was incorrect or has expired. Please re-request a new password. If that fails, contact the forum administrator at"
+
+msgid "Pass updated"
+msgstr "Your password has been updated. You can now login with your new password."
+
+msgid "Pass updated redirect"
+msgstr "Password updated."
+
+msgid "Wrong pass"
+msgstr "Wrong old password."
+
+msgid "Change pass"
+msgstr "Change password"
+
+msgid "Change pass legend"
+msgstr "Enter and confirm your new password"
+
+msgid "Old pass"
+msgstr "Old password"
+
+msgid "New pass"
+msgstr "New password"
+
+msgid "Confirm new pass"
+msgstr "Confirm new password"
+
+msgid "Pass info"
+msgstr "Passwords must be at least 6 characters long. Passwords are case sensitive."
+
+msgid "Email key bad"
+msgstr "The specified email activation key was incorrect or has expired. Please re-request change of email address. If that fails, contact the forum administrator at"
+
+msgid "Email updated"
+msgstr "Your email address has been updated."
+
+msgid "Activate email sent"
+msgstr "An email has been sent to the specified address with instructions on how to activate the new email address. If it doesn't arrive you can contact the forum administrator at"
+
+msgid "Email legend"
+msgstr "Enter your new email address"
+
+msgid "Email instructions"
+msgstr "An email will be sent to your new address with an activation link. You must click the link in the email you receive to activate the new address."
+
+msgid "Change email"
+msgstr "Change email address"
+
+msgid "New email"
+msgstr "New email"
+
+msgid "Avatars disabled"
+msgstr "The administrator has disabled avatar support."
+
+msgid "Too large ini"
+msgstr "The selected file was too large to upload. The server didn't allow the upload."
+
+msgid "Partial upload"
+msgstr "The selected file was only partially uploaded. Please try again."
+
+msgid "No tmp directory"
+msgstr "PHP was unable to save the uploaded file to a temporary location."
+
+msgid "No file"
+msgstr "You did not select a file for upload."
+
+msgid "Bad type"
+msgstr "The file you tried to upload is not of an allowed type. Allowed types are gif, jpeg and png."
+
+msgid "Too wide or high"
+msgstr "The file you tried to upload is wider and/or higher than the maximum allowed"
+
+msgid "Too large"
+msgstr "The file you tried to upload is larger than the maximum allowed"
+
+msgid "pixels"
+msgstr "pixels"
+
+msgid "bytes"
+msgstr "bytes"
+
+msgid "Move failed"
+msgstr "The server was unable to save the uploaded file. Please contact the forum administrator at"
+
+msgid "Unknown failure"
+msgstr "An unknown error occurred. Please try again."
+
+msgid "Avatar upload redirect"
+msgstr "Avatar uploaded."
+
+msgid "Avatar deleted redirect"
+msgstr "Avatar deleted."
+
+msgid "Avatar desc"
+msgstr "An avatar is a small image that will be displayed under your username in your posts. It must not be any bigger than"
+
+msgid "Upload avatar"
+msgstr "Upload avatar"
+
+msgid "Upload avatar legend"
+msgstr "Enter an avatar file to upload"
+
+msgid "Delete avatar"
+msgstr "Delete avatar"
+
+msgid "File"
+msgstr "File"
+
+msgid "Upload"
+msgstr "Upload"
+
+msgid "Forbidden title"
+msgstr "The title you entered contains a forbidden word. You must choose a different title."
+
+msgid "Profile redirect"
+msgstr "Profile updated."
+
+msgid "Users profile"
+msgstr "%s's profile"
+
+msgid "Username info"
+msgstr "Username: %s"
+
+msgid "Email info"
+msgstr "Email: %s"
+
+msgid "Posts info"
+msgstr "Posts: %s"
+
+msgid "Registered info"
+msgstr "Registered: %s"
+
+msgid "Last post info"
+msgstr "Last post: %s"
+
+msgid "Last visit info"
+msgstr "Last visit: %s"
+
+msgid "Show posts"
+msgstr "Show all posts"
+
+msgid "Show topics"
+msgstr "Show all topics"
+
+msgid "Show subscriptions"
+msgstr "Show all subscriptions"
+
+msgid "Realname"
+msgstr "Real name"
+
+msgid "Location"
+msgstr "Location"
+
+msgid "Website"
+msgstr "Website"
+
+msgid "Invalid website URL"
+msgstr "The website URL you entered is invalid."
+
+msgid "Website not allowed"
+msgstr "You are not allowed to add a website to your profile yet."
+
+msgid "Jabber"
+msgstr "Jabber"
+
+msgid "ICQ"
+msgstr "ICQ"
+
+msgid "MSN"
+msgstr "Microsoft Account"
+
+msgid "AOL IM"
+msgstr "AOL IM"
+
+msgid "Yahoo"
+msgstr "Yahoo! Messenger"
+
+msgid "Avatar"
+msgstr "Avatar"
+
+msgid "Signature"
+msgstr "Signature"
+
+msgid "Sig max size"
+msgstr "Max length: %s characters / Max lines: %s"
+
+msgid "Avatar legend"
+msgstr "Set your avatar display options"
+
+msgid "Avatar info"
+msgstr "An avatar is a small image that will be displayed with all your posts. You can upload an avatar by clicking the link below."
+
+msgid "Change avatar"
+msgstr "Change avatar"
+
+msgid "Signature legend"
+msgstr "Compose your signature"
+
+msgid "Signature info"
+msgstr "A signature is a small piece of text that is attached to your posts. In it, you can enter just about anything you like. Perhaps you would like to enter your favourite quote or your star sign. It's up to you! In your signature you can use BBCode if it is allowed in this particular forum. You can see the features that are allowed/enabled listed below whenever you edit your signature."
+
+msgid "Sig preview"
+msgstr "Current signature preview:"
+
+msgid "No sig"
+msgstr "No signature currently stored in profile."
+
+msgid "Signature quote/code/list/h"
+msgstr "The quote, code, list, and heading BBCodes are not allowed in signatures."
+
+msgid "Topics per page"
+msgstr "Topics"
+
+msgid "Posts per page"
+msgstr "Posts"
+
+msgid "Leave blank"
+msgstr "Leave blank to use forum default."
+
+msgid "Subscription legend"
+msgstr "Set your subscription options"
+
+msgid "Notify full"
+msgstr "Include a plain text version of new posts in subscription notification emails."
+
+msgid "Auto notify full"
+msgstr "Automatically subscribe to every topic you post in."
+
+msgid "Show smilies"
+msgstr "Show smilies as graphic icons."
+
+msgid "Show images"
+msgstr "Show images in posts."
+
+msgid "Show images sigs"
+msgstr "Show images in user signatures."
+
+msgid "Show avatars"
+msgstr "Show user avatars in posts."
+
+msgid "Show sigs"
+msgstr "Show user signatures."
+
+msgid "Style legend"
+msgstr "Select your preferred style"
+
+msgid "Styles"
+msgstr "Styles"
+
+msgid "Admin note"
+msgstr "Admin note"
+
+msgid "Pagination legend"
+msgstr "Enter your pagination options"
+
+msgid "Post display legend"
+msgstr "Set your options for viewing posts"
+
+msgid "Post display info"
+msgstr "If you are on a slow connection, disabling these options, particularly showing images in posts and signatures, will make pages load faster."
+
+msgid "Instructions"
+msgstr "When you update your profile, you will be redirected back to this page."
+
+msgid "Group membership legend"
+msgstr "Choose user group"
+
+msgid "Save"
+msgstr "Save"
+
+msgid "Set mods legend"
+msgstr "Set moderator access"
+
+msgid "Moderator in info"
+msgstr "Choose which forums this user should be allowed to moderate. Note: This only applies to moderators. Administrators always have full permissions in all forums."
+
+msgid "Update forums"
+msgstr "Update forums"
+
+msgid "Delete ban legend"
+msgstr "Delete (administrators only) or ban user"
+
+msgid "Delete user"
+msgstr "Delete user"
+
+msgid "Ban user"
+msgstr "Ban user"
+
+msgid "Confirm delete legend"
+msgstr "Important: read before deleting user"
+
+msgid "Confirm delete user"
+msgstr "Confirm delete user"
+
+msgid "Confirmation info"
+msgstr "Please confirm that you want to delete the user"
+
+msgid "Delete warning"
+msgstr "Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by this user, the posts can only be deleted manually at a later time."
+
+msgid "Delete posts"
+msgstr "Delete any posts and topics this user has made."
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "User delete redirect"
+msgstr "User deleted."
+
+msgid "User promote redirect"
+msgstr "User promoted."
+
+msgid "Group membership redirect"
+msgstr "Group membership saved."
+
+msgid "Update forums redirect"
+msgstr "Forum moderator rights updated."
+
+msgid "Ban redirect"
+msgstr "Redirecting …"
+
+msgid "No delete admin message"
+msgstr "Administrators cannot be deleted. In order to delete this user, you must first move him/her to a different user group."
diff --git a/lang/English/register.mo b/lang/English/register.mo
new file mode 100644
index 0000000000000000000000000000000000000000..f076b7ec197bfa69d341ed5f2390572d16f257ad
GIT binary patch
literal 3064
zcma)8O>Z1U5FH?VnGhg+BnKiD5+8|_nZ#BCW`iSQCq@<tG4Tcg2c+Ja+SwsJ-Anh3
zmqp^hg%e0{KwRL2#6LhBI3OX8hzkceAkIkq1|(i}&wB0PAVwL#?Vj$gS5>d7^T*)>
zpCx#X;(Z+N?|7fW`^9begXi?^NpdG}5qKByIpF=k^WFGzhg-k}%)beI0LZ}mfNh5#
z0Pn^4<8J&p@L`O<0v-f@+kO8Lcn`)uci(>n3b((2hk*y~i0h94#m<u*p6T#nhkf8C
zd?<jz|C<Am|98MgG5!H~7T<pZ{*Cb=I5z|yygNyb0X<Ooe+tZiUjknS{sc^cM?vxk
za2+V)w}77jKLX-katzLje@_Effj!_a!1sY?fUhE03iu)L6!1^r*TADNx(xgtC@FXZ
z?}K>d5r089_#?T1Yrz&E#7OueOgj&#247`DxJcd}lEEz=P)iQ&`X+gioJ!mu!z=zK
z7fQ#RtSOVTPS&g$R<0(lRi%@Q>~mU-u#{YqIjYRic0Y}6s8&rrO4hAwYjUk-pS)tp
z@Pr(fKG{^>#~tC9=8{d3T;r1RU=OQ`%5mPrIa`l4Hyj3$0hU(2VJB1g;Z##uL+qS&
ze!sbBY|rAMwiY&p8+8P(dv-?EOgS5GU9vMS+A+i7z2l|%xZA&}Tc>miuWR2UGY&()
zvUHB(&z0kbo>-y96XzB-oqZerr5i>18aog6Jz8hgjM%NNE^J=yr)v&F%%>Ms!#%=W
zdX2X$Svs4#tbCL9oibjl#yTvztW4RelG8q`de@2cf-36Dyf};|27}DH^8CV;jVqVt
z_7}6$3rKXs2B%KPFxv3D&8e|gl{rWGNIB2V%Ju$wx;$Se)`#rUOD4BPWy&5c52|K|
zNRQYoyq><qhLI%UxM`8wh8DBs><qrdVY+2om-AY*(W7YOKQu_HC>;Bnl0B)krV^AI
zn%b6Bo?{6$mK2$`9<U=jB#A+by`)S5y^YnN(p6Jo!b<ojm1k;=+J>stKyya@5o2oD
znq2ZB!p(JCFkv;t%~P=v+>$d37PZpY`o^Ec$XBHiKCnJ9B%?q8`&A<xA#Y{GepnN>
z1#WelkEpf|6gGyzp^@5#Ni(H)TK18Q<5D>ZJdUe84MW9=^L}JoU6ArOumj;j`eUV7
zmnEyL?S!yi$&NZ4UbnuXp+wNO4V)zF3PcQ^!A7XIjIN>^gvHA7&NLTcsxv4O4dHh*
zb{6Le;{uDfE0n*)tf+=i3{*zYQv>S3b18ihnJHt)L4|eUX%MJdqo-&pH;|e!Nc&oW
z=UBN$GAh62;C~&bG<t-%5+fVwWXT%{Pw*BT@Lkci(p3?g+e}ypT-*gU6}E<T^eE9V
zyd9%`O%NRldK-vgID<gNj7DW<T{rB6iu4xffV0+^?dgsEdFqf8StQaOOKfIMbEnJs
zEVNIt@1qwW03m5cH=t)jovIvup{-d{W+W{(u9l?b3R(tVB&phFoF)4hRT?58716c&
z5VCw^v3AGdy{$F&YRyG<(|p&jGm=1yQ3J7QTb77jWwNA?EZ+#4f%tZ01ZTqz=w=q*
z5t1-q5SRxT<j0&>5C^o~MOw-Onky`O^9*9=99#?M2Th@+As|5^u{`z^17g?F=l!n}
zls}3@qhKT*@s2@OU>_Mr>~rhns=|1{IDc+<RyMulLdar^>xCw8Y4!nICRH<v+Le1}
zV{_(HC%^C=`W1C+$uEl9p(9z;7H^B{;#u7V816K%JUJHxic0p7gc5uuwBXrHB&xgj
zqIEc1@1~N`7Cf6ug9y`Td)B~a#b^S%ib%<S6r%cf2Wr0tg3P0UXSXaA7IlX>;OGX|
z40^C(G@j7*x@%aXBw~k>qgEkGs1jv6ZzQubvt-NGEN4h>)3`#5>AvBfZMZcf9MD*c
zc3tBhkeKhL9=b;~KZ_ema4?<6T{tK`hSJ-bU6m_6uS`0w()Yy6)9Ldk{-0ZW%XA*Y
RSt^%8lU+JHHxkP~`3D%zqaXkP

literal 0
HcmV?d00001

diff --git a/lang/English/register.php b/lang/English/register.php
deleted file mode 100644
index b1a80018..00000000
--- a/lang/English/register.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-// Language definitions used in register.php
-$lang_register = array(
-
-// Miscellaneous
-'No new regs'                =>    'This forum is not accepting new registrations.',
-'Reg cancel redirect'        =>    'Registration cancelled.',
-'Forum rules'                =>    'Forum rules',
-'Rules legend'                =>    'You must agree to the following in order to register',
-'Registration flood'        =>    'A new user was registered with the same IP address as you within the last hour. To prevent registration flooding, at least an hour has to pass between registrations from the same IP. Sorry for the inconvenience.',
-'Agree'                        =>    'Agree',
-'Cancel'                    =>    'Cancel',
-'Register'                    =>    'Register',
-
-// Form validation stuff (some of these are also used in post.php)
-'Registration errors'        =>    'Registration errors',
-'Registration errors info'    =>    'The following errors need to be corrected before you can register:',
-'Username censor'            =>    'The username you entered contains one or more censored words. Please choose a different username.',
-'Username dupe 1'            =>    'Someone is already registered with the username',
-'Username dupe 2'            =>    'The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username.',
-'Email not match'            =>    'Email addresses do not match.',
-
-// Registration email stuff
-'Reg email'                    =>    'Thank you for registering. Your password has been sent to the specified address. If it doesn\'t arrive you can contact the forum administrator at',
-'Reg complete'                =>    'Registration complete. You are now logged in.',
-
-// Register info
-'Desc 1'                    =>    'Registration will grant you access to a number of features and capabilities otherwise unavailable. These functions include the ability to edit and delete posts, design your own signature that accompanies your posts and much more. If you have any questions regarding this forum you should ask an administrator.',
-'Desc 2'                    =>    'Below is a form you must fill out in order to register. Once you are registered you should visit your profile and review the different settings you can change. The fields below only make up a small part of all the settings you can alter in your profile.',
-'Username legend'            =>    'Please enter a username between 2 and 25 characters long',
-'Pass legend'                =>    'Please enter and confirm your chosen password',
-'Pass info'                    =>    'Passwords must be at least 6 characters long. Passwords are case sensitive.',
-'Email info'                =>    'You must enter a valid email address as your randomly generated password will be sent to that address.',
-'Confirm email'                =>    'Confirm email address',
-
-);
diff --git a/lang/English/register.po b/lang/English/register.po
new file mode 100644
index 00000000..7cde2e42
--- /dev/null
+++ b/lang/English/register.po
@@ -0,0 +1,84 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "No new regs"
+msgstr "This forum is not accepting new registrations."
+
+msgid "Reg cancel redirect"
+msgstr "Registration cancelled."
+
+msgid "Forum rules"
+msgstr "Forum rules"
+
+msgid "Rules legend"
+msgstr "You must agree to the following in order to register"
+
+msgid "Registration flood"
+msgstr "A new user was registered with the same IP address as you within the last hour. To prevent registration flooding, at least an hour has to pass between registrations from the same IP. Sorry for the inconvenience."
+
+msgid "Agree"
+msgstr "Agree"
+
+msgid "Cancel"
+msgstr "Cancel"
+
+msgid "Register"
+msgstr "Register"
+
+msgid "Registration errors"
+msgstr "Registration errors"
+
+msgid "Registration errors info"
+msgstr "The following errors need to be corrected before you can register:"
+
+msgid "Username censor"
+msgstr "The username you entered contains one or more censored words. Please choose a different username."
+
+msgid "Username dupe 1"
+msgstr "Someone is already registered with the username"
+
+msgid "Username dupe 2"
+msgstr "The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username."
+
+msgid "Email not match"
+msgstr "Email addresses do not match."
+
+msgid "Reg email"
+msgstr "Thank you for registering. Your password has been sent to the specified address. If it doesn't arrive you can contact the forum administrator at"
+
+msgid "Reg complete"
+msgstr "Registration complete. You are now logged in."
+
+msgid "Desc 1"
+msgstr "Registration will grant you access to a number of features and capabilities otherwise unavailable. These functions include the ability to edit and delete posts, design your own signature that accompanies your posts and much more. If you have any questions regarding this forum you should ask an administrator."
+
+msgid "Desc 2"
+msgstr "Below is a form you must fill out in order to register. Once you are registered you should visit your profile and review the different settings you can change. The fields below only make up a small part of all the settings you can alter in your profile."
+
+msgid "Username legend"
+msgstr "Please enter a username between 2 and 25 characters long"
+
+msgid "Pass legend"
+msgstr "Please enter and confirm your chosen password"
+
+msgid "Pass info"
+msgstr "Passwords must be at least 6 characters long. Passwords are case sensitive."
+
+msgid "Email info"
+msgstr "You must enter a valid email address as your randomly generated password will be sent to that address."
+
+msgid "Confirm email"
+msgstr "Confirm email address"
diff --git a/lang/English/search.mo b/lang/English/search.mo
new file mode 100644
index 0000000000000000000000000000000000000000..1f68f853019433a51326c94ee5a3f1f980c6b99e
GIT binary patch
literal 4068
zcma);Pi$009LGlmh2r0eB7!ie<?rs6B34|ep%e;@P%7OTxrnpx&2}Gs``$V;+jSGp
zc)@s3qtR&8Xf)BpfEP8KOgvynO!T52NW93+7!M}Ki{IbOyxnfMRVO>|v-AHqzxn-s
zGuQf8yvC4*kvAe=y@9a_@Z3%KAicYSvDM&v;BDY1;631%;Jx5?;Ck>^@P3f3bnP2J
zY99joz+>R8;IuD42d+VR4!j*~f_H=GLF)G=cnkQEFMkH!f%0W=EqE2Y6Z{2S1^xk&
ze1ChczS+&Y4kUTEg7<+3K$3R`+zh55?fYfVPr(OJz5?RMuH!@d_zfhvRzfJ!M?Xk%
zZv;t>T_Ek}0Js4>=G#M%_N76R<3$iZ_BK8w?}s4G^SQ78+Lyoe?LUEcq5V2Y`~M3h
zeXho)iEBYxcQZJJv)cudeCP0?`Oky2zgNNS;6;$+_!-;+{tnXkeoVFw+yv6R!}vgz
zY}A*Jg4FL6Nb)`lZUSo{$#(%Hy}biI4qgTy1^@KSVenp*%iuWpI+z2mfdz04lsgC(
zK{CCwAn8BxY=ETab0DT<FM$}!-T?7qAK*j%FM?!;Uw~!s2M}9i!%)Wa;6aei^AflU
z`nm!>hVu8=6z!`IN-l!yLDEkN#E;G6L;5%m(mEGF90hyDm*4X3?}N17$G-g%Nb-IK
z_JiMmB=?UXmbZ1JcS@wMJ;<cj8<8oIF38@=riPJ8CQ4*ev_2(FWfRFyiR_!wpo9IA
zOmzNGhqZ?x5L>r<B7IPL1bHVi$xG>B<gLg9$Ye8=wjt9w>_Fzo*5^Um6WIaj=0Rlg
zEjriT$a!S)J+hA+GNoM()+P`-x)My-ribV|ssovXQ8LR$8>X5nuBA{xl^tsFa%!qv
zSJNgJn%7fpbWg2G>rr5<=VYsys!;b1=xON;YG{cC7q8G&>pLHoZ8^tN)u?4+9!<GP
zt#Hi!wf)(XPMWOO38}T1m0Tnt*NyU785ow;rAgdklPRx8*dLh4rr#_IN<urPQ+CSX
zb*XBR)=`?!2+XJh71a&Ob_#=L`=^nJL^q|9A@#HSa(c{4es@nbqF~MoYxQvkQn21y
zC(e=$^*EAxiI#5RdZ%0<;u4KGpEFM4Wg7hkrk&9^a3}*Rhy;)2ER2i!>PnoZ?Lw4f
z)ltHuq>?Tub`M+FSZl;4s>hO7$Ov@TKqWO=bvBPLF4d(im$N)J-DQDUDcf4A3@^9X
zv?CYRP1;2(NV`P3;wGxec1>n(b~qeFDpn$=;nwbEtOGdZO~nl*;ylc|ri(nO+oB%X
zv!A=aBij?cWrPpy*xxs$QnKOvM3{eCDzd{OAD6;Zr8;z|Z|Y<zKc-Mbeg3d8vdB@F
zKPBfQ>Y7y@7uw`Y3Kkj*lPYvNE|S>>{3KtJqPAd0en5n^C^=YhOO(rnRLwrocVgni
zk<R)<h24E)X=30n`BJNnMU8yH4Ax^2CHr|$6-rApGE*AQ@9XrV)hklvk0e1#L8!?0
zl_S#@q{wB`_e}n%Or&x$PNg!83?C}&E9^y!E9R%uh6?1ETcgO`BFl!hDGFsgfUFP=
zi}Gy)dRq=>%m=hP9L<{%VxP7A<vK1o%YP4NZrpN<x%$P?&c`;A=l_H`QoN0I)`WW^
zo^7_~cN%)j!j6)rp%NML#Kpn_E5V!)Gm%l{yus<E9U{4ol0fnnO%ubMI9Zq}bcIn~
z74wpprA&BDgwoCcmxryoA$#`nD#q&qgETxu08Wh?(}}Va;}JdWARmIs78^>El#zC!
z6$~0m!2siyoyEt#GB$+?MAGuRa7$UaP>=q&g@i#=pe>|{<o?Pc9S-736p8nGnkHL6
zRf{y#iKO0e>@Fdc4H1hvJJZ5xn~wOTlx4bm?f+Z<N!%Etfr;j&H8ET{)9zlP?K`uY
z>0C!kSfT6VVl_Krm0}OpZ#WC;Y&6r<04{q8H^QZ#>9Q`g##x&t9k&}Ob%9TjYH{=e
zuDf6qUB^bXd`I#`F$<S0WFZ`P#8@>=F%qh5R->TmbV&xsn`t8sc^u8bEZV0+Ge#BH
zE^u*oTIeur-1Pxj=XlM(3Y<SE``)3oV}w>LN5<bC568|<9(wZjk;`lcp-$B}EXCgZ
zolzuifltf2K={IJ^e%8Nr0XIe&ENvyqmzeo{NyR?v6ClDG+fC_1Up=y{{rulz}-TA
zeexxGTqL3<d0Me<;yW~}q&{bDR%?;2E|!mEXhv}u2o>5uEduh0og_Vn=q3^|eAfh3
zNX#ZG6b`ISYa1N2RhSHOT*PtKfcat=LS_SD`%JT2`ZSI(fMW&jfawPAl8<g%`&{!a
z3Ocd(d;5f_0jiph@L=;cnoVx6@azE~w2QeuHfJ}pfA6w!dP&$G{^IuU!=4M<8&2=V
F{STjGN0I;l

literal 0
HcmV?d00001

diff --git a/lang/English/search.php b/lang/English/search.php
deleted file mode 100644
index 17c7d546..00000000
--- a/lang/English/search.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-// Language definitions used in search.php
-$lang_search = array(
-
-// The search form
-'User search'                        =>    'User search',
-'No search permission'                =>    'You do not have permission to use the search feature.',
-'Search flood'                        =>    'At least %s seconds have to pass between searches. Please wait %s seconds and try searching again.',
-'Search'                            =>    'Search',
-'Search criteria legend'            =>    'Enter your search criteria',
-'Search info'                        =>    'To search by keyword, enter a term or terms to search for. Separate terms with spaces. Use AND, OR and NOT to refine your search. To search by author enter the username of the author whose posts you wish to search for. Use wildcard character * for partial matches.',
-'Keyword search'                    =>    'Keyword search',
-'Author search'                        =>    'Author search',
-'Search in legend'                    =>    'Select where to search',
-'Search in info'                    =>    'Choose in which forum you would like to search and if you want to search in topic subjects, message text or both.',
-'Search multiple forums info'        =>    'If no forums are selected, all forums will be searched.',
-'Forum search'                        =>    'Forum',
-'Search in'                            =>    'Search in',
-'Message and subject'                =>    'Message text and topic subject',
-'Message only'                        =>    'Message text only',
-'Topic only'                        =>    'Topic subject only',
-'Sort by'                            =>    'Sort by',
-'Sort order'                        =>    'Sort order',
-'Search results legend'                =>    'Select how to view search results',
-'Search results info'                =>    'You can choose how you wish to sort and show your results.',
-'Sort by post time'                    =>    'Post time',
-'Sort by author'                    =>    'Author',
-'Sort by subject'                    =>    'Subject',
-'Sort by forum'                        =>    'Forum',
-'Ascending'                            =>    'Ascending',
-'Descending'                        =>    'Descending',
-'Show as'                            =>    'Show results as',
-'Show as topics'                    =>    'Topics',
-'Show as posts'                        =>    'Posts',
-
-// Results
-'Search'                            =>    'Search',
-'Search results'                    =>    'Search results',
-'Quick search show_new'                =>    'New',
-'Quick search show_recent'            =>    'Active',
-'Quick search show_unanswered'        =>    'Unanswered',
-'Quick search show_replies'            =>    'Posted',
-'Quick search show_user_topics'        =>    'Topics by %s',
-'Quick search show_user_posts'        =>    'Posts by %s',
-'Quick search show_subscriptions'    =>    'Subscribed by %s',
-'By keywords show as topics'        =>    'Topics with posts containing \'%s\'',
-'By keywords show as posts'            =>    'Posts containing \'%s\'',
-'By user show as topics'            =>    'Topics with posts by %s',
-'By user show as posts'                =>    'Posts by %s',
-'By both show as topics'            =>    'Topics with posts containing \'%s\', by %s',
-'By both show as posts'                =>    'Posts containing \'%s\', by %s',
-'No terms'                            =>    'You have to enter at least one keyword and/or an author to search for.',
-'No hits'                            =>    'Your search returned no hits.',
-'No user posts'                        =>    'There are no posts by this user in this forum.',
-'No user topics'                    =>    'There are no topics by this user in this forum.',
-'No subscriptions'                    =>    'This user is currently not subscribed to any topics.',
-'No new posts'                        =>    'There are no topics with new posts since your last visit.',
-'No recent posts'                    =>    'No new posts have been made within the last 24 hours.',
-'No unanswered'                        =>    'There are no unanswered posts in this forum.',
-'Go to post'                        =>    'Go to post',
-'Go to topic'                        =>    'Go to topic'
-
-);
diff --git a/lang/English/search.po b/lang/English/search.po
new file mode 100644
index 00000000..0f2f643b
--- /dev/null
+++ b/lang/English/search.po
@@ -0,0 +1,174 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "User search"
+msgstr "User search"
+
+msgid "No search permission"
+msgstr "You do not have permission to use the search feature."
+
+msgid "Search flood"
+msgstr "At least %s seconds have to pass between searches. Please wait %s seconds and try searching again."
+
+msgid "Search"
+msgstr "Search"
+
+msgid "Search criteria legend"
+msgstr "Enter your search criteria"
+
+msgid "Search info"
+msgstr "To search by keyword, enter a term or terms to search for. Separate terms with spaces. Use AND, OR and NOT to refine your search. To search by author enter the username of the author whose posts you wish to search for. Use wildcard character * for partial matches."
+
+msgid "Keyword search"
+msgstr "Keyword search"
+
+msgid "Author search"
+msgstr "Author search"
+
+msgid "Search in legend"
+msgstr "Select where to search"
+
+msgid "Search in info"
+msgstr "Choose in which forum you would like to search and if you want to search in topic subjects, message text or both."
+
+msgid "Search multiple forums info"
+msgstr "If no forums are selected, all forums will be searched."
+
+msgid "Forum search"
+msgstr "Forum"
+
+msgid "Search in"
+msgstr "Search in"
+
+msgid "Message and subject"
+msgstr "Message text and topic subject"
+
+msgid "Message only"
+msgstr "Message text only"
+
+msgid "Topic only"
+msgstr "Topic subject only"
+
+msgid "Sort by"
+msgstr "Sort by"
+
+msgid "Sort order"
+msgstr "Sort order"
+
+msgid "Search results legend"
+msgstr "Select how to view search results"
+
+msgid "Search results info"
+msgstr "You can choose how you wish to sort and show your results."
+
+msgid "Sort by post time"
+msgstr "Post time"
+
+msgid "Sort by author"
+msgstr "Author"
+
+msgid "Sort by subject"
+msgstr "Subject"
+
+msgid "Sort by forum"
+msgstr "Forum"
+
+msgid "Ascending"
+msgstr "Ascending"
+
+msgid "Descending"
+msgstr "Descending"
+
+msgid "Show as"
+msgstr "Show results as"
+
+msgid "Show as topics"
+msgstr "Topics"
+
+msgid "Show as posts"
+msgstr "Posts"
+
+msgid "Search results"
+msgstr "Search results"
+
+msgid "Quick search show_new"
+msgstr "New"
+
+msgid "Quick search show_recent"
+msgstr "Active"
+
+msgid "Quick search show_unanswered"
+msgstr "Unanswered"
+
+msgid "Quick search show_replies"
+msgstr "Posted"
+
+msgid "Quick search show_user_topics"
+msgstr "Topics by %s"
+
+msgid "Quick search show_user_posts"
+msgstr "Posts by %s"
+
+msgid "Quick search show_subscriptions"
+msgstr "Subscribed by %s"
+
+msgid "By keywords show as topics"
+msgstr "Topics with posts containing '%s'"
+
+msgid "By keywords show as posts"
+msgstr "Posts containing '%s'"
+
+msgid "By user show as topics"
+msgstr "Topics with posts by %s"
+
+msgid "By user show as posts"
+msgstr "Posts by %s"
+
+msgid "By both show as topics"
+msgstr "Topics with posts containing '%s', by %s"
+
+msgid "By both show as posts"
+msgstr "Posts containing '%s', by %s"
+
+msgid "No terms"
+msgstr "You have to enter at least one keyword and/or an author to search for."
+
+msgid "No hits"
+msgstr "Your search returned no hits."
+
+msgid "No user posts"
+msgstr "There are no posts by this user in this forum."
+
+msgid "No user topics"
+msgstr "There are no topics by this user in this forum."
+
+msgid "No subscriptions"
+msgstr "This user is currently not subscribed to any topics."
+
+msgid "No new posts"
+msgstr "There are no topics with new posts since your last visit."
+
+msgid "No recent posts"
+msgstr "No new posts have been made within the last 24 hours."
+
+msgid "No unanswered"
+msgstr "There are no unanswered posts in this forum."
+
+msgid "Go to post"
+msgstr "Go to post"
+
+msgid "Go to topic"
+msgstr "Go to topic"
diff --git a/lang/English/topic.mo b/lang/English/topic.mo
new file mode 100644
index 0000000000000000000000000000000000000000..680eb6f72a32f79359530e4da6cac94432ef590e
GIT binary patch
literal 1475
zcmaiyxo;FP6vhn+0hTifS0IH!LV`%Mun380l0_(+L#td%vVqVsJLBw5n6+27hh%B#
z(j!q&K|@6v3M51cReCDu_ya(+NPKT*a!L?uJU<`r_-w!LJ)JKY+9mXU^xx=L(Kim@
zhxYg&V_l#Jc7lzJP4E!r8tevF!4u#bcocjI9tU58N5FNE{6Bz)!A~H?{S4;74Upn}
z&Gx^6<o_ev|CR0k0r9bpj?}LUq<GyR#p?qpKL^Qw06YfX0m-feR&cgSknCSU6zO_{
zALW0W@f}F#dJhhOU%->#Pp}6hV>(waNPhkJQT!_)#T@|YT!m~tob8uD(lrT^u0;?Z
z3-E&^ww$d?km5fBDc*DNJh%oX_X?8#I!Jjxg7jpR^8$JwIyKUatt1xBPovX2Q9GL=
zxvx_gQ(QXR#cZ9>n~mu%s79z!-gD@riyFNLX(JuDp5z>7z@&|eNLazfg3z*Yt(t5i
z7RIu2g?mAug)ux*^|}aH*>DrrjIYBQW>cQAT#(bW3b?PN)haS<My&7<Gd80TbarVe
z3MD8LR1|!)Xhm&CL&GXsJPpMPsG6|nu@Rcxk3;_nZ@~aViZVxEJv3HmB%XtRC=5|)
z%jP#Fv8rl?KKCPKV6`B(w6ceyW<tcNM6vcFXI$x~ak*?IQ&YS(#M5E%n&g*@yl{Oe
z2SLliw@x{59tdqhC0#x)Jlha@WF%LatvV%*Db}4)&kC1g&6&et$aHgwuE?osPnyWH
zO2cT%ll9oE3#Tf)=8lMb*bADWytkC5sMYdH*YD=0%hO}q`3w1*xf1SKNJMS7kkpD*
zd!rS3p&a6V!_!9C;zD)Y8Qiv`>`OvBW71baDC;gCtc7+<h|7h{EjklI3Y}`KD0)<0
z$PeakV<(+D^D5T9D5W`Eo+e>?OUM0Z?L1O3_q5=CtTpsU?H#4Wt>U&38W0b-U05RE
twKi2(Ds6X-CFMai=I&Qy?*FPREym3<b9dAkjgvx42D>V4kKldl?l0XCOUM8K

literal 0
HcmV?d00001

diff --git a/lang/English/topic.php b/lang/English/topic.php
deleted file mode 100644
index 0ef0df93..00000000
--- a/lang/English/topic.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-// Language definitions used in viewtopic.php
-$lang_topic = array(
-
-'Post reply'        =>    'Post reply',
-'Topic closed'        =>    'Topic closed',
-'From'                =>    'From:', // User location
-'Promote user'        =>    'Promote user',
-'IP address logged'    =>    'IP address logged',
-'Note'                =>    'Note:', // Admin note
-'Posts'                =>    'Posts:',
-'Registered'        =>    'Registered:',
-'Replies'            =>    'Replies:',
-'Website'            =>    'Website',
-'Guest'                =>    'Guest',
-'Online'            =>    'Online',
-'Offline'            =>    'Offline',
-'Last edit'            =>    'Last edited by',
-'Report'            =>    'Report',
-'Delete'            =>    'Delete',
-'Edit'                =>    'Edit',
-'Quote'                =>    'Quote',
-'Is subscribed'        =>    'You are currently subscribed to this topic',
-'Unsubscribe'        =>    'Unsubscribe',
-'Subscribe'            =>    'Subscribe to this topic',
-'Quick post'        =>    'Quick reply',
-'Mod controls'        =>    'Moderator controls',
-'New icon'            =>    'New post',
-'Re'                =>    'Re:',
-'Preview'            =>    'Preview'
-
-);
diff --git a/lang/English/topic.po b/lang/English/topic.po
new file mode 100644
index 00000000..4f143767
--- /dev/null
+++ b/lang/English/topic.po
@@ -0,0 +1,93 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Post reply"
+msgstr "Post reply"
+
+msgid "Topic closed"
+msgstr "Topic closed"
+
+msgid "From"
+msgstr "From:"
+
+msgid "Promote user"
+msgstr "Promote user"
+
+msgid "IP address logged"
+msgstr "IP address logged"
+
+msgid "Note"
+msgstr "Note:"
+
+msgid "Posts"
+msgstr "Posts:"
+
+msgid "Registered"
+msgstr "Registered:"
+
+msgid "Replies"
+msgstr "Replies:"
+
+msgid "Website"
+msgstr "Website"
+
+msgid "Guest"
+msgstr "Guest"
+
+msgid "Online"
+msgstr "Online"
+
+msgid "Offline"
+msgstr "Offline"
+
+msgid "Last edit"
+msgstr "Last edited by"
+
+msgid "Report"
+msgstr "Report"
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "Edit"
+msgstr "Edit"
+
+msgid "Quote"
+msgstr "Quote"
+
+msgid "Is subscribed"
+msgstr "You are currently subscribed to this topic"
+
+msgid "Unsubscribe"
+msgstr "Unsubscribe"
+
+msgid "Subscribe"
+msgstr "Subscribe to this topic"
+
+msgid "Quick post"
+msgstr "Quick reply"
+
+msgid "Mod controls"
+msgstr "Moderator controls"
+
+msgid "New icon"
+msgstr "New post"
+
+msgid "Re"
+msgstr "Re:"
+
+msgid "Preview"
+msgstr "Preview"
diff --git a/lang/English/update.mo b/lang/English/update.mo
new file mode 100644
index 0000000000000000000000000000000000000000..18d61df2ff3d7f864483f458fe703aa3bbddb701
GIT binary patch
literal 7678
zcmbW5TZ|-C8OIO0URXpF<f3>vyRys-PWSFC7k6hbz}{fuUdG*7kPu?3yH0l(R9E%Z
zshZi@CyDWaXwU?CFc>e1nivve)L@VYP0*O&i-`$F6L=sRg^*~}7<^FtednC2>6spM
zwKLWKIj5`6`L6%(JN4p~TOL<@4sgAnYs;IIIs?A?X1@6Bd5cn4f_noV2e&f*BzOh*
zAox!30(dp}2>3qmtKjwEkHB|>&x6;1e+>9~n7`(&N?ptRG$_B{0lovgH((6Djq$mF
ztDwm9Fevwb5xfk161)ohA$T453sB_y9VqMl4HWq<VKI^CT2OwU0k?pA!}uU5_nidg
zxfpyqcn*~3E`<5df$w4brGVc7*+M-FiankKWu4!E9{~RZid>hon2c`(Wqbq_{T~S9
z3KYE_1?Bl~g5rv2K(YIeL6Pe@@N)3ipzQm5Q0(w(7{3OJUayDomP?i5PhG|rrdL;k
z^85AR;w4IHu+8`!n}~hC28zDl2Sv`Gfj5CKf)8{5rEGRT<If_D$oU6Q?*AwF4e$zt
zdj|XgcpdkTFv<esM=-kR_bc!z@D=cT;Md=!)Zf7+7C8le3?Wv)C%_843g?P`kAULm
z$N72;{5JR*@Bq#byF3d%$9}&A#m-N#*+KAWQ1pHc6n*{$eh|DC<I8imfvBbqgO7qI
z!~6@N<i;!D7r<#A7P~(Uei!^XxB{MkuTr;ze+Ey3yGQ~9ej5BO_%iqa_*0VN9&kI!
zb{<>>zYP8b6hD6+p+%0zK#}V!pzQY~D1Lq#6np<9jGqU^k1vGrOCYXPFN31*U&HVJ
z05OaE$hy;9a^GGqR8u!|-NyAHE==xhydRw9n&G;EOYB7$yExea%BSVQeedQQbEutM
zH*yhrj#B`IS=2tRU0k?YX)f_6Zg6@7YMu)*Cq5q@n-QHp8pdJ=%;`RobMnE=?lToo
zY$Ns*8$xX^Mz?|T`3TodTzj}~;UW~>N9;To{;%Nx|7_>Fm5b0)>dttWWQi?{sLTtU
zXX&asJctTwO5M$~WmDKB&(vY}Z<%EMv43?^njzz&Fx^s{qR0!Y4p$5_9%hlKTbe?%
z)aJ7~$$I%4{FFu=ld2<88FeCS^eD1+B`@O18NbNHjXKLqqmE`#CpF`WOw4G%(@~K=
z+$d`5%A&gR(;}yy8z1ae3t3snq(>PqM`;r4Uc!dX7R^*Ge3(8FC0S{*DC-(E_P-t)
zYoq?Ab6&|4X4pZf=Ejp|#fh0kL!(aS&g2{X#_WdOnW;u`RMtYC6gw>zW`xg0Z|Bp~
zrc)(p?8aGa&eyZDQ?SfwbFNAX6RR`bA{mvss4^QAJX1zR8Fo=;s%{s>dR3aPhPhas
z^?oUHo#x$#!eeKhSjt1A<XQaSwmo#{a30rEH?wzD#<IELu4NO~E7i{|Eb3lf45JX8
zs(Gvv#cL5-%ia7MSEDrPuGy&hq0B{MtmGZMZr%=ZwDv#T<I_eD6U*k^L72WTuXI!x
zu~jCv^*48-Ovz^byhw~yU6WZtQKFqep7oM`MRH0OqDwWjs-J5tmxyCjzsReRRioUN
z3MV3hvPnOS%BnD`%tuLARaiqUrYw@Sj$sWuud|UG+5@}yY5(tm=}d1spyy`xZCxz#
z2TADGLfi^^%<E$&DhH-GbZG11sioH8f*}I6NINsHnQNUk%ZV^WJ#{>?WoxO3GMfsq
zaMST9>sQ2gYso~zu@&|HNGRxzp5LO=Y3D`%;MNlhCyuV|KiA&16%Hb8Sao&8rlmPw
z?i{7$(!M(I51d^(*4ndnpX}Z<MeAtR%_WxS^`1^rHiFD+lWqM(>n@WSM}G5qF*k8i
z>bdrw_AUJ4hpjVtRdh`t#d+;FQA>lwYFnC-262qWKDv`fMXa4Z>nL^Gf96!Z!|Inl
z^{sJg-7$BA)jM|cB|j{&b}vuUe5DB+t20Bu69^q4ILE;zo>%*!aw7ELraU~qe`okv
zFZ7(mqaqnb#VRc5y+c^(RTLJLs-ft1H0!5{9n8wK?naqTO|)!ynBPb&Q9Cxhs7gx>
z16HQ3@6J~Yg=1DHy$x$+1jxGeNSZ1oZSkzP;JUJ*^EVK36u}zAbu8kF1Wwwv-fxBn
z?=qz$a3|o3*uqIICaT~mryTs}>x#{FoM%&|ez1Z@`jCm;wtpw9XyL_q?YxYlMPNIP
zVwvbAo90N~ti(+&GTQ1+2#<|wqeyH7oxPY==R94kB-Axo=HgXuZ(b}Xi=tYB_f5gp
zL+_wk-$4B%e8}!=W^dGJs>MoD4)n?(fxM2T)%in*^h#tgw=JVIHE~-4C`1IM76T1k
zb(&>AOu?Te?Y)DX$)`M(wMT=|lq-^L6;>E$#4{g1P65)>Q5Nfgp+f3`1Y3riY87e;
zXJ9U;1#z%mNmqhh%@A=-gs{$!L-DaWPgg=I^1LkeZ&qG=uAewJhg4Wc!a?>r%_jPZ
zu@t)(4Y0AaAS9}oC79p(lDU$k>8y@=68q530Q(LjN}LGQ1RVKVbz$=;l|ae*#!AkQ
z%RO7SEgH`_UaYfXO|v5RfzaKoJCg-{?0P$)Z|M8PkBuZgo2RH>)u>-Yt~=<-!u8E_
z?cME$e<lpGMm^JYXg2am3asy3X4;|M^1_U@WJ~0Zalr@|xe8kAFWhMJx<d(07skrF
z=uI%=j<MyO>>;+7kzLYy2#qDgm2Yx<@D-*HnX_rET~eU#s<z26Nu$EuC!uC%CAlTK
zhVuCKPTtwBC5pFqo_(sby{!%z*jwxwY3Q^RYLmij5i8fdh_2C*d62KI7kzMd2YF6>
zN3i``v*)*pNKILyt<N?Kxm+UThE7<*A*#xpP^X)b{)<v!r8yVN4cU{3F-2fYGpy;>
z$61@IBWb)At9AIge0Gf6<c=6y;sTG-tQUFL#55rEKm7qEB6<i7vQ<(54>_|($bqU(
zWl8{Mh|S1kE~au%>2@UbEmQy$#O%(X68bi|0R4Iv-YCcs$LGxUIl>UxL$|x`P%^4f
z{ZJEm9mAdOgn$_;<ZG)Vbn(J$G&z#Cjaot`l8baXLWDjC^KLc7qOKjfT{sakoQ3<O
z1LoPnKy%?_(CpdpOj|pOs9fV6s82SWypzBrW^kXQZ0u6gm~b-w9E}VaBvN^@-C?ID
z_pO-|XUQQza@f@5E(&{obfws>(uh$%crm+<ooF^a-7KMBIO$*@8VF%Q(JW3Z?cAzQ
z1D_hikVH)50~xsBvNmM5bb)>aDMG9w#~7AK6GD!}tt3aKIVSHU+6I+y?5fZ}N$aTZ
zUOI6+1bSFlQk0O`td*m1b3AS;pX6GEE^;XIzLsZ^!-YAKM+*;AM4h}Ub<1htVwIE+
zDoadicWy{mx2bi<xw^hAoLD?{dg;!SOSC0*>lQdm>P2iyT6M9Rn9|jl#k&`YlI4WX
zM<SE{hLR!Hah23oBRM2E6~(U9Sl1h)hon8{l`+Oghd7jmK%COz`wSM!ZqE0ir4cDI
zy>RAKYtNor_qOIFzH70DhHhL8<Rpb^W%td?k+<U5I<s|@uDIOB&F)x_c!4f`)I000
zB@aKls^&Z|@$Jm+tl$+RafVS=2{Yo<@$8lWh;s=ye?xu37`K8H79{EA6@eA#AQ0d<
zQ?%t|KAA~G+j0_fe7<j8vmK?vIs}dM3av74@g&-c)v!w7V%gcTT2it&ZR+^>ef_~<
z;vg@YHMgkKu2lF!q^9d5{ft^zqm(B3U|nAd5Tq8fW5h<Bvvh}&Na@WpLMpW!0-!=C
zb8x2fHa+KT-L=)0Cxlai*oA{5#wobVC#xh+pDb1DUMP$itTC&!rgoDT4Q<WcF5xqZ
z?+)7@d-JeTNT(S*Ca)oyn(J(9rG7~+Nt*e4BljkwX}@^;(WS>-)s4hi-l`2CkshL(
zx?3OkCya?ezGnKI_R$dXyU~uNppaJH3(-Kl)#V_txC=mD7zh!$q>y6fogjfPOeI@y
zay)JP;g6T@w(;;K#HDX>t4e1RJQemud@8f+e}a|WTSG^!6#Tl{I+iB#XheLo5%sN}
z_Ahj1*fJa=ef~oIu=|GgM_3i*q%6p8LfO7YlaV{Om16PwJ<xxDeo}67Ib^X&DxwRQ
zEpnQVS@t4Cnq0E3GOjNdx~n<U>Zw`n`@{P+8To*mq;rlt|6TAiA<NLV&cclis*AE<
zDG7Sto7EE%5Oo*9BJxTrG_xCSbTJkuJzk-B%6E<;(UDb}Q;`^MN=J}BO;8~{=9-F}
z;aV3&w_UBhGZSi2?PXo5PisCMGoW-kQnPT%Q2H}hSa#pKw!C%k;U?A%aWd_SswrmP
zcy%cvwH~`KdR=+>w|?1sHoWTdMr?A|af6g#dC6c6O*W~--Zdjcb!ls!u-yT@IdtX<
zHKiSkJ0=ZO<yp8bRI%=5qGR>?C?;=?+V#>qZss*oIK~k*wbs52+`?~&ggnw(aWa!)
u=vY&HP<M$0O{g0}4#cx-cu|C0G4*=@*Ht;<QUB*VO^IC30{`3F&3^;$i$!<<

literal 0
HcmV?d00001

diff --git a/lang/English/update.php b/lang/English/update.php
deleted file mode 100644
index 96b19a23..00000000
--- a/lang/English/update.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-// Language definitions used in db_update.php
-
-$lang_update = array(
-
-'Update'                        =>    'Update FluxBB',
-'Update message'                =>    'Your FluxBB database is out-of-date and must be upgraded in order to continue. If you are the board administrator, please follow the instructions below to complete the upgrade.',
-'Note'                            =>    'Note:',
-'Members message'                =>    'This process is for board administrators only. If you are a member there is nothing to worry about - the forums will be back shortly!',
-'Administrator only'            =>    'This step is for the board administrator only!',
-'Database password info'        =>    'To perform the database update please enter the database password with which FluxBB was installed. If you cannot remember, this is stored in your \'config.php\' file.',
-'Database password note'        =>    'If you are running SQLite (and hence have no database password) please use the database file name instead. This must exactly match the database file name given in your configuration file.',
-'Database password'                =>    'Database password',
-'Maintenance'                    =>    'Maintenance',
-'Maintenance message info'        =>    'The message that will be displayed to users during the updating process. This text will not be parsed like regular posts and thus may contain HTML.',
-'Maintenance message'            =>    'Maintenance message',
-
-'You are running error'            =>    'You are running %1$s version %2$s. FluxBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue.',
-'Version mismatch error'        =>    'Version mismatch. The database \'%s\' doesn\'t seem to be running a FluxBB database schema supported by this update script.',
-'Invalid file error'            =>    'Invalid database file name. When using SQLite the database file name must be entered exactly as it appears in your \'%s\'',
-'Invalid password error'        =>    'Invalid database password. To upgrade FluxBB you must enter your database password exactly as it appears in your \'%s\'',
-'No password error'                =>    'No database password provided',
-'Script runs error'                =>    'It appears the update script is already being ran by someone else. If this is not the case, please manually delete the file \'%s\' and try again',
-'No update error'                =>    'Your forum is already as up-to-date as this script can make it',
-
-'Intro 1'                        =>    'This script will update your forum database. The update procedure might take anything from a second to hours depending on the speed of the server and the size of the forum database. Don\'t forget to make a backup of the database before continuing.',
-'Intro 2'                        =>    'Did you read the update instructions in the documentation? If not, start there.',
-'No charset conversion'            =>    '<strong>IMPORTANT!</strong> FluxBB has detected that this PHP environment does not have support for the encoding mechanisms required to do UTF-8 conversion from character sets other than ISO-8859-1. What this means is that if the current character set is not ISO-8859-1, FluxBB won\'t be able to convert your forum database to UTF-8 and you will have to do it manually. Instructions for doing manual charset conversion can be found in the update instructions.',
-'Enable conversion'                =>    '<strong>Enable conversion:</strong> When enabled this update script will, after it has made the required structural changes to the database, convert all text in the database from the current character set to UTF-8. This conversion is required if you\'re upgrading from version 1.2.',
-'Current character set'            =>    '<strong>Current character set:</strong> If the primary language in your forum is English, you can leave this at the default value. However, if your forum is non-English, you should enter the character set of the primary language pack used in the forum. <em>Getting this wrong can corrupt your database so don\'t just guess!</em> Note: This is required even if the old database is UTF-8.',
-'Charset conversion'            =>    'Charset conversion',
-'Enable conversion label'        =>    '<strong>Enable conversion</strong> (perform database charset conversion).',
-'Current character set label'    =>    'Current character set',
-'Current character set info'    =>    'Accept default for English forums otherwise the character set of the primary language pack.',
-'Start update'                    =>    'Start update',
-'Error converting users'        =>    'Error converting users',
-'Error info 1'                    =>    'There was an error converting some users. This can occur when converting from FluxBB v1.2 if multiple users have registered with very similar usernames, for example "bob" and "böb".',
-'Error info 2'                    =>    'Below is a list of users who failed to convert. Please choose a new username for each user. Users who are renamed will automatically be sent an email alerting them of the change.',
-'New username'                    =>    'New username',
-'Required'                        =>    '(Required)',
-'Correct errors'                =>    'The following errors need to be corrected:',
-'Rename users'                    =>    'Rename users',
-'Successfully updated'            =>    'Your forum database was successfully updated. You may now %s.',
-'go to index'                    =>    'go to the forum index',
-
-'Unable to lock error'            =>    'Unable to write update lock. Please make sure PHP has write access to the directory \'%s\' and no-one else is currently running the update script.',
-
-'Converting'                    =>    'Converting %s …',
-'Converting item'                =>    'Converting %1$s %2$s …',
-'Preparsing item'                =>    'Preparsing %1$s %2$s …',
-'Rebuilding index item'            =>    'Rebuilding index for %1$s %2$s',
-
-'ban'                            =>    'ban',
-'categories'                    =>    'categories',
-'censor words'                    =>    'censor words',
-'configuration'                    =>    'configuration',
-'forums'                        =>    'forums',
-'groups'                        =>    'groups',
-'post'                            =>    'post',
-'report'                        =>    'report',
-'topic'                            =>    'topic',
-'user'                            =>    'user',
-'signature'                        =>    'signature',
-
-'Username too short error'        =>    'Usernames must be at least 2 characters long. Please choose another (longer) username.',
-'Username too long error'        =>    'Usernames must not be more than 25 characters long. Please choose another (shorter) username.',
-'Username Guest reserved error'    =>    'The username guest is reserved. Please choose another username.',
-'Username IP format error'        =>    'Usernames may not be in the form of an IP address. Please choose another username.',
-'Username bad characters error'    =>    'Usernames may not contain all the characters \', " and [ or ] at once. Please choose another username.',
-'Username BBCode error'            =>    'Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username.',
-'Username duplicate error'        =>    'Someone is already registered with the username %s. The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username.',
-
-);
diff --git a/lang/English/update.po b/lang/English/update.po
new file mode 100644
index 00000000..6611a073
--- /dev/null
+++ b/lang/English/update.po
@@ -0,0 +1,195 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Update"
+msgstr "Update FluxBB"
+
+msgid "Update message"
+msgstr "Your FluxBB database is out-of-date and must be upgraded in order to continue. If you are the board administrator, please follow the instructions below to complete the upgrade."
+
+msgid "Note"
+msgstr "Note:"
+
+msgid "Members message"
+msgstr "This process is for board administrators only. If you are a member there is nothing to worry about - the forums will be back shortly!"
+
+msgid "Administrator only"
+msgstr "This step is for the board administrator only!"
+
+msgid "Database password info"
+msgstr "To perform the database update please enter the database password with which FluxBB was installed. If you cannot remember, this is stored in your 'config.php' file."
+
+msgid "Database password note"
+msgstr "If you are running SQLite (and hence have no database password) please use the database file name instead. This must exactly match the database file name given in your configuration file."
+
+msgid "Database password"
+msgstr "Database password"
+
+msgid "Maintenance"
+msgstr "Maintenance"
+
+msgid "Maintenance message info"
+msgstr "The message that will be displayed to users during the updating process. This text will not be parsed like regular posts and thus may contain HTML."
+
+msgid "Maintenance message"
+msgstr "Maintenance message"
+
+msgid "You are running error"
+msgstr "You are running %1$s version %2$s. FluxBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue."
+
+msgid "Version mismatch error"
+msgstr "Version mismatch. The database '%s' doesn't seem to be running a FluxBB database schema supported by this update script."
+
+msgid "Invalid file error"
+msgstr "Invalid database file name. When using SQLite the database file name must be entered exactly as it appears in your '%s'"
+
+msgid "Invalid password error"
+msgstr "Invalid database password. To upgrade FluxBB you must enter your database password exactly as it appears in your '%s'"
+
+msgid "No password error"
+msgstr "No database password provided"
+
+msgid "Script runs error"
+msgstr "It appears the update script is already being ran by someone else. If this is not the case, please manually delete the file '%s' and try again"
+
+msgid "No update error"
+msgstr "Your forum is already as up-to-date as this script can make it"
+
+msgid "Intro 1"
+msgstr "This script will update your forum database. The update procedure might take anything from a second to hours depending on the speed of the server and the size of the forum database. Don't forget to make a backup of the database before continuing."
+
+msgid "Intro 2"
+msgstr "Did you read the update instructions in the documentation? If not, start there."
+
+msgid "No charset conversion"
+msgstr "<strong>IMPORTANT!</strong> FluxBB has detected that this PHP environment does not have support for the encoding mechanisms required to do UTF-8 conversion from character sets other than ISO-8859-1. What this means is that if the current character set is not ISO-8859-1, FluxBB won't be able to convert your forum database to UTF-8 and you will have to do it manually. Instructions for doing manual charset conversion can be found in the update instructions."
+
+msgid "Enable conversion"
+msgstr "<strong>Enable conversion:</strong> When enabled this update script will, after it has made the required structural changes to the database, convert all text in the database from the current character set to UTF-8. This conversion is required if you're upgrading from version 1.2."
+
+msgid "Current character set"
+msgstr "<strong>Current character set:</strong> If the primary language in your forum is English, you can leave this at the default value. However, if your forum is non-English, you should enter the character set of the primary language pack used in the forum. <em>Getting this wrong can corrupt your database so don't just guess!</em> Note: This is required even if the old database is UTF-8."
+
+msgid "Charset conversion"
+msgstr "Charset conversion"
+
+msgid "Enable conversion label"
+msgstr "<strong>Enable conversion</strong> (perform database charset conversion)."
+
+msgid "Current character set label"
+msgstr "Current character set"
+
+msgid "Current character set info"
+msgstr "Accept default for English forums otherwise the character set of the primary language pack."
+
+msgid "Start update"
+msgstr "Start update"
+
+msgid "Error converting users"
+msgstr "Error converting users"
+
+msgid "Error info 1"
+msgstr "There was an error converting some users. This can occur when converting from FluxBB v1.2 if multiple users have registered with very similar usernames, for example \"bob\" and \"böb\"."
+
+msgid "Error info 2"
+msgstr "Below is a list of users who failed to convert. Please choose a new username for each user. Users who are renamed will automatically be sent an email alerting them of the change."
+
+msgid "New username"
+msgstr "New username"
+
+msgid "Required"
+msgstr "(Required)"
+
+msgid "Correct errors"
+msgstr "The following errors need to be corrected:"
+
+msgid "Rename users"
+msgstr "Rename users"
+
+msgid "Successfully updated"
+msgstr "Your forum database was successfully updated. You may now %s."
+
+msgid "go to index"
+msgstr "go to the forum index"
+
+msgid "Unable to lock error"
+msgstr "Unable to write update lock. Please make sure PHP has write access to the directory '%s' and no-one else is currently running the update script."
+
+msgid "Converting"
+msgstr "Converting %s …"
+
+msgid "Converting item"
+msgstr "Converting %1$s %2$s …"
+
+msgid "Preparsing item"
+msgstr "Preparsing %1$s %2$s …"
+
+msgid "Rebuilding index item"
+msgstr "Rebuilding index for %1$s %2$s"
+
+msgid "ban"
+msgstr "ban"
+
+msgid "categories"
+msgstr "categories"
+
+msgid "censor words"
+msgstr "censor words"
+
+msgid "configuration"
+msgstr "configuration"
+
+msgid "forums"
+msgstr "forums"
+
+msgid "groups"
+msgstr "groups"
+
+msgid "post"
+msgstr "post"
+
+msgid "report"
+msgstr "report"
+
+msgid "topic"
+msgstr "topic"
+
+msgid "user"
+msgstr "user"
+
+msgid "signature"
+msgstr "signature"
+
+msgid "Username too short error"
+msgstr "Usernames must be at least 2 characters long. Please choose another (longer) username."
+
+msgid "Username too long error"
+msgstr "Usernames must not be more than 25 characters long. Please choose another (shorter) username."
+
+msgid "Username Guest reserved error"
+msgstr "The username guest is reserved. Please choose another username."
+
+msgid "Username IP format error"
+msgstr "Usernames may not be in the form of an IP address. Please choose another username."
+
+msgid "Username bad characters error"
+msgstr "Usernames may not contain all the characters ', \" and [ or ] at once. Please choose another username."
+
+msgid "Username BBCode error"
+msgstr "Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username."
+
+msgid "Username duplicate error"
+msgstr "Someone is already registered with the username %s. The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username."
diff --git a/lang/English/userlist.mo b/lang/English/userlist.mo
new file mode 100644
index 0000000000000000000000000000000000000000..74d6b6eaf7013ca1abd4270b4dcbf6b1c58fd784
GIT binary patch
literal 898
zcmY+C!H&}~5QYORAc6!4t{jHjf=EgchbpBAwzO!a-KAo?2qX?T@gy~*c4WK2-Z>(1
zLgG>2%meTSh&!*qf#1z;yIA@(p7D%llHb3sZhVQb&V%b<3NC_AAgpiT0{9L>{0F!K
zeu5bM2EqRWE`h&batgWN4EC>1N6}^2*Ra=M8`x0y5%w$WXV{mpn@C1UbQXlQ0m4k@
zf^%YpJ5drvkLsEhj;)LK44IM|<GhOw5TR0ONi|ojWgDohSv2j|v9QIAlrGItz*yh9
zlX_uAos5m0yNq<Rblu=?pW5wUQ`3zBb#M0Li8XJy@X5AJo?`@MbVg$qe#UldE1o=^
zCPNDs@#L}aoDpKlGk&K+>TzgCIG;?d(5@EVSS0NTT`fe#$&|(X#Eo=c$hp!F%eF<H
zr^Z$f;@$1t(Yk*(y%P_O_N;O1VS}cgKln~l3#I#1%!GC92M5z}(p%?+?j_q~qzfaJ
zt}^Q7%C82=h;{rTdBU1)JLAN#RGzwNFTID8)=l=!!WKMidt}r$2@*wni+K)7RsxNK
zHUhZt-&+BfqO}^0Fux_SJkVm!<P9B3RvH{=*$HNOPRo*zQK~wW<%cOvXS^;h71xpq
zp($rPh|*JD3;i}FbR>vH?^P`eVUdH;MG-E!MWIn6tXHC@x$wn|T^jAL#zh+nqunM6
kX~}Y>912+y>h%AgyZln6Nw@-!5&yR%`FM+T$u^Dt0lG5+eE<Le

literal 0
HcmV?d00001

diff --git a/lang/English/userlist.php b/lang/English/userlist.php
deleted file mode 100644
index fc089f34..00000000
--- a/lang/English/userlist.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-// Language definitions used in userlist.php
-$lang_ul = array(
-
-'User find legend'    =>    'Find and sort users',
-'User search info'    =>    'Enter a username to search for and/or a user group to filter by. The username field can be left blank. Use the wildcard character * for partial matches.',
-'User sort info'    =>    'Sort users by name, date registered or number of posts and in ascending/descending order.',
-'User group'        =>    'User group',
-'No of posts'        =>    'Number of posts',
-'All users'            =>    'All'
-
-);
diff --git a/lang/English/userlist.po b/lang/English/userlist.po
new file mode 100644
index 00000000..4f7d81df
--- /dev/null
+++ b/lang/English/userlist.po
@@ -0,0 +1,33 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "User find legend"
+msgstr "Find and sort users"
+
+msgid "User search info"
+msgstr "Enter a username to search for and/or a user group to filter by. The username field can be left blank. Use the wildcard character * for partial matches."
+
+msgid "User sort info"
+msgstr "Sort users by name, date registered or number of posts and in ascending/descending order."
+
+msgid "User group"
+msgstr "User group"
+
+msgid "No of posts"
+msgstr "Number of posts"
+
+msgid "All users"
+msgstr "All"
diff --git a/model/admin/bans.php b/model/admin/bans.php
index db3a1b0e..52ba33a9 100644
--- a/model/admin/bans.php
+++ b/model/admin/bans.php
@@ -24,7 +24,7 @@ public function __construct()
  
     public function add_ban_info($id = null)
     {
-        global $lang_common, $lang_admin_bans;
+        global $lang_admin_bans;
 
         $ban = array();
 
@@ -32,7 +32,7 @@ public function add_ban_info($id = null)
         if (is_numeric($id)) {
             $ban['user_id'] = $id;
             if ($ban['user_id'] < 2) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             $select_add_ban_info = array('group_id', 'username', 'email');
@@ -102,7 +102,7 @@ public function add_ban_info($id = null)
 
     public function edit_ban_info($id)
     {
-        global $lang_common;
+
 
         $ban = array();
 
@@ -120,7 +120,7 @@ public function edit_ban_info($id)
             $ban['message'] = $result['message'];
             $ban['expire'] = $result['expire'];
         } else {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $diff = ($this->user->timezone + $this->user->dst) * 3600;
diff --git a/model/admin/groups.php b/model/admin/groups.php
index 6769a13c..6ce1b905 100644
--- a/model/admin/groups.php
+++ b/model/admin/groups.php
@@ -35,7 +35,7 @@ public function fetch_groups()
 
     public function info_add_group($groups, $id)
     {
-        global $lang_common;
+
 
         $group = array();
 
@@ -47,7 +47,7 @@ public function info_add_group($groups, $id)
         } else {
             // We are editing a group
             if (!isset($groups[$id])) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             $group['info'] = $groups[$id];
@@ -246,18 +246,18 @@ public function add_edit_group($groups)
 
     public function set_default_group($groups)
     {
-        global $lang_admin_groups, $lang_common;
+        global $lang_admin_groups;
 
         $group_id = intval($this->request->post('default_group'));
 
         // Make sure it's not the admin or guest groups
         if ($group_id == FEATHER_ADMIN || $group_id == FEATHER_GUEST) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Make sure it's not a moderator group
         if ($groups[$group_id]['g_moderator'] != 0) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         DB::for_table('config')->where('conf_name', 'o_default_user_group')
diff --git a/model/admin/options.php b/model/admin/options.php
index d9f29c05..c0cdc83e 100644
--- a/model/admin/options.php
+++ b/model/admin/options.php
@@ -24,7 +24,7 @@ public function __construct()
  
     public function update_options()
     {
-        global $lang_admin_options, $lang_common;
+        global $lang_admin_options;
 
         
 
@@ -110,12 +110,12 @@ public function update_options()
 
         $languages = forum_list_langs();
         if (!in_array($form['default_lang'], $languages)) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $styles = forum_list_styles();
         if (!in_array($form['default_style'], $styles)) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         if ($form['time_format'] == '') {
@@ -197,19 +197,19 @@ public function update_options()
         }
 
         if ($form['feed_type'] < 0 || $form['feed_type'] > 2) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         if ($form['feed_ttl'] < 0) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         if ($form['report_method'] < 0 || $form['report_method'] > 2) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         if ($form['default_email_setting'] < 0 || $form['default_email_setting'] > 2) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         if ($form['timeout_online'] >= $form['timeout_visit']) {
diff --git a/model/admin/users.php b/model/admin/users.php
index bf9b81d6..5f0e27fe 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -499,7 +499,7 @@ public function ban_users()
 
     public function get_user_search()
     {
-        global $db_type, $lang_common, $lang_admin_users;
+        global $db_type, $lang_admin_users;
 
         $form = $this->request->get('form') ? $this->request->get('form') : array();
 
@@ -618,7 +618,7 @@ public function get_user_search()
 
     public function print_users($conditions, $order_by, $direction, $start_from)
     {
-        global $lang_common, $lang_admin_users;
+        global $lang_admin_users;
 
         $user_data = array();
 
@@ -637,7 +637,7 @@ public function print_users($conditions, $order_by, $direction, $start_from)
                 $cur_user['user_title'] = get_title($cur_user);
 
                 // This script is a special case in that we want to display "Not verified" for non-verified users
-                if (($cur_user['g_id'] == '' || $cur_user['g_id'] == FEATHER_UNVERIFIED) && $cur_user['user_title'] != $lang_common['Banned']) {
+                if (($cur_user['g_id'] == '' || $cur_user['g_id'] == FEATHER_UNVERIFIED) && $cur_user['user_title'] != __('Banned')) {
                     $cur_user['user_title'] = '<span class="warntext">'.$lang_admin_users['Not verified'].'</span>';
                 }
 
diff --git a/model/delete.php b/model/delete.php
index 0ac3cc9b..f2b4f523 100644
--- a/model/delete.php
+++ b/model/delete.php
@@ -24,8 +24,6 @@ public function __construct()
  
     public function get_info_delete($id)
     {
-        global $lang_common;
-        
         $select_get_info_delete = array('fid' => 'f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_replies',  'fp.post_topics', 'tid' => 't.id', 't.subject', 't.first_post_id', 't.closed', 'p.poster', 'p.posted', 'p.poster_id', 'p.message', 'p.hide_smilies');
         $where_get_info_delete = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -44,7 +42,7 @@ public function get_info_delete($id)
             ->find_one();
         
         if (!$cur_post) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_post;
@@ -52,8 +50,6 @@ public function get_info_delete($id)
 
     public function handle_deletion($is_topic_post, $id, $tid, $fid)
     {
-        global $lang_delete;
-
         require FEATHER_ROOT.'include/search_idx.php';
 
         if ($is_topic_post) {
@@ -61,7 +57,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
             delete_topic($tid);
             update_forum($fid);
 
-            redirect(get_link('forum/'.$fid.'/'), $lang_delete['Topic del redirect']);
+            redirect(get_link('forum/'.$fid.'/'), __('Topic del redirect'));
         } else {
             // Delete just this one post
             delete_post($id, $tid);
@@ -75,7 +71,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
                 ->order_by_desc('id')
                 ->find_one();
 
-            redirect(get_link('post/'.$post['id'].'/#p'.$post['id']), $lang_delete['Post del redirect']);
+            redirect(get_link('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
         }
     }
 }
diff --git a/model/edit.php b/model/edit.php
index 61410dd3..b14e870b 100644
--- a/model/edit.php
+++ b/model/edit.php
@@ -25,7 +25,7 @@ public function __construct()
     // Fetch some info about the post, the topic and the forum
     public function get_info_edit($id)
     {
-        global $lang_common;
+
      
         $select_get_info_edit = array('fid' => 'f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_topics', 'tid' => 't.id', 't.subject', 't.posted', 't.first_post_id', 't.sticky', 't.closed', 'p.poster', 'p.poster_id', 'p.message', 'p.hide_smilies');
         $where_get_info_edit = array(
@@ -45,7 +45,7 @@ public function get_info_edit($id)
             ->find_one();
 
         if (!$cur_post) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_post;
@@ -53,7 +53,7 @@ public function get_info_edit($id)
 
     public function check_errors_before_edit($id, $can_edit_subject, $errors)
     {
-        global $lang_post, $pd;
+        global $pd;
 
         // If it's a topic it must contain a subject
         if ($can_edit_subject) {
@@ -64,13 +64,13 @@ public function check_errors_before_edit($id, $can_edit_subject, $errors)
             }
 
             if ($subject == '') {
-                $errors[] = $lang_post['No subject'];
+                $errors[] = __('No subject');
             } elseif ($this->config['o_censoring'] == '1' && $censored_subject == '') {
-                $errors[] = $lang_post['No subject after censoring'];
+                $errors[] = __('No subject after censoring');
             } elseif (feather_strlen($subject) > 70) {
-                $errors[] = $lang_post['Too long subject'];
+                $errors[] = __('Too long subject');
             } elseif ($this->config['p_subject_all_caps'] == '0' && is_all_uppercase($subject) && !$this->user->is_admmod) {
-                $errors[] = $lang_post['All caps subject'];
+                $errors[] = __('All caps subject');
             }
         }
 
@@ -79,9 +79,9 @@ public function check_errors_before_edit($id, $can_edit_subject, $errors)
 
         // Here we use strlen() not feather_strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         if (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            $errors[] = sprintf($lang_post['Too long message'], forum_number_format(FEATHER_MAX_POSTSIZE));
+            $errors[] = sprintf(__('Too long message'), forum_number_format(FEATHER_MAX_POSTSIZE));
         } elseif ($this->config['p_message_all_caps'] == '0' && is_all_uppercase($message) && !$this->user->is_admmod) {
-            $errors[] = $lang_post['All caps message'];
+            $errors[] = __('All caps message');
         }
 
         // Validate BBCode syntax
@@ -92,13 +92,13 @@ public function check_errors_before_edit($id, $can_edit_subject, $errors)
 
         if (empty($errors)) {
             if ($message == '') {
-                $errors[] = $lang_post['No message'];
+                $errors[] = __('No message');
             } elseif ($this->config['o_censoring'] == '1') {
                 // Censor message to see if that causes problems
                 $censored_message = feather_trim(censor_words($message));
 
                 if ($censored_message == '') {
-                    $errors[] = $lang_post['No message after censoring'];
+                    $errors[] = __('No message after censoring');
                 }
             }
         }
@@ -186,31 +186,29 @@ public function edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod)
 
     public function get_checkboxes($can_edit_subject, $is_admmod, $cur_post, $cur_index)
     {
-        global $lang_post, $lang_common;
-
         $checkboxes = array();
 
         if ($can_edit_subject && $is_admmod) {
             if ($this->request->post('stick_topic') || $cur_post['sticky'] == '1') {
-                $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.$lang_common['Stick topic'].'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.__('Stick topic').'<br /></label>';
             } else {
-                $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" tabindex="'.($cur_index++).'" />'.$lang_common['Stick topic'].'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" tabindex="'.($cur_index++).'" />'.__('Stick topic').'<br /></label>';
             }
         }
 
         if ($this->config['o_smilies'] == '1') {
             if ($this->request->post('hide_smilies') || $cur_post['hide_smilies'] == '1') {
-                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.$lang_post['Hide smilies'].'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.__('Hide smilies').'<br /></label>';
             } else {
-                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'" />'.$lang_post['Hide smilies'].'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'" />'.__('Hide smilies').'<br /></label>';
             }
         }
 
         if ($is_admmod) {
             if ($this->request->isPost() && $this->request->post('silent') || $this->request->isPost() == '') {
-                $checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" checked="checked" />'.$lang_post['Silent edit'].'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" checked="checked" />'.__('Silent edit').'<br /></label>';
             } else {
-                $checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" />'.$lang_post['Silent edit'].'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" />'.__('Silent edit').'<br /></label>';
             }
         }
 
diff --git a/model/index.php b/model/index.php
index 6d85307c..228ea44c 100644
--- a/model/index.php
+++ b/model/index.php
@@ -26,12 +26,12 @@ public function __construct()
     // Returns page head
     public function get_page_head()
     {
-        global $lang_common;
+
         
         if ($this->config['o_feed_type'] == '1') {
-            $page_head = array('feed' => '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;type=rss" title="'.$lang_common['RSS active topics feed'].'" />');
+            $page_head = array('feed' => '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;type=rss" title="'.__('RSS active topics feed').'" />');
         } elseif ($this->config['o_feed_type'] == '2') {
-            $page_head = array('feed' => '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;type=atom" title="'.$lang_common['Atom active topics feed'].'" />');
+            $page_head = array('feed' => '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;type=atom" title="'.__('Atom active topics feed').'" />');
         }
 
         return $page_head;
@@ -40,13 +40,11 @@ public function get_page_head()
     // Returns forum action
     public function get_forum_actions()
     {
-        global $lang_common;
-
         $forum_actions = array();
 
         // Display a "mark all as read" link
         if (!$this->user->is_guest) {
-            $forum_actions[] = '<a href="'.get_link('mark-read/').'">'.$lang_common['Mark all as read'].'</a>';
+            $forum_actions[] = '<a href="'.get_link('mark-read/').'">'.__('Mark all as read').'</a>';
         }
 
         return $forum_actions;
@@ -106,8 +104,6 @@ public function get_new_posts()
     // Returns the elements needed to display categories and their forums
     public function print_categories_forums()
     {
-        global $lang_common, $lang_index;
-
         // Get list of forums and topics with new posts since last visit
         if (!$this->user->is_guest) {
             $new_topics = $this->get_new_posts();
@@ -162,13 +158,13 @@ public function print_categories_forums()
             // Are there new posts since our last visit?
             if (isset($new_topics[$cur_forum->fid])) {
                 $cur_forum->item_status .= ' inew';
-                $forum_field_new = '<span class="newtext">[ <a href="'.get_link('search/?action=show_new&amp;fid='.$cur_forum->fid).'">'.$lang_common['New posts'].'</a> ]</span>';
+                $forum_field_new = '<span class="newtext">[ <a href="'.get_link('search/?action=show_new&amp;fid='.$cur_forum->fid).'">'.__('New posts').'</a> ]</span>';
                 $cur_forum->icon_type = 'icon icon-new';
             }
 
             // Is this a redirect forum?
             if ($cur_forum->redirect_url != '') {
-                $cur_forum->forum_field = '<h3><span class="redirtext">'.$lang_index['Link to'].'</span> <a href="'.feather_escape($cur_forum->redirect_url).'" title="'.$lang_index['Link to'].' '.feather_escape($cur_forum->redirect_url).'">'.feather_escape($cur_forum->forum_name).'</a></h3>';
+                $cur_forum->forum_field = '<h3><span class="redirtext">'.__('Link to').'</span> <a href="'.feather_escape($cur_forum->redirect_url).'" title="'.__('Link to').' '.feather_escape($cur_forum->redirect_url).'">'.feather_escape($cur_forum->forum_name).'</a></h3>';
                 $cur_forum->num_topics_formatted = $cur_forum->num_posts_formatted = '-';
                 $cur_forum->item_status .= ' iredirect';
                 $cur_forum->icon_type = 'icon';
@@ -184,11 +180,11 @@ public function print_categories_forums()
 
             // If there is a last_post/last_poster
             if ($cur_forum->last_post != '') {
-                $cur_forum->last_post_formatted = '<a href="'.get_link('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.format_time($cur_forum->last_post).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_forum->last_poster).'</span>';
+                $cur_forum->last_post_formatted = '<a href="'.get_link('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.format_time($cur_forum->last_post).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_forum->last_poster).'</span>';
             } elseif ($cur_forum->redirect_url != '') {
                 $cur_forum->last_post_formatted = '- - -';
             } else {
-                $cur_forum->last_post_formatted = $lang_common['Never'];
+                $cur_forum->last_post_formatted = __('Never');
             }
 
             if ($cur_forum->moderators != '') {
@@ -203,7 +199,7 @@ public function print_categories_forums()
                     }
                 }
 
-                $cur_forum->moderators_formatted = "\t\t\t\t\t\t\t\t".'<p class="modlist">(<em>'.$lang_common['Moderated by'].'</em> '.implode(', ', $moderators).')</p>'."\n";
+                $cur_forum->moderators_formatted = "\t\t\t\t\t\t\t\t".'<p class="modlist">(<em>'.__('Moderated by').'</em> '.implode(', ', $moderators).')</p>'."\n";
             } else {
                 $cur_forum->moderators_formatted = '';
             }
diff --git a/model/login.php b/model/login.php
index 0e934b01..5c5ac99d 100644
--- a/model/login.php
+++ b/model/login.php
@@ -24,8 +24,6 @@ public function __construct()
  
     public function login()
     {
-        global $db_type, $lang_login;
-
         $form_username = feather_trim($this->request->post('req_username'));
         $form_password = feather_trim($this->request->post('req_password'));
         $save_pass = $this->request->post('save_pass');
@@ -56,7 +54,7 @@ public function login()
         }
 
         if (!$authorized) {
-            message($lang_login['Wrong user/pass'].' <a href="'.get_link('login/action/forget/').'">'.$lang_login['Forgotten pass'].'</a>');
+            message(__('Wrong user/pass').' <a href="'.get_link('login/action/forget/').'">'.__('Forgotten pass').'</a>');
         }
 
         // Update the status if this is the first time the user logged in
@@ -87,13 +85,11 @@ public function login()
         // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after login)
         $redirect_url = validate_redirect($this->request->post('redirect_url'), get_base_url());
 
-        redirect(feather_escape($redirect_url), $lang_login['Login redirect']);
+        redirect(feather_escape($redirect_url), __('Login redirect'));
     }
 
     public function logout($id, $token)
     {
-        global $lang_login;
-
         if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != feather_hash($this->user->id.feather_hash(get_remote_address()))) {
             header('Location: '.get_base_url());
             exit;
@@ -113,13 +109,11 @@ public function logout($id, $token)
 
         feather_setcookie(1, feather_hash(uniqid(rand(), true)), time() + 31536000);
 
-        redirect(get_base_url(), $lang_login['Logout redirect']);
+        redirect(get_base_url(), __('Logout redirect'));
     }
 
     public function password_forgotten()
     {
-        global $lang_common, $lang_login;
-
         if (!$this->user->is_guest) {
             header('Location: '.get_base_url());
             exit;
@@ -133,7 +127,7 @@ public function password_forgotten()
             // Validate the email address
             $email = strtolower(feather_trim($this->request->post('req_email')));
             if (!is_valid_email($email)) {
-                $errors[] = $lang_common['Invalid email'];
+                $errors[] = __('Invalid email');
             }
 
             // Did everything go according to plan?
@@ -161,7 +155,7 @@ public function password_forgotten()
                     // Loop through users we found
                     foreach($result as $cur_hit) {
                         if ($cur_hit->last_email_sent != '' && (time() - $cur_hit->last_email_sent) < 3600 && (time() - $cur_hit->last_email_sent) >= 0) {
-                            message(sprintf($lang_login['Email flood'], intval((3600 - (time() - $cur_hit->last_email_sent)) / 60)), true);
+                            message(sprintf(__('Email flood'), intval((3600 - (time() - $cur_hit->last_email_sent)) / 60)), true);
                         }
 
                         // Generate a new password and a new password activation code
@@ -187,9 +181,9 @@ public function password_forgotten()
                         pun_mail($email, $mail_subject, $cur_mail_message);
                     }
 
-                    message($lang_login['Forget mail'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
+                    message(__('Forget mail').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
                 } else {
-                    $errors[] = $lang_login['No email match'].' '.htmlspecialchars($email).'.';
+                    $errors[] = __('No email match').' '.htmlspecialchars($email).'.';
                 }
             }
         }
diff --git a/model/misc.php b/model/misc.php
index db1b8d60..e836c72d 100644
--- a/model/misc.php
+++ b/model/misc.php
@@ -32,8 +32,6 @@ public function update_last_visit()
 
     public function get_info_mail($recipient_id)
     {
-        global $lang_common;
-        
         $select_get_info_mail = array('username', 'email', 'email_setting');
         
         $mail = DB::for_table('users')
@@ -42,7 +40,7 @@ public function get_info_mail($recipient_id)
                 ->find_one();
         
         if (!$mail) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
         
         $mail['recipient'] = $mail['username'];
@@ -53,24 +51,22 @@ public function get_info_mail($recipient_id)
 
     public function send_email($mail, $id)
     {
-        global $lang_misc;
-
         // Clean up message and subject from POST
         $subject = feather_trim($this->request->post('req_subject'));
         $message = feather_trim($this->request->post('req_message'));
 
         if ($subject == '') {
-            message($lang_misc['No email subject']);
+            message(__('No email subject'));
         } elseif ($message == '') {
-            message($lang_misc['No email message']);
+            message(__('No email message'));
         }
         // Here we use strlen() not feather_strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         elseif (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            message($lang_misc['Too long email message']);
+            message(__('Too long email message'));
         }
 
         if ($this->user->last_email_sent != '' && (time() - $this->user->last_email_sent) < $this->user->g_email_flood && (time() - $this->user->last_email_sent) >= 0) {
-            message(sprintf($lang_misc['Email flood'], $this->user->g_email_flood, $this->user->g_email_flood - (time() - $this->user->last_email_sent)));
+            message(sprintf(__('Email flood'), $this->user->g_email_flood, $this->user->g_email_flood - (time() - $this->user->last_email_sent)));
         }
 
         // Load the "form email" template
@@ -99,7 +95,7 @@ public function send_email($mail, $id)
         // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after the email is sent)
         //$redirect_url = validate_redirect($this->request->post('redirect_url'), 'index.php');
 
-        redirect(get_base_url(), $lang_misc['Email sent redirect']);
+        redirect(get_base_url(), __('Email sent redirect'));
     }
 
     public function get_redirect_url($recipient_id)
@@ -121,18 +117,16 @@ public function get_redirect_url($recipient_id)
 
     public function insert_report($post_id)
     {
-        global $lang_misc, $lang_common;
-
         // Clean up reason from POST
         $reason = feather_linebreaks(feather_trim($this->request->post('req_reason')));
         if ($reason == '') {
-            message($lang_misc['No reason']);
+            message(__('No reason'));
         } elseif (strlen($reason) > 65535) { // TEXT field can only hold 65535 bytes
-            message($lang_misc['Reason too long']);
+            message(__('Reason too long'));
         }
 
         if ($this->user->last_report_sent != '' && (time() - $this->user->last_report_sent) < $this->user->g_report_flood && (time() - $this->user->last_report_sent) >= 0) {
-            message(sprintf($lang_misc['Report flood'], $this->user->g_report_flood, $this->user->g_report_flood - (time() - $this->user->last_report_sent)));
+            message(sprintf(__('Report flood'), $this->user->g_report_flood, $this->user->g_report_flood - (time() - $this->user->last_report_sent)));
         }
 
         // Get the topic ID
@@ -141,7 +135,7 @@ public function insert_report($post_id)
                                                               ->find_one();
 
         if (!$topic) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $select_report = array('subject', 'forum_id');
@@ -152,7 +146,7 @@ public function insert_report($post_id)
             ->find_one();
 
         if (!$report) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Should we use the internal report handling?
@@ -203,13 +197,11 @@ public function insert_report($post_id)
             ->set('last_report_sent', time())
             ->save();
 
-        redirect(get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['subject']).'/'), $lang_misc['Report redirect']);
+        redirect(get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['subject']).'/'), __('Report redirect'));
     }
 
     public function get_info_report($post_id)
     {
-        global $lang_common;
-
         $select_get_info_report = array('fid' => 'f.id', 'f.forum_name', 'tid' => 't.id', 't.subject');
         $where_get_info_report = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -228,7 +220,7 @@ public function get_info_report($post_id)
             ->find_one();
 
         if (!$cur_post) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_post;
@@ -236,10 +228,8 @@ public function get_info_report($post_id)
 
     public function subscribe_topic($topic_id)
     {
-        global $lang_common, $lang_misc;
-
         if ($this->config['o_topic_subscriptions'] != '1') {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Make sure the user can view the topic
@@ -258,7 +248,7 @@ public function subscribe_topic($topic_id)
                     ->find_one();
 
         if (!$authorized) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $is_subscribed = DB::for_table('topic_subscriptions')
@@ -267,7 +257,7 @@ public function subscribe_topic($topic_id)
                         ->find_one();
 
         if ($is_subscribed) {
-            message($lang_misc['Already subscribed topic']);
+            message(__('Already subscribed topic'));
         }
 
         $insert_subscribe_topic = array(
@@ -281,15 +271,13 @@ public function subscribe_topic($topic_id)
             ->set($insert_subscribe_topic)
             ->save();
 
-        redirect(get_link('topic/'.$topic_id.'/'), $lang_misc['Subscribe redirect']);
+        redirect(get_link('topic/'.$topic_id.'/'), __('Subscribe redirect'));
     }
 
     public function unsubscribe_topic($topic_id)
     {
-        global $lang_common, $lang_misc;
-
         if ($this->config['o_topic_subscriptions'] != '1') {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         $is_subscribed = DB::for_table('topic_subscriptions')
@@ -298,7 +286,7 @@ public function unsubscribe_topic($topic_id)
             ->find_one();
 
         if (!$is_subscribed) {
-            message($lang_misc['Not subscribed topic']);
+            message(__('Not subscribed topic'));
         }
 
         // Delete the subscription
@@ -307,15 +295,13 @@ public function unsubscribe_topic($topic_id)
             ->where('topic_id', $topic_id)
             ->delete_many();
 
-        redirect(get_link('topic/'.$topic_id.'/'), $lang_misc['Unsubscribe redirect']);
+        redirect(get_link('topic/'.$topic_id.'/'), __('Unsubscribe redirect'));
     }
 
     public function unsubscribe_forum($forum_id)
     {
-        global $lang_common, $lang_misc;
-
         if ($this->config['o_forum_subscriptions'] != '1') {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         $is_subscribed = DB::for_table('forum_subscriptions')
@@ -324,7 +310,7 @@ public function unsubscribe_forum($forum_id)
             ->find_one();
 
         if (!$is_subscribed) {
-            message($lang_misc['Not subscribed forum']);
+            message(__('Not subscribed forum'));
         }
 
         // Delete the subscription
@@ -333,15 +319,13 @@ public function unsubscribe_forum($forum_id)
             ->where('forum_id', $forum_id)
             ->delete_many();
 
-        redirect(get_link('forum/'.$forum_id.'/'), $lang_misc['Unsubscribe redirect']);
+        redirect(get_link('forum/'.$forum_id.'/'), __('Unsubscribe redirect'));
     }
 
     public function subscribe_forum($forum_id)
     {
-        global $lang_common, $lang_misc;
-
         if ($this->config['o_forum_subscriptions'] != '1') {
-            message($lang_common['No permission'], '403');
+            message(__('No permission'), '403');
         }
 
         // Make sure the user can view the forum
@@ -359,7 +343,7 @@ public function subscribe_forum($forum_id)
             ->find_one();
 
         if (!$authorized) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $is_subscribed = DB::for_table('forum_subscriptions')
@@ -368,7 +352,7 @@ public function subscribe_forum($forum_id)
             ->find_one();
 
         if ($is_subscribed) {
-            message($lang_misc['Already subscribed forum']);
+            message(__('Already subscribed forum'));
         }
 
         $insert_subscribe_forum = array(
@@ -382,6 +366,6 @@ public function subscribe_forum($forum_id)
             ->set($insert_subscribe_forum)
             ->save();
 
-        redirect(get_link('forum/'.$forum_id.'/'), $lang_misc['Subscribe redirect']);
+        redirect(get_link('forum/'.$forum_id.'/'), __('Subscribe redirect'));
     }
 }
diff --git a/model/moderate.php b/model/moderate.php
index 81a29caf..df7fe2d8 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -24,30 +24,28 @@ public function __construct()
  
     public function display_ip_info($ip)
     {
-        global $lang_misc;
-
         // Load the misc.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
 
-        message(sprintf($lang_misc['Host info 1'], $ip).'<br />'.sprintf($lang_misc['Host info 2'], @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.$lang_misc['Show more users'].'</a>');
+        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function display_ip_address_post($pid)
     {
-        global $lang_common;
+
 
         $ip = DB::for_table('posts')
             ->where('id', $pid)
             ->find_one_col('poster_ip');
 
         if (!$ip) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Load the misc.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
 
-        message(sprintf($lang_misc['Host info 1'], $ip).'<br />'.sprintf($lang_misc['Host info 2'], @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.$lang_misc['Show more users'].'</a>');
+        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function get_moderators($fid)
@@ -61,7 +59,7 @@ public function get_moderators($fid)
 
     public function get_topic_info($fid, $tid)
     {
-        global $lang_common;
+
         
         // Fetch some info about the topic
         $select_get_topic_info = array('forum_id' => 'f.id', 'f.forum_name', 't.subject', 't.num_replies', 't.first_post_id');
@@ -83,7 +81,7 @@ public function get_topic_info($fid, $tid)
             ->find_one();
 
         if (!$cur_topic) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_topic;
@@ -91,16 +89,15 @@ public function get_topic_info($fid, $tid)
 
     public function delete_posts($tid, $fid, $p = null)
     {
-        global $lang_common, $lang_misc;
-
+        
         $posts = $this->request->post('posts') ? $this->request->post('posts') : array();
         if (empty($posts)) {
-            message($lang_misc['No posts selected']);
+            message(__('No posts selected'));
         }
 
         if ($this->request->post('delete_posts_comply')) {
             if (@preg_match('%[^0-9,]%', $posts)) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             // Verify that the post IDs are valid
@@ -116,7 +113,7 @@ public function delete_posts($tid, $fid, $p = null)
             }
 
             if (count($result) != substr_count($posts, ',') + 1) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             // Delete the posts
@@ -153,7 +150,7 @@ public function delete_posts($tid, $fid, $p = null)
 
             update_forum($fid);
 
-            redirect(get_link('topic/'.$tid.'/'), $lang_misc['Delete posts redirect']);
+            redirect(get_link('topic/'.$tid.'/'), __('Delete posts redirect'));
         }
 
         return $posts;
@@ -161,21 +158,20 @@ public function delete_posts($tid, $fid, $p = null)
 
     public function split_posts($tid, $fid, $p = null)
     {
-        global $lang_common, $lang_misc, $lang_post;
-
+        
         $posts = $this->request->post('posts') ? $this->request->post('posts') : array();
         if (empty($posts)) {
-            message($lang_misc['No posts selected']);
+            message(__('No posts selected'));
         }
 
         if ($this->request->post('split_posts_comply')) {
             if (@preg_match('%[^0-9,]%', $posts)) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             $move_to_forum = $this->request->post('move_to_forum') ? intval($this->request->post('move_to_forum')) : 0;
             if ($move_to_forum < 1) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             // How many posts did we just split off?
@@ -190,7 +186,7 @@ public function split_posts($tid, $fid, $p = null)
                 ->find_many();
 
             if (count($result) != $num_posts_splitted) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             // Verify that the move to forum ID is valid
@@ -208,7 +204,7 @@ public function split_posts($tid, $fid, $p = null)
                 ->find_one();
 
             if (!$result) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             // Load the post.php language file
@@ -218,9 +214,9 @@ public function split_posts($tid, $fid, $p = null)
             $new_subject = $this->request->post('new_subject') ? feather_trim($this->request->post('new_subject')) : '';
 
             if ($new_subject == '') {
-                message($lang_post['No subject']);
+                message(__('No subject'));
             } elseif (feather_strlen($new_subject) > 70) {
-                message($lang_post['Too long subject']);
+                message(__('Too long subject'));
             }
 
             // Get data from the new first post
@@ -306,7 +302,7 @@ public function split_posts($tid, $fid, $p = null)
             update_forum($fid);
             update_forum($move_to_forum);
 
-            redirect(get_link('topic/'.$new_tid.'/'), $lang_misc['Split posts redirect']);
+            redirect(get_link('topic/'.$new_tid.'/'), __('Split posts redirect'));
         }
 
         return $posts;
@@ -400,7 +396,7 @@ public function get_forum_list_move($id)
 
     public function display_posts_view($tid, $start_from)
     {
-        global $pd, $lang_topic;
+        global $pd;
 
         $post_data = array();
 
@@ -454,7 +450,7 @@ public function display_posts_view($tid, $start_from)
             // If the poster is a guest (or a user that has been deleted)
             else {
                 $cur_post->poster_disp = feather_escape($cur_post->poster);
-                $cur_post->user_title = $lang_topic['Guest'];
+                $cur_post->user_title = __('Guest');
             }
 
             // Perform the main parsing of the message (BBCode, smilies, censor words etc)
@@ -468,16 +464,15 @@ public function display_posts_view($tid, $start_from)
 
     public function move_topics_to($fid, $tfid = null, $param = null)
     {
-        global $lang_common, $lang_misc;
-
+        
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $topics = explode(',', $this->request->post('topics'));
         $move_to_forum = $this->request->post('move_to_forum') ? intval($this->request->post('move_to_forum')) : 0;
         if (empty($topics) || $move_to_forum < 1) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Verify that the topic IDs are valid
@@ -487,7 +482,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
             ->find_many();
 
         if (count($result) != count($topics)) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
 
@@ -506,7 +501,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
             ->find_one();
 
         if (!$authorized) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Delete any redirect topics if there are any (only if we moved/copied the topic back to where it was once moved from)
@@ -553,14 +548,13 @@ public function move_topics_to($fid, $tfid = null, $param = null)
         update_forum($fid); // Update the forum FROM which the topic was moved
         update_forum($move_to_forum); // Update the forum TO which the topic was moved
 
-        $redirect_msg = (count($topics) > 1) ? $lang_misc['Move topics redirect'] : $lang_misc['Move topic redirect'];
+        $redirect_msg = (count($topics) > 1) ? __('Move topics redirect') : __('Move topic redirect');
         redirect(get_link('forum/'.$move_to_forum.'/'), $redirect_msg);
     }
 
     public function check_move_possible()
     {
-        global $lang_misc;
-
+        
         $select_check_move_possible = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name');
         $where_check_move_possible = array(
             array('fp.post_topics' => 'IS NULL'),
@@ -580,21 +574,20 @@ public function check_move_possible()
             ->find_many();
 
         if (count($result) < 2) {
-            message($lang_misc['Nowhere to move']);
+            message(__('Nowhere to move'));
         }
     }
 
     public function merge_topics($fid)
     {
-        global $lang_common, $lang_misc;
-
+        
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $topics = explode(',', $this->request->post('topics'));
         if (count($topics) < 2) {
-            message($lang_misc['Not enough topics selected']);
+            message(__('Not enough topics selected'));
         }
 
         // Verify that the topic IDs are valid (redirect links will point to the merged topic after the merge)
@@ -604,7 +597,7 @@ public function merge_topics($fid)
             ->find_many();
 
         if (count($result) != count($topics)) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // The topic that we are merging into is the one with the smallest ID
@@ -692,16 +685,15 @@ public function merge_topics($fid)
 
         // Update the forum FROM which the topic was moved and redirect
         update_forum($fid);
-        redirect(get_link('forum/'.$fid.'/'), $lang_misc['Merge topics redirect']);
+        redirect(get_link('forum/'.$fid.'/'), __('Merge topics redirect'));
     }
 
     public function delete_topics($topics, $fid)
     {
-        global $lang_misc, $lang_common;
-        
+                
 
         if (@preg_match('%[^0-9,]%', $topics)) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         require FEATHER_ROOT.'include/search_idx.php';
@@ -715,7 +707,7 @@ public function delete_topics($topics, $fid)
             ->find_many();
 
         if (count($result) != substr_count($topics, ',') + 1) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Verify that the posts are not by admins
@@ -725,7 +717,7 @@ public function delete_topics($topics, $fid)
                 ->where('poster_id', get_admin_ids())
                 ->find_many();
             if ($authorized) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
         }
 
@@ -767,12 +759,12 @@ public function delete_topics($topics, $fid)
 
         update_forum($fid);
 
-        redirect(get_link('forum/'.$fid.'/'), $lang_misc['Delete topics redirect']);
+        redirect(get_link('forum/'.$fid.'/'), __('Delete topics redirect'));
     }
 
     public function get_forum_info($fid)
     {
-        global $lang_common;
+
 
         $select_get_forum_info = array('f.forum_name', 'f.redirect_url', 'f.num_topics', 'f.sort_by');
         $where_get_forum_info = array(
@@ -790,7 +782,7 @@ public function get_forum_info($fid)
             ->find_one();
 
         if (!$cur_forum) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_forum;
@@ -819,8 +811,6 @@ public function forum_sort_by($forum_sort)
 
     public function display_topics($fid, $sort_by, $start_from)
     {
-        global $lang_forum, $lang_common;
-
         $topic_data = array();
 
         // Get topic/forum tracking data
@@ -861,7 +851,7 @@ public function display_topics($fid, $sort_by, $start_from)
                 $url_topic = url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_disp'] = '<a href="'.get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_disp'] = '<a href="'.get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
                     $cur_topic['ghost_topic'] = false;
                 } else {
                     $cur_topic['last_post_disp'] = '- - -';
@@ -874,18 +864,18 @@ public function display_topics($fid, $sort_by, $start_from)
 
                 if ($cur_topic['sticky'] == '1') {
                     $cur_topic['item_status'] .= ' isticky';
-                    $status_text[] = '<span class="stickytext">'.$lang_forum['Sticky'].'</span>';
+                    $status_text[] = '<span class="stickytext">'.__('Sticky').'</span>';
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
-                    $status_text[] = '<span class="movedtext">'.$lang_forum['Moved'].'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
-                    $status_text[] = '<span class="closedtext">'.$lang_forum['Closed'].'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
 
@@ -893,7 +883,7 @@ public function display_topics($fid, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_disp'] = '<strong>'.$cur_topic['subject_disp'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.$lang_common['New posts info'].'">'.$lang_common['New posts'].'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
@@ -963,14 +953,14 @@ public function close_multiple_topics($action, $topics, $fid)
     
     public function get_subject_tid($id)
     {
-        global $lang_common;
+
 
         $subject = DB::for_table('topics')
             ->where('id', $id)
             ->find_one_col('subject');
 
         if (!$subject) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $subject;
diff --git a/model/post.php b/model/post.php
index 39fbba15..0c55d616 100644
--- a/model/post.php
+++ b/model/post.php
@@ -25,7 +25,7 @@ public function __construct()
     //  Get some info about the post
     public function get_info_post($tid, $fid)
     {
-        global $lang_common;
+
 
         if ($tid) {
             $select_get_info_post = array('f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_replies', 'fp.post_topics', 't.subject', 't.closed', 'is_subscribed' => 's.user_id');
@@ -64,7 +64,7 @@ public function get_info_post($tid, $fid)
         }
 
         if (!$cur_posting) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_posting;
@@ -73,7 +73,7 @@ public function get_info_post($tid, $fid)
     // Checks the post for errors before posting
     public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
     {
-        global $lang_post, $lang_common, $lang_prof_reg, $lang_register, $lang_antispam, $lang_antispam_questions, $pd;
+        global $lang_antispam, $lang_antispam_questions, $pd;
 
         // Antispam feature
         if ($this->user->is_guest) {
@@ -90,13 +90,13 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
             }
 
             if (empty($lang_antispam_questions_array[$question]) || $lang_antispam_questions_array[$question] != $answer) {
-                $errors[] = $lang_antispam['Robot test fail'];
+                $errors[] = __('Robot test fail');
             }
         }
 
         // Flood protection
         if ($this->request->post('preview') != '' && $this->user->last_post != '' && (time() - $this->user->last_post) < $this->user->g_post_flood) {
-            $errors[] = sprintf($lang_post['Flood start'], $this->user->g_post_flood, $this->user->g_post_flood - (time() - $this->user->last_post));
+            $errors[] = sprintf(__('Flood start'), $this->user->g_post_flood, $this->user->g_post_flood - (time() - $this->user->last_post));
         }
 
         if ($tid) {
@@ -105,13 +105,13 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
                 ->find_one_col('subject');
 
             if (!$subject_tid) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
             $url_subject = url_friendly($subject_tid);
         } else {
             $url_subject = '';
         }
-        
+
         // If it's a new topic
         if ($fid) {
             $subject = feather_trim($this->request->post('req_subject'));
@@ -121,13 +121,13 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
             }
 
             if ($subject == '') {
-                $errors[] = $lang_post['No subject'];
+                $errors[] = __('No subject');
             } elseif ($this->config['o_censoring'] == '1' && $censored_subject == '') {
-                $errors[] = $lang_post['No subject after censoring'];
+                $errors[] = __('No subject after censoring');
             } elseif (feather_strlen($subject) > 70) {
-                $errors[] = $lang_post['Too long subject'];
+                $errors[] = __('Too long subject');
             } elseif ($this->config['p_subject_all_caps'] == '0' && is_all_uppercase($subject) && !$this->user->is_admmod) {
-                $errors[] = $lang_post['All caps subject'];
+                $errors[] = __('All caps subject');
             }
         }
 
@@ -141,14 +141,14 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
             if ($this->config['p_force_guest_email'] == '1' || $email != '') {
                 require FEATHER_ROOT.'include/email.php';
                 if (!is_valid_email($email)) {
-                    $errors[] = $lang_common['Invalid email'];
+                    $errors[] = __('Invalid email');
                 }
 
                 // Check if it's a banned email address
                 // we should only check guests because members' addresses are already verified
                 if ($this->user->is_guest && is_banned_email($email)) {
                     if ($this->config['p_allow_banned_email'] == '0') {
-                        $errors[] = $lang_prof_reg['Banned email'];
+                        $errors[] = __('Banned email');
                     }
 
                     $errors['banned_email'] = 1; // Used later when we send an alert email
@@ -161,9 +161,9 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
 
         // Here we use strlen() not feather_strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         if (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            $errors[] = sprintf($lang_post['Too long message'], forum_number_format(FEATHER_MAX_POSTSIZE));
+            $errors[] = sprintf(__('Too long message'), forum_number_format(FEATHER_MAX_POSTSIZE));
         } elseif ($this->config['p_message_all_caps'] == '0' && is_all_uppercase($message) && !$this->user->is_admmod) {
-            $errors[] = $lang_post['All caps message'];
+            $errors[] = __('All caps message');
         }
 
         // Validate BBCode syntax
@@ -174,13 +174,13 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
 
         if (empty($errors)) {
             if ($message == '') {
-                $errors[] = $lang_post['No message'];
+                $errors[] = __('No message');
             } elseif ($this->config['o_censoring'] == '1') {
                 // Censor message to see if that causes problems
                 $censored_message = feather_trim(censor_words($message));
 
                 if ($censored_message == '') {
-                    $errors[] = $lang_post['No message after censoring'];
+                    $errors[] = __('No message after censoring');
                 }
             }
         }
@@ -693,7 +693,7 @@ public function split_text($text, $start, $end, $retab = true)
     // If we are quoting a message
     public function get_quote_message($qid, $tid)
     {
-        global $lang_common;
+
 
         $select_get_quote_message = array('poster', 'message');
 
@@ -703,7 +703,7 @@ public function get_quote_message($qid, $tid)
                  ->find_one();
 
         if (!$quote) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // If the message contains a code tag we have to split it up (text within [code][/code] shouldn't be touched)
@@ -756,7 +756,7 @@ public function get_quote_message($qid, $tid)
                 }
             $quote = '[quote='. $quote['poster'] .']'.$quote['message'].'[/quote]'."\n";
         } else {
-            $quote = '> '.$quote['poster'].' '.$lang_common['wrote']."\n\n".'> '.$quote['message']."\n";
+            $quote = '> '.$quote['poster'].' '.__('wrote')."\n\n".'> '.$quote['message']."\n";
         }
 
         return $quote;
@@ -765,18 +765,16 @@ public function get_quote_message($qid, $tid)
     // Get the current state of checkboxes
     public function get_checkboxes($fid, $is_admmod, $is_subscribed)
     {
-        global $lang_post, $lang_common;
-
         $cur_index = 1;
 
         $checkboxes = array();
         if ($fid && $is_admmod) {
-            $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('stick_topic') ? ' checked="checked"' : '').' />'.$lang_common['Stick topic'].'<br /></label>';
+            $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('stick_topic') ? ' checked="checked"' : '').' />'.__('Stick topic').'<br /></label>';
         }
 
         if (!$this->user->is_guest) {
             if ($this->config['o_smilies'] == '1') {
-                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('hide_smilies') ? ' checked="checked"' : '').' />'.$lang_post['Hide smilies'].'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('hide_smilies') ? ' checked="checked"' : '').' />'.__('Hide smilies').'<br /></label>';
             }
 
             if ($this->config['o_topic_subscriptions'] == '1') {
@@ -795,10 +793,10 @@ public function get_checkboxes($fid, $is_admmod, $is_subscribed)
                     $subscr_checked = true;
                 }
 
-                $checkboxes[] = '<label><input type="checkbox" name="subscribe" value="1" tabindex="'.($cur_index++).'"'.($subscr_checked ? ' checked="checked"' : '').' />'.($is_subscribed ? $lang_post['Stay subscribed'] : $lang_post['Subscribe']).'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="subscribe" value="1" tabindex="'.($cur_index++).'"'.($subscr_checked ? ' checked="checked"' : '').' />'.($is_subscribed ? __('Stay subscribed') : __('Subscribe')).'<br /></label>';
             }
         } elseif ($this->config['o_smilies'] == '1') {
-            $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('hide_smilies') ? ' checked="checked"' : '').' />'.$lang_post['Hide smilies'].'<br /></label>';
+            $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('hide_smilies') ? ' checked="checked"' : '').' />'.__('Hide smilies').'<br /></label>';
         }
 
         return $checkboxes;
diff --git a/model/profile.php b/model/profile.php
index ff440fad..49e8fe69 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -24,8 +24,6 @@ public function __construct()
  
     public function change_pass($id)
     {
-        global $lang_profile, $lang_common, $lang_prof_reg;
-
         if ($this->request->get('key')) {
             // If the user is already logged in we shouldn't be here :)
             if (!$this->user->is_guest) {
@@ -40,7 +38,7 @@ public function change_pass($id)
                 ->find_one();
 
             if ($key == '' || $key != $cur_user['activate_key']) {
-                message($lang_profile['Pass key bad'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
+                message(__('Pass key bad').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
             } else {
                 DB::for_table('users')
                     ->where('id', $id)
@@ -50,14 +48,14 @@ public function change_pass($id)
                     ->set_expr('activate_key', 'NULL')
                     ->save();
 
-                message($lang_profile['Pass updated'], true);
+                message(__('Pass updated'), true);
             }
         }
 
         // Make sure we are allowed to change this user's password
         if ($this->user->id != $id) {
             if (!$this->user->is_admmod) { // A regular user trying to change another user's password?
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's password?
 
@@ -71,11 +69,11 @@ public function change_pass($id)
                     ->find_one();
 
                 if (!$user) {
-                    message($lang_common['Bad request'], '404');
+                    message(__('Bad request'), '404');
                 }
 
                 if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == FEATHER_ADMIN || $user['g_moderator'] == '1') {
-                    message($lang_common['No permission'], '403');
+                    message(__('No permission'), '403');
                 }
             }
         }
@@ -86,10 +84,10 @@ public function change_pass($id)
             $new_password2 = feather_trim($this->request->post('req_new_password2'));
 
             if ($new_password1 != $new_password2) {
-                message($lang_prof_reg['Pass not match']);
+                message(__('Pass not match'));
             }
             if (feather_strlen($new_password1) < 6) {
-                message($lang_prof_reg['Pass too short']);
+                message(__('Pass too short'));
             }
 
             $cur_user = DB::for_table('users')
@@ -107,7 +105,7 @@ public function change_pass($id)
             }
 
             if (!$authorized) {
-                message($lang_profile['Wrong pass']);
+                message(__('Wrong pass'));
             }
 
             $new_password_hash = feather_hash($new_password1);
@@ -121,18 +119,16 @@ public function change_pass($id)
                 feather_setcookie($this->user->id, $new_password_hash, time() + $this->config['o_timeout_visit']);
             }
 
-            redirect(get_link('user/'.$id.'/section/essentials/'), $lang_profile['Pass updated redirect']);
+            redirect(get_link('user/'.$id.'/section/essentials/'), __('Pass updated redirect'));
         }
     }
 
     public function change_email($id)
     {
-        global $lang_profile, $lang_common, $lang_prof_reg;
-
         // Make sure we are allowed to change this user's email
         if ($this->user->id != $id) {
             if (!$this->user->is_admmod) { // A regular user trying to change another user's email?
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's email?
 
@@ -146,11 +142,11 @@ public function change_email($id)
                     ->find_one();
 
                 if (!$user) {
-                    message($lang_common['Bad request'], '404');
+                    message(__('Bad request'), '404');
                 }
 
                 if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == FEATHER_ADMIN || $user['g_moderator'] == '1') {
-                    message($lang_common['No permission'], '403');
+                    message(__('No permission'), '403');
                 }
             }
         }
@@ -163,7 +159,7 @@ public function change_email($id)
                 ->find_one_col('activate_key');
 
             if ($key == '' || $key != $new_email_key) {
-                message($lang_profile['Email key bad'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
+                message(__('Email key bad').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
             } else {
                 DB::for_table('users')
                     ->where('id', $id)
@@ -173,11 +169,11 @@ public function change_email($id)
                     ->set_expr('activate_key', 'NULL')
                     ->save();
 
-                message($lang_profile['Email updated'], true);
+                message(__('Email updated'), true);
             }
         } elseif ($this->request->isPost()) {
             if (feather_hash($this->request->post('req_password')) !== $this->user->password) {
-                message($lang_profile['Wrong pass']);
+                message(__('Wrong pass'));
             }
 
             require FEATHER_ROOT.'include/email.php';
@@ -185,13 +181,13 @@ public function change_email($id)
             // Validate the email address
             $new_email = strtolower(feather_trim($this->request->post('req_new_email')));
             if (!is_valid_email($new_email)) {
-                message($lang_common['Invalid email']);
+                message(__('Invalid email'));
             }
 
             // Check if it's a banned email address
             if (is_banned_email($new_email)) {
                 if ($this->config['p_allow_banned_email'] == '0') {
-                    message($lang_prof_reg['Banned email']);
+                    message(__('Banned email'));
                 } elseif ($this->config['o_mailing_list'] != '') {
                     // Load the "banned email change" template
                     $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/banned_email_change.tpl'));
@@ -220,7 +216,7 @@ public function change_email($id)
 
             if ($result) {
                 if ($this->config['p_allow_dupe_email'] == '0') {
-                    message($lang_prof_reg['Dupe email']);
+                    message(__('Dupe email'));
                 } elseif ($this->config['o_mailing_list'] != '') {
                     foreach($result as $cur_dupe) {
                         $dupe_list[] = $cur_dupe['username'];
@@ -272,16 +268,14 @@ public function change_email($id)
 
             pun_mail($new_email, $mail_subject, $mail_message);
 
-            message($lang_profile['Activate email sent'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
+            message(__('Activate email sent').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
         }
     }
 
     public function upload_avatar($id, $files_data)
     {
-        global $lang_profile;
-
         if (!isset($files_data['req_file'])) {
-            message($lang_profile['No file']);
+            message(__('No file'));
         }
 
         $uploaded_file = $files_data['req_file'];
@@ -291,25 +285,25 @@ public function upload_avatar($id, $files_data)
             switch ($uploaded_file['error']) {
                 case 1: // UPLOAD_ERR_INI_SIZE
                 case 2: // UPLOAD_ERR_FORM_SIZE
-                    message($lang_profile['Too large ini']);
+                    message(__('Too large ini'));
                     break;
 
                 case 3: // UPLOAD_ERR_PARTIAL
-                    message($lang_profile['Partial upload']);
+                    message(__('Partial upload'));
                     break;
 
                 case 4: // UPLOAD_ERR_NO_FILE
-                    message($lang_profile['No file']);
+                    message(__('No file'));
                     break;
 
                 case 6: // UPLOAD_ERR_NO_TMP_DIR
-                    message($lang_profile['No tmp directory']);
+                    message(__('No tmp directory'));
                     break;
 
                 default:
                     // No error occured, but was something actually uploaded?
                     if ($uploaded_file['size'] == 0) {
-                        message($lang_profile['No file']);
+                        message(__('No file'));
                     }
                     break;
             }
@@ -319,17 +313,17 @@ public function upload_avatar($id, $files_data)
             // Preliminary file check, adequate in most cases
             $allowed_types = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/png', 'image/x-png');
             if (!in_array($uploaded_file['type'], $allowed_types)) {
-                message($lang_profile['Bad type']);
+                message(__('Bad type'));
             }
 
             // Make sure the file isn't too big
             if ($uploaded_file['size'] > $this->config['o_avatars_size']) {
-                message($lang_profile['Too large'].' '.forum_number_format($this->config['o_avatars_size']).' '.$lang_profile['bytes'].'.');
+                message(__('Too large').' '.forum_number_format($this->config['o_avatars_size']).' '.__('bytes').'.');
             }
 
             // Move the file to the avatar directory. We do this before checking the width/height to circumvent open_basedir restrictions
             if (!@move_uploaded_file($uploaded_file['tmp_name'], FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp')) {
-                message($lang_profile['Move failed'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
+                message(__('Move failed').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
             }
 
             list($width, $height, $type, ) = @getimagesize(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
@@ -344,13 +338,13 @@ public function upload_avatar($id, $files_data)
             } else {
                 // Invalid type
                 @unlink(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
-                message($lang_profile['Bad type']);
+                message(__('Bad type'));
             }
 
             // Now check the width/height
             if (empty($width) || empty($height) || $width > $this->config['o_avatars_width'] || $height > $this->config['o_avatars_height']) {
                 @unlink(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
-                message($lang_profile['Too wide or high'].' '.$this->config['o_avatars_width'].'x'.$this->config['o_avatars_height'].' '.$lang_profile['pixels'].'.');
+                message(__('Too wide or high').' '.$this->config['o_avatars_width'].'x'.$this->config['o_avatars_height'].' '.__('pixels').'.');
             }
 
             // Delete any old avatars and put the new one in place
@@ -358,16 +352,14 @@ public function upload_avatar($id, $files_data)
             @rename(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp', FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.$extension);
             @chmod(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.$extension, 0644);
         } else {
-            message($lang_profile['Unknown failure']);
+            message(__('Unknown failure'));
         }
 
-        redirect(get_link('user/'.$id.'/section/personality/'), $lang_profile['Avatar upload redirect']);
+        redirect(get_link('user/'.$id.'/section/personality/'), __('Avatar upload redirect'));
     }
 
     public function update_group_membership($id)
     {
-        global $lang_profile;
-
         $new_group_id = intval($this->request->post('group_id'));
 
         $old_group_id = DB::for_table('users')
@@ -425,7 +417,7 @@ public function update_group_membership($id)
             }
         }
 
-        redirect(get_link('user/'.$id.'/section/admin/'), $lang_profile['Group membership redirect']);
+        redirect(get_link('user/'.$id.'/section/admin/'), __('Group membership redirect'));
     }
 
     public function get_username($id)
@@ -440,8 +432,6 @@ public function get_username($id)
 
     public function update_mod_forums($id)
     {
-        global $lang_profile;
-
         $username = $this->get_username($id);
 
         $moderator_in = ($this->request->post('moderator_in')) ? array_keys($this->request->post('moderator_in')) : array();
@@ -483,13 +473,11 @@ public function update_mod_forums($id)
             }
         }
 
-        redirect(get_link('user/'.$id.'/section/admin/'), $lang_profile['Update forums redirect']);
+        redirect(get_link('user/'.$id.'/section/admin/'), __('Update forums redirect'));
     }
 
     public function ban_user($id)
     {
-        global $lang_profile;
-
         // Get the username of the user we are banning
         $username = $this->get_username($id);
 
@@ -501,16 +489,14 @@ public function ban_user($id)
             ->find_one_col('id');
 
         if ($ban_id) {
-            redirect(get_link('admin/bans/edit/'.$ban_id.'/'), $lang_profile['Ban redirect']);
+            redirect(get_link('admin/bans/edit/'.$ban_id.'/'), __('Ban redirect'));
         } else {
-            redirect(get_link('admin/bans/add/'.$id.'/'), $lang_profile['Ban redirect']);
+            redirect(get_link('admin/bans/add/'.$id.'/'), __('Ban redirect'));
         }
     }
 
     public function promote_user($id)
     {
-        global $lang_profile, $lang_common;
-
         $pid = $this->request->get('pid') ? intval($this->request->get('pid')) : 0;
 
         // Find the group ID to promote the user to
@@ -521,7 +507,7 @@ public function promote_user($id)
             ->find_one_col('g.g_promote_next_group');
         
         if (!$next_group_id) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         // Update the user
@@ -530,13 +516,11 @@ public function promote_user($id)
             ->set('group_id', $next_group_id)
             ->save();
         
-        redirect(get_link('post/'.$pid.'/#p'.$pid), $lang_profile['User promote redirect']);
+        redirect(get_link('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
     }
 
     public function delete_user($id)
     {
-        global $lang_profile;
-
         // Get the username and group of the user we are deleting
         $select_info_delete_user = array('group_id', 'username');
 
@@ -548,7 +532,7 @@ public function delete_user($id)
         $username = $result['username'];
         
         if ($group_id == FEATHER_ADMIN) {
-            message($lang_profile['No delete admin message']);
+            message(__('No delete admin message'));
         }
 
         if ($this->request->post('delete_user_comply')) {
@@ -658,13 +642,13 @@ public function delete_user($id)
                 generate_admins_cache();
             }
 
-            redirect(get_base_url(), $lang_profile['User delete redirect']);
+            redirect(get_base_url(), __('User delete redirect'));
         }
     }
 
     public function fetch_user_group($id)
     {
-        global $lang_common;
+
 
         $info = array();
         
@@ -678,7 +662,7 @@ public function fetch_user_group($id)
             ->find_one();
 
         if (!$info) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $info;
@@ -686,7 +670,7 @@ public function fetch_user_group($id)
 
     public function update_profile($id, $info, $section)
     {
-        global $lang_common, $lang_profile, $lang_prof_reg, $pd;
+        global $pd;
 
         $username_updated = false;
 
@@ -706,7 +690,7 @@ public function update_profile($id, $info, $section)
                     $languages = forum_list_langs();
                     $form['language'] = feather_trim($this->request->post('form_language'));
                     if (!in_array($form['language'], $languages)) {
-                        message($lang_common['Bad request'], '404');
+                        message(__('Bad request'), '404');
                     }
                 }
 
@@ -743,7 +727,7 @@ public function update_profile($id, $info, $section)
                     // Validate the email address
                     $form['email'] = strtolower(feather_trim($this->request->post('req_email')));
                     if (!is_valid_email($form['email'])) {
-                        message($lang_common['Invalid email']);
+                        message(__('Invalid email'));
                     }
                 }
 
@@ -764,14 +748,14 @@ public function update_profile($id, $info, $section)
                         $url = url_valid($form['url']);
 
                         if ($url === false) {
-                            message($lang_profile['Invalid website URL']);
+                            message(__('Invalid website URL'));
                         }
 
                         $form['url'] = $url['url'];
                     }
                 } else {
                     if (!empty($form['url'])) {
-                        message($lang_profile['Website not allowed']);
+                        message(__('Website not allowed'));
                     }
 
                     $form['url'] = '';
@@ -785,10 +769,10 @@ public function update_profile($id, $info, $section)
                     if ($form['title'] != '') {
                         // A list of words that the title may not contain
                         // If the language is English, there will be some duplicates, but it's not the end of the world
-                        $forbidden = array('member', 'moderator', 'administrator', 'banned', 'guest', utf8_strtolower($lang_common['Member']), utf8_strtolower($lang_common['Moderator']), utf8_strtolower($lang_common['Administrator']), utf8_strtolower($lang_common['Banned']), utf8_strtolower($lang_common['Guest']));
+                        $forbidden = array('member', 'moderator', 'administrator', 'banned', 'guest', utf8_strtolower(__('Member')), utf8_strtolower(__('Moderator')), utf8_strtolower(__('Administrator')), utf8_strtolower(__('Banned')), utf8_strtolower(__('Guest')));
 
                         if (in_array(utf8_strtolower($form['title']), $forbidden)) {
-                            message($lang_profile['Forbidden title']);
+                            message(__('Forbidden title'));
                         }
                     }
                 }
@@ -808,7 +792,7 @@ public function update_profile($id, $info, $section)
 
                 // If the ICQ UIN contains anything other than digits it's invalid
                 if (preg_match('%[^0-9]%', $form['icq'])) {
-                    message($lang_prof_reg['Bad ICQ']);
+                    message(__('Bad ICQ'));
                 }
 
                 break;
@@ -824,9 +808,9 @@ public function update_profile($id, $info, $section)
 
                     // Validate signature
                     if (feather_strlen($form['signature']) > $this->config['p_sig_length']) {
-                        message(sprintf($lang_prof_reg['Sig too long'], $this->config['p_sig_length'], feather_strlen($form['signature']) - $this->config['p_sig_length']));
+                        message(sprintf(__('Sig too long'), $this->config['p_sig_length'], feather_strlen($form['signature']) - $this->config['p_sig_length']));
                     } elseif (substr_count($form['signature'], "\n") > ($this->config['p_sig_lines']-1)) {
-                        message(sprintf($lang_prof_reg['Sig too many lines'], $this->config['p_sig_lines']));
+                        message(sprintf(__('Sig too many lines'), $this->config['p_sig_lines']));
                     } elseif ($form['signature'] && $this->config['p_sig_all_caps'] == '0' && is_all_uppercase($form['signature']) && !$this->user->is_admmod) {
                         $form['signature'] = utf8_ucwords(utf8_strtolower($form['signature']));
                     }
@@ -883,7 +867,7 @@ public function update_profile($id, $info, $section)
                     $styles = forum_list_styles();
                     $form['style'] = feather_trim($this->request->post('form_style'));
                     if (!in_array($form['style'], $styles)) {
-                        message($lang_common['Bad request'], '404');
+                        message(__('Bad request'), '404');
                     }
                 }
 
@@ -906,7 +890,7 @@ public function update_profile($id, $info, $section)
             }
 
             default:
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
         }
 
 
@@ -917,7 +901,7 @@ public function update_profile($id, $info, $section)
         }
 
         if (empty($temp)) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         DB::for_table('users')->where('id', $id)
@@ -999,12 +983,12 @@ public function update_profile($id, $info, $section)
             }
         }
 
-        redirect(get_link('user/'.$id.'/section/'.$section.'/'), $lang_profile['Profile redirect']);
+        redirect(get_link('user/'.$id.'/section/'.$section.'/'), __('Profile redirect'));
     }
 
     public function get_user_info($id)
     {
-        global $lang_common;
+
 
         $select_get_user_info = array('u.id', 'u.username', 'u.email', 'u.title', 'u.realname', 'u.url', 'u.jabber', 'u.icq', 'u.msn', 'u.aim', 'u.yahoo', 'u.location', 'u.signature', 'u.disp_topics', 'u.disp_posts', 'u.email_setting', 'u.notify_with_post', 'u.auto_notify', 'u.show_smilies', 'u.show_img', 'u.show_img_sig', 'u.show_avatars', 'u.show_sig', 'u.timezone', 'u.dst', 'u.language', 'u.style', 'u.num_posts', 'u.last_post', 'u.registered', 'u.registration_ip', 'u.admin_note', 'u.date_format', 'u.time_format', 'u.last_visit', 'g.g_id', 'g.g_user_title', 'g.g_moderator');
 
@@ -1016,7 +1000,7 @@ public function get_user_info($id)
             ->find_one();
 
         if (!$user) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $user;
@@ -1024,81 +1008,79 @@ public function get_user_info($id)
 
     public function parse_user_info($user)
     {
-        global $lang_common, $lang_profile;
-
         $user_info = array();
 
-        $user_info['personal'][] = '<dt>'.$lang_common['Username'].'</dt>';
+        $user_info['personal'][] = '<dt>'.__('Username').'</dt>';
         $user_info['personal'][] = '<dd>'.feather_escape($user['username']).'</dd>';
 
         $user_title_field = get_title($user);
-        $user_info['personal'][] = '<dt>'.$lang_common['Title'].'</dt>';
+        $user_info['personal'][] = '<dt>'.__('Title').'</dt>';
         $user_info['personal'][] = '<dd>'.(($this->config['o_censoring'] == '1') ? censor_words($user_title_field) : $user_title_field).'</dd>';
 
         if ($user['realname'] != '') {
-            $user_info['personal'][] = '<dt>'.$lang_profile['Realname'].'</dt>';
+            $user_info['personal'][] = '<dt>'.__('Realname').'</dt>';
             $user_info['personal'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['realname']) : $user['realname']).'</dd>';
         }
 
         if ($user['location'] != '') {
-            $user_info['personal'][] = '<dt>'.$lang_profile['Location'].'</dt>';
+            $user_info['personal'][] = '<dt>'.__('Location').'</dt>';
             $user_info['personal'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['location']) : $user['location']).'</dd>';
         }
 
         if ($user['url'] != '') {
             $user['url'] = feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['url']) : $user['url']);
-            $user_info['personal'][] = '<dt>'.$lang_profile['Website'].'</dt>';
+            $user_info['personal'][] = '<dt>'.__('Website').'</dt>';
             $user_info['personal'][] = '<dd><span class="website"><a href="'.$user['url'].'" rel="nofollow">'.$user['url'].'</a></span></dd>';
         }
 
         if ($user['email_setting'] == '0' && !$this->user->is_guest && $this->user->g_send_email == '1') {
             $user['email_field'] = '<a href="mailto:'.feather_escape($user['email']).'">'.feather_escape($user['email']).'</a>';
         } elseif ($user['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-            $user['email_field'] = '<a href="'.get_link('email/'.$user['id'].'/').'">'.$lang_common['Send email'].'</a>';
+            $user['email_field'] = '<a href="'.get_link('email/'.$user['id'].'/').'">'.__('Send email').'</a>';
         } else {
             $user['email_field'] = '';
         }
         if ($user['email_field'] != '') {
-            $user_info['personal'][] = '<dt>'.$lang_common['Email'].'</dt>';
+            $user_info['personal'][] = '<dt>'.__('Email').'</dt>';
             $user_info['personal'][] = '<dd><span class="email">'.$user['email_field'].'</span></dd>';
         }
 
         if ($user['jabber'] != '') {
-            $user_info['messaging'][] = '<dt>'.$lang_profile['Jabber'].'</dt>';
+            $user_info['messaging'][] = '<dt>'.__('Jabber').'</dt>';
             $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['jabber']) : $user['jabber']).'</dd>';
         }
 
         if ($user['icq'] != '') {
-            $user_info['messaging'][] = '<dt>'.$lang_profile['ICQ'].'</dt>';
+            $user_info['messaging'][] = '<dt>'.__('ICQ').'</dt>';
             $user_info['messaging'][] = '<dd>'.$user['icq'].'</dd>';
         }
 
         if ($user['msn'] != '') {
-            $user_info['messaging'][] = '<dt>'.$lang_profile['MSN'].'</dt>';
+            $user_info['messaging'][] = '<dt>'.__('MSN').'</dt>';
             $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['msn']) : $user['msn']).'</dd>';
         }
 
         if ($user['aim'] != '') {
-            $user_info['messaging'][] = '<dt>'.$lang_profile['AOL IM'].'</dt>';
+            $user_info['messaging'][] = '<dt>'.__('AOL IM').'</dt>';
             $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['aim']) : $user['aim']).'</dd>';
         }
 
         if ($user['yahoo'] != '') {
-            $user_info['messaging'][] = '<dt>'.$lang_profile['Yahoo'].'</dt>';
+            $user_info['messaging'][] = '<dt>'.__('Yahoo').'</dt>';
             $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['yahoo']) : $user['yahoo']).'</dd>';
         }
 
         if ($this->config['o_avatars'] == '1') {
             $avatar_field = generate_avatar_markup($user['id']);
             if ($avatar_field != '') {
-                $user_info['personality'][] = '<dt>'.$lang_profile['Avatar'].'</dt>';
+                $user_info['personality'][] = '<dt>'.__('Avatar').'</dt>';
                 $user_info['personality'][] = '<dd>'.$avatar_field.'</dd>';
             }
         }
 
         if ($this->config['o_signatures'] == '1') {
             if (isset($parsed_signature)) {
-                $user_info['personality'][] = '<dt>'.$lang_profile['Signature'].'</dt>';
+                $user_info['personality'][] = '<dt>'.__('Signature').'</dt>';
                 $user_info['personality'][] = '<dd><div class="postsignature postmsg">'.$parsed_signature.'</div></dd>';
             }
         }
@@ -1110,11 +1092,11 @@ public function parse_user_info($user)
         if ($this->user->g_search == '1') {
             $quick_searches = array();
             if ($user['num_posts'] > 0) {
-                $quick_searches[] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$user['id']).'">'.$lang_profile['Show topics'].'</a>';
-                $quick_searches[] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.$lang_profile['Show posts'].'</a>';
+                $quick_searches[] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$user['id']).'">'.__('Show topics').'</a>';
+                $quick_searches[] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Show posts').'</a>';
             }
             if ($this->user->is_admmod && $this->config['o_topic_subscriptions'] == '1') {
-                $quick_searches[] = '<a href="'.get_link('search/?action=show_subscriptions&amp;user_id='.$user['id']).'">'.$lang_profile['Show subscriptions'].'</a>';
+                $quick_searches[] = '<a href="'.get_link('search/?action=show_subscriptions&amp;user_id='.$user['id']).'">'.__('Show subscriptions').'</a>';
             }
 
             if (!empty($quick_searches)) {
@@ -1122,16 +1104,16 @@ public function parse_user_info($user)
             }
         }
         if ($posts_field != '') {
-            $user_info['activity'][] = '<dt>'.$lang_common['Posts'].'</dt>';
+            $user_info['activity'][] = '<dt>'.__('Posts').'</dt>';
             $user_info['activity'][] = '<dd>'.$posts_field.'</dd>';
         }
 
         if ($user['num_posts'] > 0) {
-            $user_info['activity'][] = '<dt>'.$lang_common['Last post'].'</dt>';
+            $user_info['activity'][] = '<dt>'.__('Last post').'</dt>';
             $user_info['activity'][] = '<dd>'.format_time($user['last_post']).'</dd>';
         }
 
-        $user_info['activity'][] = '<dt>'.$lang_common['Registered'].'</dt>';
+        $user_info['activity'][] = '<dt>'.__('Registered').'</dt>';
         $user_info['activity'][] = '<dd>'.format_time($user['registered'], true).'</dd>';
 
         return $user_info;
@@ -1139,25 +1121,23 @@ public function parse_user_info($user)
 
     public function edit_essentials($id, $user)
     {
-        global $lang_profile, $lang_common;
-
         $user_disp = array();
 
         if ($this->user->is_admmod) {
             if ($this->user->g_id == FEATHER_ADMIN || $this->user->g_mod_rename_users == '1') {
-                $user_disp['username_field'] = '<label class="required"><strong>'.$lang_common['Username'].' <span>'.$lang_common['Required'].'</span></strong><br /><input type="text" name="req_username" value="'.feather_escape($user['username']).'" size="25" maxlength="25" /><br /></label>'."\n";
+                $user_disp['username_field'] = '<label class="required"><strong>'.__('Username').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_username" value="'.feather_escape($user['username']).'" size="25" maxlength="25" /><br /></label>'."\n";
             } else {
-                $user_disp['username_field'] = '<p>'.sprintf($lang_profile['Username info'], feather_escape($user['username'])).'</p>'."\n";
+                $user_disp['username_field'] = '<p>'.sprintf(__('Username info'), feather_escape($user['username'])).'</p>'."\n";
             }
 
-            $user_disp['email_field'] = '<label class="required"><strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong><br /><input type="text" name="req_email" value="'.feather_escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.get_link('email/'.$id.'/').'">'.$lang_common['Send email'].'</a></span></p>'."\n";
+            $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.feather_escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.get_link('email/'.$id.'/').'">'.__('Send email').'</a></span></p>'."\n";
         } else {
-            $user_disp['username_field'] = '<p>'.$lang_common['Username'].': '.feather_escape($user['username']).'</p>'."\n";
+            $user_disp['username_field'] = '<p>'.__('Username').': '.feather_escape($user['username']).'</p>'."\n";
 
             if ($this->config['o_regs_verify'] == '1') {
-                $user_disp['email_field'] = '<p>'.sprintf($lang_profile['Email info'], feather_escape($user['email']).' - <a href="'.get_link('user/'.$id.'/action/change_email/').'">'.$lang_profile['Change email'].'</a>').'</p>'."\n";
+                $user_disp['email_field'] = '<p>'.sprintf(__('Email info'), feather_escape($user['email']).' - <a href="'.get_link('user/'.$id.'/action/change_email/').'">'.__('Change email').'</a>').'</p>'."\n";
             } else {
-                $user_disp['email_field'] = '<label class="required"><strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong><br /><input type="text" name="req_email" value="'.$user['email'].'" size="40" maxlength="80" /><br /></label>'."\n";
+                $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.$user['email'].'" size="40" maxlength="80" /><br /></label>'."\n";
             }
         }
 
@@ -1165,17 +1145,17 @@ public function edit_essentials($id, $user)
         $posts_actions = array();
 
         if ($this->user->g_id == FEATHER_ADMIN) {
-            $user_disp['posts_field'] .= '<label>'.$lang_common['Posts'].'<br /><input type="text" name="num_posts" value="'.$user['num_posts'].'" size="8" maxlength="8" /><br /></label>';
+            $user_disp['posts_field'] .= '<label>'.__('Posts').'<br /><input type="text" name="num_posts" value="'.$user['num_posts'].'" size="8" maxlength="8" /><br /></label>';
         } elseif ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) {
-            $posts_actions[] = sprintf($lang_profile['Posts info'], forum_number_format($user['num_posts']));
+            $posts_actions[] = sprintf(__('Posts info'), forum_number_format($user['num_posts']));
         }
 
         if ($this->user->g_search == '1' || $this->user->g_id == FEATHER_ADMIN) {
-            $posts_actions[] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$id).'">'.$lang_profile['Show topics'].'</a>';
-            $posts_actions[] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$id).'">'.$lang_profile['Show posts'].'</a>';
+            $posts_actions[] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$id).'">'.__('Show topics').'</a>';
+            $posts_actions[] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$id).'">'.__('Show posts').'</a>';
 
             if ($this->config['o_topic_subscriptions'] == '1') {
-                $posts_actions[] = '<a href="'.get_link('search/?action=show_subscriptions&amp;user_id='.$id).'">'.$lang_profile['Show subscriptions'].'</a>';
+                $posts_actions[] = '<a href="'.get_link('search/?action=show_subscriptions&amp;user_id='.$id).'">'.__('Show subscriptions').'</a>';
             }
         }
 
@@ -1251,10 +1231,7 @@ public function get_forum_list($id)
     //
     public function generate_profile_menu($page = '', $id)
     {
-        global $lang_profile;
-
         $this->feather->render('profile/menu.php', array(
-            'lang_profile' => $lang_profile,
             'id' => $id,
             'feather_config' => $this->config,
             'feather_user' => $this->user,
diff --git a/model/register.php b/model/register.php
index 9c61b0a7..d88001fd 100644
--- a/model/register.php
+++ b/model/register.php
@@ -24,7 +24,7 @@ public function __construct()
  
     public function check_for_errors()
     {
-        global $lang_register, $lang_prof_reg, $lang_common, $lang_antispam, $lang_antispam_questions;
+        global $lang_register, $lang_antispam, $lang_antispam_questions;
 
         $user = array();
         $user['errors'] = '';
@@ -36,7 +36,7 @@ public function check_for_errors()
                                   ->find_one();
 
         if ($already_registered) {
-            message($lang_register['Registration flood']);
+            message(__('Registration flood'));
         }
 
 
@@ -57,9 +57,9 @@ public function check_for_errors()
         $user['errors'] = check_username($user['username'], $user['errors']);
 
         if (feather_strlen($user['password1']) < 6) {
-            $user['errors'][] = $lang_prof_reg['Pass too short'];
+            $user['errors'][] = __('Pass too short');
         } elseif ($user['password1'] != $password2) {
-            $user['errors'][] = $lang_prof_reg['Pass not match'];
+            $user['errors'][] = __('Pass not match');
         }
 
         // Antispam feature
@@ -71,22 +71,22 @@ public function check_for_errors()
             $lang_antispam_questions_array[md5($k)] = strtoupper($v);
         }
         if (empty($lang_antispam_questions_array[$question]) || $lang_antispam_questions_array[$question] != $answer) {
-            $user['errors'][] = $lang_antispam['Robot test fail'];
+            $user['errors'][] = __('Robot test fail');
         }
 
         // Validate email
         require FEATHER_ROOT.'include/email.php';
 
         if (!is_valid_email($user['email1'])) {
-            $user['errors'][] = $lang_common['Invalid email'];
+            $user['errors'][] = __('Invalid email');
         } elseif ($this->config['o_regs_verify'] == '1' && $user['email1'] != $email2) {
-            $user['errors'][] = $lang_register['Email not match'];
+            $user['errors'][] = __('Email not match');
         }
 
         // Check if it's a banned email address
         if (is_banned_email($user['email1'])) {
             if ($this->config['p_allow_banned_email'] == '0') {
-                $user['errors'][] = $lang_prof_reg['Banned email'];
+                $user['errors'][] = __('Banned email');
             }
             $user['banned_email'] = 1; // Used later when we send an alert email
         }
@@ -100,7 +100,7 @@ public function check_for_errors()
 
         if ($dupe_mail) {
             if ($this->config['p_allow_dupe_email'] == '0') {
-                $user['errors'][] = $lang_prof_reg['Dupe email'];
+                $user['errors'][] = __('Dupe email');
             }
 
             foreach($dupe_mail as $cur_dupe) {
@@ -112,7 +112,7 @@ public function check_for_errors()
         if ($this->request->post('language')) {
             $user['language'] = preg_replace('%[\.\\\/]%', '', $this->request->post('language'));
             if (!file_exists(FEATHER_ROOT.'lang/'.$user['language'].'/common.php')) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
         } else {
             $user['language'] = $this->config['o_default_lang'];
@@ -123,8 +123,6 @@ public function check_for_errors()
 
     public function insert_user($user)
     {
-        global $lang_register;
-
         // Insert the new user into the database. We do this now to get the last inserted ID for later use
         $now = time();
 
@@ -241,11 +239,11 @@ public function insert_user($user)
 
             pun_mail($user['email1'], $mail_subject, $mail_message);
 
-            message($lang_register['Reg email'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
+            message(__('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
         }
 
         feather_setcookie($new_uid, $password_hash, time() + $this->config['o_timeout_visit']);
 
-        redirect(get_base_url(), $lang_register['Reg complete']);
+        redirect(get_base_url(), __('Reg complete'));
     }
 }
diff --git a/model/search.php b/model/search.php
index fdf13f44..9904dc3a 100644
--- a/model/search.php
+++ b/model/search.php
@@ -25,7 +25,7 @@ public function __construct()
  
     public function get_search_results()
     {
-        global $db_type, $lang_common, $lang_search;
+        global $db_type, $lang_search;
 
         $search = array();
 
@@ -46,7 +46,7 @@ public function get_search_results()
         if ($this->request->get('search_id')) {
             $search_id = intval($this->request->get('search_id'));
             if ($search_id < 1) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
         }
         // If it's a regular search (keywords and/or author)
@@ -63,7 +63,7 @@ public function get_search_results()
             }
 
             if (!$keywords && !$author) {
-                message($lang_search['No terms']);
+                message(__('No terms'));
             }
 
             if ($author) {
@@ -78,21 +78,21 @@ public function get_search_results()
         elseif ($action == 'show_user_posts' || $action == 'show_user_topics' || $action == 'show_subscriptions') {
             $user_id = ($this->request->get('user_id')) ? intval($this->request->get('user_id')) : $this->user->id;
             if ($user_id < 2) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
             // Subscribed topics can only be viewed by admins, moderators and the users themselves
             if ($action == 'show_subscriptions' && !$this->user->is_admmod && $user_id != $this->user->id) {
-                message($lang_common['No permission'], '403');
+                message(__('No permission'), '403');
             }
         } elseif ($action == 'show_recent') {
             $interval = $this->request->get('value') ? intval($this->request->get('value')) : 86400;
         } elseif ($action == 'show_replies') {
             if ($this->user->is_guest) {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
         } elseif ($action != 'show_new' && $action != 'show_unanswered') {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
 
@@ -117,7 +117,7 @@ public function get_search_results()
 
                 unset($temp);
             } else {
-                message($lang_search['No hits']);
+                message(__('No hits'));
             }
         } else {
             $keyword_results = $author_results = array();
@@ -128,7 +128,7 @@ public function get_search_results()
             if (!empty($author) || !empty($keywords)) {
                 // Flood protection
                 if ($this->user->last_search && (time() - $this->user->last_search) < $this->user->g_search_flood && (time() - $this->user->last_search) >= 0) {
-                    message(sprintf($lang_search['Search flood'], $this->user->g_search_flood, $this->user->g_search_flood - (time() - $this->user->last_search)));
+                    message(sprintf(__('Search flood'), $this->user->g_search_flood, $this->user->g_search_flood - (time() - $this->user->last_search)));
                 }
 
                 if (!$this->user->is_guest) {
@@ -172,7 +172,7 @@ public function get_search_results()
                     $keywords_array = split_words($keywords, false);
 
                     if (empty($keywords_array)) {
-                        message($lang_search['No hits']);
+                        message(__('No hits'));
                     }
 
                     // Should we search in message body or topic subject specifically?
@@ -252,7 +252,7 @@ public function get_search_results()
                 }
 
                 // If it's a search for author name (and that author name isn't Guest)
-                if ($author && $author != 'guest' && $author != utf8_strtolower($lang_common['Guest'])) {
+                if ($author && $author != 'guest' && $author != utf8_strtolower(__('Guest'))) {
                     $username_exists = DB::for_table('users')->select('id')->where_like('username', $author)->find_many();
 
                     if ($username_exists) {
@@ -296,7 +296,7 @@ public function get_search_results()
 
                 $num_hits = count($search_ids);
                 if (!$num_hits) {
-                    message($lang_search['No hits']);
+                    message(__('No hits'));
                 }
             } elseif ($action == 'show_new' || $action == 'show_recent' || $action == 'show_replies' || $action == 'show_user_posts' || $action == 'show_user_topics' || $action == 'show_subscriptions' || $action == 'show_unanswered') {
                 $search_type = array('action', $action);
@@ -313,7 +313,7 @@ public function get_search_results()
                 // If it's a search for new posts since last visit
                 if ($action == 'show_new') {
                     if ($this->user->is_guest) {
-                        message($lang_common['No permission'], '403');
+                        message(__('No permission'), '403');
                     }
 
                     $result = DB::for_table('topics')
@@ -336,7 +336,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message($lang_search['No new posts']);
+                        message(__('No new posts'));
                     }
                 }
                 // If it's a search for recent posts (in a certain time interval)
@@ -360,7 +360,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message($lang_search['No recent posts']);
+                        message(__('No recent posts'));
                     }
                 }
                 // If it's a search for topics in which the user has posted
@@ -384,7 +384,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message($lang_search['No user posts']);
+                        message(__('No user posts'));
                     }
                 }
                 // If it's a search for posts by a specific user ID
@@ -406,7 +406,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message($lang_search['No user posts']);
+                        message(__('No user posts'));
                     }
 
                     // Pass on the user ID so that we can later know whose posts we're searching for
@@ -429,7 +429,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message($lang_search['No user topics']);
+                        message(__('No user topics'));
                     }
 
                     // Pass on the user ID so that we can later know whose topics we're searching for
@@ -438,7 +438,7 @@ public function get_search_results()
                 // If it's a search for subscribed topics
                 elseif ($action == 'show_subscriptions') {
                     if ($this->user->is_guest) {
-                        message($lang_common['Bad request'], '404');
+                        message(__('Bad request'), '404');
                     }
 
                     $result = DB::for_table('topics')
@@ -456,7 +456,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message($lang_search['No subscriptions']);
+                        message(__('No subscriptions'));
                     }
 
                     // Pass on user ID so that we can later know whose subscriptions we're searching for
@@ -479,7 +479,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message($lang_search['No unanswered']);
+                        message(__('No unanswered'));
                     }
                 }
 
@@ -491,7 +491,7 @@ public function get_search_results()
                 $pdo = DB::get_db();
                 $pdo = null;
             } else {
-                message($lang_common['Bad request'], '404');
+                message(__('Bad request'), '404');
             }
 
 
@@ -543,7 +543,7 @@ public function get_search_results()
 
         // If we're on the new posts search, display a "mark all as read" link
         if (!$this->user->is_guest && $search_type[0] == 'action' && $search_type[1] == 'show_new') {
-            $search['forum_actions'][] = '<a href="'.get_link('mark-read/').'">'.$lang_common['Mark all as read'].'</a>';
+            $search['forum_actions'][] = '<a href="'.get_link('mark-read/').'">'.__('Mark all as read').'</a>';
         }
 
         // Fetch results to display
@@ -578,7 +578,7 @@ public function get_search_results()
             $search['start_from'] = $start_from;
 
             // Generate paging links
-            $search['paging_links'] = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate_old($num_pages, $p, '?search_id='.$search_id);
+            $search['paging_links'] = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?search_id='.$search_id);
 
             // throw away the first $start_from of $search_ids, only keep the top $per_page of $search_ids
             $search_ids = array_slice($search_ids, $start_from, $per_page);
@@ -614,23 +614,23 @@ public function get_search_results()
                 $search['search_set'][] = $row;
             }
 
-            $search['crumbs_text']['show_as'] = $lang_search['Search'];
+            $search['crumbs_text']['show_as'] = __('Search');
 
             if ($search_type[0] == 'action') {
                 if ($search_type[1] == 'show_user_topics') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf($lang_search['Quick search show_user_topics'], feather_escape($search['search_set'][0]['poster'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_topics'), feather_escape($search['search_set'][0]['poster'])).'</a>';
                 } elseif ($search_type[1] == 'show_user_posts') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf($lang_search['Quick search show_user_posts'], feather_escape($search['search_set'][0]['pposter'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_posts'), feather_escape($search['search_set'][0]['pposter'])).'</a>';
                 } elseif ($search_type[1] == 'show_subscriptions') {
                     // Fetch username of subscriber
                     $subscriber_id = $search_type[2];
                     $subscriber_name = DB::for_table('users')->where('id', $subscriber_id)->find_one_col('username');
 
                     if (!$subscriber_name) {
-                        message($lang_common['Bad request'], '404');
+                        message(__('Bad request'), '404');
                     }
 
-                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf($lang_search['Quick search show_subscriptions'], feather_escape($subscriber_name)).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), feather_escape($subscriber_name)).'</a>';
                 } else {
                     $search_url = str_replace('_', '/', $search_type[1]);
                     $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/'.$search_url.'/').'">'.$lang_search['Quick search '.$search_type[1]].'</a>';
@@ -660,7 +660,7 @@ public function get_search_results()
 
     public function display_search_results($search)
     {
-        global $lang_forum, $lang_common, $lang_topic, $lang_search, $pd;
+        global $lang_search, $pd;
 
         // Get topic/forum tracking data
         if (!$this->user->is_guest) {
@@ -684,7 +684,7 @@ public function display_search_results($search)
                 if (!$this->user->is_guest && $cur_search['last_post'] > $this->user->last_visit && (!isset($tracked_topics['topics'][$cur_search['tid']]) || $tracked_topics['topics'][$cur_search['tid']] < $cur_search['last_post']) && (!isset($tracked_topics['forums'][$cur_search['forum_id']]) || $tracked_topics['forums'][$cur_search['forum_id']] < $cur_search['last_post'])) {
                     $cur_search['item_status'] = 'inew';
                     $cur_search['icon_type'] = 'icon icon-new';
-                    $cur_search['icon_text'] = $lang_topic['New icon'];
+                    $cur_search['icon_text'] = __('New icon');
                 } else {
                     $cur_search['item_status'] = '';
                     $cur_search['icon_text'] = '<!-- -->';
@@ -708,9 +708,7 @@ public function display_search_results($search)
                     'url_topic' => $url_topic,
                     'cur_search' => $cur_search,
                     'forum' => $forum,
-                    'lang_common' => $lang_common,
                     'lang_search' => $lang_search,
-                    'lang_topic' => $lang_topic,
                     )
                 );
             } else {
@@ -719,15 +717,15 @@ public function display_search_results($search)
                 $cur_search['item_status'] = ($topic_count % 2 == 0) ? 'roweven' : 'rowodd';
                 $cur_search['icon_type'] = 'icon';
 
-                $subject = '<a href="'.get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.feather_escape($cur_search['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_search['poster']).'</span>';
+                $subject = '<a href="'.get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.feather_escape($cur_search['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['poster']).'</span>';
 
                 if ($cur_search['sticky'] == '1') {
                     $cur_search['item_status'] .= ' isticky';
-                    $status_text[] = '<span class="stickytext">'.$lang_forum['Sticky'].'</span>';
+                    $status_text[] = '<span class="stickytext">'.__('Sticky').'</span>';
                 }
 
                 if ($cur_search['closed'] != '0') {
-                    $status_text[] = '<span class="closedtext">'.$lang_forum['Closed'].'</span>';
+                    $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_search['item_status'] .= ' iclosed';
                 }
 
@@ -735,7 +733,7 @@ public function display_search_results($search)
                     $cur_search['item_status'] .= ' inew';
                     $cur_search['icon_type'] = 'icon icon-new';
                     $subject = '<strong>'.$subject.'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_search['tid'].'/action/new/').'" title="'.$lang_common['New posts info'].'">'.$lang_common['New posts'].'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_search['tid'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
@@ -769,7 +767,6 @@ public function display_search_results($search)
                     'topic_count' => $topic_count,
                     'subject' => $subject,
                     'forum' => $forum,
-                    'lang_common' => $lang_common,
                     )
                 );
             }
@@ -802,7 +799,7 @@ public function get_list_forums()
 
         // We either show a list of forums of which multiple can be selected
         if ($this->config['o_search_all_forums'] == '1' || $this->user->is_admmod) {
-            $output .= "\t\t\t\t\t\t".'<div class="conl multiselect">'.$lang_search['Forum search']."\n";
+            $output .= "\t\t\t\t\t\t".'<div class="conl multiselect">'.__('Forum search')."\n";
             $output .= "\t\t\t\t\t\t".'<br />'."\n";
             $output .= "\t\t\t\t\t\t".'<div class="checklist">'."\n";
 
@@ -834,7 +831,7 @@ public function get_list_forums()
         }
         // ... or a simple select list for one forum only
         else {
-            $output .= "\t\t\t\t\t\t".'<label class="conl">'.$lang_search['Forum search']."\n";
+            $output .= "\t\t\t\t\t\t".'<label class="conl">'.__('Forum search')."\n";
             $output .= "\t\t\t\t\t\t".'<br />'."\n";
             $output .= "\t\t\t\t\t\t".'<select id="forum" name="forum">'."\n";
 
diff --git a/model/viewforum.php b/model/viewforum.php
index 1f87ec5d..7eee1586 100644
--- a/model/viewforum.php
+++ b/model/viewforum.php
@@ -25,7 +25,7 @@ public function __construct()
     // Returns basic informations about the forum
     public function get_info_forum($id)
     {
-        global $lang_common;
+
 
         $where_get_info_forum = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -58,7 +58,7 @@ public function get_info_forum($id)
         }
 
         if (!$cur_forum) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_forum;
@@ -87,7 +87,7 @@ public function sort_forum_by($sort_by_sql)
     // Adds relationship meta tags
     public function get_page_head($forum_id, $num_pages, $p, $url_forum)
     {
-        global $lang_common;
+
 
         $page_head = array();
         $page_head['canonical'] = "\t".'<link href="'.get_link('forum/'.$forum_id.'/'.$url_forum.'/').'" rel="canonical" />';
@@ -102,9 +102,9 @@ public function get_page_head($forum_id, $num_pages, $p, $url_forum)
         }
 
         if ($this->config['o_feed_type'] == '1') {
-            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss" title="'.$lang_common['RSS forum feed'].'" />';
+            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss" title="'.__('RSS forum feed').'" />';
         } elseif ($this->config['o_feed_type'] == '2') {
-            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom" title="'.$lang_common['Atom forum feed'].'" />';
+            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom" title="'.__('Atom forum feed').'" />';
         }
 
         return $page_head;
@@ -113,20 +113,18 @@ public function get_page_head($forum_id, $num_pages, $p, $url_forum)
     // Returns forum action
     public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
     {
-        global $lang_forum, $lang_common;
-
         $forum_actions = array();
 
         if (!$this->user->is_guest) {
             if ($subscriptions == 1) {
                 if ($is_subscribed) {
-                    $forum_actions[] = '<span>'.$lang_forum['Is subscribed'].' - </span><a href="'.get_link('unsubscribe/forum/'.$forum_id.'/').'">'.$lang_forum['Unsubscribe'].'</a>';
+                    $forum_actions[] = '<span>'.__('Is subscribed').' - </span><a href="'.get_link('unsubscribe/forum/'.$forum_id.'/').'">'.__('Unsubscribe').'</a>';
                 } else {
-                    $forum_actions[] = '<a href="'.get_link('subscribe/forum/'.$forum_id.'/').'">'.$lang_forum['Subscribe'].'</a>';
+                    $forum_actions[] = '<a href="'.get_link('subscribe/forum/'.$forum_id.'/').'">'.__('Subscribe').'</a>';
                 }
             }
 
-            $forum_actions[] = '<a href="'.get_link('mark-forum-read/'.$forum_id.'/').'">'.$lang_common['Mark forum read'].'</a>';
+            $forum_actions[] = '<a href="'.get_link('mark-forum-read/'.$forum_id.'/').'">'.__('Mark forum read').'</a>';
         }
 
         return $forum_actions;
@@ -135,8 +133,6 @@ public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
     // Returns the elements needed to display topics
     public function print_topics($forum_id, $sort_by, $start_from)
     {
-        global $lang_common, $lang_forum;
-
         // Get topic/forum tracking data
         if (!$this->user->is_guest) {
             $tracked_topics = get_tracked_topics();
@@ -197,7 +193,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 $url_subject = url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_formatted'] = '<a href="'.get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_formatted'] = '<a href="'.get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
                 } else {
                     $cur_topic['last_post_formatted'] = '- - -';
                 }
@@ -208,18 +204,18 @@ public function print_topics($forum_id, $sort_by, $start_from)
 
                 if ($cur_topic['sticky'] == '1') {
                     $cur_topic['item_status'] .= ' isticky';
-                    $status_text[] = '<span class="stickytext">'.$lang_forum['Sticky'].'</span>';
+                    $status_text[] = '<span class="stickytext">'.__('Sticky').'</span>';
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
-                    $status_text[] = '<span class="movedtext">'.$lang_forum['Moved'].'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
-                    $status_text[] = '<span class="closedtext">'.$lang_forum['Closed'].'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
 
@@ -227,7 +223,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_formatted'] = '<strong>'.$cur_topic['subject_formatted'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.$lang_common['New posts info'].'">'.$lang_common['New posts'].'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
diff --git a/model/viewtopic.php b/model/viewtopic.php
index a4dcb441..baa99464 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -25,8 +25,6 @@ public function __construct()
     // Redirects to a post in particular
     public function redirect_to_post($post_id)
     {
-        global $lang_common;
-
         $select_info_topic = array('topic_id', 'posted');
 
         $result = DB::for_table('posts')
@@ -35,7 +33,7 @@ public function redirect_to_post($post_id)
                       ->find_one();
 
         if (!$result) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         $post['topic_id'] = $result['topic_id'];
@@ -55,7 +53,7 @@ public function redirect_to_post($post_id)
     // Redirects to new posts or last post
     public function handle_actions($topic_id, $action)
     {
-        
+
         // If action=new, we redirect to the first new post (if any)
         if ($action == 'new') {
             if (!$this->user->is_guest) {
@@ -94,7 +92,7 @@ public function handle_actions($topic_id, $action)
     // Gets some info about the topic
     public function get_info_topic($id)
     {
-        global $lang_common;
+
 
         $where_get_info_topic = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -133,7 +131,7 @@ public function get_info_topic($id)
         }
 
         if (!$cur_topic) {
-            message($lang_common['Bad request'], '404');
+            message(__('Bad request'), '404');
         }
 
         return $cur_topic;
@@ -142,19 +140,17 @@ public function get_info_topic($id)
     // Generates the post link
     public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
     {
-        global $lang_topic;
-
         if ($closed == '0') {
             if (($post_replies == '' && $this->user->g_post_replies == '1') || $post_replies == '1' || $is_admmod) {
-                $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/reply/'.$topic_id.'/').'">'.$lang_topic['Post reply'].'</a></p>'."\n";
+                $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a></p>'."\n";
             } else {
                 $post_link = '';
             }
         } else {
-            $post_link = $lang_topic['Topic closed'];
+            $post_link = __('Topic closed');
 
             if ($is_admmod) {
-                $post_link .= ' / <a href="'.get_link('post/reply/'.$topic_id.'/').'">'.$lang_topic['Post reply'].'</a>';
+                $post_link .= ' / <a href="'.get_link('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a>';
             }
 
             $post_link = "\t\t\t".'<p class="postlink conr">'.$post_link.'</p>'."\n";
@@ -166,18 +162,16 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
     // Should we display the quickpost?
     public function is_quickpost($post_replies, $closed, $is_admmod)
     {
-        global $lang_common;
+
 
         $quickpost = false;
         if ($this->config['o_quickpost'] == '1' && ($post_replies == '1' || ($post_replies == '' && $this->user->g_post_replies == '1')) && ($closed == '0' || $is_admmod)) {
-            // Load the post.php language file
-            require FEATHER_ROOT.'lang/'.$this->user->language.'/post.php';
 
-            $required_fields = array('req_message' => $lang_common['Message']);
+            $required_fields = array('req_message' => __('Message'));
             if ($this->user->is_guest) {
-                $required_fields['req_username'] = $lang_post['Guest name'];
+                $required_fields['req_username'] = __('Guest name');
                 if ($this->config['p_force_guest_email'] == '1') {
-                    $required_fields['req_email'] = $lang_common['Email'];
+                    $required_fields['req_email'] = __('Email');
                 }
             }
             $quickpost = true;
@@ -189,14 +183,12 @@ public function is_quickpost($post_replies, $closed, $is_admmod)
     // Subscraction link
     public function get_subscraction($is_subscribed, $topic_id)
     {
-        global $lang_topic;
-
         if (!$this->user->is_guest && $this->config['o_topic_subscriptions'] == '1') {
             if ($is_subscribed) {
                 // I apologize for the variable naming here. It's a mix of subscription and action I guess :-)
-                $subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.$lang_topic['Is subscribed'].' - </span><a href="'.get_link('unsubscribe/topic/'.$topic_id.'/').'">'.$lang_topic['Unsubscribe'].'</a></p>'."\n";
+                $subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.__('Is subscribed').' - </span><a href="'.get_link('unsubscribe/topic/'.$topic_id.'/').'">'.__('Unsubscribe').'</a></p>'."\n";
             } else {
-                $subscraction = "\t\t".'<p class="subscribelink clearb"><a href="'.get_link('subscribe/topic/'.$topic_id.'/').'">'.$lang_topic['Subscribe'].'</a></p>'."\n";
+                $subscraction = "\t\t".'<p class="subscribelink clearb"><a href="'.get_link('subscribe/topic/'.$topic_id.'/').'">'.__('Subscribe').'</a></p>'."\n";
             }
         } else {
             $subscraction = '';
@@ -208,7 +200,7 @@ public function get_subscraction($is_subscribed, $topic_id)
     // Adds relationship meta tags
     public function get_page_head($topic_id, $num_pages, $p, $url_topic)
     {
-        global $lang_common;
+
 
         $page_head = array();
         $page_head['canonical'] = "\t".'<link href="'.get_link('topic/'.$topic_id.'/'.$url_topic.'/').'" rel="canonical" />';
@@ -223,9 +215,9 @@ public function get_page_head($topic_id, $num_pages, $p, $url_topic)
         }
 
         if ($this->config['o_feed_type'] == '1') {
-            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=rss" title="'.$lang_common['RSS topic feed'].'" />';
+            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=rss" title="'.__('RSS topic feed').'" />';
         } elseif ($this->config['o_feed_type'] == '2') {
-            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=atom" title="'.$lang_common['Atom topic feed'].'" />';
+            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=atom" title="'.__('Atom topic feed').'" />';
         }
 
         return $page_head;
@@ -234,7 +226,7 @@ public function get_page_head($topic_id, $num_pages, $p, $url_topic)
     // Prints the posts
     public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
     {
-        global $lang_topic, $lang_common, $pd;
+        global $pd;
 
         $post_data = array();
 
@@ -265,9 +257,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
             ->select_many($select_print_posts)
             ->inner_join('users', array('u.id', '=', 'p.poster_id'), 'u')
             ->inner_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
-            ->left_outer_join('online', array('o.user_id', '=', 'u.id'), 'o')
-            ->left_outer_join('online', array('o2.user_id', '!=', 1), 'o2', true)
-            ->left_outer_join('online', array('o.idle', '=', 0), null, true)
+            ->raw_join('LEFT OUTER JOIN '.$this->feather->prefix.'online', "o.user_id!=1 AND o.idle=0 AND o.user_id=u.id", 'o')
             ->where_in('p.id', $post_ids)
             ->order_by('p.id')
             ->find_array();
@@ -296,7 +286,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 }
 
                 // Format the online indicator
-                $cur_post['is_online_formatted'] = ($cur_post['is_online'] == $cur_post['poster_id']) ? '<strong>'.$lang_topic['Online'].'</strong>' : '<span>'.$lang_topic['Offline'].'</span>';
+                $cur_post['is_online_formatted'] = ($cur_post['is_online'] == $cur_post['poster_id']) ? '<strong>'.__('Online').'</strong>' : '<span>'.__('Offline').'</span>';
 
                 if ($this->config['o_avatars'] == '1' && $this->user->show_avatars != '0') {
                     if (isset($avatar_cache[$cur_post['poster_id']])) {
@@ -313,20 +303,20 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                             $cur_post['location'] = censor_words($cur_post['location']);
                         }
 
-                        $cur_post['user_info'][] = '<dd><span>'.$lang_topic['From'].' '.feather_escape($cur_post['location']).'</span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.__('From').' '.feather_escape($cur_post['location']).'</span></dd>';
                     }
 
-                    $cur_post['user_info'][] = '<dd><span>'.$lang_topic['Registered'].' '.format_time($cur_post['registered'], true).'</span></dd>';
+                    $cur_post['user_info'][] = '<dd><span>'.__('Registered').' '.format_time($cur_post['registered'], true).'</span></dd>';
 
                     if ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) {
-                        $cur_post['user_info'][] = '<dd><span>'.$lang_topic['Posts'].' '.forum_number_format($cur_post['num_posts']).'</span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.__('Posts').' '.forum_number_format($cur_post['num_posts']).'</span></dd>';
                     }
 
                     // Now let's deal with the contact links (Email and URL)
                     if ((($cur_post['email_setting'] == '0' && !$this->user->is_guest) || $this->user->is_admmod) && $this->user->g_send_email == '1') {
-                        $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['email']).'">'.$lang_common['Email'].'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['email']).'">'.__('Email').'</a></span>';
                     } elseif ($cur_post['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.get_link('mail/'.$cur_post['poster_id'].'/').'">'.$lang_common['Email'].'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.get_link('mail/'.$cur_post['poster_id'].'/').'">'.__('Email').'</a></span>';
                     }
 
                     if ($cur_post['url'] != '') {
@@ -334,21 +324,21 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                             $cur_post['url'] = censor_words($cur_post['url']);
                         }
 
-                        $cur_post['user_contacts'][] = '<span class="website"><a href="'.feather_escape($cur_post['url']).'" rel="nofollow">'.$lang_topic['Website'].'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="website"><a href="'.feather_escape($cur_post['url']).'" rel="nofollow">'.__('Website').'</a></span>';
                     }
                 }
 
                 if ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && $this->user->g_mod_promote_users == '1')) {
                     if ($cur_post['g_promote_next_group']) {
-                        $cur_post['user_info'][] = '<dd><span><a href="'.get_base_url().'/user/'.$cur_post['poster_id'].'/action/promote/pid/'.$cur_post['id'].'">'.$lang_topic['Promote user'].'</a></span></dd>';
+                        $cur_post['user_info'][] = '<dd><span><a href="'.get_base_url().'/user/'.$cur_post['poster_id'].'/action/promote/pid/'.$cur_post['id'].'">'.__('Promote user').'</a></span></dd>';
                     }
                 }
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="'.get_link('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.$lang_topic['IP address logged'].'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.get_link('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
 
                     if ($cur_post['admin_note'] != '') {
-                        $cur_post['user_info'][] = '<dd><span>'.$lang_topic['Note'].' <strong>'.feather_escape($cur_post['admin_note']).'</strong></span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.__('Note').' <strong>'.feather_escape($cur_post['admin_note']).'</strong></span></dd>';
                     }
                 }
             }
@@ -358,41 +348,41 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 $cur_post['user_title_formatted'] = get_title($cur_post);
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="moderate.php?get_host='.$cur_post['id'].'" title="'.feather_escape($cur_post['poster_ip']).'">'.$lang_topic['IP address logged'].'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="moderate.php?get_host='.$cur_post['id'].'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
                 }
 
                 if ($this->config['o_show_user_info'] == '1' && $cur_post['poster_email'] != '' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-                    $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['poster_email']).'">'.$lang_common['Email'].'</a></span>';
+                    $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['poster_email']).'">'.__('Email').'</a></span>';
                 }
             }
 
             // Generation post action array (quote, edit, delete etc.)
             if (!$is_admmod) {
                 if (!$this->user->is_guest) {
-                    $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.get_link('report/'.$cur_post['id'].'/').'">'.$lang_topic['Report'].'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.get_link('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
                 }
 
                 if ($cur_topic['closed'] == '0') {
                     if ($cur_post['poster_id'] == $this->user->id) {
                         if ((($start_from + $post_count) == 1 && $this->user->g_delete_topics == '1') || (($start_from + $post_count) > 1 && $this->user->g_delete_posts == '1')) {
-                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.$lang_topic['Delete'].'</a></span></li>';
+                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
                         }
                         if ($this->user->g_edit_posts == '1') {
-                            $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.$lang_topic['Edit'].'</a></span></li>';
+                            $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
                         }
                     }
 
                     if (($cur_topic['post_replies'] == '' && $this->user->g_post_replies == '1') || $cur_topic['post_replies'] == '1') {
-                        $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.$lang_topic['Quote'].'</a></span></li>';
+                        $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
                     }
                 }
             } else {
-                $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.get_link('report/'.$cur_post['id'].'/').'">'.$lang_topic['Report'].'</a></span></li>';
+                $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.get_link('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
                 if ($this->user->g_id == FEATHER_ADMIN || !in_array($cur_post['poster_id'], $admin_ids)) {
-                    $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('delete/'.$cur_post['id'].'/').'">'.$lang_topic['Delete'].'</a></span></li>';
-                    $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.$lang_topic['Edit'].'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
                 }
-                $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.$lang_topic['Quote'].'</a></span></li>';
+                $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
             }
 
             // Perform the main parsing of the message (BBCode, smilies, censor words etc)
diff --git a/readme.md b/readme.md
index 3773e5a1..779bef7f 100644
--- a/readme.md
+++ b/readme.md
@@ -16,17 +16,28 @@ This is __FeatherBB v1.0.0 Beta__. It is intended for testing purposes only and
 for use in a production environment. Please report all the bugs you may encounter to
 the forums or in the GitHub bug tracker.
 
-* Integration with Slim Framework v2.6.2
-* New parser
-* MVC architecture
-* URL rewriting
-* Routing system
-* Responsive default style
-* Database schema compatible with FluxBB
-* Antispam protection
-* Themes fully customizables
-* PHP 4 support dropped
-* PSR-2 compliant
+### Beta 2 (2015-08-11)
+
+* New DB Layer [[adaur](http://github.com/adaur)]
+* Flash messages [[beaver](http://github.com/beaver-dev)]
+* BBCode editor [[beaver](http://github.com/beaver-dev)]
+* CSRF tokens [[capkokoon](http://github.com/capkokoon)]
+* Cookie encryption improved [[capkokoon](http://github.com/capkokoon)]
+* htaccess management improved [[adaur](http://github.com/adaur)]
+
+### Beta 1  (2015-07-09)
+
+* Integration with Slim Framework v2.6.2 [[adaur](http://github.com/adaur)]
+* New parser [[ridgerunner](http://github.com/ridgerunner)]
+* MVC architecture [[adaur](http://github.com/adaur)]
+* URL rewriting [[adaur](http://github.com/adaur)]
+* Routing system [[adaur](http://github.com/adaur)]
+* Responsive default style [[Magicalex](http://github.com/Magicalex)]
+* Database schema compatible with FluxBB [[adaur](http://github.com/adaur)]
+* Antispam protection [[adaur](http://github.com/adaur)]
+* Themes fully customizables [[adaur](http://github.com/adaur)]
+* PHP 4 support dropped [[adaur](http://github.com/adaur)]
+* PSR-2 compliant [[Magicalex](http://github.com/magicalex)]
 
 ## Requirements
 
@@ -36,7 +47,7 @@ the forums or in the GitHub bug tracker.
 
 ## Recommendations
 
-* Make use of a PHP accelerator such as APC or XCache
+* Make use of a PHP accelerator such as OPCache
 * Make sure PHP has the zlib module installed to allow FeatherBB to gzip output
 
 ## Links
@@ -46,3 +57,10 @@ the forums or in the GitHub bug tracker.
 * Community: http://featherbb.org/forums/
 * Chat: https://gitter.im/featherbb/featherbb
 * Development: http://github.com/featherbb/featherbb
+
+## Contributors
+
+* [[adaur](http://github.com/adaur)] Project leader
+* [[capkokoon](http://github.com/capkokoon)] contributor
+* [[beaver](http://github.com/beaver-dev)] contributor
+* [[Magicalex](http://github.com/magicalex)] contributor
diff --git a/style/FeatherBB/view/admin/groups/add_edit_group.php b/style/FeatherBB/view/admin/groups/add_edit_group.php
index 8c4ddb91..3bd8018c 100644
--- a/style/FeatherBB/view/admin/groups/add_edit_group.php
+++ b/style/FeatherBB/view/admin/groups/add_edit_group.php
@@ -40,7 +40,7 @@
 									<th scope="row"><?php echo $lang_admin_groups['User title label'] ?></th>
 									<td>
 										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
-										<span><?php printf($lang_admin_groups['User title help'], ($group['info']['g_id'] != FEATHER_GUEST ? $lang_common['Member'] : $lang_common['Guest'])) ?></span>
+										<span><?php printf($lang_admin_groups['User title help'], ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
 									</td>
 								</tr>
 <?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
diff --git a/style/FeatherBB/view/delete.php b/style/FeatherBB/view/delete.php
index 9d6afff9..65f2440b 100644
--- a/style/FeatherBB/view/delete.php
+++ b/style/FeatherBB/view/delete.php
@@ -16,26 +16,26 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="index.php"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="index.php"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_delete['Delete post'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Delete post') ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_delete['Delete post'] ?></span></h2>
+	<h2><span><?php echo __('Delete post') ?></span></h2>
 	<div class="box">
 		<form method="post" action="<?php echo get_link('delete/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? $lang_delete['Topic by'] : $lang_delete['Reply by'], '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
-					<p><?php echo($is_topic_post) ? '<strong>'.$lang_delete['Topic warning'].'</strong>' : '<strong>'.$lang_delete['Warning'].'</strong>' ?><br /><?php echo $lang_delete['Delete info'] ?></p>
+					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
+					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php echo __('Delete info') ?></p>
 				</div>
 			</div>
-			<p class="buttons"><input type="submit" name="delete" value="<?php echo $lang_delete['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/edit.php b/style/FeatherBB/view/edit.php
index 3d91e362..92ed1fe1 100644
--- a/style/FeatherBB/view/edit.php
+++ b/style/FeatherBB/view/edit.php
@@ -19,10 +19,10 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_post['Edit post'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Edit post') ?></strong></li>
 		</ul>
 	</div>
 </div>
@@ -33,10 +33,10 @@
 if (!empty($errors)) :
 ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo $lang_post['Post errors'] ?></span></h2>
+	<h2><span><?php echo __('Post errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo $lang_post['Post errors info'] ?></p>
+			<p><?php echo __('Post errors info') ?></p>
 			<ul class="error-list">
 <?php
     foreach ($errors as $cur_error) {
@@ -51,7 +51,7 @@
 elseif ($feather->request->post('preview')):
 ?>
 <div id="postpreview" class="blockpost">
-	<h2><span><?php echo $lang_post['Post preview'] ?></span></h2>
+	<h2><span><?php echo __('Post preview') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -68,31 +68,32 @@
 endif;
 ?>
 <!-- Init BBcode editor toolbar -->
+<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
 </script>
 <script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
 <div id="editform" class="blockform">
-	<h2><span><?php echo $lang_post['Edit post'] ?></span></h2>
+	<h2><span><?php echo __('Edit post') ?></span></h2>
 	<div class="box">
 		<form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_post['Edit post legend'] ?></legend>
+					<legend><?php echo __('Edit post legend') ?></legend>
 					<input type="hidden" name="form_sent" value="1" />
 					<div class="infldset txtarea">
-<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo $lang_common['Subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="help.php#img" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="help.php#smilies" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -102,7 +103,7 @@
 ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_common['Options'] ?></legend>
+					<legend><?php echo __('Options') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
@@ -113,7 +114,7 @@
 <?php
 endif;
 ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
index 6249ae34..0b1d2ae7 100644
--- a/style/FeatherBB/view/footer.php
+++ b/style/FeatherBB/view/footer.php
@@ -11,7 +11,7 @@
 </div>
 
 <div id="brdfooter" class="block">
-	<h2><span><?php echo $lang_common['Board footer'] ?></span></h2>
+	<h2><span><?php echo __('Board footer') ?></span></h2>
 	<div class="box">
 <?php
 
@@ -20,8 +20,8 @@
 
     if ($footer_style == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.$lang_forum['Mod controls'].'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.$lang_common['Moderate forum'].'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($footer_style == 'viewtopic') {
         if (isset($pid)) {
@@ -34,22 +34,22 @@
 
 
         echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.$lang_topic['Mod controls'].'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.$lang_common['Moderate topic'].'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.$lang_common['All'].'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.$lang_common['Moderate topic'].'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.$lang_common['Move topic'].'</a></span></dd>'."\n";
+        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
 
         if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.$lang_common['Open topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.$lang_common['Close topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
         }
 
         if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.$lang_common['Unstick topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.$lang_common['Stick topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
         }
 
         echo "\t\t\t".'</dl>'."\n";
@@ -89,26 +89,26 @@
 
 if ($footer_style == 'index') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.$lang_common['RSS active topics feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.$lang_common['Atom active topics feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewforum') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.$lang_common['RSS forum feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.$lang_common['Atom forum feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewtopic') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.$lang_common['RSS topic feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.$lang_common['Atom topic feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
     }
 }
 
 ?>
-				<p id="poweredby"><?php printf($lang_common['Powered by'], '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
+				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
 			</div>
 			<div class="clearer"></div>
 		</div>
@@ -122,13 +122,13 @@
 
     // Calculate script generation time
     $time_diff = sprintf('%.3f', get_microtime() - $feather_start);
-    echo sprintf($lang_common['Querytime'], $time_diff, count(\DB::get_query_log()[0]));
+    echo sprintf(__('Querytime'), $time_diff, count(\DB::get_query_log()[0]));
 
     if (function_exists('memory_get_usage')) {
-        echo ' - '.sprintf($lang_common['Memory usage'], file_size(memory_get_usage()));
+        echo ' - '.sprintf(__('Memory usage'), file_size(memory_get_usage()));
 
         if (function_exists('memory_get_peak_usage')) {
-            echo ' '.sprintf($lang_common['Peak usage'], file_size(memory_get_peak_usage()));
+            echo ' '.sprintf(__('Peak usage'), file_size(memory_get_peak_usage()));
         }
     }
 
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
index ec4c4b49..7b2b8d28 100644
--- a/style/FeatherBB/view/header.php
+++ b/style/FeatherBB/view/header.php
@@ -9,7 +9,7 @@
 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang_common['lang_identifier'] ?>" lang="<?php echo $lang_common['lang_identifier'] ?>" dir="<?php echo $lang_common['lang_direction'] ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo __('lang_identifier') ?>" lang="<?php echo __('lang_identifier') ?>" dir="<?php echo __('lang_direction') ?>">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -57,7 +57,7 @@ function process_form(the_form)
                         var elem = the_form.elements[i];
                         if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
                         {
-                            alert('"' + required_fields[elem.name] + '" <?php echo $lang_common['required field'] ?>');
+                            alert('"' + required_fields[elem.name] + '" <?php echo __('required field') ?>');
                             elem.focus();
                             return false;
                         }
@@ -89,7 +89,7 @@ function process_form(the_form)
                 <div class="navbar-right">
                     <form method="get" action="search" class="nav-search">
                         <input type="hidden" name="action" value="search">
-                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php echo $lang_common['Search'] ?>">
+                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php echo __('Search') ?>">
                     </form>
                 </div>
             </div>
@@ -111,7 +111,7 @@ function process_form(the_form)
         </div>
         <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
             <div id="announce" class="block">
-                <div class="hd"><h2><span><?php echo $lang_common['Announcement'] ?></span></h2></div>
+                <div class="hd"><h2><span><?php echo __('Announcement') ?></span></h2></div>
                 <div class="box">
                     <div id="announce-block" class="inbox">
                         <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
@@ -122,7 +122,7 @@ function process_form(the_form)
         <?php if (isset($flash['message'])) : ?>
             <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
             <div id="msgflash" class="block">
-                <h2><span><?php echo $lang_common['Info'] ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
+                <h2><span><?php echo __('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
                 <div class="box">
                     <div class="inbox">
                         <p><?php echo feather_escape($flash['message']) ?></p>
diff --git a/style/FeatherBB/view/help.php b/style/FeatherBB/view/help.php
index fd511285..a7f9300d 100644
--- a/style/FeatherBB/view/help.php
+++ b/style/FeatherBB/view/help.php
@@ -14,113 +14,113 @@
 
 ?>
 
-<h2><span><?php echo $lang_help['BBCode'] ?></span></h2>
+<h2><span><?php echo __('BBCode') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="bbcode"></a><?php echo $lang_help['BBCode info 1'] ?></p>
-		<p><?php echo $lang_help['BBCode info 2'] ?></p>
+		<p><a name="bbcode"></a><?php echo __('BBCode info 1') ?></p>
+		<p><?php echo __('BBCode info 2') ?></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Text style'] ?></span></h2>
+<h2><span><?php echo __('Text style') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Text style info'] ?></p>
-		<p><code>[b]<?php echo $lang_help['Bold text'] ?>[/b]</code> <?php echo $lang_help['produces'] ?> <samp><strong><?php echo $lang_help['Bold text'] ?></strong></samp></p>
-		<p><code>[u]<?php echo $lang_help['Underlined text'] ?>[/u]</code> <?php echo $lang_help['produces'] ?> <samp><span class="bbu"><?php echo $lang_help['Underlined text'] ?></span></samp></p>
-		<p><code>[i]<?php echo $lang_help['Italic text'] ?>[/i]</code> <?php echo $lang_help['produces'] ?> <samp><em><?php echo $lang_help['Italic text'] ?></em></samp></p>
-		<p><code>[s]<?php echo $lang_help['Strike-through text'] ?>[/s]</code> <?php echo $lang_help['produces'] ?> <samp><span class="bbs"><?php echo $lang_help['Strike-through text'] ?></span></samp></p>
-		<p><code>[del]<?php echo $lang_help['Deleted text'] ?>[/del]</code> <?php echo $lang_help['produces'] ?> <samp><del><?php echo $lang_help['Deleted text'] ?></del></samp></p>
-		<p><code>[ins]<?php echo $lang_help['Inserted text'] ?>[/ins]</code> <?php echo $lang_help['produces'] ?> <samp><ins><?php echo $lang_help['Inserted text'] ?></ins></samp></p>
-		<p><code>[em]<?php echo $lang_help['Emphasised text'] ?>[/em]</code> <?php echo $lang_help['produces'] ?> <samp><em><?php echo $lang_help['Emphasised text'] ?></em></samp></p>
-		<p><code>[color=#FF0000]<?php echo $lang_help['Red text'] ?>[/color]</code> <?php echo $lang_help['produces'] ?> <samp><span style="color: #ff0000"><?php echo $lang_help['Red text'] ?></span></samp></p>
-		<p><code>[color=blue]<?php echo $lang_help['Blue text'] ?>[/color]</code> <?php echo $lang_help['produces'] ?> <samp><span style="color: blue"><?php echo $lang_help['Blue text'] ?></span></samp></p>
-		<p><code>[h]<?php echo $lang_help['Heading text'] ?>[/h]</code> <?php echo $lang_help['produces'] ?></p> <div class="postmsg"><h5><?php echo $lang_help['Heading text'] ?></h5></div>
+		<p><?php echo __('Text style info') ?></p>
+		<p><code>[b]<?php echo __('Bold text') ?>[/b]</code> <?php echo __('produces') ?> <samp><strong><?php echo __('Bold text') ?></strong></samp></p>
+		<p><code>[u]<?php echo __('Underlined text') ?>[/u]</code> <?php echo __('produces') ?> <samp><span class="bbu"><?php echo __('Underlined text') ?></span></samp></p>
+		<p><code>[i]<?php echo __('Italic text') ?>[/i]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Italic text') ?></em></samp></p>
+		<p><code>[s]<?php echo __('Strike-through text') ?>[/s]</code> <?php echo __('produces') ?> <samp><span class="bbs"><?php echo __('Strike-through text') ?></span></samp></p>
+		<p><code>[del]<?php echo __('Deleted text') ?>[/del]</code> <?php echo __('produces') ?> <samp><del><?php echo __('Deleted text') ?></del></samp></p>
+		<p><code>[ins]<?php echo __('Inserted text') ?>[/ins]</code> <?php echo __('produces') ?> <samp><ins><?php echo __('Inserted text') ?></ins></samp></p>
+		<p><code>[em]<?php echo __('Emphasised text') ?>[/em]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Emphasised text') ?></em></samp></p>
+		<p><code>[color=#FF0000]<?php echo __('Red text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: #ff0000"><?php echo __('Red text') ?></span></samp></p>
+		<p><code>[color=blue]<?php echo __('Blue text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: blue"><?php echo __('Blue text') ?></span></samp></p>
+		<p><code>[h]<?php echo __('Heading text') ?>[/h]</code> <?php echo __('produces') ?></p> <div class="postmsg"><h5><?php echo __('Heading text') ?></h5></div>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Links and images'] ?></span></h2>
+<h2><span><?php echo __('Links and images') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Links info'] ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php echo $lang_help['This help page'] ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('/help') ?>"><?php echo $lang_help['This help page'] ?></a></samp></p>
-		<p><code>[email]myname@example.com[/email]</code> <?php echo $lang_help['produces'] ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
-		<p><code>[email=myname@example.com]<?php echo $lang_help['My email address'] ?>[/email]</code> <?php echo $lang_help['produces'] ?> <samp><a href="mailto:myname@example.com"><?php echo $lang_help['My email address'] ?></a></samp></p>
-		<p><code>[topic=1]<?php echo $lang_help['Test topic'] ?>[/topic]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo $lang_help['Test topic'] ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php echo $lang_help['Test post'] ?>[/post]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo $lang_help['Test post'] ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php echo $lang_help['Test forum'] ?>[/forum]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo $lang_help['Test forum'] ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php echo $lang_help['Test user'] ?>[/user]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo $lang_help['Test user'] ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
+		<p><?php echo __('Links info') ?></p>
+		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
+		<p><code>[url=/help/]<?php echo __('This help page') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php echo __('This help page') ?></a></samp></p>
+		<p><code>[email]myname@example.com[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
+		<p><code>[email=myname@example.com]<?php echo __('My email address') ?>[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com"><?php echo __('My email address') ?></a></samp></p>
+		<p><code>[topic=1]<?php echo __('Test topic') ?>[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test topic') ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php echo __('Test post') ?>[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo __('Test post') ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php echo __('Test forum') ?>[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test forum') ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php echo __('Test user') ?>[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo __('Test user') ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
 	</div>
 	<div class="inbox">
-		<p><a name="img"></a><?php echo $lang_help['Images info'] ?></p>
-		<p><code>[img=<?php echo $lang_help['FluxBB bbcode test'] ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php echo $lang_help['produces'] ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php echo $lang_help['FluxBB bbcode test'] ?>" /></samp></p>
+		<p><a name="img"></a><?php echo __('Images info') ?></p>
+		<p><code>[img=<?php echo __('FluxBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php echo __('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php echo __('FluxBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Quotes'] ?></span></h2>
+<h2><span><?php echo __('Quotes') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Quotes info'] ?></p>
-		<p><code>[quote=James]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
-		<p><?php echo $lang_help['produces quote box'] ?></p>
+		<p><?php echo __('Quotes info') ?></p>
+		<p><code>[quote=James]<?php echo __('Quote text') ?>[/quote]</code></p>
+		<p><?php echo __('produces quote box') ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><cite>James <?php echo $lang_common['wrote'] ?></cite><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
+			<div class="quotebox"><cite>James <?php echo __('wrote') ?></cite><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo $lang_help['Quotes info 2'] ?></p>
-		<p><code>[quote]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
-		<p><?php echo $lang_help['produces quote box'] ?></p>
+		<p><?php echo __('Quotes info 2') ?></p>
+		<p><code>[quote]<?php echo __('Quote text') ?>[/quote]</code></p>
+		<p><?php echo __('produces quote box') ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
+			<div class="quotebox"><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo $lang_help['quote note'] ?></p>
+		<p><?php echo __('quote note') ?></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Code'] ?></span></h2>
+<h2><span><?php echo __('Code') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Code info'] ?></p>
-		<p><code>[code]<?php echo $lang_help['Code text'] ?>[/code]</code></p>
-		<p><?php echo $lang_help['produces code box'] ?></p>
+		<p><?php echo __('Code info') ?></p>
+		<p><code>[code]<?php echo __('Code text') ?>[/code]</code></p>
+		<p><?php echo __('produces code box') ?></p>
 		<div class="postmsg">
-			<div class="codebox"><pre><code><?php echo $lang_help['Code text'] ?></code></pre></div>
+			<div class="codebox"><pre><code><?php echo __('Code text') ?></code></pre></div>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Lists'] ?></span></h2>
+<h2><span><?php echo __('Lists') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="lists"></a><?php echo $lang_help['List info'] ?></p>
-		<p><code>[list][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
-		<br /><span><?php echo $lang_help['produces list'] ?></span></p>
+		<p><a name="lists"></a><?php echo __('List info') ?></p>
+		<p><code>[list][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php echo __('produces list') ?></span></p>
 		<div class="postmsg">
-			<ul><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ul>
+			<ul><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ul>
 		</div>
-		<p><code>[list=1][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
-		<br /><span><?php echo $lang_help['produces decimal list'] ?></span></p>
+		<p><code>[list=1][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php echo __('produces decimal list') ?></span></p>
 		<div class="postmsg">
-			<ol class="decimal"><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ol>
+			<ol class="decimal"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
 		</div>
-		<p><code>[list=a][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
-		<br /><span><?php echo $lang_help['produces alpha list'] ?></span></p>
+		<p><code>[list=a][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php echo __('produces alpha list') ?></span></p>
 		<div class="postmsg">
-			<ol class="alpha"><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ol>
+			<ol class="alpha"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Nested tags'] ?></span></h2>
+<h2><span><?php echo __('Nested tags') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Nested tags info'] ?></p>
-		<p><code>[b][u]<?php echo $lang_help['Bold, underlined text'] ?>[/u][/b]</code> <?php echo $lang_help['produces'] ?> <samp><strong><span class="bbu"><?php echo $lang_help['Bold, underlined text'] ?></span></strong></samp></p>
+		<p><?php echo __('Nested tags info') ?></p>
+		<p><code>[b][u]<?php echo __('Bold, underlined text') ?>[/u][/b]</code> <?php echo __('produces') ?> <samp><strong><span class="bbu"><?php echo __('Bold, underlined text') ?></span></strong></samp></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Smilies'] ?></span></h2>
+<h2><span><?php echo __('Smilies') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="smilies"></a><?php echo $lang_help['Smilies info'] ?></p>
+		<p><a name="smilies"></a><?php echo __('Smilies info') ?></p>
 <?php
 
 // Display the smiley set
@@ -133,7 +133,7 @@
 }
 
 foreach ($smiley_groups as $smiley_img => $smiley_texts) {
-    echo "\t\t<p><code>". implode('</code> ' .$lang_common['and']. ' <code>', $smiley_texts).'</code> <span>' .$lang_help['produces']. '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
+    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
 }
 
 ?>
diff --git a/style/FeatherBB/view/index.php b/style/FeatherBB/view/index.php
index 1ffce864..d9d5ca64 100644
--- a/style/FeatherBB/view/index.php
+++ b/style/FeatherBB/view/index.php
@@ -13,7 +13,7 @@
 }
 
 if (empty($index_data)): ?>
-    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php echo $lang_index['Empty board'] ?></p></div></div></div>
+    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php echo __('Empty board') ?></p></div></div></div>
 <?php endif;
 foreach ($index_data as $forum) {
     if ($forum->cid != $cur_cat) :
@@ -33,10 +33,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Forum'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_index['Topics'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_common['Posts'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Forum') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Topics') ?></th>
+					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -80,27 +80,27 @@
 endif;
 ?>
 <div id="brdstats" class="block">
-	<h2><span><?php echo $lang_index['Board info'] ?></span></h2>
+	<h2><span><?php echo __('Board info') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<dl class="conr">
-				<dt><strong><?php echo $lang_index['Board stats'] ?></strong></dt>
-				<dd><span><?php printf($lang_index['No of users'], '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf($lang_index['No of topics'], '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
-				<dd><span><?php printf($lang_index['No of posts'], '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
+				<dt><strong><?php echo __('Board stats') ?></strong></dt>
+				<dd><span><?php printf(__('No of users'), '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of topics'), '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of posts'), '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
 			</dl>
 			<dl class="conl">
-				<dt><strong><?php echo $lang_index['User info'] ?></strong></dt>
-				<dd><span><?php printf($lang_index['Newest user'], $stats['newest_user']) ?></span></dd>
+				<dt><strong><?php echo __('User info') ?></strong></dt>
+				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
 				<?php if ($feather_config['o_users_online'] == 1) : ?>
-				<dd><span><?php printf($lang_index['Users online'], '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf($lang_index['Guests online'], '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Guests online'), '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
 				<?php endif; ?>
 			</dl>
 			<?php
             if ($feather_config['o_users_online'] == 1) :
                 if ($online['num_users'] > 0) {
-                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.$lang_index['Online'].' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
+                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
                 } else {
                     echo "\t\t\t".'<div class="clearer"></div>'."\n";
                 }
diff --git a/style/FeatherBB/view/login/form.php b/style/FeatherBB/view/login/form.php
index 8d35d8b7..fb8f2404 100644
--- a/style/FeatherBB/view/login/form.php
+++ b/style/FeatherBB/view/login/form.php
@@ -14,29 +14,29 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_common['Login'] ?></span></h2>
+	<h2><span><?php echo __('Login') ?></span></h2>
 	<div class="box">
 		<form id="login" method="post" action="<?php echo get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_login['Login legend'] ?></legend>
+					<legend><?php echo __('Login legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="conl required"><strong><?php echo $lang_common['Username'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
+						<label class="conl required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
+						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
 
 						<div class="rbox clearb">
-							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo $lang_login['Remember me'] ?><br /></label>
+							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo __('Remember me') ?><br /></label>
 						</div>
 
-						<p class="clearb"><?php echo $lang_login['Login info'] ?></p>
-						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php echo $lang_login['Not registered'] ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php echo $lang_login['Forgotten pass'] ?></a></span></p>
+						<p class="clearb"><?php echo __('Login info') ?></p>
+						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php echo __('Not registered') ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php echo __('Forgotten pass') ?></a></span></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="login" value="<?php echo $lang_common['Login'] ?>" tabindex="4" /></p>
+			<p class="buttons"><input type="submit" name="login" value="<?php echo __('Login') ?>" tabindex="4" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/login/password_forgotten.php b/style/FeatherBB/view/login/password_forgotten.php
index 2712f630..979b915c 100644
--- a/style/FeatherBB/view/login/password_forgotten.php
+++ b/style/FeatherBB/view/login/password_forgotten.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo $lang_login['New password errors'] ?></span></h2>
+	<h2><span><?php echo __('New password errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo $lang_login['New passworderrors info'] ?></p>
+			<p><?php echo __('New passworderrors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,21 +37,21 @@
 }
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_login['Request pass'] ?></span></h2>
+	<h2><span><?php echo __('Request pass') ?></span></h2>
 	<div class="box">
 		<form id="request_pass" method="post" action="<?php echo get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_login['Request pass legend'] ?></legend>
+					<legend><?php echo __('Request pass legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_common['Email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
-						<p><?php echo $lang_login['Request pass info'] ?></p>
+						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
+						<p><?php echo __('Request pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="request_pass" value="<?php echo $lang_common['Submit'] ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a><?php endif; ?></p>
+			<p class="buttons"><input type="submit" name="request_pass" value="<?php echo __('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a><?php endif; ?></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/message.php b/style/FeatherBB/view/message.php
index 7f26edad..d376bd09 100644
--- a/style/FeatherBB/view/message.php
+++ b/style/FeatherBB/view/message.php
@@ -14,11 +14,11 @@
 
 ?>
 <div id="msg" class="block">
-	<h2><span><?php echo $lang_common['Info'] ?></span></h2>
+	<h2><span><?php echo __('Info') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<p><?php echo $message ?></p>
-<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php echo __('Go back') ?></a></p>
 <?php endif;
     ?>		</div>
 	</div>
diff --git a/style/FeatherBB/view/misc/email.php b/style/FeatherBB/view/misc/email.php
index 054c7f34..7004040d 100644
--- a/style/FeatherBB/view/misc/email.php
+++ b/style/FeatherBB/view/misc/email.php
@@ -14,24 +14,24 @@
 
 ?>
 <div id="emailform" class="blockform">
-	<h2><span><?php echo $lang_misc['Send email to'] ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
+	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="<?php echo get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Write email'] ?></legend>
+					<legend><?php echo __('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
+						<p><?php echo __('Email disclosure note') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/misc/report.php b/style/FeatherBB/view/misc/report.php
index 6cf01c90..121feac2 100644
--- a/style/FeatherBB/view/misc/report.php
+++ b/style/FeatherBB/view/misc/report.php
@@ -16,29 +16,29 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Report post'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Report post') ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div id="reportform" class="blockform">
-	<h2><span><?php echo $lang_misc['Report post'] ?></span></h2>
+	<h2><span><?php echo __('Report post') ?></span></h2>
 	<div class="box">
 		<form id="report" method="post" action="<?php echo get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Reason desc'] ?></legend>
+					<legend><?php echo __('Reason desc') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_misc['Reason'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
+						<label class="required"><strong><?php echo __('Reason') ?> <span><?php echo __('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/misc/rules.php b/style/FeatherBB/view/misc/rules.php
index 00cff256..d32a805e 100644
--- a/style/FeatherBB/view/misc/rules.php
+++ b/style/FeatherBB/view/misc/rules.php
@@ -14,7 +14,7 @@
 
 ?>
 <div id="rules" class="block">
-	<div class="hd"><h2><span><?php echo $lang_register['Forum rules'] ?></span></h2></div>
+	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<div id="rules-block" class="inbox">
 			<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
diff --git a/style/FeatherBB/view/moderate/delete_posts.php b/style/FeatherBB/view/moderate/delete_posts.php
index d3a8ea76..4b95a5f1 100644
--- a/style/FeatherBB/view/moderate/delete_posts.php
+++ b/style/FeatherBB/view/moderate/delete_posts.php
@@ -14,20 +14,20 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Delete posts'] ?></span></h2>
+	<h2><span><?php echo __('Delete posts') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm delete legend'] ?></legend>
+					<legend><?php echo __('Confirm delete legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<p><?php echo $lang_misc['Delete posts comply'] ?></p>
+						<p><?php echo __('Delete posts comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/delete_topics.php b/style/FeatherBB/view/moderate/delete_topics.php
index d18c7394..e414f734 100644
--- a/style/FeatherBB/view/moderate/delete_topics.php
+++ b/style/FeatherBB/view/moderate/delete_topics.php
@@ -15,20 +15,20 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Delete topics'] ?></span></h2>
+	<h2><span><?php echo __('Delete topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm delete legend'] ?></legend>
+					<legend><?php echo __('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_misc['Delete topics comply'] ?></p>
+						<p><?php echo __('Delete topics comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/merge_topics.php b/style/FeatherBB/view/moderate/merge_topics.php
index 1c5cc5a4..b55f586b 100644
--- a/style/FeatherBB/view/moderate/merge_topics.php
+++ b/style/FeatherBB/view/moderate/merge_topics.php
@@ -15,22 +15,22 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Merge topics'] ?></span></h2>
+	<h2><span><?php echo __('Merge topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm merge legend'] ?></legend>
+					<legend><?php echo __('Confirm merge legend') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1" /><?php echo $lang_misc['Leave redirect'] ?><br /></label>
+							<label><input type="checkbox" name="with_redirect" value="1" /><?php echo __('Leave redirect') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo $lang_misc['Merge'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo __('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/moderator_forum.php b/style/FeatherBB/view/moderate/moderator_forum.php
index af90498d..bf893ce4 100644
--- a/style/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/FeatherBB/view/moderate/moderator_forum.php
@@ -17,9 +17,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -38,11 +38,11 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Replies'] ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
-<?php endif; ?>					<th class="tcr"><?php echo $lang_common['Last post'] ?></th>
-					<th class="tcmod" scope="col"><?php echo $lang_misc['Select'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
+<?php endif; ?>					<th class="tcr"><?php echo __('Last post') ?></th>
+					<th class="tcmod" scope="col"><?php echo __('Select') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -74,7 +74,7 @@
             if (empty($topic_data)):
                 $colspan = ($feather_config['o_topic_views'] == '1') ? 5 : 4;
                 $button_status = ' disabled="disabled"';
-                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.$lang_forum['Empty forum'].'</td></tr>'."\n";
+                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
             endif;
             ?>
 			</tbody>
@@ -87,13 +87,13 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php echo $lang_misc['Move'] ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php echo $lang_misc['Delete'] ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php echo $lang_misc['Merge'] ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php echo $lang_misc['Open'] ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php echo $lang_misc['Close'] ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php echo __('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php echo __('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php echo __('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php echo __('Close') ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/style/FeatherBB/view/moderate/move_topics.php b/style/FeatherBB/view/moderate/move_topics.php
index 8dfedeaf..389f1f05 100644
--- a/style/FeatherBB/view/moderate/move_topics.php
+++ b/style/FeatherBB/view/moderate/move_topics.php
@@ -15,16 +15,16 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo($action == 'single') ? $lang_misc['Move topic'] : $lang_misc['Move topics'] ?></span></h2>
+	<h2><span><?php echo($action == 'single') ? __('Move topic') : __('Move topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 			<input type="hidden" name="topics" value="<?php echo $topics ?>" />
 				<fieldset>
-					<legend><?php echo $lang_misc['Move legend'] ?></legend>
+					<legend><?php echo __('Move legend') ?></legend>
 					<div class="infldset">
-						<label><?php echo $lang_misc['Move to'] ?>
+						<label><?php echo __('Move to') ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
@@ -33,12 +33,12 @@
 						<div class="rbox">
 							<label><input type="checkbox" name="with_redirect" value="1"<?php if ($action == 'single') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_misc['Leave redirect'] ?><br /></label>
+} ?> /><?php echo __('Leave redirect') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo $lang_misc['Move'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo __('Move') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/posts_view.php b/style/FeatherBB/view/moderate/posts_view.php
index 87d23e24..f957ce8f 100644
--- a/style/FeatherBB/view/moderate/posts_view.php
+++ b/style/FeatherBB/view/moderate/posts_view.php
@@ -16,10 +16,10 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -53,11 +53,11 @@
 						</dl>
 					</div>
 					<div class="postright">
-						<h3 class="nosize"><?php echo $lang_common['Message'] ?></h3>
+						<h3 class="nosize"><?php echo __('Message') ?></h3>
 						<div class="postmsg">
 							<?php echo $post['message']."\n" ?>
 	<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.$lang_topic['Last edit'].' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 						</div>
@@ -66,7 +66,7 @@
 			</div>
 			<div class="inbox">
 				<div class="postfoot clearb">
-					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.$lang_misc['Select'].'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.$lang_misc['Cannot select first'].'</p>' ?></div>
+					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.__('Select').'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.__('Cannot select first').'</p>' ?></div>
 				</div>
 			</div>
 		</div>
@@ -80,14 +80,14 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php echo $lang_misc['Split'] ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php echo $lang_misc['Delete'] ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php echo __('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/style/FeatherBB/view/moderate/split_posts.php b/style/FeatherBB/view/moderate/split_posts.php
index f3f5d88e..ac012ff3 100644
--- a/style/FeatherBB/view/moderate/split_posts.php
+++ b/style/FeatherBB/view/moderate/split_posts.php
@@ -14,27 +14,27 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Split posts'] ?></span></h2>
+	<h2><span><?php echo __('Split posts') ?></span></h2>
 	<div class="box">
 		<form id="subject" method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm split legend'] ?></legend>
+					<legend><?php echo __('Confirm split legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<label class="required"><strong><?php echo $lang_misc['New subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
-						<label><?php echo $lang_misc['Move to'] ?>
+						<label class="required"><strong><?php echo __('New subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
+						<label><?php echo __('Move to') ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
 						</select>
 						<br /></label>
-						<p><?php echo $lang_misc['Split posts comply'] ?></p>
+						<p><?php echo __('Split posts comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo $lang_misc['Split'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo __('Split') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/post.php b/style/FeatherBB/view/post.php
index 7bdfc449..0c341fd0 100644
--- a/style/FeatherBB/view/post.php
+++ b/style/FeatherBB/view/post.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
@@ -33,10 +33,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo $lang_post['Post errors'] ?></span></h2>
+	<h2><span><?php echo __('Post errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo $lang_post['Post errors info'] ?></p>
+			<p><?php echo __('Post errors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -57,7 +57,7 @@
 
     ?>
 <div id="postpreview" class="blockpost">
-	<h2><span><?php echo $lang_post['Post preview'] ?></span></h2>
+	<h2><span><?php echo __('Post preview') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -80,6 +80,7 @@
 
 ?>
 <!-- Init BBcode editor toolbar -->
+<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
@@ -92,16 +93,16 @@
 		<?php echo $form."\n" ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_common['Write message legend'] ?></legend>
+					<legend><?php echo __('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
                                                 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if ($feather->user->is_guest) {
-    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong>' : $lang_common['Email'];
+    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
     $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
-						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
+						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
     echo feather_escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
@@ -114,17 +115,17 @@
 
 }
 if ($fid): ?>
-						<label class="required"><strong><?php echo $lang_common['Subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
+						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
     echo feather_escape($post['subject']);
 } ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -134,7 +135,7 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_common['Options'] ?></legend>
+					<legend><?php echo __('Options') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
@@ -150,14 +151,14 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
+					<legend><?php echo __('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_antispam['Robot info']    ?></p>
+						<p><?php echo __('Robot info')    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
                              $qencoded = md5($question[$index_questions]);
-                             echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);?>
-							 <span><?php echo $lang_common['Required'] ?></span></strong>
+                             echo sprintf(__('Robot question'), $question[$index_questions]);?>
+							 <span><?php echo __('Required') ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -165,7 +166,7 @@
 				</fieldset>
 			</div>
 			<?php endif; ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
@@ -175,7 +176,7 @@
 if ($tid && $feather_config['o_topic_review'] != '0') :
 ?>
 <div id="postreview">
-	<h2><span><?php echo $lang_post['Topic review'] ?></span></h2>
+	<h2><span><?php echo __('Topic review') ?></span></h2>
 
 	<?php
     // Set background switching on
diff --git a/style/FeatherBB/view/profile/change_mail.php b/style/FeatherBB/view/profile/change_mail.php
index 68ae0012..de0f8d3b 100644
--- a/style/FeatherBB/view/profile/change_mail.php
+++ b/style/FeatherBB/view/profile/change_mail.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Change email'] ?></span></h2>
+	<h2><span><?php echo __('Change email') ?></span></h2>
 	<div class="box">
 		<form id="change_email" method="post" action="<?php echo get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Email legend'] ?></legend>
+					<legend><?php echo __('Email legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_profile['New email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
-						<label class="required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
-						<p><?php echo $lang_profile['Email instructions'] ?></p>
+						<label class="required"><strong><?php echo __('New email') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
+						<label class="required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
+						<p><?php echo __('Email instructions') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="new_email" value="<?php echo $lang_common['Submit'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="new_email" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/change_pass.php b/style/FeatherBB/view/profile/change_pass.php
index 0231efa2..0f0ab452 100644
--- a/style/FeatherBB/view/profile/change_pass.php
+++ b/style/FeatherBB/view/profile/change_pass.php
@@ -14,26 +14,26 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Change pass'] ?></span></h2>
+	<h2><span><?php echo __('Change pass') ?></span></h2>
 	<div class="box">
 		<form id="change_pass" method="post" action="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
 				<fieldset>
-					<legend><?php echo $lang_profile['Change pass legend'] ?></legend>
+					<legend><?php echo __('Change pass legend') ?></legend>
 					<div class="infldset">
-<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo $lang_profile['Old pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo __('Old pass') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_old_password" size="16" /><br /></label>
-<?php endif; ?>						<label class="conl required"><strong><?php echo $lang_profile['New pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php endif; ?>						<label class="conl required"><strong><?php echo __('New pass') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password1" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_profile['Confirm new pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="conl required"><strong><?php echo __('Confirm new pass') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password2" size="16" /><br /></label>
-						<p class="clearb"><?php echo $lang_profile['Pass info'] ?></p>
+						<p class="clearb"><?php echo __('Pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/delete_user.php b/style/FeatherBB/view/profile/delete_user.php
index 55c707c5..d5d5bde2 100644
--- a/style/FeatherBB/view/profile/delete_user.php
+++ b/style/FeatherBB/view/profile/delete_user.php
@@ -14,23 +14,23 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Confirm delete user'] ?></span></h2>
+	<h2><span><?php echo __('Confirm delete user') ?></span></h2>
 	<div class="box">
 		<form id="confirm_del_user" method="post" action="<?php echo get_link('user/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Confirm delete legend'] ?></legend>
+					<legend><?php echo __('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_profile['Confirmation info'].' <strong>'.feather_escape($username).'</strong>.' ?></p>
+						<p><?php echo __('Confirmation info').' <strong>'.feather_escape($username).'</strong>.' ?></p>
 						<div class="rbox">
-							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo $lang_profile['Delete posts'] ?><br /></label>
+							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo __('Delete posts') ?><br /></label>
 						</div>
-						<p class="warntext"><strong><?php echo $lang_profile['Delete warning'] ?></strong></p>
+						<p class="warntext"><strong><?php echo __('Delete warning') ?></strong></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo $lang_profile['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/menu.php b/style/FeatherBB/view/profile/menu.php
index bcf803e1..e78d2c30 100644
--- a/style/FeatherBB/view/profile/menu.php
+++ b/style/FeatherBB/view/profile/menu.php
@@ -15,39 +15,39 @@
 ?>
 <div id="profile" class="block2col">
 	<div class="blockmenu">
-		<h2><span><?php echo $lang_profile['Profile menu'] ?></span></h2>
+		<h2><span><?php echo __('Profile menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'essentials') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php echo $lang_profile['Section essentials'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php echo __('Section essentials') ?></a></li>
 					<li<?php if ($page == 'personal') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php echo $lang_profile['Section personal'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php echo __('Section personal') ?></a></li>
 					<li<?php if ($page == 'messaging') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php echo $lang_profile['Section messaging'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php echo __('Section messaging') ?></a></li>
 <?php if ($feather_config['o_avatars'] == '1' || $feather_config['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php echo $lang_profile['Section personality'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php echo __('Section personality') ?></a></li>
 <?php endif;
     ?>					<li<?php if ($page == 'display') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php echo $lang_profile['Section display'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php echo __('Section display') ?></a></li>
 					<li<?php if ($page == 'privacy') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php echo $lang_profile['Section privacy'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php echo __('Section privacy') ?></a></li>
 <?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php echo $lang_profile['Section admin'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php echo __('Section admin') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
diff --git a/style/FeatherBB/view/profile/section_admin.php b/style/FeatherBB/view/profile/section_admin.php
index 16b4f80a..52a0ad54 100644
--- a/style/FeatherBB/view/profile/section_admin.php
+++ b/style/FeatherBB/view/profile/section_admin.php
@@ -14,7 +14,7 @@
 
 ?>
 	<div class="blockform">
-		<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section admin'] ?></span></h2>
+		<h2><span><?php echo feather_escape($user['username']).' - '.__('Section admin') ?></span></h2>
 		<div class="box">
 			<form id="profile7" method="post" action="<?php echo get_link('user/'.$id.'/section/admin/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -25,9 +25,9 @@
 
         if ($feather->user->g_moderator == '1') {
             ?>
-						<legend><?php echo $lang_profile['Delete ban legend'] ?></legend>
+						<legend><?php echo __('Delete ban legend') ?></legend>
 						<div class="infldset">
-							<p><input type="submit" name="ban" value="<?php echo $lang_profile['Ban user'] ?>" /></p>
+							<p><input type="submit" name="ban" value="<?php echo __('Ban user') ?>" /></p>
 						</div>
 					</fieldset>
 				</div>
@@ -36,12 +36,12 @@
         } else {
             if ($feather->user->id != $id) {
                 ?>
-						<legend><?php echo $lang_profile['Group membership legend'] ?></legend>
+						<legend><?php echo __('Group membership legend') ?></legend>
 						<div class="infldset">
 							<select id="group_id" name="group_id">
                                                             <?php echo $group_list ?>
 							</select>
-							<input type="submit" name="update_group_membership" value="<?php echo $lang_profile['Save'] ?>" />
+							<input type="submit" name="update_group_membership" value="<?php echo __('Save') ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -52,9 +52,9 @@
             }
 
             ?>
-						<legend><?php echo $lang_profile['Delete ban legend'] ?></legend>
+						<legend><?php echo __('Delete ban legend') ?></legend>
 						<div class="infldset">
-							<input type="submit" name="delete_user" value="<?php echo $lang_profile['Delete user'] ?>" /> <input type="submit" name="ban" value="<?php echo $lang_profile['Ban user'] ?>" />
+							<input type="submit" name="delete_user" value="<?php echo __('Delete user') ?>" /> <input type="submit" name="ban" value="<?php echo __('Ban user') ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -64,13 +64,13 @@
                 ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_profile['Set mods legend'] ?></legend>
+						<legend><?php echo __('Set mods legend') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_profile['Moderator in info'] ?></p>
+							<p><?php echo __('Moderator in info') ?></p>
                                                         <?php echo $forum_list ?>
 								</div>
 							</div>
-							<br class="clearb" /><input type="submit" name="update_forums" value="<?php echo $lang_profile['Update forums'] ?>" />
+							<br class="clearb" /><input type="submit" name="update_forums" value="<?php echo __('Update forums') ?>" />
 						</div>
 					</fieldset>
 				</div>
diff --git a/style/FeatherBB/view/profile/section_display.php b/style/FeatherBB/view/profile/section_display.php
index 8ac8fd27..506dd146 100644
--- a/style/FeatherBB/view/profile/section_display.php
+++ b/style/FeatherBB/view/profile/section_display.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section display'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section display') ?></span></h2>
 	<div class="box">
 		<form id="profile5" method="post" action="<?php echo get_link('user/'.$id.'/section/display/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -30,9 +30,9 @@
         ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Style legend'] ?></legend>
+					<legend><?php echo __('Style legend') ?></legend>
 					<div class="infldset">
-						<label><?php echo $lang_profile['Styles'] ?><br />
+						<label><?php echo __('Styles') ?><br />
 						<select name="form_style">
 <?php
 
@@ -58,25 +58,25 @@
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1' || $feather_config['o_signatures'] == '1' || $feather_config['o_avatars'] == '1' || ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1')): ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Post display legend'] ?></legend>
+					<legend><?php echo __('Post display legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_profile['Post display info'] ?></p>
+						<p><?php echo __('Post display info') ?></p>
 						<div class="rbox">
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show smilies'] ?><br /></label>
+} ?> /><?php echo __('Show smilies') ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show sigs'] ?><br /></label>
+} ?> /><?php echo __('Show sigs') ?><br /></label>
 <?php endif; if ($feather_config['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show avatars'] ?><br /></label>
+} ?> /><?php echo __('Show avatars') ?><br /></label>
 <?php endif; if ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show images'] ?><br /></label>
+} ?> /><?php echo __('Show images') ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1' && $feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show images sigs'] ?><br /></label>
+} ?> /><?php echo __('Show images sigs') ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
@@ -85,15 +85,15 @@
 <?php endif; ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Pagination legend'] ?></legend>
+					<legend><?php echo __('Pagination legend') ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo $lang_profile['Topics per page'] ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
-						<label class="conl"><?php echo $lang_profile['Posts per page'] ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
-						<p class="clearb"><?php echo $lang_profile['Paginate info'] ?> <?php echo $lang_profile['Leave blank'] ?></p>
+						<label class="conl"><?php echo __('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
+						<label class="conl"><?php echo __('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
+						<p class="clearb"><?php echo __('Paginate info') ?> <?php echo __('Leave blank') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_essentials.php b/style/FeatherBB/view/profile/section_essentials.php
index 25deccf6..4f507a8c 100644
--- a/style/FeatherBB/view/profile/section_essentials.php
+++ b/style/FeatherBB/view/profile/section_essentials.php
@@ -14,23 +14,23 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section essentials'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section essentials') ?></span></h2>
 	<div class="box">
 		<form id="profile1" method="post" action="<?php echo get_link('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Username and pass legend'] ?></legend>
+					<legend><?php echo __('Username and pass legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php echo $lang_profile['Change pass'] ?></a></span></p>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php echo __('Change pass') ?></a></span></p>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Email legend'] ?></legend>
+					<legend><?php echo __('Email legend') ?></legend>
 					<div class="infldset">
 						<?php echo $user_disp['email_field'] ?>
 					</div>
@@ -38,139 +38,139 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Localisation legend'] ?></legend>
+					<legend><?php echo __('Localisation legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_prof_reg['Time zone info'] ?></p>
-						<label><?php echo $lang_prof_reg['Time zone']."\n" ?>
+						<p><?php echo __('Time zone info') ?></p>
+						<label><?php echo __('Time zone')."\n" ?>
 						<br /><select name="form_timezone">
 							<option value="-12"<?php if ($user['timezone'] == -12) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-12:00'] ?></option>
+} ?>><?php echo __('UTC-12:00') ?></option>
 							<option value="-11"<?php if ($user['timezone'] == -11) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-11:00'] ?></option>
+} ?>><?php echo __('UTC-11:00') ?></option>
 							<option value="-10"<?php if ($user['timezone'] == -10) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-10:00'] ?></option>
+} ?>><?php echo __('UTC-10:00') ?></option>
 							<option value="-9.5"<?php if ($user['timezone'] == -9.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-09:30'] ?></option>
+} ?>><?php echo __('UTC-09:30') ?></option>
 							<option value="-9"<?php if ($user['timezone'] == -9) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-09:00'] ?></option>
+} ?>><?php echo __('UTC-09:00') ?></option>
 							<option value="-8.5"<?php if ($user['timezone'] == -8.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-08:30'] ?></option>
+} ?>><?php echo __('UTC-08:30') ?></option>
 							<option value="-8"<?php if ($user['timezone'] == -8) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-08:00'] ?></option>
+} ?>><?php echo __('UTC-08:00') ?></option>
 							<option value="-7"<?php if ($user['timezone'] == -7) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-07:00'] ?></option>
+} ?>><?php echo __('UTC-07:00') ?></option>
 							<option value="-6"<?php if ($user['timezone'] == -6) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-06:00'] ?></option>
+} ?>><?php echo __('UTC-06:00') ?></option>
 							<option value="-5"<?php if ($user['timezone'] == -5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-05:00'] ?></option>
+} ?>><?php echo __('UTC-05:00') ?></option>
 							<option value="-4"<?php if ($user['timezone'] == -4) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-04:00'] ?></option>
+} ?>><?php echo __('UTC-04:00') ?></option>
 							<option value="-3.5"<?php if ($user['timezone'] == -3.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-03:30'] ?></option>
+} ?>><?php echo __('UTC-03:30') ?></option>
 							<option value="-3"<?php if ($user['timezone'] == -3) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-03:00'] ?></option>
+} ?>><?php echo __('UTC-03:00') ?></option>
 							<option value="-2"<?php if ($user['timezone'] == -2) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-02:00'] ?></option>
+} ?>><?php echo __('UTC-02:00') ?></option>
 							<option value="-1"<?php if ($user['timezone'] == -1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-01:00'] ?></option>
+} ?>><?php echo __('UTC-01:00') ?></option>
 							<option value="0"<?php if ($user['timezone'] == 0) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC'] ?></option>
+} ?>><?php echo __('UTC') ?></option>
 							<option value="1"<?php if ($user['timezone'] == 1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+01:00'] ?></option>
+} ?>><?php echo __('UTC+01:00') ?></option>
 							<option value="2"<?php if ($user['timezone'] == 2) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+02:00'] ?></option>
+} ?>><?php echo __('UTC+02:00') ?></option>
 							<option value="3"<?php if ($user['timezone'] == 3) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+03:00'] ?></option>
+} ?>><?php echo __('UTC+03:00') ?></option>
 							<option value="3.5"<?php if ($user['timezone'] == 3.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+03:30'] ?></option>
+} ?>><?php echo __('UTC+03:30') ?></option>
 							<option value="4"<?php if ($user['timezone'] == 4) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+04:00'] ?></option>
+} ?>><?php echo __('UTC+04:00') ?></option>
 							<option value="4.5"<?php if ($user['timezone'] == 4.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+04:30'] ?></option>
+} ?>><?php echo __('UTC+04:30') ?></option>
 							<option value="5"<?php if ($user['timezone'] == 5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+05:00'] ?></option>
+} ?>><?php echo __('UTC+05:00') ?></option>
 							<option value="5.5"<?php if ($user['timezone'] == 5.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+05:30'] ?></option>
+} ?>><?php echo __('UTC+05:30') ?></option>
 							<option value="5.75"<?php if ($user['timezone'] == 5.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+05:45'] ?></option>
+} ?>><?php echo __('UTC+05:45') ?></option>
 							<option value="6"<?php if ($user['timezone'] == 6) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+06:00'] ?></option>
+} ?>><?php echo __('UTC+06:00') ?></option>
 							<option value="6.5"<?php if ($user['timezone'] == 6.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+06:30'] ?></option>
+} ?>><?php echo __('UTC+06:30') ?></option>
 							<option value="7"<?php if ($user['timezone'] == 7) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+07:00'] ?></option>
+} ?>><?php echo __('UTC+07:00') ?></option>
 							<option value="8"<?php if ($user['timezone'] == 8) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+08:00'] ?></option>
+} ?>><?php echo __('UTC+08:00') ?></option>
 							<option value="8.75"<?php if ($user['timezone'] == 8.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+08:45'] ?></option>
+} ?>><?php echo __('UTC+08:45') ?></option>
 							<option value="9"<?php if ($user['timezone'] == 9) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+09:00'] ?></option>
+} ?>><?php echo __('UTC+09:00') ?></option>
 							<option value="9.5"<?php if ($user['timezone'] == 9.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+09:30'] ?></option>
+} ?>><?php echo __('UTC+09:30') ?></option>
 							<option value="10"<?php if ($user['timezone'] == 10) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+10:00'] ?></option>
+} ?>><?php echo __('UTC+10:00') ?></option>
 							<option value="10.5"<?php if ($user['timezone'] == 10.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+10:30'] ?></option>
+} ?>><?php echo __('UTC+10:30') ?></option>
 							<option value="11"<?php if ($user['timezone'] == 11) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+11:00'] ?></option>
+} ?>><?php echo __('UTC+11:00') ?></option>
 							<option value="11.5"<?php if ($user['timezone'] == 11.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+11:30'] ?></option>
+} ?>><?php echo __('UTC+11:30') ?></option>
 							<option value="12"<?php if ($user['timezone'] == 12) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+12:00'] ?></option>
+} ?>><?php echo __('UTC+12:00') ?></option>
 							<option value="12.75"<?php if ($user['timezone'] == 12.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+12:45'] ?></option>
+} ?>><?php echo __('UTC+12:45') ?></option>
 							<option value="13"<?php if ($user['timezone'] == 13) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+13:00'] ?></option>
+} ?>><?php echo __('UTC+13:00') ?></option>
 							<option value="14"<?php if ($user['timezone'] == 14) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+14:00'] ?></option>
+} ?>><?php echo __('UTC+14:00') ?></option>
 						</select>
 						<br /></label>
 						<div class="rbox">
 							<label><input type="checkbox" name="form_dst" value="1"<?php if ($user['dst'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['DST'] ?><br /></label>
+} ?> /><?php echo __('DST') ?><br /></label>
 						</div>
-						<label><?php echo $lang_prof_reg['Time format'] ?>
+						<label><?php echo __('Time format') ?>
 
 						<br /><select name="form_time_format">
 <?php
@@ -181,14 +181,14 @@
                                 }
                                 echo '>'. format_time(time(), false, null, $time_format, true, true);
                                 if ($key == 0) {
-                                    echo ' ('.$lang_prof_reg['Default'].')';
+                                    echo ' ('.__('Default').')';
                                 }
                                 echo "</option>\n";
                             }
                             ?>
 						</select>
 						<br /></label>
-						<label><?php echo $lang_prof_reg['Date format'] ?>
+						<label><?php echo __('Date format') ?>
 
 						<br /><select name="form_date_format">
 <?php
@@ -199,7 +199,7 @@
                                 }
                                 echo '>'. format_time(time(), true, $date_format, null, false, true);
                                 if ($key == 0) {
-                                    echo ' ('.$lang_prof_reg['Default'].')';
+                                    echo ' ('.__('Default').')';
                                 }
                                 echo "</option>\n";
                             }
@@ -214,7 +214,7 @@
     // Only display the language selection box if there's more than one language available
     if (count($languages) > 1) {
         ?>
-						<label><?php echo $lang_prof_reg['Language'] ?>
+						<label><?php echo __('Language') ?>
 						<br /><select name="form_language">
 <?php
 
@@ -239,18 +239,18 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['User activity'] ?></legend>
+					<legend><?php echo __('User activity') ?></legend>
 					<div class="infldset">
-						<p><?php printf($lang_profile['Registered info'], format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
-						<p><?php printf($lang_profile['Last post info'], format_time($user['last_post'])) ?></p>
-						<p><?php printf($lang_profile['Last visit info'], format_time($user['last_visit'])) ?></p>
+						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
+						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
-<?php if ($feather->user->is_admmod): ?>							<label><?php echo $lang_profile['Admin note'] ?><br />
+<?php if ($feather->user->is_admmod): ?>							<label><?php echo __('Admin note') ?><br />
 						<input id="admin_note" type="text" name="admin_note" value="<?php echo feather_escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_messaging.php b/style/FeatherBB/view/profile/section_messaging.php
index 3a5be1a2..148a78cf 100644
--- a/style/FeatherBB/view/profile/section_messaging.php
+++ b/style/FeatherBB/view/profile/section_messaging.php
@@ -14,24 +14,24 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section messaging'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section messaging') ?></span></h2>
 	<div class="box">
 		<form id="profile3" method="post" action="<?php echo get_link('user/'.$id.'/section/messaging/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Contact details legend'] ?></legend>
+					<legend><?php echo __('Contact details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo $lang_profile['Jabber'] ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
-						<label><?php echo $lang_profile['ICQ'] ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php echo $lang_profile['MSN'] ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php echo $lang_profile['AOL IM'] ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php echo $lang_profile['Yahoo'] ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php echo __('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
+						<label><?php echo __('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
+						<label><?php echo __('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
+						<label><?php echo __('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php echo __('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_personal.php b/style/FeatherBB/view/profile/section_personal.php
index 3accb5f7..7358bc85 100644
--- a/style/FeatherBB/view/profile/section_personal.php
+++ b/style/FeatherBB/view/profile/section_personal.php
@@ -14,24 +14,24 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section personal'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personal') ?></span></h2>
 	<div class="box">
 		<form id="profile2" method="post" action="<?php echo get_link('user/'.$id.'/section/personal/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Personal details legend'] ?></legend>
+					<legend><?php echo __('Personal details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo $lang_profile['Realname'] ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
+						<label><?php echo __('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
 <?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php echo $lang_profile['Location'] ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php echo $lang_profile['Website'] ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>							<label><?php echo __('Location') ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php echo __('Website') ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_personality.php b/style/FeatherBB/view/profile/section_personality.php
index d3e67cd6..9bd9440b 100644
--- a/style/FeatherBB/view/profile/section_personality.php
+++ b/style/FeatherBB/view/profile/section_personality.php
@@ -14,41 +14,41 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section personality'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personality') ?></span></h2>
 	<div class="box">
 		<form id="profile4" method="post" action="<?php echo get_link('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php if ($feather_config['o_avatars'] == '1'): ?>				<div class="inform">
 				<fieldset id="profileavatar">
-					<legend><?php echo $lang_profile['Avatar legend'] ?></legend>
+					<legend><?php echo __('Avatar legend') ?></legend>
 					<div class="infldset">
 <?php if ($user_avatar): ?>							<div class="useravatar"><?php echo $user_avatar ?></div>
-<?php endif; ?>							<p><?php echo $lang_profile['Avatar info'] ?></p>
+<?php endif; ?>							<p><?php echo __('Avatar info') ?></p>
 						<p class="clearb actions"><?php echo $avatar_field ?></p>
 					</div>
 				</fieldset>
 			</div>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Signature legend'] ?></legend>
+					<legend><?php echo __('Signature legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_profile['Signature info'] ?></p>
+						<p><?php echo __('Signature info') ?></p>
 						<div class="txtarea">
-							<label><?php printf($lang_profile['Sig max size'], forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
+							<label><?php printf(__('Sig max size'), forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_privacy.php b/style/FeatherBB/view/profile/section_privacy.php
index 34715516..6c1ab357 100644
--- a/style/FeatherBB/view/profile/section_privacy.php
+++ b/style/FeatherBB/view/profile/section_privacy.php
@@ -14,47 +14,47 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section privacy'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section privacy') ?></span></h2>
 	<div class="box">
 		<form id="profile6" method="post" action="<?php echo get_link('user/'.$id.'/section/privacy/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Privacy options legend'] ?></legend>
+					<legend><?php echo __('Privacy options legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<p><?php echo $lang_prof_reg['Email setting info'] ?></p>
+						<p><?php echo __('Email setting info') ?></p>
 						<div class="rbox">
 							<label><input type="radio" name="form_email_setting" value="0"<?php if ($user['email_setting'] == '0') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['Email setting 1'] ?><br /></label>
+} ?> /><?php echo __('Email setting 1') ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="1"<?php if ($user['email_setting'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['Email setting 2'] ?><br /></label>
+} ?> /><?php echo __('Email setting 2') ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="2"<?php if ($user['email_setting'] == '2') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['Email setting 3'] ?><br /></label>
+} ?> /><?php echo __('Email setting 3') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
 <?php if ($feather_config['o_forum_subscriptions'] == '1' || $feather_config['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Subscription legend'] ?></legend>
+					<legend><?php echo __('Subscription legend') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Notify full'] ?><br /></label>
+} ?> /><?php echo __('Notify full') ?><br /></label>
 <?php if ($feather_config['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Auto notify full'] ?><br /></label>
+} ?> /><?php echo __('Auto notify full') ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/upload_avatar.php b/style/FeatherBB/view/profile/upload_avatar.php
index 60487560..3f74f092 100644
--- a/style/FeatherBB/view/profile/upload_avatar.php
+++ b/style/FeatherBB/view/profile/upload_avatar.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Upload avatar'] ?></span></h2>
+	<h2><span><?php echo __('Upload avatar') ?></span></h2>
 	<div class="box">
 		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Upload avatar legend'] ?></legend>
+					<legend><?php echo __('Upload avatar legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-						<label class="required"><strong><?php echo $lang_profile['File'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php echo $lang_profile['Avatar desc'].' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.$lang_profile['pixels'].' '.$lang_common['and'].' '.forum_number_format($feather_config['o_avatars_size']).' '.$lang_profile['bytes'].' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
+						<label class="required"><strong><?php echo __('File') ?> <span><?php echo __('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
+						<p><?php echo __('Avatar desc').' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.__('bytes').' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="upload" value="<?php echo $lang_profile['Upload'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="upload" value="<?php echo __('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/view_profile.php b/style/FeatherBB/view/profile/view_profile.php
index da66b788..ad1c5959 100644
--- a/style/FeatherBB/view/profile/view_profile.php
+++ b/style/FeatherBB/view/profile/view_profile.php
@@ -14,12 +14,12 @@
 
 ?>
 <div id="viewprofile" class="block">
-	<h2><span><?php echo $lang_common['Profile'] ?></span></h2>
+	<h2><span><?php echo __('Profile') ?></span></h2>
 	<div class="box">
 		<div class="fakeform">
 			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['Section personal'] ?></legend>
+				<legend><?php echo __('Section personal') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personal'])."\n" ?>
@@ -30,7 +30,7 @@
 			</div>
 <?php if (!empty($user_info['messaging'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['Section messaging'] ?></legend>
+				<legend><?php echo __('Section messaging') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['messaging'])."\n" ?>
@@ -41,7 +41,7 @@
 			</div>
 <?php endif; if (!empty($user_info['personality'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['Section personality'] ?></legend>
+				<legend><?php echo __('Section personality') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personality'])."\n" ?>
@@ -52,7 +52,7 @@
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['User activity'] ?></legend>
+				<legend><?php echo __('User activity') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['activity'])."\n" ?>
diff --git a/style/FeatherBB/view/register/email.php b/style/FeatherBB/view/register/email.php
index e6355cb6..9f9b3424 100644
--- a/style/FeatherBB/view/register/email.php
+++ b/style/FeatherBB/view/register/email.php
@@ -15,25 +15,25 @@
 ?>
 
 <div id="emailform" class="blockform">
-	<h2><span><?php echo $lang_misc['Send email to'] ?> <?php echo feather_escape($recipient) ?></span></h2>
+	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($recipient) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Write email'] ?></legend>
+					<legend><?php echo __('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
+						<p><?php echo __('Email disclosure note') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/register/form.php b/style/FeatherBB/view/register/form.php
index 3344af93..fa2d2457 100644
--- a/style/FeatherBB/view/register/form.php
+++ b/style/FeatherBB/view/register/form.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo $lang_register['Registration errors'] ?></span></h2>
+	<h2><span><?php echo __('Registration errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo $lang_register['Registration errors info'] ?></p>
+			<p><?php echo __('Registration errors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,23 +37,23 @@
 }
 ?>
 <div id="regform" class="blockform">
-	<h2><span><?php echo $lang_register['Register'] ?></span></h2>
+	<h2><span><?php echo __('Register') ?></span></h2>
 	<div class="box">
 		<form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
 		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><?php echo $lang_common['Important information'] ?></h3>
-					<p><?php echo $lang_register['Desc 1'] ?></p>
-					<p><?php echo $lang_register['Desc 2'] ?></p>
+					<h3><?php echo __('Important information') ?></h3>
+					<p><?php echo __('Desc 1') ?></p>
+					<p><?php echo __('Desc 2') ?></p>
 				</div>
 				<fieldset>
-					<legend><?php echo $lang_register['Username legend'] ?></legend>
+					<legend><?php echo __('Username legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="username" value="" />
 						<input type="hidden" name="password" value="" />
-						<label class="required"><strong><?php echo $lang_common['Username'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
+						<label class="required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
     echo feather_escape($feather->request->post('req_user'));
 } ?>" size="25" maxlength="25" /><br /></label>
 					</div>
@@ -61,28 +61,28 @@
 			</div>
 <?php if ($feather_config['o_regs_verify'] == '0'): ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_register['Pass legend'] ?></legend>
+					<legend><?php echo __('Pass legend') ?></legend>
 					<div class="infldset">
-						<label class="conl required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
+						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
     echo feather_escape($feather->request->post('req_password1'));
 } ?>" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_prof_reg['Confirm pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
+						<label class="conl required"><strong><?php echo __('Confirm pass') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
     echo feather_escape($feather->request->post('req_password2'));
 } ?>" size="16" /><br /></label>
-						<p class="clearb"><?php echo $lang_register['Pass info'] ?></p>
+						<p class="clearb"><?php echo __('Pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? $lang_prof_reg['Email legend 2'] : $lang_prof_reg['Email legend'] ?></legend>
+					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo $lang_register['Email info'] ?></p>
-<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo __('Email info') ?></p>
+<?php endif; ?>						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
     echo feather_escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo $lang_register['Confirm email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo __('Confirm email') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
     echo feather_escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
@@ -95,9 +95,9 @@
             ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Localisation legend'] ?></legend>
+					<legend><?php echo __('Localisation legend') ?></legend>
 					<div class="infldset">
-							<label><?php echo $lang_prof_reg['Language'] ?>
+							<label><?php echo __('Language') ?>
 							<br /><select name="language">
 <?php
 
@@ -121,14 +121,14 @@
 ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
+					<legend><?php echo __('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_antispam['Robot info']    ?></p>
-						<label class="required"><strong><?php echo sprintf($lang_antispam['Robot question'], $question[$index_questions]) ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
+						<p><?php echo __('Robot info')    ?></p>
+						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php echo __('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="register" value="<?php echo $lang_register['Register'] ?>" /></p>
+			<p class="buttons"><input type="submit" name="register" value="<?php echo __('Register') ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/register/rules.php b/style/FeatherBB/view/register/rules.php
index d86c8c54..3a2fd06c 100644
--- a/style/FeatherBB/view/register/rules.php
+++ b/style/FeatherBB/view/register/rules.php
@@ -15,18 +15,18 @@
 ?>
 
 <div id="rules" class="blockform">
-	<div class="hd"><h2><span><?php echo $lang_register['Forum rules'] ?></span></h2></div>
+	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<form method="get" action="<?php echo get_link('register/') ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_register['Rules legend'] ?></legend>
+					<legend><?php echo __('Rules legend') ?></legend>
 					<div class="infldset">
 						<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="agree" value="<?php echo $lang_register['Agree'] ?>" /> <input type="submit" name="cancel" value="<?php echo $lang_register['Cancel'] ?>" /></p>
+			<p class="buttons"><input type="submit" name="agree" value="<?php echo __('Agree') ?>" /> <input type="submit" name="cancel" value="<?php echo __('Cancel') ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/footer.php b/style/FeatherBB/view/search/footer.php
index 73ff5d13..a64e1cdf 100644
--- a/style/FeatherBB/view/search/footer.php
+++ b/style/FeatherBB/view/search/footer.php
@@ -30,7 +30,7 @@
 			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
diff --git a/style/FeatherBB/view/search/form.php b/style/FeatherBB/view/search/form.php
index 642fb380..bb39c614 100644
--- a/style/FeatherBB/view/search/form.php
+++ b/style/FeatherBB/view/search/form.php
@@ -14,66 +14,66 @@
 ?>
 
 <div id="searchform" class="blockform">
-	<h2><span><?php echo $lang_search['Search'] ?></span></h2>
+	<h2><span><?php echo __('Search') ?></span></h2>
 	<div class="box">
 		<form id="search" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_search['Search criteria legend'] ?></legend>
+					<legend><?php echo __('Search criteria legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="action" value="search" />
-						<label class="conl"><?php echo $lang_search['Keyword search'] ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
-						<label class="conl"><?php echo $lang_search['Author search'] ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
-						<p class="clearb"><?php echo $lang_search['Search info'] ?></p>
+						<label class="conl"><?php echo __('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
+						<label class="conl"><?php echo __('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
+						<p class="clearb"><?php echo __('Search info') ?></p>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_search['Search in legend'] ?></legend>
+					<legend><?php echo __('Search in legend') ?></legend>
 					<div class="infldset">
 					<?php echo $forums ?>
-						<label class="conl"><?php echo $lang_search['Search in']."\n" ?>
+						<label class="conl"><?php echo __('Search in')."\n" ?>
 						<br /><select id="search_in" name="search_in">
-							<option value="0"><?php echo $lang_search['Message and subject'] ?></option>
-							<option value="1"><?php echo $lang_search['Message only'] ?></option>
-							<option value="-1"><?php echo $lang_search['Topic only'] ?></option>
+							<option value="0"><?php echo __('Message and subject') ?></option>
+							<option value="1"><?php echo __('Message only') ?></option>
+							<option value="-1"><?php echo __('Topic only') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearl"><?php echo $lang_search['Search in info'] ?></p>
-<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.$lang_search['Search multiple forums info'].'</p>' : '') ?>
+						<p class="clearl"><?php echo __('Search in info') ?></p>
+<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_search['Search results legend'] ?></legend>
+					<legend><?php echo __('Search results legend') ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo $lang_search['Sort by']."\n" ?>
+						<label class="conl"><?php echo __('Sort by')."\n" ?>
 						<br /><select name="sort_by">
-							<option value="0"><?php echo $lang_search['Sort by post time'] ?></option>
-							<option value="1"><?php echo $lang_search['Sort by author'] ?></option>
-							<option value="2"><?php echo $lang_search['Sort by subject'] ?></option>
-							<option value="3"><?php echo $lang_search['Sort by forum'] ?></option>
+							<option value="0"><?php echo __('Sort by post time') ?></option>
+							<option value="1"><?php echo __('Sort by author') ?></option>
+							<option value="2"><?php echo __('Sort by subject') ?></option>
+							<option value="3"><?php echo __('Sort by forum') ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Sort order']."\n" ?>
+						<label class="conl"><?php echo __('Sort order')."\n" ?>
 						<br /><select name="sort_dir">
-							<option value="DESC"><?php echo $lang_search['Descending'] ?></option>
-							<option value="ASC"><?php echo $lang_search['Ascending'] ?></option>
+							<option value="DESC"><?php echo __('Descending') ?></option>
+							<option value="ASC"><?php echo __('Ascending') ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Show as']."\n" ?>
+						<label class="conl"><?php echo __('Show as')."\n" ?>
 						<br /><select name="show_as">
-							<option value="topics"><?php echo $lang_search['Show as topics'] ?></option>
-							<option value="posts"><?php echo $lang_search['Show as posts'] ?></option>
+							<option value="topics"><?php echo __('Show as topics') ?></option>
+							<option value="posts"><?php echo __('Show as posts') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearb"><?php echo $lang_search['Search results info'] ?></p>
+						<p class="clearb"><?php echo __('Search results info') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/header.php b/style/FeatherBB/view/search/header.php
index 47706687..909a2108 100644
--- a/style/FeatherBB/view/search/header.php
+++ b/style/FeatherBB/view/search/header.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
@@ -31,16 +31,16 @@
 if ($search['show_as'] == 'topics') :
 ?>
 <div id="vf" class="blocktable">
-	<h2><span><?php echo $lang_search['Search results'] ?></span></h2>
+	<h2><span><?php echo __('Search results') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Forum'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_common['Replies'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Forum') ?></th>
+					<th class="tc3" scope="col"><?php echo __('Replies') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/style/FeatherBB/view/search/posts.php b/style/FeatherBB/view/search/posts.php
index a1247133..872c349e 100644
--- a/style/FeatherBB/view/search/posts.php
+++ b/style/FeatherBB/view/search/posts.php
@@ -21,7 +21,7 @@
     echo ' '.$cur_search['item_status'];
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
-    echo $lang_topic['Re'].' ';
+    echo __('Re').' ';
 } ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
@@ -29,7 +29,7 @@
 			<div class="postleft">
 				<dl>
 					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php echo $lang_topic['Replies'].' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
+<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php echo __('Replies').' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
 <?php endif; ?>
 					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
 				</dl>
@@ -46,8 +46,8 @@
 		<div class="postfoot clearb">
 			<div class="postfootright">
 				<ul>
-					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo $lang_search['Go to topic'] ?></a></span></li>
-					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $lang_search['Go to post'] ?></a></span></li>
+					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo __('Go to topic') ?></a></span></li>
+					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo __('Go to post') ?></a></span></li>
 				</ul>
 			</div>
 		</div>
diff --git a/style/FeatherBB/view/search/topics.php b/style/FeatherBB/view/search/topics.php
index d60dce31..af843193 100644
--- a/style/FeatherBB/view/search/topics.php
+++ b/style/FeatherBB/view/search/topics.php
@@ -25,5 +25,5 @@
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
 	<td class="tc3"><?php echo forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_search['last_poster']) ?></span></td>
+	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
 </tr>
\ No newline at end of file
diff --git a/style/FeatherBB/view/userlist.php b/style/FeatherBB/view/userlist.php
index 66e2a20d..0bbedae6 100644
--- a/style/FeatherBB/view/userlist.php
+++ b/style/FeatherBB/view/userlist.php
@@ -14,50 +14,50 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_search['User search'] ?></span></h2>
+	<h2><span><?php echo __('User search') ?></span></h2>
 	<div class="box">
 		<form id="userlist" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_ul['User find legend'] ?></legend>
+					<legend><?php echo __('User find legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo $lang_common['Username'] ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
-<?php endif; ?>						<label class="conl"><?php echo $lang_ul['User group']."\n" ?>
+<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo __('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
+<?php endif; ?>						<label class="conl"><?php echo __('User group')."\n" ?>
 						<br /><select name="show_group">
 							<option value="-1"<?php if ($show_group == -1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_ul['All users'] ?></option>
+} ?>><?php echo __('All users') ?></option>
 <?php echo $dropdown_menu ?>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Sort by']."\n" ?>
+						<label class="conl"><?php echo __('Sort by')."\n" ?>
 						<br /><select name="sort_by">
 							<option value="username"<?php if ($sort_by == 'username') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_common['Username'] ?></option>
+} ?>><?php echo __('Username') ?></option>
 							<option value="registered"<?php if ($sort_by == 'registered') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_common['Registered'] ?></option>
+} ?>><?php echo __('Registered') ?></option>
 <?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_ul['No of posts'] ?></option>
+} ?>><?php echo __('No of posts') ?></option>
 <?php endif; ?>						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Sort order']."\n" ?>
+						<label class="conl"><?php echo __('Sort order')."\n" ?>
 						<br /><select name="sort_dir">
 							<option value="ASC"<?php if ($sort_dir == 'ASC') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_search['Ascending'] ?></option>
+} ?>><?php echo __('Ascending') ?></option>
 							<option value="DESC"<?php if ($sort_dir == 'DESC') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_search['Descending'] ?></option>
+} ?>><?php echo __('Descending') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? $lang_ul['User search info'].' ' : '').$lang_ul['User sort info']; ?></p>
+						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? __('User search info').' ' : '').__('User sort info'); ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
@@ -70,16 +70,16 @@
 </div>
 
 <div id="users1" class="blocktable">
-	<h2><span><?php echo $lang_common['User list'] ?></span></h2>
+	<h2><span><?php echo __('User list') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Username'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Title'] ?></th>
-<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php echo $lang_common['Posts'] ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo $lang_common['Registered'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Username') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Title') ?></th>
+<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Registered') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -98,7 +98,7 @@
 
             }
             if (empty($userlist_data)) {
-                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.$lang_search['No hits'].'</td></tr>'."\n";
+                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.__('No hits').'</td></tr>'."\n";
             }
             ?>
 			</tbody>
diff --git a/style/FeatherBB/view/viewforum.php b/style/FeatherBB/view/viewforum.php
index 332987ae..b9d04a1d 100644
--- a/style/FeatherBB/view/viewforum.php
+++ b/style/FeatherBB/view/viewforum.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -34,10 +34,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Replies'] ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -70,7 +70,7 @@
 							<div class="icon inone"><div class="nosize"><!-- --></div></div>
 							<div class="tclcon">
 								<div>
-									<strong><?php echo $lang_forum['Empty forum'] ?></strong>
+									<strong><?php echo __('Empty forum') ?></strong>
 								</div>
 							</div>
 						</td>
@@ -91,7 +91,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
diff --git a/style/FeatherBB/view/viewtopic.php b/style/FeatherBB/view/viewtopic.php
index e5f55ab0..16535ff1 100644
--- a/style/FeatherBB/view/viewtopic.php
+++ b/style/FeatherBB/view/viewtopic.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -64,13 +64,13 @@
 				</div>
 				<div class="postright">
 					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
-    echo $lang_topic['Re'].' ';
+    echo __('Re').' ';
 }
     ?><?php echo feather_escape($cur_topic['subject']) ?></h3>
 					<div class="postmsg">
 						<?php echo $post['message']."\n" ?>
 <?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.$lang_topic['Last edit'].' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 					</div>
@@ -107,7 +107,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -124,13 +124,13 @@
 
     ?>
 <div id="quickpost" class="blockform">
-	<h2><span><?php echo $lang_topic['Quick post'] ?></span></h2>
+	<h2><span><?php echo __('Quick post') ?></span></h2>
 	<div class="box">
 		<form id="quickpostform" method="post" action="<?php echo get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_common['Write message legend'] ?></legend>
+					<legend><?php echo __('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
@@ -139,21 +139,22 @@
 <?php endif;
 
     if ($feather->user->is_guest) {
-        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong>' : $lang_common['Email'];
+        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
         $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
         ?>
-						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
 <?php
 
-    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.$lang_common['Message'].' <span>'.$lang_common['Required'].'</span></strong><br />';
+    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.__('Message').' <span>'.__('Required').'</span></strong><br />';
     } else {
         echo "\t\t\t\t\t\t".'<label>';
     }
 
     ?>
 <!-- Init BBcode editor toolbar -->
+<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
@@ -163,13 +164,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>
@@ -178,15 +179,15 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
+					<legend><?php echo __('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_antispam['Robot info']    ?></p>
+						<p><?php echo __('Robot info')    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
     $qencoded = md5($question[$index_questions]);
-    echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);
+    echo sprintf(__('Robot question'), $question[$index_questions]);
     ?>
-							 <span><?php echo $lang_common['Required'] ?></span></strong>
+							 <span><?php echo __('Required') ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -195,7 +196,7 @@
 			</div>
 			<?php endif;
     ?>
-			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_topic['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
+			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo __('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
 		</form>
 	</div>
 </div>
diff --git a/view/admin/groups/add_edit_group.php b/view/admin/groups/add_edit_group.php
index e2f0c0e8..26c9881c 100644
--- a/view/admin/groups/add_edit_group.php
+++ b/view/admin/groups/add_edit_group.php
@@ -40,7 +40,7 @@
 								<th scope="row"><?php echo $lang_admin_groups['User title label'] ?></th>
 								<td>
 									<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
-									<span><?php printf($lang_admin_groups['User title help'], ($group['info']['g_id'] != FEATHER_GUEST ? $lang_common['Member'] : $lang_common['Guest'])) ?></span>
+									<span><?php printf($lang_admin_groups['User title help'], ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
 								</td>
 							</tr>
 							<?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
diff --git a/view/delete.php b/view/delete.php
index 9d6afff9..65f2440b 100644
--- a/view/delete.php
+++ b/view/delete.php
@@ -16,26 +16,26 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="index.php"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="index.php"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_delete['Delete post'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Delete post') ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_delete['Delete post'] ?></span></h2>
+	<h2><span><?php echo __('Delete post') ?></span></h2>
 	<div class="box">
 		<form method="post" action="<?php echo get_link('delete/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? $lang_delete['Topic by'] : $lang_delete['Reply by'], '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
-					<p><?php echo($is_topic_post) ? '<strong>'.$lang_delete['Topic warning'].'</strong>' : '<strong>'.$lang_delete['Warning'].'</strong>' ?><br /><?php echo $lang_delete['Delete info'] ?></p>
+					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
+					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php echo __('Delete info') ?></p>
 				</div>
 			</div>
-			<p class="buttons"><input type="submit" name="delete" value="<?php echo $lang_delete['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
diff --git a/view/edit.php b/view/edit.php
index 3d91e362..8f2fe702 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -6,10 +6,10 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
-    exit;
+	exit;
 }
 
 $cur_index = 1;
@@ -19,10 +19,10 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_post['Edit post'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Edit post') ?></strong></li>
 		</ul>
 	</div>
 </div>
@@ -31,89 +31,90 @@
 
 // If there are errors, we display them
 if (!empty($errors)) :
-?>
-<div id="posterror" class="block">
-	<h2><span><?php echo $lang_post['Post errors'] ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php echo $lang_post['Post errors info'] ?></p>
-			<ul class="error-list">
-<?php
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-?>
-			</ul>
+	?>
+	<div id="posterror" class="block">
+		<h2><span><?php echo __('Post errors') ?></span></h2>
+		<div class="box">
+			<div class="inbox error-info">
+				<p><?php echo __('Post errors info') ?></p>
+				<ul class="error-list">
+					<?php
+					foreach ($errors as $cur_error) {
+						echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+					}
+					?>
+				</ul>
+			</div>
 		</div>
 	</div>
-</div>
-<?php
+	<?php
 elseif ($feather->request->post('preview')):
-?>
-<div id="postpreview" class="blockpost">
-	<h2><span><?php echo $lang_post['Post preview'] ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postright">
-					<div class="postmsg">
-						<?php echo $preview_message."\n" ?>
+	?>
+	<div id="postpreview" class="blockpost">
+		<h2><span><?php echo __('Post preview') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<div class="postbody">
+					<div class="postright">
+						<div class="postmsg">
+							<?php echo $preview_message."\n" ?>
+						</div>
 					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-</div>
-<?php
+	<?php
 endif;
 ?>
 <!-- Init BBcode editor toolbar -->
+<?php $lang_bbeditor = ''; ?>
 <script>
-    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
-        langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
+	var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
+		langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
 </script>
 <script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
 <div id="editform" class="blockform">
-	<h2><span><?php echo $lang_post['Edit post'] ?></span></h2>
+	<h2><span><?php echo __('Edit post') ?></span></h2>
 	<div class="box">
 		<form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_post['Edit post legend'] ?></legend>
+					<legend><?php echo __('Edit post legend') ?></legend>
 					<input type="hidden" name="form_sent" value="1" />
 					<div class="infldset txtarea">
-<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo $lang_common['Subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
-						<script>postEditorToolbar('req_message');</script>
-                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
+						<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br />
+							<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
+						<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
+							<script>postEditorToolbar('req_message');</script>
+							<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="help.php#img" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="help.php#smilies" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
 			</div>
-<?php
-if (!empty($checkboxes)):
-?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php echo $lang_common['Options'] ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
+			<?php
+			if (!empty($checkboxes)):
+				?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php echo __('Options') ?></legend>
+						<div class="infldset">
+							<div class="rbox">
+								<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
+							</div>
 						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php
-endif;
-?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+					</fieldset>
+				</div>
+				<?php
+			endif;
+			?>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/footer.php b/view/footer.php
index dde5eb31..6d9b7934 100644
--- a/view/footer.php
+++ b/view/footer.php
@@ -11,7 +11,7 @@
 </div>
 
 <div id="brdfooter" class="block">
-	<h2><span><?php echo $lang_common['Board footer'] ?></span></h2>
+	<h2><span><?php echo __('Board footer') ?></span></h2>
 	<div class="box">
 <?php
 
@@ -20,8 +20,8 @@
 
     if ($footer_style == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.$lang_forum['Mod controls'].'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.$lang_common['Moderate forum'].'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($footer_style == 'viewtopic') {
         if (isset($pid)) {
@@ -34,22 +34,22 @@
         
         
         echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.$lang_topic['Mod controls'].'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.$lang_common['Moderate topic'].'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.$lang_common['All'].'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.$lang_common['Moderate topic'].'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.$lang_common['Move topic'].'</a></span></dd>'."\n";
+        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
 
         if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.$lang_common['Open topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.$lang_common['Close topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
         }
 
         if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.$lang_common['Unstick topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.$lang_common['Stick topic'].'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
         }
 
         echo "\t\t\t".'</dl>'."\n";
@@ -89,26 +89,26 @@
 
 if ($footer_style == 'index') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.$lang_common['RSS active topics feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.$lang_common['Atom active topics feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewforum') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.$lang_common['RSS forum feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.$lang_common['Atom forum feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewtopic') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.$lang_common['RSS topic feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.$lang_common['Atom topic feed'].'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
     }
 }
 
 ?>
-				<p id="poweredby"><?php printf($lang_common['Powered by'], '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
+				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
 			</div>
 			<div class="clearer"></div>
 		</div>
@@ -122,13 +122,13 @@
 
     // Calculate script generation time
     $time_diff = sprintf('%.3f', get_microtime() - $feather_start);
-    echo sprintf($lang_common['Querytime'], $time_diff, count(\DB::get_query_log()[0]));
+    echo sprintf(__('Querytime'), $time_diff, count(\DB::get_query_log()[0]));
 
     if (function_exists('memory_get_usage')) {
-        echo ' - '.sprintf($lang_common['Memory usage'], file_size(memory_get_usage()));
+        echo ' - '.sprintf(__('Memory usage'), file_size(memory_get_usage()));
 
         if (function_exists('memory_get_peak_usage')) {
-            echo ' '.sprintf($lang_common['Peak usage'], file_size(memory_get_peak_usage()));
+            echo ' '.sprintf(__('Peak usage'), file_size(memory_get_peak_usage()));
         }
     }
 
diff --git a/view/header.php b/view/header.php
index 4492eaa0..88f0260a 100644
--- a/view/header.php
+++ b/view/header.php
@@ -9,7 +9,7 @@
 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang_common['lang_identifier'] ?>" lang="<?php echo $lang_common['lang_identifier'] ?>" dir="<?php echo $lang_common['lang_direction'] ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo __('lang_identifier') ?>" lang="<?php echo __('lang_identifier') ?>" dir="<?php echo __('lang_direction') ?>">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title><?php echo generate_page_title($page_title, $p) ?></title>
@@ -55,7 +55,7 @@ function process_form(the_form)
 			var elem = the_form.elements[i];
 			if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
 			{
-				alert('"' + required_fields[elem.name] + '" <?php echo $lang_common['required field'] ?>');
+				alert('"' + required_fields[elem.name] + '" <?php echo __('required field') ?>');
 				elem.focus();
 				return false;
 			}
@@ -92,7 +92,7 @@ function process_form(the_form)
 
 <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
 <div id="announce" class="block">
-    <div class="hd"><h2><span><?php echo $lang_common['Announcement'] ?></span></h2></div>
+    <div class="hd"><h2><span><?php echo __('Announcement') ?></span></h2></div>
     <div class="box">
         <div id="announce-block" class="inbox">
             <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
@@ -104,7 +104,7 @@ function process_form(the_form)
 <?php if (isset($flash['message'])) : ?>
 <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
 <div id="msgflash" class="block">
-    <h2><span><?php echo $lang_common['Info'] ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
+    <h2><span><?php echo __('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
     <div class="box">
         <div class="inbox">
             <p><?php echo feather_escape($flash['message']) ?></p>
diff --git a/view/help.php b/view/help.php
index fd511285..a7f9300d 100644
--- a/view/help.php
+++ b/view/help.php
@@ -14,113 +14,113 @@
 
 ?>
 
-<h2><span><?php echo $lang_help['BBCode'] ?></span></h2>
+<h2><span><?php echo __('BBCode') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="bbcode"></a><?php echo $lang_help['BBCode info 1'] ?></p>
-		<p><?php echo $lang_help['BBCode info 2'] ?></p>
+		<p><a name="bbcode"></a><?php echo __('BBCode info 1') ?></p>
+		<p><?php echo __('BBCode info 2') ?></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Text style'] ?></span></h2>
+<h2><span><?php echo __('Text style') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Text style info'] ?></p>
-		<p><code>[b]<?php echo $lang_help['Bold text'] ?>[/b]</code> <?php echo $lang_help['produces'] ?> <samp><strong><?php echo $lang_help['Bold text'] ?></strong></samp></p>
-		<p><code>[u]<?php echo $lang_help['Underlined text'] ?>[/u]</code> <?php echo $lang_help['produces'] ?> <samp><span class="bbu"><?php echo $lang_help['Underlined text'] ?></span></samp></p>
-		<p><code>[i]<?php echo $lang_help['Italic text'] ?>[/i]</code> <?php echo $lang_help['produces'] ?> <samp><em><?php echo $lang_help['Italic text'] ?></em></samp></p>
-		<p><code>[s]<?php echo $lang_help['Strike-through text'] ?>[/s]</code> <?php echo $lang_help['produces'] ?> <samp><span class="bbs"><?php echo $lang_help['Strike-through text'] ?></span></samp></p>
-		<p><code>[del]<?php echo $lang_help['Deleted text'] ?>[/del]</code> <?php echo $lang_help['produces'] ?> <samp><del><?php echo $lang_help['Deleted text'] ?></del></samp></p>
-		<p><code>[ins]<?php echo $lang_help['Inserted text'] ?>[/ins]</code> <?php echo $lang_help['produces'] ?> <samp><ins><?php echo $lang_help['Inserted text'] ?></ins></samp></p>
-		<p><code>[em]<?php echo $lang_help['Emphasised text'] ?>[/em]</code> <?php echo $lang_help['produces'] ?> <samp><em><?php echo $lang_help['Emphasised text'] ?></em></samp></p>
-		<p><code>[color=#FF0000]<?php echo $lang_help['Red text'] ?>[/color]</code> <?php echo $lang_help['produces'] ?> <samp><span style="color: #ff0000"><?php echo $lang_help['Red text'] ?></span></samp></p>
-		<p><code>[color=blue]<?php echo $lang_help['Blue text'] ?>[/color]</code> <?php echo $lang_help['produces'] ?> <samp><span style="color: blue"><?php echo $lang_help['Blue text'] ?></span></samp></p>
-		<p><code>[h]<?php echo $lang_help['Heading text'] ?>[/h]</code> <?php echo $lang_help['produces'] ?></p> <div class="postmsg"><h5><?php echo $lang_help['Heading text'] ?></h5></div>
+		<p><?php echo __('Text style info') ?></p>
+		<p><code>[b]<?php echo __('Bold text') ?>[/b]</code> <?php echo __('produces') ?> <samp><strong><?php echo __('Bold text') ?></strong></samp></p>
+		<p><code>[u]<?php echo __('Underlined text') ?>[/u]</code> <?php echo __('produces') ?> <samp><span class="bbu"><?php echo __('Underlined text') ?></span></samp></p>
+		<p><code>[i]<?php echo __('Italic text') ?>[/i]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Italic text') ?></em></samp></p>
+		<p><code>[s]<?php echo __('Strike-through text') ?>[/s]</code> <?php echo __('produces') ?> <samp><span class="bbs"><?php echo __('Strike-through text') ?></span></samp></p>
+		<p><code>[del]<?php echo __('Deleted text') ?>[/del]</code> <?php echo __('produces') ?> <samp><del><?php echo __('Deleted text') ?></del></samp></p>
+		<p><code>[ins]<?php echo __('Inserted text') ?>[/ins]</code> <?php echo __('produces') ?> <samp><ins><?php echo __('Inserted text') ?></ins></samp></p>
+		<p><code>[em]<?php echo __('Emphasised text') ?>[/em]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Emphasised text') ?></em></samp></p>
+		<p><code>[color=#FF0000]<?php echo __('Red text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: #ff0000"><?php echo __('Red text') ?></span></samp></p>
+		<p><code>[color=blue]<?php echo __('Blue text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: blue"><?php echo __('Blue text') ?></span></samp></p>
+		<p><code>[h]<?php echo __('Heading text') ?>[/h]</code> <?php echo __('produces') ?></p> <div class="postmsg"><h5><?php echo __('Heading text') ?></h5></div>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Links and images'] ?></span></h2>
+<h2><span><?php echo __('Links and images') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Links info'] ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php echo $lang_help['This help page'] ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('/help') ?>"><?php echo $lang_help['This help page'] ?></a></samp></p>
-		<p><code>[email]myname@example.com[/email]</code> <?php echo $lang_help['produces'] ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
-		<p><code>[email=myname@example.com]<?php echo $lang_help['My email address'] ?>[/email]</code> <?php echo $lang_help['produces'] ?> <samp><a href="mailto:myname@example.com"><?php echo $lang_help['My email address'] ?></a></samp></p>
-		<p><code>[topic=1]<?php echo $lang_help['Test topic'] ?>[/topic]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo $lang_help['Test topic'] ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php echo $lang_help['Test post'] ?>[/post]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo $lang_help['Test post'] ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php echo $lang_help['Test forum'] ?>[/forum]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo $lang_help['Test forum'] ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php echo $lang_help['Test user'] ?>[/user]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo $lang_help['Test user'] ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
+		<p><?php echo __('Links info') ?></p>
+		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
+		<p><code>[url=/help/]<?php echo __('This help page') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php echo __('This help page') ?></a></samp></p>
+		<p><code>[email]myname@example.com[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
+		<p><code>[email=myname@example.com]<?php echo __('My email address') ?>[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com"><?php echo __('My email address') ?></a></samp></p>
+		<p><code>[topic=1]<?php echo __('Test topic') ?>[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test topic') ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php echo __('Test post') ?>[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo __('Test post') ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php echo __('Test forum') ?>[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test forum') ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php echo __('Test user') ?>[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo __('Test user') ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
 	</div>
 	<div class="inbox">
-		<p><a name="img"></a><?php echo $lang_help['Images info'] ?></p>
-		<p><code>[img=<?php echo $lang_help['FluxBB bbcode test'] ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php echo $lang_help['produces'] ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php echo $lang_help['FluxBB bbcode test'] ?>" /></samp></p>
+		<p><a name="img"></a><?php echo __('Images info') ?></p>
+		<p><code>[img=<?php echo __('FluxBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php echo __('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php echo __('FluxBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Quotes'] ?></span></h2>
+<h2><span><?php echo __('Quotes') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Quotes info'] ?></p>
-		<p><code>[quote=James]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
-		<p><?php echo $lang_help['produces quote box'] ?></p>
+		<p><?php echo __('Quotes info') ?></p>
+		<p><code>[quote=James]<?php echo __('Quote text') ?>[/quote]</code></p>
+		<p><?php echo __('produces quote box') ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><cite>James <?php echo $lang_common['wrote'] ?></cite><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
+			<div class="quotebox"><cite>James <?php echo __('wrote') ?></cite><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo $lang_help['Quotes info 2'] ?></p>
-		<p><code>[quote]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
-		<p><?php echo $lang_help['produces quote box'] ?></p>
+		<p><?php echo __('Quotes info 2') ?></p>
+		<p><code>[quote]<?php echo __('Quote text') ?>[/quote]</code></p>
+		<p><?php echo __('produces quote box') ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
+			<div class="quotebox"><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo $lang_help['quote note'] ?></p>
+		<p><?php echo __('quote note') ?></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Code'] ?></span></h2>
+<h2><span><?php echo __('Code') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Code info'] ?></p>
-		<p><code>[code]<?php echo $lang_help['Code text'] ?>[/code]</code></p>
-		<p><?php echo $lang_help['produces code box'] ?></p>
+		<p><?php echo __('Code info') ?></p>
+		<p><code>[code]<?php echo __('Code text') ?>[/code]</code></p>
+		<p><?php echo __('produces code box') ?></p>
 		<div class="postmsg">
-			<div class="codebox"><pre><code><?php echo $lang_help['Code text'] ?></code></pre></div>
+			<div class="codebox"><pre><code><?php echo __('Code text') ?></code></pre></div>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Lists'] ?></span></h2>
+<h2><span><?php echo __('Lists') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="lists"></a><?php echo $lang_help['List info'] ?></p>
-		<p><code>[list][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
-		<br /><span><?php echo $lang_help['produces list'] ?></span></p>
+		<p><a name="lists"></a><?php echo __('List info') ?></p>
+		<p><code>[list][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php echo __('produces list') ?></span></p>
 		<div class="postmsg">
-			<ul><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ul>
+			<ul><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ul>
 		</div>
-		<p><code>[list=1][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
-		<br /><span><?php echo $lang_help['produces decimal list'] ?></span></p>
+		<p><code>[list=1][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php echo __('produces decimal list') ?></span></p>
 		<div class="postmsg">
-			<ol class="decimal"><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ol>
+			<ol class="decimal"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
 		</div>
-		<p><code>[list=a][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
-		<br /><span><?php echo $lang_help['produces alpha list'] ?></span></p>
+		<p><code>[list=a][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php echo __('produces alpha list') ?></span></p>
 		<div class="postmsg">
-			<ol class="alpha"><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ol>
+			<ol class="alpha"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Nested tags'] ?></span></h2>
+<h2><span><?php echo __('Nested tags') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo $lang_help['Nested tags info'] ?></p>
-		<p><code>[b][u]<?php echo $lang_help['Bold, underlined text'] ?>[/u][/b]</code> <?php echo $lang_help['produces'] ?> <samp><strong><span class="bbu"><?php echo $lang_help['Bold, underlined text'] ?></span></strong></samp></p>
+		<p><?php echo __('Nested tags info') ?></p>
+		<p><code>[b][u]<?php echo __('Bold, underlined text') ?>[/u][/b]</code> <?php echo __('produces') ?> <samp><strong><span class="bbu"><?php echo __('Bold, underlined text') ?></span></strong></samp></p>
 	</div>
 </div>
-<h2><span><?php echo $lang_help['Smilies'] ?></span></h2>
+<h2><span><?php echo __('Smilies') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="smilies"></a><?php echo $lang_help['Smilies info'] ?></p>
+		<p><a name="smilies"></a><?php echo __('Smilies info') ?></p>
 <?php
 
 // Display the smiley set
@@ -133,7 +133,7 @@
 }
 
 foreach ($smiley_groups as $smiley_img => $smiley_texts) {
-    echo "\t\t<p><code>". implode('</code> ' .$lang_common['and']. ' <code>', $smiley_texts).'</code> <span>' .$lang_help['produces']. '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
+    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
 }
 
 ?>
diff --git a/view/index.php b/view/index.php
index 1ffce864..d9d5ca64 100644
--- a/view/index.php
+++ b/view/index.php
@@ -13,7 +13,7 @@
 }
 
 if (empty($index_data)): ?>
-    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php echo $lang_index['Empty board'] ?></p></div></div></div>
+    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php echo __('Empty board') ?></p></div></div></div>
 <?php endif;
 foreach ($index_data as $forum) {
     if ($forum->cid != $cur_cat) :
@@ -33,10 +33,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Forum'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_index['Topics'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_common['Posts'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Forum') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Topics') ?></th>
+					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -80,27 +80,27 @@
 endif;
 ?>
 <div id="brdstats" class="block">
-	<h2><span><?php echo $lang_index['Board info'] ?></span></h2>
+	<h2><span><?php echo __('Board info') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<dl class="conr">
-				<dt><strong><?php echo $lang_index['Board stats'] ?></strong></dt>
-				<dd><span><?php printf($lang_index['No of users'], '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf($lang_index['No of topics'], '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
-				<dd><span><?php printf($lang_index['No of posts'], '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
+				<dt><strong><?php echo __('Board stats') ?></strong></dt>
+				<dd><span><?php printf(__('No of users'), '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of topics'), '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of posts'), '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
 			</dl>
 			<dl class="conl">
-				<dt><strong><?php echo $lang_index['User info'] ?></strong></dt>
-				<dd><span><?php printf($lang_index['Newest user'], $stats['newest_user']) ?></span></dd>
+				<dt><strong><?php echo __('User info') ?></strong></dt>
+				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
 				<?php if ($feather_config['o_users_online'] == 1) : ?>
-				<dd><span><?php printf($lang_index['Users online'], '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf($lang_index['Guests online'], '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Guests online'), '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
 				<?php endif; ?>
 			</dl>
 			<?php
             if ($feather_config['o_users_online'] == 1) :
                 if ($online['num_users'] > 0) {
-                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.$lang_index['Online'].' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
+                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
                 } else {
                     echo "\t\t\t".'<div class="clearer"></div>'."\n";
                 }
diff --git a/view/login/form.php b/view/login/form.php
index 8d35d8b7..fb8f2404 100644
--- a/view/login/form.php
+++ b/view/login/form.php
@@ -14,29 +14,29 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_common['Login'] ?></span></h2>
+	<h2><span><?php echo __('Login') ?></span></h2>
 	<div class="box">
 		<form id="login" method="post" action="<?php echo get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_login['Login legend'] ?></legend>
+					<legend><?php echo __('Login legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="conl required"><strong><?php echo $lang_common['Username'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
+						<label class="conl required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
+						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
 
 						<div class="rbox clearb">
-							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo $lang_login['Remember me'] ?><br /></label>
+							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo __('Remember me') ?><br /></label>
 						</div>
 
-						<p class="clearb"><?php echo $lang_login['Login info'] ?></p>
-						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php echo $lang_login['Not registered'] ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php echo $lang_login['Forgotten pass'] ?></a></span></p>
+						<p class="clearb"><?php echo __('Login info') ?></p>
+						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php echo __('Not registered') ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php echo __('Forgotten pass') ?></a></span></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="login" value="<?php echo $lang_common['Login'] ?>" tabindex="4" /></p>
+			<p class="buttons"><input type="submit" name="login" value="<?php echo __('Login') ?>" tabindex="4" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/login/password_forgotten.php b/view/login/password_forgotten.php
index 2712f630..979b915c 100644
--- a/view/login/password_forgotten.php
+++ b/view/login/password_forgotten.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo $lang_login['New password errors'] ?></span></h2>
+	<h2><span><?php echo __('New password errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo $lang_login['New passworderrors info'] ?></p>
+			<p><?php echo __('New passworderrors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,21 +37,21 @@
 }
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_login['Request pass'] ?></span></h2>
+	<h2><span><?php echo __('Request pass') ?></span></h2>
 	<div class="box">
 		<form id="request_pass" method="post" action="<?php echo get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_login['Request pass legend'] ?></legend>
+					<legend><?php echo __('Request pass legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_common['Email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
-						<p><?php echo $lang_login['Request pass info'] ?></p>
+						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
+						<p><?php echo __('Request pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="request_pass" value="<?php echo $lang_common['Submit'] ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a><?php endif; ?></p>
+			<p class="buttons"><input type="submit" name="request_pass" value="<?php echo __('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a><?php endif; ?></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/message.php b/view/message.php
index 7f26edad..d376bd09 100644
--- a/view/message.php
+++ b/view/message.php
@@ -14,11 +14,11 @@
 
 ?>
 <div id="msg" class="block">
-	<h2><span><?php echo $lang_common['Info'] ?></span></h2>
+	<h2><span><?php echo __('Info') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<p><?php echo $message ?></p>
-<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php echo __('Go back') ?></a></p>
 <?php endif;
     ?>		</div>
 	</div>
diff --git a/view/misc/email.php b/view/misc/email.php
index 054c7f34..7004040d 100644
--- a/view/misc/email.php
+++ b/view/misc/email.php
@@ -14,24 +14,24 @@
 
 ?>
 <div id="emailform" class="blockform">
-	<h2><span><?php echo $lang_misc['Send email to'] ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
+	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="<?php echo get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Write email'] ?></legend>
+					<legend><?php echo __('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
+						<p><?php echo __('Email disclosure note') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/misc/report.php b/view/misc/report.php
index 6cf01c90..121feac2 100644
--- a/view/misc/report.php
+++ b/view/misc/report.php
@@ -16,29 +16,29 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Report post'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Report post') ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div id="reportform" class="blockform">
-	<h2><span><?php echo $lang_misc['Report post'] ?></span></h2>
+	<h2><span><?php echo __('Report post') ?></span></h2>
 	<div class="box">
 		<form id="report" method="post" action="<?php echo get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Reason desc'] ?></legend>
+					<legend><?php echo __('Reason desc') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_misc['Reason'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
+						<label class="required"><strong><?php echo __('Reason') ?> <span><?php echo __('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/misc/rules.php b/view/misc/rules.php
index 00cff256..d32a805e 100644
--- a/view/misc/rules.php
+++ b/view/misc/rules.php
@@ -14,7 +14,7 @@
 
 ?>
 <div id="rules" class="block">
-	<div class="hd"><h2><span><?php echo $lang_register['Forum rules'] ?></span></h2></div>
+	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<div id="rules-block" class="inbox">
 			<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
diff --git a/view/moderate/delete_posts.php b/view/moderate/delete_posts.php
index d3a8ea76..4b95a5f1 100644
--- a/view/moderate/delete_posts.php
+++ b/view/moderate/delete_posts.php
@@ -14,20 +14,20 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Delete posts'] ?></span></h2>
+	<h2><span><?php echo __('Delete posts') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm delete legend'] ?></legend>
+					<legend><?php echo __('Confirm delete legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<p><?php echo $lang_misc['Delete posts comply'] ?></p>
+						<p><?php echo __('Delete posts comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/delete_topics.php b/view/moderate/delete_topics.php
index d18c7394..e414f734 100644
--- a/view/moderate/delete_topics.php
+++ b/view/moderate/delete_topics.php
@@ -15,20 +15,20 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Delete topics'] ?></span></h2>
+	<h2><span><?php echo __('Delete topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm delete legend'] ?></legend>
+					<legend><?php echo __('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_misc['Delete topics comply'] ?></p>
+						<p><?php echo __('Delete topics comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/merge_topics.php b/view/moderate/merge_topics.php
index 1c5cc5a4..b55f586b 100644
--- a/view/moderate/merge_topics.php
+++ b/view/moderate/merge_topics.php
@@ -15,22 +15,22 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Merge topics'] ?></span></h2>
+	<h2><span><?php echo __('Merge topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm merge legend'] ?></legend>
+					<legend><?php echo __('Confirm merge legend') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1" /><?php echo $lang_misc['Leave redirect'] ?><br /></label>
+							<label><input type="checkbox" name="with_redirect" value="1" /><?php echo __('Leave redirect') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo $lang_misc['Merge'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo __('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
index af90498d..bf893ce4 100644
--- a/view/moderate/moderator_forum.php
+++ b/view/moderate/moderator_forum.php
@@ -17,9 +17,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -38,11 +38,11 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Replies'] ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
-<?php endif; ?>					<th class="tcr"><?php echo $lang_common['Last post'] ?></th>
-					<th class="tcmod" scope="col"><?php echo $lang_misc['Select'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
+<?php endif; ?>					<th class="tcr"><?php echo __('Last post') ?></th>
+					<th class="tcmod" scope="col"><?php echo __('Select') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -74,7 +74,7 @@
             if (empty($topic_data)):
                 $colspan = ($feather_config['o_topic_views'] == '1') ? 5 : 4;
                 $button_status = ' disabled="disabled"';
-                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.$lang_forum['Empty forum'].'</td></tr>'."\n";
+                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
             endif;
             ?>
 			</tbody>
@@ -87,13 +87,13 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php echo $lang_misc['Move'] ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php echo $lang_misc['Delete'] ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php echo $lang_misc['Merge'] ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php echo $lang_misc['Open'] ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php echo $lang_misc['Close'] ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php echo __('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php echo __('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php echo __('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php echo __('Close') ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/moderate/move_topics.php b/view/moderate/move_topics.php
index 8dfedeaf..389f1f05 100644
--- a/view/moderate/move_topics.php
+++ b/view/moderate/move_topics.php
@@ -15,16 +15,16 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo($action == 'single') ? $lang_misc['Move topic'] : $lang_misc['Move topics'] ?></span></h2>
+	<h2><span><?php echo($action == 'single') ? __('Move topic') : __('Move topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 			<input type="hidden" name="topics" value="<?php echo $topics ?>" />
 				<fieldset>
-					<legend><?php echo $lang_misc['Move legend'] ?></legend>
+					<legend><?php echo __('Move legend') ?></legend>
 					<div class="infldset">
-						<label><?php echo $lang_misc['Move to'] ?>
+						<label><?php echo __('Move to') ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
@@ -33,12 +33,12 @@
 						<div class="rbox">
 							<label><input type="checkbox" name="with_redirect" value="1"<?php if ($action == 'single') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_misc['Leave redirect'] ?><br /></label>
+} ?> /><?php echo __('Leave redirect') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo $lang_misc['Move'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo __('Move') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/posts_view.php b/view/moderate/posts_view.php
index 87d23e24..f957ce8f 100644
--- a/view/moderate/posts_view.php
+++ b/view/moderate/posts_view.php
@@ -16,10 +16,10 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -53,11 +53,11 @@
 						</dl>
 					</div>
 					<div class="postright">
-						<h3 class="nosize"><?php echo $lang_common['Message'] ?></h3>
+						<h3 class="nosize"><?php echo __('Message') ?></h3>
 						<div class="postmsg">
 							<?php echo $post['message']."\n" ?>
 	<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.$lang_topic['Last edit'].' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 						</div>
@@ -66,7 +66,7 @@
 			</div>
 			<div class="inbox">
 				<div class="postfoot clearb">
-					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.$lang_misc['Select'].'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.$lang_misc['Cannot select first'].'</p>' ?></div>
+					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.__('Select').'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.__('Cannot select first').'</p>' ?></div>
 				</div>
 			</div>
 		</div>
@@ -80,14 +80,14 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php echo $lang_misc['Split'] ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php echo $lang_misc['Delete'] ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php echo __('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/moderate/split_posts.php b/view/moderate/split_posts.php
index f3f5d88e..ac012ff3 100644
--- a/view/moderate/split_posts.php
+++ b/view/moderate/split_posts.php
@@ -14,27 +14,27 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_misc['Split posts'] ?></span></h2>
+	<h2><span><?php echo __('Split posts') ?></span></h2>
 	<div class="box">
 		<form id="subject" method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Confirm split legend'] ?></legend>
+					<legend><?php echo __('Confirm split legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<label class="required"><strong><?php echo $lang_misc['New subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
-						<label><?php echo $lang_misc['Move to'] ?>
+						<label class="required"><strong><?php echo __('New subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
+						<label><?php echo __('Move to') ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
 						</select>
 						<br /></label>
-						<p><?php echo $lang_misc['Split posts comply'] ?></p>
+						<p><?php echo __('Split posts comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo $lang_misc['Split'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo __('Split') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/post.php b/view/post.php
index 7bdfc449..0c341fd0 100644
--- a/view/post.php
+++ b/view/post.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
@@ -33,10 +33,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo $lang_post['Post errors'] ?></span></h2>
+	<h2><span><?php echo __('Post errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo $lang_post['Post errors info'] ?></p>
+			<p><?php echo __('Post errors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -57,7 +57,7 @@
 
     ?>
 <div id="postpreview" class="blockpost">
-	<h2><span><?php echo $lang_post['Post preview'] ?></span></h2>
+	<h2><span><?php echo __('Post preview') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -80,6 +80,7 @@
 
 ?>
 <!-- Init BBcode editor toolbar -->
+<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
@@ -92,16 +93,16 @@
 		<?php echo $form."\n" ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_common['Write message legend'] ?></legend>
+					<legend><?php echo __('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
                                                 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if ($feather->user->is_guest) {
-    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong>' : $lang_common['Email'];
+    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
     $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
-						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
+						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
     echo feather_escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
@@ -114,17 +115,17 @@
 
 }
 if ($fid): ?>
-						<label class="required"><strong><?php echo $lang_common['Subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
+						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
     echo feather_escape($post['subject']);
 } ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -134,7 +135,7 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_common['Options'] ?></legend>
+					<legend><?php echo __('Options') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
@@ -150,14 +151,14 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
+					<legend><?php echo __('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_antispam['Robot info']    ?></p>
+						<p><?php echo __('Robot info')    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
                              $qencoded = md5($question[$index_questions]);
-                             echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);?>
-							 <span><?php echo $lang_common['Required'] ?></span></strong>
+                             echo sprintf(__('Robot question'), $question[$index_questions]);?>
+							 <span><?php echo __('Required') ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -165,7 +166,7 @@
 				</fieldset>
 			</div>
 			<?php endif; ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
@@ -175,7 +176,7 @@
 if ($tid && $feather_config['o_topic_review'] != '0') :
 ?>
 <div id="postreview">
-	<h2><span><?php echo $lang_post['Topic review'] ?></span></h2>
+	<h2><span><?php echo __('Topic review') ?></span></h2>
 
 	<?php
     // Set background switching on
diff --git a/view/profile/change_mail.php b/view/profile/change_mail.php
index 68ae0012..de0f8d3b 100644
--- a/view/profile/change_mail.php
+++ b/view/profile/change_mail.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Change email'] ?></span></h2>
+	<h2><span><?php echo __('Change email') ?></span></h2>
 	<div class="box">
 		<form id="change_email" method="post" action="<?php echo get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Email legend'] ?></legend>
+					<legend><?php echo __('Email legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo $lang_profile['New email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
-						<label class="required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
-						<p><?php echo $lang_profile['Email instructions'] ?></p>
+						<label class="required"><strong><?php echo __('New email') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
+						<label class="required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
+						<p><?php echo __('Email instructions') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="new_email" value="<?php echo $lang_common['Submit'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="new_email" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/change_pass.php b/view/profile/change_pass.php
index 0231efa2..0f0ab452 100644
--- a/view/profile/change_pass.php
+++ b/view/profile/change_pass.php
@@ -14,26 +14,26 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Change pass'] ?></span></h2>
+	<h2><span><?php echo __('Change pass') ?></span></h2>
 	<div class="box">
 		<form id="change_pass" method="post" action="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
 				<fieldset>
-					<legend><?php echo $lang_profile['Change pass legend'] ?></legend>
+					<legend><?php echo __('Change pass legend') ?></legend>
 					<div class="infldset">
-<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo $lang_profile['Old pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo __('Old pass') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_old_password" size="16" /><br /></label>
-<?php endif; ?>						<label class="conl required"><strong><?php echo $lang_profile['New pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php endif; ?>						<label class="conl required"><strong><?php echo __('New pass') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password1" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_profile['Confirm new pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="conl required"><strong><?php echo __('Confirm new pass') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password2" size="16" /><br /></label>
-						<p class="clearb"><?php echo $lang_profile['Pass info'] ?></p>
+						<p class="clearb"><?php echo __('Pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/delete_user.php b/view/profile/delete_user.php
index 55c707c5..d5d5bde2 100644
--- a/view/profile/delete_user.php
+++ b/view/profile/delete_user.php
@@ -14,23 +14,23 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Confirm delete user'] ?></span></h2>
+	<h2><span><?php echo __('Confirm delete user') ?></span></h2>
 	<div class="box">
 		<form id="confirm_del_user" method="post" action="<?php echo get_link('user/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Confirm delete legend'] ?></legend>
+					<legend><?php echo __('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_profile['Confirmation info'].' <strong>'.feather_escape($username).'</strong>.' ?></p>
+						<p><?php echo __('Confirmation info').' <strong>'.feather_escape($username).'</strong>.' ?></p>
 						<div class="rbox">
-							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo $lang_profile['Delete posts'] ?><br /></label>
+							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo __('Delete posts') ?><br /></label>
 						</div>
-						<p class="warntext"><strong><?php echo $lang_profile['Delete warning'] ?></strong></p>
+						<p class="warntext"><strong><?php echo __('Delete warning') ?></strong></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo $lang_profile['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/menu.php b/view/profile/menu.php
index bcf803e1..e78d2c30 100644
--- a/view/profile/menu.php
+++ b/view/profile/menu.php
@@ -15,39 +15,39 @@
 ?>
 <div id="profile" class="block2col">
 	<div class="blockmenu">
-		<h2><span><?php echo $lang_profile['Profile menu'] ?></span></h2>
+		<h2><span><?php echo __('Profile menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'essentials') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php echo $lang_profile['Section essentials'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php echo __('Section essentials') ?></a></li>
 					<li<?php if ($page == 'personal') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php echo $lang_profile['Section personal'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php echo __('Section personal') ?></a></li>
 					<li<?php if ($page == 'messaging') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php echo $lang_profile['Section messaging'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php echo __('Section messaging') ?></a></li>
 <?php if ($feather_config['o_avatars'] == '1' || $feather_config['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php echo $lang_profile['Section personality'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php echo __('Section personality') ?></a></li>
 <?php endif;
     ?>					<li<?php if ($page == 'display') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php echo $lang_profile['Section display'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php echo __('Section display') ?></a></li>
 					<li<?php if ($page == 'privacy') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php echo $lang_profile['Section privacy'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php echo __('Section privacy') ?></a></li>
 <?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php echo $lang_profile['Section admin'] ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php echo __('Section admin') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
diff --git a/view/profile/section_admin.php b/view/profile/section_admin.php
index 16b4f80a..52a0ad54 100644
--- a/view/profile/section_admin.php
+++ b/view/profile/section_admin.php
@@ -14,7 +14,7 @@
 
 ?>
 	<div class="blockform">
-		<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section admin'] ?></span></h2>
+		<h2><span><?php echo feather_escape($user['username']).' - '.__('Section admin') ?></span></h2>
 		<div class="box">
 			<form id="profile7" method="post" action="<?php echo get_link('user/'.$id.'/section/admin/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -25,9 +25,9 @@
 
         if ($feather->user->g_moderator == '1') {
             ?>
-						<legend><?php echo $lang_profile['Delete ban legend'] ?></legend>
+						<legend><?php echo __('Delete ban legend') ?></legend>
 						<div class="infldset">
-							<p><input type="submit" name="ban" value="<?php echo $lang_profile['Ban user'] ?>" /></p>
+							<p><input type="submit" name="ban" value="<?php echo __('Ban user') ?>" /></p>
 						</div>
 					</fieldset>
 				</div>
@@ -36,12 +36,12 @@
         } else {
             if ($feather->user->id != $id) {
                 ?>
-						<legend><?php echo $lang_profile['Group membership legend'] ?></legend>
+						<legend><?php echo __('Group membership legend') ?></legend>
 						<div class="infldset">
 							<select id="group_id" name="group_id">
                                                             <?php echo $group_list ?>
 							</select>
-							<input type="submit" name="update_group_membership" value="<?php echo $lang_profile['Save'] ?>" />
+							<input type="submit" name="update_group_membership" value="<?php echo __('Save') ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -52,9 +52,9 @@
             }
 
             ?>
-						<legend><?php echo $lang_profile['Delete ban legend'] ?></legend>
+						<legend><?php echo __('Delete ban legend') ?></legend>
 						<div class="infldset">
-							<input type="submit" name="delete_user" value="<?php echo $lang_profile['Delete user'] ?>" /> <input type="submit" name="ban" value="<?php echo $lang_profile['Ban user'] ?>" />
+							<input type="submit" name="delete_user" value="<?php echo __('Delete user') ?>" /> <input type="submit" name="ban" value="<?php echo __('Ban user') ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -64,13 +64,13 @@
                 ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_profile['Set mods legend'] ?></legend>
+						<legend><?php echo __('Set mods legend') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_profile['Moderator in info'] ?></p>
+							<p><?php echo __('Moderator in info') ?></p>
                                                         <?php echo $forum_list ?>
 								</div>
 							</div>
-							<br class="clearb" /><input type="submit" name="update_forums" value="<?php echo $lang_profile['Update forums'] ?>" />
+							<br class="clearb" /><input type="submit" name="update_forums" value="<?php echo __('Update forums') ?>" />
 						</div>
 					</fieldset>
 				</div>
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
index 8ac8fd27..506dd146 100644
--- a/view/profile/section_display.php
+++ b/view/profile/section_display.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section display'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section display') ?></span></h2>
 	<div class="box">
 		<form id="profile5" method="post" action="<?php echo get_link('user/'.$id.'/section/display/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -30,9 +30,9 @@
         ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Style legend'] ?></legend>
+					<legend><?php echo __('Style legend') ?></legend>
 					<div class="infldset">
-						<label><?php echo $lang_profile['Styles'] ?><br />
+						<label><?php echo __('Styles') ?><br />
 						<select name="form_style">
 <?php
 
@@ -58,25 +58,25 @@
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1' || $feather_config['o_signatures'] == '1' || $feather_config['o_avatars'] == '1' || ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1')): ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Post display legend'] ?></legend>
+					<legend><?php echo __('Post display legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_profile['Post display info'] ?></p>
+						<p><?php echo __('Post display info') ?></p>
 						<div class="rbox">
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show smilies'] ?><br /></label>
+} ?> /><?php echo __('Show smilies') ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show sigs'] ?><br /></label>
+} ?> /><?php echo __('Show sigs') ?><br /></label>
 <?php endif; if ($feather_config['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show avatars'] ?><br /></label>
+} ?> /><?php echo __('Show avatars') ?><br /></label>
 <?php endif; if ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show images'] ?><br /></label>
+} ?> /><?php echo __('Show images') ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1' && $feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Show images sigs'] ?><br /></label>
+} ?> /><?php echo __('Show images sigs') ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
@@ -85,15 +85,15 @@
 <?php endif; ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Pagination legend'] ?></legend>
+					<legend><?php echo __('Pagination legend') ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo $lang_profile['Topics per page'] ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
-						<label class="conl"><?php echo $lang_profile['Posts per page'] ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
-						<p class="clearb"><?php echo $lang_profile['Paginate info'] ?> <?php echo $lang_profile['Leave blank'] ?></p>
+						<label class="conl"><?php echo __('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
+						<label class="conl"><?php echo __('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
+						<p class="clearb"><?php echo __('Paginate info') ?> <?php echo __('Leave blank') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_essentials.php b/view/profile/section_essentials.php
index 25deccf6..4f507a8c 100644
--- a/view/profile/section_essentials.php
+++ b/view/profile/section_essentials.php
@@ -14,23 +14,23 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section essentials'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section essentials') ?></span></h2>
 	<div class="box">
 		<form id="profile1" method="post" action="<?php echo get_link('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Username and pass legend'] ?></legend>
+					<legend><?php echo __('Username and pass legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php echo $lang_profile['Change pass'] ?></a></span></p>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php echo __('Change pass') ?></a></span></p>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Email legend'] ?></legend>
+					<legend><?php echo __('Email legend') ?></legend>
 					<div class="infldset">
 						<?php echo $user_disp['email_field'] ?>
 					</div>
@@ -38,139 +38,139 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Localisation legend'] ?></legend>
+					<legend><?php echo __('Localisation legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_prof_reg['Time zone info'] ?></p>
-						<label><?php echo $lang_prof_reg['Time zone']."\n" ?>
+						<p><?php echo __('Time zone info') ?></p>
+						<label><?php echo __('Time zone')."\n" ?>
 						<br /><select name="form_timezone">
 							<option value="-12"<?php if ($user['timezone'] == -12) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-12:00'] ?></option>
+} ?>><?php echo __('UTC-12:00') ?></option>
 							<option value="-11"<?php if ($user['timezone'] == -11) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-11:00'] ?></option>
+} ?>><?php echo __('UTC-11:00') ?></option>
 							<option value="-10"<?php if ($user['timezone'] == -10) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-10:00'] ?></option>
+} ?>><?php echo __('UTC-10:00') ?></option>
 							<option value="-9.5"<?php if ($user['timezone'] == -9.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-09:30'] ?></option>
+} ?>><?php echo __('UTC-09:30') ?></option>
 							<option value="-9"<?php if ($user['timezone'] == -9) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-09:00'] ?></option>
+} ?>><?php echo __('UTC-09:00') ?></option>
 							<option value="-8.5"<?php if ($user['timezone'] == -8.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-08:30'] ?></option>
+} ?>><?php echo __('UTC-08:30') ?></option>
 							<option value="-8"<?php if ($user['timezone'] == -8) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-08:00'] ?></option>
+} ?>><?php echo __('UTC-08:00') ?></option>
 							<option value="-7"<?php if ($user['timezone'] == -7) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-07:00'] ?></option>
+} ?>><?php echo __('UTC-07:00') ?></option>
 							<option value="-6"<?php if ($user['timezone'] == -6) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-06:00'] ?></option>
+} ?>><?php echo __('UTC-06:00') ?></option>
 							<option value="-5"<?php if ($user['timezone'] == -5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-05:00'] ?></option>
+} ?>><?php echo __('UTC-05:00') ?></option>
 							<option value="-4"<?php if ($user['timezone'] == -4) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-04:00'] ?></option>
+} ?>><?php echo __('UTC-04:00') ?></option>
 							<option value="-3.5"<?php if ($user['timezone'] == -3.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-03:30'] ?></option>
+} ?>><?php echo __('UTC-03:30') ?></option>
 							<option value="-3"<?php if ($user['timezone'] == -3) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-03:00'] ?></option>
+} ?>><?php echo __('UTC-03:00') ?></option>
 							<option value="-2"<?php if ($user['timezone'] == -2) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-02:00'] ?></option>
+} ?>><?php echo __('UTC-02:00') ?></option>
 							<option value="-1"<?php if ($user['timezone'] == -1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC-01:00'] ?></option>
+} ?>><?php echo __('UTC-01:00') ?></option>
 							<option value="0"<?php if ($user['timezone'] == 0) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC'] ?></option>
+} ?>><?php echo __('UTC') ?></option>
 							<option value="1"<?php if ($user['timezone'] == 1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+01:00'] ?></option>
+} ?>><?php echo __('UTC+01:00') ?></option>
 							<option value="2"<?php if ($user['timezone'] == 2) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+02:00'] ?></option>
+} ?>><?php echo __('UTC+02:00') ?></option>
 							<option value="3"<?php if ($user['timezone'] == 3) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+03:00'] ?></option>
+} ?>><?php echo __('UTC+03:00') ?></option>
 							<option value="3.5"<?php if ($user['timezone'] == 3.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+03:30'] ?></option>
+} ?>><?php echo __('UTC+03:30') ?></option>
 							<option value="4"<?php if ($user['timezone'] == 4) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+04:00'] ?></option>
+} ?>><?php echo __('UTC+04:00') ?></option>
 							<option value="4.5"<?php if ($user['timezone'] == 4.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+04:30'] ?></option>
+} ?>><?php echo __('UTC+04:30') ?></option>
 							<option value="5"<?php if ($user['timezone'] == 5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+05:00'] ?></option>
+} ?>><?php echo __('UTC+05:00') ?></option>
 							<option value="5.5"<?php if ($user['timezone'] == 5.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+05:30'] ?></option>
+} ?>><?php echo __('UTC+05:30') ?></option>
 							<option value="5.75"<?php if ($user['timezone'] == 5.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+05:45'] ?></option>
+} ?>><?php echo __('UTC+05:45') ?></option>
 							<option value="6"<?php if ($user['timezone'] == 6) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+06:00'] ?></option>
+} ?>><?php echo __('UTC+06:00') ?></option>
 							<option value="6.5"<?php if ($user['timezone'] == 6.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+06:30'] ?></option>
+} ?>><?php echo __('UTC+06:30') ?></option>
 							<option value="7"<?php if ($user['timezone'] == 7) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+07:00'] ?></option>
+} ?>><?php echo __('UTC+07:00') ?></option>
 							<option value="8"<?php if ($user['timezone'] == 8) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+08:00'] ?></option>
+} ?>><?php echo __('UTC+08:00') ?></option>
 							<option value="8.75"<?php if ($user['timezone'] == 8.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+08:45'] ?></option>
+} ?>><?php echo __('UTC+08:45') ?></option>
 							<option value="9"<?php if ($user['timezone'] == 9) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+09:00'] ?></option>
+} ?>><?php echo __('UTC+09:00') ?></option>
 							<option value="9.5"<?php if ($user['timezone'] == 9.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+09:30'] ?></option>
+} ?>><?php echo __('UTC+09:30') ?></option>
 							<option value="10"<?php if ($user['timezone'] == 10) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+10:00'] ?></option>
+} ?>><?php echo __('UTC+10:00') ?></option>
 							<option value="10.5"<?php if ($user['timezone'] == 10.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+10:30'] ?></option>
+} ?>><?php echo __('UTC+10:30') ?></option>
 							<option value="11"<?php if ($user['timezone'] == 11) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+11:00'] ?></option>
+} ?>><?php echo __('UTC+11:00') ?></option>
 							<option value="11.5"<?php if ($user['timezone'] == 11.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+11:30'] ?></option>
+} ?>><?php echo __('UTC+11:30') ?></option>
 							<option value="12"<?php if ($user['timezone'] == 12) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+12:00'] ?></option>
+} ?>><?php echo __('UTC+12:00') ?></option>
 							<option value="12.75"<?php if ($user['timezone'] == 12.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+12:45'] ?></option>
+} ?>><?php echo __('UTC+12:45') ?></option>
 							<option value="13"<?php if ($user['timezone'] == 13) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+13:00'] ?></option>
+} ?>><?php echo __('UTC+13:00') ?></option>
 							<option value="14"<?php if ($user['timezone'] == 14) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_prof_reg['UTC+14:00'] ?></option>
+} ?>><?php echo __('UTC+14:00') ?></option>
 						</select>
 						<br /></label>
 						<div class="rbox">
 							<label><input type="checkbox" name="form_dst" value="1"<?php if ($user['dst'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['DST'] ?><br /></label>
+} ?> /><?php echo __('DST') ?><br /></label>
 						</div>
-						<label><?php echo $lang_prof_reg['Time format'] ?>
+						<label><?php echo __('Time format') ?>
 
 						<br /><select name="form_time_format">
 <?php
@@ -181,14 +181,14 @@
                                 }
                                 echo '>'. format_time(time(), false, null, $time_format, true, true);
                                 if ($key == 0) {
-                                    echo ' ('.$lang_prof_reg['Default'].')';
+                                    echo ' ('.__('Default').')';
                                 }
                                 echo "</option>\n";
                             }
                             ?>
 						</select>
 						<br /></label>
-						<label><?php echo $lang_prof_reg['Date format'] ?>
+						<label><?php echo __('Date format') ?>
 
 						<br /><select name="form_date_format">
 <?php
@@ -199,7 +199,7 @@
                                 }
                                 echo '>'. format_time(time(), true, $date_format, null, false, true);
                                 if ($key == 0) {
-                                    echo ' ('.$lang_prof_reg['Default'].')';
+                                    echo ' ('.__('Default').')';
                                 }
                                 echo "</option>\n";
                             }
@@ -214,7 +214,7 @@
     // Only display the language selection box if there's more than one language available
     if (count($languages) > 1) {
         ?>
-						<label><?php echo $lang_prof_reg['Language'] ?>
+						<label><?php echo __('Language') ?>
 						<br /><select name="form_language">
 <?php
 
@@ -239,18 +239,18 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['User activity'] ?></legend>
+					<legend><?php echo __('User activity') ?></legend>
 					<div class="infldset">
-						<p><?php printf($lang_profile['Registered info'], format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
-						<p><?php printf($lang_profile['Last post info'], format_time($user['last_post'])) ?></p>
-						<p><?php printf($lang_profile['Last visit info'], format_time($user['last_visit'])) ?></p>
+						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
+						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
-<?php if ($feather->user->is_admmod): ?>							<label><?php echo $lang_profile['Admin note'] ?><br />
+<?php if ($feather->user->is_admmod): ?>							<label><?php echo __('Admin note') ?><br />
 						<input id="admin_note" type="text" name="admin_note" value="<?php echo feather_escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_messaging.php b/view/profile/section_messaging.php
index 3a5be1a2..148a78cf 100644
--- a/view/profile/section_messaging.php
+++ b/view/profile/section_messaging.php
@@ -14,24 +14,24 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section messaging'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section messaging') ?></span></h2>
 	<div class="box">
 		<form id="profile3" method="post" action="<?php echo get_link('user/'.$id.'/section/messaging/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Contact details legend'] ?></legend>
+					<legend><?php echo __('Contact details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo $lang_profile['Jabber'] ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
-						<label><?php echo $lang_profile['ICQ'] ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php echo $lang_profile['MSN'] ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php echo $lang_profile['AOL IM'] ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php echo $lang_profile['Yahoo'] ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php echo __('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
+						<label><?php echo __('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
+						<label><?php echo __('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
+						<label><?php echo __('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php echo __('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_personal.php b/view/profile/section_personal.php
index 3accb5f7..7358bc85 100644
--- a/view/profile/section_personal.php
+++ b/view/profile/section_personal.php
@@ -14,24 +14,24 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section personal'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personal') ?></span></h2>
 	<div class="box">
 		<form id="profile2" method="post" action="<?php echo get_link('user/'.$id.'/section/personal/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Personal details legend'] ?></legend>
+					<legend><?php echo __('Personal details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo $lang_profile['Realname'] ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
+						<label><?php echo __('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
 <?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php echo $lang_profile['Location'] ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php echo $lang_profile['Website'] ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>							<label><?php echo __('Location') ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php echo __('Website') ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_personality.php b/view/profile/section_personality.php
index d3e67cd6..9bd9440b 100644
--- a/view/profile/section_personality.php
+++ b/view/profile/section_personality.php
@@ -14,41 +14,41 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section personality'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personality') ?></span></h2>
 	<div class="box">
 		<form id="profile4" method="post" action="<?php echo get_link('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php if ($feather_config['o_avatars'] == '1'): ?>				<div class="inform">
 				<fieldset id="profileavatar">
-					<legend><?php echo $lang_profile['Avatar legend'] ?></legend>
+					<legend><?php echo __('Avatar legend') ?></legend>
 					<div class="infldset">
 <?php if ($user_avatar): ?>							<div class="useravatar"><?php echo $user_avatar ?></div>
-<?php endif; ?>							<p><?php echo $lang_profile['Avatar info'] ?></p>
+<?php endif; ?>							<p><?php echo __('Avatar info') ?></p>
 						<p class="clearb actions"><?php echo $avatar_field ?></p>
 					</div>
 				</fieldset>
 			</div>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Signature legend'] ?></legend>
+					<legend><?php echo __('Signature legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_profile['Signature info'] ?></p>
+						<p><?php echo __('Signature info') ?></p>
 						<div class="txtarea">
-							<label><?php printf($lang_profile['Sig max size'], forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
+							<label><?php printf(__('Sig max size'), forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_privacy.php b/view/profile/section_privacy.php
index 34715516..6c1ab357 100644
--- a/view/profile/section_privacy.php
+++ b/view/profile/section_privacy.php
@@ -14,47 +14,47 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section privacy'] ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section privacy') ?></span></h2>
 	<div class="box">
 		<form id="profile6" method="post" action="<?php echo get_link('user/'.$id.'/section/privacy/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Privacy options legend'] ?></legend>
+					<legend><?php echo __('Privacy options legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<p><?php echo $lang_prof_reg['Email setting info'] ?></p>
+						<p><?php echo __('Email setting info') ?></p>
 						<div class="rbox">
 							<label><input type="radio" name="form_email_setting" value="0"<?php if ($user['email_setting'] == '0') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['Email setting 1'] ?><br /></label>
+} ?> /><?php echo __('Email setting 1') ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="1"<?php if ($user['email_setting'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['Email setting 2'] ?><br /></label>
+} ?> /><?php echo __('Email setting 2') ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="2"<?php if ($user['email_setting'] == '2') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_prof_reg['Email setting 3'] ?><br /></label>
+} ?> /><?php echo __('Email setting 3') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
 <?php if ($feather_config['o_forum_subscriptions'] == '1' || $feather_config['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Subscription legend'] ?></legend>
+					<legend><?php echo __('Subscription legend') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Notify full'] ?><br /></label>
+} ?> /><?php echo __('Notify full') ?><br /></label>
 <?php if ($feather_config['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo $lang_profile['Auto notify full'] ?><br /></label>
+} ?> /><?php echo __('Auto notify full') ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
index 60487560..3f74f092 100644
--- a/view/profile/upload_avatar.php
+++ b/view/profile/upload_avatar.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_profile['Upload avatar'] ?></span></h2>
+	<h2><span><?php echo __('Upload avatar') ?></span></h2>
 	<div class="box">
 		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_profile['Upload avatar legend'] ?></legend>
+					<legend><?php echo __('Upload avatar legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-						<label class="required"><strong><?php echo $lang_profile['File'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php echo $lang_profile['Avatar desc'].' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.$lang_profile['pixels'].' '.$lang_common['and'].' '.forum_number_format($feather_config['o_avatars_size']).' '.$lang_profile['bytes'].' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
+						<label class="required"><strong><?php echo __('File') ?> <span><?php echo __('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
+						<p><?php echo __('Avatar desc').' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.__('bytes').' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="upload" value="<?php echo $lang_profile['Upload'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="upload" value="<?php echo __('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/view_profile.php b/view/profile/view_profile.php
index da66b788..ad1c5959 100644
--- a/view/profile/view_profile.php
+++ b/view/profile/view_profile.php
@@ -14,12 +14,12 @@
 
 ?>
 <div id="viewprofile" class="block">
-	<h2><span><?php echo $lang_common['Profile'] ?></span></h2>
+	<h2><span><?php echo __('Profile') ?></span></h2>
 	<div class="box">
 		<div class="fakeform">
 			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['Section personal'] ?></legend>
+				<legend><?php echo __('Section personal') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personal'])."\n" ?>
@@ -30,7 +30,7 @@
 			</div>
 <?php if (!empty($user_info['messaging'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['Section messaging'] ?></legend>
+				<legend><?php echo __('Section messaging') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['messaging'])."\n" ?>
@@ -41,7 +41,7 @@
 			</div>
 <?php endif; if (!empty($user_info['personality'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['Section personality'] ?></legend>
+				<legend><?php echo __('Section personality') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personality'])."\n" ?>
@@ -52,7 +52,7 @@
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo $lang_profile['User activity'] ?></legend>
+				<legend><?php echo __('User activity') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['activity'])."\n" ?>
diff --git a/view/register/email.php b/view/register/email.php
index e6355cb6..9f9b3424 100644
--- a/view/register/email.php
+++ b/view/register/email.php
@@ -15,25 +15,25 @@
 ?>
 
 <div id="emailform" class="blockform">
-	<h2><span><?php echo $lang_misc['Send email to'] ?> <?php echo feather_escape($recipient) ?></span></h2>
+	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($recipient) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_misc['Write email'] ?></legend>
+					<legend><?php echo __('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
+						<p><?php echo __('Email disclosure note') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/register/form.php b/view/register/form.php
index 3344af93..fa2d2457 100644
--- a/view/register/form.php
+++ b/view/register/form.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo $lang_register['Registration errors'] ?></span></h2>
+	<h2><span><?php echo __('Registration errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo $lang_register['Registration errors info'] ?></p>
+			<p><?php echo __('Registration errors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,23 +37,23 @@
 }
 ?>
 <div id="regform" class="blockform">
-	<h2><span><?php echo $lang_register['Register'] ?></span></h2>
+	<h2><span><?php echo __('Register') ?></span></h2>
 	<div class="box">
 		<form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
 		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><?php echo $lang_common['Important information'] ?></h3>
-					<p><?php echo $lang_register['Desc 1'] ?></p>
-					<p><?php echo $lang_register['Desc 2'] ?></p>
+					<h3><?php echo __('Important information') ?></h3>
+					<p><?php echo __('Desc 1') ?></p>
+					<p><?php echo __('Desc 2') ?></p>
 				</div>
 				<fieldset>
-					<legend><?php echo $lang_register['Username legend'] ?></legend>
+					<legend><?php echo __('Username legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="username" value="" />
 						<input type="hidden" name="password" value="" />
-						<label class="required"><strong><?php echo $lang_common['Username'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
+						<label class="required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
     echo feather_escape($feather->request->post('req_user'));
 } ?>" size="25" maxlength="25" /><br /></label>
 					</div>
@@ -61,28 +61,28 @@
 			</div>
 <?php if ($feather_config['o_regs_verify'] == '0'): ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_register['Pass legend'] ?></legend>
+					<legend><?php echo __('Pass legend') ?></legend>
 					<div class="infldset">
-						<label class="conl required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
+						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
     echo feather_escape($feather->request->post('req_password1'));
 } ?>" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo $lang_prof_reg['Confirm pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
+						<label class="conl required"><strong><?php echo __('Confirm pass') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
     echo feather_escape($feather->request->post('req_password2'));
 } ?>" size="16" /><br /></label>
-						<p class="clearb"><?php echo $lang_register['Pass info'] ?></p>
+						<p class="clearb"><?php echo __('Pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? $lang_prof_reg['Email legend 2'] : $lang_prof_reg['Email legend'] ?></legend>
+					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo $lang_register['Email info'] ?></p>
-<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo __('Email info') ?></p>
+<?php endif; ?>						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
     echo feather_escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo $lang_register['Confirm email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo __('Confirm email') ?> <span><?php echo __('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
     echo feather_escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
@@ -95,9 +95,9 @@
             ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_prof_reg['Localisation legend'] ?></legend>
+					<legend><?php echo __('Localisation legend') ?></legend>
 					<div class="infldset">
-							<label><?php echo $lang_prof_reg['Language'] ?>
+							<label><?php echo __('Language') ?>
 							<br /><select name="language">
 <?php
 
@@ -121,14 +121,14 @@
 ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
+					<legend><?php echo __('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_antispam['Robot info']    ?></p>
-						<label class="required"><strong><?php echo sprintf($lang_antispam['Robot question'], $question[$index_questions]) ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
+						<p><?php echo __('Robot info')    ?></p>
+						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php echo __('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="register" value="<?php echo $lang_register['Register'] ?>" /></p>
+			<p class="buttons"><input type="submit" name="register" value="<?php echo __('Register') ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/register/rules.php b/view/register/rules.php
index d86c8c54..3a2fd06c 100644
--- a/view/register/rules.php
+++ b/view/register/rules.php
@@ -15,18 +15,18 @@
 ?>
 
 <div id="rules" class="blockform">
-	<div class="hd"><h2><span><?php echo $lang_register['Forum rules'] ?></span></h2></div>
+	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<form method="get" action="<?php echo get_link('register/') ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_register['Rules legend'] ?></legend>
+					<legend><?php echo __('Rules legend') ?></legend>
 					<div class="infldset">
 						<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="agree" value="<?php echo $lang_register['Agree'] ?>" /> <input type="submit" name="cancel" value="<?php echo $lang_register['Cancel'] ?>" /></p>
+			<p class="buttons"><input type="submit" name="agree" value="<?php echo __('Agree') ?>" /> <input type="submit" name="cancel" value="<?php echo __('Cancel') ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/search/footer.php b/view/search/footer.php
index 73ff5d13..a64e1cdf 100644
--- a/view/search/footer.php
+++ b/view/search/footer.php
@@ -30,7 +30,7 @@
 			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
diff --git a/view/search/form.php b/view/search/form.php
index 642fb380..bb39c614 100644
--- a/view/search/form.php
+++ b/view/search/form.php
@@ -14,66 +14,66 @@
 ?>
 
 <div id="searchform" class="blockform">
-	<h2><span><?php echo $lang_search['Search'] ?></span></h2>
+	<h2><span><?php echo __('Search') ?></span></h2>
 	<div class="box">
 		<form id="search" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_search['Search criteria legend'] ?></legend>
+					<legend><?php echo __('Search criteria legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="action" value="search" />
-						<label class="conl"><?php echo $lang_search['Keyword search'] ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
-						<label class="conl"><?php echo $lang_search['Author search'] ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
-						<p class="clearb"><?php echo $lang_search['Search info'] ?></p>
+						<label class="conl"><?php echo __('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
+						<label class="conl"><?php echo __('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
+						<p class="clearb"><?php echo __('Search info') ?></p>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_search['Search in legend'] ?></legend>
+					<legend><?php echo __('Search in legend') ?></legend>
 					<div class="infldset">
 					<?php echo $forums ?>
-						<label class="conl"><?php echo $lang_search['Search in']."\n" ?>
+						<label class="conl"><?php echo __('Search in')."\n" ?>
 						<br /><select id="search_in" name="search_in">
-							<option value="0"><?php echo $lang_search['Message and subject'] ?></option>
-							<option value="1"><?php echo $lang_search['Message only'] ?></option>
-							<option value="-1"><?php echo $lang_search['Topic only'] ?></option>
+							<option value="0"><?php echo __('Message and subject') ?></option>
+							<option value="1"><?php echo __('Message only') ?></option>
+							<option value="-1"><?php echo __('Topic only') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearl"><?php echo $lang_search['Search in info'] ?></p>
-<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.$lang_search['Search multiple forums info'].'</p>' : '') ?>
+						<p class="clearl"><?php echo __('Search in info') ?></p>
+<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_search['Search results legend'] ?></legend>
+					<legend><?php echo __('Search results legend') ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo $lang_search['Sort by']."\n" ?>
+						<label class="conl"><?php echo __('Sort by')."\n" ?>
 						<br /><select name="sort_by">
-							<option value="0"><?php echo $lang_search['Sort by post time'] ?></option>
-							<option value="1"><?php echo $lang_search['Sort by author'] ?></option>
-							<option value="2"><?php echo $lang_search['Sort by subject'] ?></option>
-							<option value="3"><?php echo $lang_search['Sort by forum'] ?></option>
+							<option value="0"><?php echo __('Sort by post time') ?></option>
+							<option value="1"><?php echo __('Sort by author') ?></option>
+							<option value="2"><?php echo __('Sort by subject') ?></option>
+							<option value="3"><?php echo __('Sort by forum') ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Sort order']."\n" ?>
+						<label class="conl"><?php echo __('Sort order')."\n" ?>
 						<br /><select name="sort_dir">
-							<option value="DESC"><?php echo $lang_search['Descending'] ?></option>
-							<option value="ASC"><?php echo $lang_search['Ascending'] ?></option>
+							<option value="DESC"><?php echo __('Descending') ?></option>
+							<option value="ASC"><?php echo __('Ascending') ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Show as']."\n" ?>
+						<label class="conl"><?php echo __('Show as')."\n" ?>
 						<br /><select name="show_as">
-							<option value="topics"><?php echo $lang_search['Show as topics'] ?></option>
-							<option value="posts"><?php echo $lang_search['Show as posts'] ?></option>
+							<option value="topics"><?php echo __('Show as topics') ?></option>
+							<option value="posts"><?php echo __('Show as posts') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearb"><?php echo $lang_search['Search results info'] ?></p>
+						<p class="clearb"><?php echo __('Search results info') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/search/header.php b/view/search/header.php
index 47706687..909a2108 100644
--- a/view/search/header.php
+++ b/view/search/header.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
@@ -31,16 +31,16 @@
 if ($search['show_as'] == 'topics') :
 ?>
 <div id="vf" class="blocktable">
-	<h2><span><?php echo $lang_search['Search results'] ?></span></h2>
+	<h2><span><?php echo __('Search results') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Forum'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_common['Replies'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Forum') ?></th>
+					<th class="tc3" scope="col"><?php echo __('Replies') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/view/search/posts.php b/view/search/posts.php
index a1247133..872c349e 100644
--- a/view/search/posts.php
+++ b/view/search/posts.php
@@ -21,7 +21,7 @@
     echo ' '.$cur_search['item_status'];
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
-    echo $lang_topic['Re'].' ';
+    echo __('Re').' ';
 } ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
@@ -29,7 +29,7 @@
 			<div class="postleft">
 				<dl>
 					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php echo $lang_topic['Replies'].' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
+<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php echo __('Replies').' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
 <?php endif; ?>
 					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
 				</dl>
@@ -46,8 +46,8 @@
 		<div class="postfoot clearb">
 			<div class="postfootright">
 				<ul>
-					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo $lang_search['Go to topic'] ?></a></span></li>
-					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $lang_search['Go to post'] ?></a></span></li>
+					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo __('Go to topic') ?></a></span></li>
+					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo __('Go to post') ?></a></span></li>
 				</ul>
 			</div>
 		</div>
diff --git a/view/search/topics.php b/view/search/topics.php
index d60dce31..af843193 100644
--- a/view/search/topics.php
+++ b/view/search/topics.php
@@ -25,5 +25,5 @@
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
 	<td class="tc3"><?php echo forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_search['last_poster']) ?></span></td>
+	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
 </tr>
\ No newline at end of file
diff --git a/view/userlist.php b/view/userlist.php
index 66e2a20d..0bbedae6 100644
--- a/view/userlist.php
+++ b/view/userlist.php
@@ -14,50 +14,50 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_search['User search'] ?></span></h2>
+	<h2><span><?php echo __('User search') ?></span></h2>
 	<div class="box">
 		<form id="userlist" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_ul['User find legend'] ?></legend>
+					<legend><?php echo __('User find legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo $lang_common['Username'] ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
-<?php endif; ?>						<label class="conl"><?php echo $lang_ul['User group']."\n" ?>
+<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo __('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
+<?php endif; ?>						<label class="conl"><?php echo __('User group')."\n" ?>
 						<br /><select name="show_group">
 							<option value="-1"<?php if ($show_group == -1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_ul['All users'] ?></option>
+} ?>><?php echo __('All users') ?></option>
 <?php echo $dropdown_menu ?>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Sort by']."\n" ?>
+						<label class="conl"><?php echo __('Sort by')."\n" ?>
 						<br /><select name="sort_by">
 							<option value="username"<?php if ($sort_by == 'username') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_common['Username'] ?></option>
+} ?>><?php echo __('Username') ?></option>
 							<option value="registered"<?php if ($sort_by == 'registered') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_common['Registered'] ?></option>
+} ?>><?php echo __('Registered') ?></option>
 <?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_ul['No of posts'] ?></option>
+} ?>><?php echo __('No of posts') ?></option>
 <?php endif; ?>						</select>
 						<br /></label>
-						<label class="conl"><?php echo $lang_search['Sort order']."\n" ?>
+						<label class="conl"><?php echo __('Sort order')."\n" ?>
 						<br /><select name="sort_dir">
 							<option value="ASC"<?php if ($sort_dir == 'ASC') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_search['Ascending'] ?></option>
+} ?>><?php echo __('Ascending') ?></option>
 							<option value="DESC"<?php if ($sort_dir == 'DESC') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_search['Descending'] ?></option>
+} ?>><?php echo __('Descending') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? $lang_ul['User search info'].' ' : '').$lang_ul['User sort info']; ?></p>
+						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? __('User search info').' ' : '').__('User sort info'); ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
@@ -70,16 +70,16 @@
 </div>
 
 <div id="users1" class="blocktable">
-	<h2><span><?php echo $lang_common['User list'] ?></span></h2>
+	<h2><span><?php echo __('User list') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Username'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Title'] ?></th>
-<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php echo $lang_common['Posts'] ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo $lang_common['Registered'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Username') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Title') ?></th>
+<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Registered') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -98,7 +98,7 @@
 
             }
             if (empty($userlist_data)) {
-                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.$lang_search['No hits'].'</td></tr>'."\n";
+                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.__('No hits').'</td></tr>'."\n";
             }
             ?>
 			</tbody>
diff --git a/view/viewforum.php b/view/viewforum.php
index 332987ae..b9d04a1d 100644
--- a/view/viewforum.php
+++ b/view/viewforum.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -34,10 +34,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_common['Replies'] ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -70,7 +70,7 @@
 							<div class="icon inone"><div class="nosize"><!-- --></div></div>
 							<div class="tclcon">
 								<div>
-									<strong><?php echo $lang_forum['Empty forum'] ?></strong>
+									<strong><?php echo __('Empty forum') ?></strong>
 								</div>
 							</div>
 						</td>
@@ -91,7 +91,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
diff --git a/view/viewtopic.php b/view/viewtopic.php
index e5f55ab0..16535ff1 100644
--- a/view/viewtopic.php
+++ b/view/viewtopic.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -64,13 +64,13 @@
 				</div>
 				<div class="postright">
 					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
-    echo $lang_topic['Re'].' ';
+    echo __('Re').' ';
 }
     ?><?php echo feather_escape($cur_topic['subject']) ?></h3>
 					<div class="postmsg">
 						<?php echo $post['message']."\n" ?>
 <?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.$lang_topic['Last edit'].' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 					</div>
@@ -107,7 +107,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -124,13 +124,13 @@
 
     ?>
 <div id="quickpost" class="blockform">
-	<h2><span><?php echo $lang_topic['Quick post'] ?></span></h2>
+	<h2><span><?php echo __('Quick post') ?></span></h2>
 	<div class="box">
 		<form id="quickpostform" method="post" action="<?php echo get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_common['Write message legend'] ?></legend>
+					<legend><?php echo __('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
@@ -139,21 +139,22 @@
 <?php endif;
 
     if ($feather->user->is_guest) {
-        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong>' : $lang_common['Email'];
+        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
         $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
         ?>
-						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
 <?php
 
-    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.$lang_common['Message'].' <span>'.$lang_common['Required'].'</span></strong><br />';
+    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.__('Message').' <span>'.__('Required').'</span></strong><br />';
     } else {
         echo "\t\t\t\t\t\t".'<label>';
     }
 
     ?>
 <!-- Init BBcode editor toolbar -->
+<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
@@ -163,13 +164,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off'];
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>
@@ -178,15 +179,15 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
+					<legend><?php echo __('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_antispam['Robot info']    ?></p>
+						<p><?php echo __('Robot info')    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
     $qencoded = md5($question[$index_questions]);
-    echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);
+    echo sprintf(__('Robot question'), $question[$index_questions]);
     ?>
-							 <span><?php echo $lang_common['Required'] ?></span></strong>
+							 <span><?php echo __('Required') ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -195,7 +196,7 @@
 			</div>
 			<?php endif;
     ?>
-			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_topic['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
+			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo __('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
 		</form>
 	</div>
 </div>

From b809d88b8ec2b7b06004ef47433a658de7f2870a Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 13 Aug 2015 14:50:22 +0200
Subject: [PATCH 027/353] Revert "Merge development"

This reverts commit 6807cb5cd3d5d81c4420df1a0f9323e713807950.
---
 Slim/Extras/Middleware/FeatherBB.php          | 374 ++++++++++++-
 controller/admin/bans.php                     |  18 +-
 controller/admin/categories.php               |  20 +-
 controller/admin/censoring.php                |   4 +-
 controller/admin/forums.php                   |  16 +-
 controller/admin/groups.php                   |  14 +-
 controller/admin/index.php                    |   4 +-
 controller/admin/maintenance.php              |   4 +-
 controller/admin/options.php                  |   4 +-
 controller/admin/parser.php                   |   4 +-
 controller/admin/permissions.php              |   4 +-
 controller/admin/plugins.php                  |   8 +-
 controller/admin/reports.php                  |   4 +-
 controller/admin/statistics.php               |   8 +-
 controller/admin/users.php                    |  24 +-
 controller/delete.php                         |  17 +-
 controller/edit.php                           |  24 +-
 controller/footer.php                         |   3 +
 controller/header.php                         |  41 +-
 controller/help.php                           |  18 +-
 controller/index.php                          |  10 +-
 controller/login.php                          |  33 +-
 controller/misc.php                           |  72 ++-
 controller/moderate.php                       | 113 ++--
 controller/post.php                           |  46 +-
 controller/profile.php                        | 121 +++--
 controller/register.php                       |  36 +-
 controller/search.php                         |  24 +-
 controller/userlist.php                       |  22 +-
 controller/viewforum.php                      |  16 +-
 controller/viewtopic.php                      |  33 +-
 extern.php                                    |  40 +-
 include/cache.php                             |   6 +-
 include/common.php                            | 204 --------
 include/email.php                             |   4 +-
 include/functions.php                         | 119 ++---
 include/idiorm.php                            |  25 +-
 include/l10n.php                              |  75 ---
 include/parser.php                            |  70 +--
 include/pomo/.editorconfig                    |  16 -
 include/pomo/MO.php                           | 313 -----------
 include/pomo/PO.php                           | 494 ------------------
 include/pomo/Streams/CachedFileReader.php     |  25 -
 include/pomo/Streams/CachedIntFileReader.php  |  20 -
 include/pomo/Streams/FileReader.php           |  60 ---
 include/pomo/Streams/Reader.php               | 120 -----
 include/pomo/Streams/StringReader.php         |  61 ---
 .../pomo/Translations/EntryTranslations.php   |  89 ----
 .../pomo/Translations/GettextTranslations.php | 127 -----
 .../pomo/Translations/NOOPTranslations.php    | 104 ----
 include/pomo/Translations/Translations.php    | 173 ------
 .../Translations/TranslationsInterface.php    |  94 ----
 include/routes.php                            |   6 +-
 index.php                                     |  25 +-
 install/index.php                             | 219 ++++----
 lang/English/antispam.mo                      | Bin 751 -> 0 bytes
 lang/English/antispam.po                      |  27 -
 lang/English/antispam_questions.mo            | Bin 765 -> 0 bytes
 lang/English/antispam_questions.po            |  43 --
 lang/English/bbeditor.mo                      | Bin 1082 -> 0 bytes
 lang/English/bbeditor.php                     |  25 +
 lang/English/bbeditor.po                      |  63 ---
 lang/English/common.mo                        | Bin 9404 -> 0 bytes
 lang/English/common.php                       | 184 +++++++
 lang/English/common.po                        | 473 -----------------
 lang/English/convertor.php                    |  20 -
 lang/English/delete.mo                        | Bin 1003 -> 0 bytes
 lang/English/delete.php                       |  16 +
 lang/English/delete.po                        |  42 --
 lang/English/forum.mo                         | Bin 866 -> 0 bytes
 lang/English/forum.php                        |  17 +
 lang/English/forum.po                         |  45 --
 lang/English/help.mo                          | Bin 4255 -> 0 bytes
 lang/English/help.php                         |  66 +++
 lang/English/help.po                          | 165 ------
 lang/English/index.mo                         | Bin 1064 -> 0 bytes
 lang/English/index.php                        |  20 +
 lang/English/index.po                         |  54 --
 lang/English/install.mo                       | Bin 9441 -> 0 bytes
 lang/English/install.php                      | 100 ++++
 lang/English/install.po                       | 291 -----------
 lang/English/login.mo                         | Bin 1877 -> 0 bytes
 lang/English/login.php                        |  26 +
 lang/English/login.po                         |  63 ---
 lang/English/misc.mo                          | Bin 5068 -> 0 bytes
 lang/English/misc.php                         |  93 ++++
 lang/English/misc.po                          | 225 --------
 lang/English/post.mo                          | Bin 2395 -> 0 bytes
 lang/English/post.php                         |  38 ++
 lang/English/post.po                          |  93 ----
 lang/English/prof_reg.mo                      | Bin 5891 -> 0 bytes
 lang/English/prof_reg.php                     |  79 +++
 lang/English/prof_reg.po                      | 225 --------
 lang/English/profile.mo                       | Bin 9585 -> 0 bytes
 lang/English/profile.php                      | 143 +++++
 lang/English/profile.po                       | 378 --------------
 lang/English/register.mo                      | Bin 3064 -> 0 bytes
 lang/English/register.php                     |  37 ++
 lang/English/register.po                      |  84 ---
 lang/English/search.mo                        | Bin 4068 -> 0 bytes
 lang/English/search.php                       |  64 +++
 lang/English/search.po                        | 174 ------
 lang/English/topic.mo                         | Bin 1475 -> 0 bytes
 lang/English/topic.php                        |  33 ++
 lang/English/topic.po                         |  93 ----
 lang/English/update.mo                        | Bin 7678 -> 0 bytes
 lang/English/update.php                       |  74 +++
 lang/English/update.po                        | 195 -------
 lang/English/userlist.mo                      | Bin 898 -> 0 bytes
 lang/English/userlist.php                     |  13 +
 lang/English/userlist.po                      |  33 --
 model/admin/bans.php                          |   8 +-
 model/admin/groups.php                        |  10 +-
 model/admin/options.php                       |  14 +-
 model/admin/users.php                         |   6 +-
 model/delete.php                              |  10 +-
 model/edit.php                                |  36 +-
 model/index.php                               |  22 +-
 model/login.php                               |  20 +-
 model/misc.php                                |  70 ++-
 model/moderate.php                            | 114 ++--
 model/post.php                                |  50 +-
 model/profile.php                             | 201 +++----
 model/register.php                            |  26 +-
 model/search.php                              |  77 +--
 model/viewforum.php                           |  36 +-
 model/viewtopic.php                           |  86 +--
 readme.md                                     |  42 +-
 .../view/admin/groups/add_edit_group.php      |   2 +-
 style/FeatherBB/view/delete.php               |  12 +-
 style/FeatherBB/view/edit.php                 |  31 +-
 style/FeatherBB/view/footer.php               |  42 +-
 style/FeatherBB/view/header.php               |  10 +-
 style/FeatherBB/view/help.php                 | 128 ++---
 style/FeatherBB/view/index.php                |  30 +-
 style/FeatherBB/view/login/form.php           |  16 +-
 .../view/login/password_forgotten.php         |  14 +-
 style/FeatherBB/view/message.php              |   4 +-
 style/FeatherBB/view/misc/email.php           |  12 +-
 style/FeatherBB/view/misc/report.php          |  12 +-
 style/FeatherBB/view/misc/rules.php           |   2 +-
 .../FeatherBB/view/moderate/delete_posts.php  |   8 +-
 .../FeatherBB/view/moderate/delete_topics.php |   8 +-
 .../FeatherBB/view/moderate/merge_topics.php  |   8 +-
 .../view/moderate/moderator_forum.php         |  22 +-
 style/FeatherBB/view/moderate/move_topics.php |  10 +-
 style/FeatherBB/view/moderate/posts_view.php  |  16 +-
 style/FeatherBB/view/moderate/split_posts.php |  12 +-
 style/FeatherBB/view/post.php                 |  41 +-
 style/FeatherBB/view/profile/change_mail.php  |  12 +-
 style/FeatherBB/view/profile/change_pass.php  |  14 +-
 style/FeatherBB/view/profile/delete_user.php  |  12 +-
 style/FeatherBB/view/profile/menu.php         |  16 +-
 .../FeatherBB/view/profile/section_admin.php  |  20 +-
 .../view/profile/section_display.php          |  30 +-
 .../view/profile/section_essentials.php       | 118 ++---
 .../view/profile/section_messaging.php        |  16 +-
 .../view/profile/section_personal.php         |  12 +-
 .../view/profile/section_personality.php      |  22 +-
 .../view/profile/section_privacy.php          |  20 +-
 .../FeatherBB/view/profile/upload_avatar.php  |  10 +-
 style/FeatherBB/view/profile/view_profile.php |  10 +-
 style/FeatherBB/view/register/email.php       |  12 +-
 style/FeatherBB/view/register/form.php        |  44 +-
 style/FeatherBB/view/register/rules.php       |   6 +-
 style/FeatherBB/view/search/footer.php        |   2 +-
 style/FeatherBB/view/search/form.php          |  52 +-
 style/FeatherBB/view/search/header.php        |  12 +-
 style/FeatherBB/view/search/posts.php         |   8 +-
 style/FeatherBB/view/search/topics.php        |   2 +-
 style/FeatherBB/view/userlist.php             |  40 +-
 style/FeatherBB/view/viewforum.php            |  14 +-
 style/FeatherBB/view/viewtopic.php            |  37 +-
 view/admin/groups/add_edit_group.php          |   2 +-
 view/delete.php                               |  12 +-
 view/edit.php                                 | 119 +++--
 view/footer.php                               |  42 +-
 view/header.php                               |   8 +-
 view/help.php                                 | 128 ++---
 view/index.php                                |  30 +-
 view/login/form.php                           |  16 +-
 view/login/password_forgotten.php             |  14 +-
 view/message.php                              |   4 +-
 view/misc/email.php                           |  12 +-
 view/misc/report.php                          |  12 +-
 view/misc/rules.php                           |   2 +-
 view/moderate/delete_posts.php                |   8 +-
 view/moderate/delete_topics.php               |   8 +-
 view/moderate/merge_topics.php                |   8 +-
 view/moderate/moderator_forum.php             |  22 +-
 view/moderate/move_topics.php                 |  10 +-
 view/moderate/posts_view.php                  |  16 +-
 view/moderate/split_posts.php                 |  12 +-
 view/post.php                                 |  41 +-
 view/profile/change_mail.php                  |  12 +-
 view/profile/change_pass.php                  |  14 +-
 view/profile/delete_user.php                  |  12 +-
 view/profile/menu.php                         |  16 +-
 view/profile/section_admin.php                |  20 +-
 view/profile/section_display.php              |  30 +-
 view/profile/section_essentials.php           | 118 ++---
 view/profile/section_messaging.php            |  16 +-
 view/profile/section_personal.php             |  12 +-
 view/profile/section_personality.php          |  22 +-
 view/profile/section_privacy.php              |  20 +-
 view/profile/upload_avatar.php                |  10 +-
 view/profile/view_profile.php                 |  10 +-
 view/register/email.php                       |  12 +-
 view/register/form.php                        |  44 +-
 view/register/rules.php                       |   6 +-
 view/search/footer.php                        |   2 +-
 view/search/form.php                          |  52 +-
 view/search/header.php                        |  12 +-
 view/search/posts.php                         |   8 +-
 view/search/topics.php                        |   2 +-
 view/userlist.php                             |  40 +-
 view/viewforum.php                            |  14 +-
 view/viewtopic.php                            |  37 +-
 218 files changed, 3603 insertions(+), 6715 deletions(-)
 delete mode 100644 include/common.php
 delete mode 100644 include/l10n.php
 delete mode 100644 include/pomo/.editorconfig
 delete mode 100644 include/pomo/MO.php
 delete mode 100644 include/pomo/PO.php
 delete mode 100644 include/pomo/Streams/CachedFileReader.php
 delete mode 100644 include/pomo/Streams/CachedIntFileReader.php
 delete mode 100644 include/pomo/Streams/FileReader.php
 delete mode 100644 include/pomo/Streams/Reader.php
 delete mode 100644 include/pomo/Streams/StringReader.php
 delete mode 100644 include/pomo/Translations/EntryTranslations.php
 delete mode 100644 include/pomo/Translations/GettextTranslations.php
 delete mode 100644 include/pomo/Translations/NOOPTranslations.php
 delete mode 100644 include/pomo/Translations/Translations.php
 delete mode 100644 include/pomo/Translations/TranslationsInterface.php
 delete mode 100644 lang/English/antispam.mo
 delete mode 100644 lang/English/antispam.po
 delete mode 100644 lang/English/antispam_questions.mo
 delete mode 100644 lang/English/antispam_questions.po
 delete mode 100644 lang/English/bbeditor.mo
 create mode 100644 lang/English/bbeditor.php
 delete mode 100644 lang/English/bbeditor.po
 delete mode 100644 lang/English/common.mo
 create mode 100644 lang/English/common.php
 delete mode 100644 lang/English/common.po
 delete mode 100644 lang/English/convertor.php
 delete mode 100644 lang/English/delete.mo
 create mode 100644 lang/English/delete.php
 delete mode 100644 lang/English/delete.po
 delete mode 100644 lang/English/forum.mo
 create mode 100644 lang/English/forum.php
 delete mode 100644 lang/English/forum.po
 delete mode 100644 lang/English/help.mo
 create mode 100644 lang/English/help.php
 delete mode 100644 lang/English/help.po
 delete mode 100644 lang/English/index.mo
 create mode 100644 lang/English/index.php
 delete mode 100644 lang/English/index.po
 delete mode 100644 lang/English/install.mo
 create mode 100644 lang/English/install.php
 delete mode 100644 lang/English/install.po
 delete mode 100644 lang/English/login.mo
 create mode 100644 lang/English/login.php
 delete mode 100644 lang/English/login.po
 delete mode 100644 lang/English/misc.mo
 create mode 100644 lang/English/misc.php
 delete mode 100644 lang/English/misc.po
 delete mode 100644 lang/English/post.mo
 create mode 100644 lang/English/post.php
 delete mode 100644 lang/English/post.po
 delete mode 100644 lang/English/prof_reg.mo
 create mode 100644 lang/English/prof_reg.php
 delete mode 100644 lang/English/prof_reg.po
 delete mode 100644 lang/English/profile.mo
 create mode 100644 lang/English/profile.php
 delete mode 100644 lang/English/profile.po
 delete mode 100644 lang/English/register.mo
 create mode 100644 lang/English/register.php
 delete mode 100644 lang/English/register.po
 delete mode 100644 lang/English/search.mo
 create mode 100644 lang/English/search.php
 delete mode 100644 lang/English/search.po
 delete mode 100644 lang/English/topic.mo
 create mode 100644 lang/English/topic.php
 delete mode 100644 lang/English/topic.po
 delete mode 100644 lang/English/update.mo
 create mode 100644 lang/English/update.php
 delete mode 100644 lang/English/update.po
 delete mode 100644 lang/English/userlist.mo
 create mode 100644 lang/English/userlist.php
 delete mode 100644 lang/English/userlist.po

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 2ebb1aaf..c240ed60 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -1,36 +1,137 @@
 <?php
 /**
- * FeatherBB
  *
- *
- * USAGE
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  *
  * $app = new \Slim\Slim();
- * $app->add(new \Slim\Extras\Middleware\FeatherBB());
+ * $app->add(new \Slim\Extras\Middleware\FeatherBB($params));
  *
  */
+
 namespace Slim\Extras\Middleware;
+use DB;
 
 class FeatherBB extends \Slim\Middleware
 {
-	protected $settings = array();
+    protected $data = array();
 
-	public function __construct()
+	public function __construct(array $user_forum_settings = array())
 	{
+        // Define forum env constants
+        $this->data['forum_env'] = array(
+                                    'FEATHER' => true,
+                                    'FEATHER_ROOT' => dirname(__FILE__).'/../../../',
+                                    'FORUM_VERSION' => '1.0.0',
+                                    'FORUM_NAME' => 'FeatherBB',
+                                    'FORUM_DB_REVISION' => 21,
+                                    'FORUM_SI_REVISION' => 2,
+                                    'FORUM_PARSER_REVISION' => 2,
+                                    'FORUM_CACHE_DIR' => dirname(__FILE__).'/../../../cache/', // TODO : Move in user settings
+                                    'FEATHER_UNVERIFIED' => 0,
+                                    'FEATHER_ADMIN' => 1,
+                                    'FEATHER_MOD' => 2,
+                                    'FEATHER_GUEST' => 3,
+                                    'FEATHER_MEMBER' => 4,
+                                    'FEATHER_MAX_POSTSIZE' => 32768,
+                                    'FEATHER_SEARCH_MIN_WORD' => 3,
+                                    'FEATHER_SEARCH_MAX_WORD' => 20,
+                                    'FORUM_MAX_COOKIE_SIZE' => 4048,
+                                    'FEATHER_SHOW_QUERIES' => 1
+                                    );
+
+        // Define forum settings / TODO : handle settings with a class / User input overrides all previous settings
+        $this->data['forum_settings'] = array_merge(self::load_default_settings(), $user_forum_settings);
 
+        // Load DB settings
+        $this->init_db();
 	}
 
-    public function call() 
+    public static function load_default_settings()
+    {
+        return array(
+                // Database
+                'db_type' => 'mysqli',
+                'db_host' => '',
+                'db_name' => '',
+                'db_user' => '',
+                'db_pass' => '',
+                'db_prefix' => '',
+                // Cookies
+                'cookie_name' => 'feather_cookie',
+                'cookie_seed' => 'changeme', // MUST BE CHANGED !!!
+                // Debug
+                'debug' => false,
+                );
+    }
+
+    public function init_db()
+    {
+        require_once $this->data['forum_env']['FEATHER_ROOT'].'include/idiorm.php';
+        switch ($this->data['forum_settings']['db_type']) {
+            case 'mysql':
+            case 'mysqli':
+            case 'mysql_innodb':
+            case 'mysqli_innodb':
+                DB::configure('mysql:host='.$this->data['forum_settings']['db_host'].';dbname='.$this->data['forum_settings']['db_name']);
+                DB::configure('driver_options', array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+                break;
+            case 'sqlite';
+            case 'sqlite3';
+                DB::configure('sqlite:./'.$this->data['forum_settings']['db_name']);
+                break;
+            case 'pgsql':
+                \DB::configure('pgsql:host='.$this->data['forum_settings']['db_host'].'dbname='.$this->data['forum_settings']['db_name']);
+                break;
+        }
+        DB::configure('username', $this->data['forum_settings']['db_user']);
+        DB::configure('password', $this->data['forum_settings']['db_pass']);
+        DB::configure('logging', true);
+        DB::configure('id_column_overrides', array(
+            'groups' => 'g_id',
+        ));
+    }
+
+    // Getters / setters for Slim container (avoid magic get error)
+
+    public function set_forum_env($key, $value = null)
+    {
+        $tmp = (!is_array($key) && !is_null($value)) ? array($key, $value) : $key;
+        foreach ($tmp as $key => $value) {
+            $this->app->container->get('forum_env')[$key] = $value;
+        }
+
+    }
+
+    public function set_forum_settings($key, $value = null)
+    {
+        $tmp = (!is_array($key) && !is_null($value)) ? array($key, $value) : $key;
+        foreach ($tmp as $key => $value) {
+            $this->app->container->get('forum_settings')[$key] = $value;
+        }
+    }
+
+    public function hydrate($data)
     {
-        $feather = $this->app;
+        foreach ($data as $key => $value) {
+            $this->app->container[$key] = $value;
+        }
+    }
 
-       	// Block prefetch requests
-        $this->app->hook('slim.before', function () use ($feather) {
-        	if ((isset($feather->environment['HTTP_X_MOZ'])) && ($feather->environment['HTTP_X_MOZ'] == 'prefetch')) {
-                $feather->halt(403, 'Prefetch forbidden');
-        	}
-        });
+    // Legacy function, to ensure backward compatibility with globals
+    public function env_to_globals(array $vars)
+    {
+        foreach ($vars as $key => $value) {
+            define($key, $value);
+        }
+    }
 
+    // Headers
+
+    public function set_headers()
+    {
         // No cache headers
         $this->app->response->headers->set('Cache-Control', 'no-cache, no-store, must-revalidate');
         $this->app->response->headers->set('Pragma', 'no-cache');
@@ -41,11 +142,250 @@ public function call()
         // Prevent the site to be embedded in iFrame
         $this->app->response->headers->set('X-Frame-Options', 'deny');
         // Yeah !
-        $this->app->response->headers->set('X-Powered-By', 'FeatherBB');
+        $this->app->response->headers->set('X-Powered-By', $this->app->forum_env['FORUM_NAME']);
+    }
+
+    // Auth
+
+    public function authenticate()
+    {
+        $now = time();
+
+        // Get FeatherBB cookie
+        $cookie_raw = $this->app->getCookie($this->data['forum_settings']['cookie_name']);
+        // Check if cookie exists and is valid (getCookie method returns false if the data has been tampered locally so it can't decrypt the cookie);
+        if (isset($cookie_raw)) {
+            $cookie = json_decode($cookie_raw, true);
+            $checksum = hash_hmac('sha1', $cookie['user_id'].$cookie['expires'], $this->data['forum_settings']['cookie_seed'].'_checksum');
+            // If cookie has a non-guest user, hasn't expired and is legit
+            if ($cookie['user_id'] > 1 && $cookie['expires'] > $now && $checksum == $cookie['checksum']) {
+                // Get user info from db
+                $select_check_cookie = array('u.*', 'g.*', 'o.logged', 'o.idle');
+                $where_check_cookie = array('u.id' => intval($cookie['user_id']));
+
+                $result = DB::for_table('users')
+                    ->table_alias('u')
+                    ->select_many($select_check_cookie)
+                    ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
+                    ->left_outer_join('online', array('o.user_id', '=', 'u.id'), 'o')
+                    ->where($where_check_cookie)
+                    ->find_result_set();
+
+                foreach ($result as $this->app->user);
+
+                // Another security check, to prevent identity fraud by changing the user id in the cookie) (might be useless considering the strength of encryption)
+                if (isset($this->app->user->id) && hash_hmac('sha1', $this->app->user->password, $this->data['forum_settings']['cookie_seed'].'_password_hash') === $cookie['password_hash']) {
+                    $expires = ($cookie['expires'] > $now + $this->data['forum_settings']['o_timeout_visit']) ? $now + 1209600 : $now + $this->data['forum_settings']['o_timeout_visit'];
+                    $this->app->user->is_guest = false;
+                    $this->app->user->is_admmod = $this->app->user->g_id == $this->data['forum_env']['FEATHER_ADMIN'] || $this->app->g_moderator == '1';
+                    if (!$this->app->user->disp_topics) {
+                        $this->app->user->disp_topics = $this->data['forum_settings']['o_disp_topics_default'];
+                    }
+                    if (!$this->app->user->disp_posts) {
+                        $this->app->user->disp_posts = $this->data['forum_settings']['o_disp_posts_default'];
+                    }
+                    if (!file_exists($this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language)) {
+                        $this->app->user->language = $this->data['forum_settings']['o_default_lang'];
+                    }
+                    if (!file_exists($this->data['forum_env']['FEATHER_ROOT'].'style/'.$this->app->user->style.'.css')) {
+                        $this->app->user->style = $this->data['forum_settings']['o_default_style'];
+                    }
+                    feather_setcookie($this->app->user->id, $this->app->user->password, $expires);
+                    $this->update_online();
+                    return true;
+                }
+            }
+        }
+
+        // If there is no cookie, or cookie is guest or expired, let's reconnect.
+        $expires = $now + 31536000; // The cookie expires after a year
+
+        // Fetch guest user
+        $select_set_default_user = array('u.*', 'g.*', 'o.logged', 'o.last_post', 'o.last_search');
+        $where_set_default_user = array('u.id' => '1');
+
+        $result = DB::for_table('users')
+            ->table_alias('u')
+            ->select_many($select_set_default_user)
+            ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
+            ->left_outer_join('online', array('o.ident', '=', $this->app->request->getIp()), 'o', true)
+            ->where($where_set_default_user)
+            ->find_result_set();
+
+        if (!$result) {
+            exit('Unable to fetch guest information. Your database must contain both a guest user and a guest user group.');
+        }
 
-        // Call next middleware.
-        $this->next->call();
+        foreach ($result as $this->app->user);
+
+        $this->app->user->disp_topics = $this->data['forum_settings']['o_disp_topics_default'];
+        $this->app->user->disp_posts = $this->data['forum_settings']['o_disp_posts_default'];
+        $this->app->user->timezone = $this->data['forum_settings']['o_default_timezone'];
+        $this->app->user->dst = $this->data['forum_settings']['o_default_dst'];
+        $this->app->user->language = $this->data['forum_settings']['o_default_lang'];
+        $this->app->user->style = $this->data['forum_settings']['o_default_style'];
+        $this->app->user->is_guest = true;
+        $this->app->user->is_admmod = false;
+
+        // Update online list
+        if (!$this->app->user->logged) {
+            $this->app->user->logged = time();
+
+            // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
+            switch ($this->data['forum_settings']['db_type']) {
+                case 'mysql':
+                case 'mysqli':
+                case 'mysql_innodb':
+                case 'mysqli_innodb':
+                case 'sqlite':
+                case 'sqlite3':
+                DB::for_table('online')->raw_execute('REPLACE INTO online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
+                    break;
+
+                default:
+                    DB::for_table('online')->raw_execute('INSERT INTO online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE ident=:ident)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
+                    break;
+            }
+        } else {
+            DB::for_table('online')->where('ident', $this->app->request->getIp())
+                 ->update_many('logged', time());
+        }
+
+        feather_setcookie(1, feather_hash(uniqid(rand(), true)), $expires);
+        return true;
     }
 
+    public function update_online()
+    {
+        $now = time();
+
+        // Define this if you want this visit to affect the online list and the users last visit data
+        if (!defined('FEATHER_QUIET_VISIT')) {
+            // Update the online list
+            if (!$this->app->user->logged) {
+                $this->app->user->logged = $now;
+
+                // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
+                switch ($this->data['forum_settings']['db_type']) {
+                    case 'mysql':
+                    case 'mysqli':
+                    case 'mysql_innodb':
+                    case 'mysqli_innodb':
+                    case 'sqlite':
+                    case 'sqlite3':
+                        DB::for_table('online')->raw_execute('REPLACE INTO online (user_id, ident, logged) VALUES(:user_id, :ident, :logged)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
+                        break;
+
+                    default:
+                        DB::for_table('online')->raw_execute('INSERT INTO online (user_id, ident, logged) SELECT :user_id, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE user_id=:user_id)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
+                        break;
+                }
 
+                // Reset tracked topics
+                set_tracked_topics(null);
+
+            } else {
+                // Special case: We've timed out, but no other user has browsed the forums since we timed out
+                if ($this->app->user->logged < ($now-$this->data['forum_settings']['o_timeout_visit'])) {
+                    DB::for_table('users')->where('id', $this->app->user->id)
+                        ->find_one()
+                        ->set('last_visit', $this->app->user->logged)
+                        ->save();
+                    $this->app->user->last_visit = $this->app->user->logged;
+                }
+
+                $idle_sql = ($this->app->user->idle == '1') ? ', idle=0' : '';
+
+                DB::for_table('online')->raw_execute('UPDATE online SET logged='.$now.$idle_sql.' WHERE user_id=:user_id', array(':user_id' => $this->app->user->id));
+
+                // Update tracked topics with the current expire time
+                $cookie_tracked_topics = $this->app->getCookie($this->data['forum_settings']['cookie_name'].'_track');
+                if (isset($cookie_tracked_topics)) {
+                    set_tracked_topics(json_decode($cookie_tracked_topics, true));
+                }
+            }
+        } else {
+            if (!$this->app->user->logged) {
+                $this->app->user->logged = $this->app->user->last_visit;
+            }
+        }
+    }
+
+    //
+
+    public function call()
+    {
+        global $lang_common, $feather_bans, $db_type, $cookie_name, $cookie_seed, $forum_time_formats, $forum_date_formats, $feather_config; // Legacy
+
+        if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) { // Block prefetch requests
+            $this->set_headers();
+            $this->app->response->setStatus(403);
+        } else {
+            $this->env_to_globals($this->data['forum_env']); // Legacy : define globals from forum_env
+
+            require_once $this->data['forum_env']['FEATHER_ROOT'].'include/utf8/utf8.php';
+            require_once $this->data['forum_env']['FEATHER_ROOT'].'include/functions.php';
+
+            // Get forum config and load it into forum_settings array
+            if (file_exists($this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php')) {
+                include $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php';
+            } else {
+                require_once $this->data['forum_env']['FEATHER_ROOT'].'include/cache.php';
+                generate_config_cache();
+                require $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php';
+            }
+            $this->data['forum_settings'] = array_merge($feather_config, $this->data['forum_settings']);
+            // Define time formats
+            $forum_time_formats = array($this->data['forum_settings']['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
+            $forum_date_formats = array($this->data['forum_settings']['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
+            // Populate Feather object (Slim instance)
+            $this->hydrate($this->data);
+
+            $this->app->config = $this->data['forum_settings']; // Legacy
+            extract($this->data['forum_settings']); // Legacy
+
+            $this->set_headers();
+
+            // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
+            setlocale(LC_CTYPE, 'C');
+
+            $this->authenticate();
+
+            // Attempt to load the common language file
+            if (file_exists($this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php')) {
+                include $this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php';
+            } else {
+                die('There is no valid language pack \''.feather_escape($this->app->user->language).'\' installed. Please reinstall a language of that name');
+            }
+
+            // Check if we are to display a maintenance message
+            if ($this->data['forum_settings']['o_maintenance'] && $this->app->user->g_id > $this->data['forum_env']['FEATHER_ADMIN'] && !defined('FEATHER_TURN_OFF_MAINT')) {
+                maintenance_message();
+            }
+
+            // Load cached bans
+            if (file_exists($this->data['forum_env']['FORUM_CACHE_DIR'].'cache_bans.php')) {
+                include $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_bans.php';
+            }
+
+            if (!defined('FEATHER_BANS_LOADED')) {
+                if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
+                    require_once $this->data['forum_env']['FEATHER_ROOT'].'include/cache.php';
+                }
+
+                generate_bans_cache();
+                require_once $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_bans.php';
+            }
+
+            // Check if current user is banned
+            check_bans();
+
+            // Update online list
+            update_users_online();
+
+            // Configure Slim
+            $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? FEATHER_ROOT.'style/'.$this->app->user->style.'/view' : FEATHER_ROOT.'view');
+            $this->next->call();
+        }
+    }
 }
diff --git a/controller/admin/bans.php b/controller/admin/bans.php
index 6e544bc1..7b2544f0 100644
--- a/controller/admin/bans.php
+++ b/controller/admin/bans.php
@@ -30,14 +30,14 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common, $lang_admin_bans;
+        global $lang_common, $lang_admin_common, $lang_admin_bans;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the admin_bans.php language file
@@ -54,7 +54,7 @@ public function display()
             $start_from = 50 * ($p - 1);
 
             // Generate paging links
-            $paging_links = '<span class="pages-label">' . __('Pages') . ' </span>' . paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str']));
+            $paging_links = '<span class="pages-label">' . $lang_common['Pages'] . ' </span>' . paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str']));
 
             $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Bans'], $lang_admin_bans['Results head']);
             define('FEATHER_ACTIVE_PAGE', 'admin');
@@ -93,14 +93,14 @@ public function display()
 
     public function add($id = null)
     {
-        global $lang_admin_common, $lang_admin_bans;
+        global $lang_common, $lang_admin_common, $lang_admin_bans;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the admin_bans.php language file
@@ -131,12 +131,12 @@ public function add($id = null)
 
     public function delete($id)
     {
-        global $lang_admin_common, $lang_admin_bans;
+        global $lang_common, $lang_admin_common, $lang_admin_bans;
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the admin_bans.php language file
@@ -148,14 +148,14 @@ public function delete($id)
 
     public function edit($id)
     {
-        global $lang_admin_common, $lang_admin_bans;
+        global $lang_common, $lang_admin_common, $lang_admin_bans;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the admin_bans.php language file
diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index 07ddbe5b..8edac8f6 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -30,10 +30,10 @@ public function __autoload($class_name)
 
     public function add_category()
     {
-        global $lang_admin_common, $lang_admin_categories;
+        global $lang_common, $lang_admin_common, $lang_admin_categories;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the admin_options.php language file
@@ -54,10 +54,10 @@ public function add_category()
 
     public function edit_categories()
     {
-        global $lang_admin_common, $lang_admin_categories;
+        global $lang_common, $lang_admin_common, $lang_admin_categories;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the admin_options.php language file
@@ -65,7 +65,7 @@ public function edit_categories()
         require FEATHER_ROOT.'lang/'.$admin_language.'/categories.php';
 
         if (empty($this->request->post('cat'))) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         $categories = array();
@@ -90,10 +90,10 @@ public function edit_categories()
 
     public function delete_category()
     {
-        global $lang_admin_common, $lang_admin_categories;
+        global $lang_common, $lang_admin_common, $lang_admin_categories;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the admin_options.php language file
@@ -103,7 +103,7 @@ public function delete_category()
         $cat_to_delete = (int) $this->request->post('cat_to_delete');
 
         if ($cat_to_delete < 1) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         if (intval($this->request->post('disclaimer')) != 1) {
@@ -119,12 +119,12 @@ public function delete_category()
 
     public function display()
     {
-        global $lang_admin_common, $lang_admin_categories;
+        global $lang_common, $lang_admin_common, $lang_admin_categories;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/censoring.php b/controller/admin/censoring.php
index 469ef9cc..1c9a2872 100644
--- a/controller/admin/censoring.php
+++ b/controller/admin/censoring.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common, $lang_admin_censoring;
+        global $lang_common, $lang_admin_common, $lang_admin_censoring;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index 3d0e3610..f204e2c7 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -34,10 +34,10 @@ public function __autoload($class_name)
 
     public function add_forum()
     {
-        global $lang_admin_common, $lang_admin_forums;
+        global $lang_common, $lang_admin_common, $lang_admin_forums;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the admin_options.php language file
@@ -66,10 +66,10 @@ public function add_forum()
 
     public function edit_forum($forum_id)
     {
-        global $lang_admin_common, $lang_admin_forums;
+        global $lang_common, $lang_admin_common, $lang_admin_forums;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the admin_options.php language file
@@ -172,10 +172,10 @@ public function edit_forum($forum_id)
 
     public function delete_forum($forum_id)
     {
-        global $lang_admin_common, $lang_admin_forums;
+        global $lang_common, $lang_admin_common, $lang_admin_forums;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -239,12 +239,12 @@ public function edit_positions()
     
     public function display()
     {
-        global $lang_admin_common, $lang_admin_forums;
+        global $lang_common, $lang_admin_common, $lang_admin_forums;
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index efae5d16..2a42b0d9 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common, $lang_admin_groups;
+        global $lang_common, $lang_admin_common, $lang_admin_groups;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -72,12 +72,12 @@ public function display()
 
     public function delete($id)
     {
-        global $lang_admin_common, $lang_admin_groups;
+        global $lang_common, $lang_admin_common, $lang_admin_groups;
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -86,7 +86,7 @@ public function delete($id)
         require FEATHER_ROOT . 'lang/' . $admin_language . '/groups.php';
 
         if ($id < 5) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         // Make sure we don't remove the default group
@@ -145,12 +145,12 @@ public function delete($id)
 
     public function addedit($id = '')
     {
-        global $lang_admin_common, $lang_admin_groups;
+        global $lang_common, $lang_admin_common, $lang_admin_groups;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/index.php b/controller/admin/index.php
index 08dedaa1..47dc4129 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -44,12 +44,12 @@ public function remove_install_folder($directory)
     
     public function display($action = null)
     {
-        global $lang_admin_common, $lang_admin_index;
+        global $lang_common, $lang_admin_common, $lang_admin_index;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the admin_index.php language file
diff --git a/controller/admin/maintenance.php b/controller/admin/maintenance.php
index a5bfbc11..e1527431 100644
--- a/controller/admin/maintenance.php
+++ b/controller/admin/maintenance.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_maintenance, $lang_admin_common;
+        global $lang_common, $lang_admin_maintenance, $lang_admin_common;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/options.php b/controller/admin/options.php
index 07e43253..c20d44d3 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common;
+        global $lang_common, $lang_admin_common;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index 650869f3..38b0e084 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_parser, $lang_admin_common;
+        global $lang_common, $lang_admin_parser, $lang_admin_common;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/permissions.php b/controller/admin/permissions.php
index f503b775..16adc0f5 100644
--- a/controller/admin/permissions.php
+++ b/controller/admin/permissions.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common, $lang_admin_permissions;
+        global $lang_common, $lang_admin_common, $lang_admin_permissions;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index ef747bd9..9cd51a51 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common;
+        global $lang_common, $lang_admin_common;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -43,13 +43,13 @@ public function display()
         // The plugin to load should be supplied via GET
         $plugin = $this->request->get('plugin') ? $this->request->get('plugin') : '';
         if (!preg_match('%^AM?P_(\w*?)\.php$%i', $plugin)) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         // AP_ == Admins only, AMP_ == admins and moderators
         $prefix = substr($plugin, 0, strpos($plugin, '_'));
         if ($this->user->g_moderator == '1' && $prefix == 'AP') {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Make sure the file actually exists
diff --git a/controller/admin/reports.php b/controller/admin/reports.php
index 681f2838..070ed31d 100644
--- a/controller/admin/reports.php
+++ b/controller/admin/reports.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common, $lang_admin_reports;
+        global $lang_common, $lang_admin_common, $lang_admin_reports;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index 6b442a66..8e11a0fe 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -30,12 +30,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common, $lang_admin_index;
+        global $lang_common, $lang_admin_common, $lang_admin_index;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -72,7 +72,7 @@ public function display()
 
     public function phpinfo()
     {
-        global $lang_admin_common, $lang_admin_index;
+        global $lang_common, $lang_admin_common, $lang_admin_index;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
@@ -80,7 +80,7 @@ public function phpinfo()
         require FEATHER_ROOT.'lang/'.$admin_language.'/index.php';
 
         if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Show phpinfo() output
diff --git a/controller/admin/users.php b/controller/admin/users.php
index e6e9250f..17e7b580 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -30,14 +30,14 @@ public function __autoload($class_name)
 
     public function display()
     {
-        global $lang_admin_common, $lang_admin_users;
+        global $lang_common, $lang_admin_common, $lang_admin_users;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the admin_bans.php language file
@@ -46,7 +46,7 @@ public function display()
         // Move multiple users to other user groups
         if ($this->request->post('move_users') || $this->request->post('move_users_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             }
 
             $move = $this->model->move_users();
@@ -73,7 +73,7 @@ public function display()
         // Delete multiple users
         if ($this->request->post('delete_users') || $this->request->post('delete_users_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             }
 
             $user_ids = $this->model->delete_users();
@@ -100,7 +100,7 @@ public function display()
         // Ban multiple users
         if ($this->request->post('ban_users') || $this->request->post('ban_users_comply')) {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             }
 
             $user_ids = $this->model->ban_users();
@@ -140,7 +140,7 @@ public function display()
             $start_from = 50 * ($p - 1);
 
             // Generate paging links
-            $paging_links = '<span class="pages-label">' . __('Pages') . ' </span>' . paginate_old($num_pages, $p, '?find_user=&amp;'.implode('&amp;', $search['query_str']));
+            $paging_links = '<span class="pages-label">' . $lang_common['Pages'] . ' </span>' . paginate_old($num_pages, $p, '?find_user=&amp;'.implode('&amp;', $search['query_str']));
 
             // Some helper variables for permissions
             $can_delete = $can_move = $this->user->g_id == FEATHER_ADMIN;
@@ -192,14 +192,14 @@ public function display()
     // Show IP statistics for a certain user ID
     public function ipstats($id)
     {
-        global $lang_admin_common, $lang_admin_users;
+        global $lang_common, $lang_admin_common, $lang_admin_users;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the admin_bans.php language file
@@ -215,7 +215,7 @@ public function ipstats($id)
         $start_from = 50 * ($p - 1);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$id);
+        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$id);
 
         $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Users'], $lang_admin_users['Results head']);
 
@@ -237,14 +237,14 @@ public function ipstats($id)
     // Show IP statistics for a certain user IP
     public function showusers($ip)
     {
-        global $lang_admin_common, $lang_admin_users;
+        global $lang_common, $lang_admin_common, $lang_admin_users;
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         require FEATHER_ROOT . 'include/common_admin.php';
 
         if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the admin_bans.php language file
@@ -264,7 +264,7 @@ public function showusers($ip)
         $start_from = 50 * ($p - 1);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$ip);
+        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$ip);
 
         $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Users'], $lang_admin_users['Results head']);
 
diff --git a/controller/delete.php b/controller/delete.php
index 1c0848b4..b228c4ac 100644
--- a/controller/delete.php
+++ b/controller/delete.php
@@ -21,8 +21,6 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\delete();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/delete.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
     }
 
     public function __autoload($class_name)
@@ -32,10 +30,10 @@ public function __autoload($class_name)
     
     public function deletepost($id)
     {
-        global $pd;
+        global $lang_common, $lang_post, $pd;
 
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            message($lang_common['No view'], '403');
         }
 
         // Fetch some informations about the post, the topic and the forum
@@ -57,20 +55,23 @@ public function deletepost($id)
                 $cur_post['poster_id'] != $this->user->id ||
                 $cur_post['closed'] == '1') &&
                 !$is_admmod) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
+        // Load the delete.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/delete.php';
+
 
         if ($this->feather->request()->isPost()) {
             $this->model->handle_deletion($is_topic_post, $id, $cur_post['tid'], $cur_post['fid']);
         }
 
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Delete post'));
+        $page_title = array(feather_escape($this->config['o_board_title']), $lang_delete['Delete post']);
 
         define('FEATHER_ACTIVE_PAGE', 'delete');
 
@@ -80,6 +81,8 @@ public function deletepost($id)
         $cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
 
         $this->feather->render('delete.php', array(
+                            'lang_common' => $lang_common,
+                            'lang_delete' => $lang_delete,
                             'cur_post' => $cur_post,
                             'id' => $id,
                             'is_topic_post' => $is_topic_post,
diff --git a/controller/edit.php b/controller/edit.php
index e412751a..b2f60660 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -21,10 +21,6 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\edit();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.mo');
     }
 
     public function __autoload($class_name)
@@ -34,8 +30,10 @@ public function __autoload($class_name)
     
     public function editpost($id)
     {
+        global $lang_common, $lang_prof_reg, $lang_post, $lang_register;
+
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            message($lang_common['No view'], '403');
         }
 
         // Fetch some informations about the post, the topic and the forum
@@ -54,12 +52,15 @@ public function editpost($id)
 
         // Do we have permission to edit this post?
         if (($this->user->g_edit_posts == '0' || $cur_post['poster_id'] != $this->user->id || $cur_post['closed'] == '1') && !$is_admmod) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
+
+        // Load the post.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/post.php';
         
         // Load the bbeditor.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.php';
@@ -79,15 +80,15 @@ public function editpost($id)
                 // Edit the post
                 $this->model->edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod);
 
-                redirect(get_link('post/'.$id.'/#p'.$id), __('Post redirect'));
+                redirect(get_link('post/'.$id.'/#p'.$id), $lang_post['Post redirect']);
             }
         } else {
             $post = '';
         }
 
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Edit post'));
-        $required_fields = array('req_subject' => __('Subject'), 'req_message' => __('Message'));
+        $page_title = array(feather_escape($this->config['o_board_title']), $lang_post['Edit post']);
+        $required_fields = array('req_subject' => $lang_common['Subject'], 'req_message' => $lang_common['Message']);
         $focus_element = array('edit', 'req_message');
 
         define('FEATHER_ACTIVE_PAGE', 'edit');
@@ -102,7 +103,9 @@ public function editpost($id)
         }
 
         $this->feather->render('edit.php', array(
+                            'lang_common' => $lang_common,
                             'cur_post' => $cur_post,
+                            'lang_post' => $lang_post,
                             'errors' => $errors,
                             'preview_message' => $preview_message,
                             'id' => $id,
@@ -112,6 +115,7 @@ public function editpost($id)
                             'feather' => $this->feather,
                             'can_edit_subject' => $can_edit_subject,
                             'post' => $post,
+                            'lang_bbeditor' => $lang_bbeditor,
                             )
                     );
 
diff --git a/controller/footer.php b/controller/footer.php
index b852a21a..40f7964a 100644
--- a/controller/footer.php
+++ b/controller/footer.php
@@ -27,6 +27,8 @@ public function dontStop() {
 
     public function display($footer_style = null, $id = null, $p = null, $pid = null, $forum_id = null, $num_pages = null)
     {
+        global $lang_common;
+
         // Render the footer
         // If no footer style has been specified, we use the default (only copyright/debug info)
         $footer_style = isset($footer_style) ? $footer_style : null;
@@ -40,6 +42,7 @@ public function display($footer_style = null, $id = null, $p = null, $pid = null
         $num_pages = isset($num_pages) ? $num_pages : null;
 
         $this->feather->render('footer.php', array(
+                            'lang_common' => $lang_common,
                             'id' => $id,
                             'p' => $p,
                             'pid' => $pid,
diff --git a/controller/header.php b/controller/header.php
index c49878a1..5ee52832 100644
--- a/controller/header.php
+++ b/controller/header.php
@@ -77,6 +77,8 @@ public function setPageHead($page_head)
 
     public function display()
     {
+        global $lang_common;
+
         // START SUBST - <body> TODO
         /*if (isset($focus_element)) {
             $tpl_main = str_replace('<body onload="', '<body onload="document.getElementById(\''.$focus_element[0].'\').elements[\''.$focus_element[1].'\'].focus();', $tpl_main);
@@ -88,31 +90,31 @@ public function display()
         $links = array();
 
         // Index should always be displayed
-        $links[] = '<li id="navindex"'.((FEATHER_ACTIVE_PAGE == 'index') ? ' class="isactive"' : '').'><a href="'.get_base_url().'/">'.__('Index').'</a></li>';
+        $links[] = '<li id="navindex"'.((FEATHER_ACTIVE_PAGE == 'index') ? ' class="isactive"' : '').'><a href="'.get_base_url().'/">'.$lang_common['Index'].'</a></li>';
 
         if ($this->user->g_read_board == '1' && $this->user->g_view_users == '1') {
-            $links[] = '<li id="navuserlist"'.((FEATHER_ACTIVE_PAGE == 'userlist') ? ' class="isactive"' : '').'><a href="'.get_link('userlist/').'">'.__('User list').'</a></li>';
+            $links[] = '<li id="navuserlist"'.((FEATHER_ACTIVE_PAGE == 'userlist') ? ' class="isactive"' : '').'><a href="'.get_link('userlist/').'">'.$lang_common['User list'].'</a></li>';
         }
 
         if ($this->config['o_rules'] == '1' && (!$this->user->is_guest || $this->user->g_read_board == '1' || $this->config['o_regs_allow'] == '1')) {
-            $links[] = '<li id="navrules"'.((FEATHER_ACTIVE_PAGE == 'rules') ? ' class="isactive"' : '').'><a href="'.get_link('rules/').'">'.__('Rules').'</a></li>';
+            $links[] = '<li id="navrules"'.((FEATHER_ACTIVE_PAGE == 'rules') ? ' class="isactive"' : '').'><a href="'.get_link('rules/').'">'.$lang_common['Rules'].'</a></li>';
         }
 
         if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-            $links[] = '<li id="navsearch"'.((FEATHER_ACTIVE_PAGE == 'search') ? ' class="isactive"' : '').'><a href="'.get_link('search/').'">'.__('Search').'</a></li>';
+            $links[] = '<li id="navsearch"'.((FEATHER_ACTIVE_PAGE == 'search') ? ' class="isactive"' : '').'><a href="'.get_link('search/').'">'.$lang_common['Search'].'</a></li>';
         }
 
         if ($this->user->is_guest) {
-            $links[] = '<li id="navregister"'.((FEATHER_ACTIVE_PAGE == 'register') ? ' class="isactive"' : '').'><a href="'.get_link('register/').'">'.__('Register').'</a></li>';
-            $links[] = '<li id="navlogin"'.((FEATHER_ACTIVE_PAGE == 'login') ? ' class="isactive"' : '').'><a href="'.get_link('login/').'">'.__('Login').'</a></li>';
+            $links[] = '<li id="navregister"'.((FEATHER_ACTIVE_PAGE == 'register') ? ' class="isactive"' : '').'><a href="'.get_link('register/').'">'.$lang_common['Register'].'</a></li>';
+            $links[] = '<li id="navlogin"'.((FEATHER_ACTIVE_PAGE == 'login') ? ' class="isactive"' : '').'><a href="'.get_link('login/').'">'.$lang_common['Login'].'</a></li>';
         } else {
-            $links[] = '<li id="navprofile"'.((FEATHER_ACTIVE_PAGE == 'profile') ? ' class="isactive"' : '').'><a href="'.get_link('user/'.$this->user->id.'/').'">'.__('Profile').'</a></li>';
+            $links[] = '<li id="navprofile"'.((FEATHER_ACTIVE_PAGE == 'profile') ? ' class="isactive"' : '').'><a href="'.get_link('user/'.$this->user->id.'/').'">'.$lang_common['Profile'].'</a></li>';
 
             if ($this->user->is_admmod) {
-                $links[] = '<li id="navadmin"'.((FEATHER_ACTIVE_PAGE == 'admin') ? ' class="isactive"' : '').'><a href="'.get_link('admin/').'">'.__('Admin').'</a></li>';
+                $links[] = '<li id="navadmin"'.((FEATHER_ACTIVE_PAGE == 'admin') ? ' class="isactive"' : '').'><a href="'.get_link('admin/').'">'.$lang_common['Admin'].'</a></li>';
             }
 
-            $links[] = '<li id="navlogout"><a href="'.get_link('logout/id/'.$this->user->id.'/token/'.feather_hash($this->user->id.feather_hash(get_remote_address()))).'/">'.__('Logout').'</a></li>';
+            $links[] = '<li id="navlogout"><a href="'.get_link('logout/id/'.$this->user->id.'/token/'.feather_hash($this->user->id.feather_hash(get_remote_address()))).'/">'.$lang_common['Logout'].'</a></li>';
         }
 
         // Are there any additional navlinks we should insert into the array before imploding it?
@@ -134,33 +136,33 @@ public function display()
         $page_statusinfo = $page_topicsearches = array();
 
         if ($this->user->is_guest) {
-            $page_statusinfo = '<p class="conl">'.__('Not logged in').'</p>';
+            $page_statusinfo = '<p class="conl">'.$lang_common['Not logged in'].'</p>';
         } else {
-            $page_statusinfo[] = '<li><span>'.__('Logged in as').' <strong>'.feather_escape($this->user->username).'</strong></span></li>';
-            $page_statusinfo[] = '<li><span>'.sprintf(__('Last visit'), format_time($this->user->last_visit)).'</span></li>';
+            $page_statusinfo[] = '<li><span>'.$lang_common['Logged in as'].' <strong>'.feather_escape($this->user->username).'</strong></span></li>';
+            $page_statusinfo[] = '<li><span>'.sprintf($lang_common['Last visit'], format_time($this->user->last_visit)).'</span></li>';
 
             if ($this->user->is_admmod) {
                 if ($this->config['o_report_method'] == '0' || $this->config['o_report_method'] == '2') {
                     if ($this->model->get_reports()) {
-                        $page_statusinfo[] = '<li class="reportlink"><span><strong><a href="'.get_link('admin/reports/').'">'.__('New reports').'</a></strong></span></li>';
+                        $page_statusinfo[] = '<li class="reportlink"><span><strong><a href="'.get_link('admin/reports/').'">'.$lang_common['New reports'].'</a></strong></span></li>';
                     }
                 }
 
                 if ($this->config['o_maintenance'] == '1') {
-                    $page_statusinfo[] = '<li class="maintenancelink"><span><strong><a href="'.get_link('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>';
+                    $page_statusinfo[] = '<li class="maintenancelink"><span><strong><a href="'.get_link('admin/maintenance/').'">'.$lang_common['Maintenance mode enabled'].'</a></strong></span></li>';
                 }
             }
 
             if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-                $page_topicsearches[] = '<a href="'.get_link('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a>';
-                $page_topicsearches[] = '<a href="'.get_link('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a>';
+                $page_topicsearches[] = '<a href="'.get_link('search/show/replies/').'" title="'.$lang_common['Show posted topics'].'">'.$lang_common['Posted topics'].'</a>';
+                $page_topicsearches[] = '<a href="'.get_link('search/show/new/').'" title="'.$lang_common['Show new posts'].'">'.$lang_common['New posts header'].'</a>';
             }
         }
 
         // Quick searches
         if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-            $page_topicsearches[] = '<a href="'.get_link('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a>';
-            $page_topicsearches[] = '<a href="'.get_link('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
+            $page_topicsearches[] = '<a href="'.get_link('search/show/recent/').'" title="'.$lang_common['Show active topics'].'">'.$lang_common['Active topics'].'</a>';
+            $page_topicsearches[] = '<a href="'.get_link('search/show/unanswered/').'" title="'.$lang_common['Show unanswered topics'].'">'.$lang_common['Unanswered topics'].'</a>';
         }
 
 
@@ -179,7 +181,7 @@ public function display()
         // Generate quicklinks
         if (!empty($page_topicsearches)) {
             $page_info .= "\n\t\t\t".'<ul class="conr">';
-            $page_info .= "\n\t\t\t\t".'<li><span>'.__('Topic searches').' '.implode(' | ', $page_topicsearches).'</span></li>';
+            $page_info .= "\n\t\t\t\t".'<li><span>'.$lang_common['Topic searches'].' '.implode(' | ', $page_topicsearches).'</span></li>';
             $page_info .= "\n\t\t\t".'</ul>';
         }
 
@@ -205,6 +207,7 @@ public function display()
         $this->required_fields = isset($this->required_fields) ? $this->required_fields : null;
 
         $this->feather->render('header.php', array(
+                'lang_common' => $lang_common,
                 'page_title' => $this->title,
                 'focus_element' => $this->focus_element,
                 'p' => $this->page,
diff --git a/controller/help.php b/controller/help.php
index 3add1eb0..7cdff2af 100644
--- a/controller/help.php
+++ b/controller/help.php
@@ -20,7 +20,6 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/help.mo');
     }
 
     public function __autoload($class_name)
@@ -30,17 +29,28 @@ public function __autoload($class_name)
     
     public function display()
     {
+        global $lang_common;
+
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            message($lang_common['No view'], '403');
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Help'));
+
+        // Load the help.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/help.php';
+
+
+        $page_title = array(feather_escape($this->config['o_board_title']), $lang_help['Help']);
 
         define('FEATHER_ACTIVE_PAGE', 'help');
 
         $this->header->setTitle($page_title)->display();
 
-        $this->feather->render('help.php');
+        $this->feather->render('help.php', array(
+                            'lang_help' => $lang_help,
+                            'lang_common' => $lang_common,
+                            )
+                    );
 
         $this->footer->display();
     }
diff --git a/controller/index.php b/controller/index.php
index b94aed63..4e4f750c 100644
--- a/controller/index.php
+++ b/controller/index.php
@@ -21,7 +21,6 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\index();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/index.mo');
     }
     
     public function __autoload($class_name)
@@ -31,10 +30,15 @@ public function __autoload($class_name)
     
     public function display()
     {
+        global $lang_common;
+
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            message($lang_common['No view'], '403');
         }
 
+        // Load the index.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/index.php';
+
         $page_title = array(feather_escape($this->config['o_board_title']));
         define('FEATHER_ALLOW_INDEX', 1);
 
@@ -44,6 +48,8 @@ public function display()
 
         $this->feather->render('index.php', array(
                             'index_data' => $this->model->print_categories_forums(),
+                            'lang_common' => $lang_common,
+                            'lang_index' => $lang_index,
                             'stats' => $this->model->collect_stats(),
                             'feather_config' => $this->config,
                             'online'    =>    $this->model->fetch_users_online(),
diff --git a/controller/login.php b/controller/login.php
index 277e6378..828a2914 100644
--- a/controller/login.php
+++ b/controller/login.php
@@ -21,7 +21,6 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\login();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/login.mo');
     }
 
     public function __autoload($class_name)
@@ -31,16 +30,21 @@ public function __autoload($class_name)
     
     public function display()
     {
+        global $lang_common;
+
         if (!$this->user->is_guest) {
             header('Location: '.get_base_url());
             exit;
         }
 
+        // Load the login.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/login.php';
+
         // TODO?: Try to determine if the data in HTTP_REFERER is valid (if not, we redirect to index.php after login)
         $redirect_url = $this->model->get_redirect_url($_SERVER);
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Login'));
-        $required_fields = array('req_username' => __('Username'), 'req_password' => __('Password'));
+        $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Login']);
+        $required_fields = array('req_username' => $lang_common['Username'], 'req_password' => $lang_common['Password']);
         $focus_element = array('login', 'req_username');
 
         define('FEATHER_ACTIVE_PAGE', 'login');
@@ -48,6 +52,8 @@ public function display()
         $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         $this->feather->render('login/form.php', array(
+                            'lang_common' => $lang_common,
+                            'lang_login' => $lang_login,
                             'redirect_url'    =>    $redirect_url,
                             )
                     );
@@ -57,6 +63,8 @@ public function display()
 
     public function logmein()
     {
+        global $lang_common, $lang_login;
+
         define('FEATHER_QUIET_VISIT', 1);
 
         if (!$this->user->is_guest) {
@@ -64,18 +72,28 @@ public function logmein()
             exit;
         }
 
+        // Load the login.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/login.php';
+
         $this->model->login();
     }
 
     public function logmeout($id, $token)
     {
+        global $lang_common;
+
         define('FEATHER_QUIET_VISIT', 1);
 
+        // Load the login.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/login.php';
+
         $this->model->logout($id, $token);
     }
 
     public function forget()
     {
+        global $lang_common, $lang_login;
+
         define('FEATHER_QUIET_VISIT', 1);
 
         if (!$this->user->is_guest) {
@@ -83,10 +101,13 @@ public function forget()
             exit;
         }
 
+        // Load the login.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/login.php';
+
         $errors = $this->model->password_forgotten();
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Request pass'));
-        $required_fields = array('req_email' => __('Email'));
+        $page_title = array(feather_escape($this->config['o_board_title']), $lang_login['Request pass']);
+        $required_fields = array('req_email' => $lang_common['Email']);
         $focus_element = array('request_pass', 'req_email');
 
         define('FEATHER_ACTIVE_PAGE', 'login');
@@ -95,6 +116,8 @@ public function forget()
 
         $this->feather->render('login/password_forgotten.php', array(
                             'errors'    =>    $errors,
+                            'lang_login'    =>    $lang_login,
+                            'lang_common'    =>    $lang_common,
                             )
                     );
 
diff --git a/controller/misc.php b/controller/misc.php
index 7ecadf0a..39543856 100644
--- a/controller/misc.php
+++ b/controller/misc.php
@@ -21,8 +21,6 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\misc();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/misc.mo');
     }
 
     public function __autoload($class_name)
@@ -32,17 +30,21 @@ public function __autoload($class_name)
     
     public function rules()
     {
+        global $lang_common;
+
         if ($this->config['o_rules'] == '0' || ($this->user->is_guest && $this->user->g_read_board == '0' && $this->config['o_regs_allow'] == '0')) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Forum rules'));
+        // Load the register.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/register.php';
 
-        $this->header->setTitle($page_title)->display();
+        $page_title = array(feather_escape($this->config['o_board_title']), $lang_register['Forum rules']);
 
         define('FEATHER_ACTIVE_PAGE', 'rules');
 
         $this->feather->render('misc/rules.php', array(
+                'lang_register' => $lang_register,
                 'feather_config' => $this->config,
                 )
         );
@@ -52,35 +54,47 @@ public function rules()
 
     public function markread()
     {
+        global $lang_common;
+
         if ($this->user->is_guest) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
+        // Load the misc.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
+
         $this->model->update_last_visit();
 
         // Reset tracked topics
         set_tracked_topics(null);
 
-        redirect(get_base_url(), __('Mark read redirect'));
+        redirect(get_base_url(), $lang_misc['Mark read redirect']);
     }
 
     public function markforumread($id)
     {
+        global $lang_common;
+
         if ($this->user->is_guest) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
+        // Load the misc.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
+
         $tracked_topics = get_tracked_topics();
         $tracked_topics['forums'][$id] = time();
         set_tracked_topics($tracked_topics);
 
-        redirect(get_link('forum/'.$id.'/'), __('Mark forum read redirect'));
+        redirect(get_link('forum/'.$id.'/'), $lang_misc['Mark forum read redirect']);
     }
 
     public function subscribeforum($id)
     {
+        global $lang_common, $lang_misc;
+
         if ($this->user->is_guest) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the misc.php language file
@@ -91,8 +105,10 @@ public function subscribeforum($id)
 
     public function subscribetopic($id)
     {
+        global $lang_common, $lang_misc;
+
         if ($this->user->is_guest) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the misc.php language file
@@ -103,8 +119,10 @@ public function subscribetopic($id)
 
     public function unsubscribeforum($id)
     {
+        global $lang_common, $lang_misc;
+
         if ($this->user->is_guest) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the misc.php language file
@@ -115,8 +133,10 @@ public function unsubscribeforum($id)
 
     public function unsubscribetopic($id)
     {
+        global $lang_common, $lang_misc;
+
         if ($this->user->is_guest) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Load the misc.php language file
@@ -127,12 +147,14 @@ public function unsubscribetopic($id)
 
     public function email($id)
     {
+        global $lang_common;
+
         if ($this->user->is_guest || $this->user->g_send_email == '0') {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         if ($id < 2) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         // Load the misc.php language file
@@ -141,7 +163,7 @@ public function email($id)
         $mail = $this->model->get_info_mail($id);
 
         if ($mail['email_setting'] == 2 && !$this->user->is_admmod) {
-            message(__('Form email disabled'));
+            message($lang_misc['Form email disabled']);
         }
 
 
@@ -149,8 +171,8 @@ public function email($id)
             $this->model->send_email($mail, $id);
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Send email to').' '.feather_escape($mail['recipient']));
-        $required_fields = array('req_subject' => __('Email subject'), 'req_message' => __('Email message'));
+        $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Send email to'].' '.feather_escape($mail['recipient']));
+        $required_fields = array('req_subject' => $lang_misc['Email subject'], 'req_message' => $lang_misc['Email message']);
         $focus_element = array('email', 'req_subject');
 
         define('FEATHER_ACTIVE_PAGE', 'email');
@@ -158,6 +180,7 @@ public function email($id)
         $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         $this->feather->render('misc/email.php', array(
+                'lang_misc' => $lang_misc,
                 'id' => $id,
                 'mail' => $mail,
                 )
@@ -168,10 +191,15 @@ public function email($id)
 
     public function report($id)
     {
+        global $lang_common;
+
         if ($this->user->is_guest) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
+        // Load the misc.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
+
         if ($this->feather->request()->isPost()) {
             $this->model->insert_report($id);
         }
@@ -183,8 +211,8 @@ public function report($id)
             $cur_post['subject'] = censor_words($cur_post['subject']);
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Report post'));
-        $required_fields = array('req_reason' => __('Reason'));
+        $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Report post']);
+        $required_fields = array('req_reason' => $lang_misc['Reason']);
         $focus_element = array('report', 'req_reason');
 
         define('FEATHER_ACTIVE_PAGE', 'report');
@@ -192,7 +220,9 @@ public function report($id)
         $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         $this->feather->render('misc/report.php', array(
+                'lang_misc' => $lang_misc,
                 'id' => $id,
+                'lang_common' => $lang_common,
                 'cur_post' => $cur_post,
                 )
         );
diff --git a/controller/moderate.php b/controller/moderate.php
index 541b3de7..d258d2da 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -21,9 +21,6 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\moderate();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/topic.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/misc.mo');
     }
 
     public function __autoload($class_name)
@@ -33,17 +30,22 @@ public function __autoload($class_name)
     
     public function gethostpost($pid)
     {
+        global $lang_common;
+
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            message($lang_common['No view'], '403');
         }
 
         // Load the viewforum.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
+        // Load the misc.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
+
         // This particular function doesn't require forum-based moderator access. It can be used
         // by all moderators and admins
         if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         $this->model->display_ip_address_post($pid);
@@ -51,17 +53,22 @@ public function gethostpost($pid)
 
     public function gethostip($ip)
     {
+        global $lang_common;
+
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            message($lang_common['No view'], '403');
         }
 
         // Load the viewforum.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
+        // Load the misc.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
+
         // This particular function doesn't require forum-based moderator access. It can be used
         // by all moderators and admins
         if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         $this->model->display_ip_info($ip);
@@ -69,18 +76,23 @@ public function gethostip($ip)
 
     public function moderatetopic($id = null, $fid = null, $action = null, $param = null)
     {
+        global $lang_common, $lang_topic, $lang_misc;
+
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            message($lang_common['No view'], '403');
         }
 
         // Load the viewforum.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
+        // Load the misc.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
+
         // This particular function doesn't require forum-based moderator access. It can be used
         // by all moderators and admins
         if ($action == 'get_host') {
             if (!$this->user->is_admmod) {
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             }
 
             $this->model->display_ip_address();
@@ -91,7 +103,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         $url_subject = url_friendly($this->model->get_subject_tid($id));
@@ -104,7 +116,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                message(__('No topics selected'));
+                message($lang_misc['No topics selected']);
             }
 
             $topics = implode(',', array_map('intval', array_keys($topics)));
@@ -112,7 +124,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
+            $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -122,6 +134,8 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                     'action'    =>    'multi',
                     'id'    =>    $fid,
                     'topics'    =>    $topics,
+                    'lang_misc'    =>    $lang_misc,
+                    'lang_common'    =>    $lang_common,
                     'list_forums'   => $this->model->get_forum_list_move($fid),
                 )
             );
@@ -135,7 +149,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $this->model->stick_topic($id, $fid);
  
-            redirect(get_link('topic/'.$id.'/'), __('Stick topic redirect'));
+            redirect(get_link('topic/'.$id.'/'), $lang_misc['Stick topic redirect']);
         }
 
 
@@ -145,7 +159,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $this->model->unstick_topic($id, $fid);
 
-            redirect(get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
+            redirect(get_link('topic/'.$id.'/'), $lang_misc['Unstick topic redirect']);
         }
 
         // Open a topic
@@ -154,7 +168,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             
             $this->model->open_topic($id, $fid);
 
-            redirect(get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
+            redirect(get_link('topic/'.$id.'/'), $lang_misc['Unstick topic redirect']);
         }
 
         // Close a topic
@@ -163,7 +177,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $this->model->close_topic($id, $fid);
 
-            redirect(get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
+            redirect(get_link('topic/'.$id.'/'), $lang_misc['Unstick topic redirect']);
         }
 
         $cur_topic = $this->model->get_topic_info($fid, $id);
@@ -180,7 +194,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
+            $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -190,6 +204,8 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                         'action'    =>    'single',
                         'id'    =>    $id,
                         'topics'    =>    $id,
+                        'lang_misc'    =>    $lang_misc,
+                        'lang_common'    =>    $lang_common,
                         'list_forums'   => $this->model->get_forum_list_move($fid),
                         )
                 );
@@ -204,13 +220,15 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 if ($this->request->post('delete_posts') || $this->request->post('delete_posts_comply')) {
                     $posts = $this->model->delete_posts($id, $fid, $p);
 
-                    $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
+                    $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
 
                     define('FEATHER_ACTIVE_PAGE', 'moderate');
 
                     $this->header->setTitle($page_title)->setPage($p)->display();
 
                     $this->feather->render('moderate/delete_posts.php', array(
+                        'lang_common' => $lang_common,
+                        'lang_misc' => $lang_misc,
                         'id' => $id,
                         'posts' => $posts,
                         )
@@ -221,7 +239,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             if ($this->request->post('split_posts') || $this->request->post('split_posts_comply')) {
                 $posts = $this->model->split_posts($id, $fid, $p);
 
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
+                $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
                 $focus_element = array('subject','new_subject');
 
                 define('FEATHER_ACTIVE_PAGE', 'moderate');
@@ -229,6 +247,8 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 $this->header->setTitle($page_title)->setPage($p)->setFocusElement($focus_element)->display();
 
                 $this->feather->render('moderate/split_posts.php', array(
+                        'lang_common' => $lang_common,
+                        'lang_misc' => $lang_misc,
                         'id' => $id,
                         'posts' => $posts,
                         'list_forums' => $this->model->get_forum_list_split($id),
@@ -240,6 +260,9 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
                 // Show the moderate posts view
 
+                // Load the viewtopic.php language file
+                require FEATHER_ROOT.'lang/'.$this->user->language.'/topic.php';
+
                 // Used to disable the Move and Delete buttons if there are no replies to this topic
                 $button_status = ($cur_topic['num_replies'] == 0) ? ' disabled="disabled"' : '';
 
@@ -248,7 +271,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 }*/
 
                 // Generate paging links
-                $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/#');
+                $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/#');
 
             if ($this->config['o_censoring'] == '1') {
                 $cur_topic['subject'] = censor_words($cur_topic['subject']);
@@ -261,6 +284,9 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
 
             $this->feather->render('moderate/posts_view.php', array(
+                        'lang_common' => $lang_common,
+                        'lang_topic' => $lang_topic,
+                        'lang_misc' => $lang_misc,
                         'cur_topic' => $cur_topic,
                         'url_topic' => url_friendly($cur_topic['subject']),
                         'url_forum' => url_friendly($cur_topic['forum_name']),
@@ -279,19 +305,24 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
     public function display($id, $name = null, $page = null)
     {
+        global $lang_common, $lang_forum, $lang_misc;
+
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            message($lang_common['No view'], '403');
         }
 
         // Load the viewforum.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
+        // Load the misc.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
+
         // Make sure that only admmods allowed access this page
         $moderators = $this->model->get_moderators($id);
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Fetch some info about the forum
@@ -299,7 +330,7 @@ public function display($id, $name = null, $page = null)
 
         // Is this a redirect forum? In that case, abort!
         if ($cur_forum['redirect_url'] != '') {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         $sort_by = $this->model->forum_sort_by($cur_forum['sort_by']);
@@ -312,7 +343,7 @@ public function display($id, $name = null, $page = null)
         $url_forum = url_friendly($cur_forum['forum_name']);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/forum/'.$id.'/#');
+        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'moderate/forum/'.$id.'/#');
 
         $page_title = array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name']));
 
@@ -321,12 +352,15 @@ public function display($id, $name = null, $page = null)
         $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
 
         $this->feather->render('moderate/moderator_forum.php', array(
+                            'lang_common' => $lang_common,
+                            'lang_misc' => $lang_misc,
                             'id' => $id,
                             'p' => $p,
                             'url_forum' => $url_forum,
                             'cur_forum' => $cur_forum,
                             'paging_links' => $paging_links,
                             'feather_config' => $this->config,
+                            'lang_forum' => $lang_forum,
                             'topic_data' => $this->model->display_topics($id, $sort_by, $start_from),
                             'start_from' => $start_from,
                             )
@@ -337,19 +371,24 @@ public function display($id, $name = null, $page = null)
 
     public function dealposts($fid)
     {
+        global $lang_common, $lang_forum, $lang_topic, $lang_misc;
+
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            message($lang_common['No view'], '403');
         }
 
         // Load the viewforum.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
+        // Load the misc.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
+
         // Make sure that only admmods allowed access this page
         $moderators = $this->model->get_moderators($fid);
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Move one or more topics
@@ -360,7 +399,7 @@ public function dealposts($fid)
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                message(__('No topics selected'));
+                message($lang_misc['No topics selected']);
             }
 
             $topics = implode(',', array_map('intval', array_keys($topics)));
@@ -368,7 +407,7 @@ public function dealposts($fid)
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
+            $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -378,6 +417,8 @@ public function dealposts($fid)
                         'action'    =>    'multi',
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
+                        'lang_misc'    =>    $lang_misc,
+                        'lang_common'    =>    $lang_common,
                         'list_forums'   => $this->model->get_forum_list_move($fid),
                         )
                 );
@@ -393,10 +434,10 @@ public function dealposts($fid)
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (count($topics) < 2) {
-                message(__('Not enough topics selected'));
+                message($lang_misc['Not enough topics selected']);
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
+            $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -405,6 +446,8 @@ public function dealposts($fid)
             $this->feather->render('moderate/merge_topics.php', array(
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
+                        'lang_misc'    =>    $lang_misc,
+                        'lang_common'    =>    $lang_common,
                         )
                 );
 
@@ -415,14 +458,14 @@ public function dealposts($fid)
         elseif ($this->request->post('delete_topics') || $this->request->post('delete_topics_comply')) {
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                message(__('No topics selected'));
+                message($lang_misc['No topics selected']);
             }
 
             if ($this->request->post('delete_topics_comply')) {
                 $this->model->delete_topics($topics, $fid);
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
+            $page_title = array(feather_escape($this->config['o_board_title']), $lang_misc['Moderate']);
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -431,6 +474,8 @@ public function dealposts($fid)
             $this->feather->render('moderate/delete_topics.php', array(
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
+                        'lang_misc'    =>    $lang_misc,
+                        'lang_common'    =>    $lang_common,
                         )
                 );
 
@@ -446,12 +491,12 @@ public function dealposts($fid)
             if ($this->request->post('open') || $this->request->post('close')) {
                 $topics = $this->request->post('topics') ? @array_map('intval', @array_keys($this->request->post('topics'))) : array();
                 if (empty($topics)) {
-                    message(__('No topics selected'));
+                    message($lang_misc['No topics selected']);
                 }
 
                 $this->model->close_multiple_topics($action, $topics, $fid);
 
-                $redirect_msg = ($action) ? __('Close topics redirect') : __('Open topics redirect');
+                $redirect_msg = ($action) ? $lang_misc['Close topics redirect'] : $lang_misc['Open topics redirect'];
                 redirect(get_link('moderate/forum/'.$fid.'/'), $redirect_msg);
             }
         }
diff --git a/controller/post.php b/controller/post.php
index 99616fa1..cb64d507 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -21,9 +21,6 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\post();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.mo');
     }
 
     public function __autoload($class_name)
@@ -33,20 +30,32 @@ public function __autoload($class_name)
 
     public function newreply($fid = null, $tid = null, $qid = null)
     {
-        $this->newpost('', $fid, $tid);
+        self::newpost('', $fid, $tid);
     }
 
     public function newpost($fid = null, $tid = null, $qid = null)
     {
-        global $lang_antispam_questions, $lang_antispam;
+        global $lang_common, $lang_prof_reg, $lang_antispam_questions, $lang_antispam, $lang_post, $lang_register, $lang_bbeditor;
+
+        // Load the register.php/profile.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
+
+        // Load the register.php/profile.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/register.php';
+        
+        // Load the bbeditor.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.php';
 
         // Antispam feature
         require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
+        // BBcode toolbar feature
+        require FEATHER_ROOT.'lang/'.$this->user['language'].'/bbeditor.php';
+
         // If $_POST['username'] is filled, we are facing a bot
         if ($this->request->post('username')) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         // Fetch some info about the topic and/or the forum
@@ -56,7 +65,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // Is someone trying to post into a redirect forum?
         if ($cur_posting['redirect_url'] != '') {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
@@ -68,9 +77,12 @@ public function newpost($fid = null, $tid = null, $qid = null)
                 ($fid && (($cur_posting['post_topics'] == '' && $this->user->g_post_topics == '0') || $cur_posting['post_topics'] == '0')) ||
                 (isset($cur_posting['closed']) && $cur_posting['closed'] == '1')) &&
                 !$is_admmod) {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
+        // Load the post.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/post.php';
+
         // Start with a clean slate
         $errors = array();
 
@@ -79,7 +91,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
         if (!$this->user->is_guest) {
             $focus_element[] = ($fid) ? 'req_subject' : 'req_message';
         } else {
-            $required_fields['req_username'] = __('Guest name');
+            $required_fields['req_username'] = $lang_post['Guest name'];
             $focus_element[] = 'req_username';
         }
 
@@ -140,7 +152,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             $this->model->increment_post_count($post, $new['tid']);
                         }
 
-                    redirect(get_link('post/'.$new['pid'].'/#p'.$new['pid']), __('Post redirect'));
+                    redirect(get_link('post/'.$new['pid'].'/#p'.$new['pid']), $lang_post['Post redirect']);
                 }
         }
 
@@ -148,7 +160,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // If a topic ID was specified in the url (it's a reply)
         if ($tid) {
-            $action = __('Post a reply');
+            $action = $lang_post['Post a reply'];
             $form = '<form id="post" method="post" action="'.get_link('post/reply/'.$tid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
 
                 // If a quote ID was specified in the url
@@ -159,10 +171,10 @@ public function newpost($fid = null, $tid = null, $qid = null)
         }
         // If a forum ID was specified in the url (new topic)
         elseif ($fid) {
-            $action = __('Post new topic');
+            $action = $lang_post['Post new topic'];
             $form = '<form id="post" method="post" action="'.get_link('post/new-topic/'.$fid.'/').'" onsubmit="return process_form(this)">';
         } else {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         $url_forum = url_friendly($cur_posting['forum_name']);
@@ -176,9 +188,9 @@ public function newpost($fid = null, $tid = null, $qid = null)
         }
 
         $page_title = array(feather_escape($this->config['o_board_title']), $action);
-        $required_fields = array('req_email' => __('Email'), 'req_subject' => __('Subject'), 'req_message' => __('Message'));
+        $required_fields = array('req_email' => $lang_common['Email'], 'req_subject' => $lang_common['Subject'], 'req_message' => $lang_common['Message']);
         if ($this->user->is_guest) {
-            $required_fields['captcha'] = __('Robot title');
+            $required_fields['captcha'] = $lang_antispam['Robot title'];
         }
         $focus_element = array('post');
 
@@ -203,8 +215,11 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             'feather_config' => $this->config,
                             'feather_user' => $this->user,
                             'cur_posting' => $cur_posting,
+                            'lang_common' => $lang_common,
+                            'lang_post' => $lang_post,
                             'lang_antispam' => $lang_antispam,
                             'lang_antispam_questions' => $lang_antispam_questions,
+                            'lang_bbeditor' => $lang_bbeditor,
                             'index_questions' => $index_questions,
                             'checkboxes' => $checkboxes,
                             'cur_posting' => $cur_posting,
@@ -216,6 +231,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             'url_topic' => $url_topic,
                             'quote' => $quote,
                             'errors'    =>    $errors,
+                            'lang_bbeditor' => $lang_bbeditor,
                             )
                     );
 
diff --git a/controller/profile.php b/controller/profile.php
index 7c47382e..3abb7e51 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -21,8 +21,6 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\profile();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/profile.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
     }
 
     public function __autoload($class_name)
@@ -32,46 +30,54 @@ public function __autoload($class_name)
     
     public function display($id, $section = null)
     {
-        global $lang_profile, $pd, $forum_time_formats, $forum_date_formats;
+        global $lang_common, $lang_prof_reg, $lang_profile, $pd, $forum_time_formats, $forum_date_formats;
 
         // Include UTF-8 function
         require FEATHER_ROOT.'include/utf8/substr_replace.php';
         require FEATHER_ROOT.'include/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
         require FEATHER_ROOT.'include/utf8/strcasecmp.php';
 
+        // Load the prof_reg.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
+
+        // Load the profile.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/profile.php';
+
         if ($this->request->post('update_group_membership')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             }
 
             $this->model->update_group_membership($id, $this->feather);
         } elseif ($this->request->post('update_forums')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             }
 
             $this->model->update_mod_forums($id, $this->feather);
         } elseif ($this->request->post('ban')) {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             }
 
             $this->model->ban_user($id);
         } elseif ($this->request->post('delete_user') || $this->request->post('delete_user_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             }
 
             $this->model->delete_user($id, $this->feather);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Confirm delete user'));
+            $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Confirm delete user']);
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
 
             $this->header->setTitle($page_title)->display();
 
             $this->feather->render('profile/delete_user.php', array(
+                                    'lang_common' => $lang_common,
                                     'username' => $this->model->get_username($id),
+                                    'lang_profile' => $lang_profile,
                                     'id' => $id,
                                     )
                             );
@@ -89,7 +95,7 @@ public function display($id, $section = null)
                                     ($this->user->g_mod_edit_users == '0' ||                         // mods aren't allowed to edit users
                                     $info['group_id'] == FEATHER_ADMIN ||                            // or the user is an admin
                                     $info['is_moderator'])))) {                                      // or the user is another mod
-                                    message(__('No permission'), '403');
+                                    message($lang_common['No permission'], '403');
             }
 
             $this->model->update_profile($id, $info, $section, $this->feather);
@@ -114,7 +120,7 @@ public function display($id, $section = null)
             // or the user is another mod
                 $user_info = $this->model->parse_user_info($user);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), sprintf(__('Users profile'), feather_escape($user['username'])));
+            $page_title = array(feather_escape($this->config['o_board_title']), sprintf($lang_profile['Users profile'], feather_escape($user['username'])));
             define('FEATHER_ALLOW_INDEX', 1);
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
@@ -122,6 +128,8 @@ public function display($id, $section = null)
             $this->header->setTitle($page_title)->display();
 
             $this->feather->render('profile/view_profile.php', array(
+                        'lang_common' => $lang_common,
+                        'lang_profile' => $lang_profile,
                         'user_info' => $user_info,
                         )
                 );
@@ -131,8 +139,8 @@ public function display($id, $section = null)
             if (!$section || $section == 'essentials') {
                 $user_disp = $this->model->edit_essentials($id, $user);
 
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section essentials'));
-                $required_fields = array('req_username' => __('Username'), 'req_email' => __('Email'));
+                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section essentials']);
+                $required_fields = array('req_username' => $lang_common['Username'], 'req_email' => $lang_common['Email']);
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -141,6 +149,9 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('essentials', $id);
 
                 $this->feather->render('profile/section_essentials.php', array(
+                                'lang_common' => $lang_common,
+                                'lang_profile' => $lang_profile,
+                                'lang_prof_reg' => $lang_prof_reg,
                                 'feather' => $this->feather,
                                 'id' => $id,
                                 'user' => $user,
@@ -151,10 +162,10 @@ public function display($id, $section = null)
                         );
             } elseif ($section == 'personal') {
                 if ($this->user->g_set_title == '1') {
-                    $title_field = '<label>'.__('Title').' <em>('.__('Leave blank').')</em><br /><input type="text" name="title" value="'.feather_escape($user['title']).'" size="30" maxlength="50" /><br /></label>'."\n";
+                    $title_field = '<label>'.$lang_common['Title'].' <em>('.$lang_profile['Leave blank'].')</em><br /><input type="text" name="title" value="'.feather_escape($user['title']).'" size="30" maxlength="50" /><br /></label>'."\n";
                 }
 
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personal'));
+                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section personal']);
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -163,13 +174,15 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('personal', $id);
 
                 $this->feather->render('profile/section_personal.php', array(
+                                'lang_common' => $lang_common,
+                                'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 'feather' => $this->feather,
                                 )
                         );
                 
             } elseif ($section == 'messaging') {
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section messaging'));
+                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section messaging']);
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -178,31 +191,33 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('messaging', $id);
 
                 $this->feather->render('profile/section_messaging.php', array(
+                                'lang_common' => $lang_common,
+                                'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 )
                         );
                 
             } elseif ($section == 'personality') {
                 if ($this->config['o_avatars'] == '0' && $this->config['o_signatures'] == '0') {
-                    message(__('Bad request'), '404');
+                    message($lang_common['Bad request'], '404');
                 }
 
-                $avatar_field = '<span><a href="'.get_link('user/'.$id.'/action/upload_avatar/').'">'.__('Change avatar').'</a></span>';
+                $avatar_field = '<span><a href="'.get_link('user/'.$id.'/action/upload_avatar/').'">'.$lang_profile['Change avatar'].'</a></span>';
 
                 $user_avatar = generate_avatar_markup($id);
                 if ($user_avatar) {
-                    $avatar_field .= ' <span><a href="'.get_link('user/'.$id.'/action/delete_avatar/').'">'.__('Delete avatar').'</a></span>';
+                    $avatar_field .= ' <span><a href="'.get_link('user/'.$id.'/action/delete_avatar/').'">'.$lang_profile['Delete avatar'].'</a></span>';
                 } else {
-                    $avatar_field = '<span><a href="'.get_link('user/'.$id.'/action/upload_avatar/').'">'.__('Upload avatar').'</a></span>';
+                    $avatar_field = '<span><a href="'.get_link('user/'.$id.'/action/upload_avatar/').'">'.$lang_profile['Upload avatar'].'</a></span>';
                 }
 
                 if ($user['signature'] != '') {
-                    $signature_preview = '<p>'.__('Sig preview').'</p>'."\n\t\t\t\t\t\t\t".'<div class="postsignature postmsg">'."\n\t\t\t\t\t\t\t\t".'<hr />'."\n\t\t\t\t\t\t\t\t".$parsed_signature."\n\t\t\t\t\t\t\t".'</div>'."\n";
+                    $signature_preview = '<p>'.$lang_profile['Sig preview'].'</p>'."\n\t\t\t\t\t\t\t".'<div class="postsignature postmsg">'."\n\t\t\t\t\t\t\t\t".'<hr />'."\n\t\t\t\t\t\t\t\t".$parsed_signature."\n\t\t\t\t\t\t\t".'</div>'."\n";
                 } else {
-                    $signature_preview = '<p>'.__('No sig').'</p>'."\n";
+                    $signature_preview = '<p>'.$lang_profile['No sig'].'</p>'."\n";
                 }
 
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personality'));
+                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section personality']);
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -211,6 +226,8 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('personality', $id);
 
                 $this->feather->render('profile/section_personality.php', array(
+                                'lang_common' => $lang_common,
+                                'lang_profile' => $lang_profile,
                                 'user_avatar' => $user_avatar,
                                 'avatar_field' => $avatar_field,
                                 'signature_preview' => $signature_preview,
@@ -220,7 +237,7 @@ public function display($id, $section = null)
                         );
                 
             } elseif ($section == 'display') {
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section display'));
+                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section display']);
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -229,12 +246,14 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('display', $id);
 
                 $this->feather->render('profile/section_display.php', array(
+                                'lang_common' => $lang_common,
+                                'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 )
                         );
                 
             } elseif ($section == 'privacy') {
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section privacy'));
+                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section privacy']);
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -243,16 +262,19 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('privacy', $id);
 
                 $this->feather->render('profile/section_privacy.php', array(
+                                'lang_common' => $lang_common,
+                                'lang_profile' => $lang_profile,
+                                'lang_prof_reg' => $lang_prof_reg,
                                 'user' => $user,
                                 )
                         );
                 
             } elseif ($section == 'admin') {
                 if (!$this->user->is_admmod || ($this->user->g_moderator == '1' && $this->user->g_mod_ban_users == '0')) {
-                    message(__('Bad request'), false, '403 Forbidden');
+                    message($lang_common['Bad request'], false, '403 Forbidden');
                 }
 
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section admin'));
+                $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Section admin']);
 
                 define('FEATHER_ACTIVE_PAGE', 'profile');
 
@@ -261,6 +283,8 @@ public function display($id, $section = null)
                 $this->model->generate_profile_menu('admin', $id);
 
                 $this->feather->render('profile/section_admin.php', array(
+                                'lang_common' => $lang_common,
+                                'lang_profile' => $lang_profile,
                                 'user' => $user,
                                 'forum_list' => $this->model->get_forum_list($id),
                                 'group_list' => $this->model->get_group_list($user),
@@ -269,7 +293,7 @@ public function display($id, $section = null)
                         );
                 
             } else {
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
             }
 
             $this->footer->display();
@@ -278,26 +302,32 @@ public function display($id, $section = null)
 
     public function action($id, $action)
     {
-        global $lang_profile;
+        global $lang_common, $lang_prof_reg, $lang_profile;
 
         // Include UTF-8 function
         require FEATHER_ROOT.'include/utf8/substr_replace.php';
         require FEATHER_ROOT.'include/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
         require FEATHER_ROOT.'include/utf8/strcasecmp.php';
 
+        // Load the prof_reg.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
+
+        // Load the profile.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/profile.php';
+
         if ($action != 'change_pass' || !$this->request->get('key')) {
             if ($this->user->g_read_board == '0') {
-                message(__('No view'), '403');
+                message($lang_common['No view'], '403');
             } elseif ($this->user->g_view_users == '0' && ($this->user->is_guest || $this->user->id != $id)) {
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             }
         }
 
         if ($action == 'change_pass') {
             $this->model->change_pass($id, $this->feather);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Change pass'));
-            $required_fields = array('req_old_password' => __('Old pass'), 'req_new_password1' => __('New pass'), 'req_new_password2' => __('Confirm new pass'));
+            $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Change pass']);
+            $required_fields = array('req_old_password' => $lang_profile['Old pass'], 'req_new_password1' => $lang_profile['New pass'], 'req_new_password2' => $lang_profile['Confirm new pass']);
             $focus_element = array('change_pass', ((!$this->user->is_admmod) ? 'req_old_password' : 'req_new_password1'));
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
@@ -305,7 +335,9 @@ public function action($id, $action)
             $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             $this->feather->render('profile/change_pass.php', array(
+                                    'lang_common' => $lang_common,
                                     'feather' => $this->feather,
+                                    'lang_profile' => $lang_profile,
                                     'id' => $id,
                                     )
                             );
@@ -314,8 +346,8 @@ public function action($id, $action)
         } elseif ($action == 'change_email') {
             $this->model->change_email($id, $this->feather);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Change email'));
-            $required_fields = array('req_new_email' => __('New email'), 'req_password' => __('Password'));
+            $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Change email']);
+            $required_fields = array('req_new_email' => $lang_profile['New email'], 'req_password' => $lang_common['Password']);
             $focus_element = array('change_email', 'req_new_email');
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
@@ -323,6 +355,8 @@ public function action($id, $action)
             $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             $this->feather->render('profile/change_mail.php', array(
+                                    'lang_common' => $lang_common,
+                                    'lang_profile' => $lang_profile,
                                     'id' => $id,
                                     )
                             );
@@ -330,19 +364,19 @@ public function action($id, $action)
             $this->footer->display();
         } elseif ($action == 'upload_avatar' || $action == 'upload_avatar2') {
             if ($this->config['o_avatars'] == '0') {
-                message(__('Avatars disabled'));
+                message($lang_profile['Avatars disabled']);
             }
 
             if ($this->user->id != $id && !$this->user->is_admmod) {
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             }
 
             if ($this->feather->request()->isPost()) {
                 $this->model->upload_avatar($id, $_FILES);
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Upload avatar'));
-            $required_fields = array('req_file' => __('File'));
+            $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['Profile'], $lang_profile['Upload avatar']);
+            $required_fields = array('req_file' => $lang_profile['File']);
             $focus_element = array('upload_avatar', 'req_file');
 
             define('FEATHER_ACTIVE_PAGE', 'profile');
@@ -350,7 +384,10 @@ public function action($id, $action)
             $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             $this->feather->render('profile/upload_avatar.php', array(
+                                    'lang_common' => $lang_common,
+                                    'lang_profile' => $lang_profile,
                                     'feather_config' => $this->config,
+                                    'lang_profile' => $lang_profile,
                                     'id' => $id,
                                     )
                             );
@@ -359,22 +396,22 @@ public function action($id, $action)
             
         } elseif ($action == 'delete_avatar') {
             if ($this->user->id != $id && !$this->user->is_admmod) {
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             }
 
             
 
             $this->model->delete_avatar($id);
 
-            redirect(get_link('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
+            redirect(get_link('user/'.$id.'/section/personality/'), $lang_profile['Avatar deleted redirect']);
         } elseif ($action == 'promote') {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_promote_users == '0')) {
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             }
 
             $this->model->promote_user($id, $this->feather);
         } else {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
     }
 }
diff --git a/controller/register.php b/controller/register.php
index 691635c4..3ab047bc 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -21,9 +21,6 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\register();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.mo');
     }
 
     public function __autoload($class_name)
@@ -33,13 +30,19 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_antispam_questions, $lang_antispam;
+        global $lang_common, $lang_antispam_questions, $lang_antispam, $lang_register, $lang_prof_reg;
 
         if (!$this->user->is_guest) {
             header('Location: '.get_base_url());
             exit;
         }
 
+        // Load the register.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/register.php';
+
+        // Load the register.php/profile.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
+
         // Antispam feature
         require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
@@ -47,11 +50,11 @@ public function display()
         // Display an error message if new registrations are disabled
         // If $_REQUEST['username'] or $_REQUEST['password'] are filled, we are facing a bot
         if ($this->config['o_regs_allow'] == '0' || $this->request->post('username') || $this->request->post('password')) {
-            message(__('No new regs'));
+            message($lang_register['No new regs']);
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Register'));
-        $required_fields = array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => __('Confirm pass'), 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => __('Robot title'));
+        $page_title = array(feather_escape($this->config['o_board_title']), $lang_register['Register']);
+        $required_fields = array('req_user' => $lang_common['Username'], 'req_password1' => $lang_common['Password'], 'req_password2' => $lang_prof_reg['Confirm pass'], 'req_email1' => $lang_common['Email'], 'req_email2' => $lang_common['Email'].' 2', 'captcha' => $lang_antispam['Robot title']);
         $focus_element = array('register', 'req_user');
 
         define('FEATHER_ACTIVE_PAGE', 'register');
@@ -75,6 +78,9 @@ public function display()
         $this->feather->render('register/form.php', array(
                             'errors' => $user['errors'],
                             'feather_config' => $this->config,
+                            'lang_register' => $lang_register,
+                            'lang_common' => $lang_common,
+                            'lang_prof_reg' => $lang_prof_reg,
                             'lang_antispam' => $lang_antispam,
                             'lang_antispam_questions'    =>    $lang_antispam_questions,
                             'index_questions'    =>    $index_questions,
@@ -94,8 +100,9 @@ public function cancel()
     }
 
     public function rules()
-    {
-        // TODO: fix $_GET w/ URL rewriting
+    { // TODO: fix $_GET w/ URL rewriting
+
+        global $lang_common, $lang_login, $lang_register;
 
         // If we are logged in, we shouldn't be here
         if (!$this->user->is_guest) {
@@ -105,20 +112,27 @@ public function rules()
 
         // Display an error message if new registrations are disabled
         if ($this->config['o_regs_allow'] == '0') {
-            message(__('No new regs'));
+            message($lang_register['No new regs']);
         }
 
+        // Load the register.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/register.php';
+
+        // Load the register.php/profile.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
+
         if ($this->config['o_rules'] != '1') {
             redirect(get_link('register/agree/'));
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Register'), __('Forum rules'));
+        $page_title = array(feather_escape($this->config['o_board_title']), $lang_register['Register'], $lang_register['Forum rules']);
 
         define('FEATHER_ACTIVE_PAGE', 'register');
 
         $this->header->setTitle($page_title)->display();
 
         $this->feather->render('register/rules.php', array(
+                            'lang_register'    =>    $lang_register,
                             'feather_config'    =>    $this->config,
                             )
                     );
diff --git a/controller/search.php b/controller/search.php
index 24672375..8cfda6d3 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -21,9 +21,6 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\search();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/search.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
     }
 
     public function __autoload($class_name)
@@ -33,12 +30,16 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $pd;
+        global $lang_common, $lang_search, $lang_forum, $lang_topic, $pd;
+
+        // Load the search.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/search.php';
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            message($lang_common['No view'], '403');
         } elseif ($this->user->g_search == '0') {
-            message(__('No search permission'), false, '403 Forbidden');
+            message($lang_search['No search permission'], false, '403 Forbidden');
         }
 
         require FEATHER_ROOT.'include/search_idx.php';
@@ -49,18 +50,21 @@ public function display()
 
                 // We have results to display
                 if (isset($search['is_result'])) {
-                    $page_title = array(feather_escape($this->config['o_board_title']), __('Search results'));
+                    $page_title = array(feather_escape($this->config['o_board_title']), $lang_search['Search results']);
 
                     define('FEATHER_ACTIVE_PAGE', 'search');
 
                     $this->header->setTitle($page_title)->display();
 
                     $this->feather->render('search/header.php', array(
+                                'lang_common' => $lang_common,
+                                'lang_search' => $lang_search,
                                 'search' => $search,
                                 )
                         );
 
                     if ($search['show_as'] == 'posts') {
+                        require FEATHER_ROOT.'lang/'.$this->user->language.'/topic.php';
                         require FEATHER_ROOT.'include/parser.php';
                     }
 
@@ -73,11 +77,11 @@ public function display()
 
                     $this->footer->display();
                 } else {
-                    message(__('No hits'));
+                    message($lang_search['No hits']);
                 }
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Search'));
+        $page_title = array(feather_escape($this->config['o_board_title']), $lang_search['Search']);
         $focus_element = array('search', 'keywords');
 
         define('FEATHER_ACTIVE_PAGE', 'search');
@@ -85,6 +89,8 @@ public function display()
         $this->header->setTitle($page_title)->setFocusElement($focus_element)->display();
 
         $this->feather->render('search/form.php', array(
+                            'lang_common' => $lang_common,
+                            'lang_search' => $lang_search,
                             'feather_config' => $this->config,
                             'feather' => $this->feather,
                             'forums' => $this->model->get_list_forums(),
diff --git a/controller/userlist.php b/controller/userlist.php
index a22d849b..5fda0733 100644
--- a/controller/userlist.php
+++ b/controller/userlist.php
@@ -21,8 +21,6 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\userlist();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/search.mo');
     }
 
     public function __autoload($class_name)
@@ -32,12 +30,21 @@ public function __autoload($class_name)
     
     public function display()
     {
+        global $lang_common;
+
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            message($lang_common['No view'], '403');
         } elseif ($this->user->g_view_users == '0') {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
+        // Load the userlist.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.php';
+
+        // Load the search.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/search.php';
+
+
         // Determine if we are allowed to view post counts
         $show_post_count = ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) ? true : false;
 
@@ -54,13 +61,13 @@ public function display()
         $p = (!$this->request->get('p') || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
         $start_from = 50 * ($p - 1);
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('User list'));
+        $page_title = array(feather_escape($this->config['o_board_title']), $lang_common['User list']);
         if ($this->user->g_search_users == '1') {
             $focus_element = array('userlist', 'username');
         }
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
+        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
 
         define('FEATHER_ALLOW_INDEX', 1);
 
@@ -69,6 +76,9 @@ public function display()
         $this->header->setTitle($page_title)->setPage($p)->setFocusElement($focus_element)->setPagingLinks($paging_links)->display();
 
         $this->feather->render('userlist.php', array(
+                            'lang_common' => $lang_common,
+                            'lang_search' => $lang_search,
+                            'lang_ul' => $lang_ul,
                             'feather' => $this->feather,
                             'username' => $username,
                             'show_group' => $show_group,
diff --git a/controller/viewforum.php b/controller/viewforum.php
index 5b9d207a..a8802107 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -21,7 +21,6 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\viewforum();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
     }
 
     public function __autoload($class_name)
@@ -31,14 +30,19 @@ public function __autoload($class_name)
     
     public function display($id, $name = null, $page = null)
     {
+        global $lang_common, $lang_forum;
+
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            message($lang_common['No view'], '403');
         }
 
         if ($id < 1) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
+        // Load the viewforum.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
+
         // Fetch some informations about the forum
         $cur_forum = $this->model->get_info_forum($id);
 
@@ -56,7 +60,7 @@ public function display($id, $name = null, $page = null)
 
         // Can we or can we not post new topics?
         if (($cur_forum['post_topics'] == '' && $this->user->g_post_topics == '1') || $cur_forum['post_topics'] == '1' || $is_admmod) {
-            $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/new-topic/'.$id.'/').'">'.__('Post topic').'</a></p>'."\n";
+            $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/new-topic/'.$id.'/').'">'.$lang_forum['Post topic'].'</a></p>'."\n";
         } else {
             $post_link = '';
         }
@@ -69,7 +73,7 @@ public function display($id, $name = null, $page = null)
         $url_forum = url_friendly($cur_forum['forum_name']);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'forum/'.$id.'/'.$url_forum.'/#');
+        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'forum/'.$id.'/'.$url_forum.'/#');
 
         $forum_actions = $this->model->get_forum_actions($id, $this->config['o_forum_subscriptions'], $cur_forum['is_subscribed']);
 
@@ -86,6 +90,8 @@ public function display($id, $name = null, $page = null)
         $this->feather->render('viewforum.php', array(
                             'id' => $id,
                             'forum_data' => $this->model->print_topics($id, $sort_by, $start_from),
+                            'lang_common' => $lang_common,
+                            'lang_forum' => $lang_forum,
                             'cur_forum' => $cur_forum,
                             'paging_links' => $paging_links,
                             'post_link' => $post_link,
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index 3cede850..bbbefaa8 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -21,9 +21,6 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\viewtopic();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.mo');
     }
 
     public function __autoload($class_name)
@@ -33,20 +30,29 @@ public function __autoload($class_name)
 
     public function display($id = null, $name = null, $page = null, $pid = null)
     {
-        global $pd;
+        global $lang_common, $lang_post, $lang_topic, $lang_bbeditor, $pd;
 
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            message($lang_common['No view'], '403');
         }
 
+        // Load the viewtopic.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/topic.php';
+
+        // Load the post.php language file
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/post.php';
+
         // Antispam feature
         require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
+        // BBcode toolbar feature
+        require FEATHER_ROOT.'lang/'.$this->user['language'].'/bbeditor.php';
+
         // Load the viewtopic.php model file
         require_once FEATHER_ROOT.'model/viewtopic.php';
 
-        // Fetch some informations about the topic
+        // Fetch some informations about the topic TODO
         $cur_topic = $this->model->get_info_topic($id);
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
@@ -76,7 +82,8 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         $url_forum = url_friendly($cur_topic['forum_name']);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'topic/'.$id.'/'.$url_topic.'/#');
+        $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'topic/'.$id.'/'.$url_topic.'/#');
+
 
         if ($this->config['o_censoring'] == '1') {
             $cur_topic['subject'] = censor_words($cur_topic['subject']);
@@ -96,12 +103,18 @@ public function display($id = null, $name = null, $page = null, $pid = null)
 
         $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->display();
 
+        $forum_id = $cur_topic['forum_id'];
+
         require FEATHER_ROOT.'include/parser.php';
 
         $this->feather->render('viewtopic.php', array(
                             'id' => $id,
                             'p' => $p,
                             'post_data' => $this->model->print_posts($id, $start_from, $cur_topic, $is_admmod),
+                            'lang_common' => $lang_common,
+                            'lang_topic' => $lang_topic,
+                            'lang_post' => $lang_post,
+                            'lang_bbeditor' => $lang_bbeditor,
                             'cur_topic'    =>    $cur_topic,
                             'subscraction'    =>    $subscraction,
                             'is_admmod'    =>    $is_admmod,
@@ -128,13 +141,17 @@ public function display($id = null, $name = null, $page = null, $pid = null)
 
     public function viewpost($pid)
     {
+        global $lang_common;
+
         $post = $this->model->redirect_to_post($pid);
 
-        return $this->display($post['topic_id'], null, $post['get_p'], $pid);
+        return self::display($post['topic_id'], null, $post['get_p'], $pid);
     }
 
     public function action($id, $action)
     {
+        global $lang_common;
+
         $this->model->handle_actions($id, $action);
     }
 }
diff --git a/extern.php b/extern.php
index 06d17a61..f88c3107 100644
--- a/extern.php
+++ b/extern.php
@@ -70,8 +70,6 @@
 
 require FEATHER_ROOT.'include/common.php';
 
-load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/common.mo');
-
 // The length at which topic subjects will be truncated (for HTML output)
 if (!defined('FORUM_EXTERN_MAX_SUBJECT_LENGTH')) {
     define('FORUM_EXTERN_MAX_SUBJECT_LENGTH', 30);
@@ -130,7 +128,7 @@ function authenticate_user($user, $password, $password_is_hash = false)
 
 if ($feather->user->g_read_board == '0') {
     http_authenticate_user();
-    exit(__('No view'));
+    exit($lang_common['No view']);
 }
 
 $action = isset($_GET['action']) ? strtolower($_GET['action']) : 'feed';
@@ -169,7 +167,7 @@ function http_authenticate_user()
 //
 function output_rss($feed)
 {
-    global $feather_config;
+    global $lang_common, $feather_config;
 
     // Send XML/no cache headers
     header('Content-Type: application/xml; charset=utf-8');
@@ -214,7 +212,7 @@ function output_rss($feed)
 //
 function output_atom($feed)
 {
-    global $feather_config;
+    global $lang_common, $feather_config;
 
     // Send XML/no cache headers
     header('Content-Type: application/atom+xml; charset=utf-8');
@@ -272,7 +270,7 @@ function output_atom($feed)
 //
 function output_xml($feed)
 {
-    global $feather_config;
+    global $lang_common, $feather_config;
 
     // Send XML/no cache headers
     header('Content-Type: application/xml; charset=utf-8');
@@ -372,7 +370,7 @@ function output_html($feed)
 
         if (!$cur_topic) {
             http_authenticate_user();
-            exit(__('Bad request'));
+            exit($lang_common['Bad request']);
         }
 
         if ($feather_config['o_censoring'] == '1') {
@@ -381,9 +379,9 @@ function output_html($feed)
 
         // Setup the feed
         $feed = array(
-            'title'        =>    $feather_config['o_board_title'].__('Title separator').$cur_topic['subject'],
+            'title'        =>    $feather_config['o_board_title'].$lang_common['Title separator'].$cur_topic['subject'],
             'link'            =>    get_link('topic/'.$tid.'/'.url_friendly($cur_topic['subject']).'/'),
-            'description'        =>    sprintf(__('RSS description topic'), $cur_topic['subject']),
+            'description'        =>    sprintf($lang_common['RSS description topic'], $cur_topic['subject']),
             'items'            =>    array(),
             'type'            =>    'posts'
         );
@@ -405,7 +403,7 @@ function output_html($feed)
 
             $item = array(
                 'id'            =>    $cur_post['id'],
-                'title'            =>    $cur_topic['first_post_id'] == $cur_post['id'] ? $cur_topic['subject'] : __('RSS reply').$cur_topic['subject'],
+                'title'            =>    $cur_topic['first_post_id'] == $cur_post['id'] ? $cur_topic['subject'] : $lang_common['RSS reply'].$cur_topic['subject'],
                 'link'            =>    get_link('post/'.$cur_post['id'].'/#p'.$cur_post['id']),
                 'description'        =>    $cur_post['message'],
                 'author'        =>    array(
@@ -460,7 +458,7 @@ function output_html($feed)
                     ->find_one_col('f.forum_name');
 
                 if ($cur_topic) {
-                    $forum_name = __('Title separator').$cur_topic;
+                    $forum_name = $lang_common['Title separator'].$cur_topic;
                 }
             }
         }
@@ -477,7 +475,7 @@ function output_html($feed)
 
         // Only attempt to cache if caching is enabled and we have all or a single forum
         if ($feather_config['o_feed_ttl'] > 0 && ($forum_sql == '' || ($forum_name != '' && !isset($_GET['nfid'])))) {
-            $cache_id = 'feed'.sha1($feather->user->g_id.'|'.__('lang_identifier').'|'.($order_posted ? '1' : '0').($forum_name == '' ? '' : '|'.$fids[0]));
+            $cache_id = 'feed'.sha1($feather->user->g_id.'|'.$lang_common['lang_identifier'].'|'.($order_posted ? '1' : '0').($forum_name == '' ? '' : '|'.$fids[0]));
         }
 
         // Load cached feed
@@ -491,7 +489,7 @@ function output_html($feed)
             $feed = array(
                 'title'        =>    $feather_config['o_board_title'].$forum_name,
                 'link'            =>    '/index.php',
-                'description'    =>    sprintf(__('RSS description'), $feather_config['o_board_title']),
+                'description'    =>    sprintf($lang_common['RSS description'], $feather_config['o_board_title']),
                 'items'            =>    array(),
                 'type'            =>    'topics'
             );
@@ -613,12 +611,12 @@ function output_html($feed)
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
 
-    echo sprintf(__('Guests online'), forum_number_format($num_guests)).'<br />'."\n";
+    echo sprintf($lang_index['Guests online'], forum_number_format($num_guests)).'<br />'."\n";
 
     if ($action == 'online_full' && !empty($users)) {
-        echo sprintf(__('Users online'), implode(', ', $users)).'<br />'."\n";
+        echo sprintf($lang_index['Users online'], implode(', ', $users)).'<br />'."\n";
     } else {
-        echo sprintf(__('Users online'), forum_number_format($num_users)).'<br />'."\n";
+        echo sprintf($lang_index['Users online'], forum_number_format($num_users)).'<br />'."\n";
     }
 
     exit;
@@ -657,12 +655,12 @@ function output_html($feed)
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
 
-    echo sprintf(__('No of users'), forum_number_format($stats['total_users'])).'<br />'."\n";
-    echo sprintf(__('Newest user'), (($feather->user->g_view_users == '1') ? '<a href="'.get_link('user/'.$stats['last_user']['id'].'/').'">'.feather_escape($stats['last_user']['username']).'</a>' : feather_escape($stats['last_user']['username']))).'<br />'."\n";
-    echo sprintf(__('No of topics'), forum_number_format($stats['total_topics'])).'<br />'."\n";
-    echo sprintf(__('No of posts'), forum_number_format($stats['total_posts'])).'<br />'."\n";
+    echo sprintf($lang_index['No of users'], forum_number_format($stats['total_users'])).'<br />'."\n";
+    echo sprintf($lang_index['Newest user'], (($feather->user->g_view_users == '1') ? '<a href="'.get_link('user/'.$stats['last_user']['id'].'/').'">'.feather_escape($stats['last_user']['username']).'</a>' : feather_escape($stats['last_user']['username']))).'<br />'."\n";
+    echo sprintf($lang_index['No of topics'], forum_number_format($stats['total_topics'])).'<br />'."\n";
+    echo sprintf($lang_index['No of posts'], forum_number_format($stats['total_posts'])).'<br />'."\n";
 
     exit;
 }
 // If we end up here, the script was called with some wacky parameters
-exit(__('Bad request'));
+exit($lang_common['Bad request']);
diff --git a/include/cache.php b/include/cache.php
index b275e400..dba2e878 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -56,7 +56,7 @@ function generate_bans_cache()
 //
 function generate_quickjump_cache($group_id = false)
 {
-
+    global $lang_common;
 
     $groups = array();
 
@@ -103,7 +103,7 @@ function generate_quickjump_cache($group_id = false)
                             ->find_many();
 
             if ($result) {
-                $output .= "\t\t\t\t".'<form id="qjump" method="get" action="">'."\n\t\t\t\t\t".'<div><label><span><?php echo __(\'Jump to\') ?>'.'<br /></span>'."\n\t\t\t\t\t".'<select name="id" onchange="window.location=(\''.get_link('forum/').'\'+this.options[this.selectedIndex].value)">'."\n";
+                $output .= "\t\t\t\t".'<form id="qjump" method="get" action="">'."\n\t\t\t\t\t".'<div><label><span><?php echo $lang_common[\'Jump to\'] ?>'.'<br /></span>'."\n\t\t\t\t\t".'<select name="id" onchange="window.location=(\''.get_link('forum/').'\'+this.options[this.selectedIndex].value)">'."\n";
 
                 $cur_category = 0;
                 foreach ($result as $cur_forum) {
@@ -122,7 +122,7 @@ function generate_quickjump_cache($group_id = false)
                     $output .= "\t\t\t\t\t\t\t".'<option value="'.$cur_forum['fid'].'/'.url_friendly($cur_forum['forum_name']).'/'.'"<?php echo ($forum_id == '.$cur_forum['fid'].') ? \' selected="selected"\' : \'\' ?>>'.feather_escape($cur_forum['forum_name']).$redirect_tag.'</option>'."\n";
                 }
 
-                $output .= "\t\t\t\t\t\t".'</optgroup>'."\n\t\t\t\t\t".'</select></label>'."\n\t\t\t\t\t".'<input type="submit" value="<?php echo __(\'Go\') ?>" accesskey="g" />'."\n\t\t\t\t\t".'</div>'."\n\t\t\t\t".'</form>'."\n";
+                $output .= "\t\t\t\t\t\t".'</optgroup>'."\n\t\t\t\t\t".'</select></label>'."\n\t\t\t\t\t".'<input type="submit" value="<?php echo $lang_common[\'Go\'] ?>" accesskey="g" />'."\n\t\t\t\t\t".'</div>'."\n\t\t\t\t".'</form>'."\n";
             }
         }
 
diff --git a/include/common.php b/include/common.php
deleted file mode 100644
index d617810b..00000000
--- a/include/common.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-if (!defined('FEATHER_ROOT')) {
-    exit('The constant FEATHER_ROOT must be defined and point to a valid FeatherBB installation root directory.');
-}
-
-// Define the version and database revision that this code was written for
-define('FORUM_VERSION', '1.0.0');
-
-define('FORUM_DB_REVISION', 21);
-define('FORUM_SI_REVISION', 2);
-define('FORUM_PARSER_REVISION', 2);
-
-// Attempt to load the configuration file config.php
-if (file_exists(FEATHER_ROOT.'include/config.php')) {
-    require FEATHER_ROOT.'include/config.php';
-}
-
-// Load the functions script
-require FEATHER_ROOT.'include/functions.php';
-
-// Load UTF-8 functions
-require FEATHER_ROOT.'include/utf8/utf8.php';
-
-// Strip out "bad" UTF-8 characters
-forum_remove_bad_characters();
-
-// Reverse the effect of register_globals
-forum_unregister_globals();
-
-// If FEATHER isn't defined, config.php is missing or corrupt
-if (!defined('FEATHER')) {
-    header('Location: '.$feather->request->getPath().'install/index.php');
-    exit;
-}
-
-// Record the start time (will be used to calculate the generation time for the page)
-$feather->start = get_microtime();
-
-// Make sure PHP reports all errors except E_NOTICE. FluxBB supports E_ALL, but a lot of scripts it may interact with, do not
-//error_reporting(E_ALL ^ E_NOTICE);
-error_reporting(E_ALL); // Let's report everything for development
-
-// Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
-setlocale(LC_CTYPE, 'C');
-
-// Turn off magic_quotes_runtime
-if (get_magic_quotes_runtime()) {
-    set_magic_quotes_runtime(0);
-}
-
-// If a cookie name is not specified in config.php, we use the default (pun_cookie)
-if (empty($cookie_name)) {
-    $cookie_name = 'feather_cookie';
-}
-
-// If the cache directory is not specified, we use the default setting
-if (!defined('FORUM_CACHE_DIR')) {
-    define('FORUM_CACHE_DIR', FEATHER_ROOT.'cache/');
-}
-
-// Define a few commonly used constants
-define('FEATHER_UNVERIFIED', 0);
-define('FEATHER_ADMIN', 1);
-define('FEATHER_MOD', 2);
-define('FEATHER_GUEST', 3);
-define('FEATHER_MEMBER', 4);
-
-// Inject DB prefix to SlimFramework
-$feather->prefix = $db_prefix;
-
-// Include Idiorm and set it up
-require FEATHER_ROOT.'include/idiorm.php';
-
-switch ($db_type) {
-    case 'mysql':
-    case 'mysqli':
-    case 'mysql_innodb':
-    case 'mysqli_innodb':
-        \DB::configure('mysql:host='.$db_host.';dbname='.$db_name);
-        \DB::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-        break;
-    case 'sqlite';
-    case 'sqlite3';
-        \DB::configure('sqlite:./'.$db_name);
-        break;
-    case 'pgsql':
-        \DB::configure('pgsql:host='.$db_host.'dbname='.$db_name);
-        break;
-}
-\DB::configure('username', $db_username);
-\DB::configure('password', $db_password);
-\DB::configure('id_column_overrides', array(
-    $db_prefix.'groups' => 'g_id',
-));
-
-// Log queries if needed
-if (defined('FEATHER_SHOW_QUERIES')) {
-    \DB::configure('logging', true);
-}
-
-// Cache queries if needed
-if (defined('FEATHER_CACHE_QUERIES')) {
-    \DB::configure('caching', true);
-}
-
-// Load cached config
-if (file_exists(FORUM_CACHE_DIR.'cache_config.php')) {
-    include FORUM_CACHE_DIR.'cache_config.php';
-}
-
-if (!defined('FEATHER_CONFIG_LOADED')) {
-    if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-        require FEATHER_ROOT.'include/cache.php';
-    }
-
-    generate_config_cache();
-    require FORUM_CACHE_DIR.'cache_config.php';
-}
-
-// Inject config to SlimFramework
-$feather->config = $feather_config;
-
-// Enable output buffering
-if (!defined('FEATHER_DISABLE_BUFFERING')) {
-    // Should we use gzip output compression?
-    if ($feather->config['o_gzip'] && extension_loaded('zlib')) {
-        ob_start('ob_gzhandler');
-    } else {
-        ob_start();
-    }
-}
-
-// Define standard date/time formats
-$forum_time_formats = array($feather->config['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
-$forum_date_formats = array($feather->config['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
-
-// Check/update/set cookie and fetch user info
-check_cookie();
-
-// Load l10n
-require_once FEATHER_ROOT.'include/pomo/MO.php';
-require_once FEATHER_ROOT.'include/l10n.php';
-
-// Attempt to load the language file
-if (file_exists(FEATHER_ROOT.'lang/'.$feather->user->language.'/common.mo')) {
-    load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/common.mo');
-}
-else {
-    die('There is no valid language pack \''.feather_escape($feather->user->language).'\' installed. Please reinstall a language of that name');
-}
-
-// Check if we are to display a maintenance message
-if ($feather->config['o_maintenance'] && $feather->user->g_id > FEATHER_ADMIN && !defined('FEATHER_TURN_OFF_MAINT')) {
-    maintenance_message();
-}
-
-// Load cached bans
-if (file_exists(FORUM_CACHE_DIR.'cache_bans.php')) {
-    include FORUM_CACHE_DIR.'cache_bans.php';
-}
-
-if (!defined('FEATHER_BANS_LOADED')) {
-    if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-        require FEATHER_ROOT.'include/cache.php';
-    }
-
-    generate_bans_cache();
-    require FORUM_CACHE_DIR.'cache_bans.php';
-}
-
-// Check if current user is banned
-check_bans();
-
-// Update online list
-update_users_online();
-
-// Check to see if we logged in without a cookie being set
-if ($feather->user->is_guest && isset($_GET['login'])) {
-    message(__('No cookie'));
-}
-
-// 32kb should be more than enough for forum posts
-if (!defined('FEATHER_MAX_POSTSIZE')) {
-    define('FEATHER_MAX_POSTSIZE', 32768);
-}
-
-if (!defined('FEATHER_SEARCH_MIN_WORD')) {
-    define('FEATHER_SEARCH_MIN_WORD', 3);
-}
-if (!defined('FEATHER_SEARCH_MAX_WORD')) {
-    define('FEATHER_SEARCH_MAX_WORD', 20);
-}
-
-if (!defined('FORUM_MAX_COOKIE_SIZE')) {
-    define('FORUM_MAX_COOKIE_SIZE', 4048);
-}
diff --git a/include/email.php b/include/email.php
index 619d9736..4300cf85 100644
--- a/include/email.php
+++ b/include/email.php
@@ -261,14 +261,14 @@ function bbcode2email($text, $wrap_length = 72)
 //
 function pun_mail($to, $subject, $message, $reply_to_email = '', $reply_to_name = '')
 {
-    global $feather_config;
+    global $feather_config, $lang_common;
 
     // Use \r\n for SMTP servers, the system's line ending for local mailers
     $smtp = $feather_config['o_smtp_host'] != '';
     $EOL = $smtp ? "\r\n" : FORUM_EOL;
 
     // Default sender/return address
-    $from_name = sprintf(__('Mailer'), $feather_config['o_board_title']);
+    $from_name = sprintf($lang_common['Mailer'], $feather_config['o_board_title']);
     $from_email = $feather_config['o_webmaster_email'];
 
     // Do a little spring cleaning
diff --git a/include/functions.php b/include/functions.php
index 2a61dcee..41646e03 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -27,7 +27,7 @@ function check_cookie()
 
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
-    
+
     $now = time();
 
     // Get FeatherBB cookie
@@ -331,7 +331,7 @@ function feather_setcookie($user_id, $password, $expires)
 //
 function check_bans()
 {
-    global $feather_config, $feather_bans;
+    global $feather_config, $lang_common, $feather_bans;
 
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
@@ -384,7 +384,7 @@ function check_bans()
         if ($is_banned) {
             \DB::for_table('online')->where('ident', $feather->user->username)
                                                  ->delete_many();
-            message(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.feather_escape($feather_config['o_admin_email']).'">'.feather_escape($feather_config['o_admin_email']).'</a>.', true, true, true);
+            message($lang_common['Ban message'].' '.(($cur_ban['expire'] != '') ? $lang_common['Ban message 2'].' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? $lang_common['Ban message 3'].'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').$lang_common['Ban message 4'].' <a href="mailto:'.feather_escape($feather_config['o_admin_email']).'">'.feather_escape($feather_config['o_admin_email']).'</a>.', true, true, true);
         }
     }
 
@@ -404,35 +404,32 @@ function check_bans()
 //
 function check_username($username, $errors, $exclude_id = null)
 {
-    global $feather, $feather_config, $errors, $feather_bans;
+    global $feather, $feather_config, $errors, $lang_prof_reg, $lang_register, $lang_common, $feather_bans;
 
     // Include UTF-8 function
     require_once FEATHER_ROOT.'include/utf8/strcasecmp.php';
 
-    load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/register.mo');
-    load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/prof_reg.mo');
-
     // Convert multiple whitespace characters into one (to prevent people from registering with indistinguishable usernames)
     $username = preg_replace('%\s+%s', ' ', $username);
 
     // Validate username
     if (feather_strlen($username) < 2) {
-        $errors[] = __('Username too short');
+        $errors[] = $lang_prof_reg['Username too short'];
     } elseif (feather_strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
-        $errors[] = __('Username too long');
-    } elseif (!strcasecmp($username, 'Guest') || !utf8_strcasecmp($username, __('Guest'))) {
-        $errors[] = __('Username guest');
+        $errors[] = $lang_prof_reg['Username too long'];
+    } elseif (!strcasecmp($username, 'Guest') || !utf8_strcasecmp($username, $lang_common['Guest'])) {
+        $errors[] = $lang_prof_reg['Username guest'];
     } elseif (preg_match('%[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}%', $username) || preg_match('%((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))%', $username)) {
-        $errors[] = __('Username IP');
+        $errors[] = $lang_prof_reg['Username IP'];
     } elseif ((strpos($username, '[') !== false || strpos($username, ']') !== false) && strpos($username, '\'') !== false && strpos($username, '"') !== false) {
-        $errors[] = __('Username reserved chars');
+        $errors[] = $lang_prof_reg['Username reserved chars'];
     } elseif (preg_match('%(?:\[/?(?:b|u|s|ins|del|em|i|h|colou?r|quote|code|img|url|email|list|\*|topic|post|forum|user)\]|\[(?:img|url|quote|list)=)%i', $username)) {
-        $errors[] = __('Username BBCode');
+        $errors[] = $lang_prof_reg['Username BBCode'];
     }
 
     // Check username for any censored words
     if ($feather_config['o_censoring'] == '1' && censor_words($username) != $username) {
-        $errors[] = __('Username censor');
+        $errors[] = $lang_register['Username censor'];
     }
 
     // Check that the username (or a too similar username) is not already registered
@@ -442,13 +439,13 @@ function check_username($username, $errors, $exclude_id = null)
 
     if ($result) {
         $busy = $result['username'];
-        $errors[] = __('Username dupe 1').' '.feather_escape($busy).'. '.__('Username dupe 2');
+        $errors[] = $lang_register['Username dupe 1'].' '.feather_escape($busy).'. '.$lang_register['Username dupe 2'];
     }
 
     // Check username for any banned usernames
     foreach ($feather_bans as $cur_ban) {
         if ($cur_ban['username'] != '' && utf8_strtolower($username) == utf8_strtolower($cur_ban['username'])) {
-            $errors[] = __('Banned username');
+            $errors[] = $lang_prof_reg['Banned username'];
             break;
         }
     }
@@ -524,7 +521,7 @@ function generate_avatar_markup($user_id)
 //
 function generate_page_title($page_title, $p = null)
 {
-
+    global $lang_common;
 
     if (!is_array($page_title)) {
         $page_title = array($page_title);
@@ -533,10 +530,10 @@ function generate_page_title($page_title, $p = null)
     $page_title = array_reverse($page_title);
 
     if ($p > 1) {
-        $page_title[0] .= ' ('.sprintf(__('Page'), forum_number_format($p)).')';
+        $page_title[0] .= ' ('.sprintf($lang_common['Page'], forum_number_format($p)).')';
     }
 
-    $crumbs = implode(__('Title separator'), $page_title);
+    $crumbs = implode($lang_common['Title separator'], $page_title);
 
     return $crumbs;
 }
@@ -799,7 +796,7 @@ function censor_words($text)
 //
 function get_title($user)
 {
-    global $feather_bans;
+    global $feather_bans, $lang_common;
     static $ban_list;
 
     // If not already built in a previous call, build an array of lowercase banned usernames
@@ -817,7 +814,7 @@ function get_title($user)
     }
     // If the user is banned
     elseif (in_array(utf8_strtolower($user['username']), $ban_list)) {
-        $user_title = __('Banned');
+        $user_title = $lang_common['Banned'];
     }
     // If the user group has a default user title
     elseif ($user['g_user_title'] != '') {
@@ -825,11 +822,11 @@ function get_title($user)
     }
     // If the user is a guest
     elseif ($user['g_id'] == FEATHER_GUEST) {
-        $user_title = __('Guest');
+        $user_title = $lang_common['Guest'];
     }
     // If nothing else helps, we assign the default
     else {
-        $user_title = __('Member');
+        $user_title = $lang_common['Member'];
     }
 
     return $user_title;
@@ -841,7 +838,7 @@ function get_title($user)
 //
 function paginate($num_pages, $cur_page, $link, $args = null)
 {
-
+    global $lang_common;
 
     $pages = array();
     $link_to_all = false;
@@ -857,14 +854,14 @@ function paginate($num_pages, $cur_page, $link, $args = null)
     } else {
         // Add a previous page link
         if ($num_pages > 1 && $cur_page > 1) {
-            $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', ($cur_page - 1), $args).'">'.__('Previous').'</a>';
+            $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', ($cur_page - 1), $args).'">'.$lang_common['Previous'].'</a>';
         }
 
         if ($cur_page > 3) {
             $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'">1</a>';
 
             if ($cur_page > 5) {
-                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
+                $pages[] = '<span class="spacer">'.$lang_common['Spacer'].'</span>';
             }
         }
 
@@ -881,7 +878,7 @@ function paginate($num_pages, $cur_page, $link, $args = null)
 
         if ($cur_page <= ($num_pages-3)) {
             if ($cur_page != ($num_pages-3) && $cur_page != ($num_pages-4)) {
-                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
+                $pages[] = '<span class="spacer">'.$lang_common['Spacer'].'</span>';
             }
 
             $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', $num_pages, $args).'">'.forum_number_format($num_pages).'</a>';
@@ -889,7 +886,7 @@ function paginate($num_pages, $cur_page, $link, $args = null)
 
         // Add a next page link
         if ($num_pages > 1 && !$link_to_all && $cur_page < $num_pages) {
-            $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', ($cur_page + 1), $args).'">'.__('Next').'</a>';
+            $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', ($cur_page + 1), $args).'">'.$lang_common['Next'].'</a>';
         }
     }
 
@@ -902,7 +899,7 @@ function paginate($num_pages, $cur_page, $link, $args = null)
 //
 function paginate_old($num_pages, $cur_page, $link)
 {
-
+    global $lang_common;
 
     $pages = array();
     $link_to_all = false;
@@ -918,14 +915,14 @@ function paginate_old($num_pages, $cur_page, $link)
     } else {
         // Add a previous page link
         if ($num_pages > 1 && $cur_page > 1) {
-            $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.($cur_page == 2 ? '' : '&amp;p='.($cur_page - 1)).'">'.__('Previous').'</a>';
+            $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.($cur_page == 2 ? '' : '&amp;p='.($cur_page - 1)).'">'.$lang_common['Previous'].'</a>';
         }
 
         if ($cur_page > 3) {
             $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'">1</a>';
 
             if ($cur_page > 5) {
-                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
+                $pages[] = '<span class="spacer">'.$lang_common['Spacer'].'</span>';
             }
         }
 
@@ -942,7 +939,7 @@ function paginate_old($num_pages, $cur_page, $link)
 
         if ($cur_page <= ($num_pages-3)) {
             if ($cur_page != ($num_pages-3) && $cur_page != ($num_pages-4)) {
-                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
+                $pages[] = '<span class="spacer">'.$lang_common['Spacer'].'</span>';
             }
 
             $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.$num_pages.'">'.forum_number_format($num_pages).'</a>';
@@ -950,7 +947,7 @@ function paginate_old($num_pages, $cur_page, $link)
 
         // Add a next page link
         if ($num_pages > 1 && !$link_to_all && $cur_page < $num_pages) {
-            $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.($cur_page +1).'">'.__('Next').'</a>';
+            $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.($cur_page +1).'">'.$lang_common['Next'].'</a>';
         }
     }
 
@@ -964,7 +961,7 @@ function paginate_old($num_pages, $cur_page, $link)
 
 function message($msg, $http_status = null, $no_back_link = false, $dontStop = false)
 {
-
+    global $lang_common;
 
     // Did we receive a custom header?
     if (!is_null($http_status)) {
@@ -983,7 +980,7 @@ function message($msg, $http_status = null, $no_back_link = false, $dontStop = f
     $feather->response->setBody('');
 
     if (!defined('FEATHER_HEADER')) {
-        $page_title = array(feather_escape($feather->config['o_board_title']), __('Info'));
+        $page_title = array(feather_escape($feather->config['o_board_title']), $lang_common['Info']);
 
         if (!defined('FEATHER_ACTIVE_PAGE')) {
             define('FEATHER_ACTIVE_PAGE', 'index');
@@ -999,6 +996,7 @@ function message($msg, $http_status = null, $no_back_link = false, $dontStop = f
     }
 
     $feather->render('message.php', array(
+        'lang_common' => $lang_common,
         'message'    =>    $msg,
         'no_back_link'    => $no_back_link,
         ));
@@ -1020,10 +1018,10 @@ function message($msg, $http_status = null, $no_back_link = false, $dontStop = f
 //
 function format_time($timestamp, $date_only = false, $date_format = null, $time_format = null, $time_only = false, $no_text = false)
 {
-    global $forum_date_formats, $forum_time_formats;
+    global $lang_common, $forum_date_formats, $forum_time_formats;
 
     if ($timestamp == '') {
-        return __('Never');
+        return $lang_common['Never'];
     }
 
     // Get Slim current session
@@ -1047,9 +1045,9 @@ function format_time($timestamp, $date_only = false, $date_format = null, $time_
 
     if (!$no_text) {
         if ($date == $today) {
-            $date = __('Today');
+            $date = $lang_common['Today'];
         } elseif ($date == $yesterday) {
-            $date = __('Yesterday');
+            $date = $lang_common['Yesterday'];
         }
     }
 
@@ -1068,9 +1066,9 @@ function format_time($timestamp, $date_only = false, $date_format = null, $time_
 //
 function forum_number_format($number, $decimals = 0)
 {
+    global $lang_common;
 
-
-    return is_numeric($number) ? number_format($number, $decimals, __('lang_decimal_point'), __('lang_thousands_sep')) : $number;
+    return is_numeric($number) ? number_format($number, $decimals, $lang_common['lang_decimal_point'], $lang_common['lang_thousands_sep']) : $number;
 }
 
 
@@ -1245,7 +1243,7 @@ function is_all_uppercase($string)
 //
 function maintenance_message()
 {
-    global $feather_config, $tpl_main;
+    global $lang_common, $feather_config, $tpl_main;
 
     // Deal with newlines, tabs and multiple spaces
     $pattern = array("\t", '  ', '  ');
@@ -1255,7 +1253,7 @@ function maintenance_message()
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
 
-    $page_title = array(feather_escape($feather_config['o_board_title']), __('Maintenance'));
+    $page_title = array(feather_escape($feather_config['o_board_title']), $lang_common['Maintenance']);
 
     if (!defined('FEATHER_ACTIVE_PAGE')) {
         define('FEATHER_ACTIVE_PAGE', 'index');
@@ -1271,6 +1269,7 @@ function maintenance_message()
     $header->setTitle($page_title)->display();
 
     $feather->render('message.php', array(
+            'lang_common' => $lang_common,
             'message'    =>    $message,
             'no_back_link'    =>    '',
         )
@@ -1412,13 +1411,15 @@ function remove_bad_characters($array)
 //
 function file_size($size)
 {
+    global $lang_common;
+
     $units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB');
 
     for ($i = 0; $size > 1024; $i++) {
         $size /= 1024;
     }
 
-    return sprintf(__('Size unit '.$units[$i]), round($size, 2));
+    return sprintf($lang_common['Size unit '.$units[$i]], round($size, 2));
 }
 
 
@@ -1706,19 +1707,19 @@ function forum_is_writable($path)
 //
 function display_saved_queries()
 {
-
+    global $lang_common;
 
     ?>
 
 <div id="debug" class="blocktable">
-	<h2><span><?php echo __('Debug table') ?></span></h2>
+	<h2><span><?php echo $lang_common['Debug table'] ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Query times') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Query') ?></th>
+					<th class="tcl" scope="col"><?php echo $lang_common['Query times'] ?></th>
+					<th class="tcr" scope="col"><?php echo $lang_common['Query'] ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -1737,7 +1738,7 @@ function display_saved_queries()
     }
         ?>
 				<tr>
-					<td class="tcl" colspan="2"><?php printf(__('Total query time'), $query_time_total.' s') ?></td>
+					<td class="tcl" colspan="2"><?php printf($lang_common['Total query time'], $query_time_total.' s') ?></td>
 				</tr>
 			</tbody>
 			</table>
@@ -1748,24 +1749,6 @@ function display_saved_queries()
 
 }
 
-//
-// Return the path to load the view file
-//
-function get_path_view($file = null)
-{
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    if ($file && is_file('style/'.$feather->user->style)) {
-        return FEATHER_ROOT.'style/'.$feather->user->style.'/view';
-    }
-    elseif (is_dir('style/'.$feather->user->style.'/view')) {
-        return FEATHER_ROOT.'style/'.$feather->user->style.'/view';
-    } else {
-        return FEATHER_ROOT.'view';
-    }
-}
-
 //
 // Make a string safe to use in a URL
 // Inspired by (c) Panther <http://www.pantherforum.org/>
diff --git a/include/idiorm.php b/include/idiorm.php
index 22675040..5e1c7f20 100644
--- a/include/idiorm.php
+++ b/include/idiorm.php
@@ -225,7 +225,7 @@ public static function reset_config()
         {
             self::$_config = array();
         }
-        
+
         /**
          * Despite its slightly odd name, this is actually the factory
          * method used to acquire instances of the class. It is named
@@ -239,7 +239,7 @@ public static function reset_config()
         public static function for_table($table_name, $connection_name = self::DEFAULT_CONNECTION)
         {
             $feather = \Slim\Slim::getInstance();
-            $table_name = $feather->prefix.$table_name;
+            $table_name = $feather->forum_settings['db_prefix'].$table_name;
             self::_setup_db($connection_name);
             return new self($table_name, array(), $connection_name);
         }
@@ -507,12 +507,12 @@ protected static function _log_query($query, $parameters, $connection_name, $que
             self::$_last_query = $bound_query;
             self::$_query_log[$connection_name][0][] = $query_time;
             self::$_query_log[$connection_name][1][] = $bound_query;
-            
+
             if(is_callable(self::$_config[$connection_name]['logger'])){
                 $logger = self::$_config[$connection_name]['logger'];
                 $logger($bound_query, $query_time);
             }
-            
+
             return true;
         }
 
@@ -1020,7 +1020,7 @@ public function distinct()
          * ON `user`.`id` = `profile`.`user_id`
          *
          * The fourth argument specifies an alias for the joined table.
-         * 
+         *
          * The final argument specifies is the last column should be escaped
          */
         protected function _add_join_source($join_operator, $table, $constraint, $table_alias=null, $no_escape_second_col=false)
@@ -1061,6 +1061,9 @@ protected function _add_join_source($join_operator, $table, $constraint, $table_
          */
         public function raw_join($table, $constraint, $table_alias, $parameters = array())
         {
+            $feather = \Slim\Slim::getInstance();
+            $table = $feather->prefix.$table;
+
             // Add table alias if present
             if (!is_null($table_alias)) {
                 $table_alias = $this->_quote_identifier($table_alias);
@@ -1283,7 +1286,7 @@ protected function _create_placeholders($fields)
                 return implode(', ', $db_fields);
             }
         }
-        
+
         /**
          * Helper method that filters a column/value array returning only those
          * columns that belong to a compound primary key.
@@ -1515,7 +1518,7 @@ public function where_raw($clause, $parameters=array())
         {
             return $this->_add_where($clause, $parameters);
         }
-        
+
         /**
          * Add a LIMIT to the query
          */
@@ -1567,7 +1570,7 @@ public function order_by($column_name, $dir=null)
         {
             return $this->_add_order_by($column_name, $dir);
         }
-        
+
         /**
          * Add columns to the list of columns returned by the ORDER BY
          * query. This defaults to '*'. Many columns can be supplied
@@ -1593,7 +1596,7 @@ public function order_by_many()
             }
             return $this;
         }
-        
+
         /**
          * Add an unquoted expression as an ORDER BY clause
          */
@@ -2650,7 +2653,7 @@ public function as_array()
         {
             return $this->get_results();
         }
-        
+
         /**
          * Get the number of records in the result set
          * @return int
@@ -2689,7 +2692,7 @@ public function offsetGet($offset)
         {
             return $this->_results[$offset];
         }
-        
+
         /**
          * ArrayAccess
          * @param int|string $offset
diff --git a/include/l10n.php b/include/l10n.php
deleted file mode 100644
index ce27af92..00000000
--- a/include/l10n.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Load a .mo file into the text domain $domain.
- *
- * If the text domain already exists, the translations will be merged. If both
- * sets have the same string, the translation from the original value will be taken.
- *
- * On success, the .mo file will be placed in the $l10n global by $domain
- * and will be a MO object.
- *
- * @param    string     $domain Text domain. Unique identifier for retrieving translated strings.
- * @param    string     $mofile Path to the .mo file.
- * 
- * @return   boolean    True on success, false on failure.
- *
- * Inspired from Luna <http://getluna.org>
- */
-function load_textdomain($domain, $mofile) {
-
-	global $l10n;
-
-	if (!is_readable($mofile)) {
-		return false;
-	}
-
-	$mo = new MO();
-	if (!$mo->import_from_file($mofile)) {
-		return false;
-	}
-
-	if (isset($l10n[$domain])) {
-		$mo->merge_with($l10n[$domain]);
-	}
-
-	$l10n[$domain] = &$mo;
-
-	return true;
-}
-
-function __($text, $domain = 'featherbb') {
-
-	return luna_translate($text, $domain);
-}
-
-function _e($text, $domain = 'featherbb') {
-
-	echo luna_translate($text, $domain);
-}
-
-function _n($single, $plural, $number, $domain = 'featherbb') {
-
-	$translations = load_translations($domain);
-	$translation = $translations->translate_plural($single, $plural, $number);
-
-	return $translation;
-}
-
-function luna_translate($text, $domain = 'featherbb') {
-
-	$translations = load_translations($domain);
-	$translations = $translations->translate($text);
-
-	return $translations;
-}
-
-function load_translations($domain) {
-
-	global $l10n;
-
-	if (!isset($l10n[$domain])) {
-		$l10n[$domain] = new NOOPTranslations;
-	}
-
-	return $l10n[$domain];
-}
\ No newline at end of file
diff --git a/include/parser.php b/include/parser.php
index 69ee422d..69e287dc 100644
--- a/include/parser.php
+++ b/include/parser.php
@@ -118,7 +118,7 @@ function matches one BBCode open/close pair. The BBCode tag components are
 *********************************************************** */
 function _preparse_bbcode_callback($matches)
 {
-    global $errors, $pd;
+    global $lang_common, $errors, $pd;
     
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
@@ -143,7 +143,7 @@ function _preparse_bbcode_callback($matches)
         if ($contents === null) {
             // On error, preg_replace_callback returns NULL.
  // Error #1: '(%s) Message is too long or too complex. Please shorten.'
-            $new_errors[] = sprintf(__('BBerr pcre'), preg_error());
+            $new_errors[] = sprintf($lang_common['BBerr pcre'], preg_error());
             $contents = ''; // Zero out the contents.
         }
     }
@@ -179,22 +179,22 @@ function _preparse_bbcode_callback($matches)
             // which is either unexpected or unrecognized.
  // Error #2: 'Unexpected attribute: "%1$s". (No attribute allowed for [%2$s].'.
             $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = sprintf(__('BBerr unexpected attribute'), $attribute, $tagname);
+            $new_errors[] = sprintf($lang_common['BBerr unexpected attribute'], $attribute, $tagname);
         } else { // Error #3: 'Unrecognized attribute: "%1$s", is not valid for [%2$s].'
             $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = sprintf(__('BBerr unrecognized attribute'), $attribute, $tagname);
+            $new_errors[] = sprintf($lang_common['BBerr unrecognized attribute'], $attribute, $tagname);
         }
         // Make sure attribute does nor contain a valid BBcode tag.
         if (preg_match($pd['re_bbtag'], $attribute)) { // Error #4: 'Attribute may NOT contain open or close bbcode tags'
             $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = __('BBerr bbcode attribute');
+            $new_errors[] = $lang_common['BBerr bbcode attribute'];
         }
         // Validate and filter tag's attribute value if and according to custom attribute regex.
         if (isset($handler['a_regex'])) { // Check if this tag has an attribute regex? (very rare)
             if (preg_match($handler['a_regex'], $attribute, $m)) { // Yes. Check if regex matches attribute?
                 $attribute = $m[1];
             } else { // Error #4b: 'Invalid attribute, [%s] requires specific attribute.'
-                $new_errors[] = sprintf(__('BBerr invalid attrib'), $tagname);
+                $new_errors[] = sprintf($lang_common['BBerr invalid attrib'], $tagname);
             }
         }
     } else { // Attribute not specified. Use the NO_ATTRIB handler if it exixts else error.
@@ -204,7 +204,7 @@ function _preparse_bbcode_callback($matches)
             $handler =& $tag['handlers']['NO_ATTRIB'];        // no-attribute handler. Otherwise...
         } else { // Error #5: '[%1$s] is missing a required attribute.'.
             $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = sprintf(__('BBerr missing attribute'), $tagname);
+            $new_errors[] = sprintf($lang_common['BBerr missing attribute'], $tagname);
         }
     }
     // -------------------------------------------------------
@@ -220,7 +220,7 @@ function _preparse_bbcode_callback($matches)
             $fmt_open = $fmt_close = '';
             break;
         case 'err':    // Error #6: '[%1$s] tag nesting depth: %2$d exceeds allowable limit: %3$d.'.
-            $new_errors[] = sprintf(__('BBerr nesting overflow'),
+            $new_errors[] = sprintf($lang_common['BBerr nesting overflow'],
                                 $tagname, $tag['depth'], $tag['depth_max']);
             break;
         default:
@@ -231,14 +231,14 @@ function _preparse_bbcode_callback($matches)
         // Are we illegitimate?
     // Yes. Pick between error #6 and #7.
         if ($parent === $tagname) { // Error #7: '[%s] was opened within itself, this is not allowed.'
-            $new_errors[] = sprintf(__('BBerr self-nesting'), $tagname);
+            $new_errors[] = sprintf($lang_common['BBerr self-nesting'], $tagname);
         } else { // Error #8: '[%1$s] was opened within [%2$s], this is not allowed.'
-            $new_errors[] = sprintf(__('BBerr invalid nesting'), $tagname, $parent);
+            $new_errors[] = sprintf($lang_common['BBerr invalid nesting'], $tagname, $parent);
         }
     }
     // Verfify our parent tag is in our 'parents' allowable array if it exists.
     if (isset($tag['parents']) && !isset($tag['parents'][$parent])) { // Error #9: '[%1$s] cannot be within: [%2$s]. Allowable parent tags: %3$s.'.
-        $new_errors[] = sprintf(__('BBerr invalid parent'),
+        $new_errors[] = sprintf($lang_common['BBerr invalid parent'],
             $tagname, $parent, '('. implode('), (', array_keys($tag['parents'])) .')');
     }
     // -----------------------------------------
@@ -266,18 +266,18 @@ function _preparse_bbcode_callback($matches)
         $contents = preg_replace(array('/^\s+/', '/\s+$/S'), '', $contents);
         // Handle special case link to a
         if ($feather->user->g_post_links != '1') {
-            $new_errors[] = __('BBerr cannot post URLs');
+            $new_errors[] = $lang_common['BBerr cannot post URLs'];
         }
         else if (($m = url_valid($contents))) {
             $contents = $m['url']; // Fetch possibly more complete url address.
         } else { // Error #10a: 'Invalid URL name: %s'.
-            $new_errors[] = sprintf(__('BBerr Invalid URL name'), $contents);
+            $new_errors[] = sprintf($lang_common['BBerr Invalid URL name'], $contents);
         }
         break;
 
     case 'email':
         if (filter_var($contents, FILTER_VALIDATE_EMAIL)) { // Error #10c: 'Invalid email address: %s'.
-            $new_errors[] = sprintf(__('BBerr Invalid email address'), $contents);
+            $new_errors[] = sprintf($lang_common['BBerr Invalid email address'], $contents);
         }
         break;
 
@@ -308,20 +308,20 @@ function _preparse_bbcode_callback($matches)
         if (($m = url_valid($attribute))) {
             $attribute = $m['url']; // Fetch possibly more complete url address.
         } else { // Error #10b: 'Invalid URL name: %s'.
-            $new_errors[] = sprintf(__('BBerr Invalid URL name'), $attribute);
+            $new_errors[] = sprintf($lang_common['BBerr Invalid URL name'], $attribute);
         }
         break;
 
     case 'color':
         if (!preg_match($pd['re_color'], $attribute)) { // Error #11: 'Invalid color attribute: %s'.
-            $new_errors[] = sprintf(__('BBerr Invalid color'), $attribute);
+            $new_errors[] = sprintf($lang_common['BBerr Invalid color'], $attribute);
         }
         break;
 
     case 'email':
         // TODO: improve this quick-n-dirty email check.
         if (!preg_match('/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,6}$/i', $attribute)) { // Error #10c: 'Invalid email address: %s'.
-            $new_errors[] = sprintf(__('BBerr Invalid email address'), $attribute);
+            $new_errors[] = sprintf($lang_common['BBerr Invalid email address'], $attribute);
         }
         break;
 
@@ -376,13 +376,13 @@ function _preparse_bbcode_callback($matches)
                                             } // Else remote image fits. Do nothing special with width and height.
                                         }
                                     } else { // Error #13: 'Unable to retrieve image data from remote url: %s'.
-                                        $new_errors[] = sprintf(__('BBerr bad meta data'), $contents);
+                                        $new_errors[] = sprintf($lang_common['BBerr bad meta data'], $contents);
                                     } // NOTE: cannot generate this error.
                                 } else { // Filesize of remote image is too big. Silently convert to link if possible.
                                     if (isset($pd['bbcd']['url']) && $pd['bbcd']['url']['depth'] === 0) {
                                         $fmt_open  = '{[url='. $contents .']';
                                         $fmt_close = '[/url]}';
-                                        $contents = __('BBmsg big image');
+                                        $contents = $lang_common['BBmsg big image'];
                                     } else { // Image within a url cannot be linkified. Just display url name.
                                         $contents = '{'. $contents .'}';
                                         $fmt_open  = '';
@@ -392,16 +392,16 @@ function _preparse_bbcode_callback($matches)
                             } else {
                                 // $size not set.
  // Error #14: 'Unable to determine remote file size.'.
-                                $new_errors[] = __('BBerr no file size');
+                                $new_errors[] = $lang_common['BBerr no file size'];
                             } // NOTE: cannot generate this error.
                         } else { // Error #15: 'Remote url does not have Content-Type: "image".'
-                            $new_errors[] = __('BBerr non image');
+                            $new_errors[] = $lang_common['BBerr non image'];
                         }
                     } else { // Error #16: 'Bad HTTP response header: "%s"'.
-                        $new_errors[] = sprintf(__('BBerr bad http response'), $http[0]);
+                        $new_errors[] = sprintf($lang_common['BBerr bad http response'], $http[0]);
                     }
                 } else { // Error #17: 'Unable to read remote image http headers.'.
-                    $new_errors[] = __('BBerr bad headers');
+                    $new_errors[] = $lang_common['BBerr bad headers'];
                 }
             } // Image validation turned off. Do nothing.
         } else { // Non-Error: IMG tag self nesting. Handle by silently stripping tags with no error.
@@ -507,7 +507,7 @@ function _preparse_bbcode_callback($matches)
         if (preg_match($handler['c_regex'], $contents, $m)) {
             $contents = $m[1];
         } else { // Error #12: 'Invalid content, [%s] requires specific content.'
-            $new_errors[] = sprintf(__('BBerr invalid content'), $tagname);
+            $new_errors[] = sprintf($lang_common['BBerr invalid content'], $tagname);
         }
     }
     // Silently strip empty or all-white tags:
@@ -572,7 +572,7 @@ function _preparse_bbcode_callback($matches)
  */
 function preparse_bbcode($text, &$errors, $is_signature = false)
 {
-    global $feather_config, $pd;
+    global $lang_common, $feather_config, $pd;
 
     $pd['new_errors'] = array(); // Reset the parser error message stack.
     $pd['in_signature'] = ($is_signature) ? true : false;
@@ -581,7 +581,7 @@ function preparse_bbcode($text, &$errors, $is_signature = false)
     if ($newtext === null) {
         // On error, preg_replace_callback returns NULL.
  // Error #1: '(%s) Message is too long or too complex. Please shorten.'
-        $errors[] = sprintf(__('BBerr pcre'), preg_error());
+        $errors[] = sprintf($lang_common['BBerr pcre'], preg_error());
         return $text;
     }
     $newtext = str_replace("\3", '[', $newtext); // Fixup CODE sections.
@@ -628,11 +628,11 @@ function preparse_bbcode($text, &$errors, $is_signature = false)
 //
 function _orphan_callback($matches)
 {
-    global $pd;
+    global $pd, $lang_common;
     if ($matches[0][1] === '/') { // Error #18: 'Orphan close tag: [/%s] is missing its open tag.'
-        $errmsg = sprintf(__('BBerr orphan close'), $matches[1]);
+        $errmsg = sprintf($lang_common['BBerr orphan close'], $matches[1]);
     } else { // Error #19: 'Orphan open tag: [%s] is missing its close tag.'
-        $errmsg = sprintf(__('BBerr orphan open'), $matches[1]);
+        $errmsg = sprintf($lang_common['BBerr orphan open'], $matches[1]);
     }
     $pd['new_errors'][] = $errmsg;    // Append to array of errors so far.
     return '[err='. $errmsg .']'. $matches[0] .'[/err]';
@@ -731,7 +731,7 @@ function preg_error()
 *********************************************************** */
 function _parse_bbcode_callback($matches)
 {
-    global $pd;
+    global $pd, $lang_common;
     $tagname =& $matches[1];            // TAGNAME we are currently servicing.
     $contents =& $matches[6];            // Shortcut to contents.
     $tag =& $pd['bbcd'][$tagname];        // Shortcut to bbcd array entry.
@@ -852,10 +852,10 @@ function _parse_bbcode_callback($matches)
                 $format = "{%c_str%}";
             } else {
                 if ($attribute) {
-                    $format = '{<a href="%c_str%" title="%a_str%">'. __('Image link') .'</a>}';
+                    $format = '{<a href="%c_str%" title="%a_str%">'. $lang_common['Image link'] .'</a>}';
                 } else {
-                    $format = '{<a href="%c_str%" title="'. __('BBmsg images disabled') .'">'.
-                    __('Image link') .'</a>}';
+                    $format = '{<a href="%c_str%" title="'. $lang_common['BBmsg images disabled'] .'">'.
+                    $lang_common['Image link'] .'</a>}';
                 }
                 $enabled = true; // Re-enable to override defauslt disabled handling (i.e. dont delete.)
             }
@@ -879,12 +879,12 @@ function _parse_bbcode_callback($matches)
                 // Check for optional embedded post id.
  // Attribute has optional '#1234' quoted post ID number. Convert to link back to quoted post.
                 $attribute = preg_replace('/\s*#\d++$/S', '', $attribute); // Strip post id from attribute.
-                $attribute .= ' '. __('wrote');  // Append language-specific "wrote:".
+                $attribute .= ' '. $lang_common['wrote'];  // Append language-specific "wrote:".
                 if ($pd['config']['quote_links']) {
                     $attribute = ' <a href="'. get_link('post/'.$m[1].'/#p'.$m[1]) .'">'. $attribute .'</a>';
                 }
             } else {
-                $attribute .= ' '. __('wrote');
+                $attribute .= ' '. $lang_common['wrote'];
             } // If no post id, just add "wrote:".
         }
         break;
diff --git a/include/pomo/.editorconfig b/include/pomo/.editorconfig
deleted file mode 100644
index a6c9cc43..00000000
--- a/include/pomo/.editorconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-# http://editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
-
-[*.php]
-indent_size = 4
diff --git a/include/pomo/MO.php b/include/pomo/MO.php
deleted file mode 100644
index d3a25de3..00000000
--- a/include/pomo/MO.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-/**
- * This file is part of the POMO package.
- *
- * @copyright 2014 POMO
- * @license GPL
- */
-
-require_once dirname(__FILE__) . '/Streams/Reader.php';
-require_once dirname(__FILE__) . '/Streams/FileReader.php';
-require_once dirname(__FILE__) . '/Translations/NOOPTranslations.php';
-require_once dirname(__FILE__) . '/Translations/GettextTranslations.php';
-require_once dirname(__FILE__) . '/Translations/EntryTranslations.php';
-
-/**
- * Class for working with MO files
- */
-class MO extends GettextTranslations
-{
-    public $_nplurals = 2;
-
-    /**
-     * Fills up with the entries from MO file $filename
-     *
-     * @param  string $filename MO file to load
-     * @return bool   Success
-     */
-    public function import_from_file($filename)
-    {
-        $reader = new FileReader($filename);
-        if (!$reader->is_resource()) {
-            return false;
-        }
-
-        return $this->import_from_reader($reader);
-    }
-
-    public function export_to_file($filename)
-    {
-        $fh = fopen($filename, 'wb');
-        if (!$fh) {
-            return false;
-        }
-        $res = $this->export_to_file_handle($fh);
-        fclose($fh);
-
-        return $res;
-    }
-
-    public function export()
-    {
-        $tmp_fh = fopen("php://temp", 'r+');
-        if (!$tmp_fh) {
-            return false;
-        }
-        $this->export_to_file_handle($tmp_fh);
-        rewind($tmp_fh);
-
-        return stream_get_contents($tmp_fh);
-    }
-
-    public function is_entry_good_for_export($entry)
-    {
-        if (empty($entry->translations)) {
-            return false;
-        }
-
-        if (!array_filter($entry->translations)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function export_to_file_handle($fh)
-    {
-        $entries = array_filter(
-            $this->entries,
-            array($this, 'is_entry_good_for_export')
-        );
-        ksort($entries);
-        $magic = 0x950412de;
-        $revision = 0;
-        $total = count($entries) + 1; // all the headers are one entry
-        $originals_lenghts_addr = 28;
-        $translations_lenghts_addr = $originals_lenghts_addr + 8 * $total;
-        $size_of_hash = 0;
-        $hash_addr = $translations_lenghts_addr + 8 * $total;
-        $current_addr = $hash_addr;
-        fwrite($fh, pack(
-                'V*',
-                $magic,
-                $revision,
-                $total,
-                $originals_lenghts_addr,
-                $translations_lenghts_addr,
-                $size_of_hash,
-                $hash_addr
-            ));
-        fseek($fh, $originals_lenghts_addr);
-
-        // headers' msgid is an empty string
-        fwrite($fh, pack('VV', 0, $current_addr));
-        $current_addr++;
-        $originals_table = chr(0);
-
-        $reader = new Reader();
-
-        foreach ($entries as $entry) {
-            $originals_table .= $this->export_original($entry) . chr(0);
-            $length = $reader->strlen($this->export_original($entry));
-            fwrite($fh, pack('VV', $length, $current_addr));
-            $current_addr += $length + 1; // account for the NULL byte after
-        }
-
-        $exported_headers = $this->export_headers();
-        fwrite($fh, pack(
-            'VV',
-            $reader->strlen($exported_headers),
-            $current_addr)
-        );
-        $current_addr += strlen($exported_headers) + 1;
-        $translations_table = $exported_headers . chr(0);
-
-        foreach ($entries as $entry) {
-            $translations_table .= $this->export_translations($entry).chr(0);
-            $length = $reader->strlen($this->export_translations($entry));
-            fwrite($fh, pack('VV', $length, $current_addr));
-            $current_addr += $length + 1;
-        }
-
-        fwrite($fh, $originals_table);
-        fwrite($fh, $translations_table);
-
-        return true;
-    }
-
-    public function export_original($entry)
-    {
-        //TODO: warnings for control characters
-        $exported = $entry->singular;
-        if ($entry->is_plural) {
-            $exported .= chr(0).$entry->plural;
-        }
-        if (!is_null($entry->context)) {
-            $exported = $entry->context.chr(4).$exported;
-        }
-
-        return $exported;
-    }
-
-    public function export_translations($entry)
-    {
-        //TODO: warnings for control characters
-        return implode(chr(0), $entry->translations);
-    }
-
-    public function export_headers()
-    {
-        $exported = '';
-        foreach ($this->headers as $header => $value) {
-            $exported .= "$header: $value\n";
-        }
-
-        return $exported;
-    }
-
-    public function get_byteorder($magic)
-    {
-        // The magic is 0x950412de
-        $magic_little = (int) - 1794895138;
-        $magic_little_64 = (int) 2500072158;
-        // 0xde120495
-        $magic_big = ((int) - 569244523) & 0xFFFFFFFF;
-        if ($magic_little == $magic || $magic_little_64 == $magic) {
-            return 'little';
-        } elseif ($magic_big == $magic) {
-            return 'big';
-        } else {
-            return false;
-        }
-    }
-
-    public function import_from_reader($reader)
-    {
-        $endian_string = $this->get_byteorder($reader->readint32());
-        if (false === $endian_string) {
-            return false;
-        }
-        $reader->setEndian($endian_string);
-
-        $endian = ('big' == $endian_string) ? 'N' : 'V';
-
-        $header = $reader->read(24);
-        if ($reader->strlen($header) != 24) {
-            return false;
-        }
-
-        // parse header
-        $header = unpack("{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header);
-        if (!is_array($header)) {
-            return false;
-        }
-
-        // support revision 0 of MO format specs, only
-        if ($header['revision'] != 0) {
-            return false;
-        }
-
-        // seek to data blocks
-        $reader->seekto($header['originals_lenghts_addr']);
-
-        // read originals' indices
-        $originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr'];
-        if ($originals_lengths_length != $header['total'] * 8) {
-            return false;
-        }
-
-        $originals = $reader->read($originals_lengths_length);
-        if ($reader->strlen($originals) != $originals_lengths_length) {
-            return false;
-        }
-
-        // read translations' indices
-        $translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr'];
-        if ($translations_lenghts_length != $header['total'] * 8) {
-            return false;
-        }
-
-        $translations = $reader->read($translations_lenghts_length);
-        if ($reader->strlen($translations) != $translations_lenghts_length) {
-            return false;
-        }
-
-        // transform raw data into set of indices
-        $originals    = $reader->str_split($originals, 8);
-        $translations = $reader->str_split($translations, 8);
-
-        // skip hash table
-        $strings_addr = $header['hash_addr'] + $header['hash_length'] * 4;
-
-        $reader->seekto($strings_addr);
-
-        $strings = $reader->read_all();
-        $reader->close();
-
-        for ($i = 0; $i < $header['total']; $i++) {
-            $o = unpack("{$endian}length/{$endian}pos", $originals[$i]);
-            $t = unpack("{$endian}length/{$endian}pos", $translations[$i]);
-            if (!$o || !$t) {
-                return false;
-            }
-
-            // adjust offset due to reading strings to separate space before
-            $o['pos'] -= $strings_addr;
-            $t['pos'] -= $strings_addr;
-
-            $original    = $reader->substr($strings, $o['pos'], $o['length']);
-            $translation = $reader->substr($strings, $t['pos'], $t['length']);
-
-            if ('' === $original) {
-                $this->set_headers($this->make_headers($translation));
-            } else {
-                $entry = &$this->make_entry($original, $translation);
-                $this->entries[$entry->key()] = &$entry;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Build a EntryTranslations from original string and translation strings,
-     * found in a MO file
-     *
-     * @param string $original    original string to translate from MO file.
-     *                            Might contain 0x04 as context separator or
-     *                            0x00 as singular/plural separator
-     * @param string $translation translation string from MO file.Might contain
-     *                            0x00 as a plural translations separator
-     * @retrun EntryTranslations New entry
-     */
-    public static function &make_entry($original, $translation) {
-        $entry = new EntryTranslations();
-        // look for context
-        $parts = explode(chr(4), $original);
-        if (isset($parts[1])) {
-            $original = $parts[1];
-            $entry->context = $parts[0];
-        }
-        // look for plural original
-        $parts = explode(chr(0), $original);
-        $entry->singular = $parts[0];
-        if (isset($parts[1])) {
-            $entry->is_plural = true;
-            $entry->plural = $parts[1];
-        }
-        // plural translations are also separated by \0
-        $entry->translations = explode(chr(0), $translation);
-
-        return $entry;
-    }
-
-    public function select_plural_form($count)
-    {
-        return $this->gettext_select_plural_form($count);
-    }
-
-    public function get_plural_forms_count()
-    {
-        return $this->_nplurals;
-    }
-}
diff --git a/include/pomo/PO.php b/include/pomo/PO.php
deleted file mode 100644
index 6a057631..00000000
--- a/include/pomo/PO.php
+++ /dev/null
@@ -1,494 +0,0 @@
-<?php
-/**
- * This file is part of the POMO package.
- *
- * @copyright 2014 POMO
- * @license GPL
- */
-
-ini_set('auto_detect_line_endings', 1);
-
-/**
- * Class for working with PO files
- */
-class PO extends GettextTranslations
-{
-    const MAX_LINE_LEN = 79;
-
-    public $comments_before_headers = '';
-
-    /**
-     * Exports headers to a PO entry
-     *
-     * @return string msgid/msgstr PO entry for this PO file headers, doesn't
-     *                contain newline at the end
-     */
-    public function export_headers()
-    {
-        $header_string = '';
-        foreach ($this->headers as $header => $value) {
-            $header_string.= "$header: $value\n";
-        }
-        $poified = PO::poify($header_string);
-        if ($this->comments_before_headers) {
-            $before_headers = PO::prepend_each_line(rtrim(
-                $this->comments_before_headers)."\n", '# '
-            );
-        } else {
-            $before_headers = '';
-        }
-
-        return rtrim("{$before_headers}msgid \"\"\nmsgstr $poified");
-    }
-
-    /**
-     * Exports all entries to PO format
-     *
-     * @return string sequence of mgsgid/msgstr PO strings, doesn't containt
-     *                newline at the end
-     */
-    public function export_entries()
-    {
-        //TODO: sorting
-        return implode("\n\n", array_map(
-            array(__CLASS__, 'export_entry'),
-            $this->entries)
-        );
-    }
-
-    /**
-     * Exports the whole PO file as a string
-     *
-     * @param  bool   $include_headers whether to include the headers in the
-     *                                 export
-     * @return string ready for inclusion in PO file string for headers and all
-     *                                the enrtries
-     */
-    public function export($include_headers = true)
-    {
-        $res = '';
-        if ($include_headers) {
-            $res .= $this->export_headers();
-            $res .= "\n\n";
-        }
-        $res .= $this->export_entries();
-
-        return $res;
-    }
-
-    /**
-     * Same as {@link export}, but writes the result to a file
-     *
-     * @param  string $filename        where to write the PO string
-     * @param  bool   $include_headers whether to include tje headers in the
-     *                                 export
-     * @return bool   true on success, false on error
-     */
-    public function export_to_file($filename, $include_headers = true)
-    {
-        $fh = fopen($filename, 'w');
-        if (false === $fh) {
-            return false;
-        }
-        $export = $this->export($include_headers);
-        $res = fwrite($fh, $export);
-        if (false === $res) {
-            return false;
-        }
-
-        return fclose($fh);
-    }
-
-    /**
-     * Text to include as a comment before the start of the PO contents
-     *
-     * Doesn't need to include # in the beginning of lines, these are added
-     * automatically
-     *
-     * @param string $text Comment text
-     */
-    public function set_comment_before_headers($text)
-    {
-        $this->comments_before_headers = $text;
-    }
-
-    /**
-     * Formats a string in PO-style
-     *
-     * @param  string $string the string to format
-     * @return string the poified string
-     */
-    public static function poify($string)
-    {
-        $quote = '"';
-        $slash = '\\';
-        $newline = "\n";
-
-        $replaces = array(
-            "$slash"    => "$slash$slash",
-            "$quote"    => "$slash$quote",
-            "\t"        => '\t',
-        );
-
-        $string = str_replace(
-            array_keys($replaces),
-            array_values($replaces),
-            $string
-        );
-
-        $po = $quote.implode(
-            "${slash}n$quote$newline$quote",
-            explode($newline, $string)
-        ).$quote;
-        // add empty string on first line for readbility
-        if (false !== strpos($string, $newline) &&
-                (substr_count($string, $newline) > 1 ||
-                !($newline === substr($string, -strlen($newline))))) {
-            $po = "$quote$quote$newline$po";
-        }
-        // remove empty strings
-        $po = str_replace("$newline$quote$quote", '', $po);
-
-        return $po;
-    }
-
-    /**
-     * Gives back the original string from a PO-formatted string
-     *
-     * @param  string $string PO-formatted string
-     * @return string enascaped string
-     */
-    public static function unpoify($string)
-    {
-        $escapes = array('t' => "\t", 'n' => "\n", '\\' => '\\');
-        $lines = array_map('trim', explode("\n", $string));
-        $lines = array_map(array(__CLASS__, 'trim_quotes'), $lines);
-        $unpoified = '';
-        $previous_is_backslash = false;
-        foreach ($lines as $line) {
-            preg_match_all('/./u', $line, $chars);
-            $chars = $chars[0];
-            foreach ($chars as $char) {
-                if (!$previous_is_backslash) {
-                    if ('\\' == $char) {
-                        $previous_is_backslash = true;
-                    } else {
-                        $unpoified .= $char;
-                    }
-                } else {
-                    $previous_is_backslash = false;
-                    $unpoified .= isset($escapes[$char]) ?
-                        $escapes[$char] :
-                        $char;
-                }
-            }
-        }
-
-        return $unpoified;
-    }
-
-    /**
-     * Inserts $with in the beginning of every new line of $string and
-     * returns the modified string
-     *
-     * @param  string $string prepend lines in this string
-     * @param  string $with   prepend lines with this string
-     * @return string The modified string
-     */
-    public static function prepend_each_line($string, $with)
-    {
-        $php_with = var_export($with, true);
-        $lines = explode("\n", $string);
-        // do not prepend the string on the last empty line, artefact by explode
-        if ("\n" == substr($string, -1)) {
-            unset($lines[count($lines) - 1]);
-        }
-        $res = implode("\n", array_map(
-                create_function('$x', "return $php_with.\$x;"),
-                $lines
-            ));
-        // give back the empty line, we ignored above
-        if ("\n" == substr($string, -1)) {
-            $res .= "\n";
-        }
-
-        return $res;
-    }
-
-    /**
-     * Prepare a text as a comment -- wraps the lines and prepends #
-     * and a special character to each line
-     *
-     * @param  string $text the comment text
-     * @param  string $char character to denote a special PO comment,
-     *                      like :, default is a space
-     * @return string The modified string
-     */
-    private static function comment_block($text, $char=' ')
-    {
-        $text = wordwrap($text, self::MAX_LINE_LEN - 3);
-
-        return self::prepend_each_line($text, "#$char ");
-    }
-
-    /**
-     * Builds a string from the entry for inclusion in PO file
-     *
-     * @param  object      &$entry the entry to convert to po string
-     * @return string|bool PO-style formatted string for the entry or
-     *                            false if the entry is empty
-     */
-    public static function export_entry(&$entry)
-    {
-        if (is_null($entry->singular)) {
-            return false;
-        }
-        $po = array();
-        if (!empty($entry->translator_comments)) {
-            $po[] = self::comment_block($entry->translator_comments);
-        }
-        if (!empty($entry->extracted_comments)) {
-            $po[] = self::comment_block($entry->extracted_comments, '.');
-        }
-        if (!empty($entry->references)) {
-            $po[] = self::comment_block(implode(' ', $entry->references), ':');
-        }
-        if (!empty($entry->flags)) {
-            $po[] = self::comment_block(implode(", ", $entry->flags), ',');
-        }
-        if (!is_null($entry->context)) {
-            $po[] = 'msgctxt '.self::poify($entry->context);
-        }
-        $po[] = 'msgid '.self::poify($entry->singular);
-        if (!$entry->is_plural) {
-            $translation = empty($entry->translations) ?
-                '' :
-                $entry->translations[0];
-            $po[] = 'msgstr '.self::poify($translation);
-        } else {
-            $po[] = 'msgid_plural '.self::poify($entry->plural);
-            $translations = empty($entry->translations) ?
-                array('', '') :
-                $entry->translations;
-            foreach ($translations as $i => $translation) {
-                $po[] = "msgstr[$i] ".self::poify($translation);
-            }
-        }
-
-        return implode("\n", $po);
-    }
-
-    public function import_from_file($filename)
-    {
-        $f = fopen($filename, 'r');
-        if (!$f) {
-            return false;
-        }
-        $lineno = 0;
-        while (true) {
-            $res = $this->read_entry($f, $lineno);
-            if (!$res) {
-                break;
-            }
-            if ($res['entry']->singular == '') {
-                $this->set_headers(
-                    $this->make_headers($res['entry']->translations[0])
-                );
-            } else {
-                $this->add_entry($res['entry']);
-            }
-        }
-        PO::read_line($f, 'clear');
-        if (false === $res) {
-            return false;
-        }
-        if (! $this->headers && ! $this->entries) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function read_entry($f, $lineno = 0)
-    {
-        $entry = new EntryTranslations();
-        // where were we in the last step
-        // can be: comment, msgctxt, msgid, msgid_plural, msgstr, msgstr_plural
-        $context = '';
-        $msgstr_index = 0;
-        $is_final = create_function('$context', 'return $context == "msgstr" || $context == "msgstr_plural";');
-        while (true) {
-            $lineno++;
-            $line = PO::read_line($f);
-            if (!$line) {
-                if (feof($f)) {
-                    if ($is_final($context)) {
-                        break;
-                    } elseif (!$context) {// we haven't read a line and eof came
-
-                        return null;
-                    } else {
-                        return false;
-                    }
-                } else {
-                    return false;
-                }
-            }
-            if ($line == "\n") {
-                continue;
-            }
-
-            $line = trim($line);
-            if (preg_match('/^#/', $line, $m)) {
-                // the comment is the start of a new entry
-                if ($is_final($context)) {
-                    PO::read_line($f, 'put-back');
-                    $lineno--;
-                    break;
-                }
-                // comments have to be at the beginning
-                if ($context && $context != 'comment') {
-                    return false;
-                }
-                // add comment
-                $this->add_comment_to_entry($entry, $line);
-            } elseif (preg_match('/^msgctxt\s+(".*")/', $line, $m)) {
-                if ($is_final($context)) {
-                    PO::read_line($f, 'put-back');
-                    $lineno--;
-                    break;
-                }
-                if ($context && $context != 'comment') {
-                    return false;
-                }
-                $context = 'msgctxt';
-                $entry->context .= PO::unpoify($m[1]);
-            } elseif (preg_match('/^msgid\s+(".*")/', $line, $m)) {
-                if ($is_final($context)) {
-                    PO::read_line($f, 'put-back');
-                    $lineno--;
-                    break;
-                }
-                if ($context &&
-                    $context != 'msgctxt' &&
-                    $context != 'comment') {
-                    return false;
-                }
-                $context = 'msgid';
-                $entry->singular .= PO::unpoify($m[1]);
-            } elseif (preg_match('/^msgid_plural\s+(".*")/', $line, $m)) {
-                if ($context != 'msgid') {
-                    return false;
-                }
-                $context = 'msgid_plural';
-                $entry->is_plural = true;
-                $entry->plural .= PO::unpoify($m[1]);
-            } elseif (preg_match('/^msgstr\s+(".*")/', $line, $m)) {
-                if ($context != 'msgid') {
-                    return false;
-                }
-                $context = 'msgstr';
-                $entry->translations = array(PO::unpoify($m[1]));
-            } elseif (preg_match('/^msgstr\[(\d+)\]\s+(".*")/', $line, $m)) {
-                if ($context != 'msgid_plural' && $context != 'msgstr_plural') {
-                    return false;
-                }
-                $context = 'msgstr_plural';
-                $msgstr_index = $m[1];
-                $entry->translations[$m[1]] = PO::unpoify($m[2]);
-            } elseif (preg_match('/^".*"$/', $line)) {
-                $unpoified = PO::unpoify($line);
-                switch ($context) {
-                    case 'msgid':
-                        $entry->singular .= $unpoified;
-                        break;
-                    case 'msgctxt':
-                        $entry->context .= $unpoified;
-                        break;
-                    case 'msgid_plural':
-                        $entry->plural .= $unpoified;
-                        break;
-                    case 'msgstr':
-                        $entry->translations[0] .= $unpoified;
-                        break;
-                    case 'msgstr_plural':
-                        $entry->translations[$msgstr_index] .= $unpoified;
-                        break;
-                    default:
-                        return false;
-                }
-            } else {
-                return false;
-            }
-        }
-        if (array() == array_filter(
-                $entry->translations,
-                create_function('$t', 'return $t || "0" === $t;'))
-            ) {
-            $entry->translations = array();
-        }
-
-        return array('entry' => $entry, 'lineno' => $lineno);
-    }
-
-    public static function read_line($f, $action = 'read')
-    {
-        static $last_line = '';
-        static $use_last_line = false;
-        if ('clear' == $action) {
-            $last_line = '';
-
-            return true;
-        }
-        if ('put-back' == $action) {
-            $use_last_line = true;
-
-            return true;
-        }
-        $line = $use_last_line ? $last_line : fgets($f);
-        $line = ( "\r\n" == substr( $line, -2 ) ) ?
-            rtrim( $line, "\r\n" ) . "\n" :
-            $line;
-        $last_line = $line;
-        $use_last_line = false;
-
-        return $line;
-    }
-
-    public function add_comment_to_entry(&$entry, $po_comment_line)
-    {
-        $first_two = substr($po_comment_line, 0, 2);
-        $comment = trim(substr($po_comment_line, 2));
-        if ('#:' == $first_two) {
-            $entry->references = array_merge(
-                $entry->references,
-                preg_split('/\s+/', $comment)
-            );
-        } elseif ('#.' == $first_two) {
-            $entry->extracted_comments = trim(
-                $entry->extracted_comments . "\n" . $comment
-            );
-        } elseif ('#,' == $first_two) {
-            $entry->flags = array_merge(
-                $entry->flags,
-                preg_split('/,\s*/', $comment)
-            );
-        } else {
-            $entry->translator_comments = trim(
-                $entry->translator_comments . "\n" . $comment
-            );
-        }
-    }
-
-    public static function trim_quotes($s)
-    {
-        if ( substr($s, 0, 1) == '"') {
-            $s = substr($s, 1);
-        }
-        if ( substr($s, -1, 1) == '"') {
-            $s = substr($s, 0, -1);
-        }
-
-        return $s;
-    }
-}
diff --git a/include/pomo/Streams/CachedFileReader.php b/include/pomo/Streams/CachedFileReader.php
deleted file mode 100644
index 5d93121e..00000000
--- a/include/pomo/Streams/CachedFileReader.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * This file is part of the POMO package.
- *
- * @copyright 2014 POMO
- * @license GPL
- */
-
-/**
- * Reads the contents of the file in the beginning.
- *
- * @author Danilo Segan <danilo@kvota.net>
- */
-class CachedFileReader extends StringReader
-{
-    public function __construct($filename)
-    {
-        parent::__construct();
-        $this->_str = file_get_contents($filename);
-        if (false === $this->_str) {
-            return false;
-        }
-        $this->_pos = 0;
-    }
-}
diff --git a/include/pomo/Streams/CachedIntFileReader.php b/include/pomo/Streams/CachedIntFileReader.php
deleted file mode 100644
index 17a8e50e..00000000
--- a/include/pomo/Streams/CachedIntFileReader.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * This file is part of the POMO package.
- *
- * @copyright 2014 POMO
- * @license GPL
- */
-
-/**
- * Reads the contents of the file in the beginning.
- *
- * @author Danilo Segan <danilo@kvota.net>
- */
-class CachedIntFileReader extends CachedFileReader
-{
-    public function __construct($filename)
-    {
-        parent::__construct($filename);
-    }
-}
diff --git a/include/pomo/Streams/FileReader.php b/include/pomo/Streams/FileReader.php
deleted file mode 100644
index 983df271..00000000
--- a/include/pomo/Streams/FileReader.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * This file is part of the POMO package.
- *
- * @copyright 2014 POMO
- * @license GPL
- */
-
-/**
- * Classes, which help reading streams of data from files.
- *
- * @author Danilo Segan <danilo@kvota.net>
- */
-class FileReader extends Reader
-{
-    public function __construct($filename)
-    {
-        parent::__construct();
-        $this->_f = fopen($filename, 'rb');
-    }
-
-    public function read($bytes)
-    {
-        return fread($this->_f, $bytes);
-    }
-
-    public function seekto($pos)
-    {
-        if (-1 == fseek($this->_f, $pos, SEEK_SET)) {
-            return false;
-        }
-        $this->_pos = $pos;
-
-        return true;
-    }
-
-    public function is_resource()
-    {
-        return is_resource($this->_f);
-    }
-
-    public function feof()
-    {
-        return feof($this->_f);
-    }
-
-    public function close()
-    {
-        return fclose($this->_f);
-    }
-
-    public function read_all()
-    {
-        $all = '';
-        while (!$this->feof())
-            $all .= $this->read(4096);
-
-        return $all;
-    }
-}
diff --git a/include/pomo/Streams/Reader.php b/include/pomo/Streams/Reader.php
deleted file mode 100644
index ced42eb6..00000000
--- a/include/pomo/Streams/Reader.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * This file is part of the POMO package.
- *
- * @copyright 2014 POMO
- * @license GPL
- */
-
-/**
- * Classes, which help reading streams of data from files.
- *
- * @author Danilo Segan <danilo@kvota.net>
- */
-class Reader
-{
-    public $endian = 'little';
-    public $_post = '';
-
-    public function __construct()
-    {
-        $this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) &&
-            function_exists('mb_substr');
-        $this->_pos = 0;
-    }
-
-    /**
-     * Sets the endianness of the file.
-     *
-     * @param $endian string 'big' or 'little'
-     */
-    public function setEndian($endian)
-    {
-        $this->endian = $endian;
-    }
-
-    /**
-     * Reads a 32bit Integer from the Stream
-     *
-     * @return mixed The integer, corresponding to the next 32 bits from the
-     *               stream of false if there are not enough bytes or on error
-     */
-    public function readint32()
-    {
-        $bytes = $this->read(4);
-        if (4 != $this->strlen($bytes)) {
-            return false;
-        }
-        $endian_letter = ('big' == $this->endian) ? 'N' : 'V';
-        $int = unpack($endian_letter, $bytes);
-
-        return array_shift($int);
-    }
-
-    /**
-     * Reads an array of 32-bit Integers from the Stream
-     *
-     * @param integer count How many elements should be read
-     * @return mixed Array of integers or false if there isn't
-     *               enough data or on error
-     */
-    public function readint32array($count)
-    {
-        $bytes = $this->read(4 * $count);
-        if (4*$count != $this->strlen($bytes)) {
-            return false;
-        }
-        $endian_letter = ('big' == $this->endian) ? 'N' : 'V';
-
-        return unpack($endian_letter.$count, $bytes);
-    }
-
-
-    public function substr($string, $start, $length)
-    {
-        if ($this->is_overloaded) {
-            return mb_substr($string, $start, $length, 'ascii');
-        } else {
-            return substr($string, $start, $length);
-        }
-    }
-
-    public function strlen($string)
-    {
-        if ($this->is_overloaded) {
-            return mb_strlen($string, 'ascii');
-        } else {
-            return strlen($string);
-        }
-    }
-
-    public function str_split($string, $chunk_size)
-    {
-        if (!function_exists('str_split')) {
-            $length = $this->strlen($string);
-            $out = array();
-            for ($i = 0; $i < $length; $i += $chunk_size) {
-                $out[] = $this->substr($string, $i, $chunk_size);
-            }
-
-            return $out;
-        } else {
-            return str_split($string, $chunk_size);
-        }
-    }
-
-    public function pos()
-    {
-        return $this->_pos;
-    }
-
-    public function is_resource()
-    {
-        return true;
-    }
-
-    public function close()
-    {
-        return true;
-    }
-}
diff --git a/include/pomo/Streams/StringReader.php b/include/pomo/Streams/StringReader.php
deleted file mode 100644
index c0d1c3bb..00000000
--- a/include/pomo/Streams/StringReader.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * This file is part of the POMO package.
- *
- * @copyright 2014 POMO
- * @license GPL
- */
-
-/**
- * Provides file-like methods for manipulating a string instead
- * of a physical file.
- *
- * @author Danilo Segan <danilo@kvota.net>
- */
-class StringReader extends Reader
-{
-    public $_str = '';
-
-    public function __construct($str = '')
-    {
-        parent::__construct();
-        $this->_str = $str;
-        $this->_pos = 0;
-    }
-
-    public function read($bytes)
-    {
-        $data = $this->substr($this->_str, $this->_pos, $bytes);
-        $this->_pos += $bytes;
-        if ($this->strlen($this->_str) < $this->_pos) {
-            $this->_pos = $this->strlen($this->_str);
-        }
-
-        return $data;
-    }
-
-    public function seekto($pos)
-    {
-        $this->_pos = $pos;
-        if ($this->strlen($this->_str) < $this->_pos) {
-            $this->_pos = $this->strlen($this->_str);
-        }
-
-        return $this->_pos;
-    }
-
-    public function length()
-    {
-        return $this->strlen($this->_str);
-    }
-
-    public function read_all()
-    {
-        return $this->substr(
-            $this->_str,
-            $this->_pos,
-            $this->strlen($this->_str)
-        );
-    }
-
-}
diff --git a/include/pomo/Translations/EntryTranslations.php b/include/pomo/Translations/EntryTranslations.php
deleted file mode 100644
index 892a2718..00000000
--- a/include/pomo/Translations/EntryTranslations.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * This file is part of the POMO package.
- *
- * @copyright 2014 POMO
- * @license GPL
- */
-
-/**
- * Contains EntryTranslations class
- * EntryTranslations class encapsulates a translatable string
- */
-class EntryTranslations
-{
-    /**
-     * Whether the entry contains a string and its plural form, default is false
-     *
-     * @var boolean
-     */
-    public $is_plural = false;
-
-    public $context = null;
-    public $singular = null;
-    public $plural = null;
-    public $translations = array();
-    public $translator_comments = '';
-    public $extracted_comments = '';
-    public $references = array();
-    public $flags = array();
-
-    /**
-     * @param array $args associative array, support following keys:
-     *                    - singular (string) -- the string to translate, if omitted and empty entry will be created
-     *                    - plural (string) -- the plural form of the string, setting this will set {@link $is_plural} to true
-     *                    - translations (array) -- translations of the string and possibly -- its plural forms
-     *                    - context (string) -- a string differentiating two equal strings used in different contexts
-     *                    - translator_comments (string) -- comments left by translators
-     *                    - extracted_comments (string) -- comments left by developers
-     *                    - references (array) -- places in the code this strings is used, in relative_to_root_path/file.php:linenum form
-     *                    - flags (array) -- flags like php-format
-     */
-    public function __construct($args=array())
-    {
-        // if no singular -- empty object
-        if (!isset($args['singular'])) {
-            return;
-        }
-        // get member variable values from args hash
-        foreach ($args as $varname => $value) {
-            $this->$varname = $value;
-        }
-        if (isset($args['plural'])) {
-            $this->is_plural = true;
-        }
-        if (!is_array($this->translations)) {
-            $this->translations = array();
-        }
-        if (!is_array($this->references)) {
-            $this->references = array();
-        }
-        if (!is_array($this->flags)) {
-            $this->flags = array();
-        }
-    }
-
-    /**
-     * Generates a unique key for this entry
-     *
-     * @return string|bool the key or false if the entry is empty
-     */
-    public function key()
-    {
-        if (is_null($this->singular)) {
-            return false;
-        }
-        // prepend context and EOT, like in MO files
-        return is_null($this->context) ? $this->singular : $this->context.chr(4).$this->singular;
-    }
-
-    public function merge_with(&$other)
-    {
-        $this->flags = array_unique(array_merge($this->flags, $other->flags));
-        $this->references = array_unique(array_merge($this->references, $other->references));
-        if ($this->extracted_comments != $other->extracted_comments) {
-            $this->extracted_comments .= $other->extracted_comments;
-        }
-
-    }
-}
diff --git a/include/pomo/Translations/GettextTranslations.php b/include/pomo/Translations/GettextTranslations.php
deleted file mode 100644
index 857e05f7..00000000
--- a/include/pomo/Translations/GettextTranslations.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * This file is part of the POMO package.
- *
- * @copyright 2014 POMO
- * @license GPL
- */
-
-require_once dirname(__FILE__) . '/Translations.php';
-
-/**
- * Class for a set of entries for translation and their associated headers
- */
-class GettextTranslations extends Translations
-{
-    /**
-     * The gettext implementation of select_plural_form.
-     *
-     * It lives in this class, because there are more than one descendand,
-     * which will use it and they can't share it effectively.
-     *
-     * @param integer $count Items count
-     */
-    public function gettext_select_plural_form($count)
-    {
-        if (!isset($this->_gettext_select_plural_form)
-            || is_null($this->_gettext_select_plural_form)) {
-            list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
-            $this->_nplurals = $nplurals;
-            $this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
-        }
-
-        return call_user_func($this->_gettext_select_plural_form, $count);
-    }
-
-    public function nplurals_and_expression_from_header($header)
-    {
-        if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches)) {
-            $nplurals = (int) $matches[1];
-            $expression = trim($this->parenthesize_plural_exression($matches[2]));
-
-            return array($nplurals, $expression);
-        } else {
-            return array(2, 'n != 1');
-        }
-    }
-
-    /**
-     * Makes a function, which will return the right translation index,
-     * according to the plural forms header
-     *
-     * @param  integer $nplurals
-     * @param  string  $expression
-     * @return integer The right translation index
-     */
-    public function make_plural_form_function($nplurals, $expression)
-    {
-        $expression = str_replace('n', '$n', $expression);
-        $func_body = "
-            \$index = (int) ($expression);
-
-            return (\$index < $nplurals) ? \$index : $nplurals - 1;";
-        return create_function('$n', $func_body);
-    }
-
-    /**
-     * Adds parantheses to the inner parts of ternary operators in
-     * plural expressions, because PHP evaluates ternary oerators
-     * from left to right
-     *
-     * @param  string $expression the expression without parentheses
-     * @return string the expression with parentheses added
-     */
-    public function parenthesize_plural_exression($expression)
-    {
-        $expression .= ';';
-        $res = '';
-        $depth = 0;
-        for ($i = 0; $i < strlen($expression); ++$i) {
-            $char = $expression[$i];
-            switch ($char) {
-                case '?':
-                    $res .= ' ? (';
-                    $depth++;
-                    break;
-                case ':':
-                    $res .= ') : (';
-                    break;
-                case ';':
-                    $res .= str_repeat(')', $depth) . ';';
-                    $depth= 0;
-                    break;
-                default:
-                    $res .= $char;
-            }
-        }
-
-        return rtrim($res, ';');
-    }
-
-    public function make_headers($translation)
-    {
-        $headers = array();
-        // sometimes \ns are used instead of real new lines
-        $translation = str_replace('\n', "\n", $translation);
-        $lines = explode("\n", $translation);
-        foreach ($lines as $line) {
-            $parts = explode(':', $line, 2);
-            if (!isset($parts[1])) {
-                continue;
-            }
-            $headers[trim($parts[0])] = trim($parts[1]);
-        }
-
-        return $headers;
-    }
-
-    public function set_header($header, $value)
-    {
-        parent::set_header($header, $value);
-        if ('Plural-Forms' == $header) {
-            list($nplurals, $expression) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
-            $this->_nplurals = $nplurals;
-            $this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
-        }
-    }
-}
diff --git a/include/pomo/Translations/NOOPTranslations.php b/include/pomo/Translations/NOOPTranslations.php
deleted file mode 100644
index f656f860..00000000
--- a/include/pomo/Translations/NOOPTranslations.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * This file is part of the POMO package.
- *
- * @copyright 2014 POMO
- * @license GPL
- */
-
-require_once dirname(__FILE__) . '/Translations.php';
-
-/**
- * Provides the same interface as Translations, but doesn't do anything
- */
-class NOOPTranslations implements TranslationsInterface
-{
-    /**
-     * Entries provided availible
-     *
-     * @var array
-     */
-    public $entries = array();
-    public $headers = array();
-
-    /**
-     * {@inheritdoc}
-     */
-    public function add_entry($entry)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set_header($header, $value)
-    {
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set_headers($headers)
-    {
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get_header($header)
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function translate_entry(&$entry)
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function translate($singular, $context = null)
-    {
-        return $singular;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function select_plural_form($count)
-    {
-        return 1 == $count ? 0 : 1;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get_plural_forms_count()
-    {
-        return 2;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function translate_plural(
-        $singular,
-        $plural,
-        $count,
-        $context = null
-    ) {
-        return 1 == $count ? $singular : $plural;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function merge_with(&$other)
-    {
-    }
-}
diff --git a/include/pomo/Translations/Translations.php b/include/pomo/Translations/Translations.php
deleted file mode 100644
index 4daea42b..00000000
--- a/include/pomo/Translations/Translations.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * This file is part of the POMO package.
- *
- * @copyright 2014 POMO
- * @license GPL
- */
-
-require_once dirname(__FILE__) . '/TranslationsInterface.php';
-
-/**
- * Class for a set of entries for translation and their associated headers
- */
-class Translations implements TranslationsInterface
-{
-    /**
-     * Entries provided availible
-     *
-     * @var array
-     */
-    public $entries = array();
-    public $headers = array();
-
-    /**
-     * {@inheritdoc}
-     */
-    public function add_entry($entry)
-    {
-        if (is_array($entry)) {
-            $entry = new EntryTranslations($entry);
-        }
-        $key = $entry->key();
-        if (false === $key) {
-            return false;
-        }
-        $this->entries[$key] = &$entry;
-
-        return true;
-    }
-
-    public function add_entry_or_merge($entry)
-    {
-        if (is_array($entry)) {
-            $entry = new EntryTranslations($entry);
-        }
-        $key = $entry->key();
-        if (false === $key) {
-            return false;
-        }
-        if (isset($this->entries[$key])) {
-            $this->entries[$key]->merge_with($entry);
-        } else {
-            $this->entries[$key] = &$entry;
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set_header($header, $value)
-    {
-        $this->headers[$header] = $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set_headers($headers)
-    {
-        foreach ($headers as $header => $value) {
-            $this->set_header($header, $value);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get_header($header)
-    {
-        return isset($this->headers[$header]) ? $this->headers[$header] : false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function translate_entry(&$entry)
-    {
-        $key = $entry->key();
-
-        return isset($this->entries[$key]) ? $this->entries[$key] : false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function translate($singular, $context = null)
-    {
-        $entry = new EntryTranslations(array(
-                'singular' => $singular,
-                'context' => $context
-            ));
-        $translated = $this->translate_entry($entry);
-
-        return ($translated && !empty($translated->translations)) ?
-            $translated->translations[0] :
-            $singular;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function select_plural_form($count)
-    {
-        return 1 == $count ? 0 : 1;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get_plural_forms_count()
-    {
-        return 2;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function translate_plural(
-        $singular,
-        $plural,
-        $count,
-        $context = null
-    ) {
-        $entry = new EntryTranslations(array(
-                'singular' => $singular,
-                'plural' => $plural,
-                'context' => $context
-            ));
-        $translated = $this->translate_entry($entry);
-        $index = $this->select_plural_form($count);
-        $total_plural_forms = $this->get_plural_forms_count();
-        if ($translated && 0 <= $index && $index < $total_plural_forms &&
-                is_array($translated->translations) &&
-                isset($translated->translations[$index])) {
-            return $translated->translations[$index];
-        } else {
-            return 1 == $count ? $singular : $plural;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function merge_with(&$other)
-    {
-        foreach ($other->entries as $entry) {
-            $this->entries[$entry->key()] = $entry;
-        }
-    }
-
-    public function merge_originals_with(&$other)
-    {
-        foreach ($other->entries as $entry) {
-            if ( !isset( $this->entries[$entry->key()] )) {
-                $this->entries[$entry->key()] = $entry;
-            } else {
-                $this->entries[$entry->key()]->merge_with($entry);
-            }
-        }
-    }
-}
diff --git a/include/pomo/Translations/TranslationsInterface.php b/include/pomo/Translations/TranslationsInterface.php
deleted file mode 100644
index 401194d9..00000000
--- a/include/pomo/Translations/TranslationsInterface.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * This file is part of the POMO package.
- *
- * @copyright 2014 POMO
- * @license GPL
- */
-
-/**
- * Translations Interface that all POMO Translators must implement
- *
- * @author Léo Colombaro <git@colombaro.fr>
- */
-interface TranslationsInterface
-{
-    /**
-     * Add entry to the PO structure
-     *
-     * @param  object &$entry
-     * @return bool   true on success, false if the entry doesn't have a key
-     */
-    public function add_entry($entry);
-
-    /**
-     * Sets $header PO header to $value
-     *
-     * If the header already exists, it will be overwritten
-     *
-     * @todo This should be out of this class, it is gettext specific
-     * @param string $header header name, without trailing :
-     * @param string $value  header value, without trailing \n
-     */
-    public function set_header($header, $value);
-
-    public function set_headers($headers);
-
-    public function get_header($header);
-
-    public function translate_entry(&$entry);
-
-    /**
-     * Translate an entry in the singular way
-     *
-     * @param  string $singular Singular form of the entry
-     * @param  mixed  $context
-     * @return string The translation
-     */
-    public function translate($singular, $context = null);
-
-    /**
-     * Given the number of items, returns the 0-based index of the plural form
-     * to use
-     *
-     * Here, in the base Translations class, the common logic for English is
-     * implemented:
-     * 	0 if there is one element, 1 otherwise
-     *
-     * This function should be overrided by the sub-classes. For example MO/PO
-     * can derive the logic from their headers.
-     *
-     * @param integer $count number of items
-     */
-    public function select_plural_form($count);
-
-    public function get_plural_forms_count();
-
-    /**
-     * Plural sensitive tranlation of an entry
-     *
-     * Same behavior as {@link translate()} but with plural analyser, provide by
-     * {@link select_plural_form()} parser.
-     *
-     * @param  string  $singular Singular form of the entry
-     * @param  string  $plural   Plural form of the entry
-     * @param  integer $count    Number of items for the plural context
-     * @param  mixed   $context
-     * @return string  The correct translation
-     */
-    public function translate_plural(
-        $singular,
-        $plural,
-        $count,
-        $context = null
-    );
-
-    /**
-     * Merge $other in the current object.
-     *
-     * @param  Object &$other Another Translation object, whose translations
-     *                        will be merged in this one
-     * @return void
-     **/
-    public function merge_with(&$other);
-}
diff --git a/include/routes.php b/include/routes.php
index 85afa86f..50a4074a 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -157,10 +157,10 @@
         $feather->get('/ip-stats/id/:id(/)', '\controller\admin\users:ipstats')->conditions(array('id' => '[0-9]+'));
         $feather->get('/show-users/ip/:ip(/)', '\controller\admin\users:showusers');
     });
-    
+
 });
 
 // 404 not found
-$feather->notFound(function () {
-    message(__('Bad request'), '404');
+$feather->notFound(function () use ($feather) {
+    $feather->halt(404, 'Not found');
 });
diff --git a/index.php b/index.php
index bfb68e1f..b53037f2 100644
--- a/index.php
+++ b/index.php
@@ -6,10 +6,11 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Start a session for flash messages
 session_cache_limiter(false);
 session_start();
+error_reporting(E_ALL); // Let's report everything for development
 
 // Load Slim Framework
 require 'Slim/Slim.php';
@@ -17,24 +18,22 @@
 
 // Instantiate Slim
 $feather = new \Slim\Slim();
+$feather_user_settings = array(
+							'db_name' => 'featherbb',
+							'db_host' => 'localhost',
+							'db_user' => 'featherbb',
+							'db_pass' => 'featherbb',
+							'cookie_name' => 'feather_cookie_45ef0b',
+							'cookie_seed' => '0f320ab07f4afbc5');
 
 // Load middlewares
 $feather->add(new \Slim\Extras\Middleware\CsrfGuard('featherbb_csrf')); // CSRF
-$feather->add(new \Slim\Extras\Middleware\FeatherBB()); // FeatherBB
-
-// Cookie encryption
-$feather->config('cookies.encrypt', true);
-
-// Load FeatherBB common file
-define('FEATHER_ROOT', dirname(__FILE__).'/');
-require FEATHER_ROOT.'include/common.php';
+$feather->add(new \Slim\Extras\Middleware\FeatherBB($feather_user_settings)); // FeatherBB
 
 // Load the routes
-require FEATHER_ROOT.'include/routes.php';
-
-// Specify where to load the views
-$feather->config('templates.path', get_path_view());
+require 'include/routes.php';
 
+$feather->config('cookies.encrypt', true);
 $feather->config('debug', true); // As long as we're developing FeatherBB
 
 // Run it, baby!
diff --git a/install/index.php b/install/index.php
index 540f1681..873973c2 100644
--- a/install/index.php
+++ b/install/index.php
@@ -79,15 +79,11 @@ function stripslashes_array($array)
 $install_lang = preg_replace('%[\.\\\/]%', '', $install_lang);
 
 // If such a language pack doesn't exist, or isn't up-to-date enough to translate this page, default to English
-if (!file_exists(FEATHER_ROOT.'lang/'.$feather->user->language.'/install.mo')) {
+if (!file_exists(FEATHER_ROOT.'lang/'.$install_lang.'/install.php')) {
     $install_lang = 'English';
 }
 
-// Load l10n
-require_once FEATHER_ROOT.'include/pomo/MO.php';
-require_once FEATHER_ROOT.'include/l10n.php';
-
-load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$install_lang.'/install.mo');
+require FEATHER_ROOT.'lang/'.$install_lang.'/install.php';
 
 if (file_exists(FEATHER_ROOT.'include/config.php')) {
     // Check to see whether FeatherBB is already installed
@@ -95,7 +91,7 @@ function stripslashes_array($array)
 
     // If FEATHER is defined, config.php is probably valid and thus the software is installed
     if (defined('FEATHER')) {
-        exit(__('Already installed'));
+        exit($lang_install['Already installed']);
     }
 }
 
@@ -109,7 +105,7 @@ function stripslashes_array($array)
 
 // Make sure we are running at least MIN_PHP_VERSION
 if (!function_exists('version_compare') || version_compare(PHP_VERSION, MIN_PHP_VERSION, '<')) {
-    exit(sprintf(__('You are running error'), 'PHP', PHP_VERSION, FORUM_VERSION, MIN_PHP_VERSION));
+    exit(sprintf($lang_install['You are running error'], 'PHP', PHP_VERSION, FORUM_VERSION, MIN_PHP_VERSION));
 }
 
 
@@ -119,7 +115,7 @@ function stripslashes_array($array)
 //
 function error($message, $file = null, $line = null, $db_error = false)
 {
-    global $feather_config;
+    global $feather_config, $lang_common;
     // Set some default settings if the script failed before $feather_config could be populated
     if (empty($feather_config)) {
         $feather_config = array(
@@ -127,6 +123,13 @@ function error($message, $file = null, $line = null, $db_error = false)
             'o_gzip'        => '0'
         );
     }
+    // Set some default translations if the script failed before $lang_common could be populated
+    if (empty($lang_common)) {
+        $lang_common = array(
+            'Title separator'    => ' / ',
+            'Page'                => 'Page %s'
+        );
+    }
     // Empty all output buffers and stop buffering
     while (@ob_end_clean());
     // "Restart" output buffering if we are using ob_gzhandler (since the gzip header is already sent)
@@ -230,8 +233,8 @@ function generate_config_file()
 
     $db_type = $db_name = $db_username = $db_prefix = $username = $email = '';
     $db_host = 'localhost';
-    $title = __('My FeatherBB Forum');
-    $description = '<p><span>'.__('Description').'</span></p>';
+    $title = $lang_install['My FeatherBB Forum'];
+    $description = '<p><span>'.$lang_install['Description'].'</span></p>';
     $default_lang = $install_lang;
     $default_style = 'FeatherBB';
 } else {
@@ -259,55 +262,55 @@ function generate_config_file()
 
     // Validate username and passwords
     if (feather_strlen($username) < 2) {
-        $alerts[] = __('Username 1');
+        $alerts[] = $lang_install['Username 1'];
     } elseif (feather_strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
-        $alerts[] = __('Username 2');
+        $alerts[] = $lang_install['Username 2'];
     } elseif (!strcasecmp($username, 'Guest')) {
-        $alerts[] = __('Username 3');
+        $alerts[] = $lang_install['Username 3'];
     } elseif (preg_match('%[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}%', $username) || preg_match('%((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))%', $username)) {
-        $alerts[] = __('Username 4');
+        $alerts[] = $lang_install['Username 4'];
     } elseif ((strpos($username, '[') !== false || strpos($username, ']') !== false) && strpos($username, '\'') !== false && strpos($username, '"') !== false) {
-        $alerts[] = __('Username 5');
+        $alerts[] = $lang_install['Username 5'];
     } elseif (preg_match('%(?:\[/?(?:b|u|i|h|colou?r|quote|code|img|url|email|list)\]|\[(?:code|quote|list)=)%i', $username)) {
-        $alerts[] = __('Username 6');
+        $alerts[] = $lang_install['Username 6'];
     }
 
     if (feather_strlen($password1) < 6) {
-        $alerts[] = __('Short password');
+        $alerts[] = $lang_install['Short password'];
     } elseif ($password1 != $password2) {
-        $alerts[] = __('Passwords not match');
+        $alerts[] = $lang_install['Passwords not match'];
     }
 
     // Validate email
     require FEATHER_ROOT.'include/email.php';
 
     if (!is_valid_email($email)) {
-        $alerts[] = __('Wrong email');
+        $alerts[] = $lang_install['Wrong email'];
     }
 
     if ($title == '') {
-        $alerts[] = __('No board title');
+        $alerts[] = $lang_install['No board title'];
     }
 
     $languages = forum_list_langs();
     if (!in_array($default_lang, $languages)) {
-        $alerts[] = __('Error default language');
+        $alerts[] = $lang_install['Error default language'];
     }
 
     $styles = forum_list_styles();
     if (!in_array($default_style, $styles)) {
-        $alerts[] = __('Error default style');
+        $alerts[] = $lang_install['Error default style'];
     }
 }
 
 // Check if the cache directory is writable
 if (!forum_is_writable(FORUM_CACHE_DIR)) {
-    $alerts[] = sprintf(__('Alert cache'), FORUM_CACHE_DIR);
+    $alerts[] = sprintf($lang_install['Alert cache'], FORUM_CACHE_DIR);
 }
 
 // Check if default avatar directory is writable
 if (!forum_is_writable(FEATHER_ROOT.'img/avatars/')) {
-    $alerts[] = sprintf(__('Alert avatar'), FEATHER_ROOT.'img/avatars/');
+    $alerts[] = sprintf($lang_install['Alert avatar'], FEATHER_ROOT.'img/avatars/');
 }
 
 if (!isset($_POST['form_sent']) || !empty($alerts)) {
@@ -340,7 +343,7 @@ function generate_config_file()
     }
 
     if (empty($db_extensions)) {
-        error(__('No DB extensions'));
+        error($lang_install['No DB extensions']);
     }
 
     // Fetch a list of installed languages
@@ -351,22 +354,22 @@ function generate_config_file()
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><?php echo __('FeatherBB Installation') ?></title>
+<title><?php echo $lang_install['FeatherBB Installation'] ?></title>
 <link rel="stylesheet" type="text/css" href="../style/<?php echo $default_style ?>.css" />
 <script type="text/javascript">
 /* <![CDATA[ */
 function process_form(the_form)
 {
 	var required_fields = {
-		"req_db_type": "<?php echo __('Database type') ?>",
-		"req_db_host": "<?php echo __('Database server hostname') ?>",
-		"req_db_name": "<?php echo __('Database name') ?>",
-		"req_username": "<?php echo __('Administrator username') ?>",
-		"req_password1": "<?php echo __('Password') ?>",
-		"req_password2": "<?php echo __('Confirm password') ?>",
-		"req_email": "<?php echo __('Administrator email') ?>",
-		"req_title": "<?php echo __('Board title') ?>",
-		"req_base_url": "<?php echo __('Base URL') ?>"
+		"req_db_type": "<?php echo $lang_install['Database type'] ?>",
+		"req_db_host": "<?php echo $lang_install['Database server hostname'] ?>",
+		"req_db_name": "<?php echo $lang_install['Database name'] ?>",
+		"req_username": "<?php echo $lang_install['Administrator username'] ?>",
+		"req_password1": "<?php echo $lang_install['Password'] ?>",
+		"req_password2": "<?php echo $lang_install['Confirm password'] ?>",
+		"req_email": "<?php echo $lang_install['Administrator email'] ?>",
+		"req_title": "<?php echo $lang_install['Board title'] ?>",
+		"req_base_url": "<?php echo $lang_install['Base URL'] ?>"
 	};
 	if (document.all || document.getElementById)
 	{
@@ -375,7 +378,7 @@ function process_form(the_form)
 			var elem = the_form.elements[i];
 			if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
 			{
-				alert('"' + required_fields[elem.name] + '" <?php echo __('Required field') ?>');
+				alert('"' + required_fields[elem.name] + '" <?php echo $lang_install['Required field'] ?>');
 				elem.focus();
 				return false;
 			}
@@ -396,8 +399,8 @@ function process_form(the_form)
 	<div id="brdheader" class="block">
 		<div class="box">
 			<div id="brdtitle" class="inbox">
-				<h1><span><?php echo __('FeatherBB Installation') ?></span></h1>
-				<div id="brddesc"><p><?php echo __('Welcome') ?></p></div>
+				<h1><span><?php echo $lang_install['FeatherBB Installation'] ?></span></h1>
+				<div id="brddesc"><p><?php echo $lang_install['Welcome'] ?></p></div>
 			</div>
 		</div>
 	</div>
@@ -406,15 +409,15 @@ function process_form(the_form)
 <section class="container">
 	<div id="brdmain">
 	<?php if (count($languages) > 1): ?><div class="blockform">
-		<h2><span><?php echo __('Choose install language') ?></span></h2>
+		<h2><span><?php echo $lang_install['Choose install language'] ?></span></h2>
 		<div class="box">
 			<form id="install" method="post" action="">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Install language') ?></legend>
+						<legend><?php echo $lang_install['Install language'] ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Choose install language info') ?></p>
-							<label><strong><?php echo __('Install language') ?></strong>
+							<p><?php echo $lang_install['Choose install language info'] ?></p>
+							<label><strong><?php echo $lang_install['Install language'] ?></strong>
 							<br /><select name="install_lang">
 <?php
 
@@ -432,7 +435,7 @@ function process_form(the_form)
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="start" value="<?php echo __('Change language') ?>" /></p>
+				<p class="buttons"><input type="submit" name="start" value="<?php echo $lang_install['Change language'] ?>" /></p>
 			</form>
 		</div>
 	</div>
@@ -440,13 +443,13 @@ function process_form(the_form)
     ?>
 
 	<div class="blockform">
-		<h2><span><?php echo sprintf(__('Install'), FORUM_VERSION) ?></span></h2>
+		<h2><span><?php echo sprintf($lang_install['Install'], FORUM_VERSION) ?></span></h2>
 		<div class="box">
 			<form id="install" method="post" action="" onsubmit="this.start.disabled=true;if(process_form(this)){return true;}else{this.start.disabled=false;return false;}">
 			<div><input type="hidden" name="form_sent" value="1" /><input type="hidden" name="install_lang" value="<?php echo feather_escape($install_lang) ?>" /></div>
 				<div class="inform">
 	<?php if (!empty($alerts)): ?>				<div class="forminfo error-info">
-						<h3><?php echo __('Errors') ?></h3>
+						<h3><?php echo $lang_install['Errors'] ?></h3>
 						<ul class="error-list">
 <?php
 
@@ -460,14 +463,14 @@ function process_form(the_form)
     ?>			</div>
 				<div class="inform">
 					<div class="forminfo">
-						<h3><?php echo __('Database setup') ?></h3>
-						<p><?php echo __('Info 1') ?></p>
+						<h3><?php echo $lang_install['Database setup'] ?></h3>
+						<p><?php echo $lang_install['Info 1'] ?></p>
 					</div>
 					<fieldset>
-					<legend><?php echo __('Select database') ?></legend>
+					<legend><?php echo $lang_install['Select database'] ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Info 2') ?></p>
-							<label class="required"><strong><?php echo __('Database type') ?> <span><?php echo __('Required') ?></span></strong>
+							<p><?php echo $lang_install['Info 2'] ?></p>
+							<label class="required"><strong><?php echo $lang_install['Database type'] ?> <span><?php echo $lang_install['Required'] ?></span></strong>
 							<br /><select name="req_db_type">
 <?php
 
@@ -487,71 +490,71 @@ function process_form(the_form)
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Database hostname') ?></legend>
+						<legend><?php echo $lang_install['Database hostname'] ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Info 3') ?></p>
-							<label class="required"><strong><?php echo __('Database server hostname') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_db_host" value="<?php echo feather_escape($db_host) ?>" size="50" /><br /></label>
+							<p><?php echo $lang_install['Info 3'] ?></p>
+							<label class="required"><strong><?php echo $lang_install['Database server hostname'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input type="text" name="req_db_host" value="<?php echo feather_escape($db_host) ?>" size="50" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Database enter name') ?></legend>
+						<legend><?php echo $lang_install['Database enter name'] ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Info 4') ?></p>
-							<label class="required"><strong><?php echo __('Database name') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_db_name" type="text" name="req_db_name" value="<?php echo feather_escape($db_name) ?>" size="30" /><br /></label>
+							<p><?php echo $lang_install['Info 4'] ?></p>
+							<label class="required"><strong><?php echo $lang_install['Database name'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input id="req_db_name" type="text" name="req_db_name" value="<?php echo feather_escape($db_name) ?>" size="30" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Database enter informations') ?></legend>
+						<legend><?php echo $lang_install['Database enter informations'] ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Info 5') ?></p>
-							<label class="conl"><?php echo __('Database username') ?><br /><input type="text" name="db_username" value="<?php echo feather_escape($db_username) ?>" size="30" /><br /></label>
-							<label class="conl"><?php echo __('Database password') ?><br /><input type="password" name="db_password" size="30" /><br /></label>
+							<p><?php echo $lang_install['Info 5'] ?></p>
+							<label class="conl"><?php echo $lang_install['Database username'] ?><br /><input type="text" name="db_username" value="<?php echo feather_escape($db_username) ?>" size="30" /><br /></label>
+							<label class="conl"><?php echo $lang_install['Database password'] ?><br /><input type="password" name="db_password" size="30" /><br /></label>
 							<div class="clearer"></div>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Database enter prefix') ?></legend>
+						<legend><?php echo $lang_install['Database enter prefix'] ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Info 6') ?></p>
-							<label><?php echo __('Table prefix') ?><br /><input id="db_prefix" type="text" name="db_prefix" value="<?php echo feather_escape($db_prefix) ?>" size="20" maxlength="30" /><br /></label>
+							<p><?php echo $lang_install['Info 6'] ?></p>
+							<label><?php echo $lang_install['Table prefix'] ?><br /><input id="db_prefix" type="text" name="db_prefix" value="<?php echo feather_escape($db_prefix) ?>" size="20" maxlength="30" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<div class="forminfo">
-						<h3><?php echo __('Administration setup') ?></h3>
-						<p><?php echo __('Info 7') ?></p>
+						<h3><?php echo $lang_install['Administration setup'] ?></h3>
+						<p><?php echo $lang_install['Info 7'] ?></p>
 					</div>
 					<fieldset>
-						<legend><?php echo __('Administration setup') ?></legend>
+						<legend><?php echo $lang_install['Administration setup'] ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Info 8') ?></p>
-							<label class="required"><strong><?php echo __('Administrator username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
-							<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_password1" type="password" name="req_password1" size="16" /><br /></label>
-							<label class="conl required"><strong><?php echo __('Confirm password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" size="16" /><br /></label>
+							<p><?php echo $lang_install['Info 8'] ?></p>
+							<label class="required"><strong><?php echo $lang_install['Administrator username'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input type="text" name="req_username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
+							<label class="conl required"><strong><?php echo $lang_install['Password'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input id="req_password1" type="password" name="req_password1" size="16" /><br /></label>
+							<label class="conl required"><strong><?php echo $lang_install['Confirm password'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input type="password" name="req_password2" size="16" /><br /></label>
 							<div class="clearer"></div>
-							<label class="required"><strong><?php echo __('Administrator email') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" value="<?php echo feather_escape($email) ?>" size="50" maxlength="80" /><br /></label>
+							<label class="required"><strong><?php echo $lang_install['Administrator email'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input id="req_email" type="text" name="req_email" value="<?php echo feather_escape($email) ?>" size="50" maxlength="80" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<div class="forminfo">
-						<h3><?php echo __('Board setup') ?></h3>
-						<p><?php echo __('Info 11') ?></p>
+						<h3><?php echo $lang_install['Board setup'] ?></h3>
+						<p><?php echo $lang_install['Info 11'] ?></p>
 					</div>
 					<fieldset>
-						<legend><?php echo __('General information') ?></legend>
+						<legend><?php echo $lang_install['General information'] ?></legend>
 						<div class="infldset">
-							<label class="required"><strong><?php echo __('Board title') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_title" type="text" name="req_title" value="<?php echo feather_escape($title) ?>" size="60" maxlength="255" /><br /></label>
-							<label><?php echo __('Board description') ?><br /><input id="desc" type="text" name="desc" value="<?php echo feather_escape($description) ?>" size="60" maxlength="255" /><br /></label>
-							<label class="required"><strong><?php echo __('Base URL') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_base_url" type="text" name="req_base_url" value="<?php echo feather_escape($base_url) ?>" size="60" maxlength="100" /><br /></label>
-							<label class="required"><strong><?php echo __('Default language') ?> <span><?php echo __('Required') ?></span></strong><br /><select id="req_default_lang" name="req_default_lang">
+							<label class="required"><strong><?php echo $lang_install['Board title'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input id="req_title" type="text" name="req_title" value="<?php echo feather_escape($title) ?>" size="60" maxlength="255" /><br /></label>
+							<label><?php echo $lang_install['Board description'] ?><br /><input id="desc" type="text" name="desc" value="<?php echo feather_escape($description) ?>" size="60" maxlength="255" /><br /></label>
+							<label class="required"><strong><?php echo $lang_install['Base URL'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><input id="req_base_url" type="text" name="req_base_url" value="<?php echo feather_escape($base_url) ?>" size="60" maxlength="100" /><br /></label>
+							<label class="required"><strong><?php echo $lang_install['Default language'] ?> <span><?php echo $lang_install['Required'] ?></span></strong><br /><select id="req_default_lang" name="req_default_lang">
 <?php
 
             $languages = forum_list_langs();
@@ -568,7 +571,7 @@ function process_form(the_form)
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="start" value="<?php echo __('Start install') ?>" /></p>
+				<p class="buttons"><input type="submit" name="start" value="<?php echo $lang_install['Start install'] ?>" /></p>
 			</form>
 		</div>
 	</div>
@@ -615,7 +618,7 @@ function process_form(the_form)
             break;
 
         default:
-            error(sprintf(__('DB type not valid'), feather_escape($db_type)));
+            error(sprintf($lang_install['DB type not valid'], feather_escape($db_type)));
     }
 
     // Create the database object (and connect/select db)
@@ -623,7 +626,7 @@ function process_form(the_form)
 
     // Validate prefix
     if (strlen($db_prefix) > 0 && (!preg_match('%^[a-zA-Z_][a-zA-Z0-9_]*$%', $db_prefix) || strlen($db_prefix) > 40)) {
-        error(sprintf(__('Table prefix error'), $db->prefix));
+        error(sprintf($lang_install['Table prefix error'], $db->prefix));
     }
 
     // Do some DB type specific checks
@@ -634,21 +637,21 @@ function process_form(the_form)
         case 'mysqli_innodb':
             $mysql_info = $db->get_version();
             if (version_compare($mysql_info['version'], MIN_MYSQL_VERSION, '<')) {
-                error(sprintf(__('You are running error'), 'MySQL', $mysql_info['version'], FORUM_VERSION, MIN_MYSQL_VERSION));
+                error(sprintf($lang_install['You are running error'], 'MySQL', $mysql_info['version'], FORUM_VERSION, MIN_MYSQL_VERSION));
             }
             break;
 
         case 'pgsql':
             $pgsql_info = $db->get_version();
             if (version_compare($pgsql_info['version'], MIN_PGSQL_VERSION, '<')) {
-                error(sprintf(__('You are running error'), 'PostgreSQL', $pgsql_info['version'], FORUM_VERSION, MIN_PGSQL_VERSION));
+                error(sprintf($lang_install['You are running error'], 'PostgreSQL', $pgsql_info['version'], FORUM_VERSION, MIN_PGSQL_VERSION));
             }
             break;
 
         case 'sqlite':
         case 'sqlite3':
             if (strtolower($db_prefix) == 'sqlite_') {
-                error(__('Prefix reserved'));
+                error($lang_install['Prefix reserved']);
             }
             break;
     }
@@ -657,7 +660,7 @@ function process_form(the_form)
     // Make sure FeatherBB isn't already installed
     $result = $db->query('SELECT 1 FROM '.$db_prefix.'users WHERE id=1');
     if ($db->num_rows($result)) {
-        error(sprintf(__('Existing table error'), $db_prefix, $db_name));
+        error(sprintf($lang_install['Existing table error'], $db_prefix, $db_name));
     }
 
     // Check if InnoDB is available
@@ -665,7 +668,7 @@ function process_form(the_form)
         $result = $db->query('SHOW VARIABLES LIKE \'have_innodb\'');
         list(, $result) = $db->fetch_row($result);
         if ((strtoupper($result) != 'YES')) {
-            error(__('InnoDB off'));
+            error($lang_install['InnoDB off']);
         }
     }
 
@@ -1610,16 +1613,16 @@ function process_form(the_form)
     $now = time();
 
     // Insert the four preset groups
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '1, ' : '').'\''.$db->escape(__('Administrators')).'\', \''.$db->escape(__('Administrator')).'\', 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
+    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '1, ' : '').'\''.$db->escape($lang_install['Administrators']).'\', \''.$db->escape($lang_install['Administrator']).'\', 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
 
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_mod_promote_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '2, ' : '').'\''.$db->escape(__('Moderators')).'\', \''.$db->escape(__('Moderator')).'\', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
+    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_mod_promote_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '2, ' : '').'\''.$db->escape($lang_install['Moderators']).'\', \''.$db->escape($lang_install['Moderator']).'\', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
 
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '3, ' : '').'\''.$db->escape(__('Guests')).'\', NULL, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 60, 30, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
+    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '3, ' : '').'\''.$db->escape($lang_install['Guests']).'\', NULL, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 60, 30, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
 
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '4, ' : '').'\''.$db->escape(__('Members')).'\', NULL, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 60, 30, 60, 60)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
+    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '4, ' : '').'\''.$db->escape($lang_install['Members']).'\', NULL, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 60, 30, 60, 60)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
 
     // Insert guest and first admin user
-    $db->query('INSERT INTO '.$db_prefix.'users (group_id, username, password, email) VALUES(3, \''.$db->escape(__('Guest')).'\', \''.$db->escape(__('Guest')).'\', \''.$db->escape(__('Guest')).'\')')
+    $db->query('INSERT INTO '.$db_prefix.'users (group_id, username, password, email) VALUES(3, \''.$db->escape($lang_install['Guest']).'\', \''.$db->escape($lang_install['Guest']).'\', \''.$db->escape($lang_install['Guest']).'\')')
         or error('Unable to add guest user. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
 
     $db->query('INSERT INTO '.$db_prefix.'users (group_id, username, password, email, language, style, num_posts, last_post, registered, registration_ip, last_visit) VALUES(1, \''.$db->escape($username).'\', \''.feather_hash($password1).'\', \''.$email.'\', \''.$db->escape($default_lang).'\', \''.$db->escape($default_style).'\', 1, '.$now.', '.$now.', \''.$db->escape(get_remote_address()).'\', '.$now.')')
@@ -1687,11 +1690,11 @@ function process_form(the_form)
         'o_regs_allow'                => 1,
         'o_regs_verify'                => 0,
         'o_announcement'            => 0,
-        'o_announcement_message'    => __('Announcement'),
+        'o_announcement_message'    => $lang_install['Announcement'],
         'o_rules'                    => 0,
-        'o_rules_message'            => __('Rules'),
+        'o_rules_message'            => $lang_install['Rules'],
         'o_maintenance'                => 0,
-        'o_maintenance_message'        => __('Maintenance message'),
+        'o_maintenance_message'        => $lang_install['Maintenance message'],
         'o_default_dst'                => 0,
         'o_feed_type'                => 2,
         'o_feed_ttl'                => 0,
@@ -1715,13 +1718,13 @@ function process_form(the_form)
     }
 
     // Insert some other default data
-    $subject = __('Test post');
-    $message = __('Message');
+    $subject = $lang_install['Test post'];
+    $message = $lang_install['Message'];
 
-    $db->query('INSERT INTO '.$db_prefix.'categories (cat_name, disp_position) VALUES(\''.$db->escape(__('Test category')).'\', 1)')
+    $db->query('INSERT INTO '.$db_prefix.'categories (cat_name, disp_position) VALUES(\''.$db->escape($lang_install['Test category']).'\', 1)')
         or error('Unable to insert into table '.$db_prefix.'categories. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
 
-    $db->query('INSERT INTO '.$db_prefix.'forums (forum_name, forum_desc, num_topics, num_posts, last_post, last_post_id, last_poster, disp_position, cat_id) VALUES(\''.$db->escape(__('Test forum')).'\', \''.$db->escape(__('This is just a test forum')).'\', 1, 1, '.$now.', 1, \''.$db->escape($username).'\', 1, 1)')
+    $db->query('INSERT INTO '.$db_prefix.'forums (forum_name, forum_desc, num_topics, num_posts, last_post, last_post_id, last_poster, disp_position, cat_id) VALUES(\''.$db->escape($lang_install['Test forum']).'\', \''.$db->escape($lang_install['This is just a test forum']).'\', 1, 1, '.$now.', 1, \''.$db->escape($username).'\', 1, 1)')
         or error('Unable to insert into table '.$db_prefix.'forums. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
 
     $db->query('INSERT INTO '.$db_prefix.'topics (poster, subject, posted, first_post_id, last_post, last_post_id, last_poster, forum_id) VALUES(\''.$db->escape($username).'\', \''.$db->escape($subject).'\', '.$now.', 1, '.$now.', 1, \''.$db->escape($username).'\', 1)')
@@ -1737,7 +1740,7 @@ function process_form(the_form)
 
     // Check if we disabled uploading avatars because file_uploads was disabled
     if ($avatars == '0') {
-        $alerts[] = __('Alert upload');
+        $alerts[] = $lang_install['Alert upload'];
     }
 
     // Add some random bytes at the end of the cookie name to prevent collisions
@@ -1770,7 +1773,7 @@ function process_form(the_form)
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><?php echo __('FeatherBB Installation') ?></title>
+<title><?php echo $lang_install['FeatherBB Installation'] ?></title>
 <link rel="stylesheet" type="text/css" href="../style/<?php echo $default_style ?>.css" />
 </head>
 <body>
@@ -1783,8 +1786,8 @@ function process_form(the_form)
     <div id="brdheader" class="block">
             <div class="box">
                     <div id="brdtitle" class="inbox">
-                            <h1><span><?php echo __('FeatherBB Installation') ?></span></h1>
-                            <div id="brddesc"><p><?php echo __('FeatherBB has been installed') ?></p></div>
+                            <h1><span><?php echo $lang_install['FeatherBB Installation'] ?></span></h1>
+                            <div id="brddesc"><p><?php echo $lang_install['FeatherBB has been installed'] ?></p></div>
                     </div>
             </div>
     </div>
@@ -1792,7 +1795,7 @@ function process_form(the_form)
     <div id="brdmain">
 
     <div class="blockform">
-            <h2><span><?php echo __('Final instructions') ?></span></h2>
+            <h2><span><?php echo $lang_install['Final instructions'] ?></span></h2>
             <div class="box">
     <?php
 
@@ -1801,8 +1804,8 @@ function process_form(the_form)
                     <form method="post" action="">
                             <div class="inform">
                                     <div class="forminfo">
-                                            <p><?php echo __('Info 17') ?></p>
-                                            <p><?php echo __('Info 18') ?></p>
+                                            <p><?php echo $lang_install['Info 17'] ?></p>
+                                            <p><?php echo $lang_install['Info 18'] ?></p>
                                     </div>
                                     <input type="hidden" name="generate_config" value="1" />
                                     <input type="hidden" name="db_type" value="<?php echo $db_type;
@@ -1834,7 +1837,7 @@ function process_form(the_form)
                                     </div>
     <?php endif;
         ?>			</div>
-                            <p class="buttons"><input type="submit" value="<?php echo __('Download config.php file') ?>" /></p>
+                            <p class="buttons"><input type="submit" value="<?php echo $lang_install['Download config.php file'] ?>" /></p>
                     </form>
 
     <?php
@@ -1844,7 +1847,7 @@ function process_form(the_form)
                     <div class="fakeform">
                             <div class="inform">
                                     <div class="forminfo">
-                                            <p><?php echo __('FeatherBB fully installed') ?></p>
+                                            <p><?php echo $lang_install['FeatherBB fully installed'] ?></p>
                                     </div>
                             </div>
                     </div>
diff --git a/lang/English/antispam.mo b/lang/English/antispam.mo
deleted file mode 100644
index 2d884422712f3935e89b7acbab004e1cdb67f9c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 751
zcmYk4!EVz)5QYsDAsGn}7cLxzN=R^6mmm(2n*?auK&4bfB_KF(SjUrO!QM5qYf9b#
z?r`JABk%w`1~;CC-*MBj^5@yvotfX>*}pfpzDF3B!ELY)u7CnG;|qwvS8xq{1J}V%
za25OllM7Mw8+HtCT#TXt>^s;L_6O`O*gvoci!K37*LpDPvDLhfUFHHAJ9nqkk2U*X
zoIP~|Jeq4$Y<v?6jwVGdx=<r0rBBILYuEQ5?ovDL-?Mb5Po4X_@kHEvo&|N7tJf?Z
zl~WqA4ojB3y?F9ss)hm=>uO&IP6=!3m_L~&bh9+pKB%c^>kA#6AZV=ZqSgymQ`Y5w
z6{)B5(%2{SRwBz1CyPORba-@duHQ)>#6xETTU1?D5Dok}>{Nv|c9&*LEuKUF)pVq~
z=W&htoJAejnahn`q}0t!IQx*4*v4<vGqx=4H%=VqCQv8oCXcYwy6UB?WyZr+Bc)a(
z8ZLSE0Y%BoDJ+dAJi_Z<a8B8ZG+bR!g(Gy9w9Uz)ZyM7&xDp4KQzdR8x=hd=)}E2z
zD~G@n6PC#DWdmE68B1>`8&Gi2VcK*%ZMN_FW-EH@Y83V-EGTO5w<2g@vD)NpKd(y&
aJE8UE**+_hL{Eijh4kenLYnLKIQj?9tlQE6

diff --git a/lang/English/antispam.po b/lang/English/antispam.po
deleted file mode 100644
index 75fa1d31..00000000
--- a/lang/English/antispam.po
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Robot title"
-msgstr "Are you human or robot?"
-
-msgid "Robot question"
-msgstr "Please respond with a <b>number</b> to the question: <b>%s</b>"
-
-msgid "Robot info"
-msgstr "Checking if this is requested by a real person and not an automated program."
-
-msgid "Robot test fail"
-msgstr "You answered incorrectly to the \"Human or Robot\" question."
diff --git a/lang/English/antispam_questions.mo b/lang/English/antispam_questions.mo
deleted file mode 100644
index f3ff0a71bb65c8f0a8a5a078d57338b2408dd0e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 765
zcmZ{f&uUXa6vn5u{=06h;6LbM*1|+@ZOUy#3bsWGEd~iH?#ARKnUc(enUh!_!et+!
zZ{Z`jbnU88C?X<-BHj4i^rR_L=iV>B`+alf%*ppVb9)Nw7PJ5{G!K1+%5{52sR!UZ
zcprQud;va$e=qwi`DgGR@_q4Nz`O9@#2<kN@UycJc!(cF>PYxQ_*3{x_#4Elj>Vq{
z{|HZo*HANAH{_%IZ&#rVx-QvG@QQqwn1j$lskdFr+9ge{(`C)BPf7E~uzJ4Hb|cb#
z=ZF91VHhP3o~HHQ`AL1E5&7xP*j{!dxm`Wzl^1j)U1(M2mrOLSk^>hf#n}Hz&ziI`
z@v5rFutQBYn=SK(VsgRPbXI@WFl&)4!<u!=G|tRx8o9D!5^dSUrV*`AJ<B1YXv_M}
z(00f)$oAp4H@7#Yee=qbY%O>uk7J((=*qOqj|V;L{4?F`+L(x+yA(`OR98$sEiUh9
zQ#2dC8CuSFYP$H~`24z>CZD}CFUeCpo1`A7<yhyHqOz2!d|5rkv#6HUipm#NRV}GP
F{RM6Rwd?=@

diff --git a/lang/English/antispam_questions.po b/lang/English/antispam_questions.po
deleted file mode 100644
index 384893e1..00000000
--- a/lang/English/antispam_questions.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-
-msgid "What is two plus two?"
-msgstr "4"
-
-msgid "What is four minus one?"
-msgstr "3"
-
-msgid "What is three plus two?"
-msgstr "5"
-
-msgid "What is two times four?"
-msgstr "8"
-
-msgid "What is five minus two?"
-msgstr "3"
-
-msgid "What is six plus three?"
-msgstr "9"
-
-msgid "What is seven minus one?"
-msgstr "6"
-
-msgid "What is eight times two?"
-msgstr "16"
-
-msgid "What is six times two?"
-msgstr "12"
-
-msgid "What is nine minus seven?"
-msgstr "2"
diff --git a/lang/English/bbeditor.mo b/lang/English/bbeditor.mo
deleted file mode 100644
index a176f079a551314464013f06d3593a9f9617a8a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1082
zcmYk4J!}&(6vq!*zQRWVAu+&U2BadmKr4poN)T#jQBW#ENf4`(dr3_%cJTQsDmE5i
zU_gQi76c;;3p0!i42Y=<3#_b&k^i$V1WUf3-+T6Z&;H-{qth=Uj3byQG2dby$2_+K
zAB@M~9`Fgc4}4bIFTuUA-<1A$U<LMvGXAOL=aOH`_%_JrewO?N9)SHD+z(Fe44eVE
z-U+aU*lBPY_U2R+?FJu!Y(E5dfsac6Q;_?8UdCU6Gq7KShrstB*ZT<axi2NZfn0AJ
zJO=&%=fOW9pF4|UXv3f3w}RW};TR9@g$KXEVZWMu_`ZBM?gQ8Gb%5v~CilwsiMmcN
znJi`2NjtKBWl{>vjCVAg%v6tE*Nfb#{uVEr)OVgrZv^JvZmFIttWR*WFwQU5)L`8Q
zJ31wsDNWJHn&HSbhH@}ohuy*7v02p03M;dC#n@q<2tD#<UYlPOVOg8i;#5t{oms53
zthq})7dO)QHrZSmoro2ZZk_DXQl)jH9oH>P_~Wb6Q6k`r*JxAm*0HN8a~HR*)OjYI
zvDnm<dQhOjxJ`2SUq*3BrbDH#^h1emw`%O*a%Hu#x;&{rSG`cF8@#DT)~ykWI=b)9
zk20zBqUfzlo0F?`+AHzGWFJ@WlZ}^k&!kEZ60y)#?q4H`AYHi=Un5O6^w=_#DktWu
z3)PE=1T(&63frT4sF8?JB=Sm^GS^w-x?zD!b;r_rT^l+l>qKX*DVnTrM;i;}D1`}`
z%WzOH=oTcN=)25+lYj!k@8VPmBqf;>E-{W3D5K?&#6A91QZZ|+z@AMK-Aw9@Gf6bb
H<1_pPbWa9S

diff --git a/lang/English/bbeditor.php b/lang/English/bbeditor.php
new file mode 100644
index 00000000..7e1990a3
--- /dev/null
+++ b/lang/English/bbeditor.php
@@ -0,0 +1,25 @@
+<?php
+
+// Language definitions used in viewtopic.php and post.php
+$lang_bbeditor = array(
+
+    'btnBold'           => 'Bold',
+    'btnItalic'         => 'Italic',
+    'btnUnderline'      => 'Underline',
+    'btnColor'          => 'Color',
+    'btnLeft'           => 'Left',
+    'btnRight'          => 'Right',
+    'btnJustify'        => 'Justify',
+    'btnCenter'         => 'Center',
+    'btnLink'           => 'Insert URL Link',
+    'btnPicture'        => 'Insert Image',
+    'btnList'           => 'Ordered List',
+    'btnList'           => 'Unordered List',
+    'btnQuote'          => 'Quote',
+    'btnCode'           => 'Code',
+
+    'promptImage'       => 'Enter the Image URL:',
+    'promptUrl'         => 'Enter the URL:',
+    'promptQuote'         => 'Please enter the username quoted (or leave blank):'
+
+);
diff --git a/lang/English/bbeditor.po b/lang/English/bbeditor.po
deleted file mode 100644
index 3deedec3..00000000
--- a/lang/English/bbeditor.po
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "btnBold"
-msgstr "Bold"
-
-msgid "btnItalic"
-msgstr "Italic"
-
-msgid "btnUnderline"
-msgstr "Underline"
-
-msgid "btnColor"
-msgstr "Color"
-
-msgid "btnLeft"
-msgstr "Left"
-
-msgid "btnRight"
-msgstr "Right"
-
-msgid "btnJustify"
-msgstr "Justify"
-
-msgid "btnCenter"
-msgstr "Center"
-
-msgid "btnLink"
-msgstr "Insert URL Link"
-
-msgid "btnPicture"
-msgstr "Insert Image"
-
-msgid "btnList"
-msgstr "Unordered List"
-
-msgid "btnQuote"
-msgstr "Quote"
-
-msgid "btnCode"
-msgstr "Code"
-
-msgid "promptImage"
-msgstr "Enter the Image URL:"
-
-msgid "promptUrl"
-msgstr "Enter the URL:"
-
-msgid "promptQuote"
-msgstr "Please enter the username quoted (or leave blank):"
diff --git a/lang/English/common.mo b/lang/English/common.mo
deleted file mode 100644
index fc08237e6da5b22b1f2d17b687732e820380b425..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9404
zcmcJUdypK*UB}yz@~{ZDF;46}-I8_DU7}lA@&j>}?CA8eY&|Y_Cp)%dl-b?hyODNh
z)-$uZJKMx@9!L-ygTW36Cq)G#!0?9+1;HdmVg)J`sS1>1C|3niR2dAFa!4s8#l!r;
z=iAe>w=2omq>8Qk&1br&AHV+1ue*Oe_pOUpK4SQtK;DVGw9=Swz%QQ9h2NWg)ENHE
z`CMKPFAeE;!4;(62j2`gz)Rs4cp;n(Y{EB?F5p|?J@Cij!|)yOB>XXW3ab8d;rUBY
z<;?{pFNJR*Sqt0&FCl$9RJ|0c{4sbj{4A6nPlfa|Q2jgySHTxU{%QDj(km&f@m~&A
zZwnXow-;)Bb@(GN4ZH`UqB$1$NZ@ZkjrS?2dVdV*!u&Z@{pSMz0m_~)1%3~{j`V-P
zH^P@g{)&rAeb0x|=Mt!T?}fZ7b0w4>*Fe?V4)yA8h8pKVC_O$5Rj&i3UmkcjlwSA4
z%ix2MKXZ}`DwxkhmH#SKJ70(D=bKRDdLi(8;rV$OS^ZxC)&FHs{az9B#~?+`RZ#VJ
zK=nTZHJ(FI^_x)RN}&3?H>5uS)$YR~|1(haeiN#nC*YgllThWJhHB@}!t-ZC{_{}f
zUVv)<B`EuTAM$5b;Y3Qm6RO=!P<n2L(r*WpzwL*zlY=VXgBsVTpvs*H>Bph!{{d9L
zUxL!_FQEGWM#%prRDb^nW%qAGl{*djGyly+?O(_wQu^IcdTfMh|3;|s&IZ;4yMZ4G
zd?4@yRR6yX)!&m)?R-Aue<kF94N9+Pp~m}sNdHUVze4HteW>@lg2^d6UIL}hd!X!b
zHPra8hy0n{A^$^A>q!f09vp_!s{=L89#s3sq5A)H$p0;<dVc~{?@yu1Jp)z$uc7pQ
z9!{NS%(tM%xdEf8+_g~p?SyJ)2FlNGg<4mdQ2pH-_yAP9k3pI;k3+3vPs6vtzky@$
zyYSucZ8WkGZiZLE!*DhHEW8qa8D0ZV!>w=~lW-k$Q0WKZ2>cq{08c~JTTN$5Ps7dd
zV^HmX0p0+=8}c`>xXJGGP|q`X19mtGw~&4j<u8X<u=u?TZihF)2>vAeJt%v<2xXV=
zz<KyzP=3;&lHPL)W#{_?k3r4L2chisaL7Lq`0G&f<zz^I5vu$tDEoaCs@`cR{r?l{
zeXYQ#(&J*N{w{~oZv?8`dMLfFg{WvIA*MBl0vDjlKLq7hk3#kHJ5cRE75HVSe*Oxo
z-M@pHhc80)dphL*JCxs?hY|JOUJo^{aj5ZZhmXM<q2AX&LA}4X*mB<Pf@=3pC_Ux_
zyHI*ALd}=^p!7KomH!Bo9*;r!@8_V(Jqgv$)9@Df415q?hSTkbC!y;70IK}UQ2MM~
zQ|faK#MEXll>H7v+2t72cpeSuUxTvq6Hx8^5!5)o1l9jvhV-*g{rx?Z-Y<mwZ$nIH
zegHK;F1e!g!(CAQwxIg^I8?pkfe!^f8u*#O#{+*CN}t~k=`TR(c?wFeuZR4<g<dbX
zg8Uak`kw>816BUtpyv6@P~*F3ZE5d!K>5WORDV}N*=<Y6za6e1-Gr}$^HBAV!1LhI
z@O&{mzc=LH7xM29`JaTmB6A$7{u5C4_(Q06egRoP?m|9<Smb^rMx@sgGLNtvnD-((
zk)z0AWC!xIh(mr6`7okiihLT;{J#y+Ph;5Y@5;+oFg}ph?XMv6CH?jwvb*NO4am<U
z`rTK;uNk^M9@59)&mfws*N41^VGX$lk*~0|_}?#c9YNlMtV385{n`f1c3t@4R%VyK
zGv)w{kPjfggvgF7k=4i)@&NJ(QvL4W=21lJ!=WlO@F(CbBA?ao-V$asum?9G^^nGG
z%+<(TNDDK_$B-s+5i*JFMjD8IEkwTARwDe~2X8{wBkxD9L$)EBD`)=3$T%PAAfE^i
z-xw&o0l69JB0q=dCm+{OK76geEB!p&nvYgD@Cd@T;eWr%burwpfcwJz#{&heJ10W=
z8hAJIX5_6QuY%U81YwCZKaE_7WXPRJj(ifi0NIR8AX-oLyB&E5DUh|ut;pMv8xj4c
zkz0^YDZ%d`@)6{N$QI<M5VNgO#7CVi(r(<y&9-JIPReVX7g<!Knc3EEn{7#w_L7F{
zxTG-KinL>+!FsmkT(it?rCF~tkoFCi>B-6MY15g>Ntb1IPjWPB$4z^1daq5Q&Y9Vb
zv`yE;MO`O~+cs)8GneP#Sv_jnc^5TZHk4BoT}!EMn&ef>D%o*GWSdbDRkiC4G_p}q
zWO2P$R7D#R!!2w#%?s&QwHybP8);I=4yATgZsPJHPUg<Y?MB&h(N3J_6gjKEP}QbK
zUDj%+3!#l9wXL}AY#!fTX_lmkjXTj?l}@wne3aNmJME7%WTjn~gm$`(tSX<oc58fC
z(_Z2hyRK2V=2?36lFT*IxrF|QA9nINTaV}ZswnN%%55{wqk0=}n8e<hYw@lfFVZLO
z>R}`96JA7~`%x_4+f9Q{>{UaltCdRBY8qut+e*`dR=2m~#t}Mc#^_m)#0sS+n;ov+
zo3n*fF+1fqW|th(>`wW!^{8>g?DpF1ku_~QPL7y8oo<>HQBv4A!Hqjn5vPgSlQi8T
z*H+4<^jYtS=B8e!OK)axgqz4$%Dba+9&?+{&0(}Su~DuBvx;llE6hHWL3bc8ikMV`
z_qHR4B;VU`Uz8oOQ5&bv8D`X^BpKxtE7Pu1S7WY|W=po`ZMrYmb{{P<gI!tP^pk!@
z_LEIpU#b$!xPACwFyVfOJDUA&!4EE9z6%p>AVc=@$;`=wD!W*i{i$uF>5<s!uIn=I
z{#caM(bz4(!nP|rnFBa%==nfbme0+UTtpY$=J`UJHO-WZj)Z|uVRLL8mM*0zmo7LQ
zLW7#h+|fAgk(Z^KM`o(W<VhOs9u_WL2BQt-;;h(UupHxXNiIM5K+jRyUu_ZNz~#Me
z&GgL7xfVoaH(lPyVm}~XY#<#*t5O52rjnSkz2u7zET7ZC&$Y-*yE)cpUQczy)R?AH
zj9Sy~t{xMDj9#1MjEl0yJV=_hbljQwbYWOs<Fk_ftM*B`^s;$<Ru6y8O9Kb1&#*Sw
zUJ@5}(k$Qaj0aP@hf+5WrS=V_riN0pN_ApCsF`lmV7N1dW_;<vGrjs@O?%j3#?8hB
z@7P~$?pSyI<~5r(qa`z|-L1UxO!mMqvuP2vEo%}p$G^pcXN~S)!kXUi@L=vTRthG%
z?);{8YZf!X!fIyQZVoG(+gRmXrhX$*cw*eqQZ#4UQ8IU^=^8AR?L*y^1t4Vk^-E6X
zOT<mKjJOpuUY{=J@nV|F4>2y2wpxagS$NBA5w6`dy{zrKSjboz%~ZRWMeT8xyiPu0
zldezZTQ^;2%iFD^iCw+bZXCOA6_Z0&9N*I%zlBW{B_`}H7Zvj^o19!VbzpXUJ1dRm
z<M<91lL<@S_%t(1MXM|=f#b6o&e4|DDYTcN_L#Zjvo7ikv}m_P3NhZ_D!ZuHYiTxj
z{i=O?_U&Bme`D>+Rolx=c6@fJOQ!|%a6`Avnt7dV%tu-7imeA{ca3jeE~nnvZN_&d
z?CH#r3A?!-7kx!0SX5ViaD2B*v?xl)sgwy-*p0Q#wX1njCdX&eUe<8i%RVM-*-40!
z1_L9#EgvoYf5k}?{q3d-ktXa&-p}*_((;Zy^lT_l@=tJWHWVg~-$uA}aFcS&w(|;>
zLJU=7pKaP3XJ@A<Q-)9B(S%(ylCLp?4G}c4MTAxqRoPZXWEdL9BYoG~s^H3Yq9wck
zz$}|WQt&3NLKK^3W%Od}Wh}-#$<1wP&qkTEio)3bSktx4mjRi!>OnL3SZuu=9m&V&
z+An>%&53B3K@Hy*v#DlAM>ejd!~#31`lZ2zxR^(a(UDC&SZ_(>mcM~M`?W$qSa+e)
zM5tA>1jp%uw{02eX%aH!My^_$_iNK=Kk}<o9Ehj-<)~__P_XH`#XRk7TFa`v*dV;l
zOH25^+A%Ah@1<EAcqL88y2I>p)jQ~ik2Q7$|H`#aG*ed&b3Wqr4NtT+K8#yaGY1AD
zOAU%4Z;*)x1``*hE%mrx!N1h9{5gvIK(#FIUs#A$)M}BYL<2;}c!cg7X{XzEi#0pd
zb`f!1K2K!f5?Sk<?-6YXZeQU&9y~{oE04w}*3|4M5lR0H(04fY<mxqJ<8wvARSWAY
zzbV7R!HSdpD7g$Y36ELEmb{lWdc?*_(O#<JJ%x+j4gCp&2&$Tlho*P#+Bv;*x@I*q
zv;p&meQ53Hg|E|99P1|_F*O@?k8LCKk$di!w3^-1qIGAxS;|__QAC!rc;)N~-oTyc
z2v+XVb}=6ncHN|`&f2q1qidw-+K{d+z0%XKeH%igX4##}T1#Q(`Y2du9raj7H+4oG
z9gXMMOq8FN73iR5_oehY5Og!TIpX}Peszps>38hL%tp&pY;hv>5w^P6)$T1$PU6~)
zp3bO#!zvdutqE+%H9Jc&Egn`nw$iYyFg9Ysa&&S%LUfig$GoZ*p}IeLl&1BT_QR<e
zwZ}82XP5n(=~?)}D$Yt<{;A*Us{KKYE4cT&PdWC`vh-=YR$0ANOd}6b#RR*#e?Mi&
zim8{-SnC|YUTMb4!o&SV{;2f|hbFdnEZ*|AXr|sB7j*LBwJb#Jit0tPk%(s$#mkbJ
zt!L?iqM-f~f}5o}C^cB7m-M0+bUtH5W9K-I4ZPu@Lz(4BcE+*HFGH_>BGWq<+U@*+
zZ~%V@@bA{o$=d&VTJ!tVE1%d#a{F2iZS)q-ZL7<3nhtJdm^^%bTXv%5{Ikz-D8=f;
z(XKox_m6Mh`>GRLbylmM{+~{BGP$3I_)na1h^-C)n%`bYuf6wlyv1+G91(`jcz%*}
zyTsIL%5NzBBOQxLqk;OZ9=@^Oa_Z2D(nc&MIu%m7+=l9oIDloPztor094E?@t>uE*
zrMcd+QI|tbL!03GVC~RaF6S$?UT}4e;I5p(!MVL=%V$t28+ql*Dq1{Wt-Q{xly<C&
z{vEKv`_W?>#SHynvlX8ED68<zpJtiT)p2%I=h^aAk8ya_iOXZ~B<t&)d6-=e#8}T|
zWe&v{w>sbAvwklq9J{DK0*vG}yThL|^re7Ld%TLA^ABD-5b+EI6R*8lCZQG+HKbQQ
zUw*a1hZ0AKg;HFI;DaLllQ+esuYWqEd%wgFrH#T=uK_+2UQGxg!x4U#6T2PF$4od2
z5DKD&CL7+y&fCn_EAGnu(NJrwTXYRR4sxJA_c5RGv$8XP*dbYZ`g6XJ(fvj+_*BPg
z?K%G8nP-2FIzQ~Of3!OHkG<l-e^;z++JEWwfo!F)SE**sdR(ms7zV#`T3a~)>vNai
z-iK@Ou$=$>?*_xq6>iHz^lbyH)(kE>sf#`q0DUC@`aA&iT>$8V02ufZFk!y(xl<oK
zb@J6e1=tOiGyWOJ|9s-CbH88xnNH!$22S^y4*lL3VUPB!Q(k_DIP3I(2gm<AeF)8e
qb=pN{_%OS^I>s|=B1}?#u_@2;<(%LFt4yb6?jU3j)&1dq!u$_5vOzQe

diff --git a/lang/English/common.php b/lang/English/common.php
new file mode 100644
index 00000000..59632561
--- /dev/null
+++ b/lang/English/common.php
@@ -0,0 +1,184 @@
+<?php
+
+// Language definitions for frequently used strings
+$lang_common = array(
+
+// Text orientation and encoding
+'lang_direction'                    =>    'ltr', // ltr (Left-To-Right) or rtl (Right-To-Left)
+'lang_identifier'                    =>    'en',
+
+// Number formatting
+'lang_decimal_point'                =>    '.',
+'lang_thousands_sep'                =>    ',',
+
+// Notices
+'Bad request'                        =>    'Bad request. The link you followed is incorrect or outdated.',
+'No view'                            =>    'You do not have permission to view these forums.',
+'No permission'                        =>    'You do not have permission to access this page.',
+'Bad referrer'                        =>    'Bad HTTP_REFERER. You were referred to this page from an unauthorized source. If the problem persists please make sure that \'Base URL\' is correctly set in Admin/Options and that you are visiting the forum by navigating to that URL. More information regarding the referrer check can be found in the FluxBB documentation.',
+'No cookie'                            =>    'You appear to have logged in successfully, however a cookie has not been set. Please check your settings and if applicable, enable cookies for this website.',
+'Pun include extension'            =>    'Unable to process user include %s from template %s. "%s" files are not allowed',
+'Pun include directory'                =>    'Unable to process user include %s from template %s. Directory traversal is not allowed',
+'Pun include error'                    =>    'Unable to process user include %s from template %s. There is no such file in neither the template directory nor in the user include directory',
+
+// Miscellaneous
+'Announcement'                        =>    'Announcement',
+'Options'                            =>    'Options',
+'Submit'                            =>    'Submit', // "Name" of submit buttons
+'Ban message'                        =>    'You are banned from this forum.',
+'Ban message 2'                        =>    'The ban expires at the end of',
+'Ban message 3'                        =>    'The administrator or moderator that banned you left the following message:',
+'Ban message 4'                        =>    'Please direct any inquiries to the forum administrator at',
+'Never'                                =>    'Never',
+'Today'                                =>    'Today',
+'Yesterday'                            =>    'Yesterday',
+'Info'                                =>    'Info', // A common table header
+'Go back'                            =>    'Go back',
+'Maintenance'                        =>    'Maintenance',
+'Redirecting'                        =>    'Redirecting',
+'Click redirect'                    =>    'Click here if you do not want to wait any longer (or if your browser does not automatically forward you)',
+'on'                                =>    'on', // As in "BBCode is on"
+'off'                                =>    'off',
+'Invalid email'                        =>    'The email address you entered is invalid.',
+'Required'                            =>    '(Required)',
+'required field'                    =>    'is a required field in this form.', // For javascript form validation
+'Last post'                            =>    'Last post',
+'by'                                =>    'by', // As in last post by some user
+'New posts'                            =>    'New posts', // The link that leads to the first new post
+'New posts info'                    =>    'Go to the first new post in this topic.', // The popup text for new posts links
+'Username'                            =>    'Username',
+'Password'                            =>    'Password',
+'Email'                                =>    'Email',
+'Send email'                        =>    'Send email',
+'Moderated by'                        =>    'Moderated by',
+'Registered'                        =>    'Registered',
+'Subject'                            =>    'Subject',
+'Message'                            =>    'Message',
+'Topic'                                =>    'Topic',
+'Forum'                                =>    'Forum',
+'Posts'                                =>    'Posts',
+'Replies'                            =>    'Replies',
+'Pages'                                =>    'Pages:',
+'Page'                                =>    'Page %s',
+'BBCode'                            =>    'BBCode:', // You probably shouldn't change this
+'url tag'                            =>    '[url] tag:',
+'img tag'                            =>    '[img] tag:',
+'Smilies'                            =>    'Smilies:',
+'and'                                =>    'and',
+'Image link'                        =>    'image', // This is displayed (i.e. <image>) instead of images when "Show images" is disabled in the profile
+'wrote'                                =>    'wrote:', // For [quote]'s
+'Mailer'                            =>    '%s Mailer', // As in "MyForums Mailer" in the signature of outgoing emails
+'Important information'                =>    'Important information',
+'Write message legend'                =>    'Write your message and submit',
+'Previous'                            =>    'Previous',
+'Next'                                =>    'Next',
+'Spacer'                            =>    '…', // Ellipsis for paginate
+
+// Title
+'Title'                                =>    'Title',
+'Member'                            =>    'Member', // Default title
+'Moderator'                            =>    'Moderator',
+'Administrator'                        =>    'Administrator',
+'Banned'                            =>    'Banned',
+'Guest'                                =>    'Guest',
+
+// Stuff for include/parser.php
+'BBerr pcre'                        =>    '(%s) Message is too long or too complex. Please shorten.',            // Error 1
+'BBerr unexpected attribute'        =>    'Unexpected attribute: "%1$s". (No attribute allowed for (%2$s).',    // Error 2
+'BBerr unrecognized attribute'        =>    'Unrecognized attribute: "%1$s", is not valid for (%2$s).',            // Error 3
+'BBerr bbcode attribute'            =>    'Attribute may NOT contain open or close bbcode tags',                // Error 4
+'BBerr missing attribute'            =>    '(%1$s) is missing a required attribute.',                            // Error 5
+'BBerr nesting overflow'            =>    '(%1$s) tag nesting depth: %2$d exceeds allowable limit: %3$d.',    // Error 6
+'BBerr self-nesting'                =>    '(%s) was opened within itself, this is not allowed.',                // Error 7
+'BBerr invalid nesting'                =>    '(%1$s) was opened within (%2$s), this is not allowed.',            // Error 8
+'BBerr invalid parent'                =>    '(%1$s) cannot be within: (%2$s). Allowable parent tags: %3$s.',    // Error 9
+'BBerr Invalid URL name'            =>    'Invalid URL name: %s',                                                // Error 10
+'BBerr cannot post URLs'            =>    'You are not allowed to post links',                                                // Error 10
+'BBerr Invalid email address'        =>    'Invalid email address: %s',                                        // Error 10c
+'BBerr Invalid color'                =>    'Invalid color attribute: %s',                                        // Error 11
+'BBerr invalid content'                =>    'Invalid content, (%s) requires specific content.',                    // Error 12
+'BBerr bad meta data'                =>    'Unable to retrieve image data from remote url: %s',                // Error 13
+'BBerr no file size'                =>    'Unable to determine remote file size.',                            // Error 14
+'BBerr non image'                    =>    'Remote url does not have Content-Type: "image".',                    // Error 15
+'BBerr bad http response'            =>    'Bad HTTP response header: "%s"',                                    // Error 16
+'BBerr bad headers'                    =>    'Unable to read remote image http headers.',                        // Error 17
+'BBerr orphan close'                =>    'Orphan close tag: (/%s) is missing its open tag.',                    // Error 18
+'BBerr orphan open'                    =>    'Orphan open tag: (%s) is missing its close tag.',                    // Error 19
+
+'BBmsg big image'                    =>    'Big image',                                                        // Msg 1
+'BBmsg images disabled'                =>    'Image display not currently enabled in this context',                // Msg 2
+
+// Stuff for the navigator (top of every page)
+'Index'                                =>    'Index',
+'User list'                            =>    'User list',
+'Rules'                                =>    'Rules',
+'Search'                            =>    'Search',
+'Register'                            =>    'Register',
+'Login'                                =>    'Login',
+'Not logged in'                        =>    'You are not logged in.',
+'Profile'                            =>    'Profile',
+'Logout'                            =>    'Logout',
+'Logged in as'                        =>    'Logged in as',
+'Admin'                                =>    'Administration',
+'Last visit'                        =>    'Last visit: %s',
+'Topic searches'                    =>    'Topics:',
+'New posts header'                    =>    'New',
+'Active topics'                        =>    'Active',
+'Unanswered topics'                    =>    'Unanswered',
+'Posted topics'                        =>    'Posted',
+'Show new posts'                    =>    'Find topics with new posts since your last visit.',
+'Show active topics'                =>    'Find topics with recent posts.',
+'Show unanswered topics'            =>    'Find topics with no replies.',
+'Show posted topics'                =>    'Find topics you have posted to.',
+'Mark all as read'                    =>    'Mark all topics as read',
+'Mark forum read'                    =>    'Mark this forum as read',
+'Title separator'                    =>    ' / ',
+
+// Stuff for the page footer
+'Board footer'                        =>    'Board footer',
+'Jump to'                            =>    'Jump to',
+'Go'                                =>    ' Go ', // Submit button in forum jump
+'Moderate topic'                    =>    'Moderate topic',
+'All'                    =>    'All',
+'Move topic'                        =>    'Move topic',
+'Open topic'                        =>    'Open topic',
+'Close topic'                        =>    'Close topic',
+'Unstick topic'                        =>    'Unstick topic',
+'Stick topic'                        =>    'Stick topic',
+'Moderate forum'                    =>    'Moderate forum',
+'Powered by'                        =>    'Powered by %s',
+
+// Debug information
+'Debug table'                        =>    'Debug information',
+'Querytime'                            =>    'Generated in %1$s seconds, %2$s queries executed',
+'Memory usage'                        =>    'Memory usage: %1$s',
+'Peak usage'                        =>    '(Peak: %1$s)',
+'Query times'                        =>    'Time (s)',
+'Query'                                =>    'Query',
+'Total query time'                    =>    'Total query time: %s',
+
+// For extern.php RSS feed
+'RSS description'                    =>    'The most recent topics at %s.',
+'RSS description topic'                =>    'The most recent posts in %s.',
+'RSS reply'                            =>    'Re: ', // The topic subject will be appended to this string (to signify a reply)
+'RSS active topics feed'            =>    'RSS active topics feed',
+'Atom active topics feed'            =>    'Atom active topics feed',
+'RSS forum feed'                    =>    'RSS forum feed',
+'Atom forum feed'                    =>    'Atom forum feed',
+'RSS topic feed'                    =>    'RSS topic feed',
+'Atom topic feed'                    =>    'Atom topic feed',
+
+// Admin related stuff in the header
+'New reports'                        =>    'There are new reports',
+'Maintenance mode enabled'            =>    'Maintenance mode is enabled!',
+
+// Units for file sizes
+'Size unit B'                        =>    '%s B',
+'Size unit KiB'                        =>    '%s KiB',
+'Size unit MiB'                        =>    '%s MiB',
+'Size unit GiB'                        =>    '%s GiB',
+'Size unit TiB'                        =>    '%s TiB',
+'Size unit PiB'                        =>    '%s PiB',
+'Size unit EiB'                        =>    '%s EiB',
+
+);
diff --git a/lang/English/common.po b/lang/English/common.po
deleted file mode 100644
index 8d5a40cd..00000000
--- a/lang/English/common.po
+++ /dev/null
@@ -1,473 +0,0 @@
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "lang_direction"
-msgstr "ltr"
-
-msgid "lang_identifier"
-msgstr "en"
-
-msgid "lang_decimal_point"
-msgstr "."
-
-msgid "lang_thousands_sep"
-msgstr ","
-
-msgid "Bad request"
-msgstr "Bad request. The link you followed is incorrect or outdated."
-
-msgid "No view"
-msgstr "You do not have permission to view these forums."
-
-msgid "No permission"
-msgstr "You do not have permission to access this page."
-
-msgid "Bad referrer"
-msgstr "Bad HTTP_REFERER. You were referred to this page from an unauthorized source. If the problem persists please make sure that 'Base URL' is correctly set in Admin/Options and that you are visiting the forum by navigating to that URL. More information regarding the referrer check can be found in the FluxBB documentation."
-
-msgid "No cookie"
-msgstr "You appear to have logged in successfully, however a cookie has not been set. Please check your settings and if applicable, enable cookies for this website."
-
-msgid "Pun include extension"
-msgstr "Unable to process user include %s from template %s. \"%s\" files are not allowed"
-
-msgid "Pun include directory"
-msgstr "Unable to process user include %s from template %s. Directory traversal is not allowed"
-
-msgid "Pun include error"
-msgstr "Unable to process user include %s from template %s. There is no such file in neither the template directory nor in the user include directory"
-
-msgid "Announcement"
-msgstr "Announcement"
-
-msgid "Options"
-msgstr "Options"
-
-msgid "Submit"
-msgstr "Submit"
-
-msgid "Ban message"
-msgstr "You are banned from this forum."
-
-msgid "Ban message 2"
-msgstr "The ban expires at the end of"
-
-msgid "Ban message 3"
-msgstr "The administrator or moderator that banned you left the following message:"
-
-msgid "Ban message 4"
-msgstr "Please direct any inquiries to the forum administrator at"
-
-msgid "Never"
-msgstr "Never"
-
-msgid "Today"
-msgstr "Today"
-
-msgid "Yesterday"
-msgstr "Yesterday"
-
-msgid "Info"
-msgstr "Info"
-
-msgid "Go back"
-msgstr "Go back"
-
-msgid "Maintenance"
-msgstr "Maintenance"
-
-msgid "Redirecting"
-msgstr "Redirecting"
-
-msgid "Click redirect"
-msgstr "Click here if you do not want to wait any longer (or if your browser does not automatically forward you)"
-
-msgid "on"
-msgstr "on"
-
-msgid "off"
-msgstr "off"
-
-msgid "Invalid email"
-msgstr "The email address you entered is invalid."
-
-msgid "Required"
-msgstr "(Required)"
-
-msgid "required field"
-msgstr "is a required field in this form."
-
-msgid "Last post"
-msgstr "Last post"
-
-msgid "by"
-msgstr "by"
-
-msgid "New posts"
-msgstr "New posts"
-
-msgid "New posts info"
-msgstr "Go to the first new post in this topic."
-
-msgid "Username"
-msgstr "Username"
-
-msgid "Password"
-msgstr "Password"
-
-msgid "Email"
-msgstr "Email"
-
-msgid "Send email"
-msgstr "Send email"
-
-msgid "Moderated by"
-msgstr "Moderated by"
-
-msgid "Registered"
-msgstr "Registered"
-
-msgid "Subject"
-msgstr "Subject"
-
-msgid "Message"
-msgstr "Message"
-
-msgid "Topic"
-msgstr "Topic"
-
-msgid "Forum"
-msgstr "Forum"
-
-msgid "Posts"
-msgstr "Posts"
-
-msgid "Replies"
-msgstr "Replies"
-
-msgid "Pages"
-msgstr "Pages:"
-
-msgid "Page"
-msgstr "Page %s"
-
-msgid "BBCode"
-msgstr "BBCode:"
-
-msgid "url tag"
-msgstr "[url] tag:"
-
-msgid "img tag"
-msgstr "[img] tag:"
-
-msgid "Smilies"
-msgstr "Smilies:"
-
-msgid "and"
-msgstr "and"
-
-msgid "Image link"
-msgstr "image"
-
-msgid "wrote"
-msgstr "wrote:"
-
-msgid "Mailer"
-msgstr "%s Mailer"
-
-msgid "Important information"
-msgstr "Important information"
-
-msgid "Write message legend"
-msgstr "Write your message and submit"
-
-msgid "Previous"
-msgstr "Previous"
-
-msgid "Next"
-msgstr "Next"
-
-msgid "Spacer"
-msgstr "…"
-
-msgid "Title"
-msgstr "Title"
-
-msgid "Member"
-msgstr "Member"
-
-msgid "Moderator"
-msgstr "Moderator"
-
-msgid "Administrator"
-msgstr "Administrator"
-
-msgid "Banned"
-msgstr "Banned"
-
-msgid "Guest"
-msgstr "Guest"
-
-msgid "BBerr pcre"
-msgstr "(%s) Message is too long or too complex. Please shorten."
-
-msgid "BBerr unexpected attribute"
-msgstr "Unexpected attribute: \"%1$s\". (No attribute allowed for (%2$s)."
-
-msgid "BBerr unrecognized attribute"
-msgstr "Unrecognized attribute: \"%1$s\", is not valid for (%2$s)."
-
-msgid "BBerr bbcode attribute"
-msgstr "Attribute may NOT contain open or close bbcode tags"
-
-msgid "BBerr missing attribute"
-msgstr "(%1$s) is missing a required attribute."
-
-msgid "BBerr nesting overflow"
-msgstr "(%1$s) tag nesting depth: %2$d exceeds allowable limit: %3$d."
-
-msgid "BBerr self-nesting"
-msgstr "(%s) was opened within itself, this is not allowed."
-
-msgid "BBerr invalid nesting"
-msgstr "(%1$s) was opened within (%2$s), this is not allowed."
-
-msgid "BBerr invalid parent"
-msgstr "(%1$s) cannot be within: (%2$s). Allowable parent tags: %3$s."
-
-msgid "BBerr Invalid URL name"
-msgstr "Invalid URL name: %s"
-
-msgid "BBerr cannot post URLs"
-msgstr "You are not allowed to post links"
-
-msgid "BBerr Invalid email address"
-msgstr "Invalid email address: %s"
-
-msgid "BBerr Invalid color"
-msgstr "Invalid color attribute: %s"
-
-msgid "BBerr invalid content"
-msgstr "Invalid content, (%s) requires specific content."
-
-msgid "BBerr bad meta data"
-msgstr "Unable to retrieve image data from remote url: %s"
-
-msgid "BBerr no file size"
-msgstr "Unable to determine remote file size."
-
-msgid "BBerr non image"
-msgstr "Remote url does not have Content-Type: \"image\"."
-
-msgid "BBerr bad http response"
-msgstr "Bad HTTP response header: \"%s\""
-
-msgid "BBerr bad headers"
-msgstr "Unable to read remote image http headers."
-
-msgid "BBerr orphan close"
-msgstr "Orphan close tag: (/%s) is missing its open tag."
-
-msgid "BBerr orphan open"
-msgstr "Orphan open tag: (%s) is missing its close tag."
-
-msgid "BBmsg big image"
-msgstr "Big image"
-
-msgid "BBmsg images disabled"
-msgstr "Image display not currently enabled in this context"
-
-msgid "Index"
-msgstr "Index"
-
-msgid "User list"
-msgstr "User list"
-
-msgid "Rules"
-msgstr "Rules"
-
-msgid "Search"
-msgstr "Search"
-
-msgid "Register"
-msgstr "Register"
-
-msgid "Login"
-msgstr "Login"
-
-msgid "Not logged in"
-msgstr "You are not logged in."
-
-msgid "Profile"
-msgstr "Profile"
-
-msgid "Logout"
-msgstr "Logout"
-
-msgid "Logged in as"
-msgstr "Logged in as"
-
-msgid "Admin"
-msgstr "Administration"
-
-msgid "Last visit"
-msgstr "Last visit: %s"
-
-msgid "Topic searches"
-msgstr "Topics:"
-
-msgid "New posts header"
-msgstr "New"
-
-msgid "Active topics"
-msgstr "Active"
-
-msgid "Unanswered topics"
-msgstr "Unanswered"
-
-msgid "Posted topics"
-msgstr "Posted"
-
-msgid "Show new posts"
-msgstr "Find topics with new posts since your last visit."
-
-msgid "Show active topics"
-msgstr "Find topics with recent posts."
-
-msgid "Show unanswered topics"
-msgstr "Find topics with no replies."
-
-msgid "Show posted topics"
-msgstr "Find topics you have posted to."
-
-msgid "Mark all as read"
-msgstr "Mark all topics as read"
-
-msgid "Mark forum read"
-msgstr "Mark this forum as read"
-
-msgid "Title separator"
-msgstr " / "
-
-msgid "Board footer"
-msgstr "Board footer"
-
-msgid "Jump to"
-msgstr "Jump to"
-
-msgid "Go"
-msgstr " Go "
-
-msgid "Moderate topic"
-msgstr "Moderate topic"
-
-msgid "All"
-msgstr "All"
-
-msgid "Move topic"
-msgstr "Move topic"
-
-msgid "Open topic"
-msgstr "Open topic"
-
-msgid "Close topic"
-msgstr "Close topic"
-
-msgid "Unstick topic"
-msgstr "Unstick topic"
-
-msgid "Stick topic"
-msgstr "Stick topic"
-
-msgid "Moderate forum"
-msgstr "Moderate forum"
-
-msgid "Powered by"
-msgstr "Powered by %s"
-
-msgid "Debug table"
-msgstr "Debug information"
-
-msgid "Querytime"
-msgstr "Generated in %1$s seconds, %2$s queries executed"
-
-msgid "Memory usage"
-msgstr "Memory usage: %1$s"
-
-msgid "Peak usage"
-msgstr "(Peak: %1$s)"
-
-msgid "Query times"
-msgstr "Time (s)"
-
-msgid "Query"
-msgstr "Query"
-
-msgid "Total query time"
-msgstr "Total query time: %s"
-
-msgid "RSS description"
-msgstr "The most recent topics at %s."
-
-msgid "RSS description topic"
-msgstr "The most recent posts in %s."
-
-msgid "RSS reply"
-msgstr "Re: "
-
-msgid "RSS active topics feed"
-msgstr "RSS active topics feed"
-
-msgid "Atom active topics feed"
-msgstr "Atom active topics feed"
-
-msgid "RSS forum feed"
-msgstr "RSS forum feed"
-
-msgid "Atom forum feed"
-msgstr "Atom forum feed"
-
-msgid "RSS topic feed"
-msgstr "RSS topic feed"
-
-msgid "Atom topic feed"
-msgstr "Atom topic feed"
-
-msgid "New reports"
-msgstr "There are new reports"
-
-msgid "Maintenance mode enabled"
-msgstr "Maintenance mode is enabled!"
-
-msgid "Size unit B"
-msgstr "%s B"
-
-msgid "Size unit KiB"
-msgstr "%s KiB"
-
-msgid "Size unit MiB"
-msgstr "%s MiB"
-
-msgid "Size unit GiB"
-msgstr "%s GiB"
-
-msgid "Size unit TiB"
-msgstr "%s TiB"
-
-msgid "Size unit PiB"
-msgstr "%s PiB"
-
-msgid "Size unit EiB"
-msgstr "%s EiB"
diff --git a/lang/English/convertor.php b/lang/English/convertor.php
deleted file mode 100644
index ebca4650..00000000
--- a/lang/English/convertor.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * PHP arrays to po file
- */
-
-$fh = fopen("antispam_questions.po", 'w');
-fwrite($fh, "#\n");
-fwrite($fh, "msgid \"\"\n");
-fwrite($fh,  "msgstr \"\"\n");
-
-include 'antispam.php';
-
-foreach ($lang_antispam_questions as $key => $value) {
-    $key = addslashes($key);
-    $value = addslashes($value);
-    fwrite($fh, "\n");
-    fwrite($fh, "msgid \"$key\"\n");
-    fwrite($fh, "msgstr \"$value\"\n");
-}
-fclose($fh);
\ No newline at end of file
diff --git a/lang/English/delete.mo b/lang/English/delete.mo
deleted file mode 100644
index 6597bd8e9691f8fca8dfc14430312b9b6eff0bb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1003
zcmZuv&2AGh5H=A0f~ZPQ2yvJqAr*laf_exEL8xg{Rcb|4wos5bIGaggw6RxSry&o*
zYjES%XW<#(#*xq2O~Rj*Z@-!GWPUvJZKLv8;8cOTKnmOh&Vg{g16P0_zzyJM$(0L2
z+=9Fgz6QQm@<Z?j^lfm6vk$%sJ^^=u4?u|b<)RR$;IH5ickNQ)e+Rq{eG7aW{0zJX
zJ_f%BD{urp2P4${AcTM_E*I*&mmr3^LhcH19SC{FE~o6dB+_PJ7jkBEFS__ppHp(&
z*Nzh}jyX$b)SHReW;$63e>fF)Q{{{{L-DrcZaQ%)l^yHGd4o(gSM%1>CKY09%g|<v
zY7d&#uCpJJO&;{+8+N(2ra>K6e#CBPr`mlL%eI3GyWCZt8w8s?<})2!7p6m%dl@@r
z@>F^2;B=_WaH57RV^-teBGPl!A8Ye+P^9SfBI|}Psz(P$d#n7l=t;G0jc0?XvkXZ+
zfAWvBRB6+sWTafqzI76JWPRlqvJcqFJ(Jiz9-~3^p7zT^8pNi0D)-s2D{AaoytJoU
zRFAfCQ>gN_ow$VCMUDm)NfyJ4M@(T_G_w;LsWV0~HfKZLhS_1hq;o=XWG9|_oZ2Z3
zted;T#o^g_3Oj5F<ZQwy!3?ASZUUn9qvaOR{hTB|<u>GAIox9_{<<j2z#q$9*ra%b
zn()I&X`mgdpSPe<H7q_X*Q2>O9oe)r&{U@>3Z;zQSQ!igtGEpP4&5tspn9QAH1@9-
K0wQHd6p3HzG7?h&

diff --git a/lang/English/delete.php b/lang/English/delete.php
new file mode 100644
index 00000000..71dca256
--- /dev/null
+++ b/lang/English/delete.php
@@ -0,0 +1,16 @@
+<?php
+
+// Language definitions used in delete.php
+$lang_delete = array(
+
+'Delete post'            =>    'Delete post',
+'Warning'                =>    'You are about to permanently delete this post.',
+'Topic warning'            =>    'Warning! This is the first post in the topic, the whole topic will be permanently deleted.',
+'Delete info'            =>    'The post you have chosen to delete is set out below for you to review before proceeding.',
+'Reply by'                =>    'Reply by %s - %s',
+'Topic by'                =>    'Topic started by %s - %s',
+'Delete'                =>    'Delete', // The submit button
+'Post del redirect'        =>    'Post deleted.',
+'Topic del redirect'    =>    'Topic deleted.'
+
+);
diff --git a/lang/English/delete.po b/lang/English/delete.po
deleted file mode 100644
index 208f9bdc..00000000
--- a/lang/English/delete.po
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Delete post"
-msgstr "Delete post"
-
-msgid "Warning"
-msgstr "You are about to permanently delete this post."
-
-msgid "Topic warning"
-msgstr "Warning! This is the first post in the topic, the whole topic will be permanently deleted."
-
-msgid "Delete info"
-msgstr "The post you have chosen to delete is set out below for you to review before proceeding."
-
-msgid "Reply by"
-msgstr "Reply by %s - %s"
-
-msgid "Topic by"
-msgstr "Topic started by %s - %s"
-
-msgid "Delete"
-msgstr "Delete"
-
-msgid "Post del redirect"
-msgstr "Post deleted."
-
-msgid "Topic del redirect"
-msgstr "Topic deleted."
diff --git a/lang/English/forum.mo b/lang/English/forum.mo
deleted file mode 100644
index b0b3a1649e976c79f203ea4e3c0c3d235a87f124..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 866
zcmZXR&u$Yj5XKD@3d`U20zw>Ii31=xG!=(vLjW}-C{iO<BrPEI;_OZmx4U*^dt34#
zyb;Gf0^(WtoK2fjMjHJ*<MGVwet$OCelply_%pbNZ@|ys!5&>>>=w8IhMFhfeegMW
z58MH7g73iy?0}&@0q=lc!SGIkp{@YKorA9<{&k(Phu|6b3j7Ujg6lV`K2O01h_}E{
zzYRVH8(`?0fT8aph?WdkSeU)GJcqq*FV6uOv9QoDSa=_H4*gg=H;yvaDQ14o$HtZg
z>pAYqkxQ)_;ihjgo*M0~$sK|dq!Qyi_hzP2Ht;Gvp0mMuJ=@n8Z`pyOQ^%6Lv@#c6
zV+$8^JzIpXwbSI)vGqdptroApY(|MSN0fTe%fta$r;Ltym!zMP-QA6n&qL9+2$2^b
zrKgx9C%({$3Z>_%J?Xp{TB%(wy|F0TlX_Ch35g-e;!;QcR%V6LAI8;)(WqwZ<XzP7
z^*gKi_1bpS#`lv(*ZB-XJ^k>nXSr0m$<wK{j(lr>*cFXcU6?*5D>^zgnbMP(H%7`|
zEE03l(KqplG}&s$#89R@uh$y2H@K-nF)*b~sa?&8c{OAyS<LW9%YrM%DTr5N-%ZJ-
qC7zbnV%vOvNk+)U{S>v8#1OTbd_~&0(pJ;yKl;Wifv+_BU+%xIH`nR_

diff --git a/lang/English/forum.php b/lang/English/forum.php
new file mode 100644
index 00000000..60dbef30
--- /dev/null
+++ b/lang/English/forum.php
@@ -0,0 +1,17 @@
+<?php
+
+// Language definitions used in viewforum.php
+$lang_forum = array(
+
+'Post topic'    =>    'Post new topic',
+'Views'            =>    'Views',
+'Moved'            =>    'Moved:',
+'Sticky'        =>    'Sticky:',
+'Closed'        =>    'Closed:',
+'Empty forum'    =>    'Forum is empty.',
+'Mod controls'    =>    'Moderator controls',
+'Is subscribed'    =>    'You are currently subscribed to this forum',
+'Unsubscribe'    =>    'Unsubscribe',
+'Subscribe'        =>    'Subscribe to this forum'
+
+);
diff --git a/lang/English/forum.po b/lang/English/forum.po
deleted file mode 100644
index 4a2b8880..00000000
--- a/lang/English/forum.po
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Post topic"
-msgstr "Post new topic"
-
-msgid "Views"
-msgstr "Views"
-
-msgid "Moved"
-msgstr "Moved:"
-
-msgid "Sticky"
-msgstr "Sticky:"
-
-msgid "Closed"
-msgstr "Closed:"
-
-msgid "Empty forum"
-msgstr "Forum is empty."
-
-msgid "Mod controls"
-msgstr "Moderator controls"
-
-msgid "Is subscribed"
-msgstr "You are currently subscribed to this forum"
-
-msgid "Unsubscribe"
-msgstr "Unsubscribe"
-
-msgid "Subscribe"
-msgstr "Subscribe to this forum"
diff --git a/lang/English/help.mo b/lang/English/help.mo
deleted file mode 100644
index 2d7673164737d5e1eb6a7b3ff25813f9d4072fa3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4255
zcmb`JPl#kk9mi`mCT0?i`J+b7#@aO|vu3)Jol#t8Ga=4qW@lhFj=QraK_XOlS9ib6
zdsWZ(XJ^}kC<tD1i;71f;z{sg1kr;8MDP+sFqbF_9z=p*z>5m;^Q)@v>DlbTg*;xp
zZ&kgjU;X}k>sR%syKeff;#r~GNBQY7rOtyp@8-iZzDcQ@!3=yKSSI{Bcq{D}5`GW-
zAnhN3yy|DE{}%~=4c<=wtKc2r>)>7B8>#;-kXPOQ9;I#r?*wJN<Ei~H_yO9V1sA|A
zP}aYc{y&#6OW1<E>YIFI-nUc#_fz|apvZX{6#IUa{{IG)b$<`O7yJu&3;1_X^nVk)
z8+;3t`FAr}^td0C_F`(Ur1lyp_HKdi2cJpp5h(HxK#}(i@J{eMp!o4epy=^SQ2g{;
zP~`s++$BbT19{cw5b_`J3Gij`F_aN~-c0ykP~_drWbyBP;7`C4pve6lD0cl76g~f$
z`i~I=>Awe*c_+Z1gAanD*PlUN^$$Mc-+zNogSRp1D_|eI2Ye;rYYE=~ah*Db5Se!i
zD01!vH^2wL6X5fp*!Kc>7JL!3;H#kc?K3!2;_^873b+Z1A8*A7Oi;%`@xx+jFQ@ie
zYM%#B^Zz0!arqX=t6t<I@?Qc^fj<WC2mb(m1pHURJ5c`Pv`>MT!EKPR%pTcKk5C?@
z$h><gpQMP6pP-0t)92AtkvPfoA<Bm-h*S?y<Po1tpHEQ{-IggQDWb2Y9H)qHmnid(
z_*Wj;--{Gn7<30hj0J^z4@-sTqY=XQV|*nJn5{Y#@$EyDcTvRu;+rl-d?=5^TvCT{
zM))N@4$u1fIX|!}g3jE~>(fVC%W6Gut#0hqMy>mNa9CT?tsB@X&zw!YL6m%gAQft1
z;*&PF&2-d8QI1WW)zkK7-d<f_*S%g}W;V8N)Rr}a%#Gq&TQ)D%c40=gj&iqMZL68M
z?Z)I;KMvi=+<vW%8|W;ISFuCPqFOg`eyE9Fn0i=Wo~y5fdaW)@v@J}QYcm*BwyxDv
zXeWA`(UE$T`^DBb$y1?Ps|a&{qXl|dU7T8fsmSuo)+%8fd#S0iecNfqm2XGmXxko3
z>!GjOLWOGSaa5=^zRdcu+Ts~%m{vEF+|E^_;JtBH>oE@1CH_>GuL)pT`9a%9n`uRx
zoM7o3-yQaaIQ9J1!=8cd<M8~NaYtu;HF!s+#hSxeYBz5ylXo_KRn)86m7!U$EuYn~
zy0+-_i8X!t)Y*mI%0F-WO=o-1`I4>b%)3>+X-zY>)%yCv?icnt=PH`?cb+tjUDfn;
zF4`-Z44roEn7ZlgRmRo1X?(??9pgqVzUb^(Q_M-!kC{P{xhIBkiC(YktI^{N7q%~K
z9Ik)5`{=?s?;7inIw@IHX!S^$o6Mcn{jsTP+pJyQ+w7b<94D&}ZPnRuI1-kx>NCBp
znJKcWty_4ebKW{zMICp&9b}NTd#3wo{={bIl5eZNJr~zl)p3!ub!R)6&7k`}&v6`H
z(0(WkDooRa-35zvGd7JjmDNxOVtdirjiB+^>fHN%nG^O(=IDbxfr4E<%^0=r8JUT6
znNpj=>axmQKPw@Gsh8q*to0RJO>~_>cT=&>lHS_8u!9_%`vZ;K$TC^Z<av-~uCVn?
zFSlv2w6k5^RBf=QmQ}}0M{U%XNkvzEUg8E}gZE&&xe~20J$70%k-^plvA)uSte#t;
ztDp6)?i*~eD3J~4%#3p|bT)~4D=8%?o7-Wd3sa3~AB+he_UZ}JWS?SOLHdAZGCf3-
zUlr~cIn%V2?cQjXeVQdid8js#Sk{3J#F`W;tJY)RlB^4}PfS<<9f`C2Nsfv`Nn~9e
z@<ozGBoDHNltV0IJ~ktIaE8po4DWnhnm*%(5I+Pr{AN4r9wUZBxW?b!M0<n~YFO4)
zA@LC9+QSbK+*R+up)d><9T*fLs>uX&is?W6lweLx&I*o{U@_JOQk$~02DXk+yb)#j
zadPcs2+TCHzO*iF7vU+w#P&GW<hY<ATlZR0zZ^Wt@wkFLkhcSI=#&mnq0ZoQSKYu7
z_H1HgU$Pr}G8}PO8@)U5{k9<euoYxi9X+l%Fxxt)j#)#}fImov)T?TbtsX_DohRg&
z_m-sZ=&oy2SkVo+junR?;m<EJo1-?anxbUuhMugk1^Meboy*tjT<QKl=WohDqB7og
z>13W+Rd`r$23L%WWSyqHuI9ASHmZjkB&YF8<O3zP^^{NHoa&}STx}mETRg;s&feLj
z`8_vfTO1*Lo6a40_fT_GJe-*zK)6<#s>%8-=`o6%kHt(@*qxGg>XI{e81}x=j;z~#
z`<)`GoO74Zi{Vx@)Ep#Oo08e7rC@hR=^^%g@5oz{ueeBXEs+@4@rEMoinl6V*^=83
ztP96&7!=ZrjI<LH%IutAXy1=q_BBL_hYv|Ol`3i>FDIphAw|qTaivxD&fSELtS(7u
z{-ld}K&Uc3?-Da^=&t1Ab*X2GBZt^Tb9!-(kOE{EbPw-KawwCixeW1#;K;$cI{(|X
zMbB2(o7ig+C<*p$A|pqxk@*z2tW^yWj3ll~h{D=LE^{#=a!D~{?5fsZmK^fjENfcw
SmnZ29W1NoCIpFrm=KlkVWs<i5

diff --git a/lang/English/help.php b/lang/English/help.php
new file mode 100644
index 00000000..2c3ff0fc
--- /dev/null
+++ b/lang/English/help.php
@@ -0,0 +1,66 @@
+<?php
+
+// Language definitions used in help.php
+$lang_help = array(
+
+'Help'                    =>    'Help',
+'produces'                =>    'produces',
+
+'BBCode'                =>    'BBCode',
+'BBCode info 1'            =>    'BBCode is a collection of formatting tags that are used to change the look of text in this forum. BBCode is based on the same principal as, and is very similar to, HTML. Below is a list of all the available BBCodes and instructions on how to use them.',
+'BBCode info 2'            =>    'Administrators have the ability to enable or disable BBCode. You can tell if BBCode is enabled or disabled out in the left margin whenever you post a message or edit your signature.',
+
+'Text style'            =>    'Text style',
+'Text style info'        =>    'The following tags change the appearance of text:',
+'Bold text'                =>    'Bold text',
+'Underlined text'        =>    'Underlined text',
+'Italic text'            =>    'Italic text',
+'Strike-through text'    =>    'Strike-through text',
+'Red text'                =>    'Red text',
+'Blue text'                =>    'Blue text',
+'Heading text'            =>    'Heading text',
+'Deleted text'            =>    'Deleted text',
+'Inserted text'            =>    'Inserted text',
+'Emphasised text'        =>    'Emphasised text',
+
+'Links and images'        =>    'Links and images',
+'Links info'            =>    'You can create links to other documents or to email addresses using the following tags:',
+'This help page'        =>    'This help page',
+'My email address'        =>    'My email address',
+'Images info'            =>    'If you want to display an image you can use the img tag. The text appearing after the "=" sign in the opening tag is used for the alt attribute and should be included whenever possible.',
+'FluxBB bbcode test'    =>    'FluxBB bbcode test',
+
+'Test topic'            =>    'Test topic',
+'Test post'                =>    'Test post',
+'Test forum'            =>    'Test forum',
+'Test user'                =>    'Test user',
+
+'Quotes'                =>    'Quotes',
+'Quotes info'            =>    'If you want to quote someone, you should use the quote tag.',
+'Quotes info 2'            =>    'If you don\'t want to quote anyone in particular, you can use the quote tag without specifying a name.',
+'Quote text'            =>    'This is the text I want to quote.',
+'produces quote box'    =>    'produces a quote box like this:',
+'quote note'            =>    'Note: If a username contains the characters [ or ] you can enclose it in quote marks.',
+
+'Code'                    =>    'Code',
+'Code info'                =>    'When displaying source code you should make sure that you use the code tag. Text displayed with the code tag will use a monospaced font and will not be affected by other tags.',
+'Code text'                =>    'This is some code.',
+'produces code box'        =>    'produces a code box like this:',
+
+'Nested tags'            =>    'Nested tags',
+'Nested tags info'        =>    'BBCode can be nested to create more advanced formatting. For example:',
+'Bold, underlined text'    =>    'Bold, underlined text',
+
+'Lists'                    =>    'Lists',
+'List info'                =>    'To create a list you can use the list tag. You can create 3 types of lists using the list tag.',
+'List text 1'            =>    'Example list item 1.',
+'List text 2'            =>    'Example list item 2.',
+'List text 3'            =>    'Example list item 3.',
+'produces list'            =>    'produces a bulleted list.',
+'produces decimal list'    =>    'produces a numbered list.',
+'produces alpha list'    =>    'produces an alphabetically labelled list.',
+
+'Smilies'                =>    'Smilies',
+'Smilies info'            =>    'If you like (and if it is enabled), the forum can convert a series of smilies to images representations of that smiley. This forum recognizes the following smilies and replaces them with images:'
+
+);
diff --git a/lang/English/help.po b/lang/English/help.po
deleted file mode 100644
index 8947956a..00000000
--- a/lang/English/help.po
+++ /dev/null
@@ -1,165 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Help"
-msgstr "Help"
-
-msgid "produces"
-msgstr "produces"
-
-msgid "BBCode"
-msgstr "BBCode"
-
-msgid "BBCode info 1"
-msgstr "BBCode is a collection of formatting tags that are used to change the look of text in this forum. BBCode is based on the same principal as, and is very similar to, HTML. Below is a list of all the available BBCodes and instructions on how to use them."
-
-msgid "BBCode info 2"
-msgstr "Administrators have the ability to enable or disable BBCode. You can tell if BBCode is enabled or disabled out in the left margin whenever you post a message or edit your signature."
-
-msgid "Text style"
-msgstr "Text style"
-
-msgid "Text style info"
-msgstr "The following tags change the appearance of text:"
-
-msgid "Bold text"
-msgstr "Bold text"
-
-msgid "Underlined text"
-msgstr "Underlined text"
-
-msgid "Italic text"
-msgstr "Italic text"
-
-msgid "Strike-through text"
-msgstr "Strike-through text"
-
-msgid "Red text"
-msgstr "Red text"
-
-msgid "Blue text"
-msgstr "Blue text"
-
-msgid "Heading text"
-msgstr "Heading text"
-
-msgid "Deleted text"
-msgstr "Deleted text"
-
-msgid "Inserted text"
-msgstr "Inserted text"
-
-msgid "Emphasised text"
-msgstr "Emphasised text"
-
-msgid "Links and images"
-msgstr "Links and images"
-
-msgid "Links info"
-msgstr "You can create links to other documents or to email addresses using the following tags:"
-
-msgid "This help page"
-msgstr "This help page"
-
-msgid "My email address"
-msgstr "My email address"
-
-msgid "Images info"
-msgstr "If you want to display an image you can use the img tag. The text appearing after the \"=\" sign in the opening tag is used for the alt attribute and should be included whenever possible."
-
-msgid "FluxBB bbcode test"
-msgstr "FluxBB bbcode test"
-
-msgid "Test topic"
-msgstr "Test topic"
-
-msgid "Test post"
-msgstr "Test post"
-
-msgid "Test forum"
-msgstr "Test forum"
-
-msgid "Test user"
-msgstr "Test user"
-
-msgid "Quotes"
-msgstr "Quotes"
-
-msgid "Quotes info"
-msgstr "If you want to quote someone, you should use the quote tag."
-
-msgid "Quotes info 2"
-msgstr "If you don't want to quote anyone in particular, you can use the quote tag without specifying a name."
-
-msgid "Quote text"
-msgstr "This is the text I want to quote."
-
-msgid "produces quote box"
-msgstr "produces a quote box like this:"
-
-msgid "quote note"
-msgstr "Note: If a username contains the characters [ or ] you can enclose it in quote marks."
-
-msgid "Code"
-msgstr "Code"
-
-msgid "Code info"
-msgstr "When displaying source code you should make sure that you use the code tag. Text displayed with the code tag will use a monospaced font and will not be affected by other tags."
-
-msgid "Code text"
-msgstr "This is some code."
-
-msgid "produces code box"
-msgstr "produces a code box like this:"
-
-msgid "Nested tags"
-msgstr "Nested tags"
-
-msgid "Nested tags info"
-msgstr "BBCode can be nested to create more advanced formatting. For example:"
-
-msgid "Bold, underlined text"
-msgstr "Bold, underlined text"
-
-msgid "Lists"
-msgstr "Lists"
-
-msgid "List info"
-msgstr "To create a list you can use the list tag. You can create 3 types of lists using the list tag."
-
-msgid "List text 1"
-msgstr "Example list item 1."
-
-msgid "List text 2"
-msgstr "Example list item 2."
-
-msgid "List text 3"
-msgstr "Example list item 3."
-
-msgid "produces list"
-msgstr "produces a bulleted list."
-
-msgid "produces decimal list"
-msgstr "produces a numbered list."
-
-msgid "produces alpha list"
-msgstr "produces an alphabetically labelled list."
-
-msgid "Smilies"
-msgstr "Smilies"
-
-msgid "Smilies info"
-msgstr "If you like (and if it is enabled), the forum can convert a series of smilies to images representations of that smiley. This forum recognizes the following smilies and replaces them with images:"
diff --git a/lang/English/index.mo b/lang/English/index.mo
deleted file mode 100644
index c8ab6fe21fdf82315b9166c34d7355ba818d7dc1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1064
zcmZvaJC74F5XTK1ujP1GJPIR$#1#$%QA8VpP(pG<%H2iB9-_DcC+p-EcJ0XaavUW!
zqCleI3((Nf(NR(G1*rH0lyp$=_j>nUI!mLUXFQ%6d*;`Lxeo;E4CE^0E#xBPAH=Ok
zhX@J4K6na@N<ITmLr=lu;Oo-<rsO+t9`=u={s}w={Y%NO;7RD;K<D=Z9729V&O=`~
zLdZF=37!Q9ptG-oCqM~a1~<V=;QLbl3|@!+9dvd523_7ipo{kxyaLY85rS03yPcm~
zFcoh)T4;nE2H{@ZcR8!&>UMwO{>9Z^thVAhriq*=;<v_fYe+Yn*)2M9hh#Aq#u}<*
znn*zgiF`q=BFkbEW||wJ$+DtqLT3tY<=(1UGOiToW5|lXANi9t*nC>I+m1d=bInuM
zQ#vytm9s)MtvgNXx2>C!UTe|%LNgd@^<0cC>&NT~A|y(Nv?sXT5W3wChAR>4XsEEW
zhun&g!p2s`%fz`>rU5sWMVd>Ka;r3)23$^aJ{2qyJlhqK-s5qW$OjXjVl=8LJ-r_+
z^_RLk`RldYK}Sg|B%*H3kkpD-_SP)riEPsG2G>T|)>_nKjU7LieIhjL%CU+QISpxJ
zl-TV;LMmkNlr0J=w6AffM4VV!uQh6SapG0>Smk;wIzC58eUh@NuD?1fK4Vv#6JuSI
z$`LSBxTe?k_B*6EOx5$SYPuFv+!b2HMgI$*NLijznP($3wwi_mPyB2gc(gAtMgZCU
T;DluV<Wvt@-CIpHOU2#);DZp(

diff --git a/lang/English/index.php b/lang/English/index.php
new file mode 100644
index 00000000..2089a2bb
--- /dev/null
+++ b/lang/English/index.php
@@ -0,0 +1,20 @@
+<?php
+
+// Language definitions used in index.php
+$lang_index = array(
+
+'Topics'        =>    'Topics',
+'Link to'        =>    'Link to:', // As in "Link to: http://fluxbb.org/"
+'Empty board'    =>    'Board is empty.',
+'Newest user'    =>    'Newest registered user: %s',
+'Users online'    =>    'Registered users online: %s',
+'Guests online'    =>    'Guests online: %s',
+'No of users'    =>    'Total number of registered users: %s',
+'No of topics'    =>    'Total number of topics: %s',
+'No of posts'    =>    'Total number of posts: %s',
+'Online'        =>    'Online:', // As in "Online: User A, User B etc."
+'Board info'    =>    'Board information',
+'Board stats'    =>    'Board statistics',
+'User info'        =>    'User information'
+
+);
diff --git a/lang/English/index.po b/lang/English/index.po
deleted file mode 100644
index 1413e4ae..00000000
--- a/lang/English/index.po
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Topics"
-msgstr "Topics"
-
-msgid "Link to"
-msgstr "Link to:"
-
-msgid "Empty board"
-msgstr "Board is empty."
-
-msgid "Newest user"
-msgstr "Newest registered user: %s"
-
-msgid "Users online"
-msgstr "Registered users online: %s"
-
-msgid "Guests online"
-msgstr "Guests online: %s"
-
-msgid "No of users"
-msgstr "Total number of registered users: %s"
-
-msgid "No of topics"
-msgstr "Total number of topics: %s"
-
-msgid "No of posts"
-msgstr "Total number of posts: %s"
-
-msgid "Online"
-msgstr "Online:"
-
-msgid "Board info"
-msgstr "Board information"
-
-msgid "Board stats"
-msgstr "Board statistics"
-
-msgid "User info"
-msgstr "User information"
diff --git a/lang/English/install.mo b/lang/English/install.mo
deleted file mode 100644
index 1052a5282505b5b50a975dbac3799dc91ed6dd13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9441
zcmc(kS&SV=6^1(`0b&A#gq;9olVNO_xsG=;UdW7>WMC#9>~R)C2t9r4-rKlu_och9
z#}h#S<q5G!2$4iY3IYiM4+sGgFA)zQfgleE1QJ4Gd4nLaDDZ$lV)@Rg>SY!?@PN2-
z&EH#9ojT_~OO=0h<29cS_}x#tnRd<9LGVHF_t)}=-_y?vf|r87178UK6TAt${`o=h
za?pS;0uO=LgQvk4fam=E1K>-zPyGEu;5P0*3i2;_gg^5Bv!L|*n#XT}FXsLS;48qN
zgCgHE;0@r5u5<lf559)`J)p?72)+yq{rgo=<o<}ie-wNr_g@A@?(g{bKlbl`4a)e>
z_~*|-Sdr@nQ2N~r%DNALGT#FDT<|@h=&A4DzaM-R_n!hq?yrD1f=_|c@0Xyc_!&_8
z|JCC^K~x-E%cO!Y^!PH5uLb4%36E1A_j#Q0IP38ak7q!J4(<YF+z^y?#-Paapnv`e
zkB@+;Ab0|leqRDb{%?TN?|Y!=?`I$;34R00IDZ1gZdXGFd43Zp-`xz#dfyDn`#t{o
zEGYI_0{Iubn?Ewo1^@gZQ0D&_DDpfCie5kGpFipGdmex6@fRL{>+#Q^tot7zA_mto
zsqo|_;L=q=FbRtNE+MSQ^Knq#KMsoBzXtLzc#1zc-~Sx^3-=2s<4xS(28p}eUqJZR
zf<FR9?mvQOz`udp!FiM<^I!0|3W`1+26up;0xy8y1Vzs~5K8*(19ySv!PkQy1cmpX
z1>XQZ35wjm2F0KL0E*oI0!8juvKV<k3CjBepp1XJe|`@re%1q}-$USD@KJC#_!Rgi
z@bBP#takz@5I^`ZokH+2@ICS#WU0Y@3?lNTpxFH}P<Z<UI0t?K+y_1lo&;~ksNV)d
z@Dt!0UL6ESz^{Ynz(0aB;2ewI4}Ji=OWuQ1;B`3Jqu@dCqu>ugmL9wlW5_x)P{#QX
zC_MNn_(|{=pztbvowL^^P~?9Y{4V$i$S1+OP`dE>L69W|4}%tb927fWWt^R^2T@Vb
z0fnb0!D;Z_py>Z&AQTKf13nKuei4-CU)}D;`Ig7;gVO&ep!EL(DEfL0Bw@<n3@G-=
zz*FGo!Mnky!S92&L5f4*b+^C~a2C7@6xrk_91#1+@2msm$#eYmtsp8_+ljow0nxkY
z;vntKG=>b`LKC|z(T>rM(5|70?&WvdLC^t3|Lvcw?|A!xzZQMo=dZ;UV&?<2J881k
zx6{OiduWGgb2QP3{BEKhrM;1M4-K`ceF4=Yv``)|gKv|E{NCX}^>?1@MH*&TyW9(+
zQss~VPte{;6Wv0+V1g#RxS#e`+9XZ<S$=0|SJQ-_^1I!E@_pW4w?X_#ezOkrFYXa6
z&|W~>NfRHEpV(gb(EbT8@1VWQKfKK&RAA8VFizv5%)>IyQd8J+JZeA8^7VJd4#POv
z@N8VzJPn6-{o^8-O>AD8@M2ho45K$u7!CMNug9Y#3%lIpHtepMI4#OBNi0v&G#jUp
z9on=EW=A6%<{`JiTv%9h{_H|9mxX!PbZrsk@kj*sPn`JfZ5fw|4NeTgv~Nwq-*MQN
z`z&J+Ki9K9=fhqWoXFB%oDa<?EQ-}E?*=F5Ou06)Ce2E7F-&5fu*MY;50P!I-SVO8
zwAlDgHMQaUQEq$jrRK{)R+Q_%TYuL`Qq7AAE;8}vj!q}_d?I%<Pi?uAwik|*vQbF&
zpeWZ+<H?q)PiCvB7|ukZmVRe67@1zoN2l^U%dyIak=8$U<LR>^ICTl?#cAK5yae6J
z0KsV+mIIs5&6#<}2vuY2ac`U?ZMrla24P`VtW7KX!ll!38YX(5k0YT<5!`N5o9n|~
z=8Y8GKDI^a{uaSJMmKvrRCvJOAM$wE;a&&(9PD@Czdh*gd=Kf6W>6>V^|(~BSJ>!%
zF^pkQDttFXTNFatMLS%vc>((StjhvQbhTJr@p8>Hia4F+<6&@TW|+=iV!T3E&Vv<o
z9p@ZN6`!k%LKzKjqd~Bwlr*_jW_5$J_I=|xN2ApRMz;yK<HQ!hIh)w1G+j@};M^d?
z^=q1*BLb9_Rf1);w&#5N#xr0UTbL*;Z9mJ`0=>ghEJ!a$_(rfihzrBN_m25AG^O-#
z-<<cs2m{uadz;IB&E@{)@<4NWFu2<$QARYoJI|n|3wZZtV-x1q<l{6I!aAxhC1Z#*
zjkbryj7dj&TO8Ya#JJ02J5#g$nAx-I$hM_CdoLQAp6^cIg)K41Ok=NYOJ|m+PY?!$
zpwsxOoiRL{K5H+=@@e&GAuP)2WrAUmi23<w!3VbKWg8A#BbuY3ME2Wy&Y4zLI$7R7
zzHM=S@l-Sap3be?h;7h=QHcvP=<!mydz8SzBPJSzIl<%D`Q_8ohnw$Y_MXkBPo+`T
zMHMsV@Jd|Pg3J&Bx7{=Cd`x9r%4|0-&7RKT&VJsw+v#)JIFBshS>~8AZjyEaVcE}~
zjwXw(5)x1Az}8A|87_2`REJfMFAuCwOr{H~BP1oH6eb$yIqD$3NNiutV~tGPkM8#U
z%zV$R!G+Z@Ep?K@lsFZGNdV*0B{f3?i*rMytY(RacyghAhr-#y>gOn?9E9@6wgfq9
zhsP(1qq_kSsuIJjteK@dmO4h*7=<ZOLy}G8avGBt;l+Ace!>_D7`cbZSXXO~og#s1
zXZIP+p~bF_!DAS1m~~|-7)Ip^N25F&<uQ}B`j2crj0=q`9nlICb+hqGIn@ks>!Cx3
zI_p%f>Ay9|f28r$kaJll{@u8Y2-u@Y(6UA3vw5;Mbp<`D)-lv3W&SVMe44!IDNz{o
zNG0R>(v1s>oov;14MZ;`oVgVKKj0eaMA-?)BvC)$I11S{ffK@1iI`h+F@{u<oskqI
z-`5Km2)#7Fx)Hlm6}#&ZAtgHYuZ0sW|HGpzs_m9kH72)of_e3YVPTT^f^FFsg@hX`
zL&yALkd2eB>1PBvGayYJ+tKOlj?=EaB*n;%<5Um!=<X2TA<I%*c7jt{mEpL#30uXb
zkuN*#5>w&=6{gv_8kbCi1LV}Z67dPS#b6i7TYR`pL`^##qZz3pS(Fh*qO!BOQZ+k^
z@n}SHEX*CtiwnE{+sah}MOD4J^0%oSMEI)GmEhD>mr-u5?;_IT%Nr`Sb{Fidg+g2w
zHtA`w!LAY!RxGUTY_5qXCyGf4RuVTuR~6UgfL6<GBUE)l9j7r%w<#B#xn!wQ_SQPD
zdijy6TVFl;dZK0O`h&|B$N%4|dLix)B!H6vBue{S-3cyRVQ*<Q!hb=@+s$l|PC93j
z7-OZj?ocQ-hSu6!(#5lU-^(O2)nyJgwQz|sp@3($?al<VUh$Fc+6)Actm{}%xh_Uw
zGAaFBXs)&^!WQo{k$Uscq61BZO%=OU2p|`@&q9cX`<hW~iBq^`k@d<|snO`>>5kOG
zD;{J~G#;(VlCqSqb2H5Nl3qeGxBCz-6s-W1yMnjS>{jP|v{3odkPTBjB0feLLNG_K
z)!Q$)5dKy?oNCg)&)MzN?4<B4Zj>;;^(Ls^>TK8zZP(&p7)k-Ndbt2e=wuzTbPZmt
zh}bC+vlBEE*E7`0#9$;{*-*s~qBXkvS1y5|3fTcW_SCPdZC4dIw%CxhTvnqF^_y-`
z)Of93erNqQZ8njO9V>7fZL><a@I;NImZlVv6qgc+rI?h6?qYXkj}F@w&3T0eN{#C(
zKvQ8+1k3q>#?VBntxm8QlBe`rr#!iYBqv-I7B&%Bs23XNbbRXixbcH4DbmrTUP=;2
z7hH`%P#%{hOVJoCChS&waiWK0YVV58&fKj8Q>C?T>IxON&`zETc}C=Jis8+Pu5Ij2
zpyh$Mg;oV_Q2ec#daC6Ot1-4BdTb)=tgnAZ8QWg(A8_|FiTw(^^&3ze%7>VaxtoOL
za;-V{j)l0iQ)Y3EE2Y&EyU2cSx$Ok^vI<{RAY)a@_qF`hV8U@gFVBX~f~$5#k6ETn
z+%rjr%H_~S<FDH^WcdXbcdO(jo>GY=W4PS|YWEs#DJn}<oZL$)0aZt7r$@6h?x#L{
zxrObbjB4#m7@2*lspC`Q(`^$<loWmv6k$#!pOo)4<w^6-kz@rNFRekCTsGVhL7S)!
z6@~q-R`7z?A~zacvE{0q%IsCm?>!(><Y9z2QT4GKQ<4(N{c!|>Gly7$^C&_}X%24g
zahB6TITgV*`K;<n%}7{}2t(7Pogyydi_~}i+(j~^T8N#`(5EwBsdmhg3tmlJt};~;
zu2r+t11RPFsGed|l2m-5U7hoI?Ksl88l*n(X>2kf2Tpn#REG}D+8SNlf=WB2WDN6|
zeW|#-hN~gFbbnG*i(g`*u+Ix;+n!xDoC1tF9wBb|QzT)#E}$4k5hqF;e6k@URKPgw
z4#q@2B51MQ+(}MJvc8T^bQ@4yn@r9feGJh<hvqn${%p4s%#+$gzH!lk!r$>mmxyH5
zDOPi}<$0Et*z8Tv^Tn8Lyqpg=e&^Su#kDFZOxLOmU$L9SB6Mk#UlrqMkZ~pE>V|&P
zSeE3$GS!q*rU@Qmb?1YklgsQ=p|W>8%U(qEuM9_eh78+Ba-Cpl^O;;XQ`YLSoC_@N
zQo&3X?@I`74`}sW9oMM>a78&X5a;zW+O!|1wx&zN_WFRp*B?8pQ@&jR5isN!(4GDf
z066rMwQ5SlfWvjWt6WY4bz4;(32K0-^zSwT)f$Wc#M6T-ogK2W^}3Kvh_DV9AinXx
z34IQFTj2(Cv7R!^eBfDT1h-@}B=7jHs<MRIKq3^Ui<x<ltuAy*$9fX0aZJ=Yrf|v&
zYGQ&;71N}wwQFu^12*{L9<nLI#W@4jDkSs+>8DJ5DISi8#JaRkiGqClZ*7L7wAd7z
zHd;&1MK60`T2h`ygcM0-S2{7>!W?^BayX6E2c`aNSsDD+a$5H>TZDHFXLVla%Tc>X
zQgOA@9#acf9a1@_73xsjnC-#*k_o$Ax)IIJ`^<<KzDs30b|Y%P+8~9QoH9GqX7`D|
z-Y<zI<8<SSqcp)o4n@VEa6tc`75&2OoSQpA*xJQZj3!*rU?v+{q!S;POcbu@8NwEs
zo?S&1FQAtX4^3cdZxym3l{M9@pJb@pa2eNa#j7Jp%YiIOSwaf3%aLCk$qog7RMJUz
zKaYm<DGsT%VCMvdPCkNnvuG@FRX=gjrWMpB$B}oE$_`r1XdI*T6Mm)o-(igcs`K)R
zJ+~B6LCATbnb>;^tZstv#6DhD+pQ++YoCezyhAoAXsTmASJY|@9gj#*U7t?0Lwkv6
R2&?E@J;D%*kPb2YzX2gx-ueIl

diff --git a/lang/English/install.php b/lang/English/install.php
new file mode 100644
index 00000000..595480f9
--- /dev/null
+++ b/lang/English/install.php
@@ -0,0 +1,100 @@
+<?php
+
+// Language definitions used in install.php, localized by adaur
+
+$lang_install = array(
+
+'Choose install language'        =>    'Choose the install script language',
+'Choose install language info'    =>    'The language used for this install script. The default language used for the board itself can be set below.',
+'Install language'                =>    'Install language',
+'Change language'                =>    'Change language',
+'Already installed'                =>    'It seems like FeatherBB is already installed. You should go <a href="../index.php">here</a> instead.',
+'You are running error'            =>    'You are running %1$s version %2$s. FeatherBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue.',
+'My FeatherBB Forum'            =>    'My FeatherBB Forum',
+'Description'                    =>    'Lighter than a feather.',
+'Username 1'                    =>    'Usernames must be at least 2 characters long.',
+'Username 2'                    =>    'Usernames must not be more than 25 characters long.',
+'Username 3'                    =>    'The username guest is reserved.',
+'Username 4'                    =>    'Usernames may not be in the form of an IP address.',
+'Username 5'                    =>    'Usernames may not contain all the characters \', " and [ or ] at once.',
+'Username 6'                    =>    'Usernames may not contain any of the text formatting tags (BBCode) that the forum uses.',
+'Short password'                =>    'Passwords must be at least 6 characters long.',
+'Passwords not match'            =>    'Passwords do not match.',
+'Wrong email'                    =>    'The administrator email address you entered is invalid.',
+'No board title'                =>    'You must enter a board title.',
+'Error default language'        =>    'The default language chosen doesn\'t seem to exist.',
+'Error default style'            =>    'The default style chosen doesn\'t seem to exist.',
+'No DB extensions'                =>    'This PHP environment does not have support for any of the databases that FeatherBB supports. PHP needs to have support for either MySQL, PostgreSQL or SQLite in order for FeatherBB to be installed.',
+'Administrator username'        =>    'Administrator\'s username',
+'Administrator email'            =>    'Administrator\'s email',
+'Board title'                    =>    'Board title',
+'Base URL'                        =>    'The URL (without trailing slash) of your FeatherBB forum. This must be correct.',
+'Required field'                =>    'is a required field in this form.',
+'FeatherBB Installation'            =>    'FeatherBB Installation',
+'Welcome'                        =>    'You are about to install FeatherBB. In order to install FeatherBB, you must complete the form set out below. If you encounter any difficulties with the installation, please refer to the documentation.',
+'Install'                        =>    'Install FeatherBB %s',
+'Errors'                        =>    'The following errors need to be corrected:',
+'Database setup'                =>    'Database setup',
+'Info 1'                        =>    'All information we need to create a connection with your database.',
+'Select database'                =>    'Select your database type',
+'Info 2'                        =>    'Select a database. We support SQLite, MySQL and PostgreSQL.',
+'Database type'                    =>    'Database type',
+'Required'                        =>    '(Required)',
+'Database hostname'                =>    'Enter your database server hostname',
+'Info 3'                        =>    'You should be able to get this info from your web host, if localhost does not work.',
+'Database server hostname'        =>    'Database server hostname',
+'Database enter name'            =>    'Enter the name of your database',
+'Info 4'                        =>    'The name of the database you want to install FeatherBB on.',
+'Database name'                    =>    'Database name',
+'Database enter informations'    =>    'Enter your database username and password',
+'Database username'                =>    'Database username',
+'Info 5'                        =>    'Your MySQL username and password (ignore of SQLite).',
+'Database password'                =>    'Database password',
+'Database enter prefix'            =>    'Enter database table prefix',
+'Info 6'                        =>    'If you want to run multiple FeatherBB installations in a single database, change this.',
+'Table prefix'                    =>    'Table prefix',
+'Administration setup'            =>    'Administration setup',
+'Info 7'                        =>    'Create the very first account on your board.',
+'Info 8'                        =>    'Your username should be between 2 and 25 characters long. Your password must be at least 6 characters long. Remember that passwords are case-sensitive.',
+'Password'                        =>    'Password',
+'Confirm password'                =>    'Confirm password',
+'Board setup'                    =>    'Board setup',
+'Info 11'                        =>    'Settings for your board. You can change this later.',
+'General information'            =>    'Enter your board\'s title and description.',
+'Board description'                =>    'Board description (supports HTML)',
+'Appearance'                    =>    'Appearance',
+'Info 15'                        =>    'Make your forum yours. Choose a language and a style for your board.',
+'Default language'                =>    'Default language',
+'Default style'                    =>    'Default style',
+'Start install'                    =>    'Start install',
+'DB type not valid'                =>    '\'%s\' is not a valid database type',
+'Table prefix error'            =>    'The table prefix \'%s\' contains illegal characters or is too long. The prefix may contain the letters a to z, any numbers and the underscore character. They must however not start with a number. The maximum length is 40 characters. Please choose a different prefix',
+'Prefix reserved'                =>    'The table prefix \'sqlite_\' is reserved for use by the SQLite engine. Please choose a different prefix',
+'Existing table error'            =>    'A table called \'%susers\' is already present in the database \'%s\'. This could mean that FeatherBB is already installed or that another piece of software is installed and is occupying one or more of the table names FeatherBB requires. If you want to install multiple copies of FeatherBB in the same database, you must choose a different table prefix',
+'InnoDB off'                    =>    'InnoDB does not seem to be enabled. Please choose a database layer that does not have InnoDB support, or enable InnoDB on your MySQL server',
+'Administrators'                =>    'Administrators',
+'Administrator'                    =>    'Administrator',
+'Moderators'                    =>    'Moderators',
+'Moderator'                        =>    'Moderator',
+'Guests'                        =>    'Guests',
+'Guest'                            =>    'Guest',
+'Members'                        =>    'Members',
+'Announcement'                    =>    'Enter your announcement here.',
+'Rules'                            =>    'Enter your rules here',
+'Maintenance message'            =>    'The forums are temporarily down for maintenance. Please try again in a few minutes.',
+'Test post'                        =>    'Test topic',
+'Message'                        =>    'You have successfully installed FeatherBB, congratulations! Now log in and head over to the administration control panel to configure your forum.',
+'Test category'                    =>    'Test category',
+'Test forum'                    =>    'Test forum',
+'This is just a test forum'        =>    'This is just a test forum',
+'Alert cache'                    =>    '<strong>The cache directory is currently not writable!</strong> In order for FeatherBB to function properly, the directory <em>%s</em> must be writable by PHP. Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777.',
+'Alert avatar'                    =>    '<strong>The avatar directory is currently not writable!</strong> If you want users to be able to upload their own avatar images you must see to it that the directory <em>%s</em> is writable by PHP. You can later choose to save avatar images in a different directory (see Admin/Options). Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777.',
+'Alert upload'                    =>    '<strong>File uploads appear to be disallowed on this server!</strong> If you want users to be able to upload their own avatar images you must enable the file_uploads configuration setting in PHP. Once file uploads have been enabled, avatar uploads can be enabled in Administration/Options/Features.',
+'FeatherBB has been installed'        =>    'FeatherBB has been installed. To finalize the installation please follow the instructions below.',
+'Final instructions'            =>    'Final instructions',
+'Info 17'                        =>    'To finalize the installation, you need to click on the button below to download a file called config.php. You then need to upload this file to the root directory of your FeatherBB installation.',
+'Info 18'                        =>    'Once you have uploaded config.php, FeatherBB will be fully installed! At that point, you may <a href="../index.php">go to the forum index</a>.',
+'Download config.php file'        =>    'Download config.php file',
+'FeatherBB fully installed'        =>    'FeatherBB has been fully installed! You may now <a href="../index.php">go to the forum index</a>.',
+
+);
diff --git a/lang/English/install.po b/lang/English/install.po
deleted file mode 100644
index 03f10123..00000000
--- a/lang/English/install.po
+++ /dev/null
@@ -1,291 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Choose install language"
-msgstr "Choose the install script language"
-
-msgid "Choose install language info"
-msgstr "The language used for this install script. The default language used for the board itself can be set below."
-
-msgid "Install language"
-msgstr "Install language"
-
-msgid "Change language"
-msgstr "Change language"
-
-msgid "Already installed"
-msgstr "It seems like FeatherBB is already installed. You should go <a href=\"../index.php\">here</a> instead."
-
-msgid "You are running error"
-msgstr "You are running %1$s version %2$s. FeatherBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue."
-
-msgid "My FeatherBB Forum"
-msgstr "My FeatherBB Forum"
-
-msgid "Description"
-msgstr "Lighter than a feather."
-
-msgid "Username 1"
-msgstr "Usernames must be at least 2 characters long."
-
-msgid "Username 2"
-msgstr "Usernames must not be more than 25 characters long."
-
-msgid "Username 3"
-msgstr "The username guest is reserved."
-
-msgid "Username 4"
-msgstr "Usernames may not be in the form of an IP address."
-
-msgid "Username 5"
-msgstr "Usernames may not contain all the characters ', \" and [ or ] at once."
-
-msgid "Username 6"
-msgstr "Usernames may not contain any of the text formatting tags (BBCode) that the forum uses."
-
-msgid "Short password"
-msgstr "Passwords must be at least 6 characters long."
-
-msgid "Passwords not match"
-msgstr "Passwords do not match."
-
-msgid "Wrong email"
-msgstr "The administrator email address you entered is invalid."
-
-msgid "No board title"
-msgstr "You must enter a board title."
-
-msgid "Error default language"
-msgstr "The default language chosen doesn't seem to exist."
-
-msgid "Error default style"
-msgstr "The default style chosen doesn't seem to exist."
-
-msgid "No DB extensions"
-msgstr "This PHP environment does not have support for any of the databases that FeatherBB supports. PHP needs to have support for either MySQL, PostgreSQL or SQLite in order for FeatherBB to be installed."
-
-msgid "Administrator username"
-msgstr "Administrator's username"
-
-msgid "Administrator email"
-msgstr "Administrator's email"
-
-msgid "Board title"
-msgstr "Board title"
-
-msgid "Base URL"
-msgstr "The URL (without trailing slash) of your FeatherBB forum. This must be correct."
-
-msgid "Required field"
-msgstr "is a required field in this form."
-
-msgid "FeatherBB Installation"
-msgstr "FeatherBB Installation"
-
-msgid "Welcome"
-msgstr "You are about to install FeatherBB. In order to install FeatherBB, you must complete the form set out below. If you encounter any difficulties with the installation, please refer to the documentation."
-
-msgid "Install"
-msgstr "Install FeatherBB %s"
-
-msgid "Errors"
-msgstr "The following errors need to be corrected:"
-
-msgid "Database setup"
-msgstr "Database setup"
-
-msgid "Info 1"
-msgstr "All information we need to create a connection with your database."
-
-msgid "Select database"
-msgstr "Select your database type"
-
-msgid "Info 2"
-msgstr "Select a database. We support SQLite, MySQL and PostgreSQL."
-
-msgid "Database type"
-msgstr "Database type"
-
-msgid "Required"
-msgstr "(Required)"
-
-msgid "Database hostname"
-msgstr "Enter your database server hostname"
-
-msgid "Info 3"
-msgstr "You should be able to get this info from your web host, if localhost does not work."
-
-msgid "Database server hostname"
-msgstr "Database server hostname"
-
-msgid "Database enter name"
-msgstr "Enter the name of your database"
-
-msgid "Info 4"
-msgstr "The name of the database you want to install FeatherBB on."
-
-msgid "Database name"
-msgstr "Database name"
-
-msgid "Database enter informations"
-msgstr "Enter your database username and password"
-
-msgid "Database username"
-msgstr "Database username"
-
-msgid "Info 5"
-msgstr "Your MySQL username and password (ignore of SQLite)."
-
-msgid "Database password"
-msgstr "Database password"
-
-msgid "Database enter prefix"
-msgstr "Enter database table prefix"
-
-msgid "Info 6"
-msgstr "If you want to run multiple FeatherBB installations in a single database, change this."
-
-msgid "Table prefix"
-msgstr "Table prefix"
-
-msgid "Administration setup"
-msgstr "Administration setup"
-
-msgid "Info 7"
-msgstr "Create the very first account on your board."
-
-msgid "Info 8"
-msgstr "Your username should be between 2 and 25 characters long. Your password must be at least 6 characters long. Remember that passwords are case-sensitive."
-
-msgid "Password"
-msgstr "Password"
-
-msgid "Confirm password"
-msgstr "Confirm password"
-
-msgid "Board setup"
-msgstr "Board setup"
-
-msgid "Info 11"
-msgstr "Settings for your board. You can change this later."
-
-msgid "General information"
-msgstr "Enter your board's title and description."
-
-msgid "Board description"
-msgstr "Board description (supports HTML)"
-
-msgid "Appearance"
-msgstr "Appearance"
-
-msgid "Info 15"
-msgstr "Make your forum yours. Choose a language and a style for your board."
-
-msgid "Default language"
-msgstr "Default language"
-
-msgid "Default style"
-msgstr "Default style"
-
-msgid "Start install"
-msgstr "Start install"
-
-msgid "DB type not valid"
-msgstr "'%s' is not a valid database type"
-
-msgid "Table prefix error"
-msgstr "The table prefix '%s' contains illegal characters or is too long. The prefix may contain the letters a to z, any numbers and the underscore character. They must however not start with a number. The maximum length is 40 characters. Please choose a different prefix"
-
-msgid "Prefix reserved"
-msgstr "The table prefix 'sqlite_' is reserved for use by the SQLite engine. Please choose a different prefix"
-
-msgid "Existing table error"
-msgstr "A table called '%susers' is already present in the database '%s'. This could mean that FeatherBB is already installed or that another piece of software is installed and is occupying one or more of the table names FeatherBB requires. If you want to install multiple copies of FeatherBB in the same database, you must choose a different table prefix"
-
-msgid "InnoDB off"
-msgstr "InnoDB does not seem to be enabled. Please choose a database layer that does not have InnoDB support, or enable InnoDB on your MySQL server"
-
-msgid "Administrators"
-msgstr "Administrators"
-
-msgid "Administrator"
-msgstr "Administrator"
-
-msgid "Moderators"
-msgstr "Moderators"
-
-msgid "Moderator"
-msgstr "Moderator"
-
-msgid "Guests"
-msgstr "Guests"
-
-msgid "Guest"
-msgstr "Guest"
-
-msgid "Members"
-msgstr "Members"
-
-msgid "Announcement"
-msgstr "Enter your announcement here."
-
-msgid "Rules"
-msgstr "Enter your rules here"
-
-msgid "Maintenance message"
-msgstr "The forums are temporarily down for maintenance. Please try again in a few minutes."
-
-msgid "Test post"
-msgstr "Test topic"
-
-msgid "Message"
-msgstr "You have successfully installed FeatherBB, congratulations! Now log in and head over to the administration control panel to configure your forum."
-
-msgid "Test category"
-msgstr "Test category"
-
-msgid "Test forum"
-msgstr "Test forum"
-
-msgid "This is just a test forum"
-msgstr "This is just a test forum"
-
-msgid "Alert cache"
-msgstr "<strong>The cache directory is currently not writable!</strong> In order for FeatherBB to function properly, the directory <em>%s</em> must be writable by PHP. Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777."
-
-msgid "Alert avatar"
-msgstr "<strong>The avatar directory is currently not writable!</strong> If you want users to be able to upload their own avatar images you must see to it that the directory <em>%s</em> is writable by PHP. You can later choose to save avatar images in a different directory (see Admin/Options). Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777."
-
-msgid "Alert upload"
-msgstr "<strong>File uploads appear to be disallowed on this server!</strong> If you want users to be able to upload their own avatar images you must enable the file_uploads configuration setting in PHP. Once file uploads have been enabled, avatar uploads can be enabled in Administration/Options/Features."
-
-msgid "FeatherBB has been installed"
-msgstr "FeatherBB has been installed. To finalize the installation please follow the instructions below."
-
-msgid "Final instructions"
-msgstr "Final instructions"
-
-msgid "Info 17"
-msgstr "To finalize the installation, you need to click on the button below to download a file called config.php. You then need to upload this file to the root directory of your FeatherBB installation."
-
-msgid "Info 18"
-msgstr "Once you have uploaded config.php, FeatherBB will be fully installed! At that point, you may <a href=\"../index.php\">go to the forum index</a>."
-
-msgid "Download config.php file"
-msgstr "Download config.php file"
-
-msgid "FeatherBB fully installed"
-msgstr "FeatherBB has been fully installed! You may now <a href=\"../index.php\">go to the forum index</a>."
diff --git a/lang/English/login.mo b/lang/English/login.mo
deleted file mode 100644
index cef79b30ccc81bc7fe3d011101c52b6cfabb7959..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1877
zcmZWp%Z?m16g4Egns*`r3nXrkK!B(kIs$3bLlcr=1`V1Ft<VG(2;{E1U2RfrH@0h<
z*|A^&Ym@~`P(A?Gh&@{*BzA212E>MQ%l!-`RUP}5eeSsr`>zY<Z!0`c;(ZqH9lTHD
zef1uE@O%S&82If1Zv!90{0CqM_!ICE;4cgNZ@|Yf{}Xr-_%~4a{$2dPcyHSOJWzPM
zK-u31iiY=qvhNe1@XUY%?EMP(HRivcQ|d?H&GSk<1N;a08Suh=O1%j5K=JoIQ22ia
zJ_Y<0cntglco}%<{^Vx}d<F9f@Co2|z)yj9fL-9Z2b6ja_y!O%6lAmy+_wB!rXEVB
z)%Q`1;HHg7as<h%M`8k1>r3+ZAYO@I9Za>UX<R#3szc{1jwF_L>|$g~GaZ6Dc9pSY
z?AR@aHCJrQ#l&-IJQq=>u8FjopYXihKX<+)_TKrRHf_n2cuyR0D`u)=F;OQ@cq$Vj
zgHGMxDNjf2Y04OX(Qt@K+2$k>ZCMsNKl092)CBfBZ9Idz@w(0s@ig?v&f00{U*4lM
z?7w8`QlGjn?{x;=eU8|&qcXe6J{V_vbjUhR*k8NW8N5Ht_C2PsXYc69J%TN}!KX%+
zE=|We#BAub4YiKWW6`m;Rii7;hODO>jP#~1r^dcLPA*2H994O%bN%T0!P<W}f336c
zEXo7cvl*O5{xa^&YHjQu6%*|P$Nq=I!)$lGPP~uVX9u=$rLk3yc1I?zg!G7Q=i}^M
zw(OI}fkRy*b@Sc)b^J-w>;u>Mg7=e;9wjGgI5B~AQMkrNnrMt`WTiYq4clUINqXH1
zo}mxbB4kml*aFs^1~u!zG}mzZLLlU!i5zIeW9NBE1?k|jo2{iQ1fHv_cF{s2V8m$N
zfDBP|t)DRC!i<e5DN85_G&gYq6(RbjkOBsB7E0!_14*<M(;0NFbmw$5CP*tCL|HVb
z_THSfi>T0+3Y0__aEPd&xS7HeVn7eK86_Pz&eaz46$NHkkUH=Q^}6@T`D6xVmCoeW
zUMgx++!E>HSI=hN&AdS?Qf=%l<e_%+TpgfWd<sX7fz?y2wdE?dv`$WNg$$uIp(zR^
zY24KHS-!O6bmwY-8=*bXi`u4>jTVroYj~3iwMQFO;xb4&M~v)vxg@~8sOMcplni2-
zl&mLYs5pAcy7t&^=A$i}#G3AlMK$lbG3bor6_Je_L&DKbbhueep%D+UE+!NWejSmV
zR7ACTZAf(L>UNJshszPFQrGB|TttR~n^VcQDB9}ExvA@AM5zfiS|;`0vLOEpBhk+%
Z1_Gra)_tJXm)Np;J7^8L&qQyo{sSF<EA0RP

diff --git a/lang/English/login.php b/lang/English/login.php
new file mode 100644
index 00000000..d4a10755
--- /dev/null
+++ b/lang/English/login.php
@@ -0,0 +1,26 @@
+<?php
+
+// Language definitions used in login.php
+$lang_login = array(
+
+// Miscellaneous
+'Wrong user/pass'            =>    'Wrong username and/or password.',
+'Forgotten pass'            =>    'Forgotten your password?',
+'Login redirect'            =>    'Logged in successfully.',
+'Logout redirect'            =>    'Logged out.',
+'No email match'            =>    'There is no user registered with the email address',
+'Request pass'                =>    'Request password',
+'Request pass legend'        =>    'Enter the email address with which you registered',
+'Request pass info'            =>    'A new password together with a link to activate the new password will be sent to that address.',
+'Not registered'            =>    'Not registered yet?',
+'Login legend'                =>    'Enter your username and password below',
+'Remember me'                =>    'Log me in automatically each time I visit.',
+'Login info'                =>    'If you have not registered or have forgotten your password click on the appropriate link below.',
+'New password errors'        =>    'Password request error',
+'New passworderrors info'    =>    'The following error needs to be corrected before a new password can be sent:',
+
+// Forget password mail stuff
+'Forget mail'                =>    'An email has been sent to the specified address with instructions on how to change your password. If it does not arrive you can contact the forum administrator at',
+'Email flood'                =>    'This account has already requested a password reset in the past hour. Please wait %s minutes before requesting a new password again.'
+
+);
diff --git a/lang/English/login.po b/lang/English/login.po
deleted file mode 100644
index 059c8920..00000000
--- a/lang/English/login.po
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Wrong user/pass"
-msgstr "Wrong username and/or password."
-
-msgid "Forgotten pass"
-msgstr "Forgotten your password?"
-
-msgid "Login redirect"
-msgstr "Logged in successfully."
-
-msgid "Logout redirect"
-msgstr "Logged out."
-
-msgid "No email match"
-msgstr "There is no user registered with the email address"
-
-msgid "Request pass"
-msgstr "Request password"
-
-msgid "Request pass legend"
-msgstr "Enter the email address with which you registered"
-
-msgid "Request pass info"
-msgstr "A new password together with a link to activate the new password will be sent to that address."
-
-msgid "Not registered"
-msgstr "Not registered yet?"
-
-msgid "Login legend"
-msgstr "Enter your username and password below"
-
-msgid "Remember me"
-msgstr "Log me in automatically each time I visit."
-
-msgid "Login info"
-msgstr "If you have not registered or have forgotten your password click on the appropriate link below."
-
-msgid "New password errors"
-msgstr "Password request error"
-
-msgid "New passworderrors info"
-msgstr "The following error needs to be corrected before a new password can be sent:"
-
-msgid "Forget mail"
-msgstr "An email has been sent to the specified address with instructions on how to change your password. If it does not arrive you can contact the forum administrator at"
-
-msgid "Email flood"
-msgstr "This account has already requested a password reset in the past hour. Please wait %s minutes before requesting a new password again."
diff --git a/lang/English/misc.mo b/lang/English/misc.mo
deleted file mode 100644
index 9a3f7859ab142662a032fa3356390c5918b31c2d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5068
zcmb7`O^h5z701gE3|Rt+O(5aB65`;EGqYZQ#q8Sg$J!e#y!I-)i9rFOo|)R+#xvbR
zcaJxVkU3xhhbRI>;1VIYAS8r@l0!}*7myGVAcRm3AS8qY95_Hu1cBi9ud1Gz-L*;F
zn(E(Fb$z^g@6~(thuyb4V|X5+ypOW{24fQV)GfSt?$~L}-Eddr1MnTx=ir;*C3q+N
z6nrNvBEJ&bza9BJ<Y#`y>o)i+sCj-5HSX{5ZE)wC!+dwbcTt~&`hF6=6+RBtuLU)}
zAM4j*{p(Quz8Co%d^`0YL+#@ia5wxjl>Dzk$@5>Rb#8l$G5pNEyrhDCQ1k7FbTP-^
z1Uv(^{>Avc4W)-X)~~@ksDCx`yKoov=isgICs1<y621ri5o-LuBX`m1cIx*-$#Dc~
zy;-P!7a=M$9Vq!OL-k*W+Rv9``!{0yccA+J2ugo1#P**;>EX9f^ZX7<uD?L7^RLL;
z*|gg4gR;v*kr$x)IjHfUgNr+i`4XI@{xXf?4uqP5`=Hi)0!oeq%04-~3tokq@0)NQ
z{s2nuS0F$0DzAfZCxbO^25O#jybi%jP<nU@J^`PFZTL?p`+br@lCuL<@53|jNhtfj
z2(|uipyc^0oQ0ZH@*jhezY8T#0qJ7C05P3;8p>YZg0kzgQ0u$^QHgm8YTVDE<aik(
zn)y?#{{z08`hOzt!ilusX(<17@L_lrHsOnK5Byu?Zk$a0k3z}Og_{4f(8~#>&!?gG
z^$eVXzlNWNJ20~3N}&4pp!$CvYMw8`_rkA1>EVY^{hx;i;7d^c@e0)VTXEWZ;N9>j
zoPmgHO86moE%N&ixA9}u?*WP)#iSDy*`|KHJ*e!Z5U#vmN+<F&J(5$pIj#!N`zibU
zzwo*rNQRRX$$W~U=U{+;AK`tLA|1Ywavw#HeB-qL7h<OVO8@dbJ@b?gP(DmKOp)#7
z7uu`*NjkF>)a~^nUuaNdgEJJ=U_L_8BfWF{%rVLwWrp$~Wk02Ua1--EihOJ9Gfl%o
zTN-5x`Q^P7*-btrf72tonp54vC7lgh4q9cqNL#LBSMp-eyWWQ?@271umt<L9+0u1g
zyRs{3QC4QIo0l%Ut?y+E*GUUHj5n5Jt$D`Cp6xJ8<!sljx~ya7Vr$P8tJ@mOemAY^
zo@e|x6JYy!S(TeAww?F--Hpv{Lz&_*FX?bxsBIY-8;2v$_L8(~J89Ww$AiLIRN+i$
zUFqg|C;sobvP@R%FQv<>(cVLE6#g0MXFf*_uAVk&bzR4Nl>OK=TgmP8*#86Oyi2aQ
z(L@VLaXDCvwxqM=!<Htg)GT<##(j@h#>VCyS0rp|A-@t{wa(Rmb^V86<*~ox6Zmep
zN;&p@%=Q=Dy4=n0{z4x2UMp<aFxJDHH#!{Jp$mH}^GyGufr2;skCk;<K3HA5?x$^T
zenGB0@_j!Y^RBNsj9cZlCoNp;yUf4BoTI(!L%q(>M;;Br1>oUj+r<A>p4)Doty1sj
z1&7CbOsr^^^@rhHOa7FZB~C|F6b4vY%hwSM0SBckO0%Ss5#I4A_?Ga$cIfe@(ezc?
zzPxo)OSL*i`&^EKZ!y+mS$Vw)Xx=`>r6T2^dq+2m-9eFb8*=?}#%6tAEsr0Vwc+pa
zy_vn|xSgJyomeb#IZESPr|~#@P4jHV&by?-KBrGlEM8o0%;5|b?Ts^d?Tn?Z@u<6!
zs%zbJJ}Illa*<?ZH>vW1PUn+sb-)2_EW4yPHlsb3bb4uaawRO$YBlp>_2G$ya|>rj
z>rXfLPY|jqPIY5>qtBw1d$OA9cat=mwe7W}C|z~@vE}*3(NRCGzT%3;*{q#+(rk6c
z9&M%7P>>nCcH-lWM_i`UCm9!WLTF{Dn@5|6_!6p(rF>Ad-CS5>#)d`AC-Q+!@P}l3
zG{=XlwX_UzqWOAy`ZLfp^NQ@=hip59{FWOYLQQ9VM4k#Eycu)AvT}q~bab7j@wIYT
zUF>o+93D9q{4o>$u&LdL|E-OFF`KW9L<nIa;bg>I#8Io#%sYcR>gYCO2H2Dc%qdj0
zfy#UY*Pr!-0F9=?UQpQBPW>_`%%XBk?7+@8r;wYP(CfE6Q7b2`$&^tG$|y*XRJOIj
z0moH_2JAg3v5R;LlTN1~&Diy{+qKvxW+gJXx49BUJME`<Y15oi=HwLEJtf-00G-mV
zDVfl<pD;<wRqKvm=2MkFrDfAbiPjVRaBQGdUKQLKh)NPKS;g_2B$ur@uW5)SKF%+r
zQ3Wfnc6ln}{mybfi%qg&ctbAqoR&Tn%FkkY#G9Dp+@h`bof13tl)iOM2{TK2&c?>g
znKDGUz2zjgnr^6+<kw*5K3ZBy>w8boN=vHfkzQ#=8X^q#85=7NAlaZ7wRqkBKEG~G
zx$!)B2WQ5GO}RG2dL@jlUR>wVn!1LCgC-yM6OD3iy+-&lo@^B*dIL0tOJIt`#-tmf
z!lo|-aM^9_OFUz^WpJcCb0Iivj|AJ+L4Ty{*O<&73m;dssTfwKax(0c4=4X;c(p#f
z2uK>Q-q2mH=5MQYLW+lDdqBKFFE5pMJ%v|4TW$F?<M6DnrR_EE)dWc&a-x4V!>u8h
zNxK+}hjlev3+jVkTcupn-5}_U`8S4Vrtr6hVL<Q~26U|r`;!-pOC%U%+~Mqz!-o$Z
zCWut7w0o}}Idr)-c@u#kEOygDVEi(pkjXxD)zRi(&t1mb-{-4yi`Ti=+%V3D>~Q0_
z?PHxkrM_p(Ox9mtB%4=bytVXooA6P{4<Ow5BNlW_G8-mCUFFa-u{w*&R_;&Q94<6|
n<dFT?X*3=@U=XfKud!C);(-pgC7;^{tsdcbV-)x6tMdN<ZOB62

diff --git a/lang/English/misc.php b/lang/English/misc.php
new file mode 100644
index 00000000..493b52ca
--- /dev/null
+++ b/lang/English/misc.php
@@ -0,0 +1,93 @@
+<?php
+
+// Language definitions used in various scripts
+$lang_misc = array(
+
+'Mark read redirect'            =>    'All topics and forums have been marked as read.',
+'Mark forum read redirect'        =>    'All topics in the specified forum have been marked as read.',
+
+// Send email
+'Form email disabled'            =>    'The user you are trying to send an email to has disabled form email.',
+'No email subject'                =>    'You must enter a subject.',
+'No email message'                =>    'You must enter a message.',
+'Too long email message'        =>    'Messages cannot be longer than 65535 characters (64 KB).',
+'Email flood'                    =>    'At least %s seconds have to pass between sent emails. Please wait %s seconds and try sending again.',
+'Email sent redirect'            =>    'Email sent.',
+'Send email to'                    =>    'Send email to',
+'Email subject'                    =>    'Subject',
+'Email message'                    =>    'Message',
+'Email disclosure note'            =>    'Please note that by using this form, your email address will be disclosed to the recipient.',
+'Write email'                    =>    'Write and submit your email message',
+
+// Report
+'No reason'                        =>    'You must enter a reason.',
+'Reason too long'                =>    'Your message must be under 65535 bytes (~64kb).',
+'Report flood'                    =>    'At least %s seconds have to pass between reports. Please wait %s seconds and try sending again.',
+'Report redirect'                =>    'Post reported.',
+'Report post'                    =>    'Report post',
+'Reason'                        =>    'Reason',
+'Reason desc'                    =>    'Please enter a short reason why you are reporting this post',
+
+// Subscriptions
+'Already subscribed topic'        =>    'You are already subscribed to this topic.',
+'Already subscribed forum'        =>    'You are already subscribed to this forum.',
+'Subscribe redirect'            =>    'Your subscription has been added.',
+'Not subscribed topic'            =>    'You are not subscribed to this topic.',
+'Not subscribed forum'            =>    'You are not subscribed to this forum.',
+'Unsubscribe redirect'            =>    'Your subscription has been removed.',
+
+// General forum and topic moderation
+'Moderate'                        =>    'Moderate',
+'Select'                        =>    'Select', // the header of a column of checkboxes
+'Move'                            =>    'Move',
+'Split'                            =>    'Split',
+'Delete'                        =>    'Delete',
+'Merge'                            =>    'Merge',
+
+// Moderate forum
+'Open'                            =>    'Open',
+'Close'                            =>    'Close',
+'Move topic'                    =>    'Move topic',
+'Move topics'                    =>    'Move topics',
+'Move legend'                    =>    'Select destination of move',
+'Move to'                        =>    'Move to',
+'Nowhere to move'                =>    'There are no forums into which you can move topics.',
+'Leave redirect'                =>    'Leave redirect topic(s)',
+'Move topic redirect'            =>    'Topic moved.',
+'Move topics redirect'            =>    'Topics moved.',
+'Confirm delete legend'            =>    'Please confirm deletion',
+'Delete topics'                    =>    'Delete topics',
+'Delete topics comply'            =>    'Are you sure you want to delete the selected topics?',
+'Delete topics redirect'        =>    'Topics deleted.',
+'Open topic redirect'            =>    'Topic opened.',
+'Open topics redirect'            =>    'Topics opened.',
+'Close topic redirect'            =>    'Topic closed.',
+'Close topics redirect'            =>    'Topics closed.',
+'No topics selected'            =>    'You must select at least one topic for move/delete/open/close.',
+'Not enough topics selected'    =>    'You must select at least two topics for merge.',
+'Stick topic redirect'            =>    'Topic sticked.',
+'Unstick topic redirect'        =>    'Topic unsticked.',
+'Merge topics'                    =>    'Merge topics',
+'Merge topics redirect'            =>    'Topics merged.',
+'Confirm merge legend'            =>    'Please confirm merge',
+'New subject'                    =>    'New subject',
+
+// Split multiple posts in topic
+'Confirm split legend'            =>    'Please confirm split of selected posts and select destination of move.',
+'Split posts'                    =>    'Split posts',
+'Split posts comply'            =>    'Are you sure you want to split the selected posts?',
+'Split posts redirect'            =>    'Posts have been split.',
+
+// Delete multiple posts in topic
+'Delete posts'                    =>    'Delete posts',
+'Cannot select first'            =>    'First post cannot be selected for split/delete.',
+'Delete posts comply'            =>    'Are you sure you want to delete the selected posts?',
+'Delete posts redirect'            =>    'Posts deleted.',
+'No posts selected'                =>    'You must select at least one post for split/delete.',
+
+// Get host
+'Host info 1'                    =>    'The IP address is: %s',
+'Host info 2'                    =>    'The host name is: %s',
+'Show more users'                =>    'Show more users for this IP',
+
+);
diff --git a/lang/English/misc.po b/lang/English/misc.po
deleted file mode 100644
index 68516bb7..00000000
--- a/lang/English/misc.po
+++ /dev/null
@@ -1,225 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Mark read redirect"
-msgstr "All topics and forums have been marked as read."
-
-msgid "Mark forum read redirect"
-msgstr "All topics in the specified forum have been marked as read."
-
-msgid "Form email disabled"
-msgstr "The user you are trying to send an email to has disabled form email."
-
-msgid "No email subject"
-msgstr "You must enter a subject."
-
-msgid "No email message"
-msgstr "You must enter a message."
-
-msgid "Too long email message"
-msgstr "Messages cannot be longer than 65535 characters (64 KB)."
-
-msgid "Email flood"
-msgstr "At least %s seconds have to pass between sent emails. Please wait %s seconds and try sending again."
-
-msgid "Email sent redirect"
-msgstr "Email sent."
-
-msgid "Send email to"
-msgstr "Send email to"
-
-msgid "Email subject"
-msgstr "Subject"
-
-msgid "Email message"
-msgstr "Message"
-
-msgid "Email disclosure note"
-msgstr "Please note that by using this form, your email address will be disclosed to the recipient."
-
-msgid "Write email"
-msgstr "Write and submit your email message"
-
-msgid "No reason"
-msgstr "You must enter a reason."
-
-msgid "Reason too long"
-msgstr "Your message must be under 65535 bytes (~64kb)."
-
-msgid "Report flood"
-msgstr "At least %s seconds have to pass between reports. Please wait %s seconds and try sending again."
-
-msgid "Report redirect"
-msgstr "Post reported."
-
-msgid "Report post"
-msgstr "Report post"
-
-msgid "Reason"
-msgstr "Reason"
-
-msgid "Reason desc"
-msgstr "Please enter a short reason why you are reporting this post"
-
-msgid "Already subscribed topic"
-msgstr "You are already subscribed to this topic."
-
-msgid "Already subscribed forum"
-msgstr "You are already subscribed to this forum."
-
-msgid "Subscribe redirect"
-msgstr "Your subscription has been added."
-
-msgid "Not subscribed topic"
-msgstr "You are not subscribed to this topic."
-
-msgid "Not subscribed forum"
-msgstr "You are not subscribed to this forum."
-
-msgid "Unsubscribe redirect"
-msgstr "Your subscription has been removed."
-
-msgid "Moderate"
-msgstr "Moderate"
-
-msgid "Select"
-msgstr "Select"
-
-msgid "Move"
-msgstr "Move"
-
-msgid "Split"
-msgstr "Split"
-
-msgid "Delete"
-msgstr "Delete"
-
-msgid "Merge"
-msgstr "Merge"
-
-msgid "Open"
-msgstr "Open"
-
-msgid "Close"
-msgstr "Close"
-
-msgid "Move topic"
-msgstr "Move topic"
-
-msgid "Move topics"
-msgstr "Move topics"
-
-msgid "Move legend"
-msgstr "Select destination of move"
-
-msgid "Move to"
-msgstr "Move to"
-
-msgid "Nowhere to move"
-msgstr "There are no forums into which you can move topics."
-
-msgid "Leave redirect"
-msgstr "Leave redirect topic(s)"
-
-msgid "Move topic redirect"
-msgstr "Topic moved."
-
-msgid "Move topics redirect"
-msgstr "Topics moved."
-
-msgid "Confirm delete legend"
-msgstr "Please confirm deletion"
-
-msgid "Delete topics"
-msgstr "Delete topics"
-
-msgid "Delete topics comply"
-msgstr "Are you sure you want to delete the selected topics?"
-
-msgid "Delete topics redirect"
-msgstr "Topics deleted."
-
-msgid "Open topic redirect"
-msgstr "Topic opened."
-
-msgid "Open topics redirect"
-msgstr "Topics opened."
-
-msgid "Close topic redirect"
-msgstr "Topic closed."
-
-msgid "Close topics redirect"
-msgstr "Topics closed."
-
-msgid "No topics selected"
-msgstr "You must select at least one topic for move/delete/open/close."
-
-msgid "Not enough topics selected"
-msgstr "You must select at least two topics for merge."
-
-msgid "Stick topic redirect"
-msgstr "Topic sticked."
-
-msgid "Unstick topic redirect"
-msgstr "Topic unsticked."
-
-msgid "Merge topics"
-msgstr "Merge topics"
-
-msgid "Merge topics redirect"
-msgstr "Topics merged."
-
-msgid "Confirm merge legend"
-msgstr "Please confirm merge"
-
-msgid "New subject"
-msgstr "New subject"
-
-msgid "Confirm split legend"
-msgstr "Please confirm split of selected posts and select destination of move."
-
-msgid "Split posts"
-msgstr "Split posts"
-
-msgid "Split posts comply"
-msgstr "Are you sure you want to split the selected posts?"
-
-msgid "Split posts redirect"
-msgstr "Posts have been split."
-
-msgid "Delete posts"
-msgstr "Delete posts"
-
-msgid "Cannot select first"
-msgstr "First post cannot be selected for split/delete."
-
-msgid "Delete posts comply"
-msgstr "Are you sure you want to delete the selected posts?"
-
-msgid "Delete posts redirect"
-msgstr "Posts deleted."
-
-msgid "No posts selected"
-msgstr "You must select at least one post for split/delete."
-
-msgid "Host info 1"
-msgstr "The IP address is: %s"
-
-msgid "Host info 2"
-msgstr "The host name is: %s"
-
-msgid "Show more users"
-msgstr "Show more users for this IP"
diff --git a/lang/English/post.mo b/lang/English/post.mo
deleted file mode 100644
index 58fde8300077007e4b07e61d358b4877b2e39f52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2395
zcma)-O=u)V6vta#bsax<*N^p+=fYwlcAJP`oESBUNeu4B!Hg0S!J6qeGbP<sy;aqj
z9lYsD#gpjKqbCs$dKL62g5bwhLA;3v!K>o`b<a$O7<C(Ze)Xze^?UW+t2aNMJoa9M
z=T5wL;r#>eS-f9gh95kyTpmR?foe<#UIY1!vHT8rJ>(C-6W~YSwczJq1N;iS4*X#(
z{|w#%`M0rr{EAvW1&Uq*%Kl|g>~4WKfP3ThJ}CAAcs2MsDEe=KH-hhj;@^j$?EhrU
zFF^VJw_por`w6@s^1_u-6oW5;vhPihz;{8h^C|c-_$Bx<c;TujItG3N&V%2Bw}XFy
zyWnX!bq|<<d*Iuk*!=|*KYs_G0sjQ$T-(R%^*vDRF^HwegO7r*fp>$SfwzI*foH*A
zLGk+poR-`@0gh7^orXMlWRJu}Vu2$^x8S`QFWjyCLK>=b1696+_;mG68H>-7FL~tL
zl4J2t&Ww;$X8<bSg}358h4-Wg@~mbVbyeXhXYW;?4<>xsd6l~%+DLVv!upvJW!z_z
z)=Q34?JC8*2qRLxz>a)yx`;M2Yg3Gs3(;1|K9Es4M^EdN$>%!L?4un!HGMD~f2GUD
zTc=H5v?l%>4F93kf|sPoagmLpN?_-#^Rr{prf2I3!$S(T(A`=r9Peu$*245ut?}%x
z&e#OPVMDYV)JXjCU8g&oM!S<?)V7u~Yx>hOO(!Pqx5Xe_tW9O5Q(3%eUGAG?ic0h=
z4=qzYT$wX;?+Pu>FE?7wN;=~0G=71d*VZ&?lT{e7TU%?io^8kL4kG5`r&Qo3VJ?0S
zW<+%|bx!#Zx1BORQ^7hYol~Y?BJXjVRX+1YdQ7FcHc$3y6P-?CUH|dM`R(%?2lf|}
zg~qxy0fC9zqXI?)UkncxnbKyNx&!4rhn45soAJ_to>=d(i#JTyrpRrRmO4629cdDq
z#$LR|hF$Gr%SzB`F<D9;#!4;5yS8*)UaxI5sWwvO&ZD4>v4Og94W5uS*+`092bH08
z0}9k9k~9hEC2AkK1qgd}CrB9-c-hI}AkJ(0sOYNj$|6M;(j?jr<e76%BRE{|fnQ#G
ztdi{!SGQ(uZQZ8qD_0Z39_>Zf>rTcL1}fkOQv+2L2uw;H?yAx=anet)#Heb-E0_Ae
zP};yWRGw1pyUL|A>aZuuxw@$HG9Rm^T!aDQvd>u(tp<!xC3M!qZ+M!D)qOZ&sZid-
zau_n3>Lfm)mS~GP1Yl;1geAC9rG*@m>LU?Jv?JGl2bRzw26i}U0t9EZM1^|R)hET_
zL-e98DKFs+3JhD+<W?pBzCx>2|3RFxkr<w~5bEhn68}J*h;h5C;#8#|!QI8pL?aY~
zlhRR>w)20>muh$124?M6^>S3#Y9m!Wn`L$=C#hQ*8Ad*lj1I#|CylqtF9Iipg51`9
zT<(DANE|tB)<yYW4X+BZ6zmZVkLFTq?h8^-xZ5K-Bey}!jwnfzGbp~gkCHUC`NQo|
zysfIY?zOmgb>BQRFJYKoMtCl56iG+%8>y_$DDV-t_K@Nu3su`uh>G0t*=9>~IKKP`
K^|bS0KKdIOKcS%j

diff --git a/lang/English/post.php b/lang/English/post.php
new file mode 100644
index 00000000..c4ea7a76
--- /dev/null
+++ b/lang/English/post.php
@@ -0,0 +1,38 @@
+<?php
+
+// Language definitions used in post.php and edit.php
+$lang_post = array(
+
+// Post validation stuff (many are similiar to those in edit.php)
+'No subject'        =>    'Topics must contain a subject.',
+'No subject after censoring'    =>    'Topics must contain a subject. After applying censoring filters, your subject was empty.',
+'Too long subject'    =>    'Subjects cannot be longer than 70 characters.',
+'No message'        =>    'You must enter a message.',
+'No message after censoring'    =>    'You must enter a message. After applying censoring filters, your message was empty.',
+'Too long message'    =>    'Posts cannot be longer than %s bytes.',
+'All caps subject'    =>    'Subjects cannot contain only capital letters.',
+'All caps message'    =>    'Posts cannot contain only capital letters.',
+'Empty after strip'    =>    'It seems your post consisted of empty BBCodes only. It is possible that this happened because e.g. the innermost quote was discarded because of the maximum quote depth level.',
+
+// Posting
+'Post errors'        =>    'Post errors',
+'Post errors info'    =>    'The following errors need to be corrected before the message can be posted:',
+'Post preview'        =>    'Post preview',
+'Guest name'        =>    'Name', // For guests (instead of Username)
+'Post redirect'        =>    'Post entered.',
+'Post a reply'        =>    'Post a reply',
+'Post new topic'    =>    'Post new topic',
+'Hide smilies'        =>    'Never show smilies as icons for this post',
+'Subscribe'            =>    'Subscribe to this topic',
+'Stay subscribed'    =>    'Stay subscribed to this topic',
+'Topic review'        =>    'Topic review (newest first)',
+'Flood start'        =>    'At least %s seconds have to pass between posts. Please wait %s seconds and try posting again.',
+'Preview'            =>    'Preview', // submit button to preview message
+
+// Edit post
+'Edit post legend'    =>    'Edit the post and submit changes',
+'Silent edit'        =>    'Silent edit (don\'t display "Edited by ..." in topic view)',
+'Edit post'            =>    'Edit post',
+'Edit redirect'        =>    'Post updated.'
+
+);
diff --git a/lang/English/post.po b/lang/English/post.po
deleted file mode 100644
index 5472cbc5..00000000
--- a/lang/English/post.po
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "No subject"
-msgstr "Topics must contain a subject."
-
-msgid "No subject after censoring"
-msgstr "Topics must contain a subject. After applying censoring filters, your subject was empty."
-
-msgid "Too long subject"
-msgstr "Subjects cannot be longer than 70 characters."
-
-msgid "No message"
-msgstr "You must enter a message."
-
-msgid "No message after censoring"
-msgstr "You must enter a message. After applying censoring filters, your message was empty."
-
-msgid "Too long message"
-msgstr "Posts cannot be longer than %s bytes."
-
-msgid "All caps subject"
-msgstr "Subjects cannot contain only capital letters."
-
-msgid "All caps message"
-msgstr "Posts cannot contain only capital letters."
-
-msgid "Empty after strip"
-msgstr "It seems your post consisted of empty BBCodes only. It is possible that this happened because e.g. the innermost quote was discarded because of the maximum quote depth level."
-
-msgid "Post errors"
-msgstr "Post errors"
-
-msgid "Post errors info"
-msgstr "The following errors need to be corrected before the message can be posted:"
-
-msgid "Post preview"
-msgstr "Post preview"
-
-msgid "Guest name"
-msgstr "Name"
-
-msgid "Post redirect"
-msgstr "Post entered."
-
-msgid "Post a reply"
-msgstr "Post a reply"
-
-msgid "Post new topic"
-msgstr "Post new topic"
-
-msgid "Hide smilies"
-msgstr "Never show smilies as icons for this post"
-
-msgid "Subscribe"
-msgstr "Subscribe to this topic"
-
-msgid "Stay subscribed"
-msgstr "Stay subscribed to this topic"
-
-msgid "Topic review"
-msgstr "Topic review (newest first)"
-
-msgid "Flood start"
-msgstr "At least %s seconds have to pass between posts. Please wait %s seconds and try posting again."
-
-msgid "Preview"
-msgstr "Preview"
-
-msgid "Edit post legend"
-msgstr "Edit the post and submit changes"
-
-msgid "Silent edit"
-msgstr "Silent edit (don't display \"Edited by ...\" in topic view)"
-
-msgid "Edit post"
-msgstr "Edit post"
-
-msgid "Edit redirect"
-msgstr "Post updated."
diff --git a/lang/English/prof_reg.mo b/lang/English/prof_reg.mo
deleted file mode 100644
index c20bbbd19e3f9ba8d8b6e49836bffc40de556cb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5891
zcmbuCU5sQ!702%`iytEhiy$s47O)G`(zmyJc4t3kc9EIhnc0z@vDum31r`#j`&M_?
z&h1<6y>+{Hcrb?epa~C#L>`m`Vxlo>A~8H^^nsx92@_u21mpn|qY-0#;nDa%^>MqW
z89t0RQ}er3x9U{YIj8EJe(RQf-wW`ppnL&kb8irE@R@!1hv(*x1;NL`{ooDY0q`d9
zUROT`UWa-e{1mtXQvVHb3cL)`xHkA{Fav4)(~i$N{t&zc?Y{&+0sapB4EP#I<KA}s
zH~3l9X%doqJ4oXWf;9he@RML2q;YE?t?zNy{-om-NA36x$8S46>-fCmj~!of{FURY
zj;}dhb9~$J9mjVaX>+u`DaTtK?{u7YoN+wmxa`<)e9SR&OdPK|KJEC7<8zKLI{wu0
zWyjw-{=xBe$2UQ;*Iz->@4F!BbuTt?JGdX*50*f(!#vp769ntvJnApN2`+<gfDePm
zA>?N8JK!ns`yk2v6aGO(!C$~9!GD0C2hYLC_kmsT%iwpx5d1Y*1^*8I47}q;>o>m#
zzli!DL0aEG!HeMaSoG(>$H69;gCy@7h^d0>ut_XAxCwj(JOJJWz6nyl|9~M_!s2ON
zmq6M_hJOtF7D)5`2)q^i4M^wdb&&M)FObIXLFI1nu;Y1f4)q+Qd0qmi!8gD=!F^CF
z@gDFta1kVZJObVUeiOVG`~gVodIh9;-U4aAH{cM}z(XL_FM)@^zN<e6(t3XZ;xBmB
z@tSLY$JO_s6Yb|Vkk&r~lAbSswB8J){Xg&OFM~tW{|ug|epvihz@LBu{2TZLxQ@e2
z_W3yow=oZncu+#2eH=qMfii<a_MknSMmdV&pX>2bMj<^dqAa1*QRoUIolHJ3g?VVb
zq#Lq7J$q4L=HPymWt0_^BPgU_|Il4R`~MP31%+$}Q<;bM_W%l1Z){2aTt!(xIgWAw
z#Xo28a@beEd)zzel<W()4sJw&dzy!AcF?^;rREN#^D~QrBWZkh9z2Oc_Miu*Gd^M}
z6aSd2!wkWLC{rk8-(ZnPY_<L{m?R=%qQ_<ID|sf;g!e>HS4mr@J=W)07M$7G49;*Z
zSX-q%u7fk8&GQ({`@)T1A}K5u9g#%Ac!kZlY9_RnNr%-Y>XYA(OnjF~TLtHM(#d&8
z1m{$X$1>wus>Dy%z#3ViG{f3j-N00}QY`DLR0oYz4tQ&usXmR#{GbilVbm#BNhk1?
z9#6JeEEACho3dBz*StTa5@B2EjhSU#*sKRA_g8Ck)vA4)Dc+8Zy&Z91j}~o5=X~32
z(Kb8Qc68RtJ63!>R(w5Pw4E4x^CM0cZ72PRTGhAV&COdY){HmbR;<1@Gw0;hihb1l
z>ce8cVbzZatG*w-S$Sb~G{WyPtoj{=Rlkq0>i0o!eyra|SoQk|i+zN}>O-uQbnhIO
zEiTqoBu4es#^}A1i%gHIslcECjzFu+(`?jUxJ4m!%$wpo<#D)-gOJU!q;IO(>6v+E
zUr$db?5@+SR+^t`r0R-j>2Ng)FN!pS^Ubkk!F5-pi;Gi@uWg3)6jii`bhzdi+QRc<
zAgQZwI>$2|Zl*lRVy;z+PW~u_n}YYoB(hUH>dEB6ww<Ectf;i}z|`96+R|wLTBSOL
zqpd{(soQ-_s>M}(xF2(w%v(JOefq-Ya(H6Yk7jR+G+atrD#8(-V<(zY7YmtVBAI$5
zToH*#?HU_OL{hU_<wWHuzSwHGq4KmP>ZEI-=a`)&cvR&WuSE(w@C3(dfb(rGD0X3W
zy}}x?;F(|@#hSdeg)T6cN>eDd5^Q$e^}~1+!I~M{9+M_B3^7-nOqlMXit8)y6(U<*
zr68H(=734;J>~^j+5R^Cf5dtjl^s{=P^A&B)a_Vyx|(h90o0l?bI)L%Sg&Zeu|+n`
zqXAD^f@!*rn%k_#x=>@Ovg>`kp?ZSuCJ|#_ki%m*ShUSj(UF-|@lfh6l)?4He!ZSQ
zSSd?nD8`w!k%=5$V}bi->|<lc?)}cl4DPl~I-O8D?qg<cK}yRi!C4uJ-TF0ijlIQc
zXabVm$@}*vmx&NE-ZNlB#H8b4R~QE%-x=~m?=~Y=))Z_Y#gI2+SYyXRnMzIgp^0SM
zIE#@pwig-!0e*0XC~5jx6%HhaO-#7Sdu*Dbtld<}iLQ(S;D&GujK?FP3vMR%k#A)z
zQlpSq8Efz5nKnz&h=jOY*fDeLc?*_Ba6~kGzXLK&A4OU+IRQ;l35vz^cLrGss0r6O
z&LnH$3?epT_jWvaU&0R64&oE;0y}XrC$51U?rxkT^Fqk+56$cxu*(!(J`k*@QrO2#
zf$dNz$64Mrmg5c|(>e?UCo!H$XAO(9w@hq2l^L~V)?v)zjQZ`dq<o;lR@>|&9B6Vf
z<Ry8G+b+%&R3LDxk@2kwSwB?+xP1h-l&vls$~eXm8(jjp)ch?_38s;Jl-MOiHKc89
zDNj{j@TAOEQX!Hd#+x2CJt?s|?pXw{v3@j?Ewob!Be|{=O-pPEp0QJ;AH1_S#r#q4
z$!|ySZ57eOiKb+r#MV^SQbVjUkK1KjeLeU<(Sb%Rv^y{#F05i8<qjp*;9ENzjrb&z
z9AZ+*5E!?-q*-JyCAKd5Ja)1v>nJhgyq%awBI}mfVmHSWW%j7pLikN((#+FN(VK+V
zRZC@T6`?nYvNBuS<_T8ox=`|h?In?Fb!CDztgC^_WK*Wumg_=UO^J*_@>$(>TfhN?
z6(kOUGhCTHl=3W5+lY*#p|k;nOt^-#g*S5{z|BH=Qi*+)_h~Z^!Tqro%%y?VbSu||
zOiH7m-qHNdrdE#0t#*8NPEdTN(dTgP*;zFdu9cEVT4$_!NXV_K%IqR^ETIjp+<r`o
z34^G#t>P`$&xx=ew=Rb4F~LdIWwtD@Na&k)c;ubHB&0A2LRXjfyiuG8>xP@SpRnmh
zSBXSk^<AJ7-os6!y>pl}7CXV+;QJUcHmijOo`Mcx?mEY>8)R;gC>Q6!94uO+8)4VJ
zCZljcqgl(A`(RhJ(BrrqAj+M*$>EeJlba6PDo>&@x%Q|`$h5~`+$uJiE>5<a+j{02
zL~5jUuF?8pgSTY6SS01zI9F1)xWxV89Ni7DZnY5eYzs<V;k~AW6WcyT7aG6D)2}13
z=EX^|U!6al<wGuIxDbn6!{?z3rFJ-gP355lnM2XI50pK`HnFD@MmLeklW}*MpP|Nd
zbR3GDJ;QImZ4>ZX$ZoM~q;>eo*ETmRrMT{=tN8`0IdZLO`$M5bu|ki<0i+&T5sfCY
zp;0b(!TsDA&5QVE(oFlKk*3B0Uv2pG=)*;BA_n*gnE9nbDV+a}^5Ns(yQD%Dacnj?
z3b*XOGP~R4(w8a2c!EI%3Tfv5Gz%pXF0zk;?#%31RR7>~!u&j^e8TU#GH%YvG-c)^
L%k^o>NbG+B>1OB{

diff --git a/lang/English/prof_reg.php b/lang/English/prof_reg.php
new file mode 100644
index 00000000..0745348e
--- /dev/null
+++ b/lang/English/prof_reg.php
@@ -0,0 +1,79 @@
+<?php
+
+// Language definitions used in both profile.php and register.php
+$lang_prof_reg = array(
+
+'Email legend'                =>    'Enter a valid email address',
+'Email legend 2'            =>    'Enter and confirm a valid email address',
+'Localisation legend'        =>    'Set your localisation options',
+'Time zone'                    =>    'Time zone',
+'Time zone info'            =>    'For the forum to display times correctly you must select your local time zone. If Daylight Savings Time is in effect you should also check the option provided which will advance times by 1 hour.',
+'DST'                        =>    'Daylight Savings Time is in effect (advance time by 1 hour).',
+'Time format'                =>    'Time format',
+'Date format'                =>    'Date format',
+'Default'                    =>    'Default',
+'Language'                    =>    'Language',
+'Email setting info'        =>    'Select whether you want your email address to be viewable to other users or not and if you want other users to be able to send you email via the forum (form email) or not.',
+'Email setting 1'            =>    'Display your email address to other users.',
+'Email setting 2'            =>    'Hide your email address but allow form email.',
+'Email setting 3'            =>    'Hide your email address and disallow form email.',
+'Privacy options legend'    =>    'Set your privacy options',
+'Confirm pass'                =>    'Confirm password',
+
+'Username too short'        =>    'Usernames must be at least 2 characters long. Please choose another (longer) username.',
+'Username too long'            =>    'Usernames must not be more than 25 characters long. Please choose another (shorter) username.',
+'Username guest'            =>    'The username guest is reserved. Please choose another username.',
+'Username IP'                =>    'Usernames may not be in the form of an IP address. Please choose another username.',
+'Username reserved chars'    =>    'Usernames may not contain all the characters \', " and [ or ] at once. Please choose another username.',
+'Username BBCode'            =>    'Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username.',
+'Banned username'            =>    'The username you entered is banned in this forum. Please choose another username.',
+'Pass too short'            =>    'Passwords must be at least 6 characters long. Please choose another (longer) password.',
+'Pass not match'            =>    'Passwords do not match.',
+'Banned email'                =>    'The email address you entered is banned in this forum. Please choose another email address.',
+'Dupe email'                =>    'Someone else is already registered with that email address. Please choose another email address.',
+'Sig too long'                =>    'Signatures cannot be longer than %1$s characters. Please reduce your signature by %2$s characters.',
+'Sig too many lines'        =>    'Signatures cannot have more than %s lines.',
+'Bad ICQ'                    =>    'You entered an invalid ICQ UIN. Please go back and correct.',
+
+'UTC-12:00'                    =>    '(UTC-12:00) International Date Line West',
+'UTC-11:00'                    =>    '(UTC-11:00) Niue, Samoa',
+'UTC-10:00'                    =>    '(UTC-10:00) Hawaii-Aleutian, Cook Island',
+'UTC-09:30'                    =>    '(UTC-09:30) Marquesas Islands',
+'UTC-09:00'                    =>    '(UTC-09:00) Alaska, Gambier Island',
+'UTC-08:30'                    =>    '(UTC-08:30) Pitcairn Islands',
+'UTC-08:00'                    =>    '(UTC-08:00) Pacific',
+'UTC-07:00'                    =>    '(UTC-07:00) Mountain',
+'UTC-06:00'                    =>    '(UTC-06:00) Central',
+'UTC-05:00'                    =>    '(UTC-05:00) Eastern',
+'UTC-04:00'                    =>    '(UTC-04:00) Atlantic',
+'UTC-03:30'                    =>    '(UTC-03:30) Newfoundland',
+'UTC-03:00'                    =>    '(UTC-03:00) Amazon, Central Greenland',
+'UTC-02:00'                    =>    '(UTC-02:00) Mid-Atlantic',
+'UTC-01:00'                    =>    '(UTC-01:00) Azores, Cape Verde, Eastern Greenland',
+'UTC'                        =>    '(UTC) Western European, Greenwich',
+'UTC+01:00'                    =>    '(UTC+01:00) Central European, West African',
+'UTC+02:00'                    =>    '(UTC+02:00) Eastern European, Central African',
+'UTC+03:00'                    =>    '(UTC+03:00) Eastern African',
+'UTC+03:30'                    =>    '(UTC+03:30) Iran',
+'UTC+04:00'                    =>    '(UTC+04:00) Moscow, Gulf, Samara',
+'UTC+04:30'                    =>    '(UTC+04:30) Afghanistan',
+'UTC+05:00'                    =>    '(UTC+05:00) Pakistan',
+'UTC+05:30'                    =>    '(UTC+05:30) India, Sri Lanka',
+'UTC+05:45'                    =>    '(UTC+05:45) Nepal',
+'UTC+06:00'                    =>    '(UTC+06:00) Bangladesh, Bhutan, Yekaterinburg',
+'UTC+06:30'                    =>    '(UTC+06:30) Cocos Islands, Myanmar',
+'UTC+07:00'                    =>    '(UTC+07:00) Indochina, Novosibirsk',
+'UTC+08:00'                    =>    '(UTC+08:00) Greater China, Australian Western, Krasnoyarsk',
+'UTC+08:45'                    =>    '(UTC+08:45) Southeastern Western Australia',
+'UTC+09:00'                    =>    '(UTC+09:00) Japan, Korea, Chita, Irkutsk',
+'UTC+09:30'                    =>    '(UTC+09:30) Australian Central',
+'UTC+10:00'                    =>    '(UTC+10:00) Australian Eastern',
+'UTC+10:30'                    =>    '(UTC+10:30) Lord Howe',
+'UTC+11:00'                    =>    '(UTC+11:00) Solomon Island, Vladivostok',
+'UTC+11:30'                    =>    '(UTC+11:30) Norfolk Island',
+'UTC+12:00'                    =>    '(UTC+12:00) New Zealand, Fiji, Magadan',
+'UTC+12:45'                    =>    '(UTC+12:45) Chatham Islands',
+'UTC+13:00'                    =>    '(UTC+13:00) Tonga, Phoenix Islands, Kamchatka',
+'UTC+14:00'                    =>    '(UTC+14:00) Line Islands'
+
+);
diff --git a/lang/English/prof_reg.po b/lang/English/prof_reg.po
deleted file mode 100644
index 9409aa33..00000000
--- a/lang/English/prof_reg.po
+++ /dev/null
@@ -1,225 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Email legend"
-msgstr "Enter a valid email address"
-
-msgid "Email legend 2"
-msgstr "Enter and confirm a valid email address"
-
-msgid "Localisation legend"
-msgstr "Set your localisation options"
-
-msgid "Time zone"
-msgstr "Time zone"
-
-msgid "Time zone info"
-msgstr "For the forum to display times correctly you must select your local time zone. If Daylight Savings Time is in effect you should also check the option provided which will advance times by 1 hour."
-
-msgid "DST"
-msgstr "Daylight Savings Time is in effect (advance time by 1 hour)."
-
-msgid "Time format"
-msgstr "Time format"
-
-msgid "Date format"
-msgstr "Date format"
-
-msgid "Default"
-msgstr "Default"
-
-msgid "Language"
-msgstr "Language"
-
-msgid "Email setting info"
-msgstr "Select whether you want your email address to be viewable to other users or not and if you want other users to be able to send you email via the forum (form email) or not."
-
-msgid "Email setting 1"
-msgstr "Display your email address to other users."
-
-msgid "Email setting 2"
-msgstr "Hide your email address but allow form email."
-
-msgid "Email setting 3"
-msgstr "Hide your email address and disallow form email."
-
-msgid "Privacy options legend"
-msgstr "Set your privacy options"
-
-msgid "Confirm pass"
-msgstr "Confirm password"
-
-msgid "Username too short"
-msgstr "Usernames must be at least 2 characters long. Please choose another (longer) username."
-
-msgid "Username too long"
-msgstr "Usernames must not be more than 25 characters long. Please choose another (shorter) username."
-
-msgid "Username guest"
-msgstr "The username guest is reserved. Please choose another username."
-
-msgid "Username IP"
-msgstr "Usernames may not be in the form of an IP address. Please choose another username."
-
-msgid "Username reserved chars"
-msgstr "Usernames may not contain all the characters ', \" and [ or ] at once. Please choose another username."
-
-msgid "Username BBCode"
-msgstr "Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username."
-
-msgid "Banned username"
-msgstr "The username you entered is banned in this forum. Please choose another username."
-
-msgid "Pass too short"
-msgstr "Passwords must be at least 6 characters long. Please choose another (longer) password."
-
-msgid "Pass not match"
-msgstr "Passwords do not match."
-
-msgid "Banned email"
-msgstr "The email address you entered is banned in this forum. Please choose another email address."
-
-msgid "Dupe email"
-msgstr "Someone else is already registered with that email address. Please choose another email address."
-
-msgid "Sig too long"
-msgstr "Signatures cannot be longer than %1$s characters. Please reduce your signature by %2$s characters."
-
-msgid "Sig too many lines"
-msgstr "Signatures cannot have more than %s lines."
-
-msgid "Bad ICQ"
-msgstr "You entered an invalid ICQ UIN. Please go back and correct."
-
-msgid "UTC-12:00"
-msgstr "(UTC-12:00) International Date Line West"
-
-msgid "UTC-11:00"
-msgstr "(UTC-11:00) Niue, Samoa"
-
-msgid "UTC-10:00"
-msgstr "(UTC-10:00) Hawaii-Aleutian, Cook Island"
-
-msgid "UTC-09:30"
-msgstr "(UTC-09:30) Marquesas Islands"
-
-msgid "UTC-09:00"
-msgstr "(UTC-09:00) Alaska, Gambier Island"
-
-msgid "UTC-08:30"
-msgstr "(UTC-08:30) Pitcairn Islands"
-
-msgid "UTC-08:00"
-msgstr "(UTC-08:00) Pacific"
-
-msgid "UTC-07:00"
-msgstr "(UTC-07:00) Mountain"
-
-msgid "UTC-06:00"
-msgstr "(UTC-06:00) Central"
-
-msgid "UTC-05:00"
-msgstr "(UTC-05:00) Eastern"
-
-msgid "UTC-04:00"
-msgstr "(UTC-04:00) Atlantic"
-
-msgid "UTC-03:30"
-msgstr "(UTC-03:30) Newfoundland"
-
-msgid "UTC-03:00"
-msgstr "(UTC-03:00) Amazon, Central Greenland"
-
-msgid "UTC-02:00"
-msgstr "(UTC-02:00) Mid-Atlantic"
-
-msgid "UTC-01:00"
-msgstr "(UTC-01:00) Azores, Cape Verde, Eastern Greenland"
-
-msgid "UTC"
-msgstr "(UTC) Western European, Greenwich"
-
-msgid "UTC+01:00"
-msgstr "(UTC+01:00) Central European, West African"
-
-msgid "UTC+02:00"
-msgstr "(UTC+02:00) Eastern European, Central African"
-
-msgid "UTC+03:00"
-msgstr "(UTC+03:00) Eastern African"
-
-msgid "UTC+03:30"
-msgstr "(UTC+03:30) Iran"
-
-msgid "UTC+04:00"
-msgstr "(UTC+04:00) Moscow, Gulf, Samara"
-
-msgid "UTC+04:30"
-msgstr "(UTC+04:30) Afghanistan"
-
-msgid "UTC+05:00"
-msgstr "(UTC+05:00) Pakistan"
-
-msgid "UTC+05:30"
-msgstr "(UTC+05:30) India, Sri Lanka"
-
-msgid "UTC+05:45"
-msgstr "(UTC+05:45) Nepal"
-
-msgid "UTC+06:00"
-msgstr "(UTC+06:00) Bangladesh, Bhutan, Yekaterinburg"
-
-msgid "UTC+06:30"
-msgstr "(UTC+06:30) Cocos Islands, Myanmar"
-
-msgid "UTC+07:00"
-msgstr "(UTC+07:00) Indochina, Novosibirsk"
-
-msgid "UTC+08:00"
-msgstr "(UTC+08:00) Greater China, Australian Western, Krasnoyarsk"
-
-msgid "UTC+08:45"
-msgstr "(UTC+08:45) Southeastern Western Australia"
-
-msgid "UTC+09:00"
-msgstr "(UTC+09:00) Japan, Korea, Chita, Irkutsk"
-
-msgid "UTC+09:30"
-msgstr "(UTC+09:30) Australian Central"
-
-msgid "UTC+10:00"
-msgstr "(UTC+10:00) Australian Eastern"
-
-msgid "UTC+10:30"
-msgstr "(UTC+10:30) Lord Howe"
-
-msgid "UTC+11:00"
-msgstr "(UTC+11:00) Solomon Island, Vladivostok"
-
-msgid "UTC+11:30"
-msgstr "(UTC+11:30) Norfolk Island"
-
-msgid "UTC+12:00"
-msgstr "(UTC+12:00) New Zealand, Fiji, Magadan"
-
-msgid "UTC+12:45"
-msgstr "(UTC+12:45) Chatham Islands"
-
-msgid "UTC+13:00"
-msgstr "(UTC+13:00) Tonga, Phoenix Islands, Kamchatka"
-
-msgid "UTC+14:00"
-msgstr "(UTC+14:00) Line Islands"
diff --git a/lang/English/profile.mo b/lang/English/profile.mo
deleted file mode 100644
index 59c8f7e636ece29c768e9fb9322345b6a5d0afad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9585
zcmbW6dyFK<UB^3q;P{9k*yQ0PKwXmK?!xYD{77u?*~#tgy*AvQ*LS<VTrecPGc_}P
zH`6`t?zz1^_`?wq5f~6CLbeD=5D`yD3XzdOktL*vC{hGbhy(&DSP)*416KZuf*=x~
z@2{%oaqC2uTU+z(s;<Yce($P%{`Q-GE8)3Dc?;#gZcLI-gU{W<56|g+N%8~W8h8h|
z0rHo0_<1c@fcpLf_y+K!;17bIiueq88}&a2Uk`o})VQyMuLl1cd=2>RSih0M>i-&0
z?Qa4#-$8zE2k!x22c85)&tstG8-YIpei+m`9|J|#pMaY0bMgCMf|~blLH?5G`S~I6
z1rQRF{{gkmO?1+@H-PGYAlB~&Z=!w_{9*6}sC{pNcY;F@7A7AB`AeSUM|3_7ik{Da
zTJKp<<G%okj<12@$Mc}Z|0k&Zd^3LkE_f^TTOmsQ?f|v!TR@5GUQqKt2#O!8pyu5K
z)&D~ve@VuV=G_5B$1j7L_i2zNlHZH?Sx|g_4%9kd12ygiQ2Y5mQ2cr=lW3kd^P}<a
z0JZ*opw>MNYM+mQ;#&$bH0j3n8Wg`j0&4!JK#l)nQ0sgi)cCJNd>+&~FM`_N|AOj&
z3!OyI8$s>oZJ_!sf|`FBRR8tZelga&p!$~}QzgFuYQ87IH-o<eYM#FU#osT2qU*0g
zjr(U%`*{J>xbJ}cCAU%$-U;gaVNiN`AE<fG#`Z1nN2#}C{c5cL5-9$E9DF1Ax%mCd
z5&r>{-2Vd<JuiaV{|zwlX7IL%cYs>&PH^K@N#bJtahUQ9?N>pKdpncd11^E;-v&kh
zC9ndofj<wv2>yiHA(|zVUjbX-$HB+IFM}F)5aK2O`#|mgD9ESeEU52o@NHlPz8!oD
zWa{KOQ2o9NE`k3J$}hbR=83MmLCyC7cnCZNs^18de18}GBk(hz<g<nH{s#C#@Dt#-
zK+X5-Fjeb514=Ky3Z4i54unO?VT@UNe*~00o(E5X7r=wyr$Ev3B~bKy1(g1L9o!Fo
z6V(21dsCS2_24I|9|AuBehCzPZ$-(ZUkl(B@B#1u_^04u@bAGDP(+^vj)Cg`o8T(=
zN$|(OZ-7TZRel;+0iObY4O{~c{CJ?F0GTrRF!&_+3Gl7pVT3Ar&VbUNM?tOg7$`Ys
z@%uGU`}_zfzI`m#p9ZCme+WvSJ_~BT&x7K_UxAX(-+=1(kD%oIFQDl8Hi)Q`+g;GF
zL!j0<4XXVD2&u^sM6}7Tg3_Z;gNMOqL0Fpn6R35+13rPi-+(aG{}<Wh8u;6w*84Y5
z@{<yZf46||1rLDYvj@+Be+H`Gt5B8&@YSH?{VoualT}dP+p+x;C_1mk`cn~qAJl%H
z1s(VWQ2hPZh~EOmm+yiPfH$KAvWNGA;{SP2a_N9t?-I!NtS^w<Mfq9EaaDMvOZQPu
zQ|_m{gQDjViuNm;d6c3@@)B*@xAr8x7f&H&?)jNmYk@t=yC|q#a)ct=d7L61>5&d%
zO3At^@p(7cr#wdaNlHp-o_l$DI94#7<Oa%7iuV3NO7pyjm#a+$ly5&r*`%~7&9lgh
z^kX+RY=M_3;<27pisUFB>+u0hr}Zjbk)BAG4pQDp8B-i(hw>1mdAhvFXXug6AR6-l
zsyB~xy{7zJY`6>#C<O%-OD<4urfg6SQSPQlZ-0uiLeY~`9;95OpuUqwdbCZE{#KNd
zau4MM<^7cRQ8J3`<3@_?@fc-Dk!|Ve1V~2Ua(owjfFga<b1Hz@v2^?-<wKN<lw{@M
zGj44?S!vhVm9+NG57TVmDxcTMN@tkmE-z}Itc>eIZ&`QOb;pB2vO?#yjNm$c;A`J;
zrSD{=Z!^?B(_Xck_bl%g&HKRjeBNnl<I$i<_YAIFC#%x!f$t>8_*(CdJTLil4OPaK
zFO$`Nn)kd*14*%F`)EFm(yE$$caebABJXD9Fw*}$TEiN#XYO}gm@PD<bynog_Qqs&
z+OC<bhJ{r#+i~Mf5}+Y6*0$L~Bqg?timI-f&bD&=u#=W~miLkqCLdd{d9CVljQEPY
zieE4LUALWfVl6HZdXGmPq})kPW&@v`EXwVy)A6~hvzq#;vKWut&=0qLS@p9~L))JA
ziJaF~A4%5o83NYwE9oHXxE;S;WvJ8ExiiW8(rqS8&ZJfCw7<YEt6s_I73)5|;@$Qj
z%`YcsincK}SwDX^SuZ-iOzWbgU+B7C(6bAZ*~nQ05@fA66V2J85ol@}JoHtS_IyHn
zSK9`wtS6|4BeYB!Ta>#rO!fQWK_^VMk@m7&hG8s^HOV}(bt5h7EFHL@#K{Jl)^z2q
zk%Tojyq~R1)p-M+7dbOsr#~Cw7^W~9q`PtE*_MV3>CN<W<wm|_1MGUEEVOIHnvW-y
zi2%>}bdaY*pPci(tg1a9!Yt>JMsgm`Xs^b{Ni7mHsl#5}1x%<WO@Zao*JcXnvF+_?
z$m-o`TZt2Dt6sZd(V5uL`F^nzO@}p9$%gE0?p-pC4Z(=4-?XtBW`nF5QjNE(cA1TW
z)mYEE7-elH$a-#=US+mx?4Qc0^j9*!qj&URTv}^*i=1jcG%7La=^h{BJeS%i@X`S8
zF7=c1^)9lALbD1>&Jfdl+AIn;NK525d1JNAYCBoSJItY<_4+i3?5Vi7^2>R#lbd;n
z*ex@7*DcENu$r$;b#Kc&Fkj6PM@KqWYv|g-;X1rrc13ctTE`sR%w*~^DvKd|pKq0-
zxik-!H9MnyFay(!>?Y`Jav^w;1{Hx^Iv5l?82*K_$dQgb`^B_h6v_5(jd(}dRgWTW
z48~<TSj58(t7VsutXe&E_YoIfA3Bt~{SUdj4j<Wvfm}k*7uPzAkFq%WzU)r=wC?-z
z*s*;Z4{t86mQ-n9JdPt+cC;;?Ln+j?X_7Zv+$__)8pu`A=?p<>jFK*H`gAxmqkGV-
z>1a1BvAx|Y%HDhSt*@=0n67_U>z(@)Pq3@SO(Ng2tNqn_2_KN<M_jv~mX)s`+S)w1
zc>lDYR`2?9@kEZsVSCH&{_U)u5VGuizVH2ur+gmV>9X4>h}X5dt95_tUcQ9t;`w4+
zwmo4~Yb?94$Rtn5V}{UAE4S?l9kP8#b^yOzHS+DOo8d#!PN&2#xSg!-qqx%u;czE1
zU`Ci4$+c>z0;~D)W@yW;bsf}o3SZ?1k$Z`A@NTylyEb979iy$rnsNsxg_VU^k?zS~
zhRCpu_UyW7{oAZuIDf^LyS!jVHhGLtt(cuONlMW24$Zj3klkdJOI<Z&%HWRJM_RLE
z>P#KIB)k~s1Tf8ATD}sMJv5lBVypPOF@9bO&e$|3fM>lP!<aLF1#24LMVT!dSGgE@
z7h)BwG&|Yeb?rgczKqhCFa}wE89Feumic0vB<{KiMMZR;D}fndP7i}Nk%+1IL>AH&
zhFLP#ELn|5qoS-scMDJ~;_6b$gH$4kuvjc9x<+iUd`kseZe^y1AWH9gS$Dx*8u?!E
zF?p{=R14u<8~er+e_#ouWmVrhXKeIuHecK+O0p@;5#NXVLia3fG`2Juq4ilCYEx;B
z-QY7i@DSZZ7vv&ELs)x0>zr$wn{8v@)5=elGxZXec3416ik?>{V3Pz2jjBliZqkXE
zQ#Pq(^zp}o?>;mquL>I->>gH#QG#ky$Bt4=Qzqj>2$^UMVp1<BK@Zc8Z#B!<*b5<b
z-S5IA7=$@_IJv|UVLD7Y>OO7*2Z|!e{<YgS&K)l3^ZcH}NUi5k;0YBAroxkHZ8K(&
zw$}~>=3{dM7;8$9l~n6&2+@`zFS`Sk3@$jM#+n;1Hxc=qgOeqN1C+8QSx?JdgmklM
zv#hCEk;F=1VS4S4^wZ0;vAI1SF|HD<Wa?d`qns|OJaY%;XSn`S`K;v!H2A9{@>`f0
zb*c1=rGI=3j}=99Y{ItUbirjC-%Zt&VOI+;$J5Rz-X1@mz=(2w3DXk`9x)|uh4Y9!
zhn+-B?!*;KN6pg{LJ$_l6b~%2wpktr9Z7LBT|yv3!$d8t*tEygv#0aT-cwFRs*B&!
zS>{5Yh$f)~!lL&K*~o%@XcPjb+Q9*LwVk#vOM0e(%DIEMW{yB}`@vYUa7t?JIU1Sr
zO;1LlIz1R^6?PH>UdMOS@c<V(JuYSKvZ#t~?N-|DV$2ynZhxnrwfiv%40IYps(vx%
zpreS>c+*0Ow-N;3a%ailmffbzTOPrsqmfc*Q4u>8WrZi!DXVezh-t8s?pDZHhcxaA
zl$#E-O4*WjuB9R+QLTMR2sZT{=ZX=UUotT}Y2u0<-6m@MGNS+4CZVt+qVh!Z(AN<=
z^*h0t%I)MBk0Lf?gvKeyf)1Ej69F)yp^l>cY`8?Wr~$JYIMun9i~!y2m=~*XL|7>5
ztaBMU9iv?<o=oH6qCLiv^IG|eIYjX;CdRE~<MhVM;#i=m_KHg>dCnl7tWo#8Js9IU
zQ!-+*N=q;uf{>i#6f6?OQ)QDeS;*HONb<r7Js5V?N}2=nOsJHb%g4G*(0nmiSo&|%
z%FK4MsxK0C!cu1FQ`9t=(2P%^L1%CyEM^^Y6@iZ!pz%@e&$M(DPUP^d(VdCf)Nml}
zv0E4z6@q}J#7ibnb0pCn#k(!R#uw`-GT@ZK_(^Xi8f`^oA_8|8IPUA6bE9gFHy7Ej
z#6PD&1aak8;+D<xPRN;L?2Xg45T#t210(x{$01!uFy;K(6K+Mnh_{>-4}6-vxkzH*
z7OU7hIWmc)!bl#j6Bc4J7_&`y8FR@6M9*zXd(6pKYR@@AeZpDa)ZY|GDpWOxZUU6K
z<Y9W*o90MlWL{k)>C2h)HLhXyCUw)ymLwz_n$=vby-hAj=59<Hrjb%|M|0hki4C?J
zlNtAd+>_(s-X=LQy&_q++bC8~nj4?Vi;mPA^H(78<|}Qt85XWS%&mm{&HSltf{jkE
zMJBA;(;B?~gm>|~JaS-#P4d#6;{A!k%z9-yBA~bonPU1jNOQczt%{n1<tOXhstkPI
ztNUWttc@)>`<CTCh+#E&zNwI#OPJ-ETbPxZ&jhIEBsR)Or_A4QV8(G{)%sd<HQNtI
z3sdjFH2M0h4o+Q$fV;(6U6Mmcw~H~q`7Ti%O_8%2WS0qwNUfias*ns=_*A=`SQu^7
zchf5vkuE^(3P{<QwO3r48{L?5eUPkqq=9_eFH%C6Mmn~Fs6rm@*s)c@vdip9tPRC@
zEyu0+JT;sUTSIQ7(UlK@RQC;B2ob%-6WL~*W64|8?XW*gM%jSOb%#tyM`NSHt_kL;
zBeN<9Dv&ncZpS~{v@*wzU$AKx?7YzDNF-*4&9DiGP+C8;nW<f)S0PT?{M^Ek*O7D)
z47ouI_h=Xd7lmQ{**mo6XsRIb{f?G)!4{6#aD^+<^lCO74;y-HD|>@X-CWH{bRopF
zNRkv0ERiA1+kJ&3WYfkzHr@9lNB4Smz|^rwmwVI@RyZ&0p)FijuAm<A#t-%|u4r4{
zFwOX9V&2x=UEoPw2~HC^SF$2^$P-7m^-`CD!R<p+ybZAZO!yEk1nm@a-Sr?5V@oH*
zcrQ2~K;&@d?glN1P=B?Wb3IUDE!STQUc@M`*CA-((1bf^((hnjwsK&;Cu0tmhef>P
Wx5GrZMcnV?pYc-s!(#42@&5r|czkyN

diff --git a/lang/English/profile.php b/lang/English/profile.php
new file mode 100644
index 00000000..2d19ba6c
--- /dev/null
+++ b/lang/English/profile.php
@@ -0,0 +1,143 @@
+<?php
+
+// Language definitions used in profile.php
+$lang_profile = array(
+
+// Navigation and sections
+'Profile menu'                    =>    'Profile menu',
+'Section essentials'            =>    'Essentials',
+'Section personal'                =>    'Personal',
+'Section messaging'                =>    'Messaging',
+'Section personality'            =>    'Personality',
+'Section display'                =>    'Display',
+'Section privacy'                =>    'Privacy',
+'Section admin'                    =>    'Administration',
+
+// Miscellaneous
+'Username and pass legend'        =>    'Enter your username and password',
+'Personal details legend'        =>    'Enter your personal details',
+'Contact details legend'        =>    'Enter your messaging details',
+'User activity'                    =>    'User activity',
+'Paginate info'                    =>    'Enter the number of topics and posts you wish to view on each page.',
+
+// Password stuff
+'Pass key bad'                    =>    'The specified password activation key was incorrect or has expired. Please re-request a new password. If that fails, contact the forum administrator at',
+'Pass updated'                    =>    'Your password has been updated. You can now login with your new password.',
+'Pass updated redirect'            =>    'Password updated.',
+'Wrong pass'                    =>    'Wrong old password.',
+'Change pass'                    =>    'Change password',
+'Change pass legend'            =>    'Enter and confirm your new password',
+'Old pass'                        =>    'Old password',
+'New pass'                        =>    'New password',
+'Confirm new pass'                =>    'Confirm new password',
+'Pass info'                        =>    'Passwords must be at least 6 characters long. Passwords are case sensitive.',
+
+// Email stuff
+'Email key bad'                    =>    'The specified email activation key was incorrect or has expired. Please re-request change of email address. If that fails, contact the forum administrator at',
+'Email updated'                    =>    'Your email address has been updated.',
+'Activate email sent'            =>    'An email has been sent to the specified address with instructions on how to activate the new email address. If it doesn\'t arrive you can contact the forum administrator at',
+'Email legend'                    =>    'Enter your new email address',
+'Email instructions'            =>    'An email will be sent to your new address with an activation link. You must click the link in the email you receive to activate the new address.',
+'Change email'                    =>    'Change email address',
+'New email'                        =>    'New email',
+
+// Avatar upload stuff
+'Avatars disabled'                =>    'The administrator has disabled avatar support.',
+'Too large ini'                    =>    'The selected file was too large to upload. The server didn\'t allow the upload.',
+'Partial upload'                =>    'The selected file was only partially uploaded. Please try again.',
+'No tmp directory'                =>    'PHP was unable to save the uploaded file to a temporary location.',
+'No file'                        =>    'You did not select a file for upload.',
+'Bad type'                        =>    'The file you tried to upload is not of an allowed type. Allowed types are gif, jpeg and png.',
+'Too wide or high'                =>    'The file you tried to upload is wider and/or higher than the maximum allowed',
+'Too large'                        =>    'The file you tried to upload is larger than the maximum allowed',
+'pixels'                        =>    'pixels',
+'bytes'                            =>    'bytes',
+'Move failed'                    =>    'The server was unable to save the uploaded file. Please contact the forum administrator at',
+'Unknown failure'                =>    'An unknown error occurred. Please try again.',
+'Avatar upload redirect'        =>    'Avatar uploaded.',
+'Avatar deleted redirect'        =>    'Avatar deleted.',
+'Avatar desc'                    =>    'An avatar is a small image that will be displayed under your username in your posts. It must not be any bigger than',
+'Upload avatar'                    =>    'Upload avatar',
+'Upload avatar legend'            =>    'Enter an avatar file to upload',
+'Delete avatar'                    =>    'Delete avatar', // only for admins
+'File'                            =>    'File',
+'Upload'                        =>    'Upload', // submit button
+
+// Form validation stuff
+'Forbidden title'                =>    'The title you entered contains a forbidden word. You must choose a different title.',
+'Profile redirect'                =>    'Profile updated.',
+
+// Profile display stuff
+'Users profile'                    =>    '%s\'s profile',
+'Username info'                    =>    'Username: %s',
+'Email info'                    =>    'Email: %s',
+'Posts info'                    =>    'Posts: %s',
+'Registered info'                =>    'Registered: %s',
+'Last post info'                =>    'Last post: %s',
+'Last visit info'                =>    'Last visit: %s',
+'Show posts'                    =>    'Show all posts',
+'Show topics'                    =>    'Show all topics',
+'Show subscriptions'            =>    'Show all subscriptions',
+'Realname'                        =>    'Real name',
+'Location'                        =>    'Location',
+'Website'                        =>    'Website',
+'Invalid website URL'            =>    'The website URL you entered is invalid.',
+'Website not allowed'            =>    'You are not allowed to add a website to your profile yet.',
+'Jabber'                        =>    'Jabber',
+'ICQ'                            =>    'ICQ',
+'MSN'                            =>    'Microsoft Account',
+'AOL IM'                        =>    'AOL IM',
+'Yahoo'                            =>    'Yahoo! Messenger',
+'Avatar'                        =>    'Avatar',
+'Signature'                        =>    'Signature',
+'Sig max size'                    =>    'Max length: %s characters / Max lines: %s',
+'Avatar legend'                    =>    'Set your avatar display options',
+'Avatar info'                    =>    'An avatar is a small image that will be displayed with all your posts. You can upload an avatar by clicking the link below.',
+'Change avatar'                    =>    'Change avatar',
+'Signature legend'                =>    'Compose your signature',
+'Signature info'                =>    'A signature is a small piece of text that is attached to your posts. In it, you can enter just about anything you like. Perhaps you would like to enter your favourite quote or your star sign. It\'s up to you! In your signature you can use BBCode if it is allowed in this particular forum. You can see the features that are allowed/enabled listed below whenever you edit your signature.',
+'Sig preview'                    =>    'Current signature preview:',
+'No sig'                        =>    'No signature currently stored in profile.',
+'Signature quote/code/list/h'    =>    'The quote, code, list, and heading BBCodes are not allowed in signatures.',
+'Topics per page'                =>    'Topics',
+'Posts per page'                =>    'Posts',
+'Leave blank'                    =>    'Leave blank to use forum default.',
+'Subscription legend'            =>    'Set your subscription options',
+'Notify full'                    =>    'Include a plain text version of new posts in subscription notification emails.',
+'Auto notify full'                =>    'Automatically subscribe to every topic you post in.',
+'Show smilies'                    =>    'Show smilies as graphic icons.',
+'Show images'                    =>    'Show images in posts.',
+'Show images sigs'                =>    'Show images in user signatures.',
+'Show avatars'                    =>    'Show user avatars in posts.',
+'Show sigs'                        =>    'Show user signatures.',
+'Style legend'                    =>    'Select your preferred style',
+'Styles'                        =>    'Styles',
+'Admin note'                    =>    'Admin note',
+'Pagination legend'                =>    'Enter your pagination options',
+'Post display legend'            =>    'Set your options for viewing posts',
+'Post display info'                =>    'If you are on a slow connection, disabling these options, particularly showing images in posts and signatures, will make pages load faster.',
+'Instructions'                    =>    'When you update your profile, you will be redirected back to this page.',
+
+// Administration stuff
+'Group membership legend'        =>    'Choose user group',
+'Save'                            =>    'Save',
+'Set mods legend'                =>    'Set moderator access',
+'Moderator in info'                =>    'Choose which forums this user should be allowed to moderate. Note: This only applies to moderators. Administrators always have full permissions in all forums.',
+'Update forums'                    =>    'Update forums',
+'Delete ban legend'                =>    'Delete (administrators only) or ban user',
+'Delete user'                    =>    'Delete user',
+'Ban user'                        =>    'Ban user',
+'Confirm delete legend'            =>    'Important: read before deleting user',
+'Confirm delete user'            =>    'Confirm delete user',
+'Confirmation info'                =>    'Please confirm that you want to delete the user', // the username will be appended to this string
+'Delete warning'                =>    'Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by this user, the posts can only be deleted manually at a later time.',
+'Delete posts'                    =>    'Delete any posts and topics this user has made.',
+'Delete'                        =>    'Delete', // submit button (confirm user delete)
+'User delete redirect'            =>    'User deleted.',
+'User promote redirect'            =>    'User promoted.',
+'Group membership redirect'        =>    'Group membership saved.',
+'Update forums redirect'        =>    'Forum moderator rights updated.',
+'Ban redirect'                    =>    'Redirecting …',
+'No delete admin message'        =>    'Administrators cannot be deleted. In order to delete this user, you must first move him/her to a different user group.',
+
+);
diff --git a/lang/English/profile.po b/lang/English/profile.po
deleted file mode 100644
index bbd7f00b..00000000
--- a/lang/English/profile.po
+++ /dev/null
@@ -1,378 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Profile menu"
-msgstr "Profile menu"
-
-msgid "Section essentials"
-msgstr "Essentials"
-
-msgid "Section personal"
-msgstr "Personal"
-
-msgid "Section messaging"
-msgstr "Messaging"
-
-msgid "Section personality"
-msgstr "Personality"
-
-msgid "Section display"
-msgstr "Display"
-
-msgid "Section privacy"
-msgstr "Privacy"
-
-msgid "Section admin"
-msgstr "Administration"
-
-msgid "Username and pass legend"
-msgstr "Enter your username and password"
-
-msgid "Personal details legend"
-msgstr "Enter your personal details"
-
-msgid "Contact details legend"
-msgstr "Enter your messaging details"
-
-msgid "User activity"
-msgstr "User activity"
-
-msgid "Paginate info"
-msgstr "Enter the number of topics and posts you wish to view on each page."
-
-msgid "Pass key bad"
-msgstr "The specified password activation key was incorrect or has expired. Please re-request a new password. If that fails, contact the forum administrator at"
-
-msgid "Pass updated"
-msgstr "Your password has been updated. You can now login with your new password."
-
-msgid "Pass updated redirect"
-msgstr "Password updated."
-
-msgid "Wrong pass"
-msgstr "Wrong old password."
-
-msgid "Change pass"
-msgstr "Change password"
-
-msgid "Change pass legend"
-msgstr "Enter and confirm your new password"
-
-msgid "Old pass"
-msgstr "Old password"
-
-msgid "New pass"
-msgstr "New password"
-
-msgid "Confirm new pass"
-msgstr "Confirm new password"
-
-msgid "Pass info"
-msgstr "Passwords must be at least 6 characters long. Passwords are case sensitive."
-
-msgid "Email key bad"
-msgstr "The specified email activation key was incorrect or has expired. Please re-request change of email address. If that fails, contact the forum administrator at"
-
-msgid "Email updated"
-msgstr "Your email address has been updated."
-
-msgid "Activate email sent"
-msgstr "An email has been sent to the specified address with instructions on how to activate the new email address. If it doesn't arrive you can contact the forum administrator at"
-
-msgid "Email legend"
-msgstr "Enter your new email address"
-
-msgid "Email instructions"
-msgstr "An email will be sent to your new address with an activation link. You must click the link in the email you receive to activate the new address."
-
-msgid "Change email"
-msgstr "Change email address"
-
-msgid "New email"
-msgstr "New email"
-
-msgid "Avatars disabled"
-msgstr "The administrator has disabled avatar support."
-
-msgid "Too large ini"
-msgstr "The selected file was too large to upload. The server didn't allow the upload."
-
-msgid "Partial upload"
-msgstr "The selected file was only partially uploaded. Please try again."
-
-msgid "No tmp directory"
-msgstr "PHP was unable to save the uploaded file to a temporary location."
-
-msgid "No file"
-msgstr "You did not select a file for upload."
-
-msgid "Bad type"
-msgstr "The file you tried to upload is not of an allowed type. Allowed types are gif, jpeg and png."
-
-msgid "Too wide or high"
-msgstr "The file you tried to upload is wider and/or higher than the maximum allowed"
-
-msgid "Too large"
-msgstr "The file you tried to upload is larger than the maximum allowed"
-
-msgid "pixels"
-msgstr "pixels"
-
-msgid "bytes"
-msgstr "bytes"
-
-msgid "Move failed"
-msgstr "The server was unable to save the uploaded file. Please contact the forum administrator at"
-
-msgid "Unknown failure"
-msgstr "An unknown error occurred. Please try again."
-
-msgid "Avatar upload redirect"
-msgstr "Avatar uploaded."
-
-msgid "Avatar deleted redirect"
-msgstr "Avatar deleted."
-
-msgid "Avatar desc"
-msgstr "An avatar is a small image that will be displayed under your username in your posts. It must not be any bigger than"
-
-msgid "Upload avatar"
-msgstr "Upload avatar"
-
-msgid "Upload avatar legend"
-msgstr "Enter an avatar file to upload"
-
-msgid "Delete avatar"
-msgstr "Delete avatar"
-
-msgid "File"
-msgstr "File"
-
-msgid "Upload"
-msgstr "Upload"
-
-msgid "Forbidden title"
-msgstr "The title you entered contains a forbidden word. You must choose a different title."
-
-msgid "Profile redirect"
-msgstr "Profile updated."
-
-msgid "Users profile"
-msgstr "%s's profile"
-
-msgid "Username info"
-msgstr "Username: %s"
-
-msgid "Email info"
-msgstr "Email: %s"
-
-msgid "Posts info"
-msgstr "Posts: %s"
-
-msgid "Registered info"
-msgstr "Registered: %s"
-
-msgid "Last post info"
-msgstr "Last post: %s"
-
-msgid "Last visit info"
-msgstr "Last visit: %s"
-
-msgid "Show posts"
-msgstr "Show all posts"
-
-msgid "Show topics"
-msgstr "Show all topics"
-
-msgid "Show subscriptions"
-msgstr "Show all subscriptions"
-
-msgid "Realname"
-msgstr "Real name"
-
-msgid "Location"
-msgstr "Location"
-
-msgid "Website"
-msgstr "Website"
-
-msgid "Invalid website URL"
-msgstr "The website URL you entered is invalid."
-
-msgid "Website not allowed"
-msgstr "You are not allowed to add a website to your profile yet."
-
-msgid "Jabber"
-msgstr "Jabber"
-
-msgid "ICQ"
-msgstr "ICQ"
-
-msgid "MSN"
-msgstr "Microsoft Account"
-
-msgid "AOL IM"
-msgstr "AOL IM"
-
-msgid "Yahoo"
-msgstr "Yahoo! Messenger"
-
-msgid "Avatar"
-msgstr "Avatar"
-
-msgid "Signature"
-msgstr "Signature"
-
-msgid "Sig max size"
-msgstr "Max length: %s characters / Max lines: %s"
-
-msgid "Avatar legend"
-msgstr "Set your avatar display options"
-
-msgid "Avatar info"
-msgstr "An avatar is a small image that will be displayed with all your posts. You can upload an avatar by clicking the link below."
-
-msgid "Change avatar"
-msgstr "Change avatar"
-
-msgid "Signature legend"
-msgstr "Compose your signature"
-
-msgid "Signature info"
-msgstr "A signature is a small piece of text that is attached to your posts. In it, you can enter just about anything you like. Perhaps you would like to enter your favourite quote or your star sign. It's up to you! In your signature you can use BBCode if it is allowed in this particular forum. You can see the features that are allowed/enabled listed below whenever you edit your signature."
-
-msgid "Sig preview"
-msgstr "Current signature preview:"
-
-msgid "No sig"
-msgstr "No signature currently stored in profile."
-
-msgid "Signature quote/code/list/h"
-msgstr "The quote, code, list, and heading BBCodes are not allowed in signatures."
-
-msgid "Topics per page"
-msgstr "Topics"
-
-msgid "Posts per page"
-msgstr "Posts"
-
-msgid "Leave blank"
-msgstr "Leave blank to use forum default."
-
-msgid "Subscription legend"
-msgstr "Set your subscription options"
-
-msgid "Notify full"
-msgstr "Include a plain text version of new posts in subscription notification emails."
-
-msgid "Auto notify full"
-msgstr "Automatically subscribe to every topic you post in."
-
-msgid "Show smilies"
-msgstr "Show smilies as graphic icons."
-
-msgid "Show images"
-msgstr "Show images in posts."
-
-msgid "Show images sigs"
-msgstr "Show images in user signatures."
-
-msgid "Show avatars"
-msgstr "Show user avatars in posts."
-
-msgid "Show sigs"
-msgstr "Show user signatures."
-
-msgid "Style legend"
-msgstr "Select your preferred style"
-
-msgid "Styles"
-msgstr "Styles"
-
-msgid "Admin note"
-msgstr "Admin note"
-
-msgid "Pagination legend"
-msgstr "Enter your pagination options"
-
-msgid "Post display legend"
-msgstr "Set your options for viewing posts"
-
-msgid "Post display info"
-msgstr "If you are on a slow connection, disabling these options, particularly showing images in posts and signatures, will make pages load faster."
-
-msgid "Instructions"
-msgstr "When you update your profile, you will be redirected back to this page."
-
-msgid "Group membership legend"
-msgstr "Choose user group"
-
-msgid "Save"
-msgstr "Save"
-
-msgid "Set mods legend"
-msgstr "Set moderator access"
-
-msgid "Moderator in info"
-msgstr "Choose which forums this user should be allowed to moderate. Note: This only applies to moderators. Administrators always have full permissions in all forums."
-
-msgid "Update forums"
-msgstr "Update forums"
-
-msgid "Delete ban legend"
-msgstr "Delete (administrators only) or ban user"
-
-msgid "Delete user"
-msgstr "Delete user"
-
-msgid "Ban user"
-msgstr "Ban user"
-
-msgid "Confirm delete legend"
-msgstr "Important: read before deleting user"
-
-msgid "Confirm delete user"
-msgstr "Confirm delete user"
-
-msgid "Confirmation info"
-msgstr "Please confirm that you want to delete the user"
-
-msgid "Delete warning"
-msgstr "Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by this user, the posts can only be deleted manually at a later time."
-
-msgid "Delete posts"
-msgstr "Delete any posts and topics this user has made."
-
-msgid "Delete"
-msgstr "Delete"
-
-msgid "User delete redirect"
-msgstr "User deleted."
-
-msgid "User promote redirect"
-msgstr "User promoted."
-
-msgid "Group membership redirect"
-msgstr "Group membership saved."
-
-msgid "Update forums redirect"
-msgstr "Forum moderator rights updated."
-
-msgid "Ban redirect"
-msgstr "Redirecting …"
-
-msgid "No delete admin message"
-msgstr "Administrators cannot be deleted. In order to delete this user, you must first move him/her to a different user group."
diff --git a/lang/English/register.mo b/lang/English/register.mo
deleted file mode 100644
index f076b7ec197bfa69d341ed5f2390572d16f257ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3064
zcma)8O>Z1U5FH?VnGhg+BnKiD5+8|_nZ#BCW`iSQCq@<tG4Tcg2c+Ja+SwsJ-Anh3
zmqp^hg%e0{KwRL2#6LhBI3OX8hzkceAkIkq1|(i}&wB0PAVwL#?Vj$gS5>d7^T*)>
zpCx#X;(Z+N?|7fW`^9begXi?^NpdG}5qKByIpF=k^WFGzhg-k}%)beI0LZ}mfNh5#
z0Pn^4<8J&p@L`O<0v-f@+kO8Lcn`)uci(>n3b((2hk*y~i0h94#m<u*p6T#nhkf8C
zd?<jz|C<Am|98MgG5!H~7T<pZ{*Cb=I5z|yygNyb0X<Ooe+tZiUjknS{sc^cM?vxk
za2+V)w}77jKLX-katzLje@_Effj!_a!1sY?fUhE03iu)L6!1^r*TADNx(xgtC@FXZ
z?}K>d5r089_#?T1Yrz&E#7OueOgj&#247`DxJcd}lEEz=P)iQ&`X+gioJ!mu!z=zK
z7fQ#RtSOVTPS&g$R<0(lRi%@Q>~mU-u#{YqIjYRic0Y}6s8&rrO4hAwYjUk-pS)tp
z@Pr(fKG{^>#~tC9=8{d3T;r1RU=OQ`%5mPrIa`l4Hyj3$0hU(2VJB1g;Z##uL+qS&
ze!sbBY|rAMwiY&p8+8P(dv-?EOgS5GU9vMS+A+i7z2l|%xZA&}Tc>miuWR2UGY&()
zvUHB(&z0kbo>-y96XzB-oqZerr5i>18aog6Jz8hgjM%NNE^J=yr)v&F%%>Ms!#%=W
zdX2X$Svs4#tbCL9oibjl#yTvztW4RelG8q`de@2cf-36Dyf};|27}DH^8CV;jVqVt
z_7}6$3rKXs2B%KPFxv3D&8e|gl{rWGNIB2V%Ju$wx;$Se)`#rUOD4BPWy&5c52|K|
zNRQYoyq><qhLI%UxM`8wh8DBs><qrdVY+2om-AY*(W7YOKQu_HC>;Bnl0B)krV^AI
zn%b6Bo?{6$mK2$`9<U=jB#A+by`)S5y^YnN(p6Jo!b<ojm1k;=+J>stKyya@5o2oD
znq2ZB!p(JCFkv;t%~P=v+>$d37PZpY`o^Ec$XBHiKCnJ9B%?q8`&A<xA#Y{GepnN>
z1#WelkEpf|6gGyzp^@5#Ni(H)TK18Q<5D>ZJdUe84MW9=^L}JoU6ArOumj;j`eUV7
zmnEyL?S!yi$&NZ4UbnuXp+wNO4V)zF3PcQ^!A7XIjIN>^gvHA7&NLTcsxv4O4dHh*
zb{6Le;{uDfE0n*)tf+=i3{*zYQv>S3b18ihnJHt)L4|eUX%MJdqo-&pH;|e!Nc&oW
z=UBN$GAh62;C~&bG<t-%5+fVwWXT%{Pw*BT@Lkci(p3?g+e}ypT-*gU6}E<T^eE9V
zyd9%`O%NRldK-vgID<gNj7DW<T{rB6iu4xffV0+^?dgsEdFqf8StQaOOKfIMbEnJs
zEVNIt@1qwW03m5cH=t)jovIvup{-d{W+W{(u9l?b3R(tVB&phFoF)4hRT?58716c&
z5VCw^v3AGdy{$F&YRyG<(|p&jGm=1yQ3J7QTb77jWwNA?EZ+#4f%tZ01ZTqz=w=q*
z5t1-q5SRxT<j0&>5C^o~MOw-Onky`O^9*9=99#?M2Th@+As|5^u{`z^17g?F=l!n}
zls}3@qhKT*@s2@OU>_Mr>~rhns=|1{IDc+<RyMulLdar^>xCw8Y4!nICRH<v+Le1}
zV{_(HC%^C=`W1C+$uEl9p(9z;7H^B{;#u7V816K%JUJHxic0p7gc5uuwBXrHB&xgj
zqIEc1@1~N`7Cf6ug9y`Td)B~a#b^S%ib%<S6r%cf2Wr0tg3P0UXSXaA7IlX>;OGX|
z40^C(G@j7*x@%aXBw~k>qgEkGs1jv6ZzQubvt-NGEN4h>)3`#5>AvBfZMZcf9MD*c
zc3tBhkeKhL9=b;~KZ_ema4?<6T{tK`hSJ-bU6m_6uS`0w()Yy6)9Ldk{-0ZW%XA*Y
RSt^%8lU+JHHxkP~`3D%zqaXkP

diff --git a/lang/English/register.php b/lang/English/register.php
new file mode 100644
index 00000000..b1a80018
--- /dev/null
+++ b/lang/English/register.php
@@ -0,0 +1,37 @@
+<?php
+
+// Language definitions used in register.php
+$lang_register = array(
+
+// Miscellaneous
+'No new regs'                =>    'This forum is not accepting new registrations.',
+'Reg cancel redirect'        =>    'Registration cancelled.',
+'Forum rules'                =>    'Forum rules',
+'Rules legend'                =>    'You must agree to the following in order to register',
+'Registration flood'        =>    'A new user was registered with the same IP address as you within the last hour. To prevent registration flooding, at least an hour has to pass between registrations from the same IP. Sorry for the inconvenience.',
+'Agree'                        =>    'Agree',
+'Cancel'                    =>    'Cancel',
+'Register'                    =>    'Register',
+
+// Form validation stuff (some of these are also used in post.php)
+'Registration errors'        =>    'Registration errors',
+'Registration errors info'    =>    'The following errors need to be corrected before you can register:',
+'Username censor'            =>    'The username you entered contains one or more censored words. Please choose a different username.',
+'Username dupe 1'            =>    'Someone is already registered with the username',
+'Username dupe 2'            =>    'The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username.',
+'Email not match'            =>    'Email addresses do not match.',
+
+// Registration email stuff
+'Reg email'                    =>    'Thank you for registering. Your password has been sent to the specified address. If it doesn\'t arrive you can contact the forum administrator at',
+'Reg complete'                =>    'Registration complete. You are now logged in.',
+
+// Register info
+'Desc 1'                    =>    'Registration will grant you access to a number of features and capabilities otherwise unavailable. These functions include the ability to edit and delete posts, design your own signature that accompanies your posts and much more. If you have any questions regarding this forum you should ask an administrator.',
+'Desc 2'                    =>    'Below is a form you must fill out in order to register. Once you are registered you should visit your profile and review the different settings you can change. The fields below only make up a small part of all the settings you can alter in your profile.',
+'Username legend'            =>    'Please enter a username between 2 and 25 characters long',
+'Pass legend'                =>    'Please enter and confirm your chosen password',
+'Pass info'                    =>    'Passwords must be at least 6 characters long. Passwords are case sensitive.',
+'Email info'                =>    'You must enter a valid email address as your randomly generated password will be sent to that address.',
+'Confirm email'                =>    'Confirm email address',
+
+);
diff --git a/lang/English/register.po b/lang/English/register.po
deleted file mode 100644
index 7cde2e42..00000000
--- a/lang/English/register.po
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "No new regs"
-msgstr "This forum is not accepting new registrations."
-
-msgid "Reg cancel redirect"
-msgstr "Registration cancelled."
-
-msgid "Forum rules"
-msgstr "Forum rules"
-
-msgid "Rules legend"
-msgstr "You must agree to the following in order to register"
-
-msgid "Registration flood"
-msgstr "A new user was registered with the same IP address as you within the last hour. To prevent registration flooding, at least an hour has to pass between registrations from the same IP. Sorry for the inconvenience."
-
-msgid "Agree"
-msgstr "Agree"
-
-msgid "Cancel"
-msgstr "Cancel"
-
-msgid "Register"
-msgstr "Register"
-
-msgid "Registration errors"
-msgstr "Registration errors"
-
-msgid "Registration errors info"
-msgstr "The following errors need to be corrected before you can register:"
-
-msgid "Username censor"
-msgstr "The username you entered contains one or more censored words. Please choose a different username."
-
-msgid "Username dupe 1"
-msgstr "Someone is already registered with the username"
-
-msgid "Username dupe 2"
-msgstr "The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username."
-
-msgid "Email not match"
-msgstr "Email addresses do not match."
-
-msgid "Reg email"
-msgstr "Thank you for registering. Your password has been sent to the specified address. If it doesn't arrive you can contact the forum administrator at"
-
-msgid "Reg complete"
-msgstr "Registration complete. You are now logged in."
-
-msgid "Desc 1"
-msgstr "Registration will grant you access to a number of features and capabilities otherwise unavailable. These functions include the ability to edit and delete posts, design your own signature that accompanies your posts and much more. If you have any questions regarding this forum you should ask an administrator."
-
-msgid "Desc 2"
-msgstr "Below is a form you must fill out in order to register. Once you are registered you should visit your profile and review the different settings you can change. The fields below only make up a small part of all the settings you can alter in your profile."
-
-msgid "Username legend"
-msgstr "Please enter a username between 2 and 25 characters long"
-
-msgid "Pass legend"
-msgstr "Please enter and confirm your chosen password"
-
-msgid "Pass info"
-msgstr "Passwords must be at least 6 characters long. Passwords are case sensitive."
-
-msgid "Email info"
-msgstr "You must enter a valid email address as your randomly generated password will be sent to that address."
-
-msgid "Confirm email"
-msgstr "Confirm email address"
diff --git a/lang/English/search.mo b/lang/English/search.mo
deleted file mode 100644
index 1f68f853019433a51326c94ee5a3f1f980c6b99e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4068
zcma);Pi$009LGlmh2r0eB7!ie<?rs6B34|ep%e;@P%7OTxrnpx&2}Gs``$V;+jSGp
zc)@s3qtR&8Xf)BpfEP8KOgvynO!T52NW93+7!M}Ki{IbOyxnfMRVO>|v-AHqzxn-s
zGuQf8yvC4*kvAe=y@9a_@Z3%KAicYSvDM&v;BDY1;631%;Jx5?;Ck>^@P3f3bnP2J
zY99joz+>R8;IuD42d+VR4!j*~f_H=GLF)G=cnkQEFMkH!f%0W=EqE2Y6Z{2S1^xk&
ze1ChczS+&Y4kUTEg7<+3K$3R`+zh55?fYfVPr(OJz5?RMuH!@d_zfhvRzfJ!M?Xk%
zZv;t>T_Ek}0Js4>=G#M%_N76R<3$iZ_BK8w?}s4G^SQ78+Lyoe?LUEcq5V2Y`~M3h
zeXho)iEBYxcQZJJv)cudeCP0?`Oky2zgNNS;6;$+_!-;+{tnXkeoVFw+yv6R!}vgz
zY}A*Jg4FL6Nb)`lZUSo{$#(%Hy}biI4qgTy1^@KSVenp*%iuWpI+z2mfdz04lsgC(
zK{CCwAn8BxY=ETab0DT<FM$}!-T?7qAK*j%FM?!;Uw~!s2M}9i!%)Wa;6aei^AflU
z`nm!>hVu8=6z!`IN-l!yLDEkN#E;G6L;5%m(mEGF90hyDm*4X3?}N17$G-g%Nb-IK
z_JiMmB=?UXmbZ1JcS@wMJ;<cj8<8oIF38@=riPJ8CQ4*ev_2(FWfRFyiR_!wpo9IA
zOmzNGhqZ?x5L>r<B7IPL1bHVi$xG>B<gLg9$Ye8=wjt9w>_Fzo*5^Um6WIaj=0Rlg
zEjriT$a!S)J+hA+GNoM()+P`-x)My-ribV|ssovXQ8LR$8>X5nuBA{xl^tsFa%!qv
zSJNgJn%7fpbWg2G>rr5<=VYsys!;b1=xON;YG{cC7q8G&>pLHoZ8^tN)u?4+9!<GP
zt#Hi!wf)(XPMWOO38}T1m0Tnt*NyU785ow;rAgdklPRx8*dLh4rr#_IN<urPQ+CSX
zb*XBR)=`?!2+XJh71a&Ob_#=L`=^nJL^q|9A@#HSa(c{4es@nbqF~MoYxQvkQn21y
zC(e=$^*EAxiI#5RdZ%0<;u4KGpEFM4Wg7hkrk&9^a3}*Rhy;)2ER2i!>PnoZ?Lw4f
z)ltHuq>?Tub`M+FSZl;4s>hO7$Ov@TKqWO=bvBPLF4d(im$N)J-DQDUDcf4A3@^9X
zv?CYRP1;2(NV`P3;wGxec1>n(b~qeFDpn$=;nwbEtOGdZO~nl*;ylc|ri(nO+oB%X
zv!A=aBij?cWrPpy*xxs$QnKOvM3{eCDzd{OAD6;Zr8;z|Z|Y<zKc-Mbeg3d8vdB@F
zKPBfQ>Y7y@7uw`Y3Kkj*lPYvNE|S>>{3KtJqPAd0en5n^C^=YhOO(rnRLwrocVgni
zk<R)<h24E)X=30n`BJNnMU8yH4Ax^2CHr|$6-rApGE*AQ@9XrV)hklvk0e1#L8!?0
zl_S#@q{wB`_e}n%Or&x$PNg!83?C}&E9^y!E9R%uh6?1ETcgO`BFl!hDGFsgfUFP=
zi}Gy)dRq=>%m=hP9L<{%VxP7A<vK1o%YP4NZrpN<x%$P?&c`;A=l_H`QoN0I)`WW^
zo^7_~cN%)j!j6)rp%NML#Kpn_E5V!)Gm%l{yus<E9U{4ol0fnnO%ubMI9Zq}bcIn~
z74wpprA&BDgwoCcmxryoA$#`nD#q&qgETxu08Wh?(}}Va;}JdWARmIs78^>El#zC!
z6$~0m!2siyoyEt#GB$+?MAGuRa7$UaP>=q&g@i#=pe>|{<o?Pc9S-736p8nGnkHL6
zRf{y#iKO0e>@Fdc4H1hvJJZ5xn~wOTlx4bm?f+Z<N!%Etfr;j&H8ET{)9zlP?K`uY
z>0C!kSfT6VVl_Krm0}OpZ#WC;Y&6r<04{q8H^QZ#>9Q`g##x&t9k&}Ob%9TjYH{=e
zuDf6qUB^bXd`I#`F$<S0WFZ`P#8@>=F%qh5R->TmbV&xsn`t8sc^u8bEZV0+Ge#BH
zE^u*oTIeur-1Pxj=XlM(3Y<SE``)3oV}w>LN5<bC568|<9(wZjk;`lcp-$B}EXCgZ
zolzuifltf2K={IJ^e%8Nr0XIe&ENvyqmzeo{NyR?v6ClDG+fC_1Up=y{{rulz}-TA
zeexxGTqL3<d0Me<;yW~}q&{bDR%?;2E|!mEXhv}u2o>5uEduh0og_Vn=q3^|eAfh3
zNX#ZG6b`ISYa1N2RhSHOT*PtKfcat=LS_SD`%JT2`ZSI(fMW&jfawPAl8<g%`&{!a
z3Ocd(d;5f_0jiph@L=;cnoVx6@azE~w2QeuHfJ}pfA6w!dP&$G{^IuU!=4M<8&2=V
F{STjGN0I;l

diff --git a/lang/English/search.php b/lang/English/search.php
new file mode 100644
index 00000000..17c7d546
--- /dev/null
+++ b/lang/English/search.php
@@ -0,0 +1,64 @@
+<?php
+
+// Language definitions used in search.php
+$lang_search = array(
+
+// The search form
+'User search'                        =>    'User search',
+'No search permission'                =>    'You do not have permission to use the search feature.',
+'Search flood'                        =>    'At least %s seconds have to pass between searches. Please wait %s seconds and try searching again.',
+'Search'                            =>    'Search',
+'Search criteria legend'            =>    'Enter your search criteria',
+'Search info'                        =>    'To search by keyword, enter a term or terms to search for. Separate terms with spaces. Use AND, OR and NOT to refine your search. To search by author enter the username of the author whose posts you wish to search for. Use wildcard character * for partial matches.',
+'Keyword search'                    =>    'Keyword search',
+'Author search'                        =>    'Author search',
+'Search in legend'                    =>    'Select where to search',
+'Search in info'                    =>    'Choose in which forum you would like to search and if you want to search in topic subjects, message text or both.',
+'Search multiple forums info'        =>    'If no forums are selected, all forums will be searched.',
+'Forum search'                        =>    'Forum',
+'Search in'                            =>    'Search in',
+'Message and subject'                =>    'Message text and topic subject',
+'Message only'                        =>    'Message text only',
+'Topic only'                        =>    'Topic subject only',
+'Sort by'                            =>    'Sort by',
+'Sort order'                        =>    'Sort order',
+'Search results legend'                =>    'Select how to view search results',
+'Search results info'                =>    'You can choose how you wish to sort and show your results.',
+'Sort by post time'                    =>    'Post time',
+'Sort by author'                    =>    'Author',
+'Sort by subject'                    =>    'Subject',
+'Sort by forum'                        =>    'Forum',
+'Ascending'                            =>    'Ascending',
+'Descending'                        =>    'Descending',
+'Show as'                            =>    'Show results as',
+'Show as topics'                    =>    'Topics',
+'Show as posts'                        =>    'Posts',
+
+// Results
+'Search'                            =>    'Search',
+'Search results'                    =>    'Search results',
+'Quick search show_new'                =>    'New',
+'Quick search show_recent'            =>    'Active',
+'Quick search show_unanswered'        =>    'Unanswered',
+'Quick search show_replies'            =>    'Posted',
+'Quick search show_user_topics'        =>    'Topics by %s',
+'Quick search show_user_posts'        =>    'Posts by %s',
+'Quick search show_subscriptions'    =>    'Subscribed by %s',
+'By keywords show as topics'        =>    'Topics with posts containing \'%s\'',
+'By keywords show as posts'            =>    'Posts containing \'%s\'',
+'By user show as topics'            =>    'Topics with posts by %s',
+'By user show as posts'                =>    'Posts by %s',
+'By both show as topics'            =>    'Topics with posts containing \'%s\', by %s',
+'By both show as posts'                =>    'Posts containing \'%s\', by %s',
+'No terms'                            =>    'You have to enter at least one keyword and/or an author to search for.',
+'No hits'                            =>    'Your search returned no hits.',
+'No user posts'                        =>    'There are no posts by this user in this forum.',
+'No user topics'                    =>    'There are no topics by this user in this forum.',
+'No subscriptions'                    =>    'This user is currently not subscribed to any topics.',
+'No new posts'                        =>    'There are no topics with new posts since your last visit.',
+'No recent posts'                    =>    'No new posts have been made within the last 24 hours.',
+'No unanswered'                        =>    'There are no unanswered posts in this forum.',
+'Go to post'                        =>    'Go to post',
+'Go to topic'                        =>    'Go to topic'
+
+);
diff --git a/lang/English/search.po b/lang/English/search.po
deleted file mode 100644
index 0f2f643b..00000000
--- a/lang/English/search.po
+++ /dev/null
@@ -1,174 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "User search"
-msgstr "User search"
-
-msgid "No search permission"
-msgstr "You do not have permission to use the search feature."
-
-msgid "Search flood"
-msgstr "At least %s seconds have to pass between searches. Please wait %s seconds and try searching again."
-
-msgid "Search"
-msgstr "Search"
-
-msgid "Search criteria legend"
-msgstr "Enter your search criteria"
-
-msgid "Search info"
-msgstr "To search by keyword, enter a term or terms to search for. Separate terms with spaces. Use AND, OR and NOT to refine your search. To search by author enter the username of the author whose posts you wish to search for. Use wildcard character * for partial matches."
-
-msgid "Keyword search"
-msgstr "Keyword search"
-
-msgid "Author search"
-msgstr "Author search"
-
-msgid "Search in legend"
-msgstr "Select where to search"
-
-msgid "Search in info"
-msgstr "Choose in which forum you would like to search and if you want to search in topic subjects, message text or both."
-
-msgid "Search multiple forums info"
-msgstr "If no forums are selected, all forums will be searched."
-
-msgid "Forum search"
-msgstr "Forum"
-
-msgid "Search in"
-msgstr "Search in"
-
-msgid "Message and subject"
-msgstr "Message text and topic subject"
-
-msgid "Message only"
-msgstr "Message text only"
-
-msgid "Topic only"
-msgstr "Topic subject only"
-
-msgid "Sort by"
-msgstr "Sort by"
-
-msgid "Sort order"
-msgstr "Sort order"
-
-msgid "Search results legend"
-msgstr "Select how to view search results"
-
-msgid "Search results info"
-msgstr "You can choose how you wish to sort and show your results."
-
-msgid "Sort by post time"
-msgstr "Post time"
-
-msgid "Sort by author"
-msgstr "Author"
-
-msgid "Sort by subject"
-msgstr "Subject"
-
-msgid "Sort by forum"
-msgstr "Forum"
-
-msgid "Ascending"
-msgstr "Ascending"
-
-msgid "Descending"
-msgstr "Descending"
-
-msgid "Show as"
-msgstr "Show results as"
-
-msgid "Show as topics"
-msgstr "Topics"
-
-msgid "Show as posts"
-msgstr "Posts"
-
-msgid "Search results"
-msgstr "Search results"
-
-msgid "Quick search show_new"
-msgstr "New"
-
-msgid "Quick search show_recent"
-msgstr "Active"
-
-msgid "Quick search show_unanswered"
-msgstr "Unanswered"
-
-msgid "Quick search show_replies"
-msgstr "Posted"
-
-msgid "Quick search show_user_topics"
-msgstr "Topics by %s"
-
-msgid "Quick search show_user_posts"
-msgstr "Posts by %s"
-
-msgid "Quick search show_subscriptions"
-msgstr "Subscribed by %s"
-
-msgid "By keywords show as topics"
-msgstr "Topics with posts containing '%s'"
-
-msgid "By keywords show as posts"
-msgstr "Posts containing '%s'"
-
-msgid "By user show as topics"
-msgstr "Topics with posts by %s"
-
-msgid "By user show as posts"
-msgstr "Posts by %s"
-
-msgid "By both show as topics"
-msgstr "Topics with posts containing '%s', by %s"
-
-msgid "By both show as posts"
-msgstr "Posts containing '%s', by %s"
-
-msgid "No terms"
-msgstr "You have to enter at least one keyword and/or an author to search for."
-
-msgid "No hits"
-msgstr "Your search returned no hits."
-
-msgid "No user posts"
-msgstr "There are no posts by this user in this forum."
-
-msgid "No user topics"
-msgstr "There are no topics by this user in this forum."
-
-msgid "No subscriptions"
-msgstr "This user is currently not subscribed to any topics."
-
-msgid "No new posts"
-msgstr "There are no topics with new posts since your last visit."
-
-msgid "No recent posts"
-msgstr "No new posts have been made within the last 24 hours."
-
-msgid "No unanswered"
-msgstr "There are no unanswered posts in this forum."
-
-msgid "Go to post"
-msgstr "Go to post"
-
-msgid "Go to topic"
-msgstr "Go to topic"
diff --git a/lang/English/topic.mo b/lang/English/topic.mo
deleted file mode 100644
index 680eb6f72a32f79359530e4da6cac94432ef590e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1475
zcmaiyxo;FP6vhn+0hTifS0IH!LV`%Mun380l0_(+L#td%vVqVsJLBw5n6+27hh%B#
z(j!q&K|@6v3M51cReCDu_ya(+NPKT*a!L?uJU<`r_-w!LJ)JKY+9mXU^xx=L(Kim@
zhxYg&V_l#Jc7lzJP4E!r8tevF!4u#bcocjI9tU58N5FNE{6Bz)!A~H?{S4;74Upn}
z&Gx^6<o_ev|CR0k0r9bpj?}LUq<GyR#p?qpKL^Qw06YfX0m-feR&cgSknCSU6zO_{
zALW0W@f}F#dJhhOU%->#Pp}6hV>(waNPhkJQT!_)#T@|YT!m~tob8uD(lrT^u0;?Z
z3-E&^ww$d?km5fBDc*DNJh%oX_X?8#I!Jjxg7jpR^8$JwIyKUatt1xBPovX2Q9GL=
zxvx_gQ(QXR#cZ9>n~mu%s79z!-gD@riyFNLX(JuDp5z>7z@&|eNLazfg3z*Yt(t5i
z7RIu2g?mAug)ux*^|}aH*>DrrjIYBQW>cQAT#(bW3b?PN)haS<My&7<Gd80TbarVe
z3MD8LR1|!)Xhm&CL&GXsJPpMPsG6|nu@Rcxk3;_nZ@~aViZVxEJv3HmB%XtRC=5|)
z%jP#Fv8rl?KKCPKV6`B(w6ceyW<tcNM6vcFXI$x~ak*?IQ&YS(#M5E%n&g*@yl{Oe
z2SLliw@x{59tdqhC0#x)Jlha@WF%LatvV%*Db}4)&kC1g&6&et$aHgwuE?osPnyWH
zO2cT%ll9oE3#Tf)=8lMb*bADWytkC5sMYdH*YD=0%hO}q`3w1*xf1SKNJMS7kkpD*
zd!rS3p&a6V!_!9C;zD)Y8Qiv`>`OvBW71baDC;gCtc7+<h|7h{EjklI3Y}`KD0)<0
z$PeakV<(+D^D5T9D5W`Eo+e>?OUM0Z?L1O3_q5=CtTpsU?H#4Wt>U&38W0b-U05RE
twKi2(Ds6X-CFMai=I&Qy?*FPREym3<b9dAkjgvx42D>V4kKldl?l0XCOUM8K

diff --git a/lang/English/topic.php b/lang/English/topic.php
new file mode 100644
index 00000000..0ef0df93
--- /dev/null
+++ b/lang/English/topic.php
@@ -0,0 +1,33 @@
+<?php
+
+// Language definitions used in viewtopic.php
+$lang_topic = array(
+
+'Post reply'        =>    'Post reply',
+'Topic closed'        =>    'Topic closed',
+'From'                =>    'From:', // User location
+'Promote user'        =>    'Promote user',
+'IP address logged'    =>    'IP address logged',
+'Note'                =>    'Note:', // Admin note
+'Posts'                =>    'Posts:',
+'Registered'        =>    'Registered:',
+'Replies'            =>    'Replies:',
+'Website'            =>    'Website',
+'Guest'                =>    'Guest',
+'Online'            =>    'Online',
+'Offline'            =>    'Offline',
+'Last edit'            =>    'Last edited by',
+'Report'            =>    'Report',
+'Delete'            =>    'Delete',
+'Edit'                =>    'Edit',
+'Quote'                =>    'Quote',
+'Is subscribed'        =>    'You are currently subscribed to this topic',
+'Unsubscribe'        =>    'Unsubscribe',
+'Subscribe'            =>    'Subscribe to this topic',
+'Quick post'        =>    'Quick reply',
+'Mod controls'        =>    'Moderator controls',
+'New icon'            =>    'New post',
+'Re'                =>    'Re:',
+'Preview'            =>    'Preview'
+
+);
diff --git a/lang/English/topic.po b/lang/English/topic.po
deleted file mode 100644
index 4f143767..00000000
--- a/lang/English/topic.po
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Post reply"
-msgstr "Post reply"
-
-msgid "Topic closed"
-msgstr "Topic closed"
-
-msgid "From"
-msgstr "From:"
-
-msgid "Promote user"
-msgstr "Promote user"
-
-msgid "IP address logged"
-msgstr "IP address logged"
-
-msgid "Note"
-msgstr "Note:"
-
-msgid "Posts"
-msgstr "Posts:"
-
-msgid "Registered"
-msgstr "Registered:"
-
-msgid "Replies"
-msgstr "Replies:"
-
-msgid "Website"
-msgstr "Website"
-
-msgid "Guest"
-msgstr "Guest"
-
-msgid "Online"
-msgstr "Online"
-
-msgid "Offline"
-msgstr "Offline"
-
-msgid "Last edit"
-msgstr "Last edited by"
-
-msgid "Report"
-msgstr "Report"
-
-msgid "Delete"
-msgstr "Delete"
-
-msgid "Edit"
-msgstr "Edit"
-
-msgid "Quote"
-msgstr "Quote"
-
-msgid "Is subscribed"
-msgstr "You are currently subscribed to this topic"
-
-msgid "Unsubscribe"
-msgstr "Unsubscribe"
-
-msgid "Subscribe"
-msgstr "Subscribe to this topic"
-
-msgid "Quick post"
-msgstr "Quick reply"
-
-msgid "Mod controls"
-msgstr "Moderator controls"
-
-msgid "New icon"
-msgstr "New post"
-
-msgid "Re"
-msgstr "Re:"
-
-msgid "Preview"
-msgstr "Preview"
diff --git a/lang/English/update.mo b/lang/English/update.mo
deleted file mode 100644
index 18d61df2ff3d7f864483f458fe703aa3bbddb701..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7678
zcmbW5TZ|-C8OIO0URXpF<f3>vyRys-PWSFC7k6hbz}{fuUdG*7kPu?3yH0l(R9E%Z
zshZi@CyDWaXwU?CFc>e1nivve)L@VYP0*O&i-`$F6L=sRg^*~}7<^FtednC2>6spM
zwKLWKIj5`6`L6%(JN4p~TOL<@4sgAnYs;IIIs?A?X1@6Bd5cn4f_noV2e&f*BzOh*
zAox!30(dp}2>3qmtKjwEkHB|>&x6;1e+>9~n7`(&N?ptRG$_B{0lovgH((6Djq$mF
ztDwm9Fevwb5xfk161)ohA$T453sB_y9VqMl4HWq<VKI^CT2OwU0k?pA!}uU5_nidg
zxfpyqcn*~3E`<5df$w4brGVc7*+M-FiankKWu4!E9{~RZid>hon2c`(Wqbq_{T~S9
z3KYE_1?Bl~g5rv2K(YIeL6Pe@@N)3ipzQm5Q0(w(7{3OJUayDomP?i5PhG|rrdL;k
z^85AR;w4IHu+8`!n}~hC28zDl2Sv`Gfj5CKf)8{5rEGRT<If_D$oU6Q?*AwF4e$zt
zdj|XgcpdkTFv<esM=-kR_bc!z@D=cT;Md=!)Zf7+7C8le3?Wv)C%_843g?P`kAULm
z$N72;{5JR*@Bq#byF3d%$9}&A#m-N#*+KAWQ1pHc6n*{$eh|DC<I8imfvBbqgO7qI
z!~6@N<i;!D7r<#A7P~(Uei!^XxB{MkuTr;ze+Ey3yGQ~9ej5BO_%iqa_*0VN9&kI!
zb{<>>zYP8b6hD6+p+%0zK#}V!pzQY~D1Lq#6np<9jGqU^k1vGrOCYXPFN31*U&HVJ
z05OaE$hy;9a^GGqR8u!|-NyAHE==xhydRw9n&G;EOYB7$yExea%BSVQeedQQbEutM
zH*yhrj#B`IS=2tRU0k?YX)f_6Zg6@7YMu)*Cq5q@n-QHp8pdJ=%;`RobMnE=?lToo
zY$Ns*8$xX^Mz?|T`3TodTzj}~;UW~>N9;To{;%Nx|7_>Fm5b0)>dttWWQi?{sLTtU
zXX&asJctTwO5M$~WmDKB&(vY}Z<%EMv43?^njzz&Fx^s{qR0!Y4p$5_9%hlKTbe?%
z)aJ7~$$I%4{FFu=ld2<88FeCS^eD1+B`@O18NbNHjXKLqqmE`#CpF`WOw4G%(@~K=
z+$d`5%A&gR(;}yy8z1ae3t3snq(>PqM`;r4Uc!dX7R^*Ge3(8FC0S{*DC-(E_P-t)
zYoq?Ab6&|4X4pZf=Ejp|#fh0kL!(aS&g2{X#_WdOnW;u`RMtYC6gw>zW`xg0Z|Bp~
zrc)(p?8aGa&eyZDQ?SfwbFNAX6RR`bA{mvss4^QAJX1zR8Fo=;s%{s>dR3aPhPhas
z^?oUHo#x$#!eeKhSjt1A<XQaSwmo#{a30rEH?wzD#<IELu4NO~E7i{|Eb3lf45JX8
zs(Gvv#cL5-%ia7MSEDrPuGy&hq0B{MtmGZMZr%=ZwDv#T<I_eD6U*k^L72WTuXI!x
zu~jCv^*48-Ovz^byhw~yU6WZtQKFqep7oM`MRH0OqDwWjs-J5tmxyCjzsReRRioUN
z3MV3hvPnOS%BnD`%tuLARaiqUrYw@Sj$sWuud|UG+5@}yY5(tm=}d1spyy`xZCxz#
z2TADGLfi^^%<E$&DhH-GbZG11sioH8f*}I6NINsHnQNUk%ZV^WJ#{>?WoxO3GMfsq
zaMST9>sQ2gYso~zu@&|HNGRxzp5LO=Y3D`%;MNlhCyuV|KiA&16%Hb8Sao&8rlmPw
z?i{7$(!M(I51d^(*4ndnpX}Z<MeAtR%_WxS^`1^rHiFD+lWqM(>n@WSM}G5qF*k8i
z>bdrw_AUJ4hpjVtRdh`t#d+;FQA>lwYFnC-262qWKDv`fMXa4Z>nL^Gf96!Z!|Inl
z^{sJg-7$BA)jM|cB|j{&b}vuUe5DB+t20Bu69^q4ILE;zo>%*!aw7ELraU~qe`okv
zFZ7(mqaqnb#VRc5y+c^(RTLJLs-ft1H0!5{9n8wK?naqTO|)!ynBPb&Q9Cxhs7gx>
z16HQ3@6J~Yg=1DHy$x$+1jxGeNSZ1oZSkzP;JUJ*^EVK36u}zAbu8kF1Wwwv-fxBn
z?=qz$a3|o3*uqIICaT~mryTs}>x#{FoM%&|ez1Z@`jCm;wtpw9XyL_q?YxYlMPNIP
zVwvbAo90N~ti(+&GTQ1+2#<|wqeyH7oxPY==R94kB-Axo=HgXuZ(b}Xi=tYB_f5gp
zL+_wk-$4B%e8}!=W^dGJs>MoD4)n?(fxM2T)%in*^h#tgw=JVIHE~-4C`1IM76T1k
zb(&>AOu?Te?Y)DX$)`M(wMT=|lq-^L6;>E$#4{g1P65)>Q5Nfgp+f3`1Y3riY87e;
zXJ9U;1#z%mNmqhh%@A=-gs{$!L-DaWPgg=I^1LkeZ&qG=uAewJhg4Wc!a?>r%_jPZ
zu@t)(4Y0AaAS9}oC79p(lDU$k>8y@=68q530Q(LjN}LGQ1RVKVbz$=;l|ae*#!AkQ
z%RO7SEgH`_UaYfXO|v5RfzaKoJCg-{?0P$)Z|M8PkBuZgo2RH>)u>-Yt~=<-!u8E_
z?cME$e<lpGMm^JYXg2am3asy3X4;|M^1_U@WJ~0Zalr@|xe8kAFWhMJx<d(07skrF
z=uI%=j<MyO>>;+7kzLYy2#qDgm2Yx<@D-*HnX_rET~eU#s<z26Nu$EuC!uC%CAlTK
zhVuCKPTtwBC5pFqo_(sby{!%z*jwxwY3Q^RYLmij5i8fdh_2C*d62KI7kzMd2YF6>
zN3i``v*)*pNKILyt<N?Kxm+UThE7<*A*#xpP^X)b{)<v!r8yVN4cU{3F-2fYGpy;>
z$61@IBWb)At9AIge0Gf6<c=6y;sTG-tQUFL#55rEKm7qEB6<i7vQ<(54>_|($bqU(
zWl8{Mh|S1kE~au%>2@UbEmQy$#O%(X68bi|0R4Iv-YCcs$LGxUIl>UxL$|x`P%^4f
z{ZJEm9mAdOgn$_;<ZG)Vbn(J$G&z#Cjaot`l8baXLWDjC^KLc7qOKjfT{sakoQ3<O
z1LoPnKy%?_(CpdpOj|pOs9fV6s82SWypzBrW^kXQZ0u6gm~b-w9E}VaBvN^@-C?ID
z_pO-|XUQQza@f@5E(&{obfws>(uh$%crm+<ooF^a-7KMBIO$*@8VF%Q(JW3Z?cAzQ
z1D_hikVH)50~xsBvNmM5bb)>aDMG9w#~7AK6GD!}tt3aKIVSHU+6I+y?5fZ}N$aTZ
zUOI6+1bSFlQk0O`td*m1b3AS;pX6GEE^;XIzLsZ^!-YAKM+*;AM4h}Ub<1htVwIE+
zDoadicWy{mx2bi<xw^hAoLD?{dg;!SOSC0*>lQdm>P2iyT6M9Rn9|jl#k&`YlI4WX
zM<SE{hLR!Hah23oBRM2E6~(U9Sl1h)hon8{l`+Oghd7jmK%COz`wSM!ZqE0ir4cDI
zy>RAKYtNor_qOIFzH70DhHhL8<Rpb^W%td?k+<U5I<s|@uDIOB&F)x_c!4f`)I000
zB@aKls^&Z|@$Jm+tl$+RafVS=2{Yo<@$8lWh;s=ye?xu37`K8H79{EA6@eA#AQ0d<
zQ?%t|KAA~G+j0_fe7<j8vmK?vIs}dM3av74@g&-c)v!w7V%gcTT2it&ZR+^>ef_~<
z;vg@YHMgkKu2lF!q^9d5{ft^zqm(B3U|nAd5Tq8fW5h<Bvvh}&Na@WpLMpW!0-!=C
zb8x2fHa+KT-L=)0Cxlai*oA{5#wobVC#xh+pDb1DUMP$itTC&!rgoDT4Q<WcF5xqZ
z?+)7@d-JeTNT(S*Ca)oyn(J(9rG7~+Nt*e4BljkwX}@^;(WS>-)s4hi-l`2CkshL(
zx?3OkCya?ezGnKI_R$dXyU~uNppaJH3(-Kl)#V_txC=mD7zh!$q>y6fogjfPOeI@y
zay)JP;g6T@w(;;K#HDX>t4e1RJQemud@8f+e}a|WTSG^!6#Tl{I+iB#XheLo5%sN}
z_Ahj1*fJa=ef~oIu=|GgM_3i*q%6p8LfO7YlaV{Om16PwJ<xxDeo}67Ib^X&DxwRQ
zEpnQVS@t4Cnq0E3GOjNdx~n<U>Zw`n`@{P+8To*mq;rlt|6TAiA<NLV&cclis*AE<
zDG7Sto7EE%5Oo*9BJxTrG_xCSbTJkuJzk-B%6E<;(UDb}Q;`^MN=J}BO;8~{=9-F}
z;aV3&w_UBhGZSi2?PXo5PisCMGoW-kQnPT%Q2H}hSa#pKw!C%k;U?A%aWd_SswrmP
zcy%cvwH~`KdR=+>w|?1sHoWTdMr?A|af6g#dC6c6O*W~--Zdjcb!ls!u-yT@IdtX<
zHKiSkJ0=ZO<yp8bRI%=5qGR>?C?;=?+V#>qZss*oIK~k*wbs52+`?~&ggnw(aWa!)
u=vY&HP<M$0O{g0}4#cx-cu|C0G4*=@*Ht;<QUB*VO^IC30{`3F&3^;$i$!<<

diff --git a/lang/English/update.php b/lang/English/update.php
new file mode 100644
index 00000000..96b19a23
--- /dev/null
+++ b/lang/English/update.php
@@ -0,0 +1,74 @@
+<?php
+
+// Language definitions used in db_update.php
+
+$lang_update = array(
+
+'Update'                        =>    'Update FluxBB',
+'Update message'                =>    'Your FluxBB database is out-of-date and must be upgraded in order to continue. If you are the board administrator, please follow the instructions below to complete the upgrade.',
+'Note'                            =>    'Note:',
+'Members message'                =>    'This process is for board administrators only. If you are a member there is nothing to worry about - the forums will be back shortly!',
+'Administrator only'            =>    'This step is for the board administrator only!',
+'Database password info'        =>    'To perform the database update please enter the database password with which FluxBB was installed. If you cannot remember, this is stored in your \'config.php\' file.',
+'Database password note'        =>    'If you are running SQLite (and hence have no database password) please use the database file name instead. This must exactly match the database file name given in your configuration file.',
+'Database password'                =>    'Database password',
+'Maintenance'                    =>    'Maintenance',
+'Maintenance message info'        =>    'The message that will be displayed to users during the updating process. This text will not be parsed like regular posts and thus may contain HTML.',
+'Maintenance message'            =>    'Maintenance message',
+
+'You are running error'            =>    'You are running %1$s version %2$s. FluxBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue.',
+'Version mismatch error'        =>    'Version mismatch. The database \'%s\' doesn\'t seem to be running a FluxBB database schema supported by this update script.',
+'Invalid file error'            =>    'Invalid database file name. When using SQLite the database file name must be entered exactly as it appears in your \'%s\'',
+'Invalid password error'        =>    'Invalid database password. To upgrade FluxBB you must enter your database password exactly as it appears in your \'%s\'',
+'No password error'                =>    'No database password provided',
+'Script runs error'                =>    'It appears the update script is already being ran by someone else. If this is not the case, please manually delete the file \'%s\' and try again',
+'No update error'                =>    'Your forum is already as up-to-date as this script can make it',
+
+'Intro 1'                        =>    'This script will update your forum database. The update procedure might take anything from a second to hours depending on the speed of the server and the size of the forum database. Don\'t forget to make a backup of the database before continuing.',
+'Intro 2'                        =>    'Did you read the update instructions in the documentation? If not, start there.',
+'No charset conversion'            =>    '<strong>IMPORTANT!</strong> FluxBB has detected that this PHP environment does not have support for the encoding mechanisms required to do UTF-8 conversion from character sets other than ISO-8859-1. What this means is that if the current character set is not ISO-8859-1, FluxBB won\'t be able to convert your forum database to UTF-8 and you will have to do it manually. Instructions for doing manual charset conversion can be found in the update instructions.',
+'Enable conversion'                =>    '<strong>Enable conversion:</strong> When enabled this update script will, after it has made the required structural changes to the database, convert all text in the database from the current character set to UTF-8. This conversion is required if you\'re upgrading from version 1.2.',
+'Current character set'            =>    '<strong>Current character set:</strong> If the primary language in your forum is English, you can leave this at the default value. However, if your forum is non-English, you should enter the character set of the primary language pack used in the forum. <em>Getting this wrong can corrupt your database so don\'t just guess!</em> Note: This is required even if the old database is UTF-8.',
+'Charset conversion'            =>    'Charset conversion',
+'Enable conversion label'        =>    '<strong>Enable conversion</strong> (perform database charset conversion).',
+'Current character set label'    =>    'Current character set',
+'Current character set info'    =>    'Accept default for English forums otherwise the character set of the primary language pack.',
+'Start update'                    =>    'Start update',
+'Error converting users'        =>    'Error converting users',
+'Error info 1'                    =>    'There was an error converting some users. This can occur when converting from FluxBB v1.2 if multiple users have registered with very similar usernames, for example "bob" and "böb".',
+'Error info 2'                    =>    'Below is a list of users who failed to convert. Please choose a new username for each user. Users who are renamed will automatically be sent an email alerting them of the change.',
+'New username'                    =>    'New username',
+'Required'                        =>    '(Required)',
+'Correct errors'                =>    'The following errors need to be corrected:',
+'Rename users'                    =>    'Rename users',
+'Successfully updated'            =>    'Your forum database was successfully updated. You may now %s.',
+'go to index'                    =>    'go to the forum index',
+
+'Unable to lock error'            =>    'Unable to write update lock. Please make sure PHP has write access to the directory \'%s\' and no-one else is currently running the update script.',
+
+'Converting'                    =>    'Converting %s …',
+'Converting item'                =>    'Converting %1$s %2$s …',
+'Preparsing item'                =>    'Preparsing %1$s %2$s …',
+'Rebuilding index item'            =>    'Rebuilding index for %1$s %2$s',
+
+'ban'                            =>    'ban',
+'categories'                    =>    'categories',
+'censor words'                    =>    'censor words',
+'configuration'                    =>    'configuration',
+'forums'                        =>    'forums',
+'groups'                        =>    'groups',
+'post'                            =>    'post',
+'report'                        =>    'report',
+'topic'                            =>    'topic',
+'user'                            =>    'user',
+'signature'                        =>    'signature',
+
+'Username too short error'        =>    'Usernames must be at least 2 characters long. Please choose another (longer) username.',
+'Username too long error'        =>    'Usernames must not be more than 25 characters long. Please choose another (shorter) username.',
+'Username Guest reserved error'    =>    'The username guest is reserved. Please choose another username.',
+'Username IP format error'        =>    'Usernames may not be in the form of an IP address. Please choose another username.',
+'Username bad characters error'    =>    'Usernames may not contain all the characters \', " and [ or ] at once. Please choose another username.',
+'Username BBCode error'            =>    'Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username.',
+'Username duplicate error'        =>    'Someone is already registered with the username %s. The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username.',
+
+);
diff --git a/lang/English/update.po b/lang/English/update.po
deleted file mode 100644
index 6611a073..00000000
--- a/lang/English/update.po
+++ /dev/null
@@ -1,195 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Update"
-msgstr "Update FluxBB"
-
-msgid "Update message"
-msgstr "Your FluxBB database is out-of-date and must be upgraded in order to continue. If you are the board administrator, please follow the instructions below to complete the upgrade."
-
-msgid "Note"
-msgstr "Note:"
-
-msgid "Members message"
-msgstr "This process is for board administrators only. If you are a member there is nothing to worry about - the forums will be back shortly!"
-
-msgid "Administrator only"
-msgstr "This step is for the board administrator only!"
-
-msgid "Database password info"
-msgstr "To perform the database update please enter the database password with which FluxBB was installed. If you cannot remember, this is stored in your 'config.php' file."
-
-msgid "Database password note"
-msgstr "If you are running SQLite (and hence have no database password) please use the database file name instead. This must exactly match the database file name given in your configuration file."
-
-msgid "Database password"
-msgstr "Database password"
-
-msgid "Maintenance"
-msgstr "Maintenance"
-
-msgid "Maintenance message info"
-msgstr "The message that will be displayed to users during the updating process. This text will not be parsed like regular posts and thus may contain HTML."
-
-msgid "Maintenance message"
-msgstr "Maintenance message"
-
-msgid "You are running error"
-msgstr "You are running %1$s version %2$s. FluxBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue."
-
-msgid "Version mismatch error"
-msgstr "Version mismatch. The database '%s' doesn't seem to be running a FluxBB database schema supported by this update script."
-
-msgid "Invalid file error"
-msgstr "Invalid database file name. When using SQLite the database file name must be entered exactly as it appears in your '%s'"
-
-msgid "Invalid password error"
-msgstr "Invalid database password. To upgrade FluxBB you must enter your database password exactly as it appears in your '%s'"
-
-msgid "No password error"
-msgstr "No database password provided"
-
-msgid "Script runs error"
-msgstr "It appears the update script is already being ran by someone else. If this is not the case, please manually delete the file '%s' and try again"
-
-msgid "No update error"
-msgstr "Your forum is already as up-to-date as this script can make it"
-
-msgid "Intro 1"
-msgstr "This script will update your forum database. The update procedure might take anything from a second to hours depending on the speed of the server and the size of the forum database. Don't forget to make a backup of the database before continuing."
-
-msgid "Intro 2"
-msgstr "Did you read the update instructions in the documentation? If not, start there."
-
-msgid "No charset conversion"
-msgstr "<strong>IMPORTANT!</strong> FluxBB has detected that this PHP environment does not have support for the encoding mechanisms required to do UTF-8 conversion from character sets other than ISO-8859-1. What this means is that if the current character set is not ISO-8859-1, FluxBB won't be able to convert your forum database to UTF-8 and you will have to do it manually. Instructions for doing manual charset conversion can be found in the update instructions."
-
-msgid "Enable conversion"
-msgstr "<strong>Enable conversion:</strong> When enabled this update script will, after it has made the required structural changes to the database, convert all text in the database from the current character set to UTF-8. This conversion is required if you're upgrading from version 1.2."
-
-msgid "Current character set"
-msgstr "<strong>Current character set:</strong> If the primary language in your forum is English, you can leave this at the default value. However, if your forum is non-English, you should enter the character set of the primary language pack used in the forum. <em>Getting this wrong can corrupt your database so don't just guess!</em> Note: This is required even if the old database is UTF-8."
-
-msgid "Charset conversion"
-msgstr "Charset conversion"
-
-msgid "Enable conversion label"
-msgstr "<strong>Enable conversion</strong> (perform database charset conversion)."
-
-msgid "Current character set label"
-msgstr "Current character set"
-
-msgid "Current character set info"
-msgstr "Accept default for English forums otherwise the character set of the primary language pack."
-
-msgid "Start update"
-msgstr "Start update"
-
-msgid "Error converting users"
-msgstr "Error converting users"
-
-msgid "Error info 1"
-msgstr "There was an error converting some users. This can occur when converting from FluxBB v1.2 if multiple users have registered with very similar usernames, for example \"bob\" and \"böb\"."
-
-msgid "Error info 2"
-msgstr "Below is a list of users who failed to convert. Please choose a new username for each user. Users who are renamed will automatically be sent an email alerting them of the change."
-
-msgid "New username"
-msgstr "New username"
-
-msgid "Required"
-msgstr "(Required)"
-
-msgid "Correct errors"
-msgstr "The following errors need to be corrected:"
-
-msgid "Rename users"
-msgstr "Rename users"
-
-msgid "Successfully updated"
-msgstr "Your forum database was successfully updated. You may now %s."
-
-msgid "go to index"
-msgstr "go to the forum index"
-
-msgid "Unable to lock error"
-msgstr "Unable to write update lock. Please make sure PHP has write access to the directory '%s' and no-one else is currently running the update script."
-
-msgid "Converting"
-msgstr "Converting %s …"
-
-msgid "Converting item"
-msgstr "Converting %1$s %2$s …"
-
-msgid "Preparsing item"
-msgstr "Preparsing %1$s %2$s …"
-
-msgid "Rebuilding index item"
-msgstr "Rebuilding index for %1$s %2$s"
-
-msgid "ban"
-msgstr "ban"
-
-msgid "categories"
-msgstr "categories"
-
-msgid "censor words"
-msgstr "censor words"
-
-msgid "configuration"
-msgstr "configuration"
-
-msgid "forums"
-msgstr "forums"
-
-msgid "groups"
-msgstr "groups"
-
-msgid "post"
-msgstr "post"
-
-msgid "report"
-msgstr "report"
-
-msgid "topic"
-msgstr "topic"
-
-msgid "user"
-msgstr "user"
-
-msgid "signature"
-msgstr "signature"
-
-msgid "Username too short error"
-msgstr "Usernames must be at least 2 characters long. Please choose another (longer) username."
-
-msgid "Username too long error"
-msgstr "Usernames must not be more than 25 characters long. Please choose another (shorter) username."
-
-msgid "Username Guest reserved error"
-msgstr "The username guest is reserved. Please choose another username."
-
-msgid "Username IP format error"
-msgstr "Usernames may not be in the form of an IP address. Please choose another username."
-
-msgid "Username bad characters error"
-msgstr "Usernames may not contain all the characters ', \" and [ or ] at once. Please choose another username."
-
-msgid "Username BBCode error"
-msgstr "Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username."
-
-msgid "Username duplicate error"
-msgstr "Someone is already registered with the username %s. The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username."
diff --git a/lang/English/userlist.mo b/lang/English/userlist.mo
deleted file mode 100644
index 74d6b6eaf7013ca1abd4270b4dcbf6b1c58fd784..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 898
zcmY+C!H&}~5QYORAc6!4t{jHjf=EgchbpBAwzO!a-KAo?2qX?T@gy~*c4WK2-Z>(1
zLgG>2%meTSh&!*qf#1z;yIA@(p7D%llHb3sZhVQb&V%b<3NC_AAgpiT0{9L>{0F!K
zeu5bM2EqRWE`h&batgWN4EC>1N6}^2*Ra=M8`x0y5%w$WXV{mpn@C1UbQXlQ0m4k@
zf^%YpJ5drvkLsEhj;)LK44IM|<GhOw5TR0ONi|ojWgDohSv2j|v9QIAlrGItz*yh9
zlX_uAos5m0yNq<Rblu=?pW5wUQ`3zBb#M0Li8XJy@X5AJo?`@MbVg$qe#UldE1o=^
zCPNDs@#L}aoDpKlGk&K+>TzgCIG;?d(5@EVSS0NTT`fe#$&|(X#Eo=c$hp!F%eF<H
zr^Z$f;@$1t(Yk*(y%P_O_N;O1VS}cgKln~l3#I#1%!GC92M5z}(p%?+?j_q~qzfaJ
zt}^Q7%C82=h;{rTdBU1)JLAN#RGzwNFTID8)=l=!!WKMidt}r$2@*wni+K)7RsxNK
zHUhZt-&+BfqO}^0Fux_SJkVm!<P9B3RvH{=*$HNOPRo*zQK~wW<%cOvXS^;h71xpq
zp($rPh|*JD3;i}FbR>vH?^P`eVUdH;MG-E!MWIn6tXHC@x$wn|T^jAL#zh+nqunM6
kX~}Y>912+y>h%AgyZln6Nw@-!5&yR%`FM+T$u^Dt0lG5+eE<Le

diff --git a/lang/English/userlist.php b/lang/English/userlist.php
new file mode 100644
index 00000000..fc089f34
--- /dev/null
+++ b/lang/English/userlist.php
@@ -0,0 +1,13 @@
+<?php
+
+// Language definitions used in userlist.php
+$lang_ul = array(
+
+'User find legend'    =>    'Find and sort users',
+'User search info'    =>    'Enter a username to search for and/or a user group to filter by. The username field can be left blank. Use the wildcard character * for partial matches.',
+'User sort info'    =>    'Sort users by name, date registered or number of posts and in ascending/descending order.',
+'User group'        =>    'User group',
+'No of posts'        =>    'Number of posts',
+'All users'            =>    'All'
+
+);
diff --git a/lang/English/userlist.po b/lang/English/userlist.po
deleted file mode 100644
index 4f7d81df..00000000
--- a/lang/English/userlist.po
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "User find legend"
-msgstr "Find and sort users"
-
-msgid "User search info"
-msgstr "Enter a username to search for and/or a user group to filter by. The username field can be left blank. Use the wildcard character * for partial matches."
-
-msgid "User sort info"
-msgstr "Sort users by name, date registered or number of posts and in ascending/descending order."
-
-msgid "User group"
-msgstr "User group"
-
-msgid "No of posts"
-msgstr "Number of posts"
-
-msgid "All users"
-msgstr "All"
diff --git a/model/admin/bans.php b/model/admin/bans.php
index 52ba33a9..db3a1b0e 100644
--- a/model/admin/bans.php
+++ b/model/admin/bans.php
@@ -24,7 +24,7 @@ public function __construct()
  
     public function add_ban_info($id = null)
     {
-        global $lang_admin_bans;
+        global $lang_common, $lang_admin_bans;
 
         $ban = array();
 
@@ -32,7 +32,7 @@ public function add_ban_info($id = null)
         if (is_numeric($id)) {
             $ban['user_id'] = $id;
             if ($ban['user_id'] < 2) {
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
             }
 
             $select_add_ban_info = array('group_id', 'username', 'email');
@@ -102,7 +102,7 @@ public function add_ban_info($id = null)
 
     public function edit_ban_info($id)
     {
-
+        global $lang_common;
 
         $ban = array();
 
@@ -120,7 +120,7 @@ public function edit_ban_info($id)
             $ban['message'] = $result['message'];
             $ban['expire'] = $result['expire'];
         } else {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         $diff = ($this->user->timezone + $this->user->dst) * 3600;
diff --git a/model/admin/groups.php b/model/admin/groups.php
index 6ce1b905..6769a13c 100644
--- a/model/admin/groups.php
+++ b/model/admin/groups.php
@@ -35,7 +35,7 @@ public function fetch_groups()
 
     public function info_add_group($groups, $id)
     {
-
+        global $lang_common;
 
         $group = array();
 
@@ -47,7 +47,7 @@ public function info_add_group($groups, $id)
         } else {
             // We are editing a group
             if (!isset($groups[$id])) {
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
             }
 
             $group['info'] = $groups[$id];
@@ -246,18 +246,18 @@ public function add_edit_group($groups)
 
     public function set_default_group($groups)
     {
-        global $lang_admin_groups;
+        global $lang_admin_groups, $lang_common;
 
         $group_id = intval($this->request->post('default_group'));
 
         // Make sure it's not the admin or guest groups
         if ($group_id == FEATHER_ADMIN || $group_id == FEATHER_GUEST) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         // Make sure it's not a moderator group
         if ($groups[$group_id]['g_moderator'] != 0) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         DB::for_table('config')->where('conf_name', 'o_default_user_group')
diff --git a/model/admin/options.php b/model/admin/options.php
index c0cdc83e..d9f29c05 100644
--- a/model/admin/options.php
+++ b/model/admin/options.php
@@ -24,7 +24,7 @@ public function __construct()
  
     public function update_options()
     {
-        global $lang_admin_options;
+        global $lang_admin_options, $lang_common;
 
         
 
@@ -110,12 +110,12 @@ public function update_options()
 
         $languages = forum_list_langs();
         if (!in_array($form['default_lang'], $languages)) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         $styles = forum_list_styles();
         if (!in_array($form['default_style'], $styles)) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         if ($form['time_format'] == '') {
@@ -197,19 +197,19 @@ public function update_options()
         }
 
         if ($form['feed_type'] < 0 || $form['feed_type'] > 2) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         if ($form['feed_ttl'] < 0) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         if ($form['report_method'] < 0 || $form['report_method'] > 2) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         if ($form['default_email_setting'] < 0 || $form['default_email_setting'] > 2) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         if ($form['timeout_online'] >= $form['timeout_visit']) {
diff --git a/model/admin/users.php b/model/admin/users.php
index 5f0e27fe..bf9b81d6 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -499,7 +499,7 @@ public function ban_users()
 
     public function get_user_search()
     {
-        global $db_type, $lang_admin_users;
+        global $db_type, $lang_common, $lang_admin_users;
 
         $form = $this->request->get('form') ? $this->request->get('form') : array();
 
@@ -618,7 +618,7 @@ public function get_user_search()
 
     public function print_users($conditions, $order_by, $direction, $start_from)
     {
-        global $lang_admin_users;
+        global $lang_common, $lang_admin_users;
 
         $user_data = array();
 
@@ -637,7 +637,7 @@ public function print_users($conditions, $order_by, $direction, $start_from)
                 $cur_user['user_title'] = get_title($cur_user);
 
                 // This script is a special case in that we want to display "Not verified" for non-verified users
-                if (($cur_user['g_id'] == '' || $cur_user['g_id'] == FEATHER_UNVERIFIED) && $cur_user['user_title'] != __('Banned')) {
+                if (($cur_user['g_id'] == '' || $cur_user['g_id'] == FEATHER_UNVERIFIED) && $cur_user['user_title'] != $lang_common['Banned']) {
                     $cur_user['user_title'] = '<span class="warntext">'.$lang_admin_users['Not verified'].'</span>';
                 }
 
diff --git a/model/delete.php b/model/delete.php
index f2b4f523..0ac3cc9b 100644
--- a/model/delete.php
+++ b/model/delete.php
@@ -24,6 +24,8 @@ public function __construct()
  
     public function get_info_delete($id)
     {
+        global $lang_common;
+        
         $select_get_info_delete = array('fid' => 'f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_replies',  'fp.post_topics', 'tid' => 't.id', 't.subject', 't.first_post_id', 't.closed', 'p.poster', 'p.posted', 'p.poster_id', 'p.message', 'p.hide_smilies');
         $where_get_info_delete = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -42,7 +44,7 @@ public function get_info_delete($id)
             ->find_one();
         
         if (!$cur_post) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         return $cur_post;
@@ -50,6 +52,8 @@ public function get_info_delete($id)
 
     public function handle_deletion($is_topic_post, $id, $tid, $fid)
     {
+        global $lang_delete;
+
         require FEATHER_ROOT.'include/search_idx.php';
 
         if ($is_topic_post) {
@@ -57,7 +61,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
             delete_topic($tid);
             update_forum($fid);
 
-            redirect(get_link('forum/'.$fid.'/'), __('Topic del redirect'));
+            redirect(get_link('forum/'.$fid.'/'), $lang_delete['Topic del redirect']);
         } else {
             // Delete just this one post
             delete_post($id, $tid);
@@ -71,7 +75,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
                 ->order_by_desc('id')
                 ->find_one();
 
-            redirect(get_link('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
+            redirect(get_link('post/'.$post['id'].'/#p'.$post['id']), $lang_delete['Post del redirect']);
         }
     }
 }
diff --git a/model/edit.php b/model/edit.php
index b14e870b..61410dd3 100644
--- a/model/edit.php
+++ b/model/edit.php
@@ -25,7 +25,7 @@ public function __construct()
     // Fetch some info about the post, the topic and the forum
     public function get_info_edit($id)
     {
-
+        global $lang_common;
      
         $select_get_info_edit = array('fid' => 'f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_topics', 'tid' => 't.id', 't.subject', 't.posted', 't.first_post_id', 't.sticky', 't.closed', 'p.poster', 'p.poster_id', 'p.message', 'p.hide_smilies');
         $where_get_info_edit = array(
@@ -45,7 +45,7 @@ public function get_info_edit($id)
             ->find_one();
 
         if (!$cur_post) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         return $cur_post;
@@ -53,7 +53,7 @@ public function get_info_edit($id)
 
     public function check_errors_before_edit($id, $can_edit_subject, $errors)
     {
-        global $pd;
+        global $lang_post, $pd;
 
         // If it's a topic it must contain a subject
         if ($can_edit_subject) {
@@ -64,13 +64,13 @@ public function check_errors_before_edit($id, $can_edit_subject, $errors)
             }
 
             if ($subject == '') {
-                $errors[] = __('No subject');
+                $errors[] = $lang_post['No subject'];
             } elseif ($this->config['o_censoring'] == '1' && $censored_subject == '') {
-                $errors[] = __('No subject after censoring');
+                $errors[] = $lang_post['No subject after censoring'];
             } elseif (feather_strlen($subject) > 70) {
-                $errors[] = __('Too long subject');
+                $errors[] = $lang_post['Too long subject'];
             } elseif ($this->config['p_subject_all_caps'] == '0' && is_all_uppercase($subject) && !$this->user->is_admmod) {
-                $errors[] = __('All caps subject');
+                $errors[] = $lang_post['All caps subject'];
             }
         }
 
@@ -79,9 +79,9 @@ public function check_errors_before_edit($id, $can_edit_subject, $errors)
 
         // Here we use strlen() not feather_strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         if (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            $errors[] = sprintf(__('Too long message'), forum_number_format(FEATHER_MAX_POSTSIZE));
+            $errors[] = sprintf($lang_post['Too long message'], forum_number_format(FEATHER_MAX_POSTSIZE));
         } elseif ($this->config['p_message_all_caps'] == '0' && is_all_uppercase($message) && !$this->user->is_admmod) {
-            $errors[] = __('All caps message');
+            $errors[] = $lang_post['All caps message'];
         }
 
         // Validate BBCode syntax
@@ -92,13 +92,13 @@ public function check_errors_before_edit($id, $can_edit_subject, $errors)
 
         if (empty($errors)) {
             if ($message == '') {
-                $errors[] = __('No message');
+                $errors[] = $lang_post['No message'];
             } elseif ($this->config['o_censoring'] == '1') {
                 // Censor message to see if that causes problems
                 $censored_message = feather_trim(censor_words($message));
 
                 if ($censored_message == '') {
-                    $errors[] = __('No message after censoring');
+                    $errors[] = $lang_post['No message after censoring'];
                 }
             }
         }
@@ -186,29 +186,31 @@ public function edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod)
 
     public function get_checkboxes($can_edit_subject, $is_admmod, $cur_post, $cur_index)
     {
+        global $lang_post, $lang_common;
+
         $checkboxes = array();
 
         if ($can_edit_subject && $is_admmod) {
             if ($this->request->post('stick_topic') || $cur_post['sticky'] == '1') {
-                $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.__('Stick topic').'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.$lang_common['Stick topic'].'<br /></label>';
             } else {
-                $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" tabindex="'.($cur_index++).'" />'.__('Stick topic').'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" tabindex="'.($cur_index++).'" />'.$lang_common['Stick topic'].'<br /></label>';
             }
         }
 
         if ($this->config['o_smilies'] == '1') {
             if ($this->request->post('hide_smilies') || $cur_post['hide_smilies'] == '1') {
-                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.__('Hide smilies').'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.$lang_post['Hide smilies'].'<br /></label>';
             } else {
-                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'" />'.__('Hide smilies').'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'" />'.$lang_post['Hide smilies'].'<br /></label>';
             }
         }
 
         if ($is_admmod) {
             if ($this->request->isPost() && $this->request->post('silent') || $this->request->isPost() == '') {
-                $checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" checked="checked" />'.__('Silent edit').'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" checked="checked" />'.$lang_post['Silent edit'].'<br /></label>';
             } else {
-                $checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" />'.__('Silent edit').'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" />'.$lang_post['Silent edit'].'<br /></label>';
             }
         }
 
diff --git a/model/index.php b/model/index.php
index 228ea44c..6d85307c 100644
--- a/model/index.php
+++ b/model/index.php
@@ -26,12 +26,12 @@ public function __construct()
     // Returns page head
     public function get_page_head()
     {
-
+        global $lang_common;
         
         if ($this->config['o_feed_type'] == '1') {
-            $page_head = array('feed' => '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;type=rss" title="'.__('RSS active topics feed').'" />');
+            $page_head = array('feed' => '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;type=rss" title="'.$lang_common['RSS active topics feed'].'" />');
         } elseif ($this->config['o_feed_type'] == '2') {
-            $page_head = array('feed' => '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;type=atom" title="'.__('Atom active topics feed').'" />');
+            $page_head = array('feed' => '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;type=atom" title="'.$lang_common['Atom active topics feed'].'" />');
         }
 
         return $page_head;
@@ -40,11 +40,13 @@ public function get_page_head()
     // Returns forum action
     public function get_forum_actions()
     {
+        global $lang_common;
+
         $forum_actions = array();
 
         // Display a "mark all as read" link
         if (!$this->user->is_guest) {
-            $forum_actions[] = '<a href="'.get_link('mark-read/').'">'.__('Mark all as read').'</a>';
+            $forum_actions[] = '<a href="'.get_link('mark-read/').'">'.$lang_common['Mark all as read'].'</a>';
         }
 
         return $forum_actions;
@@ -104,6 +106,8 @@ public function get_new_posts()
     // Returns the elements needed to display categories and their forums
     public function print_categories_forums()
     {
+        global $lang_common, $lang_index;
+
         // Get list of forums and topics with new posts since last visit
         if (!$this->user->is_guest) {
             $new_topics = $this->get_new_posts();
@@ -158,13 +162,13 @@ public function print_categories_forums()
             // Are there new posts since our last visit?
             if (isset($new_topics[$cur_forum->fid])) {
                 $cur_forum->item_status .= ' inew';
-                $forum_field_new = '<span class="newtext">[ <a href="'.get_link('search/?action=show_new&amp;fid='.$cur_forum->fid).'">'.__('New posts').'</a> ]</span>';
+                $forum_field_new = '<span class="newtext">[ <a href="'.get_link('search/?action=show_new&amp;fid='.$cur_forum->fid).'">'.$lang_common['New posts'].'</a> ]</span>';
                 $cur_forum->icon_type = 'icon icon-new';
             }
 
             // Is this a redirect forum?
             if ($cur_forum->redirect_url != '') {
-                $cur_forum->forum_field = '<h3><span class="redirtext">'.__('Link to').'</span> <a href="'.feather_escape($cur_forum->redirect_url).'" title="'.__('Link to').' '.feather_escape($cur_forum->redirect_url).'">'.feather_escape($cur_forum->forum_name).'</a></h3>';
+                $cur_forum->forum_field = '<h3><span class="redirtext">'.$lang_index['Link to'].'</span> <a href="'.feather_escape($cur_forum->redirect_url).'" title="'.$lang_index['Link to'].' '.feather_escape($cur_forum->redirect_url).'">'.feather_escape($cur_forum->forum_name).'</a></h3>';
                 $cur_forum->num_topics_formatted = $cur_forum->num_posts_formatted = '-';
                 $cur_forum->item_status .= ' iredirect';
                 $cur_forum->icon_type = 'icon';
@@ -180,11 +184,11 @@ public function print_categories_forums()
 
             // If there is a last_post/last_poster
             if ($cur_forum->last_post != '') {
-                $cur_forum->last_post_formatted = '<a href="'.get_link('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.format_time($cur_forum->last_post).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_forum->last_poster).'</span>';
+                $cur_forum->last_post_formatted = '<a href="'.get_link('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.format_time($cur_forum->last_post).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_forum->last_poster).'</span>';
             } elseif ($cur_forum->redirect_url != '') {
                 $cur_forum->last_post_formatted = '- - -';
             } else {
-                $cur_forum->last_post_formatted = __('Never');
+                $cur_forum->last_post_formatted = $lang_common['Never'];
             }
 
             if ($cur_forum->moderators != '') {
@@ -199,7 +203,7 @@ public function print_categories_forums()
                     }
                 }
 
-                $cur_forum->moderators_formatted = "\t\t\t\t\t\t\t\t".'<p class="modlist">(<em>'.__('Moderated by').'</em> '.implode(', ', $moderators).')</p>'."\n";
+                $cur_forum->moderators_formatted = "\t\t\t\t\t\t\t\t".'<p class="modlist">(<em>'.$lang_common['Moderated by'].'</em> '.implode(', ', $moderators).')</p>'."\n";
             } else {
                 $cur_forum->moderators_formatted = '';
             }
diff --git a/model/login.php b/model/login.php
index 5c5ac99d..0e934b01 100644
--- a/model/login.php
+++ b/model/login.php
@@ -24,6 +24,8 @@ public function __construct()
  
     public function login()
     {
+        global $db_type, $lang_login;
+
         $form_username = feather_trim($this->request->post('req_username'));
         $form_password = feather_trim($this->request->post('req_password'));
         $save_pass = $this->request->post('save_pass');
@@ -54,7 +56,7 @@ public function login()
         }
 
         if (!$authorized) {
-            message(__('Wrong user/pass').' <a href="'.get_link('login/action/forget/').'">'.__('Forgotten pass').'</a>');
+            message($lang_login['Wrong user/pass'].' <a href="'.get_link('login/action/forget/').'">'.$lang_login['Forgotten pass'].'</a>');
         }
 
         // Update the status if this is the first time the user logged in
@@ -85,11 +87,13 @@ public function login()
         // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after login)
         $redirect_url = validate_redirect($this->request->post('redirect_url'), get_base_url());
 
-        redirect(feather_escape($redirect_url), __('Login redirect'));
+        redirect(feather_escape($redirect_url), $lang_login['Login redirect']);
     }
 
     public function logout($id, $token)
     {
+        global $lang_login;
+
         if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != feather_hash($this->user->id.feather_hash(get_remote_address()))) {
             header('Location: '.get_base_url());
             exit;
@@ -109,11 +113,13 @@ public function logout($id, $token)
 
         feather_setcookie(1, feather_hash(uniqid(rand(), true)), time() + 31536000);
 
-        redirect(get_base_url(), __('Logout redirect'));
+        redirect(get_base_url(), $lang_login['Logout redirect']);
     }
 
     public function password_forgotten()
     {
+        global $lang_common, $lang_login;
+
         if (!$this->user->is_guest) {
             header('Location: '.get_base_url());
             exit;
@@ -127,7 +133,7 @@ public function password_forgotten()
             // Validate the email address
             $email = strtolower(feather_trim($this->request->post('req_email')));
             if (!is_valid_email($email)) {
-                $errors[] = __('Invalid email');
+                $errors[] = $lang_common['Invalid email'];
             }
 
             // Did everything go according to plan?
@@ -155,7 +161,7 @@ public function password_forgotten()
                     // Loop through users we found
                     foreach($result as $cur_hit) {
                         if ($cur_hit->last_email_sent != '' && (time() - $cur_hit->last_email_sent) < 3600 && (time() - $cur_hit->last_email_sent) >= 0) {
-                            message(sprintf(__('Email flood'), intval((3600 - (time() - $cur_hit->last_email_sent)) / 60)), true);
+                            message(sprintf($lang_login['Email flood'], intval((3600 - (time() - $cur_hit->last_email_sent)) / 60)), true);
                         }
 
                         // Generate a new password and a new password activation code
@@ -181,9 +187,9 @@ public function password_forgotten()
                         pun_mail($email, $mail_subject, $cur_mail_message);
                     }
 
-                    message(__('Forget mail').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
+                    message($lang_login['Forget mail'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
                 } else {
-                    $errors[] = __('No email match').' '.htmlspecialchars($email).'.';
+                    $errors[] = $lang_login['No email match'].' '.htmlspecialchars($email).'.';
                 }
             }
         }
diff --git a/model/misc.php b/model/misc.php
index e836c72d..db1b8d60 100644
--- a/model/misc.php
+++ b/model/misc.php
@@ -32,6 +32,8 @@ public function update_last_visit()
 
     public function get_info_mail($recipient_id)
     {
+        global $lang_common;
+        
         $select_get_info_mail = array('username', 'email', 'email_setting');
         
         $mail = DB::for_table('users')
@@ -40,7 +42,7 @@ public function get_info_mail($recipient_id)
                 ->find_one();
         
         if (!$mail) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
         
         $mail['recipient'] = $mail['username'];
@@ -51,22 +53,24 @@ public function get_info_mail($recipient_id)
 
     public function send_email($mail, $id)
     {
+        global $lang_misc;
+
         // Clean up message and subject from POST
         $subject = feather_trim($this->request->post('req_subject'));
         $message = feather_trim($this->request->post('req_message'));
 
         if ($subject == '') {
-            message(__('No email subject'));
+            message($lang_misc['No email subject']);
         } elseif ($message == '') {
-            message(__('No email message'));
+            message($lang_misc['No email message']);
         }
         // Here we use strlen() not feather_strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         elseif (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            message(__('Too long email message'));
+            message($lang_misc['Too long email message']);
         }
 
         if ($this->user->last_email_sent != '' && (time() - $this->user->last_email_sent) < $this->user->g_email_flood && (time() - $this->user->last_email_sent) >= 0) {
-            message(sprintf(__('Email flood'), $this->user->g_email_flood, $this->user->g_email_flood - (time() - $this->user->last_email_sent)));
+            message(sprintf($lang_misc['Email flood'], $this->user->g_email_flood, $this->user->g_email_flood - (time() - $this->user->last_email_sent)));
         }
 
         // Load the "form email" template
@@ -95,7 +99,7 @@ public function send_email($mail, $id)
         // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after the email is sent)
         //$redirect_url = validate_redirect($this->request->post('redirect_url'), 'index.php');
 
-        redirect(get_base_url(), __('Email sent redirect'));
+        redirect(get_base_url(), $lang_misc['Email sent redirect']);
     }
 
     public function get_redirect_url($recipient_id)
@@ -117,16 +121,18 @@ public function get_redirect_url($recipient_id)
 
     public function insert_report($post_id)
     {
+        global $lang_misc, $lang_common;
+
         // Clean up reason from POST
         $reason = feather_linebreaks(feather_trim($this->request->post('req_reason')));
         if ($reason == '') {
-            message(__('No reason'));
+            message($lang_misc['No reason']);
         } elseif (strlen($reason) > 65535) { // TEXT field can only hold 65535 bytes
-            message(__('Reason too long'));
+            message($lang_misc['Reason too long']);
         }
 
         if ($this->user->last_report_sent != '' && (time() - $this->user->last_report_sent) < $this->user->g_report_flood && (time() - $this->user->last_report_sent) >= 0) {
-            message(sprintf(__('Report flood'), $this->user->g_report_flood, $this->user->g_report_flood - (time() - $this->user->last_report_sent)));
+            message(sprintf($lang_misc['Report flood'], $this->user->g_report_flood, $this->user->g_report_flood - (time() - $this->user->last_report_sent)));
         }
 
         // Get the topic ID
@@ -135,7 +141,7 @@ public function insert_report($post_id)
                                                               ->find_one();
 
         if (!$topic) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         $select_report = array('subject', 'forum_id');
@@ -146,7 +152,7 @@ public function insert_report($post_id)
             ->find_one();
 
         if (!$report) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         // Should we use the internal report handling?
@@ -197,11 +203,13 @@ public function insert_report($post_id)
             ->set('last_report_sent', time())
             ->save();
 
-        redirect(get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['subject']).'/'), __('Report redirect'));
+        redirect(get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['subject']).'/'), $lang_misc['Report redirect']);
     }
 
     public function get_info_report($post_id)
     {
+        global $lang_common;
+
         $select_get_info_report = array('fid' => 'f.id', 'f.forum_name', 'tid' => 't.id', 't.subject');
         $where_get_info_report = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -220,7 +228,7 @@ public function get_info_report($post_id)
             ->find_one();
 
         if (!$cur_post) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         return $cur_post;
@@ -228,8 +236,10 @@ public function get_info_report($post_id)
 
     public function subscribe_topic($topic_id)
     {
+        global $lang_common, $lang_misc;
+
         if ($this->config['o_topic_subscriptions'] != '1') {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Make sure the user can view the topic
@@ -248,7 +258,7 @@ public function subscribe_topic($topic_id)
                     ->find_one();
 
         if (!$authorized) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         $is_subscribed = DB::for_table('topic_subscriptions')
@@ -257,7 +267,7 @@ public function subscribe_topic($topic_id)
                         ->find_one();
 
         if ($is_subscribed) {
-            message(__('Already subscribed topic'));
+            message($lang_misc['Already subscribed topic']);
         }
 
         $insert_subscribe_topic = array(
@@ -271,13 +281,15 @@ public function subscribe_topic($topic_id)
             ->set($insert_subscribe_topic)
             ->save();
 
-        redirect(get_link('topic/'.$topic_id.'/'), __('Subscribe redirect'));
+        redirect(get_link('topic/'.$topic_id.'/'), $lang_misc['Subscribe redirect']);
     }
 
     public function unsubscribe_topic($topic_id)
     {
+        global $lang_common, $lang_misc;
+
         if ($this->config['o_topic_subscriptions'] != '1') {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         $is_subscribed = DB::for_table('topic_subscriptions')
@@ -286,7 +298,7 @@ public function unsubscribe_topic($topic_id)
             ->find_one();
 
         if (!$is_subscribed) {
-            message(__('Not subscribed topic'));
+            message($lang_misc['Not subscribed topic']);
         }
 
         // Delete the subscription
@@ -295,13 +307,15 @@ public function unsubscribe_topic($topic_id)
             ->where('topic_id', $topic_id)
             ->delete_many();
 
-        redirect(get_link('topic/'.$topic_id.'/'), __('Unsubscribe redirect'));
+        redirect(get_link('topic/'.$topic_id.'/'), $lang_misc['Unsubscribe redirect']);
     }
 
     public function unsubscribe_forum($forum_id)
     {
+        global $lang_common, $lang_misc;
+
         if ($this->config['o_forum_subscriptions'] != '1') {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         $is_subscribed = DB::for_table('forum_subscriptions')
@@ -310,7 +324,7 @@ public function unsubscribe_forum($forum_id)
             ->find_one();
 
         if (!$is_subscribed) {
-            message(__('Not subscribed forum'));
+            message($lang_misc['Not subscribed forum']);
         }
 
         // Delete the subscription
@@ -319,13 +333,15 @@ public function unsubscribe_forum($forum_id)
             ->where('forum_id', $forum_id)
             ->delete_many();
 
-        redirect(get_link('forum/'.$forum_id.'/'), __('Unsubscribe redirect'));
+        redirect(get_link('forum/'.$forum_id.'/'), $lang_misc['Unsubscribe redirect']);
     }
 
     public function subscribe_forum($forum_id)
     {
+        global $lang_common, $lang_misc;
+
         if ($this->config['o_forum_subscriptions'] != '1') {
-            message(__('No permission'), '403');
+            message($lang_common['No permission'], '403');
         }
 
         // Make sure the user can view the forum
@@ -343,7 +359,7 @@ public function subscribe_forum($forum_id)
             ->find_one();
 
         if (!$authorized) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         $is_subscribed = DB::for_table('forum_subscriptions')
@@ -352,7 +368,7 @@ public function subscribe_forum($forum_id)
             ->find_one();
 
         if ($is_subscribed) {
-            message(__('Already subscribed forum'));
+            message($lang_misc['Already subscribed forum']);
         }
 
         $insert_subscribe_forum = array(
@@ -366,6 +382,6 @@ public function subscribe_forum($forum_id)
             ->set($insert_subscribe_forum)
             ->save();
 
-        redirect(get_link('forum/'.$forum_id.'/'), __('Subscribe redirect'));
+        redirect(get_link('forum/'.$forum_id.'/'), $lang_misc['Subscribe redirect']);
     }
 }
diff --git a/model/moderate.php b/model/moderate.php
index df7fe2d8..81a29caf 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -24,28 +24,30 @@ public function __construct()
  
     public function display_ip_info($ip)
     {
+        global $lang_misc;
+
         // Load the misc.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
 
-        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        message(sprintf($lang_misc['Host info 1'], $ip).'<br />'.sprintf($lang_misc['Host info 2'], @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.$lang_misc['Show more users'].'</a>');
     }
 
     public function display_ip_address_post($pid)
     {
-
+        global $lang_common;
 
         $ip = DB::for_table('posts')
             ->where('id', $pid)
             ->find_one_col('poster_ip');
 
         if (!$ip) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         // Load the misc.php language file
         require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
 
-        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        message(sprintf($lang_misc['Host info 1'], $ip).'<br />'.sprintf($lang_misc['Host info 2'], @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.$lang_misc['Show more users'].'</a>');
     }
 
     public function get_moderators($fid)
@@ -59,7 +61,7 @@ public function get_moderators($fid)
 
     public function get_topic_info($fid, $tid)
     {
-
+        global $lang_common;
         
         // Fetch some info about the topic
         $select_get_topic_info = array('forum_id' => 'f.id', 'f.forum_name', 't.subject', 't.num_replies', 't.first_post_id');
@@ -81,7 +83,7 @@ public function get_topic_info($fid, $tid)
             ->find_one();
 
         if (!$cur_topic) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         return $cur_topic;
@@ -89,15 +91,16 @@ public function get_topic_info($fid, $tid)
 
     public function delete_posts($tid, $fid, $p = null)
     {
-        
+        global $lang_common, $lang_misc;
+
         $posts = $this->request->post('posts') ? $this->request->post('posts') : array();
         if (empty($posts)) {
-            message(__('No posts selected'));
+            message($lang_misc['No posts selected']);
         }
 
         if ($this->request->post('delete_posts_comply')) {
             if (@preg_match('%[^0-9,]%', $posts)) {
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
             }
 
             // Verify that the post IDs are valid
@@ -113,7 +116,7 @@ public function delete_posts($tid, $fid, $p = null)
             }
 
             if (count($result) != substr_count($posts, ',') + 1) {
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
             }
 
             // Delete the posts
@@ -150,7 +153,7 @@ public function delete_posts($tid, $fid, $p = null)
 
             update_forum($fid);
 
-            redirect(get_link('topic/'.$tid.'/'), __('Delete posts redirect'));
+            redirect(get_link('topic/'.$tid.'/'), $lang_misc['Delete posts redirect']);
         }
 
         return $posts;
@@ -158,20 +161,21 @@ public function delete_posts($tid, $fid, $p = null)
 
     public function split_posts($tid, $fid, $p = null)
     {
-        
+        global $lang_common, $lang_misc, $lang_post;
+
         $posts = $this->request->post('posts') ? $this->request->post('posts') : array();
         if (empty($posts)) {
-            message(__('No posts selected'));
+            message($lang_misc['No posts selected']);
         }
 
         if ($this->request->post('split_posts_comply')) {
             if (@preg_match('%[^0-9,]%', $posts)) {
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
             }
 
             $move_to_forum = $this->request->post('move_to_forum') ? intval($this->request->post('move_to_forum')) : 0;
             if ($move_to_forum < 1) {
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
             }
 
             // How many posts did we just split off?
@@ -186,7 +190,7 @@ public function split_posts($tid, $fid, $p = null)
                 ->find_many();
 
             if (count($result) != $num_posts_splitted) {
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
             }
 
             // Verify that the move to forum ID is valid
@@ -204,7 +208,7 @@ public function split_posts($tid, $fid, $p = null)
                 ->find_one();
 
             if (!$result) {
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
             }
 
             // Load the post.php language file
@@ -214,9 +218,9 @@ public function split_posts($tid, $fid, $p = null)
             $new_subject = $this->request->post('new_subject') ? feather_trim($this->request->post('new_subject')) : '';
 
             if ($new_subject == '') {
-                message(__('No subject'));
+                message($lang_post['No subject']);
             } elseif (feather_strlen($new_subject) > 70) {
-                message(__('Too long subject'));
+                message($lang_post['Too long subject']);
             }
 
             // Get data from the new first post
@@ -302,7 +306,7 @@ public function split_posts($tid, $fid, $p = null)
             update_forum($fid);
             update_forum($move_to_forum);
 
-            redirect(get_link('topic/'.$new_tid.'/'), __('Split posts redirect'));
+            redirect(get_link('topic/'.$new_tid.'/'), $lang_misc['Split posts redirect']);
         }
 
         return $posts;
@@ -396,7 +400,7 @@ public function get_forum_list_move($id)
 
     public function display_posts_view($tid, $start_from)
     {
-        global $pd;
+        global $pd, $lang_topic;
 
         $post_data = array();
 
@@ -450,7 +454,7 @@ public function display_posts_view($tid, $start_from)
             // If the poster is a guest (or a user that has been deleted)
             else {
                 $cur_post->poster_disp = feather_escape($cur_post->poster);
-                $cur_post->user_title = __('Guest');
+                $cur_post->user_title = $lang_topic['Guest'];
             }
 
             // Perform the main parsing of the message (BBCode, smilies, censor words etc)
@@ -464,15 +468,16 @@ public function display_posts_view($tid, $start_from)
 
     public function move_topics_to($fid, $tfid = null, $param = null)
     {
-        
+        global $lang_common, $lang_misc;
+
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         $topics = explode(',', $this->request->post('topics'));
         $move_to_forum = $this->request->post('move_to_forum') ? intval($this->request->post('move_to_forum')) : 0;
         if (empty($topics) || $move_to_forum < 1) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         // Verify that the topic IDs are valid
@@ -482,7 +487,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
             ->find_many();
 
         if (count($result) != count($topics)) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
 
@@ -501,7 +506,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
             ->find_one();
 
         if (!$authorized) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         // Delete any redirect topics if there are any (only if we moved/copied the topic back to where it was once moved from)
@@ -548,13 +553,14 @@ public function move_topics_to($fid, $tfid = null, $param = null)
         update_forum($fid); // Update the forum FROM which the topic was moved
         update_forum($move_to_forum); // Update the forum TO which the topic was moved
 
-        $redirect_msg = (count($topics) > 1) ? __('Move topics redirect') : __('Move topic redirect');
+        $redirect_msg = (count($topics) > 1) ? $lang_misc['Move topics redirect'] : $lang_misc['Move topic redirect'];
         redirect(get_link('forum/'.$move_to_forum.'/'), $redirect_msg);
     }
 
     public function check_move_possible()
     {
-        
+        global $lang_misc;
+
         $select_check_move_possible = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name');
         $where_check_move_possible = array(
             array('fp.post_topics' => 'IS NULL'),
@@ -574,20 +580,21 @@ public function check_move_possible()
             ->find_many();
 
         if (count($result) < 2) {
-            message(__('Nowhere to move'));
+            message($lang_misc['Nowhere to move']);
         }
     }
 
     public function merge_topics($fid)
     {
-        
+        global $lang_common, $lang_misc;
+
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         $topics = explode(',', $this->request->post('topics'));
         if (count($topics) < 2) {
-            message(__('Not enough topics selected'));
+            message($lang_misc['Not enough topics selected']);
         }
 
         // Verify that the topic IDs are valid (redirect links will point to the merged topic after the merge)
@@ -597,7 +604,7 @@ public function merge_topics($fid)
             ->find_many();
 
         if (count($result) != count($topics)) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         // The topic that we are merging into is the one with the smallest ID
@@ -685,15 +692,16 @@ public function merge_topics($fid)
 
         // Update the forum FROM which the topic was moved and redirect
         update_forum($fid);
-        redirect(get_link('forum/'.$fid.'/'), __('Merge topics redirect'));
+        redirect(get_link('forum/'.$fid.'/'), $lang_misc['Merge topics redirect']);
     }
 
     public function delete_topics($topics, $fid)
     {
-                
+        global $lang_misc, $lang_common;
+        
 
         if (@preg_match('%[^0-9,]%', $topics)) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         require FEATHER_ROOT.'include/search_idx.php';
@@ -707,7 +715,7 @@ public function delete_topics($topics, $fid)
             ->find_many();
 
         if (count($result) != substr_count($topics, ',') + 1) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         // Verify that the posts are not by admins
@@ -717,7 +725,7 @@ public function delete_topics($topics, $fid)
                 ->where('poster_id', get_admin_ids())
                 ->find_many();
             if ($authorized) {
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             }
         }
 
@@ -759,12 +767,12 @@ public function delete_topics($topics, $fid)
 
         update_forum($fid);
 
-        redirect(get_link('forum/'.$fid.'/'), __('Delete topics redirect'));
+        redirect(get_link('forum/'.$fid.'/'), $lang_misc['Delete topics redirect']);
     }
 
     public function get_forum_info($fid)
     {
-
+        global $lang_common;
 
         $select_get_forum_info = array('f.forum_name', 'f.redirect_url', 'f.num_topics', 'f.sort_by');
         $where_get_forum_info = array(
@@ -782,7 +790,7 @@ public function get_forum_info($fid)
             ->find_one();
 
         if (!$cur_forum) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         return $cur_forum;
@@ -811,6 +819,8 @@ public function forum_sort_by($forum_sort)
 
     public function display_topics($fid, $sort_by, $start_from)
     {
+        global $lang_forum, $lang_common;
+
         $topic_data = array();
 
         // Get topic/forum tracking data
@@ -851,7 +861,7 @@ public function display_topics($fid, $sort_by, $start_from)
                 $url_topic = url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_disp'] = '<a href="'.get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_disp'] = '<a href="'.get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['last_poster']).'</span>';
                     $cur_topic['ghost_topic'] = false;
                 } else {
                     $cur_topic['last_post_disp'] = '- - -';
@@ -864,18 +874,18 @@ public function display_topics($fid, $sort_by, $start_from)
 
                 if ($cur_topic['sticky'] == '1') {
                     $cur_topic['item_status'] .= ' isticky';
-                    $status_text[] = '<span class="stickytext">'.__('Sticky').'</span>';
+                    $status_text[] = '<span class="stickytext">'.$lang_forum['Sticky'].'</span>';
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
-                    $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
+                    $status_text[] = '<span class="movedtext">'.$lang_forum['Moved'].'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
-                    $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
+                    $status_text[] = '<span class="closedtext">'.$lang_forum['Closed'].'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
 
@@ -883,7 +893,7 @@ public function display_topics($fid, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_disp'] = '<strong>'.$cur_topic['subject_disp'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.$lang_common['New posts info'].'">'.$lang_common['New posts'].'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
@@ -953,14 +963,14 @@ public function close_multiple_topics($action, $topics, $fid)
     
     public function get_subject_tid($id)
     {
-
+        global $lang_common;
 
         $subject = DB::for_table('topics')
             ->where('id', $id)
             ->find_one_col('subject');
 
         if (!$subject) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         return $subject;
diff --git a/model/post.php b/model/post.php
index 0c55d616..39fbba15 100644
--- a/model/post.php
+++ b/model/post.php
@@ -25,7 +25,7 @@ public function __construct()
     //  Get some info about the post
     public function get_info_post($tid, $fid)
     {
-
+        global $lang_common;
 
         if ($tid) {
             $select_get_info_post = array('f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_replies', 'fp.post_topics', 't.subject', 't.closed', 'is_subscribed' => 's.user_id');
@@ -64,7 +64,7 @@ public function get_info_post($tid, $fid)
         }
 
         if (!$cur_posting) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         return $cur_posting;
@@ -73,7 +73,7 @@ public function get_info_post($tid, $fid)
     // Checks the post for errors before posting
     public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
     {
-        global $lang_antispam, $lang_antispam_questions, $pd;
+        global $lang_post, $lang_common, $lang_prof_reg, $lang_register, $lang_antispam, $lang_antispam_questions, $pd;
 
         // Antispam feature
         if ($this->user->is_guest) {
@@ -90,13 +90,13 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
             }
 
             if (empty($lang_antispam_questions_array[$question]) || $lang_antispam_questions_array[$question] != $answer) {
-                $errors[] = __('Robot test fail');
+                $errors[] = $lang_antispam['Robot test fail'];
             }
         }
 
         // Flood protection
         if ($this->request->post('preview') != '' && $this->user->last_post != '' && (time() - $this->user->last_post) < $this->user->g_post_flood) {
-            $errors[] = sprintf(__('Flood start'), $this->user->g_post_flood, $this->user->g_post_flood - (time() - $this->user->last_post));
+            $errors[] = sprintf($lang_post['Flood start'], $this->user->g_post_flood, $this->user->g_post_flood - (time() - $this->user->last_post));
         }
 
         if ($tid) {
@@ -105,13 +105,13 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
                 ->find_one_col('subject');
 
             if (!$subject_tid) {
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
             }
             $url_subject = url_friendly($subject_tid);
         } else {
             $url_subject = '';
         }
-
+        
         // If it's a new topic
         if ($fid) {
             $subject = feather_trim($this->request->post('req_subject'));
@@ -121,13 +121,13 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
             }
 
             if ($subject == '') {
-                $errors[] = __('No subject');
+                $errors[] = $lang_post['No subject'];
             } elseif ($this->config['o_censoring'] == '1' && $censored_subject == '') {
-                $errors[] = __('No subject after censoring');
+                $errors[] = $lang_post['No subject after censoring'];
             } elseif (feather_strlen($subject) > 70) {
-                $errors[] = __('Too long subject');
+                $errors[] = $lang_post['Too long subject'];
             } elseif ($this->config['p_subject_all_caps'] == '0' && is_all_uppercase($subject) && !$this->user->is_admmod) {
-                $errors[] = __('All caps subject');
+                $errors[] = $lang_post['All caps subject'];
             }
         }
 
@@ -141,14 +141,14 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
             if ($this->config['p_force_guest_email'] == '1' || $email != '') {
                 require FEATHER_ROOT.'include/email.php';
                 if (!is_valid_email($email)) {
-                    $errors[] = __('Invalid email');
+                    $errors[] = $lang_common['Invalid email'];
                 }
 
                 // Check if it's a banned email address
                 // we should only check guests because members' addresses are already verified
                 if ($this->user->is_guest && is_banned_email($email)) {
                     if ($this->config['p_allow_banned_email'] == '0') {
-                        $errors[] = __('Banned email');
+                        $errors[] = $lang_prof_reg['Banned email'];
                     }
 
                     $errors['banned_email'] = 1; // Used later when we send an alert email
@@ -161,9 +161,9 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
 
         // Here we use strlen() not feather_strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         if (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            $errors[] = sprintf(__('Too long message'), forum_number_format(FEATHER_MAX_POSTSIZE));
+            $errors[] = sprintf($lang_post['Too long message'], forum_number_format(FEATHER_MAX_POSTSIZE));
         } elseif ($this->config['p_message_all_caps'] == '0' && is_all_uppercase($message) && !$this->user->is_admmod) {
-            $errors[] = __('All caps message');
+            $errors[] = $lang_post['All caps message'];
         }
 
         // Validate BBCode syntax
@@ -174,13 +174,13 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
 
         if (empty($errors)) {
             if ($message == '') {
-                $errors[] = __('No message');
+                $errors[] = $lang_post['No message'];
             } elseif ($this->config['o_censoring'] == '1') {
                 // Censor message to see if that causes problems
                 $censored_message = feather_trim(censor_words($message));
 
                 if ($censored_message == '') {
-                    $errors[] = __('No message after censoring');
+                    $errors[] = $lang_post['No message after censoring'];
                 }
             }
         }
@@ -693,7 +693,7 @@ public function split_text($text, $start, $end, $retab = true)
     // If we are quoting a message
     public function get_quote_message($qid, $tid)
     {
-
+        global $lang_common;
 
         $select_get_quote_message = array('poster', 'message');
 
@@ -703,7 +703,7 @@ public function get_quote_message($qid, $tid)
                  ->find_one();
 
         if (!$quote) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         // If the message contains a code tag we have to split it up (text within [code][/code] shouldn't be touched)
@@ -756,7 +756,7 @@ public function get_quote_message($qid, $tid)
                 }
             $quote = '[quote='. $quote['poster'] .']'.$quote['message'].'[/quote]'."\n";
         } else {
-            $quote = '> '.$quote['poster'].' '.__('wrote')."\n\n".'> '.$quote['message']."\n";
+            $quote = '> '.$quote['poster'].' '.$lang_common['wrote']."\n\n".'> '.$quote['message']."\n";
         }
 
         return $quote;
@@ -765,16 +765,18 @@ public function get_quote_message($qid, $tid)
     // Get the current state of checkboxes
     public function get_checkboxes($fid, $is_admmod, $is_subscribed)
     {
+        global $lang_post, $lang_common;
+
         $cur_index = 1;
 
         $checkboxes = array();
         if ($fid && $is_admmod) {
-            $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('stick_topic') ? ' checked="checked"' : '').' />'.__('Stick topic').'<br /></label>';
+            $checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('stick_topic') ? ' checked="checked"' : '').' />'.$lang_common['Stick topic'].'<br /></label>';
         }
 
         if (!$this->user->is_guest) {
             if ($this->config['o_smilies'] == '1') {
-                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('hide_smilies') ? ' checked="checked"' : '').' />'.__('Hide smilies').'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('hide_smilies') ? ' checked="checked"' : '').' />'.$lang_post['Hide smilies'].'<br /></label>';
             }
 
             if ($this->config['o_topic_subscriptions'] == '1') {
@@ -793,10 +795,10 @@ public function get_checkboxes($fid, $is_admmod, $is_subscribed)
                     $subscr_checked = true;
                 }
 
-                $checkboxes[] = '<label><input type="checkbox" name="subscribe" value="1" tabindex="'.($cur_index++).'"'.($subscr_checked ? ' checked="checked"' : '').' />'.($is_subscribed ? __('Stay subscribed') : __('Subscribe')).'<br /></label>';
+                $checkboxes[] = '<label><input type="checkbox" name="subscribe" value="1" tabindex="'.($cur_index++).'"'.($subscr_checked ? ' checked="checked"' : '').' />'.($is_subscribed ? $lang_post['Stay subscribed'] : $lang_post['Subscribe']).'<br /></label>';
             }
         } elseif ($this->config['o_smilies'] == '1') {
-            $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('hide_smilies') ? ' checked="checked"' : '').' />'.__('Hide smilies').'<br /></label>';
+            $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('hide_smilies') ? ' checked="checked"' : '').' />'.$lang_post['Hide smilies'].'<br /></label>';
         }
 
         return $checkboxes;
diff --git a/model/profile.php b/model/profile.php
index 49e8fe69..ff440fad 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -24,6 +24,8 @@ public function __construct()
  
     public function change_pass($id)
     {
+        global $lang_profile, $lang_common, $lang_prof_reg;
+
         if ($this->request->get('key')) {
             // If the user is already logged in we shouldn't be here :)
             if (!$this->user->is_guest) {
@@ -38,7 +40,7 @@ public function change_pass($id)
                 ->find_one();
 
             if ($key == '' || $key != $cur_user['activate_key']) {
-                message(__('Pass key bad').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
+                message($lang_profile['Pass key bad'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
             } else {
                 DB::for_table('users')
                     ->where('id', $id)
@@ -48,14 +50,14 @@ public function change_pass($id)
                     ->set_expr('activate_key', 'NULL')
                     ->save();
 
-                message(__('Pass updated'), true);
+                message($lang_profile['Pass updated'], true);
             }
         }
 
         // Make sure we are allowed to change this user's password
         if ($this->user->id != $id) {
             if (!$this->user->is_admmod) { // A regular user trying to change another user's password?
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's password?
 
@@ -69,11 +71,11 @@ public function change_pass($id)
                     ->find_one();
 
                 if (!$user) {
-                    message(__('Bad request'), '404');
+                    message($lang_common['Bad request'], '404');
                 }
 
                 if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == FEATHER_ADMIN || $user['g_moderator'] == '1') {
-                    message(__('No permission'), '403');
+                    message($lang_common['No permission'], '403');
                 }
             }
         }
@@ -84,10 +86,10 @@ public function change_pass($id)
             $new_password2 = feather_trim($this->request->post('req_new_password2'));
 
             if ($new_password1 != $new_password2) {
-                message(__('Pass not match'));
+                message($lang_prof_reg['Pass not match']);
             }
             if (feather_strlen($new_password1) < 6) {
-                message(__('Pass too short'));
+                message($lang_prof_reg['Pass too short']);
             }
 
             $cur_user = DB::for_table('users')
@@ -105,7 +107,7 @@ public function change_pass($id)
             }
 
             if (!$authorized) {
-                message(__('Wrong pass'));
+                message($lang_profile['Wrong pass']);
             }
 
             $new_password_hash = feather_hash($new_password1);
@@ -119,16 +121,18 @@ public function change_pass($id)
                 feather_setcookie($this->user->id, $new_password_hash, time() + $this->config['o_timeout_visit']);
             }
 
-            redirect(get_link('user/'.$id.'/section/essentials/'), __('Pass updated redirect'));
+            redirect(get_link('user/'.$id.'/section/essentials/'), $lang_profile['Pass updated redirect']);
         }
     }
 
     public function change_email($id)
     {
+        global $lang_profile, $lang_common, $lang_prof_reg;
+
         // Make sure we are allowed to change this user's email
         if ($this->user->id != $id) {
             if (!$this->user->is_admmod) { // A regular user trying to change another user's email?
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's email?
 
@@ -142,11 +146,11 @@ public function change_email($id)
                     ->find_one();
 
                 if (!$user) {
-                    message(__('Bad request'), '404');
+                    message($lang_common['Bad request'], '404');
                 }
 
                 if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == FEATHER_ADMIN || $user['g_moderator'] == '1') {
-                    message(__('No permission'), '403');
+                    message($lang_common['No permission'], '403');
                 }
             }
         }
@@ -159,7 +163,7 @@ public function change_email($id)
                 ->find_one_col('activate_key');
 
             if ($key == '' || $key != $new_email_key) {
-                message(__('Email key bad').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
+                message($lang_profile['Email key bad'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
             } else {
                 DB::for_table('users')
                     ->where('id', $id)
@@ -169,11 +173,11 @@ public function change_email($id)
                     ->set_expr('activate_key', 'NULL')
                     ->save();
 
-                message(__('Email updated'), true);
+                message($lang_profile['Email updated'], true);
             }
         } elseif ($this->request->isPost()) {
             if (feather_hash($this->request->post('req_password')) !== $this->user->password) {
-                message(__('Wrong pass'));
+                message($lang_profile['Wrong pass']);
             }
 
             require FEATHER_ROOT.'include/email.php';
@@ -181,13 +185,13 @@ public function change_email($id)
             // Validate the email address
             $new_email = strtolower(feather_trim($this->request->post('req_new_email')));
             if (!is_valid_email($new_email)) {
-                message(__('Invalid email'));
+                message($lang_common['Invalid email']);
             }
 
             // Check if it's a banned email address
             if (is_banned_email($new_email)) {
                 if ($this->config['p_allow_banned_email'] == '0') {
-                    message(__('Banned email'));
+                    message($lang_prof_reg['Banned email']);
                 } elseif ($this->config['o_mailing_list'] != '') {
                     // Load the "banned email change" template
                     $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/banned_email_change.tpl'));
@@ -216,7 +220,7 @@ public function change_email($id)
 
             if ($result) {
                 if ($this->config['p_allow_dupe_email'] == '0') {
-                    message(__('Dupe email'));
+                    message($lang_prof_reg['Dupe email']);
                 } elseif ($this->config['o_mailing_list'] != '') {
                     foreach($result as $cur_dupe) {
                         $dupe_list[] = $cur_dupe['username'];
@@ -268,14 +272,16 @@ public function change_email($id)
 
             pun_mail($new_email, $mail_subject, $mail_message);
 
-            message(__('Activate email sent').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
+            message($lang_profile['Activate email sent'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
         }
     }
 
     public function upload_avatar($id, $files_data)
     {
+        global $lang_profile;
+
         if (!isset($files_data['req_file'])) {
-            message(__('No file'));
+            message($lang_profile['No file']);
         }
 
         $uploaded_file = $files_data['req_file'];
@@ -285,25 +291,25 @@ public function upload_avatar($id, $files_data)
             switch ($uploaded_file['error']) {
                 case 1: // UPLOAD_ERR_INI_SIZE
                 case 2: // UPLOAD_ERR_FORM_SIZE
-                    message(__('Too large ini'));
+                    message($lang_profile['Too large ini']);
                     break;
 
                 case 3: // UPLOAD_ERR_PARTIAL
-                    message(__('Partial upload'));
+                    message($lang_profile['Partial upload']);
                     break;
 
                 case 4: // UPLOAD_ERR_NO_FILE
-                    message(__('No file'));
+                    message($lang_profile['No file']);
                     break;
 
                 case 6: // UPLOAD_ERR_NO_TMP_DIR
-                    message(__('No tmp directory'));
+                    message($lang_profile['No tmp directory']);
                     break;
 
                 default:
                     // No error occured, but was something actually uploaded?
                     if ($uploaded_file['size'] == 0) {
-                        message(__('No file'));
+                        message($lang_profile['No file']);
                     }
                     break;
             }
@@ -313,17 +319,17 @@ public function upload_avatar($id, $files_data)
             // Preliminary file check, adequate in most cases
             $allowed_types = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/png', 'image/x-png');
             if (!in_array($uploaded_file['type'], $allowed_types)) {
-                message(__('Bad type'));
+                message($lang_profile['Bad type']);
             }
 
             // Make sure the file isn't too big
             if ($uploaded_file['size'] > $this->config['o_avatars_size']) {
-                message(__('Too large').' '.forum_number_format($this->config['o_avatars_size']).' '.__('bytes').'.');
+                message($lang_profile['Too large'].' '.forum_number_format($this->config['o_avatars_size']).' '.$lang_profile['bytes'].'.');
             }
 
             // Move the file to the avatar directory. We do this before checking the width/height to circumvent open_basedir restrictions
             if (!@move_uploaded_file($uploaded_file['tmp_name'], FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp')) {
-                message(__('Move failed').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
+                message($lang_profile['Move failed'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
             }
 
             list($width, $height, $type, ) = @getimagesize(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
@@ -338,13 +344,13 @@ public function upload_avatar($id, $files_data)
             } else {
                 // Invalid type
                 @unlink(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
-                message(__('Bad type'));
+                message($lang_profile['Bad type']);
             }
 
             // Now check the width/height
             if (empty($width) || empty($height) || $width > $this->config['o_avatars_width'] || $height > $this->config['o_avatars_height']) {
                 @unlink(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
-                message(__('Too wide or high').' '.$this->config['o_avatars_width'].'x'.$this->config['o_avatars_height'].' '.__('pixels').'.');
+                message($lang_profile['Too wide or high'].' '.$this->config['o_avatars_width'].'x'.$this->config['o_avatars_height'].' '.$lang_profile['pixels'].'.');
             }
 
             // Delete any old avatars and put the new one in place
@@ -352,14 +358,16 @@ public function upload_avatar($id, $files_data)
             @rename(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp', FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.$extension);
             @chmod(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.$extension, 0644);
         } else {
-            message(__('Unknown failure'));
+            message($lang_profile['Unknown failure']);
         }
 
-        redirect(get_link('user/'.$id.'/section/personality/'), __('Avatar upload redirect'));
+        redirect(get_link('user/'.$id.'/section/personality/'), $lang_profile['Avatar upload redirect']);
     }
 
     public function update_group_membership($id)
     {
+        global $lang_profile;
+
         $new_group_id = intval($this->request->post('group_id'));
 
         $old_group_id = DB::for_table('users')
@@ -417,7 +425,7 @@ public function update_group_membership($id)
             }
         }
 
-        redirect(get_link('user/'.$id.'/section/admin/'), __('Group membership redirect'));
+        redirect(get_link('user/'.$id.'/section/admin/'), $lang_profile['Group membership redirect']);
     }
 
     public function get_username($id)
@@ -432,6 +440,8 @@ public function get_username($id)
 
     public function update_mod_forums($id)
     {
+        global $lang_profile;
+
         $username = $this->get_username($id);
 
         $moderator_in = ($this->request->post('moderator_in')) ? array_keys($this->request->post('moderator_in')) : array();
@@ -473,11 +483,13 @@ public function update_mod_forums($id)
             }
         }
 
-        redirect(get_link('user/'.$id.'/section/admin/'), __('Update forums redirect'));
+        redirect(get_link('user/'.$id.'/section/admin/'), $lang_profile['Update forums redirect']);
     }
 
     public function ban_user($id)
     {
+        global $lang_profile;
+
         // Get the username of the user we are banning
         $username = $this->get_username($id);
 
@@ -489,14 +501,16 @@ public function ban_user($id)
             ->find_one_col('id');
 
         if ($ban_id) {
-            redirect(get_link('admin/bans/edit/'.$ban_id.'/'), __('Ban redirect'));
+            redirect(get_link('admin/bans/edit/'.$ban_id.'/'), $lang_profile['Ban redirect']);
         } else {
-            redirect(get_link('admin/bans/add/'.$id.'/'), __('Ban redirect'));
+            redirect(get_link('admin/bans/add/'.$id.'/'), $lang_profile['Ban redirect']);
         }
     }
 
     public function promote_user($id)
     {
+        global $lang_profile, $lang_common;
+
         $pid = $this->request->get('pid') ? intval($this->request->get('pid')) : 0;
 
         // Find the group ID to promote the user to
@@ -507,7 +521,7 @@ public function promote_user($id)
             ->find_one_col('g.g_promote_next_group');
         
         if (!$next_group_id) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         // Update the user
@@ -516,11 +530,13 @@ public function promote_user($id)
             ->set('group_id', $next_group_id)
             ->save();
         
-        redirect(get_link('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
+        redirect(get_link('post/'.$pid.'/#p'.$pid), $lang_profile['User promote redirect']);
     }
 
     public function delete_user($id)
     {
+        global $lang_profile;
+
         // Get the username and group of the user we are deleting
         $select_info_delete_user = array('group_id', 'username');
 
@@ -532,7 +548,7 @@ public function delete_user($id)
         $username = $result['username'];
         
         if ($group_id == FEATHER_ADMIN) {
-            message(__('No delete admin message'));
+            message($lang_profile['No delete admin message']);
         }
 
         if ($this->request->post('delete_user_comply')) {
@@ -642,13 +658,13 @@ public function delete_user($id)
                 generate_admins_cache();
             }
 
-            redirect(get_base_url(), __('User delete redirect'));
+            redirect(get_base_url(), $lang_profile['User delete redirect']);
         }
     }
 
     public function fetch_user_group($id)
     {
-
+        global $lang_common;
 
         $info = array();
         
@@ -662,7 +678,7 @@ public function fetch_user_group($id)
             ->find_one();
 
         if (!$info) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         return $info;
@@ -670,7 +686,7 @@ public function fetch_user_group($id)
 
     public function update_profile($id, $info, $section)
     {
-        global $pd;
+        global $lang_common, $lang_profile, $lang_prof_reg, $pd;
 
         $username_updated = false;
 
@@ -690,7 +706,7 @@ public function update_profile($id, $info, $section)
                     $languages = forum_list_langs();
                     $form['language'] = feather_trim($this->request->post('form_language'));
                     if (!in_array($form['language'], $languages)) {
-                        message(__('Bad request'), '404');
+                        message($lang_common['Bad request'], '404');
                     }
                 }
 
@@ -727,7 +743,7 @@ public function update_profile($id, $info, $section)
                     // Validate the email address
                     $form['email'] = strtolower(feather_trim($this->request->post('req_email')));
                     if (!is_valid_email($form['email'])) {
-                        message(__('Invalid email'));
+                        message($lang_common['Invalid email']);
                     }
                 }
 
@@ -748,14 +764,14 @@ public function update_profile($id, $info, $section)
                         $url = url_valid($form['url']);
 
                         if ($url === false) {
-                            message(__('Invalid website URL'));
+                            message($lang_profile['Invalid website URL']);
                         }
 
                         $form['url'] = $url['url'];
                     }
                 } else {
                     if (!empty($form['url'])) {
-                        message(__('Website not allowed'));
+                        message($lang_profile['Website not allowed']);
                     }
 
                     $form['url'] = '';
@@ -769,10 +785,10 @@ public function update_profile($id, $info, $section)
                     if ($form['title'] != '') {
                         // A list of words that the title may not contain
                         // If the language is English, there will be some duplicates, but it's not the end of the world
-                        $forbidden = array('member', 'moderator', 'administrator', 'banned', 'guest', utf8_strtolower(__('Member')), utf8_strtolower(__('Moderator')), utf8_strtolower(__('Administrator')), utf8_strtolower(__('Banned')), utf8_strtolower(__('Guest')));
+                        $forbidden = array('member', 'moderator', 'administrator', 'banned', 'guest', utf8_strtolower($lang_common['Member']), utf8_strtolower($lang_common['Moderator']), utf8_strtolower($lang_common['Administrator']), utf8_strtolower($lang_common['Banned']), utf8_strtolower($lang_common['Guest']));
 
                         if (in_array(utf8_strtolower($form['title']), $forbidden)) {
-                            message(__('Forbidden title'));
+                            message($lang_profile['Forbidden title']);
                         }
                     }
                 }
@@ -792,7 +808,7 @@ public function update_profile($id, $info, $section)
 
                 // If the ICQ UIN contains anything other than digits it's invalid
                 if (preg_match('%[^0-9]%', $form['icq'])) {
-                    message(__('Bad ICQ'));
+                    message($lang_prof_reg['Bad ICQ']);
                 }
 
                 break;
@@ -808,9 +824,9 @@ public function update_profile($id, $info, $section)
 
                     // Validate signature
                     if (feather_strlen($form['signature']) > $this->config['p_sig_length']) {
-                        message(sprintf(__('Sig too long'), $this->config['p_sig_length'], feather_strlen($form['signature']) - $this->config['p_sig_length']));
+                        message(sprintf($lang_prof_reg['Sig too long'], $this->config['p_sig_length'], feather_strlen($form['signature']) - $this->config['p_sig_length']));
                     } elseif (substr_count($form['signature'], "\n") > ($this->config['p_sig_lines']-1)) {
-                        message(sprintf(__('Sig too many lines'), $this->config['p_sig_lines']));
+                        message(sprintf($lang_prof_reg['Sig too many lines'], $this->config['p_sig_lines']));
                     } elseif ($form['signature'] && $this->config['p_sig_all_caps'] == '0' && is_all_uppercase($form['signature']) && !$this->user->is_admmod) {
                         $form['signature'] = utf8_ucwords(utf8_strtolower($form['signature']));
                     }
@@ -867,7 +883,7 @@ public function update_profile($id, $info, $section)
                     $styles = forum_list_styles();
                     $form['style'] = feather_trim($this->request->post('form_style'));
                     if (!in_array($form['style'], $styles)) {
-                        message(__('Bad request'), '404');
+                        message($lang_common['Bad request'], '404');
                     }
                 }
 
@@ -890,7 +906,7 @@ public function update_profile($id, $info, $section)
             }
 
             default:
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
         }
 
 
@@ -901,7 +917,7 @@ public function update_profile($id, $info, $section)
         }
 
         if (empty($temp)) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         DB::for_table('users')->where('id', $id)
@@ -983,12 +999,12 @@ public function update_profile($id, $info, $section)
             }
         }
 
-        redirect(get_link('user/'.$id.'/section/'.$section.'/'), __('Profile redirect'));
+        redirect(get_link('user/'.$id.'/section/'.$section.'/'), $lang_profile['Profile redirect']);
     }
 
     public function get_user_info($id)
     {
-
+        global $lang_common;
 
         $select_get_user_info = array('u.id', 'u.username', 'u.email', 'u.title', 'u.realname', 'u.url', 'u.jabber', 'u.icq', 'u.msn', 'u.aim', 'u.yahoo', 'u.location', 'u.signature', 'u.disp_topics', 'u.disp_posts', 'u.email_setting', 'u.notify_with_post', 'u.auto_notify', 'u.show_smilies', 'u.show_img', 'u.show_img_sig', 'u.show_avatars', 'u.show_sig', 'u.timezone', 'u.dst', 'u.language', 'u.style', 'u.num_posts', 'u.last_post', 'u.registered', 'u.registration_ip', 'u.admin_note', 'u.date_format', 'u.time_format', 'u.last_visit', 'g.g_id', 'g.g_user_title', 'g.g_moderator');
 
@@ -1000,7 +1016,7 @@ public function get_user_info($id)
             ->find_one();
 
         if (!$user) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         return $user;
@@ -1008,79 +1024,81 @@ public function get_user_info($id)
 
     public function parse_user_info($user)
     {
+        global $lang_common, $lang_profile;
+
         $user_info = array();
 
-        $user_info['personal'][] = '<dt>'.__('Username').'</dt>';
+        $user_info['personal'][] = '<dt>'.$lang_common['Username'].'</dt>';
         $user_info['personal'][] = '<dd>'.feather_escape($user['username']).'</dd>';
 
         $user_title_field = get_title($user);
-        $user_info['personal'][] = '<dt>'.__('Title').'</dt>';
+        $user_info['personal'][] = '<dt>'.$lang_common['Title'].'</dt>';
         $user_info['personal'][] = '<dd>'.(($this->config['o_censoring'] == '1') ? censor_words($user_title_field) : $user_title_field).'</dd>';
 
         if ($user['realname'] != '') {
-            $user_info['personal'][] = '<dt>'.__('Realname').'</dt>';
+            $user_info['personal'][] = '<dt>'.$lang_profile['Realname'].'</dt>';
             $user_info['personal'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['realname']) : $user['realname']).'</dd>';
         }
 
         if ($user['location'] != '') {
-            $user_info['personal'][] = '<dt>'.__('Location').'</dt>';
+            $user_info['personal'][] = '<dt>'.$lang_profile['Location'].'</dt>';
             $user_info['personal'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['location']) : $user['location']).'</dd>';
         }
 
         if ($user['url'] != '') {
             $user['url'] = feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['url']) : $user['url']);
-            $user_info['personal'][] = '<dt>'.__('Website').'</dt>';
+            $user_info['personal'][] = '<dt>'.$lang_profile['Website'].'</dt>';
             $user_info['personal'][] = '<dd><span class="website"><a href="'.$user['url'].'" rel="nofollow">'.$user['url'].'</a></span></dd>';
         }
 
         if ($user['email_setting'] == '0' && !$this->user->is_guest && $this->user->g_send_email == '1') {
             $user['email_field'] = '<a href="mailto:'.feather_escape($user['email']).'">'.feather_escape($user['email']).'</a>';
         } elseif ($user['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-            $user['email_field'] = '<a href="'.get_link('email/'.$user['id'].'/').'">'.__('Send email').'</a>';
+            $user['email_field'] = '<a href="'.get_link('email/'.$user['id'].'/').'">'.$lang_common['Send email'].'</a>';
         } else {
             $user['email_field'] = '';
         }
         if ($user['email_field'] != '') {
-            $user_info['personal'][] = '<dt>'.__('Email').'</dt>';
+            $user_info['personal'][] = '<dt>'.$lang_common['Email'].'</dt>';
             $user_info['personal'][] = '<dd><span class="email">'.$user['email_field'].'</span></dd>';
         }
 
         if ($user['jabber'] != '') {
-            $user_info['messaging'][] = '<dt>'.__('Jabber').'</dt>';
+            $user_info['messaging'][] = '<dt>'.$lang_profile['Jabber'].'</dt>';
             $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['jabber']) : $user['jabber']).'</dd>';
         }
 
         if ($user['icq'] != '') {
-            $user_info['messaging'][] = '<dt>'.__('ICQ').'</dt>';
+            $user_info['messaging'][] = '<dt>'.$lang_profile['ICQ'].'</dt>';
             $user_info['messaging'][] = '<dd>'.$user['icq'].'</dd>';
         }
 
         if ($user['msn'] != '') {
-            $user_info['messaging'][] = '<dt>'.__('MSN').'</dt>';
+            $user_info['messaging'][] = '<dt>'.$lang_profile['MSN'].'</dt>';
             $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['msn']) : $user['msn']).'</dd>';
         }
 
         if ($user['aim'] != '') {
-            $user_info['messaging'][] = '<dt>'.__('AOL IM').'</dt>';
+            $user_info['messaging'][] = '<dt>'.$lang_profile['AOL IM'].'</dt>';
             $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['aim']) : $user['aim']).'</dd>';
         }
 
         if ($user['yahoo'] != '') {
-            $user_info['messaging'][] = '<dt>'.__('Yahoo').'</dt>';
+            $user_info['messaging'][] = '<dt>'.$lang_profile['Yahoo'].'</dt>';
             $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['yahoo']) : $user['yahoo']).'</dd>';
         }
 
         if ($this->config['o_avatars'] == '1') {
             $avatar_field = generate_avatar_markup($user['id']);
             if ($avatar_field != '') {
-                $user_info['personality'][] = '<dt>'.__('Avatar').'</dt>';
+                $user_info['personality'][] = '<dt>'.$lang_profile['Avatar'].'</dt>';
                 $user_info['personality'][] = '<dd>'.$avatar_field.'</dd>';
             }
         }
 
         if ($this->config['o_signatures'] == '1') {
             if (isset($parsed_signature)) {
-                $user_info['personality'][] = '<dt>'.__('Signature').'</dt>';
+                $user_info['personality'][] = '<dt>'.$lang_profile['Signature'].'</dt>';
                 $user_info['personality'][] = '<dd><div class="postsignature postmsg">'.$parsed_signature.'</div></dd>';
             }
         }
@@ -1092,11 +1110,11 @@ public function parse_user_info($user)
         if ($this->user->g_search == '1') {
             $quick_searches = array();
             if ($user['num_posts'] > 0) {
-                $quick_searches[] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$user['id']).'">'.__('Show topics').'</a>';
-                $quick_searches[] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Show posts').'</a>';
+                $quick_searches[] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$user['id']).'">'.$lang_profile['Show topics'].'</a>';
+                $quick_searches[] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.$lang_profile['Show posts'].'</a>';
             }
             if ($this->user->is_admmod && $this->config['o_topic_subscriptions'] == '1') {
-                $quick_searches[] = '<a href="'.get_link('search/?action=show_subscriptions&amp;user_id='.$user['id']).'">'.__('Show subscriptions').'</a>';
+                $quick_searches[] = '<a href="'.get_link('search/?action=show_subscriptions&amp;user_id='.$user['id']).'">'.$lang_profile['Show subscriptions'].'</a>';
             }
 
             if (!empty($quick_searches)) {
@@ -1104,16 +1122,16 @@ public function parse_user_info($user)
             }
         }
         if ($posts_field != '') {
-            $user_info['activity'][] = '<dt>'.__('Posts').'</dt>';
+            $user_info['activity'][] = '<dt>'.$lang_common['Posts'].'</dt>';
             $user_info['activity'][] = '<dd>'.$posts_field.'</dd>';
         }
 
         if ($user['num_posts'] > 0) {
-            $user_info['activity'][] = '<dt>'.__('Last post').'</dt>';
+            $user_info['activity'][] = '<dt>'.$lang_common['Last post'].'</dt>';
             $user_info['activity'][] = '<dd>'.format_time($user['last_post']).'</dd>';
         }
 
-        $user_info['activity'][] = '<dt>'.__('Registered').'</dt>';
+        $user_info['activity'][] = '<dt>'.$lang_common['Registered'].'</dt>';
         $user_info['activity'][] = '<dd>'.format_time($user['registered'], true).'</dd>';
 
         return $user_info;
@@ -1121,23 +1139,25 @@ public function parse_user_info($user)
 
     public function edit_essentials($id, $user)
     {
+        global $lang_profile, $lang_common;
+
         $user_disp = array();
 
         if ($this->user->is_admmod) {
             if ($this->user->g_id == FEATHER_ADMIN || $this->user->g_mod_rename_users == '1') {
-                $user_disp['username_field'] = '<label class="required"><strong>'.__('Username').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_username" value="'.feather_escape($user['username']).'" size="25" maxlength="25" /><br /></label>'."\n";
+                $user_disp['username_field'] = '<label class="required"><strong>'.$lang_common['Username'].' <span>'.$lang_common['Required'].'</span></strong><br /><input type="text" name="req_username" value="'.feather_escape($user['username']).'" size="25" maxlength="25" /><br /></label>'."\n";
             } else {
-                $user_disp['username_field'] = '<p>'.sprintf(__('Username info'), feather_escape($user['username'])).'</p>'."\n";
+                $user_disp['username_field'] = '<p>'.sprintf($lang_profile['Username info'], feather_escape($user['username'])).'</p>'."\n";
             }
 
-            $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.feather_escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.get_link('email/'.$id.'/').'">'.__('Send email').'</a></span></p>'."\n";
+            $user_disp['email_field'] = '<label class="required"><strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong><br /><input type="text" name="req_email" value="'.feather_escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.get_link('email/'.$id.'/').'">'.$lang_common['Send email'].'</a></span></p>'."\n";
         } else {
-            $user_disp['username_field'] = '<p>'.__('Username').': '.feather_escape($user['username']).'</p>'."\n";
+            $user_disp['username_field'] = '<p>'.$lang_common['Username'].': '.feather_escape($user['username']).'</p>'."\n";
 
             if ($this->config['o_regs_verify'] == '1') {
-                $user_disp['email_field'] = '<p>'.sprintf(__('Email info'), feather_escape($user['email']).' - <a href="'.get_link('user/'.$id.'/action/change_email/').'">'.__('Change email').'</a>').'</p>'."\n";
+                $user_disp['email_field'] = '<p>'.sprintf($lang_profile['Email info'], feather_escape($user['email']).' - <a href="'.get_link('user/'.$id.'/action/change_email/').'">'.$lang_profile['Change email'].'</a>').'</p>'."\n";
             } else {
-                $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.$user['email'].'" size="40" maxlength="80" /><br /></label>'."\n";
+                $user_disp['email_field'] = '<label class="required"><strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong><br /><input type="text" name="req_email" value="'.$user['email'].'" size="40" maxlength="80" /><br /></label>'."\n";
             }
         }
 
@@ -1145,17 +1165,17 @@ public function edit_essentials($id, $user)
         $posts_actions = array();
 
         if ($this->user->g_id == FEATHER_ADMIN) {
-            $user_disp['posts_field'] .= '<label>'.__('Posts').'<br /><input type="text" name="num_posts" value="'.$user['num_posts'].'" size="8" maxlength="8" /><br /></label>';
+            $user_disp['posts_field'] .= '<label>'.$lang_common['Posts'].'<br /><input type="text" name="num_posts" value="'.$user['num_posts'].'" size="8" maxlength="8" /><br /></label>';
         } elseif ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) {
-            $posts_actions[] = sprintf(__('Posts info'), forum_number_format($user['num_posts']));
+            $posts_actions[] = sprintf($lang_profile['Posts info'], forum_number_format($user['num_posts']));
         }
 
         if ($this->user->g_search == '1' || $this->user->g_id == FEATHER_ADMIN) {
-            $posts_actions[] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$id).'">'.__('Show topics').'</a>';
-            $posts_actions[] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$id).'">'.__('Show posts').'</a>';
+            $posts_actions[] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$id).'">'.$lang_profile['Show topics'].'</a>';
+            $posts_actions[] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$id).'">'.$lang_profile['Show posts'].'</a>';
 
             if ($this->config['o_topic_subscriptions'] == '1') {
-                $posts_actions[] = '<a href="'.get_link('search/?action=show_subscriptions&amp;user_id='.$id).'">'.__('Show subscriptions').'</a>';
+                $posts_actions[] = '<a href="'.get_link('search/?action=show_subscriptions&amp;user_id='.$id).'">'.$lang_profile['Show subscriptions'].'</a>';
             }
         }
 
@@ -1231,7 +1251,10 @@ public function get_forum_list($id)
     //
     public function generate_profile_menu($page = '', $id)
     {
+        global $lang_profile;
+
         $this->feather->render('profile/menu.php', array(
+            'lang_profile' => $lang_profile,
             'id' => $id,
             'feather_config' => $this->config,
             'feather_user' => $this->user,
diff --git a/model/register.php b/model/register.php
index d88001fd..9c61b0a7 100644
--- a/model/register.php
+++ b/model/register.php
@@ -24,7 +24,7 @@ public function __construct()
  
     public function check_for_errors()
     {
-        global $lang_register, $lang_antispam, $lang_antispam_questions;
+        global $lang_register, $lang_prof_reg, $lang_common, $lang_antispam, $lang_antispam_questions;
 
         $user = array();
         $user['errors'] = '';
@@ -36,7 +36,7 @@ public function check_for_errors()
                                   ->find_one();
 
         if ($already_registered) {
-            message(__('Registration flood'));
+            message($lang_register['Registration flood']);
         }
 
 
@@ -57,9 +57,9 @@ public function check_for_errors()
         $user['errors'] = check_username($user['username'], $user['errors']);
 
         if (feather_strlen($user['password1']) < 6) {
-            $user['errors'][] = __('Pass too short');
+            $user['errors'][] = $lang_prof_reg['Pass too short'];
         } elseif ($user['password1'] != $password2) {
-            $user['errors'][] = __('Pass not match');
+            $user['errors'][] = $lang_prof_reg['Pass not match'];
         }
 
         // Antispam feature
@@ -71,22 +71,22 @@ public function check_for_errors()
             $lang_antispam_questions_array[md5($k)] = strtoupper($v);
         }
         if (empty($lang_antispam_questions_array[$question]) || $lang_antispam_questions_array[$question] != $answer) {
-            $user['errors'][] = __('Robot test fail');
+            $user['errors'][] = $lang_antispam['Robot test fail'];
         }
 
         // Validate email
         require FEATHER_ROOT.'include/email.php';
 
         if (!is_valid_email($user['email1'])) {
-            $user['errors'][] = __('Invalid email');
+            $user['errors'][] = $lang_common['Invalid email'];
         } elseif ($this->config['o_regs_verify'] == '1' && $user['email1'] != $email2) {
-            $user['errors'][] = __('Email not match');
+            $user['errors'][] = $lang_register['Email not match'];
         }
 
         // Check if it's a banned email address
         if (is_banned_email($user['email1'])) {
             if ($this->config['p_allow_banned_email'] == '0') {
-                $user['errors'][] = __('Banned email');
+                $user['errors'][] = $lang_prof_reg['Banned email'];
             }
             $user['banned_email'] = 1; // Used later when we send an alert email
         }
@@ -100,7 +100,7 @@ public function check_for_errors()
 
         if ($dupe_mail) {
             if ($this->config['p_allow_dupe_email'] == '0') {
-                $user['errors'][] = __('Dupe email');
+                $user['errors'][] = $lang_prof_reg['Dupe email'];
             }
 
             foreach($dupe_mail as $cur_dupe) {
@@ -112,7 +112,7 @@ public function check_for_errors()
         if ($this->request->post('language')) {
             $user['language'] = preg_replace('%[\.\\\/]%', '', $this->request->post('language'));
             if (!file_exists(FEATHER_ROOT.'lang/'.$user['language'].'/common.php')) {
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
             }
         } else {
             $user['language'] = $this->config['o_default_lang'];
@@ -123,6 +123,8 @@ public function check_for_errors()
 
     public function insert_user($user)
     {
+        global $lang_register;
+
         // Insert the new user into the database. We do this now to get the last inserted ID for later use
         $now = time();
 
@@ -239,11 +241,11 @@ public function insert_user($user)
 
             pun_mail($user['email1'], $mail_subject, $mail_message);
 
-            message(__('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
+            message($lang_register['Reg email'].' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
         }
 
         feather_setcookie($new_uid, $password_hash, time() + $this->config['o_timeout_visit']);
 
-        redirect(get_base_url(), __('Reg complete'));
+        redirect(get_base_url(), $lang_register['Reg complete']);
     }
 }
diff --git a/model/search.php b/model/search.php
index 9904dc3a..fdf13f44 100644
--- a/model/search.php
+++ b/model/search.php
@@ -25,7 +25,7 @@ public function __construct()
  
     public function get_search_results()
     {
-        global $db_type, $lang_search;
+        global $db_type, $lang_common, $lang_search;
 
         $search = array();
 
@@ -46,7 +46,7 @@ public function get_search_results()
         if ($this->request->get('search_id')) {
             $search_id = intval($this->request->get('search_id'));
             if ($search_id < 1) {
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
             }
         }
         // If it's a regular search (keywords and/or author)
@@ -63,7 +63,7 @@ public function get_search_results()
             }
 
             if (!$keywords && !$author) {
-                message(__('No terms'));
+                message($lang_search['No terms']);
             }
 
             if ($author) {
@@ -78,21 +78,21 @@ public function get_search_results()
         elseif ($action == 'show_user_posts' || $action == 'show_user_topics' || $action == 'show_subscriptions') {
             $user_id = ($this->request->get('user_id')) ? intval($this->request->get('user_id')) : $this->user->id;
             if ($user_id < 2) {
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
             }
 
             // Subscribed topics can only be viewed by admins, moderators and the users themselves
             if ($action == 'show_subscriptions' && !$this->user->is_admmod && $user_id != $this->user->id) {
-                message(__('No permission'), '403');
+                message($lang_common['No permission'], '403');
             }
         } elseif ($action == 'show_recent') {
             $interval = $this->request->get('value') ? intval($this->request->get('value')) : 86400;
         } elseif ($action == 'show_replies') {
             if ($this->user->is_guest) {
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
             }
         } elseif ($action != 'show_new' && $action != 'show_unanswered') {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
 
@@ -117,7 +117,7 @@ public function get_search_results()
 
                 unset($temp);
             } else {
-                message(__('No hits'));
+                message($lang_search['No hits']);
             }
         } else {
             $keyword_results = $author_results = array();
@@ -128,7 +128,7 @@ public function get_search_results()
             if (!empty($author) || !empty($keywords)) {
                 // Flood protection
                 if ($this->user->last_search && (time() - $this->user->last_search) < $this->user->g_search_flood && (time() - $this->user->last_search) >= 0) {
-                    message(sprintf(__('Search flood'), $this->user->g_search_flood, $this->user->g_search_flood - (time() - $this->user->last_search)));
+                    message(sprintf($lang_search['Search flood'], $this->user->g_search_flood, $this->user->g_search_flood - (time() - $this->user->last_search)));
                 }
 
                 if (!$this->user->is_guest) {
@@ -172,7 +172,7 @@ public function get_search_results()
                     $keywords_array = split_words($keywords, false);
 
                     if (empty($keywords_array)) {
-                        message(__('No hits'));
+                        message($lang_search['No hits']);
                     }
 
                     // Should we search in message body or topic subject specifically?
@@ -252,7 +252,7 @@ public function get_search_results()
                 }
 
                 // If it's a search for author name (and that author name isn't Guest)
-                if ($author && $author != 'guest' && $author != utf8_strtolower(__('Guest'))) {
+                if ($author && $author != 'guest' && $author != utf8_strtolower($lang_common['Guest'])) {
                     $username_exists = DB::for_table('users')->select('id')->where_like('username', $author)->find_many();
 
                     if ($username_exists) {
@@ -296,7 +296,7 @@ public function get_search_results()
 
                 $num_hits = count($search_ids);
                 if (!$num_hits) {
-                    message(__('No hits'));
+                    message($lang_search['No hits']);
                 }
             } elseif ($action == 'show_new' || $action == 'show_recent' || $action == 'show_replies' || $action == 'show_user_posts' || $action == 'show_user_topics' || $action == 'show_subscriptions' || $action == 'show_unanswered') {
                 $search_type = array('action', $action);
@@ -313,7 +313,7 @@ public function get_search_results()
                 // If it's a search for new posts since last visit
                 if ($action == 'show_new') {
                     if ($this->user->is_guest) {
-                        message(__('No permission'), '403');
+                        message($lang_common['No permission'], '403');
                     }
 
                     $result = DB::for_table('topics')
@@ -336,7 +336,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message(__('No new posts'));
+                        message($lang_search['No new posts']);
                     }
                 }
                 // If it's a search for recent posts (in a certain time interval)
@@ -360,7 +360,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message(__('No recent posts'));
+                        message($lang_search['No recent posts']);
                     }
                 }
                 // If it's a search for topics in which the user has posted
@@ -384,7 +384,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message(__('No user posts'));
+                        message($lang_search['No user posts']);
                     }
                 }
                 // If it's a search for posts by a specific user ID
@@ -406,7 +406,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message(__('No user posts'));
+                        message($lang_search['No user posts']);
                     }
 
                     // Pass on the user ID so that we can later know whose posts we're searching for
@@ -429,7 +429,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message(__('No user topics'));
+                        message($lang_search['No user topics']);
                     }
 
                     // Pass on the user ID so that we can later know whose topics we're searching for
@@ -438,7 +438,7 @@ public function get_search_results()
                 // If it's a search for subscribed topics
                 elseif ($action == 'show_subscriptions') {
                     if ($this->user->is_guest) {
-                        message(__('Bad request'), '404');
+                        message($lang_common['Bad request'], '404');
                     }
 
                     $result = DB::for_table('topics')
@@ -456,7 +456,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message(__('No subscriptions'));
+                        message($lang_search['No subscriptions']);
                     }
 
                     // Pass on user ID so that we can later know whose subscriptions we're searching for
@@ -479,7 +479,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message(__('No unanswered'));
+                        message($lang_search['No unanswered']);
                     }
                 }
 
@@ -491,7 +491,7 @@ public function get_search_results()
                 $pdo = DB::get_db();
                 $pdo = null;
             } else {
-                message(__('Bad request'), '404');
+                message($lang_common['Bad request'], '404');
             }
 
 
@@ -543,7 +543,7 @@ public function get_search_results()
 
         // If we're on the new posts search, display a "mark all as read" link
         if (!$this->user->is_guest && $search_type[0] == 'action' && $search_type[1] == 'show_new') {
-            $search['forum_actions'][] = '<a href="'.get_link('mark-read/').'">'.__('Mark all as read').'</a>';
+            $search['forum_actions'][] = '<a href="'.get_link('mark-read/').'">'.$lang_common['Mark all as read'].'</a>';
         }
 
         // Fetch results to display
@@ -578,7 +578,7 @@ public function get_search_results()
             $search['start_from'] = $start_from;
 
             // Generate paging links
-            $search['paging_links'] = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?search_id='.$search_id);
+            $search['paging_links'] = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate_old($num_pages, $p, '?search_id='.$search_id);
 
             // throw away the first $start_from of $search_ids, only keep the top $per_page of $search_ids
             $search_ids = array_slice($search_ids, $start_from, $per_page);
@@ -614,23 +614,23 @@ public function get_search_results()
                 $search['search_set'][] = $row;
             }
 
-            $search['crumbs_text']['show_as'] = __('Search');
+            $search['crumbs_text']['show_as'] = $lang_search['Search'];
 
             if ($search_type[0] == 'action') {
                 if ($search_type[1] == 'show_user_topics') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_topics'), feather_escape($search['search_set'][0]['poster'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf($lang_search['Quick search show_user_topics'], feather_escape($search['search_set'][0]['poster'])).'</a>';
                 } elseif ($search_type[1] == 'show_user_posts') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_posts'), feather_escape($search['search_set'][0]['pposter'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf($lang_search['Quick search show_user_posts'], feather_escape($search['search_set'][0]['pposter'])).'</a>';
                 } elseif ($search_type[1] == 'show_subscriptions') {
                     // Fetch username of subscriber
                     $subscriber_id = $search_type[2];
                     $subscriber_name = DB::for_table('users')->where('id', $subscriber_id)->find_one_col('username');
 
                     if (!$subscriber_name) {
-                        message(__('Bad request'), '404');
+                        message($lang_common['Bad request'], '404');
                     }
 
-                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), feather_escape($subscriber_name)).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf($lang_search['Quick search show_subscriptions'], feather_escape($subscriber_name)).'</a>';
                 } else {
                     $search_url = str_replace('_', '/', $search_type[1]);
                     $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/'.$search_url.'/').'">'.$lang_search['Quick search '.$search_type[1]].'</a>';
@@ -660,7 +660,7 @@ public function get_search_results()
 
     public function display_search_results($search)
     {
-        global $lang_search, $pd;
+        global $lang_forum, $lang_common, $lang_topic, $lang_search, $pd;
 
         // Get topic/forum tracking data
         if (!$this->user->is_guest) {
@@ -684,7 +684,7 @@ public function display_search_results($search)
                 if (!$this->user->is_guest && $cur_search['last_post'] > $this->user->last_visit && (!isset($tracked_topics['topics'][$cur_search['tid']]) || $tracked_topics['topics'][$cur_search['tid']] < $cur_search['last_post']) && (!isset($tracked_topics['forums'][$cur_search['forum_id']]) || $tracked_topics['forums'][$cur_search['forum_id']] < $cur_search['last_post'])) {
                     $cur_search['item_status'] = 'inew';
                     $cur_search['icon_type'] = 'icon icon-new';
-                    $cur_search['icon_text'] = __('New icon');
+                    $cur_search['icon_text'] = $lang_topic['New icon'];
                 } else {
                     $cur_search['item_status'] = '';
                     $cur_search['icon_text'] = '<!-- -->';
@@ -708,7 +708,9 @@ public function display_search_results($search)
                     'url_topic' => $url_topic,
                     'cur_search' => $cur_search,
                     'forum' => $forum,
+                    'lang_common' => $lang_common,
                     'lang_search' => $lang_search,
+                    'lang_topic' => $lang_topic,
                     )
                 );
             } else {
@@ -717,15 +719,15 @@ public function display_search_results($search)
                 $cur_search['item_status'] = ($topic_count % 2 == 0) ? 'roweven' : 'rowodd';
                 $cur_search['icon_type'] = 'icon';
 
-                $subject = '<a href="'.get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.feather_escape($cur_search['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['poster']).'</span>';
+                $subject = '<a href="'.get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.feather_escape($cur_search['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_search['poster']).'</span>';
 
                 if ($cur_search['sticky'] == '1') {
                     $cur_search['item_status'] .= ' isticky';
-                    $status_text[] = '<span class="stickytext">'.__('Sticky').'</span>';
+                    $status_text[] = '<span class="stickytext">'.$lang_forum['Sticky'].'</span>';
                 }
 
                 if ($cur_search['closed'] != '0') {
-                    $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
+                    $status_text[] = '<span class="closedtext">'.$lang_forum['Closed'].'</span>';
                     $cur_search['item_status'] .= ' iclosed';
                 }
 
@@ -733,7 +735,7 @@ public function display_search_results($search)
                     $cur_search['item_status'] .= ' inew';
                     $cur_search['icon_type'] = 'icon icon-new';
                     $subject = '<strong>'.$subject.'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_search['tid'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_search['tid'].'/action/new/').'" title="'.$lang_common['New posts info'].'">'.$lang_common['New posts'].'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
@@ -767,6 +769,7 @@ public function display_search_results($search)
                     'topic_count' => $topic_count,
                     'subject' => $subject,
                     'forum' => $forum,
+                    'lang_common' => $lang_common,
                     )
                 );
             }
@@ -799,7 +802,7 @@ public function get_list_forums()
 
         // We either show a list of forums of which multiple can be selected
         if ($this->config['o_search_all_forums'] == '1' || $this->user->is_admmod) {
-            $output .= "\t\t\t\t\t\t".'<div class="conl multiselect">'.__('Forum search')."\n";
+            $output .= "\t\t\t\t\t\t".'<div class="conl multiselect">'.$lang_search['Forum search']."\n";
             $output .= "\t\t\t\t\t\t".'<br />'."\n";
             $output .= "\t\t\t\t\t\t".'<div class="checklist">'."\n";
 
@@ -831,7 +834,7 @@ public function get_list_forums()
         }
         // ... or a simple select list for one forum only
         else {
-            $output .= "\t\t\t\t\t\t".'<label class="conl">'.__('Forum search')."\n";
+            $output .= "\t\t\t\t\t\t".'<label class="conl">'.$lang_search['Forum search']."\n";
             $output .= "\t\t\t\t\t\t".'<br />'."\n";
             $output .= "\t\t\t\t\t\t".'<select id="forum" name="forum">'."\n";
 
diff --git a/model/viewforum.php b/model/viewforum.php
index 7eee1586..1f87ec5d 100644
--- a/model/viewforum.php
+++ b/model/viewforum.php
@@ -25,7 +25,7 @@ public function __construct()
     // Returns basic informations about the forum
     public function get_info_forum($id)
     {
-
+        global $lang_common;
 
         $where_get_info_forum = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -58,7 +58,7 @@ public function get_info_forum($id)
         }
 
         if (!$cur_forum) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         return $cur_forum;
@@ -87,7 +87,7 @@ public function sort_forum_by($sort_by_sql)
     // Adds relationship meta tags
     public function get_page_head($forum_id, $num_pages, $p, $url_forum)
     {
-
+        global $lang_common;
 
         $page_head = array();
         $page_head['canonical'] = "\t".'<link href="'.get_link('forum/'.$forum_id.'/'.$url_forum.'/').'" rel="canonical" />';
@@ -102,9 +102,9 @@ public function get_page_head($forum_id, $num_pages, $p, $url_forum)
         }
 
         if ($this->config['o_feed_type'] == '1') {
-            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss" title="'.__('RSS forum feed').'" />';
+            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss" title="'.$lang_common['RSS forum feed'].'" />';
         } elseif ($this->config['o_feed_type'] == '2') {
-            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom" title="'.__('Atom forum feed').'" />';
+            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom" title="'.$lang_common['Atom forum feed'].'" />';
         }
 
         return $page_head;
@@ -113,18 +113,20 @@ public function get_page_head($forum_id, $num_pages, $p, $url_forum)
     // Returns forum action
     public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
     {
+        global $lang_forum, $lang_common;
+
         $forum_actions = array();
 
         if (!$this->user->is_guest) {
             if ($subscriptions == 1) {
                 if ($is_subscribed) {
-                    $forum_actions[] = '<span>'.__('Is subscribed').' - </span><a href="'.get_link('unsubscribe/forum/'.$forum_id.'/').'">'.__('Unsubscribe').'</a>';
+                    $forum_actions[] = '<span>'.$lang_forum['Is subscribed'].' - </span><a href="'.get_link('unsubscribe/forum/'.$forum_id.'/').'">'.$lang_forum['Unsubscribe'].'</a>';
                 } else {
-                    $forum_actions[] = '<a href="'.get_link('subscribe/forum/'.$forum_id.'/').'">'.__('Subscribe').'</a>';
+                    $forum_actions[] = '<a href="'.get_link('subscribe/forum/'.$forum_id.'/').'">'.$lang_forum['Subscribe'].'</a>';
                 }
             }
 
-            $forum_actions[] = '<a href="'.get_link('mark-forum-read/'.$forum_id.'/').'">'.__('Mark forum read').'</a>';
+            $forum_actions[] = '<a href="'.get_link('mark-forum-read/'.$forum_id.'/').'">'.$lang_common['Mark forum read'].'</a>';
         }
 
         return $forum_actions;
@@ -133,6 +135,8 @@ public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
     // Returns the elements needed to display topics
     public function print_topics($forum_id, $sort_by, $start_from)
     {
+        global $lang_common, $lang_forum;
+
         // Get topic/forum tracking data
         if (!$this->user->is_guest) {
             $tracked_topics = get_tracked_topics();
@@ -193,7 +197,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 $url_subject = url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_formatted'] = '<a href="'.get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_formatted'] = '<a href="'.get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['last_poster']).'</span>';
                 } else {
                     $cur_topic['last_post_formatted'] = '- - -';
                 }
@@ -204,18 +208,18 @@ public function print_topics($forum_id, $sort_by, $start_from)
 
                 if ($cur_topic['sticky'] == '1') {
                     $cur_topic['item_status'] .= ' isticky';
-                    $status_text[] = '<span class="stickytext">'.__('Sticky').'</span>';
+                    $status_text[] = '<span class="stickytext">'.$lang_forum['Sticky'].'</span>';
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
-                    $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
+                    $status_text[] = '<span class="movedtext">'.$lang_forum['Moved'].'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
-                    $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_topic['poster']).'</span>';
+                    $status_text[] = '<span class="closedtext">'.$lang_forum['Closed'].'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
 
@@ -223,7 +227,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_formatted'] = '<strong>'.$cur_topic['subject_formatted'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.$lang_common['New posts info'].'">'.$lang_common['New posts'].'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
diff --git a/model/viewtopic.php b/model/viewtopic.php
index baa99464..a4dcb441 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -25,6 +25,8 @@ public function __construct()
     // Redirects to a post in particular
     public function redirect_to_post($post_id)
     {
+        global $lang_common;
+
         $select_info_topic = array('topic_id', 'posted');
 
         $result = DB::for_table('posts')
@@ -33,7 +35,7 @@ public function redirect_to_post($post_id)
                       ->find_one();
 
         if (!$result) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         $post['topic_id'] = $result['topic_id'];
@@ -53,7 +55,7 @@ public function redirect_to_post($post_id)
     // Redirects to new posts or last post
     public function handle_actions($topic_id, $action)
     {
-
+        
         // If action=new, we redirect to the first new post (if any)
         if ($action == 'new') {
             if (!$this->user->is_guest) {
@@ -92,7 +94,7 @@ public function handle_actions($topic_id, $action)
     // Gets some info about the topic
     public function get_info_topic($id)
     {
-
+        global $lang_common;
 
         $where_get_info_topic = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -131,7 +133,7 @@ public function get_info_topic($id)
         }
 
         if (!$cur_topic) {
-            message(__('Bad request'), '404');
+            message($lang_common['Bad request'], '404');
         }
 
         return $cur_topic;
@@ -140,17 +142,19 @@ public function get_info_topic($id)
     // Generates the post link
     public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
     {
+        global $lang_topic;
+
         if ($closed == '0') {
             if (($post_replies == '' && $this->user->g_post_replies == '1') || $post_replies == '1' || $is_admmod) {
-                $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a></p>'."\n";
+                $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/reply/'.$topic_id.'/').'">'.$lang_topic['Post reply'].'</a></p>'."\n";
             } else {
                 $post_link = '';
             }
         } else {
-            $post_link = __('Topic closed');
+            $post_link = $lang_topic['Topic closed'];
 
             if ($is_admmod) {
-                $post_link .= ' / <a href="'.get_link('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a>';
+                $post_link .= ' / <a href="'.get_link('post/reply/'.$topic_id.'/').'">'.$lang_topic['Post reply'].'</a>';
             }
 
             $post_link = "\t\t\t".'<p class="postlink conr">'.$post_link.'</p>'."\n";
@@ -162,16 +166,18 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
     // Should we display the quickpost?
     public function is_quickpost($post_replies, $closed, $is_admmod)
     {
-
+        global $lang_common;
 
         $quickpost = false;
         if ($this->config['o_quickpost'] == '1' && ($post_replies == '1' || ($post_replies == '' && $this->user->g_post_replies == '1')) && ($closed == '0' || $is_admmod)) {
+            // Load the post.php language file
+            require FEATHER_ROOT.'lang/'.$this->user->language.'/post.php';
 
-            $required_fields = array('req_message' => __('Message'));
+            $required_fields = array('req_message' => $lang_common['Message']);
             if ($this->user->is_guest) {
-                $required_fields['req_username'] = __('Guest name');
+                $required_fields['req_username'] = $lang_post['Guest name'];
                 if ($this->config['p_force_guest_email'] == '1') {
-                    $required_fields['req_email'] = __('Email');
+                    $required_fields['req_email'] = $lang_common['Email'];
                 }
             }
             $quickpost = true;
@@ -183,12 +189,14 @@ public function is_quickpost($post_replies, $closed, $is_admmod)
     // Subscraction link
     public function get_subscraction($is_subscribed, $topic_id)
     {
+        global $lang_topic;
+
         if (!$this->user->is_guest && $this->config['o_topic_subscriptions'] == '1') {
             if ($is_subscribed) {
                 // I apologize for the variable naming here. It's a mix of subscription and action I guess :-)
-                $subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.__('Is subscribed').' - </span><a href="'.get_link('unsubscribe/topic/'.$topic_id.'/').'">'.__('Unsubscribe').'</a></p>'."\n";
+                $subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.$lang_topic['Is subscribed'].' - </span><a href="'.get_link('unsubscribe/topic/'.$topic_id.'/').'">'.$lang_topic['Unsubscribe'].'</a></p>'."\n";
             } else {
-                $subscraction = "\t\t".'<p class="subscribelink clearb"><a href="'.get_link('subscribe/topic/'.$topic_id.'/').'">'.__('Subscribe').'</a></p>'."\n";
+                $subscraction = "\t\t".'<p class="subscribelink clearb"><a href="'.get_link('subscribe/topic/'.$topic_id.'/').'">'.$lang_topic['Subscribe'].'</a></p>'."\n";
             }
         } else {
             $subscraction = '';
@@ -200,7 +208,7 @@ public function get_subscraction($is_subscribed, $topic_id)
     // Adds relationship meta tags
     public function get_page_head($topic_id, $num_pages, $p, $url_topic)
     {
-
+        global $lang_common;
 
         $page_head = array();
         $page_head['canonical'] = "\t".'<link href="'.get_link('topic/'.$topic_id.'/'.$url_topic.'/').'" rel="canonical" />';
@@ -215,9 +223,9 @@ public function get_page_head($topic_id, $num_pages, $p, $url_topic)
         }
 
         if ($this->config['o_feed_type'] == '1') {
-            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=rss" title="'.__('RSS topic feed').'" />';
+            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=rss" title="'.$lang_common['RSS topic feed'].'" />';
         } elseif ($this->config['o_feed_type'] == '2') {
-            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=atom" title="'.__('Atom topic feed').'" />';
+            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=atom" title="'.$lang_common['Atom topic feed'].'" />';
         }
 
         return $page_head;
@@ -226,7 +234,7 @@ public function get_page_head($topic_id, $num_pages, $p, $url_topic)
     // Prints the posts
     public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
     {
-        global $pd;
+        global $lang_topic, $lang_common, $pd;
 
         $post_data = array();
 
@@ -257,7 +265,9 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
             ->select_many($select_print_posts)
             ->inner_join('users', array('u.id', '=', 'p.poster_id'), 'u')
             ->inner_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
-            ->raw_join('LEFT OUTER JOIN '.$this->feather->prefix.'online', "o.user_id!=1 AND o.idle=0 AND o.user_id=u.id", 'o')
+            ->left_outer_join('online', array('o.user_id', '=', 'u.id'), 'o')
+            ->left_outer_join('online', array('o2.user_id', '!=', 1), 'o2', true)
+            ->left_outer_join('online', array('o.idle', '=', 0), null, true)
             ->where_in('p.id', $post_ids)
             ->order_by('p.id')
             ->find_array();
@@ -286,7 +296,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 }
 
                 // Format the online indicator
-                $cur_post['is_online_formatted'] = ($cur_post['is_online'] == $cur_post['poster_id']) ? '<strong>'.__('Online').'</strong>' : '<span>'.__('Offline').'</span>';
+                $cur_post['is_online_formatted'] = ($cur_post['is_online'] == $cur_post['poster_id']) ? '<strong>'.$lang_topic['Online'].'</strong>' : '<span>'.$lang_topic['Offline'].'</span>';
 
                 if ($this->config['o_avatars'] == '1' && $this->user->show_avatars != '0') {
                     if (isset($avatar_cache[$cur_post['poster_id']])) {
@@ -303,20 +313,20 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                             $cur_post['location'] = censor_words($cur_post['location']);
                         }
 
-                        $cur_post['user_info'][] = '<dd><span>'.__('From').' '.feather_escape($cur_post['location']).'</span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.$lang_topic['From'].' '.feather_escape($cur_post['location']).'</span></dd>';
                     }
 
-                    $cur_post['user_info'][] = '<dd><span>'.__('Registered').' '.format_time($cur_post['registered'], true).'</span></dd>';
+                    $cur_post['user_info'][] = '<dd><span>'.$lang_topic['Registered'].' '.format_time($cur_post['registered'], true).'</span></dd>';
 
                     if ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) {
-                        $cur_post['user_info'][] = '<dd><span>'.__('Posts').' '.forum_number_format($cur_post['num_posts']).'</span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.$lang_topic['Posts'].' '.forum_number_format($cur_post['num_posts']).'</span></dd>';
                     }
 
                     // Now let's deal with the contact links (Email and URL)
                     if ((($cur_post['email_setting'] == '0' && !$this->user->is_guest) || $this->user->is_admmod) && $this->user->g_send_email == '1') {
-                        $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['email']).'">'.__('Email').'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['email']).'">'.$lang_common['Email'].'</a></span>';
                     } elseif ($cur_post['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.get_link('mail/'.$cur_post['poster_id'].'/').'">'.__('Email').'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.get_link('mail/'.$cur_post['poster_id'].'/').'">'.$lang_common['Email'].'</a></span>';
                     }
 
                     if ($cur_post['url'] != '') {
@@ -324,21 +334,21 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                             $cur_post['url'] = censor_words($cur_post['url']);
                         }
 
-                        $cur_post['user_contacts'][] = '<span class="website"><a href="'.feather_escape($cur_post['url']).'" rel="nofollow">'.__('Website').'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="website"><a href="'.feather_escape($cur_post['url']).'" rel="nofollow">'.$lang_topic['Website'].'</a></span>';
                     }
                 }
 
                 if ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && $this->user->g_mod_promote_users == '1')) {
                     if ($cur_post['g_promote_next_group']) {
-                        $cur_post['user_info'][] = '<dd><span><a href="'.get_base_url().'/user/'.$cur_post['poster_id'].'/action/promote/pid/'.$cur_post['id'].'">'.__('Promote user').'</a></span></dd>';
+                        $cur_post['user_info'][] = '<dd><span><a href="'.get_base_url().'/user/'.$cur_post['poster_id'].'/action/promote/pid/'.$cur_post['id'].'">'.$lang_topic['Promote user'].'</a></span></dd>';
                     }
                 }
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="'.get_link('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.get_link('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.$lang_topic['IP address logged'].'</a></span></dd>';
 
                     if ($cur_post['admin_note'] != '') {
-                        $cur_post['user_info'][] = '<dd><span>'.__('Note').' <strong>'.feather_escape($cur_post['admin_note']).'</strong></span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.$lang_topic['Note'].' <strong>'.feather_escape($cur_post['admin_note']).'</strong></span></dd>';
                     }
                 }
             }
@@ -348,41 +358,41 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 $cur_post['user_title_formatted'] = get_title($cur_post);
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="moderate.php?get_host='.$cur_post['id'].'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="moderate.php?get_host='.$cur_post['id'].'" title="'.feather_escape($cur_post['poster_ip']).'">'.$lang_topic['IP address logged'].'</a></span></dd>';
                 }
 
                 if ($this->config['o_show_user_info'] == '1' && $cur_post['poster_email'] != '' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-                    $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['poster_email']).'">'.__('Email').'</a></span>';
+                    $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['poster_email']).'">'.$lang_common['Email'].'</a></span>';
                 }
             }
 
             // Generation post action array (quote, edit, delete etc.)
             if (!$is_admmod) {
                 if (!$this->user->is_guest) {
-                    $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.get_link('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.get_link('report/'.$cur_post['id'].'/').'">'.$lang_topic['Report'].'</a></span></li>';
                 }
 
                 if ($cur_topic['closed'] == '0') {
                     if ($cur_post['poster_id'] == $this->user->id) {
                         if ((($start_from + $post_count) == 1 && $this->user->g_delete_topics == '1') || (($start_from + $post_count) > 1 && $this->user->g_delete_posts == '1')) {
-                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
+                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.$lang_topic['Delete'].'</a></span></li>';
                         }
                         if ($this->user->g_edit_posts == '1') {
-                            $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
+                            $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.$lang_topic['Edit'].'</a></span></li>';
                         }
                     }
 
                     if (($cur_topic['post_replies'] == '' && $this->user->g_post_replies == '1') || $cur_topic['post_replies'] == '1') {
-                        $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
+                        $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.$lang_topic['Quote'].'</a></span></li>';
                     }
                 }
             } else {
-                $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.get_link('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
+                $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.get_link('report/'.$cur_post['id'].'/').'">'.$lang_topic['Report'].'</a></span></li>';
                 if ($this->user->g_id == FEATHER_ADMIN || !in_array($cur_post['poster_id'], $admin_ids)) {
-                    $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
-                    $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('delete/'.$cur_post['id'].'/').'">'.$lang_topic['Delete'].'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.$lang_topic['Edit'].'</a></span></li>';
                 }
-                $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
+                $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.$lang_topic['Quote'].'</a></span></li>';
             }
 
             // Perform the main parsing of the message (BBCode, smilies, censor words etc)
diff --git a/readme.md b/readme.md
index 779bef7f..3773e5a1 100644
--- a/readme.md
+++ b/readme.md
@@ -16,28 +16,17 @@ This is __FeatherBB v1.0.0 Beta__. It is intended for testing purposes only and
 for use in a production environment. Please report all the bugs you may encounter to
 the forums or in the GitHub bug tracker.
 
-### Beta 2 (2015-08-11)
-
-* New DB Layer [[adaur](http://github.com/adaur)]
-* Flash messages [[beaver](http://github.com/beaver-dev)]
-* BBCode editor [[beaver](http://github.com/beaver-dev)]
-* CSRF tokens [[capkokoon](http://github.com/capkokoon)]
-* Cookie encryption improved [[capkokoon](http://github.com/capkokoon)]
-* htaccess management improved [[adaur](http://github.com/adaur)]
-
-### Beta 1  (2015-07-09)
-
-* Integration with Slim Framework v2.6.2 [[adaur](http://github.com/adaur)]
-* New parser [[ridgerunner](http://github.com/ridgerunner)]
-* MVC architecture [[adaur](http://github.com/adaur)]
-* URL rewriting [[adaur](http://github.com/adaur)]
-* Routing system [[adaur](http://github.com/adaur)]
-* Responsive default style [[Magicalex](http://github.com/Magicalex)]
-* Database schema compatible with FluxBB [[adaur](http://github.com/adaur)]
-* Antispam protection [[adaur](http://github.com/adaur)]
-* Themes fully customizables [[adaur](http://github.com/adaur)]
-* PHP 4 support dropped [[adaur](http://github.com/adaur)]
-* PSR-2 compliant [[Magicalex](http://github.com/magicalex)]
+* Integration with Slim Framework v2.6.2
+* New parser
+* MVC architecture
+* URL rewriting
+* Routing system
+* Responsive default style
+* Database schema compatible with FluxBB
+* Antispam protection
+* Themes fully customizables
+* PHP 4 support dropped
+* PSR-2 compliant
 
 ## Requirements
 
@@ -47,7 +36,7 @@ the forums or in the GitHub bug tracker.
 
 ## Recommendations
 
-* Make use of a PHP accelerator such as OPCache
+* Make use of a PHP accelerator such as APC or XCache
 * Make sure PHP has the zlib module installed to allow FeatherBB to gzip output
 
 ## Links
@@ -57,10 +46,3 @@ the forums or in the GitHub bug tracker.
 * Community: http://featherbb.org/forums/
 * Chat: https://gitter.im/featherbb/featherbb
 * Development: http://github.com/featherbb/featherbb
-
-## Contributors
-
-* [[adaur](http://github.com/adaur)] Project leader
-* [[capkokoon](http://github.com/capkokoon)] contributor
-* [[beaver](http://github.com/beaver-dev)] contributor
-* [[Magicalex](http://github.com/magicalex)] contributor
diff --git a/style/FeatherBB/view/admin/groups/add_edit_group.php b/style/FeatherBB/view/admin/groups/add_edit_group.php
index 3bd8018c..8c4ddb91 100644
--- a/style/FeatherBB/view/admin/groups/add_edit_group.php
+++ b/style/FeatherBB/view/admin/groups/add_edit_group.php
@@ -40,7 +40,7 @@
 									<th scope="row"><?php echo $lang_admin_groups['User title label'] ?></th>
 									<td>
 										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
-										<span><?php printf($lang_admin_groups['User title help'], ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
+										<span><?php printf($lang_admin_groups['User title help'], ($group['info']['g_id'] != FEATHER_GUEST ? $lang_common['Member'] : $lang_common['Guest'])) ?></span>
 									</td>
 								</tr>
 <?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
diff --git a/style/FeatherBB/view/delete.php b/style/FeatherBB/view/delete.php
index 65f2440b..9d6afff9 100644
--- a/style/FeatherBB/view/delete.php
+++ b/style/FeatherBB/view/delete.php
@@ -16,26 +16,26 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="index.php"><?php echo __('Index') ?></a></li>
+			<li><a href="index.php"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Delete post') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo $lang_delete['Delete post'] ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div class="blockform">
-	<h2><span><?php echo __('Delete post') ?></span></h2>
+	<h2><span><?php echo $lang_delete['Delete post'] ?></span></h2>
 	<div class="box">
 		<form method="post" action="<?php echo get_link('delete/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
-					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php echo __('Delete info') ?></p>
+					<h3><span><?php printf($is_topic_post ? $lang_delete['Topic by'] : $lang_delete['Reply by'], '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
+					<p><?php echo($is_topic_post) ? '<strong>'.$lang_delete['Topic warning'].'</strong>' : '<strong>'.$lang_delete['Warning'].'</strong>' ?><br /><?php echo $lang_delete['Delete info'] ?></p>
 				</div>
 			</div>
-			<p class="buttons"><input type="submit" name="delete" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete" value="<?php echo $lang_delete['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/edit.php b/style/FeatherBB/view/edit.php
index 92ed1fe1..3d91e362 100644
--- a/style/FeatherBB/view/edit.php
+++ b/style/FeatherBB/view/edit.php
@@ -19,10 +19,10 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Edit post') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo $lang_post['Edit post'] ?></strong></li>
 		</ul>
 	</div>
 </div>
@@ -33,10 +33,10 @@
 if (!empty($errors)) :
 ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo __('Post errors') ?></span></h2>
+	<h2><span><?php echo $lang_post['Post errors'] ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo __('Post errors info') ?></p>
+			<p><?php echo $lang_post['Post errors info'] ?></p>
 			<ul class="error-list">
 <?php
     foreach ($errors as $cur_error) {
@@ -51,7 +51,7 @@
 elseif ($feather->request->post('preview')):
 ?>
 <div id="postpreview" class="blockpost">
-	<h2><span><?php echo __('Post preview') ?></span></h2>
+	<h2><span><?php echo $lang_post['Post preview'] ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -68,32 +68,31 @@
 endif;
 ?>
 <!-- Init BBcode editor toolbar -->
-<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
 </script>
 <script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
 <div id="editform" class="blockform">
-	<h2><span><?php echo __('Edit post') ?></span></h2>
+	<h2><span><?php echo $lang_post['Edit post'] ?></span></h2>
 	<div class="box">
 		<form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Edit post legend') ?></legend>
+					<legend><?php echo $lang_post['Edit post legend'] ?></legend>
 					<input type="hidden" name="form_sent" value="1" />
 					<div class="infldset txtarea">
-<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo $lang_common['Subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="help.php#img" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="help.php#smilies" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -103,7 +102,7 @@
 ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Options') ?></legend>
+					<legend><?php echo $lang_common['Options'] ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
@@ -114,7 +113,7 @@
 <?php
 endif;
 ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
index 0b1d2ae7..6249ae34 100644
--- a/style/FeatherBB/view/footer.php
+++ b/style/FeatherBB/view/footer.php
@@ -11,7 +11,7 @@
 </div>
 
 <div id="brdfooter" class="block">
-	<h2><span><?php echo __('Board footer') ?></span></h2>
+	<h2><span><?php echo $lang_common['Board footer'] ?></span></h2>
 	<div class="box">
 <?php
 
@@ -20,8 +20,8 @@
 
     if ($footer_style == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.$lang_forum['Mod controls'].'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.$lang_common['Moderate forum'].'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($footer_style == 'viewtopic') {
         if (isset($pid)) {
@@ -34,22 +34,22 @@
 
 
         echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.$lang_topic['Mod controls'].'</strong></dt>'."\n";
         // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.$lang_common['Moderate topic'].'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.$lang_common['All'].'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.$lang_common['Moderate topic'].'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.$lang_common['Move topic'].'</a></span></dd>'."\n";
 
         if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.$lang_common['Open topic'].'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.$lang_common['Close topic'].'</a></span></dd>'."\n";
         }
 
         if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.$lang_common['Unstick topic'].'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.$lang_common['Stick topic'].'</a></span></dd>'."\n";
         }
 
         echo "\t\t\t".'</dl>'."\n";
@@ -89,26 +89,26 @@
 
 if ($footer_style == 'index') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.$lang_common['RSS active topics feed'].'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.$lang_common['Atom active topics feed'].'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewforum') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.$lang_common['RSS forum feed'].'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.$lang_common['Atom forum feed'].'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewtopic') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.$lang_common['RSS topic feed'].'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.$lang_common['Atom topic feed'].'</a></span></p>'."\n";
     }
 }
 
 ?>
-				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
+				<p id="poweredby"><?php printf($lang_common['Powered by'], '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
 			</div>
 			<div class="clearer"></div>
 		</div>
@@ -122,13 +122,13 @@
 
     // Calculate script generation time
     $time_diff = sprintf('%.3f', get_microtime() - $feather_start);
-    echo sprintf(__('Querytime'), $time_diff, count(\DB::get_query_log()[0]));
+    echo sprintf($lang_common['Querytime'], $time_diff, count(\DB::get_query_log()[0]));
 
     if (function_exists('memory_get_usage')) {
-        echo ' - '.sprintf(__('Memory usage'), file_size(memory_get_usage()));
+        echo ' - '.sprintf($lang_common['Memory usage'], file_size(memory_get_usage()));
 
         if (function_exists('memory_get_peak_usage')) {
-            echo ' '.sprintf(__('Peak usage'), file_size(memory_get_peak_usage()));
+            echo ' '.sprintf($lang_common['Peak usage'], file_size(memory_get_peak_usage()));
         }
     }
 
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
index 7b2b8d28..ec4c4b49 100644
--- a/style/FeatherBB/view/header.php
+++ b/style/FeatherBB/view/header.php
@@ -9,7 +9,7 @@
 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo __('lang_identifier') ?>" lang="<?php echo __('lang_identifier') ?>" dir="<?php echo __('lang_direction') ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang_common['lang_identifier'] ?>" lang="<?php echo $lang_common['lang_identifier'] ?>" dir="<?php echo $lang_common['lang_direction'] ?>">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -57,7 +57,7 @@ function process_form(the_form)
                         var elem = the_form.elements[i];
                         if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
                         {
-                            alert('"' + required_fields[elem.name] + '" <?php echo __('required field') ?>');
+                            alert('"' + required_fields[elem.name] + '" <?php echo $lang_common['required field'] ?>');
                             elem.focus();
                             return false;
                         }
@@ -89,7 +89,7 @@ function process_form(the_form)
                 <div class="navbar-right">
                     <form method="get" action="search" class="nav-search">
                         <input type="hidden" name="action" value="search">
-                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php echo __('Search') ?>">
+                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php echo $lang_common['Search'] ?>">
                     </form>
                 </div>
             </div>
@@ -111,7 +111,7 @@ function process_form(the_form)
         </div>
         <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
             <div id="announce" class="block">
-                <div class="hd"><h2><span><?php echo __('Announcement') ?></span></h2></div>
+                <div class="hd"><h2><span><?php echo $lang_common['Announcement'] ?></span></h2></div>
                 <div class="box">
                     <div id="announce-block" class="inbox">
                         <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
@@ -122,7 +122,7 @@ function process_form(the_form)
         <?php if (isset($flash['message'])) : ?>
             <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
             <div id="msgflash" class="block">
-                <h2><span><?php echo __('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
+                <h2><span><?php echo $lang_common['Info'] ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
                 <div class="box">
                     <div class="inbox">
                         <p><?php echo feather_escape($flash['message']) ?></p>
diff --git a/style/FeatherBB/view/help.php b/style/FeatherBB/view/help.php
index a7f9300d..fd511285 100644
--- a/style/FeatherBB/view/help.php
+++ b/style/FeatherBB/view/help.php
@@ -14,113 +14,113 @@
 
 ?>
 
-<h2><span><?php echo __('BBCode') ?></span></h2>
+<h2><span><?php echo $lang_help['BBCode'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="bbcode"></a><?php echo __('BBCode info 1') ?></p>
-		<p><?php echo __('BBCode info 2') ?></p>
+		<p><a name="bbcode"></a><?php echo $lang_help['BBCode info 1'] ?></p>
+		<p><?php echo $lang_help['BBCode info 2'] ?></p>
 	</div>
 </div>
-<h2><span><?php echo __('Text style') ?></span></h2>
+<h2><span><?php echo $lang_help['Text style'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Text style info') ?></p>
-		<p><code>[b]<?php echo __('Bold text') ?>[/b]</code> <?php echo __('produces') ?> <samp><strong><?php echo __('Bold text') ?></strong></samp></p>
-		<p><code>[u]<?php echo __('Underlined text') ?>[/u]</code> <?php echo __('produces') ?> <samp><span class="bbu"><?php echo __('Underlined text') ?></span></samp></p>
-		<p><code>[i]<?php echo __('Italic text') ?>[/i]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Italic text') ?></em></samp></p>
-		<p><code>[s]<?php echo __('Strike-through text') ?>[/s]</code> <?php echo __('produces') ?> <samp><span class="bbs"><?php echo __('Strike-through text') ?></span></samp></p>
-		<p><code>[del]<?php echo __('Deleted text') ?>[/del]</code> <?php echo __('produces') ?> <samp><del><?php echo __('Deleted text') ?></del></samp></p>
-		<p><code>[ins]<?php echo __('Inserted text') ?>[/ins]</code> <?php echo __('produces') ?> <samp><ins><?php echo __('Inserted text') ?></ins></samp></p>
-		<p><code>[em]<?php echo __('Emphasised text') ?>[/em]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Emphasised text') ?></em></samp></p>
-		<p><code>[color=#FF0000]<?php echo __('Red text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: #ff0000"><?php echo __('Red text') ?></span></samp></p>
-		<p><code>[color=blue]<?php echo __('Blue text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: blue"><?php echo __('Blue text') ?></span></samp></p>
-		<p><code>[h]<?php echo __('Heading text') ?>[/h]</code> <?php echo __('produces') ?></p> <div class="postmsg"><h5><?php echo __('Heading text') ?></h5></div>
+		<p><?php echo $lang_help['Text style info'] ?></p>
+		<p><code>[b]<?php echo $lang_help['Bold text'] ?>[/b]</code> <?php echo $lang_help['produces'] ?> <samp><strong><?php echo $lang_help['Bold text'] ?></strong></samp></p>
+		<p><code>[u]<?php echo $lang_help['Underlined text'] ?>[/u]</code> <?php echo $lang_help['produces'] ?> <samp><span class="bbu"><?php echo $lang_help['Underlined text'] ?></span></samp></p>
+		<p><code>[i]<?php echo $lang_help['Italic text'] ?>[/i]</code> <?php echo $lang_help['produces'] ?> <samp><em><?php echo $lang_help['Italic text'] ?></em></samp></p>
+		<p><code>[s]<?php echo $lang_help['Strike-through text'] ?>[/s]</code> <?php echo $lang_help['produces'] ?> <samp><span class="bbs"><?php echo $lang_help['Strike-through text'] ?></span></samp></p>
+		<p><code>[del]<?php echo $lang_help['Deleted text'] ?>[/del]</code> <?php echo $lang_help['produces'] ?> <samp><del><?php echo $lang_help['Deleted text'] ?></del></samp></p>
+		<p><code>[ins]<?php echo $lang_help['Inserted text'] ?>[/ins]</code> <?php echo $lang_help['produces'] ?> <samp><ins><?php echo $lang_help['Inserted text'] ?></ins></samp></p>
+		<p><code>[em]<?php echo $lang_help['Emphasised text'] ?>[/em]</code> <?php echo $lang_help['produces'] ?> <samp><em><?php echo $lang_help['Emphasised text'] ?></em></samp></p>
+		<p><code>[color=#FF0000]<?php echo $lang_help['Red text'] ?>[/color]</code> <?php echo $lang_help['produces'] ?> <samp><span style="color: #ff0000"><?php echo $lang_help['Red text'] ?></span></samp></p>
+		<p><code>[color=blue]<?php echo $lang_help['Blue text'] ?>[/color]</code> <?php echo $lang_help['produces'] ?> <samp><span style="color: blue"><?php echo $lang_help['Blue text'] ?></span></samp></p>
+		<p><code>[h]<?php echo $lang_help['Heading text'] ?>[/h]</code> <?php echo $lang_help['produces'] ?></p> <div class="postmsg"><h5><?php echo $lang_help['Heading text'] ?></h5></div>
 	</div>
 </div>
-<h2><span><?php echo __('Links and images') ?></span></h2>
+<h2><span><?php echo $lang_help['Links and images'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php echo __('This help page') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php echo __('This help page') ?></a></samp></p>
-		<p><code>[email]myname@example.com[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
-		<p><code>[email=myname@example.com]<?php echo __('My email address') ?>[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com"><?php echo __('My email address') ?></a></samp></p>
-		<p><code>[topic=1]<?php echo __('Test topic') ?>[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test topic') ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php echo __('Test post') ?>[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo __('Test post') ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php echo __('Test forum') ?>[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test forum') ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php echo __('Test user') ?>[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo __('Test user') ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
+		<p><?php echo $lang_help['Links info'] ?></p>
+		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
+		<p><code>[url=/help/]<?php echo $lang_help['This help page'] ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('/help') ?>"><?php echo $lang_help['This help page'] ?></a></samp></p>
+		<p><code>[email]myname@example.com[/email]</code> <?php echo $lang_help['produces'] ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
+		<p><code>[email=myname@example.com]<?php echo $lang_help['My email address'] ?>[/email]</code> <?php echo $lang_help['produces'] ?> <samp><a href="mailto:myname@example.com"><?php echo $lang_help['My email address'] ?></a></samp></p>
+		<p><code>[topic=1]<?php echo $lang_help['Test topic'] ?>[/topic]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo $lang_help['Test topic'] ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php echo $lang_help['Test post'] ?>[/post]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo $lang_help['Test post'] ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php echo $lang_help['Test forum'] ?>[/forum]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo $lang_help['Test forum'] ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php echo $lang_help['Test user'] ?>[/user]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo $lang_help['Test user'] ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
 	</div>
 	<div class="inbox">
-		<p><a name="img"></a><?php echo __('Images info') ?></p>
-		<p><code>[img=<?php echo __('FluxBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php echo __('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php echo __('FluxBB bbcode test') ?>" /></samp></p>
+		<p><a name="img"></a><?php echo $lang_help['Images info'] ?></p>
+		<p><code>[img=<?php echo $lang_help['FluxBB bbcode test'] ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php echo $lang_help['produces'] ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php echo $lang_help['FluxBB bbcode test'] ?>" /></samp></p>
 	</div>
 </div>
-<h2><span><?php echo __('Quotes') ?></span></h2>
+<h2><span><?php echo $lang_help['Quotes'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Quotes info') ?></p>
-		<p><code>[quote=James]<?php echo __('Quote text') ?>[/quote]</code></p>
-		<p><?php echo __('produces quote box') ?></p>
+		<p><?php echo $lang_help['Quotes info'] ?></p>
+		<p><code>[quote=James]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
+		<p><?php echo $lang_help['produces quote box'] ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><cite>James <?php echo __('wrote') ?></cite><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
+			<div class="quotebox"><cite>James <?php echo $lang_common['wrote'] ?></cite><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo __('Quotes info 2') ?></p>
-		<p><code>[quote]<?php echo __('Quote text') ?>[/quote]</code></p>
-		<p><?php echo __('produces quote box') ?></p>
+		<p><?php echo $lang_help['Quotes info 2'] ?></p>
+		<p><code>[quote]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
+		<p><?php echo $lang_help['produces quote box'] ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
+			<div class="quotebox"><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo __('quote note') ?></p>
+		<p><?php echo $lang_help['quote note'] ?></p>
 	</div>
 </div>
-<h2><span><?php echo __('Code') ?></span></h2>
+<h2><span><?php echo $lang_help['Code'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Code info') ?></p>
-		<p><code>[code]<?php echo __('Code text') ?>[/code]</code></p>
-		<p><?php echo __('produces code box') ?></p>
+		<p><?php echo $lang_help['Code info'] ?></p>
+		<p><code>[code]<?php echo $lang_help['Code text'] ?>[/code]</code></p>
+		<p><?php echo $lang_help['produces code box'] ?></p>
 		<div class="postmsg">
-			<div class="codebox"><pre><code><?php echo __('Code text') ?></code></pre></div>
+			<div class="codebox"><pre><code><?php echo $lang_help['Code text'] ?></code></pre></div>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo __('Lists') ?></span></h2>
+<h2><span><?php echo $lang_help['Lists'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="lists"></a><?php echo __('List info') ?></p>
-		<p><code>[list][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php echo __('produces list') ?></span></p>
+		<p><a name="lists"></a><?php echo $lang_help['List info'] ?></p>
+		<p><code>[list][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
+		<br /><span><?php echo $lang_help['produces list'] ?></span></p>
 		<div class="postmsg">
-			<ul><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ul>
+			<ul><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ul>
 		</div>
-		<p><code>[list=1][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php echo __('produces decimal list') ?></span></p>
+		<p><code>[list=1][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
+		<br /><span><?php echo $lang_help['produces decimal list'] ?></span></p>
 		<div class="postmsg">
-			<ol class="decimal"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
+			<ol class="decimal"><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ol>
 		</div>
-		<p><code>[list=a][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php echo __('produces alpha list') ?></span></p>
+		<p><code>[list=a][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
+		<br /><span><?php echo $lang_help['produces alpha list'] ?></span></p>
 		<div class="postmsg">
-			<ol class="alpha"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
+			<ol class="alpha"><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ol>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo __('Nested tags') ?></span></h2>
+<h2><span><?php echo $lang_help['Nested tags'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Nested tags info') ?></p>
-		<p><code>[b][u]<?php echo __('Bold, underlined text') ?>[/u][/b]</code> <?php echo __('produces') ?> <samp><strong><span class="bbu"><?php echo __('Bold, underlined text') ?></span></strong></samp></p>
+		<p><?php echo $lang_help['Nested tags info'] ?></p>
+		<p><code>[b][u]<?php echo $lang_help['Bold, underlined text'] ?>[/u][/b]</code> <?php echo $lang_help['produces'] ?> <samp><strong><span class="bbu"><?php echo $lang_help['Bold, underlined text'] ?></span></strong></samp></p>
 	</div>
 </div>
-<h2><span><?php echo __('Smilies') ?></span></h2>
+<h2><span><?php echo $lang_help['Smilies'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="smilies"></a><?php echo __('Smilies info') ?></p>
+		<p><a name="smilies"></a><?php echo $lang_help['Smilies info'] ?></p>
 <?php
 
 // Display the smiley set
@@ -133,7 +133,7 @@
 }
 
 foreach ($smiley_groups as $smiley_img => $smiley_texts) {
-    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
+    echo "\t\t<p><code>". implode('</code> ' .$lang_common['and']. ' <code>', $smiley_texts).'</code> <span>' .$lang_help['produces']. '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
 }
 
 ?>
diff --git a/style/FeatherBB/view/index.php b/style/FeatherBB/view/index.php
index d9d5ca64..1ffce864 100644
--- a/style/FeatherBB/view/index.php
+++ b/style/FeatherBB/view/index.php
@@ -13,7 +13,7 @@
 }
 
 if (empty($index_data)): ?>
-    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php echo __('Empty board') ?></p></div></div></div>
+    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php echo $lang_index['Empty board'] ?></p></div></div></div>
 <?php endif;
 foreach ($index_data as $forum) {
     if ($forum->cid != $cur_cat) :
@@ -33,10 +33,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Forum') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Topics') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
+					<th class="tcl" scope="col"><?php echo $lang_common['Forum'] ?></th>
+					<th class="tc2" scope="col"><?php echo $lang_index['Topics'] ?></th>
+					<th class="tc3" scope="col"><?php echo $lang_common['Posts'] ?></th>
+					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -80,27 +80,27 @@
 endif;
 ?>
 <div id="brdstats" class="block">
-	<h2><span><?php echo __('Board info') ?></span></h2>
+	<h2><span><?php echo $lang_index['Board info'] ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<dl class="conr">
-				<dt><strong><?php echo __('Board stats') ?></strong></dt>
-				<dd><span><?php printf(__('No of users'), '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of topics'), '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of posts'), '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
+				<dt><strong><?php echo $lang_index['Board stats'] ?></strong></dt>
+				<dd><span><?php printf($lang_index['No of users'], '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf($lang_index['No of topics'], '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
+				<dd><span><?php printf($lang_index['No of posts'], '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
 			</dl>
 			<dl class="conl">
-				<dt><strong><?php echo __('User info') ?></strong></dt>
-				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
+				<dt><strong><?php echo $lang_index['User info'] ?></strong></dt>
+				<dd><span><?php printf($lang_index['Newest user'], $stats['newest_user']) ?></span></dd>
 				<?php if ($feather_config['o_users_online'] == 1) : ?>
-				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('Guests online'), '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
+				<dd><span><?php printf($lang_index['Users online'], '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf($lang_index['Guests online'], '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
 				<?php endif; ?>
 			</dl>
 			<?php
             if ($feather_config['o_users_online'] == 1) :
                 if ($online['num_users'] > 0) {
-                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
+                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.$lang_index['Online'].' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
                 } else {
                     echo "\t\t\t".'<div class="clearer"></div>'."\n";
                 }
diff --git a/style/FeatherBB/view/login/form.php b/style/FeatherBB/view/login/form.php
index fb8f2404..8d35d8b7 100644
--- a/style/FeatherBB/view/login/form.php
+++ b/style/FeatherBB/view/login/form.php
@@ -14,29 +14,29 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Login') ?></span></h2>
+	<h2><span><?php echo $lang_common['Login'] ?></span></h2>
 	<div class="box">
 		<form id="login" method="post" action="<?php echo get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Login legend') ?></legend>
+					<legend><?php echo $lang_login['Login legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="conl required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
-						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
+						<label class="conl required"><strong><?php echo $lang_common['Username'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
+						<label class="conl required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
 
 						<div class="rbox clearb">
-							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo __('Remember me') ?><br /></label>
+							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo $lang_login['Remember me'] ?><br /></label>
 						</div>
 
-						<p class="clearb"><?php echo __('Login info') ?></p>
-						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php echo __('Not registered') ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php echo __('Forgotten pass') ?></a></span></p>
+						<p class="clearb"><?php echo $lang_login['Login info'] ?></p>
+						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php echo $lang_login['Not registered'] ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php echo $lang_login['Forgotten pass'] ?></a></span></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="login" value="<?php echo __('Login') ?>" tabindex="4" /></p>
+			<p class="buttons"><input type="submit" name="login" value="<?php echo $lang_common['Login'] ?>" tabindex="4" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/login/password_forgotten.php b/style/FeatherBB/view/login/password_forgotten.php
index 979b915c..2712f630 100644
--- a/style/FeatherBB/view/login/password_forgotten.php
+++ b/style/FeatherBB/view/login/password_forgotten.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo __('New password errors') ?></span></h2>
+	<h2><span><?php echo $lang_login['New password errors'] ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo __('New passworderrors info') ?></p>
+			<p><?php echo $lang_login['New passworderrors info'] ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,21 +37,21 @@
 }
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Request pass') ?></span></h2>
+	<h2><span><?php echo $lang_login['Request pass'] ?></span></h2>
 	<div class="box">
 		<form id="request_pass" method="post" action="<?php echo get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Request pass legend') ?></legend>
+					<legend><?php echo $lang_login['Request pass legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
-						<p><?php echo __('Request pass info') ?></p>
+						<label class="required"><strong><?php echo $lang_common['Email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
+						<p><?php echo $lang_login['Request pass info'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="request_pass" value="<?php echo __('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a><?php endif; ?></p>
+			<p class="buttons"><input type="submit" name="request_pass" value="<?php echo $lang_common['Submit'] ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a><?php endif; ?></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/message.php b/style/FeatherBB/view/message.php
index d376bd09..7f26edad 100644
--- a/style/FeatherBB/view/message.php
+++ b/style/FeatherBB/view/message.php
@@ -14,11 +14,11 @@
 
 ?>
 <div id="msg" class="block">
-	<h2><span><?php echo __('Info') ?></span></h2>
+	<h2><span><?php echo $lang_common['Info'] ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<p><?php echo $message ?></p>
-<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php echo __('Go back') ?></a></p>
+<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 <?php endif;
     ?>		</div>
 	</div>
diff --git a/style/FeatherBB/view/misc/email.php b/style/FeatherBB/view/misc/email.php
index 7004040d..054c7f34 100644
--- a/style/FeatherBB/view/misc/email.php
+++ b/style/FeatherBB/view/misc/email.php
@@ -14,24 +14,24 @@
 
 ?>
 <div id="emailform" class="blockform">
-	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
+	<h2><span><?php echo $lang_misc['Send email to'] ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="<?php echo get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write email') ?></legend>
+					<legend><?php echo $lang_misc['Write email'] ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo __('Email disclosure note') ?></p>
+						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/misc/report.php b/style/FeatherBB/view/misc/report.php
index 121feac2..6cf01c90 100644
--- a/style/FeatherBB/view/misc/report.php
+++ b/style/FeatherBB/view/misc/report.php
@@ -16,29 +16,29 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Report post') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo $lang_misc['Report post'] ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div id="reportform" class="blockform">
-	<h2><span><?php echo __('Report post') ?></span></h2>
+	<h2><span><?php echo $lang_misc['Report post'] ?></span></h2>
 	<div class="box">
 		<form id="report" method="post" action="<?php echo get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Reason desc') ?></legend>
+					<legend><?php echo $lang_misc['Reason desc'] ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('Reason') ?> <span><?php echo __('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
+						<label class="required"><strong><?php echo $lang_misc['Reason'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/misc/rules.php b/style/FeatherBB/view/misc/rules.php
index d32a805e..00cff256 100644
--- a/style/FeatherBB/view/misc/rules.php
+++ b/style/FeatherBB/view/misc/rules.php
@@ -14,7 +14,7 @@
 
 ?>
 <div id="rules" class="block">
-	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
+	<div class="hd"><h2><span><?php echo $lang_register['Forum rules'] ?></span></h2></div>
 	<div class="box">
 		<div id="rules-block" class="inbox">
 			<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
diff --git a/style/FeatherBB/view/moderate/delete_posts.php b/style/FeatherBB/view/moderate/delete_posts.php
index 4b95a5f1..d3a8ea76 100644
--- a/style/FeatherBB/view/moderate/delete_posts.php
+++ b/style/FeatherBB/view/moderate/delete_posts.php
@@ -14,20 +14,20 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Delete posts') ?></span></h2>
+	<h2><span><?php echo $lang_misc['Delete posts'] ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm delete legend') ?></legend>
+					<legend><?php echo $lang_misc['Confirm delete legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<p><?php echo __('Delete posts comply') ?></p>
+						<p><?php echo $lang_misc['Delete posts comply'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/delete_topics.php b/style/FeatherBB/view/moderate/delete_topics.php
index e414f734..d18c7394 100644
--- a/style/FeatherBB/view/moderate/delete_topics.php
+++ b/style/FeatherBB/view/moderate/delete_topics.php
@@ -15,20 +15,20 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('Delete topics') ?></span></h2>
+	<h2><span><?php echo $lang_misc['Delete topics'] ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm delete legend') ?></legend>
+					<legend><?php echo $lang_misc['Confirm delete legend'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Delete topics comply') ?></p>
+						<p><?php echo $lang_misc['Delete topics comply'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/merge_topics.php b/style/FeatherBB/view/moderate/merge_topics.php
index b55f586b..1c5cc5a4 100644
--- a/style/FeatherBB/view/moderate/merge_topics.php
+++ b/style/FeatherBB/view/moderate/merge_topics.php
@@ -15,22 +15,22 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('Merge topics') ?></span></h2>
+	<h2><span><?php echo $lang_misc['Merge topics'] ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm merge legend') ?></legend>
+					<legend><?php echo $lang_misc['Confirm merge legend'] ?></legend>
 					<div class="infldset">
 						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1" /><?php echo __('Leave redirect') ?><br /></label>
+							<label><input type="checkbox" name="with_redirect" value="1" /><?php echo $lang_misc['Leave redirect'] ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo __('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo $lang_misc['Merge'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/moderator_forum.php b/style/FeatherBB/view/moderate/moderator_forum.php
index bf893ce4..af90498d 100644
--- a/style/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/FeatherBB/view/moderate/moderator_forum.php
@@ -17,9 +17,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -38,11 +38,11 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
-<?php endif; ?>					<th class="tcr"><?php echo __('Last post') ?></th>
-					<th class="tcmod" scope="col"><?php echo __('Select') ?></th>
+					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
+					<th class="tc2" scope="col"><?php echo $lang_common['Replies'] ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
+<?php endif; ?>					<th class="tcr"><?php echo $lang_common['Last post'] ?></th>
+					<th class="tcmod" scope="col"><?php echo $lang_misc['Select'] ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -74,7 +74,7 @@
             if (empty($topic_data)):
                 $colspan = ($feather_config['o_topic_views'] == '1') ? 5 : 4;
                 $button_status = ' disabled="disabled"';
-                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
+                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.$lang_forum['Empty forum'].'</td></tr>'."\n";
             endif;
             ?>
 			</tbody>
@@ -87,13 +87,13 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php echo __('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php echo __('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php echo __('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php echo __('Close') ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php echo $lang_misc['Move'] ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php echo $lang_misc['Delete'] ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php echo $lang_misc['Merge'] ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php echo $lang_misc['Open'] ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php echo $lang_misc['Close'] ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/style/FeatherBB/view/moderate/move_topics.php b/style/FeatherBB/view/moderate/move_topics.php
index 389f1f05..8dfedeaf 100644
--- a/style/FeatherBB/view/moderate/move_topics.php
+++ b/style/FeatherBB/view/moderate/move_topics.php
@@ -15,16 +15,16 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo($action == 'single') ? __('Move topic') : __('Move topics') ?></span></h2>
+	<h2><span><?php echo($action == 'single') ? $lang_misc['Move topic'] : $lang_misc['Move topics'] ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 			<input type="hidden" name="topics" value="<?php echo $topics ?>" />
 				<fieldset>
-					<legend><?php echo __('Move legend') ?></legend>
+					<legend><?php echo $lang_misc['Move legend'] ?></legend>
 					<div class="infldset">
-						<label><?php echo __('Move to') ?>
+						<label><?php echo $lang_misc['Move to'] ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
@@ -33,12 +33,12 @@
 						<div class="rbox">
 							<label><input type="checkbox" name="with_redirect" value="1"<?php if ($action == 'single') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Leave redirect') ?><br /></label>
+} ?> /><?php echo $lang_misc['Leave redirect'] ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo __('Move') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo $lang_misc['Move'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/posts_view.php b/style/FeatherBB/view/moderate/posts_view.php
index f957ce8f..87d23e24 100644
--- a/style/FeatherBB/view/moderate/posts_view.php
+++ b/style/FeatherBB/view/moderate/posts_view.php
@@ -16,10 +16,10 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -53,11 +53,11 @@
 						</dl>
 					</div>
 					<div class="postright">
-						<h3 class="nosize"><?php echo __('Message') ?></h3>
+						<h3 class="nosize"><?php echo $lang_common['Message'] ?></h3>
 						<div class="postmsg">
 							<?php echo $post['message']."\n" ?>
 	<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.$lang_topic['Last edit'].' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 						</div>
@@ -66,7 +66,7 @@
 			</div>
 			<div class="inbox">
 				<div class="postfoot clearb">
-					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.__('Select').'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.__('Cannot select first').'</p>' ?></div>
+					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.$lang_misc['Select'].'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.$lang_misc['Cannot select first'].'</p>' ?></div>
 				</div>
 			</div>
 		</div>
@@ -80,14 +80,14 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php echo __('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php echo $lang_misc['Split'] ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php echo $lang_misc['Delete'] ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/style/FeatherBB/view/moderate/split_posts.php b/style/FeatherBB/view/moderate/split_posts.php
index ac012ff3..f3f5d88e 100644
--- a/style/FeatherBB/view/moderate/split_posts.php
+++ b/style/FeatherBB/view/moderate/split_posts.php
@@ -14,27 +14,27 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Split posts') ?></span></h2>
+	<h2><span><?php echo $lang_misc['Split posts'] ?></span></h2>
 	<div class="box">
 		<form id="subject" method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm split legend') ?></legend>
+					<legend><?php echo $lang_misc['Confirm split legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<label class="required"><strong><?php echo __('New subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
-						<label><?php echo __('Move to') ?>
+						<label class="required"><strong><?php echo $lang_misc['New subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
+						<label><?php echo $lang_misc['Move to'] ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
 						</select>
 						<br /></label>
-						<p><?php echo __('Split posts comply') ?></p>
+						<p><?php echo $lang_misc['Split posts comply'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo __('Split') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo $lang_misc['Split'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/post.php b/style/FeatherBB/view/post.php
index 0c341fd0..7bdfc449 100644
--- a/style/FeatherBB/view/post.php
+++ b/style/FeatherBB/view/post.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
@@ -33,10 +33,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo __('Post errors') ?></span></h2>
+	<h2><span><?php echo $lang_post['Post errors'] ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo __('Post errors info') ?></p>
+			<p><?php echo $lang_post['Post errors info'] ?></p>
 			<ul class="error-list">
 <?php
 
@@ -57,7 +57,7 @@
 
     ?>
 <div id="postpreview" class="blockpost">
-	<h2><span><?php echo __('Post preview') ?></span></h2>
+	<h2><span><?php echo $lang_post['Post preview'] ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -80,7 +80,6 @@
 
 ?>
 <!-- Init BBcode editor toolbar -->
-<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
@@ -93,16 +92,16 @@
 		<?php echo $form."\n" ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write message legend') ?></legend>
+					<legend><?php echo $lang_common['Write message legend'] ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
                                                 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if ($feather->user->is_guest) {
-    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong>' : $lang_common['Email'];
     $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
-						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
+						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
     echo feather_escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
@@ -115,17 +114,17 @@
 
 }
 if ($fid): ?>
-						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
+						<label class="required"><strong><?php echo $lang_common['Subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
     echo feather_escape($post['subject']);
 } ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -135,7 +134,7 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Options') ?></legend>
+					<legend><?php echo $lang_common['Options'] ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
@@ -151,14 +150,14 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Robot title') ?></legend>
+					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Robot info')    ?></p>
+						<p><?php echo $lang_antispam['Robot info']    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
                              $qencoded = md5($question[$index_questions]);
-                             echo sprintf(__('Robot question'), $question[$index_questions]);?>
-							 <span><?php echo __('Required') ?></span></strong>
+                             echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);?>
+							 <span><?php echo $lang_common['Required'] ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -166,7 +165,7 @@
 				</fieldset>
 			</div>
 			<?php endif; ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
@@ -176,7 +175,7 @@
 if ($tid && $feather_config['o_topic_review'] != '0') :
 ?>
 <div id="postreview">
-	<h2><span><?php echo __('Topic review') ?></span></h2>
+	<h2><span><?php echo $lang_post['Topic review'] ?></span></h2>
 
 	<?php
     // Set background switching on
diff --git a/style/FeatherBB/view/profile/change_mail.php b/style/FeatherBB/view/profile/change_mail.php
index de0f8d3b..68ae0012 100644
--- a/style/FeatherBB/view/profile/change_mail.php
+++ b/style/FeatherBB/view/profile/change_mail.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Change email') ?></span></h2>
+	<h2><span><?php echo $lang_profile['Change email'] ?></span></h2>
 	<div class="box">
 		<form id="change_email" method="post" action="<?php echo get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Email legend') ?></legend>
+					<legend><?php echo $lang_profile['Email legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('New email') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
-						<label class="required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
-						<p><?php echo __('Email instructions') ?></p>
+						<label class="required"><strong><?php echo $lang_profile['New email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
+						<label class="required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
+						<p><?php echo $lang_profile['Email instructions'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="new_email" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="new_email" value="<?php echo $lang_common['Submit'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/change_pass.php b/style/FeatherBB/view/profile/change_pass.php
index 0f0ab452..0231efa2 100644
--- a/style/FeatherBB/view/profile/change_pass.php
+++ b/style/FeatherBB/view/profile/change_pass.php
@@ -14,26 +14,26 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Change pass') ?></span></h2>
+	<h2><span><?php echo $lang_profile['Change pass'] ?></span></h2>
 	<div class="box">
 		<form id="change_pass" method="post" action="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
 				<fieldset>
-					<legend><?php echo __('Change pass legend') ?></legend>
+					<legend><?php echo $lang_profile['Change pass legend'] ?></legend>
 					<div class="infldset">
-<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo __('Old pass') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo $lang_profile['Old pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<input type="password" name="req_old_password" size="16" /><br /></label>
-<?php endif; ?>						<label class="conl required"><strong><?php echo __('New pass') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php endif; ?>						<label class="conl required"><strong><?php echo $lang_profile['New pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<input type="password" name="req_new_password1" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo __('Confirm new pass') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="conl required"><strong><?php echo $lang_profile['Confirm new pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<input type="password" name="req_new_password2" size="16" /><br /></label>
-						<p class="clearb"><?php echo __('Pass info') ?></p>
+						<p class="clearb"><?php echo $lang_profile['Pass info'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/delete_user.php b/style/FeatherBB/view/profile/delete_user.php
index d5d5bde2..55c707c5 100644
--- a/style/FeatherBB/view/profile/delete_user.php
+++ b/style/FeatherBB/view/profile/delete_user.php
@@ -14,23 +14,23 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Confirm delete user') ?></span></h2>
+	<h2><span><?php echo $lang_profile['Confirm delete user'] ?></span></h2>
 	<div class="box">
 		<form id="confirm_del_user" method="post" action="<?php echo get_link('user/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm delete legend') ?></legend>
+					<legend><?php echo $lang_profile['Confirm delete legend'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Confirmation info').' <strong>'.feather_escape($username).'</strong>.' ?></p>
+						<p><?php echo $lang_profile['Confirmation info'].' <strong>'.feather_escape($username).'</strong>.' ?></p>
 						<div class="rbox">
-							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo __('Delete posts') ?><br /></label>
+							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo $lang_profile['Delete posts'] ?><br /></label>
 						</div>
-						<p class="warntext"><strong><?php echo __('Delete warning') ?></strong></p>
+						<p class="warntext"><strong><?php echo $lang_profile['Delete warning'] ?></strong></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo $lang_profile['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/menu.php b/style/FeatherBB/view/profile/menu.php
index e78d2c30..bcf803e1 100644
--- a/style/FeatherBB/view/profile/menu.php
+++ b/style/FeatherBB/view/profile/menu.php
@@ -15,39 +15,39 @@
 ?>
 <div id="profile" class="block2col">
 	<div class="blockmenu">
-		<h2><span><?php echo __('Profile menu') ?></span></h2>
+		<h2><span><?php echo $lang_profile['Profile menu'] ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'essentials') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php echo __('Section essentials') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php echo $lang_profile['Section essentials'] ?></a></li>
 					<li<?php if ($page == 'personal') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php echo __('Section personal') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php echo $lang_profile['Section personal'] ?></a></li>
 					<li<?php if ($page == 'messaging') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php echo __('Section messaging') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php echo $lang_profile['Section messaging'] ?></a></li>
 <?php if ($feather_config['o_avatars'] == '1' || $feather_config['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php echo __('Section personality') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php echo $lang_profile['Section personality'] ?></a></li>
 <?php endif;
     ?>					<li<?php if ($page == 'display') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php echo __('Section display') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php echo $lang_profile['Section display'] ?></a></li>
 					<li<?php if ($page == 'privacy') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php echo __('Section privacy') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php echo $lang_profile['Section privacy'] ?></a></li>
 <?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php echo __('Section admin') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php echo $lang_profile['Section admin'] ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
diff --git a/style/FeatherBB/view/profile/section_admin.php b/style/FeatherBB/view/profile/section_admin.php
index 52a0ad54..16b4f80a 100644
--- a/style/FeatherBB/view/profile/section_admin.php
+++ b/style/FeatherBB/view/profile/section_admin.php
@@ -14,7 +14,7 @@
 
 ?>
 	<div class="blockform">
-		<h2><span><?php echo feather_escape($user['username']).' - '.__('Section admin') ?></span></h2>
+		<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section admin'] ?></span></h2>
 		<div class="box">
 			<form id="profile7" method="post" action="<?php echo get_link('user/'.$id.'/section/admin/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -25,9 +25,9 @@
 
         if ($feather->user->g_moderator == '1') {
             ?>
-						<legend><?php echo __('Delete ban legend') ?></legend>
+						<legend><?php echo $lang_profile['Delete ban legend'] ?></legend>
 						<div class="infldset">
-							<p><input type="submit" name="ban" value="<?php echo __('Ban user') ?>" /></p>
+							<p><input type="submit" name="ban" value="<?php echo $lang_profile['Ban user'] ?>" /></p>
 						</div>
 					</fieldset>
 				</div>
@@ -36,12 +36,12 @@
         } else {
             if ($feather->user->id != $id) {
                 ?>
-						<legend><?php echo __('Group membership legend') ?></legend>
+						<legend><?php echo $lang_profile['Group membership legend'] ?></legend>
 						<div class="infldset">
 							<select id="group_id" name="group_id">
                                                             <?php echo $group_list ?>
 							</select>
-							<input type="submit" name="update_group_membership" value="<?php echo __('Save') ?>" />
+							<input type="submit" name="update_group_membership" value="<?php echo $lang_profile['Save'] ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -52,9 +52,9 @@
             }
 
             ?>
-						<legend><?php echo __('Delete ban legend') ?></legend>
+						<legend><?php echo $lang_profile['Delete ban legend'] ?></legend>
 						<div class="infldset">
-							<input type="submit" name="delete_user" value="<?php echo __('Delete user') ?>" /> <input type="submit" name="ban" value="<?php echo __('Ban user') ?>" />
+							<input type="submit" name="delete_user" value="<?php echo $lang_profile['Delete user'] ?>" /> <input type="submit" name="ban" value="<?php echo $lang_profile['Ban user'] ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -64,13 +64,13 @@
                 ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Set mods legend') ?></legend>
+						<legend><?php echo $lang_profile['Set mods legend'] ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Moderator in info') ?></p>
+							<p><?php echo $lang_profile['Moderator in info'] ?></p>
                                                         <?php echo $forum_list ?>
 								</div>
 							</div>
-							<br class="clearb" /><input type="submit" name="update_forums" value="<?php echo __('Update forums') ?>" />
+							<br class="clearb" /><input type="submit" name="update_forums" value="<?php echo $lang_profile['Update forums'] ?>" />
 						</div>
 					</fieldset>
 				</div>
diff --git a/style/FeatherBB/view/profile/section_display.php b/style/FeatherBB/view/profile/section_display.php
index 506dd146..8ac8fd27 100644
--- a/style/FeatherBB/view/profile/section_display.php
+++ b/style/FeatherBB/view/profile/section_display.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section display') ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section display'] ?></span></h2>
 	<div class="box">
 		<form id="profile5" method="post" action="<?php echo get_link('user/'.$id.'/section/display/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -30,9 +30,9 @@
         ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Style legend') ?></legend>
+					<legend><?php echo $lang_profile['Style legend'] ?></legend>
 					<div class="infldset">
-						<label><?php echo __('Styles') ?><br />
+						<label><?php echo $lang_profile['Styles'] ?><br />
 						<select name="form_style">
 <?php
 
@@ -58,25 +58,25 @@
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1' || $feather_config['o_signatures'] == '1' || $feather_config['o_avatars'] == '1' || ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1')): ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Post display legend') ?></legend>
+					<legend><?php echo $lang_profile['Post display legend'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Post display info') ?></p>
+						<p><?php echo $lang_profile['Post display info'] ?></p>
 						<div class="rbox">
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show smilies') ?><br /></label>
+} ?> /><?php echo $lang_profile['Show smilies'] ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show sigs') ?><br /></label>
+} ?> /><?php echo $lang_profile['Show sigs'] ?><br /></label>
 <?php endif; if ($feather_config['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show avatars') ?><br /></label>
+} ?> /><?php echo $lang_profile['Show avatars'] ?><br /></label>
 <?php endif; if ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show images') ?><br /></label>
+} ?> /><?php echo $lang_profile['Show images'] ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1' && $feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show images sigs') ?><br /></label>
+} ?> /><?php echo $lang_profile['Show images sigs'] ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
@@ -85,15 +85,15 @@
 <?php endif; ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Pagination legend') ?></legend>
+					<legend><?php echo $lang_profile['Pagination legend'] ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo __('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
-						<label class="conl"><?php echo __('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
-						<p class="clearb"><?php echo __('Paginate info') ?> <?php echo __('Leave blank') ?></p>
+						<label class="conl"><?php echo $lang_profile['Topics per page'] ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
+						<label class="conl"><?php echo $lang_profile['Posts per page'] ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
+						<p class="clearb"><?php echo $lang_profile['Paginate info'] ?> <?php echo $lang_profile['Leave blank'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_essentials.php b/style/FeatherBB/view/profile/section_essentials.php
index 4f507a8c..25deccf6 100644
--- a/style/FeatherBB/view/profile/section_essentials.php
+++ b/style/FeatherBB/view/profile/section_essentials.php
@@ -14,23 +14,23 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section essentials') ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section essentials'] ?></span></h2>
 	<div class="box">
 		<form id="profile1" method="post" action="<?php echo get_link('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Username and pass legend') ?></legend>
+					<legend><?php echo $lang_profile['Username and pass legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php echo __('Change pass') ?></a></span></p>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php echo $lang_profile['Change pass'] ?></a></span></p>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Email legend') ?></legend>
+					<legend><?php echo $lang_prof_reg['Email legend'] ?></legend>
 					<div class="infldset">
 						<?php echo $user_disp['email_field'] ?>
 					</div>
@@ -38,139 +38,139 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Localisation legend') ?></legend>
+					<legend><?php echo $lang_prof_reg['Localisation legend'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Time zone info') ?></p>
-						<label><?php echo __('Time zone')."\n" ?>
+						<p><?php echo $lang_prof_reg['Time zone info'] ?></p>
+						<label><?php echo $lang_prof_reg['Time zone']."\n" ?>
 						<br /><select name="form_timezone">
 							<option value="-12"<?php if ($user['timezone'] == -12) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-12:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-12:00'] ?></option>
 							<option value="-11"<?php if ($user['timezone'] == -11) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-11:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-11:00'] ?></option>
 							<option value="-10"<?php if ($user['timezone'] == -10) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-10:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-10:00'] ?></option>
 							<option value="-9.5"<?php if ($user['timezone'] == -9.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-09:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-09:30'] ?></option>
 							<option value="-9"<?php if ($user['timezone'] == -9) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-09:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-09:00'] ?></option>
 							<option value="-8.5"<?php if ($user['timezone'] == -8.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-08:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-08:30'] ?></option>
 							<option value="-8"<?php if ($user['timezone'] == -8) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-08:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-08:00'] ?></option>
 							<option value="-7"<?php if ($user['timezone'] == -7) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-07:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-07:00'] ?></option>
 							<option value="-6"<?php if ($user['timezone'] == -6) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-06:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-06:00'] ?></option>
 							<option value="-5"<?php if ($user['timezone'] == -5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-05:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-05:00'] ?></option>
 							<option value="-4"<?php if ($user['timezone'] == -4) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-04:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-04:00'] ?></option>
 							<option value="-3.5"<?php if ($user['timezone'] == -3.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-03:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-03:30'] ?></option>
 							<option value="-3"<?php if ($user['timezone'] == -3) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-03:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-03:00'] ?></option>
 							<option value="-2"<?php if ($user['timezone'] == -2) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-02:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-02:00'] ?></option>
 							<option value="-1"<?php if ($user['timezone'] == -1) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-01:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-01:00'] ?></option>
 							<option value="0"<?php if ($user['timezone'] == 0) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC'] ?></option>
 							<option value="1"<?php if ($user['timezone'] == 1) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+01:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+01:00'] ?></option>
 							<option value="2"<?php if ($user['timezone'] == 2) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+02:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+02:00'] ?></option>
 							<option value="3"<?php if ($user['timezone'] == 3) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+03:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+03:00'] ?></option>
 							<option value="3.5"<?php if ($user['timezone'] == 3.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+03:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+03:30'] ?></option>
 							<option value="4"<?php if ($user['timezone'] == 4) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+04:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+04:00'] ?></option>
 							<option value="4.5"<?php if ($user['timezone'] == 4.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+04:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+04:30'] ?></option>
 							<option value="5"<?php if ($user['timezone'] == 5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+05:00'] ?></option>
 							<option value="5.5"<?php if ($user['timezone'] == 5.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+05:30'] ?></option>
 							<option value="5.75"<?php if ($user['timezone'] == 5.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:45') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+05:45'] ?></option>
 							<option value="6"<?php if ($user['timezone'] == 6) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+06:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+06:00'] ?></option>
 							<option value="6.5"<?php if ($user['timezone'] == 6.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+06:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+06:30'] ?></option>
 							<option value="7"<?php if ($user['timezone'] == 7) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+07:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+07:00'] ?></option>
 							<option value="8"<?php if ($user['timezone'] == 8) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+08:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+08:00'] ?></option>
 							<option value="8.75"<?php if ($user['timezone'] == 8.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+08:45') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+08:45'] ?></option>
 							<option value="9"<?php if ($user['timezone'] == 9) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+09:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+09:00'] ?></option>
 							<option value="9.5"<?php if ($user['timezone'] == 9.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+09:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+09:30'] ?></option>
 							<option value="10"<?php if ($user['timezone'] == 10) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+10:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+10:00'] ?></option>
 							<option value="10.5"<?php if ($user['timezone'] == 10.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+10:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+10:30'] ?></option>
 							<option value="11"<?php if ($user['timezone'] == 11) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+11:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+11:00'] ?></option>
 							<option value="11.5"<?php if ($user['timezone'] == 11.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+11:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+11:30'] ?></option>
 							<option value="12"<?php if ($user['timezone'] == 12) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+12:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+12:00'] ?></option>
 							<option value="12.75"<?php if ($user['timezone'] == 12.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+12:45') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+12:45'] ?></option>
 							<option value="13"<?php if ($user['timezone'] == 13) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+13:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+13:00'] ?></option>
 							<option value="14"<?php if ($user['timezone'] == 14) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+14:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+14:00'] ?></option>
 						</select>
 						<br /></label>
 						<div class="rbox">
 							<label><input type="checkbox" name="form_dst" value="1"<?php if ($user['dst'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('DST') ?><br /></label>
+} ?> /><?php echo $lang_prof_reg['DST'] ?><br /></label>
 						</div>
-						<label><?php echo __('Time format') ?>
+						<label><?php echo $lang_prof_reg['Time format'] ?>
 
 						<br /><select name="form_time_format">
 <?php
@@ -181,14 +181,14 @@
                                 }
                                 echo '>'. format_time(time(), false, null, $time_format, true, true);
                                 if ($key == 0) {
-                                    echo ' ('.__('Default').')';
+                                    echo ' ('.$lang_prof_reg['Default'].')';
                                 }
                                 echo "</option>\n";
                             }
                             ?>
 						</select>
 						<br /></label>
-						<label><?php echo __('Date format') ?>
+						<label><?php echo $lang_prof_reg['Date format'] ?>
 
 						<br /><select name="form_date_format">
 <?php
@@ -199,7 +199,7 @@
                                 }
                                 echo '>'. format_time(time(), true, $date_format, null, false, true);
                                 if ($key == 0) {
-                                    echo ' ('.__('Default').')';
+                                    echo ' ('.$lang_prof_reg['Default'].')';
                                 }
                                 echo "</option>\n";
                             }
@@ -214,7 +214,7 @@
     // Only display the language selection box if there's more than one language available
     if (count($languages) > 1) {
         ?>
-						<label><?php echo __('Language') ?>
+						<label><?php echo $lang_prof_reg['Language'] ?>
 						<br /><select name="form_language">
 <?php
 
@@ -239,18 +239,18 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('User activity') ?></legend>
+					<legend><?php echo $lang_profile['User activity'] ?></legend>
 					<div class="infldset">
-						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
-						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
-						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
+						<p><?php printf($lang_profile['Registered info'], format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf($lang_profile['Last post info'], format_time($user['last_post'])) ?></p>
+						<p><?php printf($lang_profile['Last visit info'], format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
-<?php if ($feather->user->is_admmod): ?>							<label><?php echo __('Admin note') ?><br />
+<?php if ($feather->user->is_admmod): ?>							<label><?php echo $lang_profile['Admin note'] ?><br />
 						<input id="admin_note" type="text" name="admin_note" value="<?php echo feather_escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_messaging.php b/style/FeatherBB/view/profile/section_messaging.php
index 148a78cf..3a5be1a2 100644
--- a/style/FeatherBB/view/profile/section_messaging.php
+++ b/style/FeatherBB/view/profile/section_messaging.php
@@ -14,24 +14,24 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section messaging') ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section messaging'] ?></span></h2>
 	<div class="box">
 		<form id="profile3" method="post" action="<?php echo get_link('user/'.$id.'/section/messaging/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Contact details legend') ?></legend>
+					<legend><?php echo $lang_profile['Contact details legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo __('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
-						<label><?php echo __('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php echo __('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php echo __('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php echo __('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php echo $lang_profile['Jabber'] ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
+						<label><?php echo $lang_profile['ICQ'] ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
+						<label><?php echo $lang_profile['MSN'] ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
+						<label><?php echo $lang_profile['AOL IM'] ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php echo $lang_profile['Yahoo'] ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_personal.php b/style/FeatherBB/view/profile/section_personal.php
index 7358bc85..3accb5f7 100644
--- a/style/FeatherBB/view/profile/section_personal.php
+++ b/style/FeatherBB/view/profile/section_personal.php
@@ -14,24 +14,24 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personal') ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section personal'] ?></span></h2>
 	<div class="box">
 		<form id="profile2" method="post" action="<?php echo get_link('user/'.$id.'/section/personal/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Personal details legend') ?></legend>
+					<legend><?php echo $lang_profile['Personal details legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo __('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
+						<label><?php echo $lang_profile['Realname'] ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
 <?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php echo __('Location') ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php echo __('Website') ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>							<label><?php echo $lang_profile['Location'] ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php echo $lang_profile['Website'] ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_personality.php b/style/FeatherBB/view/profile/section_personality.php
index 9bd9440b..d3e67cd6 100644
--- a/style/FeatherBB/view/profile/section_personality.php
+++ b/style/FeatherBB/view/profile/section_personality.php
@@ -14,41 +14,41 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personality') ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section personality'] ?></span></h2>
 	<div class="box">
 		<form id="profile4" method="post" action="<?php echo get_link('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php if ($feather_config['o_avatars'] == '1'): ?>				<div class="inform">
 				<fieldset id="profileavatar">
-					<legend><?php echo __('Avatar legend') ?></legend>
+					<legend><?php echo $lang_profile['Avatar legend'] ?></legend>
 					<div class="infldset">
 <?php if ($user_avatar): ?>							<div class="useravatar"><?php echo $user_avatar ?></div>
-<?php endif; ?>							<p><?php echo __('Avatar info') ?></p>
+<?php endif; ?>							<p><?php echo $lang_profile['Avatar info'] ?></p>
 						<p class="clearb actions"><?php echo $avatar_field ?></p>
 					</div>
 				</fieldset>
 			</div>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Signature legend') ?></legend>
+					<legend><?php echo $lang_profile['Signature legend'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Signature info') ?></p>
+						<p><?php echo $lang_profile['Signature info'] ?></p>
 						<div class="txtarea">
-							<label><?php printf(__('Sig max size'), forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
+							<label><?php printf($lang_profile['Sig max size'], forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_privacy.php b/style/FeatherBB/view/profile/section_privacy.php
index 6c1ab357..34715516 100644
--- a/style/FeatherBB/view/profile/section_privacy.php
+++ b/style/FeatherBB/view/profile/section_privacy.php
@@ -14,47 +14,47 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section privacy') ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section privacy'] ?></span></h2>
 	<div class="box">
 		<form id="profile6" method="post" action="<?php echo get_link('user/'.$id.'/section/privacy/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Privacy options legend') ?></legend>
+					<legend><?php echo $lang_prof_reg['Privacy options legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<p><?php echo __('Email setting info') ?></p>
+						<p><?php echo $lang_prof_reg['Email setting info'] ?></p>
 						<div class="rbox">
 							<label><input type="radio" name="form_email_setting" value="0"<?php if ($user['email_setting'] == '0') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Email setting 1') ?><br /></label>
+} ?> /><?php echo $lang_prof_reg['Email setting 1'] ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="1"<?php if ($user['email_setting'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Email setting 2') ?><br /></label>
+} ?> /><?php echo $lang_prof_reg['Email setting 2'] ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="2"<?php if ($user['email_setting'] == '2') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Email setting 3') ?><br /></label>
+} ?> /><?php echo $lang_prof_reg['Email setting 3'] ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
 <?php if ($feather_config['o_forum_subscriptions'] == '1' || $feather_config['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Subscription legend') ?></legend>
+					<legend><?php echo $lang_profile['Subscription legend'] ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Notify full') ?><br /></label>
+} ?> /><?php echo $lang_profile['Notify full'] ?><br /></label>
 <?php if ($feather_config['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Auto notify full') ?><br /></label>
+} ?> /><?php echo $lang_profile['Auto notify full'] ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/upload_avatar.php b/style/FeatherBB/view/profile/upload_avatar.php
index 3f74f092..60487560 100644
--- a/style/FeatherBB/view/profile/upload_avatar.php
+++ b/style/FeatherBB/view/profile/upload_avatar.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Upload avatar') ?></span></h2>
+	<h2><span><?php echo $lang_profile['Upload avatar'] ?></span></h2>
 	<div class="box">
 		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Upload avatar legend') ?></legend>
+					<legend><?php echo $lang_profile['Upload avatar legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-						<label class="required"><strong><?php echo __('File') ?> <span><?php echo __('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php echo __('Avatar desc').' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.__('bytes').' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
+						<label class="required"><strong><?php echo $lang_profile['File'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
+						<p><?php echo $lang_profile['Avatar desc'].' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.$lang_profile['pixels'].' '.$lang_common['and'].' '.forum_number_format($feather_config['o_avatars_size']).' '.$lang_profile['bytes'].' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="upload" value="<?php echo __('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="upload" value="<?php echo $lang_profile['Upload'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/view_profile.php b/style/FeatherBB/view/profile/view_profile.php
index ad1c5959..da66b788 100644
--- a/style/FeatherBB/view/profile/view_profile.php
+++ b/style/FeatherBB/view/profile/view_profile.php
@@ -14,12 +14,12 @@
 
 ?>
 <div id="viewprofile" class="block">
-	<h2><span><?php echo __('Profile') ?></span></h2>
+	<h2><span><?php echo $lang_common['Profile'] ?></span></h2>
 	<div class="box">
 		<div class="fakeform">
 			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('Section personal') ?></legend>
+				<legend><?php echo $lang_profile['Section personal'] ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personal'])."\n" ?>
@@ -30,7 +30,7 @@
 			</div>
 <?php if (!empty($user_info['messaging'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('Section messaging') ?></legend>
+				<legend><?php echo $lang_profile['Section messaging'] ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['messaging'])."\n" ?>
@@ -41,7 +41,7 @@
 			</div>
 <?php endif; if (!empty($user_info['personality'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('Section personality') ?></legend>
+				<legend><?php echo $lang_profile['Section personality'] ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personality'])."\n" ?>
@@ -52,7 +52,7 @@
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('User activity') ?></legend>
+				<legend><?php echo $lang_profile['User activity'] ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['activity'])."\n" ?>
diff --git a/style/FeatherBB/view/register/email.php b/style/FeatherBB/view/register/email.php
index 9f9b3424..e6355cb6 100644
--- a/style/FeatherBB/view/register/email.php
+++ b/style/FeatherBB/view/register/email.php
@@ -15,25 +15,25 @@
 ?>
 
 <div id="emailform" class="blockform">
-	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($recipient) ?></span></h2>
+	<h2><span><?php echo $lang_misc['Send email to'] ?> <?php echo feather_escape($recipient) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write email') ?></legend>
+					<legend><?php echo $lang_misc['Write email'] ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo __('Email disclosure note') ?></p>
+						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/register/form.php b/style/FeatherBB/view/register/form.php
index fa2d2457..3344af93 100644
--- a/style/FeatherBB/view/register/form.php
+++ b/style/FeatherBB/view/register/form.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo __('Registration errors') ?></span></h2>
+	<h2><span><?php echo $lang_register['Registration errors'] ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo __('Registration errors info') ?></p>
+			<p><?php echo $lang_register['Registration errors info'] ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,23 +37,23 @@
 }
 ?>
 <div id="regform" class="blockform">
-	<h2><span><?php echo __('Register') ?></span></h2>
+	<h2><span><?php echo $lang_register['Register'] ?></span></h2>
 	<div class="box">
 		<form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
 		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><?php echo __('Important information') ?></h3>
-					<p><?php echo __('Desc 1') ?></p>
-					<p><?php echo __('Desc 2') ?></p>
+					<h3><?php echo $lang_common['Important information'] ?></h3>
+					<p><?php echo $lang_register['Desc 1'] ?></p>
+					<p><?php echo $lang_register['Desc 2'] ?></p>
 				</div>
 				<fieldset>
-					<legend><?php echo __('Username legend') ?></legend>
+					<legend><?php echo $lang_register['Username legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="username" value="" />
 						<input type="hidden" name="password" value="" />
-						<label class="required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
+						<label class="required"><strong><?php echo $lang_common['Username'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
     echo feather_escape($feather->request->post('req_user'));
 } ?>" size="25" maxlength="25" /><br /></label>
 					</div>
@@ -61,28 +61,28 @@
 			</div>
 <?php if ($feather_config['o_regs_verify'] == '0'): ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Pass legend') ?></legend>
+					<legend><?php echo $lang_register['Pass legend'] ?></legend>
 					<div class="infldset">
-						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
+						<label class="conl required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
     echo feather_escape($feather->request->post('req_password1'));
 } ?>" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo __('Confirm pass') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
+						<label class="conl required"><strong><?php echo $lang_prof_reg['Confirm pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
     echo feather_escape($feather->request->post('req_password2'));
 } ?>" size="16" /><br /></label>
-						<p class="clearb"><?php echo __('Pass info') ?></p>
+						<p class="clearb"><?php echo $lang_register['Pass info'] ?></p>
 					</div>
 				</fieldset>
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
+					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? $lang_prof_reg['Email legend 2'] : $lang_prof_reg['Email legend'] ?></legend>
 					<div class="infldset">
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo __('Email info') ?></p>
-<?php endif; ?>						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo $lang_register['Email info'] ?></p>
+<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
     echo feather_escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo __('Confirm email') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo $lang_register['Confirm email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
     echo feather_escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
@@ -95,9 +95,9 @@
             ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Localisation legend') ?></legend>
+					<legend><?php echo $lang_prof_reg['Localisation legend'] ?></legend>
 					<div class="infldset">
-							<label><?php echo __('Language') ?>
+							<label><?php echo $lang_prof_reg['Language'] ?>
 							<br /><select name="language">
 <?php
 
@@ -121,14 +121,14 @@
 ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Robot title') ?></legend>
+					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Robot info')    ?></p>
-						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php echo __('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
+						<p><?php echo $lang_antispam['Robot info']    ?></p>
+						<label class="required"><strong><?php echo sprintf($lang_antispam['Robot question'], $question[$index_questions]) ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="register" value="<?php echo __('Register') ?>" /></p>
+			<p class="buttons"><input type="submit" name="register" value="<?php echo $lang_register['Register'] ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/register/rules.php b/style/FeatherBB/view/register/rules.php
index 3a2fd06c..d86c8c54 100644
--- a/style/FeatherBB/view/register/rules.php
+++ b/style/FeatherBB/view/register/rules.php
@@ -15,18 +15,18 @@
 ?>
 
 <div id="rules" class="blockform">
-	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
+	<div class="hd"><h2><span><?php echo $lang_register['Forum rules'] ?></span></h2></div>
 	<div class="box">
 		<form method="get" action="<?php echo get_link('register/') ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Rules legend') ?></legend>
+					<legend><?php echo $lang_register['Rules legend'] ?></legend>
 					<div class="infldset">
 						<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="agree" value="<?php echo __('Agree') ?>" /> <input type="submit" name="cancel" value="<?php echo __('Cancel') ?>" /></p>
+			<p class="buttons"><input type="submit" name="agree" value="<?php echo $lang_register['Agree'] ?>" /> <input type="submit" name="cancel" value="<?php echo $lang_register['Cancel'] ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/footer.php b/style/FeatherBB/view/search/footer.php
index a64e1cdf..73ff5d13 100644
--- a/style/FeatherBB/view/search/footer.php
+++ b/style/FeatherBB/view/search/footer.php
@@ -30,7 +30,7 @@
 			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
diff --git a/style/FeatherBB/view/search/form.php b/style/FeatherBB/view/search/form.php
index bb39c614..642fb380 100644
--- a/style/FeatherBB/view/search/form.php
+++ b/style/FeatherBB/view/search/form.php
@@ -14,66 +14,66 @@
 ?>
 
 <div id="searchform" class="blockform">
-	<h2><span><?php echo __('Search') ?></span></h2>
+	<h2><span><?php echo $lang_search['Search'] ?></span></h2>
 	<div class="box">
 		<form id="search" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Search criteria legend') ?></legend>
+					<legend><?php echo $lang_search['Search criteria legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="action" value="search" />
-						<label class="conl"><?php echo __('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
-						<label class="conl"><?php echo __('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
-						<p class="clearb"><?php echo __('Search info') ?></p>
+						<label class="conl"><?php echo $lang_search['Keyword search'] ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
+						<label class="conl"><?php echo $lang_search['Author search'] ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
+						<p class="clearb"><?php echo $lang_search['Search info'] ?></p>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Search in legend') ?></legend>
+					<legend><?php echo $lang_search['Search in legend'] ?></legend>
 					<div class="infldset">
 					<?php echo $forums ?>
-						<label class="conl"><?php echo __('Search in')."\n" ?>
+						<label class="conl"><?php echo $lang_search['Search in']."\n" ?>
 						<br /><select id="search_in" name="search_in">
-							<option value="0"><?php echo __('Message and subject') ?></option>
-							<option value="1"><?php echo __('Message only') ?></option>
-							<option value="-1"><?php echo __('Topic only') ?></option>
+							<option value="0"><?php echo $lang_search['Message and subject'] ?></option>
+							<option value="1"><?php echo $lang_search['Message only'] ?></option>
+							<option value="-1"><?php echo $lang_search['Topic only'] ?></option>
 						</select>
 						<br /></label>
-						<p class="clearl"><?php echo __('Search in info') ?></p>
-<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
+						<p class="clearl"><?php echo $lang_search['Search in info'] ?></p>
+<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.$lang_search['Search multiple forums info'].'</p>' : '') ?>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Search results legend') ?></legend>
+					<legend><?php echo $lang_search['Search results legend'] ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo __('Sort by')."\n" ?>
+						<label class="conl"><?php echo $lang_search['Sort by']."\n" ?>
 						<br /><select name="sort_by">
-							<option value="0"><?php echo __('Sort by post time') ?></option>
-							<option value="1"><?php echo __('Sort by author') ?></option>
-							<option value="2"><?php echo __('Sort by subject') ?></option>
-							<option value="3"><?php echo __('Sort by forum') ?></option>
+							<option value="0"><?php echo $lang_search['Sort by post time'] ?></option>
+							<option value="1"><?php echo $lang_search['Sort by author'] ?></option>
+							<option value="2"><?php echo $lang_search['Sort by subject'] ?></option>
+							<option value="3"><?php echo $lang_search['Sort by forum'] ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Sort order')."\n" ?>
+						<label class="conl"><?php echo $lang_search['Sort order']."\n" ?>
 						<br /><select name="sort_dir">
-							<option value="DESC"><?php echo __('Descending') ?></option>
-							<option value="ASC"><?php echo __('Ascending') ?></option>
+							<option value="DESC"><?php echo $lang_search['Descending'] ?></option>
+							<option value="ASC"><?php echo $lang_search['Ascending'] ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Show as')."\n" ?>
+						<label class="conl"><?php echo $lang_search['Show as']."\n" ?>
 						<br /><select name="show_as">
-							<option value="topics"><?php echo __('Show as topics') ?></option>
-							<option value="posts"><?php echo __('Show as posts') ?></option>
+							<option value="topics"><?php echo $lang_search['Show as topics'] ?></option>
+							<option value="posts"><?php echo $lang_search['Show as posts'] ?></option>
 						</select>
 						<br /></label>
-						<p class="clearb"><?php echo __('Search results info') ?></p>
+						<p class="clearb"><?php echo $lang_search['Search results info'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/header.php b/style/FeatherBB/view/search/header.php
index 909a2108..47706687 100644
--- a/style/FeatherBB/view/search/header.php
+++ b/style/FeatherBB/view/search/header.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
@@ -31,16 +31,16 @@
 if ($search['show_as'] == 'topics') :
 ?>
 <div id="vf" class="blocktable">
-	<h2><span><?php echo __('Search results') ?></span></h2>
+	<h2><span><?php echo $lang_search['Search results'] ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Forum') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Replies') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
+					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
+					<th class="tc2" scope="col"><?php echo $lang_common['Forum'] ?></th>
+					<th class="tc3" scope="col"><?php echo $lang_common['Replies'] ?></th>
+					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/style/FeatherBB/view/search/posts.php b/style/FeatherBB/view/search/posts.php
index 872c349e..a1247133 100644
--- a/style/FeatherBB/view/search/posts.php
+++ b/style/FeatherBB/view/search/posts.php
@@ -21,7 +21,7 @@
     echo ' '.$cur_search['item_status'];
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
-    echo __('Re').' ';
+    echo $lang_topic['Re'].' ';
 } ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
@@ -29,7 +29,7 @@
 			<div class="postleft">
 				<dl>
 					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php echo __('Replies').' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
+<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php echo $lang_topic['Replies'].' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
 <?php endif; ?>
 					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
 				</dl>
@@ -46,8 +46,8 @@
 		<div class="postfoot clearb">
 			<div class="postfootright">
 				<ul>
-					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo __('Go to topic') ?></a></span></li>
-					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo __('Go to post') ?></a></span></li>
+					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo $lang_search['Go to topic'] ?></a></span></li>
+					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $lang_search['Go to post'] ?></a></span></li>
 				</ul>
 			</div>
 		</div>
diff --git a/style/FeatherBB/view/search/topics.php b/style/FeatherBB/view/search/topics.php
index af843193..d60dce31 100644
--- a/style/FeatherBB/view/search/topics.php
+++ b/style/FeatherBB/view/search/topics.php
@@ -25,5 +25,5 @@
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
 	<td class="tc3"><?php echo forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
+	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_search['last_poster']) ?></span></td>
 </tr>
\ No newline at end of file
diff --git a/style/FeatherBB/view/userlist.php b/style/FeatherBB/view/userlist.php
index 0bbedae6..66e2a20d 100644
--- a/style/FeatherBB/view/userlist.php
+++ b/style/FeatherBB/view/userlist.php
@@ -14,50 +14,50 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('User search') ?></span></h2>
+	<h2><span><?php echo $lang_search['User search'] ?></span></h2>
 	<div class="box">
 		<form id="userlist" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('User find legend') ?></legend>
+					<legend><?php echo $lang_ul['User find legend'] ?></legend>
 					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo __('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
-<?php endif; ?>						<label class="conl"><?php echo __('User group')."\n" ?>
+<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo $lang_common['Username'] ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
+<?php endif; ?>						<label class="conl"><?php echo $lang_ul['User group']."\n" ?>
 						<br /><select name="show_group">
 							<option value="-1"<?php if ($show_group == -1) {
     echo ' selected="selected"';
-} ?>><?php echo __('All users') ?></option>
+} ?>><?php echo $lang_ul['All users'] ?></option>
 <?php echo $dropdown_menu ?>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Sort by')."\n" ?>
+						<label class="conl"><?php echo $lang_search['Sort by']."\n" ?>
 						<br /><select name="sort_by">
 							<option value="username"<?php if ($sort_by == 'username') {
     echo ' selected="selected"';
-} ?>><?php echo __('Username') ?></option>
+} ?>><?php echo $lang_common['Username'] ?></option>
 							<option value="registered"<?php if ($sort_by == 'registered') {
     echo ' selected="selected"';
-} ?>><?php echo __('Registered') ?></option>
+} ?>><?php echo $lang_common['Registered'] ?></option>
 <?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
     echo ' selected="selected"';
-} ?>><?php echo __('No of posts') ?></option>
+} ?>><?php echo $lang_ul['No of posts'] ?></option>
 <?php endif; ?>						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Sort order')."\n" ?>
+						<label class="conl"><?php echo $lang_search['Sort order']."\n" ?>
 						<br /><select name="sort_dir">
 							<option value="ASC"<?php if ($sort_dir == 'ASC') {
     echo ' selected="selected"';
-} ?>><?php echo __('Ascending') ?></option>
+} ?>><?php echo $lang_search['Ascending'] ?></option>
 							<option value="DESC"<?php if ($sort_dir == 'DESC') {
     echo ' selected="selected"';
-} ?>><?php echo __('Descending') ?></option>
+} ?>><?php echo $lang_search['Descending'] ?></option>
 						</select>
 						<br /></label>
-						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? __('User search info').' ' : '').__('User sort info'); ?></p>
+						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? $lang_ul['User search info'].' ' : '').$lang_ul['User sort info']; ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
@@ -70,16 +70,16 @@
 </div>
 
 <div id="users1" class="blocktable">
-	<h2><span><?php echo __('User list') ?></span></h2>
+	<h2><span><?php echo $lang_common['User list'] ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Username') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Title') ?></th>
-<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Registered') ?></th>
+					<th class="tcl" scope="col"><?php echo $lang_common['Username'] ?></th>
+					<th class="tc2" scope="col"><?php echo $lang_common['Title'] ?></th>
+<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php echo $lang_common['Posts'] ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php echo $lang_common['Registered'] ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -98,7 +98,7 @@
 
             }
             if (empty($userlist_data)) {
-                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.__('No hits').'</td></tr>'."\n";
+                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.$lang_search['No hits'].'</td></tr>'."\n";
             }
             ?>
 			</tbody>
diff --git a/style/FeatherBB/view/viewforum.php b/style/FeatherBB/view/viewforum.php
index b9d04a1d..332987ae 100644
--- a/style/FeatherBB/view/viewforum.php
+++ b/style/FeatherBB/view/viewforum.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -34,10 +34,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
+					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
+					<th class="tc2" scope="col"><?php echo $lang_common['Replies'] ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -70,7 +70,7 @@
 							<div class="icon inone"><div class="nosize"><!-- --></div></div>
 							<div class="tclcon">
 								<div>
-									<strong><?php echo __('Empty forum') ?></strong>
+									<strong><?php echo $lang_forum['Empty forum'] ?></strong>
 								</div>
 							</div>
 						</td>
@@ -91,7 +91,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
diff --git a/style/FeatherBB/view/viewtopic.php b/style/FeatherBB/view/viewtopic.php
index 16535ff1..e5f55ab0 100644
--- a/style/FeatherBB/view/viewtopic.php
+++ b/style/FeatherBB/view/viewtopic.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -64,13 +64,13 @@
 				</div>
 				<div class="postright">
 					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
-    echo __('Re').' ';
+    echo $lang_topic['Re'].' ';
 }
     ?><?php echo feather_escape($cur_topic['subject']) ?></h3>
 					<div class="postmsg">
 						<?php echo $post['message']."\n" ?>
 <?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.$lang_topic['Last edit'].' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 					</div>
@@ -107,7 +107,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -124,13 +124,13 @@
 
     ?>
 <div id="quickpost" class="blockform">
-	<h2><span><?php echo __('Quick post') ?></span></h2>
+	<h2><span><?php echo $lang_topic['Quick post'] ?></span></h2>
 	<div class="box">
 		<form id="quickpostform" method="post" action="<?php echo get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write message legend') ?></legend>
+					<legend><?php echo $lang_common['Write message legend'] ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
@@ -139,22 +139,21 @@
 <?php endif;
 
     if ($feather->user->is_guest) {
-        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong>' : $lang_common['Email'];
         $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
         ?>
-						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
 <?php
 
-    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.__('Message').' <span>'.__('Required').'</span></strong><br />';
+    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.$lang_common['Message'].' <span>'.$lang_common['Required'].'</span></strong><br />';
     } else {
         echo "\t\t\t\t\t\t".'<label>';
     }
 
     ?>
 <!-- Init BBcode editor toolbar -->
-<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
@@ -164,13 +163,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off'];
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off'];
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off'];
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off'];
     ?></span></li>
 						</ul>
 					</div>
@@ -179,15 +178,15 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Robot title') ?></legend>
+					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Robot info')    ?></p>
+						<p><?php echo $lang_antispam['Robot info']    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
     $qencoded = md5($question[$index_questions]);
-    echo sprintf(__('Robot question'), $question[$index_questions]);
+    echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);
     ?>
-							 <span><?php echo __('Required') ?></span></strong>
+							 <span><?php echo $lang_common['Required'] ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -196,7 +195,7 @@
 			</div>
 			<?php endif;
     ?>
-			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo __('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
+			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_topic['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
 		</form>
 	</div>
 </div>
diff --git a/view/admin/groups/add_edit_group.php b/view/admin/groups/add_edit_group.php
index 26c9881c..e2f0c0e8 100644
--- a/view/admin/groups/add_edit_group.php
+++ b/view/admin/groups/add_edit_group.php
@@ -40,7 +40,7 @@
 								<th scope="row"><?php echo $lang_admin_groups['User title label'] ?></th>
 								<td>
 									<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
-									<span><?php printf($lang_admin_groups['User title help'], ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
+									<span><?php printf($lang_admin_groups['User title help'], ($group['info']['g_id'] != FEATHER_GUEST ? $lang_common['Member'] : $lang_common['Guest'])) ?></span>
 								</td>
 							</tr>
 							<?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
diff --git a/view/delete.php b/view/delete.php
index 65f2440b..9d6afff9 100644
--- a/view/delete.php
+++ b/view/delete.php
@@ -16,26 +16,26 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="index.php"><?php echo __('Index') ?></a></li>
+			<li><a href="index.php"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Delete post') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo $lang_delete['Delete post'] ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div class="blockform">
-	<h2><span><?php echo __('Delete post') ?></span></h2>
+	<h2><span><?php echo $lang_delete['Delete post'] ?></span></h2>
 	<div class="box">
 		<form method="post" action="<?php echo get_link('delete/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
-					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php echo __('Delete info') ?></p>
+					<h3><span><?php printf($is_topic_post ? $lang_delete['Topic by'] : $lang_delete['Reply by'], '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
+					<p><?php echo($is_topic_post) ? '<strong>'.$lang_delete['Topic warning'].'</strong>' : '<strong>'.$lang_delete['Warning'].'</strong>' ?><br /><?php echo $lang_delete['Delete info'] ?></p>
 				</div>
 			</div>
-			<p class="buttons"><input type="submit" name="delete" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete" value="<?php echo $lang_delete['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
diff --git a/view/edit.php b/view/edit.php
index 8f2fe702..3d91e362 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -6,10 +6,10 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
-
+ 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
-	exit;
+    exit;
 }
 
 $cur_index = 1;
@@ -19,10 +19,10 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Edit post') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo $lang_post['Edit post'] ?></strong></li>
 		</ul>
 	</div>
 </div>
@@ -31,90 +31,89 @@
 
 // If there are errors, we display them
 if (!empty($errors)) :
-	?>
-	<div id="posterror" class="block">
-		<h2><span><?php echo __('Post errors') ?></span></h2>
-		<div class="box">
-			<div class="inbox error-info">
-				<p><?php echo __('Post errors info') ?></p>
-				<ul class="error-list">
-					<?php
-					foreach ($errors as $cur_error) {
-						echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-					}
-					?>
-				</ul>
-			</div>
+?>
+<div id="posterror" class="block">
+	<h2><span><?php echo $lang_post['Post errors'] ?></span></h2>
+	<div class="box">
+		<div class="inbox error-info">
+			<p><?php echo $lang_post['Post errors info'] ?></p>
+			<ul class="error-list">
+<?php
+    foreach ($errors as $cur_error) {
+        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+    }
+?>
+			</ul>
 		</div>
 	</div>
-	<?php
+</div>
+<?php
 elseif ($feather->request->post('preview')):
-	?>
-	<div id="postpreview" class="blockpost">
-		<h2><span><?php echo __('Post preview') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<div class="postbody">
-					<div class="postright">
-						<div class="postmsg">
-							<?php echo $preview_message."\n" ?>
-						</div>
+?>
+<div id="postpreview" class="blockpost">
+	<h2><span><?php echo $lang_post['Post preview'] ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<div class="postbody">
+				<div class="postright">
+					<div class="postmsg">
+						<?php echo $preview_message."\n" ?>
 					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-	<?php
+</div>
+<?php
 endif;
 ?>
 <!-- Init BBcode editor toolbar -->
-<?php $lang_bbeditor = ''; ?>
 <script>
-	var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
-		langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
+    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
+        langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
 </script>
 <script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
 <div id="editform" class="blockform">
-	<h2><span><?php echo __('Edit post') ?></span></h2>
+	<h2><span><?php echo $lang_post['Edit post'] ?></span></h2>
 	<div class="box">
 		<form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Edit post legend') ?></legend>
+					<legend><?php echo $lang_post['Edit post legend'] ?></legend>
 					<input type="hidden" name="form_sent" value="1" />
 					<div class="infldset txtarea">
-						<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br />
-							<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
-						<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
-							<script>postEditorToolbar('req_message');</script>
-							<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
+<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo $lang_common['Subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
+<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
+						<script>postEditorToolbar('req_message');</script>
+                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="help.php#img" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="help.php#smilies" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
 			</div>
-			<?php
-			if (!empty($checkboxes)):
-				?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php echo __('Options') ?></legend>
-						<div class="infldset">
-							<div class="rbox">
-								<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
-							</div>
+<?php
+if (!empty($checkboxes)):
+?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php echo $lang_common['Options'] ?></legend>
+					<div class="infldset">
+						<div class="rbox">
+							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
 						</div>
-					</fieldset>
-				</div>
-				<?php
-			endif;
-			?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+					</div>
+				</fieldset>
+			</div>
+<?php
+endif;
+?>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/footer.php b/view/footer.php
index 6d9b7934..dde5eb31 100644
--- a/view/footer.php
+++ b/view/footer.php
@@ -11,7 +11,7 @@
 </div>
 
 <div id="brdfooter" class="block">
-	<h2><span><?php echo __('Board footer') ?></span></h2>
+	<h2><span><?php echo $lang_common['Board footer'] ?></span></h2>
 	<div class="box">
 <?php
 
@@ -20,8 +20,8 @@
 
     if ($footer_style == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.$lang_forum['Mod controls'].'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.$lang_common['Moderate forum'].'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($footer_style == 'viewtopic') {
         if (isset($pid)) {
@@ -34,22 +34,22 @@
         
         
         echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.$lang_topic['Mod controls'].'</strong></dt>'."\n";
         // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.$lang_common['Moderate topic'].'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.$lang_common['All'].'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.$lang_common['Moderate topic'].'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.$lang_common['Move topic'].'</a></span></dd>'."\n";
 
         if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.$lang_common['Open topic'].'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.$lang_common['Close topic'].'</a></span></dd>'."\n";
         }
 
         if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.$lang_common['Unstick topic'].'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.$lang_common['Stick topic'].'</a></span></dd>'."\n";
         }
 
         echo "\t\t\t".'</dl>'."\n";
@@ -89,26 +89,26 @@
 
 if ($footer_style == 'index') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.$lang_common['RSS active topics feed'].'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.$lang_common['Atom active topics feed'].'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewforum') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.$lang_common['RSS forum feed'].'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.$lang_common['Atom forum feed'].'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewtopic') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.$lang_common['RSS topic feed'].'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.$lang_common['Atom topic feed'].'</a></span></p>'."\n";
     }
 }
 
 ?>
-				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
+				<p id="poweredby"><?php printf($lang_common['Powered by'], '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
 			</div>
 			<div class="clearer"></div>
 		</div>
@@ -122,13 +122,13 @@
 
     // Calculate script generation time
     $time_diff = sprintf('%.3f', get_microtime() - $feather_start);
-    echo sprintf(__('Querytime'), $time_diff, count(\DB::get_query_log()[0]));
+    echo sprintf($lang_common['Querytime'], $time_diff, count(\DB::get_query_log()[0]));
 
     if (function_exists('memory_get_usage')) {
-        echo ' - '.sprintf(__('Memory usage'), file_size(memory_get_usage()));
+        echo ' - '.sprintf($lang_common['Memory usage'], file_size(memory_get_usage()));
 
         if (function_exists('memory_get_peak_usage')) {
-            echo ' '.sprintf(__('Peak usage'), file_size(memory_get_peak_usage()));
+            echo ' '.sprintf($lang_common['Peak usage'], file_size(memory_get_peak_usage()));
         }
     }
 
diff --git a/view/header.php b/view/header.php
index 88f0260a..4492eaa0 100644
--- a/view/header.php
+++ b/view/header.php
@@ -9,7 +9,7 @@
 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo __('lang_identifier') ?>" lang="<?php echo __('lang_identifier') ?>" dir="<?php echo __('lang_direction') ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang_common['lang_identifier'] ?>" lang="<?php echo $lang_common['lang_identifier'] ?>" dir="<?php echo $lang_common['lang_direction'] ?>">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title><?php echo generate_page_title($page_title, $p) ?></title>
@@ -55,7 +55,7 @@ function process_form(the_form)
 			var elem = the_form.elements[i];
 			if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
 			{
-				alert('"' + required_fields[elem.name] + '" <?php echo __('required field') ?>');
+				alert('"' + required_fields[elem.name] + '" <?php echo $lang_common['required field'] ?>');
 				elem.focus();
 				return false;
 			}
@@ -92,7 +92,7 @@ function process_form(the_form)
 
 <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
 <div id="announce" class="block">
-    <div class="hd"><h2><span><?php echo __('Announcement') ?></span></h2></div>
+    <div class="hd"><h2><span><?php echo $lang_common['Announcement'] ?></span></h2></div>
     <div class="box">
         <div id="announce-block" class="inbox">
             <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
@@ -104,7 +104,7 @@ function process_form(the_form)
 <?php if (isset($flash['message'])) : ?>
 <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
 <div id="msgflash" class="block">
-    <h2><span><?php echo __('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
+    <h2><span><?php echo $lang_common['Info'] ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
     <div class="box">
         <div class="inbox">
             <p><?php echo feather_escape($flash['message']) ?></p>
diff --git a/view/help.php b/view/help.php
index a7f9300d..fd511285 100644
--- a/view/help.php
+++ b/view/help.php
@@ -14,113 +14,113 @@
 
 ?>
 
-<h2><span><?php echo __('BBCode') ?></span></h2>
+<h2><span><?php echo $lang_help['BBCode'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="bbcode"></a><?php echo __('BBCode info 1') ?></p>
-		<p><?php echo __('BBCode info 2') ?></p>
+		<p><a name="bbcode"></a><?php echo $lang_help['BBCode info 1'] ?></p>
+		<p><?php echo $lang_help['BBCode info 2'] ?></p>
 	</div>
 </div>
-<h2><span><?php echo __('Text style') ?></span></h2>
+<h2><span><?php echo $lang_help['Text style'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Text style info') ?></p>
-		<p><code>[b]<?php echo __('Bold text') ?>[/b]</code> <?php echo __('produces') ?> <samp><strong><?php echo __('Bold text') ?></strong></samp></p>
-		<p><code>[u]<?php echo __('Underlined text') ?>[/u]</code> <?php echo __('produces') ?> <samp><span class="bbu"><?php echo __('Underlined text') ?></span></samp></p>
-		<p><code>[i]<?php echo __('Italic text') ?>[/i]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Italic text') ?></em></samp></p>
-		<p><code>[s]<?php echo __('Strike-through text') ?>[/s]</code> <?php echo __('produces') ?> <samp><span class="bbs"><?php echo __('Strike-through text') ?></span></samp></p>
-		<p><code>[del]<?php echo __('Deleted text') ?>[/del]</code> <?php echo __('produces') ?> <samp><del><?php echo __('Deleted text') ?></del></samp></p>
-		<p><code>[ins]<?php echo __('Inserted text') ?>[/ins]</code> <?php echo __('produces') ?> <samp><ins><?php echo __('Inserted text') ?></ins></samp></p>
-		<p><code>[em]<?php echo __('Emphasised text') ?>[/em]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Emphasised text') ?></em></samp></p>
-		<p><code>[color=#FF0000]<?php echo __('Red text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: #ff0000"><?php echo __('Red text') ?></span></samp></p>
-		<p><code>[color=blue]<?php echo __('Blue text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: blue"><?php echo __('Blue text') ?></span></samp></p>
-		<p><code>[h]<?php echo __('Heading text') ?>[/h]</code> <?php echo __('produces') ?></p> <div class="postmsg"><h5><?php echo __('Heading text') ?></h5></div>
+		<p><?php echo $lang_help['Text style info'] ?></p>
+		<p><code>[b]<?php echo $lang_help['Bold text'] ?>[/b]</code> <?php echo $lang_help['produces'] ?> <samp><strong><?php echo $lang_help['Bold text'] ?></strong></samp></p>
+		<p><code>[u]<?php echo $lang_help['Underlined text'] ?>[/u]</code> <?php echo $lang_help['produces'] ?> <samp><span class="bbu"><?php echo $lang_help['Underlined text'] ?></span></samp></p>
+		<p><code>[i]<?php echo $lang_help['Italic text'] ?>[/i]</code> <?php echo $lang_help['produces'] ?> <samp><em><?php echo $lang_help['Italic text'] ?></em></samp></p>
+		<p><code>[s]<?php echo $lang_help['Strike-through text'] ?>[/s]</code> <?php echo $lang_help['produces'] ?> <samp><span class="bbs"><?php echo $lang_help['Strike-through text'] ?></span></samp></p>
+		<p><code>[del]<?php echo $lang_help['Deleted text'] ?>[/del]</code> <?php echo $lang_help['produces'] ?> <samp><del><?php echo $lang_help['Deleted text'] ?></del></samp></p>
+		<p><code>[ins]<?php echo $lang_help['Inserted text'] ?>[/ins]</code> <?php echo $lang_help['produces'] ?> <samp><ins><?php echo $lang_help['Inserted text'] ?></ins></samp></p>
+		<p><code>[em]<?php echo $lang_help['Emphasised text'] ?>[/em]</code> <?php echo $lang_help['produces'] ?> <samp><em><?php echo $lang_help['Emphasised text'] ?></em></samp></p>
+		<p><code>[color=#FF0000]<?php echo $lang_help['Red text'] ?>[/color]</code> <?php echo $lang_help['produces'] ?> <samp><span style="color: #ff0000"><?php echo $lang_help['Red text'] ?></span></samp></p>
+		<p><code>[color=blue]<?php echo $lang_help['Blue text'] ?>[/color]</code> <?php echo $lang_help['produces'] ?> <samp><span style="color: blue"><?php echo $lang_help['Blue text'] ?></span></samp></p>
+		<p><code>[h]<?php echo $lang_help['Heading text'] ?>[/h]</code> <?php echo $lang_help['produces'] ?></p> <div class="postmsg"><h5><?php echo $lang_help['Heading text'] ?></h5></div>
 	</div>
 </div>
-<h2><span><?php echo __('Links and images') ?></span></h2>
+<h2><span><?php echo $lang_help['Links and images'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php echo __('This help page') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php echo __('This help page') ?></a></samp></p>
-		<p><code>[email]myname@example.com[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
-		<p><code>[email=myname@example.com]<?php echo __('My email address') ?>[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com"><?php echo __('My email address') ?></a></samp></p>
-		<p><code>[topic=1]<?php echo __('Test topic') ?>[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test topic') ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php echo __('Test post') ?>[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo __('Test post') ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php echo __('Test forum') ?>[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test forum') ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php echo __('Test user') ?>[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo __('Test user') ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
+		<p><?php echo $lang_help['Links info'] ?></p>
+		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
+		<p><code>[url=/help/]<?php echo $lang_help['This help page'] ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('/help') ?>"><?php echo $lang_help['This help page'] ?></a></samp></p>
+		<p><code>[email]myname@example.com[/email]</code> <?php echo $lang_help['produces'] ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
+		<p><code>[email=myname@example.com]<?php echo $lang_help['My email address'] ?>[/email]</code> <?php echo $lang_help['produces'] ?> <samp><a href="mailto:myname@example.com"><?php echo $lang_help['My email address'] ?></a></samp></p>
+		<p><code>[topic=1]<?php echo $lang_help['Test topic'] ?>[/topic]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo $lang_help['Test topic'] ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php echo $lang_help['Test post'] ?>[/post]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo $lang_help['Test post'] ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php echo $lang_help['Test forum'] ?>[/forum]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo $lang_help['Test forum'] ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php echo $lang_help['Test user'] ?>[/user]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo $lang_help['Test user'] ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
 	</div>
 	<div class="inbox">
-		<p><a name="img"></a><?php echo __('Images info') ?></p>
-		<p><code>[img=<?php echo __('FluxBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php echo __('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php echo __('FluxBB bbcode test') ?>" /></samp></p>
+		<p><a name="img"></a><?php echo $lang_help['Images info'] ?></p>
+		<p><code>[img=<?php echo $lang_help['FluxBB bbcode test'] ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php echo $lang_help['produces'] ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php echo $lang_help['FluxBB bbcode test'] ?>" /></samp></p>
 	</div>
 </div>
-<h2><span><?php echo __('Quotes') ?></span></h2>
+<h2><span><?php echo $lang_help['Quotes'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Quotes info') ?></p>
-		<p><code>[quote=James]<?php echo __('Quote text') ?>[/quote]</code></p>
-		<p><?php echo __('produces quote box') ?></p>
+		<p><?php echo $lang_help['Quotes info'] ?></p>
+		<p><code>[quote=James]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
+		<p><?php echo $lang_help['produces quote box'] ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><cite>James <?php echo __('wrote') ?></cite><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
+			<div class="quotebox"><cite>James <?php echo $lang_common['wrote'] ?></cite><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo __('Quotes info 2') ?></p>
-		<p><code>[quote]<?php echo __('Quote text') ?>[/quote]</code></p>
-		<p><?php echo __('produces quote box') ?></p>
+		<p><?php echo $lang_help['Quotes info 2'] ?></p>
+		<p><code>[quote]<?php echo $lang_help['Quote text'] ?>[/quote]</code></p>
+		<p><?php echo $lang_help['produces quote box'] ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
+			<div class="quotebox"><blockquote><div><p><?php echo $lang_help['Quote text'] ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo __('quote note') ?></p>
+		<p><?php echo $lang_help['quote note'] ?></p>
 	</div>
 </div>
-<h2><span><?php echo __('Code') ?></span></h2>
+<h2><span><?php echo $lang_help['Code'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Code info') ?></p>
-		<p><code>[code]<?php echo __('Code text') ?>[/code]</code></p>
-		<p><?php echo __('produces code box') ?></p>
+		<p><?php echo $lang_help['Code info'] ?></p>
+		<p><code>[code]<?php echo $lang_help['Code text'] ?>[/code]</code></p>
+		<p><?php echo $lang_help['produces code box'] ?></p>
 		<div class="postmsg">
-			<div class="codebox"><pre><code><?php echo __('Code text') ?></code></pre></div>
+			<div class="codebox"><pre><code><?php echo $lang_help['Code text'] ?></code></pre></div>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo __('Lists') ?></span></h2>
+<h2><span><?php echo $lang_help['Lists'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="lists"></a><?php echo __('List info') ?></p>
-		<p><code>[list][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php echo __('produces list') ?></span></p>
+		<p><a name="lists"></a><?php echo $lang_help['List info'] ?></p>
+		<p><code>[list][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
+		<br /><span><?php echo $lang_help['produces list'] ?></span></p>
 		<div class="postmsg">
-			<ul><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ul>
+			<ul><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ul>
 		</div>
-		<p><code>[list=1][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php echo __('produces decimal list') ?></span></p>
+		<p><code>[list=1][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
+		<br /><span><?php echo $lang_help['produces decimal list'] ?></span></p>
 		<div class="postmsg">
-			<ol class="decimal"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
+			<ol class="decimal"><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ol>
 		</div>
-		<p><code>[list=a][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php echo __('produces alpha list') ?></span></p>
+		<p><code>[list=a][*]<?php echo $lang_help['List text 1'] ?>[/*][*]<?php echo $lang_help['List text 2'] ?>[/*][*]<?php echo $lang_help['List text 3'] ?>[/*][/list]</code>
+		<br /><span><?php echo $lang_help['produces alpha list'] ?></span></p>
 		<div class="postmsg">
-			<ol class="alpha"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
+			<ol class="alpha"><li><p><?php echo $lang_help['List text 1'] ?></p></li><li><p><?php echo $lang_help['List text 2'] ?></p></li><li><p><?php echo $lang_help['List text 3'] ?></p></li></ol>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo __('Nested tags') ?></span></h2>
+<h2><span><?php echo $lang_help['Nested tags'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Nested tags info') ?></p>
-		<p><code>[b][u]<?php echo __('Bold, underlined text') ?>[/u][/b]</code> <?php echo __('produces') ?> <samp><strong><span class="bbu"><?php echo __('Bold, underlined text') ?></span></strong></samp></p>
+		<p><?php echo $lang_help['Nested tags info'] ?></p>
+		<p><code>[b][u]<?php echo $lang_help['Bold, underlined text'] ?>[/u][/b]</code> <?php echo $lang_help['produces'] ?> <samp><strong><span class="bbu"><?php echo $lang_help['Bold, underlined text'] ?></span></strong></samp></p>
 	</div>
 </div>
-<h2><span><?php echo __('Smilies') ?></span></h2>
+<h2><span><?php echo $lang_help['Smilies'] ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="smilies"></a><?php echo __('Smilies info') ?></p>
+		<p><a name="smilies"></a><?php echo $lang_help['Smilies info'] ?></p>
 <?php
 
 // Display the smiley set
@@ -133,7 +133,7 @@
 }
 
 foreach ($smiley_groups as $smiley_img => $smiley_texts) {
-    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
+    echo "\t\t<p><code>". implode('</code> ' .$lang_common['and']. ' <code>', $smiley_texts).'</code> <span>' .$lang_help['produces']. '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
 }
 
 ?>
diff --git a/view/index.php b/view/index.php
index d9d5ca64..1ffce864 100644
--- a/view/index.php
+++ b/view/index.php
@@ -13,7 +13,7 @@
 }
 
 if (empty($index_data)): ?>
-    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php echo __('Empty board') ?></p></div></div></div>
+    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php echo $lang_index['Empty board'] ?></p></div></div></div>
 <?php endif;
 foreach ($index_data as $forum) {
     if ($forum->cid != $cur_cat) :
@@ -33,10 +33,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Forum') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Topics') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
+					<th class="tcl" scope="col"><?php echo $lang_common['Forum'] ?></th>
+					<th class="tc2" scope="col"><?php echo $lang_index['Topics'] ?></th>
+					<th class="tc3" scope="col"><?php echo $lang_common['Posts'] ?></th>
+					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -80,27 +80,27 @@
 endif;
 ?>
 <div id="brdstats" class="block">
-	<h2><span><?php echo __('Board info') ?></span></h2>
+	<h2><span><?php echo $lang_index['Board info'] ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<dl class="conr">
-				<dt><strong><?php echo __('Board stats') ?></strong></dt>
-				<dd><span><?php printf(__('No of users'), '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of topics'), '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of posts'), '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
+				<dt><strong><?php echo $lang_index['Board stats'] ?></strong></dt>
+				<dd><span><?php printf($lang_index['No of users'], '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf($lang_index['No of topics'], '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
+				<dd><span><?php printf($lang_index['No of posts'], '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
 			</dl>
 			<dl class="conl">
-				<dt><strong><?php echo __('User info') ?></strong></dt>
-				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
+				<dt><strong><?php echo $lang_index['User info'] ?></strong></dt>
+				<dd><span><?php printf($lang_index['Newest user'], $stats['newest_user']) ?></span></dd>
 				<?php if ($feather_config['o_users_online'] == 1) : ?>
-				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('Guests online'), '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
+				<dd><span><?php printf($lang_index['Users online'], '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf($lang_index['Guests online'], '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
 				<?php endif; ?>
 			</dl>
 			<?php
             if ($feather_config['o_users_online'] == 1) :
                 if ($online['num_users'] > 0) {
-                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
+                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.$lang_index['Online'].' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
                 } else {
                     echo "\t\t\t".'<div class="clearer"></div>'."\n";
                 }
diff --git a/view/login/form.php b/view/login/form.php
index fb8f2404..8d35d8b7 100644
--- a/view/login/form.php
+++ b/view/login/form.php
@@ -14,29 +14,29 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Login') ?></span></h2>
+	<h2><span><?php echo $lang_common['Login'] ?></span></h2>
 	<div class="box">
 		<form id="login" method="post" action="<?php echo get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Login legend') ?></legend>
+					<legend><?php echo $lang_login['Login legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="conl required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
-						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
+						<label class="conl required"><strong><?php echo $lang_common['Username'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
+						<label class="conl required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
 
 						<div class="rbox clearb">
-							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo __('Remember me') ?><br /></label>
+							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo $lang_login['Remember me'] ?><br /></label>
 						</div>
 
-						<p class="clearb"><?php echo __('Login info') ?></p>
-						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php echo __('Not registered') ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php echo __('Forgotten pass') ?></a></span></p>
+						<p class="clearb"><?php echo $lang_login['Login info'] ?></p>
+						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php echo $lang_login['Not registered'] ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php echo $lang_login['Forgotten pass'] ?></a></span></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="login" value="<?php echo __('Login') ?>" tabindex="4" /></p>
+			<p class="buttons"><input type="submit" name="login" value="<?php echo $lang_common['Login'] ?>" tabindex="4" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/login/password_forgotten.php b/view/login/password_forgotten.php
index 979b915c..2712f630 100644
--- a/view/login/password_forgotten.php
+++ b/view/login/password_forgotten.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo __('New password errors') ?></span></h2>
+	<h2><span><?php echo $lang_login['New password errors'] ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo __('New passworderrors info') ?></p>
+			<p><?php echo $lang_login['New passworderrors info'] ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,21 +37,21 @@
 }
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Request pass') ?></span></h2>
+	<h2><span><?php echo $lang_login['Request pass'] ?></span></h2>
 	<div class="box">
 		<form id="request_pass" method="post" action="<?php echo get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Request pass legend') ?></legend>
+					<legend><?php echo $lang_login['Request pass legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
-						<p><?php echo __('Request pass info') ?></p>
+						<label class="required"><strong><?php echo $lang_common['Email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
+						<p><?php echo $lang_login['Request pass info'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="request_pass" value="<?php echo __('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a><?php endif; ?></p>
+			<p class="buttons"><input type="submit" name="request_pass" value="<?php echo $lang_common['Submit'] ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a><?php endif; ?></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/message.php b/view/message.php
index d376bd09..7f26edad 100644
--- a/view/message.php
+++ b/view/message.php
@@ -14,11 +14,11 @@
 
 ?>
 <div id="msg" class="block">
-	<h2><span><?php echo __('Info') ?></span></h2>
+	<h2><span><?php echo $lang_common['Info'] ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<p><?php echo $message ?></p>
-<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php echo __('Go back') ?></a></p>
+<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 <?php endif;
     ?>		</div>
 	</div>
diff --git a/view/misc/email.php b/view/misc/email.php
index 7004040d..054c7f34 100644
--- a/view/misc/email.php
+++ b/view/misc/email.php
@@ -14,24 +14,24 @@
 
 ?>
 <div id="emailform" class="blockform">
-	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
+	<h2><span><?php echo $lang_misc['Send email to'] ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="<?php echo get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write email') ?></legend>
+					<legend><?php echo $lang_misc['Write email'] ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo __('Email disclosure note') ?></p>
+						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/misc/report.php b/view/misc/report.php
index 121feac2..6cf01c90 100644
--- a/view/misc/report.php
+++ b/view/misc/report.php
@@ -16,29 +16,29 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Report post') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo $lang_misc['Report post'] ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div id="reportform" class="blockform">
-	<h2><span><?php echo __('Report post') ?></span></h2>
+	<h2><span><?php echo $lang_misc['Report post'] ?></span></h2>
 	<div class="box">
 		<form id="report" method="post" action="<?php echo get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Reason desc') ?></legend>
+					<legend><?php echo $lang_misc['Reason desc'] ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('Reason') ?> <span><?php echo __('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
+						<label class="required"><strong><?php echo $lang_misc['Reason'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/misc/rules.php b/view/misc/rules.php
index d32a805e..00cff256 100644
--- a/view/misc/rules.php
+++ b/view/misc/rules.php
@@ -14,7 +14,7 @@
 
 ?>
 <div id="rules" class="block">
-	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
+	<div class="hd"><h2><span><?php echo $lang_register['Forum rules'] ?></span></h2></div>
 	<div class="box">
 		<div id="rules-block" class="inbox">
 			<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
diff --git a/view/moderate/delete_posts.php b/view/moderate/delete_posts.php
index 4b95a5f1..d3a8ea76 100644
--- a/view/moderate/delete_posts.php
+++ b/view/moderate/delete_posts.php
@@ -14,20 +14,20 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Delete posts') ?></span></h2>
+	<h2><span><?php echo $lang_misc['Delete posts'] ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm delete legend') ?></legend>
+					<legend><?php echo $lang_misc['Confirm delete legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<p><?php echo __('Delete posts comply') ?></p>
+						<p><?php echo $lang_misc['Delete posts comply'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/delete_topics.php b/view/moderate/delete_topics.php
index e414f734..d18c7394 100644
--- a/view/moderate/delete_topics.php
+++ b/view/moderate/delete_topics.php
@@ -15,20 +15,20 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('Delete topics') ?></span></h2>
+	<h2><span><?php echo $lang_misc['Delete topics'] ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm delete legend') ?></legend>
+					<legend><?php echo $lang_misc['Confirm delete legend'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Delete topics comply') ?></p>
+						<p><?php echo $lang_misc['Delete topics comply'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo $lang_misc['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/merge_topics.php b/view/moderate/merge_topics.php
index b55f586b..1c5cc5a4 100644
--- a/view/moderate/merge_topics.php
+++ b/view/moderate/merge_topics.php
@@ -15,22 +15,22 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('Merge topics') ?></span></h2>
+	<h2><span><?php echo $lang_misc['Merge topics'] ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm merge legend') ?></legend>
+					<legend><?php echo $lang_misc['Confirm merge legend'] ?></legend>
 					<div class="infldset">
 						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1" /><?php echo __('Leave redirect') ?><br /></label>
+							<label><input type="checkbox" name="with_redirect" value="1" /><?php echo $lang_misc['Leave redirect'] ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo __('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo $lang_misc['Merge'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
index bf893ce4..af90498d 100644
--- a/view/moderate/moderator_forum.php
+++ b/view/moderate/moderator_forum.php
@@ -17,9 +17,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -38,11 +38,11 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
-<?php endif; ?>					<th class="tcr"><?php echo __('Last post') ?></th>
-					<th class="tcmod" scope="col"><?php echo __('Select') ?></th>
+					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
+					<th class="tc2" scope="col"><?php echo $lang_common['Replies'] ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
+<?php endif; ?>					<th class="tcr"><?php echo $lang_common['Last post'] ?></th>
+					<th class="tcmod" scope="col"><?php echo $lang_misc['Select'] ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -74,7 +74,7 @@
             if (empty($topic_data)):
                 $colspan = ($feather_config['o_topic_views'] == '1') ? 5 : 4;
                 $button_status = ' disabled="disabled"';
-                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
+                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.$lang_forum['Empty forum'].'</td></tr>'."\n";
             endif;
             ?>
 			</tbody>
@@ -87,13 +87,13 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php echo __('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php echo __('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php echo __('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php echo __('Close') ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php echo $lang_misc['Move'] ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php echo $lang_misc['Delete'] ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php echo $lang_misc['Merge'] ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php echo $lang_misc['Open'] ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php echo $lang_misc['Close'] ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/moderate/move_topics.php b/view/moderate/move_topics.php
index 389f1f05..8dfedeaf 100644
--- a/view/moderate/move_topics.php
+++ b/view/moderate/move_topics.php
@@ -15,16 +15,16 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo($action == 'single') ? __('Move topic') : __('Move topics') ?></span></h2>
+	<h2><span><?php echo($action == 'single') ? $lang_misc['Move topic'] : $lang_misc['Move topics'] ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 			<input type="hidden" name="topics" value="<?php echo $topics ?>" />
 				<fieldset>
-					<legend><?php echo __('Move legend') ?></legend>
+					<legend><?php echo $lang_misc['Move legend'] ?></legend>
 					<div class="infldset">
-						<label><?php echo __('Move to') ?>
+						<label><?php echo $lang_misc['Move to'] ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
@@ -33,12 +33,12 @@
 						<div class="rbox">
 							<label><input type="checkbox" name="with_redirect" value="1"<?php if ($action == 'single') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Leave redirect') ?><br /></label>
+} ?> /><?php echo $lang_misc['Leave redirect'] ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo __('Move') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo $lang_misc['Move'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/posts_view.php b/view/moderate/posts_view.php
index f957ce8f..87d23e24 100644
--- a/view/moderate/posts_view.php
+++ b/view/moderate/posts_view.php
@@ -16,10 +16,10 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -53,11 +53,11 @@
 						</dl>
 					</div>
 					<div class="postright">
-						<h3 class="nosize"><?php echo __('Message') ?></h3>
+						<h3 class="nosize"><?php echo $lang_common['Message'] ?></h3>
 						<div class="postmsg">
 							<?php echo $post['message']."\n" ?>
 	<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.$lang_topic['Last edit'].' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 						</div>
@@ -66,7 +66,7 @@
 			</div>
 			<div class="inbox">
 				<div class="postfoot clearb">
-					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.__('Select').'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.__('Cannot select first').'</p>' ?></div>
+					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.$lang_misc['Select'].'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.$lang_misc['Cannot select first'].'</p>' ?></div>
 				</div>
 			</div>
 		</div>
@@ -80,14 +80,14 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php echo __('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php echo $lang_misc['Split'] ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php echo $lang_misc['Delete'] ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php echo $lang_misc['Moderate'] ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/moderate/split_posts.php b/view/moderate/split_posts.php
index ac012ff3..f3f5d88e 100644
--- a/view/moderate/split_posts.php
+++ b/view/moderate/split_posts.php
@@ -14,27 +14,27 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Split posts') ?></span></h2>
+	<h2><span><?php echo $lang_misc['Split posts'] ?></span></h2>
 	<div class="box">
 		<form id="subject" method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm split legend') ?></legend>
+					<legend><?php echo $lang_misc['Confirm split legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<label class="required"><strong><?php echo __('New subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
-						<label><?php echo __('Move to') ?>
+						<label class="required"><strong><?php echo $lang_misc['New subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
+						<label><?php echo $lang_misc['Move to'] ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
 						</select>
 						<br /></label>
-						<p><?php echo __('Split posts comply') ?></p>
+						<p><?php echo $lang_misc['Split posts comply'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo __('Split') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo $lang_misc['Split'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/post.php b/view/post.php
index 0c341fd0..7bdfc449 100644
--- a/view/post.php
+++ b/view/post.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
@@ -33,10 +33,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo __('Post errors') ?></span></h2>
+	<h2><span><?php echo $lang_post['Post errors'] ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo __('Post errors info') ?></p>
+			<p><?php echo $lang_post['Post errors info'] ?></p>
 			<ul class="error-list">
 <?php
 
@@ -57,7 +57,7 @@
 
     ?>
 <div id="postpreview" class="blockpost">
-	<h2><span><?php echo __('Post preview') ?></span></h2>
+	<h2><span><?php echo $lang_post['Post preview'] ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -80,7 +80,6 @@
 
 ?>
 <!-- Init BBcode editor toolbar -->
-<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
@@ -93,16 +92,16 @@
 		<?php echo $form."\n" ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write message legend') ?></legend>
+					<legend><?php echo $lang_common['Write message legend'] ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
                                                 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if ($feather->user->is_guest) {
-    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong>' : $lang_common['Email'];
     $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
-						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
+						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
     echo feather_escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
@@ -115,17 +114,17 @@
 
 }
 if ($fid): ?>
-						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
+						<label class="required"><strong><?php echo $lang_common['Subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
     echo feather_escape($post['subject']);
 } ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -135,7 +134,7 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Options') ?></legend>
+					<legend><?php echo $lang_common['Options'] ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
@@ -151,14 +150,14 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Robot title') ?></legend>
+					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Robot info')    ?></p>
+						<p><?php echo $lang_antispam['Robot info']    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
                              $qencoded = md5($question[$index_questions]);
-                             echo sprintf(__('Robot question'), $question[$index_questions]);?>
-							 <span><?php echo __('Required') ?></span></strong>
+                             echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);?>
+							 <span><?php echo $lang_common['Required'] ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -166,7 +165,7 @@
 				</fieldset>
 			</div>
 			<?php endif; ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_post['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
@@ -176,7 +175,7 @@
 if ($tid && $feather_config['o_topic_review'] != '0') :
 ?>
 <div id="postreview">
-	<h2><span><?php echo __('Topic review') ?></span></h2>
+	<h2><span><?php echo $lang_post['Topic review'] ?></span></h2>
 
 	<?php
     // Set background switching on
diff --git a/view/profile/change_mail.php b/view/profile/change_mail.php
index de0f8d3b..68ae0012 100644
--- a/view/profile/change_mail.php
+++ b/view/profile/change_mail.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Change email') ?></span></h2>
+	<h2><span><?php echo $lang_profile['Change email'] ?></span></h2>
 	<div class="box">
 		<form id="change_email" method="post" action="<?php echo get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Email legend') ?></legend>
+					<legend><?php echo $lang_profile['Email legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('New email') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
-						<label class="required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
-						<p><?php echo __('Email instructions') ?></p>
+						<label class="required"><strong><?php echo $lang_profile['New email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
+						<label class="required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
+						<p><?php echo $lang_profile['Email instructions'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="new_email" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="new_email" value="<?php echo $lang_common['Submit'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/change_pass.php b/view/profile/change_pass.php
index 0f0ab452..0231efa2 100644
--- a/view/profile/change_pass.php
+++ b/view/profile/change_pass.php
@@ -14,26 +14,26 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Change pass') ?></span></h2>
+	<h2><span><?php echo $lang_profile['Change pass'] ?></span></h2>
 	<div class="box">
 		<form id="change_pass" method="post" action="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
 				<fieldset>
-					<legend><?php echo __('Change pass legend') ?></legend>
+					<legend><?php echo $lang_profile['Change pass legend'] ?></legend>
 					<div class="infldset">
-<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo __('Old pass') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo $lang_profile['Old pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<input type="password" name="req_old_password" size="16" /><br /></label>
-<?php endif; ?>						<label class="conl required"><strong><?php echo __('New pass') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php endif; ?>						<label class="conl required"><strong><?php echo $lang_profile['New pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<input type="password" name="req_new_password1" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo __('Confirm new pass') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="conl required"><strong><?php echo $lang_profile['Confirm new pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<input type="password" name="req_new_password2" size="16" /><br /></label>
-						<p class="clearb"><?php echo __('Pass info') ?></p>
+						<p class="clearb"><?php echo $lang_profile['Pass info'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/delete_user.php b/view/profile/delete_user.php
index d5d5bde2..55c707c5 100644
--- a/view/profile/delete_user.php
+++ b/view/profile/delete_user.php
@@ -14,23 +14,23 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Confirm delete user') ?></span></h2>
+	<h2><span><?php echo $lang_profile['Confirm delete user'] ?></span></h2>
 	<div class="box">
 		<form id="confirm_del_user" method="post" action="<?php echo get_link('user/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm delete legend') ?></legend>
+					<legend><?php echo $lang_profile['Confirm delete legend'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Confirmation info').' <strong>'.feather_escape($username).'</strong>.' ?></p>
+						<p><?php echo $lang_profile['Confirmation info'].' <strong>'.feather_escape($username).'</strong>.' ?></p>
 						<div class="rbox">
-							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo __('Delete posts') ?><br /></label>
+							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo $lang_profile['Delete posts'] ?><br /></label>
 						</div>
-						<p class="warntext"><strong><?php echo __('Delete warning') ?></strong></p>
+						<p class="warntext"><strong><?php echo $lang_profile['Delete warning'] ?></strong></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo $lang_profile['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/menu.php b/view/profile/menu.php
index e78d2c30..bcf803e1 100644
--- a/view/profile/menu.php
+++ b/view/profile/menu.php
@@ -15,39 +15,39 @@
 ?>
 <div id="profile" class="block2col">
 	<div class="blockmenu">
-		<h2><span><?php echo __('Profile menu') ?></span></h2>
+		<h2><span><?php echo $lang_profile['Profile menu'] ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'essentials') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php echo __('Section essentials') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php echo $lang_profile['Section essentials'] ?></a></li>
 					<li<?php if ($page == 'personal') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php echo __('Section personal') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php echo $lang_profile['Section personal'] ?></a></li>
 					<li<?php if ($page == 'messaging') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php echo __('Section messaging') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php echo $lang_profile['Section messaging'] ?></a></li>
 <?php if ($feather_config['o_avatars'] == '1' || $feather_config['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php echo __('Section personality') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php echo $lang_profile['Section personality'] ?></a></li>
 <?php endif;
     ?>					<li<?php if ($page == 'display') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php echo __('Section display') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php echo $lang_profile['Section display'] ?></a></li>
 					<li<?php if ($page == 'privacy') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php echo __('Section privacy') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php echo $lang_profile['Section privacy'] ?></a></li>
 <?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php echo __('Section admin') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php echo $lang_profile['Section admin'] ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
diff --git a/view/profile/section_admin.php b/view/profile/section_admin.php
index 52a0ad54..16b4f80a 100644
--- a/view/profile/section_admin.php
+++ b/view/profile/section_admin.php
@@ -14,7 +14,7 @@
 
 ?>
 	<div class="blockform">
-		<h2><span><?php echo feather_escape($user['username']).' - '.__('Section admin') ?></span></h2>
+		<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section admin'] ?></span></h2>
 		<div class="box">
 			<form id="profile7" method="post" action="<?php echo get_link('user/'.$id.'/section/admin/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -25,9 +25,9 @@
 
         if ($feather->user->g_moderator == '1') {
             ?>
-						<legend><?php echo __('Delete ban legend') ?></legend>
+						<legend><?php echo $lang_profile['Delete ban legend'] ?></legend>
 						<div class="infldset">
-							<p><input type="submit" name="ban" value="<?php echo __('Ban user') ?>" /></p>
+							<p><input type="submit" name="ban" value="<?php echo $lang_profile['Ban user'] ?>" /></p>
 						</div>
 					</fieldset>
 				</div>
@@ -36,12 +36,12 @@
         } else {
             if ($feather->user->id != $id) {
                 ?>
-						<legend><?php echo __('Group membership legend') ?></legend>
+						<legend><?php echo $lang_profile['Group membership legend'] ?></legend>
 						<div class="infldset">
 							<select id="group_id" name="group_id">
                                                             <?php echo $group_list ?>
 							</select>
-							<input type="submit" name="update_group_membership" value="<?php echo __('Save') ?>" />
+							<input type="submit" name="update_group_membership" value="<?php echo $lang_profile['Save'] ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -52,9 +52,9 @@
             }
 
             ?>
-						<legend><?php echo __('Delete ban legend') ?></legend>
+						<legend><?php echo $lang_profile['Delete ban legend'] ?></legend>
 						<div class="infldset">
-							<input type="submit" name="delete_user" value="<?php echo __('Delete user') ?>" /> <input type="submit" name="ban" value="<?php echo __('Ban user') ?>" />
+							<input type="submit" name="delete_user" value="<?php echo $lang_profile['Delete user'] ?>" /> <input type="submit" name="ban" value="<?php echo $lang_profile['Ban user'] ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -64,13 +64,13 @@
                 ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Set mods legend') ?></legend>
+						<legend><?php echo $lang_profile['Set mods legend'] ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Moderator in info') ?></p>
+							<p><?php echo $lang_profile['Moderator in info'] ?></p>
                                                         <?php echo $forum_list ?>
 								</div>
 							</div>
-							<br class="clearb" /><input type="submit" name="update_forums" value="<?php echo __('Update forums') ?>" />
+							<br class="clearb" /><input type="submit" name="update_forums" value="<?php echo $lang_profile['Update forums'] ?>" />
 						</div>
 					</fieldset>
 				</div>
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
index 506dd146..8ac8fd27 100644
--- a/view/profile/section_display.php
+++ b/view/profile/section_display.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section display') ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section display'] ?></span></h2>
 	<div class="box">
 		<form id="profile5" method="post" action="<?php echo get_link('user/'.$id.'/section/display/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -30,9 +30,9 @@
         ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Style legend') ?></legend>
+					<legend><?php echo $lang_profile['Style legend'] ?></legend>
 					<div class="infldset">
-						<label><?php echo __('Styles') ?><br />
+						<label><?php echo $lang_profile['Styles'] ?><br />
 						<select name="form_style">
 <?php
 
@@ -58,25 +58,25 @@
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1' || $feather_config['o_signatures'] == '1' || $feather_config['o_avatars'] == '1' || ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1')): ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Post display legend') ?></legend>
+					<legend><?php echo $lang_profile['Post display legend'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Post display info') ?></p>
+						<p><?php echo $lang_profile['Post display info'] ?></p>
 						<div class="rbox">
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show smilies') ?><br /></label>
+} ?> /><?php echo $lang_profile['Show smilies'] ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show sigs') ?><br /></label>
+} ?> /><?php echo $lang_profile['Show sigs'] ?><br /></label>
 <?php endif; if ($feather_config['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show avatars') ?><br /></label>
+} ?> /><?php echo $lang_profile['Show avatars'] ?><br /></label>
 <?php endif; if ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show images') ?><br /></label>
+} ?> /><?php echo $lang_profile['Show images'] ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1' && $feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show images sigs') ?><br /></label>
+} ?> /><?php echo $lang_profile['Show images sigs'] ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
@@ -85,15 +85,15 @@
 <?php endif; ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Pagination legend') ?></legend>
+					<legend><?php echo $lang_profile['Pagination legend'] ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo __('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
-						<label class="conl"><?php echo __('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
-						<p class="clearb"><?php echo __('Paginate info') ?> <?php echo __('Leave blank') ?></p>
+						<label class="conl"><?php echo $lang_profile['Topics per page'] ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
+						<label class="conl"><?php echo $lang_profile['Posts per page'] ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
+						<p class="clearb"><?php echo $lang_profile['Paginate info'] ?> <?php echo $lang_profile['Leave blank'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_essentials.php b/view/profile/section_essentials.php
index 4f507a8c..25deccf6 100644
--- a/view/profile/section_essentials.php
+++ b/view/profile/section_essentials.php
@@ -14,23 +14,23 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section essentials') ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section essentials'] ?></span></h2>
 	<div class="box">
 		<form id="profile1" method="post" action="<?php echo get_link('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Username and pass legend') ?></legend>
+					<legend><?php echo $lang_profile['Username and pass legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php echo __('Change pass') ?></a></span></p>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php echo $lang_profile['Change pass'] ?></a></span></p>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Email legend') ?></legend>
+					<legend><?php echo $lang_prof_reg['Email legend'] ?></legend>
 					<div class="infldset">
 						<?php echo $user_disp['email_field'] ?>
 					</div>
@@ -38,139 +38,139 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Localisation legend') ?></legend>
+					<legend><?php echo $lang_prof_reg['Localisation legend'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Time zone info') ?></p>
-						<label><?php echo __('Time zone')."\n" ?>
+						<p><?php echo $lang_prof_reg['Time zone info'] ?></p>
+						<label><?php echo $lang_prof_reg['Time zone']."\n" ?>
 						<br /><select name="form_timezone">
 							<option value="-12"<?php if ($user['timezone'] == -12) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-12:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-12:00'] ?></option>
 							<option value="-11"<?php if ($user['timezone'] == -11) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-11:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-11:00'] ?></option>
 							<option value="-10"<?php if ($user['timezone'] == -10) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-10:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-10:00'] ?></option>
 							<option value="-9.5"<?php if ($user['timezone'] == -9.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-09:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-09:30'] ?></option>
 							<option value="-9"<?php if ($user['timezone'] == -9) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-09:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-09:00'] ?></option>
 							<option value="-8.5"<?php if ($user['timezone'] == -8.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-08:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-08:30'] ?></option>
 							<option value="-8"<?php if ($user['timezone'] == -8) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-08:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-08:00'] ?></option>
 							<option value="-7"<?php if ($user['timezone'] == -7) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-07:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-07:00'] ?></option>
 							<option value="-6"<?php if ($user['timezone'] == -6) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-06:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-06:00'] ?></option>
 							<option value="-5"<?php if ($user['timezone'] == -5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-05:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-05:00'] ?></option>
 							<option value="-4"<?php if ($user['timezone'] == -4) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-04:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-04:00'] ?></option>
 							<option value="-3.5"<?php if ($user['timezone'] == -3.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-03:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-03:30'] ?></option>
 							<option value="-3"<?php if ($user['timezone'] == -3) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-03:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-03:00'] ?></option>
 							<option value="-2"<?php if ($user['timezone'] == -2) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-02:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-02:00'] ?></option>
 							<option value="-1"<?php if ($user['timezone'] == -1) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-01:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC-01:00'] ?></option>
 							<option value="0"<?php if ($user['timezone'] == 0) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC'] ?></option>
 							<option value="1"<?php if ($user['timezone'] == 1) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+01:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+01:00'] ?></option>
 							<option value="2"<?php if ($user['timezone'] == 2) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+02:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+02:00'] ?></option>
 							<option value="3"<?php if ($user['timezone'] == 3) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+03:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+03:00'] ?></option>
 							<option value="3.5"<?php if ($user['timezone'] == 3.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+03:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+03:30'] ?></option>
 							<option value="4"<?php if ($user['timezone'] == 4) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+04:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+04:00'] ?></option>
 							<option value="4.5"<?php if ($user['timezone'] == 4.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+04:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+04:30'] ?></option>
 							<option value="5"<?php if ($user['timezone'] == 5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+05:00'] ?></option>
 							<option value="5.5"<?php if ($user['timezone'] == 5.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+05:30'] ?></option>
 							<option value="5.75"<?php if ($user['timezone'] == 5.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:45') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+05:45'] ?></option>
 							<option value="6"<?php if ($user['timezone'] == 6) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+06:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+06:00'] ?></option>
 							<option value="6.5"<?php if ($user['timezone'] == 6.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+06:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+06:30'] ?></option>
 							<option value="7"<?php if ($user['timezone'] == 7) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+07:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+07:00'] ?></option>
 							<option value="8"<?php if ($user['timezone'] == 8) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+08:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+08:00'] ?></option>
 							<option value="8.75"<?php if ($user['timezone'] == 8.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+08:45') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+08:45'] ?></option>
 							<option value="9"<?php if ($user['timezone'] == 9) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+09:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+09:00'] ?></option>
 							<option value="9.5"<?php if ($user['timezone'] == 9.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+09:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+09:30'] ?></option>
 							<option value="10"<?php if ($user['timezone'] == 10) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+10:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+10:00'] ?></option>
 							<option value="10.5"<?php if ($user['timezone'] == 10.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+10:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+10:30'] ?></option>
 							<option value="11"<?php if ($user['timezone'] == 11) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+11:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+11:00'] ?></option>
 							<option value="11.5"<?php if ($user['timezone'] == 11.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+11:30') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+11:30'] ?></option>
 							<option value="12"<?php if ($user['timezone'] == 12) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+12:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+12:00'] ?></option>
 							<option value="12.75"<?php if ($user['timezone'] == 12.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+12:45') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+12:45'] ?></option>
 							<option value="13"<?php if ($user['timezone'] == 13) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+13:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+13:00'] ?></option>
 							<option value="14"<?php if ($user['timezone'] == 14) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+14:00') ?></option>
+} ?>><?php echo $lang_prof_reg['UTC+14:00'] ?></option>
 						</select>
 						<br /></label>
 						<div class="rbox">
 							<label><input type="checkbox" name="form_dst" value="1"<?php if ($user['dst'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('DST') ?><br /></label>
+} ?> /><?php echo $lang_prof_reg['DST'] ?><br /></label>
 						</div>
-						<label><?php echo __('Time format') ?>
+						<label><?php echo $lang_prof_reg['Time format'] ?>
 
 						<br /><select name="form_time_format">
 <?php
@@ -181,14 +181,14 @@
                                 }
                                 echo '>'. format_time(time(), false, null, $time_format, true, true);
                                 if ($key == 0) {
-                                    echo ' ('.__('Default').')';
+                                    echo ' ('.$lang_prof_reg['Default'].')';
                                 }
                                 echo "</option>\n";
                             }
                             ?>
 						</select>
 						<br /></label>
-						<label><?php echo __('Date format') ?>
+						<label><?php echo $lang_prof_reg['Date format'] ?>
 
 						<br /><select name="form_date_format">
 <?php
@@ -199,7 +199,7 @@
                                 }
                                 echo '>'. format_time(time(), true, $date_format, null, false, true);
                                 if ($key == 0) {
-                                    echo ' ('.__('Default').')';
+                                    echo ' ('.$lang_prof_reg['Default'].')';
                                 }
                                 echo "</option>\n";
                             }
@@ -214,7 +214,7 @@
     // Only display the language selection box if there's more than one language available
     if (count($languages) > 1) {
         ?>
-						<label><?php echo __('Language') ?>
+						<label><?php echo $lang_prof_reg['Language'] ?>
 						<br /><select name="form_language">
 <?php
 
@@ -239,18 +239,18 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('User activity') ?></legend>
+					<legend><?php echo $lang_profile['User activity'] ?></legend>
 					<div class="infldset">
-						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
-						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
-						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
+						<p><?php printf($lang_profile['Registered info'], format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf($lang_profile['Last post info'], format_time($user['last_post'])) ?></p>
+						<p><?php printf($lang_profile['Last visit info'], format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
-<?php if ($feather->user->is_admmod): ?>							<label><?php echo __('Admin note') ?><br />
+<?php if ($feather->user->is_admmod): ?>							<label><?php echo $lang_profile['Admin note'] ?><br />
 						<input id="admin_note" type="text" name="admin_note" value="<?php echo feather_escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_messaging.php b/view/profile/section_messaging.php
index 148a78cf..3a5be1a2 100644
--- a/view/profile/section_messaging.php
+++ b/view/profile/section_messaging.php
@@ -14,24 +14,24 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section messaging') ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section messaging'] ?></span></h2>
 	<div class="box">
 		<form id="profile3" method="post" action="<?php echo get_link('user/'.$id.'/section/messaging/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Contact details legend') ?></legend>
+					<legend><?php echo $lang_profile['Contact details legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo __('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
-						<label><?php echo __('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php echo __('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php echo __('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php echo __('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php echo $lang_profile['Jabber'] ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
+						<label><?php echo $lang_profile['ICQ'] ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
+						<label><?php echo $lang_profile['MSN'] ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
+						<label><?php echo $lang_profile['AOL IM'] ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php echo $lang_profile['Yahoo'] ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_personal.php b/view/profile/section_personal.php
index 7358bc85..3accb5f7 100644
--- a/view/profile/section_personal.php
+++ b/view/profile/section_personal.php
@@ -14,24 +14,24 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personal') ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section personal'] ?></span></h2>
 	<div class="box">
 		<form id="profile2" method="post" action="<?php echo get_link('user/'.$id.'/section/personal/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Personal details legend') ?></legend>
+					<legend><?php echo $lang_profile['Personal details legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo __('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
+						<label><?php echo $lang_profile['Realname'] ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
 <?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php echo __('Location') ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php echo __('Website') ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>							<label><?php echo $lang_profile['Location'] ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php echo $lang_profile['Website'] ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_personality.php b/view/profile/section_personality.php
index 9bd9440b..d3e67cd6 100644
--- a/view/profile/section_personality.php
+++ b/view/profile/section_personality.php
@@ -14,41 +14,41 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personality') ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section personality'] ?></span></h2>
 	<div class="box">
 		<form id="profile4" method="post" action="<?php echo get_link('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php if ($feather_config['o_avatars'] == '1'): ?>				<div class="inform">
 				<fieldset id="profileavatar">
-					<legend><?php echo __('Avatar legend') ?></legend>
+					<legend><?php echo $lang_profile['Avatar legend'] ?></legend>
 					<div class="infldset">
 <?php if ($user_avatar): ?>							<div class="useravatar"><?php echo $user_avatar ?></div>
-<?php endif; ?>							<p><?php echo __('Avatar info') ?></p>
+<?php endif; ?>							<p><?php echo $lang_profile['Avatar info'] ?></p>
 						<p class="clearb actions"><?php echo $avatar_field ?></p>
 					</div>
 				</fieldset>
 			</div>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Signature legend') ?></legend>
+					<legend><?php echo $lang_profile['Signature legend'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Signature info') ?></p>
+						<p><?php echo $lang_profile['Signature info'] ?></p>
 						<div class="txtarea">
-							<label><?php printf(__('Sig max size'), forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
+							<label><?php printf($lang_profile['Sig max size'], forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_privacy.php b/view/profile/section_privacy.php
index 6c1ab357..34715516 100644
--- a/view/profile/section_privacy.php
+++ b/view/profile/section_privacy.php
@@ -14,47 +14,47 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section privacy') ?></span></h2>
+	<h2><span><?php echo feather_escape($user['username']).' - '.$lang_profile['Section privacy'] ?></span></h2>
 	<div class="box">
 		<form id="profile6" method="post" action="<?php echo get_link('user/'.$id.'/section/privacy/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Privacy options legend') ?></legend>
+					<legend><?php echo $lang_prof_reg['Privacy options legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<p><?php echo __('Email setting info') ?></p>
+						<p><?php echo $lang_prof_reg['Email setting info'] ?></p>
 						<div class="rbox">
 							<label><input type="radio" name="form_email_setting" value="0"<?php if ($user['email_setting'] == '0') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Email setting 1') ?><br /></label>
+} ?> /><?php echo $lang_prof_reg['Email setting 1'] ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="1"<?php if ($user['email_setting'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Email setting 2') ?><br /></label>
+} ?> /><?php echo $lang_prof_reg['Email setting 2'] ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="2"<?php if ($user['email_setting'] == '2') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Email setting 3') ?><br /></label>
+} ?> /><?php echo $lang_prof_reg['Email setting 3'] ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
 <?php if ($feather_config['o_forum_subscriptions'] == '1' || $feather_config['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Subscription legend') ?></legend>
+					<legend><?php echo $lang_profile['Subscription legend'] ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Notify full') ?><br /></label>
+} ?> /><?php echo $lang_profile['Notify full'] ?><br /></label>
 <?php if ($feather_config['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Auto notify full') ?><br /></label>
+} ?> /><?php echo $lang_profile['Auto notify full'] ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo $lang_common['Submit'] ?>" /> <?php echo $lang_profile['Instructions'] ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
index 3f74f092..60487560 100644
--- a/view/profile/upload_avatar.php
+++ b/view/profile/upload_avatar.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Upload avatar') ?></span></h2>
+	<h2><span><?php echo $lang_profile['Upload avatar'] ?></span></h2>
 	<div class="box">
 		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Upload avatar legend') ?></legend>
+					<legend><?php echo $lang_profile['Upload avatar legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-						<label class="required"><strong><?php echo __('File') ?> <span><?php echo __('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php echo __('Avatar desc').' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.__('bytes').' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
+						<label class="required"><strong><?php echo $lang_profile['File'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
+						<p><?php echo $lang_profile['Avatar desc'].' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.$lang_profile['pixels'].' '.$lang_common['and'].' '.forum_number_format($feather_config['o_avatars_size']).' '.$lang_profile['bytes'].' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="upload" value="<?php echo __('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="upload" value="<?php echo $lang_profile['Upload'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/view_profile.php b/view/profile/view_profile.php
index ad1c5959..da66b788 100644
--- a/view/profile/view_profile.php
+++ b/view/profile/view_profile.php
@@ -14,12 +14,12 @@
 
 ?>
 <div id="viewprofile" class="block">
-	<h2><span><?php echo __('Profile') ?></span></h2>
+	<h2><span><?php echo $lang_common['Profile'] ?></span></h2>
 	<div class="box">
 		<div class="fakeform">
 			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('Section personal') ?></legend>
+				<legend><?php echo $lang_profile['Section personal'] ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personal'])."\n" ?>
@@ -30,7 +30,7 @@
 			</div>
 <?php if (!empty($user_info['messaging'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('Section messaging') ?></legend>
+				<legend><?php echo $lang_profile['Section messaging'] ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['messaging'])."\n" ?>
@@ -41,7 +41,7 @@
 			</div>
 <?php endif; if (!empty($user_info['personality'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('Section personality') ?></legend>
+				<legend><?php echo $lang_profile['Section personality'] ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personality'])."\n" ?>
@@ -52,7 +52,7 @@
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('User activity') ?></legend>
+				<legend><?php echo $lang_profile['User activity'] ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['activity'])."\n" ?>
diff --git a/view/register/email.php b/view/register/email.php
index 9f9b3424..e6355cb6 100644
--- a/view/register/email.php
+++ b/view/register/email.php
@@ -15,25 +15,25 @@
 ?>
 
 <div id="emailform" class="blockform">
-	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($recipient) ?></span></h2>
+	<h2><span><?php echo $lang_misc['Send email to'] ?> <?php echo feather_escape($recipient) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write email') ?></legend>
+					<legend><?php echo $lang_misc['Write email'] ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email subject'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php echo $lang_misc['Email message'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo __('Email disclosure note') ?></p>
+						<p><?php echo $lang_misc['Email disclosure note'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo $lang_common['Go back'] ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/register/form.php b/view/register/form.php
index fa2d2457..3344af93 100644
--- a/view/register/form.php
+++ b/view/register/form.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo __('Registration errors') ?></span></h2>
+	<h2><span><?php echo $lang_register['Registration errors'] ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo __('Registration errors info') ?></p>
+			<p><?php echo $lang_register['Registration errors info'] ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,23 +37,23 @@
 }
 ?>
 <div id="regform" class="blockform">
-	<h2><span><?php echo __('Register') ?></span></h2>
+	<h2><span><?php echo $lang_register['Register'] ?></span></h2>
 	<div class="box">
 		<form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
 		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><?php echo __('Important information') ?></h3>
-					<p><?php echo __('Desc 1') ?></p>
-					<p><?php echo __('Desc 2') ?></p>
+					<h3><?php echo $lang_common['Important information'] ?></h3>
+					<p><?php echo $lang_register['Desc 1'] ?></p>
+					<p><?php echo $lang_register['Desc 2'] ?></p>
 				</div>
 				<fieldset>
-					<legend><?php echo __('Username legend') ?></legend>
+					<legend><?php echo $lang_register['Username legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="username" value="" />
 						<input type="hidden" name="password" value="" />
-						<label class="required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
+						<label class="required"><strong><?php echo $lang_common['Username'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
     echo feather_escape($feather->request->post('req_user'));
 } ?>" size="25" maxlength="25" /><br /></label>
 					</div>
@@ -61,28 +61,28 @@
 			</div>
 <?php if ($feather_config['o_regs_verify'] == '0'): ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Pass legend') ?></legend>
+					<legend><?php echo $lang_register['Pass legend'] ?></legend>
 					<div class="infldset">
-						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
+						<label class="conl required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
     echo feather_escape($feather->request->post('req_password1'));
 } ?>" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo __('Confirm pass') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
+						<label class="conl required"><strong><?php echo $lang_prof_reg['Confirm pass'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
     echo feather_escape($feather->request->post('req_password2'));
 } ?>" size="16" /><br /></label>
-						<p class="clearb"><?php echo __('Pass info') ?></p>
+						<p class="clearb"><?php echo $lang_register['Pass info'] ?></p>
 					</div>
 				</fieldset>
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
+					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? $lang_prof_reg['Email legend 2'] : $lang_prof_reg['Email legend'] ?></legend>
 					<div class="infldset">
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo __('Email info') ?></p>
-<?php endif; ?>						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo $lang_register['Email info'] ?></p>
+<?php endif; ?>						<label class="required"><strong><?php echo $lang_common['Email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
     echo feather_escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo __('Confirm email') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo $lang_register['Confirm email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
     echo feather_escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
@@ -95,9 +95,9 @@
             ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Localisation legend') ?></legend>
+					<legend><?php echo $lang_prof_reg['Localisation legend'] ?></legend>
 					<div class="infldset">
-							<label><?php echo __('Language') ?>
+							<label><?php echo $lang_prof_reg['Language'] ?>
 							<br /><select name="language">
 <?php
 
@@ -121,14 +121,14 @@
 ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Robot title') ?></legend>
+					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Robot info')    ?></p>
-						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php echo __('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
+						<p><?php echo $lang_antispam['Robot info']    ?></p>
+						<label class="required"><strong><?php echo sprintf($lang_antispam['Robot question'], $question[$index_questions]) ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="register" value="<?php echo __('Register') ?>" /></p>
+			<p class="buttons"><input type="submit" name="register" value="<?php echo $lang_register['Register'] ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/register/rules.php b/view/register/rules.php
index 3a2fd06c..d86c8c54 100644
--- a/view/register/rules.php
+++ b/view/register/rules.php
@@ -15,18 +15,18 @@
 ?>
 
 <div id="rules" class="blockform">
-	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
+	<div class="hd"><h2><span><?php echo $lang_register['Forum rules'] ?></span></h2></div>
 	<div class="box">
 		<form method="get" action="<?php echo get_link('register/') ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Rules legend') ?></legend>
+					<legend><?php echo $lang_register['Rules legend'] ?></legend>
 					<div class="infldset">
 						<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="agree" value="<?php echo __('Agree') ?>" /> <input type="submit" name="cancel" value="<?php echo __('Cancel') ?>" /></p>
+			<p class="buttons"><input type="submit" name="agree" value="<?php echo $lang_register['Agree'] ?>" /> <input type="submit" name="cancel" value="<?php echo $lang_register['Cancel'] ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/search/footer.php b/view/search/footer.php
index a64e1cdf..73ff5d13 100644
--- a/view/search/footer.php
+++ b/view/search/footer.php
@@ -30,7 +30,7 @@
 			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
diff --git a/view/search/form.php b/view/search/form.php
index bb39c614..642fb380 100644
--- a/view/search/form.php
+++ b/view/search/form.php
@@ -14,66 +14,66 @@
 ?>
 
 <div id="searchform" class="blockform">
-	<h2><span><?php echo __('Search') ?></span></h2>
+	<h2><span><?php echo $lang_search['Search'] ?></span></h2>
 	<div class="box">
 		<form id="search" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Search criteria legend') ?></legend>
+					<legend><?php echo $lang_search['Search criteria legend'] ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="action" value="search" />
-						<label class="conl"><?php echo __('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
-						<label class="conl"><?php echo __('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
-						<p class="clearb"><?php echo __('Search info') ?></p>
+						<label class="conl"><?php echo $lang_search['Keyword search'] ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
+						<label class="conl"><?php echo $lang_search['Author search'] ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
+						<p class="clearb"><?php echo $lang_search['Search info'] ?></p>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Search in legend') ?></legend>
+					<legend><?php echo $lang_search['Search in legend'] ?></legend>
 					<div class="infldset">
 					<?php echo $forums ?>
-						<label class="conl"><?php echo __('Search in')."\n" ?>
+						<label class="conl"><?php echo $lang_search['Search in']."\n" ?>
 						<br /><select id="search_in" name="search_in">
-							<option value="0"><?php echo __('Message and subject') ?></option>
-							<option value="1"><?php echo __('Message only') ?></option>
-							<option value="-1"><?php echo __('Topic only') ?></option>
+							<option value="0"><?php echo $lang_search['Message and subject'] ?></option>
+							<option value="1"><?php echo $lang_search['Message only'] ?></option>
+							<option value="-1"><?php echo $lang_search['Topic only'] ?></option>
 						</select>
 						<br /></label>
-						<p class="clearl"><?php echo __('Search in info') ?></p>
-<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
+						<p class="clearl"><?php echo $lang_search['Search in info'] ?></p>
+<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.$lang_search['Search multiple forums info'].'</p>' : '') ?>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Search results legend') ?></legend>
+					<legend><?php echo $lang_search['Search results legend'] ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo __('Sort by')."\n" ?>
+						<label class="conl"><?php echo $lang_search['Sort by']."\n" ?>
 						<br /><select name="sort_by">
-							<option value="0"><?php echo __('Sort by post time') ?></option>
-							<option value="1"><?php echo __('Sort by author') ?></option>
-							<option value="2"><?php echo __('Sort by subject') ?></option>
-							<option value="3"><?php echo __('Sort by forum') ?></option>
+							<option value="0"><?php echo $lang_search['Sort by post time'] ?></option>
+							<option value="1"><?php echo $lang_search['Sort by author'] ?></option>
+							<option value="2"><?php echo $lang_search['Sort by subject'] ?></option>
+							<option value="3"><?php echo $lang_search['Sort by forum'] ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Sort order')."\n" ?>
+						<label class="conl"><?php echo $lang_search['Sort order']."\n" ?>
 						<br /><select name="sort_dir">
-							<option value="DESC"><?php echo __('Descending') ?></option>
-							<option value="ASC"><?php echo __('Ascending') ?></option>
+							<option value="DESC"><?php echo $lang_search['Descending'] ?></option>
+							<option value="ASC"><?php echo $lang_search['Ascending'] ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Show as')."\n" ?>
+						<label class="conl"><?php echo $lang_search['Show as']."\n" ?>
 						<br /><select name="show_as">
-							<option value="topics"><?php echo __('Show as topics') ?></option>
-							<option value="posts"><?php echo __('Show as posts') ?></option>
+							<option value="topics"><?php echo $lang_search['Show as topics'] ?></option>
+							<option value="posts"><?php echo $lang_search['Show as posts'] ?></option>
 						</select>
 						<br /></label>
-						<p class="clearb"><?php echo __('Search results info') ?></p>
+						<p class="clearb"><?php echo $lang_search['Search results info'] ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/search/header.php b/view/search/header.php
index 909a2108..47706687 100644
--- a/view/search/header.php
+++ b/view/search/header.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
@@ -31,16 +31,16 @@
 if ($search['show_as'] == 'topics') :
 ?>
 <div id="vf" class="blocktable">
-	<h2><span><?php echo __('Search results') ?></span></h2>
+	<h2><span><?php echo $lang_search['Search results'] ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Forum') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Replies') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
+					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
+					<th class="tc2" scope="col"><?php echo $lang_common['Forum'] ?></th>
+					<th class="tc3" scope="col"><?php echo $lang_common['Replies'] ?></th>
+					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/view/search/posts.php b/view/search/posts.php
index 872c349e..a1247133 100644
--- a/view/search/posts.php
+++ b/view/search/posts.php
@@ -21,7 +21,7 @@
     echo ' '.$cur_search['item_status'];
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
-    echo __('Re').' ';
+    echo $lang_topic['Re'].' ';
 } ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
@@ -29,7 +29,7 @@
 			<div class="postleft">
 				<dl>
 					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php echo __('Replies').' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
+<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php echo $lang_topic['Replies'].' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
 <?php endif; ?>
 					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
 				</dl>
@@ -46,8 +46,8 @@
 		<div class="postfoot clearb">
 			<div class="postfootright">
 				<ul>
-					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo __('Go to topic') ?></a></span></li>
-					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo __('Go to post') ?></a></span></li>
+					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo $lang_search['Go to topic'] ?></a></span></li>
+					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $lang_search['Go to post'] ?></a></span></li>
 				</ul>
 			</div>
 		</div>
diff --git a/view/search/topics.php b/view/search/topics.php
index af843193..d60dce31 100644
--- a/view/search/topics.php
+++ b/view/search/topics.php
@@ -25,5 +25,5 @@
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
 	<td class="tc3"><?php echo forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
+	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.$lang_common['by'].' '.feather_escape($cur_search['last_poster']) ?></span></td>
 </tr>
\ No newline at end of file
diff --git a/view/userlist.php b/view/userlist.php
index 0bbedae6..66e2a20d 100644
--- a/view/userlist.php
+++ b/view/userlist.php
@@ -14,50 +14,50 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('User search') ?></span></h2>
+	<h2><span><?php echo $lang_search['User search'] ?></span></h2>
 	<div class="box">
 		<form id="userlist" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('User find legend') ?></legend>
+					<legend><?php echo $lang_ul['User find legend'] ?></legend>
 					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo __('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
-<?php endif; ?>						<label class="conl"><?php echo __('User group')."\n" ?>
+<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo $lang_common['Username'] ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
+<?php endif; ?>						<label class="conl"><?php echo $lang_ul['User group']."\n" ?>
 						<br /><select name="show_group">
 							<option value="-1"<?php if ($show_group == -1) {
     echo ' selected="selected"';
-} ?>><?php echo __('All users') ?></option>
+} ?>><?php echo $lang_ul['All users'] ?></option>
 <?php echo $dropdown_menu ?>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Sort by')."\n" ?>
+						<label class="conl"><?php echo $lang_search['Sort by']."\n" ?>
 						<br /><select name="sort_by">
 							<option value="username"<?php if ($sort_by == 'username') {
     echo ' selected="selected"';
-} ?>><?php echo __('Username') ?></option>
+} ?>><?php echo $lang_common['Username'] ?></option>
 							<option value="registered"<?php if ($sort_by == 'registered') {
     echo ' selected="selected"';
-} ?>><?php echo __('Registered') ?></option>
+} ?>><?php echo $lang_common['Registered'] ?></option>
 <?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
     echo ' selected="selected"';
-} ?>><?php echo __('No of posts') ?></option>
+} ?>><?php echo $lang_ul['No of posts'] ?></option>
 <?php endif; ?>						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Sort order')."\n" ?>
+						<label class="conl"><?php echo $lang_search['Sort order']."\n" ?>
 						<br /><select name="sort_dir">
 							<option value="ASC"<?php if ($sort_dir == 'ASC') {
     echo ' selected="selected"';
-} ?>><?php echo __('Ascending') ?></option>
+} ?>><?php echo $lang_search['Ascending'] ?></option>
 							<option value="DESC"<?php if ($sort_dir == 'DESC') {
     echo ' selected="selected"';
-} ?>><?php echo __('Descending') ?></option>
+} ?>><?php echo $lang_search['Descending'] ?></option>
 						</select>
 						<br /></label>
-						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? __('User search info').' ' : '').__('User sort info'); ?></p>
+						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? $lang_ul['User search info'].' ' : '').$lang_ul['User sort info']; ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
@@ -70,16 +70,16 @@
 </div>
 
 <div id="users1" class="blocktable">
-	<h2><span><?php echo __('User list') ?></span></h2>
+	<h2><span><?php echo $lang_common['User list'] ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Username') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Title') ?></th>
-<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Registered') ?></th>
+					<th class="tcl" scope="col"><?php echo $lang_common['Username'] ?></th>
+					<th class="tc2" scope="col"><?php echo $lang_common['Title'] ?></th>
+<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php echo $lang_common['Posts'] ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php echo $lang_common['Registered'] ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -98,7 +98,7 @@
 
             }
             if (empty($userlist_data)) {
-                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.__('No hits').'</td></tr>'."\n";
+                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.$lang_search['No hits'].'</td></tr>'."\n";
             }
             ?>
 			</tbody>
diff --git a/view/viewforum.php b/view/viewforum.php
index b9d04a1d..332987ae 100644
--- a/view/viewforum.php
+++ b/view/viewforum.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -34,10 +34,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
+					<th class="tcl" scope="col"><?php echo $lang_common['Topic'] ?></th>
+					<th class="tc2" scope="col"><?php echo $lang_common['Replies'] ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo $lang_forum['Views'] ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php echo $lang_common['Last post'] ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -70,7 +70,7 @@
 							<div class="icon inone"><div class="nosize"><!-- --></div></div>
 							<div class="tclcon">
 								<div>
-									<strong><?php echo __('Empty forum') ?></strong>
+									<strong><?php echo $lang_forum['Empty forum'] ?></strong>
 								</div>
 							</div>
 						</td>
@@ -91,7 +91,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
diff --git a/view/viewtopic.php b/view/viewtopic.php
index 16535ff1..e5f55ab0 100644
--- a/view/viewtopic.php
+++ b/view/viewtopic.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -64,13 +64,13 @@
 				</div>
 				<div class="postright">
 					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
-    echo __('Re').' ';
+    echo $lang_topic['Re'].' ';
 }
     ?><?php echo feather_escape($cur_topic['subject']) ?></h3>
 					<div class="postmsg">
 						<?php echo $post['message']."\n" ?>
 <?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.$lang_topic['Last edit'].' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 					</div>
@@ -107,7 +107,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -124,13 +124,13 @@
 
     ?>
 <div id="quickpost" class="blockform">
-	<h2><span><?php echo __('Quick post') ?></span></h2>
+	<h2><span><?php echo $lang_topic['Quick post'] ?></span></h2>
 	<div class="box">
 		<form id="quickpostform" method="post" action="<?php echo get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write message legend') ?></legend>
+					<legend><?php echo $lang_common['Write message legend'] ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
@@ -139,22 +139,21 @@
 <?php endif;
 
     if ($feather->user->is_guest) {
-        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.$lang_common['Email'].' <span>'.$lang_common['Required'].'</span></strong>' : $lang_common['Email'];
         $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
         ?>
-						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
 <?php
 
-    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.__('Message').' <span>'.__('Required').'</span></strong><br />';
+    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.$lang_common['Message'].' <span>'.$lang_common['Required'].'</span></strong><br />';
     } else {
         echo "\t\t\t\t\t\t".'<label>';
     }
 
     ?>
 <!-- Init BBcode editor toolbar -->
-<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
@@ -164,13 +163,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off'];
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? $lang_common['on'] : $lang_common['off'];
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off'];
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo($feather_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off'];
     ?></span></li>
 						</ul>
 					</div>
@@ -179,15 +178,15 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Robot title') ?></legend>
+					<legend><?php echo $lang_antispam['Robot title'] ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Robot info')    ?></p>
+						<p><?php echo $lang_antispam['Robot info']    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
     $qencoded = md5($question[$index_questions]);
-    echo sprintf(__('Robot question'), $question[$index_questions]);
+    echo sprintf($lang_antispam['Robot question'], $question[$index_questions]);
     ?>
-							 <span><?php echo __('Required') ?></span></strong>
+							 <span><?php echo $lang_common['Required'] ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -196,7 +195,7 @@
 			</div>
 			<?php endif;
     ?>
-			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo __('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
+			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_topic['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
 		</form>
 	</div>
 </div>

From ab524042b86b400f6ebd6ba6e68f6f1eb61c228d Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 13 Aug 2015 14:55:53 +0200
Subject: [PATCH 028/353] Remove common file

---
 include/common.php | 204 ---------------------------------------------
 1 file changed, 204 deletions(-)
 delete mode 100644 include/common.php

diff --git a/include/common.php b/include/common.php
deleted file mode 100644
index d617810b..00000000
--- a/include/common.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-if (!defined('FEATHER_ROOT')) {
-    exit('The constant FEATHER_ROOT must be defined and point to a valid FeatherBB installation root directory.');
-}
-
-// Define the version and database revision that this code was written for
-define('FORUM_VERSION', '1.0.0');
-
-define('FORUM_DB_REVISION', 21);
-define('FORUM_SI_REVISION', 2);
-define('FORUM_PARSER_REVISION', 2);
-
-// Attempt to load the configuration file config.php
-if (file_exists(FEATHER_ROOT.'include/config.php')) {
-    require FEATHER_ROOT.'include/config.php';
-}
-
-// Load the functions script
-require FEATHER_ROOT.'include/functions.php';
-
-// Load UTF-8 functions
-require FEATHER_ROOT.'include/utf8/utf8.php';
-
-// Strip out "bad" UTF-8 characters
-forum_remove_bad_characters();
-
-// Reverse the effect of register_globals
-forum_unregister_globals();
-
-// If FEATHER isn't defined, config.php is missing or corrupt
-if (!defined('FEATHER')) {
-    header('Location: '.$feather->request->getPath().'install/index.php');
-    exit;
-}
-
-// Record the start time (will be used to calculate the generation time for the page)
-$feather->start = get_microtime();
-
-// Make sure PHP reports all errors except E_NOTICE. FluxBB supports E_ALL, but a lot of scripts it may interact with, do not
-//error_reporting(E_ALL ^ E_NOTICE);
-error_reporting(E_ALL); // Let's report everything for development
-
-// Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
-setlocale(LC_CTYPE, 'C');
-
-// Turn off magic_quotes_runtime
-if (get_magic_quotes_runtime()) {
-    set_magic_quotes_runtime(0);
-}
-
-// If a cookie name is not specified in config.php, we use the default (pun_cookie)
-if (empty($cookie_name)) {
-    $cookie_name = 'feather_cookie';
-}
-
-// If the cache directory is not specified, we use the default setting
-if (!defined('FORUM_CACHE_DIR')) {
-    define('FORUM_CACHE_DIR', FEATHER_ROOT.'cache/');
-}
-
-// Define a few commonly used constants
-define('FEATHER_UNVERIFIED', 0);
-define('FEATHER_ADMIN', 1);
-define('FEATHER_MOD', 2);
-define('FEATHER_GUEST', 3);
-define('FEATHER_MEMBER', 4);
-
-// Inject DB prefix to SlimFramework
-$feather->prefix = $db_prefix;
-
-// Include Idiorm and set it up
-require FEATHER_ROOT.'include/idiorm.php';
-
-switch ($db_type) {
-    case 'mysql':
-    case 'mysqli':
-    case 'mysql_innodb':
-    case 'mysqli_innodb':
-        \DB::configure('mysql:host='.$db_host.';dbname='.$db_name);
-        \DB::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-        break;
-    case 'sqlite';
-    case 'sqlite3';
-        \DB::configure('sqlite:./'.$db_name);
-        break;
-    case 'pgsql':
-        \DB::configure('pgsql:host='.$db_host.'dbname='.$db_name);
-        break;
-}
-\DB::configure('username', $db_username);
-\DB::configure('password', $db_password);
-\DB::configure('id_column_overrides', array(
-    $db_prefix.'groups' => 'g_id',
-));
-
-// Log queries if needed
-if (defined('FEATHER_SHOW_QUERIES')) {
-    \DB::configure('logging', true);
-}
-
-// Cache queries if needed
-if (defined('FEATHER_CACHE_QUERIES')) {
-    \DB::configure('caching', true);
-}
-
-// Load cached config
-if (file_exists(FORUM_CACHE_DIR.'cache_config.php')) {
-    include FORUM_CACHE_DIR.'cache_config.php';
-}
-
-if (!defined('FEATHER_CONFIG_LOADED')) {
-    if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-        require FEATHER_ROOT.'include/cache.php';
-    }
-
-    generate_config_cache();
-    require FORUM_CACHE_DIR.'cache_config.php';
-}
-
-// Inject config to SlimFramework
-$feather->config = $feather_config;
-
-// Enable output buffering
-if (!defined('FEATHER_DISABLE_BUFFERING')) {
-    // Should we use gzip output compression?
-    if ($feather->config['o_gzip'] && extension_loaded('zlib')) {
-        ob_start('ob_gzhandler');
-    } else {
-        ob_start();
-    }
-}
-
-// Define standard date/time formats
-$forum_time_formats = array($feather->config['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
-$forum_date_formats = array($feather->config['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
-
-// Check/update/set cookie and fetch user info
-check_cookie();
-
-// Load l10n
-require_once FEATHER_ROOT.'include/pomo/MO.php';
-require_once FEATHER_ROOT.'include/l10n.php';
-
-// Attempt to load the language file
-if (file_exists(FEATHER_ROOT.'lang/'.$feather->user->language.'/common.mo')) {
-    load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/common.mo');
-}
-else {
-    die('There is no valid language pack \''.feather_escape($feather->user->language).'\' installed. Please reinstall a language of that name');
-}
-
-// Check if we are to display a maintenance message
-if ($feather->config['o_maintenance'] && $feather->user->g_id > FEATHER_ADMIN && !defined('FEATHER_TURN_OFF_MAINT')) {
-    maintenance_message();
-}
-
-// Load cached bans
-if (file_exists(FORUM_CACHE_DIR.'cache_bans.php')) {
-    include FORUM_CACHE_DIR.'cache_bans.php';
-}
-
-if (!defined('FEATHER_BANS_LOADED')) {
-    if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-        require FEATHER_ROOT.'include/cache.php';
-    }
-
-    generate_bans_cache();
-    require FORUM_CACHE_DIR.'cache_bans.php';
-}
-
-// Check if current user is banned
-check_bans();
-
-// Update online list
-update_users_online();
-
-// Check to see if we logged in without a cookie being set
-if ($feather->user->is_guest && isset($_GET['login'])) {
-    message(__('No cookie'));
-}
-
-// 32kb should be more than enough for forum posts
-if (!defined('FEATHER_MAX_POSTSIZE')) {
-    define('FEATHER_MAX_POSTSIZE', 32768);
-}
-
-if (!defined('FEATHER_SEARCH_MIN_WORD')) {
-    define('FEATHER_SEARCH_MIN_WORD', 3);
-}
-if (!defined('FEATHER_SEARCH_MAX_WORD')) {
-    define('FEATHER_SEARCH_MAX_WORD', 20);
-}
-
-if (!defined('FORUM_MAX_COOKIE_SIZE')) {
-    define('FORUM_MAX_COOKIE_SIZE', 4048);
-}

From 44bd087cad39e87667f4561e37fe6a399c857561 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 13 Aug 2015 14:59:55 +0200
Subject: [PATCH 029/353] Include gettext loading in middleware

---
 Slim/Extras/Middleware/FeatherBB.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index c240ed60..c912c600 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -352,9 +352,15 @@ public function call()
             $this->authenticate();
 
             // Attempt to load the common language file
-            if (file_exists($this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php')) {
-                include $this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.php';
-            } else {
+            // Load l10n
+            require_once $this->data['forum_env']['FEATHER_ROOT'].'include/pomo/MO.php';
+            require_once $this->data['forum_env']['FEATHER_ROOT'].'include/l10n.php';
+
+            // Attempt to load the language file
+            if (file_exists($this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.mo')) {
+                load_textdomain('featherbb', $this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.mo');
+            }
+            else {
                 die('There is no valid language pack \''.feather_escape($this->app->user->language).'\' installed. Please reinstall a language of that name');
             }
 

From ce0c5b8769a109fc62aeda57eebb5fcbc84fd874 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 13 Aug 2015 17:58:35 +0200
Subject: [PATCH 030/353] Fix issues with prefixes

---
 Slim/Extras/Middleware/FeatherBB.php | 15 ++++++++-------
 include/idiorm.php                   |  4 ++--
 index.php                            | 10 +++-------
 model/viewtopic.php                  |  2 +-
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index c912c600..5fda7b16 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -39,7 +39,8 @@ public function __construct(array $user_forum_settings = array())
                                     'FEATHER_SEARCH_MIN_WORD' => 3,
                                     'FEATHER_SEARCH_MAX_WORD' => 20,
                                     'FORUM_MAX_COOKIE_SIZE' => 4048,
-                                    'FEATHER_SHOW_QUERIES' => 1
+                                    'FEATHER_DEBUG' => 1,
+                                    'FEATHER_SHOW_QUERIES' => 1,
                                     );
 
         // Define forum settings / TODO : handle settings with a class / User input overrides all previous settings
@@ -90,7 +91,7 @@ public function init_db()
         DB::configure('password', $this->data['forum_settings']['db_pass']);
         DB::configure('logging', true);
         DB::configure('id_column_overrides', array(
-            'groups' => 'g_id',
+            $this->data['forum_settings']['db_prefix'].'groups' => 'g_id',
         ));
     }
 
@@ -239,11 +240,11 @@ public function authenticate()
                 case 'mysqli_innodb':
                 case 'sqlite':
                 case 'sqlite3':
-                DB::for_table('online')->raw_execute('REPLACE INTO online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
+                DB::for_table('online')->raw_execute('REPLACE INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
                     break;
 
                 default:
-                    DB::for_table('online')->raw_execute('INSERT INTO online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE ident=:ident)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
+                    DB::for_table('online')->raw_execute('INSERT INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE ident=:ident)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
                     break;
             }
         } else {
@@ -273,11 +274,11 @@ public function update_online()
                     case 'mysqli_innodb':
                     case 'sqlite':
                     case 'sqlite3':
-                        DB::for_table('online')->raw_execute('REPLACE INTO online (user_id, ident, logged) VALUES(:user_id, :ident, :logged)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
+                        DB::for_table('online')->raw_execute('REPLACE INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) VALUES(:user_id, :ident, :logged)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
                         break;
 
                     default:
-                        DB::for_table('online')->raw_execute('INSERT INTO online (user_id, ident, logged) SELECT :user_id, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE user_id=:user_id)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
+                        DB::for_table('online')->raw_execute('INSERT INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) SELECT :user_id, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE user_id=:user_id)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
                         break;
                 }
 
@@ -296,7 +297,7 @@ public function update_online()
 
                 $idle_sql = ($this->app->user->idle == '1') ? ', idle=0' : '';
 
-                DB::for_table('online')->raw_execute('UPDATE online SET logged='.$now.$idle_sql.' WHERE user_id=:user_id', array(':user_id' => $this->app->user->id));
+                DB::for_table('online')->raw_execute('UPDATE '.$this->data['forum_settings']['db_prefix'].'online SET logged='.$now.$idle_sql.' WHERE user_id=:user_id', array(':user_id' => $this->app->user->id));
 
                 // Update tracked topics with the current expire time
                 $cookie_tracked_topics = $this->app->getCookie($this->data['forum_settings']['cookie_name'].'_track');
diff --git a/include/idiorm.php b/include/idiorm.php
index 69bf8b07..a7d7d348 100644
--- a/include/idiorm.php
+++ b/include/idiorm.php
@@ -615,7 +615,7 @@ public function use_id_column($id_column)
         protected function _create_instance_from_row($row)
         {
             $feather = \Slim\Slim::getInstance();
-            $table = str_replace($feather->prefix, '', $this->_table_name);
+            $table = str_replace($feather->forum_settings['db_prefix'], '', $this->_table_name);
             $instance = self::for_table($table, $this->_connection_name);
             $instance->use_id_column($this->_instance_id_column);
             $instance->hydrate($row);
@@ -1026,7 +1026,7 @@ public function distinct()
         protected function _add_join_source($join_operator, $table, $constraint, $table_alias=null, $no_escape_second_col=false)
         {
             $feather = \Slim\Slim::getInstance();
-            $table = $feather->prefix.$table;
+            $table = $feather->forum_settings['db_prefix'].$table;
 
             $join_operator = trim("{$join_operator} JOIN");
 
diff --git a/index.php b/index.php
index b53037f2..39db116a 100644
--- a/index.php
+++ b/index.php
@@ -18,13 +18,9 @@
 
 // Instantiate Slim
 $feather = new \Slim\Slim();
-$feather_user_settings = array(
-							'db_name' => 'featherbb',
-							'db_host' => 'localhost',
-							'db_user' => 'featherbb',
-							'db_pass' => 'featherbb',
-							'cookie_name' => 'feather_cookie_45ef0b',
-							'cookie_seed' => '0f320ab07f4afbc5');
+
+// Load the config
+require 'include/config.php';
 
 // Load middlewares
 $feather->add(new \Slim\Extras\Middleware\CsrfGuard('featherbb_csrf')); // CSRF
diff --git a/model/viewtopic.php b/model/viewtopic.php
index baa99464..61cdfe66 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -257,7 +257,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
             ->select_many($select_print_posts)
             ->inner_join('users', array('u.id', '=', 'p.poster_id'), 'u')
             ->inner_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
-            ->raw_join('LEFT OUTER JOIN '.$this->feather->prefix.'online', "o.user_id!=1 AND o.idle=0 AND o.user_id=u.id", 'o')
+            ->raw_join('LEFT OUTER JOIN '.$this->feather->forum_settings['db_prefix'].'online', "o.user_id!=1 AND o.idle=0 AND o.user_id=u.id", 'o')
             ->where_in('p.id', $post_ids)
             ->order_by('p.id')
             ->find_array();

From 253eb9a42602a5d72311768809ba781f2b4d136e Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 13 Aug 2015 18:07:30 +0200
Subject: [PATCH 031/353] Replace require_once with require, fix timer

---
 Slim/Extras/Middleware/FeatherBB.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 5fda7b16..a8e57651 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -70,7 +70,7 @@ public static function load_default_settings()
 
     public function init_db()
     {
-        require_once $this->data['forum_env']['FEATHER_ROOT'].'include/idiorm.php';
+        require $this->data['forum_env']['FEATHER_ROOT'].'include/idiorm.php';
         switch ($this->data['forum_settings']['db_type']) {
             case 'mysql':
             case 'mysqli':
@@ -316,7 +316,7 @@ public function update_online()
 
     public function call()
     {
-        global $lang_common, $feather_bans, $db_type, $cookie_name, $cookie_seed, $forum_time_formats, $forum_date_formats, $feather_config; // Legacy
+        global $feather_bans, $db_type, $cookie_name, $cookie_seed, $forum_time_formats, $forum_date_formats, $feather_config; // Legacy
 
         if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) { // Block prefetch requests
             $this->set_headers();
@@ -324,14 +324,17 @@ public function call()
         } else {
             $this->env_to_globals($this->data['forum_env']); // Legacy : define globals from forum_env
 
-            require_once $this->data['forum_env']['FEATHER_ROOT'].'include/utf8/utf8.php';
-            require_once $this->data['forum_env']['FEATHER_ROOT'].'include/functions.php';
+            require $this->data['forum_env']['FEATHER_ROOT'].'include/utf8/utf8.php';
+            require $this->data['forum_env']['FEATHER_ROOT'].'include/functions.php';
+
+            // Record the start time (will be used to calculate the generation time for the page)
+            $this->app->start = get_microtime();
 
             // Get forum config and load it into forum_settings array
             if (file_exists($this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php')) {
                 include $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php';
             } else {
-                require_once $this->data['forum_env']['FEATHER_ROOT'].'include/cache.php';
+                require $this->data['forum_env']['FEATHER_ROOT'].'include/cache.php';
                 generate_config_cache();
                 require $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php';
             }
@@ -354,8 +357,8 @@ public function call()
 
             // Attempt to load the common language file
             // Load l10n
-            require_once $this->data['forum_env']['FEATHER_ROOT'].'include/pomo/MO.php';
-            require_once $this->data['forum_env']['FEATHER_ROOT'].'include/l10n.php';
+            require $this->data['forum_env']['FEATHER_ROOT'].'include/pomo/MO.php';
+            require $this->data['forum_env']['FEATHER_ROOT'].'include/l10n.php';
 
             // Attempt to load the language file
             if (file_exists($this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.mo')) {
@@ -377,11 +380,11 @@ public function call()
 
             if (!defined('FEATHER_BANS_LOADED')) {
                 if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                    require_once $this->data['forum_env']['FEATHER_ROOT'].'include/cache.php';
+                    require $this->data['forum_env']['FEATHER_ROOT'].'include/cache.php';
                 }
 
                 generate_bans_cache();
-                require_once $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_bans.php';
+                require $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_bans.php';
             }
 
             // Check if current user is banned

From d5fc3a871aa6511e5495bd3277e96d5f44694d20 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 13 Aug 2015 18:10:56 +0200
Subject: [PATCH 032/353] Add options to DB init

---
 Slim/Extras/Middleware/FeatherBB.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index a8e57651..4b5ac906 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -41,6 +41,7 @@ public function __construct(array $user_forum_settings = array())
                                     'FORUM_MAX_COOKIE_SIZE' => 4048,
                                     'FEATHER_DEBUG' => 1,
                                     'FEATHER_SHOW_QUERIES' => 1,
+                                    'FEATHER_CACHE_QUERIES' => 0,
                                     );
 
         // Define forum settings / TODO : handle settings with a class / User input overrides all previous settings
@@ -89,7 +90,12 @@ public function init_db()
         }
         DB::configure('username', $this->data['forum_settings']['db_user']);
         DB::configure('password', $this->data['forum_settings']['db_pass']);
-        DB::configure('logging', true);
+        if ($this->data['forum_env']['FEATHER_SHOW_QUERIES'] == 1) {
+            DB::configure('logging', true);
+        }
+        if ($this->data['forum_env']['FEATHER_CACHE_QUERIES'] == 1) {
+            DB::configure('caching', true);
+        }
         DB::configure('id_column_overrides', array(
             $this->data['forum_settings']['db_prefix'].'groups' => 'g_id',
         ));

From fce5d2f327cce27450b5db602c211b6a45478c44 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 13 Aug 2015 18:29:01 +0200
Subject: [PATCH 033/353] Fix more undefined variables

---
 Slim/Extras/Middleware/FeatherBB.php |   3 +-
 controller/moderate.php              |  21 ---
 extern.php                           |  64 +++++++++
 include/functions.php                | 207 +--------------------------
 include/search_idx.php               |  14 +-
 model/admin/maintenance.php          |   7 +-
 model/admin/statistics.php           |   7 +-
 model/admin/users.php                |   7 +-
 model/search.php                     |   6 +-
 9 files changed, 90 insertions(+), 246 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 4b5ac906..5c533212 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -322,7 +322,7 @@ public function update_online()
 
     public function call()
     {
-        global $feather_bans, $db_type, $cookie_name, $cookie_seed, $forum_time_formats, $forum_date_formats, $feather_config; // Legacy
+        global $feather_bans, $cookie_name, $cookie_seed, $forum_time_formats, $forum_date_formats, $feather_config; // Legacy
 
         if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) { // Block prefetch requests
             $this->set_headers();
@@ -330,6 +330,7 @@ public function call()
         } else {
             $this->env_to_globals($this->data['forum_env']); // Legacy : define globals from forum_env
 
+
             require $this->data['forum_env']['FEATHER_ROOT'].'include/utf8/utf8.php';
             require $this->data['forum_env']['FEATHER_ROOT'].'include/functions.php';
 
diff --git a/controller/moderate.php b/controller/moderate.php
index 541b3de7..0baeedd6 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -37,8 +37,6 @@ public function gethostpost($pid)
             message(__('No view'), '403');
         }
 
-        // Load the viewforum.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
         // This particular function doesn't require forum-based moderator access. It can be used
         // by all moderators and admins
@@ -55,8 +53,6 @@ public function gethostip($ip)
             message(__('No view'), '403');
         }
 
-        // Load the viewforum.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
         // This particular function doesn't require forum-based moderator access. It can be used
         // by all moderators and admins
@@ -73,8 +69,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             message(__('No view'), '403');
         }
 
-        // Load the viewforum.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
         // This particular function doesn't require forum-based moderator access. It can be used
         // by all moderators and admins
@@ -94,8 +88,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             message(__('No permission'), '403');
         }
 
-        $url_subject = url_friendly($this->model->get_subject_tid($id));
-
         // Move one topic
         if ($this->request->post('move_topics') || $this->request->post('move_topics_to')) {
             if ($this->request->post('move_topics_to')) {
@@ -131,8 +123,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
         // Stick a topic
         if ($action == 'stick') {
-            
-
             $this->model->stick_topic($id, $fid);
  
             redirect(get_link('topic/'.$id.'/'), __('Stick topic redirect'));
@@ -141,8 +131,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
         // Unstick a topic
         if ($action == 'unstick') {
-            
-
             $this->model->unstick_topic($id, $fid);
 
             redirect(get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
@@ -150,8 +138,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
         // Open a topic
         if ($action == 'open') {
-            
-            
             $this->model->open_topic($id, $fid);
 
             redirect(get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
@@ -159,8 +145,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
         // Close a topic
         if ($action == 'close') {
-            
-
             $this->model->close_topic($id, $fid);
 
             redirect(get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
@@ -283,8 +267,6 @@ public function display($id, $name = null, $page = null)
             message(__('No view'), '403');
         }
 
-        // Load the viewforum.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
 
         // Make sure that only admmods allowed access this page
         $moderators = $this->model->get_moderators($id);
@@ -341,9 +323,6 @@ public function dealposts($fid)
             message(__('No view'), '403');
         }
 
-        // Load the viewforum.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/forum.php';
-
         // Make sure that only admmods allowed access this page
         $moderators = $this->model->get_moderators($fid);
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
diff --git a/extern.php b/extern.php
index 06d17a61..c91490d2 100644
--- a/extern.php
+++ b/extern.php
@@ -85,6 +85,70 @@ function escape_cdata($str)
     return str_replace(']]>', ']]&gt;', $str);
 }
 
+//
+// Fill $feather->user with default values (for guests)
+//
+function set_default_user()
+{
+    global $feather_config;
+
+    // Get Slim current session
+    $feather = \Slim\Slim::getInstance();
+
+    $remote_addr = get_remote_address();
+
+    // Fetch guest user
+    $select_set_default_user = array('u.*', 'g.*', 'o.logged', 'o.last_post', 'o.last_search');
+    $where_set_default_user = array('u.id' => '1');
+
+    $result = \DB::for_table('users')
+        ->table_alias('u')
+        ->select_many($select_set_default_user)
+        ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
+        ->left_outer_join('online', array('o.ident', '=', $remote_addr), 'o', true)
+        ->where($where_set_default_user)
+        ->find_result_set();
+
+    if (!$result) {
+        exit('Unable to fetch guest information. Your database must contain both a guest user and a guest user group.');
+    }
+
+    foreach ($result as $feather->user);
+
+    // Update online list
+    if (!$feather->user->logged) {
+        $feather->user->logged = time();
+
+        // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
+        switch ($feather->forum_settings['db_type']) {
+            case 'mysql':
+            case 'mysqli':
+            case 'mysql_innodb':
+            case 'mysqli_innodb':
+            case 'sqlite':
+            case 'sqlite3':
+                \DB::for_table('online')->raw_execute('REPLACE INTO '.$feather->forum_settings['db_prefix'].'online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $remote_addr, ':logged' => $feather->user->logged));
+                break;
+
+            default:
+                \DB::for_table('online')->raw_execute('INSERT INTO '.$feather->forum_settings['db_prefix'].'online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$feather->forum_settings['db_prefix'].'online WHERE ident=:ident)', array(':ident' => $remote_addr, ':logged' => $feather->user->logged));
+                break;
+        }
+    } else {
+        \DB::for_table('online')->where('ident', $remote_addr)
+            ->update_many('logged', time());
+    }
+
+    $feather->user->disp_topics = $feather_config['o_disp_topics_default'];
+    $feather->user->disp_posts = $feather_config['o_disp_posts_default'];
+    $feather->user->timezone = $feather_config['o_default_timezone'];
+    $feather->user->dst = $feather_config['o_default_dst'];
+    $feather->user->language = $feather_config['o_default_lang'];
+    $feather->user->style = $feather_config['o_default_style'];
+    $feather->user->is_guest = true;
+    $feather->user->is_admmod = false;
+}
+
 //
 // Authenticates the provided username and password against the user database
 // $user can be either a user ID (integer) or a username (string)
diff --git a/include/functions.php b/include/functions.php
index a705b2c0..de203e26 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -18,140 +18,6 @@ function get_microtime()
     return ((float)$usec + (float)$sec);
 }
 
-//
-// Cookie stuff!
-//
-function check_cookie()
-{
-    global $cookie_name, $cookie_seed;
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    $now = time();
-
-    // Get FeatherBB cookie
-    $cookie_raw = $feather->getCookie($cookie_name);
-
-    // Check if cookie exists and is valid (getCookie method returns false if the data has been tampered locally so it can't decrypt the cookie);
-    if (isset($cookie_raw)) {
-        $cookie = json_decode($cookie_raw, true);
-        $checksum = hash_hmac('sha1', $cookie['user_id'].$cookie['expires'], $cookie_seed . '_checksum');
-
-        // If cookie has a non-guest user, hasn't expired and is legit
-        if ($cookie['user_id'] > 1 && $cookie['expires'] > $now && $checksum == $cookie['checksum']) {
-
-            // Get user info from db
-            $select_check_cookie = array('u.*', 'g.*', 'o.logged', 'o.idle');
-            $where_check_cookie = array('u.id' => intval($cookie['user_id']));
-
-            $result = \DB::for_table('users')
-                ->table_alias('u')
-                ->select_many($select_check_cookie)
-                ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
-                ->left_outer_join('online', array('o.user_id', '=', 'u.id'), 'o')
-                ->where($where_check_cookie)
-                ->find_result_set();
-
-            foreach ($result as $feather->user);
-
-            // Another security check, to prevent identity fraud by changing the user id in the cookie) (might be useless considering the strength of encryption)
-            if (isset($feather->user->id) && hash_hmac('sha1', $feather->user->password, $cookie_seed.'_password_hash') === $cookie['password_hash']) {
-                $expires = ($cookie['expires'] > $now + $feather->config['o_timeout_visit']) ? $now + 1209600 : $now + $feather->config['o_timeout_visit'];
-                $feather->user->is_guest = false;
-                $feather->user->is_admmod = $feather->user->g_id == FEATHER_ADMIN || $feather->user->g_moderator == '1';
-                feather_setcookie($feather->user->id, $feather->user->password, $expires);
-                set_preferences();
-                return true;
-            }
-        }
-    }
-    // If there is no cookie, or cookie is guest or expired, let's reconnect.
-    $expires = $now + 31536000; // The cookie expires after a year
-    feather_setcookie(1, feather_hash(uniqid(rand(), true)), $expires);
-    return set_default_user();
-}
-
-//
-// Set preferences
-//
-function set_preferences()
-{
-    global $db_type, $cookie_name;
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-    $now = time();
-
-    // Set a default language if the user selected language no longer exists
-    if (!file_exists(FEATHER_ROOT.'lang/'.$feather->user->language)) {
-        $feather->user->language = $feather->config['o_default_lang'];
-    }
-
-    // Set a default style if the user selected style no longer exists
-    if (!file_exists(FEATHER_ROOT.'style/'.$feather->user->style.'.css')) {
-        $feather->user->style = $feather->config['o_default_style'];
-    }
-
-    if (!$feather->user->disp_topics) {
-        $feather->user->disp_topics = $feather->config['o_disp_topics_default'];
-    }
-    if (!$feather->user->disp_posts) {
-        $feather->user->disp_posts = $feather->config['o_disp_posts_default'];
-    }
-
-    // Define this if you want this visit to affect the online list and the users last visit data
-    if (!defined('FEATHER_QUIET_VISIT')) {
-        // Update the online list
-        if (!$feather->user->logged) {
-            $feather->user->logged = $now;
-
-            // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
-            switch ($db_type) {
-                case 'mysql':
-                case 'mysqli':
-                case 'mysql_innodb':
-                case 'mysqli_innodb':
-                case 'sqlite':
-                case 'sqlite3':
-                    \DB::for_table('online')->raw_execute('REPLACE INTO '.$feather->prefix.'online (user_id, ident, logged) VALUES(:user_id, :ident, :logged)', array(':user_id' => $feather->user->id, ':ident' => $feather->user->username, ':logged' => $feather->user->logged));
-                    break;
-
-                default:
-                    \DB::for_table('online')->raw_execute('INSERT INTO '.$feather->prefix.'online (user_id, ident, logged) SELECT :user_id, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$feather->prefix.'online WHERE user_id=:user_id)', array(':user_id' => $feather->user->id, ':ident' => $feather->user->username, ':logged' => $feather->user->logged));
-                    break;
-            }
-
-            // Reset tracked topics
-            set_tracked_topics(null);
-
-        } else {
-            // Special case: We've timed out, but no other user has browsed the forums since we timed out
-            if ($feather->user->logged < ($now-$feather->config['o_timeout_visit'])) {
-                \DB::for_table('users')->where('id', $feather->user->id)
-                    ->find_one()
-                    ->set('last_visit', $feather->user->logged)
-                    ->save();
-                $feather->user->last_visit = $feather->user->logged;
-            }
-
-            $idle_sql = ($feather->user->idle == '1') ? ', idle=0' : '';
-
-            \DB::for_table('online')->raw_execute('UPDATE '.$feather->prefix.'online SET logged='.$now.$idle_sql.' WHERE user_id=:user_id', array(':user_id' => $feather->user->id));
-
-            // Update tracked topics with the current expire time
-            $cookie_tracked_topics = $feather->getCookie($cookie_name.'_track');
-            if (isset($cookie_tracked_topics)) {
-                set_tracked_topics(json_decode($cookie_tracked_topics, true));
-            }
-        }
-    } else {
-        if (!$feather->user->logged) {
-            $feather->user->logged = $feather->user->last_visit;
-        }
-    }
-}
-
 
 //
 // Try to determine the current URL
@@ -244,71 +110,6 @@ function get_admin_ids()
 }
 
 
-//
-// Fill $feather->user with default values (for guests)
-//
-function set_default_user()
-{
-    global $db_type, $feather_config;
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    $remote_addr = get_remote_address();
-
-    // Fetch guest user
-    $select_set_default_user = array('u.*', 'g.*', 'o.logged', 'o.last_post', 'o.last_search');
-    $where_set_default_user = array('u.id' => '1');
-
-    $result = \DB::for_table('users')
-        ->table_alias('u')
-        ->select_many($select_set_default_user)
-        ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
-        ->left_outer_join('online', array('o.ident', '=', $remote_addr), 'o', true)
-        ->where($where_set_default_user)
-        ->find_result_set();
-
-    if (!$result) {
-        exit('Unable to fetch guest information. Your database must contain both a guest user and a guest user group.');
-    }
-
-    foreach ($result as $feather->user);
-
-    // Update online list
-    if (!$feather->user->logged) {
-        $feather->user->logged = time();
-
-        // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
-        switch ($db_type) {
-            case 'mysql':
-            case 'mysqli':
-            case 'mysql_innodb':
-            case 'mysqli_innodb':
-            case 'sqlite':
-            case 'sqlite3':
-            \DB::for_table('online')->raw_execute('REPLACE INTO '.$feather->prefix.'online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $remote_addr, ':logged' => $feather->user->logged));
-                break;
-
-            default:
-                \DB::for_table('online')->raw_execute('INSERT INTO '.$feather->prefix.'online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$feather->prefix.'online WHERE ident=:ident)', array(':ident' => $remote_addr, ':logged' => $feather->user->logged));
-                break;
-        }
-    } else {
-        \DB::for_table('online')->where('ident', $remote_addr)
-             ->update_many('logged', time());
-    }
-
-    $feather->user->disp_topics = $feather_config['o_disp_topics_default'];
-    $feather->user->disp_posts = $feather_config['o_disp_posts_default'];
-    $feather->user->timezone = $feather_config['o_default_timezone'];
-    $feather->user->dst = $feather_config['o_default_dst'];
-    $feather->user->language = $feather_config['o_default_lang'];
-    $feather->user->style = $feather_config['o_default_style'];
-    $feather->user->is_guest = true;
-    $feather->user->is_admmod = false;
-}
-
-
 //
 // Wrapper for Slim setCookie method
 //
@@ -438,7 +239,7 @@ function check_username($username, $errors, $exclude_id = null)
     // Check that the username (or a too similar username) is not already registered
     $query = (!is_null($exclude_id)) ? ' AND id!='.$exclude_id : '';
 
-    $result = \DB::for_table('online')->raw_query('SELECT username FROM '.$feather->prefix.'users WHERE (UPPER(username)=UPPER(:username1) OR UPPER(username)=UPPER(:username2)) AND id>1'.$query, array(':username1' => $username, ':username2' => ucp_preg_replace('%[^\p{L}\p{N}]%u', '', $username)))->find_one();
+    $result = \DB::for_table('online')->raw_query('SELECT username FROM '.$feather->forum_settings['db_prefix'].'users WHERE (UPPER(username)=UPPER(:username1) OR UPPER(username)=UPPER(:username2)) AND id>1'.$query, array(':username1' => $username, ':username2' => ucp_preg_replace('%[^\p{L}\p{N}]%u', '', $username)))->find_one();
 
     if ($result) {
         $busy = $result['username'];
@@ -964,8 +765,6 @@ function paginate_old($num_pages, $cur_page, $link)
 
 function message($msg, $http_status = null, $no_back_link = false, $dontStop = false)
 {
-
-
     // Did we receive a custom header?
     if (!is_null($http_status)) {
         header('HTTP/1.1 ' . $http_status);
@@ -991,8 +790,6 @@ function message($msg, $http_status = null, $no_back_link = false, $dontStop = f
 
         require_once FEATHER_ROOT.'controller/header.php';
 
-        $feather->config('templates.path', get_path_view());
-
         $header = new \controller\header();
 
         $header->setTitle($page_title)->display();
@@ -1068,8 +865,6 @@ function format_time($timestamp, $date_only = false, $date_format = null, $time_
 //
 function forum_number_format($number, $decimals = 0)
 {
-
-
     return is_numeric($number) ? number_format($number, $decimals, __('lang_decimal_point'), __('lang_thousands_sep')) : $number;
 }
 
diff --git a/include/search_idx.php b/include/search_idx.php
index f2d14f84..364ec00e 100644
--- a/include/search_idx.php
+++ b/include/search_idx.php
@@ -165,8 +165,6 @@ function strip_bbcode($text)
 //
 function update_search_index($mode, $post_id, $message, $subject = null)
 {
-    global $db_type;
-
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
 
@@ -236,7 +234,7 @@ function update_search_index($mode, $post_id, $message, $subject = null)
         unset($unique_words);
 
         if (!empty($new_words)) {
-            switch ($db_type) {
+            switch ($feather->forum_settings['db_type']) {
                 case 'mysql':
                 case 'mysqli':
                 case 'mysql_innodb':
@@ -244,7 +242,7 @@ function update_search_index($mode, $post_id, $message, $subject = null)
                     // Quite dirty, right? :-)
                     $placeholders = rtrim(str_repeat('(?), ', count($new_words)), ', ');
                     \DB::for_table('search_words')
-                        ->raw_execute('INSERT INTO '.$feather->prefix.'search_words (word) VALUES '.$placeholders, $new_words);
+                        ->raw_execute('INSERT INTO '.$feather->forum_settings['db_prefix'].'search_words (word) VALUES '.$placeholders, $new_words);
                     break;
 
                 default:
@@ -289,7 +287,7 @@ function update_search_index($mode, $post_id, $message, $subject = null)
             $wordlist = array_values($wordlist);
             $placeholders = rtrim(str_repeat('?, ', count($wordlist)), ', ');
             \DB::for_table('search_words')
-                ->raw_execute('INSERT INTO '.$feather->prefix.'search_matches (post_id, word_id, subject_match) SELECT '.$post_id.', id, '.$subject_match.' FROM '.$feather->prefix.'search_words WHERE word IN ('.$placeholders.')', $wordlist);
+                ->raw_execute('INSERT INTO '.$feather->forum_settings['db_prefix'].'search_matches (post_id, word_id, subject_match) SELECT '.$post_id.', id, '.$subject_match.' FROM '.$feather->forum_settings['db_prefix'].'search_words WHERE word IN ('.$placeholders.')', $wordlist);
         }
     }
 
@@ -302,8 +300,6 @@ function update_search_index($mode, $post_id, $message, $subject = null)
 //
 function strip_search_index($post_ids)
 {
-    global $db_type;
-
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
 
@@ -314,7 +310,7 @@ function strip_search_index($post_ids)
         $post_ids_sql = $post_ids;
     }
 
-    switch ($db_type) {
+    switch ($feather->forum_settings['db_type']) {
         case 'mysql':
         case 'mysqli':
         case 'mysql_innodb':
@@ -353,7 +349,7 @@ function strip_search_index($post_ids)
 
         default:
             \DB::for_table('search_matches')
-                ->where_raw('id IN(SELECT word_id FROM '.$feather->prefix.'search_matches WHERE word_id IN(SELECT word_id FROM '.$feather->prefix.'search_matches WHERE post_id IN('.$post_ids.') GROUP BY word_id) GROUP BY word_id HAVING COUNT(word_id)=1)')
+                ->where_raw('id IN(SELECT word_id FROM '.$feather->forum_settings['db_prefix'].'search_matches WHERE word_id IN(SELECT word_id FROM '.$feather->forum_settings['db_prefix'].'search_matches WHERE post_id IN('.$post_ids.') GROUP BY word_id) GROUP BY word_id HAVING COUNT(word_id)=1)')
                 ->delete_many();
             break;
 
diff --git a/model/admin/maintenance.php b/model/admin/maintenance.php
index 671a4385..be2e9541 100644
--- a/model/admin/maintenance.php
+++ b/model/admin/maintenance.php
@@ -24,7 +24,10 @@ public function __construct()
  
     public function rebuild()
     {
-        global $db_type, $lang_admin_maintenance;
+        global $lang_admin_maintenance;
+
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
 
         $per_page = $this->request->get('i_per_page') ? intval($this->request->get('i_per_page')) : 0;
 
@@ -41,7 +44,7 @@ public function rebuild()
             DB::for_table('search_matches')->raw_execute('TRUNCATE '.$this->feather->prefix.'search_matches');
 
             // Reset the sequence for the search words (not needed for SQLite)
-            switch ($db_type) {
+            switch ($feather->forum_settings['db_type']) {
                 case 'mysql':
                 case 'mysqli':
                 case 'mysql_innodb':
diff --git a/model/admin/statistics.php b/model/admin/statistics.php
index ddfe5768..9fb6d658 100644
--- a/model/admin/statistics.php
+++ b/model/admin/statistics.php
@@ -60,11 +60,12 @@ public function get_num_online()
 
     public function get_total_size()
     {
-        global $db_type;
-
         $total = array();
 
-        if ($db_type == 'mysql' || $db_type == 'mysqli' || $db_type == 'mysql_innodb' || $db_type == 'mysqli_innodb') {
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+
+        if ($feather->forum_settings['db_type'] == 'mysql' || $feather->forum_settings['db_type'] == 'mysqli' || $feather->forum_settings['db_type'] == 'mysql_innodb' || $feather->forum_settings['db_type'] == 'mysqli_innodb') {
             // Calculate total db size/row count
             $result = DB::for_table('users')->raw_query('SHOW TABLE STATUS LIKE \''.$this->feather->prefix.'%\'')->find_many();
 
diff --git a/model/admin/users.php b/model/admin/users.php
index 5f0e27fe..7ff23b57 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -499,7 +499,10 @@ public function ban_users()
 
     public function get_user_search()
     {
-        global $db_type, $lang_admin_users;
+        global $lang_admin_users;
+
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
 
         $form = $this->request->get('form') ? $this->request->get('form') : array();
 
@@ -592,7 +595,7 @@ public function get_user_search()
             $search['conditions'][] = 'u.registered<'.$registered_before;
         }
 
-        $like_command = ($db_type == 'pgsql') ? 'ILIKE' : 'LIKE';
+        $like_command = ($feather->forum_settings['db_type'] == 'pgsql') ? 'ILIKE' : 'LIKE';
         foreach ($form as $key => $input) {
             if ($input != '' && in_array($key, array('username', 'email', 'title', 'realname', 'url', 'jabber', 'icq', 'msn', 'aim', 'yahoo', 'location', 'signature', 'admin_note'))) {
                 $search['conditions'][] = 'u.'.str_replace("'","''",$key).' '.$like_command.' \''.str_replace("'","''",str_replace('*', '%', $input)).'\'';
diff --git a/model/search.php b/model/search.php
index 9904dc3a..6ed3c053 100644
--- a/model/search.php
+++ b/model/search.php
@@ -25,7 +25,7 @@ public function __construct()
  
     public function get_search_results()
     {
-        global $db_type, $lang_search;
+        global $lang_search;
 
         $search = array();
 
@@ -375,7 +375,9 @@ public function get_search_results()
                                 ->where('p.poster_id', $this->user->id)
                                 ->group_by('t.id');
 
-                    if ($db_type == 'pgsql') {
+                    $feather = \Slim\Slim::getInstance();
+
+                    if ($feather->forum_settings['db_type'] == 'pgsql') {
                         $result = $result->group_by('t.last_post');
                     }
 

From a06a2383a9bfa8e1ab536239ede772de3b3e3088 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 13 Aug 2015 19:22:23 +0200
Subject: [PATCH 034/353] Implement gettext for admin panel

---
 Slim/Extras/Middleware/FeatherBB.php          |   1 -
 controller/admin/bans.php                     |  50 +-
 controller/admin/categories.php               |  48 +-
 controller/admin/censoring.php                |  13 +-
 controller/admin/forums.php                   |  61 +-
 controller/admin/groups.php                   |  43 +-
 controller/admin/index.php                    |  24 +-
 controller/admin/maintenance.php              |  22 +-
 controller/admin/options.php                  |  12 +-
 controller/admin/parser.php                   |  16 +-
 controller/admin/permissions.php              |  13 +-
 controller/admin/plugins.php                  |  11 +-
 controller/admin/reports.php                  |  13 +-
 controller/admin/statistics.php               |  22 +-
 controller/admin/users.php                    |  53 +-
 controller/profile.php                        |   4 +-
 include/common_admin.php                      |  17 +-
 include/functions.php                         |   2 +-
 lang/English/admin/bans.mo                    | Bin 0 -> 4861 bytes
 lang/English/admin/bans.php                   |  67 --
 lang/English/admin/bans.po                    | 183 ++++++
 lang/English/admin/categories.mo              | Bin 0 -> 2167 bytes
 lang/English/admin/categories.php             |  30 -
 lang/English/admin/categories.po              |  84 +++
 lang/English/admin/censoring.mo               | Bin 0 -> 1551 bytes
 lang/English/admin/censoring.php              |  21 -
 lang/English/admin/censoring.po               |  57 ++
 lang/English/admin/common.mo                  | Bin 0 -> 1802 bytes
 lang/English/admin/common.php                 |  45 --
 lang/English/admin/common.po                  | 117 ++++
 lang/English/admin/forums.mo                  | Bin 0 -> 3548 bytes
 lang/English/admin/forums.php                 |  55 --
 lang/English/admin/forums.po                  | 147 +++++
 lang/English/admin/groups.mo                  | Bin 0 -> 8477 bytes
 lang/English/admin/groups.php                 |  91 ---
 lang/English/admin/groups.po                  | 261 ++++++++
 lang/English/admin/index.mo                   | Bin 0 -> 4052 bytes
 lang/English/admin/index.php                  |  63 --
 lang/English/admin/index.po                   | 180 ++++++
 lang/English/admin/maintenance.mo             | Bin 0 -> 4083 bytes
 lang/English/admin/maintenance.php            |  40 --
 lang/English/admin/maintenance.po             | 114 ++++
 lang/English/admin/options.mo                 | Bin 0 -> 18847 bytes
 lang/English/admin/options.php                | 227 -------
 lang/English/admin/options.po                 | 603 ++++++++++++++++++
 lang/English/admin/parser.mo                  | Bin 0 -> 5557 bytes
 lang/English/admin/parser.po                  | 168 +++++
 lang/English/admin/permissions.mo             | Bin 0 -> 2836 bytes
 lang/English/admin/permissions.php            |  36 --
 lang/English/admin/permissions.po             | 102 +++
 lang/English/admin/plugin_example.mo          | Bin 0 -> 1137 bytes
 lang/English/admin/plugin_example.php         |  17 -
 lang/English/admin/plugin_example.po          |  45 ++
 lang/English/admin/reports.mo                 | Bin 0 -> 1083 bytes
 lang/English/admin/reports.php                |  21 -
 lang/English/admin/reports.po                 |  57 ++
 lang/English/admin/users.mo                   | Bin 0 -> 7114 bytes
 lang/English/admin/users.php                  | 110 ----
 lang/English/admin/users.po                   | 312 +++++++++
 model/admin/bans.php                          |  44 +-
 model/admin/categories.php                    |   2 -
 model/admin/censoring.php                     |  16 +-
 model/admin/groups.php                        |  22 +-
 model/admin/maintenance.php                   |  25 +-
 model/admin/options.php                       |  29 +-
 model/admin/permissions.php                   |   4 +-
 model/admin/reports.php                       |   6 +-
 model/admin/statistics.php                    |  27 +-
 model/admin/users.php                         |  57 +-
 style/FeatherBB/view/admin/bans/add_ban.php   |  32 +-
 .../FeatherBB/view/admin/bans/admin_bans.php  |  48 +-
 .../FeatherBB/view/admin/bans/search_ban.php  |  34 +-
 style/FeatherBB/view/admin/categories.php     |  26 +-
 style/FeatherBB/view/admin/censoring.php      |  26 +-
 .../view/admin/forums/admin_forums.php        |  28 +-
 .../view/admin/forums/delete_forum.php        |  10 +-
 .../view/admin/forums/permissions.php         |  38 +-
 .../view/admin/groups/add_edit_group.php      | 184 +++---
 .../view/admin/groups/admin_groups.php        |  22 +-
 .../view/admin/groups/confirm_delete.php      |  10 +-
 .../view/admin/groups/delete_group.php        |  10 +-
 style/FeatherBB/view/admin/index.php          |  40 +-
 .../admin/maintenance/admin_maintenance.php   |  46 +-
 .../view/admin/maintenance/prune.php          |  10 +-
 .../view/admin/maintenance/rebuild.php        |   2 +-
 style/FeatherBB/view/admin/menu.php           |  30 +-
 style/FeatherBB/view/admin/options.php        | 474 +++++++-------
 style/FeatherBB/view/admin/parser.php         |  32 +-
 style/FeatherBB/view/admin/permissions.php    | 100 +--
 style/FeatherBB/view/admin/reports.php        |  28 +-
 style/FeatherBB/view/admin/statistics.php     |  20 +-
 .../view/admin/users/admin_users.php          |  96 +--
 .../FeatherBB/view/admin/users/ban_users.php  |  22 +-
 .../view/admin/users/delete_users.php         |  12 +-
 .../FeatherBB/view/admin/users/find_users.php |  38 +-
 .../FeatherBB/view/admin/users/move_users.php |  10 +-
 .../FeatherBB/view/admin/users/search_ip.php  |  26 +-
 .../FeatherBB/view/admin/users/show_users.php |  32 +-
 view/admin/bans/add_ban.php                   |  32 +-
 view/admin/bans/admin_bans.php                |  48 +-
 view/admin/bans/search_ban.php                |  34 +-
 view/admin/categories.php                     |  26 +-
 view/admin/censoring.php                      |  26 +-
 view/admin/forums/admin_forums.php            |  28 +-
 view/admin/forums/delete_forum.php            |  10 +-
 view/admin/forums/permissions.php             |  38 +-
 view/admin/groups/add_edit_group.php          | 184 +++---
 view/admin/groups/admin_groups.php            |  22 +-
 view/admin/groups/confirm_delete.php          |  10 +-
 view/admin/groups/delete_group.php            |  10 +-
 view/admin/index.php                          |  40 +-
 view/admin/maintenance/admin_maintenance.php  |  46 +-
 view/admin/maintenance/prune.php              |  10 +-
 view/admin/maintenance/rebuild.php            |   2 +-
 view/admin/menu.php                           |  30 +-
 view/admin/options.php                        | 474 +++++++-------
 view/admin/parser.php                         |  32 +-
 view/admin/permissions.php                    | 100 +--
 view/admin/reports.php                        |  28 +-
 view/admin/statistics.php                     |  20 +-
 view/admin/users/admin_users.php              |  96 +--
 view/admin/users/ban_users.php                |  22 +-
 view/admin/users/delete_users.php             |  12 +-
 view/admin/users/find_users.php               |  38 +-
 view/admin/users/move_users.php               |  10 +-
 view/admin/users/search_ip.php                |  26 +-
 view/admin/users/show_users.php               |  32 +-
 127 files changed, 4100 insertions(+), 2782 deletions(-)
 create mode 100644 lang/English/admin/bans.mo
 delete mode 100644 lang/English/admin/bans.php
 create mode 100644 lang/English/admin/bans.po
 create mode 100644 lang/English/admin/categories.mo
 delete mode 100644 lang/English/admin/categories.php
 create mode 100644 lang/English/admin/categories.po
 create mode 100644 lang/English/admin/censoring.mo
 delete mode 100644 lang/English/admin/censoring.php
 create mode 100644 lang/English/admin/censoring.po
 create mode 100644 lang/English/admin/common.mo
 delete mode 100644 lang/English/admin/common.php
 create mode 100644 lang/English/admin/common.po
 create mode 100644 lang/English/admin/forums.mo
 delete mode 100644 lang/English/admin/forums.php
 create mode 100644 lang/English/admin/forums.po
 create mode 100644 lang/English/admin/groups.mo
 delete mode 100644 lang/English/admin/groups.php
 create mode 100644 lang/English/admin/groups.po
 create mode 100644 lang/English/admin/index.mo
 delete mode 100644 lang/English/admin/index.php
 create mode 100644 lang/English/admin/index.po
 create mode 100644 lang/English/admin/maintenance.mo
 delete mode 100644 lang/English/admin/maintenance.php
 create mode 100644 lang/English/admin/maintenance.po
 create mode 100644 lang/English/admin/options.mo
 delete mode 100644 lang/English/admin/options.php
 create mode 100644 lang/English/admin/options.po
 create mode 100644 lang/English/admin/parser.mo
 create mode 100644 lang/English/admin/parser.po
 create mode 100644 lang/English/admin/permissions.mo
 delete mode 100644 lang/English/admin/permissions.php
 create mode 100644 lang/English/admin/permissions.po
 create mode 100644 lang/English/admin/plugin_example.mo
 delete mode 100644 lang/English/admin/plugin_example.php
 create mode 100644 lang/English/admin/plugin_example.po
 create mode 100644 lang/English/admin/reports.mo
 delete mode 100644 lang/English/admin/reports.php
 create mode 100644 lang/English/admin/reports.po
 create mode 100644 lang/English/admin/users.mo
 delete mode 100644 lang/English/admin/users.php
 create mode 100644 lang/English/admin/users.po

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 5c533212..d6b6a3f3 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -362,7 +362,6 @@ public function call()
 
             $this->authenticate();
 
-            // Attempt to load the common language file
             // Load l10n
             require $this->data['forum_env']['FEATHER_ROOT'].'include/pomo/MO.php';
             require $this->data['forum_env']['FEATHER_ROOT'].'include/l10n.php';
diff --git a/controller/admin/bans.php b/controller/admin/bans.php
index 6e544bc1..4d8af8a5 100644
--- a/controller/admin/bans.php
+++ b/controller/admin/bans.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\admin\bans();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/bans.mo');
+        require FEATHER_ROOT . 'include/common_admin.php';
     }
 
     public function __autoload($class_name)
@@ -30,19 +32,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common, $lang_admin_bans;
-
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        require FEATHER_ROOT . 'include/common_admin.php';
-
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
             message(__('No permission'), '403');
         }
 
-        // Load the admin_bans.php language file
-        require FEATHER_ROOT . 'lang/' . $admin_language . '/bans.php';
-
         // Display bans
         if ($this->request->get('find_ban')) {
             $ban_info = $this->model->find_ban();
@@ -56,7 +51,7 @@ public function display()
             // Generate paging links
             $paging_links = '<span class="pages-label">' . __('Pages') . ' </span>' . paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str']));
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Bans'], $lang_admin_bans['Results head']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'), __('Results head'));
             define('FEATHER_ACTIVE_PAGE', 'admin');
             
             $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
@@ -64,8 +59,6 @@ public function display()
             $ban_data = $this->model->find_ban($start_from);
 
             $this->feather->render('admin/bans/search_ban.php', array(
-                    'lang_admin_bans' => $lang_admin_bans,
-                    'lang_admin_common' => $lang_admin_common,
                     'ban_data' => $ban_data['data'],
                 )
             );
@@ -73,7 +66,7 @@ public function display()
             $this->footer->display();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Bans']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
         $focus_element = array('bans', 'new_ban_user');
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
@@ -82,35 +75,24 @@ public function display()
 
         generate_admin_menu('bans');
 
-        $this->feather->render('admin/bans/admin_bans.php', array(
-                'lang_admin_bans' => $lang_admin_bans,
-                'lang_admin_common' => $lang_admin_common,
-            )
-        );
+        $this->feather->render('admin/bans/admin_bans.php');
 
         $this->footer->display();
     }
 
     public function add($id = null)
     {
-        global $lang_admin_common, $lang_admin_bans;
-
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        require FEATHER_ROOT . 'include/common_admin.php';
-
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
             message(__('No permission'), '403');
         }
 
-        // Load the admin_bans.php language file
-        require FEATHER_ROOT . 'lang/' . $admin_language . '/bans.php';
-
         if ($this->request->post('add_edit_ban')) {
             $this->model->insert_ban();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Bans']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
         $focus_element = array('bans2', 'ban_user');
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
@@ -120,8 +102,6 @@ public function add($id = null)
         generate_admin_menu('bans');
 
         $this->feather->render('admin/bans/add_ban.php', array(
-                'lang_admin_bans' => $lang_admin_bans,
-                'lang_admin_common' => $lang_admin_common,
                 'ban' => $this->model->add_ban_info($id),
             )
         );
@@ -131,41 +111,27 @@ public function add($id = null)
 
     public function delete($id)
     {
-        global $lang_admin_common, $lang_admin_bans;
-
-        require FEATHER_ROOT . 'include/common_admin.php';
-
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
             message(__('No permission'), '403');
         }
 
-        // Load the admin_bans.php language file
-        require FEATHER_ROOT . 'lang/' . $admin_language . '/bans.php';
-
         // Remove the ban
         $this->model->remove_ban($id);
     }
 
     public function edit($id)
     {
-        global $lang_admin_common, $lang_admin_bans;
-
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        require FEATHER_ROOT . 'include/common_admin.php';
-
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
             message(__('No permission'), '403');
         }
 
-        // Load the admin_bans.php language file
-        require FEATHER_ROOT . 'lang/' . $admin_language . '/bans.php';
-
         if ($this->request->post('add_edit_ban')) {
             $this->model->insert_ban();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Bans']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
         $focus_element = array('bans2', 'ban_user');
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
@@ -175,8 +141,6 @@ public function edit($id)
         generate_admin_menu('bans');
 
         $this->feather->render('admin/bans/add_ban.php', array(
-                'lang_admin_bans' => $lang_admin_bans,
-                'lang_admin_common' => $lang_admin_common,
                 'ban' => $this->model->edit_ban_info($id),
             )
         );
diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index 07ddbe5b..242843db 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\admin\categories();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/categories.mo');
+        require FEATHER_ROOT . 'include/common_admin.php';
     }
 
     public function __autoload($class_name)
@@ -30,51 +32,38 @@ public function __autoload($class_name)
 
     public function add_category()
     {
-        global $lang_admin_common, $lang_admin_categories;
-
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
-        // Load the admin_options.php language file
-        require FEATHER_ROOT.'include/common_admin.php';
-        require FEATHER_ROOT.'lang/'.$admin_language.'/categories.php';
-
         $cat_name = feather_trim($this->request->post('cat_name'));
         if ($cat_name == '') {
-            redirect(get_link('admin/categories/'), $lang_admin_categories['Must enter name message']);
+            redirect(get_link('admin/categories/'), __('Must enter name message'));
         }
 
         if ($this->model->add_category($cat_name)) {
-            redirect(get_link('admin/categories/'), $lang_admin_categories['Category added redirect']);
+            redirect(get_link('admin/categories/'), __('Category added redirect'));
         } else { //TODO, add error message
-            redirect(get_link('admin/categories/'), $lang_admin_categories['Category added redirect']);
+            redirect(get_link('admin/categories/'), __('Category added redirect'));
         }
     }
 
     public function edit_categories()
     {
-        global $lang_admin_common, $lang_admin_categories;
-
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
-        // Load the admin_options.php language file
-        require FEATHER_ROOT.'include/common_admin.php';
-        require FEATHER_ROOT.'lang/'.$admin_language.'/categories.php';
-
         if (empty($this->request->post('cat'))) {
             message(__('Bad request'), '404');
         }
 
-        $categories = array();
         foreach ($this->request->post('cat') as $cat_id => $properties) {
             $category = array('id' => (int) $cat_id,
                               'name' => feather_escape($properties['name']),
                               'order' => (int) $properties['order'], );
             if ($category['name'] == '') {
-                redirect(get_link('admin/categories/'), $lang_admin_categories['Must enter name message']);
+                redirect(get_link('admin/categories/'), __('Must enter name message'));
             }
             $this->model->update_category($category);
         }
@@ -85,21 +74,15 @@ public function edit_categories()
         }
         generate_quickjump_cache();
 
-        redirect(get_link('admin/categories/'), $lang_admin_categories['Categories updated redirect']);
+        redirect(get_link('admin/categories/'), __('Categories updated redirect'));
     }
 
     public function delete_category()
     {
-        global $lang_admin_common, $lang_admin_categories;
-
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
-        // Load the admin_options.php language file
-        require FEATHER_ROOT.'include/common_admin.php';
-        require FEATHER_ROOT.'lang/'.$admin_language.'/categories.php';
-
         $cat_to_delete = (int) $this->request->post('cat_to_delete');
 
         if ($cat_to_delete < 1) {
@@ -107,32 +90,25 @@ public function delete_category()
         }
 
         if (intval($this->request->post('disclaimer')) != 1) {
-            redirect(get_link('admin/categories/'), $lang_admin_categories['Delete category not validated']);
+            redirect(get_link('admin/categories/'), __('Delete category not validated'));
         }
 
         if ($this->model->delete_category($cat_to_delete)) {
-            redirect(get_link('admin/categories/'), $lang_admin_categories['Category deleted redirect']);
+            redirect(get_link('admin/categories/'), __('Category deleted redirect'));
         } else {
-            redirect(get_link('admin/categories/'), $lang_admin_categories['Unable to delete category']);
+            redirect(get_link('admin/categories/'), __('Unable to delete category'));
         }
     }
 
     public function display()
     {
-        global $lang_admin_common, $lang_admin_categories;
-
-        require FEATHER_ROOT.'include/common_admin.php';
-
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        // Load the admin_options.php language file
-        require FEATHER_ROOT.'lang/'.$admin_language.'/categories.php';
-
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Categories']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Categories'));
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -141,8 +117,6 @@ public function display()
         generate_admin_menu('categories');
 
         $this->feather->render('admin/categories.php', array(
-                'lang_admin_categories' => $lang_admin_categories,
-                'lang_admin_common' => $lang_admin_common,
                 'cat_list' => $this->model->get_cat_list(),
             ));
 
diff --git a/controller/admin/censoring.php b/controller/admin/censoring.php
index 469ef9cc..3764e393 100644
--- a/controller/admin/censoring.php
+++ b/controller/admin/censoring.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\admin\censoring();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/censoring.mo');
+        require FEATHER_ROOT . 'include/common_admin.php';
     }
 
     public function __autoload($class_name)
@@ -30,19 +32,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common, $lang_admin_censoring;
-
-        require FEATHER_ROOT.'include/common_admin.php';
-
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        // Load the admin_options.php language file
-        require FEATHER_ROOT.'lang/'.$admin_language.'/censoring.php';
-
         // Add a censor word
         if ($this->request->post('add_word')) {
             $this->model->add_word();
@@ -58,7 +53,7 @@ public function display()
             $this->model->remove_word();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Censoring']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Censoring'));
         $focus_element = array('censoring', 'new_search_for');
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
@@ -68,8 +63,6 @@ public function display()
         generate_admin_menu('censoring');
 
         $this->feather->render('admin/censoring.php', array(
-                'lang_admin_censoring'    =>    $lang_admin_censoring,
-                'lang_admin_common'    =>    $lang_admin_common,
                 'feather_config'    =>    $this->config,
                 'word_data'    =>    $this->model->get_words(),
             )
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index 3d0e3610..e71517f5 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\admin\forums();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/forums.mo');
+        require FEATHER_ROOT . 'include/common_admin.php';
     }
 
     public function __autoload($class_name)
@@ -34,23 +36,17 @@ public function __autoload($class_name)
 
     public function add_forum()
     {
-        global $lang_admin_common, $lang_admin_forums;
-
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
-        // Load the admin_options.php language file
-        require FEATHER_ROOT.'include/common_admin.php';
-        require FEATHER_ROOT.'lang/'.$admin_language.'/forums.php';
-
         $cat_id = (int) $this->request->post('cat');
 
         if ($cat_id < 1) {
-            redirect(get_link('admin/forums/'), $lang_admin_forums['Must be valid category']);
+            redirect(get_link('admin/forums/'), __('Must be valid category'));
         }
 
-        if ($fid = $this->model->add_forum($cat_id, $lang_admin_forums['New forum'])) {
+        if ($fid = $this->model->add_forum($cat_id, __('New forum'))) {
             // Regenerate the quick jump cache
             if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
                 require FEATHER_ROOT.'include/cache.php';
@@ -58,24 +54,18 @@ public function add_forum()
 
             generate_quickjump_cache();
 
-            redirect(get_link('admin/forums/edit/'.$fid.'/'), $lang_admin_forums['Forum added redirect']);
+            redirect(get_link('admin/forums/edit/'.$fid.'/'), __('Forum added redirect'));
         } else {
-            redirect(get_link('admin/forums/'), $lang_admin_forums['Unable to add forum']);
+            redirect(get_link('admin/forums/'), __('Unable to add forum'));
         }
     }
 
     public function edit_forum($forum_id)
     {
-        global $lang_admin_common, $lang_admin_forums;
-
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
-        // Load the admin_options.php language file
-        require FEATHER_ROOT.'include/common_admin.php';
-        require FEATHER_ROOT.'lang/'.$admin_language.'/forums.php';
-
         if($this->request->isPost()) {
             if ($this->request->post('save') && $this->request->post('read_forum_old')) {
 
@@ -87,10 +77,10 @@ public function edit_forum($forum_id)
                                     'redirect_url' => url_valid($this->request->post('redirect_url')) ? feather_escape($this->request->post('redirect_url')) : NULL);
 
                 if ($forum_data['forum_name'] == '') {
-                    redirect(get_link('admin/forums/edit/'.$forum_id.'/'), $lang_admin_forums['Must enter name message']);
+                    redirect(get_link('admin/forums/edit/'.$forum_id.'/'), __('Must enter name message'));
                 }
                 if ($forum_data['cat_id'] < 1) {
-                    redirect(get_link('admin/forums/edit/'.$forum_id.'/'), $lang_admin_forums['Must be valid category']);
+                    redirect(get_link('admin/forums/edit/'.$forum_id.'/'), __('Must be valid category'));
                 }
 
                 $this->model->update_forum($forum_id, $forum_data);
@@ -129,7 +119,7 @@ public function edit_forum($forum_id)
                 }
                 generate_quickjump_cache();
 
-                redirect(get_link('admin/forums/edit/'.$forum_id.'/'), $lang_admin_forums['Forum updated redirect']);
+                redirect(get_link('admin/forums/edit/'.$forum_id.'/'), __('Forum updated redirect'));
                 
             } elseif ($this->request->post('revert_perms')) {
                 $this->model->delete_permissions($forum_id);
@@ -140,14 +130,14 @@ public function edit_forum($forum_id)
                 }
                 generate_quickjump_cache();
 
-                redirect(get_link('admin/forums/edit/'.$forum_id.'/'), $lang_admin_forums['Perms reverted redirect']);
+                redirect(get_link('admin/forums/edit/'.$forum_id.'/'), __('Perms reverted redirect'));
             }
 
         } else {
 
             define('FEATHER_ADMIN_CONSOLE', 1);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Forums']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums'));
 
             define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -156,8 +146,6 @@ public function edit_forum($forum_id)
             generate_admin_menu('forums');
 
             $this->feather->render('admin/forums/permissions.php', array(
-                    'lang_admin_forums' => $lang_admin_forums,
-                    'lang_admin_common' => $lang_admin_common,
                     'feather_config' => $this->config,
                     'perm_data' => $this->model->get_permissions($forum_id),
                     'cur_index'     =>  7,
@@ -172,18 +160,12 @@ public function edit_forum($forum_id)
 
     public function delete_forum($forum_id)
     {
-        global $lang_admin_common, $lang_admin_forums;
-
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        // Load the admin_options.php language file
-        require FEATHER_ROOT.'include/common_admin.php';
-        require FEATHER_ROOT.'lang/'.$admin_language.'/forums.php';
-
         if($this->request->isPost()) {
             $this->model->delete_forum($forum_id);
             // Regenerate the quick jump cache
@@ -193,11 +175,11 @@ public function delete_forum($forum_id)
 
             generate_quickjump_cache();
 
-            redirect(get_link('admin/forums/'), $lang_admin_forums['Forum deleted redirect']);
+            redirect(get_link('admin/forums/'), __('Forum deleted redirect'));
 
         } else { // If the user hasn't confirmed the delete
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Forums']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums'));
 
             define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -206,8 +188,6 @@ public function delete_forum($forum_id)
             generate_admin_menu('forums');
 
             $this->feather->render('admin/forums/delete_forum.php', array(
-                    'lang_admin_forums' => $lang_admin_forums,
-                    'lang_admin_common' => $lang_admin_common,
                     'cur_forum' => $this->model->get_forum_info($forum_id),
                 )
             );
@@ -220,8 +200,6 @@ public function delete_forum($forum_id)
 
     public function edit_positions()
     {
-        global $lang_admin_forums;
-
         foreach ($this->request->post('position') as $forum_id => $position) {
             $position = (int) feather_trim($position);
             $this->model->update_positions($forum_id, $position);
@@ -234,29 +212,22 @@ public function edit_positions()
 
         generate_quickjump_cache();
 
-        redirect(get_link('admin/forums/'), $lang_admin_forums['Forums updated redirect']);
+        redirect(get_link('admin/forums/'), __('Forums updated redirect'));
     }
     
     public function display()
     {
-        global $lang_admin_common, $lang_admin_forums;
-
-        require FEATHER_ROOT . 'include/common_admin.php';
-
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        // Load the admin_options.php language file
-        require FEATHER_ROOT . 'lang/' . $admin_language . '/forums.php';
-
         if ($this->request->post('update_positions')) {
             $this->edit_positions();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Forums']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums'));
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -265,8 +236,6 @@ public function display()
         generate_admin_menu('forums');
 
         $this->feather->render('admin/forums/admin_forums.php', array(
-                'lang_admin_forums' => $lang_admin_forums,
-                'lang_admin_common' => $lang_admin_common,
                 'feather_config' => $this->config,
                 'forum_data'    =>  $this->model->get_forums(),
                 'cur_index'     =>  4,
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index efae5d16..ec69692b 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\admin\groups();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/groups.mo');
+        require FEATHER_ROOT . 'include/common_admin.php';
     }
 
     public function __autoload($class_name)
@@ -30,19 +32,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common, $lang_admin_groups;
-
-        require FEATHER_ROOT.'include/common_admin.php';
-
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        // Load the admin_groups.php language file
-        require FEATHER_ROOT.'lang/'.$admin_language.'/groups.php';
-
         $groups = $this->model->fetch_groups();
 
         // Set default group
@@ -50,7 +45,7 @@ public function display()
             $this->model->set_default_group($groups, $this->feather);
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['User groups']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -59,8 +54,6 @@ public function display()
         generate_admin_menu('groups');
 
         $this->feather->render('admin/groups/admin_groups.php', array(
-                'lang_admin_groups'    =>    $lang_admin_groups,
-                'lang_admin_common'    =>    $lang_admin_common,
                 'feather_config'    =>    $this->config,
                 'groups' => $groups,
                 'cur_index' => 5,
@@ -72,26 +65,19 @@ public function display()
 
     public function delete($id)
     {
-        global $lang_admin_common, $lang_admin_groups;
-
-        require FEATHER_ROOT . 'include/common_admin.php';
-
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        // Load the admin_groups.php language file
-        require FEATHER_ROOT . 'lang/' . $admin_language . '/groups.php';
-
         if ($id < 5) {
             message(__('Bad request'), '404');
         }
 
         // Make sure we don't remove the default group
         if ($id == $this->config['o_default_user_group']) {
-            message($lang_admin_groups['Cannot remove default message']);
+            message(__('Cannot remove default message'));
         }
 
         // Check if this group has any members
@@ -104,7 +90,7 @@ public function delete($id)
             } else {
                 $group_title = $this->model->get_group_title($id);
 
-                $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['User groups']);
+                $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
 
                 define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -113,8 +99,6 @@ public function delete($id)
                 generate_admin_menu('groups');
 
                 $this->feather->render('admin/groups/confirm_delete.php', array(
-                        'lang_admin_groups'    =>    $lang_admin_groups,
-                        'lang_admin_common'    =>    $lang_admin_common,
                         'group_title'      =>  $group_title,
                         'id'    => $id,
                     )
@@ -124,7 +108,7 @@ public function delete($id)
             }
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['User groups']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -133,8 +117,6 @@ public function delete($id)
         generate_admin_menu('groups');
 
         $this->feather->render('admin/groups/delete_group.php', array(
-                'lang_admin_groups'    =>    $lang_admin_groups,
-                'lang_admin_common'    =>    $lang_admin_common,
                 'id'    => $id,
                 'group_info'      =>  $this->model->get_title_members($id),
             )
@@ -145,19 +127,12 @@ public function delete($id)
 
     public function addedit($id = '')
     {
-        global $lang_admin_common, $lang_admin_groups;
-
-        require FEATHER_ROOT.'include/common_admin.php';
-
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        // Load the admin_groups.php language file
-        require FEATHER_ROOT.'lang/'.$admin_language.'/groups.php';
-
         $groups = $this->model->fetch_groups();
 
         // Add/edit a group (stage 2)
@@ -167,8 +142,8 @@ public function addedit($id = '')
 
         // Add/edit a group (stage 1)
         elseif ($this->request->post('add_group') || isset($id)) {
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['User groups']);
-            $required_fields = array('req_title' => $lang_admin_groups['Group title label']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
+            $required_fields = array('req_title' => __('Group title label'));
             $focus_element = array('groups2', 'req_title');
 
             define('FEATHER_ACTIVE_PAGE', 'admin');
@@ -180,8 +155,6 @@ public function addedit($id = '')
             $group = $this->model->info_add_group($groups, $id);
 
             $this->feather->render('admin/groups/add_edit_group.php', array(
-                    'lang_admin_groups'    =>    $lang_admin_groups,
-                    'lang_admin_common'    =>    $lang_admin_common,
                     'feather_config'    =>    $this->config,
                     'group'    =>    $group,
                     'groups'    =>    $groups,
diff --git a/controller/admin/index.php b/controller/admin/index.php
index 08dedaa1..5996a35f 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -20,6 +20,8 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/index.mo');
+        require FEATHER_ROOT . 'include/common_admin.php';
     }
 
     public function __autoload($class_name)
@@ -44,34 +46,27 @@ public function remove_install_folder($directory)
     
     public function display($action = null)
     {
-        global $lang_admin_common, $lang_admin_index;
-
-        require FEATHER_ROOT.'include/common_admin.php';
-
         if (!$this->user->is_admmod) {
             message(__('No permission'), '403');
         }
 
-        // Load the admin_index.php language file
-        require FEATHER_ROOT.'lang/'.$admin_language.'/index.php';
-
         define('FEATHER_ADMIN_CONSOLE', 1);
 
         // Check for upgrade
         if ($action == 'check_upgrade') {
             if (!ini_get('allow_url_fopen')) {
-                message($lang_admin_index['fopen disabled message']);
+                message(__('fopen disabled message'));
             }
 
             $latest_version = trim(@file_get_contents('http://featherbb.org/latest_version'));
             if (empty($latest_version)) {
-                message($lang_admin_index['Upgrade check failed message']);
+                message(__('Upgrade check failed message'));
             }
 
             if (version_compare($this->config['o_cur_version'], $latest_version, '>=')) {
-                message($lang_admin_index['Running latest version message']);
+                message(__('Running latest version message'));
             } else {
-                message(sprintf($lang_admin_index['New version available message'], '<a href="http://featherbb.org/">FeatherBB.org</a>'));
+                message(sprintf(__('New version available message'), '<a href="http://featherbb.org/">FeatherBB.org</a>'));
             }
         }
         // Remove /install
@@ -79,15 +74,15 @@ public function display($action = null)
             $deleted = $this->remove_install_folder(FEATHER_ROOT.'install');
 
             if ($deleted) {
-                redirect(get_link('admin/'), $lang_admin_index['Deleted install.php redirect']);
+                redirect(get_link('admin/'), __('Deleted install.php redirect'));
             } else {
-                message($lang_admin_index['Delete install.php failed']);
+                message(__('Delete install.php failed'));
             }
         }
 
         $install_folder_exists = is_dir(FEATHER_ROOT.'install');
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Index']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Index'));
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -96,7 +91,6 @@ public function display($action = null)
         generate_admin_menu('index');
 
         $this->feather->render('admin/index.php', array(
-                            'lang_admin_index'    =>    $lang_admin_index,
                             'install_file_exists'    =>    $install_folder_exists,
                             'feather_config'    =>    $this->config,
                             )
diff --git a/controller/admin/maintenance.php b/controller/admin/maintenance.php
index a5bfbc11..f18def31 100644
--- a/controller/admin/maintenance.php
+++ b/controller/admin/maintenance.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\admin\maintenance();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/maintenance.mo');
+        require FEATHER_ROOT . 'include/common_admin.php';
     }
 
     public function __autoload($class_name)
@@ -30,19 +32,12 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_maintenance, $lang_admin_common;
-
-        require FEATHER_ROOT.'include/common_admin.php';
-
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        // Load the admin_options.php language file
-        require FEATHER_ROOT.'lang/'.$admin_language.'/maintenance.php';
-
         $action = '';
         if ($this->request->post('action')) {
             $action = $this->request->post('action');
@@ -53,24 +48,23 @@ public function display()
         if ($action == 'rebuild') {
             $this->model->rebuild();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_maintenance['Rebuilding search index']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Rebuilding search index'));
 
             $this->feather->render('admin/maintenance/rebuild.php', array(
-                    'lang_admin_maintenance'    =>    $lang_admin_maintenance,
                     'page_title'    =>    $page_title,
                 )
             );
 
             $query_str = $this->model->get_query_str();
 
-            exit('<script type="text/javascript">window.location="'.get_link('admin/maintenance/').$query_str.'"</script><hr /><p>'.sprintf($lang_admin_maintenance['Javascript redirect failed'], '<a href="'.get_link('admin/maintenance/').$query_str.'">'.$lang_admin_maintenance['Click here'].'</a>').'</p>');
+            exit('<script type="text/javascript">window.location="'.get_link('admin/maintenance/').$query_str.'"</script><hr /><p>'.sprintf(__('Javascript redirect failed'), '<a href="'.get_link('admin/maintenance/').$query_str.'">'.__('Click here').'</a>').'</p>');
         }
 
         if ($action == 'prune') {
             $prune_from = feather_trim($this->request->post('prune_from'));
             $prune_sticky = intval($this->request->post('prune_sticky'));
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Prune']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Prune'));
 
             define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -83,8 +77,6 @@ public function display()
             }
 
             $this->feather->render('admin/maintenance/prune.php', array(
-                    'lang_admin_maintenance'    =>    $lang_admin_maintenance,
-                    'lang_admin_common'    =>    $lang_admin_common,
                     'prune_sticky'    =>    $prune_sticky,
                     'prune_from'    =>    $prune_from,
                     'prune' => $this->model->get_info_prune($prune_sticky, $prune_from),
@@ -94,7 +86,7 @@ public function display()
             $this->footer->display();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Maintenance']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Maintenance'));
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -103,8 +95,6 @@ public function display()
         generate_admin_menu('maintenance');
 
         $this->feather->render('admin/maintenance/admin_maintenance.php', array(
-                'lang_admin_maintenance'    =>    $lang_admin_maintenance,
-                'lang_admin_common'    =>    $lang_admin_common,
                 'first_id' => $this->model->get_first_id(),
                 'categories' => $this->model->get_categories(),
             )
diff --git a/controller/admin/options.php b/controller/admin/options.php
index 07e43253..05a06bcc 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\admin\options();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/options.mo');
+        require FEATHER_ROOT . 'include/common_admin.php';
     }
 
     public function __autoload($class_name)
@@ -30,24 +32,17 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common;
-
-        require FEATHER_ROOT.'include/common_admin.php';
-
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        // Load the admin_options.php language file
-        require FEATHER_ROOT.'lang/'.$admin_language.'/options.php';
-
         if ($this->feather->request->isPost()) {
             $this->model->update_options();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Options']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Options'));
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -56,7 +51,6 @@ public function display()
         generate_admin_menu('options');
 
         $this->feather->render('admin/options.php', array(
-                'lang_admin_options'    =>    $lang_admin_options,
                 'feather_config'    =>    $this->config,
                 'feather_user'    =>    $this->user,
                 'languages' => forum_list_langs(),
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index 650869f3..0a3eee9e 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\admin\parser();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/parser.mo');
+        require FEATHER_ROOT . 'include/common_admin.php';
     }
 
     public function __autoload($class_name)
@@ -30,18 +32,16 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_parser, $lang_admin_common;
-
-        require FEATHER_ROOT.'include/common_admin.php';
+        global $lang_admin_parser;
 
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
+        // Legacy
+        require FEATHER_ROOT . 'lang/' . $this->user->language . '/admin/parser.php';
 
-        // Load the admin_options.php language file
-        require FEATHER_ROOT.'lang/'.$admin_language.'/parser.php';
+        define('FEATHER_ADMIN_CONSOLE', 1);
 
         // This is where the parser data lives and breathes.
         $cache_file = FEATHER_ROOT.'cache/cache_parser_data.php';
@@ -212,7 +212,7 @@ public function display()
         }
 
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Parser']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Parser'));
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -222,7 +222,7 @@ public function display()
 
         $this->feather->render('admin/parser.php', array(
                 'lang_admin_parser'    =>    $lang_admin_parser,
-                'lang_admin_common'    =>    $lang_admin_common,
+
                 'smiley_files' => $this->model->get_smiley_files(),
                 'bbcd' =>   $bbcd,
                 'config' => $config,
diff --git a/controller/admin/permissions.php b/controller/admin/permissions.php
index f503b775..27cd6b63 100644
--- a/controller/admin/permissions.php
+++ b/controller/admin/permissions.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\admin\permissions();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/permissions.mo');
+        require FEATHER_ROOT . 'include/common_admin.php';
     }
 
     public function __autoload($class_name)
@@ -30,25 +32,18 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common, $lang_admin_permissions;
-
-        require FEATHER_ROOT.'include/common_admin.php';
-
         if (!$this->user->is_admmod) {
             message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        // Load the admin_options.php language file
-        require FEATHER_ROOT.'lang/'.$admin_language.'/permissions.php';
-
         // Update permissions
         if ($this->feather->request->isPost()) {
             $this->model->update_permissions();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Permissions']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Permissions'));
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -57,8 +52,6 @@ public function display()
         generate_admin_menu('permissions');
 
         $this->feather->render('admin/permissions.php', array(
-                'lang_admin_permissions'    =>    $lang_admin_permissions,
-                'lang_admin_common'    =>    $lang_admin_common,
                 'feather_config'    =>    $this->config,
             )
         );
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index ef747bd9..32d2395c 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\admin\plugins();
+        require FEATHER_ROOT . 'include/common_admin.php';
     }
 
     public function __autoload($class_name)
@@ -30,10 +31,6 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common;
-
-        require FEATHER_ROOT.'include/common_admin.php';
-
         if (!$this->user->is_admmod) {
             message(__('No permission'), '403');
         }
@@ -54,7 +51,7 @@ public function display()
 
         // Make sure the file actually exists
         if (!file_exists(FEATHER_ROOT.'plugins/'.$plugin)) {
-            message(sprintf($lang_admin_common['No plugin message'], $plugin));
+            message(sprintf(__('No plugin message'), $plugin));
         }
 
         // Construct REQUEST_URI if it isn't set TODO?
@@ -62,7 +59,7 @@ public function display()
             $_SERVER['REQUEST_URI'] = (isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : '').'?'.(isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '');
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], str_replace('_', ' ', substr($plugin, strpos($plugin, '_') + 1, -4)));
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), str_replace('_', ' ', substr($plugin, strpos($plugin, '_') + 1, -4)));
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -73,7 +70,7 @@ public function display()
         // get the "blank page of death"
         include FEATHER_ROOT.'plugins/'.$plugin;
         if (!defined('FEATHER_PLUGIN_LOADED')) {
-            message(sprintf($lang_admin_common['Plugin failed message'], $plugin));
+            message(sprintf(__('Plugin failed message'), $plugin));
         }
 
         $this->feather->render('admin/loader.php');
diff --git a/controller/admin/reports.php b/controller/admin/reports.php
index 681f2838..80d956f1 100644
--- a/controller/admin/reports.php
+++ b/controller/admin/reports.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\admin\reports();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/reports.mo');
+        require FEATHER_ROOT . 'include/common_admin.php';
     }
 
     public function __autoload($class_name)
@@ -30,25 +32,18 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common, $lang_admin_reports;
-
-        require FEATHER_ROOT.'include/common_admin.php';
-
         if (!$this->user->is_admmod) {
             message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        // Load the admin_options.php language file
-        require FEATHER_ROOT.'lang/'.$admin_language.'/reports.php';
-
         // Zap a report
         if ($this->feather->request->isPost()) {
             $this->model->zap_report();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Reports']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Reports'));
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -57,8 +52,6 @@ public function display()
         generate_admin_menu('reports');
 
         $this->feather->render('admin/reports.php', array(
-                'lang_admin_reports'    =>    $lang_admin_reports,
-                'lang_admin_common'    =>    $lang_admin_common,
                 'report_data'   =>  $this->model->get_reports(),
                 'report_zapped_data'   =>  $this->model->get_zapped_reports(),
             )
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index 6b442a66..27c9d46b 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\admin\statistics();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/index.mo');
+        require FEATHER_ROOT . 'include/common_admin.php';
     }
 
     public function __autoload($class_name)
@@ -30,20 +32,13 @@ public function __autoload($class_name)
     
     public function display()
     {
-        global $lang_admin_common, $lang_admin_index;
-
-        require FEATHER_ROOT.'include/common_admin.php';
-
         if (!$this->user->is_admmod) {
             message(__('No permission'), '403');
         }
 
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        // Load the admin_index.php language file
-        require FEATHER_ROOT.'lang/'.$admin_language.'/index.php';
-
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Server statistics']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Server statistics'));
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
 
@@ -54,8 +49,6 @@ public function display()
         $total = $this->model->get_total_size();
 
         $this->feather->render('admin/statistics.php', array(
-                'lang_admin_common'    =>    $lang_admin_common,
-                'lang_admin_index'    =>    $lang_admin_index,
                 'feather_config'    =>    $this->config,
                 'server_load'    =>    $this->model->get_server_load(),
                 'num_online'    =>    $this->model->get_num_online(),
@@ -72,13 +65,6 @@ public function display()
 
     public function phpinfo()
     {
-        global $lang_admin_common, $lang_admin_index;
-
-        require FEATHER_ROOT.'include/common_admin.php';
-
-        // Load the admin_index.php language file
-        require FEATHER_ROOT.'lang/'.$admin_language.'/index.php';
-
         if ($this->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
@@ -86,7 +72,7 @@ public function phpinfo()
         // Show phpinfo() output
         // Is phpinfo() a disabled function?
         if (strpos(strtolower((string) ini_get('disable_functions')), 'phpinfo') !== false) {
-            message($lang_admin_index['PHPinfo disabled message']);
+            message(__('PHPinfo disabled message'));
         }
 
         phpinfo();
diff --git a/controller/admin/users.php b/controller/admin/users.php
index e6e9250f..2af46780 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -21,6 +21,8 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\admin\users();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/users.mo');
+        require FEATHER_ROOT . 'include/common_admin.php';
     }
 
     public function __autoload($class_name)
@@ -30,19 +32,12 @@ public function __autoload($class_name)
 
     public function display()
     {
-        global $lang_admin_common, $lang_admin_users;
-
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        require FEATHER_ROOT . 'include/common_admin.php';
-
         if (!$this->user->is_admmod) {
             message(__('No permission'), '403');
         }
 
-        // Load the admin_bans.php language file
-        require FEATHER_ROOT . 'lang/' . $admin_language . '/users.php';
-
         // Move multiple users to other user groups
         if ($this->request->post('move_users') || $this->request->post('move_users_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
@@ -51,7 +46,7 @@ public function display()
 
             $move = $this->model->move_users();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Users'], $lang_admin_users['Move users']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Move users'));
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -60,8 +55,6 @@ public function display()
             generate_admin_menu('users');
 
             $this->feather->render('admin/users/move_users.php', array(
-                    'lang_admin_users' => $lang_admin_users,
-                    'lang_admin_common' => $lang_admin_common,
                     'move'              =>  $move,
                 )
             );
@@ -78,7 +71,7 @@ public function display()
 
             $user_ids = $this->model->delete_users();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Users'], $lang_admin_users['Delete users']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Delete users'));
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
 
@@ -87,8 +80,6 @@ public function display()
             generate_admin_menu('users');
 
             $this->feather->render('admin/users/delete_users.php', array(
-                    'lang_admin_users' => $lang_admin_users,
-                    'lang_admin_common' => $lang_admin_common,
                     'user_ids'          => $user_ids,
                 )
             );
@@ -105,7 +96,7 @@ public function display()
 
             $user_ids = $this->model->ban_users();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Bans']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
             $focus_element = array('bans2', 'ban_message');
 
             define('FEATHER_ACTIVE_PAGE', 'moderate');
@@ -115,8 +106,6 @@ public function display()
             generate_admin_menu('users');
 
             $this->feather->render('admin/users/ban_users.php', array(
-                    'lang_admin_users' => $lang_admin_users,
-                    'lang_admin_common' => $lang_admin_common,
                     'user_ids'          => $user_ids,
                 )
             );
@@ -147,7 +136,7 @@ public function display()
             $can_ban = $this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && $this->user->g_mod_ban_users == '1');
             $can_action = ($can_delete || $can_ban || $can_move) && $num_users > 0;
 
-            $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Users'], $lang_admin_users['Results head']);
+            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head'));
             $page_head = array('js' => '<script type="text/javascript" src="'.get_base_url().'/js/common.js"></script>');
 
             define('FEATHER_ACTIVE_PAGE', 'admin');
@@ -155,8 +144,6 @@ public function display()
             $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->display();
 
             $this->feather->render('admin/users/find_users.php', array(
-                    'lang_admin_users' => $lang_admin_users,
-                    'lang_admin_common' => $lang_admin_common,
                     'search' => $search,
                     'start_from' => $start_from,
                     'can_delete' => $can_delete,
@@ -170,7 +157,7 @@ public function display()
             $this->footer->display();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Users']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'));
         $focus_element = array('find_user', 'form[username]');
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
@@ -180,8 +167,6 @@ public function display()
         generate_admin_menu('users');
 
         $this->feather->render('admin/users/admin_users.php', array(
-                'lang_admin_users' => $lang_admin_users,
-                'lang_admin_common' => $lang_admin_common,
                 'group_list' => $this->model->get_group_list(),
             )
         );
@@ -192,19 +177,12 @@ public function display()
     // Show IP statistics for a certain user ID
     public function ipstats($id)
     {
-        global $lang_admin_common, $lang_admin_users;
-
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        require FEATHER_ROOT . 'include/common_admin.php';
-
         if (!$this->user->is_admmod) {
             message(__('No permission'), '403');
         }
 
-        // Load the admin_bans.php language file
-        require FEATHER_ROOT . 'lang/' . $admin_language . '/users.php';
-
         // Fetch ip count
         $num_ips = $this->model->get_num_ip($id);
 
@@ -217,15 +195,13 @@ public function ipstats($id)
         // Generate paging links
         $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$id);
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Users'], $lang_admin_users['Results head']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head'));
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
 
         $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
 
         $this->feather->render('admin/users/search_ip.php', array(
-                'lang_admin_users' => $lang_admin_users,
-                'lang_admin_common' => $lang_admin_common,
                 'start_from'        =>  $start_from,
                 'ip_data'   =>  $this->model->get_ip_stats($id, $start_from),
             )
@@ -237,21 +213,14 @@ public function ipstats($id)
     // Show IP statistics for a certain user IP
     public function showusers($ip)
     {
-        global $lang_admin_common, $lang_admin_users;
-
         define('FEATHER_ADMIN_CONSOLE', 1);
 
-        require FEATHER_ROOT . 'include/common_admin.php';
-
         if (!$this->user->is_admmod) {
             message(__('No permission'), '403');
         }
 
-        // Load the admin_bans.php language file
-        require FEATHER_ROOT . 'lang/' . $admin_language . '/users.php';
-
         if (!@preg_match('%^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$%', $ip) && !@preg_match('%^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$%', $ip)) {
-            message($lang_admin_users['Bad IP message']);
+            message(__('Bad IP message'));
         }
 
         // Fetch user count
@@ -266,15 +235,13 @@ public function showusers($ip)
         // Generate paging links
         $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$ip);
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Users'], $lang_admin_users['Results head']);
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head'));
 
         define('FEATHER_ACTIVE_PAGE', 'admin');
 
         $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
 
         $this->feather->render('admin/users/show_users.php', array(
-                'lang_admin_users' => $lang_admin_users,
-                'lang_admin_common' => $lang_admin_common,
                 'start_from'        =>  $start_from,
                 'info'   =>  $this->model->get_info_poster($ip, $start_from),
             )
diff --git a/controller/profile.php b/controller/profile.php
index 7c47382e..3ffe0031 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -32,7 +32,7 @@ public function __autoload($class_name)
     
     public function display($id, $section = null)
     {
-        global $lang_profile, $pd, $forum_time_formats, $forum_date_formats;
+        global $pd, $forum_time_formats, $forum_date_formats;
 
         // Include UTF-8 function
         require FEATHER_ROOT.'include/utf8/substr_replace.php';
@@ -278,8 +278,6 @@ public function display($id, $section = null)
 
     public function action($id, $action)
     {
-        global $lang_profile;
-
         // Include UTF-8 function
         require FEATHER_ROOT.'include/utf8/substr_replace.php';
         require FEATHER_ROOT.'include/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
diff --git a/include/common_admin.php b/include/common_admin.php
index a40dd7ed..228b2fa2 100644
--- a/include/common_admin.php
+++ b/include/common_admin.php
@@ -15,24 +15,22 @@
 // TODO: refactor
 $feather = \Slim\Slim::getInstance();
 
-// Make sure we have a usable language pack for admin.
-if (file_exists(FEATHER_ROOT.'lang/'.$feather->user->language.'/admin_common.php')) {
-    $admin_language = $feather->user->language.'/admin/';
-} elseif (file_exists(FEATHER_ROOT.'lang/'.$feather->config['o_default_lang'].'/admin_common.php')) {
-    $admin_language = $feather->config['o_default_lang'].'/admin/';
+// Load the admin common lang file
+if (file_exists(FEATHER_ROOT.'lang/'.$feather->user->language.'/admin/common.mo')) {
+    load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/admin/common.mo');
 } else {
-    $admin_language = 'English/admin/';
+    die('There is no valid language pack \''.feather_escape($feather->user->language).'\' installed. Please reinstall a language of that name');
 }
 
-// Attempt to load the admin_common language file
-require FEATHER_ROOT.'lang/'.$admin_language.'/common.php';
+// To be removed
+$admin_language = 'English/admin';
 
 //
 // Display the admin navigation menu
 //
 function generate_admin_menu($page = '')
 {
-    global $lang_admin_common, $feather;
+    $feather = \Slim\Slim::getInstance();
 
     $is_admin = $feather->user->g_id == FEATHER_ADMIN ? true : false;
     
@@ -42,7 +40,6 @@ function generate_admin_menu($page = '')
     $feather->render('admin/menu.php', array(
         'page'    =>    $page,
         'is_admin'    =>    $is_admin,
-        'lang_admin_common'    =>    $lang_admin_common,
         'feather_config'    =>    $feather->config,
         'feather_user'    =>    $feather->user,
         'plugins'    =>    $plugins,
diff --git a/include/functions.php b/include/functions.php
index de203e26..3db67c33 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1625,7 +1625,7 @@ function breadcrumbs(array $links) {
         if ($name != '' && $url != '') {
             $tmp[] = '<span><a href="' . $url . '">'.feather_escape($name).'</a></span>';
         } else {
-            $tmp[] = '<span>'.$lang_admin_reports['Deleted'].'</span>';
+            $tmp[] = '<span>'.__('Deleted').'</span>';
             return implode(' » ', $tmp);
         }
     }
diff --git a/lang/English/admin/bans.mo b/lang/English/admin/bans.mo
new file mode 100644
index 0000000000000000000000000000000000000000..3077c64b555429af441b4f7867c6d8ac40e68fea
GIT binary patch
literal 4861
zcma)<U5F(|6~{X!(ardkjV8vAWNTMrX5!wSolVxPvsttAwKB4k8FyyYJcYX5b?0`b
zZ}+9E@628>0bc}tQ9(iRIYcypfNv@&zDYz71>XcAki<7p)DR#1ovP}-_YMiBnY#b3
z)Ae!A|9n)<U+%i?`w`FQXrG|Ha!V9#gD>3556^42MbQVr*TFl$H^7tNt+z+fUEtlI
z^yk43gUjHDz-{nOFbUu5@ckR0toNgUKLur-Ux4?5zXxTXSHU^(@8EmE|AOxWPrN(q
z3(7w8pzQM)D0*yx?*X3zW&A#P0<1yV=NVA+{7%5<z<cQbJm4R|_tSq3l=1%pWt}@%
zRMxo%6!|Go>^L8AHQ;qn^zDKl01Hs`dItOm_-#=3e;$;5e+h~me+>94DEqw$%D5A3
zdN+6<D0)2%@+n#g@=Z|YKLyHq7L;+{0%iXnfIIl~c~Iv42Xcj9A@^AUP<Z|(KeEsF
zKn4B;6gyr9zXbj{^cN6{eiuMQ(JJ^NxCP4mH$erSWRQ$I&yS3I9Q+~pMG#j;uYmkT
zf8$5={Wq9{x6@&Xr~-ctJ`0`&AIBKsBL_bTem&rG;2!<of)#i_P7xly3yQrz2DibN
zLSKRfDxwqM{oqOPYv4Ih^m-AL{eK3&3;Y!*<9`$IWe`=PKY_CTUqRvXbx`L2Bgo$X
zQ7O6w=gYV|L0RWsQ0zS&<cr`<`j3JI_!9U6c#0r<5d0k|^Zp6qM)wF0@(8bw&=zQt
zzw(@-opEnbbP<%jMGw(U@=LgpM>rK8V;WmJ8$Jz6EXgCWdYX10?Nc<d`5{_|CeH<$
z@boZE(S%ER9`MlqN*R&5BDQ>#wn&2-_nZ&-DEQg%j+@$t)N{E;$#K5;So_7l2#@kC
zd2l>^CcJ+fJV%q5oEO<jnyRiYlpS^ZMyJt=O-zwy#eTGkbaO{ly4W`=D|)4q=rlE{
zs!W<yCaHtyP!|bOw}4F3X^=FlijXPw@u>r2t!DYY$%k&OMv&{S$(^J!gYxkBJZp57
z^d}pJeye5ZH`}l2q9|);=l;mpT7_+*bzO(e*G+5qMrWY2-0KwHy*e8=hghw2uQrvM
z5p_+k<jagKZPyO-oWKu(S7&lSm1o64L??VL4t1WT!hWOZW)QhG-cnc@ZOg(&%}C>|
zXvS^@rj6JzZr$C8{l;4(xG{y8*UWpu968>cZ=WdDK-Wn>;$>tRwYfeS7(~s)?J8wJ
zcdWc3(WLKKob<Ed<lU>$4wXF$JuuOAV@G*yg%JX<!WQrQMy``O!}wVtVO<b7sNj@u
z#s*?$W!|$hvYAe>YIdbYJulrIbq86keCS0tii4s&Dxw=gQ)W?nkQFUijdW0^GcqxD
zl07a&WT+F*_B>NN`KZ!)=W1CE?6N9`u4^x!zoh)@<@rLLzO0rOF3s&!<<n$rXEW`5
z*;E#~mep0G>%OU0SLb%N_d08YkkHtXtXNjaI@ir%CPN$1HErw89wou%x-KgQU86jV
zNa4<&(SxZK)nm@$D?PtOw;Pw${^#emHn%n=`!B`k=GIE$tzgyhkWFiIvtAtLIx8-z
zq^~P$>dQCwu68a?#>wtIQ*}0qq?AIntS)x5x>aPE0G|75=L@DVmDh2nl+vS?;*0Sk
zeDU4RZaJzFv*!0$R(_MF98Q(NC(Dtt{c@BONk$zSk|)uX>5X!A)Hj7BM}Zc~Rm+aA
zmR*x*f<u)(1;1)oTAOvVJgdhd8W76aFgGrRtj{P}L55lhfT6DHOy@*<JgK?OYg1WG
zT{Fo>yQ3j%4WQ8F=}}hqU78fBGE&Ff3cmKn(Ml6-Y^G~<l;yctm1Y*s$0SQ#IyFM-
zU_<4t?3+c4dJ+w!p=jDIb(MOhnv|C+AIi1=5OQJHS8Gb7sAxG%+zQk(-PP8_N;ppB
zh;XH+EMSfbBo&oXG+@6nq?KZgSbZhSQ+$xND<K^SvqYz<GJ9av{6h;0FDacQX2`J<
zt3B4}mq$vA$)ZJW^dST2_A-;Rm>CS~aU5+pCBg}kR2*7WrlUPf_GgD91#R7l0uQdr
z#L@hir!yFI(sUu3I!$DvbA;IBU(yoC6l#psN15%5d90%5O}rl~TMi5iToEL|DibFq
z##Qb^D_Drtt}*J&N}gkr*CDJP3Z$`Tgy<az%m_cJj^Y5vs+^M;>cV6CP>VvxA7{>H
zci^}{ultlS(Q}dwdQ@Xdoh7h1Zd|YC#T~j{R#S|`>YAgwo9p604EAwC@E0SQj5fXm
z%YJU-sZx*Hn>#+W?Ax%mbm3gQw8S4EWKH^xDKbh<<CYqDCr#{7C&tEVlgM#*9Sn3K
zNFwN*YM71{g#)Psd`@&JSJWlHTx#>hMZ@ucj@I%lIZzLT$Tc#-)(~ak%KO2wDU;)9
zV(DUQW+W-m>Qdmz=1S0xiQjIFJK{-dERG$O-XBwbdy=QKwbfZ)$8eG!>ztnla{f~f
zC=Fx>?~;nCh6SIoy-__PAl;%ql$+Do$FA6O#YeY9?SgosDQ2_dLkjq5(=#L~8oQx4
z*gaEcoX*b3akS;HHI53Wy_>5H?xl2T=N>sd&jt@S`l6WB8_9qsD%5;q_Cg$mYmZ!X
z2<53854Q<dI=T5&W*>)=p_IYqLezW~Cfun#HAv#j<-Dd=lLF|1hLTZIO6ts)Urkt=
zB<p2KtGs$z{Nn4C_^MspWz(@lb_uk()847v4MbES&f3_q(Tcw@$?4!PNi*euW5w6(
zaA|6Jz7g!=*m<kl&R)<?LLcv8n!5!+lRJx@=O~>Ix+wEi%cb8mEkelgiDw;g&cVH`
zf{c{^3gqgZ4Hj{<k4T}V*_b-V^;6FOcfRLj&O6@Dxwt9c31?X+E37FvB(p<9<q<v#
zt~6u;|K+&jHaE31#s{ia3BIMkOA%;}?3NPe_oEOlj+aSrOnGy1vP=aEg)4+d<COoS
I>?BbB2bWPZ3;+NC

literal 0
HcmV?d00001

diff --git a/lang/English/admin/bans.php b/lang/English/admin/bans.php
deleted file mode 100644
index 49219ab2..00000000
--- a/lang/English/admin/bans.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-// Language definitions used in admin_bans.php
-$lang_admin_bans = array(
-
-'No user message'            =>    'No user by that username registered. If you want to add a ban not tied to a specific username just leave the username blank.',
-'No user ID message'        =>    'No user by that ID registered.',
-'User is admin message'        =>    'The user %s is an administrator and can\'t be banned. If you want to ban an administrator, you must first demote him/her.',
-'User is mod message'        =>    'The user %s is a moderator and can\'t be banned. If you want to ban a moderator, you must first demote him/her.',
-'Must enter message'        =>    'You must enter either a username, an IP address or an email address (at least).',
-'Cannot ban guest message'    =>    'The guest user cannot be banned.',
-'Invalid IP message'        =>    'You entered an invalid IP/IP-range.',
-'Invalid e-mail message'    =>    'The email address (e.g. user@domain.com) or partial email address domain (e.g. domain.com) you entered is invalid.',
-'Invalid date message'        =>    'You entered an invalid expire date.',
-'Invalid date reasons'        =>    'The format should be YYYY-MM-DD and the date must be at least one day in the future.',
-'Ban added redirect'        =>    'Ban added.' ,
-'Ban edited redirect'        =>    'Ban edited.',
-'Ban removed redirect'        =>    'Ban removed.',
-
-'New ban head'                =>    'New ban',
-'Add ban subhead'            =>    'Add ban',
-'Username label'            =>    'Username',
-'Username help'                =>    'The username to ban (case-insensitive).',
-'Username advanced help'    =>    'The username to ban (case-insensitive). The next page will let you enter a custom IP and email. If you just want to ban a specific IP/IP-range or email just leave it blank.',
-
-'Ban search head'            =>    'Ban search',
-'Ban search subhead'        =>    'Enter search criteria',
-'Ban search info'            =>    'Search for bans in the database. You can enter one or more terms to search for. Wildcards in the form of asterisks (*) are accepted. To show all bans leave all fields empty.',
-'Date help'                    =>    '(yyyy-mm-dd)',
-'Message label'                =>    'Message',
-'Expire after label'        =>    'Expire after',
-'Expire before label'        =>    'Expire before',
-'Order by label'            =>    'Order by',
-'Order by username'            =>    'Username',
-'Order by ip'                =>    'IP',
-'Order by e-mail'            =>    'Email',
-'Order by expire'            =>    'Expire date',
-'Ascending'                    =>    'Ascending',
-'Descending'                =>    'Descending',
-'Submit search'                =>    'Submit search',
-
-'E-mail label'                =>    'Email',
-'E-mail help'                =>    'The email or email domain you wish to ban (e.g. someone@somewhere.com or somewhere.com). See "Allow banned email addresses" in Permissions for more info.',
-'IP label'                    =>    'IP address/IP-ranges',
-'IP help'                    =>    'The IP address or IP-ranges you wish to ban (e.g. 150.11.110.1 or 150.11.110). Separate addresses with spaces. If an IP is entered already it is the last known IP of this user in the database.',
-'IP help link'                =>    'Click %s to see IP statistics for this user.',
-'Ban advanced head'            =>    'Ban advanced settings',
-'Ban advanced subhead'        =>    'Supplement ban with IP and email',
-'Ban message label'            =>    'Ban message',
-'Ban message help'            =>    'A message that will be displayed to the banned user when he/she visits the board.',
-'Message expiry subhead'    =>    'Ban message and expiry',
-'Ban IP range info'            =>    'You should be very careful when banning an IP-range because of the possibility of multiple users matching the same partial IP.',
-'Expire date label'            =>    'Expire date',
-'Expire date help'            =>    'The date when this ban should be automatically removed (format: yyyy-mm-dd). Leave blank to remove manually.',
-
-'Results head'                =>    'Search Results',
-'Results username head'        =>    'Username',
-'Results e-mail head'        =>    'Email',
-'Results IP address head'    =>    'IP/IP-ranges',
-'Results expire head'        =>    'Expires',
-'Results message head'        =>    'Message',
-'Results banned by head'    =>    'Banned by',
-'Results actions head'        =>    'Actions',
-'No match'                    =>    'No match',
-'Unknown'                    =>    'Unknown',
-
-);
diff --git a/lang/English/admin/bans.po b/lang/English/admin/bans.po
new file mode 100644
index 00000000..4a126619
--- /dev/null
+++ b/lang/English/admin/bans.po
@@ -0,0 +1,183 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "No user message"
+msgstr "No user by that username registered. If you want to add a ban not tied to a specific username just leave the username blank."
+
+msgid "No user ID message"
+msgstr "No user by that ID registered."
+
+msgid "User is admin message"
+msgstr "The user %s is an administrator and can't be banned. If you want to ban an administrator, you must first demote him/her."
+
+msgid "User is mod message"
+msgstr "The user %s is a moderator and can't be banned. If you want to ban a moderator, you must first demote him/her."
+
+msgid "Must enter message"
+msgstr "You must enter either a username, an IP address or an email address (at least)."
+
+msgid "Cannot ban guest message"
+msgstr "The guest user cannot be banned."
+
+msgid "Invalid IP message"
+msgstr "You entered an invalid IP/IP-range."
+
+msgid "Invalid e-mail message"
+msgstr "The email address (e.g. user@domain.com) or partial email address domain (e.g. domain.com) you entered is invalid."
+
+msgid "Invalid date message"
+msgstr "You entered an invalid expire date."
+
+msgid "Invalid date reasons"
+msgstr "The format should be YYYY-MM-DD and the date must be at least one day in the future."
+
+msgid "Ban added redirect"
+msgstr "Ban added."
+
+msgid "Ban edited redirect"
+msgstr "Ban edited."
+
+msgid "Ban removed redirect"
+msgstr "Ban removed."
+
+msgid "New ban head"
+msgstr "New ban"
+
+msgid "Add ban subhead"
+msgstr "Add ban"
+
+msgid "Username label"
+msgstr "Username"
+
+msgid "Username help"
+msgstr "The username to ban (case-insensitive)."
+
+msgid "Username advanced help"
+msgstr "The username to ban (case-insensitive). The next page will let you enter a custom IP and email. If you just want to ban a specific IP/IP-range or email just leave it blank."
+
+msgid "Ban search head"
+msgstr "Ban search"
+
+msgid "Ban search subhead"
+msgstr "Enter search criteria"
+
+msgid "Ban search info"
+msgstr "Search for bans in the database. You can enter one or more terms to search for. Wildcards in the form of asterisks (*) are accepted. To show all bans leave all fields empty."
+
+msgid "Date help"
+msgstr "(yyyy-mm-dd)"
+
+msgid "Message label"
+msgstr "Message"
+
+msgid "Expire after label"
+msgstr "Expire after"
+
+msgid "Expire before label"
+msgstr "Expire before"
+
+msgid "Order by label"
+msgstr "Order by"
+
+msgid "Order by username"
+msgstr "Username"
+
+msgid "Order by ip"
+msgstr "IP"
+
+msgid "Order by e-mail"
+msgstr "Email"
+
+msgid "Order by expire"
+msgstr "Expire date"
+
+msgid "Ascending"
+msgstr "Ascending"
+
+msgid "Descending"
+msgstr "Descending"
+
+msgid "Submit search"
+msgstr "Submit search"
+
+msgid "E-mail label"
+msgstr "Email"
+
+msgid "E-mail help"
+msgstr "The email or email domain you wish to ban (e.g. someone@somewhere.com or somewhere.com). See \"Allow banned email addresses\" in Permissions for more info."
+
+msgid "IP label"
+msgstr "IP address/IP-ranges"
+
+msgid "IP help"
+msgstr "The IP address or IP-ranges you wish to ban (e.g. 150.11.110.1 or 150.11.110). Separate addresses with spaces. If an IP is entered already it is the last known IP of this user in the database."
+
+msgid "IP help link"
+msgstr "Click %s to see IP statistics for this user."
+
+msgid "Ban advanced head"
+msgstr "Ban advanced settings"
+
+msgid "Ban advanced subhead"
+msgstr "Supplement ban with IP and email"
+
+msgid "Ban message label"
+msgstr "Ban message"
+
+msgid "Ban message help"
+msgstr "A message that will be displayed to the banned user when he/she visits the board."
+
+msgid "Message expiry subhead"
+msgstr "Ban message and expiry"
+
+msgid "Ban IP range info"
+msgstr "You should be very careful when banning an IP-range because of the possibility of multiple users matching the same partial IP."
+
+msgid "Expire date label"
+msgstr "Expire date"
+
+msgid "Expire date help"
+msgstr "The date when this ban should be automatically removed (format: yyyy-mm-dd). Leave blank to remove manually."
+
+msgid "Results head"
+msgstr "Search Results"
+
+msgid "Results username head"
+msgstr "Username"
+
+msgid "Results e-mail head"
+msgstr "Email"
+
+msgid "Results IP address head"
+msgstr "IP/IP-ranges"
+
+msgid "Results expire head"
+msgstr "Expires"
+
+msgid "Results message head"
+msgstr "Message"
+
+msgid "Results banned by head"
+msgstr "Banned by"
+
+msgid "Results actions head"
+msgstr "Actions"
+
+msgid "No match"
+msgstr "No match"
+
+msgid "Unknown"
+msgstr "Unknown"
diff --git a/lang/English/admin/categories.mo b/lang/English/admin/categories.mo
new file mode 100644
index 0000000000000000000000000000000000000000..73ca42af061e53155923b6c77b56d277bd521e43
GIT binary patch
literal 2167
zcmZ{kNsrt_6vqolSekuU!mi>lXeN@KG$PWdXC@?>O(V@f3pxl;E@ivA+r+MFRh6gH
z$6Pogp&$-$LpkNfg%7}q&w#=mi3=AbPW+!;?#10$a{u~0SG~1fJzP6?kKuU@?^}3(
z$GeXAhez;(=klYBy#%(wSHT1DMer851}gA5@Gkf!_zidgd;q=<{tD9mhhG1;ms^ij
z_TKTl0@C^u@C~pJz6{<4Uje@Z-v%Fe{cj-o`2(c&|9E-rTxI7X*hLQeAjNm@e8r!@
zZz2B-Qv64cGxh}dB}j2b;Pc=aNO^t@!UX#sd=mT-JOuB9<o_>_)}4nD;stOU+yt+I
z((CVoZOFfXWdBdkf5D58TQL3}cm<?<Zh^i9W!=d(#ewpb^#G<1^^R&qc43Y^i?@ZB
z@<w<Jsj?UFu6mw<lJcV5pPpMlwRy_RC~f&rzU+FE@K`uG&?c3Z52Z+&I$K0d^#lvE
z(fq;*&qO4%Ql;dWV^f|wwl_0fj1mY5H!?|$jHllwTqMa#eIhftdWRCZ^bWm;2_I>j
zx>T!LuT?)aIj@ZHRP{C6Th!Hw?U#O*%CM|ny<x(W)W(@eb7|P(CaMz(+EiAhYHF2s
z{7htNStfRnq;4ssrm_y`w6Km#<)lHPXeO9TYsEmaxld))YW+<mqD*q9>k9c(Fk#)S
zFd_>MwaIOVt5GT1-S@Y7^>=qe@ppH5dvm+hHTo;GGB{3x&!n-aeup1Q;fB)OxY6o<
z+za*$MCgNkG{3{43qFx&DJ`v4C&Id*XN0nuaN1zeiBN+A!3RAl@;QrqM<jWwuJtPy
zQ50%3xY{~BK0TQEZ-<v#XtYB)g5G2Vr%v8+mquui+UD_47%ScG&E8?KHCspC`_cpl
zD%MG=1|7Z?rEVHX2gPlD9vn#}O%-ET;}|>M4!6P&@TC%iPjz8pxmWq<@XE>jm|(`5
zVs9vU*%{sEC>*Ehse8dEy5M7>9Q6rf67nygh=t;%_i{Ong5NsbhC<>9Y*;BdhEk6=
zLw=;m#=7;Ecwd_$FD3Xe3tq!AM6sZ&2Ybathqca6@|>Jh6CARS5GCvS31!!fEHkqO
z{<xuV3wc(X%34el+Of`PHMqKNcP{zAA2!FiUfdWrD*585k>(haX=H?u<J(G)Gnov0
zC?d;d^~Wp<K2D*Eq#u;!ao%uxAnD9wr5kcG;HxWCLiduhoQ4^P5@*nE*5Qb$A4YA>
zX^63?ytb&dWg+NBLzwYU#<y`W%d$lJPV;_PlIvnuW)Z#cH{_X|-VwNM3K`CvS2qY6
RPiG1#EcAf=?~M_%{{T<hS-}7R

literal 0
HcmV?d00001

diff --git a/lang/English/admin/categories.php b/lang/English/admin/categories.php
deleted file mode 100644
index 14f20cab..00000000
--- a/lang/English/admin/categories.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-// Language definitions used in admin_categories.php
-$lang_admin_categories = array(
-
-'Must enter name message'        =>    'You must enter a name for the category',
-'Category added redirect'        =>    'Category added.',
-'Category deleted redirect'        =>    'Category deleted.',
-'Unable to delete category'        =>    'Unable to delete category.',
-'Delete category head'            =>    'Delete category (together with all forums and posts it contains)',
-'Confirm delete subhead'        =>    'Confirm delete category',
-'Confirm delete info'            =>    'Are you sure that you want to delete the category <strong>%s</strong>?',
-'Delete category not validated'            =>    'You must confirm the deletion by checking the box',
-'Must enter integer message'    =>    'Position must be a positive integer value.',
-'Categories updated redirect'    =>    'Categories updated.',
-'Add categories head'            =>    'Add categories',
-'Add categories subhead'        =>    'Add categories',
-'Add category label'            =>    'Add a new category',
-'Add new submit'                =>    'Add new',
-'Add category help'                =>    'The name of the new category you want to add. You can edit the name of the category later (see below). Go to %s to add forums to your new category.',
-'Delete categories head'        =>    'Delete categories',
-'Delete categories subhead'        =>    'Delete categories',
-'Delete category label'            =>    'Delete a category',
-'Delete category disclaimer'            =>    'I hereby acknowledge that all category data will be deleted',
-'Edit categories head'            =>    'Edit categories',
-'Edit categories subhead'        =>    'Edit categories',
-'Category position label'        =>    'Position',
-'Category name label'            =>    'Name',
-
-);
diff --git a/lang/English/admin/categories.po b/lang/English/admin/categories.po
new file mode 100644
index 00000000..fac4ce86
--- /dev/null
+++ b/lang/English/admin/categories.po
@@ -0,0 +1,84 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Must enter name message"
+msgstr "You must enter a name for the category"
+
+msgid "Category added redirect"
+msgstr "Category added."
+
+msgid "Category deleted redirect"
+msgstr "Category deleted."
+
+msgid "Unable to delete category"
+msgstr "Unable to delete category."
+
+msgid "Delete category head"
+msgstr "Delete category (together with all forums and posts it contains)"
+
+msgid "Confirm delete subhead"
+msgstr "Confirm delete category"
+
+msgid "Confirm delete info"
+msgstr "Are you sure that you want to delete the category <strong>%s</strong>?"
+
+msgid "Delete category not validated"
+msgstr "You must confirm the deletion by checking the box"
+
+msgid "Must enter integer message"
+msgstr "Position must be a positive integer value."
+
+msgid "Categories updated redirect"
+msgstr "Categories updated."
+
+msgid "Add categories head"
+msgstr "Add categories"
+
+msgid "Add categories subhead"
+msgstr "Add categories"
+
+msgid "Add category label"
+msgstr "Add a new category"
+
+msgid "Add new submit"
+msgstr "Add new"
+
+msgid "Add category help"
+msgstr "The name of the new category you want to add. You can edit the name of the category later (see below). Go to %s to add forums to your new category."
+
+msgid "Delete categories head"
+msgstr "Delete categories"
+
+msgid "Delete categories subhead"
+msgstr "Delete categories"
+
+msgid "Delete category label"
+msgstr "Delete a category"
+
+msgid "Delete category disclaimer"
+msgstr "I hereby acknowledge that all category data will be deleted"
+
+msgid "Edit categories head"
+msgstr "Edit categories"
+
+msgid "Edit categories subhead"
+msgstr "Edit categories"
+
+msgid "Category position label"
+msgstr "Position"
+
+msgid "Category name label"
+msgstr "Name"
diff --git a/lang/English/admin/censoring.mo b/lang/English/admin/censoring.mo
new file mode 100644
index 0000000000000000000000000000000000000000..2f0e456c224163bf2c73bf679de354e34c738d35
GIT binary patch
literal 1551
zcmZvcOHUL*5XVQw2kRR(8sninm;iAGF&@bB2#8=v05`gV9(!kMciYT#Z@POx?tBFK
z2p;?n>dCVQ?|SnC7;nad|DKs;S+$eqN7qzWRo7#`jg1@xSQoKxVZXt?j(zSJ{$O>%
zbD#vzgFE0Qa38z^9)M%uJMc329=rg4uD*W-y}cixzc+fk)Vm4#`**=>;9|usumRl^
zJO%lO6G0H+{0TgR^Uskoj^AL2bL}K-fHUAI$lz5_g9Pq_H^8@`_xBO>@qPil-uH^X
zK)5N^*@_-;8z7V-KmJ`%EBu@W{qiyT{M4|0e17>nA-v(W6g#OErJ}`Yu#_aUt4%^u
zwe{d+^H!Hd5-hW_+Hj>)UMXc#btsWmv{LS?c@e9>C54@pL^?8@=^duN?Ty?z=sPxL
z1Q}Z^Ivi~3;%pHTrP8|KDfdzla|Yci>TMsfND>5w;H2T$1%<41@wYVZCBhxmZKSyo
zX}GFQX6vMS#nH~+pQZBO`Ef<J=V^Lkw$?EE70icgNw~$vB6D?GW#PJP9zLu!o;1T{
zgCpeOBRHuOWZ_fZkzTbgS{K%ZO(T>|h0_K~>q2#Myf$pI$c|W~Igw;iEw)P+tyZK>
zXQ8&Swy`qsKONnxEo)>>!RlTQP948?Q^=B3vlMrQvFzrbH&?@%fu8r?W)rTcSSKh|
zon~6n9R^ZIDQYjm$E?_tF*Y<(>u5Tfi5}ofc?_TF+{C<G`lwUsBq)0-SShM0%6hu4
zaI~j$+7&3A(-arYL_#Hm^r3QtvikU`tqnd%TU?K5Tc$}YOkznGCK1Qn^F<t&5l1v>
zb;gs>%+rK2;o>fN$u7zQU3f^fVlSD9sBGA(sYGfuiFO+`rQEVn0(}?JChrzUIG1Tk
zN;_)75W3q(Zn%R+^o=TAcW{kj6ahK+jW5(*^}uRcV6=%>S{4Su;Z?D)jGng0f^>3+
zqr-6<9<yN1I-^x*VK8X8-Jdl-6?bejH&rS9U%MK^f0PeR2E{}o;nh(3-vArDM76TP
sSoRCqFJ0tkv#Mfop+BP0(2V*|<94EYRoM*1utr0oYF3AZ)u=|nA7$gXPXGV_

literal 0
HcmV?d00001

diff --git a/lang/English/admin/censoring.php b/lang/English/admin/censoring.php
deleted file mode 100644
index f0729e42..00000000
--- a/lang/English/admin/censoring.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-// Language definitions used in admin_censoring.php
-$lang_admin_censoring = array(
-
-'Must enter word message'    =>    'You must enter a word to censor.',
-'Word updated redirect'        =>    'Censor word updated.',
-'Word added redirect'        =>    'Censor word added.',
-'Word removed redirect'        =>    'Censor word removed.',
-'Censoring head'            =>    'Censoring',
-'Add word subhead'            =>    'Add word',
-'Add word info'                =>    'Enter a word that you want to censor and the replacement text for this word. Wildcards are accepted (i.e. *some* would match somewhere and lonesome). Censor words also affect usernames. New users will not be able to register with usernames containing any censored words. The search is case insensitive.',
-'Censoring enabled'            =>    '<strong>Censoring is enabled in %s.</strong>',
-'Censoring disabled'        =>    '<strong>Censoring is disabled in %s.</strong>',
-'Censored word label'        =>    'Censored word',
-'Replacement label'            =>    'Replacement word(s)',
-'Action label'                =>    'Action',
-'Edit remove subhead'        =>    'Edit or remove words',
-'No words in list'            =>    'No censor words in list.',
-
-);
diff --git a/lang/English/admin/censoring.po b/lang/English/admin/censoring.po
new file mode 100644
index 00000000..665e0f88
--- /dev/null
+++ b/lang/English/admin/censoring.po
@@ -0,0 +1,57 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Must enter word message"
+msgstr "You must enter a word to censor."
+
+msgid "Word updated redirect"
+msgstr "Censor word updated."
+
+msgid "Word added redirect"
+msgstr "Censor word added."
+
+msgid "Word removed redirect"
+msgstr "Censor word removed."
+
+msgid "Censoring head"
+msgstr "Censoring"
+
+msgid "Add word subhead"
+msgstr "Add word"
+
+msgid "Add word info"
+msgstr "Enter a word that you want to censor and the replacement text for this word. Wildcards are accepted (i.e. *some* would match somewhere and lonesome). Censor words also affect usernames. New users will not be able to register with usernames containing any censored words. The search is case insensitive."
+
+msgid "Censoring enabled"
+msgstr "<strong>Censoring is enabled in %s.</strong>"
+
+msgid "Censoring disabled"
+msgstr "<strong>Censoring is disabled in %s.</strong>"
+
+msgid "Censored word label"
+msgstr "Censored word"
+
+msgid "Replacement label"
+msgstr "Replacement word(s)"
+
+msgid "Action label"
+msgstr "Action"
+
+msgid "Edit remove subhead"
+msgstr "Edit or remove words"
+
+msgid "No words in list"
+msgstr "No censor words in list."
diff --git a/lang/English/admin/common.mo b/lang/English/admin/common.mo
new file mode 100644
index 0000000000000000000000000000000000000000..80370172ebed1c83e490488693dfcd113d29b4e3
GIT binary patch
literal 1802
zcmchW&5ImG7>6sm(PZLBOk&h%v|?OPp=Yy_$TGW|nBDA##o1)s4>6wXovxj<&U6h`
zJxg-%KM?dH9z4Z^Cs91)mWv>Q2QMBBUIal<yoh)bL41DGlk6ghCoSr&r>gq>sCw(|
z?+%Q;YiP%j$B>h|jG2JVI~Ztt?lk5uxEIpReumxf5Ujx?a14%**3ZJdtWQDNof&;!
z9Iao3ceB3&<>ytn555NX!!EoJz6o`Nx8MWtZKyccpzJ?{^8YcE{dM>t{0!a$Z$kP1
z0ZQ*@D7#;w{QM53_a~J9eQZkaD3rgapzKdTRLt{`ZW;_Na&!ht{~eU{{XHoC_ZgIz
zYf$<hjn<z+<>dyH-4~<pUyasZL!IwiNH^az=o~*n<>fc1yo_P2yc~q5;9;mZO(^@9
zAl+PI80Hm9uM2hG51{;i0_o;DgY0fV`S~15?@Oq>d;{s`CkFZZ1<L*psC)0iSa!Q1
zX&Ksrp^bP5IiLwmc~O(y!-)K;9YOSVY6lVBQ)hY-QO*t{k04JVy8CfNF&{!6MRcB{
z$lsgtrnU#M$T37Uem|nSJ&xRq4BOdunft<=%`&8yYsP4Mt{9lPw1{RtEnUZl+%a`U
zWL9*{IoEZiGYeT>nnfQ5y=cyRyOFlvFiS<|u9)RCFG^RWMceJ1+n&$ZU<hgHLlx$N
zHy6C^cL$we;26`6W2bQDVqb@grj>^1f@!(X%VVszD)r4Y@45^>l~rrF8!Nx9Fu=!(
z>-jCA??V~QYRW=`ZC_4{4!2r$Vao*@%e2g6nYW`^?`K@vtP|6Af*<tRVjj&U)Gxc>
z3~@r*O}Kh5Hf+J!S;pDtrgaUbvriZH*sPs=X1dl2{&m+blcg+q86O<JVHaIm;%9EI
z*1EWs%m<e2C+CRTu<Ru(ZY!7St*vGn%VaI^9$n=Pr6z|Tkf>zMrM(><?M$i%d||T+
zv9VG2p>w*nytKTq9e=WZqBigKKzO~{Cur%eloS0fuQsj3knVDJeQhzB+SXI_O&5}d
zqU|$^pkb#r^78gU8rBuHSCaFtsNS|=Ti#J0cCtQIKgpMBnXLLjXuJ6;M#EM?%>Ph^
zz3r0xr!rjA<Jvsh;&wf@)2<3^JX(sAN4r(0Ssr**AFkH_wN#rvRlcm>-02{(GqDW5
Z=$sypGZUk!O>9-sb(I+Z!+&4Oe*v%hjEDdL

literal 0
HcmV?d00001

diff --git a/lang/English/admin/common.php b/lang/English/admin/common.php
deleted file mode 100644
index 23b253af..00000000
--- a/lang/English/admin/common.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-// Language definitions used in admin_common.php
-$lang_admin_common = array(
-
-// The menu
-'Admin menu'            =>    'Admin menu',
-'Plugins menu'            =>    'Plugins menu',
-'Moderator menu'        =>    'Moderator menu',
-'Index'                    =>    'Index',
-'Categories'            =>    'Categories',
-'Forums'                =>    'Forums',
-'Users'                    =>    'Users',
-'User groups'            =>    'User groups',
-'Options'                =>    'Options',
-'Permissions'            =>    'Permissions',
-'Parser'                =>    'Parser',
-'Censoring'                =>    'Censoring',
-'Bans'                    =>    'Bans',
-'Prune'                    =>    'Prune',
-'Maintenance'            =>    'Maintenance',
-'Reports'                =>    'Reports',
-'Server statistics'                =>    'Server statistics',
-
-'Admin'                    =>    'Admin',
-'Go back'                =>    'Go back',
-'Delete'                =>    'Delete',
-'Update'                =>    'Update',
-'Add'                    =>    'Add',
-'Edit'                    =>    'Edit',
-'Remove'                =>    'Remove',
-'Yes'                    =>    'Yes',
-'No'                    =>    'No',
-'Save changes'            =>    'Save changes',
-'Save'                    =>    'Save',
-'here'                    =>    'here',
-'Action'                =>    'Action',
-'None'                    =>    'None',
-'Maintenance mode'        =>    'maintenance mode', // Used for link text in more than one file
-
-// Admin loader
-'No plugin message'        =>    'There is no plugin called %s in the plugin directory.',
-'Plugin failed message'    =>    'Loading of the plugin - <strong>%s</strong> - failed.',
-
-);
diff --git a/lang/English/admin/common.po b/lang/English/admin/common.po
new file mode 100644
index 00000000..7fd3c5b6
--- /dev/null
+++ b/lang/English/admin/common.po
@@ -0,0 +1,117 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Admin menu"
+msgstr "Admin menu"
+
+msgid "Plugins menu"
+msgstr "Plugins menu"
+
+msgid "Moderator menu"
+msgstr "Moderator menu"
+
+msgid "Index"
+msgstr "Index"
+
+msgid "Categories"
+msgstr "Categories"
+
+msgid "Forums"
+msgstr "Forums"
+
+msgid "Users"
+msgstr "Users"
+
+msgid "User groups"
+msgstr "User groups"
+
+msgid "Options"
+msgstr "Options"
+
+msgid "Permissions"
+msgstr "Permissions"
+
+msgid "Parser"
+msgstr "Parser"
+
+msgid "Censoring"
+msgstr "Censoring"
+
+msgid "Bans"
+msgstr "Bans"
+
+msgid "Prune"
+msgstr "Prune"
+
+msgid "Maintenance"
+msgstr "Maintenance"
+
+msgid "Reports"
+msgstr "Reports"
+
+msgid "Server statistics"
+msgstr "Server statistics"
+
+msgid "Admin"
+msgstr "Admin"
+
+msgid "Go back"
+msgstr "Go back"
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "Update"
+msgstr "Update"
+
+msgid "Add"
+msgstr "Add"
+
+msgid "Edit"
+msgstr "Edit"
+
+msgid "Remove"
+msgstr "Remove"
+
+msgid "Yes"
+msgstr "Yes"
+
+msgid "No"
+msgstr "No"
+
+msgid "Save changes"
+msgstr "Save changes"
+
+msgid "Save"
+msgstr "Save"
+
+msgid "here"
+msgstr "here"
+
+msgid "Action"
+msgstr "Action"
+
+msgid "None"
+msgstr "None"
+
+msgid "Maintenance mode"
+msgstr "maintenance mode"
+
+msgid "No plugin message"
+msgstr "There is no plugin called %s in the plugin directory."
+
+msgid "Plugin failed message"
+msgstr "Loading of the plugin - <strong>%s</strong> - failed."
diff --git a/lang/English/admin/forums.mo b/lang/English/admin/forums.mo
new file mode 100644
index 0000000000000000000000000000000000000000..03ddd80dc6c4a33dfe423faa626b936b95d41701
GIT binary patch
literal 3548
zcmbVOO>A5>5H`>s8h%?SP@u&rlqMzbl~f?LNz;<1ZHStrQL<^_=-ubtea-t>Y`-MS
zt%w7MN*n-j;J^VD2^Ar6p}m2`u^?3(Iq-8p2o(t=Bo18Q8{2Pplkg*9#rdAc<C*cy
zcxJ!ZvFR;_5nw)w`RXl<jRAkY75^~4yN$7J!0&-~18;i#19%VC+cr7+F5tab4*>52
z9`QH>d;n|V*Q>xCSYHC(0elyDKky2W<b4JteK$P)YapHf1^6Iv%Vu|O50La70Mh;_
zkoM>O`T}ql))#>!?;RlNy$mG2Yd|`8!>@k?65pRdvVYqa$G00u_kI>g=T8E+1J46V
ze+;|}_%e|AUi15Jd-?~!t)O28(tSS#lKksHI{z(j4nF@CNczWbcX$SP1nWiMPT=c6
z{ISdUM|>Xv$#2(y6TmNlj{&!1a}qcVBzxOHh-R1k`VC+o*6#!1QuZ<MPT(g%vj1}+
zo%;$1SFj&|#DCN8{|=-$Z3Zzwj_d^P!+HWju*G5^`9lK_051Z`t`C8fUta);?<XMn
z;WuDEa4Qbs3TzMv5<3JWe;o&s{xiTmz;k}T08$)Y0g~Ns0?E(s0qNWoAj!W9BtKsV
z!p+uJfE{$6d_eZlS-KYuvYUKs?EzB0Jc&u;AxyH5?nHJyg82j{#IuJn2QYVI_6~|4
z*+}-#2rxP3eoV5J;zNV{PQIYA7xQsU%F!Xra`<OybNeX}DMmE#9PK^HM>NRSc8o_6
zuji^rS?7y4rHIxnlUC0%5mlM631MU-S8cv-sf(&TK9OhjSfxCYi8RuQTt|zudd}9-
z{^9tFP#K$05=wa{S9r;G(n(L^Y>AzUVgq$X#EI@OSfah3Gr_Jc`)Rr~7f~c5u4EJ|
zSu@NLoy~tk)-@HkOq^%_){fnIz<p;Tm1{PORs^Hh%hG%UeNyE`i?^goW38b=bL*dt
z<nr#*LL1)7wP7<N6AkIYsNFqh3T##-WFSmZ@l<LJ9#+zqMG{B6=7Z?S61<Ar8<gy`
z@O9m0$8275$5L~-8bj|KjMZ@7vQ%rXIG5|V$4gimaJ3RT>6~RrCU3>Hk}{8+bE-Vc
zypIX)gY@gH-1&K{lbaj?uZtovY#~>;aG8z^MfC#3vqCDkHbNP;n2Bm4=?sGIZ?$Nn
zLteB7Yc`h@N+bb-nd%Xqwd_)l9UA5Cb8H~v{bPK1aI|ku<)kB+ih^@eQOHL4X=G?q
zsuL&r=FV0Eo3Nk<C*kK24q5=iV`42y6vUvSM5YsAas{Soku?g0DyT@2_DJMMMU=+b
zb9JYpS`Bm6IMz2aHFK(~e>i-)4=>6fltHE4f>I+_&B0b8;%t=HnnG!5#uh85gTq}u
z(q5M;IF;4%D9#!q{BSik9YaRA%=%skCS@j-vvDp*Yz!X`4~NfS$1Q_}yihec;dG2}
zr=(jqdcGF$YHNnWQ)N!IDJ(0^xYp$Dyx=RbZkB-(_QBgE47)ODx0AhPE$S4dk@aQ8
z<?y(YR=h6oVVc4?Wg>$ulu5QykyVzRAJs<XS>xC~ee|IJJkF-l7BUS-`ngTnssyui
zhv7SRetdp*YId@p+tLII7hc>-oFt_Zflnlz(R?7TbCI<N@lu^hR(F3{?0Rm`T(NU?
z&ROWIT@T5A`Z8u~Te!BSg^<#%Vgt`tW~K)nhv%c`?>~Ks@)9~FD`Zn-YOLvA>5%nd
zO=KLIWkc#r(=Azx>v(*<6%AXKC5r1vI3y`AG)hi`N}mq-RNV?|ie;JYH#`-QB;Qcp
zW)0L11gX?pr2Dly*Q;O%Ipm|Nr9}Np@)Zt4DW<+q@T$-#$0*^j*C0MrXZb#8AE)Pq
zvSyQ9bCIlwHmWI%;q`*z)l-^97I9&dsGwq4OA54+kW)c))w?U*=9#-Nud6&=V@$8i
z(m7q1SQV*IORj%}yn=h|?N-XYJvPBfvbI#sSMhjYEJ}YAYbtmVM~0CDte5GsFBMYz
z@?2YT&T&GkxlmEB(2$=-#LDjI@>mbSc?lluzt{qoQ-vV)p-WDueB*Up7U9>&KXfyO
zPT_h<>N}e7)f!<bn;V*00YxvOa#$|c$OK>4<TmWPOr?wu*?)JsvMqP|ovj(R`{=M^
zCw+9fom;p*hZa_LIChpCD3<X{#kM5GM5Zm%_6`Q8`#HiF=clot_UZ~$Ppk9Iv)X3=
HyVv~%37X56

literal 0
HcmV?d00001

diff --git a/lang/English/admin/forums.php b/lang/English/admin/forums.php
deleted file mode 100644
index 6259796e..00000000
--- a/lang/English/admin/forums.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-// Language definitions used in admin_forums.php
-$lang_admin_forums = array(
-
-'Forum added redirect'        =>    'Forum added.',
-'Unable to add forum'	=> 'Unable to add forum',
-'Forum deleted redirect'    =>    'Forum deleted.',
-'Forums updated redirect'    =>    'Forums updated.',
-'Forum updated redirect'    =>    'Forum updated.',
-'Perms reverted redirect'    =>    'Permissions reverted to defaults.',
-'Must enter name message'    =>    'You must enter a forum name.',
-'Must be integer message'    =>    'Position must be a positive integer value.',
-'Must be valid category'	=>	'You must enter a valid category',
-'New forum'                    =>    'New forum',
-
-// Entry page
-'Add forum head'            =>    'Add forum',
-'Create new subhead'        =>    'Create a new forum',
-'Add forum label'            =>    'Add forum to category',
-'Add forum help'            =>    'Select the category to which you wish to add a new forum.',
-'Add forum'                    =>    'Add forum',
-'No categories exist'        =>    'No categories exist',
-'Manage forums head'            =>    'Manage forums',
-'Category subhead'            =>    'Category:',
-'Forum label'                =>    'Forum',
-'Edit link'                    =>    'Edit',
-'Delete link'                =>    'Delete',
-'Position label'            =>    'Position',
-'Update positions'            =>    'Update positions',
-'Confirm delete head'        =>    'Confirm delete forum',
-'Confirm delete subhead'    =>    'Important! Read before deleting',
-'Confirm delete info'        =>    'Are you sure that you want to delete the forum <strong>%s</strong>?',
-'Confirm delete warn'        =>    'WARNING! Deleting a forum will delete all posts (if any) in that forum!',
-
-// Detailed edit page
-'Edit forum head'            =>    'Edit forum',
-'Edit details subhead'        =>    'Edit forum details',
-'Forum name label'            =>    'Forum name',
-'Forum description label'    =>    'Description (HTML)',
-'Category label'            =>    'Category',
-'Sort by label'                =>    'Sort topics by',
-'Last post'                    =>    'Last post',
-'Topic start'                =>    'Topic start',
-'Subject'                    =>    'Subject',
-'Redirect label'            =>    'Redirect URL',
-'Redirect help'                =>    'Only available in empty forums',
-'Group permissions subhead'    =>    'Edit group permissions for this forum',
-'Group permissions info'    =>    'In this form, you can set the forum specific permissions for the different user groups. If you haven\'t made any changes to this forum\'s group permissions, what you see below is the default based on settings in %s. Administrators always have full permissions and are thus excluded. Permission settings that differ from the default permissions for the user group are marked red. The "Read forum" permission checkbox will be disabled if the group in question lacks the "Read board" permission. For redirect forums, only the "Read forum" permission is editable.',
-'Read forum label'            =>    'Read forum',
-'Post replies label'        =>    'Post replies',
-'Post topics label'            =>    'Post topics',
-'Revert to default'            =>    'Revert to default',
-
-);
diff --git a/lang/English/admin/forums.po b/lang/English/admin/forums.po
new file mode 100644
index 00000000..d3153c81
--- /dev/null
+++ b/lang/English/admin/forums.po
@@ -0,0 +1,147 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Forum added redirect"
+msgstr "Forum added."
+
+msgid "Unable to add forum"
+msgstr "Unable to add forum"
+
+msgid "Forum deleted redirect"
+msgstr "Forum deleted."
+
+msgid "Forums updated redirect"
+msgstr "Forums updated."
+
+msgid "Forum updated redirect"
+msgstr "Forum updated."
+
+msgid "Perms reverted redirect"
+msgstr "Permissions reverted to defaults."
+
+msgid "Must enter name message"
+msgstr "You must enter a forum name."
+
+msgid "Must be integer message"
+msgstr "Position must be a positive integer value."
+
+msgid "Must be valid category"
+msgstr "You must enter a valid category"
+
+msgid "New forum"
+msgstr "New forum"
+
+msgid "Add forum head"
+msgstr "Add forum"
+
+msgid "Create new subhead"
+msgstr "Create a new forum"
+
+msgid "Add forum label"
+msgstr "Add forum to category"
+
+msgid "Add forum help"
+msgstr "Select the category to which you wish to add a new forum."
+
+msgid "Add forum"
+msgstr "Add forum"
+
+msgid "No categories exist"
+msgstr "No categories exist"
+
+msgid "Manage forums head"
+msgstr "Manage forums"
+
+msgid "Category subhead"
+msgstr "Category:"
+
+msgid "Forum label"
+msgstr "Forum"
+
+msgid "Edit link"
+msgstr "Edit"
+
+msgid "Delete link"
+msgstr "Delete"
+
+msgid "Position label"
+msgstr "Position"
+
+msgid "Update positions"
+msgstr "Update positions"
+
+msgid "Confirm delete head"
+msgstr "Confirm delete forum"
+
+msgid "Confirm delete subhead"
+msgstr "Important! Read before deleting"
+
+msgid "Confirm delete info"
+msgstr "Are you sure that you want to delete the forum <strong>%s</strong>?"
+
+msgid "Confirm delete warn"
+msgstr "WARNING! Deleting a forum will delete all posts (if any) in that forum!"
+
+msgid "Edit forum head"
+msgstr "Edit forum"
+
+msgid "Edit details subhead"
+msgstr "Edit forum details"
+
+msgid "Forum name label"
+msgstr "Forum name"
+
+msgid "Forum description label"
+msgstr "Description (HTML)"
+
+msgid "Category label"
+msgstr "Category"
+
+msgid "Sort by label"
+msgstr "Sort topics by"
+
+msgid "Last post"
+msgstr "Last post"
+
+msgid "Topic start"
+msgstr "Topic start"
+
+msgid "Subject"
+msgstr "Subject"
+
+msgid "Redirect label"
+msgstr "Redirect URL"
+
+msgid "Redirect help"
+msgstr "Only available in empty forums"
+
+msgid "Group permissions subhead"
+msgstr "Edit group permissions for this forum"
+
+msgid "Group permissions info"
+msgstr "In this form, you can set the forum specific permissions for the different user groups. If you haven't made any changes to this forum's group permissions, what you see below is the default based on settings in %s. Administrators always have full permissions and are thus excluded. Permission settings that differ from the default permissions for the user group are marked red. The \"Read forum\" permission checkbox will be disabled if the group in question lacks the \"Read board\" permission. For redirect forums, only the \"Read forum\" permission is editable."
+
+msgid "Read forum label"
+msgstr "Read forum"
+
+msgid "Post replies label"
+msgstr "Post replies"
+
+msgid "Post topics label"
+msgstr "Post topics"
+
+msgid "Revert to default"
+msgstr "Revert to default"
diff --git a/lang/English/admin/groups.mo b/lang/English/admin/groups.mo
new file mode 100644
index 0000000000000000000000000000000000000000..c76b6c961767db43e55cbf7a7f06130c998d6971
GIT binary patch
literal 8477
zcmdU!U5q4E6~_w!(NR8CP!zqhfV->HJ^LjtvmY?KJG%_-%nmcN2mwv1yKi?FR9CfC
z)iVqU(TJLjnh>HJW5h(Gpz%dCCTcJ-MhqnKK-5GugkXX(`hpK=jF{-}+>h$&nc0nI
zd9kv0{(VoKd+)jDoO{l>wJ%(8!Rdf!iS{nq4_+4p9|MnH$RD1|E((In!OOu*!E3=w
zz}>EY2)u^=BKS724_*m=27C+nRoDNX>pu-%0sVQ`f7!i1{|$Eh)!>_XzXOzY4}fn1
zPq_YFpp5T1`~)cLe8Ii{mct*r_rC-$<NXVu@VyMa5j>wivY(4Vd4CNk>(xP-|7P&5
z;F80xd;b6^`+NwLeLf1xygzaHtfRjK%6zXn`o&{*zHv~--2h$%&Viy&4T?MkDDr#?
z6gf_VZwJ2(3g6E_;d|EMi=goT)%DLqS<=58l=ZiOGS41IKj!FnIQl)H$o~K+^F9p9
z_^*R9{`;Vef711T>-v9o{eQXsB^XWk$3fxW?eHil^WO=IfAv7o-)BM5!`DDr?}wm_
ze;O1ye(&gi0cHHFpxEQmi-Ta{ydby^<X<pADKh>+@HqHIQ2g-^;Qipg!8^eFne;mF
z*Wh9BAE3;)pTReRw}C$gKL^UZClE&V@exqu>hlK?f=@bp2z)*LN5DPcHyr&raE|^T
zL78ValkhW`2JZ%!Kw0;3@Jjaa3y^=o^K9}0@MUlp_zH+ggRL;11b2b&1y6yZpYMVq
z&rcmb1Il{81KD!$Cx?FrAEtjHO1~ET5{SuyC%`Abr$7Zhh%pwxZ-V3C-@s?Ut8miO
z;7g#)e?QJB`aR|FG4Rv$p9E!}x4t6??gH-y#cn?WKMy_w%6{&=+UlzXiu_*&Yv5y`
z$n_iW3H0(JDC<3f)BF?s4k+UvW$_c><DdeAcVi=99AqoO$H9++r(ORQ@J9M$@3HG0
z0dJsx8z_1|1?~sG0^R~X2jT+3xUzEY0%hF}xC~~l{}i}~{;xn;_ac;r*v2;E7t^$N
z(r%^6vyXP1b~Eh=O`ZuF!-Au<_tC14=tlHWeZ;PqC8#^1glO4|$T#I^9#CI!kS0Da
za*8dkr^zGwlLwU=pOXEH?`@-@F7xc*ujv0nG(uRglZGn=yJ<5t(dqd#|A_77Ty3F=
z|B5g92h#_WG|~4wZ97dKLb1^`t`i&(f_uatM5l*nn8U=$4}gm_(nat=nt$HU5Akbx
z#D4P3(YDe^Wx+9;JhK*po50&>xKFT`wnS63@|kY6R3}RZeU%RyT^+W9l9DUaKNKcv
zkn2pkaX%P#<FKLQ;Bc5EX`wRROINgN>2^4X3)Rzk9(HtaxEm%Nt@>e}uclec&9Q;%
zrb?4`l=YY-)`eD4(oTcJqckt%I`V3mCBYH5w%v{qc9djS8Kq^q6=k|vtQ+muIbuaI
zQ^I28^7ErBM~S24UjMtF=7rm)duu6vaWh4c_M_$~mm@j0C=VMkddt#YT106Q%+z{e
z6svZerY&oT5sDo)(~1gf&D?6QO7L4UG$XP3Rgt&Sugr%G?Fd<nLM@A<IHvoeyoi#H
zU)VU!G2>EUtEF4GhEuU6wyYK_Y`iZv@>!4CFg(|VtR~9C0CvifW?W_+&F|Zii>P2P
zR`NMi+0UXCcGuC)8tZ6PMlpr19tF!=C70|v3yU<fMwpX>VNZ~euhRGYC4(1sZjcvB
zCxy<GmDnGsdA;h+tFgzhYo}Vk`>IY-=~o!U`fk65!S*W*neNAtSBYWqlnPVTi4D()
z3ojVg^&2<Bj*{$5i&#-L(lB#gUFmy<B<zh$v#2W+&(u$|k&Q3v3dJ%l=`d?{tJ)c%
zc&4PKv^i`}Lrc0s@l1tER}*I%v$rK(C0Vv*<7;7@vBx!~<(%YYWIRboRWT%$Te-|M
z8>n_BL*BsW2o)CVE5n(p-hO+8>xdf~ue8T`9nH?P5D&62t{qLYUOuIgzUk%%cI{L4
z=YegB8b6?RZr?YCMeiYa)@EC^+sP0Fsws6;hecOshYpP`oLH_MX7dujYDdCCPbp}%
zMZFRUt0x@~^P;w#g-IUEp@Hc*Nn=3zs4eTTSD8`m4_mz`xw&nZXf*0+);TyfH#;{o
zTz_YM#~A6M;Plj%*ZM44==+MvejG;0KGp1o8R6o<$>pQ9y+b}(y{)s_OwvqSgqJC`
zw-FVkAXA*hu{&zVbYc(olv+q7YN?&|z4bl3vEABII>?%u^d@UeDZ7ZtsEI$f(wpQh
z8Mh-rG7o0ks+YE0#HhrhFw-n6d7w3+!Z=Q?`6RTfq8sHd4iu?s_!M0arVU>?U#_aJ
zgXQipMVr-C)28o+b{V`?SF?#CRZHYaeJUO<H=)+jf$B+kB3B#lm92!T6}3?yN_S#~
zEInMU{u=BO(@8C1T(~SKHs7&hExCeebSZ-81AY|UurR&V5OJ%!)K2*Qd6A__=iv4E
z{z>=qruC(W(O>Z4>Bafk`D5d1x-G$4*02e#g-)!Bh33?p=^PKIv?=P?0u%DDq9waG
zGipNVdZ%t)+F4}Vxe}kilbfVVykNDf#TE1##_JGDbXHd!TOvwxkVS=%!#qv$373A5
zVr!wW^>7LuF&<N6s?upNzcL4nDQzAzIyZ9Us<Gy)y!vR-G}=Q5Hn~Jt^fjRw@5`h!
zcAN*>?QZaNS3DqYl$j9RmvT!4F?E&c{f{%athFsln(;u+z6ul3oXLRO%c(6}aAdSH
zOFF^)pw~cyX<O8uCe*mbzc$-IHzd*HZ>u4pqoIpcjs3I~c6nWis(81<IHX;r9?Vp#
zzDUY}l`uA^xS#17ij5LH!5QY*0Pn)q(-I@S>F86Y*x-Wukjmz?$eVkYte*T^(p9~p
zvkB`{c#HUot<LIdA;y`sqS$vQ2;<}_so5?+VLNGGqP=z0K@zU8H&e-OE8Tg&?j1C-
z(->?2Bwf|lSue^ZDX2Ei*D*WUUSGErg5YYnMp_m%wg+)s8HW$d5RfOGgIJji>Fn-c
zB-!9jGL^E<bnemFEMZQNE2WWjvoO7pFPIsvtzEfm%Ido7*bTdmOrcx;m8+nAmjh`k
z=irc*TvA#JpBU=jT28`&Kep9(VjOulj0bhK+|{^6Ia|LUuc@ewpNJ_3J(c%$Gipc8
z4U6DEnw-(JVZ!Ib;Y_1)xgDB{CYbdpN(2h6I2&Sxag$+C3mZ`!6;!no)IO8B1U$)N
zcsQ5Ss3Ql7<LCI<P(sV-6LHN(IHEpex8&tY6b^M!376u;eTo-}2wqoPbGgdNHOiab
zhKHea!@U0*WJ=Z=-c|gH<yxjD7-0!EJKMGf_&-!I4teG@uE>m1rQoDpN|a3!Jr%kM
zkY&Wn$t}&IOy?56yAc-&jEmztZnYW_kE+fz=;H|Hbm9^9pmOUg(rRxg5FTvP;+?+4
zvNu3qNEqLjoa*Emo<h~e;zO}iS#4UeqJ$hzM2on843D#9XcG|38D`9V#5{3avla5G
zsb(a_)QSNPFQdyLd<T+b;Hz4W%Q+`Po60xOgA2oZZJ7pb47CSo!{N8toSVM6>YCS5
zGPpI&L3Vo~tK_K)iCc2x#kvv<!h%B4=1V!ltGbaBSt)sSY$`9a>Q;ZK3Ft;Zv)I}5
zjR@e23scCOFF|g+D?0v*8AS26B5^}qc_N-8d3)q|%cjDLt-?W(_PCWbxm1`~%@$3q
zh*O8Esk4Hsl1j?D#wpGD-InX~Eiz-v)hK7EIHl^9YE?cCvJRDniLd@JCF?3o<M;&T
zOq2D+Aj3MtzOp5KZt4ST^Ux#@rlle^7Zh($<G)3CFSUzdDNlLS>yaV3h{kJWU0+x8
zWkn;V4twc<TLHn_Y}=dxdkkHzUZh1BZ(xJp=Aj9*<IQI3g)PZ7@Y$GQ6NJCVVaICJ
zKD!UB$X#C6FkenwV)EOsxUy7pYph8MHd`u(m`YF_1xls~^43tqFFsafS;U7siodn>
zDZD)Xin7S)9PuHFKWv##xA=?3=y5dmNE3Wb;-h@mggs6>Q8LNjbby19>&q)lF#HDe
z8stKPefj-p^Hf;nIOib75#~$OnacT*uTo_oJJ%b8{SKthwCGaxyH~mBS)*rO{pN+S
zQgIV|iIn_<wcIDNv%9JBjPj~x(p8zm?B}u}O>Q-KA^zk)nEAA~$`#c(yZxHANy_$i
zwQ*t8`H;SyY5qTf?B+h0NljB>b>*yli<8ZnkAy}pp`3k#uo=nx#C(?`Z`6a6&@Ihe
z*7&+~Z*@g~=Iu=;EF|7iwyWb>ZZ?fr*pXXi_f@#v`!)%_+)0_=eHb2*k1=IrV6gkX
XD2L1RND5MdlC4I+`(=_0NZ|hgb0FhW

literal 0
HcmV?d00001

diff --git a/lang/English/admin/groups.php b/lang/English/admin/groups.php
deleted file mode 100644
index 8263ca10..00000000
--- a/lang/English/admin/groups.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-// Language definitions used in admin_groups.php
-$lang_admin_groups = array(
-
-'Must enter title message'        =>    'You must enter a group title.',
-'Title already exists message'    =>    'There is already a group with the title <strong>%s</strong>.',
-'Default group redirect'        =>    'Default group set.',
-'Cannot remove default message'    =>    'The default group cannot be removed. In order to delete this group, you must first setup a different group as the default.',
-'Group removed redirect'        =>    'Group removed.',
-'Group added redirect'            =>    'Group added.',
-'Group edited redirect'            =>    'Group edited.',
-
-'Add groups head'                =>    'Add/setup groups',
-'Add group subhead'                =>    'Add new group',
-'New group label'                =>    'Base new group on',
-'New group help'                =>    'Select a user group from which the new group will inherit its permission settings. The next page will let you fine-tune its settings.',
-'Default group subhead'            =>    'Set default group',
-'Default group label'            =>    'Default group',
-'Default group help'            =>    'This is the default user group, e.g. the group users are placed in when they register. For security reasons, users can\'t be placed in either the moderator or administrator user groups by default.',
-'Existing groups head'            =>    'Existing groups',
-'Edit groups subhead'            =>    'Edit/delete groups',
-'Edit groups info'                =>    'The pre-defined groups Guests, Administrators, Moderators and Members cannot be removed. However, they can be edited. Please note that in some groups, some options are unavailable (e.g. the <em>edit posts</em> permission for guests). Administrators always have full permissions.',
-'Edit link'                        =>    'Edit',
-'Delete link'                    =>    'Delete',
-'Group delete head'                =>    'Group delete',
-'Confirm delete subhead'        =>    'Confirm delete group',
-'Confirm delete info'            =>    'Are you sure that you want to delete the group <strong>%s</strong>?',
-'Confirm delete warn'            =>    'WARNING! After you deleted a group you cannot restore it.',
-'Delete group head'                =>    'Delete group',
-'Move users subhead'            =>    'Move users currently in group',
-'Move users info'                =>    'The group <strong>%s</strong> currently has <strong>%s</strong> members. Please select a group to which these members will be assigned upon deletion.',
-'Move users label'                =>    'Move users to',
-'Delete group'                    =>    'Delete group',
-
-'Group settings head'            =>    'Group settings',
-'Group settings subhead'        =>    'Setup group options and permissions',
-'Group settings info'            =>    'Below options and permissions are the default permissions for the user group. These options apply if no forum specific permissions are in effect.',
-'Group title label'                =>    'Group title',
-'User title label'                =>    'User title',
-'User title help'                =>    'The rank users in this group have attained. Leave blank to use default title ("%s").',
-'Promote users label'            =>    'Promote users',
-'Promote users help'            =>    'You can promote users to a new group automatically if they reach a certain number of posts. Select "%s" to disable. For security reasons, you are not allowed to select an administrator group here. Also note that group changes for users affected by this setting will take effect <strong>immediately</strong>. Note that the amount of posts you enter is the total amount of posts of a user, not the amount of posts made as a member of this group.',
-'Disable promotion'                =>    'Disable promoting',
-'Mod privileges label'            =>    'Allow users moderator privileges',
-'Mod privileges help'            =>    'In order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user\'s profile.',
-'Edit profile label'            =>    'Allow moderators to edit user profiles',
-'Edit profile help'                =>    'If moderator privileges are enabled, allow users in this group to edit user profiles.',
-'Rename users label'            =>    'Allow moderators to rename users',
-'Rename users help'                =>    'If moderator privileges are enabled, allow users in this group to rename users.',
-'Change passwords label'        =>    'Allow moderators to change passwords',
-'Change passwords help'            =>    'If moderator privileges are enabled, allow users in this group to change user passwords.',
-'Mod promote users label'        =>    'Allow moderators to promote users',
-'Mod promote users help'        =>    'If moderator privileges are enabled, allow users in this group to promote users.',
-'Ban users label'                =>    'Allow moderators to ban users',
-'Ban users help'                =>    'If moderator privileges are enabled, allow users in this group to ban users.',
-'Read board label'                =>    'Read board',
-'Read board help'                =>    'Allow users in this group to view the board. This setting applies to every aspect of the board and can therefore not be overridden by forum specific settings. If this is set to "No", users in this group will only be able to login/logout and register.',
-'View user info label'            =>    'View user information',
-'View user info help'            =>    'Allow users to view the user list and user profiles.',
-'Post replies label'            =>    'Post replies',
-'Post replies help'                =>    'Allow users in this group to post replies in topics.',
-'Post topics label'                =>    'Post topics',
-'Post topics help'                =>    'Allow users in this group to post new topics.',
-'Edit posts label'                =>    'Edit posts',
-'Edit posts help'                =>    'Allow users in this group to edit their own posts.',
-'Delete posts label'            =>    'Delete posts',
-'Delete posts help'                =>    'Allow users in this group to delete their own posts.',
-'Delete topics label'            =>    'Delete topics',
-'Delete topics help'            =>    'Allow users in this group to delete their own topics (including any replies).',
-'Post links label'                =>    'Post links',
-'Post links help'                =>    'Allow users in this group to include links in their posts. This setting also applies to signatures and the website field in users\' profiles.',
-'Set own title label'            =>    'Set own user title',
-'Set own title help'            =>    'Allow users in this group to set their own user title.',
-'User search label'                =>    'Use search',
-'User search help'                =>    'Allow users in this group to use the search feature.',
-'User list search label'        =>    'Search user list',
-'User list search help'            =>    'Allow users in this group to freetext search for users in the user list.',
-'Send e-mails label'            =>    'Send e-mails',
-'Send e-mails help'                =>    'Allow users in this group to send e-mails to other users.',
-'Post flood label'                =>    'Post flood interval',
-'Post flood help'                =>    'Number of seconds that users in this group have to wait between posts. Set to 0 to disable.',
-'Search flood label'            =>    'Search flood interval',
-'Search flood help'                =>    'Number of seconds that users in this group have to wait between searches. Set to 0 to disable.',
-'E-mail flood label'            =>    'Email flood interval',
-'E-mail flood help'                =>    'Number of seconds that users in this group have to wait between emails. Set to 0 to disable.',
-'Report flood label'            =>    'Report flood interval',
-'Report flood help'                =>    'Number of seconds that users in this group have to wait between reports. Set to 0 to disable.',
-'Moderator info'                =>    'Please note that in order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user\'s profile.',
-
-);
diff --git a/lang/English/admin/groups.po b/lang/English/admin/groups.po
new file mode 100644
index 00000000..cb17a229
--- /dev/null
+++ b/lang/English/admin/groups.po
@@ -0,0 +1,261 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Must enter title message"
+msgstr "You must enter a group title."
+
+msgid "Title already exists message"
+msgstr "There is already a group with the title <strong>%s</strong>."
+
+msgid "Default group redirect"
+msgstr "Default group set."
+
+msgid "Cannot remove default message"
+msgstr "The default group cannot be removed. In order to delete this group, you must first setup a different group as the default."
+
+msgid "Group removed redirect"
+msgstr "Group removed."
+
+msgid "Group added redirect"
+msgstr "Group added."
+
+msgid "Group edited redirect"
+msgstr "Group edited."
+
+msgid "Add groups head"
+msgstr "Add/setup groups"
+
+msgid "Add group subhead"
+msgstr "Add new group"
+
+msgid "New group label"
+msgstr "Base new group on"
+
+msgid "New group help"
+msgstr "Select a user group from which the new group will inherit its permission settings. The next page will let you fine-tune its settings."
+
+msgid "Default group subhead"
+msgstr "Set default group"
+
+msgid "Default group label"
+msgstr "Default group"
+
+msgid "Default group help"
+msgstr "This is the default user group, e.g. the group users are placed in when they register. For security reasons, users can't be placed in either the moderator or administrator user groups by default."
+
+msgid "Existing groups head"
+msgstr "Existing groups"
+
+msgid "Edit groups subhead"
+msgstr "Edit/delete groups"
+
+msgid "Edit groups info"
+msgstr "The pre-defined groups Guests, Administrators, Moderators and Members cannot be removed. However, they can be edited. Please note that in some groups, some options are unavailable (e.g. the <em>edit posts</em> permission for guests). Administrators always have full permissions."
+
+msgid "Edit link"
+msgstr "Edit"
+
+msgid "Delete link"
+msgstr "Delete"
+
+msgid "Group delete head"
+msgstr "Group delete"
+
+msgid "Confirm delete subhead"
+msgstr "Confirm delete group"
+
+msgid "Confirm delete info"
+msgstr "Are you sure that you want to delete the group <strong>%s</strong>?"
+
+msgid "Confirm delete warn"
+msgstr "WARNING! After you deleted a group you cannot restore it."
+
+msgid "Delete group head"
+msgstr "Delete group"
+
+msgid "Move users subhead"
+msgstr "Move users currently in group"
+
+msgid "Move users info"
+msgstr "The group <strong>%s</strong> currently has <strong>%s</strong> members. Please select a group to which these members will be assigned upon deletion."
+
+msgid "Move users label"
+msgstr "Move users to"
+
+msgid "Delete group"
+msgstr "Delete group"
+
+msgid "Group settings head"
+msgstr "Group settings"
+
+msgid "Group settings subhead"
+msgstr "Setup group options and permissions"
+
+msgid "Group settings info"
+msgstr "Below options and permissions are the default permissions for the user group. These options apply if no forum specific permissions are in effect."
+
+msgid "Group title label"
+msgstr "Group title"
+
+msgid "User title label"
+msgstr "User title"
+
+msgid "User title help"
+msgstr "The rank users in this group have attained. Leave blank to use default title (\"%s\")."
+
+msgid "Promote users label"
+msgstr "Promote users"
+
+msgid "Promote users help"
+msgstr "You can promote users to a new group automatically if they reach a certain number of posts. Select \"%s\" to disable. For security reasons, you are not allowed to select an administrator group here. Also note that group changes for users affected by this setting will take effect <strong>immediately</strong>. Note that the amount of posts you enter is the total amount of posts of a user, not the amount of posts made as a member of this group."
+
+msgid "Disable promotion"
+msgstr "Disable promoting"
+
+msgid "Mod privileges label"
+msgstr "Allow users moderator privileges"
+
+msgid "Mod privileges help"
+msgstr "In order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user's profile."
+
+msgid "Edit profile label"
+msgstr "Allow moderators to edit user profiles"
+
+msgid "Edit profile help"
+msgstr "If moderator privileges are enabled, allow users in this group to edit user profiles."
+
+msgid "Rename users label"
+msgstr "Allow moderators to rename users"
+
+msgid "Rename users help"
+msgstr "If moderator privileges are enabled, allow users in this group to rename users."
+
+msgid "Change passwords label"
+msgstr "Allow moderators to change passwords"
+
+msgid "Change passwords help"
+msgstr "If moderator privileges are enabled, allow users in this group to change user passwords."
+
+msgid "Mod promote users label"
+msgstr "Allow moderators to promote users"
+
+msgid "Mod promote users help"
+msgstr "If moderator privileges are enabled, allow users in this group to promote users."
+
+msgid "Ban users label"
+msgstr "Allow moderators to ban users"
+
+msgid "Ban users help"
+msgstr "If moderator privileges are enabled, allow users in this group to ban users."
+
+msgid "Read board label"
+msgstr "Read board"
+
+msgid "Read board help"
+msgstr "Allow users in this group to view the board. This setting applies to every aspect of the board and can therefore not be overridden by forum specific settings. If this is set to \"No\", users in this group will only be able to login/logout and register."
+
+msgid "View user info label"
+msgstr "View user information"
+
+msgid "View user info help"
+msgstr "Allow users to view the user list and user profiles."
+
+msgid "Post replies label"
+msgstr "Post replies"
+
+msgid "Post replies help"
+msgstr "Allow users in this group to post replies in topics."
+
+msgid "Post topics label"
+msgstr "Post topics"
+
+msgid "Post topics help"
+msgstr "Allow users in this group to post new topics."
+
+msgid "Edit posts label"
+msgstr "Edit posts"
+
+msgid "Edit posts help"
+msgstr "Allow users in this group to edit their own posts."
+
+msgid "Delete posts label"
+msgstr "Delete posts"
+
+msgid "Delete posts help"
+msgstr "Allow users in this group to delete their own posts."
+
+msgid "Delete topics label"
+msgstr "Delete topics"
+
+msgid "Delete topics help"
+msgstr "Allow users in this group to delete their own topics (including any replies)."
+
+msgid "Post links label"
+msgstr "Post links"
+
+msgid "Post links help"
+msgstr "Allow users in this group to include links in their posts. This setting also applies to signatures and the website field in users' profiles."
+
+msgid "Set own title label"
+msgstr "Set own user title"
+
+msgid "Set own title help"
+msgstr "Allow users in this group to set their own user title."
+
+msgid "User search label"
+msgstr "Use search"
+
+msgid "User search help"
+msgstr "Allow users in this group to use the search feature."
+
+msgid "User list search label"
+msgstr "Search user list"
+
+msgid "User list search help"
+msgstr "Allow users in this group to freetext search for users in the user list."
+
+msgid "Send e-mails label"
+msgstr "Send e-mails"
+
+msgid "Send e-mails help"
+msgstr "Allow users in this group to send e-mails to other users."
+
+msgid "Post flood label"
+msgstr "Post flood interval"
+
+msgid "Post flood help"
+msgstr "Number of seconds that users in this group have to wait between posts. Set to 0 to disable."
+
+msgid "Search flood label"
+msgstr "Search flood interval"
+
+msgid "Search flood help"
+msgstr "Number of seconds that users in this group have to wait between searches. Set to 0 to disable."
+
+msgid "E-mail flood label"
+msgstr "Email flood interval"
+
+msgid "E-mail flood help"
+msgstr "Number of seconds that users in this group have to wait between emails. Set to 0 to disable."
+
+msgid "Report flood label"
+msgstr "Report flood interval"
+
+msgid "Report flood help"
+msgstr "Number of seconds that users in this group have to wait between reports. Set to 0 to disable."
+
+msgid "Moderator info"
+msgstr "Please note that in order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user's profile."
diff --git a/lang/English/admin/index.mo b/lang/English/admin/index.mo
new file mode 100644
index 0000000000000000000000000000000000000000..4a7addb19d2ddd3d3b13821c293300399d51aedd
GIT binary patch
literal 4052
zcmaKuO^h5z6~`;V5LiND5<&=pP=*BWCg~op?KsP93|`NAiKTdVvb#10Az3xuH8YKS
zs+y|m9j_6HBSMHnByLe8K8`>nF2IQoi4%eY2mu0xOC&%D2`NH|1Bm~ts_vcf+O($o
zS6x-}>V4I#e(ixHUt_pdaK8`tAMavp3w-%ac;Nco5ylq4--B-lUk4ur{{eFF-ZwM$
zPA~x<06!MF4c>=$2|frq@DcD!Ag%L_*#9H&U3mXB_#W^tAj!MyEsVVzd=PvXd=fkg
zo(D;f9q?`7HIU>N;N9To!S{n-1m6L^0+QTsgO7nf14+*7Ag%LHkk+~9p0LhiAjv%g
z(*MszZh~arr$N$RgY>_zfHeP`k>82@e&kOge;)ap$UjB?HS!IR^!g77mDqi64R$^R
zk{^$OWakO+UT_^G{a*x0j|?O~-2_R$m%u(^`6_rn-YJMA_b5p5dl;nkPJtw69mG_2
zCGuM27$o~X3!VZ$2YwKI6{NWR3MBb|21&1fffS!3c#yoKAjy9Or1?*Q2r)Yc;>R}d
zSOvF1O1ZCsSHYJ+^8eq!=fHo1C%`jUgzO!G=we?0N&c53Uj|9v?}Bh8`vFLDehgCl
ze+eew-$9b|C<Z?Oo&=AB+u#y-6Qn%)76_BrPeJ_HFYqAy{{WKz{tJ>__ajK(10M&;
z&%Xt!|1}Ul_68nLfp^1MSem8aL*Od71-=MU{Jsvp7yKcJ@Od8sUI%pf9H;l@T1JEH
zB_Ggr1~=JBKBhR+MS1ff+~kj^aX*gx817pyiZ5MH;Kug${(TlC|Ipqge~?Y&hvs@F
zHfV30jO|5`d_?ggACW)E=F_-4xXDhsk^o<OK8!Z`pJGD(e-bzOi+n`>OL0?P(?xm0
zag(2JchP=lYXe<7K9(Y9Yo#>KHf<-360X>jy#IWk_e3_9d~vPcTf)3Mj`6Zk*I92Y
zv+I1Q4X>+_5xHdR!ij;flILh}qo?+kE?eB3nN^B`EZMp&rIWl+)`_y@!=l8LxxTa-
zS9~ZikjIg{neK;-%nKtk$1bS7!e}*-$^{j+b`JN6EIZt}Cygz%ni~k}ZAjt9(wslf
z;~X!U9qx|PwW%ju<dZ@L7jO8EFnDph$75^8S}t!C)>*c>#x~`&T}JG|VlgNspGa%P
zNU}}sc-zYmuR;wq&kIYl@^;#GtyG~#SjkE2T6v9>9cf?*FSW>nDYG3xyV!$(IA~U6
zF<TCI$LV7|ML>p{?bKDJjf+O^)&>c3>5|VXHun}X=yJ##j-;bZ@)2&$xKh9wHYj_b
z3HyXBGd+=fxow?nTc_IA>9+Mu+d9*>o^4wzZR;a#%jpn5b~Pv-5H$XjR5{<OTroi=
z8#ezMrpUD{L;4!wv|+O^VR)!3sSXDX$=9m~VHeH{xI=%C)h}x!$^<Dkv0bhz|7y>k
zT;-v8c2V(TXZiBd>O$Y>&tQur7xUyw$n`F7b9kY@wVU(|G9Ak$*u}ET(U)w?y@Iwy
z)AfR|F4;9gS>%>BnDl~BqZ+xH>`F12k;tF(Tj1O<?4H3O)n@e3g-aJNT{u{OIX$t^
z)5>AHCcFC;7IpH5>r|yE)GCrf7%Sb`%ex!N%E3HZeJD+GL1j8ens@oipm41sT`twa
z)#T$+g$Q(cU!y!YzMQV4r!f*<lO2uZl)bP<mxo1SnQZ+MYvundg={*VQV~j(bRAJ;
zo!gYfZ4|;Tf5NgIB#m!0g|aPlj`eh1=3HTm8#&Ra$FU%K;k;i;UspA^nh*B*Sg1T@
zyC~LFFZonhZfoS7wZpnB_oEC<*{aA7R1WOEbrLax9y1B%-%(14JfXpvBFgrf&ekPO
zIbor$`6#1C&>AS8zLQazL-dqFbte_u(yq%Kl?N3Cbv_imr}+Tqk{x^Fk^aH<JcS}D
z+w82dHLhlAq8=V3Eqq}4Kw>i)Y&UoZ|N5k^c_y&E^i=r*hthp(9TYAIpDU)MCLMso
zT4iJjM@XrnEiN4_(-v9`yKw=J`{I-`T2&Y*9}Dko7M)c*Wznm=hJ;1C#I?eKDp{<r
zq<GVwDSUBsw&&KmJ6~g&qxzdnCK;XTsr4B@#6FZhSq~>_Q-Lvu*Xp{06X9E7wL&oN
zP>#3ENGPN=-0tK^n?hQS+@#NfdV;_0NEh14w8$mbD4h`Jr&LB_BTI#>O_Bb}8C`Ou
z>!h$$bZq#vfQ!QPQH|5AQRHGDY1E!hUSXP;vh#>Oxs^mpWnsxwn;dVXNL~3cJ~Fzl
z8YT2Zd!16&M*yKBwqd3HQqRK@>@IqPBj{v<pymL=F+qVo*ctPCfoF|H0{bB48%9s?
zMSwKfk4f50*emei!-cI-pDjnGkl2A11_`|`aavHBLyqw2SYpU{0hDhrb!JVNil5*U
zjZH@7xml>&9Aq~_B9z5w>|B+HESNvSd^x*`B~u)-oyzFEhEg5Wc$0UiKcNWv!>==U
zxcNUyd|Nd~Uyy!T`7apwDxUFBD}F6<TOjoOI6nIH^jdAoYyN0F&atx&Z#7@MQii;^
S?J*gva5AevrqlX*hy4%aFDIn{

literal 0
HcmV?d00001

diff --git a/lang/English/admin/index.php b/lang/English/admin/index.php
deleted file mode 100644
index c89b6755..00000000
--- a/lang/English/admin/index.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-// Language definitions used in admin_index.php
-$lang_admin_index = array(
-
-'fopen disabled message'            =>    'Unable to check for upgrade since \'allow_url_fopen\' is disabled on this system.',
-'Upgrade check failed message'        =>    'Check for upgrade failed for unknown reasons.',
-'Running latest version message'    =>    'You are running the latest version of FeatherBB.',
-'New version available message'        =>    'A new version of FeatherBB has been released. You can download the latest version at %s.',
-'Deleted install.php redirect'        =>    'The file was successfully removed.',
-'Delete install.php failed'            =>    'Could not remove install.php. Please do so by hand.',
-'Not available'                        =>    'Not available',
-'Forum admin head'                    =>    'Forum administration',
-'NA'                                =>    'N/A',
-'Welcome to admin'                    =>    'Welcome to the FeatherBB administration control panel. From here you can control vital aspects of the board. Depending on whether you are an administrator or a moderator you can:',
-'Welcome 1'                            =>    'Organize categories and forums.',
-'Welcome 2'                            =>    'Set forum-wide options and preferences.',
-'Welcome 3'                            =>    'Control permissions for users and guests.',
-'Welcome 4'                            =>    'View IP statistics for users.',
-'Welcome 5'                            =>    'Ban users.',
-'Welcome 6'                            =>    'Censor words.',
-'Welcome 7'                            =>    'Set up user groups and promotions.',
-'Welcome 8'                            =>    'Prune old posts.',
-'Welcome 9'                            =>    'Handle post reports.',
-'Alerts head'                        =>    'Alerts',
-'Install file exists'                =>    'The install folder still exists, but should be removed. %s.',
-'Delete install file'                =>    'Delete it',
-'About head'                        =>    'About FeatherBB',
-'FeatherBB version label'                =>    'FeatherBB version',
-'Check for upgrade'                    =>    'Check for upgrade',
-'FeatherBB version data'                =>    'v%s - %s',
-'Server statistics label'            =>    'Server statistics',
-'View server statistics'            =>    'View server statistics',
-'Support label'                        =>    'Support',
-'Forum label'                        =>    'Forum',
-'IRC label'                            =>    'IRC channel',
-
-// Language definitions used in admin_statistics.php
-'PHPinfo disabled message'            =>    'The PHP function phpinfo() has been disabled on this server.',
-'Server statistics head'            =>    'Server statistics',
-'Server load label'                    =>    'Server load',
-'Server load data'                    =>    '%s - %s user(s) online',
-'Environment label'                    =>    'Environment',
-'Environment data OS'                =>    'Operating system: %s',
-'Show info'                            =>    'Show info',
-'Environment data version'            =>    'PHP: %s - %s',
-'Environment data acc'                =>    'Accelerator: %s',
-'Turck MMCache'                        =>    'Turck MMCache',
-'Turck MMCache link'                =>    'turck-mmcache.sourceforge.net/',
-'ionCube PHP Accelerator'            =>    'ionCube PHP Accelerator',
-'ionCube PHP Accelerator link'        =>    'www.php-accelerator.co.uk/',
-'Alternative PHP Cache (APC)'        =>    'Alternative PHP Cache (APC)',
-'Alternative PHP Cache (APC) link'    =>    'www.php.net/apc/',
-'Zend Optimizer'                    =>    'Zend Optimizer',
-'Zend Optimizer link'                =>    'www.zend.com/products/guard/zend-optimizer/',
-'eAccelerator'                        =>    'eAccelerator',
-'eAccelerator link'                    =>    'www.eaccelerator.net/',
-'XCache'                            =>    'XCache',
-'XCache link'                        =>    'xcache.lighttpd.net/',
-'Database label'                    =>    'Database',
-'Database data rows'                =>    'Rows: %s',
-'Database data size'                =>    'Size: %s',
-);
diff --git a/lang/English/admin/index.po b/lang/English/admin/index.po
new file mode 100644
index 00000000..91dce679
--- /dev/null
+++ b/lang/English/admin/index.po
@@ -0,0 +1,180 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "fopen disabled message"
+msgstr "Unable to check for upgrade since 'allow_url_fopen' is disabled on this system."
+
+msgid "Upgrade check failed message"
+msgstr "Check for upgrade failed for unknown reasons."
+
+msgid "Running latest version message"
+msgstr "You are running the latest version of FeatherBB."
+
+msgid "New version available message"
+msgstr "A new version of FeatherBB has been released. You can download the latest version at %s."
+
+msgid "Deleted install.php redirect"
+msgstr "The file was successfully removed."
+
+msgid "Delete install.php failed"
+msgstr "Could not remove install.php. Please do so by hand."
+
+msgid "Not available"
+msgstr "Not available"
+
+msgid "Forum admin head"
+msgstr "Forum administration"
+
+msgid "NA"
+msgstr "N/A"
+
+msgid "Welcome to admin"
+msgstr "Welcome to the FeatherBB administration control panel. From here you can control vital aspects of the board. Depending on whether you are an administrator or a moderator you can:"
+
+msgid "Welcome 1"
+msgstr "Organize categories and forums."
+
+msgid "Welcome 2"
+msgstr "Set forum-wide options and preferences."
+
+msgid "Welcome 3"
+msgstr "Control permissions for users and guests."
+
+msgid "Welcome 4"
+msgstr "View IP statistics for users."
+
+msgid "Welcome 5"
+msgstr "Ban users."
+
+msgid "Welcome 6"
+msgstr "Censor words."
+
+msgid "Welcome 7"
+msgstr "Set up user groups and promotions."
+
+msgid "Welcome 8"
+msgstr "Prune old posts."
+
+msgid "Welcome 9"
+msgstr "Handle post reports."
+
+msgid "Alerts head"
+msgstr "Alerts"
+
+msgid "Install file exists"
+msgstr "The install folder still exists, but should be removed. %s."
+
+msgid "Delete install file"
+msgstr "Delete it"
+
+msgid "About head"
+msgstr "About FeatherBB"
+
+msgid "FeatherBB version label"
+msgstr "FeatherBB version"
+
+msgid "Check for upgrade"
+msgstr "Check for upgrade"
+
+msgid "FeatherBB version data"
+msgstr "v%s - %s"
+
+msgid "Server statistics label"
+msgstr "Server statistics"
+
+msgid "View server statistics"
+msgstr "View server statistics"
+
+msgid "Support label"
+msgstr "Support"
+
+msgid "Forum label"
+msgstr "Forum"
+
+msgid "IRC label"
+msgstr "IRC channel"
+
+msgid "PHPinfo disabled message"
+msgstr "The PHP function phpinfo() has been disabled on this server."
+
+msgid "Server statistics head"
+msgstr "Server statistics"
+
+msgid "Server load label"
+msgstr "Server load"
+
+msgid "Server load data"
+msgstr "%s - %s user(s) online"
+
+msgid "Environment label"
+msgstr "Environment"
+
+msgid "Environment data OS"
+msgstr "Operating system: %s"
+
+msgid "Show info"
+msgstr "Show info"
+
+msgid "Environment data version"
+msgstr "PHP: %s - %s"
+
+msgid "Environment data acc"
+msgstr "Accelerator: %s"
+
+msgid "Turck MMCache"
+msgstr "Turck MMCache"
+
+msgid "Turck MMCache link"
+msgstr "turck-mmcache.sourceforge.net/"
+
+msgid "ionCube PHP Accelerator"
+msgstr "ionCube PHP Accelerator"
+
+msgid "ionCube PHP Accelerator link"
+msgstr "www.php-accelerator.co.uk/"
+
+msgid "Alternative PHP Cache (APC)"
+msgstr "Alternative PHP Cache (APC)"
+
+msgid "Alternative PHP Cache (APC) link"
+msgstr "www.php.net/apc/"
+
+msgid "Zend Optimizer"
+msgstr "Zend Optimizer"
+
+msgid "Zend Optimizer link"
+msgstr "www.zend.com/products/guard/zend-optimizer/"
+
+msgid "eAccelerator"
+msgstr "eAccelerator"
+
+msgid "eAccelerator link"
+msgstr "www.eaccelerator.net/"
+
+msgid "XCache"
+msgstr "XCache"
+
+msgid "XCache link"
+msgstr "xcache.lighttpd.net/"
+
+msgid "Database label"
+msgstr "Database"
+
+msgid "Database data rows"
+msgstr "Rows: %s"
+
+msgid "Database data size"
+msgstr "Size: %s"
diff --git a/lang/English/admin/maintenance.mo b/lang/English/admin/maintenance.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d31d3736a25e05750fa3194d34023a5c9a20a5ee
GIT binary patch
literal 4083
zcmbuCOKc=Z8OIw~Aecu;cs~NQBO>n#Pw$$|!SX&}V|ydR?#A+ZH*lk-yJoscKStfv
zo(w01h=i0&E+FMd4hST~E#kt7oRK(iiUdN*1;L2}Qleb=eO1*n<4J;q7^(g5s;>Ip
z-@nR#ee~SVB7Os&FY|1@FN!XK*WS+`es6*s;9CLDeISY+W&AMs8E_EBJD}|U4)}2}
z13v+tf}aGR2Oj}{4t^2*RhWMj6ghte9|QjZej0q}oS%Oz;1%#;<_`mY4-~mMDE9p@
z;Pas9c@Y#lUk1gVSHRDLuZHn!;rrh~(f@Y9M?M%upJTiU%KmSHp8}7;BVscKMc?l}
z<na&S1IB*@W!=|497UJG9Z=$!gTDq}0v`hR_;Vk;4Sp1S8GHi#Ehu)s0e&C+H@FQx
z_(&A}1^g)}{*O^E{+xoF;7`CI_#05-@fwJU(LceLz<+^a&kHCM`+g6KoIioTz@NW?
zBJaoiIcEGKDDi)T<Q;%-f)bA#Y<dBF0E(X1L6%3jedZ@V$d5ESJLFyTeU(S@D>)z(
z(Z_gjG5QjZ$dlTUx{#VtJn|DeNK15{2RB^2favo)U*QqEq;4folEYB4ym_D83xB@Q
zzkr0%#UZ*`6lz>IUD-x^MV>sXGSir7udc><Q>tmxRYv92xL%uTyHRFzx;8u0O%?6y
zd8^8<wQ3|=t(llcm8Na=#Q2YOk)o!UE=PqPnIbwUr*_Vk)I8_EuTJ<S-`1zPO`3da
zRb$e;F^N@UofjsJ?r2d~=_)bo#<sh)5>2+A<_Q)B3y$j6zPEk;>lBNVc~XcV%v_)J
zri59EP`WTCI%?_!O?fp@Q#3J_2#%Y&46>HvAjVBNgZ)|;ZU5R@GBRJ?7-m+t_Nh2F
zqb|qaq%Nn0u^8nf_0uk_(V5Y^EKqCG#1Eg4RbevQ8r>wB{}|n~y0N{_-rloQ!Qi56
zbTPbDH)Xr4s;L{c*S~R9`Pb_gDs}$4+P-*ogE;<x<PHzh;RDmOd0p+QTSi;T^T{VS
zj-Eal?llaVAMR^wb`^8OV{@9z(thf;Ztd`-(N$Y$TQ@Aat*c2#Ar4QBE>|R~YdS6S
z>RV&4Vl;~DW^!ZW&f%SdrT*>s@&=tjks)<HMX5E<*-O)c%DbwPOgF8u*YBU)8tyFD
ziT1H+h6hzrr-W!%?Tm7}Fl1MmYU8`Zr%YuUZ{tx-VOzBw@5E2=#Se$~>aI!5p4YLf
zyps3m-kXh4^SUFKyx2@zH=60n(hQ-eHGLmCgC?QgSy!pYTa`-tx_V`Bfyb}97_arZ
zRCgOabMyG_;oYasD=FB%01#rN0@<4xNW?Uyt_WH&kA2H8tmtV%OS9xQKV34$sV+Jb
zM<<z4RacI%upWEk1{ge0+8efD8f3yZQ|YEORtNDUR{7XF4x@?VSb&r(m$#HTHO)Ni
zckxN{wA!?^PG!j@vc)^JNf#BgvyaY|%iaKCm08{K7meQ4G<e3R=pN2POE$~fg$XY9
zxU$+cViN)kte2x_WZ+=~lejjPSYBw2VY;YiM1O?~BVoaNYb@ARZI=l3jJqP1L?T`M
z$*az&*MIcOh_35ORW4alVv9n}Q`J5i&Qa^8kl;!Ik79LH7~P7m2~Ecfc~ve!l9YjC
ze4msGz9qDJf|~dp#QDFb+trvjGWDz~rKF~`?`dvk|2@fM*=7y#%epG%sBjr=muU+U
z`Jlz-%v8=P5grybX55%Ii`9usqzmY@p>(8;B$Yk^u2pOfc}!H@Q8Zm6ud*VfvbX*n
z@#y2@Yj*wUP}f@9)Yat1<L$Le;ngMb1kvuu_H8=La(Gz!{cMN3;Gxr<FV0H0$xlT0
zT^6ZOVLai9S#C3x=uRj#Ug&na``{%oL?yi=Wy{f9^GdTVt)s;FMCXtvl+pEx+45AB
zxqg`vAc>4OpH7o1^8u62C2(={jO2oIe8i!?rNV(1sA`r&Te@ghdp&q~W?`6<Ms;C`
zo|apIXznX1)9v!4^fo%-&NF|pke<}sh^Rl;%TgP$I<$(YW%(p4<}L_jX}GaS4F#gj
zG&Hu-qQMuAN(luKYU)`_5QF2Z4NqJYDX2?Mwgl<nhBK3p=>AHwYWYPB@+>E9%=Sbq
zsg)kpjSux&5pKZ%&(id?yfxCj5|n~-vX2b=9r+#ZyUy^W>3lof|N6E#F*tj)AMOv7
z7<j3t+i=b-$mhafg}Vlxu+c6>)H<p(Dg1UEt}p(c;+@(gkUAx}P&Q{GrV*dUloVcH
zlhjzpSti#;=L(#yM?z7o^agDb7*ZllN%E<xvJEuM)S2q+LnR?uCF)q+`acSLncrnw
z1!sGrSXD+3;)%~uLHjGXg(yH$u0HcBP%srFomkX5?JG&_?tKV#etyxMivX`G>nFt!
z7x=(-CFSiBq}8OZsVK2Qc$ogJE7jHvlX^UcUw4NWSEZbhej*JgCn?3m?pAJzy@jGu
zThS-y%2;=W4Mz&?C7$pP2s=6HaxRZt#gVa=<5=All9B8?`V)$gW4z}<Ze$g7F3lUS
KT~QDBqyGRB=+FZI

literal 0
HcmV?d00001

diff --git a/lang/English/admin/maintenance.php b/lang/English/admin/maintenance.php
deleted file mode 100644
index b4bffe65..00000000
--- a/lang/English/admin/maintenance.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-// Language definitions used in admin_maintenance.php
-$lang_admin_maintenance = array(
-
-'Maintenance head'                =>    'Forum maintenance',
-'Rebuild index subhead'            =>    'Rebuild search index',
-'Rebuild index info'            =>    'If you\'ve added, edited or removed posts manually in the database or if you\'re having problems searching, you should rebuild the search index. For best performance, you should put the forum in %s during rebuilding. <strong>Rebuilding the search index can take a long time and will increase server load during the rebuild process!</strong>',
-'Posts per cycle label'            =>    'Posts per cycle',
-'Posts per cycle help'            =>    'The number of posts to process per pageview. E.g. if you were to enter 300, three hundred posts would be processed and then the page would refresh. This is to prevent the script from timing out during the rebuild process.',
-'Starting post label'            =>    'Starting post ID',
-'Starting post help'            =>    'The post ID to start rebuilding at. The default value is the first available ID in the database. Normally you wouldn\'t want to change this.',
-'Empty index label'                =>    'Empty index',
-'Empty index help'                =>    'Select this if you want the search index to be emptied before rebuilding (see below).',
-'Rebuild completed info'        =>    'Once the process has completed, you will be redirected back to this page. It is highly recommended that you have JavaScript enabled in your browser during rebuilding (for automatic redirect when a cycle has completed). If you are forced to abort the rebuild process, make a note of the last processed post ID and enter that ID+1 in "Starting post ID" when/if you want to continue ("Empty index" must not be selected).',
-'Rebuild index'                    =>    'Rebuild index',
-'Rebuilding search index'        =>    'Rebuilding search index',
-'Rebuilding index info'            =>    'Rebuilding index. This might be a good time to put on some coffee :-)',
-'Processing post'                =>    'Processing post <strong>%s</strong> …',
-'Click here'                    =>    'Click here',
-'Javascript redirect failed'    =>    'JavaScript redirect unsuccessful. %s to continue …',
-'Posts must be integer message'    =>    'Posts per cycle must be a positive integer value.',
-'Days must be integer message'    =>    'Days to prune must be a positive integer value.',
-'No old topics message'            =>    'There are no topics that are %s days old. Please decrease the value of "Days old" and try again.',
-'Posts pruned redirect'            =>    'Posts pruned.',
-'Prune head'                    =>    'Prune',
-'Prune subhead'                    =>    'Prune old posts',
-'Days old label'                =>    'Days old',
-'Days old help'                    =>    'The number of days "old" a topic must be to be pruned. E.g. if you were to enter 30, every topic that didn\'t contain a post dated less than 30 days old would be deleted.',
-'Prune sticky label'            =>    'Prune sticky topics',
-'Prune sticky help'                =>    'When enabled, sticky topics will also be pruned.',
-'Prune from label'                =>    'Prune from forum',
-'All forums'                    =>    'All forums',
-'Prune from help'                =>    'The forum from which you want to prune posts.',
-'Prune info'                    =>    'Use this feature with caution. <strong>Pruned posts can never be recovered.</strong> For best performance, you should put the forum in %s during pruning.',
-'Confirm prune subhead'            =>    'Confirm prune posts',
-'Confirm prune info'            =>    'Are you sure that you want to prune all topics older than %s days from %s (%s topics).',
-'Confirm prune warn'            =>    'WARNING! Pruning posts deletes them permanently.',
-
-);
diff --git a/lang/English/admin/maintenance.po b/lang/English/admin/maintenance.po
new file mode 100644
index 00000000..ec5bc3b4
--- /dev/null
+++ b/lang/English/admin/maintenance.po
@@ -0,0 +1,114 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Maintenance head"
+msgstr "Forum maintenance"
+
+msgid "Rebuild index subhead"
+msgstr "Rebuild search index"
+
+msgid "Rebuild index info"
+msgstr "If you've added, edited or removed posts manually in the database or if you're having problems searching, you should rebuild the search index. For best performance, you should put the forum in %s during rebuilding. <strong>Rebuilding the search index can take a long time and will increase server load during the rebuild process!</strong>"
+
+msgid "Posts per cycle label"
+msgstr "Posts per cycle"
+
+msgid "Posts per cycle help"
+msgstr "The number of posts to process per pageview. E.g. if you were to enter 300, three hundred posts would be processed and then the page would refresh. This is to prevent the script from timing out during the rebuild process."
+
+msgid "Starting post label"
+msgstr "Starting post ID"
+
+msgid "Starting post help"
+msgstr "The post ID to start rebuilding at. The default value is the first available ID in the database. Normally you wouldn't want to change this."
+
+msgid "Empty index label"
+msgstr "Empty index"
+
+msgid "Empty index help"
+msgstr "Select this if you want the search index to be emptied before rebuilding (see below)."
+
+msgid "Rebuild completed info"
+msgstr "Once the process has completed, you will be redirected back to this page. It is highly recommended that you have JavaScript enabled in your browser during rebuilding (for automatic redirect when a cycle has completed). If you are forced to abort the rebuild process, make a note of the last processed post ID and enter that ID+1 in \"Starting post ID\" when/if you want to continue (\"Empty index\" must not be selected)."
+
+msgid "Rebuild index"
+msgstr "Rebuild index"
+
+msgid "Rebuilding search index"
+msgstr "Rebuilding search index"
+
+msgid "Rebuilding index info"
+msgstr "Rebuilding index. This might be a good time to put on some coffee :-)"
+
+msgid "Processing post"
+msgstr "Processing post <strong>%s</strong> …"
+
+msgid "Click here"
+msgstr "Click here"
+
+msgid "Javascript redirect failed"
+msgstr "JavaScript redirect unsuccessful. %s to continue …"
+
+msgid "Posts must be integer message"
+msgstr "Posts per cycle must be a positive integer value."
+
+msgid "Days must be integer message"
+msgstr "Days to prune must be a positive integer value."
+
+msgid "No old topics message"
+msgstr "There are no topics that are %s days old. Please decrease the value of \"Days old\" and try again."
+
+msgid "Posts pruned redirect"
+msgstr "Posts pruned."
+
+msgid "Prune head"
+msgstr "Prune"
+
+msgid "Prune subhead"
+msgstr "Prune old posts"
+
+msgid "Days old label"
+msgstr "Days old"
+
+msgid "Days old help"
+msgstr "The number of days \"old\" a topic must be to be pruned. E.g. if you were to enter 30, every topic that didn't contain a post dated less than 30 days old would be deleted."
+
+msgid "Prune sticky label"
+msgstr "Prune sticky topics"
+
+msgid "Prune sticky help"
+msgstr "When enabled, sticky topics will also be pruned."
+
+msgid "Prune from label"
+msgstr "Prune from forum"
+
+msgid "All forums"
+msgstr "All forums"
+
+msgid "Prune from help"
+msgstr "The forum from which you want to prune posts."
+
+msgid "Prune info"
+msgstr "Use this feature with caution. <strong>Pruned posts can never be recovered.</strong> For best performance, you should put the forum in %s during pruning."
+
+msgid "Confirm prune subhead"
+msgstr "Confirm prune posts"
+
+msgid "Confirm prune info"
+msgstr "Are you sure that you want to prune all topics older than %s days from %s (%s topics)."
+
+msgid "Confirm prune warn"
+msgstr "WARNING! Pruning posts deletes them permanently."
diff --git a/lang/English/admin/options.mo b/lang/English/admin/options.mo
new file mode 100644
index 0000000000000000000000000000000000000000..e650f058e17e820620ef23ad31d363620b23f641
GIT binary patch
literal 18847
zcmcJW3y@@2dEYMxAy^Osj3omCu2x2xv1WQ_^;}jGFuOaeU9`Izc6RkZNa9ZSo$0IX
z?mN1-duK<4U>OT+Fct)`tvI&9!Y^VT4p<Jxyo|x+#5TdNq)f#{aN;<j%1%g;!Y-1^
z@Bf|e-0q%T<VTUNJ@dc!-1Gd-cfQv-`)AL6%6k%ipC?^PI`Gsax!_4j(tD<IljMh<
zog~ize;9l&_><tXzz=~Jfu97Q5B?tb0`R|r&jX)KrKf<GfGT$>_&wkpcp<n1s+|>(
zD#<FSa<#v|$?@GF|B|2MkJ|e+@af=hc>Whajq5*v>i28lcZ14&8gMbF@-G3^&n!rh
zWUu29kblX&{COexfWN;T{4U<#3u=BJ12w<j2i4Di12x|N3##0+_@n%tpyqW0cnNqA
zRKNFv6irHh{{c{Rco(Sh?*m2hkAR}nCqec5C!ogvKfoQ}--4Ro`E;iKUkE+}yb4tP
z8$k7Q0HkPg2Pit60xt%KU<$qsRR6yWs{daHMVH?JRsYMN#_?C6#&H3is^81_qjqip
z)&4P1<5&eX&k9t#ZvxfsJ00H(s@#ViKMkt<7r_g_uYl_BFF}p>Npzz1-T|tgi$I2w
zTn=iUdq9<60!5d5LA76iYIh4%y|;p@_tXCUqyGJK{{Bb){+}Jc0g4V!W%14fzXudO
zE(O)zE>P|52i4!5p!(~A3_aNbX(D;VzyCa_@jVV|ojwbSKEDTwK3@ja-+u?y&$mF)
z`ywW%_gPT=-UMoYE_;68^S>X|INl9v9Pjt{U-kFTgQC};fa>?pLG|}PLA8G#ovGf%
zpz^N-HIJ8h{%xS@y$;lP2cXKm0aX1*K$=Q^7UW;@3I3?PKL%CqFF?`jo1oggkWD1I
zUJi<{uXNn)c%$Qz<86+2Ikp}9j+>4TIlj&DJ&r%)_)Cr-b^N5`Z##a;@ym|?#qqBl
z|Hkn=goMU@q2ncvmpNYLc%9=b91lCLINsy9?)ZS?>m46<e8lll$Hzd?@q?iF>~o;#
z{imSl{WVbQ^nXC{#WP_V(f?9V^>%|QcMGWXy9*Rw_CWE;8BqN8FsOQuf-3hR&;Kl_
zcK#St|6c=_(HBpCQIgE_zVhPG-b3K)cz-(xODBH?z6yNmOG3M^2E|uvp!WF?lpNRs
zpG$iWfnVqS-D!{qZ@DZ<zRLSMzyhpyhI#x)aLD^#gPKR@^3dJ}cs}nV@DTWVQ1kmO
zumgSx)cmgh-Xz%v-U^CtKMGz8{uHS8{s24;{uwB`oqQ>C1lPfPz)ygh$MdhCE$~WE
z?cNLWDXBrt>rwFK;QK()?<?T>;Qt08UGgnZ^nAgUL0;?zB?oT;Uj{CLqT?GujqAt3
zli*{Z*6VM;!_e)*nehFNS!4(KZT?&Zz8(BA@Z+HBFMnT>d;okcsP(;oLhA1Y;4biT
z@EULhd=K~*P<-~HxiIe*D0=<~_`BevpvJKV6Fh@)JP4}%n_E6!@Br_Rfjhvz^!NV-
zs^2|yx*uEwpAJ3@ZqUvnpy-wC4)rbuMX$@iXMnE&p90<r-VQE<&jNn|ya0S0)Hpr`
zs^2eyqT8Q>7l8{`C&_)_D?!zJFSr1H7*zSMfNuo92CBbP5M=;vf*RLffaihV@_aFm
z_@M+vpErPg@U5Wa<Tt@Dg3q}wjO#yv8t2!+i<s}<g5S;ijvJUen1bSqkAPnVe;fQR
z@B@2TZ}3y#XTYbyB<lBfz(e4_2j2yzdqe)mK+WSf!RLVcZZwi6CqT{f%^)n4yb~0?
zJ`Pee`8S}(bN)?XU%U_$9hSjm@U@`Y`=Gyn+TWjjbCR4Oe<vt9Y=Ro^4}u#1?}HoQ
zS3$M6!sd7#cps>B`3!g&`0v2)1HTT!Qpt;65$v>EL5*`AOu;kYCE%mr^T1yLF9p8<
zYJ7hVs{S`XL`8D>D+3+`HO~T6Kko<GLdh4w7lYq)yks%Z;d)SXIs(1`9D;1!<Pq?N
z;NzhB`2$evE#U&ICC>--ek&-s(DC=Tf*S8*py=|i9e>yJzvA!T05zYdvq^S>SAZ`9
z4}%)-I;i=-!{2`q{3pDB2^5`<vH9);?*m2ePlF!^|1GHR4=>R-_+y~jx$Ph_3|t4b
zeqR88;z>#JhoHvWgUK|Hhd|qJp!$0pyb!#G#Xbryf?Cf<K&m%C&E;oEKTrCnp36|1
z-{*OH6X~g>n)FuEuaGVy{WR$%q#q*bcP;4(lIWt}(@0vQ?<bWc{X{E<Zogk}JP*`Z
zB^UJ*pKI-IA>}0TgMRN0kYwO5`}5ntb<zd?E)bt}C*C_epC&=#<b$5iGMaq-QSjGD
zE1rLw<K5tg{8{j*KR*U)ee}DE^bXP|NJG*Mqzw{FXFT?cAY#Pm|Gi-R{gOYdf#L<N
z*S{pamL%SL1?lOecalC$`a#mCNc#0juOmH~G(-A1()&mw(!->mARQw8E7Bb4e3JO=
zhe?u`lfTP(X_G!ldMW9nq+cg}mK1+4j}MLyfgdC7A^md_Vk3E+bT6qOy@m7v5@Ij;
zXQcO&t|94nJL!IVN)p6b@;TDG{CzvTl8j~2n@NkLJ4nwZy@&K$q$4El`yC|x_L9W^
z+WY!Fk0gHAPy1+r^y4J$HOYbNN%41>hl~9M^^)8~TJ`ti;Co3QCcT*S1ElAZev>r$
zdkrtQdd5$JXGkYW73ni1{Z5eHK)OdS{5At5cY$vt{VM54NIlX|kscuFcZ@VkdbM8o
zrKDGp{sk%iT0Fd-^c2z~q>qrEP5N2VZ;<r6GeB|*e30}^f8PS%?$60$r(X=xe7>I*
zy|kP6Hl}lW*=pWP7JI#NGaclcUZQ#R&x1iZ8np9%J{YF`ysoqL+)JM8%Q-65qt$Mn
zb&|zl*-sWvXTz+j)0nw0>!gQHoLEke=WBVDSFwv^UsmVo$>T>tU(H)+zj@uL%GF-p
zPxh5r)k!;f-S+b1cdua?!(!O;(T5r#BNiEUlYLuGuVjBdsLLwdEUQi(8lB1sb@um)
z_Nj~^q`hKrDwf-p8HyfQIT4!CgJ)&KJY6fRem3+^6B%A4U&}_lVY-&*9WOJPGhK*v
z9t`tA#&R`uJmAIa;Z~gbbe1<!)Em8QE6pYs)mY}hxxP$Sat@o$j4Qkp*stT`ur{~l
zg^Hfp)MF~u_VHACvSj(ysF#b}%BX92v&ed5t~!`!!%;<n*w{gl@5Bk`rsgelY_Cnp
zvKsYOuWnbx#;_;{zN!b$@gdZ|<u%1dSQ~o^nTLu_o@Tb0w8FmPmb+RGyZ(N7(9ym!
zqWE*Det57}rflAgvL5;Xrn6!(h&0H0$>G82tXFj6X7`QSWN+rH{j3&2eXU}FBiUem
z)NJYIEwp|Vxls((;qBVTIF-{B+Rk)gK9oJ{!#S#y(8=aMRbIJg7mkZ`G&@6`V!hi8
zt9g%=&ZKqmVAHa{jX!P{9Tvg+J(Gr4|C|p-X)(<EPWPkZcP~&3M#H>Lj*cJ;%Li41
z9En6dR;KN&-OZC@<seUP8$iUIBK^D^`GB|Og?4Xi*bQkJUq%}pghD5+@=j6Z?P0Qf
zXgTd?gAt3q40EJy#Iv_L@g7=KMxAajz>Q{&x8;R`uO1=C()&k!XXJ_Z$pRbd(1;ca
z*n2EcBFsAZMkMR2N8^l8<oL=;a@?n3<OoeoXL-?l9iFQ)?Z0LdAI~?+YB*L^6YsH>
z3W#I-`LJ8MzzoGEawiLqMZ|HJC}_#>7>cbNMLDgkxa4TwCO&4J4x+}H#R|lni9+oz
z8!cxU>RK8l%-jk;QPxBQu~?mU*ye*0Wt<J$-Nf1$)sg~zXZPtWZzIpDc2@$)yB@!L
zfnt5&Lemy_W&G|1`UnG)xlm}uU#36R#d;)zf47`a=mh*frR*j%#znM6@~T4f#@(cH
z<c?QL84t3v!c3YsZ=>8O+U%CoMYL#6Oy*1$I){)CWv4$(R#B@y#ZWY4OcdF^-K^L|
zW+-~{#QubI)xz$*3k%`t>gMU1iKlD)>$OeZwR>aUbxq!N6M5HO7uvhN`Fefx^@b*I
z&%{%#@v<iGWwFNYg_y^a_q)3pGfy$E8U607_j-G~n|bVxqn~f)JHHTX%rC@pdJ65$
zFN|x%S<WxS8O<-mdCV`wdFUzDjq{jai1V0l<}u%lex8wv_8Ywt8#D;lvf2tvbylt~
z8#Za?7Od@(lM@-^BGEWuqo_c5Z9Z3NH-jM%rO~9L&{XEQXq}cpd&J%_ojoTMx;?Lo
zH6OG;Hy>&V&%vm_s@7%wQ(!XB3l?=ToYqdaPi2K-cWk#Hti`i(L*eD#sLFctm`we8
zZ#vkp*ZStGZ%o7E%`=1avYXT0vp4QouFCsSYx9RY^FF-2smwP_yM6n1EZ=rwet*R)
zQ<*=2BHWvjH-DV%t(nBEBiJ_cC#q~v_p)JGQ7Bq6^C$AGKha`(QzobAm207k)zwy6
zt-pN7(ZffV#{KVZE$rA|%6OsGtqnRI=4XbxFp!JEjVYqMs`KH^Cr=!l-!m?!-f>~(
zmj>;!gSOe5?pZB{%|P~IDeSm&{+4`@qt-OW<q};uOn0~Tw65h#c%5G<M^!uDANtsv
zhE9?b-8{|va^s?IDc4eHl&+dzV{-}$v#eUt%TxJ8^QcN}<IOHQQKm|_sAIKu8+~1y
zMy)0^Zrw_;`pvC@*|yRVR%(^j8+jWmJ8c(Ld(^Loax-c=YaGU@CKxjPh;A5HXdP*+
zRVhGd*TJGZ#lFbbN4*T&#H^HT&|z$&8ojoKQ8O4qY+S>mN9bbGDT!)fGP9m?F7X|M
zQ+eO<rGrbymyWm6!)xhQIb!3T#xp8UGXiMA*2FYtD(PBP_SsjMoMk)M9K#aV13R60
zql)Uy0$oe3P6<&5^_;afkW)dyV4~S_G>&Po(4ZZY&^lqnWvg;&XL@CMO8utgeag6R
zRP|yZX1!Ldr<CmFv-EGH9Hi|Y%Gz2nt1?~P!p`dDX6Q(vw>G*P=~^L&$a~ur3N}Km
zWen6V`x{gXZuJ!ZFukr6FBVs@_}NEwH=QY3c`NM>hZ}o$?b_VjZ1uMS0a`S*E6{GX
zmD)<*gt=A@)?ePoD86Zzzi7qVWhJ{+L&NZao|?OcZA@#k>|^cQrohd08w9dqC!K0m
zZap8SJGHJ=h!gA#Mgl8Q46j6*5(j{4BDeR~Y9a{9U2G{nz_C5VgM?zIgjV9ndbD9S
zWi}!>!MC<J@3f0aNF)yi%Sx4SuO4hTAeFVnHd(C22~}!Kt7wHYF2+jSE$rm1O)Jhc
z=cW?|9F&NnJ&ZwqMME_4<LMI1?_5M+hop5^wy`20?zX13!rJSjo-vDW`WZ@Y4pKr6
z;>%&Vp@KPc-ZCd4uIE~j_d4g;i{nU(_hYOT{GabskC8^K(3q8+vMv%P!Z!qe2;3~0
zv|AdO)G`?d$=V@?V{5U-;)Y<3ZxR!ot#l>N)0ZLwWO0^N4$0Tb)>QN-xucsCMzf|n
zbLqj}=*+%-L8>);18Zql4#nx&U`vrJ+l^z{*3S@mki5@+jzOa?%B8Z%Q7bvB@8eIF
zo9yrA_+`Z!@?)!K{%)O}M!C?oHJ`7osmGbDbK1nQ>2a2PE8U&4qpMjdgZt&DYJNnX
zlDqeh*pGOOWWe!znfpCcL<spNT*}~(wi0PxuaK-Ddg#)ahvAER>a9ViaKUMTDoEc6
zVWU=h3^#CZy1!eNwS2IF#B8GxC}j(#T5J&0HeE$dj8G=%EdIq1Cc|DsIySyzu#(>y
z>xRS5R?ezI3n32Ij3uo-BGyWmk)!OhA)KDAOS|wdL*#6xSOoIugP4qwst_?#E9;|N
zezXKK8x<35vs;=j8C;3~ZJu2x=nzpQ)(>n}px>%e(s?`wYnedS6t6nLjIhLIiOIUA
z(=gR;;MWArd{(5c$(*(kScag&Y}E80s=`$)hS9hg>_%0b&e~fkhK((~rmdK;YD!Tz
z-Z(^xOA$Kr8qEfj*fN>8EtFV6fF%o-*w<(yTXqw{OJd}X2RMQ-%D{ApqA8|pp$qMc
z9QfR3DltUGHef?zB8G?UX;NMSKo!G>WM#~yk@jIVDd!#^>WUX<su|Q)USKeUd15~i
ziYW0#Vc@oGQgldWL_&xbZMNFMvqOXlmd80I$NGZ=4K)w+?gpw?F-&#7T9upPF;}a$
zQ;7YH2<fiEfFV$2Q=UVz54AvyqE`$R*){>TfBB?Wc5Mo&9vBfk!W`=&_7y-vdLU0R
zHi(jT*p38k9_$sX>CF7RUgq_JCJ1}iji;=~q&xT;GNMET6Zd(#xM4&_iCY8(yw4`5
z?Z-3Q0j-;hv#^vjMcE-1G0{kZzH;S=Y8s(+qEs+3?vrRG7F-R~N-T~#&FmruQkZ?i
z`t?1|**aHA?PGN@QCP~OrM1#18RDKfh#Kuv?6DxRU=PR*y~GN%pnWKr=2kAl4LkL2
zJb?V3yLTC2&aJo7+gR#qv#?zU@i7nCYY>h_u_ca8({~YK!r~1z%&<a+;+e?`%G*?w
zgtttYY}E`m3Y$k+xv{R=;%<uyX;>BnQM5w55wu*>geei`#lWHgJm;I9&8GO{oVCu%
zDc0zQX|Q!r1*WRf8D9>Fi}GVPoRsL0HkAM~J;+SVoa&kE4))*lA|e_>L^X`22vO}I
zmnUM_TCT<udZIc}7WZP9TXO9?B+jE#QRVU|v<YJ;tm~;cHk%e&x>t)E!nkAM84F{&
zu^;*woQH1&spT9|M`|@3Lg2oeG+>4E5(A#S7uvRRrutY=gjKOoAVdfdtnntZ7Fm7N
z4SJO|sz;?_q9C%K^D=$Ie_|VR7bnz?n;XzQs#EQ4oCCH@FJEJd%!fH=jY5h2#4faP
zTr7QOoI++c9!ofv+-9h0517&nTg;3LmVy9IL6`zUGTAB5ISO4DLvc?QldiU$J_IR(
zn);Y*awae~Can+g*aW3oX|!kWSUi60@UdGiOAnOhee}w8iT@x^#-oL8*fA3=1X_<x
z;k(!+MpwBonvqY2_NZvKjjjBcKCG2kA!Y<l$j%gf&bmwvvh;qS0{6ram-cOOCMS3>
zbNzx?049T1bL3Hn4L&}FIcIxz{xaR#>Xww|%<hG&ul+XdnUIr!>TereP<+$P{au5z
zI(DSX#4AZ^#S_x8)eW6l$>1#@YFEoMurQL@gJ$#=&Vk$vA@&lsh}LR=A-*1DFccYW
zbEqJyxl_J#rIJv+;tU!wI~e0C2u|pFXL@sbMQ?axmUi)PZ{CRj-Fe0O@WvyDkKL;L
zU76m*Cm6bSY9%xRWNHy~fLN#?ysum}DsNDV6yCt^%_~WjnY@J_S`h1oyg1@jth>QL
zW0GLMda}TpjJcgA$R$8_ViK&ln39;TbRJ;FgDj9izKVfxN*)JsE%TT$VdGg^@>0A>
zKR6TrnqZ_2I>>yNniGkHEX}NzQ4tQ%j)f2=t5L&$1GZmgLaGt2MTgD2nnPWIW)fub
zgi-E6(;(Y4m)5p(xp?3faV)VX4%|%p+Tu4uatALANP*pchWj#;nNF3U&~b$HE-Ezm
z0gWGFf<7urwG;HKZKkNW#+(>BV)a~DkB{}V=R-%WRBIK?W<1N<qZWa~-B54YvElec
zBHF^57G`2R2Ar|OK)QpfqyB8#sfZK=!i^6Hw+Y-S&$!cJRG~q%5l)%*K*Mw8kbsL>
zkRnhNyqkpn!V+o68A(D6OVt&l(;&wrZ6#qS*8Y?X8gfJ=Ho5x&okHFt8_ax(bz^=x
zn87ic_>Kvxtxrjg*z#P5rszmlwNZ;f`!+XCP-T*SCO%^mcJ!I(jPq=Mg^ZgSv0gJA
zvAFFd7d|!p=_cpG96ABU4IfQ-G^XKLKhH?yPmAH>v5F?m0qfXT`?k&pjp)=MklM@%
z3EYXp{+XJn2&Uy};*d7z;OM9Vy{iYY8H}d|F%H4j2nVfaN0TQ*27WM075s=n2dRPi
zEEd>hs~zo@R3bt=&<?IDW1uHi<gB6-qRtvb(h)Y$u%zvDH-Z6MjIZ8e)cv{O&W+``
z2h?GgZ%YVs$7dA?*42$TQ4Kvz$7fzAha{h6k80>H+~BF;>ry>1oowQ0dz%@i(Hdz@
zDEir@gmGp8`p7nc?2&EMjeC~ffvuNyZ!Q{47lt6GRldnOD!#&$w^5icB9>He9z6kz
z$&C2U+GtBA-x(=fGjU;O(5|+0?x1-i&<Dhm<jOE$<=F8xj7CTjs%Y38zoU49N{dz;
z^ul4WuzodFrEzwdoM>phPlR;M=?r1t+FC{c+IT`MO^+r|oH-<@w4!I6qb7&QsPWyo
zd7}*!)M2Y(-w=5u-jud+1Q1}xi7wRLuAFR4foW;KYNTMWkt1pXt9kWx=<zd|;`n=Q
z#}bn7qB#_h-+Rq<dlt~pM{+snW{``d5X#z-XV<ejQbg-j)^CN&15Rq6Y7#<@W)lVS
zBDz9o!tXG^$9DV>nr(-0A_AKEDVPv1DxhcLWe4r{iCN+e>r^Q!|5!n*$(os&iQZ6K
zzLO{FrZash$}r}-v8+30P>(HSXM&XYEWSE%eKXV`j>iB)-^LnE_ruMCAPW?;$Ve5*
z6Tj;i0ofJ=N2uR$Yb=w7HdvwdkQwTGt!o)-)WU>JFgV8Mmp?IGBoTu9{{NpYffHhn
zL9IuLFbB1DdBkizghkwe(QiNtC>q3M<V>*XEC@Y5LS$K;#q6Y=_3aYLPCFx`OMZqJ
zNUbni=tbfUh0)wrv1U2nvtW$|XwFwQ9AY2R6&FmxwH22h3b(=_Xru837M+120N@(G
zm7*=%mxazQ*uZd33zl3}{JZ=fHS+hYC_Si=jR!N`Rx`%>9~XVs4HvVXvf#pV(+}Dq
zl6LBg9LQkZ?raQVo1N5UFktfZ>?%4yAMPZwqQ)gBWj)YVJ!O6>Gqt-m;?=VPCoBU|
zcMBLp(`XoItj7B>V(p>(rm@C$dIIa#tPZV$6u=CjXhQHDa#r=woDhrBnKR>T%1q4E
z4%#yswGG2Gu@vJIvpLfz3h>IL#Jj;d56w<p2}*9oKGb0;#xl#GZ9bk!xDn(AIYth)
z?EydKaCxebO@0OglW<Mj)Ux)&)E<#VzdEYTXdWSn!XT{asr4CmYnGAi4G3Zf1hQc5
z+8^x6F^9J2-_Jj=&L$j$8Ez`grgyLa2&8mrgeQ<^gSqsUD$fT9&2FL+;V#o`$}MRq
z)0-%#n(5+Ng%lomQC+>6O_%IS>SU9#@^ook5E_@>{_PsR9p?6hH?5mPv+2>YZkPC6
zw~TsgbLmRfC$`oUP>sd4bv6fvY*SGejb_v3?9_CoHP880Ml)5B9wE*ZTe^;`PP6GT
zJmQ|Wtt(2i={^F1J>0;$JD2Y3j_6`8y(>ROaE~Cw>Zn?8N~`hxWxK4?!yLKe+Rmj%
zx3U4F^&-0I#PkN8vW*4D7><>var;-<2&cS=u0YLdG1Pv#KNMTU++Y<7tQKFmx%Ad5
zs|V#4H!#LkH36=iz{0*3ahaP2ycb=nnoVDoZD=yLqUjk6eGP%b)hXmgY*TlxAn&+;
zU(?WzUBsID>`c&nR_!CYB6*0T9?#W{GmW!X_OXfrspit#p>Y8<hNbsy_t998vRW&9
zr@Wju5jgG`QJ2@`nMln+ZgGDBy@{7~A`{r{HI{^Pl5W<Ii{ecLHax*C2PVDTE%QNf
zCKiDvSsxugjLczo-k6E5{`%TlGvNvx6nGFCvfTSK&QNd9@hRt;{a_nQWAqwf>_>~v
z{Nj*o%o+a>Mzq+^5YaT{J8ye+-KrCtZmto&?@Y8Cw#v3P!#0>)m2mT}+1cKA;LM{s
z5g@SWnSmFVvv$F8dy}W`m$^Zc708ciVg$BY>}B;Sh<Z!bUoBwbP{!*AhB}&64{!`i
zfMu!y=chv%{&g|G*vm)!PXN(Ew`?Yxv3q||p%_7E<UtuWakvGj9cHGzhpp_q+m=q-
z!6fcz`#nJ^xfm!#lW@i*BL+1nb>NYZs>EAwZsExM)a7j*37ChrSrJ}T9H(Dk0_lGm
zSamF<rViHPwvM;OT!My+UR;a>`)JwyVTc|djKy3<V9SQ9T?`q+$>VP)b)pz9Ii9mG
z8-KQr@Yis4aABtv!NKzgN8_sEu9y#KG5_F4hXW`tF7Gqz5%=NJf^{21^WCZ(p%pE#
z$PI|#3r)ma?UGasC!zeLh{v~B{Pf9`UT{5GMCck%M4bQ%5p`H1nkT%3mm_T+j03Wy
zZiCv?1uHVzc71^59XmaQ+}9x^AI$=sxY<coaPG}4!Jx&SsQ%%$fX`&2VQ(s)=F>Mv
zZ0;=T?C?y``r%-3!eoo)nO5EG=<zJ<&{>v<c-O5q*Z^BQSeEDH12bdf^wJ=QrHCu}
zx6$V_MxZ&OA098Vb?0gyOiBKLqsDd7je5~JQtwRzMnAD-44Yy-S$hgit>H(dQ!C1U
z|B(f1j$`c;ggvqQ73tDdhN+WAoSE33hnOhrK3WrLlv^`31!k&nw|5OcDJWo(UhREF
zFJU0NrzK*BiTh=Q40A3R+FS(E*P5euT9?Db9tbO9QemgxVB?CLs2k5YHDaUOm?XFv
zXb#P9va32A61xb30F!rqX<`kb1ShKM#FukKEuSFD&R*I@Fp2YG%my}!t`O^rqrCU{
zKUQYAQ-UF*`#3Qgu4RY^gRrXH^0JbVJ$2(aY*ktkKg0-3Ln)85*nJ6)4@?~LNr;61
RkHK1LAzR7B9c9ro`F~JqR&M|R

literal 0
HcmV?d00001

diff --git a/lang/English/admin/options.php b/lang/English/admin/options.php
deleted file mode 100644
index 30ccf41a..00000000
--- a/lang/English/admin/options.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-// Language definitions used in admin_options.php
-$lang_admin_options = array(
-
-'Bad HTTP Referer message'            =>    'Bad HTTP_REFERER. If you have moved these forums from one location to another or switched domains, you need to update the Base URL manually in the database (look for o_base_url in the config table) and then clear the cache by deleting all .php files in the /cache directory.',
-'Must enter title message'            =>    'You must enter a board title.',
-'Invalid e-mail message'            =>    'The admin email address you entered is invalid.',
-'Invalid webmaster e-mail message'    =>    'The webmaster email address you entered is invalid.',
-'SMTP passwords did not match'        =>    'You need to enter the SMTP password twice exactly the same to change it.',
-'Enter announcement here'            =>    'Enter your announcement here.',
-'Enter rules here'                    =>    'Enter your rules here.',
-'Default maintenance message'        =>    'The forums are temporarily down for maintenance. Please try again in a few minutes.',
-'Timeout error message'                =>    'The value of "Timeout online" must be smaller than the value of "Timeout visit".',
-'Options updated redirect'            =>    'Options updated.',
-'Options head'                        =>    'Options',
-
-// Essentials section
-'Essentials subhead'                =>    'Essentials',
-'Board title label'                    =>    'Board title',
-'Board title help'                    =>    'The title of this bulletin board (shown at the top of every page). This field may <strong>not</strong> contain HTML.',
-'Board desc label'                    =>    'Board description',
-'Board desc help'                    =>    'A short description of this bulletin board (shown at the top of every page). This field may contain HTML.',
-'Base URL label'                    =>    'Base URL',
-'Base URL help'                        =>    'The complete URL of the board without trailing slash (i.e. http://www.mydomain.com/forums). This <strong>must</strong> be correct in order for all admin and moderator features to work. If you get "Bad referer" errors, it\'s probably incorrect.',
-'Base URL problem'          =>  'Your installation does not support automatic conversion of internationalized domain names. As your base URL contains special characters, you <strong>must</strong> use an online converter in order to avoid "Bad referer" errors.',
-'Timezone label'                    =>    'Default time zone',
-'Timezone help'                        =>    'The default time zone for guests and users attempting to register for the board.',
-'DST label'                            =>    'Adjust for DST',
-'DST help'                            =>    'Check if daylight savings is in effect (advances times by 1 hour).',
-'Language label'                    =>    'Default language',
-'Language help'                        =>    'The default language for guests and users who haven\'t changed from the default in their profile. If you remove a language pack, this must be updated.',
-'Default style label'                =>    'Default style',
-'Default style help'                =>    'The default style for guests and users who haven\'t changed from the default in their profile.',
-
-// Essentials section timezone options
-'UTC-12:00'                            =>    '(UTC-12:00) International Date Line West',
-'UTC-11:00'                            =>    '(UTC-11:00) Niue, Samoa',
-'UTC-10:00'                            =>    '(UTC-10:00) Hawaii-Aleutian, Cook Island',
-'UTC-09:30'                            =>    '(UTC-09:30) Marquesas Islands',
-'UTC-09:00'                            =>    '(UTC-09:00) Alaska, Gambier Island',
-'UTC-08:30'                            =>    '(UTC-08:30) Pitcairn Islands',
-'UTC-08:00'                            =>    '(UTC-08:00) Pacific',
-'UTC-07:00'                            =>    '(UTC-07:00) Mountain',
-'UTC-06:00'                            =>    '(UTC-06:00) Central',
-'UTC-05:00'                            =>    '(UTC-05:00) Eastern',
-'UTC-04:00'                            =>    '(UTC-04:00) Atlantic',
-'UTC-03:30'                            =>    '(UTC-03:30) Newfoundland',
-'UTC-03:00'                            =>    '(UTC-03:00) Amazon, Central Greenland',
-'UTC-02:00'                            =>    '(UTC-02:00) Mid-Atlantic',
-'UTC-01:00'                            =>    '(UTC-01:00) Azores, Cape Verde, Eastern Greenland',
-'UTC'                                =>    '(UTC) Western European, Greenwich',
-'UTC+01:00'                            =>    '(UTC+01:00) Central European, West African',
-'UTC+02:00'                            =>    '(UTC+02:00) Eastern European, Central African',
-'UTC+03:00'                            =>    '(UTC+03:00) Eastern African',
-'UTC+03:30'                            =>    '(UTC+03:30) Iran',
-'UTC+04:00'                            =>    '(UTC+04:00) Moscow, Gulf, Samara',
-'UTC+04:30'                            =>    '(UTC+04:30) Afghanistan',
-'UTC+05:00'                            =>    '(UTC+05:00) Pakistan',
-'UTC+05:30'                            =>    '(UTC+05:30) India, Sri Lanka',
-'UTC+05:45'                            =>    '(UTC+05:45) Nepal',
-'UTC+06:00'                            =>    '(UTC+06:00) Bangladesh, Bhutan, Yekaterinburg',
-'UTC+06:30'                            =>    '(UTC+06:30) Cocos Islands, Myanmar',
-'UTC+07:00'                            =>    '(UTC+07:00) Indochina, Novosibirsk',
-'UTC+08:00'                            =>    '(UTC+08:00) Greater China, Australian Western, Krasnoyarsk',
-'UTC+08:45'                            =>    '(UTC+08:45) Southeastern Western Australia',
-'UTC+09:00'                            =>    '(UTC+09:00) Japan, Korea, Chita, Irkutsk',
-'UTC+09:30'                            =>    '(UTC+09:30) Australian Central',
-'UTC+10:00'                            =>    '(UTC+10:00) Australian Eastern',
-'UTC+10:30'                            =>    '(UTC+10:30) Lord Howe',
-'UTC+11:00'                            =>    '(UTC+11:00) Solomon Island, Vladivostok',
-'UTC+11:30'                            =>    '(UTC+11:30) Norfolk Island',
-'UTC+12:00'                            =>    '(UTC+12:00) New Zealand, Fiji, Magadan',
-'UTC+12:45'                            =>    '(UTC+12:45) Chatham Islands',
-'UTC+13:00'                            =>    '(UTC+13:00) Tonga, Phoenix Islands, Kamchatka',
-'UTC+14:00'                            =>    '(UTC+14:00) Line Islands',
-
-// Timeout Section
-'Timeouts subhead'                    =>    'Time and timeouts',
-'Time format label'                    =>    'Time format',
-'PHP manual'                        =>    'PHP manual',
-'Time format help'                    =>    '[Current format: %s]. See %s for formatting options.',
-'Date format label'                    =>    'Date format',
-'Date format help'                    =>    '[Current format: %s]. See %s for formatting options.',
-'Visit timeout label'                =>    'Visit timeout',
-'Visit timeout help'                =>    'Number of seconds a user must be idle before his/hers last visit data is updated (primarily affects new message indicators).',
-'Online timeout label'                =>    'Online timeout',
-'Online timeout help'                =>    'Number of seconds a user must be idle before being removed from the online users list.',
-'Redirect time label'                =>    'Redirect time',
-'Redirect time help'                =>    'Number of seconds to wait when redirecting. If set to 0, no redirect page will be displayed (not recommended).',
-
-// Display Section
-'Display subhead'                    =>    'Display',
-'Version number label'                =>    'Version number',
-'Version number help'                =>    'Show FluxBB version number in footer.',
-'Info in posts label'                =>    'User info in posts',
-'Info in posts help'                =>    'Show information about the poster under the username in topic view. The information affected is location, register date, post count and the contact links (email and URL).',
-'Post count label'                    =>    'User post count',
-'Post count help'                    =>    'Show the number of posts a user has made (affects topic view, profile and user list).',
-'Smilies label'                        =>    'Smilies in posts',
-'Smilies help'                        =>    'Convert smilies to small graphic icons.',
-'Smilies sigs label'                =>    'Smilies in signatures',
-'Smilies sigs help'                    =>    'Convert smilies to small graphic icons in user signatures.',
-'Clickable links label'                =>    'Make clickable links',
-'Clickable links help'                =>    'When enabled, FluxBB will automatically detect any URLs in posts and make them clickable hyperlinks.',
-'Topic review label'                =>    'Topic review',
-'Topic review help'                    =>    'Maximum number of posts to display when posting (newest first). Set to 0 to disable.',
-'Topics per page label'                =>    'Topics per page',
-'Topics per page help'                =>    'The default number of topics to display per page in a forum. Users can personalize this setting.',
-'Posts per page label'                =>    'Posts per page',
-'Posts per page help'                =>    'The default number of posts to display per page in a topic. Users can personalize this setting.',
-'Indent label'                        =>    'Indent size',
-'Indent help'                        =>    'If set to 8, a regular tab will be used when displaying text within the [code][/code] tag. Otherwise this many spaces will be used to indent the text.',
-'Quote depth label'                    =>    'Maximum [quote] depth',
-'Quote depth help'                    =>    'The maximum times a [quote] tag can go inside other [quote] tags, any tags deeper than this will be discarded.',
-
-// Features section
-'Features subhead'                    =>    'Features',
-'Quick post label'                    =>    'Quick reply',
-'Quick post help'                    =>    'When enabled, FluxBB will add a quick reply form at the bottom of topics. This way users can post directly from the topic view.',
-'Users online label'                =>    'Users online',
-'Users online help'                    =>    'Display info on the index page about guests and registered users currently browsing the board.',
-'Censor words label'                =>    'Censor words',
-'Censor words help'                    =>    'Enable this to censor specific words in the board. See %s for more info.',
-'Signatures label'                    =>    'Signatures',
-'Signatures help'                    =>    'Allow users to attach a signature to their posts.',
-'User has posted label'                =>    'User has posted earlier',
-'User has posted help'                =>    'This feature displays a dot in front of topics in viewforum.php in case the currently logged in user has posted in that topic earlier. Disable if you are experiencing high server load.',
-'Topic views label'                    =>    'Topic views',
-'Topic views help'                    =>    'Keep track of the number of views a topic has. Disable if you are experiencing high server load in a busy forum.',
-'Quick jump label'                    =>    'Quick jump',
-'Quick jump help'                    =>    'Enable the quick jump (jump to forum) drop list.',
-'GZip label'                        =>    'GZip output',
-'GZip help'                            =>    'If enabled, FluxBB will gzip the output sent to browsers. This will reduce bandwidth usage, but use a little more CPU. This feature requires that PHP is configured with zlib (--with-zlib). Note: If you already have one of the Apache modules mod_gzip or mod_deflate set up to compress PHP scripts, you should disable this feature.',
-'Search all label'                    =>    'Search all forums',
-'Search all help'                    =>    'When disabled, searches will only be allowed in one forum at a time. Disable if server load is high due to excessive searching.',
-'Menu items label'                    =>    'Additional menu items',
-'Menu items help'                    =>    'By entering HTML hyperlinks into this textbox, any number of items can be added to the navigation menu at the top of all pages. The format for adding new links is X = &lt;a href="URL"&gt;LINK&lt;/a&gt; where X is the position at which the link should be inserted (e.g. 0 to insert at the beginning and 2 to insert after "User list"). Separate entries with a linebreak.',
-
-// Feeds section
-'Feed subhead'                        =>    'Syndication',
-'Default feed label'                =>    'Default feed type',
-'Default feed help'                    =>    'Select the type of syndication feed to display. Note: Choosing none will not disable feeds, only hide them by default.',
-'None'                                =>    'None',
-'RSS'                                =>    'RSS',
-'Atom'                                =>    'Atom',
-'Feed TTL label'                    =>    'Duration to cache feeds',
-'Feed TTL help'                        =>    'Feeds can be cached to lower the resource usage of feeds.',
-'No cache'                            =>    'Don\'t cache',
-'Minutes'                            =>    '%d minutes',
-
-// Reports section
-'Reports subhead'                    =>    'Reports',
-'Reporting method label'            =>    'Reporting method',
-'Internal'                            =>    'Internal',
-'By e-mail'                            =>    'Email',
-'Both'                                =>    'Both',
-'Reporting method help'                =>    'Select the method for handling topic/post reports. You can choose whether topic/post reports should be handled by the internal report system, emailed to the addresses on the mailing list (see below) or both.',
-'Mailing list label'                =>    'Mailing list',
-'Mailing list help'                    =>    'A comma separated list of subscribers. The people on this list are the recipients of reports.',
-
-// Avatars section
-'Avatars subhead'                    =>    'Avatars',
-'Use avatars label'                    =>    'Use avatars',
-'Use avatars help'                    =>    'When enabled, users will be able to upload an avatar which will be displayed under their title.',
-'Upload directory label'            =>    'Upload directory',
-'Upload directory help'                =>    'The upload directory for avatars (relative to the FluxBB root directory). PHP must have write permissions to this directory.',
-'Max width label'                    =>    'Max width',
-'Max width help'                    =>    'The maximum allowed width of avatars in pixels (60 is recommended).',
-'Max height label'                    =>    'Max height',
-'Max height help'                    =>    'The maximum allowed height of avatars in pixels (60 is recommended).',
-'Max size label'                    =>    'Max size',
-'Max size help'                        =>    'The maximum allowed size of avatars in bytes (10240 is recommended).',
-
-// E-mail section
-'E-mail subhead'                    =>    'Email',
-'Admin e-mail label'                =>    'Admin email',
-'Admin e-mail help'                    =>    'The email address of the board administrator.',
-'Webmaster e-mail label'            =>    'Webmaster email',
-'Webmaster e-mail help'                =>    'This is the address that all emails sent by the board will be addressed from.',
-'Forum subscriptions label'            =>    'Forum subscriptions',
-'Forum subscriptions help'            =>    'Enable users to subscribe to forums (receive email when someone creates a new topic).',
-'Topic subscriptions label'            =>    'Topic subscriptions',
-'Topic subscriptions help'            =>    'Enable users to subscribe to topics (receive email when someone replies).',
-'SMTP address label'                =>    'SMTP server address',
-'SMTP address help'                    =>    'The address of an external SMTP server to send emails with. You can specify a custom port number if the SMTP server doesn\'t run on the default port 25 (example: mail.myhost.com:3580). Leave blank to use the local mail program.',
-'SMTP username label'                =>    'SMTP username',
-'SMTP username help'                =>    'Username for SMTP server. Only enter a username if it is required by the SMTP server (most servers <strong>do not</strong> require authentication).',
-'SMTP password label'                =>    'SMTP password',
-'SMTP change password help'            =>    'Check this if you want to change or delete the currently stored password.',
-'SMTP password help'                =>    'Password for SMTP server. Only enter a password if it is required by the SMTP server (most servers <strong>do not</strong> require authentication). Please enter your password twice to confirm.',
-'SMTP SSL label'                    =>    'Encrypt SMTP using SSL',
-'SMTP SSL help'                        =>    'Encrypts the connection to the SMTP server using SSL. Should only be used if your SMTP server requires it and your version of PHP supports SSL.',
-
-// Registration Section
-'Registration subhead'                =>    'Registration',
-'Allow new label'                    =>    'Allow new registrations',
-'Allow new help'                    =>    'Controls whether this board accepts new registrations. Disable only under special circumstances.',
-'Verify label'                        =>    'Verify registrations',
-'Verify help'                        =>    'When enabled, users are emailed a random password when they register. They can then log in and change the password in their profile if they see fit. This feature also requires users to verify new email addresses if they choose to change from the one they registered with. This is an effective way of avoiding registration abuse and making sure that all users have "correct" email addresses in their profiles.',
-'Report new label'                    =>    'Report new registrations',
-'Report new help'                    =>    'If enabled, FluxBB will notify users on the mailing list (see above) when a new user registers in the forums.',
-'Use rules label'                    =>    'User forum rules',
-'Use rules help'                    =>    'When enabled, users must agree to a set of rules when registering (enter text below). The rules will always be available through a link in the navigation table at the top of every page.',
-'Rules label'                        =>    'Enter your rules here',
-'Rules help'                        =>    'Here you can enter any rules or other information that the user must review and accept when registering. If you enabled rules above you have to enter something here, otherwise it will be disabled. This text will not be parsed like regular posts and thus may contain HTML.',
-'E-mail default label'                =>    'Default email setting',
-'E-mail default help'                =>    'Choose the default privacy setting for new user registrations.',
-'Display e-mail label'                =>    'Display email address to other users.',
-'Hide allow form label'                =>    'Hide email address but allow form e-mail.',
-'Hide both label'                    =>    'Hide email address and disallow form email.',
-
-// Announcement Section
-'Announcement subhead'                =>    'Announcements',
-'Display announcement label'        =>    'Display announcement',
-'Display announcement help'            =>    'Enable this to display the below message in the board.',
-'Announcement message label'        =>    'Announcement message',
-'Announcement message help'            =>    'This text will not be parsed like regular posts and thus may contain HTML.',
-
-// Maintenance Section
-'Maintenance subhead'                =>    'Maintenance',
-'Maintenance mode label'            =>    'Maintenance mode',
-'Maintenance mode help'                =>    'When enabled, the board will only be available to administrators. This should be used if the board needs to be taken down temporarily for maintenance. <strong>WARNING! Do not log out when the board is in maintenance mode.</strong> You will not be able to login again.',
-'Maintenance message label'            =>    'Maintenance message',
-'Maintenance message help'            =>    'The message that will be displayed to users when the board is in maintenance mode. If left blank, a default message will be used. This text will not be parsed like regular posts and thus may contain HTML.',
-
-);
diff --git a/lang/English/admin/options.po b/lang/English/admin/options.po
new file mode 100644
index 00000000..9df9a3d3
--- /dev/null
+++ b/lang/English/admin/options.po
@@ -0,0 +1,603 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Bad HTTP Referer message"
+msgstr "Bad HTTP_REFERER. If you have moved these forums from one location to another or switched domains, you need to update the Base URL manually in the database (look for o_base_url in the config table) and then clear the cache by deleting all .php files in the /cache directory."
+
+msgid "Must enter title message"
+msgstr "You must enter a board title."
+
+msgid "Invalid e-mail message"
+msgstr "The admin email address you entered is invalid."
+
+msgid "Invalid webmaster e-mail message"
+msgstr "The webmaster email address you entered is invalid."
+
+msgid "SMTP passwords did not match"
+msgstr "You need to enter the SMTP password twice exactly the same to change it."
+
+msgid "Enter announcement here"
+msgstr "Enter your announcement here."
+
+msgid "Enter rules here"
+msgstr "Enter your rules here."
+
+msgid "Default maintenance message"
+msgstr "The forums are temporarily down for maintenance. Please try again in a few minutes."
+
+msgid "Timeout error message"
+msgstr "The value of \"Timeout online\" must be smaller than the value of \"Timeout visit\"."
+
+msgid "Options updated redirect"
+msgstr "Options updated."
+
+msgid "Options head"
+msgstr "Options"
+
+msgid "Essentials subhead"
+msgstr "Essentials"
+
+msgid "Board title label"
+msgstr "Board title"
+
+msgid "Board title help"
+msgstr "The title of this bulletin board (shown at the top of every page). This field may <strong>not</strong> contain HTML."
+
+msgid "Board desc label"
+msgstr "Board description"
+
+msgid "Board desc help"
+msgstr "A short description of this bulletin board (shown at the top of every page). This field may contain HTML."
+
+msgid "Base URL label"
+msgstr "Base URL"
+
+msgid "Base URL help"
+msgstr "The complete URL of the board without trailing slash (i.e. http://www.mydomain.com/forums). This <strong>must</strong> be correct in order for all admin and moderator features to work. If you get \"Bad referer\" errors, it's probably incorrect."
+
+msgid "Base URL problem"
+msgstr "Your installation does not support automatic conversion of internationalized domain names. As your base URL contains special characters, you <strong>must</strong> use an online converter in order to avoid \"Bad referer\" errors."
+
+msgid "Timezone label"
+msgstr "Default time zone"
+
+msgid "Timezone help"
+msgstr "The default time zone for guests and users attempting to register for the board."
+
+msgid "DST label"
+msgstr "Adjust for DST"
+
+msgid "DST help"
+msgstr "Check if daylight savings is in effect (advances times by 1 hour)."
+
+msgid "Language label"
+msgstr "Default language"
+
+msgid "Language help"
+msgstr "The default language for guests and users who haven't changed from the default in their profile. If you remove a language pack, this must be updated."
+
+msgid "Default style label"
+msgstr "Default style"
+
+msgid "Default style help"
+msgstr "The default style for guests and users who haven't changed from the default in their profile."
+
+msgid "UTC-12:00"
+msgstr "(UTC-12:00) International Date Line West"
+
+msgid "UTC-11:00"
+msgstr "(UTC-11:00) Niue, Samoa"
+
+msgid "UTC-10:00"
+msgstr "(UTC-10:00) Hawaii-Aleutian, Cook Island"
+
+msgid "UTC-09:30"
+msgstr "(UTC-09:30) Marquesas Islands"
+
+msgid "UTC-09:00"
+msgstr "(UTC-09:00) Alaska, Gambier Island"
+
+msgid "UTC-08:30"
+msgstr "(UTC-08:30) Pitcairn Islands"
+
+msgid "UTC-08:00"
+msgstr "(UTC-08:00) Pacific"
+
+msgid "UTC-07:00"
+msgstr "(UTC-07:00) Mountain"
+
+msgid "UTC-06:00"
+msgstr "(UTC-06:00) Central"
+
+msgid "UTC-05:00"
+msgstr "(UTC-05:00) Eastern"
+
+msgid "UTC-04:00"
+msgstr "(UTC-04:00) Atlantic"
+
+msgid "UTC-03:30"
+msgstr "(UTC-03:30) Newfoundland"
+
+msgid "UTC-03:00"
+msgstr "(UTC-03:00) Amazon, Central Greenland"
+
+msgid "UTC-02:00"
+msgstr "(UTC-02:00) Mid-Atlantic"
+
+msgid "UTC-01:00"
+msgstr "(UTC-01:00) Azores, Cape Verde, Eastern Greenland"
+
+msgid "UTC"
+msgstr "(UTC) Western European, Greenwich"
+
+msgid "UTC+01:00"
+msgstr "(UTC+01:00) Central European, West African"
+
+msgid "UTC+02:00"
+msgstr "(UTC+02:00) Eastern European, Central African"
+
+msgid "UTC+03:00"
+msgstr "(UTC+03:00) Eastern African"
+
+msgid "UTC+03:30"
+msgstr "(UTC+03:30) Iran"
+
+msgid "UTC+04:00"
+msgstr "(UTC+04:00) Moscow, Gulf, Samara"
+
+msgid "UTC+04:30"
+msgstr "(UTC+04:30) Afghanistan"
+
+msgid "UTC+05:00"
+msgstr "(UTC+05:00) Pakistan"
+
+msgid "UTC+05:30"
+msgstr "(UTC+05:30) India, Sri Lanka"
+
+msgid "UTC+05:45"
+msgstr "(UTC+05:45) Nepal"
+
+msgid "UTC+06:00"
+msgstr "(UTC+06:00) Bangladesh, Bhutan, Yekaterinburg"
+
+msgid "UTC+06:30"
+msgstr "(UTC+06:30) Cocos Islands, Myanmar"
+
+msgid "UTC+07:00"
+msgstr "(UTC+07:00) Indochina, Novosibirsk"
+
+msgid "UTC+08:00"
+msgstr "(UTC+08:00) Greater China, Australian Western, Krasnoyarsk"
+
+msgid "UTC+08:45"
+msgstr "(UTC+08:45) Southeastern Western Australia"
+
+msgid "UTC+09:00"
+msgstr "(UTC+09:00) Japan, Korea, Chita, Irkutsk"
+
+msgid "UTC+09:30"
+msgstr "(UTC+09:30) Australian Central"
+
+msgid "UTC+10:00"
+msgstr "(UTC+10:00) Australian Eastern"
+
+msgid "UTC+10:30"
+msgstr "(UTC+10:30) Lord Howe"
+
+msgid "UTC+11:00"
+msgstr "(UTC+11:00) Solomon Island, Vladivostok"
+
+msgid "UTC+11:30"
+msgstr "(UTC+11:30) Norfolk Island"
+
+msgid "UTC+12:00"
+msgstr "(UTC+12:00) New Zealand, Fiji, Magadan"
+
+msgid "UTC+12:45"
+msgstr "(UTC+12:45) Chatham Islands"
+
+msgid "UTC+13:00"
+msgstr "(UTC+13:00) Tonga, Phoenix Islands, Kamchatka"
+
+msgid "UTC+14:00"
+msgstr "(UTC+14:00) Line Islands"
+
+msgid "Timeouts subhead"
+msgstr "Time and timeouts"
+
+msgid "Time format label"
+msgstr "Time format"
+
+msgid "PHP manual"
+msgstr "PHP manual"
+
+msgid "Time format help"
+msgstr "[Current format: %s]. See %s for formatting options."
+
+msgid "Date format label"
+msgstr "Date format"
+
+msgid "Date format help"
+msgstr "[Current format: %s]. See %s for formatting options."
+
+msgid "Visit timeout label"
+msgstr "Visit timeout"
+
+msgid "Visit timeout help"
+msgstr "Number of seconds a user must be idle before his/hers last visit data is updated (primarily affects new message indicators)."
+
+msgid "Online timeout label"
+msgstr "Online timeout"
+
+msgid "Online timeout help"
+msgstr "Number of seconds a user must be idle before being removed from the online users list."
+
+msgid "Redirect time label"
+msgstr "Redirect time"
+
+msgid "Redirect time help"
+msgstr "Number of seconds to wait when redirecting. If set to 0, no redirect page will be displayed (not recommended)."
+
+msgid "Display subhead"
+msgstr "Display"
+
+msgid "Version number label"
+msgstr "Version number"
+
+msgid "Version number help"
+msgstr "Show FluxBB version number in footer."
+
+msgid "Info in posts label"
+msgstr "User info in posts"
+
+msgid "Info in posts help"
+msgstr "Show information about the poster under the username in topic view. The information affected is location, register date, post count and the contact links (email and URL)."
+
+msgid "Post count label"
+msgstr "User post count"
+
+msgid "Post count help"
+msgstr "Show the number of posts a user has made (affects topic view, profile and user list)."
+
+msgid "Smilies label"
+msgstr "Smilies in posts"
+
+msgid "Smilies help"
+msgstr "Convert smilies to small graphic icons."
+
+msgid "Smilies sigs label"
+msgstr "Smilies in signatures"
+
+msgid "Smilies sigs help"
+msgstr "Convert smilies to small graphic icons in user signatures."
+
+msgid "Clickable links label"
+msgstr "Make clickable links"
+
+msgid "Clickable links help"
+msgstr "When enabled, FluxBB will automatically detect any URLs in posts and make them clickable hyperlinks."
+
+msgid "Topic review label"
+msgstr "Topic review"
+
+msgid "Topic review help"
+msgstr "Maximum number of posts to display when posting (newest first). Set to 0 to disable."
+
+msgid "Topics per page label"
+msgstr "Topics per page"
+
+msgid "Topics per page help"
+msgstr "The default number of topics to display per page in a forum. Users can personalize this setting."
+
+msgid "Posts per page label"
+msgstr "Posts per page"
+
+msgid "Posts per page help"
+msgstr "The default number of posts to display per page in a topic. Users can personalize this setting."
+
+msgid "Indent label"
+msgstr "Indent size"
+
+msgid "Indent help"
+msgstr "If set to 8, a regular tab will be used when displaying text within the [code][/code] tag. Otherwise this many spaces will be used to indent the text."
+
+msgid "Quote depth label"
+msgstr "Maximum [quote] depth"
+
+msgid "Quote depth help"
+msgstr "The maximum times a [quote] tag can go inside other [quote] tags, any tags deeper than this will be discarded."
+
+msgid "Features subhead"
+msgstr "Features"
+
+msgid "Quick post label"
+msgstr "Quick reply"
+
+msgid "Quick post help"
+msgstr "When enabled, FluxBB will add a quick reply form at the bottom of topics. This way users can post directly from the topic view."
+
+msgid "Users online label"
+msgstr "Users online"
+
+msgid "Users online help"
+msgstr "Display info on the index page about guests and registered users currently browsing the board."
+
+msgid "Censor words label"
+msgstr "Censor words"
+
+msgid "Censor words help"
+msgstr "Enable this to censor specific words in the board. See %s for more info."
+
+msgid "Signatures label"
+msgstr "Signatures"
+
+msgid "Signatures help"
+msgstr "Allow users to attach a signature to their posts."
+
+msgid "User has posted label"
+msgstr "User has posted earlier"
+
+msgid "User has posted help"
+msgstr "This feature displays a dot in front of topics in viewforum.php in case the currently logged in user has posted in that topic earlier. Disable if you are experiencing high server load."
+
+msgid "Topic views label"
+msgstr "Topic views"
+
+msgid "Topic views help"
+msgstr "Keep track of the number of views a topic has. Disable if you are experiencing high server load in a busy forum."
+
+msgid "Quick jump label"
+msgstr "Quick jump"
+
+msgid "Quick jump help"
+msgstr "Enable the quick jump (jump to forum) drop list."
+
+msgid "GZip label"
+msgstr "GZip output"
+
+msgid "GZip help"
+msgstr "If enabled, FluxBB will gzip the output sent to browsers. This will reduce bandwidth usage, but use a little more CPU. This feature requires that PHP is configured with zlib (--with-zlib). Note: If you already have one of the Apache modules mod_gzip or mod_deflate set up to compress PHP scripts, you should disable this feature."
+
+msgid "Search all label"
+msgstr "Search all forums"
+
+msgid "Search all help"
+msgstr "When disabled, searches will only be allowed in one forum at a time. Disable if server load is high due to excessive searching."
+
+msgid "Menu items label"
+msgstr "Additional menu items"
+
+msgid "Menu items help"
+msgstr "By entering HTML hyperlinks into this textbox, any number of items can be added to the navigation menu at the top of all pages. The format for adding new links is X = &lt;a href=\"URL\"&gt;LINK&lt;/a&gt; where X is the position at which the link should be inserted (e.g. 0 to insert at the beginning and 2 to insert after \"User list\"). Separate entries with a linebreak."
+
+msgid "Feed subhead"
+msgstr "Syndication"
+
+msgid "Default feed label"
+msgstr "Default feed type"
+
+msgid "Default feed help"
+msgstr "Select the type of syndication feed to display. Note: Choosing none will not disable feeds, only hide them by default."
+
+msgid "None"
+msgstr "None"
+
+msgid "RSS"
+msgstr "RSS"
+
+msgid "Atom"
+msgstr "Atom"
+
+msgid "Feed TTL label"
+msgstr "Duration to cache feeds"
+
+msgid "Feed TTL help"
+msgstr "Feeds can be cached to lower the resource usage of feeds."
+
+msgid "No cache"
+msgstr "Don't cache"
+
+msgid "Minutes"
+msgstr "%d minutes"
+
+msgid "Reports subhead"
+msgstr "Reports"
+
+msgid "Reporting method label"
+msgstr "Reporting method"
+
+msgid "Internal"
+msgstr "Internal"
+
+msgid "By e-mail"
+msgstr "Email"
+
+msgid "Both"
+msgstr "Both"
+
+msgid "Reporting method help"
+msgstr "Select the method for handling topic/post reports. You can choose whether topic/post reports should be handled by the internal report system, emailed to the addresses on the mailing list (see below) or both."
+
+msgid "Mailing list label"
+msgstr "Mailing list"
+
+msgid "Mailing list help"
+msgstr "A comma separated list of subscribers. The people on this list are the recipients of reports."
+
+msgid "Avatars subhead"
+msgstr "Avatars"
+
+msgid "Use avatars label"
+msgstr "Use avatars"
+
+msgid "Use avatars help"
+msgstr "When enabled, users will be able to upload an avatar which will be displayed under their title."
+
+msgid "Upload directory label"
+msgstr "Upload directory"
+
+msgid "Upload directory help"
+msgstr "The upload directory for avatars (relative to the FluxBB root directory). PHP must have write permissions to this directory."
+
+msgid "Max width label"
+msgstr "Max width"
+
+msgid "Max width help"
+msgstr "The maximum allowed width of avatars in pixels (60 is recommended)."
+
+msgid "Max height label"
+msgstr "Max height"
+
+msgid "Max height help"
+msgstr "The maximum allowed height of avatars in pixels (60 is recommended)."
+
+msgid "Max size label"
+msgstr "Max size"
+
+msgid "Max size help"
+msgstr "The maximum allowed size of avatars in bytes (10240 is recommended)."
+
+msgid "E-mail subhead"
+msgstr "Email"
+
+msgid "Admin e-mail label"
+msgstr "Admin email"
+
+msgid "Admin e-mail help"
+msgstr "The email address of the board administrator."
+
+msgid "Webmaster e-mail label"
+msgstr "Webmaster email"
+
+msgid "Webmaster e-mail help"
+msgstr "This is the address that all emails sent by the board will be addressed from."
+
+msgid "Forum subscriptions label"
+msgstr "Forum subscriptions"
+
+msgid "Forum subscriptions help"
+msgstr "Enable users to subscribe to forums (receive email when someone creates a new topic)."
+
+msgid "Topic subscriptions label"
+msgstr "Topic subscriptions"
+
+msgid "Topic subscriptions help"
+msgstr "Enable users to subscribe to topics (receive email when someone replies)."
+
+msgid "SMTP address label"
+msgstr "SMTP server address"
+
+msgid "SMTP address help"
+msgstr "The address of an external SMTP server to send emails with. You can specify a custom port number if the SMTP server doesn't run on the default port 25 (example: mail.myhost.com:3580). Leave blank to use the local mail program."
+
+msgid "SMTP username label"
+msgstr "SMTP username"
+
+msgid "SMTP username help"
+msgstr "Username for SMTP server. Only enter a username if it is required by the SMTP server (most servers <strong>do not</strong> require authentication)."
+
+msgid "SMTP password label"
+msgstr "SMTP password"
+
+msgid "SMTP change password help"
+msgstr "Check this if you want to change or delete the currently stored password."
+
+msgid "SMTP password help"
+msgstr "Password for SMTP server. Only enter a password if it is required by the SMTP server (most servers <strong>do not</strong> require authentication). Please enter your password twice to confirm."
+
+msgid "SMTP SSL label"
+msgstr "Encrypt SMTP using SSL"
+
+msgid "SMTP SSL help"
+msgstr "Encrypts the connection to the SMTP server using SSL. Should only be used if your SMTP server requires it and your version of PHP supports SSL."
+
+msgid "Registration subhead"
+msgstr "Registration"
+
+msgid "Allow new label"
+msgstr "Allow new registrations"
+
+msgid "Allow new help"
+msgstr "Controls whether this board accepts new registrations. Disable only under special circumstances."
+
+msgid "Verify label"
+msgstr "Verify registrations"
+
+msgid "Verify help"
+msgstr "When enabled, users are emailed a random password when they register. They can then log in and change the password in their profile if they see fit. This feature also requires users to verify new email addresses if they choose to change from the one they registered with. This is an effective way of avoiding registration abuse and making sure that all users have \"correct\" email addresses in their profiles."
+
+msgid "Report new label"
+msgstr "Report new registrations"
+
+msgid "Report new help"
+msgstr "If enabled, FluxBB will notify users on the mailing list (see above) when a new user registers in the forums."
+
+msgid "Use rules label"
+msgstr "User forum rules"
+
+msgid "Use rules help"
+msgstr "When enabled, users must agree to a set of rules when registering (enter text below). The rules will always be available through a link in the navigation table at the top of every page."
+
+msgid "Rules label"
+msgstr "Enter your rules here"
+
+msgid "Rules help"
+msgstr "Here you can enter any rules or other information that the user must review and accept when registering. If you enabled rules above you have to enter something here, otherwise it will be disabled. This text will not be parsed like regular posts and thus may contain HTML."
+
+msgid "E-mail default label"
+msgstr "Default email setting"
+
+msgid "E-mail default help"
+msgstr "Choose the default privacy setting for new user registrations."
+
+msgid "Display e-mail label"
+msgstr "Display email address to other users."
+
+msgid "Hide allow form label"
+msgstr "Hide email address but allow form e-mail."
+
+msgid "Hide both label"
+msgstr "Hide email address and disallow form email."
+
+msgid "Announcement subhead"
+msgstr "Announcements"
+
+msgid "Display announcement label"
+msgstr "Display announcement"
+
+msgid "Display announcement help"
+msgstr "Enable this to display the below message in the board."
+
+msgid "Announcement message label"
+msgstr "Announcement message"
+
+msgid "Announcement message help"
+msgstr "This text will not be parsed like regular posts and thus may contain HTML."
+
+msgid "Maintenance subhead"
+msgstr "Maintenance"
+
+msgid "Maintenance mode label"
+msgstr "Maintenance mode"
+
+msgid "Maintenance mode help"
+msgstr "When enabled, the board will only be available to administrators. This should be used if the board needs to be taken down temporarily for maintenance. <strong>WARNING! Do not log out when the board is in maintenance mode.</strong> You will not be able to login again."
+
+msgid "Maintenance message label"
+msgstr "Maintenance message"
+
+msgid "Maintenance message help"
+msgstr "The message that will be displayed to users when the board is in maintenance mode. If left blank, a default message will be used. This text will not be parsed like regular posts and thus may contain HTML."
diff --git a/lang/English/admin/parser.mo b/lang/English/admin/parser.mo
new file mode 100644
index 0000000000000000000000000000000000000000..b18ade305d28766faae4f1f67744c3d60cc02cf4
GIT binary patch
literal 5557
zcmbVPO^h5z6>cCTumJ*wgzyu19uquk&$PX^S<E;K_O5pwBkxbV>)^<;CpA4aGnMVG
zo>X=3?gSBWK#*LxpeTYvltX|M91w6ooKO%44j>VU8wv-+g%g&@35oAjRnN@YSs!R^
z@7J$>UcLW%^S49yy%OO$jrX&7fBBv$x&*xPKK#QoxG#zx0xIA~fFs~XfiD3c1pYA0
z|2W{UfHN5XeW3pgydU)2Kwke(;0J-Xfgc9`7x*FIgYS=`4*(wp^7vsO?>hnHee*!(
zy9i`?R>SyBAj_kGEZ+-2-v2U?`MwJL81M}s^Z7N9*Z(ez{{_hF{{iInx5GFe&f|vy
z67T`gF_72I1DW3vkk4HQ^7>n0J`Feu_}zd%2>5!yp9TC)z&`|h3&{HZJ>b89toJ*>
z4fyB*2*dJRhtc@_XMwC&4m<+<Ht>_cH-NnEx4=WdH-THgzXExE1I~B|{1$+ZfL_I+
zd`=hm31AWMW#C(&Ujy<!3*~PBzXN<2_%=|1&wqf-=UEto`R)QA1^qn;c@_9Num-#h
zWWPLu!#)nI1D^su0R)Ta`#_feM?hZp3*dF&n?U?Uk3k5i5H*3!e;)W#oVN~q4D>tL
z^f}<eP@4Ij0nP)@1HTB|1)c=H24s8v3CKBc8_4n<g;2+UUkCEK68Ht+Pk_Atk3jrI
z|Hi+c<J|jUEI@>CcIy#F?qMFh?>JtTvw;^Px*RwPjPdfrx;~Eg(@fy`yayL+oR=&U
zpUcl@JnZ{F2kKLJA-;<T)~R|BGA@=*08isRjF)Z55Br!O_Sr06j$yW69d8pamjR9+
zw&k4<>(9O?yzHat=e;0K;bq&ipQ6RZrMxRG*|IZ`q8lycx~KYMa!u}%%~UE!q%zT$
z(S|Tq8ggr|$}BIY_HJUKnxd0bCEIP4^=&ly#MX2eb!D%;HwsV<4U0iL6MK=;?O|?<
zb}BkDWy-34ATSN;1sPQzelJsC=fMv>UqUv2_~dhXDph*hMt;tH`$;3MEC}+6GA(T6
z$hIw$L|PkJu_GshvrD@N>jde%rM!Ss-=1+8DCAzHSr{pYX%5TVkuJm@*<zH+eT3g$
zh`ttCbrPszG#pdl2`M7x4fGpIEp~*04Kd-5fLFa5o@{r@qR4faY)fO>bJN7BY2x%W
zab}wM(ljwYO?-KpI6F;zr6TfPFWM2Q>UvL2KD`bbX=y~-T**ylTcn4Mv<s)sk^fw%
zYdX9@bF=4WHcbAUOp4~^Zu4nrtjcwZR-`Bf(kw2{Y^-lJmkdaZH!q4pwg_X*t8z#2
z(rW06utjsr2yIhQ<OYkb2;DCc_{}XTvMG-Agy?2UpYQo2I-NK-{jbifUS3_EoIe+z
zoIyerQiChp)gt!LiD4>~K1a!bbE#OkwzbkcJ6Xr4_oQhq>m=_g-EYy^jw;52v`Ffi
z>&;72OXFqS$Yoa*G#8(Z&tS%r&CR?tiCpq$w8$S)rF)ge`H&4_ql40X-Oo3uDicC?
zY15~9<kR2R1#+Hq=8dZPRk1DU^6DjW$?xLuqOwpv)Dla~O{6xbjF(E03<5VX*+ZP0
zROAFtQm;%?;{5MYZd6}sk;c(QpR1I?41%sdGaeYKJ(<$3>J|fc)Ih5KprBrENTaU7
z^`%I|w!Fj9W2x@SoNZvXD|1V-NM>XD#z1Nk#8rs~f(3VqAqyR27OnO)hcP0Hj4O-0
zphn)nq%0Ms(JZ!ZuqN866IOBsA*CT#<}Ap|Z6Z=Ehu%H-c2^Yx<@Q)fU6o1AQR@w8
zWPxyU{3@G}utR7=2oROW(JIOci>jq95Kt&?sI+l(Ax-mLoa@xGUz^Y<w^~46i9zgD
zS(!O?Sx#4ctHB_@Ga2Ocvn+E*!mr@&6lQ~i!w^|ygDDf2iV#IOPq1B`St{F2I67~$
zL6U(?w!u&Ip)K41gIJEb5=SA7j2z~s;CbgA6f<~P^$5me<L8hG*BY<%yeIL>^SO3b
za+;3AsM7L)FmeiVRR13V6;+AA=>ZQsb!~lXnZ~0&1}Q=5fU;03_}?#sD`CgWJ#T_Z
zgz>!v+t=3e8r3-@!zD(TV873X$P3&9PeJYqBw-}!95<g&Q5@PgVmMHU!*oQrD%=V-
zJ=%n+RcvoKDI3BNT-|7ZLT9Fv)*HOe=ea2LbG+0`+@jhyVTW(kkZ1>M^^CN&cU8cN
z4<R7`M0U-&#DdqId_fiRSw0&_S5Q<`ZxjrlsKS>nSF&6-Zy+Sm=j<AE5v>|kE4+%r
z7p0C!#+7NDdag!ri3xHI#17}&{&`(y9dOT(x+oa}A&{hH7d8)x><UX!7zMja?@Y(n
z?`zP|$VBq`&WJ>djvhJMa76=IuX+mOf)fNK74e>Ppdd-c>{5kdYjc?WhLdsO0^ekG
zWbWkL%{Y#4oN%Kz;SQ8|i)-+%NV3)aaj*NK>NdD$kC2}sJXg|kZ*lR?*tBuQ61Sp8
zq1eBh`>t;6ZkDPOb@iqi366KgBHEC+_%xym_XLUVbEPd%Fn!(kEf;n2z3DPquQFwB
z{^aAdut2BI?43G8F7YkQz&9Gs<?xQKxo*vst-#F1ceJ#Aahdk@aGNsaB8=?dmX7Q|
zB0*iP@0mRF*_$eqGI%H{je(3X6lWMB7e3r{4dIixvr@jd5HGI8#^DmDEtK>%w1g3V
za5oq&Ygdo9ASYibc7T$Yl;~o^gv~Rbq&&+pwk=1tFgeFVwYEiVnGJEt@h#hK&@o=1
z`^Oq|UTLJRL|N*}^9?u%d49_#Mh%NwOm<%M#ET7TcA-0}ann`Y<IqWRaX#)$7}H$>
zx)Rz!pztQDADeaie6;hxky&J%#r4ct?m7mX?hAgnQ8+y~&-{gwp;^au)1W#Mk-H-|
zrAh9Ai%Ul>Q4YJMVS>{G8Py!3A7h%e$6g+0mrt7#ahs}4!5Ll_l;|C&8dqLyP&n@S
zQsH*ti1S?&TiW7EL{X3cKEY+xINP}dbZ}%GZSkenD|Nzc8E5oV6F&|^7ef0xdgNGK
zMdk|Rts*w8>fv_)@`tYZ_<*Qcz60g*>bG4lPrK5LPq<?nbDX+G@41ZQkk|56f-cGB
z#z7kvagnex{JZ9$HSX+OBQfBeLb;mm#hWS!cgVZOP1C*EVo8B8&y6r61mC^1UlN*?
z*){OGPhZ##1!wypk+11(o$n&pxCc2L+`?XGp)4C`lI`HbDT~_nF70FF+RjO2hp0ve
z>aG;-9XPbmt5&TihpdZnsS{aM{=2(0zBUZvH1vZ$Zdp3~>JkV96rpi58q*SYUcNiO
zo0Y4vxMjLIt*viWH!yczRnJxDFhl)z`Q%%{9VK_AIf|q}L+1K(fAtF;ej4~Dds3p&
zi{N(_1S@bmP>mZ}w+#)p@uctVs}8~Cs5@}d68JU*!l0p!slJAbo!Ny>a?(asE^#`*
lo*PeYz`#bi(pp0R=DY3Er0rfll)A?5T)A*%b2*-k{s-{mb5#HU

literal 0
HcmV?d00001

diff --git a/lang/English/admin/parser.po b/lang/English/admin/parser.po
new file mode 100644
index 00000000..b21ec9f5
--- /dev/null
+++ b/lang/English/admin/parser.po
@@ -0,0 +1,168 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Parser head"
+msgstr "Parser Options, BBCodes and Smilies"
+
+msgid "reset_success"
+msgstr "Parser Options, BBCodes and Smilies successfully reset to FluxBB default settings."
+
+msgid "save_success"
+msgstr "Parser changes successfully saved."
+
+msgid "upload success"
+msgstr "Smiley file upload successful."
+
+msgid "upload_button"
+msgstr "Upload File"
+
+msgid "reset defaults"
+msgstr "Restore default settings"
+
+msgid "Remotes subhead"
+msgstr "Remote image validation"
+
+msgid "unavailable"
+msgstr "This function is unavailable."
+
+msgid "Config subhead"
+msgstr "Parser options"
+
+msgid "syntax style"
+msgstr "CODE syntax style"
+
+msgid "syntax style help"
+msgstr "Select a style sheet file from this list of currently installed SyntaxHighlighter files."
+
+msgid "textile"
+msgstr "Enable Textile shortcuts"
+
+msgid "textile help"
+msgstr "Enable some textile tag keystroke shortcuts: _emphasized_, *strong*, @inline code@, super^script^, sub~script~, -deleted- and +inserted+ text. Textile shortcuts for bulleted (*) and numbered (#) lists are also supported. When posting a new message, (or editing an existing one), during the pre-parsing phase, the textile shortcut delimiters are converted to their equivalent BBCode tags before being stored in the database."
+
+msgid "quote_imgs"
+msgstr "Display IMG in QUOTE "
+
+msgid "quote_imgs help"
+msgstr "Display images contained within QUOTE tags. If this option is set to \"No\" (the default setting), then images within a quote are not displayed graphically but are instead displayed as a simple text hyperlink to the image (with the link text set to: \"{IMG}\"). If this option is set to \"Yes\", then images within quotes are displayed normally (as a graphic object)."
+
+msgid "quote_links"
+msgstr "Linkify QUOTE citation"
+
+msgid "quote_links help"
+msgstr "Make the \"Poster wrote:\" citation text a link back to the original post for quotes having original post number metadata included in the tag attribute (the post number, preceded by a: '#', is specified at the end of the attribute like so: \"[quote=Admin #101]...[/quote]\")."
+
+msgid "click_imgs"
+msgstr "Make IMG clickable"
+
+msgid "click_imgs help"
+msgstr "Display images and also make each image a clickable link to the full sized original."
+
+msgid "max_xy"
+msgstr "Maximum media XY"
+
+msgid "max_xy help"
+msgstr "Maximum pixel width and height allowable for new visual media objects (images, videos etc)."
+
+msgid "smiley_size"
+msgstr "Smiley display size"
+
+msgid "smiley_size help"
+msgstr "Percent size adjustment for smiley box dimensions (default 160% == 24x24 pixels)."
+
+msgid "valid_imgs"
+msgstr "Validate remote IMG"
+
+msgid "valid_imgs help"
+msgstr "When posting a message having IMG tags, validate the existence of the remote image files by requesting their file header information. Check each remote image filesize and do NOT display if too big (to save the forum viewer's bandwidth). If any image has a dimension greater than \"Max width\" or \"Max height\", then limit the displayed image to fit. (Note that this option is disabled if the PHP variable \"allow_url_fopen\" is FALSE.)"
+
+msgid "max_size"
+msgstr "Maximum IMG filesize"
+
+msgid "max_size help"
+msgstr "Maximum remote image filesize to be allowed on forum pages. When creating a new post, the remote image file size is checked against this value and reported as an error if it is too big and image validation is on."
+
+msgid "def_xy"
+msgstr "Default media XY"
+
+msgid "def_xy help"
+msgstr "Default pixel width and height for new visual media objects (images, videos etc). When a post has an IMG tag and the \"Validate remote IMG\" option is turned on, then the remote file information is scaled to fit within these dimensions and retain the original aspect ratio."
+
+msgid "Smilies subhead"
+msgstr "Smilies"
+
+msgid "smiley_text_label"
+msgstr "Smiley text"
+
+msgid "smiley_file_label"
+msgstr "Smiley image file"
+
+msgid "smiley_upload"
+msgstr "Upload new smiley image"
+
+msgid "New smiley image"
+msgstr "New smiley image"
+
+msgid "upload_err_1"
+msgstr "Smiley upload failed. Unable to move to smiley folder."
+
+msgid "upload_err_2"
+msgstr "Smiley upload failed. File is too big."
+
+msgid "upload_err_3"
+msgstr "Smiley upload failed. File type is not an image."
+
+msgid "upload_err_4"
+msgstr "Smiley upload failed. Bad filename."
+
+msgid "upload_err_5"
+msgstr "Smiley upload failed. File only partially uploaded."
+
+msgid "upload_err_6"
+msgstr "Smiley upload failed. No filename."
+
+msgid "upload_err_7"
+msgstr "Smiley upload failed. No temporary folder."
+
+msgid "upload_err_8"
+msgstr "Smiley upload failed. Cannot write file to disk."
+
+msgid "upload_err_9"
+msgstr "Smiley upload failed. Unknown error!"
+
+msgid "upload_off"
+msgstr "Uploading files is currently disabled."
+
+msgid "BBCodes subhead"
+msgstr "BBCodes"
+
+msgid "tagname_label"
+msgstr "BBCode Tag Name"
+
+msgid "tagtype_label"
+msgstr "Tag type"
+
+msgid "in_post_label"
+msgstr "Allow in posts?"
+
+msgid "in_sig_label"
+msgstr "Allow in signatures?"
+
+msgid "depth_max"
+msgstr "Max tag nesting depth."
+
+msgid "tag_summary"
+msgstr ""
diff --git a/lang/English/admin/permissions.mo b/lang/English/admin/permissions.mo
new file mode 100644
index 0000000000000000000000000000000000000000..b90e01493cdced77a818ba14c09c24312dcc9be4
GIT binary patch
literal 2836
zcmb7_&u<(x6vqveAKjJ$Ek8>E7kWrgXVO&s2%DyYqzy`yh*gpzqzEMMj(65*#-5Hn
zO>^OZg!lsxLWm38kl=v0a6*CuS0u!_NF2CwtB?=}zHjWE{gED;(M~?`^Yin2&+mEu
zIDY6;hUZzlr|=%Vi?LboKaid;?`G^V@GJ0f@CWcX_$zn<{4>no3iC(qVeAOx&x1$7
z7<?F91Rnv{L0bPFNb9eGWd9?O?0*3s1HT6!0)GZc?>F#K@UJlbH;j)R^7dW;N$(Yq
z_PYX-y&aJ3lpwAD5G1|N!uT7I{P_v&Am-n}a~Pkw&)c~Qp2xTklHTVa&3_x_Z-Qqq
z{u{)Pow%Q|)8I*v;<^C-18#zp-zyIwCNKq`17{C2_9D0j;>R5Rtb!kaPk_IG7r~q0
zli;ZqW3PcPgEVhI%J;`0#rFw_t=QKf<^MbIRq#iU;=Tpq#|~o=9WmT!9y%X-$WMxe
zo_p~=gO_qi=Ryzd^B~@*@RBWxlj?`;laFw<_6?|WhNEg8@(rcJp2m9;FP#<nPY?M!
zd~gi)xv@90jQ2!gc`mILspJEh75k-`=*ny)wkow#nzd+Jt?Irndv01YNWJp%@`_2q
zw&DMYiP2VJc5I_%p|wo7jB=qezssb^Te?&gnd%8ACp7m-z4BU4S#Tot_C~|$>5*e2
zoiX1w#0`!i&!kS>z#E&Ad5euuX&I6_De`I^S?0=GWi%;?gpt7Vsz?x6!b_Q`61ip_
zW1Z3|w^g@R+mxxYt`rU{$As4^s88f$Q%=bIu3IYA!c`?a8yf6nRVlJ))nNNJ*F`<F
zOXnB4|95Fd^V3Uwes;0dDGi-}w3b9~%aVL=^HnL_K$gqPt<GE9(MpLS<k2NW(dLjv
zoASCM)uCuzSQl-VLfcF@Q$lH7=(NHqMcY#3V;1=Zk>pCh-uGK{yRj+Li>-~djmx9`
z=i_s&6{DThu)0@ZQzvh@xgrxvFY?|%lvcW>tJ|y5!bp#H@5?f}ta~OwcH4ZRt6bwq
zn@in#CwfzAiA0l+9fR|5d_G=?U&4$ZMq8#Tdve9^(dK>=>MFC#Mbm-K@E#n5KiueS
zkJ?i?k)e{DLl)yv8-|{3ETG=}Y4JO^(X1I+3H^Bh8-7Kw5c(AE7pO(cXHb_W&!tXe
zG8;2LJ)vtklq)Ms>X=Y(L&bV-Bo6CH*;15cUEWx^tI%bpq!ZNCzy=xZhWnwu9z>F$
zjO|=vFw`+$>m#Fm$A#kxUM8|Hs?2eme%(Jad(zIH<!+!X7rnZBb`>tmuH=FaOeSY}
zx59Fbu`C^z^)5pli~1rbQ0tr~s3kKrBA>wm+3%w*)OE>s#U3|(Z0<+^og6->B9kF7
z-?tWN^Hp-Yh@@py(51;N-yKNmt~!}$*@3CDWX$FL86$7T(*uW*5TQ+D2H~MelRZ8V
zw$54;{y{@meVj?sT*gSOk6R|g@J5ppP9Z`cK4mkM*N)25cX#IKZ+%-2%PnTjb$myQ
zrpk`bAao>uykZ-JRHkF4xLu#^4V70p*Hzv{-f@<6g`i-lKE+f~qY}{0zPDqBTfSb}
zSPb6^c6+-hA>6_THc6}MZ$<ccjQ>CUdc?!81{?ocVBo(9X(g$TQO&k03fxHhiUwup
SyB#GQPp<Rj#kQKpX8!{#k0yoy

literal 0
HcmV?d00001

diff --git a/lang/English/admin/permissions.php b/lang/English/admin/permissions.php
deleted file mode 100644
index 74d44fd1..00000000
--- a/lang/English/admin/permissions.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-// Language definitions used in admin_permissions.php
-$lang_admin_permissions = array(
-
-'Perms updated redirect'    =>    'Permissions updated.',
-'Permissions head'            =>    'Permissions',
-'Posting subhead'            =>    'Posting',
-'BBCode label'                =>    'BBCode',
-'BBCode help'                =>    'Allow BBCode in posts (recommended).',
-'Image tag label'            =>    'Image tag',
-'Image tag help'            =>    'Allow the BBCode [img][/img] tag in posts.',
-'All caps message label'    =>    'All caps message',
-'All caps message help'        =>    'Allow a message to contain only capital letters.',
-'All caps subject label'    =>    'All caps subject',
-'All caps subject help'        =>    'Allow a subject to contain only capital letters.',
-'Require e-mail label'        =>    'Require guest email',
-'Require e-mail help'        =>    'Require guests to supply an email address when posting.',
-'Signatures subhead'        =>    'Signatures',
-'BBCode sigs label'            =>    'BBCodes in signatures',
-'BBCode sigs help'            =>    'Allow BBCodes in user signatures.',
-'Image tag sigs label'        =>    'Image tag in signatures',
-'Image tag sigs help'        =>    'Allow the BBCode [img][/img] tag in user signatures (not recommended).',
-'All caps sigs label'        =>    'All caps signature',
-'All caps sigs help'        =>    'Allow a signature to contain only capital letters.',
-'Max sig length label'        =>    'Maximum signature length',
-'Max sig length help'        =>    'The maximum number of characters a user signature may contain.',
-'Max sig lines label'        =>    'Maximum signature lines',
-'Max sig lines help'        =>    'The maximum number of lines a user signature may contain.',
-'Registration subhead'        =>    'Registration',
-'Banned e-mail label'        =>    'Allow banned email addresses',
-'Banned e-mail help'        =>    'Allow users to register with or change to a banned email address/domain. If left at its default setting (yes), this action will be allowed, but an alert email will be sent to the mailing list (an effective way of detecting multiple registrations).',
-'Duplicate e-mail label'    =>    'Allow duplicate email addresses',
-'Duplicate e-mail help'        =>    'Controls whether users should be allowed to register with an email address that another user already has. If allowed, an alert email will be sent to the mailing list if a duplicate is detected.',
-
-);
diff --git a/lang/English/admin/permissions.po b/lang/English/admin/permissions.po
new file mode 100644
index 00000000..0539ea39
--- /dev/null
+++ b/lang/English/admin/permissions.po
@@ -0,0 +1,102 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Perms updated redirect"
+msgstr "Permissions updated."
+
+msgid "Permissions head"
+msgstr "Permissions"
+
+msgid "Posting subhead"
+msgstr "Posting"
+
+msgid "BBCode label"
+msgstr "BBCode"
+
+msgid "BBCode help"
+msgstr "Allow BBCode in posts (recommended)."
+
+msgid "Image tag label"
+msgstr "Image tag"
+
+msgid "Image tag help"
+msgstr "Allow the BBCode [img][/img] tag in posts."
+
+msgid "All caps message label"
+msgstr "All caps message"
+
+msgid "All caps message help"
+msgstr "Allow a message to contain only capital letters."
+
+msgid "All caps subject label"
+msgstr "All caps subject"
+
+msgid "All caps subject help"
+msgstr "Allow a subject to contain only capital letters."
+
+msgid "Require e-mail label"
+msgstr "Require guest email"
+
+msgid "Require e-mail help"
+msgstr "Require guests to supply an email address when posting."
+
+msgid "Signatures subhead"
+msgstr "Signatures"
+
+msgid "BBCode sigs label"
+msgstr "BBCodes in signatures"
+
+msgid "BBCode sigs help"
+msgstr "Allow BBCodes in user signatures."
+
+msgid "Image tag sigs label"
+msgstr "Image tag in signatures"
+
+msgid "Image tag sigs help"
+msgstr "Allow the BBCode [img][/img] tag in user signatures (not recommended)."
+
+msgid "All caps sigs label"
+msgstr "All caps signature"
+
+msgid "All caps sigs help"
+msgstr "Allow a signature to contain only capital letters."
+
+msgid "Max sig length label"
+msgstr "Maximum signature length"
+
+msgid "Max sig length help"
+msgstr "The maximum number of characters a user signature may contain."
+
+msgid "Max sig lines label"
+msgstr "Maximum signature lines"
+
+msgid "Max sig lines help"
+msgstr "The maximum number of lines a user signature may contain."
+
+msgid "Registration subhead"
+msgstr "Registration"
+
+msgid "Banned e-mail label"
+msgstr "Allow banned email addresses"
+
+msgid "Banned e-mail help"
+msgstr "Allow users to register with or change to a banned email address/domain. If left at its default setting (yes), this action will be allowed, but an alert email will be sent to the mailing list (an effective way of detecting multiple registrations)."
+
+msgid "Duplicate e-mail label"
+msgstr "Allow duplicate email addresses"
+
+msgid "Duplicate e-mail help"
+msgstr "Controls whether users should be allowed to register with an email address that another user already has. If allowed, an alert email will be sent to the mailing list if a duplicate is detected."
diff --git a/lang/English/admin/plugin_example.mo b/lang/English/admin/plugin_example.mo
new file mode 100644
index 0000000000000000000000000000000000000000..e0a606bdc922c117379a06cbd1f0c098bc8199bb
GIT binary patch
literal 1137
zcmZva%We}f6ow6yTY%D5thh+00mMbjKq?j`B^AA-rBVwKO%W`enKOxDVn?>8Y2E-H
zpj)1ZCt$%Vuw@6oGwDSLOGlqCXMFxS{(sI*9SV#qh}#H{m_>X?gfVkQh&gZ;yaC<=
zuYoTn+?;R^40j~pMbLmV;1IkDegQ9mhhPiw4RIaoUuT7w2LFI7;Pg2mzJe|A4)_Cn
z4E_dhf_JBcxC}0X;ojHaEpQLSm7;<O1L<QOVU8nlK1?uz#_)X@K@ZA`3t@3Ing_B!
z$eA)@`{b3+SsZN*@}jHs@#Y|xT6$$P)sS+sS`b@$P<Tp=_N=|w<}T}$JRf-R#+2Oc
znc;Xwox*#gMH{E&4LKZ$kES3eRVrF}VPzg|K#QxBh5#&GV_}KPY2%@$`3BV<Emd09
zeB#7MTWR#3t%IyOZLst`wyUd^*4uWpX0gP6v@Si@3475y-d7>@Xlq+KAGNL2E|=a|
zByCIGEo7IYHp~908|kG?`%1sc$`YMUY;1SAva_|*JgHxcpH<e%E=29o07XL+o}yJs
zFHzEy*0FEwwKt;0le|zpV;ePfVp65Mbz1Bwe=MX<tScX)P1bBnjV;5e@>Gi#<L5Xj
zm(i{%Y{F}0jXIS@#EK?9^}zo;t!Vd@3#|>$oEmoefd@(Ik?%nY6^^qakLfk*gbBSR
zE&EK>i9@P!dBe~Yc}g87NnK-7asxAdTrcy_*vplNtw?qZTrz^rNy(Vj*(Fxt!(mT)
z!cPSeD4$aB3)Zm5<Z4JsV_IeESjE|s;3HBxxE7DR&p`<k23Mg14W%9{NR>nPN3m$a
zn-*FIit#5VD^tgnP^Nn9&+7cxjj2jQFJR~J)ubKs;yCU9{-x@DSB+^i7>}GUvMd&V
E0VRz$fB*mh

literal 0
HcmV?d00001

diff --git a/lang/English/admin/plugin_example.php b/lang/English/admin/plugin_example.php
deleted file mode 100644
index 6dbc172a..00000000
--- a/lang/English/admin/plugin_example.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-// Language definitions used in example Plugin
-$lang_admin_plugin_example = array(
-
-    'No text'                =>    'You didn\'t enter anything!',
-    'Example plugin title'    =>    'Example plugin',
-    'You said'                =>    'You said "%s". Great stuff.',
-    'Explanation 1'            =>    'This plugin doesn\'t do anything useful. Hence the name "Example".',
-    'Explanation 2'            =>    'This would be a good spot to talk a little about your plugin. Describe what it does and how it should be used. Be brief, but informative.',
-    'Example form title'    =>    'An example form',
-    'Legend text'            =>    'Enter a piece of text and hit "Show text"!',
-    'Text to show'            =>    'Text to show',
-    'Show text button'        =>    'Show text',
-    'Input content'            =>    'The text you want to display.',
-
-);
diff --git a/lang/English/admin/plugin_example.po b/lang/English/admin/plugin_example.po
new file mode 100644
index 00000000..491eca80
--- /dev/null
+++ b/lang/English/admin/plugin_example.po
@@ -0,0 +1,45 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "No text"
+msgstr "You didn't enter anything!"
+
+msgid "Example plugin title"
+msgstr "Example plugin"
+
+msgid "You said"
+msgstr "You said \"%s\". Great stuff."
+
+msgid "Explanation 1"
+msgstr "This plugin doesn't do anything useful. Hence the name \"Example\"."
+
+msgid "Explanation 2"
+msgstr "This would be a good spot to talk a little about your plugin. Describe what it does and how it should be used. Be brief, but informative."
+
+msgid "Example form title"
+msgstr "An example form"
+
+msgid "Legend text"
+msgstr "Enter a piece of text and hit \"Show text\"!"
+
+msgid "Text to show"
+msgstr "Text to show"
+
+msgid "Show text button"
+msgstr "Show text"
+
+msgid "Input content"
+msgstr "The text you want to display."
diff --git a/lang/English/admin/reports.mo b/lang/English/admin/reports.mo
new file mode 100644
index 0000000000000000000000000000000000000000..3fcf39da696a0648275f2b7020ce364a802430ef
GIT binary patch
literal 1083
zcmY+CJ8u&~5XUc&5IDk9Q4ok?QG^7=U1CIGoiT#gF|rgJD;N~ft$h>w;Jkb6oq?p_
z3m`!O)cFSVbd+>7w4~w#(9rXrd-$=^+|Tn~@67S##V;1l1;};CXUG-E$^t$(LvR@k
zz!mUS&UfGm=<mUc;0N$Lcm!Sozk;0i9Xtj8$o)UTHR#9SS@0it5?nwr&R+sMu&sie
zPjGVI5x5E-f*k)5AI|>-UImZ9Yv4EVH24eTzP~|^`vY>{zaaNnUd-yQf&72hL9|U{
zmq0!UO%KQOu_1gHu6qW;_v3ftcR+f2&gEqAJtn74AtmHnImI|8W9`T|5v5HrB<Wl2
zhgO^32t$!JNu1lXP*a=L*5Xh`5&1=w)zPTXtXsPzW32#A7V)^3mdw>jjvpB6CwUaA
z^bV}&GGgJHMOG&q8yPwcZAP&tRFtZ5^-e`(KdZNtxKS0Q+ZDTG^b1sUn!fXlOdM$C
zi3Z7JNM>ux?mX@~H3JoPr!Eun1Z>VOy$(3EF!3umT_aT-%0wFk?MO8k%K<rElB1c5
z;-2(JfqJl?wdnO+Z3g%4R<pG|?O$>??V45zDO5d(&@`d9$wm~)KvhJ4C{0XB^=Y@^
zl&5jreV>f8t@_#z)W8$vUXV;K;t5jrp7V$lne2`oO@4skxn=h*Jele|(PPu6TGqo8
zS(9Ss1+&>>>>-aI?=u}|dt+`1tS%msgoLQMO>pNuvo+joC)RJq^GksNr>1m4M$){5
ZLB?r&cXlH<ss(r9OqFRY+*lh9`VXT)2pj+a

literal 0
HcmV?d00001

diff --git a/lang/English/admin/reports.php b/lang/English/admin/reports.php
deleted file mode 100644
index 6d76b9c2..00000000
--- a/lang/English/admin/reports.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-// Language definitions used in admin_reports.php
-$lang_admin_reports = array(
-
-'Report zapped redirect'    =>    'Report marked as read.',
-'New reports head'            =>    'New reports',
-'Deleted user'                =>    'Deleted user',
-'Deleted'                    =>    'Deleted',
-'Post ID'                    =>    'Post #%s',
-'Report subhead'            =>    'Reported %s',
-'Reported by'                =>    'Reported by %s',
-'Reason'                    =>    'Reason',
-'Zap'                        =>    'Mark as read',
-'No new reports'            =>    'There are no new reports.',
-'Last 10 head'                =>    '10 last read reports',
-'NA'                        =>    'N/A',
-'Zapped subhead'            =>    'Marked as read %s by %s',
-'No zapped reports'            =>    'There are no read reports.',
-
-);
diff --git a/lang/English/admin/reports.po b/lang/English/admin/reports.po
new file mode 100644
index 00000000..a37bac7b
--- /dev/null
+++ b/lang/English/admin/reports.po
@@ -0,0 +1,57 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Report zapped redirect"
+msgstr "Report marked as read."
+
+msgid "New reports head"
+msgstr "New reports"
+
+msgid "Deleted user"
+msgstr "Deleted user"
+
+msgid "Deleted"
+msgstr "Deleted"
+
+msgid "Post ID"
+msgstr "Post #%s"
+
+msgid "Report subhead"
+msgstr "Reported %s"
+
+msgid "Reported by"
+msgstr "Reported by %s"
+
+msgid "Reason"
+msgstr "Reason"
+
+msgid "Zap"
+msgstr "Mark as read"
+
+msgid "No new reports"
+msgstr "There are no new reports."
+
+msgid "Last 10 head"
+msgstr "10 last read reports"
+
+msgid "NA"
+msgstr "N/A"
+
+msgid "Zapped subhead"
+msgstr "Marked as read %s by %s"
+
+msgid "No zapped reports"
+msgstr "There are no read reports."
diff --git a/lang/English/admin/users.mo b/lang/English/admin/users.mo
new file mode 100644
index 0000000000000000000000000000000000000000..4ca0d53146c0d6a3443f8069beba1e47755dceed
GIT binary patch
literal 7114
zcmbW5Ym6L65yu;nkYET86UYn5B#^{Tyz4kG?6Vzm_MOeyKKtT3$2NJ+?#|u~o}F1{
zW_><D2rEDoMF=E9@_~mGMJVEt2qF|gJ`e;X5_~`rL<kTGNFap7BZv<Oz65^%?w;9Q
z`;Y>otNl;cbXQeZS65fxi)+vPoZ;y}Z-=&>Va$Et?XTg7=VRv>^IGsE_$Kgva1Hnc
z&wmtr1MP2u3^m^aUkCmWd_DLasBtfVZwCJgN}hi7eGT{)@O<#C;ME|1W|AM7uoqOn
zgC6e!r7r<x$A`i5z)ynG^LbEuz7D<-{4U6!`H64;0#v_0f|BzuQ2ozAnB-jKaU*yk
z?I}=p-3iK$(zj27Z=?N?$H&3*X+Hx>?h7EI&7b}Ee}Md%b8*gE@B&c%t_Ef21Smaw
zK>6ct@B**|ahdrPD18rtviC7i{hkJ8*Uv!7`7J29e*>lG-=O-frIYwqfNI|WO3n-@
zy|;P%ASgNaf_8qO=JmM8XF-jB5tP6F?)hh*>-d*|8h0JYpV`9?UCa^Bk3fz8h;M%e
zl%0=)((@FkdH>Y&{{+gumqF<}k4Y#l)`RlrHK6R>3ev^w1(~ur3QBJTYQ1xh_jr83
z<Cj6%^CZZh`7uAz_e+m2f%<+HN+kb6Q1Y(?=U&A;LD}<hl*pd@Jw6C({T~Le1HT4p
zfBXhq0)GecXZEoO2f#Z($$bpexbJ|n{|BJPKL=h8o{6($-&LUW-V9y~?grKWL*Q4z
zdqLTAEym04?O+P-1*PXH5Yx@GpzQiNC^^3ZHSS!TEjum%wVs!O?*g}g3*a5#rQj1F
zrkUqK+4Bbw)#fiCqO7sP^Dr8gSqCbfw}TqD3zYmLzMX;mnUnlH1U>}Hj*WCG!7X3{
zJ`SD$FD7Ut?*Z^h@Qa}IFAzjq!9`Ghc?3KQ{06B0PlA&BG^qLh2$Vmb_wC<<>h}_;
zJn&CY`Ee}`YY(XP+X8AHdqBy#9h4sy!Lz~C^N)kle-gYHyw|rM0SPhl6;N`&4a)BC
zgYN-f1~u-+i=6yzpw@3UsCmtUvh!|G>l}m9zYNNrkAjkWpa1?@Q1TuIHU3dh^Y|91
z{?CAt{~Y)U@YkT$qlMAZa{`o}lc4PWG^q9c5~%q;0m_e0fou=^+{W)l=mto0(lZHZ
z{3Vd$?k-4A6KdHvV>W{<vzdkzYkJ-fX??drb5QlXlNZf%KlEPDe7DC1@MdTybQHQC
z(z6@d2i>j)&sJy?v>n<49fI`S0m(-P)ZkeM-3Z;P#>ms=eHM~G<ck?-^pW4ShhFWO
z>p{ho)}eYDyl5TtTnFh~-T>iFyMJy0cR*T$Yap$)9>T-~df_<&h0qnyozSTdTg0x>
z9+0rEpLzeLb>0O{K@-qb&^w^ZAi`nnIg{3vp0gLc3DSPJ8&Vuy4IP9ILuWwmgY;Yu
zDXz@qfqg*|wxYyLc6xCdq*)nNj3fyb^K8&B%w*Ay(oUQ%njK*$n3)TDQBj185zSO2
z)>4%8t9K_+AAHB**NQRhGAN?FFgusRbTM)Y&CV?C#(6L3L`j4_aoWvJ<t5P~CYh;_
z?^gAc?Q0wa{j4a9s^K*FFUw(`Y9>=rJ*nwNFN~8Q>~wPG<)=S=q95l`(5V%SGMx3h
z;?#P>4>U77Z}EfiM<vY~H_~=PVH8oAx0f(J?3iJ*7_=NGJsu`;$LX)!Ju}M8qp--*
z!i+J?xEEDUufNz;thsx_Rx8TAq5Hz3w9X2`Zn+A#6?HSb;EcANkH<w^p5EKB$Gd0k
zu#B_RkDi_1U%k2L2_m_8C8(x6n;nk=w^qZ~`s@B^*+qw2?qSo}wm%D6#9OE+F6y~@
zZZGSM@qApJ-nkc+?Ipvgo@_b&yS0v$OQLoeb?C^B8T6t&ZjY!egX3_zF&z%%9h}-)
z2_hR}!?rWJ{+v|HFxrEav0feWTvXSi@@O$GShZ0_vM>#Mk(tvD2oeQ!$=>p=cif)V
zbcA~_3X?#ie6NGG;IV}sVUI2J!KfG{C>x1#8^aYpY}+tcg;%)nuR9KN&{${Zz45+X
zZ9Y4ZBu<Z+O2pzID$2SwCdE1#|8&L$rI`%xW&_emB?X@K^(kz}8xvYAWy`+rm>t@P
zg&RJuu8hk>DT`fSX{*+3oO?Vb;<3z%owp%p90XyKnE7}y4a-5jIp+th9vjnT6|-Qq
zxF|c6x`4IA4y9Fa`mJ_|fbkp4cNb$cIoTebVN>xaquRXUjYN=|g?40$y9rQIX}dIz
z>v!KNT)X3H-r=Z4nyKRPXt<PRRRkx4JWLw9vb<MJ1Zm$ki|yBL4czPYb!l+v_F&Wc
zt!w7;>;tH6%yb&JVh*WjBG?s$<x-UI*s*5rz(QjuNmQ}f&^a;@z-t_gwCRQ{CB4Q%
z9;QVSmRU}xeVkMSPQS)N6!u0W2HR}HxVh_8v|7z9U%Y9}?9A-+Q2(apHETHD$|yzZ
zN*|?VbfVnYPr^9e8nl<fyok!}hZc4<HV^wrdpF7((`h@?F+34$ZpCG7$V3pOYmPK_
zM`@Hh8|N}yUIv?*o1543#WfrA*&uI6oV3z05jZ8b1elo}IseV%YA64~QbaE9_Y?Bk
z=uVFd6%9c<%eBPG3NfFPMoEuNTOLd%g-gx2ePkS)BkPibqAExRHeyOrZ+I*sWL#=v
zvOyT6?1Zr0W{Z|?%Xi{#H*S-3q)k$KR@s<*Gg;+irMfa$j+s`A6Fn~Q_6oB=*=YtW
zFGZ=iD=zoC4q2GH*;Ep3p<^u`FI?sl4&?}ExcbHFUC9Q)a){-q^P!J?dfD+!Gt=v5
zc}a%}W=(nJQ>*Q&={q&+R(Kk{UZX?$TAJwfCW>OcFL0_lCrnp-DhkPsW!8_|O8&L3
zU@7EO>xG@DSq*W*54)P^(qPIKQ5~l<K*~nk>#|;(z05k}z?=-r0n%v(Gu=S5YqL9<
zk3Nsh(T|iuoq;2kY_NW<1qWG5;Am~U{$7|4NOCIy>lU){RhlTH%I;y=Hd?ir1wzRd
zYt;&35&5SG$k2mCZVkdgnGu?C+ltO3rJPQ%&IRm5F!b>HX0R`kuUbi%9@C^;XME@E
zYMPO1(5zAiT60FuLqzxts(_`?#u?T<vN>!KGz3CjH0sqS@@Y~<uDBkPV2<K;Qi#re
zmI;BbTC^3F^Fz~`;N~{sgQGl++1bX_l$O_;VZGKHP;SUaB{hSpkt~&*mCDxcKxa+!
zzbTfCjc$didel{&GgD3DDo$g|N3D54&ama?ILigT<GFHjykE_$I{Nz3%*O3JE3$4G
zOu8gtw`X<J&@^48S?yH?y}xPr162v;bgtIO%>w5yFU3^rV!6{4$J@<Q=M@`G&0rVn
zTSV<a9+xZH(5lfl1SDghC~-g$w<rOSY0tbKX)Nx;aN=M~i9JfF?rcJLRy0jr^tx<a
zeJ+CG=5$9cTQdzZTYMs~E{y8|8|=QdYtBWB6|t6}w<ohga%7kDh5#G!O4H0{RI@r@
zUWr0#Zr}O;Q#Pquur_#PhCWA(Pth^Qy@uPBo&MKZs`|IrfYn!0B15V!WjpdnwoD+L
zwv=P5M-IlP^r!CdD_LdE>RhPYPtF=2>ZZW*1|2d;#;#O!#JQ4ipYt~MSEit!XWf`;
zpCHM6Bvo;G%BIEgv{Bt!NE-uPu<fc>Oq-3{Su*IQ5;t<6nO4fJ?<2$QJF;ob{y|Uo
zOHOy2->GuzTgo9{B%a!5cuhI&%c3eY#ObzzD1T2G5$ZF^Pzza%tQU=@(@A>)F%I~5
zMt#jNZbCMJ+q;C@gN#QZ8#eBn-S$E;?=I`UVt3P}Z^tIt)yg7@6%HK*2}#vnE~-pA
zO!x}~1Pcz4F0|V?@amg~Juu0}vZxx0T>~neIs4Cz`TFKTwO?O0T;;!UzT|FD*n->M
z25<G3i2{D%uMw->Cd?}L2=hvB5LRDxa(S1@m(HvH)T`$o=nzwA+k?y=IP`UQ(}?O`
z+h%xZHiN@)(rHtPu`KTVM08Ja#&N}kyEs+^>#kaF{YkMH^=%0{ZO>0HrcF|&XE^lB
lAzO9&q&ap!q2SX;e*jRJ^Y1Bm{$gU>m1LIdb;O6<{0F^TYqJ0V

literal 0
HcmV?d00001

diff --git a/lang/English/admin/users.php b/lang/English/admin/users.php
deleted file mode 100644
index e45a0027..00000000
--- a/lang/English/admin/users.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-// Language definitions used in admin_users.php
-$lang_admin_users = array(
-
-'Non numeric message'        =>    'You entered a non-numeric value into a numeric only column.',
-'Invalid date time message'    =>    'You entered an invalid date/time.',
-'Not verified'                =>    'Not verified',
-
-// Actions: mass delete/ban etc.
-'No users selected'            =>    'No users selected.',
-'No move admins message'    =>    'For security reasons, you are not allowed to move multiple administrators to another group. If you want to move these administrators, you can do so on their respective user profiles.',
-'No delete admins message'    =>    'Administrators cannot be deleted. In order to delete administrators, you must first move them to a different user group.',
-'No ban admins message'        =>    'Administrators cannot be banned. In order to ban administrators, you must first move them to a different user group.',
-'No ban mods message'        =>    'Moderators cannot be banned. In order to ban moderators, you must first move them to a different user group.',
-'Move users'                =>    'Change user group',
-'Move users subhead'        =>    'Select new user group',
-'New group label'            =>    'New group',
-'New group help'            =>    'Select the group to which the selected users will be moved. For security reasons, it is not possible to move multiple users to the administrator group.',
-'Invalid group message'        =>    'Invalid group ID.',
-'Users move redirect'        =>    'User group changed.',
-'Delete users'                =>    'Delete users',
-'Confirm delete legend'        =>    'Important: read before deleting users',
-'Confirm delete info'        =>    'Please confirm that you want to delete these users.',
-'Delete posts'                =>    'Delete any posts and topics these users have made.',
-'Delete warning'            =>    'Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by these users, the posts can only be deleted manually at a later time.',
-'Users delete redirect'        =>    'Users deleted.',
-'Ban users'                    =>    'Ban users',
-'Message expiry subhead'    =>    'Ban message and expiry',
-'Ban message label'            =>    'Ban message',
-'Ban message help'            =>    'A message that will be displayed to the banned users when they visit the board.',
-'Expire date label'            =>    'Expire date',
-'Expire date help'            =>    'The date when these bans should be automatically removed (format: yyyy-mm-dd). Leave blank to remove manually.',
-'Ban IP label'                =>    'Ban IP addresses',
-'Ban IP help'                =>    'Also ban the IP addresses of the banned users to make registering a new account more difficult for them.',
-'Invalid date message'        =>    'You entered an invalid expire date.',
-'Invalid date reasons'        =>    'The format should be YYYY-MM-DD and the date must be at least one day in the future.',
-'Users banned redirect'        =>    'Users banned.',
-
-'User search head'            =>    'User search',
-'User search subhead'        =>    'Enter search criteria',
-'User search info'            =>    'Search for users in the database. You can enter one or more terms to search for. Wildcards in the form of asterisks (*) are accepted.',
-'Username label'            =>    'Username',
-'E-mail address label'        =>    'Email address',
-'Title label'                =>    'Title',
-'Real name label'            =>    'Real name',
-'Website label'                =>    'Website',
-'Jabber label'                =>    'Jabber',
-'ICQ label'                    =>    'ICQ',
-'MSN label'                    =>    'Microsoft Account',
-'AOL label'                    =>    'AOL IM',
-'Yahoo label'                =>    'Yahoo Messenger',
-'Location label'            =>    'Location',
-'Signature label'            =>    'Signature',
-'Admin note label'            =>    'Admin note',
-'Posts more than label'        =>    'Number of posts greater than',
-'Posts less than label'        =>    'Number of posts less than',
-'Last post after label'        =>    'Last post is after',
-'Date help'                    =>    '(yyyy-mm-dd hh:mm:ss)',
-'Last post before label'    =>    'Last post is before',
-'Last visit after label'    =>    'Last visit is after',
-'Last visit before label'    =>    'Last visit is before',
-'Registered after label'    =>    'Registered after',
-'Registered before label'    =>    'Registered before',
-'Order by label'            =>    'Order by',
-'Order by username'            =>    'Username',
-'Order by e-mail'            =>    'Email',
-'Order by posts'            =>    'Number of posts',
-'Order by last post'        =>    'Last post',
-'Order by last visit'        =>    'Last visit',
-'Order by registered'        =>    'Registered',
-'Ascending'                    =>    'Ascending',
-'Descending'                =>    'Descending',
-'User group label'            =>    'User group',
-'All groups'                =>    'All groups',
-'Unverified users'            =>    'Unverified users',
-'Submit search'                =>    'Submit search',
-'IP search head'            =>    'IP search',
-'IP search subhead'            =>    'Enter IP to search for',
-'IP address label'            =>    'IP address',
-'IP address help'            =>    'The IP address to search for in the post database.',
-'Find IP address'            =>    'Find IP address',
-
-'Results head'                =>    'Search Results',
-'Results username head'        =>    'Username',
-'Results e-mail head'        =>    'Email',
-'Results title head'        =>    'Title/Status',
-'Results posts head'        =>    'Posts',
-'Results admin note head'    =>    'Admin note',
-'Results actions head'        =>    'Actions',
-'Results IP address head'    =>    'IP address',
-'Results last used head'    =>    'Last used',
-'Results times found head'    =>    'Times found',
-'Results action head'        =>    'Action',
-'Results find more link'    =>    'Find more users for this ip',
-'Results no posts found'    =>    'There are currently no posts by that user in the forum.',
-'Select'                    =>    'Select',
-'Select all'                =>    'Select all',
-'Unselect all'                =>    'Unselect all',
-'Ban'                        =>    'Ban',
-'Delete'                    =>    'Delete',
-'Change group'                =>    'Change group',
-'Bad IP message'            =>    'The supplied IP address is not correctly formatted.',
-'Results view IP link'        =>    'View IP stats',
-'Results show posts link'    =>    'Show posts',
-'Results guest'                =>    'Guest',
-'Results no IP found'        =>    'The supplied IP address could not be found in the database.',
-'No match'                    =>    'No match'
-
-);
diff --git a/lang/English/admin/users.po b/lang/English/admin/users.po
new file mode 100644
index 00000000..41af5899
--- /dev/null
+++ b/lang/English/admin/users.po
@@ -0,0 +1,312 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Non numeric message"
+msgstr "You entered a non-numeric value into a numeric only column."
+
+msgid "Invalid date time message"
+msgstr "You entered an invalid date/time."
+
+msgid "Not verified"
+msgstr "Not verified"
+
+msgid "No users selected"
+msgstr "No users selected."
+
+msgid "No move admins message"
+msgstr "For security reasons, you are not allowed to move multiple administrators to another group. If you want to move these administrators, you can do so on their respective user profiles."
+
+msgid "No delete admins message"
+msgstr "Administrators cannot be deleted. In order to delete administrators, you must first move them to a different user group."
+
+msgid "No ban admins message"
+msgstr "Administrators cannot be banned. In order to ban administrators, you must first move them to a different user group."
+
+msgid "No ban mods message"
+msgstr "Moderators cannot be banned. In order to ban moderators, you must first move them to a different user group."
+
+msgid "Move users"
+msgstr "Change user group"
+
+msgid "Move users subhead"
+msgstr "Select new user group"
+
+msgid "New group label"
+msgstr "New group"
+
+msgid "New group help"
+msgstr "Select the group to which the selected users will be moved. For security reasons, it is not possible to move multiple users to the administrator group."
+
+msgid "Invalid group message"
+msgstr "Invalid group ID."
+
+msgid "Users move redirect"
+msgstr "User group changed."
+
+msgid "Delete users"
+msgstr "Delete users"
+
+msgid "Confirm delete legend"
+msgstr "Important: read before deleting users"
+
+msgid "Confirm delete info"
+msgstr "Please confirm that you want to delete these users."
+
+msgid "Delete posts"
+msgstr "Delete any posts and topics these users have made."
+
+msgid "Delete warning"
+msgstr "Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by these users, the posts can only be deleted manually at a later time."
+
+msgid "Users delete redirect"
+msgstr "Users deleted."
+
+msgid "Ban users"
+msgstr "Ban users"
+
+msgid "Message expiry subhead"
+msgstr "Ban message and expiry"
+
+msgid "Ban message label"
+msgstr "Ban message"
+
+msgid "Ban message help"
+msgstr "A message that will be displayed to the banned users when they visit the board."
+
+msgid "Expire date label"
+msgstr "Expire date"
+
+msgid "Expire date help"
+msgstr "The date when these bans should be automatically removed (format: yyyy-mm-dd). Leave blank to remove manually."
+
+msgid "Ban IP label"
+msgstr "Ban IP addresses"
+
+msgid "Ban IP help"
+msgstr "Also ban the IP addresses of the banned users to make registering a new account more difficult for them."
+
+msgid "Invalid date message"
+msgstr "You entered an invalid expire date."
+
+msgid "Invalid date reasons"
+msgstr "The format should be YYYY-MM-DD and the date must be at least one day in the future."
+
+msgid "Users banned redirect"
+msgstr "Users banned."
+
+msgid "User search head"
+msgstr "User search"
+
+msgid "User search subhead"
+msgstr "Enter search criteria"
+
+msgid "User search info"
+msgstr "Search for users in the database. You can enter one or more terms to search for. Wildcards in the form of asterisks (*) are accepted."
+
+msgid "Username label"
+msgstr "Username"
+
+msgid "E-mail address label"
+msgstr "Email address"
+
+msgid "Title label"
+msgstr "Title"
+
+msgid "Real name label"
+msgstr "Real name"
+
+msgid "Website label"
+msgstr "Website"
+
+msgid "Jabber label"
+msgstr "Jabber"
+
+msgid "ICQ label"
+msgstr "ICQ"
+
+msgid "MSN label"
+msgstr "Microsoft Account"
+
+msgid "AOL label"
+msgstr "AOL IM"
+
+msgid "Yahoo label"
+msgstr "Yahoo Messenger"
+
+msgid "Location label"
+msgstr "Location"
+
+msgid "Signature label"
+msgstr "Signature"
+
+msgid "Admin note label"
+msgstr "Admin note"
+
+msgid "Posts more than label"
+msgstr "Number of posts greater than"
+
+msgid "Posts less than label"
+msgstr "Number of posts less than"
+
+msgid "Last post after label"
+msgstr "Last post is after"
+
+msgid "Date help"
+msgstr "(yyyy-mm-dd hh:mm:ss)"
+
+msgid "Last post before label"
+msgstr "Last post is before"
+
+msgid "Last visit after label"
+msgstr "Last visit is after"
+
+msgid "Last visit before label"
+msgstr "Last visit is before"
+
+msgid "Registered after label"
+msgstr "Registered after"
+
+msgid "Registered before label"
+msgstr "Registered before"
+
+msgid "Order by label"
+msgstr "Order by"
+
+msgid "Order by username"
+msgstr "Username"
+
+msgid "Order by e-mail"
+msgstr "Email"
+
+msgid "Order by posts"
+msgstr "Number of posts"
+
+msgid "Order by last post"
+msgstr "Last post"
+
+msgid "Order by last visit"
+msgstr "Last visit"
+
+msgid "Order by registered"
+msgstr "Registered"
+
+msgid "Ascending"
+msgstr "Ascending"
+
+msgid "Descending"
+msgstr "Descending"
+
+msgid "User group label"
+msgstr "User group"
+
+msgid "All groups"
+msgstr "All groups"
+
+msgid "Unverified users"
+msgstr "Unverified users"
+
+msgid "Submit search"
+msgstr "Submit search"
+
+msgid "IP search head"
+msgstr "IP search"
+
+msgid "IP search subhead"
+msgstr "Enter IP to search for"
+
+msgid "IP address label"
+msgstr "IP address"
+
+msgid "IP address help"
+msgstr "The IP address to search for in the post database."
+
+msgid "Find IP address"
+msgstr "Find IP address"
+
+msgid "Results head"
+msgstr "Search Results"
+
+msgid "Results username head"
+msgstr "Username"
+
+msgid "Results e-mail head"
+msgstr "Email"
+
+msgid "Results title head"
+msgstr "Title/Status"
+
+msgid "Results posts head"
+msgstr "Posts"
+
+msgid "Results admin note head"
+msgstr "Admin note"
+
+msgid "Results actions head"
+msgstr "Actions"
+
+msgid "Results IP address head"
+msgstr "IP address"
+
+msgid "Results last used head"
+msgstr "Last used"
+
+msgid "Results times found head"
+msgstr "Times found"
+
+msgid "Results action head"
+msgstr "Action"
+
+msgid "Results find more link"
+msgstr "Find more users for this ip"
+
+msgid "Results no posts found"
+msgstr "There are currently no posts by that user in the forum."
+
+msgid "Select"
+msgstr "Select"
+
+msgid "Select all"
+msgstr "Select all"
+
+msgid "Unselect all"
+msgstr "Unselect all"
+
+msgid "Ban"
+msgstr "Ban"
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "Change group"
+msgstr "Change group"
+
+msgid "Bad IP message"
+msgstr "The supplied IP address is not correctly formatted."
+
+msgid "Results view IP link"
+msgstr "View IP stats"
+
+msgid "Results show posts link"
+msgstr "Show posts"
+
+msgid "Results guest"
+msgstr "Guest"
+
+msgid "Results no IP found"
+msgstr "The supplied IP address could not be found in the database."
+
+msgid "No match"
+msgstr "No match"
diff --git a/model/admin/bans.php b/model/admin/bans.php
index 52ba33a9..c0a85f60 100644
--- a/model/admin/bans.php
+++ b/model/admin/bans.php
@@ -24,8 +24,6 @@ public function __construct()
  
     public function add_ban_info($id = null)
     {
-        global $lang_admin_bans;
-
         $ban = array();
 
         // If the ID of the user to ban was provided through GET (a link from profile.php)
@@ -45,7 +43,7 @@ public function add_ban_info($id = null)
                 $ban['ban_user'] = $result['username'];
                 $ban['email'] = $result['email'];
             } else {
-                message($lang_admin_bans['No user ID message']);
+                message(__('No user ID message'));
             }
         } else {
             // Otherwise the username is in POST
@@ -64,7 +62,7 @@ public function add_ban_info($id = null)
                     $ban['ban_user'] = $result['username'];
                     $ban['email'] = $result['email'];
                 } else {
-                    message($lang_admin_bans['No user message']);
+                    message(__('No user message'));
                 }
             }
         }
@@ -72,14 +70,14 @@ public function add_ban_info($id = null)
         // Make sure we're not banning an admin or moderator
         if (isset($group_id)) {
             if ($group_id == FEATHER_ADMIN) {
-                message(sprintf($lang_admin_bans['User is admin message'], feather_escape($ban['ban_user'])));
+                message(sprintf(__('User is admin message'), feather_escape($ban['ban_user'])));
             }
 
             $is_moderator_group = DB::for_table('groups')->where('g_id', $group_id)
                                         ->find_one_col('g_moderator');
 
             if ($is_moderator_group) {
-                message(sprintf($lang_admin_bans['User is mod message'], feather_escape($ban['ban_user'])));
+                message(sprintf(__('User is mod message'), feather_escape($ban['ban_user'])));
             }
         }
 
@@ -102,8 +100,6 @@ public function add_ban_info($id = null)
 
     public function edit_ban_info($id)
     {
-
-
         $ban = array();
 
         $ban['id'] = $id;
@@ -133,8 +129,6 @@ public function edit_ban_info($id)
 
     public function insert_ban()
     {
-        global $lang_admin_bans;
-
         $ban_user = feather_trim($this->request->post('ban_user'));
         $ban_ip = feather_trim($this->request->post('ban_ip'));
         $ban_email = strtolower(feather_trim($this->request->post('ban_email')));
@@ -142,9 +136,9 @@ public function insert_ban()
         $ban_expire = feather_trim($this->request->post('ban_expire'));
 
         if ($ban_user == '' && $ban_ip == '' && $ban_email == '') {
-            message($lang_admin_bans['Must enter message']);
+            message(__('Must enter message'));
         } elseif (strtolower($ban_user) == 'guest') {
-            message($lang_admin_bans['Cannot ban guest message']);
+            message(__('Cannot ban guest message'));
         }
 
         // Make sure we're not banning an admin or moderator
@@ -155,14 +149,14 @@ public function insert_ban()
 
             if ($group_id) {
                 if ($group_id == FEATHER_ADMIN) {
-                    message(sprintf($lang_admin_bans['User is admin message'], feather_escape($ban_user)));
+                    message(sprintf(__('User is admin message'), feather_escape($ban_user)));
                 }
 
                 $is_moderator_group = DB::for_table('groups')->where('g_id', $group_id)
                                             ->find_one_col('g_moderator');
 
                 if ($is_moderator_group) {
-                    message(sprintf($lang_admin_bans['User is mod message'], feather_escape($ban_user)));
+                    message(sprintf(__('User is mod message'), feather_escape($ban_user)));
                 }
             }
         }
@@ -181,7 +175,7 @@ public function insert_ban()
                         $octets[$c] = ltrim($octets[$c], "0");
 
                         if ($c > 7 || (!empty($octets[$c]) && !ctype_xdigit($octets[$c])) || intval($octets[$c], 16) > 65535) {
-                            message($lang_admin_bans['Invalid IP message']);
+                            message(__('Invalid IP message'));
                         }
                     }
 
@@ -194,7 +188,7 @@ public function insert_ban()
                         $octets[$c] = (strlen($octets[$c]) > 1) ? ltrim($octets[$c], "0") : $octets[$c];
 
                         if ($c > 3 || preg_match('%[^0-9]%', $octets[$c]) || intval($octets[$c]) > 255) {
-                            message($lang_admin_bans['Invalid IP message']);
+                            message(__('Invalid IP message'));
                         }
                     }
 
@@ -210,7 +204,7 @@ public function insert_ban()
 
         if ($ban_email != '' && !is_valid_email($ban_email)) {
             if (!preg_match('%^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,63})$%', $ban_email)) {
-                message($lang_admin_bans['Invalid e-mail message']);
+                message(__('Invalid e-mail message'));
             }
         }
 
@@ -218,14 +212,14 @@ public function insert_ban()
             $ban_expire = strtotime($ban_expire.' GMT');
 
             if ($ban_expire == -1 || !$ban_expire) {
-                message($lang_admin_bans['Invalid date message'].' '.$lang_admin_bans['Invalid date reasons']);
+                message(__('Invalid date message').' '.__('Invalid date reasons'));
             }
 
             $diff = ($this->user->timezone + $this->user->dst) * 3600;
             $ban_expire -= $diff;
 
             if ($ban_expire <= time()) {
-                message($lang_admin_bans['Invalid date message'].' '.$lang_admin_bans['Invalid date reasons']);
+                message(__('Invalid date message').' '.__('Invalid date reasons'));
             }
         } else {
             $ban_expire = 'NULL';
@@ -267,13 +261,11 @@ public function insert_ban()
 
         generate_bans_cache();
 
-        redirect(get_link('admin/bans/'), $lang_admin_bans['Ban edited redirect']);
+        redirect(get_link('admin/bans/'), __('Ban edited redirect'));
     }
 
     public function remove_ban($ban_id)
     {
-        global $lang_admin_bans;
-
         DB::for_table('bans')->where('id', $ban_id)
                     ->find_one()
                     ->delete();
@@ -285,13 +277,11 @@ public function remove_ban($ban_id)
 
         generate_bans_cache();
 
-        redirect(get_link('admin/bans/'), $lang_admin_bans['Ban removed redirect']);
+        redirect(get_link('admin/bans/'), __('Ban removed redirect'));
     }
 
     public function find_ban($start_from = false)
     {
-        global $lang_admin_bans;
-
         $ban_info = array();
 
         // trim() all elements in $form
@@ -315,7 +305,7 @@ public function find_ban($start_from = false)
 
             $expire_after = strtotime($expire_after);
             if ($expire_after === false || $expire_after == -1) {
-                message($lang_admin_bans['Invalid date message']);
+                message(__('Invalid date message'));
             }
 
             $result = $result->where_gt('b.expire', $expire_after);
@@ -325,7 +315,7 @@ public function find_ban($start_from = false)
 
             $expire_before = strtotime($expire_before);
             if ($expire_before === false || $expire_before == -1) {
-                message($lang_admin_bans['Invalid date message']);
+                message(__('Invalid date message'));
             }
 
             $result = $result->where_lt('b.expire', $expire_before);
diff --git a/model/admin/categories.php b/model/admin/categories.php
index 1232901c..7e8010c1 100644
--- a/model/admin/categories.php
+++ b/model/admin/categories.php
@@ -45,8 +45,6 @@ public function update_category(array $category)
 
     public function delete_category($cat_to_delete)
     {
-        global $lang_admin_categories;
-
         $forums_in_cat = DB::for_table('forums')
                             ->select('id')
                             ->where('cat_id', $cat_to_delete)
diff --git a/model/admin/censoring.php b/model/admin/censoring.php
index b6f5ddd4..473769ca 100644
--- a/model/admin/censoring.php
+++ b/model/admin/censoring.php
@@ -24,13 +24,11 @@ public function __construct()
 
     public function add_word()
     {
-        global $lang_admin_censoring;
-
         $search_for = feather_trim($this->request->post('new_search_for'));
         $replace_with = feather_trim($this->request->post('new_replace_with'));
 
         if ($search_for == '') {
-            message($lang_admin_censoring['Must enter word message']);
+            message(__('Must enter word message'));
         }
 
         $set_search_word = array('search_for' => $search_for,
@@ -48,20 +46,18 @@ public function add_word()
 
         generate_censoring_cache();
 
-        redirect(get_link('admin/censoring/'), $lang_admin_censoring['Word added redirect']);
+        redirect(get_link('admin/censoring/'), __('Word added redirect'));
     }
 
     public function update_word()
     {
-        global $lang_admin_censoring;
-
         $id = intval(key($this->request->post('update')));
 
         $search_for = feather_trim($this->request->post('search_for')[$id]);
         $replace_with = feather_trim($this->request->post('replace_with')[$id]);
 
         if ($search_for == '') {
-            message($lang_admin_censoring['Must enter word message']);
+            message(__('Must enter word message'));
         }
 
         $set_search_word = array('search_for' => $search_for,
@@ -79,13 +75,11 @@ public function update_word()
 
         generate_censoring_cache();
 
-        redirect(get_link('admin/censoring/'), $lang_admin_censoring['Word updated redirect']);
+        redirect(get_link('admin/censoring/'), __('Word updated redirect'));
     }
 
     public function remove_word()
     {
-        global $lang_admin_censoring;
-
         $id = intval(key($this->request->post('remove')));
 
         DB::for_table('censoring')
@@ -99,7 +93,7 @@ public function remove_word()
 
         generate_censoring_cache();
 
-        redirect(get_link('admin/censoring/'),  $lang_admin_censoring['Word removed redirect']);
+        redirect(get_link('admin/censoring/'),  __('Word removed redirect'));
     }
 
     public function get_words()
diff --git a/model/admin/groups.php b/model/admin/groups.php
index 6ce1b905..eb0687b2 100644
--- a/model/admin/groups.php
+++ b/model/admin/groups.php
@@ -35,8 +35,6 @@ public function fetch_groups()
 
     public function info_add_group($groups, $id)
     {
-
-
         $group = array();
 
         if ($this->request->post('add_group')) {
@@ -96,8 +94,6 @@ public function get_group_list_delete($group_id)
 
     public function add_edit_group($groups)
     {
-        global $lang_admin_groups;
-
         if ($this->request->post('group_id')) {
             $group_id = $this->request->post('group_id');
         } else {
@@ -144,7 +140,7 @@ public function add_edit_group($groups)
         $report_flood = ($this->request->post('report_flood') >= 0) ? $this->request->post('report_flood') : '0';
 
         if ($title == '') {
-            message($lang_admin_groups['Must enter title message']);
+            message(__('Must enter title message'));
         }
 
         $user_title = ($user_title != '') ? $user_title : 'NULL';
@@ -181,7 +177,7 @@ public function add_edit_group($groups)
         if ($this->request->post('mode') == 'add') {
             $title_exists = DB::for_table('groups')->where('g_title', $title)->find_one();
             if ($title_exists) {
-                message(sprintf($lang_admin_groups['Title already exists message'], feather_escape($title)));
+                message(sprintf(__('Title already exists message'), feather_escape($title)));
             }
 
             DB::for_table('groups')
@@ -213,7 +209,7 @@ public function add_edit_group($groups)
         } else {
             $title_exists = DB::for_table('groups')->where('g_title', $title)->where_not_equal('g_id', $this->request->post('group_id'))->find_one();
             if ($title_exists) {
-                message(sprintf($lang_admin_groups['Title already exists message'], feather_escape($title)));
+                message(sprintf(__('Title already exists message'), feather_escape($title)));
             }
             DB::for_table('groups')
                     ->find_one($this->request->post('group_id'))
@@ -238,16 +234,14 @@ public function add_edit_group($groups)
         generate_quickjump_cache($group_id);
 
         if ($this->request->post('mode') == 'edit') {
-            redirect(get_link('admin/groups/'), $lang_admin_groups['Group edited redirect']);
+            redirect(get_link('admin/groups/'), __('Group edited redirect'));
         } else {
-            redirect(get_link('admin/groups/'), $lang_admin_groups['Group added redirect']);
+            redirect(get_link('admin/groups/'), __('Group added redirect'));
         }
     }
 
     public function set_default_group($groups)
     {
-        global $lang_admin_groups;
-
         $group_id = intval($this->request->post('default_group'));
 
         // Make sure it's not the admin or guest groups
@@ -270,7 +264,7 @@ public function set_default_group($groups)
 
         generate_config_cache();
 
-        redirect(get_link('admin/groups/'), $lang_admin_groups['Default group redirect']);
+        redirect(get_link('admin/groups/'), __('Default group redirect'));
     }
 
     public function check_members($group_id)
@@ -289,8 +283,6 @@ public function check_members($group_id)
 
     public function delete_group($group_id)
     {
-        global $lang_admin_groups;
-
         if ($this->request->post('del_group')) {
             $move_to_group = intval($this->request->post('move_to_group'));
             DB::for_table('users')->where('group_id', $group_id)
@@ -309,7 +301,7 @@ public function delete_group($group_id)
         DB::for_table('groups')->where('g_promote_next_group', $group_id)
                                                    ->update_many('g_promote_next_group', 0);
 
-        redirect(get_link('admin/groups/'), $lang_admin_groups['Group removed redirect']);
+        redirect(get_link('admin/groups/'), __('Group removed redirect'));
     }
 
     public function get_group_title($group_id)
diff --git a/model/admin/maintenance.php b/model/admin/maintenance.php
index be2e9541..b8534959 100644
--- a/model/admin/maintenance.php
+++ b/model/admin/maintenance.php
@@ -24,16 +24,11 @@ public function __construct()
  
     public function rebuild()
     {
-        global $lang_admin_maintenance;
-
-        // Get Slim current session
-        $feather = \Slim\Slim::getInstance();
-
         $per_page = $this->request->get('i_per_page') ? intval($this->request->get('i_per_page')) : 0;
 
         // Check per page is > 0
         if ($per_page < 1) {
-            message($lang_admin_maintenance['Posts must be integer message']);
+            message(__('Posts must be integer message'));
         }
 
         @set_time_limit(0);
@@ -44,7 +39,7 @@ public function rebuild()
             DB::for_table('search_matches')->raw_execute('TRUNCATE '.$this->feather->prefix.'search_matches');
 
             // Reset the sequence for the search words (not needed for SQLite)
-            switch ($feather->forum_settings['db_type']) {
+            switch ($this->feather->forum_settings['db_type']) {
                 case 'mysql':
                 case 'mysqli':
                 case 'mysql_innodb':
@@ -60,8 +55,6 @@ public function rebuild()
 
     public function get_query_str()
     {
-        global $lang_admin_maintenance;
-
         $query_str = '';
 
         $per_page = $this->request->get('i_per_page') ? intval($this->request->get('i_per_page')) : 0;
@@ -82,7 +75,7 @@ public function get_query_str()
 
         $end_at = 0;
         foreach ($result as $cur_item) {
-            echo '<p><span>'.sprintf($lang_admin_maintenance['Processing post'], $cur_item['id']).'</span></p>'."\n";
+            echo '<p><span>'.sprintf(__('Processing post'), $cur_item['id']).'</span></p>'."\n";
 
             if ($cur_item['id'] == $cur_item['first_post_id']) {
                 update_search_index('post', $cur_item['id'], $cur_item['message'], $cur_item['subject']);
@@ -168,8 +161,6 @@ public function prune($forum_id, $prune_sticky, $prune_date)
 
     public function prune_comply($prune_from, $prune_sticky)
     {
-        global $lang_admin_maintenance;
-
         $prune_days = intval($this->request->post('prune_days'));
         $prune_date = ($prune_days) ? time() - ($prune_days * 86400) : -1;
 
@@ -209,18 +200,16 @@ public function prune_comply($prune_from, $prune_sticky)
                     ->delete_many();
         }
 
-        redirect(get_link('admin/maintenance/'), $lang_admin_maintenance['Posts pruned redirect']);
+        redirect(get_link('admin/maintenance/'), __('Posts pruned redirect'));
     }
 
     public function get_info_prune($prune_sticky, $prune_from)
     {
-        global $lang_admin_maintenance;
-
         $prune = array();
 
         $prune['days'] = feather_trim($this->request->post('req_prune_days'));
         if ($prune['days'] == '' || preg_match('%[^0-9]%', $prune['days'])) {
-            message($lang_admin_maintenance['Days must be integer message']);
+            message(__('Days must be integer message'));
         }
 
         $prune['date'] = time() - ($prune['days'] * 86400);
@@ -241,13 +230,13 @@ public function get_info_prune($prune_sticky, $prune_from)
                         ->find_one_col('forum_name');
             $prune['forum'] = '"'.feather_escape($forum).'"';
         } else {
-            $prune['forum'] = $lang_admin_maintenance['All forums'];
+            $prune['forum'] = __('All forums');
         }
 
         $prune['num_topics'] = $query->count('id');
 
         if (!$prune['num_topics']) {
-            message(sprintf($lang_admin_maintenance['No old topics message'], $prune['days']));
+            message(sprintf(__('No old topics message'), $prune['days']));
         }
 
         return $prune;
diff --git a/model/admin/options.php b/model/admin/options.php
index c0cdc83e..a92ade18 100644
--- a/model/admin/options.php
+++ b/model/admin/options.php
@@ -24,10 +24,6 @@ public function __construct()
  
     public function update_options()
     {
-        global $lang_admin_options;
-
-        
-
         $form = array(
             'board_title'            => feather_trim($this->request->post('form_board_title')),
             'board_desc'            => feather_trim($this->request->post('form_board_desc')),
@@ -91,7 +87,7 @@ public function update_options()
         );
 
         if ($form['board_title'] == '') {
-            message($lang_admin_options['Must enter title message']);
+            message(__('Must enter title message'));
         }
 
         // Make sure base_url doesn't end with a slash
@@ -102,7 +98,7 @@ public function update_options()
         // Convert IDN to Punycode if needed
         if (preg_match('/[^\x00-\x7F]/', $form['base_url'])) {
             if (!function_exists('idn_to_ascii')) {
-                message($lang_admin_options['Base URL problem']);
+                message(__('Base URL problem'));
             } else {
                 $form['base_url'] = idn_to_ascii($form['base_url']);
             }
@@ -130,11 +126,11 @@ public function update_options()
         require FEATHER_ROOT.'include/email.php';
 
         if (!is_valid_email($form['admin_email'])) {
-            message($lang_admin_options['Invalid e-mail message']);
+            message(__('Invalid e-mail message'));
         }
 
         if (!is_valid_email($form['webmaster_email'])) {
-            message($lang_admin_options['Invalid webmaster e-mail message']);
+            message(__('Invalid webmaster e-mail message'));
         }
 
         if ($form['mailing_list'] != '') {
@@ -158,28 +154,28 @@ public function update_options()
             if ($smtp_pass1 == $smtp_pass2) {
                 $form['smtp_pass'] = $smtp_pass1;
             } else {
-                message($lang_admin_options['SMTP passwords did not match']);
+                message(__('SMTP passwords did not match'));
             }
         }
 
         if ($form['announcement_message'] != '') {
             $form['announcement_message'] = feather_linebreaks($form['announcement_message']);
         } else {
-            $form['announcement_message'] = $lang_admin_options['Enter announcement here'];
+            $form['announcement_message'] = __('Enter announcement here');
             $form['announcement'] = '0';
         }
 
         if ($form['rules_message'] != '') {
             $form['rules_message'] = feather_linebreaks($form['rules_message']);
         } else {
-            $form['rules_message'] = $lang_admin_options['Enter rules here'];
+            $form['rules_message'] = __('Enter rules here');
             $form['rules'] = '0';
         }
 
         if ($form['maintenance_message'] != '') {
             $form['maintenance_message'] = feather_linebreaks($form['maintenance_message']);
         } else {
-            $form['maintenance_message'] = $lang_admin_options['Default maintenance message'];
+            $form['maintenance_message'] = __('Default maintenance message');
             $form['maintenance'] = '0';
         }
 
@@ -213,7 +209,7 @@ public function update_options()
         }
 
         if ($form['timeout_online'] >= $form['timeout_visit']) {
-            message($lang_admin_options['Timeout error message']);
+            message(__('Timeout error message'));
         }
 
         foreach ($form as $key => $input) {
@@ -237,12 +233,11 @@ public function update_options()
         generate_config_cache();
         clear_feed_cache();
 
-        redirect(get_link('admin/options/'), $lang_admin_options['Options updated redirect']);
+        redirect(get_link('admin/options/'), __('Options updated redirect'));
     }
 
     public function get_styles()
     {
-        
         $styles = forum_list_styles();
         
         $output = '';
@@ -260,14 +255,12 @@ public function get_styles()
 
     public function get_times()
     {
-        global $lang_admin_options;
-
         $times = array(5, 15, 30, 60);
         
         $output = '';
 
         foreach ($times as $time) {
-            $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$time.'"'.($this->config['o_feed_ttl'] == $time ? ' selected="selected"' : '').'>'.sprintf($lang_admin_options['Minutes'], $time).'</option>'."\n";
+            $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$time.'"'.($this->config['o_feed_ttl'] == $time ? ' selected="selected"' : '').'>'.sprintf(__('Minutes'), $time).'</option>'."\n";
         }
         
         return $output;
diff --git a/model/admin/permissions.php b/model/admin/permissions.php
index 77533048..2666f587 100644
--- a/model/admin/permissions.php
+++ b/model/admin/permissions.php
@@ -24,8 +24,6 @@ public function __construct()
  
     public function update_permissions()
     {
-        global $lang_admin_permissions;
-
         $form = array_map('intval', $this->request->post('form'));
 
         foreach ($form as $key => $input) {
@@ -48,6 +46,6 @@ public function update_permissions()
 
         generate_config_cache();
 
-        redirect(get_link('admin/permissions/'), $lang_admin_permissions['Perms updated redirect']);
+        redirect(get_link('admin/permissions/'), __('Perms updated redirect'));
     }
 }
\ No newline at end of file
diff --git a/model/admin/reports.php b/model/admin/reports.php
index 248d5e03..a6a653a2 100644
--- a/model/admin/reports.php
+++ b/model/admin/reports.php
@@ -24,8 +24,6 @@ public function __construct()
 
     public function zap_report()
     {
-        global $lang_admin_reports;
-
         $zap_id = intval(key($this->request->post('zap_id')));
 
         $result = DB::for_table('reports')
@@ -56,13 +54,11 @@ public function zap_report()
                 ->delete_many();
         }
 
-        redirect(get_link('admin/reports/'), $lang_admin_reports['Report zapped redirect']);
+        redirect(get_link('admin/reports/'), __('Report zapped redirect'));
     }
 
     public function get_reports()
     {
-        global $lang_admin_reports;
-
         $reports = array();
         $select_reports = array('r.id', 'r.topic_id', 'r.forum_id', 'r.reported_by', 'r.created', 'r.message', 'pid' => 'p.id', 't.subject', 'f.forum_name', 'reporter' => 'u.username');
         $reports = DB::for_table('reports')
diff --git a/model/admin/statistics.php b/model/admin/statistics.php
index 9fb6d658..a2246741 100644
--- a/model/admin/statistics.php
+++ b/model/admin/statistics.php
@@ -24,8 +24,6 @@ public function __construct()
  
     public function get_server_load()
     {
-        global $lang_admin_index;
-
         if (@file_exists('/proc/loadavg') && is_readable('/proc/loadavg')) {
             // We use @ just in case
             $fh = @fopen('/proc/loadavg', 'r');
@@ -40,11 +38,11 @@ public function get_server_load()
             }
 
             $load_averages = @explode(' ', $load_averages);
-            $server_load = isset($load_averages[2]) ? $load_averages[0].' '.$load_averages[1].' '.$load_averages[2] : $lang_admin_index['Not available'];
+            $server_load = isset($load_averages[2]) ? $load_averages[0].' '.$load_averages[1].' '.$load_averages[2] : __('Not available');
         } elseif (!in_array(PHP_OS, array('WINNT', 'WIN32')) && preg_match('%averages?: ([0-9\.]+),?\s+([0-9\.]+),?\s+([0-9\.]+)%i', @exec('uptime'), $load_averages)) {
             $server_load = $load_averages[1].' '.$load_averages[2].' '.$load_averages[3];
         } else {
-            $server_load = $lang_admin_index['Not available'];
+            $server_load = __('Not available');
         }
 
         return $server_load;
@@ -62,10 +60,7 @@ public function get_total_size()
     {
         $total = array();
 
-        // Get Slim current session
-        $feather = \Slim\Slim::getInstance();
-
-        if ($feather->forum_settings['db_type'] == 'mysql' || $feather->forum_settings['db_type'] == 'mysqli' || $feather->forum_settings['db_type'] == 'mysql_innodb' || $feather->forum_settings['db_type'] == 'mysqli_innodb') {
+        if ($this->feather->forum_settings['db_type'] == 'mysql' || $this->feather->forum_settings['db_type'] == 'mysqli' || $this->feather->forum_settings['db_type'] == 'mysql_innodb' || $this->feather->forum_settings['db_type'] == 'mysqli_innodb') {
             // Calculate total db size/row count
             $result = DB::for_table('users')->raw_query('SHOW TABLE STATUS LIKE \''.$this->feather->prefix.'%\'')->find_many();
 
@@ -83,22 +78,20 @@ public function get_total_size()
 
     public function get_php_accelerator()
     {
-        global $lang_admin_index;
-
         if (function_exists('mmcache')) {
-            $php_accelerator = '<a href="http://'.$lang_admin_index['Turck MMCache link'].'">'.$lang_admin_index['Turck MMCache'].'</a>';
+            $php_accelerator = '<a href="http://'.__('Turck MMCache link').'">'.__('Turck MMCache').'</a>';
         } elseif (isset($_PHPA)) {
-            $php_accelerator = '<a href="http://'.$lang_admin_index['ionCube PHP Accelerator link'].'">'.$lang_admin_index['ionCube PHP Accelerator'].'</a>';
+            $php_accelerator = '<a href="http://'.__('ionCube PHP Accelerator link').'">'.__('ionCube PHP Accelerator').'</a>';
         } elseif (ini_get('apc.enabled')) {
-            $php_accelerator ='<a href="http://'.$lang_admin_index['Alternative PHP Cache (APC) link'].'">'.$lang_admin_index['Alternative PHP Cache (APC)'].'</a>';
+            $php_accelerator ='<a href="http://'.__('Alternative PHP Cache (APC) link').'">'.__('Alternative PHP Cache (APC)').'</a>';
         } elseif (ini_get('zend_optimizer.optimization_level')) {
-            $php_accelerator = '<a href="http://'.$lang_admin_index['Zend Optimizer link'].'">'.$lang_admin_index['Zend Optimizer'].'</a>';
+            $php_accelerator = '<a href="http://'.__('Zend Optimizer link').'">'.__('Zend Optimizer').'</a>';
         } elseif (ini_get('eaccelerator.enable')) {
-            $php_accelerator = '<a href="http://'.$lang_admin_index['eAccelerator link'].'">'.$lang_admin_index['eAccelerator'].'</a>';
+            $php_accelerator = '<a href="http://'.__('eAccelerator link').'">'.__('eAccelerator').'</a>';
         } elseif (ini_get('xcache.cacher')) {
-            $php_accelerator = '<a href="http://'.$lang_admin_index['XCache link'].'">'.$lang_admin_index['XCache'].'</a>';
+            $php_accelerator = '<a href="http://'.__('XCache link').'">'.__('XCache').'</a>';
         } else {
-            $php_accelerator = $lang_admin_index['NA'];
+            $php_accelerator = __('NA');
         }
 
         return $php_accelerator;
diff --git a/model/admin/users.php b/model/admin/users.php
index 7ff23b57..6f0daef7 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -115,8 +115,6 @@ public function get_info_poster($ip, $start_from)
 
     public function move_users()
     {
-        global $lang_admin_users;
-
         $move = array();
 
         if ($this->request->post('users')) {
@@ -130,7 +128,7 @@ public function move_users()
         }
 
         if (empty($move['user_ids'])) {
-            message($lang_admin_users['No users selected']);
+            message(__('No users selected'));
         }
 
         // Are we trying to batch move any admins?
@@ -138,7 +136,7 @@ public function move_users()
                         ->where('group_id', FEATHER_ADMIN)
                         ->find_one();
         if ($is_admin) {
-            message($lang_admin_users['No move admins message']);
+            message(__('No move admins message'));
         }
 
         // Fetch all user groups
@@ -155,7 +153,7 @@ public function move_users()
         }
 
         if ($this->request->post('move_users_comply')) {
-            $new_group = $this->request->post('new_group') && isset($move['all_groups'][$this->request->post('new_group')]) ? $this->request->post('new_group') : message($lang_admin_users['Invalid group message']);
+            $new_group = $this->request->post('new_group') && isset($move['all_groups'][$this->request->post('new_group')]) ? $this->request->post('new_group') : message(__('Invalid group message'));
 
             // Is the new group a moderator group?
             $new_group_mod = DB::for_table('groups')->where('g_id', $new_group)
@@ -219,7 +217,7 @@ public function move_users()
             DB::for_table('users')->where_in('id', $move['user_ids'])
                                                       ->update_many('group_id', $new_group);
 
-            redirect(get_link('admin/users/'), $lang_admin_users['Users move redirect']);
+            redirect(get_link('admin/users/'), __('Users move redirect'));
         }
 
         return $move;
@@ -227,8 +225,6 @@ public function move_users()
 
     public function delete_users()
     {
-        global $lang_admin_users;
-
         if ($this->request->post('users')) {
             $user_ids = is_array($this->request->post('users')) ? array_keys($this->request->post('users')) : explode(',', $this->request->post('users'));
             $user_ids = array_map('intval', $user_ids);
@@ -240,7 +236,7 @@ public function delete_users()
         }
 
         if (empty($user_ids)) {
-            message($lang_admin_users['No users selected']);
+            message(__('No users selected'));
         }
 
         // Are we trying to delete any admins?
@@ -248,7 +244,7 @@ public function delete_users()
             ->where('group_id', FEATHER_ADMIN)
             ->find_one();
         if ($is_admin) {
-            message($lang_admin_users['No delete admins message']);
+            message(__('No delete admins message'));
         }
 
         if ($this->request->post('delete_users_comply')) {
@@ -376,7 +372,7 @@ public function delete_users()
 
             generate_users_info_cache();
 
-            redirect(get_link('admin/users/'), $lang_admin_users['Users delete redirect']);
+            redirect(get_link('admin/users/'), __('Users delete redirect'));
         }
 
         return $user_ids;
@@ -384,8 +380,6 @@ public function delete_users()
 
     public function ban_users()
     {
-        global $lang_admin_users;
-
         if ($this->request->post('users')) {
             $user_ids = is_array($this->request->post('users')) ? array_keys($this->request->post('users')) : explode(',', $this->request->post('users'));
             $user_ids = array_map('intval', $user_ids);
@@ -397,7 +391,7 @@ public function ban_users()
         }
 
         if (empty($user_ids)) {
-            message($lang_admin_users['No users selected']);
+            message(__('No users selected'));
         }
 
         // Are we trying to ban any admins?
@@ -405,7 +399,7 @@ public function ban_users()
             ->where('group_id', FEATHER_ADMIN)
             ->find_one();
         if ($is_admin) {
-            message($lang_admin_users['No ban admins message']);
+            message(__('No ban admins message'));
         }
 
         // Also, we cannot ban moderators
@@ -415,7 +409,7 @@ public function ban_users()
             ->where_in('u.id', $user_ids)
             ->find_one();
         if ($is_mod) {
-            message($lang_admin_users['No ban mods message']);
+            message(__('No ban mods message'));
         }
 
         if ($this->request->post('ban_users_comply')) {
@@ -427,14 +421,14 @@ public function ban_users()
                 $ban_expire = strtotime($ban_expire . ' GMT');
 
                 if ($ban_expire == -1 || !$ban_expire) {
-                    message($lang_admin_users['Invalid date message'] . ' ' . $lang_admin_users['Invalid date reasons']);
+                    message(__('Invalid date message') . ' ' . __('Invalid date reasons'));
                 }
 
                 $diff = ($this->user->timezone + $this->user->dst) * 3600;
                 $ban_expire -= $diff;
 
                 if ($ban_expire <= time()) {
-                    message($lang_admin_users['Invalid date message'] . ' ' . $lang_admin_users['Invalid date reasons']);
+                    message(__('Invalid date message') . ' ' . __('Invalid date reasons'));
                 }
             } else {
                 $ban_expire = 'NULL';
@@ -491,7 +485,7 @@ public function ban_users()
 
                 generate_bans_cache();
 
-                redirect(get_link('admin/users/'), $lang_admin_users['Users banned redirect']);
+                redirect(get_link('admin/users/'), __('Users banned redirect'));
             }
         }
         return $user_ids;
@@ -499,11 +493,6 @@ public function ban_users()
 
     public function get_user_search()
     {
-        global $lang_admin_users;
-
-        // Get Slim current session
-        $feather = \Slim\Slim::getInstance();
-
         $form = $this->request->get('form') ? $this->request->get('form') : array();
 
         $search = array();
@@ -528,7 +517,7 @@ public function get_user_search()
         $search['query_str'][] = 'user_group='.$user_group;
 
         if (preg_match('%[^0-9]%', $posts_greater.$posts_less)) {
-            message($lang_admin_users['Non numeric message']);
+            message(__('Non numeric message'));
         }
 
         $search['conditions'] = array();
@@ -539,7 +528,7 @@ public function get_user_search()
 
             $last_post_after = strtotime($last_post_after);
             if ($last_post_after === false || $last_post_after == -1) {
-                message($lang_admin_users['Invalid date time message']);
+                message(__('Invalid date time message'));
             }
 
             $search['conditions'][] = 'u.last_post>'.$last_post_after;
@@ -549,7 +538,7 @@ public function get_user_search()
 
             $last_post_before = strtotime($last_post_before);
             if ($last_post_before === false || $last_post_before == -1) {
-                message($lang_admin_users['Invalid date time message']);
+                message(__('Invalid date time message'));
             }
 
             $search['conditions'][] = 'u.last_post<'.$last_post_before;
@@ -559,7 +548,7 @@ public function get_user_search()
 
             $last_visit_after = strtotime($last_visit_after);
             if ($last_visit_after === false || $last_visit_after == -1) {
-                message($lang_admin_users['Invalid date time message']);
+                message(__('Invalid date time message'));
             }
 
             $search['conditions'][] = 'u.last_visit>'.$last_visit_after;
@@ -569,7 +558,7 @@ public function get_user_search()
 
             $last_visit_before = strtotime($last_visit_before);
             if ($last_visit_before === false || $last_visit_before == -1) {
-                message($lang_admin_users['Invalid date time message']);
+                message(__('Invalid date time message'));
             }
 
             $search['conditions'][] = 'u.last_visit<'.$last_visit_before;
@@ -579,7 +568,7 @@ public function get_user_search()
 
             $registered_after = strtotime($registered_after);
             if ($registered_after === false || $registered_after == -1) {
-                message($lang_admin_users['Invalid date time message']);
+                message(__('Invalid date time message'));
             }
 
             $search['conditions'][] = 'u.registered>'.$registered_after;
@@ -589,13 +578,13 @@ public function get_user_search()
 
             $registered_before = strtotime($registered_before);
             if ($registered_before === false || $registered_before == -1) {
-                message($lang_admin_users['Invalid date time message']);
+                message(__('Invalid date time message'));
             }
 
             $search['conditions'][] = 'u.registered<'.$registered_before;
         }
 
-        $like_command = ($feather->forum_settings['db_type'] == 'pgsql') ? 'ILIKE' : 'LIKE';
+        $like_command = ($this->feather->forum_settings['db_type'] == 'pgsql') ? 'ILIKE' : 'LIKE';
         foreach ($form as $key => $input) {
             if ($input != '' && in_array($key, array('username', 'email', 'title', 'realname', 'url', 'jabber', 'icq', 'msn', 'aim', 'yahoo', 'location', 'signature', 'admin_note'))) {
                 $search['conditions'][] = 'u.'.str_replace("'","''",$key).' '.$like_command.' \''.str_replace("'","''",str_replace('*', '%', $input)).'\'';
@@ -621,8 +610,6 @@ public function get_user_search()
 
     public function print_users($conditions, $order_by, $direction, $start_from)
     {
-        global $lang_admin_users;
-
         $user_data = array();
 
         $select_print_users = array('u.id', 'u.username', 'u.email', 'u.title', 'u.num_posts', 'u.admin_note', 'g.g_id', 'g.g_user_title');
@@ -641,7 +628,7 @@ public function print_users($conditions, $order_by, $direction, $start_from)
 
                 // This script is a special case in that we want to display "Not verified" for non-verified users
                 if (($cur_user['g_id'] == '' || $cur_user['g_id'] == FEATHER_UNVERIFIED) && $cur_user['user_title'] != __('Banned')) {
-                    $cur_user['user_title'] = '<span class="warntext">'.$lang_admin_users['Not verified'].'</span>';
+                    $cur_user['user_title'] = '<span class="warntext">'.__('Not verified').'</span>';
                 }
 
                 $user_data[] = $cur_user;
diff --git a/style/FeatherBB/view/admin/bans/add_ban.php b/style/FeatherBB/view/admin/bans/add_ban.php
index c5943d99..28b73f89 100644
--- a/style/FeatherBB/view/admin/bans/add_ban.php
+++ b/style/FeatherBB/view/admin/bans/add_ban.php
@@ -14,7 +14,7 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_admin_bans['Ban advanced head'] ?></span></h2>
+	<h2><span><?php echo __('Ban advanced head') ?></span></h2>
 	<div class="box">
 		<form id="bans2" method="post" action="">
 			<div class="inform">
@@ -24,71 +24,71 @@
 				<?php endif; ?>
 				<?php if ($ban['mode'] == 'add' && isset($ban['user_id'])): ?><input type="hidden" name="ban_user_id" value="<?php echo $ban['user_id'] ?>" />
 				<?php endif; ?><fieldset>
-					<legend><?php echo $lang_admin_bans['Ban advanced subhead'] ?></legend>
+					<legend><?php echo __('Ban advanced subhead') ?></legend>
 					<div class="infldset">
 						<table class="aligntop">
 							<tr>
-								<th scope="row"><?php echo $lang_admin_bans['Username label'] ?></th>
+								<th scope="row"><?php echo __('Username label') ?></th>
 								<td>
 									<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
 										echo feather_escape($ban['ban_user']);
 									} ?>" tabindex="1" />
-									<span><?php echo $lang_admin_bans['Username help'] ?></span>
+									<span><?php echo __('Username help') ?></span>
 								</td>
 							</tr>
 							<tr>
-								<th scope="row"><?php echo $lang_admin_bans['IP label'] ?></th>
+								<th scope="row"><?php echo __('IP label') ?></th>
 								<td>
 									<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
 										echo feather_escape($ban['ip']);
 									} ?>" tabindex="2" />
-										<span><?php echo $lang_admin_bans['IP help'] ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
-												printf(' '.$lang_admin_bans['IP help link'], '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.$lang_admin_common['here'].'</a>');
+										<span><?php echo __('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
+												printf(' '.__('IP help link'), '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.__('here').'</a>');
 											} ?></span>
 								</td>
 							</tr>
 							<tr>
-								<th scope="row"><?php echo $lang_admin_bans['E-mail label'] ?></th>
+								<th scope="row"><?php echo __('E-mail label') ?></th>
 								<td>
 									<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
 										echo feather_escape($ban['email']);
 									} ?>" tabindex="3" />
-									<span><?php echo $lang_admin_bans['E-mail help'] ?></span>
+									<span><?php echo __('E-mail help') ?></span>
 								</td>
 							</tr>
 						</table>
-						<p class="topspace"><strong class="warntext"><?php echo $lang_admin_bans['Ban IP range info'] ?></strong></p>
+						<p class="topspace"><strong class="warntext"><?php echo __('Ban IP range info') ?></strong></p>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_admin_bans['Message expiry subhead'] ?></legend>
+					<legend><?php echo __('Message expiry subhead') ?></legend>
 					<div class="infldset">
 						<table class="aligntop">
 							<tr>
-								<th scope="row"><?php echo $lang_admin_bans['Ban message label'] ?></th>
+								<th scope="row"><?php echo __('Ban message label') ?></th>
 								<td>
 									<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
 										echo feather_escape($ban['message']);
 									} ?>" tabindex="4" />
-									<span><?php echo $lang_admin_bans['Ban message help'] ?></span>
+									<span><?php echo __('Ban message help') ?></span>
 								</td>
 							</tr>
 							<tr>
-								<th scope="row"><?php echo $lang_admin_bans['Expire date label'] ?></th>
+								<th scope="row"><?php echo __('Expire date label') ?></th>
 								<td>
 									<input type="text" name="ban_expire" size="17" maxlength="10" value="<?php if (isset($ban['expire'])) {
 										echo $ban['expire'];
 									} ?>" tabindex="5" />
-									<span><?php echo $lang_admin_bans['Expire date help'] ?></span>
+									<span><?php echo __('Expire date help') ?></span>
 								</td>
 							</tr>
 						</table>
 					</div>
 				</fieldset>
 			</div>
-			<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php echo $lang_admin_common['Save'] ?>" tabindex="6" /></p>
+			<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php echo __('Save') ?>" tabindex="6" /></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/admin/bans/admin_bans.php b/style/FeatherBB/view/admin/bans/admin_bans.php
index 17664a89..e6f2b5f7 100644
--- a/style/FeatherBB/view/admin/bans/admin_bans.php
+++ b/style/FeatherBB/view/admin/bans/admin_bans.php
@@ -14,20 +14,20 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_bans['New ban head'] ?></span></h2>
+		<h2><span><?php echo __('New ban head') ?></span></h2>
 		<div class="box">
 			<form id="bans" method="post" action="<?php echo get_link('admin/bans/add/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_bans['Add ban subhead'] ?></legend>
+						<legend><?php echo __('Add ban subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['Username label'] ?><div><input type="submit" name="add_ban" value="<?php echo $lang_admin_common['Add'] ?>" tabindex="2" /></div></th>
+									<th scope="row"><?php echo __('Username label') ?><div><input type="submit" name="add_ban" value="<?php echo __('Add') ?>" tabindex="2" /></div></th>
 									<td>
 										<input type="text" name="new_ban_user" size="25" maxlength="25" tabindex="1" />
-										<span><?php echo $lang_admin_bans['Username advanced help'] ?></span>
+										<span><?php echo __('Username advanced help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -37,56 +37,56 @@
 			</form>
 		</div>
 
-		<h2 class="block2"><span><?php echo $lang_admin_bans['Ban search head'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('Ban search head') ?></span></h2>
 		<div class="box">
 			<form id="find_bans" method="get" action="<?php echo get_link('admin/bans/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="find_ban" value="<?php echo $lang_admin_bans['Submit search'] ?>" tabindex="3" /></p>
+				<p class="submittop"><input type="submit" name="find_ban" value="<?php echo __('Submit search') ?>" tabindex="3" /></p>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_bans['Ban search subhead'] ?></legend>
+						<legend><?php echo __('Ban search subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_bans['Ban search info'] ?></p>
+							<p><?php echo __('Ban search info') ?></p>
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['Username label'] ?></th>
+									<th scope="row"><?php echo __('Username label') ?></th>
 									<td><input type="text" name="username" size="30" maxlength="25" tabindex="4" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['IP label'] ?></th>
+									<th scope="row"><?php echo __('IP label') ?></th>
 									<td><input type="text" name="ip" size="30" maxlength="255" tabindex="5" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['E-mail label'] ?></th>
+									<th scope="row"><?php echo __('E-mail label') ?></th>
 									<td><input type="text" name="email" size="30" maxlength="80" tabindex="6" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['Message label'] ?></th>
+									<th scope="row"><?php echo __('Message label') ?></th>
 									<td><input type="text" name="message" size="30" maxlength="255" tabindex="7" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['Expire after label'] ?></th>
+									<th scope="row"><?php echo __('Expire after label') ?></th>
 									<td><input type="text" name="expire_after" size="10" maxlength="10" tabindex="8" />
-									<span><?php echo $lang_admin_bans['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['Expire before label'] ?></th>
+									<th scope="row"><?php echo __('Expire before label') ?></th>
 									<td><input type="text" name="expire_before" size="10" maxlength="10" tabindex="9" />
-									<span><?php echo $lang_admin_bans['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['Order by label'] ?></th>
+									<th scope="row"><?php echo __('Order by label') ?></th>
 									<td>
 										<select name="order_by" tabindex="10">
-											<option value="username" selected="selected"><?php echo $lang_admin_bans['Order by username'] ?></option>
-											<option value="ip"><?php echo $lang_admin_bans['Order by ip'] ?></option>
-											<option value="email"><?php echo $lang_admin_bans['Order by e-mail'] ?></option>
-											<option value="expire"><?php echo $lang_admin_bans['Order by expire'] ?></option>
+											<option value="username" selected="selected"><?php echo __('Order by username') ?></option>
+											<option value="ip"><?php echo __('Order by ip') ?></option>
+											<option value="email"><?php echo __('Order by e-mail') ?></option>
+											<option value="expire"><?php echo __('Order by expire') ?></option>
 										</select>
                                         &#160;&#160;&#160;
                                         <select name="direction" tabindex="11">
-											<option value="ASC" selected="selected"><?php echo $lang_admin_bans['Ascending'] ?></option>
-											<option value="DESC"><?php echo $lang_admin_bans['Descending'] ?></option>
+											<option value="ASC" selected="selected"><?php echo __('Ascending') ?></option>
+											<option value="DESC"><?php echo __('Descending') ?></option>
 										</select>
 									</td>
 								</tr>
@@ -94,7 +94,7 @@
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="find_ban" value="<?php echo $lang_admin_bans['Submit search'] ?>" tabindex="12" /></p>
+				<p class="submitend"><input type="submit" name="find_ban" value="<?php echo __('Submit search') ?>" tabindex="12" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/bans/search_ban.php b/style/FeatherBB/view/admin/bans/search_ban.php
index b39642e9..4285f695 100644
--- a/style/FeatherBB/view/admin/bans/search_ban.php
+++ b/style/FeatherBB/view/admin/bans/search_ban.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php echo $lang_admin_common['Bans'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_admin_bans['Results head'] ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php echo __('Bans') ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -29,19 +29,19 @@
 
 
 <div id="bans1" class="blocktable">
-	<h2><span><?php echo $lang_admin_bans['Results head'] ?></span></h2>
+	<h2><span><?php echo __('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_admin_bans['Results username head'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_admin_bans['Results e-mail head'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_admin_bans['Results IP address head'] ?></th>
-					<th class="tc4" scope="col"><?php echo $lang_admin_bans['Results expire head'] ?></th>
-					<th class="tc5" scope="col"><?php echo $lang_admin_bans['Results message head'] ?></th>
-					<th class="tc6" scope="col"><?php echo $lang_admin_bans['Results banned by head'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_admin_bans['Results actions head'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php echo __('Results IP address head') ?></th>
+					<th class="tc4" scope="col"><?php echo __('Results expire head') ?></th>
+					<th class="tc5" scope="col"><?php echo __('Results message head') ?></th>
+					<th class="tc6" scope="col"><?php echo __('Results banned by head') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Results actions head') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -55,14 +55,14 @@
 					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? feather_escape($cur_ban['ip']) : '&#160;' ?></td>
 					<td class="tc4"><?php echo format_time($cur_ban['expire'], true) ?></td>
 					<td class="tc5"><?php echo($cur_ban['message'] != '') ? feather_escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.get_link('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : $lang_admin_bans['Unknown'] ?></td>
-					<td class="tcr"><?php echo '<a href="'.get_link('admin/bans/edit/'.$cur_ban['id'].'/').'">'.$lang_admin_common['Edit'].'</a> | <a href="'.get_link('admin/bans/delete/'.$cur_ban['id'].'/').'">'.$lang_admin_common['Remove'].'</a>' ?></td>
+					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.get_link('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
+					<td class="tcr"><?php echo '<a href="'.get_link('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.get_link('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
 				</tr>
 <?php
 
         }
         if (empty($ban_data)) {
-            echo "\t\t\t\t".'<tr><td class="tcl" colspan="7">'.$lang_admin_bans['No match'].'</td></tr>'."\n";
+            echo "\t\t\t\t".'<tr><td class="tcl" colspan="7">'.__('No match').'</td></tr>'."\n";
         }
 
 ?>
@@ -78,9 +78,9 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
         <ul class="crumbs">
-            <li><a href="<?php echo get_link('admin/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php echo $lang_admin_common['Bans'] ?></a></li>
-            <li><span>»&#160;</span><strong><?php echo $lang_admin_bans['Results head'] ?></strong></li>
+            <li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+            <li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php echo __('Bans') ?></a></li>
+            <li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
         </ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/style/FeatherBB/view/admin/categories.php b/style/FeatherBB/view/admin/categories.php
index 13959991..0a150cc1 100644
--- a/style/FeatherBB/view/admin/categories.php
+++ b/style/FeatherBB/view/admin/categories.php
@@ -14,20 +14,20 @@
 
 ?>
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_categories['Add categories head'] ?></span></h2>
+		<h2><span><?php echo __('Add categories head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/categories/add/') ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_categories['Add categories subhead'] ?></legend>
+						<legend><?php echo __('Add categories subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_categories['Add category label'] ?><div><input type="submit" value="<?php echo $lang_admin_categories['Add new submit'] ?>" tabindex="2" /></div></th>
+									<th scope="row"><?php echo __('Add category label') ?><div><input type="submit" value="<?php echo __('Add new submit') ?>" tabindex="2" /></div></th>
 									<td>
 										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
-										<span><?php printf($lang_admin_categories['Add category help'], '<a href="'.get_link('admin/forums').'">'.$lang_admin_common['Forums'].'</a>') ?></span>
+										<span><?php printf(__('Add category help'), '<a href="'.get_link('admin/forums').'">'.__('Forums').'</a>') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -37,17 +37,17 @@
 			</form>
 		</div>
 
-<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php echo $lang_admin_categories['Delete categories head'] ?></span></h2>
+<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php echo __('Delete categories head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/categories/delete') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_categories['Delete categories subhead'] ?></legend>
+						<legend><?php echo __('Delete categories subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_categories['Delete category label'] ?><div><input type="submit" value="<?php echo $lang_admin_common['Delete'] ?>" tabindex="4" /></div></th>
+									<th scope="row"><?php echo __('Delete category label') ?><div><input type="submit" value="<?php echo __('Delete') ?>" tabindex="4" /></div></th>
 									<td>
 										<select name="cat_to_delete" tabindex="3">
 <?php
@@ -58,7 +58,7 @@
 
 ?>
 										</select>
-										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php echo $lang_admin_categories['Delete category disclaimer'] ?></span>
+										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php echo __('Delete category disclaimer') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -69,19 +69,19 @@
 		</div>
 <?php endif; ?>
 
-<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php echo $lang_admin_categories['Edit categories head'] ?></span></h2>
+<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php echo __('Edit categories head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/categories/edit/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_categories['Edit categories subhead'] ?></legend>
+						<legend><?php echo __('Edit categories subhead') ?></legend>
 						<div class="infldset">
 							<table id="categoryedit">
 							<thead>
 								<tr>
-									<th class="tcl" scope="col"><?php echo $lang_admin_categories['Category name label'] ?></th>
-									<th scope="col"><?php echo $lang_admin_categories['Category position label'] ?></th>
+									<th class="tcl" scope="col"><?php echo __('Category name label') ?></th>
+									<th scope="col"><?php echo __('Category position label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -100,7 +100,7 @@
 ?>
 							</tbody>
 							</table>
-							<div class="fsetsubmit"><input type="submit" value="<?php echo $lang_admin_common['Update'] ?>" /></div>
+							<div class="fsetsubmit"><input type="submit" value="<?php echo __('Update') ?>" /></div>
 						</div>
 					</fieldset>
 				</div>
diff --git a/style/FeatherBB/view/admin/censoring.php b/style/FeatherBB/view/admin/censoring.php
index 5131e64c..b8dc9f88 100644
--- a/style/FeatherBB/view/admin/censoring.php
+++ b/style/FeatherBB/view/admin/censoring.php
@@ -14,28 +14,28 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_censoring['Censoring head'] ?></span></h2>
+		<h2><span><?php echo __('Censoring head') ?></span></h2>
 		<div class="box">
 			<form id="censoring" method="post" action="<?php echo get_link('admin/censoring/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_censoring['Add word subhead'] ?></legend>
+						<legend><?php echo __('Add word subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_censoring['Add word info'].' '.($feather_config['o_censoring'] == '1' ? sprintf($lang_admin_censoring['Censoring enabled'], '<a href="'.get_link('admin/options#censoring').'">'.$lang_admin_common['Options'].'</a>') : sprintf($lang_admin_censoring['Censoring disabled'], '<a href="'.get_link('admin/options#censoring').'">'.$lang_admin_common['Options'].'</a>')) ?></p>
+							<p><?php echo __('Add word info').' '.($feather_config['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
 							<table>
 							<thead>
 								<tr>
-									<th class="tcl" scope="col"><?php echo $lang_admin_censoring['Censored word label'] ?></th>
-									<th class="tc2" scope="col"><?php echo $lang_admin_censoring['Replacement label'] ?></th>
-									<th class="hidehead" scope="col"><?php echo $lang_admin_censoring['Action label'] ?></th>
+									<th class="tcl" scope="col"><?php echo __('Censored word label') ?></th>
+									<th class="tc2" scope="col"><?php echo __('Replacement label') ?></th>
+									<th class="hidehead" scope="col"><?php echo __('Action label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
 								<tr>
 									<td class="tcl"><input type="text" name="new_search_for" size="24" maxlength="60" tabindex="1" /></td>
 									<td class="tc2"><input type="text" name="new_replace_with" size="24" maxlength="60" tabindex="2" /></td>
-									<td><input type="submit" name="add_word" value="<?php echo $lang_admin_common['Add'] ?>" tabindex="3" /></td>
+									<td><input type="submit" name="add_word" value="<?php echo __('Add') ?>" tabindex="3" /></td>
 								</tr>
 							</tbody>
 							</table>
@@ -44,7 +44,7 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_censoring['Edit remove subhead'] ?></legend>
+						<legend><?php echo __('Edit remove subhead') ?></legend>
 						<div class="infldset">
 <?php
 if (!empty($word_data)) {
@@ -52,16 +52,16 @@
 							<table>
 							<thead>
 								<tr>
-									<th class="tcl" scope="col"><?php echo $lang_admin_censoring['Censored word label'] ?></th>
-									<th class="tc2" scope="col"><?php echo $lang_admin_censoring['Replacement label'] ?></th>
-									<th class="hidehead" scope="col"><?php echo $lang_admin_censoring['Action label'] ?></th>
+									<th class="tcl" scope="col"><?php echo __('Censored word label') ?></th>
+									<th class="tc2" scope="col"><?php echo __('Replacement label') ?></th>
+									<th class="hidehead" scope="col"><?php echo __('Action label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
 <?php
 
     foreach ($word_data as $word) {
-        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.feather_escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.feather_escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.$lang_admin_common['Update'].'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.$lang_admin_common['Remove'].'" /></td></tr>'."\n";
+        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.feather_escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.feather_escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
     }
 
     ?>
@@ -70,7 +70,7 @@
 <?php
 
 } else {
-    echo "\t\t\t\t\t\t\t".'<p>'.$lang_admin_censoring['No words in list'].'</p>'."\n";
+    echo "\t\t\t\t\t\t\t".'<p>'.__('No words in list').'</p>'."\n";
 }
 
 ?>
diff --git a/style/FeatherBB/view/admin/forums/admin_forums.php b/style/FeatherBB/view/admin/forums/admin_forums.php
index d6562aad..1771986a 100644
--- a/style/FeatherBB/view/admin/forums/admin_forums.php
+++ b/style/FeatherBB/view/admin/forums/admin_forums.php
@@ -14,7 +14,7 @@
 ?>
 	
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_forums['Add forum head'] ?></span></h2>
+		<h2><span><?php echo __('Add forum head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/forums/add') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -23,18 +23,18 @@
     ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_forums['Create new subhead'] ?></legend>
+						<legend><?php echo __('Create new subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_forums['Add forum label'] ?><div><input type="submit" value="<?php echo $lang_admin_forums['Add forum'] ?>" tabindex="2" /></div></th>
+									<th scope="row"><?php echo __('Add forum label') ?><div><input type="submit" value="<?php echo __('Add forum') ?>" tabindex="2" /></div></th>
 									<td>
 										<select name="cat" tabindex="1">
 											<?php  foreach ($forum_data as $cat_id => $cat_data) {
 												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'">'.feather_escape($cat_data['cat_name']).'</option>'."\n";
 											} ?>
 										</select>
-										<span><?php echo $lang_admin_forums['Add forum help'] ?></span>
+										<span><?php echo __('Add forum help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -47,9 +47,9 @@
     ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_common['None'] ?></legend>
+						<legend><?php echo __('None') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_forums['No categories exist'] ?></p>
+							<p><?php echo __('No categories exist') ?></p>
 						</div>
 					</fieldset>
 				</div>
@@ -63,24 +63,24 @@
 <?php
 if (!empty($forum_data)) {
     ?>
-		<h2 class="block2"><span><?php echo $lang_admin_forums['Manage forums head'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('Manage forums head') ?></span></h2>
 		<div class="box">
 			<form id="edforum" method="post" action="<?php echo get_link('admin/forums/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="update_positions" value="<?php echo $lang_admin_forums['Update positions'] ?>" tabindex="3" /></p>
+				<p class="submittop"><input type="submit" name="update_positions" value="<?php echo __('Update positions') ?>" tabindex="3" /></p>
 <?php
     foreach ($forum_data as $cat_id => $cat_data) {
             ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_forums['Category subhead'] ?> <?php echo feather_escape($cat_data['cat_name']) ?></legend>
+						<legend><?php echo __('Category subhead') ?> <?php echo feather_escape($cat_data['cat_name']) ?></legend>
 						<div class="infldset">
 							<table>
 							<thead>
 								<tr>
-									<th class="tcl"><?php echo $lang_admin_common['Action'] ?></th>
-									<th class="tc2"><?php echo $lang_admin_forums['Position label'] ?></th>
-									<th class="tcr"><?php echo $lang_admin_forums['Forum label'] ?></th>
+									<th class="tcl"><?php echo __('Action') ?></th>
+									<th class="tc2"><?php echo __('Position label') ?></th>
+									<th class="tcr"><?php echo __('Forum label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -88,7 +88,7 @@
 	foreach ($cat_data['cat_forums'] as $forum) {
         ?>
 								<tr>
-									<td class="tcl"><a href="<?php echo get_link('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php echo $lang_admin_forums['Edit link'] ?></a> | <a href="<?php echo get_link('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php echo $lang_admin_forums['Delete link'] ?></a></td>
+									<td class="tcl"><a href="<?php echo get_link('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php echo __('Edit link') ?></a> | <a href="<?php echo get_link('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php echo __('Delete link') ?></a></td>
 									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
 									<td class="tcr"><strong><?php echo feather_escape($forum['forum_name']) ?></strong></td>
 								</tr>
@@ -103,7 +103,7 @@
 <?php
 	}
 ?>
-				<p class="submitend"><input type="submit" name="update_positions" value="<?php echo $lang_admin_forums['Update positions'] ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
+				<p class="submitend"><input type="submit" name="update_positions" value="<?php echo __('Update positions') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/forums/delete_forum.php b/style/FeatherBB/view/admin/forums/delete_forum.php
index 5d7bc983..213e4090 100644
--- a/style/FeatherBB/view/admin/forums/delete_forum.php
+++ b/style/FeatherBB/view/admin/forums/delete_forum.php
@@ -14,20 +14,20 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_forums['Confirm delete head'] ?></span></h2>
+		<h2><span><?php echo __('Confirm delete head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_forums['Confirm delete subhead'] ?></legend>
+						<legend><?php echo __('Confirm delete subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf($lang_admin_forums['Confirm delete info'], $cur_forum['forum_name']) ?></p>
-							<p class="warntext"><?php echo $lang_admin_forums['Confirm delete warn'] ?></p>
+							<p><?php printf(__('Confirm delete info'), $cur_forum['forum_name']) ?></p>
+							<p class="warntext"><?php echo __('Confirm delete warn') ?></p>
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="del_forum_comply" value="<?php echo $lang_admin_common['Delete'] ?>" /><a href="javascript:history.go(-1)"><?php echo $lang_admin_common['Go back'] ?></a></p>
+				<p class="buttons"><input type="submit" name="del_forum_comply" value="<?php echo __('Delete') ?>" /><a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/forums/permissions.php b/style/FeatherBB/view/admin/forums/permissions.php
index b4591bc1..f66d00db 100644
--- a/style/FeatherBB/view/admin/forums/permissions.php
+++ b/style/FeatherBB/view/admin/forums/permissions.php
@@ -14,26 +14,26 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_forums['Edit forum head'] ?></span></h2>
+		<h2><span><?php echo __('Edit forum head') ?></span></h2>
 		<div class="box">
 			<form id="edit_forum" method="post" action="<?php echo get_link('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" tabindex="6" /></p>
+				<p class="submittop"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" tabindex="6" /></p>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_forums['Edit details subhead'] ?></legend>
+						<legend><?php echo __('Edit details subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_forums['Forum name label'] ?></th>
+									<th scope="row"><?php echo __('Forum name label') ?></th>
 									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo feather_escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_forums['Forum description label'] ?></th>
+									<th scope="row"><?php echo __('Forum description label') ?></th>
 									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo feather_escape($cur_forum['forum_desc']) ?></textarea></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_forums['Category label'] ?></th>
+									<th scope="row"><?php echo __('Category label') ?></th>
 									<td>
 										<select name="cat_id" tabindex="3">
 											<?php  foreach ($forum_data as $cat_id => $cat_data) {
@@ -44,24 +44,24 @@
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_forums['Sort by label'] ?></th>
+									<th scope="row"><?php echo __('Sort by label') ?></th>
 									<td>
 										<select name="sort_by" tabindex="4">
 											<option value="0"<?php if ($cur_forum['sort_by'] == '0') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_forums['Last post'] ?></option>
+} ?>><?php echo __('Last post') ?></option>
 											<option value="1"<?php if ($cur_forum['sort_by'] == '1') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_forums['Topic start'] ?></option>
+} ?>><?php echo __('Topic start') ?></option>
 											<option value="2"<?php if ($cur_forum['sort_by'] == '2') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_forums['Subject'] ?></option>
+} ?>><?php echo __('Subject') ?></option>
 										</select>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_forums['Redirect label'] ?></th>
-									<td><?php echo(!empty($cur_forum['num_topics'])) ? $lang_admin_forums['Redirect help'] : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.feather_escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
+									<th scope="row"><?php echo __('Redirect label') ?></th>
+									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.feather_escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
 								</tr>
 							</table>
 						</div>
@@ -69,16 +69,16 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_forums['Group permissions subhead'] ?></legend>
+						<legend><?php echo __('Group permissions subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf($lang_admin_forums['Group permissions info'], '<a href="admin_groups.php">'.$lang_admin_common['User groups'].'</a>') ?></p>
+							<p><?php printf(__('Group permissions info'), '<a href="admin_groups.php">'.__('User groups').'</a>') ?></p>
 							<table id="forumperms">
 							<thead>
 								<tr>
 									<th class="atcl">&#160;</th>
-									<th><?php echo $lang_admin_forums['Read forum label'] ?></th>
-									<th><?php echo $lang_admin_forums['Post replies label'] ?></th>
-									<th><?php echo $lang_admin_forums['Post topics label'] ?></th>
+									<th><?php echo __('Read forum label') ?></th>
+									<th><?php echo __('Post replies label') ?></th>
+									<th><?php echo __('Post topics label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -125,11 +125,11 @@
 ?>
 							</tbody>
 							</table>
-							<div class="fsetsubmit"><input type="submit" name="revert_perms" value="<?php echo $lang_admin_forums['Revert to default'] ?>" tabindex="<?php echo $cur_index++ ?>" /></div>
+							<div class="fsetsubmit"><input type="submit" name="revert_perms" value="<?php echo __('Revert to default') ?>" tabindex="<?php echo $cur_index++ ?>" /></div>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
+				<p class="submitend"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/groups/add_edit_group.php b/style/FeatherBB/view/admin/groups/add_edit_group.php
index 3bd8018c..3c3c146c 100644
--- a/style/FeatherBB/view/admin/groups/add_edit_group.php
+++ b/style/FeatherBB/view/admin/groups/add_edit_group.php
@@ -14,22 +14,22 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_groups['Group settings head'] ?></span></h2>
+		<h2><span><?php echo __('Group settings head') ?></span></h2>
 		<div class="box">
 			<form id="groups2" method="post" action="" onsubmit="return process_form(this)">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="add_edit_group" value="<?php echo $lang_admin_common['Save'] ?>" /></p>
+				<p class="submittop"><input type="submit" name="add_edit_group" value="<?php echo __('Save') ?>" /></p>
 				<div class="inform">
 					<input type="hidden" name="mode" value="<?php echo $group['mode'] ?>" />
 <?php if ($group['mode'] == 'edit'): ?>					<input type="hidden" name="group_id" value="<?php echo $id ?>" />
 <?php endif; ?><?php if ($group['mode'] == 'add'): ?>					<input type="hidden" name="base_group" value="<?php echo $group['base_group'] ?>" />
 <?php endif; ?>					<fieldset>
-						<legend><?php echo $lang_admin_groups['Group settings subhead'] ?></legend>
+						<legend><?php echo __('Group settings subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_groups['Group settings info'] ?></p>
+							<p><?php echo __('Group settings info') ?></p>
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Group title label'] ?></th>
+									<th scope="row"><?php echo __('Group title label') ?></th>
 									<td>
 										<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
     echo feather_escape($group['info']['g_title']);
@@ -37,273 +37,273 @@
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['User title label'] ?></th>
+									<th scope="row"><?php echo __('User title label') ?></th>
 									<td>
 										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
-										<span><?php printf($lang_admin_groups['User title help'], ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
+										<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
 									</td>
 								</tr>
 <?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Promote users label'] ?></th>
+									<th scope="row"><?php echo __('Promote users label') ?></th>
 									<td>
 										<select name="promote_next_group" tabindex="3">
-											<option value="0"><?php echo $lang_admin_groups['Disable promotion'] ?></option>
+											<option value="0"><?php echo __('Disable promotion') ?></option>
 											<?php echo $group_list ?>
 										</select>
 										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo feather_escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
-										<span><?php printf($lang_admin_groups['Promote users help'], $lang_admin_groups['Disable promotion']) ?></span>
+										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
 									</td>
 								</tr>
 <?php if ($group['mode'] != 'edit' || $feather_config['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
-									<th scope="row"> <?php echo $lang_admin_groups['Mod privileges label'] ?></th>
+									<th scope="row"> <?php echo __('Mod privileges label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="5" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="5" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="moderator" value="0"<?php if ($group['info']['g_moderator'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="6" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Mod privileges help'] ?></span>
+} ?> tabindex="6" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Mod privileges help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Edit profile label'] ?></th>
+									<th scope="row"><?php echo __('Edit profile label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="mod_edit_users" value="1"<?php if ($group['info']['g_mod_edit_users'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="7" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="7" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="mod_edit_users" value="0"<?php if ($group['info']['g_mod_edit_users'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="8" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Edit profile help'] ?></span>
+} ?> tabindex="8" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Edit profile help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Rename users label'] ?></th>
+									<th scope="row"><?php echo __('Rename users label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="mod_rename_users" value="1"<?php if ($group['info']['g_mod_rename_users'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="9" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="9" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="mod_rename_users" value="0"<?php if ($group['info']['g_mod_rename_users'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="10" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Rename users help'] ?></span>
+} ?> tabindex="10" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Rename users help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Change passwords label'] ?></th>
+									<th scope="row"><?php echo __('Change passwords label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="mod_change_passwords" value="1"<?php if ($group['info']['g_mod_change_passwords'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="11" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="11" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="mod_change_passwords" value="0"<?php if ($group['info']['g_mod_change_passwords'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="12" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Change passwords help'] ?></span>
+} ?> tabindex="12" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Change passwords help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Mod promote users label'] ?></th>
+									<th scope="row"><?php echo __('Mod promote users label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="mod_promote_users" value="1"<?php if ($group['info']['g_mod_promote_users'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="13" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="13" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="mod_promote_users" value="0"<?php if ($group['info']['g_mod_promote_users'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="14" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Mod promote users help'] ?></span>
+} ?> tabindex="14" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Mod promote users help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Ban users label'] ?></th>
+									<th scope="row"><?php echo __('Ban users label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="mod_ban_users" value="1"<?php if ($group['info']['g_mod_ban_users'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="15" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="15" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="mod_ban_users" value="0"<?php if ($group['info']['g_mod_ban_users'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="16" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Ban users help'] ?></span>
+} ?> tabindex="16" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Ban users help') ?></span>
 									</td>
 								</tr>
 <?php endif; endif; ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Read board label'] ?></th>
+									<th scope="row"><?php echo __('Read board label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="read_board" value="1"<?php if ($group['info']['g_read_board'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="17" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="17" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="read_board" value="0"<?php if ($group['info']['g_read_board'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="18" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Read board help'] ?></span>
+} ?> tabindex="18" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Read board help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['View user info label'] ?></th>
+									<th scope="row"><?php echo __('View user info label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="view_users" value="1"<?php if ($group['info']['g_view_users'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="19" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="19" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="view_users" value="0"<?php if ($group['info']['g_view_users'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="20" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['View user info help'] ?></span>
+} ?> tabindex="20" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('View user info help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Post replies label'] ?></th>
+									<th scope="row"><?php echo __('Post replies label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="post_replies" value="1"<?php if ($group['info']['g_post_replies'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="21" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="21" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="post_replies" value="0"<?php if ($group['info']['g_post_replies'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="22" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Post replies help'] ?></span>
+} ?> tabindex="22" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Post replies help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Post topics label'] ?></th>
+									<th scope="row"><?php echo __('Post topics label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="post_topics" value="1"<?php if ($group['info']['g_post_topics'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="23" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="23" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="post_topics" value="0"<?php if ($group['info']['g_post_topics'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="24" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Post topics help'] ?></span>
+} ?> tabindex="24" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Post topics help') ?></span>
 									</td>
 								</tr>
 <?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Edit posts label'] ?></th>
+									<th scope="row"><?php echo __('Edit posts label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="edit_posts" value="1"<?php if ($group['info']['g_edit_posts'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="25" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="25" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="edit_posts" value="0"<?php if ($group['info']['g_edit_posts'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="26" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Edit posts help'] ?></span>
+} ?> tabindex="26" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Edit posts help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Delete posts label'] ?></th>
+									<th scope="row"><?php echo __('Delete posts label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="delete_posts" value="1"<?php if ($group['info']['g_delete_posts'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="27" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="27" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="delete_posts" value="0"<?php if ($group['info']['g_delete_posts'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="28" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Delete posts help'] ?></span>
+} ?> tabindex="28" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Delete posts help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Delete topics label'] ?></th>
+									<th scope="row"><?php echo __('Delete topics label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="delete_topics" value="1"<?php if ($group['info']['g_delete_topics'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="29" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="29" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="delete_topics" value="0"<?php if ($group['info']['g_delete_topics'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="30" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Delete topics help'] ?></span>
+} ?> tabindex="30" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Delete topics help') ?></span>
 									</td>
 								</tr>
 <?php endif; ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Post links label'] ?></th>
+									<th scope="row"><?php echo __('Post links label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="post_links" value="1"<?php if ($group['info']['g_post_links'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="31" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="31" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="post_links" value="0"<?php if ($group['info']['g_post_links'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="32" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Post links help'] ?></span>
+} ?> tabindex="32" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Post links help') ?></span>
 									</td>
 								</tr>
 <?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Set own title label'] ?></th>
+									<th scope="row"><?php echo __('Set own title label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="set_title" value="1"<?php if ($group['info']['g_set_title'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="33" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="33" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="set_title" value="0"<?php if ($group['info']['g_set_title'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="34" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Set own title help'] ?></span>
+} ?> tabindex="34" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Set own title help') ?></span>
 									</td>
 								</tr>
 <?php endif; ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['User search label'] ?></th>
+									<th scope="row"><?php echo __('User search label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="search" value="1"<?php if ($group['info']['g_search'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="35" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="35" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="search" value="0"<?php if ($group['info']['g_search'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="36" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['User search help'] ?></span>
+} ?> tabindex="36" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('User search help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['User list search label'] ?></th>
+									<th scope="row"><?php echo __('User list search label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="search_users" value="1"<?php if ($group['info']['g_search_users'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="37" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="37" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="search_users" value="0"<?php if ($group['info']['g_search_users'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="38" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['User list search help'] ?></span>
+} ?> tabindex="38" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('User list search help') ?></span>
 									</td>
 								</tr>
 <?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Send e-mails label'] ?></th>
+									<th scope="row"><?php echo __('Send e-mails label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="send_email" value="1"<?php if ($group['info']['g_send_email'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="39" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> tabindex="39" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="send_email" value="0"<?php if ($group['info']['g_send_email'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="40" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Send e-mails help'] ?></span>
+} ?> tabindex="40" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Send e-mails help') ?></span>
 									</td>
 								</tr>
 <?php endif; ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Post flood label'] ?></th>
+									<th scope="row"><?php echo __('Post flood label') ?></th>
 									<td>
 										<input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_post_flood'] ?>" tabindex="41" />
-										<span><?php echo $lang_admin_groups['Post flood help'] ?></span>
+										<span><?php echo __('Post flood help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Search flood label'] ?></th>
+									<th scope="row"><?php echo __('Search flood label') ?></th>
 									<td>
 										<input type="text" name="search_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_search_flood'] ?>" tabindex="42" />
-										<span><?php echo $lang_admin_groups['Search flood help'] ?></span>
+										<span><?php echo __('Search flood help') ?></span>
 									</td>
 								</tr>
 <?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['E-mail flood label'] ?></th>
+									<th scope="row"><?php echo __('E-mail flood label') ?></th>
 									<td>
 										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_email_flood'] ?>" tabindex="43" />
-										<span><?php echo $lang_admin_groups['E-mail flood help'] ?></span>
+										<span><?php echo __('E-mail flood help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Report flood label'] ?></th>
+									<th scope="row"><?php echo __('Report flood label') ?></th>
 									<td>
 										<input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_report_flood'] ?>" tabindex="44" />
-										<span><?php echo $lang_admin_groups['Report flood help'] ?></span>
+										<span><?php echo __('Report flood help') ?></span>
 									</td>
 								</tr>
 <?php endif; endif; ?>							</table>
-<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php echo $lang_admin_groups['Moderator info'] ?></p>
+<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php echo __('Moderator info') ?></p>
 <?php endif; ?>						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="add_edit_group" value="<?php echo $lang_admin_common['Save'] ?>" tabindex="45" /></p>
+				<p class="submitend"><input type="submit" name="add_edit_group" value="<?php echo __('Save') ?>" tabindex="45" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/groups/admin_groups.php b/style/FeatherBB/view/admin/groups/admin_groups.php
index c6fcf41a..1bf9a10e 100644
--- a/style/FeatherBB/view/admin/groups/admin_groups.php
+++ b/style/FeatherBB/view/admin/groups/admin_groups.php
@@ -14,17 +14,17 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_groups['Add groups head'] ?></span></h2>
+		<h2><span><?php echo __('Add groups head') ?></span></h2>
 		<div class="box">
 				<div class="inform">
 					<fieldset>
                         <form id="groups" method="post" action="<?php echo get_link('admin/groups/add/') ?>">
                         <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php echo $lang_admin_groups['Add group subhead'] ?></legend>
+						<legend><?php echo __('Add group subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['New group label'] ?><div><input type="submit" name="add_group" value="<?php echo $lang_admin_common['Add'] ?>" tabindex="2" /></div></th>
+									<th scope="row"><?php echo __('New group label') ?><div><input type="submit" name="add_group" value="<?php echo __('Add') ?>" tabindex="2" /></div></th>
 									<td>
 										<select id="base_group" name="base_group" tabindex="1">
 <?php
@@ -41,7 +41,7 @@
 
 ?>
 										</select>
-										<span><?php echo $lang_admin_groups['New group help'] ?></span>
+										<span><?php echo __('New group help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -53,11 +53,11 @@
 					<fieldset>
                         <form id="groups" method="post" action="<?php echo get_link('admin/groups/') ?>">
                         	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php echo $lang_admin_groups['Default group subhead'] ?></legend>
+						<legend><?php echo __('Default group subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Default group label'] ?><div><input type="submit" name="set_default_group" value="<?php echo $lang_admin_common['Save'] ?>" tabindex="4" /></div></th>
+									<th scope="row"><?php echo __('Default group label') ?><div><input type="submit" name="set_default_group" value="<?php echo __('Save') ?>" tabindex="4" /></div></th>
 									<td>
 										<select id="default_group" name="default_group" tabindex="3">
 <?php
@@ -74,7 +74,7 @@
 
 ?>
 										</select>
-										<span><?php echo $lang_admin_groups['Default group help'] ?></span>
+										<span><?php echo __('Default group help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -84,18 +84,18 @@
 				</div>
 		</div>
 
-		<h2 class="block2"><span><?php echo $lang_admin_groups['Existing groups head'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('Existing groups head') ?></span></h2>
 		<div class="box">
 			<div class="fakeform">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_groups['Edit groups subhead'] ?></legend>
+						<legend><?php echo __('Edit groups subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_groups['Edit groups info'] ?></p>
+							<p><?php echo __('Edit groups info') ?></p>
 							<table>
 <?php
 foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.get_link('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.$lang_admin_groups['Edit link'].'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.get_link('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.$lang_admin_groups['Delete link'].'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.get_link('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.get_link('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
 }
 
 ?>
diff --git a/style/FeatherBB/view/admin/groups/confirm_delete.php b/style/FeatherBB/view/admin/groups/confirm_delete.php
index c6c34bc8..936fb2fb 100644
--- a/style/FeatherBB/view/admin/groups/confirm_delete.php
+++ b/style/FeatherBB/view/admin/groups/confirm_delete.php
@@ -14,21 +14,21 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_groups['Group delete head'] ?></span></h2>
+		<h2><span><?php echo __('Group delete head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 				<input type="hidden" name="group_to_delete" value="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>" />
 					<fieldset>
-						<legend><?php echo $lang_admin_groups['Confirm delete subhead'] ?></legend>
+						<legend><?php echo __('Confirm delete subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf($lang_admin_groups['Confirm delete info'], feather_escape($group_title)) ?></p>
-							<p class="warntext"><?php echo $lang_admin_groups['Confirm delete warn'] ?></p>
+							<p><?php printf(__('Confirm delete info'), feather_escape($group_title)) ?></p>
+							<p class="warntext"><?php echo __('Confirm delete warn') ?></p>
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="del_group_comply" value="<?php echo $lang_admin_common['Delete'] ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php echo $lang_admin_common['Go back'] ?></a></p>
+				<p class="buttons"><input type="submit" name="del_group_comply" value="<?php echo __('Delete') ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php echo __('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/groups/delete_group.php b/style/FeatherBB/view/admin/groups/delete_group.php
index bbafdb36..fee07d5b 100644
--- a/style/FeatherBB/view/admin/groups/delete_group.php
+++ b/style/FeatherBB/view/admin/groups/delete_group.php
@@ -14,16 +14,16 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_groups['Delete group head'] ?></span></h2>
+		<h2><span><?php echo __('Delete group head') ?></span></h2>
 		<div class="box">
 			<form id="groups" method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_groups['Move users subhead'] ?></legend>
+						<legend><?php echo __('Move users subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf($lang_admin_groups['Move users info'], feather_escape($group_info['title']), forum_number_format($group_info['members'])) ?></p>
-							<label><?php echo $lang_admin_groups['Move users label'] ?>
+							<p><?php printf(__('Move users info'), feather_escape($group_info['title']), forum_number_format($group_info['members'])) ?></p>
+							<label><?php echo __('Move users label') ?>
 							<select name="move_to_group">
 								<?php get_group_list_delete($id); ?>
 							</select>
@@ -31,7 +31,7 @@
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="del_group" value="<?php echo $lang_admin_groups['Delete group'] ?>" /><a href="javascript:history.go(-1)"><?php echo $lang_admin_common['Go back'] ?></a></p>
+				<p class="buttons"><input type="submit" name="del_group" value="<?php echo __('Delete group') ?>" /><a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/index.php b/style/FeatherBB/view/admin/index.php
index 18f1e853..50afbad1 100644
--- a/style/FeatherBB/view/admin/index.php
+++ b/style/FeatherBB/view/admin/index.php
@@ -14,46 +14,46 @@
 ?>
 
 	<div class="block">
-		<h2><span><?php echo $lang_admin_index['Forum admin head'] ?></span></h2>
+		<h2><span><?php echo __('Forum admin head') ?></span></h2>
 		<div id="adintro" class="box">
 			<div class="inbox">
-				<p><?php echo $lang_admin_index['Welcome to admin'] ?></p>
+				<p><?php echo __('Welcome to admin') ?></p>
 				<ul>
-					<li><span><?php echo $lang_admin_index['Welcome 1'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 2'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 3'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 4'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 5'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 6'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 7'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 8'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 9'] ?></span></li>
+					<li><span><?php echo __('Welcome 1') ?></span></li>
+					<li><span><?php echo __('Welcome 2') ?></span></li>
+					<li><span><?php echo __('Welcome 3') ?></span></li>
+					<li><span><?php echo __('Welcome 4') ?></span></li>
+					<li><span><?php echo __('Welcome 5') ?></span></li>
+					<li><span><?php echo __('Welcome 6') ?></span></li>
+					<li><span><?php echo __('Welcome 7') ?></span></li>
+					<li><span><?php echo __('Welcome 8') ?></span></li>
+					<li><span><?php echo __('Welcome 9') ?></span></li>
 				</ul>
 			</div>
 		</div>
 
 <?php if ($install_file_exists) : ?>
-		<h2 class="block2"><span><?php echo $lang_admin_index['Alerts head'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('Alerts head') ?></span></h2>
 		<div id="adalerts" class="box">
-			<p><?php printf($lang_admin_index['Install file exists'], '<a href="'.get_link('admin/action/remove_install_file/').'">'.$lang_admin_index['Delete install file'].'</a>') ?></p>
+			<p><?php printf(__('Install file exists'), '<a href="'.get_link('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
 		</div>
 <?php endif; ?>
 
-		<h2 class="block2"><span><?php echo $lang_admin_index['About head'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('About head') ?></span></h2>
 		<div id="adstats" class="box">
 			<div class="inbox">
 				<dl>
-					<dt><?php echo $lang_admin_index['FeatherBB version label'] ?></dt>
+					<dt><?php echo __('FeatherBB version label') ?></dt>
 					<dd>
-						<?php printf($lang_admin_index['FeatherBB version data']."\n", $feather_config['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.$lang_admin_index['Check for upgrade'].'</a>') ?>
+						<?php printf(__('FeatherBB version data')."\n", $feather_config['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
 					</dd>
-					<dt><?php echo $lang_admin_index['Server statistics label'] ?></dt>
+					<dt><?php echo __('Server statistics label') ?></dt>
 					<dd>
-						<a href="<?php echo get_link('admin/statistics/') ?>"><?php echo $lang_admin_index['View server statistics'] ?></a>
+						<a href="<?php echo get_link('admin/statistics/') ?>"><?php echo __('View server statistics') ?></a>
 					</dd>
-					<dt><?php echo $lang_admin_index['Support label'] ?></dt>
+					<dt><?php echo __('Support label') ?></dt>
 					<dd>
-						<a href="http://FeatherBB.org/forums/index.php"><?php echo $lang_admin_index['Forum label'] ?></a> - <a href="http://gitter.im/featherbb/featherbb"><?php echo $lang_admin_index['IRC label'] ?></a>
+						<a href="http://FeatherBB.org/forums/index.php"><?php echo __('Forum label') ?></a> - <a href="http://gitter.im/featherbb/featherbb"><?php echo __('IRC label') ?></a>
 					</dd>
 				</dl>
 			</div>
diff --git a/style/FeatherBB/view/admin/maintenance/admin_maintenance.php b/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
index 6d08e608..77c8404e 100644
--- a/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
+++ b/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
@@ -14,39 +14,39 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_maintenance['Maintenance head'] ?></span></h2>
+		<h2><span><?php echo __('Maintenance head') ?></span></h2>
 		<div class="box">
 			<form method="get" action="<?php echo get_link('admin/maintenance/') ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="rebuild" />
 					<fieldset>
-						<legend><?php echo $lang_admin_maintenance['Rebuild index subhead'] ?></legend>
+						<legend><?php echo __('Rebuild index subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf($lang_admin_maintenance['Rebuild index info'], '<a href="'.get_link('admin/options/#maintenance').'">'.$lang_admin_common['Maintenance mode'].'</a>') ?></p>
+							<p><?php printf(__('Rebuild index info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_maintenance['Posts per cycle label'] ?></th>
+									<th scope="row"><?php echo __('Posts per cycle label') ?></th>
 									<td>
 										<input type="text" name="i_per_page" size="7" maxlength="7" value="300" tabindex="1" />
-										<span><?php echo $lang_admin_maintenance['Posts per cycle help'] ?></span>
+										<span><?php echo __('Posts per cycle help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_maintenance['Starting post label'] ?></th>
+									<th scope="row"><?php echo __('Starting post label') ?></th>
 									<td>
 										<input type="text" name="i_start_at" size="7" maxlength="7" value="<?php echo(isset($first_id)) ? $first_id : 0 ?>" tabindex="2" />
-										<span><?php echo $lang_admin_maintenance['Starting post help'] ?></span>
+										<span><?php echo __('Starting post help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_maintenance['Empty index label'] ?></th>
+									<th scope="row"><?php echo __('Empty index label') ?></th>
 									<td class="inputadmin">
-										<label><input type="checkbox" name="i_empty_index" value="1" tabindex="3" checked="checked" />&#160;&#160;<?php echo $lang_admin_maintenance['Empty index help'] ?></label>
+										<label><input type="checkbox" name="i_empty_index" value="1" tabindex="3" checked="checked" />&#160;&#160;<?php echo __('Empty index help') ?></label>
 									</td>
 								</tr>
 							</table>
-							<p class="topspace"><?php echo $lang_admin_maintenance['Rebuild completed info'] ?></p>
-							<div class="fsetsubmit"><input type="submit" name="rebuild_index" value="<?php echo $lang_admin_maintenance['Rebuild index'] ?>" tabindex="4" /></div>
+							<p class="topspace"><?php echo __('Rebuild completed info') ?></p>
+							<div class="fsetsubmit"><input type="submit" name="rebuild_index" value="<?php echo __('Rebuild index') ?>" tabindex="4" /></div>
 						</div>
 					</fieldset>
 				</div>
@@ -57,38 +57,38 @@
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
 					<fieldset>
-						<legend><?php echo $lang_admin_maintenance['Prune subhead'] ?></legend>
+						<legend><?php echo __('Prune subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_maintenance['Days old label'] ?></th>
+									<th scope="row"><?php echo __('Days old label') ?></th>
 									<td>
 										<input type="text" name="req_prune_days" size="3" maxlength="3" tabindex="5" />
-										<span><?php echo $lang_admin_maintenance['Days old help'] ?></span>
+										<span><?php echo __('Days old help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_maintenance['Prune sticky label'] ?></th>
+									<th scope="row"><?php echo __('Prune sticky label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="prune_sticky" value="1" tabindex="6" checked="checked" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
-										<label class="conl"><input type="radio" name="prune_sticky" value="0" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_maintenance['Prune sticky help'] ?></span>
+										<label class="conl"><input type="radio" name="prune_sticky" value="1" tabindex="6" checked="checked" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="prune_sticky" value="0" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Prune sticky help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_maintenance['Prune from label'] ?></th>
+									<th scope="row"><?php echo __('Prune from label') ?></th>
 									<td>
 										<select name="prune_from" tabindex="7">
-											<option value="all"><?php echo $lang_admin_maintenance['All forums'] ?></option>
+											<option value="all"><?php echo __('All forums') ?></option>
 												<?php echo $categories; ?>
 											</optgroup>
 										</select>
-										<span><?php echo $lang_admin_maintenance['Prune from help'] ?></span>
+										<span><?php echo __('Prune from help') ?></span>
 									</td>
 								</tr>
 							</table>
-							<p class="topspace"><?php printf($lang_admin_maintenance['Prune info'], '<a href="'.get_link('admin/options/#maintenance').'">'.$lang_admin_common['Maintenance mode'].'</a>') ?></p>
-							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php echo $lang_admin_common['Prune'] ?>" tabindex="8" /></div>
+							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php echo __('Prune') ?>" tabindex="8" /></div>
 						</div>
 					</fieldset>
 				</div>
diff --git a/style/FeatherBB/view/admin/maintenance/prune.php b/style/FeatherBB/view/admin/maintenance/prune.php
index d668d98a..8801a979 100644
--- a/style/FeatherBB/view/admin/maintenance/prune.php
+++ b/style/FeatherBB/view/admin/maintenance/prune.php
@@ -14,7 +14,7 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_maintenance['Prune head'] ?></span></h2>
+		<h2><span><?php echo __('Prune head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/maintenance/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -24,14 +24,14 @@
 					<input type="hidden" name="prune_sticky" value="<?php echo $prune_sticky ?>" />
 					<input type="hidden" name="prune_from" value="<?php echo $prune_from ?>" />
 					<fieldset>
-						<legend><?php echo $lang_admin_maintenance['Confirm prune subhead'] ?></legend>
+						<legend><?php echo __('Confirm prune subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf($lang_admin_maintenance['Confirm prune info'], $prune['days'], $prune['forum'], forum_number_format($prune['num_topics'])) ?></p>
-							<p class="warntext"><?php echo $lang_admin_maintenance['Confirm prune warn'] ?></p>
+							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], forum_number_format($prune['num_topics'])) ?></p>
+							<p class="warntext"><?php echo __('Confirm prune warn') ?></p>
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="prune_comply" value="<?php echo $lang_admin_common['Prune'] ?>" /><a href="javascript:history.go(-1)"><?php echo $lang_admin_common['Go back'] ?></a></p>
+				<p class="buttons"><input type="submit" name="prune_comply" value="<?php echo __('Prune') ?>" /><a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/maintenance/rebuild.php b/style/FeatherBB/view/admin/maintenance/rebuild.php
index ebf049ef..36947974 100644
--- a/style/FeatherBB/view/admin/maintenance/rebuild.php
+++ b/style/FeatherBB/view/admin/maintenance/rebuild.php
@@ -34,5 +34,5 @@
 </head>
 <body>
 
-<h1><?php echo $lang_admin_maintenance['Rebuilding index info'] ?></h1>
+<h1><?php echo __('Rebuilding index info') ?></h1>
 <hr />
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/menu.php b/style/FeatherBB/view/admin/menu.php
index ef12247c..e2870921 100644
--- a/style/FeatherBB/view/admin/menu.php
+++ b/style/FeatherBB/view/admin/menu.php
@@ -15,27 +15,27 @@
 ?>
 <div id="adminconsole" class="block2col">
 	<div id="adminmenu" class="blockmenu">
-		<h2><span><?php echo $lang_admin_common['Moderator menu'] ?></span></h2>
+		<h2><span><?php echo __('Moderator menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'index') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/') ?>"><?php echo $lang_admin_common['Index'] ?></a></li>
+    ?>><a href="<?php echo get_link('admin/') ?>"><?php echo __('Index') ?></a></li>
 					<li<?php if ($page == 'users') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/users/') ?>"><?php echo $lang_admin_common['Users'] ?></a></li>
+    ?>><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
 <?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php echo $lang_admin_common['Bans'] ?></a></li>
+    ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php echo __('Bans') ?></a></li>
 <?php endif;
     if ($is_admin || $feather_config['o_report_method'] == '0' || $feather_config['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php echo $lang_admin_common['Reports'] ?></a></li>
+    ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php echo __('Reports') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
@@ -44,42 +44,42 @@
 
     if ($is_admin) {
         ?>
-		<h2 class="block2"><span><?php echo $lang_admin_common['Admin menu'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('Admin menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'options') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/options/') ?>"><?php echo $lang_admin_common['Options'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/options/') ?>"><?php echo __('Options') ?></a></li>
 					<li<?php if ($page == 'permissions') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/permissions/') ?>"><?php echo $lang_admin_common['Permissions'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/permissions/') ?>"><?php echo __('Permissions') ?></a></li>
 					<li<?php if ($page == 'categories') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/categories/') ?>"><?php echo $lang_admin_common['Categories'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/categories/') ?>"><?php echo __('Categories') ?></a></li>
 					<li<?php if ($page == 'forums') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/forums/') ?>"><?php echo $lang_admin_common['Forums'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/forums/') ?>"><?php echo __('Forums') ?></a></li>
 					<li<?php if ($page == 'groups') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/groups/') ?>"><?php echo $lang_admin_common['User groups'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/groups/') ?>"><?php echo __('User groups') ?></a></li>
 					<li<?php if ($page == 'censoring') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/censoring/') ?>"><?php echo $lang_admin_common['Censoring'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/censoring/') ?>"><?php echo __('Censoring') ?></a></li>
 					<li<?php if ($page == 'parser') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/parser/') ?>"><?php echo $lang_admin_common['Parser'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/parser/') ?>"><?php echo __('Parser') ?></a></li>
 					<li<?php if ($page == 'maintenance') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/maintenance/') ?>"><?php echo $lang_admin_common['Maintenance'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/maintenance/') ?>"><?php echo __('Maintenance') ?></a></li>
 				</ul>
 			</div>
 		</div>
@@ -90,7 +90,7 @@
     // Did we find any plugins?
     if (!empty($plugins)) {
         ?>
-		<h2 class="block2"><span><?php echo $lang_admin_common['Plugins menu'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('Plugins menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
diff --git a/style/FeatherBB/view/admin/options.php b/style/FeatherBB/view/admin/options.php
index 00d01f78..a19ccddb 100644
--- a/style/FeatherBB/view/admin/options.php
+++ b/style/FeatherBB/view/admin/options.php
@@ -14,180 +14,180 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_options['Options head'] ?></span></h2>
+		<h2><span><?php echo __('Options head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/options/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" /></p>
+				<p class="submittop"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
 				<div class="inform">
 					<input type="hidden" name="form_sent" value="1" />
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Essentials subhead'] ?></legend>
+						<legend><?php echo __('Essentials subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Board title label'] ?></th>
+									<th scope="row"><?php echo __('Board title label') ?></th>
 									<td>
 										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather_config['o_board_title']) ?>" />
-										<span><?php echo $lang_admin_options['Board title help'] ?></span>
+										<span><?php echo __('Board title help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Board desc label'] ?></th>
+									<th scope="row"><?php echo __('Board desc label') ?></th>
 									<td>
 										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather_config['o_board_desc']) ?></textarea>
-										<span><?php echo $lang_admin_options['Board desc help'] ?></span>
+										<span><?php echo __('Board desc help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Base URL label'] ?></th>
+									<th scope="row"><?php echo __('Base URL label') ?></th>
 									<td>
 										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather_config['o_base_url']) ?>" />
-										<span><?php echo $lang_admin_options['Base URL help'] ?></span>
+										<span><?php echo __('Base URL help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Timezone label'] ?></th>
+									<th scope="row"><?php echo __('Timezone label') ?></th>
 									<td>
 										<select name="form_default_timezone">
 											<option value="-12"<?php if ($feather_config['o_default_timezone'] == -12) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-12:00'] ?></option>
+} ?>><?php echo __('UTC-12:00') ?></option>
 											<option value="-11"<?php if ($feather_config['o_default_timezone'] == -11) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-11:00'] ?></option>
+} ?>><?php echo __('UTC-11:00') ?></option>
 											<option value="-10"<?php if ($feather_config['o_default_timezone'] == -10) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-10:00'] ?></option>
+} ?>><?php echo __('UTC-10:00') ?></option>
 											<option value="-9.5"<?php if ($feather_config['o_default_timezone'] == -9.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-09:30'] ?></option>
+} ?>><?php echo __('UTC-09:30') ?></option>
 											<option value="-9"<?php if ($feather_config['o_default_timezone'] == -9) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-09:00'] ?></option>
+} ?>><?php echo __('UTC-09:00') ?></option>
 											<option value="-8.5"<?php if ($feather_config['o_default_timezone'] == -8.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-08:30'] ?></option>
+} ?>><?php echo __('UTC-08:30') ?></option>
 											<option value="-8"<?php if ($feather_config['o_default_timezone'] == -8) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-08:00'] ?></option>
+} ?>><?php echo __('UTC-08:00') ?></option>
 											<option value="-7"<?php if ($feather_config['o_default_timezone'] == -7) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-07:00'] ?></option>
+} ?>><?php echo __('UTC-07:00') ?></option>
 											<option value="-6"<?php if ($feather_config['o_default_timezone'] == -6) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-06:00'] ?></option>
+} ?>><?php echo __('UTC-06:00') ?></option>
 											<option value="-5"<?php if ($feather_config['o_default_timezone'] == -5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-05:00'] ?></option>
+} ?>><?php echo __('UTC-05:00') ?></option>
 											<option value="-4"<?php if ($feather_config['o_default_timezone'] == -4) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-04:00'] ?></option>
+} ?>><?php echo __('UTC-04:00') ?></option>
 											<option value="-3.5"<?php if ($feather_config['o_default_timezone'] == -3.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-03:30'] ?></option>
+} ?>><?php echo __('UTC-03:30') ?></option>
 											<option value="-3"<?php if ($feather_config['o_default_timezone'] == -3) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-03:00'] ?></option>
+} ?>><?php echo __('UTC-03:00') ?></option>
 											<option value="-2"<?php if ($feather_config['o_default_timezone'] == -2) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-02:00'] ?></option>
+} ?>><?php echo __('UTC-02:00') ?></option>
 											<option value="-1"<?php if ($feather_config['o_default_timezone'] == -1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-01:00'] ?></option>
+} ?>><?php echo __('UTC-01:00') ?></option>
 											<option value="0"<?php if ($feather_config['o_default_timezone'] == 0) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC'] ?></option>
+} ?>><?php echo __('UTC') ?></option>
 											<option value="1"<?php if ($feather_config['o_default_timezone'] == 1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+01:00'] ?></option>
+} ?>><?php echo __('UTC+01:00') ?></option>
 											<option value="2"<?php if ($feather_config['o_default_timezone'] == 2) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+02:00'] ?></option>
+} ?>><?php echo __('UTC+02:00') ?></option>
 											<option value="3"<?php if ($feather_config['o_default_timezone'] == 3) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+03:00'] ?></option>
+} ?>><?php echo __('UTC+03:00') ?></option>
 											<option value="3.5"<?php if ($feather_config['o_default_timezone'] == 3.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+03:30'] ?></option>
+} ?>><?php echo __('UTC+03:30') ?></option>
 											<option value="4"<?php if ($feather_config['o_default_timezone'] == 4) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+04:00'] ?></option>
+} ?>><?php echo __('UTC+04:00') ?></option>
 											<option value="4.5"<?php if ($feather_config['o_default_timezone'] == 4.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+04:30'] ?></option>
+} ?>><?php echo __('UTC+04:30') ?></option>
 											<option value="5"<?php if ($feather_config['o_default_timezone'] == 5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+05:00'] ?></option>
+} ?>><?php echo __('UTC+05:00') ?></option>
 											<option value="5.5"<?php if ($feather_config['o_default_timezone'] == 5.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+05:30'] ?></option>
+} ?>><?php echo __('UTC+05:30') ?></option>
 											<option value="5.75"<?php if ($feather_config['o_default_timezone'] == 5.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+05:45'] ?></option>
+} ?>><?php echo __('UTC+05:45') ?></option>
 											<option value="6"<?php if ($feather_config['o_default_timezone'] == 6) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+06:00'] ?></option>
+} ?>><?php echo __('UTC+06:00') ?></option>
 											<option value="6.5"<?php if ($feather_config['o_default_timezone'] == 6.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+06:30'] ?></option>
+} ?>><?php echo __('UTC+06:30') ?></option>
 											<option value="7"<?php if ($feather_config['o_default_timezone'] == 7) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+07:00'] ?></option>
+} ?>><?php echo __('UTC+07:00') ?></option>
 											<option value="8"<?php if ($feather_config['o_default_timezone'] == 8) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+08:00'] ?></option>
+} ?>><?php echo __('UTC+08:00') ?></option>
 											<option value="8.75"<?php if ($feather_config['o_default_timezone'] == 8.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+08:45'] ?></option>
+} ?>><?php echo __('UTC+08:45') ?></option>
 											<option value="9"<?php if ($feather_config['o_default_timezone'] == 9) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+09:00'] ?></option>
+} ?>><?php echo __('UTC+09:00') ?></option>
 											<option value="9.5"<?php if ($feather_config['o_default_timezone'] == 9.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+09:30'] ?></option>
+} ?>><?php echo __('UTC+09:30') ?></option>
 											<option value="10"<?php if ($feather_config['o_default_timezone'] == 10) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+10:00'] ?></option>
+} ?>><?php echo __('UTC+10:00') ?></option>
 											<option value="10.5"<?php if ($feather_config['o_default_timezone'] == 10.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+10:30'] ?></option>
+} ?>><?php echo __('UTC+10:30') ?></option>
 											<option value="11"<?php if ($feather_config['o_default_timezone'] == 11) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+11:00'] ?></option>
+} ?>><?php echo __('UTC+11:00') ?></option>
 											<option value="11.5"<?php if ($feather_config['o_default_timezone'] == 11.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+11:30'] ?></option>
+} ?>><?php echo __('UTC+11:30') ?></option>
 											<option value="12"<?php if ($feather_config['o_default_timezone'] == 12) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+12:00'] ?></option>
+} ?>><?php echo __('UTC+12:00') ?></option>
 											<option value="12.75"<?php if ($feather_config['o_default_timezone'] == 12.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+12:45'] ?></option>
+} ?>><?php echo __('UTC+12:45') ?></option>
 											<option value="13"<?php if ($feather_config['o_default_timezone'] == 13) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+13:00'] ?></option>
+} ?>><?php echo __('UTC+13:00') ?></option>
 											<option value="14"<?php if ($feather_config['o_default_timezone'] == 14) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+14:00'] ?></option>
+} ?>><?php echo __('UTC+14:00') ?></option>
 										</select>
-										<span><?php echo $lang_admin_options['Timezone help'] ?></span>
+										<span><?php echo __('Timezone help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['DST label'] ?></th>
+									<th scope="row"><?php echo __('DST label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather_config['o_default_dst'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather_config['o_default_dst'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['DST help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('DST help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Language label'] ?></th>
+									<th scope="row"><?php echo __('Language label') ?></th>
 									<td>
 										<select name="form_default_lang">
 <?php
@@ -201,16 +201,16 @@
 
 ?>
 										</select>
-										<span><?php echo $lang_admin_options['Language help'] ?></span>
+										<span><?php echo __('Language help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Default style label'] ?></th>
+									<th scope="row"><?php echo __('Default style label') ?></th>
 									<td>
 										<select name="form_default_style">
 											<?php echo $styles; ?>
 										</select>
-										<span><?php echo $lang_admin_options['Default style help'] ?></span>
+										<span><?php echo __('Default style help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -225,42 +225,42 @@
 ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Timeouts subhead'] ?></legend>
+						<legend><?php echo __('Timeouts subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Time format label'] ?></th>
+									<th scope="row"><?php echo __('Time format label') ?></th>
 									<td>
 										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_time_format']) ?>" />
-										<span><?php printf($lang_admin_options['Time format help'], gmdate($feather_config['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.$lang_admin_options['PHP manual'].'</a>') ?></span>
+										<span><?php printf(__('Time format help'), gmdate($feather_config['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Date format label'] ?></th>
+									<th scope="row"><?php echo __('Date format label') ?></th>
 									<td>
 										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_date_format']) ?>" />
-										<span><?php printf($lang_admin_options['Date format help'], gmdate($feather_config['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.$lang_admin_options['PHP manual'].'</a>') ?></span>
+										<span><?php printf(__('Date format help'), gmdate($feather_config['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Visit timeout label'] ?></th>
+									<th scope="row"><?php echo __('Visit timeout label') ?></th>
 									<td>
 										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_visit'] ?>" />
-										<span><?php echo $lang_admin_options['Visit timeout help'] ?></span>
+										<span><?php echo __('Visit timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Online timeout label'] ?></th>
+									<th scope="row"><?php echo __('Online timeout label') ?></th>
 									<td>
 										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_online'] ?>" />
-										<span><?php echo $lang_admin_options['Online timeout help'] ?></span>
+										<span><?php echo __('Online timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Redirect time label'] ?></th>
+									<th scope="row"><?php echo __('Redirect time label') ?></th>
 									<td>
 										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather_config['o_redirect_delay'] ?>" />
-										<span><?php echo $lang_admin_options['Redirect time help'] ?></span>
+										<span><?php echo __('Redirect time help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -269,114 +269,114 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Display subhead'] ?></legend>
+						<legend><?php echo __('Display subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Version number label'] ?></th>
+									<th scope="row"><?php echo __('Version number label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather_config['o_show_version'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather_config['o_show_version'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Version number help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Version number help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Info in posts label'] ?></th>
+									<th scope="row"><?php echo __('Info in posts label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather_config['o_show_user_info'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather_config['o_show_user_info'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Info in posts help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Info in posts help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Post count label'] ?></th>
+									<th scope="row"><?php echo __('Post count label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather_config['o_show_post_count'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather_config['o_show_post_count'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Post count help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Post count help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Smilies label'] ?></th>
+									<th scope="row"><?php echo __('Smilies label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather_config['o_smilies'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather_config['o_smilies'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Smilies help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Smilies help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Smilies sigs label'] ?></th>
+									<th scope="row"><?php echo __('Smilies sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather_config['o_smilies_sig'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather_config['o_smilies_sig'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Smilies sigs help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Smilies sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Clickable links label'] ?></th>
+									<th scope="row"><?php echo __('Clickable links label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather_config['o_make_links'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather_config['o_make_links'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Clickable links help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Clickable links help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Topic review label'] ?></th>
+									<th scope="row"><?php echo __('Topic review label') ?></th>
 									<td>
 										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather_config['o_topic_review'] ?>" />
-										<span><?php echo $lang_admin_options['Topic review help'] ?></span>
+										<span><?php echo __('Topic review help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Topics per page label'] ?></th>
+									<th scope="row"><?php echo __('Topics per page label') ?></th>
 									<td>
 										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_topics_default'] ?>" />
-										<span><?php echo $lang_admin_options['Topics per page help'] ?></span>
+										<span><?php echo __('Topics per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Posts per page label'] ?></th>
+									<th scope="row"><?php echo __('Posts per page label') ?></th>
 									<td>
 										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_posts_default'] ?>" />
-										<span><?php echo $lang_admin_options['Posts per page help'] ?></span>
+										<span><?php echo __('Posts per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Indent label'] ?></th>
+									<th scope="row"><?php echo __('Indent label') ?></th>
 									<td>
 										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather_config['o_indent_num_spaces'] ?>" />
-										<span><?php echo $lang_admin_options['Indent help'] ?></span>
+										<span><?php echo __('Indent help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Quote depth label'] ?></th>
+									<th scope="row"><?php echo __('Quote depth label') ?></th>
 									<td>
 										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather_config['o_quote_depth'] ?>" />
-										<span><?php echo $lang_admin_options['Quote depth help'] ?></span>
+										<span><?php echo __('Quote depth help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -385,122 +385,122 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Features subhead'] ?></legend>
+						<legend><?php echo __('Features subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Quick post label'] ?></th>
+									<th scope="row"><?php echo __('Quick post label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather_config['o_quickpost'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather_config['o_quickpost'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Quick post help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Quick post help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Users online label'] ?></th>
+									<th scope="row"><?php echo __('Users online label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather_config['o_users_online'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather_config['o_users_online'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Users online help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Users online help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><a name="censoring"></a><?php echo $lang_admin_options['Censor words label'] ?></th>
+									<th scope="row"><a name="censoring"></a><?php echo __('Censor words label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather_config['o_censoring'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather_config['o_censoring'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php printf($lang_admin_options['Censor words help'], '<a href="'.get_link('admin/censoring/').'">'.$lang_admin_common['Censoring'].'</a>') ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><a name="signatures"></a><?php echo $lang_admin_options['Signatures label'] ?></th>
+									<th scope="row"><a name="signatures"></a><?php echo __('Signatures label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather_config['o_signatures'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather_config['o_signatures'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Signatures help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Signatures help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['User has posted label'] ?></th>
+									<th scope="row"><?php echo __('User has posted label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather_config['o_show_dot'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather_config['o_show_dot'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['User has posted help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('User has posted help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Topic views label'] ?></th>
+									<th scope="row"><?php echo __('Topic views label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather_config['o_topic_views'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather_config['o_topic_views'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Topic views help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Topic views help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Quick jump label'] ?></th>
+									<th scope="row"><?php echo __('Quick jump label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather_config['o_quickjump'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather_config['o_quickjump'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Quick jump help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Quick jump help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['GZip label'] ?></th>
+									<th scope="row"><?php echo __('GZip label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather_config['o_gzip'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather_config['o_gzip'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['GZip help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('GZip help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Search all label'] ?></th>
+									<th scope="row"><?php echo __('Search all label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather_config['o_search_all_forums'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather_config['o_search_all_forums'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Search all help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Search all help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Menu items label'] ?></th>
+									<th scope="row"><?php echo __('Menu items label') ?></th>
 									<td>
 										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather_config['o_additional_navlinks']) ?></textarea>
-										<span><?php echo $lang_admin_options['Menu items help'] ?></span>
+										<span><?php echo __('Menu items help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -509,34 +509,34 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Feed subhead'] ?></legend>
+						<legend><?php echo __('Feed subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Default feed label'] ?></th>
+									<th scope="row"><?php echo __('Default feed label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather_config['o_feed_type'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_options['None'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('None') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather_config['o_feed_type'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_options['RSS'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('RSS') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather_config['o_feed_type'] == '2') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_options['Atom'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Default feed help'] ?></span>
+} ?> />&#160;<strong><?php echo __('Atom') ?></strong></label>
+										<span class="clearb"><?php echo __('Default feed help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Feed TTL label'] ?></th>
+									<th scope="row"><?php echo __('Feed TTL label') ?></th>
 									<td>
 										<select name="form_feed_ttl">
 											<option value="0"<?php if ($feather_config['o_feed_ttl'] == '0') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['No cache'] ?></option>
+} ?>><?php echo __('No cache') ?></option>
 											<?php echo $times ?>
 										</select>
-										<span><?php echo $lang_admin_options['Feed TTL help'] ?></span>
+										<span><?php echo __('Feed TTL help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -545,29 +545,29 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Reports subhead'] ?></legend>
+						<legend><?php echo __('Reports subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Reporting method label'] ?></th>
+									<th scope="row"><?php echo __('Reporting method label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather_config['o_report_method'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_options['Internal'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Internal') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather_config['o_report_method'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_options['By e-mail'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('By e-mail') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather_config['o_report_method'] == '2') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_options['Both'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Reporting method help'] ?></span>
+} ?> />&#160;<strong><?php echo __('Both') ?></strong></label>
+										<span class="clearb"><?php echo __('Reporting method help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Mailing list label'] ?></th>
+									<th scope="row"><?php echo __('Mailing list label') ?></th>
 									<td>
 										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather_config['o_mailing_list']) ?></textarea>
-										<span><?php echo $lang_admin_options['Mailing list help'] ?></span>
+										<span><?php echo __('Mailing list help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -576,47 +576,47 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Avatars subhead'] ?></legend>
+						<legend><?php echo __('Avatars subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Use avatars label'] ?></th>
+									<th scope="row"><?php echo __('Use avatars label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather_config['o_avatars'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather_config['o_avatars'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Use avatars help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Use avatars help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Upload directory label'] ?></th>
+									<th scope="row"><?php echo __('Upload directory label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather_config['o_avatars_dir']) ?>" />
-										<span><?php echo $lang_admin_options['Upload directory help'] ?></span>
+										<span><?php echo __('Upload directory help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Max width label'] ?></th>
+									<th scope="row"><?php echo __('Max width label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_width'] ?>" />
-										<span><?php echo $lang_admin_options['Max width help'] ?></span>
+										<span><?php echo __('Max width help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Max height label'] ?></th>
+									<th scope="row"><?php echo __('Max height label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_height'] ?>" />
-										<span><?php echo $lang_admin_options['Max height help'] ?></span>
+										<span><?php echo __('Max height help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Max size label'] ?></th>
+									<th scope="row"><?php echo __('Max size label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-										<span><?php echo $lang_admin_options['Max size help'] ?></span>
+										<span><?php echo __('Max size help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -625,81 +625,81 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['E-mail subhead'] ?></legend>
+						<legend><?php echo __('E-mail subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Admin e-mail label'] ?></th>
+									<th scope="row"><?php echo __('Admin e-mail label') ?></th>
 									<td>
 										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_admin_email']) ?>" />
-										<span><?php echo $lang_admin_options['Admin e-mail help'] ?></span>
+										<span><?php echo __('Admin e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Webmaster e-mail label'] ?></th>
+									<th scope="row"><?php echo __('Webmaster e-mail label') ?></th>
 									<td>
 										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_webmaster_email']) ?>" />
-										<span><?php echo $lang_admin_options['Webmaster e-mail help'] ?></span>
+										<span><?php echo __('Webmaster e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Forum subscriptions label'] ?></th>
+									<th scope="row"><?php echo __('Forum subscriptions label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather_config['o_forum_subscriptions'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather_config['o_forum_subscriptions'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Forum subscriptions help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Forum subscriptions help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Topic subscriptions label'] ?></th>
+									<th scope="row"><?php echo __('Topic subscriptions label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather_config['o_topic_subscriptions'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather_config['o_topic_subscriptions'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Topic subscriptions help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Topic subscriptions help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['SMTP address label'] ?></th>
+									<th scope="row"><?php echo __('SMTP address label') ?></th>
 									<td>
 										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather_config['o_smtp_host']) ?>" />
-										<span><?php echo $lang_admin_options['SMTP address help'] ?></span>
+										<span><?php echo __('SMTP address help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['SMTP username label'] ?></th>
+									<th scope="row"><?php echo __('SMTP username label') ?></th>
 									<td>
 										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather_config['o_smtp_user']) ?>" />
-										<span><?php echo $lang_admin_options['SMTP username help'] ?></span>
+										<span><?php echo __('SMTP username help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['SMTP password label'] ?></th>
+									<th scope="row"><?php echo __('SMTP password label') ?></th>
 									<td>
-										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php echo $lang_admin_options['SMTP change password help'] ?></label>
+										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php echo __('SMTP change password help') ?></label>
 <?php $smtp_pass = !empty($feather_config['o_smtp_pass']) ? random_key(feather_strlen($feather_config['o_smtp_pass']), true) : ''; ?>
 										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
-										<span><?php echo $lang_admin_options['SMTP password help'] ?></span>
+										<span><?php echo __('SMTP password help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['SMTP SSL label'] ?></th>
+									<th scope="row"><?php echo __('SMTP SSL label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather_config['o_smtp_ssl'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather_config['o_smtp_ssl'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['SMTP SSL help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('SMTP SSL help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -708,77 +708,77 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Registration subhead'] ?></legend>
+						<legend><?php echo __('Registration subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Allow new label'] ?></th>
+									<th scope="row"><?php echo __('Allow new label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather_config['o_regs_allow'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather_config['o_regs_allow'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Allow new help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Allow new help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Verify label'] ?></th>
+									<th scope="row"><?php echo __('Verify label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather_config['o_regs_verify'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather_config['o_regs_verify'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Verify help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Verify help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Report new label'] ?></th>
+									<th scope="row"><?php echo __('Report new label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather_config['o_regs_report'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather_config['o_regs_report'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Report new help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Report new help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Use rules label'] ?></th>
+									<th scope="row"><?php echo __('Use rules label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather_config['o_rules'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather_config['o_rules'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Use rules help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Use rules help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Rules label'] ?></th>
+									<th scope="row"><?php echo __('Rules label') ?></th>
 									<td>
 										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather_config['o_rules_message']) ?></textarea>
-										<span><?php echo $lang_admin_options['Rules help'] ?></span>
+										<span><?php echo __('Rules help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['E-mail default label'] ?></th>
+									<th scope="row"><?php echo __('E-mail default label') ?></th>
 									<td>
-										<span><?php echo $lang_admin_options['E-mail default help'] ?></span>
+										<span><?php echo __('E-mail default help') ?></span>
 										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather_config['o_default_email_setting'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<?php echo $lang_admin_options['Display e-mail label'] ?></label>
+} ?> />&#160;<?php echo __('Display e-mail label') ?></label>
 										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather_config['o_default_email_setting'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<?php echo $lang_admin_options['Hide allow form label'] ?></label>
+} ?> />&#160;<?php echo __('Hide allow form label') ?></label>
 										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather_config['o_default_email_setting'] == '2') {
     echo ' checked="checked"';
-} ?> />&#160;<?php echo $lang_admin_options['Hide both label'] ?></label>
+} ?> />&#160;<?php echo __('Hide both label') ?></label>
 									</td>
 								</tr>
 							</table>
@@ -787,26 +787,26 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Announcement subhead'] ?></legend>
+						<legend><?php echo __('Announcement subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Display announcement label'] ?></th>
+									<th scope="row"><?php echo __('Display announcement label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather_config['o_announcement'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather_config['o_announcement'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Display announcement help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Display announcement help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Announcement message label'] ?></th>
+									<th scope="row"><?php echo __('Announcement message label') ?></th>
 									<td>
 										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_announcement_message']) ?></textarea>
-										<span><?php echo $lang_admin_options['Announcement message help'] ?></span>
+										<span><?php echo __('Announcement message help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -815,33 +815,33 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Maintenance subhead'] ?></legend>
+						<legend><?php echo __('Maintenance subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><a name="maintenance"></a><?php echo $lang_admin_options['Maintenance mode label'] ?></th>
+									<th scope="row"><a name="maintenance"></a><?php echo __('Maintenance mode label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather_config['o_maintenance'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather_config['o_maintenance'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Maintenance mode help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Maintenance mode help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Maintenance message label'] ?></th>
+									<th scope="row"><?php echo __('Maintenance message label') ?></th>
 									<td>
 										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_maintenance_message']) ?></textarea>
-										<span><?php echo $lang_admin_options['Maintenance message help'] ?></span>
+										<span><?php echo __('Maintenance message help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" /></p>
+				<p class="submitend"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/parser.php b/style/FeatherBB/view/admin/parser.php
index 84a0528e..8049bc52 100644
--- a/style/FeatherBB/view/admin/parser.php
+++ b/style/FeatherBB/view/admin/parser.php
@@ -19,7 +19,7 @@
 			<form method="post" action="<?php echo get_link('admin/parser/') ?>" enctype="multipart/form-data">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop">
-					<input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" />
+					<input type="submit" name="save" value="<?php echo __('Save changes') ?>" />
 					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
 				</p>
 				<div class="inform">
@@ -33,9 +33,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[textile]" value="1"<?php if ($config['textile']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['Yes'] ?></strong>   <input type="radio" name="config[textile]" value="0"<?php if (!$config['textile']) {
+} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[textile]" value="0"<?php if (!$config['textile']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+} ?> /> <strong><?php echo __('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['textile help'] ?></span>
@@ -46,9 +46,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[quote_links]" value="1"<?php if ($config['quote_links']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['Yes'] ?></strong>   <input type="radio" name="config[quote_links]" value="0"<?php if (!$config['quote_links']) {
+} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[quote_links]" value="0"<?php if (!$config['quote_links']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+} ?> /> <strong><?php echo __('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['quote_links help'] ?></span>
@@ -59,9 +59,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[quote_imgs]" value="1"<?php if ($config['quote_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['Yes'] ?></strong>   <input type="radio" name="config[quote_imgs]" value="0"<?php if (!$config['quote_imgs']) {
+} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[quote_imgs]" value="0"<?php if (!$config['quote_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+} ?> /> <strong><?php echo __('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['quote_imgs help'] ?></span>
@@ -72,9 +72,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[click_imgs]" value="1"<?php if ($config['click_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['Yes'] ?></strong>   <input type="radio" name="config[click_imgs]" value="0"<?php if (!$config['click_imgs']) {
+} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[click_imgs]" value="0"<?php if (!$config['click_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+} ?> /> <strong><?php echo __('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['click_imgs help'] ?></span>
@@ -88,12 +88,12 @@
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
     echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php echo $lang_admin_common['Yes'] ?></strong>
+} ?> /> <strong><?php echo __('Yes') ?></strong>
 										<input type="radio" name="config[valid_imgs]" value="0"<?php if (!$config['valid_imgs']) {
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
     echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+} ?> /> <strong><?php echo __('No') ?></strong>
 									</td>
 									<td><?php echo $lang_admin_parser['valid_imgs help'] ?></td>
 								</tr>
@@ -257,19 +257,19 @@
 										<input type="radio" name="<?php echo($tagname) ?>_in_post" value="1"<?php if ($bbcd[$tagname]['in_post']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo $lang_admin_common['Yes'] ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_post" value="0"<?php if (!$bbcd[$tagname]['in_post']) {
+    ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_post" value="0"<?php if (!$bbcd[$tagname]['in_post']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+    ?> /> <strong><?php echo __('No') ?></strong>
 									</td>
 									<td>
 										<input type="radio" name="<?php echo($tagname) ?>_in_sig" value="1"<?php if ($bbcd[$tagname]['in_sig']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo $lang_admin_common['Yes'] ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_sig" value="0"<?php if (!$bbcd[$tagname]['in_sig']) {
+    ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_sig" value="0"<?php if (!$bbcd[$tagname]['in_sig']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+    ?> /> <strong><?php echo __('No') ?></strong>
 									</td>
 									<td>
 										<input type="text" size="10" name="<?php echo($tagname) ?>_depth_max" value="<?php echo($bbcd[$tagname]['depth_max']);
@@ -289,7 +289,7 @@
 
 
 				<p class="submitend">
-					<input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" />
+					<input type="submit" name="save" value="<?php echo __('Save changes') ?>" />
 					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
 				</p>
 			</form>
diff --git a/style/FeatherBB/view/admin/permissions.php b/style/FeatherBB/view/admin/permissions.php
index bb73f56c..34fe64cb 100644
--- a/style/FeatherBB/view/admin/permissions.php
+++ b/style/FeatherBB/view/admin/permissions.php
@@ -14,75 +14,75 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_permissions['Permissions head'] ?></span></h2>
+		<h2><span><?php echo __('Permissions head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/permissions/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" /></p>
+				<p class="submittop"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
 				<div class="inform">
 					<input type="hidden" name="form_sent" value="1" />
 					<fieldset>
-						<legend><?php echo $lang_admin_permissions['Posting subhead'] ?></legend>
+						<legend><?php echo __('Posting subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['BBCode label'] ?></th>
+									<th scope="row"><?php echo __('BBCode label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather_config['p_message_bbcode'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather_config['p_message_bbcode'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['BBCode help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('BBCode help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['Image tag label'] ?></th>
+									<th scope="row"><?php echo __('Image tag label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather_config['p_message_img_tag'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather_config['p_message_img_tag'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['Image tag help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Image tag help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['All caps message label'] ?></th>
+									<th scope="row"><?php echo __('All caps message label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather_config['p_message_all_caps'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather_config['p_message_all_caps'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['All caps message help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('All caps message help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['All caps subject label'] ?></th>
+									<th scope="row"><?php echo __('All caps subject label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather_config['p_subject_all_caps'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather_config['p_subject_all_caps'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['All caps subject help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('All caps subject help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['Require e-mail label'] ?></th>
+									<th scope="row"><?php echo __('Require e-mail label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather_config['p_force_guest_email'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather_config['p_force_guest_email'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['Require e-mail help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Require e-mail help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -91,57 +91,57 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_permissions['Signatures subhead'] ?></legend>
+						<legend><?php echo __('Signatures subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['BBCode sigs label'] ?></th>
+									<th scope="row"><?php echo __('BBCode sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather_config['p_sig_bbcode'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather_config['p_sig_bbcode'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['BBCode sigs help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('BBCode sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['Image tag sigs label'] ?></th>
+									<th scope="row"><?php echo __('Image tag sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather_config['p_sig_img_tag'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather_config['p_sig_img_tag'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['Image tag sigs help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Image tag sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['All caps sigs label'] ?></th>
+									<th scope="row"><?php echo __('All caps sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather_config['p_sig_all_caps'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather_config['p_sig_all_caps'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['All caps sigs help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('All caps sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['Max sig length label'] ?></th>
+									<th scope="row"><?php echo __('Max sig length label') ?></th>
 									<td>
 										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather_config['p_sig_length'] ?>" />
-										<span class="clearb"><?php echo $lang_admin_permissions['Max sig length help'] ?></span>
+										<span class="clearb"><?php echo __('Max sig length help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['Max sig lines label'] ?></th>
+									<th scope="row"><?php echo __('Max sig lines label') ?></th>
 									<td>
 										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather_config['p_sig_lines'] ?>" />
-										<span class="clearb"><?php echo $lang_admin_permissions['Max sig lines help'] ?></span>
+										<span class="clearb"><?php echo __('Max sig lines help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -150,38 +150,38 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_permissions['Registration subhead'] ?></legend>
+						<legend><?php echo __('Registration subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['Banned e-mail label'] ?></th>
+									<th scope="row"><?php echo __('Banned e-mail label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather_config['p_allow_banned_email'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather_config['p_allow_banned_email'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['Banned e-mail help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Banned e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['Duplicate e-mail label'] ?></th>
+									<th scope="row"><?php echo __('Duplicate e-mail label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather_config['p_allow_dupe_email'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather_config['p_allow_dupe_email'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['Duplicate e-mail help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Duplicate e-mail help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" /></p>
+				<p class="submitend"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/reports.php b/style/FeatherBB/view/admin/reports.php
index 77523caa..605637c6 100644
--- a/style/FeatherBB/view/admin/reports.php
+++ b/style/FeatherBB/view/admin/reports.php
@@ -14,7 +14,7 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_reports['New reports head'] ?></span></h2>
+		<h2><span><?php echo __('New reports head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/reports/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -24,17 +24,17 @@
         ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php printf($lang_admin_reports['Report subhead'], format_time($report['created'])) ?></legend>
+						<legend><?php printf(__('Report subhead'), format_time($report['created'])) ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf($lang_admin_reports['Reported by'], ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : $lang_admin_reports['Deleted user']) ?></th>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
 									<td class="location"><?php echo breadcrumbs(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
-																						sprintf($lang_admin_reports['Post ID'], $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_reports['Reason'] ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php echo $lang_admin_reports['Zap'] ?>" /></div></th>
+									<th scope="row"><?php echo __('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php echo __('Zap') ?>" /></div></th>
 									<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
 								</tr>
 							</table>
@@ -48,9 +48,9 @@
     ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_common['None'] ?></legend>
+						<legend><?php echo __('None') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_reports['No new reports'] ?></p>
+							<p><?php echo __('No new reports') ?></p>
 						</div>
 					</fieldset>
 				</div>
@@ -64,7 +64,7 @@
 	</div>
 
 	<div class="blockform block2">
-		<h2><span><?php echo $lang_admin_reports['Last 10 head'] ?></span></h2>
+		<h2><span><?php echo __('Last 10 head') ?></span></h2>
 		<div class="box">
 			<div class="fakeform">
 <?php
@@ -74,17 +74,17 @@
         ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php printf($lang_admin_reports['Zapped subhead'], format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.get_link('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : $lang_admin_reports['NA']) ?></legend>
+						<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.get_link('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf($lang_admin_reports['Reported by'], ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : $lang_admin_reports['Deleted user']) ?></th>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
 									<td class="location"><?php echo breadcrumbs(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
-																						sprintf($lang_admin_reports['Post ID'], $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_reports['Reason'] ?></th>
+									<th scope="row"><?php echo __('Reason') ?></th>
 									<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
 								</tr>
 							</table>
@@ -98,9 +98,9 @@
     ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_common['None'] ?></legend>
+						<legend><?php echo __('None') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_reports['No zapped reports'] ?></p>
+							<p><?php echo __('No zapped reports') ?></p>
 						</div>
 					</fieldset>
 				</div>
diff --git a/style/FeatherBB/view/admin/statistics.php b/style/FeatherBB/view/admin/statistics.php
index cd714e16..522bbb5d 100644
--- a/style/FeatherBB/view/admin/statistics.php
+++ b/style/FeatherBB/view/admin/statistics.php
@@ -14,24 +14,24 @@
 ?>
 
 	<div class="block">
-		<h2><span><?php echo $lang_admin_index['Server statistics head'] ?></span></h2>
+		<h2><span><?php echo __('Server statistics head') ?></span></h2>
 		<div id="adstats" class="box">
 			<div class="inbox">
 				<dl>
-					<dt><?php echo $lang_admin_index['Server load label'] ?></dt>
+					<dt><?php echo __('Server load label') ?></dt>
 					<dd>
-						<?php printf($lang_admin_index['Server load data']."\n", $server_load, $num_online) ?>
+						<?php printf(__('Server load data')."\n", $server_load, $num_online) ?>
 					</dd>
-<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php echo $lang_admin_index['Environment label'] ?></dt>
+<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php echo __('Environment label') ?></dt>
 					<dd>
-						<?php printf($lang_admin_index['Environment data OS'], PHP_OS) ?><br />
-						<?php printf($lang_admin_index['Environment data version'], phpversion(), '<a href="'.get_link('admin/phpinfo/').'">'.$lang_admin_index['Show info'].'</a>') ?><br />
-						<?php printf($lang_admin_index['Environment data acc']."\n", $php_accelerator) ?>
+						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
+						<?php printf(__('Environment data version'), phpversion(), '<a href="'.get_link('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
+						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
 					</dd>
-					<dt><?php echo $lang_admin_index['Database label'] ?></dt>
+					<dt><?php echo __('Database label') ?></dt>
 					<dd>
-<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf($lang_admin_index['Database data rows']."\n", forum_number_format($total_records)) ?>
-						<br /><?php printf($lang_admin_index['Database data size']."\n", $total_size) ?>
+<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", forum_number_format($total_records)) ?>
+						<br /><?php printf(__('Database data size')."\n", $total_size) ?>
 <?php endif; ?>					</dd>
 <?php endif; ?>
 				</dl>
diff --git a/style/FeatherBB/view/admin/users/admin_users.php b/style/FeatherBB/view/admin/users/admin_users.php
index 207d4ecd..f29830af 100644
--- a/style/FeatherBB/view/admin/users/admin_users.php
+++ b/style/FeatherBB/view/admin/users/admin_users.php
@@ -14,128 +14,128 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_users['User search head'] ?></span></h2>
+		<h2><span><?php echo __('User search head') ?></span></h2>
 		<div class="box">
 			<form id="find_user" method="get" action="<?php echo get_link('admin/users/') ?>">
-				<p class="submittop"><input type="submit" name="find_user" value="<?php echo $lang_admin_users['Submit search'] ?>" tabindex="1" /></p>
+				<p class="submittop"><input type="submit" name="find_user" value="<?php echo __('Submit search') ?>" tabindex="1" /></p>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_users['User search subhead'] ?></legend>
+						<legend><?php echo __('User search subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_users['User search info'] ?></p>
+							<p><?php echo __('User search info') ?></p>
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Username label'] ?></th>
+									<th scope="row"><?php echo __('Username label') ?></th>
 									<td><input type="text" name="form[username]" size="25" maxlength="25" tabindex="2" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['E-mail address label'] ?></th>
+									<th scope="row"><?php echo __('E-mail address label') ?></th>
 									<td><input type="text" name="form[email]" size="30" maxlength="80" tabindex="3" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Title label'] ?></th>
+									<th scope="row"><?php echo __('Title label') ?></th>
 									<td><input type="text" name="form[title]" size="30" maxlength="50" tabindex="4" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Real name label'] ?></th>
+									<th scope="row"><?php echo __('Real name label') ?></th>
 									<td><input type="text" name="form[realname]" size="30" maxlength="40" tabindex="5" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Website label'] ?></th>
+									<th scope="row"><?php echo __('Website label') ?></th>
 									<td><input type="text" name="form[url]" size="35" maxlength="100" tabindex="6" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Jabber label'] ?></th>
+									<th scope="row"><?php echo __('Jabber label') ?></th>
 									<td><input type="text" name="form[jabber]" size="30" maxlength="75" tabindex="7" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['ICQ label'] ?></th>
+									<th scope="row"><?php echo __('ICQ label') ?></th>
 									<td><input type="text" name="form[icq]" size="12" maxlength="12" tabindex="8" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['MSN label'] ?></th>
+									<th scope="row"><?php echo __('MSN label') ?></th>
 									<td><input type="text" name="form[msn]" size="30" maxlength="50" tabindex="9" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['AOL label'] ?></th>
+									<th scope="row"><?php echo __('AOL label') ?></th>
 									<td><input type="text" name="form[aim]" size="20" maxlength="20" tabindex="10" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Yahoo label'] ?></th>
+									<th scope="row"><?php echo __('Yahoo label') ?></th>
 									<td><input type="text" name="form[yahoo]" size="20" maxlength="20" tabindex="11" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Location label'] ?></th>
+									<th scope="row"><?php echo __('Location label') ?></th>
 									<td><input type="text" name="form[location]" size="30" maxlength="30" tabindex="12" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Signature label'] ?></th>
+									<th scope="row"><?php echo __('Signature label') ?></th>
 									<td><input type="text" name="form[signature]" size="35" maxlength="512" tabindex="13" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Admin note label'] ?></th>
+									<th scope="row"><?php echo __('Admin note label') ?></th>
 									<td><input type="text" name="form[admin_note]" size="30" maxlength="30" tabindex="14" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Posts more than label'] ?></th>
+									<th scope="row"><?php echo __('Posts more than label') ?></th>
 									<td><input type="text" name="posts_greater" size="5" maxlength="8" tabindex="15" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Posts less than label'] ?></th>
+									<th scope="row"><?php echo __('Posts less than label') ?></th>
 									<td><input type="text" name="posts_less" size="5" maxlength="8" tabindex="16" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Last post after label'] ?></th>
+									<th scope="row"><?php echo __('Last post after label') ?></th>
 									<td><input type="text" name="last_post_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php echo $lang_admin_users['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Last post before label'] ?></th>
+									<th scope="row"><?php echo __('Last post before label') ?></th>
 									<td><input type="text" name="last_post_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php echo $lang_admin_users['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Last visit after label'] ?></th>
+									<th scope="row"><?php echo __('Last visit after label') ?></th>
 									<td><input type="text" name="last_visit_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php echo $lang_admin_users['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Last visit before label'] ?></th>
+									<th scope="row"><?php echo __('Last visit before label') ?></th>
 									<td><input type="text" name="last_visit_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php echo $lang_admin_users['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Registered after label'] ?></th>
+									<th scope="row"><?php echo __('Registered after label') ?></th>
 									<td><input type="text" name="registered_after" size="24" maxlength="19" tabindex="19" />
-									<span><?php echo $lang_admin_users['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Registered before label'] ?></th>
+									<th scope="row"><?php echo __('Registered before label') ?></th>
 									<td><input type="text" name="registered_before" size="24" maxlength="19" tabindex="20" />
-									<span><?php echo $lang_admin_users['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Order by label'] ?></th>
+									<th scope="row"><?php echo __('Order by label') ?></th>
 									<td>
 										<select name="order_by" tabindex="21">
-											<option value="username" selected="selected"><?php echo $lang_admin_users['Order by username'] ?></option>
-											<option value="email"><?php echo $lang_admin_users['Order by e-mail'] ?></option>
-											<option value="num_posts"><?php echo $lang_admin_users['Order by posts'] ?></option>
-											<option value="last_post"><?php echo $lang_admin_users['Order by last post'] ?></option>
-											<option value="last_visit"><?php echo $lang_admin_users['Order by last visit'] ?></option>
-											<option value="registered"><?php echo $lang_admin_users['Order by registered'] ?></option>
+											<option value="username" selected="selected"><?php echo __('Order by username') ?></option>
+											<option value="email"><?php echo __('Order by e-mail') ?></option>
+											<option value="num_posts"><?php echo __('Order by posts') ?></option>
+											<option value="last_post"><?php echo __('Order by last post') ?></option>
+											<option value="last_visit"><?php echo __('Order by last visit') ?></option>
+											<option value="registered"><?php echo __('Order by registered') ?></option>
 										</select>&#160;&#160;&#160;<select name="direction" tabindex="22">
-											<option value="ASC" selected="selected"><?php echo $lang_admin_users['Ascending'] ?></option>
-											<option value="DESC"><?php echo $lang_admin_users['Descending'] ?></option>
+											<option value="ASC" selected="selected"><?php echo __('Ascending') ?></option>
+											<option value="DESC"><?php echo __('Descending') ?></option>
 										</select>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['User group label'] ?></th>
+									<th scope="row"><?php echo __('User group label') ?></th>
 									<td>
 										<select name="user_group" tabindex="23">
-											<option value="-1" selected="selected"><?php echo $lang_admin_users['All groups'] ?></option>
-											<option value="0"><?php echo $lang_admin_users['Unverified users'] ?></option>
+											<option value="-1" selected="selected"><?php echo __('All groups') ?></option>
+											<option value="0"><?php echo __('Unverified users') ?></option>
 											<?php echo $group_list; ?>
 										</select>
 									</td>
@@ -144,22 +144,22 @@
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="find_user" value="<?php echo $lang_admin_users['Submit search'] ?>" tabindex="25" /></p>
+				<p class="submitend"><input type="submit" name="find_user" value="<?php echo __('Submit search') ?>" tabindex="25" /></p>
 			</form>
 		</div>
 
-		<h2 class="block2"><span><?php echo $lang_admin_users['IP search head'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('IP search head') ?></span></h2>
 		<div class="box">
 			<form method="get" action="<?php echo get_link('admin/users/') ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_users['IP search subhead'] ?></legend>
+						<legend><?php echo __('IP search subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['IP address label'] ?><div><input type="submit" value="<?php echo $lang_admin_users['Find IP address'] ?>" tabindex="26" /></div></th>
+									<th scope="row"><?php echo __('IP address label') ?><div><input type="submit" value="<?php echo __('Find IP address') ?>" tabindex="26" /></div></th>
 									<td><input type="text" name="show_users" size="18" maxlength="15" tabindex="24" />
-									<span><?php echo $lang_admin_users['IP address help'] ?></span></td>
+									<span><?php echo __('IP address help') ?></span></td>
 								</tr>
 							</table>
 						</div>
diff --git a/style/FeatherBB/view/admin/users/ban_users.php b/style/FeatherBB/view/admin/users/ban_users.php
index 0d2c8b69..5d782379 100644
--- a/style/FeatherBB/view/admin/users/ban_users.php
+++ b/style/FeatherBB/view/admin/users/ban_users.php
@@ -14,43 +14,43 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_users['Ban users'] ?></span></h2>
+		<h2><span><?php echo __('Ban users') ?></span></h2>
 		<div class="box">
 			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo get_link('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_users['Message expiry subhead'] ?></legend>
+						<legend><?php echo __('Message expiry subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Ban message label'] ?></th>
+									<th scope="row"><?php echo __('Ban message label') ?></th>
 									<td>
 										<input type="text" name="ban_message" size="50" maxlength="255" tabindex="1" />
-										<span><?php echo $lang_admin_users['Ban message help'] ?></span>
+										<span><?php echo __('Ban message help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Expire date label'] ?></th>
+									<th scope="row"><?php echo __('Expire date label') ?></th>
 									<td>
 										<input type="text" name="ban_expire" size="17" maxlength="10" tabindex="2" />
-										<span><?php echo $lang_admin_users['Expire date help'] ?></span>
+										<span><?php echo __('Expire date help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Ban IP label'] ?></th>
+									<th scope="row"><?php echo __('Ban IP label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="3" value="1" checked="checked" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="4" value="0" checked="checked" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_users['Ban IP help'] ?></span>
+										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="3" value="1" checked="checked" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="4" value="0" checked="checked" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Ban IP help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="ban_users_comply" value="<?php echo $lang_admin_common['Save'] ?>" tabindex="3" /></p>
+				<p class="submitend"><input type="submit" name="ban_users_comply" value="<?php echo __('Save') ?>" tabindex="3" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/users/delete_users.php b/style/FeatherBB/view/admin/users/delete_users.php
index 3f1388f6..b3b3c36e 100644
--- a/style/FeatherBB/view/admin/users/delete_users.php
+++ b/style/FeatherBB/view/admin/users/delete_users.php
@@ -14,24 +14,24 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_users['Delete users'] ?></span></h2>
+		<h2><span><?php echo __('Delete users') ?></span></h2>
 		<div class="box">
 			<form name="confirm_del_users" method="post" action="<?php echo get_link('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_users['Confirm delete legend'] ?></legend>
+						<legend><?php echo __('Confirm delete legend') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_users['Confirm delete info'] ?></p>
+							<p><?php echo __('Confirm delete info') ?></p>
 							<div class="rbox">
-								<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo $lang_admin_users['Delete posts'] ?><br /></label>
+								<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo __('Delete posts') ?><br /></label>
 							</div>
-							<p class="warntext"><strong><?php echo $lang_admin_users['Delete warning'] ?></strong></p>
+							<p class="warntext"><strong><?php echo __('Delete warning') ?></strong></p>
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="delete_users_comply" value="<?php echo $lang_admin_users['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_admin_common['Go back'] ?></a></p>
+				<p class="buttons"><input type="submit" name="delete_users_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/users/find_users.php b/style/FeatherBB/view/admin/users/find_users.php
index 47e7763a..ee79eef6 100644
--- a/style/FeatherBB/view/admin/users/find_users.php
+++ b/style/FeatherBB/view/admin/users/find_users.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/index/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo $lang_admin_common['Users'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_admin_users['Results head'] ?></strong></li>
+			<li><a href="<?php echo get_link('admin/index/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -31,19 +31,19 @@
 <form id="search-users-form" action="<?php echo get_link('admin/users/') ?>" method="post">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <div id="users2" class="blocktable">
-	<h2><span><?php echo $lang_admin_users['Results head'] ?></span></h2>
+	<h2><span><?php echo __('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_admin_users['Results username head'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_admin_users['Results e-mail head'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_admin_users['Results title head'] ?></th>
-					<th class="tc4" scope="col"><?php echo $lang_admin_users['Results posts head'] ?></th>
-					<th class="tc5" scope="col"><?php echo $lang_admin_users['Results admin note head'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_admin_users['Results actions head'] ?></th>
-<?php if ($can_action): ?>					<th class="tcmod" scope="col"><?php echo $lang_admin_users['Select'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php echo __('Results title head') ?></th>
+					<th class="tc4" scope="col"><?php echo __('Results posts head') ?></th>
+					<th class="tc5" scope="col"><?php echo __('Results admin note head') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Results actions head') ?></th>
+<?php if ($can_action): ?>					<th class="tcmod" scope="col"><?php echo __('Select') ?></th>
 <?php endif;
     ?>
 				</tr>
@@ -59,7 +59,7 @@
 					<td class="tc3"><?php echo $user['user_title'] ?></td>
 					<td class="tc4"><?php echo forum_number_format($user['num_posts']) ?></td>
 					<td class="tc5"><?php echo($user['admin_note'] != '') ? feather_escape($user['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$user['id'].'/').'">'.$lang_admin_users['Results view IP link'].'</a> | <a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.$lang_admin_users['Results show posts link'].'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
 <?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
 <?php endif;
             ?>
@@ -68,7 +68,7 @@
 
         }
     } else {
-        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.$lang_admin_users['No match'].'</td></tr>'."\n";
+        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('No match').'</td></tr>'."\n";
     }
 
     ?>
@@ -82,17 +82,17 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
-<?php if ($can_action): ?>			<p class="conr modbuttons"><a href="#" onclick="return select_checkboxes('search-users-form', this, '<?php echo $lang_admin_users['Unselect all'] ?>')"><?php echo $lang_admin_users['Select all'] ?></a> <?php if ($can_ban) : ?><input type="submit" name="ban_users" value="<?php echo $lang_admin_users['Ban'] ?>" /><?php endif;
-    if ($can_delete) : ?><input type="submit" name="delete_users" value="<?php echo $lang_admin_users['Delete'] ?>" /><?php endif;
-    if ($can_move) : ?><input type="submit" name="move_users" value="<?php echo $lang_admin_users['Change group'] ?>" /><?php endif;
+<?php if ($can_action): ?>			<p class="conr modbuttons"><a href="#" onclick="return select_checkboxes('search-users-form', this, '<?php echo __('Unselect all') ?>')"><?php echo __('Select all') ?></a> <?php if ($can_ban) : ?><input type="submit" name="ban_users" value="<?php echo __('Ban') ?>" /><?php endif;
+    if ($can_delete) : ?><input type="submit" name="delete_users" value="<?php echo __('Delete') ?>" /><?php endif;
+    if ($can_move) : ?><input type="submit" name="move_users" value="<?php echo __('Change group') ?>" /><?php endif;
     ?></p>
 <?php endif;
     ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/index/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo $lang_admin_common['Users'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_admin_users['Results head'] ?></strong></li>
+			<li><a href="<?php echo get_link('admin/index/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/style/FeatherBB/view/admin/users/move_users.php b/style/FeatherBB/view/admin/users/move_users.php
index b82d0e71..9b785654 100644
--- a/style/FeatherBB/view/admin/users/move_users.php
+++ b/style/FeatherBB/view/admin/users/move_users.php
@@ -14,32 +14,32 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_users['Move users'] ?></span></h2>
+		<h2><span><?php echo __('Move users') ?></span></h2>
 		<div class="box">
 			<form name="confirm_move_users" method="post" action="<?php echo get_link('admin/users/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_users['Move users subhead'] ?></legend>
+						<legend><?php echo __('Move users subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['New group label'] ?></th>
+									<th scope="row"><?php echo __('New group label') ?></th>
 									<td>
 										<select name="new_group" tabindex="1">
 <?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo feather_escape($group) ?></option>
 <?php endforeach;
     ?>
 										</select>
-										<span><?php echo $lang_admin_users['New group help'] ?></span>
+										<span><?php echo __('New group help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="move_users_comply" value="<?php echo $lang_admin_common['Save'] ?>" tabindex="2" /></p>
+				<p class="submitend"><input type="submit" name="move_users_comply" value="<?php echo __('Save') ?>" tabindex="2" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/users/search_ip.php b/style/FeatherBB/view/admin/users/search_ip.php
index 108d0948..0fbb89f8 100644
--- a/style/FeatherBB/view/admin/users/search_ip.php
+++ b/style/FeatherBB/view/admin/users/search_ip.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo $lang_admin_common['Users'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_admin_users['Results head'] ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -28,16 +28,16 @@
 </div>
 
 <div id="users1" class="blocktable">
-	<h2><span><?php echo $lang_admin_users['Results head'] ?></span></h2>
+	<h2><span><?php echo __('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_admin_users['Results IP address head'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_admin_users['Results last used head'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_admin_users['Results times found head'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_admin_users['Results action head'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Results IP address head') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Results last used head') ?></th>
+					<th class="tc3" scope="col"><?php echo __('Results times found head') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Results action head') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -48,13 +48,13 @@
 					<td class="tcl"><a href="<?php echo get_link('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
 					<td class="tc2"><?php echo format_time($ip['last_used']) ?></td>
 					<td class="tc3"><?php echo $ip['used_times'] ?></td>
-					<td class="tcr"><a href="<?php echo get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php echo $lang_admin_users['Results find more link'] ?></a></td>
+					<td class="tcr"><a href="<?php echo get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php echo __('Results find more link') ?></a></td>
 				</tr>
 <?php
 
         }
         if (empty($ip_data)):
-            echo "\t\t\t\t".'<tr><td class="tcl" colspan="4">'.$lang_admin_users['Results no posts found'].'</td></tr>'."\n";
+            echo "\t\t\t\t".'<tr><td class="tcl" colspan="4">'.__('Results no posts found').'</td></tr>'."\n";
         endif;
 
     ?>
@@ -70,9 +70,9 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo $lang_admin_common['Users'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_admin_users['Results head'] ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/style/FeatherBB/view/admin/users/show_users.php b/style/FeatherBB/view/admin/users/show_users.php
index ab94c9f9..f93dba7a 100644
--- a/style/FeatherBB/view/admin/users/show_users.php
+++ b/style/FeatherBB/view/admin/users/show_users.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo $lang_admin_common['Users'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_admin_users['Results head'] ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -28,18 +28,18 @@
 </div>
 
 <div id="users2" class="blocktable">
-	<h2><span><?php echo $lang_admin_users['Results head'] ?></span></h2>
+	<h2><span><?php echo __('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_admin_users['Results username head'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_admin_users['Results e-mail head'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_admin_users['Results title head'] ?></th>
-					<th class="tc4" scope="col"><?php echo $lang_admin_users['Results posts head'] ?></th>
-					<th class="tc5" scope="col"><?php echo $lang_admin_users['Results admin note head'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_admin_users['Results actions head'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php echo __('Results title head') ?></th>
+					<th class="tc4" scope="col"><?php echo __('Results posts head') ?></th>
+					<th class="tc5" scope="col"><?php echo __('Results admin note head') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Results actions head') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -56,7 +56,7 @@
 					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
 					<td class="tc4"><?php echo forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
 					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? feather_escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.$lang_admin_users['Results view IP link'].'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.$lang_admin_users['Results show posts link'].'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
 				</tr>
 <?php
 
@@ -65,7 +65,7 @@
 				<tr>
 					<td class="tcl"><?php echo feather_escape($cur_poster['poster']) ?></td>
 					<td class="tc2">&#160;</td>
-					<td class="tc3"><?php echo $lang_admin_users['Results guest'] ?></td>
+					<td class="tc3"><?php echo __('Results guest') ?></td>
 					<td class="tc4">&#160;</td>
 					<td class="tc5">&#160;</td>
 					<td class="tcr">&#160;</td>
@@ -75,7 +75,7 @@
             }
         }
     } else {
-        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.$lang_admin_users['Results no IP found'].'</td></tr>'."\n";
+        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('Results no IP found').'</td></tr>'."\n";
     }
 
     ?>
@@ -91,9 +91,9 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo $lang_admin_common['Users'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_admin_users['Results head'] ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/admin/bans/add_ban.php b/view/admin/bans/add_ban.php
index c5943d99..28b73f89 100644
--- a/view/admin/bans/add_ban.php
+++ b/view/admin/bans/add_ban.php
@@ -14,7 +14,7 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_admin_bans['Ban advanced head'] ?></span></h2>
+	<h2><span><?php echo __('Ban advanced head') ?></span></h2>
 	<div class="box">
 		<form id="bans2" method="post" action="">
 			<div class="inform">
@@ -24,71 +24,71 @@
 				<?php endif; ?>
 				<?php if ($ban['mode'] == 'add' && isset($ban['user_id'])): ?><input type="hidden" name="ban_user_id" value="<?php echo $ban['user_id'] ?>" />
 				<?php endif; ?><fieldset>
-					<legend><?php echo $lang_admin_bans['Ban advanced subhead'] ?></legend>
+					<legend><?php echo __('Ban advanced subhead') ?></legend>
 					<div class="infldset">
 						<table class="aligntop">
 							<tr>
-								<th scope="row"><?php echo $lang_admin_bans['Username label'] ?></th>
+								<th scope="row"><?php echo __('Username label') ?></th>
 								<td>
 									<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
 										echo feather_escape($ban['ban_user']);
 									} ?>" tabindex="1" />
-									<span><?php echo $lang_admin_bans['Username help'] ?></span>
+									<span><?php echo __('Username help') ?></span>
 								</td>
 							</tr>
 							<tr>
-								<th scope="row"><?php echo $lang_admin_bans['IP label'] ?></th>
+								<th scope="row"><?php echo __('IP label') ?></th>
 								<td>
 									<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
 										echo feather_escape($ban['ip']);
 									} ?>" tabindex="2" />
-										<span><?php echo $lang_admin_bans['IP help'] ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
-												printf(' '.$lang_admin_bans['IP help link'], '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.$lang_admin_common['here'].'</a>');
+										<span><?php echo __('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
+												printf(' '.__('IP help link'), '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.__('here').'</a>');
 											} ?></span>
 								</td>
 							</tr>
 							<tr>
-								<th scope="row"><?php echo $lang_admin_bans['E-mail label'] ?></th>
+								<th scope="row"><?php echo __('E-mail label') ?></th>
 								<td>
 									<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
 										echo feather_escape($ban['email']);
 									} ?>" tabindex="3" />
-									<span><?php echo $lang_admin_bans['E-mail help'] ?></span>
+									<span><?php echo __('E-mail help') ?></span>
 								</td>
 							</tr>
 						</table>
-						<p class="topspace"><strong class="warntext"><?php echo $lang_admin_bans['Ban IP range info'] ?></strong></p>
+						<p class="topspace"><strong class="warntext"><?php echo __('Ban IP range info') ?></strong></p>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_admin_bans['Message expiry subhead'] ?></legend>
+					<legend><?php echo __('Message expiry subhead') ?></legend>
 					<div class="infldset">
 						<table class="aligntop">
 							<tr>
-								<th scope="row"><?php echo $lang_admin_bans['Ban message label'] ?></th>
+								<th scope="row"><?php echo __('Ban message label') ?></th>
 								<td>
 									<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
 										echo feather_escape($ban['message']);
 									} ?>" tabindex="4" />
-									<span><?php echo $lang_admin_bans['Ban message help'] ?></span>
+									<span><?php echo __('Ban message help') ?></span>
 								</td>
 							</tr>
 							<tr>
-								<th scope="row"><?php echo $lang_admin_bans['Expire date label'] ?></th>
+								<th scope="row"><?php echo __('Expire date label') ?></th>
 								<td>
 									<input type="text" name="ban_expire" size="17" maxlength="10" value="<?php if (isset($ban['expire'])) {
 										echo $ban['expire'];
 									} ?>" tabindex="5" />
-									<span><?php echo $lang_admin_bans['Expire date help'] ?></span>
+									<span><?php echo __('Expire date help') ?></span>
 								</td>
 							</tr>
 						</table>
 					</div>
 				</fieldset>
 			</div>
-			<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php echo $lang_admin_common['Save'] ?>" tabindex="6" /></p>
+			<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php echo __('Save') ?>" tabindex="6" /></p>
 		</form>
 	</div>
 </div>
diff --git a/view/admin/bans/admin_bans.php b/view/admin/bans/admin_bans.php
index 17664a89..e6f2b5f7 100644
--- a/view/admin/bans/admin_bans.php
+++ b/view/admin/bans/admin_bans.php
@@ -14,20 +14,20 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_bans['New ban head'] ?></span></h2>
+		<h2><span><?php echo __('New ban head') ?></span></h2>
 		<div class="box">
 			<form id="bans" method="post" action="<?php echo get_link('admin/bans/add/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_bans['Add ban subhead'] ?></legend>
+						<legend><?php echo __('Add ban subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['Username label'] ?><div><input type="submit" name="add_ban" value="<?php echo $lang_admin_common['Add'] ?>" tabindex="2" /></div></th>
+									<th scope="row"><?php echo __('Username label') ?><div><input type="submit" name="add_ban" value="<?php echo __('Add') ?>" tabindex="2" /></div></th>
 									<td>
 										<input type="text" name="new_ban_user" size="25" maxlength="25" tabindex="1" />
-										<span><?php echo $lang_admin_bans['Username advanced help'] ?></span>
+										<span><?php echo __('Username advanced help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -37,56 +37,56 @@
 			</form>
 		</div>
 
-		<h2 class="block2"><span><?php echo $lang_admin_bans['Ban search head'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('Ban search head') ?></span></h2>
 		<div class="box">
 			<form id="find_bans" method="get" action="<?php echo get_link('admin/bans/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="find_ban" value="<?php echo $lang_admin_bans['Submit search'] ?>" tabindex="3" /></p>
+				<p class="submittop"><input type="submit" name="find_ban" value="<?php echo __('Submit search') ?>" tabindex="3" /></p>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_bans['Ban search subhead'] ?></legend>
+						<legend><?php echo __('Ban search subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_bans['Ban search info'] ?></p>
+							<p><?php echo __('Ban search info') ?></p>
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['Username label'] ?></th>
+									<th scope="row"><?php echo __('Username label') ?></th>
 									<td><input type="text" name="username" size="30" maxlength="25" tabindex="4" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['IP label'] ?></th>
+									<th scope="row"><?php echo __('IP label') ?></th>
 									<td><input type="text" name="ip" size="30" maxlength="255" tabindex="5" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['E-mail label'] ?></th>
+									<th scope="row"><?php echo __('E-mail label') ?></th>
 									<td><input type="text" name="email" size="30" maxlength="80" tabindex="6" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['Message label'] ?></th>
+									<th scope="row"><?php echo __('Message label') ?></th>
 									<td><input type="text" name="message" size="30" maxlength="255" tabindex="7" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['Expire after label'] ?></th>
+									<th scope="row"><?php echo __('Expire after label') ?></th>
 									<td><input type="text" name="expire_after" size="10" maxlength="10" tabindex="8" />
-									<span><?php echo $lang_admin_bans['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['Expire before label'] ?></th>
+									<th scope="row"><?php echo __('Expire before label') ?></th>
 									<td><input type="text" name="expire_before" size="10" maxlength="10" tabindex="9" />
-									<span><?php echo $lang_admin_bans['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_bans['Order by label'] ?></th>
+									<th scope="row"><?php echo __('Order by label') ?></th>
 									<td>
 										<select name="order_by" tabindex="10">
-											<option value="username" selected="selected"><?php echo $lang_admin_bans['Order by username'] ?></option>
-											<option value="ip"><?php echo $lang_admin_bans['Order by ip'] ?></option>
-											<option value="email"><?php echo $lang_admin_bans['Order by e-mail'] ?></option>
-											<option value="expire"><?php echo $lang_admin_bans['Order by expire'] ?></option>
+											<option value="username" selected="selected"><?php echo __('Order by username') ?></option>
+											<option value="ip"><?php echo __('Order by ip') ?></option>
+											<option value="email"><?php echo __('Order by e-mail') ?></option>
+											<option value="expire"><?php echo __('Order by expire') ?></option>
 										</select>
                                         &#160;&#160;&#160;
                                         <select name="direction" tabindex="11">
-											<option value="ASC" selected="selected"><?php echo $lang_admin_bans['Ascending'] ?></option>
-											<option value="DESC"><?php echo $lang_admin_bans['Descending'] ?></option>
+											<option value="ASC" selected="selected"><?php echo __('Ascending') ?></option>
+											<option value="DESC"><?php echo __('Descending') ?></option>
 										</select>
 									</td>
 								</tr>
@@ -94,7 +94,7 @@
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="find_ban" value="<?php echo $lang_admin_bans['Submit search'] ?>" tabindex="12" /></p>
+				<p class="submitend"><input type="submit" name="find_ban" value="<?php echo __('Submit search') ?>" tabindex="12" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/bans/search_ban.php b/view/admin/bans/search_ban.php
index b39642e9..4285f695 100644
--- a/view/admin/bans/search_ban.php
+++ b/view/admin/bans/search_ban.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php echo $lang_admin_common['Bans'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_admin_bans['Results head'] ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php echo __('Bans') ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -29,19 +29,19 @@
 
 
 <div id="bans1" class="blocktable">
-	<h2><span><?php echo $lang_admin_bans['Results head'] ?></span></h2>
+	<h2><span><?php echo __('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_admin_bans['Results username head'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_admin_bans['Results e-mail head'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_admin_bans['Results IP address head'] ?></th>
-					<th class="tc4" scope="col"><?php echo $lang_admin_bans['Results expire head'] ?></th>
-					<th class="tc5" scope="col"><?php echo $lang_admin_bans['Results message head'] ?></th>
-					<th class="tc6" scope="col"><?php echo $lang_admin_bans['Results banned by head'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_admin_bans['Results actions head'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php echo __('Results IP address head') ?></th>
+					<th class="tc4" scope="col"><?php echo __('Results expire head') ?></th>
+					<th class="tc5" scope="col"><?php echo __('Results message head') ?></th>
+					<th class="tc6" scope="col"><?php echo __('Results banned by head') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Results actions head') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -55,14 +55,14 @@
 					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? feather_escape($cur_ban['ip']) : '&#160;' ?></td>
 					<td class="tc4"><?php echo format_time($cur_ban['expire'], true) ?></td>
 					<td class="tc5"><?php echo($cur_ban['message'] != '') ? feather_escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.get_link('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : $lang_admin_bans['Unknown'] ?></td>
-					<td class="tcr"><?php echo '<a href="'.get_link('admin/bans/edit/'.$cur_ban['id'].'/').'">'.$lang_admin_common['Edit'].'</a> | <a href="'.get_link('admin/bans/delete/'.$cur_ban['id'].'/').'">'.$lang_admin_common['Remove'].'</a>' ?></td>
+					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.get_link('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
+					<td class="tcr"><?php echo '<a href="'.get_link('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.get_link('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
 				</tr>
 <?php
 
         }
         if (empty($ban_data)) {
-            echo "\t\t\t\t".'<tr><td class="tcl" colspan="7">'.$lang_admin_bans['No match'].'</td></tr>'."\n";
+            echo "\t\t\t\t".'<tr><td class="tcl" colspan="7">'.__('No match').'</td></tr>'."\n";
         }
 
 ?>
@@ -78,9 +78,9 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
         <ul class="crumbs">
-            <li><a href="<?php echo get_link('admin/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php echo $lang_admin_common['Bans'] ?></a></li>
-            <li><span>»&#160;</span><strong><?php echo $lang_admin_bans['Results head'] ?></strong></li>
+            <li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+            <li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php echo __('Bans') ?></a></li>
+            <li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
         </ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/admin/categories.php b/view/admin/categories.php
index 96375c24..20f1fdd9 100644
--- a/view/admin/categories.php
+++ b/view/admin/categories.php
@@ -14,20 +14,20 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $lang_admin_categories['Add categories head'] ?></span></h2>
+	<h2><span><?php echo __('Add categories head') ?></span></h2>
 	<div class="box">
 		<form method="post" action="<?php echo get_link('admin/categories/add/') ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo $lang_admin_categories['Add categories subhead'] ?></legend>
+					<legend><?php echo __('Add categories subhead') ?></legend>
 					<div class="infldset">
 						<table class="aligntop">
 							<tr>
-								<th scope="row"><?php echo $lang_admin_categories['Add category label'] ?><div><input type="submit" value="<?php echo $lang_admin_categories['Add new submit'] ?>" tabindex="2" /></div></th>
+								<th scope="row"><?php echo __('Add category label') ?><div><input type="submit" value="<?php echo __('Add new submit') ?>" tabindex="2" /></div></th>
 								<td>
 									<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 									<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
-									<span><?php printf($lang_admin_categories['Add category help'], '<a href="'.get_link('admin/forums').'">'.$lang_admin_common['Forums'].'</a>') ?></span>
+									<span><?php printf(__('Add category help'), '<a href="'.get_link('admin/forums').'">'.__('Forums').'</a>') ?></span>
 								</td>
 							</tr>
 						</table>
@@ -37,17 +37,17 @@
 		</form>
 	</div>
 
-	<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php echo $lang_admin_categories['Delete categories head'] ?></span></h2>
+	<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php echo __('Delete categories head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/categories/delete') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_categories['Delete categories subhead'] ?></legend>
+						<legend><?php echo __('Delete categories subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_categories['Delete category label'] ?><div><input type="submit" value="<?php echo $lang_admin_common['Delete'] ?>" tabindex="4" /></div></th>
+									<th scope="row"><?php echo __('Delete category label') ?><div><input type="submit" value="<?php echo __('Delete') ?>" tabindex="4" /></div></th>
 									<td>
 										<select name="cat_to_delete" tabindex="3">
 											<?php
@@ -58,7 +58,7 @@
 
 											?>
 										</select>
-										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php echo $lang_admin_categories['Delete category disclaimer'] ?></span>
+										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php echo __('Delete category disclaimer') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -69,19 +69,19 @@
 		</div>
 	<?php endif; ?>
 
-	<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php echo $lang_admin_categories['Edit categories head'] ?></span></h2>
+	<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php echo __('Edit categories head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/categories/edit/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_categories['Edit categories subhead'] ?></legend>
+						<legend><?php echo __('Edit categories subhead') ?></legend>
 						<div class="infldset">
 							<table id="categoryedit">
 								<thead>
 								<tr>
-									<th class="tcl" scope="col"><?php echo $lang_admin_categories['Category name label'] ?></th>
-									<th scope="col"><?php echo $lang_admin_categories['Category position label'] ?></th>
+									<th class="tcl" scope="col"><?php echo __('Category name label') ?></th>
+									<th scope="col"><?php echo __('Category position label') ?></th>
 								</tr>
 								</thead>
 								<tbody>
@@ -100,7 +100,7 @@
 								?>
 								</tbody>
 							</table>
-							<div class="fsetsubmit"><input type="submit" value="<?php echo $lang_admin_common['Update'] ?>" /></div>
+							<div class="fsetsubmit"><input type="submit" value="<?php echo __('Update') ?>" /></div>
 						</div>
 					</fieldset>
 				</div>
diff --git a/view/admin/censoring.php b/view/admin/censoring.php
index 5131e64c..b8dc9f88 100644
--- a/view/admin/censoring.php
+++ b/view/admin/censoring.php
@@ -14,28 +14,28 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_censoring['Censoring head'] ?></span></h2>
+		<h2><span><?php echo __('Censoring head') ?></span></h2>
 		<div class="box">
 			<form id="censoring" method="post" action="<?php echo get_link('admin/censoring/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_censoring['Add word subhead'] ?></legend>
+						<legend><?php echo __('Add word subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_censoring['Add word info'].' '.($feather_config['o_censoring'] == '1' ? sprintf($lang_admin_censoring['Censoring enabled'], '<a href="'.get_link('admin/options#censoring').'">'.$lang_admin_common['Options'].'</a>') : sprintf($lang_admin_censoring['Censoring disabled'], '<a href="'.get_link('admin/options#censoring').'">'.$lang_admin_common['Options'].'</a>')) ?></p>
+							<p><?php echo __('Add word info').' '.($feather_config['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
 							<table>
 							<thead>
 								<tr>
-									<th class="tcl" scope="col"><?php echo $lang_admin_censoring['Censored word label'] ?></th>
-									<th class="tc2" scope="col"><?php echo $lang_admin_censoring['Replacement label'] ?></th>
-									<th class="hidehead" scope="col"><?php echo $lang_admin_censoring['Action label'] ?></th>
+									<th class="tcl" scope="col"><?php echo __('Censored word label') ?></th>
+									<th class="tc2" scope="col"><?php echo __('Replacement label') ?></th>
+									<th class="hidehead" scope="col"><?php echo __('Action label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
 								<tr>
 									<td class="tcl"><input type="text" name="new_search_for" size="24" maxlength="60" tabindex="1" /></td>
 									<td class="tc2"><input type="text" name="new_replace_with" size="24" maxlength="60" tabindex="2" /></td>
-									<td><input type="submit" name="add_word" value="<?php echo $lang_admin_common['Add'] ?>" tabindex="3" /></td>
+									<td><input type="submit" name="add_word" value="<?php echo __('Add') ?>" tabindex="3" /></td>
 								</tr>
 							</tbody>
 							</table>
@@ -44,7 +44,7 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_censoring['Edit remove subhead'] ?></legend>
+						<legend><?php echo __('Edit remove subhead') ?></legend>
 						<div class="infldset">
 <?php
 if (!empty($word_data)) {
@@ -52,16 +52,16 @@
 							<table>
 							<thead>
 								<tr>
-									<th class="tcl" scope="col"><?php echo $lang_admin_censoring['Censored word label'] ?></th>
-									<th class="tc2" scope="col"><?php echo $lang_admin_censoring['Replacement label'] ?></th>
-									<th class="hidehead" scope="col"><?php echo $lang_admin_censoring['Action label'] ?></th>
+									<th class="tcl" scope="col"><?php echo __('Censored word label') ?></th>
+									<th class="tc2" scope="col"><?php echo __('Replacement label') ?></th>
+									<th class="hidehead" scope="col"><?php echo __('Action label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
 <?php
 
     foreach ($word_data as $word) {
-        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.feather_escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.feather_escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.$lang_admin_common['Update'].'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.$lang_admin_common['Remove'].'" /></td></tr>'."\n";
+        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.feather_escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.feather_escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
     }
 
     ?>
@@ -70,7 +70,7 @@
 <?php
 
 } else {
-    echo "\t\t\t\t\t\t\t".'<p>'.$lang_admin_censoring['No words in list'].'</p>'."\n";
+    echo "\t\t\t\t\t\t\t".'<p>'.__('No words in list').'</p>'."\n";
 }
 
 ?>
diff --git a/view/admin/forums/admin_forums.php b/view/admin/forums/admin_forums.php
index 44eebdf4..0d6adc16 100644
--- a/view/admin/forums/admin_forums.php
+++ b/view/admin/forums/admin_forums.php
@@ -14,7 +14,7 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_forums['Add forum head'] ?></span></h2>
+		<h2><span><?php echo __('Add forum head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/forums/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -23,16 +23,16 @@
     ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_forums['Create new subhead'] ?></legend>
+						<legend><?php echo __('Create new subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_forums['Add forum label'] ?><div><input type="submit" name="add_forum" value="<?php echo $lang_admin_forums['Add forum'] ?>" tabindex="2" /></div></th>
+									<th scope="row"><?php echo __('Add forum label') ?><div><input type="submit" name="add_forum" value="<?php echo __('Add forum') ?>" tabindex="2" /></div></th>
 									<td>
 										<select name="add_to_cat" tabindex="1">
 											<?php echo $categories_add ?>
 										</select>
-										<span><?php echo $lang_admin_forums['Add forum help'] ?></span>
+										<span><?php echo __('Add forum help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -45,9 +45,9 @@
     ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_common['None'] ?></legend>
+						<legend><?php echo __('None') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_forums['No categories exist'] ?></p>
+							<p><?php echo __('No categories exist') ?></p>
 						</div>
 					</fieldset>
 				</div>
@@ -61,11 +61,11 @@
 <?php
 if (!empty($forum_data)) {
     ?>
-		<h2 class="block2"><span><?php echo $lang_admin_forums['Edit forums head'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('Edit forums head') ?></span></h2>
 		<div class="box">
 			<form id="edforum" method="post" action="<?php echo get_link('admin/forums/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="update_positions" value="<?php echo $lang_admin_forums['Update positions'] ?>" tabindex="3" /></p>
+				<p class="submittop"><input type="submit" name="update_positions" value="<?php echo __('Update positions') ?>" tabindex="3" /></p>
 <?php
     foreach ($forum_data as $forum) {
         if ($forum['cid'] != $cur_category) {
@@ -78,14 +78,14 @@
             ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_forums['Category subhead'] ?> <?php echo feather_escape($forum['cat_name']) ?></legend>
+						<legend><?php echo __('Category subhead') ?> <?php echo feather_escape($forum['cat_name']) ?></legend>
 						<div class="infldset">
 							<table>
 							<thead>
 								<tr>
-									<th class="tcl"><?php echo $lang_admin_common['Action'] ?></th>
-									<th class="tc2"><?php echo $lang_admin_forums['Position label'] ?></th>
-									<th class="tcr"><?php echo $lang_admin_forums['Forum label'] ?></th>
+									<th class="tcl"><?php echo __('Action') ?></th>
+									<th class="tc2"><?php echo __('Position label') ?></th>
+									<th class="tcr"><?php echo __('Forum label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -96,7 +96,7 @@
 
         ?>
 								<tr>
-									<td class="tcl"><a href="<?php echo get_link('admin/forums/edit/'.$forum['fid'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php echo $lang_admin_forums['Edit link'] ?></a> | <a href="<?php echo get_link('admin/forums/delete/'.$forum['fid'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php echo $lang_admin_forums['Delete link'] ?></a></td>
+									<td class="tcl"><a href="<?php echo get_link('admin/forums/edit/'.$forum['fid'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php echo __('Edit link') ?></a> | <a href="<?php echo get_link('admin/forums/delete/'.$forum['fid'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php echo __('Delete link') ?></a></td>
 									<td class="tc2"><input type="text" name="position[<?php echo $forum['fid'] ?>]" size="3" maxlength="3" value="<?php echo $forum['disp_position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
 									<td class="tcr"><strong><?php echo feather_escape($forum['forum_name']) ?></strong></td>
 								</tr>
@@ -110,7 +110,7 @@
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="update_positions" value="<?php echo $lang_admin_forums['Update positions'] ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
+				<p class="submitend"><input type="submit" name="update_positions" value="<?php echo __('Update positions') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
 			</form>
 		</div>
 <?php
diff --git a/view/admin/forums/delete_forum.php b/view/admin/forums/delete_forum.php
index ec06e508..1c9dcea0 100644
--- a/view/admin/forums/delete_forum.php
+++ b/view/admin/forums/delete_forum.php
@@ -14,20 +14,20 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_forums['Confirm delete head'] ?></span></h2>
+		<h2><span><?php echo __('Confirm delete head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/forums/delete/'.$forum_id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_forums['Confirm delete subhead'] ?></legend>
+						<legend><?php echo __('Confirm delete subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf($lang_admin_forums['Confirm delete info'], $forum_name) ?></p>
-							<p class="warntext"><?php echo $lang_admin_forums['Confirm delete warn'] ?></p>
+							<p><?php printf(__('Confirm delete info'), $forum_name) ?></p>
+							<p class="warntext"><?php echo __('Confirm delete warn') ?></p>
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="del_forum_comply" value="<?php echo $lang_admin_common['Delete'] ?>" /><a href="javascript:history.go(-1)"><?php echo $lang_admin_common['Go back'] ?></a></p>
+				<p class="buttons"><input type="submit" name="del_forum_comply" value="<?php echo __('Delete') ?>" /><a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/forums/permissions.php b/view/admin/forums/permissions.php
index 4c303c56..fc3feae5 100644
--- a/view/admin/forums/permissions.php
+++ b/view/admin/forums/permissions.php
@@ -14,26 +14,26 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_forums['Edit forum head'] ?></span></h2>
+		<h2><span><?php echo __('Edit forum head') ?></span></h2>
 		<div class="box">
 			<form id="edit_forum" method="post" action="<?php echo get_link('admin/forums/edit/'.$forum_id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" tabindex="6" /></p>
+				<p class="submittop"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" tabindex="6" /></p>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_forums['Edit details subhead'] ?></legend>
+						<legend><?php echo __('Edit details subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_forums['Forum name label'] ?></th>
+									<th scope="row"><?php echo __('Forum name label') ?></th>
 									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo feather_escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_forums['Forum description label'] ?></th>
+									<th scope="row"><?php echo __('Forum description label') ?></th>
 									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo feather_escape($cur_forum['forum_desc']) ?></textarea></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_forums['Category label'] ?></th>
+									<th scope="row"><?php echo __('Category label') ?></th>
 									<td>
 										<select name="cat_id" tabindex="3">
 											<?php echo $categories_perms ?>
@@ -41,24 +41,24 @@
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_forums['Sort by label'] ?></th>
+									<th scope="row"><?php echo __('Sort by label') ?></th>
 									<td>
 										<select name="sort_by" tabindex="4">
 											<option value="0"<?php if ($cur_forum['sort_by'] == '0') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_forums['Last post'] ?></option>
+} ?>><?php echo __('Last post') ?></option>
 											<option value="1"<?php if ($cur_forum['sort_by'] == '1') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_forums['Topic start'] ?></option>
+} ?>><?php echo __('Topic start') ?></option>
 											<option value="2"<?php if ($cur_forum['sort_by'] == '2') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_forums['Subject'] ?></option>
+} ?>><?php echo __('Subject') ?></option>
 										</select>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_forums['Redirect label'] ?></th>
-									<td><?php echo($cur_forum['num_topics']) ? $lang_admin_forums['Redirect help'] : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.feather_escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
+									<th scope="row"><?php echo __('Redirect label') ?></th>
+									<td><?php echo($cur_forum['num_topics']) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.feather_escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
 								</tr>
 							</table>
 						</div>
@@ -66,16 +66,16 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_forums['Group permissions subhead'] ?></legend>
+						<legend><?php echo __('Group permissions subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf($lang_admin_forums['Group permissions info'], '<a href="admin_groups.php">'.$lang_admin_common['User groups'].'</a>') ?></p>
+							<p><?php printf(__('Group permissions info'), '<a href="admin_groups.php">'.__('User groups').'</a>') ?></p>
 							<table id="forumperms">
 							<thead>
 								<tr>
 									<th class="atcl">&#160;</th>
-									<th><?php echo $lang_admin_forums['Read forum label'] ?></th>
-									<th><?php echo $lang_admin_forums['Post replies label'] ?></th>
-									<th><?php echo $lang_admin_forums['Post topics label'] ?></th>
+									<th><?php echo __('Read forum label') ?></th>
+									<th><?php echo __('Post replies label') ?></th>
+									<th><?php echo __('Post topics label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -122,11 +122,11 @@
 ?>
 							</tbody>
 							</table>
-							<div class="fsetsubmit"><input type="submit" name="revert_perms" value="<?php echo $lang_admin_forums['Revert to default'] ?>" tabindex="<?php echo $cur_index++ ?>" /></div>
+							<div class="fsetsubmit"><input type="submit" name="revert_perms" value="<?php echo __('Revert to default') ?>" tabindex="<?php echo $cur_index++ ?>" /></div>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
+				<p class="submitend"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/groups/add_edit_group.php b/view/admin/groups/add_edit_group.php
index 26c9881c..6246e104 100644
--- a/view/admin/groups/add_edit_group.php
+++ b/view/admin/groups/add_edit_group.php
@@ -14,22 +14,22 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_admin_groups['Group settings head'] ?></span></h2>
+	<h2><span><?php echo __('Group settings head') ?></span></h2>
 	<div class="box">
 		<form id="groups2" method="post" action="" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<p class="submittop"><input type="submit" name="add_edit_group" value="<?php echo $lang_admin_common['Save'] ?>" /></p>
+			<p class="submittop"><input type="submit" name="add_edit_group" value="<?php echo __('Save') ?>" /></p>
 			<div class="inform">
 				<input type="hidden" name="mode" value="<?php echo $group['mode'] ?>" />
 				<?php if ($group['mode'] == 'edit'): ?>					<input type="hidden" name="group_id" value="<?php echo $id ?>" />
 				<?php endif; ?><?php if ($group['mode'] == 'add'): ?>					<input type="hidden" name="base_group" value="<?php echo $group['base_group'] ?>" />
 				<?php endif; ?>					<fieldset>
-					<legend><?php echo $lang_admin_groups['Group settings subhead'] ?></legend>
+					<legend><?php echo __('Group settings subhead') ?></legend>
 					<div class="infldset">
-						<p><?php echo $lang_admin_groups['Group settings info'] ?></p>
+						<p><?php echo __('Group settings info') ?></p>
 						<table class="aligntop">
 							<tr>
-								<th scope="row"><?php echo $lang_admin_groups['Group title label'] ?></th>
+								<th scope="row"><?php echo __('Group title label') ?></th>
 								<td>
 									<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
 										echo feather_escape($group['info']['g_title']);
@@ -37,273 +37,273 @@
 								</td>
 							</tr>
 							<tr>
-								<th scope="row"><?php echo $lang_admin_groups['User title label'] ?></th>
+								<th scope="row"><?php echo __('User title label') ?></th>
 								<td>
 									<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
-									<span><?php printf($lang_admin_groups['User title help'], ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
+									<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
 								</td>
 							</tr>
 							<?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-								<th scope="row"><?php echo $lang_admin_groups['Promote users label'] ?></th>
+								<th scope="row"><?php echo __('Promote users label') ?></th>
 								<td>
 									<select name="promote_next_group" tabindex="3">
-										<option value="0"><?php echo $lang_admin_groups['Disable promotion'] ?></option>
+										<option value="0"><?php echo __('Disable promotion') ?></option>
 										<?php echo $group_list ?>
 									</select>
 									<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo feather_escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
-									<span><?php printf($lang_admin_groups['Promote users help'], $lang_admin_groups['Disable promotion']) ?></span>
+									<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
 								</td>
 							</tr>
 								<?php if ($group['mode'] != 'edit' || $feather_config['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
-									<th scope="row"> <?php echo $lang_admin_groups['Mod privileges label'] ?></th>
+									<th scope="row"> <?php echo __('Mod privileges label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="5" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+											} ?> tabindex="5" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="moderator" value="0"<?php if ($group['info']['g_moderator'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="6" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Mod privileges help'] ?></span>
+											} ?> tabindex="6" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Mod privileges help') ?></span>
 									</td>
 								</tr>
 									<tr>
-										<th scope="row"><?php echo $lang_admin_groups['Edit profile label'] ?></th>
+										<th scope="row"><?php echo __('Edit profile label') ?></th>
 										<td>
 											<label class="conl"><input type="radio" name="mod_edit_users" value="1"<?php if ($group['info']['g_mod_edit_users'] == '1') {
 													echo ' checked="checked"';
-												} ?> tabindex="7" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+												} ?> tabindex="7" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 											<label class="conl"><input type="radio" name="mod_edit_users" value="0"<?php if ($group['info']['g_mod_edit_users'] == '0') {
 													echo ' checked="checked"';
-												} ?> tabindex="8" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-											<span class="clearb"><?php echo $lang_admin_groups['Edit profile help'] ?></span>
+												} ?> tabindex="8" />&#160;<strong><?php echo __('No') ?></strong></label>
+											<span class="clearb"><?php echo __('Edit profile help') ?></span>
 										</td>
 									</tr>
 									<tr>
-										<th scope="row"><?php echo $lang_admin_groups['Rename users label'] ?></th>
+										<th scope="row"><?php echo __('Rename users label') ?></th>
 										<td>
 											<label class="conl"><input type="radio" name="mod_rename_users" value="1"<?php if ($group['info']['g_mod_rename_users'] == '1') {
 													echo ' checked="checked"';
-												} ?> tabindex="9" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+												} ?> tabindex="9" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 											<label class="conl"><input type="radio" name="mod_rename_users" value="0"<?php if ($group['info']['g_mod_rename_users'] == '0') {
 													echo ' checked="checked"';
-												} ?> tabindex="10" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-											<span class="clearb"><?php echo $lang_admin_groups['Rename users help'] ?></span>
+												} ?> tabindex="10" />&#160;<strong><?php echo __('No') ?></strong></label>
+											<span class="clearb"><?php echo __('Rename users help') ?></span>
 										</td>
 									</tr>
 									<tr>
-										<th scope="row"><?php echo $lang_admin_groups['Change passwords label'] ?></th>
+										<th scope="row"><?php echo __('Change passwords label') ?></th>
 										<td>
 											<label class="conl"><input type="radio" name="mod_change_passwords" value="1"<?php if ($group['info']['g_mod_change_passwords'] == '1') {
 													echo ' checked="checked"';
-												} ?> tabindex="11" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+												} ?> tabindex="11" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 											<label class="conl"><input type="radio" name="mod_change_passwords" value="0"<?php if ($group['info']['g_mod_change_passwords'] == '0') {
 													echo ' checked="checked"';
-												} ?> tabindex="12" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-											<span class="clearb"><?php echo $lang_admin_groups['Change passwords help'] ?></span>
+												} ?> tabindex="12" />&#160;<strong><?php echo __('No') ?></strong></label>
+											<span class="clearb"><?php echo __('Change passwords help') ?></span>
 										</td>
 									</tr>
 									<tr>
-										<th scope="row"><?php echo $lang_admin_groups['Mod promote users label'] ?></th>
+										<th scope="row"><?php echo __('Mod promote users label') ?></th>
 										<td>
 											<label class="conl"><input type="radio" name="mod_promote_users" value="1"<?php if ($group['info']['g_mod_promote_users'] == '1') {
 													echo ' checked="checked"';
-												} ?> tabindex="13" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+												} ?> tabindex="13" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 											<label class="conl"><input type="radio" name="mod_promote_users" value="0"<?php if ($group['info']['g_mod_promote_users'] == '0') {
 													echo ' checked="checked"';
-												} ?> tabindex="14" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-											<span class="clearb"><?php echo $lang_admin_groups['Mod promote users help'] ?></span>
+												} ?> tabindex="14" />&#160;<strong><?php echo __('No') ?></strong></label>
+											<span class="clearb"><?php echo __('Mod promote users help') ?></span>
 										</td>
 									</tr>
 									<tr>
-										<th scope="row"><?php echo $lang_admin_groups['Ban users label'] ?></th>
+										<th scope="row"><?php echo __('Ban users label') ?></th>
 										<td>
 											<label class="conl"><input type="radio" name="mod_ban_users" value="1"<?php if ($group['info']['g_mod_ban_users'] == '1') {
 													echo ' checked="checked"';
-												} ?> tabindex="15" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+												} ?> tabindex="15" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 											<label class="conl"><input type="radio" name="mod_ban_users" value="0"<?php if ($group['info']['g_mod_ban_users'] == '0') {
 													echo ' checked="checked"';
-												} ?> tabindex="16" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-											<span class="clearb"><?php echo $lang_admin_groups['Ban users help'] ?></span>
+												} ?> tabindex="16" />&#160;<strong><?php echo __('No') ?></strong></label>
+											<span class="clearb"><?php echo __('Ban users help') ?></span>
 										</td>
 									</tr>
 								<?php endif; endif; ?>								<tr>
-								<th scope="row"><?php echo $lang_admin_groups['Read board label'] ?></th>
+								<th scope="row"><?php echo __('Read board label') ?></th>
 								<td>
 									<label class="conl"><input type="radio" name="read_board" value="1"<?php if ($group['info']['g_read_board'] == '1') {
 											echo ' checked="checked"';
-										} ?> tabindex="17" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+										} ?> tabindex="17" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 									<label class="conl"><input type="radio" name="read_board" value="0"<?php if ($group['info']['g_read_board'] == '0') {
 											echo ' checked="checked"';
-										} ?> tabindex="18" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-									<span class="clearb"><?php echo $lang_admin_groups['Read board help'] ?></span>
+										} ?> tabindex="18" />&#160;<strong><?php echo __('No') ?></strong></label>
+									<span class="clearb"><?php echo __('Read board help') ?></span>
 								</td>
 							</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['View user info label'] ?></th>
+									<th scope="row"><?php echo __('View user info label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="view_users" value="1"<?php if ($group['info']['g_view_users'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="19" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+											} ?> tabindex="19" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="view_users" value="0"<?php if ($group['info']['g_view_users'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="20" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['View user info help'] ?></span>
+											} ?> tabindex="20" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('View user info help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Post replies label'] ?></th>
+									<th scope="row"><?php echo __('Post replies label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="post_replies" value="1"<?php if ($group['info']['g_post_replies'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="21" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+											} ?> tabindex="21" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="post_replies" value="0"<?php if ($group['info']['g_post_replies'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="22" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Post replies help'] ?></span>
+											} ?> tabindex="22" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Post replies help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Post topics label'] ?></th>
+									<th scope="row"><?php echo __('Post topics label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="post_topics" value="1"<?php if ($group['info']['g_post_topics'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="23" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+											} ?> tabindex="23" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="post_topics" value="0"<?php if ($group['info']['g_post_topics'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="24" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Post topics help'] ?></span>
+											} ?> tabindex="24" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Post topics help') ?></span>
 									</td>
 								</tr>
 								<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Edit posts label'] ?></th>
+									<th scope="row"><?php echo __('Edit posts label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="edit_posts" value="1"<?php if ($group['info']['g_edit_posts'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="25" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+											} ?> tabindex="25" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="edit_posts" value="0"<?php if ($group['info']['g_edit_posts'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="26" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Edit posts help'] ?></span>
+											} ?> tabindex="26" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Edit posts help') ?></span>
 									</td>
 								</tr>
 									<tr>
-										<th scope="row"><?php echo $lang_admin_groups['Delete posts label'] ?></th>
+										<th scope="row"><?php echo __('Delete posts label') ?></th>
 										<td>
 											<label class="conl"><input type="radio" name="delete_posts" value="1"<?php if ($group['info']['g_delete_posts'] == '1') {
 													echo ' checked="checked"';
-												} ?> tabindex="27" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+												} ?> tabindex="27" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 											<label class="conl"><input type="radio" name="delete_posts" value="0"<?php if ($group['info']['g_delete_posts'] == '0') {
 													echo ' checked="checked"';
-												} ?> tabindex="28" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-											<span class="clearb"><?php echo $lang_admin_groups['Delete posts help'] ?></span>
+												} ?> tabindex="28" />&#160;<strong><?php echo __('No') ?></strong></label>
+											<span class="clearb"><?php echo __('Delete posts help') ?></span>
 										</td>
 									</tr>
 									<tr>
-										<th scope="row"><?php echo $lang_admin_groups['Delete topics label'] ?></th>
+										<th scope="row"><?php echo __('Delete topics label') ?></th>
 										<td>
 											<label class="conl"><input type="radio" name="delete_topics" value="1"<?php if ($group['info']['g_delete_topics'] == '1') {
 													echo ' checked="checked"';
-												} ?> tabindex="29" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+												} ?> tabindex="29" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 											<label class="conl"><input type="radio" name="delete_topics" value="0"<?php if ($group['info']['g_delete_topics'] == '0') {
 													echo ' checked="checked"';
-												} ?> tabindex="30" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-											<span class="clearb"><?php echo $lang_admin_groups['Delete topics help'] ?></span>
+												} ?> tabindex="30" />&#160;<strong><?php echo __('No') ?></strong></label>
+											<span class="clearb"><?php echo __('Delete topics help') ?></span>
 										</td>
 									</tr>
 								<?php endif; ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Post links label'] ?></th>
+									<th scope="row"><?php echo __('Post links label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="post_links" value="1"<?php if ($group['info']['g_post_links'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="31" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+											} ?> tabindex="31" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="post_links" value="0"<?php if ($group['info']['g_post_links'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="32" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Post links help'] ?></span>
+											} ?> tabindex="32" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Post links help') ?></span>
 									</td>
 								</tr>
 								<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Set own title label'] ?></th>
+									<th scope="row"><?php echo __('Set own title label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="set_title" value="1"<?php if ($group['info']['g_set_title'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="33" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+											} ?> tabindex="33" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="set_title" value="0"<?php if ($group['info']['g_set_title'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="34" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Set own title help'] ?></span>
+											} ?> tabindex="34" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Set own title help') ?></span>
 									</td>
 								</tr>
 								<?php endif; ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['User search label'] ?></th>
+									<th scope="row"><?php echo __('User search label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="search" value="1"<?php if ($group['info']['g_search'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="35" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+											} ?> tabindex="35" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="search" value="0"<?php if ($group['info']['g_search'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="36" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['User search help'] ?></span>
+											} ?> tabindex="36" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('User search help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['User list search label'] ?></th>
+									<th scope="row"><?php echo __('User list search label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="search_users" value="1"<?php if ($group['info']['g_search_users'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="37" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+											} ?> tabindex="37" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="search_users" value="0"<?php if ($group['info']['g_search_users'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="38" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['User list search help'] ?></span>
+											} ?> tabindex="38" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('User list search help') ?></span>
 									</td>
 								</tr>
 								<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Send e-mails label'] ?></th>
+									<th scope="row"><?php echo __('Send e-mails label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="send_email" value="1"<?php if ($group['info']['g_send_email'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="39" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+											} ?> tabindex="39" />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="send_email" value="0"<?php if ($group['info']['g_send_email'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="40" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_groups['Send e-mails help'] ?></span>
+											} ?> tabindex="40" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Send e-mails help') ?></span>
 									</td>
 								</tr>
 								<?php endif; ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Post flood label'] ?></th>
+									<th scope="row"><?php echo __('Post flood label') ?></th>
 									<td>
 										<input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_post_flood'] ?>" tabindex="41" />
-										<span><?php echo $lang_admin_groups['Post flood help'] ?></span>
+										<span><?php echo __('Post flood help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Search flood label'] ?></th>
+									<th scope="row"><?php echo __('Search flood label') ?></th>
 									<td>
 										<input type="text" name="search_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_search_flood'] ?>" tabindex="42" />
-										<span><?php echo $lang_admin_groups['Search flood help'] ?></span>
+										<span><?php echo __('Search flood help') ?></span>
 									</td>
 								</tr>
 								<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['E-mail flood label'] ?></th>
+									<th scope="row"><?php echo __('E-mail flood label') ?></th>
 									<td>
 										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_email_flood'] ?>" tabindex="43" />
-										<span><?php echo $lang_admin_groups['E-mail flood help'] ?></span>
+										<span><?php echo __('E-mail flood help') ?></span>
 									</td>
 								</tr>
 									<tr>
-										<th scope="row"><?php echo $lang_admin_groups['Report flood label'] ?></th>
+										<th scope="row"><?php echo __('Report flood label') ?></th>
 										<td>
 											<input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_report_flood'] ?>" tabindex="44" />
-											<span><?php echo $lang_admin_groups['Report flood help'] ?></span>
+											<span><?php echo __('Report flood help') ?></span>
 										</td>
 									</tr>
 								<?php endif; endif; ?>							</table>
-						<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php echo $lang_admin_groups['Moderator info'] ?></p>
+						<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php echo __('Moderator info') ?></p>
 						<?php endif; ?>						</div>
 				</fieldset>
 			</div>
-			<p class="submitend"><input type="submit" name="add_edit_group" value="<?php echo $lang_admin_common['Save'] ?>" tabindex="45" /></p>
+			<p class="submitend"><input type="submit" name="add_edit_group" value="<?php echo __('Save') ?>" tabindex="45" /></p>
 		</form>
 	</div>
 </div>
diff --git a/view/admin/groups/admin_groups.php b/view/admin/groups/admin_groups.php
index c6fcf41a..1bf9a10e 100644
--- a/view/admin/groups/admin_groups.php
+++ b/view/admin/groups/admin_groups.php
@@ -14,17 +14,17 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_groups['Add groups head'] ?></span></h2>
+		<h2><span><?php echo __('Add groups head') ?></span></h2>
 		<div class="box">
 				<div class="inform">
 					<fieldset>
                         <form id="groups" method="post" action="<?php echo get_link('admin/groups/add/') ?>">
                         <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php echo $lang_admin_groups['Add group subhead'] ?></legend>
+						<legend><?php echo __('Add group subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['New group label'] ?><div><input type="submit" name="add_group" value="<?php echo $lang_admin_common['Add'] ?>" tabindex="2" /></div></th>
+									<th scope="row"><?php echo __('New group label') ?><div><input type="submit" name="add_group" value="<?php echo __('Add') ?>" tabindex="2" /></div></th>
 									<td>
 										<select id="base_group" name="base_group" tabindex="1">
 <?php
@@ -41,7 +41,7 @@
 
 ?>
 										</select>
-										<span><?php echo $lang_admin_groups['New group help'] ?></span>
+										<span><?php echo __('New group help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -53,11 +53,11 @@
 					<fieldset>
                         <form id="groups" method="post" action="<?php echo get_link('admin/groups/') ?>">
                         	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php echo $lang_admin_groups['Default group subhead'] ?></legend>
+						<legend><?php echo __('Default group subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_groups['Default group label'] ?><div><input type="submit" name="set_default_group" value="<?php echo $lang_admin_common['Save'] ?>" tabindex="4" /></div></th>
+									<th scope="row"><?php echo __('Default group label') ?><div><input type="submit" name="set_default_group" value="<?php echo __('Save') ?>" tabindex="4" /></div></th>
 									<td>
 										<select id="default_group" name="default_group" tabindex="3">
 <?php
@@ -74,7 +74,7 @@
 
 ?>
 										</select>
-										<span><?php echo $lang_admin_groups['Default group help'] ?></span>
+										<span><?php echo __('Default group help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -84,18 +84,18 @@
 				</div>
 		</div>
 
-		<h2 class="block2"><span><?php echo $lang_admin_groups['Existing groups head'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('Existing groups head') ?></span></h2>
 		<div class="box">
 			<div class="fakeform">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_groups['Edit groups subhead'] ?></legend>
+						<legend><?php echo __('Edit groups subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_groups['Edit groups info'] ?></p>
+							<p><?php echo __('Edit groups info') ?></p>
 							<table>
 <?php
 foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.get_link('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.$lang_admin_groups['Edit link'].'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.get_link('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.$lang_admin_groups['Delete link'].'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.get_link('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.get_link('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
 }
 
 ?>
diff --git a/view/admin/groups/confirm_delete.php b/view/admin/groups/confirm_delete.php
index 983830f1..a6200b6f 100644
--- a/view/admin/groups/confirm_delete.php
+++ b/view/admin/groups/confirm_delete.php
@@ -14,21 +14,21 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_admin_groups['Group delete head'] ?></span></h2>
+	<h2><span><?php echo __('Group delete head') ?></span></h2>
 	<div class="box">
 		<form method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="group_to_delete" value="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>" />
 				<fieldset>
-					<legend><?php echo $lang_admin_groups['Confirm delete subhead'] ?></legend>
+					<legend><?php echo __('Confirm delete subhead') ?></legend>
 					<div class="infldset">
-						<p><?php printf($lang_admin_groups['Confirm delete info'], feather_escape($group_title)) ?></p>
-						<p class="warntext"><?php echo $lang_admin_groups['Confirm delete warn'] ?></p>
+						<p><?php printf(__('Confirm delete info'), feather_escape($group_title)) ?></p>
+						<p class="warntext"><?php echo __('Confirm delete warn') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="del_group_comply" value="<?php echo $lang_admin_common['Delete'] ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php echo $lang_admin_common['Go back'] ?></a></p>
+			<p class="buttons"><input type="submit" name="del_group_comply" value="<?php echo __('Delete') ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php echo __('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
diff --git a/view/admin/groups/delete_group.php b/view/admin/groups/delete_group.php
index bbafdb36..fee07d5b 100644
--- a/view/admin/groups/delete_group.php
+++ b/view/admin/groups/delete_group.php
@@ -14,16 +14,16 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_groups['Delete group head'] ?></span></h2>
+		<h2><span><?php echo __('Delete group head') ?></span></h2>
 		<div class="box">
 			<form id="groups" method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_groups['Move users subhead'] ?></legend>
+						<legend><?php echo __('Move users subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf($lang_admin_groups['Move users info'], feather_escape($group_info['title']), forum_number_format($group_info['members'])) ?></p>
-							<label><?php echo $lang_admin_groups['Move users label'] ?>
+							<p><?php printf(__('Move users info'), feather_escape($group_info['title']), forum_number_format($group_info['members'])) ?></p>
+							<label><?php echo __('Move users label') ?>
 							<select name="move_to_group">
 								<?php get_group_list_delete($id); ?>
 							</select>
@@ -31,7 +31,7 @@
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="del_group" value="<?php echo $lang_admin_groups['Delete group'] ?>" /><a href="javascript:history.go(-1)"><?php echo $lang_admin_common['Go back'] ?></a></p>
+				<p class="buttons"><input type="submit" name="del_group" value="<?php echo __('Delete group') ?>" /><a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/index.php b/view/admin/index.php
index 18f1e853..50afbad1 100644
--- a/view/admin/index.php
+++ b/view/admin/index.php
@@ -14,46 +14,46 @@
 ?>
 
 	<div class="block">
-		<h2><span><?php echo $lang_admin_index['Forum admin head'] ?></span></h2>
+		<h2><span><?php echo __('Forum admin head') ?></span></h2>
 		<div id="adintro" class="box">
 			<div class="inbox">
-				<p><?php echo $lang_admin_index['Welcome to admin'] ?></p>
+				<p><?php echo __('Welcome to admin') ?></p>
 				<ul>
-					<li><span><?php echo $lang_admin_index['Welcome 1'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 2'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 3'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 4'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 5'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 6'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 7'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 8'] ?></span></li>
-					<li><span><?php echo $lang_admin_index['Welcome 9'] ?></span></li>
+					<li><span><?php echo __('Welcome 1') ?></span></li>
+					<li><span><?php echo __('Welcome 2') ?></span></li>
+					<li><span><?php echo __('Welcome 3') ?></span></li>
+					<li><span><?php echo __('Welcome 4') ?></span></li>
+					<li><span><?php echo __('Welcome 5') ?></span></li>
+					<li><span><?php echo __('Welcome 6') ?></span></li>
+					<li><span><?php echo __('Welcome 7') ?></span></li>
+					<li><span><?php echo __('Welcome 8') ?></span></li>
+					<li><span><?php echo __('Welcome 9') ?></span></li>
 				</ul>
 			</div>
 		</div>
 
 <?php if ($install_file_exists) : ?>
-		<h2 class="block2"><span><?php echo $lang_admin_index['Alerts head'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('Alerts head') ?></span></h2>
 		<div id="adalerts" class="box">
-			<p><?php printf($lang_admin_index['Install file exists'], '<a href="'.get_link('admin/action/remove_install_file/').'">'.$lang_admin_index['Delete install file'].'</a>') ?></p>
+			<p><?php printf(__('Install file exists'), '<a href="'.get_link('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
 		</div>
 <?php endif; ?>
 
-		<h2 class="block2"><span><?php echo $lang_admin_index['About head'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('About head') ?></span></h2>
 		<div id="adstats" class="box">
 			<div class="inbox">
 				<dl>
-					<dt><?php echo $lang_admin_index['FeatherBB version label'] ?></dt>
+					<dt><?php echo __('FeatherBB version label') ?></dt>
 					<dd>
-						<?php printf($lang_admin_index['FeatherBB version data']."\n", $feather_config['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.$lang_admin_index['Check for upgrade'].'</a>') ?>
+						<?php printf(__('FeatherBB version data')."\n", $feather_config['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
 					</dd>
-					<dt><?php echo $lang_admin_index['Server statistics label'] ?></dt>
+					<dt><?php echo __('Server statistics label') ?></dt>
 					<dd>
-						<a href="<?php echo get_link('admin/statistics/') ?>"><?php echo $lang_admin_index['View server statistics'] ?></a>
+						<a href="<?php echo get_link('admin/statistics/') ?>"><?php echo __('View server statistics') ?></a>
 					</dd>
-					<dt><?php echo $lang_admin_index['Support label'] ?></dt>
+					<dt><?php echo __('Support label') ?></dt>
 					<dd>
-						<a href="http://FeatherBB.org/forums/index.php"><?php echo $lang_admin_index['Forum label'] ?></a> - <a href="http://gitter.im/featherbb/featherbb"><?php echo $lang_admin_index['IRC label'] ?></a>
+						<a href="http://FeatherBB.org/forums/index.php"><?php echo __('Forum label') ?></a> - <a href="http://gitter.im/featherbb/featherbb"><?php echo __('IRC label') ?></a>
 					</dd>
 				</dl>
 			</div>
diff --git a/view/admin/maintenance/admin_maintenance.php b/view/admin/maintenance/admin_maintenance.php
index 6d08e608..77c8404e 100644
--- a/view/admin/maintenance/admin_maintenance.php
+++ b/view/admin/maintenance/admin_maintenance.php
@@ -14,39 +14,39 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_maintenance['Maintenance head'] ?></span></h2>
+		<h2><span><?php echo __('Maintenance head') ?></span></h2>
 		<div class="box">
 			<form method="get" action="<?php echo get_link('admin/maintenance/') ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="rebuild" />
 					<fieldset>
-						<legend><?php echo $lang_admin_maintenance['Rebuild index subhead'] ?></legend>
+						<legend><?php echo __('Rebuild index subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf($lang_admin_maintenance['Rebuild index info'], '<a href="'.get_link('admin/options/#maintenance').'">'.$lang_admin_common['Maintenance mode'].'</a>') ?></p>
+							<p><?php printf(__('Rebuild index info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_maintenance['Posts per cycle label'] ?></th>
+									<th scope="row"><?php echo __('Posts per cycle label') ?></th>
 									<td>
 										<input type="text" name="i_per_page" size="7" maxlength="7" value="300" tabindex="1" />
-										<span><?php echo $lang_admin_maintenance['Posts per cycle help'] ?></span>
+										<span><?php echo __('Posts per cycle help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_maintenance['Starting post label'] ?></th>
+									<th scope="row"><?php echo __('Starting post label') ?></th>
 									<td>
 										<input type="text" name="i_start_at" size="7" maxlength="7" value="<?php echo(isset($first_id)) ? $first_id : 0 ?>" tabindex="2" />
-										<span><?php echo $lang_admin_maintenance['Starting post help'] ?></span>
+										<span><?php echo __('Starting post help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_maintenance['Empty index label'] ?></th>
+									<th scope="row"><?php echo __('Empty index label') ?></th>
 									<td class="inputadmin">
-										<label><input type="checkbox" name="i_empty_index" value="1" tabindex="3" checked="checked" />&#160;&#160;<?php echo $lang_admin_maintenance['Empty index help'] ?></label>
+										<label><input type="checkbox" name="i_empty_index" value="1" tabindex="3" checked="checked" />&#160;&#160;<?php echo __('Empty index help') ?></label>
 									</td>
 								</tr>
 							</table>
-							<p class="topspace"><?php echo $lang_admin_maintenance['Rebuild completed info'] ?></p>
-							<div class="fsetsubmit"><input type="submit" name="rebuild_index" value="<?php echo $lang_admin_maintenance['Rebuild index'] ?>" tabindex="4" /></div>
+							<p class="topspace"><?php echo __('Rebuild completed info') ?></p>
+							<div class="fsetsubmit"><input type="submit" name="rebuild_index" value="<?php echo __('Rebuild index') ?>" tabindex="4" /></div>
 						</div>
 					</fieldset>
 				</div>
@@ -57,38 +57,38 @@
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
 					<fieldset>
-						<legend><?php echo $lang_admin_maintenance['Prune subhead'] ?></legend>
+						<legend><?php echo __('Prune subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_maintenance['Days old label'] ?></th>
+									<th scope="row"><?php echo __('Days old label') ?></th>
 									<td>
 										<input type="text" name="req_prune_days" size="3" maxlength="3" tabindex="5" />
-										<span><?php echo $lang_admin_maintenance['Days old help'] ?></span>
+										<span><?php echo __('Days old help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_maintenance['Prune sticky label'] ?></th>
+									<th scope="row"><?php echo __('Prune sticky label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="prune_sticky" value="1" tabindex="6" checked="checked" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
-										<label class="conl"><input type="radio" name="prune_sticky" value="0" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_maintenance['Prune sticky help'] ?></span>
+										<label class="conl"><input type="radio" name="prune_sticky" value="1" tabindex="6" checked="checked" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="prune_sticky" value="0" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Prune sticky help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_maintenance['Prune from label'] ?></th>
+									<th scope="row"><?php echo __('Prune from label') ?></th>
 									<td>
 										<select name="prune_from" tabindex="7">
-											<option value="all"><?php echo $lang_admin_maintenance['All forums'] ?></option>
+											<option value="all"><?php echo __('All forums') ?></option>
 												<?php echo $categories; ?>
 											</optgroup>
 										</select>
-										<span><?php echo $lang_admin_maintenance['Prune from help'] ?></span>
+										<span><?php echo __('Prune from help') ?></span>
 									</td>
 								</tr>
 							</table>
-							<p class="topspace"><?php printf($lang_admin_maintenance['Prune info'], '<a href="'.get_link('admin/options/#maintenance').'">'.$lang_admin_common['Maintenance mode'].'</a>') ?></p>
-							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php echo $lang_admin_common['Prune'] ?>" tabindex="8" /></div>
+							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php echo __('Prune') ?>" tabindex="8" /></div>
 						</div>
 					</fieldset>
 				</div>
diff --git a/view/admin/maintenance/prune.php b/view/admin/maintenance/prune.php
index d668d98a..8801a979 100644
--- a/view/admin/maintenance/prune.php
+++ b/view/admin/maintenance/prune.php
@@ -14,7 +14,7 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_maintenance['Prune head'] ?></span></h2>
+		<h2><span><?php echo __('Prune head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/maintenance/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -24,14 +24,14 @@
 					<input type="hidden" name="prune_sticky" value="<?php echo $prune_sticky ?>" />
 					<input type="hidden" name="prune_from" value="<?php echo $prune_from ?>" />
 					<fieldset>
-						<legend><?php echo $lang_admin_maintenance['Confirm prune subhead'] ?></legend>
+						<legend><?php echo __('Confirm prune subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf($lang_admin_maintenance['Confirm prune info'], $prune['days'], $prune['forum'], forum_number_format($prune['num_topics'])) ?></p>
-							<p class="warntext"><?php echo $lang_admin_maintenance['Confirm prune warn'] ?></p>
+							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], forum_number_format($prune['num_topics'])) ?></p>
+							<p class="warntext"><?php echo __('Confirm prune warn') ?></p>
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="prune_comply" value="<?php echo $lang_admin_common['Prune'] ?>" /><a href="javascript:history.go(-1)"><?php echo $lang_admin_common['Go back'] ?></a></p>
+				<p class="buttons"><input type="submit" name="prune_comply" value="<?php echo __('Prune') ?>" /><a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/maintenance/rebuild.php b/view/admin/maintenance/rebuild.php
index ebf049ef..36947974 100644
--- a/view/admin/maintenance/rebuild.php
+++ b/view/admin/maintenance/rebuild.php
@@ -34,5 +34,5 @@
 </head>
 <body>
 
-<h1><?php echo $lang_admin_maintenance['Rebuilding index info'] ?></h1>
+<h1><?php echo __('Rebuilding index info') ?></h1>
 <hr />
\ No newline at end of file
diff --git a/view/admin/menu.php b/view/admin/menu.php
index ef12247c..e2870921 100644
--- a/view/admin/menu.php
+++ b/view/admin/menu.php
@@ -15,27 +15,27 @@
 ?>
 <div id="adminconsole" class="block2col">
 	<div id="adminmenu" class="blockmenu">
-		<h2><span><?php echo $lang_admin_common['Moderator menu'] ?></span></h2>
+		<h2><span><?php echo __('Moderator menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'index') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/') ?>"><?php echo $lang_admin_common['Index'] ?></a></li>
+    ?>><a href="<?php echo get_link('admin/') ?>"><?php echo __('Index') ?></a></li>
 					<li<?php if ($page == 'users') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/users/') ?>"><?php echo $lang_admin_common['Users'] ?></a></li>
+    ?>><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
 <?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php echo $lang_admin_common['Bans'] ?></a></li>
+    ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php echo __('Bans') ?></a></li>
 <?php endif;
     if ($is_admin || $feather_config['o_report_method'] == '0' || $feather_config['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php echo $lang_admin_common['Reports'] ?></a></li>
+    ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php echo __('Reports') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
@@ -44,42 +44,42 @@
 
     if ($is_admin) {
         ?>
-		<h2 class="block2"><span><?php echo $lang_admin_common['Admin menu'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('Admin menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'options') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/options/') ?>"><?php echo $lang_admin_common['Options'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/options/') ?>"><?php echo __('Options') ?></a></li>
 					<li<?php if ($page == 'permissions') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/permissions/') ?>"><?php echo $lang_admin_common['Permissions'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/permissions/') ?>"><?php echo __('Permissions') ?></a></li>
 					<li<?php if ($page == 'categories') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/categories/') ?>"><?php echo $lang_admin_common['Categories'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/categories/') ?>"><?php echo __('Categories') ?></a></li>
 					<li<?php if ($page == 'forums') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/forums/') ?>"><?php echo $lang_admin_common['Forums'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/forums/') ?>"><?php echo __('Forums') ?></a></li>
 					<li<?php if ($page == 'groups') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/groups/') ?>"><?php echo $lang_admin_common['User groups'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/groups/') ?>"><?php echo __('User groups') ?></a></li>
 					<li<?php if ($page == 'censoring') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/censoring/') ?>"><?php echo $lang_admin_common['Censoring'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/censoring/') ?>"><?php echo __('Censoring') ?></a></li>
 					<li<?php if ($page == 'parser') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/parser/') ?>"><?php echo $lang_admin_common['Parser'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/parser/') ?>"><?php echo __('Parser') ?></a></li>
 					<li<?php if ($page == 'maintenance') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/maintenance/') ?>"><?php echo $lang_admin_common['Maintenance'] ?></a></li>
+        ?>><a href="<?php echo get_link('admin/maintenance/') ?>"><?php echo __('Maintenance') ?></a></li>
 				</ul>
 			</div>
 		</div>
@@ -90,7 +90,7 @@
     // Did we find any plugins?
     if (!empty($plugins)) {
         ?>
-		<h2 class="block2"><span><?php echo $lang_admin_common['Plugins menu'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('Plugins menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
diff --git a/view/admin/options.php b/view/admin/options.php
index 00d01f78..a19ccddb 100644
--- a/view/admin/options.php
+++ b/view/admin/options.php
@@ -14,180 +14,180 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_options['Options head'] ?></span></h2>
+		<h2><span><?php echo __('Options head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/options/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" /></p>
+				<p class="submittop"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
 				<div class="inform">
 					<input type="hidden" name="form_sent" value="1" />
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Essentials subhead'] ?></legend>
+						<legend><?php echo __('Essentials subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Board title label'] ?></th>
+									<th scope="row"><?php echo __('Board title label') ?></th>
 									<td>
 										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather_config['o_board_title']) ?>" />
-										<span><?php echo $lang_admin_options['Board title help'] ?></span>
+										<span><?php echo __('Board title help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Board desc label'] ?></th>
+									<th scope="row"><?php echo __('Board desc label') ?></th>
 									<td>
 										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather_config['o_board_desc']) ?></textarea>
-										<span><?php echo $lang_admin_options['Board desc help'] ?></span>
+										<span><?php echo __('Board desc help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Base URL label'] ?></th>
+									<th scope="row"><?php echo __('Base URL label') ?></th>
 									<td>
 										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather_config['o_base_url']) ?>" />
-										<span><?php echo $lang_admin_options['Base URL help'] ?></span>
+										<span><?php echo __('Base URL help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Timezone label'] ?></th>
+									<th scope="row"><?php echo __('Timezone label') ?></th>
 									<td>
 										<select name="form_default_timezone">
 											<option value="-12"<?php if ($feather_config['o_default_timezone'] == -12) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-12:00'] ?></option>
+} ?>><?php echo __('UTC-12:00') ?></option>
 											<option value="-11"<?php if ($feather_config['o_default_timezone'] == -11) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-11:00'] ?></option>
+} ?>><?php echo __('UTC-11:00') ?></option>
 											<option value="-10"<?php if ($feather_config['o_default_timezone'] == -10) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-10:00'] ?></option>
+} ?>><?php echo __('UTC-10:00') ?></option>
 											<option value="-9.5"<?php if ($feather_config['o_default_timezone'] == -9.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-09:30'] ?></option>
+} ?>><?php echo __('UTC-09:30') ?></option>
 											<option value="-9"<?php if ($feather_config['o_default_timezone'] == -9) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-09:00'] ?></option>
+} ?>><?php echo __('UTC-09:00') ?></option>
 											<option value="-8.5"<?php if ($feather_config['o_default_timezone'] == -8.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-08:30'] ?></option>
+} ?>><?php echo __('UTC-08:30') ?></option>
 											<option value="-8"<?php if ($feather_config['o_default_timezone'] == -8) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-08:00'] ?></option>
+} ?>><?php echo __('UTC-08:00') ?></option>
 											<option value="-7"<?php if ($feather_config['o_default_timezone'] == -7) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-07:00'] ?></option>
+} ?>><?php echo __('UTC-07:00') ?></option>
 											<option value="-6"<?php if ($feather_config['o_default_timezone'] == -6) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-06:00'] ?></option>
+} ?>><?php echo __('UTC-06:00') ?></option>
 											<option value="-5"<?php if ($feather_config['o_default_timezone'] == -5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-05:00'] ?></option>
+} ?>><?php echo __('UTC-05:00') ?></option>
 											<option value="-4"<?php if ($feather_config['o_default_timezone'] == -4) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-04:00'] ?></option>
+} ?>><?php echo __('UTC-04:00') ?></option>
 											<option value="-3.5"<?php if ($feather_config['o_default_timezone'] == -3.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-03:30'] ?></option>
+} ?>><?php echo __('UTC-03:30') ?></option>
 											<option value="-3"<?php if ($feather_config['o_default_timezone'] == -3) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-03:00'] ?></option>
+} ?>><?php echo __('UTC-03:00') ?></option>
 											<option value="-2"<?php if ($feather_config['o_default_timezone'] == -2) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-02:00'] ?></option>
+} ?>><?php echo __('UTC-02:00') ?></option>
 											<option value="-1"<?php if ($feather_config['o_default_timezone'] == -1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC-01:00'] ?></option>
+} ?>><?php echo __('UTC-01:00') ?></option>
 											<option value="0"<?php if ($feather_config['o_default_timezone'] == 0) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC'] ?></option>
+} ?>><?php echo __('UTC') ?></option>
 											<option value="1"<?php if ($feather_config['o_default_timezone'] == 1) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+01:00'] ?></option>
+} ?>><?php echo __('UTC+01:00') ?></option>
 											<option value="2"<?php if ($feather_config['o_default_timezone'] == 2) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+02:00'] ?></option>
+} ?>><?php echo __('UTC+02:00') ?></option>
 											<option value="3"<?php if ($feather_config['o_default_timezone'] == 3) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+03:00'] ?></option>
+} ?>><?php echo __('UTC+03:00') ?></option>
 											<option value="3.5"<?php if ($feather_config['o_default_timezone'] == 3.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+03:30'] ?></option>
+} ?>><?php echo __('UTC+03:30') ?></option>
 											<option value="4"<?php if ($feather_config['o_default_timezone'] == 4) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+04:00'] ?></option>
+} ?>><?php echo __('UTC+04:00') ?></option>
 											<option value="4.5"<?php if ($feather_config['o_default_timezone'] == 4.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+04:30'] ?></option>
+} ?>><?php echo __('UTC+04:30') ?></option>
 											<option value="5"<?php if ($feather_config['o_default_timezone'] == 5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+05:00'] ?></option>
+} ?>><?php echo __('UTC+05:00') ?></option>
 											<option value="5.5"<?php if ($feather_config['o_default_timezone'] == 5.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+05:30'] ?></option>
+} ?>><?php echo __('UTC+05:30') ?></option>
 											<option value="5.75"<?php if ($feather_config['o_default_timezone'] == 5.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+05:45'] ?></option>
+} ?>><?php echo __('UTC+05:45') ?></option>
 											<option value="6"<?php if ($feather_config['o_default_timezone'] == 6) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+06:00'] ?></option>
+} ?>><?php echo __('UTC+06:00') ?></option>
 											<option value="6.5"<?php if ($feather_config['o_default_timezone'] == 6.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+06:30'] ?></option>
+} ?>><?php echo __('UTC+06:30') ?></option>
 											<option value="7"<?php if ($feather_config['o_default_timezone'] == 7) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+07:00'] ?></option>
+} ?>><?php echo __('UTC+07:00') ?></option>
 											<option value="8"<?php if ($feather_config['o_default_timezone'] == 8) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+08:00'] ?></option>
+} ?>><?php echo __('UTC+08:00') ?></option>
 											<option value="8.75"<?php if ($feather_config['o_default_timezone'] == 8.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+08:45'] ?></option>
+} ?>><?php echo __('UTC+08:45') ?></option>
 											<option value="9"<?php if ($feather_config['o_default_timezone'] == 9) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+09:00'] ?></option>
+} ?>><?php echo __('UTC+09:00') ?></option>
 											<option value="9.5"<?php if ($feather_config['o_default_timezone'] == 9.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+09:30'] ?></option>
+} ?>><?php echo __('UTC+09:30') ?></option>
 											<option value="10"<?php if ($feather_config['o_default_timezone'] == 10) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+10:00'] ?></option>
+} ?>><?php echo __('UTC+10:00') ?></option>
 											<option value="10.5"<?php if ($feather_config['o_default_timezone'] == 10.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+10:30'] ?></option>
+} ?>><?php echo __('UTC+10:30') ?></option>
 											<option value="11"<?php if ($feather_config['o_default_timezone'] == 11) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+11:00'] ?></option>
+} ?>><?php echo __('UTC+11:00') ?></option>
 											<option value="11.5"<?php if ($feather_config['o_default_timezone'] == 11.5) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+11:30'] ?></option>
+} ?>><?php echo __('UTC+11:30') ?></option>
 											<option value="12"<?php if ($feather_config['o_default_timezone'] == 12) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+12:00'] ?></option>
+} ?>><?php echo __('UTC+12:00') ?></option>
 											<option value="12.75"<?php if ($feather_config['o_default_timezone'] == 12.75) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+12:45'] ?></option>
+} ?>><?php echo __('UTC+12:45') ?></option>
 											<option value="13"<?php if ($feather_config['o_default_timezone'] == 13) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+13:00'] ?></option>
+} ?>><?php echo __('UTC+13:00') ?></option>
 											<option value="14"<?php if ($feather_config['o_default_timezone'] == 14) {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['UTC+14:00'] ?></option>
+} ?>><?php echo __('UTC+14:00') ?></option>
 										</select>
-										<span><?php echo $lang_admin_options['Timezone help'] ?></span>
+										<span><?php echo __('Timezone help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['DST label'] ?></th>
+									<th scope="row"><?php echo __('DST label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather_config['o_default_dst'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather_config['o_default_dst'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['DST help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('DST help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Language label'] ?></th>
+									<th scope="row"><?php echo __('Language label') ?></th>
 									<td>
 										<select name="form_default_lang">
 <?php
@@ -201,16 +201,16 @@
 
 ?>
 										</select>
-										<span><?php echo $lang_admin_options['Language help'] ?></span>
+										<span><?php echo __('Language help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Default style label'] ?></th>
+									<th scope="row"><?php echo __('Default style label') ?></th>
 									<td>
 										<select name="form_default_style">
 											<?php echo $styles; ?>
 										</select>
-										<span><?php echo $lang_admin_options['Default style help'] ?></span>
+										<span><?php echo __('Default style help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -225,42 +225,42 @@
 ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Timeouts subhead'] ?></legend>
+						<legend><?php echo __('Timeouts subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Time format label'] ?></th>
+									<th scope="row"><?php echo __('Time format label') ?></th>
 									<td>
 										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_time_format']) ?>" />
-										<span><?php printf($lang_admin_options['Time format help'], gmdate($feather_config['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.$lang_admin_options['PHP manual'].'</a>') ?></span>
+										<span><?php printf(__('Time format help'), gmdate($feather_config['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Date format label'] ?></th>
+									<th scope="row"><?php echo __('Date format label') ?></th>
 									<td>
 										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_date_format']) ?>" />
-										<span><?php printf($lang_admin_options['Date format help'], gmdate($feather_config['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.$lang_admin_options['PHP manual'].'</a>') ?></span>
+										<span><?php printf(__('Date format help'), gmdate($feather_config['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Visit timeout label'] ?></th>
+									<th scope="row"><?php echo __('Visit timeout label') ?></th>
 									<td>
 										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_visit'] ?>" />
-										<span><?php echo $lang_admin_options['Visit timeout help'] ?></span>
+										<span><?php echo __('Visit timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Online timeout label'] ?></th>
+									<th scope="row"><?php echo __('Online timeout label') ?></th>
 									<td>
 										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_online'] ?>" />
-										<span><?php echo $lang_admin_options['Online timeout help'] ?></span>
+										<span><?php echo __('Online timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Redirect time label'] ?></th>
+									<th scope="row"><?php echo __('Redirect time label') ?></th>
 									<td>
 										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather_config['o_redirect_delay'] ?>" />
-										<span><?php echo $lang_admin_options['Redirect time help'] ?></span>
+										<span><?php echo __('Redirect time help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -269,114 +269,114 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Display subhead'] ?></legend>
+						<legend><?php echo __('Display subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Version number label'] ?></th>
+									<th scope="row"><?php echo __('Version number label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather_config['o_show_version'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather_config['o_show_version'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Version number help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Version number help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Info in posts label'] ?></th>
+									<th scope="row"><?php echo __('Info in posts label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather_config['o_show_user_info'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather_config['o_show_user_info'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Info in posts help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Info in posts help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Post count label'] ?></th>
+									<th scope="row"><?php echo __('Post count label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather_config['o_show_post_count'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather_config['o_show_post_count'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Post count help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Post count help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Smilies label'] ?></th>
+									<th scope="row"><?php echo __('Smilies label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather_config['o_smilies'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather_config['o_smilies'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Smilies help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Smilies help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Smilies sigs label'] ?></th>
+									<th scope="row"><?php echo __('Smilies sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather_config['o_smilies_sig'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather_config['o_smilies_sig'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Smilies sigs help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Smilies sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Clickable links label'] ?></th>
+									<th scope="row"><?php echo __('Clickable links label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather_config['o_make_links'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather_config['o_make_links'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Clickable links help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Clickable links help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Topic review label'] ?></th>
+									<th scope="row"><?php echo __('Topic review label') ?></th>
 									<td>
 										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather_config['o_topic_review'] ?>" />
-										<span><?php echo $lang_admin_options['Topic review help'] ?></span>
+										<span><?php echo __('Topic review help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Topics per page label'] ?></th>
+									<th scope="row"><?php echo __('Topics per page label') ?></th>
 									<td>
 										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_topics_default'] ?>" />
-										<span><?php echo $lang_admin_options['Topics per page help'] ?></span>
+										<span><?php echo __('Topics per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Posts per page label'] ?></th>
+									<th scope="row"><?php echo __('Posts per page label') ?></th>
 									<td>
 										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_posts_default'] ?>" />
-										<span><?php echo $lang_admin_options['Posts per page help'] ?></span>
+										<span><?php echo __('Posts per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Indent label'] ?></th>
+									<th scope="row"><?php echo __('Indent label') ?></th>
 									<td>
 										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather_config['o_indent_num_spaces'] ?>" />
-										<span><?php echo $lang_admin_options['Indent help'] ?></span>
+										<span><?php echo __('Indent help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Quote depth label'] ?></th>
+									<th scope="row"><?php echo __('Quote depth label') ?></th>
 									<td>
 										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather_config['o_quote_depth'] ?>" />
-										<span><?php echo $lang_admin_options['Quote depth help'] ?></span>
+										<span><?php echo __('Quote depth help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -385,122 +385,122 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Features subhead'] ?></legend>
+						<legend><?php echo __('Features subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Quick post label'] ?></th>
+									<th scope="row"><?php echo __('Quick post label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather_config['o_quickpost'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather_config['o_quickpost'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Quick post help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Quick post help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Users online label'] ?></th>
+									<th scope="row"><?php echo __('Users online label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather_config['o_users_online'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather_config['o_users_online'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Users online help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Users online help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><a name="censoring"></a><?php echo $lang_admin_options['Censor words label'] ?></th>
+									<th scope="row"><a name="censoring"></a><?php echo __('Censor words label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather_config['o_censoring'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather_config['o_censoring'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php printf($lang_admin_options['Censor words help'], '<a href="'.get_link('admin/censoring/').'">'.$lang_admin_common['Censoring'].'</a>') ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><a name="signatures"></a><?php echo $lang_admin_options['Signatures label'] ?></th>
+									<th scope="row"><a name="signatures"></a><?php echo __('Signatures label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather_config['o_signatures'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather_config['o_signatures'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Signatures help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Signatures help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['User has posted label'] ?></th>
+									<th scope="row"><?php echo __('User has posted label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather_config['o_show_dot'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather_config['o_show_dot'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['User has posted help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('User has posted help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Topic views label'] ?></th>
+									<th scope="row"><?php echo __('Topic views label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather_config['o_topic_views'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather_config['o_topic_views'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Topic views help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Topic views help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Quick jump label'] ?></th>
+									<th scope="row"><?php echo __('Quick jump label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather_config['o_quickjump'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather_config['o_quickjump'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Quick jump help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Quick jump help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['GZip label'] ?></th>
+									<th scope="row"><?php echo __('GZip label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather_config['o_gzip'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather_config['o_gzip'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['GZip help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('GZip help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Search all label'] ?></th>
+									<th scope="row"><?php echo __('Search all label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather_config['o_search_all_forums'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather_config['o_search_all_forums'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Search all help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Search all help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Menu items label'] ?></th>
+									<th scope="row"><?php echo __('Menu items label') ?></th>
 									<td>
 										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather_config['o_additional_navlinks']) ?></textarea>
-										<span><?php echo $lang_admin_options['Menu items help'] ?></span>
+										<span><?php echo __('Menu items help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -509,34 +509,34 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Feed subhead'] ?></legend>
+						<legend><?php echo __('Feed subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Default feed label'] ?></th>
+									<th scope="row"><?php echo __('Default feed label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather_config['o_feed_type'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_options['None'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('None') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather_config['o_feed_type'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_options['RSS'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('RSS') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather_config['o_feed_type'] == '2') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_options['Atom'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Default feed help'] ?></span>
+} ?> />&#160;<strong><?php echo __('Atom') ?></strong></label>
+										<span class="clearb"><?php echo __('Default feed help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Feed TTL label'] ?></th>
+									<th scope="row"><?php echo __('Feed TTL label') ?></th>
 									<td>
 										<select name="form_feed_ttl">
 											<option value="0"<?php if ($feather_config['o_feed_ttl'] == '0') {
     echo ' selected="selected"';
-} ?>><?php echo $lang_admin_options['No cache'] ?></option>
+} ?>><?php echo __('No cache') ?></option>
 											<?php echo $times ?>
 										</select>
-										<span><?php echo $lang_admin_options['Feed TTL help'] ?></span>
+										<span><?php echo __('Feed TTL help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -545,29 +545,29 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Reports subhead'] ?></legend>
+						<legend><?php echo __('Reports subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Reporting method label'] ?></th>
+									<th scope="row"><?php echo __('Reporting method label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather_config['o_report_method'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_options['Internal'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Internal') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather_config['o_report_method'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_options['By e-mail'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('By e-mail') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather_config['o_report_method'] == '2') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_options['Both'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Reporting method help'] ?></span>
+} ?> />&#160;<strong><?php echo __('Both') ?></strong></label>
+										<span class="clearb"><?php echo __('Reporting method help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Mailing list label'] ?></th>
+									<th scope="row"><?php echo __('Mailing list label') ?></th>
 									<td>
 										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather_config['o_mailing_list']) ?></textarea>
-										<span><?php echo $lang_admin_options['Mailing list help'] ?></span>
+										<span><?php echo __('Mailing list help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -576,47 +576,47 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Avatars subhead'] ?></legend>
+						<legend><?php echo __('Avatars subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Use avatars label'] ?></th>
+									<th scope="row"><?php echo __('Use avatars label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather_config['o_avatars'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather_config['o_avatars'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Use avatars help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Use avatars help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Upload directory label'] ?></th>
+									<th scope="row"><?php echo __('Upload directory label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather_config['o_avatars_dir']) ?>" />
-										<span><?php echo $lang_admin_options['Upload directory help'] ?></span>
+										<span><?php echo __('Upload directory help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Max width label'] ?></th>
+									<th scope="row"><?php echo __('Max width label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_width'] ?>" />
-										<span><?php echo $lang_admin_options['Max width help'] ?></span>
+										<span><?php echo __('Max width help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Max height label'] ?></th>
+									<th scope="row"><?php echo __('Max height label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_height'] ?>" />
-										<span><?php echo $lang_admin_options['Max height help'] ?></span>
+										<span><?php echo __('Max height help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Max size label'] ?></th>
+									<th scope="row"><?php echo __('Max size label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-										<span><?php echo $lang_admin_options['Max size help'] ?></span>
+										<span><?php echo __('Max size help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -625,81 +625,81 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['E-mail subhead'] ?></legend>
+						<legend><?php echo __('E-mail subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Admin e-mail label'] ?></th>
+									<th scope="row"><?php echo __('Admin e-mail label') ?></th>
 									<td>
 										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_admin_email']) ?>" />
-										<span><?php echo $lang_admin_options['Admin e-mail help'] ?></span>
+										<span><?php echo __('Admin e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Webmaster e-mail label'] ?></th>
+									<th scope="row"><?php echo __('Webmaster e-mail label') ?></th>
 									<td>
 										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_webmaster_email']) ?>" />
-										<span><?php echo $lang_admin_options['Webmaster e-mail help'] ?></span>
+										<span><?php echo __('Webmaster e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Forum subscriptions label'] ?></th>
+									<th scope="row"><?php echo __('Forum subscriptions label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather_config['o_forum_subscriptions'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather_config['o_forum_subscriptions'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Forum subscriptions help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Forum subscriptions help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Topic subscriptions label'] ?></th>
+									<th scope="row"><?php echo __('Topic subscriptions label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather_config['o_topic_subscriptions'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather_config['o_topic_subscriptions'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Topic subscriptions help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Topic subscriptions help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['SMTP address label'] ?></th>
+									<th scope="row"><?php echo __('SMTP address label') ?></th>
 									<td>
 										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather_config['o_smtp_host']) ?>" />
-										<span><?php echo $lang_admin_options['SMTP address help'] ?></span>
+										<span><?php echo __('SMTP address help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['SMTP username label'] ?></th>
+									<th scope="row"><?php echo __('SMTP username label') ?></th>
 									<td>
 										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather_config['o_smtp_user']) ?>" />
-										<span><?php echo $lang_admin_options['SMTP username help'] ?></span>
+										<span><?php echo __('SMTP username help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['SMTP password label'] ?></th>
+									<th scope="row"><?php echo __('SMTP password label') ?></th>
 									<td>
-										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php echo $lang_admin_options['SMTP change password help'] ?></label>
+										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php echo __('SMTP change password help') ?></label>
 <?php $smtp_pass = !empty($feather_config['o_smtp_pass']) ? random_key(feather_strlen($feather_config['o_smtp_pass']), true) : ''; ?>
 										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
-										<span><?php echo $lang_admin_options['SMTP password help'] ?></span>
+										<span><?php echo __('SMTP password help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['SMTP SSL label'] ?></th>
+									<th scope="row"><?php echo __('SMTP SSL label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather_config['o_smtp_ssl'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather_config['o_smtp_ssl'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['SMTP SSL help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('SMTP SSL help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -708,77 +708,77 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Registration subhead'] ?></legend>
+						<legend><?php echo __('Registration subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Allow new label'] ?></th>
+									<th scope="row"><?php echo __('Allow new label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather_config['o_regs_allow'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather_config['o_regs_allow'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Allow new help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Allow new help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Verify label'] ?></th>
+									<th scope="row"><?php echo __('Verify label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather_config['o_regs_verify'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather_config['o_regs_verify'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Verify help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Verify help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Report new label'] ?></th>
+									<th scope="row"><?php echo __('Report new label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather_config['o_regs_report'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather_config['o_regs_report'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Report new help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Report new help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Use rules label'] ?></th>
+									<th scope="row"><?php echo __('Use rules label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather_config['o_rules'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather_config['o_rules'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Use rules help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Use rules help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Rules label'] ?></th>
+									<th scope="row"><?php echo __('Rules label') ?></th>
 									<td>
 										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather_config['o_rules_message']) ?></textarea>
-										<span><?php echo $lang_admin_options['Rules help'] ?></span>
+										<span><?php echo __('Rules help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['E-mail default label'] ?></th>
+									<th scope="row"><?php echo __('E-mail default label') ?></th>
 									<td>
-										<span><?php echo $lang_admin_options['E-mail default help'] ?></span>
+										<span><?php echo __('E-mail default help') ?></span>
 										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather_config['o_default_email_setting'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<?php echo $lang_admin_options['Display e-mail label'] ?></label>
+} ?> />&#160;<?php echo __('Display e-mail label') ?></label>
 										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather_config['o_default_email_setting'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<?php echo $lang_admin_options['Hide allow form label'] ?></label>
+} ?> />&#160;<?php echo __('Hide allow form label') ?></label>
 										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather_config['o_default_email_setting'] == '2') {
     echo ' checked="checked"';
-} ?> />&#160;<?php echo $lang_admin_options['Hide both label'] ?></label>
+} ?> />&#160;<?php echo __('Hide both label') ?></label>
 									</td>
 								</tr>
 							</table>
@@ -787,26 +787,26 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Announcement subhead'] ?></legend>
+						<legend><?php echo __('Announcement subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Display announcement label'] ?></th>
+									<th scope="row"><?php echo __('Display announcement label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather_config['o_announcement'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather_config['o_announcement'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Display announcement help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Display announcement help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Announcement message label'] ?></th>
+									<th scope="row"><?php echo __('Announcement message label') ?></th>
 									<td>
 										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_announcement_message']) ?></textarea>
-										<span><?php echo $lang_admin_options['Announcement message help'] ?></span>
+										<span><?php echo __('Announcement message help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -815,33 +815,33 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_options['Maintenance subhead'] ?></legend>
+						<legend><?php echo __('Maintenance subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><a name="maintenance"></a><?php echo $lang_admin_options['Maintenance mode label'] ?></th>
+									<th scope="row"><a name="maintenance"></a><?php echo __('Maintenance mode label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather_config['o_maintenance'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather_config['o_maintenance'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_options['Maintenance mode help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Maintenance mode help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_options['Maintenance message label'] ?></th>
+									<th scope="row"><?php echo __('Maintenance message label') ?></th>
 									<td>
 										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_maintenance_message']) ?></textarea>
-										<span><?php echo $lang_admin_options['Maintenance message help'] ?></span>
+										<span><?php echo __('Maintenance message help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" /></p>
+				<p class="submitend"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/parser.php b/view/admin/parser.php
index 84a0528e..8049bc52 100644
--- a/view/admin/parser.php
+++ b/view/admin/parser.php
@@ -19,7 +19,7 @@
 			<form method="post" action="<?php echo get_link('admin/parser/') ?>" enctype="multipart/form-data">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop">
-					<input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" />
+					<input type="submit" name="save" value="<?php echo __('Save changes') ?>" />
 					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
 				</p>
 				<div class="inform">
@@ -33,9 +33,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[textile]" value="1"<?php if ($config['textile']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['Yes'] ?></strong>   <input type="radio" name="config[textile]" value="0"<?php if (!$config['textile']) {
+} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[textile]" value="0"<?php if (!$config['textile']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+} ?> /> <strong><?php echo __('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['textile help'] ?></span>
@@ -46,9 +46,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[quote_links]" value="1"<?php if ($config['quote_links']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['Yes'] ?></strong>   <input type="radio" name="config[quote_links]" value="0"<?php if (!$config['quote_links']) {
+} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[quote_links]" value="0"<?php if (!$config['quote_links']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+} ?> /> <strong><?php echo __('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['quote_links help'] ?></span>
@@ -59,9 +59,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[quote_imgs]" value="1"<?php if ($config['quote_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['Yes'] ?></strong>   <input type="radio" name="config[quote_imgs]" value="0"<?php if (!$config['quote_imgs']) {
+} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[quote_imgs]" value="0"<?php if (!$config['quote_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+} ?> /> <strong><?php echo __('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['quote_imgs help'] ?></span>
@@ -72,9 +72,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[click_imgs]" value="1"<?php if ($config['click_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['Yes'] ?></strong>   <input type="radio" name="config[click_imgs]" value="0"<?php if (!$config['click_imgs']) {
+} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[click_imgs]" value="0"<?php if (!$config['click_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+} ?> /> <strong><?php echo __('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['click_imgs help'] ?></span>
@@ -88,12 +88,12 @@
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
     echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php echo $lang_admin_common['Yes'] ?></strong>
+} ?> /> <strong><?php echo __('Yes') ?></strong>
 										<input type="radio" name="config[valid_imgs]" value="0"<?php if (!$config['valid_imgs']) {
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
     echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+} ?> /> <strong><?php echo __('No') ?></strong>
 									</td>
 									<td><?php echo $lang_admin_parser['valid_imgs help'] ?></td>
 								</tr>
@@ -257,19 +257,19 @@
 										<input type="radio" name="<?php echo($tagname) ?>_in_post" value="1"<?php if ($bbcd[$tagname]['in_post']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo $lang_admin_common['Yes'] ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_post" value="0"<?php if (!$bbcd[$tagname]['in_post']) {
+    ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_post" value="0"<?php if (!$bbcd[$tagname]['in_post']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+    ?> /> <strong><?php echo __('No') ?></strong>
 									</td>
 									<td>
 										<input type="radio" name="<?php echo($tagname) ?>_in_sig" value="1"<?php if ($bbcd[$tagname]['in_sig']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo $lang_admin_common['Yes'] ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_sig" value="0"<?php if (!$bbcd[$tagname]['in_sig']) {
+    ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_sig" value="0"<?php if (!$bbcd[$tagname]['in_sig']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+    ?> /> <strong><?php echo __('No') ?></strong>
 									</td>
 									<td>
 										<input type="text" size="10" name="<?php echo($tagname) ?>_depth_max" value="<?php echo($bbcd[$tagname]['depth_max']);
@@ -289,7 +289,7 @@
 
 
 				<p class="submitend">
-					<input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" />
+					<input type="submit" name="save" value="<?php echo __('Save changes') ?>" />
 					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
 				</p>
 			</form>
diff --git a/view/admin/permissions.php b/view/admin/permissions.php
index bb73f56c..34fe64cb 100644
--- a/view/admin/permissions.php
+++ b/view/admin/permissions.php
@@ -14,75 +14,75 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_permissions['Permissions head'] ?></span></h2>
+		<h2><span><?php echo __('Permissions head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/permissions/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" /></p>
+				<p class="submittop"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
 				<div class="inform">
 					<input type="hidden" name="form_sent" value="1" />
 					<fieldset>
-						<legend><?php echo $lang_admin_permissions['Posting subhead'] ?></legend>
+						<legend><?php echo __('Posting subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['BBCode label'] ?></th>
+									<th scope="row"><?php echo __('BBCode label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather_config['p_message_bbcode'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather_config['p_message_bbcode'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['BBCode help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('BBCode help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['Image tag label'] ?></th>
+									<th scope="row"><?php echo __('Image tag label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather_config['p_message_img_tag'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather_config['p_message_img_tag'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['Image tag help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Image tag help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['All caps message label'] ?></th>
+									<th scope="row"><?php echo __('All caps message label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather_config['p_message_all_caps'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather_config['p_message_all_caps'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['All caps message help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('All caps message help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['All caps subject label'] ?></th>
+									<th scope="row"><?php echo __('All caps subject label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather_config['p_subject_all_caps'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather_config['p_subject_all_caps'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['All caps subject help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('All caps subject help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['Require e-mail label'] ?></th>
+									<th scope="row"><?php echo __('Require e-mail label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather_config['p_force_guest_email'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather_config['p_force_guest_email'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['Require e-mail help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Require e-mail help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -91,57 +91,57 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_permissions['Signatures subhead'] ?></legend>
+						<legend><?php echo __('Signatures subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['BBCode sigs label'] ?></th>
+									<th scope="row"><?php echo __('BBCode sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather_config['p_sig_bbcode'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather_config['p_sig_bbcode'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['BBCode sigs help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('BBCode sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['Image tag sigs label'] ?></th>
+									<th scope="row"><?php echo __('Image tag sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather_config['p_sig_img_tag'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather_config['p_sig_img_tag'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['Image tag sigs help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Image tag sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['All caps sigs label'] ?></th>
+									<th scope="row"><?php echo __('All caps sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather_config['p_sig_all_caps'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather_config['p_sig_all_caps'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['All caps sigs help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('All caps sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['Max sig length label'] ?></th>
+									<th scope="row"><?php echo __('Max sig length label') ?></th>
 									<td>
 										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather_config['p_sig_length'] ?>" />
-										<span class="clearb"><?php echo $lang_admin_permissions['Max sig length help'] ?></span>
+										<span class="clearb"><?php echo __('Max sig length help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['Max sig lines label'] ?></th>
+									<th scope="row"><?php echo __('Max sig lines label') ?></th>
 									<td>
 										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather_config['p_sig_lines'] ?>" />
-										<span class="clearb"><?php echo $lang_admin_permissions['Max sig lines help'] ?></span>
+										<span class="clearb"><?php echo __('Max sig lines help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -150,38 +150,38 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_permissions['Registration subhead'] ?></legend>
+						<legend><?php echo __('Registration subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['Banned e-mail label'] ?></th>
+									<th scope="row"><?php echo __('Banned e-mail label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather_config['p_allow_banned_email'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather_config['p_allow_banned_email'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['Banned e-mail help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Banned e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_permissions['Duplicate e-mail label'] ?></th>
+									<th scope="row"><?php echo __('Duplicate e-mail label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather_config['p_allow_dupe_email'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
+} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather_config['p_allow_dupe_email'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_permissions['Duplicate e-mail help'] ?></span>
+} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Duplicate e-mail help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" /></p>
+				<p class="submitend"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/reports.php b/view/admin/reports.php
index 82605fce..619980c1 100644
--- a/view/admin/reports.php
+++ b/view/admin/reports.php
@@ -14,7 +14,7 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo $lang_admin_reports['New reports head'] ?></span></h2>
+	<h2><span><?php echo __('New reports head') ?></span></h2>
 	<div class="box">
 		<form method="post" action="<?php echo get_link('admin/reports/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -24,17 +24,17 @@
 					?>
 					<div class="inform">
 						<fieldset>
-							<legend><?php printf($lang_admin_reports['Report subhead'], format_time($report['created'])) ?></legend>
+							<legend><?php printf(__('Report subhead'), format_time($report['created'])) ?></legend>
 							<div class="infldset">
 								<table class="aligntop">
 									<tr>
-										<th scope="row"><?php printf($lang_admin_reports['Reported by'], ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : $lang_admin_reports['Deleted user']) ?></th>
+										<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
 										<td class="location"><?php echo breadcrumbs(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
 												$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
-												sprintf($lang_admin_reports['Post ID'], $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+												sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 									</tr>
 									<tr>
-										<th scope="row"><?php echo $lang_admin_reports['Reason'] ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php echo $lang_admin_reports['Zap'] ?>" /></div></th>
+										<th scope="row"><?php echo __('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php echo __('Zap') ?>" /></div></th>
 										<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
 									</tr>
 								</table>
@@ -48,9 +48,9 @@
 				?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_common['None'] ?></legend>
+						<legend><?php echo __('None') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_reports['No new reports'] ?></p>
+							<p><?php echo __('No new reports') ?></p>
 						</div>
 					</fieldset>
 				</div>
@@ -64,7 +64,7 @@
 </div>
 
 <div class="blockform block2">
-	<h2><span><?php echo $lang_admin_reports['Last 10 head'] ?></span></h2>
+	<h2><span><?php echo __('Last 10 head') ?></span></h2>
 	<div class="box">
 		<div class="fakeform">
 			<?php
@@ -74,17 +74,17 @@
 					?>
 					<div class="inform">
 						<fieldset>
-							<legend><?php printf($lang_admin_reports['Zapped subhead'], format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.get_link('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : $lang_admin_reports['NA']) ?></legend>
+							<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.get_link('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
 							<div class="infldset">
 								<table class="aligntop">
 									<tr>
-										<th scope="row"><?php printf($lang_admin_reports['Reported by'], ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : $lang_admin_reports['Deleted user']) ?></th>
+										<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
 										<td class="location"><?php echo breadcrumbs(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
 												$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
-												sprintf($lang_admin_reports['Post ID'], $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+												sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 									</tr>
 									<tr>
-										<th scope="row"><?php echo $lang_admin_reports['Reason'] ?></th>
+										<th scope="row"><?php echo __('Reason') ?></th>
 										<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
 									</tr>
 								</table>
@@ -98,9 +98,9 @@
 				?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_common['None'] ?></legend>
+						<legend><?php echo __('None') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_reports['No zapped reports'] ?></p>
+							<p><?php echo __('No zapped reports') ?></p>
 						</div>
 					</fieldset>
 				</div>
diff --git a/view/admin/statistics.php b/view/admin/statistics.php
index cd714e16..522bbb5d 100644
--- a/view/admin/statistics.php
+++ b/view/admin/statistics.php
@@ -14,24 +14,24 @@
 ?>
 
 	<div class="block">
-		<h2><span><?php echo $lang_admin_index['Server statistics head'] ?></span></h2>
+		<h2><span><?php echo __('Server statistics head') ?></span></h2>
 		<div id="adstats" class="box">
 			<div class="inbox">
 				<dl>
-					<dt><?php echo $lang_admin_index['Server load label'] ?></dt>
+					<dt><?php echo __('Server load label') ?></dt>
 					<dd>
-						<?php printf($lang_admin_index['Server load data']."\n", $server_load, $num_online) ?>
+						<?php printf(__('Server load data')."\n", $server_load, $num_online) ?>
 					</dd>
-<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php echo $lang_admin_index['Environment label'] ?></dt>
+<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php echo __('Environment label') ?></dt>
 					<dd>
-						<?php printf($lang_admin_index['Environment data OS'], PHP_OS) ?><br />
-						<?php printf($lang_admin_index['Environment data version'], phpversion(), '<a href="'.get_link('admin/phpinfo/').'">'.$lang_admin_index['Show info'].'</a>') ?><br />
-						<?php printf($lang_admin_index['Environment data acc']."\n", $php_accelerator) ?>
+						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
+						<?php printf(__('Environment data version'), phpversion(), '<a href="'.get_link('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
+						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
 					</dd>
-					<dt><?php echo $lang_admin_index['Database label'] ?></dt>
+					<dt><?php echo __('Database label') ?></dt>
 					<dd>
-<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf($lang_admin_index['Database data rows']."\n", forum_number_format($total_records)) ?>
-						<br /><?php printf($lang_admin_index['Database data size']."\n", $total_size) ?>
+<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", forum_number_format($total_records)) ?>
+						<br /><?php printf(__('Database data size')."\n", $total_size) ?>
 <?php endif; ?>					</dd>
 <?php endif; ?>
 				</dl>
diff --git a/view/admin/users/admin_users.php b/view/admin/users/admin_users.php
index 207d4ecd..f29830af 100644
--- a/view/admin/users/admin_users.php
+++ b/view/admin/users/admin_users.php
@@ -14,128 +14,128 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_users['User search head'] ?></span></h2>
+		<h2><span><?php echo __('User search head') ?></span></h2>
 		<div class="box">
 			<form id="find_user" method="get" action="<?php echo get_link('admin/users/') ?>">
-				<p class="submittop"><input type="submit" name="find_user" value="<?php echo $lang_admin_users['Submit search'] ?>" tabindex="1" /></p>
+				<p class="submittop"><input type="submit" name="find_user" value="<?php echo __('Submit search') ?>" tabindex="1" /></p>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_users['User search subhead'] ?></legend>
+						<legend><?php echo __('User search subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_users['User search info'] ?></p>
+							<p><?php echo __('User search info') ?></p>
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Username label'] ?></th>
+									<th scope="row"><?php echo __('Username label') ?></th>
 									<td><input type="text" name="form[username]" size="25" maxlength="25" tabindex="2" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['E-mail address label'] ?></th>
+									<th scope="row"><?php echo __('E-mail address label') ?></th>
 									<td><input type="text" name="form[email]" size="30" maxlength="80" tabindex="3" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Title label'] ?></th>
+									<th scope="row"><?php echo __('Title label') ?></th>
 									<td><input type="text" name="form[title]" size="30" maxlength="50" tabindex="4" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Real name label'] ?></th>
+									<th scope="row"><?php echo __('Real name label') ?></th>
 									<td><input type="text" name="form[realname]" size="30" maxlength="40" tabindex="5" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Website label'] ?></th>
+									<th scope="row"><?php echo __('Website label') ?></th>
 									<td><input type="text" name="form[url]" size="35" maxlength="100" tabindex="6" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Jabber label'] ?></th>
+									<th scope="row"><?php echo __('Jabber label') ?></th>
 									<td><input type="text" name="form[jabber]" size="30" maxlength="75" tabindex="7" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['ICQ label'] ?></th>
+									<th scope="row"><?php echo __('ICQ label') ?></th>
 									<td><input type="text" name="form[icq]" size="12" maxlength="12" tabindex="8" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['MSN label'] ?></th>
+									<th scope="row"><?php echo __('MSN label') ?></th>
 									<td><input type="text" name="form[msn]" size="30" maxlength="50" tabindex="9" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['AOL label'] ?></th>
+									<th scope="row"><?php echo __('AOL label') ?></th>
 									<td><input type="text" name="form[aim]" size="20" maxlength="20" tabindex="10" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Yahoo label'] ?></th>
+									<th scope="row"><?php echo __('Yahoo label') ?></th>
 									<td><input type="text" name="form[yahoo]" size="20" maxlength="20" tabindex="11" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Location label'] ?></th>
+									<th scope="row"><?php echo __('Location label') ?></th>
 									<td><input type="text" name="form[location]" size="30" maxlength="30" tabindex="12" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Signature label'] ?></th>
+									<th scope="row"><?php echo __('Signature label') ?></th>
 									<td><input type="text" name="form[signature]" size="35" maxlength="512" tabindex="13" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Admin note label'] ?></th>
+									<th scope="row"><?php echo __('Admin note label') ?></th>
 									<td><input type="text" name="form[admin_note]" size="30" maxlength="30" tabindex="14" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Posts more than label'] ?></th>
+									<th scope="row"><?php echo __('Posts more than label') ?></th>
 									<td><input type="text" name="posts_greater" size="5" maxlength="8" tabindex="15" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Posts less than label'] ?></th>
+									<th scope="row"><?php echo __('Posts less than label') ?></th>
 									<td><input type="text" name="posts_less" size="5" maxlength="8" tabindex="16" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Last post after label'] ?></th>
+									<th scope="row"><?php echo __('Last post after label') ?></th>
 									<td><input type="text" name="last_post_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php echo $lang_admin_users['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Last post before label'] ?></th>
+									<th scope="row"><?php echo __('Last post before label') ?></th>
 									<td><input type="text" name="last_post_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php echo $lang_admin_users['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Last visit after label'] ?></th>
+									<th scope="row"><?php echo __('Last visit after label') ?></th>
 									<td><input type="text" name="last_visit_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php echo $lang_admin_users['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Last visit before label'] ?></th>
+									<th scope="row"><?php echo __('Last visit before label') ?></th>
 									<td><input type="text" name="last_visit_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php echo $lang_admin_users['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Registered after label'] ?></th>
+									<th scope="row"><?php echo __('Registered after label') ?></th>
 									<td><input type="text" name="registered_after" size="24" maxlength="19" tabindex="19" />
-									<span><?php echo $lang_admin_users['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Registered before label'] ?></th>
+									<th scope="row"><?php echo __('Registered before label') ?></th>
 									<td><input type="text" name="registered_before" size="24" maxlength="19" tabindex="20" />
-									<span><?php echo $lang_admin_users['Date help'] ?></span></td>
+									<span><?php echo __('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Order by label'] ?></th>
+									<th scope="row"><?php echo __('Order by label') ?></th>
 									<td>
 										<select name="order_by" tabindex="21">
-											<option value="username" selected="selected"><?php echo $lang_admin_users['Order by username'] ?></option>
-											<option value="email"><?php echo $lang_admin_users['Order by e-mail'] ?></option>
-											<option value="num_posts"><?php echo $lang_admin_users['Order by posts'] ?></option>
-											<option value="last_post"><?php echo $lang_admin_users['Order by last post'] ?></option>
-											<option value="last_visit"><?php echo $lang_admin_users['Order by last visit'] ?></option>
-											<option value="registered"><?php echo $lang_admin_users['Order by registered'] ?></option>
+											<option value="username" selected="selected"><?php echo __('Order by username') ?></option>
+											<option value="email"><?php echo __('Order by e-mail') ?></option>
+											<option value="num_posts"><?php echo __('Order by posts') ?></option>
+											<option value="last_post"><?php echo __('Order by last post') ?></option>
+											<option value="last_visit"><?php echo __('Order by last visit') ?></option>
+											<option value="registered"><?php echo __('Order by registered') ?></option>
 										</select>&#160;&#160;&#160;<select name="direction" tabindex="22">
-											<option value="ASC" selected="selected"><?php echo $lang_admin_users['Ascending'] ?></option>
-											<option value="DESC"><?php echo $lang_admin_users['Descending'] ?></option>
+											<option value="ASC" selected="selected"><?php echo __('Ascending') ?></option>
+											<option value="DESC"><?php echo __('Descending') ?></option>
 										</select>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['User group label'] ?></th>
+									<th scope="row"><?php echo __('User group label') ?></th>
 									<td>
 										<select name="user_group" tabindex="23">
-											<option value="-1" selected="selected"><?php echo $lang_admin_users['All groups'] ?></option>
-											<option value="0"><?php echo $lang_admin_users['Unverified users'] ?></option>
+											<option value="-1" selected="selected"><?php echo __('All groups') ?></option>
+											<option value="0"><?php echo __('Unverified users') ?></option>
 											<?php echo $group_list; ?>
 										</select>
 									</td>
@@ -144,22 +144,22 @@
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="find_user" value="<?php echo $lang_admin_users['Submit search'] ?>" tabindex="25" /></p>
+				<p class="submitend"><input type="submit" name="find_user" value="<?php echo __('Submit search') ?>" tabindex="25" /></p>
 			</form>
 		</div>
 
-		<h2 class="block2"><span><?php echo $lang_admin_users['IP search head'] ?></span></h2>
+		<h2 class="block2"><span><?php echo __('IP search head') ?></span></h2>
 		<div class="box">
 			<form method="get" action="<?php echo get_link('admin/users/') ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_users['IP search subhead'] ?></legend>
+						<legend><?php echo __('IP search subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['IP address label'] ?><div><input type="submit" value="<?php echo $lang_admin_users['Find IP address'] ?>" tabindex="26" /></div></th>
+									<th scope="row"><?php echo __('IP address label') ?><div><input type="submit" value="<?php echo __('Find IP address') ?>" tabindex="26" /></div></th>
 									<td><input type="text" name="show_users" size="18" maxlength="15" tabindex="24" />
-									<span><?php echo $lang_admin_users['IP address help'] ?></span></td>
+									<span><?php echo __('IP address help') ?></span></td>
 								</tr>
 							</table>
 						</div>
diff --git a/view/admin/users/ban_users.php b/view/admin/users/ban_users.php
index 0d2c8b69..5d782379 100644
--- a/view/admin/users/ban_users.php
+++ b/view/admin/users/ban_users.php
@@ -14,43 +14,43 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_users['Ban users'] ?></span></h2>
+		<h2><span><?php echo __('Ban users') ?></span></h2>
 		<div class="box">
 			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo get_link('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_users['Message expiry subhead'] ?></legend>
+						<legend><?php echo __('Message expiry subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Ban message label'] ?></th>
+									<th scope="row"><?php echo __('Ban message label') ?></th>
 									<td>
 										<input type="text" name="ban_message" size="50" maxlength="255" tabindex="1" />
-										<span><?php echo $lang_admin_users['Ban message help'] ?></span>
+										<span><?php echo __('Ban message help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Expire date label'] ?></th>
+									<th scope="row"><?php echo __('Expire date label') ?></th>
 									<td>
 										<input type="text" name="ban_expire" size="17" maxlength="10" tabindex="2" />
-										<span><?php echo $lang_admin_users['Expire date help'] ?></span>
+										<span><?php echo __('Expire date help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['Ban IP label'] ?></th>
+									<th scope="row"><?php echo __('Ban IP label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="3" value="1" checked="checked" />&#160;<strong><?php echo $lang_admin_common['Yes'] ?></strong></label>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="4" value="0" checked="checked" />&#160;<strong><?php echo $lang_admin_common['No'] ?></strong></label>
-										<span class="clearb"><?php echo $lang_admin_users['Ban IP help'] ?></span>
+										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="3" value="1" checked="checked" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="4" value="0" checked="checked" />&#160;<strong><?php echo __('No') ?></strong></label>
+										<span class="clearb"><?php echo __('Ban IP help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="ban_users_comply" value="<?php echo $lang_admin_common['Save'] ?>" tabindex="3" /></p>
+				<p class="submitend"><input type="submit" name="ban_users_comply" value="<?php echo __('Save') ?>" tabindex="3" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/users/delete_users.php b/view/admin/users/delete_users.php
index 3f1388f6..b3b3c36e 100644
--- a/view/admin/users/delete_users.php
+++ b/view/admin/users/delete_users.php
@@ -14,24 +14,24 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_users['Delete users'] ?></span></h2>
+		<h2><span><?php echo __('Delete users') ?></span></h2>
 		<div class="box">
 			<form name="confirm_del_users" method="post" action="<?php echo get_link('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_users['Confirm delete legend'] ?></legend>
+						<legend><?php echo __('Confirm delete legend') ?></legend>
 						<div class="infldset">
-							<p><?php echo $lang_admin_users['Confirm delete info'] ?></p>
+							<p><?php echo __('Confirm delete info') ?></p>
 							<div class="rbox">
-								<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo $lang_admin_users['Delete posts'] ?><br /></label>
+								<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo __('Delete posts') ?><br /></label>
 							</div>
-							<p class="warntext"><strong><?php echo $lang_admin_users['Delete warning'] ?></strong></p>
+							<p class="warntext"><strong><?php echo __('Delete warning') ?></strong></p>
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="delete_users_comply" value="<?php echo $lang_admin_users['Delete'] ?>" /> <a href="javascript:history.go(-1)"><?php echo $lang_admin_common['Go back'] ?></a></p>
+				<p class="buttons"><input type="submit" name="delete_users_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/users/find_users.php b/view/admin/users/find_users.php
index e6053496..bf05ced4 100644
--- a/view/admin/users/find_users.php
+++ b/view/admin/users/find_users.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/index/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo $lang_admin_common['Users'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_admin_users['Results head'] ?></strong></li>
+			<li><a href="<?php echo get_link('admin/index/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -31,19 +31,19 @@
 <form id="search-users-form" action="<?php echo get_link('admin/users/') ?>" method="post">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <div id="users2" class="blocktable">
-	<h2><span><?php echo $lang_admin_users['Results head'] ?></span></h2>
+	<h2><span><?php echo __('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_admin_users['Results username head'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_admin_users['Results e-mail head'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_admin_users['Results title head'] ?></th>
-					<th class="tc4" scope="col"><?php echo $lang_admin_users['Results posts head'] ?></th>
-					<th class="tc5" scope="col"><?php echo $lang_admin_users['Results admin note head'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_admin_users['Results actions head'] ?></th>
-<?php if ($can_action): ?>					<th class="tcmod" scope="col"><?php echo $lang_admin_users['Select'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php echo __('Results title head') ?></th>
+					<th class="tc4" scope="col"><?php echo __('Results posts head') ?></th>
+					<th class="tc5" scope="col"><?php echo __('Results admin note head') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Results actions head') ?></th>
+<?php if ($can_action): ?>					<th class="tcmod" scope="col"><?php echo __('Select') ?></th>
 <?php endif;
     ?>
 				</tr>
@@ -59,7 +59,7 @@
 					<td class="tc3"><?php echo $user['user_title'] ?></td>
 					<td class="tc4"><?php echo forum_number_format($user['num_posts']) ?></td>
 					<td class="tc5"><?php echo($user['admin_note'] != '') ? feather_escape($user['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$user['id'].'/').'">'.$lang_admin_users['Results view IP link'].'</a> | <a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.$lang_admin_users['Results show posts link'].'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
 <?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
 <?php endif;
             ?>
@@ -68,7 +68,7 @@
 
         }
     } else {
-        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.$lang_admin_users['No match'].'</td></tr>'."\n";
+        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('No match').'</td></tr>'."\n";
     }
 
     ?>
@@ -82,17 +82,17 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
-<?php if ($can_action): ?>			<p class="conr modbuttons"><a href="#" onclick="return select_checkboxes('search-users-form', this, '<?php echo $lang_admin_users['Unselect all'] ?>')"><?php echo $lang_admin_users['Select all'] ?></a> <?php if ($can_ban) : ?><input type="submit" name="ban_users" value="<?php echo $lang_admin_users['Ban'] ?>" /><?php endif;
-    if ($can_delete) : ?><input type="submit" name="delete_users" value="<?php echo $lang_admin_users['Delete'] ?>" /><?php endif;
-    if ($can_move) : ?><input type="submit" name="move_users" value="<?php echo $lang_admin_users['Change group'] ?>" /><?php endif;
+<?php if ($can_action): ?>			<p class="conr modbuttons"><a href="#" onclick="return select_checkboxes('search-users-form', this, '<?php echo __('Unselect all') ?>')"><?php echo __('Select all') ?></a> <?php if ($can_ban) : ?><input type="submit" name="ban_users" value="<?php echo __('Ban') ?>" /><?php endif;
+    if ($can_delete) : ?><input type="submit" name="delete_users" value="<?php echo __('Delete') ?>" /><?php endif;
+    if ($can_move) : ?><input type="submit" name="move_users" value="<?php echo __('Change group') ?>" /><?php endif;
     ?></p>
 <?php endif;
     ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/index/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo $lang_admin_common['Users'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_admin_users['Results head'] ?></strong></li>
+			<li><a href="<?php echo get_link('admin/index/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/admin/users/move_users.php b/view/admin/users/move_users.php
index b82d0e71..9b785654 100644
--- a/view/admin/users/move_users.php
+++ b/view/admin/users/move_users.php
@@ -14,32 +14,32 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo $lang_admin_users['Move users'] ?></span></h2>
+		<h2><span><?php echo __('Move users') ?></span></h2>
 		<div class="box">
 			<form name="confirm_move_users" method="post" action="<?php echo get_link('admin/users/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo $lang_admin_users['Move users subhead'] ?></legend>
+						<legend><?php echo __('Move users subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo $lang_admin_users['New group label'] ?></th>
+									<th scope="row"><?php echo __('New group label') ?></th>
 									<td>
 										<select name="new_group" tabindex="1">
 <?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo feather_escape($group) ?></option>
 <?php endforeach;
     ?>
 										</select>
-										<span><?php echo $lang_admin_users['New group help'] ?></span>
+										<span><?php echo __('New group help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="move_users_comply" value="<?php echo $lang_admin_common['Save'] ?>" tabindex="2" /></p>
+				<p class="submitend"><input type="submit" name="move_users_comply" value="<?php echo __('Save') ?>" tabindex="2" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/users/search_ip.php b/view/admin/users/search_ip.php
index 108d0948..0fbb89f8 100644
--- a/view/admin/users/search_ip.php
+++ b/view/admin/users/search_ip.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo $lang_admin_common['Users'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_admin_users['Results head'] ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -28,16 +28,16 @@
 </div>
 
 <div id="users1" class="blocktable">
-	<h2><span><?php echo $lang_admin_users['Results head'] ?></span></h2>
+	<h2><span><?php echo __('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_admin_users['Results IP address head'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_admin_users['Results last used head'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_admin_users['Results times found head'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_admin_users['Results action head'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Results IP address head') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Results last used head') ?></th>
+					<th class="tc3" scope="col"><?php echo __('Results times found head') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Results action head') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -48,13 +48,13 @@
 					<td class="tcl"><a href="<?php echo get_link('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
 					<td class="tc2"><?php echo format_time($ip['last_used']) ?></td>
 					<td class="tc3"><?php echo $ip['used_times'] ?></td>
-					<td class="tcr"><a href="<?php echo get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php echo $lang_admin_users['Results find more link'] ?></a></td>
+					<td class="tcr"><a href="<?php echo get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php echo __('Results find more link') ?></a></td>
 				</tr>
 <?php
 
         }
         if (empty($ip_data)):
-            echo "\t\t\t\t".'<tr><td class="tcl" colspan="4">'.$lang_admin_users['Results no posts found'].'</td></tr>'."\n";
+            echo "\t\t\t\t".'<tr><td class="tcl" colspan="4">'.__('Results no posts found').'</td></tr>'."\n";
         endif;
 
     ?>
@@ -70,9 +70,9 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo $lang_admin_common['Users'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_admin_users['Results head'] ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/admin/users/show_users.php b/view/admin/users/show_users.php
index ab94c9f9..f93dba7a 100644
--- a/view/admin/users/show_users.php
+++ b/view/admin/users/show_users.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo $lang_admin_common['Users'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_admin_users['Results head'] ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -28,18 +28,18 @@
 </div>
 
 <div id="users2" class="blocktable">
-	<h2><span><?php echo $lang_admin_users['Results head'] ?></span></h2>
+	<h2><span><?php echo __('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo $lang_admin_users['Results username head'] ?></th>
-					<th class="tc2" scope="col"><?php echo $lang_admin_users['Results e-mail head'] ?></th>
-					<th class="tc3" scope="col"><?php echo $lang_admin_users['Results title head'] ?></th>
-					<th class="tc4" scope="col"><?php echo $lang_admin_users['Results posts head'] ?></th>
-					<th class="tc5" scope="col"><?php echo $lang_admin_users['Results admin note head'] ?></th>
-					<th class="tcr" scope="col"><?php echo $lang_admin_users['Results actions head'] ?></th>
+					<th class="tcl" scope="col"><?php echo __('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php echo __('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php echo __('Results title head') ?></th>
+					<th class="tc4" scope="col"><?php echo __('Results posts head') ?></th>
+					<th class="tc5" scope="col"><?php echo __('Results admin note head') ?></th>
+					<th class="tcr" scope="col"><?php echo __('Results actions head') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -56,7 +56,7 @@
 					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
 					<td class="tc4"><?php echo forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
 					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? feather_escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.$lang_admin_users['Results view IP link'].'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.$lang_admin_users['Results show posts link'].'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
 				</tr>
 <?php
 
@@ -65,7 +65,7 @@
 				<tr>
 					<td class="tcl"><?php echo feather_escape($cur_poster['poster']) ?></td>
 					<td class="tc2">&#160;</td>
-					<td class="tc3"><?php echo $lang_admin_users['Results guest'] ?></td>
+					<td class="tc3"><?php echo __('Results guest') ?></td>
 					<td class="tc4">&#160;</td>
 					<td class="tc5">&#160;</td>
 					<td class="tcr">&#160;</td>
@@ -75,7 +75,7 @@
             }
         }
     } else {
-        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.$lang_admin_users['Results no IP found'].'</td></tr>'."\n";
+        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('Results no IP found').'</td></tr>'."\n";
     }
 
     ?>
@@ -91,9 +91,9 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo $lang_admin_common['Admin'].' '.$lang_admin_common['Index'] ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo $lang_admin_common['Users'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $lang_admin_users['Results head'] ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>

From 3e4ca20270bc31ea038cd52c7df008dcf730fe09 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 13 Aug 2015 19:24:51 +0200
Subject: [PATCH 035/353] Use _e( instead of echo __(

---
 include/cache.php                             |   4 +-
 include/functions.php                         |   6 +-
 install/index.php                             | 122 ++---
 style/FeatherBB/view/admin/bans/add_ban.php   |  30 +-
 .../FeatherBB/view/admin/bans/admin_bans.php  |  48 +-
 .../FeatherBB/view/admin/bans/search_ban.php  |  28 +-
 style/FeatherBB/view/admin/categories.php     |  24 +-
 style/FeatherBB/view/admin/censoring.php      |  22 +-
 .../view/admin/forums/admin_forums.php        |  28 +-
 .../view/admin/forums/delete_forum.php        |   8 +-
 .../view/admin/forums/permissions.php         |  34 +-
 .../view/admin/groups/add_edit_group.php      | 180 +++----
 .../view/admin/groups/admin_groups.php        |  20 +-
 .../view/admin/groups/confirm_delete.php      |   8 +-
 .../view/admin/groups/delete_group.php        |   8 +-
 style/FeatherBB/view/admin/index.php          |  36 +-
 .../admin/maintenance/admin_maintenance.php   |  42 +-
 .../view/admin/maintenance/prune.php          |   8 +-
 .../view/admin/maintenance/rebuild.php        |   2 +-
 style/FeatherBB/view/admin/menu.php           |  30 +-
 style/FeatherBB/view/admin/options.php        | 468 +++++++++---------
 style/FeatherBB/view/admin/parser.php         |  32 +-
 style/FeatherBB/view/admin/permissions.php    | 100 ++--
 style/FeatherBB/view/admin/reports.php        |  16 +-
 style/FeatherBB/view/admin/statistics.php     |   8 +-
 .../view/admin/users/admin_users.php          |  96 ++--
 .../FeatherBB/view/admin/users/ban_users.php  |  22 +-
 .../view/admin/users/delete_users.php         |  12 +-
 .../FeatherBB/view/admin/users/find_users.php |  34 +-
 .../FeatherBB/view/admin/users/move_users.php |  10 +-
 .../FeatherBB/view/admin/users/search_ip.php  |  24 +-
 .../FeatherBB/view/admin/users/show_users.php |  28 +-
 style/FeatherBB/view/delete.php               |  10 +-
 style/FeatherBB/view/edit.php                 |  30 +-
 style/FeatherBB/view/footer.php               |   2 +-
 style/FeatherBB/view/header.php               |  10 +-
 style/FeatherBB/view/help.php                 | 126 ++---
 style/FeatherBB/view/index.php                |  16 +-
 style/FeatherBB/view/login/form.php           |  16 +-
 .../view/login/password_forgotten.php         |  14 +-
 style/FeatherBB/view/message.php              |   4 +-
 style/FeatherBB/view/misc/email.php           |  12 +-
 style/FeatherBB/view/misc/report.php          |  12 +-
 style/FeatherBB/view/misc/rules.php           |   2 +-
 .../FeatherBB/view/moderate/delete_posts.php  |   8 +-
 .../FeatherBB/view/moderate/delete_topics.php |   8 +-
 .../FeatherBB/view/moderate/merge_topics.php  |   8 +-
 .../view/moderate/moderator_forum.php         |  20 +-
 style/FeatherBB/view/moderate/move_topics.php |   8 +-
 style/FeatherBB/view/moderate/posts_view.php  |  12 +-
 style/FeatherBB/view/moderate/split_posts.php |  12 +-
 style/FeatherBB/view/post.php                 |  36 +-
 style/FeatherBB/view/profile/change_mail.php  |  12 +-
 style/FeatherBB/view/profile/change_pass.php  |  14 +-
 style/FeatherBB/view/profile/delete_user.php  |  12 +-
 style/FeatherBB/view/profile/menu.php         |  16 +-
 .../FeatherBB/view/profile/section_admin.php  |  18 +-
 .../view/profile/section_display.php          |  28 +-
 .../view/profile/section_essentials.php       | 106 ++--
 .../view/profile/section_messaging.php        |  14 +-
 .../view/profile/section_personal.php         |  10 +-
 .../view/profile/section_personality.php      |  18 +-
 .../view/profile/section_privacy.php          |  18 +-
 .../FeatherBB/view/profile/upload_avatar.php  |  10 +-
 style/FeatherBB/view/profile/view_profile.php |  10 +-
 style/FeatherBB/view/register/email.php       |  12 +-
 style/FeatherBB/view/register/form.php        |  42 +-
 style/FeatherBB/view/register/rules.php       |   6 +-
 style/FeatherBB/view/search/footer.php        |   2 +-
 style/FeatherBB/view/search/form.php          |  50 +-
 style/FeatherBB/view/search/header.php        |  12 +-
 style/FeatherBB/view/search/posts.php         |   8 +-
 style/FeatherBB/view/userlist.php             |  36 +-
 style/FeatherBB/view/viewforum.php            |  14 +-
 style/FeatherBB/view/viewtopic.php            |  28 +-
 view/admin/bans/add_ban.php                   |  30 +-
 view/admin/bans/admin_bans.php                |  48 +-
 view/admin/bans/search_ban.php                |  28 +-
 view/admin/categories.php                     |  24 +-
 view/admin/censoring.php                      |  22 +-
 view/admin/forums/admin_forums.php            |  28 +-
 view/admin/forums/delete_forum.php            |   8 +-
 view/admin/forums/permissions.php             |  34 +-
 view/admin/groups/add_edit_group.php          | 180 +++----
 view/admin/groups/admin_groups.php            |  20 +-
 view/admin/groups/confirm_delete.php          |   8 +-
 view/admin/groups/delete_group.php            |   8 +-
 view/admin/index.php                          |  36 +-
 view/admin/maintenance/admin_maintenance.php  |  42 +-
 view/admin/maintenance/prune.php              |   8 +-
 view/admin/maintenance/rebuild.php            |   2 +-
 view/admin/menu.php                           |  30 +-
 view/admin/options.php                        | 468 +++++++++---------
 view/admin/parser.php                         |  32 +-
 view/admin/permissions.php                    | 100 ++--
 view/admin/reports.php                        |  16 +-
 view/admin/statistics.php                     |   8 +-
 view/admin/users/admin_users.php              |  96 ++--
 view/admin/users/ban_users.php                |  22 +-
 view/admin/users/delete_users.php             |  12 +-
 view/admin/users/find_users.php               |  34 +-
 view/admin/users/move_users.php               |  10 +-
 view/admin/users/search_ip.php                |  24 +-
 view/admin/users/show_users.php               |  28 +-
 view/delete.php                               |  10 +-
 view/edit.php                                 |  30 +-
 view/footer.php                               |   2 +-
 view/header.php                               |   8 +-
 view/help.php                                 | 126 ++---
 view/index.php                                |  16 +-
 view/login/form.php                           |  16 +-
 view/login/password_forgotten.php             |  14 +-
 view/message.php                              |   4 +-
 view/misc/email.php                           |  12 +-
 view/misc/report.php                          |  12 +-
 view/misc/rules.php                           |   2 +-
 view/moderate/delete_posts.php                |   8 +-
 view/moderate/delete_topics.php               |   8 +-
 view/moderate/merge_topics.php                |   8 +-
 view/moderate/moderator_forum.php             |  20 +-
 view/moderate/move_topics.php                 |   8 +-
 view/moderate/posts_view.php                  |  12 +-
 view/moderate/split_posts.php                 |  12 +-
 view/post.php                                 |  36 +-
 view/profile/change_mail.php                  |  12 +-
 view/profile/change_pass.php                  |  14 +-
 view/profile/delete_user.php                  |  12 +-
 view/profile/menu.php                         |  16 +-
 view/profile/section_admin.php                |  18 +-
 view/profile/section_display.php              |  28 +-
 view/profile/section_essentials.php           | 106 ++--
 view/profile/section_messaging.php            |  14 +-
 view/profile/section_personal.php             |  10 +-
 view/profile/section_personality.php          |  18 +-
 view/profile/section_privacy.php              |  18 +-
 view/profile/upload_avatar.php                |  10 +-
 view/profile/view_profile.php                 |  10 +-
 view/register/email.php                       |  12 +-
 view/register/form.php                        |  42 +-
 view/register/rules.php                       |   6 +-
 view/search/footer.php                        |   2 +-
 view/search/form.php                          |  50 +-
 view/search/header.php                        |  12 +-
 view/search/posts.php                         |   8 +-
 view/userlist.php                             |  36 +-
 view/viewforum.php                            |  14 +-
 view/viewtopic.php                            |  28 +-
 147 files changed, 2333 insertions(+), 2333 deletions(-)

diff --git a/include/cache.php b/include/cache.php
index b275e400..77dc13dd 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -103,7 +103,7 @@ function generate_quickjump_cache($group_id = false)
                             ->find_many();
 
             if ($result) {
-                $output .= "\t\t\t\t".'<form id="qjump" method="get" action="">'."\n\t\t\t\t\t".'<div><label><span><?php echo __(\'Jump to\') ?>'.'<br /></span>'."\n\t\t\t\t\t".'<select name="id" onchange="window.location=(\''.get_link('forum/').'\'+this.options[this.selectedIndex].value)">'."\n";
+                $output .= "\t\t\t\t".'<form id="qjump" method="get" action="">'."\n\t\t\t\t\t".'<div><label><span><?php _e(\'Jump to\') ?>'.'<br /></span>'."\n\t\t\t\t\t".'<select name="id" onchange="window.location=(\''.get_link('forum/').'\'+this.options[this.selectedIndex].value)">'."\n";
 
                 $cur_category = 0;
                 foreach ($result as $cur_forum) {
@@ -122,7 +122,7 @@ function generate_quickjump_cache($group_id = false)
                     $output .= "\t\t\t\t\t\t\t".'<option value="'.$cur_forum['fid'].'/'.url_friendly($cur_forum['forum_name']).'/'.'"<?php echo ($forum_id == '.$cur_forum['fid'].') ? \' selected="selected"\' : \'\' ?>>'.feather_escape($cur_forum['forum_name']).$redirect_tag.'</option>'."\n";
                 }
 
-                $output .= "\t\t\t\t\t\t".'</optgroup>'."\n\t\t\t\t\t".'</select></label>'."\n\t\t\t\t\t".'<input type="submit" value="<?php echo __(\'Go\') ?>" accesskey="g" />'."\n\t\t\t\t\t".'</div>'."\n\t\t\t\t".'</form>'."\n";
+                $output .= "\t\t\t\t\t\t".'</optgroup>'."\n\t\t\t\t\t".'</select></label>'."\n\t\t\t\t\t".'<input type="submit" value="<?php _e(\'Go\') ?>" accesskey="g" />'."\n\t\t\t\t\t".'</div>'."\n\t\t\t\t".'</form>'."\n";
             }
         }
 
diff --git a/include/functions.php b/include/functions.php
index 3db67c33..e02b7f2f 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1506,14 +1506,14 @@ function display_saved_queries()
     ?>
 
 <div id="debug" class="blocktable">
-	<h2><span><?php echo __('Debug table') ?></span></h2>
+	<h2><span><?php _e('Debug table') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Query times') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Query') ?></th>
+					<th class="tcl" scope="col"><?php _e('Query times') ?></th>
+					<th class="tcr" scope="col"><?php _e('Query') ?></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/install/index.php b/install/index.php
index 540f1681..da804d25 100644
--- a/install/index.php
+++ b/install/index.php
@@ -351,22 +351,22 @@ function generate_config_file()
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><?php echo __('FeatherBB Installation') ?></title>
+<title><?php _e('FeatherBB Installation') ?></title>
 <link rel="stylesheet" type="text/css" href="../style/<?php echo $default_style ?>.css" />
 <script type="text/javascript">
 /* <![CDATA[ */
 function process_form(the_form)
 {
 	var required_fields = {
-		"req_db_type": "<?php echo __('Database type') ?>",
-		"req_db_host": "<?php echo __('Database server hostname') ?>",
-		"req_db_name": "<?php echo __('Database name') ?>",
-		"req_username": "<?php echo __('Administrator username') ?>",
-		"req_password1": "<?php echo __('Password') ?>",
-		"req_password2": "<?php echo __('Confirm password') ?>",
-		"req_email": "<?php echo __('Administrator email') ?>",
-		"req_title": "<?php echo __('Board title') ?>",
-		"req_base_url": "<?php echo __('Base URL') ?>"
+		"req_db_type": "<?php _e('Database type') ?>",
+		"req_db_host": "<?php _e('Database server hostname') ?>",
+		"req_db_name": "<?php _e('Database name') ?>",
+		"req_username": "<?php _e('Administrator username') ?>",
+		"req_password1": "<?php _e('Password') ?>",
+		"req_password2": "<?php _e('Confirm password') ?>",
+		"req_email": "<?php _e('Administrator email') ?>",
+		"req_title": "<?php _e('Board title') ?>",
+		"req_base_url": "<?php _e('Base URL') ?>"
 	};
 	if (document.all || document.getElementById)
 	{
@@ -375,7 +375,7 @@ function process_form(the_form)
 			var elem = the_form.elements[i];
 			if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
 			{
-				alert('"' + required_fields[elem.name] + '" <?php echo __('Required field') ?>');
+				alert('"' + required_fields[elem.name] + '" <?php _e('Required field') ?>');
 				elem.focus();
 				return false;
 			}
@@ -396,8 +396,8 @@ function process_form(the_form)
 	<div id="brdheader" class="block">
 		<div class="box">
 			<div id="brdtitle" class="inbox">
-				<h1><span><?php echo __('FeatherBB Installation') ?></span></h1>
-				<div id="brddesc"><p><?php echo __('Welcome') ?></p></div>
+				<h1><span><?php _e('FeatherBB Installation') ?></span></h1>
+				<div id="brddesc"><p><?php _e('Welcome') ?></p></div>
 			</div>
 		</div>
 	</div>
@@ -406,15 +406,15 @@ function process_form(the_form)
 <section class="container">
 	<div id="brdmain">
 	<?php if (count($languages) > 1): ?><div class="blockform">
-		<h2><span><?php echo __('Choose install language') ?></span></h2>
+		<h2><span><?php _e('Choose install language') ?></span></h2>
 		<div class="box">
 			<form id="install" method="post" action="">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Install language') ?></legend>
+						<legend><?php _e('Install language') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Choose install language info') ?></p>
-							<label><strong><?php echo __('Install language') ?></strong>
+							<p><?php _e('Choose install language info') ?></p>
+							<label><strong><?php _e('Install language') ?></strong>
 							<br /><select name="install_lang">
 <?php
 
@@ -432,7 +432,7 @@ function process_form(the_form)
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="start" value="<?php echo __('Change language') ?>" /></p>
+				<p class="buttons"><input type="submit" name="start" value="<?php _e('Change language') ?>" /></p>
 			</form>
 		</div>
 	</div>
@@ -446,7 +446,7 @@ function process_form(the_form)
 			<div><input type="hidden" name="form_sent" value="1" /><input type="hidden" name="install_lang" value="<?php echo feather_escape($install_lang) ?>" /></div>
 				<div class="inform">
 	<?php if (!empty($alerts)): ?>				<div class="forminfo error-info">
-						<h3><?php echo __('Errors') ?></h3>
+						<h3><?php _e('Errors') ?></h3>
 						<ul class="error-list">
 <?php
 
@@ -460,14 +460,14 @@ function process_form(the_form)
     ?>			</div>
 				<div class="inform">
 					<div class="forminfo">
-						<h3><?php echo __('Database setup') ?></h3>
-						<p><?php echo __('Info 1') ?></p>
+						<h3><?php _e('Database setup') ?></h3>
+						<p><?php _e('Info 1') ?></p>
 					</div>
 					<fieldset>
-					<legend><?php echo __('Select database') ?></legend>
+					<legend><?php _e('Select database') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Info 2') ?></p>
-							<label class="required"><strong><?php echo __('Database type') ?> <span><?php echo __('Required') ?></span></strong>
+							<p><?php _e('Info 2') ?></p>
+							<label class="required"><strong><?php _e('Database type') ?> <span><?php _e('Required') ?></span></strong>
 							<br /><select name="req_db_type">
 <?php
 
@@ -487,71 +487,71 @@ function process_form(the_form)
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Database hostname') ?></legend>
+						<legend><?php _e('Database hostname') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Info 3') ?></p>
-							<label class="required"><strong><?php echo __('Database server hostname') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_db_host" value="<?php echo feather_escape($db_host) ?>" size="50" /><br /></label>
+							<p><?php _e('Info 3') ?></p>
+							<label class="required"><strong><?php _e('Database server hostname') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_db_host" value="<?php echo feather_escape($db_host) ?>" size="50" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Database enter name') ?></legend>
+						<legend><?php _e('Database enter name') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Info 4') ?></p>
-							<label class="required"><strong><?php echo __('Database name') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_db_name" type="text" name="req_db_name" value="<?php echo feather_escape($db_name) ?>" size="30" /><br /></label>
+							<p><?php _e('Info 4') ?></p>
+							<label class="required"><strong><?php _e('Database name') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_db_name" type="text" name="req_db_name" value="<?php echo feather_escape($db_name) ?>" size="30" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Database enter informations') ?></legend>
+						<legend><?php _e('Database enter informations') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Info 5') ?></p>
-							<label class="conl"><?php echo __('Database username') ?><br /><input type="text" name="db_username" value="<?php echo feather_escape($db_username) ?>" size="30" /><br /></label>
-							<label class="conl"><?php echo __('Database password') ?><br /><input type="password" name="db_password" size="30" /><br /></label>
+							<p><?php _e('Info 5') ?></p>
+							<label class="conl"><?php _e('Database username') ?><br /><input type="text" name="db_username" value="<?php echo feather_escape($db_username) ?>" size="30" /><br /></label>
+							<label class="conl"><?php _e('Database password') ?><br /><input type="password" name="db_password" size="30" /><br /></label>
 							<div class="clearer"></div>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Database enter prefix') ?></legend>
+						<legend><?php _e('Database enter prefix') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Info 6') ?></p>
-							<label><?php echo __('Table prefix') ?><br /><input id="db_prefix" type="text" name="db_prefix" value="<?php echo feather_escape($db_prefix) ?>" size="20" maxlength="30" /><br /></label>
+							<p><?php _e('Info 6') ?></p>
+							<label><?php _e('Table prefix') ?><br /><input id="db_prefix" type="text" name="db_prefix" value="<?php echo feather_escape($db_prefix) ?>" size="20" maxlength="30" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<div class="forminfo">
-						<h3><?php echo __('Administration setup') ?></h3>
-						<p><?php echo __('Info 7') ?></p>
+						<h3><?php _e('Administration setup') ?></h3>
+						<p><?php _e('Info 7') ?></p>
 					</div>
 					<fieldset>
-						<legend><?php echo __('Administration setup') ?></legend>
+						<legend><?php _e('Administration setup') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Info 8') ?></p>
-							<label class="required"><strong><?php echo __('Administrator username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
-							<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_password1" type="password" name="req_password1" size="16" /><br /></label>
-							<label class="conl required"><strong><?php echo __('Confirm password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" size="16" /><br /></label>
+							<p><?php _e('Info 8') ?></p>
+							<label class="required"><strong><?php _e('Administrator username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
+							<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_password1" type="password" name="req_password1" size="16" /><br /></label>
+							<label class="conl required"><strong><?php _e('Confirm password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" size="16" /><br /></label>
 							<div class="clearer"></div>
-							<label class="required"><strong><?php echo __('Administrator email') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" value="<?php echo feather_escape($email) ?>" size="50" maxlength="80" /><br /></label>
+							<label class="required"><strong><?php _e('Administrator email') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" value="<?php echo feather_escape($email) ?>" size="50" maxlength="80" /><br /></label>
 						</div>
 					</fieldset>
 				</div>
 				<div class="inform">
 					<div class="forminfo">
-						<h3><?php echo __('Board setup') ?></h3>
-						<p><?php echo __('Info 11') ?></p>
+						<h3><?php _e('Board setup') ?></h3>
+						<p><?php _e('Info 11') ?></p>
 					</div>
 					<fieldset>
-						<legend><?php echo __('General information') ?></legend>
+						<legend><?php _e('General information') ?></legend>
 						<div class="infldset">
-							<label class="required"><strong><?php echo __('Board title') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_title" type="text" name="req_title" value="<?php echo feather_escape($title) ?>" size="60" maxlength="255" /><br /></label>
-							<label><?php echo __('Board description') ?><br /><input id="desc" type="text" name="desc" value="<?php echo feather_escape($description) ?>" size="60" maxlength="255" /><br /></label>
-							<label class="required"><strong><?php echo __('Base URL') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_base_url" type="text" name="req_base_url" value="<?php echo feather_escape($base_url) ?>" size="60" maxlength="100" /><br /></label>
-							<label class="required"><strong><?php echo __('Default language') ?> <span><?php echo __('Required') ?></span></strong><br /><select id="req_default_lang" name="req_default_lang">
+							<label class="required"><strong><?php _e('Board title') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_title" type="text" name="req_title" value="<?php echo feather_escape($title) ?>" size="60" maxlength="255" /><br /></label>
+							<label><?php _e('Board description') ?><br /><input id="desc" type="text" name="desc" value="<?php echo feather_escape($description) ?>" size="60" maxlength="255" /><br /></label>
+							<label class="required"><strong><?php _e('Base URL') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_base_url" type="text" name="req_base_url" value="<?php echo feather_escape($base_url) ?>" size="60" maxlength="100" /><br /></label>
+							<label class="required"><strong><?php _e('Default language') ?> <span><?php _e('Required') ?></span></strong><br /><select id="req_default_lang" name="req_default_lang">
 <?php
 
             $languages = forum_list_langs();
@@ -568,7 +568,7 @@ function process_form(the_form)
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="start" value="<?php echo __('Start install') ?>" /></p>
+				<p class="buttons"><input type="submit" name="start" value="<?php _e('Start install') ?>" /></p>
 			</form>
 		</div>
 	</div>
@@ -1770,7 +1770,7 @@ function process_form(the_form)
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><?php echo __('FeatherBB Installation') ?></title>
+<title><?php _e('FeatherBB Installation') ?></title>
 <link rel="stylesheet" type="text/css" href="../style/<?php echo $default_style ?>.css" />
 </head>
 <body>
@@ -1783,8 +1783,8 @@ function process_form(the_form)
     <div id="brdheader" class="block">
             <div class="box">
                     <div id="brdtitle" class="inbox">
-                            <h1><span><?php echo __('FeatherBB Installation') ?></span></h1>
-                            <div id="brddesc"><p><?php echo __('FeatherBB has been installed') ?></p></div>
+                            <h1><span><?php _e('FeatherBB Installation') ?></span></h1>
+                            <div id="brddesc"><p><?php _e('FeatherBB has been installed') ?></p></div>
                     </div>
             </div>
     </div>
@@ -1792,7 +1792,7 @@ function process_form(the_form)
     <div id="brdmain">
 
     <div class="blockform">
-            <h2><span><?php echo __('Final instructions') ?></span></h2>
+            <h2><span><?php _e('Final instructions') ?></span></h2>
             <div class="box">
     <?php
 
@@ -1801,8 +1801,8 @@ function process_form(the_form)
                     <form method="post" action="">
                             <div class="inform">
                                     <div class="forminfo">
-                                            <p><?php echo __('Info 17') ?></p>
-                                            <p><?php echo __('Info 18') ?></p>
+                                            <p><?php _e('Info 17') ?></p>
+                                            <p><?php _e('Info 18') ?></p>
                                     </div>
                                     <input type="hidden" name="generate_config" value="1" />
                                     <input type="hidden" name="db_type" value="<?php echo $db_type;
@@ -1834,7 +1834,7 @@ function process_form(the_form)
                                     </div>
     <?php endif;
         ?>			</div>
-                            <p class="buttons"><input type="submit" value="<?php echo __('Download config.php file') ?>" /></p>
+                            <p class="buttons"><input type="submit" value="<?php _e('Download config.php file') ?>" /></p>
                     </form>
 
     <?php
@@ -1844,7 +1844,7 @@ function process_form(the_form)
                     <div class="fakeform">
                             <div class="inform">
                                     <div class="forminfo">
-                                            <p><?php echo __('FeatherBB fully installed') ?></p>
+                                            <p><?php _e('FeatherBB fully installed') ?></p>
                                     </div>
                             </div>
                     </div>
diff --git a/style/FeatherBB/view/admin/bans/add_ban.php b/style/FeatherBB/view/admin/bans/add_ban.php
index 28b73f89..8170a2a9 100644
--- a/style/FeatherBB/view/admin/bans/add_ban.php
+++ b/style/FeatherBB/view/admin/bans/add_ban.php
@@ -14,7 +14,7 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('Ban advanced head') ?></span></h2>
+	<h2><span><?php _e('Ban advanced head') ?></span></h2>
 	<div class="box">
 		<form id="bans2" method="post" action="">
 			<div class="inform">
@@ -24,71 +24,71 @@
 				<?php endif; ?>
 				<?php if ($ban['mode'] == 'add' && isset($ban['user_id'])): ?><input type="hidden" name="ban_user_id" value="<?php echo $ban['user_id'] ?>" />
 				<?php endif; ?><fieldset>
-					<legend><?php echo __('Ban advanced subhead') ?></legend>
+					<legend><?php _e('Ban advanced subhead') ?></legend>
 					<div class="infldset">
 						<table class="aligntop">
 							<tr>
-								<th scope="row"><?php echo __('Username label') ?></th>
+								<th scope="row"><?php _e('Username label') ?></th>
 								<td>
 									<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
 										echo feather_escape($ban['ban_user']);
 									} ?>" tabindex="1" />
-									<span><?php echo __('Username help') ?></span>
+									<span><?php _e('Username help') ?></span>
 								</td>
 							</tr>
 							<tr>
-								<th scope="row"><?php echo __('IP label') ?></th>
+								<th scope="row"><?php _e('IP label') ?></th>
 								<td>
 									<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
 										echo feather_escape($ban['ip']);
 									} ?>" tabindex="2" />
-										<span><?php echo __('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
+										<span><?php _e('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
 												printf(' '.__('IP help link'), '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.__('here').'</a>');
 											} ?></span>
 								</td>
 							</tr>
 							<tr>
-								<th scope="row"><?php echo __('E-mail label') ?></th>
+								<th scope="row"><?php _e('E-mail label') ?></th>
 								<td>
 									<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
 										echo feather_escape($ban['email']);
 									} ?>" tabindex="3" />
-									<span><?php echo __('E-mail help') ?></span>
+									<span><?php _e('E-mail help') ?></span>
 								</td>
 							</tr>
 						</table>
-						<p class="topspace"><strong class="warntext"><?php echo __('Ban IP range info') ?></strong></p>
+						<p class="topspace"><strong class="warntext"><?php _e('Ban IP range info') ?></strong></p>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Message expiry subhead') ?></legend>
+					<legend><?php _e('Message expiry subhead') ?></legend>
 					<div class="infldset">
 						<table class="aligntop">
 							<tr>
-								<th scope="row"><?php echo __('Ban message label') ?></th>
+								<th scope="row"><?php _e('Ban message label') ?></th>
 								<td>
 									<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
 										echo feather_escape($ban['message']);
 									} ?>" tabindex="4" />
-									<span><?php echo __('Ban message help') ?></span>
+									<span><?php _e('Ban message help') ?></span>
 								</td>
 							</tr>
 							<tr>
-								<th scope="row"><?php echo __('Expire date label') ?></th>
+								<th scope="row"><?php _e('Expire date label') ?></th>
 								<td>
 									<input type="text" name="ban_expire" size="17" maxlength="10" value="<?php if (isset($ban['expire'])) {
 										echo $ban['expire'];
 									} ?>" tabindex="5" />
-									<span><?php echo __('Expire date help') ?></span>
+									<span><?php _e('Expire date help') ?></span>
 								</td>
 							</tr>
 						</table>
 					</div>
 				</fieldset>
 			</div>
-			<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php echo __('Save') ?>" tabindex="6" /></p>
+			<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php _e('Save') ?>" tabindex="6" /></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/admin/bans/admin_bans.php b/style/FeatherBB/view/admin/bans/admin_bans.php
index e6f2b5f7..3d714e7f 100644
--- a/style/FeatherBB/view/admin/bans/admin_bans.php
+++ b/style/FeatherBB/view/admin/bans/admin_bans.php
@@ -14,20 +14,20 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('New ban head') ?></span></h2>
+		<h2><span><?php _e('New ban head') ?></span></h2>
 		<div class="box">
 			<form id="bans" method="post" action="<?php echo get_link('admin/bans/add/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Add ban subhead') ?></legend>
+						<legend><?php _e('Add ban subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Username label') ?><div><input type="submit" name="add_ban" value="<?php echo __('Add') ?>" tabindex="2" /></div></th>
+									<th scope="row"><?php _e('Username label') ?><div><input type="submit" name="add_ban" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
 									<td>
 										<input type="text" name="new_ban_user" size="25" maxlength="25" tabindex="1" />
-										<span><?php echo __('Username advanced help') ?></span>
+										<span><?php _e('Username advanced help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -37,56 +37,56 @@
 			</form>
 		</div>
 
-		<h2 class="block2"><span><?php echo __('Ban search head') ?></span></h2>
+		<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
 		<div class="box">
 			<form id="find_bans" method="get" action="<?php echo get_link('admin/bans/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="find_ban" value="<?php echo __('Submit search') ?>" tabindex="3" /></p>
+				<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Ban search subhead') ?></legend>
+						<legend><?php _e('Ban search subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Ban search info') ?></p>
+							<p><?php _e('Ban search info') ?></p>
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Username label') ?></th>
+									<th scope="row"><?php _e('Username label') ?></th>
 									<td><input type="text" name="username" size="30" maxlength="25" tabindex="4" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('IP label') ?></th>
+									<th scope="row"><?php _e('IP label') ?></th>
 									<td><input type="text" name="ip" size="30" maxlength="255" tabindex="5" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('E-mail label') ?></th>
+									<th scope="row"><?php _e('E-mail label') ?></th>
 									<td><input type="text" name="email" size="30" maxlength="80" tabindex="6" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Message label') ?></th>
+									<th scope="row"><?php _e('Message label') ?></th>
 									<td><input type="text" name="message" size="30" maxlength="255" tabindex="7" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Expire after label') ?></th>
+									<th scope="row"><?php _e('Expire after label') ?></th>
 									<td><input type="text" name="expire_after" size="10" maxlength="10" tabindex="8" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Expire before label') ?></th>
+									<th scope="row"><?php _e('Expire before label') ?></th>
 									<td><input type="text" name="expire_before" size="10" maxlength="10" tabindex="9" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Order by label') ?></th>
+									<th scope="row"><?php _e('Order by label') ?></th>
 									<td>
 										<select name="order_by" tabindex="10">
-											<option value="username" selected="selected"><?php echo __('Order by username') ?></option>
-											<option value="ip"><?php echo __('Order by ip') ?></option>
-											<option value="email"><?php echo __('Order by e-mail') ?></option>
-											<option value="expire"><?php echo __('Order by expire') ?></option>
+											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
+											<option value="ip"><?php _e('Order by ip') ?></option>
+											<option value="email"><?php _e('Order by e-mail') ?></option>
+											<option value="expire"><?php _e('Order by expire') ?></option>
 										</select>
                                         &#160;&#160;&#160;
                                         <select name="direction" tabindex="11">
-											<option value="ASC" selected="selected"><?php echo __('Ascending') ?></option>
-											<option value="DESC"><?php echo __('Descending') ?></option>
+											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
+											<option value="DESC"><?php _e('Descending') ?></option>
 										</select>
 									</td>
 								</tr>
@@ -94,7 +94,7 @@
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="find_ban" value="<?php echo __('Submit search') ?>" tabindex="12" /></p>
+				<p class="submitend"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="12" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/bans/search_ban.php b/style/FeatherBB/view/admin/bans/search_ban.php
index 4285f695..0d057182 100644
--- a/style/FeatherBB/view/admin/bans/search_ban.php
+++ b/style/FeatherBB/view/admin/bans/search_ban.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php echo __('Bans') ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -29,19 +29,19 @@
 
 
 <div id="bans1" class="blocktable">
-	<h2><span><?php echo __('Results head') ?></span></h2>
+	<h2><span><?php _e('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Results IP address head') ?></th>
-					<th class="tc4" scope="col"><?php echo __('Results expire head') ?></th>
-					<th class="tc5" scope="col"><?php echo __('Results message head') ?></th>
-					<th class="tc6" scope="col"><?php echo __('Results banned by head') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Results actions head') ?></th>
+					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results IP address head') ?></th>
+					<th class="tc4" scope="col"><?php _e('Results expire head') ?></th>
+					<th class="tc5" scope="col"><?php _e('Results message head') ?></th>
+					<th class="tc6" scope="col"><?php _e('Results banned by head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -78,9 +78,9 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
         <ul class="crumbs">
-            <li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php echo __('Bans') ?></a></li>
-            <li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+            <li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+            <li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+            <li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
         </ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/style/FeatherBB/view/admin/categories.php b/style/FeatherBB/view/admin/categories.php
index 0a150cc1..c8786528 100644
--- a/style/FeatherBB/view/admin/categories.php
+++ b/style/FeatherBB/view/admin/categories.php
@@ -14,16 +14,16 @@
 
 ?>
 	<div class="blockform">
-		<h2><span><?php echo __('Add categories head') ?></span></h2>
+		<h2><span><?php _e('Add categories head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/categories/add/') ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Add categories subhead') ?></legend>
+						<legend><?php _e('Add categories subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Add category label') ?><div><input type="submit" value="<?php echo __('Add new submit') ?>" tabindex="2" /></div></th>
+									<th scope="row"><?php _e('Add category label') ?><div><input type="submit" value="<?php _e('Add new submit') ?>" tabindex="2" /></div></th>
 									<td>
 										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
@@ -37,17 +37,17 @@
 			</form>
 		</div>
 
-<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php echo __('Delete categories head') ?></span></h2>
+<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/categories/delete') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Delete categories subhead') ?></legend>
+						<legend><?php _e('Delete categories subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Delete category label') ?><div><input type="submit" value="<?php echo __('Delete') ?>" tabindex="4" /></div></th>
+									<th scope="row"><?php _e('Delete category label') ?><div><input type="submit" value="<?php _e('Delete') ?>" tabindex="4" /></div></th>
 									<td>
 										<select name="cat_to_delete" tabindex="3">
 <?php
@@ -58,7 +58,7 @@
 
 ?>
 										</select>
-										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php echo __('Delete category disclaimer') ?></span>
+										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php _e('Delete category disclaimer') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -69,19 +69,19 @@
 		</div>
 <?php endif; ?>
 
-<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php echo __('Edit categories head') ?></span></h2>
+<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/categories/edit/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Edit categories subhead') ?></legend>
+						<legend><?php _e('Edit categories subhead') ?></legend>
 						<div class="infldset">
 							<table id="categoryedit">
 							<thead>
 								<tr>
-									<th class="tcl" scope="col"><?php echo __('Category name label') ?></th>
-									<th scope="col"><?php echo __('Category position label') ?></th>
+									<th class="tcl" scope="col"><?php _e('Category name label') ?></th>
+									<th scope="col"><?php _e('Category position label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -100,7 +100,7 @@
 ?>
 							</tbody>
 							</table>
-							<div class="fsetsubmit"><input type="submit" value="<?php echo __('Update') ?>" /></div>
+							<div class="fsetsubmit"><input type="submit" value="<?php _e('Update') ?>" /></div>
 						</div>
 					</fieldset>
 				</div>
diff --git a/style/FeatherBB/view/admin/censoring.php b/style/FeatherBB/view/admin/censoring.php
index b8dc9f88..71c253f7 100644
--- a/style/FeatherBB/view/admin/censoring.php
+++ b/style/FeatherBB/view/admin/censoring.php
@@ -14,28 +14,28 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Censoring head') ?></span></h2>
+		<h2><span><?php _e('Censoring head') ?></span></h2>
 		<div class="box">
 			<form id="censoring" method="post" action="<?php echo get_link('admin/censoring/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Add word subhead') ?></legend>
+						<legend><?php _e('Add word subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Add word info').' '.($feather_config['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
+							<p><?php _e('Add word info').' '.($feather_config['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
 							<table>
 							<thead>
 								<tr>
-									<th class="tcl" scope="col"><?php echo __('Censored word label') ?></th>
-									<th class="tc2" scope="col"><?php echo __('Replacement label') ?></th>
-									<th class="hidehead" scope="col"><?php echo __('Action label') ?></th>
+									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
+									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
+									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
 								<tr>
 									<td class="tcl"><input type="text" name="new_search_for" size="24" maxlength="60" tabindex="1" /></td>
 									<td class="tc2"><input type="text" name="new_replace_with" size="24" maxlength="60" tabindex="2" /></td>
-									<td><input type="submit" name="add_word" value="<?php echo __('Add') ?>" tabindex="3" /></td>
+									<td><input type="submit" name="add_word" value="<?php _e('Add') ?>" tabindex="3" /></td>
 								</tr>
 							</tbody>
 							</table>
@@ -44,7 +44,7 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Edit remove subhead') ?></legend>
+						<legend><?php _e('Edit remove subhead') ?></legend>
 						<div class="infldset">
 <?php
 if (!empty($word_data)) {
@@ -52,9 +52,9 @@
 							<table>
 							<thead>
 								<tr>
-									<th class="tcl" scope="col"><?php echo __('Censored word label') ?></th>
-									<th class="tc2" scope="col"><?php echo __('Replacement label') ?></th>
-									<th class="hidehead" scope="col"><?php echo __('Action label') ?></th>
+									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
+									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
+									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
diff --git a/style/FeatherBB/view/admin/forums/admin_forums.php b/style/FeatherBB/view/admin/forums/admin_forums.php
index 1771986a..027ebd88 100644
--- a/style/FeatherBB/view/admin/forums/admin_forums.php
+++ b/style/FeatherBB/view/admin/forums/admin_forums.php
@@ -14,7 +14,7 @@
 ?>
 	
 	<div class="blockform">
-		<h2><span><?php echo __('Add forum head') ?></span></h2>
+		<h2><span><?php _e('Add forum head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/forums/add') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -23,18 +23,18 @@
     ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Create new subhead') ?></legend>
+						<legend><?php _e('Create new subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Add forum label') ?><div><input type="submit" value="<?php echo __('Add forum') ?>" tabindex="2" /></div></th>
+									<th scope="row"><?php _e('Add forum label') ?><div><input type="submit" value="<?php _e('Add forum') ?>" tabindex="2" /></div></th>
 									<td>
 										<select name="cat" tabindex="1">
 											<?php  foreach ($forum_data as $cat_id => $cat_data) {
 												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'">'.feather_escape($cat_data['cat_name']).'</option>'."\n";
 											} ?>
 										</select>
-										<span><?php echo __('Add forum help') ?></span>
+										<span><?php _e('Add forum help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -47,9 +47,9 @@
     ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('None') ?></legend>
+						<legend><?php _e('None') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('No categories exist') ?></p>
+							<p><?php _e('No categories exist') ?></p>
 						</div>
 					</fieldset>
 				</div>
@@ -63,24 +63,24 @@
 <?php
 if (!empty($forum_data)) {
     ?>
-		<h2 class="block2"><span><?php echo __('Manage forums head') ?></span></h2>
+		<h2 class="block2"><span><?php _e('Manage forums head') ?></span></h2>
 		<div class="box">
 			<form id="edforum" method="post" action="<?php echo get_link('admin/forums/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="update_positions" value="<?php echo __('Update positions') ?>" tabindex="3" /></p>
+				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
 <?php
     foreach ($forum_data as $cat_id => $cat_data) {
             ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Category subhead') ?> <?php echo feather_escape($cat_data['cat_name']) ?></legend>
+						<legend><?php _e('Category subhead') ?> <?php echo feather_escape($cat_data['cat_name']) ?></legend>
 						<div class="infldset">
 							<table>
 							<thead>
 								<tr>
-									<th class="tcl"><?php echo __('Action') ?></th>
-									<th class="tc2"><?php echo __('Position label') ?></th>
-									<th class="tcr"><?php echo __('Forum label') ?></th>
+									<th class="tcl"><?php _e('Action') ?></th>
+									<th class="tc2"><?php _e('Position label') ?></th>
+									<th class="tcr"><?php _e('Forum label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -88,7 +88,7 @@
 	foreach ($cat_data['cat_forums'] as $forum) {
         ?>
 								<tr>
-									<td class="tcl"><a href="<?php echo get_link('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php echo __('Edit link') ?></a> | <a href="<?php echo get_link('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php echo __('Delete link') ?></a></td>
+									<td class="tcl"><a href="<?php echo get_link('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo get_link('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
 									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
 									<td class="tcr"><strong><?php echo feather_escape($forum['forum_name']) ?></strong></td>
 								</tr>
@@ -103,7 +103,7 @@
 <?php
 	}
 ?>
-				<p class="submitend"><input type="submit" name="update_positions" value="<?php echo __('Update positions') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
+				<p class="submitend"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/forums/delete_forum.php b/style/FeatherBB/view/admin/forums/delete_forum.php
index 213e4090..6a5263ba 100644
--- a/style/FeatherBB/view/admin/forums/delete_forum.php
+++ b/style/FeatherBB/view/admin/forums/delete_forum.php
@@ -14,20 +14,20 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Confirm delete head') ?></span></h2>
+		<h2><span><?php _e('Confirm delete head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Confirm delete subhead') ?></legend>
+						<legend><?php _e('Confirm delete subhead') ?></legend>
 						<div class="infldset">
 							<p><?php printf(__('Confirm delete info'), $cur_forum['forum_name']) ?></p>
-							<p class="warntext"><?php echo __('Confirm delete warn') ?></p>
+							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="del_forum_comply" value="<?php echo __('Delete') ?>" /><a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+				<p class="buttons"><input type="submit" name="del_forum_comply" value="<?php _e('Delete') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/forums/permissions.php b/style/FeatherBB/view/admin/forums/permissions.php
index f66d00db..df092f46 100644
--- a/style/FeatherBB/view/admin/forums/permissions.php
+++ b/style/FeatherBB/view/admin/forums/permissions.php
@@ -14,26 +14,26 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Edit forum head') ?></span></h2>
+		<h2><span><?php _e('Edit forum head') ?></span></h2>
 		<div class="box">
 			<form id="edit_forum" method="post" action="<?php echo get_link('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" tabindex="6" /></p>
+				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Edit details subhead') ?></legend>
+						<legend><?php _e('Edit details subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Forum name label') ?></th>
+									<th scope="row"><?php _e('Forum name label') ?></th>
 									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo feather_escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Forum description label') ?></th>
+									<th scope="row"><?php _e('Forum description label') ?></th>
 									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo feather_escape($cur_forum['forum_desc']) ?></textarea></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Category label') ?></th>
+									<th scope="row"><?php _e('Category label') ?></th>
 									<td>
 										<select name="cat_id" tabindex="3">
 											<?php  foreach ($forum_data as $cat_id => $cat_data) {
@@ -44,23 +44,23 @@
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Sort by label') ?></th>
+									<th scope="row"><?php _e('Sort by label') ?></th>
 									<td>
 										<select name="sort_by" tabindex="4">
 											<option value="0"<?php if ($cur_forum['sort_by'] == '0') {
     echo ' selected="selected"';
-} ?>><?php echo __('Last post') ?></option>
+} ?>><?php _e('Last post') ?></option>
 											<option value="1"<?php if ($cur_forum['sort_by'] == '1') {
     echo ' selected="selected"';
-} ?>><?php echo __('Topic start') ?></option>
+} ?>><?php _e('Topic start') ?></option>
 											<option value="2"<?php if ($cur_forum['sort_by'] == '2') {
     echo ' selected="selected"';
-} ?>><?php echo __('Subject') ?></option>
+} ?>><?php _e('Subject') ?></option>
 										</select>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Redirect label') ?></th>
+									<th scope="row"><?php _e('Redirect label') ?></th>
 									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.feather_escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
 								</tr>
 							</table>
@@ -69,16 +69,16 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Group permissions subhead') ?></legend>
+						<legend><?php _e('Group permissions subhead') ?></legend>
 						<div class="infldset">
 							<p><?php printf(__('Group permissions info'), '<a href="admin_groups.php">'.__('User groups').'</a>') ?></p>
 							<table id="forumperms">
 							<thead>
 								<tr>
 									<th class="atcl">&#160;</th>
-									<th><?php echo __('Read forum label') ?></th>
-									<th><?php echo __('Post replies label') ?></th>
-									<th><?php echo __('Post topics label') ?></th>
+									<th><?php _e('Read forum label') ?></th>
+									<th><?php _e('Post replies label') ?></th>
+									<th><?php _e('Post topics label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -125,11 +125,11 @@
 ?>
 							</tbody>
 							</table>
-							<div class="fsetsubmit"><input type="submit" name="revert_perms" value="<?php echo __('Revert to default') ?>" tabindex="<?php echo $cur_index++ ?>" /></div>
+							<div class="fsetsubmit"><input type="submit" name="revert_perms" value="<?php _e('Revert to default') ?>" tabindex="<?php echo $cur_index++ ?>" /></div>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
+				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/groups/add_edit_group.php b/style/FeatherBB/view/admin/groups/add_edit_group.php
index 3c3c146c..bc2bc244 100644
--- a/style/FeatherBB/view/admin/groups/add_edit_group.php
+++ b/style/FeatherBB/view/admin/groups/add_edit_group.php
@@ -14,22 +14,22 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Group settings head') ?></span></h2>
+		<h2><span><?php _e('Group settings head') ?></span></h2>
 		<div class="box">
 			<form id="groups2" method="post" action="" onsubmit="return process_form(this)">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="add_edit_group" value="<?php echo __('Save') ?>" /></p>
+				<p class="submittop"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" /></p>
 				<div class="inform">
 					<input type="hidden" name="mode" value="<?php echo $group['mode'] ?>" />
 <?php if ($group['mode'] == 'edit'): ?>					<input type="hidden" name="group_id" value="<?php echo $id ?>" />
 <?php endif; ?><?php if ($group['mode'] == 'add'): ?>					<input type="hidden" name="base_group" value="<?php echo $group['base_group'] ?>" />
 <?php endif; ?>					<fieldset>
-						<legend><?php echo __('Group settings subhead') ?></legend>
+						<legend><?php _e('Group settings subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Group settings info') ?></p>
+							<p><?php _e('Group settings info') ?></p>
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Group title label') ?></th>
+									<th scope="row"><?php _e('Group title label') ?></th>
 									<td>
 										<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
     echo feather_escape($group['info']['g_title']);
@@ -37,17 +37,17 @@
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('User title label') ?></th>
+									<th scope="row"><?php _e('User title label') ?></th>
 									<td>
 										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
 										<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
 									</td>
 								</tr>
 <?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo __('Promote users label') ?></th>
+									<th scope="row"><?php _e('Promote users label') ?></th>
 									<td>
 										<select name="promote_next_group" tabindex="3">
-											<option value="0"><?php echo __('Disable promotion') ?></option>
+											<option value="0"><?php _e('Disable promotion') ?></option>
 											<?php echo $group_list ?>
 										</select>
 										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo feather_escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
@@ -55,255 +55,255 @@
 									</td>
 								</tr>
 <?php if ($group['mode'] != 'edit' || $feather_config['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
-									<th scope="row"> <?php echo __('Mod privileges label') ?></th>
+									<th scope="row"> <?php _e('Mod privileges label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="5" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="5" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="moderator" value="0"<?php if ($group['info']['g_moderator'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="6" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Mod privileges help') ?></span>
+} ?> tabindex="6" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Mod privileges help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Edit profile label') ?></th>
+									<th scope="row"><?php _e('Edit profile label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="mod_edit_users" value="1"<?php if ($group['info']['g_mod_edit_users'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="7" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="7" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="mod_edit_users" value="0"<?php if ($group['info']['g_mod_edit_users'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="8" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Edit profile help') ?></span>
+} ?> tabindex="8" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Edit profile help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Rename users label') ?></th>
+									<th scope="row"><?php _e('Rename users label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="mod_rename_users" value="1"<?php if ($group['info']['g_mod_rename_users'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="9" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="9" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="mod_rename_users" value="0"<?php if ($group['info']['g_mod_rename_users'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="10" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Rename users help') ?></span>
+} ?> tabindex="10" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Rename users help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Change passwords label') ?></th>
+									<th scope="row"><?php _e('Change passwords label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="mod_change_passwords" value="1"<?php if ($group['info']['g_mod_change_passwords'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="11" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="11" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="mod_change_passwords" value="0"<?php if ($group['info']['g_mod_change_passwords'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="12" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Change passwords help') ?></span>
+} ?> tabindex="12" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Change passwords help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Mod promote users label') ?></th>
+									<th scope="row"><?php _e('Mod promote users label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="mod_promote_users" value="1"<?php if ($group['info']['g_mod_promote_users'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="13" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="13" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="mod_promote_users" value="0"<?php if ($group['info']['g_mod_promote_users'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="14" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Mod promote users help') ?></span>
+} ?> tabindex="14" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Mod promote users help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Ban users label') ?></th>
+									<th scope="row"><?php _e('Ban users label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="mod_ban_users" value="1"<?php if ($group['info']['g_mod_ban_users'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="15" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="15" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="mod_ban_users" value="0"<?php if ($group['info']['g_mod_ban_users'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="16" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Ban users help') ?></span>
+} ?> tabindex="16" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Ban users help') ?></span>
 									</td>
 								</tr>
 <?php endif; endif; ?>								<tr>
-									<th scope="row"><?php echo __('Read board label') ?></th>
+									<th scope="row"><?php _e('Read board label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="read_board" value="1"<?php if ($group['info']['g_read_board'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="17" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="17" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="read_board" value="0"<?php if ($group['info']['g_read_board'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="18" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Read board help') ?></span>
+} ?> tabindex="18" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Read board help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('View user info label') ?></th>
+									<th scope="row"><?php _e('View user info label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="view_users" value="1"<?php if ($group['info']['g_view_users'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="19" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="19" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="view_users" value="0"<?php if ($group['info']['g_view_users'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="20" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('View user info help') ?></span>
+} ?> tabindex="20" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('View user info help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Post replies label') ?></th>
+									<th scope="row"><?php _e('Post replies label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="post_replies" value="1"<?php if ($group['info']['g_post_replies'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="21" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="21" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="post_replies" value="0"<?php if ($group['info']['g_post_replies'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="22" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Post replies help') ?></span>
+} ?> tabindex="22" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post replies help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Post topics label') ?></th>
+									<th scope="row"><?php _e('Post topics label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="post_topics" value="1"<?php if ($group['info']['g_post_topics'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="23" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="23" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="post_topics" value="0"<?php if ($group['info']['g_post_topics'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="24" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Post topics help') ?></span>
+} ?> tabindex="24" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post topics help') ?></span>
 									</td>
 								</tr>
 <?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo __('Edit posts label') ?></th>
+									<th scope="row"><?php _e('Edit posts label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="edit_posts" value="1"<?php if ($group['info']['g_edit_posts'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="25" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="25" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="edit_posts" value="0"<?php if ($group['info']['g_edit_posts'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="26" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Edit posts help') ?></span>
+} ?> tabindex="26" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Edit posts help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Delete posts label') ?></th>
+									<th scope="row"><?php _e('Delete posts label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="delete_posts" value="1"<?php if ($group['info']['g_delete_posts'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="27" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="27" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="delete_posts" value="0"<?php if ($group['info']['g_delete_posts'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="28" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Delete posts help') ?></span>
+} ?> tabindex="28" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Delete posts help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Delete topics label') ?></th>
+									<th scope="row"><?php _e('Delete topics label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="delete_topics" value="1"<?php if ($group['info']['g_delete_topics'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="29" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="29" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="delete_topics" value="0"<?php if ($group['info']['g_delete_topics'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="30" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Delete topics help') ?></span>
+} ?> tabindex="30" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Delete topics help') ?></span>
 									</td>
 								</tr>
 <?php endif; ?>								<tr>
-									<th scope="row"><?php echo __('Post links label') ?></th>
+									<th scope="row"><?php _e('Post links label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="post_links" value="1"<?php if ($group['info']['g_post_links'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="31" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="31" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="post_links" value="0"<?php if ($group['info']['g_post_links'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="32" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Post links help') ?></span>
+} ?> tabindex="32" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post links help') ?></span>
 									</td>
 								</tr>
 <?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo __('Set own title label') ?></th>
+									<th scope="row"><?php _e('Set own title label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="set_title" value="1"<?php if ($group['info']['g_set_title'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="33" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="33" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="set_title" value="0"<?php if ($group['info']['g_set_title'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="34" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Set own title help') ?></span>
+} ?> tabindex="34" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Set own title help') ?></span>
 									</td>
 								</tr>
 <?php endif; ?>								<tr>
-									<th scope="row"><?php echo __('User search label') ?></th>
+									<th scope="row"><?php _e('User search label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="search" value="1"<?php if ($group['info']['g_search'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="35" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="35" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="search" value="0"<?php if ($group['info']['g_search'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="36" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('User search help') ?></span>
+} ?> tabindex="36" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('User search help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('User list search label') ?></th>
+									<th scope="row"><?php _e('User list search label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="search_users" value="1"<?php if ($group['info']['g_search_users'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="37" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="37" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="search_users" value="0"<?php if ($group['info']['g_search_users'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="38" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('User list search help') ?></span>
+} ?> tabindex="38" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('User list search help') ?></span>
 									</td>
 								</tr>
 <?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo __('Send e-mails label') ?></th>
+									<th scope="row"><?php _e('Send e-mails label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="send_email" value="1"<?php if ($group['info']['g_send_email'] == '1') {
     echo ' checked="checked"';
-} ?> tabindex="39" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> tabindex="39" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="send_email" value="0"<?php if ($group['info']['g_send_email'] == '0') {
     echo ' checked="checked"';
-} ?> tabindex="40" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Send e-mails help') ?></span>
+} ?> tabindex="40" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Send e-mails help') ?></span>
 									</td>
 								</tr>
 <?php endif; ?>								<tr>
-									<th scope="row"><?php echo __('Post flood label') ?></th>
+									<th scope="row"><?php _e('Post flood label') ?></th>
 									<td>
 										<input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_post_flood'] ?>" tabindex="41" />
-										<span><?php echo __('Post flood help') ?></span>
+										<span><?php _e('Post flood help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Search flood label') ?></th>
+									<th scope="row"><?php _e('Search flood label') ?></th>
 									<td>
 										<input type="text" name="search_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_search_flood'] ?>" tabindex="42" />
-										<span><?php echo __('Search flood help') ?></span>
+										<span><?php _e('Search flood help') ?></span>
 									</td>
 								</tr>
 <?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo __('E-mail flood label') ?></th>
+									<th scope="row"><?php _e('E-mail flood label') ?></th>
 									<td>
 										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_email_flood'] ?>" tabindex="43" />
-										<span><?php echo __('E-mail flood help') ?></span>
+										<span><?php _e('E-mail flood help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Report flood label') ?></th>
+									<th scope="row"><?php _e('Report flood label') ?></th>
 									<td>
 										<input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_report_flood'] ?>" tabindex="44" />
-										<span><?php echo __('Report flood help') ?></span>
+										<span><?php _e('Report flood help') ?></span>
 									</td>
 								</tr>
 <?php endif; endif; ?>							</table>
-<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php echo __('Moderator info') ?></p>
+<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php _e('Moderator info') ?></p>
 <?php endif; ?>						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="add_edit_group" value="<?php echo __('Save') ?>" tabindex="45" /></p>
+				<p class="submitend"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" tabindex="45" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/groups/admin_groups.php b/style/FeatherBB/view/admin/groups/admin_groups.php
index 1bf9a10e..643b4883 100644
--- a/style/FeatherBB/view/admin/groups/admin_groups.php
+++ b/style/FeatherBB/view/admin/groups/admin_groups.php
@@ -14,17 +14,17 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Add groups head') ?></span></h2>
+		<h2><span><?php _e('Add groups head') ?></span></h2>
 		<div class="box">
 				<div class="inform">
 					<fieldset>
                         <form id="groups" method="post" action="<?php echo get_link('admin/groups/add/') ?>">
                         <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php echo __('Add group subhead') ?></legend>
+						<legend><?php _e('Add group subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('New group label') ?><div><input type="submit" name="add_group" value="<?php echo __('Add') ?>" tabindex="2" /></div></th>
+									<th scope="row"><?php _e('New group label') ?><div><input type="submit" name="add_group" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
 									<td>
 										<select id="base_group" name="base_group" tabindex="1">
 <?php
@@ -41,7 +41,7 @@
 
 ?>
 										</select>
-										<span><?php echo __('New group help') ?></span>
+										<span><?php _e('New group help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -53,11 +53,11 @@
 					<fieldset>
                         <form id="groups" method="post" action="<?php echo get_link('admin/groups/') ?>">
                         	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php echo __('Default group subhead') ?></legend>
+						<legend><?php _e('Default group subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Default group label') ?><div><input type="submit" name="set_default_group" value="<?php echo __('Save') ?>" tabindex="4" /></div></th>
+									<th scope="row"><?php _e('Default group label') ?><div><input type="submit" name="set_default_group" value="<?php _e('Save') ?>" tabindex="4" /></div></th>
 									<td>
 										<select id="default_group" name="default_group" tabindex="3">
 <?php
@@ -74,7 +74,7 @@
 
 ?>
 										</select>
-										<span><?php echo __('Default group help') ?></span>
+										<span><?php _e('Default group help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -84,14 +84,14 @@
 				</div>
 		</div>
 
-		<h2 class="block2"><span><?php echo __('Existing groups head') ?></span></h2>
+		<h2 class="block2"><span><?php _e('Existing groups head') ?></span></h2>
 		<div class="box">
 			<div class="fakeform">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Edit groups subhead') ?></legend>
+						<legend><?php _e('Edit groups subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Edit groups info') ?></p>
+							<p><?php _e('Edit groups info') ?></p>
 							<table>
 <?php
 foreach ($groups as $cur_group) {
diff --git a/style/FeatherBB/view/admin/groups/confirm_delete.php b/style/FeatherBB/view/admin/groups/confirm_delete.php
index 936fb2fb..ca595ab3 100644
--- a/style/FeatherBB/view/admin/groups/confirm_delete.php
+++ b/style/FeatherBB/view/admin/groups/confirm_delete.php
@@ -14,21 +14,21 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Group delete head') ?></span></h2>
+		<h2><span><?php _e('Group delete head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 				<input type="hidden" name="group_to_delete" value="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>" />
 					<fieldset>
-						<legend><?php echo __('Confirm delete subhead') ?></legend>
+						<legend><?php _e('Confirm delete subhead') ?></legend>
 						<div class="infldset">
 							<p><?php printf(__('Confirm delete info'), feather_escape($group_title)) ?></p>
-							<p class="warntext"><?php echo __('Confirm delete warn') ?></p>
+							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="del_group_comply" value="<?php echo __('Delete') ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php echo __('Go back') ?></a></p>
+				<p class="buttons"><input type="submit" name="del_group_comply" value="<?php _e('Delete') ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php _e('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/groups/delete_group.php b/style/FeatherBB/view/admin/groups/delete_group.php
index fee07d5b..693baab1 100644
--- a/style/FeatherBB/view/admin/groups/delete_group.php
+++ b/style/FeatherBB/view/admin/groups/delete_group.php
@@ -14,16 +14,16 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Delete group head') ?></span></h2>
+		<h2><span><?php _e('Delete group head') ?></span></h2>
 		<div class="box">
 			<form id="groups" method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Move users subhead') ?></legend>
+						<legend><?php _e('Move users subhead') ?></legend>
 						<div class="infldset">
 							<p><?php printf(__('Move users info'), feather_escape($group_info['title']), forum_number_format($group_info['members'])) ?></p>
-							<label><?php echo __('Move users label') ?>
+							<label><?php _e('Move users label') ?>
 							<select name="move_to_group">
 								<?php get_group_list_delete($id); ?>
 							</select>
@@ -31,7 +31,7 @@
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="del_group" value="<?php echo __('Delete group') ?>" /><a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+				<p class="buttons"><input type="submit" name="del_group" value="<?php _e('Delete group') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/index.php b/style/FeatherBB/view/admin/index.php
index 50afbad1..dc0dcf8c 100644
--- a/style/FeatherBB/view/admin/index.php
+++ b/style/FeatherBB/view/admin/index.php
@@ -14,46 +14,46 @@
 ?>
 
 	<div class="block">
-		<h2><span><?php echo __('Forum admin head') ?></span></h2>
+		<h2><span><?php _e('Forum admin head') ?></span></h2>
 		<div id="adintro" class="box">
 			<div class="inbox">
-				<p><?php echo __('Welcome to admin') ?></p>
+				<p><?php _e('Welcome to admin') ?></p>
 				<ul>
-					<li><span><?php echo __('Welcome 1') ?></span></li>
-					<li><span><?php echo __('Welcome 2') ?></span></li>
-					<li><span><?php echo __('Welcome 3') ?></span></li>
-					<li><span><?php echo __('Welcome 4') ?></span></li>
-					<li><span><?php echo __('Welcome 5') ?></span></li>
-					<li><span><?php echo __('Welcome 6') ?></span></li>
-					<li><span><?php echo __('Welcome 7') ?></span></li>
-					<li><span><?php echo __('Welcome 8') ?></span></li>
-					<li><span><?php echo __('Welcome 9') ?></span></li>
+					<li><span><?php _e('Welcome 1') ?></span></li>
+					<li><span><?php _e('Welcome 2') ?></span></li>
+					<li><span><?php _e('Welcome 3') ?></span></li>
+					<li><span><?php _e('Welcome 4') ?></span></li>
+					<li><span><?php _e('Welcome 5') ?></span></li>
+					<li><span><?php _e('Welcome 6') ?></span></li>
+					<li><span><?php _e('Welcome 7') ?></span></li>
+					<li><span><?php _e('Welcome 8') ?></span></li>
+					<li><span><?php _e('Welcome 9') ?></span></li>
 				</ul>
 			</div>
 		</div>
 
 <?php if ($install_file_exists) : ?>
-		<h2 class="block2"><span><?php echo __('Alerts head') ?></span></h2>
+		<h2 class="block2"><span><?php _e('Alerts head') ?></span></h2>
 		<div id="adalerts" class="box">
 			<p><?php printf(__('Install file exists'), '<a href="'.get_link('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
 		</div>
 <?php endif; ?>
 
-		<h2 class="block2"><span><?php echo __('About head') ?></span></h2>
+		<h2 class="block2"><span><?php _e('About head') ?></span></h2>
 		<div id="adstats" class="box">
 			<div class="inbox">
 				<dl>
-					<dt><?php echo __('FeatherBB version label') ?></dt>
+					<dt><?php _e('FeatherBB version label') ?></dt>
 					<dd>
 						<?php printf(__('FeatherBB version data')."\n", $feather_config['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
 					</dd>
-					<dt><?php echo __('Server statistics label') ?></dt>
+					<dt><?php _e('Server statistics label') ?></dt>
 					<dd>
-						<a href="<?php echo get_link('admin/statistics/') ?>"><?php echo __('View server statistics') ?></a>
+						<a href="<?php echo get_link('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
 					</dd>
-					<dt><?php echo __('Support label') ?></dt>
+					<dt><?php _e('Support label') ?></dt>
 					<dd>
-						<a href="http://FeatherBB.org/forums/index.php"><?php echo __('Forum label') ?></a> - <a href="http://gitter.im/featherbb/featherbb"><?php echo __('IRC label') ?></a>
+						<a href="http://FeatherBB.org/forums/index.php"><?php _e('Forum label') ?></a> - <a href="http://gitter.im/featherbb/featherbb"><?php _e('IRC label') ?></a>
 					</dd>
 				</dl>
 			</div>
diff --git a/style/FeatherBB/view/admin/maintenance/admin_maintenance.php b/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
index 77c8404e..068b914b 100644
--- a/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
+++ b/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
@@ -14,39 +14,39 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Maintenance head') ?></span></h2>
+		<h2><span><?php _e('Maintenance head') ?></span></h2>
 		<div class="box">
 			<form method="get" action="<?php echo get_link('admin/maintenance/') ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="rebuild" />
 					<fieldset>
-						<legend><?php echo __('Rebuild index subhead') ?></legend>
+						<legend><?php _e('Rebuild index subhead') ?></legend>
 						<div class="infldset">
 							<p><?php printf(__('Rebuild index info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Posts per cycle label') ?></th>
+									<th scope="row"><?php _e('Posts per cycle label') ?></th>
 									<td>
 										<input type="text" name="i_per_page" size="7" maxlength="7" value="300" tabindex="1" />
-										<span><?php echo __('Posts per cycle help') ?></span>
+										<span><?php _e('Posts per cycle help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Starting post label') ?></th>
+									<th scope="row"><?php _e('Starting post label') ?></th>
 									<td>
 										<input type="text" name="i_start_at" size="7" maxlength="7" value="<?php echo(isset($first_id)) ? $first_id : 0 ?>" tabindex="2" />
-										<span><?php echo __('Starting post help') ?></span>
+										<span><?php _e('Starting post help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Empty index label') ?></th>
+									<th scope="row"><?php _e('Empty index label') ?></th>
 									<td class="inputadmin">
-										<label><input type="checkbox" name="i_empty_index" value="1" tabindex="3" checked="checked" />&#160;&#160;<?php echo __('Empty index help') ?></label>
+										<label><input type="checkbox" name="i_empty_index" value="1" tabindex="3" checked="checked" />&#160;&#160;<?php _e('Empty index help') ?></label>
 									</td>
 								</tr>
 							</table>
-							<p class="topspace"><?php echo __('Rebuild completed info') ?></p>
-							<div class="fsetsubmit"><input type="submit" name="rebuild_index" value="<?php echo __('Rebuild index') ?>" tabindex="4" /></div>
+							<p class="topspace"><?php _e('Rebuild completed info') ?></p>
+							<div class="fsetsubmit"><input type="submit" name="rebuild_index" value="<?php _e('Rebuild index') ?>" tabindex="4" /></div>
 						</div>
 					</fieldset>
 				</div>
@@ -57,38 +57,38 @@
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
 					<fieldset>
-						<legend><?php echo __('Prune subhead') ?></legend>
+						<legend><?php _e('Prune subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Days old label') ?></th>
+									<th scope="row"><?php _e('Days old label') ?></th>
 									<td>
 										<input type="text" name="req_prune_days" size="3" maxlength="3" tabindex="5" />
-										<span><?php echo __('Days old help') ?></span>
+										<span><?php _e('Days old help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Prune sticky label') ?></th>
+									<th scope="row"><?php _e('Prune sticky label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="prune_sticky" value="1" tabindex="6" checked="checked" />&#160;<strong><?php echo __('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="prune_sticky" value="0" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Prune sticky help') ?></span>
+										<label class="conl"><input type="radio" name="prune_sticky" value="1" tabindex="6" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="prune_sticky" value="0" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Prune sticky help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Prune from label') ?></th>
+									<th scope="row"><?php _e('Prune from label') ?></th>
 									<td>
 										<select name="prune_from" tabindex="7">
-											<option value="all"><?php echo __('All forums') ?></option>
+											<option value="all"><?php _e('All forums') ?></option>
 												<?php echo $categories; ?>
 											</optgroup>
 										</select>
-										<span><?php echo __('Prune from help') ?></span>
+										<span><?php _e('Prune from help') ?></span>
 									</td>
 								</tr>
 							</table>
 							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
-							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php echo __('Prune') ?>" tabindex="8" /></div>
+							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php _e('Prune') ?>" tabindex="8" /></div>
 						</div>
 					</fieldset>
 				</div>
diff --git a/style/FeatherBB/view/admin/maintenance/prune.php b/style/FeatherBB/view/admin/maintenance/prune.php
index 8801a979..9e3b0d2b 100644
--- a/style/FeatherBB/view/admin/maintenance/prune.php
+++ b/style/FeatherBB/view/admin/maintenance/prune.php
@@ -14,7 +14,7 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Prune head') ?></span></h2>
+		<h2><span><?php _e('Prune head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/maintenance/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -24,14 +24,14 @@
 					<input type="hidden" name="prune_sticky" value="<?php echo $prune_sticky ?>" />
 					<input type="hidden" name="prune_from" value="<?php echo $prune_from ?>" />
 					<fieldset>
-						<legend><?php echo __('Confirm prune subhead') ?></legend>
+						<legend><?php _e('Confirm prune subhead') ?></legend>
 						<div class="infldset">
 							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], forum_number_format($prune['num_topics'])) ?></p>
-							<p class="warntext"><?php echo __('Confirm prune warn') ?></p>
+							<p class="warntext"><?php _e('Confirm prune warn') ?></p>
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="prune_comply" value="<?php echo __('Prune') ?>" /><a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+				<p class="buttons"><input type="submit" name="prune_comply" value="<?php _e('Prune') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/maintenance/rebuild.php b/style/FeatherBB/view/admin/maintenance/rebuild.php
index 36947974..5bd6ffc0 100644
--- a/style/FeatherBB/view/admin/maintenance/rebuild.php
+++ b/style/FeatherBB/view/admin/maintenance/rebuild.php
@@ -34,5 +34,5 @@
 </head>
 <body>
 
-<h1><?php echo __('Rebuilding index info') ?></h1>
+<h1><?php _e('Rebuilding index info') ?></h1>
 <hr />
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/menu.php b/style/FeatherBB/view/admin/menu.php
index e2870921..b33c2727 100644
--- a/style/FeatherBB/view/admin/menu.php
+++ b/style/FeatherBB/view/admin/menu.php
@@ -15,27 +15,27 @@
 ?>
 <div id="adminconsole" class="block2col">
 	<div id="adminmenu" class="blockmenu">
-		<h2><span><?php echo __('Moderator menu') ?></span></h2>
+		<h2><span><?php _e('Moderator menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'index') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/') ?>"><?php echo __('Index') ?></a></li>
+    ?>><a href="<?php echo get_link('admin/') ?>"><?php _e('Index') ?></a></li>
 					<li<?php if ($page == 'users') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
+    ?>><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 <?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php echo __('Bans') ?></a></li>
+    ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
 <?php endif;
     if ($is_admin || $feather_config['o_report_method'] == '0' || $feather_config['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php echo __('Reports') ?></a></li>
+    ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
@@ -44,42 +44,42 @@
 
     if ($is_admin) {
         ?>
-		<h2 class="block2"><span><?php echo __('Admin menu') ?></span></h2>
+		<h2 class="block2"><span><?php _e('Admin menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'options') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/options/') ?>"><?php echo __('Options') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/options/') ?>"><?php _e('Options') ?></a></li>
 					<li<?php if ($page == 'permissions') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/permissions/') ?>"><?php echo __('Permissions') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
 					<li<?php if ($page == 'categories') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/categories/') ?>"><?php echo __('Categories') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
 					<li<?php if ($page == 'forums') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/forums/') ?>"><?php echo __('Forums') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
 					<li<?php if ($page == 'groups') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/groups/') ?>"><?php echo __('User groups') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
 					<li<?php if ($page == 'censoring') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/censoring/') ?>"><?php echo __('Censoring') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
 					<li<?php if ($page == 'parser') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/parser/') ?>"><?php echo __('Parser') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
 					<li<?php if ($page == 'maintenance') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/maintenance/') ?>"><?php echo __('Maintenance') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
 				</ul>
 			</div>
 		</div>
@@ -90,7 +90,7 @@
     // Did we find any plugins?
     if (!empty($plugins)) {
         ?>
-		<h2 class="block2"><span><?php echo __('Plugins menu') ?></span></h2>
+		<h2 class="block2"><span><?php _e('Plugins menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
diff --git a/style/FeatherBB/view/admin/options.php b/style/FeatherBB/view/admin/options.php
index a19ccddb..faa8e34c 100644
--- a/style/FeatherBB/view/admin/options.php
+++ b/style/FeatherBB/view/admin/options.php
@@ -14,180 +14,180 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Options head') ?></span></h2>
+		<h2><span><?php _e('Options head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/options/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
+				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
 					<input type="hidden" name="form_sent" value="1" />
 					<fieldset>
-						<legend><?php echo __('Essentials subhead') ?></legend>
+						<legend><?php _e('Essentials subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Board title label') ?></th>
+									<th scope="row"><?php _e('Board title label') ?></th>
 									<td>
 										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather_config['o_board_title']) ?>" />
-										<span><?php echo __('Board title help') ?></span>
+										<span><?php _e('Board title help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Board desc label') ?></th>
+									<th scope="row"><?php _e('Board desc label') ?></th>
 									<td>
 										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather_config['o_board_desc']) ?></textarea>
-										<span><?php echo __('Board desc help') ?></span>
+										<span><?php _e('Board desc help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Base URL label') ?></th>
+									<th scope="row"><?php _e('Base URL label') ?></th>
 									<td>
 										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather_config['o_base_url']) ?>" />
-										<span><?php echo __('Base URL help') ?></span>
+										<span><?php _e('Base URL help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Timezone label') ?></th>
+									<th scope="row"><?php _e('Timezone label') ?></th>
 									<td>
 										<select name="form_default_timezone">
 											<option value="-12"<?php if ($feather_config['o_default_timezone'] == -12) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-12:00') ?></option>
+} ?>><?php _e('UTC-12:00') ?></option>
 											<option value="-11"<?php if ($feather_config['o_default_timezone'] == -11) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-11:00') ?></option>
+} ?>><?php _e('UTC-11:00') ?></option>
 											<option value="-10"<?php if ($feather_config['o_default_timezone'] == -10) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-10:00') ?></option>
+} ?>><?php _e('UTC-10:00') ?></option>
 											<option value="-9.5"<?php if ($feather_config['o_default_timezone'] == -9.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-09:30') ?></option>
+} ?>><?php _e('UTC-09:30') ?></option>
 											<option value="-9"<?php if ($feather_config['o_default_timezone'] == -9) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-09:00') ?></option>
+} ?>><?php _e('UTC-09:00') ?></option>
 											<option value="-8.5"<?php if ($feather_config['o_default_timezone'] == -8.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-08:30') ?></option>
+} ?>><?php _e('UTC-08:30') ?></option>
 											<option value="-8"<?php if ($feather_config['o_default_timezone'] == -8) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-08:00') ?></option>
+} ?>><?php _e('UTC-08:00') ?></option>
 											<option value="-7"<?php if ($feather_config['o_default_timezone'] == -7) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-07:00') ?></option>
+} ?>><?php _e('UTC-07:00') ?></option>
 											<option value="-6"<?php if ($feather_config['o_default_timezone'] == -6) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-06:00') ?></option>
+} ?>><?php _e('UTC-06:00') ?></option>
 											<option value="-5"<?php if ($feather_config['o_default_timezone'] == -5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-05:00') ?></option>
+} ?>><?php _e('UTC-05:00') ?></option>
 											<option value="-4"<?php if ($feather_config['o_default_timezone'] == -4) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-04:00') ?></option>
+} ?>><?php _e('UTC-04:00') ?></option>
 											<option value="-3.5"<?php if ($feather_config['o_default_timezone'] == -3.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-03:30') ?></option>
+} ?>><?php _e('UTC-03:30') ?></option>
 											<option value="-3"<?php if ($feather_config['o_default_timezone'] == -3) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-03:00') ?></option>
+} ?>><?php _e('UTC-03:00') ?></option>
 											<option value="-2"<?php if ($feather_config['o_default_timezone'] == -2) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-02:00') ?></option>
+} ?>><?php _e('UTC-02:00') ?></option>
 											<option value="-1"<?php if ($feather_config['o_default_timezone'] == -1) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-01:00') ?></option>
+} ?>><?php _e('UTC-01:00') ?></option>
 											<option value="0"<?php if ($feather_config['o_default_timezone'] == 0) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC') ?></option>
+} ?>><?php _e('UTC') ?></option>
 											<option value="1"<?php if ($feather_config['o_default_timezone'] == 1) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+01:00') ?></option>
+} ?>><?php _e('UTC+01:00') ?></option>
 											<option value="2"<?php if ($feather_config['o_default_timezone'] == 2) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+02:00') ?></option>
+} ?>><?php _e('UTC+02:00') ?></option>
 											<option value="3"<?php if ($feather_config['o_default_timezone'] == 3) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+03:00') ?></option>
+} ?>><?php _e('UTC+03:00') ?></option>
 											<option value="3.5"<?php if ($feather_config['o_default_timezone'] == 3.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+03:30') ?></option>
+} ?>><?php _e('UTC+03:30') ?></option>
 											<option value="4"<?php if ($feather_config['o_default_timezone'] == 4) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+04:00') ?></option>
+} ?>><?php _e('UTC+04:00') ?></option>
 											<option value="4.5"<?php if ($feather_config['o_default_timezone'] == 4.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+04:30') ?></option>
+} ?>><?php _e('UTC+04:30') ?></option>
 											<option value="5"<?php if ($feather_config['o_default_timezone'] == 5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:00') ?></option>
+} ?>><?php _e('UTC+05:00') ?></option>
 											<option value="5.5"<?php if ($feather_config['o_default_timezone'] == 5.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:30') ?></option>
+} ?>><?php _e('UTC+05:30') ?></option>
 											<option value="5.75"<?php if ($feather_config['o_default_timezone'] == 5.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:45') ?></option>
+} ?>><?php _e('UTC+05:45') ?></option>
 											<option value="6"<?php if ($feather_config['o_default_timezone'] == 6) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+06:00') ?></option>
+} ?>><?php _e('UTC+06:00') ?></option>
 											<option value="6.5"<?php if ($feather_config['o_default_timezone'] == 6.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+06:30') ?></option>
+} ?>><?php _e('UTC+06:30') ?></option>
 											<option value="7"<?php if ($feather_config['o_default_timezone'] == 7) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+07:00') ?></option>
+} ?>><?php _e('UTC+07:00') ?></option>
 											<option value="8"<?php if ($feather_config['o_default_timezone'] == 8) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+08:00') ?></option>
+} ?>><?php _e('UTC+08:00') ?></option>
 											<option value="8.75"<?php if ($feather_config['o_default_timezone'] == 8.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+08:45') ?></option>
+} ?>><?php _e('UTC+08:45') ?></option>
 											<option value="9"<?php if ($feather_config['o_default_timezone'] == 9) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+09:00') ?></option>
+} ?>><?php _e('UTC+09:00') ?></option>
 											<option value="9.5"<?php if ($feather_config['o_default_timezone'] == 9.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+09:30') ?></option>
+} ?>><?php _e('UTC+09:30') ?></option>
 											<option value="10"<?php if ($feather_config['o_default_timezone'] == 10) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+10:00') ?></option>
+} ?>><?php _e('UTC+10:00') ?></option>
 											<option value="10.5"<?php if ($feather_config['o_default_timezone'] == 10.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+10:30') ?></option>
+} ?>><?php _e('UTC+10:30') ?></option>
 											<option value="11"<?php if ($feather_config['o_default_timezone'] == 11) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+11:00') ?></option>
+} ?>><?php _e('UTC+11:00') ?></option>
 											<option value="11.5"<?php if ($feather_config['o_default_timezone'] == 11.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+11:30') ?></option>
+} ?>><?php _e('UTC+11:30') ?></option>
 											<option value="12"<?php if ($feather_config['o_default_timezone'] == 12) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+12:00') ?></option>
+} ?>><?php _e('UTC+12:00') ?></option>
 											<option value="12.75"<?php if ($feather_config['o_default_timezone'] == 12.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+12:45') ?></option>
+} ?>><?php _e('UTC+12:45') ?></option>
 											<option value="13"<?php if ($feather_config['o_default_timezone'] == 13) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+13:00') ?></option>
+} ?>><?php _e('UTC+13:00') ?></option>
 											<option value="14"<?php if ($feather_config['o_default_timezone'] == 14) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+14:00') ?></option>
+} ?>><?php _e('UTC+14:00') ?></option>
 										</select>
-										<span><?php echo __('Timezone help') ?></span>
+										<span><?php _e('Timezone help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('DST label') ?></th>
+									<th scope="row"><?php _e('DST label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather_config['o_default_dst'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather_config['o_default_dst'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('DST help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('DST help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Language label') ?></th>
+									<th scope="row"><?php _e('Language label') ?></th>
 									<td>
 										<select name="form_default_lang">
 <?php
@@ -201,16 +201,16 @@
 
 ?>
 										</select>
-										<span><?php echo __('Language help') ?></span>
+										<span><?php _e('Language help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Default style label') ?></th>
+									<th scope="row"><?php _e('Default style label') ?></th>
 									<td>
 										<select name="form_default_style">
 											<?php echo $styles; ?>
 										</select>
-										<span><?php echo __('Default style help') ?></span>
+										<span><?php _e('Default style help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -225,42 +225,42 @@
 ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Timeouts subhead') ?></legend>
+						<legend><?php _e('Timeouts subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Time format label') ?></th>
+									<th scope="row"><?php _e('Time format label') ?></th>
 									<td>
 										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_time_format']) ?>" />
 										<span><?php printf(__('Time format help'), gmdate($feather_config['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Date format label') ?></th>
+									<th scope="row"><?php _e('Date format label') ?></th>
 									<td>
 										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_date_format']) ?>" />
 										<span><?php printf(__('Date format help'), gmdate($feather_config['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Visit timeout label') ?></th>
+									<th scope="row"><?php _e('Visit timeout label') ?></th>
 									<td>
 										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_visit'] ?>" />
-										<span><?php echo __('Visit timeout help') ?></span>
+										<span><?php _e('Visit timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Online timeout label') ?></th>
+									<th scope="row"><?php _e('Online timeout label') ?></th>
 									<td>
 										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_online'] ?>" />
-										<span><?php echo __('Online timeout help') ?></span>
+										<span><?php _e('Online timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Redirect time label') ?></th>
+									<th scope="row"><?php _e('Redirect time label') ?></th>
 									<td>
 										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather_config['o_redirect_delay'] ?>" />
-										<span><?php echo __('Redirect time help') ?></span>
+										<span><?php _e('Redirect time help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -269,114 +269,114 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Display subhead') ?></legend>
+						<legend><?php _e('Display subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Version number label') ?></th>
+									<th scope="row"><?php _e('Version number label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather_config['o_show_version'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather_config['o_show_version'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Version number help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Version number help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Info in posts label') ?></th>
+									<th scope="row"><?php _e('Info in posts label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather_config['o_show_user_info'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather_config['o_show_user_info'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Info in posts help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Info in posts help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Post count label') ?></th>
+									<th scope="row"><?php _e('Post count label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather_config['o_show_post_count'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather_config['o_show_post_count'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Post count help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post count help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Smilies label') ?></th>
+									<th scope="row"><?php _e('Smilies label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather_config['o_smilies'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather_config['o_smilies'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Smilies help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Smilies help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Smilies sigs label') ?></th>
+									<th scope="row"><?php _e('Smilies sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather_config['o_smilies_sig'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather_config['o_smilies_sig'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Smilies sigs help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Smilies sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Clickable links label') ?></th>
+									<th scope="row"><?php _e('Clickable links label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather_config['o_make_links'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather_config['o_make_links'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Clickable links help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Clickable links help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Topic review label') ?></th>
+									<th scope="row"><?php _e('Topic review label') ?></th>
 									<td>
 										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather_config['o_topic_review'] ?>" />
-										<span><?php echo __('Topic review help') ?></span>
+										<span><?php _e('Topic review help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Topics per page label') ?></th>
+									<th scope="row"><?php _e('Topics per page label') ?></th>
 									<td>
 										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_topics_default'] ?>" />
-										<span><?php echo __('Topics per page help') ?></span>
+										<span><?php _e('Topics per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Posts per page label') ?></th>
+									<th scope="row"><?php _e('Posts per page label') ?></th>
 									<td>
 										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_posts_default'] ?>" />
-										<span><?php echo __('Posts per page help') ?></span>
+										<span><?php _e('Posts per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Indent label') ?></th>
+									<th scope="row"><?php _e('Indent label') ?></th>
 									<td>
 										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather_config['o_indent_num_spaces'] ?>" />
-										<span><?php echo __('Indent help') ?></span>
+										<span><?php _e('Indent help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Quote depth label') ?></th>
+									<th scope="row"><?php _e('Quote depth label') ?></th>
 									<td>
 										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather_config['o_quote_depth'] ?>" />
-										<span><?php echo __('Quote depth help') ?></span>
+										<span><?php _e('Quote depth help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -385,122 +385,122 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Features subhead') ?></legend>
+						<legend><?php _e('Features subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Quick post label') ?></th>
+									<th scope="row"><?php _e('Quick post label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather_config['o_quickpost'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather_config['o_quickpost'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Quick post help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Quick post help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Users online label') ?></th>
+									<th scope="row"><?php _e('Users online label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather_config['o_users_online'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather_config['o_users_online'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Users online help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Users online help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><a name="censoring"></a><?php echo __('Censor words label') ?></th>
+									<th scope="row"><a name="censoring"></a><?php _e('Censor words label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather_config['o_censoring'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather_config['o_censoring'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><a name="signatures"></a><?php echo __('Signatures label') ?></th>
+									<th scope="row"><a name="signatures"></a><?php _e('Signatures label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather_config['o_signatures'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather_config['o_signatures'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Signatures help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Signatures help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('User has posted label') ?></th>
+									<th scope="row"><?php _e('User has posted label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather_config['o_show_dot'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather_config['o_show_dot'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('User has posted help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('User has posted help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Topic views label') ?></th>
+									<th scope="row"><?php _e('Topic views label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather_config['o_topic_views'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather_config['o_topic_views'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Topic views help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Topic views help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Quick jump label') ?></th>
+									<th scope="row"><?php _e('Quick jump label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather_config['o_quickjump'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather_config['o_quickjump'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Quick jump help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Quick jump help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('GZip label') ?></th>
+									<th scope="row"><?php _e('GZip label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather_config['o_gzip'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather_config['o_gzip'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('GZip help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('GZip help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Search all label') ?></th>
+									<th scope="row"><?php _e('Search all label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather_config['o_search_all_forums'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather_config['o_search_all_forums'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Search all help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Search all help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Menu items label') ?></th>
+									<th scope="row"><?php _e('Menu items label') ?></th>
 									<td>
 										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather_config['o_additional_navlinks']) ?></textarea>
-										<span><?php echo __('Menu items help') ?></span>
+										<span><?php _e('Menu items help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -509,34 +509,34 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Feed subhead') ?></legend>
+						<legend><?php _e('Feed subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Default feed label') ?></th>
+									<th scope="row"><?php _e('Default feed label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather_config['o_feed_type'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('None') ?></strong></label>
+} ?> />&#160;<strong><?php _e('None') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather_config['o_feed_type'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('RSS') ?></strong></label>
+} ?> />&#160;<strong><?php _e('RSS') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather_config['o_feed_type'] == '2') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Atom') ?></strong></label>
-										<span class="clearb"><?php echo __('Default feed help') ?></span>
+} ?> />&#160;<strong><?php _e('Atom') ?></strong></label>
+										<span class="clearb"><?php _e('Default feed help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Feed TTL label') ?></th>
+									<th scope="row"><?php _e('Feed TTL label') ?></th>
 									<td>
 										<select name="form_feed_ttl">
 											<option value="0"<?php if ($feather_config['o_feed_ttl'] == '0') {
     echo ' selected="selected"';
-} ?>><?php echo __('No cache') ?></option>
+} ?>><?php _e('No cache') ?></option>
 											<?php echo $times ?>
 										</select>
-										<span><?php echo __('Feed TTL help') ?></span>
+										<span><?php _e('Feed TTL help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -545,29 +545,29 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Reports subhead') ?></legend>
+						<legend><?php _e('Reports subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Reporting method label') ?></th>
+									<th scope="row"><?php _e('Reporting method label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather_config['o_report_method'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Internal') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Internal') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather_config['o_report_method'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('By e-mail') ?></strong></label>
+} ?> />&#160;<strong><?php _e('By e-mail') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather_config['o_report_method'] == '2') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Both') ?></strong></label>
-										<span class="clearb"><?php echo __('Reporting method help') ?></span>
+} ?> />&#160;<strong><?php _e('Both') ?></strong></label>
+										<span class="clearb"><?php _e('Reporting method help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Mailing list label') ?></th>
+									<th scope="row"><?php _e('Mailing list label') ?></th>
 									<td>
 										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather_config['o_mailing_list']) ?></textarea>
-										<span><?php echo __('Mailing list help') ?></span>
+										<span><?php _e('Mailing list help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -576,47 +576,47 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Avatars subhead') ?></legend>
+						<legend><?php _e('Avatars subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Use avatars label') ?></th>
+									<th scope="row"><?php _e('Use avatars label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather_config['o_avatars'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather_config['o_avatars'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Use avatars help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Use avatars help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Upload directory label') ?></th>
+									<th scope="row"><?php _e('Upload directory label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather_config['o_avatars_dir']) ?>" />
-										<span><?php echo __('Upload directory help') ?></span>
+										<span><?php _e('Upload directory help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Max width label') ?></th>
+									<th scope="row"><?php _e('Max width label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_width'] ?>" />
-										<span><?php echo __('Max width help') ?></span>
+										<span><?php _e('Max width help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Max height label') ?></th>
+									<th scope="row"><?php _e('Max height label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_height'] ?>" />
-										<span><?php echo __('Max height help') ?></span>
+										<span><?php _e('Max height help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Max size label') ?></th>
+									<th scope="row"><?php _e('Max size label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-										<span><?php echo __('Max size help') ?></span>
+										<span><?php _e('Max size help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -625,81 +625,81 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('E-mail subhead') ?></legend>
+						<legend><?php _e('E-mail subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Admin e-mail label') ?></th>
+									<th scope="row"><?php _e('Admin e-mail label') ?></th>
 									<td>
 										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_admin_email']) ?>" />
-										<span><?php echo __('Admin e-mail help') ?></span>
+										<span><?php _e('Admin e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Webmaster e-mail label') ?></th>
+									<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
 									<td>
 										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_webmaster_email']) ?>" />
-										<span><?php echo __('Webmaster e-mail help') ?></span>
+										<span><?php _e('Webmaster e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Forum subscriptions label') ?></th>
+									<th scope="row"><?php _e('Forum subscriptions label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather_config['o_forum_subscriptions'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather_config['o_forum_subscriptions'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Forum subscriptions help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Forum subscriptions help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Topic subscriptions label') ?></th>
+									<th scope="row"><?php _e('Topic subscriptions label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather_config['o_topic_subscriptions'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather_config['o_topic_subscriptions'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Topic subscriptions help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Topic subscriptions help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('SMTP address label') ?></th>
+									<th scope="row"><?php _e('SMTP address label') ?></th>
 									<td>
 										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather_config['o_smtp_host']) ?>" />
-										<span><?php echo __('SMTP address help') ?></span>
+										<span><?php _e('SMTP address help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('SMTP username label') ?></th>
+									<th scope="row"><?php _e('SMTP username label') ?></th>
 									<td>
 										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather_config['o_smtp_user']) ?>" />
-										<span><?php echo __('SMTP username help') ?></span>
+										<span><?php _e('SMTP username help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('SMTP password label') ?></th>
+									<th scope="row"><?php _e('SMTP password label') ?></th>
 									<td>
-										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php echo __('SMTP change password help') ?></label>
+										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
 <?php $smtp_pass = !empty($feather_config['o_smtp_pass']) ? random_key(feather_strlen($feather_config['o_smtp_pass']), true) : ''; ?>
 										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
-										<span><?php echo __('SMTP password help') ?></span>
+										<span><?php _e('SMTP password help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('SMTP SSL label') ?></th>
+									<th scope="row"><?php _e('SMTP SSL label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather_config['o_smtp_ssl'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather_config['o_smtp_ssl'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('SMTP SSL help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('SMTP SSL help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -708,77 +708,77 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Registration subhead') ?></legend>
+						<legend><?php _e('Registration subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Allow new label') ?></th>
+									<th scope="row"><?php _e('Allow new label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather_config['o_regs_allow'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather_config['o_regs_allow'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Allow new help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Allow new help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Verify label') ?></th>
+									<th scope="row"><?php _e('Verify label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather_config['o_regs_verify'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather_config['o_regs_verify'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Verify help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Verify help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Report new label') ?></th>
+									<th scope="row"><?php _e('Report new label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather_config['o_regs_report'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather_config['o_regs_report'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Report new help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Report new help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Use rules label') ?></th>
+									<th scope="row"><?php _e('Use rules label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather_config['o_rules'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather_config['o_rules'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Use rules help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Use rules help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Rules label') ?></th>
+									<th scope="row"><?php _e('Rules label') ?></th>
 									<td>
 										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather_config['o_rules_message']) ?></textarea>
-										<span><?php echo __('Rules help') ?></span>
+										<span><?php _e('Rules help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('E-mail default label') ?></th>
+									<th scope="row"><?php _e('E-mail default label') ?></th>
 									<td>
-										<span><?php echo __('E-mail default help') ?></span>
+										<span><?php _e('E-mail default help') ?></span>
 										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather_config['o_default_email_setting'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<?php echo __('Display e-mail label') ?></label>
+} ?> />&#160;<?php _e('Display e-mail label') ?></label>
 										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather_config['o_default_email_setting'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<?php echo __('Hide allow form label') ?></label>
+} ?> />&#160;<?php _e('Hide allow form label') ?></label>
 										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather_config['o_default_email_setting'] == '2') {
     echo ' checked="checked"';
-} ?> />&#160;<?php echo __('Hide both label') ?></label>
+} ?> />&#160;<?php _e('Hide both label') ?></label>
 									</td>
 								</tr>
 							</table>
@@ -787,26 +787,26 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Announcement subhead') ?></legend>
+						<legend><?php _e('Announcement subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Display announcement label') ?></th>
+									<th scope="row"><?php _e('Display announcement label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather_config['o_announcement'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather_config['o_announcement'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Display announcement help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Display announcement help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Announcement message label') ?></th>
+									<th scope="row"><?php _e('Announcement message label') ?></th>
 									<td>
 										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_announcement_message']) ?></textarea>
-										<span><?php echo __('Announcement message help') ?></span>
+										<span><?php _e('Announcement message help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -815,33 +815,33 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Maintenance subhead') ?></legend>
+						<legend><?php _e('Maintenance subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><a name="maintenance"></a><?php echo __('Maintenance mode label') ?></th>
+									<th scope="row"><a name="maintenance"></a><?php _e('Maintenance mode label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather_config['o_maintenance'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather_config['o_maintenance'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Maintenance mode help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Maintenance mode help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Maintenance message label') ?></th>
+									<th scope="row"><?php _e('Maintenance message label') ?></th>
 									<td>
 										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_maintenance_message']) ?></textarea>
-										<span><?php echo __('Maintenance message help') ?></span>
+										<span><?php _e('Maintenance message help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
+				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/parser.php b/style/FeatherBB/view/admin/parser.php
index 8049bc52..aec1f767 100644
--- a/style/FeatherBB/view/admin/parser.php
+++ b/style/FeatherBB/view/admin/parser.php
@@ -19,7 +19,7 @@
 			<form method="post" action="<?php echo get_link('admin/parser/') ?>" enctype="multipart/form-data">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop">
-					<input type="submit" name="save" value="<?php echo __('Save changes') ?>" />
+					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
 					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
 				</p>
 				<div class="inform">
@@ -33,9 +33,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[textile]" value="1"<?php if ($config['textile']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[textile]" value="0"<?php if (!$config['textile']) {
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[textile]" value="0"<?php if (!$config['textile']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('No') ?></strong>
+} ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['textile help'] ?></span>
@@ -46,9 +46,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[quote_links]" value="1"<?php if ($config['quote_links']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[quote_links]" value="0"<?php if (!$config['quote_links']) {
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_links]" value="0"<?php if (!$config['quote_links']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('No') ?></strong>
+} ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['quote_links help'] ?></span>
@@ -59,9 +59,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[quote_imgs]" value="1"<?php if ($config['quote_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[quote_imgs]" value="0"<?php if (!$config['quote_imgs']) {
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_imgs]" value="0"<?php if (!$config['quote_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('No') ?></strong>
+} ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['quote_imgs help'] ?></span>
@@ -72,9 +72,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[click_imgs]" value="1"<?php if ($config['click_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[click_imgs]" value="0"<?php if (!$config['click_imgs']) {
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[click_imgs]" value="0"<?php if (!$config['click_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('No') ?></strong>
+} ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['click_imgs help'] ?></span>
@@ -88,12 +88,12 @@
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
     echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php echo __('Yes') ?></strong>
+} ?> /> <strong><?php _e('Yes') ?></strong>
 										<input type="radio" name="config[valid_imgs]" value="0"<?php if (!$config['valid_imgs']) {
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
     echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php echo __('No') ?></strong>
+} ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td><?php echo $lang_admin_parser['valid_imgs help'] ?></td>
 								</tr>
@@ -257,19 +257,19 @@
 										<input type="radio" name="<?php echo($tagname) ?>_in_post" value="1"<?php if ($bbcd[$tagname]['in_post']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_post" value="0"<?php if (!$bbcd[$tagname]['in_post']) {
+    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_post" value="0"<?php if (!$bbcd[$tagname]['in_post']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo __('No') ?></strong>
+    ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td>
 										<input type="radio" name="<?php echo($tagname) ?>_in_sig" value="1"<?php if ($bbcd[$tagname]['in_sig']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_sig" value="0"<?php if (!$bbcd[$tagname]['in_sig']) {
+    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_sig" value="0"<?php if (!$bbcd[$tagname]['in_sig']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo __('No') ?></strong>
+    ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td>
 										<input type="text" size="10" name="<?php echo($tagname) ?>_depth_max" value="<?php echo($bbcd[$tagname]['depth_max']);
@@ -289,7 +289,7 @@
 
 
 				<p class="submitend">
-					<input type="submit" name="save" value="<?php echo __('Save changes') ?>" />
+					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
 					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
 				</p>
 			</form>
diff --git a/style/FeatherBB/view/admin/permissions.php b/style/FeatherBB/view/admin/permissions.php
index 34fe64cb..a70328ae 100644
--- a/style/FeatherBB/view/admin/permissions.php
+++ b/style/FeatherBB/view/admin/permissions.php
@@ -14,75 +14,75 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Permissions head') ?></span></h2>
+		<h2><span><?php _e('Permissions head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/permissions/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
+				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
 					<input type="hidden" name="form_sent" value="1" />
 					<fieldset>
-						<legend><?php echo __('Posting subhead') ?></legend>
+						<legend><?php _e('Posting subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('BBCode label') ?></th>
+									<th scope="row"><?php _e('BBCode label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather_config['p_message_bbcode'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather_config['p_message_bbcode'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('BBCode help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('BBCode help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Image tag label') ?></th>
+									<th scope="row"><?php _e('Image tag label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather_config['p_message_img_tag'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather_config['p_message_img_tag'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Image tag help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Image tag help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('All caps message label') ?></th>
+									<th scope="row"><?php _e('All caps message label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather_config['p_message_all_caps'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather_config['p_message_all_caps'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('All caps message help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('All caps message help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('All caps subject label') ?></th>
+									<th scope="row"><?php _e('All caps subject label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather_config['p_subject_all_caps'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather_config['p_subject_all_caps'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('All caps subject help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('All caps subject help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Require e-mail label') ?></th>
+									<th scope="row"><?php _e('Require e-mail label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather_config['p_force_guest_email'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather_config['p_force_guest_email'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Require e-mail help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Require e-mail help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -91,57 +91,57 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Signatures subhead') ?></legend>
+						<legend><?php _e('Signatures subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('BBCode sigs label') ?></th>
+									<th scope="row"><?php _e('BBCode sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather_config['p_sig_bbcode'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather_config['p_sig_bbcode'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('BBCode sigs help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('BBCode sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Image tag sigs label') ?></th>
+									<th scope="row"><?php _e('Image tag sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather_config['p_sig_img_tag'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather_config['p_sig_img_tag'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Image tag sigs help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Image tag sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('All caps sigs label') ?></th>
+									<th scope="row"><?php _e('All caps sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather_config['p_sig_all_caps'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather_config['p_sig_all_caps'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('All caps sigs help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('All caps sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Max sig length label') ?></th>
+									<th scope="row"><?php _e('Max sig length label') ?></th>
 									<td>
 										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather_config['p_sig_length'] ?>" />
-										<span class="clearb"><?php echo __('Max sig length help') ?></span>
+										<span class="clearb"><?php _e('Max sig length help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Max sig lines label') ?></th>
+									<th scope="row"><?php _e('Max sig lines label') ?></th>
 									<td>
 										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather_config['p_sig_lines'] ?>" />
-										<span class="clearb"><?php echo __('Max sig lines help') ?></span>
+										<span class="clearb"><?php _e('Max sig lines help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -150,38 +150,38 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Registration subhead') ?></legend>
+						<legend><?php _e('Registration subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Banned e-mail label') ?></th>
+									<th scope="row"><?php _e('Banned e-mail label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather_config['p_allow_banned_email'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather_config['p_allow_banned_email'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Banned e-mail help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Banned e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Duplicate e-mail label') ?></th>
+									<th scope="row"><?php _e('Duplicate e-mail label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather_config['p_allow_dupe_email'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather_config['p_allow_dupe_email'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Duplicate e-mail help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Duplicate e-mail help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
+				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/reports.php b/style/FeatherBB/view/admin/reports.php
index 605637c6..0baeaaf1 100644
--- a/style/FeatherBB/view/admin/reports.php
+++ b/style/FeatherBB/view/admin/reports.php
@@ -14,7 +14,7 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('New reports head') ?></span></h2>
+		<h2><span><?php _e('New reports head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/reports/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -34,7 +34,7 @@
 																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php echo __('Zap') ?>" /></div></th>
+									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
 									<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
 								</tr>
 							</table>
@@ -48,9 +48,9 @@
     ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('None') ?></legend>
+						<legend><?php _e('None') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('No new reports') ?></p>
+							<p><?php _e('No new reports') ?></p>
 						</div>
 					</fieldset>
 				</div>
@@ -64,7 +64,7 @@
 	</div>
 
 	<div class="blockform block2">
-		<h2><span><?php echo __('Last 10 head') ?></span></h2>
+		<h2><span><?php _e('Last 10 head') ?></span></h2>
 		<div class="box">
 			<div class="fakeform">
 <?php
@@ -84,7 +84,7 @@
 																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Reason') ?></th>
+									<th scope="row"><?php _e('Reason') ?></th>
 									<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
 								</tr>
 							</table>
@@ -98,9 +98,9 @@
     ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('None') ?></legend>
+						<legend><?php _e('None') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('No zapped reports') ?></p>
+							<p><?php _e('No zapped reports') ?></p>
 						</div>
 					</fieldset>
 				</div>
diff --git a/style/FeatherBB/view/admin/statistics.php b/style/FeatherBB/view/admin/statistics.php
index 522bbb5d..5306b027 100644
--- a/style/FeatherBB/view/admin/statistics.php
+++ b/style/FeatherBB/view/admin/statistics.php
@@ -14,21 +14,21 @@
 ?>
 
 	<div class="block">
-		<h2><span><?php echo __('Server statistics head') ?></span></h2>
+		<h2><span><?php _e('Server statistics head') ?></span></h2>
 		<div id="adstats" class="box">
 			<div class="inbox">
 				<dl>
-					<dt><?php echo __('Server load label') ?></dt>
+					<dt><?php _e('Server load label') ?></dt>
 					<dd>
 						<?php printf(__('Server load data')."\n", $server_load, $num_online) ?>
 					</dd>
-<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php echo __('Environment label') ?></dt>
+<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
 					<dd>
 						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
 						<?php printf(__('Environment data version'), phpversion(), '<a href="'.get_link('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
 						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
 					</dd>
-					<dt><?php echo __('Database label') ?></dt>
+					<dt><?php _e('Database label') ?></dt>
 					<dd>
 <?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", forum_number_format($total_records)) ?>
 						<br /><?php printf(__('Database data size')."\n", $total_size) ?>
diff --git a/style/FeatherBB/view/admin/users/admin_users.php b/style/FeatherBB/view/admin/users/admin_users.php
index f29830af..27e99a16 100644
--- a/style/FeatherBB/view/admin/users/admin_users.php
+++ b/style/FeatherBB/view/admin/users/admin_users.php
@@ -14,128 +14,128 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('User search head') ?></span></h2>
+		<h2><span><?php _e('User search head') ?></span></h2>
 		<div class="box">
 			<form id="find_user" method="get" action="<?php echo get_link('admin/users/') ?>">
-				<p class="submittop"><input type="submit" name="find_user" value="<?php echo __('Submit search') ?>" tabindex="1" /></p>
+				<p class="submittop"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="1" /></p>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('User search subhead') ?></legend>
+						<legend><?php _e('User search subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('User search info') ?></p>
+							<p><?php _e('User search info') ?></p>
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Username label') ?></th>
+									<th scope="row"><?php _e('Username label') ?></th>
 									<td><input type="text" name="form[username]" size="25" maxlength="25" tabindex="2" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('E-mail address label') ?></th>
+									<th scope="row"><?php _e('E-mail address label') ?></th>
 									<td><input type="text" name="form[email]" size="30" maxlength="80" tabindex="3" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Title label') ?></th>
+									<th scope="row"><?php _e('Title label') ?></th>
 									<td><input type="text" name="form[title]" size="30" maxlength="50" tabindex="4" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Real name label') ?></th>
+									<th scope="row"><?php _e('Real name label') ?></th>
 									<td><input type="text" name="form[realname]" size="30" maxlength="40" tabindex="5" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Website label') ?></th>
+									<th scope="row"><?php _e('Website label') ?></th>
 									<td><input type="text" name="form[url]" size="35" maxlength="100" tabindex="6" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Jabber label') ?></th>
+									<th scope="row"><?php _e('Jabber label') ?></th>
 									<td><input type="text" name="form[jabber]" size="30" maxlength="75" tabindex="7" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('ICQ label') ?></th>
+									<th scope="row"><?php _e('ICQ label') ?></th>
 									<td><input type="text" name="form[icq]" size="12" maxlength="12" tabindex="8" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('MSN label') ?></th>
+									<th scope="row"><?php _e('MSN label') ?></th>
 									<td><input type="text" name="form[msn]" size="30" maxlength="50" tabindex="9" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('AOL label') ?></th>
+									<th scope="row"><?php _e('AOL label') ?></th>
 									<td><input type="text" name="form[aim]" size="20" maxlength="20" tabindex="10" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Yahoo label') ?></th>
+									<th scope="row"><?php _e('Yahoo label') ?></th>
 									<td><input type="text" name="form[yahoo]" size="20" maxlength="20" tabindex="11" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Location label') ?></th>
+									<th scope="row"><?php _e('Location label') ?></th>
 									<td><input type="text" name="form[location]" size="30" maxlength="30" tabindex="12" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Signature label') ?></th>
+									<th scope="row"><?php _e('Signature label') ?></th>
 									<td><input type="text" name="form[signature]" size="35" maxlength="512" tabindex="13" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Admin note label') ?></th>
+									<th scope="row"><?php _e('Admin note label') ?></th>
 									<td><input type="text" name="form[admin_note]" size="30" maxlength="30" tabindex="14" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Posts more than label') ?></th>
+									<th scope="row"><?php _e('Posts more than label') ?></th>
 									<td><input type="text" name="posts_greater" size="5" maxlength="8" tabindex="15" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Posts less than label') ?></th>
+									<th scope="row"><?php _e('Posts less than label') ?></th>
 									<td><input type="text" name="posts_less" size="5" maxlength="8" tabindex="16" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Last post after label') ?></th>
+									<th scope="row"><?php _e('Last post after label') ?></th>
 									<td><input type="text" name="last_post_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Last post before label') ?></th>
+									<th scope="row"><?php _e('Last post before label') ?></th>
 									<td><input type="text" name="last_post_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Last visit after label') ?></th>
+									<th scope="row"><?php _e('Last visit after label') ?></th>
 									<td><input type="text" name="last_visit_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Last visit before label') ?></th>
+									<th scope="row"><?php _e('Last visit before label') ?></th>
 									<td><input type="text" name="last_visit_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Registered after label') ?></th>
+									<th scope="row"><?php _e('Registered after label') ?></th>
 									<td><input type="text" name="registered_after" size="24" maxlength="19" tabindex="19" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Registered before label') ?></th>
+									<th scope="row"><?php _e('Registered before label') ?></th>
 									<td><input type="text" name="registered_before" size="24" maxlength="19" tabindex="20" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Order by label') ?></th>
+									<th scope="row"><?php _e('Order by label') ?></th>
 									<td>
 										<select name="order_by" tabindex="21">
-											<option value="username" selected="selected"><?php echo __('Order by username') ?></option>
-											<option value="email"><?php echo __('Order by e-mail') ?></option>
-											<option value="num_posts"><?php echo __('Order by posts') ?></option>
-											<option value="last_post"><?php echo __('Order by last post') ?></option>
-											<option value="last_visit"><?php echo __('Order by last visit') ?></option>
-											<option value="registered"><?php echo __('Order by registered') ?></option>
+											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
+											<option value="email"><?php _e('Order by e-mail') ?></option>
+											<option value="num_posts"><?php _e('Order by posts') ?></option>
+											<option value="last_post"><?php _e('Order by last post') ?></option>
+											<option value="last_visit"><?php _e('Order by last visit') ?></option>
+											<option value="registered"><?php _e('Order by registered') ?></option>
 										</select>&#160;&#160;&#160;<select name="direction" tabindex="22">
-											<option value="ASC" selected="selected"><?php echo __('Ascending') ?></option>
-											<option value="DESC"><?php echo __('Descending') ?></option>
+											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
+											<option value="DESC"><?php _e('Descending') ?></option>
 										</select>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('User group label') ?></th>
+									<th scope="row"><?php _e('User group label') ?></th>
 									<td>
 										<select name="user_group" tabindex="23">
-											<option value="-1" selected="selected"><?php echo __('All groups') ?></option>
-											<option value="0"><?php echo __('Unverified users') ?></option>
+											<option value="-1" selected="selected"><?php _e('All groups') ?></option>
+											<option value="0"><?php _e('Unverified users') ?></option>
 											<?php echo $group_list; ?>
 										</select>
 									</td>
@@ -144,22 +144,22 @@
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="find_user" value="<?php echo __('Submit search') ?>" tabindex="25" /></p>
+				<p class="submitend"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="25" /></p>
 			</form>
 		</div>
 
-		<h2 class="block2"><span><?php echo __('IP search head') ?></span></h2>
+		<h2 class="block2"><span><?php _e('IP search head') ?></span></h2>
 		<div class="box">
 			<form method="get" action="<?php echo get_link('admin/users/') ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('IP search subhead') ?></legend>
+						<legend><?php _e('IP search subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('IP address label') ?><div><input type="submit" value="<?php echo __('Find IP address') ?>" tabindex="26" /></div></th>
+									<th scope="row"><?php _e('IP address label') ?><div><input type="submit" value="<?php _e('Find IP address') ?>" tabindex="26" /></div></th>
 									<td><input type="text" name="show_users" size="18" maxlength="15" tabindex="24" />
-									<span><?php echo __('IP address help') ?></span></td>
+									<span><?php _e('IP address help') ?></span></td>
 								</tr>
 							</table>
 						</div>
diff --git a/style/FeatherBB/view/admin/users/ban_users.php b/style/FeatherBB/view/admin/users/ban_users.php
index 5d782379..e929c043 100644
--- a/style/FeatherBB/view/admin/users/ban_users.php
+++ b/style/FeatherBB/view/admin/users/ban_users.php
@@ -14,43 +14,43 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Ban users') ?></span></h2>
+		<h2><span><?php _e('Ban users') ?></span></h2>
 		<div class="box">
 			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo get_link('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Message expiry subhead') ?></legend>
+						<legend><?php _e('Message expiry subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Ban message label') ?></th>
+									<th scope="row"><?php _e('Ban message label') ?></th>
 									<td>
 										<input type="text" name="ban_message" size="50" maxlength="255" tabindex="1" />
-										<span><?php echo __('Ban message help') ?></span>
+										<span><?php _e('Ban message help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Expire date label') ?></th>
+									<th scope="row"><?php _e('Expire date label') ?></th>
 									<td>
 										<input type="text" name="ban_expire" size="17" maxlength="10" tabindex="2" />
-										<span><?php echo __('Expire date help') ?></span>
+										<span><?php _e('Expire date help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Ban IP label') ?></th>
+									<th scope="row"><?php _e('Ban IP label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="3" value="1" checked="checked" />&#160;<strong><?php echo __('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="4" value="0" checked="checked" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Ban IP help') ?></span>
+										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="3" value="1" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="4" value="0" checked="checked" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Ban IP help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="ban_users_comply" value="<?php echo __('Save') ?>" tabindex="3" /></p>
+				<p class="submitend"><input type="submit" name="ban_users_comply" value="<?php _e('Save') ?>" tabindex="3" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/users/delete_users.php b/style/FeatherBB/view/admin/users/delete_users.php
index b3b3c36e..a82c22ec 100644
--- a/style/FeatherBB/view/admin/users/delete_users.php
+++ b/style/FeatherBB/view/admin/users/delete_users.php
@@ -14,24 +14,24 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Delete users') ?></span></h2>
+		<h2><span><?php _e('Delete users') ?></span></h2>
 		<div class="box">
 			<form name="confirm_del_users" method="post" action="<?php echo get_link('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Confirm delete legend') ?></legend>
+						<legend><?php _e('Confirm delete legend') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Confirm delete info') ?></p>
+							<p><?php _e('Confirm delete info') ?></p>
 							<div class="rbox">
-								<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo __('Delete posts') ?><br /></label>
+								<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
 							</div>
-							<p class="warntext"><strong><?php echo __('Delete warning') ?></strong></p>
+							<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="delete_users_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+				<p class="buttons"><input type="submit" name="delete_users_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/users/find_users.php b/style/FeatherBB/view/admin/users/find_users.php
index ee79eef6..d426177d 100644
--- a/style/FeatherBB/view/admin/users/find_users.php
+++ b/style/FeatherBB/view/admin/users/find_users.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/index/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+			<li><a href="<?php echo get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -31,19 +31,19 @@
 <form id="search-users-form" action="<?php echo get_link('admin/users/') ?>" method="post">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <div id="users2" class="blocktable">
-	<h2><span><?php echo __('Results head') ?></span></h2>
+	<h2><span><?php _e('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Results title head') ?></th>
-					<th class="tc4" scope="col"><?php echo __('Results posts head') ?></th>
-					<th class="tc5" scope="col"><?php echo __('Results admin note head') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Results actions head') ?></th>
-<?php if ($can_action): ?>					<th class="tcmod" scope="col"><?php echo __('Select') ?></th>
+					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
+					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
+					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
+<?php if ($can_action): ?>					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
 <?php endif;
     ?>
 				</tr>
@@ -82,17 +82,17 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
-<?php if ($can_action): ?>			<p class="conr modbuttons"><a href="#" onclick="return select_checkboxes('search-users-form', this, '<?php echo __('Unselect all') ?>')"><?php echo __('Select all') ?></a> <?php if ($can_ban) : ?><input type="submit" name="ban_users" value="<?php echo __('Ban') ?>" /><?php endif;
-    if ($can_delete) : ?><input type="submit" name="delete_users" value="<?php echo __('Delete') ?>" /><?php endif;
-    if ($can_move) : ?><input type="submit" name="move_users" value="<?php echo __('Change group') ?>" /><?php endif;
+<?php if ($can_action): ?>			<p class="conr modbuttons"><a href="#" onclick="return select_checkboxes('search-users-form', this, '<?php _e('Unselect all') ?>')"><?php _e('Select all') ?></a> <?php if ($can_ban) : ?><input type="submit" name="ban_users" value="<?php _e('Ban') ?>" /><?php endif;
+    if ($can_delete) : ?><input type="submit" name="delete_users" value="<?php _e('Delete') ?>" /><?php endif;
+    if ($can_move) : ?><input type="submit" name="move_users" value="<?php _e('Change group') ?>" /><?php endif;
     ?></p>
 <?php endif;
     ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/index/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+			<li><a href="<?php echo get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/style/FeatherBB/view/admin/users/move_users.php b/style/FeatherBB/view/admin/users/move_users.php
index 9b785654..d43303e8 100644
--- a/style/FeatherBB/view/admin/users/move_users.php
+++ b/style/FeatherBB/view/admin/users/move_users.php
@@ -14,32 +14,32 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Move users') ?></span></h2>
+		<h2><span><?php _e('Move users') ?></span></h2>
 		<div class="box">
 			<form name="confirm_move_users" method="post" action="<?php echo get_link('admin/users/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Move users subhead') ?></legend>
+						<legend><?php _e('Move users subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('New group label') ?></th>
+									<th scope="row"><?php _e('New group label') ?></th>
 									<td>
 										<select name="new_group" tabindex="1">
 <?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo feather_escape($group) ?></option>
 <?php endforeach;
     ?>
 										</select>
-										<span><?php echo __('New group help') ?></span>
+										<span><?php _e('New group help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="move_users_comply" value="<?php echo __('Save') ?>" tabindex="2" /></p>
+				<p class="submitend"><input type="submit" name="move_users_comply" value="<?php _e('Save') ?>" tabindex="2" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/style/FeatherBB/view/admin/users/search_ip.php b/style/FeatherBB/view/admin/users/search_ip.php
index 0fbb89f8..a17e7ac5 100644
--- a/style/FeatherBB/view/admin/users/search_ip.php
+++ b/style/FeatherBB/view/admin/users/search_ip.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -28,16 +28,16 @@
 </div>
 
 <div id="users1" class="blocktable">
-	<h2><span><?php echo __('Results head') ?></span></h2>
+	<h2><span><?php _e('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Results IP address head') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Results last used head') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Results times found head') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Results action head') ?></th>
+					<th class="tcl" scope="col"><?php _e('Results IP address head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results last used head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results times found head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results action head') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -48,7 +48,7 @@
 					<td class="tcl"><a href="<?php echo get_link('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
 					<td class="tc2"><?php echo format_time($ip['last_used']) ?></td>
 					<td class="tc3"><?php echo $ip['used_times'] ?></td>
-					<td class="tcr"><a href="<?php echo get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php echo __('Results find more link') ?></a></td>
+					<td class="tcr"><a href="<?php echo get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
 				</tr>
 <?php
 
@@ -70,9 +70,9 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/style/FeatherBB/view/admin/users/show_users.php b/style/FeatherBB/view/admin/users/show_users.php
index f93dba7a..4ab008c7 100644
--- a/style/FeatherBB/view/admin/users/show_users.php
+++ b/style/FeatherBB/view/admin/users/show_users.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -28,18 +28,18 @@
 </div>
 
 <div id="users2" class="blocktable">
-	<h2><span><?php echo __('Results head') ?></span></h2>
+	<h2><span><?php _e('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Results title head') ?></th>
-					<th class="tc4" scope="col"><?php echo __('Results posts head') ?></th>
-					<th class="tc5" scope="col"><?php echo __('Results admin note head') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Results actions head') ?></th>
+					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
+					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
+					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -65,7 +65,7 @@
 				<tr>
 					<td class="tcl"><?php echo feather_escape($cur_poster['poster']) ?></td>
 					<td class="tc2">&#160;</td>
-					<td class="tc3"><?php echo __('Results guest') ?></td>
+					<td class="tc3"><?php _e('Results guest') ?></td>
 					<td class="tc4">&#160;</td>
 					<td class="tc5">&#160;</td>
 					<td class="tcr">&#160;</td>
@@ -91,9 +91,9 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/style/FeatherBB/view/delete.php b/style/FeatherBB/view/delete.php
index 65f2440b..8a2d6959 100644
--- a/style/FeatherBB/view/delete.php
+++ b/style/FeatherBB/view/delete.php
@@ -16,26 +16,26 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="index.php"><?php echo __('Index') ?></a></li>
+			<li><a href="index.php"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Delete post') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div class="blockform">
-	<h2><span><?php echo __('Delete post') ?></span></h2>
+	<h2><span><?php _e('Delete post') ?></span></h2>
 	<div class="box">
 		<form method="post" action="<?php echo get_link('delete/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
 					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
-					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php echo __('Delete info') ?></p>
+					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
 				</div>
 			</div>
-			<p class="buttons"><input type="submit" name="delete" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/edit.php b/style/FeatherBB/view/edit.php
index 92ed1fe1..49f98dbf 100644
--- a/style/FeatherBB/view/edit.php
+++ b/style/FeatherBB/view/edit.php
@@ -19,10 +19,10 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Edit post') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
 		</ul>
 	</div>
 </div>
@@ -33,10 +33,10 @@
 if (!empty($errors)) :
 ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo __('Post errors') ?></span></h2>
+	<h2><span><?php _e('Post errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo __('Post errors info') ?></p>
+			<p><?php _e('Post errors info') ?></p>
 			<ul class="error-list">
 <?php
     foreach ($errors as $cur_error) {
@@ -51,7 +51,7 @@
 elseif ($feather->request->post('preview')):
 ?>
 <div id="postpreview" class="blockpost">
-	<h2><span><?php echo __('Post preview') ?></span></h2>
+	<h2><span><?php _e('Post preview') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -75,25 +75,25 @@
 </script>
 <script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
 <div id="editform" class="blockform">
-	<h2><span><?php echo __('Edit post') ?></span></h2>
+	<h2><span><?php _e('Edit post') ?></span></h2>
 	<div class="box">
 		<form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Edit post legend') ?></legend>
+					<legend><?php _e('Edit post legend') ?></legend>
 					<input type="hidden" name="form_sent" value="1" />
 					<div class="infldset txtarea">
-<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -103,7 +103,7 @@
 ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Options') ?></legend>
+					<legend><?php _e('Options') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
@@ -114,7 +114,7 @@
 <?php
 endif;
 ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
index 0b1d2ae7..5231f252 100644
--- a/style/FeatherBB/view/footer.php
+++ b/style/FeatherBB/view/footer.php
@@ -11,7 +11,7 @@
 </div>
 
 <div id="brdfooter" class="block">
-	<h2><span><?php echo __('Board footer') ?></span></h2>
+	<h2><span><?php _e('Board footer') ?></span></h2>
 	<div class="box">
 <?php
 
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
index 7b2b8d28..d045592b 100644
--- a/style/FeatherBB/view/header.php
+++ b/style/FeatherBB/view/header.php
@@ -9,7 +9,7 @@
 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo __('lang_identifier') ?>" lang="<?php echo __('lang_identifier') ?>" dir="<?php echo __('lang_direction') ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php _e('lang_identifier') ?>" lang="<?php _e('lang_identifier') ?>" dir="<?php _e('lang_direction') ?>">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -57,7 +57,7 @@ function process_form(the_form)
                         var elem = the_form.elements[i];
                         if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
                         {
-                            alert('"' + required_fields[elem.name] + '" <?php echo __('required field') ?>');
+                            alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
                             elem.focus();
                             return false;
                         }
@@ -89,7 +89,7 @@ function process_form(the_form)
                 <div class="navbar-right">
                     <form method="get" action="search" class="nav-search">
                         <input type="hidden" name="action" value="search">
-                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php echo __('Search') ?>">
+                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php _e('Search') ?>">
                     </form>
                 </div>
             </div>
@@ -111,7 +111,7 @@ function process_form(the_form)
         </div>
         <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
             <div id="announce" class="block">
-                <div class="hd"><h2><span><?php echo __('Announcement') ?></span></h2></div>
+                <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
                 <div class="box">
                     <div id="announce-block" class="inbox">
                         <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
@@ -122,7 +122,7 @@ function process_form(the_form)
         <?php if (isset($flash['message'])) : ?>
             <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
             <div id="msgflash" class="block">
-                <h2><span><?php echo __('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
+                <h2><span><?php _e('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
                 <div class="box">
                     <div class="inbox">
                         <p><?php echo feather_escape($flash['message']) ?></p>
diff --git a/style/FeatherBB/view/help.php b/style/FeatherBB/view/help.php
index a7f9300d..b5477db4 100644
--- a/style/FeatherBB/view/help.php
+++ b/style/FeatherBB/view/help.php
@@ -14,113 +14,113 @@
 
 ?>
 
-<h2><span><?php echo __('BBCode') ?></span></h2>
+<h2><span><?php _e('BBCode') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="bbcode"></a><?php echo __('BBCode info 1') ?></p>
-		<p><?php echo __('BBCode info 2') ?></p>
+		<p><a name="bbcode"></a><?php _e('BBCode info 1') ?></p>
+		<p><?php _e('BBCode info 2') ?></p>
 	</div>
 </div>
-<h2><span><?php echo __('Text style') ?></span></h2>
+<h2><span><?php _e('Text style') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Text style info') ?></p>
-		<p><code>[b]<?php echo __('Bold text') ?>[/b]</code> <?php echo __('produces') ?> <samp><strong><?php echo __('Bold text') ?></strong></samp></p>
-		<p><code>[u]<?php echo __('Underlined text') ?>[/u]</code> <?php echo __('produces') ?> <samp><span class="bbu"><?php echo __('Underlined text') ?></span></samp></p>
-		<p><code>[i]<?php echo __('Italic text') ?>[/i]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Italic text') ?></em></samp></p>
-		<p><code>[s]<?php echo __('Strike-through text') ?>[/s]</code> <?php echo __('produces') ?> <samp><span class="bbs"><?php echo __('Strike-through text') ?></span></samp></p>
-		<p><code>[del]<?php echo __('Deleted text') ?>[/del]</code> <?php echo __('produces') ?> <samp><del><?php echo __('Deleted text') ?></del></samp></p>
-		<p><code>[ins]<?php echo __('Inserted text') ?>[/ins]</code> <?php echo __('produces') ?> <samp><ins><?php echo __('Inserted text') ?></ins></samp></p>
-		<p><code>[em]<?php echo __('Emphasised text') ?>[/em]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Emphasised text') ?></em></samp></p>
-		<p><code>[color=#FF0000]<?php echo __('Red text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: #ff0000"><?php echo __('Red text') ?></span></samp></p>
-		<p><code>[color=blue]<?php echo __('Blue text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: blue"><?php echo __('Blue text') ?></span></samp></p>
-		<p><code>[h]<?php echo __('Heading text') ?>[/h]</code> <?php echo __('produces') ?></p> <div class="postmsg"><h5><?php echo __('Heading text') ?></h5></div>
+		<p><?php _e('Text style info') ?></p>
+		<p><code>[b]<?php _e('Bold text') ?>[/b]</code> <?php _e('produces') ?> <samp><strong><?php _e('Bold text') ?></strong></samp></p>
+		<p><code>[u]<?php _e('Underlined text') ?>[/u]</code> <?php _e('produces') ?> <samp><span class="bbu"><?php _e('Underlined text') ?></span></samp></p>
+		<p><code>[i]<?php _e('Italic text') ?>[/i]</code> <?php _e('produces') ?> <samp><em><?php _e('Italic text') ?></em></samp></p>
+		<p><code>[s]<?php _e('Strike-through text') ?>[/s]</code> <?php _e('produces') ?> <samp><span class="bbs"><?php _e('Strike-through text') ?></span></samp></p>
+		<p><code>[del]<?php _e('Deleted text') ?>[/del]</code> <?php _e('produces') ?> <samp><del><?php _e('Deleted text') ?></del></samp></p>
+		<p><code>[ins]<?php _e('Inserted text') ?>[/ins]</code> <?php _e('produces') ?> <samp><ins><?php _e('Inserted text') ?></ins></samp></p>
+		<p><code>[em]<?php _e('Emphasised text') ?>[/em]</code> <?php _e('produces') ?> <samp><em><?php _e('Emphasised text') ?></em></samp></p>
+		<p><code>[color=#FF0000]<?php _e('Red text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: #ff0000"><?php _e('Red text') ?></span></samp></p>
+		<p><code>[color=blue]<?php _e('Blue text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: blue"><?php _e('Blue text') ?></span></samp></p>
+		<p><code>[h]<?php _e('Heading text') ?>[/h]</code> <?php _e('produces') ?></p> <div class="postmsg"><h5><?php _e('Heading text') ?></h5></div>
 	</div>
 </div>
-<h2><span><?php echo __('Links and images') ?></span></h2>
+<h2><span><?php _e('Links and images') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php echo __('This help page') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php echo __('This help page') ?></a></samp></p>
-		<p><code>[email]myname@example.com[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
-		<p><code>[email=myname@example.com]<?php echo __('My email address') ?>[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com"><?php echo __('My email address') ?></a></samp></p>
-		<p><code>[topic=1]<?php echo __('Test topic') ?>[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test topic') ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php echo __('Test post') ?>[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo __('Test post') ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php echo __('Test forum') ?>[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test forum') ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php echo __('Test user') ?>[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo __('Test user') ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
+		<p><?php _e('Links info') ?></p>
+		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
+		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php _e('This help page') ?></a></samp></p>
+		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
+		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
+		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
 	</div>
 	<div class="inbox">
-		<p><a name="img"></a><?php echo __('Images info') ?></p>
-		<p><code>[img=<?php echo __('FluxBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php echo __('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php echo __('FluxBB bbcode test') ?>" /></samp></p>
+		<p><a name="img"></a><?php _e('Images info') ?></p>
+		<p><code>[img=<?php _e('FluxBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php _e('FluxBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
-<h2><span><?php echo __('Quotes') ?></span></h2>
+<h2><span><?php _e('Quotes') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Quotes info') ?></p>
-		<p><code>[quote=James]<?php echo __('Quote text') ?>[/quote]</code></p>
-		<p><?php echo __('produces quote box') ?></p>
+		<p><?php _e('Quotes info') ?></p>
+		<p><code>[quote=James]<?php _e('Quote text') ?>[/quote]</code></p>
+		<p><?php _e('produces quote box') ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><cite>James <?php echo __('wrote') ?></cite><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
+			<div class="quotebox"><cite>James <?php _e('wrote') ?></cite><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo __('Quotes info 2') ?></p>
-		<p><code>[quote]<?php echo __('Quote text') ?>[/quote]</code></p>
-		<p><?php echo __('produces quote box') ?></p>
+		<p><?php _e('Quotes info 2') ?></p>
+		<p><code>[quote]<?php _e('Quote text') ?>[/quote]</code></p>
+		<p><?php _e('produces quote box') ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
+			<div class="quotebox"><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo __('quote note') ?></p>
+		<p><?php _e('quote note') ?></p>
 	</div>
 </div>
-<h2><span><?php echo __('Code') ?></span></h2>
+<h2><span><?php _e('Code') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Code info') ?></p>
-		<p><code>[code]<?php echo __('Code text') ?>[/code]</code></p>
-		<p><?php echo __('produces code box') ?></p>
+		<p><?php _e('Code info') ?></p>
+		<p><code>[code]<?php _e('Code text') ?>[/code]</code></p>
+		<p><?php _e('produces code box') ?></p>
 		<div class="postmsg">
-			<div class="codebox"><pre><code><?php echo __('Code text') ?></code></pre></div>
+			<div class="codebox"><pre><code><?php _e('Code text') ?></code></pre></div>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo __('Lists') ?></span></h2>
+<h2><span><?php _e('Lists') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="lists"></a><?php echo __('List info') ?></p>
-		<p><code>[list][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php echo __('produces list') ?></span></p>
+		<p><a name="lists"></a><?php _e('List info') ?></p>
+		<p><code>[list][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php _e('produces list') ?></span></p>
 		<div class="postmsg">
-			<ul><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ul>
+			<ul><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ul>
 		</div>
-		<p><code>[list=1][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php echo __('produces decimal list') ?></span></p>
+		<p><code>[list=1][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php _e('produces decimal list') ?></span></p>
 		<div class="postmsg">
-			<ol class="decimal"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
+			<ol class="decimal"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
 		</div>
-		<p><code>[list=a][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php echo __('produces alpha list') ?></span></p>
+		<p><code>[list=a][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php _e('produces alpha list') ?></span></p>
 		<div class="postmsg">
-			<ol class="alpha"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
+			<ol class="alpha"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo __('Nested tags') ?></span></h2>
+<h2><span><?php _e('Nested tags') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Nested tags info') ?></p>
-		<p><code>[b][u]<?php echo __('Bold, underlined text') ?>[/u][/b]</code> <?php echo __('produces') ?> <samp><strong><span class="bbu"><?php echo __('Bold, underlined text') ?></span></strong></samp></p>
+		<p><?php _e('Nested tags info') ?></p>
+		<p><code>[b][u]<?php _e('Bold, underlined text') ?>[/u][/b]</code> <?php _e('produces') ?> <samp><strong><span class="bbu"><?php _e('Bold, underlined text') ?></span></strong></samp></p>
 	</div>
 </div>
-<h2><span><?php echo __('Smilies') ?></span></h2>
+<h2><span><?php _e('Smilies') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="smilies"></a><?php echo __('Smilies info') ?></p>
+		<p><a name="smilies"></a><?php _e('Smilies info') ?></p>
 <?php
 
 // Display the smiley set
diff --git a/style/FeatherBB/view/index.php b/style/FeatherBB/view/index.php
index d9d5ca64..3142e1bd 100644
--- a/style/FeatherBB/view/index.php
+++ b/style/FeatherBB/view/index.php
@@ -13,7 +13,7 @@
 }
 
 if (empty($index_data)): ?>
-    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php echo __('Empty board') ?></p></div></div></div>
+    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php _e('Empty board') ?></p></div></div></div>
 <?php endif;
 foreach ($index_data as $forum) {
     if ($forum->cid != $cur_cat) :
@@ -33,10 +33,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Forum') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Topics') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
+					<th class="tcl" scope="col"><?php _e('Forum') ?></th>
+					<th class="tc2" scope="col"><?php _e('Topics') ?></th>
+					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
+					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -80,17 +80,17 @@
 endif;
 ?>
 <div id="brdstats" class="block">
-	<h2><span><?php echo __('Board info') ?></span></h2>
+	<h2><span><?php _e('Board info') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<dl class="conr">
-				<dt><strong><?php echo __('Board stats') ?></strong></dt>
+				<dt><strong><?php _e('Board stats') ?></strong></dt>
 				<dd><span><?php printf(__('No of users'), '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
 				<dd><span><?php printf(__('No of topics'), '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
 				<dd><span><?php printf(__('No of posts'), '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
 			</dl>
 			<dl class="conl">
-				<dt><strong><?php echo __('User info') ?></strong></dt>
+				<dt><strong><?php _e('User info') ?></strong></dt>
 				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
 				<?php if ($feather_config['o_users_online'] == 1) : ?>
 				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
diff --git a/style/FeatherBB/view/login/form.php b/style/FeatherBB/view/login/form.php
index fb8f2404..13d1744b 100644
--- a/style/FeatherBB/view/login/form.php
+++ b/style/FeatherBB/view/login/form.php
@@ -14,29 +14,29 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Login') ?></span></h2>
+	<h2><span><?php _e('Login') ?></span></h2>
 	<div class="box">
 		<form id="login" method="post" action="<?php echo get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Login legend') ?></legend>
+					<legend><?php _e('Login legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="conl required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
-						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
+						<label class="conl required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
+						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
 
 						<div class="rbox clearb">
-							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo __('Remember me') ?><br /></label>
+							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php _e('Remember me') ?><br /></label>
 						</div>
 
-						<p class="clearb"><?php echo __('Login info') ?></p>
-						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php echo __('Not registered') ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php echo __('Forgotten pass') ?></a></span></p>
+						<p class="clearb"><?php _e('Login info') ?></p>
+						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="login" value="<?php echo __('Login') ?>" tabindex="4" /></p>
+			<p class="buttons"><input type="submit" name="login" value="<?php _e('Login') ?>" tabindex="4" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/login/password_forgotten.php b/style/FeatherBB/view/login/password_forgotten.php
index 979b915c..41c0a121 100644
--- a/style/FeatherBB/view/login/password_forgotten.php
+++ b/style/FeatherBB/view/login/password_forgotten.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo __('New password errors') ?></span></h2>
+	<h2><span><?php _e('New password errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo __('New passworderrors info') ?></p>
+			<p><?php _e('New passworderrors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,21 +37,21 @@
 }
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Request pass') ?></span></h2>
+	<h2><span><?php _e('Request pass') ?></span></h2>
 	<div class="box">
 		<form id="request_pass" method="post" action="<?php echo get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Request pass legend') ?></legend>
+					<legend><?php _e('Request pass legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
-						<p><?php echo __('Request pass info') ?></p>
+						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
+						<p><?php _e('Request pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="request_pass" value="<?php echo __('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a><?php endif; ?></p>
+			<p class="buttons"><input type="submit" name="request_pass" value="<?php _e('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a><?php endif; ?></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/message.php b/style/FeatherBB/view/message.php
index d376bd09..740b040e 100644
--- a/style/FeatherBB/view/message.php
+++ b/style/FeatherBB/view/message.php
@@ -14,11 +14,11 @@
 
 ?>
 <div id="msg" class="block">
-	<h2><span><?php echo __('Info') ?></span></h2>
+	<h2><span><?php _e('Info') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<p><?php echo $message ?></p>
-<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php echo __('Go back') ?></a></p>
+<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php _e('Go back') ?></a></p>
 <?php endif;
     ?>		</div>
 	</div>
diff --git a/style/FeatherBB/view/misc/email.php b/style/FeatherBB/view/misc/email.php
index 7004040d..eb44dafb 100644
--- a/style/FeatherBB/view/misc/email.php
+++ b/style/FeatherBB/view/misc/email.php
@@ -14,24 +14,24 @@
 
 ?>
 <div id="emailform" class="blockform">
-	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
+	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="<?php echo get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write email') ?></legend>
+					<legend><?php _e('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo __('Email disclosure note') ?></p>
+						<p><?php _e('Email disclosure note') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/misc/report.php b/style/FeatherBB/view/misc/report.php
index 121feac2..252042c7 100644
--- a/style/FeatherBB/view/misc/report.php
+++ b/style/FeatherBB/view/misc/report.php
@@ -16,29 +16,29 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Report post') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div id="reportform" class="blockform">
-	<h2><span><?php echo __('Report post') ?></span></h2>
+	<h2><span><?php _e('Report post') ?></span></h2>
 	<div class="box">
 		<form id="report" method="post" action="<?php echo get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Reason desc') ?></legend>
+					<legend><?php _e('Reason desc') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('Reason') ?> <span><?php echo __('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
+						<label class="required"><strong><?php _e('Reason') ?> <span><?php _e('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/misc/rules.php b/style/FeatherBB/view/misc/rules.php
index d32a805e..366880ee 100644
--- a/style/FeatherBB/view/misc/rules.php
+++ b/style/FeatherBB/view/misc/rules.php
@@ -14,7 +14,7 @@
 
 ?>
 <div id="rules" class="block">
-	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
+	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<div id="rules-block" class="inbox">
 			<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
diff --git a/style/FeatherBB/view/moderate/delete_posts.php b/style/FeatherBB/view/moderate/delete_posts.php
index 4b95a5f1..00b80920 100644
--- a/style/FeatherBB/view/moderate/delete_posts.php
+++ b/style/FeatherBB/view/moderate/delete_posts.php
@@ -14,20 +14,20 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Delete posts') ?></span></h2>
+	<h2><span><?php _e('Delete posts') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm delete legend') ?></legend>
+					<legend><?php _e('Confirm delete legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<p><?php echo __('Delete posts comply') ?></p>
+						<p><?php _e('Delete posts comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/delete_topics.php b/style/FeatherBB/view/moderate/delete_topics.php
index e414f734..d0ab1eed 100644
--- a/style/FeatherBB/view/moderate/delete_topics.php
+++ b/style/FeatherBB/view/moderate/delete_topics.php
@@ -15,20 +15,20 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('Delete topics') ?></span></h2>
+	<h2><span><?php _e('Delete topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm delete legend') ?></legend>
+					<legend><?php _e('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Delete topics comply') ?></p>
+						<p><?php _e('Delete topics comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/merge_topics.php b/style/FeatherBB/view/moderate/merge_topics.php
index b55f586b..820cedee 100644
--- a/style/FeatherBB/view/moderate/merge_topics.php
+++ b/style/FeatherBB/view/moderate/merge_topics.php
@@ -15,22 +15,22 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('Merge topics') ?></span></h2>
+	<h2><span><?php _e('Merge topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm merge legend') ?></legend>
+					<legend><?php _e('Confirm merge legend') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1" /><?php echo __('Leave redirect') ?><br /></label>
+							<label><input type="checkbox" name="with_redirect" value="1" /><?php _e('Leave redirect') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo __('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php _e('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/moderator_forum.php b/style/FeatherBB/view/moderate/moderator_forum.php
index bf893ce4..35b67b41 100644
--- a/style/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/FeatherBB/view/moderate/moderator_forum.php
@@ -17,9 +17,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -38,11 +38,11 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
-<?php endif; ?>					<th class="tcr"><?php echo __('Last post') ?></th>
-					<th class="tcmod" scope="col"><?php echo __('Select') ?></th>
+					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
+					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php endif; ?>					<th class="tcr"><?php _e('Last post') ?></th>
+					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -87,13 +87,13 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php echo __('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php echo __('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php echo __('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php echo __('Close') ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php _e('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php _e('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php _e('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php _e('Close') ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/style/FeatherBB/view/moderate/move_topics.php b/style/FeatherBB/view/moderate/move_topics.php
index 389f1f05..e72ae5cb 100644
--- a/style/FeatherBB/view/moderate/move_topics.php
+++ b/style/FeatherBB/view/moderate/move_topics.php
@@ -22,9 +22,9 @@
 			<div class="inform">
 			<input type="hidden" name="topics" value="<?php echo $topics ?>" />
 				<fieldset>
-					<legend><?php echo __('Move legend') ?></legend>
+					<legend><?php _e('Move legend') ?></legend>
 					<div class="infldset">
-						<label><?php echo __('Move to') ?>
+						<label><?php _e('Move to') ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
@@ -33,12 +33,12 @@
 						<div class="rbox">
 							<label><input type="checkbox" name="with_redirect" value="1"<?php if ($action == 'single') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Leave redirect') ?><br /></label>
+} ?> /><?php _e('Leave redirect') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo __('Move') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php _e('Move') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/posts_view.php b/style/FeatherBB/view/moderate/posts_view.php
index f957ce8f..482a1c49 100644
--- a/style/FeatherBB/view/moderate/posts_view.php
+++ b/style/FeatherBB/view/moderate/posts_view.php
@@ -16,10 +16,10 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -53,7 +53,7 @@
 						</dl>
 					</div>
 					<div class="postright">
-						<h3 class="nosize"><?php echo __('Message') ?></h3>
+						<h3 class="nosize"><?php _e('Message') ?></h3>
 						<div class="postmsg">
 							<?php echo $post['message']."\n" ?>
 	<?php if ($post['edited'] != '') {
@@ -80,14 +80,14 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php echo __('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php _e('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/style/FeatherBB/view/moderate/split_posts.php b/style/FeatherBB/view/moderate/split_posts.php
index ac012ff3..7c59b0b9 100644
--- a/style/FeatherBB/view/moderate/split_posts.php
+++ b/style/FeatherBB/view/moderate/split_posts.php
@@ -14,27 +14,27 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Split posts') ?></span></h2>
+	<h2><span><?php _e('Split posts') ?></span></h2>
 	<div class="box">
 		<form id="subject" method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm split legend') ?></legend>
+					<legend><?php _e('Confirm split legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<label class="required"><strong><?php echo __('New subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
-						<label><?php echo __('Move to') ?>
+						<label class="required"><strong><?php _e('New subject') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
+						<label><?php _e('Move to') ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
 						</select>
 						<br /></label>
-						<p><?php echo __('Split posts comply') ?></p>
+						<p><?php _e('Split posts comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo __('Split') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php _e('Split') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/post.php b/style/FeatherBB/view/post.php
index 0c341fd0..fbfd6840 100644
--- a/style/FeatherBB/view/post.php
+++ b/style/FeatherBB/view/post.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
@@ -33,10 +33,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo __('Post errors') ?></span></h2>
+	<h2><span><?php _e('Post errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo __('Post errors info') ?></p>
+			<p><?php _e('Post errors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -57,7 +57,7 @@
 
     ?>
 <div id="postpreview" class="blockpost">
-	<h2><span><?php echo __('Post preview') ?></span></h2>
+	<h2><span><?php _e('Post preview') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -93,7 +93,7 @@
 		<?php echo $form."\n" ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write message legend') ?></legend>
+					<legend><?php _e('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
                                                 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -102,7 +102,7 @@
     $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
     $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
-						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
+						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
     echo feather_escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
@@ -115,17 +115,17 @@
 
 }
 if ($fid): ?>
-						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
+						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
     echo feather_escape($post['subject']);
 } ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -135,7 +135,7 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Options') ?></legend>
+					<legend><?php _e('Options') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
@@ -151,14 +151,14 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Robot title') ?></legend>
+					<legend><?php _e('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Robot info')    ?></p>
+						<p><?php _e('Robot info')    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
                              $qencoded = md5($question[$index_questions]);
                              echo sprintf(__('Robot question'), $question[$index_questions]);?>
-							 <span><?php echo __('Required') ?></span></strong>
+							 <span><?php _e('Required') ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -166,7 +166,7 @@
 				</fieldset>
 			</div>
 			<?php endif; ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
@@ -176,7 +176,7 @@
 if ($tid && $feather_config['o_topic_review'] != '0') :
 ?>
 <div id="postreview">
-	<h2><span><?php echo __('Topic review') ?></span></h2>
+	<h2><span><?php _e('Topic review') ?></span></h2>
 
 	<?php
     // Set background switching on
diff --git a/style/FeatherBB/view/profile/change_mail.php b/style/FeatherBB/view/profile/change_mail.php
index de0f8d3b..f8d25e99 100644
--- a/style/FeatherBB/view/profile/change_mail.php
+++ b/style/FeatherBB/view/profile/change_mail.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Change email') ?></span></h2>
+	<h2><span><?php _e('Change email') ?></span></h2>
 	<div class="box">
 		<form id="change_email" method="post" action="<?php echo get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Email legend') ?></legend>
+					<legend><?php _e('Email legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('New email') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
-						<label class="required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
-						<p><?php echo __('Email instructions') ?></p>
+						<label class="required"><strong><?php _e('New email') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
+						<label class="required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
+						<p><?php _e('Email instructions') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="new_email" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="new_email" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/change_pass.php b/style/FeatherBB/view/profile/change_pass.php
index 0f0ab452..3f4285fb 100644
--- a/style/FeatherBB/view/profile/change_pass.php
+++ b/style/FeatherBB/view/profile/change_pass.php
@@ -14,26 +14,26 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Change pass') ?></span></h2>
+	<h2><span><?php _e('Change pass') ?></span></h2>
 	<div class="box">
 		<form id="change_pass" method="post" action="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
 				<fieldset>
-					<legend><?php echo __('Change pass legend') ?></legend>
+					<legend><?php _e('Change pass legend') ?></legend>
 					<div class="infldset">
-<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo __('Old pass') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php _e('Old pass') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="password" name="req_old_password" size="16" /><br /></label>
-<?php endif; ?>						<label class="conl required"><strong><?php echo __('New pass') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php endif; ?>						<label class="conl required"><strong><?php _e('New pass') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password1" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo __('Confirm new pass') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="conl required"><strong><?php _e('Confirm new pass') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password2" size="16" /><br /></label>
-						<p class="clearb"><?php echo __('Pass info') ?></p>
+						<p class="clearb"><?php _e('Pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/delete_user.php b/style/FeatherBB/view/profile/delete_user.php
index d5d5bde2..0fd42f52 100644
--- a/style/FeatherBB/view/profile/delete_user.php
+++ b/style/FeatherBB/view/profile/delete_user.php
@@ -14,23 +14,23 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Confirm delete user') ?></span></h2>
+	<h2><span><?php _e('Confirm delete user') ?></span></h2>
 	<div class="box">
 		<form id="confirm_del_user" method="post" action="<?php echo get_link('user/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm delete legend') ?></legend>
+					<legend><?php _e('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Confirmation info').' <strong>'.feather_escape($username).'</strong>.' ?></p>
+						<p><?php _e('Confirmation info').' <strong>'.feather_escape($username).'</strong>.' ?></p>
 						<div class="rbox">
-							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo __('Delete posts') ?><br /></label>
+							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
 						</div>
-						<p class="warntext"><strong><?php echo __('Delete warning') ?></strong></p>
+						<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/menu.php b/style/FeatherBB/view/profile/menu.php
index e78d2c30..4627f8db 100644
--- a/style/FeatherBB/view/profile/menu.php
+++ b/style/FeatherBB/view/profile/menu.php
@@ -15,39 +15,39 @@
 ?>
 <div id="profile" class="block2col">
 	<div class="blockmenu">
-		<h2><span><?php echo __('Profile menu') ?></span></h2>
+		<h2><span><?php _e('Profile menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'essentials') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php echo __('Section essentials') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
 					<li<?php if ($page == 'personal') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php echo __('Section personal') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
 					<li<?php if ($page == 'messaging') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php echo __('Section messaging') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
 <?php if ($feather_config['o_avatars'] == '1' || $feather_config['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php echo __('Section personality') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
 <?php endif;
     ?>					<li<?php if ($page == 'display') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php echo __('Section display') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
 					<li<?php if ($page == 'privacy') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php echo __('Section privacy') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
 <?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php echo __('Section admin') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
diff --git a/style/FeatherBB/view/profile/section_admin.php b/style/FeatherBB/view/profile/section_admin.php
index 52a0ad54..18ba2f12 100644
--- a/style/FeatherBB/view/profile/section_admin.php
+++ b/style/FeatherBB/view/profile/section_admin.php
@@ -25,9 +25,9 @@
 
         if ($feather->user->g_moderator == '1') {
             ?>
-						<legend><?php echo __('Delete ban legend') ?></legend>
+						<legend><?php _e('Delete ban legend') ?></legend>
 						<div class="infldset">
-							<p><input type="submit" name="ban" value="<?php echo __('Ban user') ?>" /></p>
+							<p><input type="submit" name="ban" value="<?php _e('Ban user') ?>" /></p>
 						</div>
 					</fieldset>
 				</div>
@@ -36,12 +36,12 @@
         } else {
             if ($feather->user->id != $id) {
                 ?>
-						<legend><?php echo __('Group membership legend') ?></legend>
+						<legend><?php _e('Group membership legend') ?></legend>
 						<div class="infldset">
 							<select id="group_id" name="group_id">
                                                             <?php echo $group_list ?>
 							</select>
-							<input type="submit" name="update_group_membership" value="<?php echo __('Save') ?>" />
+							<input type="submit" name="update_group_membership" value="<?php _e('Save') ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -52,9 +52,9 @@
             }
 
             ?>
-						<legend><?php echo __('Delete ban legend') ?></legend>
+						<legend><?php _e('Delete ban legend') ?></legend>
 						<div class="infldset">
-							<input type="submit" name="delete_user" value="<?php echo __('Delete user') ?>" /> <input type="submit" name="ban" value="<?php echo __('Ban user') ?>" />
+							<input type="submit" name="delete_user" value="<?php _e('Delete user') ?>" /> <input type="submit" name="ban" value="<?php _e('Ban user') ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -64,13 +64,13 @@
                 ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Set mods legend') ?></legend>
+						<legend><?php _e('Set mods legend') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Moderator in info') ?></p>
+							<p><?php _e('Moderator in info') ?></p>
                                                         <?php echo $forum_list ?>
 								</div>
 							</div>
-							<br class="clearb" /><input type="submit" name="update_forums" value="<?php echo __('Update forums') ?>" />
+							<br class="clearb" /><input type="submit" name="update_forums" value="<?php _e('Update forums') ?>" />
 						</div>
 					</fieldset>
 				</div>
diff --git a/style/FeatherBB/view/profile/section_display.php b/style/FeatherBB/view/profile/section_display.php
index 506dd146..5da0f4b4 100644
--- a/style/FeatherBB/view/profile/section_display.php
+++ b/style/FeatherBB/view/profile/section_display.php
@@ -30,9 +30,9 @@
         ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Style legend') ?></legend>
+					<legend><?php _e('Style legend') ?></legend>
 					<div class="infldset">
-						<label><?php echo __('Styles') ?><br />
+						<label><?php _e('Styles') ?><br />
 						<select name="form_style">
 <?php
 
@@ -58,25 +58,25 @@
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1' || $feather_config['o_signatures'] == '1' || $feather_config['o_avatars'] == '1' || ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1')): ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Post display legend') ?></legend>
+					<legend><?php _e('Post display legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Post display info') ?></p>
+						<p><?php _e('Post display info') ?></p>
 						<div class="rbox">
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show smilies') ?><br /></label>
+} ?> /><?php _e('Show smilies') ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show sigs') ?><br /></label>
+} ?> /><?php _e('Show sigs') ?><br /></label>
 <?php endif; if ($feather_config['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show avatars') ?><br /></label>
+} ?> /><?php _e('Show avatars') ?><br /></label>
 <?php endif; if ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show images') ?><br /></label>
+} ?> /><?php _e('Show images') ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1' && $feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show images sigs') ?><br /></label>
+} ?> /><?php _e('Show images sigs') ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
@@ -85,15 +85,15 @@
 <?php endif; ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Pagination legend') ?></legend>
+					<legend><?php _e('Pagination legend') ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo __('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
-						<label class="conl"><?php echo __('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
-						<p class="clearb"><?php echo __('Paginate info') ?> <?php echo __('Leave blank') ?></p>
+						<label class="conl"><?php _e('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
+						<label class="conl"><?php _e('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
+						<p class="clearb"><?php _e('Paginate info') ?> <?php _e('Leave blank') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_essentials.php b/style/FeatherBB/view/profile/section_essentials.php
index 4f507a8c..0050f89c 100644
--- a/style/FeatherBB/view/profile/section_essentials.php
+++ b/style/FeatherBB/view/profile/section_essentials.php
@@ -20,17 +20,17 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Username and pass legend') ?></legend>
+					<legend><?php _e('Username and pass legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php echo __('Change pass') ?></a></span></p>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Email legend') ?></legend>
+					<legend><?php _e('Email legend') ?></legend>
 					<div class="infldset">
 						<?php echo $user_disp['email_field'] ?>
 					</div>
@@ -38,139 +38,139 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Localisation legend') ?></legend>
+					<legend><?php _e('Localisation legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Time zone info') ?></p>
-						<label><?php echo __('Time zone')."\n" ?>
+						<p><?php _e('Time zone info') ?></p>
+						<label><?php _e('Time zone')."\n" ?>
 						<br /><select name="form_timezone">
 							<option value="-12"<?php if ($user['timezone'] == -12) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-12:00') ?></option>
+} ?>><?php _e('UTC-12:00') ?></option>
 							<option value="-11"<?php if ($user['timezone'] == -11) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-11:00') ?></option>
+} ?>><?php _e('UTC-11:00') ?></option>
 							<option value="-10"<?php if ($user['timezone'] == -10) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-10:00') ?></option>
+} ?>><?php _e('UTC-10:00') ?></option>
 							<option value="-9.5"<?php if ($user['timezone'] == -9.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-09:30') ?></option>
+} ?>><?php _e('UTC-09:30') ?></option>
 							<option value="-9"<?php if ($user['timezone'] == -9) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-09:00') ?></option>
+} ?>><?php _e('UTC-09:00') ?></option>
 							<option value="-8.5"<?php if ($user['timezone'] == -8.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-08:30') ?></option>
+} ?>><?php _e('UTC-08:30') ?></option>
 							<option value="-8"<?php if ($user['timezone'] == -8) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-08:00') ?></option>
+} ?>><?php _e('UTC-08:00') ?></option>
 							<option value="-7"<?php if ($user['timezone'] == -7) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-07:00') ?></option>
+} ?>><?php _e('UTC-07:00') ?></option>
 							<option value="-6"<?php if ($user['timezone'] == -6) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-06:00') ?></option>
+} ?>><?php _e('UTC-06:00') ?></option>
 							<option value="-5"<?php if ($user['timezone'] == -5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-05:00') ?></option>
+} ?>><?php _e('UTC-05:00') ?></option>
 							<option value="-4"<?php if ($user['timezone'] == -4) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-04:00') ?></option>
+} ?>><?php _e('UTC-04:00') ?></option>
 							<option value="-3.5"<?php if ($user['timezone'] == -3.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-03:30') ?></option>
+} ?>><?php _e('UTC-03:30') ?></option>
 							<option value="-3"<?php if ($user['timezone'] == -3) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-03:00') ?></option>
+} ?>><?php _e('UTC-03:00') ?></option>
 							<option value="-2"<?php if ($user['timezone'] == -2) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-02:00') ?></option>
+} ?>><?php _e('UTC-02:00') ?></option>
 							<option value="-1"<?php if ($user['timezone'] == -1) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-01:00') ?></option>
+} ?>><?php _e('UTC-01:00') ?></option>
 							<option value="0"<?php if ($user['timezone'] == 0) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC') ?></option>
+} ?>><?php _e('UTC') ?></option>
 							<option value="1"<?php if ($user['timezone'] == 1) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+01:00') ?></option>
+} ?>><?php _e('UTC+01:00') ?></option>
 							<option value="2"<?php if ($user['timezone'] == 2) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+02:00') ?></option>
+} ?>><?php _e('UTC+02:00') ?></option>
 							<option value="3"<?php if ($user['timezone'] == 3) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+03:00') ?></option>
+} ?>><?php _e('UTC+03:00') ?></option>
 							<option value="3.5"<?php if ($user['timezone'] == 3.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+03:30') ?></option>
+} ?>><?php _e('UTC+03:30') ?></option>
 							<option value="4"<?php if ($user['timezone'] == 4) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+04:00') ?></option>
+} ?>><?php _e('UTC+04:00') ?></option>
 							<option value="4.5"<?php if ($user['timezone'] == 4.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+04:30') ?></option>
+} ?>><?php _e('UTC+04:30') ?></option>
 							<option value="5"<?php if ($user['timezone'] == 5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:00') ?></option>
+} ?>><?php _e('UTC+05:00') ?></option>
 							<option value="5.5"<?php if ($user['timezone'] == 5.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:30') ?></option>
+} ?>><?php _e('UTC+05:30') ?></option>
 							<option value="5.75"<?php if ($user['timezone'] == 5.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:45') ?></option>
+} ?>><?php _e('UTC+05:45') ?></option>
 							<option value="6"<?php if ($user['timezone'] == 6) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+06:00') ?></option>
+} ?>><?php _e('UTC+06:00') ?></option>
 							<option value="6.5"<?php if ($user['timezone'] == 6.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+06:30') ?></option>
+} ?>><?php _e('UTC+06:30') ?></option>
 							<option value="7"<?php if ($user['timezone'] == 7) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+07:00') ?></option>
+} ?>><?php _e('UTC+07:00') ?></option>
 							<option value="8"<?php if ($user['timezone'] == 8) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+08:00') ?></option>
+} ?>><?php _e('UTC+08:00') ?></option>
 							<option value="8.75"<?php if ($user['timezone'] == 8.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+08:45') ?></option>
+} ?>><?php _e('UTC+08:45') ?></option>
 							<option value="9"<?php if ($user['timezone'] == 9) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+09:00') ?></option>
+} ?>><?php _e('UTC+09:00') ?></option>
 							<option value="9.5"<?php if ($user['timezone'] == 9.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+09:30') ?></option>
+} ?>><?php _e('UTC+09:30') ?></option>
 							<option value="10"<?php if ($user['timezone'] == 10) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+10:00') ?></option>
+} ?>><?php _e('UTC+10:00') ?></option>
 							<option value="10.5"<?php if ($user['timezone'] == 10.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+10:30') ?></option>
+} ?>><?php _e('UTC+10:30') ?></option>
 							<option value="11"<?php if ($user['timezone'] == 11) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+11:00') ?></option>
+} ?>><?php _e('UTC+11:00') ?></option>
 							<option value="11.5"<?php if ($user['timezone'] == 11.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+11:30') ?></option>
+} ?>><?php _e('UTC+11:30') ?></option>
 							<option value="12"<?php if ($user['timezone'] == 12) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+12:00') ?></option>
+} ?>><?php _e('UTC+12:00') ?></option>
 							<option value="12.75"<?php if ($user['timezone'] == 12.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+12:45') ?></option>
+} ?>><?php _e('UTC+12:45') ?></option>
 							<option value="13"<?php if ($user['timezone'] == 13) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+13:00') ?></option>
+} ?>><?php _e('UTC+13:00') ?></option>
 							<option value="14"<?php if ($user['timezone'] == 14) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+14:00') ?></option>
+} ?>><?php _e('UTC+14:00') ?></option>
 						</select>
 						<br /></label>
 						<div class="rbox">
 							<label><input type="checkbox" name="form_dst" value="1"<?php if ($user['dst'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('DST') ?><br /></label>
+} ?> /><?php _e('DST') ?><br /></label>
 						</div>
-						<label><?php echo __('Time format') ?>
+						<label><?php _e('Time format') ?>
 
 						<br /><select name="form_time_format">
 <?php
@@ -188,7 +188,7 @@
                             ?>
 						</select>
 						<br /></label>
-						<label><?php echo __('Date format') ?>
+						<label><?php _e('Date format') ?>
 
 						<br /><select name="form_date_format">
 <?php
@@ -214,7 +214,7 @@
     // Only display the language selection box if there's more than one language available
     if (count($languages) > 1) {
         ?>
-						<label><?php echo __('Language') ?>
+						<label><?php _e('Language') ?>
 						<br /><select name="form_language">
 <?php
 
@@ -239,18 +239,18 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('User activity') ?></legend>
+					<legend><?php _e('User activity') ?></legend>
 					<div class="infldset">
 						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
 						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
 						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
-<?php if ($feather->user->is_admmod): ?>							<label><?php echo __('Admin note') ?><br />
+<?php if ($feather->user->is_admmod): ?>							<label><?php _e('Admin note') ?><br />
 						<input id="admin_note" type="text" name="admin_note" value="<?php echo feather_escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_messaging.php b/style/FeatherBB/view/profile/section_messaging.php
index 148a78cf..d944ee43 100644
--- a/style/FeatherBB/view/profile/section_messaging.php
+++ b/style/FeatherBB/view/profile/section_messaging.php
@@ -20,18 +20,18 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Contact details legend') ?></legend>
+					<legend><?php _e('Contact details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo __('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
-						<label><?php echo __('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php echo __('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php echo __('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php echo __('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
+						<label><?php _e('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
+						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
+						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_personal.php b/style/FeatherBB/view/profile/section_personal.php
index 7358bc85..a765e0aa 100644
--- a/style/FeatherBB/view/profile/section_personal.php
+++ b/style/FeatherBB/view/profile/section_personal.php
@@ -20,18 +20,18 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Personal details legend') ?></legend>
+					<legend><?php _e('Personal details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo __('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
+						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
 <?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php echo __('Location') ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php echo __('Website') ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_personality.php b/style/FeatherBB/view/profile/section_personality.php
index 9bd9440b..3624e5e6 100644
--- a/style/FeatherBB/view/profile/section_personality.php
+++ b/style/FeatherBB/view/profile/section_personality.php
@@ -21,34 +21,34 @@
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php if ($feather_config['o_avatars'] == '1'): ?>				<div class="inform">
 				<fieldset id="profileavatar">
-					<legend><?php echo __('Avatar legend') ?></legend>
+					<legend><?php _e('Avatar legend') ?></legend>
 					<div class="infldset">
 <?php if ($user_avatar): ?>							<div class="useravatar"><?php echo $user_avatar ?></div>
-<?php endif; ?>							<p><?php echo __('Avatar info') ?></p>
+<?php endif; ?>							<p><?php _e('Avatar info') ?></p>
 						<p class="clearb actions"><?php echo $avatar_field ?></p>
 					</div>
 				</fieldset>
 			</div>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Signature legend') ?></legend>
+					<legend><?php _e('Signature legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Signature info') ?></p>
+						<p><?php _e('Signature info') ?></p>
 						<div class="txtarea">
 							<label><?php printf(__('Sig max size'), forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/section_privacy.php b/style/FeatherBB/view/profile/section_privacy.php
index 6c1ab357..36930415 100644
--- a/style/FeatherBB/view/profile/section_privacy.php
+++ b/style/FeatherBB/view/profile/section_privacy.php
@@ -20,41 +20,41 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Privacy options legend') ?></legend>
+					<legend><?php _e('Privacy options legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<p><?php echo __('Email setting info') ?></p>
+						<p><?php _e('Email setting info') ?></p>
 						<div class="rbox">
 							<label><input type="radio" name="form_email_setting" value="0"<?php if ($user['email_setting'] == '0') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Email setting 1') ?><br /></label>
+} ?> /><?php _e('Email setting 1') ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="1"<?php if ($user['email_setting'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Email setting 2') ?><br /></label>
+} ?> /><?php _e('Email setting 2') ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="2"<?php if ($user['email_setting'] == '2') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Email setting 3') ?><br /></label>
+} ?> /><?php _e('Email setting 3') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
 <?php if ($feather_config['o_forum_subscriptions'] == '1' || $feather_config['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Subscription legend') ?></legend>
+					<legend><?php _e('Subscription legend') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Notify full') ?><br /></label>
+} ?> /><?php _e('Notify full') ?><br /></label>
 <?php if ($feather_config['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Auto notify full') ?><br /></label>
+} ?> /><?php _e('Auto notify full') ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/style/FeatherBB/view/profile/upload_avatar.php b/style/FeatherBB/view/profile/upload_avatar.php
index 3f74f092..4131569c 100644
--- a/style/FeatherBB/view/profile/upload_avatar.php
+++ b/style/FeatherBB/view/profile/upload_avatar.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Upload avatar') ?></span></h2>
+	<h2><span><?php _e('Upload avatar') ?></span></h2>
 	<div class="box">
 		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Upload avatar legend') ?></legend>
+					<legend><?php _e('Upload avatar legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-						<label class="required"><strong><?php echo __('File') ?> <span><?php echo __('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php echo __('Avatar desc').' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.__('bytes').' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
+						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
+						<p><?php _e('Avatar desc').' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.__('bytes').' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="upload" value="<?php echo __('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="upload" value="<?php _e('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/view_profile.php b/style/FeatherBB/view/profile/view_profile.php
index ad1c5959..d30181fd 100644
--- a/style/FeatherBB/view/profile/view_profile.php
+++ b/style/FeatherBB/view/profile/view_profile.php
@@ -14,12 +14,12 @@
 
 ?>
 <div id="viewprofile" class="block">
-	<h2><span><?php echo __('Profile') ?></span></h2>
+	<h2><span><?php _e('Profile') ?></span></h2>
 	<div class="box">
 		<div class="fakeform">
 			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('Section personal') ?></legend>
+				<legend><?php _e('Section personal') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personal'])."\n" ?>
@@ -30,7 +30,7 @@
 			</div>
 <?php if (!empty($user_info['messaging'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('Section messaging') ?></legend>
+				<legend><?php _e('Section messaging') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['messaging'])."\n" ?>
@@ -41,7 +41,7 @@
 			</div>
 <?php endif; if (!empty($user_info['personality'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('Section personality') ?></legend>
+				<legend><?php _e('Section personality') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personality'])."\n" ?>
@@ -52,7 +52,7 @@
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('User activity') ?></legend>
+				<legend><?php _e('User activity') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['activity'])."\n" ?>
diff --git a/style/FeatherBB/view/register/email.php b/style/FeatherBB/view/register/email.php
index 9f9b3424..e26ad690 100644
--- a/style/FeatherBB/view/register/email.php
+++ b/style/FeatherBB/view/register/email.php
@@ -15,25 +15,25 @@
 ?>
 
 <div id="emailform" class="blockform">
-	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($recipient) ?></span></h2>
+	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($recipient) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write email') ?></legend>
+					<legend><?php _e('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo __('Email disclosure note') ?></p>
+						<p><?php _e('Email disclosure note') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/register/form.php b/style/FeatherBB/view/register/form.php
index fa2d2457..f1a360ef 100644
--- a/style/FeatherBB/view/register/form.php
+++ b/style/FeatherBB/view/register/form.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo __('Registration errors') ?></span></h2>
+	<h2><span><?php _e('Registration errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo __('Registration errors info') ?></p>
+			<p><?php _e('Registration errors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,23 +37,23 @@
 }
 ?>
 <div id="regform" class="blockform">
-	<h2><span><?php echo __('Register') ?></span></h2>
+	<h2><span><?php _e('Register') ?></span></h2>
 	<div class="box">
 		<form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
 		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><?php echo __('Important information') ?></h3>
-					<p><?php echo __('Desc 1') ?></p>
-					<p><?php echo __('Desc 2') ?></p>
+					<h3><?php _e('Important information') ?></h3>
+					<p><?php _e('Desc 1') ?></p>
+					<p><?php _e('Desc 2') ?></p>
 				</div>
 				<fieldset>
-					<legend><?php echo __('Username legend') ?></legend>
+					<legend><?php _e('Username legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="username" value="" />
 						<input type="hidden" name="password" value="" />
-						<label class="required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
+						<label class="required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
     echo feather_escape($feather->request->post('req_user'));
 } ?>" size="25" maxlength="25" /><br /></label>
 					</div>
@@ -61,15 +61,15 @@
 			</div>
 <?php if ($feather_config['o_regs_verify'] == '0'): ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Pass legend') ?></legend>
+					<legend><?php _e('Pass legend') ?></legend>
 					<div class="infldset">
-						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
+						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
     echo feather_escape($feather->request->post('req_password1'));
 } ?>" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo __('Confirm pass') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
+						<label class="conl required"><strong><?php _e('Confirm pass') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
     echo feather_escape($feather->request->post('req_password2'));
 } ?>" size="16" /><br /></label>
-						<p class="clearb"><?php echo __('Pass info') ?></p>
+						<p class="clearb"><?php _e('Pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
@@ -77,12 +77,12 @@
 				<fieldset>
 					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo __('Email info') ?></p>
-<?php endif; ?>						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
+<?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
     echo feather_escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo __('Confirm email') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
     echo feather_escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
@@ -95,9 +95,9 @@
             ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Localisation legend') ?></legend>
+					<legend><?php _e('Localisation legend') ?></legend>
 					<div class="infldset">
-							<label><?php echo __('Language') ?>
+							<label><?php _e('Language') ?>
 							<br /><select name="language">
 <?php
 
@@ -121,14 +121,14 @@
 ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Robot title') ?></legend>
+					<legend><?php _e('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Robot info')    ?></p>
-						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php echo __('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
+						<p><?php _e('Robot info')    ?></p>
+						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php _e('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="register" value="<?php echo __('Register') ?>" /></p>
+			<p class="buttons"><input type="submit" name="register" value="<?php _e('Register') ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/register/rules.php b/style/FeatherBB/view/register/rules.php
index 3a2fd06c..cef62405 100644
--- a/style/FeatherBB/view/register/rules.php
+++ b/style/FeatherBB/view/register/rules.php
@@ -15,18 +15,18 @@
 ?>
 
 <div id="rules" class="blockform">
-	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
+	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<form method="get" action="<?php echo get_link('register/') ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Rules legend') ?></legend>
+					<legend><?php _e('Rules legend') ?></legend>
 					<div class="infldset">
 						<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="agree" value="<?php echo __('Agree') ?>" /> <input type="submit" name="cancel" value="<?php echo __('Cancel') ?>" /></p>
+			<p class="buttons"><input type="submit" name="agree" value="<?php _e('Agree') ?>" /> <input type="submit" name="cancel" value="<?php _e('Cancel') ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/footer.php b/style/FeatherBB/view/search/footer.php
index a64e1cdf..a73ed5aa 100644
--- a/style/FeatherBB/view/search/footer.php
+++ b/style/FeatherBB/view/search/footer.php
@@ -30,7 +30,7 @@
 			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
diff --git a/style/FeatherBB/view/search/form.php b/style/FeatherBB/view/search/form.php
index bb39c614..4731b068 100644
--- a/style/FeatherBB/view/search/form.php
+++ b/style/FeatherBB/view/search/form.php
@@ -14,66 +14,66 @@
 ?>
 
 <div id="searchform" class="blockform">
-	<h2><span><?php echo __('Search') ?></span></h2>
+	<h2><span><?php _e('Search') ?></span></h2>
 	<div class="box">
 		<form id="search" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Search criteria legend') ?></legend>
+					<legend><?php _e('Search criteria legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="action" value="search" />
-						<label class="conl"><?php echo __('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
-						<label class="conl"><?php echo __('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
-						<p class="clearb"><?php echo __('Search info') ?></p>
+						<label class="conl"><?php _e('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
+						<label class="conl"><?php _e('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
+						<p class="clearb"><?php _e('Search info') ?></p>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Search in legend') ?></legend>
+					<legend><?php _e('Search in legend') ?></legend>
 					<div class="infldset">
 					<?php echo $forums ?>
-						<label class="conl"><?php echo __('Search in')."\n" ?>
+						<label class="conl"><?php _e('Search in')."\n" ?>
 						<br /><select id="search_in" name="search_in">
-							<option value="0"><?php echo __('Message and subject') ?></option>
-							<option value="1"><?php echo __('Message only') ?></option>
-							<option value="-1"><?php echo __('Topic only') ?></option>
+							<option value="0"><?php _e('Message and subject') ?></option>
+							<option value="1"><?php _e('Message only') ?></option>
+							<option value="-1"><?php _e('Topic only') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearl"><?php echo __('Search in info') ?></p>
+						<p class="clearl"><?php _e('Search in info') ?></p>
 <?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Search results legend') ?></legend>
+					<legend><?php _e('Search results legend') ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo __('Sort by')."\n" ?>
+						<label class="conl"><?php _e('Sort by')."\n" ?>
 						<br /><select name="sort_by">
-							<option value="0"><?php echo __('Sort by post time') ?></option>
-							<option value="1"><?php echo __('Sort by author') ?></option>
-							<option value="2"><?php echo __('Sort by subject') ?></option>
-							<option value="3"><?php echo __('Sort by forum') ?></option>
+							<option value="0"><?php _e('Sort by post time') ?></option>
+							<option value="1"><?php _e('Sort by author') ?></option>
+							<option value="2"><?php _e('Sort by subject') ?></option>
+							<option value="3"><?php _e('Sort by forum') ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Sort order')."\n" ?>
+						<label class="conl"><?php _e('Sort order')."\n" ?>
 						<br /><select name="sort_dir">
-							<option value="DESC"><?php echo __('Descending') ?></option>
-							<option value="ASC"><?php echo __('Ascending') ?></option>
+							<option value="DESC"><?php _e('Descending') ?></option>
+							<option value="ASC"><?php _e('Ascending') ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Show as')."\n" ?>
+						<label class="conl"><?php _e('Show as')."\n" ?>
 						<br /><select name="show_as">
-							<option value="topics"><?php echo __('Show as topics') ?></option>
-							<option value="posts"><?php echo __('Show as posts') ?></option>
+							<option value="topics"><?php _e('Show as topics') ?></option>
+							<option value="posts"><?php _e('Show as posts') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearb"><?php echo __('Search results info') ?></p>
+						<p class="clearb"><?php _e('Search results info') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/header.php b/style/FeatherBB/view/search/header.php
index 909a2108..01af597a 100644
--- a/style/FeatherBB/view/search/header.php
+++ b/style/FeatherBB/view/search/header.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
@@ -31,16 +31,16 @@
 if ($search['show_as'] == 'topics') :
 ?>
 <div id="vf" class="blocktable">
-	<h2><span><?php echo __('Search results') ?></span></h2>
+	<h2><span><?php _e('Search results') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Forum') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Replies') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
+					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
+					<th class="tc2" scope="col"><?php _e('Forum') ?></th>
+					<th class="tc3" scope="col"><?php _e('Replies') ?></th>
+					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/style/FeatherBB/view/search/posts.php b/style/FeatherBB/view/search/posts.php
index 872c349e..c575f9c2 100644
--- a/style/FeatherBB/view/search/posts.php
+++ b/style/FeatherBB/view/search/posts.php
@@ -21,7 +21,7 @@
     echo ' '.$cur_search['item_status'];
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
-    echo __('Re').' ';
+    _e('Re').' ';
 } ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
@@ -29,7 +29,7 @@
 			<div class="postleft">
 				<dl>
 					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php echo __('Replies').' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
+<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
 <?php endif; ?>
 					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
 				</dl>
@@ -46,8 +46,8 @@
 		<div class="postfoot clearb">
 			<div class="postfootright">
 				<ul>
-					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo __('Go to topic') ?></a></span></li>
-					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo __('Go to post') ?></a></span></li>
+					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
+					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
 				</ul>
 			</div>
 		</div>
diff --git a/style/FeatherBB/view/userlist.php b/style/FeatherBB/view/userlist.php
index 0bbedae6..26c24027 100644
--- a/style/FeatherBB/view/userlist.php
+++ b/style/FeatherBB/view/userlist.php
@@ -14,50 +14,50 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('User search') ?></span></h2>
+	<h2><span><?php _e('User search') ?></span></h2>
 	<div class="box">
 		<form id="userlist" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('User find legend') ?></legend>
+					<legend><?php _e('User find legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo __('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
-<?php endif; ?>						<label class="conl"><?php echo __('User group')."\n" ?>
+<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
+<?php endif; ?>						<label class="conl"><?php _e('User group')."\n" ?>
 						<br /><select name="show_group">
 							<option value="-1"<?php if ($show_group == -1) {
     echo ' selected="selected"';
-} ?>><?php echo __('All users') ?></option>
+} ?>><?php _e('All users') ?></option>
 <?php echo $dropdown_menu ?>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Sort by')."\n" ?>
+						<label class="conl"><?php _e('Sort by')."\n" ?>
 						<br /><select name="sort_by">
 							<option value="username"<?php if ($sort_by == 'username') {
     echo ' selected="selected"';
-} ?>><?php echo __('Username') ?></option>
+} ?>><?php _e('Username') ?></option>
 							<option value="registered"<?php if ($sort_by == 'registered') {
     echo ' selected="selected"';
-} ?>><?php echo __('Registered') ?></option>
+} ?>><?php _e('Registered') ?></option>
 <?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
     echo ' selected="selected"';
-} ?>><?php echo __('No of posts') ?></option>
+} ?>><?php _e('No of posts') ?></option>
 <?php endif; ?>						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Sort order')."\n" ?>
+						<label class="conl"><?php _e('Sort order')."\n" ?>
 						<br /><select name="sort_dir">
 							<option value="ASC"<?php if ($sort_dir == 'ASC') {
     echo ' selected="selected"';
-} ?>><?php echo __('Ascending') ?></option>
+} ?>><?php _e('Ascending') ?></option>
 							<option value="DESC"<?php if ($sort_dir == 'DESC') {
     echo ' selected="selected"';
-} ?>><?php echo __('Descending') ?></option>
+} ?>><?php _e('Descending') ?></option>
 						</select>
 						<br /></label>
 						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? __('User search info').' ' : '').__('User sort info'); ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
@@ -70,16 +70,16 @@
 </div>
 
 <div id="users1" class="blocktable">
-	<h2><span><?php echo __('User list') ?></span></h2>
+	<h2><span><?php _e('User list') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Username') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Title') ?></th>
-<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Registered') ?></th>
+					<th class="tcl" scope="col"><?php _e('Username') ?></th>
+					<th class="tc2" scope="col"><?php _e('Title') ?></th>
+<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Registered') ?></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/style/FeatherBB/view/viewforum.php b/style/FeatherBB/view/viewforum.php
index b9d04a1d..a35faf22 100644
--- a/style/FeatherBB/view/viewforum.php
+++ b/style/FeatherBB/view/viewforum.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -34,10 +34,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
+					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
+					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -70,7 +70,7 @@
 							<div class="icon inone"><div class="nosize"><!-- --></div></div>
 							<div class="tclcon">
 								<div>
-									<strong><?php echo __('Empty forum') ?></strong>
+									<strong><?php _e('Empty forum') ?></strong>
 								</div>
 							</div>
 						</td>
@@ -91,7 +91,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
diff --git a/style/FeatherBB/view/viewtopic.php b/style/FeatherBB/view/viewtopic.php
index 16535ff1..95de6a99 100644
--- a/style/FeatherBB/view/viewtopic.php
+++ b/style/FeatherBB/view/viewtopic.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -64,7 +64,7 @@
 				</div>
 				<div class="postright">
 					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
-    echo __('Re').' ';
+    _e('Re').' ';
 }
     ?><?php echo feather_escape($cur_topic['subject']) ?></h3>
 					<div class="postmsg">
@@ -107,7 +107,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -124,13 +124,13 @@
 
     ?>
 <div id="quickpost" class="blockform">
-	<h2><span><?php echo __('Quick post') ?></span></h2>
+	<h2><span><?php _e('Quick post') ?></span></h2>
 	<div class="box">
 		<form id="quickpostform" method="post" action="<?php echo get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write message legend') ?></legend>
+					<legend><?php _e('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
@@ -142,7 +142,7 @@
         $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
         $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
         ?>
-						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
 <?php
@@ -164,13 +164,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>
@@ -179,15 +179,15 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Robot title') ?></legend>
+					<legend><?php _e('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Robot info')    ?></p>
+						<p><?php _e('Robot info')    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
     $qencoded = md5($question[$index_questions]);
     echo sprintf(__('Robot question'), $question[$index_questions]);
     ?>
-							 <span><?php echo __('Required') ?></span></strong>
+							 <span><?php _e('Required') ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -196,7 +196,7 @@
 			</div>
 			<?php endif;
     ?>
-			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo __('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
+			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php _e('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
 		</form>
 	</div>
 </div>
diff --git a/view/admin/bans/add_ban.php b/view/admin/bans/add_ban.php
index 28b73f89..8170a2a9 100644
--- a/view/admin/bans/add_ban.php
+++ b/view/admin/bans/add_ban.php
@@ -14,7 +14,7 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('Ban advanced head') ?></span></h2>
+	<h2><span><?php _e('Ban advanced head') ?></span></h2>
 	<div class="box">
 		<form id="bans2" method="post" action="">
 			<div class="inform">
@@ -24,71 +24,71 @@
 				<?php endif; ?>
 				<?php if ($ban['mode'] == 'add' && isset($ban['user_id'])): ?><input type="hidden" name="ban_user_id" value="<?php echo $ban['user_id'] ?>" />
 				<?php endif; ?><fieldset>
-					<legend><?php echo __('Ban advanced subhead') ?></legend>
+					<legend><?php _e('Ban advanced subhead') ?></legend>
 					<div class="infldset">
 						<table class="aligntop">
 							<tr>
-								<th scope="row"><?php echo __('Username label') ?></th>
+								<th scope="row"><?php _e('Username label') ?></th>
 								<td>
 									<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
 										echo feather_escape($ban['ban_user']);
 									} ?>" tabindex="1" />
-									<span><?php echo __('Username help') ?></span>
+									<span><?php _e('Username help') ?></span>
 								</td>
 							</tr>
 							<tr>
-								<th scope="row"><?php echo __('IP label') ?></th>
+								<th scope="row"><?php _e('IP label') ?></th>
 								<td>
 									<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
 										echo feather_escape($ban['ip']);
 									} ?>" tabindex="2" />
-										<span><?php echo __('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
+										<span><?php _e('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
 												printf(' '.__('IP help link'), '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.__('here').'</a>');
 											} ?></span>
 								</td>
 							</tr>
 							<tr>
-								<th scope="row"><?php echo __('E-mail label') ?></th>
+								<th scope="row"><?php _e('E-mail label') ?></th>
 								<td>
 									<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
 										echo feather_escape($ban['email']);
 									} ?>" tabindex="3" />
-									<span><?php echo __('E-mail help') ?></span>
+									<span><?php _e('E-mail help') ?></span>
 								</td>
 							</tr>
 						</table>
-						<p class="topspace"><strong class="warntext"><?php echo __('Ban IP range info') ?></strong></p>
+						<p class="topspace"><strong class="warntext"><?php _e('Ban IP range info') ?></strong></p>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Message expiry subhead') ?></legend>
+					<legend><?php _e('Message expiry subhead') ?></legend>
 					<div class="infldset">
 						<table class="aligntop">
 							<tr>
-								<th scope="row"><?php echo __('Ban message label') ?></th>
+								<th scope="row"><?php _e('Ban message label') ?></th>
 								<td>
 									<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
 										echo feather_escape($ban['message']);
 									} ?>" tabindex="4" />
-									<span><?php echo __('Ban message help') ?></span>
+									<span><?php _e('Ban message help') ?></span>
 								</td>
 							</tr>
 							<tr>
-								<th scope="row"><?php echo __('Expire date label') ?></th>
+								<th scope="row"><?php _e('Expire date label') ?></th>
 								<td>
 									<input type="text" name="ban_expire" size="17" maxlength="10" value="<?php if (isset($ban['expire'])) {
 										echo $ban['expire'];
 									} ?>" tabindex="5" />
-									<span><?php echo __('Expire date help') ?></span>
+									<span><?php _e('Expire date help') ?></span>
 								</td>
 							</tr>
 						</table>
 					</div>
 				</fieldset>
 			</div>
-			<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php echo __('Save') ?>" tabindex="6" /></p>
+			<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php _e('Save') ?>" tabindex="6" /></p>
 		</form>
 	</div>
 </div>
diff --git a/view/admin/bans/admin_bans.php b/view/admin/bans/admin_bans.php
index e6f2b5f7..3d714e7f 100644
--- a/view/admin/bans/admin_bans.php
+++ b/view/admin/bans/admin_bans.php
@@ -14,20 +14,20 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('New ban head') ?></span></h2>
+		<h2><span><?php _e('New ban head') ?></span></h2>
 		<div class="box">
 			<form id="bans" method="post" action="<?php echo get_link('admin/bans/add/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Add ban subhead') ?></legend>
+						<legend><?php _e('Add ban subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Username label') ?><div><input type="submit" name="add_ban" value="<?php echo __('Add') ?>" tabindex="2" /></div></th>
+									<th scope="row"><?php _e('Username label') ?><div><input type="submit" name="add_ban" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
 									<td>
 										<input type="text" name="new_ban_user" size="25" maxlength="25" tabindex="1" />
-										<span><?php echo __('Username advanced help') ?></span>
+										<span><?php _e('Username advanced help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -37,56 +37,56 @@
 			</form>
 		</div>
 
-		<h2 class="block2"><span><?php echo __('Ban search head') ?></span></h2>
+		<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
 		<div class="box">
 			<form id="find_bans" method="get" action="<?php echo get_link('admin/bans/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="find_ban" value="<?php echo __('Submit search') ?>" tabindex="3" /></p>
+				<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Ban search subhead') ?></legend>
+						<legend><?php _e('Ban search subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Ban search info') ?></p>
+							<p><?php _e('Ban search info') ?></p>
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Username label') ?></th>
+									<th scope="row"><?php _e('Username label') ?></th>
 									<td><input type="text" name="username" size="30" maxlength="25" tabindex="4" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('IP label') ?></th>
+									<th scope="row"><?php _e('IP label') ?></th>
 									<td><input type="text" name="ip" size="30" maxlength="255" tabindex="5" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('E-mail label') ?></th>
+									<th scope="row"><?php _e('E-mail label') ?></th>
 									<td><input type="text" name="email" size="30" maxlength="80" tabindex="6" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Message label') ?></th>
+									<th scope="row"><?php _e('Message label') ?></th>
 									<td><input type="text" name="message" size="30" maxlength="255" tabindex="7" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Expire after label') ?></th>
+									<th scope="row"><?php _e('Expire after label') ?></th>
 									<td><input type="text" name="expire_after" size="10" maxlength="10" tabindex="8" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Expire before label') ?></th>
+									<th scope="row"><?php _e('Expire before label') ?></th>
 									<td><input type="text" name="expire_before" size="10" maxlength="10" tabindex="9" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Order by label') ?></th>
+									<th scope="row"><?php _e('Order by label') ?></th>
 									<td>
 										<select name="order_by" tabindex="10">
-											<option value="username" selected="selected"><?php echo __('Order by username') ?></option>
-											<option value="ip"><?php echo __('Order by ip') ?></option>
-											<option value="email"><?php echo __('Order by e-mail') ?></option>
-											<option value="expire"><?php echo __('Order by expire') ?></option>
+											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
+											<option value="ip"><?php _e('Order by ip') ?></option>
+											<option value="email"><?php _e('Order by e-mail') ?></option>
+											<option value="expire"><?php _e('Order by expire') ?></option>
 										</select>
                                         &#160;&#160;&#160;
                                         <select name="direction" tabindex="11">
-											<option value="ASC" selected="selected"><?php echo __('Ascending') ?></option>
-											<option value="DESC"><?php echo __('Descending') ?></option>
+											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
+											<option value="DESC"><?php _e('Descending') ?></option>
 										</select>
 									</td>
 								</tr>
@@ -94,7 +94,7 @@
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="find_ban" value="<?php echo __('Submit search') ?>" tabindex="12" /></p>
+				<p class="submitend"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="12" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/bans/search_ban.php b/view/admin/bans/search_ban.php
index 4285f695..0d057182 100644
--- a/view/admin/bans/search_ban.php
+++ b/view/admin/bans/search_ban.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php echo __('Bans') ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -29,19 +29,19 @@
 
 
 <div id="bans1" class="blocktable">
-	<h2><span><?php echo __('Results head') ?></span></h2>
+	<h2><span><?php _e('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Results IP address head') ?></th>
-					<th class="tc4" scope="col"><?php echo __('Results expire head') ?></th>
-					<th class="tc5" scope="col"><?php echo __('Results message head') ?></th>
-					<th class="tc6" scope="col"><?php echo __('Results banned by head') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Results actions head') ?></th>
+					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results IP address head') ?></th>
+					<th class="tc4" scope="col"><?php _e('Results expire head') ?></th>
+					<th class="tc5" scope="col"><?php _e('Results message head') ?></th>
+					<th class="tc6" scope="col"><?php _e('Results banned by head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -78,9 +78,9 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
         <ul class="crumbs">
-            <li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php echo __('Bans') ?></a></li>
-            <li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+            <li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+            <li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+            <li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
         </ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/admin/categories.php b/view/admin/categories.php
index 20f1fdd9..23929e47 100644
--- a/view/admin/categories.php
+++ b/view/admin/categories.php
@@ -14,16 +14,16 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Add categories head') ?></span></h2>
+	<h2><span><?php _e('Add categories head') ?></span></h2>
 	<div class="box">
 		<form method="post" action="<?php echo get_link('admin/categories/add/') ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Add categories subhead') ?></legend>
+					<legend><?php _e('Add categories subhead') ?></legend>
 					<div class="infldset">
 						<table class="aligntop">
 							<tr>
-								<th scope="row"><?php echo __('Add category label') ?><div><input type="submit" value="<?php echo __('Add new submit') ?>" tabindex="2" /></div></th>
+								<th scope="row"><?php _e('Add category label') ?><div><input type="submit" value="<?php _e('Add new submit') ?>" tabindex="2" /></div></th>
 								<td>
 									<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 									<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
@@ -37,17 +37,17 @@
 		</form>
 	</div>
 
-	<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php echo __('Delete categories head') ?></span></h2>
+	<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/categories/delete') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Delete categories subhead') ?></legend>
+						<legend><?php _e('Delete categories subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Delete category label') ?><div><input type="submit" value="<?php echo __('Delete') ?>" tabindex="4" /></div></th>
+									<th scope="row"><?php _e('Delete category label') ?><div><input type="submit" value="<?php _e('Delete') ?>" tabindex="4" /></div></th>
 									<td>
 										<select name="cat_to_delete" tabindex="3">
 											<?php
@@ -58,7 +58,7 @@
 
 											?>
 										</select>
-										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php echo __('Delete category disclaimer') ?></span>
+										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php _e('Delete category disclaimer') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -69,19 +69,19 @@
 		</div>
 	<?php endif; ?>
 
-	<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php echo __('Edit categories head') ?></span></h2>
+	<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/categories/edit/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Edit categories subhead') ?></legend>
+						<legend><?php _e('Edit categories subhead') ?></legend>
 						<div class="infldset">
 							<table id="categoryedit">
 								<thead>
 								<tr>
-									<th class="tcl" scope="col"><?php echo __('Category name label') ?></th>
-									<th scope="col"><?php echo __('Category position label') ?></th>
+									<th class="tcl" scope="col"><?php _e('Category name label') ?></th>
+									<th scope="col"><?php _e('Category position label') ?></th>
 								</tr>
 								</thead>
 								<tbody>
@@ -100,7 +100,7 @@
 								?>
 								</tbody>
 							</table>
-							<div class="fsetsubmit"><input type="submit" value="<?php echo __('Update') ?>" /></div>
+							<div class="fsetsubmit"><input type="submit" value="<?php _e('Update') ?>" /></div>
 						</div>
 					</fieldset>
 				</div>
diff --git a/view/admin/censoring.php b/view/admin/censoring.php
index b8dc9f88..71c253f7 100644
--- a/view/admin/censoring.php
+++ b/view/admin/censoring.php
@@ -14,28 +14,28 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Censoring head') ?></span></h2>
+		<h2><span><?php _e('Censoring head') ?></span></h2>
 		<div class="box">
 			<form id="censoring" method="post" action="<?php echo get_link('admin/censoring/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Add word subhead') ?></legend>
+						<legend><?php _e('Add word subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Add word info').' '.($feather_config['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
+							<p><?php _e('Add word info').' '.($feather_config['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
 							<table>
 							<thead>
 								<tr>
-									<th class="tcl" scope="col"><?php echo __('Censored word label') ?></th>
-									<th class="tc2" scope="col"><?php echo __('Replacement label') ?></th>
-									<th class="hidehead" scope="col"><?php echo __('Action label') ?></th>
+									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
+									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
+									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
 								<tr>
 									<td class="tcl"><input type="text" name="new_search_for" size="24" maxlength="60" tabindex="1" /></td>
 									<td class="tc2"><input type="text" name="new_replace_with" size="24" maxlength="60" tabindex="2" /></td>
-									<td><input type="submit" name="add_word" value="<?php echo __('Add') ?>" tabindex="3" /></td>
+									<td><input type="submit" name="add_word" value="<?php _e('Add') ?>" tabindex="3" /></td>
 								</tr>
 							</tbody>
 							</table>
@@ -44,7 +44,7 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Edit remove subhead') ?></legend>
+						<legend><?php _e('Edit remove subhead') ?></legend>
 						<div class="infldset">
 <?php
 if (!empty($word_data)) {
@@ -52,9 +52,9 @@
 							<table>
 							<thead>
 								<tr>
-									<th class="tcl" scope="col"><?php echo __('Censored word label') ?></th>
-									<th class="tc2" scope="col"><?php echo __('Replacement label') ?></th>
-									<th class="hidehead" scope="col"><?php echo __('Action label') ?></th>
+									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
+									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
+									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
diff --git a/view/admin/forums/admin_forums.php b/view/admin/forums/admin_forums.php
index 0d6adc16..fb4b716e 100644
--- a/view/admin/forums/admin_forums.php
+++ b/view/admin/forums/admin_forums.php
@@ -14,7 +14,7 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Add forum head') ?></span></h2>
+		<h2><span><?php _e('Add forum head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/forums/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -23,16 +23,16 @@
     ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Create new subhead') ?></legend>
+						<legend><?php _e('Create new subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Add forum label') ?><div><input type="submit" name="add_forum" value="<?php echo __('Add forum') ?>" tabindex="2" /></div></th>
+									<th scope="row"><?php _e('Add forum label') ?><div><input type="submit" name="add_forum" value="<?php _e('Add forum') ?>" tabindex="2" /></div></th>
 									<td>
 										<select name="add_to_cat" tabindex="1">
 											<?php echo $categories_add ?>
 										</select>
-										<span><?php echo __('Add forum help') ?></span>
+										<span><?php _e('Add forum help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -45,9 +45,9 @@
     ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('None') ?></legend>
+						<legend><?php _e('None') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('No categories exist') ?></p>
+							<p><?php _e('No categories exist') ?></p>
 						</div>
 					</fieldset>
 				</div>
@@ -61,11 +61,11 @@
 <?php
 if (!empty($forum_data)) {
     ?>
-		<h2 class="block2"><span><?php echo __('Edit forums head') ?></span></h2>
+		<h2 class="block2"><span><?php _e('Edit forums head') ?></span></h2>
 		<div class="box">
 			<form id="edforum" method="post" action="<?php echo get_link('admin/forums/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="update_positions" value="<?php echo __('Update positions') ?>" tabindex="3" /></p>
+				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
 <?php
     foreach ($forum_data as $forum) {
         if ($forum['cid'] != $cur_category) {
@@ -78,14 +78,14 @@
             ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Category subhead') ?> <?php echo feather_escape($forum['cat_name']) ?></legend>
+						<legend><?php _e('Category subhead') ?> <?php echo feather_escape($forum['cat_name']) ?></legend>
 						<div class="infldset">
 							<table>
 							<thead>
 								<tr>
-									<th class="tcl"><?php echo __('Action') ?></th>
-									<th class="tc2"><?php echo __('Position label') ?></th>
-									<th class="tcr"><?php echo __('Forum label') ?></th>
+									<th class="tcl"><?php _e('Action') ?></th>
+									<th class="tc2"><?php _e('Position label') ?></th>
+									<th class="tcr"><?php _e('Forum label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -96,7 +96,7 @@
 
         ?>
 								<tr>
-									<td class="tcl"><a href="<?php echo get_link('admin/forums/edit/'.$forum['fid'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php echo __('Edit link') ?></a> | <a href="<?php echo get_link('admin/forums/delete/'.$forum['fid'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php echo __('Delete link') ?></a></td>
+									<td class="tcl"><a href="<?php echo get_link('admin/forums/edit/'.$forum['fid'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo get_link('admin/forums/delete/'.$forum['fid'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
 									<td class="tc2"><input type="text" name="position[<?php echo $forum['fid'] ?>]" size="3" maxlength="3" value="<?php echo $forum['disp_position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
 									<td class="tcr"><strong><?php echo feather_escape($forum['forum_name']) ?></strong></td>
 								</tr>
@@ -110,7 +110,7 @@
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="update_positions" value="<?php echo __('Update positions') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
+				<p class="submitend"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
 			</form>
 		</div>
 <?php
diff --git a/view/admin/forums/delete_forum.php b/view/admin/forums/delete_forum.php
index 1c9dcea0..027a03e4 100644
--- a/view/admin/forums/delete_forum.php
+++ b/view/admin/forums/delete_forum.php
@@ -14,20 +14,20 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Confirm delete head') ?></span></h2>
+		<h2><span><?php _e('Confirm delete head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/forums/delete/'.$forum_id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Confirm delete subhead') ?></legend>
+						<legend><?php _e('Confirm delete subhead') ?></legend>
 						<div class="infldset">
 							<p><?php printf(__('Confirm delete info'), $forum_name) ?></p>
-							<p class="warntext"><?php echo __('Confirm delete warn') ?></p>
+							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="del_forum_comply" value="<?php echo __('Delete') ?>" /><a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+				<p class="buttons"><input type="submit" name="del_forum_comply" value="<?php _e('Delete') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/forums/permissions.php b/view/admin/forums/permissions.php
index fc3feae5..e6869913 100644
--- a/view/admin/forums/permissions.php
+++ b/view/admin/forums/permissions.php
@@ -14,26 +14,26 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Edit forum head') ?></span></h2>
+		<h2><span><?php _e('Edit forum head') ?></span></h2>
 		<div class="box">
 			<form id="edit_forum" method="post" action="<?php echo get_link('admin/forums/edit/'.$forum_id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" tabindex="6" /></p>
+				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Edit details subhead') ?></legend>
+						<legend><?php _e('Edit details subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Forum name label') ?></th>
+									<th scope="row"><?php _e('Forum name label') ?></th>
 									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo feather_escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Forum description label') ?></th>
+									<th scope="row"><?php _e('Forum description label') ?></th>
 									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo feather_escape($cur_forum['forum_desc']) ?></textarea></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Category label') ?></th>
+									<th scope="row"><?php _e('Category label') ?></th>
 									<td>
 										<select name="cat_id" tabindex="3">
 											<?php echo $categories_perms ?>
@@ -41,23 +41,23 @@
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Sort by label') ?></th>
+									<th scope="row"><?php _e('Sort by label') ?></th>
 									<td>
 										<select name="sort_by" tabindex="4">
 											<option value="0"<?php if ($cur_forum['sort_by'] == '0') {
     echo ' selected="selected"';
-} ?>><?php echo __('Last post') ?></option>
+} ?>><?php _e('Last post') ?></option>
 											<option value="1"<?php if ($cur_forum['sort_by'] == '1') {
     echo ' selected="selected"';
-} ?>><?php echo __('Topic start') ?></option>
+} ?>><?php _e('Topic start') ?></option>
 											<option value="2"<?php if ($cur_forum['sort_by'] == '2') {
     echo ' selected="selected"';
-} ?>><?php echo __('Subject') ?></option>
+} ?>><?php _e('Subject') ?></option>
 										</select>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Redirect label') ?></th>
+									<th scope="row"><?php _e('Redirect label') ?></th>
 									<td><?php echo($cur_forum['num_topics']) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.feather_escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
 								</tr>
 							</table>
@@ -66,16 +66,16 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Group permissions subhead') ?></legend>
+						<legend><?php _e('Group permissions subhead') ?></legend>
 						<div class="infldset">
 							<p><?php printf(__('Group permissions info'), '<a href="admin_groups.php">'.__('User groups').'</a>') ?></p>
 							<table id="forumperms">
 							<thead>
 								<tr>
 									<th class="atcl">&#160;</th>
-									<th><?php echo __('Read forum label') ?></th>
-									<th><?php echo __('Post replies label') ?></th>
-									<th><?php echo __('Post topics label') ?></th>
+									<th><?php _e('Read forum label') ?></th>
+									<th><?php _e('Post replies label') ?></th>
+									<th><?php _e('Post topics label') ?></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -122,11 +122,11 @@
 ?>
 							</tbody>
 							</table>
-							<div class="fsetsubmit"><input type="submit" name="revert_perms" value="<?php echo __('Revert to default') ?>" tabindex="<?php echo $cur_index++ ?>" /></div>
+							<div class="fsetsubmit"><input type="submit" name="revert_perms" value="<?php _e('Revert to default') ?>" tabindex="<?php echo $cur_index++ ?>" /></div>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
+				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/groups/add_edit_group.php b/view/admin/groups/add_edit_group.php
index 6246e104..9a91a65f 100644
--- a/view/admin/groups/add_edit_group.php
+++ b/view/admin/groups/add_edit_group.php
@@ -14,22 +14,22 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('Group settings head') ?></span></h2>
+	<h2><span><?php _e('Group settings head') ?></span></h2>
 	<div class="box">
 		<form id="groups2" method="post" action="" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<p class="submittop"><input type="submit" name="add_edit_group" value="<?php echo __('Save') ?>" /></p>
+			<p class="submittop"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" /></p>
 			<div class="inform">
 				<input type="hidden" name="mode" value="<?php echo $group['mode'] ?>" />
 				<?php if ($group['mode'] == 'edit'): ?>					<input type="hidden" name="group_id" value="<?php echo $id ?>" />
 				<?php endif; ?><?php if ($group['mode'] == 'add'): ?>					<input type="hidden" name="base_group" value="<?php echo $group['base_group'] ?>" />
 				<?php endif; ?>					<fieldset>
-					<legend><?php echo __('Group settings subhead') ?></legend>
+					<legend><?php _e('Group settings subhead') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Group settings info') ?></p>
+						<p><?php _e('Group settings info') ?></p>
 						<table class="aligntop">
 							<tr>
-								<th scope="row"><?php echo __('Group title label') ?></th>
+								<th scope="row"><?php _e('Group title label') ?></th>
 								<td>
 									<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
 										echo feather_escape($group['info']['g_title']);
@@ -37,17 +37,17 @@
 								</td>
 							</tr>
 							<tr>
-								<th scope="row"><?php echo __('User title label') ?></th>
+								<th scope="row"><?php _e('User title label') ?></th>
 								<td>
 									<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
 									<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
 								</td>
 							</tr>
 							<?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-								<th scope="row"><?php echo __('Promote users label') ?></th>
+								<th scope="row"><?php _e('Promote users label') ?></th>
 								<td>
 									<select name="promote_next_group" tabindex="3">
-										<option value="0"><?php echo __('Disable promotion') ?></option>
+										<option value="0"><?php _e('Disable promotion') ?></option>
 										<?php echo $group_list ?>
 									</select>
 									<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo feather_escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
@@ -55,255 +55,255 @@
 								</td>
 							</tr>
 								<?php if ($group['mode'] != 'edit' || $feather_config['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
-									<th scope="row"> <?php echo __('Mod privileges label') ?></th>
+									<th scope="row"> <?php _e('Mod privileges label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="5" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+											} ?> tabindex="5" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="moderator" value="0"<?php if ($group['info']['g_moderator'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="6" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Mod privileges help') ?></span>
+											} ?> tabindex="6" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Mod privileges help') ?></span>
 									</td>
 								</tr>
 									<tr>
-										<th scope="row"><?php echo __('Edit profile label') ?></th>
+										<th scope="row"><?php _e('Edit profile label') ?></th>
 										<td>
 											<label class="conl"><input type="radio" name="mod_edit_users" value="1"<?php if ($group['info']['g_mod_edit_users'] == '1') {
 													echo ' checked="checked"';
-												} ?> tabindex="7" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+												} ?> tabindex="7" />&#160;<strong><?php _e('Yes') ?></strong></label>
 											<label class="conl"><input type="radio" name="mod_edit_users" value="0"<?php if ($group['info']['g_mod_edit_users'] == '0') {
 													echo ' checked="checked"';
-												} ?> tabindex="8" />&#160;<strong><?php echo __('No') ?></strong></label>
-											<span class="clearb"><?php echo __('Edit profile help') ?></span>
+												} ?> tabindex="8" />&#160;<strong><?php _e('No') ?></strong></label>
+											<span class="clearb"><?php _e('Edit profile help') ?></span>
 										</td>
 									</tr>
 									<tr>
-										<th scope="row"><?php echo __('Rename users label') ?></th>
+										<th scope="row"><?php _e('Rename users label') ?></th>
 										<td>
 											<label class="conl"><input type="radio" name="mod_rename_users" value="1"<?php if ($group['info']['g_mod_rename_users'] == '1') {
 													echo ' checked="checked"';
-												} ?> tabindex="9" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+												} ?> tabindex="9" />&#160;<strong><?php _e('Yes') ?></strong></label>
 											<label class="conl"><input type="radio" name="mod_rename_users" value="0"<?php if ($group['info']['g_mod_rename_users'] == '0') {
 													echo ' checked="checked"';
-												} ?> tabindex="10" />&#160;<strong><?php echo __('No') ?></strong></label>
-											<span class="clearb"><?php echo __('Rename users help') ?></span>
+												} ?> tabindex="10" />&#160;<strong><?php _e('No') ?></strong></label>
+											<span class="clearb"><?php _e('Rename users help') ?></span>
 										</td>
 									</tr>
 									<tr>
-										<th scope="row"><?php echo __('Change passwords label') ?></th>
+										<th scope="row"><?php _e('Change passwords label') ?></th>
 										<td>
 											<label class="conl"><input type="radio" name="mod_change_passwords" value="1"<?php if ($group['info']['g_mod_change_passwords'] == '1') {
 													echo ' checked="checked"';
-												} ?> tabindex="11" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+												} ?> tabindex="11" />&#160;<strong><?php _e('Yes') ?></strong></label>
 											<label class="conl"><input type="radio" name="mod_change_passwords" value="0"<?php if ($group['info']['g_mod_change_passwords'] == '0') {
 													echo ' checked="checked"';
-												} ?> tabindex="12" />&#160;<strong><?php echo __('No') ?></strong></label>
-											<span class="clearb"><?php echo __('Change passwords help') ?></span>
+												} ?> tabindex="12" />&#160;<strong><?php _e('No') ?></strong></label>
+											<span class="clearb"><?php _e('Change passwords help') ?></span>
 										</td>
 									</tr>
 									<tr>
-										<th scope="row"><?php echo __('Mod promote users label') ?></th>
+										<th scope="row"><?php _e('Mod promote users label') ?></th>
 										<td>
 											<label class="conl"><input type="radio" name="mod_promote_users" value="1"<?php if ($group['info']['g_mod_promote_users'] == '1') {
 													echo ' checked="checked"';
-												} ?> tabindex="13" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+												} ?> tabindex="13" />&#160;<strong><?php _e('Yes') ?></strong></label>
 											<label class="conl"><input type="radio" name="mod_promote_users" value="0"<?php if ($group['info']['g_mod_promote_users'] == '0') {
 													echo ' checked="checked"';
-												} ?> tabindex="14" />&#160;<strong><?php echo __('No') ?></strong></label>
-											<span class="clearb"><?php echo __('Mod promote users help') ?></span>
+												} ?> tabindex="14" />&#160;<strong><?php _e('No') ?></strong></label>
+											<span class="clearb"><?php _e('Mod promote users help') ?></span>
 										</td>
 									</tr>
 									<tr>
-										<th scope="row"><?php echo __('Ban users label') ?></th>
+										<th scope="row"><?php _e('Ban users label') ?></th>
 										<td>
 											<label class="conl"><input type="radio" name="mod_ban_users" value="1"<?php if ($group['info']['g_mod_ban_users'] == '1') {
 													echo ' checked="checked"';
-												} ?> tabindex="15" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+												} ?> tabindex="15" />&#160;<strong><?php _e('Yes') ?></strong></label>
 											<label class="conl"><input type="radio" name="mod_ban_users" value="0"<?php if ($group['info']['g_mod_ban_users'] == '0') {
 													echo ' checked="checked"';
-												} ?> tabindex="16" />&#160;<strong><?php echo __('No') ?></strong></label>
-											<span class="clearb"><?php echo __('Ban users help') ?></span>
+												} ?> tabindex="16" />&#160;<strong><?php _e('No') ?></strong></label>
+											<span class="clearb"><?php _e('Ban users help') ?></span>
 										</td>
 									</tr>
 								<?php endif; endif; ?>								<tr>
-								<th scope="row"><?php echo __('Read board label') ?></th>
+								<th scope="row"><?php _e('Read board label') ?></th>
 								<td>
 									<label class="conl"><input type="radio" name="read_board" value="1"<?php if ($group['info']['g_read_board'] == '1') {
 											echo ' checked="checked"';
-										} ?> tabindex="17" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+										} ?> tabindex="17" />&#160;<strong><?php _e('Yes') ?></strong></label>
 									<label class="conl"><input type="radio" name="read_board" value="0"<?php if ($group['info']['g_read_board'] == '0') {
 											echo ' checked="checked"';
-										} ?> tabindex="18" />&#160;<strong><?php echo __('No') ?></strong></label>
-									<span class="clearb"><?php echo __('Read board help') ?></span>
+										} ?> tabindex="18" />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Read board help') ?></span>
 								</td>
 							</tr>
 								<tr>
-									<th scope="row"><?php echo __('View user info label') ?></th>
+									<th scope="row"><?php _e('View user info label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="view_users" value="1"<?php if ($group['info']['g_view_users'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="19" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+											} ?> tabindex="19" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="view_users" value="0"<?php if ($group['info']['g_view_users'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="20" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('View user info help') ?></span>
+											} ?> tabindex="20" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('View user info help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Post replies label') ?></th>
+									<th scope="row"><?php _e('Post replies label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="post_replies" value="1"<?php if ($group['info']['g_post_replies'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="21" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+											} ?> tabindex="21" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="post_replies" value="0"<?php if ($group['info']['g_post_replies'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="22" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Post replies help') ?></span>
+											} ?> tabindex="22" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post replies help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Post topics label') ?></th>
+									<th scope="row"><?php _e('Post topics label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="post_topics" value="1"<?php if ($group['info']['g_post_topics'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="23" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+											} ?> tabindex="23" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="post_topics" value="0"<?php if ($group['info']['g_post_topics'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="24" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Post topics help') ?></span>
+											} ?> tabindex="24" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post topics help') ?></span>
 									</td>
 								</tr>
 								<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo __('Edit posts label') ?></th>
+									<th scope="row"><?php _e('Edit posts label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="edit_posts" value="1"<?php if ($group['info']['g_edit_posts'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="25" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+											} ?> tabindex="25" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="edit_posts" value="0"<?php if ($group['info']['g_edit_posts'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="26" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Edit posts help') ?></span>
+											} ?> tabindex="26" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Edit posts help') ?></span>
 									</td>
 								</tr>
 									<tr>
-										<th scope="row"><?php echo __('Delete posts label') ?></th>
+										<th scope="row"><?php _e('Delete posts label') ?></th>
 										<td>
 											<label class="conl"><input type="radio" name="delete_posts" value="1"<?php if ($group['info']['g_delete_posts'] == '1') {
 													echo ' checked="checked"';
-												} ?> tabindex="27" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+												} ?> tabindex="27" />&#160;<strong><?php _e('Yes') ?></strong></label>
 											<label class="conl"><input type="radio" name="delete_posts" value="0"<?php if ($group['info']['g_delete_posts'] == '0') {
 													echo ' checked="checked"';
-												} ?> tabindex="28" />&#160;<strong><?php echo __('No') ?></strong></label>
-											<span class="clearb"><?php echo __('Delete posts help') ?></span>
+												} ?> tabindex="28" />&#160;<strong><?php _e('No') ?></strong></label>
+											<span class="clearb"><?php _e('Delete posts help') ?></span>
 										</td>
 									</tr>
 									<tr>
-										<th scope="row"><?php echo __('Delete topics label') ?></th>
+										<th scope="row"><?php _e('Delete topics label') ?></th>
 										<td>
 											<label class="conl"><input type="radio" name="delete_topics" value="1"<?php if ($group['info']['g_delete_topics'] == '1') {
 													echo ' checked="checked"';
-												} ?> tabindex="29" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+												} ?> tabindex="29" />&#160;<strong><?php _e('Yes') ?></strong></label>
 											<label class="conl"><input type="radio" name="delete_topics" value="0"<?php if ($group['info']['g_delete_topics'] == '0') {
 													echo ' checked="checked"';
-												} ?> tabindex="30" />&#160;<strong><?php echo __('No') ?></strong></label>
-											<span class="clearb"><?php echo __('Delete topics help') ?></span>
+												} ?> tabindex="30" />&#160;<strong><?php _e('No') ?></strong></label>
+											<span class="clearb"><?php _e('Delete topics help') ?></span>
 										</td>
 									</tr>
 								<?php endif; ?>								<tr>
-									<th scope="row"><?php echo __('Post links label') ?></th>
+									<th scope="row"><?php _e('Post links label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="post_links" value="1"<?php if ($group['info']['g_post_links'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="31" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+											} ?> tabindex="31" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="post_links" value="0"<?php if ($group['info']['g_post_links'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="32" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Post links help') ?></span>
+											} ?> tabindex="32" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post links help') ?></span>
 									</td>
 								</tr>
 								<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo __('Set own title label') ?></th>
+									<th scope="row"><?php _e('Set own title label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="set_title" value="1"<?php if ($group['info']['g_set_title'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="33" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+											} ?> tabindex="33" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="set_title" value="0"<?php if ($group['info']['g_set_title'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="34" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Set own title help') ?></span>
+											} ?> tabindex="34" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Set own title help') ?></span>
 									</td>
 								</tr>
 								<?php endif; ?>								<tr>
-									<th scope="row"><?php echo __('User search label') ?></th>
+									<th scope="row"><?php _e('User search label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="search" value="1"<?php if ($group['info']['g_search'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="35" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+											} ?> tabindex="35" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="search" value="0"<?php if ($group['info']['g_search'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="36" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('User search help') ?></span>
+											} ?> tabindex="36" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('User search help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('User list search label') ?></th>
+									<th scope="row"><?php _e('User list search label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="search_users" value="1"<?php if ($group['info']['g_search_users'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="37" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+											} ?> tabindex="37" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="search_users" value="0"<?php if ($group['info']['g_search_users'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="38" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('User list search help') ?></span>
+											} ?> tabindex="38" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('User list search help') ?></span>
 									</td>
 								</tr>
 								<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo __('Send e-mails label') ?></th>
+									<th scope="row"><?php _e('Send e-mails label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="send_email" value="1"<?php if ($group['info']['g_send_email'] == '1') {
 												echo ' checked="checked"';
-											} ?> tabindex="39" />&#160;<strong><?php echo __('Yes') ?></strong></label>
+											} ?> tabindex="39" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="send_email" value="0"<?php if ($group['info']['g_send_email'] == '0') {
 												echo ' checked="checked"';
-											} ?> tabindex="40" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Send e-mails help') ?></span>
+											} ?> tabindex="40" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Send e-mails help') ?></span>
 									</td>
 								</tr>
 								<?php endif; ?>								<tr>
-									<th scope="row"><?php echo __('Post flood label') ?></th>
+									<th scope="row"><?php _e('Post flood label') ?></th>
 									<td>
 										<input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_post_flood'] ?>" tabindex="41" />
-										<span><?php echo __('Post flood help') ?></span>
+										<span><?php _e('Post flood help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Search flood label') ?></th>
+									<th scope="row"><?php _e('Search flood label') ?></th>
 									<td>
 										<input type="text" name="search_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_search_flood'] ?>" tabindex="42" />
-										<span><?php echo __('Search flood help') ?></span>
+										<span><?php _e('Search flood help') ?></span>
 									</td>
 								</tr>
 								<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php echo __('E-mail flood label') ?></th>
+									<th scope="row"><?php _e('E-mail flood label') ?></th>
 									<td>
 										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_email_flood'] ?>" tabindex="43" />
-										<span><?php echo __('E-mail flood help') ?></span>
+										<span><?php _e('E-mail flood help') ?></span>
 									</td>
 								</tr>
 									<tr>
-										<th scope="row"><?php echo __('Report flood label') ?></th>
+										<th scope="row"><?php _e('Report flood label') ?></th>
 										<td>
 											<input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_report_flood'] ?>" tabindex="44" />
-											<span><?php echo __('Report flood help') ?></span>
+											<span><?php _e('Report flood help') ?></span>
 										</td>
 									</tr>
 								<?php endif; endif; ?>							</table>
-						<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php echo __('Moderator info') ?></p>
+						<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php _e('Moderator info') ?></p>
 						<?php endif; ?>						</div>
 				</fieldset>
 			</div>
-			<p class="submitend"><input type="submit" name="add_edit_group" value="<?php echo __('Save') ?>" tabindex="45" /></p>
+			<p class="submitend"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" tabindex="45" /></p>
 		</form>
 	</div>
 </div>
diff --git a/view/admin/groups/admin_groups.php b/view/admin/groups/admin_groups.php
index 1bf9a10e..643b4883 100644
--- a/view/admin/groups/admin_groups.php
+++ b/view/admin/groups/admin_groups.php
@@ -14,17 +14,17 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Add groups head') ?></span></h2>
+		<h2><span><?php _e('Add groups head') ?></span></h2>
 		<div class="box">
 				<div class="inform">
 					<fieldset>
                         <form id="groups" method="post" action="<?php echo get_link('admin/groups/add/') ?>">
                         <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php echo __('Add group subhead') ?></legend>
+						<legend><?php _e('Add group subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('New group label') ?><div><input type="submit" name="add_group" value="<?php echo __('Add') ?>" tabindex="2" /></div></th>
+									<th scope="row"><?php _e('New group label') ?><div><input type="submit" name="add_group" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
 									<td>
 										<select id="base_group" name="base_group" tabindex="1">
 <?php
@@ -41,7 +41,7 @@
 
 ?>
 										</select>
-										<span><?php echo __('New group help') ?></span>
+										<span><?php _e('New group help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -53,11 +53,11 @@
 					<fieldset>
                         <form id="groups" method="post" action="<?php echo get_link('admin/groups/') ?>">
                         	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php echo __('Default group subhead') ?></legend>
+						<legend><?php _e('Default group subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Default group label') ?><div><input type="submit" name="set_default_group" value="<?php echo __('Save') ?>" tabindex="4" /></div></th>
+									<th scope="row"><?php _e('Default group label') ?><div><input type="submit" name="set_default_group" value="<?php _e('Save') ?>" tabindex="4" /></div></th>
 									<td>
 										<select id="default_group" name="default_group" tabindex="3">
 <?php
@@ -74,7 +74,7 @@
 
 ?>
 										</select>
-										<span><?php echo __('Default group help') ?></span>
+										<span><?php _e('Default group help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -84,14 +84,14 @@
 				</div>
 		</div>
 
-		<h2 class="block2"><span><?php echo __('Existing groups head') ?></span></h2>
+		<h2 class="block2"><span><?php _e('Existing groups head') ?></span></h2>
 		<div class="box">
 			<div class="fakeform">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Edit groups subhead') ?></legend>
+						<legend><?php _e('Edit groups subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Edit groups info') ?></p>
+							<p><?php _e('Edit groups info') ?></p>
 							<table>
 <?php
 foreach ($groups as $cur_group) {
diff --git a/view/admin/groups/confirm_delete.php b/view/admin/groups/confirm_delete.php
index a6200b6f..94edb821 100644
--- a/view/admin/groups/confirm_delete.php
+++ b/view/admin/groups/confirm_delete.php
@@ -14,21 +14,21 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('Group delete head') ?></span></h2>
+	<h2><span><?php _e('Group delete head') ?></span></h2>
 	<div class="box">
 		<form method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="group_to_delete" value="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>" />
 				<fieldset>
-					<legend><?php echo __('Confirm delete subhead') ?></legend>
+					<legend><?php _e('Confirm delete subhead') ?></legend>
 					<div class="infldset">
 						<p><?php printf(__('Confirm delete info'), feather_escape($group_title)) ?></p>
-						<p class="warntext"><?php echo __('Confirm delete warn') ?></p>
+						<p class="warntext"><?php _e('Confirm delete warn') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="del_group_comply" value="<?php echo __('Delete') ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="del_group_comply" value="<?php _e('Delete') ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
diff --git a/view/admin/groups/delete_group.php b/view/admin/groups/delete_group.php
index fee07d5b..693baab1 100644
--- a/view/admin/groups/delete_group.php
+++ b/view/admin/groups/delete_group.php
@@ -14,16 +14,16 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Delete group head') ?></span></h2>
+		<h2><span><?php _e('Delete group head') ?></span></h2>
 		<div class="box">
 			<form id="groups" method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Move users subhead') ?></legend>
+						<legend><?php _e('Move users subhead') ?></legend>
 						<div class="infldset">
 							<p><?php printf(__('Move users info'), feather_escape($group_info['title']), forum_number_format($group_info['members'])) ?></p>
-							<label><?php echo __('Move users label') ?>
+							<label><?php _e('Move users label') ?>
 							<select name="move_to_group">
 								<?php get_group_list_delete($id); ?>
 							</select>
@@ -31,7 +31,7 @@
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="del_group" value="<?php echo __('Delete group') ?>" /><a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+				<p class="buttons"><input type="submit" name="del_group" value="<?php _e('Delete group') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/index.php b/view/admin/index.php
index 50afbad1..dc0dcf8c 100644
--- a/view/admin/index.php
+++ b/view/admin/index.php
@@ -14,46 +14,46 @@
 ?>
 
 	<div class="block">
-		<h2><span><?php echo __('Forum admin head') ?></span></h2>
+		<h2><span><?php _e('Forum admin head') ?></span></h2>
 		<div id="adintro" class="box">
 			<div class="inbox">
-				<p><?php echo __('Welcome to admin') ?></p>
+				<p><?php _e('Welcome to admin') ?></p>
 				<ul>
-					<li><span><?php echo __('Welcome 1') ?></span></li>
-					<li><span><?php echo __('Welcome 2') ?></span></li>
-					<li><span><?php echo __('Welcome 3') ?></span></li>
-					<li><span><?php echo __('Welcome 4') ?></span></li>
-					<li><span><?php echo __('Welcome 5') ?></span></li>
-					<li><span><?php echo __('Welcome 6') ?></span></li>
-					<li><span><?php echo __('Welcome 7') ?></span></li>
-					<li><span><?php echo __('Welcome 8') ?></span></li>
-					<li><span><?php echo __('Welcome 9') ?></span></li>
+					<li><span><?php _e('Welcome 1') ?></span></li>
+					<li><span><?php _e('Welcome 2') ?></span></li>
+					<li><span><?php _e('Welcome 3') ?></span></li>
+					<li><span><?php _e('Welcome 4') ?></span></li>
+					<li><span><?php _e('Welcome 5') ?></span></li>
+					<li><span><?php _e('Welcome 6') ?></span></li>
+					<li><span><?php _e('Welcome 7') ?></span></li>
+					<li><span><?php _e('Welcome 8') ?></span></li>
+					<li><span><?php _e('Welcome 9') ?></span></li>
 				</ul>
 			</div>
 		</div>
 
 <?php if ($install_file_exists) : ?>
-		<h2 class="block2"><span><?php echo __('Alerts head') ?></span></h2>
+		<h2 class="block2"><span><?php _e('Alerts head') ?></span></h2>
 		<div id="adalerts" class="box">
 			<p><?php printf(__('Install file exists'), '<a href="'.get_link('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
 		</div>
 <?php endif; ?>
 
-		<h2 class="block2"><span><?php echo __('About head') ?></span></h2>
+		<h2 class="block2"><span><?php _e('About head') ?></span></h2>
 		<div id="adstats" class="box">
 			<div class="inbox">
 				<dl>
-					<dt><?php echo __('FeatherBB version label') ?></dt>
+					<dt><?php _e('FeatherBB version label') ?></dt>
 					<dd>
 						<?php printf(__('FeatherBB version data')."\n", $feather_config['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
 					</dd>
-					<dt><?php echo __('Server statistics label') ?></dt>
+					<dt><?php _e('Server statistics label') ?></dt>
 					<dd>
-						<a href="<?php echo get_link('admin/statistics/') ?>"><?php echo __('View server statistics') ?></a>
+						<a href="<?php echo get_link('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
 					</dd>
-					<dt><?php echo __('Support label') ?></dt>
+					<dt><?php _e('Support label') ?></dt>
 					<dd>
-						<a href="http://FeatherBB.org/forums/index.php"><?php echo __('Forum label') ?></a> - <a href="http://gitter.im/featherbb/featherbb"><?php echo __('IRC label') ?></a>
+						<a href="http://FeatherBB.org/forums/index.php"><?php _e('Forum label') ?></a> - <a href="http://gitter.im/featherbb/featherbb"><?php _e('IRC label') ?></a>
 					</dd>
 				</dl>
 			</div>
diff --git a/view/admin/maintenance/admin_maintenance.php b/view/admin/maintenance/admin_maintenance.php
index 77c8404e..068b914b 100644
--- a/view/admin/maintenance/admin_maintenance.php
+++ b/view/admin/maintenance/admin_maintenance.php
@@ -14,39 +14,39 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Maintenance head') ?></span></h2>
+		<h2><span><?php _e('Maintenance head') ?></span></h2>
 		<div class="box">
 			<form method="get" action="<?php echo get_link('admin/maintenance/') ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="rebuild" />
 					<fieldset>
-						<legend><?php echo __('Rebuild index subhead') ?></legend>
+						<legend><?php _e('Rebuild index subhead') ?></legend>
 						<div class="infldset">
 							<p><?php printf(__('Rebuild index info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Posts per cycle label') ?></th>
+									<th scope="row"><?php _e('Posts per cycle label') ?></th>
 									<td>
 										<input type="text" name="i_per_page" size="7" maxlength="7" value="300" tabindex="1" />
-										<span><?php echo __('Posts per cycle help') ?></span>
+										<span><?php _e('Posts per cycle help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Starting post label') ?></th>
+									<th scope="row"><?php _e('Starting post label') ?></th>
 									<td>
 										<input type="text" name="i_start_at" size="7" maxlength="7" value="<?php echo(isset($first_id)) ? $first_id : 0 ?>" tabindex="2" />
-										<span><?php echo __('Starting post help') ?></span>
+										<span><?php _e('Starting post help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Empty index label') ?></th>
+									<th scope="row"><?php _e('Empty index label') ?></th>
 									<td class="inputadmin">
-										<label><input type="checkbox" name="i_empty_index" value="1" tabindex="3" checked="checked" />&#160;&#160;<?php echo __('Empty index help') ?></label>
+										<label><input type="checkbox" name="i_empty_index" value="1" tabindex="3" checked="checked" />&#160;&#160;<?php _e('Empty index help') ?></label>
 									</td>
 								</tr>
 							</table>
-							<p class="topspace"><?php echo __('Rebuild completed info') ?></p>
-							<div class="fsetsubmit"><input type="submit" name="rebuild_index" value="<?php echo __('Rebuild index') ?>" tabindex="4" /></div>
+							<p class="topspace"><?php _e('Rebuild completed info') ?></p>
+							<div class="fsetsubmit"><input type="submit" name="rebuild_index" value="<?php _e('Rebuild index') ?>" tabindex="4" /></div>
 						</div>
 					</fieldset>
 				</div>
@@ -57,38 +57,38 @@
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
 					<fieldset>
-						<legend><?php echo __('Prune subhead') ?></legend>
+						<legend><?php _e('Prune subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Days old label') ?></th>
+									<th scope="row"><?php _e('Days old label') ?></th>
 									<td>
 										<input type="text" name="req_prune_days" size="3" maxlength="3" tabindex="5" />
-										<span><?php echo __('Days old help') ?></span>
+										<span><?php _e('Days old help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Prune sticky label') ?></th>
+									<th scope="row"><?php _e('Prune sticky label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="prune_sticky" value="1" tabindex="6" checked="checked" />&#160;<strong><?php echo __('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="prune_sticky" value="0" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Prune sticky help') ?></span>
+										<label class="conl"><input type="radio" name="prune_sticky" value="1" tabindex="6" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="prune_sticky" value="0" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Prune sticky help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Prune from label') ?></th>
+									<th scope="row"><?php _e('Prune from label') ?></th>
 									<td>
 										<select name="prune_from" tabindex="7">
-											<option value="all"><?php echo __('All forums') ?></option>
+											<option value="all"><?php _e('All forums') ?></option>
 												<?php echo $categories; ?>
 											</optgroup>
 										</select>
-										<span><?php echo __('Prune from help') ?></span>
+										<span><?php _e('Prune from help') ?></span>
 									</td>
 								</tr>
 							</table>
 							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
-							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php echo __('Prune') ?>" tabindex="8" /></div>
+							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php _e('Prune') ?>" tabindex="8" /></div>
 						</div>
 					</fieldset>
 				</div>
diff --git a/view/admin/maintenance/prune.php b/view/admin/maintenance/prune.php
index 8801a979..9e3b0d2b 100644
--- a/view/admin/maintenance/prune.php
+++ b/view/admin/maintenance/prune.php
@@ -14,7 +14,7 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Prune head') ?></span></h2>
+		<h2><span><?php _e('Prune head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/maintenance/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -24,14 +24,14 @@
 					<input type="hidden" name="prune_sticky" value="<?php echo $prune_sticky ?>" />
 					<input type="hidden" name="prune_from" value="<?php echo $prune_from ?>" />
 					<fieldset>
-						<legend><?php echo __('Confirm prune subhead') ?></legend>
+						<legend><?php _e('Confirm prune subhead') ?></legend>
 						<div class="infldset">
 							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], forum_number_format($prune['num_topics'])) ?></p>
-							<p class="warntext"><?php echo __('Confirm prune warn') ?></p>
+							<p class="warntext"><?php _e('Confirm prune warn') ?></p>
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="prune_comply" value="<?php echo __('Prune') ?>" /><a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+				<p class="buttons"><input type="submit" name="prune_comply" value="<?php _e('Prune') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/maintenance/rebuild.php b/view/admin/maintenance/rebuild.php
index 36947974..5bd6ffc0 100644
--- a/view/admin/maintenance/rebuild.php
+++ b/view/admin/maintenance/rebuild.php
@@ -34,5 +34,5 @@
 </head>
 <body>
 
-<h1><?php echo __('Rebuilding index info') ?></h1>
+<h1><?php _e('Rebuilding index info') ?></h1>
 <hr />
\ No newline at end of file
diff --git a/view/admin/menu.php b/view/admin/menu.php
index e2870921..b33c2727 100644
--- a/view/admin/menu.php
+++ b/view/admin/menu.php
@@ -15,27 +15,27 @@
 ?>
 <div id="adminconsole" class="block2col">
 	<div id="adminmenu" class="blockmenu">
-		<h2><span><?php echo __('Moderator menu') ?></span></h2>
+		<h2><span><?php _e('Moderator menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'index') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/') ?>"><?php echo __('Index') ?></a></li>
+    ?>><a href="<?php echo get_link('admin/') ?>"><?php _e('Index') ?></a></li>
 					<li<?php if ($page == 'users') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
+    ?>><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 <?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php echo __('Bans') ?></a></li>
+    ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
 <?php endif;
     if ($is_admin || $feather_config['o_report_method'] == '0' || $feather_config['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php echo __('Reports') ?></a></li>
+    ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
@@ -44,42 +44,42 @@
 
     if ($is_admin) {
         ?>
-		<h2 class="block2"><span><?php echo __('Admin menu') ?></span></h2>
+		<h2 class="block2"><span><?php _e('Admin menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'options') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/options/') ?>"><?php echo __('Options') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/options/') ?>"><?php _e('Options') ?></a></li>
 					<li<?php if ($page == 'permissions') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/permissions/') ?>"><?php echo __('Permissions') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
 					<li<?php if ($page == 'categories') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/categories/') ?>"><?php echo __('Categories') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
 					<li<?php if ($page == 'forums') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/forums/') ?>"><?php echo __('Forums') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
 					<li<?php if ($page == 'groups') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/groups/') ?>"><?php echo __('User groups') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
 					<li<?php if ($page == 'censoring') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/censoring/') ?>"><?php echo __('Censoring') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
 					<li<?php if ($page == 'parser') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/parser/') ?>"><?php echo __('Parser') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
 					<li<?php if ($page == 'maintenance') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/maintenance/') ?>"><?php echo __('Maintenance') ?></a></li>
+        ?>><a href="<?php echo get_link('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
 				</ul>
 			</div>
 		</div>
@@ -90,7 +90,7 @@
     // Did we find any plugins?
     if (!empty($plugins)) {
         ?>
-		<h2 class="block2"><span><?php echo __('Plugins menu') ?></span></h2>
+		<h2 class="block2"><span><?php _e('Plugins menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
diff --git a/view/admin/options.php b/view/admin/options.php
index a19ccddb..faa8e34c 100644
--- a/view/admin/options.php
+++ b/view/admin/options.php
@@ -14,180 +14,180 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Options head') ?></span></h2>
+		<h2><span><?php _e('Options head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/options/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
+				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
 					<input type="hidden" name="form_sent" value="1" />
 					<fieldset>
-						<legend><?php echo __('Essentials subhead') ?></legend>
+						<legend><?php _e('Essentials subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Board title label') ?></th>
+									<th scope="row"><?php _e('Board title label') ?></th>
 									<td>
 										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather_config['o_board_title']) ?>" />
-										<span><?php echo __('Board title help') ?></span>
+										<span><?php _e('Board title help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Board desc label') ?></th>
+									<th scope="row"><?php _e('Board desc label') ?></th>
 									<td>
 										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather_config['o_board_desc']) ?></textarea>
-										<span><?php echo __('Board desc help') ?></span>
+										<span><?php _e('Board desc help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Base URL label') ?></th>
+									<th scope="row"><?php _e('Base URL label') ?></th>
 									<td>
 										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather_config['o_base_url']) ?>" />
-										<span><?php echo __('Base URL help') ?></span>
+										<span><?php _e('Base URL help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Timezone label') ?></th>
+									<th scope="row"><?php _e('Timezone label') ?></th>
 									<td>
 										<select name="form_default_timezone">
 											<option value="-12"<?php if ($feather_config['o_default_timezone'] == -12) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-12:00') ?></option>
+} ?>><?php _e('UTC-12:00') ?></option>
 											<option value="-11"<?php if ($feather_config['o_default_timezone'] == -11) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-11:00') ?></option>
+} ?>><?php _e('UTC-11:00') ?></option>
 											<option value="-10"<?php if ($feather_config['o_default_timezone'] == -10) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-10:00') ?></option>
+} ?>><?php _e('UTC-10:00') ?></option>
 											<option value="-9.5"<?php if ($feather_config['o_default_timezone'] == -9.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-09:30') ?></option>
+} ?>><?php _e('UTC-09:30') ?></option>
 											<option value="-9"<?php if ($feather_config['o_default_timezone'] == -9) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-09:00') ?></option>
+} ?>><?php _e('UTC-09:00') ?></option>
 											<option value="-8.5"<?php if ($feather_config['o_default_timezone'] == -8.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-08:30') ?></option>
+} ?>><?php _e('UTC-08:30') ?></option>
 											<option value="-8"<?php if ($feather_config['o_default_timezone'] == -8) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-08:00') ?></option>
+} ?>><?php _e('UTC-08:00') ?></option>
 											<option value="-7"<?php if ($feather_config['o_default_timezone'] == -7) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-07:00') ?></option>
+} ?>><?php _e('UTC-07:00') ?></option>
 											<option value="-6"<?php if ($feather_config['o_default_timezone'] == -6) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-06:00') ?></option>
+} ?>><?php _e('UTC-06:00') ?></option>
 											<option value="-5"<?php if ($feather_config['o_default_timezone'] == -5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-05:00') ?></option>
+} ?>><?php _e('UTC-05:00') ?></option>
 											<option value="-4"<?php if ($feather_config['o_default_timezone'] == -4) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-04:00') ?></option>
+} ?>><?php _e('UTC-04:00') ?></option>
 											<option value="-3.5"<?php if ($feather_config['o_default_timezone'] == -3.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-03:30') ?></option>
+} ?>><?php _e('UTC-03:30') ?></option>
 											<option value="-3"<?php if ($feather_config['o_default_timezone'] == -3) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-03:00') ?></option>
+} ?>><?php _e('UTC-03:00') ?></option>
 											<option value="-2"<?php if ($feather_config['o_default_timezone'] == -2) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-02:00') ?></option>
+} ?>><?php _e('UTC-02:00') ?></option>
 											<option value="-1"<?php if ($feather_config['o_default_timezone'] == -1) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-01:00') ?></option>
+} ?>><?php _e('UTC-01:00') ?></option>
 											<option value="0"<?php if ($feather_config['o_default_timezone'] == 0) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC') ?></option>
+} ?>><?php _e('UTC') ?></option>
 											<option value="1"<?php if ($feather_config['o_default_timezone'] == 1) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+01:00') ?></option>
+} ?>><?php _e('UTC+01:00') ?></option>
 											<option value="2"<?php if ($feather_config['o_default_timezone'] == 2) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+02:00') ?></option>
+} ?>><?php _e('UTC+02:00') ?></option>
 											<option value="3"<?php if ($feather_config['o_default_timezone'] == 3) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+03:00') ?></option>
+} ?>><?php _e('UTC+03:00') ?></option>
 											<option value="3.5"<?php if ($feather_config['o_default_timezone'] == 3.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+03:30') ?></option>
+} ?>><?php _e('UTC+03:30') ?></option>
 											<option value="4"<?php if ($feather_config['o_default_timezone'] == 4) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+04:00') ?></option>
+} ?>><?php _e('UTC+04:00') ?></option>
 											<option value="4.5"<?php if ($feather_config['o_default_timezone'] == 4.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+04:30') ?></option>
+} ?>><?php _e('UTC+04:30') ?></option>
 											<option value="5"<?php if ($feather_config['o_default_timezone'] == 5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:00') ?></option>
+} ?>><?php _e('UTC+05:00') ?></option>
 											<option value="5.5"<?php if ($feather_config['o_default_timezone'] == 5.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:30') ?></option>
+} ?>><?php _e('UTC+05:30') ?></option>
 											<option value="5.75"<?php if ($feather_config['o_default_timezone'] == 5.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:45') ?></option>
+} ?>><?php _e('UTC+05:45') ?></option>
 											<option value="6"<?php if ($feather_config['o_default_timezone'] == 6) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+06:00') ?></option>
+} ?>><?php _e('UTC+06:00') ?></option>
 											<option value="6.5"<?php if ($feather_config['o_default_timezone'] == 6.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+06:30') ?></option>
+} ?>><?php _e('UTC+06:30') ?></option>
 											<option value="7"<?php if ($feather_config['o_default_timezone'] == 7) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+07:00') ?></option>
+} ?>><?php _e('UTC+07:00') ?></option>
 											<option value="8"<?php if ($feather_config['o_default_timezone'] == 8) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+08:00') ?></option>
+} ?>><?php _e('UTC+08:00') ?></option>
 											<option value="8.75"<?php if ($feather_config['o_default_timezone'] == 8.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+08:45') ?></option>
+} ?>><?php _e('UTC+08:45') ?></option>
 											<option value="9"<?php if ($feather_config['o_default_timezone'] == 9) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+09:00') ?></option>
+} ?>><?php _e('UTC+09:00') ?></option>
 											<option value="9.5"<?php if ($feather_config['o_default_timezone'] == 9.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+09:30') ?></option>
+} ?>><?php _e('UTC+09:30') ?></option>
 											<option value="10"<?php if ($feather_config['o_default_timezone'] == 10) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+10:00') ?></option>
+} ?>><?php _e('UTC+10:00') ?></option>
 											<option value="10.5"<?php if ($feather_config['o_default_timezone'] == 10.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+10:30') ?></option>
+} ?>><?php _e('UTC+10:30') ?></option>
 											<option value="11"<?php if ($feather_config['o_default_timezone'] == 11) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+11:00') ?></option>
+} ?>><?php _e('UTC+11:00') ?></option>
 											<option value="11.5"<?php if ($feather_config['o_default_timezone'] == 11.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+11:30') ?></option>
+} ?>><?php _e('UTC+11:30') ?></option>
 											<option value="12"<?php if ($feather_config['o_default_timezone'] == 12) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+12:00') ?></option>
+} ?>><?php _e('UTC+12:00') ?></option>
 											<option value="12.75"<?php if ($feather_config['o_default_timezone'] == 12.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+12:45') ?></option>
+} ?>><?php _e('UTC+12:45') ?></option>
 											<option value="13"<?php if ($feather_config['o_default_timezone'] == 13) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+13:00') ?></option>
+} ?>><?php _e('UTC+13:00') ?></option>
 											<option value="14"<?php if ($feather_config['o_default_timezone'] == 14) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+14:00') ?></option>
+} ?>><?php _e('UTC+14:00') ?></option>
 										</select>
-										<span><?php echo __('Timezone help') ?></span>
+										<span><?php _e('Timezone help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('DST label') ?></th>
+									<th scope="row"><?php _e('DST label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather_config['o_default_dst'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather_config['o_default_dst'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('DST help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('DST help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Language label') ?></th>
+									<th scope="row"><?php _e('Language label') ?></th>
 									<td>
 										<select name="form_default_lang">
 <?php
@@ -201,16 +201,16 @@
 
 ?>
 										</select>
-										<span><?php echo __('Language help') ?></span>
+										<span><?php _e('Language help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Default style label') ?></th>
+									<th scope="row"><?php _e('Default style label') ?></th>
 									<td>
 										<select name="form_default_style">
 											<?php echo $styles; ?>
 										</select>
-										<span><?php echo __('Default style help') ?></span>
+										<span><?php _e('Default style help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -225,42 +225,42 @@
 ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Timeouts subhead') ?></legend>
+						<legend><?php _e('Timeouts subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Time format label') ?></th>
+									<th scope="row"><?php _e('Time format label') ?></th>
 									<td>
 										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_time_format']) ?>" />
 										<span><?php printf(__('Time format help'), gmdate($feather_config['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Date format label') ?></th>
+									<th scope="row"><?php _e('Date format label') ?></th>
 									<td>
 										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_date_format']) ?>" />
 										<span><?php printf(__('Date format help'), gmdate($feather_config['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Visit timeout label') ?></th>
+									<th scope="row"><?php _e('Visit timeout label') ?></th>
 									<td>
 										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_visit'] ?>" />
-										<span><?php echo __('Visit timeout help') ?></span>
+										<span><?php _e('Visit timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Online timeout label') ?></th>
+									<th scope="row"><?php _e('Online timeout label') ?></th>
 									<td>
 										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_online'] ?>" />
-										<span><?php echo __('Online timeout help') ?></span>
+										<span><?php _e('Online timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Redirect time label') ?></th>
+									<th scope="row"><?php _e('Redirect time label') ?></th>
 									<td>
 										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather_config['o_redirect_delay'] ?>" />
-										<span><?php echo __('Redirect time help') ?></span>
+										<span><?php _e('Redirect time help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -269,114 +269,114 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Display subhead') ?></legend>
+						<legend><?php _e('Display subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Version number label') ?></th>
+									<th scope="row"><?php _e('Version number label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather_config['o_show_version'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather_config['o_show_version'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Version number help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Version number help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Info in posts label') ?></th>
+									<th scope="row"><?php _e('Info in posts label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather_config['o_show_user_info'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather_config['o_show_user_info'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Info in posts help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Info in posts help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Post count label') ?></th>
+									<th scope="row"><?php _e('Post count label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather_config['o_show_post_count'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather_config['o_show_post_count'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Post count help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post count help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Smilies label') ?></th>
+									<th scope="row"><?php _e('Smilies label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather_config['o_smilies'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather_config['o_smilies'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Smilies help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Smilies help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Smilies sigs label') ?></th>
+									<th scope="row"><?php _e('Smilies sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather_config['o_smilies_sig'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather_config['o_smilies_sig'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Smilies sigs help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Smilies sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Clickable links label') ?></th>
+									<th scope="row"><?php _e('Clickable links label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather_config['o_make_links'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather_config['o_make_links'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Clickable links help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Clickable links help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Topic review label') ?></th>
+									<th scope="row"><?php _e('Topic review label') ?></th>
 									<td>
 										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather_config['o_topic_review'] ?>" />
-										<span><?php echo __('Topic review help') ?></span>
+										<span><?php _e('Topic review help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Topics per page label') ?></th>
+									<th scope="row"><?php _e('Topics per page label') ?></th>
 									<td>
 										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_topics_default'] ?>" />
-										<span><?php echo __('Topics per page help') ?></span>
+										<span><?php _e('Topics per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Posts per page label') ?></th>
+									<th scope="row"><?php _e('Posts per page label') ?></th>
 									<td>
 										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_posts_default'] ?>" />
-										<span><?php echo __('Posts per page help') ?></span>
+										<span><?php _e('Posts per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Indent label') ?></th>
+									<th scope="row"><?php _e('Indent label') ?></th>
 									<td>
 										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather_config['o_indent_num_spaces'] ?>" />
-										<span><?php echo __('Indent help') ?></span>
+										<span><?php _e('Indent help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Quote depth label') ?></th>
+									<th scope="row"><?php _e('Quote depth label') ?></th>
 									<td>
 										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather_config['o_quote_depth'] ?>" />
-										<span><?php echo __('Quote depth help') ?></span>
+										<span><?php _e('Quote depth help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -385,122 +385,122 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Features subhead') ?></legend>
+						<legend><?php _e('Features subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Quick post label') ?></th>
+									<th scope="row"><?php _e('Quick post label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather_config['o_quickpost'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather_config['o_quickpost'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Quick post help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Quick post help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Users online label') ?></th>
+									<th scope="row"><?php _e('Users online label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather_config['o_users_online'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather_config['o_users_online'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Users online help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Users online help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><a name="censoring"></a><?php echo __('Censor words label') ?></th>
+									<th scope="row"><a name="censoring"></a><?php _e('Censor words label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather_config['o_censoring'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather_config['o_censoring'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><a name="signatures"></a><?php echo __('Signatures label') ?></th>
+									<th scope="row"><a name="signatures"></a><?php _e('Signatures label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather_config['o_signatures'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather_config['o_signatures'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Signatures help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Signatures help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('User has posted label') ?></th>
+									<th scope="row"><?php _e('User has posted label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather_config['o_show_dot'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather_config['o_show_dot'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('User has posted help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('User has posted help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Topic views label') ?></th>
+									<th scope="row"><?php _e('Topic views label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather_config['o_topic_views'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather_config['o_topic_views'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Topic views help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Topic views help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Quick jump label') ?></th>
+									<th scope="row"><?php _e('Quick jump label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather_config['o_quickjump'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather_config['o_quickjump'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Quick jump help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Quick jump help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('GZip label') ?></th>
+									<th scope="row"><?php _e('GZip label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather_config['o_gzip'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather_config['o_gzip'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('GZip help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('GZip help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Search all label') ?></th>
+									<th scope="row"><?php _e('Search all label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather_config['o_search_all_forums'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather_config['o_search_all_forums'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Search all help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Search all help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Menu items label') ?></th>
+									<th scope="row"><?php _e('Menu items label') ?></th>
 									<td>
 										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather_config['o_additional_navlinks']) ?></textarea>
-										<span><?php echo __('Menu items help') ?></span>
+										<span><?php _e('Menu items help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -509,34 +509,34 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Feed subhead') ?></legend>
+						<legend><?php _e('Feed subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Default feed label') ?></th>
+									<th scope="row"><?php _e('Default feed label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather_config['o_feed_type'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('None') ?></strong></label>
+} ?> />&#160;<strong><?php _e('None') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather_config['o_feed_type'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('RSS') ?></strong></label>
+} ?> />&#160;<strong><?php _e('RSS') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather_config['o_feed_type'] == '2') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Atom') ?></strong></label>
-										<span class="clearb"><?php echo __('Default feed help') ?></span>
+} ?> />&#160;<strong><?php _e('Atom') ?></strong></label>
+										<span class="clearb"><?php _e('Default feed help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Feed TTL label') ?></th>
+									<th scope="row"><?php _e('Feed TTL label') ?></th>
 									<td>
 										<select name="form_feed_ttl">
 											<option value="0"<?php if ($feather_config['o_feed_ttl'] == '0') {
     echo ' selected="selected"';
-} ?>><?php echo __('No cache') ?></option>
+} ?>><?php _e('No cache') ?></option>
 											<?php echo $times ?>
 										</select>
-										<span><?php echo __('Feed TTL help') ?></span>
+										<span><?php _e('Feed TTL help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -545,29 +545,29 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Reports subhead') ?></legend>
+						<legend><?php _e('Reports subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Reporting method label') ?></th>
+									<th scope="row"><?php _e('Reporting method label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather_config['o_report_method'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Internal') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Internal') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather_config['o_report_method'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('By e-mail') ?></strong></label>
+} ?> />&#160;<strong><?php _e('By e-mail') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather_config['o_report_method'] == '2') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Both') ?></strong></label>
-										<span class="clearb"><?php echo __('Reporting method help') ?></span>
+} ?> />&#160;<strong><?php _e('Both') ?></strong></label>
+										<span class="clearb"><?php _e('Reporting method help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Mailing list label') ?></th>
+									<th scope="row"><?php _e('Mailing list label') ?></th>
 									<td>
 										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather_config['o_mailing_list']) ?></textarea>
-										<span><?php echo __('Mailing list help') ?></span>
+										<span><?php _e('Mailing list help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -576,47 +576,47 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Avatars subhead') ?></legend>
+						<legend><?php _e('Avatars subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Use avatars label') ?></th>
+									<th scope="row"><?php _e('Use avatars label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather_config['o_avatars'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather_config['o_avatars'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Use avatars help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Use avatars help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Upload directory label') ?></th>
+									<th scope="row"><?php _e('Upload directory label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather_config['o_avatars_dir']) ?>" />
-										<span><?php echo __('Upload directory help') ?></span>
+										<span><?php _e('Upload directory help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Max width label') ?></th>
+									<th scope="row"><?php _e('Max width label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_width'] ?>" />
-										<span><?php echo __('Max width help') ?></span>
+										<span><?php _e('Max width help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Max height label') ?></th>
+									<th scope="row"><?php _e('Max height label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_height'] ?>" />
-										<span><?php echo __('Max height help') ?></span>
+										<span><?php _e('Max height help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Max size label') ?></th>
+									<th scope="row"><?php _e('Max size label') ?></th>
 									<td>
 										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-										<span><?php echo __('Max size help') ?></span>
+										<span><?php _e('Max size help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -625,81 +625,81 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('E-mail subhead') ?></legend>
+						<legend><?php _e('E-mail subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Admin e-mail label') ?></th>
+									<th scope="row"><?php _e('Admin e-mail label') ?></th>
 									<td>
 										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_admin_email']) ?>" />
-										<span><?php echo __('Admin e-mail help') ?></span>
+										<span><?php _e('Admin e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Webmaster e-mail label') ?></th>
+									<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
 									<td>
 										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_webmaster_email']) ?>" />
-										<span><?php echo __('Webmaster e-mail help') ?></span>
+										<span><?php _e('Webmaster e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Forum subscriptions label') ?></th>
+									<th scope="row"><?php _e('Forum subscriptions label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather_config['o_forum_subscriptions'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather_config['o_forum_subscriptions'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Forum subscriptions help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Forum subscriptions help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Topic subscriptions label') ?></th>
+									<th scope="row"><?php _e('Topic subscriptions label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather_config['o_topic_subscriptions'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather_config['o_topic_subscriptions'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Topic subscriptions help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Topic subscriptions help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('SMTP address label') ?></th>
+									<th scope="row"><?php _e('SMTP address label') ?></th>
 									<td>
 										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather_config['o_smtp_host']) ?>" />
-										<span><?php echo __('SMTP address help') ?></span>
+										<span><?php _e('SMTP address help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('SMTP username label') ?></th>
+									<th scope="row"><?php _e('SMTP username label') ?></th>
 									<td>
 										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather_config['o_smtp_user']) ?>" />
-										<span><?php echo __('SMTP username help') ?></span>
+										<span><?php _e('SMTP username help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('SMTP password label') ?></th>
+									<th scope="row"><?php _e('SMTP password label') ?></th>
 									<td>
-										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php echo __('SMTP change password help') ?></label>
+										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
 <?php $smtp_pass = !empty($feather_config['o_smtp_pass']) ? random_key(feather_strlen($feather_config['o_smtp_pass']), true) : ''; ?>
 										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
-										<span><?php echo __('SMTP password help') ?></span>
+										<span><?php _e('SMTP password help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('SMTP SSL label') ?></th>
+									<th scope="row"><?php _e('SMTP SSL label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather_config['o_smtp_ssl'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather_config['o_smtp_ssl'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('SMTP SSL help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('SMTP SSL help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -708,77 +708,77 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Registration subhead') ?></legend>
+						<legend><?php _e('Registration subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Allow new label') ?></th>
+									<th scope="row"><?php _e('Allow new label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather_config['o_regs_allow'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather_config['o_regs_allow'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Allow new help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Allow new help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Verify label') ?></th>
+									<th scope="row"><?php _e('Verify label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather_config['o_regs_verify'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather_config['o_regs_verify'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Verify help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Verify help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Report new label') ?></th>
+									<th scope="row"><?php _e('Report new label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather_config['o_regs_report'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather_config['o_regs_report'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Report new help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Report new help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Use rules label') ?></th>
+									<th scope="row"><?php _e('Use rules label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather_config['o_rules'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather_config['o_rules'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Use rules help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Use rules help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Rules label') ?></th>
+									<th scope="row"><?php _e('Rules label') ?></th>
 									<td>
 										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather_config['o_rules_message']) ?></textarea>
-										<span><?php echo __('Rules help') ?></span>
+										<span><?php _e('Rules help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('E-mail default label') ?></th>
+									<th scope="row"><?php _e('E-mail default label') ?></th>
 									<td>
-										<span><?php echo __('E-mail default help') ?></span>
+										<span><?php _e('E-mail default help') ?></span>
 										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather_config['o_default_email_setting'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<?php echo __('Display e-mail label') ?></label>
+} ?> />&#160;<?php _e('Display e-mail label') ?></label>
 										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather_config['o_default_email_setting'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<?php echo __('Hide allow form label') ?></label>
+} ?> />&#160;<?php _e('Hide allow form label') ?></label>
 										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather_config['o_default_email_setting'] == '2') {
     echo ' checked="checked"';
-} ?> />&#160;<?php echo __('Hide both label') ?></label>
+} ?> />&#160;<?php _e('Hide both label') ?></label>
 									</td>
 								</tr>
 							</table>
@@ -787,26 +787,26 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Announcement subhead') ?></legend>
+						<legend><?php _e('Announcement subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Display announcement label') ?></th>
+									<th scope="row"><?php _e('Display announcement label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather_config['o_announcement'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather_config['o_announcement'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Display announcement help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Display announcement help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Announcement message label') ?></th>
+									<th scope="row"><?php _e('Announcement message label') ?></th>
 									<td>
 										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_announcement_message']) ?></textarea>
-										<span><?php echo __('Announcement message help') ?></span>
+										<span><?php _e('Announcement message help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -815,33 +815,33 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Maintenance subhead') ?></legend>
+						<legend><?php _e('Maintenance subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><a name="maintenance"></a><?php echo __('Maintenance mode label') ?></th>
+									<th scope="row"><a name="maintenance"></a><?php _e('Maintenance mode label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather_config['o_maintenance'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather_config['o_maintenance'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Maintenance mode help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Maintenance mode help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Maintenance message label') ?></th>
+									<th scope="row"><?php _e('Maintenance message label') ?></th>
 									<td>
 										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_maintenance_message']) ?></textarea>
-										<span><?php echo __('Maintenance message help') ?></span>
+										<span><?php _e('Maintenance message help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
+				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/parser.php b/view/admin/parser.php
index 8049bc52..aec1f767 100644
--- a/view/admin/parser.php
+++ b/view/admin/parser.php
@@ -19,7 +19,7 @@
 			<form method="post" action="<?php echo get_link('admin/parser/') ?>" enctype="multipart/form-data">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop">
-					<input type="submit" name="save" value="<?php echo __('Save changes') ?>" />
+					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
 					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
 				</p>
 				<div class="inform">
@@ -33,9 +33,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[textile]" value="1"<?php if ($config['textile']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[textile]" value="0"<?php if (!$config['textile']) {
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[textile]" value="0"<?php if (!$config['textile']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('No') ?></strong>
+} ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['textile help'] ?></span>
@@ -46,9 +46,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[quote_links]" value="1"<?php if ($config['quote_links']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[quote_links]" value="0"<?php if (!$config['quote_links']) {
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_links]" value="0"<?php if (!$config['quote_links']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('No') ?></strong>
+} ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['quote_links help'] ?></span>
@@ -59,9 +59,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[quote_imgs]" value="1"<?php if ($config['quote_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[quote_imgs]" value="0"<?php if (!$config['quote_imgs']) {
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_imgs]" value="0"<?php if (!$config['quote_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('No') ?></strong>
+} ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['quote_imgs help'] ?></span>
@@ -72,9 +72,9 @@
 									<td colspan="2">
 										<input type="radio" name="config[click_imgs]" value="1"<?php if ($config['click_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="config[click_imgs]" value="0"<?php if (!$config['click_imgs']) {
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[click_imgs]" value="0"<?php if (!$config['click_imgs']) {
     echo ' checked="checked"';
-} ?> /> <strong><?php echo __('No') ?></strong>
+} ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td>
 										<span><?php echo $lang_admin_parser['click_imgs help'] ?></span>
@@ -88,12 +88,12 @@
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
     echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php echo __('Yes') ?></strong>
+} ?> /> <strong><?php _e('Yes') ?></strong>
 										<input type="radio" name="config[valid_imgs]" value="0"<?php if (!$config['valid_imgs']) {
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
     echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php echo __('No') ?></strong>
+} ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td><?php echo $lang_admin_parser['valid_imgs help'] ?></td>
 								</tr>
@@ -257,19 +257,19 @@
 										<input type="radio" name="<?php echo($tagname) ?>_in_post" value="1"<?php if ($bbcd[$tagname]['in_post']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_post" value="0"<?php if (!$bbcd[$tagname]['in_post']) {
+    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_post" value="0"<?php if (!$bbcd[$tagname]['in_post']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo __('No') ?></strong>
+    ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td>
 										<input type="radio" name="<?php echo($tagname) ?>_in_sig" value="1"<?php if ($bbcd[$tagname]['in_sig']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo __('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_sig" value="0"<?php if (!$bbcd[$tagname]['in_sig']) {
+    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_sig" value="0"<?php if (!$bbcd[$tagname]['in_sig']) {
     echo ' checked="checked"';
 }
-    ?> /> <strong><?php echo __('No') ?></strong>
+    ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td>
 										<input type="text" size="10" name="<?php echo($tagname) ?>_depth_max" value="<?php echo($bbcd[$tagname]['depth_max']);
@@ -289,7 +289,7 @@
 
 
 				<p class="submitend">
-					<input type="submit" name="save" value="<?php echo __('Save changes') ?>" />
+					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
 					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
 				</p>
 			</form>
diff --git a/view/admin/permissions.php b/view/admin/permissions.php
index 34fe64cb..a70328ae 100644
--- a/view/admin/permissions.php
+++ b/view/admin/permissions.php
@@ -14,75 +14,75 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Permissions head') ?></span></h2>
+		<h2><span><?php _e('Permissions head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/permissions/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
+				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
 					<input type="hidden" name="form_sent" value="1" />
 					<fieldset>
-						<legend><?php echo __('Posting subhead') ?></legend>
+						<legend><?php _e('Posting subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('BBCode label') ?></th>
+									<th scope="row"><?php _e('BBCode label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather_config['p_message_bbcode'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather_config['p_message_bbcode'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('BBCode help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('BBCode help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Image tag label') ?></th>
+									<th scope="row"><?php _e('Image tag label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather_config['p_message_img_tag'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather_config['p_message_img_tag'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Image tag help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Image tag help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('All caps message label') ?></th>
+									<th scope="row"><?php _e('All caps message label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather_config['p_message_all_caps'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather_config['p_message_all_caps'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('All caps message help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('All caps message help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('All caps subject label') ?></th>
+									<th scope="row"><?php _e('All caps subject label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather_config['p_subject_all_caps'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather_config['p_subject_all_caps'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('All caps subject help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('All caps subject help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Require e-mail label') ?></th>
+									<th scope="row"><?php _e('Require e-mail label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather_config['p_force_guest_email'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather_config['p_force_guest_email'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Require e-mail help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Require e-mail help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -91,57 +91,57 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Signatures subhead') ?></legend>
+						<legend><?php _e('Signatures subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('BBCode sigs label') ?></th>
+									<th scope="row"><?php _e('BBCode sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather_config['p_sig_bbcode'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather_config['p_sig_bbcode'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('BBCode sigs help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('BBCode sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Image tag sigs label') ?></th>
+									<th scope="row"><?php _e('Image tag sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather_config['p_sig_img_tag'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather_config['p_sig_img_tag'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Image tag sigs help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Image tag sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('All caps sigs label') ?></th>
+									<th scope="row"><?php _e('All caps sigs label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather_config['p_sig_all_caps'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather_config['p_sig_all_caps'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('All caps sigs help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('All caps sigs help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Max sig length label') ?></th>
+									<th scope="row"><?php _e('Max sig length label') ?></th>
 									<td>
 										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather_config['p_sig_length'] ?>" />
-										<span class="clearb"><?php echo __('Max sig length help') ?></span>
+										<span class="clearb"><?php _e('Max sig length help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Max sig lines label') ?></th>
+									<th scope="row"><?php _e('Max sig lines label') ?></th>
 									<td>
 										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather_config['p_sig_lines'] ?>" />
-										<span class="clearb"><?php echo __('Max sig lines help') ?></span>
+										<span class="clearb"><?php _e('Max sig lines help') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -150,38 +150,38 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Registration subhead') ?></legend>
+						<legend><?php _e('Registration subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Banned e-mail label') ?></th>
+									<th scope="row"><?php _e('Banned e-mail label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather_config['p_allow_banned_email'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather_config['p_allow_banned_email'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Banned e-mail help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Banned e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Duplicate e-mail label') ?></th>
+									<th scope="row"><?php _e('Duplicate e-mail label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather_config['p_allow_dupe_email'] == '1') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('Yes') ?></strong></label>
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather_config['p_allow_dupe_email'] == '0') {
     echo ' checked="checked"';
-} ?> />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Duplicate e-mail help') ?></span>
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Duplicate e-mail help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php echo __('Save changes') ?>" /></p>
+				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/reports.php b/view/admin/reports.php
index 619980c1..d9a027e3 100644
--- a/view/admin/reports.php
+++ b/view/admin/reports.php
@@ -14,7 +14,7 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('New reports head') ?></span></h2>
+	<h2><span><?php _e('New reports head') ?></span></h2>
 	<div class="box">
 		<form method="post" action="<?php echo get_link('admin/reports/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -34,7 +34,7 @@
 												sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 									</tr>
 									<tr>
-										<th scope="row"><?php echo __('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php echo __('Zap') ?>" /></div></th>
+										<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
 										<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
 									</tr>
 								</table>
@@ -48,9 +48,9 @@
 				?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('None') ?></legend>
+						<legend><?php _e('None') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('No new reports') ?></p>
+							<p><?php _e('No new reports') ?></p>
 						</div>
 					</fieldset>
 				</div>
@@ -64,7 +64,7 @@
 </div>
 
 <div class="blockform block2">
-	<h2><span><?php echo __('Last 10 head') ?></span></h2>
+	<h2><span><?php _e('Last 10 head') ?></span></h2>
 	<div class="box">
 		<div class="fakeform">
 			<?php
@@ -84,7 +84,7 @@
 												sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 									</tr>
 									<tr>
-										<th scope="row"><?php echo __('Reason') ?></th>
+										<th scope="row"><?php _e('Reason') ?></th>
 										<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
 									</tr>
 								</table>
@@ -98,9 +98,9 @@
 				?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('None') ?></legend>
+						<legend><?php _e('None') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('No zapped reports') ?></p>
+							<p><?php _e('No zapped reports') ?></p>
 						</div>
 					</fieldset>
 				</div>
diff --git a/view/admin/statistics.php b/view/admin/statistics.php
index 522bbb5d..5306b027 100644
--- a/view/admin/statistics.php
+++ b/view/admin/statistics.php
@@ -14,21 +14,21 @@
 ?>
 
 	<div class="block">
-		<h2><span><?php echo __('Server statistics head') ?></span></h2>
+		<h2><span><?php _e('Server statistics head') ?></span></h2>
 		<div id="adstats" class="box">
 			<div class="inbox">
 				<dl>
-					<dt><?php echo __('Server load label') ?></dt>
+					<dt><?php _e('Server load label') ?></dt>
 					<dd>
 						<?php printf(__('Server load data')."\n", $server_load, $num_online) ?>
 					</dd>
-<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php echo __('Environment label') ?></dt>
+<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
 					<dd>
 						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
 						<?php printf(__('Environment data version'), phpversion(), '<a href="'.get_link('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
 						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
 					</dd>
-					<dt><?php echo __('Database label') ?></dt>
+					<dt><?php _e('Database label') ?></dt>
 					<dd>
 <?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", forum_number_format($total_records)) ?>
 						<br /><?php printf(__('Database data size')."\n", $total_size) ?>
diff --git a/view/admin/users/admin_users.php b/view/admin/users/admin_users.php
index f29830af..27e99a16 100644
--- a/view/admin/users/admin_users.php
+++ b/view/admin/users/admin_users.php
@@ -14,128 +14,128 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('User search head') ?></span></h2>
+		<h2><span><?php _e('User search head') ?></span></h2>
 		<div class="box">
 			<form id="find_user" method="get" action="<?php echo get_link('admin/users/') ?>">
-				<p class="submittop"><input type="submit" name="find_user" value="<?php echo __('Submit search') ?>" tabindex="1" /></p>
+				<p class="submittop"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="1" /></p>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('User search subhead') ?></legend>
+						<legend><?php _e('User search subhead') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('User search info') ?></p>
+							<p><?php _e('User search info') ?></p>
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Username label') ?></th>
+									<th scope="row"><?php _e('Username label') ?></th>
 									<td><input type="text" name="form[username]" size="25" maxlength="25" tabindex="2" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('E-mail address label') ?></th>
+									<th scope="row"><?php _e('E-mail address label') ?></th>
 									<td><input type="text" name="form[email]" size="30" maxlength="80" tabindex="3" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Title label') ?></th>
+									<th scope="row"><?php _e('Title label') ?></th>
 									<td><input type="text" name="form[title]" size="30" maxlength="50" tabindex="4" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Real name label') ?></th>
+									<th scope="row"><?php _e('Real name label') ?></th>
 									<td><input type="text" name="form[realname]" size="30" maxlength="40" tabindex="5" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Website label') ?></th>
+									<th scope="row"><?php _e('Website label') ?></th>
 									<td><input type="text" name="form[url]" size="35" maxlength="100" tabindex="6" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Jabber label') ?></th>
+									<th scope="row"><?php _e('Jabber label') ?></th>
 									<td><input type="text" name="form[jabber]" size="30" maxlength="75" tabindex="7" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('ICQ label') ?></th>
+									<th scope="row"><?php _e('ICQ label') ?></th>
 									<td><input type="text" name="form[icq]" size="12" maxlength="12" tabindex="8" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('MSN label') ?></th>
+									<th scope="row"><?php _e('MSN label') ?></th>
 									<td><input type="text" name="form[msn]" size="30" maxlength="50" tabindex="9" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('AOL label') ?></th>
+									<th scope="row"><?php _e('AOL label') ?></th>
 									<td><input type="text" name="form[aim]" size="20" maxlength="20" tabindex="10" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Yahoo label') ?></th>
+									<th scope="row"><?php _e('Yahoo label') ?></th>
 									<td><input type="text" name="form[yahoo]" size="20" maxlength="20" tabindex="11" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Location label') ?></th>
+									<th scope="row"><?php _e('Location label') ?></th>
 									<td><input type="text" name="form[location]" size="30" maxlength="30" tabindex="12" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Signature label') ?></th>
+									<th scope="row"><?php _e('Signature label') ?></th>
 									<td><input type="text" name="form[signature]" size="35" maxlength="512" tabindex="13" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Admin note label') ?></th>
+									<th scope="row"><?php _e('Admin note label') ?></th>
 									<td><input type="text" name="form[admin_note]" size="30" maxlength="30" tabindex="14" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Posts more than label') ?></th>
+									<th scope="row"><?php _e('Posts more than label') ?></th>
 									<td><input type="text" name="posts_greater" size="5" maxlength="8" tabindex="15" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Posts less than label') ?></th>
+									<th scope="row"><?php _e('Posts less than label') ?></th>
 									<td><input type="text" name="posts_less" size="5" maxlength="8" tabindex="16" /></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Last post after label') ?></th>
+									<th scope="row"><?php _e('Last post after label') ?></th>
 									<td><input type="text" name="last_post_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Last post before label') ?></th>
+									<th scope="row"><?php _e('Last post before label') ?></th>
 									<td><input type="text" name="last_post_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Last visit after label') ?></th>
+									<th scope="row"><?php _e('Last visit after label') ?></th>
 									<td><input type="text" name="last_visit_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Last visit before label') ?></th>
+									<th scope="row"><?php _e('Last visit before label') ?></th>
 									<td><input type="text" name="last_visit_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Registered after label') ?></th>
+									<th scope="row"><?php _e('Registered after label') ?></th>
 									<td><input type="text" name="registered_after" size="24" maxlength="19" tabindex="19" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Registered before label') ?></th>
+									<th scope="row"><?php _e('Registered before label') ?></th>
 									<td><input type="text" name="registered_before" size="24" maxlength="19" tabindex="20" />
-									<span><?php echo __('Date help') ?></span></td>
+									<span><?php _e('Date help') ?></span></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Order by label') ?></th>
+									<th scope="row"><?php _e('Order by label') ?></th>
 									<td>
 										<select name="order_by" tabindex="21">
-											<option value="username" selected="selected"><?php echo __('Order by username') ?></option>
-											<option value="email"><?php echo __('Order by e-mail') ?></option>
-											<option value="num_posts"><?php echo __('Order by posts') ?></option>
-											<option value="last_post"><?php echo __('Order by last post') ?></option>
-											<option value="last_visit"><?php echo __('Order by last visit') ?></option>
-											<option value="registered"><?php echo __('Order by registered') ?></option>
+											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
+											<option value="email"><?php _e('Order by e-mail') ?></option>
+											<option value="num_posts"><?php _e('Order by posts') ?></option>
+											<option value="last_post"><?php _e('Order by last post') ?></option>
+											<option value="last_visit"><?php _e('Order by last visit') ?></option>
+											<option value="registered"><?php _e('Order by registered') ?></option>
 										</select>&#160;&#160;&#160;<select name="direction" tabindex="22">
-											<option value="ASC" selected="selected"><?php echo __('Ascending') ?></option>
-											<option value="DESC"><?php echo __('Descending') ?></option>
+											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
+											<option value="DESC"><?php _e('Descending') ?></option>
 										</select>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('User group label') ?></th>
+									<th scope="row"><?php _e('User group label') ?></th>
 									<td>
 										<select name="user_group" tabindex="23">
-											<option value="-1" selected="selected"><?php echo __('All groups') ?></option>
-											<option value="0"><?php echo __('Unverified users') ?></option>
+											<option value="-1" selected="selected"><?php _e('All groups') ?></option>
+											<option value="0"><?php _e('Unverified users') ?></option>
 											<?php echo $group_list; ?>
 										</select>
 									</td>
@@ -144,22 +144,22 @@
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="find_user" value="<?php echo __('Submit search') ?>" tabindex="25" /></p>
+				<p class="submitend"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="25" /></p>
 			</form>
 		</div>
 
-		<h2 class="block2"><span><?php echo __('IP search head') ?></span></h2>
+		<h2 class="block2"><span><?php _e('IP search head') ?></span></h2>
 		<div class="box">
 			<form method="get" action="<?php echo get_link('admin/users/') ?>">
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('IP search subhead') ?></legend>
+						<legend><?php _e('IP search subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('IP address label') ?><div><input type="submit" value="<?php echo __('Find IP address') ?>" tabindex="26" /></div></th>
+									<th scope="row"><?php _e('IP address label') ?><div><input type="submit" value="<?php _e('Find IP address') ?>" tabindex="26" /></div></th>
 									<td><input type="text" name="show_users" size="18" maxlength="15" tabindex="24" />
-									<span><?php echo __('IP address help') ?></span></td>
+									<span><?php _e('IP address help') ?></span></td>
 								</tr>
 							</table>
 						</div>
diff --git a/view/admin/users/ban_users.php b/view/admin/users/ban_users.php
index 5d782379..e929c043 100644
--- a/view/admin/users/ban_users.php
+++ b/view/admin/users/ban_users.php
@@ -14,43 +14,43 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Ban users') ?></span></h2>
+		<h2><span><?php _e('Ban users') ?></span></h2>
 		<div class="box">
 			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo get_link('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Message expiry subhead') ?></legend>
+						<legend><?php _e('Message expiry subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('Ban message label') ?></th>
+									<th scope="row"><?php _e('Ban message label') ?></th>
 									<td>
 										<input type="text" name="ban_message" size="50" maxlength="255" tabindex="1" />
-										<span><?php echo __('Ban message help') ?></span>
+										<span><?php _e('Ban message help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Expire date label') ?></th>
+									<th scope="row"><?php _e('Expire date label') ?></th>
 									<td>
 										<input type="text" name="ban_expire" size="17" maxlength="10" tabindex="2" />
-										<span><?php echo __('Expire date help') ?></span>
+										<span><?php _e('Expire date help') ?></span>
 									</td>
 								</tr>
 								<tr>
-									<th scope="row"><?php echo __('Ban IP label') ?></th>
+									<th scope="row"><?php _e('Ban IP label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="3" value="1" checked="checked" />&#160;<strong><?php echo __('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="4" value="0" checked="checked" />&#160;<strong><?php echo __('No') ?></strong></label>
-										<span class="clearb"><?php echo __('Ban IP help') ?></span>
+										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="3" value="1" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="4" value="0" checked="checked" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Ban IP help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="ban_users_comply" value="<?php echo __('Save') ?>" tabindex="3" /></p>
+				<p class="submitend"><input type="submit" name="ban_users_comply" value="<?php _e('Save') ?>" tabindex="3" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/users/delete_users.php b/view/admin/users/delete_users.php
index b3b3c36e..a82c22ec 100644
--- a/view/admin/users/delete_users.php
+++ b/view/admin/users/delete_users.php
@@ -14,24 +14,24 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Delete users') ?></span></h2>
+		<h2><span><?php _e('Delete users') ?></span></h2>
 		<div class="box">
 			<form name="confirm_del_users" method="post" action="<?php echo get_link('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Confirm delete legend') ?></legend>
+						<legend><?php _e('Confirm delete legend') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Confirm delete info') ?></p>
+							<p><?php _e('Confirm delete info') ?></p>
 							<div class="rbox">
-								<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo __('Delete posts') ?><br /></label>
+								<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
 							</div>
-							<p class="warntext"><strong><?php echo __('Delete warning') ?></strong></p>
+							<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
 						</div>
 					</fieldset>
 				</div>
-				<p class="buttons"><input type="submit" name="delete_users_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+				<p class="buttons"><input type="submit" name="delete_users_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/users/find_users.php b/view/admin/users/find_users.php
index bf05ced4..cf547cc5 100644
--- a/view/admin/users/find_users.php
+++ b/view/admin/users/find_users.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/index/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+			<li><a href="<?php echo get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -31,19 +31,19 @@
 <form id="search-users-form" action="<?php echo get_link('admin/users/') ?>" method="post">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <div id="users2" class="blocktable">
-	<h2><span><?php echo __('Results head') ?></span></h2>
+	<h2><span><?php _e('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Results title head') ?></th>
-					<th class="tc4" scope="col"><?php echo __('Results posts head') ?></th>
-					<th class="tc5" scope="col"><?php echo __('Results admin note head') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Results actions head') ?></th>
-<?php if ($can_action): ?>					<th class="tcmod" scope="col"><?php echo __('Select') ?></th>
+					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
+					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
+					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
+<?php if ($can_action): ?>					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
 <?php endif;
     ?>
 				</tr>
@@ -82,17 +82,17 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
-<?php if ($can_action): ?>			<p class="conr modbuttons"><a href="#" onclick="return select_checkboxes('search-users-form', this, '<?php echo __('Unselect all') ?>')"><?php echo __('Select all') ?></a> <?php if ($can_ban) : ?><input type="submit" name="ban_users" value="<?php echo __('Ban') ?>" /><?php endif;
-    if ($can_delete) : ?><input type="submit" name="delete_users" value="<?php echo __('Delete') ?>" /><?php endif;
-    if ($can_move) : ?><input type="submit" name="move_users" value="<?php echo __('Change group') ?>" /><?php endif;
+<?php if ($can_action): ?>			<p class="conr modbuttons"><a href="#" onclick="return select_checkboxes('search-users-form', this, '<?php _e('Unselect all') ?>')"><?php _e('Select all') ?></a> <?php if ($can_ban) : ?><input type="submit" name="ban_users" value="<?php _e('Ban') ?>" /><?php endif;
+    if ($can_delete) : ?><input type="submit" name="delete_users" value="<?php _e('Delete') ?>" /><?php endif;
+    if ($can_move) : ?><input type="submit" name="move_users" value="<?php _e('Change group') ?>" /><?php endif;
     ?></p>
 <?php endif;
     ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/index/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+			<li><a href="<?php echo get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/admin/users/move_users.php b/view/admin/users/move_users.php
index 9b785654..d43303e8 100644
--- a/view/admin/users/move_users.php
+++ b/view/admin/users/move_users.php
@@ -14,32 +14,32 @@
 ?>
 
 	<div class="blockform">
-		<h2><span><?php echo __('Move users') ?></span></h2>
+		<h2><span><?php _e('Move users') ?></span></h2>
 		<div class="box">
 			<form name="confirm_move_users" method="post" action="<?php echo get_link('admin/users/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Move users subhead') ?></legend>
+						<legend><?php _e('Move users subhead') ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php echo __('New group label') ?></th>
+									<th scope="row"><?php _e('New group label') ?></th>
 									<td>
 										<select name="new_group" tabindex="1">
 <?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo feather_escape($group) ?></option>
 <?php endforeach;
     ?>
 										</select>
-										<span><?php echo __('New group help') ?></span>
+										<span><?php _e('New group help') ?></span>
 									</td>
 								</tr>
 							</table>
 						</div>
 					</fieldset>
 				</div>
-				<p class="submitend"><input type="submit" name="move_users_comply" value="<?php echo __('Save') ?>" tabindex="2" /></p>
+				<p class="submitend"><input type="submit" name="move_users_comply" value="<?php _e('Save') ?>" tabindex="2" /></p>
 			</form>
 		</div>
 	</div>
diff --git a/view/admin/users/search_ip.php b/view/admin/users/search_ip.php
index 0fbb89f8..a17e7ac5 100644
--- a/view/admin/users/search_ip.php
+++ b/view/admin/users/search_ip.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -28,16 +28,16 @@
 </div>
 
 <div id="users1" class="blocktable">
-	<h2><span><?php echo __('Results head') ?></span></h2>
+	<h2><span><?php _e('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Results IP address head') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Results last used head') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Results times found head') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Results action head') ?></th>
+					<th class="tcl" scope="col"><?php _e('Results IP address head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results last used head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results times found head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results action head') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -48,7 +48,7 @@
 					<td class="tcl"><a href="<?php echo get_link('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
 					<td class="tc2"><?php echo format_time($ip['last_used']) ?></td>
 					<td class="tc3"><?php echo $ip['used_times'] ?></td>
-					<td class="tcr"><a href="<?php echo get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php echo __('Results find more link') ?></a></td>
+					<td class="tcr"><a href="<?php echo get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
 				</tr>
 <?php
 
@@ -70,9 +70,9 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/admin/users/show_users.php b/view/admin/users/show_users.php
index f93dba7a..4ab008c7 100644
--- a/view/admin/users/show_users.php
+++ b/view/admin/users/show_users.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink"><?php echo $paging_links ?></p>
@@ -28,18 +28,18 @@
 </div>
 
 <div id="users2" class="blocktable">
-	<h2><span><?php echo __('Results head') ?></span></h2>
+	<h2><span><?php _e('Results head') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Results title head') ?></th>
-					<th class="tc4" scope="col"><?php echo __('Results posts head') ?></th>
-					<th class="tc5" scope="col"><?php echo __('Results admin note head') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Results actions head') ?></th>
+					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
+					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
+					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -65,7 +65,7 @@
 				<tr>
 					<td class="tcl"><?php echo feather_escape($cur_poster['poster']) ?></td>
 					<td class="tc2">&#160;</td>
-					<td class="tc3"><?php echo __('Results guest') ?></td>
+					<td class="tc3"><?php _e('Results guest') ?></td>
 					<td class="tc4">&#160;</td>
 					<td class="tc5">&#160;</td>
 					<td class="tcr">&#160;</td>
@@ -91,9 +91,9 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php echo __('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php echo __('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Results head') ?></strong></li>
+			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/delete.php b/view/delete.php
index 65f2440b..8a2d6959 100644
--- a/view/delete.php
+++ b/view/delete.php
@@ -16,26 +16,26 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="index.php"><?php echo __('Index') ?></a></li>
+			<li><a href="index.php"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Delete post') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div class="blockform">
-	<h2><span><?php echo __('Delete post') ?></span></h2>
+	<h2><span><?php _e('Delete post') ?></span></h2>
 	<div class="box">
 		<form method="post" action="<?php echo get_link('delete/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
 					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
-					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php echo __('Delete info') ?></p>
+					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
 				</div>
 			</div>
-			<p class="buttons"><input type="submit" name="delete" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
diff --git a/view/edit.php b/view/edit.php
index 8f2fe702..7b6234bd 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -19,10 +19,10 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Edit post') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
 		</ul>
 	</div>
 </div>
@@ -33,10 +33,10 @@
 if (!empty($errors)) :
 	?>
 	<div id="posterror" class="block">
-		<h2><span><?php echo __('Post errors') ?></span></h2>
+		<h2><span><?php _e('Post errors') ?></span></h2>
 		<div class="box">
 			<div class="inbox error-info">
-				<p><?php echo __('Post errors info') ?></p>
+				<p><?php _e('Post errors info') ?></p>
 				<ul class="error-list">
 					<?php
 					foreach ($errors as $cur_error) {
@@ -51,7 +51,7 @@
 elseif ($feather->request->post('preview')):
 	?>
 	<div id="postpreview" class="blockpost">
-		<h2><span><?php echo __('Post preview') ?></span></h2>
+		<h2><span><?php _e('Post preview') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<div class="postbody">
@@ -75,25 +75,25 @@
 </script>
 <script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
 <div id="editform" class="blockform">
-	<h2><span><?php echo __('Edit post') ?></span></h2>
+	<h2><span><?php _e('Edit post') ?></span></h2>
 	<div class="box">
 		<form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Edit post legend') ?></legend>
+					<legend><?php _e('Edit post legend') ?></legend>
 					<input type="hidden" name="form_sent" value="1" />
 					<div class="infldset txtarea">
-						<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
 							<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
-						<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
 							<script>postEditorToolbar('req_message');</script>
 							<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -103,7 +103,7 @@
 				?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Options') ?></legend>
+						<legend><?php _e('Options') ?></legend>
 						<div class="infldset">
 							<div class="rbox">
 								<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
@@ -114,7 +114,7 @@
 				<?php
 			endif;
 			?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/footer.php b/view/footer.php
index 6d9b7934..f4b79085 100644
--- a/view/footer.php
+++ b/view/footer.php
@@ -11,7 +11,7 @@
 </div>
 
 <div id="brdfooter" class="block">
-	<h2><span><?php echo __('Board footer') ?></span></h2>
+	<h2><span><?php _e('Board footer') ?></span></h2>
 	<div class="box">
 <?php
 
diff --git a/view/header.php b/view/header.php
index 88f0260a..7102cbb9 100644
--- a/view/header.php
+++ b/view/header.php
@@ -9,7 +9,7 @@
 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo __('lang_identifier') ?>" lang="<?php echo __('lang_identifier') ?>" dir="<?php echo __('lang_direction') ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php _e('lang_identifier') ?>" lang="<?php _e('lang_identifier') ?>" dir="<?php _e('lang_direction') ?>">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title><?php echo generate_page_title($page_title, $p) ?></title>
@@ -55,7 +55,7 @@ function process_form(the_form)
 			var elem = the_form.elements[i];
 			if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
 			{
-				alert('"' + required_fields[elem.name] + '" <?php echo __('required field') ?>');
+				alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
 				elem.focus();
 				return false;
 			}
@@ -92,7 +92,7 @@ function process_form(the_form)
 
 <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
 <div id="announce" class="block">
-    <div class="hd"><h2><span><?php echo __('Announcement') ?></span></h2></div>
+    <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
     <div class="box">
         <div id="announce-block" class="inbox">
             <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
@@ -104,7 +104,7 @@ function process_form(the_form)
 <?php if (isset($flash['message'])) : ?>
 <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
 <div id="msgflash" class="block">
-    <h2><span><?php echo __('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
+    <h2><span><?php _e('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
     <div class="box">
         <div class="inbox">
             <p><?php echo feather_escape($flash['message']) ?></p>
diff --git a/view/help.php b/view/help.php
index a7f9300d..b5477db4 100644
--- a/view/help.php
+++ b/view/help.php
@@ -14,113 +14,113 @@
 
 ?>
 
-<h2><span><?php echo __('BBCode') ?></span></h2>
+<h2><span><?php _e('BBCode') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="bbcode"></a><?php echo __('BBCode info 1') ?></p>
-		<p><?php echo __('BBCode info 2') ?></p>
+		<p><a name="bbcode"></a><?php _e('BBCode info 1') ?></p>
+		<p><?php _e('BBCode info 2') ?></p>
 	</div>
 </div>
-<h2><span><?php echo __('Text style') ?></span></h2>
+<h2><span><?php _e('Text style') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Text style info') ?></p>
-		<p><code>[b]<?php echo __('Bold text') ?>[/b]</code> <?php echo __('produces') ?> <samp><strong><?php echo __('Bold text') ?></strong></samp></p>
-		<p><code>[u]<?php echo __('Underlined text') ?>[/u]</code> <?php echo __('produces') ?> <samp><span class="bbu"><?php echo __('Underlined text') ?></span></samp></p>
-		<p><code>[i]<?php echo __('Italic text') ?>[/i]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Italic text') ?></em></samp></p>
-		<p><code>[s]<?php echo __('Strike-through text') ?>[/s]</code> <?php echo __('produces') ?> <samp><span class="bbs"><?php echo __('Strike-through text') ?></span></samp></p>
-		<p><code>[del]<?php echo __('Deleted text') ?>[/del]</code> <?php echo __('produces') ?> <samp><del><?php echo __('Deleted text') ?></del></samp></p>
-		<p><code>[ins]<?php echo __('Inserted text') ?>[/ins]</code> <?php echo __('produces') ?> <samp><ins><?php echo __('Inserted text') ?></ins></samp></p>
-		<p><code>[em]<?php echo __('Emphasised text') ?>[/em]</code> <?php echo __('produces') ?> <samp><em><?php echo __('Emphasised text') ?></em></samp></p>
-		<p><code>[color=#FF0000]<?php echo __('Red text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: #ff0000"><?php echo __('Red text') ?></span></samp></p>
-		<p><code>[color=blue]<?php echo __('Blue text') ?>[/color]</code> <?php echo __('produces') ?> <samp><span style="color: blue"><?php echo __('Blue text') ?></span></samp></p>
-		<p><code>[h]<?php echo __('Heading text') ?>[/h]</code> <?php echo __('produces') ?></p> <div class="postmsg"><h5><?php echo __('Heading text') ?></h5></div>
+		<p><?php _e('Text style info') ?></p>
+		<p><code>[b]<?php _e('Bold text') ?>[/b]</code> <?php _e('produces') ?> <samp><strong><?php _e('Bold text') ?></strong></samp></p>
+		<p><code>[u]<?php _e('Underlined text') ?>[/u]</code> <?php _e('produces') ?> <samp><span class="bbu"><?php _e('Underlined text') ?></span></samp></p>
+		<p><code>[i]<?php _e('Italic text') ?>[/i]</code> <?php _e('produces') ?> <samp><em><?php _e('Italic text') ?></em></samp></p>
+		<p><code>[s]<?php _e('Strike-through text') ?>[/s]</code> <?php _e('produces') ?> <samp><span class="bbs"><?php _e('Strike-through text') ?></span></samp></p>
+		<p><code>[del]<?php _e('Deleted text') ?>[/del]</code> <?php _e('produces') ?> <samp><del><?php _e('Deleted text') ?></del></samp></p>
+		<p><code>[ins]<?php _e('Inserted text') ?>[/ins]</code> <?php _e('produces') ?> <samp><ins><?php _e('Inserted text') ?></ins></samp></p>
+		<p><code>[em]<?php _e('Emphasised text') ?>[/em]</code> <?php _e('produces') ?> <samp><em><?php _e('Emphasised text') ?></em></samp></p>
+		<p><code>[color=#FF0000]<?php _e('Red text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: #ff0000"><?php _e('Red text') ?></span></samp></p>
+		<p><code>[color=blue]<?php _e('Blue text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: blue"><?php _e('Blue text') ?></span></samp></p>
+		<p><code>[h]<?php _e('Heading text') ?>[/h]</code> <?php _e('produces') ?></p> <div class="postmsg"><h5><?php _e('Heading text') ?></h5></div>
 	</div>
 </div>
-<h2><span><?php echo __('Links and images') ?></span></h2>
+<h2><span><?php _e('Links and images') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php echo __('This help page') ?>[/url]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php echo __('This help page') ?></a></samp></p>
-		<p><code>[email]myname@example.com[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
-		<p><code>[email=myname@example.com]<?php echo __('My email address') ?>[/email]</code> <?php echo __('produces') ?> <samp><a href="mailto:myname@example.com"><?php echo __('My email address') ?></a></samp></p>
-		<p><code>[topic=1]<?php echo __('Test topic') ?>[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test topic') ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php echo __('Test post') ?>[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo __('Test post') ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php echo __('Test forum') ?>[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo __('Test forum') ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php echo __('Test user') ?>[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo __('Test user') ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php echo __('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
+		<p><?php _e('Links info') ?></p>
+		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
+		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php _e('This help page') ?></a></samp></p>
+		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
+		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
+		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
 	</div>
 	<div class="inbox">
-		<p><a name="img"></a><?php echo __('Images info') ?></p>
-		<p><code>[img=<?php echo __('FluxBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php echo __('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php echo __('FluxBB bbcode test') ?>" /></samp></p>
+		<p><a name="img"></a><?php _e('Images info') ?></p>
+		<p><code>[img=<?php _e('FluxBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php _e('FluxBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
-<h2><span><?php echo __('Quotes') ?></span></h2>
+<h2><span><?php _e('Quotes') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Quotes info') ?></p>
-		<p><code>[quote=James]<?php echo __('Quote text') ?>[/quote]</code></p>
-		<p><?php echo __('produces quote box') ?></p>
+		<p><?php _e('Quotes info') ?></p>
+		<p><code>[quote=James]<?php _e('Quote text') ?>[/quote]</code></p>
+		<p><?php _e('produces quote box') ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><cite>James <?php echo __('wrote') ?></cite><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
+			<div class="quotebox"><cite>James <?php _e('wrote') ?></cite><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo __('Quotes info 2') ?></p>
-		<p><code>[quote]<?php echo __('Quote text') ?>[/quote]</code></p>
-		<p><?php echo __('produces quote box') ?></p>
+		<p><?php _e('Quotes info 2') ?></p>
+		<p><code>[quote]<?php _e('Quote text') ?>[/quote]</code></p>
+		<p><?php _e('produces quote box') ?></p>
 		<div class="postmsg">
-			<div class="quotebox"><blockquote><div><p><?php echo __('Quote text') ?></p></div></blockquote></div>
+			<div class="quotebox"><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
 		</div>
-		<p><?php echo __('quote note') ?></p>
+		<p><?php _e('quote note') ?></p>
 	</div>
 </div>
-<h2><span><?php echo __('Code') ?></span></h2>
+<h2><span><?php _e('Code') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Code info') ?></p>
-		<p><code>[code]<?php echo __('Code text') ?>[/code]</code></p>
-		<p><?php echo __('produces code box') ?></p>
+		<p><?php _e('Code info') ?></p>
+		<p><code>[code]<?php _e('Code text') ?>[/code]</code></p>
+		<p><?php _e('produces code box') ?></p>
 		<div class="postmsg">
-			<div class="codebox"><pre><code><?php echo __('Code text') ?></code></pre></div>
+			<div class="codebox"><pre><code><?php _e('Code text') ?></code></pre></div>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo __('Lists') ?></span></h2>
+<h2><span><?php _e('Lists') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="lists"></a><?php echo __('List info') ?></p>
-		<p><code>[list][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php echo __('produces list') ?></span></p>
+		<p><a name="lists"></a><?php _e('List info') ?></p>
+		<p><code>[list][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php _e('produces list') ?></span></p>
 		<div class="postmsg">
-			<ul><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ul>
+			<ul><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ul>
 		</div>
-		<p><code>[list=1][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php echo __('produces decimal list') ?></span></p>
+		<p><code>[list=1][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php _e('produces decimal list') ?></span></p>
 		<div class="postmsg">
-			<ol class="decimal"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
+			<ol class="decimal"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
 		</div>
-		<p><code>[list=a][*]<?php echo __('List text 1') ?>[/*][*]<?php echo __('List text 2') ?>[/*][*]<?php echo __('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php echo __('produces alpha list') ?></span></p>
+		<p><code>[list=a][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php _e('produces alpha list') ?></span></p>
 		<div class="postmsg">
-			<ol class="alpha"><li><p><?php echo __('List text 1') ?></p></li><li><p><?php echo __('List text 2') ?></p></li><li><p><?php echo __('List text 3') ?></p></li></ol>
+			<ol class="alpha"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
 		</div>
 	</div>
 </div>
-<h2><span><?php echo __('Nested tags') ?></span></h2>
+<h2><span><?php _e('Nested tags') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><?php echo __('Nested tags info') ?></p>
-		<p><code>[b][u]<?php echo __('Bold, underlined text') ?>[/u][/b]</code> <?php echo __('produces') ?> <samp><strong><span class="bbu"><?php echo __('Bold, underlined text') ?></span></strong></samp></p>
+		<p><?php _e('Nested tags info') ?></p>
+		<p><code>[b][u]<?php _e('Bold, underlined text') ?>[/u][/b]</code> <?php _e('produces') ?> <samp><strong><span class="bbu"><?php _e('Bold, underlined text') ?></span></strong></samp></p>
 	</div>
 </div>
-<h2><span><?php echo __('Smilies') ?></span></h2>
+<h2><span><?php _e('Smilies') ?></span></h2>
 <div class="box">
 	<div class="inbox">
-		<p><a name="smilies"></a><?php echo __('Smilies info') ?></p>
+		<p><a name="smilies"></a><?php _e('Smilies info') ?></p>
 <?php
 
 // Display the smiley set
diff --git a/view/index.php b/view/index.php
index d9d5ca64..3142e1bd 100644
--- a/view/index.php
+++ b/view/index.php
@@ -13,7 +13,7 @@
 }
 
 if (empty($index_data)): ?>
-    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php echo __('Empty board') ?></p></div></div></div>
+    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php _e('Empty board') ?></p></div></div></div>
 <?php endif;
 foreach ($index_data as $forum) {
     if ($forum->cid != $cur_cat) :
@@ -33,10 +33,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Forum') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Topics') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
+					<th class="tcl" scope="col"><?php _e('Forum') ?></th>
+					<th class="tc2" scope="col"><?php _e('Topics') ?></th>
+					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
+					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -80,17 +80,17 @@
 endif;
 ?>
 <div id="brdstats" class="block">
-	<h2><span><?php echo __('Board info') ?></span></h2>
+	<h2><span><?php _e('Board info') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<dl class="conr">
-				<dt><strong><?php echo __('Board stats') ?></strong></dt>
+				<dt><strong><?php _e('Board stats') ?></strong></dt>
 				<dd><span><?php printf(__('No of users'), '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
 				<dd><span><?php printf(__('No of topics'), '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
 				<dd><span><?php printf(__('No of posts'), '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
 			</dl>
 			<dl class="conl">
-				<dt><strong><?php echo __('User info') ?></strong></dt>
+				<dt><strong><?php _e('User info') ?></strong></dt>
 				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
 				<?php if ($feather_config['o_users_online'] == 1) : ?>
 				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
diff --git a/view/login/form.php b/view/login/form.php
index fb8f2404..13d1744b 100644
--- a/view/login/form.php
+++ b/view/login/form.php
@@ -14,29 +14,29 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Login') ?></span></h2>
+	<h2><span><?php _e('Login') ?></span></h2>
 	<div class="box">
 		<form id="login" method="post" action="<?php echo get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Login legend') ?></legend>
+					<legend><?php _e('Login legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="conl required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
-						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
+						<label class="conl required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
+						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
 
 						<div class="rbox clearb">
-							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php echo __('Remember me') ?><br /></label>
+							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php _e('Remember me') ?><br /></label>
 						</div>
 
-						<p class="clearb"><?php echo __('Login info') ?></p>
-						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php echo __('Not registered') ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php echo __('Forgotten pass') ?></a></span></p>
+						<p class="clearb"><?php _e('Login info') ?></p>
+						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="login" value="<?php echo __('Login') ?>" tabindex="4" /></p>
+			<p class="buttons"><input type="submit" name="login" value="<?php _e('Login') ?>" tabindex="4" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/login/password_forgotten.php b/view/login/password_forgotten.php
index 979b915c..41c0a121 100644
--- a/view/login/password_forgotten.php
+++ b/view/login/password_forgotten.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo __('New password errors') ?></span></h2>
+	<h2><span><?php _e('New password errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo __('New passworderrors info') ?></p>
+			<p><?php _e('New passworderrors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,21 +37,21 @@
 }
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Request pass') ?></span></h2>
+	<h2><span><?php _e('Request pass') ?></span></h2>
 	<div class="box">
 		<form id="request_pass" method="post" action="<?php echo get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Request pass legend') ?></legend>
+					<legend><?php _e('Request pass legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
-						<p><?php echo __('Request pass info') ?></p>
+						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
+						<p><?php _e('Request pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="request_pass" value="<?php echo __('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a><?php endif; ?></p>
+			<p class="buttons"><input type="submit" name="request_pass" value="<?php _e('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a><?php endif; ?></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/message.php b/view/message.php
index d376bd09..740b040e 100644
--- a/view/message.php
+++ b/view/message.php
@@ -14,11 +14,11 @@
 
 ?>
 <div id="msg" class="block">
-	<h2><span><?php echo __('Info') ?></span></h2>
+	<h2><span><?php _e('Info') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<p><?php echo $message ?></p>
-<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php echo __('Go back') ?></a></p>
+<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php _e('Go back') ?></a></p>
 <?php endif;
     ?>		</div>
 	</div>
diff --git a/view/misc/email.php b/view/misc/email.php
index 7004040d..eb44dafb 100644
--- a/view/misc/email.php
+++ b/view/misc/email.php
@@ -14,24 +14,24 @@
 
 ?>
 <div id="emailform" class="blockform">
-	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
+	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="<?php echo get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write email') ?></legend>
+					<legend><?php _e('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo __('Email disclosure note') ?></p>
+						<p><?php _e('Email disclosure note') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/misc/report.php b/view/misc/report.php
index 121feac2..252042c7 100644
--- a/view/misc/report.php
+++ b/view/misc/report.php
@@ -16,29 +16,29 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Report post') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
 		</ul>
 	</div>
 </div>
 
 <div id="reportform" class="blockform">
-	<h2><span><?php echo __('Report post') ?></span></h2>
+	<h2><span><?php _e('Report post') ?></span></h2>
 	<div class="box">
 		<form id="report" method="post" action="<?php echo get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Reason desc') ?></legend>
+					<legend><?php _e('Reason desc') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('Reason') ?> <span><?php echo __('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
+						<label class="required"><strong><?php _e('Reason') ?> <span><?php _e('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/misc/rules.php b/view/misc/rules.php
index d32a805e..366880ee 100644
--- a/view/misc/rules.php
+++ b/view/misc/rules.php
@@ -14,7 +14,7 @@
 
 ?>
 <div id="rules" class="block">
-	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
+	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<div id="rules-block" class="inbox">
 			<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
diff --git a/view/moderate/delete_posts.php b/view/moderate/delete_posts.php
index 4b95a5f1..00b80920 100644
--- a/view/moderate/delete_posts.php
+++ b/view/moderate/delete_posts.php
@@ -14,20 +14,20 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Delete posts') ?></span></h2>
+	<h2><span><?php _e('Delete posts') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm delete legend') ?></legend>
+					<legend><?php _e('Confirm delete legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<p><?php echo __('Delete posts comply') ?></p>
+						<p><?php _e('Delete posts comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/delete_topics.php b/view/moderate/delete_topics.php
index e414f734..d0ab1eed 100644
--- a/view/moderate/delete_topics.php
+++ b/view/moderate/delete_topics.php
@@ -15,20 +15,20 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('Delete topics') ?></span></h2>
+	<h2><span><?php _e('Delete topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm delete legend') ?></legend>
+					<legend><?php _e('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Delete topics comply') ?></p>
+						<p><?php _e('Delete topics comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/merge_topics.php b/view/moderate/merge_topics.php
index b55f586b..820cedee 100644
--- a/view/moderate/merge_topics.php
+++ b/view/moderate/merge_topics.php
@@ -15,22 +15,22 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('Merge topics') ?></span></h2>
+	<h2><span><?php _e('Merge topics') ?></span></h2>
 	<div class="box">
 		<form method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm merge legend') ?></legend>
+					<legend><?php _e('Confirm merge legend') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1" /><?php echo __('Leave redirect') ?><br /></label>
+							<label><input type="checkbox" name="with_redirect" value="1" /><?php _e('Leave redirect') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php echo __('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php _e('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
index bf893ce4..35b67b41 100644
--- a/view/moderate/moderator_forum.php
+++ b/view/moderate/moderator_forum.php
@@ -17,9 +17,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -38,11 +38,11 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
-<?php endif; ?>					<th class="tcr"><?php echo __('Last post') ?></th>
-					<th class="tcmod" scope="col"><?php echo __('Select') ?></th>
+					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
+					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php endif; ?>					<th class="tcr"><?php _e('Last post') ?></th>
+					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -87,13 +87,13 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php echo __('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php echo __('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php echo __('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php echo __('Close') ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php _e('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php _e('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php _e('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php _e('Close') ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/moderate/move_topics.php b/view/moderate/move_topics.php
index 389f1f05..e72ae5cb 100644
--- a/view/moderate/move_topics.php
+++ b/view/moderate/move_topics.php
@@ -22,9 +22,9 @@
 			<div class="inform">
 			<input type="hidden" name="topics" value="<?php echo $topics ?>" />
 				<fieldset>
-					<legend><?php echo __('Move legend') ?></legend>
+					<legend><?php _e('Move legend') ?></legend>
 					<div class="infldset">
-						<label><?php echo __('Move to') ?>
+						<label><?php _e('Move to') ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
@@ -33,12 +33,12 @@
 						<div class="rbox">
 							<label><input type="checkbox" name="with_redirect" value="1"<?php if ($action == 'single') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Leave redirect') ?><br /></label>
+} ?> /><?php _e('Leave redirect') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php echo __('Move') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php _e('Move') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/moderate/posts_view.php b/view/moderate/posts_view.php
index f957ce8f..482a1c49 100644
--- a/view/moderate/posts_view.php
+++ b/view/moderate/posts_view.php
@@ -16,10 +16,10 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -53,7 +53,7 @@
 						</dl>
 					</div>
 					<div class="postright">
-						<h3 class="nosize"><?php echo __('Message') ?></h3>
+						<h3 class="nosize"><?php _e('Message') ?></h3>
 						<div class="postmsg">
 							<?php echo $post['message']."\n" ?>
 	<?php if ($post['edited'] != '') {
@@ -80,14 +80,14 @@
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php echo __('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php echo __('Delete') ?>"<?php echo $button_status ?> /></p>
+			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php _e('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /></p>
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo __('Moderate') ?></strong></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
diff --git a/view/moderate/split_posts.php b/view/moderate/split_posts.php
index ac012ff3..7c59b0b9 100644
--- a/view/moderate/split_posts.php
+++ b/view/moderate/split_posts.php
@@ -14,27 +14,27 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Split posts') ?></span></h2>
+	<h2><span><?php _e('Split posts') ?></span></h2>
 	<div class="box">
 		<form id="subject" method="post" action="">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm split legend') ?></legend>
+					<legend><?php _e('Confirm split legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<label class="required"><strong><?php echo __('New subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
-						<label><?php echo __('Move to') ?>
+						<label class="required"><strong><?php _e('New subject') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
+						<label><?php _e('Move to') ?>
 						<br /><select name="move_to_forum">
 								<?php echo $list_forums ?>
 							</optgroup>
 						</select>
 						<br /></label>
-						<p><?php echo __('Split posts comply') ?></p>
+						<p><?php _e('Split posts comply') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php echo __('Split') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php _e('Split') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/post.php b/view/post.php
index 0c341fd0..fbfd6840 100644
--- a/view/post.php
+++ b/view/post.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
@@ -33,10 +33,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo __('Post errors') ?></span></h2>
+	<h2><span><?php _e('Post errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo __('Post errors info') ?></p>
+			<p><?php _e('Post errors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -57,7 +57,7 @@
 
     ?>
 <div id="postpreview" class="blockpost">
-	<h2><span><?php echo __('Post preview') ?></span></h2>
+	<h2><span><?php _e('Post preview') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -93,7 +93,7 @@
 		<?php echo $form."\n" ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write message legend') ?></legend>
+					<legend><?php _e('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
                                                 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -102,7 +102,7 @@
     $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
     $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
-						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
+						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
     echo feather_escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
@@ -115,17 +115,17 @@
 
 }
 if ($fid): ?>
-						<label class="required"><strong><?php echo __('Subject') ?> <span><?php echo __('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
+						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
     echo feather_escape($post['subject']);
 } ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php echo __('Message') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -135,7 +135,7 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Options') ?></legend>
+					<legend><?php _e('Options') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
@@ -151,14 +151,14 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Robot title') ?></legend>
+					<legend><?php _e('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Robot info')    ?></p>
+						<p><?php _e('Robot info')    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
                              $qencoded = md5($question[$index_questions]);
                              echo sprintf(__('Robot question'), $question[$index_questions]);?>
-							 <span><?php echo __('Required') ?></span></strong>
+							 <span><?php _e('Required') ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -166,7 +166,7 @@
 				</fieldset>
 			</div>
 			<?php endif; ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
@@ -176,7 +176,7 @@
 if ($tid && $feather_config['o_topic_review'] != '0') :
 ?>
 <div id="postreview">
-	<h2><span><?php echo __('Topic review') ?></span></h2>
+	<h2><span><?php _e('Topic review') ?></span></h2>
 
 	<?php
     // Set background switching on
diff --git a/view/profile/change_mail.php b/view/profile/change_mail.php
index de0f8d3b..f8d25e99 100644
--- a/view/profile/change_mail.php
+++ b/view/profile/change_mail.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Change email') ?></span></h2>
+	<h2><span><?php _e('Change email') ?></span></h2>
 	<div class="box">
 		<form id="change_email" method="post" action="<?php echo get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Email legend') ?></legend>
+					<legend><?php _e('Email legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php echo __('New email') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
-						<label class="required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
-						<p><?php echo __('Email instructions') ?></p>
+						<label class="required"><strong><?php _e('New email') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
+						<label class="required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
+						<p><?php _e('Email instructions') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="new_email" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="new_email" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/change_pass.php b/view/profile/change_pass.php
index 0f0ab452..3f4285fb 100644
--- a/view/profile/change_pass.php
+++ b/view/profile/change_pass.php
@@ -14,26 +14,26 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Change pass') ?></span></h2>
+	<h2><span><?php _e('Change pass') ?></span></h2>
 	<div class="box">
 		<form id="change_pass" method="post" action="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
 				<fieldset>
-					<legend><?php echo __('Change pass legend') ?></legend>
+					<legend><?php _e('Change pass legend') ?></legend>
 					<div class="infldset">
-<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php echo __('Old pass') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php _e('Old pass') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="password" name="req_old_password" size="16" /><br /></label>
-<?php endif; ?>						<label class="conl required"><strong><?php echo __('New pass') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php endif; ?>						<label class="conl required"><strong><?php _e('New pass') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password1" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo __('Confirm new pass') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="conl required"><strong><?php _e('Confirm new pass') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="password" name="req_new_password2" size="16" /><br /></label>
-						<p class="clearb"><?php echo __('Pass info') ?></p>
+						<p class="clearb"><?php _e('Pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/delete_user.php b/view/profile/delete_user.php
index d5d5bde2..0fd42f52 100644
--- a/view/profile/delete_user.php
+++ b/view/profile/delete_user.php
@@ -14,23 +14,23 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Confirm delete user') ?></span></h2>
+	<h2><span><?php _e('Confirm delete user') ?></span></h2>
 	<div class="box">
 		<form id="confirm_del_user" method="post" action="<?php echo get_link('user/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Confirm delete legend') ?></legend>
+					<legend><?php _e('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Confirmation info').' <strong>'.feather_escape($username).'</strong>.' ?></p>
+						<p><?php _e('Confirmation info').' <strong>'.feather_escape($username).'</strong>.' ?></p>
 						<div class="rbox">
-							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php echo __('Delete posts') ?><br /></label>
+							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
 						</div>
-						<p class="warntext"><strong><?php echo __('Delete warning') ?></strong></p>
+						<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php echo __('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/menu.php b/view/profile/menu.php
index e78d2c30..4627f8db 100644
--- a/view/profile/menu.php
+++ b/view/profile/menu.php
@@ -15,39 +15,39 @@
 ?>
 <div id="profile" class="block2col">
 	<div class="blockmenu">
-		<h2><span><?php echo __('Profile menu') ?></span></h2>
+		<h2><span><?php _e('Profile menu') ?></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<ul>
 					<li<?php if ($page == 'essentials') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php echo __('Section essentials') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
 					<li<?php if ($page == 'personal') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php echo __('Section personal') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
 					<li<?php if ($page == 'messaging') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php echo __('Section messaging') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
 <?php if ($feather_config['o_avatars'] == '1' || $feather_config['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php echo __('Section personality') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
 <?php endif;
     ?>					<li<?php if ($page == 'display') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php echo __('Section display') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
 					<li<?php if ($page == 'privacy') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php echo __('Section privacy') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
 <?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php echo __('Section admin') ?></a></li>
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
diff --git a/view/profile/section_admin.php b/view/profile/section_admin.php
index 52a0ad54..18ba2f12 100644
--- a/view/profile/section_admin.php
+++ b/view/profile/section_admin.php
@@ -25,9 +25,9 @@
 
         if ($feather->user->g_moderator == '1') {
             ?>
-						<legend><?php echo __('Delete ban legend') ?></legend>
+						<legend><?php _e('Delete ban legend') ?></legend>
 						<div class="infldset">
-							<p><input type="submit" name="ban" value="<?php echo __('Ban user') ?>" /></p>
+							<p><input type="submit" name="ban" value="<?php _e('Ban user') ?>" /></p>
 						</div>
 					</fieldset>
 				</div>
@@ -36,12 +36,12 @@
         } else {
             if ($feather->user->id != $id) {
                 ?>
-						<legend><?php echo __('Group membership legend') ?></legend>
+						<legend><?php _e('Group membership legend') ?></legend>
 						<div class="infldset">
 							<select id="group_id" name="group_id">
                                                             <?php echo $group_list ?>
 							</select>
-							<input type="submit" name="update_group_membership" value="<?php echo __('Save') ?>" />
+							<input type="submit" name="update_group_membership" value="<?php _e('Save') ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -52,9 +52,9 @@
             }
 
             ?>
-						<legend><?php echo __('Delete ban legend') ?></legend>
+						<legend><?php _e('Delete ban legend') ?></legend>
 						<div class="infldset">
-							<input type="submit" name="delete_user" value="<?php echo __('Delete user') ?>" /> <input type="submit" name="ban" value="<?php echo __('Ban user') ?>" />
+							<input type="submit" name="delete_user" value="<?php _e('Delete user') ?>" /> <input type="submit" name="ban" value="<?php _e('Ban user') ?>" />
 						</div>
 					</fieldset>
 				</div>
@@ -64,13 +64,13 @@
                 ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php echo __('Set mods legend') ?></legend>
+						<legend><?php _e('Set mods legend') ?></legend>
 						<div class="infldset">
-							<p><?php echo __('Moderator in info') ?></p>
+							<p><?php _e('Moderator in info') ?></p>
                                                         <?php echo $forum_list ?>
 								</div>
 							</div>
-							<br class="clearb" /><input type="submit" name="update_forums" value="<?php echo __('Update forums') ?>" />
+							<br class="clearb" /><input type="submit" name="update_forums" value="<?php _e('Update forums') ?>" />
 						</div>
 					</fieldset>
 				</div>
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
index 506dd146..5da0f4b4 100644
--- a/view/profile/section_display.php
+++ b/view/profile/section_display.php
@@ -30,9 +30,9 @@
         ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Style legend') ?></legend>
+					<legend><?php _e('Style legend') ?></legend>
 					<div class="infldset">
-						<label><?php echo __('Styles') ?><br />
+						<label><?php _e('Styles') ?><br />
 						<select name="form_style">
 <?php
 
@@ -58,25 +58,25 @@
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1' || $feather_config['o_signatures'] == '1' || $feather_config['o_avatars'] == '1' || ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1')): ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Post display legend') ?></legend>
+					<legend><?php _e('Post display legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Post display info') ?></p>
+						<p><?php _e('Post display info') ?></p>
 						<div class="rbox">
 <?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show smilies') ?><br /></label>
+} ?> /><?php _e('Show smilies') ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show sigs') ?><br /></label>
+} ?> /><?php _e('Show sigs') ?><br /></label>
 <?php endif; if ($feather_config['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show avatars') ?><br /></label>
+} ?> /><?php _e('Show avatars') ?><br /></label>
 <?php endif; if ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show images') ?><br /></label>
+} ?> /><?php _e('Show images') ?><br /></label>
 <?php endif; if ($feather_config['o_signatures'] == '1' && $feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Show images sigs') ?><br /></label>
+} ?> /><?php _e('Show images sigs') ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
@@ -85,15 +85,15 @@
 <?php endif; ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Pagination legend') ?></legend>
+					<legend><?php _e('Pagination legend') ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo __('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
-						<label class="conl"><?php echo __('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
-						<p class="clearb"><?php echo __('Paginate info') ?> <?php echo __('Leave blank') ?></p>
+						<label class="conl"><?php _e('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
+						<label class="conl"><?php _e('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
+						<p class="clearb"><?php _e('Paginate info') ?> <?php _e('Leave blank') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_essentials.php b/view/profile/section_essentials.php
index 4f507a8c..0050f89c 100644
--- a/view/profile/section_essentials.php
+++ b/view/profile/section_essentials.php
@@ -20,17 +20,17 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Username and pass legend') ?></legend>
+					<legend><?php _e('Username and pass legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php echo __('Change pass') ?></a></span></p>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Email legend') ?></legend>
+					<legend><?php _e('Email legend') ?></legend>
 					<div class="infldset">
 						<?php echo $user_disp['email_field'] ?>
 					</div>
@@ -38,139 +38,139 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Localisation legend') ?></legend>
+					<legend><?php _e('Localisation legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Time zone info') ?></p>
-						<label><?php echo __('Time zone')."\n" ?>
+						<p><?php _e('Time zone info') ?></p>
+						<label><?php _e('Time zone')."\n" ?>
 						<br /><select name="form_timezone">
 							<option value="-12"<?php if ($user['timezone'] == -12) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-12:00') ?></option>
+} ?>><?php _e('UTC-12:00') ?></option>
 							<option value="-11"<?php if ($user['timezone'] == -11) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-11:00') ?></option>
+} ?>><?php _e('UTC-11:00') ?></option>
 							<option value="-10"<?php if ($user['timezone'] == -10) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-10:00') ?></option>
+} ?>><?php _e('UTC-10:00') ?></option>
 							<option value="-9.5"<?php if ($user['timezone'] == -9.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-09:30') ?></option>
+} ?>><?php _e('UTC-09:30') ?></option>
 							<option value="-9"<?php if ($user['timezone'] == -9) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-09:00') ?></option>
+} ?>><?php _e('UTC-09:00') ?></option>
 							<option value="-8.5"<?php if ($user['timezone'] == -8.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-08:30') ?></option>
+} ?>><?php _e('UTC-08:30') ?></option>
 							<option value="-8"<?php if ($user['timezone'] == -8) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-08:00') ?></option>
+} ?>><?php _e('UTC-08:00') ?></option>
 							<option value="-7"<?php if ($user['timezone'] == -7) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-07:00') ?></option>
+} ?>><?php _e('UTC-07:00') ?></option>
 							<option value="-6"<?php if ($user['timezone'] == -6) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-06:00') ?></option>
+} ?>><?php _e('UTC-06:00') ?></option>
 							<option value="-5"<?php if ($user['timezone'] == -5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-05:00') ?></option>
+} ?>><?php _e('UTC-05:00') ?></option>
 							<option value="-4"<?php if ($user['timezone'] == -4) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-04:00') ?></option>
+} ?>><?php _e('UTC-04:00') ?></option>
 							<option value="-3.5"<?php if ($user['timezone'] == -3.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-03:30') ?></option>
+} ?>><?php _e('UTC-03:30') ?></option>
 							<option value="-3"<?php if ($user['timezone'] == -3) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-03:00') ?></option>
+} ?>><?php _e('UTC-03:00') ?></option>
 							<option value="-2"<?php if ($user['timezone'] == -2) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-02:00') ?></option>
+} ?>><?php _e('UTC-02:00') ?></option>
 							<option value="-1"<?php if ($user['timezone'] == -1) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC-01:00') ?></option>
+} ?>><?php _e('UTC-01:00') ?></option>
 							<option value="0"<?php if ($user['timezone'] == 0) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC') ?></option>
+} ?>><?php _e('UTC') ?></option>
 							<option value="1"<?php if ($user['timezone'] == 1) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+01:00') ?></option>
+} ?>><?php _e('UTC+01:00') ?></option>
 							<option value="2"<?php if ($user['timezone'] == 2) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+02:00') ?></option>
+} ?>><?php _e('UTC+02:00') ?></option>
 							<option value="3"<?php if ($user['timezone'] == 3) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+03:00') ?></option>
+} ?>><?php _e('UTC+03:00') ?></option>
 							<option value="3.5"<?php if ($user['timezone'] == 3.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+03:30') ?></option>
+} ?>><?php _e('UTC+03:30') ?></option>
 							<option value="4"<?php if ($user['timezone'] == 4) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+04:00') ?></option>
+} ?>><?php _e('UTC+04:00') ?></option>
 							<option value="4.5"<?php if ($user['timezone'] == 4.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+04:30') ?></option>
+} ?>><?php _e('UTC+04:30') ?></option>
 							<option value="5"<?php if ($user['timezone'] == 5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:00') ?></option>
+} ?>><?php _e('UTC+05:00') ?></option>
 							<option value="5.5"<?php if ($user['timezone'] == 5.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:30') ?></option>
+} ?>><?php _e('UTC+05:30') ?></option>
 							<option value="5.75"<?php if ($user['timezone'] == 5.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+05:45') ?></option>
+} ?>><?php _e('UTC+05:45') ?></option>
 							<option value="6"<?php if ($user['timezone'] == 6) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+06:00') ?></option>
+} ?>><?php _e('UTC+06:00') ?></option>
 							<option value="6.5"<?php if ($user['timezone'] == 6.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+06:30') ?></option>
+} ?>><?php _e('UTC+06:30') ?></option>
 							<option value="7"<?php if ($user['timezone'] == 7) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+07:00') ?></option>
+} ?>><?php _e('UTC+07:00') ?></option>
 							<option value="8"<?php if ($user['timezone'] == 8) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+08:00') ?></option>
+} ?>><?php _e('UTC+08:00') ?></option>
 							<option value="8.75"<?php if ($user['timezone'] == 8.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+08:45') ?></option>
+} ?>><?php _e('UTC+08:45') ?></option>
 							<option value="9"<?php if ($user['timezone'] == 9) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+09:00') ?></option>
+} ?>><?php _e('UTC+09:00') ?></option>
 							<option value="9.5"<?php if ($user['timezone'] == 9.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+09:30') ?></option>
+} ?>><?php _e('UTC+09:30') ?></option>
 							<option value="10"<?php if ($user['timezone'] == 10) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+10:00') ?></option>
+} ?>><?php _e('UTC+10:00') ?></option>
 							<option value="10.5"<?php if ($user['timezone'] == 10.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+10:30') ?></option>
+} ?>><?php _e('UTC+10:30') ?></option>
 							<option value="11"<?php if ($user['timezone'] == 11) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+11:00') ?></option>
+} ?>><?php _e('UTC+11:00') ?></option>
 							<option value="11.5"<?php if ($user['timezone'] == 11.5) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+11:30') ?></option>
+} ?>><?php _e('UTC+11:30') ?></option>
 							<option value="12"<?php if ($user['timezone'] == 12) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+12:00') ?></option>
+} ?>><?php _e('UTC+12:00') ?></option>
 							<option value="12.75"<?php if ($user['timezone'] == 12.75) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+12:45') ?></option>
+} ?>><?php _e('UTC+12:45') ?></option>
 							<option value="13"<?php if ($user['timezone'] == 13) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+13:00') ?></option>
+} ?>><?php _e('UTC+13:00') ?></option>
 							<option value="14"<?php if ($user['timezone'] == 14) {
     echo ' selected="selected"';
-} ?>><?php echo __('UTC+14:00') ?></option>
+} ?>><?php _e('UTC+14:00') ?></option>
 						</select>
 						<br /></label>
 						<div class="rbox">
 							<label><input type="checkbox" name="form_dst" value="1"<?php if ($user['dst'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('DST') ?><br /></label>
+} ?> /><?php _e('DST') ?><br /></label>
 						</div>
-						<label><?php echo __('Time format') ?>
+						<label><?php _e('Time format') ?>
 
 						<br /><select name="form_time_format">
 <?php
@@ -188,7 +188,7 @@
                             ?>
 						</select>
 						<br /></label>
-						<label><?php echo __('Date format') ?>
+						<label><?php _e('Date format') ?>
 
 						<br /><select name="form_date_format">
 <?php
@@ -214,7 +214,7 @@
     // Only display the language selection box if there's more than one language available
     if (count($languages) > 1) {
         ?>
-						<label><?php echo __('Language') ?>
+						<label><?php _e('Language') ?>
 						<br /><select name="form_language">
 <?php
 
@@ -239,18 +239,18 @@
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('User activity') ?></legend>
+					<legend><?php _e('User activity') ?></legend>
 					<div class="infldset">
 						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
 						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
 						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
-<?php if ($feather->user->is_admmod): ?>							<label><?php echo __('Admin note') ?><br />
+<?php if ($feather->user->is_admmod): ?>							<label><?php _e('Admin note') ?><br />
 						<input id="admin_note" type="text" name="admin_note" value="<?php echo feather_escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_messaging.php b/view/profile/section_messaging.php
index 148a78cf..d944ee43 100644
--- a/view/profile/section_messaging.php
+++ b/view/profile/section_messaging.php
@@ -20,18 +20,18 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Contact details legend') ?></legend>
+					<legend><?php _e('Contact details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo __('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
-						<label><?php echo __('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php echo __('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php echo __('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php echo __('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
+						<label><?php _e('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
+						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
+						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_personal.php b/view/profile/section_personal.php
index 7358bc85..a765e0aa 100644
--- a/view/profile/section_personal.php
+++ b/view/profile/section_personal.php
@@ -20,18 +20,18 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Personal details legend') ?></legend>
+					<legend><?php _e('Personal details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php echo __('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
+						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
 <?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php echo __('Location') ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php echo __('Website') ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_personality.php b/view/profile/section_personality.php
index 9bd9440b..3624e5e6 100644
--- a/view/profile/section_personality.php
+++ b/view/profile/section_personality.php
@@ -21,34 +21,34 @@
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php if ($feather_config['o_avatars'] == '1'): ?>				<div class="inform">
 				<fieldset id="profileavatar">
-					<legend><?php echo __('Avatar legend') ?></legend>
+					<legend><?php _e('Avatar legend') ?></legend>
 					<div class="infldset">
 <?php if ($user_avatar): ?>							<div class="useravatar"><?php echo $user_avatar ?></div>
-<?php endif; ?>							<p><?php echo __('Avatar info') ?></p>
+<?php endif; ?>							<p><?php _e('Avatar info') ?></p>
 						<p class="clearb actions"><?php echo $avatar_field ?></p>
 					</div>
 				</fieldset>
 			</div>
 <?php endif; if ($feather_config['o_signatures'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Signature legend') ?></legend>
+					<legend><?php _e('Signature legend') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Signature info') ?></p>
+						<p><?php _e('Signature info') ?></p>
 						<div class="txtarea">
 							<label><?php printf(__('Sig max size'), forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/section_privacy.php b/view/profile/section_privacy.php
index 6c1ab357..36930415 100644
--- a/view/profile/section_privacy.php
+++ b/view/profile/section_privacy.php
@@ -20,41 +20,41 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Privacy options legend') ?></legend>
+					<legend><?php _e('Privacy options legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<p><?php echo __('Email setting info') ?></p>
+						<p><?php _e('Email setting info') ?></p>
 						<div class="rbox">
 							<label><input type="radio" name="form_email_setting" value="0"<?php if ($user['email_setting'] == '0') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Email setting 1') ?><br /></label>
+} ?> /><?php _e('Email setting 1') ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="1"<?php if ($user['email_setting'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Email setting 2') ?><br /></label>
+} ?> /><?php _e('Email setting 2') ?><br /></label>
 							<label><input type="radio" name="form_email_setting" value="2"<?php if ($user['email_setting'] == '2') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Email setting 3') ?><br /></label>
+} ?> /><?php _e('Email setting 3') ?><br /></label>
 						</div>
 					</div>
 				</fieldset>
 			</div>
 <?php if ($feather_config['o_forum_subscriptions'] == '1' || $feather_config['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Subscription legend') ?></legend>
+					<legend><?php _e('Subscription legend') ?></legend>
 					<div class="infldset">
 						<div class="rbox">
 							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Notify full') ?><br /></label>
+} ?> /><?php _e('Notify full') ?><br /></label>
 <?php if ($feather_config['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
     echo ' checked="checked"';
-} ?> /><?php echo __('Auto notify full') ?><br /></label>
+} ?> /><?php _e('Auto notify full') ?><br /></label>
 <?php endif; ?>
 						</div>
 					</div>
 				</fieldset>
 			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php echo __('Submit') ?>" /> <?php echo __('Instructions') ?></p>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
 		</form>
 	</div>
 </div>
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
index 3f74f092..4131569c 100644
--- a/view/profile/upload_avatar.php
+++ b/view/profile/upload_avatar.php
@@ -14,22 +14,22 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo __('Upload avatar') ?></span></h2>
+	<h2><span><?php _e('Upload avatar') ?></span></h2>
 	<div class="box">
 		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Upload avatar legend') ?></legend>
+					<legend><?php _e('Upload avatar legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-						<label class="required"><strong><?php echo __('File') ?> <span><?php echo __('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php echo __('Avatar desc').' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.__('bytes').' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
+						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
+						<p><?php _e('Avatar desc').' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.__('bytes').' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="upload" value="<?php echo __('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="upload" value="<?php _e('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/profile/view_profile.php b/view/profile/view_profile.php
index ad1c5959..d30181fd 100644
--- a/view/profile/view_profile.php
+++ b/view/profile/view_profile.php
@@ -14,12 +14,12 @@
 
 ?>
 <div id="viewprofile" class="block">
-	<h2><span><?php echo __('Profile') ?></span></h2>
+	<h2><span><?php _e('Profile') ?></span></h2>
 	<div class="box">
 		<div class="fakeform">
 			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('Section personal') ?></legend>
+				<legend><?php _e('Section personal') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personal'])."\n" ?>
@@ -30,7 +30,7 @@
 			</div>
 <?php if (!empty($user_info['messaging'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('Section messaging') ?></legend>
+				<legend><?php _e('Section messaging') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['messaging'])."\n" ?>
@@ -41,7 +41,7 @@
 			</div>
 <?php endif; if (!empty($user_info['personality'])): ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('Section personality') ?></legend>
+				<legend><?php _e('Section personality') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personality'])."\n" ?>
@@ -52,7 +52,7 @@
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-				<legend><?php echo __('User activity') ?></legend>
+				<legend><?php _e('User activity') ?></legend>
 					<div class="infldset">
 						<dl>
 							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['activity'])."\n" ?>
diff --git a/view/register/email.php b/view/register/email.php
index 9f9b3424..e26ad690 100644
--- a/view/register/email.php
+++ b/view/register/email.php
@@ -15,25 +15,25 @@
 ?>
 
 <div id="emailform" class="blockform">
-	<h2><span><?php echo __('Send email to') ?> <?php echo feather_escape($recipient) ?></span></h2>
+	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($recipient) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write email') ?></legend>
+					<legend><?php _e('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="required"><strong><?php echo __('Email subject') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php echo __('Email message') ?> <span><?php echo __('Required') ?></span></strong><br />
+						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
 						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php echo __('Email disclosure note') ?></p>
+						<p><?php _e('Email disclosure note') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php echo __('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php echo __('Go back') ?></a></p>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/register/form.php b/view/register/form.php
index fa2d2457..f1a360ef 100644
--- a/view/register/form.php
+++ b/view/register/form.php
@@ -16,10 +16,10 @@
 if (!empty($errors)) {
     ?>
 <div id="posterror" class="block">
-	<h2><span><?php echo __('Registration errors') ?></span></h2>
+	<h2><span><?php _e('Registration errors') ?></span></h2>
 	<div class="box">
 		<div class="inbox error-info">
-			<p><?php echo __('Registration errors info') ?></p>
+			<p><?php _e('Registration errors info') ?></p>
 			<ul class="error-list">
 <?php
 
@@ -37,23 +37,23 @@
 }
 ?>
 <div id="regform" class="blockform">
-	<h2><span><?php echo __('Register') ?></span></h2>
+	<h2><span><?php _e('Register') ?></span></h2>
 	<div class="box">
 		<form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
 		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><?php echo __('Important information') ?></h3>
-					<p><?php echo __('Desc 1') ?></p>
-					<p><?php echo __('Desc 2') ?></p>
+					<h3><?php _e('Important information') ?></h3>
+					<p><?php _e('Desc 1') ?></p>
+					<p><?php _e('Desc 2') ?></p>
 				</div>
 				<fieldset>
-					<legend><?php echo __('Username legend') ?></legend>
+					<legend><?php _e('Username legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="username" value="" />
 						<input type="hidden" name="password" value="" />
-						<label class="required"><strong><?php echo __('Username') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
+						<label class="required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
     echo feather_escape($feather->request->post('req_user'));
 } ?>" size="25" maxlength="25" /><br /></label>
 					</div>
@@ -61,15 +61,15 @@
 			</div>
 <?php if ($feather_config['o_regs_verify'] == '0'): ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Pass legend') ?></legend>
+					<legend><?php _e('Pass legend') ?></legend>
 					<div class="infldset">
-						<label class="conl required"><strong><?php echo __('Password') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
+						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
     echo feather_escape($feather->request->post('req_password1'));
 } ?>" size="16" /><br /></label>
-						<label class="conl required"><strong><?php echo __('Confirm pass') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
+						<label class="conl required"><strong><?php _e('Confirm pass') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
     echo feather_escape($feather->request->post('req_password2'));
 } ?>" size="16" /><br /></label>
-						<p class="clearb"><?php echo __('Pass info') ?></p>
+						<p class="clearb"><?php _e('Pass info') ?></p>
 					</div>
 				</fieldset>
 			</div>
@@ -77,12 +77,12 @@
 				<fieldset>
 					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php echo __('Email info') ?></p>
-<?php endif; ?>						<label class="required"><strong><?php echo __('Email') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
+<?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
     echo feather_escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php echo __('Confirm email') ?> <span><?php echo __('Required') ?></span></strong><br />
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
     echo feather_escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
@@ -95,9 +95,9 @@
             ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Localisation legend') ?></legend>
+					<legend><?php _e('Localisation legend') ?></legend>
 					<div class="infldset">
-							<label><?php echo __('Language') ?>
+							<label><?php _e('Language') ?>
 							<br /><select name="language">
 <?php
 
@@ -121,14 +121,14 @@
 ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Robot title') ?></legend>
+					<legend><?php _e('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Robot info')    ?></p>
-						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php echo __('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
+						<p><?php _e('Robot info')    ?></p>
+						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php _e('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="register" value="<?php echo __('Register') ?>" /></p>
+			<p class="buttons"><input type="submit" name="register" value="<?php _e('Register') ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/register/rules.php b/view/register/rules.php
index 3a2fd06c..cef62405 100644
--- a/view/register/rules.php
+++ b/view/register/rules.php
@@ -15,18 +15,18 @@
 ?>
 
 <div id="rules" class="blockform">
-	<div class="hd"><h2><span><?php echo __('Forum rules') ?></span></h2></div>
+	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<form method="get" action="<?php echo get_link('register/') ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Rules legend') ?></legend>
+					<legend><?php _e('Rules legend') ?></legend>
 					<div class="infldset">
 						<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="agree" value="<?php echo __('Agree') ?>" /> <input type="submit" name="cancel" value="<?php echo __('Cancel') ?>" /></p>
+			<p class="buttons"><input type="submit" name="agree" value="<?php _e('Agree') ?>" /> <input type="submit" name="cancel" value="<?php _e('Cancel') ?>" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/search/footer.php b/view/search/footer.php
index a64e1cdf..a73ed5aa 100644
--- a/view/search/footer.php
+++ b/view/search/footer.php
@@ -30,7 +30,7 @@
 			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
diff --git a/view/search/form.php b/view/search/form.php
index bb39c614..4731b068 100644
--- a/view/search/form.php
+++ b/view/search/form.php
@@ -14,66 +14,66 @@
 ?>
 
 <div id="searchform" class="blockform">
-	<h2><span><?php echo __('Search') ?></span></h2>
+	<h2><span><?php _e('Search') ?></span></h2>
 	<div class="box">
 		<form id="search" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Search criteria legend') ?></legend>
+					<legend><?php _e('Search criteria legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="action" value="search" />
-						<label class="conl"><?php echo __('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
-						<label class="conl"><?php echo __('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
-						<p class="clearb"><?php echo __('Search info') ?></p>
+						<label class="conl"><?php _e('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
+						<label class="conl"><?php _e('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
+						<p class="clearb"><?php _e('Search info') ?></p>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Search in legend') ?></legend>
+					<legend><?php _e('Search in legend') ?></legend>
 					<div class="infldset">
 					<?php echo $forums ?>
-						<label class="conl"><?php echo __('Search in')."\n" ?>
+						<label class="conl"><?php _e('Search in')."\n" ?>
 						<br /><select id="search_in" name="search_in">
-							<option value="0"><?php echo __('Message and subject') ?></option>
-							<option value="1"><?php echo __('Message only') ?></option>
-							<option value="-1"><?php echo __('Topic only') ?></option>
+							<option value="0"><?php _e('Message and subject') ?></option>
+							<option value="1"><?php _e('Message only') ?></option>
+							<option value="-1"><?php _e('Topic only') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearl"><?php echo __('Search in info') ?></p>
+						<p class="clearl"><?php _e('Search in info') ?></p>
 <?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
 					</div>
 				</fieldset>
 			</div>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Search results legend') ?></legend>
+					<legend><?php _e('Search results legend') ?></legend>
 					<div class="infldset">
-						<label class="conl"><?php echo __('Sort by')."\n" ?>
+						<label class="conl"><?php _e('Sort by')."\n" ?>
 						<br /><select name="sort_by">
-							<option value="0"><?php echo __('Sort by post time') ?></option>
-							<option value="1"><?php echo __('Sort by author') ?></option>
-							<option value="2"><?php echo __('Sort by subject') ?></option>
-							<option value="3"><?php echo __('Sort by forum') ?></option>
+							<option value="0"><?php _e('Sort by post time') ?></option>
+							<option value="1"><?php _e('Sort by author') ?></option>
+							<option value="2"><?php _e('Sort by subject') ?></option>
+							<option value="3"><?php _e('Sort by forum') ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Sort order')."\n" ?>
+						<label class="conl"><?php _e('Sort order')."\n" ?>
 						<br /><select name="sort_dir">
-							<option value="DESC"><?php echo __('Descending') ?></option>
-							<option value="ASC"><?php echo __('Ascending') ?></option>
+							<option value="DESC"><?php _e('Descending') ?></option>
+							<option value="ASC"><?php _e('Ascending') ?></option>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Show as')."\n" ?>
+						<label class="conl"><?php _e('Show as')."\n" ?>
 						<br /><select name="show_as">
-							<option value="topics"><?php echo __('Show as topics') ?></option>
-							<option value="posts"><?php echo __('Show as posts') ?></option>
+							<option value="topics"><?php _e('Show as topics') ?></option>
+							<option value="posts"><?php _e('Show as posts') ?></option>
 						</select>
 						<br /></label>
-						<p class="clearb"><?php echo __('Search results info') ?></p>
+						<p class="clearb"><?php _e('Search results info') ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/view/search/header.php b/view/search/header.php
index 909a2108..01af597a 100644
--- a/view/search/header.php
+++ b/view/search/header.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
@@ -31,16 +31,16 @@
 if ($search['show_as'] == 'topics') :
 ?>
 <div id="vf" class="blocktable">
-	<h2><span><?php echo __('Search results') ?></span></h2>
+	<h2><span><?php _e('Search results') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Forum') ?></th>
-					<th class="tc3" scope="col"><?php echo __('Replies') ?></th>
-					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
+					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
+					<th class="tc2" scope="col"><?php _e('Forum') ?></th>
+					<th class="tc3" scope="col"><?php _e('Replies') ?></th>
+					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/view/search/posts.php b/view/search/posts.php
index 872c349e..c575f9c2 100644
--- a/view/search/posts.php
+++ b/view/search/posts.php
@@ -21,7 +21,7 @@
     echo ' '.$cur_search['item_status'];
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
-    echo __('Re').' ';
+    _e('Re').' ';
 } ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
@@ -29,7 +29,7 @@
 			<div class="postleft">
 				<dl>
 					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php echo __('Replies').' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
+<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
 <?php endif; ?>
 					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
 				</dl>
@@ -46,8 +46,8 @@
 		<div class="postfoot clearb">
 			<div class="postfootright">
 				<ul>
-					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo __('Go to topic') ?></a></span></li>
-					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo __('Go to post') ?></a></span></li>
+					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
+					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
 				</ul>
 			</div>
 		</div>
diff --git a/view/userlist.php b/view/userlist.php
index 0bbedae6..26c24027 100644
--- a/view/userlist.php
+++ b/view/userlist.php
@@ -14,50 +14,50 @@
 ?>
 
 <div class="blockform">
-	<h2><span><?php echo __('User search') ?></span></h2>
+	<h2><span><?php _e('User search') ?></span></h2>
 	<div class="box">
 		<form id="userlist" method="get" action="">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('User find legend') ?></legend>
+					<legend><?php _e('User find legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php echo __('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
-<?php endif; ?>						<label class="conl"><?php echo __('User group')."\n" ?>
+<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
+<?php endif; ?>						<label class="conl"><?php _e('User group')."\n" ?>
 						<br /><select name="show_group">
 							<option value="-1"<?php if ($show_group == -1) {
     echo ' selected="selected"';
-} ?>><?php echo __('All users') ?></option>
+} ?>><?php _e('All users') ?></option>
 <?php echo $dropdown_menu ?>
 						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Sort by')."\n" ?>
+						<label class="conl"><?php _e('Sort by')."\n" ?>
 						<br /><select name="sort_by">
 							<option value="username"<?php if ($sort_by == 'username') {
     echo ' selected="selected"';
-} ?>><?php echo __('Username') ?></option>
+} ?>><?php _e('Username') ?></option>
 							<option value="registered"<?php if ($sort_by == 'registered') {
     echo ' selected="selected"';
-} ?>><?php echo __('Registered') ?></option>
+} ?>><?php _e('Registered') ?></option>
 <?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
     echo ' selected="selected"';
-} ?>><?php echo __('No of posts') ?></option>
+} ?>><?php _e('No of posts') ?></option>
 <?php endif; ?>						</select>
 						<br /></label>
-						<label class="conl"><?php echo __('Sort order')."\n" ?>
+						<label class="conl"><?php _e('Sort order')."\n" ?>
 						<br /><select name="sort_dir">
 							<option value="ASC"<?php if ($sort_dir == 'ASC') {
     echo ' selected="selected"';
-} ?>><?php echo __('Ascending') ?></option>
+} ?>><?php _e('Ascending') ?></option>
 							<option value="DESC"<?php if ($sort_dir == 'DESC') {
     echo ' selected="selected"';
-} ?>><?php echo __('Descending') ?></option>
+} ?>><?php _e('Descending') ?></option>
 						</select>
 						<br /></label>
 						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? __('User search info').' ' : '').__('User sort info'); ?></p>
 					</div>
 				</fieldset>
 			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php echo __('Submit') ?>" accesskey="s" /></p>
+			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
 		</form>
 	</div>
 </div>
@@ -70,16 +70,16 @@
 </div>
 
 <div id="users1" class="blocktable">
-	<h2><span><?php echo __('User list') ?></span></h2>
+	<h2><span><?php _e('User list') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Username') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Title') ?></th>
-<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php echo __('Posts') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Registered') ?></th>
+					<th class="tcl" scope="col"><?php _e('Username') ?></th>
+					<th class="tc2" scope="col"><?php _e('Title') ?></th>
+<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Registered') ?></th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/view/viewforum.php b/view/viewforum.php
index b9d04a1d..a35faf22 100644
--- a/view/viewforum.php
+++ b/view/viewforum.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -34,10 +34,10 @@
 			<table>
 			<thead>
 				<tr>
-					<th class="tcl" scope="col"><?php echo __('Topic') ?></th>
-					<th class="tc2" scope="col"><?php echo __('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php echo __('Views') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php echo __('Last post') ?></th>
+					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
+					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -70,7 +70,7 @@
 							<div class="icon inone"><div class="nosize"><!-- --></div></div>
 							<div class="tclcon">
 								<div>
-									<strong><?php echo __('Empty forum') ?></strong>
+									<strong><?php _e('Empty forum') ?></strong>
 								</div>
 							</div>
 						</td>
@@ -91,7 +91,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
diff --git a/view/viewtopic.php b/view/viewtopic.php
index 16535ff1..95de6a99 100644
--- a/view/viewtopic.php
+++ b/view/viewtopic.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -64,7 +64,7 @@
 				</div>
 				<div class="postright">
 					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
-    echo __('Re').' ';
+    _e('Re').' ';
 }
     ?><?php echo feather_escape($cur_topic['subject']) ?></h3>
 					<div class="postmsg">
@@ -107,7 +107,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php echo __('Index') ?></a></li>
+			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -124,13 +124,13 @@
 
     ?>
 <div id="quickpost" class="blockform">
-	<h2><span><?php echo __('Quick post') ?></span></h2>
+	<h2><span><?php _e('Quick post') ?></span></h2>
 	<div class="box">
 		<form id="quickpostform" method="post" action="<?php echo get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Write message legend') ?></legend>
+					<legend><?php _e('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
@@ -142,7 +142,7 @@
         $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
         $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
         ?>
-						<label class="conl required"><strong><?php echo __('Guest name') ?> <span><?php echo __('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
 <?php
@@ -164,13 +164,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php echo __('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php echo __('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php echo __('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php echo __('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>
@@ -179,15 +179,15 @@
 			<?php if ($feather->user->is_guest) : ?>
 			<div class="inform">
 				<fieldset>
-					<legend><?php echo __('Robot title') ?></legend>
+					<legend><?php _e('Robot title') ?></legend>
 					<div class="infldset">
-						<p><?php echo __('Robot info')    ?></p>
+						<p><?php _e('Robot info')    ?></p>
 						<label class="required"><strong><?php
                              $question = array_keys($lang_antispam_questions);
     $qencoded = md5($question[$index_questions]);
     echo sprintf(__('Robot question'), $question[$index_questions]);
     ?>
-							 <span><?php echo __('Required') ?></span></strong>
+							 <span><?php _e('Required') ?></span></strong>
 							 <br />
 							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
 						</label>
@@ -196,7 +196,7 @@
 			</div>
 			<?php endif;
     ?>
-			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo __('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo __('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
+			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php _e('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
 		</form>
 	</div>
 </div>

From 6416c3b2199e91a7c6fd4df5c53fba81d6bd1288 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Thu, 13 Aug 2015 23:32:06 +0200
Subject: [PATCH 036/353] Use POMO as language manager for BBcode editor.

---
 controller/post.php                | 21 +++++++++++++++++++++
 controller/viewtopic.php           | 20 ++++++++++++++++++++
 style/FeatherBB/view/post.php      |  3 +--
 style/FeatherBB/view/viewtopic.php |  1 -
 view/post.php                      |  3 +--
 view/viewtopic.php                 |  1 -
 6 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/controller/post.php b/controller/post.php
index 99616fa1..298e8b15 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -24,6 +24,7 @@ public function __construct()
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.mo');
     }
 
     public function __autoload($class_name)
@@ -196,6 +197,25 @@ public function newpost($fid = null, $tid = null, $qid = null)
             $post_data = '';
         }
 
+        $lang_bbeditor = array(
+            'btnBold' => __('btnBold'),
+            'btnItalic' => __('btnItalic'),
+            'btnUnderline' => __('btnUnderline'),
+            'btnColor' => __('btnColor'),
+            'btnLeft' => __('btnLeft'),
+            'btnRight' => __('btnRight'),
+            'btnJustify' => __('btnJustify'),
+            'btnCenter' => __('btnCenter'),
+            'btnLink' => __('btnLink'),
+            'btnPicture' => __('btnPicture'),
+            'btnList' => __('btnList'),
+            'btnQuote' => __('btnQuote'),
+            'btnCode' => __('btnCode'),
+            'promptImage' => __('promptImage'),
+            'promptUrl' => __('promptUrl'),
+            'promptQuote' => __('promptQuote')
+        );
+
         $this->feather->render('post.php', array(
                             'post' => $post,
                             'tid' => $tid,
@@ -205,6 +225,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             'cur_posting' => $cur_posting,
                             'lang_antispam' => $lang_antispam,
                             'lang_antispam_questions' => $lang_antispam_questions,
+                            'lang_bbeditor'    =>    $lang_bbeditor,
                             'index_questions' => $index_questions,
                             'checkboxes' => $checkboxes,
                             'cur_posting' => $cur_posting,
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index 3cede850..6c8f6901 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -98,6 +98,25 @@ public function display($id = null, $name = null, $page = null, $pid = null)
 
         require FEATHER_ROOT.'include/parser.php';
 
+        $lang_bbeditor = array(
+            'btnBold' => __('btnBold'),
+            'btnItalic' => __('btnItalic'),
+            'btnUnderline' => __('btnUnderline'),
+            'btnColor' => __('btnColor'),
+            'btnLeft' => __('btnLeft'),
+            'btnRight' => __('btnRight'),
+            'btnJustify' => __('btnJustify'),
+            'btnCenter' => __('btnCenter'),
+            'btnLink' => __('btnLink'),
+            'btnPicture' => __('btnPicture'),
+            'btnList' => __('btnList'),
+            'btnQuote' => __('btnQuote'),
+            'btnCode' => __('btnCode'),
+            'promptImage' => __('promptImage'),
+            'promptUrl' => __('promptUrl'),
+            'promptQuote' => __('promptQuote')
+        );
+
         $this->feather->render('viewtopic.php', array(
                             'id' => $id,
                             'p' => $p,
@@ -114,6 +133,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
                             'quickpost'        =>    $quickpost,
                             'index_questions'        =>    $index_questions,
                             'lang_antispam_questions'        =>    $lang_antispam_questions,
+                            'lang_bbeditor'    =>    $lang_bbeditor,
                             'url_forum'        =>    $url_forum,
                             'url_topic'        =>    $url_topic,
                             'feather'          =>    $this->feather,
diff --git a/style/FeatherBB/view/post.php b/style/FeatherBB/view/post.php
index fbfd6840..f1d22d07 100644
--- a/style/FeatherBB/view/post.php
+++ b/style/FeatherBB/view/post.php
@@ -80,10 +80,9 @@
 
 ?>
 <!-- Init BBcode editor toolbar -->
-<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
-        langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
+        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
 
diff --git a/style/FeatherBB/view/viewtopic.php b/style/FeatherBB/view/viewtopic.php
index 95de6a99..e2681757 100644
--- a/style/FeatherBB/view/viewtopic.php
+++ b/style/FeatherBB/view/viewtopic.php
@@ -154,7 +154,6 @@
 
     ?>
 <!-- Init BBcode editor toolbar -->
-<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
diff --git a/view/post.php b/view/post.php
index fbfd6840..f1d22d07 100644
--- a/view/post.php
+++ b/view/post.php
@@ -80,10 +80,9 @@
 
 ?>
 <!-- Init BBcode editor toolbar -->
-<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
-        langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
+        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
 
diff --git a/view/viewtopic.php b/view/viewtopic.php
index 95de6a99..e2681757 100644
--- a/view/viewtopic.php
+++ b/view/viewtopic.php
@@ -154,7 +154,6 @@
 
     ?>
 <!-- Init BBcode editor toolbar -->
-<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;

From e23a4823487b06dc2d068b9df985ccb4eba2f15a Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 14 Aug 2015 11:43:21 +0200
Subject: [PATCH 037/353] Fix BBCode editor in edit.php

---
 controller/edit.php           |  23 ++++-
 lang/English/convertor.php    |  20 ----
 style/FeatherBB/view/edit.php |   3 +-
 view/edit.php                 | 173 +++++++++++++++++-----------------
 4 files changed, 107 insertions(+), 112 deletions(-)
 delete mode 100644 lang/English/convertor.php

diff --git a/controller/edit.php b/controller/edit.php
index e412751a..2ac8b24d 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -60,9 +60,6 @@ public function editpost($id)
         if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
             message(__('No permission'), '403');
         }
-        
-        // Load the bbeditor.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.php';
 
         // Start with a clean slate
         $errors = array();
@@ -101,6 +98,25 @@ public function editpost($id)
             $preview_message = '';
         }
 
+        $lang_bbeditor = array(
+            'btnBold' => __('btnBold'),
+            'btnItalic' => __('btnItalic'),
+            'btnUnderline' => __('btnUnderline'),
+            'btnColor' => __('btnColor'),
+            'btnLeft' => __('btnLeft'),
+            'btnRight' => __('btnRight'),
+            'btnJustify' => __('btnJustify'),
+            'btnCenter' => __('btnCenter'),
+            'btnLink' => __('btnLink'),
+            'btnPicture' => __('btnPicture'),
+            'btnList' => __('btnList'),
+            'btnQuote' => __('btnQuote'),
+            'btnCode' => __('btnCode'),
+            'promptImage' => __('promptImage'),
+            'promptUrl' => __('promptUrl'),
+            'promptQuote' => __('promptQuote')
+        );
+
         $this->feather->render('edit.php', array(
                             'cur_post' => $cur_post,
                             'errors' => $errors,
@@ -111,6 +127,7 @@ public function editpost($id)
                             'checkboxes' => $this->model->get_checkboxes($can_edit_subject, $is_admmod, $cur_post, 1),
                             'feather' => $this->feather,
                             'can_edit_subject' => $can_edit_subject,
+                            'lang_bbeditor'    =>    $lang_bbeditor,
                             'post' => $post,
                             )
                     );
diff --git a/lang/English/convertor.php b/lang/English/convertor.php
deleted file mode 100644
index ebca4650..00000000
--- a/lang/English/convertor.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * PHP arrays to po file
- */
-
-$fh = fopen("antispam_questions.po", 'w');
-fwrite($fh, "#\n");
-fwrite($fh, "msgid \"\"\n");
-fwrite($fh,  "msgstr \"\"\n");
-
-include 'antispam.php';
-
-foreach ($lang_antispam_questions as $key => $value) {
-    $key = addslashes($key);
-    $value = addslashes($value);
-    fwrite($fh, "\n");
-    fwrite($fh, "msgid \"$key\"\n");
-    fwrite($fh, "msgstr \"$value\"\n");
-}
-fclose($fh);
\ No newline at end of file
diff --git a/style/FeatherBB/view/edit.php b/style/FeatherBB/view/edit.php
index 49f98dbf..48a692e8 100644
--- a/style/FeatherBB/view/edit.php
+++ b/style/FeatherBB/view/edit.php
@@ -68,10 +68,9 @@
 endif;
 ?>
 <!-- Init BBcode editor toolbar -->
-<?php $lang_bbeditor = ''; ?>
 <script>
     var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
-        langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
+        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
 <div id="editform" class="blockform">
diff --git a/view/edit.php b/view/edit.php
index 7b6234bd..2c926634 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -9,7 +9,7 @@
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
-	exit;
+    exit;
 }
 
 $cur_index = 1;
@@ -17,104 +17,103 @@
 ?>
 
 <div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
-		</ul>
-	</div>
+    <div class="inbox">
+        <ul class="crumbs">
+            <li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+            <li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+            <li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+            <li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
+        </ul>
+    </div>
 </div>
 
 <?php
 
 // If there are errors, we display them
 if (!empty($errors)) :
-	?>
-	<div id="posterror" class="block">
-		<h2><span><?php _e('Post errors') ?></span></h2>
-		<div class="box">
-			<div class="inbox error-info">
-				<p><?php _e('Post errors info') ?></p>
-				<ul class="error-list">
-					<?php
-					foreach ($errors as $cur_error) {
-						echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-					}
-					?>
-				</ul>
-			</div>
-		</div>
-	</div>
-	<?php
+    ?>
+    <div id="posterror" class="block">
+        <h2><span><?php _e('Post errors') ?></span></h2>
+        <div class="box">
+            <div class="inbox error-info">
+                <p><?php _e('Post errors info') ?></p>
+                <ul class="error-list">
+                    <?php
+                    foreach ($errors as $cur_error) {
+                        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+                    }
+                    ?>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <?php
 elseif ($feather->request->post('preview')):
-	?>
-	<div id="postpreview" class="blockpost">
-		<h2><span><?php _e('Post preview') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<div class="postbody">
-					<div class="postright">
-						<div class="postmsg">
-							<?php echo $preview_message."\n" ?>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-	<?php
+    ?>
+    <div id="postpreview" class="blockpost">
+        <h2><span><?php _e('Post preview') ?></span></h2>
+        <div class="box">
+            <div class="inbox">
+                <div class="postbody">
+                    <div class="postright">
+                        <div class="postmsg">
+                            <?php echo $preview_message."\n" ?>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <?php
 endif;
 ?>
 <!-- Init BBcode editor toolbar -->
-<?php $lang_bbeditor = ''; ?>
 <script>
-	var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
-		langBbeditor = JSON.parse('<?= json_encode($lang_bbeditor); ?>');
+    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
+        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
 <div id="editform" class="blockform">
-	<h2><span><?php _e('Edit post') ?></span></h2>
-	<div class="box">
-		<form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Edit post legend') ?></legend>
-					<input type="hidden" name="form_sent" value="1" />
-					<div class="infldset txtarea">
-						<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
-							<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
-						<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
-							<script>postEditorToolbar('req_message');</script>
-							<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
-						</ul>
-					</div>
-				</fieldset>
-			</div>
-			<?php
-			if (!empty($checkboxes)):
-				?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Options') ?></legend>
-						<div class="infldset">
-							<div class="rbox">
-								<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
-							</div>
-						</div>
-					</fieldset>
-				</div>
-				<?php
-			endif;
-			?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
+    <h2><span><?php _e('Edit post') ?></span></h2>
+    <div class="box">
+        <form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
+            <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+            <div class="inform">
+                <fieldset>
+                    <legend><?php _e('Edit post legend') ?></legend>
+                    <input type="hidden" name="form_sent" value="1" />
+                    <div class="infldset txtarea">
+                        <?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
+                            <input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
+                        <?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
+                            <script>postEditorToolbar('req_message');</script>
+                            <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
+                        <ul class="bblinks">
+                            <li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+                            <li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+                            <li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+                            <li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+                        </ul>
+                    </div>
+                </fieldset>
+            </div>
+            <?php
+            if (!empty($checkboxes)):
+                ?>
+                <div class="inform">
+                    <fieldset>
+                        <legend><?php _e('Options') ?></legend>
+                        <div class="infldset">
+                            <div class="rbox">
+                                <?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
+                            </div>
+                        </div>
+                    </fieldset>
+                </div>
+                <?php
+            endif;
+            ?>
+            <p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+        </form>
+    </div>
 </div>
\ No newline at end of file

From 675950ef42a72290b1c7d25eaab38ea64c03a170 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 14 Aug 2015 11:45:39 +0200
Subject: [PATCH 038/353] Remove old requires for lang files

---
 extern.php         | 4 ----
 model/moderate.php | 9 ---------
 model/post.php     | 4 ----
 model/profile.php  | 3 ---
 model/register.php | 2 +-
 5 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/extern.php b/extern.php
index c91490d2..1229f8db 100644
--- a/extern.php
+++ b/extern.php
@@ -645,8 +645,6 @@ function output_html($feed)
 
 // Show users online
 elseif ($action == 'online' || $action == 'online_full') {
-    // Load the index.php language file
-    require FEATHER_ROOT.'lang/'.$feather_config['o_default_lang'].'/index.php';
 
     // Fetch users online info and generate strings for output
     $num_guests = $num_users = 0;
@@ -690,8 +688,6 @@ function output_html($feed)
 
 // Show board statistics
 elseif ($action == 'stats') {
-    // Load the index.php language file
-    require FEATHER_ROOT.'lang/'.$feather_config['o_default_lang'].'/index.php';
 
     // Collect some statistics from the database
     if (file_exists(FORUM_CACHE_DIR.'cache_users_info.php')) {
diff --git a/model/moderate.php b/model/moderate.php
index df7fe2d8..210d649b 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -24,9 +24,6 @@ public function __construct()
  
     public function display_ip_info($ip)
     {
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
@@ -42,9 +39,6 @@ public function display_ip_address_post($pid)
             message(__('Bad request'), '404');
         }
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
@@ -207,9 +201,6 @@ public function split_posts($tid, $fid, $p = null)
                 message(__('Bad request'), '404');
             }
 
-            // Load the post.php language file
-            require FEATHER_ROOT.'lang/'.$this->user->language.'/post.php';
-
             // Check subject
             $new_subject = $this->request->post('new_subject') ? feather_trim($this->request->post('new_subject')) : '';
 
diff --git a/model/post.php b/model/post.php
index 0c55d616..62724236 100644
--- a/model/post.php
+++ b/model/post.php
@@ -134,10 +134,6 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
         if ($this->user->is_guest) {
             $email = strtolower(feather_trim(($this->config['p_force_guest_email'] == '1') ? $this->request->post('req_email') : $this->request->post('email')));
 
-            // Load the register.php/prof_reg.php language files
-            require FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.php';
-            require FEATHER_ROOT.'lang/'.$this->user->language.'/register.php';
-
             if ($this->config['p_force_guest_email'] == '1' || $email != '') {
                 require FEATHER_ROOT.'include/email.php';
                 if (!is_valid_email($email)) {
diff --git a/model/profile.php b/model/profile.php
index 49e8fe69..7fee36e6 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -702,9 +702,6 @@ public function update_profile($id, $info, $section)
                         $form['username'] = feather_trim($this->request->post('req_username'));
 
                         if ($form['username'] != $info['old_username']) {
-                            // Check username
-                            require FEATHER_ROOT.'lang/'.$this->user->language.'/register.php';
-
                             $errors = '';
                             $errors = check_username($form['username'], $errors, $id);
                             if (!empty($errors)) {
diff --git a/model/register.php b/model/register.php
index d88001fd..68f27844 100644
--- a/model/register.php
+++ b/model/register.php
@@ -111,7 +111,7 @@ public function check_for_errors()
         // Make sure we got a valid language string
         if ($this->request->post('language')) {
             $user['language'] = preg_replace('%[\.\\\/]%', '', $this->request->post('language'));
-            if (!file_exists(FEATHER_ROOT.'lang/'.$user['language'].'/common.php')) {
+            if (!file_exists(FEATHER_ROOT.'lang/'.$user['language'].'/common.po')) {
                 message(__('Bad request'), '404');
             }
         } else {

From ff0c067fb8dfc064fdda3f3f246b9305d1219f09 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 14 Aug 2015 12:01:43 +0200
Subject: [PATCH 039/353] Load more lang files

---
 controller/moderate.php |  1 +
 controller/post.php     |  1 +
 controller/profile.php  |  1 +
 extern.php              | 11 ++++++++++-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/controller/moderate.php b/controller/moderate.php
index 0baeedd6..b1e7a889 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -24,6 +24,7 @@ public function __construct()
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/topic.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/misc.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/post.php b/controller/post.php
index 298e8b15..2dcb6498 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -23,6 +23,7 @@ public function __construct()
         $this->model = new \model\post();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.mo');
     }
diff --git a/controller/profile.php b/controller/profile.php
index 3ffe0031..68895ab9 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -22,6 +22,7 @@ public function __construct()
         $this->footer = new \controller\footer();
         $this->model = new \model\profile();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/profile.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
     }
 
diff --git a/extern.php b/extern.php
index 1229f8db..50f9bb09 100644
--- a/extern.php
+++ b/extern.php
@@ -68,9 +68,18 @@
 // Instantiate Slim
 $feather = new \Slim\Slim();
 
-require FEATHER_ROOT.'include/common.php';
+// Load the config
+require 'include/config.php';
+
+// Load middlewares
+$feather->add(new \Slim\Extras\Middleware\CsrfGuard('featherbb_csrf')); // CSRF
+$feather->add(new \Slim\Extras\Middleware\FeatherBB($feather_user_settings)); // FeatherBB
+
+$feather->config('cookies.encrypt', true);
+$feather->config('debug', true); // As long as we're developing FeatherBB
 
 load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/common.mo');
+load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/index.mo');
 
 // The length at which topic subjects will be truncated (for HTML output)
 if (!defined('FORUM_EXTERN_MAX_SUBJECT_LENGTH')) {

From 2d9e98fa95f39d81ec3c21b43c84ac8e79bd2718 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 14 Aug 2015 12:10:18 +0200
Subject: [PATCH 040/353] Fix po files

---
 controller/viewtopic.php | 2 +-
 model/viewtopic.php      | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index 6c8f6901..88fb8980 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -21,9 +21,9 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\viewtopic();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/topic.mo');
     }
 
     public function __autoload($class_name)
diff --git a/model/viewtopic.php b/model/viewtopic.php
index 61cdfe66..1ba4caf9 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -53,7 +53,6 @@ public function redirect_to_post($post_id)
     // Redirects to new posts or last post
     public function handle_actions($topic_id, $action)
     {
-
         // If action=new, we redirect to the first new post (if any)
         if ($action == 'new') {
             if (!$this->user->is_guest) {
@@ -92,8 +91,6 @@ public function handle_actions($topic_id, $action)
     // Gets some info about the topic
     public function get_info_topic($id)
     {
-
-
         $where_get_info_topic = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')

From c5b4a0a71a7c77b582916887a90204fc1a4ec576 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 14 Aug 2015 12:11:34 +0200
Subject: [PATCH 041/353] Remove useless requires

---
 controller/misc.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/controller/misc.php b/controller/misc.php
index 7ecadf0a..be6c2e2e 100644
--- a/controller/misc.php
+++ b/controller/misc.php
@@ -83,9 +83,6 @@ public function subscribeforum($id)
             message(__('No permission'), '403');
         }
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         $this->model->subscribe_forum($id);
     }
 
@@ -95,9 +92,6 @@ public function subscribetopic($id)
             message(__('No permission'), '403');
         }
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         $this->model->subscribe_topic($id);
     }
 
@@ -107,9 +101,6 @@ public function unsubscribeforum($id)
             message(__('No permission'), '403');
         }
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         $this->model->unsubscribe_forum($id);
     }
 
@@ -119,9 +110,6 @@ public function unsubscribetopic($id)
             message(__('No permission'), '403');
         }
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         $this->model->unsubscribe_topic($id);
     }
 
@@ -135,9 +123,6 @@ public function email($id)
             message(__('Bad request'), '404');
         }
 
-        // Load the misc.php language file
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/misc.php';
-
         $mail = $this->model->get_info_mail($id);
 
         if ($mail['email_setting'] == 2 && !$this->user->is_admmod) {

From 06e17f136499f035fbada6600b0d571aea453411 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Fri, 14 Aug 2015 16:23:46 +0200
Subject: [PATCH 042/353] New config file generator.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Everything’s fine, except when adding a prefix to tables. See later
with FeatherBB middleware TODO line 47 ?
---
 index.php         | 1 +
 install/index.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/index.php b/index.php
index 39db116a..cc432991 100644
--- a/index.php
+++ b/index.php
@@ -11,6 +11,7 @@
 session_cache_limiter(false);
 session_start();
 error_reporting(E_ALL); // Let's report everything for development
+ini_set('display_errors', 1);
 
 // Load Slim Framework
 require 'Slim/Slim.php';
diff --git a/install/index.php b/install/index.php
index da804d25..f069b5d8 100644
--- a/install/index.php
+++ b/install/index.php
@@ -195,7 +195,7 @@ function generate_config_file()
 {
     global $db_type, $db_host, $db_name, $db_username, $db_password, $db_prefix, $cookie_name, $cookie_seed;
 
-    return '<?php'."\n\n".'$db_type = \''.$db_type."';\n".'$db_host = \''.$db_host."';\n".'$db_name = \''.addslashes($db_name)."';\n".'$db_username = \''.addslashes($db_username)."';\n".'$db_password = \''.addslashes($db_password)."';\n".'$db_prefix = \''.addslashes($db_prefix)."';\n".'$p_connect = false;'."\n\n".'$cookie_name = '."'".$cookie_name."';\n".'$cookie_domain = '."'';\n".'$cookie_path = '."'/';\n".'$cookie_secure = 0;'."\n".'$cookie_seed = \''.random_key(16, false, true)."';\n\ndefine('FEATHER', 1);\n";
+    return '<?php'."\n\n".'$feather_user_settings = array('."\n\t".'\'db_type\' => \''.$db_type."',\n\t".'\'db_host\' => \''.$db_host."',\n\t".'\'db_name\' => \''.addslashes($db_name)."',\n\t".'\'db_user\' => \''.addslashes($db_username)."',\n\t".'\'db_pass\' => \''.addslashes($db_password)."',\n\t".'\'db_prefix\' => \''.addslashes($db_prefix)."'\n);\n\n".'$p_connect = false;'."\n\n".'$cookie_name = '."'".$cookie_name."';\n".'$cookie_domain = '."'';\n".'$cookie_path = '."'/';\n".'$cookie_secure = 0;'."\n".'$cookie_seed = \''.random_key(16, false, true)."';\n";
 }
 
 
@@ -609,7 +609,7 @@ function process_form(the_form)
         case 'sqlite':
             require FEATHER_ROOT.'install/dblayer/sqlite.php';
             break;
-            
+
         case 'sqlite3':
             require FEATHER_ROOT.'install/dblayer/sqlite3.php';
             break;

From 89e2302f7b5d4e587403f467365d707d79a292d0 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 15 Aug 2015 12:28:33 +0200
Subject: [PATCH 043/353] Fix translation conflict

---
 controller/viewtopic.php |   2 +-
 lang/English/topic.mo    | Bin 1475 -> 1487 bytes
 lang/English/topic.po    |   4 ++--
 model/viewtopic.php      |   8 +++-----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index 88fb8980..839ccea0 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -21,9 +21,9 @@ public function __construct()
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
         $this->model = new \model\viewtopic();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/topic.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/topic.mo');
     }
 
     public function __autoload($class_name)
diff --git a/lang/English/topic.mo b/lang/English/topic.mo
index 680eb6f72a32f79359530e4da6cac94432ef590e..b5dbc93c8358f0e216f8001e84e2d1a83cfc13cb 100644
GIT binary patch
delta 443
zcmYk&ze>YU6vy%7P5;G2TMMm<h=K@GN~hAzLArEnw?06-IN3oQT(Wf%6ap^3fRhgG
zR2RX)QRw30=GYf-5&Hdw6dLZ$=ic0tb58ORd<748QDA1@&Mc3=7~%pq@ei};d1frl
z#}bC9_(RO$Df(DPz28FRZKLA4*xNAcqvD@4W(<4HSd<i)vQwcM?%+GtaE{yfk7W!A
zD&P?+{*0RnG*F3KsK(FJeJ4Hdq8jU?8XF?RM%jq3V{wxn+@cDMQ3>yH7avgxUQh|%
zP=!B{4@-*fVTGwnO>>mwDx&_{7IXd5A3KPBcd~jZ$z0{BD(}Y^?kRVCeKooq#6PZ?
JE+-{#;+9NZBcA{O

delta 433
zcmXZYzfQtX6vy%7Ed^^)0aJz8!N}H)iN%F5k`P88z{$Y}aOvP?985aOBnuM^xH+1z
zIx;!>0I);&{z`A|?dSeEJ?FN+;ZOMfmilJ4a%L6$!z%vc32sp5Tcn%k9rnwp_&S!c
zg#q56-cK;ZE-J2%qa(8cDt=rtquZopX<lH;N`+=v$1hB9iD$UR1}f+nE>Q6?4;8pY
zB~DNm?-c91;=GT#*Z_60d!*ZgpYl~q9*ct~RDowy!WX>4S5$&eRDwCG@Hg^ddC?}e
w7;3sSM|m!-Ym8G(XwiZEkDX_MYe(0`jxt{|RN1ng`^biVob6n55qk@_2gOt$YybcN

diff --git a/lang/English/topic.po b/lang/English/topic.po
index 4f143767..bca23a6f 100644
--- a/lang/English/topic.po
+++ b/lang/English/topic.po
@@ -32,10 +32,10 @@ msgstr "IP address logged"
 msgid "Note"
 msgstr "Note:"
 
-msgid "Posts"
+msgid "Posts topic"
 msgstr "Posts:"
 
-msgid "Registered"
+msgid "Registered topic"
 msgstr "Registered:"
 
 msgid "Replies"
diff --git a/model/viewtopic.php b/model/viewtopic.php
index 1ba4caf9..827b5596 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
     }
- 
+
     // Redirects to a post in particular
     public function redirect_to_post($post_id)
     {
@@ -159,8 +159,6 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
     // Should we display the quickpost?
     public function is_quickpost($post_replies, $closed, $is_admmod)
     {
-
-
         $quickpost = false;
         if ($this->config['o_quickpost'] == '1' && ($post_replies == '1' || ($post_replies == '' && $this->user->g_post_replies == '1')) && ($closed == '0' || $is_admmod)) {
 
@@ -303,10 +301,10 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                         $cur_post['user_info'][] = '<dd><span>'.__('From').' '.feather_escape($cur_post['location']).'</span></dd>';
                     }
 
-                    $cur_post['user_info'][] = '<dd><span>'.__('Registered').' '.format_time($cur_post['registered'], true).'</span></dd>';
+                    $cur_post['user_info'][] = '<dd><span>'.__('Registered topic').' '.format_time($cur_post['registered'], true).'</span></dd>';
 
                     if ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) {
-                        $cur_post['user_info'][] = '<dd><span>'.__('Posts').' '.forum_number_format($cur_post['num_posts']).'</span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.__('Posts topic').' '.forum_number_format($cur_post['num_posts']).'</span></dd>';
                     }
 
                     // Now let's deal with the contact links (Email and URL)

From 8ab730890ca2ddccd768df43a3ec32ec3f411b3a Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 15 Aug 2015 12:28:48 +0200
Subject: [PATCH 044/353] Rebrand the translator

---
 include/l10n.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/l10n.php b/include/l10n.php
index ce27af92..0c155dcd 100644
--- a/include/l10n.php
+++ b/include/l10n.php
@@ -39,12 +39,12 @@ function load_textdomain($domain, $mofile) {
 
 function __($text, $domain = 'featherbb') {
 
-	return luna_translate($text, $domain);
+	return feather_translate($text, $domain);
 }
 
 function _e($text, $domain = 'featherbb') {
 
-	echo luna_translate($text, $domain);
+	echo feather_translate($text, $domain);
 }
 
 function _n($single, $plural, $number, $domain = 'featherbb') {
@@ -55,7 +55,7 @@ function _n($single, $plural, $number, $domain = 'featherbb') {
 	return $translation;
 }
 
-function luna_translate($text, $domain = 'featherbb') {
+function feather_translate($text, $domain = 'featherbb') {
 
 	$translations = load_translations($domain);
 	$translations = $translations->translate($text);

From 6f7989096f9abd54889affafeb69d35186013a2a Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 15 Aug 2015 12:31:24 +0200
Subject: [PATCH 045/353] Rewrite old link

---
 model/viewtopic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/model/viewtopic.php b/model/viewtopic.php
index 827b5596..c84d7105 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -343,7 +343,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 $cur_post['user_title_formatted'] = get_title($cur_post);
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="moderate.php?get_host='.$cur_post['id'].'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.get_link('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
                 }
 
                 if ($this->config['o_show_user_info'] == '1' && $cur_post['poster_email'] != '' && !$this->user->is_guest && $this->user->g_send_email == '1') {

From 60d0b90a694b26b39f60a6e759a9c1b0e44b71e0 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 15 Aug 2015 12:38:48 +0200
Subject: [PATCH 046/353] Refactor functions.php

---
 Slim/Extras/Middleware/FeatherBB.php | 108 +++++++++++++++++++++-
 include/functions.php                | 128 ---------------------------
 2 files changed, 106 insertions(+), 130 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index d6b6a3f3..3d46232d 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -318,6 +318,110 @@ public function update_online()
         }
     }
 
+    public function update_users_online()
+    {
+        global $feather_config;
+
+        $now = time();
+
+        // Fetch all online list entries that are older than "o_timeout_online"
+        $select_update_users_online = array('user_id', 'ident', 'logged', 'idle');
+
+        $result = \DB::for_table('online')->select_many($select_update_users_online)
+            ->where_lt('logged', $now-$feather_config['o_timeout_online'])
+            ->find_many();
+
+        foreach ($result as $cur_user) {
+            // If the entry is a guest, delete it
+            if ($cur_user['user_id'] == '1') {
+                \DB::for_table('online')->where('ident', $cur_user['ident'])
+                    ->delete_many();
+            } else {
+                // If the entry is older than "o_timeout_visit", update last_visit for the user in question, then delete him/her from the online list
+                if ($cur_user['logged'] < ($now-$feather_config['o_timeout_visit'])) {
+                    \DB::for_table('users')->where('id', $cur_user['user_id'])
+                        ->find_one()
+                        ->set('last_visit', $cur_user['logged'])
+                        ->save();
+                    \DB::for_table('online')->where('user_id', $cur_user['user_id'])
+                        ->delete_many();
+                } elseif ($cur_user['idle'] == '0') {
+                    \DB::for_table('online')->where('user_id', $cur_user['user_id'])
+                        ->update_many('idle', 1);
+                }
+            }
+        }
+    }
+
+    public function check_bans()
+    {
+        global $feather_config, $feather_bans;
+
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+
+        // Admins and moderators aren't affected
+        if ($feather->user->is_admmod || !$feather_bans) {
+            return;
+        }
+
+        // Add a dot or a colon (depending on IPv4/IPv6) at the end of the IP address to prevent banned address
+        // 192.168.0.5 from matching e.g. 192.168.0.50
+        $user_ip = get_remote_address();
+        $user_ip .= (strpos($user_ip, '.') !== false) ? '.' : ':';
+
+        $bans_altered = false;
+        $is_banned = false;
+
+        foreach ($feather_bans as $cur_ban) {
+            // Has this ban expired?
+            if ($cur_ban['expire'] != '' && $cur_ban['expire'] <= time()) {
+                \DB::for_table('bans')->where('id', $cur_ban['id'])
+                    ->delete_many();
+                $bans_altered = true;
+                continue;
+            }
+
+            if ($cur_ban['username'] != '' && utf8_strtolower($feather->user->username) == utf8_strtolower($cur_ban['username'])) {
+                $is_banned = true;
+            }
+
+            if ($cur_ban['ip'] != '') {
+                $cur_ban_ips = explode(' ', $cur_ban['ip']);
+
+                $num_ips = count($cur_ban_ips);
+                for ($i = 0; $i < $num_ips; ++$i) {
+                    // Add the proper ending to the ban
+                    if (strpos($user_ip, '.') !== false) {
+                        $cur_ban_ips[$i] = $cur_ban_ips[$i].'.';
+                    } else {
+                        $cur_ban_ips[$i] = $cur_ban_ips[$i].':';
+                    }
+
+                    if (substr($user_ip, 0, strlen($cur_ban_ips[$i])) == $cur_ban_ips[$i]) {
+                        $is_banned = true;
+                        break;
+                    }
+                }
+            }
+
+            if ($is_banned) {
+                \DB::for_table('online')->where('ident', $feather->user->username)
+                    ->delete_many();
+                message(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.feather_escape($feather_config['o_admin_email']).'">'.feather_escape($feather_config['o_admin_email']).'</a>.', true, true, true);
+            }
+        }
+
+        // If we removed any expired bans during our run-through, we need to regenerate the bans cache
+        if ($bans_altered) {
+            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
+                require FEATHER_ROOT.'include/cache.php';
+            }
+
+            generate_bans_cache();
+        }
+    }
+
     //
 
     public function call()
@@ -394,10 +498,10 @@ public function call()
             }
 
             // Check if current user is banned
-            check_bans();
+            $this->check_bans();
 
             // Update online list
-            update_users_online();
+            $this->update_users_online();
 
             // Configure Slim
             $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? FEATHER_ROOT.'style/'.$this->app->user->style.'/view' : FEATHER_ROOT.'view');
diff --git a/include/functions.php b/include/functions.php
index e02b7f2f..28fb1c8a 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -127,79 +127,6 @@ function feather_setcookie($user_id, $password, $expires)
 }
 
 
-//
-// Check whether the connecting user is banned (and delete any expired bans while we're at it)
-//
-function check_bans()
-{
-    global $feather_config, $feather_bans;
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    // Admins and moderators aren't affected
-    if ($feather->user->is_admmod || !$feather_bans) {
-        return;
-    }
-
-    // Add a dot or a colon (depending on IPv4/IPv6) at the end of the IP address to prevent banned address
-    // 192.168.0.5 from matching e.g. 192.168.0.50
-    $user_ip = get_remote_address();
-    $user_ip .= (strpos($user_ip, '.') !== false) ? '.' : ':';
-
-    $bans_altered = false;
-    $is_banned = false;
-
-    foreach ($feather_bans as $cur_ban) {
-        // Has this ban expired?
-        if ($cur_ban['expire'] != '' && $cur_ban['expire'] <= time()) {
-            \DB::for_table('bans')->where('id', $cur_ban['id'])
-                                               ->delete_many();
-            $bans_altered = true;
-            continue;
-        }
-
-        if ($cur_ban['username'] != '' && utf8_strtolower($feather->user->username) == utf8_strtolower($cur_ban['username'])) {
-            $is_banned = true;
-        }
-
-        if ($cur_ban['ip'] != '') {
-            $cur_ban_ips = explode(' ', $cur_ban['ip']);
-
-            $num_ips = count($cur_ban_ips);
-            for ($i = 0; $i < $num_ips; ++$i) {
-                // Add the proper ending to the ban
-                if (strpos($user_ip, '.') !== false) {
-                    $cur_ban_ips[$i] = $cur_ban_ips[$i].'.';
-                } else {
-                    $cur_ban_ips[$i] = $cur_ban_ips[$i].':';
-                }
-
-                if (substr($user_ip, 0, strlen($cur_ban_ips[$i])) == $cur_ban_ips[$i]) {
-                    $is_banned = true;
-                    break;
-                }
-            }
-        }
-
-        if ($is_banned) {
-            \DB::for_table('online')->where('ident', $feather->user->username)
-                                                 ->delete_many();
-            message(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.feather_escape($feather_config['o_admin_email']).'">'.feather_escape($feather_config['o_admin_email']).'</a>.', true, true, true);
-        }
-    }
-
-    // If we removed any expired bans during our run-through, we need to regenerate the bans cache
-    if ($bans_altered) {
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-
-        generate_bans_cache();
-    }
-}
-
-
 //
 // Check username
 //
@@ -258,45 +185,6 @@ function check_username($username, $errors, $exclude_id = null)
 }
 
 
-//
-// Update "Users online"
-//
-function update_users_online()
-{
-    global $feather, $feather_config;
-
-    $now = time();
-
-    // Fetch all online list entries that are older than "o_timeout_online"
-    $select_update_users_online = array('user_id', 'ident', 'logged', 'idle');
-
-    $result = \DB::for_table('online')->select_many($select_update_users_online)
-        ->where_lt('logged', $now-$feather_config['o_timeout_online'])
-        ->find_many();
-
-    foreach ($result as $cur_user) {
-        // If the entry is a guest, delete it
-        if ($cur_user['user_id'] == '1') {
-            \DB::for_table('online')->where('ident', $cur_user['ident'])
-                                                 ->delete_many();
-        } else {
-            // If the entry is older than "o_timeout_visit", update last_visit for the user in question, then delete him/her from the online list
-            if ($cur_user['logged'] < ($now-$feather_config['o_timeout_visit'])) {
-                \DB::for_table('users')->where('id', $cur_user['user_id'])
-                        ->find_one()
-                        ->set('last_visit', $cur_user['logged'])
-                        ->save();
-                \DB::for_table('online')->where('user_id', $cur_user['user_id'])
-                    ->delete_many();
-            } elseif ($cur_user['idle'] == '0') {
-                \DB::for_table('online')->where('user_id', $cur_user['user_id'])
-                        ->update_many('idle', 1);
-            }
-        }
-    }
-}
-
-
 //
 // Outputs markup to display a user's avatar
 //
@@ -325,8 +213,6 @@ function generate_avatar_markup($user_id)
 //
 function generate_page_title($page_title, $p = null)
 {
-
-
     if (!is_array($page_title)) {
         $page_title = array($page_title);
     }
@@ -390,9 +276,6 @@ function get_tracked_topics()
 //
 function update_forum($forum_id)
 {
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
     $stats_query = \DB::for_table('topics')
                     ->where('forum_id', $forum_id)
                     ->select_expr('COUNT(id)', 'total_topics')
@@ -462,9 +345,6 @@ function delete_avatar($user_id)
 //
 function delete_topic($topic_id)
 {
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
     // Delete the topic and any redirect topics
     $where_delete_topic = array(
             array('id' => $topic_id),
@@ -492,9 +372,6 @@ function delete_topic($topic_id)
 //
 function delete_post($post_id, $topic_id)
 {
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
     $result = \DB::for_table('posts')
                   ->select_many('id', 'poster', 'posted')
                   ->where('topic_id', $topic_id)
@@ -703,8 +580,6 @@ function paginate($num_pages, $cur_page, $link, $args = null)
 //
 function paginate_old($num_pages, $cur_page, $link)
 {
-
-
     $pages = array();
     $link_to_all = false;
 
@@ -1617,10 +1492,7 @@ function get_sublink($link, $sublink, $subarg, $args = null)
 }
 
 // Generate breadcrumbs from an array of name and URLs
-
 function breadcrumbs(array $links) {
-    global $lang_admin_reports;
-
     foreach ($links as $name => $url) {
         if ($name != '' && $url != '') {
             $tmp[] = '<span><a href="' . $url . '">'.feather_escape($name).'</a></span>';

From d135332c8b04e2b3f36fd1227646d4d5b8ddf601 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 15 Aug 2015 12:45:33 +0200
Subject: [PATCH 047/353] Get rid of some globals

---
 Slim/Extras/Middleware/FeatherBB.php | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 3d46232d..e6b9a26d 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -320,15 +320,13 @@ public function update_online()
 
     public function update_users_online()
     {
-        global $feather_config;
-
         $now = time();
 
         // Fetch all online list entries that are older than "o_timeout_online"
         $select_update_users_online = array('user_id', 'ident', 'logged', 'idle');
 
         $result = \DB::for_table('online')->select_many($select_update_users_online)
-            ->where_lt('logged', $now-$feather_config['o_timeout_online'])
+            ->where_lt('logged', $now-$this->data['forum_settings']['o_timeout_online'])
             ->find_many();
 
         foreach ($result as $cur_user) {
@@ -338,7 +336,7 @@ public function update_users_online()
                     ->delete_many();
             } else {
                 // If the entry is older than "o_timeout_visit", update last_visit for the user in question, then delete him/her from the online list
-                if ($cur_user['logged'] < ($now-$feather_config['o_timeout_visit'])) {
+                if ($cur_user['logged'] < ($now-$this->data['forum_settings']['o_timeout_visit'])) {
                     \DB::for_table('users')->where('id', $cur_user['user_id'])
                         ->find_one()
                         ->set('last_visit', $cur_user['logged'])
@@ -355,13 +353,10 @@ public function update_users_online()
 
     public function check_bans()
     {
-        global $feather_config, $feather_bans;
-
-        // Get Slim current session
-        $feather = \Slim\Slim::getInstance();
+        global $feather_bans;
 
         // Admins and moderators aren't affected
-        if ($feather->user->is_admmod || !$feather_bans) {
+        if ($this->app->user->is_admmod || !$feather_bans) {
             return;
         }
 
@@ -382,7 +377,7 @@ public function check_bans()
                 continue;
             }
 
-            if ($cur_ban['username'] != '' && utf8_strtolower($feather->user->username) == utf8_strtolower($cur_ban['username'])) {
+            if ($cur_ban['username'] != '' && utf8_strtolower($this->app->user->username) == utf8_strtolower($cur_ban['username'])) {
                 $is_banned = true;
             }
 
@@ -406,9 +401,9 @@ public function check_bans()
             }
 
             if ($is_banned) {
-                \DB::for_table('online')->where('ident', $feather->user->username)
+                \DB::for_table('online')->where('ident', $this->app->user->username)
                     ->delete_many();
-                message(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.feather_escape($feather_config['o_admin_email']).'">'.feather_escape($feather_config['o_admin_email']).'</a>.', true, true, true);
+                message(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.feather_escape($this->data['forum_settings']['o_admin_email']).'">'.feather_escape($this->data['forum_settings']['o_admin_email']).'</a>.', true, true, true);
             }
         }
 

From 7ee81317bc18d32efef4ad656b53c3427e9926ff Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 15 Aug 2015 13:03:22 +0200
Subject: [PATCH 048/353] Fix some more prefixes issues

---
 include/functions.php       | 4 +---
 model/admin/groups.php      | 2 +-
 model/admin/maintenance.php | 8 ++++----
 model/admin/statistics.php  | 2 +-
 model/admin/users.php       | 2 +-
 model/moderate.php          | 6 +++---
 model/post.php              | 8 ++++----
 model/register.php          | 2 +-
 model/search.php            | 6 +++---
 9 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 28fb1c8a..7c3cf2a9 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -519,8 +519,6 @@ function get_title($user)
 //
 function paginate($num_pages, $cur_page, $link, $args = null)
 {
-
-
     $pages = array();
     $link_to_all = false;
 
@@ -915,7 +913,7 @@ function is_all_uppercase($string)
 //
 function maintenance_message()
 {
-    global $feather_config, $tpl_main;
+    global $feather_config;
 
     // Deal with newlines, tabs and multiple spaces
     $pattern = array("\t", '  ', '  ');
diff --git a/model/admin/groups.php b/model/admin/groups.php
index eb0687b2..bf3cd7df 100644
--- a/model/admin/groups.php
+++ b/model/admin/groups.php
@@ -184,7 +184,7 @@ public function add_edit_group($groups)
                 ->create()
                 ->set($insert_update_group)
                 ->save();
-            $new_group_id = DB::get_db()->lastInsertId($this->feather->prefix.'groups');
+            $new_group_id = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'groups');
 
             // Now lets copy the forum specific permissions from the group which this group is based on
             $select_forum_perms = array('forum_id', 'read_forum', 'post_replies', 'post_topics');
diff --git a/model/admin/maintenance.php b/model/admin/maintenance.php
index b8534959..d05fb7ec 100644
--- a/model/admin/maintenance.php
+++ b/model/admin/maintenance.php
@@ -35,8 +35,8 @@ public function rebuild()
 
         // If this is the first cycle of posts we empty the search index before we proceed
         if ($this->request->get('i_empty_index')) {
-            DB::for_table('search_words')->raw_execute('TRUNCATE '.$this->feather->prefix.'search_words');
-            DB::for_table('search_matches')->raw_execute('TRUNCATE '.$this->feather->prefix.'search_matches');
+            DB::for_table('search_words')->raw_execute('TRUNCATE '.$this->feather->forum_settings['db_prefix'].'search_words');
+            DB::for_table('search_matches')->raw_execute('TRUNCATE '.$this->feather->forum_settings['db_prefix'].'search_matches');
 
             // Reset the sequence for the search words (not needed for SQLite)
             switch ($this->feather->forum_settings['db_type']) {
@@ -44,11 +44,11 @@ public function rebuild()
                 case 'mysqli':
                 case 'mysql_innodb':
                 case 'mysqli_innodb':
-                    DB::for_table('search_words')->raw_execute('ALTER TABLE '.$this->feather->prefix.'search_words auto_increment=1');
+                    DB::for_table('search_words')->raw_execute('ALTER TABLE '.$this->feather->forum_settings['db_prefix'].'search_words auto_increment=1');
                     break;
 
                 case 'pgsql';
-                    DB::for_table('search_words')->raw_execute('SELECT setval(\''.$this->feather->prefix.'search_words_id_seq\', 1, false)');
+                    DB::for_table('search_words')->raw_execute('SELECT setval(\''.$this->feather->forum_settings['db_prefix'].'search_words_id_seq\', 1, false)');
             }
         }
     }
diff --git a/model/admin/statistics.php b/model/admin/statistics.php
index a2246741..225392e0 100644
--- a/model/admin/statistics.php
+++ b/model/admin/statistics.php
@@ -62,7 +62,7 @@ public function get_total_size()
 
         if ($this->feather->forum_settings['db_type'] == 'mysql' || $this->feather->forum_settings['db_type'] == 'mysqli' || $this->feather->forum_settings['db_type'] == 'mysql_innodb' || $this->feather->forum_settings['db_type'] == 'mysqli_innodb') {
             // Calculate total db size/row count
-            $result = DB::for_table('users')->raw_query('SHOW TABLE STATUS LIKE \''.$this->feather->prefix.'%\'')->find_many();
+            $result = DB::for_table('users')->raw_query('SHOW TABLE STATUS LIKE \''.$this->feather->forum_settings['db_prefix'].'%\'')->find_many();
 
             $total['size'] = $total['records'] = 0;
             foreach ($result as $status) {
diff --git a/model/admin/users.php b/model/admin/users.php
index 6f0daef7..d7c80e0c 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -448,7 +448,7 @@ public function ban_users()
 
             // Overwrite the registration IP with one from the last post (if it exists)
             if ($ban_the_ip != 0) {
-                $result = DB::for_table('posts')->raw_query('SELECT p.poster_id, p.poster_ip FROM ' . $this->feather->prefix . 'posts AS p INNER JOIN (SELECT MAX(id) AS id FROM ' . $this->feather->prefix . 'posts WHERE poster_id IN (' . implode(',', $user_ids) . ') GROUP BY poster_id) AS i ON p.id=i.id')->find_many();
+                $result = DB::for_table('posts')->raw_query('SELECT p.poster_id, p.poster_ip FROM ' . $this->feather->forum_settings['db_prefix'] . 'posts AS p INNER JOIN (SELECT MAX(id) AS id FROM ' . $this->feather->forum_settings['db_prefix'] . 'posts WHERE poster_id IN (' . implode(',', $user_ids) . ') GROUP BY poster_id) AS i ON p.id=i.id')->find_many();
                 foreach ($result as $cur_address) {
                     $user_info[$cur_address['poster_id']]['ip'] = $cur_address['poster_ip'];
                 }
diff --git a/model/moderate.php b/model/moderate.php
index 210d649b..218bf78e 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -233,7 +233,7 @@ public function split_posts($tid, $fid, $p = null)
                 ->set($insert_topic)
                 ->save();
 
-            $new_tid = DB::get_db()->lastInsertId($this->feather->prefix.'topics');
+            $new_tid = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'topics');
 
             // Move the posts to the new topic
             DB::for_table('posts')->where_in('id', $posts_array)
@@ -242,7 +242,7 @@ public function split_posts($tid, $fid, $p = null)
                 ->save();
 
             // Apply every subscription to both topics
-            DB::for_table('topic_subscriptions')->raw_query('INSERT INTO '.$this->feather->prefix.'topic_subscriptions (user_id, topic_id) SELECT user_id, '.$new_tid.' FROM '.$this->feather->prefix.'topic_subscriptions WHERE topic_id=:tid', array('tid' => $tid));
+            DB::for_table('topic_subscriptions')->raw_query('INSERT INTO '.$this->feather->forum_settings['db_prefix'].'topic_subscriptions (user_id, topic_id) SELECT user_id, '.$new_tid.' FROM '.$this->feather->forum_settings['db_prefix'].'topic_subscriptions WHERE topic_id=:tid', array('tid' => $tid));
 
             // Get last_post, last_post_id, and last_poster from the topic and update it
             $select_last_post = array('id', 'poster', 'posted');
@@ -599,7 +599,7 @@ public function merge_topics($fid)
             ->find_one_col('id');
 
         // Make any redirect topics point to our new, merged topic
-        $query = 'UPDATE '.$this->feather->prefix.'topics SET moved_to='.$merge_to_tid.' WHERE moved_to IN('.implode(',', $topics).')';
+        $query = 'UPDATE '.$this->feather->forum_settings['db_prefix'].'topics SET moved_to='.$merge_to_tid.' WHERE moved_to IN('.implode(',', $topics).')';
 
         // Should we create redirect topics?
         if ($this->request->post('with_redirect')) {
diff --git a/model/post.php b/model/post.php
index 62724236..52756e50 100644
--- a/model/post.php
+++ b/model/post.php
@@ -247,7 +247,7 @@ public function insert_reply($post, $tid, $cur_posting, $is_subscribed)
                 ->set($insert_post)
                 ->save();
 
-            $new['pid'] = DB::get_db()->lastInsertId($this->feather->prefix.'posts');
+            $new['pid'] = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'posts');
 
             // To subscribe or not to subscribe, that ...
             if ($this->config['o_topic_subscriptions'] == '1') {
@@ -296,7 +296,7 @@ public function insert_reply($post, $tid, $cur_posting, $is_subscribed)
                 ->save();
 
 
-            $new['pid'] = DB::get_db()->lastInsertId($this->feather->prefix.'posts');
+            $new['pid'] = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'posts');
         }
 
         // Update topic
@@ -442,7 +442,7 @@ public function insert_topic($post, $fid)
             ->set($insert_topic)
             ->save();
 
-        $new['tid'] = DB::get_db()->lastInsertId($this->feather->prefix.'topics');
+        $new['tid'] = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'topics');
 
         if (!$this->user->is_guest) {
             // To subscribe or not to subscribe, that ...
@@ -496,7 +496,7 @@ public function insert_topic($post, $fid)
                 ->set($insert_post)
                 ->save();
         }
-        $new['pid'] = DB::get_db()->lastInsertId($this->feather->prefix.'topics');
+        $new['pid'] = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'topics');
 
         // Update the topic with last_post_id
         $update_topic = array(
diff --git a/model/register.php b/model/register.php
index 68f27844..8152bc20 100644
--- a/model/register.php
+++ b/model/register.php
@@ -150,7 +150,7 @@ public function insert_user($user)
             ->set($insert_user)
             ->save();
 
-        $new_uid = DB::get_db()->lastInsertId($this->feather->prefix.'users');
+        $new_uid = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'users');
 
 
         if ($this->config['o_regs_verify'] == '0') {
diff --git a/model/search.php b/model/search.php
index 6ed3c053..ba8ba002 100644
--- a/model/search.php
+++ b/model/search.php
@@ -196,9 +196,9 @@ public function get_search_results()
                                     $where_cond = str_replace('*', '%', $cur_word);
                                     $where_cond_cjk = ($search_in ? (($search_in > 0) ? 'p.message LIKE %:where_cond%' : 't.subject LIKE %:where_cond%') : 'p.message LIKE %:where_cond% OR t.subject LIKE %:where_cond%');
 
-                                    $result = DB::for_table('posts')->raw_query('SELECT p.id AS post_id, p.topic_id, '.$sort_by_sql.' AS sort_by FROM '.$this->feather->prefix.'posts AS p INNER JOIN '.$this->feather->prefix.'topics AS t ON t.id=p.topic_id LEFT JOIN '.$this->feather->prefix.'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$this->user->g_id.') WHERE ('.$where_cond_cjk.') AND (fp.read_forum IS NULL OR fp.read_forum=1)'.$forum_sql, array(':where_cond' => $where_cond))->find_many();
+                                    $result = DB::for_table('posts')->raw_query('SELECT p.id AS post_id, p.topic_id, '.$sort_by_sql.' AS sort_by FROM '.$this->feather->forum_settings['db_prefix'].'posts AS p INNER JOIN '.$this->feather->forum_settings['db_prefix'].'topics AS t ON t.id=p.topic_id LEFT JOIN '.$this->feather->forum_settings['db_prefix'].'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$this->user->g_id.') WHERE ('.$where_cond_cjk.') AND (fp.read_forum IS NULL OR fp.read_forum=1)'.$forum_sql, array(':where_cond' => $where_cond))->find_many();
                                 } else {
-                                    $result = DB::for_table('posts')->raw_query('SELECT m.post_id, p.topic_id, '.$sort_by_sql.' AS sort_by FROM '.$this->feather->prefix.'search_words AS w INNER JOIN '.$this->feather->prefix.'search_matches AS m ON m.word_id = w.id INNER JOIN '.$this->feather->prefix.'posts AS p ON p.id=m.post_id INNER JOIN '.$this->feather->prefix.'topics AS t ON t.id=p.topic_id LEFT JOIN '.$this->feather->prefix.'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$this->user->g_id.') WHERE w.word LIKE :where_cond'.$search_in_cond.' AND (fp.read_forum IS NULL OR fp.read_forum=1)'.$forum_sql, array(':where_cond' => str_replace('*', '%', $cur_word)))->find_many();
+                                    $result = DB::for_table('posts')->raw_query('SELECT m.post_id, p.topic_id, '.$sort_by_sql.' AS sort_by FROM '.$this->feather->forum_settings['db_prefix'].'search_words AS w INNER JOIN '.$this->feather->forum_settings['db_prefix'].'search_matches AS m ON m.word_id = w.id INNER JOIN '.$this->feather->forum_settings['db_prefix'].'posts AS p ON p.id=m.post_id INNER JOIN '.$this->feather->forum_settings['db_prefix'].'topics AS t ON t.id=p.topic_id LEFT JOIN '.$this->feather->forum_settings['db_prefix'].'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$this->user->g_id.') WHERE w.word LIKE :where_cond'.$search_in_cond.' AND (fp.read_forum IS NULL OR fp.read_forum=1)'.$forum_sql, array(':where_cond' => str_replace('*', '%', $cur_word)))->find_many();
                                 }
 
                                 $row = array();
@@ -261,7 +261,7 @@ public function get_search_results()
                             $user_ids[] = $row['id'];
                         }
 
-                        $result = DB::for_table('posts')->raw_query('SELECT p.id AS post_id, p.topic_id FROM '.$this->feather->prefix.'posts AS p INNER JOIN '.$this->feather->prefix.'topics AS t ON t.id=p.topic_id LEFT JOIN '.$this->feather->prefix.'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$this->user->g_id.') WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND p.poster_id IN('.implode(',', $user_ids).')'.$forum_sql.' ORDER BY '.$sort_by_sql.' '.$sort_dir)->find_many();
+                        $result = DB::for_table('posts')->raw_query('SELECT p.id AS post_id, p.topic_id FROM '.$this->feather->forum_settings['db_prefix'].'posts AS p INNER JOIN '.$this->feather->forum_settings['db_prefix'].'topics AS t ON t.id=p.topic_id LEFT JOIN '.$this->feather->forum_settings['db_prefix'].'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$this->user->g_id.') WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND p.poster_id IN('.implode(',', $user_ids).')'.$forum_sql.' ORDER BY '.$sort_by_sql.' '.$sort_dir)->find_many();
 
                         foreach($result as $temp) {
                             $author_results[$temp['post_id']] = $temp['topic_id'];

From 768b4f857017fd7c79f28407072263775dea9ced Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 15 Aug 2015 13:14:10 +0200
Subject: [PATCH 049/353] Delete bbcd.php

---
 include/bbcd.php | 961 -----------------------------------------------
 1 file changed, 961 deletions(-)
 delete mode 100644 include/bbcd.php

diff --git a/include/bbcd.php b/include/bbcd.php
deleted file mode 100644
index 3a8105ac..00000000
--- a/include/bbcd.php
+++ /dev/null
@@ -1,961 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * Parser (C) 2011 Jeff Roberson (jmrware.com)
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-
-// File: $bbcd_source.php Rev:20110403_2100
-// Contains master default: $config, $syntaxes, $smilies and $bbcd arrays.
-// This file is not used during runtime. It is used to compile the actual runtime
-// cache file: cache_parser_data.php whenever the parser options need to be reset
-// or initialized. These are the "factory default" settings. This file is designed
-// to be hand edited.
-
-// Global parser options (These should eventually be migrated to the config db table?)
-$config = array(
-    'textile'        => true,        // Allow simple textile phrase extensions.
-    'quote_links'    => true,        // Make quote citation a link back to source post.
-    'quote_imgs'    => false,        // Allow IMG tags withing QUOTEs flag.
-    'valid_imgs'    => true,        // Validate images and clip size during pre-parsing.
-    'click_imgs'    => true,        // Wrap IMG tags in a url link to the original image.
-    'max_size'        => 100000,        // Maximum remote filesize for posting IMG links.
-    'max_width'        => 800,            // Max width of visual media objects in pixels.
-    'max_height'    => 600,            // Max height of visual media objects in pixels.
-    'def_width'        => 240,            // Default width of visual media objects in pixels.
-    'def_height'    => 180,            // Default height of visual media objects in pixels.
-    'smiley_size'   => 100,            // Percent size adjust for display of smilies.
-); // End $config array.
-
-// Array of smileys. These files are located in the img/smilies folder).
-$smilies = array(
-    ':)'            => array('file'    => 'smile.png'),
-    '=)'            => array('file'    => 'smile.png'),
-    ':|'            => array('file'    => 'neutral.png'),
-    '=|'            => array('file'    => 'neutral.png'),
-    ':('            => array('file'    => 'sad.png'),
-    '=('            => array('file'    => 'sad.png'),
-    ':D'            => array('file'    => 'big_smile.png'),
-    '=D'            => array('file'    => 'big_smile.png'),
-    ':o'            => array('file'    => 'yikes.png'),
-    ':O'            => array('file'    => 'yikes.png'),
-    ';)'            => array('file'    => 'wink.png'),
-    ':/'            => array('file'    => 'hmm.png'),
-    ':P'            => array('file'    => 'tongue.png'),
-    ':p'            => array('file'    => 'tongue.png'),
-    ':lol:'        => array('file'    => 'lol.png'),
-    ':mad:'        => array('file'    => 'mad.png'),
-    ':rolleyes:'    => array('file'    => 'roll.png'),
-    ':cool:'        => array('file'    => 'cool.png')
-); // End $smilies array.
-
-/*
-FluxBB 1.4.3 Old parser tags:
-array('quote', 'code', 'b', 'i', 'u', 's', 'ins', 'del', 'em', 'color', 'colour', 'url', 'email', 'img', 'list', '*', 'h')
-array('quote', 'code', 'b', 'i', 'u',
-*/
-$bbcd = array( // Array of recognised BBCode tag structures (arrays).
-    'b' => array(
-        'html_name'                => 'strong'
-    ),
-    'code' => array(
-        'html_name'                => 'pre',
-        'tag_type'                => 'hidden',
-        'html_type'                => 'block',
-        'handlers'                => array(
-            'ATTRIB'            => array(
-                'format'        => '
-					</p>
-					<div class="codebox">
-						<h4>Code: "%a_str%"</h4>
-						<pre>%c_str%</pre>
-					</div>
-					<p>'
-            ),
-            'NO_ATTRIB'            => array(
-                'format'        => '
-					</p>
-					<div class="codebox">
-						<pre>%c_str%</pre>
-					</div>
-					<p>'
-            )
-        )
-    ),
-    'color' => array(
-        'html_name'                => 'span',
-        'nest_type'                => 'err',
-        'handlers'                => array(
-            'ATTRIB'            => array(
-                'a_type'        => 'color',
-                'format'        => '<span style="color: %a_str%;">%c_str%</span>'
-            )
-        )
-    ),
-    'colour' => array(
-        'html_name'                => 'span',
-        'nest_type'                => 'err',
-        'handlers'                => array(
-            'ATTRIB'            => array(
-                'a_type'        => 'color',
-                'format'        => '<span style="color: %a_str%;">%c_str%</span>'
-            )
-        )
-    ),
-    'del' => array(
-        'html_name'                => 'del'
-    ),
-    'email' => array(
-        'html_name'                => 'a',
-        'nest_type'                => 'err',
-        'tags_excluded'            => array('email' => true, 'url' => true),
-        'handlers'                => array(
-            'ATTRIB'            => array(
-                'a_type'        => 'email',
-                'c_type'        => 'text',
-                'format'        => '<a href="mailto:%a_str%" rel="nofollow">%c_str%</a>'
-            ),
-            'NO_ATTRIB'            => array(
-                'a_type'        => 'none',
-                'c_type'        => 'email',
-                'format'        => '<a href="mailto:%c_str%" rel="nofollow">%c_str%</a>'
-            )
-        )
-    ),
-    'em' => array(
-        'html_name'                => 'em'
-    ),
-    'h' => array(
-        'html_name'                => 'h5',
-        'handlers'                => array(
-            'NO_ATTRIB'            => array(
-                'format'        => '</p><h5>%c_str%</h5><p>'
-            )
-        )
-    ),
-    'img' => array(
-        'html_name'                => 'img',
-        'tag_type'                => 'atomic',
-        'tags_allowed'            => array('img' => true),
-        'handlers'                => array(
-            'ATTRIB'            => array(
-                'a_type'        => 'width_height',
-                'c_type'        => 'url',
-                'format'        => '<img src="%c_str%" alt="%a_str%" title="%a_str%" width="%w_str%" height="%h_str%" />'
-            ),
-            'NO_ATTRIB'            => array(
-                'a_type'        => 'none',
-                'c_type'        => 'url',
-                'format'        => '<img src="%c_str%" alt="%c_str%" />'
-            )
-        )
-    ),
-    'ins' => array(
-        'html_name'                => 'ins'
-    ),
-    'i' => array(
-        'html_name'                => 'em'
-    ),
-
-
-    'table' => array(
-        'html_name'                => 'table',
-        'html_type'                => 'block',
-        'handlers'        => array(
-            'NO_ATTRIB'            => array('format' => '</p><table>%c_str%</table><p>' )
-        ),
-        'tags_only'                => true,
-        'tags_allowed'            => array(
-            'tr'                =>    true,
-            'err'                =>    true,
-        )
-    ),
-    'tr' => array(
-        'html_name'                => 'tr',
-        'html_type'                => 'block',
-        'parents'                => array('table' => true),
-        'handlers'        => array(
-            'NO_ATTRIB'            => array('format' => '<tr>%c_str%</tr>' )
-        ),
-        'tags_only'                => true,
-        'tags_allowed'            => array(
-            'th'                =>    true,
-            'td'                =>    true,
-            'err'                =>    true,
-        )
-    ),
-    'th' => array(
-        'html_name'                => 'th',
-        'html_type'                => 'block',
-        'parents'                => array('tr' => true),
-        'handlers'        => array(
-            'NO_ATTRIB'            => array('format' => '<th><p>%c_str%</p></th>' )
-        ),
-    ),
-    'td' => array(
-        'html_name'                => 'td',
-        'html_type'                => 'block',
-        'parents'                => array('tr' => true),
-        'handlers'        => array(
-            'NO_ATTRIB'            => array('format' => '<td><p>%c_str%</p></td>' )
-        ),
-    ),
-
-
-    'list' => array(
-        'html_name'                => 'ul',
-        'html_type'                => 'block',
-        'handlers'        => array(
-            '1'                    => array('format' => '</p><ol class="decimal">%c_str%</ol><p>'),
-            'a'                    => array('format' => '</p><ol class="alpha">%c_str%</ol><p>'),
-            '*'                    => array('format' => '</p><ul>%c_str%</ul><p>'),
-            'NO_ATTRIB'            => array('format' => '</p><ul>%c_str%</ul><p>' )
-        ),
-        'tags_only'                => true,
-        'tags_allowed'            => array(
-            'list'                =>    true,
-            '*'                    =>    true)
-    ),
-    '*' => array(
-        'html_name'                => 'li',
-        'html_type'                => 'block',
-        'parents'                => array('list' => true),
-        'handlers'        => array(
-            'NO_ATTRIB'            => array('format' => '<li><p>%c_str%</p></li>' )
-        )
-    ),
-    'quote' => array(
-        'html_name'                => 'blockquote',
-        'html_type'                => 'block',
-        'tag_type'                => 'zombie',
-        'nest_type'                => 'clip',
-//		'depth_max'				=> 3,
-        'handlers'                => array(
-            'ATTRIB'            => array(
-                'format'        => '
-				</p>
-				<div class="quotebox">
-					<cite>%a_str%</cite>
-					<blockquote>
-						<div>
-							<p>%c_str%</p>
-						</div>
-					</blockquote>
-				</div>
-				<p>'
-            ),
-            'NO_ATTRIB'            => array(
-                'format'        => '
-				</p>
-				<div class="quotebox">
-					<blockquote>
-						<div>
-							<p>%c_str%</p>
-						</div>
-					</blockquote>
-				</div>
-				<p>'
-            ),
-        ),
-    ),
-    'sub' => array(
-        'html_name'                => 'sub'
-    ),
-    'sup' => array(
-        'html_name'                => 'sup'
-    ),
-    's' => array(
-        'html_name'                => 'span',
-        'handlers'                => array(
-            'NO_ATTRIB'            => array(
-                'format'        => '<span class="bbs">%c_str%</span>'
-            )
-        )
-    ),
-    'tt' => array(
-        'html_name'                => 'tt',
-        'tag_type'                => 'hidden',
-        'handlers'    => array( // count == 1
-            'NO_ATTRIB'    => array( // count == 3
-                'a_type'    => 'none',
-                'c_type'    => 'text',
-                'format'    => '<tt>%c_str%</tt>'
-            )
-        ),
-
-
-    ),
-    'url' => array(
-        'html_name'                => 'a',
-//		'nest_type'				=> 'err',
-        'tags_excluded'            => array('email' => true, 'url' => true),
-        'handlers'                => array(
-            'ATTRIB'            => array(
-                'a_type'        => 'url',
-                'c_type'        => 'text',
-                'format'        => '<a href="%a_str%" rel="nofollow">%c_str%</a>'
-            ),
-            'NO_ATTRIB'            => array(
-                'a_type'        => 'none',
-                'c_type'        => 'url',
-                'format'        => '<a href="%c_str%" rel="nofollow">%c_str%</a>'
-            )
-        )
-    ),
-    'u' => array(
-        'html_name'                => 'span',
-        'handlers'                => array(
-            'NO_ATTRIB'            => array(
-                'format'        => '<span class="bbu">%c_str%</span>'
-            )
-        )
-    ),
-
-    'center' => array(
-        'html_name'                => 'div',
-        'handlers'                => array(
-            'NO_ATTRIB'            => array(
-                'format'        => '</p><div align="center"><p>%c_str%</p></div><p>'
-            )
-        )
-    ),
-    'right' => array(
-        'html_name'                => 'div',
-        'handlers'                => array(
-            'NO_ATTRIB'            => array(
-                'format'        => '</p><div align="right"><p>%c_str%</p></div><p>'
-            )
-        )
-    ),
-    'left' => array(
-        'html_name'                => 'div',
-        'handlers'                => array(
-            'NO_ATTRIB'            => array(
-                'format'        => '</p><div align="left"><p>%c_str%</p></div><p>'
-            )
-        )
-    ),
-    'justify' => array(
-        'html_name'                => 'div',
-        'handlers'                => array(
-            'NO_ATTRIB'            => array(
-                'format'        => '</p><div align="justify"><p>%c_str%</p></div><p>'
-            )
-        )
-    ),
-
-
-    'youtube' => array(
-    /* Supplied in one of three acceptable formats:  (Note: smallest good youtube dimensions: 260x225)
-        1. XWlhKllqnAk
-        2. http://www.youtube.com/watch?v=XWlhKllqnAk
-        3. <object width="480" height="385"><param name="movie" value="http://www.youtube.com/v/XWlhKllqnAk?fs=1&amp;hl=en_US&amp;rel=0"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/XWlhKllqnAk?fs=1&amp;hl=en_US&amp;rel=0" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="480" height="385"></embed></object>
-        SIZING:
-        With wxh set to 480x385 and no borders, the object uses 480x385 and the image takes 480x360.
-        With wxh set to 480x385 and borders, the object uses 480x385 and the image takes 460x340.
-          Border width = 10px. Controller height = 25.
-    */
-        'in_post'                => true,
-        'in_sig'                => false,
-        'html_name'                => 'object',
-        'tags_allowed'            => array(),
-        'x_padding'                => 20,
-        'y_padding'                => 45,
-        'handlers'                => array(
-            'ATTRIB'            => array(
-                'a_type'        => 'width_height',
-                'c_type'        => 'text',
-                'c_regex'        => '%(?:^|\bv[=/])(\w{10,12})\b%S',
-                'format'        => '
-					<object type="application/x-shockwave-flash" width="%w_str%" height="%h_str%"
-						data="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1&amp;rel=0">
-						<param name="movie" value="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1" />
-						<param name="allowFullScreen" value="true" />
-					</object>'
-            ),
-            'NO_ATTRIB'            => array(
-                'a_type'        => 'width_height',
-                'c_type'        => 'width_height',
-                'c_regex'        => '%(?:^|\bv[=/])(\w{10,12})\b%S',
-                'format'        => '
-					<object type="application/x-shockwave-flash" width="%w_str%" height="%h_str%"
-						data="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1&amp;rel=0">
-						<param name="movie" value="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1" />
-						<param name="allowFullScreen" value="true" />
-					</object>'
-            )
-        )
-    ),
-
-    'large' => array(
-        'html_name'                => 'span',
-        'handlers'                => array(
-            'NO_ATTRIB'            => array(
-                'format'        => '<span style="font-size: larger;">%c_str%</span>'
-            )
-        )
-    ),
-    'small' => array(
-        'html_name'                => 'span',
-        'handlers'                => array(
-            'NO_ATTRIB'            => array(
-                'format'        => '<span style="font-size: smaller;">%c_str%</span>'
-            )
-        )
-    ),
-
-
-
-
-
-
-
-    // System Tags. DO NOT DISABLE
-    'err' => array(
-        'html_name'                => 'span',
-        'tag_type'                => 'hidden',
-        'html_type'                => 'inline',
-        'handlers'                => array(
-            'ATTRIB'            => array(
-                'format'        =>
-                    '<span class="err" title="%a_str%">%c_str%</span>'
-            ),
-            'NO_ATTRIB'            => array(
-                'format'        =>
-                    '<span class="err">%c_str%</span>'
-            )
-        )
-    ),
-    'dbug' => array(
-        'html_name'                => 'div',
-        'html_type'                => 'block',
-        'handlers'                => array(
-            'ATTRIB'            => array(
-                'format'        =>
-                    '</p><p class="debug" title="%a_str%">%c_str%</p><p>'
-            )
-        )
-    ),
-    '_ROOT_' => array(
-        'in_post'                => false,
-        'in_sig'                => false,
-        'html_name'                => 'div',
-        'tag_type'                => 'normal',
-        'html_type'                => 'block',
-        'depth_max'                => 1,
-        'handlers'                => array( // Default handler for erroneously defined tag.
-            'NO_ATTRIB'            => array(
-                'a_type'        => 'text',
-                'c_type'        => 'text',
-                'format'        => "\1\2<span class=\"err\" title=\"_ROOT_\">%c_str%</span>\1",
-            )
-        )
-    )
-); // End $bbcd array.
-
-// This script compiles the $options, $smilies and $bbcd arrays (from bbcd_source.php script
-// or from an admin page web form) into the cache/cache_parser_data.php.
-
-// Initialize a new global parser data array $pd:
-$pd = array(
-    'newer_php_version'        => version_compare(PHP_VERSION, '5.2.0', '>='), // PHP version affects PCRE error checking.
-    'in_signature'            => false,                // TRUE when parsing signatures, FALSE when parsing posts.
-    'ipass'                    => 0,                    // Pass number (for multi-pass pre-parsing).
-    'tag_stack'                => array('_ROOT_'),        // current stack trace of tags in recursive callback
-    'config'                => $config,                // Array of various global parser options.
-
-// -----------------------------------------------------------------------------
-// Parser Regular Expressions. (All fully commented in 'x'-"free-spacing" mode.)
-// -----------------------------------------------------------------------------
-    're_smilies'            => '/ # re_smilies Rev:20110220_1200
-# Match special smiley character sequences within BBCode content.
-(?<=^|[>\s])                    # Only if preceeded by ">" or whitespace.
-(?:%smilies%)
-(?=$|[\[<\s])                   # Only if followed by "<", "[" or whitespace.
-                                /Sx',
-
-    're_color'              => '% # re_color Rev:20110220_1200
-# Match a valid CSS color value. #123, #123456, or "red", "blue", etc.
-^                               # Anchor to start of string.
-(                               # $1: Foreground color (required).
-  \#(?:[0-9A-Fa-f]{3}){1,2}     # Either a "#" and a 3 or 6 digit hex number,
-| (?: maroon|red|orange|yellow| # or a recognized CSS color word.
-      olive|purple|fuchsia|white|
-      lime|green|navy|blue|aqua|
-      teal|black|silver|gray
-  )                             # End group of recognized color words.
-)                               # End $1. Foreground color.
-# Match optional CSS background color value. ;#123, ;#123456, or ;"red", "blue", etc.
-(?:                             # Begin group for optional background color
-  ;?+                           # foreground;background delimiter: e.g. "#123;#456".
-  ((?1))                        # $2: Background color. (Same regex as the first.)
-)?+                             # Background color spec is optional.
-$                               # Anchor to end of string.
-                                %ix',
-
-    're_textile'            => '/ # re_textile Rev:20110220_1200
-# Match textile inline phrase: _em_ *strong* @tt@ ^super^ ~sub~ -del- +ins+
-([+\-@*_\^~])                   # $1: literal exposed start of phrase char, but
-(?<=                            # only if preceded by...
-  ^          [+\-@*_]           # start of string (for _em_ *strong* -del- +ins+ @code)
-| \s         [+\-@*_]           # or whitespace   (for _em_ *strong* -del- +ins+ @code)
-| [A-Za-z0-9)}\]>][\^~]         # or alphanum or bracket (for ^superscript^ ~subscript~).
-)                               # only if preceded by whitespace or start of string.
-(                               # $2: Textile phrase contents.
-  [A-Za-z0-9({\[<]              # First char following delim must be alphanum or bracket.
-  [^+\-@*_\^~\n]*+              # "normal*" == Zero or more non-delim, non-newline.
-  (?>                           # Begin unrolling-the-loop. "(special normal*)*"
-    (?!                         # One of two conditions must be true for inside delim:
-      (?:(?<=[A-Za-z0-9)}\]>][.,;:!?])(?=\1(?:\s|$)))
-    | (?:(?<=[A-Za-z0-9)}\]>])(?=\1(?:[\s.,;:!?]|$)))
-    )[+\-@*_\^~]                # If so then not yet at phrase end. Match delim and
-    [^+\-@*_\^~\n]*+            # more "normal*" non-delim, non-linefeeds.
-  )*+                           # Continue unrolling. "(special normal*)*"
-)                               # End $2: Textile phrase contents.
-(?>
-  (?:(?<=[A-Za-z0-9)}\]>][.,;:!?])(?=\1(?:\s|$)))
-| (?:(?<=[A-Za-z0-9)}\]>])(?=\1(?:[\s.,;:!?]|$)))
-)
-\1                              # Match delim end of phrase, but only if
-                                /Smx',
-
-    're_bbcode'             => '% # re_bbcode Rev:20110220_1200
-# First, match opening tag of syntax: "[TAGNAME (= ("\')ATTRIBUTE("\') )]";
-\[                              # Match opening bracket of outermost opening TAGNAME tag.
-(?>(%taglist%)\s*+) # $1:
-(?>                             # Atomically group remainder of opening tag.
-  (?:                           # Optional attribute.
-    (=)\s*+                     # $2: = Optional attribute\'s equals sign delimiter, ws.
-    (?:                         # Group for 1-line attribute value alternatives.
-      \'([^\'\r\n\\\\]*+(?:\\\\.[^\'\r\n\\\\]*+)*+)\'  # Either $3: == single quoted,
-    | "([^"\r\n\\\\]*+(?:\\\\.[^"\r\n\\\\]*+)*+)"      # or     $4: == double quoted,
-    | ( [^[\]\r\n]*+            # or $5: == un-or-any-quoted. "normal*" == non-"[]"
-        (?:                     # Begin "(special normal*)*" "Unrolling-the-loop" construct.
-          \[[^[\]\r\n]*+\]      # Allow matching [square brackets] 1 level deep. "special".
-            [^[\]\r\n]*+        # More "normal*" any non-"[]", non-newline characters.
-        )*+                     # End "(special normal*)*" "Unrolling-the-loop" construct.
-      )                         # End $5: Un-or-any-quoted attribute value.
-    )                           # End group of attribute values alternatives.
-    \s*+                        # Optional whitespace following quoted values.
-  )?                            # End optional attribute group.
-  \]                            # Match closing bracket of outermost opening TAGNAME tag.
-)                               # End atomic group with opening tag remainder.
-# Second, match the contents of the tag.
-(                               # $6: Non-trimmed contents of TAGNAME tag.
-  (?>                           # Atomic group for contents alternatives.
-    [^\[]++                     # Option 1: Match non-tag chars (starting with non-"[").
-    (?:                         # Begin "(special normal*)*" "Unrolling-the-loop" construct.
-      (?!\[/?+\1[\]=\s])\[      # "special" = "[" if not start of [TAGNAME*] or [/TAGNAME].
-      [^\[]*+                   # More "normal*".
-    )*+                         # Zero or more "special normal*"s allowed for option 1.
-  | (?:                         # or Option 2: Match non-tag chars (starting with "[").
-      (?!\[/?+\1[\]=\s])\[      # "special" = "[" if not start of [TAGNAME*] or [/TAGNAME].
-      [^\[]*+                   # More "normal*".
-    )++                         # One or more "special normal*"s required for option 2.
-  | (?R)                        # Or option 3: recursively match nested [TAGNAME]..[/TAGNAME].
-  )*+                           # One of these three options as many times as necessary.
-)                               # End $6: Non-trimmed contents of TAGNAME tag.
-# Finally, match the closing tag.
-\[/\1\s*+\]                     # Match outermost closing [/  TAGNAME  ]
-                                %ix',
-
-    're_bbtag'              => '%# re_bbtag Rev:20110220_1200
-# Match open or close BBtag.
-\[/?+                           # Match opening bracket of outermost opening TAGNAME tag.
-(?>(%taglist%)\s*+) #$1:
-(?:                             # Optional attribute.
-  (=)\s*+                       # $2: = Optional attribute\'s equals sign delimiter, ws.
-  (?:                           # Group for 1-line attribute value alternatives.
-    \'([^\'\r\n\\\\]*+(?:\\\\.[^\'\r\n\\\\]*+)*+)\'  # Either $3: == single quoted,
-  | "([^"\r\n\\\\]*+(?:\\\\.[^"\r\n\\\\]*+)*+)"      # or     $4: == double quoted,
-  | ( [^[\]\r\n]*+              # or $5: == un-or-any-quoted. "normal*" == non-"[]"
-      (?:                       # Begin "(special normal*)*" "Unrolling-the-loop" construct.
-        \[[^[\]\r\n]*+\]        # Allow matching [square brackets] 1 level deep. "special".
-          [^[\]\r\n]*+          # More "normal*" any non-"[]", non-newline characters.
-      )*+                       # End loop construct. See: "Mastering Regular Expressions".
-    )                           # End $5: Un-or-any-quoted attribute value.
-  )                             # End group of attribute values alternatives.
-  \s*+                          # Optional whitespace following quoted values.
-)?                              # End optional attribute.
-\]                              # Match closing bracket of outermost opening TAGNAME tag.
-                                %ix',
-    're_fixlist_1'            => '%# re_fixlist_1 Rev:20110220_1200
-# Match and repair invalid characters at start of LIST tag (before first [*]).
-^                               # Anchor to start of subject text.
-(                               # $1: Substring with invalid chars to be enclosed.
-  \s*+                          # Optional whitespace before first invalid char.
-  (?!\[(?:\*|/list)\])          # Assert invalid char(s). (i.e. valid if [*] or [/list]).
-  [^[]*                         # (Normal*) Zero or more non-[.
-  (?:                           # Begin (special normal*)* "Unroll-the-loop- construct.
-    (?!\[(?:\*|/list)\])        # If this [ is not the start of [*] or [/list], then
-    \[                          # go ahead and match non-[*], non-[/list] left bracket.
-    [^[]*                       # More (normal*).
-  )*                            # End (special normal*)* "unroll-the-loop- construct.
-)                               # End $1: non-whitespace before first [*] (or [/list]).
-(?<!\s)                         # Backtrack to exclude any trailing whitespace.
-(?=\s*\[(?:\*|/list)\])         # Done once we reach a [*] or [/list].
-								%ix',
-    're_fixlist_2'            => '%# re_fixlist_2 Rev:20110220_1200
-# Match and repair invalid characters between [/*] and next [*] (or [/list]].
-\[/\*\]                         # Match [/*] close tag.
-(                               # $1: Substring with invalid chars to be enclosed.
-  \s*+                          # Optional whitespace before first invalid char.
-  (?!\[(?:\*|/list)\])          # Assert invalid char(s). (i.e. valid if [*] or [/list]).
-  [^[]*                         # (Normal*) Zero or more non-[.
-  (?:                           # Begin (special normal*)* "Unroll-the-loop- construct.
-    (?!\[(?:\*|/list)\])        # If this [ is not the start of [*] or [/list], then
-    \[                          # go ahead and match non-[*], non-[/list] left bracket.
-    [^[]*                       # More (normal*).
-  )*                            # End (special normal*)* "unroll-the-loop- construct.
-)                               # End $1: non-whitespace before first [*] (or [/list]).
-(?<!\s)                         # Backtrack to exclude any trailing whitespace.
-(?=\s*\[(?:\*|/list)\])         # Done once we reach a [*] or [/list].
-								%ix',
-    'smilies'                => array(),                // Array of Smilies, each an array with filename and html.
-    'bbcd'                    => array(),                // Array of BBCode tag definitions.
-
-);
-unset($config);
-
-// If this server's PHP installation won't allow access to remote files,
-//   then unconditionally turn off validate images option.
-if (!ini_get('allow_url_fopen')) {
-    $pd['config']['valid_imgs'] = false;
-}
-
-// Validate and compute replacement texts for smilies array.
-$re_keys = array();                                    // Array of regex-safe smiley texts.
-$file_path = FEATHER_ROOT . 'img/smilies/';                // File system path to smilies.
-$url_path = get_base_url(true);                        // Convert abs URL to relative URL.
-$url_path = preg_replace('%^https?://[^/]++(.*)$%i', '$1', $url_path) . '/img/smilies/';
-foreach ($smilies as $smiley_text => $smiley_img) {    // Loop through all smilieys in array.
-    $file = $file_path . $smiley_img['file'];        // Local file system address of smiley.
-    if (!file_exists($file)) {
-        continue;
-    }                // Skip if the file does not exist.
-    $info = getimagesize($file);                    // Fetch width & height the image.
-    // Scale the smiley image to fit inside tiny smiley box; default = 15 by 15 pixels (@ 100%).
-    if (isset($info) && is_array($info) && ($iw = (int)$info[0]) && ($ih = (int)$info[1])) {
-        $ar = (float)$iw / (float)$ih;
-        if ($iw > $ih) { // Check if landscape?
-            $w = (int)((($pd['config']['smiley_size'] * 15.0) / 100.0) + 0.5);
-            $h = (int)round((float)$w / $ar);
-        } else {
-            $h = (int)((($pd['config']['smiley_size'] * 15.0) / 100.0) + 0.5);
-            $w = (int)round((float)$h * $ar);
-        }
-        unset($ar);
-    }
-    $re_keys[] = preg_quote($smiley_text, '/');        // Gather array of regex-safe smiley texts.
-    $url = $url_path . $smiley_img['file'];            // url address of this smiley.
-    $url = htmlspecialchars($url);                    // Make sure all [&<>""] are escaped.
-    $desc = file2title($smiley_img['file']);        // Convert filename to a title.
-    $format = '<img width="%d" height="%d" src="%s" alt="%s" title="%s" />';
-    $pd['smilies'][$smiley_text] = array(
-        'file' => $smiley_img['file'],
-        'html' => sprintf($format, $w, $h, $url, $desc, $desc)
-        );
-}
-// Assemble "the-one-regex-to-match-them-all" (smilies that is!) 8^)
-$pd['re_smilies'] = str_replace('%smilies%', implode('|', $re_keys), $pd['re_smilies']);
-unset($re_keys); unset($file_path); unset($url_path); unset($file);
-unset($info); unset($url); unset($desc); unset($format);
-unset($smiley_text); unset($smiley_img); unset($smilies);
-unset($w); unset($h); unset($iw); unset($ih);
-
-// Local arrays:
-$all_tags                    = array();                // array of all tag names allowed in posts
-$all_tags_re                = array();                // array of all tag names allowed in posts (preg_quoted)
-$all_block_tags                = array();                // array of all block type tag names
-
-// loop through all BBCodes to pre-assemble and initialize-once global data structures
-foreach ($bbcd as $tagname => $tagdata) { // pass 1: accumulate regex pattern string fragments counting block and inline types
-    $pd['bbcd'][$tagname]    = $tagdata;                // Copy initial tag data to $pd['bbcd']['tagname'].
-    $tag =& $pd['bbcd'][$tagname];                    // tag is shortcut to member of $pd['bbcd']['tagname'] array
-    $tag['depth']            = 0;                        // initialize tag nesting depth level to zero
-
-    // assign default values for members that were not specified
-    if (!isset($tag['in_post'])) {
-        $tag['in_post']    = true;
-    }            // default in_post = TRUE
-    if (!isset($tag['in_sig'])) {
-        $tag['in_sig']        = true;
-    }            // default in_sig = TRUE
-    if (!isset($tag['html_type'])) {
-        $tag['html_type']    = 'inline';
-    }        // default html_type = inline
-    if (!isset($tag['tag_type'])) {
-        $tag['tag_type']    = 'normal';
-    }        // default tag_type = normal
-    if (!isset($tag['nest_type'])) {
-        if ($tag['html_type'] === 'inline') {
-            $tag['nest_type'] = 'fix';
-        }    // default inline nest_type = fix
-        else {
-            $tag['nest_type'] = 'err';
-        }    // default block nest_type = err
-    }
-    if (!isset($tag['handlers'])) {
-        $tag['handlers']    = array(
-                'NO_ATTRIB'        => array(
-                    'format' => '<'. $tag['html_name'] .'>%c_str%</'. $tag['html_name'] .'>'
-                )
-            );
-    }
-    // Loop through attribute handlers assigning default values to a_type and c_type.
-    foreach ($tag['handlers'] as $key => $value) {
-        $handler =& $tag['handlers'][$key];
-        // Detect when width/height types are being used.
-        $w_typ = (preg_match('/%[wh]_str%/', $handler['format'])) ?  'width_height' : false;
-        switch ($key) {
-        case 'ATTRIB':                            // Variable attribute handler.
-            if (!isset($handler['a_type'])) {
-                $handler['a_type'] = ($w_typ) ? $w_typ : 'text';
-            }
-            if (!isset($handler['c_type'])) {
-                $handler['c_type'] = 'text';
-            }
-            break;
-
-        case 'NO_ATTRIB':                        // No attribute handler.
-            if (!isset($handler['a_type'])) {
-                $handler['a_type'] = 'none';
-            }
-            if (!isset($handler['c_type'])) {
-                $handler['c_type'] = ($w_typ) ? $w_typ : 'text';
-            }
-            break;
-
-        default:                                // Fixed attribute handlers.
-            if (!isset($handler['a_type'])) {
-                $handler['a_type'] = ($w_typ) ? $w_typ : 'text';
-            }
-            if (!isset($handler['c_type'])) {
-                $handler['c_type'] = 'text';
-            }
-            break;
-        }
-        ksort($handler);
-    }
-    unset($w_typ);
-    // fill arrays with names of tags for block, inline and hidden tag categories
-    if ($tagname == '_ROOT_') {
-        continue;
-    }        // Dont add _ROOT_ to tag lists
-    $all_tags[$tagname]    = true;                    // Array of all tags. with the names stored in the $keys.
-    $re_name = preg_quote($tagname);            // this name is metachar-safe to concatenate into a regex pattern string
-    $all_tags_re[]                        = $re_name;
-    if ($tag['html_type'] == 'block') {
-        $all_block_tags[]                = $tagname;
-        if (!isset($tag['depth_max'])) {
-            $tag['depth_max'] = 5;                    // default block tags max depth = 5
-        }
-    }
-    if ($tag['html_type'] == 'inline') {
-        $tag['depth_max']    = 1;                    // all inline tags max depth = 1
-    }
-    if ($tag['tag_type'] === 'hidden') {
-        $tag['depth_max'] = 1;                        // all hidden tags max depth = 1
-        $tag['tags_allowed']            = array();    // no tags allowed in hidden tags.
-    }
-    // clean excess whitespace (added for human readable formatting above) from format conversion strings
-    foreach ($tag['handlers'] as $ikey => $i) {        // loop through all tag attribute handlers
-        if (isset($tag['handlers'][$ikey]['format'])) {
-            $format_str =& $tag['handlers'][$ikey]['format'];
-            // Strip all whitespace between tags.
-            $format_str = preg_replace('/(^|>)\s++(<|$)/S', '$1$2', $format_str);
-            // Consolidate consecutive whitespace into a single space.
-            $format_str = preg_replace('/\s++/S', ' ', $format_str);
-            // Clean out any old version byte marker cruft.
-            $format_str = str_replace(array("\1", "\2"), '', $format_str);
-            // Wrap all hidden chunks like so: "\1\2<tag>\1 stuff \1\2</tag>\1".
-            if ($tag['tag_type'] === 'hidden' || $tag['handlers'][$ikey]['c_type'] === 'url') {
-                $format_str = "\1\2". $format_str ."\1";
-            } else {
-                $format_str = preg_replace('/((?:<[^>]*+>)++(?:%a_str%(?:<[^>]*+>)++)?+)/S', "\1\2$1\1", $format_str);
-            }
-        } else {
-            exit(sprintf("Compile error! \$bbcd['%s']['handlers']['%s']['format'] format string is missing!",
-                $tagname, $ikey));
-        }
-    }
-    unset($i);
-    unset($ikey);
-} // end pass 1
-
-// Now we can complete the regex patterns with precise list of recognized tags.
-$re_tag_names = empty($all_tags_re) ? '_ROOT_' : implode($all_tags_re, "|");
-$pd['re_bbcode'] = str_replace('%taglist%', $re_tag_names, $pd['re_bbcode']);
-$pd['re_bbtag'] = str_replace('%taglist%', $re_tag_names, $pd['re_bbtag']);
-
-unset($all_tags_re); unset($re_tag_names);
-
-foreach ($pd['bbcd'] as $tagname => $tagdata) { // pass 2: initialize allowed and excluded arrays
-    $tag =& $pd['bbcd'][$tagname];                            // Alias to "tagname" member of global array
-    if (!isset($tag['tags_allowed']) ||                        // if allowed_tags not specified or if
-        isset($tag['tags_allowed']['all'])) {                // 'all' has been specified as an allowed tag
-        $tag['tags_allowed'] =    $all_tags;                    // then create and set tags_allowed to allow all
-    }
-    if (isset($tag['tags_excluded'])) {                        // if tags_excluded specified
-        foreach ($tag['tags_allowed'] as $iname => $value) {
-            // remove them from tags_allow array
-            if (isset($tag['tags_excluded'][$iname])) {
-                unset($tag['tags_allowed'][$iname]);
-            }        // remove tags_excluded tags from tags_allowed array
-        }
-    }
-    if ($tag['html_type'] === 'inline') {                    // tag type is inline.
-        foreach ($tag['tags_allowed'] as $iname => $value) {
-            // remove them from tags_allow array
-            if (in_array($iname, $all_block_tags)) {        // if this is a block type tag then remove
-                unset($tag['tags_allowed'][$iname]);
-            }                                                // remove tags_excluded tags from tags_allowed array
-        }
-    }
-    // Build the (shorter/faster) excluded list to be used in the code. (discard tags_allowed[]).
-    $tag['tags_excluded'] = array();
-    foreach ($all_tags as $iname => $value) {
-        if (!isset($tag['tags_allowed'][$iname])) {
-            $tag['tags_excluded'][$iname] = true;
-        }
-    }
-    // Hidden tags have no use for these arrays so set them to minimum.
-    if ($tag['tag_type'] === 'hidden') {
-        $tag['tags_excluded'] = array();
-        $tag['tags_allowed'] = array();
-    }
-    unset($iname);
-    unset($value);
-    unset($tag['tags_allowed']);
-    unset($tag['html_name']);
-    ksort($tag);
-}
-unset($i); unset($iname); unset($n); unset($re_name); unset($tagname); unset($tagdata); unset($tag);
-
-
-//
-// SUPPORT FUNCTIONS
-//
-
-function esc_sq($str)
-{ // Escape single quotes and escapes.
-    // Note: When sprintf is used to write a string into another string, it is
-    //      interpreted and thus loses its escapes in front of single quotes
-    //      and escapes. This function puts the necessary extras in so that
-    //		when it is written, it looks the same as when it started.
-    $str = preg_replace('/ # Regex to reliably escape non-escaped single quotes.
-		( [^\'\\\\]++(?:\\\\.[^\'\\\\]*+)*+  # One or more non-quotes and escaped anything.
-		|            (?:\\\\.[^\'\\\\]*+)++  # or (same thing but start on an escape).
-		) \'/sx', "$1\\'", $str); // Replace all non-escaped quotes with an escaped one.
-    $str = preg_replace('/ # Regex to reliably escape non-escaped escapes.
-		( [^\\\\]++(?:\\\\[^\\\\][^\\\\]*+)*+       # One or more non-escapes and escaped anything-but-escape.
-		|          (?:\\\\[^\\\\][^\\\\]*+)++       # or (same thing but start on an escape).
-		) \\\\\\\\/x', '$1\\\\\\\\\\\\\\\\', $str); // Match an escaped escape, then double it.
-        // Note: The above may look pretty "slashy", but this is precisely what it takes!
-        // There may be a built-in PHP function that this, but couldnt find it.
-    return $str;
-}
-
-// Make a nice title out of a file name.
-function file2title($file)
-{
-    // Strip off file extention.
-    $title = preg_replace('/\.[^.]*$/', '', $file);
-    // Convert underscores and dashes to spaces.
-    $title = str_replace(array('_', '-'), ' ', $title);
-    // Make first letter of each word uppercase.
-    $title = ucwords($title);
-    // Space out camelcase words.
-    $title = preg_replace('/(?<=[a-z])(?=[A-Z])/', ' ', $title);
-    // Make first letter of insignificant words lowercase.
-    $title = preg_replace_callback('/(?!^)\b(And|At|A|In|Is|Of|The|To)\b/i', function ($m) { return strtolower($m); }, $title);
-    // Ensure this is HTML-safe (No [&<>""]).
-    $title = htmlspecialchars($title);
-    return $title;
-}
-
-function print_array($a)
-{    // Pretty-print an array to string $s.
-    global $s;
-    static $depth = 0;    // Keep track of nesting depth to allow tidy indentation.
-    ++$depth;
-    foreach ($a as $key => $value) {
-        for ($i = 0; $i < $depth; $i++) {
-            $s .= "\t";
-        }
-        if (is_string($key)) {
-            $s .= sprintf("'%s'\t=> ", esc_sq($key));
-        } elseif (is_int($key)) {
-            $s .= sprintf("%d\t=> ", $key);
-        }
-        if (is_array($value)) {
-            $s .= sprintf("array( // count == %d\n", count($value));
-            print_array($value);
-            for ($i = 0; $i < $depth; $i++) {
-                $s .= "\t";
-            }
-            $s .= sprintf("),\n");
-        } elseif (is_int($value)) {
-            $s .= sprintf("%d,\n", $value);
-        } elseif (is_bool($value)) {
-            if ($value) {
-                $s .= sprintf("TRUE,\n");
-            } else {
-                $s .= sprintf("FALSE,\n");
-            }
-        } elseif (is_string($value)) {
-            $s .= sprintf("'%s',\n", esc_sq($value));
-        }
-    }
-    $s = preg_replace('/,$/', '', $s);
-    --$depth;
-}
-
-// Output the $pd global data array to the cache file. Convert to string first.
-$s = "<?php // File: cache_parser_data.php. Automatically generated: " . date('Y-m-d h:i:s') . ". DO NOT EDIT!!!\n";
-
-$s .= sprintf("\$pd = array( // count == %d\n", count($pd));
-$depth = 0;
-++$depth;
-foreach ($pd as $key => $value) {
-    for ($i = 0; $i < $depth; $i++) {
-        $s .= "\t";
-    }
-    if (is_string($key)) {
-        $s .= sprintf("'%s'\t=> ", esc_sq($key));
-    } elseif (is_int($key)) {
-        $s .= sprintf("%d\t=> ", $key);
-    }
-    if (is_array($value)) {
-        $s .= sprintf("array( // count == %d\n", count($value));
-        print_array($value);
-        for ($i = 0; $i < $depth; $i++) {
-            $s .= "\t";
-        }
-        $s .= sprintf("),\n");
-    } elseif (is_int($value)) {
-        $s .= sprintf("%d,\n", $value);
-    } elseif (is_bool($value)) {
-        if ($value) {
-            $s .= sprintf("TRUE,\n");
-        } else {
-            $s .= sprintf("FALSE,\n");
-        }
-    } elseif (is_string($value)) {
-        $s .= sprintf("'%s',\n", esc_sq($value));
-    }
-}
-$s = preg_replace('/,$/', '', $s);
---$depth;
-$s .= ");\n";
-
-$s .= "?>";
-file_put_contents(FEATHER_ROOT.'cache/cache_parser_data.php', $s);
-
-// Clean up our global variables.
-unset($all_tags); unset($all_block_tags);
-unset($bbcd); unset($format_str); unset($handler); unset($key); unset($s);

From 710aec756049bc4fc0eaf31472aba1d81fe0d2e1 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 15 Aug 2015 16:06:26 +0200
Subject: [PATCH 050/353] Tidy up code

---
 extern.php        | 2 +-
 include/cache.php | 2 +-
 model/index.php   | 6 +-----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/extern.php b/extern.php
index 50f9bb09..a8ad9d86 100644
--- a/extern.php
+++ b/extern.php
@@ -703,7 +703,7 @@ function output_html($feed)
         include FORUM_CACHE_DIR.'cache_users_info.php';
     }
 
-    if (!defined('feather_userS_INFO_LOADED')) {
+    if (!defined('FEATHER_USERS_INFO_LOADED')) {
         if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
             require FEATHER_ROOT.'include/cache.php';
         }
diff --git a/include/cache.php b/include/cache.php
index 77dc13dd..44fbce40 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -202,7 +202,7 @@ function generate_users_info_cache()
     $stats['last_user'] = $last_user[0];
 
     // Output users info as PHP code
-    $content = '<?php'."\n\n".'define(\'feather_userS_INFO_LOADED\', 1);'."\n\n".'$stats = '.var_export($stats, true).';'."\n\n".'?>';
+    $content = '<?php'."\n\n".'define(\'FEATHER_USERS_INFO_LOADED\', 1);'."\n\n".'$stats = '.var_export($stats, true).';'."\n\n".'?>';
     featherbb_write_cache_file('cache_users_info.php', $content);
 }
 
diff --git a/model/index.php b/model/index.php
index 228ea44c..986a3715 100644
--- a/model/index.php
+++ b/model/index.php
@@ -26,8 +26,6 @@ public function __construct()
     // Returns page head
     public function get_page_head()
     {
-
-        
         if ($this->config['o_feed_type'] == '1') {
             $page_head = array('feed' => '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;type=rss" title="'.__('RSS active topics feed').'" />');
         } elseif ($this->config['o_feed_type'] == '2') {
@@ -133,8 +131,6 @@ public function print_categories_forums()
                 $cur_forum->cur_category = 0;
                 $cur_forum->forum_count_formatted = 0;
             }
-            
-            $moderators = '';
 
             if (isset($cur_forum->cur_category)) {
                 $cur_cat = $cur_forum->cur_category;
@@ -219,7 +215,7 @@ public function collect_stats()
             include FORUM_CACHE_DIR.'cache_users_info.php';
         }
 
-        if (!defined('feather_userS_INFO_LOADED')) {
+        if (!defined('FEATHER_USERS_INFO_LOADED')) {
             if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
                 require FEATHER_ROOT.'include/cache.php';
             }

From 9bde9c780631082abdace4e6facf073dd2ad9d9e Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 15 Aug 2015 16:32:27 +0200
Subject: [PATCH 051/353] Move and refactor maintenance

---
 Slim/Extras/Middleware/FeatherBB.php | 32 ++++++++++++++++++-
 include/functions.php                | 48 +---------------------------
 2 files changed, 32 insertions(+), 48 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index e6b9a26d..400e8554 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -351,6 +351,36 @@ public function update_users_online()
         }
     }
 
+    public function maintenance_message()
+    {
+        // Deal with newlines, tabs and multiple spaces
+        $pattern = array("\t", '  ', '  ');
+        $replace = array('&#160; &#160; ', '&#160; ', ' &#160;');
+        $message = str_replace($pattern, $replace, $this->data['forum_settings']['o_maintenance_message']);
+
+        $page_title = array(feather_escape($this->data['forum_settings']['o_board_title']), __('Maintenance'));
+
+        define('FEATHER_ACTIVE_PAGE', 'index');
+
+        $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? FEATHER_ROOT.'style/'.$this->app->user->style.'/view' : FEATHER_ROOT.'view');
+
+        $header = new \controller\header();
+
+        $header->setTitle($page_title)->display();
+
+        $this->app->render('message.php', array(
+                'message'    =>    $message,
+                'no_back_link'    =>    '',
+            )
+        );
+
+        $footer = new \controller\footer();
+
+        $footer->dontStop();
+
+        $footer->display();
+    }
+
     public function check_bans()
     {
         global $feather_bans;
@@ -475,7 +505,7 @@ public function call()
 
             // Check if we are to display a maintenance message
             if ($this->data['forum_settings']['o_maintenance'] && $this->app->user->g_id > $this->data['forum_env']['FEATHER_ADMIN'] && !defined('FEATHER_TURN_OFF_MAINT')) {
-                maintenance_message();
+                $this->maintenance_message();
             }
 
             // Load cached bans
diff --git a/include/functions.php b/include/functions.php
index 7c3cf2a9..4e9ff41a 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -908,52 +908,6 @@ function is_all_uppercase($string)
 }
 
 
-//
-// Display a message when board is in maintenance mode
-//
-function maintenance_message()
-{
-    global $feather_config;
-
-    // Deal with newlines, tabs and multiple spaces
-    $pattern = array("\t", '  ', '  ');
-    $replace = array('&#160; &#160; ', '&#160; ', ' &#160;');
-    $message = str_replace($pattern, $replace, $feather_config['o_maintenance_message']);
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    $page_title = array(feather_escape($feather_config['o_board_title']), __('Maintenance'));
-
-    if (!defined('FEATHER_ACTIVE_PAGE')) {
-        define('FEATHER_ACTIVE_PAGE', 'index');
-    }
-
-    require_once FEATHER_ROOT.'controller/header.php';
-    require_once FEATHER_ROOT.'controller/footer.php';
-
-    $feather->config('templates.path', get_path_view());
-
-    $header = new \controller\header();
-
-    $header->setTitle($page_title)->display();
-
-    $feather->render('message.php', array(
-            'message'    =>    $message,
-            'no_back_link'    =>    '',
-        )
-    );
-
-    require_once FEATHER_ROOT.'controller/footer.php';
-
-    $footer = new \controller\footer();
-
-    $footer->dontStop();
-
-    $footer->display();
-}
-
-
 //
 // Display $message and redirect user to $destination_url
 //
@@ -1128,7 +1082,7 @@ function forum_list_langs()
             continue;
         }
 
-        if (is_dir(FEATHER_ROOT.'lang/'.$entry) && file_exists(FEATHER_ROOT.'lang/'.$entry.'/common.php')) {
+        if (is_dir(FEATHER_ROOT.'lang/'.$entry) && file_exists(FEATHER_ROOT.'lang/'.$entry.'/common.po')) {
             $languages[] = $entry;
         }
     }

From 9aa814292d8bda9314c07b045387d8835361fa27 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 15 Aug 2015 16:45:12 +0200
Subject: [PATCH 052/353] Refactor functions.php

---
 extern.php                             |  18 ++
 include/cache.php                      |  20 ++
 include/functions.php                  | 279 +++++--------------------
 install/dblayer/sqlite.php             |  26 ++-
 install/dblayer/sqlite3.php            |  26 ++-
 install/index.php                      | 126 ++++++++++-
 style/FeatherBB/view/admin/reports.php |   4 +-
 view/admin/reports.php                 |   4 +-
 8 files changed, 266 insertions(+), 237 deletions(-)

diff --git a/extern.php b/extern.php
index a8ad9d86..3bbc6d4a 100644
--- a/extern.php
+++ b/extern.php
@@ -94,6 +94,24 @@ function escape_cdata($str)
     return str_replace(']]>', ']]&gt;', $str);
 }
 
+//
+// Try to determine the current URL
+//
+function get_current_url($max_length = 0)
+{
+    $protocol = get_current_protocol();
+    $port = (isset($_SERVER['SERVER_PORT']) && (($_SERVER['SERVER_PORT'] != '80' && $protocol == 'http') || ($_SERVER['SERVER_PORT'] != '443' && $protocol == 'https')) && strpos($_SERVER['HTTP_HOST'], ':') === false) ? ':'.$_SERVER['SERVER_PORT'] : '';
+
+    $url = urldecode($protocol.'://'.$_SERVER['HTTP_HOST'].$port.$_SERVER['REQUEST_URI']);
+
+    if (strlen($url) <= $max_length || $max_length == 0) {
+        return $url;
+    }
+
+    // We can't find a short enough url
+    return null;
+}
+
 //
 // Fill $feather->user with default values (for guests)
 //
diff --git a/include/cache.php b/include/cache.php
index 44fbce40..f9a56b8a 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -153,6 +153,26 @@ function generate_censoring_cache()
     featherbb_write_cache_file('cache_censoring.php', $content);
 }
 
+//
+// Generate a cache ID based on the last modification time for all stopwords files
+//
+function generate_stopwords_cache_id()
+{
+    $files = glob(FEATHER_ROOT.'lang/*/stopwords.txt');
+    if ($files === false) {
+        return 'cache_id_error';
+    }
+
+    $hash = array();
+
+    foreach ($files as $file) {
+        $hash[] = $file;
+        $hash[] = filemtime($file);
+    }
+
+    return sha1(implode('|', $hash));
+}
+
 
 //
 // Generate the stopwords cache PHP script
diff --git a/include/functions.php b/include/functions.php
index 4e9ff41a..3408f44e 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -19,25 +19,6 @@ function get_microtime()
 }
 
 
-//
-// Try to determine the current URL
-//
-function get_current_url($max_length = 0)
-{
-    $protocol = get_current_protocol();
-    $port = (isset($_SERVER['SERVER_PORT']) && (($_SERVER['SERVER_PORT'] != '80' && $protocol == 'http') || ($_SERVER['SERVER_PORT'] != '443' && $protocol == 'https')) && strpos($_SERVER['HTTP_HOST'], ':') === false) ? ':'.$_SERVER['SERVER_PORT'] : '';
-
-    $url = urldecode($protocol.'://'.$_SERVER['HTTP_HOST'].$port.$_SERVER['REQUEST_URI']);
-
-    if (strlen($url) <= $max_length || $max_length == 0) {
-        return $url;
-    }
-
-    // We can't find a short enough url
-    return null;
-}
-
-
 //
 // Fetch the current protocol in use - http or https
 //
@@ -635,7 +616,6 @@ function paginate_old($num_pages, $cur_page, $link)
 //
 // Display a message
 //
-
 function message($msg, $http_status = null, $no_back_link = false, $dontStop = false)
 {
     // Did we receive a custom header?
@@ -922,113 +902,6 @@ function redirect($destination_url, $message = null)
 }
 
 
-//
-// Unset any variables instantiated as a result of register_globals being enabled
-//
-function forum_unregister_globals()
-{
-    $register_globals = ini_get('register_globals');
-    if ($register_globals === '' || $register_globals === '0' || strtolower($register_globals) === 'off') {
-        return;
-    }
-
-    // Prevent script.php?GLOBALS[foo]=bar
-    if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) {
-        exit('I\'ll have a steak sandwich and... a steak sandwich.');
-    }
-
-    // Variables that shouldn't be unset
-    $no_unset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
-
-    // Remove elements in $GLOBALS that are present in any of the superglobals
-    $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array());
-    foreach ($input as $k => $v) {
-        if (!in_array($k, $no_unset) && isset($GLOBALS[$k])) {
-            unset($GLOBALS[$k]);
-            unset($GLOBALS[$k]); // Double unset to circumvent the zend_hash_del_key_or_index hole in PHP <4.4.3 and <5.1.4
-        }
-    }
-}
-
-
-//
-// Removes any "bad" characters (characters which mess with the display of a page, are invisible, etc) from user input
-//
-function forum_remove_bad_characters()
-{
-    $_GET = remove_bad_characters($_GET);
-    $_POST = remove_bad_characters($_POST);
-    $_COOKIE = remove_bad_characters($_COOKIE);
-    $_REQUEST = remove_bad_characters($_REQUEST);
-}
-
-//
-// Removes any "bad" characters (characters which mess with the display of a page, are invisible, etc) from the given string
-// See: http://kb.mozillazine.org/Network.IDN.blacklist_chars
-//
-function remove_bad_characters($array)
-{
-    static $bad_utf8_chars;
-
-    if (!isset($bad_utf8_chars)) {
-        $bad_utf8_chars = array(
-            "\xcc\xb7"        => '',        // COMBINING SHORT SOLIDUS OVERLAY		0337	*
-            "\xcc\xb8"        => '',        // COMBINING LONG SOLIDUS OVERLAY		0338	*
-            "\xe1\x85\x9F"    => '',        // HANGUL CHOSEONG FILLER				115F	*
-            "\xe1\x85\xA0"    => '',        // HANGUL JUNGSEONG FILLER				1160	*
-            "\xe2\x80\x8b"    => '',        // ZERO WIDTH SPACE						200B	*
-            "\xe2\x80\x8c"    => '',        // ZERO WIDTH NON-JOINER				200C
-            "\xe2\x80\x8d"    => '',        // ZERO WIDTH JOINER					200D
-            "\xe2\x80\x8e"    => '',        // LEFT-TO-RIGHT MARK					200E
-            "\xe2\x80\x8f"    => '',        // RIGHT-TO-LEFT MARK					200F
-            "\xe2\x80\xaa"    => '',        // LEFT-TO-RIGHT EMBEDDING				202A
-            "\xe2\x80\xab"    => '',        // RIGHT-TO-LEFT EMBEDDING				202B
-            "\xe2\x80\xac"    => '',        // POP DIRECTIONAL FORMATTING			202C
-            "\xe2\x80\xad"    => '',        // LEFT-TO-RIGHT OVERRIDE				202D
-            "\xe2\x80\xae"    => '',        // RIGHT-TO-LEFT OVERRIDE				202E
-            "\xe2\x80\xaf"    => '',        // NARROW NO-BREAK SPACE				202F	*
-            "\xe2\x81\x9f"    => '',        // MEDIUM MATHEMATICAL SPACE			205F	*
-            "\xe2\x81\xa0"    => '',        // WORD JOINER							2060
-            "\xe3\x85\xa4"    => '',        // HANGUL FILLER						3164	*
-            "\xef\xbb\xbf"    => '',        // ZERO WIDTH NO-BREAK SPACE			FEFF
-            "\xef\xbe\xa0"    => '',        // HALFWIDTH HANGUL FILLER				FFA0	*
-            "\xef\xbf\xb9"    => '',        // INTERLINEAR ANNOTATION ANCHOR		FFF9	*
-            "\xef\xbf\xba"    => '',        // INTERLINEAR ANNOTATION SEPARATOR		FFFA	*
-            "\xef\xbf\xbb"    => '',        // INTERLINEAR ANNOTATION TERMINATOR	FFFB	*
-            "\xef\xbf\xbc"    => '',        // OBJECT REPLACEMENT CHARACTER			FFFC	*
-            "\xef\xbf\xbd"    => '',        // REPLACEMENT CHARACTER				FFFD	*
-            "\xe2\x80\x80"    => ' ',        // EN QUAD								2000	*
-            "\xe2\x80\x81"    => ' ',        // EM QUAD								2001	*
-            "\xe2\x80\x82"    => ' ',        // EN SPACE								2002	*
-            "\xe2\x80\x83"    => ' ',        // EM SPACE								2003	*
-            "\xe2\x80\x84"    => ' ',        // THREE-PER-EM SPACE					2004	*
-            "\xe2\x80\x85"    => ' ',        // FOUR-PER-EM SPACE					2005	*
-            "\xe2\x80\x86"    => ' ',        // SIX-PER-EM SPACE						2006	*
-            "\xe2\x80\x87"    => ' ',        // FIGURE SPACE							2007	*
-            "\xe2\x80\x88"    => ' ',        // FEATHERCTUATION SPACE					2008	*
-            "\xe2\x80\x89"    => ' ',        // THIN SPACE							2009	*
-            "\xe2\x80\x8a"    => ' ',        // HAIR SPACE							200A	*
-            "\xE3\x80\x80"    => ' ',        // IDEOGRAPHIC SPACE					3000	*
-        );
-    }
-
-    if (is_array($array)) {
-        return array_map('remove_bad_characters', $array);
-    }
-
-    // Strip out any invalid characters
-    $array = utf8_bad_strip($array);
-
-    // Remove control characters
-    $array = preg_replace('%[\x00-\x08\x0b-\x0c\x0e-\x1f]%', '', $array);
-
-    // Replace some "bad" characters
-    $array = str_replace(array_keys($bad_utf8_chars), array_values($bad_utf8_chars), $array);
-
-    return $array;
-}
-
-
 //
 // Converts the file size in bytes to a human readable file size
 //
@@ -1094,27 +967,6 @@ function forum_list_langs()
 }
 
 
-//
-// Generate a cache ID based on the last modification time for all stopwords files
-//
-function generate_stopwords_cache_id()
-{
-    $files = glob(FEATHER_ROOT.'lang/*/stopwords.txt');
-    if ($files === false) {
-        return 'cache_id_error';
-    }
-
-    $hash = array();
-
-    foreach ($files as $file) {
-        $hash[] = $file;
-        $hash[] = filemtime($file);
-    }
-
-    return sha1(implode('|', $hash));
-}
-
-
 //
 // function url_valid($url) {
 //
@@ -1291,85 +1143,6 @@ function strip_bad_multibyte_chars($str)
     return $result;
 }
 
-//
-// Check whether a file/folder is writable.
-//
-// This function also works on Windows Server where ACLs seem to be ignored.
-//
-function forum_is_writable($path)
-{
-    if (is_dir($path)) {
-        $path = rtrim($path, '/').'/';
-        return forum_is_writable($path.uniqid(mt_rand()).'.tmp');
-    }
-
-    // Check temporary file for read/write capabilities
-    $rm = file_exists($path);
-    $f = @fopen($path, 'a');
-
-    if ($f === false) {
-        return false;
-    }
-
-    fclose($f);
-
-    if (!$rm) {
-        @unlink($path);
-    }
-
-    return true;
-}
-
-
-// DEBUG FUNCTIONS BELOW
-
-//
-// Display executed queries (if enabled)
-//
-function display_saved_queries()
-{
-
-
-    ?>
-
-<div id="debug" class="blocktable">
-	<h2><span><?php _e('Debug table') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Query times') ?></th>
-					<th class="tcr" scope="col"><?php _e('Query') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-
-    $query_time_total = 0.0;
-    $i = 0;
-    foreach (\DB::get_query_log()[1] as $query) {
-        ?>
-                <tr>
-					<td class="tcl"><?php echo feather_escape(round(\DB::get_query_log()[0][$i], 6)) ?></td>
-					<td class="tcr"><?php echo feather_escape($query) ?></td>
-				</tr>
-        <?php
-        ++$i;
-    }
-        ?>
-				<tr>
-					<td class="tcl" colspan="2"><?php printf(__('Total query time'), $query_time_total.' s') ?></td>
-				</tr>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-<?php
-
-}
-
 //
 // Make a string safe to use in a URL
 // Inspired by (c) Panther <http://www.pantherforum.org/>
@@ -1444,7 +1217,8 @@ function get_sublink($link, $sublink, $subarg, $args = null)
 }
 
 // Generate breadcrumbs from an array of name and URLs
-function breadcrumbs(array $links) {
+function breadcrumbs_admin(array $links)
+{
     foreach ($links as $name => $url) {
         if ($name != '' && $url != '') {
             $tmp[] = '<span><a href="' . $url . '">'.feather_escape($name).'</a></span>';
@@ -1455,3 +1229,52 @@ function breadcrumbs(array $links) {
     }
     return implode(' » ', $tmp);
 }
+
+
+
+// DEBUG FUNCTIONS BELOW
+
+//
+// Display executed queries (if enabled)
+//
+function display_saved_queries()
+{
+    ?>
+
+<div id="debug" class="blocktable">
+	<h2><span><?php _e('Debug table') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Query times') ?></th>
+					<th class="tcr" scope="col"><?php _e('Query') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+
+    $query_time_total = 0.0;
+    $i = 0;
+    foreach (\DB::get_query_log()[1] as $query) {
+        ?>
+                <tr>
+					<td class="tcl"><?php echo feather_escape(round(\DB::get_query_log()[0][$i], 6)) ?></td>
+					<td class="tcr"><?php echo feather_escape($query) ?></td>
+				</tr>
+        <?php
+        ++$i;
+    }
+        ?>
+				<tr>
+					<td class="tcl" colspan="2"><?php printf(__('Total query time'), $query_time_total.' s') ?></td>
+				</tr>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+<?php
+
+}
\ No newline at end of file
diff --git a/install/dblayer/sqlite.php b/install/dblayer/sqlite.php
index 56832ed2..8c2416d3 100644
--- a/install/dblayer/sqlite.php
+++ b/install/dblayer/sqlite.php
@@ -32,6 +32,30 @@ class DBLayer
         '%^(TINY|MEDIUM|LONG)?TEXT$%i'                                            =>    'TEXT'
     );
 
+    public function forum_is_writable($path)
+    {
+        if (is_dir($path)) {
+            $path = rtrim($path, '/').'/';
+            return forum_is_writable($path.uniqid(mt_rand()).'.tmp');
+        }
+
+        // Check temporary file for read/write capabilities
+        $rm = file_exists($path);
+        $f = @fopen($path, 'a');
+
+        if ($f === false) {
+            return false;
+        }
+
+        fclose($f);
+
+        if (!$rm) {
+            @unlink($path);
+        }
+
+        return true;
+    }
+
 
     public function __construct($db_host, $db_username, $db_password, $db_name, $db_prefix, $p_connect)
     {
@@ -52,7 +76,7 @@ public function __construct($db_host, $db_username, $db_password, $db_name, $db_
             error('Unable to open database \''.$db_name.'\' for reading. Permission denied', __FILE__, __LINE__);
         }
 
-        if (!forum_is_writable($db_name)) {
+        if (!$this->forum_is_writable($db_name)) {
             error('Unable to open database \''.$db_name.'\' for writing. Permission denied', __FILE__, __LINE__);
         }
 
diff --git a/install/dblayer/sqlite3.php b/install/dblayer/sqlite3.php
index f81ec862..9b6438c6 100644
--- a/install/dblayer/sqlite3.php
+++ b/install/dblayer/sqlite3.php
@@ -34,6 +34,30 @@ class DBLayer
         '%^(TINY|MEDIUM|LONG)?TEXT$%i'                                            =>    'TEXT'
     );
 
+    public function forum_is_writable($path)
+    {
+        if (is_dir($path)) {
+            $path = rtrim($path, '/').'/';
+            return forum_is_writable($path.uniqid(mt_rand()).'.tmp');
+        }
+
+        // Check temporary file for read/write capabilities
+        $rm = file_exists($path);
+        $f = @fopen($path, 'a');
+
+        if ($f === false) {
+            return false;
+        }
+
+        fclose($f);
+
+        if (!$rm) {
+            @unlink($path);
+        }
+
+        return true;
+    }
+
 
     public function __construct($db_host, $db_username, $db_password, $db_name, $db_prefix, $p_connect)
     {
@@ -54,7 +78,7 @@ public function __construct($db_host, $db_username, $db_password, $db_name, $db_
             error('Unable to open database \''.$db_name.'\' for reading. Permission denied', __FILE__, __LINE__);
         }
 
-        if (!forum_is_writable($db_name)) {
+        if (!$this->forum_is_writable($db_name)) {
             error('Unable to open database \''.$db_name.'\' for writing. Permission denied', __FILE__, __LINE__);
         }
 
diff --git a/install/index.php b/install/index.php
index f069b5d8..6c481fa4 100644
--- a/install/index.php
+++ b/install/index.php
@@ -38,11 +38,131 @@
 // Load UTF-8 functions
 require FEATHER_ROOT.'include/utf8/utf8.php';
 
+//
+// Check whether a file/folder is writable.
+//
+// This function also works on Windows Server where ACLs seem to be ignored.
+//
+function forum_is_writable($path)
+{
+    if (is_dir($path)) {
+        $path = rtrim($path, '/').'/';
+        return forum_is_writable($path.uniqid(mt_rand()).'.tmp');
+    }
+
+    // Check temporary file for read/write capabilities
+    $rm = file_exists($path);
+    $f = @fopen($path, 'a');
+
+    if ($f === false) {
+        return false;
+    }
+
+    fclose($f);
+
+    if (!$rm) {
+        @unlink($path);
+    }
+
+    return true;
+}
+
+//
+// Removes any "bad" characters (characters which mess with the display of a page, are invisible, etc) from the given string
+// See: http://kb.mozillazine.org/Network.IDN.blacklist_chars
+//
+function remove_bad_characters($array)
+{
+    static $bad_utf8_chars;
+
+    if (!isset($bad_utf8_chars)) {
+        $bad_utf8_chars = array(
+            "\xcc\xb7"        => '',        // COMBINING SHORT SOLIDUS OVERLAY		0337	*
+            "\xcc\xb8"        => '',        // COMBINING LONG SOLIDUS OVERLAY		0338	*
+            "\xe1\x85\x9F"    => '',        // HANGUL CHOSEONG FILLER				115F	*
+            "\xe1\x85\xA0"    => '',        // HANGUL JUNGSEONG FILLER				1160	*
+            "\xe2\x80\x8b"    => '',        // ZERO WIDTH SPACE						200B	*
+            "\xe2\x80\x8c"    => '',        // ZERO WIDTH NON-JOINER				200C
+            "\xe2\x80\x8d"    => '',        // ZERO WIDTH JOINER					200D
+            "\xe2\x80\x8e"    => '',        // LEFT-TO-RIGHT MARK					200E
+            "\xe2\x80\x8f"    => '',        // RIGHT-TO-LEFT MARK					200F
+            "\xe2\x80\xaa"    => '',        // LEFT-TO-RIGHT EMBEDDING				202A
+            "\xe2\x80\xab"    => '',        // RIGHT-TO-LEFT EMBEDDING				202B
+            "\xe2\x80\xac"    => '',        // POP DIRECTIONAL FORMATTING			202C
+            "\xe2\x80\xad"    => '',        // LEFT-TO-RIGHT OVERRIDE				202D
+            "\xe2\x80\xae"    => '',        // RIGHT-TO-LEFT OVERRIDE				202E
+            "\xe2\x80\xaf"    => '',        // NARROW NO-BREAK SPACE				202F	*
+            "\xe2\x81\x9f"    => '',        // MEDIUM MATHEMATICAL SPACE			205F	*
+            "\xe2\x81\xa0"    => '',        // WORD JOINER							2060
+            "\xe3\x85\xa4"    => '',        // HANGUL FILLER						3164	*
+            "\xef\xbb\xbf"    => '',        // ZERO WIDTH NO-BREAK SPACE			FEFF
+            "\xef\xbe\xa0"    => '',        // HALFWIDTH HANGUL FILLER				FFA0	*
+            "\xef\xbf\xb9"    => '',        // INTERLINEAR ANNOTATION ANCHOR		FFF9	*
+            "\xef\xbf\xba"    => '',        // INTERLINEAR ANNOTATION SEPARATOR		FFFA	*
+            "\xef\xbf\xbb"    => '',        // INTERLINEAR ANNOTATION TERMINATOR	FFFB	*
+            "\xef\xbf\xbc"    => '',        // OBJECT REPLACEMENT CHARACTER			FFFC	*
+            "\xef\xbf\xbd"    => '',        // REPLACEMENT CHARACTER				FFFD	*
+            "\xe2\x80\x80"    => ' ',        // EN QUAD								2000	*
+            "\xe2\x80\x81"    => ' ',        // EM QUAD								2001	*
+            "\xe2\x80\x82"    => ' ',        // EN SPACE								2002	*
+            "\xe2\x80\x83"    => ' ',        // EM SPACE								2003	*
+            "\xe2\x80\x84"    => ' ',        // THREE-PER-EM SPACE					2004	*
+            "\xe2\x80\x85"    => ' ',        // FOUR-PER-EM SPACE					2005	*
+            "\xe2\x80\x86"    => ' ',        // SIX-PER-EM SPACE						2006	*
+            "\xe2\x80\x87"    => ' ',        // FIGURE SPACE							2007	*
+            "\xe2\x80\x88"    => ' ',        // FEATHERCTUATION SPACE					2008	*
+            "\xe2\x80\x89"    => ' ',        // THIN SPACE							2009	*
+            "\xe2\x80\x8a"    => ' ',        // HAIR SPACE							200A	*
+            "\xE3\x80\x80"    => ' ',        // IDEOGRAPHIC SPACE					3000	*
+        );
+    }
+
+    if (is_array($array)) {
+        return array_map('remove_bad_characters', $array);
+    }
+
+    // Strip out any invalid characters
+    $array = utf8_bad_strip($array);
+
+    // Remove control characters
+    $array = preg_replace('%[\x00-\x08\x0b-\x0c\x0e-\x1f]%', '', $array);
+
+    // Replace some "bad" characters
+    $array = str_replace(array_keys($bad_utf8_chars), array_values($bad_utf8_chars), $array);
+
+    return $array;
+}
+
 // Strip out "bad" UTF-8 characters
-forum_remove_bad_characters();
+$_GET = remove_bad_characters($_GET);
+$_POST = remove_bad_characters($_POST);
+$_COOKIE = remove_bad_characters($_COOKIE);
+$_REQUEST = remove_bad_characters($_REQUEST);
 
-// Reverse the effect of register_globals
-forum_unregister_globals();
+//
+// Unset any variables instantiated as a result of register_globals being enabled
+//
+$register_globals = ini_get('register_globals');
+if ($register_globals === '' || $register_globals === '0' || strtolower($register_globals) === 'off') {
+    return;
+}
+
+// Prevent script.php?GLOBALS[foo]=bar
+if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) {
+    exit('I\'ll have a steak sandwich and... a steak sandwich.');
+}
+
+// Variables that shouldn't be unset
+$no_unset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
+
+// Remove elements in $GLOBALS that are present in any of the superglobals
+$input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array());
+foreach ($input as $k => $v) {
+    if (!in_array($k, $no_unset) && isset($GLOBALS[$k])) {
+        unset($GLOBALS[$k]);
+        unset($GLOBALS[$k]); // Double unset to circumvent the zend_hash_del_key_or_index hole in PHP <4.4.3 and <5.1.4
+    }
+}
 
 // Disable error reporting for uninitialized variables
 error_reporting(E_ALL);
diff --git a/style/FeatherBB/view/admin/reports.php b/style/FeatherBB/view/admin/reports.php
index 0baeaaf1..63251681 100644
--- a/style/FeatherBB/view/admin/reports.php
+++ b/style/FeatherBB/view/admin/reports.php
@@ -29,7 +29,7 @@
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
+									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
@@ -79,7 +79,7 @@
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
+									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
diff --git a/view/admin/reports.php b/view/admin/reports.php
index d9a027e3..7b9b1e3d 100644
--- a/view/admin/reports.php
+++ b/view/admin/reports.php
@@ -29,7 +29,7 @@
 								<table class="aligntop">
 									<tr>
 										<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-										<td class="location"><?php echo breadcrumbs(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
+										<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
 												$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
 												sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 									</tr>
@@ -79,7 +79,7 @@
 								<table class="aligntop">
 									<tr>
 										<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-										<td class="location"><?php echo breadcrumbs(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
+										<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
 												$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
 												sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 									</tr>

From 3f8e7411f32a00607446156dc8b48c12814338d5 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 12:38:53 +0200
Subject: [PATCH 053/353] New FeatherBB middleware architecture

---
 Slim/Extras/Middleware/FeatherBB.php       | 536 ---------------------
 Slim/Extras/Middleware/FeatherBBAuth.php   | 316 ++++++++++++
 Slim/Extras/Middleware/FeatherBBLoader.php | 258 ++++++++++
 index.php                                  |   9 +-
 4 files changed, 579 insertions(+), 540 deletions(-)
 delete mode 100644 Slim/Extras/Middleware/FeatherBB.php
 create mode 100644 Slim/Extras/Middleware/FeatherBBAuth.php
 create mode 100644 Slim/Extras/Middleware/FeatherBBLoader.php

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
deleted file mode 100644
index 400e8554..00000000
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ /dev/null
@@ -1,536 +0,0 @@
-<?php
-/**
- *
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- *
- * $app = new \Slim\Slim();
- * $app->add(new \Slim\Extras\Middleware\FeatherBB($params));
- *
- */
-
-namespace Slim\Extras\Middleware;
-use DB;
-
-class FeatherBB extends \Slim\Middleware
-{
-    protected $data = array();
-
-	public function __construct(array $user_forum_settings = array())
-	{
-        // Define forum env constants
-        $this->data['forum_env'] = array(
-                                    'FEATHER' => true,
-                                    'FEATHER_ROOT' => dirname(__FILE__).'/../../../',
-                                    'FORUM_VERSION' => '1.0.0',
-                                    'FORUM_NAME' => 'FeatherBB',
-                                    'FORUM_DB_REVISION' => 21,
-                                    'FORUM_SI_REVISION' => 2,
-                                    'FORUM_PARSER_REVISION' => 2,
-                                    'FORUM_CACHE_DIR' => dirname(__FILE__).'/../../../cache/', // TODO : Move in user settings
-                                    'FEATHER_UNVERIFIED' => 0,
-                                    'FEATHER_ADMIN' => 1,
-                                    'FEATHER_MOD' => 2,
-                                    'FEATHER_GUEST' => 3,
-                                    'FEATHER_MEMBER' => 4,
-                                    'FEATHER_MAX_POSTSIZE' => 32768,
-                                    'FEATHER_SEARCH_MIN_WORD' => 3,
-                                    'FEATHER_SEARCH_MAX_WORD' => 20,
-                                    'FORUM_MAX_COOKIE_SIZE' => 4048,
-                                    'FEATHER_DEBUG' => 1,
-                                    'FEATHER_SHOW_QUERIES' => 1,
-                                    'FEATHER_CACHE_QUERIES' => 0,
-                                    );
-
-        // Define forum settings / TODO : handle settings with a class / User input overrides all previous settings
-        $this->data['forum_settings'] = array_merge(self::load_default_settings(), $user_forum_settings);
-
-        // Load DB settings
-        $this->init_db();
-	}
-
-    public static function load_default_settings()
-    {
-        return array(
-                // Database
-                'db_type' => 'mysqli',
-                'db_host' => '',
-                'db_name' => '',
-                'db_user' => '',
-                'db_pass' => '',
-                'db_prefix' => '',
-                // Cookies
-                'cookie_name' => 'feather_cookie',
-                'cookie_seed' => 'changeme', // MUST BE CHANGED !!!
-                // Debug
-                'debug' => false,
-                );
-    }
-
-    public function init_db()
-    {
-        require $this->data['forum_env']['FEATHER_ROOT'].'include/idiorm.php';
-        switch ($this->data['forum_settings']['db_type']) {
-            case 'mysql':
-            case 'mysqli':
-            case 'mysql_innodb':
-            case 'mysqli_innodb':
-                DB::configure('mysql:host='.$this->data['forum_settings']['db_host'].';dbname='.$this->data['forum_settings']['db_name']);
-                DB::configure('driver_options', array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-                break;
-            case 'sqlite';
-            case 'sqlite3';
-                DB::configure('sqlite:./'.$this->data['forum_settings']['db_name']);
-                break;
-            case 'pgsql':
-                \DB::configure('pgsql:host='.$this->data['forum_settings']['db_host'].'dbname='.$this->data['forum_settings']['db_name']);
-                break;
-        }
-        DB::configure('username', $this->data['forum_settings']['db_user']);
-        DB::configure('password', $this->data['forum_settings']['db_pass']);
-        if ($this->data['forum_env']['FEATHER_SHOW_QUERIES'] == 1) {
-            DB::configure('logging', true);
-        }
-        if ($this->data['forum_env']['FEATHER_CACHE_QUERIES'] == 1) {
-            DB::configure('caching', true);
-        }
-        DB::configure('id_column_overrides', array(
-            $this->data['forum_settings']['db_prefix'].'groups' => 'g_id',
-        ));
-    }
-
-    // Getters / setters for Slim container (avoid magic get error)
-
-    public function set_forum_env($key, $value = null)
-    {
-        $tmp = (!is_array($key) && !is_null($value)) ? array($key, $value) : $key;
-        foreach ($tmp as $key => $value) {
-            $this->app->container->get('forum_env')[$key] = $value;
-        }
-
-    }
-
-    public function set_forum_settings($key, $value = null)
-    {
-        $tmp = (!is_array($key) && !is_null($value)) ? array($key, $value) : $key;
-        foreach ($tmp as $key => $value) {
-            $this->app->container->get('forum_settings')[$key] = $value;
-        }
-    }
-
-    public function hydrate($data)
-    {
-        foreach ($data as $key => $value) {
-            $this->app->container[$key] = $value;
-        }
-    }
-
-    // Legacy function, to ensure backward compatibility with globals
-    public function env_to_globals(array $vars)
-    {
-        foreach ($vars as $key => $value) {
-            define($key, $value);
-        }
-    }
-
-    // Headers
-
-    public function set_headers()
-    {
-        // No cache headers
-        $this->app->response->headers->set('Cache-Control', 'no-cache, no-store, must-revalidate');
-        $this->app->response->headers->set('Pragma', 'no-cache');
-        $this->app->expires(0);
-
-        // For servers which might be configured to send something else
-        $this->app->response->headers->set('Content-type', 'text/html');
-        // Prevent the site to be embedded in iFrame
-        $this->app->response->headers->set('X-Frame-Options', 'deny');
-        // Yeah !
-        $this->app->response->headers->set('X-Powered-By', $this->app->forum_env['FORUM_NAME']);
-    }
-
-    // Auth
-
-    public function authenticate()
-    {
-        $now = time();
-
-        // Get FeatherBB cookie
-        $cookie_raw = $this->app->getCookie($this->data['forum_settings']['cookie_name']);
-        // Check if cookie exists and is valid (getCookie method returns false if the data has been tampered locally so it can't decrypt the cookie);
-        if (isset($cookie_raw)) {
-            $cookie = json_decode($cookie_raw, true);
-            $checksum = hash_hmac('sha1', $cookie['user_id'].$cookie['expires'], $this->data['forum_settings']['cookie_seed'].'_checksum');
-            // If cookie has a non-guest user, hasn't expired and is legit
-            if ($cookie['user_id'] > 1 && $cookie['expires'] > $now && $checksum == $cookie['checksum']) {
-                // Get user info from db
-                $select_check_cookie = array('u.*', 'g.*', 'o.logged', 'o.idle');
-                $where_check_cookie = array('u.id' => intval($cookie['user_id']));
-
-                $result = DB::for_table('users')
-                    ->table_alias('u')
-                    ->select_many($select_check_cookie)
-                    ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
-                    ->left_outer_join('online', array('o.user_id', '=', 'u.id'), 'o')
-                    ->where($where_check_cookie)
-                    ->find_result_set();
-
-                foreach ($result as $this->app->user);
-
-                // Another security check, to prevent identity fraud by changing the user id in the cookie) (might be useless considering the strength of encryption)
-                if (isset($this->app->user->id) && hash_hmac('sha1', $this->app->user->password, $this->data['forum_settings']['cookie_seed'].'_password_hash') === $cookie['password_hash']) {
-                    $expires = ($cookie['expires'] > $now + $this->data['forum_settings']['o_timeout_visit']) ? $now + 1209600 : $now + $this->data['forum_settings']['o_timeout_visit'];
-                    $this->app->user->is_guest = false;
-                    $this->app->user->is_admmod = $this->app->user->g_id == $this->data['forum_env']['FEATHER_ADMIN'] || $this->app->g_moderator == '1';
-                    if (!$this->app->user->disp_topics) {
-                        $this->app->user->disp_topics = $this->data['forum_settings']['o_disp_topics_default'];
-                    }
-                    if (!$this->app->user->disp_posts) {
-                        $this->app->user->disp_posts = $this->data['forum_settings']['o_disp_posts_default'];
-                    }
-                    if (!file_exists($this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language)) {
-                        $this->app->user->language = $this->data['forum_settings']['o_default_lang'];
-                    }
-                    if (!file_exists($this->data['forum_env']['FEATHER_ROOT'].'style/'.$this->app->user->style.'.css')) {
-                        $this->app->user->style = $this->data['forum_settings']['o_default_style'];
-                    }
-                    feather_setcookie($this->app->user->id, $this->app->user->password, $expires);
-                    $this->update_online();
-                    return true;
-                }
-            }
-        }
-
-        // If there is no cookie, or cookie is guest or expired, let's reconnect.
-        $expires = $now + 31536000; // The cookie expires after a year
-
-        // Fetch guest user
-        $select_set_default_user = array('u.*', 'g.*', 'o.logged', 'o.last_post', 'o.last_search');
-        $where_set_default_user = array('u.id' => '1');
-
-        $result = DB::for_table('users')
-            ->table_alias('u')
-            ->select_many($select_set_default_user)
-            ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
-            ->left_outer_join('online', array('o.ident', '=', $this->app->request->getIp()), 'o', true)
-            ->where($where_set_default_user)
-            ->find_result_set();
-
-        if (!$result) {
-            exit('Unable to fetch guest information. Your database must contain both a guest user and a guest user group.');
-        }
-
-        foreach ($result as $this->app->user);
-
-        $this->app->user->disp_topics = $this->data['forum_settings']['o_disp_topics_default'];
-        $this->app->user->disp_posts = $this->data['forum_settings']['o_disp_posts_default'];
-        $this->app->user->timezone = $this->data['forum_settings']['o_default_timezone'];
-        $this->app->user->dst = $this->data['forum_settings']['o_default_dst'];
-        $this->app->user->language = $this->data['forum_settings']['o_default_lang'];
-        $this->app->user->style = $this->data['forum_settings']['o_default_style'];
-        $this->app->user->is_guest = true;
-        $this->app->user->is_admmod = false;
-
-        // Update online list
-        if (!$this->app->user->logged) {
-            $this->app->user->logged = time();
-
-            // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
-            switch ($this->data['forum_settings']['db_type']) {
-                case 'mysql':
-                case 'mysqli':
-                case 'mysql_innodb':
-                case 'mysqli_innodb':
-                case 'sqlite':
-                case 'sqlite3':
-                DB::for_table('online')->raw_execute('REPLACE INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
-                    break;
-
-                default:
-                    DB::for_table('online')->raw_execute('INSERT INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE ident=:ident)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
-                    break;
-            }
-        } else {
-            DB::for_table('online')->where('ident', $this->app->request->getIp())
-                 ->update_many('logged', time());
-        }
-
-        feather_setcookie(1, feather_hash(uniqid(rand(), true)), $expires);
-        return true;
-    }
-
-    public function update_online()
-    {
-        $now = time();
-
-        // Define this if you want this visit to affect the online list and the users last visit data
-        if (!defined('FEATHER_QUIET_VISIT')) {
-            // Update the online list
-            if (!$this->app->user->logged) {
-                $this->app->user->logged = $now;
-
-                // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
-                switch ($this->data['forum_settings']['db_type']) {
-                    case 'mysql':
-                    case 'mysqli':
-                    case 'mysql_innodb':
-                    case 'mysqli_innodb':
-                    case 'sqlite':
-                    case 'sqlite3':
-                        DB::for_table('online')->raw_execute('REPLACE INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) VALUES(:user_id, :ident, :logged)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
-                        break;
-
-                    default:
-                        DB::for_table('online')->raw_execute('INSERT INTO '.$this->data['forum_settings']['db_prefix'].'online (user_id, ident, logged) SELECT :user_id, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE user_id=:user_id)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
-                        break;
-                }
-
-                // Reset tracked topics
-                set_tracked_topics(null);
-
-            } else {
-                // Special case: We've timed out, but no other user has browsed the forums since we timed out
-                if ($this->app->user->logged < ($now-$this->data['forum_settings']['o_timeout_visit'])) {
-                    DB::for_table('users')->where('id', $this->app->user->id)
-                        ->find_one()
-                        ->set('last_visit', $this->app->user->logged)
-                        ->save();
-                    $this->app->user->last_visit = $this->app->user->logged;
-                }
-
-                $idle_sql = ($this->app->user->idle == '1') ? ', idle=0' : '';
-
-                DB::for_table('online')->raw_execute('UPDATE '.$this->data['forum_settings']['db_prefix'].'online SET logged='.$now.$idle_sql.' WHERE user_id=:user_id', array(':user_id' => $this->app->user->id));
-
-                // Update tracked topics with the current expire time
-                $cookie_tracked_topics = $this->app->getCookie($this->data['forum_settings']['cookie_name'].'_track');
-                if (isset($cookie_tracked_topics)) {
-                    set_tracked_topics(json_decode($cookie_tracked_topics, true));
-                }
-            }
-        } else {
-            if (!$this->app->user->logged) {
-                $this->app->user->logged = $this->app->user->last_visit;
-            }
-        }
-    }
-
-    public function update_users_online()
-    {
-        $now = time();
-
-        // Fetch all online list entries that are older than "o_timeout_online"
-        $select_update_users_online = array('user_id', 'ident', 'logged', 'idle');
-
-        $result = \DB::for_table('online')->select_many($select_update_users_online)
-            ->where_lt('logged', $now-$this->data['forum_settings']['o_timeout_online'])
-            ->find_many();
-
-        foreach ($result as $cur_user) {
-            // If the entry is a guest, delete it
-            if ($cur_user['user_id'] == '1') {
-                \DB::for_table('online')->where('ident', $cur_user['ident'])
-                    ->delete_many();
-            } else {
-                // If the entry is older than "o_timeout_visit", update last_visit for the user in question, then delete him/her from the online list
-                if ($cur_user['logged'] < ($now-$this->data['forum_settings']['o_timeout_visit'])) {
-                    \DB::for_table('users')->where('id', $cur_user['user_id'])
-                        ->find_one()
-                        ->set('last_visit', $cur_user['logged'])
-                        ->save();
-                    \DB::for_table('online')->where('user_id', $cur_user['user_id'])
-                        ->delete_many();
-                } elseif ($cur_user['idle'] == '0') {
-                    \DB::for_table('online')->where('user_id', $cur_user['user_id'])
-                        ->update_many('idle', 1);
-                }
-            }
-        }
-    }
-
-    public function maintenance_message()
-    {
-        // Deal with newlines, tabs and multiple spaces
-        $pattern = array("\t", '  ', '  ');
-        $replace = array('&#160; &#160; ', '&#160; ', ' &#160;');
-        $message = str_replace($pattern, $replace, $this->data['forum_settings']['o_maintenance_message']);
-
-        $page_title = array(feather_escape($this->data['forum_settings']['o_board_title']), __('Maintenance'));
-
-        define('FEATHER_ACTIVE_PAGE', 'index');
-
-        $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? FEATHER_ROOT.'style/'.$this->app->user->style.'/view' : FEATHER_ROOT.'view');
-
-        $header = new \controller\header();
-
-        $header->setTitle($page_title)->display();
-
-        $this->app->render('message.php', array(
-                'message'    =>    $message,
-                'no_back_link'    =>    '',
-            )
-        );
-
-        $footer = new \controller\footer();
-
-        $footer->dontStop();
-
-        $footer->display();
-    }
-
-    public function check_bans()
-    {
-        global $feather_bans;
-
-        // Admins and moderators aren't affected
-        if ($this->app->user->is_admmod || !$feather_bans) {
-            return;
-        }
-
-        // Add a dot or a colon (depending on IPv4/IPv6) at the end of the IP address to prevent banned address
-        // 192.168.0.5 from matching e.g. 192.168.0.50
-        $user_ip = get_remote_address();
-        $user_ip .= (strpos($user_ip, '.') !== false) ? '.' : ':';
-
-        $bans_altered = false;
-        $is_banned = false;
-
-        foreach ($feather_bans as $cur_ban) {
-            // Has this ban expired?
-            if ($cur_ban['expire'] != '' && $cur_ban['expire'] <= time()) {
-                \DB::for_table('bans')->where('id', $cur_ban['id'])
-                    ->delete_many();
-                $bans_altered = true;
-                continue;
-            }
-
-            if ($cur_ban['username'] != '' && utf8_strtolower($this->app->user->username) == utf8_strtolower($cur_ban['username'])) {
-                $is_banned = true;
-            }
-
-            if ($cur_ban['ip'] != '') {
-                $cur_ban_ips = explode(' ', $cur_ban['ip']);
-
-                $num_ips = count($cur_ban_ips);
-                for ($i = 0; $i < $num_ips; ++$i) {
-                    // Add the proper ending to the ban
-                    if (strpos($user_ip, '.') !== false) {
-                        $cur_ban_ips[$i] = $cur_ban_ips[$i].'.';
-                    } else {
-                        $cur_ban_ips[$i] = $cur_ban_ips[$i].':';
-                    }
-
-                    if (substr($user_ip, 0, strlen($cur_ban_ips[$i])) == $cur_ban_ips[$i]) {
-                        $is_banned = true;
-                        break;
-                    }
-                }
-            }
-
-            if ($is_banned) {
-                \DB::for_table('online')->where('ident', $this->app->user->username)
-                    ->delete_many();
-                message(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.feather_escape($this->data['forum_settings']['o_admin_email']).'">'.feather_escape($this->data['forum_settings']['o_admin_email']).'</a>.', true, true, true);
-            }
-        }
-
-        // If we removed any expired bans during our run-through, we need to regenerate the bans cache
-        if ($bans_altered) {
-            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                require FEATHER_ROOT.'include/cache.php';
-            }
-
-            generate_bans_cache();
-        }
-    }
-
-    //
-
-    public function call()
-    {
-        global $feather_bans, $cookie_name, $cookie_seed, $forum_time_formats, $forum_date_formats, $feather_config; // Legacy
-
-        if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) { // Block prefetch requests
-            $this->set_headers();
-            $this->app->response->setStatus(403);
-        } else {
-            $this->env_to_globals($this->data['forum_env']); // Legacy : define globals from forum_env
-
-
-            require $this->data['forum_env']['FEATHER_ROOT'].'include/utf8/utf8.php';
-            require $this->data['forum_env']['FEATHER_ROOT'].'include/functions.php';
-
-            // Record the start time (will be used to calculate the generation time for the page)
-            $this->app->start = get_microtime();
-
-            // Get forum config and load it into forum_settings array
-            if (file_exists($this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php')) {
-                include $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php';
-            } else {
-                require $this->data['forum_env']['FEATHER_ROOT'].'include/cache.php';
-                generate_config_cache();
-                require $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_config.php';
-            }
-            $this->data['forum_settings'] = array_merge($feather_config, $this->data['forum_settings']);
-            // Define time formats
-            $forum_time_formats = array($this->data['forum_settings']['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
-            $forum_date_formats = array($this->data['forum_settings']['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
-            // Populate Feather object (Slim instance)
-            $this->hydrate($this->data);
-
-            $this->app->config = $this->data['forum_settings']; // Legacy
-            extract($this->data['forum_settings']); // Legacy
-
-            $this->set_headers();
-
-            // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
-            setlocale(LC_CTYPE, 'C');
-
-            $this->authenticate();
-
-            // Load l10n
-            require $this->data['forum_env']['FEATHER_ROOT'].'include/pomo/MO.php';
-            require $this->data['forum_env']['FEATHER_ROOT'].'include/l10n.php';
-
-            // Attempt to load the language file
-            if (file_exists($this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.mo')) {
-                load_textdomain('featherbb', $this->data['forum_env']['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.mo');
-            }
-            else {
-                die('There is no valid language pack \''.feather_escape($this->app->user->language).'\' installed. Please reinstall a language of that name');
-            }
-
-            // Check if we are to display a maintenance message
-            if ($this->data['forum_settings']['o_maintenance'] && $this->app->user->g_id > $this->data['forum_env']['FEATHER_ADMIN'] && !defined('FEATHER_TURN_OFF_MAINT')) {
-                $this->maintenance_message();
-            }
-
-            // Load cached bans
-            if (file_exists($this->data['forum_env']['FORUM_CACHE_DIR'].'cache_bans.php')) {
-                include $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_bans.php';
-            }
-
-            if (!defined('FEATHER_BANS_LOADED')) {
-                if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                    require $this->data['forum_env']['FEATHER_ROOT'].'include/cache.php';
-                }
-
-                generate_bans_cache();
-                require $this->data['forum_env']['FORUM_CACHE_DIR'].'cache_bans.php';
-            }
-
-            // Check if current user is banned
-            $this->check_bans();
-
-            // Update online list
-            $this->update_users_online();
-
-            // Configure Slim
-            $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? FEATHER_ROOT.'style/'.$this->app->user->style.'/view' : FEATHER_ROOT.'view');
-            $this->next->call();
-        }
-    }
-}
diff --git a/Slim/Extras/Middleware/FeatherBBAuth.php b/Slim/Extras/Middleware/FeatherBBAuth.php
new file mode 100644
index 00000000..c75ad413
--- /dev/null
+++ b/Slim/Extras/Middleware/FeatherBBAuth.php
@@ -0,0 +1,316 @@
+<?php
+/**
+ *
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ *
+ * $app = new \Slim\Slim();
+ * $app->add(new \Slim\Extras\Middleware\FeatherBBAuth());
+ *
+ */
+
+namespace Slim\Extras\Middleware;
+use DB;
+
+class FeatherBBAuth extends \Slim\Middleware
+{
+    public function __construct()
+	{
+    }
+
+    public function authenticate()
+    {
+        $now = time();
+
+        // Get FeatherBB cookie
+        $cookie_raw = $this->app->getCookie($this->app->forum_settings['cookie_name']);
+        // Check if cookie exists and is valid (getCookie method returns false if the data has been tampered locally so it can't decrypt the cookie);
+        if (isset($cookie_raw)) {
+            $cookie = json_decode($cookie_raw, true);
+            $checksum = hash_hmac('sha1', $cookie['user_id'].$cookie['expires'], $this->app->forum_settings['cookie_seed'].'_checksum');
+            // If cookie has a non-guest user, hasn't expired and is legit
+            if ($cookie['user_id'] > 1 && $cookie['expires'] > $now && $checksum == $cookie['checksum']) {
+                // Get user info from db
+                $select_check_cookie = array('u.*', 'g.*', 'o.logged', 'o.idle');
+                $where_check_cookie = array('u.id' => intval($cookie['user_id']));
+
+                $result = DB::for_table('users')
+                    ->table_alias('u')
+                    ->select_many($select_check_cookie)
+                    ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
+                    ->left_outer_join('online', array('o.user_id', '=', 'u.id'), 'o')
+                    ->where($where_check_cookie)
+                    ->find_result_set();
+
+                foreach ($result as $this->app->user);
+
+                // Another security check, to prevent identity fraud by changing the user id in the cookie) (might be useless considering the strength of encryption)
+                if (isset($this->app->user->id) && hash_hmac('sha1', $this->app->user->password, $this->app->forum_settings['cookie_seed'].'_password_hash') === $cookie['password_hash']) {
+                    $expires = ($cookie['expires'] > $now + $this->app->forum_settings['o_timeout_visit']) ? $now + 1209600 : $now + $this->app->forum_settings['o_timeout_visit'];
+                    $this->app->user->is_guest = false;
+                    $this->app->user->is_admmod = $this->app->user->g_id == $this->app->forum_env['FEATHER_ADMIN'] || $this->app->g_moderator == '1';
+                    if (!$this->app->user->disp_topics) {
+                        $this->app->user->disp_topics = $this->app->forum_settings['o_disp_topics_default'];
+                    }
+                    if (!$this->app->user->disp_posts) {
+                        $this->app->user->disp_posts = $this->app->forum_settings['o_disp_posts_default'];
+                    }
+                    if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language)) {
+                        $this->app->user->language = $this->app->forum_settings['o_default_lang'];
+                    }
+                    if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'style/'.$this->app->user->style.'.css')) {
+                        $this->app->user->style = $this->app->forum_settings['o_default_style'];
+                    }
+                    feather_setcookie($this->app->user->id, $this->app->user->password, $expires);
+                    $this->update_online();
+                    return true;
+                }
+            }
+        }
+
+        // If there is no cookie, or cookie is guest or expired, let's reconnect.
+        $expires = $now + 31536000; // The cookie expires after a year
+
+        // Fetch guest user
+        $select_set_default_user = array('u.*', 'g.*', 'o.logged', 'o.last_post', 'o.last_search');
+        $where_set_default_user = array('u.id' => '1');
+
+        $result = DB::for_table('users')
+            ->table_alias('u')
+            ->select_many($select_set_default_user)
+            ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
+            ->left_outer_join('online', array('o.ident', '=', $this->app->request->getIp()), 'o', true)
+            ->where($where_set_default_user)
+            ->find_result_set();
+
+        if (!$result) {
+            exit('Unable to fetch guest information. Your database must contain both a guest user and a guest user group.');
+        }
+
+        foreach ($result as $this->app->user);
+
+        $this->app->user->disp_topics = $this->app->forum_settings['o_disp_topics_default'];
+        $this->app->user->disp_posts = $this->app->forum_settings['o_disp_posts_default'];
+        $this->app->user->timezone = $this->app->forum_settings['o_default_timezone'];
+        $this->app->user->dst = $this->app->forum_settings['o_default_dst'];
+        $this->app->user->language = $this->app->forum_settings['o_default_lang'];
+        $this->app->user->style = $this->app->forum_settings['o_default_style'];
+        $this->app->user->is_guest = true;
+        $this->app->user->is_admmod = false;
+
+        // Update online list
+        if (!$this->app->user->logged) {
+            $this->app->user->logged = time();
+
+            // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
+            switch ($this->app->forum_settings['db_type']) {
+                case 'mysql':
+                case 'mysqli':
+                case 'mysql_innodb':
+                case 'mysqli_innodb':
+                case 'sqlite':
+                case 'sqlite3':
+                DB::for_table('online')->raw_execute('REPLACE INTO '.$this->app->forum_settings['db_prefix'].'online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
+                    break;
+
+                default:
+                    DB::for_table('online')->raw_execute('INSERT INTO '.$this->app->forum_settings['db_prefix'].'online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE ident=:ident)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
+                    break;
+            }
+        } else {
+            DB::for_table('online')->where('ident', $this->app->request->getIp())
+                 ->update_many('logged', time());
+        }
+
+        feather_setcookie(1, feather_hash(uniqid(rand(), true)), $expires);
+        return true;
+    }
+
+    public function update_online()
+    {
+        $now = time();
+
+        // Define this if you want this visit to affect the online list and the users last visit data
+        if (!defined('FEATHER_QUIET_VISIT')) {
+            // Update the online list
+            if (!$this->app->user->logged) {
+                $this->app->user->logged = $now;
+
+                // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
+                switch ($this->app->forum_settings['db_type']) {
+                    case 'mysql':
+                    case 'mysqli':
+                    case 'mysql_innodb':
+                    case 'mysqli_innodb':
+                    case 'sqlite':
+                    case 'sqlite3':
+                        DB::for_table('online')->raw_execute('REPLACE INTO '.$this->app->forum_settings['db_prefix'].'online (user_id, ident, logged) VALUES(:user_id, :ident, :logged)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
+                        break;
+
+                    default:
+                        DB::for_table('online')->raw_execute('INSERT INTO '.$this->app->forum_settings['db_prefix'].'online (user_id, ident, logged) SELECT :user_id, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE user_id=:user_id)', array(':user_id' => $this->app->user->id, ':ident' => $this->app->user->username, ':logged' => $this->app->user->logged));
+                        break;
+                }
+
+                // Reset tracked topics
+                set_tracked_topics(null);
+
+            } else {
+                // Special case: We've timed out, but no other user has browsed the forums since we timed out
+                if ($this->app->user->logged < ($now-$this->app->forum_settings['o_timeout_visit'])) {
+                    DB::for_table('users')->where('id', $this->app->user->id)
+                        ->find_one()
+                        ->set('last_visit', $this->app->user->logged)
+                        ->save();
+                    $this->app->user->last_visit = $this->app->user->logged;
+                }
+
+                $idle_sql = ($this->app->user->idle == '1') ? ', idle=0' : '';
+
+                DB::for_table('online')->raw_execute('UPDATE '.$this->app->forum_settings['db_prefix'].'online SET logged='.$now.$idle_sql.' WHERE user_id=:user_id', array(':user_id' => $this->app->user->id));
+
+                // Update tracked topics with the current expire time
+                $cookie_tracked_topics = $this->app->getCookie($this->app->forum_settings['cookie_name'].'_track');
+                if (isset($cookie_tracked_topics)) {
+                    set_tracked_topics(json_decode($cookie_tracked_topics, true));
+                }
+            }
+        } else {
+            if (!$this->app->user->logged) {
+                $this->app->user->logged = $this->app->user->last_visit;
+            }
+        }
+    }
+
+    public function update_users_online()
+    {
+        $now = time();
+
+        // Fetch all online list entries that are older than "o_timeout_online"
+        $select_update_users_online = array('user_id', 'ident', 'logged', 'idle');
+
+        $result = \DB::for_table('online')->select_many($select_update_users_online)
+            ->where_lt('logged', $now-$this->app->forum_settings['o_timeout_online'])
+            ->find_many();
+
+        foreach ($result as $cur_user) {
+            // If the entry is a guest, delete it
+            if ($cur_user['user_id'] == '1') {
+                \DB::for_table('online')->where('ident', $cur_user['ident'])
+                    ->delete_many();
+            } else {
+                // If the entry is older than "o_timeout_visit", update last_visit for the user in question, then delete him/her from the online list
+                if ($cur_user['logged'] < ($now-$this->app->forum_settings['o_timeout_visit'])) {
+                    \DB::for_table('users')->where('id', $cur_user['user_id'])
+                        ->find_one()
+                        ->set('last_visit', $cur_user['logged'])
+                        ->save();
+                    \DB::for_table('online')->where('user_id', $cur_user['user_id'])
+                        ->delete_many();
+                } elseif ($cur_user['idle'] == '0') {
+                    \DB::for_table('online')->where('user_id', $cur_user['user_id'])
+                        ->update_many('idle', 1);
+                }
+            }
+        }
+    }
+
+    public function check_bans()
+    {
+        global $feather_bans;
+
+        // Admins and moderators aren't affected
+        if ($this->app->user->is_admmod || !$feather_bans) {
+            return;
+        }
+
+        // Add a dot or a colon (depending on IPv4/IPv6) at the end of the IP address to prevent banned address
+        // 192.168.0.5 from matching e.g. 192.168.0.50
+        $user_ip = get_remote_address();
+        $user_ip .= (strpos($user_ip, '.') !== false) ? '.' : ':';
+
+        $bans_altered = false;
+        $is_banned = false;
+
+        foreach ($feather_bans as $cur_ban) {
+            // Has this ban expired?
+            if ($cur_ban['expire'] != '' && $cur_ban['expire'] <= time()) {
+                \DB::for_table('bans')->where('id', $cur_ban['id'])
+                    ->delete_many();
+                $bans_altered = true;
+                continue;
+            }
+
+            if ($cur_ban['username'] != '' && utf8_strtolower($this->app->user->username) == utf8_strtolower($cur_ban['username'])) {
+                $is_banned = true;
+            }
+
+            if ($cur_ban['ip'] != '') {
+                $cur_ban_ips = explode(' ', $cur_ban['ip']);
+
+                $num_ips = count($cur_ban_ips);
+                for ($i = 0; $i < $num_ips; ++$i) {
+                    // Add the proper ending to the ban
+                    if (strpos($user_ip, '.') !== false) {
+                        $cur_ban_ips[$i] = $cur_ban_ips[$i].'.';
+                    } else {
+                        $cur_ban_ips[$i] = $cur_ban_ips[$i].':';
+                    }
+
+                    if (substr($user_ip, 0, strlen($cur_ban_ips[$i])) == $cur_ban_ips[$i]) {
+                        $is_banned = true;
+                        break;
+                    }
+                }
+            }
+
+            if ($is_banned) {
+                \DB::for_table('online')->where('ident', $this->app->user->username)
+                    ->delete_many();
+                message(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.feather_escape($this->app->forum_settings['o_admin_email']).'">'.feather_escape($this->app->forum_settings['o_admin_email']).'</a>.', true, true, true);
+            }
+        }
+
+        // If we removed any expired bans during our run-through, we need to regenerate the bans cache
+        if ($bans_altered) {
+            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
+                require FEATHER_ROOT.'include/cache.php';
+            }
+
+            generate_bans_cache();
+        }
+    }
+
+    public function call()
+    {
+        global $feather_bans, $cookie_name, $cookie_seed;
+
+        $this->authenticate();
+
+        // Load cached bans
+        if (file_exists($this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php')) {
+            include $this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php';
+        }
+
+        if (!defined('FEATHER_BANS_LOADED')) {
+            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
+                require $this->app->forum_env['FEATHER_ROOT'].'include/cache.php';
+            }
+
+            generate_bans_cache();
+            require $this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php';
+        }
+
+        // Check if current user is banned
+        $this->check_bans();
+
+        // Update online list
+        $this->update_users_online();
+
+        // Configure Slim
+        $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? FEATHER_ROOT.'style/'.$this->app->user->style.'/view' : FEATHER_ROOT.'view');
+        $this->next->call();
+    }
+}
diff --git a/Slim/Extras/Middleware/FeatherBBLoader.php b/Slim/Extras/Middleware/FeatherBBLoader.php
new file mode 100644
index 00000000..16f585a3
--- /dev/null
+++ b/Slim/Extras/Middleware/FeatherBBLoader.php
@@ -0,0 +1,258 @@
+<?php
+/**
+ *
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ *
+ * $app = new \Slim\Slim();
+ * $app->add(new \Slim\Extras\Middleware\FeatherBBLoader(array $config));
+ *
+ */
+
+namespace Slim\Extras\Middleware;
+use DB;
+
+class FeatherBBLoader extends \Slim\Middleware
+{
+    protected $forum_env,
+              $forum_settings;
+    protected $headers = array(
+        'Cache-Control' => 'no-cache, no-store, must-revalidate',
+        'Pragma' => 'no-cache',
+        'Content-type' => 'text/html',
+        'X-Frame-Options' => 'deny');
+
+	public function __construct(array $data)
+	{
+        // Define some core variables
+        $this->forum_env['FEATHER_ROOT'] = realpath(dirname(__FILE__). '../../../');
+        $this->forum_env['FORUM_CACHE_DIR'] = is_writable($this->forum_env['FEATHER_ROOT'].$data['cache_dir']) ? realpath($this->forum_env['FEATHER_ROOT'].$data['cache_dir']).'/' : null;
+        $this->forum_env['FORUM_CONFIG_FILE'] = is_file($this->forum_env['FEATHER_ROOT'].$data['config_file']) ? realpath($this->forum_env['FEATHER_ROOT'].$data['config_file']) : null;
+        // Populate forum_env
+        $this->forum_env = array_merge(self::load_default_forum_env(), $this->forum_env);
+        $this->env_to_globals($this->forum_env); // Legacy
+
+        // Load files
+        require $this->forum_env['FEATHER_ROOT'].'include/utf8/utf8.php'; // ?
+        require $this->forum_env['FEATHER_ROOT'].'include/functions.php';
+        require $this->forum_env['FEATHER_ROOT'].'include/pomo/MO.php';
+        require $this->forum_env['FEATHER_ROOT'].'include/l10n.php';
+        require $this->forum_env['FEATHER_ROOT'].'include/idiorm.php';
+
+        // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
+        setlocale(LC_CTYPE, 'C');
+        // Reset opcache while debugging
+        opcache_reset();
+	}
+
+    public static function load_default_forum_env()
+    {
+        return array(
+                'FEATHER' => true, // Legacy
+                'FEATHER_ROOT' => '',
+                'FORUM_CONFIG_FILE' => 'include/config.php',
+                'FORUM_CACHE_DIR' => 'cache/',
+                'FORUM_VERSION' => '1.0.0',
+                'FORUM_NAME' => 'FeatherBB',
+                'FORUM_DB_REVISION' => 21,
+                'FORUM_SI_REVISION' => 2,
+                'FORUM_PARSER_REVISION' => 2,
+                'FEATHER_UNVERIFIED' => 0,
+                'FEATHER_ADMIN' => 1,
+                'FEATHER_MOD' => 2,
+                'FEATHER_GUEST' => 3,
+                'FEATHER_MEMBER' => 4,
+                'FEATHER_MAX_POSTSIZE' => 32768,
+                'FEATHER_SEARCH_MIN_WORD' => 3,
+                'FEATHER_SEARCH_MAX_WORD' => 20,
+                'FORUM_MAX_COOKIE_SIZE' => 4048,
+                'FEATHER_DEBUG' => 1,
+                'FEATHER_SHOW_QUERIES' => 1,
+                'FEATHER_CACHE_QUERIES' => 0,
+                );
+    }
+
+    public static function load_default_forum_settings()
+    {
+        return array(
+                // Database
+                'db_type' => 'mysqli',
+                'db_host' => '',
+                'db_name' => '',
+                'db_user' => '',
+                'db_pass' => '',
+                'db_prefix' => '',
+                // Cookies
+                'cookie_name' => 'feather_cookie',
+                'cookie_seed' => 'changeme', // MUST BE CHANGED !!!
+                // Debug
+                'debug' => false,
+                );
+    }
+
+    public function init_db()
+    {
+        switch ($this->forum_settings['db_type']) {
+            case 'mysql':
+            case 'mysqli':
+            case 'mysql_innodb':
+            case 'mysqli_innodb':
+                DB::configure('mysql:host='.$this->forum_settings['db_host'].';dbname='.$this->forum_settings['db_name']);
+                DB::configure('driver_options', array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+                break;
+            case 'sqlite';
+            case 'sqlite3';
+                DB::configure('sqlite:./'.$this->forum_settings['db_name']);
+                break;
+            case 'pgsql':
+                \DB::configure('pgsql:host='.$this->forum_settings['db_host'].'dbname='.$this->forum_settings['db_name']);
+                break;
+        }
+        DB::configure('username', $this->forum_settings['db_user']);
+        DB::configure('password', $this->forum_settings['db_pass']);
+        if ($this->forum_env['FEATHER_SHOW_QUERIES'] == 1) {
+            DB::configure('logging', true);
+        }
+        if ($this->forum_env['FEATHER_CACHE_QUERIES'] == 1) {
+            DB::configure('caching', true);
+        }
+        DB::configure('id_column_overrides', array(
+            $this->forum_settings['db_prefix'].'groups' => 'g_id',
+        ));
+    }
+
+    // Getters / setters for Slim container (avoid magic get error)
+
+    public function set_forum_env($key, $value = null)
+    {
+        $tmp = (!is_array($key) && !is_null($value)) ? array($key, $value) : $key;
+        foreach ($tmp as $key => $value) {
+            $this->app->container->get('forum_env')[$key] = $value;
+        }
+
+    }
+
+    public function set_forum_settings($key, $value = null)
+    {
+        $tmp = (!is_array($key) && !is_null($value)) ? array($key, $value) : $key;
+        foreach ($tmp as $key => $value) {
+            $this->app->container->get('forum_settings')[$key] = $value;
+        }
+    }
+
+    // Legacy function, to ensure backward compatibility with globals
+    public function env_to_globals(array $vars)
+    {
+        foreach ($vars as $key => $value) {
+            define($key, $value);
+        }
+    }
+
+    public function hydrate($name, array $data)
+    {
+        $this->app->container[$name] = $data;
+    }
+
+    // Headers
+
+    public function set_headers()
+    {
+        foreach ($this->headers as $label => $value) {
+            $this->app->response->headers->set($label, $value);
+        }
+        $this->app->response()->headers()->set('X-Powered-By', $this->forum_env['FORUM_NAME']);
+        $this->app->expires(0);
+    }
+
+    public function maintenance_message()
+    {
+        // Deal with newlines, tabs and multiple spaces
+        $pattern = array("\t", '  ', '  ');
+        $replace = array('&#160; &#160; ', '&#160; ', ' &#160;');
+        $message = str_replace($pattern, $replace, $this->forum_settings['o_maintenance_message']);
+
+        $page_title = array(feather_escape($this->forum_settings['o_board_title']), __('Maintenance'));
+
+        define('FEATHER_ACTIVE_PAGE', 'index');
+
+        $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? FEATHER_ROOT.'style/'.$this->app->user->style.'/view' : FEATHER_ROOT.'view');
+
+        $header = new \controller\header();
+
+        $header->setTitle($page_title)->display();
+
+        $this->app->render('message.php', array(
+                'message'    =>    $message,
+                'no_back_link'    =>    '',
+            )
+        );
+
+        $footer = new \controller\footer();
+
+        $footer->dontStop();
+
+        $footer->display();
+    }
+
+    public function call()
+    {
+        global $forum_time_formats, $forum_date_formats, $feather_config; // Legacy
+
+        // Set headers
+        $this->set_headers();
+
+        // Record start time
+        $this->app->start = get_microtime();
+
+        // Populate FeatherBB Slim object with forum_env vars
+        $this->hydrate('forum_env', $this->forum_env);
+
+        if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) { // Block prefetch requests
+            $this->set_headers();
+            return $this->app->response->setStatus(403); // Send forbidden header
+        }
+
+        if (is_null($this->forum_env['FORUM_CONFIG_FILE'])) {
+            echo 'install !!!!';
+            return;
+        }
+
+        $config_file = json_decode(file_get_contents($this->forum_env['FORUM_CONFIG_FILE']), true);
+        if (!is_null($config_file)) {
+            $this->forum_settings = array_merge(self::load_default_forum_settings(), $config_file);
+        } else {
+            // Erreur
+            echo 'Wrong config format';
+        }
+
+        // Init DB
+        $this->init_db();
+
+        // Get forum settings from DB/cache and load it into forum_settings array
+        if (file_exists($this->forum_env['FORUM_CACHE_DIR'].'cache_config.php')) {
+            include $this->forum_env['FORUM_CACHE_DIR'].'cache_config.php';
+        } else {
+            require $this->forum_env['FEATHER_ROOT'].'include/cache.php';
+            generate_config_cache();
+            require $this->forum_env['FORUM_CACHE_DIR'].'cache_config.php';
+        }
+
+        // Finalize forum_settings array
+        $this->forum_settings = array_merge($feather_config, $this->forum_settings);
+
+        // Populate FeatherBB Slim object with forum_settings vars
+        $this->hydrate('forum_settings', $this->forum_settings);
+        $this->app->config = $this->forum_settings; // Legacy
+        var_dump($this->app->config);
+        extract($this->forum_settings); // Legacy
+
+        // Define time formats
+        $forum_time_formats = array($this->forum_settings['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
+        $forum_date_formats = array($this->forum_settings['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
+
+        // Call FeatherBBAuth middleware
+        $this->next->call();
+    }
+}
diff --git a/index.php b/index.php
index cc432991..f5aa57f8 100644
--- a/index.php
+++ b/index.php
@@ -19,13 +19,14 @@
 
 // Instantiate Slim
 $feather = new \Slim\Slim();
-
-// Load the config
-require 'include/config.php';
+$feather_settings = array('config_file' => 'include/config.php',
+                          'cache_dir' => 'cache/');
 
 // Load middlewares
 $feather->add(new \Slim\Extras\Middleware\CsrfGuard('featherbb_csrf')); // CSRF
-$feather->add(new \Slim\Extras\Middleware\FeatherBB($feather_user_settings)); // FeatherBB
+$feather->add(new \Slim\Extras\Middleware\FeatherBBAuth());
+$feather->add(new \Slim\Extras\Middleware\FeatherBBLoader($feather_settings)); // FeatherBB
+ // FeatherBB
 
 // Load the routes
 require 'include/routes.php';

From 430af94408d043b7228530efe5aa536f455cb037 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 12:55:11 +0200
Subject: [PATCH 054/353] Start implementing installer

---
 Slim/Extras/Middleware/FeatherBBLoader.php |   4 +-
 controller/install.php                     | 272 +++++++++++++++
 model/install.php                          | 370 +++++++++++++++++++++
 style/FeatherBB/view/install.php           | 221 ++++++++++++
 4 files changed, 865 insertions(+), 2 deletions(-)
 create mode 100644 controller/install.php
 create mode 100644 model/install.php
 create mode 100644 style/FeatherBB/view/install.php

diff --git a/Slim/Extras/Middleware/FeatherBBLoader.php b/Slim/Extras/Middleware/FeatherBBLoader.php
index 16f585a3..4d2ebf59 100644
--- a/Slim/Extras/Middleware/FeatherBBLoader.php
+++ b/Slim/Extras/Middleware/FeatherBBLoader.php
@@ -215,7 +215,8 @@ public function call()
         }
 
         if (is_null($this->forum_env['FORUM_CONFIG_FILE'])) {
-            echo 'install !!!!';
+            $installer = new \controller\install;
+            $installer->run();
             return;
         }
 
@@ -245,7 +246,6 @@ public function call()
         // Populate FeatherBB Slim object with forum_settings vars
         $this->hydrate('forum_settings', $this->forum_settings);
         $this->app->config = $this->forum_settings; // Legacy
-        var_dump($this->app->config);
         extract($this->forum_settings); // Legacy
 
         // Define time formats
diff --git a/controller/install.php b/controller/install.php
new file mode 100644
index 00000000..de23eae8
--- /dev/null
+++ b/controller/install.php
@@ -0,0 +1,272 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace controller;
+
+class install
+{
+    protected $supported_dbs = array('mysql' => 'MySQL',
+                                     'pgsql' => 'PostgreSQL',
+                                     'sqlite' => 'SQLite',
+                                     'sqlite3' => 'SQLite3',
+                                    );
+    protected $optional_fields = array('db_user', 'db_pass', 'db_prefix');
+    protected $default_style = 'FeatherBB';
+    protected $config_keys = array('db_type', 'db_host', 'db_name', 'db_user', 'db_pass', 'db_prefix');
+    protected $default_config_path = 'include/config.php';
+    protected $errors = array();
+
+    public function __construct()
+    {
+        $this->feather = \Slim\Slim::getInstance();
+        $this->model = new \model\install();
+
+        // // Check to see whether FeatherBB is already installed
+        // if (!is_null($this->feather->forum_env['CONFIG_PATH'])) {
+        //     $config = @json_decode(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].$this->feather->forum_env['CONFIG_PATH']), true);
+        //     if (is_array($config)) {
+        //         redirect(get_link(''), __('Already installed'));
+        //     }
+        // }
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/English/install.mo');
+    }
+
+    public function run()
+    {
+        if ($this->feather->request->isPost()) {
+            $missing_fields = array();
+            $data = array_map(function ($item) {
+                return feather_escape(feather_trim($item));
+            }, $this->feather->request->post('install'));
+
+            foreach ($data as $field => $value) {
+                // Handle empty fields
+                if (empty($value)) {
+                    // If the field is required, or if user and pass are missing even though mysql or pgsql are selected as DB
+                    if (!in_array($field, $this->optional_fields) || (in_array($field, array('db_user', 'db_pass')) && in_array($data['db_type'], array('mysql', 'pgsql')))) {
+                        $missing_fields[] = $field;
+                    }
+                }
+            }
+
+            if (!empty($missing_fields)) {
+                $this->errors = 'The following fields are required but are missing : '.implode(', ', $missing_fields);
+            } else { // Missing fields, so we don't need to validate the others
+                // VALIDATION
+                // Make sure base_url doesn't end with a slash
+                if (substr($data['base_url'], -1) == '/') {
+                    $data['base_url'] = substr($data['base_url'], 0, -1);
+                }
+
+                // Validate username and passwords
+                if (feather_strlen($data['username']) < 2) {
+                    $this->errors[] = __('Username 1');
+                } elseif (feather_strlen($data['username']) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
+                    $this->errors[] = __('Username 2');
+                } elseif (!strcasecmp($data['username'], 'Guest')) {
+                    $this->errors[] = __('Username 3');
+                } elseif (preg_match('%[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}%', $data['username']) || preg_match('%((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))%', $data['username'])) {
+                    $this->errors[] = __('Username 4');
+                } elseif ((strpos($data['username'], '[') !== false || strpos($data['username'], ']') !== false) && strpos($data['username'], '\'') !== false && strpos($data['username'], '"') !== false) {
+                    $this->errors[] = __('Username 5');
+                } elseif (preg_match('%(?:\[/?(?:b|u|i|h|colou?r|quote|code|img|url|email|list)\]|\[(?:code|quote|list)=)%i', $data['username'])) {
+                    $this->errors[] = __('Username 6');
+                }
+
+                if (feather_strlen($data['password']) < 6) {
+                    $this->errors[] = __('Short password');
+                } elseif ($data['password'] != $data['password_conf']) {
+                    $this->errors[] = __('Passwords not match');
+                }
+
+                // Validate email
+                if (!filter_var($data['email'], FILTER_VALIDATE_EMAIL)) {
+                    $this->errors[] = __('Wrong email');
+                }
+
+                // Validate language
+                if (!in_array($data['default_lang'], forum_list_langs())) {
+                    $this->errors[] = __('Error default language');
+                }
+
+                // Check if the cache directory is writable
+                if (!is_writable($this->feather->forum_env['FORUM_CACHE_DIR'])) {
+                    $this->errors[] = sprintf(__('Alert cache'), $this->feather->forum_env['FORUM_CACHE_DIR']);
+                }
+
+                // Check if default avatar directory is writable
+                if (!is_writable($this->feather->forum_env['FEATHER_ROOT'].'img/avatars/')) {
+                    $this->errors[] = sprintf(__('Alert avatar'), $this->feather->forum_env['FEATHER_ROOT'].'img/avatars/');
+                }
+
+                // Validate db_prefix if existing
+                if (!empty($data['db_prefix']) && ((strlen($data['db_prefix']) > 0 && (!preg_match('%^[a-zA-Z_][a-zA-Z0-9_]*$%', $data['db_prefix']) || strlen($data['db_prefix']) > 40)))) {
+                    $this->errors[] = sprintf(__('Table prefix error'), $data['db_prefix']);
+                }
+            }
+
+            // End validation and check errors
+            if (!empty($this->errors)) {
+                $this->feather->flashNow('error', $this->errors);
+                $this->feather->view->setTemplatesDirectory($this->feather->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
+                $this->feather->view->setData('flash', $this->feather->environment['slim.flash']);
+                $this->feather->view->display('install.php', array(
+                                                        'feather' => $this->feather,
+                                                        'languages' => forum_list_langs(),
+                                                        'supported_dbs' => $this->supported_dbs,
+                                                        'data' => $data,
+                                                        'alerts' => array(),
+                                                    ));
+            } else {
+                $data['default_style'] = $this->default_style;
+                $data['avatars'] = in_array(strtolower(@ini_get('file_uploads')), array('on', 'true', '1')) ? 1 : 0;
+                $this->create_config($data);
+            }
+        } else {
+            $data = array('title' => __('My FeatherBB Forum'),
+                          'description' => '<p><span>'.__('Description').'</span></p>',
+                          'base_url' => $this->feather->request->getUrl().$this->feather->request->getRootUri(),
+                          'default_lang' => 'English');
+            $this->feather->view->setTemplatesDirectory($this->feather->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
+            $this->feather->view->setData('flash', $this->feather->environment['slim.flash']);
+            $this->feather->view->display('install.php', array(
+                                                'feather' => $this->feather,
+                                                'languages' => forum_list_langs(),
+                                                'supported_dbs' => $this->supported_dbs,
+                                                'data' => $data,
+                                                'alerts' => array()));
+        }
+    }
+
+    public function create_config(array $data)
+    {
+        // Generate config ...
+        $config = array();
+        foreach ($data as $key => $value) {
+            if (in_array($key, $this->config_keys)) {
+                $config[$key] = $value;
+            }
+        }
+
+        $config = array_merge($config, array('cookie_name' => mb_strtolower($this->feather->forum_env['FORUM_NAME']).'_cookie_'.random_key(7, false, true),
+                                             'cookie_seed' => random_key(16, false, true)));
+
+        // ... And write it on disk
+        if ($this->write_config(json_encode($config, JSON_PRETTY_PRINT))) {
+            //$this->create_db($data);
+            echo 'Config created';
+        }
+    }
+
+    public function create_db(array $data)
+    {
+        // Check if FeatherBB DB isn't installed already
+        if ($this->model->is_installed()) {
+            //redirect(get_link(''), 'DB already installed');
+        }
+
+        // Create tables
+        foreach ($this->model->get_database_scheme() as $table => $sql) {
+            if (!$this->model->create_table($table, $sql)) {
+                // Error handling
+                $this->errors[] = 'A problem was encountered while creating table '.$table;
+            }
+        }
+        echo 'ok';
+    }
+
+    public function write_config($json)
+    {
+        return file_put_contents($this->feather->forum_env['FEATHER_ROOT'].$this->default_config_path, $json);
+    }
+
+    public function load_default_config(array $data)
+    {
+        $config = array(
+            'o_cur_version'                => $this->feather->forum_env['FORUM_VERSION'],
+            'o_database_revision'        => $this->feather->forum_env['FORUM_DB_REVISION'],
+            'o_searchindex_revision'    => $this->feather->forum_env['FORUM_SI_REVISION'],
+            'o_parser_revision'            => $this->feather->forum_env['FORUM_PARSER_REVISION'],
+            'o_board_title'                => $data['title'],
+            'o_board_desc'                => $data['description'],
+            'o_default_timezone'        => 0,
+            'o_time_format'                => 'H:i:s',
+            'o_date_format'                => 'Y-m-d',
+            'o_timeout_visit'            => 1800,
+            'o_timeout_online'            => 300,
+            'o_redirect_delay'            => 1,
+            'o_show_version'            => 0,
+            'o_show_user_info'            => 1,
+            'o_show_post_count'            => 1,
+            'o_signatures'                => 1,
+            'o_smilies'                    => 1,
+            'o_smilies_sig'                => 1,
+            'o_make_links'                => 1,
+            'o_default_lang'            => $data['default_lang'],
+            'o_default_style'            => $data['default_style'],
+            'o_default_user_group'        => 4,
+            'o_topic_review'            => 15,
+            'o_disp_topics_default'        => 30,
+            'o_disp_posts_default'        => 25,
+            'o_indent_num_spaces'        => 4,
+            'o_quote_depth'                => 3,
+            'o_quickpost'                => 1,
+            'o_users_online'            => 1,
+            'o_censoring'                => 0,
+            'o_show_dot'                => 0,
+            'o_topic_views'                => 1,
+            'o_quickjump'                => 1,
+            'o_gzip'                    => 0,
+            'o_additional_navlinks'        => '',
+            'o_report_method'            => 0,
+            'o_regs_report'                => 0,
+            'o_default_email_setting'    => 1,
+            'o_mailing_list'            => $data['email'],
+            'o_avatars'                    => $data['avatars'],
+            'o_avatars_dir'                => 'img/avatars',
+            'o_avatars_width'            => 60,
+            'o_avatars_height'            => 60,
+            'o_avatars_size'            => 10240,
+            'o_search_all_forums'        => 1,
+            'o_base_url'                => $data['base_url'],
+            'o_admin_email'                => $data['email'],
+            'o_webmaster_email'            => $data['email'],
+            'o_forum_subscriptions'        => 1,
+            'o_topic_subscriptions'        => 1,
+            'o_smtp_host'                => null,
+            'o_smtp_user'                => null,
+            'o_smtp_pass'                => null,
+            'o_smtp_ssl'                => 0,
+            'o_regs_allow'                => 1,
+            'o_regs_verify'                => 0,
+            'o_announcement'            => 0,
+            'o_announcement_message'    => __('Announcement'),
+            'o_rules'                    => 0,
+            'o_rules_message'            => __('Rules'),
+            'o_maintenance'                => 0,
+            'o_maintenance_message'        => __('Maintenance message'),
+            'o_default_dst'                => 0,
+            'o_feed_type'                => 2,
+            'o_feed_ttl'                => 0,
+            'p_message_bbcode'            => 1,
+            'p_message_img_tag'            => 1,
+            'p_message_all_caps'        => 1,
+            'p_subject_all_caps'        => 1,
+            'p_sig_all_caps'            => 1,
+            'p_sig_bbcode'                => 1,
+            'p_sig_img_tag'                => 0,
+            'p_sig_length'                => 400,
+            'p_sig_lines'                => 4,
+            'p_allow_banned_email'        => 1,
+            'p_allow_dupe_email'        => 0,
+            'p_force_guest_email'        => 1
+        );
+        return $config;
+    }
+}
diff --git a/model/install.php b/model/install.php
new file mode 100644
index 00000000..d7e6d05f
--- /dev/null
+++ b/model/install.php
@@ -0,0 +1,370 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace model;
+
+use DB;
+
+class install
+{
+    protected $database_scheme = array(
+        'bans' => "CREATE TABLE `bans` (
+            `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+            `username` varchar(200) DEFAULT NULL,
+            `ip` varchar(255) DEFAULT NULL,
+            `email` varchar(80) DEFAULT NULL,
+            `message` varchar(255) DEFAULT NULL,
+            `expire` int(10) unsigned DEFAULT NULL,
+            `ban_creator` int(10) unsigned NOT NULL DEFAULT '0',
+            PRIMARY KEY (`id`),
+            KEY `bans_username_idx` (`username`(25))
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+        'categories' => "CREATE TABLE `categories` (
+            `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+            `cat_name` varchar(80) NOT NULL DEFAULT 'New Category',
+            `disp_position` int(10) NOT NULL DEFAULT '0',
+            PRIMARY KEY (`id`)
+        ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;",
+        'censoring' => "CREATE TABLE `censoring` (
+            `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+            `search_for` varchar(60) NOT NULL DEFAULT '',
+            `replace_with` varchar(60) NOT NULL DEFAULT '',
+            PRIMARY KEY (`id`)
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+        'config' => "CREATE TABLE `config` (
+            `conf_name` varchar(255) NOT NULL DEFAULT '',
+            `conf_value` text,
+            PRIMARY KEY (`conf_name`)
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+        'forum_perms' => "CREATE TABLE `forum_perms` (
+            `group_id` int(10) NOT NULL DEFAULT '0',
+            `forum_id` int(10) NOT NULL DEFAULT '0',
+            `read_forum` tinyint(1) NOT NULL DEFAULT '1',
+            `post_replies` tinyint(1) NOT NULL DEFAULT '1',
+            `post_topics` tinyint(1) NOT NULL DEFAULT '1',
+            PRIMARY KEY (`group_id`,`forum_id`)
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+        'forum_subscriptions' => "CREATE TABLE `forum_subscriptions` (
+            `user_id` int(10) unsigned NOT NULL DEFAULT '0',
+            `forum_id` int(10) unsigned NOT NULL DEFAULT '0',
+            PRIMARY KEY (`user_id`,`forum_id`)
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+        'forums' => "CREATE TABLE `forums` (
+            `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+            `forum_name` varchar(80) NOT NULL DEFAULT 'New forum',
+            `forum_desc` text,
+            `redirect_url` varchar(100) DEFAULT NULL,
+            `moderators` text,
+            `num_topics` mediumint(8) unsigned NOT NULL DEFAULT '0',
+            `num_posts` mediumint(8) unsigned NOT NULL DEFAULT '0',
+            `last_post` int(10) unsigned DEFAULT NULL,
+            `last_post_id` int(10) unsigned DEFAULT NULL,
+            `last_poster` varchar(200) DEFAULT NULL,
+            `sort_by` tinyint(1) NOT NULL DEFAULT '0',
+            `disp_position` int(10) NOT NULL DEFAULT '0',
+            `cat_id` int(10) unsigned NOT NULL DEFAULT '0',
+            PRIMARY KEY (`id`)
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+        'groups' => "CREATE TABLE `groups` (
+            `g_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+            `g_title` varchar(50) NOT NULL DEFAULT '',
+            `g_user_title` varchar(50) DEFAULT NULL,
+            `g_promote_min_posts` int(10) unsigned NOT NULL DEFAULT '0',
+            `g_promote_next_group` int(10) unsigned NOT NULL DEFAULT '0',
+            `g_moderator` tinyint(1) NOT NULL DEFAULT '0',
+            `g_mod_edit_users` tinyint(1) NOT NULL DEFAULT '0',
+            `g_mod_rename_users` tinyint(1) NOT NULL DEFAULT '0',
+            `g_mod_change_passwords` tinyint(1) NOT NULL DEFAULT '0',
+            `g_mod_ban_users` tinyint(1) NOT NULL DEFAULT '0',
+            `g_mod_promote_users` tinyint(1) NOT NULL DEFAULT '0',
+            `g_read_board` tinyint(1) NOT NULL DEFAULT '1',
+            `g_view_users` tinyint(1) NOT NULL DEFAULT '1',
+            `g_post_replies` tinyint(1) NOT NULL DEFAULT '1',
+            `g_post_topics` tinyint(1) NOT NULL DEFAULT '1',
+            `g_edit_posts` tinyint(1) NOT NULL DEFAULT '1',
+            `g_delete_posts` tinyint(1) NOT NULL DEFAULT '1',
+            `g_delete_topics` tinyint(1) NOT NULL DEFAULT '1',
+            `g_post_links` tinyint(1) NOT NULL DEFAULT '1',
+            `g_set_title` tinyint(1) NOT NULL DEFAULT '1',
+            `g_search` tinyint(1) NOT NULL DEFAULT '1',
+            `g_search_users` tinyint(1) NOT NULL DEFAULT '1',
+            `g_send_email` tinyint(1) NOT NULL DEFAULT '1',
+            `g_post_flood` smallint(6) NOT NULL DEFAULT '30',
+            `g_search_flood` smallint(6) NOT NULL DEFAULT '30',
+            `g_email_flood` smallint(6) NOT NULL DEFAULT '60',
+            `g_report_flood` smallint(6) NOT NULL DEFAULT '60',
+            PRIMARY KEY (`g_id`)
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+        'online' => "CREATE TABLE `online` (
+            `user_id` int(10) unsigned NOT NULL DEFAULT '1',
+            `ident` varchar(200) NOT NULL DEFAULT '',
+            `logged` int(10) unsigned NOT NULL DEFAULT '0',
+            `idle` tinyint(1) NOT NULL DEFAULT '0',
+            `last_post` int(10) unsigned DEFAULT NULL,
+            `last_search` int(10) unsigned DEFAULT NULL,
+            UNIQUE KEY `online_user_id_ident_idx` (`user_id`,`ident`(25)),
+            KEY `online_ident_idx` (`ident`(25)),
+            KEY `online_logged_idx` (`logged`)
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+        'posts' => "CREATE TABLE `posts` (
+            `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+            `poster` varchar(200) NOT NULL DEFAULT '',
+            `poster_id` int(10) unsigned NOT NULL DEFAULT '1',
+            `poster_ip` varchar(39) DEFAULT NULL,
+            `poster_email` varchar(80) DEFAULT NULL,
+            `message` mediumtext,
+            `hide_smilies` tinyint(1) NOT NULL DEFAULT '0',
+            `posted` int(10) unsigned NOT NULL DEFAULT '0',
+            `edited` int(10) unsigned DEFAULT NULL,
+            `edited_by` varchar(200) DEFAULT NULL,
+            `topic_id` int(10) unsigned NOT NULL DEFAULT '0',
+            PRIMARY KEY (`id`),
+            KEY `posts_topic_id_idx` (`topic_id`),
+            KEY `posts_multi_idx` (`poster_id`,`topic_id`)
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+        'reports' => "CREATE TABLE `reports` (
+            `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+            `post_id` int(10) unsigned NOT NULL DEFAULT '0',
+            `topic_id` int(10) unsigned NOT NULL DEFAULT '0',
+            `forum_id` int(10) unsigned NOT NULL DEFAULT '0',
+            `reported_by` int(10) unsigned NOT NULL DEFAULT '0',
+            `created` int(10) unsigned NOT NULL DEFAULT '0',
+            `message` text,
+            `zapped` int(10) unsigned DEFAULT NULL,
+            `zapped_by` int(10) unsigned DEFAULT NULL,
+            PRIMARY KEY (`id`),
+            KEY `reports_zapped_idx` (`zapped`)
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+        'search_cache' => "CREATE TABLE `search_cache` (
+            `id` int(10) unsigned NOT NULL DEFAULT '0',
+            `ident` varchar(200) NOT NULL DEFAULT '',
+            `search_data` mediumtext,
+            PRIMARY KEY (`id`),
+            KEY `search_cache_ident_idx` (`ident`(8))
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+        'search_matches' => "CREATE TABLE `search_matches` (
+            `post_id` int(10) unsigned NOT NULL DEFAULT '0',
+            `word_id` int(10) unsigned NOT NULL DEFAULT '0',
+            `subject_match` tinyint(1) NOT NULL DEFAULT '0',
+            KEY `search_matches_word_id_idx` (`word_id`),
+            KEY `search_matches_post_id_idx` (`post_id`)
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+        'search_words' => "CREATE TABLE `search_words` (
+            `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+            `word` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+            PRIMARY KEY (`word`),
+            KEY `search_words_id_idx` (`id`)
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+        'topic_subscriptions' => "CREATE TABLE `topic_subscriptions` (
+            `user_id` int(10) unsigned NOT NULL DEFAULT '0',
+            `topic_id` int(10) unsigned NOT NULL DEFAULT '0',
+            PRIMARY KEY (`user_id`,`topic_id`)
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+        'topics' => "CREATE TABLE `topics` (
+            `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+            `poster` varchar(200) NOT NULL DEFAULT '',
+            `subject` varchar(255) NOT NULL DEFAULT '',
+            `posted` int(10) unsigned NOT NULL DEFAULT '0',
+            `first_post_id` int(10) unsigned NOT NULL DEFAULT '0',
+            `last_post` int(10) unsigned NOT NULL DEFAULT '0',
+            `last_post_id` int(10) unsigned NOT NULL DEFAULT '0',
+            `last_poster` varchar(200) DEFAULT NULL,
+            `num_views` mediumint(8) unsigned NOT NULL DEFAULT '0',
+            `num_replies` mediumint(8) unsigned NOT NULL DEFAULT '0',
+            `closed` tinyint(1) NOT NULL DEFAULT '0',
+            `sticky` tinyint(1) NOT NULL DEFAULT '0',
+            `moved_to` int(10) unsigned DEFAULT NULL,
+            `forum_id` int(10) unsigned NOT NULL DEFAULT '0',
+            PRIMARY KEY (`id`),
+            KEY `topics_forum_id_idx` (`forum_id`),
+            KEY `topics_moved_to_idx` (`moved_to`),
+            KEY `topics_last_post_idx` (`last_post`),
+            KEY `topics_first_post_id_idx` (`first_post_id`)
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+        'users' => "CREATE TABLE `users` (
+            `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+            `group_id` int(10) unsigned NOT NULL DEFAULT '3',
+            `username` varchar(200) NOT NULL DEFAULT '',
+            `password` varchar(40) NOT NULL DEFAULT '',
+            `email` varchar(80) NOT NULL DEFAULT '',
+            `title` varchar(50) DEFAULT NULL,
+            `realname` varchar(40) DEFAULT NULL,
+            `url` varchar(100) DEFAULT NULL,
+            `jabber` varchar(80) DEFAULT NULL,
+            `icq` varchar(12) DEFAULT NULL,
+            `msn` varchar(80) DEFAULT NULL,
+            `aim` varchar(30) DEFAULT NULL,
+            `yahoo` varchar(30) DEFAULT NULL,
+            `location` varchar(30) DEFAULT NULL,
+            `signature` text,
+            `disp_topics` tinyint(3) unsigned DEFAULT NULL,
+            `disp_posts` tinyint(3) unsigned DEFAULT NULL,
+            `email_setting` tinyint(1) NOT NULL DEFAULT '1',
+            `notify_with_post` tinyint(1) NOT NULL DEFAULT '0',
+            `auto_notify` tinyint(1) NOT NULL DEFAULT '0',
+            `show_smilies` tinyint(1) NOT NULL DEFAULT '1',
+            `show_img` tinyint(1) NOT NULL DEFAULT '1',
+            `show_img_sig` tinyint(1) NOT NULL DEFAULT '1',
+            `show_avatars` tinyint(1) NOT NULL DEFAULT '1',
+            `show_sig` tinyint(1) NOT NULL DEFAULT '1',
+            `timezone` float NOT NULL DEFAULT '0',
+            `dst` tinyint(1) NOT NULL DEFAULT '0',
+            `time_format` tinyint(1) NOT NULL DEFAULT '0',
+            `date_format` tinyint(1) NOT NULL DEFAULT '0',
+            `language` varchar(25) NOT NULL DEFAULT 'English',
+            `style` varchar(25) NOT NULL DEFAULT 'FeatherBB',
+            `num_posts` int(10) unsigned NOT NULL DEFAULT '0',
+            `last_post` int(10) unsigned DEFAULT NULL,
+            `last_search` int(10) unsigned DEFAULT NULL,
+            `last_email_sent` int(10) unsigned DEFAULT NULL,
+            `last_report_sent` int(10) unsigned DEFAULT NULL,
+            `registered` int(10) unsigned NOT NULL DEFAULT '0',
+            `registration_ip` varchar(39) NOT NULL DEFAULT '0.0.0.0',
+            `last_visit` int(10) unsigned NOT NULL DEFAULT '0',
+            `admin_note` varchar(30) DEFAULT NULL,
+            `activate_string` varchar(80) DEFAULT NULL,
+            `activate_key` varchar(8) DEFAULT NULL,
+            PRIMARY KEY (`id`),
+            UNIQUE KEY `users_username_idx` (`username`(25)),
+            KEY `users_registered_idx` (`registered`)
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",);
+
+    public function __construct()
+    {
+        $this->feather = \Slim\Slim::getInstance();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/English/install.mo');
+    }
+
+    public function is_installed()
+    {
+        return false;
+    }
+
+    public function create_table($table_name, $sql)
+    {
+        $db = DB::get_db();
+        return $db->exec($sql);
+    }
+
+    public function get_database_scheme()
+    {
+        return $this->database_scheme;
+    }
+
+    public static function load_default_groups()
+    {
+        $data['Administrators'] = array(
+            'g_id' => 1,
+            'g_title' => __('Administrators'),
+            'g_user_title' => __('Administrator'),
+            'g_moderator' => 0,
+            'g_mod_edit_users' => 0,
+            'g_mod_rename_users' => 0,
+            'g_mod_change_passwords' => 0,
+            'g_mod_ban_users' => 0,
+            'g_read_board' => 1,
+            'g_view_users' => 1,
+            'g_post_replies' => 1,
+            'g_post_topics' => 1,
+            'g_edit_posts' => 1,
+            'g_delete_posts' => 1,
+            'g_delete_topics' => 1,
+            'g_set_title' => 1,
+            'g_search' => 1,
+            'g_search_users' => 1,
+            'g_send_email' => 1,
+            'g_post_flood' => 0,
+            'g_search_flood' => 0,
+            'g_email_flood' => 0,
+            'g_report_flood' => 0);
+        $data['Moderators'] = array(
+            'g_id' => 2,
+            'g_title' => __('Moderators'),
+            'g_user_title' => __('Moderator'),
+            'g_moderator' => 1,
+            'g_mod_edit_users' => 1,
+            'g_mod_rename_users' => 1,
+            'g_mod_change_passwords' => 1,
+            'g_mod_ban_users' => 1,
+            'g_read_board' => 1,
+            'g_view_users' => 1,
+            'g_post_replies' => 1,
+            'g_post_topics' => 1,
+            'g_edit_posts' => 1,
+            'g_delete_posts' => 1,
+            'g_delete_topics' => 1,
+            'g_set_title' => 1,
+            'g_search' => 1,
+            'g_search_users' => 1,
+            'g_send_email' => 1,
+            'g_post_flood' => 0,
+            'g_search_flood' => 0,
+            'g_email_flood' => 0,
+            'g_report_flood' => 0);
+        $data['Guests'] = array(
+            'g_id' => 3,
+            'g_title' => __('Guests'),
+            'g_user_title' => __('Guest'),
+            'g_moderator' => 0,
+            'g_mod_edit_users' => 0,
+            'g_mod_rename_users' => 0,
+            'g_mod_change_passwords' => 0,
+            'g_mod_ban_users' => 0,
+            'g_read_board' => 1,
+            'g_view_users' => 1,
+            'g_post_replies' => 0,
+            'g_post_topics' => 0,
+            'g_edit_posts' => 0,
+            'g_delete_posts' => 0,
+            'g_delete_topics' => 0,
+            'g_set_title' => 0,
+            'g_search' => 1,
+            'g_search_users' => 1,
+            'g_send_email' => 0,
+            'g_post_flood' => 60,
+            'g_search_flood' => 30,
+            'g_email_flood' => 0,
+            'g_report_flood' => 0);
+        $data['Members'] = array(
+            'g_id' => 4,
+            'g_title' => __('Members'),
+            'g_user_title' => __('Member'),
+            'g_moderator' => 0,
+            'g_mod_edit_users' => 0,
+            'g_mod_rename_users' => 0,
+            'g_mod_change_passwords' => 0,
+            'g_mod_ban_users' => 0,
+            'g_read_board' => 1,
+            'g_view_users' => 1,
+            'g_post_replies' => 1,
+            'g_post_topics' => 1,
+            'g_edit_posts' => 1,
+            'g_delete_posts' => 1,
+            'g_delete_topics' => 1,
+            'g_set_title' => 0,
+            'g_search' => 1,
+            'g_search_users' => 1,
+            'g_send_email' => 1,
+            'g_post_flood' => 60,
+            'g_search_flood' => 30,
+            'g_email_flood' => 60,
+            'g_report_flood' => 60);
+
+        return $data;
+    }
+
+    public static function load_default_user()
+    {
+        return $data['Guest'] = array(
+                'group_id' => 3,
+                'username' => __('Guest'),
+                'password' => __('Guest'),
+                'email' => __('Guest'));
+    }
+}
diff --git a/style/FeatherBB/view/install.php b/style/FeatherBB/view/install.php
new file mode 100644
index 00000000..d39b6247
--- /dev/null
+++ b/style/FeatherBB/view/install.php
@@ -0,0 +1,221 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title><?php _e('FeatherBB Installation') ?></title>
+    <link rel="stylesheet" type="text/css" href="style/<?php echo $feather->forum_env['FORUM_NAME'] ?>.css" />
+</head>
+
+<body>
+    <div id="puninstall" class="pun">
+    <div class="top-box"><div><!-- Top Corners --></div></div>
+        <div class="punwrap">
+
+            <section class="container">
+            	<div id="brdheader" class="block">
+            		<div class="box">
+            			<div id="brdtitle" class="inbox">
+            				<h1><span><?php _e('FeatherBB Installation') ?></span></h1>
+            				<div id="brddesc"><p><?php _e('Welcome') ?></p></div>
+            			</div>
+            		</div>
+            	</div>
+            </section>
+
+            <section class="container">
+            	<div id="brdmain">
+            	<?php if (count($languages) > 1): ?>
+                    <div class="blockform">
+            		<h2><span><?php _e('Choose install language') ?></span></h2>
+            		<div class="box">
+            			<form id="install" method="post" action="">
+            				<div class="inform">
+            					<fieldset>
+            						<legend><?php _e('Install language') ?></legend>
+            						<div class="infldset">
+            							<p><?php _e('Choose install language info') ?></p>
+            							<label><strong><?php _e('Install language') ?></strong>
+            							<br /><select name="install_lang">
+            <?php
+
+                        foreach ($languages as $lang) {
+                                echo "\t\t\t\t\t".'<option value="'.$lang.'">'.$lang.'</option>'."\n";
+                            }
+
+                ?>
+            							</select>
+            							<br /></label>
+            						</div>
+            					</fieldset>
+            				</div>
+            				<p class="buttons"><input type="submit" value="<?php _e('Change language') ?>" /></p>
+            			</form>
+            		</div>
+            	   </div>
+            	<?php endif;
+                ?>
+
+            	<div class="blockform">
+            		<h2><span><?php echo sprintf(__('Install'), FORUM_VERSION) ?></span></h2>
+            		<div class="box">
+            			<form id="install" method="post" action="">
+            				<div class="inform">
+            	<?php if (isset($flash['error'])): ?>
+                                <div class="forminfo error-info">
+            						<h3><?php _e('Errors') ?></h3>
+            						    <ul class="error-list">
+            <?php
+                $errors = (!is_array($flash['error'])) ? array($flash['error']) : $flash['error'];
+                foreach ($errors as $error) {
+                    echo "\t\t\t\t\t\t".'<li><strong>'.$error.'</strong></li>'."\n";
+                }
+                ?>
+            						    </ul>
+            					</div>
+            	<?php endif;
+                ?>			</div>
+
+            				<div class="inform">
+            					<div class="forminfo">
+            						<h3><?php _e('Database setup') ?></h3>
+            						<p><?php _e('Info 1') ?></p>
+            					</div>
+            					<fieldset>
+            					<legend><?php _e('Select database') ?></legend>
+            						<div class="infldset">
+            							<p><?php _e('Info 2') ?></p>
+            							<label class="required"><strong><?php _e('Database type') ?> <span><?php _e('Required') ?></span></strong></label>
+                							<select name="install[db_type]" required>
+                <?php
+
+                        foreach ($supported_dbs as $id => $db_type) {
+                                echo "\t\t\t\t\t\t\t".'<option value="'.$id.'">'.$db_type.'</option>'."\n";
+                            }
+
+                    ?>
+                							</select>
+            						</div>
+            					</fieldset>
+            				</div>
+
+            				<div class="inform">
+            					<fieldset>
+            						<legend><?php _e('Database hostname') ?></legend>
+            						<div class="infldset">
+            							<p><?php _e('Info 3') ?></p>
+            							<label class="required"><strong><?php _e('Database server hostname') ?> <span><?php _e('Required') ?></span></strong></label>
+                                        <input type="text" name="install[db_host]" size="50" required />
+            						</div>
+            					</fieldset>
+            				</div>
+
+            				<div class="inform">
+            					<fieldset>
+            						<legend><?php _e('Database enter name') ?></legend>
+            						<div class="infldset">
+            							<p><?php _e('Info 4') ?></p>
+            							<label class="required"><strong><?php _e('Database name') ?> <span><?php _e('Required') ?></span></strong></label>
+                                        <input type="text" name="install[db_name]" size="30" required />
+            						</div>
+            					</fieldset>
+            				</div>
+
+            				<div class="inform">
+            					<fieldset>
+            						<legend><?php _e('Database enter informations') ?></legend>
+            						<div class="infldset">
+            							<p><?php _e('Info 5') ?></p>
+            							<label class="conl"><?php _e('Database username') ?></label>
+                                        <input type="text" name="install[db_user]" size="30" />
+            							<label class="conl"><?php _e('Database password') ?></label>
+                                        <input type="password" name="install[db_pass]" size="30" />
+            							<div class="clearer"></div>
+            						</div>
+            					</fieldset>
+            				</div>
+
+            				<div class="inform">
+            					<fieldset>
+            						<legend><?php _e('Database enter prefix') ?></legend>
+            						<div class="infldset">
+            							<p><?php _e('Info 6') ?></p>
+            							<label><?php _e('Table prefix') ?></label>
+                                        <input id="install[db_prefix]" type="text" name="db_prefix" size="20" maxlength="30" />
+            						</div>
+            					</fieldset>
+            				</div>
+
+            				<div class="inform">
+            					<div class="forminfo">
+            						<h3><?php _e('Administration setup') ?></h3>
+            						<p><?php _e('Info 7') ?></p>
+            					</div>
+            					<fieldset>
+            						<legend><?php _e('Administration setup') ?></legend>
+            						<div class="infldset">
+            							<p><?php _e('Info 8') ?></p>
+            							<label class="required"><strong><?php _e('Administrator username') ?> <span><?php _e('Required') ?></span></strong></label>
+                                            <input type="text" name="install[username]" size="25" maxlength="25" required />
+            							<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong></label>
+                                            <input type="password" name="install[password]" size="16" required />
+            							<label class="conl required"><strong><?php _e('Confirm password') ?> <span><?php _e('Required') ?></span></strong></label>
+                                            <input type="password" name="install[password_conf]" size="16" required />
+            							<!-- <div class="clearer"></div> -->
+            							<label class="required"><strong><?php _e('Administrator email') ?> <span><?php _e('Required') ?></span></strong></label>
+                                            <input type="text" name="install[email]" size="50" maxlength="80" required />
+            						</div>
+            					</fieldset>
+            				</div>
+
+            				<div class="inform">
+            					<div class="forminfo">
+            						<h3><?php _e('Board setup') ?></h3>
+            						<p><?php _e('Info 11') ?></p>
+            					</div>
+            					<fieldset>
+            						<legend><?php _e('General information') ?></legend>
+            						<div class="infldset">
+            							<label class="required"><strong><?php _e('Board title') ?> <span><?php _e('Required') ?></span></strong></label>
+                                            <input type="text" name="install[title]" value="<? echo $data['title'] ?>" size="60" maxlength="255" required />
+            							<label><?php _e('Board description') ?></label>
+                                            <input type="text" name="install[description]" value="<? echo $data['description'] ?>" size="60" maxlength="255" required />
+            							<label class="required"><strong><?php _e('Base URL') ?> <span><?php _e('Required') ?></span></strong></label>
+                                            <input type="text" name="install[base_url]" value="<? echo $data['base_url'] ?>" size="60" maxlength="100" required />
+            							<label class="required"><strong><?php _e('Default language') ?> <span><?php _e('Required') ?></span></strong></label>
+                                            <select name="install[default_lang]" required />
+<?php
+foreach ($languages as $lang) {
+    echo "\t\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').' >'.$lang.'</option>'."\n";
+}
+?>
+            							    </select>
+            						</div>
+            					</fieldset>
+            				</div>
+
+            				<p class="buttons"><input type="submit" value="<?php _e('Start install') ?>" /></p>
+            			</form>
+            		</div>
+            	</div>
+            	</div>
+            </section>
+        </div>
+        <div class="end-box"><div><!-- Bottom Corners --></div></div>
+    </div>
+</body>
+</html>

From 1174239490c743a5bce5c3432b49b6580f50709d Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 12:56:19 +0200
Subject: [PATCH 055/353] Fix CSS input property only working when nested in
 label

---
 style/FeatherBB.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/style/FeatherBB.css b/style/FeatherBB.css
index f8fae2a9..b2646697 100644
--- a/style/FeatherBB.css
+++ b/style/FeatherBB.css
@@ -1152,7 +1152,7 @@ footer .footer-link a {
 	display: inline-block;
 	padding-right: 12px;
 }
-.blockform .box .inform fieldset label input {
+.blockform .box .inform fieldset input {
     box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075);
     border: 1px solid #ccc;
     border-radius: 3px;
@@ -1160,7 +1160,7 @@ footer .footer-link a {
     padding: 7px 8px;
     margin: 7px 0
 }
-.blockform .box .inform fieldset label input:focus {
+.blockform .box .inform fieldset input:focus {
     border: 1px solid #51a7e8;
     background-color: #fff;
     box-shadow: 0 0 5px rgba(81, 167, 232, .5);

From c4beef8a955933f06f122eaea8cb1ab61a86bacb Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 13:14:00 +0200
Subject: [PATCH 056/353] Patch errors display

---
 controller/install.php           | 16 ++++++++--------
 style/FeatherBB/view/install.php |  5 ++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/controller/install.php b/controller/install.php
index de23eae8..f58aada0 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -113,15 +113,13 @@ public function run()
 
             // End validation and check errors
             if (!empty($this->errors)) {
-                $this->feather->flashNow('error', $this->errors);
-                $this->feather->view->setTemplatesDirectory($this->feather->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
-                $this->feather->view->setData('flash', $this->feather->environment['slim.flash']);
-                $this->feather->view->display('install.php', array(
+                $this->feather->view()->setTemplatesDirectory($this->feather->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
+                $this->feather->view()->display('install.php', array(
                                                         'feather' => $this->feather,
                                                         'languages' => forum_list_langs(),
                                                         'supported_dbs' => $this->supported_dbs,
                                                         'data' => $data,
-                                                        'alerts' => array(),
+                                                        'errors' => $this->errors,
                                                     ));
             } else {
                 $data['default_style'] = $this->default_style;
@@ -133,9 +131,11 @@ public function run()
                           'description' => '<p><span>'.__('Description').'</span></p>',
                           'base_url' => $this->feather->request->getUrl().$this->feather->request->getRootUri(),
                           'default_lang' => 'English');
-            $this->feather->view->setTemplatesDirectory($this->feather->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
-            $this->feather->view->setData('flash', $this->feather->environment['slim.flash']);
-            $this->feather->view->display('install.php', array(
+            if (isset($this->environment['slim.flash'])) {
+                $this->feather->view()->set('flash', $this->environment['slim.flash']);
+            }
+            $this->feather->view()->setTemplatesDirectory($this->feather->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
+            $this->feather->view()->display('install.php', array(
                                                 'feather' => $this->feather,
                                                 'languages' => forum_list_langs(),
                                                 'supported_dbs' => $this->supported_dbs,
diff --git a/style/FeatherBB/view/install.php b/style/FeatherBB/view/install.php
index d39b6247..993cf291 100644
--- a/style/FeatherBB/view/install.php
+++ b/style/FeatherBB/view/install.php
@@ -73,14 +73,13 @@
             	<div class="blockform">
             		<h2><span><?php echo sprintf(__('Install'), FORUM_VERSION) ?></span></h2>
             		<div class="box">
-            			<form id="install" method="post" action="">
             				<div class="inform">
-            	<?php if (isset($flash['error'])): ?>
+            	<?php if (!empty($errors)): ?>
                                 <div class="forminfo error-info">
             						<h3><?php _e('Errors') ?></h3>
             						    <ul class="error-list">
             <?php
-                $errors = (!is_array($flash['error'])) ? array($flash['error']) : $flash['error'];
+                $errors = (!is_array($errors)) ? array($errors) : $errors;
                 foreach ($errors as $error) {
                     echo "\t\t\t\t\t\t".'<li><strong>'.$error.'</strong></li>'."\n";
                 }

From cc26b88db6e48460360f1aa0518b5dfd142aa12e Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 13:25:26 +0200
Subject: [PATCH 057/353] Fix design issues in views

---
 style/FeatherBB/view/install.php | 367 ++++++++++++++++---------------
 1 file changed, 184 insertions(+), 183 deletions(-)

diff --git a/style/FeatherBB/view/install.php b/style/FeatherBB/view/install.php
index 993cf291..223e42b6 100644
--- a/style/FeatherBB/view/install.php
+++ b/style/FeatherBB/view/install.php
@@ -23,195 +23,196 @@
 
 <body>
     <div id="puninstall" class="pun">
-    <div class="top-box"><div><!-- Top Corners --></div></div>
+        <div class="top-box"><div><!-- Top Corners --></div></div>
         <div class="punwrap">
 
             <section class="container">
-            	<div id="brdheader" class="block">
-            		<div class="box">
-            			<div id="brdtitle" class="inbox">
-            				<h1><span><?php _e('FeatherBB Installation') ?></span></h1>
-            				<div id="brddesc"><p><?php _e('Welcome') ?></p></div>
-            			</div>
-            		</div>
-            	</div>
+                <div id="brdheader" class="block">
+                    <div class="box">
+                        <div id="brdtitle" class="inbox">
+                            <h1><span><?php _e('FeatherBB Installation') ?></span></h1>
+                            <div id="brddesc"><p><?php _e('Welcome') ?></p></div>
+                        </div>
+                    </div>
+                </div>
             </section>
 
             <section class="container">
-            	<div id="brdmain">
-            	<?php if (count($languages) > 1): ?>
-                    <div class="blockform">
-            		<h2><span><?php _e('Choose install language') ?></span></h2>
-            		<div class="box">
-            			<form id="install" method="post" action="">
-            				<div class="inform">
-            					<fieldset>
-            						<legend><?php _e('Install language') ?></legend>
-            						<div class="infldset">
-            							<p><?php _e('Choose install language info') ?></p>
-            							<label><strong><?php _e('Install language') ?></strong>
-            							<br /><select name="install_lang">
-            <?php
-
-                        foreach ($languages as $lang) {
-                                echo "\t\t\t\t\t".'<option value="'.$lang.'">'.$lang.'</option>'."\n";
-                            }
-
-                ?>
-            							</select>
-            							<br /></label>
-            						</div>
-            					</fieldset>
-            				</div>
-            				<p class="buttons"><input type="submit" value="<?php _e('Change language') ?>" /></p>
-            			</form>
-            		</div>
-            	   </div>
-            	<?php endif;
-                ?>
-
-            	<div class="blockform">
-            		<h2><span><?php echo sprintf(__('Install'), FORUM_VERSION) ?></span></h2>
-            		<div class="box">
-            				<div class="inform">
-            	<?php if (!empty($errors)): ?>
-                                <div class="forminfo error-info">
-            						<h3><?php _e('Errors') ?></h3>
-            						    <ul class="error-list">
-            <?php
-                $errors = (!is_array($errors)) ? array($errors) : $errors;
-                foreach ($errors as $error) {
-                    echo "\t\t\t\t\t\t".'<li><strong>'.$error.'</strong></li>'."\n";
-                }
-                ?>
-            						    </ul>
-            					</div>
-            	<?php endif;
-                ?>			</div>
-
-            				<div class="inform">
-            					<div class="forminfo">
-            						<h3><?php _e('Database setup') ?></h3>
-            						<p><?php _e('Info 1') ?></p>
-            					</div>
-            					<fieldset>
-            					<legend><?php _e('Select database') ?></legend>
-            						<div class="infldset">
-            							<p><?php _e('Info 2') ?></p>
-            							<label class="required"><strong><?php _e('Database type') ?> <span><?php _e('Required') ?></span></strong></label>
-                							<select name="install[db_type]" required>
-                <?php
-
-                        foreach ($supported_dbs as $id => $db_type) {
-                                echo "\t\t\t\t\t\t\t".'<option value="'.$id.'">'.$db_type.'</option>'."\n";
-                            }
-
-                    ?>
-                							</select>
-            						</div>
-            					</fieldset>
-            				</div>
-
-            				<div class="inform">
-            					<fieldset>
-            						<legend><?php _e('Database hostname') ?></legend>
-            						<div class="infldset">
-            							<p><?php _e('Info 3') ?></p>
-            							<label class="required"><strong><?php _e('Database server hostname') ?> <span><?php _e('Required') ?></span></strong></label>
-                                        <input type="text" name="install[db_host]" size="50" required />
-            						</div>
-            					</fieldset>
-            				</div>
-
-            				<div class="inform">
-            					<fieldset>
-            						<legend><?php _e('Database enter name') ?></legend>
-            						<div class="infldset">
-            							<p><?php _e('Info 4') ?></p>
-            							<label class="required"><strong><?php _e('Database name') ?> <span><?php _e('Required') ?></span></strong></label>
-                                        <input type="text" name="install[db_name]" size="30" required />
-            						</div>
-            					</fieldset>
-            				</div>
-
-            				<div class="inform">
-            					<fieldset>
-            						<legend><?php _e('Database enter informations') ?></legend>
-            						<div class="infldset">
-            							<p><?php _e('Info 5') ?></p>
-            							<label class="conl"><?php _e('Database username') ?></label>
-                                        <input type="text" name="install[db_user]" size="30" />
-            							<label class="conl"><?php _e('Database password') ?></label>
-                                        <input type="password" name="install[db_pass]" size="30" />
-            							<div class="clearer"></div>
-            						</div>
-            					</fieldset>
-            				</div>
-
-            				<div class="inform">
-            					<fieldset>
-            						<legend><?php _e('Database enter prefix') ?></legend>
-            						<div class="infldset">
-            							<p><?php _e('Info 6') ?></p>
-            							<label><?php _e('Table prefix') ?></label>
-                                        <input id="install[db_prefix]" type="text" name="db_prefix" size="20" maxlength="30" />
-            						</div>
-            					</fieldset>
-            				</div>
-
-            				<div class="inform">
-            					<div class="forminfo">
-            						<h3><?php _e('Administration setup') ?></h3>
-            						<p><?php _e('Info 7') ?></p>
-            					</div>
-            					<fieldset>
-            						<legend><?php _e('Administration setup') ?></legend>
-            						<div class="infldset">
-            							<p><?php _e('Info 8') ?></p>
-            							<label class="required"><strong><?php _e('Administrator username') ?> <span><?php _e('Required') ?></span></strong></label>
-                                            <input type="text" name="install[username]" size="25" maxlength="25" required />
-            							<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong></label>
-                                            <input type="password" name="install[password]" size="16" required />
-            							<label class="conl required"><strong><?php _e('Confirm password') ?> <span><?php _e('Required') ?></span></strong></label>
-                                            <input type="password" name="install[password_conf]" size="16" required />
-            							<!-- <div class="clearer"></div> -->
-            							<label class="required"><strong><?php _e('Administrator email') ?> <span><?php _e('Required') ?></span></strong></label>
-                                            <input type="text" name="install[email]" size="50" maxlength="80" required />
-            						</div>
-            					</fieldset>
-            				</div>
-
-            				<div class="inform">
-            					<div class="forminfo">
-            						<h3><?php _e('Board setup') ?></h3>
-            						<p><?php _e('Info 11') ?></p>
-            					</div>
-            					<fieldset>
-            						<legend><?php _e('General information') ?></legend>
-            						<div class="infldset">
-            							<label class="required"><strong><?php _e('Board title') ?> <span><?php _e('Required') ?></span></strong></label>
-                                            <input type="text" name="install[title]" value="<? echo $data['title'] ?>" size="60" maxlength="255" required />
-            							<label><?php _e('Board description') ?></label>
-                                            <input type="text" name="install[description]" value="<? echo $data['description'] ?>" size="60" maxlength="255" required />
-            							<label class="required"><strong><?php _e('Base URL') ?> <span><?php _e('Required') ?></span></strong></label>
-                                            <input type="text" name="install[base_url]" value="<? echo $data['base_url'] ?>" size="60" maxlength="100" required />
-            							<label class="required"><strong><?php _e('Default language') ?> <span><?php _e('Required') ?></span></strong></label>
-                                            <select name="install[default_lang]" required />
-<?php
-foreach ($languages as $lang) {
-    echo "\t\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').' >'.$lang.'</option>'."\n";
-}
-?>
-            							    </select>
-            						</div>
-            					</fieldset>
-            				</div>
-
-            				<p class="buttons"><input type="submit" value="<?php _e('Start install') ?>" /></p>
-            			</form>
-            		</div>
-            	</div>
-            	</div>
+                <div id="brdmain">
+                    <?php if (count($languages) > 1): ?>
+                        <div class="blockform">
+                            <h2><span><?php _e('Choose install language') ?></span></h2>
+                            <div class="box">
+                                <form id="install" method="post" action="">
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Install language') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Choose install language info') ?></p>
+                                                <label><strong><?php _e('Install language') ?></strong>
+                                                    <br /><select name="install_lang">
+                                                        <?php
+
+                                                        foreach ($languages as $lang) {
+                                                            echo "\t\t\t\t\t".'<option value="'.$lang.'">'.$lang.'</option>'."\n";
+                                                        }
+
+                                                        ?>
+                                                    </select>
+                                                    <br /></label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                        <p class="buttons"><input type="submit" value="<?php _e('Change language') ?>" /></p>
+                                    </form>
+                                </div>
+                            </div>
+                        <?php endif;
+                        ?>
+
+                        <div class="blockform">
+                            <h2><span><?php echo sprintf(__('Install'), FORUM_VERSION) ?></span></h2>
+                            <div class="box">
+                                <form id="install" method="post" action="">
+                                    <?php if (!empty($errors)): ?>
+                                        <div class="inform">
+                                            <div class="forminfo error-info">
+                                                <h3><?php _e('Errors') ?></h3>
+                                                <ul class="error-list">
+                                                    <?php
+                                                    $errors = (!is_array($errors)) ? array($errors) : $errors;
+                                                    foreach ($errors as $error) {
+                                                        echo "\t\t\t\t\t\t".'<li><strong>'.$error.'</strong></li>'."\n";
+                                                    }
+                                                    ?>
+                                                </ul>
+                                            </div>
+                                        </div>
+                                        <?php endif;?>
+
+                                    <div class="inform">
+                                        <div class="forminfo">
+                                            <h3><?php _e('Database setup') ?></h3>
+                                            <p><?php _e('Info 1') ?></p>
+                                        </div>
+                                        <fieldset>
+                                            <legend><?php _e('Select database') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 2') ?></p>
+                                                <label class="required"><strong><?php _e('Database type') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <select name="install[db_type]" required>
+                                                    <?php
+
+                                                    foreach ($supported_dbs as $id => $db_type) {
+                                                        echo "\t\t\t\t\t\t\t".'<option value="'.$id.'">'.$db_type.'</option>'."\n";
+                                                    }
+
+                                                    ?>
+                                                </select>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database hostname') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 3') ?></p>
+                                                <label class="required"><strong><?php _e('Database server hostname') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[db_host]" size="50" required />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database enter name') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 4') ?></p>
+                                                <label class="required"><strong><?php _e('Database name') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[db_name]" size="30" required />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database enter informations') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 5') ?></p>
+                                                <label class="conl"><?php _e('Database username') ?></label>
+                                                <input type="text" name="install[db_user]" size="30" />
+                                                <label class="conl"><?php _e('Database password') ?></label>
+                                                <input type="password" name="install[db_pass]" size="30" />
+                                                <div class="clearer"></div>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database enter prefix') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 6') ?></p>
+                                                <label><?php _e('Table prefix') ?></label>
+                                                <input id="install[db_prefix]" type="text" name="db_prefix" size="20" maxlength="30" />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <div class="forminfo">
+                                            <h3><?php _e('Administration setup') ?></h3>
+                                            <p><?php _e('Info 7') ?></p>
+                                        </div>
+                                        <fieldset>
+                                            <legend><?php _e('Administration setup') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 8') ?></p>
+                                                <label class="required"><strong><?php _e('Administrator username') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[username]" size="25" maxlength="25" required />
+                                                <label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="password" name="install[password]" size="16" required />
+                                                <label class="conl required"><strong><?php _e('Confirm password') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="password" name="install[password_conf]" size="16" required />
+                                                <!-- <div class="clearer"></div> -->
+                                                <label class="required"><strong><?php _e('Administrator email') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[email]" size="50" maxlength="80" required />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <div class="forminfo">
+                                            <h3><?php _e('Board setup') ?></h3>
+                                            <p><?php _e('Info 11') ?></p>
+                                        </div>
+                                        <fieldset>
+                                            <legend><?php _e('General information') ?></legend>
+                                            <div class="infldset">
+                                                <label class="required"><strong><?php _e('Board title') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[title]" value="<? echo $data['title'] ?>" size="60" maxlength="255" required />
+                                                <label><?php _e('Board description') ?></label>
+                                                <input type="text" name="install[description]" value="<? echo $data['description'] ?>" size="60" maxlength="255" required />
+                                                <label class="required"><strong><?php _e('Base URL') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[base_url]" value="<? echo $data['base_url'] ?>" size="60" maxlength="100" required />
+                                                <label class="required"><strong><?php _e('Default language') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <select name="install[default_lang]" required />
+                                                <?php
+                                                foreach ($languages as $lang) {
+                                                    echo "\t\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').' >'.$lang.'</option>'."\n";
+                                                }
+                                                ?>
+                                            </select>
+                                        </div>
+                                    </fieldset>
+                                </div>
+
+                                <p class="buttons"><input type="submit" value="<?php _e('Start install') ?>" /></p>
+                            </form>
+                        </div>
+                    </div>
+                </div>
             </section>
         </div>
         <div class="end-box"><div><!-- Bottom Corners --></div></div>

From 222e1460caf4f8cb1543d1475d4c30c3a15d5cf8 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 13:47:44 +0200
Subject: [PATCH 058/353] Turn init_db into static function

---
 Slim/Extras/Middleware/FeatherBBLoader.php | 25 +++++++++-------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBBLoader.php b/Slim/Extras/Middleware/FeatherBBLoader.php
index 4d2ebf59..e1152aac 100644
--- a/Slim/Extras/Middleware/FeatherBBLoader.php
+++ b/Slim/Extras/Middleware/FeatherBBLoader.php
@@ -92,34 +92,29 @@ public static function load_default_forum_settings()
                 );
     }
 
-    public function init_db()
+    public static function init_db(array $config)
     {
-        switch ($this->forum_settings['db_type']) {
+        switch ($config['db_type']) {
             case 'mysql':
             case 'mysqli':
             case 'mysql_innodb':
             case 'mysqli_innodb':
-                DB::configure('mysql:host='.$this->forum_settings['db_host'].';dbname='.$this->forum_settings['db_name']);
+                DB::configure('mysql:host='.$config['db_host'].';dbname='.$config['db_name']);
                 DB::configure('driver_options', array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
                 break;
             case 'sqlite';
             case 'sqlite3';
-                DB::configure('sqlite:./'.$this->forum_settings['db_name']);
+                DB::configure('sqlite:./'.$config['db_name']);
                 break;
             case 'pgsql':
-                \DB::configure('pgsql:host='.$this->forum_settings['db_host'].'dbname='.$this->forum_settings['db_name']);
+                DB::configure('pgsql:host='.$config['db_host'].'dbname='.$config['db_name']);
                 break;
         }
-        DB::configure('username', $this->forum_settings['db_user']);
-        DB::configure('password', $this->forum_settings['db_pass']);
-        if ($this->forum_env['FEATHER_SHOW_QUERIES'] == 1) {
-            DB::configure('logging', true);
-        }
-        if ($this->forum_env['FEATHER_CACHE_QUERIES'] == 1) {
-            DB::configure('caching', true);
-        }
+        DB::configure('username', $config['db_user']);
+        DB::configure('password', $config['db_pass']);
+        DB::configure('logging', true);
         DB::configure('id_column_overrides', array(
-            $this->forum_settings['db_prefix'].'groups' => 'g_id',
+            $config['db_prefix'].'groups' => 'g_id',
         ));
     }
 
@@ -229,7 +224,7 @@ public function call()
         }
 
         // Init DB
-        $this->init_db();
+        self::init_db($this->forum_settings);
 
         // Get forum settings from DB/cache and load it into forum_settings array
         if (file_exists($this->forum_env['FORUM_CACHE_DIR'].'cache_config.php')) {

From e848bf390605ce6b9bb1c581f853f10acfc7b51f Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 13:58:39 +0200
Subject: [PATCH 059/353] Implement create table feature

---
 Slim/Extras/Middleware/FeatherBBLoader.php |  1 +
 controller/install.php                     |  8 +++--
 model/install.php                          | 40 ++++++++++++----------
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBBLoader.php b/Slim/Extras/Middleware/FeatherBBLoader.php
index e1152aac..dd318efc 100644
--- a/Slim/Extras/Middleware/FeatherBBLoader.php
+++ b/Slim/Extras/Middleware/FeatherBBLoader.php
@@ -94,6 +94,7 @@ public static function load_default_forum_settings()
 
     public static function init_db(array $config)
     {
+        $config['db_prefix'] = (!empty($config['db_prefix'])) ? $config['db_prefix'] : '';
         switch ($config['db_type']) {
             case 'mysql':
             case 'mysqli':
diff --git a/controller/install.php b/controller/install.php
index f58aada0..17c440ab 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -159,8 +159,7 @@ public function create_config(array $data)
 
         // ... And write it on disk
         if ($this->write_config(json_encode($config, JSON_PRETTY_PRINT))) {
-            //$this->create_db($data);
-            echo 'Config created';
+            $this->create_db($data);
         }
     }
 
@@ -171,14 +170,17 @@ public function create_db(array $data)
             //redirect(get_link(''), 'DB already installed');
         }
 
+        //
+        \Slim\Extras\Middleware\FeatherBBLoader::init_db($data);
+
         // Create tables
         foreach ($this->model->get_database_scheme() as $table => $sql) {
+            $table = (!empty($data['db_prefix'])) ? $data['db_prefix'].$table : $table;
             if (!$this->model->create_table($table, $sql)) {
                 // Error handling
                 $this->errors[] = 'A problem was encountered while creating table '.$table;
             }
         }
-        echo 'ok';
     }
 
     public function write_config($json)
diff --git a/model/install.php b/model/install.php
index d7e6d05f..a4698265 100644
--- a/model/install.php
+++ b/model/install.php
@@ -14,7 +14,7 @@
 class install
 {
     protected $database_scheme = array(
-        'bans' => "CREATE TABLE `bans` (
+        'bans' => "CREATE TABLE %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `username` varchar(200) DEFAULT NULL,
             `ip` varchar(255) DEFAULT NULL,
@@ -25,24 +25,24 @@ class install
             PRIMARY KEY (`id`),
             KEY `bans_username_idx` (`username`(25))
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'categories' => "CREATE TABLE `categories` (
+        'categories' => "CREATE TABLE %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `cat_name` varchar(80) NOT NULL DEFAULT 'New Category',
             `disp_position` int(10) NOT NULL DEFAULT '0',
             PRIMARY KEY (`id`)
         ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;",
-        'censoring' => "CREATE TABLE `censoring` (
+        'censoring' => "CREATE TABLE %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `search_for` varchar(60) NOT NULL DEFAULT '',
             `replace_with` varchar(60) NOT NULL DEFAULT '',
             PRIMARY KEY (`id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'config' => "CREATE TABLE `config` (
+        'config' => "CREATE TABLE %t% (
             `conf_name` varchar(255) NOT NULL DEFAULT '',
             `conf_value` text,
             PRIMARY KEY (`conf_name`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'forum_perms' => "CREATE TABLE `forum_perms` (
+        'forum_perms' => "CREATE TABLE %t% (
             `group_id` int(10) NOT NULL DEFAULT '0',
             `forum_id` int(10) NOT NULL DEFAULT '0',
             `read_forum` tinyint(1) NOT NULL DEFAULT '1',
@@ -50,12 +50,12 @@ class install
             `post_topics` tinyint(1) NOT NULL DEFAULT '1',
             PRIMARY KEY (`group_id`,`forum_id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'forum_subscriptions' => "CREATE TABLE `forum_subscriptions` (
+        'forum_subscriptions' => "CREATE TABLE %t% (
             `user_id` int(10) unsigned NOT NULL DEFAULT '0',
             `forum_id` int(10) unsigned NOT NULL DEFAULT '0',
             PRIMARY KEY (`user_id`,`forum_id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'forums' => "CREATE TABLE `forums` (
+        'forums' => "CREATE TABLE %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `forum_name` varchar(80) NOT NULL DEFAULT 'New forum',
             `forum_desc` text,
@@ -71,7 +71,7 @@ class install
             `cat_id` int(10) unsigned NOT NULL DEFAULT '0',
             PRIMARY KEY (`id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'groups' => "CREATE TABLE `groups` (
+        'groups' => "CREATE TABLE %t% (
             `g_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `g_title` varchar(50) NOT NULL DEFAULT '',
             `g_user_title` varchar(50) DEFAULT NULL,
@@ -101,7 +101,7 @@ class install
             `g_report_flood` smallint(6) NOT NULL DEFAULT '60',
             PRIMARY KEY (`g_id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'online' => "CREATE TABLE `online` (
+        'online' => "CREATE TABLE %t% (
             `user_id` int(10) unsigned NOT NULL DEFAULT '1',
             `ident` varchar(200) NOT NULL DEFAULT '',
             `logged` int(10) unsigned NOT NULL DEFAULT '0',
@@ -112,7 +112,7 @@ class install
             KEY `online_ident_idx` (`ident`(25)),
             KEY `online_logged_idx` (`logged`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'posts' => "CREATE TABLE `posts` (
+        'posts' => "CREATE TABLE %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `poster` varchar(200) NOT NULL DEFAULT '',
             `poster_id` int(10) unsigned NOT NULL DEFAULT '1',
@@ -128,7 +128,7 @@ class install
             KEY `posts_topic_id_idx` (`topic_id`),
             KEY `posts_multi_idx` (`poster_id`,`topic_id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'reports' => "CREATE TABLE `reports` (
+        'reports' => "CREATE TABLE %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `post_id` int(10) unsigned NOT NULL DEFAULT '0',
             `topic_id` int(10) unsigned NOT NULL DEFAULT '0',
@@ -141,32 +141,32 @@ class install
             PRIMARY KEY (`id`),
             KEY `reports_zapped_idx` (`zapped`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'search_cache' => "CREATE TABLE `search_cache` (
+        'search_cache' => "CREATE TABLE %t% (
             `id` int(10) unsigned NOT NULL DEFAULT '0',
             `ident` varchar(200) NOT NULL DEFAULT '',
             `search_data` mediumtext,
             PRIMARY KEY (`id`),
             KEY `search_cache_ident_idx` (`ident`(8))
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'search_matches' => "CREATE TABLE `search_matches` (
+        'search_matches' => "CREATE TABLE %t% (
             `post_id` int(10) unsigned NOT NULL DEFAULT '0',
             `word_id` int(10) unsigned NOT NULL DEFAULT '0',
             `subject_match` tinyint(1) NOT NULL DEFAULT '0',
             KEY `search_matches_word_id_idx` (`word_id`),
             KEY `search_matches_post_id_idx` (`post_id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'search_words' => "CREATE TABLE `search_words` (
+        'search_words' => "CREATE TABLE %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `word` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
             PRIMARY KEY (`word`),
             KEY `search_words_id_idx` (`id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'topic_subscriptions' => "CREATE TABLE `topic_subscriptions` (
+        'topic_subscriptions' => "CREATE TABLE %t% (
             `user_id` int(10) unsigned NOT NULL DEFAULT '0',
             `topic_id` int(10) unsigned NOT NULL DEFAULT '0',
             PRIMARY KEY (`user_id`,`topic_id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'topics' => "CREATE TABLE `topics` (
+        'topics' => "CREATE TABLE %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `poster` varchar(200) NOT NULL DEFAULT '',
             `subject` varchar(255) NOT NULL DEFAULT '',
@@ -187,7 +187,7 @@ class install
             KEY `topics_last_post_idx` (`last_post`),
             KEY `topics_first_post_id_idx` (`first_post_id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'users' => "CREATE TABLE `users` (
+        'users' => "CREATE TABLE %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `group_id` int(10) unsigned NOT NULL DEFAULT '3',
             `username` varchar(200) NOT NULL DEFAULT '',
@@ -238,7 +238,6 @@ class install
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/English/install.mo');
     }
 
     public function is_installed()
@@ -249,7 +248,10 @@ public function is_installed()
     public function create_table($table_name, $sql)
     {
         $db = DB::get_db();
-        return $db->exec($sql);
+        $req = preg_replace('/%t%/', '`'.$table_name.'`', $sql);
+        $db->exec($req);
+        echo DB::get_last_query();
+        return true;
     }
 
     public function get_database_scheme()

From 29bf3c7ca1a16c0be5574eb773327d134a725aa7 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 14:06:07 +0200
Subject: [PATCH 060/353] Fix is_installed check

---
 controller/install.php | 7 +++----
 model/install.php      | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/controller/install.php b/controller/install.php
index 17c440ab..23df1319 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -165,14 +165,13 @@ public function create_config(array $data)
 
     public function create_db(array $data)
     {
+        \Slim\Extras\Middleware\FeatherBBLoader::init_db($data);
+
         // Check if FeatherBB DB isn't installed already
         if ($this->model->is_installed()) {
-            //redirect(get_link(''), 'DB already installed');
+            redirect(get_link(''), 'DB already installed');
         }
 
-        //
-        \Slim\Extras\Middleware\FeatherBBLoader::init_db($data);
-
         // Create tables
         foreach ($this->model->get_database_scheme() as $table => $sql) {
             $table = (!empty($data['db_prefix'])) ? $data['db_prefix'].$table : $table;
diff --git a/model/install.php b/model/install.php
index a4698265..c1a42cb8 100644
--- a/model/install.php
+++ b/model/install.php
@@ -242,7 +242,9 @@ public function __construct()
 
     public function is_installed()
     {
-        return false;
+        $db = DB::get_db();
+        $db->exec('SHOW TABLES like `users`');
+        return (bool) $db;
     }
 
     public function create_table($table_name, $sql)

From ebe18287f854670d30ceab6faeeeab6c4a1f2ac7 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 14:24:40 +0200
Subject: [PATCH 061/353] Add default and admin users

---
 controller/install.php |  4 ++++
 model/install.php      | 41 +++++++++++++++++++++++++++++++++--------
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/controller/install.php b/controller/install.php
index 23df1319..b07d8258 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -180,6 +180,10 @@ public function create_db(array $data)
                 $this->errors[] = 'A problem was encountered while creating table '.$table;
             }
         }
+
+        // Populate tables with default values
+        $this->model->add_user($this->model->load_default_user());
+        $this->model->add_user($this->model->load_admin_user($data));
     }
 
     public function write_config($json)
diff --git a/model/install.php b/model/install.php
index c1a42cb8..426f961b 100644
--- a/model/install.php
+++ b/model/install.php
@@ -243,8 +243,8 @@ public function __construct()
     public function is_installed()
     {
         $db = DB::get_db();
-        $db->exec('SHOW TABLES like `users`');
-        return (bool) $db;
+        //$db->exec('SHOW TABLES like users');
+        return false;
     }
 
     public function create_table($table_name, $sql)
@@ -256,6 +256,14 @@ public function create_table($table_name, $sql)
         return true;
     }
 
+    public function add_user(array $data)
+    {
+        return (bool) DB::for_table('users')
+                        ->create()
+                        ->set($data)
+                        ->save();
+    }
+
     public function get_database_scheme()
     {
         return $this->database_scheme;
@@ -263,7 +271,7 @@ public function get_database_scheme()
 
     public static function load_default_groups()
     {
-        $data['Administrators'] = array(
+        $groups['Administrators'] = array(
             'g_id' => 1,
             'g_title' => __('Administrators'),
             'g_user_title' => __('Administrator'),
@@ -287,7 +295,7 @@ public static function load_default_groups()
             'g_search_flood' => 0,
             'g_email_flood' => 0,
             'g_report_flood' => 0);
-        $data['Moderators'] = array(
+        $groups['Moderators'] = array(
             'g_id' => 2,
             'g_title' => __('Moderators'),
             'g_user_title' => __('Moderator'),
@@ -311,7 +319,7 @@ public static function load_default_groups()
             'g_search_flood' => 0,
             'g_email_flood' => 0,
             'g_report_flood' => 0);
-        $data['Guests'] = array(
+        $groups['Guests'] = array(
             'g_id' => 3,
             'g_title' => __('Guests'),
             'g_user_title' => __('Guest'),
@@ -335,7 +343,7 @@ public static function load_default_groups()
             'g_search_flood' => 30,
             'g_email_flood' => 0,
             'g_report_flood' => 0);
-        $data['Members'] = array(
+        $groups['Members'] = array(
             'g_id' => 4,
             'g_title' => __('Members'),
             'g_user_title' => __('Member'),
@@ -360,15 +368,32 @@ public static function load_default_groups()
             'g_email_flood' => 60,
             'g_report_flood' => 60);
 
-        return $data;
+        return $groups;
     }
 
     public static function load_default_user()
     {
-        return $data['Guest'] = array(
+        return $user = array(
                 'group_id' => 3,
                 'username' => __('Guest'),
                 'password' => __('Guest'),
                 'email' => __('Guest'));
     }
+
+    public static function load_admin_user(array $data)
+    {
+        $now = time();
+        return $user = array(
+            'group_id' => 1,
+            'username' => $data['username'],
+            'password' => feather_hash($data['password']),
+            'email' => $data['email'],
+            'language' => $data['default_lang'],
+            'style' => $data['default_style'],
+            'num_posts' => 1,
+            'last_post' => $now,
+            'registered' => $now,
+            'registration_ip' => get_remote_address(),
+            'last_visit' => $now);
+    }
 }

From 7a6a606797abe95105cfa46f2e80fe35e7b23474 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Mon, 17 Aug 2015 15:21:41 +0200
Subject: [PATCH 062/353] First attempt to do a hook system

---
 Slim/Extras/Middleware/FeatherBB.php |  5 +++++
 Slim/Middleware/PrettyExceptions.php |  6 +++---
 Slim/Slim.php                        | 10 ++++++----
 model/index.php                      |  2 ++
 plugins/test/plugintest.php          | 28 ++++++++++++++++++++++++++++
 5 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 plugins/test/plugintest.php

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 400e8554..321d3f08 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -13,6 +13,7 @@
 
 namespace Slim\Extras\Middleware;
 use DB;
+use model\plugintest;
 
 class FeatherBB extends \Slim\Middleware
 {
@@ -528,6 +529,10 @@ public function call()
             // Update online list
             $this->update_users_online();
 
+            // Load the test plugin
+            require $this->data['forum_env']['FEATHER_ROOT'].'plugins/test/plugintest.php';
+            new \plugin\plugintest();
+
             // Configure Slim
             $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? FEATHER_ROOT.'style/'.$this->app->user->style.'/view' : FEATHER_ROOT.'view');
             $this->next->call();
diff --git a/Slim/Middleware/PrettyExceptions.php b/Slim/Middleware/PrettyExceptions.php
index aafda0f9..8bed30d7 100644
--- a/Slim/Middleware/PrettyExceptions.php
+++ b/Slim/Middleware/PrettyExceptions.php
@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.6.1
+ * @version     2.6.3
  * @package     Slim
  *
  * MIT LICENSE
@@ -86,10 +86,10 @@ protected function renderBody(&$env, $exception)
     {
         $title = 'Slim Application Error';
         $code = $exception->getCode();
-        $message = $exception->getMessage();
+        $message = htmlspecialchars($exception->getMessage());
         $file = $exception->getFile();
         $line = $exception->getLine();
-        $trace = str_replace(array('#', "\n"), array('<div>#', '</div>'), $exception->getTraceAsString());
+        $trace = str_replace(array('#', "\n"), array('<div>#', '</div>'), htmlspecialchars($exception->getTraceAsString()));
         $html = sprintf('<h1>%s</h1>', $title);
         $html .= '<p>The application could not run because of the following error:</p>';
         $html .= '<h2>Details</h2>';
diff --git a/Slim/Slim.php b/Slim/Slim.php
index c7ae85d4..33ecc482 100644
--- a/Slim/Slim.php
+++ b/Slim/Slim.php
@@ -1193,8 +1193,12 @@ public function hook($name, $callable, $priority = 10)
      */
     public function applyHook($name)
     {
+        $args = func_get_args();
+        array_shift($args);
+
         if (!isset($this->hooks[$name])) {
             $this->hooks[$name] = array(array());
+            return $args[0];
         }
         if (!empty($this->hooks[$name])) {
             // Sort by priority, low to high, if there's more than one priority
@@ -1202,13 +1206,11 @@ public function applyHook($name)
                 ksort($this->hooks[$name]);
             }
 
-            $args = func_get_args();
-            array_shift($args);
-
             foreach ($this->hooks[$name] as $priority) {
                 if (!empty($priority)) {
                     foreach ($priority as $callable) {
-                        call_user_func_array($callable, $args);
+                        $output = call_user_func_array($callable, $args);
+                        return $output;
                     }
                 }
             }
diff --git a/model/index.php b/model/index.php
index 986a3715..da8e296e 100644
--- a/model/index.php
+++ b/model/index.php
@@ -45,6 +45,8 @@ public function get_forum_actions()
             $forum_actions[] = '<a href="'.get_link('mark-read/').'">'.__('Mark all as read').'</a>';
         }
 
+        $forum_actions = $this->feather->applyHook('get_forum_actions', $forum_actions);
+
         return $forum_actions;
     }
 
diff --git a/plugins/test/plugintest.php b/plugins/test/plugintest.php
new file mode 100644
index 00000000..b277a8ea
--- /dev/null
+++ b/plugins/test/plugintest.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace plugin;
+
+class plugintest
+{
+
+    public function __construct()
+    {
+        $this->feather = \Slim\Slim::getInstance();
+        $this->start = $this->feather->start;
+        $this->config = $this->feather->config;
+        $this->user = $this->feather->user;
+        $this->request = $this->feather->request;
+
+        $this->feather->hook('get_forum_actions', function ($forum_actions) {
+            $forum_actions[] = '<a href="'.get_link('mark-read/').'">Test</a>';
+            return $forum_actions;
+        });
+    }
+}
\ No newline at end of file

From 193ea8787c8fd8a694eea3f2a62836d63e82b425 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 15:31:54 +0200
Subject: [PATCH 063/353] Add groups and lorem ipsum features

---
 controller/install.php |  8 +++++-
 model/install.php      | 56 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/controller/install.php b/controller/install.php
index b07d8258..98405a46 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -181,9 +181,15 @@ public function create_db(array $data)
             }
         }
 
-        // Populate tables with default values
+        // Populate group table with default values
+        foreach ($this->model->load_default_groups() as $group_name => $group_data) {
+            $this->model->add_group($group_data);
+        }
+        // Populate user table with default values
         $this->model->add_user($this->model->load_default_user());
         $this->model->add_user($this->model->load_admin_user($data));
+        // Populate categories, forums, topics, posts
+        $this->model->add_mock_forum($this->model->load_mock_forum_data($data));
     }
 
     public function write_config($json)
diff --git a/model/install.php b/model/install.php
index 426f961b..559a618b 100644
--- a/model/install.php
+++ b/model/install.php
@@ -264,6 +264,24 @@ public function add_user(array $data)
                         ->save();
     }
 
+    public function add_mock_forum(array $arch)
+    {
+        foreach ($arch as $forum => $data) {
+            DB::for_table($forum)
+                ->create()
+                ->set($data)
+                ->save();
+        }
+    }
+
+    public function add_group(array $data)
+    {
+        return (bool) DB::for_table('groups')
+                        ->create()
+                        ->set($data)
+                        ->save();
+    }
+
     public function get_database_scheme()
     {
         return $this->database_scheme;
@@ -396,4 +414,42 @@ public static function load_admin_user(array $data)
             'registration_ip' => get_remote_address(),
             'last_visit' => $now);
     }
+
+    public static function load_mock_forum_data(array $data)
+    {
+        $cat_name = __('Test category');
+        $subject = __('Test post');
+        $message = __('Message');
+        $forum_name = __('Test forum');
+        $forum_desc = __('This is just a test forum');
+        $now = time();
+        $ip = get_remote_address();
+
+        return $mock_data = array(
+            'categories' => array('cat_name' => $cat_name,
+                                  'disp_position' => 1),
+                'forums' => array('forum_name' => $forum_name,
+                                  'forum_desc' => $forum_desc,
+                                  'num_topics' => 1,
+                                  'num_posts' => 1,
+                                  'last_post' => $now,
+                                  'last_post_id' => 1,
+                                  'last_poster' => $data['username'],
+                                  'disp_position' => 1,
+                                  'cat_id' =>  1),
+                'topics' => array('poster' => $data['username'],
+                                  'subject' => $subject,
+                                  'posted' => $now,
+                                  'first_post_id' => 1,
+                                  'last_post' => $now,
+                                  'last_post_id' => 1,
+                                  'last_poster' => $data['username'],
+                                  'forum_id' => 1),
+                'posts' => array('poster' => $data['username'],
+                                 'poster_id' => 2,
+                                 'poster_ip' => $ip,
+                                 'message' => $message,
+                                 'posted' => $now,
+                                 'topic_id' => 1));
+    }
 }

From 25ded94c045e726dbac6ae0fbfa89b59c8a1b2a7 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 15:55:54 +0200
Subject: [PATCH 064/353] Prefer use of a generic add_data method in model

---
 .htaccess.dist         |  3 ---
 cache/index.html       |  1 -
 controller/install.php | 11 ++++++-----
 model/install.php      | 21 +++++++++------------
 4 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 .htaccess.dist
 delete mode 100644 cache/index.html

diff --git a/.htaccess.dist b/.htaccess.dist
deleted file mode 100644
index a7b90e2c..00000000
--- a/.htaccess.dist
+++ /dev/null
@@ -1,3 +0,0 @@
-RewriteEngine On
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^ index.php [QSA,L]
\ No newline at end of file
diff --git a/cache/index.html b/cache/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/cache/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/controller/install.php b/controller/install.php
index 98405a46..b5bce496 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -183,13 +183,15 @@ public function create_db(array $data)
 
         // Populate group table with default values
         foreach ($this->model->load_default_groups() as $group_name => $group_data) {
-            $this->model->add_group($group_data);
+            $this->model->add_data('groups', $group_data);
         }
         // Populate user table with default values
-        $this->model->add_user($this->model->load_default_user());
-        $this->model->add_user($this->model->load_admin_user($data));
+        $this->model->add_data('users', $this->model->load_default_user());
+        $this->model->add_data('users', $this->model->load_admin_user($data));
         // Populate categories, forums, topics, posts
         $this->model->add_mock_forum($this->model->load_mock_forum_data($data));
+        // Store config in DB
+        $this->model->save_config($this->load_default_config($data));
     }
 
     public function write_config($json)
@@ -199,7 +201,7 @@ public function write_config($json)
 
     public function load_default_config(array $data)
     {
-        $config = array(
+        return array(
             'o_cur_version'                => $this->feather->forum_env['FORUM_VERSION'],
             'o_database_revision'        => $this->feather->forum_env['FORUM_DB_REVISION'],
             'o_searchindex_revision'    => $this->feather->forum_env['FORUM_SI_REVISION'],
@@ -278,6 +280,5 @@ public function load_default_config(array $data)
             'p_allow_dupe_email'        => 0,
             'p_force_guest_email'        => 1
         );
-        return $config;
     }
 }
diff --git a/model/install.php b/model/install.php
index 559a618b..0e4bbd6d 100644
--- a/model/install.php
+++ b/model/install.php
@@ -256,9 +256,9 @@ public function create_table($table_name, $sql)
         return true;
     }
 
-    public function add_user(array $data)
+    public function add_data($table_name, array $data)
     {
-        return (bool) DB::for_table('users')
+        return (bool) DB::for_table($table_name)
                         ->create()
                         ->set($data)
                         ->save();
@@ -266,20 +266,17 @@ public function add_user(array $data)
 
     public function add_mock_forum(array $arch)
     {
-        foreach ($arch as $forum => $data) {
-            DB::for_table($forum)
-                ->create()
-                ->set($data)
-                ->save();
+        foreach ($arch as $table_name => $data) {
+            $this->add_data($table_name, $data);
         }
     }
 
-    public function add_group(array $data)
+    public function save_config(array $data)
     {
-        return (bool) DB::for_table('groups')
-                        ->create()
-                        ->set($data)
-                        ->save();
+        foreach ($data as $key => $value) {
+            $this->add_data('config', array('conf_name' => $key,
+                                            'conf_value' => $value));
+        }
     }
 
     public function get_database_scheme()

From 60ed705d6b91656ddfe6905c337bf69f431e3e51 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 16:59:12 +0200
Subject: [PATCH 065/353] Fix multilingual installation

---
 controller/install.php           | 22 +++++++++++++++++-----
 style/FeatherBB/view/install.php |  3 ++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/controller/install.php b/controller/install.php
index b5bce496..26bf115f 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -16,7 +16,9 @@ class install
                                      'sqlite' => 'SQLite',
                                      'sqlite3' => 'SQLite3',
                                     );
+    protected $available_langs;
     protected $optional_fields = array('db_user', 'db_pass', 'db_prefix');
+    protected $install_lang = 'English';
     protected $default_style = 'FeatherBB';
     protected $config_keys = array('db_type', 'db_host', 'db_name', 'db_user', 'db_pass', 'db_prefix');
     protected $default_config_path = 'include/config.php';
@@ -26,6 +28,7 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \model\install();
+        $this->available_langs = forum_list_langs();
 
         // // Check to see whether FeatherBB is already installed
         // if (!is_null($this->feather->forum_env['CONFIG_PATH'])) {
@@ -34,12 +37,18 @@ public function __construct()
         //         redirect(get_link(''), __('Already installed'));
         //     }
         // }
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/English/install.mo');
     }
 
     public function run()
     {
-        if ($this->feather->request->isPost()) {
+        if (!empty($this->feather->request->post('choose_lang'))) {
+            if (in_array(feather_trim($this->feather->request->post('install_lang')), $this->available_langs)) {
+                $this->install_lang = $this->feather->request->post('install_lang');
+            }
+        }
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->install_lang.'/install.mo');
+
+        if ($this->feather->request->isPost() && empty($this->feather->request->post('choose_lang'))) {
             $missing_fields = array();
             $data = array_map(function ($item) {
                 return feather_escape(feather_trim($item));
@@ -116,7 +125,7 @@ public function run()
                 $this->feather->view()->setTemplatesDirectory($this->feather->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
                 $this->feather->view()->display('install.php', array(
                                                         'feather' => $this->feather,
-                                                        'languages' => forum_list_langs(),
+                                                        'languages' => $this->available_langs,
                                                         'supported_dbs' => $this->supported_dbs,
                                                         'data' => $data,
                                                         'errors' => $this->errors,
@@ -130,14 +139,14 @@ public function run()
             $data = array('title' => __('My FeatherBB Forum'),
                           'description' => '<p><span>'.__('Description').'</span></p>',
                           'base_url' => $this->feather->request->getUrl().$this->feather->request->getRootUri(),
-                          'default_lang' => 'English');
+                          'default_lang' => $this->install_lang);
             if (isset($this->environment['slim.flash'])) {
                 $this->feather->view()->set('flash', $this->environment['slim.flash']);
             }
             $this->feather->view()->setTemplatesDirectory($this->feather->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
             $this->feather->view()->display('install.php', array(
                                                 'feather' => $this->feather,
-                                                'languages' => forum_list_langs(),
+                                                'languages' => $this->available_langs,
                                                 'supported_dbs' => $this->supported_dbs,
                                                 'data' => $data,
                                                 'alerts' => array()));
@@ -172,6 +181,9 @@ public function create_db(array $data)
             redirect(get_link(''), 'DB already installed');
         }
 
+        // Load appropriate language
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$data['default_lang'].'/install.mo');
+
         // Create tables
         foreach ($this->model->get_database_scheme() as $table => $sql) {
             $table = (!empty($data['db_prefix'])) ? $data['db_prefix'].$table : $table;
diff --git a/style/FeatherBB/view/install.php b/style/FeatherBB/view/install.php
index 223e42b6..3338baaf 100644
--- a/style/FeatherBB/view/install.php
+++ b/style/FeatherBB/view/install.php
@@ -44,6 +44,7 @@
                             <h2><span><?php _e('Choose install language') ?></span></h2>
                             <div class="box">
                                 <form id="install" method="post" action="">
+                                    <input type="hidden" name="choose_lang" value="1">
                                     <div class="inform">
                                         <fieldset>
                                             <legend><?php _e('Install language') ?></legend>
@@ -54,7 +55,7 @@
                                                         <?php
 
                                                         foreach ($languages as $lang) {
-                                                            echo "\t\t\t\t\t".'<option value="'.$lang.'">'.$lang.'</option>'."\n";
+                                                            echo "\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').'>'.$lang.'</option>'."\n";
                                                         }
 
                                                         ?>

From f82ba12e45c0d32a4836bb5221ebeefe302e496a Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 17:02:52 +0200
Subject: [PATCH 066/353] Drop 'already installed' check as the installer can't
 be called by a route

---
 controller/install.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/controller/install.php b/controller/install.php
index 26bf115f..b08eec78 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -29,14 +29,6 @@ public function __construct()
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \model\install();
         $this->available_langs = forum_list_langs();
-
-        // // Check to see whether FeatherBB is already installed
-        // if (!is_null($this->feather->forum_env['CONFIG_PATH'])) {
-        //     $config = @json_decode(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].$this->feather->forum_env['CONFIG_PATH']), true);
-        //     if (is_array($config)) {
-        //         redirect(get_link(''), __('Already installed'));
-        //     }
-        // }
     }
 
     public function run()

From f5bc0ab324db1166bdd800672419eb99d1bc5fc7 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 17:05:39 +0200
Subject: [PATCH 067/353] Rename var

---
 controller/install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controller/install.php b/controller/install.php
index b08eec78..806151b8 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -21,7 +21,7 @@ class install
     protected $install_lang = 'English';
     protected $default_style = 'FeatherBB';
     protected $config_keys = array('db_type', 'db_host', 'db_name', 'db_user', 'db_pass', 'db_prefix');
-    protected $default_config_path = 'include/config.php';
+    protected $config_file = 'include/config.php';
     protected $errors = array();
 
     public function __construct()
@@ -200,7 +200,7 @@ public function create_db(array $data)
 
     public function write_config($json)
     {
-        return file_put_contents($this->feather->forum_env['FEATHER_ROOT'].$this->default_config_path, $json);
+        return file_put_contents($this->feather->forum_env['FEATHER_ROOT'].$this->config_file, $json);
     }
 
     public function load_default_config(array $data)

From 1e8cbfb58e83ef16693382fa2c43541e5dbfbe83 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 17:08:57 +0200
Subject: [PATCH 068/353] Get rid of is_installed check by using 'IF NOT
 EXISTS' sql syntax

---
 controller/install.php |  5 -----
 model/install.php      | 45 +++++++++++++++++-------------------------
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/controller/install.php b/controller/install.php
index 806151b8..cf5bc8b5 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -168,11 +168,6 @@ public function create_db(array $data)
     {
         \Slim\Extras\Middleware\FeatherBBLoader::init_db($data);
 
-        // Check if FeatherBB DB isn't installed already
-        if ($this->model->is_installed()) {
-            redirect(get_link(''), 'DB already installed');
-        }
-
         // Load appropriate language
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$data['default_lang'].'/install.mo');
 
diff --git a/model/install.php b/model/install.php
index 0e4bbd6d..56427462 100644
--- a/model/install.php
+++ b/model/install.php
@@ -14,7 +14,7 @@
 class install
 {
     protected $database_scheme = array(
-        'bans' => "CREATE TABLE %t% (
+        'bans' => "CREATE TABLE IF NOT EXISTS %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `username` varchar(200) DEFAULT NULL,
             `ip` varchar(255) DEFAULT NULL,
@@ -25,24 +25,24 @@ class install
             PRIMARY KEY (`id`),
             KEY `bans_username_idx` (`username`(25))
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'categories' => "CREATE TABLE %t% (
+        'categories' => "CREATE TABLE IF NOT EXISTS %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `cat_name` varchar(80) NOT NULL DEFAULT 'New Category',
             `disp_position` int(10) NOT NULL DEFAULT '0',
             PRIMARY KEY (`id`)
         ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;",
-        'censoring' => "CREATE TABLE %t% (
+        'censoring' => "CREATE TABLE IF NOT EXISTS %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `search_for` varchar(60) NOT NULL DEFAULT '',
             `replace_with` varchar(60) NOT NULL DEFAULT '',
             PRIMARY KEY (`id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'config' => "CREATE TABLE %t% (
+        'config' => "CREATE TABLE IF NOT EXISTS %t% (
             `conf_name` varchar(255) NOT NULL DEFAULT '',
             `conf_value` text,
             PRIMARY KEY (`conf_name`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'forum_perms' => "CREATE TABLE %t% (
+        'forum_perms' => "CREATE TABLE IF NOT EXISTS %t% (
             `group_id` int(10) NOT NULL DEFAULT '0',
             `forum_id` int(10) NOT NULL DEFAULT '0',
             `read_forum` tinyint(1) NOT NULL DEFAULT '1',
@@ -50,12 +50,12 @@ class install
             `post_topics` tinyint(1) NOT NULL DEFAULT '1',
             PRIMARY KEY (`group_id`,`forum_id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'forum_subscriptions' => "CREATE TABLE %t% (
+        'forum_subscriptions' => "CREATE TABLE IF NOT EXISTS %t% (
             `user_id` int(10) unsigned NOT NULL DEFAULT '0',
             `forum_id` int(10) unsigned NOT NULL DEFAULT '0',
             PRIMARY KEY (`user_id`,`forum_id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'forums' => "CREATE TABLE %t% (
+        'forums' => "CREATE TABLE IF NOT EXISTS %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `forum_name` varchar(80) NOT NULL DEFAULT 'New forum',
             `forum_desc` text,
@@ -71,7 +71,7 @@ class install
             `cat_id` int(10) unsigned NOT NULL DEFAULT '0',
             PRIMARY KEY (`id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'groups' => "CREATE TABLE %t% (
+        'groups' => "CREATE TABLE IF NOT EXISTS %t% (
             `g_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `g_title` varchar(50) NOT NULL DEFAULT '',
             `g_user_title` varchar(50) DEFAULT NULL,
@@ -101,7 +101,7 @@ class install
             `g_report_flood` smallint(6) NOT NULL DEFAULT '60',
             PRIMARY KEY (`g_id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'online' => "CREATE TABLE %t% (
+        'online' => "CREATE TABLE IF NOT EXISTS %t% (
             `user_id` int(10) unsigned NOT NULL DEFAULT '1',
             `ident` varchar(200) NOT NULL DEFAULT '',
             `logged` int(10) unsigned NOT NULL DEFAULT '0',
@@ -112,7 +112,7 @@ class install
             KEY `online_ident_idx` (`ident`(25)),
             KEY `online_logged_idx` (`logged`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'posts' => "CREATE TABLE %t% (
+        'posts' => "CREATE TABLE IF NOT EXISTS %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `poster` varchar(200) NOT NULL DEFAULT '',
             `poster_id` int(10) unsigned NOT NULL DEFAULT '1',
@@ -128,7 +128,7 @@ class install
             KEY `posts_topic_id_idx` (`topic_id`),
             KEY `posts_multi_idx` (`poster_id`,`topic_id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'reports' => "CREATE TABLE %t% (
+        'reports' => "CREATE TABLE IF NOT EXISTS %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `post_id` int(10) unsigned NOT NULL DEFAULT '0',
             `topic_id` int(10) unsigned NOT NULL DEFAULT '0',
@@ -141,32 +141,32 @@ class install
             PRIMARY KEY (`id`),
             KEY `reports_zapped_idx` (`zapped`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'search_cache' => "CREATE TABLE %t% (
+        'search_cache' => "CREATE TABLE IF NOT EXISTS %t% (
             `id` int(10) unsigned NOT NULL DEFAULT '0',
             `ident` varchar(200) NOT NULL DEFAULT '',
             `search_data` mediumtext,
             PRIMARY KEY (`id`),
             KEY `search_cache_ident_idx` (`ident`(8))
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'search_matches' => "CREATE TABLE %t% (
+        'search_matches' => "CREATE TABLE IF NOT EXISTS %t% (
             `post_id` int(10) unsigned NOT NULL DEFAULT '0',
             `word_id` int(10) unsigned NOT NULL DEFAULT '0',
             `subject_match` tinyint(1) NOT NULL DEFAULT '0',
             KEY `search_matches_word_id_idx` (`word_id`),
             KEY `search_matches_post_id_idx` (`post_id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'search_words' => "CREATE TABLE %t% (
+        'search_words' => "CREATE TABLE IF NOT EXISTS %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `word` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
             PRIMARY KEY (`word`),
             KEY `search_words_id_idx` (`id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'topic_subscriptions' => "CREATE TABLE %t% (
+        'topic_subscriptions' => "CREATE TABLE IF NOT EXISTS %t% (
             `user_id` int(10) unsigned NOT NULL DEFAULT '0',
             `topic_id` int(10) unsigned NOT NULL DEFAULT '0',
             PRIMARY KEY (`user_id`,`topic_id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'topics' => "CREATE TABLE %t% (
+        'topics' => "CREATE TABLE IF NOT EXISTS %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `poster` varchar(200) NOT NULL DEFAULT '',
             `subject` varchar(255) NOT NULL DEFAULT '',
@@ -187,7 +187,7 @@ class install
             KEY `topics_last_post_idx` (`last_post`),
             KEY `topics_first_post_id_idx` (`first_post_id`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-        'users' => "CREATE TABLE %t% (
+        'users' => "CREATE TABLE IF NOT EXISTS %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `group_id` int(10) unsigned NOT NULL DEFAULT '3',
             `username` varchar(200) NOT NULL DEFAULT '',
@@ -240,20 +240,11 @@ public function __construct()
         $this->feather = \Slim\Slim::getInstance();
     }
 
-    public function is_installed()
-    {
-        $db = DB::get_db();
-        //$db->exec('SHOW TABLES like users');
-        return false;
-    }
-
     public function create_table($table_name, $sql)
     {
         $db = DB::get_db();
         $req = preg_replace('/%t%/', '`'.$table_name.'`', $sql);
-        $db->exec($req);
-        echo DB::get_last_query();
-        return true;
+        return $db->exec($req);
     }
 
     public function add_data($table_name, array $data)

From b8c2e522e8d7c354c9e462c405ed155308e4d719 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 17:18:11 +0200
Subject: [PATCH 069/353] Fix common language loading

---
 Slim/Extras/Middleware/FeatherBBAuth.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Slim/Extras/Middleware/FeatherBBAuth.php b/Slim/Extras/Middleware/FeatherBBAuth.php
index c75ad413..8cf86d5e 100644
--- a/Slim/Extras/Middleware/FeatherBBAuth.php
+++ b/Slim/Extras/Middleware/FeatherBBAuth.php
@@ -289,6 +289,7 @@ public function call()
 
         $this->authenticate();
 
+        load_textdomain('featherbb', $this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.mo');
         // Load cached bans
         if (file_exists($this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php')) {
             include $this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php';

From 9007c0461d5d867e082f5b815a26f52adb58c261 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Mon, 17 Aug 2015 17:23:04 +0200
Subject: [PATCH 070/353] Patch weird auto_increment

---
 model/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/model/install.php b/model/install.php
index 56427462..30d1c2ad 100644
--- a/model/install.php
+++ b/model/install.php
@@ -30,7 +30,7 @@ class install
             `cat_name` varchar(80) NOT NULL DEFAULT 'New Category',
             `disp_position` int(10) NOT NULL DEFAULT '0',
             PRIMARY KEY (`id`)
-        ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;",
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
         'censoring' => "CREATE TABLE IF NOT EXISTS %t% (
             `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
             `search_for` varchar(60) NOT NULL DEFAULT '',

From a698a7cc309a0651cd45210fc81e9066dbe9ca83 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Mon, 17 Aug 2015 22:32:23 +0200
Subject: [PATCH 071/353] Support multiple hooks and DB hooks

---
 Slim/Slim.php               | 58 +++++++++++++++++++++++++++++++++++--
 model/index.php             | 44 ++++++++++++++++------------
 plugins/test/plugintest.php | 17 ++++++++++-
 3 files changed, 97 insertions(+), 22 deletions(-)

diff --git a/Slim/Slim.php b/Slim/Slim.php
index 33ecc482..fa142a57 100644
--- a/Slim/Slim.php
+++ b/Slim/Slim.php
@@ -1206,14 +1206,68 @@ public function applyHook($name)
                 ksort($this->hooks[$name]);
             }
 
+            $output = array();
+            $count = 0;
+
+            foreach ($this->hooks[$name] as $priority) {
+                if (!empty($priority)) {
+                    foreach ($priority as $callable) {
+                        $output[] = call_user_func_array($callable, $args);
+                        ++$count;
+                    }
+                }
+            }
+
+            if ($count == 1) {
+                return $output[0];
+            }
+            else {
+                $data = array();
+                // Move all the keys to the same level
+                array_walk_recursive($output, function ($v, $k) use (&$data) {
+                    $data[] = $v;
+                });
+                array_merge_recursive($output);
+                // Remove any duplicate key
+                if (!is_object($data)) {
+                    $data = array_unique($data);
+                }
+                return $data;
+            }
+        }
+    }
+
+    /**
+     * Invoke hook for DB
+     * @param  string $name The hook name
+     * @param  mixed  ...   (Optional) Argument(s) for hooked functions, can specify multiple arguments
+     */
+    public function applyHookDB($name)
+    {
+        $args = func_get_args();
+        array_shift($args);
+
+        if (!isset($this->hooks[$name])) {
+            $this->hooks[$name] = array(array());
+            return $args[0];
+        }
+        if (!empty($this->hooks[$name])) {
+            // Sort by priority, low to high, if there's more than one priority
+            if (count($this->hooks[$name]) > 1) {
+                ksort($this->hooks[$name]);
+            }
+
+            $output = array();
+
             foreach ($this->hooks[$name] as $priority) {
                 if (!empty($priority)) {
                     foreach ($priority as $callable) {
-                        $output = call_user_func_array($callable, $args);
-                        return $output;
+                        $output[] = call_user_func_array($callable, $args);
                     }
                 }
             }
+
+            return $output[0];
         }
     }
 
diff --git a/model/index.php b/model/index.php
index da8e296e..439f9722 100644
--- a/model/index.php
+++ b/model/index.php
@@ -32,6 +32,8 @@ public function get_page_head()
             $page_head = array('feed' => '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;type=atom" title="'.__('Atom active topics feed').'" />');
         }
 
+        $page_head = $this->feather->applyHook('get_page_head', $page_head);
+
         return $page_head;
     }
 
@@ -67,7 +69,7 @@ public function get_new_posts()
             ->where_any_is($where_get_new_posts_any)
             ->where_gt('f.last_post', $this->user->last_visit)
             ->find_result_set();
-        
+
         $forums = $new_topics = array();
         $tracked_topics = get_tracked_topics();
 
@@ -80,7 +82,7 @@ public function get_new_posts()
         if (!empty($forums)) {
             if (empty($tracked_topics['topics'])) {
                 $new_topics = $forums;
-            } else {   
+            } else {
                 $select_get_new_posts_tracked_topics = array('forum_id', 'id', 'last_post');
 
                 $result = DB::for_table('topics')
@@ -108,14 +110,14 @@ public function print_categories_forums()
         if (!$this->user->is_guest) {
             $new_topics = $this->get_new_posts();
         }
-        
+
         $select_print_categories_forums = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.forum_desc', 'f.redirect_url', 'f.moderators', 'f.num_topics', 'f.num_posts', 'f.last_post', 'f.last_post_id', 'f.last_poster');
         $where_print_categories_forums = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
         $order_by_print_categories_forums = array('c.disp_position', 'c.id', 'f.disp_position');
-        
+
         $result = DB::for_table('categories')
             ->table_alias('c')
             ->select_many($select_print_categories_forums)
@@ -225,12 +227,12 @@ public function collect_stats()
             generate_users_info_cache();
             require FORUM_CACHE_DIR.'cache_users_info.php';
         }
-        
+
         $stats_query = DB::for_table('forums')
                         ->select_expr('SUM(num_topics)', 'total_topics')
                         ->select_expr('SUM(num_posts)', 'total_posts')
                         ->find_one();
-        
+
         $stats['total_topics'] = intval($stats_query['total_topics']);
         $stats['total_posts'] = intval($stats_query['total_posts']);
 
@@ -247,20 +249,23 @@ public function collect_stats()
     public function fetch_users_online()
     {
         // Fetch users online info and generate strings for output
-        $num_guests = 0;
+        $online['num_guests'] = 0;
         $online = array();
 
-        $select_fetch_users_online = array('user_id', 'ident');
-        $where_fetch_users_online = array('idle' => '0');
-        $order_by_fetch_users_online = array('ident');
-        
-        $result = DB::for_table('online')
-            ->select_many($select_fetch_users_online)
-            ->where($where_fetch_users_online)
-            ->order_by_many($order_by_fetch_users_online)
-            ->find_result_set();
+        $query['select'] = array('user_id', 'ident');
+        $query['where'] = array('idle' => '0');
+        $query['order_by'] = array('ident');
+
+        $query = DB::for_table('online')
+                    ->select_many($query['select'])
+                    ->where($query['where'])
+                    ->order_by_many($query['order_by']);
 
-        foreach($result as $user_online) {
+        $query = $this->feather->applyHook('query_fetch_users_online', $query);
+
+        $query = $query->find_result_set();
+
+        foreach($query as $user_online) {
             if ($user_online->user_id > 1) {
                 if ($this->user->g_view_users == '1') {
                     $online['users'][] = "\n\t\t\t\t".'<dd><a href="'.get_link('user/'.$user_online->user_id).'/">'.feather_escape($user_online->ident).'</a>';
@@ -268,7 +273,7 @@ public function fetch_users_online()
                     $online['users'][] = "\n\t\t\t\t".'<dd>'.feather_escape($user_online->ident);
                 }
             } else {
-                ++$num_guests;
+                ++$online['num_guests'];
             }
         }
 
@@ -277,7 +282,8 @@ public function fetch_users_online()
         } else {
             $online['num_users'] = 0;
         }
-        $online['num_guests'] = $num_guests;
+
+        $online = $this->feather->applyHook('fetch_users_online', $online);
 
         return $online;
     }
diff --git a/plugins/test/plugintest.php b/plugins/test/plugintest.php
index b277a8ea..f78024b2 100644
--- a/plugins/test/plugintest.php
+++ b/plugins/test/plugintest.php
@@ -21,8 +21,23 @@ public function __construct()
         $this->request = $this->feather->request;
 
         $this->feather->hook('get_forum_actions', function ($forum_actions) {
-            $forum_actions[] = '<a href="'.get_link('mark-read/').'">Test</a>';
+            $forum_actions[] = '<a href="'.get_link('mark-read/').'">Test1</a>';
             return $forum_actions;
         });
+
+        $this->feather->hook('get_forum_actions', function ($forum_actions) {
+            $forum_actions[] = '<a href="'.get_link('mark-read/').'">Test2</a>';
+            return $forum_actions;
+        });
+
+        $this->feather->hook('query_fetch_users_online', function ($query) {
+            $query = $query->limit(50);
+            return $query;
+        });
+
+        $this->feather->hook('query_fetch_users_online', function ($query) {
+            $query = $query->offset(50);
+            return $query;
+        });
     }
 }
\ No newline at end of file

From a614c1a495fd55785a2b0fd41fdc633a19f8849d Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Mon, 17 Aug 2015 22:41:36 +0200
Subject: [PATCH 072/353] Fix applyHookDB

---
 model/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/model/index.php b/model/index.php
index 439f9722..5758421d 100644
--- a/model/index.php
+++ b/model/index.php
@@ -249,8 +249,8 @@ public function collect_stats()
     public function fetch_users_online()
     {
         // Fetch users online info and generate strings for output
-        $online['num_guests'] = 0;
         $online = array();
+        $online['num_guests'] = 0;
 
         $query['select'] = array('user_id', 'ident');
         $query['where'] = array('idle' => '0');
@@ -261,7 +261,7 @@ public function fetch_users_online()
                     ->where($query['where'])
                     ->order_by_many($query['order_by']);
 
-        $query = $this->feather->applyHook('query_fetch_users_online', $query);
+        $query = $this->feather->applyHookDB('query_fetch_users_online', $query);
 
         $query = $query->find_result_set();
 

From cdec3fa13908d4e0679baa95b06db6dd8568d00a Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Tue, 18 Aug 2015 10:54:23 +0200
Subject: [PATCH 073/353] Restaure "focus element" feature

Add javascript to focus form elements + clean a bit Header controller
---
 controller/header.php           | 91 ++++++++++++++++-----------------
 controller/post.php             | 17 +++---
 include/cache.php               |  2 +-
 style/FeatherBB/view/header.php |  4 +-
 view/header.php                 |  2 +-
 5 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/controller/header.php b/controller/header.php
index c49878a1..edcbcb50 100644
--- a/controller/header.php
+++ b/controller/header.php
@@ -77,14 +77,45 @@ public function setPageHead($page_head)
 
     public function display()
     {
-        // START SUBST - <body> TODO
-        /*if (isset($focus_element)) {
-            $tpl_main = str_replace('<body onload="', '<body onload="document.getElementById(\''.$focus_element[0].'\').elements[\''.$focus_element[1].'\'].focus();', $tpl_main);
-            $tpl_main = str_replace('<body>', '<body onload="document.getElementById(\''.$focus_element[0].'\').elements[\''.$focus_element[1].'\'].focus()">', $tpl_main);
-        }*/
-        // END SUBST - <body>
-
-        // START SUBST - <pun_navlinks>
+        if (!defined('FEATHER_HEADER')) {
+            define('FEATHER_HEADER', 1);
+        }
+
+        // Render the header
+        $this->title = isset($this->title) ? $this->title : feather_escape($this->config['o_board_title']);
+
+        // Define $p if it's not set to avoid a PHP notice
+        $this->page = isset($this->page) ? $this->page : null;
+
+        // Set default safe values
+        $this->page_head = isset($this->page_head) ? $this->page_head : null;
+        $this->paging_links = isset($this->paging_links) ? $this->paging_links : null;
+        $this->required_fields = isset($this->required_fields) ? $this->required_fields : null;
+
+        $navlinks = $this->getNavlinks();
+        $page_info = $this->getStatus();
+
+        $focus_element = isset($this->focus_element) ? ' onload="document.getElementById(\''.$this->focus_element[0].'\').elements[\''.$this->focus_element[1].'\'].focus();"' : '';
+
+        $this->feather->render('header.php', array(
+                'page_title' => $this->title,
+                'p' => $this->page,
+                'feather_user' => $this->user,
+                'feather_config' => $this->config,
+                '_SERVER' => $_SERVER,
+                'page_head' => $this->page_head,
+                'paging_links' => $this->paging_links,
+                'required_fields' => $this->required_fields,
+                'feather' => $this->feather,
+                'focus_element' => $focus_element,
+                'navlinks' => $navlinks,
+                'page_info' => $page_info,
+            )
+        );
+    }
+
+    private function getNavlinks()
+    {
         $links = array();
 
         // Index should always be displayed
@@ -127,10 +158,12 @@ public function display()
         }
 
         $navlinks = '<div id="brdmenu" class="inbox">'."\n\t\t\t".'<ul>'."\n\t\t\t\t".implode("\n\t\t\t\t", $links)."\n\t\t\t".'</ul>'."\n\t\t".'</div>';
-        // END SUBST - <pun_navlinks>
 
+        return $navlinks;
+    }
 
-        // START SUBST - <pun_status>
+    private function getStatus()
+    {
         $page_statusinfo = $page_topicsearches = array();
 
         if ($this->user->is_guest) {
@@ -163,7 +196,6 @@ public function display()
             $page_topicsearches[] = '<a href="'.get_link('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
         }
 
-
         // Generate all that jazz
         $page_info = '<div id="brdwelcome" class="inbox">';
 
@@ -184,40 +216,7 @@ public function display()
         }
 
         $page_info .= "\n\t\t\t".'<div class="clearer"></div>'."\n\t\t".'</div>';
-        // END SUBST - <pun_status>
-
-
-        // START SUBST - <pun_main>
-
-        if (!defined('FEATHER_HEADER')) {
-            define('FEATHER_HEADER', 1);
-        }
-
-        // Render the header
-        $this->title = isset($this->title) ? $this->title : feather_escape($this->config['o_board_title']);
-
-        // Define $p if it's not set to avoid a PHP notice
-        $this->page = isset($this->page) ? $this->page : null;
 
-        $this->page_head = isset($this->page_head) ? $this->page_head : null;
-        $this->focus_element = isset($this->focus_element) ? $this->focus_element : null;
-        $this->paging_links = isset($this->paging_links) ? $this->paging_links : null;
-        $this->required_fields = isset($this->required_fields) ? $this->required_fields : null;
-
-        $this->feather->render('header.php', array(
-                'page_title' => $this->title,
-                'focus_element' => $this->focus_element,
-                'p' => $this->page,
-                'feather_user' => $this->user,
-                'feather_config' => $this->config,
-                '_SERVER'    =>    $_SERVER,
-                'page_head'        =>    $this->page_head,
-                'navlinks'        =>    $navlinks,
-                'page_info'        =>    $page_info,
-                'paging_links' => $this->paging_links,
-                'required_fields' => $this->required_fields,
-                'feather'    => $this->feather,
-            )
-        );
+        return $page_info;
     }
-}
\ No newline at end of file
+}
diff --git a/controller/post.php b/controller/post.php
index 2dcb6498..b5318867 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -78,13 +78,6 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         $post = '';
 
-        if (!$this->user->is_guest) {
-            $focus_element[] = ($fid) ? 'req_subject' : 'req_message';
-        } else {
-            $required_fields['req_username'] = __('Guest name');
-            $focus_element[] = 'req_username';
-        }
-
         // Did someone just hit "Submit" or "Preview"?
         if ($this->feather->request()->isPost()) {
 
@@ -182,7 +175,15 @@ public function newpost($fid = null, $tid = null, $qid = null)
         if ($this->user->is_guest) {
             $required_fields['captcha'] = __('Robot title');
         }
-        $focus_element = array('post');
+
+        // Set focus element (new post or new reply to an existing post ?)
+        $focus_element[] = 'post';
+        if (!$this->user->is_guest) {
+            $focus_element[] = ($fid) ? 'req_subject' : 'req_message';
+        } else {
+            $required_fields['req_username'] = __('Guest name');
+            $focus_element[] = 'req_username';
+        }
 
         define('FEATHER_ACTIVE_PAGE', 'post');
 
diff --git a/include/cache.php b/include/cache.php
index f9a56b8a..17312bd9 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -122,7 +122,7 @@ function generate_quickjump_cache($group_id = false)
                     $output .= "\t\t\t\t\t\t\t".'<option value="'.$cur_forum['fid'].'/'.url_friendly($cur_forum['forum_name']).'/'.'"<?php echo ($forum_id == '.$cur_forum['fid'].') ? \' selected="selected"\' : \'\' ?>>'.feather_escape($cur_forum['forum_name']).$redirect_tag.'</option>'."\n";
                 }
 
-                $output .= "\t\t\t\t\t\t".'</optgroup>'."\n\t\t\t\t\t".'</select></label>'."\n\t\t\t\t\t".'<input type="submit" value="<?php _e(\'Go\') ?>" accesskey="g" />'."\n\t\t\t\t\t".'</div>'."\n\t\t\t\t".'</form>'."\n";
+                $output .= "\t\t\t\t\t\t".'</optgroup>'."\n\t\t\t\t\t".'</select></label>'."\n\t\t\t\t\t".'<noscript><input type="submit" value="<?php _e(\'Go\') ?>" accesskey="g" /></noscript>'."\n\t\t\t\t\t".'</div>'."\n\t\t\t\t".'</form>'."\n";
             }
         }
 
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
index d045592b..352081e1 100644
--- a/style/FeatherBB/view/header.php
+++ b/style/FeatherBB/view/header.php
@@ -75,7 +75,7 @@ function process_form(the_form)
     ?>
 </head>
 
-<body id="pun<?php echo FEATHER_ACTIVE_PAGE ?>">
+<body id="pun<?php echo FEATHER_ACTIVE_PAGE ?>"<?= $focus_element; ?>>
 
 <header>
 
@@ -87,7 +87,7 @@ function process_form(the_form)
             <div id="phone">
                 <?php echo $navlinks ?>
                 <div class="navbar-right">
-                    <form method="get" action="search" class="nav-search">
+                    <form method="get" action="/search" class="nav-search">
                         <input type="hidden" name="action" value="search">
                         <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php _e('Search') ?>">
                     </form>
diff --git a/view/header.php b/view/header.php
index 7102cbb9..41c719af 100644
--- a/view/header.php
+++ b/view/header.php
@@ -73,7 +73,7 @@ function process_form(the_form)
 ?>
 </head>
 
-<body>
+<body<?= $focus_element; ?>>
 
 <div id="pun<?php echo FEATHER_ACTIVE_PAGE ?>" class="pun">
 <div class="top-box"></div>

From f6511d7d14e09f1dc5983c32d4760726e15266d0 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 18 Aug 2015 11:33:18 +0200
Subject: [PATCH 074/353] Restore db_prefix feature

---
 Slim/Extras/Middleware/FeatherBBLoader.php | 1 +
 controller/install.php                     | 6 ++++--
 include/idiorm.php                         | 6 ++++--
 style/FeatherBB/view/install.php           | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBBLoader.php b/Slim/Extras/Middleware/FeatherBBLoader.php
index dd318efc..beef72c7 100644
--- a/Slim/Extras/Middleware/FeatherBBLoader.php
+++ b/Slim/Extras/Middleware/FeatherBBLoader.php
@@ -117,6 +117,7 @@ public static function init_db(array $config)
         DB::configure('id_column_overrides', array(
             $config['db_prefix'].'groups' => 'g_id',
         ));
+        DB::configure('prefix', $config['db_prefix']);
     }
 
     // Getters / setters for Slim container (avoid magic get error)
diff --git a/controller/install.php b/controller/install.php
index cf5bc8b5..2ef9d71e 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -171,10 +171,12 @@ public function create_db(array $data)
         // Load appropriate language
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$data['default_lang'].'/install.mo');
 
+        // Handle db prefix
+        $data['db_prefix'] = (!empty($data['db_prefix'])) ? $data['db_prefix'] : '';
+
         // Create tables
         foreach ($this->model->get_database_scheme() as $table => $sql) {
-            $table = (!empty($data['db_prefix'])) ? $data['db_prefix'].$table : $table;
-            if (!$this->model->create_table($table, $sql)) {
+            if (!$this->model->create_table($data['db_prefix'].$table, $sql)) {
                 // Error handling
                 $this->errors[] = 'A problem was encountered while creating table '.$table;
             }
diff --git a/include/idiorm.php b/include/idiorm.php
index a7d7d348..2423f784 100644
--- a/include/idiorm.php
+++ b/include/idiorm.php
@@ -74,6 +74,7 @@ class DB implements ArrayAccess
             'caching' => false,
             'caching_auto_clear' => false,
             'return_result_sets' => false,
+            'prefix' => null, // Add prefix feature
         );
 
         // Map of configuration settings
@@ -238,8 +239,9 @@ public static function reset_config()
          */
         public static function for_table($table_name, $connection_name = self::DEFAULT_CONNECTION)
         {
-            $feather = \Slim\Slim::getInstance();
-            $table_name = $feather->forum_settings['db_prefix'].$table_name;
+            if (!empty(self::$_config[$connection_name]['prefix'])) {
+                $table_name = self::$_config[$connection_name]['prefix'].$table_name;
+            }
             self::_setup_db($connection_name);
             return new self($table_name, array(), $connection_name);
         }
diff --git a/style/FeatherBB/view/install.php b/style/FeatherBB/view/install.php
index 3338baaf..c146b1b7 100644
--- a/style/FeatherBB/view/install.php
+++ b/style/FeatherBB/view/install.php
@@ -156,7 +156,7 @@
                                             <div class="infldset">
                                                 <p><?php _e('Info 6') ?></p>
                                                 <label><?php _e('Table prefix') ?></label>
-                                                <input id="install[db_prefix]" type="text" name="db_prefix" size="20" maxlength="30" />
+                                                <input type="text" name="install[db_prefix]" size="20" maxlength="30" />
                                             </div>
                                         </fieldset>
                                     </div>

From b68dc04c21da17132f59c98a6586482762ca16a1 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 18 Aug 2015 11:42:12 +0200
Subject: [PATCH 075/353] Remove HTML in description

Regression, will be fixed soon
---
 controller/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controller/install.php b/controller/install.php
index 2ef9d71e..4a14d3e4 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -129,7 +129,7 @@ public function run()
             }
         } else {
             $data = array('title' => __('My FeatherBB Forum'),
-                          'description' => '<p><span>'.__('Description').'</span></p>',
+                          'description' => __('Description'),
                           'base_url' => $this->feather->request->getUrl().$this->feather->request->getRootUri(),
                           'default_lang' => $this->install_lang);
             if (isset($this->environment['slim.flash'])) {

From db3f1c0f408e3952fd4376a9287b3277a1317c19 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 18 Aug 2015 11:51:33 +0200
Subject: [PATCH 076/353] Add config format check

---
 Slim/Extras/Middleware/FeatherBBLoader.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBBLoader.php b/Slim/Extras/Middleware/FeatherBBLoader.php
index beef72c7..8c0acc88 100644
--- a/Slim/Extras/Middleware/FeatherBBLoader.php
+++ b/Slim/Extras/Middleware/FeatherBBLoader.php
@@ -97,9 +97,6 @@ public static function init_db(array $config)
         $config['db_prefix'] = (!empty($config['db_prefix'])) ? $config['db_prefix'] : '';
         switch ($config['db_type']) {
             case 'mysql':
-            case 'mysqli':
-            case 'mysql_innodb':
-            case 'mysqli_innodb':
                 DB::configure('mysql:host='.$config['db_host'].';dbname='.$config['db_name']);
                 DB::configure('driver_options', array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
                 break;
@@ -207,7 +204,6 @@ public function call()
         $this->hydrate('forum_env', $this->forum_env);
 
         if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) { // Block prefetch requests
-            $this->set_headers();
             return $this->app->response->setStatus(403); // Send forbidden header
         }
 
@@ -221,8 +217,8 @@ public function call()
         if (!is_null($config_file)) {
             $this->forum_settings = array_merge(self::load_default_forum_settings(), $config_file);
         } else {
-            // Erreur
-            echo 'Wrong config format';
+            $this->app->response->setStatus(500); // Send forbidden header
+            return $this->app->response->setBody('Wrong config file format');
         }
 
         // Init DB

From 025375b7c7107672a47babecedafca4f4ddac2d5 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Tue, 18 Aug 2015 12:06:58 +0200
Subject: [PATCH 077/353] Add more hooks

---
 model/index.php | 77 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 30 deletions(-)

diff --git a/model/index.php b/model/index.php
index 5758421d..23491abd 100644
--- a/model/index.php
+++ b/model/index.php
@@ -55,25 +55,28 @@ public function get_forum_actions()
     // Detects if a "new" icon has to be displayed
     public function get_new_posts()
     {   
-        $select_get_new_posts = array('f.id', 'f.last_post');
-        $where_get_new_posts_any = array(
+        $query['select'] = array('f.id', 'f.last_post');
+        $query['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
 
-        $result = DB::for_table('forums')
+        $query = DB::for_table('forums')
             ->table_alias('f')
-            ->select_many($select_get_new_posts)
+            ->select_many($query['select'])
             ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
             ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-            ->where_any_is($where_get_new_posts_any)
-            ->where_gt('f.last_post', $this->user->last_visit)
-            ->find_result_set();
+            ->where_any_is($query['where'])
+            ->where_gt('f.last_post', $this->user->last_visit);
+
+        $query = $this->feather->applyHookDB('query_get_new_posts', $query);
+
+        $query = $query->find_result_set();
 
         $forums = $new_topics = array();
         $tracked_topics = get_tracked_topics();
 
-        foreach ($result as $cur_forum) {
+        foreach ($query as $cur_forum) {
             if (!isset($tracked_topics['forums'][$cur_forum->id]) || $tracked_topics['forums'][$cur_forum->id] < $cur_forum->last_post) {
                 $forums[$cur_forum->id] = $cur_forum->last_post;
             }
@@ -83,16 +86,19 @@ public function get_new_posts()
             if (empty($tracked_topics['topics'])) {
                 $new_topics = $forums;
             } else {
-                $select_get_new_posts_tracked_topics = array('forum_id', 'id', 'last_post');
+                $query['select'] = array('forum_id', 'id', 'last_post');
 
-                $result = DB::for_table('topics')
-                    ->select_many($select_get_new_posts_tracked_topics)
+                $query = DB::for_table('topics')
+                    ->select_many($query['select'])
                     ->where_in('forum_id', array_keys($forums))
                     ->where_gt('last_post', $this->user->last_visit)
-                    ->where_null('moved_to')
-                    ->find_result_set();
+                    ->where_null('moved_to');
 
-                foreach ($result as $cur_topic) {
+                $query = $this->feather->applyHookDB('query_get_new_posts', $query);
+
+                $query = $query->find_result_set();
+
+                foreach ($query as $cur_topic) {
                     if (!isset($new_topics[$cur_topic->forum_id]) && (!isset($tracked_topics['forums'][$cur_topic->forum_id]) || $tracked_topics['forums'][$cur_topic->forum_id] < $forums[$cur_topic->forum_id]) && (!isset($tracked_topics['topics'][$cur_topic->id]) || $tracked_topics['topics'][$cur_topic->id] < $cur_topic->last_post)) {
                         $new_topics[$cur_topic->forum_id] = $forums[$cur_topic->forum_id];
                     }
@@ -100,7 +106,9 @@ public function get_new_posts()
             }
         }
 
-            return $new_topics;
+        $new_topics = $this->feather->applyHook('get_new_posts', $new_topics);
+
+        return $new_topics;
     }
 
     // Returns the elements needed to display categories and their forums
@@ -111,26 +119,29 @@ public function print_categories_forums()
             $new_topics = $this->get_new_posts();
         }
 
-        $select_print_categories_forums = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.forum_desc', 'f.redirect_url', 'f.moderators', 'f.num_topics', 'f.num_posts', 'f.last_post', 'f.last_post_id', 'f.last_poster');
-        $where_print_categories_forums = array(
+        $query['select'] = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.forum_desc', 'f.redirect_url', 'f.moderators', 'f.num_topics', 'f.num_posts', 'f.last_post', 'f.last_post_id', 'f.last_poster');
+        $query['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
-        $order_by_print_categories_forums = array('c.disp_position', 'c.id', 'f.disp_position');
+        $query['order_by'] = array('c.disp_position', 'c.id', 'f.disp_position');
 
-        $result = DB::for_table('categories')
+        $query = DB::for_table('categories')
             ->table_alias('c')
-            ->select_many($select_print_categories_forums)
+            ->select_many($query['select'])
             ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
             ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
             ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-            ->where_any_is($where_print_categories_forums)
-            ->order_by_many($order_by_print_categories_forums)
-            ->find_result_set();
+            ->where_any_is($query['where'])
+            ->order_by_many($query['order_by']);
+
+        $query = $this->feather->applyHookDB('query_print_categories_forums', $query);
+
+        $query = $query->find_result_set();
 
         $index_data = array();
         $i = 0;
-        foreach ($result as $cur_forum) {
+        foreach ($query as $cur_forum) {
             if ($i == 0) {
                 $cur_forum->cur_category = 0;
                 $cur_forum->forum_count_formatted = 0;
@@ -144,7 +155,6 @@ public function print_categories_forums()
 
             if ($cur_forum->cid != $cur_cat) {
                 // A new category since last iteration?
-
                 $cur_forum->forum_count_formatted = 0;
                 $cur_forum->cur_category = $cur_forum->cid;
             }
@@ -208,6 +218,8 @@ public function print_categories_forums()
             ++$i;
         }
 
+        $index_data = $this->feather->applyHook('print_categories_forums', $index_data);
+
         return $index_data;
     }
 
@@ -228,13 +240,16 @@ public function collect_stats()
             require FORUM_CACHE_DIR.'cache_users_info.php';
         }
 
-        $stats_query = DB::for_table('forums')
+        $query = DB::for_table('forums')
                         ->select_expr('SUM(num_topics)', 'total_topics')
-                        ->select_expr('SUM(num_posts)', 'total_posts')
-                        ->find_one();
+                        ->select_expr('SUM(num_posts)', 'total_posts');
 
-        $stats['total_topics'] = intval($stats_query['total_topics']);
-        $stats['total_posts'] = intval($stats_query['total_posts']);
+        $query = $this->feather->applyHookDB('collect_stats_query', $query);
+
+        $query = $query->find_one();
+
+        $stats['total_topics'] = intval($query['total_topics']);
+        $stats['total_posts'] = intval($query['total_posts']);
 
         if ($this->user->g_view_users == '1') {
             $stats['newest_user'] = '<a href="'.get_link('user/'.$stats['last_user']['id']).'/">'.feather_escape($stats['last_user']['username']).'</a>';
@@ -242,6 +257,8 @@ public function collect_stats()
             $stats['newest_user'] = feather_escape($stats['last_user']['username']);
         }
 
+        $stats = $this->feather->applyHook('collect_stats', $stats);
+
         return $stats;
     }
 

From 03db4200bbb0bda77d6fdc73172c60f1be27346a Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Tue, 18 Aug 2015 12:15:56 +0200
Subject: [PATCH 078/353] Simplify applyHook

---
 Slim/Slim.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Slim/Slim.php b/Slim/Slim.php
index fa142a57..e6829d56 100644
--- a/Slim/Slim.php
+++ b/Slim/Slim.php
@@ -1227,11 +1227,8 @@ public function applyHook($name)
                 array_walk_recursive($output, function ($v, $k) use (&$data) {
                     $data[] = $v;
                 });
-                array_merge_recursive($output);
                 // Remove any duplicate key
-                if (!is_object($data)) {
-                    $data = array_unique($data);
-                }
+                $data = array_unique($data);
                 return $data;
             }
         }

From cb35bef39d1bbc27fc5bbc325ac5c1db3f28054c Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 18 Aug 2015 12:33:32 +0200
Subject: [PATCH 079/353] Patch feather_setcookie helper

---
 include/functions.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 3408f44e..97b8f951 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -96,15 +96,13 @@ function get_admin_ids()
 //
 function feather_setcookie($user_id, $password, $expires)
 {
-    global $cookie_name, $cookie_seed;
-
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
     $cookie_data = array('user_id' => $user_id,
-        'password_hash' => hash_hmac('sha1', $password, $cookie_seed.'_password_hash'),
+        'password_hash' => hash_hmac('sha1', $password, $feather->forum_settings['cookie_seed'].'_password_hash'),
         'expires' => $expires,
-        'checksum' => hash_hmac('sha1', $user_id.$expires, $cookie_seed.'_checksum'));
-    $feather->setCookie($cookie_name, json_encode($cookie_data), $expires);
+        'checksum' => hash_hmac('sha1', $user_id.$expires, $feather->forum_settings['cookie_seed'].'_checksum'));
+    $feather->setCookie($feather->forum_settings['cookie_name'], json_encode($cookie_data), $expires);
 }
 
 
@@ -1277,4 +1275,4 @@ function display_saved_queries()
 </div>
 <?php
 
-}
\ No newline at end of file
+}

From 39b7890b576c62c946d83cbceea668447da9d9d6 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 18 Aug 2015 12:33:49 +0200
Subject: [PATCH 080/353] Add now() feature

---
 Slim/Extras/Middleware/FeatherBBLoader.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Slim/Extras/Middleware/FeatherBBLoader.php b/Slim/Extras/Middleware/FeatherBBLoader.php
index 8c0acc88..8e870102 100644
--- a/Slim/Extras/Middleware/FeatherBBLoader.php
+++ b/Slim/Extras/Middleware/FeatherBBLoader.php
@@ -199,6 +199,10 @@ public function call()
 
         // Record start time
         $this->app->start = get_microtime();
+        // Define now var
+        $this->app->now = function () {
+            return time();
+        };
 
         // Populate FeatherBB Slim object with forum_env vars
         $this->hydrate('forum_env', $this->forum_env);

From 8332ed443b61cf67617d0f72464f6c6dd650ede4 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 18 Aug 2015 12:39:04 +0200
Subject: [PATCH 081/353] Start to refactor FeatherBBAuth middleware

---
 Slim/Extras/Middleware/FeatherBBAuth.php | 184 +++++++++--------------
 model/auth.php                           |  40 +++++
 2 files changed, 113 insertions(+), 111 deletions(-)
 create mode 100644 model/auth.php

diff --git a/Slim/Extras/Middleware/FeatherBBAuth.php b/Slim/Extras/Middleware/FeatherBBAuth.php
index 8cf86d5e..2ce16203 100644
--- a/Slim/Extras/Middleware/FeatherBBAuth.php
+++ b/Slim/Extras/Middleware/FeatherBBAuth.php
@@ -16,127 +16,35 @@
 
 class FeatherBBAuth extends \Slim\Middleware
 {
+    protected $model;
+
     public function __construct()
 	{
+        $this->model = new \model\auth();
     }
 
-    public function authenticate()
+    public function get_cookie_data($cookie_name, $cookie_seed)
     {
-        $now = time();
-
         // Get FeatherBB cookie
-        $cookie_raw = $this->app->getCookie($this->app->forum_settings['cookie_name']);
+        $cookie_raw = $this->app->getCookie($cookie_name);
         // Check if cookie exists and is valid (getCookie method returns false if the data has been tampered locally so it can't decrypt the cookie);
         if (isset($cookie_raw)) {
             $cookie = json_decode($cookie_raw, true);
-            $checksum = hash_hmac('sha1', $cookie['user_id'].$cookie['expires'], $this->app->forum_settings['cookie_seed'].'_checksum');
-            // If cookie has a non-guest user, hasn't expired and is legit
-            if ($cookie['user_id'] > 1 && $cookie['expires'] > $now && $checksum == $cookie['checksum']) {
-                // Get user info from db
-                $select_check_cookie = array('u.*', 'g.*', 'o.logged', 'o.idle');
-                $where_check_cookie = array('u.id' => intval($cookie['user_id']));
-
-                $result = DB::for_table('users')
-                    ->table_alias('u')
-                    ->select_many($select_check_cookie)
-                    ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
-                    ->left_outer_join('online', array('o.user_id', '=', 'u.id'), 'o')
-                    ->where($where_check_cookie)
-                    ->find_result_set();
-
-                foreach ($result as $this->app->user);
-
-                // Another security check, to prevent identity fraud by changing the user id in the cookie) (might be useless considering the strength of encryption)
-                if (isset($this->app->user->id) && hash_hmac('sha1', $this->app->user->password, $this->app->forum_settings['cookie_seed'].'_password_hash') === $cookie['password_hash']) {
-                    $expires = ($cookie['expires'] > $now + $this->app->forum_settings['o_timeout_visit']) ? $now + 1209600 : $now + $this->app->forum_settings['o_timeout_visit'];
-                    $this->app->user->is_guest = false;
-                    $this->app->user->is_admmod = $this->app->user->g_id == $this->app->forum_env['FEATHER_ADMIN'] || $this->app->g_moderator == '1';
-                    if (!$this->app->user->disp_topics) {
-                        $this->app->user->disp_topics = $this->app->forum_settings['o_disp_topics_default'];
-                    }
-                    if (!$this->app->user->disp_posts) {
-                        $this->app->user->disp_posts = $this->app->forum_settings['o_disp_posts_default'];
-                    }
-                    if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language)) {
-                        $this->app->user->language = $this->app->forum_settings['o_default_lang'];
-                    }
-                    if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'style/'.$this->app->user->style.'.css')) {
-                        $this->app->user->style = $this->app->forum_settings['o_default_style'];
-                    }
-                    feather_setcookie($this->app->user->id, $this->app->user->password, $expires);
-                    $this->update_online();
-                    return true;
-                }
-            }
-        }
-
-        // If there is no cookie, or cookie is guest or expired, let's reconnect.
-        $expires = $now + 31536000; // The cookie expires after a year
-
-        // Fetch guest user
-        $select_set_default_user = array('u.*', 'g.*', 'o.logged', 'o.last_post', 'o.last_search');
-        $where_set_default_user = array('u.id' => '1');
-
-        $result = DB::for_table('users')
-            ->table_alias('u')
-            ->select_many($select_set_default_user)
-            ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
-            ->left_outer_join('online', array('o.ident', '=', $this->app->request->getIp()), 'o', true)
-            ->where($where_set_default_user)
-            ->find_result_set();
-
-        if (!$result) {
-            exit('Unable to fetch guest information. Your database must contain both a guest user and a guest user group.');
-        }
-
-        foreach ($result as $this->app->user);
-
-        $this->app->user->disp_topics = $this->app->forum_settings['o_disp_topics_default'];
-        $this->app->user->disp_posts = $this->app->forum_settings['o_disp_posts_default'];
-        $this->app->user->timezone = $this->app->forum_settings['o_default_timezone'];
-        $this->app->user->dst = $this->app->forum_settings['o_default_dst'];
-        $this->app->user->language = $this->app->forum_settings['o_default_lang'];
-        $this->app->user->style = $this->app->forum_settings['o_default_style'];
-        $this->app->user->is_guest = true;
-        $this->app->user->is_admmod = false;
-
-        // Update online list
-        if (!$this->app->user->logged) {
-            $this->app->user->logged = time();
-
-            // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
-            switch ($this->app->forum_settings['db_type']) {
-                case 'mysql':
-                case 'mysqli':
-                case 'mysql_innodb':
-                case 'mysqli_innodb':
-                case 'sqlite':
-                case 'sqlite3':
-                DB::for_table('online')->raw_execute('REPLACE INTO '.$this->app->forum_settings['db_prefix'].'online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
-                    break;
-
-                default:
-                    DB::for_table('online')->raw_execute('INSERT INTO '.$this->app->forum_settings['db_prefix'].'online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE ident=:ident)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
-                    break;
+            $checksum = hash_hmac('sha1', $cookie['user_id'].$cookie['expires'], $cookie_seed.'_checksum');
+            if ($cookie['user_id'] > 1 && $cookie['expires'] > $this->app->now && $checksum == $cookie['checksum']) {
+                return $cookie;
             }
-        } else {
-            DB::for_table('online')->where('ident', $this->app->request->getIp())
-                 ->update_many('logged', time());
         }
-
-        feather_setcookie(1, feather_hash(uniqid(rand(), true)), $expires);
-        return true;
+        return false;
     }
 
     public function update_online()
     {
-        $now = time();
-
         // Define this if you want this visit to affect the online list and the users last visit data
         if (!defined('FEATHER_QUIET_VISIT')) {
             // Update the online list
             if (!$this->app->user->logged) {
-                $this->app->user->logged = $now;
+                $this->app->user->logged = $this->app->now;
 
                 // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
                 switch ($this->app->forum_settings['db_type']) {
@@ -159,7 +67,7 @@ public function update_online()
 
             } else {
                 // Special case: We've timed out, but no other user has browsed the forums since we timed out
-                if ($this->app->user->logged < ($now-$this->app->forum_settings['o_timeout_visit'])) {
+                if ($this->app->user->logged < ($this->app->now-$this->app->forum_settings['o_timeout_visit'])) {
                     DB::for_table('users')->where('id', $this->app->user->id)
                         ->find_one()
                         ->set('last_visit', $this->app->user->logged)
@@ -169,7 +77,7 @@ public function update_online()
 
                 $idle_sql = ($this->app->user->idle == '1') ? ', idle=0' : '';
 
-                DB::for_table('online')->raw_execute('UPDATE '.$this->app->forum_settings['db_prefix'].'online SET logged='.$now.$idle_sql.' WHERE user_id=:user_id', array(':user_id' => $this->app->user->id));
+                DB::for_table('online')->raw_execute('UPDATE '.$this->app->forum_settings['db_prefix'].'online SET logged='.$this->app->now.$idle_sql.' WHERE user_id=:user_id', array(':user_id' => $this->app->user->id));
 
                 // Update tracked topics with the current expire time
                 $cookie_tracked_topics = $this->app->getCookie($this->app->forum_settings['cookie_name'].'_track');
@@ -186,13 +94,11 @@ public function update_online()
 
     public function update_users_online()
     {
-        $now = time();
-
         // Fetch all online list entries that are older than "o_timeout_online"
         $select_update_users_online = array('user_id', 'ident', 'logged', 'idle');
 
         $result = \DB::for_table('online')->select_many($select_update_users_online)
-            ->where_lt('logged', $now-$this->app->forum_settings['o_timeout_online'])
+            ->where_lt('logged', $this->app->now-$this->app->forum_settings['o_timeout_online'])
             ->find_many();
 
         foreach ($result as $cur_user) {
@@ -202,7 +108,7 @@ public function update_users_online()
                     ->delete_many();
             } else {
                 // If the entry is older than "o_timeout_visit", update last_visit for the user in question, then delete him/her from the online list
-                if ($cur_user['logged'] < ($now-$this->app->forum_settings['o_timeout_visit'])) {
+                if ($cur_user['logged'] < ($this->app->now-$this->app->forum_settings['o_timeout_visit'])) {
                     \DB::for_table('users')->where('id', $cur_user['user_id'])
                         ->find_one()
                         ->set('last_visit', $cur_user['logged'])
@@ -285,9 +191,65 @@ public function check_bans()
 
     public function call()
     {
-        global $feather_bans, $cookie_name, $cookie_seed;
+        global $feather_bans;
 
-        $this->authenticate();
+        if ($cookie = $this->get_cookie_data($this->app->forum_settings['cookie_name'], $this->app->forum_settings['cookie_seed'])) {
+            $this->app->user = $this->model->load_user($cookie['user_id']);
+            $expires = ($cookie['expires'] > $this->app->now + $this->app->forum_settings['o_timeout_visit']) ? $this->app->now + 1209600 : $this->app->now + $this->app->forum_settings['o_timeout_visit'];
+            $this->app->user->is_guest = false;
+            $this->app->user->is_admmod = $this->app->user->g_id == $this->app->forum_env['FEATHER_ADMIN'] || $this->app->g_moderator == '1';
+            if (!$this->app->user->disp_topics) {
+                $this->app->user->disp_topics = $this->app->forum_settings['o_disp_topics_default'];
+            }
+            if (!$this->app->user->disp_posts) {
+                $this->app->user->disp_posts = $this->app->forum_settings['o_disp_posts_default'];
+            }
+            if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language)) {
+                $this->app->user->language = $this->app->forum_settings['o_default_lang'];
+            }
+            if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'style/'.$this->app->user->style.'.css')) {
+                $this->app->user->style = $this->app->forum_settings['o_default_style'];
+            }
+            feather_setcookie($this->app->user->id, $this->app->user->password, $expires);
+            $this->update_online();
+        } else {
+            $this->app->user = $this->model->load_user(1);
+
+            $this->app->user->disp_topics = $this->app->forum_settings['o_disp_topics_default'];
+            $this->app->user->disp_posts = $this->app->forum_settings['o_disp_posts_default'];
+            $this->app->user->timezone = $this->app->forum_settings['o_default_timezone'];
+            $this->app->user->dst = $this->app->forum_settings['o_default_dst'];
+            $this->app->user->language = $this->app->forum_settings['o_default_lang'];
+            $this->app->user->style = $this->app->forum_settings['o_default_style'];
+            $this->app->user->is_guest = true;
+            $this->app->user->is_admmod = false;
+
+            // Update online list
+            if (!$this->app->user->logged) {
+                $this->app->user->logged = time();
+
+                // With MySQL/MySQLi/SQLite, REPLACE INTO avoids a user having two rows in the online table
+                switch ($this->app->forum_settings['db_type']) {
+                    case 'mysql':
+                    case 'mysqli':
+                    case 'mysql_innodb':
+                    case 'mysqli_innodb':
+                    case 'sqlite':
+                    case 'sqlite3':
+                    DB::for_table('online')->raw_execute('REPLACE INTO '.$this->app->forum_settings['db_prefix'].'online (user_id, ident, logged) VALUES(1, :ident, :logged)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
+                        break;
+
+                    default:
+                        DB::for_table('online')->raw_execute('INSERT INTO '.$this->app->forum_settings['db_prefix'].'online (user_id, ident, logged) SELECT 1, :ident, :logged WHERE NOT EXISTS (SELECT 1 FROM '.$this->app->db->prefix.'online WHERE ident=:ident)', array(':ident' => $this->app->request->getIp(), ':logged' => $this->app->user->logged));
+                        break;
+                }
+            } else {
+                DB::for_table('online')->where('ident', $this->app->request->getIp())
+                     ->update_many('logged', time());
+            }
+
+            feather_setcookie(1, feather_hash(uniqid(rand(), true)), $this->app->now + 31536000);
+        }
 
         load_textdomain('featherbb', $this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.mo');
         // Load cached bans
@@ -311,7 +273,7 @@ public function call()
         $this->update_users_online();
 
         // Configure Slim
-        $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? FEATHER_ROOT.'style/'.$this->app->user->style.'/view' : FEATHER_ROOT.'view');
+        $this->app->config('templates.path', $this->app->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
         $this->next->call();
     }
 }
diff --git a/model/auth.php b/model/auth.php
new file mode 100644
index 00000000..15b896a2
--- /dev/null
+++ b/model/auth.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace model;
+use DB;
+
+class auth
+{
+    public function __construct()
+    {
+        $this->feather = \Slim\Slim::getInstance();
+    }
+
+    public function load_user($user_id)
+    {
+        $user_id = (int) $user_id;
+        $select_load_user = array('u.*', 'g.*', 'o.logged', 'o.idle');
+        $where_load_user = array('u.id' => $user_id);
+        $left_outer_join_load_user = ($user_id == 1) ? $this->feather->request->getIp() : 'u.id';
+        $escape = ($user_id == 1) ? true : false;
+
+        $result = DB::for_table('users')
+            ->table_alias('u')
+            ->select_many($select_load_user)
+            ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
+            ->left_outer_join('online', array('o.user_id', '=', $left_outer_join_load_user), 'o', $escape)
+            ->where($where_load_user)
+            ->find_result_set();
+
+        foreach ($result as $user) {
+            return $user;
+        }
+    }
+}

From dcb8812f366d41cf2034f843a5bf836831b7f5f9 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 18 Aug 2015 12:58:07 +0200
Subject: [PATCH 082/353] Patch FEATHER_ROOT init

---
 Slim/Extras/Middleware/FeatherBBLoader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Slim/Extras/Middleware/FeatherBBLoader.php b/Slim/Extras/Middleware/FeatherBBLoader.php
index 8e870102..660f9825 100644
--- a/Slim/Extras/Middleware/FeatherBBLoader.php
+++ b/Slim/Extras/Middleware/FeatherBBLoader.php
@@ -27,7 +27,7 @@ class FeatherBBLoader extends \Slim\Middleware
 	public function __construct(array $data)
 	{
         // Define some core variables
-        $this->forum_env['FEATHER_ROOT'] = realpath(dirname(__FILE__). '../../../');
+        $this->forum_env['FEATHER_ROOT'] = realpath(dirname(__FILE__).'/../../../').'/';
         $this->forum_env['FORUM_CACHE_DIR'] = is_writable($this->forum_env['FEATHER_ROOT'].$data['cache_dir']) ? realpath($this->forum_env['FEATHER_ROOT'].$data['cache_dir']).'/' : null;
         $this->forum_env['FORUM_CONFIG_FILE'] = is_file($this->forum_env['FEATHER_ROOT'].$data['config_file']) ? realpath($this->forum_env['FEATHER_ROOT'].$data['config_file']) : null;
         // Populate forum_env

From a5c586660d5f55a428a8927470490d525779ee51 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 18 Aug 2015 13:31:36 +0200
Subject: [PATCH 083/353] Various fixes

---
 .gitignore             | 1 -
 .htaccess              | 3 +++
 controller/install.php | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 .htaccess

diff --git a/.gitignore b/.gitignore
index 57908133..daf8a988 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@ include/config.php
 .idea/
 nbproject/
 lang/French
-.htaccess
\ No newline at end of file
diff --git a/.htaccess b/.htaccess
new file mode 100644
index 00000000..a7b90e2c
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,3 @@
+RewriteEngine On
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^ index.php [QSA,L]
\ No newline at end of file
diff --git a/controller/install.php b/controller/install.php
index 4a14d3e4..2eab5c81 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -128,9 +128,10 @@ public function run()
                 $this->create_config($data);
             }
         } else {
+            $base_url = str_replace('index.php', '', $this->feather->request->getUrl().$this->feather->request->getRootUri());
             $data = array('title' => __('My FeatherBB Forum'),
                           'description' => __('Description'),
-                          'base_url' => $this->feather->request->getUrl().$this->feather->request->getRootUri(),
+                          'base_url' => $base_url,
                           'default_lang' => $this->install_lang);
             if (isset($this->environment['slim.flash'])) {
                 $this->feather->view()->set('flash', $this->environment['slim.flash']);
@@ -193,6 +194,9 @@ public function create_db(array $data)
         $this->model->add_mock_forum($this->model->load_mock_forum_data($data));
         // Store config in DB
         $this->model->save_config($this->load_default_config($data));
+
+        // Redirect to homepage
+        redirect(get_link('/'));
     }
 
     public function write_config($json)

From 803a982e1d223d775ed36164ce9dea4c4485a733 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 18 Aug 2015 15:19:08 +0200
Subject: [PATCH 084/353] Restore .htaccess feature

---
 .gitignore                      |  1 +
 .htaccess                       |  2 +-
 .htaccess.dist                  |  3 +++
 controller/install.php          | 11 +++++++++++
 style/FeatherBB/view/header.php |  2 +-
 5 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 .htaccess.dist

diff --git a/.gitignore b/.gitignore
index daf8a988..b1fc652e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ include/config.php
 .idea/
 nbproject/
 lang/French
+.htaccess
diff --git a/.htaccess b/.htaccess
index a7b90e2c..51c6beec 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,3 +1,3 @@
 RewriteEngine On
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^ index.php [QSA,L]
\ No newline at end of file
+RewriteRule ^ index.php [QSA,L]
diff --git a/.htaccess.dist b/.htaccess.dist
new file mode 100644
index 00000000..51c6beec
--- /dev/null
+++ b/.htaccess.dist
@@ -0,0 +1,3 @@
+RewriteEngine On
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^ index.php [QSA,L]
diff --git a/controller/install.php b/controller/install.php
index 2eab5c81..67256fd8 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -195,6 +195,11 @@ public function create_db(array $data)
         // Store config in DB
         $this->model->save_config($this->load_default_config($data));
 
+        // Handle .htaccess
+        if (function_exists('apache_get_modules') && in_array('mod_rewrite', apache_get_modules())) {
+            $this->write_htaccess();
+        }
+        
         // Redirect to homepage
         redirect(get_link('/'));
     }
@@ -204,6 +209,12 @@ public function write_config($json)
         return file_put_contents($this->feather->forum_env['FEATHER_ROOT'].$this->config_file, $json);
     }
 
+    public function write_htaccess()
+    {
+        $data = file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'.htaccess.dist');
+        return file_put_contents($this->feather->forum_env['FEATHER_ROOT'].'.htaccess', $data);
+    }
+
     public function load_default_config(array $data)
     {
         return array(
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
index 352081e1..15bad5d7 100644
--- a/style/FeatherBB/view/header.php
+++ b/style/FeatherBB/view/header.php
@@ -102,7 +102,7 @@ function process_form(the_form)
                 <a href="<?php echo get_base_url() ?>" title="" class="site-name">
                     <p><?php echo feather_escape($feather_config['o_board_title']) ?></p>
                 </a>
-                <div id="brddesc"><?php echo $feather_config['o_board_desc'] ?></div>
+                <div id="brddesc"><?php echo htmlspecialchars_decode($feather_config['o_board_desc']) ?></div>
             </h1>
             <div class="status-avatar">
                 <?php echo $page_info ?>

From ff2f9e5486e98b00458809ca8af36d734e980405 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 18 Aug 2015 15:33:49 +0200
Subject: [PATCH 085/353] Patch add forum feature in empty category

---
 controller/admin/forums.php                        | 12 +++++++-----
 model/admin/forums.php                             |  6 +++---
 style/FeatherBB/view/admin/forums/admin_forums.php | 12 ++++++------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index e71517f5..38577a3f 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -100,8 +100,8 @@ public function edit_forum($forum_id)
                     $permissions_data['post_replies'] = (isset($this->request->post('post_replies_new')[$perm_group['g_id']])) ? '1' : '0';
                     $permissions_data['post_topics'] = (isset($this->request->post('post_topics_new')[$perm_group['g_id']])) ? '1' : '0';
                     // Check if the new settings differ from the old
-                    if ($permissions_data['read_forum'] != $this->request->post('read_forum_old')[$perm_group['g_id']] || 
-                        $permissions_data['post_replies'] != $this->request->post('post_replies_old')[$perm_group['g_id']] || 
+                    if ($permissions_data['read_forum'] != $this->request->post('read_forum_old')[$perm_group['g_id']] ||
+                        $permissions_data['post_replies'] != $this->request->post('post_replies_old')[$perm_group['g_id']] ||
                         $permissions_data['post_topics'] != $this->request->post('post_topics_old')[$perm_group['g_id']]) {
                             // If there is no group permissions override for this forum
                             if ($permissions_data['read_forum'] == '1' && $permissions_data['post_replies'] == $perm_group['g_post_replies'] && $permissions_data['post_topics'] == $perm_group['g_post_topics']) {
@@ -120,7 +120,7 @@ public function edit_forum($forum_id)
                 generate_quickjump_cache();
 
                 redirect(get_link('admin/forums/edit/'.$forum_id.'/'), __('Forum updated redirect'));
-                
+
             } elseif ($this->request->post('revert_perms')) {
                 $this->model->delete_permissions($forum_id);
 
@@ -195,7 +195,7 @@ public function delete_forum($forum_id)
             $this->footer->display();
         }
     }
-    
+
     // -- //
 
     public function edit_positions()
@@ -214,7 +214,7 @@ public function edit_positions()
 
         redirect(get_link('admin/forums/'), __('Forums updated redirect'));
     }
-    
+
     public function display()
     {
         if ($this->user->g_id != FEATHER_ADMIN) {
@@ -235,8 +235,10 @@ public function display()
 
         generate_admin_menu('forums');
 
+        $categories_model = new \model\admin\categories();
         $this->feather->render('admin/forums/admin_forums.php', array(
                 'feather_config' => $this->config,
+                'cat_list'      => $categories_model->get_cat_list(),
                 'forum_data'    =>  $this->model->get_forums(),
                 'cur_index'     =>  4,
             )
diff --git a/model/admin/forums.php b/model/admin/forums.php
index e5c62007..eb332bbe 100644
--- a/model/admin/forums.php
+++ b/model/admin/forums.php
@@ -21,9 +21,9 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
     }
- 
+
     //
-    // Forum 
+    // Forum
     //
 
     public function add_forum($cat_id, $forum_name)
@@ -192,7 +192,7 @@ public function update_permissions(array $permissions_data)
 
     }
 
-    public function delete_permissions($forum_id, $group_id = null) 
+    public function delete_permissions($forum_id, $group_id = null)
     {
         $result = DB::for_table('forum_perms')
                     ->where('forum_id', $forum_id);
diff --git a/style/FeatherBB/view/admin/forums/admin_forums.php b/style/FeatherBB/view/admin/forums/admin_forums.php
index 027ebd88..e966e6f5 100644
--- a/style/FeatherBB/view/admin/forums/admin_forums.php
+++ b/style/FeatherBB/view/admin/forums/admin_forums.php
@@ -6,20 +6,20 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
 }
 ?>
-	
+
 	<div class="blockform">
 		<h2><span><?php _e('Add forum head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/forums/add') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
-if (!empty($forum_data)) {
+if (!empty($cat_list)) {
     ?>
 				<div class="inform">
 					<fieldset>
@@ -30,8 +30,8 @@
 									<th scope="row"><?php _e('Add forum label') ?><div><input type="submit" value="<?php _e('Add forum') ?>" tabindex="2" /></div></th>
 									<td>
 										<select name="cat" tabindex="1">
-											<?php  foreach ($forum_data as $cat_id => $cat_data) {
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'">'.feather_escape($cat_data['cat_name']).'</option>'."\n";
+											<?php  foreach ($cat_list as $cat) {
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.feather_escape($cat['cat_name']).'</option>'."\n";
 											} ?>
 										</select>
 										<span><?php _e('Add forum help') ?></span>
@@ -111,4 +111,4 @@
 </div>
 <?php
 	}
-?>
\ No newline at end of file
+?>

From a03c5bc35c8a755d4fd86777671932b11f77d4e5 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 18 Aug 2015 16:27:51 +0200
Subject: [PATCH 086/353] Tweak debug mode

---
 Slim/Extras/Middleware/FeatherBBLoader.php | 31 +++++++++++++---------
 index.php                                  |  6 ++---
 style/FeatherBB/view/footer.php            |  4 +--
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBBLoader.php b/Slim/Extras/Middleware/FeatherBBLoader.php
index 660f9825..07345f12 100644
--- a/Slim/Extras/Middleware/FeatherBBLoader.php
+++ b/Slim/Extras/Middleware/FeatherBBLoader.php
@@ -26,10 +26,16 @@ class FeatherBBLoader extends \Slim\Middleware
 
 	public function __construct(array $data)
 	{
+        // Handle empty values in data
+        $data = array_merge(array('config_file' => 'include/config.php',
+                                  'cache_dir' => 'cache/',
+                                  'debug'   => false), $data);
         // Define some core variables
         $this->forum_env['FEATHER_ROOT'] = realpath(dirname(__FILE__).'/../../../').'/';
         $this->forum_env['FORUM_CACHE_DIR'] = is_writable($this->forum_env['FEATHER_ROOT'].$data['cache_dir']) ? realpath($this->forum_env['FEATHER_ROOT'].$data['cache_dir']).'/' : null;
         $this->forum_env['FORUM_CONFIG_FILE'] = is_file($this->forum_env['FEATHER_ROOT'].$data['config_file']) ? realpath($this->forum_env['FEATHER_ROOT'].$data['config_file']) : null;
+        $this->forum_env['FEATHER_DEBUG'] = $this->forum_env['FEATHER_SHOW_QUERIES'] = ($data['debug'] == 'all');
+        $this->forum_env['FEATHER_SHOW_INFO'] = ($data['debug'] == 'info' || $data['debug'] == 'all');
         // Populate forum_env
         $this->forum_env = array_merge(self::load_default_forum_env(), $this->forum_env);
         $this->env_to_globals($this->forum_env); // Legacy
@@ -43,8 +49,6 @@ public function __construct(array $data)
 
         // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
         setlocale(LC_CTYPE, 'C');
-        // Reset opcache while debugging
-        opcache_reset();
 	}
 
     public static function load_default_forum_env()
@@ -68,9 +72,9 @@ public static function load_default_forum_env()
                 'FEATHER_SEARCH_MIN_WORD' => 3,
                 'FEATHER_SEARCH_MAX_WORD' => 20,
                 'FORUM_MAX_COOKIE_SIZE' => 4048,
-                'FEATHER_DEBUG' => 1,
-                'FEATHER_SHOW_QUERIES' => 1,
-                'FEATHER_CACHE_QUERIES' => 0,
+                'FEATHER_DEBUG' => false,
+                'FEATHER_SHOW_QUERIES' => false,
+                'FEATHER_SHOW_INFO' => false
                 );
     }
 
@@ -87,12 +91,10 @@ public static function load_default_forum_settings()
                 // Cookies
                 'cookie_name' => 'feather_cookie',
                 'cookie_seed' => 'changeme', // MUST BE CHANGED !!!
-                // Debug
-                'debug' => false,
                 );
     }
 
-    public static function init_db(array $config)
+    public static function init_db(array $config, $log_queries = false)
     {
         $config['db_prefix'] = (!empty($config['db_prefix'])) ? $config['db_prefix'] : '';
         switch ($config['db_type']) {
@@ -110,11 +112,13 @@ public static function init_db(array $config)
         }
         DB::configure('username', $config['db_user']);
         DB::configure('password', $config['db_pass']);
-        DB::configure('logging', true);
+        DB::configure('prefix', $config['db_prefix']);
+        if ($log_queries) {
+            DB::configure('logging', true);
+        }
         DB::configure('id_column_overrides', array(
             $config['db_prefix'].'groups' => 'g_id',
         ));
-        DB::configure('prefix', $config['db_prefix']);
     }
 
     // Getters / setters for Slim container (avoid magic get error)
@@ -225,8 +229,11 @@ public function call()
             return $this->app->response->setBody('Wrong config file format');
         }
 
-        // Init DB
-        self::init_db($this->forum_settings);
+        // Init DB and configure Slim
+        self::init_db($this->forum_settings, $this->forum_env['FEATHER_SHOW_INFO']);
+        $this->app->config(array('debug' => $this->forum_env['FEATHER_DEBUG'],
+                                 'cookies.encrypt' => true,
+                                 'cookies.secret_key' => $this->forum_settings['cookie_seed']));
 
         // Get forum settings from DB/cache and load it into forum_settings array
         if (file_exists($this->forum_env['FORUM_CACHE_DIR'].'cache_config.php')) {
diff --git a/index.php b/index.php
index f5aa57f8..5b22fd16 100644
--- a/index.php
+++ b/index.php
@@ -20,7 +20,8 @@
 // Instantiate Slim
 $feather = new \Slim\Slim();
 $feather_settings = array('config_file' => 'include/config.php',
-                          'cache_dir' => 'cache/');
+                          'cache_dir' => 'cache/',
+                          'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
 
 // Load middlewares
 $feather->add(new \Slim\Extras\Middleware\CsrfGuard('featherbb_csrf')); // CSRF
@@ -31,8 +32,5 @@
 // Load the routes
 require 'include/routes.php';
 
-$feather->config('cookies.encrypt', true);
-$feather->config('debug', true); // As long as we're developing FeatherBB
-
 // Run it, baby!
 $feather->run();
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
index 5231f252..10922aab 100644
--- a/style/FeatherBB/view/footer.php
+++ b/style/FeatherBB/view/footer.php
@@ -117,7 +117,7 @@
 <?php
 
 // Display debug info (if enabled/defined)
-if (defined('FEATHER_DEBUG')) {
+if ($feather->forum_env['FEATHER_SHOW_INFO']) {
     echo '<p id="debugtime">[ ';
 
     // Calculate script generation time
@@ -135,7 +135,7 @@
     echo ' ]</p>'."\n";
 }
 // Display executed queries (if enabled)
-if (defined('FEATHER_SHOW_QUERIES')) {
+if ($feather->forum_env['FEATHER_SHOW_QUERIES']) {
     display_saved_queries();
 }
 ?>

From 2132a897bcbc4facafeb5a726f7e2983d6626171 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Tue, 18 Aug 2015 21:26:31 +0200
Subject: [PATCH 087/353] Don't edit Slim's core

---
 Slim/Extras/Middleware/FeatherBB.php |   3 +
 Slim/Slim.php                        | 139 ++++++++-----------------
 include/hooks.php                    | 149 +++++++++++++++++++++++++++
 model/index.php                      |  23 +++--
 plugins/test/plugintest.php          |  13 +--
 5 files changed, 214 insertions(+), 113 deletions(-)
 create mode 100644 include/hooks.php

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index 321d3f08..f9e1b6b5 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -460,6 +460,9 @@ public function call()
         } else {
             $this->env_to_globals($this->data['forum_env']); // Legacy : define globals from forum_env
 
+            // Load hooks
+            require $this->data['forum_env']['FEATHER_ROOT'].'include/hooks.php';
+            $this->app->hooks = new \hooks;
 
             require $this->data['forum_env']['FEATHER_ROOT'].'include/utf8/utf8.php';
             require $this->data['forum_env']['FEATHER_ROOT'].'include/functions.php';
diff --git a/Slim/Slim.php b/Slim/Slim.php
index e6829d56..d0918792 100644
--- a/Slim/Slim.php
+++ b/Slim/Slim.php
@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.6.1
+ * @version     2.6.3
  * @package     Slim
  *
  * MIT LICENSE
@@ -54,7 +54,7 @@ class Slim
     /**
      * @const string
      */
-    const VERSION = '2.6.1';
+    const VERSION = '2.6.3';
 
     /**
      * @var \Slim\Helper\Set
@@ -99,10 +99,10 @@ class Slim
     );
 
     /********************************************************************************
-    * PSR-0 Autoloader
-    *
-    * Do not use if you are using Composer to autoload dependencies.
-    *******************************************************************************/
+     * PSR-0 Autoloader
+     *
+     * Do not use if you are using Composer to autoload dependencies.
+     *******************************************************************************/
 
     /**
      * Slim PSR-0 autoloader
@@ -141,8 +141,8 @@ public static function registerAutoloader()
     }
 
     /********************************************************************************
-    * Instantiation and Configuration
-    *******************************************************************************/
+     * Instantiation and Configuration
+     *******************************************************************************/
 
     /**
      * Constructor
@@ -179,7 +179,7 @@ public function __construct(array $userSettings = array())
             $viewClass = $c['settings']['view'];
             $templatesPath = $c['settings']['templates.path'];
 
-            $view = ($viewClass instanceof \Slim\View) ? $viewClass : new $viewClass;
+            $view = ($viewClass instanceOf \Slim\View) ? $viewClass : new $viewClass;
             $view->setTemplatesDirectory($templatesPath);
             return $view;
         });
@@ -353,8 +353,8 @@ public function config($name, $value = null)
     }
 
     /********************************************************************************
-    * Application Modes
-    *******************************************************************************/
+     * Application Modes
+     *******************************************************************************/
 
     /**
      * Get application mode
@@ -390,8 +390,8 @@ public function configureMode($mode, $callable)
     }
 
     /********************************************************************************
-    * Logging
-    *******************************************************************************/
+     * Logging
+     *******************************************************************************/
 
     /**
      * Get application log
@@ -403,8 +403,8 @@ public function getLog()
     }
 
     /********************************************************************************
-    * Routing
-    *******************************************************************************/
+     * Routing
+     *******************************************************************************/
 
     /**
      * Add GET|POST|PUT|PATCH|DELETE route
@@ -588,7 +588,7 @@ public function any()
      *
      * @param  mixed $callable Anything that returns true for is_callable()
      */
-    public function notFound($callable = null)
+    public function notFound ($callable = null)
     {
         if (is_callable($callable)) {
             $this->notFound = $callable;
@@ -662,8 +662,8 @@ protected function callErrorHandler($argument = null)
     }
 
     /********************************************************************************
-    * Application Accessors
-    *******************************************************************************/
+     * Application Accessors
+     *******************************************************************************/
 
     /**
      * Get a reference to the Environment object
@@ -720,7 +720,7 @@ public function view($viewClass = null)
     {
         if (!is_null($viewClass)) {
             $existingData = is_null($this->view) ? array() : $this->view->getData();
-            if ($viewClass instanceof \Slim\View) {
+            if ($viewClass instanceOf \Slim\View) {
                 $this->view = $viewClass;
             } else {
                 $this->view = new $viewClass();
@@ -733,8 +733,8 @@ public function view($viewClass = null)
     }
 
     /********************************************************************************
-    * Rendering
-    *******************************************************************************/
+     * Rendering
+     *******************************************************************************/
 
     /**
      * Render a template
@@ -758,8 +758,8 @@ public function render($template, $data = array(), $status = null)
     }
 
     /********************************************************************************
-    * HTTP Caching
-    *******************************************************************************/
+     * HTTP Caching
+     *******************************************************************************/
 
     /**
      * Set Last-Modified HTTP Response Header
@@ -847,8 +847,8 @@ public function expires($time)
     }
 
     /********************************************************************************
-    * HTTP Cookies
-    *******************************************************************************/
+     * HTTP Cookies
+     *******************************************************************************/
 
     /**
      * Set HTTP cookie to be sent with the HTTP response
@@ -981,8 +981,8 @@ public function deleteCookie($name, $path = null, $domain = null, $secure = null
     }
 
     /********************************************************************************
-    * Helper Methods
-    *******************************************************************************/
+     * Helper Methods
+     *******************************************************************************/
 
     /**
      * Get the absolute path to this Slim application's root directory
@@ -1113,14 +1113,13 @@ public function redirect($url, $status = 302)
      * @param string    $route      The route name
      * @param array     $params     Associative array of URL parameters and replacement values
      */
-    public function redirectTo($route, $params = array(), $status = 302)
-    {
+    public function redirectTo($route, $params = array(), $status = 302){
         $this->redirect($this->urlFor($route, $params), $status);
     }
 
     /********************************************************************************
-    * Flash Messages
-    *******************************************************************************/
+     * Flash Messages
+     *******************************************************************************/
 
     /**
      * Set flash message for subsequent request
@@ -1167,8 +1166,8 @@ public function flashData()
     }
 
     /********************************************************************************
-    * Hooks
-    *******************************************************************************/
+     * Hooks
+     *******************************************************************************/
 
     /**
      * Assign hook
@@ -1193,60 +1192,8 @@ public function hook($name, $callable, $priority = 10)
      */
     public function applyHook($name)
     {
-        $args = func_get_args();
-        array_shift($args);
-
-        if (!isset($this->hooks[$name])) {
-            $this->hooks[$name] = array(array());
-            return $args[0];
-        }
-        if (!empty($this->hooks[$name])) {
-            // Sort by priority, low to high, if there's more than one priority
-            if (count($this->hooks[$name]) > 1) {
-                ksort($this->hooks[$name]);
-            }
-
-            $output = array();
-            $count = 0;
-
-            foreach ($this->hooks[$name] as $priority) {
-                if (!empty($priority)) {
-                    foreach ($priority as $callable) {
-                        $output[] = call_user_func_array($callable, $args);
-                        ++$count;
-                    }
-                }
-            }
-
-            if ($count == 1) {
-                return $output[0];
-            }
-            else {
-                $data = array();
-                // Move all the keys to the same level
-                array_walk_recursive($output, function ($v, $k) use (&$data) {
-                    $data[] = $v;
-                });
-                // Remove any duplicate key
-                $data = array_unique($data);
-                return $data;
-            }
-        }
-    }
-
-    /**
-     * Invoke hook for DB
-     * @param  string $name The hook name
-     * @param  mixed  ...   (Optional) Argument(s) for hooked functions, can specify multiple arguments
-     */
-    public function applyHookDB($name)
-    {
-        $args = func_get_args();
-        array_shift($args);
-
         if (!isset($this->hooks[$name])) {
             $this->hooks[$name] = array(array());
-            return $args[0];
         }
         if (!empty($this->hooks[$name])) {
             // Sort by priority, low to high, if there's more than one priority
@@ -1254,17 +1201,16 @@ public function applyHookDB($name)
                 ksort($this->hooks[$name]);
             }
 
-            $output = array();
+            $args = func_get_args();
+            array_shift($args);
 
             foreach ($this->hooks[$name] as $priority) {
                 if (!empty($priority)) {
                     foreach ($priority as $callable) {
-                        $output[] = call_user_func_array($callable, $args);
+                        call_user_func_array($callable, $args);
                     }
                 }
             }
-
-            return $output[0];
         }
     }
 
@@ -1309,8 +1255,8 @@ public function clearHooks($name = null)
     }
 
     /********************************************************************************
-    * Middleware
-    *******************************************************************************/
+     * Middleware
+     *******************************************************************************/
 
     /**
      * Add middleware
@@ -1322,7 +1268,7 @@ public function clearHooks($name = null)
      */
     public function add(\Slim\Middleware $newMiddleware)
     {
-        if (in_array($newMiddleware, $this->middleware)) {
+        if(in_array($newMiddleware, $this->middleware)) {
             $middleware_class = get_class($newMiddleware);
             throw new \RuntimeException("Circular Middleware setup detected. Tried to queue the same Middleware instance ({$middleware_class}) twice.");
         }
@@ -1332,8 +1278,8 @@ public function add(\Slim\Middleware $newMiddleware)
     }
 
     /********************************************************************************
-    * Runner
-    *******************************************************************************/
+     * Runner
+     *******************************************************************************/
 
     /**
      * Run
@@ -1426,6 +1372,7 @@ public function call()
             $this->response()->write(ob_get_clean());
         } catch (\Exception $e) {
             if ($this->config('debug')) {
+                ob_end_clean();
                 throw $e;
             } else {
                 try {
@@ -1439,8 +1386,8 @@ public function call()
     }
 
     /********************************************************************************
-    * Error Handling and Debugging
-    *******************************************************************************/
+     * Error Handling and Debugging
+     *******************************************************************************/
 
     /**
      * Convert errors into ErrorException objects
diff --git a/include/hooks.php b/include/hooks.php
new file mode 100644
index 00000000..77875fe2
--- /dev/null
+++ b/include/hooks.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+class hooks extends \Slim\Slim
+{
+    /**
+     * Assign hook
+     * @param  string   $name       The hook name
+     * @param  mixed    $callable   A callable object
+     * @param  int      $priority   The hook priority; 0 = high, 10 = low
+     */
+    public function bind($name, $callable, $priority = 10)
+    {
+        if (!isset($this->hooks[$name])) {
+            $this->hooks[$name] = array(array());
+        }
+        if (is_callable($callable)) {
+            $this->hooks[$name][(int) $priority][] = $callable;
+        }
+    }
+
+    /**
+     * Invoke hook
+     * @param  string $name The hook name
+     * @param  mixed  ...   (Optional) Argument(s) for hooked functions, can specify multiple arguments
+     */
+    public function fire($name)
+    {
+        $args = func_get_args();
+        array_shift($args);
+
+        if (!isset($this->hooks[$name])) {
+            $this->hooks[$name] = array(array());
+            return $args[0];
+        }
+        if (!empty($this->hooks[$name])) {
+            // Sort by priority, low to high, if there's more than one priority
+            if (count($this->hooks[$name]) > 1) {
+                ksort($this->hooks[$name]);
+            }
+
+            $output = array();
+            $count = 0;
+
+            foreach ($this->hooks[$name] as $priority) {
+                if (!empty($priority)) {
+                    foreach ($priority as $callable) {
+                        $output[] = call_user_func_array($callable, $args);
+                        ++$count;
+                    }
+                }
+            }
+
+            if ($count == 1) {
+                return $output[0];
+            }
+            else {
+                $data = array();
+                // Move all the keys to the same level
+                array_walk_recursive($output, function ($v, $k) use (&$data) {
+                    $data[] = $v;
+                });
+                // Remove any duplicate key
+                $data = array_unique($data);
+                return $data;
+            }
+        }
+    }
+
+    /**
+     * Invoke hook for DB
+     * @param  string $name The hook name
+     * @param  mixed  ...   (Optional) Argument(s) for hooked functions, can specify multiple arguments
+     */
+    public function fireDB($name)
+    {
+        $args = func_get_args();
+        array_shift($args);
+
+        if (!isset($this->hooks[$name])) {
+            $this->hooks[$name] = array(array());
+            return $args[0];
+        }
+        if (!empty($this->hooks[$name])) {
+            // Sort by priority, low to high, if there's more than one priority
+            if (count($this->hooks[$name]) > 1) {
+                ksort($this->hooks[$name]);
+            }
+
+            $output = array();
+
+            foreach ($this->hooks[$name] as $priority) {
+                if (!empty($priority)) {
+                    foreach ($priority as $callable) {
+                        $output[] = call_user_func_array($callable, $args);
+                    }
+                }
+            }
+
+            return $output[0];
+        }
+    }
+
+    /**
+     * Get hook listeners
+     *
+     * Return an array of registered hooks. If `$name` is a valid
+     * hook name, only the listeners attached to that hook are returned.
+     * Else, all listeners are returned as an associative array whose
+     * keys are hook names and whose values are arrays of listeners.
+     *
+     * @param  string     $name     A hook name (Optional)
+     * @return array|null
+     */
+    public function getHooks($name = null)
+    {
+        if (!is_null($name)) {
+            return isset($this->hooks[(string) $name]) ? $this->hooks[(string) $name] : null;
+        } else {
+            return $this->hooks;
+        }
+    }
+
+    /**
+     * Clear hook listeners
+     *
+     * Clear all listeners for all hooks. If `$name` is
+     * a valid hook name, only the listeners attached
+     * to that hook will be cleared.
+     *
+     * @param  string   $name   A hook name (Optional)
+     */
+    public function clearHooks($name = null)
+    {
+        if (!is_null($name) && isset($this->hooks[(string) $name])) {
+            $this->hooks[(string) $name] = array(array());
+        } else {
+            foreach ($this->hooks as $key => $value) {
+                $this->hooks[$key] = array(array());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/model/index.php b/model/index.php
index 23491abd..0f17a69a 100644
--- a/model/index.php
+++ b/model/index.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
     
     // Returns page head
@@ -32,7 +33,7 @@ public function get_page_head()
             $page_head = array('feed' => '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;type=atom" title="'.__('Atom active topics feed').'" />');
         }
 
-        $page_head = $this->feather->applyHook('get_page_head', $page_head);
+        $page_head = $this->hook->fire('get_page_head', $page_head);
 
         return $page_head;
     }
@@ -47,7 +48,7 @@ public function get_forum_actions()
             $forum_actions[] = '<a href="'.get_link('mark-read/').'">'.__('Mark all as read').'</a>';
         }
 
-        $forum_actions = $this->feather->applyHook('get_forum_actions', $forum_actions);
+        $forum_actions = $this->hook->fire('get_forum_actions', $forum_actions);
 
         return $forum_actions;
     }
@@ -69,7 +70,7 @@ public function get_new_posts()
             ->where_any_is($query['where'])
             ->where_gt('f.last_post', $this->user->last_visit);
 
-        $query = $this->feather->applyHookDB('query_get_new_posts', $query);
+        $query = $this->hook->fireDB('query_get_new_posts', $query);
 
         $query = $query->find_result_set();
 
@@ -94,7 +95,7 @@ public function get_new_posts()
                     ->where_gt('last_post', $this->user->last_visit)
                     ->where_null('moved_to');
 
-                $query = $this->feather->applyHookDB('query_get_new_posts', $query);
+                $query = $this->hook->fireDB('query_get_new_posts', $query);
 
                 $query = $query->find_result_set();
 
@@ -106,7 +107,7 @@ public function get_new_posts()
             }
         }
 
-        $new_topics = $this->feather->applyHook('get_new_posts', $new_topics);
+        $new_topics = $this->hook->fire('get_new_posts', $new_topics);
 
         return $new_topics;
     }
@@ -135,7 +136,7 @@ public function print_categories_forums()
             ->where_any_is($query['where'])
             ->order_by_many($query['order_by']);
 
-        $query = $this->feather->applyHookDB('query_print_categories_forums', $query);
+        $query = $this->hook->fireDB('query_print_categories_forums', $query);
 
         $query = $query->find_result_set();
 
@@ -218,7 +219,7 @@ public function print_categories_forums()
             ++$i;
         }
 
-        $index_data = $this->feather->applyHook('print_categories_forums', $index_data);
+        $index_data = $this->hook->fire('print_categories_forums', $index_data);
 
         return $index_data;
     }
@@ -244,7 +245,7 @@ public function collect_stats()
                         ->select_expr('SUM(num_topics)', 'total_topics')
                         ->select_expr('SUM(num_posts)', 'total_posts');
 
-        $query = $this->feather->applyHookDB('collect_stats_query', $query);
+        $query = $this->hook->fireDB('collect_stats_query', $query);
 
         $query = $query->find_one();
 
@@ -257,7 +258,7 @@ public function collect_stats()
             $stats['newest_user'] = feather_escape($stats['last_user']['username']);
         }
 
-        $stats = $this->feather->applyHook('collect_stats', $stats);
+        $stats = $this->hook->fire('collect_stats', $stats);
 
         return $stats;
     }
@@ -278,7 +279,7 @@ public function fetch_users_online()
                     ->where($query['where'])
                     ->order_by_many($query['order_by']);
 
-        $query = $this->feather->applyHookDB('query_fetch_users_online', $query);
+        $query = $this->hook->fireDB('query_fetch_users_online', $query);
 
         $query = $query->find_result_set();
 
@@ -300,7 +301,7 @@ public function fetch_users_online()
             $online['num_users'] = 0;
         }
 
-        $online = $this->feather->applyHook('fetch_users_online', $online);
+        $online = $this->hook->fire('fetch_users_online', $online);
 
         return $online;
     }
diff --git a/plugins/test/plugintest.php b/plugins/test/plugintest.php
index f78024b2..b3f3ad9d 100644
--- a/plugins/test/plugintest.php
+++ b/plugins/test/plugintest.php
@@ -19,23 +19,24 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
 
-        $this->feather->hook('get_forum_actions', function ($forum_actions) {
-            $forum_actions[] = '<a href="'.get_link('mark-read/').'">Test1</a>';
+        $this->hook->bind('get_forum_actions', function ($forum_actions) {
+            $forum_actions[] = '<a href="' . get_link('mark-read/') . '">Test1</a>';
             return $forum_actions;
         });
 
-        $this->feather->hook('get_forum_actions', function ($forum_actions) {
-            $forum_actions[] = '<a href="'.get_link('mark-read/').'">Test2</a>';
+        $this->hook->bind('get_forum_actions', function ($forum_actions) {
+            $forum_actions[] = '<a href="' . get_link('mark-read/') . '">Test2</a>';
             return $forum_actions;
         });
 
-        $this->feather->hook('query_fetch_users_online', function ($query) {
+        $this->hook->bind('query_fetch_users_online', function ($query) {
             $query = $query->limit(50);
             return $query;
         });
 
-        $this->feather->hook('query_fetch_users_online', function ($query) {
+        $this->hook->bind('query_fetch_users_online', function ($query) {
             $query = $query->offset(50);
             return $query;
         });

From 6371e8c4b0aed6e8145996abbf9704ec6b63ee14 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Tue, 18 Aug 2015 23:47:40 +0200
Subject: [PATCH 088/353] Fix admin_forums default view

---
 view/admin/forums/admin_forums.php | 51 ++++++++++++------------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/view/admin/forums/admin_forums.php b/view/admin/forums/admin_forums.php
index fb4b716e..e966e6f5 100644
--- a/view/admin/forums/admin_forums.php
+++ b/view/admin/forums/admin_forums.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -16,10 +16,10 @@
 	<div class="blockform">
 		<h2><span><?php _e('Add forum head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/forums/') ?>">
+			<form method="post" action="<?php echo get_link('admin/forums/add') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
-if ($is_forum) {
+if (!empty($cat_list)) {
     ?>
 				<div class="inform">
 					<fieldset>
@@ -27,10 +27,12 @@
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php _e('Add forum label') ?><div><input type="submit" name="add_forum" value="<?php _e('Add forum') ?>" tabindex="2" /></div></th>
+									<th scope="row"><?php _e('Add forum label') ?><div><input type="submit" value="<?php _e('Add forum') ?>" tabindex="2" /></div></th>
 									<td>
-										<select name="add_to_cat" tabindex="1">
-											<?php echo $categories_add ?>
+										<select name="cat" tabindex="1">
+											<?php  foreach ($cat_list as $cat) {
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.feather_escape($cat['cat_name']).'</option>'."\n";
+											} ?>
 										</select>
 										<span><?php _e('Add forum help') ?></span>
 									</td>
@@ -61,24 +63,17 @@
 <?php
 if (!empty($forum_data)) {
     ?>
-		<h2 class="block2"><span><?php _e('Edit forums head') ?></span></h2>
+		<h2 class="block2"><span><?php _e('Manage forums head') ?></span></h2>
 		<div class="box">
 			<form id="edforum" method="post" action="<?php echo get_link('admin/forums/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
 <?php
-    foreach ($forum_data as $forum) {
-        if ($forum['cid'] != $cur_category) {
-            // A new category since last iteration?
-
-        if ($cur_category != 0) {
-            echo "\t\t\t\t\t\t\t".'</tbody>'."\n\t\t\t\t\t\t\t".'</table>'."\n\t\t\t\t\t\t".'</div>'."\n\t\t\t\t\t".'</fieldset>'."\n\t\t\t\t".'</div>'."\n";
-        }
-
+    foreach ($forum_data as $cat_id => $cat_data) {
             ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php _e('Category subhead') ?> <?php echo feather_escape($forum['cat_name']) ?></legend>
+						<legend><?php _e('Category subhead') ?> <?php echo feather_escape($cat_data['cat_name']) ?></legend>
 						<div class="infldset">
 							<table>
 							<thead>
@@ -90,34 +85,30 @@
 							</thead>
 							<tbody>
 <?php
-
-        $cur_category = $forum['cid'];
-        }
-
+	foreach ($cat_data['cat_forums'] as $forum) {
         ?>
 								<tr>
-									<td class="tcl"><a href="<?php echo get_link('admin/forums/edit/'.$forum['fid'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo get_link('admin/forums/delete/'.$forum['fid'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
-									<td class="tc2"><input type="text" name="position[<?php echo $forum['fid'] ?>]" size="3" maxlength="3" value="<?php echo $forum['disp_position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
+									<td class="tcl"><a href="<?php echo get_link('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo get_link('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
+									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
 									<td class="tcr"><strong><?php echo feather_escape($forum['forum_name']) ?></strong></td>
 								</tr>
 <?php
-
     }
-
     ?>
 							</tbody>
 							</table>
 						</div>
 					</fieldset>
 				</div>
+<?php
+	}
+?>
 				<p class="submitend"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
 			</form>
 		</div>
-<?php
-
-}
-
-?>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
+<?php
+	}
+?>

From 46457f61f2581cf87db6b5ac61ff4c8eafd716d2 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 15:23:33 +0200
Subject: [PATCH 089/353] Move maintenance message in auth middleware

---
 Slim/Extras/Middleware/FeatherBBAuth.php   | 30 ++++++++++++++++++++++
 Slim/Extras/Middleware/FeatherBBLoader.php | 30 ----------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBBAuth.php b/Slim/Extras/Middleware/FeatherBBAuth.php
index 2ce16203..017ef619 100644
--- a/Slim/Extras/Middleware/FeatherBBAuth.php
+++ b/Slim/Extras/Middleware/FeatherBBAuth.php
@@ -189,6 +189,36 @@ public function check_bans()
         }
     }
 
+    public function maintenance_message()
+    {
+        // Deal with newlines, tabs and multiple spaces
+        $pattern = array("\t", '  ', '  ');
+        $replace = array('&#160; &#160; ', '&#160; ', ' &#160;');
+        $message = str_replace($pattern, $replace, $this->app->forum_settings['o_maintenance_message']);
+
+        $page_title = array(feather_escape($this->app->forum_settings['o_board_title']), __('Maintenance'));
+
+        define('FEATHER_ACTIVE_PAGE', 'index');
+
+        $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? $this->app->forum_env['FEATHER_ROOT'].'style/'.$this->app->user->style.'/view' : $this->app->forum_env['FEATHER_ROOT'].'view');
+
+        $header = new \controller\header();
+
+        $header->setTitle($page_title)->display();
+
+        $this->app->render('message.php', array(
+                'message'    =>    $message,
+                'no_back_link'    =>    '',
+            )
+        );
+
+        $footer = new \controller\footer();
+
+        $footer->dontStop();
+
+        $footer->display();
+    }
+
     public function call()
     {
         global $feather_bans;
diff --git a/Slim/Extras/Middleware/FeatherBBLoader.php b/Slim/Extras/Middleware/FeatherBBLoader.php
index 07345f12..1c7368bc 100644
--- a/Slim/Extras/Middleware/FeatherBBLoader.php
+++ b/Slim/Extras/Middleware/FeatherBBLoader.php
@@ -164,36 +164,6 @@ public function set_headers()
         $this->app->expires(0);
     }
 
-    public function maintenance_message()
-    {
-        // Deal with newlines, tabs and multiple spaces
-        $pattern = array("\t", '  ', '  ');
-        $replace = array('&#160; &#160; ', '&#160; ', ' &#160;');
-        $message = str_replace($pattern, $replace, $this->forum_settings['o_maintenance_message']);
-
-        $page_title = array(feather_escape($this->forum_settings['o_board_title']), __('Maintenance'));
-
-        define('FEATHER_ACTIVE_PAGE', 'index');
-
-        $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? FEATHER_ROOT.'style/'.$this->app->user->style.'/view' : FEATHER_ROOT.'view');
-
-        $header = new \controller\header();
-
-        $header->setTitle($page_title)->display();
-
-        $this->app->render('message.php', array(
-                'message'    =>    $message,
-                'no_back_link'    =>    '',
-            )
-        );
-
-        $footer = new \controller\footer();
-
-        $footer->dontStop();
-
-        $footer->display();
-    }
-
     public function call()
     {
         global $forum_time_formats, $forum_date_formats, $feather_config; // Legacy

From 4872de9be27c3f24edd6d3f5f04c04ace47052cd Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 19 Aug 2015 15:25:01 +0200
Subject: [PATCH 090/353] Fix delete link

---
 model/viewtopic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/model/viewtopic.php b/model/viewtopic.php
index c84d7105..c0729034 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -360,7 +360,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 if ($cur_topic['closed'] == '0') {
                     if ($cur_post['poster_id'] == $this->user->id) {
                         if ((($start_from + $post_count) == 1 && $this->user->g_delete_topics == '1') || (($start_from + $post_count) > 1 && $this->user->g_delete_posts == '1')) {
-                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
+                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
                         }
                         if ($this->user->g_edit_posts == '1') {
                             $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';

From 9a8b868df62e9dbc09ccc5a52b9b8158e9993e41 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 19 Aug 2015 15:25:22 +0200
Subject: [PATCH 091/353] Fix cache function

---
 include/cache.php     | 20 --------------------
 include/functions.php | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/include/cache.php b/include/cache.php
index 17312bd9..b92c5ded 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -153,26 +153,6 @@ function generate_censoring_cache()
     featherbb_write_cache_file('cache_censoring.php', $content);
 }
 
-//
-// Generate a cache ID based on the last modification time for all stopwords files
-//
-function generate_stopwords_cache_id()
-{
-    $files = glob(FEATHER_ROOT.'lang/*/stopwords.txt');
-    if ($files === false) {
-        return 'cache_id_error';
-    }
-
-    $hash = array();
-
-    foreach ($files as $file) {
-        $hash[] = $file;
-        $hash[] = filemtime($file);
-    }
-
-    return sha1(implode('|', $hash));
-}
-
 
 //
 // Generate the stopwords cache PHP script
diff --git a/include/functions.php b/include/functions.php
index 3408f44e..c50c714b 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1143,6 +1143,26 @@ function strip_bad_multibyte_chars($str)
     return $result;
 }
 
+//
+// Generate a cache ID based on the last modification time for all stopwords files
+//
+function generate_stopwords_cache_id()
+{
+    $files = glob(FEATHER_ROOT.'lang/*/stopwords.txt');
+    if ($files === false) {
+        return 'cache_id_error';
+    }
+
+    $hash = array();
+
+    foreach ($files as $file) {
+        $hash[] = $file;
+        $hash[] = filemtime($file);
+    }
+
+    return sha1(implode('|', $hash));
+}
+
 //
 // Make a string safe to use in a URL
 // Inspired by (c) Panther <http://www.pantherforum.org/>

From 5fceabe4897cafdd468bd48f99a194f6078cd333 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 19 Aug 2015 15:25:38 +0200
Subject: [PATCH 092/353] Add hooks

---
 controller/edit.php |  2 +-
 model/delete.php    | 33 +++++++++++++++++---------
 model/edit.php      | 57 ++++++++++++++++++++++++++++-----------------
 3 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/controller/edit.php b/controller/edit.php
index 2ac8b24d..c3056e19 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -66,7 +66,7 @@ public function editpost($id)
 
         if ($this->feather->request()->isPost()) {
             // Let's see if everything went right
-            $errors = $this->model->check_errors_before_edit($id, $can_edit_subject, $errors);
+            $errors = $this->model->check_errors_before_edit($can_edit_subject, $errors);
 
             // Setup some variables before post
             $post = $this->model->setup_variables($cur_post, $is_admmod, $can_edit_subject, $errors);
diff --git a/model/delete.php b/model/delete.php
index f2b4f523..82db289e 100644
--- a/model/delete.php
+++ b/model/delete.php
@@ -20,32 +20,36 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
  
     public function get_info_delete($id)
     {
-        $select_get_info_delete = array('fid' => 'f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_replies',  'fp.post_topics', 'tid' => 't.id', 't.subject', 't.first_post_id', 't.closed', 'p.poster', 'p.posted', 'p.poster_id', 'p.message', 'p.hide_smilies');
-        $where_get_info_delete = array(
+        $query['select'] = array('fid' => 'f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_replies',  'fp.post_topics', 'tid' => 't.id', 't.subject', 't.first_post_id', 't.closed', 'p.poster', 'p.posted', 'p.poster_id', 'p.message', 'p.hide_smilies');
+        $query['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
 
-        $cur_post = DB::for_table('posts')
+        $query = DB::for_table('posts')
             ->table_alias('p')
-            ->select_many($select_get_info_delete)
+            ->select_many($query['select'])
             ->inner_join('topics', array('t.id', '=', 'p.topic_id'), 't')
             ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
             ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
             ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-            ->where_any_is($where_get_info_delete)
-            ->where('p.id', $id)
-            ->find_one();
+            ->where_any_is($query['where'])
+            ->where('p.id', $id);
+
+        $query = $this->hook->fireDB('get_info_delete_query', $query);
+
+        $query = $query->find_one();
         
-        if (!$cur_post) {
+        if (!$query) {
             message(__('Bad request'), '404');
         }
 
-        return $cur_post;
+        return $query;
     }
 
     public function handle_deletion($is_topic_post, $id, $tid, $fid)
@@ -53,12 +57,16 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
         require FEATHER_ROOT.'include/search_idx.php';
 
         if ($is_topic_post) {
+            $this->hook->fire('handle_deletion_topic_post', $tid, $fid);
+
             // Delete the topic and all of its posts
             delete_topic($tid);
             update_forum($fid);
 
             redirect(get_link('forum/'.$fid.'/'), __('Topic del redirect'));
         } else {
+            $this->hook->fire('handle_deletion', $tid, $fid, $id);
+
             // Delete just this one post
             delete_post($id, $tid);
             update_forum($fid);
@@ -68,8 +76,11 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
                 ->select('id')
                 ->where('topic_id', $tid)
                 ->where_lt('id', $id)
-                ->order_by_desc('id')
-                ->find_one();
+                ->order_by_desc('id');
+
+            $post = $this->hook->fireDB('handle_deletion_query', $post);
+
+            $post = $post->find_one();
 
             redirect(get_link('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
         }
diff --git a/model/edit.php b/model/edit.php
index b14e870b..eb95c75b 100644
--- a/model/edit.php
+++ b/model/edit.php
@@ -20,29 +20,31 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
 
     // Fetch some info about the post, the topic and the forum
     public function get_info_edit($id)
     {
-
-     
-        $select_get_info_edit = array('fid' => 'f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_topics', 'tid' => 't.id', 't.subject', 't.posted', 't.first_post_id', 't.sticky', 't.closed', 'p.poster', 'p.poster_id', 'p.message', 'p.hide_smilies');
-        $where_get_info_edit = array(
+        $cur_post['select'] = array('fid' => 'f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_topics', 'tid' => 't.id', 't.subject', 't.posted', 't.first_post_id', 't.sticky', 't.closed', 'p.poster', 'p.poster_id', 'p.message', 'p.hide_smilies');
+        $cur_post['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
 
         $cur_post = DB::for_table('posts')
             ->table_alias('p')
-            ->select_many($select_get_info_edit)
+            ->select_many($cur_post['select'])
             ->inner_join('topics', array('t.id', '=', 'p.topic_id'), 't')
             ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
             ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
             ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-            ->where_any_is($where_get_info_edit)
-            ->where('p.id', $id)
-            ->find_one();
+            ->where_any_is($cur_post['where'])
+            ->where('p.id', $id);
+
+        $cur_post = $this->hook->fireDB('get_info_edit_query', $cur_post);
+
+        $cur_post = $cur_post->find_one();
 
         if (!$cur_post) {
             message(__('Bad request'), '404');
@@ -51,7 +53,7 @@ public function get_info_edit($id)
         return $cur_post;
     }
 
-    public function check_errors_before_edit($id, $can_edit_subject, $errors)
+    public function check_errors_before_edit($can_edit_subject, $errors)
     {
         global $pd;
 
@@ -103,6 +105,8 @@ public function check_errors_before_edit($id, $can_edit_subject, $errors)
             }
         }
 
+        $errors = $this->hook->fire('check_errors_before_edit', $errors);
+
         return $errors;
     }
 
@@ -136,6 +140,8 @@ public function setup_variables($cur_post, $is_admmod, $can_edit_subject, $error
             $post['subject'] = feather_trim($this->request->post('req_subject'));
         }
 
+        $post = $this->hook->fire('setup_variables_edit', $post);
+
         return $post;
     }
 
@@ -150,15 +156,18 @@ public function edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod)
                 array('moved_to' => $cur_post['tid'])
             );
             
-            $update_topic = array(
+            $query['update_topic'] = array(
                 'subject' => $post['subject'],
                 'sticky'  => $post['stick_topic']
             );
             
-            DB::for_table('topics')->where_any_is($where_topic)
-                                                       ->find_one()
-                                                       ->set($update_topic)
-                                                       ->save();
+            $query = DB::for_table('topics')->where_any_is($where_topic)
+                                            ->find_one()
+                                            ->set($query['update_topic']);
+
+            $query = $this->hook->fireDB('edit_post_can_edit_subject', $query);
+
+            $query = $query->save();
 
             // We changed the subject, so we need to take that into account when we update the search words
             update_search_index('edit', $id, $post['message'], $post['subject']);
@@ -167,21 +176,23 @@ public function edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod)
         }
         
         // Update the post
-        $update_post = array(
+        $query['update_post'] = array(
             'message' => $post['message'],
             'hide_smilies'  => $post['hide_smilies']
         );
         
         if (!$this->request->post('silent') || !$is_admmod) {
-            $update_post['edited'] = time();
-            $update_post['edited_by'] = $this->user->username;
+            $query['update_post']['edited'] = time();
+            $query['update_post']['edited_by'] = $this->user->username;
         }
 
-        DB::for_table('posts')->where('id', $id)
-                                                   ->find_one()
-                                                   ->set($update_post)
-                                                   ->save();
-        
+        $query = DB::for_table('posts')->where('id', $id)
+                                       ->find_one()
+                                       ->set($query['update_post']);
+
+        $query = $this->hook->fireDB('edit_post_can_edit_subject', $query);
+
+        $query = $query->save();
     }
 
     public function get_checkboxes($can_edit_subject, $is_admmod, $cur_post, $cur_index)
@@ -212,6 +223,8 @@ public function get_checkboxes($can_edit_subject, $is_admmod, $cur_post, $cur_in
             }
         }
 
+        $checkboxes = $this->hook->fire('get_checkboxes', $checkboxes);
+
         return $checkboxes;
     }
 }

From 3efb9b11368cca988ac09e828e3dd07e300cf5b3 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 15:38:06 +0200
Subject: [PATCH 093/353] Add install success flash message

---
 controller/install.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/controller/install.php b/controller/install.php
index 67256fd8..97ba73c1 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -199,7 +199,12 @@ public function create_db(array $data)
         if (function_exists('apache_get_modules') && in_array('mod_rewrite', apache_get_modules())) {
             $this->write_htaccess();
         }
-        
+
+        // Install success flash message
+        $flash = new \Slim\Middleware\Flash();
+        $flash->set('message', __('Message'));
+        $flash->save();
+
         // Redirect to homepage
         redirect(get_link('/'));
     }

From cb3b44b049a2eb7022f6a1e104a688da5f33a723 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 19 Aug 2015 15:39:53 +0200
Subject: [PATCH 094/353] Add hooks

---
 model/header.php | 7 ++++++-
 model/index.php  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/model/header.php b/model/header.php
index be2b853a..ea9a2ac6 100644
--- a/model/header.php
+++ b/model/header.php
@@ -20,11 +20,16 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
 
     public function get_reports()
     {
-        $result_header = DB::for_table('reports')->where_null('zapped')->find_one();
+        $result_header = DB::for_table('reports')->where_null('zapped');
+
+        $result_header = $this->hook->fireDB('get_reports_query', $result_header);
+
+        $result_header = $result_header->find_one();
 
         if ($result_header) {
             return true;
diff --git a/model/index.php b/model/index.php
index 0f17a69a..a4852a19 100644
--- a/model/index.php
+++ b/model/index.php
@@ -95,7 +95,7 @@ public function get_new_posts()
                     ->where_gt('last_post', $this->user->last_visit)
                     ->where_null('moved_to');
 
-                $query = $this->hook->fireDB('query_get_new_posts', $query);
+                $query = $this->hook->fireDB('get_new_posts_query', $query);
 
                 $query = $query->find_result_set();
 

From 4a160ce99437a2f0060e452b3706e717fa68e04a Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 19 Aug 2015 15:40:17 +0200
Subject: [PATCH 095/353] Rebrand pun_mail

---
 include/email.php  |  2 +-
 model/login.php    |  2 +-
 model/misc.php     |  4 ++--
 model/post.php     | 10 +++++-----
 model/profile.php  |  6 +++---
 model/register.php |  8 ++++----
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/email.php b/include/email.php
index 619d9736..3281d9eb 100644
--- a/include/email.php
+++ b/include/email.php
@@ -259,7 +259,7 @@ function bbcode2email($text, $wrap_length = 72)
 //
 // Wrapper for PHP's mail()
 //
-function pun_mail($to, $subject, $message, $reply_to_email = '', $reply_to_name = '')
+function feather_mail($to, $subject, $message, $reply_to_email = '', $reply_to_name = '')
 {
     global $feather_config;
 
diff --git a/model/login.php b/model/login.php
index 5c5ac99d..14c3fd32 100644
--- a/model/login.php
+++ b/model/login.php
@@ -178,7 +178,7 @@ public function password_forgotten()
                         $cur_mail_message = str_replace('<activation_url>', get_link('user/'.$cur_hit->id.'/action/change_pass/?key='.$new_password_key), $cur_mail_message);
                         $cur_mail_message = str_replace('<new_password>', $new_password, $cur_mail_message);
 
-                        pun_mail($email, $mail_subject, $cur_mail_message);
+                        feather_mail($email, $mail_subject, $cur_mail_message);
                     }
 
                     message(__('Forget mail').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
diff --git a/model/misc.php b/model/misc.php
index e836c72d..23ac015a 100644
--- a/model/misc.php
+++ b/model/misc.php
@@ -85,7 +85,7 @@ public function send_email($mail, $id)
 
         require_once FEATHER_ROOT.'include/email.php';
 
-        pun_mail($mail['recipient_email'], $mail_subject, $mail_message, $this->user->email, $this->user->username);
+        feather_mail($mail['recipient_email'], $mail_subject, $mail_message, $this->user->email, $this->user->username);
 
         DB::for_table('users')->where('id', $this->user->id)
                                                   ->find_one()
@@ -188,7 +188,7 @@ public function insert_report($post_id)
 
                 require FEATHER_ROOT.'include/email.php';
 
-                pun_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+                feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
             }
         }
 
diff --git a/model/post.php b/model/post.php
index 52756e50..eab496f4 100644
--- a/model/post.php
+++ b/model/post.php
@@ -410,9 +410,9 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
                 // We have to double check here because the templates could be missing
                 if (isset($notification_emails[$cur_subscriber['language']])) {
                     if ($cur_subscriber['notify_with_post'] == '0') {
-                        pun_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][0], $notification_emails[$cur_subscriber['language']][1]);
+                        feather_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][0], $notification_emails[$cur_subscriber['language']][1]);
                     } else {
-                        pun_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][2], $notification_emails[$cur_subscriber['language']][3]);
+                        feather_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][2], $notification_emails[$cur_subscriber['language']][3]);
                     }
                 }
             }
@@ -597,9 +597,9 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
                 // We have to double check here because the templates could be missing
                 if (isset($notification_emails[$cur_subscriber['language']])) {
                     if ($cur_subscriber['notify_with_post'] == '0') {
-                        pun_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][0], $notification_emails[$cur_subscriber['language']][1]);
+                        feather_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][0], $notification_emails[$cur_subscriber['language']][1]);
                     } else {
-                        pun_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][2], $notification_emails[$cur_subscriber['language']][3]);
+                        feather_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][2], $notification_emails[$cur_subscriber['language']][3]);
                     }
                 }
             }
@@ -624,7 +624,7 @@ public function warn_banned_user($post, $new_pid)
         $mail_message = str_replace('<post_url>', get_link('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
-        pun_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+        feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
     }
 
     // Increment post count, change group if needed
diff --git a/model/profile.php b/model/profile.php
index 7fee36e6..6720eee3 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -202,7 +202,7 @@ public function change_email($id)
                     $mail_message = str_replace('<profile_url>', get_link('user/'.$id.'/'), $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
-                    pun_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+                    feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
                 }
             }
 
@@ -235,7 +235,7 @@ public function change_email($id)
                     $mail_message = str_replace('<profile_url>', get_link('user/'.$id.'/'), $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
-                    pun_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+                    feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
                 }
             }
 
@@ -266,7 +266,7 @@ public function change_email($id)
             $mail_message = str_replace('<activation_url>', get_link('user/'.$id.'/action/change_email/?key='.$new_email_key), $mail_message);
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
-            pun_mail($new_email, $mail_subject, $mail_message);
+            feather_mail($new_email, $mail_subject, $mail_message);
 
             message(__('Activate email sent').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
         }
diff --git a/model/register.php b/model/register.php
index 8152bc20..53dd5e8d 100644
--- a/model/register.php
+++ b/model/register.php
@@ -179,7 +179,7 @@ public function insert_user($user)
                 $mail_message = str_replace('<profile_url>', get_link('user/'.$new_uid.'/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
-                pun_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+                feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
             }
 
             // If we previously found out that the email was a dupe
@@ -197,7 +197,7 @@ public function insert_user($user)
                 $mail_message = str_replace('<profile_url>', get_link('user/'.$new_uid.'/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
-                pun_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+                feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
             }
 
             // Should we alert people on the admin mailing list that a new user has registered?
@@ -216,7 +216,7 @@ public function insert_user($user)
                 $mail_message = str_replace('<admin_url>', get_link('user/'.$new_uid.'/section/admin/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
-                pun_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+                feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
             }
         }
 
@@ -237,7 +237,7 @@ public function insert_user($user)
             $mail_message = str_replace('<login_url>', get_link('login/'), $mail_message);
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
-            pun_mail($user['email1'], $mail_subject, $mail_message);
+            feather_mail($user['email1'], $mail_subject, $mail_message);
 
             message(__('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
         }

From 7c24de7d041147cc77d22dc97b6d332cfedb1060 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 16:06:06 +0200
Subject: [PATCH 096/353] Fix installer when config file isn't default

---
 Slim/Extras/Middleware/FeatherBBLoader.php | 4 ++--
 controller/install.php                     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBBLoader.php b/Slim/Extras/Middleware/FeatherBBLoader.php
index 1c7368bc..c1ebe232 100644
--- a/Slim/Extras/Middleware/FeatherBBLoader.php
+++ b/Slim/Extras/Middleware/FeatherBBLoader.php
@@ -33,7 +33,7 @@ public function __construct(array $data)
         // Define some core variables
         $this->forum_env['FEATHER_ROOT'] = realpath(dirname(__FILE__).'/../../../').'/';
         $this->forum_env['FORUM_CACHE_DIR'] = is_writable($this->forum_env['FEATHER_ROOT'].$data['cache_dir']) ? realpath($this->forum_env['FEATHER_ROOT'].$data['cache_dir']).'/' : null;
-        $this->forum_env['FORUM_CONFIG_FILE'] = is_file($this->forum_env['FEATHER_ROOT'].$data['config_file']) ? realpath($this->forum_env['FEATHER_ROOT'].$data['config_file']) : null;
+        $this->forum_env['FORUM_CONFIG_FILE'] = $this->forum_env['FEATHER_ROOT'].$data['config_file'];
         $this->forum_env['FEATHER_DEBUG'] = $this->forum_env['FEATHER_SHOW_QUERIES'] = ($data['debug'] == 'all');
         $this->forum_env['FEATHER_SHOW_INFO'] = ($data['debug'] == 'info' || $data['debug'] == 'all');
         // Populate forum_env
@@ -185,7 +185,7 @@ public function call()
             return $this->app->response->setStatus(403); // Send forbidden header
         }
 
-        if (is_null($this->forum_env['FORUM_CONFIG_FILE'])) {
+        if (!is_file($this->forum_env['FORUM_CONFIG_FILE'])) {
             $installer = new \controller\install;
             $installer->run();
             return;
diff --git a/controller/install.php b/controller/install.php
index 97ba73c1..9f26b624 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -21,7 +21,6 @@ class install
     protected $install_lang = 'English';
     protected $default_style = 'FeatherBB';
     protected $config_keys = array('db_type', 'db_host', 'db_name', 'db_user', 'db_pass', 'db_prefix');
-    protected $config_file = 'include/config.php';
     protected $errors = array();
 
     public function __construct()
@@ -211,7 +210,7 @@ public function create_db(array $data)
 
     public function write_config($json)
     {
-        return file_put_contents($this->feather->forum_env['FEATHER_ROOT'].$this->config_file, $json);
+        return file_put_contents($this->feather->forum_env['FORUM_CONFIG_FILE'], $json);
     }
 
     public function write_htaccess()

From 77c090262325cfa524c11bc9c9267b7ae7b8b446 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 16:45:15 +0200
Subject: [PATCH 097/353] Initial commit of the cache class

---
 include/classes/cache.class.php | 360 ++++++++++++++++++++++++++++++++
 1 file changed, 360 insertions(+)
 create mode 100755 include/classes/cache.class.php

diff --git a/include/classes/cache.class.php b/include/classes/cache.class.php
new file mode 100755
index 00000000..2bcfaa6a
--- /dev/null
+++ b/include/classes/cache.class.php
@@ -0,0 +1,360 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by Christian Metz - MetzWeb Networks
+ * API Documentation: https://github.com/cosenary/Simple-PHP-Cache
+ * License: BSD http://www.opensource.org/licenses/bsd-license.php
+ *
+ * FeatherBB Cache class
+ *
+ * @version 1.6
+ */
+
+namespace FeatherBB;
+
+class Cache
+{
+    /**
+     * The path to the cache file folder
+     *
+     * @var string
+     */
+    private $_cachepath = 'cache/';
+
+    /**
+     * The name of the default cache file
+     *
+     * @var string
+     */
+    private $_cachename = 'default';
+
+    /**
+     * The cache file extension
+     *
+     * @var string
+     */
+    private $_extension = '.cache';
+
+    private $cache;
+
+    /**
+     * Default constructor
+     *
+     * @param string|array [optional] $config
+     * @return void
+     */
+    public function __construct($config = null)
+    {
+        if (true === isset($config)) {
+            if (is_string($config)) {
+                $this->setCache($config);
+            } else if (is_array($config)) {
+                $this->setCache($config['name']);
+                $this->setCachePath($config['path']);
+                $this->setExtension($config['extension']);
+            }
+        }
+    }
+
+    /**
+     * Check whether data accociated with a key
+     *
+     * @param string $key
+     * @return boolean
+     */
+    public function isCached($key)
+    {
+        if (false != $this->_loadCache()) {
+            $cachedData = $this->_loadCache();
+            $entry = $cachedData[$key];
+            if ($entry && true === $this->_checkExpired($entry['time'], $entry['expire'])) {
+                return false;
+            } else {
+                return isset($cachedData[$key]['data']);
+            }
+        }
+    }
+
+    /**
+     * Store data in the cache
+     *
+     * @param string $key
+     * @param mixed $data
+     * @param integer [optional] $expiration Seconds to expire the cache
+     * @return object
+     */
+    public function store($key, $data, $expiration = 0)
+    {
+        $storeData = array(
+            'time' => time(),
+            'expire' => $expiration,
+            'data' => serialize($data)
+        );
+        $dataArray = $this->_loadCache();
+        if (true === is_array($dataArray)) {
+            $dataArray[$key] = $storeData;
+        } else {
+            $dataArray = array($key => $storeData);
+        }
+        $this->_saveCache($dataArray);
+        return $this;
+    }
+
+    /**
+     * Retrieve cached data by its key
+     *
+     * @param string $key
+     * @param boolean [optional] $timestamp
+     * @return string
+     */
+    public function retrieve($key, $timestamp = false)
+    {
+        $cachedData = $this->_loadCache();
+        (false === $timestamp) ? $type = 'data' : $type = 'time';
+        if (!isset($cachedData[$key][$type])) return null;
+        if (false === $timestamp) {
+            $entry = $cachedData[$key];
+            if ($entry && true === $this->_checkExpired($entry['time'], $entry['expire']))
+                return null;
+        }
+        return unserialize($cachedData[$key][$type]);
+    }
+
+    /**
+     * Retrieve all cached data
+     *
+     * @param boolean [optional] $meta
+     * @return array
+     */
+    public function retrieveAll($meta = false)
+    {
+        if ($meta === false) {
+            $results = array();
+            $cachedData = $this->_loadCache();
+            if ($cachedData) {
+                foreach ($cachedData as $k => $v) {
+                    $results[$k] = unserialize($v['data']);
+                }
+            }
+            return $results;
+        } else {
+            return $this->_loadCache();
+        }
+    }
+
+    /**
+     * Erase cached entry by its key
+     *
+     * @param string $key
+     * @return object
+     */
+    public function erase($key)
+    {
+        $cacheData = $this->_loadCache();
+        if (true === is_array($cacheData)) {
+            if (true === isset($cacheData[$key])) {
+                unset($cacheData[$key]);
+                $cacheData = json_encode($cacheData);
+                $this->_saveCache($cacheData);
+            } else {
+                throw new Exception("Error: erase() - Key '{$key}' not found.");
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Erase all expired entries
+     *
+     * @return integer
+     */
+    public function eraseExpired()
+    {
+        $cacheData = $this->_loadCache();
+        if (true === is_array($cacheData)) {
+            $counter = 0;
+            foreach ($cacheData as $key => $entry) {
+                if (true === $this->_checkExpired($entry['time'], $entry['expire'])) {
+                    unset($cacheData[$key]);
+                    $counter++;
+                }
+            }
+            if ($counter > 0) {
+                $cacheData = json_encode($cacheData);
+                $this->_saveCache($cacheData);
+            }
+            return $counter;
+        }
+    }
+
+    /**
+     * Erase all cached entries
+     * @return object
+     */
+    public function eraseAll()
+    {
+        $cacheDir = $this->getCacheDir();
+        if (true === file_exists($cacheDir)) {
+            $cacheFile = fopen($cacheDir, 'w');
+            fclose($cacheFile);
+        }
+        return $this;
+    }
+
+    /**
+     * Load appointed cache
+     * @return mixed
+     */
+    private function _loadCache()
+    {
+        if ($this->cache!=null)
+            return $this->cache;
+
+        if (true === file_exists($this->getCacheDir())) {
+            $file = file_get_contents($this->getCacheDir());
+            $this->cache=json_decode($file, true);
+            return $this->cache;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Save cache file
+     * @param $dataArray
+     */
+    private function _saveCache($dataArray)
+    {
+        $this->cache = $dataArray;
+        $cacheData = json_encode($dataArray);
+        file_put_contents($this->getCacheDir(), $cacheData);
+    }
+
+    /**
+     * Get the cache directory path
+     *
+     * @return string
+     */
+    public function getCacheDir()
+    {
+        if (true === $this->_checkCacheDir()) {
+            $filename = $this->getCache();
+            $filename = preg_replace('/[^0-9a-z\.\_\-]/i', '', strtolower($filename));
+            return $this->getCachePath() . $this->_getHash($filename) . $this->getExtension();
+        }
+    }
+
+    /**
+     * Get the filename hash
+     *
+     * @return string
+     */
+    private function _getHash($filename)
+    {
+        return sha1($filename);
+    }
+
+    /**
+     * Check whether a timestamp is still in the duration
+     *
+     * @param integer $timestamp
+     * @param integer $expiration
+     * @return boolean
+     */
+    private function _checkExpired($timestamp, $expiration)
+    {
+        $result = false;
+        if ($expiration !== 0) {
+            $timeDiff = time() - $timestamp;
+            ($timeDiff > $expiration) ? $result = true : $result = false;
+        }
+        return $result;
+    }
+
+    /**
+     * Check if a writable cache directory exists and if not create a new one
+     *
+     * @return boolean
+     */
+    private function _checkCacheDir()
+    {
+        if (!is_dir($this->getCachePath()) && !mkdir($this->getCachePath(), 0775, true)) {
+            throw new Exception('Unable to create cache directory ' . $this->getCachePath());
+        } elseif (!is_readable($this->getCachePath()) || !is_writable($this->getCachePath())) {
+            if (!chmod($this->getCachePath(), 0775)) {
+                throw new Exception($this->getCachePath() . ' must be readable and writeable');
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Cache path Setter
+     *
+     * @param string $path
+     * @return object
+     */
+    public function setCachePath($path)
+    {
+        $this->_cachepath = $path;
+        return $this;
+    }
+
+    /**
+     * Cache path Getter
+     *
+     * @return string
+     */
+    public function getCachePath()
+    {
+        return $this->_cachepath;
+    }
+
+    /**
+     * Cache name Setter
+     *
+     * @param string $name
+     * @return object
+     */
+    public function setCache($name)
+    {
+        $this->_cachename = $name;
+        return $this;
+    }
+
+    /**
+     * Cache name Getter
+     *
+     * @return void
+     */
+    public function getCache()
+    {
+        return $this->_cachename;
+    }
+
+    /**
+     * Cache file extension Setter
+     *
+     * @param string $ext
+     * @return object
+     */
+    public function setExtension($ext)
+    {
+        $this->_extension = $ext;
+        return $this;
+    }
+
+    /**
+     * Cache file extension Getter
+     *
+     * @return string
+     */
+    public function getExtension()
+    {
+        return $this->_extension;
+    }
+
+
+
+}

From 6f1a8548bad162eab6d54708dea6e02be9d3c943 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 16:46:35 +0200
Subject: [PATCH 098/353] Change object var scope

---
 include/classes/cache.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/classes/cache.class.php b/include/classes/cache.class.php
index 2bcfaa6a..92a117eb 100755
--- a/include/classes/cache.class.php
+++ b/include/classes/cache.class.php
@@ -20,23 +20,23 @@ class Cache
      *
      * @var string
      */
-    private $_cachepath = 'cache/';
+    protected $_cachepath = 'cache/';
 
     /**
      * The name of the default cache file
      *
      * @var string
      */
-    private $_cachename = 'default';
+    protected $_cachename = 'default';
 
     /**
      * The cache file extension
      *
      * @var string
      */
-    private $_extension = '.cache';
+    protected $_extension = '.cache';
 
-    private $cache;
+    protected $cache;
 
     /**
      * Default constructor

From c0721d373489fd305a0d75fd8c7663fc7489cac1 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 17:00:22 +0200
Subject: [PATCH 099/353] Load cache in Slim

---
 Slim/Extras/Middleware/FeatherBBLoader.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBBLoader.php b/Slim/Extras/Middleware/FeatherBBLoader.php
index 1c7368bc..5a36bc48 100644
--- a/Slim/Extras/Middleware/FeatherBBLoader.php
+++ b/Slim/Extras/Middleware/FeatherBBLoader.php
@@ -46,6 +46,7 @@ public function __construct(array $data)
         require $this->forum_env['FEATHER_ROOT'].'include/pomo/MO.php';
         require $this->forum_env['FEATHER_ROOT'].'include/l10n.php';
         require $this->forum_env['FEATHER_ROOT'].'include/idiorm.php';
+        require $this->forum_env['FEATHER_ROOT'].'include/classes/cache.class.php';
 
         // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
         setlocale(LC_CTYPE, 'C');
@@ -171,15 +172,20 @@ public function call()
         // Set headers
         $this->set_headers();
 
+        // Populate FeatherBB Slim object with forum_env vars
+        $this->hydrate('forum_env', $this->forum_env);
         // Record start time
         $this->app->start = get_microtime();
         // Define now var
         $this->app->now = function () {
             return time();
         };
-
-        // Populate FeatherBB Slim object with forum_env vars
-        $this->hydrate('forum_env', $this->forum_env);
+        $this->app->container->singleton('cache', function ($container) {
+            $path = $container->forum_env['FORUM_CACHE_DIR'];
+            return new \FeatherBB\Cache(array('name' => 'feather',
+                                               'path' => $path,
+                                               'extension' => '.cache'));
+        });
 
         if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) { // Block prefetch requests
             return $this->app->response->setStatus(403); // Send forbidden header

From cfbea4c8fde7b1f68192a01d7d3055d8b0a32214 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 17:21:50 +0200
Subject: [PATCH 100/353] First attempt to cache config (static data)

---
 Slim/Extras/Middleware/FeatherBBLoader.php | 10 +++-----
 model/cache.php                            | 30 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 model/cache.php

diff --git a/Slim/Extras/Middleware/FeatherBBLoader.php b/Slim/Extras/Middleware/FeatherBBLoader.php
index 5a36bc48..9eeab160 100644
--- a/Slim/Extras/Middleware/FeatherBBLoader.php
+++ b/Slim/Extras/Middleware/FeatherBBLoader.php
@@ -211,15 +211,11 @@ public function call()
                                  'cookies.encrypt' => true,
                                  'cookies.secret_key' => $this->forum_settings['cookie_seed']));
 
-        // Get forum settings from DB/cache and load it into forum_settings array
-        if (file_exists($this->forum_env['FORUM_CACHE_DIR'].'cache_config.php')) {
-            include $this->forum_env['FORUM_CACHE_DIR'].'cache_config.php';
-        } else {
-            require $this->forum_env['FEATHER_ROOT'].'include/cache.php';
-            generate_config_cache();
-            require $this->forum_env['FORUM_CACHE_DIR'].'cache_config.php';
+        if (!$this->app->cache->isCached('config')) {
+            $this->app->cache->store('config', \model\cache::get_config());
         }
 
+        $feather_config = $this->app->cache->retrieve('config');
         // Finalize forum_settings array
         $this->forum_settings = array_merge($feather_config, $this->forum_settings);
 
diff --git a/model/cache.php b/model/cache.php
new file mode 100644
index 00000000..d47f2c88
--- /dev/null
+++ b/model/cache.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace model;
+use DB;
+
+class cache
+{
+    public function __construct()
+    {
+        $this->feather = \Slim\Slim::getInstance();
+    }
+
+    public static function get_config()
+    {
+        $result = DB::for_table('config')
+                    ->find_array();
+        $config = array();
+        foreach ($result as $item) {
+            $config[$item['conf_name']] = $item['conf_value'];
+        }
+        return $config;
+    }
+}

From 0a8323b778810e11b71673af4d59fa26b26e8431 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 17:22:04 +0200
Subject: [PATCH 101/353] Tweaking cache class

---
 include/classes/cache.class.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/include/classes/cache.class.php b/include/classes/cache.class.php
index 92a117eb..c8f08c4e 100755
--- a/include/classes/cache.class.php
+++ b/include/classes/cache.class.php
@@ -58,14 +58,14 @@ public function __construct($config = null)
     }
 
     /**
-     * Check whether data accociated with a key
+     * Check whether data is associated with a key
      *
      * @param string $key
      * @return boolean
      */
     public function isCached($key)
     {
-        if (false != $this->_loadCache()) {
+        if ($this->_loadCache()) {
             $cachedData = $this->_loadCache();
             $entry = $cachedData[$key];
             if ($entry && true === $this->_checkExpired($entry['time'], $entry['expire'])) {
@@ -73,6 +73,8 @@ public function isCached($key)
             } else {
                 return isset($cachedData[$key]['data']);
             }
+        } else {
+            return false; // If cache file doesn't exist or cache is empty, nothing is cached
         }
     }
 
@@ -208,12 +210,12 @@ public function eraseAll()
      */
     private function _loadCache()
     {
-        if ($this->cache!=null)
+        if ($this->cache != null)
             return $this->cache;
 
         if (true === file_exists($this->getCacheDir())) {
             $file = file_get_contents($this->getCacheDir());
-            $this->cache=json_decode($file, true);
+            $this->cache = json_decode($file, true);
             return $this->cache;
         } else {
             return false;
@@ -264,12 +266,11 @@ private function _getHash($filename)
      */
     private function _checkExpired($timestamp, $expiration)
     {
-        $result = false;
         if ($expiration !== 0) {
             $timeDiff = time() - $timestamp;
-            ($timeDiff > $expiration) ? $result = true : $result = false;
+            return ($timeDiff > $expiration);
         }
-        return $result;
+        return false;
     }
 
     /**

From d8d4045ce3cf108221583693e6299d16876de25a Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 17:48:36 +0200
Subject: [PATCH 102/353] Refactor cache constructor and settings

---
 include/classes/cache.class.php | 42 ++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/include/classes/cache.class.php b/include/classes/cache.class.php
index c8f08c4e..ceefd06a 100755
--- a/include/classes/cache.class.php
+++ b/include/classes/cache.class.php
@@ -7,14 +7,17 @@
  * License: BSD http://www.opensource.org/licenses/bsd-license.php
  *
  * FeatherBB Cache class
- *
- * @version 1.6
+ * Usage : $cache = new \FeatherBB\Cache(array('name' => , 'path' =>, 'extension' =>));
  */
 
 namespace FeatherBB;
 
 class Cache
 {
+    /**
+     * @var array
+     */
+    protected $settings;
     /**
      * The path to the cache file folder
      *
@@ -44,17 +47,22 @@ class Cache
      * @param string|array [optional] $config
      * @return void
      */
-    public function __construct($config = null)
+    public function __construct($config = array())
     {
-        if (true === isset($config)) {
-            if (is_string($config)) {
-                $this->setCache($config);
-            } else if (is_array($config)) {
-                $this->setCache($config['name']);
-                $this->setCachePath($config['path']);
-                $this->setExtension($config['extension']);
-            }
+        if (!is_array($config)) {
+            $config = array('name' => (string) $config);
         }
+        $this->settings = array_merge(self::getDefaultSettings(), $config);
+        $this->setCache($this->settings['name']);
+        $this->setCachePath($this->settings['path']);
+        $this->setExtension($this->settings['extension']);
+    }
+
+    protected static function getDefaultSettings()
+    {
+        return array('name' => 'default',
+                     'path' => 'cache/',
+                     'extension' => '.cache');
     }
 
     /**
@@ -298,7 +306,7 @@ private function _checkCacheDir()
      */
     public function setCachePath($path)
     {
-        $this->_cachepath = $path;
+        $this->settings['path'] = $path;
         return $this;
     }
 
@@ -309,7 +317,7 @@ public function setCachePath($path)
      */
     public function getCachePath()
     {
-        return $this->_cachepath;
+        return $this->settings['path'];
     }
 
     /**
@@ -320,7 +328,7 @@ public function getCachePath()
      */
     public function setCache($name)
     {
-        $this->_cachename = $name;
+        $this->settings['name'] = $name;
         return $this;
     }
 
@@ -331,7 +339,7 @@ public function setCache($name)
      */
     public function getCache()
     {
-        return $this->_cachename;
+        return $this->settings['path'];
     }
 
     /**
@@ -342,7 +350,7 @@ public function getCache()
      */
     public function setExtension($ext)
     {
-        $this->_extension = $ext;
+        $this->settings['extension']= $ext;
         return $this;
     }
 
@@ -353,7 +361,7 @@ public function setExtension($ext)
      */
     public function getExtension()
     {
-        return $this->_extension;
+        return $this->settings['extension'];
     }
 
 

From e15a0dc5f972db1547d0d6751167a7c925ad1c2f Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 17:50:38 +0200
Subject: [PATCH 103/353] Cosmetics in cache class

---
 include/classes/cache.class.php | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/include/classes/cache.class.php b/include/classes/cache.class.php
index ceefd06a..916c5c7b 100755
--- a/include/classes/cache.class.php
+++ b/include/classes/cache.class.php
@@ -18,27 +18,10 @@ class Cache
      * @var array
      */
     protected $settings;
-    /**
-     * The path to the cache file folder
-     *
-     * @var string
-     */
-    protected $_cachepath = 'cache/';
-
-    /**
-     * The name of the default cache file
-     *
-     * @var string
-     */
-    protected $_cachename = 'default';
 
     /**
-     * The cache file extension
-     *
-     * @var string
+     * @var array
      */
-    protected $_extension = '.cache';
-
     protected $cache;
 
     /**
@@ -58,6 +41,11 @@ public function __construct($config = array())
         $this->setExtension($this->settings['extension']);
     }
 
+    /**
+     * Return default settings
+     *
+     * @return array
+     */
     protected static function getDefaultSettings()
     {
         return array('name' => 'default',

From 621dbf428b58acf0454fc1726a8a1a4d7cd25a8f Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 18:01:58 +0200
Subject: [PATCH 104/353] Add ban cache

---
 Slim/Extras/Middleware/FeatherBBAuth.php   |  6 +----
 Slim/Extras/Middleware/FeatherBBLoader.php |  1 +
 model/admin/bans.php                       | 14 +++--------
 model/admin/users.php                      | 10 +++-----
 model/cache.php                            |  7 ++++++
 model/profile.php                          | 28 +++++++++++-----------
 6 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBBAuth.php b/Slim/Extras/Middleware/FeatherBBAuth.php
index 017ef619..1026f1ff 100644
--- a/Slim/Extras/Middleware/FeatherBBAuth.php
+++ b/Slim/Extras/Middleware/FeatherBBAuth.php
@@ -181,11 +181,7 @@ public function check_bans()
 
         // If we removed any expired bans during our run-through, we need to regenerate the bans cache
         if ($bans_altered) {
-            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                require FEATHER_ROOT.'include/cache.php';
-            }
-
-            generate_bans_cache();
+            $this->app->cache->store('bans', \model\cache::get_bans());
         }
     }
 
diff --git a/Slim/Extras/Middleware/FeatherBBLoader.php b/Slim/Extras/Middleware/FeatherBBLoader.php
index 9eeab160..42e2ac7d 100644
--- a/Slim/Extras/Middleware/FeatherBBLoader.php
+++ b/Slim/Extras/Middleware/FeatherBBLoader.php
@@ -180,6 +180,7 @@ public function call()
         $this->app->now = function () {
             return time();
         };
+        // Load cache feature
         $this->app->container->singleton('cache', function ($container) {
             $path = $container->forum_env['FORUM_CACHE_DIR'];
             return new \FeatherBB\Cache(array('name' => 'feather',
diff --git a/model/admin/bans.php b/model/admin/bans.php
index c0a85f60..dad24d44 100644
--- a/model/admin/bans.php
+++ b/model/admin/bans.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
     }
- 
+
     public function add_ban_info($id = null)
     {
         $ban = array();
@@ -255,11 +255,7 @@ public function insert_ban()
         }
 
         // Regenerate the bans cache
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-
-        generate_bans_cache();
+        $this->feather->cache->store('bans', \model\cache::get_bans());
 
         redirect(get_link('admin/bans/'), __('Ban edited redirect'));
     }
@@ -271,11 +267,7 @@ public function remove_ban($ban_id)
                     ->delete();
 
         // Regenerate the bans cache
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-
-        generate_bans_cache();
+        $this->feather->cache->store('bans', \model\cache::get_bans());
 
         redirect(get_link('admin/bans/'), __('Ban removed redirect'));
     }
diff --git a/model/admin/users.php b/model/admin/users.php
index d7c80e0c..5463d4e6 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
     }
- 
+
     public function get_num_ip($ip_stats)
     {
         $num_ips = DB::for_table('posts')->where('poster_id', $ip_stats)
@@ -479,11 +479,7 @@ public function ban_users()
                 }
 
                 // Regenerate the bans cache
-                if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                    require FEATHER_ROOT . 'include/cache.php';
-                }
-
-                generate_bans_cache();
+                $this->feather->cache->store('bans', \model\cache::get_bans());
 
                 redirect(get_link('admin/users/'), __('Users banned redirect'));
             }
@@ -653,4 +649,4 @@ public function get_group_list()
 
         return $output;
     }
-}
\ No newline at end of file
+}
diff --git a/model/cache.php b/model/cache.php
index d47f2c88..25050e50 100644
--- a/model/cache.php
+++ b/model/cache.php
@@ -27,4 +27,11 @@ public static function get_config()
         }
         return $config;
     }
+
+    public static function get_bans()
+    {
+        return DB::for_table('bans')
+                ->find_array();
+    }
+
 }
diff --git a/model/profile.php b/model/profile.php
index 7fee36e6..8ddbb74d 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
     }
- 
+
     public function change_pass($id)
     {
         if ($this->request->get('key')) {
@@ -505,7 +505,7 @@ public function promote_user($id)
             ->inner_join('users', array('u.group_id', '=', 'g.g_id'), 'u')
             ->where('u.id', $id)
             ->find_one_col('g.g_promote_next_group');
-        
+
         if (!$next_group_id) {
             message(__('Bad request'), '404');
         }
@@ -515,7 +515,7 @@ public function promote_user($id)
             ->find_one()
             ->set('group_id', $next_group_id)
             ->save();
-        
+
         redirect(get_link('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
     }
 
@@ -527,10 +527,10 @@ public function delete_user($id)
         $result = DB::for_table('users')->where('id', $id)
             ->select_many($select_info_delete_user)
             ->find_one();
-        
+
         $group_id = $result['group_id'];
         $username = $result['username'];
-        
+
         if ($group_id == FEATHER_ADMIN) {
             message(__('No delete admin message'));
         }
@@ -547,13 +547,13 @@ public function delete_user($id)
                 $result = DB::for_table('forums')
                     ->select_many($select_info_delete_moderators)
                     ->find_many();
-                
+
                 foreach($result as $cur_forum) {
                     $cur_moderators = ($cur_forum['moderators'] != '') ? unserialize($cur_forum['moderators']) : array();
 
                     if (in_array($id, $cur_moderators)) {
                         unset($cur_moderators[$username]);
-                        
+
                         if (!empty($cur_moderators)) {
                             DB::for_table('forums')->where('id', $cur_forum['id'])
                                 ->find_one()
@@ -590,7 +590,7 @@ public function delete_user($id)
 
                 // Find all posts made by this user
                 $select_user_posts = array('p.id', 'p.topic_id', 't.forum_id');
-                
+
                 $result = DB::for_table('posts')
                     ->table_alias('p')
                     ->select_many($select_user_posts)
@@ -598,7 +598,7 @@ public function delete_user($id)
                     ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
                     ->where('p.poster_id', $id)
                     ->find_many();
-                
+
                 if ($result) {
                     foreach($result as $cur_post) {
                         // Determine whether this post is the "topic post" or not
@@ -606,7 +606,7 @@ public function delete_user($id)
                             ->where('topic_id', $cur_post['topic_id'])
                             ->order_by('posted')
                             ->find_one_col('id');
-                        
+
                         if ($this->db->result($result2) == $cur_post['id']) {
                             delete_topic($cur_post['topic_id']);
                         } else {
@@ -651,7 +651,7 @@ public function fetch_user_group($id)
 
 
         $info = array();
-        
+
         $select_fetch_user_group = array('old_username' => 'u.username', 'group_id' => 'u.group_id', 'is_moderator' => 'g.g_moderator');
 
         $info = DB::for_table('users')
@@ -976,7 +976,7 @@ public function update_profile($id, $info, $section)
 
             // Check if the bans table was updated and regenerate the bans cache when needed
             if ($bans_updated) {
-                generate_bans_cache();
+                $this->feather->cache->store('bans', \model\cache::get_bans());
             }
         }
 
@@ -1179,7 +1179,7 @@ public function get_group_list($user)
                 $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
             }
         }
-        
+
         return $output;
     }
 
@@ -1219,7 +1219,7 @@ public function get_forum_list($id)
 
             $output .= "\n\t\t\t\t\t\t\t\t\t".'<label><input type="checkbox" name="moderator_in['.$cur_forum['fid'].']" value="1"'.((in_array($id, $moderators)) ? ' checked="checked"' : '').' />'.feather_escape($cur_forum['forum_name']).'<br /></label>'."\n";
         }
-        
+
         return $output;
     }
 

From 5611d858c447e09d1aa526af93ccf1f86910aadf Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 18:17:43 +0200
Subject: [PATCH 105/353] Add bans read cache

---
 Slim/Extras/Middleware/FeatherBBAuth.php | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBBAuth.php b/Slim/Extras/Middleware/FeatherBBAuth.php
index 1026f1ff..c30cb4af 100644
--- a/Slim/Extras/Middleware/FeatherBBAuth.php
+++ b/Slim/Extras/Middleware/FeatherBBAuth.php
@@ -278,19 +278,12 @@ public function call()
         }
 
         load_textdomain('featherbb', $this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.mo');
-        // Load cached bans
-        if (file_exists($this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php')) {
-            include $this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php';
-        }
-
-        if (!defined('FEATHER_BANS_LOADED')) {
-            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                require $this->app->forum_env['FEATHER_ROOT'].'include/cache.php';
-            }
 
-            generate_bans_cache();
-            require $this->app->forum_env['FORUM_CACHE_DIR'].'cache_bans.php';
+        // Load bans from cache
+        if (!$this->app->cache->isCached('bans')) {
+            $this->app->cache->store('bans', \model\cache::get_config());
         }
+        $feather_bans = $this->app->cache->retrieve('bans');
 
         // Check if current user is banned
         $this->check_bans();

From 969993f860d3a467bdd0e3bc848b93e6e056c882 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 18:28:09 +0200
Subject: [PATCH 106/353] Fix typo

---
 Slim/Extras/Middleware/FeatherBBAuth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Slim/Extras/Middleware/FeatherBBAuth.php b/Slim/Extras/Middleware/FeatherBBAuth.php
index c30cb4af..1bc0e4b9 100644
--- a/Slim/Extras/Middleware/FeatherBBAuth.php
+++ b/Slim/Extras/Middleware/FeatherBBAuth.php
@@ -281,7 +281,7 @@ public function call()
 
         // Load bans from cache
         if (!$this->app->cache->isCached('bans')) {
-            $this->app->cache->store('bans', \model\cache::get_config());
+            $this->app->cache->store('bans', \model\cache::get_bans());
         }
         $feather_bans = $this->app->cache->retrieve('bans');
 

From 30216bc1dfb747435a8fdf74eaa17842631dbae6 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 18:28:24 +0200
Subject: [PATCH 107/353] Refactor isCached cache method

---
 include/classes/cache.class.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/include/classes/cache.class.php b/include/classes/cache.class.php
index 916c5c7b..c1f7c701 100755
--- a/include/classes/cache.class.php
+++ b/include/classes/cache.class.php
@@ -61,17 +61,14 @@ protected static function getDefaultSettings()
      */
     public function isCached($key)
     {
-        if ($this->_loadCache()) {
-            $cachedData = $this->_loadCache();
-            $entry = $cachedData[$key];
-            if ($entry && true === $this->_checkExpired($entry['time'], $entry['expire'])) {
-                return false;
-            } else {
-                return isset($cachedData[$key]['data']);
+        if ($cachedData = $this->_loadCache()) {
+            if (isset($cachedData[$key])) {
+                if (!$this->_checkExpired($cachedData[$key]['time'], $cachedData[$key]['expire'])) {
+                    return true;
+                }
             }
-        } else {
-            return false; // If cache file doesn't exist or cache is empty, nothing is cached
         }
+        return false; // If cache file doesn't exist or cache is empty or key doesn't exist in array, key isn't cached
     }
 
     /**

From 8e2d711a4d591fd13c8ca97ba4a60ce1d84363d5 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 18:58:37 +0200
Subject: [PATCH 108/353] Refactor censor_words function

---
 include/functions.php | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 97b8f951..81bc70e9 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -426,27 +426,23 @@ function censor_words($text)
 {
     static $search_for, $replace_with;
 
-    // If not already built in a previous call, build an array of censor words and their replacement text
-    if (!isset($search_for)) {
-        if (file_exists(FORUM_CACHE_DIR.'cache_censoring.php')) {
-            include FORUM_CACHE_DIR.'cache_censoring.php';
-        }
-
-        if (!defined('FEATHER_CENSOR_LOADED')) {
-            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                require FEATHER_ROOT.'include/cache.php';
-            }
+    $feather = \Slim\Slim::getInstance();
 
-            generate_censoring_cache();
-            require FORUM_CACHE_DIR.'cache_censoring.php';
-        }
+    if (!$this->feather->cache->isCached('search_for')) {
+        $this->feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
+        $search_for = $this->feather->cache->retrieve('search_for');
     }
 
-    if (!empty($search_for)) {
-        $text = substr(ucp_preg_replace($search_for, $replace_with, ' '.$text.' '), 1, -1);
+    if (!$this->feather->cache->isCached('replace_with')) {
+        $this->feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
+        $replace_with = $this->feather->cache->retrieve('replace_with');
     }
 
-    return $text;
+    if (!empty($search_for) && !empty($replace_with)) {
+        return substr(ucp_preg_replace($search_for, $replace_with, ' '.$text.' '), 1, -1);
+    } else {
+        return $text;
+    }
 }
 
 
@@ -462,7 +458,6 @@ function get_title($user)
     // If not already built in a previous call, build an array of lowercase banned usernames
     if (empty($ban_list)) {
         $ban_list = array();
-
         foreach ($feather_bans as $cur_ban) {
             $ban_list[] = utf8_strtolower($cur_ban['username']);
         }

From ccc8478e91ef655b2920268eb8973f98f5db99eb Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 18:58:53 +0200
Subject: [PATCH 109/353] Add censoring cache

---
 model/admin/censoring.php | 23 +++++++----------------
 model/cache.php           | 13 +++++++++++++
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/model/admin/censoring.php b/model/admin/censoring.php
index 473769ca..7434840b 100644
--- a/model/admin/censoring.php
+++ b/model/admin/censoring.php
@@ -40,11 +40,8 @@ public function add_word()
             ->save();
 
         // Regenerate the censoring cache
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-
-        generate_censoring_cache();
+        $this->feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
+        $this->feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
 
         redirect(get_link('admin/censoring/'), __('Word added redirect'));
     }
@@ -69,11 +66,8 @@ public function update_word()
             ->save();
 
         // Regenerate the censoring cache
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-
-        generate_censoring_cache();
+        $this->feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
+        $this->feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
 
         redirect(get_link('admin/censoring/'), __('Word updated redirect'));
     }
@@ -87,11 +81,8 @@ public function remove_word()
             ->delete();
 
         // Regenerate the censoring cache
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-
-        generate_censoring_cache();
+        $this->feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
+        $this->feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
 
         redirect(get_link('admin/censoring/'),  __('Word removed redirect'));
     }
@@ -106,4 +97,4 @@ public function get_words()
 
         return $word_data;
     }
-}
\ No newline at end of file
+}
diff --git a/model/cache.php b/model/cache.php
index 25050e50..7e1e9475 100644
--- a/model/cache.php
+++ b/model/cache.php
@@ -34,4 +34,17 @@ public static function get_bans()
                 ->find_array();
     }
 
+    public static function get_censoring($select_censoring = 'search_for')
+    {
+        $result = DB::for_table('censoring')
+                    ->select_many($select_censoring)
+                    ->find_array();
+        $output = array();
+
+        foreach ($result as $item) {
+            $output[] = ($select_censoring == 'search_for') ? '%(?<=[^\p{L}\p{N}])('.str_replace('\*', '[\p{L}\p{N}]*?', preg_quote($item['search_for'], '%')).')(?=[^\p{L}\p{N}])%iu' : $item['replace_with'];
+        }
+        return $output;
+    }
+
 }

From 8450694f8544d73da9cfaf0ee633aef636452524 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 19 Aug 2015 19:33:10 +0200
Subject: [PATCH 110/353] Add users info and admin ids cache

---
 extern.php            | 14 ++-------
 include/cache.php     | 66 -------------------------------------------
 include/functions.php | 17 ++++-------
 model/admin/users.php |  6 ++--
 model/cache.php       | 24 ++++++++++++++++
 model/index.php       | 32 ++++++++-------------
 model/login.php       | 14 ++++-----
 model/profile.php     | 22 +++++++--------
 model/register.php    |  8 +++---
 9 files changed, 69 insertions(+), 134 deletions(-)

diff --git a/extern.php b/extern.php
index 3bbc6d4a..327693d0 100644
--- a/extern.php
+++ b/extern.php
@@ -716,19 +716,11 @@ function output_html($feed)
 // Show board statistics
 elseif ($action == 'stats') {
 
-    // Collect some statistics from the database
-    if (file_exists(FORUM_CACHE_DIR.'cache_users_info.php')) {
-        include FORUM_CACHE_DIR.'cache_users_info.php';
+    if (!$this->feather->cache->isCached('users_info')) {
+        $this->feather->cache->store('users_info', \model\cache::get_users_info());
     }
 
-    if (!defined('FEATHER_USERS_INFO_LOADED')) {
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-
-        generate_users_info_cache();
-        require FORUM_CACHE_DIR.'cache_users_info.php';
-    }
+    $stats = $this->feather->cache->retrieve('users_info');
 
     $stats_query = \DB::for_table('forums')
                         ->select_expr('SUM(num_topics)', 'total_topics')
diff --git a/include/cache.php b/include/cache.php
index 17312bd9..258ffd6d 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -7,49 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-
-//
-// Generate the config cache PHP script
-//
-function generate_config_cache()
-{
-    // Get the forum config from the DB
-    $result = \DB::for_table('config')->find_array();
-
-    $output = array();
-    foreach ($result as $cur_config_item) {
-        $output[$cur_config_item['conf_name']] = $cur_config_item['conf_value'];
-    }
-
-    // Output config as PHP code
-    $content = '<?php'."\n\n".'define(\'FEATHER_CONFIG_LOADED\', 1);'."\n\n".'$feather_config = '.var_export($output, true).';'."\n\n".'?>';
-    featherbb_write_cache_file('cache_config.php', $content);
-}
-
-
-//
-// Generate the bans cache PHP script
-//
-function generate_bans_cache()
-{
-    // Get the ban list from the DB
-    $result = \DB::for_table('bans')->find_array();
-
-    $output = array();
-    foreach ($result as $cur_ban) {
-        $output[] = $cur_ban;
-    }
-
-    // Output ban list as PHP code
-    $content = '<?php'."\n\n".'define(\'FEATHER_BANS_LOADED\', 1);'."\n\n".'$feather_bans = '.var_export($output, true).';'."\n\n".'?>';
-    featherbb_write_cache_file('cache_bans.php', $content);
-}
-
 
 //
 // Generate quick jump cache PHP scripts
@@ -130,29 +87,6 @@ function generate_quickjump_cache($group_id = false)
     }
 }
 
-
-//
-// Generate the censoring cache PHP script
-//
-function generate_censoring_cache()
-{
-    $select_generate_censoring_cache = array('search_for', 'replace_with');
-    $result = \DB::for_table('censoring')->select_many($select_generate_censoring_cache)
-                    ->find_many();
-
-    $search_for = $replace_with = array();
-    $i = 0;
-    foreach ($result as $row) {
-        $replace_with[$i] = $row['replace_with'];
-        $search_for[$i] = '%(?<=[^\p{L}\p{N}])('.str_replace('\*', '[\p{L}\p{N}]*?', preg_quote($row['search_for'], '%')).')(?=[^\p{L}\p{N}])%iu';
-        ++$i;
-    }
-
-    // Output censored words as PHP code
-    $content = '<?php'."\n\n".'define(\'FEATHER_CENSOR_LOADED\', 1);'."\n\n".'$search_for = '.var_export($search_for, true).';'."\n\n".'$replace_with = '.var_export($replace_with, true).';'."\n\n".'?>';
-    featherbb_write_cache_file('cache_censoring.php', $content);
-}
-
 //
 // Generate a cache ID based on the last modification time for all stopwords files
 //
diff --git a/include/functions.php b/include/functions.php
index 81bc70e9..c4363a9f 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -74,20 +74,13 @@ function get_base_url($support_https = false)
 //
 function get_admin_ids()
 {
-    if (file_exists(FORUM_CACHE_DIR.'cache_admins.php')) {
-        include FORUM_CACHE_DIR.'cache_admins.php';
-    }
-
-    if (!defined('FEATHER_ADMINS_LOADED')) {
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-
-        generate_admins_cache();
-        require FORUM_CACHE_DIR.'cache_admins.php';
+    // Get Slim current session
+    $feather = \Slim\Slim::getInstance();
+    if (!$this->feather->cache->isCached('admin_ids')) {
+        $this->feather->cache->store('admin_ids', \model\cache::get_admin_ids());
     }
 
-    return $feather_admins;
+    return $this->feather->cache->retrieve('admin_ids');
 }
 
 
diff --git a/model/admin/users.php b/model/admin/users.php
index 5463d4e6..58ccea8a 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -366,11 +366,11 @@ public function delete_users()
             }
 
             // Regenerate the users info cache
-            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                require FEATHER_ROOT.'include/cache.php';
+            if (!$this->feather->cache->isCached('users_info')) {
+                $this->feather->cache->store('users_info', \model\cache::get_users_info());
             }
 
-            generate_users_info_cache();
+            $stats = $this->feather->cache->retrieve('users_info');
 
             redirect(get_link('admin/users/'), __('Users delete redirect'));
         }
diff --git a/model/cache.php b/model/cache.php
index 7e1e9475..d5867536 100644
--- a/model/cache.php
+++ b/model/cache.php
@@ -47,4 +47,28 @@ public static function get_censoring($select_censoring = 'search_for')
         return $output;
     }
 
+    public static function get_users_info()
+    {
+        $stats = array();
+        $select_get_users_info = array('id', 'username');
+        $stats['total_users'] = DB::for_table('users')
+                                    ->where_not_equal('group_id', FEATHER_UNVERIFIED)
+                                    ->where_not_equal('id', 1)
+                                    ->count();
+        $stats['last_user'] = DB::for_table('users')->select_many($select_get_users_info)
+                            ->where_not_equal('group_id', FEATHER_UNVERIFIED)
+                            ->order_by_desc('registered')
+                            ->limit(1)
+                            ->find_array()[0];
+        return $stats;
+    }
+
+    public static function get_admin_ids()
+    {
+        return DB::for_table('users')
+                ->select('id')
+                ->where('group_id', FEATHER_ADMIN)
+                ->find_array();
+    }
+
 }
diff --git a/model/index.php b/model/index.php
index 986a3715..0a7ac667 100644
--- a/model/index.php
+++ b/model/index.php
@@ -22,7 +22,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
     }
-    
+
     // Returns page head
     public function get_page_head()
     {
@@ -50,7 +50,7 @@ public function get_forum_actions()
 
     // Detects if a "new" icon has to be displayed
     public function get_new_posts()
-    {   
+    {
         $select_get_new_posts = array('f.id', 'f.last_post');
         $where_get_new_posts_any = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -65,7 +65,7 @@ public function get_new_posts()
             ->where_any_is($where_get_new_posts_any)
             ->where_gt('f.last_post', $this->user->last_visit)
             ->find_result_set();
-        
+
         $forums = $new_topics = array();
         $tracked_topics = get_tracked_topics();
 
@@ -78,7 +78,7 @@ public function get_new_posts()
         if (!empty($forums)) {
             if (empty($tracked_topics['topics'])) {
                 $new_topics = $forums;
-            } else {   
+            } else {
                 $select_get_new_posts_tracked_topics = array('forum_id', 'id', 'last_post');
 
                 $result = DB::for_table('topics')
@@ -106,14 +106,14 @@ public function print_categories_forums()
         if (!$this->user->is_guest) {
             $new_topics = $this->get_new_posts();
         }
-        
+
         $select_print_categories_forums = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.forum_desc', 'f.redirect_url', 'f.moderators', 'f.num_topics', 'f.num_posts', 'f.last_post', 'f.last_post_id', 'f.last_poster');
         $where_print_categories_forums = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
         $order_by_print_categories_forums = array('c.disp_position', 'c.id', 'f.disp_position');
-        
+
         $result = DB::for_table('categories')
             ->table_alias('c')
             ->select_many($select_print_categories_forums)
@@ -210,25 +210,17 @@ public function print_categories_forums()
     // Returns the elements needed to display stats
     public function collect_stats()
     {
-        // Collect some statistics from the database
-        if (file_exists(FORUM_CACHE_DIR.'cache_users_info.php')) {
-            include FORUM_CACHE_DIR.'cache_users_info.php';
+        if (!$this->feather->cache->isCached('users_info')) {
+            $this->feather->cache->store('users_info', \model\cache::get_users_info());
         }
 
-        if (!defined('FEATHER_USERS_INFO_LOADED')) {
-            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                require FEATHER_ROOT.'include/cache.php';
-            }
+        $stats = $this->feather->cache->retrieve('users_info');
 
-            generate_users_info_cache();
-            require FORUM_CACHE_DIR.'cache_users_info.php';
-        }
-        
         $stats_query = DB::for_table('forums')
                         ->select_expr('SUM(num_topics)', 'total_topics')
                         ->select_expr('SUM(num_posts)', 'total_posts')
                         ->find_one();
-        
+
         $stats['total_topics'] = intval($stats_query['total_topics']);
         $stats['total_posts'] = intval($stats_query['total_posts']);
 
@@ -251,7 +243,7 @@ public function fetch_users_online()
         $select_fetch_users_online = array('user_id', 'ident');
         $where_fetch_users_online = array('idle' => '0');
         $order_by_fetch_users_online = array('ident');
-        
+
         $result = DB::for_table('online')
             ->select_many($select_fetch_users_online)
             ->where($where_fetch_users_online)
@@ -279,4 +271,4 @@ public function fetch_users_online()
 
         return $online;
     }
-}
\ No newline at end of file
+}
diff --git a/model/login.php b/model/login.php
index 5c5ac99d..f3234e59 100644
--- a/model/login.php
+++ b/model/login.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
     }
- 
+
     public function login()
     {
         $form_username = feather_trim($this->request->post('req_username'));
@@ -65,11 +65,11 @@ public function login()
                                                       ->save();
 
             // Regenerate the users info cache
-            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                require FEATHER_ROOT.'include/cache.php';
+            if (!$this->feather->cache->isCached('users_info')) {
+                $this->feather->cache->store('users_info', \model\cache::get_users_info());
             }
 
-            generate_users_info_cache();
+            $stats = $this->feather->cache->retrieve('users_info');
         }
 
         // Remove this user's guest entry from the online list
@@ -161,13 +161,13 @@ public function password_forgotten()
                         // Generate a new password and a new password activation code
                         $new_password = random_pass(12);
                         $new_password_key = random_pass(8);
- 
+
                         $update_password = array(
                             'activate_string' => feather_hash($new_password),
                             'activate_key'    => $new_password_key,
                             'last_email_sent' => time()
                         );
-                        
+
                         DB::for_table('users')->where('id', $cur_hit->id)
                                                                   ->find_one()
                                                                   ->set($update_password)
@@ -205,4 +205,4 @@ public function get_redirect_url($server_data)
 
         return $redirect_url;
     }
-}
\ No newline at end of file
+}
diff --git a/model/profile.php b/model/profile.php
index 8ddbb74d..71c06b8c 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -372,14 +372,14 @@ public function update_group_membership($id)
             ->save();
 
         // Regenerate the users info cache
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
+        if (!$this->feather->cache->isCached('users_info')) {
+            $this->feather->cache->store('users_info', \model\cache::get_users_info());
         }
 
-        generate_users_info_cache();
+        $stats = $this->feather->cache->retrieve('users_info');
 
         if ($old_group_id == FEATHER_ADMIN || $new_group_id == FEATHER_ADMIN) {
-            generate_admins_cache();
+            $this->feather->cache->store('admin_ids', \model\cache::get_admin_ids());
         }
 
         $new_group_mod = DB::for_table('groups')
@@ -632,14 +632,14 @@ public function delete_user($id)
             delete_avatar($id);
 
             // Regenerate the users info cache
-            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                require FEATHER_ROOT.'include/cache.php';
+            if (!$this->feather->cache->isCached('users_info')) {
+                $this->feather->cache->store('users_info', \model\cache::get_users_info());
             }
 
-            generate_users_info_cache();
+            $stats = $this->feather->cache->retrieve('users_info');
 
             if ($group_id == FEATHER_ADMIN) {
-                generate_admins_cache();
+                $this->feather->cache->store('admin_ids', \model\cache::get_admin_ids());
             }
 
             redirect(get_base_url(), __('User delete redirect'));
@@ -968,11 +968,11 @@ public function update_profile($id, $info, $section)
             }
 
             // Regenerate the users info cache
-            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                require FEATHER_ROOT.'include/cache.php';
+            if (!$this->feather->cache->isCached('users_info')) {
+                $this->feather->cache->store('users_info', \model\cache::get_users_info());
             }
 
-            generate_users_info_cache();
+            $stats = $this->feather->cache->retrieve('users_info');
 
             // Check if the bans table was updated and regenerate the bans cache when needed
             if ($bans_updated) {
diff --git a/model/register.php b/model/register.php
index 8152bc20..3f04bb64 100644
--- a/model/register.php
+++ b/model/register.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
     }
- 
+
     public function check_for_errors()
     {
         global $lang_register, $lang_antispam, $lang_antispam_questions;
@@ -155,11 +155,11 @@ public function insert_user($user)
 
         if ($this->config['o_regs_verify'] == '0') {
             // Regenerate the users info cache
-            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                require FEATHER_ROOT.'include/cache.php';
+            if (!$this->feather->cache->isCached('users_info')) {
+                $this->feather->cache->store('users_info', \model\cache::get_users_info());
             }
 
-            generate_users_info_cache();
+            $stats = $this->feather->cache->retrieve('users_info');
         }
 
         // If the mailing list isn't empty, we may need to send out some alerts

From ef0aa55cf5b3775f3240d7a4302ffe099904428b Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 19 Aug 2015 22:11:38 +0200
Subject: [PATCH 111/353] Add more hooks

---
 controller/login.php        |   2 +-
 include/hooks.php           |   9 +++-
 model/delete.php            |   4 ++
 model/edit.php              |  10 ++++
 model/header.php            |   2 +
 model/index.php             |  14 ++++-
 model/login.php             | 101 +++++++++++++++++++++---------------
 plugins/test/plugintest.php |   4 +-
 8 files changed, 98 insertions(+), 48 deletions(-)

diff --git a/controller/login.php b/controller/login.php
index 277e6378..a84d8ea9 100644
--- a/controller/login.php
+++ b/controller/login.php
@@ -37,7 +37,7 @@ public function display()
         }
 
         // TODO?: Try to determine if the data in HTTP_REFERER is valid (if not, we redirect to index.php after login)
-        $redirect_url = $this->model->get_redirect_url($_SERVER);
+        $redirect_url = $this->model->get_redirect_url();
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Login'));
         $required_fields = array('req_username' => __('Username'), 'req_password' => __('Password'));
diff --git a/include/hooks.php b/include/hooks.php
index 77875fe2..c8ed4387 100644
--- a/include/hooks.php
+++ b/include/hooks.php
@@ -37,7 +37,12 @@ public function fire($name)
 
         if (!isset($this->hooks[$name])) {
             $this->hooks[$name] = array(array());
-            return $args[0];
+            if (isset ($args[0])) {
+                return $args[0];
+            }
+            else {
+                return;
+            }
         }
         if (!empty($this->hooks[$name])) {
             // Sort by priority, low to high, if there's more than one priority
@@ -76,7 +81,7 @@ public function fire($name)
     /**
      * Invoke hook for DB
      * @param  string $name The hook name
-     * @param  mixed  ...   (Optional) Argument(s) for hooked functions, can specify multiple arguments
+     * @param  mixed  ...   Argument(s) for hooked functions, can specify multiple arguments
      */
     public function fireDB($name)
     {
diff --git a/model/delete.php b/model/delete.php
index 82db289e..18df47c0 100644
--- a/model/delete.php
+++ b/model/delete.php
@@ -25,6 +25,8 @@ public function __construct()
  
     public function get_info_delete($id)
     {
+        $this->hook->fire('get_info_delete_start');
+
         $query['select'] = array('fid' => 'f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_replies',  'fp.post_topics', 'tid' => 't.id', 't.subject', 't.first_post_id', 't.closed', 'p.poster', 'p.posted', 'p.poster_id', 'p.message', 'p.hide_smilies');
         $query['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -54,6 +56,8 @@ public function get_info_delete($id)
 
     public function handle_deletion($is_topic_post, $id, $tid, $fid)
     {
+        $this->hook->fire('handle_deletion_start');
+
         require FEATHER_ROOT.'include/search_idx.php';
 
         if ($is_topic_post) {
diff --git a/model/edit.php b/model/edit.php
index eb95c75b..790a1672 100644
--- a/model/edit.php
+++ b/model/edit.php
@@ -26,6 +26,8 @@ public function __construct()
     // Fetch some info about the post, the topic and the forum
     public function get_info_edit($id)
     {
+        $this->hook->fire('get_info_edit_start');
+
         $cur_post['select'] = array('fid' => 'f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_topics', 'tid' => 't.id', 't.subject', 't.posted', 't.first_post_id', 't.sticky', 't.closed', 'p.poster', 'p.poster_id', 'p.message', 'p.hide_smilies');
         $cur_post['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -57,6 +59,8 @@ public function check_errors_before_edit($can_edit_subject, $errors)
     {
         global $pd;
 
+        $this->hook->fire('check_errors_before_edit_start');
+
         // If it's a topic it must contain a subject
         if ($can_edit_subject) {
             $subject = feather_trim($this->request->post('req_subject'));
@@ -115,6 +119,8 @@ public function setup_variables($cur_post, $is_admmod, $can_edit_subject, $error
     {
         global $pd;
 
+        $this->hook->fire('setup_variables_start');
+
         $post = array();
 
         $post['hide_smilies'] = $this->request->post('hide_smilies') ? '1' : '0';
@@ -147,6 +153,8 @@ public function setup_variables($cur_post, $is_admmod, $can_edit_subject, $error
 
     public function edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod)
     {
+        $this->hook->fire('edit_post_start');
+
         require FEATHER_ROOT.'include/search_idx.php';
 
         if ($can_edit_subject) {
@@ -197,6 +205,8 @@ public function edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod)
 
     public function get_checkboxes($can_edit_subject, $is_admmod, $cur_post, $cur_index)
     {
+        $this->hook->fire('get_checkboxes_start');
+
         $checkboxes = array();
 
         if ($can_edit_subject && $is_admmod) {
diff --git a/model/header.php b/model/header.php
index ea9a2ac6..8a254fa5 100644
--- a/model/header.php
+++ b/model/header.php
@@ -25,6 +25,8 @@ public function __construct()
 
     public function get_reports()
     {
+        $this->hook->fire('get_reports_start');
+
         $result_header = DB::for_table('reports')->where_null('zapped');
 
         $result_header = $this->hook->fireDB('get_reports_query', $result_header);
diff --git a/model/index.php b/model/index.php
index a4852a19..42455186 100644
--- a/model/index.php
+++ b/model/index.php
@@ -27,6 +27,8 @@ public function __construct()
     // Returns page head
     public function get_page_head()
     {
+        $this->hook->fire('get_page_head_start');
+
         if ($this->config['o_feed_type'] == '1') {
             $page_head = array('feed' => '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;type=rss" title="'.__('RSS active topics feed').'" />');
         } elseif ($this->config['o_feed_type'] == '2') {
@@ -41,6 +43,8 @@ public function get_page_head()
     // Returns forum action
     public function get_forum_actions()
     {
+        $this->hook->fire('get_forum_actions_start');
+
         $forum_actions = array();
 
         // Display a "mark all as read" link
@@ -55,7 +59,9 @@ public function get_forum_actions()
 
     // Detects if a "new" icon has to be displayed
     public function get_new_posts()
-    {   
+    {
+        $this->hook->fire('get_new_posts_start');
+
         $query['select'] = array('f.id', 'f.last_post');
         $query['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -115,6 +121,8 @@ public function get_new_posts()
     // Returns the elements needed to display categories and their forums
     public function print_categories_forums()
     {
+        $this->hook->fire('print_categories_forums_start');
+
         // Get list of forums and topics with new posts since last visit
         if (!$this->user->is_guest) {
             $new_topics = $this->get_new_posts();
@@ -227,6 +235,8 @@ public function print_categories_forums()
     // Returns the elements needed to display stats
     public function collect_stats()
     {
+        $this->hook->fire('collect_stats_start');
+
         // Collect some statistics from the database
         if (file_exists(FORUM_CACHE_DIR.'cache_users_info.php')) {
             include FORUM_CACHE_DIR.'cache_users_info.php';
@@ -266,6 +276,8 @@ public function collect_stats()
     // Returns the elements needed to display users online
     public function fetch_users_online()
     {
+        $this->hook->fire('fetch_users_online_start');
+
         // Fetch users online info and generate strings for output
         $online = array();
         $online['num_guests'] = 0;
diff --git a/model/login.php b/model/login.php
index 14c3fd32..223466f7 100644
--- a/model/login.php
+++ b/model/login.php
@@ -20,49 +20,43 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
  
     public function login()
     {
+        $this->hook->fire('login_start');
+
         $form_username = feather_trim($this->request->post('req_username'));
         $form_password = feather_trim($this->request->post('req_password'));
         $save_pass = $this->request->post('save_pass');
 
-        $user = DB::for_table('users')->where('username', $form_username)->find_one();
+        $user = DB::for_table('users')->where('username', $form_username);
+
+        $user = $this->hook->fireDB('find_user_login', $user);
+
+        $user = $user->find_one();
 
         $authorized = false;
 
         if (!empty($user->password)) {
             $form_password_hash = feather_hash($form_password); // Will result in a SHA-1 hash
-
-            // If the length isn't 40 then the password isn't using sha1, so it must be md5 from 1.2
-            // Maybe this should be removed
-            if (strlen($user->password) != 40) {
-                if (md5($form_password) == $user->password) {
-                    $authorized = true;
-
-                    DB::for_table('users')->where('id', $user->id)
-                                                              ->find_one()
-                                                              ->set('password', $form_password_hash)
-                                                              ->save();
-                }
-            }
-            // Otherwise we should have a normal sha1 password
-            else {
-                $authorized = ($user->password == $form_password_hash);
-            }
+            $authorized = ($user->password == $form_password_hash);
         }
 
+        $authorized = $this->hook->fire('authorized_login', $authorized);
+
         if (!$authorized) {
             message(__('Wrong user/pass').' <a href="'.get_link('login/action/forget/').'">'.__('Forgotten pass').'</a>');
         }
 
         // Update the status if this is the first time the user logged in
         if ($user->group_id == FEATHER_UNVERIFIED) {
-            DB::for_table('users')->where('id', $user->id)
+            $update_usergroup = DB::for_table('users')->where('id', $user->id)
                                                       ->find_one()
-                                                      ->set('group_id', $this->config['o_default_user_group'])
-                                                      ->save();
+                                                      ->set('group_id', $this->config['o_default_user_group']);
+            $update_usergroup = $this->hook->fireDB('update_usergroup_login', $update_usergroup);
+            $update_usergroup = $update_usergroup->save();
 
             // Regenerate the users info cache
             if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
@@ -73,10 +67,12 @@ public function login()
         }
 
         // Remove this user's guest entry from the online list
-        DB::for_table('online')->where('ident', get_remote_address())
-                                                   ->delete_many();
+        $delete_online = DB::for_table('online')->where('ident', get_remote_address());
+        $delete_online = $this->hook->fireDB('delete_online_login', $delete_online);
+        $delete_online = $delete_online->delete_many();
 
         $expire = ($save_pass == '1') ? time() + 1209600 : time() + $this->config['o_timeout_visit'];
+        $expire = $this->hook->fire('expire_login', $expire);
         feather_setcookie($user->id, $form_password_hash, $expire);
 
         // Reset tracked topics
@@ -84,29 +80,36 @@ public function login()
 
         // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after login)
         $redirect_url = validate_redirect($this->request->post('redirect_url'), get_base_url());
+        $redirect_url = $this->hook->fire('redirect_url_login', $redirect_url);
 
         redirect(feather_escape($redirect_url), __('Login redirect'));
     }
 
     public function logout($id, $token)
     {
+        $this->hook->fire('logout_start');
+
         if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != feather_hash($this->user->id.feather_hash(get_remote_address()))) {
             header('Location: '.get_base_url());
             exit;
         }
 
         // Remove user from "users online" list
-        DB::for_table('online')->where('user_id', $this->user->id)
-                                                   ->delete_many();
+        $delete_online = DB::for_table('online')->where('user_id', $this->user->id);
+        $delete_online = $this->hook->fireDB('delete_online_logout', $delete_online);
+        $delete_online = $delete_online->delete_many();
 
         // Update last_visit (make sure there's something to update it with)
         if (isset($this->user->logged)) {
-            DB::for_table('users')->where('id', $this->user->id)
-                                                      ->find_one()
-                                                      ->set('last_visit', $this->user->logged)
-                                                      ->save();
+            $update_last_visit = DB::for_table('users')->where('id', $this->user->id)
+                                                       ->find_one()
+                                                       ->set('last_visit', $this->user->logged);
+            $update_last_visit = $this->hook->fireDB('update_online_logout', $update_last_visit);
+            $update_last_visit = $update_last_visit->save();
         }
 
+        $this->hook->fire('logout_end');
+
         feather_setcookie(1, feather_hash(uniqid(rand(), true)), time() + 31536000);
 
         redirect(get_base_url(), __('Logout redirect'));
@@ -114,6 +117,8 @@ public function logout($id, $token)
 
     public function password_forgotten()
     {
+        $this->hook->fire('password_forgotten_start');
+
         if (!$this->user->is_guest) {
             header('Location: '.get_base_url());
             exit;
@@ -132,16 +137,18 @@ public function password_forgotten()
 
             // Did everything go according to plan?
             if (empty($errors)) {
-                $select_password_forgotten = array('id', 'username', 'last_email_sent');
+                $result['select'] = array('id', 'username', 'last_email_sent');
 
                 $result = DB::for_table('users')
-                    ->select_many($select_password_forgotten)
-                    ->where('email', $email)
-                    ->find_many();
+                    ->select_many($result['select'])
+                    ->where('email', $email);
+                $result = $this->hook->fireDB('password_forgotten_query', $result);
+                $result = $result->find_many();
 
                 if ($result) {
                     // Load the "activate password" template
                     $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/activate_password.tpl'));
+                    $mail_tpl = $this->hook->fire('mail_tpl_password_forgotten', $mail_tpl);
 
                     // The first row contains the subject
                     $first_crlf = strpos($mail_tpl, "\n");
@@ -152,6 +159,8 @@ public function password_forgotten()
                     $mail_message = str_replace('<base_url>', get_base_url().'/', $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
+                    $mail_message = $this->hook->fire('mail_message_password_forgotten', $mail_message);
+
                     // Loop through users we found
                     foreach($result as $cur_hit) {
                         if ($cur_hit->last_email_sent != '' && (time() - $cur_hit->last_email_sent) < 3600 && (time() - $cur_hit->last_email_sent) >= 0) {
@@ -161,22 +170,24 @@ public function password_forgotten()
                         // Generate a new password and a new password activation code
                         $new_password = random_pass(12);
                         $new_password_key = random_pass(8);
- 
-                        $update_password = array(
+
+                        $query['update'] = array(
                             'activate_string' => feather_hash($new_password),
                             'activate_key'    => $new_password_key,
                             'last_email_sent' => time()
                         );
                         
-                        DB::for_table('users')->where('id', $cur_hit->id)
-                                                                  ->find_one()
-                                                                  ->set($update_password)
-                                                                  ->save();
+                        $query = DB::for_table('users')->where('id', $cur_hit->id)
+                                                      ->find_one()
+                                                      ->set($query['update']);
+                        $query = $this->hook->fireDB('password_forgotten_mail_query', $query);
+                        $query = $query->save();
 
                         // Do the user specific replacements to the template
                         $cur_mail_message = str_replace('<username>', $cur_hit->username, $mail_message);
                         $cur_mail_message = str_replace('<activation_url>', get_link('user/'.$cur_hit->id.'/action/change_pass/?key='.$new_password_key), $cur_mail_message);
                         $cur_mail_message = str_replace('<new_password>', $new_password, $cur_mail_message);
+                        $cur_mail_message = $this->hook->fire('cur_mail_message_password_forgotten', $cur_mail_message);
 
                         feather_mail($email, $mail_subject, $cur_mail_message);
                     }
@@ -188,13 +199,17 @@ public function password_forgotten()
             }
         }
 
+        $errors = $this->hook->fire('password_forgotten', $errors);
+
         return $errors;
     }
 
-    public function get_redirect_url($server_data)
+    public function get_redirect_url()
     {
-        if (!empty($server_data['HTTP_REFERER'])) {
-            $redirect_url = validate_redirect($server_data['HTTP_REFERER'], null);
+        $this->hook->fire('get_redirect_url_start');
+
+        if (!empty($this->request->getReferrer())) {
+            $redirect_url = validate_redirect($this->request->getReferrer(), null);
         }
 
         if (!isset($redirect_url)) {
@@ -203,6 +218,8 @@ public function get_redirect_url($server_data)
             $redirect_url .= '#p'.$matches[1];
         }
 
+        $redirect_url = $this->hook->fire('get_redirect_url', $redirect_url);
+
         return $redirect_url;
     }
 }
\ No newline at end of file
diff --git a/plugins/test/plugintest.php b/plugins/test/plugintest.php
index b3f3ad9d..c9fe31f2 100644
--- a/plugins/test/plugintest.php
+++ b/plugins/test/plugintest.php
@@ -36,9 +36,9 @@ public function __construct()
             return $query;
         });
 
-        $this->hook->bind('query_fetch_users_online', function ($query) {
+        /*$this->hook->bind('query_fetch_users_online', function ($query) {
             $query = $query->offset(50);
             return $query;
-        });
+        });*/
     }
 }
\ No newline at end of file

From 301281c5fd7d2d4b5428b730d9100609708f0127 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 20 Aug 2015 14:36:33 +0200
Subject: [PATCH 112/353] Add more hooks

---
 controller/misc.php |   2 +-
 model/delete.php    |   2 +-
 model/edit.php      |   5 +-
 model/login.php     |   6 +-
 model/misc.php      | 215 +++++++++++++++++++++++++++-----------------
 5 files changed, 141 insertions(+), 89 deletions(-)

diff --git a/controller/misc.php b/controller/misc.php
index be6c2e2e..f6d108a5 100644
--- a/controller/misc.php
+++ b/controller/misc.php
@@ -131,7 +131,7 @@ public function email($id)
 
 
         if ($this->feather->request()->isPost()) {
-            $this->model->send_email($mail, $id);
+            $this->model->send_email($mail);
         }
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Send email to').' '.feather_escape($mail['recipient']));
diff --git a/model/delete.php b/model/delete.php
index 18df47c0..18e413ea 100644
--- a/model/delete.php
+++ b/model/delete.php
@@ -25,7 +25,7 @@ public function __construct()
  
     public function get_info_delete($id)
     {
-        $this->hook->fire('get_info_delete_start');
+        $id = $this->hook->fire('get_info_delete_start', $id);
 
         $query['select'] = array('fid' => 'f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_replies',  'fp.post_topics', 'tid' => 't.id', 't.subject', 't.first_post_id', 't.closed', 'p.poster', 'p.posted', 'p.poster_id', 'p.message', 'p.hide_smilies');
         $query['where'] = array(
diff --git a/model/edit.php b/model/edit.php
index 790a1672..faf9834f 100644
--- a/model/edit.php
+++ b/model/edit.php
@@ -184,6 +184,7 @@ public function edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod)
         }
         
         // Update the post
+        unset($query);
         $query['update_post'] = array(
             'message' => $post['message'],
             'hide_smilies'  => $post['hide_smilies']
@@ -197,9 +198,7 @@ public function edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod)
         $query = DB::for_table('posts')->where('id', $id)
                                        ->find_one()
                                        ->set($query['update_post']);
-
-        $query = $this->hook->fireDB('edit_post_can_edit_subject', $query);
-
+        $query = $this->hook->fireDB('edit_post_query', $query);
         $query = $query->save();
     }
 
diff --git a/model/login.php b/model/login.php
index 223466f7..30912a9a 100644
--- a/model/login.php
+++ b/model/login.php
@@ -87,7 +87,11 @@ public function login()
 
     public function logout($id, $token)
     {
-        $this->hook->fire('logout_start');
+        $hook['id'] = $id;
+        $hook['token'] = $token;
+        $hook = $this->hook->fire('logout_start', $hook);
+        $id = $hook['id'];
+        $token = $hook['token'];
 
         if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != feather_hash($this->user->id.feather_hash(get_remote_address()))) {
             header('Location: '.get_base_url());
diff --git a/model/misc.php b/model/misc.php
index 23ac015a..e24ccd93 100644
--- a/model/misc.php
+++ b/model/misc.php
@@ -20,24 +20,31 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
  
     public function update_last_visit()
     {
-        DB::for_table('users')->where('id', $this->user->id)
-                                                  ->find_one()
-                                                  ->set('last_visit', $this->user->logged)
-                                                  ->save();
+        $this->hook->fire('update_last_visit_start');
+
+        $update_last_visit = DB::for_table('users')->where('id', $this->user->id)
+                                                   ->find_one()
+                                                   ->set('last_visit', $this->user->logged);
+        $update_last_visit = $this->hook->fireDB('update_last_visit', $update_last_visit);
+        $update_last_visit = $update_last_visit->save();
     }
 
     public function get_info_mail($recipient_id)
     {
-        $select_get_info_mail = array('username', 'email', 'email_setting');
+        $recipient_id = $this->hook->fire('get_info_mail_start', $recipient_id);
+
+        $mail['select'] = array('username', 'email', 'email_setting');
         
         $mail = DB::for_table('users')
-                ->select_many($select_get_info_mail)
-                ->where('id', $recipient_id)
-                ->find_one();
+                ->select_many($mail['select'])
+                ->where('id', $recipient_id);
+        $mail = $this->hook->fireDB('get_info_mail_query', $mail);
+        $mail = $mail->find_one();
         
         if (!$mail) {
             message(__('Bad request'), '404');
@@ -46,11 +53,15 @@ public function get_info_mail($recipient_id)
         $mail['recipient'] = $mail['username'];
         $mail['recipient_email'] = $mail['email'];
 
+        $mail = $this->hook->fireDB('get_info_mail', $mail);
+
         return $mail;
     }
 
-    public function send_email($mail, $id)
+    public function send_email($mail)
     {
+        $mail = $this->hook->fire('send_email_start', $mail);
+
         // Clean up message and subject from POST
         $subject = feather_trim($this->request->post('req_subject'));
         $message = feather_trim($this->request->post('req_message'));
@@ -71,6 +82,7 @@ public function send_email($mail, $id)
 
         // Load the "form email" template
         $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/form_email.tpl'));
+        $mail_tpl = $this->hook->fire('send_email_mail_tpl', $mail_tpl);
 
         // The first row contains the subject
         $first_crlf = strpos($mail_tpl, "\n");
@@ -83,16 +95,19 @@ public function send_email($mail, $id)
         $mail_message = str_replace('<mail_message>', $message, $mail_message);
         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
+        $mail_message = $this->hook->fire('send_email_mail_message', $mail_message);
+
         require_once FEATHER_ROOT.'include/email.php';
 
         feather_mail($mail['recipient_email'], $mail_subject, $mail_message, $this->user->email, $this->user->username);
 
-        DB::for_table('users')->where('id', $this->user->id)
+        $update_last_mail_sent = DB::for_table('users')->where('id', $this->user->id)
                                                   ->find_one()
-                                                  ->set('last_email_sent', time())
-                                                  ->save();
+                                                  ->set('last_email_sent', time());
+        $update_last_mail_sent = $this->hook->fireDB('send_email_update_last_mail_sent', $update_last_mail_sent);
+        $update_last_mail_sent = $update_last_mail_sent->save();
 
-        // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after the email is sent)
+        // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after the email is sent) TODO
         //$redirect_url = validate_redirect($this->request->post('redirect_url'), 'index.php');
 
         redirect(get_base_url(), __('Email sent redirect'));
@@ -100,6 +115,8 @@ public function send_email($mail, $id)
 
     public function get_redirect_url($recipient_id)
     {
+        $recipient_id = $this->hook->fire('get_redirect_url_start', $recipient_id);
+
         // Try to determine if the data in HTTP_REFERER is valid (if not, we redirect to the user's profile after the email is sent)
         // TODO
         if ($this->request->getReferrer()) {
@@ -112,11 +129,15 @@ public function get_redirect_url($recipient_id)
             $redirect_url .= '#p'.$matches[1];
         }
 
+        $redirect_url = $this->hook->fire('get_redirect_url', $redirect_url);
+
         return $redirect_url;
     }
 
     public function insert_report($post_id)
     {
+        $post_id = $this->hook->fire('insert_report_start', $post_id);
+
         // Clean up reason from POST
         $reason = feather_linebreaks(feather_trim($this->request->post('req_reason')));
         if ($reason == '') {
@@ -131,19 +152,20 @@ public function insert_report($post_id)
 
         // Get the topic ID
         $topic = DB::for_table('posts')->select('topic_id')
-                                                              ->where('id', $post_id)
-                                                              ->find_one();
+                                      ->where('id', $post_id);
+        $topic = $this->hook->fireDB('insert_report_topic_id', $topic);
+        $topic = $topic->find_one();
 
         if (!$topic) {
             message(__('Bad request'), '404');
         }
 
-        $select_report = array('subject', 'forum_id');
-
         // Get the subject and forum ID
-        $report = DB::for_table('topics')->select_many($select_report)
-            ->where('id', $topic['topic_id'])
-            ->find_one();
+        $report['select'] = array('subject', 'forum_id');
+        $report = DB::for_table('topics')->select_many($report['select'])
+                                        ->where('id', $topic['topic_id']);
+        $report = $this->hook->fireDB('insert_report_get_subject', $report);
+        $report = $report->find_one();
 
         if (!$report) {
             message(__('Bad request'), '404');
@@ -151,7 +173,9 @@ public function insert_report($post_id)
 
         // Should we use the internal report handling?
         if ($this->config['o_report_method'] == '0' || $this->config['o_report_method'] == '2') {
-            $insert_report = array(
+            
+            // Insert the report
+            $query['insert'] = array(
                 'post_id' => $post_id,
                 'topic_id'  => $topic['topic_id'],
                 'forum_id'  => $report['forum_id'],
@@ -159,12 +183,11 @@ public function insert_report($post_id)
                 'created'  => time(),
                 'message'  => $reason,
             );
-
-            // Insert the report
-            DB::for_table('reports')
+            $query = DB::for_table('reports')
                 ->create()
-                ->set($insert_report)
-                ->save();
+                ->set($query['insert']);
+            $query = $this->hook->fireDB('insert_report_query', $query);
+            $query = $query->save();
         }
 
         // Should we email the report?
@@ -173,6 +196,7 @@ public function insert_report($post_id)
             if ($this->config['o_mailing_list'] != '') {
                 // Load the "new report" template
                 $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/new_report.tpl'));
+                $mail_tpl = $this->hook->fire('insert_report_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
                 $first_crlf = strpos($mail_tpl, "\n");
@@ -186,66 +210,77 @@ public function insert_report($post_id)
                 $mail_message = str_replace('<reason>', $reason, $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
+                $mail_message = $this->hook->fire('insert_report_mail_message', $mail_message);
+
                 require FEATHER_ROOT.'include/email.php';
 
                 feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
             }
         }
 
-        DB::for_table('users')->where('id', $this->user->id)
+        $last_report_sent = DB::for_table('users')->where('id', $this->user->id)
             ->find_one()
-            ->set('last_report_sent', time())
-            ->save();
+            ->set('last_report_sent', time());
+        $last_report_sent = $this->hook->fireDB('insert_last_report_sent', $last_report_sent);
+        $last_report_sent = $last_report_sent->save();
 
         redirect(get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['subject']).'/'), __('Report redirect'));
     }
 
     public function get_info_report($post_id)
     {
-        $select_get_info_report = array('fid' => 'f.id', 'f.forum_name', 'tid' => 't.id', 't.subject');
-        $where_get_info_report = array(
+        $post_id = $this->hook->fire('get_info_report_start', $post_id);
+
+        $cur_post['select'] = array('fid' => 'f.id', 'f.forum_name', 'tid' => 't.id', 't.subject');
+        $cur_post['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
 
         $cur_post = DB::for_table('posts')
-            ->table_alias('p')
-            ->select_many($select_get_info_report)
-            ->inner_join('topics', array('t.id', '=', 'p.topic_id'), 't')
-            ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
-            ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
-            ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-            ->where_any_is($where_get_info_report)
-            ->where('p.id', $post_id)
-            ->find_one();
+                        ->table_alias('p')
+                        ->select_many($cur_post['select'])
+                        ->inner_join('topics', array('t.id', '=', 'p.topic_id'), 't')
+                        ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
+                        ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
+                        ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
+                        ->where_any_is($cur_post['where'])
+                        ->where('p.id', $post_id);
+        $cur_post = $this->hook->fireDB('get_info_report_query', $cur_post);
+        $cur_post = $cur_post->find_one();
 
         if (!$cur_post) {
             message(__('Bad request'), '404');
         }
 
+        $cur_post = $this->hook->fire('get_info_report', $cur_post);
+
         return $cur_post;
     }
 
     public function subscribe_topic($topic_id)
     {
+        $topic_id = $this->hook->fire('subscribe_topic_start', $topic_id);
+
         if ($this->config['o_topic_subscriptions'] != '1') {
             message(__('No permission'), '403');
         }
 
         // Make sure the user can view the topic
-        $where_subscribe_topic = array(
+        $authorized['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
 
         $authorized = DB::for_table('topics')
-                    ->table_alias('t')
-                    ->left_outer_join('forum_perms', array('fp.forum_id', '=', 't.forum_id'), 'fp')
-                    ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-                    ->where_any_is($where_subscribe_topic)
-                    ->where('t.id', $topic_id)
-                    ->where_null('t.moved_to')
-                    ->find_one();
+                            ->table_alias('t')
+                            ->left_outer_join('forum_perms', array('fp.forum_id', '=', 't.forum_id'), 'fp')
+                            ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
+                            ->where_any_is($authorized['where'])
+                            ->where('t.id', $topic_id)
+                            ->where_null('t.moved_to');
+        $authorized = $this->hook->fireDB('subscribe_topic_authorized_query', $authorized);
+        $authorized = $authorized->find_one();
 
         if (!$authorized) {
             message(__('Bad request'), '404');
@@ -253,94 +288,107 @@ public function subscribe_topic($topic_id)
 
         $is_subscribed = DB::for_table('topic_subscriptions')
                         ->where('user_id', $this->user->id)
-                        ->where('topic_id', $topic_id)
-                        ->find_one();
+                        ->where('topic_id', $topic_id);
+        $is_subscribed = $this->hook->fireDB('subscribe_topic_is_subscribed_query', $is_subscribed);
+        $is_subscribed = $is_subscribed->find_one();
 
         if ($is_subscribed) {
             message(__('Already subscribed topic'));
         }
 
-        $insert_subscribe_topic = array(
+        $subscription['insert'] = array(
             'user_id' => $this->user->id,
             'topic_id'  => $topic_id
         );
 
         // Insert the subscription
-        DB::for_table('topic_subscriptions')
-            ->create()
-            ->set($insert_subscribe_topic)
-            ->save();
+        $subscription = DB::for_table('topic_subscriptions')
+                                    ->create()
+                                    ->set($subscription['insert']);
+        $subscription = $this->hook->fireDB('subscribe_topic_query', $subscription);
+        $subscription = $subscription->save();
 
         redirect(get_link('topic/'.$topic_id.'/'), __('Subscribe redirect'));
     }
 
     public function unsubscribe_topic($topic_id)
     {
+        $topic_id = $this->hook->fire('unsubscribe_topic_start', $topic_id);
+
         if ($this->config['o_topic_subscriptions'] != '1') {
             message(__('No permission'), '403');
         }
 
         $is_subscribed = DB::for_table('topic_subscriptions')
-            ->where('user_id', $this->user->id)
-            ->where('topic_id', $topic_id)
-            ->find_one();
+                            ->where('user_id', $this->user->id)
+                            ->where('topic_id', $topic_id);
+        $is_subscribed = $this->hook->fireDB('unsubscribe_topic_subscribed_query', $is_subscribed);
+        $is_subscribed = $is_subscribed->find_one();
 
         if (!$is_subscribed) {
             message(__('Not subscribed topic'));
         }
 
         // Delete the subscription
-        DB::for_table('topic_subscriptions')
-            ->where('user_id', $this->user->id)
-            ->where('topic_id', $topic_id)
-            ->delete_many();
+        $delete = DB::for_table('topic_subscriptions')
+                    ->where('user_id', $this->user->id)
+                    ->where('topic_id', $topic_id);
+        $delete = $this->hook->fireDB('unsubscribe_topic_query', $delete);
+        $delete = $delete->delete_many();
 
         redirect(get_link('topic/'.$topic_id.'/'), __('Unsubscribe redirect'));
     }
 
     public function unsubscribe_forum($forum_id)
     {
+        $forum_id = $this->hook->fire('unsubscribe_forum_start', $forum_id);
+
         if ($this->config['o_forum_subscriptions'] != '1') {
             message(__('No permission'), '403');
         }
 
         $is_subscribed = DB::for_table('forum_subscriptions')
             ->where('user_id', $this->user->id)
-            ->where('forum_id', $forum_id)
-            ->find_one();
+            ->where('forum_id', $forum_id);
+        $is_subscribed = $this->hook->fireDB('unsubscribe_forum_subscribed_query', $is_subscribed);
+        $is_subscribed = $is_subscribed->find_one();
 
         if (!$is_subscribed) {
             message(__('Not subscribed forum'));
         }
 
         // Delete the subscription
-        DB::for_table('forum_subscriptions')
+        $delete = DB::for_table('forum_subscriptions')
             ->where('user_id', $this->user->id)
-            ->where('forum_id', $forum_id)
-            ->delete_many();
+            ->where('forum_id', $forum_id);
+        $delete = $this->hook->fireDB('unsubscribe_forum_query', $delete);
+        $delete = $delete->delete_many();
 
         redirect(get_link('forum/'.$forum_id.'/'), __('Unsubscribe redirect'));
     }
 
     public function subscribe_forum($forum_id)
     {
+        $forum_id = $this->hook->fire('subscribe_forum_start', $forum_id);
+
         if ($this->config['o_forum_subscriptions'] != '1') {
             message(__('No permission'), '403');
         }
 
         // Make sure the user can view the forum
-        $where_subscribe_forum = array(
+        $authorized['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
 
         $authorized = DB::for_table('forums')
-            ->table_alias('f')
-            ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
-            ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-            ->where_any_is($where_subscribe_forum)
-            ->where('f.id', $forum_id)
-            ->find_one();
+                        ->table_alias('f')
+                        ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
+                        ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
+                        ->where_any_is($authorized['where'])
+                        ->where('f.id', $forum_id);
+        $authorized = $this->hook->fireDB('subscribe_forum_authorized_query', $authorized);
+        $authorized = $authorized->find_one();
 
         if (!$authorized) {
             message(__('Bad request'), '404');
@@ -348,23 +396,24 @@ public function subscribe_forum($forum_id)
 
         $is_subscribed = DB::for_table('forum_subscriptions')
             ->where('user_id', $this->user->id)
-            ->where('forum_id', $forum_id)
-            ->find_one();
+            ->where('forum_id', $forum_id);
+        $is_subscribed = $this->hook->fireDB('subscribe_forum_subscribed_query', $is_subscribed);
+        $is_subscribed = $is_subscribed->find_one();
 
         if ($is_subscribed) {
             message(__('Already subscribed forum'));
         }
 
-        $insert_subscribe_forum = array(
+        // Insert the subscription
+        $subscription['insert'] = array(
             'user_id' => $this->user->id,
             'forum_id'  => $forum_id
         );
-
-        // Insert the subscription
-        DB::for_table('forum_subscriptions')
-            ->create()
-            ->set($insert_subscribe_forum)
-            ->save();
+        $subscription = DB::for_table('forum_subscriptions')
+                            ->create()
+                            ->set($subscription['insert']);
+        $subscription = $this->hook->fireDB('subscribe_forum_query', $subscription);
+        $subscription = $subscription->save();
 
         redirect(get_link('forum/'.$forum_id.'/'), __('Subscribe redirect'));
     }

From ead352f44dd7868baf1f91d94605b0a28bf91dad Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 20 Aug 2015 15:14:38 +0200
Subject: [PATCH 113/353] Fix mail link

---
 model/viewtopic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/model/viewtopic.php b/model/viewtopic.php
index c0729034..1f32514a 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -311,7 +311,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                     if ((($cur_post['email_setting'] == '0' && !$this->user->is_guest) || $this->user->is_admmod) && $this->user->g_send_email == '1') {
                         $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['email']).'">'.__('Email').'</a></span>';
                     } elseif ($cur_post['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.get_link('mail/'.$cur_post['poster_id'].'/').'">'.__('Email').'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.get_link('email/'.$cur_post['poster_id'].'/').'">'.__('Email').'</a></span>';
                     }
 
                     if ($cur_post['url'] != '') {

From a687e748e87ce4d0786a6e04379912cd30f4b14b Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 20 Aug 2015 16:14:13 +0200
Subject: [PATCH 114/353] Start to add hooks

---
 model/moderate.php | 237 +++++++++++++++++++++++++--------------------
 1 file changed, 133 insertions(+), 104 deletions(-)

diff --git a/model/moderate.php b/model/moderate.php
index 218bf78e..8bf1ec52 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -20,59 +20,64 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
  
     public function display_ip_info($ip)
     {
+        $ip = $this->hook->fire('display_ip_info', $ip);
         message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function display_ip_address_post($pid)
     {
-
+        $pid = $this->hook->fire('display_ip_address_post_start', $pid);
 
         $ip = DB::for_table('posts')
-            ->where('id', $pid)
-            ->find_one_col('poster_ip');
+            ->where('id', $pid);
+        $ip = $this->hook->fireDB('display_ip_address_post_query', $pid);
+        $ip = $ip->find_one_col('poster_ip');
 
         if (!$ip) {
             message(__('Bad request'), '404');
         }
 
+        $ip = $this->hook->fire('display_ip_address_post', $ip);
+
         message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function get_moderators($fid)
     {
         $moderators = DB::for_table('forums')
-            ->where('id', $fid)
-            ->find_one_col('moderators');
+            ->where('id', $fid);
+        $moderators = $this->hook->fireDB('get_moderators', $moderators);
+        $moderators = $moderators->find_one_col('moderators');
 
         return $moderators;
     }
 
     public function get_topic_info($fid, $tid)
     {
-
-        
         // Fetch some info about the topic
-        $select_get_topic_info = array('forum_id' => 'f.id', 'f.forum_name', 't.subject', 't.num_replies', 't.first_post_id');
-        $where_get_topic_info = array(
+        $cur_topic['select'] = array('forum_id' => 'f.id', 'f.forum_name', 't.subject', 't.num_replies', 't.first_post_id');
+        $cur_topic['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
 
         $cur_topic = DB::for_table('topics')
             ->table_alias('t')
-            ->select_many($select_get_topic_info)
+            ->select_many($cur_topic['select'])
             ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
             ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
             ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-            ->where_any_is($where_get_topic_info)
+            ->where_any_is($cur_topic['where'])
             ->where('f.id', $fid)
             ->where('t.id', $tid)
-            ->where_null('t.moved_to')
-            ->find_one();
+            ->where_null('t.moved_to');
+        $cur_topic = $this->hook->fireDB('get_topic_info', $cur_topic);
+        $cur_topic = $cur_topic->find_one();
 
         if (!$cur_topic) {
             message(__('Bad request'), '404');
@@ -83,8 +88,9 @@ public function get_topic_info($fid, $tid)
 
     public function delete_posts($tid, $fid, $p = null)
     {
-        
         $posts = $this->request->post('posts') ? $this->request->post('posts') : array();
+        $posts = $this->hook->fire('delete_posts_start', $posts);
+
         if (empty($posts)) {
             message(__('No posts selected'));
         }
@@ -99,61 +105,68 @@ public function delete_posts($tid, $fid, $p = null)
 
             $result = DB::for_table('posts')
                 ->where_in('id', $posts_array)
-                ->where('topic_id', $tid)
-                ->find_many();
+                ->where('topic_id', $tid);
 
             if ($this->user->g_id != FEATHER_ADMIN) {
                 $result->where_not_in('poster_id', get_admin_ids());
             }
 
+            $result = $this->hook->fireDB('delete_posts_first_query', $result);
+            $result = $result->find_many();
+
             if (count($result) != substr_count($posts, ',') + 1) {
                 message(__('Bad request'), '404');
             }
 
             // Delete the posts
-            DB::for_table('posts')
-                ->where_in('id', $posts_array)
-                ->delete_many();
+            $delete_posts = DB::for_table('posts')
+                                ->where_in('id', $posts_array);
+            $delete_posts = $this->hook->fireDB('delete_posts_query', $delete_posts);
+            $delete_posts = $delete_posts->delete_many();
 
             require FEATHER_ROOT.'include/search_idx.php';
             strip_search_index($posts);
 
             // Get last_post, last_post_id, and last_poster for the topic after deletion
-            $select_last_post = array('id', 'poster', 'posted');
+            $last_post['select'] = array('id', 'poster', 'posted');
 
             $last_post = DB::for_table('posts')
-                ->select_many($select_last_post)
-                ->where('topic_id', $tid)
-                ->find_one();
+                ->select_many($last_post['select'])
+                ->where('topic_id', $tid);
+            $last_post = $this->hook->fireDB('delete_posts_last_post_query', $last_post);
+            $last_post = $last_post->find_one();
 
             // How many posts did we just delete?
             $num_posts_deleted = substr_count($posts, ',') + 1;
 
             // Update the topic
-            $update_topic = array(
+            $update_topic['insert'] = array(
                 'last_post' => $this->user->id,
                 'last_post_id'  => $last_post['id'],
                 'last_poster'  => $last_post['poster'],
             );
 
-            DB::for_table('topics')->where('id', $tid)
+            $update_topic = DB::for_table('topics')->where('id', $tid)
                 ->find_one()
-                ->set($update_topic)
-                ->set_expr('num_replies', 'num_replies-'.$num_posts_deleted)
-                ->save();
+                ->set($update_topic['insert'])
+                ->set_expr('num_replies', 'num_replies-'.$num_posts_deleted);
+            $update_topic = $this->hook->fireDB('delete_posts_update_topic_query', $update_topic);
+            $update_topic = $update_topic->save();
 
             update_forum($fid);
 
             redirect(get_link('topic/'.$tid.'/'), __('Delete posts redirect'));
         }
 
+        $posts = $this->hook->fire('delete_posts', $posts);
+
         return $posts;
     }
 
     public function split_posts($tid, $fid, $p = null)
     {
-        
         $posts = $this->request->post('posts') ? $this->request->post('posts') : array();
+        $posts = $this->hook->fire('split_posts_start', $posts);
         if (empty($posts)) {
             message(__('No posts selected'));
         }
@@ -176,26 +189,30 @@ public function split_posts($tid, $fid, $p = null)
 
             $result = DB::for_table('posts')
                 ->where_in('id', $posts_array)
-                ->where('topic_id', $tid)
-                ->find_many();
+                ->where('topic_id', $tid);
+            $result = $this->hook->fireDB('split_posts_first_query', $result);
+            $result = $result->find_many();
 
             if (count($result) != $num_posts_splitted) {
                 message(__('Bad request'), '404');
             }
 
+            unset($result);
+
             // Verify that the move to forum ID is valid
-            $where_split_posts = array(
+            $result['where'] = array(
                 array('fp.post_topics' => 'IS NULL'),
                 array('fp.post_topics' => '1')
             );
 
             $result = DB::for_table('forums')
-                ->table_alias('f')
-                ->left_outer_join('forum_perms', array('fp.forum_id', '=', $move_to_forum), 'fp', true)
-                ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-                ->where_any_is($where_split_posts)
-                ->where_null('f.redirect_url')
-                ->find_one();
+                        ->table_alias('f')
+                        ->left_outer_join('forum_perms', array('fp.forum_id', '=', $move_to_forum), 'fp', true)
+                        ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
+                        ->where_any_is($result['where'])
+                        ->where_null('f.redirect_url');
+            $result = $this->hook->fireDB('split_posts_second_query', $result);
+            $result = $result->find_one();
 
             if (!$result) {
                 message(__('Bad request'), '404');
@@ -220,7 +237,7 @@ public function split_posts($tid, $fid, $p = null)
                 ->find_one();
 
             // Create the new topic
-            $insert_topic = array(
+            $topic['insert'] = array(
                 'poster' => $first_post_data['poster'],
                 'subject'  => $new_subject,
                 'posted'  => $first_post_data['posted'],
@@ -228,67 +245,73 @@ public function split_posts($tid, $fid, $p = null)
                 'forum_id'  => $move_to_forum,
             );
 
-            DB::for_table('topics')
+            $topic = DB::for_table('topics')
                 ->create()
-                ->set($insert_topic)
-                ->save();
+                ->set($topic['insert']);
+            $topic = $this->hook->fireDB('split_posts_topic_query', $topic);
+            $topic = $topic->save();
 
             $new_tid = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'topics');
 
             // Move the posts to the new topic
-            DB::for_table('posts')->where_in('id', $posts_array)
+            $move_posts = DB::for_table('posts')->where_in('id', $posts_array)
                 ->find_one()
-                ->set('topic_id', $new_tid)
-                ->save();
+                ->set('topic_id', $new_tid);
+            $move_posts = $this->hook->fireDB('split_posts_move_query', $move_posts);
+            $move_posts = $move_posts->save();
 
             // Apply every subscription to both topics
             DB::for_table('topic_subscriptions')->raw_query('INSERT INTO '.$this->feather->forum_settings['db_prefix'].'topic_subscriptions (user_id, topic_id) SELECT user_id, '.$new_tid.' FROM '.$this->feather->forum_settings['db_prefix'].'topic_subscriptions WHERE topic_id=:tid', array('tid' => $tid));
 
             // Get last_post, last_post_id, and last_poster from the topic and update it
-            $select_last_post = array('id', 'poster', 'posted');
+            $last_old_post_data['select'] = array('id', 'poster', 'posted');
 
             $last_old_post_data = DB::for_table('posts')
-                ->select_many($select_last_post)
+                ->select_many($last_old_post_data['select'])
                 ->where('topic_id', $tid)
-                ->order_by_desc('id')
-                ->find_one();
+                ->order_by_desc('id');
+            $last_old_post_data = $this->hook->fireDB('split_posts_last_old_post_data_query', $last_old_post_data);
+            $last_old_post_data = $last_old_post_data->find_one();
 
             // Update the old topic
-            $update_old_topic = array(
+            $update_old_topic['insert'] = array(
                 'last_post' => $last_old_post_data['posted'],
                 'last_post_id'  => $last_old_post_data['id'],
                 'last_poster'  => $last_old_post_data['poster'],
             );
 
-            DB::for_table('topics')
-                ->where('id', $tid)
-                ->find_one()
-                ->set($update_old_topic)
-                ->set_expr('num_replies', 'num_replies-'.$num_posts_splitted)
-                ->save();
+            $update_old_topic = DB::for_table('topics')
+                                ->where('id', $tid)
+                                ->find_one()
+                                ->set($update_old_topic['insert'])
+                                ->set_expr('num_replies', 'num_replies-'.$num_posts_splitted);
+            $update_old_topic = $this->hook->fireDB('split_posts_update_old_topic_query', $update_old_topic);
+            $update_old_topic = $update_old_topic->save();
 
             // Get last_post, last_post_id, and last_poster from the new topic and update it
-            $select_new_post = array('id', 'poster', 'posted');
+            $last_new_post_data['select'] = array('id', 'poster', 'posted');
 
             $last_new_post_data = DB::for_table('posts')
-                ->select_many($select_new_post)
-                ->where('topic_id', $new_tid)
-                ->order_by_desc('id')
-                ->find_one();
+                                    ->select_many($last_new_post_data['select'])
+                                    ->where('topic_id', $new_tid)
+                                    ->order_by_desc('id');
+            $last_new_post_data = $this->hook->fireDB('split_posts_last_new_post_query', $last_new_post_data);
+            $last_new_post_data = $last_new_post_data->find_one();
 
             // Update the new topic
-            $update_new_topic = array(
+            $update_new_topic['insert'] = array(
                 'last_post' => $last_new_post_data['posted'],
                 'last_post_id'  => $last_new_post_data['id'],
                 'last_poster'  => $last_new_post_data['poster'],
             );
 
-            DB::for_table('topics')
+            $update_new_topic = DB::for_table('topics')
                 ->where('id', $new_tid)
                 ->find_one()
-                ->set($update_new_topic)
-                ->set_expr('num_replies', 'num_replies-'.$num_posts_splitted-1)
-                ->save();
+                ->set($update_new_topic['insert'])
+                ->set_expr('num_replies', 'num_replies-'.$num_posts_splitted-1);
+            $update_new_topic = $this->hook->fireDB('split_posts_update_new_topic_query', $update_new_topic);
+            $update_new_topic = $update_new_topic->save();
 
             update_forum($fid);
             update_forum($move_to_forum);
@@ -296,6 +319,8 @@ public function split_posts($tid, $fid, $p = null)
             redirect(get_link('topic/'.$new_tid.'/'), __('Split posts redirect'));
         }
 
+        $posts = $this->hook->fire('split_posts', $posts);
+
         return $posts;
     }
 
@@ -303,23 +328,24 @@ public function get_forum_list_split($id)
     {
         $output = '';
 
-        $select_get_forum_list_split = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name');
-        $where_get_forum_list_split = array(
+        $result['select'] = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name');
+        $result['where'] = array(
             array('fp.post_topics' => 'IS NULL'),
             array('fp.post_topics' => '1')
         );
         $order_by_get_forum_list_split = array('c.disp_position', 'c.id', 'f.disp_position');
 
         $result = DB::for_table('categories')
-            ->table_alias('c')
-            ->select_many($select_get_forum_list_split)
-            ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
-            ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
-            ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-            ->where_any_is($where_get_forum_list_split)
-            ->where_null('f.redirect_url')
-            ->order_by_many($order_by_get_forum_list_split)
-            ->find_result_set();
+                    ->table_alias('c')
+                    ->select_many($result['select'])
+                    ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
+                    ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
+                    ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
+                    ->where_any_is($result['where'])
+                    ->where_null('f.redirect_url')
+                    ->order_by_many($order_by_get_forum_list_split);
+        $result = $this->hook->fireDB('get_forum_list_split_query', $result);
+        $result = $result->find_result_set();
 
         $cur_category = 0;
 
@@ -338,6 +364,8 @@ public function get_forum_list_split($id)
             $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_forum->fid.'"'.($id == $cur_forum->fid ? ' selected="selected"' : '').'>'.feather_escape($cur_forum->forum_name).'</option>'."\n";
         }
 
+        $output = $this->hook->fire('get_forum_list_split', $output);
+
         return $output;
     }
 
@@ -353,15 +381,16 @@ public function get_forum_list_move($id)
         $order_by_get_forum_list_move = array('c.disp_position', 'c.id', 'f.disp_position');
 
         $result = DB::for_table('categories')
-            ->table_alias('c')
-            ->select_many($select_get_forum_list_move)
-            ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
-            ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
-            ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-            ->where_any_is($where_get_forum_list_move)
-            ->where_null('f.redirect_url')
-            ->order_by_many($order_by_get_forum_list_move)
-            ->find_result_set();
+                    ->table_alias('c')
+                    ->select_many($select_get_forum_list_move)
+                    ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
+                    ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
+                    ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
+                    ->where_any_is($where_get_forum_list_move)
+                    ->where_null('f.redirect_url')
+                    ->order_by_many($order_by_get_forum_list_move);
+        $result = $this->hook->fireDB('get_forum_list_move_query', $result);
+        $result = $result->find_result_set();
 
         $cur_category = 0;
 
@@ -382,6 +411,8 @@ public function get_forum_list_move($id)
             }
         }
 
+        $output = $this->hook->fire('get_forum_list_move', $output);
+
         return $output;
     }
 
@@ -389,6 +420,8 @@ public function display_posts_view($tid, $start_from)
     {
         global $pd;
 
+        $this->hook->fire('display_posts_view_start');
+
         $post_data = array();
 
         require FEATHER_ROOT.'include/parser.php';
@@ -400,24 +433,26 @@ public function display_posts_view($tid, $start_from)
             ->where('topic_id', $tid)
             ->order_by('id')
             ->limit($this->user->disp_posts)
-            ->offset($start_from)
-            ->find_many();
+            ->offset($start_from);
+        $find_ids = $this->hook->fireDB('display_posts_view_find_ids', $find_ids);
+        $find_ids = $find_ids->find_many();
 
         foreach ($find_ids as $id) {
             $post_ids[] = $id['id'];
         }
 
         // Retrieve the posts (and their respective poster)
-        $select_display_posts_view = array('u.title', 'u.num_posts', 'g.g_id', 'g.g_user_title', 'p.id', 'p.poster', 'p.poster_id', 'p.message', 'p.hide_smilies', 'p.posted', 'p.edited', 'p.edited_by');
+        $result['select'] = array('u.title', 'u.num_posts', 'g.g_id', 'g.g_user_title', 'p.id', 'p.poster', 'p.poster_id', 'p.message', 'p.hide_smilies', 'p.posted', 'p.edited', 'p.edited_by');
 
         $result = DB::for_table('posts')
-            ->table_alias('p')
-            ->select_many($select_display_posts_view)
-            ->inner_join('users', array('u.id', '=', 'p.poster_id'), 'u')
-            ->inner_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
-            ->where_in('p.id', $post_ids)
-            ->order_by('p.id')
-            ->find_many();
+                    ->table_alias('p')
+                    ->select_many($result['select'])
+                    ->inner_join('users', array('u.id', '=', 'p.poster_id'), 'u')
+                    ->inner_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
+                    ->where_in('p.id', $post_ids)
+                    ->order_by('p.id');
+        $result = $this->hook->fireDB('display_posts_view_query', $result);
+        $result = $result->find_many();
 
         foreach($result as $cur_post) {
             $post_count++;
@@ -450,6 +485,8 @@ public function display_posts_view($tid, $start_from)
             $post_data[] = $cur_post;
         }
 
+        $post_data = $this->hook->fire('display_posts_view', $post_data);
+
         return $post_data;
     }
 
@@ -545,7 +582,6 @@ public function move_topics_to($fid, $tfid = null, $param = null)
 
     public function check_move_possible()
     {
-        
         $select_check_move_possible = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name');
         $where_check_move_possible = array(
             array('fp.post_topics' => 'IS NULL'),
@@ -571,7 +607,6 @@ public function check_move_possible()
 
     public function merge_topics($fid)
     {
-        
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
             message(__('Bad request'), '404');
         }
@@ -681,8 +716,6 @@ public function merge_topics($fid)
 
     public function delete_topics($topics, $fid)
     {
-                
-
         if (@preg_match('%[^0-9,]%', $topics)) {
             message(__('Bad request'), '404');
         }
@@ -755,8 +788,6 @@ public function delete_topics($topics, $fid)
 
     public function get_forum_info($fid)
     {
-
-
         $select_get_forum_info = array('f.forum_name', 'f.redirect_url', 'f.num_topics', 'f.sort_by');
         $where_get_forum_info = array(
             array('fp.read_forum' => 'IS NULL'),
@@ -944,8 +975,6 @@ public function close_multiple_topics($action, $topics, $fid)
     
     public function get_subject_tid($id)
     {
-
-
         $subject = DB::for_table('topics')
             ->where('id', $id)
             ->find_one_col('subject');

From d430b5540cb4b8a2f0c17e939c1be942cdd5198b Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Thu, 20 Aug 2015 16:25:26 +0200
Subject: [PATCH 115/353] Use private header attribute instead of
 'FEATHER_ACTIVE_PAGE' constant

---
 Slim/Extras/Middleware/FeatherBBAuth.php |  4 +-
 controller/admin/bans.php                | 19 ++-----
 controller/admin/categories.php          |  4 +-
 controller/admin/censoring.php           |  6 +-
 controller/admin/forums.php              | 12 +---
 controller/admin/groups.php              | 18 ++----
 controller/admin/index.php               |  6 +-
 controller/admin/maintenance.php         | 10 +---
 controller/admin/options.php             |  6 +-
 controller/admin/parser.php              |  8 +--
 controller/admin/permissions.php         |  6 +-
 controller/admin/plugins.php             |  6 +-
 controller/admin/reports.php             |  6 +-
 controller/admin/statistics.php          |  6 +-
 controller/admin/users.php               | 28 +++-------
 controller/delete.php                    |  6 +-
 controller/edit.php                      |  6 +-
 controller/header.php                    | 26 ++++++---
 controller/help.php                      |  6 +-
 controller/index.php                     | 10 ++--
 controller/login.php                     | 10 +---
 controller/misc.php                      | 14 ++---
 controller/moderate.php                  | 40 ++++----------
 controller/post.php                      |  6 +-
 controller/profile.php                   | 70 ++++++++----------------
 controller/register.php                  | 14 +----
 controller/search.php                    | 10 +---
 controller/userlist.php                  |  6 +-
 controller/viewforum.php                 |  6 +-
 controller/viewtopic.php                 |  4 +-
 include/functions.php                    |  4 --
 style/FeatherBB/view/header.php          |  2 +-
 view/header.php                          |  2 +-
 33 files changed, 126 insertions(+), 261 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBBAuth.php b/Slim/Extras/Middleware/FeatherBBAuth.php
index 017ef619..8546c0e8 100644
--- a/Slim/Extras/Middleware/FeatherBBAuth.php
+++ b/Slim/Extras/Middleware/FeatherBBAuth.php
@@ -198,13 +198,11 @@ public function maintenance_message()
 
         $page_title = array(feather_escape($this->app->forum_settings['o_board_title']), __('Maintenance'));
 
-        define('FEATHER_ACTIVE_PAGE', 'index');
-
         $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? $this->app->forum_env['FEATHER_ROOT'].'style/'.$this->app->user->style.'/view' : $this->app->forum_env['FEATHER_ROOT'].'view');
 
         $header = new \controller\header();
 
-        $header->setTitle($page_title)->display();
+        $header->setTitle($page_title)->setActivePage('index')->display();
 
         $this->app->render('message.php', array(
                 'message'    =>    $message,
diff --git a/controller/admin/bans.php b/controller/admin/bans.php
index 4d8af8a5..3835e13b 100644
--- a/controller/admin/bans.php
+++ b/controller/admin/bans.php
@@ -29,7 +29,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         define('FEATHER_ADMIN_CONSOLE', 1);
@@ -52,9 +52,8 @@ public function display()
             $paging_links = '<span class="pages-label">' . __('Pages') . ' </span>' . paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str']));
 
             $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'), __('Results head'));
-            define('FEATHER_ACTIVE_PAGE', 'admin');
-            
-            $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
+
+            $this->header->setTitle($page_title)->setActivePage('admin')->setPage($p)->setPagingLinks($paging_links)->display();
 
             $ban_data = $this->model->find_ban($start_from);
 
@@ -69,9 +68,7 @@ public function display()
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
         $focus_element = array('bans', 'new_ban_user');
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-        
-        $this->header->setTitle($page_title)->setFocusElement($focus_element)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->display();
 
         generate_admin_menu('bans');
 
@@ -95,9 +92,7 @@ public function add($id = null)
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
         $focus_element = array('bans2', 'ban_user');
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-        
-        $this->header->setTitle($page_title)->setFocusElement($focus_element)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->display();
 
         generate_admin_menu('bans');
 
@@ -134,9 +129,7 @@ public function edit($id)
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
         $focus_element = array('bans2', 'ban_user');
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->setFocusElement($focus_element)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->display();
 
         generate_admin_menu('bans');
 
diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index 242843db..12f90727 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -110,9 +110,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Categories'));
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
         generate_admin_menu('categories');
 
diff --git a/controller/admin/censoring.php b/controller/admin/censoring.php
index 3764e393..ea6c05b0 100644
--- a/controller/admin/censoring.php
+++ b/controller/admin/censoring.php
@@ -29,7 +29,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         if ($this->user->g_id != FEATHER_ADMIN) {
@@ -56,9 +56,7 @@ public function display()
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Censoring'));
         $focus_element = array('censoring', 'new_search_for');
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->setFocusElement($focus_element)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->display();
 
         generate_admin_menu('censoring');
 
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index 38577a3f..f2fde95e 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -139,9 +139,7 @@ public function edit_forum($forum_id)
 
             $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums'));
 
-            define('FEATHER_ACTIVE_PAGE', 'admin');
-
-            $this->header->setTitle($page_title)->display();
+            $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
             generate_admin_menu('forums');
 
@@ -181,9 +179,7 @@ public function delete_forum($forum_id)
 
             $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums'));
 
-            define('FEATHER_ACTIVE_PAGE', 'admin');
-
-            $this->header->setTitle($page_title)->display();
+            $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
             generate_admin_menu('forums');
 
@@ -229,9 +225,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums'));
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
         generate_admin_menu('forums');
 
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index ec69692b..c10ed976 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -29,7 +29,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         if ($this->user->g_id != FEATHER_ADMIN) {
@@ -47,9 +47,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
         generate_admin_menu('groups');
 
@@ -92,9 +90,7 @@ public function delete($id)
 
                 $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
 
-                define('FEATHER_ACTIVE_PAGE', 'admin');
-
-                $this->header->setTitle($page_title)->display();
+                $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
                 generate_admin_menu('groups');
 
@@ -110,9 +106,7 @@ public function delete($id)
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
         generate_admin_menu('groups');
 
@@ -146,9 +140,7 @@ public function addedit($id = '')
             $required_fields = array('req_title' => __('Group title label'));
             $focus_element = array('groups2', 'req_title');
 
-            define('FEATHER_ACTIVE_PAGE', 'admin');
-
-            $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+            $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             generate_admin_menu('groups');
 
diff --git a/controller/admin/index.php b/controller/admin/index.php
index 5996a35f..757b520a 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -43,7 +43,7 @@ public function remove_install_folder($directory)
 
         return $deleted;
     }
-    
+
     public function display($action = null)
     {
         if (!$this->user->is_admmod) {
@@ -84,9 +84,7 @@ public function display($action = null)
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Index'));
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
         generate_admin_menu('index');
 
diff --git a/controller/admin/maintenance.php b/controller/admin/maintenance.php
index f18def31..5d5e178e 100644
--- a/controller/admin/maintenance.php
+++ b/controller/admin/maintenance.php
@@ -29,7 +29,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         if ($this->user->g_id != FEATHER_ADMIN) {
@@ -66,9 +66,7 @@ public function display()
 
             $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Prune'));
 
-            define('FEATHER_ACTIVE_PAGE', 'admin');
-
-            $this->header->setTitle($page_title)->display();
+            $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
             generate_admin_menu('maintenance');
 
@@ -88,9 +86,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Maintenance'));
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
         generate_admin_menu('maintenance');
 
diff --git a/controller/admin/options.php b/controller/admin/options.php
index 05a06bcc..739c1507 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -29,7 +29,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         if ($this->user->g_id != FEATHER_ADMIN) {
@@ -44,9 +44,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Options'));
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
         generate_admin_menu('options');
 
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index 0a3eee9e..feb4cb65 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -29,7 +29,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         global $lang_admin_parser;
@@ -61,7 +61,7 @@ public function display()
         $count = count($bbcd);
 
         if ($this->request->post('form_sent')) {
-            
+
 
             // Upload new smiley image to img/smilies
             if ($this->request->post('upload') && isset($_FILES['new_smiley']) && isset($_FILES['new_smiley']['error'])) {
@@ -214,9 +214,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Parser'));
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
         generate_admin_menu('parser');
 
diff --git a/controller/admin/permissions.php b/controller/admin/permissions.php
index 27cd6b63..03188c1e 100644
--- a/controller/admin/permissions.php
+++ b/controller/admin/permissions.php
@@ -29,7 +29,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         if (!$this->user->is_admmod) {
@@ -45,9 +45,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Permissions'));
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
         generate_admin_menu('permissions');
 
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index 32d2395c..7aefa1a2 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -28,7 +28,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         if (!$this->user->is_admmod) {
@@ -61,9 +61,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), str_replace('_', ' ', substr($plugin, strpos($plugin, '_') + 1, -4)));
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
         // Attempt to load the plugin. We don't use @ here to suppress error messages,
         // because if we did and a parse error occurred in the plugin, we would only
diff --git a/controller/admin/reports.php b/controller/admin/reports.php
index 80d956f1..b84271cc 100644
--- a/controller/admin/reports.php
+++ b/controller/admin/reports.php
@@ -29,7 +29,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         if (!$this->user->is_admmod) {
@@ -45,9 +45,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Reports'));
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
         generate_admin_menu('reports');
 
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index 27c9d46b..5aed0c15 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -29,7 +29,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         if (!$this->user->is_admmod) {
@@ -40,9 +40,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Server statistics'));
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->display();
 
         generate_admin_menu('index');
 
diff --git a/controller/admin/users.php b/controller/admin/users.php
index 2af46780..c0d0fba7 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -48,9 +48,7 @@ public function display()
 
             $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Move users'));
 
-            define('FEATHER_ACTIVE_PAGE', 'moderate');
-
-            $this->header->setTitle($page_title)->display();
+            $this->header->setTitle($page_title)->setActivePage('moderate')->display();
 
             generate_admin_menu('users');
 
@@ -73,9 +71,7 @@ public function display()
 
             $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Delete users'));
 
-            define('FEATHER_ACTIVE_PAGE', 'moderate');
-
-            $this->header->setTitle($page_title)->display();
+            $this->header->setTitle($page_title)->setActivePage('moderate')->display();
 
             generate_admin_menu('users');
 
@@ -99,9 +95,7 @@ public function display()
             $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
             $focus_element = array('bans2', 'ban_message');
 
-            define('FEATHER_ACTIVE_PAGE', 'moderate');
-
-            $this->header->setTitle($page_title)->setFocusElement($focus_element)->display();
+            $this->header->setTitle($page_title)->setActivePage('moderate')->setFocusElement($focus_element)->display();
 
             generate_admin_menu('users');
 
@@ -139,9 +133,7 @@ public function display()
             $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head'));
             $page_head = array('js' => '<script type="text/javascript" src="'.get_base_url().'/js/common.js"></script>');
 
-            define('FEATHER_ACTIVE_PAGE', 'admin');
-
-            $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->display();
+            $this->header->setTitle($page_title)->setActivePage('admin')->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->display();
 
             $this->feather->render('admin/users/find_users.php', array(
                     'search' => $search,
@@ -160,9 +152,7 @@ public function display()
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'));
         $focus_element = array('find_user', 'form[username]');
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->setFocusElement($focus_element)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->display();
 
         generate_admin_menu('users');
 
@@ -197,9 +187,7 @@ public function ipstats($id)
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head'));
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->setPage($p)->setPagingLinks($paging_links)->display();
 
         $this->feather->render('admin/users/search_ip.php', array(
                 'start_from'        =>  $start_from,
@@ -237,9 +225,7 @@ public function showusers($ip)
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head'));
 
-        define('FEATHER_ACTIVE_PAGE', 'admin');
-
-        $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->setPage($p)->setPagingLinks($paging_links)->display();
 
         $this->feather->render('admin/users/show_users.php', array(
                 'start_from'        =>  $start_from,
diff --git a/controller/delete.php b/controller/delete.php
index 1c0848b4..e6dc453d 100644
--- a/controller/delete.php
+++ b/controller/delete.php
@@ -29,7 +29,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function deletepost($id)
     {
         global $pd;
@@ -72,9 +72,7 @@ public function deletepost($id)
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Delete post'));
 
-        define('FEATHER_ACTIVE_PAGE', 'delete');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('delete')->display();
 
         require FEATHER_ROOT.'include/parser.php';
         $cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
diff --git a/controller/edit.php b/controller/edit.php
index 2ac8b24d..ee318576 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -31,7 +31,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function editpost($id)
     {
         if ($this->user->g_read_board == '0') {
@@ -87,9 +87,7 @@ public function editpost($id)
         $required_fields = array('req_subject' => __('Subject'), 'req_message' => __('Message'));
         $focus_element = array('edit', 'req_message');
 
-        define('FEATHER_ACTIVE_PAGE', 'edit');
-
-        $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+        $this->header->setTitle($page_title)->setActivePage('edit')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         if ($this->request->post('preview')) {
             require_once FEATHER_ROOT.'include/parser.php';
diff --git a/controller/header.php b/controller/header.php
index edcbcb50..2016280e 100644
--- a/controller/header.php
+++ b/controller/header.php
@@ -33,6 +33,8 @@ public function __construct()
 
     private $page_head;
 
+    private $active_page;
+
     public function setTitle($title)
     {
         $this->title = $title;
@@ -75,6 +77,13 @@ public function setPageHead($page_head)
         return $this;
     }
 
+    public function setActivePage($active_page)
+    {
+        $this->active_page = $active_page;
+
+        return $this;
+    }
+
     public function display()
     {
         if (!defined('FEATHER_HEADER')) {
@@ -104,6 +113,7 @@ public function display()
                 'feather_config' => $this->config,
                 '_SERVER' => $_SERVER,
                 'page_head' => $this->page_head,
+                'active_page' => $this->active_page,
                 'paging_links' => $this->paging_links,
                 'required_fields' => $this->required_fields,
                 'feather' => $this->feather,
@@ -119,28 +129,28 @@ private function getNavlinks()
         $links = array();
 
         // Index should always be displayed
-        $links[] = '<li id="navindex"'.((FEATHER_ACTIVE_PAGE == 'index') ? ' class="isactive"' : '').'><a href="'.get_base_url().'/">'.__('Index').'</a></li>';
+        $links[] = '<li id="navindex"'.(($this->active_page == 'index') ? ' class="isactive"' : '').'><a href="'.get_base_url().'/">'.__('Index').'</a></li>';
 
         if ($this->user->g_read_board == '1' && $this->user->g_view_users == '1') {
-            $links[] = '<li id="navuserlist"'.((FEATHER_ACTIVE_PAGE == 'userlist') ? ' class="isactive"' : '').'><a href="'.get_link('userlist/').'">'.__('User list').'</a></li>';
+            $links[] = '<li id="navuserlist"'.(($this->active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.get_link('userlist/').'">'.__('User list').'</a></li>';
         }
 
         if ($this->config['o_rules'] == '1' && (!$this->user->is_guest || $this->user->g_read_board == '1' || $this->config['o_regs_allow'] == '1')) {
-            $links[] = '<li id="navrules"'.((FEATHER_ACTIVE_PAGE == 'rules') ? ' class="isactive"' : '').'><a href="'.get_link('rules/').'">'.__('Rules').'</a></li>';
+            $links[] = '<li id="navrules"'.(($this->active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.get_link('rules/').'">'.__('Rules').'</a></li>';
         }
 
         if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-            $links[] = '<li id="navsearch"'.((FEATHER_ACTIVE_PAGE == 'search') ? ' class="isactive"' : '').'><a href="'.get_link('search/').'">'.__('Search').'</a></li>';
+            $links[] = '<li id="navsearch"'.(($this->active_page == 'search') ? ' class="isactive"' : '').'><a href="'.get_link('search/').'">'.__('Search').'</a></li>';
         }
 
         if ($this->user->is_guest) {
-            $links[] = '<li id="navregister"'.((FEATHER_ACTIVE_PAGE == 'register') ? ' class="isactive"' : '').'><a href="'.get_link('register/').'">'.__('Register').'</a></li>';
-            $links[] = '<li id="navlogin"'.((FEATHER_ACTIVE_PAGE == 'login') ? ' class="isactive"' : '').'><a href="'.get_link('login/').'">'.__('Login').'</a></li>';
+            $links[] = '<li id="navregister"'.(($this->active_page == 'register') ? ' class="isactive"' : '').'><a href="'.get_link('register/').'">'.__('Register').'</a></li>';
+            $links[] = '<li id="navlogin"'.(($this->active_page == 'login') ? ' class="isactive"' : '').'><a href="'.get_link('login/').'">'.__('Login').'</a></li>';
         } else {
-            $links[] = '<li id="navprofile"'.((FEATHER_ACTIVE_PAGE == 'profile') ? ' class="isactive"' : '').'><a href="'.get_link('user/'.$this->user->id.'/').'">'.__('Profile').'</a></li>';
+            $links[] = '<li id="navprofile"'.(($this->active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.get_link('user/'.$this->user->id.'/').'">'.__('Profile').'</a></li>';
 
             if ($this->user->is_admmod) {
-                $links[] = '<li id="navadmin"'.((FEATHER_ACTIVE_PAGE == 'admin') ? ' class="isactive"' : '').'><a href="'.get_link('admin/').'">'.__('Admin').'</a></li>';
+                $links[] = '<li id="navadmin"'.(($this->active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.get_link('admin/').'">'.__('Admin').'</a></li>';
             }
 
             $links[] = '<li id="navlogout"><a href="'.get_link('logout/id/'.$this->user->id.'/token/'.feather_hash($this->user->id.feather_hash(get_remote_address()))).'/">'.__('Logout').'</a></li>';
diff --git a/controller/help.php b/controller/help.php
index 3add1eb0..36f44c4e 100644
--- a/controller/help.php
+++ b/controller/help.php
@@ -27,7 +27,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         if ($this->user->g_read_board == '0') {
@@ -36,9 +36,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Help'));
 
-        define('FEATHER_ACTIVE_PAGE', 'help');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('help')->display();
 
         $this->feather->render('help.php');
 
diff --git a/controller/index.php b/controller/index.php
index b94aed63..f4cb80c5 100644
--- a/controller/index.php
+++ b/controller/index.php
@@ -23,12 +23,12 @@ public function __construct()
         $this->model = new \model\index();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/index.mo');
     }
-    
+
     public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         if ($this->user->g_read_board == '0') {
@@ -38,9 +38,7 @@ public function display()
         $page_title = array(feather_escape($this->config['o_board_title']));
         define('FEATHER_ALLOW_INDEX', 1);
 
-        define('FEATHER_ACTIVE_PAGE', 'index');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('index')->display();
 
         $this->feather->render('index.php', array(
                             'index_data' => $this->model->print_categories_forums(),
@@ -51,7 +49,7 @@ public function display()
                             'cur_cat'   => 0,
                             )
                     );
-        
+
         $this->footer->display();
     }
 }
diff --git a/controller/login.php b/controller/login.php
index 277e6378..102b7b29 100644
--- a/controller/login.php
+++ b/controller/login.php
@@ -28,7 +28,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         if (!$this->user->is_guest) {
@@ -43,9 +43,7 @@ public function display()
         $required_fields = array('req_username' => __('Username'), 'req_password' => __('Password'));
         $focus_element = array('login', 'req_username');
 
-        define('FEATHER_ACTIVE_PAGE', 'login');
-
-        $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+        $this->header->setTitle($page_title)->setActivePage('login')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         $this->feather->render('login/form.php', array(
                             'redirect_url'    =>    $redirect_url,
@@ -89,9 +87,7 @@ public function forget()
         $required_fields = array('req_email' => __('Email'));
         $focus_element = array('request_pass', 'req_email');
 
-        define('FEATHER_ACTIVE_PAGE', 'login');
-
-        $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+        $this->header->setTitle($page_title)->setActivePage('login')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         $this->feather->render('login/password_forgotten.php', array(
                             'errors'    =>    $errors,
diff --git a/controller/misc.php b/controller/misc.php
index be6c2e2e..afea0d11 100644
--- a/controller/misc.php
+++ b/controller/misc.php
@@ -29,7 +29,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function rules()
     {
         if ($this->config['o_rules'] == '0' || ($this->user->is_guest && $this->user->g_read_board == '0' && $this->config['o_regs_allow'] == '0')) {
@@ -38,9 +38,7 @@ public function rules()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Forum rules'));
 
-        $this->header->setTitle($page_title)->display();
-
-        define('FEATHER_ACTIVE_PAGE', 'rules');
+        $this->header->setTitle($page_title)->setActivePage('rules')->display();
 
         $this->feather->render('misc/rules.php', array(
                 'feather_config' => $this->config,
@@ -138,9 +136,7 @@ public function email($id)
         $required_fields = array('req_subject' => __('Email subject'), 'req_message' => __('Email message'));
         $focus_element = array('email', 'req_subject');
 
-        define('FEATHER_ACTIVE_PAGE', 'email');
-
-        $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+        $this->header->setTitle($page_title)->setActivePage('email')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         $this->feather->render('misc/email.php', array(
                 'id' => $id,
@@ -172,9 +168,7 @@ public function report($id)
         $required_fields = array('req_reason' => __('Reason'));
         $focus_element = array('report', 'req_reason');
 
-        define('FEATHER_ACTIVE_PAGE', 'report');
-
-        $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+        $this->header->setTitle($page_title)->setActivePage('report')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         $this->feather->render('misc/report.php', array(
                 'id' => $id,
diff --git a/controller/moderate.php b/controller/moderate.php
index b1e7a889..80d907af 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -31,7 +31,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function gethostpost($pid)
     {
         if ($this->user->g_read_board == '0') {
@@ -107,9 +107,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
-            define('FEATHER_ACTIVE_PAGE', 'moderate');
-
-            $this->header->setTitle($page_title)->setPage($p)->display();
+            $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->display();
 
             $this->feather->render('moderate/move_topics.php', array(
                     'action'    =>    'multi',
@@ -125,7 +123,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         // Stick a topic
         if ($action == 'stick') {
             $this->model->stick_topic($id, $fid);
- 
+
             redirect(get_link('topic/'.$id.'/'), __('Stick topic redirect'));
         }
 
@@ -167,9 +165,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
-            define('FEATHER_ACTIVE_PAGE', 'moderate');
-
-            $this->header->setTitle($page_title)->setPage($p)->display();
+            $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->display();
 
             $this->feather->render('moderate/move_topics.php', array(
                         'action'    =>    'single',
@@ -191,9 +187,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
                     $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
-                    define('FEATHER_ACTIVE_PAGE', 'moderate');
-
-                    $this->header->setTitle($page_title)->setPage($p)->display();
+                    $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->display();
 
                     $this->feather->render('moderate/delete_posts.php', array(
                         'id' => $id,
@@ -209,9 +203,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
                 $focus_element = array('subject','new_subject');
 
-                define('FEATHER_ACTIVE_PAGE', 'moderate');
-
-                $this->header->setTitle($page_title)->setPage($p)->setFocusElement($focus_element)->display();
+                $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->setFocusElement($focus_element)->display();
 
                 $this->feather->render('moderate/split_posts.php', array(
                         'id' => $id,
@@ -241,9 +233,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $page_title = array(feather_escape($this->config['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject']));
 
-            define('FEATHER_ACTIVE_PAGE', 'moderate');
-
-            $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
+            $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->setPagingLinks($paging_links)->display();
 
             $this->feather->render('moderate/posts_view.php', array(
                         'cur_topic' => $cur_topic,
@@ -299,9 +289,7 @@ public function display($id, $name = null, $page = null)
 
         $page_title = array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name']));
 
-        define('FEATHER_ACTIVE_PAGE', 'moderate');
-
-        $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->display();
+        $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->setPagingLinks($paging_links)->display();
 
         $this->feather->render('moderate/moderator_forum.php', array(
                             'id' => $id,
@@ -350,9 +338,7 @@ public function dealposts($fid)
 
             $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
-            define('FEATHER_ACTIVE_PAGE', 'moderate');
-
-            $this->header->setTitle($page_title)->display();
+            $this->header->setTitle($page_title)->setActivePage('moderate')->display();
 
             $this->feather->render('moderate/move_topics.php', array(
                         'action'    =>    'multi',
@@ -378,9 +364,7 @@ public function dealposts($fid)
 
             $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
-            define('FEATHER_ACTIVE_PAGE', 'moderate');
-
-            $this->header->setTitle($page_title)->display();
+            $this->header->setTitle($page_title)->setActivePage('moderate')->display();
 
             $this->feather->render('moderate/merge_topics.php', array(
                         'id'    =>    $fid,
@@ -404,9 +388,7 @@ public function dealposts($fid)
 
             $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
 
-            define('FEATHER_ACTIVE_PAGE', 'moderate');
-
-            $this->header->setTitle($page_title)->display();
+            $this->header->setTitle($page_title)->setActivePage('moderate')->display();
 
             $this->feather->render('moderate/delete_topics.php', array(
                         'id'    =>    $fid,
diff --git a/controller/post.php b/controller/post.php
index b5318867..a4778ec9 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -40,8 +40,6 @@ public function newreply($fid = null, $tid = null, $qid = null)
 
     public function newpost($fid = null, $tid = null, $qid = null)
     {
-        global $lang_antispam_questions, $lang_antispam;
-
         // Antispam feature
         require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
@@ -185,9 +183,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
             $focus_element[] = 'req_username';
         }
 
-        define('FEATHER_ACTIVE_PAGE', 'post');
-
-        $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+        $this->header->setTitle($page_title)->setActivePage('post')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         // Get the current state of checkboxes
         $checkboxes = $this->model->get_checkboxes($fid, $is_admmod, $is_subscribed);
diff --git a/controller/profile.php b/controller/profile.php
index 68895ab9..32ba9312 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -30,7 +30,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display($id, $section = null)
     {
         global $pd, $forum_time_formats, $forum_date_formats;
@@ -67,18 +67,16 @@ public function display($id, $section = null)
 
             $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Confirm delete user'));
 
-            define('FEATHER_ACTIVE_PAGE', 'profile');
-
-            $this->header->setTitle($page_title)->display();
+            $this->header->setTitle($page_title)->setActivePage('profile')->display();
 
             $this->feather->render('profile/delete_user.php', array(
                                     'username' => $this->model->get_username($id),
                                     'id' => $id,
                                     )
                             );
-            
+
             $this->footer->display();
-            
+
         } elseif ($this->request->post('form_sent')) {
 
             // Fetch the user group of the user we are editing
@@ -118,9 +116,7 @@ public function display($id, $section = null)
             $page_title = array(feather_escape($this->config['o_board_title']), sprintf(__('Users profile'), feather_escape($user['username'])));
             define('FEATHER_ALLOW_INDEX', 1);
 
-            define('FEATHER_ACTIVE_PAGE', 'profile');
-
-            $this->header->setTitle($page_title)->display();
+            $this->header->setTitle($page_title)->setActivePage('profile')->display();
 
             $this->feather->render('profile/view_profile.php', array(
                         'user_info' => $user_info,
@@ -135,9 +131,7 @@ public function display($id, $section = null)
                 $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section essentials'));
                 $required_fields = array('req_username' => __('Username'), 'req_email' => __('Email'));
 
-                define('FEATHER_ACTIVE_PAGE', 'profile');
-
-                $this->header->setTitle($page_title)->setRequiredFields($required_fields)->display();
+                $this->header->setTitle($page_title)->setActivePage('profile')->setRequiredFields($required_fields)->display();
 
                 $this->model->generate_profile_menu('essentials', $id);
 
@@ -157,9 +151,7 @@ public function display($id, $section = null)
 
                 $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personal'));
 
-                define('FEATHER_ACTIVE_PAGE', 'profile');
-
-                $this->header->setTitle($page_title)->display();
+                $this->header->setTitle($page_title)->setActivePage('profile')->display();
 
                 $this->model->generate_profile_menu('personal', $id);
 
@@ -168,13 +160,11 @@ public function display($id, $section = null)
                                 'feather' => $this->feather,
                                 )
                         );
-                
+
             } elseif ($section == 'messaging') {
                 $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section messaging'));
 
-                define('FEATHER_ACTIVE_PAGE', 'profile');
-
-                $this->header->setTitle($page_title)->display();
+                $this->header->setTitle($page_title)->setActivePage('profile')->display();
 
                 $this->model->generate_profile_menu('messaging', $id);
 
@@ -182,7 +172,7 @@ public function display($id, $section = null)
                                 'user' => $user,
                                 )
                         );
-                
+
             } elseif ($section == 'personality') {
                 if ($this->config['o_avatars'] == '0' && $this->config['o_signatures'] == '0') {
                     message(__('Bad request'), '404');
@@ -205,9 +195,7 @@ public function display($id, $section = null)
 
                 $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personality'));
 
-                define('FEATHER_ACTIVE_PAGE', 'profile');
-
-                $this->header->setTitle($page_title)->display();
+                $this->header->setTitle($page_title)->setActivePage('profile')->display();
 
                 $this->model->generate_profile_menu('personality', $id);
 
@@ -219,13 +207,11 @@ public function display($id, $section = null)
                                 'feather' => $this->feather,
                                 )
                         );
-                
+
             } elseif ($section == 'display') {
                 $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section display'));
 
-                define('FEATHER_ACTIVE_PAGE', 'profile');
-
-                $this->header->setTitle($page_title)->display();
+                $this->header->setTitle($page_title)->setActivePage('profile')->display();
 
                 $this->model->generate_profile_menu('display', $id);
 
@@ -233,13 +219,11 @@ public function display($id, $section = null)
                                 'user' => $user,
                                 )
                         );
-                
+
             } elseif ($section == 'privacy') {
                 $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section privacy'));
 
-                define('FEATHER_ACTIVE_PAGE', 'profile');
-
-                $this->header->setTitle($page_title)->display();
+                $this->header->setTitle($page_title)->setActivePage('profile')->display();
 
                 $this->model->generate_profile_menu('privacy', $id);
 
@@ -247,7 +231,7 @@ public function display($id, $section = null)
                                 'user' => $user,
                                 )
                         );
-                
+
             } elseif ($section == 'admin') {
                 if (!$this->user->is_admmod || ($this->user->g_moderator == '1' && $this->user->g_mod_ban_users == '0')) {
                     message(__('Bad request'), false, '403 Forbidden');
@@ -255,9 +239,7 @@ public function display($id, $section = null)
 
                 $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section admin'));
 
-                define('FEATHER_ACTIVE_PAGE', 'profile');
-
-                $this->header->setTitle($page_title)->display();
+                $this->header->setTitle($page_title)->setActivePage('profile')->display();
 
                 $this->model->generate_profile_menu('admin', $id);
 
@@ -268,7 +250,7 @@ public function display($id, $section = null)
                                 'feather' => $this->feather,
                                 )
                         );
-                
+
             } else {
                 message(__('Bad request'), '404');
             }
@@ -299,9 +281,7 @@ public function action($id, $action)
             $required_fields = array('req_old_password' => __('Old pass'), 'req_new_password1' => __('New pass'), 'req_new_password2' => __('Confirm new pass'));
             $focus_element = array('change_pass', ((!$this->user->is_admmod) ? 'req_old_password' : 'req_new_password1'));
 
-            define('FEATHER_ACTIVE_PAGE', 'profile');
-
-            $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+            $this->header->setTitle($page_title)->setActivePage('profile')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             $this->feather->render('profile/change_pass.php', array(
                                     'feather' => $this->feather,
@@ -317,9 +297,7 @@ public function action($id, $action)
             $required_fields = array('req_new_email' => __('New email'), 'req_password' => __('Password'));
             $focus_element = array('change_email', 'req_new_email');
 
-            define('FEATHER_ACTIVE_PAGE', 'profile');
-
-            $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+            $this->header->setTitle($page_title)->setActivePage('profile')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             $this->feather->render('profile/change_mail.php', array(
                                     'id' => $id,
@@ -344,9 +322,7 @@ public function action($id, $action)
             $required_fields = array('req_file' => __('File'));
             $focus_element = array('upload_avatar', 'req_file');
 
-            define('FEATHER_ACTIVE_PAGE', 'profile');
-
-            $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+            $this->header->setTitle($page_title)->setActivePage('profile')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
             $this->feather->render('profile/upload_avatar.php', array(
                                     'feather_config' => $this->config,
@@ -355,13 +331,13 @@ public function action($id, $action)
                             );
 
             $this->footer->display();
-            
+
         } elseif ($action == 'delete_avatar') {
             if ($this->user->id != $id && !$this->user->is_admmod) {
                 message(__('No permission'), '403');
             }
 
-            
+
 
             $this->model->delete_avatar($id);
 
diff --git a/controller/register.php b/controller/register.php
index 691635c4..6ff7e16c 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -30,11 +30,9 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
-        global $lang_antispam_questions, $lang_antispam;
-
         if (!$this->user->is_guest) {
             header('Location: '.get_base_url());
             exit;
@@ -54,8 +52,6 @@ public function display()
         $required_fields = array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => __('Confirm pass'), 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => __('Robot title'));
         $focus_element = array('register', 'req_user');
 
-        define('FEATHER_ACTIVE_PAGE', 'register');
-
         $user['timezone'] = isset($user['timezone']) ? $user['timezone'] : $this->config['o_default_timezone'];
         $user['dst'] = isset($user['dst']) ? $user['dst'] : $this->config['o_default_dst'];
         $user['email_setting'] = isset($user['email_setting']) ? $user['email_setting'] : $this->config['o_default_email_setting'];
@@ -70,13 +66,11 @@ public function display()
             }
         }
 
-        $this->header->setTitle($page_title)->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+        $this->header->setTitle($page_title)->setActivePage('register')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
 
         $this->feather->render('register/form.php', array(
                             'errors' => $user['errors'],
                             'feather_config' => $this->config,
-                            'lang_antispam' => $lang_antispam,
-                            'lang_antispam_questions'    =>    $lang_antispam_questions,
                             'index_questions'    =>    $index_questions,
                             'feather'    =>    $this->feather,
                             'languages' => forum_list_langs(),
@@ -114,9 +108,7 @@ public function rules()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Register'), __('Forum rules'));
 
-        define('FEATHER_ACTIVE_PAGE', 'register');
-
-        $this->header->setTitle($page_title)->display();
+        $this->header->setTitle($page_title)->setActivePage('register')->display();
 
         $this->feather->render('register/rules.php', array(
                             'feather_config'    =>    $this->config,
diff --git a/controller/search.php b/controller/search.php
index 24672375..186a25ec 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -30,7 +30,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         global $pd;
@@ -51,9 +51,7 @@ public function display()
                 if (isset($search['is_result'])) {
                     $page_title = array(feather_escape($this->config['o_board_title']), __('Search results'));
 
-                    define('FEATHER_ACTIVE_PAGE', 'search');
-
-                    $this->header->setTitle($page_title)->display();
+                    $this->header->setTitle($page_title)->setActivePage('search')->display();
 
                     $this->feather->render('search/header.php', array(
                                 'search' => $search,
@@ -80,9 +78,7 @@ public function display()
         $page_title = array(feather_escape($this->config['o_board_title']), __('Search'));
         $focus_element = array('search', 'keywords');
 
-        define('FEATHER_ACTIVE_PAGE', 'search');
-
-        $this->header->setTitle($page_title)->setFocusElement($focus_element)->display();
+        $this->header->setTitle($page_title)->setActivePage('search')->setFocusElement($focus_element)->display();
 
         $this->feather->render('search/form.php', array(
                             'feather_config' => $this->config,
diff --git a/controller/userlist.php b/controller/userlist.php
index a22d849b..649f1658 100644
--- a/controller/userlist.php
+++ b/controller/userlist.php
@@ -29,7 +29,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         if ($this->user->g_read_board == '0') {
@@ -64,9 +64,7 @@ public function display()
 
         define('FEATHER_ALLOW_INDEX', 1);
 
-        define('FEATHER_ACTIVE_PAGE', 'userlist');
-
-        $this->header->setTitle($page_title)->setPage($p)->setFocusElement($focus_element)->setPagingLinks($paging_links)->display();
+        $this->header->setTitle($page_title)->setActivePage('userlist')->setPage($p)->setFocusElement($focus_element)->setPagingLinks($paging_links)->display();
 
         $this->feather->render('userlist.php', array(
                             'feather' => $this->feather,
diff --git a/controller/viewforum.php b/controller/viewforum.php
index 5b9d207a..1e9bf0c1 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -28,7 +28,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display($id, $name = null, $page = null)
     {
         if ($this->user->g_read_board == '0') {
@@ -77,11 +77,9 @@ public function display($id, $name = null, $page = null)
         $page_title = array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name']));
         define('FEATHER_ALLOW_INDEX', 1);
 
-        define('FEATHER_ACTIVE_PAGE', 'viewforum');
-        
         $page_head = $this->model->get_page_head($id, $num_pages, $p, $url_forum);
 
-        $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->display();
+        $this->header->setTitle($page_title)->setActivePage('viewforum')->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->display();
 
         $this->feather->render('viewforum.php', array(
                             'id' => $id,
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index 839ccea0..292f0857 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -92,9 +92,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         $page_title = array(feather_escape($this->config['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject']));
         define('FEATHER_ALLOW_INDEX', 1);
 
-        define('FEATHER_ACTIVE_PAGE', 'viewtopic');
-
-        $this->header->setTitle($page_title)->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->display();
+        $this->header->setTitle($page_title)->setActivePage('viewtopic')->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->display();
 
         require FEATHER_ROOT.'include/parser.php';
 
diff --git a/include/functions.php b/include/functions.php
index 97b8f951..4cb5d874 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -635,10 +635,6 @@ function message($msg, $http_status = null, $no_back_link = false, $dontStop = f
     if (!defined('FEATHER_HEADER')) {
         $page_title = array(feather_escape($feather->config['o_board_title']), __('Info'));
 
-        if (!defined('FEATHER_ACTIVE_PAGE')) {
-            define('FEATHER_ACTIVE_PAGE', 'index');
-        }
-
         require_once FEATHER_ROOT.'controller/header.php';
 
         $header = new \controller\header();
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
index 15bad5d7..fa1028cb 100644
--- a/style/FeatherBB/view/header.php
+++ b/style/FeatherBB/view/header.php
@@ -75,7 +75,7 @@ function process_form(the_form)
     ?>
 </head>
 
-<body id="pun<?php echo FEATHER_ACTIVE_PAGE ?>"<?= $focus_element; ?>>
+<body id="pun<?= $active_page ?>"<?= $focus_element; ?>>
 
 <header>
 
diff --git a/view/header.php b/view/header.php
index 41c719af..e00002ad 100644
--- a/view/header.php
+++ b/view/header.php
@@ -75,7 +75,7 @@ function process_form(the_form)
 
 <body<?= $focus_element; ?>>
 
-<div id="pun<?php echo FEATHER_ACTIVE_PAGE ?>" class="pun">
+<div id="pun<?= $active_page ?>" class="pun">
 <div class="top-box"></div>
 <div class="punwrap">
 

From d96aa7701805b5bda738404cae3026af7eefe6fd Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 20 Aug 2015 16:56:50 +0200
Subject: [PATCH 116/353] Fix typo

---
 include/classes/cache.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/classes/cache.class.php b/include/classes/cache.class.php
index c1f7c701..321e98a7 100755
--- a/include/classes/cache.class.php
+++ b/include/classes/cache.class.php
@@ -76,7 +76,7 @@ public function isCached($key)
      *
      * @param string $key
      * @param mixed $data
-     * @param integer [optional] $expiration Seconds to expire the cache
+     * @param integer [optional] $expiration seconds to expire the cache
      * @return object
      */
     public function store($key, $data, $expiration = 0)

From 7278d8b84ce1d7f93e35968c8e6feba60feff249 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Fri, 21 Aug 2015 11:30:08 +0200
Subject: [PATCH 117/353] Remove ALLOW_INDEX and ADMIN_CONSOLE constants

---
 controller/admin/bans.php        | 14 ++---
 controller/admin/categories.php  |  4 +-
 controller/admin/censoring.php   |  4 +-
 controller/admin/forums.php      | 12 +---
 controller/admin/groups.php      | 12 +---
 controller/admin/index.php       |  4 +-
 controller/admin/maintenance.php |  6 +-
 controller/admin/options.php     |  4 +-
 controller/admin/parser.php      |  4 +-
 controller/admin/permissions.php |  4 +-
 controller/admin/plugins.php     |  4 +-
 controller/admin/reports.php     |  4 +-
 controller/admin/statistics.php  |  4 +-
 controller/admin/users.php       |  7 +--
 controller/header.php            | 37 ++++++++++++
 controller/index.php             |  3 +-
 controller/profile.php           |  3 +-
 controller/userlist.php          |  4 +-
 controller/viewforum.php         |  3 +-
 controller/viewtopic.php         |  3 +-
 style/FeatherBB/view/header.php  | 98 +++++++++++++++-----------------
 view/header.php                  | 12 +---
 22 files changed, 111 insertions(+), 139 deletions(-)

diff --git a/controller/admin/bans.php b/controller/admin/bans.php
index 3835e13b..0a3dd9d2 100644
--- a/controller/admin/bans.php
+++ b/controller/admin/bans.php
@@ -32,8 +32,6 @@ public function __autoload($class_name)
 
     public function display()
     {
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
             message(__('No permission'), '403');
         }
@@ -53,7 +51,7 @@ public function display()
 
             $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'), __('Results head'));
 
-            $this->header->setTitle($page_title)->setActivePage('admin')->setPage($p)->setPagingLinks($paging_links)->display();
+            $this->header->setTitle($page_title)->setActivePage('admin')->setPage($p)->setPagingLinks($paging_links)->enableAdminConsole()->display();
 
             $ban_data = $this->model->find_ban($start_from);
 
@@ -68,7 +66,7 @@ public function display()
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
         $focus_element = array('bans', 'new_ban_user');
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->enableAdminConsole()->display();
 
         generate_admin_menu('bans');
 
@@ -79,8 +77,6 @@ public function display()
 
     public function add($id = null)
     {
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
             message(__('No permission'), '403');
         }
@@ -92,7 +88,7 @@ public function add($id = null)
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
         $focus_element = array('bans2', 'ban_user');
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->enableAdminConsole()->display();
 
         generate_admin_menu('bans');
 
@@ -116,8 +112,6 @@ public function delete($id)
 
     public function edit($id)
     {
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
             message(__('No permission'), '403');
         }
@@ -129,7 +123,7 @@ public function edit($id)
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
         $focus_element = array('bans2', 'ban_user');
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->enableAdminConsole()->display();
 
         generate_admin_menu('bans');
 
diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index 12f90727..0e724de2 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -106,11 +106,9 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Categories'));
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
         generate_admin_menu('categories');
 
diff --git a/controller/admin/censoring.php b/controller/admin/censoring.php
index ea6c05b0..6406b9eb 100644
--- a/controller/admin/censoring.php
+++ b/controller/admin/censoring.php
@@ -36,8 +36,6 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         // Add a censor word
         if ($this->request->post('add_word')) {
             $this->model->add_word();
@@ -56,7 +54,7 @@ public function display()
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Censoring'));
         $focus_element = array('censoring', 'new_search_for');
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->enableAdminConsole()->display();
 
         generate_admin_menu('censoring');
 
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index f2fde95e..4581263e 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -135,11 +135,9 @@ public function edit_forum($forum_id)
 
         } else {
 
-            define('FEATHER_ADMIN_CONSOLE', 1);
-
             $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums'));
 
-            $this->header->setTitle($page_title)->setActivePage('admin')->display();
+            $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
             generate_admin_menu('forums');
 
@@ -162,8 +160,6 @@ public function delete_forum($forum_id)
             message(__('No permission'), '403');
         }
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         if($this->request->isPost()) {
             $this->model->delete_forum($forum_id);
             // Regenerate the quick jump cache
@@ -179,7 +175,7 @@ public function delete_forum($forum_id)
 
             $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums'));
 
-            $this->header->setTitle($page_title)->setActivePage('admin')->display();
+            $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
             generate_admin_menu('forums');
 
@@ -217,15 +213,13 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         if ($this->request->post('update_positions')) {
             $this->edit_positions();
         }
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums'));
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
         generate_admin_menu('forums');
 
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index c10ed976..dc2a7826 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -36,8 +36,6 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         $groups = $this->model->fetch_groups();
 
         // Set default group
@@ -47,7 +45,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
         generate_admin_menu('groups');
 
@@ -67,8 +65,6 @@ public function delete($id)
             message(__('No permission'), '403');
         }
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         if ($id < 5) {
             message(__('Bad request'), '404');
         }
@@ -106,7 +102,7 @@ public function delete($id)
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
         generate_admin_menu('groups');
 
@@ -125,8 +121,6 @@ public function addedit($id = '')
             message(__('No permission'), '403');
         }
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         $groups = $this->model->fetch_groups();
 
         // Add/edit a group (stage 2)
@@ -140,7 +134,7 @@ public function addedit($id = '')
             $required_fields = array('req_title' => __('Group title label'));
             $focus_element = array('groups2', 'req_title');
 
-            $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+            $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->setRequiredFields($required_fields)->enableAdminConsole()->display();
 
             generate_admin_menu('groups');
 
diff --git a/controller/admin/index.php b/controller/admin/index.php
index 757b520a..e48cad10 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -50,8 +50,6 @@ public function display($action = null)
             message(__('No permission'), '403');
         }
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         // Check for upgrade
         if ($action == 'check_upgrade') {
             if (!ini_get('allow_url_fopen')) {
@@ -84,7 +82,7 @@ public function display($action = null)
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Index'));
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
         generate_admin_menu('index');
 
diff --git a/controller/admin/maintenance.php b/controller/admin/maintenance.php
index 5d5e178e..d58d7e52 100644
--- a/controller/admin/maintenance.php
+++ b/controller/admin/maintenance.php
@@ -36,8 +36,6 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         $action = '';
         if ($this->request->post('action')) {
             $action = $this->request->post('action');
@@ -66,7 +64,7 @@ public function display()
 
             $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Prune'));
 
-            $this->header->setTitle($page_title)->setActivePage('admin')->display();
+            $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
             generate_admin_menu('maintenance');
 
@@ -86,7 +84,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Maintenance'));
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
         generate_admin_menu('maintenance');
 
diff --git a/controller/admin/options.php b/controller/admin/options.php
index 739c1507..230a9dbf 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -36,15 +36,13 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         if ($this->feather->request->isPost()) {
             $this->model->update_options();
         }
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Options'));
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
         generate_admin_menu('options');
 
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index feb4cb65..e2c42f34 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -41,8 +41,6 @@ public function display()
         // Legacy
         require FEATHER_ROOT . 'lang/' . $this->user->language . '/admin/parser.php';
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         // This is where the parser data lives and breathes.
         $cache_file = FEATHER_ROOT.'cache/cache_parser_data.php';
 
@@ -214,7 +212,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Parser'));
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
         generate_admin_menu('parser');
 
diff --git a/controller/admin/permissions.php b/controller/admin/permissions.php
index 03188c1e..78133649 100644
--- a/controller/admin/permissions.php
+++ b/controller/admin/permissions.php
@@ -36,8 +36,6 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         // Update permissions
         if ($this->feather->request->isPost()) {
             $this->model->update_permissions();
@@ -45,7 +43,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Permissions'));
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
         generate_admin_menu('permissions');
 
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index 7aefa1a2..61f72ac7 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -35,8 +35,6 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         // The plugin to load should be supplied via GET
         $plugin = $this->request->get('plugin') ? $this->request->get('plugin') : '';
         if (!preg_match('%^AM?P_(\w*?)\.php$%i', $plugin)) {
@@ -61,7 +59,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), str_replace('_', ' ', substr($plugin, strpos($plugin, '_') + 1, -4)));
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
         // Attempt to load the plugin. We don't use @ here to suppress error messages,
         // because if we did and a parse error occurred in the plugin, we would only
diff --git a/controller/admin/reports.php b/controller/admin/reports.php
index b84271cc..3a9ced60 100644
--- a/controller/admin/reports.php
+++ b/controller/admin/reports.php
@@ -36,8 +36,6 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         // Zap a report
         if ($this->feather->request->isPost()) {
             $this->model->zap_report();
@@ -45,7 +43,7 @@ public function display()
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Reports'));
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
         generate_admin_menu('reports');
 
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index 5aed0c15..65dae86d 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -36,11 +36,9 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Server statistics'));
 
-        $this->header->setTitle($page_title)->setActivePage('admin')->display();
+        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
         generate_admin_menu('index');
 
diff --git a/controller/admin/users.php b/controller/admin/users.php
index c0d0fba7..aecd2f43 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -22,6 +22,7 @@ public function __construct()
         $this->footer = new \controller\footer();
         $this->model = new \model\admin\users();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/users.mo');
+        $this->header->enableAdminConsole();
         require FEATHER_ROOT . 'include/common_admin.php';
     }
 
@@ -32,8 +33,6 @@ public function __autoload($class_name)
 
     public function display()
     {
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         if (!$this->user->is_admmod) {
             message(__('No permission'), '403');
         }
@@ -167,8 +166,6 @@ public function display()
     // Show IP statistics for a certain user ID
     public function ipstats($id)
     {
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         if (!$this->user->is_admmod) {
             message(__('No permission'), '403');
         }
@@ -201,8 +198,6 @@ public function ipstats($id)
     // Show IP statistics for a certain user IP
     public function showusers($ip)
     {
-        define('FEATHER_ADMIN_CONSOLE', 1);
-
         if (!$this->user->is_admmod) {
             message(__('No permission'), '403');
         }
diff --git a/controller/header.php b/controller/header.php
index 2016280e..01e0d385 100644
--- a/controller/header.php
+++ b/controller/header.php
@@ -35,6 +35,10 @@ public function __construct()
 
     private $active_page;
 
+    private $admin_console;
+
+    private $allow_index;
+
     public function setTitle($title)
     {
         $this->title = $title;
@@ -84,6 +88,20 @@ public function setActivePage($active_page)
         return $this;
     }
 
+    public function enableAdminConsole()
+    {
+        $this->admin_console = true;
+
+        return $this;
+    }
+
+    public function allowIndex()
+    {
+        $this->allow_index = true;
+
+        return $this;
+    }
+
     public function display()
     {
         if (!defined('FEATHER_HEADER')) {
@@ -103,6 +121,10 @@ public function display()
 
         $navlinks = $this->getNavlinks();
         $page_info = $this->getStatus();
+        $admin_console = $this->getAdminConsole();
+
+        // Show the robots meta only if enabled
+        $allow_index = ($this->allow_index === true) ? '' : '<meta name="ROBOTS" content="NOINDEX, FOLLOW" />'."\n";
 
         $focus_element = isset($this->focus_element) ? ' onload="document.getElementById(\''.$this->focus_element[0].'\').elements[\''.$this->focus_element[1].'\'].focus();"' : '';
 
@@ -120,6 +142,8 @@ public function display()
                 'focus_element' => $focus_element,
                 'navlinks' => $navlinks,
                 'page_info' => $page_info,
+                'admin_console' => $admin_console,
+                'allow_index' => $allow_index,
             )
         );
     }
@@ -229,4 +253,17 @@ private function getStatus()
 
         return $page_info;
     }
+
+    protected function getAdminConsole()
+    {
+        if ($this->admin_console === true) {
+            if (file_exists(FEATHER_ROOT.'style/'.$this->user->style.'/base_admin.css')) {
+                return '<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/'.$this->user->style.'/base_admin.css" />'."\n";
+            } else {
+                return '<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/imports/base_admin.css" />'."\n";
+            }
+        } else {
+            return '';
+        }
+    }
 }
diff --git a/controller/index.php b/controller/index.php
index f4cb80c5..a6e0e72e 100644
--- a/controller/index.php
+++ b/controller/index.php
@@ -36,9 +36,8 @@ public function display()
         }
 
         $page_title = array(feather_escape($this->config['o_board_title']));
-        define('FEATHER_ALLOW_INDEX', 1);
 
-        $this->header->setTitle($page_title)->setActivePage('index')->display();
+        $this->header->setTitle($page_title)->setActivePage('index')->allowIndex()->display();
 
         $this->feather->render('index.php', array(
                             'index_data' => $this->model->print_categories_forums(),
diff --git a/controller/profile.php b/controller/profile.php
index 32ba9312..c1b17ee6 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -114,9 +114,8 @@ public function display($id, $section = null)
                 $user_info = $this->model->parse_user_info($user);
 
             $page_title = array(feather_escape($this->config['o_board_title']), sprintf(__('Users profile'), feather_escape($user['username'])));
-            define('FEATHER_ALLOW_INDEX', 1);
 
-            $this->header->setTitle($page_title)->setActivePage('profile')->display();
+            $this->header->setTitle($page_title)->setActivePage('profile')->allowIndex()->display();
 
             $this->feather->render('profile/view_profile.php', array(
                         'user_info' => $user_info,
diff --git a/controller/userlist.php b/controller/userlist.php
index 649f1658..f03dd841 100644
--- a/controller/userlist.php
+++ b/controller/userlist.php
@@ -62,9 +62,7 @@ public function display()
         // Generate paging links
         $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
 
-        define('FEATHER_ALLOW_INDEX', 1);
-
-        $this->header->setTitle($page_title)->setActivePage('userlist')->setPage($p)->setFocusElement($focus_element)->setPagingLinks($paging_links)->display();
+        $this->header->setTitle($page_title)->setActivePage('userlist')->setPage($p)->setFocusElement($focus_element)->setPagingLinks($paging_links)->allowIndex()->display();
 
         $this->feather->render('userlist.php', array(
                             'feather' => $this->feather,
diff --git a/controller/viewforum.php b/controller/viewforum.php
index 1e9bf0c1..1571b04d 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -75,11 +75,10 @@ public function display($id, $name = null, $page = null)
 
 
         $page_title = array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name']));
-        define('FEATHER_ALLOW_INDEX', 1);
 
         $page_head = $this->model->get_page_head($id, $num_pages, $p, $url_forum);
 
-        $this->header->setTitle($page_title)->setActivePage('viewforum')->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->display();
+        $this->header->setTitle($page_title)->setActivePage('viewforum')->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->allowIndex()->display();
 
         $this->feather->render('viewforum.php', array(
                             'id' => $id,
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index 292f0857..bd6f0087 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -90,9 +90,8 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         $page_head = $this->model->get_page_head($id, $num_pages, $p, $url_topic);
 
         $page_title = array(feather_escape($this->config['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject']));
-        define('FEATHER_ALLOW_INDEX', 1);
 
-        $this->header->setTitle($page_title)->setActivePage('viewtopic')->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->display();
+        $this->header->setTitle($page_title)->setActivePage('viewtopic')->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->allowIndex()->display();
 
         require FEATHER_ROOT.'include/parser.php';
 
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
index fa1028cb..9da121c2 100644
--- a/style/FeatherBB/view/header.php
+++ b/style/FeatherBB/view/header.php
@@ -11,68 +11,60 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php _e('lang_identifier') ?>" lang="<?php _e('lang_identifier') ?>" dir="<?php _e('lang_direction') ?>">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
-    <title><?php echo generate_page_title($page_title, $p) ?></title>
-    <link rel="stylesheet" type="text/css" href="<?php echo get_base_url() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
-    <?php
-    if (!defined('FEATHER_ALLOW_INDEX')) {
-        echo '<meta name="ROBOTS" content="NOINDEX, FOLLOW" />'."\n";
-    }
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
+<title><?php echo generate_page_title($page_title, $p) ?></title>
+<link rel="stylesheet" type="text/css" href="<?php echo get_base_url() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
+<?php
 
-    if (defined('FEATHER_ADMIN_CONSOLE')) {
-        if (file_exists(FEATHER_ROOT.'style/'.$feather->user->style.'/base_admin.css')) {
-            echo '<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/'.$feather->user->style.'/base_admin.css" />'."\n";
-        } else {
-            echo '<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/imports/base_admin.css" />'."\n";
-        }
-    }
+echo $allow_index;
+echo $admin_console;
 
-    if (isset($required_fields)) :
-        // Output JavaScript to validate form (make sure required fields are filled out)
+if (isset($required_fields)) :
+    // Output JavaScript to validate form (make sure required fields are filled out)
 
-        ?>
-        <script type="text/javascript">
-            /* <![CDATA[ */
-            function process_form(the_form)
-            {
-                var required_fields = {
-                    <?php
-                        // Output a JavaScript object with localised field names
-                        $tpl_temp = count($required_fields);
-                        foreach ($required_fields as $elem_orig => $elem_trans) {
-                            echo "\t\t\"".$elem_orig.'": "'.addslashes(str_replace('&#160;', ' ', $elem_trans));
-                            if (--$tpl_temp) {
-                                echo "\",\n";
-                            } else {
-                                echo "\"\n\t};\n";
-                            }
+    ?>
+    <script type="text/javascript">
+        /* <![CDATA[ */
+        function process_form(the_form)
+        {
+            var required_fields = {
+                <?php
+                    // Output a JavaScript object with localised field names
+                    $tpl_temp = count($required_fields);
+                    foreach ($required_fields as $elem_orig => $elem_trans) {
+                        echo "\t\t\"".$elem_orig.'": "'.addslashes(str_replace('&#160;', ' ', $elem_trans));
+                        if (--$tpl_temp) {
+                            echo "\",\n";
+                        } else {
+                            echo "\"\n\t};\n";
                         }
-                        ?>
-                    if (document.all || document.getElementById)
+                    }
+                    ?>
+                if (document.all || document.getElementById)
+            {
+                for (var i = 0; i < the_form.length; ++i)
                 {
-                    for (var i = 0; i < the_form.length; ++i)
+                    var elem = the_form.elements[i];
+                    if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
                     {
-                        var elem = the_form.elements[i];
-                        if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
-                        {
-                            alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
-                            elem.focus();
-                            return false;
-                        }
+                        alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
+                        elem.focus();
+                        return false;
                     }
                 }
-                return true;
             }
-            /* ]]> */
-        </script>
-        <?php
-    endif;
-    if (!empty($page_head)) :
-        echo implode("\n", $page_head)."\n";
-    endif;
-    ?>
+            return true;
+        }
+        /* ]]> */
+    </script>
+    <?php
+endif;
+if (!empty($page_head)) :
+    echo implode("\n", $page_head)."\n";
+endif;
+?>
 </head>
 
 <body id="pun<?= $active_page ?>"<?= $focus_element; ?>>
diff --git a/view/header.php b/view/header.php
index e00002ad..d9fbd687 100644
--- a/view/header.php
+++ b/view/header.php
@@ -15,17 +15,9 @@
 <title><?php echo generate_page_title($page_title, $p) ?></title>
 <link rel="stylesheet" type="text/css" href="<?php echo get_base_url() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
 <?php
-if (!defined('FEATHER_ALLOW_INDEX')) {
-    echo '<meta name="ROBOTS" content="NOINDEX, FOLLOW" />'."\n";
-}
 
-if (defined('FEATHER_ADMIN_CONSOLE')) {
-    if (file_exists(FEATHER_ROOT.'style/'.$feather->user->style.'/base_admin.css')) {
-        echo '<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/'.$feather->user->style.'/base_admin.css" />'."\n";
-    } else {
-        echo '<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/imports/base_admin.css" />'."\n";
-    }
-}
+echo $allow_index;
+echo $admin_console;
 
 if (isset($required_fields)) :
     // Output JavaScript to validate form (make sure required fields are filled out)

From a7ce91a0f0c3887581a4ef4e32a84e6a7f2cd337 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 21 Aug 2015 12:17:29 +0200
Subject: [PATCH 118/353] Start to add hooks

---
 model/moderate.php | 178 ++++++++++++++++++++++++++-------------------
 1 file changed, 103 insertions(+), 75 deletions(-)

diff --git a/model/moderate.php b/model/moderate.php
index 8bf1ec52..8972dd54 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -492,6 +492,7 @@ public function display_posts_view($tid, $start_from)
 
     public function move_topics_to($fid, $tfid = null, $param = null)
     {
+        $fid = $this->hook->fire('move_topics_to_start', $fid);
         
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
             message(__('Bad request'), '404');
@@ -505,9 +506,10 @@ public function move_topics_to($fid, $tfid = null, $param = null)
 
         // Verify that the topic IDs are valid
         $result = DB::for_table('topics')
-            ->where_in('id', $topics)
-            ->where('forum_id', $fid)
-            ->find_many();
+                    ->where_in('id', $topics)
+                    ->where('forum_id', $fid);
+        $result = $this->hook->fireDB('move_topics_to_topic_valid', $result);
+        $result = $result->find_many();
 
         if (count($result) != count($topics)) {
             message(__('Bad request'), '404');
@@ -515,47 +517,51 @@ public function move_topics_to($fid, $tfid = null, $param = null)
 
 
         // Verify that the move to forum ID is valid
-        $where_move_topics_to = array(
+        $authorized['where'] = array(
             array('fp.post_topics' => 'IS NULL'),
             array('fp.post_topics' => '1')
         );
 
         $authorized = DB::for_table('forums')
-            ->table_alias('f')
-            ->left_outer_join('forum_perms', array('fp.forum_id', '=', $move_to_forum), 'fp', true)
-            ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-            ->where_any_is($where_move_topics_to)
-            ->where_null('f.redirect_url')
-            ->find_one();
+                        ->table_alias('f')
+                        ->left_outer_join('forum_perms', array('fp.forum_id', '=', $move_to_forum), 'fp', true)
+                        ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
+                        ->where_any_is($authorized['where'])
+                        ->where_null('f.redirect_url');
+        $authorized = $this->hook->fireDB('move_topics_to_authorized', $authorized);
+        $authorized = $authorized->find_one();
 
         if (!$authorized) {
             message(__('Bad request'), '404');
         }
 
         // Delete any redirect topics if there are any (only if we moved/copied the topic back to where it was once moved from)
-        DB::for_table('topics')
-            ->where('forum_id', $move_to_forum)
-            ->where_in('moved_to', $topics)
-            ->delete_many();
+        $delete_redirect = DB::for_table('topics')
+                                ->where('forum_id', $move_to_forum)
+                                ->where_in('moved_to', $topics);
+        $delete_redirect = $this->hook->fireDB('move_topics_to_delete_redirect', $delete_redirect);
+        $delete_redirect = $delete_redirect->delete_many();
 
         // Move the topic(s)
-        DB::for_table('topics')->where_in('id', $topics)
-            ->find_one()
-            ->set('forum_id', $move_to_forum)
-            ->save();
+        $move_topics = DB::for_table('topics')->where_in('id', $topics)
+                        ->find_one()
+                        ->set('forum_id', $move_to_forum);
+        $move_topics = $this->hook->fireDB('move_topics_to_query', $move_topics);
+        $move_topics = $move_topics->save();
 
         // Should we create redirect topics?
         if ($this->request->post('with_redirect')) {
             foreach ($topics as $cur_topic) {
                 // Fetch info for the redirect topic
-                $select_move_topics_to = array('poster', 'subject', 'posted', 'last_post');
+                $moved_to['select'] = array('poster', 'subject', 'posted', 'last_post');
 
-                $moved_to = DB::for_table('topics')->select_many($select_move_topics_to)
-                    ->where('id', $cur_topic)
-                    ->find_one();
+                $moved_to = DB::for_table('topics')->select_many($moved_to['select'])
+                                ->where('id', $cur_topic);
+                $moved_to = $this->hook->fireDB('move_topics_to_fetch_redirect', $moved_to);
+                $moved_to = $moved_to->find_one();
 
                 // Create the redirect topic
-                $insert_move_topics_to = array(
+                $move_topics_to['insert'] = array(
                     'poster' => $moved_to['poster'],
                     'subject'  => $moved_to['subject'],
                     'posted'  => $moved_to['posted'],
@@ -565,10 +571,11 @@ public function move_topics_to($fid, $tfid = null, $param = null)
                 );
 
                 // Insert the report
-                DB::for_table('topics')
-                    ->create()
-                    ->set($insert_move_topics_to)
-                    ->save();
+                $move_topics_to = DB::for_table('topics')
+                                    ->create()
+                                    ->set($move_topics_to['insert']);
+                $move_topics_to = $this->hook->fireDB('move_topics_to_redirect', $move_topics_to);
+                $move_topics_to = $move_topics_to->save();
 
             }
         }
@@ -577,28 +584,32 @@ public function move_topics_to($fid, $tfid = null, $param = null)
         update_forum($move_to_forum); // Update the forum TO which the topic was moved
 
         $redirect_msg = (count($topics) > 1) ? __('Move topics redirect') : __('Move topic redirect');
+        $redirect_msg = $this->hook->fire('move_topics_to_redirect_message', $redirect_msg);
         redirect(get_link('forum/'.$move_to_forum.'/'), $redirect_msg);
     }
 
     public function check_move_possible()
     {
-        $select_check_move_possible = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name');
-        $where_check_move_possible = array(
+        $this->hook->fire('check_move_possible_start');
+
+        $result['select'] = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name');
+        $result['where'] = array(
             array('fp.post_topics' => 'IS NULL'),
             array('fp.post_topics' => '1')
         );
-        $order_by_check_move_possible = array('c.disp_position', 'c.id', 'f.disp_position');
+        $result['order_by'] = array('c.disp_position', 'c.id', 'f.disp_position');
 
         $result = DB::for_table('categories')
-            ->table_alias('c')
-            ->select_many($select_check_move_possible)
-            ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
-            ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
-            ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-            ->where_any_is($where_check_move_possible)
-            ->where_null('f.redirect_url')
-            ->order_by_many($order_by_check_move_possible)
-            ->find_many();
+                    ->table_alias('c')
+                    ->select_many($result['select'])
+                    ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
+                    ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
+                    ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
+                    ->where_any_is($result['where'])
+                    ->where_null('f.redirect_url')
+                    ->order_by_many($result['order_by']);
+        $result = $this->hook->fireDB('check_move_possible');
+        $result = $result->find_many();
 
         if (count($result) < 2) {
             message(__('Nowhere to move'));
@@ -607,6 +618,8 @@ public function check_move_possible()
 
     public function merge_topics($fid)
     {
+        $fid = $this->hook->fire('merge_topics_start', $fid);
+
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
             message(__('Bad request'), '404');
         }
@@ -618,9 +631,10 @@ public function merge_topics($fid)
 
         // Verify that the topic IDs are valid (redirect links will point to the merged topic after the merge)
         $result = DB::for_table('topics')
-            ->where_in('id', $topics)
-            ->where('forum_id', $fid)
-            ->find_many();
+                    ->where_in('id', $topics)
+                    ->where('forum_id', $fid);
+        $result = $this->hook->fireDB('merge_topics_topic_ids', $result);
+        $result = $result->find_many();
 
         if (count($result) != count($topics)) {
             message(__('Bad request'), '404');
@@ -628,10 +642,11 @@ public function merge_topics($fid)
 
         // The topic that we are merging into is the one with the smallest ID
         $merge_to_tid = DB::for_table('topics')
-            ->where_in('id', $topics)
-            ->where('forum_id', $fid)
-            ->order_by_asc('id')
-            ->find_one_col('id');
+                            ->where_in('id', $topics)
+                            ->where('forum_id', $fid)
+                            ->order_by_asc('id')
+                            ->find_one_col('id');
+        $merge_to_tid = $this->hook->fire('merge_topics_tid', $merge_to_tid);
 
         // Make any redirect topics point to our new, merged topic
         $query = 'UPDATE '.$this->feather->forum_settings['db_prefix'].'topics SET moved_to='.$merge_to_tid.' WHERE moved_to IN('.implode(',', $topics).')';
@@ -645,69 +660,80 @@ public function merge_topics($fid)
         DB::for_table('topics')->raw_execute($query);
 
         // Merge the posts into the topic
-        DB::for_table('posts')
-            ->where_in('topic_id', $topics)
-            ->update_many('topic_id', $merge_to_tid);
+        $merge_posts = DB::for_table('posts')
+                        ->where_in('topic_id', $topics);
+        $merge_posts = $this->hook->fireDB('merge_topics_merge_posts', $merge_posts);
+        $merge_posts = $merge_posts->update_many('topic_id', $merge_to_tid);
 
         // Update any subscriptions
         $find_ids = DB::for_table('topic_subscriptions')->select('user_id')
-            ->distinct()
-            ->where_in('topic_id', $topics)
-            ->find_many();
+                        ->distinct()
+                        ->where_in('topic_id', $topics);
+        $find_ids = $this->hook->fireDB('merge_topics_find_ids', $find_ids);
+        $find_ids = $find_ids->find_many();
 
         foreach ($find_ids as $id) {
             $subscribed_users[] = $id['user_id'];
         }
 
         // Delete the subscriptions
-        DB::for_table('topic_subscriptions')
-            ->where_in('topic_id', $topics)
-            ->delete_many();
+        $delete_subscriptions = DB::for_table('topic_subscriptions')
+                                    ->where_in('topic_id', $topics);
+        $delete_subscriptions = $this->hook->fireDB('merge_topics_delete_subscriptions', $delete_subscriptions);
+        $delete_subscriptions = $delete_subscriptions->delete_many();
 
         foreach ($subscribed_users as $cur_user_id) {
-            $insert_topic_subscription = array(
+            $subscriptions['insert'] = array(
                 'topic_id'  =>  $merge_to_tid,
                 'user_id'   =>  $cur_user_id,
             );
             // Insert the subscription
-            DB::for_table('topic_subscriptions')
-                ->create()
-                ->set($insert_topic_subscription)
-                ->save();
+            $subscriptions = DB::for_table('topic_subscriptions')
+                                ->create()
+                                ->set($subscriptions['insert']);
+            $subscriptions = $this->hook->fireDB('merge_topics_insert_subscriptions', $subscriptions);
+            $subscriptions = $subscriptions->save();
         }
 
         // Without redirection the old topics are removed
         if ($this->request->post('with_redirect') == 0) {
-            DB::for_table('topics')
-                ->where_in('id', $topics)
-                ->where_not_equal('id', $merge_to_tid)
-                ->delete_many();
+            $delete_topics = DB::for_table('topics')
+                                ->where_in('id', $topics)
+                                ->where_not_equal('id', $merge_to_tid);
+            $delete_topics = $this->hook->fireDB('merge_topics_delete_topics', $delete_topics);
+            $delete_topics = $delete_topics->delete_many();
         }
 
         // Count number of replies in the topic
         $num_replies = DB::for_table('posts')->where('topic_id', $merge_to_tid)->count('id') - 1;
+        $num_replies = $this->hook->fire('merge_topics_num_replies', $num_replies);
 
         // Get last_post, last_post_id and last_poster
-        $select_last_post = array('posted', 'id', 'poster');
+        $last_post['select'] = array('posted', 'id', 'poster');
 
-        $last_post = DB::for_table('posts')->select_many($select_last_post)
-            ->where('topic_id', $merge_to_tid)
-            ->order_by_desc('id')
-            ->find_one();
+        $last_post = DB::for_table('posts')
+                        ->select_many($last_post['select'])
+                        ->where('topic_id', $merge_to_tid)
+                        ->order_by_desc('id');
+        $last_post = $this->hook->fireDB('merge_topics_last_post', $last_post);
+        $last_post = $last_post->find_one();
 
         // Update topic
-        $insert_topic = array(
+        $update_topic['insert'] = array(
             'num_replies' => $num_replies,
             'last_post'  => $last_post['posted'],
             'last_post_id'  => $last_post['id'],
             'last_poster'  => $last_post['poster'],
         );
 
-        DB::for_table('topics')
-            ->where('id', $merge_to_tid)
-            ->find_one()
-            ->set($insert_topic)
-            ->save();
+        $topic = DB::for_table('topics')
+                    ->where('id', $merge_to_tid)
+                    ->find_one()
+                    ->set($update_topic['insert']);
+        $topic = $this->hook->fireDB('merge_topics_update_topic', $topic);
+        $topic = $topic->save();
+
+        $this->hook->fire('merge_topics');
 
         // Update the forum FROM which the topic was moved and redirect
         update_forum($fid);
@@ -716,6 +742,8 @@ public function merge_topics($fid)
 
     public function delete_topics($topics, $fid)
     {
+        $this->hook->fire('delete_topics');
+
         if (@preg_match('%[^0-9,]%', $topics)) {
             message(__('Bad request'), '404');
         }

From 7cad5b38d33ec6c714e83d0c8111a01f0a36b221 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 21 Aug 2015 14:54:43 +0200
Subject: [PATCH 119/353] Add more hooks

---
 controller/moderate.php |   4 +-
 model/moderate.php      | 160 ++++++++++++++++++++++++----------------
 2 files changed, 100 insertions(+), 64 deletions(-)

diff --git a/controller/moderate.php b/controller/moderate.php
index b1e7a889..9e976018 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -141,14 +141,14 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         if ($action == 'open') {
             $this->model->open_topic($id, $fid);
 
-            redirect(get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
+            redirect(get_link('topic/'.$id.'/'), __('Open topic redirect'));
         }
 
         // Close a topic
         if ($action == 'close') {
             $this->model->close_topic($id, $fid);
 
-            redirect(get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
+            redirect(get_link('topic/'.$id.'/'), __('Close topic redirect'));
         }
 
         $cur_topic = $this->model->get_topic_info($fid, $id);
diff --git a/model/moderate.php b/model/moderate.php
index 8972dd54..ea487a85 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -754,9 +754,10 @@ public function delete_topics($topics, $fid)
 
         // Verify that the topic IDs are valid
         $result = DB::for_table('topics')
-            ->where_in('id', $topics_sql)
-            ->where('forum_id', $fid)
-            ->find_many();
+                    ->where_in('id', $topics_sql)
+                    ->where('forum_id', $fid);
+        $result = $this->hook->fireDB('delete_topics_verify_id', $result);
+        $result = $result->find_many();
 
         if (count($result) != substr_count($topics, ',') + 1) {
             message(__('Bad request'), '404');
@@ -765,33 +766,39 @@ public function delete_topics($topics, $fid)
         // Verify that the posts are not by admins
         if ($this->user->g_id != FEATHER_ADMIN) {
             $authorized = DB::for_table('posts')
-                ->where_in('topic_id', $topics_sql)
-                ->where('poster_id', get_admin_ids())
-                ->find_many();
+                            ->where_in('topic_id', $topics_sql)
+                            ->where('poster_id', get_admin_ids());
+            $authorized = $this->hook->fireDB('delete_topics_authorized', $authorized);
+            $authorized = $authorized->find_many();
             if ($authorized) {
                 message(__('No permission'), '403');
             }
         }
 
         // Delete the topics
-        DB::for_table('topics')
-            ->where_in('id', $topics_sql)
-            ->delete_many();
+        $delete_topics = DB::for_table('topics')
+                            ->where_in('id', $topics_sql);
+        $delete_topics = $this->hook->fireDB('delete_topics_query', $delete_topics);
+        $delete_topics = $delete_topics->delete_many();
 
         // Delete any redirect topics
-        DB::for_table('topics')
-            ->where_in('moved_to', $topics_sql)
-            ->delete_many();
+        $delete_redirect_topics = DB::for_table('topics')
+                                    ->where_in('moved_to', $topics_sql);
+        $delete_redirect_topics = $this->hook->fireDB('delete_topics_redirect', $delete_redirect_topics);
+        $delete_redirect_topics = $delete_redirect_topics->delete_many();
 
         // Delete any subscriptions
-        DB::for_table('topic_subscriptions')
-            ->where_in('topic_id', $topics_sql)
-            ->delete_many();
+        $delete_subscriptions = DB::for_table('topic_subscriptions')
+                                    ->where_in('topic_id', $topics_sql);
+        $delete_subscriptions = $this->hook->fireDB('delete_topics_subscriptions', $delete_subscriptions);
+        $delete_subscriptions = $delete_subscriptions->delete_many();
 
         // Create a list of the post IDs in this topic and then strip the search index
-        $find_ids = DB::for_table('posts')->select('id')
-            ->where_in('topic_id', $topics_sql)
-            ->find_many();
+        $find_ids = DB::for_table('posts')
+                        ->select('id')
+                        ->where_in('topic_id', $topics_sql);
+        $find_ids = $this->hook->fireDB('delete_topics_find_ids', $find_ids);
+        $find_ids = $find_ids->find_many();
 
         foreach ($find_ids as $id) {
             $ids_post[] = $id['id'];
@@ -805,31 +812,35 @@ public function delete_topics($topics, $fid)
         }
 
         // Delete posts
-        DB::for_table('posts')
-            ->where_in('topic_id', $topics_sql)
-            ->delete_many();
+        $delete_posts = DB::for_table('posts')
+                            ->where_in('topic_id', $topics_sql);
+        $delete_posts = $this->hook->fireDB('delete_topics_delete_posts', $delete_posts);
+        $delete_posts = $delete_posts->delete_many();
 
         update_forum($fid);
 
+        $this->hook->fire('delete_topics');
+
         redirect(get_link('forum/'.$fid.'/'), __('Delete topics redirect'));
     }
 
     public function get_forum_info($fid)
     {
-        $select_get_forum_info = array('f.forum_name', 'f.redirect_url', 'f.num_topics', 'f.sort_by');
-        $where_get_forum_info = array(
+        $cur_forum['select'] = array('f.forum_name', 'f.redirect_url', 'f.num_topics', 'f.sort_by');
+        $cur_forum['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
 
         $cur_forum = DB::for_table('forums')
-            ->table_alias('f')
-            ->select_many($select_get_forum_info)
-            ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
-            ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-            ->where_any_is($where_get_forum_info)
-            ->where('f.id', $fid)
-            ->find_one();
+                        ->table_alias('f')
+                        ->select_many($cur_forum['select'])
+                        ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
+                        ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
+                        ->where_any_is($cur_forum['where'])
+                        ->where('f.id', $fid);
+        $cur_forum = $this->hook->fireDB('get_forum_info', $cur_forum);
+        $cur_forum = $cur_forum->find_one();
 
         if (!$cur_forum) {
             message(__('Bad request'), '404');
@@ -841,6 +852,8 @@ public function get_forum_info($fid)
 
     public function forum_sort_by($forum_sort)
     {
+        $forum_sort = $this->hook->fire('forum_sort_by_start', $forum_sort);
+
         switch ($forum_sort) {
             case 0:
                 $sort_by = 'last_post DESC';
@@ -856,11 +869,15 @@ public function forum_sort_by($forum_sort)
                 break;
         }
 
+        $sort_by = $this->hook->fire('forum_sort_by', $sort_by);
+
         return $sort_by;
     }
 
     public function display_topics($fid, $sort_by, $start_from)
     {
+        $this->hook->fire('display_topics_start');
+
         $topic_data = array();
 
         // Get topic/forum tracking data
@@ -870,11 +887,12 @@ public function display_topics($fid, $sort_by, $start_from)
 
         // Retrieve a list of topic IDs, LIMIT is (really) expensive so we only fetch the IDs here then later fetch the remaining data
         $result = DB::for_table('topics')->select('id')
-            ->where('forum_id', $fid)
-            ->order_by_expr('sticky DESC, '.$sort_by)
-            ->limit($this->user->disp_topics)
-            ->offset($start_from)
-            ->find_many();
+                    ->where('forum_id', $fid)
+                    ->order_by_expr('sticky DESC, '.$sort_by)
+                    ->limit($this->user->disp_topics)
+                    ->offset($start_from);
+        $result = $this->hook->fireDB('display_topics_list_ids', $result);
+        $result = $result->find_many();
 
         // If there are topics in this forum
         if ($result) {
@@ -883,14 +901,16 @@ public function display_topics($fid, $sort_by, $start_from)
                 $topic_ids[] = $id['id'];
             }
 
+            unset($result);
             // Select topics
-            $select_display_topics = array('id', 'poster', 'subject', 'posted', 'last_post', 'last_post_id', 'last_poster', 'num_views', 'num_replies', 'closed', 'sticky', 'moved_to');
-
-            // TODO: order_by_expr && result_set
-            $result = DB::for_table('topics')->select_many($select_display_topics)
-                ->where_in('id', $topic_ids)
-                ->order_by_expr('sticky DESC, '.$sort_by.', id DESC')
-                ->find_many();
+            $result['select'] = array('id', 'poster', 'subject', 'posted', 'last_post', 'last_post_id', 'last_poster', 'num_views', 'num_replies', 'closed', 'sticky', 'moved_to');
+            $result = DB::for_table('topics')->select_many($result['select'])
+                        ->where_in('id', $topic_ids)
+                        ->order_by_desc('sticky')
+                        ->order_by_expr($sort_by)
+                        ->order_by_desc('id');
+            $result = $this->hook->fireDB('display_topics_query', $result);
+            $result = $result->find_many();
 
             $topic_count = 0;
             foreach($result as $cur_topic) {
@@ -959,53 +979,69 @@ public function display_topics($fid, $sort_by, $start_from)
             }
         }
 
+        $topic_data = $this->hook->fire('display_topics', $topic_data);
+
         return $topic_data;
     }
     
     public function stick_topic($id, $fid)
     {
-        DB::for_table('topics')->where('id', $id)->where('forum_id', $fid)
-            ->find_one()
-            ->set('sticky', 1)
-            ->save();
+        $stick_topic = DB::for_table('topics')
+                            ->where('id', $id)
+                            ->where('forum_id', $fid)
+                            ->find_one()
+                            ->set('sticky', 1);
+        $stick_topic = $this->hook->fireDB('stick_topic', $stick_topic);
+        $stick_topic = $stick_topic->save();
     }
 
     public function unstick_topic($id, $fid)
     {
-        DB::for_table('topics')->where('id', $id)->where('forum_id', $fid)
+        $unstick_topic = DB::for_table('topics')
+            ->where('id', $id)
+            ->where('forum_id', $fid)
             ->find_one()
-            ->set('sticky', 0)
-            ->save();
+            ->set('sticky', 0);
+        $unstick_topic = $this->hook->fireDB('unstick_topic', $unstick_topic);
+        $unstick_topic = $unstick_topic->save();
     }
     
     public function open_topic($id, $fid)
     {
-        DB::for_table('topics')->where('id', $id)->where('forum_id', $fid)
-            ->find_one()
-            ->set('closed', 0)
-            ->save();
+        $open_topic = DB::for_table('topics')
+                        ->where('id', $id)
+                        ->where('forum_id', $fid)
+                        ->find_one()
+                        ->set('closed', 0);
+        $open_topic = $this->hook->fireDB('open_topic', $open_topic);
+        $open_topic = $open_topic->save();
     }
     
     public function close_topic($id, $fid)
     {
-        DB::for_table('topics')->where('id', $id)->where('forum_id', $fid)
-            ->find_one()
-            ->set('closed', 1)
-            ->save();
+        $close_topic = DB::for_table('topics')
+                        ->where('id', $id)
+                        ->where('forum_id', $fid)
+                        ->find_one()
+                        ->set('closed', 1);
+        $close_topic = $this->hook->fireDB('close_topic', $close_topic);
+        $close_topic = $close_topic->save();
     }
     
     public function close_multiple_topics($action, $topics, $fid)
     {
-        DB::for_table('topics')
-            ->where_in('id', $topics)
-            ->update_many('closed', $action);
+        $close_multiple_topics = DB::for_table('topics')
+                                    ->where_in('id', $topics);
+        $close_multiple_topics = $this->hook->fireDB('open_topic', $close_multiple_topics);
+        $close_multiple_topics = $close_multiple_topics->update_many('closed', $action);
     }
     
     public function get_subject_tid($id)
     {
         $subject = DB::for_table('topics')
-            ->where('id', $id)
-            ->find_one_col('subject');
+                    ->where('id', $id);
+        $subject = $this->hook->fireDB('get_subject_tid', $subject);
+        $subject = $subject->find_one_col('subject');
 
         if (!$subject) {
             message(__('Bad request'), '404');

From d6389c386a65a3eaee949611ea044d342b27a8fb Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Fri, 21 Aug 2015 16:07:26 +0200
Subject: [PATCH 120/353] Add quick jump new cache

---
 controller/footer.php           |   9 ++-
 include/cache.php               | 125 --------------------------------
 model/cache.php                 |  43 +++++++++++
 style/FeatherBB/view/footer.php |  41 +++++------
 4 files changed, 70 insertions(+), 148 deletions(-)

diff --git a/controller/footer.php b/controller/footer.php
index b852a21a..a05ffdd2 100644
--- a/controller/footer.php
+++ b/controller/footer.php
@@ -39,6 +39,10 @@ public function display($footer_style = null, $id = null, $p = null, $pid = null
 
         $num_pages = isset($num_pages) ? $num_pages : null;
 
+        if (!$this->feather->cache->isCached('quickjump')) {
+            $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
+        }
+
         $this->feather->render('footer.php', array(
                             'id' => $id,
                             'p' => $p,
@@ -47,12 +51,13 @@ public function display($footer_style = null, $id = null, $p = null, $pid = null
                             'feather_config' => $this->config,
                             'feather_start' => $this->start,
                             'footer_style' => $footer_style,
+                            'quickjump' => $this->feather->cache->retrieve('quickjump'),
                             'forum_id' => $forum_id,
                             'num_pages' => $num_pages,
                             'feather' => $this->feather,
                             )
                     );
-        
+
         // Close Idiorm connection
         $pdo = \DB::get_db();
         $pdo = null;
@@ -65,4 +70,4 @@ public function display($footer_style = null, $id = null, $p = null, $pid = null
         // If we reached this far, we shouldn't execute more code
         $this->feather->stop();
     }
-}
\ No newline at end of file
+}
diff --git a/include/cache.php b/include/cache.php
index 258ffd6d..db7add9a 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -7,86 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-
-//
-// Generate quick jump cache PHP scripts
-//
-function generate_quickjump_cache($group_id = false)
-{
-
-
-    $groups = array();
-
-    // If a group_id was supplied, we generate the quick jump cache for that group only
-    if ($group_id !== false) {
-        // Is this group even allowed to read forums?
-        $read_board = \DB::for_table('groups')->where('g_id', $group_id)
-                            ->find_one_col('g_read_board');
-
-        $groups[$group_id] = $read_board;
-    } else {
-        // A group_id was not supplied, so we generate the quick jump cache for all groups
-        $select_quickjump_all_groups = array('g_id', 'g_read_board');
-        $result = \DB::for_table('groups')->select_many($select_quickjump_all_groups)
-                        ->find_many();
-
-        foreach ($result as $row) {
-            $groups[$row['g_id']] = $row['g_read_board'];
-        }
-    }
-
-    // Loop through the groups in $groups and output the cache for each of them
-    foreach ($groups as $group_id => $read_board) {
-        // Output quick jump as PHP code
-        $output = '<?php'."\n\n".'if (!defined(\'FEATHER\')) exit;'."\n".'define(\'FEATHER_QJ_LOADED\', 1);'."\n".'$forum_id = isset($forum_id) ? $forum_id : 0;'."\n\n".'?>';
-
-        if ($read_board == '1') {
-            $select_generate_quickjump_cache = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.redirect_url');
-            $where_generate_quickjump_cache = array(
-                array('fp.read_forum' => 'IS NULL'),
-                array('fp.read_forum' => '1')
-            );
-            $order_by_generate_quickjump_cache = array('c.disp_position', 'c.id', 'f.disp_position');
-
-            $result = \DB::for_table('categories')
-                            ->table_alias('c')
-                            ->select_many($select_generate_quickjump_cache)
-                            ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
-                            ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
-                            ->left_outer_join('forum_perms', array('fp.group_id', '=', $group_id), null, true)
-                            ->where_any_is($where_generate_quickjump_cache)
-                            ->where_null('f.redirect_url')
-                            ->order_by_many($order_by_generate_quickjump_cache)
-                            ->find_many();
-
-            if ($result) {
-                $output .= "\t\t\t\t".'<form id="qjump" method="get" action="">'."\n\t\t\t\t\t".'<div><label><span><?php _e(\'Jump to\') ?>'.'<br /></span>'."\n\t\t\t\t\t".'<select name="id" onchange="window.location=(\''.get_link('forum/').'\'+this.options[this.selectedIndex].value)">'."\n";
-
-                $cur_category = 0;
-                foreach ($result as $cur_forum) {
-                    if ($cur_forum['cid'] != $cur_category) {
-                        // A new category since last iteration?
-
-                        if ($cur_category) {
-                            $output .= "\t\t\t\t\t\t".'</optgroup>'."\n";
-                        }
-
-                        $output .= "\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cur_forum['cat_name']).'">'."\n";
-                        $cur_category = $cur_forum['cid'];
-                    }
-
-                    $redirect_tag = ($cur_forum['redirect_url'] != '') ? ' &gt;&gt;&gt;' : '';
-                    $output .= "\t\t\t\t\t\t\t".'<option value="'.$cur_forum['fid'].'/'.url_friendly($cur_forum['forum_name']).'/'.'"<?php echo ($forum_id == '.$cur_forum['fid'].') ? \' selected="selected"\' : \'\' ?>>'.feather_escape($cur_forum['forum_name']).$redirect_tag.'</option>'."\n";
-                }
-
-                $output .= "\t\t\t\t\t\t".'</optgroup>'."\n\t\t\t\t\t".'</select></label>'."\n\t\t\t\t\t".'<noscript><input type="submit" value="<?php _e(\'Go\') ?>" accesskey="g" /></noscript>'."\n\t\t\t\t\t".'</div>'."\n\t\t\t\t".'</form>'."\n";
-            }
-        }
-
-        featherbb_write_cache_file('cache_quickjump_'.$group_id.'.php', $output);
-    }
-}
-
 //
 // Generate a cache ID based on the last modification time for all stopwords files
 //
@@ -137,51 +57,6 @@ function generate_stopwords_cache()
 }
 
 
-//
-// Load some information about the latest registered users
-//
-function generate_users_info_cache()
-{
-    $stats = array();
-
-    $stats['total_users'] = (\DB::for_table('users')->where_not_equal('group_id', FEATHER_UNVERIFIED)
-                                ->count('id')) - 1;
-
-    $select_generate_users_info_cache = array('id', 'username');
-    $last_user = \DB::for_table('users')->select_many($select_generate_users_info_cache)
-                        ->where_not_equal('group_id', FEATHER_UNVERIFIED)
-                        ->order_by_desc('registered')
-                        ->limit(1)
-                        ->find_array();
-    $stats['last_user'] = $last_user[0];
-
-    // Output users info as PHP code
-    $content = '<?php'."\n\n".'define(\'FEATHER_USERS_INFO_LOADED\', 1);'."\n\n".'$stats = '.var_export($stats, true).';'."\n\n".'?>';
-    featherbb_write_cache_file('cache_users_info.php', $content);
-}
-
-
-//
-// Generate the admins cache PHP script
-//
-function generate_admins_cache()
-{
-    // Get admins from the DB
-    $result = \DB::for_table('users')->select('id')
-                    ->where('group_id', FEATHER_ADMIN)
-                    ->find_array();
-
-    $output = array();
-    foreach ($result as $row) {
-        $output[] = $row['id'];
-    }
-
-    // Output admin list as PHP code
-    $content = '<?php'."\n\n".'define(\'FEATHER_ADMINS_LOADED\', 1);'."\n\n".'$feather_admins = '.var_export($output, true).';'."\n\n".'?>';
-    featherbb_write_cache_file('cache_admins.php', $content);
-}
-
-
 //
 // Safely write out a cache file.
 //
diff --git a/model/cache.php b/model/cache.php
index d5867536..33d7906d 100644
--- a/model/cache.php
+++ b/model/cache.php
@@ -71,4 +71,47 @@ public static function get_admin_ids()
                 ->find_array();
     }
 
+    public static function get_quickjump()
+    {
+        $select_quickjump = array('g_id', 'g_read_board');
+        $read_perms = DB::for_table('groups')
+                        ->select_many($select_quickjump)
+                        ->where('g_read_board', 1)
+                        ->find_array();
+
+        $output = array();
+        foreach ($read_perms as $item) {
+            $select_quickjump = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.redirect_url');
+            $where_quickjump = array(
+                array('fp.read_forum' => 'IS NULL'),
+                array('fp.read_forum' => '1')
+            );
+            $order_by_quickjump = array('c.disp_position', 'c.id', 'f.disp_position');
+
+            $result = DB::for_table('categories')
+                        ->table_alias('c')
+                        ->select_many($select_quickjump)
+                        ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
+                        ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
+                        ->left_outer_join('forum_perms', array('fp.group_id', '=', $item['g_id']), null, true)
+                        ->where_any_is($where_quickjump)
+                        ->where_null('f.redirect_url')
+                        ->order_by_many($order_by_quickjump)
+                        ->find_many();
+
+            $forum_data = array();
+            foreach ($result as $forum) {
+                if (!isset($forum_data[$forum['cid']])) {
+                    $forum_data[$forum['cid']] = array('cat_name' => $forum['cat_name'],
+                                                       'cat_position' => $forum['cat_position'],
+                                                       'cat_forums' => array());
+                }
+                $forum_data[$forum['cid']]['cat_forums'][] = array('forum_id' => $forum['fid'],
+                                                                   'forum_name' => $forum['forum_name'],
+                                                                   'position' => $forum['forum_position']);
+            }
+            $output[(int) $item['g_id']] = $forum_data;
+        }
+        return $output;
+    }
 }
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
index 10922aab..470d5c6b 100644
--- a/style/FeatherBB/view/footer.php
+++ b/style/FeatherBB/view/footer.php
@@ -60,30 +60,29 @@
 
 ?>
 		<div id="brdfooternav" class="inbox">
-<?php
-
-echo "\t\t\t".'<div class="conl">'."\n";
 
+<?php
 // Display the "Jump to" drop list
-if ($feather_config['o_quickjump'] == '1') {
-    // Load cached quick jump
-    if (file_exists(FORUM_CACHE_DIR.'cache_quickjump_'.$feather->user->g_id.'.php')) {
-        include FORUM_CACHE_DIR.'cache_quickjump_'.$feather->user->g_id.'.php';
-    }
-
-    if (!defined('FEATHER_QJ_LOADED')) {
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-
-        generate_quickjump_cache($feather->user->g_id);
-        require FORUM_CACHE_DIR.'cache_quickjump_'.$feather->user->g_id.'.php';
-    }
-}
-
-echo "\t\t\t".'</div>'."\n";
+if ($feather_config['o_quickjump'] == '1' && !empty($quickjump)) { ?>
+			<div class="conl">
+			<form id="qjump" method="get" action="">
+				<div><label><span><?php _e('Jump to') ?><br /></span></label>
+					<select name="id" onchange="window.location=('<?php echo get_link('forum/') ?>'+this.options[this.selectedIndex].value)">
+<?php
+		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
+			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
+			foreach ($cat_data['cat_forums'] as $forum) {
+				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
+			}
+			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
+		} ?>
+					</select>
+					<noscript><input type="submit" value="<?php _e('Go') ?>" accesskey="g" /></noscript>
+				</div>
+			</form>
+			</div>
+<?php } ?>
 
-?>
 			<div class="conr">
 <?php
 

From 590cefe06f2cd75d1aebf1c9f613dc0c083e8636 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Fri, 21 Aug 2015 19:12:56 +0200
Subject: [PATCH 121/353] Finish to rewrite cache

---
 controller/admin/categories.php |  5 +--
 controller/admin/forums.php     | 29 +++--------------
 model/admin/groups.php          | 10 ++----
 view/footer.php                 | 58 ++++++++++++++++-----------------
 4 files changed, 37 insertions(+), 65 deletions(-)

diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index 12f90727..4ad2f729 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -69,10 +69,7 @@ public function edit_categories()
         }
 
         // Regenerate the quick jump cache
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-        generate_quickjump_cache();
+        $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
         redirect(get_link('admin/categories/'), __('Categories updated redirect'));
     }
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index f2fde95e..4b068d18 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -48,12 +48,7 @@ public function add_forum()
 
         if ($fid = $this->model->add_forum($cat_id, __('New forum'))) {
             // Regenerate the quick jump cache
-            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                require FEATHER_ROOT.'include/cache.php';
-            }
-
-            generate_quickjump_cache();
-
+            $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
             redirect(get_link('admin/forums/edit/'.$fid.'/'), __('Forum added redirect'));
         } else {
             redirect(get_link('admin/forums/'), __('Unable to add forum'));
@@ -114,10 +109,7 @@ public function edit_forum($forum_id)
                 }
 
                 // Regenerate the quick jump cache
-                if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                    require FEATHER_ROOT.'include/cache.php';
-                }
-                generate_quickjump_cache();
+                $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
                 redirect(get_link('admin/forums/edit/'.$forum_id.'/'), __('Forum updated redirect'));
 
@@ -125,10 +117,7 @@ public function edit_forum($forum_id)
                 $this->model->delete_permissions($forum_id);
 
                 // Regenerate the quick jump cache
-                if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                    require FEATHER_ROOT.'include/cache.php';
-                }
-                generate_quickjump_cache();
+                $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
                 redirect(get_link('admin/forums/edit/'.$forum_id.'/'), __('Perms reverted redirect'));
             }
@@ -167,11 +156,7 @@ public function delete_forum($forum_id)
         if($this->request->isPost()) {
             $this->model->delete_forum($forum_id);
             // Regenerate the quick jump cache
-            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                require FEATHER_ROOT.'include/cache.php';
-            }
-
-            generate_quickjump_cache();
+            $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
             redirect(get_link('admin/forums/'), __('Forum deleted redirect'));
 
@@ -202,11 +187,7 @@ public function edit_positions()
         }
 
         // Regenerate the quick jump cache
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-
-        generate_quickjump_cache();
+        $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
         redirect(get_link('admin/forums/'), __('Forums updated redirect'));
     }
diff --git a/model/admin/groups.php b/model/admin/groups.php
index bf3cd7df..40b663a3 100644
--- a/model/admin/groups.php
+++ b/model/admin/groups.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
     }
- 
+
     public function fetch_groups()
     {
         $result = DB::for_table('groups')->order_by('g_id')->find_many();
@@ -225,13 +225,7 @@ public function add_edit_group($groups)
         }
 
         // Regenerate the quick jump cache
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-
-        $group_id = $this->request->post('mode') == 'add' ? $new_group_id : $this->request->post('group_id');
-
-        generate_quickjump_cache($group_id);
+        $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
         if ($this->request->post('mode') == 'edit') {
             redirect(get_link('admin/groups/'), __('Group edited redirect'));
diff --git a/view/footer.php b/view/footer.php
index f4b79085..470d5c6b 100644
--- a/view/footer.php
+++ b/view/footer.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 ?>
 </div>
 
@@ -31,8 +31,8 @@
         } else {
             $parameter = '';
         }
-        
-        
+
+
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         // TODO: all
@@ -60,30 +60,29 @@
 
 ?>
 		<div id="brdfooternav" class="inbox">
-<?php
-
-echo "\t\t\t".'<div class="conl">'."\n";
 
+<?php
 // Display the "Jump to" drop list
-if ($feather_config['o_quickjump'] == '1') {
-    // Load cached quick jump
-    if (file_exists(FORUM_CACHE_DIR.'cache_quickjump_'.$feather->user->g_id.'.php')) {
-        include FORUM_CACHE_DIR.'cache_quickjump_'.$feather->user->g_id.'.php';
-    }
-
-    if (!defined('FEATHER_QJ_LOADED')) {
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-
-        generate_quickjump_cache($feather->user->g_id);
-        require FORUM_CACHE_DIR.'cache_quickjump_'.$feather->user->g_id.'.php';
-    }
-}
-
-echo "\t\t\t".'</div>'."\n";
+if ($feather_config['o_quickjump'] == '1' && !empty($quickjump)) { ?>
+			<div class="conl">
+			<form id="qjump" method="get" action="">
+				<div><label><span><?php _e('Jump to') ?><br /></span></label>
+					<select name="id" onchange="window.location=('<?php echo get_link('forum/') ?>'+this.options[this.selectedIndex].value)">
+<?php
+		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
+			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
+			foreach ($cat_data['cat_forums'] as $forum) {
+				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
+			}
+			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
+		} ?>
+					</select>
+					<noscript><input type="submit" value="<?php _e('Go') ?>" accesskey="g" /></noscript>
+				</div>
+			</form>
+			</div>
+<?php } ?>
 
-?>
 			<div class="conr">
 <?php
 
@@ -117,7 +116,7 @@
 <?php
 
 // Display debug info (if enabled/defined)
-if (defined('FEATHER_DEBUG')) {
+if ($feather->forum_env['FEATHER_SHOW_INFO']) {
     echo '<p id="debugtime">[ ';
 
     // Calculate script generation time
@@ -135,13 +134,14 @@
     echo ' ]</p>'."\n";
 }
 // Display executed queries (if enabled)
-if (defined('FEATHER_SHOW_QUERIES')) {
+if ($feather->forum_env['FEATHER_SHOW_QUERIES']) {
     display_saved_queries();
 }
 ?>
-</div>
-<div class="end-box"></div>
-</div>
+
+</section>
+
+<script src="<?php echo get_base_url() ?>/style/FeatherBB/phone.min.js"></script>
 
 </body>
 </html>

From 902b60cf916d6e44522a59d9a5f7675daaf10105 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Fri, 21 Aug 2015 22:32:36 +0200
Subject: [PATCH 122/353] Major rewrite of cache class

---
 include/classes/cache.class.php | 443 +++++++++++++++++---------------
 1 file changed, 241 insertions(+), 202 deletions(-)

diff --git a/include/classes/cache.class.php b/include/classes/cache.class.php
index 321e98a7..98647dc7 100755
--- a/include/classes/cache.class.php
+++ b/include/classes/cache.class.php
@@ -1,35 +1,40 @@
 <?php
 
 /**
- * Copyright (C) 2015 FeatherBB
- * based on code by Christian Metz - MetzWeb Networks
- * API Documentation: https://github.com/cosenary/Simple-PHP-Cache
- * License: BSD http://www.opensource.org/licenses/bsd-license.php
- *
- * FeatherBB Cache class
- * Usage : $cache = new \FeatherBB\Cache(array('name' => , 'path' =>, 'extension' =>));
- */
+* Copyright (C) 2015 FeatherBB
+* based on code by Christian Metz - MetzWeb Networks
+* API Documentation: https://github.com/cosenary/Simple-PHP-Cache
+* License: BSD http://www.opensource.org/licenses/bsd-license.php
+*
+* FeatherBB Cache class
+* Usage : $cache = new \FeatherBB\Cache(array('name' => , 'path' =>, 'extension' =>));
+*/
 
 namespace FeatherBB;
 
 class Cache
 {
     /**
-     * @var array
-     */
+    * @var array
+    */
     protected $settings;
 
     /**
-     * @var array
-     */
+    * @var array
+    */
     protected $cache;
 
     /**
-     * Default constructor
-     *
-     * @param string|array [optional] $config
-     * @return void
-     */
+    * @var array
+    */
+    protected $filenames;
+
+    /**
+    * Default constructor
+    *
+    * @param string|array [optional] $config
+    * @return void
+    */
     public function __construct($config = array())
     {
         if (!is_array($config)) {
@@ -38,32 +43,32 @@ public function __construct($config = array())
         $this->settings = array_merge(self::getDefaultSettings(), $config);
         $this->setCache($this->settings['name']);
         $this->setCachePath($this->settings['path']);
-        $this->setExtension($this->settings['extension']);
+        $this->setCacheExtension($this->settings['extension']);
     }
 
     /**
-     * Return default settings
-     *
-     * @return array
-     */
+    * Return default settings
+    *
+    * @return array
+    */
     protected static function getDefaultSettings()
     {
         return array('name' => 'default',
-                     'path' => 'cache/',
-                     'extension' => '.cache');
+        'path' => 'cache/',
+        'extension' => '.cache');
     }
 
     /**
-     * Check whether data is associated with a key
-     *
-     * @param string $key
-     * @return boolean
-     */
+    * Check whether data is associated with a key
+    *
+    * @param string $key
+    * @return boolean
+    */
     public function isCached($key)
     {
         if ($cachedData = $this->_loadCache()) {
             if (isset($cachedData[$key])) {
-                if (!$this->_checkExpired($cachedData[$key]['time'], $cachedData[$key]['expire'])) {
+                if (!$this->_isExpired($cachedData[$key]['time'], $cachedData[$key]['expire'])) {
                     return true;
                 }
             }
@@ -72,283 +77,317 @@ public function isCached($key)
     }
 
     /**
-     * Store data in the cache
-     *
-     * @param string $key
-     * @param mixed $data
-     * @param integer [optional] $expiration seconds to expire the cache
-     * @return object
-     */
-    public function store($key, $data, $expiration = 0)
+    * Store data in the cache
+    *
+    * @param string $key
+    * @param mixed $data
+    * @param integer [optional] $expires
+    * @return self
+    */
+    public function store($key, $data, $expires = 0)
     {
-        $storeData = array(
+        $new_data = array(
             'time' => time(),
-            'expire' => $expiration,
+            'expire' => (int) $expires,
             'data' => serialize($data)
         );
-        $dataArray = $this->_loadCache();
-        if (true === is_array($dataArray)) {
-            $dataArray[$key] = $storeData;
+
+        $cache = $this->_loadCache();
+        if (is_array($cache)) {
+            $cache[(string) $key] = $new_data;
         } else {
-            $dataArray = array($key => $storeData);
+            $cache = array((string) $key => $new_data);
         }
-        $this->_saveCache($dataArray);
+        $this->_saveCache($cache);
         return $this;
     }
 
     /**
-     * Retrieve cached data by its key
-     *
-     * @param string $key
-     * @param boolean [optional] $timestamp
-     * @return string
-     */
-    public function retrieve($key, $timestamp = false)
+    * Retrieve cached data by key
+    *
+    * @param string $key
+    * @param boolean [optional] $timestamp
+    * @return string
+    */
+    public function retrieve($key)
     {
-        $cachedData = $this->_loadCache();
-        (false === $timestamp) ? $type = 'data' : $type = 'time';
-        if (!isset($cachedData[$key][$type])) return null;
-        if (false === $timestamp) {
-            $entry = $cachedData[$key];
-            if ($entry && true === $this->_checkExpired($entry['time'], $entry['expire']))
-                return null;
+        $key = (string) $key;
+        if ($cache = $this->_loadCache()) {
+            if (isset($cache[$key])) {
+                if (!$this->_isExpired($cache[$key]['time'], $cache[$key]['expire'])) {
+                    return unserialize($cache[$key]['data']);
+                }
+            }
         }
-        return unserialize($cachedData[$key][$type]);
+        return null;
     }
 
     /**
-     * Retrieve all cached data
-     *
-     * @param boolean [optional] $meta
-     * @return array
-     */
-    public function retrieveAll($meta = false)
+    * Retrieve all cached data
+    *
+    * @param boolean [optional] $meta
+    * @return array | null
+    */
+    public function retrieveAll($raw = false)
     {
-        if ($meta === false) {
-            $results = array();
-            $cachedData = $this->_loadCache();
-            if ($cachedData) {
-                foreach ($cachedData as $k => $v) {
-                    $results[$k] = unserialize($v['data']);
+        if ($cache = $this->_loadCache()) {
+            if (!$raw) {
+                $results = array();
+                foreach ($cache as $key => $value) {
+                    $results[$key] = unserialize($value['data']);
                 }
+                return $results;
+            } else {
+                return $cache;
             }
-            return $results;
-        } else {
-            return $this->_loadCache();
         }
+        return null;
     }
 
     /**
-     * Erase cached entry by its key
-     *
-     * @param string $key
-     * @return object
-     */
-    public function erase($key)
+    * Delete cached entry by its key
+    *
+    * @param string $key
+    * @return object
+    */
+    public function delete($key)
     {
-        $cacheData = $this->_loadCache();
-        if (true === is_array($cacheData)) {
-            if (true === isset($cacheData[$key])) {
-                unset($cacheData[$key]);
-                $cacheData = json_encode($cacheData);
-                $this->_saveCache($cacheData);
-            } else {
-                throw new Exception("Error: erase() - Key '{$key}' not found.");
+        $key = (string) $key;
+        if ($cache = $this->_loadCache()) {
+            if (isset($cache[$key])) {
+                unset($cache[$key]);
+                $this->_saveCache($cache);
+                return $this;
             }
         }
-        return $this;
+        throw new \Exception("Error: delete() - Key '{$key}' not found.");
     }
 
     /**
-     * Erase all expired entries
-     *
-     * @return integer
-     */
-    public function eraseExpired()
+    * Erase all expired entries
+    *
+    * @return object
+    */
+    public function deleteExpired()
     {
-        $cacheData = $this->_loadCache();
-        if (true === is_array($cacheData)) {
-            $counter = 0;
-            foreach ($cacheData as $key => $entry) {
-                if (true === $this->_checkExpired($entry['time'], $entry['expire'])) {
-                    unset($cacheData[$key]);
-                    $counter++;
-                }
+        $cache = $this->_loadCache();
+        if (is_array($cache)) {
+            $i = 0;
+            $cache = array_map(function ($value) {
+                        if (!$this->_isExpired($value['time'], $value['expire'])) {
+                            ++$i;
+                            return $value;
+                        }
+                        });
+            if ($i > 0) {
+                $this->_saveCache($cache);
             }
-            if ($counter > 0) {
-                $cacheData = json_encode($cacheData);
-                $this->_saveCache($cacheData);
-            }
-            return $counter;
         }
+        return $this;
     }
 
     /**
-     * Erase all cached entries
-     * @return object
-     */
-    public function eraseAll()
+    * Flush all cached entries
+    * @return object
+    */
+    public function flush()
     {
-        $cacheDir = $this->getCacheDir();
-        if (true === file_exists($cacheDir)) {
-            $cacheFile = fopen($cacheDir, 'w');
-            fclose($cacheFile);
-        }
+        $this->cache = null; // Purge cache
+        $this->_saveCache(array());
         return $this;
     }
 
     /**
-     * Load appointed cache
-     * @return mixed
-     */
-    private function _loadCache()
+    * Increment key
+    * @return object
+    */
+    public function increment($key)
     {
-        if ($this->cache != null)
-            return $this->cache;
-
-        if (true === file_exists($this->getCacheDir())) {
-            $file = file_get_contents($this->getCacheDir());
-            $this->cache = json_decode($file, true);
-            return $this->cache;
-        } else {
-            return false;
+        $key = (string) $key;
+        if ($cache = $this->_loadCache()) {
+            if (isset($cache[$key])) {
+                $tmp = unserialize($cache[$key]['data']);
+                if (is_numeric($tmp)) {
+                    ++$tmp;
+                    $cache[$key]['data'] = serialize($tmp);
+                    $this->_saveCache($cache);
+                    return $this;
+                }
+            }
         }
+        throw new \Exception("Error: increment() - Key '{$key}' not found.");
     }
 
     /**
-     * Save cache file
-     * @param $dataArray
-     */
-    private function _saveCache($dataArray)
+    * Decrement key
+    * @return object
+    */
+    public function decrement($key)
     {
-        $this->cache = $dataArray;
-        $cacheData = json_encode($dataArray);
-        file_put_contents($this->getCacheDir(), $cacheData);
+        $key = (string) $key;
+        if ($cache = $this->_loadCache()) {
+            if (isset($cache[$key])) {
+                $tmp = unserialize($cache[$key]['data']);
+                if (is_numeric($tmp)) {
+                    --$tmp;
+                    $cache[$key]['data'] = serialize($tmp);
+                    $this->_saveCache($cache);
+                    return $this;
+                }
+            }
+        }
+        throw new \Exception("Error: decrement() - Key '{$key}' not found.");
     }
 
     /**
-     * Get the cache directory path
-     *
-     * @return string
-     */
-    public function getCacheDir()
+    * Load cache
+    * @return cache if existing or not null / null otherwise
+    */
+    protected function _loadCache()
     {
-        if (true === $this->_checkCacheDir()) {
-            $filename = $this->getCache();
-            $filename = preg_replace('/[^0-9a-z\.\_\-]/i', '', strtolower($filename));
-            return $this->getCachePath() . $this->_getHash($filename) . $this->getExtension();
+        if (!is_null($this->cache))
+        return $this->cache;
+
+        if (file_exists($this->getCacheFile())) {
+            $this->cache = json_decode(file_get_contents($this->getCacheFile()), true);
+            return $this->cache;
         }
+        return null;
     }
 
     /**
-     * Get the filename hash
-     *
-     * @return string
-     */
-    private function _getHash($filename)
+    * Save cache file
+    * @param $dataArray
+    */
+    protected function _saveCache(array $data)
     {
-        return sha1($filename);
+        $this->cache = $data; // Save new data in object to avoid useless I/O access
+        return file_put_contents($this->getCacheFile(), json_encode($data));
     }
 
     /**
-     * Check whether a timestamp is still in the duration
-     *
-     * @param integer $timestamp
-     * @param integer $expiration
-     * @return boolean
-     */
-    private function _checkExpired($timestamp, $expiration)
+    * Check whether a timestamp is still in the duration
+    *
+    * @param integer $timestamp
+    * @param integer $expiration
+    * @return boolean
+    */
+    protected function _isExpired($timestamp, $expiration)
     {
         if ($expiration !== 0) {
-            $timeDiff = time() - $timestamp;
-            return ($timeDiff > $expiration);
+            return (time() - $timestamp > $expiration);
         }
         return false;
     }
 
     /**
-     * Check if a writable cache directory exists and if not create a new one
-     *
-     * @return boolean
-     */
-    private function _checkCacheDir()
+    * Check if a writable cache directory exists and if not create a new one
+    *
+    * @return boolean
+    */
+    protected function _checkCacheDir()
     {
         if (!is_dir($this->getCachePath()) && !mkdir($this->getCachePath(), 0775, true)) {
-            throw new Exception('Unable to create cache directory ' . $this->getCachePath());
+            throw new \Exception('Unable to create cache directory ' . $this->getCachePath());
         } elseif (!is_readable($this->getCachePath()) || !is_writable($this->getCachePath())) {
             if (!chmod($this->getCachePath(), 0775)) {
-                throw new Exception($this->getCachePath() . ' must be readable and writeable');
+                throw new \Exception($this->getCachePath() . ' must be readable and writeable');
             }
         }
         return true;
     }
 
     /**
-     * Cache path Setter
-     *
-     * @param string $path
-     * @return object
-     */
+    * Getters and setters
+    */
+
+    /**
+    * Get the cache directory path
+    *
+    * @return string
+    */
+    public function getCacheFile()
+    {
+        if (!isset($this->filenames[$this->settings['name']])) {
+            if ($this->_checkCacheDir()) {
+                $filename = preg_replace('/[^0-9a-z\.\_\-]/i', '', strtolower($this->settings['name']));
+                $this->filenames[$this->settings['name']] = $this->settings['path'] . sha1($filename) . $this->settings['extension'];
+            }
+        }
+        return $this->filenames[$this->settings['name']];
+    }
+
+    /**
+    * Cache path Setter
+    *
+    * @param string $path
+    * @return object
+    */
     public function setCachePath($path)
     {
         $this->settings['path'] = $path;
-        return $this;
     }
 
     /**
-     * Cache path Getter
-     *
-     * @return string
-     */
+    * Cache path Getter
+    *
+    * @return string
+    */
     public function getCachePath()
     {
         return $this->settings['path'];
     }
 
     /**
-     * Cache name Setter
-     *
-     * @param string $name
-     * @return object
-     */
+    * Cache name Setter
+    *
+    * @param string $name
+    * @return object
+    */
     public function setCache($name)
     {
+        $this->cache = null; // Purge cache as we change cache
         $this->settings['name'] = $name;
-        return $this;
     }
 
     /**
-     * Cache name Getter
-     *
-     * @return void
-     */
+    * Cache name Getter
+    *
+    * @return void
+    */
     public function getCache()
     {
         return $this->settings['path'];
     }
 
     /**
-     * Cache file extension Setter
-     *
-     * @param string $ext
-     * @return object
-     */
-    public function setExtension($ext)
+    * Cache file extension Setter
+    *
+    * @param string $ext
+    * @return object
+    */
+    public function setCacheExtension($ext)
     {
         $this->settings['extension']= $ext;
-        return $this;
     }
 
     /**
-     * Cache file extension Getter
-     *
-     * @return string
-     */
-    public function getExtension()
+    * Cache file extension Getter
+    *
+    * @return string
+    */
+    public function getCacheExtension()
     {
         return $this->settings['extension'];
     }
 
-
-
+    /**
+    * Settings Getter
+    *
+    * @return array
+    */
+    public function getSettings()
+    {
+        return $this->settings;
+    }
 }

From d540abf3c6695d60b0c82dc5bdb387903918a96e Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 21 Aug 2015 22:45:33 +0200
Subject: [PATCH 123/353] Add more hooks

---
 model/delete.php   |   2 +-
 model/edit.php     |   6 +-
 model/login.php    |   6 +-
 model/moderate.php |  10 +-
 model/post.php     | 380 +++++++++++++++++++++++++++------------------
 5 files changed, 239 insertions(+), 165 deletions(-)

diff --git a/model/delete.php b/model/delete.php
index 18e413ea..a1983700 100644
--- a/model/delete.php
+++ b/model/delete.php
@@ -56,7 +56,7 @@ public function get_info_delete($id)
 
     public function handle_deletion($is_topic_post, $id, $tid, $fid)
     {
-        $this->hook->fire('handle_deletion_start');
+        $this->hook->fire('handle_deletion_start', $is_topic_post, $id, $tid, $fid);
 
         require FEATHER_ROOT.'include/search_idx.php';
 
diff --git a/model/edit.php b/model/edit.php
index faf9834f..b1b54f47 100644
--- a/model/edit.php
+++ b/model/edit.php
@@ -26,7 +26,7 @@ public function __construct()
     // Fetch some info about the post, the topic and the forum
     public function get_info_edit($id)
     {
-        $this->hook->fire('get_info_edit_start');
+        $id = $this->hook->fire('get_info_edit_start', $id);
 
         $cur_post['select'] = array('fid' => 'f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_topics', 'tid' => 't.id', 't.subject', 't.posted', 't.first_post_id', 't.sticky', 't.closed', 'p.poster', 'p.poster_id', 'p.message', 'p.hide_smilies');
         $cur_post['where'] = array(
@@ -59,7 +59,7 @@ public function check_errors_before_edit($can_edit_subject, $errors)
     {
         global $pd;
 
-        $this->hook->fire('check_errors_before_edit_start');
+        $errors = $this->hook->fire('check_errors_before_edit_start', $errors);
 
         // If it's a topic it must contain a subject
         if ($can_edit_subject) {
@@ -204,7 +204,7 @@ public function edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod)
 
     public function get_checkboxes($can_edit_subject, $is_admmod, $cur_post, $cur_index)
     {
-        $this->hook->fire('get_checkboxes_start');
+        $this->hook->fire('get_checkboxes_start', $can_edit_subject, $is_admmod, $cur_post, $cur_index);
 
         $checkboxes = array();
 
diff --git a/model/login.php b/model/login.php
index 30912a9a..28631803 100644
--- a/model/login.php
+++ b/model/login.php
@@ -87,11 +87,7 @@ public function login()
 
     public function logout($id, $token)
     {
-        $hook['id'] = $id;
-        $hook['token'] = $token;
-        $hook = $this->hook->fire('logout_start', $hook);
-        $id = $hook['id'];
-        $token = $hook['token'];
+        $token = $this->hook->fire('logout_start', $token, $id);
 
         if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != feather_hash($this->user->id.feather_hash(get_remote_address()))) {
             header('Location: '.get_base_url());
diff --git a/model/moderate.php b/model/moderate.php
index ea487a85..ebb24753 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -50,7 +50,7 @@ public function display_ip_address_post($pid)
     public function get_moderators($fid)
     {
         $moderators = DB::for_table('forums')
-            ->where('id', $fid);
+                        ->where('id', $fid);
         $moderators = $this->hook->fireDB('get_moderators', $moderators);
         $moderators = $moderators->find_one_col('moderators');
 
@@ -89,7 +89,7 @@ public function get_topic_info($fid, $tid)
     public function delete_posts($tid, $fid, $p = null)
     {
         $posts = $this->request->post('posts') ? $this->request->post('posts') : array();
-        $posts = $this->hook->fire('delete_posts_start', $posts);
+        $posts = $this->hook->fire('delete_posts_start', $posts, $tid, $fid);
 
         if (empty($posts)) {
             message(__('No posts selected'));
@@ -166,7 +166,7 @@ public function delete_posts($tid, $fid, $p = null)
     public function split_posts($tid, $fid, $p = null)
     {
         $posts = $this->request->post('posts') ? $this->request->post('posts') : array();
-        $posts = $this->hook->fire('split_posts_start', $posts);
+        $posts = $this->hook->fire('split_posts_start', $posts, $tid, $fid);
         if (empty($posts)) {
             message(__('No posts selected'));
         }
@@ -420,7 +420,7 @@ public function display_posts_view($tid, $start_from)
     {
         global $pd;
 
-        $this->hook->fire('display_posts_view_start');
+        $this->hook->fire('display_posts_view_start', $tid, $start_from);
 
         $post_data = array();
 
@@ -876,7 +876,7 @@ public function forum_sort_by($forum_sort)
 
     public function display_topics($fid, $sort_by, $start_from)
     {
-        $this->hook->fire('display_topics_start');
+        $this->hook->fire('display_topics_start', $fid, $sort_by, $start_from);
 
         $topic_data = array();
 
diff --git a/model/post.php b/model/post.php
index eab496f4..49fed8d0 100644
--- a/model/post.php
+++ b/model/post.php
@@ -20,53 +20,54 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
  
     //  Get some info about the post
     public function get_info_post($tid, $fid)
     {
+        $this->hook->fire('get_info_post_start', $tid, $fid);
 
+        $cur_posting['where'] = array(
+            array('fp.read_forum' => 'IS NULL'),
+            array('fp.read_forum' => '1')
+        );
 
         if ($tid) {
-            $select_get_info_post = array('f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_replies', 'fp.post_topics', 't.subject', 't.closed', 'is_subscribed' => 's.user_id');
-            $where_get_info_post_any = array(
-                array('fp.read_forum' => 'IS NULL'),
-                array('fp.read_forum' => '1')
-            );
+            $cur_posting['select'] = array('f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_replies', 'fp.post_topics', 't.subject', 't.closed', 'is_subscribed' => 's.user_id');
 
             $cur_posting = DB::for_table('topics')
-                ->table_alias('t')
-                ->select_many($select_get_info_post)
-                ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
-                ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
-                ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-                ->left_outer_join('topic_subscriptions', array('t.id', '=', 's.topic_id'), 's')
-                ->left_outer_join('topic_subscriptions', array('s.user_id', '=', $this->user->id), null, true)
-                ->where_any_is($where_get_info_post_any)
-                ->where('t.id', $tid)
-                ->find_one();
+                            ->table_alias('t')
+                            ->select_many($cur_posting['select'])
+                            ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
+                            ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
+                            ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
+                            ->left_outer_join('topic_subscriptions', array('t.id', '=', 's.topic_id'), 's')
+                            ->left_outer_join('topic_subscriptions', array('s.user_id', '=', $this->user->id), null, true)
+                            ->where_any_is($cur_posting['where'])
+                            ->where('t.id', $tid);
 
         } else {
-            $select_get_info_post = array('f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_replies', 'fp.post_topics');
-            $where_get_info_post_any = array(
-                array('fp.read_forum' => 'IS NULL'),
-                array('fp.read_forum' => '1')
-            );
+            $cur_posting['select'] = array('f.id', 'f.forum_name', 'f.moderators', 'f.redirect_url', 'fp.post_replies', 'fp.post_topics');
 
             $cur_posting = DB::for_table('forums')
-                ->table_alias('f')
-                ->select_many($select_get_info_post)
-                ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
-                ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-                ->where_any_is($where_get_info_post_any)
-                ->where('f.id', $fid)
-                ->find_one();
+                            ->table_alias('f')
+                            ->select_many($cur_posting['select'])
+                            ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
+                            ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
+                            ->where_any_is($cur_posting['where'])
+                            ->where('f.id', $fid);
         }
 
+        $cur_posting = $this->hook->fireDB('get_info_post_query', $cur_posting);
+        $cur_posting = $cur_posting->find_one();
+
         if (!$cur_posting) {
             message(__('Bad request'), '404');
         }
 
+        $cur_posting = $this->hook->fire('get_info_post', $cur_posting);
+
         return $cur_posting;
     }
 
@@ -75,12 +76,16 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
     {
         global $lang_antispam, $lang_antispam_questions, $pd;
 
+        $fid = $this->hook->fire('check_errors_before_post_start', $fid);
+
         // Antispam feature
         if ($this->user->is_guest) {
 
             // It's a guest, so we have to validate the username
             $errors = check_username(feather_trim($this->request->post('req_username')), $errors);
 
+            $errors = $this->hook->fire('check_errors_before_post_antispam', $errors);
+
             $question = $this->request->post('captcha_q') ? trim($this->request->post('captcha_q')) : '';
             $answer = $this->request->post('captcha') ? strtoupper(trim($this->request->post('captcha'))) : '';
             $lang_antispam_questions_array = array();
@@ -99,25 +104,14 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
             $errors[] = sprintf(__('Flood start'), $this->user->g_post_flood, $this->user->g_post_flood - (time() - $this->user->last_post));
         }
 
-        if ($tid) {
-            $subject_tid = DB::for_table('topics')
-                ->where('id', $tid)
-                ->find_one_col('subject');
-
-            if (!$subject_tid) {
-                message(__('Bad request'), '404');
-            }
-            $url_subject = url_friendly($subject_tid);
-        } else {
-            $url_subject = '';
-        }
-
         // If it's a new topic
         if ($fid) {
             $subject = feather_trim($this->request->post('req_subject'));
+            $subject = $this->hook->fire('check_errors_before_new_topic_subject', $subject);
 
             if ($this->config['o_censoring'] == '1') {
                 $censored_subject = feather_trim(censor_words($subject));
+                $censored_subject = $this->hook->fire('check_errors_before_censored', $censored_subject);
             }
 
             if ($subject == '') {
@@ -129,6 +123,8 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
             } elseif ($this->config['p_subject_all_caps'] == '0' && is_all_uppercase($subject) && !$this->user->is_admmod) {
                 $errors[] = __('All caps subject');
             }
+
+            $errors = $this->hook->fire('check_errors_before_new_topic_errors', $errors);
         }
 
         if ($this->user->is_guest) {
@@ -136,6 +132,9 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
 
             if ($this->config['p_force_guest_email'] == '1' || $email != '') {
                 require FEATHER_ROOT.'include/email.php';
+
+                $errors = $this->hook->fire('check_errors_before_post_email', $errors, $email);
+
                 if (!is_valid_email($email)) {
                     $errors[] = __('Invalid email');
                 }
@@ -154,6 +153,7 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
 
         // Clean up message from POST
         $message = feather_linebreaks(feather_trim($this->request->post('req_message')));
+        $message = $this->hook->fire('check_errors_before_post_message', $message);
 
         // Here we use strlen() not feather_strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         if (strlen($message) > FEATHER_MAX_POSTSIZE) {
@@ -166,9 +166,11 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
         if ($this->config['p_message_bbcode'] == '1') {
             require FEATHER_ROOT.'include/parser.php';
             $message = preparse_bbcode($message, $errors);
+            $message = $this->hook->fire('check_errors_before_post_bbcode', $message);
         }
 
         if (empty($errors)) {
+            $errors = $this->hook->fire('check_errors_before_post_no_error', $errors);
             if ($message == '') {
                 $errors[] = __('No message');
             } elseif ($this->config['o_censoring'] == '1') {
@@ -181,6 +183,8 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
             }
         }
 
+        $errors = $this->hook->fire('check_errors_before_post', $errors);
+
         return $errors;
     }
 
@@ -189,6 +193,8 @@ public function setup_variables($errors, $is_admmod)
     {
         $post = array();
 
+        $post = $this->hook->fire('setup_variables_start', $post, $errors, $is_admmod);
+
         if (!$this->user->is_guest) {
             $post['username'] = $this->user->username;
             $post['email'] = $this->user->email;
@@ -220,6 +226,8 @@ public function setup_variables($errors, $is_admmod)
 
         $post['time'] = time();
 
+        $post = $this->hook->fire('setup_variables', $post);
+
         return $post;
     }
 
@@ -228,11 +236,13 @@ public function insert_reply($post, $tid, $cur_posting, $is_subscribed)
     {
         $new = array();
 
+        $new = $this->hook->fireDB('insert_reply_start', $new, $post, $tid, $cur_posting, $is_subscribed);
+
         if (!$this->user->is_guest) {
             $new['tid'] = $tid;
 
             // Insert the new post
-            $insert_post = array(
+            $query['insert'] = array(
                 'poster' => $post['username'],
                 'poster_id' => $this->user->id,
                 'poster_ip' => get_remote_address(),
@@ -242,10 +252,11 @@ public function insert_reply($post, $tid, $cur_posting, $is_subscribed)
                 'topic_id'  => $tid,
             );
 
-            DB::for_table('posts')
-                ->create()
-                ->set($insert_post)
-                ->save();
+            $query = DB::for_table('posts')
+                        ->create()
+                        ->set($query['insert']);
+            $query = $this->hook->fireDB('insert_reply_guest_query', $query);
+            $query = $query->save();
 
             $new['pid'] = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'posts');
 
@@ -255,29 +266,31 @@ public function insert_reply($post, $tid, $cur_posting, $is_subscribed)
                 // Let's do it
                 if (isset($post['subscribe']) && $post['subscribe'] && !$is_subscribed) {
 
-                    $insert_subscription = array(
+                    $subscription['insert'] = array(
                         'user_id'   =>  $this->user->id,
                         'topic_id'  =>  $tid
                     );
 
-                    DB::for_table('topic_subscriptions')
-                        ->create()
-                        ->set($insert_subscription)
-                        ->save();
+                    $subscription = DB::for_table('topic_subscriptions')
+                                        ->create()
+                                        ->set($subscription['insert']);
+                    $subscription = $this->hook->fireDB('insert_reply_subscription', $subscription);
+                    $subscription = $subscription->save();
 
                 // We reply and we don't want to be subscribed anymore
                 } elseif ($post['subscribe'] == '0' && $is_subscribed) {
 
-                    DB::for_table('topic_subscriptions')
-                        ->where('user_id', $this->user->id)
-                        ->where('topic_id', $tid)
-                        ->delete_many();
+                    $unsubscription = DB::for_table('topic_subscriptions')
+                                        ->where('user_id', $this->user->id)
+                                        ->where('topic_id', $tid);
+                    $unsubscription = $this->hook->fireDB('insert_reply_unsubscription', $unsubscription);
+                    $unsubscription = $unsubscription->delete_many();
 
                 }
             }
         } else {
             // It's a guest. Insert the new post
-            $insert_post = array(
+            $query['insert'] = array(
                 'poster' => $post['username'],
                 'poster_ip' => get_remote_address(),
                 'message' => $post['message'],
@@ -287,68 +300,76 @@ public function insert_reply($post, $tid, $cur_posting, $is_subscribed)
             );
 
             if ($this->config['p_force_guest_email'] == '1' || $post['email'] != '') {
-                $insert_post['poster_email'] = $post['email'];
+                $query['insert']['poster_email'] = $post['email'];
             }
 
-            DB::for_table('posts')
-                ->create()
-                ->set($insert_post)
-                ->save();
-
+            $query = DB::for_table('posts')
+                        ->create()
+                        ->set($query['insert']);
+            $query = $this->hook->fireDB('insert_reply_member_query', $query);
+            $query = $query->save();
 
             $new['pid'] = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'posts');
         }
 
         // Update topic
-        $update_topic = array(
+        $topic['update'] = array(
             'last_post' => $post['time'],
             'last_post_id'  => $new['pid'],
             'last_poster'  => $post['username'],
         );
 
-        DB::for_table('topics')->where('id', $tid)
-            ->find_one()
-            ->set($update_topic)
-            ->set_expr('num_replies', 'num_replies+1')
-            ->save();
+        $topic = DB::for_table('topics')
+                    ->where('id', $tid)
+                    ->find_one()
+                    ->set($topic['update'])
+                    ->set_expr('num_replies', 'num_replies+1');
+        $topic = $this->hook->fireDB('insert_reply_update_query', $topic);
+        $topic = $topic->save();
 
         update_search_index('post', $new['pid'], $post['message']);
 
         update_forum($cur_posting['id']);
 
+        $new = $this->hook->fireDB('insert_reply', $new);
+
         return $new;
     }
 
     // Send notifications for replies
     public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
     {
+        $this->hook->fire('send_notifications_reply_start', $tid, $cur_posting, $new_pid, $post);
+
         // Get the post time for the previous post in this topic
         $previous_post_time = DB::for_table('posts')
-            ->where('topic_id', $tid)
-            ->order_by_desc('id')
-            ->find_one_col('posted');
+                                ->where('topic_id', $tid)
+                                ->order_by_desc('id');
+        $previous_post_time = $this->hook->fireDB('send_notifications_reply_previous', $previous_post_time);
+        $previous_post_time = $previous_post_time->find_one_col('posted');
 
         // Get any subscribed users that should be notified (banned users are excluded)
-        $where_send_notifications_reply = array(
+        $result['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
-        $select_send_notifications_reply = array('u.id', 'u.email', 'u.notify_with_post', 'u.language');
+        $result['select'] = array('u.id', 'u.email', 'u.notify_with_post', 'u.language');
 
         $result = DB::for_table('users')
-            ->table_alias('u')
-            ->select_many($select_send_notifications_reply)
-            ->inner_join('topic_subscriptions', array('u.id', '=', 's.user_id'), 's')
-            ->left_outer_join('forum_perms', array('fp.forum_id', '=', $cur_posting['id']), 'fp', true)
-            ->left_outer_join('forum_perms', array('fp.group_id', '=', 'u.group_id'))
-            ->left_outer_join('online', array('u.id', '=', 'o.user_id'), 'o')
-            ->left_outer_join('bans', array('u.username', '=', 'b.username'), 'b')
-            ->where_raw('COALESCE(o.logged, u.last_visit)>'.$previous_post_time)
-            ->where_null('b.username')
-            ->where_any_is($where_send_notifications_reply)
-            ->where('s.topic_id', $tid)
-            ->where_not_equal('u.id', $this->user->id)
-            ->find_many();
+                    ->table_alias('u')
+                    ->select_many($result['select'])
+                    ->inner_join('topic_subscriptions', array('u.id', '=', 's.user_id'), 's')
+                    ->left_outer_join('forum_perms', array('fp.forum_id', '=', $cur_posting['id']), 'fp', true)
+                    ->left_outer_join('forum_perms', array('fp.group_id', '=', 'u.group_id'))
+                    ->left_outer_join('online', array('u.id', '=', 'o.user_id'), 'o')
+                    ->left_outer_join('bans', array('u.username', '=', 'b.username'), 'b')
+                    ->where_raw('COALESCE(o.logged, u.last_visit)>'.$previous_post_time)
+                    ->where_null('b.username')
+                    ->where_any_is($result['where'])
+                    ->where('s.topic_id', $tid)
+                    ->where_not_equal('u.id', $this->user->id);
+        $result = $this->hook->fireDB('send_notifications_reply_query', $result);
+        $result = $result->find_many();
 
         if ($result) {
             require_once FEATHER_ROOT.'include/email.php';
@@ -370,13 +391,16 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
                     if (file_exists(FEATHER_ROOT.'lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl')) {
                         // Load the "new reply" template
                         $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl'));
+                        $mail_tpl = $this->hook->fire('send_notifications_reply_mail_tpl', $mail_tpl);
 
                         // Load the "new reply full" template (with post included)
                         $mail_tpl_full = trim(file_get_contents(FEATHER_ROOT.'lang/'.$cur_subscriber['language'].'/mail_templates/new_reply_full.tpl'));
+                        $mail_tpl_full = $this->hook->fire('send_notifications_reply_mail_tpl_full', $mail_tpl_full);
 
                         // The first row contains the subject (it also starts with "Subject:")
                         $first_crlf = strpos($mail_tpl, "\n");
                         $mail_subject = trim(substr($mail_tpl, 8, $first_crlf-8));
+                        $mail_subject = $this->hook->fire('send_notifications_reply_mail_subject', $mail_subject);
                         $mail_message = trim(substr($mail_tpl, $first_crlf));
 
                         $first_crlf = strpos($mail_tpl_full, "\n");
@@ -387,16 +411,18 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
                         $mail_message = str_replace('<topic_subject>', $cur_posting['subject'], $mail_message);
                         $mail_message = str_replace('<replier>', $post['username'], $mail_message);
                         $mail_message = str_replace('<post_url>', get_link('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
-                        $mail_message = str_replace('<unsubscribe_url>', get_base_url().'/misc.php?action=unsubscribe&tid='.$tid, $mail_message);
+                        $mail_message = str_replace('<unsubscribe_url>', get_link('unsubscribe/topic/'.$tid.'/'), $mail_message);
                         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
+                        $mail_message = $this->hook->fire('send_notifications_reply_mail_message', $mail_message);
 
                         $mail_subject_full = str_replace('<topic_subject>', $cur_posting['subject'], $mail_subject_full);
                         $mail_message_full = str_replace('<topic_subject>', $cur_posting['subject'], $mail_message_full);
                         $mail_message_full = str_replace('<replier>', $post['username'], $mail_message_full);
                         $mail_message_full = str_replace('<message>', $cleaned_message, $mail_message_full);
                         $mail_message_full = str_replace('<post_url>', get_link('post/'.$new_pid.'/#p'.$new_pid), $mail_message_full);
-                        $mail_message_full = str_replace('<unsubscribe_url>', get_base_url().'/misc.php?action=unsubscribe&tid='.$tid, $mail_message_full);
+                        $mail_message_full = str_replace('<unsubscribe_url>', get_link('unsubscribe/topic/'.$tid.'/'), $mail_message_full);
                         $mail_message_full = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message_full);
+                        $mail_message_full = $this->hook->fire('send_notifications_reply_mail_message_full', $mail_message_full);
 
                         $notification_emails[$cur_subscriber['language']][0] = $mail_subject;
                         $notification_emails[$cur_subscriber['language']][1] = $mail_message;
@@ -417,6 +443,8 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
                 }
             }
 
+            $this->hook->fire('send_notifications_reply');
+
             unset($cleaned_message);
         }
     }
@@ -426,8 +454,10 @@ public function insert_topic($post, $fid)
     {
         $new = array();
 
+        $new = $this->hook->fireDB('insert_topic_start', $new, $post, $fid);
+
         // Create the topic
-        $insert_topic = array(
+        $topic['insert'] = array(
             'poster' => $post['username'],
             'subject' => $post['subject'],
             'posted'  => $post['time'],
@@ -437,10 +467,11 @@ public function insert_topic($post, $fid)
             'forum_id'  => $fid,
         );
 
-        DB::for_table('topics')
-            ->create()
-            ->set($insert_topic)
-            ->save();
+        $topic = DB::for_table('topics')
+                    ->create()
+                    ->set($topic['insert']);
+        $topic = $this->hook->fireDB('insert_topic_create', $topic);
+        $topic = $topic->save();
 
         $new['tid'] = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'topics');
 
@@ -448,20 +479,21 @@ public function insert_topic($post, $fid)
             // To subscribe or not to subscribe, that ...
             if ($this->config['o_topic_subscriptions'] == '1' && $post['subscribe']) {
 
-                $insert_subscription = array(
+                $subscription['insert'] = array(
                     'user_id'   =>  $this->user->id,
                     'topic_id'  =>  $new['tid']
                 );
 
-                DB::for_table('topic_subscriptions')
-                    ->create()
-                    ->set($insert_subscription)
-                    ->save();
+                $subscription = DB::for_table('topic_subscriptions')
+                                    ->create()
+                                    ->set($subscription['insert']);
+                $subscription = $this->hook->fireDB('insert_topic_subscription_member', $subscription);
+                $subscription = $subscription->save();
 
             }
 
             // Create the post ("topic post")
-            $insert_post = array(
+            $query['insert'] = array(
                 'poster' => $post['username'],
                 'poster_id' => $this->user->id,
                 'poster_ip' => get_remote_address(),
@@ -471,14 +503,15 @@ public function insert_topic($post, $fid)
                 'topic_id'  => $new['tid'],
             );
 
-            DB::for_table('posts')
-                ->create()
-                ->set($insert_post)
-                ->save();
+            $query = DB::for_table('posts')
+                        ->create()
+                        ->set($query['insert']);
+            $query = $this->hook->fireDB('insert_topic_post_member', $query);
+            $query = $query->save();
         } else {
             // It's a guest
             // Create the post ("topic post")
-            $insert_post = array(
+            $query['insert'] = array(
                 'poster' => $post['username'],
                 'poster_ip' => get_remote_address(),
                 'message' => $post['message'],
@@ -488,62 +521,73 @@ public function insert_topic($post, $fid)
             );
 
             if ($this->config['p_force_guest_email'] == '1' || $post['email'] != '') {
-                $insert_post['poster_email'] = $post['email'];
+                $query['poster_email'] = $post['email'];
             }
 
-            DB::for_table('posts')
+            $query = DB::for_table('posts')
                 ->create()
-                ->set($insert_post)
-                ->save();
+                ->set($query['insert']);
+            $query = $this->hook->fireDB('insert_topic_post_member', $query);
+            $query = $query->save();
         }
         $new['pid'] = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'topics');
 
         // Update the topic with last_post_id
-        $update_topic = array(
+        $topic['update'] = array(
             'last_post_id'  =>  $new['pid'],
             'first_post_id' =>  $new['pid'],
         );
 
-        DB::for_table('topics')->where('id', $new['tid'])
-            ->find_one()
-            ->set($update_topic)
-            ->save();
+        $topic = DB::for_table('topics')
+                    ->where('id', $new['tid'])
+                    ->find_one()
+                    ->set($topic['update']);
+        $topic = $this->hook->fireDB('insert_topic_post_topic', $topic);
+        $topic = $topic->save();
 
         update_search_index('post', $new['pid'], $post['message'], $post['subject']);
 
         update_forum($fid);
 
+        $new = $this->hook->fireDB('insert_topic', $new);
+
         return $new;
     }
 
     // Send notifications for new topics
     public function send_notifications_new_topic($post, $cur_posting, $new_tid)
     {
+        $this->hook->fire('send_notifications_new_topic_start', $post, $cur_posting, $new_tid);
+
         // Get any subscribed users that should be notified (banned users are excluded)
-        $where_send_notifications_reply = array(
+        $result['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
-        $select_send_notifications_reply = array('u.id', 'u.email', 'u.notify_with_post', 'u.language');
+        $result['select'] = array('u.id', 'u.email', 'u.notify_with_post', 'u.language');
 
         $result = DB::for_table('users')
-            ->table_alias('u')
-            ->select_many($select_send_notifications_reply)
-            ->inner_join('forum_subscriptions', array('u.id', '=', 's.user_id'), 's')
-            ->left_outer_join('forum_perms', array('fp.forum_id', '=', $cur_posting['id']), 'fp', true)
-            ->left_outer_join('forum_perms', array('fp.group_id', '=', 'u.group_id'))
-            ->left_outer_join('bans', array('u.username', '=', 'b.username'), 'b')
-            ->where_null('b.username')
-            ->where_any_is($where_send_notifications_reply)
-            ->where('s.forum_id', $cur_posting['id'])
-            ->where_not_equal('u.id', $this->user->id)
-            ->find_many();
+                    ->table_alias('u')
+                    ->select_many($result['select'])
+                    ->inner_join('forum_subscriptions', array('u.id', '=', 's.user_id'), 's')
+                    ->left_outer_join('forum_perms', array('fp.forum_id', '=', $cur_posting['id']), 'fp', true)
+                    ->left_outer_join('forum_perms', array('fp.group_id', '=', 'u.group_id'))
+                    ->left_outer_join('bans', array('u.username', '=', 'b.username'), 'b')
+                    ->where_null('b.username')
+                    ->where_any_is($result['where'])
+                    ->where('s.forum_id', $cur_posting['id'])
+                    ->where_not_equal('u.id', $this->user->id);
+        $result = $this->hook->fireDB('send_notifications_new_topic_query');
+        $result = $result->find_many();
 
         if ($result) {
             require_once FEATHER_ROOT.'include/email.php';
 
             $notification_emails = array();
 
+            $censored_message = feather_trim(censor_words($post['message']));
+            $censored_subject = feather_trim(censor_words($post['subject']));
+
             if ($this->config['o_censoring'] == '1') {
                 $cleaned_message = bbcode2email($censored_message, -1);
             } else {
@@ -557,6 +601,7 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
                     if (file_exists(FEATHER_ROOT.'lang/'.$cur_subscriber['language'].'/mail_templates/new_topic.tpl')) {
                         // Load the "new topic" template
                         $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$cur_subscriber['language'].'/mail_templates/new_topic.tpl'));
+                        $mail_tpl = $this->hook->fire('send_notifications_new_topic_mail_tpl', $mail_tpl);
 
                         // Load the "new topic full" template (with post included)
                         $mail_tpl_full = trim(file_get_contents(FEATHER_ROOT.'lang/'.$cur_subscriber['language'].'/mail_templates/new_topic_full.tpl'));
@@ -575,8 +620,9 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
                         $mail_message = str_replace('<forum_name>', $cur_posting['forum_name'], $mail_message);
                         $mail_message = str_replace('<poster>', $post['username'], $mail_message);
                         $mail_message = str_replace('<topic_url>', get_link('topic/'.$new_tid.'/'), $mail_message);
-                        $mail_message = str_replace('<unsubscribe_url>', get_base_url().'/misc.php?action=unsubscribe&fid='.$cur_posting['id'], $mail_message);
+                        $mail_message = str_replace('<unsubscribe_url>', get_link('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message);
                         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
+                        $mail_message = $this->hook->fire('send_notifications_new_topic_mail_message', $mail_message);
 
                         $mail_subject_full = str_replace('<forum_name>', $cur_posting['forum_name'], $mail_subject_full);
                         $mail_message_full = str_replace('<topic_subject>', $this->config['o_censoring'] == '1' ? $censored_subject : $post['subject'], $mail_message_full);
@@ -584,8 +630,9 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
                         $mail_message_full = str_replace('<poster>', $post['username'], $mail_message_full);
                         $mail_message_full = str_replace('<message>', $cleaned_message, $mail_message_full);
                         $mail_message_full = str_replace('<topic_url>', get_link('topic/'.$new_tid.'/'), $mail_message_full);
-                        $mail_message_full = str_replace('<unsubscribe_url>', get_base_url().'/misc.php?action=unsubscribe&fid='.$cur_posting['id'], $mail_message_full);
+                        $mail_message_full = str_replace('<unsubscribe_url>', get_link('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message_full);
                         $mail_message_full = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message_full);
+                        $mail_message_full = $this->hook->fire('send_notifications_new_topic_mail_message_full', $mail_message_full);
 
                         $notification_emails[$cur_subscriber['language']][0] = $mail_subject;
                         $notification_emails[$cur_subscriber['language']][1] = $mail_message;
@@ -604,6 +651,8 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
                 }
             }
 
+            $this->hook->fire('send_notifications_new_topic');
+
             unset($cleaned_message);
         }
     }
@@ -611,8 +660,11 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
     // Warn the admin if a banned user posts
     public function warn_banned_user($post, $new_pid)
     {
+        $this->hook->fire('warn_banned_user_start', $post, $new_pid);
+
         // Load the "banned email post" template
         $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/banned_email_post.tpl'));
+        $mail_tpl = $this->hook->fire('warn_banned_user_mail_tpl', $mail_tpl);
 
         // The first row contains the subject
         $first_crlf = strpos($mail_tpl, "\n");
@@ -623,6 +675,7 @@ public function warn_banned_user($post, $new_pid)
         $mail_message = str_replace('<email>', $post['email'], $mail_message);
         $mail_message = str_replace('<post_url>', get_link('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
+        $mail_message = $this->hook->fire('warn_banned_user_mail_message', $mail_message);
 
         feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
     }
@@ -630,22 +683,26 @@ public function warn_banned_user($post, $new_pid)
     // Increment post count, change group if needed
     public function increment_post_count($post, $new_tid)
     {
+        $this->hook->fire('increment_post_count_start', $post, $new_tid);
+
         if (!$this->user->is_guest) {
-            DB::for_table('users')
-                ->where('id', $this->user->id)
-                ->find_one()
-                ->set('last_post', $post['time'])
-                ->set_expr('num_posts', 'num_posts+1')
-                ->save();
+            $increment = DB::for_table('users')
+                            ->where('id', $this->user->id)
+                            ->find_one()
+                            ->set('last_post', $post['time'])
+                            ->set_expr('num_posts', 'num_posts+1');
+            $increment = $this->hook->fireDB('increment_post_count_query', $increment);
+            $increment = $increment->save();
 
             // Promote this user to a new group if enabled
             if ($this->user->g_promote_next_group != 0 && $this->user->num_posts + 1 >= $this->user->g_promote_min_posts) {
                 $new_group_id = $this->user->g_promote_next_group;
-                DB::for_table('users')
-                    ->where('id', $this->user->id)
-                    ->find_one()
-                    ->set('group_id', $new_group_id)
-                    ->save();
+                $promote = DB::for_table('users')
+                            ->where('id', $this->user->id)
+                            ->find_one()
+                            ->set('group_id', $new_group_id);
+                $promote = $this->hook->fireDB('increment_post_count_query', $promote);
+                $promote = $promote->save();
             }
 
             // Topic tracking stuff...
@@ -654,12 +711,15 @@ public function increment_post_count($post, $new_tid)
             set_tracked_topics($tracked_topics);
         } else {
             // Update the last_post field for guests
-            DB::for_table('online')
-                ->where('ident', get_remote_address())
-                ->find_one()
-                ->set('last_post', $post['time'])
-                ->save();
+            $last_post = DB::for_table('online')
+                            ->where('ident', get_remote_address())
+                            ->find_one()
+                            ->set('last_post', $post['time']);
+            $last_post = $this->hook->fireDB('increment_post_count_last_post', $last_post);
+            $last_post = $last_post->save();
         }
+
+        $this->hook->fire('increment_post_count');
     }
 
     //
@@ -669,6 +729,8 @@ public function split_text($text, $start, $end, $retab = true)
     {
         $result = array(0 => array(), 1 => array()); // 0 = inside, 1 = outside
 
+        $result = $this->hook->fire('split_text_start', $result, $text, $start, $end, $retab);
+
         // split the text into parts
         $parts = preg_split('%'.preg_quote($start, '%').'(.*)'.preg_quote($end, '%').'%Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
         $num_parts = count($parts);
@@ -683,20 +745,25 @@ public function split_text($text, $start, $end, $retab = true)
             $result[1] = str_replace("\t", $spaces, $result[1]);
         }
 
+        $result = $this->hook->fire('split_text_start', $result);
+
         return $result;
     }
 
     // If we are quoting a message
     public function get_quote_message($qid, $tid)
     {
+        $quote = array();
 
+        $quote = $this->hook->fire('get_quote_message', $quote, $qid, $tid);
 
-        $select_get_quote_message = array('poster', 'message');
+        $quote['select'] = array('poster', 'message');
 
-        $quote = DB::for_table('posts')->select_many($select_get_quote_message)
-                 ->where('id', $qid)
-                 ->where('topic_id', $tid)
-                 ->find_one();
+        $quote = DB::for_table('posts')->select_many($quote['select'])
+                     ->where('id', $qid)
+                     ->where('topic_id', $tid);
+        $quote = $this->hook->fireDB('get_quote_message_query', $quote);
+        $quote = $quote->find_one();
 
         if (!$quote) {
             message(__('Bad request'), '404');
@@ -755,12 +822,16 @@ public function get_quote_message($qid, $tid)
             $quote = '> '.$quote['poster'].' '.__('wrote')."\n\n".'> '.$quote['message']."\n";
         }
 
+        $quote = $this->hook->fire('get_quote_message', $quote);
+
         return $quote;
     }
 
     // Get the current state of checkboxes
     public function get_checkboxes($fid, $is_admmod, $is_subscribed)
     {
+        $this->hook->fire('get_checkboxes_start', $fid, $is_admmod, $is_subscribed);
+
         $cur_index = 1;
 
         $checkboxes = array();
@@ -795,6 +866,8 @@ public function get_checkboxes($fid, $is_admmod, $is_subscribed)
             $checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'"'.($this->request->post('hide_smilies') ? ' checked="checked"' : '').' />'.__('Hide smilies').'<br /></label>';
         }
 
+        $checkboxes = $this->hook->fire('get_checkboxes', $checkboxes);
+
         return $checkboxes;
     }
 
@@ -805,20 +878,25 @@ public function topic_review($tid)
 
         $post_data = array();
 
+        $post_data = $this->hook->fire('topic_review_start', $post_data, $tid);
+
         require_once FEATHER_ROOT.'include/parser.php';
 
         $select_topic_review = array('poster', 'message', 'hide_smilies', 'posted');
 
         $result = DB::for_table('posts')->select_many($select_topic_review)
-            ->where('topic_id', $tid)
-            ->order_by_desc('id')
-            ->find_many();
+                    ->where('topic_id', $tid)
+                    ->order_by_desc('id');
+        $result = $this->hook->fire('topic_review_query', $result);
+        $result = $result->find_many();
 
         foreach($result as $cur_post) {
             $cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
             $post_data[] = $cur_post;
         }
 
+        $post_data = $this->hook->fire('topic_review', $post_data);
+
         return $post_data;
     }
 }

From 961a61b16910dea17da815ea4ec2085c4cf29141 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 22 Aug 2015 18:46:14 +0200
Subject: [PATCH 124/353] Start to add hooks

---
 model/profile.php | 406 ++++++++++++++++++++++++++++------------------
 1 file changed, 248 insertions(+), 158 deletions(-)

diff --git a/model/profile.php b/model/profile.php
index 6720eee3..c28a9c20 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -20,33 +20,40 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
  
     public function change_pass($id)
     {
+        $id = $this->hook->fire('change_pass_start', $id);
+
         if ($this->request->get('key')) {
+
+            $key = $this->request->get('key');
+            $key = $this->hook->fire('change_pass_key', $key);
+
             // If the user is already logged in we shouldn't be here :)
             if (!$this->user->is_guest) {
                 header('Location: '.get_base_url());
                 exit;
             }
 
-            $key = $this->request->get('key');
-
             $cur_user = DB::for_table('users')
-                ->where('id', $id)
-                ->find_one();
+                            ->where('id', $id);
+            $cur_user = $this->hook->fireDB('change_pass_user_query', $cur_user);
+            $cur_user = $cur_user->find_one();
 
             if ($key == '' || $key != $cur_user['activate_key']) {
                 message(__('Pass key bad').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
             } else {
-                DB::for_table('users')
-                    ->where('id', $id)
-                    ->find_one()
-                    ->set('password', $cur_user['activate_string'])
-                    ->set_expr('activate_string', 'NULL')
-                    ->set_expr('activate_key', 'NULL')
-                    ->save();
+                $query = DB::for_table('users')
+                            ->where('id', $id)
+                            ->find_one()
+                            ->set('password', $cur_user['activate_string'])
+                            ->set_expr('activate_string', 'NULL')
+                            ->set_expr('activate_key', 'NULL');
+                $query = $this->hook->fireDB('change_pass_activate_query', $query);
+                $query = $query->save();
 
                 message(__('Pass updated'), true);
             }
@@ -54,19 +61,22 @@ public function change_pass($id)
 
         // Make sure we are allowed to change this user's password
         if ($this->user->id != $id) {
+            $id = $this->hook->fire('change_pass_key_not_id', $id);
+
             if (!$this->user->is_admmod) { // A regular user trying to change another user's password?
                 message(__('No permission'), '403');
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's password?
 
-                $select_change_password = array('u.group_id', 'g.g_moderator');
+                $user['select'] = array('u.group_id', 'g.g_moderator');
 
                 $user = DB::for_table('users')
-                    ->table_alias('u')
-                    ->select_many($select_change_password)
-                    ->inner_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
-                    ->where('u.id', $id)
-                    ->find_one();
+                            ->table_alias('u')
+                            ->select_many($user['select'])
+                            ->inner_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
+                            ->where('u.id', $id);
+                $user = $this->hook->fireDB('change_pass_user_query', $user);
+                $user = $user->find_one();
 
                 if (!$user) {
                     message(__('Bad request'), '404');
@@ -91,8 +101,9 @@ public function change_pass($id)
             }
 
             $cur_user = DB::for_table('users')
-                ->where('id', $id)
-                ->find_one();
+                            ->where('id', $id);
+            $cur_user = $this->hook->fireDB('change_pass_find_user', $cur_user);
+            $cur_user = $cur_user->find_one();
 
             $authorized = false;
 
@@ -110,36 +121,44 @@ public function change_pass($id)
 
             $new_password_hash = feather_hash($new_password1);
 
-            DB::for_table('users')->where('id', $id)
-                ->find_one()
-                ->set('password', $new_password_hash)
-                ->save();
+            $update_password = DB::for_table('users')
+                                ->where('id', $id)
+                                ->find_one()
+                                ->set('password', $new_password_hash);
+            $update_password = $this->hook->fireDB('change_pass_query', $update_password);
+            $update_password = $update_password->save();
 
             if ($this->user->id == $id) {
                 feather_setcookie($this->user->id, $new_password_hash, time() + $this->config['o_timeout_visit']);
             }
 
+            $this->hook->fire('change_pass');
+
             redirect(get_link('user/'.$id.'/section/essentials/'), __('Pass updated redirect'));
         }
     }
 
     public function change_email($id)
     {
+        $id = $this->hook->fire('change_email_start', $id);
+
         // Make sure we are allowed to change this user's email
         if ($this->user->id != $id) {
+            $id = $this->hook->fire('change_email_not_id', $id);
+
             if (!$this->user->is_admmod) { // A regular user trying to change another user's email?
                 message(__('No permission'), '403');
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's email?
-
-                $select_change_mail = array('u.group_id', 'g.g_moderator');
+                $user['select'] = array('u.group_id', 'g.g_moderator');
 
                 $user = DB::for_table('users')
-                    ->table_alias('u')
-                    ->select_many($select_change_mail)
-                    ->inner_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
-                    ->where('u.id', $id)
-                    ->find_one();
+                            ->table_alias('u')
+                            ->select_many($user['select'])
+                            ->inner_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
+                            ->where('u.id', $id);
+                $user = $this->hook->fireDB('change_email_not_id_query', $user);
+                $user = $user->find_one();
 
                 if (!$user) {
                     message(__('Bad request'), '404');
@@ -153,25 +172,30 @@ public function change_email($id)
 
         if ($this->request->get('key')) {
             $key = $this->request->get('key');
+            $key = $this->hook->fire('change_email_key', $key);
 
             $new_email_key = DB::for_table('users')
-                ->where('id', $id)
-                ->find_one_col('activate_key');
+                                ->where('id', $id);
+            $new_email_key = $this->hook->fireDB('change_email_key_query', $new_email_key);
+            $new_email_key = $new_email_key->find_one_col('activate_key');
 
             if ($key == '' || $key != $new_email_key) {
                 message(__('Email key bad').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
             } else {
-                DB::for_table('users')
-                    ->where('id', $id)
-                    ->find_one()
-                    ->set_expr('email', 'activate_string')
-                    ->set_expr('activate_string', 'NULL')
-                    ->set_expr('activate_key', 'NULL')
-                    ->save();
+                $update_mail = DB::for_table('users')
+                                ->where('id', $id)
+                                ->find_one()
+                                ->set_expr('email', 'activate_string')
+                                ->set_expr('activate_string', 'NULL')
+                                ->set_expr('activate_key', 'NULL');
+                $update_mail = $this->hook->fireDB('change_email_query', $update_mail);
+                $update_mail = $update_mail->save();
 
                 message(__('Email updated'), true);
             }
         } elseif ($this->request->isPost()) {
+            $this->hook->fire('change_email_post');
+
             if (feather_hash($this->request->post('req_password')) !== $this->user->password) {
                 message(__('Wrong pass'));
             }
@@ -180,6 +204,7 @@ public function change_email($id)
 
             // Validate the email address
             $new_email = strtolower(feather_trim($this->request->post('req_new_email')));
+            $new_email = $this->hook->fire('change_email_new_email', $new_email);
             if (!is_valid_email($new_email)) {
                 message(__('Invalid email'));
             }
@@ -191,28 +216,32 @@ public function change_email($id)
                 } elseif ($this->config['o_mailing_list'] != '') {
                     // Load the "banned email change" template
                     $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/banned_email_change.tpl'));
+                    $mail_tpl = $this->hook->fire('change_email_mail_tpl', $mail_tpl);
 
                     // The first row contains the subject
                     $first_crlf = strpos($mail_tpl, "\n");
                     $mail_subject = trim(substr($mail_tpl, 8, $first_crlf-8));
-                    $mail_message = trim(substr($mail_tpl, $first_crlf));
+                    $mail_subject = $this->hook->fire('change_email_mail_subject', $mail_subject);
 
+                    $mail_message = trim(substr($mail_tpl, $first_crlf));
                     $mail_message = str_replace('<username>', $this->user->username, $mail_message);
                     $mail_message = str_replace('<email>', $new_email, $mail_message);
                     $mail_message = str_replace('<profile_url>', get_link('user/'.$id.'/'), $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
+                    $mail_message = $this->hook->fire('change_email_mail_message', $mail_message);
 
                     feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
                 }
             }
 
             // Check if someone else already has registered with that email address
-            $select_change_mail = array('id', 'username');
+            $result['select'] = array('id', 'username');
 
             $result = DB::for_table('users')
-                ->select_many($select_change_mail)
-                ->where('email', $new_email)
-                ->find_many();
+                        ->select_many($result['select'])
+                        ->where('email', $new_email);
+            $result = $this->hook->fireDB('change_email_check_mail', $result);
+            $result = $result->find_many();
 
             if ($result) {
                 if ($this->config['p_allow_dupe_email'] == '0') {
@@ -224,16 +253,19 @@ public function change_email($id)
 
                     // Load the "dupe email change" template
                     $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/dupe_email_change.tpl'));
+                    $mail_tpl = $this->hook->fire('change_email_mail_dupe_tpl', $mail_tpl);
 
                     // The first row contains the subject
                     $first_crlf = strpos($mail_tpl, "\n");
                     $mail_subject = trim(substr($mail_tpl, 8, $first_crlf-8));
-                    $mail_message = trim(substr($mail_tpl, $first_crlf));
+                    $mail_subject = $this->hook->fire('change_email_mail_dupe_subject', $mail_subject);
 
+                    $mail_message = trim(substr($mail_tpl, $first_crlf));
                     $mail_message = str_replace('<username>', $this->user->username, $mail_message);
                     $mail_message = str_replace('<dupe_list>', implode(', ', $dupe_list), $mail_message);
                     $mail_message = str_replace('<profile_url>', get_link('user/'.$id.'/'), $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
+                    $mail_message = $this->hook->fire('change_email_mail_dupe_message', $mail_message);
 
                     feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
                 }
@@ -241,39 +273,50 @@ public function change_email($id)
 
 
             $new_email_key = random_pass(8);
+            $new_email_key = $this->hook->fire('change_email_new_email_key', $new_email_key);
 
             // Update the user
-            $update_user = array(
+            unset($user);
+            $user['update'] = array(
                 'activate_string' => $new_email,
                 'activate_key'  => $new_email_key,
             );
-
-            DB::for_table('users')->where('id', tid)
-                ->find_one()
-                ->set($update_user)
-                ->save();
+            $user = DB::for_table('users')
+                    ->where('id', tid)
+                    ->find_one()
+                    ->set($user['update']);
+            $user = $this->hook->fireDB('change_email_user_query', $user);
+            $user = $user->save();
 
             // Load the "activate email" template
             $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/activate_email.tpl'));
+            $mail_tpl = $this->hook->fire('change_email_mail_activate_tpl', $mail_tpl);
 
             // The first row contains the subject
             $first_crlf = strpos($mail_tpl, "\n");
             $mail_subject = trim(substr($mail_tpl, 8, $first_crlf-8));
-            $mail_message = trim(substr($mail_tpl, $first_crlf));
+            $mail_subject = $this->hook->fire('change_email_mail_activate_subject', $mail_subject);
 
+            $mail_message = trim(substr($mail_tpl, $first_crlf));
             $mail_message = str_replace('<username>', $this->user->username, $mail_message);
             $mail_message = str_replace('<base_url>', get_base_url(), $mail_message);
             $mail_message = str_replace('<activation_url>', get_link('user/'.$id.'/action/change_email/?key='.$new_email_key), $mail_message);
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
+            $mail_message = $this->hook->fire('change_email_mail_activate_message', $mail_message);
 
             feather_mail($new_email, $mail_subject, $mail_message);
 
+            $this->hook->fire('change_email_sent');
+
             message(__('Activate email sent').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
         }
+        $this->hook->fire('change_email');
     }
 
     public function upload_avatar($id, $files_data)
     {
+        $files_data = $this->hook->fire('upload_avatar_start', $files_data, $id);
+
         if (!isset($files_data['req_file'])) {
             message(__('No file'));
         }
@@ -310,6 +353,8 @@ public function upload_avatar($id, $files_data)
         }
 
         if (is_uploaded_file($uploaded_file['tmp_name'])) {
+            $uploaded_file = $this->hook->fire('upload_avatar_is_uploaded_file', $uploaded_file);
+
             // Preliminary file check, adequate in most cases
             $allowed_types = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/png', 'image/x-png');
             if (!in_array($uploaded_file['type'], $allowed_types)) {
@@ -355,21 +400,28 @@ public function upload_avatar($id, $files_data)
             message(__('Unknown failure'));
         }
 
+        $uploaded_file = $this->hook->fire('upload_avatar', $uploaded_file);
+
         redirect(get_link('user/'.$id.'/section/personality/'), __('Avatar upload redirect'));
     }
 
     public function update_group_membership($id)
     {
+        $id = $this->hook->fire('update_group_membership_start', $id);
+
         $new_group_id = intval($this->request->post('group_id'));
 
         $old_group_id = DB::for_table('users')
-            ->where('id', $id)
-            ->find_one_col('group_id');
+                            ->where('id', $id);
+        $old_group_id = $this->hook->fireDB('update_group_membership_old_group', $old_group_id);
+        $old_group_id = $old_group_id->find_one_col('group_id');
 
-        DB::for_table('users')->where('id', $id)
-            ->find_one()
-            ->set('group_id', $new_group_id)
-            ->save();
+        $update_group = DB::for_table('users')
+                            ->where('id', $id)
+                            ->find_one()
+                            ->set('group_id', $new_group_id);
+        $update_group = $this->hook->fireDB('update_group_membership_update_group', $update_group);
+        $update_group = $update_group->save();
 
         // Regenerate the users info cache
         if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
@@ -383,17 +435,15 @@ public function update_group_membership($id)
         }
 
         $new_group_mod = DB::for_table('groups')
-            ->where('g_id', $new_group_id)
-            ->find_one_col('g_moderator');
+                            ->where('g_id', $new_group_id);
+        $new_group_mod = $this->hook->fireDB('update_group_membership_new_mod', $new_group_mod);
+        $new_group_mod = $new_group_mod->find_one_col('g_moderator');
 
         // If the user was a moderator or an administrator, we remove him/her from the moderator list in all forums as well
         if ($new_group_id != FEATHER_ADMIN && $new_group_mod != '1') {
 
-            $select_mods = array('id', 'moderators');
-
-            $result = DB::for_table('forums')
-                ->select_many($select_mods)
-                ->find_many();
+            // Loop through all forums
+            $result = $this->loop_mod_forums();
 
             foreach($result as $cur_forum) {
                 $cur_moderators = ($cur_forum['moderators'] != '') ? unserialize($cur_forum['moderators']) : array();
@@ -402,21 +452,23 @@ public function update_group_membership($id)
                     $username = array_search($id, $cur_moderators);
                     unset($cur_moderators[$username]);
 
+                    $update_forums = DB::for_table('forums')
+                                        ->where('id', $cur_forum['id'])
+                                        ->find_one();
+
                     if (!empty($cur_moderators)) {
-                        DB::for_table('forums')->where('id', $cur_forum['id'])
-                            ->find_one()
-                            ->set('moderators', serialize($cur_moderators))
-                            ->save();
+                        $update_forums = $update_forums->set('moderators', serialize($cur_moderators));
                     } else {
-                        DB::for_table('forums')->where('id', $cur_forum['id'])
-                            ->find_one()
-                            ->set_expr('moderators', 'NULL')
-                            ->save();
+                        $update_forums = $update_forums->set_expr('moderators', 'NULL');
                     }
+                    $update_forums = $this->hook->fireDB('update_group_membership_mod_forums', $update_forums);
+                    $update_forums = $update_forums->save();
                 }
             }
         }
 
+        $id = $this->hook->fire('update_group_membership', $id);
+
         redirect(get_link('user/'.$id.'/section/admin/'), __('Group membership redirect'));
     }
 
@@ -424,12 +476,26 @@ public function get_username($id)
     {
         // Get the username of the user we are processing
         $username = DB::for_table('users')
-            ->where('id', $id)
-            ->find_one_col('username');
+                        ->where('id', $id)
+                        ->find_one_col('username');
+
+        $username = $this->hook->fire('get_username', $username);
 
         return $username;
     }
 
+    public function loop_mod_forums()
+    {
+        $result['select'] = array('id', 'moderators');
+
+        $result = DB::for_table('forums')
+                    ->select_many($result['select']);
+        $result = $this->hook->fireDB('loop_mod_forums', $result);
+        $result = $result->find_many();
+
+        return $result;
+    }
+
     public function update_mod_forums($id)
     {
         $username = $this->get_username($id);
@@ -437,11 +503,7 @@ public function update_mod_forums($id)
         $moderator_in = ($this->request->post('moderator_in')) ? array_keys($this->request->post('moderator_in')) : array();
 
         // Loop through all forums
-        $select_mods = array('id', 'moderators');
-
-        $result = DB::for_table('forums')
-            ->select_many($select_mods)
-            ->find_many();
+        $result = $this->loop_mod_forums();
 
         foreach($result as $cur_forum) {
             $cur_moderators = ($cur_forum['moderators'] != '') ? unserialize($cur_forum['moderators']) : array();
@@ -450,43 +512,50 @@ public function update_mod_forums($id)
                 $cur_moderators[$username] = $id;
                 uksort($cur_moderators, 'utf8_strcasecmp');
 
-                DB::for_table('forums')->where('id', $cur_forum['id'])
-                    ->find_one()
-                    ->set('moderators', serialize($cur_moderators))
-                    ->save();
+                $update_forums = DB::for_table('forums')
+                                    ->where('id', $cur_forum['id'])
+                                    ->find_one()
+                                    ->set('moderators', serialize($cur_moderators));
+                $update_forums = $this->hook->fireDB('update_mod_forums_query', $update_forums);
+                $update_forums = $update_forums->save();
             }
             // If the user shouldn't have moderator access (and he/she already has it)
             elseif (!in_array($cur_forum['id'], $moderator_in) && in_array($id, $cur_moderators)) {
                 unset($cur_moderators[$username]);
 
+                $update_forums = DB::for_table('forums')
+                    ->where('id', $cur_forum['id'])
+                    ->find_one();
+
                 if (!empty($cur_moderators)) {
-                    DB::for_table('forums')->where('id', $cur_forum['id'])
-                        ->find_one()
-                        ->set('moderators', serialize($cur_moderators))
-                        ->save();
+                    $update_forums = $update_forums->set('moderators', serialize($cur_moderators));
                 } else {
-                    DB::for_table('forums')->where('id', $cur_forum['id'])
-                        ->find_one()
-                        ->set_expr('moderators', 'NULL')
-                        ->save();
+                    $update_forums = $update_forums->set_expr('moderators', 'NULL');
                 }
+                $update_forums = $this->hook->fireDB('update_mod_forums_query', $update_forums);
+                $update_forums = $update_forums->save();
             }
         }
 
+        $id = $this->hook->fire('update_mod_forums', $id);
+
         redirect(get_link('user/'.$id.'/section/admin/'), __('Update forums redirect'));
     }
 
     public function ban_user($id)
     {
+        $id = $this->hook->fire('ban_user_start', $id);
+
         // Get the username of the user we are banning
         $username = $this->get_username($id);
 
         // Check whether user is already banned
         $ban_id = DB::for_table('bans')
-            ->where('username', $username)
-            ->order_by_expr('expire IS NULL DESC')
-            ->order_by_desc('expire')
-            ->find_one_col('id');
+                    ->where('username', $username)
+                    ->order_by_expr('expire IS NULL DESC')
+                    ->order_by_desc('expire');
+        $ban_id = $this->hook->fireDB('ban_user_query', $ban_id);
+        $ban_id = $ban_id->find_one_col('id');
 
         if ($ban_id) {
             redirect(get_link('admin/bans/edit/'.$ban_id.'/'), __('Ban redirect'));
@@ -497,36 +566,47 @@ public function ban_user($id)
 
     public function promote_user($id)
     {
+        $id = $this->hook->fire('promote_user_start', $id);
+
         $pid = $this->request->get('pid') ? intval($this->request->get('pid')) : 0;
 
         // Find the group ID to promote the user to
         $next_group_id = DB::for_table('groups')
-            ->table_alias('g')
-            ->inner_join('users', array('u.group_id', '=', 'g.g_id'), 'u')
-            ->where('u.id', $id)
-            ->find_one_col('g.g_promote_next_group');
+                            ->table_alias('g')
+                            ->inner_join('users', array('u.group_id', '=', 'g.g_id'), 'u')
+                            ->where('u.id', $id);
+        $next_group_id = $this->hook->fireDB('promote_user_group_id', $next_group_id);
+        $next_group_id = $next_group_id->find_one_col('g.g_promote_next_group');
         
         if (!$next_group_id) {
             message(__('Bad request'), '404');
         }
 
         // Update the user
-        DB::for_table('users')->where('id', $id)
-            ->find_one()
-            ->set('group_id', $next_group_id)
-            ->save();
+        $update_user = DB::for_table('users')
+                        ->where('id', $id)
+                        ->find_one()
+                        ->set('group_id', $next_group_id);
+        $update_user = $this->hook->fireDB('promote_user_query', $update_user);
+        $update_user = $update_user->save();
+
+        $pid = $this->hook->fire('promote_user', $pid);
         
         redirect(get_link('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
     }
 
     public function delete_user($id)
     {
+        $id = $this->hook->fire('delete_user_start', $id);
+
         // Get the username and group of the user we are deleting
-        $select_info_delete_user = array('group_id', 'username');
+        $result['select'] = array('group_id', 'username');
 
-        $result = DB::for_table('users')->where('id', $id)
-            ->select_many($select_info_delete_user)
-            ->find_one();
+        $result = DB::for_table('users')
+                    ->where('id', $id)
+                    ->select_many($result['select']);
+        $result = $this->hook->fireDB('delete_user_username', $result);
+        $result = $result->find_one();
         
         $group_id = $result['group_id'];
         $username = $result['username'];
@@ -538,49 +618,52 @@ public function delete_user($id)
         if ($this->request->post('delete_user_comply')) {
             // If the user is a moderator or an administrator, we remove him/her from the moderator list in all forums as well
             $group_mod = DB::for_table('groups')
-                ->where('g_id', $group_id)
-                ->find_one_col('g_moderator');
+                            ->where('g_id', $group_id);
+            $group_mod = $this->hook->fireDB('delete_user_group_mod', $group_mod);
+            $group_mod = $group_mod->find_one_col('g_moderator');
 
             if ($group_id == FEATHER_ADMIN || $group_mod == '1') {
-                $select_info_delete_moderators = array('id', 'moderators');
 
-                $result = DB::for_table('forums')
-                    ->select_many($select_info_delete_moderators)
-                    ->find_many();
+                // Loop through all forums
+                $result = $this->loop_mod_forums();
                 
                 foreach($result as $cur_forum) {
                     $cur_moderators = ($cur_forum['moderators'] != '') ? unserialize($cur_forum['moderators']) : array();
 
                     if (in_array($id, $cur_moderators)) {
                         unset($cur_moderators[$username]);
-                        
+
+                        $update_forums = DB::for_table('forums')
+                                            ->where('id', $cur_forum['id'])
+                                            ->find_one();
+
                         if (!empty($cur_moderators)) {
-                            DB::for_table('forums')->where('id', $cur_forum['id'])
-                                ->find_one()
-                                ->set('moderators', serialize($cur_moderators))
-                                ->save();
+                            $update_forums = $update_forums->set('moderators', serialize($cur_moderators));
                         } else {
-                            DB::for_table('forums')->where('id', $cur_forum['id'])
-                                ->find_one()
-                                ->set_expr('moderators', 'NULL')
-                                ->save();
+                            $update_forums = $update_forums->set_expr('moderators', 'NULL');
                         }
+                        $update_forums = $this->hook->fireDB('update_mod_forums_query', $update_forums);
+                        $update_forums = $update_forums->save();
                     }
                 }
             }
 
             // Delete any subscriptions
-            DB::for_table('topic_subscriptions')
-                ->where('user_id', $id)
-                ->delete_many();
-            DB::for_table('forum_subscriptions')
-                ->where('user_id', $id)
-                ->delete_many();
+            $delete_subscriptions = DB::for_table('topic_subscriptions')
+                                        ->where('user_id', $id);
+            $delete_subscriptions = $this->hook->fireDB('delete_user_subscriptions_topic', $delete_subscriptions);
+            $delete_subscriptions = $delete_subscriptions->delete_many();
+            unset($delete_subscriptions);
+            $delete_subscriptions = DB::for_table('forum_subscriptions')
+                                        ->where('user_id', $id);
+            $delete_subscriptions = $this->hook->fireDB('delete_user_subscriptions_forum', $delete_subscriptions);
+            $delete_subscriptions = $delete_subscriptions->delete_many();
 
             // Remove him/her from the online list (if they happen to be logged in)
-            DB::for_table('online')
-                ->where('user_id', $id)
-                ->delete_many();
+            $delete_online = DB::for_table('online')
+                                ->where('user_id', $id);
+            $delete_online = $this->hook->fireDB('delete_user_online', $delete_online);
+            $delete_online = $delete_online->delete_many();
 
             // Should we delete all posts made by this user?
             if ($this->request->post('delete_posts')) {
@@ -588,26 +671,31 @@ public function delete_user($id)
                 // Hold on, this could take some time!
                 @set_time_limit(0);
 
+                $this->hook->fire('delete_user_posts');
+
                 // Find all posts made by this user
-                $select_user_posts = array('p.id', 'p.topic_id', 't.forum_id');
+                unset($result);
+                $result['select'] = array('p.id', 'p.topic_id', 't.forum_id');
                 
                 $result = DB::for_table('posts')
-                    ->table_alias('p')
-                    ->select_many($select_user_posts)
-                    ->inner_join('topics', array('t.id', '=', 'p.topic_id'), 't')
-                    ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
-                    ->where('p.poster_id', $id)
-                    ->find_many();
+                            ->table_alias('p')
+                            ->select_many($result['select'])
+                            ->inner_join('topics', array('t.id', '=', 'p.topic_id'), 't')
+                            ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
+                            ->where('p.poster_id', $id);
+                $result = $this->hook->fireDB('delete_user_posts_first_query', $result);
+                $result = $result->find_many();
                 
                 if ($result) {
                     foreach($result as $cur_post) {
                         // Determine whether this post is the "topic post" or not
                         $result2 = DB::for_table('posts')
-                            ->where('topic_id', $cur_post['topic_id'])
-                            ->order_by('posted')
-                            ->find_one_col('id');
+                                    ->where('topic_id', $cur_post['topic_id'])
+                                    ->order_by('posted');
+                        $result2 = $this->hook->fireDB('delete_user_posts_second_query', $result2);
+                        $result2 = $result2->find_one_col('id');
                         
-                        if ($this->db->result($result2) == $cur_post['id']) {
+                        if ($result2 == $cur_post['id']) {
                             delete_topic($cur_post['topic_id']);
                         } else {
                             delete_post($cur_post['id'], $cur_post['topic_id']);
@@ -618,15 +706,16 @@ public function delete_user($id)
                 }
             } else {
                 // Set all his/her posts to guest
-                DB::for_table('posts')
-                    ->where_in('poster_id', '1')
-                    ->update_many('poster_id', $id);
+                $update_guest = DB::for_table('posts')
+                                ->where_in('poster_id', '1');
+                $update_guest = $this->hook->fireDB('delete_user_posts_guest_query', $update_guest);
+                $update_guest = $update_guest->update_many('poster_id', $id);
             }
 
             // Delete the user
-            DB::for_table('users')
-                ->where('id', $id)
-                ->delete_many();
+            $delete_user = DB::for_table('users')
+                            ->where('id', $id);
+            $delete_user = $delete_user->delete_many();
 
             // Delete user avatar
             delete_avatar($id);
@@ -642,24 +731,25 @@ public function delete_user($id)
                 generate_admins_cache();
             }
 
+            $this->hook->fire('delete_user');
+
             redirect(get_base_url(), __('User delete redirect'));
         }
     }
 
     public function fetch_user_group($id)
     {
-
-
         $info = array();
-        
-        $select_fetch_user_group = array('old_username' => 'u.username', 'group_id' => 'u.group_id', 'is_moderator' => 'g.g_moderator');
+
+        $info['select'] = array('old_username' => 'u.username', 'group_id' => 'u.group_id', 'is_moderator' => 'g.g_moderator');
 
         $info = DB::for_table('users')
-            ->table_alias('u')
-            ->select_many($select_fetch_user_group)
-            ->left_outer_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
-            ->where('u.id', $id)
-            ->find_one();
+                ->table_alias('u')
+                ->select_many($info['select'])
+                ->left_outer_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
+                ->where('u.id', $id);
+        $info = $this->hook->fireDB('fetch_user_group', $info);
+        $info = $info->find_one();
 
         if (!$info) {
             message(__('Bad request'), '404');

From 06e3c178f82e9329e0936ab3ba361eafd17e6ac7 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 22 Aug 2015 21:19:14 +0200
Subject: [PATCH 125/353] Clean up things

Remove legacy CSS styles.
Make FeatherBB theme views default
---
 style/Air.css                                 | 1664 -----------------
 style/Air/base_admin.css                      |  163 --
 style/Air/img/asterisk.png                    |  Bin 168 -> 0 bytes
 style/Air/img/bull.png                        |  Bin 107 -> 0 bytes
 style/Air/img/email.png                       |  Bin 390 -> 0 bytes
 style/Air/img/exclaim.png                     |  Bin 432 -> 0 bytes
 style/Air/img/ext.png                         |  Bin 130 -> 0 bytes
 style/Air/img/feed.png                        |  Bin 439 -> 0 bytes
 style/Air/img/help.png                        |  Bin 394 -> 0 bytes
 style/Air/img/index.html                      |    1 -
 style/Air/index.html                          |    1 -
 style/Cobalt.css                              | 1168 ------------
 style/Earth.css                               | 1664 -----------------
 style/Earth/base_admin.css                    |  163 --
 style/Earth/img/asterisk.png                  |  Bin 168 -> 0 bytes
 style/Earth/img/bull.png                      |  Bin 107 -> 0 bytes
 style/Earth/img/email.png                     |  Bin 388 -> 0 bytes
 style/Earth/img/exclaim.png                   |  Bin 432 -> 0 bytes
 style/Earth/img/ext.png                       |  Bin 130 -> 0 bytes
 style/Earth/img/feed.png                      |  Bin 439 -> 0 bytes
 style/Earth/img/help.png                      |  Bin 379 -> 0 bytes
 style/Earth/img/index.html                    |    1 -
 style/Earth/index.html                        |    1 -
 style/FeatherBB/view/admin/bans/add_ban.php   |   96 -
 .../FeatherBB/view/admin/bans/admin_bans.php  |  102 -
 style/FeatherBB/view/admin/bans/index.html    |    1 -
 .../FeatherBB/view/admin/bans/search_ban.php  |   87 -
 style/FeatherBB/view/admin/categories.php     |  111 --
 style/FeatherBB/view/admin/censoring.php      |   84 -
 .../view/admin/forums/admin_forums.php        |  114 --
 .../view/admin/forums/delete_forum.php        |   35 -
 style/FeatherBB/view/admin/forums/index.html  |    1 -
 .../view/admin/forums/permissions.php         |  137 --
 .../view/admin/groups/add_edit_group.php      |  311 ---
 .../view/admin/groups/admin_groups.php        |  110 --
 .../view/admin/groups/confirm_delete.php      |   36 -
 .../view/admin/groups/delete_group.php        |   39 -
 style/FeatherBB/view/admin/index.html         |    1 -
 style/FeatherBB/view/admin/index.php          |   63 -
 style/FeatherBB/view/admin/loader.php         |   17 -
 .../admin/maintenance/admin_maintenance.php   |   99 -
 .../view/admin/maintenance/index.html         |    1 -
 .../view/admin/maintenance/prune.php          |   39 -
 .../view/admin/maintenance/rebuild.php        |   38 -
 style/FeatherBB/view/admin/menu.php           |  112 --
 style/FeatherBB/view/admin/options.php        |  849 ---------
 style/FeatherBB/view/admin/parser.php         |  299 ---
 style/FeatherBB/view/admin/permissions.php    |  189 --
 style/FeatherBB/view/admin/reports.php        |  116 --
 style/FeatherBB/view/admin/statistics.php     |   42 -
 .../view/admin/users/admin_users.php          |  172 --
 .../FeatherBB/view/admin/users/ban_users.php  |   58 -
 .../view/admin/users/delete_users.php         |   39 -
 .../FeatherBB/view/admin/users/find_users.php |  100 -
 .../FeatherBB/view/admin/users/move_users.php |   47 -
 .../FeatherBB/view/admin/users/search_ip.php  |   79 -
 .../FeatherBB/view/admin/users/show_users.php |  100 -
 style/FeatherBB/view/delete.php               |   64 -
 style/FeatherBB/view/edit.php                 |  119 --
 style/FeatherBB/view/footer.php               |  147 --
 style/FeatherBB/view/header.php               |  131 --
 style/FeatherBB/view/help.php                 |  141 --
 style/FeatherBB/view/index.html               |    1 -
 style/FeatherBB/view/index.php                |  111 --
 style/FeatherBB/view/login/form.php           |   42 -
 style/FeatherBB/view/login/index.html         |    1 -
 .../view/login/password_forgotten.php         |   57 -
 style/FeatherBB/view/message.php              |   25 -
 style/FeatherBB/view/misc/email.php           |   37 -
 style/FeatherBB/view/misc/index.html          |    1 -
 style/FeatherBB/view/misc/report.php          |   44 -
 style/FeatherBB/view/misc/rules.php           |   23 -
 .../FeatherBB/view/moderate/delete_posts.php  |   33 -
 .../FeatherBB/view/moderate/delete_topics.php |   34 -
 style/FeatherBB/view/moderate/index.html      |    1 -
 .../FeatherBB/view/moderate/merge_topics.php  |   36 -
 .../view/moderate/moderator_forum.php         |  101 -
 style/FeatherBB/view/moderate/move_topics.php |   44 -
 style/FeatherBB/view/moderate/posts_view.php  |   95 -
 style/FeatherBB/view/moderate/split_posts.php |   40 -
 style/FeatherBB/view/post.php                 |  213 ---
 style/FeatherBB/view/profile/change_mail.php  |   35 -
 style/FeatherBB/view/profile/change_pass.php  |   39 -
 style/FeatherBB/view/profile/delete_user.php  |   36 -
 style/FeatherBB/view/profile/index.html       |    1 -
 style/FeatherBB/view/profile/menu.php         |   55 -
 .../FeatherBB/view/profile/section_admin.php  |   87 -
 .../view/profile/section_display.php          |  101 -
 .../view/profile/section_essentials.php       |  258 ---
 .../view/profile/section_messaging.php        |   39 -
 .../view/profile/section_personal.php         |   39 -
 .../view/profile/section_personality.php      |   56 -
 .../view/profile/section_privacy.php          |   62 -
 .../FeatherBB/view/profile/upload_avatar.php  |   35 -
 style/FeatherBB/view/profile/view_profile.php |   66 -
 style/FeatherBB/view/register/email.php       |   39 -
 style/FeatherBB/view/register/form.php        |  134 --
 style/FeatherBB/view/register/index.html      |    1 -
 style/FeatherBB/view/register/rules.php       |   32 -
 style/FeatherBB/view/search/footer.php        |   40 -
 style/FeatherBB/view/search/form.php          |   79 -
 style/FeatherBB/view/search/header.php        |   48 -
 style/FeatherBB/view/search/index.html        |    1 -
 style/FeatherBB/view/search/posts.php         |   56 -
 style/FeatherBB/view/search/topics.php        |   29 -
 style/FeatherBB/view/userlist.php             |  115 --
 style/FeatherBB/view/viewforum.php            |  100 -
 style/FeatherBB/view/viewtopic.php            |  204 --
 style/Fire.css                                | 1663 ----------------
 style/Fire/base_admin.css                     |  163 --
 style/Fire/img/asterisk.png                   |  Bin 168 -> 0 bytes
 style/Fire/img/bull.png                       |  Bin 107 -> 0 bytes
 style/Fire/img/email.png                      |  Bin 371 -> 0 bytes
 style/Fire/img/exclaim.png                    |  Bin 432 -> 0 bytes
 style/Fire/img/ext.png                        |  Bin 130 -> 0 bytes
 style/Fire/img/feed.png                       |  Bin 439 -> 0 bytes
 style/Fire/img/help.png                       |  Bin 380 -> 0 bytes
 style/Fire/img/index.html                     |    1 -
 style/Fire/index.html                         |    1 -
 style/Lithium.css                             | 1165 ------------
 style/Mercury.css                             | 1168 ------------
 style/Oxygen.css                              | 1168 ------------
 style/Radium.css                              | 1168 ------------
 style/Sulfur.css                              | 1163 ------------
 style/Technetium.css                          | 1387 --------------
 style/Technetium/bg.png                       |  Bin 578 -> 0 bytes
 style/Technetium/dark-shade.png               |  Bin 157 -> 0 bytes
 style/Technetium/darker-shade.png             |  Bin 172 -> 0 bytes
 style/Technetium/feed.png                     |  Bin 439 -> 0 bytes
 style/Technetium/icon-closed-sticky.png       |  Bin 457 -> 0 bytes
 style/Technetium/icon-closed.png              |  Bin 255 -> 0 bytes
 style/Technetium/icon-moved.png               |  Bin 423 -> 0 bytes
 style/Technetium/icon-new-sticky.png          |  Bin 505 -> 0 bytes
 style/Technetium/icon-new.png                 |  Bin 324 -> 0 bytes
 style/Technetium/icon-nonew-sticky.png        |  Bin 443 -> 0 bytes
 style/Technetium/icon-nonew.png               |  Bin 265 -> 0 bytes
 style/Technetium/index.html                   |    1 -
 style/Technetium/inv-shade.png                |  Bin 117 -> 0 bytes
 style/Technetium/light-shade.png              |  Bin 120 -> 0 bytes
 style/index.html                              |    1 -
 view/admin/categories.php                     |   98 +-
 view/admin/forums/delete_forum.php            |    4 +-
 view/admin/forums/permissions.php             |    9 +-
 view/admin/groups/add_edit_group.php          |  406 ++--
 view/admin/groups/confirm_delete.php          |   40 +-
 view/admin/reports.php                        |  150 +-
 view/admin/users/find_users.php               |    4 +-
 view/edit.php                                 |  168 +-
 view/header.php                               |  162 +-
 {style/FeatherBB/view => view}/install.php    |    0
 150 files changed, 533 insertions(+), 21435 deletions(-)
 delete mode 100644 style/Air.css
 delete mode 100644 style/Air/base_admin.css
 delete mode 100644 style/Air/img/asterisk.png
 delete mode 100644 style/Air/img/bull.png
 delete mode 100644 style/Air/img/email.png
 delete mode 100644 style/Air/img/exclaim.png
 delete mode 100644 style/Air/img/ext.png
 delete mode 100644 style/Air/img/feed.png
 delete mode 100644 style/Air/img/help.png
 delete mode 100644 style/Air/img/index.html
 delete mode 100644 style/Air/index.html
 delete mode 100644 style/Cobalt.css
 delete mode 100644 style/Earth.css
 delete mode 100644 style/Earth/base_admin.css
 delete mode 100644 style/Earth/img/asterisk.png
 delete mode 100644 style/Earth/img/bull.png
 delete mode 100644 style/Earth/img/email.png
 delete mode 100644 style/Earth/img/exclaim.png
 delete mode 100644 style/Earth/img/ext.png
 delete mode 100644 style/Earth/img/feed.png
 delete mode 100644 style/Earth/img/help.png
 delete mode 100644 style/Earth/img/index.html
 delete mode 100644 style/Earth/index.html
 delete mode 100644 style/FeatherBB/view/admin/bans/add_ban.php
 delete mode 100644 style/FeatherBB/view/admin/bans/admin_bans.php
 delete mode 100644 style/FeatherBB/view/admin/bans/index.html
 delete mode 100644 style/FeatherBB/view/admin/bans/search_ban.php
 delete mode 100644 style/FeatherBB/view/admin/categories.php
 delete mode 100644 style/FeatherBB/view/admin/censoring.php
 delete mode 100644 style/FeatherBB/view/admin/forums/admin_forums.php
 delete mode 100644 style/FeatherBB/view/admin/forums/delete_forum.php
 delete mode 100644 style/FeatherBB/view/admin/forums/index.html
 delete mode 100644 style/FeatherBB/view/admin/forums/permissions.php
 delete mode 100644 style/FeatherBB/view/admin/groups/add_edit_group.php
 delete mode 100644 style/FeatherBB/view/admin/groups/admin_groups.php
 delete mode 100644 style/FeatherBB/view/admin/groups/confirm_delete.php
 delete mode 100644 style/FeatherBB/view/admin/groups/delete_group.php
 delete mode 100644 style/FeatherBB/view/admin/index.html
 delete mode 100644 style/FeatherBB/view/admin/index.php
 delete mode 100644 style/FeatherBB/view/admin/loader.php
 delete mode 100644 style/FeatherBB/view/admin/maintenance/admin_maintenance.php
 delete mode 100644 style/FeatherBB/view/admin/maintenance/index.html
 delete mode 100644 style/FeatherBB/view/admin/maintenance/prune.php
 delete mode 100644 style/FeatherBB/view/admin/maintenance/rebuild.php
 delete mode 100644 style/FeatherBB/view/admin/menu.php
 delete mode 100644 style/FeatherBB/view/admin/options.php
 delete mode 100644 style/FeatherBB/view/admin/parser.php
 delete mode 100644 style/FeatherBB/view/admin/permissions.php
 delete mode 100644 style/FeatherBB/view/admin/reports.php
 delete mode 100644 style/FeatherBB/view/admin/statistics.php
 delete mode 100644 style/FeatherBB/view/admin/users/admin_users.php
 delete mode 100644 style/FeatherBB/view/admin/users/ban_users.php
 delete mode 100644 style/FeatherBB/view/admin/users/delete_users.php
 delete mode 100644 style/FeatherBB/view/admin/users/find_users.php
 delete mode 100644 style/FeatherBB/view/admin/users/move_users.php
 delete mode 100644 style/FeatherBB/view/admin/users/search_ip.php
 delete mode 100644 style/FeatherBB/view/admin/users/show_users.php
 delete mode 100644 style/FeatherBB/view/delete.php
 delete mode 100644 style/FeatherBB/view/edit.php
 delete mode 100644 style/FeatherBB/view/footer.php
 delete mode 100644 style/FeatherBB/view/header.php
 delete mode 100644 style/FeatherBB/view/help.php
 delete mode 100644 style/FeatherBB/view/index.html
 delete mode 100644 style/FeatherBB/view/index.php
 delete mode 100644 style/FeatherBB/view/login/form.php
 delete mode 100644 style/FeatherBB/view/login/index.html
 delete mode 100644 style/FeatherBB/view/login/password_forgotten.php
 delete mode 100644 style/FeatherBB/view/message.php
 delete mode 100644 style/FeatherBB/view/misc/email.php
 delete mode 100644 style/FeatherBB/view/misc/index.html
 delete mode 100644 style/FeatherBB/view/misc/report.php
 delete mode 100644 style/FeatherBB/view/misc/rules.php
 delete mode 100644 style/FeatherBB/view/moderate/delete_posts.php
 delete mode 100644 style/FeatherBB/view/moderate/delete_topics.php
 delete mode 100644 style/FeatherBB/view/moderate/index.html
 delete mode 100644 style/FeatherBB/view/moderate/merge_topics.php
 delete mode 100644 style/FeatherBB/view/moderate/moderator_forum.php
 delete mode 100644 style/FeatherBB/view/moderate/move_topics.php
 delete mode 100644 style/FeatherBB/view/moderate/posts_view.php
 delete mode 100644 style/FeatherBB/view/moderate/split_posts.php
 delete mode 100644 style/FeatherBB/view/post.php
 delete mode 100644 style/FeatherBB/view/profile/change_mail.php
 delete mode 100644 style/FeatherBB/view/profile/change_pass.php
 delete mode 100644 style/FeatherBB/view/profile/delete_user.php
 delete mode 100644 style/FeatherBB/view/profile/index.html
 delete mode 100644 style/FeatherBB/view/profile/menu.php
 delete mode 100644 style/FeatherBB/view/profile/section_admin.php
 delete mode 100644 style/FeatherBB/view/profile/section_display.php
 delete mode 100644 style/FeatherBB/view/profile/section_essentials.php
 delete mode 100644 style/FeatherBB/view/profile/section_messaging.php
 delete mode 100644 style/FeatherBB/view/profile/section_personal.php
 delete mode 100644 style/FeatherBB/view/profile/section_personality.php
 delete mode 100644 style/FeatherBB/view/profile/section_privacy.php
 delete mode 100644 style/FeatherBB/view/profile/upload_avatar.php
 delete mode 100644 style/FeatherBB/view/profile/view_profile.php
 delete mode 100644 style/FeatherBB/view/register/email.php
 delete mode 100644 style/FeatherBB/view/register/form.php
 delete mode 100644 style/FeatherBB/view/register/index.html
 delete mode 100644 style/FeatherBB/view/register/rules.php
 delete mode 100644 style/FeatherBB/view/search/footer.php
 delete mode 100644 style/FeatherBB/view/search/form.php
 delete mode 100644 style/FeatherBB/view/search/header.php
 delete mode 100644 style/FeatherBB/view/search/index.html
 delete mode 100644 style/FeatherBB/view/search/posts.php
 delete mode 100644 style/FeatherBB/view/search/topics.php
 delete mode 100644 style/FeatherBB/view/userlist.php
 delete mode 100644 style/FeatherBB/view/viewforum.php
 delete mode 100644 style/FeatherBB/view/viewtopic.php
 delete mode 100644 style/Fire.css
 delete mode 100644 style/Fire/base_admin.css
 delete mode 100644 style/Fire/img/asterisk.png
 delete mode 100644 style/Fire/img/bull.png
 delete mode 100644 style/Fire/img/email.png
 delete mode 100644 style/Fire/img/exclaim.png
 delete mode 100644 style/Fire/img/ext.png
 delete mode 100644 style/Fire/img/feed.png
 delete mode 100644 style/Fire/img/help.png
 delete mode 100644 style/Fire/img/index.html
 delete mode 100644 style/Fire/index.html
 delete mode 100644 style/Lithium.css
 delete mode 100644 style/Mercury.css
 delete mode 100644 style/Oxygen.css
 delete mode 100644 style/Radium.css
 delete mode 100644 style/Sulfur.css
 delete mode 100644 style/Technetium.css
 delete mode 100644 style/Technetium/bg.png
 delete mode 100644 style/Technetium/dark-shade.png
 delete mode 100644 style/Technetium/darker-shade.png
 delete mode 100644 style/Technetium/feed.png
 delete mode 100644 style/Technetium/icon-closed-sticky.png
 delete mode 100644 style/Technetium/icon-closed.png
 delete mode 100644 style/Technetium/icon-moved.png
 delete mode 100644 style/Technetium/icon-new-sticky.png
 delete mode 100644 style/Technetium/icon-new.png
 delete mode 100644 style/Technetium/icon-nonew-sticky.png
 delete mode 100644 style/Technetium/icon-nonew.png
 delete mode 100644 style/Technetium/index.html
 delete mode 100644 style/Technetium/inv-shade.png
 delete mode 100644 style/Technetium/light-shade.png
 delete mode 100644 style/index.html
 rename {style/FeatherBB/view => view}/install.php (100%)

diff --git a/style/Air.css b/style/Air.css
deleted file mode 100644
index decd6fe8..00000000
--- a/style/Air.css
+++ /dev/null
@@ -1,1664 +0,0 @@
-/*****************************************************************
-1. INITIAL SETTINGS
-*****************************************************************/
-
-/* Limited Reset
-----------------------------------------------------------------*/
-
-html, body, .pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3, .pun h4, .pun h5, .pun pre, .pun blockquote,
-.pun ul, .pun ol, .pun li, .pun dl, .pun dt, .pun dd, .pun th, .pun td, .pun fieldset, .pun legend .pun img,
-.pun abbr, .pun cite {
-	border: 0;
-	font-style: normal;
-	font-weight: normal;
-	margin: 0;
-	padding: 0;
-}
-
-.pun ul, .pun ol {
-	list-style: none;
-}
-
-.pun select {
-	padding-bottom: 1px;
-	padding-top: 1px;
-	padding-right: 1px;
-}
-
-/* Content Defaults
-----------------------------------------------------------------*/
-
-.pun {
-	font: 81.25%/1.462em Arial, Helvetica, sans-serif;
-}
-
-.pun table, .pun td, .pun th, .pun input, .pun select, .pun optgroup, .pun textarea, .pun legend {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 1em;
-}
-
-.pun pre, .pun code {
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace;
-	font-size: 1em;
-}
-
-.pun pre code {
-	font-size: 1em;
-}
-
-.pun table {
-	border-collapse: collapse;
-	border-spacing: 0;
-	border: 0;
-	empty-cells: show;
-	width: 100%;
-}
-
-.pun h1 {
-	font:2.154em/1em "Trebuchet MS", Arial, Helvetica, sans-serif;
-	padding: 7px 0;
-}
-
-.pun h2, .pun .hd h2 {
-	font: 1.462em/1em "Trebuchet MS", Arial, Helvetica, sans-serif;
-	padding: 7px 0;
-}
-
-.pun h3 {
-	font-size: 1.154em;
-	line-height: 1.267em;
-	padding: 7px 0;
-}
-
-.pun h4 {
-	font-size: 1.077em;
-	font-weight: bold;
-	padding: 7px 0;
-}
-
-.pun h5, .pun h6 {
-	font-size: 1em;
-	font-weight: bold;
-	padding: 7px 0;
-}
-
-.pun p, .pun ul, .pun ol, .pun dl, .pun th, .pun td, .pun legend {
-	padding: 7px 0;
-}
-
-.pun strong, .pun th, .pun span.warntext, .pun p.warntext {
-	font-weight: bold;
-}
-
-.pun em {
-	font-style: italic;
-}
-
-.pun a, .pun a:link, .pun a:visited {
-	text-decoration: none;
-}
-
-.pun a:hover, .pun a:active, .pun a:focus {
-	text-decoration: underline;
-}
-
-.pun .actions span {
-	padding-left: 16px;
-	padding-right: 8px;
-	background: url(Air/img/bull.png) center left no-repeat;
-	display: inline-block;
-	line-height: normal;
-}
-
-/* Hidden Elements
-----------------------------------------------------------------*/
-
-#brdfooter h2, #brdstats h2, #debug h2, #brdstats .conl dt, #brdstats .conr dt, #modcontrols dt,
-#searchlinks dt, div.postright h3, .pun .subscribelink span, #announce .hd, #reportform h2, #punmoderate #vf h2,
-#punviewforum #vf h2, .pun .required strong span, .pun .icon div {
-	display: block;
-	overflow: hidden;
-	position: absolute;
-	text-indent: -9999em;
-	width: 0;
-}
-
-/* Generic Float Clear
-----------------------------------------------------------------*/
-
-.pun .inbox, .pun #brdmain, .pun .crumbs, .pun .pagepost, .pun .block2col {
-	min-height: 1px;
-}
-
-* html .pun .inbox, * html .pun #brdmain, * html .pun .infldset, * html .pun .crumbs, * html .pun .pagepost, * html .pun .block2col {
-	display: inline-block;
-}
-
-* html .pun .inbox, * html .pun #bdrdmain, * html .pun .infldset, * html .pun .crumbs, * html .pun .pagepost, * html .pun .block2col {
-	display: block;
-}
-
-.pun .inbox:after, .pun #brdmain:after, .pun .crumbs:after, .pun .pagepost:after, .pun .block2col:after {
-	content: " ";
-	display: block;
-	height: 0;
-	font-size: 0;
-	clear: both;
-	visibility: hidden;
-}
-
-.pun .block2col .inbox:after {
-	content: none;
-	clear: none;
-}
-
-.clearl {
-	clear: left;
-}
-
-
-/*****************************************************************
-2. COMMON STYLES
-*****************************************************************/
-
-/* Page Layout
-----------------------------------------------------------------*/
-
-.pun {
-	max-width: 1070px;
-	margin: 0 auto;
-	padding: 30px 40px;
-}
-
-#punredirect, #punmaint {
-	padding: 60px 20% 12px 20%;
-}
-
-#puninstall, #pundb_update {
-	padding: 20px 10%;
-}
-
-.pun .punwrap {
-	border: 1px solid;
-	border-radius: 10px;
-	padding: 18px;
-}
-
-#punredirect h2, #punmaint h2 {
-	border-bottom-style: dotted;
-	border-bottom-width: 1px;
-	margin-bottom: 3px;
-}
-
-/* Section Spacing and Borders
-----------------------------------------------------------------*/
-
-#brdmain {
-	border-style: solid none;
-	border-width: 2px 0;
-	margin-bottom: 12px;
-	padding: 12px 0;
-}
-
-#punindex #brdmain {
-	padding-top: 24px;
-}
-
-#punredirect #brdmain, #punmaint #brdmain {
-	border: 0;
-	margin: 0;
-	padding: 0;
-}
-
-#brdstats {
-	border-style: solid none none none;
-	border-width: 2px 0 0 0;
-	margin-top: 24px;
-	padding-top: 12px;
-}
-
-#quickpost {
-	border-style: solid none none none;
-	border-width: 2px 0 0 0;
-	margin-top: 12px;
-	padding-top: 12px;
-}
-
-#announce {
-	border-style: solid none none none;
-	border-width: 2px 0 0 0;
-	padding-top: 3px;
-}
-
-/*****************************************************************
-3. COMMON BOARD ELEMENTS
-*****************************************************************/
-
-/* Logo, Description and Main Menu
-----------------------------------------------------------------*/
-
-#brdtitle h1 {
-	padding: 0 0 10px 0;
-}
-
-#brddesc {
-	border-top-style: dotted;
-	border-top-width: 1px;
-	padding: 10px 0;
-}
-
-#brddesc p {
-	padding: 0;
-}
-
-#brdmenu ul {
-	padding: 0;
-}
-
-#brdmenu li {
-	float: left;
-}
-
-#brdmenu a:link, #brdmenu a:visited {
-	border-right-style: solid;
-	border-width: 1px;
-	display: block;
-	min-width: 60px;
-	padding: 12px 16px 6px 8px;
-	white-space: nowrap;
-}
-
-#brdmenu a:hover, #brmenu a:active, #brdmenu a:focus {
-	text-decoration: none;
-}
-
-/* Welcome Box
-----------------------------------------------------------------*/
-
-#brdwelcome {
-	padding: 10px 0;
-}
-
-#brdwelcome .conl, #brdwelcome .conr, #brdwelcome p, #brdwelcome li {
-	display: inline;
-	padding: 0;
-}
-
-#brdwelcome .conl {
-  float: left;
-}
-
-#brdwelcome .conr {
-  float: right;
-}
-
-#brdwelcome li span {
-	background: url(Air/img/bull.png) center left no-repeat;
-	padding-left: 18px;
-	margin-right: 3px;
-	display: inline-block;
-	line-height: normal;
-	white-space: nowrap;
-}
-
-#brdwelcome .conl li:first-child span {
-	padding-left: 0;
-	background: none;
-}
-
-/* Stats
-----------------------------------------------------------------*/
-
-#brdstats .conl {
-	float: left;
-}
-
-#brdstats .conr {
-	float: right;
-	text-align: right;
-}
-
-#brdstats #onlinelist {
-	border-top-style: dotted;
-	border-top-width: 1px;
-	clear: both;
-}
-
-#brdstats #onlinelist dt, #brdstats #onlinelist dd {
-	display: inline;
-}
-
-/* Footer
-----------------------------------------------------------------*/
-
-.pun #modcontrols {
-	border-style: none none dotted none;
-	border-width: 0 0 1px 0;
-	margin-bottom: 4px;
-	text-align: center;
-	width: 100%;
-}
-
-.pun #modcontrols dd {
-	display: inline;
-}
-
-.pun #brdfooter #modcontrols dd span {
-	background: url(Air/img/bull.png) center left no-repeat;
-	display: inline-block;
-	line-height: normal;
-	padding-left: 18px;
-	white-space: nowrap;
-}
-
-.pun #brdfooter .conl {
-	float: left;
-}
-
-.pun #brdfooter .conr {
-	text-align: right;
-	float: right;
-}
-
-.pun #brdfooter #poweredby a {
-	font-size: 1.077em;
-	font-weight: bold;
-}
-
-.pun #brdfooter #qjump {
-	padding-top: 5px;
-}
-
-.pun #brdfooter #qjump * {
-	white-space: nowrap;
-}
-
-.pun #brdfooter #searchlinks dd span {
-	background: url(Air/img/bull.png) center left no-repeat;
-	display: inline-block;
-	line-height: normal;
-	padding-left: 18px;
-	white-space: nowrap;
-}
-
-.pun #brdfooter #feedlinks {
-	padding-bottom: 0;
-}
-
-.pun #brdfooter #feedlinks span {
-	background: url(Air/img/feed.png) center left no-repeat;
-	display: inline-block;
-	padding-left: 18px;
-	white-space: nowrap;
-}
-
-.pun #debugtime {
-	border-style: dotted none none none;
-	border-width: 1px 0 0 0;
-	margin-top: 7px;
-	text-align: center;
-}
-
-/* Breadcrumbs, Postlink, Pagination
-----------------------------------------------------------------*/
-
-.pun .linkst .inbox, .pun .linksb .inbox, .pun .postlinksb .inbox {
-	overflow: hidden;
-}
-
-.pun .linksb, .pun .postlinksb, .pun .linkst, .pun .crumbs {
-	clear: both;
-	position: relative;
-}
-
-.pun .linkst .crumbs {
-	font-family: "Trebuchet MS", Helvetica, Arial, sans-serif;
-	font-size: 1.462em;
-	line-height: 1.211em;
-	padding: 7px 0;
-}
-
-.pun .linksb .crumbs, .pun .postlinksb .crumbs {
-	font-family: "Trebuchet MS", Helvetica, Arial, sans-serif;
-	font-size: 1.154em;
-}
-
-.pun .linkst .crumbsplus .pagepost {
-	border-top-style: dotted;
-	border-top-width: 1px;
-}
-
-.pun .linksb .crumbsplus .pagepost, .pun .postlinksb .crumbsplus .pagepost {
-	border-bottom-style: dotted;
-	border-bottom-width: 1px;
-}
-
-.pun .postlinksb .crumbs {
-	margin-right: 11em;
-}
-
-.pun .crumbs li {
-	float: left;
-	padding-right: 0.4em;
-	white-space: nowrap;
-}
-
-.pun .crumbs li strong {
-	font-weight: normal;
-}
-
-.pun .pagelink {
-	float: left;
-	white-space: nowrap;
-}
-
-.pun .pagelink strong, .pun .pagelink a, .pun .pagelink span.spacer {
-	border-style: none none none solid;
-	border-width: 0 0 0 1px;
-	display: inline-block;
-	padding: 0 12px 0 10px;
-	margin-right: -6px;
-}
-
-.pun .pagelink .item1 {
-	border: 0;
-}
-
-.pun .pagelink .pages-label {
-	display: inline-block;
-}
-
-.pun .postlink {
-	float: right;
-	font-weight: bold;
-	text-align: right;
-}
-
-.pun .modbuttons {
-	float: right;
-	padding: 5px 0 3px 0;
-}
-
-.pun .modbuttons input {
-	margin-left: 8px;
-}
-
-.pun .subscribelink {
-	position: absolute;
-	right: 0;
-	text-align: right;
-	top: 33px;
-}
-
-#punindex .subscribelink {
-	top: 0px;
-}
-
-#punindex .linksb {
-	height: 12px;
-}
-
-/*****************************************************************
-4. MAIN TABLES
-*****************************************************************/
-
-.pun #brdmain .blocktable {
-	position: relative;
-}
-
-#punindex #brdmain .blocktable h2, #punsearch #vf h2 {
-	font: 1em/1.462em Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	margin: 1px 1px 0 1px;
-	padding-left: 8px;
-	position: absolute;
-	left: 0;
-	white-space: nowrap;
-	z-index: 100;
-}
-
-#punindex .blocktable th.tcl, #punsearch #vf th.tcl {
-	font-size: 0;
-	text-indent: -9999em;
-}
-
-.pun .blocktable .box {
-	border-style: solid;
-	border-width: 1px;
-	margin-bottom: -1px;
-	overflow: hidden;
-	position: relative;
-}
-
-* html .pun .blocktable .box {
-	display: inline-block;
-}
-
-.pun .blocktable table {
-	table-layout: fixed;
-	margin-bottom: -1px;
-}
-
-.pun .blocktable th {
-	padding: 7px 8px;
-	border-style: none none solid none;
-	border-width: 1px;
-	text-align: left;
-}
-
-.pun .blocktable td {
-	padding: 7px 8px;
-	line-height: 1.3077em;
-	border-style: none none solid none;
-	border-width: 1px;
-	text-align: left;
-}
-
-.pun .blocktable h3 {
-	font-size: 1.077em;
-	font-weight: bold;
-	padding: 0;
-}
-
-.pun .blocktable p {
-	padding: 0;
-}
-
-.pun .blocktable .tcl p {
-	padding: 5px 0 0 0;
-}
-
-.pun .blocktable .tcl {
-	width: auto;
-}
-
-.pun .blocktable .tc2, .pun .blocktable .tc3, .pun .blocktable .tcmod {
-	padding-left: 0;
-	padding-right: 0;
-	text-align: center;
-	width: 11%;
-}
-
-.pun .blocktable .tcr {
-	width: 30%;
-}
-
-.pun .blocktable td .newtext, .pun .blocktable td .pagestext, .pun .blocktable td .byuser {
-	white-space: nowrap;
-}
-
-.pun .blocktable .tcl h3 span.newtext {
-	font-size: 0.929em;
-	font-weight: normal;
-}
-
-.pun #vf td.tcl span.stickytext, .pun #vf td.tcl span.closedtext {
-	font-size: 1em;
-	font-weight: bold;
-}
-
-#punsearch #vf .tc2 {
-	padding-left: 8px;
-	padding-right: 8px;
-	text-align: left;
-	width: 18%;
-}
-
-#users1 .tcr {
-	width: 25%;
-}
-
-#users1 .tc2 {
-	padding-left: 8px;
-	padding-right: 8px;
-	text-align: left;
-	width: 25%;
-}
-
-#debug {
-	margin-top: 12px;
-}
-
-#debug .tcl {
-	width: 10%;
-}
-
-#punredirect #debug .tcl, #punmaint #debug .tcl {
-	width: 20%;
-}
-
-#debug .tcr {
-	width: 90%;
-	white-space: normal
-}
-
-#punindex .tcr .byuser {
-	display: block
-}
-
-#punindex td.tc2, #punindex td.tc3, #punindex td.tcr, .pun #vf td.tc2, .pun #vf td.tc3,
-.pun #vf td.tcr, #punindex td.tcl div.forumdesc, .pun #vf td.tcl span {
-	font-size: 0.923em;
-}
-
-.pun #vf td.tcl a {
-	font-weight: bold;
-}
-
-.pun #vf td.tcl span a {
-	font-weight: normal;
-}
-
-.pun .blocktable .tclcon {
-	min-height: 1px;
-	overflow: hidden;
-	padding: 0 11px 0 12px;
-	position: relative;
-}
-
-.pun .blocktable .tclcon div {
-	width: 100%;
-	overflow: hidden;
-}
-
-.pun .icon {
-	border-style: solid;
-	border-width: 8px;
-	float: left;
-	height: 0;
-	overflow: hidden;
-	width: 0;
-}
-
-.pun .iposted .ipost {
-	font-weight: bold;
-	left: 0;
-	padding-left: 4px;
-	position: absolute;
-	text-align: center;
-	top: 0;
-	width: 8px;
-}
-
-/*****************************************************************
-MAIN POSTS
-*****************************************************************/
-
-/* Structure
-----------------------------------------------------------------*/
-
-.pun .blockpost {
-	border-style: solid;
-	border-width: 1px;
-	margin-bottom: -1px;
-	overflow: hidden;
-	position: relative;
-}
-
-* html .pun .blockpost {
-	display: inline-block;
-}
-
-.pun .blockpost h2 {
-	font: 1em/1.462em Arial, Helvetica, sans-serif;
-	white-space: nowrap;
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	height: 1.462em;
-	padding: 0.538em 8px 0.538em 236px;
-	font-weight: normal;
-}
-
-#punsearch .blockpost h2 {
-	height: auto;
-	padding-left: 36px;
-	white-space: normal;
-}
-
-#punsearch .blockpost h2 span span {
-	white-space: nowrap;
-	display: inline-block;
-	font: 1.077em "Trebuchet MS", Arial, Helvetica, sans-serif
-}
-
-#punsearch .blockpost .icon {
-	position: absolute;
-	top: 0;
-	margin-top: -2.154em;
-}
-
-.pun .blockpost h2 .conr {
-	float: right;
-	text-align: right;
-}
-
-.pun .blockpost .inbox {
-	float: right;
-	position: relative;
-	width: 100%;
-}
-
-.pun .blockpost .postbody, .pun .blockpost .postfoot {
-	border-left-style: solid;
-	border-left-width: 1px;
-	float: right;
-	margin-right: -218px;
-	position: relative;
-	text-align: left;
-	width: 100%;
-}
-
-.pun .blockpost .postleft, .pun .blockpost .postfootleft {
-	width: 194px;
-	padding: 7px 12px 7px 12px;
-	float: left;
-	margin-left: -218px;
-	position: relative;
-}
-
-.pun .blockpost .postleft dl {
-	padding: 0;
-}
-
-#punviewtopic .blockpost dt, #punmoderate .blockpost dt {
-	display: block;
-	position: absolute;
-	padding: 0.538em 0 0.538em 12px;
-	height: 1.462em;
-	top: -2.615em;
-	left: 0;
-	overflow: hidden;
-	width: 206px;
-}
-
-.pun .blockpost dt strong {
-	font-size: 1.231em;
-	font-weight: bold;
-}
-
-.pun .blockpost .postleft dd {
-	font-size: 0.923em;
-}
-
-.pun .blockpost .postleft .usertitle {
-	padding: 4px 0 6px 0;
-	font-size: 1em;
-}
-
-.pun .blockpost .postleft .postavatar {
-	display: block;
-	margin: 0 0 4px 0;
-}
-
-.pun .blockpost .postright {
-	position: relative;
-	padding: 4px 230px 7px 18px;
-}
-
-.pun .postmsg {
-	width:100%;
-	overflow: hidden;
-	word-wrap: break-word;
-}
-
-.pun .blockpost .postfootright {
-	position: relative;
-	padding: 7px 230px 7px 18px;
-	text-align: right;
-}
-
-.pun .postfoot p, .pun .postfoot ul {
-	padding: 0;
-}
-
-.pun .blockpost .postfootright li {
-	display: inline;
-}
-
-.pun .blockpost .postfootright li span {
-	display: inline-block;
-	padding-left: 16px;
-	margin-left: 8px;
-	line-height: normal;
-	background: url(Air/img/bull.png) center left no-repeat;
-}
-
-.pun .blockpost .usercontacts {
-	padding: 7px 0;
-}
-
-.pun .blockpost .usercontacts .email {
-	background: url(Air/img/email.png) left 65% no-repeat;
-	margin-right: 5px;
-	padding-left: 21px;
-	display: inline-block;
-	line-height: normal;
-}
-
-.pun .blockpost .usercontacts .website {
-	background: url(Air/img/ext.png) left 65% no-repeat;
-	padding-left: 18px;
-	display: inline-block;
-	line-height: normal;
-}
-
-.pun .postsignature hr {
-	border:none;
-	height: 1px;
-	margin-left: 0px;
-	text-align: left;
-}
-
-/* Content (includes other user content)
-----------------------------------------------------------------*/
-
-.pun .usercontent {
-	padding: 7px 0;
-}
-
-.pun .postmsg p, .pun .postmsg li, #punhelp p samp {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-.pun .usercontent h1, .pun .usercontent h2, .pun .usercontent h3,
-.pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
-	padding: 7px 0 0 0;
-}
-
-.pun .postmsg h5, #punhelp h5 {
-	font-size: 1.231em;
-	font-weight: bold;
-	padding: 7px 0;
-}
-
-.pun .usercontent ul, .pun .postmsg ul {
-	list-style: disc;
-	padding: 4px 13px 4px 30px;
-}
-
-.pun .usercontent ol, .pun .postmsg ol {
-	list-style: decimal;
-	padding: 4px 13px 4px 30px;
-}
-
-.pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha;
-}
-
-.pun .usercontent li, .pun .postmsg li {
-	padding: 0 3px;
-}
-
-.pun .usercontent li p, .pun .postmsg li p {
-	padding: 0;
-}
-
-.pun span.bbu {
-	text-decoration: underline;
-}
-
-.pun span.bbs, .pun del {
-	text-decoration: line-through;
-}
-
-.pun .postmsg ins, #punhelp samp ins {
-	text-decoration: none;
-}
-
-.pun .blockpost .postmsg .postedit {
-	font-size: 0.857em;
-}
-
-.pun .blockform .postsignature, .pun .blockpost .postsignature {
-	font-size: 0.923em;
-}
-
-.pun .codebox {
-	border-style: solid;
-	border-width: 1px;
-	margin: 0.75em 1em;
-	padding: 0;
-}
-
-.pun .quotebox {
-	border-style: solid;
-	border-width: 1px 1px 1px 3px;
-	margin: 0.75em 1em;
-	padding: 0 0.75em;
-}
-
-.pun .quotebox cite {
-	display: block;
-	padding: 0.75em 0 0 0;
-	font-weight: bold;
-	line-height: 1.462em;
-}
-
-.pun .quotebox blockquote {
-	overflow: hidden;
-	width: 100%;
-}
-
-.pun .codebox pre {
-	overflow: auto;
-	width: 100%;
-	direction: ltr;
-	text-align: left;
-}
-
-* html .pun .codebox pre {
-	padding-bottom: 10px;
-}
-
-*:first-child+html .pun .codebox pre {
-	padding-bottom: 10px;
-}
-
-.pun .codebox pre code {
-	padding: 0.5em;
-	white-space: pre;
-}
-
-.pun div[class*=codebox] pre code {
-	display: inline-block;
-}
-
-* html .pun .codebox pre code {
-	display: block;
-}
-
-.pun .codebox pre.vscroll {
-	height: 32em;
-	overflow: auto;
-	overflow-y: auto
-}
-
-.pun .postmsg img, #punhelp samp img {
-	vertical-align: text-top;
-}
-
-.pun .postmsg .postimg img {
-	max-width: 98%;
-	vertical-align: middle;
-	margin: 7px 0.5em 7px 0;
-}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-style: solid;
-	border-width: 2px;
-}
-
-/*****************************************************************
-MAIN FORMS
-*****************************************************************/
-
-#punedit .blockform h2, #punpost .blockform h2, #postpreview h2, #posterror h2,
-.pun #quickpost h2, .pun #reportform h2, #pundelete .blockform h2 {
-	font: 1em/1.462em Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	white-space: nowrap;
-	padding: 10px 19px 4px 37px;
-	border: 0;
-}
-
-#punpost .blockform h2, #punedit .blockform h2,.pun #quickpost h2,
-#pundelete .blockform h2 {
-	margin: 1px 1px 0 1px;
-	width: 25em;
-	position: absolute;
-	z-index: 100;
-}
-
-.pun #quickpost legend, #punpost legend, #punedit legend {
-	width: 25em;
-	overflow: hidden;
-	white-space: nowrap;
-}
-
-.pun .blockform .box {
-	border-style: solid;
-	border-width: 1px;
-	padding-bottom: 12px;
-}
-
-.pun #posterror {
-	border-style: solid;
-	border-width: 1px;
-}
-
-.pun #posterror .box {
-	padding: 0 18px 12px 18px;
-}
-
-* html .pun .blockform .box, * html .pun #posterror {
-	display: inline-block;
-}
-
-.pun .blockform .forminfo, .pun .error-info {
-	padding: 12px 18px;
-	border-style: solid;
-	border-width: 1px;
-	position: relative;
-}
-
-.pun .blockform .forminfo {
-	margin-top: 12px;
-}
-
-#pundelete .blockform .forminfo {
-	margin-top: 33px;
-}
-
-.pun .forminfo h3 {
-	padding-bottom: 0;
-}
-
-.pun .error-list li {
-	padding-left: 24px;
-	background: url(Air/img/exclaim.png) center left no-repeat;
-}
-
-.pun .inform {
-	padding: 0 18px;
-}
-
-.pun legend {
-	font-weight: bold;
-	padding: 10px 19px 4px 19px;
-}
-
-* html .pun legend {
-	margin-left: -7px;
-}
-
-*:first-child+html .pun legend {
-	margin-left: -7px;
-}
-
-.pun .infldset {
-	border-style: solid;
-	border-width: 1px;
-	padding: 12px 18px;
-}
-
-#punregister #rules .infldset {
-	padding: 5px 18px;
-}
-
-.pun fieldset p {
-	padding: 0 0 7px 0;
-	width: 100%;
-}
-
-.pun fieldset .usercontent p {
-	padding: 7px 0;
-}
-
-.pun fieldset label {
-	display: block;
-	padding: 0 0 7px 0;
-}
-
-.pun label em {
-	font-weight: normal;
-	font-style: normal;
-}
-
-.pun .required strong {
-	background: url(Air/img/asterisk.png) center right no-repeat;
-	font-weight: normal;
-	padding-right: 14px;
-	white-space: pre;
-	display: inline-block;
-	line-height: normal;
-}
-
-.pun label input, .pun label select, .pun label textarea {
-	margin-top: 2px;
-}
-
-.pun label.conl {
-	display: inline-block;
-	padding-right: 12px;
-}
-
-.pun form .buttons {
-	padding: 8px 19px 8px 34px;
-	margin-bottom: -12px;
-}
-
-.pun .blockform .buttons input {
-	margin-right: 12px;
-}
-
-.pun .rbox {
-	padding: 3px 0;
-}
-
-.pun .rbox label {
-	padding: 3px 0 3px 1.75em;
-	position: relative;
-	min-height: 1px;
-}
-
-* html .pun .rbox label {
-	text-indent: -3px;
-	height: 1%;
-}
-
-.pun .rbox input {
-	margin: 3px 0.75em 3px -1.75em;
-	float: left;
-	position: relative;
-	vertical-align: middle;
-	padding: 0;
-	height: 1em;
-	width: 1em;
-}
-
-.pun input[type=text], .pun select, .pun textarea {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-.pun .txtarea textarea, .pun input.longinput {
-	width: 98%;
-}
-
-.pun textarea {
-	resize: vertical;
-}
-
-.pun #quickpost .txtarea {
-	padding-right: 12px;
-	position: relative;
-}
-
-.pun .blockform .bblinks {
-	padding-top: 0;
-}
-
-.pun .blockform .bblinks li {
-	display: inline;
-}
-
-.pun .blockform .bblinks li span {
-	background: url(Air/img/help.png) center left no-repeat;
-	margin-right: 8px;
-	padding-left: 20px;
-	display: inline-block;
-}
-
-.pun #quickpost .bblinks {
-	padding-top: 0;
-}
-
-.pun #quickpost .bblinks li {
-	display: inline;
-}
-
-.pun #login p.clearb {
-	border-top-style: dotted;
-	border-top-width: 1px;
-	font-size: 0;
-	height: 0;
-	line-height: 0;
-	margin-top: 7px;
-	overflow: hidden;
-	padding-bottom: 3px;
-	padding-top: 7px;
-	text-indent: -9999em;
-	width: 100%;
-}
-
-.pun #postreview {
-	padding-top: 12px;
-}
-
-.pun #postpreview, .pun #posterror {
-	margin-bottom: 12px;
-}
-
-.pun #postpreview .postright {
-	padding: 0;
-}
-
-.pun #postpreview .postbody {
-	border-style: solid;
-	border-width: 1px;
-	float: none;
-	margin: 0 18px 12px 18px;
-	padding: 0;
-	padding: 4px 18px 4px 18px;
-	width: auto;
-}
-
-.pun span.email {
-	background: url(Air/img/email.png) left 65% no-repeat;
-	margin-right: 5px;
-	padding-left: 21px;
-	display: inline-block;
-	line-height: normal;
-}
-
-.pun span.website {
-	background: url(Air/img/ext.png) left 65% no-repeat;
-	padding-left: 18px;
-	display: inline-block;
-	line-height: normal;
-}
-
-#punmisc #rules .box {
-	border-style: solid;
-	border-width: 1px;
-	padding: 5px 18px;
-}
-
-
-#punhelp #brdmain .box {
-	border-style: solid;
-	border-width: 1px;
-	padding: 7px 12px;
-}
-
-.pun .multiselect {
-	float: left;
-	padding-bottom: 7px;
-}
-
-.pun .checklist {
-	border-width: 1px;
-	border-style: solid;
-	max-height: 9em;
-	width: 20em;
-	overflow: auto;
-	padding: 0.25em 0.5em;
-	margin: 0.25em 16px 0 0.15em;
-}
-
-.pun .checklist legend {
-	padding: 0;
-}
-
-.pun .checklist legend span {
-	width: auto;
-	max-width: 25em;
-}
-
-/*****************************************************************
-PROFILES (+ ADMIN MENU)
-*****************************************************************/
-
-/* Profile / Admin
-----------------------------------------------------------------*/
-
-.pun .blockmenu {
-	width: 13em;
-	float: left;
-	padding-bottom: 12px;
-}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 15em;
-}
-
-.pun .blockmenu .block2 {
-	padding-top: 19px;
-}
-
-.pun .blockmenu ul {
-	border-top-style: dotted;
-	border-top-width: 1px;
-	padding: 0;
-}
-
-.pun .blockmenu li {
-	border-bottom-style: dotted;
-	border-bottom-width: 1px;
-	font-weight: bold;
-	padding: 0;
-}
-
-.pun .blockmenu a:link, .pun .blockmenu a:visited {
-	display: block;
-	padding: 9px 6px 3px 6px;
-	min-height: 1px;
-	text-decoration: none;
-}
-
-* html .pun .blockmenu a:link,  * html .pun .blockmenu a:visited {
-	height: 1%;
-}
-
-.pun .blockmenu a:hover, .pun .blockmenu a:active, .pun .blockmenu a:focus {
-	text-decoration: none;
-}
-
-#viewprofile .box {
-	border-style: solid;
-	border-width: 1px;
-	padding-bottom: 18px;
-}
-
-#viewprofile dt, #adstats dt {
-	padding: 7px 0;
-	position: absolute;
-	width: 13em;
-	left: 0;
-}
-
-#viewprofile dl {
-	border-style: solid none none none;
-	border-width: 1px;
-	margin: 7px 0;
-	padding: 0;
-	width: 100%;
-	position: relative;
-}
-
-#adintro, #adstats, #adalerts {
-	border-style: solid;
-	border-width: 1px;
-	padding: 18px;
-}
-
-#adintro li span {
-	display: inline-block;
-	padding-left: 16px;
-	margin-left: 8px;
-	line-height: normal;
-	background: url(Air/img/bull.png) center left no-repeat;
-}
-
-#adstats .inbox, #adintro .inbox, #adalerts p {
-	border-style: solid;
-	border-width: 1px;
-	padding: 18px;
-}
-
-#adstats dl {
-	margin: 0;
-	padding: 0;
-	width: 100%;
-	position: relative;
-}
-
-#viewprofile dd, #adstats dd {
-	border-style: none none solid none;
-	border-width: 1px;
-	padding: 7px 0 7px 13em;
-}
-
-/*****************************************************************
-COLOUR SCHEME
-*****************************************************************/
-
-/* Basic defaults and Common Items
-----------------------------------------------------------------*/
-
-html, body, .pun {
-	background: #f6f9fc;
-	color: #333;
-}
-
-.pun .punwrap {
-	background: #fff;
-	border-color: #cad7e1;
-	color: #566579;
-}
-
-#brdtitle #brddesc, .pun .pagepost, #brdstats #onlinelist, #brdfooter #searchlinks, #brdfooter #modcontrols,
-#punmaint h2, #punredirect h2, #adminconsole .submittop, .pun #debugtime, .pun .pagelink a, .pun .pagelink * {
-	border-color: #b9c5ce;
-}
-
-.pun a, .pun a:link, .pun a:visited {
-	color: #2365B0;
-}
-
-.pun a:hover, .pun a:active, .pun a:focus {
-	color: #b50000;
-}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-color: #22538a;
-}
-
-.pun .postmsg .postimg a:hover img, .pun .postmsg .postimg a:active img, .pun .postmsg .postimg a:focus img {
-	border-color: #b50000;
-}
-
-/* Primary Navigation
-----------------------------------------------------------------*/
-
-#brdmenu {
-	background: #44699c;
-}
-
-#brdmenu a, #brdmenu a:link, #brdmenu a:visited {
-	background: #44699c;
-	border-color: #fff;
-	color: #d4dae2;
-}
-
-#brdmenu a:hover, #brdmenu a:active, #brdmenu a:focus {
-	background: #b50000;
-	border-color: #fff;
-	color: #fff;
-}
-
-/* Main Tables
-----------------------------------------------------------------*/
-
-.pun .blocktable .box {
-	background: #fcfdfe;
-	border-color: #b9c5ce #d9e1e7;
-}
-
-#punindex .blocktable h2, .pun #vf h2 {
-	color: #357082;
-}
-
-#adminconsole fieldset th, #adminconsole fieldset td {
-	background: #f6f9fc;
-	border-color: #dfe6ee;
-}
-
-.pun #users1 h2 {
-	background: #fff;
-}
-
-.pun .blocktable td {
-	border-color: #dfe6ee;
-}
-
-.pun .blocktable th {
-	background: #ebf1f5;
-	border-color: #cad7e1;
-	color: #357082;
-}
-
-.pun .blocktable td.tcl span.stickytext {
-	color: #3399CC;
-}
-
-/* Main Posts
-----------------------------------------------------------------*/
-
-.pun .blockpost {
-	background: #f6f9fc;
-	border-color: #b9c5ce #d9e1e7;
-}
-
-.pun .blockpost h2 {
-	background: #ebf1f5;
-	border-color: #cad7e1;
-	color: #357082;
-}
-
-.pun .blockpost .postbody, .pun .blockpost .postfoot {
-	background: #fcfdfe;
-	border-color: #dfe6ee;
-}
-
-.pun .blockpost .postfootright li {
-	color: #fcfdfe;
-}
-
-.pun .postmsg, #punhelp code, #punhelp samp {
-	color: #333;
-}
-
-.pun .postsignature, .pun .postmsg .postedit {
-	color: #566579;
-}
-
-.pun .quotebox {
-	background: #f8f9f0;
-	border-color: #7aadbd;
-	color: #566579;
-}
-
-.pun .quotebox cite {
-	color: #357082;
-}
-
-.pun .codebox, #punhelp .codebox code {
-	background: #333;
-	color: #fff;
-}
-
-.pun .postmsg hr {
-	background: #b9c5ce;
-}
-
-.pun .postmsg ins, #punhelp samp ins {
-	background-color: #ff0;
-}
-
-/* Main Forms + Profile
-----------------------------------------------------------------*/
-
-.pun .blockform .box, #adstats, #adintro, #adalerts, #postpreview, #posterror {
-	border-color: #b9c5ce #d9e1e7;
-	background: #ebf1f5;
-}
-
-#punmisc #rules .box, #punhelp #brdmain .box {
-	border-color: #b9c5ce #d9e1e7;
-	background: #f6f9fc;
-}
-
-.pun #quickpost h2, #punpost .blockform h2, #punedit .blockform h2, #posterror h2,
-#pundelete .blockform h2 {
-	background: #ebf1f5;
-	color: #357082;
-}
-
-.pun .forminfo {
-	background: #fff;
-	border-color: #dfe6ee;
-}
-
-#puninstall form#install .forminfo {
-	background: #44699c;
-	color: #fff;
-}
-
-.pun #posterror .error-info, .pun #adalerts p {
-	background: #ffffe1;
-	border-color: #dfe6ee;
-}
-
-#puninstall form#install .error-info {
-	background: #ffffe1;
-	border-color: #dfe6ee;
-	color: #333;
-}
-
-.pun .infldset, #adintro .inbox, #adstats .inbox {
-	background: #f6f9fc;
-	border-color: #dfe6ee;
-}
-
-.pun label, .pun legend, #adminconsole fieldset th {
-	color: #357082;
-}
-
-.pun fieldset p {
-	border-color: #b9c5ce;
-}
-
-.pun .blockmenu ul, .pun .blockmenu li {
-	border-color: #b9c5ce;
-}
-
-.pun .blockmenu a:hover, .pun .blockmenu a:active, .pun .blockmenu a:focus {
-	background: #ffffe6;
-}
-
-.pun .blockmenu .isactive a:link, .pun .blockmenu .isactive a:visited {
-	color: #333;
-	background: #f6f9fc;
-	}
-
-.pun #viewprofile .box {
-	border-color: #b9c5ce #d9e1e7;
-	background: #ebf1f5;
-}
-
-.pun #viewprofile dt, #adstats dt {
-	color: #357082;
-}
-
-.pun #viewprofile dl, .pun #viewprofile dd, #adstats dl, #adstats dd {
-	border-color: #dfe6ee;
-}
-
-#adminconsole fieldset td.nodefault {
-	background: #d59b9b;
-}
-
-.pun .multiselect {
-	color: #357082;
-}
-
-.pun .checklist {
-	background: white;
-	border-color: #ccc;
-}
-
-/* Status Indicators
-----------------------------------------------------------------*/
-
-.pun .icon {
-	border-color: #e8ecf1 #d4d9dd #dfe3e8 #e8ecf1;
-}
-
-.pun .iredirect .icon {
-	border-color: #b9c5ce;
-	border-width: 1px;
-	padding: 7px;
-}
-
-.pun .inew .icon {
-	border-color: #91b3d9 #87a8d1 #6c85bb #7292c3;
-}
-
-/* Alert boxes
-----------------------------------------------------------------*/
-
-#msgflash {
-    opacity: 0;
-    position: fixed;
-    top: 40px;
-    right: 40px;
-    min-width: 240px;
-    max-width: 410px;
-	padding: 5px;
-	z-index: 1000;
-	color: #fff;
-	background-color: #619bc4;
-	border-color: #1489e0;
-	border-width: 2px;
-	border-radius: 5px;
-}
diff --git a/style/Air/base_admin.css b/style/Air/base_admin.css
deleted file mode 100644
index fdf41b10..00000000
--- a/style/Air/base_admin.css
+++ /dev/null
@@ -1,163 +0,0 @@
-#adminconsole .blockform .box {
-	padding-bottom: 12px;
-}
-
-#adminconsole fieldset .infldset {
-	position: relative;
-	overflow: hidden;
-}
-
-#adminconsole fieldset table {
-	margin-top: -1px;
-	margin-bottom: -1px;
-}
-
-#adminconsole fieldset td, #adminconsole fieldset th {
-	padding: 10px 8px 10px 0;
-	text-align: left;
-	white-space: normal;
-	border-style: solid none;
-	border-width: 1px 0;
-}
-
-#punadmin thead th {
-	border-top: 0;
-	font-weight: normal;
-}
-
-#adminconsole fieldset td span, #adminconsole fieldset th span {
-	display: block; font-size: 1em;
-	font-weight: normal;
-}
-
-#adminconsole fieldset td.location span {
-	display: inline-block;
-}
-
-#adminconsole fieldset th {
-	width: 15em;
-	font-weight: normal;
-	padding-right: 8px;
-}
-
-#adminconsole table.aligntop th, #adminconsole table.aligntop td {
-	vertical-align: top;
-}
-
-#adminconsole table.aligntop th div {
-	padding-top: 3px;
-}
-
-#adminconsole .inform {
-	padding-bottom: 0;
-}
-
-#adminconsole .infldset {
-	padding-bottom: 0;
-	padding-top: 0;
-}
-
-#adminconsole p.submittop {
-	text-align: center;
-	border-bottom-style: dotted;
-	border-bottom-width: 1px;
-	margin: 0 18px;
-	padding-top: 12px;
-}
-
-#adminconsole p.submitend {
-	text-align: center;
-	padding-bottom: 0;
-}
-
-#adminconsole fieldset p {
-	padding: 10px 0;
-}
-
-#adminconsole .fsetsubmit {
-	padding: 10px 0 12px 0;
-}
-
-#categoryedit .tcl {
-	width: 25%;
-}
-
-#censoring .tcl, #censoring .tc2 {
-	width: 20%;
-}
-
-#edforum .tcl {
-	width: 18%;
-}
-
-#edforum .tc2 {
-	width: 12%;
-}
-
-#forumperms thead th, #forumperms tbody td {
-	text-align: center;
-}
-
-.pun .linkst .backlink, .pun .linksb .backlink {
-	padding: 7px 0;
-}
-
-#punadmin #users1 h2, #punadmin #users2 h2, #punadmin #bans1 h2 {
-	display: block;
-	left: -9999em;
-	overflow: hidden;
-	position: absolute;
-	text-indent: -9999em;
-	width: 0;
-}
-
-#punadmin #users1 th, #punadmin #users2 th, #punadmin #bans1 th {
-	font-weight: bold;
-}
-
-#users2 th, #bans1 th {
-	text-align: left;
-}
-
-#users2 th.tcmod {
-	text-align: center;
-}
-
-#users2 .tcl, #bans1 .tcl {
-	width: auto;
-	text-align: left;
-}
-
-#users2 .tc2, #bans1 .tc2 {
-	width: 18%;
-	text-align: left;
-}
-
-#users2 .tc3, #users2 .tc5, #bans1 .tc3, #bans1 .tc5, #bans1 .tc6 {
-	width: 12%;
-	text-align: left;
-}
-
-#users2 .tc4, #bans1 .tc4 {
-	width: 10%;
-	text-align: center;
-}
-
-#users2 .tcr {
-	width: 20%;
-	white-space: nowrap;
-}
-
-#bans1 .tcr {
-	width: 15%;
-	white-space: nowrap;
-}
-
-#users2 .tcmod {
-	width: 10%;
-	text-align: center;
-}
-
-.plugin p {
-	padding: 12px 18px 0;
-}
diff --git a/style/Air/img/asterisk.png b/style/Air/img/asterisk.png
deleted file mode 100644
index f7438dea90907b0619cdfea4aa0f057fdc7ddfba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv3GfMV^~o%})6nqk{{2G=3ODle
zA5NHXIX-?T1H<`%fYS~RFE?y>ci@2eO5P}-dd89<zhDN3XE)M-93xK`#}JO|$q5R4
z8V4ns1iFrT2DmaDNf4Tsxq?CLkzPE*vYC^t&m2%%!_?HnsIiNKnZZGXWi`|7FYG|w
N44$rjF6*2UngGiBI2Zr`

diff --git a/style/Air/img/bull.png b/style/Air/img/bull.png
deleted file mode 100644
index c0706f80daf9ba299e4a51ae1adc1ffda888a8b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=-3?y@QpIZW?*aCb)T>t<7zhU<o*7_@LKoQ20
zAirP+hi5m^fE-~@7sn8e>&XcXj5nDBT8^b9FfasfV%0zFt=a*UX7F_Nb6Mw<&;$Up
C{~jg)

diff --git a/style/Air/img/email.png b/style/Air/img/email.png
deleted file mode 100644
index 39ee55f073e0a9a6b9bfd130f0933b36af4303c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 390
zcmV;10eSw3P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001-P)t-sOlfh}
z=l$mH`Avw!@%R2wi^tvP_xSt$-Rl1J`Tv%+<K*xD?DY8G?EYhq%+28VQH8}?hqp+B
z#EGffr^W2D%j;l$s_gOi#ohW|jmklL!JxnCz18$ti^%5p|2%WNywL2{<oR)!(X!0(
zpS9VXzwN-={Ee{VtH$j<ZM8;r!c20ne4W!!eZ^ab$<EsA+2rxJ*ZhU5;+4Gc@4v$`
z00001bW%=J06^y0W&i*Hm`OxIRCwBz&PNu)FbqXe+1OE>#184bl0vWh-y34Yki(tn
zY4YK>DH@G2MbR`{5~MJpz^^QTvv4e76W3MN^Dbe;9Tn};&DWPF!62ie+7|gbKPX(0
zv3<l5c{DEzg$pu2i5<&w;yBMK9C7G<R##O`k35smseaH}+aG?yC7e7igiuN$$!-Cp
khpsHcFx(Kip{4(O16h^}CB64A-2eap07*qoM6N<$f*<nE1poj5

diff --git a/style/Air/img/exclaim.png b/style/Air/img/exclaim.png
deleted file mode 100644
index b98bb3cc2270ad086bcbb8eb2fa50757736e446a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002AP)t-sOlfiY
zyQlG%g7<}M^nYRXfnwujTI+3D@p)eEa$EQ2<K<yg_ltD&uA}&~pYf-j;&NQ+fok}o
ziU02F^reyOhkf9qmiErY{npOuz_{IeZsUV=@X5g8Tv7P6r0|}N-fLRYT}b%7u+d;o
z?U9J_q?pcDJ?D^w&0|gNo|M8&Gy2)n?2&%KN-^q;dc{&g>3nCyQ#|mrr|x=S?t*Ro
z!nOL7eCKOi)MHWQje^*3SjJpMY5s;V00001bW%=J06^y0W&i*Hs!2paR2Ug;z(tY*
zK>z^3npPQC+?{n7{{Jrsf+NXY_1CwQ$+G6ApL{l1*1VQIuKH3$m6TQVSo8quL_}JH
zQqgk}fMpqJt-(1rou@$3R7xrE-V5;$d}P`=2lisK1$?HQ^AA{Se>Pj7oC)vkEHx%>
zcYENym|ANgj^ljQ0bxE$jajcJlYICR0LF_^+8Wd5!>0jP<JIr(aQIui4Y&#2{&+lf
afqTy6_6%|nl<W}z0000<MNUMnLSTaQPub=G

diff --git a/style/Air/img/ext.png b/style/Air/img/ext.png
deleted file mode 100644
index b63b4b7762a7da64d749acf02c76aaa58c496d66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9t50SjL)sZ@&Bx1uB8(+L
ze!&b5&u*jvIa;1Bjv*Yf$qmfU<av5zcz9%aKFRPnN%1HN@-V4Ou*gcV$VfclH#oq+
YkbRD2lZ?NDI#3sbr>mdKI;Vst0A=4BdH?_b

diff --git a/style/Air/img/feed.png b/style/Air/img/feed.png
deleted file mode 100644
index 3704226a673de8aa886bb5d964fd65079347a35c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 439
zcmV;o0Z9IdP)<h;3K|Lk000e1NJLTq000dD000dL0{{R3MKu&o0002SP)t-sOlfiI
zd^h-%Fzc01@r*n6l|A^JKL7v!^o}*{ggNt)IplLN|M&0y@#X4(IOT02>Ut>u@Zj)-
zFZhrs^@=3#fGGUu+4i%0{Jwwx_38SoVC8r*<cduHnKSK`U-;nE?~Fw6d?MdqAK_>z
z{n@nn!;s!%C-tXg`p>H1Z8GD8O!b{i`?hiDb0`1Ind^;F_|Uib+s*Q~lJ>%y@2-pU
ztakE>G5q7p_s6CD$Bx=p9pG|9`OBpHs#f))S^w+S{oTI#q)}0fy#xRN00DGTPE!Ct
z=GbNc005s!L_t(|+6~D=7Q{dl0Knf#Gd2gY#<uQ%smZcl0Zb4Q0%JlHd4#$VmVf4)
zQz}Dh2Acg`c#=e^0)}<!G^R)Hbjmphzir7<V>g#`F)9eUB>Au~Hw?f|{blho(e=zi
zpeWuiisN_4_GSu1s;gJTu9-G3R3NU+s>Ma0ZCTTgx3<Ilu$vv{j}l}md5*I(%i`V)
h05Zl{Af&4O0Dr034rF_``4j*E002ovPDHLkV1hcR;mQC2

diff --git a/style/Air/img/help.png b/style/Air/img/help.png
deleted file mode 100644
index b20fb2d4d04418851ce1209f923838167f1fcf09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 394
zcmV;50d@X~P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001!P)t-sOlfhQ
zy5D1ty<UjA)Z*`Yqt9lNz}@KfYL~>;<n`_H_{G@lzSHN++3LK{=3a=l;p+30wAsPg
z^@gj~Y?Qxooz1z<=C#b?sJ_`-gtTy(#)PHHMRcsX)A7yR@9OgWeW%so?fk9C<fg#m
z=<fE$)#p!pu$#2g<LdI0ug{^m)?|sbc$~<fyxG0Z-m}f^$lmyMhQ2fa0004WQchC<
zK<3zH0001`Nkl<Z7#VHAMH0e500h8U_qYn~&i`KrNx?0Rd7F2ZWeR_*OpVNIgUM>4
zmb*MB&g>LM3*~Z>BwJB&VgVSlTnl`yg>xRj){wGHY7ehdo&z98lv>wz|BxN;0Hj7}
zt&tRz7F+^Id8)OPk}=kY0zeeGj#6vmIIfxofW3#RV3$kWHoo2CE6{`QZ@0dVh6s}b
oy9Um~>G;IY`PvS{@pQ(V4}w?=T>Y+AivR!s07*qoM6N<$f~k<rJ^%m!

diff --git a/style/Air/img/index.html b/style/Air/img/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/Air/img/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/Air/index.html b/style/Air/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/Air/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/Cobalt.css b/style/Cobalt.css
deleted file mode 100644
index 267aa974..00000000
--- a/style/Cobalt.css
+++ /dev/null
@@ -1,1168 +0,0 @@
-/*****************************************************************
-1. INITIAL SETTINGS
-*****************************************************************/
-
-/* Limited Reset
-----------------------------------------------------------------*/
-
-.pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
-.pun h4, .pun h5, .pun pre, .pun blockquote, .pun ul, .pun ol, .pun li, .pun dl,
-.pun dt, .pun dd, .pun th, .pun td, .pun fieldset, .pun img, .pun abbr, .pun cite {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	}
-
-.pun ul, .pun ol {
-	list-style: none
-	}
-
-
-/* Structural Settings
-----------------------------------------------------------------*/
-
-.pun .clearer, .pun .nosize {
-	height: 0;
-	width: 0;
-	line-height: 0;
-	font-size: 0;
-	overflow: hidden
-	}
-
-.pun .clearer, .pun .clearb {
-	clear: both
-	}
-
-.pun .nosize {
-	position: absolute;
-	left: -9999em;
-	text-indent: -9999em;
-	width: 0;
-	}
-
-* html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
-	height: 1px
-	}
-
-.pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
-	min-height: 1px
-	}
-
-.clearl {
-	clear: left;
-	}
-
-/* Hidden Elements
-----------------------------------------------------------------*/
-
-#brdfooter h2, #brdstats h2, #brdstats .conl dt, #brdstats .conr dt,
-#modcontrols dt, #searchlinks dt, div.postright h3, span.closedtext,
-.pun .required strong span {
-	position: absolute;
-	display: block;
-	overflow: hidden;
-	width: 0;
-	left: -9999em;
-	text-indent: -9999em;
-	}
-
-/*****************************************************************
-2. TEXT & CONTENT
-*****************************************************************/
-
-/* Text Defaults
-----------------------------------------------------------------*/
-
-.pun {
-	font: 68.75%/1.4545em Verdana, Helvetica, Arial, sans-serif;
-	line-height: normal;
-	}
-
-.pun table, .pun td, .pun th, .pun input, .pun select, .pun optgroup, .pun textarea, .pun samp, .pun legend {
-	font-size: 1em;
-	font-family: verdana, helvetica, arial, sans-serif;
-	}
-
-.pun pre, .pun code {
-	font-size: 1.182em;
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace
-	}
-
-.pun pre code {
-	font-size: 1em;
-	}
-
-.pun strong {
-	font-weight: bold;
-	}
-
-.pun em {
-	font-style: italic;
-	}
-
-
-/* Content Defaults
-----------------------------------------------------------------*/
-
-.pun p, .pun ul, .pun ol, .pun dl {
-	font-size: 1em;
-	padding: 3px 0;
-	}
-
-.pun h2 {
-	font-size: 1em;
-	font-weight: normal;
-	padding: 4px 6px;
-	}
-
-.pun h3 {
-	font-size: 1.091em;
-	padding: 3px 0;
-	}
-
-.pun table p, .pun table h3 {
-	padding: 0;
-	}
-
-.pun span.warntext, .pun p.warntext {
-	font-weight: bold
-	}
-
-/* User Content (Announcements, Rules, Posts)
-----------------------------------------------------------------*/
-
-.pun .usercontent p, .pun .postmsg p {
-	padding: 0.75em 0
-	}
-
-.pun .usercontent ul, .pun .postmsg ul {
-	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: disc
-	}
-
-.pun .usercontent ol, .pun .postmsg ol {
-	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: decimal
-	}
-
-.pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha
-	}
-
-.pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
-	padding: 0.25em 1em 0.75em 2.5em
-	}
-
-.pun .usercontent li p, .pun .postmsg li p {
-	padding: 0
-	}
-
-.pun .usercontent h1 {
-	font-size: 1.4em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h2 {
-	font-size: 1.2em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h3 {
-	font-size: 1.1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
-	font-size: 1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .quotebox cite {
-	font-weight: bold;
-	font-style: normal;
-	padding: 0.75em 0.75em 0 0.75em
-	}
-
-.pun span.bbu {
-	text-decoration: underline
-	}
-
-.pun span.bbs, .pun del {
-	text-decoration: line-through;
-	}
-
-.pun .postmsg ins, #punhelp samp ins {
-	text-decoration: none;
-	}
-
-.pun div.postmsg h5, #punhelp h5 {
-	font-size: 1.1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0;
-	}
-
-
-/*****************************************************************
-3. COMMON STYLES
-*****************************************************************/
-
-/* Page Layout
-----------------------------------------------------------------*/
-
-html, body {
-	margin: 0;
-	padding: 0
-	}
-
-.pun {
-	max-width: 1070px;
-	width: 95%;
-	margin: 0 auto;
-	padding: 12px 20px;
-	}
-
-#punredirect, #punmaint, #puninstall, #pundb_update {
-	margin: 50px 20% 12px 20%
-	}
-
-
-/* Vertical Element Spacing
-----------------------------------------------------------------*/
-
-#brdheader {
-	margin: 0 0 12px 0;
-	}
-
-#brdtitle p {
-	padding-top: 0px
-	}
-
-#announce, #brdstats {
-	margin: 12px 0 12px 0;
-	}
-
-.pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
-	margin-bottom: 12px
-	}
-
-#punindex .blocktable, .pun .blockpost {
-	margin-bottom: 6px
-	}
-
-#postreview .blockpost {
-	margin-bottom: -1px;
-	}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-bottom: 0px
-	}
-
-.pun .linkst, .pun .linksb {
-	margin-top: -12px
-	}
-
-.pun .postlinksb {
-	margin-top: -6px
-	}
-
-
-/* External Borders
-----------------------------------------------------------------*/
-
-.pun .box {
-	border-style: solid;
-	border-width: 1px;
-	}
-
-#brdheader .box {
-	border-top-width: 4px;
-	}
-
-/* Default Internal Spacing
-----------------------------------------------------------------*/
-
-.pun .block .inbox, .pun .blockmenu .inbox {
-	padding: 3px 6px
-	}
-
-/*****************************************************************
-4. COMMON BOARD ELEMENTS
-*****************************************************************/
-
-/* Board Header
-----------------------------------------------------------------*/
-
-#brdtitle h1 {
-	font-size: 1.4em;
-	font-weight: bold;
-	padding: 3px 0 0 0;
-	}
-
-#brdmenu li {
-	display: inline;
-	margin-right: 12px;
-	}
-
-#brdmenu a:link, #brdmenu a:visited {
-	text-decoration: none
-	}
-
-#brdmenu a:hover, #brdmenu a:active {
-	text-decoration: underline
-	}
-
-#brdwelcome .conl {
-	float: left;
-	}
-
-#brdwelcome .conr {
-	float: right;
-	text-align: right;
-	}
-
-/* Breadcrumbs and Post Links
-----------------------------------------------------------------*/
-
-.pun .linkst {
-	padding: 8px 6px 3px 6px
-	}
-
-.pun .linksb, .pun .postlinksb {
-	padding: 3px 6px 8px 6px
-	}
-
-.pun .crumbs {
-	clear: both;
-	width: 100%;
-	overflow: hidden;
-	}
-
-.pun .crumbs li {
-	display: inline;
-	white-space: nowrap;
-	font-weight: bold;
-	}
-
-.pun .pagelink {
-	float: left;
-	white-space: nowrap;
-	}
-
-.pun .postlink {
-	font-weight: bold;
-	white-space: nowrap;
-	}
-
-.pun .postlink, .pun .modbuttons {
-	float: right;
-	text-align: right;
-	}
-
-.pun .modbuttons {
-	padding: 1px 0;
-	white-space: nowrap;
-	}
-
-.pun .modbuttons input {
-	margin-left: 6px;
-	}
-
-.pun .postlink a:link, .pun .postlink a:visited {
-	text-decoration: none
-	}
-
-.pun .postlink a:hover, .pun .postlink a:active {
-	text-decoration: underline;
-	}
-
-#punindex .subscribelink {
-	margin-top: 6px;
-	}
-
-/* Board Footer
-----------------------------------------------------------------*/
-
-#brdfooter .conl {
-	float: left;
-	}
-
-#brdfooter .conr {
-	float: right;
-	text-align: right;
-	}
-
-#brdfooter #modcontrols {
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	text-align: center;
-	}
-
-#brdfooter #modcontrols dd {
-	display: inline;
-	margin:0 6px;
-	}
-
-
-/* Board Stats
-----------------------------------------------------------------*/
-
-#brdstats .conl {
-	float: left;
-	}
-
-#brdstats .conr {
-	float: right;
-	text-align: right;
-	}
-
-#onlinelist dd, #onlinelist dt {
-	display: inline;
-	}
-
-
-/*****************************************************************
-5. MAIN TABLES
-*****************************************************************/
-
-.pun table {
-	width: 100%;
-	border-collapse: collapse;
-	border-spacing: 0;
-	empty-cells: show;
-	}
-
-.pun .blocktable table {
-	table-layout: fixed;
-	}
-
-.pun td, .pun th {
-	padding: 4px 6px;
-	text-align: left;
-	font-weight: normal;
-	}
-
-.pun td, .pun th {
-	border-style: solid none none solid;
-	border-width: 1px;
-	}
-
-.pun .tcl {
-	border-left: 0;
-	width: auto;
-	}
-
-.pun .tc2, .pun .tc3, .pun .tcmod {
-	width: 10%;
-	text-align: center;
-	padding: 4px 0;
-	}
-
-.pun .tcr {
-	width: 30%;
-	}
-
-.pun .tcl h3 {
-	font-size: 1.091em;
-	font-weight: bold;
-	}
-
-.pun .tcl h3 span.newtext {
-	font-size: 0.917em;
-	}
-
-.pun .tcl span.newtext, .pun .tcl span.pagestext {
-	white-space: nowrap;
-	font-weight: normal;
-	}
-
-.pun td span.byuser {
-	white-space: nowrap;
-	}
-
-.pun .tcl p {
-	padding: 5px 0 0 0
-	}
-
-#punsearch #vf .tc2 {
-	width: 18%;
-	text-align: left;
-	padding: 4px 6px;
-	}
-
-#users1 .tcr {
-	width: 25%
-	}
-
-#users1 .tc2 {
-	width: 25%;
-	text-align: left;
-	padding: 4px 6px;
-	}
-
-#debug .tcl {
-	width: 10%
-	}
-
-#debug .tcr {
-	width: 90%;
-	white-space: normal
-	}
-
-#punindex .tcr .byuser {
-	display: block
-	}
-
-.pun .blocktable .tclcon {
-	padding: 0 11px 0 12px;
-	overflow: hidden;
-	min-height: 1px;
-	position: relative;
-	}
-
-.pun .blocktable .tclcon div {
-	width: 100%;
-	overflow: hidden;
-	}
-
-.pun .icon {
-	margin: 0.1em 0 0 0.2em;
-	border-width: 0.6em;
-	border-style: solid;
-	height: 0;
-	width: 0;
-	overflow: hidden;
-	float: left;
-	}
-
-.pun .icon div {
-	position: absolute;
-	left: -9999em;
-	text-indent: -9999em;
-	height: 0;
-	}
-
-.pun .iposted .ipost {
-	position: absolute;
-	left: 0;
-	font-weight: bold;
-	width: 8px;
-	padding-left: 4px;
-	text-align: center;
-	top: 0;
-	}
-
-/*****************************************************************
-6. MAIN FORMS
-*****************************************************************/
-
-.pun .blockform form, .pun .fakeform {
-	PADDING: 20px 20px 15px 20px
-	}
-
-.pun .forminfo {
-	margin-bottom: 12px;
-	padding: 9px 10px;
-	border-style: solid;
-	border-width: 1px;
-	}
-
-.pun .forminfo h3 {
-	font-weight: bold;
-	}
-
-.pun .inform {
-	padding-bottom: 12px
-	}
-
-.pun fieldset {
-	padding: 0px 12px 0px 12px;
-	border-style: solid;
-	border-width: 1px
-	}
-
-.pun legend {
-	padding: 0px 6px
-	}
-
-.pun .infldset {
-	padding: 9px 0px 12px 0
-	}
-
-.pun label {
-	display: block;
-	padding: 3px 0
-	}
-
-.pun label.conl {
-	float: left;
-	overflow: visible;
-	margin-right: 10px
-	}
-
-.pun fieldset .rbox br {
-	display: none;
-	}
-
-.pun fieldset .rbox label {
-	padding: 3px 0 3px 25px;
-	position: relative;
-	vertical-align: middle;
-	}
-
-.pun fieldset .rbox input {
-	margin: 0 9px 0 -25px;
-	padding: 0;
-	width: 16px;
-	position: relative;
-	vertical-align: middle;
-	}
-
-.pun .txtarea {
-	width: 75%
-	}
-
-.pun .txtarea textarea, .pun input.longinput {
-	width: 100%
-	}
-
-.pun .bblinks {
-	padding-bottom: 10px;
-	padding-left: 4px
-	}
-
-.pun .bblinks li {
-	display: inline;
-	padding-right: 20px
-	}
-
-.pun .blockform .buttons {
-	padding-left: 12px;
-	}
-
-.pun .blockform .buttons input {
-	margin-right: 8px;
-	}
-
-#posterror ul {
-	list-style: square;
-	padding: 3px 0 3px 24px;
-	}
-
-.pun .deletemsg {
-	border-style: solid;
-	border-width: 1px;
-	padding: 6px 15px;
-	}
-
-.pun p.actions span {
-	margin-right: 12px;
-	}
-
-.pun .multiselect {
-	float: left;
-	padding-bottom: 7px;
-	}
-
-.pun .checklist {
-	border-width: 1px;
-	border-style: solid;
-	max-height: 9em;
-	width: 20em;
-	overflow: auto;
-	padding: 0.3em 0.5em;
-	margin: 0.25em 16px 0 0.15em;
-	}
-
-.pun .checklist fieldset {
-	border: 0;
-	padding: 0;
-	}
-
-.pun .checklist legend {
-	padding: 0;
-	}
-
-.pun .checklist legend span {
-	width: auto;
-	max-width: 25em;
-	}
-
-/*****************************************************************
-7. PROFILES AND ADMIN
-*****************************************************************/
-
-.pun .block2col {
-	padding-bottom: 1px
-	}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 14em
-	}
-
-.pun .blockmenu {
-	float:left;
-	width: 13em
-	}
-
-.pun .blockmenu li {
-	padding: 3px 0;
-	font-weight: bold;
-	}
-
-.pun .blockmenu a:link, .pun .blockmenu a:visited {
-	text-decoration: none
-	}
-
-.pun .blockmenu a:hover, .pun .blockmenu a:active {
-	text-decoration: underline
-	}
-
-#viewprofile dl {
-	float: left;
-	width: 100%;
-	overflow: hidden
-	}
-
-#viewprofile dd {
-	margin-left: 14em;
-	padding: 3px;
-	}
-
-#viewprofile dt {
-	float: left;
-	width: 13em;
-	margin: 3px 0;
-	}
-
-#profileavatar img {
-	float: right;
-	margin-left: 1em
-	}
-
-#adintro ul {
-	list-style-type: disc;
-	margin-left: 8px;
-	padding-left: 16px;
-	}
-
-/*****************************************************************
-8. MAIN POSTS
-*****************************************************************/
-
-.pun .blockpost h2 a:link, .pun .blockpost h2 a:visited {
-	text-decoration: none;
-	}
-
-.pun .blockpost h2 a:hover, .pun .blockpost h2 a:active {
-	text-decoration: underline;
-	}
-
-.pun .blockpost h2 .conr {
-	float: right;
-	text-align: right;
-	}
-
-#punsearch .blockpost h2 span {
-	white-space: nowrap;
-	}
-
-.pun .blockpost .box {
-	overflow: hidden;
-	}
-
-.pun .postleft, .pun .postfootleft {
-	float:left;
-	width: 18em;
-	position: relative;
-	overflow: hidden;
-	}
-
-.pun .postleft dl {
-	padding: 6px;
-	}
-
-.pun .postleft .usercontacts, .pun .postleft .icon {
-	margin-top: 6px
-	}
-
-.pun .postleft .postavatar, .pun .postleft .usertitle {
-	margin-bottom: 6px;
-	display: block;
-	}
-
-.pun .blockpost dt {
-	font-size: 1.091em;
-	font-weight: bold;
-	}
-
-.pun .blockpost dt a:link, .pun .blockpost dt a:visited {
-	text-decoration: none;
-	}
-
-.pun .blockpost dt a:hover, .pun .blockpost dt a:active {
-	text-decoration: underline;
-	}
-
-.pun .postright, .pun .postfootright {
-	border-left-width: 18em;
-	border-left-style: solid
-	}
-
-#postpreview .postright {
-	border-left: 0
-	}
-
-.pun .postright {
-	padding: 0 6px;
-	}
-
-.pun .postfootright, .pun .multidelete {
-	text-align: right
-	}
-
-.pun .postmsg {
-	width:98%;
-	overflow: hidden;
-	padding-bottom: 6px;
-	word-wrap: break-word;
-	}
-
-.pun .postfootright ul, .pun .postfootright div, .pun .postfootright p,
-.pun .postfootleft p {
-	padding: 10px 6px 5px 6px;
-	}
-
-.pun .postfootright li {
-	display: inline;
-	}
-
-.pun .postfootright li:before {
-	content: " | ";
-	}
-
-.pun .postfootright li:first-child:before {
-	content: "";
-	}
-
-.pun .postfootright a:link, .pun .postfootright a:visited {
-	text-decoration: none
-	}
-
-.pun .postfootright a:hover, .pun .postfootright a:active {
-	text-decoration: underline
-	}
-
-.pun .codebox {
-	border-style: solid;
-	border-width: 1px;
-	margin: 0.75em 1em;
-	padding: 0;
-	}
-
-.pun .quotebox {
-	border-style: solid;
-	border-width: 1px;
-	margin: 0.75em 1em;
-	padding: 0 0.75em;
-	}
-
-.pun .quotebox cite {
-	display: block;
-	padding: 0.75em 0 0 0;
-	}
-
-.pun .quotebox blockquote {
-	width: 100%;
-	overflow: hidden
-	}
-
-.pun .codebox pre {
-	overflow: auto;
-	width: 100%;
-	overflow-y:hidden
-	}
-
-* html .pun .codebox pre {
-	padding-bottom: 10px;
-	}
-
-*+html .pun .codebox pre {
-	padding-bottom: 10px
-	}
-
-.pun .codebox pre code {
-	display: block;
-	padding: 0.75em;
-	}
-
-.pun .codebox pre.vscroll {
-	height: 32em;
-	overflow: auto;
-	overflow-y: auto
-	}
-
-.pun .postmsg img {
-	vertical-align: bottom;
-	}
-
-.pun .postsignature hr {
-	margin-left: 0px;
-	width: 200px;
-	text-align: left;
-	height: 1px;
-	border:none
-	}
-
-.pun .postmsg .postimg img {
-	max-width: 98%;
-	vertical-align: middle;
-	margin: 7px 0.5em 7px 0;
-	}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-style: solid;
-	border-width: 2px;
-	}
-
-.pun .blockpost label {
-	padding: 3px 6px;
-	border-style: solid;
-	border-width: 1px;
-	vertical-align: middle;
-	display: inline-block;
-	}
-
-.pun .blockpost label * {
-	vertical-align: middle;
-	margin: 0;
-	padding: 0;
-	}
-
-/****************************************************************/
-/* 9. HELP FILES AND MISC. */
-/****************************************************************/
-
-#punhelp h2 {
-	margin-top: 12px
-	}
-
-#punhelp div.box {
-	padding: 10px
-	}
-
-#debugtime {
-	margin-top: -12px;
-	text-align: center;
-	}
-
-#brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
-	line-height: 1.4em
-	}
-
-#announce div.inbox div {
-	padding: 3px 0
-	}
-
-/*****************************************************************
-COLOUR SCHEME
-*****************************************************************/
-
-/* Background / Text
-----------------------------------------------------------------*/
-
-body {
-	background: #2a2a2a;
-	color: #d4d4d4
-	}
-
-.pun {
-	color: #d4d4d4
-	}
-
-.pun .box, #adminconsole fieldset th {
-	background-color: #383838
-	}
-
-.pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
-#brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
-	background-color: #424242
-	}
-
-.pun h2, #brdmenu {
-	background-color: #565656;
-	color: #d4d4d4
-	}
-
-.pun th {
-	background-color: #484848
-	}
-
-.pun legend {
-	color: #60a0dc
-	}
-
-.pun .blockmenu li.isactive a, #posterror li strong {
-	color: #d4d4d4
-	}
-
-.pun .usercontent * {
-	background: transparent;
-	color: #d4d4d4
-	}
-
-.pun textarea, .pun input, .pun select {
-	background-color: #2a2a2a;
-	color: #d4d4d4
-	}
-
-.pun .multiselect, .pun .checklist {
-	color: #D4D4D4;
-	}
-
-.pun .checklist {
-	border-color: #666;
-	}
-
-/* Posts
-----------------------------------------------------------------*/
-
-.pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
-	background-color: #383838
-	}
-
-.pun .postright, .pun .postfootright {
-	border-left-color: #424242
-	}
-
-.pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
-	background-color: #424242
-	}
-
-.pun .blockpost h2 {
-	background-color: #565656
-	}
-
-.pun .blockpost h2 span.conr {
-	color: #a19e96
-	}
-
-.pun .postmsg ins, #punhelp samp ins {
-	background-color: #ff0;
-	}
-
-.pun hr {
-	background-color: #606060;
-	color: #606060
-	}
-
-/* Borders
-----------------------------------------------------------------*/
-
-.pun .box {
-	border-color:#565656
-	}
-
-.pun td, #brdfooter #modcontrols {
-	border-color: #565656
-	}
-
-.pun th {
-	border-color: #484848
-	}
-
-.pun fieldset {
-	border-color: #606060
-	}
-
-#adminconsole td, #adminconsole th {
-	border-color: #383838
-	}
-
-.pun .quotebox, .pun .codebox, .pun .forminfo,
-.pun .blockpost label, .pun .deletemsg {
-	border-color: #606060
-	}
-
-/* Links
-----------------------------------------------------------------*/
-
-.pun a:link, .pun a:visited {
-	color: #60a0dc
-	}
-
-.pun a:hover, .pun a:active, .pun a:focus {
-	color: #80d6ff
-	}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-color: #60a0dc;
-	}
-
-.pun .postmsg .postimg a:hover img, .pun .postmsg .postimg a:active img, .pun .postmsg .postimg a:focus img {
-	border-color: #80d6ff;
-	}
-
-.pun h2 a:link, .pun h2 a:visited,
-#brdmenu a:link, #brdmenu a:visited {
-	color: #d4d4d4
-	}
-
-.pun h2 a:hover, .pun h2 a:active,
-#brdmenu a:hover, #brdmenu a:active {
-	color: #d4d4d4
-	}
-
-.pun .postreport a:link, .pun .postreport a:visited,
-.pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
-	color: #888
-	}
-
-.pun .postreport a:hover, .pun .postreport a:active,
-.pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
-	color: #aaa
-	}
-
-.pun .maintenancelink a:link, .pun .maintenancelink a:visited {
-	color: #ff4000
-	}
-
-.pun .maintenancelink a:hover, .pun .maintenancelink a:active {
-	color: #ff5010
-	}
-
-/* Status Indicators
-----------------------------------------------------------------*/
-
-.pun .icon {
-	border-color: #484848 #404040 #3c3c3c #444444
-	}
-
-.pun .iredirect .icon {
-	border-color: #383838 #383838 #383838 #383838
-	}
-
-.pun .inew .icon {
-	border-color: #5496d8 #4b85c0 #4377ac #4f8dcb
-	}
-
-
-/* Alert box
-----------------------------------------------------------------*/
-
-#msgflash {
-    opacity: 0;
-    position: fixed;
-    top: 40px;
-    right: 40px;
-    min-width: 230px;
-    max-width: 400px;
-	z-index: 1000;
-}
-#msgflash h2 {
-	color: #60a0dc;
-	font-weight: bold;
-}
diff --git a/style/Earth.css b/style/Earth.css
deleted file mode 100644
index 6379b4f7..00000000
--- a/style/Earth.css
+++ /dev/null
@@ -1,1664 +0,0 @@
-/*****************************************************************
-1. INITIAL SETTINGS
-*****************************************************************/
-
-/* Limited Reset
-----------------------------------------------------------------*/
-
-html, body, .pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3, .pun h4, .pun h5, .pun pre, .pun blockquote,
-.pun ul, .pun ol, .pun li, .pun dl, .pun dt, .pun dd, .pun th, .pun td, .pun fieldset, .pun legend .pun img,
-.pun abbr, .pun cite {
-	border: 0;
-	font-style: normal;
-	font-weight: normal;
-	margin: 0;
-	padding: 0;
-}
-
-.pun ul, .pun ol {
-	list-style: none;
-}
-
-.pun select {
-	padding-bottom: 1px;
-	padding-top: 1px;
-	padding-right: 1px;
-}
-
-/* Content Defaults
-----------------------------------------------------------------*/
-
-.pun {
-	font: 81.25%/1.462em Arial, Helvetica, sans-serif;
-}
-
-.pun table, .pun td, .pun th, .pun input, .pun select, .pun optgroup, .pun textarea, .pun legend {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 1em;
-}
-
-.pun pre, .pun code {
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace;
-	font-size: 1em;
-}
-
-.pun pre code {
-	font-size: 1em;
-}
-
-.pun table {
-	border-collapse: collapse;
-	border-spacing: 0;
-	border: 0;
-	empty-cells: show;
-	width: 100%;
-}
-
-.pun h1 {
-	font:2.154em/1em "Trebuchet MS", Arial, Helvetica, sans-serif;
-	padding: 7px 0;
-}
-
-.pun h2, .pun .hd h2 {
-	font: 1.462em/1em "Trebuchet MS", Arial, Helvetica, sans-serif;
-	padding: 7px 0;
-}
-
-.pun h3 {
-	font-size: 1.154em;
-	line-height: 1.267em;
-	padding: 7px 0;
-}
-
-.pun h4 {
-	font-size: 1.077em;
-	font-weight: bold;
-	padding: 7px 0;
-}
-
-.pun h5, .pun h6 {
-	font-size: 1em;
-	font-weight: bold;
-	padding: 7px 0;
-}
-
-.pun p, .pun ul, .pun ol, .pun dl, .pun th, .pun td, .pun legend {
-	padding: 7px 0;
-}
-
-.pun strong, .pun th, .pun span.warntext, .pun p.warntext {
-	font-weight: bold;
-}
-
-.pun em {
-	font-style: italic;
-}
-
-.pun a, .pun a:link, .pun a:visited {
-	text-decoration: none;
-}
-
-.pun a:hover, .pun a:active, .pun a:focus {
-	text-decoration: underline;
-}
-
-.pun .actions span {
-	padding-left: 16px;
-	padding-right: 8px;
-	background: url(Earth/img/bull.png) center left no-repeat;
-	display: inline-block;
-	line-height: normal;
-}
-
-/* Hidden Elements
-----------------------------------------------------------------*/
-
-#brdfooter h2, #brdstats h2, #debug h2, #brdstats .conl dt, #brdstats .conr dt, #modcontrols dt,
-#searchlinks dt, div.postright h3, .pun .subscribelink span, #announce .hd, #reportform h2, #punmoderate #vf h2,
-#punviewforum #vf h2, .pun .required strong span, .pun .icon div {
-	display: block;
-	overflow: hidden;
-	position: absolute;
-	text-indent: -9999em;
-	width: 0;
-}
-
-/* Generic Float Clear
-----------------------------------------------------------------*/
-
-.pun .inbox, .pun #brdmain, .pun .crumbs, .pun .pagepost, .pun .block2col {
-	min-height: 1px;
-}
-
-* html .pun .inbox, * html .pun #brdmain, * html .pun .infldset, * html .pun .crumbs, * html .pun .pagepost, * html .pun .block2col {
-	display: inline-block;
-}
-
-* html .pun .inbox, * html .pun #bdrdmain, * html .pun .infldset, * html .pun .crumbs, * html .pun .pagepost, * html .pun .block2col {
-	display: block;
-}
-
-.pun .inbox:after, .pun #brdmain:after, .pun .crumbs:after, .pun .pagepost:after, .pun .block2col:after {
-	content: " ";
-	display: block;
-	height: 0;
-	font-size: 0;
-	clear: both;
-	visibility: hidden;
-}
-
-.pun .block2col .inbox:after {
-	content: none;
-	clear: none;
-}
-
-.clearl {
-	clear: left;
-}
-
-/*****************************************************************
-2. COMMON STYLES
-*****************************************************************/
-
-/* Page Layout
-----------------------------------------------------------------*/
-
-.pun {
-	max-width: 1070px;
-	margin: 0 auto;
-	padding: 30px 40px;
-}
-
-#punredirect, #punmaint {
-	padding: 60px 20% 12px 20%;
-}
-
-#puninstall, #pundb_update {
-	padding: 20px 10%;
-}
-
-.pun .punwrap {
-	border: 1px solid;
-	border-radius: 10px;
-	padding: 18px;
-}
-
-#punredirect h2, #punmaint h2 {
-	border-bottom-style: dotted;
-	border-bottom-width: 1px;
-	margin-bottom: 3px;
-}
-
-/* Section Spacing and Borders
-----------------------------------------------------------------*/
-
-#brdmain {
-	border-style: solid none;
-	border-width: 2px 0;
-	margin-bottom: 12px;
-	padding: 12px 0;
-}
-
-#punindex #brdmain {
-	padding-top: 24px;
-}
-
-#punredirect #brdmain, #punmaint #brdmain {
-	border: 0;
-	margin: 0;
-	padding: 0;
-}
-
-#brdstats {
-	border-style: solid none none none;
-	border-width: 2px 0 0 0;
-	margin-top: 24px;
-	padding-top: 12px;
-}
-
-#quickpost {
-	border-style: solid none none none;
-	border-width: 2px 0 0 0;
-	margin-top: 12px;
-	padding-top: 12px;
-}
-
-#announce {
-	border-style: solid none none none;
-	border-width: 2px 0 0 0;
-	padding-top: 3px;
-}
-
-/*****************************************************************
-3. COMMON BOARD ELEMENTS
-*****************************************************************/
-
-/* Logo, Description and Main Menu
-----------------------------------------------------------------*/
-
-#brdtitle h1 {
-	padding: 0 0 10px 0;
-}
-
-#brddesc {
-	border-top-style: dotted;
-	border-top-width: 1px;
-	padding: 10px 0;
-}
-
-#brddesc p {
-	padding: 0;
-}
-
-#brdmenu ul {
-	padding: 0;
-}
-
-#brdmenu li {
-	float: left;
-}
-
-#brdmenu a:link, #brdmenu a:visited {
-	border-right-style: solid;
-	border-width: 1px;
-	display: block;
-	min-width: 60px;
-	padding: 12px 16px 6px 8px;
-	white-space: nowrap;
-}
-
-#brdmenu a:hover, #brmenu a:active, #brdmenu a:focus {
-	text-decoration: none;
-}
-
-/* Welcome Box
-----------------------------------------------------------------*/
-
-#brdwelcome {
-	padding: 10px 0;
-}
-
-#brdwelcome .conl, #brdwelcome .conr, #brdwelcome p, #brdwelcome li {
-	display: inline;
-	padding: 0;
-}
-
-#brdwelcome .conl {
-  float: left;
-}
-
-#brdwelcome .conr {
-  float: right;
-}
-
-#brdwelcome li span {
-	background: url(Earth/img/bull.png) center left no-repeat;
-	padding-left: 18px;
-	margin-right: 3px;
-	display: inline-block;
-	line-height: normal;
-	white-space: nowrap;
-}
-
-#brdwelcome .conl li:first-child span {
-	padding-left: 0;
-	background: none;
-}
-
-/* Stats
-----------------------------------------------------------------*/
-
-#brdstats .conl {
-	float: left;
-}
-
-#brdstats .conr {
-	float: right;
-	text-align: right;
-}
-
-#brdstats #onlinelist {
-	border-top-style: dotted;
-	border-top-width: 1px;
-	clear: both;
-}
-
-#brdstats #onlinelist dt, #brdstats #onlinelist dd {
-	display: inline;
-}
-
-/* Footer
-----------------------------------------------------------------*/
-
-.pun #modcontrols {
-	border-style: none none dotted none;
-	border-width: 0 0 1px 0;
-	margin-bottom: 4px;
-	text-align: center;
-	width: 100%;
-}
-
-.pun #modcontrols dd {
-	display: inline;
-}
-
-.pun #brdfooter #modcontrols dd span {
-	background: url(Earth/img/bull.png) center left no-repeat;
-	display: inline-block;
-	line-height: normal;
-	padding-left: 18px;
-	white-space: nowrap;
-}
-
-.pun #brdfooter .conl {
-	float: left;
-}
-
-.pun #brdfooter .conr {
-	text-align: right;
-	float: right;
-}
-
-.pun #brdfooter #poweredby a {
-	font-size: 1.077em;
-	font-weight: bold;
-}
-
-.pun #brdfooter #qjump {
-	padding-top: 5px;
-}
-
-.pun #brdfooter #qjump * {
-	white-space: nowrap;
-}
-
-.pun #brdfooter #searchlinks dd span {
-	background: url(Earth/img/bull.png) center left no-repeat;
-	display: inline-block;
-	line-height: normal;
-	padding-left: 18px;
-	white-space: nowrap;
-}
-
-.pun #brdfooter #feedlinks {
-	padding-bottom: 0;
-}
-
-.pun #brdfooter #feedlinks span {
-	background: url(Earth/img/feed.png) center left no-repeat;
-	display: inline-block;
-	padding-left: 18px;
-	white-space: nowrap;
-}
-
-.pun #debugtime {
-	border-style: dotted none none none;
-	border-width: 1px 0 0 0;
-	margin-top: 7px;
-	text-align: center;
-}
-
-/* Breadcrumbs, Postlink, Pagination
-----------------------------------------------------------------*/
-
-.pun .linkst .inbox, .pun .linksb .inbox, .pun .postlinksb .inbox {
-	overflow: hidden;
-}
-
-.pun .linksb, .pun .postlinksb, .pun .linkst, .pun .crumbs {
-	clear: both;
-	position: relative;
-}
-
-.pun .linkst .crumbs {
-	font-family: "Trebuchet MS", Helvetica, Arial, sans-serif;
-	font-size: 1.462em;
-	line-height: 1.211em;
-	padding: 7px 0;
-}
-
-.pun .linksb .crumbs, .pun .postlinksb .crumbs {
-	font-family: "Trebuchet MS", Helvetica, Arial, sans-serif;
-	font-size: 1.154em;
-}
-
-.pun .linkst .crumbsplus .pagepost {
-	border-top-style: dotted;
-	border-top-width: 1px;
-}
-
-.pun .linksb .crumbsplus .pagepost, .pun .postlinksb .crumbsplus .pagepost {
-	border-bottom-style: dotted;
-	border-bottom-width: 1px;
-}
-
-.pun .postlinksb .crumbs {
-	margin-right: 11em;
-}
-
-.pun .crumbs li {
-	float: left;
-	padding-right: 0.4em;
-	white-space: nowrap;
-}
-
-.pun .crumbs li strong {
-	font-weight: normal;
-}
-
-.pun .pagelink {
-	float: left;
-	white-space: nowrap;
-}
-
-.pun .pagelink strong, .pun .pagelink a, .pun .pagelink span.spacer {
-	border-style: none none none solid;
-	border-width: 0 0 0 1px;
-	display: inline-block;
-	padding: 0 12px 0 10px;
-	margin-right: -6px;
-}
-
-.pun .pagelink .item1 {
-	border: 0;
-}
-
-.pun .pagelink .pages-label {
-	display: inline-block;
-}
-
-.pun .postlink {
-	float: right;
-	font-weight: bold;
-	text-align: right;
-}
-
-.pun .modbuttons {
-	float: right;
-	padding: 5px 0 3px 0;
-}
-
-.pun .modbuttons input {
-	margin-left: 8px;
-}
-
-.pun .subscribelink {
-	position: absolute;
-	right: 0;
-	text-align: right;
-	top: 33px;
-}
-
-#punindex .subscribelink {
-	top: 0px;
-}
-
-#punindex .linksb {
-	height: 12px;
-}
-
-/*****************************************************************
-4. MAIN TABLES
-*****************************************************************/
-
-.pun #brdmain .blocktable {
-	position: relative;
-}
-
-#punindex #brdmain .blocktable h2, #punsearch #vf h2 {
-	font: 1em/1.462em Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	margin: 1px 1px 0 1px;
-	padding-left: 8px;
-	position: absolute;
-	left: 0;
-	white-space: nowrap;
-	z-index: 100;
-}
-
-#punindex .blocktable th.tcl, #punsearch #vf th.tcl {
-	font-size: 0;
-	text-indent: -9999em;
-}
-
-.pun .blocktable .box {
-	border-style: solid;
-	border-width: 1px;
-	margin-bottom: -1px;
-	overflow: hidden;
-	position: relative;
-}
-
-* html .pun .blocktable .box {
-	display: inline-block;
-}
-
-.pun .blocktable table {
-	table-layout: fixed;
-	margin-bottom: -1px;
-}
-
-.pun .blocktable th {
-	padding: 7px 8px;
-	border-style: none none solid none;
-	border-width: 1px;
-	text-align: left;
-}
-
-.pun .blocktable td {
-	padding: 7px 8px;
-	line-height: 1.3077em;
-	border-style: none none solid none;
-	border-width: 1px;
-	text-align: left;
-}
-
-.pun .blocktable h3 {
-	font-size: 1.077em;
-	font-weight: bold;
-	padding: 0;
-}
-
-.pun .blocktable p {
-	padding: 0;
-}
-
-.pun .blocktable .tcl p {
-	padding: 5px 0 0 0;
-}
-
-.pun .blocktable .tcl {
-	width: auto;
-}
-
-.pun .blocktable .tc2, .pun .blocktable .tc3, .pun .blocktable .tcmod {
-	padding-left: 0;
-	padding-right: 0;
-	text-align: center;
-	width: 11%;
-}
-
-.pun .blocktable .tcr {
-	width: 30%;
-}
-
-.pun .blocktable td .newtext, .pun .blocktable td .pagestext, .pun .blocktable td .byuser {
-	white-space: nowrap;
-}
-
-.pun .blocktable .tcl h3 span.newtext {
-	font-size: 0.929em;
-	font-weight: normal;
-}
-
-.pun #vf td.tcl span.stickytext, .pun #vf td.tcl span.closedtext {
-	font-size: 1em;
-	font-weight: bold;
-}
-
-#punsearch #vf .tc2 {
-	padding-left: 8px;
-	padding-right: 8px;
-	text-align: left;
-	width: 18%;
-}
-
-#users1 .tcr {
-	width: 25%;
-}
-
-#users1 .tc2 {
-	padding-left: 8px;
-	padding-right: 8px;
-	text-align: left;
-	width: 25%;
-}
-
-#debug {
-	margin-top: 12px;
-}
-
-#debug .tcl {
-	width: 10%;
-}
-
-#punredirect #debug .tcl, #punmaint #debug .tcl {
-	width: 20%;
-}
-
-#debug .tcr {
-	width: 90%;
-	white-space: normal
-}
-
-#punindex .tcr .byuser {
-	display: block
-}
-
-#punindex td.tc2, #punindex td.tc3, #punindex td.tcr, .pun #vf td.tc2, .pun #vf td.tc3,
-.pun #vf td.tcr, #punindex td.tcl div.forumdesc, .pun #vf td.tcl span {
-	font-size: 0.923em;
-}
-
-.pun #vf td.tcl a {
-	font-weight: bold;
-}
-
-.pun #vf td.tcl span a {
-	font-weight: normal;
-}
-
-.pun .blocktable .tclcon {
-	min-height: 1px;
-	overflow: hidden;
-	padding: 0 11px 0 12px;
-	position: relative;
-}
-
-.pun .blocktable .tclcon div {
-	width: 100%;
-	overflow: hidden;
-}
-
-.pun .icon {
-	border-style: solid;
-	border-width: 8px;
-	float: left;
-	height: 0;
-	overflow: hidden;
-	width: 0;
-}
-
-.pun .iposted .ipost {
-	font-weight: bold;
-	left: 0;
-	padding-left: 4px;
-	position: absolute;
-	text-align: center;
-	top: 0;
-	width: 8px;
-}
-
-/*****************************************************************
-MAIN POSTS
-*****************************************************************/
-
-/* Structure
-----------------------------------------------------------------*/
-
-.pun .blockpost {
-	border-style: solid;
-	border-width: 1px;
-	margin-bottom: -1px;
-	overflow: hidden;
-	position: relative;
-}
-
-* html .pun .blockpost {
-	display: inline-block;
-}
-
-.pun .blockpost h2 {
-	font: 1em/1.462em Arial, Helvetica, sans-serif;
-	white-space: nowrap;
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	height: 1.462em;
-	padding: 0.538em 8px 0.538em 236px;
-	font-weight: normal;
-}
-
-#punsearch .blockpost h2 {
-	height: auto;
-	padding-left: 36px;
-	white-space: normal;
-}
-
-#punsearch .blockpost h2 span span {
-	white-space: nowrap;
-	display: inline-block;
-	font: 1.077em "Trebuchet MS", Arial, Helvetica, sans-serif
-}
-
-#punsearch .blockpost .icon {
-	position: absolute;
-	top: 0;
-	margin-top: -2.154em;
-}
-
-.pun .blockpost h2 .conr {
-	float: right;
-	text-align: right;
-}
-
-.pun .blockpost .inbox {
-	float: right;
-	position: relative;
-	width: 100%;
-}
-
-.pun .blockpost .postbody, .pun .blockpost .postfoot {
-	border-left-style: solid;
-	border-left-width: 1px;
-	float: right;
-	margin-right: -218px;
-	position: relative;
-	text-align: left;
-	width: 100%;
-}
-
-.pun .blockpost .postleft, .pun .blockpost .postfootleft {
-	width: 194px;
-	padding: 7px 12px 7px 12px;
-	float: left;
-	margin-left: -218px;
-	position: relative;
-}
-
-.pun .blockpost .postleft dl {
-	padding: 0;
-}
-
-#punviewtopic .blockpost dt, #punmoderate .blockpost dt {
-	display: block;
-	position: absolute;
-	padding: 0.538em 0 0.538em 12px;
-	height: 1.462em;
-	top: -2.615em;
-	left: 0;
-	overflow: hidden;
-	width: 206px;
-}
-
-.pun .blockpost dt strong {
-	font-size: 1.231em;
-	font-weight: bold;
-}
-
-.pun .blockpost .postleft dd {
-	font-size: 0.923em;
-}
-
-.pun .blockpost .postleft .usertitle {
-	padding: 4px 0 6px 0;
-	font-size: 1em;
-}
-
-.pun .blockpost .postleft .postavatar {
-	display: block;
-	margin: 0 0 4px 0;
-}
-
-.pun .blockpost .postright {
-	position: relative;
-	padding: 4px 230px 7px 18px;
-}
-
-.pun .postmsg {
-	width:100%;
-	overflow: hidden;
-	word-wrap: break-word;
-}
-
-.pun .blockpost .postfootright {
-	position: relative;
-	padding: 7px 230px 7px 18px;
-	text-align: right;
-}
-
-.pun .postfoot p, .pun .postfoot ul {
-	padding: 0;
-}
-
-.pun .blockpost .postfootright li {
-	display: inline;
-}
-
-.pun .blockpost .postfootright li span {
-	display: inline-block;
-	padding-left: 16px;
-	margin-left: 8px;
-	line-height: normal;
-	background: url(Earth/img/bull.png) center left no-repeat;
-}
-
-.pun .blockpost .usercontacts {
-	padding: 7px 0;
-}
-
-.pun .blockpost .usercontacts .email {
-	background: url(Earth/img/email.png) left 65% no-repeat;
-	margin-right: 5px;
-	padding-left: 21px;
-	display: inline-block;
-	line-height: normal;
-}
-
-.pun .blockpost .usercontacts .website {
-	background: url(Earth/img/ext.png) left 65% no-repeat;
-	padding-left: 18px;
-	display: inline-block;
-	line-height: normal;
-}
-
-.pun .postsignature hr {
-	border:none;
-	height: 1px;
-	margin-left: 0px;
-	text-align: left;
-}
-
-/* Content (includes other user content)
-----------------------------------------------------------------*/
-
-.pun .usercontent {
-	padding: 7px 0;
-}
-
-.pun .postmsg p, .pun .postmsg li, #punhelp p samp {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-.pun .usercontent h1, .pun .usercontent h2, .pun .usercontent h3,
-.pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
-	padding: 7px 0 0 0;
-}
-
-.pun .postmsg h5, #punhelp h5 {
-	font-size: 1.231em;
-	font-weight: bold;
-	padding: 7px 0;
-}
-
-.pun .usercontent ul, .pun .postmsg ul {
-	list-style: disc;
-	padding: 4px 13px 4px 30px;
-}
-
-.pun .usercontent ol, .pun .postmsg ol {
-	list-style: decimal;
-	padding: 4px 13px 4px 30px;
-}
-
-.pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha;
-}
-
-.pun .usercontent li, .pun .postmsg li {
-	padding: 0 3px;
-}
-
-.pun .usercontent li p, .pun .postmsg li p {
-	padding: 0;
-}
-
-.pun span.bbu {
-	text-decoration: underline;
-}
-
-.pun span.bbs, .pun del {
-	text-decoration: line-through;
-}
-
-.pun .postmsg ins, #punhelp samp ins {
-	text-decoration: none;
-}
-
-.pun .blockpost .postmsg .postedit {
-	font-size: 0.857em;
-}
-
-.pun .blockform .postsignature, .pun .blockpost .postsignature {
-	font-size: 0.923em;
-}
-
-.pun .codebox {
-	border-style: solid;
-	border-width: 1px;
-	margin: 0.75em 1em;
-	padding: 0;
-}
-
-.pun .quotebox {
-	border-style: solid;
-	border-width: 1px 1px 1px 3px;
-	margin: 0.75em 1em;
-	padding: 0 0.75em;
-}
-
-.pun .quotebox cite {
-	display: block;
-	padding: 0.75em 0 0 0;
-	font-weight: bold;
-	line-height: 1.462em;
-}
-
-.pun .quotebox blockquote {
-	overflow: hidden;
-	width: 100%;
-}
-
-.pun .codebox pre {
-	overflow: auto;
-	width: 100%;
-	direction: ltr;
-	text-align: left;
-}
-
-* html .pun .codebox pre {
-	padding-bottom: 10px;
-}
-
-*:first-child+html .pun .codebox pre {
-	padding-bottom: 10px;
-}
-
-.pun .codebox pre code {
-	padding: 0.5em;
-	white-space: pre;
-}
-
-.pun div[class*=codebox] pre code {
-	display: inline-block;
-}
-
-* html .pun .codebox pre code {
-	display: block;
-}
-
-.pun .codebox pre.vscroll {
-	height: 32em;
-	overflow: auto;
-	overflow-y: auto
-}
-
-.pun .postmsg img, #punhelp samp img {
-	vertical-align: text-top;
-}
-
-.pun .postmsg .postimg img {
-	max-width: 98%;
-	vertical-align: middle;
-	margin: 7px 0.5em 7px 0;
-}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-style: solid;
-	border-width: 2px;
-}
-
-/*****************************************************************
-MAIN FORMS
-*****************************************************************/
-
-#punedit .blockform h2, #punpost .blockform h2, #postpreview h2, #posterror h2,
-.pun #quickpost h2, .pun #reportform h2, #pundelete .blockform h2 {
-	font: 1em/1.462em Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	white-space: nowrap;
-	padding: 10px 19px 4px 37px;
-	border: 0;
-}
-
-#punpost .blockform h2, #punedit .blockform h2,.pun #quickpost h2,
-#pundelete .blockform h2 {
-	margin: 1px 1px 0 1px;
-	width: 25em;
-	position: absolute;
-	z-index: 100;
-}
-
-.pun #quickpost legend, #punpost legend, #punedit legend {
-	width: 25em;
-	overflow: hidden;
-	white-space: nowrap;
-}
-
-.pun .blockform .box {
-	border-style: solid;
-	border-width: 1px;
-	padding-bottom: 12px;
-}
-
-.pun #posterror {
-	border-style: solid;
-	border-width: 1px;
-}
-
-.pun #posterror .box {
-	padding: 0 18px 12px 18px;
-}
-
-* html .pun .blockform .box, * html .pun #posterror {
-	display: inline-block;
-}
-
-.pun .blockform .forminfo, .pun .error-info {
-	padding: 12px 18px;
-	border-style: solid;
-	border-width: 1px;
-	position: relative;
-}
-
-.pun .blockform .forminfo {
-	margin-top: 12px;
-}
-
-#pundelete .blockform .forminfo {
-	margin-top: 33px;
-}
-
-.pun .forminfo h3 {
-	padding-bottom: 0;
-}
-
-.pun .error-list li {
-	padding-left: 24px;
-	background: url(Earth/img/exclaim.png) center left no-repeat;
-}
-
-.pun .inform {
-	padding: 0 18px;
-}
-
-.pun legend {
-	font-weight: bold;
-	padding: 10px 19px 4px 19px;
-}
-
-* html .pun legend {
-	margin-left: -7px;
-}
-
-*:first-child+html .pun legend {
-	margin-left: -7px;
-}
-
-.pun .infldset {
-	border-style: solid;
-	border-width: 1px;
-	padding: 12px 18px;
-}
-
-#punregister #rules .infldset {
-	padding: 5px 18px;
-}
-
-.pun fieldset p {
-	padding: 0 0 7px 0;
-	width: 100%;
-}
-
-.pun fieldset .usercontent p {
-	padding: 7px 0;
-}
-
-.pun fieldset label {
-	display: block;
-	padding: 0 0 7px 0;
-}
-
-.pun label em {
-	font-weight: normal;
-	font-style: normal;
-}
-
-.pun .required strong {
-	background: url(Earth/img/asterisk.png) center right no-repeat;
-	font-weight: normal;
-	padding-right: 14px;
-	white-space: pre;
-	display: inline-block;
-	line-height: normal;
-}
-
-.pun label input, .pun label select, .pun label textarea {
-	margin-top: 2px;
-}
-
-.pun label.conl {
-	display: inline-block;
-	padding-right: 12px;
-}
-
-.pun form .buttons {
-	padding: 8px 19px 8px 34px;
-	margin-bottom: -12px;
-}
-
-.pun .blockform .buttons input {
-	margin-right: 12px;
-}
-
-.pun .rbox {
-	padding: 3px 0;
-}
-
-.pun .rbox label {
-	padding: 3px 0 3px 1.75em;
-	position: relative;
-	min-height: 1px;
-}
-
-* html .pun .rbox label {
-	text-indent: -3px;
-	height: 1%;
-}
-
-.pun .rbox input {
-	margin: 3px 0.75em 3px -1.75em;
-	float: left;
-	position: relative;
-	vertical-align: middle;
-	padding: 0;
-	height: 1em;
-	width: 1em;
-}
-
-.pun input[type=text], .pun select, .pun textarea {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-.pun .txtarea textarea, .pun input.longinput {
-	width: 98%;
-}
-
-.pun textarea {
-	resize: vertical;
-}
-
-.pun #quickpost .txtarea {
-	padding-right: 12px;
-	position: relative;
-}
-
-.pun .blockform .bblinks {
-	padding-top: 0;
-}
-
-.pun .blockform .bblinks li {
-	display: inline;
-}
-
-.pun .blockform .bblinks li span {
-	background: url(Earth/img/help.png) center left no-repeat;
-	margin-right: 8px;
-	padding-left: 20px;
-	display: inline-block;
-}
-
-.pun #quickpost .bblinks {
-	padding-top: 0;
-}
-
-.pun #quickpost .bblinks li {
-	display: inline;
-}
-
-.pun #login p.clearb {
-	border-top-style: dotted;
-	border-top-width: 1px;
-	font-size: 0;
-	height: 0;
-	line-height: 0;
-	margin-top: 7px;
-	overflow: hidden;
-	padding-bottom: 3px;
-	padding-top: 7px;
-	text-indent: -9999em;
-	width: 100%;
-}
-
-.pun #postreview {
-	padding-top: 12px;
-}
-
-.pun #postpreview, .pun #posterror {
-	margin-bottom: 12px;
-}
-
-.pun #postpreview .postright {
-	padding: 0;
-}
-
-.pun #postpreview .postbody {
-	border-style: solid;
-	border-width: 1px;
-	float: none;
-	margin: 0 18px 12px 18px;
-	padding: 0;
-	padding: 4px 18px 4px 18px;
-	width: auto;
-}
-
-.pun span.email {
-	background: url(Earth/img/email.png) left 65% no-repeat;
-	margin-right: 5px;
-	padding-left: 21px;
-	display: inline-block;
-	line-height: normal;
-}
-
-.pun span.website {
-	background: url(Earth/img/ext.png) left 65% no-repeat;
-	padding-left: 18px;
-	display: inline-block;
-	line-height: normal;
-}
-
-#punmisc #rules .box {
-	border-style: solid;
-	border-width: 1px;
-	padding: 5px 18px;
-}
-
-
-#punhelp #brdmain .box {
-	border-style: solid;
-	border-width: 1px;
-	padding: 7px 12px;
-}
-
-.pun .multiselect {
-	float: left;
-	padding-bottom: 7px;
-}
-
-.pun .checklist {
-	border-width: 1px;
-	border-style: solid;
-	max-height: 9em;
-	width: 20em;
-	overflow: auto;
-	padding: 0.25em 0.5em;
-	margin: 0.25em 16px 0 0.15em;
-}
-
-.pun .checklist legend {
-	padding: 0;
-}
-
-.pun .checklist legend span {
-	width: auto;
-	max-width: 25em;
-}
-
-/*****************************************************************
-PROFILES (+ ADMIN MENU)
-*****************************************************************/
-
-/* Profile / Admin
-----------------------------------------------------------------*/
-
-.pun .blockmenu {
-	width: 13em;
-	float: left;
-	padding-bottom: 12px;
-}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 15em;
-}
-
-.pun .blockmenu .block2 {
-	padding-top: 19px;
-}
-
-.pun .blockmenu ul {
-	border-top-style: dotted;
-	border-top-width: 1px;
-	padding: 0;
-}
-
-.pun .blockmenu li {
-	border-bottom-style: dotted;
-	border-bottom-width: 1px;
-	font-weight: bold;
-	padding: 0;
-}
-
-.pun .blockmenu a:link, .pun .blockmenu a:visited {
-	display: block;
-	padding: 9px 6px 3px 6px;
-	min-height: 1px;
-	text-decoration: none;
-}
-
-* html .pun .blockmenu a:link,  * html .pun .blockmenu a:visited {
-	height: 1%;
-}
-
-.pun .blockmenu a:hover, .pun .blockmenu a:active, .pun .blockmenu a:focus {
-	text-decoration: none;
-}
-
-#viewprofile .box {
-	border-style: solid;
-	border-width: 1px;
-	padding-bottom: 18px;
-}
-
-#viewprofile dt, #adstats dt {
-	padding: 7px 0;
-	position: absolute;
-	width: 13em;
-	left: 0;
-}
-
-#viewprofile dl {
-	border-style: solid none none none;
-	border-width: 1px;
-	margin: 7px 0;
-	padding: 0;
-	width: 100%;
-	position: relative;
-}
-
-#adintro, #adstats, #adalerts {
-	border-style: solid;
-	border-width: 1px;
-	padding: 18px;
-}
-
-#adintro li span {
-	display: inline-block;
-	padding-left: 16px;
-	margin-left: 8px;
-	line-height: normal;
-	background: url(Earth/img/bull.png) center left no-repeat;
-}
-
-#adstats .inbox, #adintro .inbox, #adalerts p {
-	border-style: solid;
-	border-width: 1px;
-	padding: 18px;
-}
-
-#adstats dl {
-	margin: 0;
-	padding: 0;
-	width: 100%;
-	position: relative;
-}
-
-#viewprofile dd, #adstats dd {
-	border-style: none none solid none;
-	border-width: 1px;
-	padding: 7px 0 7px 13em;
-}
-
-/*****************************************************************
-COLOUR SCHEME
-*****************************************************************/
-
-/* Basic defaults and Common Items
-----------------------------------------------------------------*/
-
-html, body, .pun {
-	background: #eaede2;
-	color: #333;
-}
-
-.pun .punwrap {
-	background: #fff;
-	border-color: #ccd7c1;
-	color: #526550;
-}
-
-#brdtitle #brddesc, .pun .pagepost, #brdstats #onlinelist, #brdfooter #searchlinks, #brdfooter #modcontrols,
-#punmaint h2, #punredirect h2, #adminconsole .submittop, .pun #debugtime, .pun .pagelink a, .pun .pagelink * {
-	border-color: #bbc6b2;
-}
-
-.pun a, .pun a:link, .pun a:visited {
-	color: #047E00;
-}
-
-.pun a:hover, .pun a:active, .pun a:focus {
-	color: #73A900;
-}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-color: #047E00;
-}
-
-.pun .postmsg .postimg a:hover img, .pun .postmsg .postimg a:active img, .pun .postmsg .postimg a:focus img {
-	border-color: #73A900;
-}
-
-/* Primary Navigation
-----------------------------------------------------------------*/
-
-#brdmenu {
-	background: #32671d;
-}
-
-#brdmenu a, #brdmenu a:link, #brdmenu a:visited {
-	background: #32671d;
-	border-color: #fff;
-	color: #e3e3c8;
-}
-
-#brdmenu a:hover, #brdmenu a:active, #brdmenu a:focus {
-	background: #2ca100;
-	border-color: #fff;
-	color: #fff;
-}
-
-/* Main Tables
-----------------------------------------------------------------*/
-
-.pun .blocktable .box {
-	background: #fcfcf4;
-	border-color: #bbc6b2 #d8dccf;
-}
-
-#punindex .blocktable h2, .pun #vf h2 {
-	color: #83866a;
-}
-
-#adminconsole fieldset th, #adminconsole fieldset td {
-	background: #f6f6ea;
-	border-color: #dce6d8;
-}
-
-.pun #users1 h2 {
-	background: #fff;
-}
-
-.pun .blocktable td {
-	border-color: #dce6d8;
-}
-
-.pun .blocktable th {
-	background: #eaecda;
-	border-color: #ccd7c1;
-	color: #83866a;
-}
-
-.pun .blocktable td.tcl span.stickytext {
-	color: #c08b20;
-}
-
-/* Main Posts
-----------------------------------------------------------------*/
-
-.pun .blockpost {
-	background: #f6f6ea;
-	border-color: #bbc6b2 #d8dccf;
-}
-
-.pun .blockpost h2 {
-	background: #eaecda;
-	border-color: #ccd7c1;
-	color: #83866a;
-}
-
-.pun .blockpost .postbody, .pun .blockpost .postfoot {
-	background: #fcfcf4;
-	border-color: #dce6d8;
-}
-
-.pun .blockpost .postfootright li {
-	color: #fcfcf4;
-}
-
-.pun .postmsg, #punhelp code, #punhelp samp {
-	color: #333;
-}
-
-.pun .postsignature, .pun .postmsg .postedit {
-	color: #526550;
-}
-
-.pun .quotebox {
-	background: #f9fae5;
-	border-color: #bdbc7a;
-	color: #566579;
-}
-
-.pun .quotebox cite {
-	color: #83866a;
-}
-
-.pun .codebox, #punhelp .codebox code {
-	background: #333;
-	color: #fff;
-}
-
-.pun .postmsg hr {
-	background: #bbc6b2;
-}
-
-.pun .postmsg ins, #punhelp samp ins {
-	background-color: #ff0;
-}
-
-/* Main Forms + Profile
-----------------------------------------------------------------*/
-
-.pun .blockform .box, #adstats, #adintro, #adalerts, #postpreview, #posterror {
-	border-color: #bbc6b2 #d8dccf;
-	background: #eaecda;
-}
-
-#punmisc #rules .box, #punhelp #brdmain .box {
-	border-color: #bbc6b2 #d8dccf;
-	background: #f6f6ea;
-}
-
-.pun #quickpost h2, #punpost .blockform h2, #punedit .blockform h2, #posterror h2,
-#pundelete .blockform h2 {
-	background: #eaecda;
-	color: #83866a;
-}
-
-.pun .forminfo {
-	background: #fff;
-	border-color: #dce6d8;
-}
-
-#puninstall form#install .forminfo {
-	background: #32671d;
-	color: #fff;
-}
-
-.pun #posterror .error-info, .pun #adalerts p {
-	background: #ffffe1;
-	border-color: #dfe6ee;
-}
-
-#puninstall form#install .error-info {
-	background: #ffffe1;
-	border-color: #dfe6ee;
-	color: #333;
-}
-
-.pun .infldset, #adintro .inbox, #adstats .inbox {
-	background: #f6f6ea;
-	border-color: #dce6d8;
-}
-
-.pun label, .pun legend, #adminconsole fieldset th {
-	color: #83866a;
-}
-
-.pun fieldset p {
-	border-color: #bbc6b2;
-}
-
-.pun .blockmenu ul, .pun .blockmenu li {
-	border-color: #bbc6b2;
-}
-
-.pun .blockmenu a:hover, .pun .blockmenu a:active, .pun .blockmenu a:focus {
-	background: #ffffe6;
-}
-
-.pun .blockmenu .isactive a:link, .pun .blockmenu .isactive a:visited {
-	color: #333;
-	background: #f6f6ea;
-	}
-
-.pun #viewprofile .box {
-	border-color: #bbc6b2 #d8dccf;
-	background: #eaecda;
-}
-
-.pun #viewprofile dt, #adstats dt {
-	color: #83866a;
-}
-
-.pun #viewprofile dl, .pun #viewprofile dd, #adstats dl, #adstats dd {
-	border-color: #dce6d8;
-}
-
-#adminconsole fieldset td.nodefault {
-	background: #d59b9b;
-}
-
-.pun .multiselect {
-	color: #83866A;
-}
-
-.pun .checklist {
-	background: white;
-	border-color: #ccc;
-}
-
-/* Status Indicators
-----------------------------------------------------------------*/
-
-.pun .icon {
-	border-color: #eef1e8 #dbddd4 #e6e8df #eef1e8;
-}
-
-.pun .iredirect .icon {
-	border-color: #bbc6b2;
-	border-width: 1px;
-	padding: 7px;
-}
-
-.pun .inew .icon {
-	border-color: #50a42f #408426 #32671d #4a982c;
-}
-
-
-/* Alert boxes
-----------------------------------------------------------------*/
-
-#msgflash {
-    opacity: 0;
-    position: fixed;
-    top: 40px;
-    right: 40px;
-    min-width: 240px;
-    max-width: 410px;
-	padding: 5px;
-	z-index: 1000;
-	color: #fff;
-	background-color: #61c462;
-	border-color: #1489e0;
-	border-width: 2px;
-	border-radius: 5px;
-}
diff --git a/style/Earth/base_admin.css b/style/Earth/base_admin.css
deleted file mode 100644
index fdf41b10..00000000
--- a/style/Earth/base_admin.css
+++ /dev/null
@@ -1,163 +0,0 @@
-#adminconsole .blockform .box {
-	padding-bottom: 12px;
-}
-
-#adminconsole fieldset .infldset {
-	position: relative;
-	overflow: hidden;
-}
-
-#adminconsole fieldset table {
-	margin-top: -1px;
-	margin-bottom: -1px;
-}
-
-#adminconsole fieldset td, #adminconsole fieldset th {
-	padding: 10px 8px 10px 0;
-	text-align: left;
-	white-space: normal;
-	border-style: solid none;
-	border-width: 1px 0;
-}
-
-#punadmin thead th {
-	border-top: 0;
-	font-weight: normal;
-}
-
-#adminconsole fieldset td span, #adminconsole fieldset th span {
-	display: block; font-size: 1em;
-	font-weight: normal;
-}
-
-#adminconsole fieldset td.location span {
-	display: inline-block;
-}
-
-#adminconsole fieldset th {
-	width: 15em;
-	font-weight: normal;
-	padding-right: 8px;
-}
-
-#adminconsole table.aligntop th, #adminconsole table.aligntop td {
-	vertical-align: top;
-}
-
-#adminconsole table.aligntop th div {
-	padding-top: 3px;
-}
-
-#adminconsole .inform {
-	padding-bottom: 0;
-}
-
-#adminconsole .infldset {
-	padding-bottom: 0;
-	padding-top: 0;
-}
-
-#adminconsole p.submittop {
-	text-align: center;
-	border-bottom-style: dotted;
-	border-bottom-width: 1px;
-	margin: 0 18px;
-	padding-top: 12px;
-}
-
-#adminconsole p.submitend {
-	text-align: center;
-	padding-bottom: 0;
-}
-
-#adminconsole fieldset p {
-	padding: 10px 0;
-}
-
-#adminconsole .fsetsubmit {
-	padding: 10px 0 12px 0;
-}
-
-#categoryedit .tcl {
-	width: 25%;
-}
-
-#censoring .tcl, #censoring .tc2 {
-	width: 20%;
-}
-
-#edforum .tcl {
-	width: 18%;
-}
-
-#edforum .tc2 {
-	width: 12%;
-}
-
-#forumperms thead th, #forumperms tbody td {
-	text-align: center;
-}
-
-.pun .linkst .backlink, .pun .linksb .backlink {
-	padding: 7px 0;
-}
-
-#punadmin #users1 h2, #punadmin #users2 h2, #punadmin #bans1 h2 {
-	display: block;
-	left: -9999em;
-	overflow: hidden;
-	position: absolute;
-	text-indent: -9999em;
-	width: 0;
-}
-
-#punadmin #users1 th, #punadmin #users2 th, #punadmin #bans1 th {
-	font-weight: bold;
-}
-
-#users2 th, #bans1 th {
-	text-align: left;
-}
-
-#users2 th.tcmod {
-	text-align: center;
-}
-
-#users2 .tcl, #bans1 .tcl {
-	width: auto;
-	text-align: left;
-}
-
-#users2 .tc2, #bans1 .tc2 {
-	width: 18%;
-	text-align: left;
-}
-
-#users2 .tc3, #users2 .tc5, #bans1 .tc3, #bans1 .tc5, #bans1 .tc6 {
-	width: 12%;
-	text-align: left;
-}
-
-#users2 .tc4, #bans1 .tc4 {
-	width: 10%;
-	text-align: center;
-}
-
-#users2 .tcr {
-	width: 20%;
-	white-space: nowrap;
-}
-
-#bans1 .tcr {
-	width: 15%;
-	white-space: nowrap;
-}
-
-#users2 .tcmod {
-	width: 10%;
-	text-align: center;
-}
-
-.plugin p {
-	padding: 12px 18px 0;
-}
diff --git a/style/Earth/img/asterisk.png b/style/Earth/img/asterisk.png
deleted file mode 100644
index f7438dea90907b0619cdfea4aa0f057fdc7ddfba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv3GfMV^~o%})6nqk{{2G=3ODle
zA5NHXIX-?T1H<`%fYS~RFE?y>ci@2eO5P}-dd89<zhDN3XE)M-93xK`#}JO|$q5R4
z8V4ns1iFrT2DmaDNf4Tsxq?CLkzPE*vYC^t&m2%%!_?HnsIiNKnZZGXWi`|7FYG|w
N44$rjF6*2UngGiBI2Zr`

diff --git a/style/Earth/img/bull.png b/style/Earth/img/bull.png
deleted file mode 100644
index 5fd1a9a5004b39ad1c91bb058d468b5d3c35da61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=-3?y@QpIZW?*aCb)T>t<7fArM)t+&`RfFg_~
zL4Lsu4$p3+0Xf2+E{-7_*OL<(7;iEMv>Z!IU|<N|#HxSTTeSly&EV<k=d#Wzp$P!K
C!X8Wj

diff --git a/style/Earth/img/email.png b/style/Earth/img/email.png
deleted file mode 100644
index 80ff5d9388b230df079c79780929d712381bdfa4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 388
zcmV-~0ek+5P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001-P)t-sOlfiR
z`_%IH<jmoe`uy*)#!v3`-240X^8DNT|MT_y<M#IJu)<69{N1k0VD0wHsl!mCwpg3G
zJFCZ7+3Ka->9CZjUGw$o@A|>m?3k*<Mx?<&u*q80=bq;ByZ-;<!q|!5>bvdt)Zp*1
z$k(02-h=D*!_47~-0iE9vOTN6Pq@%;oWVkntxBWAPP);0vd(Ye>CEcy*6jMVC~>$X
z00001bW%=J06^y0W&i*HmPtfGRCwBz&PNu5FbqXe+1Lm}Y(nofKziT*-XcaB=H$-)
z(?syw)Srzpbsa@p5~MJpz^^QTyRdBG5Z6`q{F3m%9Tn};=KI2vV31K!U5B*a6e48o
z&~rpS7kN(MhRjc5%eJjJUe<8IaqwB&G%X#LOhTxJQETn2{De!mdRz#hltPj{14xfy
iSXE`YA@W3@{_g`n0ShubqWvZS0000<MNUMnLSTX|#?n~;

diff --git a/style/Earth/img/exclaim.png b/style/Earth/img/exclaim.png
deleted file mode 100644
index b98bb3cc2270ad086bcbb8eb2fa50757736e446a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002AP)t-sOlfiY
zyQlG%g7<}M^nYRXfnwujTI+3D@p)eEa$EQ2<K<yg_ltD&uA}&~pYf-j;&NQ+fok}o
ziU02F^reyOhkf9qmiErY{npOuz_{IeZsUV=@X5g8Tv7P6r0|}N-fLRYT}b%7u+d;o
z?U9J_q?pcDJ?D^w&0|gNo|M8&Gy2)n?2&%KN-^q;dc{&g>3nCyQ#|mrr|x=S?t*Ro
z!nOL7eCKOi)MHWQje^*3SjJpMY5s;V00001bW%=J06^y0W&i*Hs!2paR2Ug;z(tY*
zK>z^3npPQC+?{n7{{Jrsf+NXY_1CwQ$+G6ApL{l1*1VQIuKH3$m6TQVSo8quL_}JH
zQqgk}fMpqJt-(1rou@$3R7xrE-V5;$d}P`=2lisK1$?HQ^AA{Se>Pj7oC)vkEHx%>
zcYENym|ANgj^ljQ0bxE$jajcJlYICR0LF_^+8Wd5!>0jP<JIr(aQIui4Y&#2{&+lf
afqTy6_6%|nl<W}z0000<MNUMnLSTaQPub=G

diff --git a/style/Earth/img/ext.png b/style/Earth/img/ext.png
deleted file mode 100644
index daba1b1d88fbb3b1b3cace5ef13e59b2fb7ca087..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9t50U(k`oN>e4NjLB8(+L
ze!&b5&u*jvIa;1Bjv*Yf$qmfU<av5zcz9%aKFRPnN%1HN@-V4Ou*gcV$VfclH#oq+
YkbRD2lZ?NDI#3sbr>mdKI;Vst07TUr3jhEB

diff --git a/style/Earth/img/feed.png b/style/Earth/img/feed.png
deleted file mode 100644
index 3704226a673de8aa886bb5d964fd65079347a35c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 439
zcmV;o0Z9IdP)<h;3K|Lk000e1NJLTq000dD000dL0{{R3MKu&o0002SP)t-sOlfiI
zd^h-%Fzc01@r*n6l|A^JKL7v!^o}*{ggNt)IplLN|M&0y@#X4(IOT02>Ut>u@Zj)-
zFZhrs^@=3#fGGUu+4i%0{Jwwx_38SoVC8r*<cduHnKSK`U-;nE?~Fw6d?MdqAK_>z
z{n@nn!;s!%C-tXg`p>H1Z8GD8O!b{i`?hiDb0`1Ind^;F_|Uib+s*Q~lJ>%y@2-pU
ztakE>G5q7p_s6CD$Bx=p9pG|9`OBpHs#f))S^w+S{oTI#q)}0fy#xRN00DGTPE!Ct
z=GbNc005s!L_t(|+6~D=7Q{dl0Knf#Gd2gY#<uQ%smZcl0Zb4Q0%JlHd4#$VmVf4)
zQz}Dh2Acg`c#=e^0)}<!G^R)Hbjmphzir7<V>g#`F)9eUB>Au~Hw?f|{blho(e=zi
zpeWuiisN_4_GSu1s;gJTu9-G3R3NU+s>Ma0ZCTTgx3<Ilu$vv{j}l}md5*I(%i`V)
h05Zl{Af&4O0Dr034rF_``4j*E002ovPDHLkV1hcR;mQC2

diff --git a/style/Earth/img/help.png b/style/Earth/img/help.png
deleted file mode 100644
index 2375e4a688d7c8e90aa138d082d411576a3b914d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 379
zcmV->0fhdEP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001oP)t-sOlfhV
zuxqrzhLfOOh?85-)v?mpywlvbn5ACR+^^T%!j79<$k3&Wms-WkpvBIr!OESx$B(YM
zf6m&Uo2O-}wsn-DV0eX0p{-`W$(p^zn6tc(gN|0o)taZZZp+lG+~>U8=d#(|#>2{|
zpsaJKvVW?zgs{1avb%`9!Jx#@mDAs(p{;bDK~7@;0004WQchC<K<3zH0001@Nkl<Z
z7#VHAMH0e500h8USBX3B^8fciQgBOS-QiW1rNZC7R5SBDV6oq*U0&DJn_OYGQNE^9
z=A;+&2*8-#mf&kkypI5KL%U865m6VS20#tzv>uN3&MHv>C=AhBLpIJef&nN*p*3SH
zgz!!cfGqQsbJlXs`*8$dtJF8)a^ZZ8lf_qZr+DW4JY;Q##VOp95b4@J@FQ<i+fG-B
ZH6J%X3Tte3+ztQ$002ovPDHLkV1mN}xAOo1

diff --git a/style/Earth/img/index.html b/style/Earth/img/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/Earth/img/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/Earth/index.html b/style/Earth/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/Earth/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/admin/bans/add_ban.php b/style/FeatherBB/view/admin/bans/add_ban.php
deleted file mode 100644
index 8170a2a9..00000000
--- a/style/FeatherBB/view/admin/bans/add_ban.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-	exit;
-}
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('Ban advanced head') ?></span></h2>
-	<div class="box">
-		<form id="bans2" method="post" action="">
-			<div class="inform">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="mode" value="<?php echo $ban['mode'] ?>" />
-				<?php if ($ban['mode'] == 'edit'): ?>				<input type="hidden" name="ban_id" value="<?php echo $ban['id'] ?>" />
-				<?php endif; ?>
-				<?php if ($ban['mode'] == 'add' && isset($ban['user_id'])): ?><input type="hidden" name="ban_user_id" value="<?php echo $ban['user_id'] ?>" />
-				<?php endif; ?><fieldset>
-					<legend><?php _e('Ban advanced subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Username label') ?></th>
-								<td>
-									<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
-										echo feather_escape($ban['ban_user']);
-									} ?>" tabindex="1" />
-									<span><?php _e('Username help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('IP label') ?></th>
-								<td>
-									<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
-										echo feather_escape($ban['ip']);
-									} ?>" tabindex="2" />
-										<span><?php _e('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
-												printf(' '.__('IP help link'), '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.__('here').'</a>');
-											} ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('E-mail label') ?></th>
-								<td>
-									<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
-										echo feather_escape($ban['email']);
-									} ?>" tabindex="3" />
-									<span><?php _e('E-mail help') ?></span>
-								</td>
-							</tr>
-						</table>
-						<p class="topspace"><strong class="warntext"><?php _e('Ban IP range info') ?></strong></p>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Message expiry subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Ban message label') ?></th>
-								<td>
-									<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
-										echo feather_escape($ban['message']);
-									} ?>" tabindex="4" />
-									<span><?php _e('Ban message help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Expire date label') ?></th>
-								<td>
-									<input type="text" name="ban_expire" size="17" maxlength="10" value="<?php if (isset($ban['expire'])) {
-										echo $ban['expire'];
-									} ?>" tabindex="5" />
-									<span><?php _e('Expire date help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php _e('Save') ?>" tabindex="6" /></p>
-		</form>
-	</div>
-</div>
-<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/bans/admin_bans.php b/style/FeatherBB/view/admin/bans/admin_bans.php
deleted file mode 100644
index 3d714e7f..00000000
--- a/style/FeatherBB/view/admin/bans/admin_bans.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('New ban head') ?></span></h2>
-		<div class="box">
-			<form id="bans" method="post" action="<?php echo get_link('admin/bans/add/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Add ban subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Username label') ?><div><input type="submit" name="add_ban" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
-									<td>
-										<input type="text" name="new_ban_user" size="25" maxlength="25" tabindex="1" />
-										<span><?php _e('Username advanced help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-
-		<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
-		<div class="box">
-			<form id="find_bans" method="get" action="<?php echo get_link('admin/bans/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Ban search subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Ban search info') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Username label') ?></th>
-									<td><input type="text" name="username" size="30" maxlength="25" tabindex="4" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('IP label') ?></th>
-									<td><input type="text" name="ip" size="30" maxlength="255" tabindex="5" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('E-mail label') ?></th>
-									<td><input type="text" name="email" size="30" maxlength="80" tabindex="6" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Message label') ?></th>
-									<td><input type="text" name="message" size="30" maxlength="255" tabindex="7" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Expire after label') ?></th>
-									<td><input type="text" name="expire_after" size="10" maxlength="10" tabindex="8" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Expire before label') ?></th>
-									<td><input type="text" name="expire_before" size="10" maxlength="10" tabindex="9" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Order by label') ?></th>
-									<td>
-										<select name="order_by" tabindex="10">
-											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
-											<option value="ip"><?php _e('Order by ip') ?></option>
-											<option value="email"><?php _e('Order by e-mail') ?></option>
-											<option value="expire"><?php _e('Order by expire') ?></option>
-										</select>
-                                        &#160;&#160;&#160;
-                                        <select name="direction" tabindex="11">
-											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
-											<option value="DESC"><?php _e('Descending') ?></option>
-										</select>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="12" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/bans/index.html b/style/FeatherBB/view/admin/bans/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/admin/bans/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/admin/bans/search_ban.php b/style/FeatherBB/view/admin/bans/search_ban.php
deleted file mode 100644
index 0d057182..00000000
--- a/style/FeatherBB/view/admin/bans/search_ban.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-
-<div id="bans1" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results IP address head') ?></th>
-					<th class="tc4" scope="col"><?php _e('Results expire head') ?></th>
-					<th class="tc5" scope="col"><?php _e('Results message head') ?></th>
-					<th class="tc6" scope="col"><?php _e('Results banned by head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-
-        foreach ($ban_data as $cur_ban) {
-            ?>
-				<tr>
-					<td class="tcl"><?php echo($cur_ban['username'] != '') ? feather_escape($cur_ban['username']) : '&#160;' ?></td>
-					<td class="tc2"><?php echo($cur_ban['email'] != '') ? feather_escape($cur_ban['email']) : '&#160;' ?></td>
-					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? feather_escape($cur_ban['ip']) : '&#160;' ?></td>
-					<td class="tc4"><?php echo format_time($cur_ban['expire'], true) ?></td>
-					<td class="tc5"><?php echo($cur_ban['message'] != '') ? feather_escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.get_link('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
-					<td class="tcr"><?php echo '<a href="'.get_link('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.get_link('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
-				</tr>
-<?php
-
-        }
-        if (empty($ban_data)) {
-            echo "\t\t\t\t".'<tr><td class="tcl" colspan="7">'.__('No match').'</td></tr>'."\n";
-        }
-
-?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-        <ul class="crumbs">
-            <li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
-            <li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-        </ul>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/categories.php b/style/FeatherBB/view/admin/categories.php
deleted file mode 100644
index c8786528..00000000
--- a/style/FeatherBB/view/admin/categories.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-	<div class="blockform">
-		<h2><span><?php _e('Add categories head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/categories/add/') ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Add categories subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Add category label') ?><div><input type="submit" value="<?php _e('Add new submit') ?>" tabindex="2" /></div></th>
-									<td>
-										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
-										<span><?php printf(__('Add category help'), '<a href="'.get_link('admin/forums').'">'.__('Forums').'</a>') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-
-<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/categories/delete') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Delete categories subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Delete category label') ?><div><input type="submit" value="<?php _e('Delete') ?>" tabindex="4" /></div></th>
-									<td>
-										<select name="cat_to_delete" tabindex="3">
-<?php
-
-    foreach ($cat_list as $cur_cat) {
-        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.feather_escape($cur_cat['cat_name']).'</option>'."\n";
-    }
-
-?>
-										</select>
-										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php _e('Delete category disclaimer') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-<?php endif; ?>
-
-<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/categories/edit/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit categories subhead') ?></legend>
-						<div class="infldset">
-							<table id="categoryedit">
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php _e('Category name label') ?></th>
-									<th scope="col"><?php _e('Category position label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-
-    foreach ($cat_list as $cur_cat) {
-        ?>
-								<tr>
-									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo feather_escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
-									<td><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][order]" value="<?php echo $cur_cat['disp_position'] ?>" size="3" maxlength="3" /></td>
-								</tr>
-<?php
-
-    }
-
-?>
-							</tbody>
-							</table>
-							<div class="fsetsubmit"><input type="submit" value="<?php _e('Update') ?>" /></div>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-<?php endif; ?>	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/censoring.php b/style/FeatherBB/view/admin/censoring.php
deleted file mode 100644
index 71c253f7..00000000
--- a/style/FeatherBB/view/admin/censoring.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Censoring head') ?></span></h2>
-		<div class="box">
-			<form id="censoring" method="post" action="<?php echo get_link('admin/censoring/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Add word subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Add word info').' '.($feather_config['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
-							<table>
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
-									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
-									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-								<tr>
-									<td class="tcl"><input type="text" name="new_search_for" size="24" maxlength="60" tabindex="1" /></td>
-									<td class="tc2"><input type="text" name="new_replace_with" size="24" maxlength="60" tabindex="2" /></td>
-									<td><input type="submit" name="add_word" value="<?php _e('Add') ?>" tabindex="3" /></td>
-								</tr>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit remove subhead') ?></legend>
-						<div class="infldset">
-<?php
-if (!empty($word_data)) {
-    ?>
-							<table>
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
-									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
-									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-
-    foreach ($word_data as $word) {
-        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.feather_escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.feather_escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
-    }
-
-    ?>
-							</tbody>
-							</table>
-<?php
-
-} else {
-    echo "\t\t\t\t\t\t\t".'<p>'.__('No words in list').'</p>'."\n";
-}
-
-?>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/forums/admin_forums.php b/style/FeatherBB/view/admin/forums/admin_forums.php
deleted file mode 100644
index e966e6f5..00000000
--- a/style/FeatherBB/view/admin/forums/admin_forums.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Add forum head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/forums/add') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<?php
-if (!empty($cat_list)) {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Create new subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Add forum label') ?><div><input type="submit" value="<?php _e('Add forum') ?>" tabindex="2" /></div></th>
-									<td>
-										<select name="cat" tabindex="1">
-											<?php  foreach ($cat_list as $cat) {
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.feather_escape($cat['cat_name']).'</option>'."\n";
-											} ?>
-										</select>
-										<span><?php _e('Add forum help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-} else {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('None') ?></legend>
-						<div class="infldset">
-							<p><?php _e('No categories exist') ?></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-}
-
-?>
-			</form>
-		</div>
-<?php
-if (!empty($forum_data)) {
-    ?>
-		<h2 class="block2"><span><?php _e('Manage forums head') ?></span></h2>
-		<div class="box">
-			<form id="edforum" method="post" action="<?php echo get_link('admin/forums/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
-<?php
-    foreach ($forum_data as $cat_id => $cat_data) {
-            ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Category subhead') ?> <?php echo feather_escape($cat_data['cat_name']) ?></legend>
-						<div class="infldset">
-							<table>
-							<thead>
-								<tr>
-									<th class="tcl"><?php _e('Action') ?></th>
-									<th class="tc2"><?php _e('Position label') ?></th>
-									<th class="tcr"><?php _e('Forum label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-	foreach ($cat_data['cat_forums'] as $forum) {
-        ?>
-								<tr>
-									<td class="tcl"><a href="<?php echo get_link('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo get_link('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
-									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
-									<td class="tcr"><strong><?php echo feather_escape($forum['forum_name']) ?></strong></td>
-								</tr>
-<?php
-    }
-    ?>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-	}
-?>
-				<p class="submitend"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
-<?php
-	}
-?>
diff --git a/style/FeatherBB/view/admin/forums/delete_forum.php b/style/FeatherBB/view/admin/forums/delete_forum.php
deleted file mode 100644
index 6a5263ba..00000000
--- a/style/FeatherBB/view/admin/forums/delete_forum.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Confirm delete head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Confirm delete subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Confirm delete info'), $cur_forum['forum_name']) ?></p>
-							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="del_forum_comply" value="<?php _e('Delete') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/forums/index.html b/style/FeatherBB/view/admin/forums/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/admin/forums/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/admin/forums/permissions.php b/style/FeatherBB/view/admin/forums/permissions.php
deleted file mode 100644
index df092f46..00000000
--- a/style/FeatherBB/view/admin/forums/permissions.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Edit forum head') ?></span></h2>
-		<div class="box">
-			<form id="edit_forum" method="post" action="<?php echo get_link('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit details subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Forum name label') ?></th>
-									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo feather_escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Forum description label') ?></th>
-									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo feather_escape($cur_forum['forum_desc']) ?></textarea></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Category label') ?></th>
-									<td>
-										<select name="cat_id" tabindex="3">
-											<?php  foreach ($forum_data as $cat_id => $cat_data) {
-												$selected = ($cat_id == $cur_forum['cat_id']) ? 'selected="selected"' : '';
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.feather_escape($cat_data['cat_name']).'</option>'."\n";
-											} ?>
-										</select>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Sort by label') ?></th>
-									<td>
-										<select name="sort_by" tabindex="4">
-											<option value="0"<?php if ($cur_forum['sort_by'] == '0') {
-    echo ' selected="selected"';
-} ?>><?php _e('Last post') ?></option>
-											<option value="1"<?php if ($cur_forum['sort_by'] == '1') {
-    echo ' selected="selected"';
-} ?>><?php _e('Topic start') ?></option>
-											<option value="2"<?php if ($cur_forum['sort_by'] == '2') {
-    echo ' selected="selected"';
-} ?>><?php _e('Subject') ?></option>
-										</select>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Redirect label') ?></th>
-									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.feather_escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Group permissions subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Group permissions info'), '<a href="admin_groups.php">'.__('User groups').'</a>') ?></p>
-							<table id="forumperms">
-							<thead>
-								<tr>
-									<th class="atcl">&#160;</th>
-									<th><?php _e('Read forum label') ?></th>
-									<th><?php _e('Post replies label') ?></th>
-									<th><?php _e('Post topics label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-    foreach ($perm_data as $perm) {
-        ?>
-								<tr>
-									<th class="atcl"><?php echo feather_escape($perm['g_title']) ?></th>
-									<td<?php if (!$perm['read_forum_def']) {
-    echo ' class="nodefault"';
-}
-        ?>>
-										<input type="hidden" name="read_forum_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['read_forum']) ? '1' : '0';
-        ?>" />
-										<input type="checkbox" name="read_forum_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['read_forum']) ? ' checked="checked"' : '';
-        ?><?php echo($perm['g_read_board'] == '0') ? ' disabled="disabled"' : '';
-        ?> tabindex="<?php echo $cur_index++ ?>" />
-									</td>
-									<td<?php if (!$perm['post_replies_def'] && $cur_forum['redirect_url'] == '') {
-    echo ' class="nodefault"';
-}
-        ?>>
-										<input type="hidden" name="post_replies_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['post_replies']) ? '1' : '0';
-        ?>" />
-										<input type="checkbox" name="post_replies_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['post_replies']) ? ' checked="checked"' : '';
-        ?><?php echo($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : '';
-        ?> tabindex="<?php echo $cur_index++ ?>" />
-									</td>
-									<td<?php if (!$perm['post_topics_def'] && $cur_forum['redirect_url'] == '') {
-    echo ' class="nodefault"';
-}
-        ?>>
-										<input type="hidden" name="post_topics_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['post_topics']) ? '1' : '0';
-        ?>" />
-										<input type="checkbox" name="post_topics_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['post_topics']) ? ' checked="checked"' : '';
-        ?><?php echo($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : '';
-        ?> tabindex="<?php echo $cur_index++ ?>" />
-									</td>
-								</tr>
-<?php
-
-    }
-
-?>
-							</tbody>
-							</table>
-							<div class="fsetsubmit"><input type="submit" name="revert_perms" value="<?php _e('Revert to default') ?>" tabindex="<?php echo $cur_index++ ?>" /></div>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/groups/add_edit_group.php b/style/FeatherBB/view/admin/groups/add_edit_group.php
deleted file mode 100644
index bc2bc244..00000000
--- a/style/FeatherBB/view/admin/groups/add_edit_group.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Group settings head') ?></span></h2>
-		<div class="box">
-			<form id="groups2" method="post" action="" onsubmit="return process_form(this)">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" /></p>
-				<div class="inform">
-					<input type="hidden" name="mode" value="<?php echo $group['mode'] ?>" />
-<?php if ($group['mode'] == 'edit'): ?>					<input type="hidden" name="group_id" value="<?php echo $id ?>" />
-<?php endif; ?><?php if ($group['mode'] == 'add'): ?>					<input type="hidden" name="base_group" value="<?php echo $group['base_group'] ?>" />
-<?php endif; ?>					<fieldset>
-						<legend><?php _e('Group settings subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Group settings info') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Group title label') ?></th>
-									<td>
-										<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
-    echo feather_escape($group['info']['g_title']);
-} ?>" tabindex="1" />
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('User title label') ?></th>
-									<td>
-										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
-										<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Promote users label') ?></th>
-									<td>
-										<select name="promote_next_group" tabindex="3">
-											<option value="0"><?php _e('Disable promotion') ?></option>
-											<?php echo $group_list ?>
-										</select>
-										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo feather_escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
-										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
-									</td>
-								</tr>
-<?php if ($group['mode'] != 'edit' || $feather_config['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
-									<th scope="row"> <?php _e('Mod privileges label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="5" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="moderator" value="0"<?php if ($group['info']['g_moderator'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="6" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Mod privileges help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Edit profile label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_edit_users" value="1"<?php if ($group['info']['g_mod_edit_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="7" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_edit_users" value="0"<?php if ($group['info']['g_mod_edit_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="8" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Edit profile help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Rename users label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_rename_users" value="1"<?php if ($group['info']['g_mod_rename_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="9" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_rename_users" value="0"<?php if ($group['info']['g_mod_rename_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="10" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Rename users help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Change passwords label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_change_passwords" value="1"<?php if ($group['info']['g_mod_change_passwords'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="11" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_change_passwords" value="0"<?php if ($group['info']['g_mod_change_passwords'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="12" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Change passwords help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Mod promote users label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_promote_users" value="1"<?php if ($group['info']['g_mod_promote_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="13" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_promote_users" value="0"<?php if ($group['info']['g_mod_promote_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="14" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Mod promote users help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Ban users label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_ban_users" value="1"<?php if ($group['info']['g_mod_ban_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="15" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_ban_users" value="0"<?php if ($group['info']['g_mod_ban_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="16" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Ban users help') ?></span>
-									</td>
-								</tr>
-<?php endif; endif; ?>								<tr>
-									<th scope="row"><?php _e('Read board label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="read_board" value="1"<?php if ($group['info']['g_read_board'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="17" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="read_board" value="0"<?php if ($group['info']['g_read_board'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="18" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Read board help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('View user info label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="view_users" value="1"<?php if ($group['info']['g_view_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="19" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="view_users" value="0"<?php if ($group['info']['g_view_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="20" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('View user info help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Post replies label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="post_replies" value="1"<?php if ($group['info']['g_post_replies'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="21" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="post_replies" value="0"<?php if ($group['info']['g_post_replies'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="22" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Post replies help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Post topics label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="post_topics" value="1"<?php if ($group['info']['g_post_topics'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="23" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="post_topics" value="0"<?php if ($group['info']['g_post_topics'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="24" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Post topics help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Edit posts label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="edit_posts" value="1"<?php if ($group['info']['g_edit_posts'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="25" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="edit_posts" value="0"<?php if ($group['info']['g_edit_posts'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="26" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Edit posts help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Delete posts label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="delete_posts" value="1"<?php if ($group['info']['g_delete_posts'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="27" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="delete_posts" value="0"<?php if ($group['info']['g_delete_posts'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="28" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Delete posts help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Delete topics label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="delete_topics" value="1"<?php if ($group['info']['g_delete_topics'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="29" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="delete_topics" value="0"<?php if ($group['info']['g_delete_topics'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="30" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Delete topics help') ?></span>
-									</td>
-								</tr>
-<?php endif; ?>								<tr>
-									<th scope="row"><?php _e('Post links label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="post_links" value="1"<?php if ($group['info']['g_post_links'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="31" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="post_links" value="0"<?php if ($group['info']['g_post_links'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="32" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Post links help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Set own title label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="set_title" value="1"<?php if ($group['info']['g_set_title'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="33" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="set_title" value="0"<?php if ($group['info']['g_set_title'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="34" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Set own title help') ?></span>
-									</td>
-								</tr>
-<?php endif; ?>								<tr>
-									<th scope="row"><?php _e('User search label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="search" value="1"<?php if ($group['info']['g_search'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="35" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="search" value="0"<?php if ($group['info']['g_search'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="36" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('User search help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('User list search label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="search_users" value="1"<?php if ($group['info']['g_search_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="37" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="search_users" value="0"<?php if ($group['info']['g_search_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="38" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('User list search help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Send e-mails label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="send_email" value="1"<?php if ($group['info']['g_send_email'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="39" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="send_email" value="0"<?php if ($group['info']['g_send_email'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="40" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Send e-mails help') ?></span>
-									</td>
-								</tr>
-<?php endif; ?>								<tr>
-									<th scope="row"><?php _e('Post flood label') ?></th>
-									<td>
-										<input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_post_flood'] ?>" tabindex="41" />
-										<span><?php _e('Post flood help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Search flood label') ?></th>
-									<td>
-										<input type="text" name="search_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_search_flood'] ?>" tabindex="42" />
-										<span><?php _e('Search flood help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('E-mail flood label') ?></th>
-									<td>
-										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_email_flood'] ?>" tabindex="43" />
-										<span><?php _e('E-mail flood help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Report flood label') ?></th>
-									<td>
-										<input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_report_flood'] ?>" tabindex="44" />
-										<span><?php _e('Report flood help') ?></span>
-									</td>
-								</tr>
-<?php endif; endif; ?>							</table>
-<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php _e('Moderator info') ?></p>
-<?php endif; ?>						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" tabindex="45" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/groups/admin_groups.php b/style/FeatherBB/view/admin/groups/admin_groups.php
deleted file mode 100644
index 643b4883..00000000
--- a/style/FeatherBB/view/admin/groups/admin_groups.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Add groups head') ?></span></h2>
-		<div class="box">
-				<div class="inform">
-					<fieldset>
-                        <form id="groups" method="post" action="<?php echo get_link('admin/groups/add/') ?>">
-                        <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php _e('Add group subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('New group label') ?><div><input type="submit" name="add_group" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
-									<td>
-										<select id="base_group" name="base_group" tabindex="1">
-<?php
-
-foreach ($groups as $cur_group) {
-    if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
-        if ($cur_group['g_id'] == $feather_config['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
-        } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
-        }
-    }
-}
-
-?>
-										</select>
-										<span><?php _e('New group help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-                        </form>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-                        <form id="groups" method="post" action="<?php echo get_link('admin/groups/') ?>">
-                        	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php _e('Default group subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Default group label') ?><div><input type="submit" name="set_default_group" value="<?php _e('Save') ?>" tabindex="4" /></div></th>
-									<td>
-										<select id="default_group" name="default_group" tabindex="3">
-<?php
-
-foreach ($groups as $cur_group) {
-    if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
-        if ($cur_group['g_id'] == $feather_config['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
-        } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
-        }
-    }
-}
-
-?>
-										</select>
-										<span><?php _e('Default group help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-                        </form>
-					</fieldset>
-				</div>
-		</div>
-
-		<h2 class="block2"><span><?php _e('Existing groups head') ?></span></h2>
-		<div class="box">
-			<div class="fakeform">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit groups subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Edit groups info') ?></p>
-							<table>
-<?php
-foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.get_link('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.get_link('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
-}
-
-?>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/groups/confirm_delete.php b/style/FeatherBB/view/admin/groups/confirm_delete.php
deleted file mode 100644
index ca595ab3..00000000
--- a/style/FeatherBB/view/admin/groups/confirm_delete.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Group delete head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-				<input type="hidden" name="group_to_delete" value="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>" />
-					<fieldset>
-						<legend><?php _e('Confirm delete subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Confirm delete info'), feather_escape($group_title)) ?></p>
-							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="del_group_comply" value="<?php _e('Delete') ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/groups/delete_group.php b/style/FeatherBB/view/admin/groups/delete_group.php
deleted file mode 100644
index 693baab1..00000000
--- a/style/FeatherBB/view/admin/groups/delete_group.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Delete group head') ?></span></h2>
-		<div class="box">
-			<form id="groups" method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Move users subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Move users info'), feather_escape($group_info['title']), forum_number_format($group_info['members'])) ?></p>
-							<label><?php _e('Move users label') ?>
-							<select name="move_to_group">
-								<?php get_group_list_delete($id); ?>
-							</select>
-							<br /></label>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="del_group" value="<?php _e('Delete group') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/index.html b/style/FeatherBB/view/admin/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/admin/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/admin/index.php b/style/FeatherBB/view/admin/index.php
deleted file mode 100644
index dc0dcf8c..00000000
--- a/style/FeatherBB/view/admin/index.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="block">
-		<h2><span><?php _e('Forum admin head') ?></span></h2>
-		<div id="adintro" class="box">
-			<div class="inbox">
-				<p><?php _e('Welcome to admin') ?></p>
-				<ul>
-					<li><span><?php _e('Welcome 1') ?></span></li>
-					<li><span><?php _e('Welcome 2') ?></span></li>
-					<li><span><?php _e('Welcome 3') ?></span></li>
-					<li><span><?php _e('Welcome 4') ?></span></li>
-					<li><span><?php _e('Welcome 5') ?></span></li>
-					<li><span><?php _e('Welcome 6') ?></span></li>
-					<li><span><?php _e('Welcome 7') ?></span></li>
-					<li><span><?php _e('Welcome 8') ?></span></li>
-					<li><span><?php _e('Welcome 9') ?></span></li>
-				</ul>
-			</div>
-		</div>
-
-<?php if ($install_file_exists) : ?>
-		<h2 class="block2"><span><?php _e('Alerts head') ?></span></h2>
-		<div id="adalerts" class="box">
-			<p><?php printf(__('Install file exists'), '<a href="'.get_link('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
-		</div>
-<?php endif; ?>
-
-		<h2 class="block2"><span><?php _e('About head') ?></span></h2>
-		<div id="adstats" class="box">
-			<div class="inbox">
-				<dl>
-					<dt><?php _e('FeatherBB version label') ?></dt>
-					<dd>
-						<?php printf(__('FeatherBB version data')."\n", $feather_config['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
-					</dd>
-					<dt><?php _e('Server statistics label') ?></dt>
-					<dd>
-						<a href="<?php echo get_link('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
-					</dd>
-					<dt><?php _e('Support label') ?></dt>
-					<dd>
-						<a href="http://FeatherBB.org/forums/index.php"><?php _e('Forum label') ?></a> - <a href="http://gitter.im/featherbb/featherbb"><?php _e('IRC label') ?></a>
-					</dd>
-				</dl>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/loader.php b/style/FeatherBB/view/admin/loader.php
deleted file mode 100644
index 6a61c22f..00000000
--- a/style/FeatherBB/view/admin/loader.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/maintenance/admin_maintenance.php b/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
deleted file mode 100644
index 068b914b..00000000
--- a/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Maintenance head') ?></span></h2>
-		<div class="box">
-			<form method="get" action="<?php echo get_link('admin/maintenance/') ?>">
-				<div class="inform">
-					<input type="hidden" name="action" value="rebuild" />
-					<fieldset>
-						<legend><?php _e('Rebuild index subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Rebuild index info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Posts per cycle label') ?></th>
-									<td>
-										<input type="text" name="i_per_page" size="7" maxlength="7" value="300" tabindex="1" />
-										<span><?php _e('Posts per cycle help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Starting post label') ?></th>
-									<td>
-										<input type="text" name="i_start_at" size="7" maxlength="7" value="<?php echo(isset($first_id)) ? $first_id : 0 ?>" tabindex="2" />
-										<span><?php _e('Starting post help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Empty index label') ?></th>
-									<td class="inputadmin">
-										<label><input type="checkbox" name="i_empty_index" value="1" tabindex="3" checked="checked" />&#160;&#160;<?php _e('Empty index help') ?></label>
-									</td>
-								</tr>
-							</table>
-							<p class="topspace"><?php _e('Rebuild completed info') ?></p>
-							<div class="fsetsubmit"><input type="submit" name="rebuild_index" value="<?php _e('Rebuild index') ?>" tabindex="4" /></div>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-
-			<form method="post" action="<?php echo get_link('admin/maintenance/') ?>" onsubmit="return process_form(this)">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<input type="hidden" name="action" value="prune" />
-					<fieldset>
-						<legend><?php _e('Prune subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Days old label') ?></th>
-									<td>
-										<input type="text" name="req_prune_days" size="3" maxlength="3" tabindex="5" />
-										<span><?php _e('Days old help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Prune sticky label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="prune_sticky" value="1" tabindex="6" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="prune_sticky" value="0" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Prune sticky help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Prune from label') ?></th>
-									<td>
-										<select name="prune_from" tabindex="7">
-											<option value="all"><?php _e('All forums') ?></option>
-												<?php echo $categories; ?>
-											</optgroup>
-										</select>
-										<span><?php _e('Prune from help') ?></span>
-									</td>
-								</tr>
-							</table>
-							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
-							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php _e('Prune') ?>" tabindex="8" /></div>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/maintenance/index.html b/style/FeatherBB/view/admin/maintenance/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/admin/maintenance/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/admin/maintenance/prune.php b/style/FeatherBB/view/admin/maintenance/prune.php
deleted file mode 100644
index 9e3b0d2b..00000000
--- a/style/FeatherBB/view/admin/maintenance/prune.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Prune head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/maintenance/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<input type="hidden" name="action" value="prune" />
-					<input type="hidden" name="prune_days" value="<?php echo $prune['days'] ?>" />
-					<input type="hidden" name="prune_sticky" value="<?php echo $prune_sticky ?>" />
-					<input type="hidden" name="prune_from" value="<?php echo $prune_from ?>" />
-					<fieldset>
-						<legend><?php _e('Confirm prune subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], forum_number_format($prune['num_topics'])) ?></p>
-							<p class="warntext"><?php _e('Confirm prune warn') ?></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="prune_comply" value="<?php _e('Prune') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/maintenance/rebuild.php b/style/FeatherBB/view/admin/maintenance/rebuild.php
deleted file mode 100644
index 5bd6ffc0..00000000
--- a/style/FeatherBB/view/admin/maintenance/rebuild.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><?php echo generate_page_title($page_title) ?></title>
-<style type="text/css">
-body {
-	font: 12px Verdana, Arial, Helvetica, sans-serif;
-	color: #333333;
-	background-color: #FFFFFF
-}
-
-h1 {
-	font-size: 16px;
-	font-weight: normal;
-}
-</style>
-</head>
-<body>
-
-<h1><?php _e('Rebuilding index info') ?></h1>
-<hr />
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/menu.php b/style/FeatherBB/view/admin/menu.php
deleted file mode 100644
index b33c2727..00000000
--- a/style/FeatherBB/view/admin/menu.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="adminconsole" class="block2col">
-	<div id="adminmenu" class="blockmenu">
-		<h2><span><?php _e('Moderator menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-					<li<?php if ($page == 'index') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo get_link('admin/') ?>"><?php _e('Index') ?></a></li>
-					<li<?php if ($page == 'users') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
-<?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
-<?php endif;
-    if ($is_admin || $feather_config['o_report_method'] == '0' || $feather_config['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
-<?php endif;
-    ?>				</ul>
-			</div>
-		</div>
-<?php
-
-    if ($is_admin) {
-        ?>
-		<h2 class="block2"><span><?php _e('Admin menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-					<li<?php if ($page == 'options') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/options/') ?>"><?php _e('Options') ?></a></li>
-					<li<?php if ($page == 'permissions') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
-					<li<?php if ($page == 'categories') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
-					<li<?php if ($page == 'forums') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
-					<li<?php if ($page == 'groups') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
-					<li<?php if ($page == 'censoring') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
-					<li<?php if ($page == 'parser') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
-					<li<?php if ($page == 'maintenance') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
-				</ul>
-			</div>
-		</div>
-<?php
-
-    }
-
-    // Did we find any plugins?
-    if (!empty($plugins)) {
-        ?>
-		<h2 class="block2"><span><?php _e('Plugins menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-<?php
-
-        foreach ($plugins as $plugin_name => $plugin) {
-            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.get_link('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
-        }
-
-        ?>
-				</ul>
-			</div>
-		</div>
-<?php
-
-    }
-
-    ?>
-	</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/options.php b/style/FeatherBB/view/admin/options.php
deleted file mode 100644
index faa8e34c..00000000
--- a/style/FeatherBB/view/admin/options.php
+++ /dev/null
@@ -1,849 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Options head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/options/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-				<div class="inform">
-					<input type="hidden" name="form_sent" value="1" />
-					<fieldset>
-						<legend><?php _e('Essentials subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Board title label') ?></th>
-									<td>
-										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather_config['o_board_title']) ?>" />
-										<span><?php _e('Board title help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Board desc label') ?></th>
-									<td>
-										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather_config['o_board_desc']) ?></textarea>
-										<span><?php _e('Board desc help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Base URL label') ?></th>
-									<td>
-										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather_config['o_base_url']) ?>" />
-										<span><?php _e('Base URL help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Timezone label') ?></th>
-									<td>
-										<select name="form_default_timezone">
-											<option value="-12"<?php if ($feather_config['o_default_timezone'] == -12) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-12:00') ?></option>
-											<option value="-11"<?php if ($feather_config['o_default_timezone'] == -11) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-11:00') ?></option>
-											<option value="-10"<?php if ($feather_config['o_default_timezone'] == -10) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-10:00') ?></option>
-											<option value="-9.5"<?php if ($feather_config['o_default_timezone'] == -9.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-09:30') ?></option>
-											<option value="-9"<?php if ($feather_config['o_default_timezone'] == -9) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-09:00') ?></option>
-											<option value="-8.5"<?php if ($feather_config['o_default_timezone'] == -8.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-08:30') ?></option>
-											<option value="-8"<?php if ($feather_config['o_default_timezone'] == -8) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-08:00') ?></option>
-											<option value="-7"<?php if ($feather_config['o_default_timezone'] == -7) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-07:00') ?></option>
-											<option value="-6"<?php if ($feather_config['o_default_timezone'] == -6) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-06:00') ?></option>
-											<option value="-5"<?php if ($feather_config['o_default_timezone'] == -5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-05:00') ?></option>
-											<option value="-4"<?php if ($feather_config['o_default_timezone'] == -4) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-04:00') ?></option>
-											<option value="-3.5"<?php if ($feather_config['o_default_timezone'] == -3.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-03:30') ?></option>
-											<option value="-3"<?php if ($feather_config['o_default_timezone'] == -3) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-03:00') ?></option>
-											<option value="-2"<?php if ($feather_config['o_default_timezone'] == -2) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-02:00') ?></option>
-											<option value="-1"<?php if ($feather_config['o_default_timezone'] == -1) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-01:00') ?></option>
-											<option value="0"<?php if ($feather_config['o_default_timezone'] == 0) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC') ?></option>
-											<option value="1"<?php if ($feather_config['o_default_timezone'] == 1) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+01:00') ?></option>
-											<option value="2"<?php if ($feather_config['o_default_timezone'] == 2) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+02:00') ?></option>
-											<option value="3"<?php if ($feather_config['o_default_timezone'] == 3) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+03:00') ?></option>
-											<option value="3.5"<?php if ($feather_config['o_default_timezone'] == 3.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+03:30') ?></option>
-											<option value="4"<?php if ($feather_config['o_default_timezone'] == 4) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+04:00') ?></option>
-											<option value="4.5"<?php if ($feather_config['o_default_timezone'] == 4.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+04:30') ?></option>
-											<option value="5"<?php if ($feather_config['o_default_timezone'] == 5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:00') ?></option>
-											<option value="5.5"<?php if ($feather_config['o_default_timezone'] == 5.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:30') ?></option>
-											<option value="5.75"<?php if ($feather_config['o_default_timezone'] == 5.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:45') ?></option>
-											<option value="6"<?php if ($feather_config['o_default_timezone'] == 6) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+06:00') ?></option>
-											<option value="6.5"<?php if ($feather_config['o_default_timezone'] == 6.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+06:30') ?></option>
-											<option value="7"<?php if ($feather_config['o_default_timezone'] == 7) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+07:00') ?></option>
-											<option value="8"<?php if ($feather_config['o_default_timezone'] == 8) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+08:00') ?></option>
-											<option value="8.75"<?php if ($feather_config['o_default_timezone'] == 8.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+08:45') ?></option>
-											<option value="9"<?php if ($feather_config['o_default_timezone'] == 9) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+09:00') ?></option>
-											<option value="9.5"<?php if ($feather_config['o_default_timezone'] == 9.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+09:30') ?></option>
-											<option value="10"<?php if ($feather_config['o_default_timezone'] == 10) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+10:00') ?></option>
-											<option value="10.5"<?php if ($feather_config['o_default_timezone'] == 10.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+10:30') ?></option>
-											<option value="11"<?php if ($feather_config['o_default_timezone'] == 11) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+11:00') ?></option>
-											<option value="11.5"<?php if ($feather_config['o_default_timezone'] == 11.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+11:30') ?></option>
-											<option value="12"<?php if ($feather_config['o_default_timezone'] == 12) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+12:00') ?></option>
-											<option value="12.75"<?php if ($feather_config['o_default_timezone'] == 12.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+12:45') ?></option>
-											<option value="13"<?php if ($feather_config['o_default_timezone'] == 13) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+13:00') ?></option>
-											<option value="14"<?php if ($feather_config['o_default_timezone'] == 14) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+14:00') ?></option>
-										</select>
-										<span><?php _e('Timezone help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('DST label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather_config['o_default_dst'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather_config['o_default_dst'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('DST help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Language label') ?></th>
-									<td>
-										<select name="form_default_lang">
-<?php
-        foreach ($languages as $temp) {
-            if ($feather_config['o_default_lang'] == $temp) {
-                echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
-            } else {
-                echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
-            }
-        }
-
-?>
-										</select>
-										<span><?php _e('Language help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Default style label') ?></th>
-									<td>
-										<select name="form_default_style">
-											<?php echo $styles; ?>
-										</select>
-										<span><?php _e('Default style help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-    $diff = ($feather->user->timezone + $feather->user->dst) * 3600;
-    $timestamp = time() + $diff;
-
-?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Timeouts subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Time format label') ?></th>
-									<td>
-										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_time_format']) ?>" />
-										<span><?php printf(__('Time format help'), gmdate($feather_config['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Date format label') ?></th>
-									<td>
-										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_date_format']) ?>" />
-										<span><?php printf(__('Date format help'), gmdate($feather_config['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Visit timeout label') ?></th>
-									<td>
-										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_visit'] ?>" />
-										<span><?php _e('Visit timeout help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Online timeout label') ?></th>
-									<td>
-										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_online'] ?>" />
-										<span><?php _e('Online timeout help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Redirect time label') ?></th>
-									<td>
-										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather_config['o_redirect_delay'] ?>" />
-										<span><?php _e('Redirect time help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Display subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Version number label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather_config['o_show_version'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather_config['o_show_version'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Version number help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Info in posts label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather_config['o_show_user_info'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather_config['o_show_user_info'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Info in posts help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Post count label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather_config['o_show_post_count'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather_config['o_show_post_count'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Post count help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Smilies label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather_config['o_smilies'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather_config['o_smilies'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Smilies help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Smilies sigs label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather_config['o_smilies_sig'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather_config['o_smilies_sig'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Smilies sigs help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Clickable links label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather_config['o_make_links'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather_config['o_make_links'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Clickable links help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Topic review label') ?></th>
-									<td>
-										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather_config['o_topic_review'] ?>" />
-										<span><?php _e('Topic review help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Topics per page label') ?></th>
-									<td>
-										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_topics_default'] ?>" />
-										<span><?php _e('Topics per page help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Posts per page label') ?></th>
-									<td>
-										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_posts_default'] ?>" />
-										<span><?php _e('Posts per page help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Indent label') ?></th>
-									<td>
-										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather_config['o_indent_num_spaces'] ?>" />
-										<span><?php _e('Indent help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Quote depth label') ?></th>
-									<td>
-										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather_config['o_quote_depth'] ?>" />
-										<span><?php _e('Quote depth help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Features subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Quick post label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather_config['o_quickpost'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather_config['o_quickpost'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Quick post help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Users online label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather_config['o_users_online'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather_config['o_users_online'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Users online help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><a name="censoring"></a><?php _e('Censor words label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather_config['o_censoring'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather_config['o_censoring'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><a name="signatures"></a><?php _e('Signatures label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather_config['o_signatures'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather_config['o_signatures'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Signatures help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('User has posted label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather_config['o_show_dot'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather_config['o_show_dot'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('User has posted help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Topic views label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather_config['o_topic_views'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather_config['o_topic_views'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Topic views help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Quick jump label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather_config['o_quickjump'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather_config['o_quickjump'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Quick jump help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('GZip label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather_config['o_gzip'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather_config['o_gzip'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('GZip help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Search all label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather_config['o_search_all_forums'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather_config['o_search_all_forums'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Search all help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Menu items label') ?></th>
-									<td>
-										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather_config['o_additional_navlinks']) ?></textarea>
-										<span><?php _e('Menu items help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Feed subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Default feed label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather_config['o_feed_type'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('None') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather_config['o_feed_type'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('RSS') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather_config['o_feed_type'] == '2') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Atom') ?></strong></label>
-										<span class="clearb"><?php _e('Default feed help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Feed TTL label') ?></th>
-									<td>
-										<select name="form_feed_ttl">
-											<option value="0"<?php if ($feather_config['o_feed_ttl'] == '0') {
-    echo ' selected="selected"';
-} ?>><?php _e('No cache') ?></option>
-											<?php echo $times ?>
-										</select>
-										<span><?php _e('Feed TTL help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Reports subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Reporting method label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather_config['o_report_method'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Internal') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather_config['o_report_method'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('By e-mail') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather_config['o_report_method'] == '2') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Both') ?></strong></label>
-										<span class="clearb"><?php _e('Reporting method help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Mailing list label') ?></th>
-									<td>
-										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather_config['o_mailing_list']) ?></textarea>
-										<span><?php _e('Mailing list help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Avatars subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Use avatars label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather_config['o_avatars'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather_config['o_avatars'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Use avatars help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Upload directory label') ?></th>
-									<td>
-										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather_config['o_avatars_dir']) ?>" />
-										<span><?php _e('Upload directory help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max width label') ?></th>
-									<td>
-										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_width'] ?>" />
-										<span><?php _e('Max width help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max height label') ?></th>
-									<td>
-										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_height'] ?>" />
-										<span><?php _e('Max height help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max size label') ?></th>
-									<td>
-										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-										<span><?php _e('Max size help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('E-mail subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Admin e-mail label') ?></th>
-									<td>
-										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_admin_email']) ?>" />
-										<span><?php _e('Admin e-mail help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
-									<td>
-										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_webmaster_email']) ?>" />
-										<span><?php _e('Webmaster e-mail help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Forum subscriptions label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather_config['o_forum_subscriptions'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather_config['o_forum_subscriptions'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Forum subscriptions help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Topic subscriptions label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather_config['o_topic_subscriptions'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather_config['o_topic_subscriptions'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Topic subscriptions help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('SMTP address label') ?></th>
-									<td>
-										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather_config['o_smtp_host']) ?>" />
-										<span><?php _e('SMTP address help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('SMTP username label') ?></th>
-									<td>
-										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather_config['o_smtp_user']) ?>" />
-										<span><?php _e('SMTP username help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('SMTP password label') ?></th>
-									<td>
-										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
-<?php $smtp_pass = !empty($feather_config['o_smtp_pass']) ? random_key(feather_strlen($feather_config['o_smtp_pass']), true) : ''; ?>
-										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
-										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
-										<span><?php _e('SMTP password help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('SMTP SSL label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather_config['o_smtp_ssl'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather_config['o_smtp_ssl'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('SMTP SSL help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Registration subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Allow new label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather_config['o_regs_allow'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather_config['o_regs_allow'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Allow new help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Verify label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather_config['o_regs_verify'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather_config['o_regs_verify'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Verify help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Report new label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather_config['o_regs_report'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather_config['o_regs_report'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Report new help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Use rules label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather_config['o_rules'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather_config['o_rules'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Use rules help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Rules label') ?></th>
-									<td>
-										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather_config['o_rules_message']) ?></textarea>
-										<span><?php _e('Rules help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('E-mail default label') ?></th>
-									<td>
-										<span><?php _e('E-mail default help') ?></span>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather_config['o_default_email_setting'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<?php _e('Display e-mail label') ?></label>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather_config['o_default_email_setting'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<?php _e('Hide allow form label') ?></label>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather_config['o_default_email_setting'] == '2') {
-    echo ' checked="checked"';
-} ?> />&#160;<?php _e('Hide both label') ?></label>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Announcement subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Display announcement label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather_config['o_announcement'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather_config['o_announcement'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Display announcement help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Announcement message label') ?></th>
-									<td>
-										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_announcement_message']) ?></textarea>
-										<span><?php _e('Announcement message help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Maintenance subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><a name="maintenance"></a><?php _e('Maintenance mode label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather_config['o_maintenance'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather_config['o_maintenance'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Maintenance mode help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Maintenance message label') ?></th>
-									<td>
-										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_maintenance_message']) ?></textarea>
-										<span><?php _e('Maintenance message help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/parser.php b/style/FeatherBB/view/admin/parser.php
deleted file mode 100644
index aec1f767..00000000
--- a/style/FeatherBB/view/admin/parser.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php echo $lang_admin_parser['Parser head'] ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/parser/') ?>" enctype="multipart/form-data">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop">
-					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
-					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
-				</p>
-				<div class="inform">
-					<input type="hidden" name="form_sent" value="1" />
-					<fieldset>
-						<legend><?php echo $lang_admin_parser['Config subhead'] ?></legend>
-						<div class="infldset">
-							<table class="aligntop" cellspacing="0">
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['textile'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[textile]" value="1"<?php if ($config['textile']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[textile]" value="0"<?php if (!$config['textile']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['textile help'] ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['quote_links'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[quote_links]" value="1"<?php if ($config['quote_links']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_links]" value="0"<?php if (!$config['quote_links']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['quote_links help'] ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['quote_imgs'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[quote_imgs]" value="1"<?php if ($config['quote_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_imgs]" value="0"<?php if (!$config['quote_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['quote_imgs help'] ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['click_imgs'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[click_imgs]" value="1"<?php if ($config['click_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[click_imgs]" value="0"<?php if (!$config['click_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['click_imgs help'] ?></span>
-									</td>
-								</tr>
-
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['valid_imgs'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[valid_imgs]" value="1"<?php if ($config['valid_imgs']) {
-    echo ' checked="checked"';
-} if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php _e('Yes') ?></strong>
-										<input type="radio" name="config[valid_imgs]" value="0"<?php if (!$config['valid_imgs']) {
-    echo ' checked="checked"';
-} if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td><?php echo $lang_admin_parser['valid_imgs help'] ?></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['max_size'] ?></th>
-									<td colspan="2">
-										<input type="text" name="config[max_size]" size="10" maxlength="8" value="<?php echo($config['max_size'])?>"<?php if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
-} ?> />
-									</td>
-									<td><span><?php echo $lang_admin_parser['max_size help'] ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['def_xy'] ?></th>
-									<td>
-										<input type="text" name="config[def_width]" size="5" maxlength="5" value="<?php echo $config['def_width'] ?>" /> X:Width
-									</td>
-									<td>
-										<input type="text" name="config[def_height]" size="5" maxlength="5" value="<?php echo $config['def_height'] ?>" /> Y:Height
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['def_xy help'] ?></span>
-									</td>
-								</tr>
-
-
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['max_xy'] ?></th>
-									<td>
-										<input type="text" name="config[max_width]" size="5" maxlength="5" value="<?php echo $config['max_width'] ?>" /> X:Width
-									</td>
-									<td>
-										<input type="text" name="config[max_height]" size="5" maxlength="5" value="<?php echo $config['max_height'] ?>" /> Y:Height
-									</td>
-									<td><?php echo $lang_admin_parser['max_xy help'] ?></td>
-								</tr>
-
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['smiley_size'] ?></th>
-									<td colspan=2>
-										<input type="text" name="config[smiley_size]" size="5" maxlength="5" value="<?php echo $config['smiley_size'] .'%' ?>" />
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['smiley_size help'] ?></span>
-									</td>
-								</tr>
-
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php echo $lang_admin_parser['Smilies subhead'] ?></legend>
-						<div class="infldset">
-							<table cellspacing="0">
-							<thead>
-								<tr>
-									<th scope="col"><?php echo $lang_admin_parser['smiley_text_label'] ?></th>
-									<th scope="col"><?php echo $lang_admin_parser['smiley_file_label'] ?></th>
-									<th scope="col">:)</th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-    foreach ($smilies as $key => $value) {
-        $i++;
-        $oldfile = $value['file'];
-        ?>
-								<tr>
-									<td><input type="text" name="smiley_text[<?php echo($i);
-        ?>]" value="<?php echo(feather_escape($key));
-        ?>" size="20" maxlength="80" /></td>
-									<td>
-										<select name="smiley_file[<?php echo($i);
-        ?>]">
-<?php
-        foreach ($smiley_files as $file) {
-            if ($file === $oldfile) {
-                echo("\t\t\t\t\t\t\t\t\t\t\t<option selected=\"selected\">" . $file . "</option>\n");
-            } else {
-                echo("\t\t\t\t\t\t\t\t\t\t\t<option>" . $file . "</option>\n");
-            }
-        }
-        ?>
-										</select>
-									</td>
-									<td>
-										<?php echo($value['html']);
-        ?>
-									</td>
-								</tr>
-<?php
-
-    }
-?>
-								<tr>
-									<td><input type="text" name="smiley_text[<?php echo(++$i); ?>]" value="" size="20" maxlength="80" /><br />New smiley text</td>
-									<td>
-										<select name="smiley_file[<?php echo($i); ?>]">
-											<option selected="selected">select new file</option>
-<?php
-        foreach ($smiley_files as $file) {
-            echo("\t\t\t\t\t\t\t\t\t\t\t<option>" . $file . "</option>\n");
-        }
-?>
-										</select><br /><?php echo($lang_admin_parser['New smiley image']); ?>
-									</td>
-									<td></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo($lang_admin_parser['smiley_upload']); ?></th>
- <?php if (ini_get('file_uploads')) {
-    ?>
-									<td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-										<input type="file" name="new_smiley" id="upload_smiley" /></td>
-									<td><input type="submit" name="upload" value="<?php echo($lang_admin_parser['upload_button']);
-    ?>" /></td>
-<?php 
-} else {
-    ?>
-									<td colspan="2"><?php echo($lang_admin_parser['upload_off']);
-    ?></td>
-<?php 
-} ?>
-								</tr>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-
-
-
-				<div class="inform">
-					<fieldset>
-						<legend><?php echo $lang_admin_parser['BBCodes subhead'] ?></legend>
-						<div class="infldset">
-							<table cellspacing="0">
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php echo $lang_admin_parser['tagname_label'] ?></th>
-									<th class="tc3" scope="col"><?php echo $lang_admin_parser['in_post_label'] ?></th>
-									<th class="hidehead" scope="col"><?php echo $lang_admin_parser['in_sig_label'] ?></th>
-									<th class="tc2" scope="col"><?php echo $lang_admin_parser['depth_max'] ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-foreach ($bbcd as $tagname => $tagdata) {
-    if ($tagname == '_ROOT_') {
-        continue;
-    } // Skip last pseudo-tag
-    $title = isset($lang_admin_parser['tag_summary'][$tagname]) ?
-                $lang_admin_parser['tag_summary'][$tagname] : '';
-    ?>
-								<tr>
-									<th scope="row" title="<?php echo($title);
-    ?>"><?php echo('['. $tagname .']') ?></th>
-									<td>
-										<input type="radio" name="<?php echo($tagname) ?>_in_post" value="1"<?php if ($bbcd[$tagname]['in_post']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_post" value="0"<?php if (!$bbcd[$tagname]['in_post']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<input type="radio" name="<?php echo($tagname) ?>_in_sig" value="1"<?php if ($bbcd[$tagname]['in_sig']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_sig" value="0"<?php if (!$bbcd[$tagname]['in_sig']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<input type="text" size="10" name="<?php echo($tagname) ?>_depth_max" value="<?php echo($bbcd[$tagname]['depth_max']);
-    ?>" <?php if ($tagdata['html_type'] === 'inline' || $tagdata['tag_type'] === 'hidden') {
-    echo(' disabled="disabled" style="display: none;"');
-}
-    ?> />
-									</td>
-								</tr>
-<?php 
-} ?>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-
-
-				<p class="submitend">
-					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
-					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
-				</p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/permissions.php b/style/FeatherBB/view/admin/permissions.php
deleted file mode 100644
index a70328ae..00000000
--- a/style/FeatherBB/view/admin/permissions.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Permissions head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/permissions/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-				<div class="inform">
-					<input type="hidden" name="form_sent" value="1" />
-					<fieldset>
-						<legend><?php _e('Posting subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('BBCode label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather_config['p_message_bbcode'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather_config['p_message_bbcode'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('BBCode help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Image tag label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather_config['p_message_img_tag'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather_config['p_message_img_tag'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Image tag help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('All caps message label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather_config['p_message_all_caps'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather_config['p_message_all_caps'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('All caps message help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('All caps subject label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather_config['p_subject_all_caps'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather_config['p_subject_all_caps'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('All caps subject help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Require e-mail label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather_config['p_force_guest_email'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather_config['p_force_guest_email'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Require e-mail help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Signatures subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('BBCode sigs label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather_config['p_sig_bbcode'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather_config['p_sig_bbcode'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('BBCode sigs help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Image tag sigs label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather_config['p_sig_img_tag'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather_config['p_sig_img_tag'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Image tag sigs help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('All caps sigs label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather_config['p_sig_all_caps'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather_config['p_sig_all_caps'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('All caps sigs help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max sig length label') ?></th>
-									<td>
-										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather_config['p_sig_length'] ?>" />
-										<span class="clearb"><?php _e('Max sig length help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max sig lines label') ?></th>
-									<td>
-										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather_config['p_sig_lines'] ?>" />
-										<span class="clearb"><?php _e('Max sig lines help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Registration subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Banned e-mail label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather_config['p_allow_banned_email'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather_config['p_allow_banned_email'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Banned e-mail help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Duplicate e-mail label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather_config['p_allow_dupe_email'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather_config['p_allow_dupe_email'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Duplicate e-mail help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/reports.php b/style/FeatherBB/view/admin/reports.php
deleted file mode 100644
index 63251681..00000000
--- a/style/FeatherBB/view/admin/reports.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('New reports head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/reports/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<?php
-if (!empty($report_data)) {
-    foreach ($report_data as $report) {
-        ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php printf(__('Report subhead'), format_time($report['created'])) ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
-									<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-    }
-} else {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('None') ?></legend>
-						<div class="infldset">
-							<p><?php _e('No new reports') ?></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-}
-
-?>
-			</form>
-		</div>
-	</div>
-
-	<div class="blockform block2">
-		<h2><span><?php _e('Last 10 head') ?></span></h2>
-		<div class="box">
-			<div class="fakeform">
-<?php
-
-if (!empty($report_zapped_data)) {
-    foreach ($report_zapped_data as $report) {
-        ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.get_link('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Reason') ?></th>
-									<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-    }
-} else {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('None') ?></legend>
-						<div class="infldset">
-							<p><?php _e('No zapped reports') ?></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-}
-
-?>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
diff --git a/style/FeatherBB/view/admin/statistics.php b/style/FeatherBB/view/admin/statistics.php
deleted file mode 100644
index 5306b027..00000000
--- a/style/FeatherBB/view/admin/statistics.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="block">
-		<h2><span><?php _e('Server statistics head') ?></span></h2>
-		<div id="adstats" class="box">
-			<div class="inbox">
-				<dl>
-					<dt><?php _e('Server load label') ?></dt>
-					<dd>
-						<?php printf(__('Server load data')."\n", $server_load, $num_online) ?>
-					</dd>
-<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
-					<dd>
-						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
-						<?php printf(__('Environment data version'), phpversion(), '<a href="'.get_link('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
-						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
-					</dd>
-					<dt><?php _e('Database label') ?></dt>
-					<dd>
-<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", forum_number_format($total_records)) ?>
-						<br /><?php printf(__('Database data size')."\n", $total_size) ?>
-<?php endif; ?>					</dd>
-<?php endif; ?>
-				</dl>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/users/admin_users.php b/style/FeatherBB/view/admin/users/admin_users.php
deleted file mode 100644
index 27e99a16..00000000
--- a/style/FeatherBB/view/admin/users/admin_users.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('User search head') ?></span></h2>
-		<div class="box">
-			<form id="find_user" method="get" action="<?php echo get_link('admin/users/') ?>">
-				<p class="submittop"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="1" /></p>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('User search subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('User search info') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Username label') ?></th>
-									<td><input type="text" name="form[username]" size="25" maxlength="25" tabindex="2" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('E-mail address label') ?></th>
-									<td><input type="text" name="form[email]" size="30" maxlength="80" tabindex="3" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Title label') ?></th>
-									<td><input type="text" name="form[title]" size="30" maxlength="50" tabindex="4" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Real name label') ?></th>
-									<td><input type="text" name="form[realname]" size="30" maxlength="40" tabindex="5" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Website label') ?></th>
-									<td><input type="text" name="form[url]" size="35" maxlength="100" tabindex="6" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Jabber label') ?></th>
-									<td><input type="text" name="form[jabber]" size="30" maxlength="75" tabindex="7" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('ICQ label') ?></th>
-									<td><input type="text" name="form[icq]" size="12" maxlength="12" tabindex="8" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('MSN label') ?></th>
-									<td><input type="text" name="form[msn]" size="30" maxlength="50" tabindex="9" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('AOL label') ?></th>
-									<td><input type="text" name="form[aim]" size="20" maxlength="20" tabindex="10" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Yahoo label') ?></th>
-									<td><input type="text" name="form[yahoo]" size="20" maxlength="20" tabindex="11" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Location label') ?></th>
-									<td><input type="text" name="form[location]" size="30" maxlength="30" tabindex="12" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Signature label') ?></th>
-									<td><input type="text" name="form[signature]" size="35" maxlength="512" tabindex="13" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Admin note label') ?></th>
-									<td><input type="text" name="form[admin_note]" size="30" maxlength="30" tabindex="14" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Posts more than label') ?></th>
-									<td><input type="text" name="posts_greater" size="5" maxlength="8" tabindex="15" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Posts less than label') ?></th>
-									<td><input type="text" name="posts_less" size="5" maxlength="8" tabindex="16" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last post after label') ?></th>
-									<td><input type="text" name="last_post_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last post before label') ?></th>
-									<td><input type="text" name="last_post_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last visit after label') ?></th>
-									<td><input type="text" name="last_visit_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last visit before label') ?></th>
-									<td><input type="text" name="last_visit_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Registered after label') ?></th>
-									<td><input type="text" name="registered_after" size="24" maxlength="19" tabindex="19" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Registered before label') ?></th>
-									<td><input type="text" name="registered_before" size="24" maxlength="19" tabindex="20" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Order by label') ?></th>
-									<td>
-										<select name="order_by" tabindex="21">
-											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
-											<option value="email"><?php _e('Order by e-mail') ?></option>
-											<option value="num_posts"><?php _e('Order by posts') ?></option>
-											<option value="last_post"><?php _e('Order by last post') ?></option>
-											<option value="last_visit"><?php _e('Order by last visit') ?></option>
-											<option value="registered"><?php _e('Order by registered') ?></option>
-										</select>&#160;&#160;&#160;<select name="direction" tabindex="22">
-											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
-											<option value="DESC"><?php _e('Descending') ?></option>
-										</select>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('User group label') ?></th>
-									<td>
-										<select name="user_group" tabindex="23">
-											<option value="-1" selected="selected"><?php _e('All groups') ?></option>
-											<option value="0"><?php _e('Unverified users') ?></option>
-											<?php echo $group_list; ?>
-										</select>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="25" /></p>
-			</form>
-		</div>
-
-		<h2 class="block2"><span><?php _e('IP search head') ?></span></h2>
-		<div class="box">
-			<form method="get" action="<?php echo get_link('admin/users/') ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('IP search subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('IP address label') ?><div><input type="submit" value="<?php _e('Find IP address') ?>" tabindex="26" /></div></th>
-									<td><input type="text" name="show_users" size="18" maxlength="15" tabindex="24" />
-									<span><?php _e('IP address help') ?></span></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/users/ban_users.php b/style/FeatherBB/view/admin/users/ban_users.php
deleted file mode 100644
index e929c043..00000000
--- a/style/FeatherBB/view/admin/users/ban_users.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Ban users') ?></span></h2>
-		<div class="box">
-			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo get_link('admin/users') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Message expiry subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Ban message label') ?></th>
-									<td>
-										<input type="text" name="ban_message" size="50" maxlength="255" tabindex="1" />
-										<span><?php _e('Ban message help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Expire date label') ?></th>
-									<td>
-										<input type="text" name="ban_expire" size="17" maxlength="10" tabindex="2" />
-										<span><?php _e('Expire date help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Ban IP label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="3" value="1" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="4" value="0" checked="checked" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Ban IP help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="ban_users_comply" value="<?php _e('Save') ?>" tabindex="3" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/users/delete_users.php b/style/FeatherBB/view/admin/users/delete_users.php
deleted file mode 100644
index a82c22ec..00000000
--- a/style/FeatherBB/view/admin/users/delete_users.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Delete users') ?></span></h2>
-		<div class="box">
-			<form name="confirm_del_users" method="post" action="<?php echo get_link('admin/users') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Confirm delete legend') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Confirm delete info') ?></p>
-							<div class="rbox">
-								<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
-							</div>
-							<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="delete_users_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/users/find_users.php b/style/FeatherBB/view/admin/users/find_users.php
deleted file mode 100644
index d426177d..00000000
--- a/style/FeatherBB/view/admin/users/find_users.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-
-<form id="search-users-form" action="<?php echo get_link('admin/users/') ?>" method="post">
-<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<div id="users2" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
-					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
-					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
-<?php if ($can_action): ?>					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
-<?php endif;
-    ?>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-    if (!empty($user_data)) {
-        foreach ($user_data as $user) {
-            ?>
-				<tr>
-					<td class="tcl"><?php echo '<a href="'.get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo feather_escape($user['email']) ?>"><?php echo feather_escape($user['email']) ?></a></td>
-					<td class="tc3"><?php echo $user['user_title'] ?></td>
-					<td class="tc4"><?php echo forum_number_format($user['num_posts']) ?></td>
-					<td class="tc5"><?php echo($user['admin_note'] != '') ? feather_escape($user['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
-<?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
-<?php endif;
-            ?>
-				</tr>
-<?php
-
-        }
-    } else {
-        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('No match').'</td></tr>'."\n";
-    }
-
-    ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-<?php if ($can_action): ?>			<p class="conr modbuttons"><a href="#" onclick="return select_checkboxes('search-users-form', this, '<?php _e('Unselect all') ?>')"><?php _e('Select all') ?></a> <?php if ($can_ban) : ?><input type="submit" name="ban_users" value="<?php _e('Ban') ?>" /><?php endif;
-    if ($can_delete) : ?><input type="submit" name="delete_users" value="<?php _e('Delete') ?>" /><?php endif;
-    if ($can_move) : ?><input type="submit" name="move_users" value="<?php _e('Change group') ?>" /><?php endif;
-    ?></p>
-<?php endif;
-    ?>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
-</form>
diff --git a/style/FeatherBB/view/admin/users/move_users.php b/style/FeatherBB/view/admin/users/move_users.php
deleted file mode 100644
index d43303e8..00000000
--- a/style/FeatherBB/view/admin/users/move_users.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Move users') ?></span></h2>
-		<div class="box">
-			<form name="confirm_move_users" method="post" action="<?php echo get_link('admin/users/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Move users subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('New group label') ?></th>
-									<td>
-										<select name="new_group" tabindex="1">
-<?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo feather_escape($group) ?></option>
-<?php endforeach;
-    ?>
-										</select>
-										<span><?php _e('New group help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="move_users_comply" value="<?php _e('Save') ?>" tabindex="2" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/users/search_ip.php b/style/FeatherBB/view/admin/users/search_ip.php
deleted file mode 100644
index a17e7ac5..00000000
--- a/style/FeatherBB/view/admin/users/search_ip.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="users1" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results IP address head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results last used head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results times found head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results action head') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-        foreach ($ip_data as $ip) {
-            ?>
-				<tr>
-					<td class="tcl"><a href="<?php echo get_link('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
-					<td class="tc2"><?php echo format_time($ip['last_used']) ?></td>
-					<td class="tc3"><?php echo $ip['used_times'] ?></td>
-					<td class="tcr"><a href="<?php echo get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
-				</tr>
-<?php
-
-        }
-        if (empty($ip_data)):
-            echo "\t\t\t\t".'<tr><td class="tcl" colspan="4">'.__('Results no posts found').'</td></tr>'."\n";
-        endif;
-
-    ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/users/show_users.php b/style/FeatherBB/view/admin/users/show_users.php
deleted file mode 100644
index 4ab008c7..00000000
--- a/style/FeatherBB/view/admin/users/show_users.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="users2" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
-					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
-					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-    if ($info['num_posts']) {
-
-        // Loop through users and print out some info
-        foreach ($info['posters'] as $cur_poster) {
-            if (isset($info['user_data'][$cur_poster['poster_id']])) {
-                ?>
-				<tr>
-					<td class="tcl"><?php echo '<a href="'.get_link('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.feather_escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
-					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
-					<td class="tc4"><?php echo forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
-					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? feather_escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
-				</tr>
-<?php
-
-            } else {
-                ?>
-				<tr>
-					<td class="tcl"><?php echo feather_escape($cur_poster['poster']) ?></td>
-					<td class="tc2">&#160;</td>
-					<td class="tc3"><?php _e('Results guest') ?></td>
-					<td class="tc4">&#160;</td>
-					<td class="tc5">&#160;</td>
-					<td class="tcr">&#160;</td>
-				</tr>
-<?php
-
-            }
-        }
-    } else {
-        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('Results no IP found').'</td></tr>'."\n";
-    }
-
-    ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/delete.php b/style/FeatherBB/view/delete.php
deleted file mode 100644
index 8a2d6959..00000000
--- a/style/FeatherBB/view/delete.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="index.php"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<div class="blockform">
-	<h2><span><?php _e('Delete post') ?></span></h2>
-	<div class="box">
-		<form method="post" action="<?php echo get_link('delete/'.$id.'/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
-					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
-				</div>
-			</div>
-			<p class="buttons"><input type="submit" name="delete" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
-
-<div id="postreview">
-	<div class="blockpost">
-		<div class="box">
-			<div class="inbox">
-				<div class="postbody">
-					<div class="postleft">
-						<dl>
-							<dt><strong><?php echo feather_escape($cur_post['poster']) ?></strong></dt>
-							<dd><span><?php echo format_time($cur_post['posted']) ?></span></dd>
-						</dl>
-					</div>
-					<div class="postright">
-						<div class="postmsg">
-							<?php echo $cur_post['message']."\n" ?>
-						</div>
-					</div>
-				</div>
-				<div class="clearer"></div>
-			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/edit.php b/style/FeatherBB/view/edit.php
deleted file mode 100644
index 48a692e8..00000000
--- a/style/FeatherBB/view/edit.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-$cur_index = 1;
-
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<?php
-
-// If there are errors, we display them
-if (!empty($errors)) :
-?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('Post errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('Post errors info') ?></p>
-			<ul class="error-list">
-<?php
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-?>
-			</ul>
-		</div>
-	</div>
-</div>
-<?php
-elseif ($feather->request->post('preview')):
-?>
-<div id="postpreview" class="blockpost">
-	<h2><span><?php _e('Post preview') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postright">
-					<div class="postmsg">
-						<?php echo $preview_message."\n" ?>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-<?php
-endif;
-?>
-<!-- Init BBcode editor toolbar -->
-<script>
-    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
-        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
-</script>
-<script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
-<div id="editform" class="blockform">
-	<h2><span><?php _e('Edit post') ?></span></h2>
-	<div class="box">
-		<form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Edit post legend') ?></legend>
-					<input type="hidden" name="form_sent" value="1" />
-					<div class="infldset txtarea">
-<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
-						<script>postEditorToolbar('req_message');</script>
-                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
-						</ul>
-					</div>
-				</fieldset>
-			</div>
-<?php
-if (!empty($checkboxes)):
-?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Options') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php
-endif;
-?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
deleted file mode 100644
index 470d5c6b..00000000
--- a/style/FeatherBB/view/footer.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-?>
-</div>
-
-<div id="brdfooter" class="block">
-	<h2><span><?php _e('Board footer') ?></span></h2>
-	<div class="box">
-<?php
-
-if (isset($footer_style) && ($footer_style == 'viewforum' || $footer_style == 'viewtopic') && $is_admmod) {
-    echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
-
-    if ($footer_style == 'viewforum') {
-        echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
-        echo "\t\t\t".'</dl>'."\n";
-    } elseif ($footer_style == 'viewtopic') {
-        if (isset($pid)) {
-            $parameter = 'param/'.$pid.'/';
-        } elseif (isset($p) && $p != 1) {
-            $parameter = 'param/'.$p.'/';
-        } else {
-            $parameter = '';
-        }
-
-
-        echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
-
-        if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
-        } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
-        }
-
-        if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
-        } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
-        }
-
-        echo "\t\t\t".'</dl>'."\n";
-    }
-
-    echo "\t\t\t".'<div class="clearer"></div>'."\n\t\t".'</div>'."\n";
-}
-
-?>
-		<div id="brdfooternav" class="inbox">
-
-<?php
-// Display the "Jump to" drop list
-if ($feather_config['o_quickjump'] == '1' && !empty($quickjump)) { ?>
-			<div class="conl">
-			<form id="qjump" method="get" action="">
-				<div><label><span><?php _e('Jump to') ?><br /></span></label>
-					<select name="id" onchange="window.location=('<?php echo get_link('forum/') ?>'+this.options[this.selectedIndex].value)">
-<?php
-		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
-			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
-			foreach ($cat_data['cat_forums'] as $forum) {
-				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
-			}
-			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
-		} ?>
-					</select>
-					<noscript><input type="submit" value="<?php _e('Go') ?>" accesskey="g" /></noscript>
-				</div>
-			</form>
-			</div>
-<?php } ?>
-
-			<div class="conr">
-<?php
-
-if ($footer_style == 'index') {
-    if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
-    } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
-    }
-} elseif ($footer_style == 'viewforum') {
-    if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
-    } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
-    }
-} elseif ($footer_style == 'viewtopic') {
-    if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
-    } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
-    }
-}
-
-?>
-				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
-			</div>
-			<div class="clearer"></div>
-		</div>
-	</div>
-</div>
-<?php
-
-// Display debug info (if enabled/defined)
-if ($feather->forum_env['FEATHER_SHOW_INFO']) {
-    echo '<p id="debugtime">[ ';
-
-    // Calculate script generation time
-    $time_diff = sprintf('%.3f', get_microtime() - $feather_start);
-    echo sprintf(__('Querytime'), $time_diff, count(\DB::get_query_log()[0]));
-
-    if (function_exists('memory_get_usage')) {
-        echo ' - '.sprintf(__('Memory usage'), file_size(memory_get_usage()));
-
-        if (function_exists('memory_get_peak_usage')) {
-            echo ' '.sprintf(__('Peak usage'), file_size(memory_get_peak_usage()));
-        }
-    }
-
-    echo ' ]</p>'."\n";
-}
-// Display executed queries (if enabled)
-if ($feather->forum_env['FEATHER_SHOW_QUERIES']) {
-    display_saved_queries();
-}
-?>
-
-</section>
-
-<script src="<?php echo get_base_url() ?>/style/FeatherBB/phone.min.js"></script>
-
-</body>
-</html>
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
deleted file mode 100644
index 9da121c2..00000000
--- a/style/FeatherBB/view/header.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php _e('lang_identifier') ?>" lang="<?php _e('lang_identifier') ?>" dir="<?php _e('lang_direction') ?>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
-<title><?php echo generate_page_title($page_title, $p) ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo get_base_url() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
-<?php
-
-echo $allow_index;
-echo $admin_console;
-
-if (isset($required_fields)) :
-    // Output JavaScript to validate form (make sure required fields are filled out)
-
-    ?>
-    <script type="text/javascript">
-        /* <![CDATA[ */
-        function process_form(the_form)
-        {
-            var required_fields = {
-                <?php
-                    // Output a JavaScript object with localised field names
-                    $tpl_temp = count($required_fields);
-                    foreach ($required_fields as $elem_orig => $elem_trans) {
-                        echo "\t\t\"".$elem_orig.'": "'.addslashes(str_replace('&#160;', ' ', $elem_trans));
-                        if (--$tpl_temp) {
-                            echo "\",\n";
-                        } else {
-                            echo "\"\n\t};\n";
-                        }
-                    }
-                    ?>
-                if (document.all || document.getElementById)
-            {
-                for (var i = 0; i < the_form.length; ++i)
-                {
-                    var elem = the_form.elements[i];
-                    if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
-                    {
-                        alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
-                        elem.focus();
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-        /* ]]> */
-    </script>
-    <?php
-endif;
-if (!empty($page_head)) :
-    echo implode("\n", $page_head)."\n";
-endif;
-?>
-</head>
-
-<body id="pun<?= $active_page ?>"<?= $focus_element; ?>>
-
-<header>
-
-    <nav>
-        <div class="container">
-            <div class="phone-menu" id="phone-button">
-                <a class="button-phone"></a>
-            </div>
-            <div id="phone">
-                <?php echo $navlinks ?>
-                <div class="navbar-right">
-                    <form method="get" action="/search" class="nav-search">
-                        <input type="hidden" name="action" value="search">
-                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php _e('Search') ?>">
-                    </form>
-                </div>
-            </div>
-        </div>
-    </nav>
-
-    <div class="container">
-        <div class="container-title-status">
-            <h1 class="title-site">
-                <a href="<?php echo get_base_url() ?>" title="" class="site-name">
-                    <p><?php echo feather_escape($feather_config['o_board_title']) ?></p>
-                </a>
-                <div id="brddesc"><?php echo htmlspecialchars_decode($feather_config['o_board_desc']) ?></div>
-            </h1>
-            <div class="status-avatar">
-                <?php echo $page_info ?>
-            </div>
-            <div class="clear"></div>
-        </div>
-        <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
-            <div id="announce" class="block">
-                <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
-                <div class="box">
-                    <div id="announce-block" class="inbox">
-                        <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
-                    </div>
-                </div>
-            </div>
-        <?php endif; ?>
-        <?php if (isset($flash['message'])) : ?>
-            <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
-            <div id="msgflash" class="block">
-                <h2><span><?php _e('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
-                <div class="box">
-                    <div class="inbox">
-                        <p><?php echo feather_escape($flash['message']) ?></p>
-                    </div>
-                </div>
-            </div>
-            <script type="text/javascript">fadeIn('msgflash', 0);</script>
-        <?php endif; ?>
-    </div>
-
-</header>
-
-<section class="container">
-    <div id="brdmain">
diff --git a/style/FeatherBB/view/help.php b/style/FeatherBB/view/help.php
deleted file mode 100644
index b5477db4..00000000
--- a/style/FeatherBB/view/help.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<h2><span><?php _e('BBCode') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><a name="bbcode"></a><?php _e('BBCode info 1') ?></p>
-		<p><?php _e('BBCode info 2') ?></p>
-	</div>
-</div>
-<h2><span><?php _e('Text style') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Text style info') ?></p>
-		<p><code>[b]<?php _e('Bold text') ?>[/b]</code> <?php _e('produces') ?> <samp><strong><?php _e('Bold text') ?></strong></samp></p>
-		<p><code>[u]<?php _e('Underlined text') ?>[/u]</code> <?php _e('produces') ?> <samp><span class="bbu"><?php _e('Underlined text') ?></span></samp></p>
-		<p><code>[i]<?php _e('Italic text') ?>[/i]</code> <?php _e('produces') ?> <samp><em><?php _e('Italic text') ?></em></samp></p>
-		<p><code>[s]<?php _e('Strike-through text') ?>[/s]</code> <?php _e('produces') ?> <samp><span class="bbs"><?php _e('Strike-through text') ?></span></samp></p>
-		<p><code>[del]<?php _e('Deleted text') ?>[/del]</code> <?php _e('produces') ?> <samp><del><?php _e('Deleted text') ?></del></samp></p>
-		<p><code>[ins]<?php _e('Inserted text') ?>[/ins]</code> <?php _e('produces') ?> <samp><ins><?php _e('Inserted text') ?></ins></samp></p>
-		<p><code>[em]<?php _e('Emphasised text') ?>[/em]</code> <?php _e('produces') ?> <samp><em><?php _e('Emphasised text') ?></em></samp></p>
-		<p><code>[color=#FF0000]<?php _e('Red text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: #ff0000"><?php _e('Red text') ?></span></samp></p>
-		<p><code>[color=blue]<?php _e('Blue text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: blue"><?php _e('Blue text') ?></span></samp></p>
-		<p><code>[h]<?php _e('Heading text') ?>[/h]</code> <?php _e('produces') ?></p> <div class="postmsg"><h5><?php _e('Heading text') ?></h5></div>
-	</div>
-</div>
-<h2><span><?php _e('Links and images') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php _e('This help page') ?></a></samp></p>
-		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
-		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
-		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
-	</div>
-	<div class="inbox">
-		<p><a name="img"></a><?php _e('Images info') ?></p>
-		<p><code>[img=<?php _e('FluxBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php _e('FluxBB bbcode test') ?>" /></samp></p>
-	</div>
-</div>
-<h2><span><?php _e('Quotes') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Quotes info') ?></p>
-		<p><code>[quote=James]<?php _e('Quote text') ?>[/quote]</code></p>
-		<p><?php _e('produces quote box') ?></p>
-		<div class="postmsg">
-			<div class="quotebox"><cite>James <?php _e('wrote') ?></cite><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
-		</div>
-		<p><?php _e('Quotes info 2') ?></p>
-		<p><code>[quote]<?php _e('Quote text') ?>[/quote]</code></p>
-		<p><?php _e('produces quote box') ?></p>
-		<div class="postmsg">
-			<div class="quotebox"><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
-		</div>
-		<p><?php _e('quote note') ?></p>
-	</div>
-</div>
-<h2><span><?php _e('Code') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Code info') ?></p>
-		<p><code>[code]<?php _e('Code text') ?>[/code]</code></p>
-		<p><?php _e('produces code box') ?></p>
-		<div class="postmsg">
-			<div class="codebox"><pre><code><?php _e('Code text') ?></code></pre></div>
-		</div>
-	</div>
-</div>
-<h2><span><?php _e('Lists') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><a name="lists"></a><?php _e('List info') ?></p>
-		<p><code>[list][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php _e('produces list') ?></span></p>
-		<div class="postmsg">
-			<ul><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ul>
-		</div>
-		<p><code>[list=1][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php _e('produces decimal list') ?></span></p>
-		<div class="postmsg">
-			<ol class="decimal"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
-		</div>
-		<p><code>[list=a][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php _e('produces alpha list') ?></span></p>
-		<div class="postmsg">
-			<ol class="alpha"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
-		</div>
-	</div>
-</div>
-<h2><span><?php _e('Nested tags') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Nested tags info') ?></p>
-		<p><code>[b][u]<?php _e('Bold, underlined text') ?>[/u][/b]</code> <?php _e('produces') ?> <samp><strong><span class="bbu"><?php _e('Bold, underlined text') ?></span></strong></samp></p>
-	</div>
-</div>
-<h2><span><?php _e('Smilies') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><a name="smilies"></a><?php _e('Smilies info') ?></p>
-<?php
-
-// Display the smiley set
-require FEATHER_ROOT.'include/parser.php';
-
-$smiley_groups = array();
-
-foreach ($pd['smilies'] as $smiley_text => $smiley_data) {
-    $smiley_groups[$smiley_data['file']][] = $smiley_text;
-}
-
-foreach ($smiley_groups as $smiley_img => $smiley_texts) {
-    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
-}
-
-?>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/index.html b/style/FeatherBB/view/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/index.php b/style/FeatherBB/view/index.php
deleted file mode 100644
index 3142e1bd..00000000
--- a/style/FeatherBB/view/index.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-if (empty($index_data)): ?>
-    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php _e('Empty board') ?></p></div></div></div>
-<?php endif;
-foreach ($index_data as $forum) {
-    if ($forum->cid != $cur_cat) :
-        if ($cur_cat != 0) :
-    ?>
-				</tbody>
-			</table>
-		</div>
-	</div>
-	</div>
-	<?php endif;
-    ?>
-	<div id="idx<?php echo $forum->cid ?>" class="blocktable">
-	<h2><span><?php echo feather_escape($forum->cat_name) ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Forum') ?></th>
-					<th class="tc2" scope="col"><?php _e('Topics') ?></th>
-					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
-					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-	<?php
-    $cur_cat = $forum->cid;
-    endif;
-    ?>
-				<tr class="<?php echo $forum->item_status ?>">
-					<td class="tcl">
-						<div class="<?php echo $forum->icon_type ?>"><div class="nosize"><?php echo forum_number_format($forum->forum_count_formatted) ?></div></div>
-						<div class="tclcon">
-							<div>
-								<?php echo $forum->forum_field."\n".$forum->moderators_formatted ?>
-							</div>
-						</div>
-					</td>
-					<td class="tc2"><?php echo forum_number_format($forum->num_topics_formatted) ?></td>
-					<td class="tc3"><?php echo forum_number_format($forum->num_posts_formatted) ?></td>
-					<td class="tcr"><?php echo $forum->last_post_formatted ?></td>
-				</tr>
-	<?php
-
-}
-if ($cur_cat > 0) :
-    ?>
-					</tbody>
-			</table>
-		</div>
-	</div>
-	</div>
-<?php
-endif;
-if (!empty($forum_actions)) :
-?>
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<p class="subscribelink clearb"><?php echo implode(' - ', $forum_actions); ?></p>
-	</div>
-</div>
-<?php
-endif;
-?>
-<div id="brdstats" class="block">
-	<h2><span><?php _e('Board info') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<dl class="conr">
-				<dt><strong><?php _e('Board stats') ?></strong></dt>
-				<dd><span><?php printf(__('No of users'), '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of topics'), '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of posts'), '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
-			</dl>
-			<dl class="conl">
-				<dt><strong><?php _e('User info') ?></strong></dt>
-				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
-				<?php if ($feather_config['o_users_online'] == 1) : ?>
-				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('Guests online'), '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
-				<?php endif; ?>
-			</dl>
-			<?php
-            if ($feather_config['o_users_online'] == 1) :
-                if ($online['num_users'] > 0) {
-                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
-                } else {
-                    echo "\t\t\t".'<div class="clearer"></div>'."\n";
-                }
-            endif;
-            ?>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/login/form.php b/style/FeatherBB/view/login/form.php
deleted file mode 100644
index 13d1744b..00000000
--- a/style/FeatherBB/view/login/form.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Login') ?></span></h2>
-	<div class="box">
-		<form id="login" method="post" action="<?php echo get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Login legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="conl required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
-						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
-
-						<div class="rbox clearb">
-							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php _e('Remember me') ?><br /></label>
-						</div>
-
-						<p class="clearb"><?php _e('Login info') ?></p>
-						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="login" value="<?php _e('Login') ?>" tabindex="4" /></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/login/index.html b/style/FeatherBB/view/login/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/login/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/login/password_forgotten.php b/style/FeatherBB/view/login/password_forgotten.php
deleted file mode 100644
index 41c0a121..00000000
--- a/style/FeatherBB/view/login/password_forgotten.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-// If there are errors, we display them
-if (!empty($errors)) {
-    ?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('New password errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('New passworderrors info') ?></p>
-			<ul class="error-list">
-<?php
-
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-    ?>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<?php
-
-}
-?>
-<div class="blockform">
-	<h2><span><?php _e('Request pass') ?></span></h2>
-	<div class="box">
-		<form id="request_pass" method="post" action="<?php echo get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Request pass legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
-						<p><?php _e('Request pass info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="request_pass" value="<?php _e('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a><?php endif; ?></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/message.php b/style/FeatherBB/view/message.php
deleted file mode 100644
index 740b040e..00000000
--- a/style/FeatherBB/view/message.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="msg" class="block">
-	<h2><span><?php _e('Info') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<p><?php echo $message ?></p>
-<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php _e('Go back') ?></a></p>
-<?php endif;
-    ?>		</div>
-	</div>
-</div>
diff --git a/style/FeatherBB/view/misc/email.php b/style/FeatherBB/view/misc/email.php
deleted file mode 100644
index eb44dafb..00000000
--- a/style/FeatherBB/view/misc/email.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
-	<div class="box">
-		<form id="email" method="post" action="<?php echo get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write email') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
-						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php _e('Email disclosure note') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/misc/index.html b/style/FeatherBB/view/misc/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/misc/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/misc/report.php b/style/FeatherBB/view/misc/report.php
deleted file mode 100644
index 252042c7..00000000
--- a/style/FeatherBB/view/misc/report.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<div id="reportform" class="blockform">
-	<h2><span><?php _e('Report post') ?></span></h2>
-	<div class="box">
-		<form id="report" method="post" action="<?php echo get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Reason desc') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('Reason') ?> <span><?php _e('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/misc/rules.php b/style/FeatherBB/view/misc/rules.php
deleted file mode 100644
index 366880ee..00000000
--- a/style/FeatherBB/view/misc/rules.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="rules" class="block">
-	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
-	<div class="box">
-		<div id="rules-block" class="inbox">
-			<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/delete_posts.php b/style/FeatherBB/view/moderate/delete_posts.php
deleted file mode 100644
index 00b80920..00000000
--- a/style/FeatherBB/view/moderate/delete_posts.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Delete posts') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm delete legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<p><?php _e('Delete posts comply') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/delete_topics.php b/style/FeatherBB/view/moderate/delete_topics.php
deleted file mode 100644
index d0ab1eed..00000000
--- a/style/FeatherBB/view/moderate/delete_topics.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('Delete topics') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm delete legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Delete topics comply') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/index.html b/style/FeatherBB/view/moderate/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/moderate/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/moderate/merge_topics.php b/style/FeatherBB/view/moderate/merge_topics.php
deleted file mode 100644
index 820cedee..00000000
--- a/style/FeatherBB/view/moderate/merge_topics.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('Merge topics') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm merge legend') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1" /><?php _e('Leave redirect') ?><br /></label>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php _e('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/moderator_forum.php b/style/FeatherBB/view/moderate/moderator_forum.php
deleted file mode 100644
index 35b67b41..00000000
--- a/style/FeatherBB/view/moderate/moderator_forum.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<form method="post" action="<?php echo get_link('moderate/forum/'.$id.'/') ?>">
-<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<input type="hidden" name="page" value="<?php echo feather_escape($p) ?>" />
-<div id="vf" class="blocktable">
-	<h2><span><?php echo feather_escape($cur_forum['forum_name']) ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
-					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
-<?php endif; ?>					<th class="tcr"><?php _e('Last post') ?></th>
-					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-			
-			<?php
-            $topic_count = 0;
-            $button_status = '';
-            foreach ($topic_data as $topic) {
-                ++$topic_count;
-                ?>
-							<tr class="<?php echo $topic['item_status'] ?>">
-					<td class="tcl">
-						<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo forum_number_format($topic_count + $start_from) ?></div></div>
-						<div class="tclcon">
-							<div>
-								<?php echo $topic['subject_disp']."\n" ?>
-							</div>
-						</div>
-					</td>
-					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_replies']) : '-' ?></td>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_views']) : '-' ?></td>
-<?php endif;
-                ?>					<td class="tcr"><?php echo $topic['last_post_disp'] ?></td>
-					<td class="tcmod"><input type="checkbox" name="topics[<?php echo $topic['id'] ?>]" value="1" /></td>
-				</tr>
-			<?php
-
-            }
-            if (empty($topic_data)):
-                $colspan = ($feather_config['o_topic_views'] == '1') ? 5 : 4;
-                $button_status = ' disabled="disabled"';
-                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
-            endif;
-            ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php _e('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php _e('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php _e('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php _e('Close') ?>"<?php echo $button_status ?> /></p>
-			<div class="clearer"></div>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
-</form>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/move_topics.php b/style/FeatherBB/view/moderate/move_topics.php
deleted file mode 100644
index e72ae5cb..00000000
--- a/style/FeatherBB/view/moderate/move_topics.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="blockform">
-	<h2><span><?php echo($action == 'single') ? __('Move topic') : __('Move topics') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-			<input type="hidden" name="topics" value="<?php echo $topics ?>" />
-				<fieldset>
-					<legend><?php _e('Move legend') ?></legend>
-					<div class="infldset">
-						<label><?php _e('Move to') ?>
-						<br /><select name="move_to_forum">
-								<?php echo $list_forums ?>
-							</optgroup>
-						</select>
-						<br /></label>
-						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1"<?php if ($action == 'single') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Leave redirect') ?><br /></label>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php _e('Move') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/posts_view.php b/style/FeatherBB/view/moderate/posts_view.php
deleted file mode 100644
index 482a1c49..00000000
--- a/style/FeatherBB/view/moderate/posts_view.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<form method="post" action="">
-<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<?php
-$post_count = 0; // Keep track of post numbers
-foreach ($post_data as $post) {
-    $post_count++;
-    ?>
-	<div id="p<?php echo $post['id'] ?>" class="blockpost<?php if ($post['id'] == $cur_topic['first_post_id']) {
-    echo ' firstpost';
-}
-    ?><?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($post_count == 1) {
-    echo ' blockpost1';
-}
-    ?>">
-		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<div class="postbody">
-					<div class="postleft">
-						<dl>
-							<dt><strong><?php echo $post['poster_disp'] ?></strong></dt>
-							<dd class="usertitle"><strong><?php echo $post['user_title'] ?></strong></dd>
-						</dl>
-					</div>
-					<div class="postright">
-						<h3 class="nosize"><?php _e('Message') ?></h3>
-						<div class="postmsg">
-							<?php echo $post['message']."\n" ?>
-	<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
-}
-    ?>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="inbox">
-				<div class="postfoot clearb">
-					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.__('Select').'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.__('Cannot select first').'</p>' ?></div>
-				</div>
-			</div>
-		</div>
-	</div>
-<?php
-
-}
-?>
-
-<div class="postlinksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php _e('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /></p>
-			<div class="clearer"></div>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
-</form>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/split_posts.php b/style/FeatherBB/view/moderate/split_posts.php
deleted file mode 100644
index 7c59b0b9..00000000
--- a/style/FeatherBB/view/moderate/split_posts.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Split posts') ?></span></h2>
-	<div class="box">
-		<form id="subject" method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm split legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<label class="required"><strong><?php _e('New subject') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
-						<label><?php _e('Move to') ?>
-						<br /><select name="move_to_forum">
-								<?php echo $list_forums ?>
-							</optgroup>
-						</select>
-						<br /></label>
-						<p><?php _e('Split posts comply') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php _e('Split') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/post.php b/style/FeatherBB/view/post.php
deleted file mode 100644
index f1d22d07..00000000
--- a/style/FeatherBB/view/post.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
-<?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
-<?php endif; ?>
-<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_posting['subject']) ?></a></li>
-<?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<?php
-
-// If there are errors, we display them
-if (!empty($errors)) {
-    ?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('Post errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('Post errors info') ?></p>
-			<ul class="error-list">
-<?php
-
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-    ?>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<?php
-
-} elseif ($feather->request->post('preview')) {
-    require_once FEATHER_ROOT.'include/parser.php';
-    $preview_message = parse_message($post['message'], $post['hide_smilies']);
-
-    ?>
-<div id="postpreview" class="blockpost">
-	<h2><span><?php _e('Post preview') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postright">
-					<div class="postmsg">
-						<?php echo $preview_message."\n" ?>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<?php
-
-}
-
-
-$cur_index = 1;
-
-?>
-<!-- Init BBcode editor toolbar -->
-<script>
-    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
-        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
-</script>
-<script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
-
-<div id="postform" class="blockform">
-	<h2><span><?php echo $action ?></span></h2>
-	<div class="box">
-		<?php echo $form."\n" ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write message legend') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-                                                <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<?php
-if ($feather->user->is_guest) {
-    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-    $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
-    ?>
-						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
-    echo feather_escape($post['username']);
-}
-    ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
-    echo feather_escape($post['email']);
-}
-    ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<div class="clearer"></div>
-<?php
-
-}
-if ($fid): ?>
-						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
-    echo feather_escape($post['subject']);
-} ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
-                        <script>postEditorToolbar('req_message');</script>
-						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
-						</ul>
-					</div>
-				</fieldset>
-<?php
-if (!empty($checkboxes)) {
-    ?>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Options') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
-						</div>
-					</div>
-				</fieldset>
-<?php
-
-}
-
-?>
-			</div>
-			<?php if ($feather->user->is_guest) : ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Robot title') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Robot info')    ?></p>
-						<label class="required"><strong><?php
-                             $question = array_keys($lang_antispam_questions);
-                             $qencoded = md5($question[$index_questions]);
-                             echo sprintf(__('Robot question'), $question[$index_questions]);?>
-							 <span><?php _e('Required') ?></span></strong>
-							 <br />
-							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
-						</label>
-					</div>
-				</fieldset>
-			</div>
-			<?php endif; ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
-
-
-<?php
-if ($tid && $feather_config['o_topic_review'] != '0') :
-?>
-<div id="postreview">
-	<h2><span><?php _e('Topic review') ?></span></h2>
-
-	<?php
-    // Set background switching on
-    $post_count = 0;
-
-    foreach ($post_data as $post) {
-        ++$post_count;
-        ?>
-	<div class="blockpost">
-	<div class="box<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?>">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postleft">
-					<dl>
-						<dt><strong><?php echo feather_escape($post['poster']) ?></strong></dt>
-						<dd><span><?php echo format_time($post['posted']) ?></span></dd>
-					</dl>
-				</div>
-				<div class="postright">
-					<div class="postmsg">
-						<?php echo $post['message']."\n" ?>
-					</div>
-				</div>
-			</div>
-			<div class="clearer"></div>
-		</div>
-	</div>
-</div>
-	<?php
-
-    }
-    ?>
-
-</div>
-<?php endif;?>
diff --git a/style/FeatherBB/view/profile/change_mail.php b/style/FeatherBB/view/profile/change_mail.php
deleted file mode 100644
index f8d25e99..00000000
--- a/style/FeatherBB/view/profile/change_mail.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Change email') ?></span></h2>
-	<div class="box">
-		<form id="change_email" method="post" action="<?php echo get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Email legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('New email') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
-						<label class="required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
-						<p><?php _e('Email instructions') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="new_email" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/change_pass.php b/style/FeatherBB/view/profile/change_pass.php
deleted file mode 100644
index 3f4285fb..00000000
--- a/style/FeatherBB/view/profile/change_pass.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Change pass') ?></span></h2>
-	<div class="box">
-		<form id="change_pass" method="post" action="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<input type="hidden" name="form_sent" value="1" />
-				<fieldset>
-					<legend><?php _e('Change pass legend') ?></legend>
-					<div class="infldset">
-<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php _e('Old pass') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="password" name="req_old_password" size="16" /><br /></label>
-<?php endif; ?>						<label class="conl required"><strong><?php _e('New pass') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="password" name="req_new_password1" size="16" /><br /></label>
-						<label class="conl required"><strong><?php _e('Confirm new pass') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="password" name="req_new_password2" size="16" /><br /></label>
-						<p class="clearb"><?php _e('Pass info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/delete_user.php b/style/FeatherBB/view/profile/delete_user.php
deleted file mode 100644
index 0fd42f52..00000000
--- a/style/FeatherBB/view/profile/delete_user.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Confirm delete user') ?></span></h2>
-	<div class="box">
-		<form id="confirm_del_user" method="post" action="<?php echo get_link('user/'.$id.'/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm delete legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Confirmation info').' <strong>'.feather_escape($username).'</strong>.' ?></p>
-						<div class="rbox">
-							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
-						</div>
-						<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/index.html b/style/FeatherBB/view/profile/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/profile/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/profile/menu.php b/style/FeatherBB/view/profile/menu.php
deleted file mode 100644
index 4627f8db..00000000
--- a/style/FeatherBB/view/profile/menu.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="profile" class="block2col">
-	<div class="blockmenu">
-		<h2><span><?php _e('Profile menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-					<li<?php if ($page == 'essentials') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
-					<li<?php if ($page == 'personal') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
-					<li<?php if ($page == 'messaging') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
-<?php if ($feather_config['o_avatars'] == '1' || $feather_config['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
-<?php endif;
-    ?>					<li<?php if ($page == 'display') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
-					<li<?php if ($page == 'privacy') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
-<?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
-<?php endif;
-    ?>				</ul>
-			</div>
-		</div>
-	</div>
diff --git a/style/FeatherBB/view/profile/section_admin.php b/style/FeatherBB/view/profile/section_admin.php
deleted file mode 100644
index 18ba2f12..00000000
--- a/style/FeatherBB/view/profile/section_admin.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-	<div class="blockform">
-		<h2><span><?php echo feather_escape($user['username']).' - '.__('Section admin') ?></span></h2>
-		<div class="box">
-			<form id="profile7" method="post" action="<?php echo get_link('user/'.$id.'/section/admin/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-				<input type="hidden" name="form_sent" value="1" />
-					<fieldset>
-<?php
-
-        if ($feather->user->g_moderator == '1') {
-            ?>
-						<legend><?php _e('Delete ban legend') ?></legend>
-						<div class="infldset">
-							<p><input type="submit" name="ban" value="<?php _e('Ban user') ?>" /></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-        } else {
-            if ($feather->user->id != $id) {
-                ?>
-						<legend><?php _e('Group membership legend') ?></legend>
-						<div class="infldset">
-							<select id="group_id" name="group_id">
-                                                            <?php echo $group_list ?>
-							</select>
-							<input type="submit" name="update_group_membership" value="<?php _e('Save') ?>" />
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-<?php
-
-            }
-
-            ?>
-						<legend><?php _e('Delete ban legend') ?></legend>
-						<div class="infldset">
-							<input type="submit" name="delete_user" value="<?php _e('Delete user') ?>" /> <input type="submit" name="ban" value="<?php _e('Ban user') ?>" />
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-            if ($user['g_moderator'] == '1' || $user['g_id'] == FEATHER_ADMIN) {
-                ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Set mods legend') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Moderator in info') ?></p>
-                                                        <?php echo $forum_list ?>
-								</div>
-							</div>
-							<br class="clearb" /><input type="submit" name="update_forums" value="<?php _e('Update forums') ?>" />
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-            }
-        }
-
-?>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/section_display.php b/style/FeatherBB/view/profile/section_display.php
deleted file mode 100644
index 5da0f4b4..00000000
--- a/style/FeatherBB/view/profile/section_display.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section display') ?></span></h2>
-	<div class="box">
-		<form id="profile5" method="post" action="<?php echo get_link('user/'.$id.'/section/display/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div><input type="hidden" name="form_sent" value="1" /></div>
-<?php
-
-    $styles = forum_list_styles();
-
-    // Only display the style selection box if there's more than one style available
-    if (count($styles) == 1) {
-        echo "\t\t\t".'<div><input type="hidden" name="form_style" value="'.$styles[0].'" /></div>'."\n";
-    } elseif (count($styles) > 1) {
-        ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Style legend') ?></legend>
-					<div class="infldset">
-						<label><?php _e('Styles') ?><br />
-						<select name="form_style">
-<?php
-
-        foreach ($styles as $temp) {
-            if ($user['style'] == $temp) {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.str_replace('_', ' ', $temp).'</option>'."\n";
-            } else {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.str_replace('_', ' ', $temp).'</option>'."\n";
-            }
-        }
-
-        ?>
-						</select>
-						<br /></label>
-					</div>
-				</fieldset>
-			</div>
-<?php
-
-    }
-
-?>
-<?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1' || $feather_config['o_signatures'] == '1' || $feather_config['o_avatars'] == '1' || ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1')): ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Post display legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Post display info') ?></p>
-						<div class="rbox">
-<?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show smilies') ?><br /></label>
-<?php endif; if ($feather_config['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show sigs') ?><br /></label>
-<?php endif; if ($feather_config['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show avatars') ?><br /></label>
-<?php endif; if ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show images') ?><br /></label>
-<?php endif; if ($feather_config['o_signatures'] == '1' && $feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show images sigs') ?><br /></label>
-<?php endif; ?>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Pagination legend') ?></legend>
-					<div class="infldset">
-						<label class="conl"><?php _e('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
-						<label class="conl"><?php _e('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
-						<p class="clearb"><?php _e('Paginate info') ?> <?php _e('Leave blank') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/section_essentials.php b/style/FeatherBB/view/profile/section_essentials.php
deleted file mode 100644
index 0050f89c..00000000
--- a/style/FeatherBB/view/profile/section_essentials.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section essentials') ?></span></h2>
-	<div class="box">
-		<form id="profile1" method="post" action="<?php echo get_link('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Username and pass legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
-<?php endif; ?>						</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Email legend') ?></legend>
-					<div class="infldset">
-						<?php echo $user_disp['email_field'] ?>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Localisation legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Time zone info') ?></p>
-						<label><?php _e('Time zone')."\n" ?>
-						<br /><select name="form_timezone">
-							<option value="-12"<?php if ($user['timezone'] == -12) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-12:00') ?></option>
-							<option value="-11"<?php if ($user['timezone'] == -11) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-11:00') ?></option>
-							<option value="-10"<?php if ($user['timezone'] == -10) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-10:00') ?></option>
-							<option value="-9.5"<?php if ($user['timezone'] == -9.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-09:30') ?></option>
-							<option value="-9"<?php if ($user['timezone'] == -9) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-09:00') ?></option>
-							<option value="-8.5"<?php if ($user['timezone'] == -8.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-08:30') ?></option>
-							<option value="-8"<?php if ($user['timezone'] == -8) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-08:00') ?></option>
-							<option value="-7"<?php if ($user['timezone'] == -7) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-07:00') ?></option>
-							<option value="-6"<?php if ($user['timezone'] == -6) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-06:00') ?></option>
-							<option value="-5"<?php if ($user['timezone'] == -5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-05:00') ?></option>
-							<option value="-4"<?php if ($user['timezone'] == -4) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-04:00') ?></option>
-							<option value="-3.5"<?php if ($user['timezone'] == -3.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-03:30') ?></option>
-							<option value="-3"<?php if ($user['timezone'] == -3) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-03:00') ?></option>
-							<option value="-2"<?php if ($user['timezone'] == -2) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-02:00') ?></option>
-							<option value="-1"<?php if ($user['timezone'] == -1) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-01:00') ?></option>
-							<option value="0"<?php if ($user['timezone'] == 0) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC') ?></option>
-							<option value="1"<?php if ($user['timezone'] == 1) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+01:00') ?></option>
-							<option value="2"<?php if ($user['timezone'] == 2) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+02:00') ?></option>
-							<option value="3"<?php if ($user['timezone'] == 3) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+03:00') ?></option>
-							<option value="3.5"<?php if ($user['timezone'] == 3.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+03:30') ?></option>
-							<option value="4"<?php if ($user['timezone'] == 4) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+04:00') ?></option>
-							<option value="4.5"<?php if ($user['timezone'] == 4.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+04:30') ?></option>
-							<option value="5"<?php if ($user['timezone'] == 5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:00') ?></option>
-							<option value="5.5"<?php if ($user['timezone'] == 5.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:30') ?></option>
-							<option value="5.75"<?php if ($user['timezone'] == 5.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:45') ?></option>
-							<option value="6"<?php if ($user['timezone'] == 6) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+06:00') ?></option>
-							<option value="6.5"<?php if ($user['timezone'] == 6.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+06:30') ?></option>
-							<option value="7"<?php if ($user['timezone'] == 7) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+07:00') ?></option>
-							<option value="8"<?php if ($user['timezone'] == 8) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+08:00') ?></option>
-							<option value="8.75"<?php if ($user['timezone'] == 8.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+08:45') ?></option>
-							<option value="9"<?php if ($user['timezone'] == 9) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+09:00') ?></option>
-							<option value="9.5"<?php if ($user['timezone'] == 9.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+09:30') ?></option>
-							<option value="10"<?php if ($user['timezone'] == 10) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+10:00') ?></option>
-							<option value="10.5"<?php if ($user['timezone'] == 10.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+10:30') ?></option>
-							<option value="11"<?php if ($user['timezone'] == 11) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+11:00') ?></option>
-							<option value="11.5"<?php if ($user['timezone'] == 11.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+11:30') ?></option>
-							<option value="12"<?php if ($user['timezone'] == 12) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+12:00') ?></option>
-							<option value="12.75"<?php if ($user['timezone'] == 12.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+12:45') ?></option>
-							<option value="13"<?php if ($user['timezone'] == 13) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+13:00') ?></option>
-							<option value="14"<?php if ($user['timezone'] == 14) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+14:00') ?></option>
-						</select>
-						<br /></label>
-						<div class="rbox">
-							<label><input type="checkbox" name="form_dst" value="1"<?php if ($user['dst'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('DST') ?><br /></label>
-						</div>
-						<label><?php _e('Time format') ?>
-
-						<br /><select name="form_time_format">
-<?php
-                            foreach (array_unique($forum_time_formats) as $key => $time_format) {
-                                echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
-                                if ($user['time_format'] == $key) {
-                                    echo ' selected="selected"';
-                                }
-                                echo '>'. format_time(time(), false, null, $time_format, true, true);
-                                if ($key == 0) {
-                                    echo ' ('.__('Default').')';
-                                }
-                                echo "</option>\n";
-                            }
-                            ?>
-						</select>
-						<br /></label>
-						<label><?php _e('Date format') ?>
-
-						<br /><select name="form_date_format">
-<?php
-                            foreach (array_unique($forum_date_formats) as $key => $date_format) {
-                                echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
-                                if ($user['date_format'] == $key) {
-                                    echo ' selected="selected"';
-                                }
-                                echo '>'. format_time(time(), true, $date_format, null, false, true);
-                                if ($key == 0) {
-                                    echo ' ('.__('Default').')';
-                                }
-                                echo "</option>\n";
-                            }
-                            ?>
-						</select>
-						<br /></label>
-
-<?php
-
-    $languages = forum_list_langs();
-
-    // Only display the language selection box if there's more than one language available
-    if (count($languages) > 1) {
-        ?>
-						<label><?php _e('Language') ?>
-						<br /><select name="form_language">
-<?php
-
-        foreach ($languages as $temp) {
-            if ($user['language'] == $temp) {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
-            } else {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
-            }
-        }
-
-        ?>
-						</select>
-						<br /></label>
-<?php
-
-    }
-
-?>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('User activity') ?></legend>
-					<div class="infldset">
-						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
-						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
-						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
-						<?php echo $user_disp['posts_field'] ?>
-<?php if ($feather->user->is_admmod): ?>							<label><?php _e('Admin note') ?><br />
-						<input id="admin_note" type="text" name="admin_note" value="<?php echo feather_escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
-<?php endif; ?>						</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/section_messaging.php b/style/FeatherBB/view/profile/section_messaging.php
deleted file mode 100644
index d944ee43..00000000
--- a/style/FeatherBB/view/profile/section_messaging.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section messaging') ?></span></h2>
-	<div class="box">
-		<form id="profile3" method="post" action="<?php echo get_link('user/'.$id.'/section/messaging/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Contact details legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
-						<label><?php _e('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/section_personal.php b/style/FeatherBB/view/profile/section_personal.php
deleted file mode 100644
index a765e0aa..00000000
--- a/style/FeatherBB/view/profile/section_personal.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personal') ?></span></h2>
-	<div class="box">
-		<form id="profile2" method="post" action="<?php echo get_link('user/'.$id.'/section/personal/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Personal details legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
-<?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
-<?php endif; ?>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/section_personality.php b/style/FeatherBB/view/profile/section_personality.php
deleted file mode 100644
index 3624e5e6..00000000
--- a/style/FeatherBB/view/profile/section_personality.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personality') ?></span></h2>
-	<div class="box">
-		<form id="profile4" method="post" action="<?php echo get_link('user/'.$id.'/section/personality/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div><input type="hidden" name="form_sent" value="1" /></div>
-<?php if ($feather_config['o_avatars'] == '1'): ?>				<div class="inform">
-				<fieldset id="profileavatar">
-					<legend><?php _e('Avatar legend') ?></legend>
-					<div class="infldset">
-<?php if ($user_avatar): ?>							<div class="useravatar"><?php echo $user_avatar ?></div>
-<?php endif; ?>							<p><?php _e('Avatar info') ?></p>
-						<p class="clearb actions"><?php echo $avatar_field ?></p>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; if ($feather_config['o_signatures'] == '1'): ?>				<div class="inform">
-				<fieldset>
-					<legend><?php _e('Signature legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Signature info') ?></p>
-						<div class="txtarea">
-							<label><?php printf(__('Sig max size'), forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
-							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
-						</div>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
-						</ul>
-						<?php echo $signature_preview ?>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
diff --git a/style/FeatherBB/view/profile/section_privacy.php b/style/FeatherBB/view/profile/section_privacy.php
deleted file mode 100644
index 36930415..00000000
--- a/style/FeatherBB/view/profile/section_privacy.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section privacy') ?></span></h2>
-	<div class="box">
-		<form id="profile6" method="post" action="<?php echo get_link('user/'.$id.'/section/privacy/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Privacy options legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<p><?php _e('Email setting info') ?></p>
-						<div class="rbox">
-							<label><input type="radio" name="form_email_setting" value="0"<?php if ($user['email_setting'] == '0') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Email setting 1') ?><br /></label>
-							<label><input type="radio" name="form_email_setting" value="1"<?php if ($user['email_setting'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Email setting 2') ?><br /></label>
-							<label><input type="radio" name="form_email_setting" value="2"<?php if ($user['email_setting'] == '2') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Email setting 3') ?><br /></label>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php if ($feather_config['o_forum_subscriptions'] == '1' || $feather_config['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
-				<fieldset>
-					<legend><?php _e('Subscription legend') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Notify full') ?><br /></label>
-<?php if ($feather_config['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Auto notify full') ?><br /></label>
-<?php endif; ?>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/upload_avatar.php b/style/FeatherBB/view/profile/upload_avatar.php
deleted file mode 100644
index 4131569c..00000000
--- a/style/FeatherBB/view/profile/upload_avatar.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Upload avatar') ?></span></h2>
-	<div class="box">
-		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Upload avatar legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
-						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php _e('Avatar desc').' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.__('bytes').' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="upload" value="<?php _e('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/view_profile.php b/style/FeatherBB/view/profile/view_profile.php
deleted file mode 100644
index d30181fd..00000000
--- a/style/FeatherBB/view/profile/view_profile.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="viewprofile" class="block">
-	<h2><span><?php _e('Profile') ?></span></h2>
-	<div class="box">
-		<div class="fakeform">
-			<div class="inform">
-				<fieldset>
-				<legend><?php _e('Section personal') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personal'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-<?php if (!empty($user_info['messaging'])): ?>			<div class="inform">
-				<fieldset>
-				<legend><?php _e('Section messaging') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['messaging'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; if (!empty($user_info['personality'])): ?>			<div class="inform">
-				<fieldset>
-				<legend><?php _e('Section personality') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personality'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>			<div class="inform">
-				<fieldset>
-				<legend><?php _e('User activity') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['activity'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/register/email.php b/style/FeatherBB/view/register/email.php
deleted file mode 100644
index e26ad690..00000000
--- a/style/FeatherBB/view/register/email.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($recipient) ?></span></h2>
-	<div class="box">
-		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write email') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
-						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
-						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php _e('Email disclosure note') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/register/form.php b/style/FeatherBB/view/register/form.php
deleted file mode 100644
index f1a360ef..00000000
--- a/style/FeatherBB/view/register/form.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-// If there are errors, we display them
-if (!empty($errors)) {
-    ?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('Registration errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('Registration errors info') ?></p>
-			<ul class="error-list">
-<?php
-
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-    ?>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<?php
-
-}
-?>
-<div id="regform" class="blockform">
-	<h2><span><?php _e('Register') ?></span></h2>
-	<div class="box">
-		<form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
-		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<div class="forminfo">
-					<h3><?php _e('Important information') ?></h3>
-					<p><?php _e('Desc 1') ?></p>
-					<p><?php _e('Desc 2') ?></p>
-				</div>
-				<fieldset>
-					<legend><?php _e('Username legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="username" value="" />
-						<input type="hidden" name="password" value="" />
-						<label class="required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
-    echo feather_escape($feather->request->post('req_user'));
-} ?>" size="25" maxlength="25" /><br /></label>
-					</div>
-				</fieldset>
-			</div>
-<?php if ($feather_config['o_regs_verify'] == '0'): ?>			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Pass legend') ?></legend>
-					<div class="infldset">
-						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
-    echo feather_escape($feather->request->post('req_password1'));
-} ?>" size="16" /><br /></label>
-						<label class="conl required"><strong><?php _e('Confirm pass') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
-    echo feather_escape($feather->request->post('req_password2'));
-} ?>" size="16" /><br /></label>
-						<p class="clearb"><?php _e('Pass info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>			<div class="inform">
-				<fieldset>
-					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
-					<div class="infldset">
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
-<?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
-    echo feather_escape($feather->request->post('req_email1'));
-} ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
-    echo feather_escape($feather->request->post('req_email2'));
-} ?>" size="50" maxlength="80" /><br /></label>
-<?php endif; ?>					</div>
-				</fieldset>
-			</div>
-<?php
-        // Only display the language selection box if there's more than one language available
-        if (count($languages) > 1) {
-            ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Localisation legend') ?></legend>
-					<div class="infldset">
-							<label><?php _e('Language') ?>
-							<br /><select name="language">
-<?php
-
-            foreach ($languages as $temp) {
-                if ($feather_config['o_default_lang'] == $temp) {
-                    echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
-                } else {
-                    echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
-                }
-            }
-
-            ?>
-							</select>
-							<br /></label>
-					</div>
-				</fieldset>
-			</div>
-<?php
-
-        }
-?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Robot title') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Robot info')    ?></p>
-						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php _e('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="register" value="<?php _e('Register') ?>" /></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/register/index.html b/style/FeatherBB/view/register/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/register/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/register/rules.php b/style/FeatherBB/view/register/rules.php
deleted file mode 100644
index cef62405..00000000
--- a/style/FeatherBB/view/register/rules.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div id="rules" class="blockform">
-	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
-	<div class="box">
-		<form method="get" action="<?php echo get_link('register/') ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Rules legend') ?></legend>
-					<div class="infldset">
-						<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="agree" value="<?php _e('Agree') ?>" /> <input type="submit" name="cancel" value="<?php _e('Cancel') ?>" /></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/footer.php b/style/FeatherBB/view/search/footer.php
deleted file mode 100644
index a73ed5aa..00000000
--- a/style/FeatherBB/view/search/footer.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-if ($search['show_as'] == 'topics') :
-?>
-			</tbody>
-		</table>
-		</div>
-	</div>
-</div>
-
-<?php
-endif;
-?>
-
-<div class="postlinksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
-		</ul>
-<?php echo(!empty($search['forum_actions']) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $search['forum_actions']).'</p>'."\n" : '') ?>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/form.php b/style/FeatherBB/view/search/form.php
deleted file mode 100644
index 4731b068..00000000
--- a/style/FeatherBB/view/search/form.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div id="searchform" class="blockform">
-	<h2><span><?php _e('Search') ?></span></h2>
-	<div class="box">
-		<form id="search" method="get" action="">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Search criteria legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="action" value="search" />
-						<label class="conl"><?php _e('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
-						<label class="conl"><?php _e('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
-						<p class="clearb"><?php _e('Search info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Search in legend') ?></legend>
-					<div class="infldset">
-					<?php echo $forums ?>
-						<label class="conl"><?php _e('Search in')."\n" ?>
-						<br /><select id="search_in" name="search_in">
-							<option value="0"><?php _e('Message and subject') ?></option>
-							<option value="1"><?php _e('Message only') ?></option>
-							<option value="-1"><?php _e('Topic only') ?></option>
-						</select>
-						<br /></label>
-						<p class="clearl"><?php _e('Search in info') ?></p>
-<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Search results legend') ?></legend>
-					<div class="infldset">
-						<label class="conl"><?php _e('Sort by')."\n" ?>
-						<br /><select name="sort_by">
-							<option value="0"><?php _e('Sort by post time') ?></option>
-							<option value="1"><?php _e('Sort by author') ?></option>
-							<option value="2"><?php _e('Sort by subject') ?></option>
-							<option value="3"><?php _e('Sort by forum') ?></option>
-						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Sort order')."\n" ?>
-						<br /><select name="sort_dir">
-							<option value="DESC"><?php _e('Descending') ?></option>
-							<option value="ASC"><?php _e('Ascending') ?></option>
-						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Show as')."\n" ?>
-						<br /><select name="show_as">
-							<option value="topics"><?php _e('Show as topics') ?></option>
-							<option value="posts"><?php _e('Show as posts') ?></option>
-						</select>
-						<br /></label>
-						<p class="clearb"><?php _e('Search results info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/header.php b/style/FeatherBB/view/search/header.php
deleted file mode 100644
index 01af597a..00000000
--- a/style/FeatherBB/view/search/header.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<?php
-if ($search['show_as'] == 'topics') :
-?>
-<div id="vf" class="blocktable">
-	<h2><span><?php _e('Search results') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
-					<th class="tc2" scope="col"><?php _e('Forum') ?></th>
-					<th class="tc3" scope="col"><?php _e('Replies') ?></th>
-					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-endif;
diff --git a/style/FeatherBB/view/search/index.html b/style/FeatherBB/view/search/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/search/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/search/posts.php b/style/FeatherBB/view/search/posts.php
deleted file mode 100644
index c575f9c2..00000000
--- a/style/FeatherBB/view/search/posts.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockpost<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($cur_search['pid'] == $cur_search['first_post_id']) {
-    echo ' firstpost';
-} ?><?php if ($post_count == 1) {
-    echo ' blockpost1';
-} ?><?php if ($cur_search['item_status'] != '') {
-    echo ' '.$cur_search['item_status'];
-} ?>">
-<h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
-    _e('Re').' ';
-} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
-<div class="box">
-	<div class="inbox">
-		<div class="postbody">
-			<div class="postleft">
-				<dl>
-					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
-<?php endif; ?>
-					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
-				</dl>
-			</div>
-			<div class="postright">
-				<div class="postmsg">
-					<?php echo $cur_search['message']."\n" ?>
-				</div>
-			</div>
-			<div class="clearer"></div>
-		</div>
-	</div>
-	<div class="inbox">
-		<div class="postfoot clearb">
-			<div class="postfootright">
-				<ul>
-					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
-					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/topics.php b/style/FeatherBB/view/search/topics.php
deleted file mode 100644
index af843193..00000000
--- a/style/FeatherBB/view/search/topics.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<tr class="<?php echo $cur_search['item_status'] ?>">
-	<td class="tcl">
-		<div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo forum_number_format($topic_count + $start_from) ?></div></div>
-		<div class="tclcon">
-			<div>
-				<?php echo $subject."\n" ?>
-			</div>
-		</div>
-	</td>
-	<td class="tc2"><?php echo $forum ?></td>
-	<td class="tc3"><?php echo forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
-</tr>
\ No newline at end of file
diff --git a/style/FeatherBB/view/userlist.php b/style/FeatherBB/view/userlist.php
deleted file mode 100644
index 26c24027..00000000
--- a/style/FeatherBB/view/userlist.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('User search') ?></span></h2>
-	<div class="box">
-		<form id="userlist" method="get" action="">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('User find legend') ?></legend>
-					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
-<?php endif; ?>						<label class="conl"><?php _e('User group')."\n" ?>
-						<br /><select name="show_group">
-							<option value="-1"<?php if ($show_group == -1) {
-    echo ' selected="selected"';
-} ?>><?php _e('All users') ?></option>
-<?php echo $dropdown_menu ?>
-						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Sort by')."\n" ?>
-						<br /><select name="sort_by">
-							<option value="username"<?php if ($sort_by == 'username') {
-    echo ' selected="selected"';
-} ?>><?php _e('Username') ?></option>
-							<option value="registered"<?php if ($sort_by == 'registered') {
-    echo ' selected="selected"';
-} ?>><?php _e('Registered') ?></option>
-<?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
-    echo ' selected="selected"';
-} ?>><?php _e('No of posts') ?></option>
-<?php endif; ?>						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Sort order')."\n" ?>
-						<br /><select name="sort_dir">
-							<option value="ASC"<?php if ($sort_dir == 'ASC') {
-    echo ' selected="selected"';
-} ?>><?php _e('Ascending') ?></option>
-							<option value="DESC"<?php if ($sort_dir == 'DESC') {
-    echo ' selected="selected"';
-} ?>><?php _e('Descending') ?></option>
-						</select>
-						<br /></label>
-						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? __('User search info').' ' : '').__('User sort info'); ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
-		</form>
-	</div>
-</div>
-
-<div class="linkst">
-	<div class="inbox">
-		<p class="pagelink"><?php echo $paging_links ?></p>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="users1" class="blocktable">
-	<h2><span><?php _e('User list') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Username') ?></th>
-					<th class="tc2" scope="col"><?php _e('Title') ?></th>
-<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Registered') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-			<?php
-            foreach ($userlist_data as $user) {
-                ?>
-					<tr>
-						<td class="tcl"><?php echo '<a href="'.get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
-						<td class="tc2"><?php echo get_title($user) ?></td>
-	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo forum_number_format($user['num_posts']) ?></td>
-	<?php endif;
-                ?>
-						<td class="tcr"><?php echo format_time($user['registered'], true) ?></td>
-					</tr>
-			<?php
-
-            }
-            if (empty($userlist_data)) {
-                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.__('No hits').'</td></tr>'."\n";
-            }
-            ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox">
-		<p class="pagelink"><?php echo $paging_links ?></p>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/viewforum.php b/style/FeatherBB/view/viewforum.php
deleted file mode 100644
index a35faf22..00000000
--- a/style/FeatherBB/view/viewforum.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="vf" class="blocktable">
-	<h2><span><?php echo feather_escape($cur_forum['forum_name']) ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
-					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-			<?php
-            $topic_count = 0;
-            foreach ($forum_data as $topic) {
-                ++$topic_count;
-                ?>
-					<tr class="<?php echo $topic['item_status'] ?>">
-						<td class="tcl">
-							<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo forum_number_format($topic_count + $start_from) ?></div></div>
-							<div class="tclcon">
-								<div>
-									<?php echo $topic['subject_formatted']."\n" ?>
-								</div>
-							</div>
-						</td>
-						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_replies']) : '-' ?></td>
-	<?php if ($feather_config['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_views']) : '-' ?></td>
-	<?php endif;
-                ?>					<td class="tcr"><?php echo $topic['last_post_formatted'] ?></td>
-					</tr>
-			<?php
-
-            }
-            if (empty($forum_data)):
-            ?>
-					<tr class="rowodd inone">
-						<td class="tcl" colspan="<?php echo($feather_config['o_topic_views'] == 1) ? 4 : 3 ?>">
-							<div class="icon inone"><div class="nosize"><!-- --></div></div>
-							<div class="tclcon">
-								<div>
-									<strong><?php _e('Empty forum') ?></strong>
-								</div>
-							</div>
-						</td>
-					</tr>
-			<?php
-            endif;
-            ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
-		</ul>
-<?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/viewtopic.php b/style/FeatherBB/view/viewtopic.php
deleted file mode 100644
index e2681757..00000000
--- a/style/FeatherBB/view/viewtopic.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<?php
-$post_count = 1;
-foreach ($post_data as $post) {
-    ?>
-<div id="p<?php echo $post['id'] ?>" class="blockpost<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($post['id'] == $cur_topic['first_post_id']) {
-    echo ' firstpost';
-}
-    ?><?php if ($post_count == 1) {
-    echo ' blockpost1';
-}
-    ?>">
-	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postleft">
-					<dl>
-						<dt><strong><?php echo $post['username_formatted'] ?></strong></dt>
-						<dd class="usertitle"><strong><?php echo $post['user_title_formatted'] ?></strong></dd>
-<?php if ($post['user_avatar'] != '') {
-    echo "\t\t\t\t\t\t".'<dd class="postavatar">'.$post['user_avatar'].'</dd>'."\n";
-}
-    ?>
-<?php if (count($post['user_info'])) {
-    echo "\t\t\t\t\t\t".implode("\n\t\t\t\t\t\t", $post['user_info'])."\n";
-}
-    ?>
-<?php if (count($post['user_contacts'])) {
-    echo "\t\t\t\t\t\t".'<dd class="usercontacts">'.implode(' ', $post['user_contacts']).'</dd>'."\n";
-}
-    ?>
-					</dl>
-				</div>
-				<div class="postright">
-					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
-    _e('Re').' ';
-}
-    ?><?php echo feather_escape($cur_topic['subject']) ?></h3>
-					<div class="postmsg">
-						<?php echo $post['message']."\n" ?>
-<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
-}
-    ?>
-					</div>
-<?php if ($post['signature_formatted'] != '') {
-    echo "\t\t\t\t\t".'<div class="postsignature postmsg"><hr />'.$post['signature_formatted'].'</div>'."\n";
-}
-    ?>
-				</div>
-			</div>
-		</div>
-		<div class="inbox">
-			<div class="postfoot clearb">
-				<div class="postfootleft"><?php if ($post['poster_id'] > 1) {
-    echo '<p>'.$post['is_online_formatted'].'</p>';
-}
-    ?></div>
-<?php if (count($post['post_actions'])) {
-    echo "\t\t\t\t".'<div class="postfootright">'."\n\t\t\t\t\t".'<ul>'."\n\t\t\t\t\t\t".implode("\n\t\t\t\t\t\t", $post['post_actions'])."\n\t\t\t\t\t".'</ul>'."\n\t\t\t\t".'</div>'."\n";
-}
-    ?>
-			</div>
-		</div>
-	</div>
-</div>
-<?php
-    ++$post_count;
-}
-?>
-
-<div class="postlinksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
-		</ul>
-<?php echo $subscraction ?>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<?php
-
-// Display quick post if enabled
-if ($quickpost) {
-    $cur_index = 1;
-
-    ?>
-<div id="quickpost" class="blockform">
-	<h2><span><?php _e('Quick post') ?></span></h2>
-	<div class="box">
-		<form id="quickpostform" method="post" action="<?php echo get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write message legend') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
-						<input type="hidden" name="page" value="<?php echo feather_escape($p) ?>" />
-<?php if ($feather_config['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
-<?php endif;
-
-    if ($feather->user->is_guest) {
-        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-        $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
-        ?>
-						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<div class="clearer"></div>
-<?php
-
-    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.__('Message').' <span>'.__('Required').'</span></strong><br />';
-    } else {
-        echo "\t\t\t\t\t\t".'<label>';
-    }
-
-    ?>
-<!-- Init BBcode editor toolbar -->
-<script>
-    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
-        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
-</script>
-<script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
-<script>postEditorToolbar('req_message');</script>
-
-<textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
-    ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
-    ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
-    ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
-    ?></span></li>
-						</ul>
-					</div>
-				</fieldset>
-			</div>
-			<?php if ($feather->user->is_guest) : ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Robot title') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Robot info')    ?></p>
-						<label class="required"><strong><?php
-                             $question = array_keys($lang_antispam_questions);
-    $qencoded = md5($question[$index_questions]);
-    echo sprintf(__('Robot question'), $question[$index_questions]);
-    ?>
-							 <span><?php _e('Required') ?></span></strong>
-							 <br />
-							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
-						</label>
-					</div>
-				</fieldset>
-			</div>
-			<?php endif;
-    ?>
-			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php _e('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
-		</form>
-	</div>
-</div>
-<?php
-
-}
diff --git a/style/Fire.css b/style/Fire.css
deleted file mode 100644
index 5cc20486..00000000
--- a/style/Fire.css
+++ /dev/null
@@ -1,1663 +0,0 @@
-/*****************************************************************
-1. INITIAL SETTINGS
-*****************************************************************/
-
-/* Limited Reset
-----------------------------------------------------------------*/
-
-html, body, .pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3, .pun h4, .pun h5, .pun pre, .pun blockquote,
-.pun ul, .pun ol, .pun li, .pun dl, .pun dt, .pun dd, .pun th, .pun td, .pun fieldset, .pun legend .pun img,
-.pun abbr, .pun cite {
-	border: 0;
-	font-style: normal;
-	font-weight: normal;
-	margin: 0;
-	padding: 0;
-}
-
-.pun ul, .pun ol {
-	list-style: none;
-}
-
-.pun select {
-	padding-bottom: 1px;
-	padding-top: 1px;
-	padding-right: 1px;
-}
-
-/* Content Defaults
-----------------------------------------------------------------*/
-
-.pun {
-	font: 81.25%/1.462em Arial, Helvetica, sans-serif;
-}
-
-.pun table, .pun td, .pun th, .pun input, .pun select, .pun optgroup, .pun textarea, .pun legend {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 1em;
-}
-
-.pun pre, .pun code {
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace;
-	font-size: 1em;
-}
-
-.pun pre code {
-	font-size: 1em;
-}
-
-.pun table {
-	border-collapse: collapse;
-	border-spacing: 0;
-	border: 0;
-	empty-cells: show;
-	width: 100%;
-}
-
-.pun h1 {
-	font:2.154em/1em "Trebuchet MS", Arial, Helvetica, sans-serif;
-	padding: 7px 0;
-}
-
-.pun h2, .pun .hd h2 {
-	font: 1.462em/1em "Trebuchet MS", Arial, Helvetica, sans-serif;
-	padding: 7px 0;
-}
-
-.pun h3 {
-	font-size: 1.154em;
-	line-height: 1.267em;
-	padding: 7px 0;
-}
-
-.pun h4 {
-	font-size: 1.077em;
-	font-weight: bold;
-	padding: 7px 0;
-}
-
-.pun h5, .pun h6 {
-	font-size: 1em;
-	font-weight: bold;
-	padding: 7px 0;
-}
-
-.pun p, .pun ul, .pun ol, .pun dl, .pun th, .pun td, .pun legend {
-	padding: 7px 0;
-}
-
-.pun strong, .pun th, .pun span.warntext, .pun p.warntext {
-	font-weight: bold;
-}
-
-.pun em {
-	font-style: italic;
-}
-
-.pun a, .pun a:link, .pun a:visited {
-	text-decoration: none;
-}
-
-.pun a:hover, .pun a:active, .pun a:focus {
-	text-decoration: underline;
-}
-
-.pun .actions span {
-	padding-left: 16px;
-	padding-right: 8px;
-	background: url(Fire/img/bull.png) center left no-repeat;
-	display: inline-block;
-	line-height: normal;
-}
-
-/* Hidden Elements
-----------------------------------------------------------------*/
-
-#brdfooter h2, #brdstats h2, #debug h2, #brdstats .conl dt, #brdstats .conr dt, #modcontrols dt,
-#searchlinks dt, div.postright h3, .pun .subscribelink span, #announce .hd, #reportform h2, #punmoderate #vf h2,
-#punviewforum #vf h2, .pun .required strong span, .pun .icon div {
-	display: block;
-	overflow: hidden;
-	position: absolute;
-	text-indent: -9999em;
-	width: 0;
-}
-
-/* Generic Float Clear
-----------------------------------------------------------------*/
-
-.pun .inbox, .pun #brdmain, .pun .crumbs, .pun .pagepost, .pun .block2col {
-	min-height: 1px;
-}
-
-* html .pun .inbox, * html .pun #brdmain, * html .pun .infldset, * html .pun .crumbs, * html .pun .pagepost, * html .pun .block2col {
-	display: inline-block;
-}
-
-* html .pun .inbox, * html .pun #bdrdmain, * html .pun .infldset, * html .pun .crumbs, * html .pun .pagepost, * html .pun .block2col {
-	display: block;
-}
-
-.pun .inbox:after, .pun #brdmain:after, .pun .crumbs:after, .pun .pagepost:after, .pun .block2col:after {
-	content: " ";
-	display: block;
-	height: 0;
-	font-size: 0;
-	clear: both;
-	visibility: hidden;
-}
-
-.pun .block2col .inbox:after {
-	content: none;
-	clear: none;
-}
-
-.clearl {
-	clear: left;
-}
-
-/*****************************************************************
-2. COMMON STYLES
-*****************************************************************/
-
-/* Page Layout
-----------------------------------------------------------------*/
-
-.pun {
-	max-width: 1070px;
-	margin: 0 auto;
-	padding: 30px 40px;
-}
-
-#punredirect, #punmaint {
-	padding: 60px 20% 12px 20%;
-}
-
-#puninstall, #pundb_update {
-	padding: 20px 10%;
-}
-
-.pun .punwrap {
-	border: 1px solid;
-	border-radius: 10px;
-	padding: 18px;
-}
-
-#punredirect h2, #punmaint h2 {
-	border-bottom-style: dotted;
-	border-bottom-width: 1px;
-	margin-bottom: 3px;
-}
-
-/* Section Spacing and Borders
-----------------------------------------------------------------*/
-
-#brdmain {
-	border-style: solid none;
-	border-width: 2px 0;
-	margin-bottom: 12px;
-	padding: 12px 0;
-}
-
-#punindex #brdmain {
-	padding-top: 24px;
-}
-
-#punredirect #brdmain, #punmaint #brdmain {
-	border: 0;
-	margin: 0;
-	padding: 0;
-}
-
-#brdstats {
-	border-style: solid none none none;
-	border-width: 2px 0 0 0;
-	margin-top: 24px;
-	padding-top: 12px;
-}
-
-#quickpost {
-	border-style: solid none none none;
-	border-width: 2px 0 0 0;
-	margin-top: 12px;
-	padding-top: 12px;
-}
-
-#announce {
-	border-style: solid none none none;
-	border-width: 2px 0 0 0;
-	padding-top: 3px;
-}
-
-/*****************************************************************
-3. COMMON BOARD ELEMENTS
-*****************************************************************/
-
-/* Logo, Description and Main Menu
-----------------------------------------------------------------*/
-
-#brdtitle h1 {
-	padding: 0 0 10px 0;
-}
-
-#brddesc {
-	border-top-style: dotted;
-	border-top-width: 1px;
-	padding: 10px 0;
-}
-
-#brddesc p {
-	padding: 0;
-}
-
-#brdmenu ul {
-	padding: 0;
-}
-
-#brdmenu li {
-	float: left;
-}
-
-#brdmenu a:link, #brdmenu a:visited {
-	border-right-style: solid;
-	border-width: 1px;
-	display: block;
-	min-width: 60px;
-	padding: 12px 16px 6px 8px;
-	white-space: nowrap;
-}
-
-#brdmenu a:hover, #brmenu a:active, #brdmenu a:focus {
-	text-decoration: none;
-}
-
-/* Welcome Box
-----------------------------------------------------------------*/
-
-#brdwelcome {
-	padding: 10px 0;
-}
-
-#brdwelcome .conl, #brdwelcome .conr, #brdwelcome p, #brdwelcome li {
-	display: inline;
-	padding: 0;
-}
-
-#brdwelcome .conl {
-  float: left;
-}
-
-#brdwelcome .conr {
-  float: right;
-}
-
-#brdwelcome li span {
-	background: url(Fire/img/bull.png) center left no-repeat;
-	padding-left: 18px;
-	margin-right: 3px;
-	display: inline-block;
-	line-height: normal;
-	white-space: nowrap;
-}
-
-#brdwelcome .conl li:first-child span {
-	padding-left: 0;
-	background: none;
-}
-
-/* Stats
-----------------------------------------------------------------*/
-
-#brdstats .conl {
-	float: left;
-}
-
-#brdstats .conr {
-	float: right;
-	text-align: right;
-}
-
-#brdstats #onlinelist {
-	border-top-style: dotted;
-	border-top-width: 1px;
-	clear: both;
-}
-
-#brdstats #onlinelist dt, #brdstats #onlinelist dd {
-	display: inline;
-}
-
-/* Footer
-----------------------------------------------------------------*/
-
-.pun #modcontrols {
-	border-style: none none dotted none;
-	border-width: 0 0 1px 0;
-	margin-bottom: 4px;
-	text-align: center;
-	width: 100%;
-}
-
-.pun #modcontrols dd {
-	display: inline;
-}
-
-.pun #brdfooter #modcontrols dd span {
-	background: url(Fire/img/bull.png) center left no-repeat;
-	display: inline-block;
-	line-height: normal;
-	padding-left: 18px;
-	white-space: nowrap;
-}
-
-.pun #brdfooter .conl {
-	float: left;
-}
-
-.pun #brdfooter .conr {
-	text-align: right;
-	float: right;
-}
-
-.pun #brdfooter #poweredby a {
-	font-size: 1.077em;
-	font-weight: bold;
-}
-
-.pun #brdfooter #qjump {
-	padding-top: 5px;
-}
-
-.pun #brdfooter #qjump * {
-	white-space: nowrap;
-}
-
-.pun #brdfooter #searchlinks dd span {
-	background: url(Fire/img/bull.png) center left no-repeat;
-	display: inline-block;
-	line-height: normal;
-	padding-left: 18px;
-	white-space: nowrap;
-}
-
-.pun #brdfooter #feedlinks {
-	padding-bottom: 0;
-}
-
-.pun #brdfooter #feedlinks span {
-	background: url(Fire/img/feed.png) center left no-repeat;
-	display: inline-block;
-	padding-left: 18px;
-	white-space: nowrap;
-}
-
-.pun #debugtime {
-	border-style: dotted none none none;
-	border-width: 1px 0 0 0;
-	margin-top: 7px;
-	text-align: center;
-}
-
-/* Breadcrumbs, Postlink, Pagination
-----------------------------------------------------------------*/
-
-.pun .linkst .inbox, .pun .linksb .inbox, .pun .postlinksb .inbox {
-	overflow: hidden;
-}
-
-.pun .linksb, .pun .postlinksb, .pun .linkst, .pun .crumbs {
-	clear: both;
-	position: relative;
-}
-
-.pun .linkst .crumbs {
-	font-family: "Trebuchet MS", Helvetica, Arial, sans-serif;
-	font-size: 1.462em;
-	line-height: 1.211em;
-	padding: 7px 0;
-}
-
-.pun .linksb .crumbs, .pun .postlinksb .crumbs {
-	font-family: "Trebuchet MS", Helvetica, Arial, sans-serif;
-	font-size: 1.154em;
-}
-
-.pun .linkst .crumbsplus .pagepost {
-	border-top-style: dotted;
-	border-top-width: 1px;
-}
-
-.pun .linksb .crumbsplus .pagepost, .pun .postlinksb .crumbsplus .pagepost {
-	border-bottom-style: dotted;
-	border-bottom-width: 1px;
-}
-
-.pun .postlinksb .crumbs {
-	margin-right: 11em;
-}
-
-.pun .crumbs li {
-	float: left;
-	padding-right: 0.4em;
-	white-space: nowrap;
-}
-
-.pun .crumbs li strong {
-	font-weight: normal;
-}
-
-.pun .pagelink {
-	float: left;
-	white-space: nowrap;
-}
-
-.pun .pagelink strong, .pun .pagelink a, .pun .pagelink span.spacer {
-	border-style: none none none solid;
-	border-width: 0 0 0 1px;
-	display: inline-block;
-	padding: 0 12px 0 10px;
-	margin-right: -6px;
-}
-
-.pun .pagelink .item1 {
-	border: 0;
-}
-
-.pun .pagelink .pages-label {
-	display: inline-block;
-}
-
-.pun .postlink {
-	float: right;
-	font-weight: bold;
-	text-align: right;
-}
-
-.pun .modbuttons {
-	float: right;
-	padding: 5px 0 3px 0;
-}
-
-.pun .modbuttons input {
-	margin-left: 8px;
-}
-
-.pun .subscribelink {
-	position: absolute;
-	right: 0;
-	text-align: right;
-	top: 33px;
-}
-
-#punindex .subscribelink {
-	top: 0px;
-}
-
-#punindex .linksb {
-	height: 12px;
-}
-
-/*****************************************************************
-4. MAIN TABLES
-*****************************************************************/
-
-.pun #brdmain .blocktable {
-	position: relative;
-}
-
-#punindex #brdmain .blocktable h2, #punsearch #vf h2 {
-	font: 1em/1.462em Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	margin: 1px 1px 0 1px;
-	padding-left: 8px;
-	position: absolute;
-	left: 0;
-	white-space: nowrap;
-	z-index: 100;
-}
-
-#punindex .blocktable th.tcl, #punsearch #vf th.tcl {
-	font-size: 0;
-	text-indent: -9999em;
-}
-
-.pun .blocktable .box {
-	border-style: solid;
-	border-width: 1px;
-	margin-bottom: -1px;
-	overflow: hidden;
-	position: relative;
-}
-
-* html .pun .blocktable .box {
-	display: inline-block;
-}
-
-.pun .blocktable table {
-	table-layout: fixed;
-	margin-bottom: -1px;
-}
-
-.pun .blocktable th {
-	padding: 7px 8px;
-	border-style: none none solid none;
-	border-width: 1px;
-	text-align: left;
-}
-
-.pun .blocktable td {
-	padding: 7px 8px;
-	line-height: 1.3077em;
-	border-style: none none solid none;
-	border-width: 1px;
-	text-align: left;
-}
-
-.pun .blocktable h3 {
-	font-size: 1.077em;
-	font-weight: bold;
-	padding: 0;
-}
-
-.pun .blocktable p {
-	padding: 0;
-}
-
-.pun .blocktable .tcl p {
-	padding: 5px 0 0 0;
-}
-
-.pun .blocktable .tcl {
-	width: auto;
-}
-
-.pun .blocktable .tc2, .pun .blocktable .tc3, .pun .blocktable .tcmod {
-	padding-left: 0;
-	padding-right: 0;
-	text-align: center;
-	width: 11%;
-}
-
-.pun .blocktable .tcr {
-	width: 30%;
-}
-
-.pun .blocktable td .newtext, .pun .blocktable td .pagestext, .pun .blocktable td .byuser {
-	white-space: nowrap;
-}
-
-.pun .blocktable .tcl h3 span.newtext {
-	font-size: 0.929em;
-	font-weight: normal;
-}
-
-.pun #vf td.tcl span.stickytext, .pun #vf td.tcl span.closedtext {
-	font-size: 1em;
-	font-weight: bold;
-}
-
-#punsearch #vf .tc2 {
-	padding-left: 8px;
-	padding-right: 8px;
-	text-align: left;
-	width: 18%;
-}
-
-#users1 .tcr {
-	width: 25%;
-}
-
-#users1 .tc2 {
-	padding-left: 8px;
-	padding-right: 8px;
-	text-align: left;
-	width: 25%;
-}
-
-#debug {
-	margin-top: 12px;
-}
-
-#debug .tcl {
-	width: 10%;
-}
-
-#punredirect #debug .tcl, #punmaint #debug .tcl {
-	width: 20%;
-}
-
-#debug .tcr {
-	width: 90%;
-	white-space: normal
-}
-
-#punindex .tcr .byuser {
-	display: block
-}
-
-#punindex td.tc2, #punindex td.tc3, #punindex td.tcr, .pun #vf td.tc2, .pun #vf td.tc3,
-.pun #vf td.tcr, #punindex td.tcl div.forumdesc, .pun #vf td.tcl span {
-	font-size: 0.923em;
-}
-
-.pun #vf td.tcl a {
-	font-weight: bold;
-}
-
-.pun #vf td.tcl span a {
-	font-weight: normal;
-}
-
-.pun .blocktable .tclcon {
-	min-height: 1px;
-	overflow: hidden;
-	padding: 0 11px 0 12px;
-	position: relative;
-}
-
-.pun .blocktable .tclcon div {
-	width: 100%;
-	overflow: hidden;
-}
-
-.pun .icon {
-	border-style: solid;
-	border-width: 8px;
-	float: left;
-	height: 0;
-	overflow: hidden;
-	width: 0;
-}
-
-.pun .iposted .ipost {
-	font-weight: bold;
-	left: 0;
-	padding-left: 4px;
-	position: absolute;
-	text-align: center;
-	top: 0;
-	width: 8px;
-}
-
-/*****************************************************************
-MAIN POSTS
-*****************************************************************/
-
-/* Structure
-----------------------------------------------------------------*/
-
-.pun .blockpost {
-	border-style: solid;
-	border-width: 1px;
-	margin-bottom: -1px;
-	overflow: hidden;
-	position: relative;
-}
-
-* html .pun .blockpost {
-	display: inline-block;
-}
-
-.pun .blockpost h2 {
-	font: 1em/1.462em Arial, Helvetica, sans-serif;
-	white-space: nowrap;
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	height: 1.462em;
-	padding: 0.538em 8px 0.538em 236px;
-	font-weight: normal;
-}
-
-#punsearch .blockpost h2 {
-	height: auto;
-	padding-left: 36px;
-	white-space: normal;
-}
-
-#punsearch .blockpost h2 span span {
-	white-space: nowrap;
-	display: inline-block;
-	font: 1.077em "Trebuchet MS", Arial, Helvetica, sans-serif
-}
-
-#punsearch .blockpost .icon {
-	position: absolute;
-	top: 0;
-	margin-top: -2.154em;
-}
-
-.pun .blockpost h2 .conr {
-	float: right;
-	text-align: right;
-}
-
-.pun .blockpost .inbox {
-	float: right;
-	position: relative;
-	width: 100%;
-}
-
-.pun .blockpost .postbody, .pun .blockpost .postfoot {
-	border-left-style: solid;
-	border-left-width: 1px;
-	float: right;
-	margin-right: -218px;
-	position: relative;
-	text-align: left;
-	width: 100%;
-}
-
-.pun .blockpost .postleft, .pun .blockpost .postfootleft {
-	width: 194px;
-	padding: 7px 12px 7px 12px;
-	float: left;
-	margin-left: -218px;
-	position: relative;
-}
-
-.pun .blockpost .postleft dl {
-	padding: 0;
-}
-
-#punviewtopic .blockpost dt, #punmoderate .blockpost dt {
-	display: block;
-	position: absolute;
-	padding: 0.538em 0 0.538em 12px;
-	height: 1.462em;
-	top: -2.615em;
-	left: 0;
-	overflow: hidden;
-	width: 206px;
-}
-
-.pun .blockpost dt strong {
-	font-size: 1.231em;
-	font-weight: bold;
-}
-
-.pun .blockpost .postleft dd {
-	font-size: 0.923em;
-}
-
-.pun .blockpost .postleft .usertitle {
-	padding: 4px 0 6px 0;
-	font-size: 1em;
-}
-
-.pun .blockpost .postleft .postavatar {
-	display: block;
-	margin: 0 0 4px 0;
-}
-
-.pun .blockpost .postright {
-	position: relative;
-	padding: 4px 230px 7px 18px;
-}
-
-.pun .postmsg {
-	width:100%;
-	overflow: hidden;
-	word-wrap: break-word;
-}
-
-.pun .blockpost .postfootright {
-	position: relative;
-	padding: 7px 230px 7px 18px;
-	text-align: right;
-}
-
-.pun .postfoot p, .pun .postfoot ul {
-	padding: 0;
-}
-
-.pun .blockpost .postfootright li {
-	display: inline;
-}
-
-.pun .blockpost .postfootright li span {
-	display: inline-block;
-	padding-left: 16px;
-	margin-left: 8px;
-	line-height: normal;
-	background: url(Fire/img/bull.png) center left no-repeat;
-}
-
-.pun .blockpost .usercontacts {
-	padding: 7px 0;
-}
-
-.pun .blockpost .usercontacts .email {
-	background: url(Fire/img/email.png) left 65% no-repeat;
-	margin-right: 5px;
-	padding-left: 21px;
-	display: inline-block;
-	line-height: normal;
-}
-
-.pun .blockpost .usercontacts .website {
-	background: url(Fire/img/ext.png) left 65% no-repeat;
-	padding-left: 18px;
-	display: inline-block;
-	line-height: normal;
-}
-
-.pun .postsignature hr {
-	border:none;
-	height: 1px;
-	margin-left: 0px;
-	text-align: left;
-}
-
-/* Content (includes other user content)
-----------------------------------------------------------------*/
-
-.pun .usercontent {
-	padding: 7px 0;
-}
-
-.pun .postmsg p, .pun .postmsg li, #punhelp p samp {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-.pun .usercontent h1, .pun .usercontent h2, .pun .usercontent h3,
-.pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
-	padding: 7px 0 0 0;
-}
-
-.pun .postmsg h5, #punhelp h5 {
-	font-size: 1.231em;
-	font-weight: bold;
-	padding: 7px 0;
-}
-
-.pun .usercontent ul, .pun .postmsg ul {
-	list-style: disc;
-	padding: 4px 13px 4px 30px;
-}
-
-.pun .usercontent ol, .pun .postmsg ol {
-	list-style: decimal;
-	padding: 4px 13px 4px 30px;
-}
-
-.pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha;
-}
-
-.pun .usercontent li, .pun .postmsg li {
-	padding: 0 3px;
-}
-
-.pun .usercontent li p, .pun .postmsg li p {
-	padding: 0;
-}
-
-.pun span.bbu {
-	text-decoration: underline;
-}
-
-.pun span.bbs, .pun del {
-	text-decoration: line-through;
-}
-
-.pun .postmsg ins, #punhelp samp ins {
-	text-decoration: none;
-}
-
-.pun .blockpost .postmsg .postedit {
-	font-size: 0.857em;
-}
-
-.pun .blockform .postsignature, .pun .blockpost .postsignature {
-	font-size: 0.923em;
-}
-
-.pun .codebox {
-	border-style: solid;
-	border-width: 1px;
-	margin: 0.75em 1em;
-	padding: 0;
-}
-
-.pun .quotebox {
-	border-style: solid;
-	border-width: 1px 1px 1px 3px;
-	margin: 0.75em 1em;
-	padding: 0 0.75em;
-}
-
-.pun .quotebox cite {
-	display: block;
-	padding: 0.75em 0 0 0;
-	font-weight: bold;
-	line-height: 1.462em;
-}
-
-.pun .quotebox blockquote {
-	overflow: hidden;
-	width: 100%;
-}
-
-.pun .codebox pre {
-	overflow: auto;
-	width: 100%;
-	direction: ltr;
-	text-align: left;
-}
-
-* html .pun .codebox pre {
-	padding-bottom: 10px;
-}
-
-*:first-child+html .pun .codebox pre {
-	padding-bottom: 10px;
-}
-
-.pun .codebox pre code {
-	padding: 0.5em;
-	white-space: pre;
-}
-
-.pun div[class*=codebox] pre code {
-	display: inline-block;
-}
-
-* html .pun .codebox pre code {
-	display: block;
-}
-
-.pun .codebox pre.vscroll {
-	height: 32em;
-	overflow: auto;
-	overflow-y: auto
-}
-
-.pun .postmsg img, #punhelp samp img {
-	vertical-align: text-top;
-}
-
-.pun .postmsg .postimg img {
-	max-width: 98%;
-	vertical-align: middle;
-	margin: 7px 0.5em 7px 0;
-}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-style: solid;
-	border-width: 2px;
-}
-
-/*****************************************************************
-MAIN FORMS
-*****************************************************************/
-
-#punedit .blockform h2, #punpost .blockform h2, #postpreview h2, #posterror h2,
-.pun #quickpost h2, .pun #reportform h2, #pundelete .blockform h2 {
-	font: 1em/1.462em Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	white-space: nowrap;
-	padding: 10px 19px 4px 37px;
-	border: 0;
-}
-
-#punpost .blockform h2, #punedit .blockform h2,.pun #quickpost h2,
-#pundelete .blockform h2 {
-	margin: 1px 1px 0 1px;
-	width: 25em;
-	position: absolute;
-	z-index: 100;
-}
-
-.pun #quickpost legend, #punpost legend, #punedit legend {
-	width: 25em;
-	overflow: hidden;
-	white-space: nowrap;
-}
-
-.pun .blockform .box {
-	border-style: solid;
-	border-width: 1px;
-	padding-bottom: 12px;
-}
-
-.pun #posterror {
-	border-style: solid;
-	border-width: 1px;
-}
-
-.pun #posterror .box {
-	padding: 0 18px 12px 18px;
-}
-
-* html .pun .blockform .box, * html .pun #posterror {
-	display: inline-block;
-}
-
-.pun .blockform .forminfo, .pun .error-info {
-	padding: 12px 18px;
-	border-style: solid;
-	border-width: 1px;
-	position: relative;
-}
-
-.pun .blockform .forminfo {
-	margin-top: 12px;
-}
-
-#pundelete .blockform .forminfo {
-	margin-top: 33px;
-}
-
-.pun .forminfo h3 {
-	padding-bottom: 0;
-}
-
-.pun .error-list li {
-	padding-left: 24px;
-	background: url(Fire/img/exclaim.png) center left no-repeat;
-}
-
-.pun .inform {
-	padding: 0 18px;
-}
-
-.pun legend {
-	font-weight: bold;
-	padding: 10px 19px 4px 19px;
-}
-
-* html .pun legend {
-	margin-left: -7px;
-}
-
-*:first-child+html .pun legend {
-	margin-left: -7px;
-}
-
-.pun .infldset {
-	border-style: solid;
-	border-width: 1px;
-	padding: 12px 18px;
-}
-
-#punregister #rules .infldset {
-	padding: 5px 18px;
-}
-
-.pun fieldset p {
-	padding: 0 0 7px 0;
-	width: 100%;
-}
-
-.pun fieldset .usercontent p {
-	padding: 7px 0;
-}
-
-.pun fieldset label {
-	display: block;
-	padding: 0 0 7px 0;
-}
-
-.pun label em {
-	font-weight: normal;
-	font-style: normal;
-}
-
-.pun .required strong {
-	background: url(Fire/img/asterisk.png) center right no-repeat;
-	font-weight: normal;
-	padding-right: 14px;
-	white-space: pre;
-	display: inline-block;
-	line-height: normal;
-}
-
-.pun label input, .pun label select, .pun label textarea {
-	margin-top: 2px;
-}
-
-.pun label.conl {
-	display: inline-block;
-	padding-right: 12px;
-}
-
-.pun form .buttons {
-	padding: 8px 19px 8px 34px;
-	margin-bottom: -12px;
-}
-
-.pun .blockform .buttons input {
-	margin-right: 12px;
-}
-
-.pun .rbox {
-	padding: 3px 0;
-}
-
-.pun .rbox label {
-	padding: 3px 0 3px 1.75em;
-	position: relative;
-	min-height: 1px;
-}
-
-* html .pun .rbox label {
-	text-indent: -3px;
-	height: 1%;
-}
-
-.pun .rbox input {
-	margin: 3px 0.75em 3px -1.75em;
-	float: left;
-	position: relative;
-	vertical-align: middle;
-	padding: 0;
-	height: 1em;
-	width: 1em;
-}
-
-.pun input[type=text], .pun select, .pun textarea {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-.pun .txtarea textarea, .pun input.longinput {
-	width: 98%;
-}
-
-.pun textarea {
-	resize: vertical;
-}
-
-.pun #quickpost .txtarea {
-	padding-right: 12px;
-	position: relative;
-}
-
-.pun .blockform .bblinks {
-	padding-top: 0;
-}
-
-.pun .blockform .bblinks li {
-	display: inline;
-}
-
-.pun .blockform .bblinks li span {
-	background: url(Fire/img/help.png) center left no-repeat;
-	margin-right: 8px;
-	padding-left: 20px;
-	display: inline-block;
-}
-
-.pun #quickpost .bblinks {
-	padding-top: 0;
-}
-
-.pun #quickpost .bblinks li {
-	display: inline;
-}
-
-.pun #login p.clearb {
-	border-top-style: dotted;
-	border-top-width: 1px;
-	font-size: 0;
-	height: 0;
-	line-height: 0;
-	margin-top: 7px;
-	overflow: hidden;
-	padding-bottom: 3px;
-	padding-top: 7px;
-	text-indent: -9999em;
-	width: 100%;
-}
-
-.pun #postreview {
-	padding-top: 12px;
-}
-
-.pun #postpreview, .pun #posterror {
-	margin-bottom: 12px;
-}
-
-.pun #postpreview .postright {
-	padding: 0;
-}
-
-.pun #postpreview .postbody {
-	border-style: solid;
-	border-width: 1px;
-	float: none;
-	margin: 0 18px 12px 18px;
-	padding: 0;
-	padding: 4px 18px 4px 18px;
-	width: auto;
-}
-
-.pun span.email {
-	background: url(Fire/img/email.png) left 65% no-repeat;
-	margin-right: 5px;
-	padding-left: 21px;
-	display: inline-block;
-	line-height: normal;
-}
-
-.pun span.website {
-	background: url(Fire/img/ext.png) left 65% no-repeat;
-	padding-left: 18px;
-	display: inline-block;
-	line-height: normal;
-}
-
-#punmisc #rules .box {
-	border-style: solid;
-	border-width: 1px;
-	padding: 5px 18px;
-}
-
-
-#punhelp #brdmain .box {
-	border-style: solid;
-	border-width: 1px;
-	padding: 7px 12px;
-}
-
-.pun .multiselect {
-	float: left;
-	padding-bottom: 7px;
-}
-
-.pun .checklist {
-	border-width: 1px;
-	border-style: solid;
-	max-height: 9em;
-	width: 20em;
-	overflow: auto;
-	padding: 0.25em 0.5em;
-	margin: 0.25em 16px 0 0.15em;
-}
-
-.pun .checklist legend {
-	padding: 0;
-}
-
-.pun .checklist legend span {
-	width: auto;
-	max-width: 25em;
-}
-
-/*****************************************************************
-PROFILES (+ ADMIN MENU)
-*****************************************************************/
-
-/* Profile / Admin
-----------------------------------------------------------------*/
-
-.pun .blockmenu {
-	width: 13em;
-	float: left;
-	padding-bottom: 12px;
-}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 15em;
-}
-
-.pun .blockmenu .block2 {
-	padding-top: 19px;
-}
-
-.pun .blockmenu ul {
-	border-top-style: dotted;
-	border-top-width: 1px;
-	padding: 0;
-}
-
-.pun .blockmenu li {
-	border-bottom-style: dotted;
-	border-bottom-width: 1px;
-	font-weight: bold;
-	padding: 0;
-}
-
-.pun .blockmenu a:link, .pun .blockmenu a:visited {
-	display: block;
-	padding: 9px 6px 3px 6px;
-	min-height: 1px;
-	text-decoration: none;
-}
-
-* html .pun .blockmenu a:link,  * html .pun .blockmenu a:visited {
-	height: 1%;
-}
-
-.pun .blockmenu a:hover, .pun .blockmenu a:active, .pun .blockmenu a:focus {
-	text-decoration: none;
-}
-
-#viewprofile .box {
-	border-style: solid;
-	border-width: 1px;
-	padding-bottom: 18px;
-}
-
-#viewprofile dt, #adstats dt {
-	padding: 7px 0;
-	position: absolute;
-	width: 13em;
-	left: 0;
-}
-
-#viewprofile dl {
-	border-style: solid none none none;
-	border-width: 1px;
-	margin: 7px 0;
-	padding: 0;
-	width: 100%;
-	position: relative;
-}
-
-#adintro, #adstats, #adalerts {
-	border-style: solid;
-	border-width: 1px;
-	padding: 18px;
-}
-
-#adintro li span {
-	display: inline-block;
-	padding-left: 16px;
-	margin-left: 8px;
-	line-height: normal;
-	background: url(Fire/img/bull.png) center left no-repeat;
-}
-
-#adstats .inbox, #adintro .inbox, #adalerts p {
-	border-style: solid;
-	border-width: 1px;
-	padding: 18px;
-}
-
-#adstats dl {
-	margin: 0;
-	padding: 0;
-	width: 100%;
-	position: relative;
-}
-
-#viewprofile dd, #adstats dd {
-	border-style: none none solid none;
-	border-width: 1px;
-	padding: 7px 0 7px 13em;
-}
-
-/*****************************************************************
-COLOUR SCHEME
-*****************************************************************/
-
-/* Basic defaults and Common Items
-----------------------------------------------------------------*/
-
-html, body, .pun {
-	background: #eeedea;
-	color: #333;
-}
-
-.pun .punwrap {
-	background: #fff;
-	border-color: #e1d9ca;
-	color: #665858;
-}
-
-#brdtitle #brddesc, .pun .pagepost, #brdstats #onlinelist, #brdfooter #searchlinks, #brdfooter #modcontrols,
-#punmaint h2, #punredirect h2, #adminconsole .submittop, .pun #debugtime, .pun .pagelink * {
-	border-color: #cec7b9;
-}
-
-.pun a, .pun a:link, .pun a:visited {
-	color: #990000;
-}
-
-.pun a:hover, .pun a:active, .pun a:focus {
-	color: #f60;
-}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-color: #990000;
-}
-
-.pun .postmsg .postimg a:hover img, .pun .postmsg .postimg a:active img, .pun .postmsg .postimg a:focus img {
-	border-color: #f60;
-}
-
-/* Primary Navigation
-----------------------------------------------------------------*/
-
-#brdmenu {
-	background: #990000;
-}
-
-#brdmenu a, #brdmenu a:link, #brdmenu a:visited {
-	background: #990000;
-	border-color: #fff;
-	color: #ddd;
-}
-
-#brdmenu a:hover, #brdmenu a:active, #brdmenu a:focus {
-	background: #f60;
-	border-color: #fff;
-	color: #fff;
-}
-
-/* Main Tables
-----------------------------------------------------------------*/
-
-.pun .blocktable .box {
-	background: #fbfaf5;
-	border-color: #cec7b9 #e7e2d9;
-}
-
-#punindex .blocktable h2, .pun #vf h2 {
-	color: #836359;
-}
-
-#adminconsole fieldset th, #adminconsole fieldset td {
-	background: #f3f2ed;
-	border-color: #ebe0dc;
-}
-
-.pun #users1 h2 {
-	background: #fff;
-}
-
-.pun .blocktable td {
-	border-color: #ebe0dc;
-}
-
-.pun .blocktable th {
-	background: #ecebe7;
-	border-color: #e1d9ca;
-	color: #836359;
-}
-
-.pun .blocktable td.tcl span.stickytext {
-	color: #000;
-}
-
-/* Main Posts
-----------------------------------------------------------------*/
-
-.pun .blockpost {
-	background: #f3f2ed;
-	border-color: #cec7b9 #e7e2d9;
-}
-
-.pun .blockpost h2 {
-	background: #ecebe7;
-	border-color: #e1d9ca;
-	color: #836359;
-}
-
-.pun .blockpost .postbody, .pun .blockpost .postfoot {
-	background: #fbfaf5;
-	border-color: #ebe0dc;
-}
-
-.pun .blockpost .postfootright li {
-	color: #fbfaf5;
-}
-
-.pun .postmsg, #punhelp code, #punhelp samp {
-	color: #333;
-}
-
-.pun .postsignature, .pun .postmsg .postedit {
-	color: #665858;
-}
-
-.pun .quotebox {
-	background: #f4f4e8;
-	border-color: #ccc;
-	color: #665858;
-}
-
-.pun .quotebox cite {
-	color: #836359;
-}
-
-.pun .codebox, #punhelp .codebox code {
-	background: #333;
-	color: #fff;
-}
-
-.pun .postmsg hr {
-	background: #cec7b9;
-}
-
-.pun .postmsg ins, #punhelp samp ins {
-	background-color: #ff0;
-}
-
-/* Main Forms + Profile
-----------------------------------------------------------------*/
-
-.pun .blockform .box, #adstats, #adintro, #adalerts, #postpreview, #posterror {
-	border-color: #cec7b9 #e7e2d9;
-	background: #ecebe7;
-}
-
-#punmisc #rules .box, #punhelp #brdmain .box {
-	border-color: #cec7b9 #e7e2d9;
-	background: #f3f2ed;
-}
-
-.pun #quickpost h2, #punpost .blockform h2, #punedit .blockform h2, #posterror h2,
-#pundelete .blockform h2 {
-	background: #ecebe7;
-	color: #836359;
-}
-
-.pun .forminfo {
-	background: #fff;
-	border-color: #ebe0dc;
-}
-
-#puninstall form#install .forminfo {
-	background: #990000;
-	color: #fff;
-}
-
-.pun #posterror .error-info, .pun #adalerts p {
-	background: #ffffe1;
-	border-color: #dfe6ee;
-}
-
-#puninstall form#install .error-info {
-	background: #ffffe1;
-	border-color: #dfe6ee;
-	color: #333;
-}
-
-.pun .infldset, #adintro .inbox, #adstats .inbox {
-	background: #f3f2ed;
-	border-color: #ebe0dc;
-}
-
-.pun label, .pun legend, #adminconsole fieldset th {
-	color: #836359;
-}
-
-.pun fieldset p {
-	border-color: #cec7b9;
-}
-
-.pun .blockmenu ul, .pun .blockmenu li {
-	border-color: #cec7b9;
-}
-
-.pun .blockmenu a:hover, .pun .blockmenu a:active, .pun .blockmenu a:focus {
-	background: #ffffe6;
-}
-
-.pun .blockmenu .isactive a:link, .pun .blockmenu .isactive a:visited {
-	color: #333;
-	background: #f3f2ed;
-	}
-
-.pun #viewprofile .box {
-	border-color: #cec7b9 #e7e2d9;
-	background: #ecebe7;
-}
-
-.pun #viewprofile dt, #adstats dt {
-	color: #836359;
-}
-
-.pun #viewprofile dl, .pun #viewprofile dd, #adstats dl, #adstats dd {
-	border-color: #ebe0dc;
-}
-
-#adminconsole fieldset td.nodefault {
-	background: #d59b9b;
-}
-
-.pun .multiselect {
-	color: #836359;
-}
-
-.pun .checklist {
-	background: white;
-	border-color: #ccc;
-}
-
-/* Status Indicators
-----------------------------------------------------------------*/
-
-.pun .icon {
-	border-color: #f1eee8 #dddad4 #e8e5df #f1efe8;
-}
-
-.pun .iredirect .icon {
-	border-color: #cec7b9;
-	border-width: 1px;
-	padding: 7px;
-}
-
-.pun .inew .icon {
-	border-color: #ca0000 #ab0000 #bb0000 #d30000;
-}
-
-/* Alert boxes
-----------------------------------------------------------------*/
-
-#msgflash {
-    opacity: 0;
-    position: fixed;
-    top: 40px;
-    right: 40px;
-    min-width: 240px;
-    max-width: 410px;
-	padding: 5px;
-	z-index: 1000;
-	color: #fff;
-	background-color: #c47f61;
-	border-color: #1489e0;
-	border-width: 2px;
-	border-radius: 5px;
-}
diff --git a/style/Fire/base_admin.css b/style/Fire/base_admin.css
deleted file mode 100644
index fdf41b10..00000000
--- a/style/Fire/base_admin.css
+++ /dev/null
@@ -1,163 +0,0 @@
-#adminconsole .blockform .box {
-	padding-bottom: 12px;
-}
-
-#adminconsole fieldset .infldset {
-	position: relative;
-	overflow: hidden;
-}
-
-#adminconsole fieldset table {
-	margin-top: -1px;
-	margin-bottom: -1px;
-}
-
-#adminconsole fieldset td, #adminconsole fieldset th {
-	padding: 10px 8px 10px 0;
-	text-align: left;
-	white-space: normal;
-	border-style: solid none;
-	border-width: 1px 0;
-}
-
-#punadmin thead th {
-	border-top: 0;
-	font-weight: normal;
-}
-
-#adminconsole fieldset td span, #adminconsole fieldset th span {
-	display: block; font-size: 1em;
-	font-weight: normal;
-}
-
-#adminconsole fieldset td.location span {
-	display: inline-block;
-}
-
-#adminconsole fieldset th {
-	width: 15em;
-	font-weight: normal;
-	padding-right: 8px;
-}
-
-#adminconsole table.aligntop th, #adminconsole table.aligntop td {
-	vertical-align: top;
-}
-
-#adminconsole table.aligntop th div {
-	padding-top: 3px;
-}
-
-#adminconsole .inform {
-	padding-bottom: 0;
-}
-
-#adminconsole .infldset {
-	padding-bottom: 0;
-	padding-top: 0;
-}
-
-#adminconsole p.submittop {
-	text-align: center;
-	border-bottom-style: dotted;
-	border-bottom-width: 1px;
-	margin: 0 18px;
-	padding-top: 12px;
-}
-
-#adminconsole p.submitend {
-	text-align: center;
-	padding-bottom: 0;
-}
-
-#adminconsole fieldset p {
-	padding: 10px 0;
-}
-
-#adminconsole .fsetsubmit {
-	padding: 10px 0 12px 0;
-}
-
-#categoryedit .tcl {
-	width: 25%;
-}
-
-#censoring .tcl, #censoring .tc2 {
-	width: 20%;
-}
-
-#edforum .tcl {
-	width: 18%;
-}
-
-#edforum .tc2 {
-	width: 12%;
-}
-
-#forumperms thead th, #forumperms tbody td {
-	text-align: center;
-}
-
-.pun .linkst .backlink, .pun .linksb .backlink {
-	padding: 7px 0;
-}
-
-#punadmin #users1 h2, #punadmin #users2 h2, #punadmin #bans1 h2 {
-	display: block;
-	left: -9999em;
-	overflow: hidden;
-	position: absolute;
-	text-indent: -9999em;
-	width: 0;
-}
-
-#punadmin #users1 th, #punadmin #users2 th, #punadmin #bans1 th {
-	font-weight: bold;
-}
-
-#users2 th, #bans1 th {
-	text-align: left;
-}
-
-#users2 th.tcmod {
-	text-align: center;
-}
-
-#users2 .tcl, #bans1 .tcl {
-	width: auto;
-	text-align: left;
-}
-
-#users2 .tc2, #bans1 .tc2 {
-	width: 18%;
-	text-align: left;
-}
-
-#users2 .tc3, #users2 .tc5, #bans1 .tc3, #bans1 .tc5, #bans1 .tc6 {
-	width: 12%;
-	text-align: left;
-}
-
-#users2 .tc4, #bans1 .tc4 {
-	width: 10%;
-	text-align: center;
-}
-
-#users2 .tcr {
-	width: 20%;
-	white-space: nowrap;
-}
-
-#bans1 .tcr {
-	width: 15%;
-	white-space: nowrap;
-}
-
-#users2 .tcmod {
-	width: 10%;
-	text-align: center;
-}
-
-.plugin p {
-	padding: 12px 18px 0;
-}
diff --git a/style/Fire/img/asterisk.png b/style/Fire/img/asterisk.png
deleted file mode 100644
index f7438dea90907b0619cdfea4aa0f057fdc7ddfba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv3GfMV^~o%})6nqk{{2G=3ODle
zA5NHXIX-?T1H<`%fYS~RFE?y>ci@2eO5P}-dd89<zhDN3XE)M-93xK`#}JO|$q5R4
z8V4ns1iFrT2DmaDNf4Tsxq?CLkzPE*vYC^t&m2%%!_?HnsIiNKnZZGXWi`|7FYG|w
N44$rjF6*2UngGiBI2Zr`

diff --git a/style/Fire/img/bull.png b/style/Fire/img/bull.png
deleted file mode 100644
index 3fd1f619a05fa08c3243e5ec4d7e4ce832221195..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=-3?y@QpIZW?*aCb)T>t<7e|rCh1eVn*KoQ20
zAirP+hi5m^fE-~@7sn8e>&XcXj5nDBT8^b9FfasfV%0zFt=a*UX7F_Nb6Mw<&;$UE
C&mDdM

diff --git a/style/Fire/img/email.png b/style/Fire/img/email.png
deleted file mode 100644
index dd3a39dd8245a19f06f45dd567a251623e6e3940..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 371
zcmV-(0gV2MP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001!P)t-sOlfiU
z>)rh6)%fq_{r2$p@a)EjQT+M${qNoX`t-tqP2#_m{qp3(f<^k?!^@ju_u|aNic!0M
zJnPD)-MEISh+egWS;>@K=*6G&*u2M&SpV$g>(#vY>DBDct?ACP(4}zj)3L*jN$ka&
z;=7HrfIhB+OV+iE$eCNxtb5zRpw+yb>fOz`id^vH*ZbJE@57YECjx>10004WQchC<
zK<3zH0001vNkl<Zc-oc7*A9X}5J1t{IxHZ&(mN>F>;He9Lqg)C@x0v&zuiuwwYDhg
zdP^P|Tv6he%HbjdCOr~{hNVvpBkq<HQj7VmG+5+xOw*v4rx%Sga^9x`QKVB8(byw*
zLlQ6+B*{9u*72$=EAIMb#HQ`Ml^cYHqY_d|V+;~?&mlX+@rL+B`*{Zc`vB)P3M*c^
R;Wz*Q002ovPDHLkV1g1b!e{^h

diff --git a/style/Fire/img/exclaim.png b/style/Fire/img/exclaim.png
deleted file mode 100644
index b98bb3cc2270ad086bcbb8eb2fa50757736e446a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002AP)t-sOlfiY
zyQlG%g7<}M^nYRXfnwujTI+3D@p)eEa$EQ2<K<yg_ltD&uA}&~pYf-j;&NQ+fok}o
ziU02F^reyOhkf9qmiErY{npOuz_{IeZsUV=@X5g8Tv7P6r0|}N-fLRYT}b%7u+d;o
z?U9J_q?pcDJ?D^w&0|gNo|M8&Gy2)n?2&%KN-^q;dc{&g>3nCyQ#|mrr|x=S?t*Ro
z!nOL7eCKOi)MHWQje^*3SjJpMY5s;V00001bW%=J06^y0W&i*Hs!2paR2Ug;z(tY*
zK>z^3npPQC+?{n7{{Jrsf+NXY_1CwQ$+G6ApL{l1*1VQIuKH3$m6TQVSo8quL_}JH
zQqgk}fMpqJt-(1rou@$3R7xrE-V5;$d}P`=2lisK1$?HQ^AA{Se>Pj7oC)vkEHx%>
zcYENym|ANgj^ljQ0bxE$jajcJlYICR0LF_^+8Wd5!>0jP<JIr(aQIui4Y&#2{&+lf
afqTy6_6%|nl<W}z0000<MNUMnLSTaQPub=G

diff --git a/style/Fire/img/ext.png b/style/Fire/img/ext.png
deleted file mode 100644
index 637236b78045dbd67b7bb8ac6aae290fdf4003f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9t50U(r3ME5OE)-xB8(+L
ze!&b5&u*jvIa;1Bjv*Yf$qmfU<av5zcz9%aKFRPnN%1HN@-V4Ou*gcV$VfclH#oq+
YkbRD2lZ?NDI#3sbr>mdKI;Vst0B<lGjQ{`u

diff --git a/style/Fire/img/feed.png b/style/Fire/img/feed.png
deleted file mode 100644
index 3704226a673de8aa886bb5d964fd65079347a35c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 439
zcmV;o0Z9IdP)<h;3K|Lk000e1NJLTq000dD000dL0{{R3MKu&o0002SP)t-sOlfiI
zd^h-%Fzc01@r*n6l|A^JKL7v!^o}*{ggNt)IplLN|M&0y@#X4(IOT02>Ut>u@Zj)-
zFZhrs^@=3#fGGUu+4i%0{Jwwx_38SoVC8r*<cduHnKSK`U-;nE?~Fw6d?MdqAK_>z
z{n@nn!;s!%C-tXg`p>H1Z8GD8O!b{i`?hiDb0`1Ind^;F_|Uib+s*Q~lJ>%y@2-pU
ztakE>G5q7p_s6CD$Bx=p9pG|9`OBpHs#f))S^w+S{oTI#q)}0fy#xRN00DGTPE!Ct
z=GbNc005s!L_t(|+6~D=7Q{dl0Knf#Gd2gY#<uQ%smZcl0Zb4Q0%JlHd4#$VmVf4)
zQz}Dh2Acg`c#=e^0)}<!G^R)Hbjmphzir7<V>g#`F)9eUB>Au~Hw?f|{blho(e=zi
zpeWuiisN_4_GSu1s;gJTu9-G3R3NU+s>Ma0ZCTTgx3<Ilu$vv{j}l}md5*I(%i`V)
h05Zl{Af&4O0Dr034rF_``4j*E002ovPDHLkV1hcR;mQC2

diff --git a/style/Fire/img/help.png b/style/Fire/img/help.png
deleted file mode 100644
index 080de7d72813a89769f17eaa14492f4a3137b370..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 380
zcmV-?0fYXDP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001oP)t-sOlfhz
zo`2H0pRkQ>?cUJm+RvthW$xqG-O9SOj&H4sYVhge;?cpXhh^c^$Gn+&>*Ctjz^Tiy
zmg>~Mu#a)u$hOzRvdE~3&bp_!m3F<Lhs(90#Hx~`fL`U!xaQc&_Uz%sqJs73*qnG&
z@$2T@&%(#Cn(E@)riW>lb5PX9x#7vO?%BmjZ>n(s0004WQchC<K<3zH0001^Nkl<Z
z7#VHAMG^u*5Cp&)@6mM?T;>1oLjrCj{@XpOsxtW5ROU_Iclg+>%)0109%NzgwlbmP
zd0wza@dE%U*IR~{EenAF6q09I-V(@`Y6ie1%dBk=eiDNk0F;thYmwK^)k**;RcWmd
zBE~qT8URrkobz65-Sj;GpQWab^Q?7Gi^ofHM;b4ev86rX;~1x;R66Z%_&QI^^}3wS
a_~!{ER|=EhnXYjF0000<MNUMnLSTYvIKUME

diff --git a/style/Fire/img/index.html b/style/Fire/img/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/Fire/img/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/Fire/index.html b/style/Fire/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/Fire/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/Lithium.css b/style/Lithium.css
deleted file mode 100644
index 60aa9f4c..00000000
--- a/style/Lithium.css
+++ /dev/null
@@ -1,1165 +0,0 @@
-/*****************************************************************
-1. INITIAL SETTINGS
-*****************************************************************/
-
-/* Limited Reset
-----------------------------------------------------------------*/
-
-.pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
-.pun h4, .pun h5, .pun pre, .pun blockquote, .pun ul, .pun ol, .pun li, .pun dl,
-.pun dt, .pun dd, .pun th, .pun td, .pun fieldset, .pun img, .pun abbr, .pun cite {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	}
-
-.pun ul, .pun ol {
-	list-style: none
-	}
-
-
-/* Structural Settings
-----------------------------------------------------------------*/
-
-.pun .clearer, .pun .nosize {
-	height: 0;
-	width: 0;
-	line-height: 0;
-	font-size: 0;
-	overflow: hidden
-	}
-
-.pun .clearer, .pun .clearb {
-	clear: both
-	}
-
-.pun .nosize {
-	position: absolute;
-	left: -9999em;
-	text-indent: -9999em;
-	width: 0;
-	}
-
-* html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
-	height: 1px
-	}
-
-.pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
-	min-height: 1px
-	}
-
-.clearl {
-	clear: left;
-	}
-
-/* Hidden Elements
-----------------------------------------------------------------*/
-
-#brdfooter h2, #brdstats h2, #brdstats .conl dt, #brdstats .conr dt,
-#modcontrols dt, #searchlinks dt, div.postright h3, span.closedtext,
-.pun .required strong span {
-	position: absolute;
-	display: block;
-	overflow: hidden;
-	width: 0;
-	left: -9999em;
-	text-indent: -9999em;
-	}
-
-/*****************************************************************
-2. TEXT & CONTENT
-*****************************************************************/
-
-/* Text Defaults
-----------------------------------------------------------------*/
-
-.pun {
-	font: 68.75%/1.4545em Verdana, Helvetica, Arial, sans-serif;
-	line-height: normal;
-	}
-
-.pun table, .pun td, .pun th, .pun input, .pun select, .pun optgroup, .pun textarea, .pun samp, .pun legend {
-	font-size: 1em;
-	font-family: verdana, helvetica, arial, sans-serif;
-	}
-
-.pun pre, .pun code {
-	font-size: 1.182em;
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace
-	}
-
-.pun pre code {
-	font-size: 1em;
-	}
-
-.pun strong {
-	font-weight: bold;
-	}
-
-.pun em {
-	font-style: italic;
-	}
-
-
-/* Content Defaults
-----------------------------------------------------------------*/
-
-.pun p, .pun ul, .pun ol, .pun dl {
-	font-size: 1em;
-	padding: 3px 0;
-	}
-
-.pun h2 {
-	font-size: 1em;
-	font-weight: normal;
-	padding: 4px 6px;
-	}
-
-.pun h3 {
-	font-size: 1.091em;
-	padding: 3px 0;
-	}
-
-.pun table p, .pun table h3 {
-	padding: 0;
-	}
-
-.pun span.warntext, .pun p.warntext {
-	font-weight: bold
-	}
-
-/* User Content (Announcements, Rules, Posts)
-----------------------------------------------------------------*/
-
-.pun .usercontent p, .pun .postmsg p {
-	padding: 0.75em 0
-	}
-
-.pun .usercontent ul, .pun .postmsg ul {
-	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: disc
-	}
-
-.pun .usercontent ol, .pun .postmsg ol {
-	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: decimal
-	}
-
-.pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha
-	}
-
-.pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
-	padding: 0.25em 1em 0.75em 2.5em
-	}
-
-.pun .usercontent li p, .pun .postmsg li p {
-	padding: 0
-	}
-
-.pun .usercontent h1 {
-	font-size: 1.4em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h2 {
-	font-size: 1.2em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h3 {
-	font-size: 1.1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
-	font-size: 1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .quotebox cite {
-	font-weight: bold;
-	font-style: normal;
-	padding: 0.75em 0.75em 0 0.75em
-	}
-
-.pun span.bbu {
-	text-decoration: underline
-	}
-
-.pun span.bbs, .pun del {
-	text-decoration: line-through;
-	}
-
-.pun .postmsg ins, #punhelp samp ins {
-	text-decoration: none;
-	}
-
-.pun div.postmsg h5, #punhelp h5 {
-	font-size: 1.1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0;
-	}
-
-
-/*****************************************************************
-3. COMMON STYLES
-*****************************************************************/
-
-/* Page Layout
-----------------------------------------------------------------*/
-
-html, body {
-	margin: 0;
-	padding: 0
-	}
-
-.pun {
-	max-width: 1070px;
-	width: 95%;
-	margin: 0 auto;
-	padding: 12px 20px;
-	}
-
-#punredirect, #punmaint, #puninstall, #pundb_update {
-	margin: 50px 20% 12px 20%
-	}
-
-
-/* Vertical Element Spacing
-----------------------------------------------------------------*/
-
-#brdheader {
-	margin: 0 0 12px 0;
-	}
-
-#brdtitle p {
-	padding-top: 0px
-	}
-
-#announce, #brdstats {
-	margin: 12px 0 12px 0;
-	}
-
-.pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
-	margin-bottom: 12px
-	}
-
-#punindex .blocktable, .pun .blockpost {
-	margin-bottom: 6px
-	}
-
-#postreview .blockpost {
-	margin-bottom: -1px;
-	}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-bottom: 0px
-	}
-
-.pun .linkst, .pun .linksb {
-	margin-top: -12px
-	}
-
-.pun .postlinksb {
-	margin-top: -6px
-	}
-
-
-/* External Borders
-----------------------------------------------------------------*/
-
-.pun .box {
-	border-style: solid;
-	border-width: 1px;
-	}
-
-#brdheader .box {
-	border-top-width: 4px;
-	}
-
-/* Default Internal Spacing
-----------------------------------------------------------------*/
-
-.pun .block .inbox, .pun .blockmenu .inbox {
-	padding: 3px 6px
-	}
-
-/*****************************************************************
-4. COMMON BOARD ELEMENTS
-*****************************************************************/
-
-/* Board Header
-----------------------------------------------------------------*/
-
-#brdtitle h1 {
-	font-size: 1.4em;
-	font-weight: bold;
-	padding: 3px 0 0 0;
-	}
-
-#brdmenu li {
-	display: inline;
-	margin-right: 12px;
-	}
-
-#brdmenu a:link, #brdmenu a:visited {
-	text-decoration: none
-	}
-
-#brdmenu a:hover, #brdmenu a:active {
-	text-decoration: underline
-	}
-
-#brdwelcome .conl {
-	float: left;
-	}
-
-#brdwelcome .conr {
-	float: right;
-	text-align: right;
-	}
-
-/* Breadcrumbs and Post Links
-----------------------------------------------------------------*/
-
-.pun .linkst {
-	padding: 8px 6px 3px 6px
-	}
-
-.pun .linksb, .pun .postlinksb {
-	padding: 3px 6px 8px 6px
-	}
-
-.pun .crumbs {
-	clear: both;
-	width: 100%;
-	overflow: hidden;
-	}
-
-.pun .crumbs li {
-	display: inline;
-	white-space: nowrap;
-	font-weight: bold;
-	}
-
-.pun .pagelink {
-	float: left;
-	white-space: nowrap;
-	}
-
-.pun .postlink {
-	font-weight: bold;
-	white-space: nowrap;
-	}
-
-.pun .postlink, .pun .modbuttons {
-	float: right;
-	text-align: right;
-	}
-
-.pun .modbuttons {
-	padding: 1px 0;
-	white-space: nowrap;
-	}
-
-.pun .modbuttons input {
-	margin-left: 6px;
-	}
-
-.pun .postlink a:link, .pun .postlink a:visited {
-	text-decoration: none
-	}
-
-.pun .postlink a:hover, .pun .postlink a:active {
-	text-decoration: underline;
-	}
-
-#punindex .subscribelink {
-	margin-top: 6px;
-	}
-
-/* Board Footer
-----------------------------------------------------------------*/
-
-#brdfooter .conl {
-	float: left;
-	}
-
-#brdfooter .conr {
-	float: right;
-	text-align: right;
-	}
-
-#brdfooter #modcontrols {
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	text-align: center;
-	}
-
-#brdfooter #modcontrols dd {
-	display: inline;
-	margin:0 6px;
-	}
-
-
-/* Board Stats
-----------------------------------------------------------------*/
-
-#brdstats .conl {
-	float: left;
-	}
-
-#brdstats .conr {
-	float: right;
-	text-align: right;
-	}
-
-#onlinelist dd, #onlinelist dt {
-	display: inline;
-	}
-
-
-/*****************************************************************
-5. MAIN TABLES
-*****************************************************************/
-
-.pun table {
-	width: 100%;
-	border-collapse: collapse;
-	border-spacing: 0;
-	empty-cells: show;
-	}
-
-.pun .blocktable table {
-	table-layout: fixed;
-	}
-
-.pun td, .pun th {
-	padding: 4px 6px;
-	text-align: left;
-	font-weight: normal;
-	}
-
-.pun td, .pun th {
-	border-style: solid none none solid;
-	border-width: 1px;
-	}
-
-.pun .tcl {
-	border-left: 0;
-	width: auto;
-	}
-
-.pun .tc2, .pun .tc3, .pun .tcmod {
-	width: 10%;
-	text-align: center;
-	padding: 4px 0;
-	}
-
-.pun .tcr {
-	width: 30%;
-	}
-
-.pun .tcl h3 {
-	font-size: 1.091em;
-	font-weight: bold;
-	}
-
-.pun .tcl h3 span.newtext {
-	font-size: 0.917em;
-	}
-
-.pun .tcl span.newtext, .pun .tcl span.pagestext {
-	white-space: nowrap;
-	font-weight: normal;
-	}
-
-.pun td span.byuser {
-	white-space: nowrap;
-	}
-
-.pun .tcl p {
-	padding: 5px 0 0 0
-	}
-
-#punsearch #vf .tc2 {
-	width: 18%;
-	text-align: left;
-	padding: 4px 6px;
-	}
-
-#users1 .tcr {
-	width: 25%
-	}
-
-#users1 .tc2 {
-	width: 25%;
-	text-align: left;
-	padding: 4px 6px;
-	}
-
-#debug .tcl {
-	width: 10%
-	}
-
-#debug .tcr {
-	width: 90%;
-	white-space: normal
-	}
-
-#punindex .tcr .byuser {
-	display: block
-	}
-
-.pun .blocktable .tclcon {
-	padding: 0 11px 0 12px;
-	overflow: hidden;
-	min-height: 1px;
-	position: relative;
-	}
-
-.pun .blocktable .tclcon div {
-	width: 100%;
-	overflow: hidden;
-	}
-
-.pun .icon {
-	margin: 0.1em 0 0 0.2em;
-	border-width: 0.6em;
-	border-style: solid;
-	height: 0;
-	width: 0;
-	overflow: hidden;
-	float: left;
-	}
-
-.pun .icon div {
-	position: absolute;
-	left: -9999em;
-	text-indent: -9999em;
-	height: 0;
-	}
-
-.pun .iposted .ipost {
-	position: absolute;
-	left: 0;
-	font-weight: bold;
-	width: 8px;
-	padding-left: 4px;
-	text-align: center;
-	top: 0;
-	}
-
-/*****************************************************************
-6. MAIN FORMS
-*****************************************************************/
-
-.pun .blockform form, .pun .fakeform {
-	PADDING: 20px 20px 15px 20px
-	}
-
-.pun .forminfo {
-	margin-bottom: 12px;
-	padding: 9px 10px;
-	border-style: solid;
-	border-width: 1px;
-	}
-
-.pun .forminfo h3 {
-	font-weight: bold;
-	}
-
-.pun .inform {
-	padding-bottom: 12px
-	}
-
-.pun fieldset {
-	padding: 0px 12px 0px 12px;
-	border-style: solid;
-	border-width: 1px
-	}
-
-.pun legend {
-	padding: 0px 6px
-	}
-
-.pun .infldset {
-	padding: 9px 0px 12px 0
-	}
-
-.pun label {
-	display: block;
-	padding: 3px 0
-	}
-
-.pun label.conl {
-	float: left;
-	overflow: visible;
-	margin-right: 10px
-	}
-
-.pun fieldset .rbox br {
-	display: none;
-	}
-
-.pun fieldset .rbox label {
-	padding: 3px 0 3px 25px;
-	position: relative;
-	vertical-align: middle;
-	}
-
-.pun fieldset .rbox input {
-	margin: 0 9px 0 -25px;
-	padding: 0;
-	width: 16px;
-	position: relative;
-	vertical-align: middle;
-	}
-
-.pun .txtarea {
-	width: 75%
-	}
-
-.pun .txtarea textarea, .pun input.longinput {
-	width: 100%
-	}
-
-.pun .bblinks {
-	padding-bottom: 10px;
-	padding-left: 4px
-	}
-
-.pun .bblinks li {
-	display: inline;
-	padding-right: 20px
-	}
-
-.pun .blockform .buttons {
-	padding-left: 12px;
-	}
-
-.pun .blockform .buttons input {
-	margin-right: 8px;
-	}
-
-#posterror ul {
-	list-style: square;
-	padding: 3px 0 3px 24px;
-	}
-
-.pun .deletemsg {
-	border-style: solid;
-	border-width: 1px;
-	padding: 6px 15px;
-	}
-
-.pun p.actions span {
-	margin-right: 12px;
-	}
-
-.pun .multiselect {
-	float: left;
-	padding-bottom: 7px;
-	}
-
-.pun .checklist {
-	border-width: 1px;
-	border-style: solid;
-	max-height: 9em;
-	width: 20em;
-	overflow: auto;
-	padding: 0.3em 0.5em;
-	margin: 0.25em 16px 0 0.15em;
-	}
-
-.pun .checklist fieldset {
-	border: 0;
-	padding: 0;
-	}
-
-.pun .checklist legend {
-	padding: 0;
-	}
-
-.pun .checklist legend span {
-	width: auto;
-	max-width: 25em;
-	}
-
-/*****************************************************************
-7. PROFILES AND ADMIN
-*****************************************************************/
-
-.pun .block2col {
-	padding-bottom: 1px
-	}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 14em
-	}
-
-.pun .blockmenu {
-	float:left;
-	width: 13em
-	}
-
-.pun .blockmenu li {
-	padding: 3px 0;
-	font-weight: bold;
-	}
-
-.pun .blockmenu a:link, .pun .blockmenu a:visited {
-	text-decoration: none
-	}
-
-.pun .blockmenu a:hover, .pun .blockmenu a:active {
-	text-decoration: underline
-	}
-
-#viewprofile dl {
-	float: left;
-	width: 100%;
-	overflow: hidden
-	}
-
-#viewprofile dd {
-	margin-left: 14em;
-	padding: 3px;
-	}
-
-#viewprofile dt {
-	float: left;
-	width: 13em;
-	margin: 3px 0;
-	}
-
-#profileavatar img {
-	float: right;
-	margin-left: 1em
-	}
-
-#adintro ul {
-	list-style-type: disc;
-	margin-left: 8px;
-	padding-left: 16px;
-	}
-
-/*****************************************************************
-8. MAIN POSTS
-*****************************************************************/
-
-.pun .blockpost h2 a:link, .pun .blockpost h2 a:visited {
-	text-decoration: none;
-	}
-
-.pun .blockpost h2 a:hover, .pun .blockpost h2 a:active {
-	text-decoration: underline;
-	}
-
-.pun .blockpost h2 .conr {
-	float: right;
-	text-align: right;
-	}
-
-#punsearch .blockpost h2 span {
-	white-space: nowrap;
-	}
-
-.pun .blockpost .box {
-	overflow: hidden;
-	}
-
-.pun .postleft, .pun .postfootleft {
-	float:left;
-	width: 18em;
-	position: relative;
-	overflow: hidden;
-	}
-
-.pun .postleft dl {
-	padding: 6px;
-	}
-
-.pun .postleft .usercontacts, .pun .postleft .icon {
-	margin-top: 6px
-	}
-
-.pun .postleft .postavatar, .pun .postleft .usertitle {
-	margin-bottom: 6px;
-	display: block;
-	}
-
-.pun .blockpost dt {
-	font-size: 1.091em;
-	font-weight: bold;
-	}
-
-.pun .blockpost dt a:link, .pun .blockpost dt a:visited {
-	text-decoration: none;
-	}
-
-.pun .blockpost dt a:hover, .pun .blockpost dt a:active {
-	text-decoration: underline;
-	}
-
-.pun .postright, .pun .postfootright {
-	border-left-width: 18em;
-	border-left-style: solid
-	}
-
-#postpreview .postright {
-	border-left: 0
-	}
-
-.pun .postright {
-	padding: 0 6px;
-	}
-
-.pun .postfootright, .pun .multidelete {
-	text-align: right
-	}
-
-.pun .postmsg {
-	width:98%;
-	overflow: hidden;
-	padding-bottom: 6px;
-	word-wrap: break-word;
-	}
-
-.pun .postfootright ul, .pun .postfootright div, .pun .postfootright p,
-.pun .postfootleft p {
-	padding: 10px 6px 5px 6px;
-	}
-
-.pun .postfootright li {
-	display: inline;
-	}
-
-.pun .postfootright li:before {
-	content: " | ";
-	}
-
-.pun .postfootright li:first-child:before {
-	content: "";
-	}
-
-.pun .postfootright a:link, .pun .postfootright a:visited {
-	text-decoration: none
-	}
-
-.pun .postfootright a:hover, .pun .postfootright a:active {
-	text-decoration: underline
-	}
-
-.pun .codebox {
-	border-style: solid;
-	border-width: 1px;
-	margin: 0.75em 1em;
-	padding: 0;
-	}
-
-.pun .quotebox {
-	border-style: solid;
-	border-width: 1px;
-	margin: 0.75em 1em;
-	padding: 0 0.75em;
-	}
-
-.pun .quotebox cite {
-	display: block;
-	padding: 0.75em 0 0 0;
-	}
-
-.pun .quotebox blockquote {
-	width: 100%;
-	overflow: hidden
-	}
-
-.pun .codebox pre {
-	overflow: auto;
-	width: 100%;
-	overflow-y:hidden
-	}
-
-* html .pun .codebox pre {
-	padding-bottom: 10px;
-	}
-
-*+html .pun .codebox pre {
-	padding-bottom: 10px
-	}
-
-.pun .codebox pre code {
-	display: block;
-	padding: 0.75em;
-	}
-
-.pun .codebox pre.vscroll {
-	height: 32em;
-	overflow: auto;
-	overflow-y: auto
-	}
-
-.pun .postmsg img {
-	vertical-align: bottom;
-	}
-
-.pun .postsignature hr {
-	margin-left: 0px;
-	width: 200px;
-	text-align: left;
-	height: 1px;
-	border:none
-	}
-
-.pun .postmsg .postimg img {
-	max-width: 98%;
-	vertical-align: middle;
-	margin: 7px 0.5em 7px 0;
-	}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-style: solid;
-	border-width: 2px;
-	}
-
-.pun .blockpost label {
-	padding: 3px 6px;
-	border-style: solid;
-	border-width: 1px;
-	vertical-align: middle;
-	display: inline-block;
-	}
-
-.pun .blockpost label * {
-	vertical-align: middle;
-	margin: 0;
-	padding: 0;
-	}
-
-/****************************************************************/
-/* 9. HELP FILES AND MISC. */
-/****************************************************************/
-
-#punhelp h2 {
-	margin-top: 12px
-	}
-
-#punhelp div.box {
-	padding: 10px
-	}
-
-#debugtime {
-	margin-top: -12px;
-	text-align: center;
-	}
-
-#brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
-	line-height: 1.4em
-	}
-
-#announce div.inbox div {
-	padding: 3px 0
-	}
-
-/*****************************************************************
-COLOUR SCHEME
-*****************************************************************/
-
-/* Background / Text
-----------------------------------------------------------------*/
-
-body {
-	background: #fff;
-	color: #333
-	}
-
-.pun {
-	color: #333
-	}
-
-.pun .box, #adminconsole fieldset th {
-	background-color: #f1f1f1
-	}
-
-.pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
-#brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
-	background-color: #dedfdf
-	}
-
-.pun h2, #brdmenu {
-	background-color: #6c8a3f;
-	color: #fff
-	}
-
-.pun th {
-	background-color: #d1d1d1
-	}
-
-.pun legend {
-	color: #6c8a3f
-	}
-
-.pun .blockmenu li.isactive a, #posterror li strong {
-	color: #333
-	}
-
-.pun .usercontent * {
-	background: transparent;
-	color: #333
-	}
-
-.pun .multiselect, .pun .checklist {
-	color: #333;
-	}
-
-.pun .checklist {
-	border-color: #ACA899;
-	}
-
-/* posts
-----------------------------------------------------------------*/
-
-.pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
-	background-color: #dedfdf
-	}
-
-.pun .postright, .pun .postfootright {
-	border-left-color: #f1f1f1
-	}
-
-.pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
-	background-color: #f1f1f1
-	}
-
-#punhelp .codebox, #punhelp .quotebox {
-	background-color: #f9f9f9;
-	}
-
-.pun .blockpost h2 {
-	background-color: #7ea34b
-	}
-
-.pun .blockpost h2 span.conr {
-	color: #b7d094
-	}
-
-.pun .postmsg ins, #punhelp samp ins {
-	background-color: #ff0;
-	}
-
-.pun hr {
-	background-color: #333;
-	color: #333
-	}
-
-/* Borders
-----------------------------------------------------------------*/
-
-.pun .box {
-	border-color: #6c8a3f
-	}
-
-.pun td, #brdfooter #modcontrols {
-	border-color: #cedeb9
-	}
-
-.pun th {
-	border-color: #d1d1d1
-	}
-
-.pun fieldset {
-	border-color: #aca899
-	}
-
-#adminconsole td, #adminconsole th {
-	border-color: #f1f1f1
-	}
-
-.pun .quotebox, .pun .codebox, .pun .forminfo,
-.pun .blockpost label, .pun .deletemsg {
-	border-color: #aca899 #fff #fff #aca899
-	}
-
-/* Links
-----------------------------------------------------------------*/
-
-.pun a:link, .pun a:visited {
-	color: #638137
-	}
-
-.pun a:hover, .pun a:active, .pun a:focus {
-	color: #8eb653
-	}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-color: #638137;
-	}
-
-.pun .postmsg .postimg a:hover img, .pun .postmsg .postimg a:active img, .pun .postmsg .postimg a:focus img {
-	border-color: #8eb653;
-	}
-
-.pun h2 a:link, .pun h2 a:visited,
-#brdmenu a:link, #brdmenu a:visited {
-	color: #fff
-	}
-
-.pun h2 a:hover, .pun h2 a:active,
-#brdmenu a:hover, #brdmenu a:active {
-	color: #fff
-	}
-
-.pun .postreport a:link, .pun .postreport a:visited,
-.pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
-	color: #888
-	}
-
-.pun .postreport a:hover, .pun .postreport a:active,
-.pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
-	color: #aaa
-	}
-
-.pun .maintenancelink a:link, .pun .maintenancelink a:visited {
-	color: #b42000
-	}
-
-.pun .maintenancelink a:hover, .pun .maintenancelink a:active {
-	color: #b42000
-	}
-
-/* Status Indicators
-----------------------------------------------------------------*/
-
-.pun .icon {
-	border-color: #e6e6e6 #dedede #dadada #e2e2e2
-	}
-
-.pun .iredirect .icon {
-	border-color: #f1f1f1 #f1f1f1 #f1f1f1 #f1f1f1
-	}
-
-.pun .inew .icon {
-	border-color: #8bb453 #7a9e48 #709142 #799c47
-	}
-
-/* Alert boxes
-----------------------------------------------------------------*/
-
-#msgflash {
-    opacity: 0;
-    position: fixed;
-    top: 40px;
-    right: 40px;
-    min-width: 240px;
-    max-width: 410px;
-	padding: 5px;
-	z-index: 1000;
-	background-color: #61c462;
-	border-width: 0px
-}
diff --git a/style/Mercury.css b/style/Mercury.css
deleted file mode 100644
index 55170078..00000000
--- a/style/Mercury.css
+++ /dev/null
@@ -1,1168 +0,0 @@
-/*****************************************************************
-1. INITIAL SETTINGS
-*****************************************************************/
-
-/* Limited Reset
-----------------------------------------------------------------*/
-
-.pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
-.pun h4, .pun h5, .pun pre, .pun blockquote, .pun ul, .pun ol, .pun li, .pun dl,
-.pun dt, .pun dd, .pun th, .pun td, .pun fieldset, .pun img, .pun abbr, .pun cite {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	}
-
-.pun ul, .pun ol {
-	list-style: none
-	}
-
-
-/* Structural Settings
-----------------------------------------------------------------*/
-
-.pun .clearer, .pun .nosize {
-	height: 0;
-	width: 0;
-	line-height: 0;
-	font-size: 0;
-	overflow: hidden
-	}
-
-.pun .clearer, .pun .clearb {
-	clear: both
-	}
-
-.pun .nosize {
-	position: absolute;
-	left: -9999em;
-	text-indent: -9999em;
-	width: 0;
-	}
-
-* html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
-	height: 1px
-	}
-
-.pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
-	min-height: 1px
-	}
-
-.clearl {
-	clear: left;
-	}
-
-/* Hidden Elements
-----------------------------------------------------------------*/
-
-#brdfooter h2, #brdstats h2, #brdstats .conl dt, #brdstats .conr dt,
-#modcontrols dt, #searchlinks dt, div.postright h3, span.closedtext,
-.pun .required strong span {
-	position: absolute;
-	display: block;
-	overflow: hidden;
-	width: 0;
-	left: -9999em;
-	text-indent: -9999em;
-	}
-
-/*****************************************************************
-2. TEXT & CONTENT
-*****************************************************************/
-
-/* Text Defaults
-----------------------------------------------------------------*/
-
-.pun {
-	font: 68.75%/1.4545em Verdana, Helvetica, Arial, sans-serif;
-	line-height: normal;
-	}
-
-.pun table, .pun td, .pun th, .pun input, .pun select, .pun optgroup, .pun textarea, .pun samp, .pun legend {
-	font-size: 1em;
-	font-family: verdana, helvetica, arial, sans-serif;
-	}
-
-.pun pre, .pun code {
-	font-size: 1.182em;
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace
-	}
-
-.pun pre code {
-	font-size: 1em;
-	}
-
-.pun strong {
-	font-weight: bold;
-	}
-
-.pun em {
-	font-style: italic;
-	}
-
-
-/* Content Defaults
-----------------------------------------------------------------*/
-
-.pun p, .pun ul, .pun ol, .pun dl {
-	font-size: 1em;
-	padding: 3px 0;
-	}
-
-.pun h2 {
-	font-size: 1em;
-	font-weight: normal;
-	padding: 4px 6px;
-	}
-
-.pun h3 {
-	font-size: 1.091em;
-	padding: 3px 0;
-	}
-
-.pun table p, .pun table h3 {
-	padding: 0;
-	}
-
-.pun span.warntext, .pun p.warntext {
-	font-weight: bold
-	}
-
-/* User Content (Announcements, Rules, Posts)
-----------------------------------------------------------------*/
-
-.pun .usercontent p, .pun .postmsg p {
-	padding: 0.75em 0
-	}
-
-.pun .usercontent ul, .pun .postmsg ul {
-	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: disc
-	}
-
-.pun .usercontent ol, .pun .postmsg ol {
-	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: decimal
-	}
-
-.pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha
-	}
-
-.pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
-	padding: 0.25em 1em 0.75em 2.5em
-	}
-
-.pun .usercontent li p, .pun .postmsg li p {
-	padding: 0
-	}
-
-.pun .usercontent h1 {
-	font-size: 1.4em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h2 {
-	font-size: 1.2em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h3 {
-	font-size: 1.1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
-	font-size: 1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .quotebox cite {
-	font-weight: bold;
-	font-style: normal;
-	padding: 0.75em 0.75em 0 0.75em
-	}
-
-.pun span.bbu {
-	text-decoration: underline
-	}
-
-.pun span.bbs, .pun del {
-	text-decoration: line-through;
-	}
-
-.pun .postmsg ins, #punhelp samp ins {
-	text-decoration: none;
-	}
-
-.pun div.postmsg h5, #punhelp h5 {
-	font-size: 1.1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0;
-	}
-
-
-/*****************************************************************
-3. COMMON STYLES
-*****************************************************************/
-
-/* Page Layout
-----------------------------------------------------------------*/
-
-html, body {
-	margin: 0;
-	padding: 0
-	}
-
-.pun {
-	max-width: 1070px;
-	width: 95%;
-	margin: 0 auto;
-	padding: 12px 20px;
-	}
-
-#punredirect, #punmaint, #puninstall, #pundb_update {
-	margin: 50px 20% 12px 20%
-	}
-
-
-/* Vertical Element Spacing
-----------------------------------------------------------------*/
-
-#brdheader {
-	margin: 0 0 12px 0;
-	}
-
-#brdtitle p {
-	padding-top: 0px
-	}
-
-#announce, #brdstats {
-	margin: 12px 0 12px 0;
-	}
-
-.pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
-	margin-bottom: 12px
-	}
-
-#punindex .blocktable, .pun .blockpost {
-	margin-bottom: 6px
-	}
-
-#postreview .blockpost {
-	margin-bottom: -1px;
-	}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-bottom: 0px
-	}
-
-.pun .linkst, .pun .linksb {
-	margin-top: -12px
-	}
-
-.pun .postlinksb {
-	margin-top: -6px
-	}
-
-
-/* External Borders
-----------------------------------------------------------------*/
-
-.pun .box {
-	border-style: solid;
-	border-width: 1px;
-	}
-
-#brdheader .box {
-	border-top-width: 4px;
-	}
-
-/* Default Internal Spacing
-----------------------------------------------------------------*/
-
-.pun .block .inbox, .pun .blockmenu .inbox {
-	padding: 3px 6px
-	}
-
-/*****************************************************************
-4. COMMON BOARD ELEMENTS
-*****************************************************************/
-
-/* Board Header
-----------------------------------------------------------------*/
-
-#brdtitle h1 {
-	font-size: 1.4em;
-	font-weight: bold;
-	padding: 3px 0 0 0;
-	}
-
-#brdmenu li {
-	display: inline;
-	margin-right: 12px;
-	}
-
-#brdmenu a:link, #brdmenu a:visited {
-	text-decoration: none
-	}
-
-#brdmenu a:hover, #brdmenu a:active {
-	text-decoration: underline
-	}
-
-#brdwelcome .conl {
-	float: left;
-	}
-
-#brdwelcome .conr {
-	float: right;
-	text-align: right;
-	}
-
-/* Breadcrumbs and Post Links
-----------------------------------------------------------------*/
-
-.pun .linkst {
-	padding: 8px 6px 3px 6px
-	}
-
-.pun .linksb, .pun .postlinksb {
-	padding: 3px 6px 8px 6px
-	}
-
-.pun .crumbs {
-	clear: both;
-	width: 100%;
-	overflow: hidden;
-	}
-
-.pun .crumbs li {
-	display: inline;
-	white-space: nowrap;
-	font-weight: bold;
-	}
-
-.pun .pagelink {
-	float: left;
-	white-space: nowrap;
-	}
-
-.pun .postlink {
-	font-weight: bold;
-	white-space: nowrap;
-	}
-
-.pun .postlink, .pun .modbuttons {
-	float: right;
-	text-align: right;
-	}
-
-.pun .modbuttons {
-	padding: 1px 0;
-	white-space: nowrap;
-	}
-
-.pun .modbuttons input {
-	margin-left: 6px;
-	}
-
-.pun .postlink a:link, .pun .postlink a:visited {
-	text-decoration: none
-	}
-
-.pun .postlink a:hover, .pun .postlink a:active {
-	text-decoration: underline;
-	}
-
-#punindex .subscribelink {
-	margin-top: 6px;
-	}
-
-/* Board Footer
-----------------------------------------------------------------*/
-
-#brdfooter .conl {
-	float: left;
-	}
-
-#brdfooter .conr {
-	float: right;
-	text-align: right;
-	}
-
-#brdfooter #modcontrols {
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	text-align: center;
-	}
-
-#brdfooter #modcontrols dd {
-	display: inline;
-	margin:0 6px;
-	}
-
-
-/* Board Stats
-----------------------------------------------------------------*/
-
-#brdstats .conl {
-	float: left;
-	}
-
-#brdstats .conr {
-	float: right;
-	text-align: right;
-	}
-
-#onlinelist dd, #onlinelist dt {
-	display: inline;
-	}
-
-
-/*****************************************************************
-5. MAIN TABLES
-*****************************************************************/
-
-.pun table {
-	width: 100%;
-	border-collapse: collapse;
-	border-spacing: 0;
-	empty-cells: show;
-	}
-
-.pun .blocktable table {
-	table-layout: fixed;
-	}
-
-.pun td, .pun th {
-	padding: 4px 6px;
-	text-align: left;
-	font-weight: normal;
-	}
-
-.pun td, .pun th {
-	border-style: solid none none solid;
-	border-width: 1px;
-	}
-
-.pun .tcl {
-	border-left: 0;
-	width: auto;
-	}
-
-.pun .tc2, .pun .tc3, .pun .tcmod {
-	width: 10%;
-	text-align: center;
-	padding: 4px 0;
-	}
-
-.pun .tcr {
-	width: 30%;
-	}
-
-.pun .tcl h3 {
-	font-size: 1.091em;
-	font-weight: bold;
-	}
-
-.pun .tcl h3 span.newtext {
-	font-size: 0.917em;
-	}
-
-.pun .tcl span.newtext, .pun .tcl span.pagestext {
-	white-space: nowrap;
-	font-weight: normal;
-	}
-
-.pun td span.byuser {
-	white-space: nowrap;
-	}
-
-.pun .tcl p {
-	padding: 5px 0 0 0
-	}
-
-#punsearch #vf .tc2 {
-	width: 18%;
-	text-align: left;
-	padding: 4px 6px;
-	}
-
-#users1 .tcr {
-	width: 25%
-	}
-
-#users1 .tc2 {
-	width: 25%;
-	text-align: left;
-	padding: 4px 6px;
-	}
-
-#debug .tcl {
-	width: 10%
-	}
-
-#debug .tcr {
-	width: 90%;
-	white-space: normal
-	}
-
-#punindex .tcr .byuser {
-	display: block
-	}
-
-.pun .blocktable .tclcon {
-	padding: 0 11px 0 12px;
-	overflow: hidden;
-	min-height: 1px;
-	position: relative;
-	}
-
-.pun .blocktable .tclcon div {
-	width: 100%;
-	overflow: hidden;
-	}
-
-.pun .icon {
-	margin: 0.1em 0 0 0.2em;
-	border-width: 0.6em;
-	border-style: solid;
-	height: 0;
-	width: 0;
-	overflow: hidden;
-	float: left;
-	}
-
-.pun .icon div {
-	position: absolute;
-	left: -9999em;
-	text-indent: -9999em;
-	height: 0;
-	}
-
-.pun .iposted .ipost {
-	position: absolute;
-	left: 0;
-	font-weight: bold;
-	width: 8px;
-	padding-left: 4px;
-	text-align: center;
-	top: 0;
-	}
-
-/*****************************************************************
-6. MAIN FORMS
-*****************************************************************/
-
-.pun .blockform form, .pun .fakeform {
-	PADDING: 20px 20px 15px 20px
-	}
-
-.pun .forminfo {
-	margin-bottom: 12px;
-	padding: 9px 10px;
-	border-style: solid;
-	border-width: 1px;
-	}
-
-.pun .forminfo h3 {
-	font-weight: bold;
-	}
-
-.pun .inform {
-	padding-bottom: 12px
-	}
-
-.pun fieldset {
-	padding: 0px 12px 0px 12px;
-	border-style: solid;
-	border-width: 1px
-	}
-
-.pun legend {
-	padding: 0px 6px
-	}
-
-.pun .infldset {
-	padding: 9px 0px 12px 0
-	}
-
-.pun label {
-	display: block;
-	padding: 3px 0
-	}
-
-.pun label.conl {
-	float: left;
-	overflow: visible;
-	margin-right: 10px
-	}
-
-.pun fieldset .rbox br {
-	display: none;
-	}
-
-.pun fieldset .rbox label {
-	padding: 3px 0 3px 25px;
-	position: relative;
-	vertical-align: middle;
-	}
-
-.pun fieldset .rbox input {
-	margin: 0 9px 0 -25px;
-	padding: 0;
-	width: 16px;
-	position: relative;
-	vertical-align: middle;
-	}
-
-.pun .txtarea {
-	width: 75%
-	}
-
-.pun .txtarea textarea, .pun input.longinput {
-	width: 100%
-	}
-
-.pun .bblinks {
-	padding-bottom: 10px;
-	padding-left: 4px
-	}
-
-.pun .bblinks li {
-	display: inline;
-	padding-right: 20px
-	}
-
-.pun .blockform .buttons {
-	padding-left: 12px;
-	}
-
-.pun .blockform .buttons input {
-	margin-right: 8px;
-	}
-
-#posterror ul {
-	list-style: square;
-	padding: 3px 0 3px 24px;
-	}
-
-.pun .deletemsg {
-	border-style: solid;
-	border-width: 1px;
-	padding: 6px 15px;
-	}
-
-.pun p.actions span {
-	margin-right: 12px;
-	}
-
-.pun .multiselect {
-	float: left;
-	padding-bottom: 7px;
-	}
-
-.pun .checklist {
-	border-width: 1px;
-	border-style: solid;
-	max-height: 9em;
-	width: 20em;
-	overflow: auto;
-	padding: 0.3em 0.5em;
-	margin: 0.25em 16px 0 0.15em;
-	}
-
-.pun .checklist fieldset {
-	border: 0;
-	padding: 0;
-	}
-
-.pun .checklist legend {
-	padding: 0;
-	}
-
-.pun .checklist legend span {
-	width: auto;
-	max-width: 25em;
-	}
-
-/*****************************************************************
-7. PROFILES AND ADMIN
-*****************************************************************/
-
-.pun .block2col {
-	padding-bottom: 1px
-	}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 14em
-	}
-
-.pun .blockmenu {
-	float:left;
-	width: 13em
-	}
-
-.pun .blockmenu li {
-	padding: 3px 0;
-	font-weight: bold;
-	}
-
-.pun .blockmenu a:link, .pun .blockmenu a:visited {
-	text-decoration: none
-	}
-
-.pun .blockmenu a:hover, .pun .blockmenu a:active {
-	text-decoration: underline
-	}
-
-#viewprofile dl {
-	float: left;
-	width: 100%;
-	overflow: hidden
-	}
-
-#viewprofile dd {
-	margin-left: 14em;
-	padding: 3px;
-	}
-
-#viewprofile dt {
-	float: left;
-	width: 13em;
-	margin: 3px 0;
-	}
-
-#profileavatar img {
-	float: right;
-	margin-left: 1em
-	}
-
-#adintro ul {
-	list-style-type: disc;
-	margin-left: 8px;
-	padding-left: 16px;
-	}
-
-/*****************************************************************
-8. MAIN POSTS
-*****************************************************************/
-
-.pun .blockpost h2 a:link, .pun .blockpost h2 a:visited {
-	text-decoration: none;
-	}
-
-.pun .blockpost h2 a:hover, .pun .blockpost h2 a:active {
-	text-decoration: underline;
-	}
-
-.pun .blockpost h2 .conr {
-	float: right;
-	text-align: right;
-	}
-
-#punsearch .blockpost h2 span {
-	white-space: nowrap;
-	}
-
-.pun .blockpost .box {
-	overflow: hidden;
-	}
-
-.pun .postleft, .pun .postfootleft {
-	float:left;
-	width: 18em;
-	position: relative;
-	overflow: hidden;
-	}
-
-.pun .postleft dl {
-	padding: 6px;
-	}
-
-.pun .postleft .usercontacts, .pun .postleft .icon {
-	margin-top: 6px
-	}
-
-.pun .postleft .postavatar, .pun .postleft .usertitle {
-	margin-bottom: 6px;
-	display: block;
-	}
-
-.pun .blockpost dt {
-	font-size: 1.091em;
-	font-weight: bold;
-	}
-
-.pun .blockpost dt a:link, .pun .blockpost dt a:visited {
-	text-decoration: none;
-	}
-
-.pun .blockpost dt a:hover, .pun .blockpost dt a:active {
-	text-decoration: underline;
-	}
-
-.pun .postright, .pun .postfootright {
-	border-left-width: 18em;
-	border-left-style: solid
-	}
-
-#postpreview .postright {
-	border-left: 0
-	}
-
-.pun .postright {
-	padding: 0 6px;
-	}
-
-.pun .postfootright, .pun .multidelete {
-	text-align: right
-	}
-
-.pun .postmsg {
-	width:98%;
-	overflow: hidden;
-	padding-bottom: 6px;
-	word-wrap: break-word;
-	}
-
-.pun .postfootright ul, .pun .postfootright div, .pun .postfootright p,
-.pun .postfootleft p {
-	padding: 10px 6px 5px 6px;
-	}
-
-.pun .postfootright li {
-	display: inline;
-	}
-
-.pun .postfootright li:before {
-	content: " | ";
-	}
-
-.pun .postfootright li:first-child:before {
-	content: "";
-	}
-
-.pun .postfootright a:link, .pun .postfootright a:visited {
-	text-decoration: none
-	}
-
-.pun .postfootright a:hover, .pun .postfootright a:active {
-	text-decoration: underline
-	}
-
-.pun .codebox {
-	border-style: solid;
-	border-width: 1px;
-	margin: 0.75em 1em;
-	padding: 0;
-	}
-
-.pun .quotebox {
-	border-style: solid;
-	border-width: 1px;
-	margin: 0.75em 1em;
-	padding: 0 0.75em;
-	}
-
-.pun .quotebox cite {
-	display: block;
-	padding: 0.75em 0 0 0;
-	}
-
-.pun .quotebox blockquote {
-	width: 100%;
-	overflow: hidden
-	}
-
-.pun .codebox pre {
-	overflow: auto;
-	width: 100%;
-	overflow-y:hidden
-	}
-
-* html .pun .codebox pre {
-	padding-bottom: 10px;
-	}
-
-*+html .pun .codebox pre {
-	padding-bottom: 10px
-	}
-
-.pun .codebox pre code {
-	display: block;
-	padding: 0.75em;
-	}
-
-.pun .codebox pre.vscroll {
-	height: 32em;
-	overflow: auto;
-	overflow-y: auto
-	}
-
-.pun .postmsg img {
-	vertical-align: bottom;
-	}
-
-.pun .postsignature hr {
-	margin-left: 0px;
-	width: 200px;
-	text-align: left;
-	height: 1px;
-	border:none
-	}
-
-.pun .postmsg .postimg img {
-	max-width: 98%;
-	vertical-align: middle;
-	margin: 7px 0.5em 7px 0;
-	}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-style: solid;
-	border-width: 2px;
-	}
-
-.pun .blockpost label {
-	padding: 3px 6px;
-	border-style: solid;
-	border-width: 1px;
-	vertical-align: middle;
-	display: inline-block;
-	}
-
-.pun .blockpost label * {
-	vertical-align: middle;
-	margin: 0;
-	padding: 0;
-	}
-
-/****************************************************************/
-/* 9. HELP FILES AND MISC. */
-/****************************************************************/
-
-#punhelp h2 {
-	margin-top: 12px
-	}
-
-#punhelp div.box {
-	padding: 10px
-	}
-
-#debugtime {
-	margin-top: -12px;
-	text-align: center;
-	}
-
-#brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
-	line-height: 1.4em
-	}
-
-#announce div.inbox div {
-	padding: 3px 0
-	}
-
-/*****************************************************************
-COLOUR SCHEME
-*****************************************************************/
-
-/* Background / Text
-----------------------------------------------------------------*/
-
-body {
-	background: #2a2a2a;
-	color: #d4d4d4
-	}
-
-.pun {
-	color: #d4d4d4
-	}
-
-.pun .box, #adminconsole fieldset th {
-	background-color: #383838
-	}
-
-.pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
-#brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
-	background-color: #424242
-	}
-
-.pun h2, #brdmenu {
-	background-color: #565656;
-	color: #d4d4d4
-	}
-
-.pun th {
-	background-color: #484848
-	}
-
-.pun legend {
-	color: #f6b620
-	}
-
-.pun .blockmenu li.isactive a, #posterror li strong {
-	color: #d4d4d4
-	}
-
-.pun .usercontent * {
-	background: transparent;
-	color: #d4d4d4
-	}
-
-.pun textarea, .pun input, .pun select {
-	background-color: #2a2a2a;
-	color: #d4d4d4
-	}
-
-.pun .multiselect, .pun .checklist {
-	color: #D4D4D4;
-	}
-
-.pun .checklist {
-	border-color: #666;
-	}
-
-/* Posts
-----------------------------------------------------------------*/
-
-.pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
-	background-color: #383838
-	}
-
-.pun .postright, .pun .postfootright {
-	border-left-color: #424242
-	}
-
-.pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
-	background-color: #424242
-	}
-
-.pun .blockpost h2 {
-	background-color: #565656
-	}
-
-.pun .blockpost h2 span.conr {
-	color: #a19e96
-	}
-
-.pun .postmsg ins, #punhelp samp ins {
-	background-color: #ff0;
-	}
-
-.pun hr {
-	background-color: #606060;
-	color: #606060
-	}
-
-/* Borders
-----------------------------------------------------------------*/
-
-.pun .box {
-	border-color:#565656
-	}
-
-.pun td, #brdfooter #modcontrols {
-	border-color: #565656
-	}
-
-.pun th {
-	border-color: #484848
-	}
-
-.pun fieldset {
-	border-color: #565656
-	}
-
-#adminconsole td, #adminconsole th {
-	border-color: #383838
-	}
-
-.pun .quotebox, .pun .codebox, .pun .forminfo,
-.pun .blockpost label, .pun .deletemsg {
-	border-color: #565656
-	}
-
-/* Links
-----------------------------------------------------------------*/
-
-.pun a:link, .pun a:visited {
-	color: #f6b620
-	}
-
-.pun a:hover, .pun a:active, .pun a:focus {
-	color: #ffee40
-	}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-color: #f6b620;
-	}
-
-.pun .postmsg .postimg a:hover img, .pun .postmsg .postimg a:active img, .pun .postmsg .postimg a:focus img {
-	border-color: #ffee40;
-	}
-
-.pun h2 a:link, .pun h2 a:visited,
-#brdmenu a:link, #brdmenu a:visited {
-	color: #d4d4d4
-	}
-
-.pun h2 a:hover, .pun h2 a:active,
-#brdmenu a:hover, #brdmenu a:active {
-	color: #d4d4d4
-	}
-
-.pun .postreport a:link, .pun .postreport a:visited,
-.pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
-	color: #888
-	}
-
-.pun .postreport a:hover, .pun .postreport a:active,
-.pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
-	color: #aaa
-	}
-
-.pun .maintenancelink a:link, .pun .maintenancelink a:visited {
-	color: #ff4000
-	}
-
-.pun .maintenancelink a:hover, .pun .maintenancelink a:active {
-	color: #ff5010
-	}
-
-/* Status Indicators
-----------------------------------------------------------------*/
-
-.pun .icon {
-	border-color: #484848 #404040 #3c3c3c #444444
-	}
-
-.pun .iredirect .icon {
-	border-color: #383838 #383838 #383838 #383838
-	}
-
-.pun .inew .icon {
-	border-color: #f6b620 #ecae1f #d09a1b #e1a61d
-	}
-
-/* Alert boxes
-----------------------------------------------------------------*/
-
-#msgflash {
-    opacity: 0;
-    position: fixed;
-    top: 40px;
-    right: 40px;
-    min-width: 240px;
-    max-width: 410px;
-	padding: 5px;
-	z-index: 1000;
-}
-#msgflash h2 {
-	color: #f6b620;
-	font-weight: bold;
-}
diff --git a/style/Oxygen.css b/style/Oxygen.css
deleted file mode 100644
index 34173131..00000000
--- a/style/Oxygen.css
+++ /dev/null
@@ -1,1168 +0,0 @@
-/*****************************************************************
-1. INITIAL SETTINGS
-*****************************************************************/
-
-/* Limited Reset
-----------------------------------------------------------------*/
-
-.pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
-.pun h4, .pun h5, .pun pre, .pun blockquote, .pun ul, .pun ol, .pun li, .pun dl,
-.pun dt, .pun dd, .pun th, .pun td, .pun fieldset, .pun img, .pun abbr, .pun cite {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	}
-
-.pun ul, .pun ol {
-	list-style: none
-	}
-
-
-/* Structural Settings
-----------------------------------------------------------------*/
-
-.pun .clearer, .pun .nosize {
-	height: 0;
-	width: 0;
-	line-height: 0;
-	font-size: 0;
-	overflow: hidden
-	}
-
-.pun .clearer, .pun .clearb {
-	clear: both
-	}
-
-.pun .nosize {
-	position: absolute;
-	left: -9999em;
-	text-indent: -9999em;
-	width: 0;
-	}
-
-* html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
-	height: 1px
-	}
-
-.pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
-	min-height: 1px
-	}
-
-.clearl {
-	clear: left;
-	}
-
-/* Hidden Elements
-----------------------------------------------------------------*/
-
-#brdfooter h2, #brdstats h2, #brdstats .conl dt, #brdstats .conr dt,
-#modcontrols dt, #searchlinks dt, div.postright h3, span.closedtext,
-.pun .required strong span {
-	position: absolute;
-	display: block;
-	overflow: hidden;
-	width: 0;
-	left: -9999em;
-	text-indent: -9999em;
-	}
-
-/*****************************************************************
-2. TEXT & CONTENT
-*****************************************************************/
-
-/* Text Defaults
-----------------------------------------------------------------*/
-
-.pun {
-	font: 68.75%/1.4545em Verdana, Helvetica, Arial, sans-serif;
-	line-height: normal;
-	}
-
-.pun table, .pun td, .pun th, .pun input, .pun select, .pun optgroup, .pun textarea, .pun small, .pun samp, .pun legend {
-	font-size: 1em;
-	font-family: verdana, helvetica, arial, sans-serif;
-	}
-
-.pun pre, .pun code {
-	font-size: 1.182em;
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace
-	}
-
-.pun pre code {
-	font-size: 1em;
-	}
-
-.pun strong {
-	font-weight: bold;
-	}
-
-.pun em {
-	font-style: italic;
-	}
-
-
-/* Content Defaults
-----------------------------------------------------------------*/
-
-.pun p, .pun ul, .pun ol, .pun dl {
-	font-size: 1em;
-	padding: 3px 0;
-	}
-
-.pun h2 {
-	font-size: 1em;
-	font-weight: normal;
-	padding: 4px 6px;
-	}
-
-.pun h3 {
-	font-size: 1.091em;
-	padding: 3px 0;
-	}
-
-.pun table p, .pun table h3 {
-	padding: 0;
-	}
-
-.pun span.warntext, .pun p.warntext {
-	font-weight: bold
-	}
-
-
-/* User Content (Announcements, Rules, Posts)
-----------------------------------------------------------------*/
-
-.pun .usercontent p, .pun .postmsg p {
-	padding: 0.75em 0
-	}
-
-.pun .usercontent ul, .pun .postmsg ul {
-	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: disc
-	}
-
-.pun .usercontent ol, .pun .postmsg ol {
-	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: decimal
-	}
-
-.pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha
-	}
-
-.pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
-	padding: 0.25em 1em 0.75em 2.5em
-	}
-
-.pun .usercontent li p, .pun .postmsg li p {
-	padding: 0
-	}
-
-.pun .usercontent h1 {
-	font-size: 1.4em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h2 {
-	font-size: 1.2em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h3 {
-	font-size: 1.1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
-	font-size: 1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .quotebox cite {
-	font-weight: bold;
-	font-style: normal;
-	padding: 0.75em 0.75em 0 0.75em
-	}
-
-.pun span.bbu {
-	text-decoration: underline
-	}
-
-.pun span.bbs, .pun del {
-	text-decoration: line-through;
-	}
-
-.pun .postmsg ins, #punhelp samp ins {
-	text-decoration: none;
-	}
-
-.pun div.postmsg h5, #punhelp h5 {
-	font-size: 1.1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0;
-	}
-
-
-/*****************************************************************
-3. COMMON STYLES
-*****************************************************************/
-
-/* Page Layout
-----------------------------------------------------------------*/
-
-html, body {
-	margin: 0;
-	padding: 0
-	}
-
-.pun {
-	max-width: 1070px;
-	width: 95%;
-	margin: 0 auto;
-	padding: 12px 20px;
-	}
-
-#punredirect, #punmaint, #puninstall, #pundb_update {
-	margin: 50px 20% 12px 20%
-	}
-
-
-/* Vertical Element Spacing
-----------------------------------------------------------------*/
-
-#brdheader {
-	margin: 0 0 12px 0;
-	}
-
-#brdtitle p {
-	padding-top: 0px
-	}
-
-#announce, #brdstats {
-	margin: 12px 0 12px 0;
-	}
-
-.pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
-	margin-bottom: 12px
-	}
-
-#punindex .blocktable, .pun .blockpost {
-	margin-bottom: 6px
-	}
-
-#postreview .blockpost {
-	margin-bottom: -1px;
-	}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-bottom: 0px
-	}
-
-.pun .linkst, .pun .linksb {
-	margin-top: -12px
-	}
-
-.pun .postlinksb {
-	margin-top: -6px
-	}
-
-
-/* External Borders
-----------------------------------------------------------------*/
-
-.pun .box {
-	border-style: solid;
-	border-width: 1px;
-	}
-
-#brdheader .box {
-	border-top-width: 4px;
-	}
-
-/* Default Internal Spacing
-----------------------------------------------------------------*/
-
-.pun .block .inbox, .pun .blockmenu .inbox {
-	padding: 3px 6px
-	}
-
-/*****************************************************************
-4. COMMON BOARD ELEMENTS
-*****************************************************************/
-
-/* Board Header
-----------------------------------------------------------------*/
-
-#brdtitle h1 {
-	font-size: 1.4em;
-	font-weight: bold;
-	padding: 3px 0 0 0;
-	}
-
-#brdmenu li {
-	display: inline;
-	margin-right: 12px;
-	}
-
-#brdmenu a:link, #brdmenu a:visited {
-	text-decoration: none
-	}
-
-#brdmenu a:hover, #brdmenu a:active {
-	text-decoration: underline
-	}
-
-#brdwelcome .conl {
-	float: left;
-	}
-
-#brdwelcome .conr {
-	float: right;
-	text-align: right;
-	}
-
-/* Breadcrumbs and Post Links
-----------------------------------------------------------------*/
-
-.pun .linkst {
-	padding: 8px 6px 3px 6px
-	}
-
-.pun .linksb, .pun .postlinksb {
-	padding: 3px 6px 8px 6px
-	}
-
-.pun .crumbs {
-	clear: both;
-	width: 100%;
-	overflow: hidden;
-	}
-
-.pun .crumbs li {
-	display: inline;
-	white-space: nowrap;
-	font-weight: bold;
-	}
-
-.pun .pagelink {
-	float: left;
-	white-space: nowrap;
-	}
-
-.pun .postlink {
-	font-weight: bold;
-	white-space: nowrap;
-	}
-
-.pun .postlink, .pun .modbuttons {
-	float: right;
-	text-align: right;
-	}
-
-.pun .modbuttons {
-	padding: 1px 0;
-	white-space: nowrap;
-	}
-
-.pun .modbuttons input {
-	margin-left: 6px;
-	}
-
-.pun .postlink a:link, .pun .postlink a:visited {
-	text-decoration: none
-	}
-
-.pun .postlink a:hover, .pun .postlink a:active {
-	text-decoration: underline;
-	}
-
-#punindex .subscribelink {
-	margin-top: 6px;
-	}
-
-/* Board Footer
-----------------------------------------------------------------*/
-
-#brdfooter .conl {
-	float: left;
-	}
-
-#brdfooter .conr {
-	float: right;
-	text-align: right;
-	}
-
-#brdfooter #modcontrols {
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	text-align: center;
-	}
-
-#brdfooter #modcontrols dd {
-	display: inline;
-	margin:0 6px;
-	}
-
-
-/* Board Stats
-----------------------------------------------------------------*/
-
-#brdstats .conl {
-	float: left;
-	}
-
-#brdstats .conr {
-	float: right;
-	text-align: right;
-	}
-
-#onlinelist dd, #onlinelist dt {
-	display: inline;
-	}
-
-
-/*****************************************************************
-5. MAIN TABLES
-*****************************************************************/
-
-.pun table {
-	width: 100%;
-	border-collapse: collapse;
-	border-spacing: 0;
-	empty-cells: show;
-	}
-
-.pun .blocktable table {
-	table-layout: fixed;
-	}
-
-.pun td, .pun th {
-	padding: 4px 6px;
-	text-align: left;
-	font-weight: normal;
-	}
-
-.pun td, .pun th {
-	border-style: solid none none solid;
-	border-width: 1px;
-	}
-
-.pun .tcl {
-	border-left: 0;
-	width: auto;
-	}
-
-.pun .tc2, .pun .tc3, .pun .tcmod {
-	width: 10%;
-	text-align: center;
-	padding: 4px 0;
-	}
-
-.pun .tcr {
-	width: 30%;
-	}
-
-.pun .tcl h3 {
-	font-size: 1.091em;
-	font-weight: bold;
-	}
-
-.pun .tcl h3 span.newtext {
-	font-size: 0.917em;
-	}
-
-.pun .tcl span.newtext, .pun .tcl span.pagestext {
-	white-space: nowrap;
-	font-weight: normal;
-	}
-
-.pun td span.byuser {
-	white-space: nowrap;
-	}
-
-.pun .tcl p {
-	padding: 5px 0 0 0
-	}
-
-#punsearch #vf .tc2 {
-	width: 18%;
-	text-align: left;
-	padding: 4px 6px;
-	}
-
-#users1 .tcr {
-	width: 25%
-	}
-
-#users1 .tc2 {
-	width: 25%;
-	text-align: left;
-	padding: 4px 6px;
-	}
-
-#debug .tcl {
-	width: 10%
-	}
-
-#debug .tcr {
-	width: 90%;
-	white-space: normal
-	}
-
-#punindex .tcr .byuser {
-	display: block
-	}
-
-.pun .blocktable .tclcon {
-	padding: 0 11px 0 12px;
-	overflow: hidden;
-	min-height: 1px;
-	position: relative;
-	}
-
-.pun .blocktable .tclcon div {
-	width: 100%;
-	overflow: hidden;
-	}
-
-.pun .icon {
-	margin: 0.1em 0 0 0.2em;
-	border-width: 0.6em;
-	border-style: solid;
-	height: 0;
-	width: 0;
-	overflow: hidden;
-	float: left;
-	}
-
-.pun .icon div {
-	position: absolute;
-	left: -9999em;
-	text-indent: -9999em;
-	height: 0;
-	}
-
-.pun .iposted .ipost {
-	position: absolute;
-	left: 0;
-	font-weight: bold;
-	width: 8px;
-	padding-left: 4px;
-	text-align: center;
-	top: 0;
-	}
-
-/*****************************************************************
-6. MAIN FORMS
-*****************************************************************/
-
-.pun .blockform form, .pun .fakeform {
-	PADDING: 20px 20px 15px 20px
-	}
-
-.pun .forminfo {
-	margin-bottom: 12px;
-	padding: 9px 10px;
-	border-style: solid;
-	border-width: 1px;
-	}
-
-.pun .forminfo h3 {
-	font-weight: bold;
-	}
-
-.pun .inform {
-	padding-bottom: 12px
-	}
-
-.pun fieldset {
-	padding: 0px 12px 0px 12px;
-	border-style: solid;
-	border-width: 1px
-	}
-
-.pun legend {
-	padding: 0px 6px
-	}
-
-.pun .infldset {
-	padding: 9px 0px 12px 0
-	}
-
-.pun label {
-	display: block;
-	padding: 3px 0
-	}
-
-.pun label.conl {
-	float: left;
-	overflow: visible;
-	margin-right: 10px
-	}
-
-.pun fieldset .rbox br {
-	display: none;
-	}
-
-.pun fieldset .rbox label {
-	padding: 3px 0 3px 25px;
-	position: relative;
-	vertical-align: middle;
-	}
-
-.pun fieldset .rbox input {
-	margin: 0 9px 0 -25px;
-	padding: 0;
-	width: 16px;
-	position: relative;
-	vertical-align: middle;
-	}
-
-.pun .txtarea {
-	width: 75%
-	}
-
-.pun .txtarea textarea, .pun input.longinput {
-	width: 100%
-	}
-
-.pun .bblinks {
-	padding-bottom: 10px;
-	padding-left: 4px
-	}
-
-.pun .bblinks li {
-	display: inline;
-	padding-right: 20px
-	}
-
-.pun .blockform .buttons {
-	padding-left: 12px;
-	}
-
-.pun .blockform .buttons input {
-	margin-right: 8px;
-	}
-
-#posterror ul {
-	list-style: square;
-	padding: 3px 0 3px 24px;
-	}
-
-.pun .deletemsg {
-	border-style: solid;
-	border-width: 1px;
-	padding: 6px 15px;
-	}
-
-.pun p.actions span {
-	margin-right: 12px;
-	}
-
-.pun .multiselect {
-	float: left;
-	padding-bottom: 7px;
-	}
-
-.pun .checklist {
-	border-width: 1px;
-	border-style: solid;
-	max-height: 9em;
-	width: 20em;
-	overflow: auto;
-	padding: 0.3em 0.5em;
-	margin: 0.25em 16px 0 0.15em;
-	}
-
-.pun .checklist fieldset {
-	border: 0;
-	padding: 0;
-	}
-
-.pun .checklist legend {
-	padding: 0;
-	}
-
-.pun .checklist legend span {
-	width: auto;
-	max-width: 25em;
-	}
-
-/*****************************************************************
-7. PROFILES AND ADMIN
-*****************************************************************/
-
-.pun .block2col {
-	padding-bottom: 1px
-	}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 14em
-	}
-
-.pun .blockmenu {
-	float:left;
-	width: 13em
-	}
-
-.pun .blockmenu li {
-	padding: 3px 0;
-	font-weight: bold;
-	}
-
-.pun .blockmenu a:link, .pun .blockmenu a:visited {
-	text-decoration: none
-	}
-
-.pun .blockmenu a:hover, .pun .blockmenu a:active {
-	text-decoration: underline
-	}
-
-#viewprofile dl {
-	float: left;
-	width: 100%;
-	overflow: hidden
-	}
-
-#viewprofile dd {
-	margin-left: 14em;
-	padding: 3px;
-	}
-
-#viewprofile dt {
-	float: left;
-	width: 13em;
-	margin: 3px 0;
-	}
-
-#profileavatar img {
-	float: right;
-	margin-left: 1em
-	}
-
-#adintro ul {
-	list-style-type: disc;
-	margin-left: 8px;
-	padding-left: 16px;
-	}
-
-/*****************************************************************
-8. MAIN POSTS
-*****************************************************************/
-
-.pun .blockpost h2 a:link, .pun .blockpost h2 a:visited {
-	text-decoration: none;
-	}
-
-.pun .blockpost h2 a:hover, .pun .blockpost h2 a:active {
-	text-decoration: underline;
-	}
-
-.pun .blockpost h2 .conr {
-	float: right;
-	text-align: right;
-	}
-
-#punsearch .blockpost h2 span {
-	white-space: nowrap;
-	}
-
-.pun .blockpost .box {
-	overflow: hidden;
-	}
-
-.pun .postleft, .pun .postfootleft {
-	float:left;
-	width: 18em;
-	position: relative;
-	overflow: hidden;
-	}
-
-.pun .postleft dl {
-	padding: 6px;
-	}
-
-.pun .postleft .usercontacts, .pun .postleft .icon {
-	margin-top: 6px
-	}
-
-.pun .postleft .postavatar, .pun .postleft .usertitle {
-	margin-bottom: 6px;
-	display: block;
-	}
-
-.pun .blockpost dt {
-	font-size: 1.091em;
-	font-weight: bold;
-	}
-
-.pun .blockpost dt a:link, .pun .blockpost dt a:visited {
-	text-decoration: none;
-	}
-
-.pun .blockpost dt a:hover, .pun .blockpost dt a:active {
-	text-decoration: underline;
-	}
-
-.pun .postright, .pun .postfootright {
-	border-left-width: 18em;
-	border-left-style: solid
-	}
-
-#postpreview .postright {
-	border-left: 0
-	}
-
-.pun .postright {
-	padding: 0 6px;
-	}
-
-.pun .postfootright, .pun .multidelete {
-	text-align: right
-	}
-
-.pun .postmsg {
-	width:98%;
-	overflow: hidden;
-	padding-bottom: 6px;
-	word-wrap: break-word;
-	}
-
-.pun .postfootright ul, .pun .postfootright div, .pun .postfootright p,
-.pun .postfootleft p {
-	padding: 10px 6px 5px 6px;
-	}
-
-.pun .postfootright li {
-	display: inline;
-	}
-
-.pun .postfootright li:before {
-	content: " | ";
-	}
-
-.pun .postfootright li:first-child:before {
-	content: "";
-	}
-
-.pun .postfootright a:link, .pun .postfootright a:visited {
-	text-decoration: none
-	}
-
-.pun .postfootright a:hover, .pun .postfootright a:active {
-	text-decoration: underline
-	}
-
-.pun .codebox {
-	border-style: solid;
-	border-width: 1px;
-	margin: 0.75em 1em;
-	padding: 0;
-	}
-
-.pun .quotebox {
-	border-style: solid;
-	border-width: 1px;
-	margin: 0.75em 1em;
-	padding: 0 0.75em;
-	}
-
-.pun .quotebox cite {
-	display: block;
-	padding: 0.75em 0 0 0;
-	}
-
-.pun .quotebox blockquote {
-	width: 100%;
-	overflow: hidden
-	}
-
-.pun .codebox pre {
-	overflow: auto;
-	width: 100%;
-	overflow-y:hidden
-	}
-
-* html .pun .codebox pre {
-	padding-bottom: 10px;
-	}
-
-*+html .pun .codebox pre {
-	padding-bottom: 10px
-	}
-
-.pun .codebox pre code {
-	display: block;
-	padding: 0.75em;
-	}
-
-.pun .codebox pre.vscroll {
-	height: 32em;
-	overflow: auto;
-	overflow-y: auto
-	}
-
-.pun .postmsg img {
-	vertical-align: bottom;
-	}
-
-.pun .postsignature hr {
-	margin-left: 0px;
-	width: 200px;
-	text-align: left;
-	height: 1px;
-	border:none
-	}
-
-.pun .postmsg .postimg img {
-	max-width: 98%;
-	vertical-align: middle;
-	margin: 7px 0.5em 7px 0;
-	}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-style: solid;
-	border-width: 2px;
-	}
-
-.pun .blockpost label {
-	padding: 3px 6px;
-	border-style: solid;
-	border-width: 1px;
-	vertical-align: middle;
-	display: inline-block;
-	}
-
-.pun .blockpost label * {
-	vertical-align: middle;
-	margin: 0;
-	padding: 0;
-	}
-
-/****************************************************************/
-/* 9. HELP FILES AND MISC. */
-/****************************************************************/
-
-#punhelp h2 {
-	margin-top: 12px
-	}
-
-#punhelp div.box {
-	padding: 10px
-	}
-
-#debugtime {
-	margin-top: -12px;
-	text-align: center;
-	}
-
-#brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
-	line-height: 1.4em
-	}
-
-#announce div.inbox div {
-	padding: 3px 0
-	}
-
-/*****************************************************************
-COLOUR SCHEME
-*****************************************************************/
-
-/* Background / Text
-----------------------------------------------------------------*/
-
-body {
-	background: #fff;
-	color: #333
-	}
-
-.pun {
-	color: #333
-	}
-
-.pun .box, #adminconsole fieldset th {
-	background-color: #f1f1f1
-	}
-
-.pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
-#adminconsole fieldset td, .pun .blockmenu .box, #adstats dd, #brdfooter #modcontrols {
-	background-color: #dedfdf
-	}
-
-.pun h2, #brdmenu {
-	background-color: #0066b9;
-	color: #fff
-	}
-
-.pun th {
-	background-color: #d1d1d1
-	}
-
-.pun legend {
-	color: #005cb1
-	}
-
-.pun .blockmenu li.isactive a, #posterror li strong {
-	color: #333
-	}
-
-.pun .usercontent * {
-	background: transparent;
-	color: #333
-	}
-
-.pun .multiselect, .pun .checklist {
-	color: #333;
-	}
-
-.pun .checklist {
-	border-color: #ACA899;
-	}
-
-/* Posts
-----------------------------------------------------------------*/
-
-.pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
-	background-color: #dedfdf
-	}
-
-.pun .postright, .pun .postfootright {
-	border-left-color: #f1f1f1
-	}
-
-.pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
-	background-color: #f1f1f1
-	}
-
-#punhelp .codebox, #punhelp .quotebox {
-	background-color: #f9f9f9;
-	}
-
-.pun .blockpost h2 {
-	background-color: #006fc9
-	}
-
-.pun .blockpost h2 span.conr {
-	color: #aabdcd
-	}
-
-.pun .postmsg ins, #punhelp samp ins {
-	background-color: #ff0;
-	}
-
-.pun hr {
-	background-color: #333;
-	color: #333
-	}
-
-/* Borders
-----------------------------------------------------------------*/
-
-.pun .box {
-	border-color: #0066b9
-	}
-
-.pun td, #brdfooter #modcontrols {
-	border-color: #bbcede
-	}
-
-.pun th {
-	border-color: #d1d1d1
-	}
-
-.pun fieldset {
-	border-color: #aca899
-	}
-
-#adminconsole td, #adminconsole th {
-	border-color: #f1f1f1
-	}
-
-.pun .quotebox, .pun .codebox, .pun .forminfo,
-.pun .blockpost label, .pun .deletemsg {
-	border-color: #aca899 #fff #fff #aca899
-	}
-
-/* Links
-----------------------------------------------------------------*/
-
-.pun a:link, .pun a:visited {
-	color: #005cb1
-	}
-
-.pun a:hover, .pun a:active, .pun a:focus {
-	color: #b42000
-	}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-color: #005cb1;
-	}
-
-.pun .postmsg .postimg a:hover img, .pun .postmsg .postimg a:active img, .pun .postmsg .postimg a:focus img {
-	border-color: #b42000;
-	}
-
-.pun h2 a:link, .pun h2 a:visited,
-#brdmenu a:link, #brdmenu a:visited {
-	color: #fff
-	}
-
-.pun h2 a:hover, .pun h2 a:active,
-#brdmenu a:hover, #brdmenu a:active {
-	color: #fff
-	}
-
-.pun .postreport a:link, .pun .postreport a:visited,
-.pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
-	color: #888
-	}
-
-.pun .postreport a:hover, .pun .postreport a:active,
-.pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
-	color: #aaa
-	}
-
-.pun .maintenancelink a:link, .pun .maintenancelink a:visited {
-	color: #b42000
-	}
-
-.pun .maintenancelink a:hover, .pun .maintenancelink a:active {
-	color: #b42000
-	}
-
-/* Status Indicators
-----------------------------------------------------------------*/
-
-.pun .icon {
-	border-color: #e6e6e6 #dedede #dadada #e2e2e2
-	}
-
-.pun .iredirect .icon {
-	border-color: #f1f1f1 #f1f1f1 #f1f1f1 #f1f1f1
-	}
-
-.pun .inew .icon {
-	border-color: #0080d7 #0065c0 #0058b3 #0072ca
-	}
-
-/* Alert boxes
-----------------------------------------------------------------*/
-
-#msgflash {
-    opacity: 0;
-    position: fixed;
-    top: 40px;
-    right: 40px;
-    min-width: 240px;
-    max-width: 410px;
-	padding: 5px;
-	z-index: 1000;
-}
-#msgflash h2 {
-	color: #fff;
-	font-weight: bold;
-}
diff --git a/style/Radium.css b/style/Radium.css
deleted file mode 100644
index c56c0735..00000000
--- a/style/Radium.css
+++ /dev/null
@@ -1,1168 +0,0 @@
-/*****************************************************************
-1. INITIAL SETTINGS
-*****************************************************************/
-
-/* Limited Reset
-----------------------------------------------------------------*/
-
-.pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
-.pun h4, .pun h5, .pun pre, .pun blockquote, .pun ul, .pun ol, .pun li, .pun dl,
-.pun dt, .pun dd, .pun th, .pun td, .pun fieldset, .pun img, .pun abbr, .pun cite {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	}
-
-.pun ul, .pun ol {
-	list-style: none
-	}
-
-
-/* Structural Settings
-----------------------------------------------------------------*/
-
-.pun .clearer, .pun .nosize {
-	height: 0;
-	width: 0;
-	line-height: 0;
-	font-size: 0;
-	overflow: hidden
-	}
-
-.pun .clearer, .pun .clearb {
-	clear: both
-	}
-
-.pun .nosize {
-	position: absolute;
-	left: -9999em;
-	text-indent: -9999em;
-	width: 0;
-	}
-
-* html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
-	height: 1px
-	}
-
-.pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
-	min-height: 1px
-	}
-
-.clearl {
-	clear: left;
-	}
-
-/* Hidden Elements
-----------------------------------------------------------------*/
-
-#brdfooter h2, #brdstats h2, #brdstats .conl dt, #brdstats .conr dt,
-#modcontrols dt, #searchlinks dt, div.postright h3, span.closedtext,
-.pun .required strong span {
-	position: absolute;
-	display: block;
-	overflow: hidden;
-	width: 0;
-	left: -9999em;
-	text-indent: -9999em;
-	}
-
-/*****************************************************************
-2. TEXT & CONTENT
-*****************************************************************/
-
-/* Text Defaults
-----------------------------------------------------------------*/
-
-.pun {
-	font: 68.75%/1.4545em Verdana, Helvetica, Arial, sans-serif;
-	line-height: normal;
-	}
-
-.pun table, .pun td, .pun th, .pun input, .pun select, .pun optgroup, .pun textarea, .pun samp, .pun legend {
-	font-size: 1em;
-	font-family: verdana, helvetica, arial, sans-serif;
-	}
-
-.pun pre, .pun code {
-	font-size: 1.182em;
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace
-	}
-
-.pun pre code {
-	font-size: 1em;
-	}
-
-.pun strong {
-	font-weight: bold;
-	}
-
-.pun em {
-	font-style: italic;
-	}
-
-
-/* Content Defaults
-----------------------------------------------------------------*/
-
-.pun p, .pun ul, .pun ol, .pun dl {
-	font-size: 1em;
-	padding: 3px 0;
-	}
-
-.pun h2 {
-	font-size: 1em;
-	font-weight: normal;
-	padding: 4px 6px;
-	}
-
-.pun h3 {
-	font-size: 1.091em;
-	padding: 3px 0;
-	}
-
-.pun table p, .pun table h3 {
-	padding: 0;
-	}
-
-.pun span.warntext, .pun p.warntext {
-	font-weight: bold
-	}
-
-/* User Content (Announcements, Rules, Posts)
-----------------------------------------------------------------*/
-
-.pun .usercontent p, .pun .postmsg p {
-	padding: 0.75em 0
-	}
-
-.pun .usercontent ul, .pun .postmsg ul {
-	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: disc
-	}
-
-.pun .usercontent ol, .pun .postmsg ol {
-	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: decimal
-	}
-
-.pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha
-	}
-
-.pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
-	padding: 0.25em 1em 0.75em 2.5em
-	}
-
-.pun .usercontent li p, .pun .postmsg li p {
-	padding: 0
-	}
-
-.pun .usercontent h1 {
-	font-size: 1.4em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h2 {
-	font-size: 1.2em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h3 {
-	font-size: 1.1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
-	font-size: 1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .quotebox cite {
-	font-weight: bold;
-	font-style: normal;
-	padding: 0.75em 0.75em 0 0.75em
-	}
-
-.pun span.bbu {
-	text-decoration: underline
-	}
-
-.pun span.bbs, .pun del {
-	text-decoration: line-through;
-	}
-
-.pun .postmsg ins, #punhelp samp ins {
-	text-decoration: none;
-	}
-
-.pun div.postmsg h5, #punhelp h5 {
-	font-size: 1.1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0;
-	}
-
-
-/*****************************************************************
-3. COMMON STYLES
-*****************************************************************/
-
-/* Page Layout
-----------------------------------------------------------------*/
-
-html, body {
-	margin: 0;
-	padding: 0
-	}
-
-.pun {
-	max-width: 1070px;
-	width: 95%;
-	margin: 0 auto;
-	padding: 12px 20px;
-	}
-
-#punredirect, #punmaint, #puninstall, #pundb_update {
-	margin: 50px 20% 12px 20%
-	}
-
-
-/* Vertical Element Spacing
-----------------------------------------------------------------*/
-
-#brdheader {
-	margin: 0 0 12px 0;
-	}
-
-#brdtitle p {
-	padding-top: 0px
-	}
-
-#announce, #brdstats {
-	margin: 12px 0 12px 0;
-	}
-
-.pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
-	margin-bottom: 12px
-	}
-
-#punindex .blocktable, .pun .blockpost {
-	margin-bottom: 6px
-	}
-
-#postreview .blockpost {
-	margin-bottom: -1px;
-	}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-bottom: 0px
-	}
-
-.pun .linkst, .pun .linksb {
-	margin-top: -12px
-	}
-
-.pun .postlinksb {
-	margin-top: -6px
-	}
-
-
-/* External Borders
-----------------------------------------------------------------*/
-
-.pun .box {
-	border-style: solid;
-	border-width: 1px;
-	}
-
-#brdheader .box {
-	border-top-width: 4px;
-	}
-
-/* Default Internal Spacing
-----------------------------------------------------------------*/
-
-.pun .block .inbox, .pun .blockmenu .inbox {
-	padding: 3px 6px
-	}
-
-/*****************************************************************
-4. COMMON BOARD ELEMENTS
-*****************************************************************/
-
-/* Board Header
-----------------------------------------------------------------*/
-
-#brdtitle h1 {
-	font-size: 1.4em;
-	font-weight: bold;
-	padding: 3px 0 0 0;
-	}
-
-#brdmenu li {
-	display: inline;
-	margin-right: 12px;
-	}
-
-#brdmenu a:link, #brdmenu a:visited {
-	text-decoration: none
-	}
-
-#brdmenu a:hover, #brdmenu a:active {
-	text-decoration: underline
-	}
-
-#brdwelcome .conl {
-	float: left;
-	}
-
-#brdwelcome .conr {
-	float: right;
-	text-align: right;
-	}
-
-/* Breadcrumbs and Post Links
-----------------------------------------------------------------*/
-
-.pun .linkst {
-	padding: 8px 6px 3px 6px
-	}
-
-.pun .linksb, .pun .postlinksb {
-	padding: 3px 6px 8px 6px
-	}
-
-.pun .crumbs {
-	clear: both;
-	width: 100%;
-	overflow: hidden;
-	}
-
-.pun .crumbs li {
-	display: inline;
-	white-space: nowrap;
-	font-weight: bold;
-	}
-
-.pun .pagelink {
-	float: left;
-	white-space: nowrap;
-	}
-
-.pun .postlink {
-	font-weight: bold;
-	white-space: nowrap;
-	}
-
-.pun .postlink, .pun .modbuttons {
-	float: right;
-	text-align: right;
-	}
-
-.pun .modbuttons {
-	padding: 1px 0;
-	white-space: nowrap;
-	}
-
-.pun .modbuttons input {
-	margin-left: 6px;
-	}
-
-.pun .postlink a:link, .pun .postlink a:visited {
-	text-decoration: none
-	}
-
-.pun .postlink a:hover, .pun .postlink a:active {
-	text-decoration: underline;
-	}
-
-#punindex .subscribelink {
-	margin-top: 6px;
-	}
-
-/* Board Footer
-----------------------------------------------------------------*/
-
-#brdfooter .conl {
-	float: left;
-	}
-
-#brdfooter .conr {
-	float: right;
-	text-align: right;
-	}
-
-#brdfooter #modcontrols {
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	text-align: center;
-	}
-
-#brdfooter #modcontrols dd {
-	display: inline;
-	margin:0 6px;
-	}
-
-
-/* Board Stats
-----------------------------------------------------------------*/
-
-#brdstats .conl {
-	float: left;
-	}
-
-#brdstats .conr {
-	float: right;
-	text-align: right;
-	}
-
-#onlinelist dd, #onlinelist dt {
-	display: inline;
-	}
-
-
-/*****************************************************************
-5. MAIN TABLES
-*****************************************************************/
-
-.pun table {
-	width: 100%;
-	border-collapse: collapse;
-	border-spacing: 0;
-	empty-cells: show;
-	}
-
-.pun .blocktable table {
-	table-layout: fixed;
-	}
-
-.pun td, .pun th {
-	padding: 4px 6px;
-	text-align: left;
-	font-weight: normal;
-	}
-
-.pun td, .pun th {
-	border-style: solid none none solid;
-	border-width: 1px;
-	}
-
-.pun .tcl {
-	border-left: 0;
-	width: auto;
-	}
-
-.pun .tc2, .pun .tc3, .pun .tcmod {
-	width: 10%;
-	text-align: center;
-	padding: 4px 0;
-	}
-
-.pun .tcr {
-	width: 30%;
-	}
-
-.pun .tcl h3 {
-	font-size: 1.091em;
-	font-weight: bold;
-	}
-
-.pun .tcl h3 span.newtext {
-	font-size: 0.917em;
-	}
-
-.pun .tcl span.newtext, .pun .tcl span.pagestext {
-	white-space: nowrap;
-	font-weight: normal;
-	}
-
-.pun td span.byuser {
-	white-space: nowrap;
-	}
-
-.pun .tcl p {
-	padding: 5px 0 0 0
-	}
-
-#punsearch #vf .tc2 {
-	width: 18%;
-	text-align: left;
-	padding: 4px 6px;
-	}
-
-#users1 .tcr {
-	width: 25%
-	}
-
-#users1 .tc2 {
-	width: 25%;
-	text-align: left;
-	padding: 4px 6px;
-	}
-
-#debug .tcl {
-	width: 10%
-	}
-
-#debug .tcr {
-	width: 90%;
-	white-space: normal
-	}
-
-#punindex .tcr .byuser {
-	display: block
-	}
-
-.pun .blocktable .tclcon {
-	padding: 0 11px 0 12px;
-	overflow: hidden;
-	min-height: 1px;
-	position: relative;
-	}
-
-.pun .blocktable .tclcon div {
-	width: 100%;
-	overflow: hidden;
-	}
-
-.pun .icon {
-	margin: 0.1em 0 0 0.2em;
-	border-width: 0.6em;
-	border-style: solid;
-	height: 0;
-	width: 0;
-	overflow: hidden;
-	float: left;
-	}
-
-.pun .icon div {
-	position: absolute;
-	left: -9999em;
-	text-indent: -9999em;
-	height: 0;
-	}
-
-.pun .iposted .ipost {
-	position: absolute;
-	left: 0;
-	font-weight: bold;
-	width: 8px;
-	padding-left: 4px;
-	text-align: center;
-	top: 0;
-	}
-
-/*****************************************************************
-6. MAIN FORMS
-*****************************************************************/
-
-.pun .blockform form, .pun .fakeform {
-	PADDING: 20px 20px 15px 20px
-	}
-
-.pun .forminfo {
-	margin-bottom: 12px;
-	padding: 9px 10px;
-	border-style: solid;
-	border-width: 1px;
-	}
-
-.pun .forminfo h3 {
-	font-weight: bold;
-	}
-
-.pun .inform {
-	padding-bottom: 12px
-	}
-
-.pun fieldset {
-	padding: 0px 12px 0px 12px;
-	border-style: solid;
-	border-width: 1px
-	}
-
-.pun legend {
-	padding: 0px 6px
-	}
-
-.pun .infldset {
-	padding: 9px 0px 12px 0
-	}
-
-.pun label {
-	display: block;
-	padding: 3px 0
-	}
-
-.pun label.conl {
-	float: left;
-	overflow: visible;
-	margin-right: 10px
-	}
-
-.pun fieldset .rbox br {
-	display: none;
-	}
-
-.pun fieldset .rbox label {
-	padding: 3px 0 3px 25px;
-	position: relative;
-	vertical-align: middle;
-	}
-
-.pun fieldset .rbox input {
-	margin: 0 9px 0 -25px;
-	padding: 0;
-	width: 16px;
-	position: relative;
-	vertical-align: middle;
-	}
-
-.pun .txtarea {
-	width: 75%
-	}
-
-.pun .txtarea textarea, .pun input.longinput {
-	width: 100%
-	}
-
-.pun .bblinks {
-	padding-bottom: 10px;
-	padding-left: 4px
-	}
-
-.pun .bblinks li {
-	display: inline;
-	padding-right: 20px
-	}
-
-.pun .blockform .buttons {
-	padding-left: 12px;
-	}
-
-.pun .blockform .buttons input {
-	margin-right: 8px;
-	}
-
-#posterror ul {
-	list-style: square;
-	padding: 3px 0 3px 24px;
-	}
-
-.pun .deletemsg {
-	border-style: solid;
-	border-width: 1px;
-	padding: 6px 15px;
-	}
-
-.pun p.actions span {
-	margin-right: 12px;
-	}
-
-.pun .multiselect {
-	float: left;
-	padding-bottom: 7px;
-	}
-
-.pun .checklist {
-	border-width: 1px;
-	border-style: solid;
-	max-height: 9em;
-	width: 20em;
-	overflow: auto;
-	padding: 0.3em 0.5em;
-	margin: 0.25em 16px 0 0.15em;
-	}
-
-.pun .checklist fieldset {
-	border: 0;
-	padding: 0;
-	}
-
-.pun .checklist legend {
-	padding: 0;
-	}
-
-.pun .checklist legend span {
-	width: auto;
-	max-width: 25em;
-	}
-
-/*****************************************************************
-7. PROFILES AND ADMIN
-*****************************************************************/
-
-.pun .block2col {
-	padding-bottom: 1px
-	}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 14em
-	}
-
-.pun .blockmenu {
-	float:left;
-	width: 13em
-	}
-
-.pun .blockmenu li {
-	padding: 3px 0;
-	font-weight: bold;
-	}
-
-.pun .blockmenu a:link, .pun .blockmenu a:visited {
-	text-decoration: none
-	}
-
-.pun .blockmenu a:hover, .pun .blockmenu a:active {
-	text-decoration: underline
-	}
-
-#viewprofile dl {
-	float: left;
-	width: 100%;
-	overflow: hidden
-	}
-
-#viewprofile dd {
-	margin-left: 14em;
-	padding: 3px;
-	}
-
-#viewprofile dt {
-	float: left;
-	width: 13em;
-	margin: 3px 0;
-	}
-
-#profileavatar img {
-	float: right;
-	margin-left: 1em
-	}
-
-#adintro ul {
-	list-style-type: disc;
-	margin-left: 8px;
-	padding-left: 16px;
-	}
-
-/*****************************************************************
-8. MAIN POSTS
-*****************************************************************/
-
-.pun .blockpost h2 a:link, .pun .blockpost h2 a:visited {
-	text-decoration: none;
-	}
-
-.pun .blockpost h2 a:hover, .pun .blockpost h2 a:active {
-	text-decoration: underline;
-	}
-
-.pun .blockpost h2 .conr {
-	float: right;
-	text-align: right;
-	}
-
-#punsearch .blockpost h2 span {
-	white-space: nowrap;
-	}
-
-.pun .blockpost .box {
-	overflow: hidden;
-	}
-
-.pun .postleft, .pun .postfootleft {
-	float:left;
-	width: 18em;
-	position: relative;
-	overflow: hidden;
-	}
-
-.pun .postleft dl {
-	padding: 6px;
-	}
-
-.pun .postleft .usercontacts, .pun .postleft .icon {
-	margin-top: 6px
-	}
-
-.pun .postleft .postavatar, .pun .postleft .usertitle {
-	margin-bottom: 6px;
-	display: block;
-	}
-
-.pun .blockpost dt {
-	font-size: 1.091em;
-	font-weight: bold;
-	}
-
-.pun .blockpost dt a:link, .pun .blockpost dt a:visited {
-	text-decoration: none;
-	}
-
-.pun .blockpost dt a:hover, .pun .blockpost dt a:active {
-	text-decoration: underline;
-	}
-
-.pun .postright, .pun .postfootright {
-	border-left-width: 18em;
-	border-left-style: solid
-	}
-
-#postpreview .postright {
-	border-left: 0
-	}
-
-.pun .postright {
-	padding: 0 6px;
-	}
-
-.pun .postfootright, .pun .multidelete {
-	text-align: right
-	}
-
-.pun .postmsg {
-	width:98%;
-	overflow: hidden;
-	padding-bottom: 6px;
-	word-wrap: break-word;
-	}
-
-.pun .postfootright ul, .pun .postfootright div, .pun .postfootright p,
-.pun .postfootleft p {
-	padding: 10px 6px 5px 6px;
-	}
-
-.pun .postfootright li {
-	display: inline;
-	}
-
-.pun .postfootright li:before {
-	content: " | ";
-	}
-
-.pun .postfootright li:first-child:before {
-	content: "";
-	}
-
-.pun .postfootright a:link, .pun .postfootright a:visited {
-	text-decoration: none
-	}
-
-.pun .postfootright a:hover, .pun .postfootright a:active {
-	text-decoration: underline
-	}
-
-.pun .codebox {
-	border-style: solid;
-	border-width: 1px;
-	margin: 0.75em 1em;
-	padding: 0;
-	}
-
-.pun .quotebox {
-	border-style: solid;
-	border-width: 1px;
-	margin: 0.75em 1em;
-	padding: 0 0.75em;
-	}
-
-.pun .quotebox cite {
-	display: block;
-	padding: 0.75em 0 0 0;
-	}
-
-.pun .quotebox blockquote {
-	width: 100%;
-	overflow: hidden
-	}
-
-.pun .codebox pre {
-	overflow: auto;
-	width: 100%;
-	overflow-y:hidden
-	}
-
-* html .pun .codebox pre {
-	padding-bottom: 10px;
-	}
-
-*+html .pun .codebox pre {
-	padding-bottom: 10px
-	}
-
-.pun .codebox pre code {
-	display: block;
-	padding: 0.75em;
-	}
-
-.pun .codebox pre.vscroll {
-	height: 32em;
-	overflow: auto;
-	overflow-y: auto
-	}
-
-.pun .postmsg img {
-	vertical-align: bottom;
-	}
-
-.pun .postsignature hr {
-	margin-left: 0px;
-	width: 200px;
-	text-align: left;
-	height: 1px;
-	border:none
-	}
-
-.pun .postmsg .postimg img {
-	max-width: 98%;
-	vertical-align: middle;
-	margin: 7px 0.5em 7px 0;
-	}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-style: solid;
-	border-width: 2px;
-	}
-
-.pun .blockpost label {
-	padding: 3px 6px;
-	border-style: solid;
-	border-width: 1px;
-	vertical-align: middle;
-	display: inline-block;
-	}
-
-.pun .blockpost label * {
-	vertical-align: middle;
-	margin: 0;
-	padding: 0;
-	}
-
-/****************************************************************/
-/* 9. HELP FILES AND MISC. */
-/****************************************************************/
-
-#punhelp h2 {
-	margin-top: 12px
-	}
-
-#punhelp div.box {
-	padding: 10px
-	}
-
-#debugtime {
-	margin-top: -12px;
-	text-align: center;
-	}
-
-#brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
-	line-height: 1.4em
-	}
-
-#announce div.inbox div {
-	padding: 3px 0
-	}
-
-/*****************************************************************
-COLOUR SCHEME
-*****************************************************************/
-
-/* Background / Text
-----------------------------------------------------------------*/
-
-body {
-	background: #2a2a2a;
-	color: #d4d4d4
-	}
-
-.pun {
-	color: #d4d4d4
-	}
-
-.pun .box, #adminconsole fieldset th {
-	background-color: #383838
-	}
-
-.pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
-#brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
-	background-color: #424242
-	}
-
-.pun h2, #brdmenu {
-	background-color: #565656;
-	color: #d4d4d4
-	}
-
-.pun th {
-	background-color: #484848
-	}
-
-.pun legend {
-	color: #60c860
-	}
-
-.pun .blockmenu li.isactive a, #posterror li strong {
-	color: #d4d4d4
-	}
-
-.pun .usercontent * {
-	background: transparent;
-	color: #d4d4d4
-	}
-
-.pun textarea, .pun input, .pun select {
-	background-color: #2a2a2a;
-	color: #d4d4d4
-	}
-
-.pun .multiselect, .pun .checklist {
-	color: #D4D4D4;
-	}
-
-.pun .checklist {
-	border-color: #666;
-	}
-
-/* Posts
-----------------------------------------------------------------*/
-
-.pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
-	background-color: #383838
-	}
-
-.pun .postright, .pun .postfootright {
-	border-left-color: #424242
-	}
-
-.pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
-	background-color: #424242
-	}
-
-.pun .blockpost h2 {
-	background-color: #565656
-	}
-
-.pun .blockpost h2 span.conr {
-	color: #a19e96
-	}
-
-.pun .postmsg ins, #punhelp samp ins {
-	background-color: #ff0;
-	}
-
-.pun hr {
-	background-color: #606060;
-	color: #606060
-	}
-
-/* Borders
-----------------------------------------------------------------*/
-
-.pun .box {
-	border-color:#565656
-	}
-
-.pun td, #brdfooter #modcontrols {
-	border-color: #565656
-	}
-
-.pun th {
-	border-color: #484848
-	}
-
-.pun fieldset {
-	border-color: #606060
-	}
-
-#adminconsole td, #adminconsole th {
-	border-color: #383838
-	}
-
-.pun .quotebox, .pun .codebox, .pun .forminfo,
-.pun .blockpost label, .pun .deletemsg {
-	border-color: #606060
-	}
-
-/* Links
-----------------------------------------------------------------*/
-
-.pun a:link, .pun a:visited {
-	color: #60c860
-	}
-
-.pun a:hover, .pun a:active, .pun a:focus {
-	color: #80ee80
-	}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-color: #60c860;
-	}
-
-.pun .postmsg .postimg a:hover img, .pun .postmsg .postimg a:active img, .pun .postmsg .postimg a:focus img {
-	border-color: #80ee80;
-	}
-
-.pun h2 a:link, .pun h2 a:visited,
-#brdmenu a:link, #brdmenu a:visited {
-	color: #d4d4d4
-	}
-
-.pun h2 a:hover, .pun h2 a:active,
-#brdmenu a:hover, #brdmenu a:active {
-	color: #d4d4d4
-	}
-
-.pun .postreport a:link, .pun .postreport a:visited,
-.pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
-	color: #888
-	}
-
-.pun .postreport a:hover, .pun .postreport a:active,
-.pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
-	color: #aaa
-	}
-
-.pun .maintenancelink a:link, .pun .maintenancelink a:visited {
-	color: #ff4000
-	}
-
-.pun .maintenancelink a:hover, .pun .maintenancelink a:active {
-	color: #ff5010
-	}
-
-/* Status Indicators
-----------------------------------------------------------------*/
-
-.pun .icon {
-	border-color: #484848 #404040 #3c3c3c #444444
-	}
-
-.pun .iredirect .icon {
-	border-color: #383838 #383838 #383838 #383838
-	}
-
-.pun .inew .icon {
-	border-color: #60c860 #54af54 #499849 #59b657
-	}
-
-/* Alert boxes
-----------------------------------------------------------------*/
-
-#msgflash {
-    opacity: 0;
-    position: fixed;
-    top: 40px;
-    right: 40px;
-    min-width: 240px;
-    max-width: 410px;
-	padding: 5px;
-	z-index: 1000;
-}
-#msgflash h2 {
-	color: #60c860;
-	font-weight: bold;
-}
diff --git a/style/Sulfur.css b/style/Sulfur.css
deleted file mode 100644
index 9babc343..00000000
--- a/style/Sulfur.css
+++ /dev/null
@@ -1,1163 +0,0 @@
-/*****************************************************************
-1. INITIAL SETTINGS
-*****************************************************************/
-
-/* Limited Reset
-----------------------------------------------------------------*/
-
-.pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
-.pun h4, .pun h5, .pun pre, .pun blockquote, .pun ul, .pun ol, .pun li, .pun dl,
-.pun dt, .pun dd, .pun th, .pun td, .pun fieldset, .pun img, .pun abbr, .pun cite {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	}
-
-.pun ul, .pun ol {
-	list-style: none
-	}
-
-
-/* Structural Settings
-----------------------------------------------------------------*/
-
-.pun .clearer, .pun .nosize {
-	height: 0;
-	width: 0;
-	line-height: 0;
-	font-size: 0;
-	overflow: hidden
-	}
-
-.pun .clearer, .pun .clearb {
-	clear: both
-	}
-
-.pun .nosize {
-	position: absolute;
-	left: -9999em;
-	text-indent: -9999em;
-	width: 0;
-	}
-
-* html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
-	height: 1px
-	}
-
-.pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
-	min-height: 1px
-	}
-
-.clearl {
-	clear: left;
-	}
-
-/* Hidden Elements
-----------------------------------------------------------------*/
-
-#brdfooter h2, #brdstats h2, #brdstats .conl dt, #brdstats .conr dt,
-#modcontrols dt, #searchlinks dt, div.postright h3, span.closedtext,
-.pun .required strong span {
-	position: absolute;
-	display: block;
-	overflow: hidden;
-	width: 0;
-	left: -9999em;
-	text-indent: -9999em;
-	}
-
-/*****************************************************************
-2. TEXT & CONTENT
-*****************************************************************/
-
-/* Text Defaults
-----------------------------------------------------------------*/
-
-.pun {
-	font: 68.75%/1.4545em Verdana, Helvetica, Arial, sans-serif;
-	line-height: normal;
-	}
-
-.pun table, .pun td, .pun th, .pun input, .pun select, .pun optgroup, .pun textarea, .pun samp, .pun legend {
-	font-size: 1em;
-	font-family: verdana, helvetica, arial, sans-serif;
-	}
-
-.pun pre, .pun code {
-	font-size: 1.182em;
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace
-	}
-
-.pun pre code {
-	font-size: 1em;
-	}
-
-.pun strong {
-	font-weight: bold;
-	}
-
-.pun em {
-	font-style: italic;
-	}
-
-
-/* Content Defaults
-----------------------------------------------------------------*/
-
-.pun p, .pun ul, .pun ol, .pun dl {
-	font-size: 1em;
-	padding: 3px 0;
-	}
-
-.pun h2 {
-	font-size: 1em;
-	font-weight: normal;
-	padding: 4px 6px;
-	}
-
-.pun h3 {
-	font-size: 1.091em;
-	padding: 3px 0;
-	}
-
-.pun table p, .pun table h3 {
-	padding: 0;
-	}
-
-.pun span.warntext, .pun p.warntext {
-	font-weight: bold
-	}
-
-/* User Content (Announcements, Rules, Posts)
-----------------------------------------------------------------*/
-
-.pun .usercontent p, .pun .postmsg p {
-	padding: 0.75em 0
-	}
-
-.pun .usercontent ul, .pun .postmsg ul {
-	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: disc
-	}
-
-.pun .usercontent ol, .pun .postmsg ol {
-	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: decimal
-	}
-
-.pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha
-	}
-
-.pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
-	padding: 0.25em 1em 0.75em 2.5em
-	}
-
-.pun .usercontent li p, .pun .postmsg li p {
-	padding: 0
-	}
-
-.pun .usercontent h1 {
-	font-size: 1.4em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h2 {
-	font-size: 1.2em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h3 {
-	font-size: 1.1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
-	font-size: 1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-	}
-
-.pun .quotebox cite {
-	font-weight: bold;
-	font-style: normal;
-	padding: 0.75em 0.75em 0 0.75em
-	}
-
-.pun span.bbu {
-	text-decoration: underline
-	}
-
-.pun span.bbs, .pun del {
-	text-decoration: line-through;
-	}
-
-.pun .postmsg ins, #punhelp samp ins {
-	text-decoration: none;
-	}
-
-.pun div.postmsg h5, #punhelp h5 {
-	font-size: 1.1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0;
-	}
-
-
-/*****************************************************************
-3. COMMON STYLES
-*****************************************************************/
-
-/* Page Layout
-----------------------------------------------------------------*/
-
-html, body {
-	margin: 0;
-	padding: 0
-	}
-
-.pun {
-	max-width: 1070px;
-	width: 95%;
-	margin: 0 auto;
-	padding: 12px 20px;
-	}
-
-#punredirect, #punmaint, #puninstall, #pundb_update {
-	margin: 50px 20% 12px 20%
-	}
-
-
-/* Vertical Element Spacing
-----------------------------------------------------------------*/
-
-#brdheader {
-	margin: 0 0 12px 0;
-	}
-
-#brdtitle p {
-	padding-top: 0px
-	}
-
-#announce, #brdstats {
-	margin: 12px 0 12px 0;
-	}
-
-.pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
-	margin-bottom: 12px
-	}
-
-#punindex .blocktable, .pun .blockpost {
-	margin-bottom: 6px
-	}
-
-#postreview .blockpost {
-	margin-bottom: -1px;
-	}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-bottom: 0px
-	}
-
-.pun .linkst, .pun .linksb {
-	margin-top: -12px
-	}
-
-.pun .postlinksb {
-	margin-top: -6px
-	}
-
-
-/* External Borders
-----------------------------------------------------------------*/
-
-.pun .box {
-	border-style: solid;
-	border-width: 1px;
-	}
-
-#brdheader .box {
-	border-top-width: 4px;
-	}
-
-/* Default Internal Spacing
-----------------------------------------------------------------*/
-
-.pun .block .inbox, .pun .blockmenu .inbox {
-	padding: 3px 6px
-	}
-
-/*****************************************************************
-4. COMMON BOARD ELEMENTS
-*****************************************************************/
-
-/* Board Header
-----------------------------------------------------------------*/
-
-#brdtitle h1 {
-	font-size: 1.4em;
-	font-weight: bold;
-	padding: 3px 0 0 0;
-	}
-
-#brdmenu li {
-	display: inline;
-	margin-right: 12px;
-	}
-
-#brdmenu a:link, #brdmenu a:visited {
-	text-decoration: none
-	}
-
-#brdmenu a:hover, #brdmenu a:active {
-	text-decoration: underline
-	}
-
-#brdwelcome .conl {
-	float: left;
-	}
-
-#brdwelcome .conr {
-	float: right;
-	text-align: right;
-	}
-
-/* Breadcrumbs and Post Links
-----------------------------------------------------------------*/
-
-.pun .linkst {
-	padding: 8px 6px 3px 6px
-	}
-
-.pun .linksb, .pun .postlinksb {
-	padding: 3px 6px 8px 6px
-	}
-
-.pun .crumbs {
-	clear: both;
-	width: 100%;
-	overflow: hidden;
-	}
-
-.pun .crumbs li {
-	display: inline;
-	white-space: nowrap;
-	font-weight: bold;
-	}
-
-.pun .pagelink {
-	float: left;
-	white-space: nowrap;
-	}
-
-.pun .postlink {
-	font-weight: bold;
-	white-space: nowrap;
-	}
-
-.pun .postlink, .pun .modbuttons {
-	float: right;
-	text-align: right;
-	}
-
-.pun .modbuttons {
-	padding: 1px 0;
-	white-space: nowrap;
-	}
-
-.pun .modbuttons input {
-	margin-left: 6px;
-	}
-
-.pun .postlink a:link, .pun .postlink a:visited {
-	text-decoration: none
-	}
-
-.pun .postlink a:hover, .pun .postlink a:active {
-	text-decoration: underline;
-	}
-
-#punindex .subscribelink {
-	margin-top: 6px;
-	}
-
-/* Board Footer
-----------------------------------------------------------------*/
-
-#brdfooter .conl {
-	float: left;
-	}
-
-#brdfooter .conr {
-	float: right;
-	text-align: right;
-	}
-
-#brdfooter #modcontrols {
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	text-align: center;
-	}
-
-#brdfooter #modcontrols dd {
-	display: inline;
-	margin:0 6px;
-	}
-
-
-/* Board Stats
-----------------------------------------------------------------*/
-
-#brdstats .conl {
-	float: left;
-	}
-
-#brdstats .conr {
-	float: right;
-	text-align: right;
-	}
-
-#onlinelist dd, #onlinelist dt {
-	display: inline;
-	}
-
-
-/*****************************************************************
-5. MAIN TABLES
-*****************************************************************/
-
-.pun table {
-	width: 100%;
-	border-collapse: collapse;
-	border-spacing: 0;
-	empty-cells: show;
-	}
-
-.pun .blocktable table {
-	table-layout: fixed;
-	}
-
-.pun td, .pun th {
-	padding: 4px 6px;
-	text-align: left;
-	font-weight: normal;
-	}
-
-.pun td, .pun th {
-	border-style: solid none none solid;
-	border-width: 1px;
-	}
-
-.pun .tcl {
-	border-left: 0;
-	width: auto;
-	}
-
-.pun .tc2, .pun .tc3, .pun .tcmod {
-	width: 10%;
-	text-align: center;
-	padding: 4px 0;
-	}
-
-.pun .tcr {
-	width: 30%;
-	}
-
-.pun .tcl h3 {
-	font-size: 1.091em;
-	font-weight: bold;
-	}
-
-.pun .tcl h3 span.newtext {
-	font-size: 0.917em;
-	}
-
-.pun .tcl span.newtext, .pun .tcl span.pagestext {
-	white-space: nowrap;
-	font-weight: normal;
-	}
-
-.pun td span.byuser {
-	white-space: nowrap;
-	}
-
-.pun .tcl p {
-	padding: 5px 0 0 0
-	}
-
-#punsearch #vf .tc2 {
-	width: 18%;
-	text-align: left;
-	padding: 4px 6px;
-	}
-
-#users1 .tcr {
-	width: 25%
-	}
-
-#users1 .tc2 {
-	width: 25%;
-	text-align: left;
-	padding: 4px 6px;
-	}
-
-#debug .tcl {
-	width: 10%
-	}
-
-#debug .tcr {
-	width: 90%;
-	white-space: normal
-	}
-
-#punindex .tcr .byuser {
-	display: block
-	}
-
-.pun .blocktable .tclcon {
-	padding: 0 11px 0 12px;
-	overflow: hidden;
-	min-height: 1px;
-	position: relative;
-	}
-
-.pun .blocktable .tclcon div {
-	width: 100%;
-	overflow: hidden;
-	}
-
-.pun .icon {
-	margin: 0.1em 0 0 0.2em;
-	border-width: 0.6em;
-	border-style: solid;
-	height: 0;
-	width: 0;
-	overflow: hidden;
-	float: left;
-	}
-
-.pun .icon div {
-	position: absolute;
-	left: -9999em;
-	text-indent: -9999em;
-	height: 0;
-	}
-
-.pun .iposted .ipost {
-	position: absolute;
-	left: 0;
-	font-weight: bold;
-	width: 8px;
-	padding-left: 4px;
-	text-align: center;
-	top: 0;
-	}
-
-/*****************************************************************
-6. MAIN FORMS
-*****************************************************************/
-
-.pun .blockform form, .pun .fakeform {
-	PADDING: 20px 20px 15px 20px
-	}
-
-.pun .forminfo {
-	margin-bottom: 12px;
-	padding: 9px 10px;
-	border-style: solid;
-	border-width: 1px;
-	}
-
-.pun .forminfo h3 {
-	font-weight: bold;
-	}
-
-.pun .inform {
-	padding-bottom: 12px
-	}
-
-.pun fieldset {
-	padding: 0px 12px 0px 12px;
-	border-style: solid;
-	border-width: 1px
-	}
-
-.pun legend {
-	padding: 0px 6px
-	}
-
-.pun .infldset {
-	padding: 9px 0px 12px 0
-	}
-
-.pun label {
-	display: block;
-	padding: 3px 0
-	}
-
-.pun label.conl {
-	float: left;
-	overflow: visible;
-	margin-right: 10px
-	}
-
-.pun fieldset .rbox br {
-	display: none;
-	}
-
-.pun fieldset .rbox label {
-	padding: 3px 0 3px 25px;
-	position: relative;
-	vertical-align: middle;
-	}
-
-.pun fieldset .rbox input {
-	margin: 0 9px 0 -25px;
-	padding: 0;
-	width: 16px;
-	position: relative;
-	vertical-align: middle;
-	}
-
-.pun .txtarea {
-	width: 75%
-	}
-
-.pun .txtarea textarea, .pun input.longinput {
-	width: 100%
-	}
-
-.pun .bblinks {
-	padding-bottom: 10px;
-	padding-left: 4px
-	}
-
-.pun .bblinks li {
-	display: inline;
-	padding-right: 20px
-	}
-
-.pun .blockform .buttons {
-	padding-left: 12px;
-	}
-
-.pun .blockform .buttons input {
-	margin-right: 8px;
-	}
-
-#posterror ul {
-	list-style: square;
-	padding: 3px 0 3px 24px;
-	}
-
-.pun .deletemsg {
-	border-style: solid;
-	border-width: 1px;
-	padding: 6px 15px;
-	}
-
-.pun p.actions span {
-	margin-right: 12px;
-	}
-
-.pun .multiselect {
-	float: left;
-	padding-bottom: 7px;
-	}
-
-.pun .checklist {
-	border-width: 1px;
-	border-style: solid;
-	max-height: 9em;
-	width: 20em;
-	overflow: auto;
-	padding: 0.3em 0.5em;
-	margin: 0.25em 16px 0 0.15em;
-	}
-
-.pun .checklist fieldset {
-	border: 0;
-	padding: 0;
-	}
-
-.pun .checklist legend {
-	padding: 0;
-	}
-
-.pun .checklist legend span {
-	width: auto;
-	max-width: 25em;
-	}
-
-/*****************************************************************
-7. PROFILES AND ADMIN
-*****************************************************************/
-
-.pun .block2col {
-	padding-bottom: 1px
-	}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 14em
-	}
-
-.pun .blockmenu {
-	float:left;
-	width: 13em
-	}
-
-.pun .blockmenu li {
-	padding: 3px 0;
-	font-weight: bold;
-	}
-
-.pun .blockmenu a:link, .pun .blockmenu a:visited {
-	text-decoration: none
-	}
-
-.pun .blockmenu a:hover, .pun .blockmenu a:active {
-	text-decoration: underline
-	}
-
-#viewprofile dl {
-	float: left;
-	width: 100%;
-	overflow: hidden
-	}
-
-#viewprofile dd {
-	margin-left: 14em;
-	padding: 3px;
-	}
-
-#viewprofile dt {
-	float: left;
-	width: 13em;
-	margin: 3px 0;
-	}
-
-#profileavatar img {
-	float: right;
-	margin-left: 1em
-	}
-
-#adintro ul {
-	list-style-type: disc;
-	margin-left: 8px;
-	padding-left: 16px;
-	}
-
-/*****************************************************************
-8. MAIN POSTS
-*****************************************************************/
-
-.pun .blockpost h2 a:link, .pun .blockpost h2 a:visited {
-	text-decoration: none;
-	}
-
-.pun .blockpost h2 a:hover, .pun .blockpost h2 a:active {
-	text-decoration: underline;
-	}
-
-.pun .blockpost h2 .conr {
-	float: right;
-	text-align: right;
-	}
-
-#punsearch .blockpost h2 span {
-	white-space: nowrap;
-	}
-
-.pun .blockpost .box {
-	overflow: hidden;
-	}
-
-.pun .postleft, .pun .postfootleft {
-	float:left;
-	width: 18em;
-	position: relative;
-	overflow: hidden;
-	}
-
-.pun .postleft dl {
-	padding: 6px;
-	}
-
-.pun .postleft .usercontacts, .pun .postleft .icon {
-	margin-top: 6px
-	}
-
-.pun .postleft .postavatar, .pun .postleft .usertitle {
-	margin-bottom: 6px;
-	display: block;
-	}
-
-.pun .blockpost dt {
-	font-size: 1.091em;
-	font-weight: bold;
-	}
-
-.pun .blockpost dt a:link, .pun .blockpost dt a:visited {
-	text-decoration: none;
-	}
-
-.pun .blockpost dt a:hover, .pun .blockpost dt a:active {
-	text-decoration: underline;
-	}
-
-.pun .postright, .pun .postfootright {
-	border-left-width: 18em;
-	border-left-style: solid
-	}
-
-#postpreview .postright {
-	border-left: 0
-	}
-
-.pun .postright {
-	padding: 0 6px;
-	}
-
-.pun .postfootright, .pun .multidelete {
-	text-align: right
-	}
-
-.pun .postmsg {
-	width:98%;
-	overflow: hidden;
-	padding-bottom: 6px;
-	word-wrap: break-word;
-	}
-
-.pun .postfootright ul, .pun .postfootright div, .pun .postfootright p,
-.pun .postfootleft p {
-	padding: 10px 6px 5px 6px;
-	}
-
-.pun .postfootright li {
-	display: inline;
-	}
-
-.pun .postfootright li:before {
-	content: " | ";
-	}
-
-.pun .postfootright li:first-child:before {
-	content: "";
-	}
-
-.pun .postfootright a:link, .pun .postfootright a:visited {
-	text-decoration: none
-	}
-
-.pun .postfootright a:hover, .pun .postfootright a:active {
-	text-decoration: underline
-	}
-
-.pun .codebox {
-	border-style: solid;
-	border-width: 1px;
-	margin: 0.75em 1em;
-	padding: 0;
-	}
-
-.pun .quotebox {
-	border-style: solid;
-	border-width: 1px;
-	margin: 0.75em 1em;
-	padding: 0 0.75em;
-	}
-
-.pun .quotebox cite {
-	display: block;
-	padding: 0.75em 0 0 0;
-	}
-
-.pun .quotebox blockquote {
-	width: 100%;
-	overflow: hidden
-	}
-
-.pun .codebox pre {
-	overflow: auto;
-	width: 100%;
-	overflow-y:hidden
-	}
-
-* html .pun .codebox pre {
-	padding-bottom: 10px;
-	}
-
-*+html .pun .codebox pre {
-	padding-bottom: 10px
-	}
-
-.pun .codebox pre code {
-	display: block;
-	padding: 0.75em;
-	}
-
-.pun .codebox pre.vscroll {
-	height: 32em;
-	overflow: auto;
-	overflow-y: auto
-	}
-
-.pun .postmsg img {
-	vertical-align: bottom;
-	}
-
-.pun .postsignature hr {
-	margin-left: 0px;
-	width: 200px;
-	text-align: left;
-	height: 1px;
-	border:none
-	}
-
-.pun .postmsg .postimg img {
-	max-width: 98%;
-	vertical-align: middle;
-	margin: 7px 0.5em 7px 0;
-	}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-style: solid;
-	border-width: 2px;
-	}
-
-.pun .blockpost label {
-	padding: 3px 6px;
-	border-style: solid;
-	border-width: 1px;
-	vertical-align: middle;
-	display: inline-block;
-	}
-
-.pun .blockpost label * {
-	vertical-align: middle;
-	margin: 0;
-	padding: 0;
-	}
-
-/****************************************************************/
-/* 9. HELP FILES AND MISC. */
-/****************************************************************/
-
-#punhelp h2 {
-	margin-top: 12px
-	}
-
-#punhelp div.box {
-	padding: 10px
-	}
-
-#debugtime {
-	margin-top: -12px;
-	text-align: center;
-	}
-
-#brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
-	line-height: 1.4em
-	}
-
-#announce div.inbox div {
-	padding: 3px 0
-	}
-
-/*****************************************************************
-COLOUR SCHEME
-*****************************************************************/
-
-/* Background / Text
-----------------------------------------------------------------*/
-
-body {
-	background: #fff;
-	color: #333
-	}
-
-.pun {
-	color: #333
-	}
-
-.pun .box, #adminconsole fieldset th {
-	background-color: #f1f1f1
-	}
-
-.pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
-#brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
-	background-color: #dedfdf
-	}
-
-.pun h2, #brdmenu {
-	background-color: #b84623;
-	color: #fff
-	}
-
-.pun th {
-	background-color: #d1d1d1
-	}
-
-.pun legend {
-	color: #822100
-	}
-
-.pun .blockmenu li.isactive a, #posterror li strong {
-	color: #333
-	}
-
-.pun .usercontent * {
-	background: transparent;
-	color: #333
-	}
-
-.pun .multiselect, .pun .checklist {
-	color: #333;
-	}
-
-.pun .checklist {
-	border-color: #ACA899;
-	}
-
-/* Posts
-----------------------------------------------------------------*/
-
-.pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
-	background-color: #dedfdf
-	}
-
-.pun .postright, .pun .postfootright {
-	border-left-color: #f1f1f1
-	}
-
-.pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
-	background-color: #f1f1f1
-	}
-
-#punhelp .codebox, #punhelp .quotebox {
-	background-color: #f9f9f9;
-	}
-
-.pun .blockpost h2 {
-	background-color: #d25028
-	}
-
-.pun .blockpost h2 span.conr {
-	color: #fccfc1
-	}
-
-.pun .postmsg ins, #punhelp samp ins {
-	background-color: #ff0;
-	}
-
-.pun hr {
-	background-color: #333;
-	color: #333
-	}
-
-/* Borders
-----------------------------------------------------------------*/
-
-.pun .box {
-	border-color: #b84623
-	}
-
-.pun td, #brdfooter #modcontrols {
-	border-color: #e1c3c3
-	}
-
-.pun th {
-	border-color: #d1d1d1
-	}
-
-.pun fieldset {
-	border-color: #aca899
-	}
-
-#adminconsole td, #adminconsole th {
-	border-color: #f1f1f1
-	}
-
-.pun .quotebox, .pun .codebox, .pun .forminfo,
-.pun .blockpost label, .pun .deletemsg {
-	border-color: #aca899 #fff #fff #aca899
-	}
-
-/* Links
-----------------------------------------------------------------*/
-
-.pun a:link, .pun a:visited {
-	color: #822100
-	}
-
-.pun a:hover, .pun a:active, .pun a:focus {
-	color: #ca3300
-	}
-
-.pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
-	border-color: #822100;
-	}
-
-.pun .postmsg .postimg a:hover img, .pun .postmsg .postimg a:active img, .pun .postmsg .postimg a:focus img {
-	border-color: #ca3300;
-	}
-
-.pun h2 a:link, .pun h2 a:visited,
-#brdmenu a:link, #brdmenu a:visited {
-	color: #fff
-	}
-
-.pun h2 a:hover, .pun h2 a:active,
-#brdmenu a:hover, #brdmenu a:active {
-	color: #fff
-	}
-
-.pun .postreport a:link, .pun .postreport a:visited,
-.pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
-	color: #888
-	}
-
-.pun .postreport a:hover, .pun .postreport a:active,
-.pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
-	color: #aaa
-	}
-
-.pun .maintenancelink a:link, .pun .maintenancelink a:visited {
-	color: #b42000
-	}
-
-.pun .maintenancelink a:hover, .pun .maintenancelink a:active {
-	color: #b42000
-	}
-
-/* Status Indicators
-----------------------------------------------------------------*/
-
-.pun .icon {
-	border-color: #e6e6e6 #dedede #dadada #e2e2e2
-	}
-
-.pun .iredirect .icon {
-	border-color: #f1f1f1 #f1f1f1 #f1f1f1 #f1f1f1
-	}
-
-.pun .inew .icon {
-	border-color: #c23000 #af2c00 #992600 #ac2b00
-	}
-
-/* Alert boxes
-----------------------------------------------------------------*/
-
-#msgflash {
-    opacity: 0;
-    position: fixed;
-    top: 40px;
-    right: 40px;
-    min-width: 240px;
-    max-width: 410px;
-	padding: 5px;
-	z-index: 1000;
-}
diff --git a/style/Technetium.css b/style/Technetium.css
deleted file mode 100644
index aba20eb0..00000000
--- a/style/Technetium.css
+++ /dev/null
@@ -1,1387 +0,0 @@
-/*****************************************************************
-Technitium theme CSS
-*****************************************************************/
-
-/*****************************************************************
-1. INITIAL SETTINGS
-*****************************************************************/
-
-/* Limited Reset
-----------------------------------------------------------------*/
-
-.pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
-.pun h4, .pun h5, .pun pre, .pun blockquote, .pun ul, .pun ol, .pun li, .pun dl,
-.pun dt, .pun dd, .pun th, .pun td, .pun fieldset, .pun img, .pun abbr, .pun cite {
-	margin: 0;
-	padding: 0;
-	border: 0;
-}
-
-.pun ul, .pun ol {
-	list-style: none
-}
-
-
-/* Structural Settings
-----------------------------------------------------------------*/
-
-body {
-	line-height: 1.9em;
-}
-
-.pun {
-	width: 95%;
-	margin: 0 auto;
-}
-
-.pun .clearer, .pun .nosize {
-	height: 0;
-	width: 0;
-	line-height: 0;
-	font-size: 0;
-	overflow: hidden
-}
-
-.pun .clearer, .pun .clearb {
-	clear: both
-}
-
-.pun .nosize {
-	position: absolute;
-	left: -9999em;
-	text-indent: -9999em;
-	width: 0;
-}
-
-* html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
-	height: 1px
-}
-
-.pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
-	min-height: 1px
-}
-
-.clearl {
-	clear: left;
-}
-
-/* Hidden Elements
-----------------------------------------------------------------*/
-
-#brdfooter h2, #brdstats h2, #brdstats .conl dt, #brdstats .conr dt,
-#modcontrols dt, #searchlinks dt, div.postright h3 {
-	position: absolute;
-	display: block;
-	overflow: hidden;
-	width: 0;
-	left: -9999em;
-	text-indent: -9999em;
-}
-
-/*****************************************************************
-2. TEXT & CONTENT
-*****************************************************************/
-
-/* Text Defaults
-----------------------------------------------------------------*/
-
-.pun {
-	font: 10pt Georgia, Times, "Times New Roman", serif
-}
-
-.pun table, .pun td, .pun th, .pun input, .pun select, .pun optgroup, .pun textarea, .pun samp, .pun legend {
-	font-size: 1em;
-	font-family: Georgia, Times, "Times New Roman", serif;
-}
-
-.pun pre, .pun code {
-	font-size: 1.182em;
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace
-}
-
-.pun pre code {
-	font-size: 1em;
-}
-
-.pun strong {
-	font-weight: bold;
-}
-
-.pun em {
-	font-style: italic;
-}
-
-#vf td {
-	font-size: 1.1em;
-}
-
-
-/* Content Defaults
-----------------------------------------------------------------*/
-
-.pun p, .pun ul, .pun ol, .pun dl {
-	font-size: 1em;
-	padding: 3px 0;
-}
-
-.pun h2 {
-	font-size: 1.5em;
-	font-weight: normal;
-	padding: 4px 6px;
-	padding: 6px;
-	border-radius: 0.3em 0.3em 0 0;
-}
-
-.pun h2 #brdmenu {
-	font-size: 1.1em;
-}
-
-.pun .blockpost h2 {
-	font-size: 1.0em;
-	padding: 8px;
-}
-
-.pun h3 {
-	font-size: 1.091em;
-	padding: 3px 0;
-}
-
-.pun table p, .pun table h3 {
-	padding: 0;
-}
-
-.pun span.warntext, .pun p.warntext {
-	font-weight: bold
-}
-
-.pun .postleft dl dt {
-	font-size: 1.4em;
-}
-
-/* User Content (Announcements, Rules, Posts)
-----------------------------------------------------------------*/
-
-.pun .usercontent p, .pun .postmsg p {
-	padding: 0.5em 0;
-	line-height: 1.6em;
-}
-
-.pun .usercontent ul, .pun .postmsg ul {
-	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: disc
-}
-
-.pun .usercontent ol, .pun .postmsg ol {
-	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: decimal
-}
-
-.pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha
-}
-
-.pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
-	padding: 0.25em 1em 0.75em 2.5em
-}
-
-.pun .usercontent li p, .pun .postmsg li p {
-	padding: 0
-}
-
-.pun .usercontent h1 {
-	font-size: 1.4em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-}
-
-.pun .usercontent h2 {
-	font-size: 1.2em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-}
-
-.pun .usercontent h3 {
-	font-size: 1.1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-}
-
-.pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
-	font-size: 1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0
-}
-
-.pun .quotebox cite {
-	font-weight: bold;
-	font-style: normal;
-	padding: 0.75em 0.75em 0 0.75em
-}
-
-.pun span.bbu {
-	text-decoration: underline
-}
-
-.pun span.bbs, .pun del {
-	text-decoration: line-through;
-}
-
-.pun .postmsg ins, #punhelp samp ins {
-	text-decoration: none;
-}
-
-.pun div.postmsg h5, #punhelp h5 {
-	font-size: 1.1em;
-	font-weight: bold;
-	padding: 0.75em 0 0 0;
-}
-
-/*****************************************************************
-3. COMMON STYLES
-*****************************************************************/
-
-/* Page Layout
-----------------------------------------------------------------*/
-
-.pun {
-	max-width: 1070px;
-	width: 95%;
-	margin: 0 auto;
-	padding: 12px 20px;
-}
-
-#punredirect, #punmaint, #puninstall, #pundb_update {
-	margin: 50px 20% 12px 20%;
-	width: auto;
-}
-
-
-/* Vertical Element Spacing
-----------------------------------------------------------------*/
-
-#brdheader {
-	margin: 0 0 12px 0;
-}
-
-#announce, #brdstats {
-	margin: 12px 0 12px 0;
-}
-
-.pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
-	margin-bottom: 12px
-}
-
-#punindex .blocktable, .pun .blockpost {
-	margin-bottom: 6px
-}
-
-#postreview .box {
-	margin-bottom: 3px;
-}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-bottom: 0px
-}
-
-.pun .linkst, .pun .linksb {
-	margin-top: -12px
-}
-
-.pun .postlinksb {
-	margin-top: -6px
-}
-
-
-/* External Borders
-----------------------------------------------------------------*/
-
-.pun .box {
-	border-style: solid;
-	border-width: 1px;
-}
-
-
-.pun h2 {
-	border-width: 1px;
-	border-style: solid;
-	border-bottom: none;
-}
-
-
-/* Default Internal Spacing
-----------------------------------------------------------------*/
-
-.pun .block .inbox, .pun .blockmenu .inbox {
-	padding: 3px 6px
-}
-
-/*****************************************************************
-4. COMMON BOARD ELEMENTS
-*****************************************************************/
-
-/* Board Header
-----------------------------------------------------------------*/
-
-#brdtitle h1 {
-	font-size: 1.5em;
-	line-height: 1.1em;
-	padding: 3px 0 0 0;
-}
-
-#brdmenu {
-	font-size:1.2em;
-}
-
-#brddesc {
-	padding: 3px 0;
-}
-
-#brddesc * {
-	padding-top: 0;
-	padding-bottom: 0;
-}
-
-
-#brdmenu li {
-	display: inline;
-	margin-right: 10px;
-	margin-top: 12px;
-	margin-bottom: 12px;
-}
-
-
-#brdmenu a:link, #brdmenu a:visited {
-	text-decoration: none;
-	text-shadow: #FFF 1px -1px 0.4em;
-	padding: 0.2em;
-}
-
-#brdwelcome .conl {
-	float: left;
-	white-space: nowrap;
-}
-
-#brdwelcome li {
-	float:left;
-	margin-right:8px;
-	white-space:nowrap;
-}
-
-#brdwelcome .conl li strong:after {
-	content: '.'
-}
-
-#brdwelcome .conr {
-	float: right;
-	text-align: right;
-}
-
-#brdwelcome .conr li {
-	float: right;
-	text-align: right;
-}
-
-/* Breadcrumbs and Post Links
-----------------------------------------------------------------*/
-
-.pun .linkst {
-	padding: 8px 6px 3px 6px
-}
-
-.pun .linksb, .pun .postlinksb {
-	padding: 3px 6px 8px 6px
-}
-
-.pun .crumbs {
-	clear: both;
-	width: 100%;
-	overflow: hidden;
-}
-
-.pun .crumbs li {
-	display: inline;
-	white-space: nowrap;
-	font-weight: bold;
-}
-
-.pun .linkst .crumbs {
-	font-size: 1.3em;
-}
-
-.pun .pagelink {
-	float: left;
-	display: block;
-	white-space: normal;
-}
-
-.pun .postlink {
-	font-size: 1.1em;
-	font-weight: bold;
-	white-space: wrap;
-	text-decoration: none;
-}
-
-.pun .linkst .postlink {
-	position: relative;
-	margin-top: -0.2em;
-	margin-bottom: 0.5em;
-}
-
-.pun .linksb .postlink, .pun .postlinksb .postlink {
-	position: relative;
-	margin-top: 0.5em;
-	margin-bottom: -0.5em;
-}
-
-.pun .postlink, .pun .modbuttons {
-	float: right;
-	text-align: right;
-}
-
-.pun .modbuttons {
-	padding: 1px 0;
-	white-space: nowrap;
-}
-
-.pun .modbuttons input {
-	margin-left: 6px;
-}
-
-#punindex .subscribelink {
-	margin-top: 6px;
-}
-
-/* Board Footer
-----------------------------------------------------------------*/
-
-#brdfooter #modcontrols {
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	text-align: center;
-}
-
-#brdfooter #modcontrols dd {
-	display: inline;
-	margin-right: 10px;
-}
-
-#brdfooter .conl {
-	float: left;
-}
-
-#brdfooter .conr {
-	float: right;
-	text-align: right;
-}
-
-#brdfooter #feedlinks span {
-	background:url("Technetium/feed.png") no-repeat scroll left center transparent;
-	padding-left:18px;
-	display: inline;
-}
-
-
-/* Board Stats
-----------------------------------------------------------------*/
-
-#brdstats .conl {
-	float: left;
-}
-
-#brdstats .conr {
-	float: right;
-	text-align: right;
-}
-
-#onlinelist dd, #onlinelist dt {
-	display: inline;
-}
-
-
-/*****************************************************************
-5. MAIN TABLES
-*****************************************************************/
-
-.pun table {
-	width: 100%;
-	border-collapse: collapse;
-	border-spacing: 0;
-	empty-cells: show;
-}
-
-.pun .blocktable table {
-	table-layout: fixed;
-}
-
-.pun td, .pun th {
-	padding: 4px 6px;
-	line-height: 1.4em;
-	text-align: left;
-	font-weight: normal;
-}
-
-.pun td {
-	border-style: solid none none solid;
-	border-width: 1px;
-}
-
-.pun .tcl {
-	border-left: 0;
-	width: auto;
-}
-
-.pun .tc2, .pun .tc3, .pun .tcmod {
-	width: 10%;
-	text-align: center;
-	padding: 4px 0;
-}
-
-.pun .tcr {
-	width: 30%;
-}
-
-.pun .tcl h3 {
-	font-size: 1.3em;
-	font-weight: bold;
-}
-
-.pun .tcl span.newtext, .pun .tcl span.pagestext {
-	white-space: nowrap
-}
-
-.pun .tcl p {
-	padding: 5px 0 0 0
-}
-
-#punsearch #vf .tc2 {
-	width: 18%;
-	text-align: left;
-	padding: 4px 6px;
-}
-
-#users1 .tcr {
-	width: 25%
-}
-
-#users1 .tc2 {
-	width: 25%;
-	text-align: left;
-	padding: 4px 6px;
-}
-
-#debug .tcl {
-	width: 10%
-}
-
-#debug .tcr {
-	width: 90%;
-	white-space: normal
-}
-
-#punindex .tcr .byuser {
-	display: block
-}
-
-.pun .blocktable .tclcon {
-	padding: 0 11px 0 12px;
-	overflow: hidden;
-	min-height: 1px;
-	position: relative;
-}
-
-.pun .blocktable .tclcon div {
-	width: 100%;
-	overflow: hidden;
-}
-
-.pun .icon {
-	height: 24px;
-	width: 24px;
-	overflow: hidden;
-	float: left;
-}
-
-.pun .icon div {
-	position: absolute;
-	left: -9999em;
-	text-indent: -9999em;
-	height: 0;
-}
-
-.pun .iposted .ipost {
-	position: absolute;
-	left: 0;
-	font-weight: bold;
-	width: 8px;
-	padding-left: 4px;
-	text-align: center;
-	top: 0;
-}
-
-.pun .stickytext {
-	display: none;
-}
-
-.pun .movedtext {
-	display: none;
-}
-
-.pun .closedtext {
-	font-weight: bold;
-}
-/*****************************************************************
-6. MAIN FORMS
-*****************************************************************/
-
-
-.pun .forminfo {
-	margin-bottom: 12px;
-	padding: 9px 10px;
-	border-style: solid;
-	border-width: 1px;
-}
-
-.pun .forminfo h3 {
-	font-weight: bold;
-}
-
-
-
-.pun .inform {
-	padding: 0 18px;
-}
-
-.pun fieldset {
-	overflow: hidden;
-	width: 100%;
-	padding-bottom: 0.8em;
-}
-
-.pun legend {
-	font-size: 1.2em;
-	font-weight: bold;
-	margin-left: -7px;
-	padding: 10px 19px 7px 19px;
-}
-
-.pun div[class*="inform"] legend {
-	margin-left: 0;
-}
-
-.pun .infldset {
-	border-style: solid;
-	border-width: 1px;
-	display: inline-block;
-	overflow: hidden;
-	padding: 12px 18px;
-}
-
-.pun div[class*="infldset"] {
-	display: block;
-}
-
-#punregister #rules .infldset {
-	padding: 5px 18px;
-}
-
-.pun fieldset p {
-	clear: both;
-	padding: 0 0 7px 0;
-	width: 100%;
-}
-
-.pun fieldset .usercontent p {
-	padding: 7px 0;
-}
-
-.pun fieldset label {
-	clear: both;
-	display: block;
-	padding: 0 0 7px 0;
-}
-
-
-.pun label {
-	display: block;
-	padding: 3px 0
-}
-
-.pun label.conl {
-	float: left;
-	overflow: visible;
-	margin-right: 10px
-}
-
-.pun select {
-	padding-top: 1px;
-	padding-bottom: 1px;
-}
-
-.pun fieldset .rbox {
-}
-
-.pun fieldset .rbox br {
-	display: none;
-}
-
-.pun fieldset .rbox label {
-	padding: 3px 0 3px 25px;
-	position: relative;
-	vertical-align: middle;
-}
-
-.pun fieldset .rbox input {
-	margin: 0 9px 0 -25px;
-	padding: 0;
-	width: 16px;
-	position: relative;
-	vertical-align: middle;
-}
-
-.pun .txtarea {
-	width: 90%
-}
-
-.pun .txtarea textarea, .pun input.longinput {
-	width: 100%
-}
-
-.pun .bblinks {
-	padding-bottom: 10px;
-	padding-left: 4px
-}
-
-.pun .bblinks li {
-	display: inline;
-	padding-right: 20px
-}
-
-.pun .blockform .buttons {
-	padding-left: 18px;
-	padding-bottom: 5px;
-}
-
-.pun .blockform .buttons input {
-	margin-right: 8px;
-}
-
-#posterror ul {
-	list-style: square;
-	padding: 3px 0 3px 24px;
-}
-
-.pun .deletemsg {
-	border-style: solid;
-	border-width: 1px;
-	padding: 6px 15px;
-}
-
-.pun .multiselect {
-	float: left;
-	padding-bottom: 7px;
-}
-
-.pun .checklist {
-	border-width: 1px;
-	border-style: solid;
-	max-height: 9em;
-	width: 20em;
-	overflow: auto;
-	padding: 0.25em 0.5em;
-	margin: 0.25em 16px 0 0.15em;
-}
-
-.pun .checklist legend {
-	padding: 0;
-}
-
-.pun .checklist legend span {
-	width: auto;
-	max-width: 25em;
-}
-
-/*****************************************************************
-7. PROFILES AND ADMIN
-*****************************************************************/
-
-.pun .block2col {
-	padding-bottom: 1px
-}
-
-.pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 14em
-}
-
-.pun .blockmenu {
-	float:left;
-	width: 13em
-}
-
-.pun .blockmenu li {
-	padding: 3px 0;
-	font-weight: bold;
-}
-
-.pun .blockmenu a:link, .pun .blockmenu a:visited {
-	text-decoration: none
-}
-
-.pun .blockmenu a:hover, .pun .blockmenu a:active {
-	text-decoration: underline
-}
-
-#viewprofile dl {
-	float: left;
-	width: 100%;
-	overflow: hidden
-}
-
-#viewprofile dd {
-	margin-left: 14em;
-	padding: 3px;
-}
-
-#viewprofile dt {
-	float: left;
-	width: 13em;
-	margin: 3px 0;
-}
-
-#profileavatar img {
-	float: right;
-	margin-left: 1em
-}
-
-/*****************************************************************
-8. MAIN POSTS
-*****************************************************************/
-
-.pun .blockpost h2 a:link, .pun .blockpost h2 a:visited {
-	text-decoration: none;
-}
-
-.pun .blockpost h2 a:hover, .pun .blockpost h2 a:active {
-	text-decoration: underline;
-}
-
-.pun .blockpost h2 .conr {
-	float: right;
-	text-align: right;
-}
-
-#punsearch .blockpost h2 span {
-	white-space: nowrap;
-}
-
-.pun .blockpost .box {
-	overflow: hidden;
-}
-
-.pun .postleft, .pun .postfootleft {
-	float:left;
-	width: 18em;
-	overflow: hidden;
-	position: relative;
-	overflow: hidden;
-}
-
-.pun .postleft dl {
-	padding: 0.5em 6px;
-}
-
-.pun .postleft .usercontacts, .pun .postleft .icon {
-	margin-top: 6px
-}
-
-.pun .postleft .postavatar, .pun .postleft .usertitle {
-	margin-bottom: 6px;
-	display: block;
-}
-
-.pun .blockpost dt {
-	font-size: 1.091em;
-	font-weight: bold;
-}
-
-.pun .blockpost dt a:link, .pun .blockpost dt a:visited {
-	text-decoration: none;
-}
-
-.pun .blockpost dt a:hover, .pun .blockpost dt a:active {
-	text-decoration: underline;
-}
-
-.pun .postright, .pun .postfootright {
-	border-left-width: 18em;
-	border-left-style: solid
-}
-
-#postpreview .postright {
-	border-left: 0
-}
-
-.pun .postright {
-	padding: 0 6px;
-}
-
-.pun .postfootright, .pun .multidelete {
-	text-align: right
-}
-
-.pun .postmsg {
-	width:98%;
-	overflow: hidden;
-	padding-bottom: 6px;
-	word-wrap: break-word;
-}
-
-.pun .postfootright ul, .pun .postfootright div, .pun .postfootright p,
-.pun .postfootleft p {
-	padding: 6px 6px 6px 6px;
-}
-
-.pun .postfootright li {
-	display: inline;
-}
-
-.pun .postfootright li:before {
-	content: " | ";
-}
-
-.pun .postfootright li:first-child:before {
-	content: "";
-}
-
-.pun .postfootright a:link, .pun .postfootright a:visited {
-	text-decoration: none
-}
-
-.pun .postfootright a:hover, .pun .postfootright a:active {
-	text-decoration: underline
-}
-
-
-.pun .quotebox, .pun .codebox {
-	border-style: solid;
-	border-width: 2px;
-	border-left: 5px solid;
-	margin: 0.75em 1em;
-	padding: 0 0.75em;
-}
-
-.pun .quotebox cite {
-	display: block;
-	padding: 0.75em 0 0 0;
-}
-
-.pun .quotebox blockquote {
-	width: 100%;
-	overflow: hidden
-}
-
-.pun .codebox pre {
-	overflow: auto;
-	width: 100%;
-	overflow-y:hidden
-}
-
-* html .pun .codebox pre {
-	padding-bottom: 10px;
-}
-
-*+html .pun .codebox pre {
-	padding-bottom: 10px
-}
-
-.pun .codebox pre code {
-	display: block;
-	padding: 0.75em;
-}
-
-.pun .codebox pre.vscroll {
-	height: 32em;
-	overflow: auto;
-	overflow-y: auto
-}
-
-.pun .postmsg .postimg img, .pun .postmsg a .postimg img {
-	max-width: 100%;
-	vertical-align: middle;
-}
-
-.pun .postmsg img {
-	vertical-align: bottom;
-}
-
-.pun .postsignature hr {
-	margin-left: 0px;
-	width: 200px;
-	text-align: left;
-	height: 1px;
-	border:none
-}
-
-.pun .blockpost label {
-	padding: 3px 6px;
-	border-style: solid;
-	border-width: 1px;
-	vertical-align: middle;
-	display: inline-block;
-}
-
-.pun .blockpost label * {
-	vertical-align: middle;
-	margin: 0;
-	padding: 0;
-}
-
-
-/****************************************************************/
-/* 9. HELP FILES AND MISC. */
-/****************************************************************/
-
-#punhelp h2 {
-	margin-top: 12px
-}
-
-#punhelp div.box {
-	padding: 10px
-}
-
-/*****************************************************************
-COLOUR SCHEME
-*****************************************************************/
-
-/* Background / Text
-----------------------------------------------------------------*/
-
-body {
-	background: #fff url("Technetium/bg.png") repeat-x top;
-	color: #122434
-}
-
-.pun {
-	color: #122434
-}
-
-.pun .box, #adminconsole fieldset th {
-	background-color: #FBFCFD;
-	background-image: url("Technetium/light-shade.png");
-	background-position: bottom;
-	background-repeat: repeat-x;
-}
-
-.pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
-#brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
-	background-color: #F4F9FD;
-	background-image: url("Technetium/light-shade.png");
-	background-repeat: repeat-x;
-	background-position: bottom;
-}
-
-.pun h2, #brdmenu {
-	background-color: #C5D8EB;
-	color: #122434;
-	background-image: url("Technetium/dark-shade.png");
-	background-repeat: repeat-x;
-	background-position: top;
-}
-
-.pun h2  {
-	background-color: #C5D8EB;
-	background-image: url("Technetium/inv-shade.png");
-	background-repeat: repeat-x;
-	color: #122434;
-	text-shadow: #FFF 1px -1px 0.7em;
-}
-
-.pun #announce h2  {
-	display: none;
-}
-
-.box #announce-block {
-	background-color: #FDFCE3;
-}
-
-.pun th {
-	background-color: #EFF3F8;
-	background-image: url("Technetium/light-shade.png");
-	background-repeat: repeat-x;
-}
-
-.pun td {
-	background-image: url("Technetium/light-shade.png");
-	background-color: #FBFCFD;
-	background-position: bottom;
-	background-repeat: repeat-x;
-}
-
-.pun .isticky td {
-	background-color: #E4EBF1;
-}
-
-.pun .iclosed td {
-	background-color: #ECEEF0
-}
-
-.pun .iclosed.isticky td {
-	background-color: #CDD6E0;
-}
-
-.pun legend {
-	color: #122434
-}
-
-.pun .blockmenu li.isactive a, #posterror li strong {
-	color: #333
-}
-
-.pun .usercontent * {
-	background: transparent;
-	color: #333
-}
-
-#adminmenu .box {
-	background: #FBFCFD;
-}
-
-.pun .postlink a:link, .pun .postlink a:visited, .pun .postlink a:active  {
-	background-color:#F0F5FA;
-	background-image:url(Technetium/inv-shade.png);
-	background-repeat:repeat-x;
-	border: 1px solid;
-	color:#2B3037;
-	text-shadow: #FFF 1px -1px 0.4em;
-	padding: 0.3em;
-	border-radius: 0.4em;
-	position: relative;
-}
-
-.pun .postlink a:hover {
-	background-color: #C0D6E9;
-	color: #000;
-}
-
-#brdheader .box {
-	background-color:#F0F5FA;
-	background-image:url(Technetium/light-shade.png);
-	background-repeat:repeat-x;
-	background-position: top;
-	color:#122434;
-	border-radius: 0.4em;
-}
-
-.pun #brdtitle {
-	background-color: #D1E1EF;
-	background-image: url("Technetium/inv-shade.png");
-	background-repeat: repeat-x;
-	text-shadow: #FFF 1px -1px 0.4em;
-}
-
-
-.pun .infldset, #pundelete .deletemsg, #adintro .inbox, #adstats .inbox {
-	background: #FBFCFD url(Technetium/light-shade.png) bottom repeat-x;
-	border-color: #C0CCD8;
-}
-
-#adintro ul {
-	list-style-type: disc;
-	margin-left: 8px;
-	padding-left: 16px;
-}
-
-.pun .multiselect {
-	color: #122434;
-}
-
-.pun .checklist {
-	background: white;
-	border-color: #A2B5CC;
-}
-
-/* Posts
-----------------------------------------------------------------*/
-
-.pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
-	background-color: #F8FAFD;
-}
-
-.pun .postright, .pun .postfootright {
-	border-left-color: #F0F5FA
-}
-
-.pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
-	background-color: #F0F5FA
-}
-
-#punhelp .codebox, #punhelp .quotebox {
-	background-color: #f9f9f9;
-}
-
-.pun .blockpost h2 {
-	background-color: #F0F5FA;
-}
-
-.pun .blockpost h2 span.conr {
-	color: #aabdcd
-}
-
-.pun hr {
-	background-color: #333;
-	color: #333
-}
-
-.pun .quotebox {
-	background-color: #FAFCFE;
-}
-
-.pun .postmsg ins, #punhelp samp ins {
-	background-color: #ff0;
-}
-
-/* Borders
-----------------------------------------------------------------*/
-
-.pun .box, .pun h2, #brdfooter #modcontrols {
-	border-color: #A2B5CC;
-}
-
-.blocktable #announce h2 {
-	border-color: #F6B620;
-}
-
-.pun td {
-	border-color: #A2B5CC;
-}
-
-.pun th, .pun fieldset {
-	border-color: #A2B5CC;
-}
-
-#adminconsole td, #adminconsole th {
-	border-style:solid;
-	border-width:1px 0px !important;
-}
-
-#adminconsole th {
-	border-width: 1px 0px 1px 1px !important;
-}
-
-#adminconsole td {
-	border-width: 1px 1px 1px 1px !important;
-}
-
-.pun .forminfo, .pun .blockpost label, .pun .deletemsg {
-	border-color: #aca899 #fff #fff #aca899;
-}
-
-.pun .quotebox, .pun .codebox {
-	border-color: #BCD2E9;
-}
-
-.pun .postlink a:link, .pun .postlink a:visited {
-	border-color: #C0D6E9
-}
-
-
-/* Links
-----------------------------------------------------------------*/
-
-.pun a:link, .pun a:visited {
-	color: #1F537B;
-	text-decoration: none;
-}
-
-.pun a:hover, .pun a:active, .pun a:focus {
-	color: #9E1D00
-}
-
-#brdmenu li a:active, #brdmenu li a:link, #brdmenu li a:visited {
-	color: #1F2E3D;
-}
-
-#brdmenu li a:hover {
-	color: #000;
-	text-shadow: #8895A2 1px -1px 0.4em;
-}
-
-#vf a {
-	font-weight: bold;
-}
-
-.pun .postreport a:link, .pun .postreport a:visited,
-.pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
-	color: #888
-}
-
-.pun .isticky.iclosed td.tcl a:link, .pun .isticky.iclosed td.tcl a:visited {
-	color: #475F6B !important;
-}
-
-.pun .isticky.iclosed td.tcl a:hover {
-	color: #577382 !important;
-}
-
-
-.pun .postreport a:hover, .pun .postreport a:active,
-.pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
-	color: #aaa
-}
-
-.pun .maintenancelink a:link, .pun .maintenancelink a:visited {
-	color: #b42000
-}
-
-.pun .maintenancelink a:hover, .pun .maintenancelink a:active {
-	color: #b42000
-}
-
-
-/* Status Indicators
-----------------------------------------------------------------*/
-
-.pun .icon {
-	background-image:url(Technetium/icon-nonew.png);
-}
-
-.pun .iredirect .icon {
-	background-image:url(Technetium/icon-moved.png);
-}
-
-.pun .inew .icon{
-	background-image:url(Technetium/icon-new.png);
-}
-
-.pun .iclosed .icon  {
-	background-image:url(Technetium/icon-closed.png);
-}
-
-.pun .isticky .icon {
-	background-image:url(Technetium/icon-nonew-sticky.png);
-}
-
-.pun .isticky.inew .icon {
-	background-image:url(Technetium/icon-new-sticky.png);
-}
-
-.pun .iclosed.isticky .icon {
-	background-image:url(Technetium/icon-closed-sticky.png);
-}
-
-.pun .imoved .icon {
-	background-image:url(Technetium/icon-moved.png);
-}
-
-/* Alert boxes
-----------------------------------------------------------------*/
-
-#msgflash {
-    opacity: 0;
-    position: fixed;
-    top: 40px;
-    right: 40px;
-    min-width: 240px;
-    max-width: 410px;
-	padding: 5px;
-	z-index: 1000;
-}
diff --git a/style/Technetium/bg.png b/style/Technetium/bg.png
deleted file mode 100644
index 92611176286042627d2f527114a931ed0b7205fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 578
zcmeAS@N?(olHy`uVBq!ia0vp^DGUtE3@pq*mV)E`Z9qyiz$e7@-~azVfB*UV^Vgrh
z|2};E@%`8D&)<JO3+6n}z`*#z)5S5Q;?~>C4>RvL2sB)5U9He!lHgIdzK}apQC8x6
zywi=jUsaqer&t<nJD1-xG3?T1b<W*?b@-bUI8e|Z`O0;DT|jVZr}lX*t@6N1P5-|K
z<3d70?rlOSoYVSe#W~%n?Vq-MDz;q#1$)X_9R*l`Xs6%4aCcV-c*-17H<cYCUYY-C
zt(BIR*7ty)L2@94VDv=g$wsUBdq1sM1OlICYWY9Sj6b~?#3_1rYI4^p+Yp$_f1c~X
zZtFTVQ``K^Qk%8Y>u&{Iy&v{#@6Jod{St2{<-fQgv-a|{dmndg-+J~k`)kHWa`k@l
zYxUR0oh-M!k*Bq@KIZhPht^9p!Z&T){eIhS;lPzMPVe~lYI4rD+4^OFv;W<GQdO_^
zd$*U*p3CvZzVo6dzqU(#uX`_5=kxxgcj*c9?uAs{GYreNJo8NQ(DVN#e`c<GW;18e
zcaNjF(_}MruciKc6Zm#xU;A0-!tDY-^?o`oy7lS8CT+uW>8S@ah0f<snX38dQs9{%
zuP0V|)-B$l<d?3>m#%u>#^Lt<$E#wNNxZ(nzx~aw^suJ9|2Bud9kA`=5m#UI>6gUk
irM-s7BtA1fGxu~b(^^}fzXO;k7(8A5T-G@yGywoRrWr&4

diff --git a/style/Technetium/dark-shade.png b/style/Technetium/dark-shade.png
deleted file mode 100644
index 0bd7ae6a11cd9659606749d372ee9cea2c3464b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol>!VDz;rWf^sH~~H(uBHwic+m2g_gjD}xk`fk
zg4MVgW!S_N1%#Cqci;R36jkwbaSY+Oo*bBzkdWArl=3Z7rA%syn2YfK_9JF)i!M(*
bQkcMC@tvh|`>lmFK=llsu6{1-oD!M<C+91}

diff --git a/style/Technetium/darker-shade.png b/style/Technetium/darker-shade.png
deleted file mode 100644
index b3ca98a4558825fa6a36c5c73881c03c09523d01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol>!VDz;rWf@BDU|@95LaF>@X0KMFtC!XK39r?
z>Um0n{DQR<8F(Z`*<}UPRayQ9C*A^zYkRslhHzX@4opf&NMv|4(_xR)DLd|^&KG~Y
qU%16^$~@MkiN72_z4S<`FkmoZVz1oRY_kfejlt8^&t;ucLK6V!*(y!|

diff --git a/style/Technetium/feed.png b/style/Technetium/feed.png
deleted file mode 100644
index 3704226a673de8aa886bb5d964fd65079347a35c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 439
zcmV;o0Z9IdP)<h;3K|Lk000e1NJLTq000dD000dL0{{R3MKu&o0002SP)t-sOlfiI
zd^h-%Fzc01@r*n6l|A^JKL7v!^o}*{ggNt)IplLN|M&0y@#X4(IOT02>Ut>u@Zj)-
zFZhrs^@=3#fGGUu+4i%0{Jwwx_38SoVC8r*<cduHnKSK`U-;nE?~Fw6d?MdqAK_>z
z{n@nn!;s!%C-tXg`p>H1Z8GD8O!b{i`?hiDb0`1Ind^;F_|Uib+s*Q~lJ>%y@2-pU
ztakE>G5q7p_s6CD$Bx=p9pG|9`OBpHs#f))S^w+S{oTI#q)}0fy#xRN00DGTPE!Ct
z=GbNc005s!L_t(|+6~D=7Q{dl0Knf#Gd2gY#<uQ%smZcl0Zb4Q0%JlHd4#$VmVf4)
zQz}Dh2Acg`c#=e^0)}<!G^R)Hbjmphzir7<V>g#`F)9eUB>Au~Hw?f|{blho(e=zi
zpeWuiisN_4_GSu1s;gJTu9-G3R3NU+s>Ma0ZCTTgx3<Ilu$vv{j}l}md5*I(%i`V)
h05Zl{Af&4O0Dr034rF_``4j*E002ovPDHLkV1hcR;mQC2

diff --git a/style/Technetium/icon-closed-sticky.png b/style/Technetium/icon-closed-sticky.png
deleted file mode 100644
index 92f76a91465e5a9e318d66cf5a71645c16cff18f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq000;O000;W0{{R3*Qw3Q0001!P)t-sOlfhh
zzs-J_uXT)>oUp=$p0kIaw5YnuxW?0!s=aoNnRJVo;^^)A`~2VK>-_!w=j`x)m#+Bw
z`}g?z_4oPx{{G$M>f7SzcaECm>F(+7^7Hoi>+kb>lAiJO_s-Yd!OYXN!pxbgwe9fq
zg_@<NwZ6N@&)44M?(+4FpsUBw*QdG3%GKVVu(_|i#g?eDp0dL%@VG?)000VfQchC<
zRsa9y{{B^0=6GC3H2?qr+et)0RCwBb%i9iuFbsfUgQ%j2c$_-7F~><j@%^99wp)xq
z^uK7<e%a_xbAQvzpVNJs%fol;xSpc;dbRGSeE`p_21Opi)>UL#;hvmeXVWK0xrJbF
zYY`r9A>f=dt@v{RRXoW<I1osg!Kuv=@)U-a(n7rG<)AFZxRWSL0%NL<q=hjAS4dSi
zdwnv6JHZ8F_oeI3a3_eN8{SfZ^MU&Z=tI`xY(H>@5&<8M3Z_uF6NDH`5<3}g5yGYj
z2Q>&m9SwQ~0JBNmu;W*(c}->`l)&p1!2M@$-GU%xwa#Fi00000NkvXXu0mjfN$2)j

diff --git a/style/Technetium/icon-closed.png b/style/Technetium/icon-closed.png
deleted file mode 100644
index 4d9c93e00f7daac9c3654bcf9d463232200b6412..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 255
zcmV<b0094qP)<h;3K|Lk000e1NJLTq000;O000;W0{{R3*Qw3Q0000#P)t-sOlfiQ
z^78KP?(_5W-QC^O)6@3$_S@Ur*4EbM=H}|^>izxw`1tta<Kye=>+kRH`T6<h=jZ0;
z=KTEp+S=Nn=rPd%000VfQchC<|NsBy|Nm9ySIx2=aR2}SWl2OqRCwBb$<YFU5DY-k
zltEb`|NpJAw`_JE@7)y9!o)`EQ1kWU5XQ0iGHCk%$A^J2GM8v10Szb6$05*%5$NL)
z(AWj~xCJy$!D<v5SQs25w92&5hlhrf27VhSz$8##_yF0I5ct=(t&#u$002ovPDHLk
FV1iH_h1LK7

diff --git a/style/Technetium/icon-moved.png b/style/Technetium/icon-moved.png
deleted file mode 100644
index 2484c2fb74a1b92d24a651e06dab9f442f22cac0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 423
zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq000;O000;W0{{R3*Qw3Q0001oP)t-sOlfhv
z)9L;G{(6|J+UN7k-tNfT?aAEjz}D--*z4!;_ulFB@Adlk`uyPQ_1x(6_4)kz{QlbK
z^X&5Z^Y{DW?DgdB_VM=m*yi$hm#UVpzJZ>v$=KuF=kC?v>C)cj$J_1G<MG$!@{p^$
zvc=Mfq_w`!+IE(yyv^6f)!xF<+@!k5f1R&ExIKRW000VfQchC<|NsA2=H^xY=3=-j
z1ONa4#Ysd#RCwBb%i9uyAQXk+$efhQEVNS56!Vzx|9rthN0X`VYP0@f^T*C6EA|e%
zb3JXp1cjrDEiMLO%RmA%FrvcA<Rkc6mijY<06NQxvtWX7hqSU}dfqjJ<ETxLaF2l}
zRx4k$*T1H~SQ151%9Os6=bN!H3{wbS!y-_c#br$?^)SbsJjVcs8Z*ZO;Ra7Nm;9z7
zgz##bl7|xnPve<4LpYeu2;yugRB-dFA$MiiJ9!}<3!=!$exr&@R$S~qd;nde9o(Is
RrJVo(002ovPDHLkV1ik#>SX``

diff --git a/style/Technetium/icon-new-sticky.png b/style/Technetium/icon-new-sticky.png
deleted file mode 100644
index e9fb5a66d2122c2bce13d1a5a0db5344d6634393..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq000;O000;W0{{R3*Qw3Q0002GP)t-sOlfgn
zg`HuBo?V2UL28pwb(ktteKTByRDPy&ld#3v?2xzGjkMXw-0i{F>b}+Ky3**(-tLsS
z+=;T-m%H7YzTTd|-=f0crNrU4(C4no<!q3um9@@;smNrBqg;cWcABzahoEDKo@9uh
zkgvz7$Kr97v6{Qrv(Dy+ro4@@(5b`Nk+#@rji`5@#)Yoae4x3EtHYzc(@J!lQF@}Y
z%HF)u<&?PDf~3EkxzK)}wZ_`(tjFJwwb%j&e<A<?019+cPE!E?|NrLZ|Nd21x`(HD
z0002wNkl<Zc-no-*OG!j5QSmaCFn-84h$nG83A+l{a?%Op1Dvc{Vt|B{TGcl+PYDp
zx9M(%`|gvSFtO<N<+m!=AsD-_nze!9Psx%bQ=fYZ|B^okYc(izBzFeRYEWQ|WvdfQ
znt(IzU*SL@j+bz9eGI-0&nk{7Sl4ESWyxTP=etlL2)OuokVip4VFGyS%Ih)WxG9W5
zWPd7lgqy+$gm@DkzAkPGLqI<)DTlZz41nWJr}-g;*Gq9z=%Iz<$ajJ3Mxp$!DKKc;
vpPG#Zp=EB1vj3ngHfF1VMKdZixW9A<42vKDVqhcx00000NkvXXu0mjf8{`1w

diff --git a/style/Technetium/icon-new.png b/style/Technetium/icon-new.png
deleted file mode 100644
index a832adb6ea00a9c3b8a3b9889599ed1a980a9b2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 324
zcmV-K0lWT*P)<h;3K|Lk000e1NJLTq000;O000;W0{{R3*Qw3Q0001QP)t-sOlfgI
zYLY5ceY(=<bd#_`Ym;-5urpkQRDPyVb(ojC-J8DNp1|Lt!r-OE;i<>stjXlC%jL7q
z=C{!2zSZf$*XoqH+{M}Kkhj{6wAskq?TE40%--&IpT<gboKbqBv&!CVjjUvarE`+7
zqrBAVwf_YG000VfQchC<=Kud!=2rey=I3`t7XSbNdPzh<RCwBb$w>l(AQS{q1r3sU
z)<ki>{~3ke$!~qjs$@rIRm5iKX41_{KbnIdb}0X`!TO>4QkYd3A4y}p2@FkOya<dZ
zf$<<P?gYk-z_=0^7Xsr<V4MhyBZ2XiDvY`kTo`%x6WZL5!gQ`)ajhwma8eaX(Kjrg
W${i?5j;Kih0000<MNUMnLSTablbYH9

diff --git a/style/Technetium/icon-nonew-sticky.png b/style/Technetium/icon-nonew-sticky.png
deleted file mode 100644
index f148013c8fb668d4e11da23747e8f33c5a001ea8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 443
zcmV;s0Yv_ZP)<h;3K|Lk000e1NJLTq000;O000;W0{{R3*Qw3Q0001oP)t-sOlfhO
zvccNt^VsI{+UN7y=kvVN>B-#f!`SQ0-tOG!^q8=~`TPBuvBCTO{+6%5_xk+v_xttv
z{Qds^l&-$%@%Y~9^vT!a<?Z(1>-FO7_2%#Q@%H+iw8QW9`qkm;#o6ra^7*E`%D~Xt
zuEWsL-R9lr@YCb*vc=Ki>F=Sq$hgYY#nj!9ad<BP000VfQchC<|NsA2R{vGz=G}Fp
zTmS$7*-1n}RCwBb$=#NMAQXn-l!mk!r!0vo6!2f|{;#jSHyos{dJb58``vu8jrl^n
zrMn4_=b5xKKM-Q}zrtb&JpEg-9K+EYs%r4x6NQr_bD;g8kUD(;CO;@BrG}?g6^2GN
z@(KqEMKQstmKbCS&$B385W#{E*5=7fZY>2Nn*8_8*b3nS&`p0JRjYARc!0J%cx8*5
z!WGnb8v}fM+!XGh%)nIRTjQp112W07G1TxT8aIUtVp6)7;o4JR`;`tuWWp5_LD+HA
lv6;^B-3Cj<7b3WS^a49l9b9{chOGbq002ovPDHLkV1liH_LBer

diff --git a/style/Technetium/icon-nonew.png b/style/Technetium/icon-nonew.png
deleted file mode 100644
index 547c760303c8485f190d9b7e49f7d7b4311cdba1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 265
zcmV+k0rvihP)<h;3K|Lk000e1NJLTq000;O000;W0{{R3*Qw3Q0000*P)t-sOlfiJ
z^7-NH_2=;S+UN7k-tN59>B-#fz}D--*z520`rGL9{r>**_xttv{N(NS_xk+t_WIuG
z^!oh%*yi%b+wIfi@diA8od5s;3UpFVQvm<}|5xV!RsQBrsWTA(003!8L_t(|+I`7M
z0)QY41VJ|<s3<D%|ECJMLB{m4YfxGYb(w{~-NVu3v#ny{D~hH7c?ly`2(pvm1TlCJ
z!wq8CKst;d9cGXY7l>g3>F|IU;x5V+T#}Gnfz_rQn{uLcsN$&0@&D-qTBH)&!htsf
P00000NkvXXu0mjftEq?d

diff --git a/style/Technetium/index.html b/style/Technetium/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/Technetium/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/Technetium/inv-shade.png b/style/Technetium/inv-shade.png
deleted file mode 100644
index eb9650b403dbe251fef9fde91bdec028d8d7be80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 117
zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol>#0(^h)Z2A|6lZ`>h^wiC2N3yW7BW6PcN!?j
zToU9L%*DbmxwnM}$d&MPaSY+Oo}6%i+lg6%iPb?xW^I&%3KN4-vgq<AnH*K18U{~S
KKbLh*2~7YhDj7on

diff --git a/style/Technetium/light-shade.png b/style/Technetium/light-shade.png
deleted file mode 100644
index cd95460c4bc0d676810bdc763a53c1862ed871d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 120
zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol>#0(^h)Z2A|6i<Lph^wiC2OKFZ_T~eMvy=q+
z1+%a-a&Ir^Zv^tiJzX3_IIbs0Y;9oVRcyY%Q1azJ^F$7Y!fds*m$vO@0V-keboFyt
I=akR{09^<iS^xk5

diff --git a/style/index.html b/style/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/view/admin/categories.php b/view/admin/categories.php
index 23929e47..c8786528 100644
--- a/view/admin/categories.php
+++ b/view/admin/categories.php
@@ -6,38 +6,38 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
-
+ 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
-	exit;
+    exit;
 }
 
 ?>
-<div class="blockform">
-	<h2><span><?php _e('Add categories head') ?></span></h2>
-	<div class="box">
-		<form method="post" action="<?php echo get_link('admin/categories/add/') ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Add categories subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Add category label') ?><div><input type="submit" value="<?php _e('Add new submit') ?>" tabindex="2" /></div></th>
-								<td>
-									<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-									<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
-									<span><?php printf(__('Add category help'), '<a href="'.get_link('admin/forums').'">'.__('Forums').'</a>') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-		</form>
-	</div>
+	<div class="blockform">
+		<h2><span><?php _e('Add categories head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo get_link('admin/categories/add/') ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Add categories subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Add category label') ?><div><input type="submit" value="<?php _e('Add new submit') ?>" tabindex="2" /></div></th>
+									<td>
+										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
+										<span><?php printf(__('Add category help'), '<a href="'.get_link('admin/forums').'">'.__('Forums').'</a>') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
 
-	<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
+<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/categories/delete') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -50,13 +50,13 @@
 									<th scope="row"><?php _e('Delete category label') ?><div><input type="submit" value="<?php _e('Delete') ?>" tabindex="4" /></div></th>
 									<td>
 										<select name="cat_to_delete" tabindex="3">
-											<?php
+<?php
 
-											foreach ($cat_list as $cur_cat) {
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.feather_escape($cur_cat['cat_name']).'</option>'."\n";
-											}
+    foreach ($cat_list as $cur_cat) {
+        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.feather_escape($cur_cat['cat_name']).'</option>'."\n";
+    }
 
-											?>
+?>
 										</select>
 										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php _e('Delete category disclaimer') ?></span>
 									</td>
@@ -67,9 +67,9 @@
 				</div>
 			</form>
 		</div>
-	<?php endif; ?>
+<?php endif; ?>
 
-	<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
+<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
 		<div class="box">
 			<form method="post" action="<?php echo get_link('admin/categories/edit/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -78,27 +78,27 @@
 						<legend><?php _e('Edit categories subhead') ?></legend>
 						<div class="infldset">
 							<table id="categoryedit">
-								<thead>
+							<thead>
 								<tr>
 									<th class="tcl" scope="col"><?php _e('Category name label') ?></th>
 									<th scope="col"><?php _e('Category position label') ?></th>
 								</tr>
-								</thead>
-								<tbody>
-								<?php
+							</thead>
+							<tbody>
+<?php
 
-								foreach ($cat_list as $cur_cat) {
-									?>
-									<tr>
-										<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo feather_escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
-										<td><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][order]" value="<?php echo $cur_cat['disp_position'] ?>" size="3" maxlength="3" /></td>
-									</tr>
-									<?php
+    foreach ($cat_list as $cur_cat) {
+        ?>
+								<tr>
+									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo feather_escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
+									<td><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][order]" value="<?php echo $cur_cat['disp_position'] ?>" size="3" maxlength="3" /></td>
+								</tr>
+<?php
 
-								}
+    }
 
-								?>
-								</tbody>
+?>
+							</tbody>
 							</table>
 							<div class="fsetsubmit"><input type="submit" value="<?php _e('Update') ?>" /></div>
 						</div>
@@ -106,6 +106,6 @@
 				</div>
 			</form>
 		</div>
-	<?php endif; ?>	</div>
-<div class="clearer"></div>
+<?php endif; ?>	</div>
+	<div class="clearer"></div>
 </div>
\ No newline at end of file
diff --git a/view/admin/forums/delete_forum.php b/view/admin/forums/delete_forum.php
index 027a03e4..6a5263ba 100644
--- a/view/admin/forums/delete_forum.php
+++ b/view/admin/forums/delete_forum.php
@@ -16,13 +16,13 @@
 	<div class="blockform">
 		<h2><span><?php _e('Confirm delete head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/forums/delete/'.$forum_id.'/') ?>">
+			<form method="post" action="<?php echo get_link('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('Confirm delete subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Confirm delete info'), $forum_name) ?></p>
+							<p><?php printf(__('Confirm delete info'), $cur_forum['forum_name']) ?></p>
 							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
 						</div>
 					</fieldset>
diff --git a/view/admin/forums/permissions.php b/view/admin/forums/permissions.php
index e6869913..df092f46 100644
--- a/view/admin/forums/permissions.php
+++ b/view/admin/forums/permissions.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Edit forum head') ?></span></h2>
 		<div class="box">
-			<form id="edit_forum" method="post" action="<?php echo get_link('admin/forums/edit/'.$forum_id.'/') ?>">
+			<form id="edit_forum" method="post" action="<?php echo get_link('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
 				<div class="inform">
@@ -36,7 +36,10 @@
 									<th scope="row"><?php _e('Category label') ?></th>
 									<td>
 										<select name="cat_id" tabindex="3">
-											<?php echo $categories_perms ?>
+											<?php  foreach ($forum_data as $cat_id => $cat_data) {
+												$selected = ($cat_id == $cur_forum['cat_id']) ? 'selected="selected"' : '';
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.feather_escape($cat_data['cat_name']).'</option>'."\n";
+											} ?>
 										</select>
 									</td>
 								</tr>
@@ -58,7 +61,7 @@
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Redirect label') ?></th>
-									<td><?php echo($cur_forum['num_topics']) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.feather_escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
+									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.feather_escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
 								</tr>
 							</table>
 						</div>
diff --git a/view/admin/groups/add_edit_group.php b/view/admin/groups/add_edit_group.php
index 9a91a65f..bc2bc244 100644
--- a/view/admin/groups/add_edit_group.php
+++ b/view/admin/groups/add_edit_group.php
@@ -6,147 +6,147 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
-
+ 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
-	exit;
+    exit;
 }
 ?>
 
-<div class="blockform">
-	<h2><span><?php _e('Group settings head') ?></span></h2>
-	<div class="box">
-		<form id="groups2" method="post" action="" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<p class="submittop"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" /></p>
-			<div class="inform">
-				<input type="hidden" name="mode" value="<?php echo $group['mode'] ?>" />
-				<?php if ($group['mode'] == 'edit'): ?>					<input type="hidden" name="group_id" value="<?php echo $id ?>" />
-				<?php endif; ?><?php if ($group['mode'] == 'add'): ?>					<input type="hidden" name="base_group" value="<?php echo $group['base_group'] ?>" />
-				<?php endif; ?>					<fieldset>
-					<legend><?php _e('Group settings subhead') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Group settings info') ?></p>
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Group title label') ?></th>
-								<td>
-									<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
-										echo feather_escape($group['info']['g_title']);
-									} ?>" tabindex="1" />
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('User title label') ?></th>
-								<td>
-									<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
-									<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
-								</td>
-							</tr>
-							<?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-								<th scope="row"><?php _e('Promote users label') ?></th>
-								<td>
-									<select name="promote_next_group" tabindex="3">
-										<option value="0"><?php _e('Disable promotion') ?></option>
-										<?php echo $group_list ?>
-									</select>
-									<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo feather_escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
-									<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
-								</td>
-							</tr>
-								<?php if ($group['mode'] != 'edit' || $feather_config['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
+	<div class="blockform">
+		<h2><span><?php _e('Group settings head') ?></span></h2>
+		<div class="box">
+			<form id="groups2" method="post" action="" onsubmit="return process_form(this)">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" /></p>
+				<div class="inform">
+					<input type="hidden" name="mode" value="<?php echo $group['mode'] ?>" />
+<?php if ($group['mode'] == 'edit'): ?>					<input type="hidden" name="group_id" value="<?php echo $id ?>" />
+<?php endif; ?><?php if ($group['mode'] == 'add'): ?>					<input type="hidden" name="base_group" value="<?php echo $group['base_group'] ?>" />
+<?php endif; ?>					<fieldset>
+						<legend><?php _e('Group settings subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Group settings info') ?></p>
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Group title label') ?></th>
+									<td>
+										<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
+    echo feather_escape($group['info']['g_title']);
+} ?>" tabindex="1" />
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('User title label') ?></th>
+									<td>
+										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
+										<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('Promote users label') ?></th>
+									<td>
+										<select name="promote_next_group" tabindex="3">
+											<option value="0"><?php _e('Disable promotion') ?></option>
+											<?php echo $group_list ?>
+										</select>
+										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo feather_escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
+										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
+									</td>
+								</tr>
+<?php if ($group['mode'] != 'edit' || $feather_config['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
 									<th scope="row"> <?php _e('Mod privileges label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
-												echo ' checked="checked"';
-											} ?> tabindex="5" />&#160;<strong><?php _e('Yes') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="5" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="moderator" value="0"<?php if ($group['info']['g_moderator'] == '0') {
-												echo ' checked="checked"';
-											} ?> tabindex="6" />&#160;<strong><?php _e('No') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="6" />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Mod privileges help') ?></span>
 									</td>
 								</tr>
-									<tr>
-										<th scope="row"><?php _e('Edit profile label') ?></th>
-										<td>
-											<label class="conl"><input type="radio" name="mod_edit_users" value="1"<?php if ($group['info']['g_mod_edit_users'] == '1') {
-													echo ' checked="checked"';
-												} ?> tabindex="7" />&#160;<strong><?php _e('Yes') ?></strong></label>
-											<label class="conl"><input type="radio" name="mod_edit_users" value="0"<?php if ($group['info']['g_mod_edit_users'] == '0') {
-													echo ' checked="checked"';
-												} ?> tabindex="8" />&#160;<strong><?php _e('No') ?></strong></label>
-											<span class="clearb"><?php _e('Edit profile help') ?></span>
-										</td>
-									</tr>
-									<tr>
-										<th scope="row"><?php _e('Rename users label') ?></th>
-										<td>
-											<label class="conl"><input type="radio" name="mod_rename_users" value="1"<?php if ($group['info']['g_mod_rename_users'] == '1') {
-													echo ' checked="checked"';
-												} ?> tabindex="9" />&#160;<strong><?php _e('Yes') ?></strong></label>
-											<label class="conl"><input type="radio" name="mod_rename_users" value="0"<?php if ($group['info']['g_mod_rename_users'] == '0') {
-													echo ' checked="checked"';
-												} ?> tabindex="10" />&#160;<strong><?php _e('No') ?></strong></label>
-											<span class="clearb"><?php _e('Rename users help') ?></span>
-										</td>
-									</tr>
-									<tr>
-										<th scope="row"><?php _e('Change passwords label') ?></th>
-										<td>
-											<label class="conl"><input type="radio" name="mod_change_passwords" value="1"<?php if ($group['info']['g_mod_change_passwords'] == '1') {
-													echo ' checked="checked"';
-												} ?> tabindex="11" />&#160;<strong><?php _e('Yes') ?></strong></label>
-											<label class="conl"><input type="radio" name="mod_change_passwords" value="0"<?php if ($group['info']['g_mod_change_passwords'] == '0') {
-													echo ' checked="checked"';
-												} ?> tabindex="12" />&#160;<strong><?php _e('No') ?></strong></label>
-											<span class="clearb"><?php _e('Change passwords help') ?></span>
-										</td>
-									</tr>
-									<tr>
-										<th scope="row"><?php _e('Mod promote users label') ?></th>
-										<td>
-											<label class="conl"><input type="radio" name="mod_promote_users" value="1"<?php if ($group['info']['g_mod_promote_users'] == '1') {
-													echo ' checked="checked"';
-												} ?> tabindex="13" />&#160;<strong><?php _e('Yes') ?></strong></label>
-											<label class="conl"><input type="radio" name="mod_promote_users" value="0"<?php if ($group['info']['g_mod_promote_users'] == '0') {
-													echo ' checked="checked"';
-												} ?> tabindex="14" />&#160;<strong><?php _e('No') ?></strong></label>
-											<span class="clearb"><?php _e('Mod promote users help') ?></span>
-										</td>
-									</tr>
-									<tr>
-										<th scope="row"><?php _e('Ban users label') ?></th>
-										<td>
-											<label class="conl"><input type="radio" name="mod_ban_users" value="1"<?php if ($group['info']['g_mod_ban_users'] == '1') {
-													echo ' checked="checked"';
-												} ?> tabindex="15" />&#160;<strong><?php _e('Yes') ?></strong></label>
-											<label class="conl"><input type="radio" name="mod_ban_users" value="0"<?php if ($group['info']['g_mod_ban_users'] == '0') {
-													echo ' checked="checked"';
-												} ?> tabindex="16" />&#160;<strong><?php _e('No') ?></strong></label>
-											<span class="clearb"><?php _e('Ban users help') ?></span>
-										</td>
-									</tr>
-								<?php endif; endif; ?>								<tr>
-								<th scope="row"><?php _e('Read board label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="read_board" value="1"<?php if ($group['info']['g_read_board'] == '1') {
-											echo ' checked="checked"';
-										} ?> tabindex="17" />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="read_board" value="0"<?php if ($group['info']['g_read_board'] == '0') {
-											echo ' checked="checked"';
-										} ?> tabindex="18" />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Read board help') ?></span>
-								</td>
-							</tr>
+								<tr>
+									<th scope="row"><?php _e('Edit profile label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_edit_users" value="1"<?php if ($group['info']['g_mod_edit_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="7" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_edit_users" value="0"<?php if ($group['info']['g_mod_edit_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="8" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Edit profile help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Rename users label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_rename_users" value="1"<?php if ($group['info']['g_mod_rename_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="9" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_rename_users" value="0"<?php if ($group['info']['g_mod_rename_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="10" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Rename users help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Change passwords label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_change_passwords" value="1"<?php if ($group['info']['g_mod_change_passwords'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="11" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_change_passwords" value="0"<?php if ($group['info']['g_mod_change_passwords'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="12" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Change passwords help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Mod promote users label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_promote_users" value="1"<?php if ($group['info']['g_mod_promote_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="13" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_promote_users" value="0"<?php if ($group['info']['g_mod_promote_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="14" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Mod promote users help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Ban users label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_ban_users" value="1"<?php if ($group['info']['g_mod_ban_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="15" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_ban_users" value="0"<?php if ($group['info']['g_mod_ban_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="16" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Ban users help') ?></span>
+									</td>
+								</tr>
+<?php endif; endif; ?>								<tr>
+									<th scope="row"><?php _e('Read board label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="read_board" value="1"<?php if ($group['info']['g_read_board'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="17" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="read_board" value="0"<?php if ($group['info']['g_read_board'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="18" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Read board help') ?></span>
+									</td>
+								</tr>
 								<tr>
 									<th scope="row"><?php _e('View user info label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="view_users" value="1"<?php if ($group['info']['g_view_users'] == '1') {
-												echo ' checked="checked"';
-											} ?> tabindex="19" />&#160;<strong><?php _e('Yes') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="19" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="view_users" value="0"<?php if ($group['info']['g_view_users'] == '0') {
-												echo ' checked="checked"';
-											} ?> tabindex="20" />&#160;<strong><?php _e('No') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="20" />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('View user info help') ?></span>
 									</td>
 								</tr>
@@ -154,11 +154,11 @@
 									<th scope="row"><?php _e('Post replies label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="post_replies" value="1"<?php if ($group['info']['g_post_replies'] == '1') {
-												echo ' checked="checked"';
-											} ?> tabindex="21" />&#160;<strong><?php _e('Yes') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="21" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="post_replies" value="0"<?php if ($group['info']['g_post_replies'] == '0') {
-												echo ' checked="checked"';
-											} ?> tabindex="22" />&#160;<strong><?php _e('No') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="22" />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Post replies help') ?></span>
 									</td>
 								</tr>
@@ -166,83 +166,83 @@
 									<th scope="row"><?php _e('Post topics label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="post_topics" value="1"<?php if ($group['info']['g_post_topics'] == '1') {
-												echo ' checked="checked"';
-											} ?> tabindex="23" />&#160;<strong><?php _e('Yes') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="23" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="post_topics" value="0"<?php if ($group['info']['g_post_topics'] == '0') {
-												echo ' checked="checked"';
-											} ?> tabindex="24" />&#160;<strong><?php _e('No') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="24" />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Post topics help') ?></span>
 									</td>
 								</tr>
-								<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
 									<th scope="row"><?php _e('Edit posts label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="edit_posts" value="1"<?php if ($group['info']['g_edit_posts'] == '1') {
-												echo ' checked="checked"';
-											} ?> tabindex="25" />&#160;<strong><?php _e('Yes') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="25" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="edit_posts" value="0"<?php if ($group['info']['g_edit_posts'] == '0') {
-												echo ' checked="checked"';
-											} ?> tabindex="26" />&#160;<strong><?php _e('No') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="26" />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Edit posts help') ?></span>
 									</td>
 								</tr>
-									<tr>
-										<th scope="row"><?php _e('Delete posts label') ?></th>
-										<td>
-											<label class="conl"><input type="radio" name="delete_posts" value="1"<?php if ($group['info']['g_delete_posts'] == '1') {
-													echo ' checked="checked"';
-												} ?> tabindex="27" />&#160;<strong><?php _e('Yes') ?></strong></label>
-											<label class="conl"><input type="radio" name="delete_posts" value="0"<?php if ($group['info']['g_delete_posts'] == '0') {
-													echo ' checked="checked"';
-												} ?> tabindex="28" />&#160;<strong><?php _e('No') ?></strong></label>
-											<span class="clearb"><?php _e('Delete posts help') ?></span>
-										</td>
-									</tr>
-									<tr>
-										<th scope="row"><?php _e('Delete topics label') ?></th>
-										<td>
-											<label class="conl"><input type="radio" name="delete_topics" value="1"<?php if ($group['info']['g_delete_topics'] == '1') {
-													echo ' checked="checked"';
-												} ?> tabindex="29" />&#160;<strong><?php _e('Yes') ?></strong></label>
-											<label class="conl"><input type="radio" name="delete_topics" value="0"<?php if ($group['info']['g_delete_topics'] == '0') {
-													echo ' checked="checked"';
-												} ?> tabindex="30" />&#160;<strong><?php _e('No') ?></strong></label>
-											<span class="clearb"><?php _e('Delete topics help') ?></span>
-										</td>
-									</tr>
-								<?php endif; ?>								<tr>
+								<tr>
+									<th scope="row"><?php _e('Delete posts label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="delete_posts" value="1"<?php if ($group['info']['g_delete_posts'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="27" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="delete_posts" value="0"<?php if ($group['info']['g_delete_posts'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="28" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Delete posts help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Delete topics label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="delete_topics" value="1"<?php if ($group['info']['g_delete_topics'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="29" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="delete_topics" value="0"<?php if ($group['info']['g_delete_topics'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="30" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Delete topics help') ?></span>
+									</td>
+								</tr>
+<?php endif; ?>								<tr>
 									<th scope="row"><?php _e('Post links label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="post_links" value="1"<?php if ($group['info']['g_post_links'] == '1') {
-												echo ' checked="checked"';
-											} ?> tabindex="31" />&#160;<strong><?php _e('Yes') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="31" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="post_links" value="0"<?php if ($group['info']['g_post_links'] == '0') {
-												echo ' checked="checked"';
-											} ?> tabindex="32" />&#160;<strong><?php _e('No') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="32" />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Post links help') ?></span>
 									</td>
 								</tr>
-								<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
 									<th scope="row"><?php _e('Set own title label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="set_title" value="1"<?php if ($group['info']['g_set_title'] == '1') {
-												echo ' checked="checked"';
-											} ?> tabindex="33" />&#160;<strong><?php _e('Yes') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="33" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="set_title" value="0"<?php if ($group['info']['g_set_title'] == '0') {
-												echo ' checked="checked"';
-											} ?> tabindex="34" />&#160;<strong><?php _e('No') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="34" />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Set own title help') ?></span>
 									</td>
 								</tr>
-								<?php endif; ?>								<tr>
+<?php endif; ?>								<tr>
 									<th scope="row"><?php _e('User search label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="search" value="1"<?php if ($group['info']['g_search'] == '1') {
-												echo ' checked="checked"';
-											} ?> tabindex="35" />&#160;<strong><?php _e('Yes') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="35" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="search" value="0"<?php if ($group['info']['g_search'] == '0') {
-												echo ' checked="checked"';
-											} ?> tabindex="36" />&#160;<strong><?php _e('No') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="36" />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('User search help') ?></span>
 									</td>
 								</tr>
@@ -250,27 +250,27 @@
 									<th scope="row"><?php _e('User list search label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="search_users" value="1"<?php if ($group['info']['g_search_users'] == '1') {
-												echo ' checked="checked"';
-											} ?> tabindex="37" />&#160;<strong><?php _e('Yes') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="37" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="search_users" value="0"<?php if ($group['info']['g_search_users'] == '0') {
-												echo ' checked="checked"';
-											} ?> tabindex="38" />&#160;<strong><?php _e('No') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="38" />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('User list search help') ?></span>
 									</td>
 								</tr>
-								<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
 									<th scope="row"><?php _e('Send e-mails label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="send_email" value="1"<?php if ($group['info']['g_send_email'] == '1') {
-												echo ' checked="checked"';
-											} ?> tabindex="39" />&#160;<strong><?php _e('Yes') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="39" />&#160;<strong><?php _e('Yes') ?></strong></label>
 										<label class="conl"><input type="radio" name="send_email" value="0"<?php if ($group['info']['g_send_email'] == '0') {
-												echo ' checked="checked"';
-											} ?> tabindex="40" />&#160;<strong><?php _e('No') ?></strong></label>
+    echo ' checked="checked"';
+} ?> tabindex="40" />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Send e-mails help') ?></span>
 									</td>
 								</tr>
-								<?php endif; ?>								<tr>
+<?php endif; ?>								<tr>
 									<th scope="row"><?php _e('Post flood label') ?></th>
 									<td>
 										<input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_post_flood'] ?>" tabindex="41" />
@@ -284,28 +284,28 @@
 										<span><?php _e('Search flood help') ?></span>
 									</td>
 								</tr>
-								<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
 									<th scope="row"><?php _e('E-mail flood label') ?></th>
 									<td>
 										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_email_flood'] ?>" tabindex="43" />
 										<span><?php _e('E-mail flood help') ?></span>
 									</td>
 								</tr>
-									<tr>
-										<th scope="row"><?php _e('Report flood label') ?></th>
-										<td>
-											<input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_report_flood'] ?>" tabindex="44" />
-											<span><?php _e('Report flood help') ?></span>
-										</td>
-									</tr>
-								<?php endif; endif; ?>							</table>
-						<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php _e('Moderator info') ?></p>
-						<?php endif; ?>						</div>
-				</fieldset>
-			</div>
-			<p class="submitend"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" tabindex="45" /></p>
-		</form>
+								<tr>
+									<th scope="row"><?php _e('Report flood label') ?></th>
+									<td>
+										<input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_report_flood'] ?>" tabindex="44" />
+										<span><?php _e('Report flood help') ?></span>
+									</td>
+								</tr>
+<?php endif; endif; ?>							</table>
+<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php _e('Moderator info') ?></p>
+<?php endif; ?>						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" tabindex="45" /></p>
+			</form>
+		</div>
 	</div>
-</div>
-<div class="clearer"></div>
+	<div class="clearer"></div>
 </div>
\ No newline at end of file
diff --git a/view/admin/groups/confirm_delete.php b/view/admin/groups/confirm_delete.php
index 94edb821..ca595ab3 100644
--- a/view/admin/groups/confirm_delete.php
+++ b/view/admin/groups/confirm_delete.php
@@ -6,31 +6,31 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
-
+ 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
-	exit;
+    exit;
 }
 ?>
 
-<div class="blockform">
-	<h2><span><?php _e('Group delete head') ?></span></h2>
-	<div class="box">
-		<form method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
+	<div class="blockform">
+		<h2><span><?php _e('Group delete head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
 				<input type="hidden" name="group_to_delete" value="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>" />
-				<fieldset>
-					<legend><?php _e('Confirm delete subhead') ?></legend>
-					<div class="infldset">
-						<p><?php printf(__('Confirm delete info'), feather_escape($group_title)) ?></p>
-						<p class="warntext"><?php _e('Confirm delete warn') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="del_group_comply" value="<?php _e('Delete') ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php _e('Go back') ?></a></p>
-		</form>
+					<fieldset>
+						<legend><?php _e('Confirm delete subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Confirm delete info'), feather_escape($group_title)) ?></p>
+							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="del_group_comply" value="<?php _e('Delete') ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
 	</div>
-</div>
-<div class="clearer"></div>
+	<div class="clearer"></div>
 </div>
\ No newline at end of file
diff --git a/view/admin/reports.php b/view/admin/reports.php
index 7b9b1e3d..63251681 100644
--- a/view/admin/reports.php
+++ b/view/admin/reports.php
@@ -6,46 +6,46 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
-
+ 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
-	exit;
+    exit;
 }
 ?>
 
-<div class="blockform">
-	<h2><span><?php _e('New reports head') ?></span></h2>
-	<div class="box">
-		<form method="post" action="<?php echo get_link('admin/reports/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<?php
-			if (!empty($report_data)) {
-				foreach ($report_data as $report) {
-					?>
-					<div class="inform">
-						<fieldset>
-							<legend><?php printf(__('Report subhead'), format_time($report['created'])) ?></legend>
-							<div class="infldset">
-								<table class="aligntop">
-									<tr>
-										<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-										<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
-												$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
-												sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
-									</tr>
-									<tr>
-										<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
-										<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
-									</tr>
-								</table>
-							</div>
-						</fieldset>
-					</div>
-					<?php
+	<div class="blockform">
+		<h2><span><?php _e('New reports head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo get_link('admin/reports/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<?php
+if (!empty($report_data)) {
+    foreach ($report_data as $report) {
+        ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php printf(__('Report subhead'), format_time($report['created'])) ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
+									<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
 
-				}
-			} else {
-				?>
+    }
+} else {
+    ?>
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('None') ?></legend>
@@ -54,48 +54,48 @@
 						</div>
 					</fieldset>
 				</div>
-				<?php
+<?php
 
-			}
+}
 
-			?>
-		</form>
+?>
+			</form>
+		</div>
 	</div>
-</div>
 
-<div class="blockform block2">
-	<h2><span><?php _e('Last 10 head') ?></span></h2>
-	<div class="box">
-		<div class="fakeform">
-			<?php
+	<div class="blockform block2">
+		<h2><span><?php _e('Last 10 head') ?></span></h2>
+		<div class="box">
+			<div class="fakeform">
+<?php
 
-			if (!empty($report_zapped_data)) {
-				foreach ($report_zapped_data as $report) {
-					?>
-					<div class="inform">
-						<fieldset>
-							<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.get_link('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
-							<div class="infldset">
-								<table class="aligntop">
-									<tr>
-										<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-										<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
-												$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
-												sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
-									</tr>
-									<tr>
-										<th scope="row"><?php _e('Reason') ?></th>
-										<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
-									</tr>
-								</table>
-							</div>
-						</fieldset>
-					</div>
-					<?php
+if (!empty($report_zapped_data)) {
+    foreach ($report_zapped_data as $report) {
+        ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.get_link('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Reason') ?></th>
+									<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
 
-				}
-			} else {
-				?>
+    }
+} else {
+    ?>
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('None') ?></legend>
@@ -104,13 +104,13 @@
 						</div>
 					</fieldset>
 				</div>
-				<?php
+<?php
 
-			}
+}
 
-			?>
+?>
+			</div>
 		</div>
 	</div>
-</div>
-<div class="clearer"></div>
+	<div class="clearer"></div>
 </div>
diff --git a/view/admin/users/find_users.php b/view/admin/users/find_users.php
index cf547cc5..d426177d 100644
--- a/view/admin/users/find_users.php
+++ b/view/admin/users/find_users.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -97,4 +97,4 @@
 		<div class="clearer"></div>
 	</div>
 </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/view/edit.php b/view/edit.php
index 2c926634..48a692e8 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
-
+ 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -17,54 +17,54 @@
 ?>
 
 <div class="linkst">
-    <div class="inbox">
-        <ul class="crumbs">
-            <li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
-            <li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
-        </ul>
-    </div>
+	<div class="inbox">
+		<ul class="crumbs">
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
+		</ul>
+	</div>
 </div>
 
 <?php
 
 // If there are errors, we display them
 if (!empty($errors)) :
-    ?>
-    <div id="posterror" class="block">
-        <h2><span><?php _e('Post errors') ?></span></h2>
-        <div class="box">
-            <div class="inbox error-info">
-                <p><?php _e('Post errors info') ?></p>
-                <ul class="error-list">
-                    <?php
-                    foreach ($errors as $cur_error) {
-                        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-                    }
-                    ?>
-                </ul>
-            </div>
-        </div>
-    </div>
-    <?php
+?>
+<div id="posterror" class="block">
+	<h2><span><?php _e('Post errors') ?></span></h2>
+	<div class="box">
+		<div class="inbox error-info">
+			<p><?php _e('Post errors info') ?></p>
+			<ul class="error-list">
+<?php
+    foreach ($errors as $cur_error) {
+        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+    }
+?>
+			</ul>
+		</div>
+	</div>
+</div>
+<?php
 elseif ($feather->request->post('preview')):
-    ?>
-    <div id="postpreview" class="blockpost">
-        <h2><span><?php _e('Post preview') ?></span></h2>
-        <div class="box">
-            <div class="inbox">
-                <div class="postbody">
-                    <div class="postright">
-                        <div class="postmsg">
-                            <?php echo $preview_message."\n" ?>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <?php
+?>
+<div id="postpreview" class="blockpost">
+	<h2><span><?php _e('Post preview') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<div class="postbody">
+				<div class="postright">
+					<div class="postmsg">
+						<?php echo $preview_message."\n" ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<?php
 endif;
 ?>
 <!-- Init BBcode editor toolbar -->
@@ -74,46 +74,46 @@
 </script>
 <script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
 <div id="editform" class="blockform">
-    <h2><span><?php _e('Edit post') ?></span></h2>
-    <div class="box">
-        <form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
-            <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-            <div class="inform">
-                <fieldset>
-                    <legend><?php _e('Edit post legend') ?></legend>
-                    <input type="hidden" name="form_sent" value="1" />
-                    <div class="infldset txtarea">
-                        <?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
-                            <input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
-                        <?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
-                            <script>postEditorToolbar('req_message');</script>
-                            <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
-                        <ul class="bblinks">
-                            <li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-                            <li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-                            <li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-                            <li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
-                        </ul>
-                    </div>
-                </fieldset>
-            </div>
-            <?php
-            if (!empty($checkboxes)):
-                ?>
-                <div class="inform">
-                    <fieldset>
-                        <legend><?php _e('Options') ?></legend>
-                        <div class="infldset">
-                            <div class="rbox">
-                                <?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
-                            </div>
-                        </div>
-                    </fieldset>
-                </div>
-                <?php
-            endif;
-            ?>
-            <p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-        </form>
-    </div>
+	<h2><span><?php _e('Edit post') ?></span></h2>
+	<div class="box">
+		<form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Edit post legend') ?></legend>
+					<input type="hidden" name="form_sent" value="1" />
+					<div class="infldset txtarea">
+<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
+<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
+						<script>postEditorToolbar('req_message');</script>
+                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
+						<ul class="bblinks">
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+						</ul>
+					</div>
+				</fieldset>
+			</div>
+<?php
+if (!empty($checkboxes)):
+?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Options') ?></legend>
+					<div class="infldset">
+						<div class="rbox">
+							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+<?php
+endif;
+?>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
 </div>
\ No newline at end of file
diff --git a/view/header.php b/view/header.php
index d9fbd687..9da121c2 100644
--- a/view/header.php
+++ b/view/header.php
@@ -12,6 +12,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php _e('lang_identifier') ?>" lang="<?php _e('lang_identifier') ?>" dir="<?php _e('lang_direction') ?>">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
 <title><?php echo generate_page_title($page_title, $p) ?></title>
 <link rel="stylesheet" type="text/css" href="<?php echo get_base_url() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
 <?php
@@ -22,42 +24,42 @@
 if (isset($required_fields)) :
     // Output JavaScript to validate form (make sure required fields are filled out)
 
-?>
-<script type="text/javascript">
-/* <![CDATA[ */
-function process_form(the_form)
-{
-	var required_fields = {
-<?php
-    // Output a JavaScript object with localised field names
-    $tpl_temp = count($required_fields);
-    foreach ($required_fields as $elem_orig => $elem_trans) {
-        echo "\t\t\"".$elem_orig.'": "'.addslashes(str_replace('&#160;', ' ', $elem_trans));
-        if (--$tpl_temp) {
-            echo "\",\n";
-        } else {
-            echo "\"\n\t};\n";
-        }
-    }
     ?>
-	if (document.all || document.getElementById)
-	{
-		for (var i = 0; i < the_form.length; ++i)
-		{
-			var elem = the_form.elements[i];
-			if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
-			{
-				alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
-				elem.focus();
-				return false;
-			}
-		}
-	}
-	return true;
-}
-/* ]]> */
-</script>
-<?php
+    <script type="text/javascript">
+        /* <![CDATA[ */
+        function process_form(the_form)
+        {
+            var required_fields = {
+                <?php
+                    // Output a JavaScript object with localised field names
+                    $tpl_temp = count($required_fields);
+                    foreach ($required_fields as $elem_orig => $elem_trans) {
+                        echo "\t\t\"".$elem_orig.'": "'.addslashes(str_replace('&#160;', ' ', $elem_trans));
+                        if (--$tpl_temp) {
+                            echo "\",\n";
+                        } else {
+                            echo "\"\n\t};\n";
+                        }
+                    }
+                    ?>
+                if (document.all || document.getElementById)
+            {
+                for (var i = 0; i < the_form.length; ++i)
+                {
+                    var elem = the_form.elements[i];
+                    if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
+                    {
+                        alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
+                        elem.focus();
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        /* ]]> */
+    </script>
+    <?php
 endif;
 if (!empty($page_head)) :
     echo implode("\n", $page_head)."\n";
@@ -65,45 +67,65 @@ function process_form(the_form)
 ?>
 </head>
 
-<body<?= $focus_element; ?>>
-
-<div id="pun<?= $active_page ?>" class="pun">
-<div class="top-box"></div>
-<div class="punwrap">
+<body id="pun<?= $active_page ?>"<?= $focus_element; ?>>
 
-<div id="brdheader" class="block">
-	<div class="box">
-		<div id="brdtitle" class="inbox">
-			<h1><a href="<?php echo get_base_url() ?>/"><?php echo feather_escape($feather_config['o_board_title']) ?></a></h1>
-			<div id="brddesc"><?php echo  $feather_config['o_board_desc'] ?></div>
-		</div>
-		<?php echo $navlinks ?>
-		<?php echo $page_info ?>
-	</div>
-</div>
+<header>
 
-<?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
-<div id="announce" class="block">
-    <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
-    <div class="box">
-        <div id="announce-block" class="inbox">
-            <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
+    <nav>
+        <div class="container">
+            <div class="phone-menu" id="phone-button">
+                <a class="button-phone"></a>
+            </div>
+            <div id="phone">
+                <?php echo $navlinks ?>
+                <div class="navbar-right">
+                    <form method="get" action="/search" class="nav-search">
+                        <input type="hidden" name="action" value="search">
+                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php _e('Search') ?>">
+                    </form>
+                </div>
+            </div>
         </div>
-    </div>
-</div>
-<?php endif; ?>
+    </nav>
 
-<?php if (isset($flash['message'])) : ?>
-<script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
-<div id="msgflash" class="block">
-    <h2><span><?php _e('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
-    <div class="box">
-        <div class="inbox">
-            <p><?php echo feather_escape($flash['message']) ?></p>
+    <div class="container">
+        <div class="container-title-status">
+            <h1 class="title-site">
+                <a href="<?php echo get_base_url() ?>" title="" class="site-name">
+                    <p><?php echo feather_escape($feather_config['o_board_title']) ?></p>
+                </a>
+                <div id="brddesc"><?php echo htmlspecialchars_decode($feather_config['o_board_desc']) ?></div>
+            </h1>
+            <div class="status-avatar">
+                <?php echo $page_info ?>
+            </div>
+            <div class="clear"></div>
         </div>
+        <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
+            <div id="announce" class="block">
+                <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
+                <div class="box">
+                    <div id="announce-block" class="inbox">
+                        <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
+                    </div>
+                </div>
+            </div>
+        <?php endif; ?>
+        <?php if (isset($flash['message'])) : ?>
+            <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
+            <div id="msgflash" class="block">
+                <h2><span><?php _e('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
+                <div class="box">
+                    <div class="inbox">
+                        <p><?php echo feather_escape($flash['message']) ?></p>
+                    </div>
+                </div>
+            </div>
+            <script type="text/javascript">fadeIn('msgflash', 0);</script>
+        <?php endif; ?>
     </div>
-</div>
-<script type="text/javascript">fadeIn('msgflash', 0);</script>
-<?php endif; ?>
 
-<div id="brdmain">
+</header>
+
+<section class="container">
+    <div id="brdmain">
diff --git a/style/FeatherBB/view/install.php b/view/install.php
similarity index 100%
rename from style/FeatherBB/view/install.php
rename to view/install.php

From f5e9f2b32ea9c1809d074f42a471cab8c431319a Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 22 Aug 2015 21:24:29 +0200
Subject: [PATCH 126/353] Clean up things, again

---
 .htaccess                                     |   1 +
 .htaccess.dist                                |   1 +
 Slim/Extras/Middleware/FeatherBBAuth.php      |   1 +
 style/FeatherBB/view/admin/bans/add_ban.php   |  96 ++
 .../FeatherBB/view/admin/bans/admin_bans.php  | 102 +++
 style/FeatherBB/view/admin/bans/index.html    |   1 +
 .../FeatherBB/view/admin/bans/search_ban.php  |  87 ++
 style/FeatherBB/view/admin/categories.php     | 111 +++
 style/FeatherBB/view/admin/censoring.php      |  84 ++
 .../view/admin/forums/admin_forums.php        | 114 +++
 .../view/admin/forums/delete_forum.php        |  35 +
 style/FeatherBB/view/admin/forums/index.html  |   1 +
 .../view/admin/forums/permissions.php         | 137 +++
 .../view/admin/groups/add_edit_group.php      | 311 +++++++
 .../view/admin/groups/admin_groups.php        | 110 +++
 .../view/admin/groups/confirm_delete.php      |  36 +
 .../view/admin/groups/delete_group.php        |  39 +
 style/FeatherBB/view/admin/index.html         |   1 +
 style/FeatherBB/view/admin/index.php          |  63 ++
 style/FeatherBB/view/admin/loader.php         |  17 +
 .../admin/maintenance/admin_maintenance.php   |  99 ++
 .../view/admin/maintenance/index.html         |   1 +
 .../view/admin/maintenance/prune.php          |  39 +
 .../view/admin/maintenance/rebuild.php        |  38 +
 style/FeatherBB/view/admin/menu.php           | 112 +++
 style/FeatherBB/view/admin/options.php        | 849 ++++++++++++++++++
 style/FeatherBB/view/admin/parser.php         | 299 ++++++
 style/FeatherBB/view/admin/permissions.php    | 189 ++++
 style/FeatherBB/view/admin/reports.php        | 116 +++
 style/FeatherBB/view/admin/statistics.php     |  42 +
 .../view/admin/users/admin_users.php          | 172 ++++
 .../FeatherBB/view/admin/users/ban_users.php  |  58 ++
 .../view/admin/users/delete_users.php         |  39 +
 .../FeatherBB/view/admin/users/find_users.php | 100 +++
 .../FeatherBB/view/admin/users/move_users.php |  47 +
 .../FeatherBB/view/admin/users/search_ip.php  |  79 ++
 .../FeatherBB/view/admin/users/show_users.php | 100 +++
 style/FeatherBB/view/delete.php               |  64 ++
 style/FeatherBB/view/edit.php                 | 119 +++
 style/FeatherBB/view/footer.php               | 147 +++
 style/FeatherBB/view/header.php               | 131 +++
 style/FeatherBB/view/help.php                 | 141 +++
 style/FeatherBB/view/index.html               |   1 +
 style/FeatherBB/view/index.php                | 111 +++
 style/FeatherBB/view/install.php              | 222 +++++
 style/FeatherBB/view/login/form.php           |  42 +
 style/FeatherBB/view/login/index.html         |   1 +
 .../view/login/password_forgotten.php         |  57 ++
 style/FeatherBB/view/message.php              |  25 +
 style/FeatherBB/view/misc/email.php           |  37 +
 style/FeatherBB/view/misc/index.html          |   1 +
 style/FeatherBB/view/misc/report.php          |  44 +
 style/FeatherBB/view/misc/rules.php           |  23 +
 .../FeatherBB/view/moderate/delete_posts.php  |  33 +
 .../FeatherBB/view/moderate/delete_topics.php |  34 +
 style/FeatherBB/view/moderate/index.html      |   1 +
 .../FeatherBB/view/moderate/merge_topics.php  |  36 +
 .../view/moderate/moderator_forum.php         | 101 +++
 style/FeatherBB/view/moderate/move_topics.php |  44 +
 style/FeatherBB/view/moderate/posts_view.php  |  95 ++
 style/FeatherBB/view/moderate/split_posts.php |  40 +
 style/FeatherBB/view/post.php                 | 213 +++++
 style/FeatherBB/view/profile/change_mail.php  |  35 +
 style/FeatherBB/view/profile/change_pass.php  |  39 +
 style/FeatherBB/view/profile/delete_user.php  |  36 +
 style/FeatherBB/view/profile/index.html       |   1 +
 style/FeatherBB/view/profile/menu.php         |  55 ++
 .../FeatherBB/view/profile/section_admin.php  |  87 ++
 .../view/profile/section_display.php          | 101 +++
 .../view/profile/section_essentials.php       | 258 ++++++
 .../view/profile/section_messaging.php        |  39 +
 .../view/profile/section_personal.php         |  39 +
 .../view/profile/section_personality.php      |  56 ++
 .../view/profile/section_privacy.php          |  62 ++
 .../FeatherBB/view/profile/upload_avatar.php  |  35 +
 style/FeatherBB/view/profile/view_profile.php |  66 ++
 style/FeatherBB/view/register/email.php       |  39 +
 style/FeatherBB/view/register/form.php        | 134 +++
 style/FeatherBB/view/register/index.html      |   1 +
 style/FeatherBB/view/register/rules.php       |  32 +
 style/FeatherBB/view/search/footer.php        |  40 +
 style/FeatherBB/view/search/form.php          |  79 ++
 style/FeatherBB/view/search/header.php        |  48 +
 style/FeatherBB/view/search/index.html        |   1 +
 style/FeatherBB/view/search/posts.php         |  56 ++
 style/FeatherBB/view/search/topics.php        |  29 +
 style/FeatherBB/view/userlist.php             | 115 +++
 style/FeatherBB/view/viewforum.php            | 100 +++
 style/FeatherBB/view/viewtopic.php            | 204 +++++
 89 files changed, 7277 insertions(+)
 create mode 100644 style/FeatherBB/view/admin/bans/add_ban.php
 create mode 100644 style/FeatherBB/view/admin/bans/admin_bans.php
 create mode 100644 style/FeatherBB/view/admin/bans/index.html
 create mode 100644 style/FeatherBB/view/admin/bans/search_ban.php
 create mode 100644 style/FeatherBB/view/admin/categories.php
 create mode 100644 style/FeatherBB/view/admin/censoring.php
 create mode 100644 style/FeatherBB/view/admin/forums/admin_forums.php
 create mode 100644 style/FeatherBB/view/admin/forums/delete_forum.php
 create mode 100644 style/FeatherBB/view/admin/forums/index.html
 create mode 100644 style/FeatherBB/view/admin/forums/permissions.php
 create mode 100644 style/FeatherBB/view/admin/groups/add_edit_group.php
 create mode 100644 style/FeatherBB/view/admin/groups/admin_groups.php
 create mode 100644 style/FeatherBB/view/admin/groups/confirm_delete.php
 create mode 100644 style/FeatherBB/view/admin/groups/delete_group.php
 create mode 100644 style/FeatherBB/view/admin/index.html
 create mode 100644 style/FeatherBB/view/admin/index.php
 create mode 100644 style/FeatherBB/view/admin/loader.php
 create mode 100644 style/FeatherBB/view/admin/maintenance/admin_maintenance.php
 create mode 100644 style/FeatherBB/view/admin/maintenance/index.html
 create mode 100644 style/FeatherBB/view/admin/maintenance/prune.php
 create mode 100644 style/FeatherBB/view/admin/maintenance/rebuild.php
 create mode 100644 style/FeatherBB/view/admin/menu.php
 create mode 100644 style/FeatherBB/view/admin/options.php
 create mode 100644 style/FeatherBB/view/admin/parser.php
 create mode 100644 style/FeatherBB/view/admin/permissions.php
 create mode 100644 style/FeatherBB/view/admin/reports.php
 create mode 100644 style/FeatherBB/view/admin/statistics.php
 create mode 100644 style/FeatherBB/view/admin/users/admin_users.php
 create mode 100644 style/FeatherBB/view/admin/users/ban_users.php
 create mode 100644 style/FeatherBB/view/admin/users/delete_users.php
 create mode 100644 style/FeatherBB/view/admin/users/find_users.php
 create mode 100644 style/FeatherBB/view/admin/users/move_users.php
 create mode 100644 style/FeatherBB/view/admin/users/search_ip.php
 create mode 100644 style/FeatherBB/view/admin/users/show_users.php
 create mode 100644 style/FeatherBB/view/delete.php
 create mode 100644 style/FeatherBB/view/edit.php
 create mode 100644 style/FeatherBB/view/footer.php
 create mode 100644 style/FeatherBB/view/header.php
 create mode 100644 style/FeatherBB/view/help.php
 create mode 100644 style/FeatherBB/view/index.html
 create mode 100644 style/FeatherBB/view/index.php
 create mode 100644 style/FeatherBB/view/install.php
 create mode 100644 style/FeatherBB/view/login/form.php
 create mode 100644 style/FeatherBB/view/login/index.html
 create mode 100644 style/FeatherBB/view/login/password_forgotten.php
 create mode 100644 style/FeatherBB/view/message.php
 create mode 100644 style/FeatherBB/view/misc/email.php
 create mode 100644 style/FeatherBB/view/misc/index.html
 create mode 100644 style/FeatherBB/view/misc/report.php
 create mode 100644 style/FeatherBB/view/misc/rules.php
 create mode 100644 style/FeatherBB/view/moderate/delete_posts.php
 create mode 100644 style/FeatherBB/view/moderate/delete_topics.php
 create mode 100644 style/FeatherBB/view/moderate/index.html
 create mode 100644 style/FeatherBB/view/moderate/merge_topics.php
 create mode 100644 style/FeatherBB/view/moderate/moderator_forum.php
 create mode 100644 style/FeatherBB/view/moderate/move_topics.php
 create mode 100644 style/FeatherBB/view/moderate/posts_view.php
 create mode 100644 style/FeatherBB/view/moderate/split_posts.php
 create mode 100644 style/FeatherBB/view/post.php
 create mode 100644 style/FeatherBB/view/profile/change_mail.php
 create mode 100644 style/FeatherBB/view/profile/change_pass.php
 create mode 100644 style/FeatherBB/view/profile/delete_user.php
 create mode 100644 style/FeatherBB/view/profile/index.html
 create mode 100644 style/FeatherBB/view/profile/menu.php
 create mode 100644 style/FeatherBB/view/profile/section_admin.php
 create mode 100644 style/FeatherBB/view/profile/section_display.php
 create mode 100644 style/FeatherBB/view/profile/section_essentials.php
 create mode 100644 style/FeatherBB/view/profile/section_messaging.php
 create mode 100644 style/FeatherBB/view/profile/section_personal.php
 create mode 100644 style/FeatherBB/view/profile/section_personality.php
 create mode 100644 style/FeatherBB/view/profile/section_privacy.php
 create mode 100644 style/FeatherBB/view/profile/upload_avatar.php
 create mode 100644 style/FeatherBB/view/profile/view_profile.php
 create mode 100644 style/FeatherBB/view/register/email.php
 create mode 100644 style/FeatherBB/view/register/form.php
 create mode 100644 style/FeatherBB/view/register/index.html
 create mode 100644 style/FeatherBB/view/register/rules.php
 create mode 100644 style/FeatherBB/view/search/footer.php
 create mode 100644 style/FeatherBB/view/search/form.php
 create mode 100644 style/FeatherBB/view/search/header.php
 create mode 100644 style/FeatherBB/view/search/index.html
 create mode 100644 style/FeatherBB/view/search/posts.php
 create mode 100644 style/FeatherBB/view/search/topics.php
 create mode 100644 style/FeatherBB/view/userlist.php
 create mode 100644 style/FeatherBB/view/viewforum.php
 create mode 100644 style/FeatherBB/view/viewtopic.php

diff --git a/.htaccess b/.htaccess
index 51c6beec..33353df3 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,3 +1,4 @@
 RewriteEngine On
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^ index.php [QSA,L]
+Options -Indexes
diff --git a/.htaccess.dist b/.htaccess.dist
index 51c6beec..33353df3 100644
--- a/.htaccess.dist
+++ b/.htaccess.dist
@@ -1,3 +1,4 @@
 RewriteEngine On
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^ index.php [QSA,L]
+Options -Indexes
diff --git a/Slim/Extras/Middleware/FeatherBBAuth.php b/Slim/Extras/Middleware/FeatherBBAuth.php
index 20f124e9..fec39fa0 100644
--- a/Slim/Extras/Middleware/FeatherBBAuth.php
+++ b/Slim/Extras/Middleware/FeatherBBAuth.php
@@ -291,6 +291,7 @@ public function call()
 
         // Configure Slim
         $this->app->config('templates.path', $this->app->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
+        var_dump($this->app->view->getTemplatePathname('header.php'));
         $this->next->call();
     }
 }
diff --git a/style/FeatherBB/view/admin/bans/add_ban.php b/style/FeatherBB/view/admin/bans/add_ban.php
new file mode 100644
index 00000000..8170a2a9
--- /dev/null
+++ b/style/FeatherBB/view/admin/bans/add_ban.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+	exit;
+}
+?>
+
+<div class="blockform">
+	<h2><span><?php _e('Ban advanced head') ?></span></h2>
+	<div class="box">
+		<form id="bans2" method="post" action="">
+			<div class="inform">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<input type="hidden" name="mode" value="<?php echo $ban['mode'] ?>" />
+				<?php if ($ban['mode'] == 'edit'): ?>				<input type="hidden" name="ban_id" value="<?php echo $ban['id'] ?>" />
+				<?php endif; ?>
+				<?php if ($ban['mode'] == 'add' && isset($ban['user_id'])): ?><input type="hidden" name="ban_user_id" value="<?php echo $ban['user_id'] ?>" />
+				<?php endif; ?><fieldset>
+					<legend><?php _e('Ban advanced subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Username label') ?></th>
+								<td>
+									<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
+										echo feather_escape($ban['ban_user']);
+									} ?>" tabindex="1" />
+									<span><?php _e('Username help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('IP label') ?></th>
+								<td>
+									<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
+										echo feather_escape($ban['ip']);
+									} ?>" tabindex="2" />
+										<span><?php _e('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
+												printf(' '.__('IP help link'), '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.__('here').'</a>');
+											} ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('E-mail label') ?></th>
+								<td>
+									<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
+										echo feather_escape($ban['email']);
+									} ?>" tabindex="3" />
+									<span><?php _e('E-mail help') ?></span>
+								</td>
+							</tr>
+						</table>
+						<p class="topspace"><strong class="warntext"><?php _e('Ban IP range info') ?></strong></p>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Message expiry subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Ban message label') ?></th>
+								<td>
+									<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
+										echo feather_escape($ban['message']);
+									} ?>" tabindex="4" />
+									<span><?php _e('Ban message help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Expire date label') ?></th>
+								<td>
+									<input type="text" name="ban_expire" size="17" maxlength="10" value="<?php if (isset($ban['expire'])) {
+										echo $ban['expire'];
+									} ?>" tabindex="5" />
+									<span><?php _e('Expire date help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php _e('Save') ?>" tabindex="6" /></p>
+		</form>
+	</div>
+</div>
+<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/bans/admin_bans.php b/style/FeatherBB/view/admin/bans/admin_bans.php
new file mode 100644
index 00000000..3d714e7f
--- /dev/null
+++ b/style/FeatherBB/view/admin/bans/admin_bans.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('New ban head') ?></span></h2>
+		<div class="box">
+			<form id="bans" method="post" action="<?php echo get_link('admin/bans/add/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Add ban subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Username label') ?><div><input type="submit" name="add_ban" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
+									<td>
+										<input type="text" name="new_ban_user" size="25" maxlength="25" tabindex="1" />
+										<span><?php _e('Username advanced help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+
+		<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
+		<div class="box">
+			<form id="find_bans" method="get" action="<?php echo get_link('admin/bans/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Ban search subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Ban search info') ?></p>
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Username label') ?></th>
+									<td><input type="text" name="username" size="30" maxlength="25" tabindex="4" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('IP label') ?></th>
+									<td><input type="text" name="ip" size="30" maxlength="255" tabindex="5" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('E-mail label') ?></th>
+									<td><input type="text" name="email" size="30" maxlength="80" tabindex="6" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Message label') ?></th>
+									<td><input type="text" name="message" size="30" maxlength="255" tabindex="7" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Expire after label') ?></th>
+									<td><input type="text" name="expire_after" size="10" maxlength="10" tabindex="8" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Expire before label') ?></th>
+									<td><input type="text" name="expire_before" size="10" maxlength="10" tabindex="9" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Order by label') ?></th>
+									<td>
+										<select name="order_by" tabindex="10">
+											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
+											<option value="ip"><?php _e('Order by ip') ?></option>
+											<option value="email"><?php _e('Order by e-mail') ?></option>
+											<option value="expire"><?php _e('Order by expire') ?></option>
+										</select>
+                                        &#160;&#160;&#160;
+                                        <select name="direction" tabindex="11">
+											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
+											<option value="DESC"><?php _e('Descending') ?></option>
+										</select>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="12" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/bans/index.html b/style/FeatherBB/view/admin/bans/index.html
new file mode 100644
index 00000000..89337b2f
--- /dev/null
+++ b/style/FeatherBB/view/admin/bans/index.html
@@ -0,0 +1 @@
+<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/admin/bans/search_ban.php b/style/FeatherBB/view/admin/bans/search_ban.php
new file mode 100644
index 00000000..0d057182
--- /dev/null
+++ b/style/FeatherBB/view/admin/bans/search_ban.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+
+<div id="bans1" class="blocktable">
+	<h2><span><?php _e('Results head') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results IP address head') ?></th>
+					<th class="tc4" scope="col"><?php _e('Results expire head') ?></th>
+					<th class="tc5" scope="col"><?php _e('Results message head') ?></th>
+					<th class="tc6" scope="col"><?php _e('Results banned by head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+
+        foreach ($ban_data as $cur_ban) {
+            ?>
+				<tr>
+					<td class="tcl"><?php echo($cur_ban['username'] != '') ? feather_escape($cur_ban['username']) : '&#160;' ?></td>
+					<td class="tc2"><?php echo($cur_ban['email'] != '') ? feather_escape($cur_ban['email']) : '&#160;' ?></td>
+					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? feather_escape($cur_ban['ip']) : '&#160;' ?></td>
+					<td class="tc4"><?php echo format_time($cur_ban['expire'], true) ?></td>
+					<td class="tc5"><?php echo($cur_ban['message'] != '') ? feather_escape($cur_ban['message']) : '&#160;' ?></td>
+					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.get_link('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
+					<td class="tcr"><?php echo '<a href="'.get_link('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.get_link('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
+				</tr>
+<?php
+
+        }
+        if (empty($ban_data)) {
+            echo "\t\t\t\t".'<tr><td class="tcl" colspan="7">'.__('No match').'</td></tr>'."\n";
+        }
+
+?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+        <ul class="crumbs">
+            <li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+            <li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+            <li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+        </ul>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/categories.php b/style/FeatherBB/view/admin/categories.php
new file mode 100644
index 00000000..c8786528
--- /dev/null
+++ b/style/FeatherBB/view/admin/categories.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+	<div class="blockform">
+		<h2><span><?php _e('Add categories head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo get_link('admin/categories/add/') ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Add categories subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Add category label') ?><div><input type="submit" value="<?php _e('Add new submit') ?>" tabindex="2" /></div></th>
+									<td>
+										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
+										<span><?php printf(__('Add category help'), '<a href="'.get_link('admin/forums').'">'.__('Forums').'</a>') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+
+<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo get_link('admin/categories/delete') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Delete categories subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Delete category label') ?><div><input type="submit" value="<?php _e('Delete') ?>" tabindex="4" /></div></th>
+									<td>
+										<select name="cat_to_delete" tabindex="3">
+<?php
+
+    foreach ($cat_list as $cur_cat) {
+        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.feather_escape($cur_cat['cat_name']).'</option>'."\n";
+    }
+
+?>
+										</select>
+										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php _e('Delete category disclaimer') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+<?php endif; ?>
+
+<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo get_link('admin/categories/edit/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Edit categories subhead') ?></legend>
+						<div class="infldset">
+							<table id="categoryedit">
+							<thead>
+								<tr>
+									<th class="tcl" scope="col"><?php _e('Category name label') ?></th>
+									<th scope="col"><?php _e('Category position label') ?></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+
+    foreach ($cat_list as $cur_cat) {
+        ?>
+								<tr>
+									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo feather_escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
+									<td><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][order]" value="<?php echo $cur_cat['disp_position'] ?>" size="3" maxlength="3" /></td>
+								</tr>
+<?php
+
+    }
+
+?>
+							</tbody>
+							</table>
+							<div class="fsetsubmit"><input type="submit" value="<?php _e('Update') ?>" /></div>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+<?php endif; ?>	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/censoring.php b/style/FeatherBB/view/admin/censoring.php
new file mode 100644
index 00000000..71c253f7
--- /dev/null
+++ b/style/FeatherBB/view/admin/censoring.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Censoring head') ?></span></h2>
+		<div class="box">
+			<form id="censoring" method="post" action="<?php echo get_link('admin/censoring/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Add word subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Add word info').' '.($feather_config['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
+							<table>
+							<thead>
+								<tr>
+									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
+									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
+									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
+								</tr>
+							</thead>
+							<tbody>
+								<tr>
+									<td class="tcl"><input type="text" name="new_search_for" size="24" maxlength="60" tabindex="1" /></td>
+									<td class="tc2"><input type="text" name="new_replace_with" size="24" maxlength="60" tabindex="2" /></td>
+									<td><input type="submit" name="add_word" value="<?php _e('Add') ?>" tabindex="3" /></td>
+								</tr>
+							</tbody>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Edit remove subhead') ?></legend>
+						<div class="infldset">
+<?php
+if (!empty($word_data)) {
+    ?>
+							<table>
+							<thead>
+								<tr>
+									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
+									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
+									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+
+    foreach ($word_data as $word) {
+        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.feather_escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.feather_escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
+    }
+
+    ?>
+							</tbody>
+							</table>
+<?php
+
+} else {
+    echo "\t\t\t\t\t\t\t".'<p>'.__('No words in list').'</p>'."\n";
+}
+
+?>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/forums/admin_forums.php b/style/FeatherBB/view/admin/forums/admin_forums.php
new file mode 100644
index 00000000..e966e6f5
--- /dev/null
+++ b/style/FeatherBB/view/admin/forums/admin_forums.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Add forum head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo get_link('admin/forums/add') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<?php
+if (!empty($cat_list)) {
+    ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Create new subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Add forum label') ?><div><input type="submit" value="<?php _e('Add forum') ?>" tabindex="2" /></div></th>
+									<td>
+										<select name="cat" tabindex="1">
+											<?php  foreach ($cat_list as $cat) {
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.feather_escape($cat['cat_name']).'</option>'."\n";
+											} ?>
+										</select>
+										<span><?php _e('Add forum help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+} else {
+    ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('None') ?></legend>
+						<div class="infldset">
+							<p><?php _e('No categories exist') ?></p>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+}
+
+?>
+			</form>
+		</div>
+<?php
+if (!empty($forum_data)) {
+    ?>
+		<h2 class="block2"><span><?php _e('Manage forums head') ?></span></h2>
+		<div class="box">
+			<form id="edforum" method="post" action="<?php echo get_link('admin/forums/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
+<?php
+    foreach ($forum_data as $cat_id => $cat_data) {
+            ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Category subhead') ?> <?php echo feather_escape($cat_data['cat_name']) ?></legend>
+						<div class="infldset">
+							<table>
+							<thead>
+								<tr>
+									<th class="tcl"><?php _e('Action') ?></th>
+									<th class="tc2"><?php _e('Position label') ?></th>
+									<th class="tcr"><?php _e('Forum label') ?></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+	foreach ($cat_data['cat_forums'] as $forum) {
+        ?>
+								<tr>
+									<td class="tcl"><a href="<?php echo get_link('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo get_link('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
+									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
+									<td class="tcr"><strong><?php echo feather_escape($forum['forum_name']) ?></strong></td>
+								</tr>
+<?php
+    }
+    ?>
+							</tbody>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
+	}
+?>
+				<p class="submitend"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
+<?php
+	}
+?>
diff --git a/style/FeatherBB/view/admin/forums/delete_forum.php b/style/FeatherBB/view/admin/forums/delete_forum.php
new file mode 100644
index 00000000..6a5263ba
--- /dev/null
+++ b/style/FeatherBB/view/admin/forums/delete_forum.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Confirm delete head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo get_link('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Confirm delete subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Confirm delete info'), $cur_forum['forum_name']) ?></p>
+							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="del_forum_comply" value="<?php _e('Delete') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/forums/index.html b/style/FeatherBB/view/admin/forums/index.html
new file mode 100644
index 00000000..89337b2f
--- /dev/null
+++ b/style/FeatherBB/view/admin/forums/index.html
@@ -0,0 +1 @@
+<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/admin/forums/permissions.php b/style/FeatherBB/view/admin/forums/permissions.php
new file mode 100644
index 00000000..df092f46
--- /dev/null
+++ b/style/FeatherBB/view/admin/forums/permissions.php
@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Edit forum head') ?></span></h2>
+		<div class="box">
+			<form id="edit_forum" method="post" action="<?php echo get_link('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Edit details subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Forum name label') ?></th>
+									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo feather_escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Forum description label') ?></th>
+									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo feather_escape($cur_forum['forum_desc']) ?></textarea></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Category label') ?></th>
+									<td>
+										<select name="cat_id" tabindex="3">
+											<?php  foreach ($forum_data as $cat_id => $cat_data) {
+												$selected = ($cat_id == $cur_forum['cat_id']) ? 'selected="selected"' : '';
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.feather_escape($cat_data['cat_name']).'</option>'."\n";
+											} ?>
+										</select>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Sort by label') ?></th>
+									<td>
+										<select name="sort_by" tabindex="4">
+											<option value="0"<?php if ($cur_forum['sort_by'] == '0') {
+    echo ' selected="selected"';
+} ?>><?php _e('Last post') ?></option>
+											<option value="1"<?php if ($cur_forum['sort_by'] == '1') {
+    echo ' selected="selected"';
+} ?>><?php _e('Topic start') ?></option>
+											<option value="2"<?php if ($cur_forum['sort_by'] == '2') {
+    echo ' selected="selected"';
+} ?>><?php _e('Subject') ?></option>
+										</select>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Redirect label') ?></th>
+									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.feather_escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Group permissions subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Group permissions info'), '<a href="admin_groups.php">'.__('User groups').'</a>') ?></p>
+							<table id="forumperms">
+							<thead>
+								<tr>
+									<th class="atcl">&#160;</th>
+									<th><?php _e('Read forum label') ?></th>
+									<th><?php _e('Post replies label') ?></th>
+									<th><?php _e('Post topics label') ?></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+    foreach ($perm_data as $perm) {
+        ?>
+								<tr>
+									<th class="atcl"><?php echo feather_escape($perm['g_title']) ?></th>
+									<td<?php if (!$perm['read_forum_def']) {
+    echo ' class="nodefault"';
+}
+        ?>>
+										<input type="hidden" name="read_forum_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['read_forum']) ? '1' : '0';
+        ?>" />
+										<input type="checkbox" name="read_forum_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['read_forum']) ? ' checked="checked"' : '';
+        ?><?php echo($perm['g_read_board'] == '0') ? ' disabled="disabled"' : '';
+        ?> tabindex="<?php echo $cur_index++ ?>" />
+									</td>
+									<td<?php if (!$perm['post_replies_def'] && $cur_forum['redirect_url'] == '') {
+    echo ' class="nodefault"';
+}
+        ?>>
+										<input type="hidden" name="post_replies_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['post_replies']) ? '1' : '0';
+        ?>" />
+										<input type="checkbox" name="post_replies_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['post_replies']) ? ' checked="checked"' : '';
+        ?><?php echo($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : '';
+        ?> tabindex="<?php echo $cur_index++ ?>" />
+									</td>
+									<td<?php if (!$perm['post_topics_def'] && $cur_forum['redirect_url'] == '') {
+    echo ' class="nodefault"';
+}
+        ?>>
+										<input type="hidden" name="post_topics_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['post_topics']) ? '1' : '0';
+        ?>" />
+										<input type="checkbox" name="post_topics_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['post_topics']) ? ' checked="checked"' : '';
+        ?><?php echo($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : '';
+        ?> tabindex="<?php echo $cur_index++ ?>" />
+									</td>
+								</tr>
+<?php
+
+    }
+
+?>
+							</tbody>
+							</table>
+							<div class="fsetsubmit"><input type="submit" name="revert_perms" value="<?php _e('Revert to default') ?>" tabindex="<?php echo $cur_index++ ?>" /></div>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/groups/add_edit_group.php b/style/FeatherBB/view/admin/groups/add_edit_group.php
new file mode 100644
index 00000000..bc2bc244
--- /dev/null
+++ b/style/FeatherBB/view/admin/groups/add_edit_group.php
@@ -0,0 +1,311 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Group settings head') ?></span></h2>
+		<div class="box">
+			<form id="groups2" method="post" action="" onsubmit="return process_form(this)">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" /></p>
+				<div class="inform">
+					<input type="hidden" name="mode" value="<?php echo $group['mode'] ?>" />
+<?php if ($group['mode'] == 'edit'): ?>					<input type="hidden" name="group_id" value="<?php echo $id ?>" />
+<?php endif; ?><?php if ($group['mode'] == 'add'): ?>					<input type="hidden" name="base_group" value="<?php echo $group['base_group'] ?>" />
+<?php endif; ?>					<fieldset>
+						<legend><?php _e('Group settings subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Group settings info') ?></p>
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Group title label') ?></th>
+									<td>
+										<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
+    echo feather_escape($group['info']['g_title']);
+} ?>" tabindex="1" />
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('User title label') ?></th>
+									<td>
+										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
+										<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('Promote users label') ?></th>
+									<td>
+										<select name="promote_next_group" tabindex="3">
+											<option value="0"><?php _e('Disable promotion') ?></option>
+											<?php echo $group_list ?>
+										</select>
+										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo feather_escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
+										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
+									</td>
+								</tr>
+<?php if ($group['mode'] != 'edit' || $feather_config['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
+									<th scope="row"> <?php _e('Mod privileges label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="5" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="moderator" value="0"<?php if ($group['info']['g_moderator'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="6" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Mod privileges help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Edit profile label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_edit_users" value="1"<?php if ($group['info']['g_mod_edit_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="7" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_edit_users" value="0"<?php if ($group['info']['g_mod_edit_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="8" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Edit profile help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Rename users label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_rename_users" value="1"<?php if ($group['info']['g_mod_rename_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="9" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_rename_users" value="0"<?php if ($group['info']['g_mod_rename_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="10" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Rename users help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Change passwords label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_change_passwords" value="1"<?php if ($group['info']['g_mod_change_passwords'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="11" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_change_passwords" value="0"<?php if ($group['info']['g_mod_change_passwords'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="12" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Change passwords help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Mod promote users label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_promote_users" value="1"<?php if ($group['info']['g_mod_promote_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="13" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_promote_users" value="0"<?php if ($group['info']['g_mod_promote_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="14" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Mod promote users help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Ban users label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_ban_users" value="1"<?php if ($group['info']['g_mod_ban_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="15" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_ban_users" value="0"<?php if ($group['info']['g_mod_ban_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="16" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Ban users help') ?></span>
+									</td>
+								</tr>
+<?php endif; endif; ?>								<tr>
+									<th scope="row"><?php _e('Read board label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="read_board" value="1"<?php if ($group['info']['g_read_board'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="17" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="read_board" value="0"<?php if ($group['info']['g_read_board'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="18" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Read board help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('View user info label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="view_users" value="1"<?php if ($group['info']['g_view_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="19" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="view_users" value="0"<?php if ($group['info']['g_view_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="20" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('View user info help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Post replies label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="post_replies" value="1"<?php if ($group['info']['g_post_replies'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="21" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="post_replies" value="0"<?php if ($group['info']['g_post_replies'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="22" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post replies help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Post topics label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="post_topics" value="1"<?php if ($group['info']['g_post_topics'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="23" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="post_topics" value="0"<?php if ($group['info']['g_post_topics'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="24" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post topics help') ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('Edit posts label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="edit_posts" value="1"<?php if ($group['info']['g_edit_posts'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="25" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="edit_posts" value="0"<?php if ($group['info']['g_edit_posts'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="26" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Edit posts help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Delete posts label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="delete_posts" value="1"<?php if ($group['info']['g_delete_posts'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="27" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="delete_posts" value="0"<?php if ($group['info']['g_delete_posts'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="28" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Delete posts help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Delete topics label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="delete_topics" value="1"<?php if ($group['info']['g_delete_topics'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="29" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="delete_topics" value="0"<?php if ($group['info']['g_delete_topics'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="30" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Delete topics help') ?></span>
+									</td>
+								</tr>
+<?php endif; ?>								<tr>
+									<th scope="row"><?php _e('Post links label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="post_links" value="1"<?php if ($group['info']['g_post_links'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="31" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="post_links" value="0"<?php if ($group['info']['g_post_links'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="32" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post links help') ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('Set own title label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="set_title" value="1"<?php if ($group['info']['g_set_title'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="33" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="set_title" value="0"<?php if ($group['info']['g_set_title'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="34" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Set own title help') ?></span>
+									</td>
+								</tr>
+<?php endif; ?>								<tr>
+									<th scope="row"><?php _e('User search label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="search" value="1"<?php if ($group['info']['g_search'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="35" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="search" value="0"<?php if ($group['info']['g_search'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="36" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('User search help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('User list search label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="search_users" value="1"<?php if ($group['info']['g_search_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="37" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="search_users" value="0"<?php if ($group['info']['g_search_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="38" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('User list search help') ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('Send e-mails label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="send_email" value="1"<?php if ($group['info']['g_send_email'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="39" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="send_email" value="0"<?php if ($group['info']['g_send_email'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="40" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Send e-mails help') ?></span>
+									</td>
+								</tr>
+<?php endif; ?>								<tr>
+									<th scope="row"><?php _e('Post flood label') ?></th>
+									<td>
+										<input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_post_flood'] ?>" tabindex="41" />
+										<span><?php _e('Post flood help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Search flood label') ?></th>
+									<td>
+										<input type="text" name="search_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_search_flood'] ?>" tabindex="42" />
+										<span><?php _e('Search flood help') ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('E-mail flood label') ?></th>
+									<td>
+										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_email_flood'] ?>" tabindex="43" />
+										<span><?php _e('E-mail flood help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Report flood label') ?></th>
+									<td>
+										<input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_report_flood'] ?>" tabindex="44" />
+										<span><?php _e('Report flood help') ?></span>
+									</td>
+								</tr>
+<?php endif; endif; ?>							</table>
+<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php _e('Moderator info') ?></p>
+<?php endif; ?>						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" tabindex="45" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/groups/admin_groups.php b/style/FeatherBB/view/admin/groups/admin_groups.php
new file mode 100644
index 00000000..643b4883
--- /dev/null
+++ b/style/FeatherBB/view/admin/groups/admin_groups.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Add groups head') ?></span></h2>
+		<div class="box">
+				<div class="inform">
+					<fieldset>
+                        <form id="groups" method="post" action="<?php echo get_link('admin/groups/add/') ?>">
+                        <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+						<legend><?php _e('Add group subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('New group label') ?><div><input type="submit" name="add_group" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
+									<td>
+										<select id="base_group" name="base_group" tabindex="1">
+<?php
+
+foreach ($groups as $cur_group) {
+    if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
+        if ($cur_group['g_id'] == $feather_config['o_default_user_group']) {
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+        } else {
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+        }
+    }
+}
+
+?>
+										</select>
+										<span><?php _e('New group help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+                        </form>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+                        <form id="groups" method="post" action="<?php echo get_link('admin/groups/') ?>">
+                        	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+						<legend><?php _e('Default group subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Default group label') ?><div><input type="submit" name="set_default_group" value="<?php _e('Save') ?>" tabindex="4" /></div></th>
+									<td>
+										<select id="default_group" name="default_group" tabindex="3">
+<?php
+
+foreach ($groups as $cur_group) {
+    if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
+        if ($cur_group['g_id'] == $feather_config['o_default_user_group']) {
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+        } else {
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+        }
+    }
+}
+
+?>
+										</select>
+										<span><?php _e('Default group help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+                        </form>
+					</fieldset>
+				</div>
+		</div>
+
+		<h2 class="block2"><span><?php _e('Existing groups head') ?></span></h2>
+		<div class="box">
+			<div class="fakeform">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Edit groups subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Edit groups info') ?></p>
+							<table>
+<?php
+foreach ($groups as $cur_group) {
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.get_link('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.get_link('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
+}
+
+?>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/groups/confirm_delete.php b/style/FeatherBB/view/admin/groups/confirm_delete.php
new file mode 100644
index 00000000..ca595ab3
--- /dev/null
+++ b/style/FeatherBB/view/admin/groups/confirm_delete.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Group delete head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+				<input type="hidden" name="group_to_delete" value="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>" />
+					<fieldset>
+						<legend><?php _e('Confirm delete subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Confirm delete info'), feather_escape($group_title)) ?></p>
+							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="del_group_comply" value="<?php _e('Delete') ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/groups/delete_group.php b/style/FeatherBB/view/admin/groups/delete_group.php
new file mode 100644
index 00000000..693baab1
--- /dev/null
+++ b/style/FeatherBB/view/admin/groups/delete_group.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Delete group head') ?></span></h2>
+		<div class="box">
+			<form id="groups" method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Move users subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Move users info'), feather_escape($group_info['title']), forum_number_format($group_info['members'])) ?></p>
+							<label><?php _e('Move users label') ?>
+							<select name="move_to_group">
+								<?php get_group_list_delete($id); ?>
+							</select>
+							<br /></label>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="del_group" value="<?php _e('Delete group') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/index.html b/style/FeatherBB/view/admin/index.html
new file mode 100644
index 00000000..89337b2f
--- /dev/null
+++ b/style/FeatherBB/view/admin/index.html
@@ -0,0 +1 @@
+<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/admin/index.php b/style/FeatherBB/view/admin/index.php
new file mode 100644
index 00000000..dc0dcf8c
--- /dev/null
+++ b/style/FeatherBB/view/admin/index.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="block">
+		<h2><span><?php _e('Forum admin head') ?></span></h2>
+		<div id="adintro" class="box">
+			<div class="inbox">
+				<p><?php _e('Welcome to admin') ?></p>
+				<ul>
+					<li><span><?php _e('Welcome 1') ?></span></li>
+					<li><span><?php _e('Welcome 2') ?></span></li>
+					<li><span><?php _e('Welcome 3') ?></span></li>
+					<li><span><?php _e('Welcome 4') ?></span></li>
+					<li><span><?php _e('Welcome 5') ?></span></li>
+					<li><span><?php _e('Welcome 6') ?></span></li>
+					<li><span><?php _e('Welcome 7') ?></span></li>
+					<li><span><?php _e('Welcome 8') ?></span></li>
+					<li><span><?php _e('Welcome 9') ?></span></li>
+				</ul>
+			</div>
+		</div>
+
+<?php if ($install_file_exists) : ?>
+		<h2 class="block2"><span><?php _e('Alerts head') ?></span></h2>
+		<div id="adalerts" class="box">
+			<p><?php printf(__('Install file exists'), '<a href="'.get_link('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
+		</div>
+<?php endif; ?>
+
+		<h2 class="block2"><span><?php _e('About head') ?></span></h2>
+		<div id="adstats" class="box">
+			<div class="inbox">
+				<dl>
+					<dt><?php _e('FeatherBB version label') ?></dt>
+					<dd>
+						<?php printf(__('FeatherBB version data')."\n", $feather_config['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
+					</dd>
+					<dt><?php _e('Server statistics label') ?></dt>
+					<dd>
+						<a href="<?php echo get_link('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
+					</dd>
+					<dt><?php _e('Support label') ?></dt>
+					<dd>
+						<a href="http://FeatherBB.org/forums/index.php"><?php _e('Forum label') ?></a> - <a href="http://gitter.im/featherbb/featherbb"><?php _e('IRC label') ?></a>
+					</dd>
+				</dl>
+			</div>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/loader.php b/style/FeatherBB/view/admin/loader.php
new file mode 100644
index 00000000..6a61c22f
--- /dev/null
+++ b/style/FeatherBB/view/admin/loader.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/maintenance/admin_maintenance.php b/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
new file mode 100644
index 00000000..068b914b
--- /dev/null
+++ b/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Maintenance head') ?></span></h2>
+		<div class="box">
+			<form method="get" action="<?php echo get_link('admin/maintenance/') ?>">
+				<div class="inform">
+					<input type="hidden" name="action" value="rebuild" />
+					<fieldset>
+						<legend><?php _e('Rebuild index subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Rebuild index info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Posts per cycle label') ?></th>
+									<td>
+										<input type="text" name="i_per_page" size="7" maxlength="7" value="300" tabindex="1" />
+										<span><?php _e('Posts per cycle help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Starting post label') ?></th>
+									<td>
+										<input type="text" name="i_start_at" size="7" maxlength="7" value="<?php echo(isset($first_id)) ? $first_id : 0 ?>" tabindex="2" />
+										<span><?php _e('Starting post help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Empty index label') ?></th>
+									<td class="inputadmin">
+										<label><input type="checkbox" name="i_empty_index" value="1" tabindex="3" checked="checked" />&#160;&#160;<?php _e('Empty index help') ?></label>
+									</td>
+								</tr>
+							</table>
+							<p class="topspace"><?php _e('Rebuild completed info') ?></p>
+							<div class="fsetsubmit"><input type="submit" name="rebuild_index" value="<?php _e('Rebuild index') ?>" tabindex="4" /></div>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+
+			<form method="post" action="<?php echo get_link('admin/maintenance/') ?>" onsubmit="return process_form(this)">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<input type="hidden" name="action" value="prune" />
+					<fieldset>
+						<legend><?php _e('Prune subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Days old label') ?></th>
+									<td>
+										<input type="text" name="req_prune_days" size="3" maxlength="3" tabindex="5" />
+										<span><?php _e('Days old help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Prune sticky label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="prune_sticky" value="1" tabindex="6" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="prune_sticky" value="0" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Prune sticky help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Prune from label') ?></th>
+									<td>
+										<select name="prune_from" tabindex="7">
+											<option value="all"><?php _e('All forums') ?></option>
+												<?php echo $categories; ?>
+											</optgroup>
+										</select>
+										<span><?php _e('Prune from help') ?></span>
+									</td>
+								</tr>
+							</table>
+							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php _e('Prune') ?>" tabindex="8" /></div>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/maintenance/index.html b/style/FeatherBB/view/admin/maintenance/index.html
new file mode 100644
index 00000000..89337b2f
--- /dev/null
+++ b/style/FeatherBB/view/admin/maintenance/index.html
@@ -0,0 +1 @@
+<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/admin/maintenance/prune.php b/style/FeatherBB/view/admin/maintenance/prune.php
new file mode 100644
index 00000000..9e3b0d2b
--- /dev/null
+++ b/style/FeatherBB/view/admin/maintenance/prune.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Prune head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo get_link('admin/maintenance/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<input type="hidden" name="action" value="prune" />
+					<input type="hidden" name="prune_days" value="<?php echo $prune['days'] ?>" />
+					<input type="hidden" name="prune_sticky" value="<?php echo $prune_sticky ?>" />
+					<input type="hidden" name="prune_from" value="<?php echo $prune_from ?>" />
+					<fieldset>
+						<legend><?php _e('Confirm prune subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], forum_number_format($prune['num_topics'])) ?></p>
+							<p class="warntext"><?php _e('Confirm prune warn') ?></p>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="prune_comply" value="<?php _e('Prune') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/maintenance/rebuild.php b/style/FeatherBB/view/admin/maintenance/rebuild.php
new file mode 100644
index 00000000..5bd6ffc0
--- /dev/null
+++ b/style/FeatherBB/view/admin/maintenance/rebuild.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title><?php echo generate_page_title($page_title) ?></title>
+<style type="text/css">
+body {
+	font: 12px Verdana, Arial, Helvetica, sans-serif;
+	color: #333333;
+	background-color: #FFFFFF
+}
+
+h1 {
+	font-size: 16px;
+	font-weight: normal;
+}
+</style>
+</head>
+<body>
+
+<h1><?php _e('Rebuilding index info') ?></h1>
+<hr />
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/menu.php b/style/FeatherBB/view/admin/menu.php
new file mode 100644
index 00000000..b33c2727
--- /dev/null
+++ b/style/FeatherBB/view/admin/menu.php
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="adminconsole" class="block2col">
+	<div id="adminmenu" class="blockmenu">
+		<h2><span><?php _e('Moderator menu') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<ul>
+					<li<?php if ($page == 'index') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo get_link('admin/') ?>"><?php _e('Index') ?></a></li>
+					<li<?php if ($page == 'users') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+<?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+<?php endif;
+    if ($is_admin || $feather_config['o_report_method'] == '0' || $feather_config['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
+<?php endif;
+    ?>				</ul>
+			</div>
+		</div>
+<?php
+
+    if ($is_admin) {
+        ?>
+		<h2 class="block2"><span><?php _e('Admin menu') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<ul>
+					<li<?php if ($page == 'options') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo get_link('admin/options/') ?>"><?php _e('Options') ?></a></li>
+					<li<?php if ($page == 'permissions') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo get_link('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
+					<li<?php if ($page == 'categories') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo get_link('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
+					<li<?php if ($page == 'forums') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo get_link('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
+					<li<?php if ($page == 'groups') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo get_link('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
+					<li<?php if ($page == 'censoring') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo get_link('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
+					<li<?php if ($page == 'parser') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo get_link('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
+					<li<?php if ($page == 'maintenance') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo get_link('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
+				</ul>
+			</div>
+		</div>
+<?php
+
+    }
+
+    // Did we find any plugins?
+    if (!empty($plugins)) {
+        ?>
+		<h2 class="block2"><span><?php _e('Plugins menu') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<ul>
+<?php
+
+        foreach ($plugins as $plugin_name => $plugin) {
+            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.get_link('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
+        }
+
+        ?>
+				</ul>
+			</div>
+		</div>
+<?php
+
+    }
+
+    ?>
+	</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/options.php b/style/FeatherBB/view/admin/options.php
new file mode 100644
index 00000000..faa8e34c
--- /dev/null
+++ b/style/FeatherBB/view/admin/options.php
@@ -0,0 +1,849 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Options head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo get_link('admin/options/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
+				<div class="inform">
+					<input type="hidden" name="form_sent" value="1" />
+					<fieldset>
+						<legend><?php _e('Essentials subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Board title label') ?></th>
+									<td>
+										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather_config['o_board_title']) ?>" />
+										<span><?php _e('Board title help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Board desc label') ?></th>
+									<td>
+										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather_config['o_board_desc']) ?></textarea>
+										<span><?php _e('Board desc help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Base URL label') ?></th>
+									<td>
+										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather_config['o_base_url']) ?>" />
+										<span><?php _e('Base URL help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Timezone label') ?></th>
+									<td>
+										<select name="form_default_timezone">
+											<option value="-12"<?php if ($feather_config['o_default_timezone'] == -12) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-12:00') ?></option>
+											<option value="-11"<?php if ($feather_config['o_default_timezone'] == -11) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-11:00') ?></option>
+											<option value="-10"<?php if ($feather_config['o_default_timezone'] == -10) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-10:00') ?></option>
+											<option value="-9.5"<?php if ($feather_config['o_default_timezone'] == -9.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-09:30') ?></option>
+											<option value="-9"<?php if ($feather_config['o_default_timezone'] == -9) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-09:00') ?></option>
+											<option value="-8.5"<?php if ($feather_config['o_default_timezone'] == -8.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-08:30') ?></option>
+											<option value="-8"<?php if ($feather_config['o_default_timezone'] == -8) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-08:00') ?></option>
+											<option value="-7"<?php if ($feather_config['o_default_timezone'] == -7) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-07:00') ?></option>
+											<option value="-6"<?php if ($feather_config['o_default_timezone'] == -6) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-06:00') ?></option>
+											<option value="-5"<?php if ($feather_config['o_default_timezone'] == -5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-05:00') ?></option>
+											<option value="-4"<?php if ($feather_config['o_default_timezone'] == -4) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-04:00') ?></option>
+											<option value="-3.5"<?php if ($feather_config['o_default_timezone'] == -3.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-03:30') ?></option>
+											<option value="-3"<?php if ($feather_config['o_default_timezone'] == -3) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-03:00') ?></option>
+											<option value="-2"<?php if ($feather_config['o_default_timezone'] == -2) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-02:00') ?></option>
+											<option value="-1"<?php if ($feather_config['o_default_timezone'] == -1) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-01:00') ?></option>
+											<option value="0"<?php if ($feather_config['o_default_timezone'] == 0) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC') ?></option>
+											<option value="1"<?php if ($feather_config['o_default_timezone'] == 1) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+01:00') ?></option>
+											<option value="2"<?php if ($feather_config['o_default_timezone'] == 2) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+02:00') ?></option>
+											<option value="3"<?php if ($feather_config['o_default_timezone'] == 3) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+03:00') ?></option>
+											<option value="3.5"<?php if ($feather_config['o_default_timezone'] == 3.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+03:30') ?></option>
+											<option value="4"<?php if ($feather_config['o_default_timezone'] == 4) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+04:00') ?></option>
+											<option value="4.5"<?php if ($feather_config['o_default_timezone'] == 4.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+04:30') ?></option>
+											<option value="5"<?php if ($feather_config['o_default_timezone'] == 5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+05:00') ?></option>
+											<option value="5.5"<?php if ($feather_config['o_default_timezone'] == 5.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+05:30') ?></option>
+											<option value="5.75"<?php if ($feather_config['o_default_timezone'] == 5.75) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+05:45') ?></option>
+											<option value="6"<?php if ($feather_config['o_default_timezone'] == 6) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+06:00') ?></option>
+											<option value="6.5"<?php if ($feather_config['o_default_timezone'] == 6.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+06:30') ?></option>
+											<option value="7"<?php if ($feather_config['o_default_timezone'] == 7) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+07:00') ?></option>
+											<option value="8"<?php if ($feather_config['o_default_timezone'] == 8) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+08:00') ?></option>
+											<option value="8.75"<?php if ($feather_config['o_default_timezone'] == 8.75) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+08:45') ?></option>
+											<option value="9"<?php if ($feather_config['o_default_timezone'] == 9) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+09:00') ?></option>
+											<option value="9.5"<?php if ($feather_config['o_default_timezone'] == 9.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+09:30') ?></option>
+											<option value="10"<?php if ($feather_config['o_default_timezone'] == 10) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+10:00') ?></option>
+											<option value="10.5"<?php if ($feather_config['o_default_timezone'] == 10.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+10:30') ?></option>
+											<option value="11"<?php if ($feather_config['o_default_timezone'] == 11) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+11:00') ?></option>
+											<option value="11.5"<?php if ($feather_config['o_default_timezone'] == 11.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+11:30') ?></option>
+											<option value="12"<?php if ($feather_config['o_default_timezone'] == 12) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+12:00') ?></option>
+											<option value="12.75"<?php if ($feather_config['o_default_timezone'] == 12.75) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+12:45') ?></option>
+											<option value="13"<?php if ($feather_config['o_default_timezone'] == 13) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+13:00') ?></option>
+											<option value="14"<?php if ($feather_config['o_default_timezone'] == 14) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+14:00') ?></option>
+										</select>
+										<span><?php _e('Timezone help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('DST label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather_config['o_default_dst'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather_config['o_default_dst'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('DST help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Language label') ?></th>
+									<td>
+										<select name="form_default_lang">
+<?php
+        foreach ($languages as $temp) {
+            if ($feather_config['o_default_lang'] == $temp) {
+                echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
+            } else {
+                echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
+            }
+        }
+
+?>
+										</select>
+										<span><?php _e('Language help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Default style label') ?></th>
+									<td>
+										<select name="form_default_style">
+											<?php echo $styles; ?>
+										</select>
+										<span><?php _e('Default style help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+    $diff = ($feather->user->timezone + $feather->user->dst) * 3600;
+    $timestamp = time() + $diff;
+
+?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Timeouts subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Time format label') ?></th>
+									<td>
+										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_time_format']) ?>" />
+										<span><?php printf(__('Time format help'), gmdate($feather_config['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Date format label') ?></th>
+									<td>
+										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_date_format']) ?>" />
+										<span><?php printf(__('Date format help'), gmdate($feather_config['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Visit timeout label') ?></th>
+									<td>
+										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_visit'] ?>" />
+										<span><?php _e('Visit timeout help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Online timeout label') ?></th>
+									<td>
+										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_online'] ?>" />
+										<span><?php _e('Online timeout help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Redirect time label') ?></th>
+									<td>
+										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather_config['o_redirect_delay'] ?>" />
+										<span><?php _e('Redirect time help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Display subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Version number label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather_config['o_show_version'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather_config['o_show_version'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Version number help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Info in posts label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather_config['o_show_user_info'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather_config['o_show_user_info'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Info in posts help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Post count label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather_config['o_show_post_count'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather_config['o_show_post_count'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post count help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Smilies label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather_config['o_smilies'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather_config['o_smilies'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Smilies help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Smilies sigs label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather_config['o_smilies_sig'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather_config['o_smilies_sig'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Smilies sigs help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Clickable links label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather_config['o_make_links'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather_config['o_make_links'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Clickable links help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Topic review label') ?></th>
+									<td>
+										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather_config['o_topic_review'] ?>" />
+										<span><?php _e('Topic review help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Topics per page label') ?></th>
+									<td>
+										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_topics_default'] ?>" />
+										<span><?php _e('Topics per page help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Posts per page label') ?></th>
+									<td>
+										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_posts_default'] ?>" />
+										<span><?php _e('Posts per page help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Indent label') ?></th>
+									<td>
+										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather_config['o_indent_num_spaces'] ?>" />
+										<span><?php _e('Indent help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Quote depth label') ?></th>
+									<td>
+										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather_config['o_quote_depth'] ?>" />
+										<span><?php _e('Quote depth help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Features subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Quick post label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather_config['o_quickpost'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather_config['o_quickpost'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Quick post help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Users online label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather_config['o_users_online'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather_config['o_users_online'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Users online help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><a name="censoring"></a><?php _e('Censor words label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather_config['o_censoring'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather_config['o_censoring'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><a name="signatures"></a><?php _e('Signatures label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather_config['o_signatures'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather_config['o_signatures'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Signatures help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('User has posted label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather_config['o_show_dot'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather_config['o_show_dot'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('User has posted help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Topic views label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather_config['o_topic_views'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather_config['o_topic_views'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Topic views help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Quick jump label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather_config['o_quickjump'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather_config['o_quickjump'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Quick jump help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('GZip label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather_config['o_gzip'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather_config['o_gzip'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('GZip help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Search all label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather_config['o_search_all_forums'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather_config['o_search_all_forums'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Search all help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Menu items label') ?></th>
+									<td>
+										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather_config['o_additional_navlinks']) ?></textarea>
+										<span><?php _e('Menu items help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Feed subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Default feed label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather_config['o_feed_type'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('None') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather_config['o_feed_type'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('RSS') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather_config['o_feed_type'] == '2') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Atom') ?></strong></label>
+										<span class="clearb"><?php _e('Default feed help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Feed TTL label') ?></th>
+									<td>
+										<select name="form_feed_ttl">
+											<option value="0"<?php if ($feather_config['o_feed_ttl'] == '0') {
+    echo ' selected="selected"';
+} ?>><?php _e('No cache') ?></option>
+											<?php echo $times ?>
+										</select>
+										<span><?php _e('Feed TTL help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Reports subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Reporting method label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather_config['o_report_method'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Internal') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather_config['o_report_method'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('By e-mail') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather_config['o_report_method'] == '2') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Both') ?></strong></label>
+										<span class="clearb"><?php _e('Reporting method help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Mailing list label') ?></th>
+									<td>
+										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather_config['o_mailing_list']) ?></textarea>
+										<span><?php _e('Mailing list help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Avatars subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Use avatars label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather_config['o_avatars'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather_config['o_avatars'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Use avatars help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Upload directory label') ?></th>
+									<td>
+										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather_config['o_avatars_dir']) ?>" />
+										<span><?php _e('Upload directory help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Max width label') ?></th>
+									<td>
+										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_width'] ?>" />
+										<span><?php _e('Max width help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Max height label') ?></th>
+									<td>
+										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_height'] ?>" />
+										<span><?php _e('Max height help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Max size label') ?></th>
+									<td>
+										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather_config['o_avatars_size'] ?>" />
+										<span><?php _e('Max size help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('E-mail subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Admin e-mail label') ?></th>
+									<td>
+										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_admin_email']) ?>" />
+										<span><?php _e('Admin e-mail help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
+									<td>
+										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_webmaster_email']) ?>" />
+										<span><?php _e('Webmaster e-mail help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Forum subscriptions label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather_config['o_forum_subscriptions'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather_config['o_forum_subscriptions'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Forum subscriptions help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Topic subscriptions label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather_config['o_topic_subscriptions'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather_config['o_topic_subscriptions'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Topic subscriptions help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('SMTP address label') ?></th>
+									<td>
+										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather_config['o_smtp_host']) ?>" />
+										<span><?php _e('SMTP address help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('SMTP username label') ?></th>
+									<td>
+										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather_config['o_smtp_user']) ?>" />
+										<span><?php _e('SMTP username help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('SMTP password label') ?></th>
+									<td>
+										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
+<?php $smtp_pass = !empty($feather_config['o_smtp_pass']) ? random_key(feather_strlen($feather_config['o_smtp_pass']), true) : ''; ?>
+										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
+										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
+										<span><?php _e('SMTP password help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('SMTP SSL label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather_config['o_smtp_ssl'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather_config['o_smtp_ssl'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('SMTP SSL help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Registration subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Allow new label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather_config['o_regs_allow'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather_config['o_regs_allow'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Allow new help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Verify label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather_config['o_regs_verify'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather_config['o_regs_verify'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Verify help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Report new label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather_config['o_regs_report'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather_config['o_regs_report'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Report new help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Use rules label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather_config['o_rules'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather_config['o_rules'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Use rules help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Rules label') ?></th>
+									<td>
+										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather_config['o_rules_message']) ?></textarea>
+										<span><?php _e('Rules help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('E-mail default label') ?></th>
+									<td>
+										<span><?php _e('E-mail default help') ?></span>
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather_config['o_default_email_setting'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<?php _e('Display e-mail label') ?></label>
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather_config['o_default_email_setting'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<?php _e('Hide allow form label') ?></label>
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather_config['o_default_email_setting'] == '2') {
+    echo ' checked="checked"';
+} ?> />&#160;<?php _e('Hide both label') ?></label>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Announcement subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Display announcement label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather_config['o_announcement'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather_config['o_announcement'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Display announcement help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Announcement message label') ?></th>
+									<td>
+										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_announcement_message']) ?></textarea>
+										<span><?php _e('Announcement message help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Maintenance subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><a name="maintenance"></a><?php _e('Maintenance mode label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather_config['o_maintenance'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather_config['o_maintenance'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Maintenance mode help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Maintenance message label') ?></th>
+									<td>
+										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_maintenance_message']) ?></textarea>
+										<span><?php _e('Maintenance message help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/parser.php b/style/FeatherBB/view/admin/parser.php
new file mode 100644
index 00000000..aec1f767
--- /dev/null
+++ b/style/FeatherBB/view/admin/parser.php
@@ -0,0 +1,299 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php echo $lang_admin_parser['Parser head'] ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo get_link('admin/parser/') ?>" enctype="multipart/form-data">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop">
+					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
+					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
+				</p>
+				<div class="inform">
+					<input type="hidden" name="form_sent" value="1" />
+					<fieldset>
+						<legend><?php echo $lang_admin_parser['Config subhead'] ?></legend>
+						<div class="infldset">
+							<table class="aligntop" cellspacing="0">
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['textile'] ?></th>
+									<td colspan="2">
+										<input type="radio" name="config[textile]" value="1"<?php if ($config['textile']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[textile]" value="0"<?php if (!$config['textile']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['textile help'] ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['quote_links'] ?></th>
+									<td colspan="2">
+										<input type="radio" name="config[quote_links]" value="1"<?php if ($config['quote_links']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_links]" value="0"<?php if (!$config['quote_links']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['quote_links help'] ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['quote_imgs'] ?></th>
+									<td colspan="2">
+										<input type="radio" name="config[quote_imgs]" value="1"<?php if ($config['quote_imgs']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_imgs]" value="0"<?php if (!$config['quote_imgs']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['quote_imgs help'] ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['click_imgs'] ?></th>
+									<td colspan="2">
+										<input type="radio" name="config[click_imgs]" value="1"<?php if ($config['click_imgs']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[click_imgs]" value="0"<?php if (!$config['click_imgs']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['click_imgs help'] ?></span>
+									</td>
+								</tr>
+
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['valid_imgs'] ?></th>
+									<td colspan="2">
+										<input type="radio" name="config[valid_imgs]" value="1"<?php if ($config['valid_imgs']) {
+    echo ' checked="checked"';
+} if (!ini_get('allow_url_fopen')) {
+    echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
+} ?> /> <strong><?php _e('Yes') ?></strong>
+										<input type="radio" name="config[valid_imgs]" value="0"<?php if (!$config['valid_imgs']) {
+    echo ' checked="checked"';
+} if (!ini_get('allow_url_fopen')) {
+    echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
+} ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td><?php echo $lang_admin_parser['valid_imgs help'] ?></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['max_size'] ?></th>
+									<td colspan="2">
+										<input type="text" name="config[max_size]" size="10" maxlength="8" value="<?php echo($config['max_size'])?>"<?php if (!ini_get('allow_url_fopen')) {
+    echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
+} ?> />
+									</td>
+									<td><span><?php echo $lang_admin_parser['max_size help'] ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['def_xy'] ?></th>
+									<td>
+										<input type="text" name="config[def_width]" size="5" maxlength="5" value="<?php echo $config['def_width'] ?>" /> X:Width
+									</td>
+									<td>
+										<input type="text" name="config[def_height]" size="5" maxlength="5" value="<?php echo $config['def_height'] ?>" /> Y:Height
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['def_xy help'] ?></span>
+									</td>
+								</tr>
+
+
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['max_xy'] ?></th>
+									<td>
+										<input type="text" name="config[max_width]" size="5" maxlength="5" value="<?php echo $config['max_width'] ?>" /> X:Width
+									</td>
+									<td>
+										<input type="text" name="config[max_height]" size="5" maxlength="5" value="<?php echo $config['max_height'] ?>" /> Y:Height
+									</td>
+									<td><?php echo $lang_admin_parser['max_xy help'] ?></td>
+								</tr>
+
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['smiley_size'] ?></th>
+									<td colspan=2>
+										<input type="text" name="config[smiley_size]" size="5" maxlength="5" value="<?php echo $config['smiley_size'] .'%' ?>" />
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['smiley_size help'] ?></span>
+									</td>
+								</tr>
+
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php echo $lang_admin_parser['Smilies subhead'] ?></legend>
+						<div class="infldset">
+							<table cellspacing="0">
+							<thead>
+								<tr>
+									<th scope="col"><?php echo $lang_admin_parser['smiley_text_label'] ?></th>
+									<th scope="col"><?php echo $lang_admin_parser['smiley_file_label'] ?></th>
+									<th scope="col">:)</th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+    foreach ($smilies as $key => $value) {
+        $i++;
+        $oldfile = $value['file'];
+        ?>
+								<tr>
+									<td><input type="text" name="smiley_text[<?php echo($i);
+        ?>]" value="<?php echo(feather_escape($key));
+        ?>" size="20" maxlength="80" /></td>
+									<td>
+										<select name="smiley_file[<?php echo($i);
+        ?>]">
+<?php
+        foreach ($smiley_files as $file) {
+            if ($file === $oldfile) {
+                echo("\t\t\t\t\t\t\t\t\t\t\t<option selected=\"selected\">" . $file . "</option>\n");
+            } else {
+                echo("\t\t\t\t\t\t\t\t\t\t\t<option>" . $file . "</option>\n");
+            }
+        }
+        ?>
+										</select>
+									</td>
+									<td>
+										<?php echo($value['html']);
+        ?>
+									</td>
+								</tr>
+<?php
+
+    }
+?>
+								<tr>
+									<td><input type="text" name="smiley_text[<?php echo(++$i); ?>]" value="" size="20" maxlength="80" /><br />New smiley text</td>
+									<td>
+										<select name="smiley_file[<?php echo($i); ?>]">
+											<option selected="selected">select new file</option>
+<?php
+        foreach ($smiley_files as $file) {
+            echo("\t\t\t\t\t\t\t\t\t\t\t<option>" . $file . "</option>\n");
+        }
+?>
+										</select><br /><?php echo($lang_admin_parser['New smiley image']); ?>
+									</td>
+									<td></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo($lang_admin_parser['smiley_upload']); ?></th>
+ <?php if (ini_get('file_uploads')) {
+    ?>
+									<td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
+										<input type="file" name="new_smiley" id="upload_smiley" /></td>
+									<td><input type="submit" name="upload" value="<?php echo($lang_admin_parser['upload_button']);
+    ?>" /></td>
+<?php 
+} else {
+    ?>
+									<td colspan="2"><?php echo($lang_admin_parser['upload_off']);
+    ?></td>
+<?php 
+} ?>
+								</tr>
+							</tbody>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+
+
+
+				<div class="inform">
+					<fieldset>
+						<legend><?php echo $lang_admin_parser['BBCodes subhead'] ?></legend>
+						<div class="infldset">
+							<table cellspacing="0">
+							<thead>
+								<tr>
+									<th class="tcl" scope="col"><?php echo $lang_admin_parser['tagname_label'] ?></th>
+									<th class="tc3" scope="col"><?php echo $lang_admin_parser['in_post_label'] ?></th>
+									<th class="hidehead" scope="col"><?php echo $lang_admin_parser['in_sig_label'] ?></th>
+									<th class="tc2" scope="col"><?php echo $lang_admin_parser['depth_max'] ?></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+foreach ($bbcd as $tagname => $tagdata) {
+    if ($tagname == '_ROOT_') {
+        continue;
+    } // Skip last pseudo-tag
+    $title = isset($lang_admin_parser['tag_summary'][$tagname]) ?
+                $lang_admin_parser['tag_summary'][$tagname] : '';
+    ?>
+								<tr>
+									<th scope="row" title="<?php echo($title);
+    ?>"><?php echo('['. $tagname .']') ?></th>
+									<td>
+										<input type="radio" name="<?php echo($tagname) ?>_in_post" value="1"<?php if ($bbcd[$tagname]['in_post']) {
+    echo ' checked="checked"';
+}
+    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_post" value="0"<?php if (!$bbcd[$tagname]['in_post']) {
+    echo ' checked="checked"';
+}
+    ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<input type="radio" name="<?php echo($tagname) ?>_in_sig" value="1"<?php if ($bbcd[$tagname]['in_sig']) {
+    echo ' checked="checked"';
+}
+    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_sig" value="0"<?php if (!$bbcd[$tagname]['in_sig']) {
+    echo ' checked="checked"';
+}
+    ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<input type="text" size="10" name="<?php echo($tagname) ?>_depth_max" value="<?php echo($bbcd[$tagname]['depth_max']);
+    ?>" <?php if ($tagdata['html_type'] === 'inline' || $tagdata['tag_type'] === 'hidden') {
+    echo(' disabled="disabled" style="display: none;"');
+}
+    ?> />
+									</td>
+								</tr>
+<?php 
+} ?>
+							</tbody>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+
+
+				<p class="submitend">
+					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
+					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
+				</p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/permissions.php b/style/FeatherBB/view/admin/permissions.php
new file mode 100644
index 00000000..a70328ae
--- /dev/null
+++ b/style/FeatherBB/view/admin/permissions.php
@@ -0,0 +1,189 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Permissions head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo get_link('admin/permissions/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
+				<div class="inform">
+					<input type="hidden" name="form_sent" value="1" />
+					<fieldset>
+						<legend><?php _e('Posting subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('BBCode label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather_config['p_message_bbcode'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather_config['p_message_bbcode'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('BBCode help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Image tag label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather_config['p_message_img_tag'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather_config['p_message_img_tag'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Image tag help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('All caps message label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather_config['p_message_all_caps'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather_config['p_message_all_caps'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('All caps message help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('All caps subject label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather_config['p_subject_all_caps'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather_config['p_subject_all_caps'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('All caps subject help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Require e-mail label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather_config['p_force_guest_email'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather_config['p_force_guest_email'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Require e-mail help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Signatures subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('BBCode sigs label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather_config['p_sig_bbcode'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather_config['p_sig_bbcode'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('BBCode sigs help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Image tag sigs label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather_config['p_sig_img_tag'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather_config['p_sig_img_tag'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Image tag sigs help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('All caps sigs label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather_config['p_sig_all_caps'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather_config['p_sig_all_caps'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('All caps sigs help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Max sig length label') ?></th>
+									<td>
+										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather_config['p_sig_length'] ?>" />
+										<span class="clearb"><?php _e('Max sig length help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Max sig lines label') ?></th>
+									<td>
+										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather_config['p_sig_lines'] ?>" />
+										<span class="clearb"><?php _e('Max sig lines help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Registration subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Banned e-mail label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather_config['p_allow_banned_email'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather_config['p_allow_banned_email'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Banned e-mail help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Duplicate e-mail label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather_config['p_allow_dupe_email'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather_config['p_allow_dupe_email'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Duplicate e-mail help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/reports.php b/style/FeatherBB/view/admin/reports.php
new file mode 100644
index 00000000..63251681
--- /dev/null
+++ b/style/FeatherBB/view/admin/reports.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('New reports head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo get_link('admin/reports/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<?php
+if (!empty($report_data)) {
+    foreach ($report_data as $report) {
+        ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php printf(__('Report subhead'), format_time($report['created'])) ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
+									<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+    }
+} else {
+    ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('None') ?></legend>
+						<div class="infldset">
+							<p><?php _e('No new reports') ?></p>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+}
+
+?>
+			</form>
+		</div>
+	</div>
+
+	<div class="blockform block2">
+		<h2><span><?php _e('Last 10 head') ?></span></h2>
+		<div class="box">
+			<div class="fakeform">
+<?php
+
+if (!empty($report_zapped_data)) {
+    foreach ($report_zapped_data as $report) {
+        ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.get_link('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Reason') ?></th>
+									<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+    }
+} else {
+    ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('None') ?></legend>
+						<div class="infldset">
+							<p><?php _e('No zapped reports') ?></p>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+}
+
+?>
+			</div>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
diff --git a/style/FeatherBB/view/admin/statistics.php b/style/FeatherBB/view/admin/statistics.php
new file mode 100644
index 00000000..5306b027
--- /dev/null
+++ b/style/FeatherBB/view/admin/statistics.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="block">
+		<h2><span><?php _e('Server statistics head') ?></span></h2>
+		<div id="adstats" class="box">
+			<div class="inbox">
+				<dl>
+					<dt><?php _e('Server load label') ?></dt>
+					<dd>
+						<?php printf(__('Server load data')."\n", $server_load, $num_online) ?>
+					</dd>
+<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
+					<dd>
+						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
+						<?php printf(__('Environment data version'), phpversion(), '<a href="'.get_link('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
+						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
+					</dd>
+					<dt><?php _e('Database label') ?></dt>
+					<dd>
+<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", forum_number_format($total_records)) ?>
+						<br /><?php printf(__('Database data size')."\n", $total_size) ?>
+<?php endif; ?>					</dd>
+<?php endif; ?>
+				</dl>
+			</div>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/users/admin_users.php b/style/FeatherBB/view/admin/users/admin_users.php
new file mode 100644
index 00000000..27e99a16
--- /dev/null
+++ b/style/FeatherBB/view/admin/users/admin_users.php
@@ -0,0 +1,172 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('User search head') ?></span></h2>
+		<div class="box">
+			<form id="find_user" method="get" action="<?php echo get_link('admin/users/') ?>">
+				<p class="submittop"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="1" /></p>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('User search subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('User search info') ?></p>
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Username label') ?></th>
+									<td><input type="text" name="form[username]" size="25" maxlength="25" tabindex="2" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('E-mail address label') ?></th>
+									<td><input type="text" name="form[email]" size="30" maxlength="80" tabindex="3" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Title label') ?></th>
+									<td><input type="text" name="form[title]" size="30" maxlength="50" tabindex="4" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Real name label') ?></th>
+									<td><input type="text" name="form[realname]" size="30" maxlength="40" tabindex="5" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Website label') ?></th>
+									<td><input type="text" name="form[url]" size="35" maxlength="100" tabindex="6" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Jabber label') ?></th>
+									<td><input type="text" name="form[jabber]" size="30" maxlength="75" tabindex="7" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('ICQ label') ?></th>
+									<td><input type="text" name="form[icq]" size="12" maxlength="12" tabindex="8" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('MSN label') ?></th>
+									<td><input type="text" name="form[msn]" size="30" maxlength="50" tabindex="9" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('AOL label') ?></th>
+									<td><input type="text" name="form[aim]" size="20" maxlength="20" tabindex="10" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Yahoo label') ?></th>
+									<td><input type="text" name="form[yahoo]" size="20" maxlength="20" tabindex="11" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Location label') ?></th>
+									<td><input type="text" name="form[location]" size="30" maxlength="30" tabindex="12" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Signature label') ?></th>
+									<td><input type="text" name="form[signature]" size="35" maxlength="512" tabindex="13" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Admin note label') ?></th>
+									<td><input type="text" name="form[admin_note]" size="30" maxlength="30" tabindex="14" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Posts more than label') ?></th>
+									<td><input type="text" name="posts_greater" size="5" maxlength="8" tabindex="15" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Posts less than label') ?></th>
+									<td><input type="text" name="posts_less" size="5" maxlength="8" tabindex="16" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Last post after label') ?></th>
+									<td><input type="text" name="last_post_after" size="24" maxlength="19" tabindex="17" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Last post before label') ?></th>
+									<td><input type="text" name="last_post_before" size="24" maxlength="19" tabindex="18" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Last visit after label') ?></th>
+									<td><input type="text" name="last_visit_after" size="24" maxlength="19" tabindex="17" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Last visit before label') ?></th>
+									<td><input type="text" name="last_visit_before" size="24" maxlength="19" tabindex="18" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Registered after label') ?></th>
+									<td><input type="text" name="registered_after" size="24" maxlength="19" tabindex="19" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Registered before label') ?></th>
+									<td><input type="text" name="registered_before" size="24" maxlength="19" tabindex="20" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Order by label') ?></th>
+									<td>
+										<select name="order_by" tabindex="21">
+											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
+											<option value="email"><?php _e('Order by e-mail') ?></option>
+											<option value="num_posts"><?php _e('Order by posts') ?></option>
+											<option value="last_post"><?php _e('Order by last post') ?></option>
+											<option value="last_visit"><?php _e('Order by last visit') ?></option>
+											<option value="registered"><?php _e('Order by registered') ?></option>
+										</select>&#160;&#160;&#160;<select name="direction" tabindex="22">
+											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
+											<option value="DESC"><?php _e('Descending') ?></option>
+										</select>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('User group label') ?></th>
+									<td>
+										<select name="user_group" tabindex="23">
+											<option value="-1" selected="selected"><?php _e('All groups') ?></option>
+											<option value="0"><?php _e('Unverified users') ?></option>
+											<?php echo $group_list; ?>
+										</select>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="25" /></p>
+			</form>
+		</div>
+
+		<h2 class="block2"><span><?php _e('IP search head') ?></span></h2>
+		<div class="box">
+			<form method="get" action="<?php echo get_link('admin/users/') ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('IP search subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('IP address label') ?><div><input type="submit" value="<?php _e('Find IP address') ?>" tabindex="26" /></div></th>
+									<td><input type="text" name="show_users" size="18" maxlength="15" tabindex="24" />
+									<span><?php _e('IP address help') ?></span></td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/users/ban_users.php b/style/FeatherBB/view/admin/users/ban_users.php
new file mode 100644
index 00000000..e929c043
--- /dev/null
+++ b/style/FeatherBB/view/admin/users/ban_users.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Ban users') ?></span></h2>
+		<div class="box">
+			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo get_link('admin/users') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Message expiry subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Ban message label') ?></th>
+									<td>
+										<input type="text" name="ban_message" size="50" maxlength="255" tabindex="1" />
+										<span><?php _e('Ban message help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Expire date label') ?></th>
+									<td>
+										<input type="text" name="ban_expire" size="17" maxlength="10" tabindex="2" />
+										<span><?php _e('Expire date help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Ban IP label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="3" value="1" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="4" value="0" checked="checked" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Ban IP help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="ban_users_comply" value="<?php _e('Save') ?>" tabindex="3" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/users/delete_users.php b/style/FeatherBB/view/admin/users/delete_users.php
new file mode 100644
index 00000000..a82c22ec
--- /dev/null
+++ b/style/FeatherBB/view/admin/users/delete_users.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Delete users') ?></span></h2>
+		<div class="box">
+			<form name="confirm_del_users" method="post" action="<?php echo get_link('admin/users') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Confirm delete legend') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Confirm delete info') ?></p>
+							<div class="rbox">
+								<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
+							</div>
+							<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="delete_users_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/users/find_users.php b/style/FeatherBB/view/admin/users/find_users.php
new file mode 100644
index 00000000..d426177d
--- /dev/null
+++ b/style/FeatherBB/view/admin/users/find_users.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+
+<form id="search-users-form" action="<?php echo get_link('admin/users/') ?>" method="post">
+<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<div id="users2" class="blocktable">
+	<h2><span><?php _e('Results head') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
+					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
+					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
+<?php if ($can_action): ?>					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
+<?php endif;
+    ?>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+    if (!empty($user_data)) {
+        foreach ($user_data as $user) {
+            ?>
+				<tr>
+					<td class="tcl"><?php echo '<a href="'.get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
+					<td class="tc2"><a href="mailto:<?php echo feather_escape($user['email']) ?>"><?php echo feather_escape($user['email']) ?></a></td>
+					<td class="tc3"><?php echo $user['user_title'] ?></td>
+					<td class="tc4"><?php echo forum_number_format($user['num_posts']) ?></td>
+					<td class="tc5"><?php echo($user['admin_note'] != '') ? feather_escape($user['admin_note']) : '&#160;' ?></td>
+					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
+<?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
+<?php endif;
+            ?>
+				</tr>
+<?php
+
+        }
+    } else {
+        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('No match').'</td></tr>'."\n";
+    }
+
+    ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+<?php if ($can_action): ?>			<p class="conr modbuttons"><a href="#" onclick="return select_checkboxes('search-users-form', this, '<?php _e('Unselect all') ?>')"><?php _e('Select all') ?></a> <?php if ($can_ban) : ?><input type="submit" name="ban_users" value="<?php _e('Ban') ?>" /><?php endif;
+    if ($can_delete) : ?><input type="submit" name="delete_users" value="<?php _e('Delete') ?>" /><?php endif;
+    if ($can_move) : ?><input type="submit" name="move_users" value="<?php _e('Change group') ?>" /><?php endif;
+    ?></p>
+<?php endif;
+    ?>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="clearer"></div>
+	</div>
+</div>
+</form>
diff --git a/style/FeatherBB/view/admin/users/move_users.php b/style/FeatherBB/view/admin/users/move_users.php
new file mode 100644
index 00000000..d43303e8
--- /dev/null
+++ b/style/FeatherBB/view/admin/users/move_users.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Move users') ?></span></h2>
+		<div class="box">
+			<form name="confirm_move_users" method="post" action="<?php echo get_link('admin/users/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Move users subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('New group label') ?></th>
+									<td>
+										<select name="new_group" tabindex="1">
+<?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo feather_escape($group) ?></option>
+<?php endforeach;
+    ?>
+										</select>
+										<span><?php _e('New group help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="move_users_comply" value="<?php _e('Save') ?>" tabindex="2" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/users/search_ip.php b/style/FeatherBB/view/admin/users/search_ip.php
new file mode 100644
index 00000000..a17e7ac5
--- /dev/null
+++ b/style/FeatherBB/view/admin/users/search_ip.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<div id="users1" class="blocktable">
+	<h2><span><?php _e('Results head') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Results IP address head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results last used head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results times found head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results action head') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+        foreach ($ip_data as $ip) {
+            ?>
+				<tr>
+					<td class="tcl"><a href="<?php echo get_link('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
+					<td class="tc2"><?php echo format_time($ip['last_used']) ?></td>
+					<td class="tc3"><?php echo $ip['used_times'] ?></td>
+					<td class="tcr"><a href="<?php echo get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
+				</tr>
+<?php
+
+        }
+        if (empty($ip_data)):
+            echo "\t\t\t\t".'<tr><td class="tcl" colspan="4">'.__('Results no posts found').'</td></tr>'."\n";
+        endif;
+
+    ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/admin/users/show_users.php b/style/FeatherBB/view/admin/users/show_users.php
new file mode 100644
index 00000000..4ab008c7
--- /dev/null
+++ b/style/FeatherBB/view/admin/users/show_users.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<div id="users2" class="blocktable">
+	<h2><span><?php _e('Results head') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
+					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
+					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+    if ($info['num_posts']) {
+
+        // Loop through users and print out some info
+        foreach ($info['posters'] as $cur_poster) {
+            if (isset($info['user_data'][$cur_poster['poster_id']])) {
+                ?>
+				<tr>
+					<td class="tcl"><?php echo '<a href="'.get_link('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.feather_escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
+					<td class="tc2"><a href="mailto:<?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
+					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
+					<td class="tc4"><?php echo forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
+					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? feather_escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
+					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
+				</tr>
+<?php
+
+            } else {
+                ?>
+				<tr>
+					<td class="tcl"><?php echo feather_escape($cur_poster['poster']) ?></td>
+					<td class="tc2">&#160;</td>
+					<td class="tc3"><?php _e('Results guest') ?></td>
+					<td class="tc4">&#160;</td>
+					<td class="tc5">&#160;</td>
+					<td class="tcr">&#160;</td>
+				</tr>
+<?php
+
+            }
+        }
+    } else {
+        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('Results no IP found').'</td></tr>'."\n";
+    }
+
+    ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/delete.php b/style/FeatherBB/view/delete.php
new file mode 100644
index 00000000..8a2d6959
--- /dev/null
+++ b/style/FeatherBB/view/delete.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox">
+		<ul class="crumbs">
+			<li><a href="index.php"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
+		</ul>
+	</div>
+</div>
+
+<div class="blockform">
+	<h2><span><?php _e('Delete post') ?></span></h2>
+	<div class="box">
+		<form method="post" action="<?php echo get_link('delete/'.$id.'/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<div class="forminfo">
+					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
+					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
+				</div>
+			</div>
+			<p class="buttons"><input type="submit" name="delete" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
+
+<div id="postreview">
+	<div class="blockpost">
+		<div class="box">
+			<div class="inbox">
+				<div class="postbody">
+					<div class="postleft">
+						<dl>
+							<dt><strong><?php echo feather_escape($cur_post['poster']) ?></strong></dt>
+							<dd><span><?php echo format_time($cur_post['posted']) ?></span></dd>
+						</dl>
+					</div>
+					<div class="postright">
+						<div class="postmsg">
+							<?php echo $cur_post['message']."\n" ?>
+						</div>
+					</div>
+				</div>
+				<div class="clearer"></div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/edit.php b/style/FeatherBB/view/edit.php
new file mode 100644
index 00000000..48a692e8
--- /dev/null
+++ b/style/FeatherBB/view/edit.php
@@ -0,0 +1,119 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+$cur_index = 1;
+
+?>
+
+<div class="linkst">
+	<div class="inbox">
+		<ul class="crumbs">
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
+		</ul>
+	</div>
+</div>
+
+<?php
+
+// If there are errors, we display them
+if (!empty($errors)) :
+?>
+<div id="posterror" class="block">
+	<h2><span><?php _e('Post errors') ?></span></h2>
+	<div class="box">
+		<div class="inbox error-info">
+			<p><?php _e('Post errors info') ?></p>
+			<ul class="error-list">
+<?php
+    foreach ($errors as $cur_error) {
+        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+    }
+?>
+			</ul>
+		</div>
+	</div>
+</div>
+<?php
+elseif ($feather->request->post('preview')):
+?>
+<div id="postpreview" class="blockpost">
+	<h2><span><?php _e('Post preview') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<div class="postbody">
+				<div class="postright">
+					<div class="postmsg">
+						<?php echo $preview_message."\n" ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<?php
+endif;
+?>
+<!-- Init BBcode editor toolbar -->
+<script>
+    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
+        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
+</script>
+<script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
+<div id="editform" class="blockform">
+	<h2><span><?php _e('Edit post') ?></span></h2>
+	<div class="box">
+		<form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Edit post legend') ?></legend>
+					<input type="hidden" name="form_sent" value="1" />
+					<div class="infldset txtarea">
+<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
+<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
+						<script>postEditorToolbar('req_message');</script>
+                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
+						<ul class="bblinks">
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+						</ul>
+					</div>
+				</fieldset>
+			</div>
+<?php
+if (!empty($checkboxes)):
+?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Options') ?></legend>
+					<div class="infldset">
+						<div class="rbox">
+							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+<?php
+endif;
+?>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
new file mode 100644
index 00000000..470d5c6b
--- /dev/null
+++ b/style/FeatherBB/view/footer.php
@@ -0,0 +1,147 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+?>
+</div>
+
+<div id="brdfooter" class="block">
+	<h2><span><?php _e('Board footer') ?></span></h2>
+	<div class="box">
+<?php
+
+if (isset($footer_style) && ($footer_style == 'viewforum' || $footer_style == 'viewtopic') && $is_admmod) {
+    echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
+
+    if ($footer_style == 'viewforum') {
+        echo "\t\t\t".'<dl>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t".'</dl>'."\n";
+    } elseif ($footer_style == 'viewtopic') {
+        if (isset($pid)) {
+            $parameter = 'param/'.$pid.'/';
+        } elseif (isset($p) && $p != 1) {
+            $parameter = 'param/'.$p.'/';
+        } else {
+            $parameter = '';
+        }
+
+
+        echo "\t\t\t".'<dl>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
+        // TODO: all
+        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+
+        if ($cur_topic['closed'] == '1') {
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+        } else {
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+        }
+
+        if ($cur_topic['sticky'] == '1') {
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+        } else {
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+        }
+
+        echo "\t\t\t".'</dl>'."\n";
+    }
+
+    echo "\t\t\t".'<div class="clearer"></div>'."\n\t\t".'</div>'."\n";
+}
+
+?>
+		<div id="brdfooternav" class="inbox">
+
+<?php
+// Display the "Jump to" drop list
+if ($feather_config['o_quickjump'] == '1' && !empty($quickjump)) { ?>
+			<div class="conl">
+			<form id="qjump" method="get" action="">
+				<div><label><span><?php _e('Jump to') ?><br /></span></label>
+					<select name="id" onchange="window.location=('<?php echo get_link('forum/') ?>'+this.options[this.selectedIndex].value)">
+<?php
+		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
+			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
+			foreach ($cat_data['cat_forums'] as $forum) {
+				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
+			}
+			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
+		} ?>
+					</select>
+					<noscript><input type="submit" value="<?php _e('Go') ?>" accesskey="g" /></noscript>
+				</div>
+			</form>
+			</div>
+<?php } ?>
+
+			<div class="conr">
+<?php
+
+if ($footer_style == 'index') {
+    if ($feather_config['o_feed_type'] == '1') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
+    } elseif ($feather_config['o_feed_type'] == '2') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
+    }
+} elseif ($footer_style == 'viewforum') {
+    if ($feather_config['o_feed_type'] == '1') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
+    } elseif ($feather_config['o_feed_type'] == '2') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
+    }
+} elseif ($footer_style == 'viewtopic') {
+    if ($feather_config['o_feed_type'] == '1') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
+    } elseif ($feather_config['o_feed_type'] == '2') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
+    }
+}
+
+?>
+				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
+			</div>
+			<div class="clearer"></div>
+		</div>
+	</div>
+</div>
+<?php
+
+// Display debug info (if enabled/defined)
+if ($feather->forum_env['FEATHER_SHOW_INFO']) {
+    echo '<p id="debugtime">[ ';
+
+    // Calculate script generation time
+    $time_diff = sprintf('%.3f', get_microtime() - $feather_start);
+    echo sprintf(__('Querytime'), $time_diff, count(\DB::get_query_log()[0]));
+
+    if (function_exists('memory_get_usage')) {
+        echo ' - '.sprintf(__('Memory usage'), file_size(memory_get_usage()));
+
+        if (function_exists('memory_get_peak_usage')) {
+            echo ' '.sprintf(__('Peak usage'), file_size(memory_get_peak_usage()));
+        }
+    }
+
+    echo ' ]</p>'."\n";
+}
+// Display executed queries (if enabled)
+if ($feather->forum_env['FEATHER_SHOW_QUERIES']) {
+    display_saved_queries();
+}
+?>
+
+</section>
+
+<script src="<?php echo get_base_url() ?>/style/FeatherBB/phone.min.js"></script>
+
+</body>
+</html>
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
new file mode 100644
index 00000000..9da121c2
--- /dev/null
+++ b/style/FeatherBB/view/header.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php _e('lang_identifier') ?>" lang="<?php _e('lang_identifier') ?>" dir="<?php _e('lang_direction') ?>">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
+<title><?php echo generate_page_title($page_title, $p) ?></title>
+<link rel="stylesheet" type="text/css" href="<?php echo get_base_url() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
+<?php
+
+echo $allow_index;
+echo $admin_console;
+
+if (isset($required_fields)) :
+    // Output JavaScript to validate form (make sure required fields are filled out)
+
+    ?>
+    <script type="text/javascript">
+        /* <![CDATA[ */
+        function process_form(the_form)
+        {
+            var required_fields = {
+                <?php
+                    // Output a JavaScript object with localised field names
+                    $tpl_temp = count($required_fields);
+                    foreach ($required_fields as $elem_orig => $elem_trans) {
+                        echo "\t\t\"".$elem_orig.'": "'.addslashes(str_replace('&#160;', ' ', $elem_trans));
+                        if (--$tpl_temp) {
+                            echo "\",\n";
+                        } else {
+                            echo "\"\n\t};\n";
+                        }
+                    }
+                    ?>
+                if (document.all || document.getElementById)
+            {
+                for (var i = 0; i < the_form.length; ++i)
+                {
+                    var elem = the_form.elements[i];
+                    if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
+                    {
+                        alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
+                        elem.focus();
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        /* ]]> */
+    </script>
+    <?php
+endif;
+if (!empty($page_head)) :
+    echo implode("\n", $page_head)."\n";
+endif;
+?>
+</head>
+
+<body id="pun<?= $active_page ?>"<?= $focus_element; ?>>
+
+<header>
+
+    <nav>
+        <div class="container">
+            <div class="phone-menu" id="phone-button">
+                <a class="button-phone"></a>
+            </div>
+            <div id="phone">
+                <?php echo $navlinks ?>
+                <div class="navbar-right">
+                    <form method="get" action="/search" class="nav-search">
+                        <input type="hidden" name="action" value="search">
+                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php _e('Search') ?>">
+                    </form>
+                </div>
+            </div>
+        </div>
+    </nav>
+
+    <div class="container">
+        <div class="container-title-status">
+            <h1 class="title-site">
+                <a href="<?php echo get_base_url() ?>" title="" class="site-name">
+                    <p><?php echo feather_escape($feather_config['o_board_title']) ?></p>
+                </a>
+                <div id="brddesc"><?php echo htmlspecialchars_decode($feather_config['o_board_desc']) ?></div>
+            </h1>
+            <div class="status-avatar">
+                <?php echo $page_info ?>
+            </div>
+            <div class="clear"></div>
+        </div>
+        <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
+            <div id="announce" class="block">
+                <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
+                <div class="box">
+                    <div id="announce-block" class="inbox">
+                        <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
+                    </div>
+                </div>
+            </div>
+        <?php endif; ?>
+        <?php if (isset($flash['message'])) : ?>
+            <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
+            <div id="msgflash" class="block">
+                <h2><span><?php _e('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
+                <div class="box">
+                    <div class="inbox">
+                        <p><?php echo feather_escape($flash['message']) ?></p>
+                    </div>
+                </div>
+            </div>
+            <script type="text/javascript">fadeIn('msgflash', 0);</script>
+        <?php endif; ?>
+    </div>
+
+</header>
+
+<section class="container">
+    <div id="brdmain">
diff --git a/style/FeatherBB/view/help.php b/style/FeatherBB/view/help.php
new file mode 100644
index 00000000..b5477db4
--- /dev/null
+++ b/style/FeatherBB/view/help.php
@@ -0,0 +1,141 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<h2><span><?php _e('BBCode') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><a name="bbcode"></a><?php _e('BBCode info 1') ?></p>
+		<p><?php _e('BBCode info 2') ?></p>
+	</div>
+</div>
+<h2><span><?php _e('Text style') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><?php _e('Text style info') ?></p>
+		<p><code>[b]<?php _e('Bold text') ?>[/b]</code> <?php _e('produces') ?> <samp><strong><?php _e('Bold text') ?></strong></samp></p>
+		<p><code>[u]<?php _e('Underlined text') ?>[/u]</code> <?php _e('produces') ?> <samp><span class="bbu"><?php _e('Underlined text') ?></span></samp></p>
+		<p><code>[i]<?php _e('Italic text') ?>[/i]</code> <?php _e('produces') ?> <samp><em><?php _e('Italic text') ?></em></samp></p>
+		<p><code>[s]<?php _e('Strike-through text') ?>[/s]</code> <?php _e('produces') ?> <samp><span class="bbs"><?php _e('Strike-through text') ?></span></samp></p>
+		<p><code>[del]<?php _e('Deleted text') ?>[/del]</code> <?php _e('produces') ?> <samp><del><?php _e('Deleted text') ?></del></samp></p>
+		<p><code>[ins]<?php _e('Inserted text') ?>[/ins]</code> <?php _e('produces') ?> <samp><ins><?php _e('Inserted text') ?></ins></samp></p>
+		<p><code>[em]<?php _e('Emphasised text') ?>[/em]</code> <?php _e('produces') ?> <samp><em><?php _e('Emphasised text') ?></em></samp></p>
+		<p><code>[color=#FF0000]<?php _e('Red text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: #ff0000"><?php _e('Red text') ?></span></samp></p>
+		<p><code>[color=blue]<?php _e('Blue text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: blue"><?php _e('Blue text') ?></span></samp></p>
+		<p><code>[h]<?php _e('Heading text') ?>[/h]</code> <?php _e('produces') ?></p> <div class="postmsg"><h5><?php _e('Heading text') ?></h5></div>
+	</div>
+</div>
+<h2><span><?php _e('Links and images') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><?php _e('Links info') ?></p>
+		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
+		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php _e('This help page') ?></a></samp></p>
+		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
+		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
+		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
+	</div>
+	<div class="inbox">
+		<p><a name="img"></a><?php _e('Images info') ?></p>
+		<p><code>[img=<?php _e('FluxBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php _e('FluxBB bbcode test') ?>" /></samp></p>
+	</div>
+</div>
+<h2><span><?php _e('Quotes') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><?php _e('Quotes info') ?></p>
+		<p><code>[quote=James]<?php _e('Quote text') ?>[/quote]</code></p>
+		<p><?php _e('produces quote box') ?></p>
+		<div class="postmsg">
+			<div class="quotebox"><cite>James <?php _e('wrote') ?></cite><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
+		</div>
+		<p><?php _e('Quotes info 2') ?></p>
+		<p><code>[quote]<?php _e('Quote text') ?>[/quote]</code></p>
+		<p><?php _e('produces quote box') ?></p>
+		<div class="postmsg">
+			<div class="quotebox"><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
+		</div>
+		<p><?php _e('quote note') ?></p>
+	</div>
+</div>
+<h2><span><?php _e('Code') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><?php _e('Code info') ?></p>
+		<p><code>[code]<?php _e('Code text') ?>[/code]</code></p>
+		<p><?php _e('produces code box') ?></p>
+		<div class="postmsg">
+			<div class="codebox"><pre><code><?php _e('Code text') ?></code></pre></div>
+		</div>
+	</div>
+</div>
+<h2><span><?php _e('Lists') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><a name="lists"></a><?php _e('List info') ?></p>
+		<p><code>[list][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php _e('produces list') ?></span></p>
+		<div class="postmsg">
+			<ul><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ul>
+		</div>
+		<p><code>[list=1][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php _e('produces decimal list') ?></span></p>
+		<div class="postmsg">
+			<ol class="decimal"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
+		</div>
+		<p><code>[list=a][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php _e('produces alpha list') ?></span></p>
+		<div class="postmsg">
+			<ol class="alpha"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
+		</div>
+	</div>
+</div>
+<h2><span><?php _e('Nested tags') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><?php _e('Nested tags info') ?></p>
+		<p><code>[b][u]<?php _e('Bold, underlined text') ?>[/u][/b]</code> <?php _e('produces') ?> <samp><strong><span class="bbu"><?php _e('Bold, underlined text') ?></span></strong></samp></p>
+	</div>
+</div>
+<h2><span><?php _e('Smilies') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><a name="smilies"></a><?php _e('Smilies info') ?></p>
+<?php
+
+// Display the smiley set
+require FEATHER_ROOT.'include/parser.php';
+
+$smiley_groups = array();
+
+foreach ($pd['smilies'] as $smiley_text => $smiley_data) {
+    $smiley_groups[$smiley_data['file']][] = $smiley_text;
+}
+
+foreach ($smiley_groups as $smiley_img => $smiley_texts) {
+    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
+}
+
+?>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/index.html b/style/FeatherBB/view/index.html
new file mode 100644
index 00000000..89337b2f
--- /dev/null
+++ b/style/FeatherBB/view/index.html
@@ -0,0 +1 @@
+<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/index.php b/style/FeatherBB/view/index.php
new file mode 100644
index 00000000..3142e1bd
--- /dev/null
+++ b/style/FeatherBB/view/index.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+if (empty($index_data)): ?>
+    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php _e('Empty board') ?></p></div></div></div>
+<?php endif;
+foreach ($index_data as $forum) {
+    if ($forum->cid != $cur_cat) :
+        if ($cur_cat != 0) :
+    ?>
+				</tbody>
+			</table>
+		</div>
+	</div>
+	</div>
+	<?php endif;
+    ?>
+	<div id="idx<?php echo $forum->cid ?>" class="blocktable">
+	<h2><span><?php echo feather_escape($forum->cat_name) ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Forum') ?></th>
+					<th class="tc2" scope="col"><?php _e('Topics') ?></th>
+					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
+					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+	<?php
+    $cur_cat = $forum->cid;
+    endif;
+    ?>
+				<tr class="<?php echo $forum->item_status ?>">
+					<td class="tcl">
+						<div class="<?php echo $forum->icon_type ?>"><div class="nosize"><?php echo forum_number_format($forum->forum_count_formatted) ?></div></div>
+						<div class="tclcon">
+							<div>
+								<?php echo $forum->forum_field."\n".$forum->moderators_formatted ?>
+							</div>
+						</div>
+					</td>
+					<td class="tc2"><?php echo forum_number_format($forum->num_topics_formatted) ?></td>
+					<td class="tc3"><?php echo forum_number_format($forum->num_posts_formatted) ?></td>
+					<td class="tcr"><?php echo $forum->last_post_formatted ?></td>
+				</tr>
+	<?php
+
+}
+if ($cur_cat > 0) :
+    ?>
+					</tbody>
+			</table>
+		</div>
+	</div>
+	</div>
+<?php
+endif;
+if (!empty($forum_actions)) :
+?>
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<p class="subscribelink clearb"><?php echo implode(' - ', $forum_actions); ?></p>
+	</div>
+</div>
+<?php
+endif;
+?>
+<div id="brdstats" class="block">
+	<h2><span><?php _e('Board info') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<dl class="conr">
+				<dt><strong><?php _e('Board stats') ?></strong></dt>
+				<dd><span><?php printf(__('No of users'), '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of topics'), '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of posts'), '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
+			</dl>
+			<dl class="conl">
+				<dt><strong><?php _e('User info') ?></strong></dt>
+				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
+				<?php if ($feather_config['o_users_online'] == 1) : ?>
+				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Guests online'), '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
+				<?php endif; ?>
+			</dl>
+			<?php
+            if ($feather_config['o_users_online'] == 1) :
+                if ($online['num_users'] > 0) {
+                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
+                } else {
+                    echo "\t\t\t".'<div class="clearer"></div>'."\n";
+                }
+            endif;
+            ?>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/install.php b/style/FeatherBB/view/install.php
new file mode 100644
index 00000000..c146b1b7
--- /dev/null
+++ b/style/FeatherBB/view/install.php
@@ -0,0 +1,222 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title><?php _e('FeatherBB Installation') ?></title>
+    <link rel="stylesheet" type="text/css" href="style/<?php echo $feather->forum_env['FORUM_NAME'] ?>.css" />
+</head>
+
+<body>
+    <div id="puninstall" class="pun">
+        <div class="top-box"><div><!-- Top Corners --></div></div>
+        <div class="punwrap">
+
+            <section class="container">
+                <div id="brdheader" class="block">
+                    <div class="box">
+                        <div id="brdtitle" class="inbox">
+                            <h1><span><?php _e('FeatherBB Installation') ?></span></h1>
+                            <div id="brddesc"><p><?php _e('Welcome') ?></p></div>
+                        </div>
+                    </div>
+                </div>
+            </section>
+
+            <section class="container">
+                <div id="brdmain">
+                    <?php if (count($languages) > 1): ?>
+                        <div class="blockform">
+                            <h2><span><?php _e('Choose install language') ?></span></h2>
+                            <div class="box">
+                                <form id="install" method="post" action="">
+                                    <input type="hidden" name="choose_lang" value="1">
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Install language') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Choose install language info') ?></p>
+                                                <label><strong><?php _e('Install language') ?></strong>
+                                                    <br /><select name="install_lang">
+                                                        <?php
+
+                                                        foreach ($languages as $lang) {
+                                                            echo "\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').'>'.$lang.'</option>'."\n";
+                                                        }
+
+                                                        ?>
+                                                    </select>
+                                                    <br /></label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                        <p class="buttons"><input type="submit" value="<?php _e('Change language') ?>" /></p>
+                                    </form>
+                                </div>
+                            </div>
+                        <?php endif;
+                        ?>
+
+                        <div class="blockform">
+                            <h2><span><?php echo sprintf(__('Install'), FORUM_VERSION) ?></span></h2>
+                            <div class="box">
+                                <form id="install" method="post" action="">
+                                    <?php if (!empty($errors)): ?>
+                                        <div class="inform">
+                                            <div class="forminfo error-info">
+                                                <h3><?php _e('Errors') ?></h3>
+                                                <ul class="error-list">
+                                                    <?php
+                                                    $errors = (!is_array($errors)) ? array($errors) : $errors;
+                                                    foreach ($errors as $error) {
+                                                        echo "\t\t\t\t\t\t".'<li><strong>'.$error.'</strong></li>'."\n";
+                                                    }
+                                                    ?>
+                                                </ul>
+                                            </div>
+                                        </div>
+                                        <?php endif;?>
+
+                                    <div class="inform">
+                                        <div class="forminfo">
+                                            <h3><?php _e('Database setup') ?></h3>
+                                            <p><?php _e('Info 1') ?></p>
+                                        </div>
+                                        <fieldset>
+                                            <legend><?php _e('Select database') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 2') ?></p>
+                                                <label class="required"><strong><?php _e('Database type') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <select name="install[db_type]" required>
+                                                    <?php
+
+                                                    foreach ($supported_dbs as $id => $db_type) {
+                                                        echo "\t\t\t\t\t\t\t".'<option value="'.$id.'">'.$db_type.'</option>'."\n";
+                                                    }
+
+                                                    ?>
+                                                </select>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database hostname') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 3') ?></p>
+                                                <label class="required"><strong><?php _e('Database server hostname') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[db_host]" size="50" required />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database enter name') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 4') ?></p>
+                                                <label class="required"><strong><?php _e('Database name') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[db_name]" size="30" required />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database enter informations') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 5') ?></p>
+                                                <label class="conl"><?php _e('Database username') ?></label>
+                                                <input type="text" name="install[db_user]" size="30" />
+                                                <label class="conl"><?php _e('Database password') ?></label>
+                                                <input type="password" name="install[db_pass]" size="30" />
+                                                <div class="clearer"></div>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database enter prefix') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 6') ?></p>
+                                                <label><?php _e('Table prefix') ?></label>
+                                                <input type="text" name="install[db_prefix]" size="20" maxlength="30" />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <div class="forminfo">
+                                            <h3><?php _e('Administration setup') ?></h3>
+                                            <p><?php _e('Info 7') ?></p>
+                                        </div>
+                                        <fieldset>
+                                            <legend><?php _e('Administration setup') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 8') ?></p>
+                                                <label class="required"><strong><?php _e('Administrator username') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[username]" size="25" maxlength="25" required />
+                                                <label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="password" name="install[password]" size="16" required />
+                                                <label class="conl required"><strong><?php _e('Confirm password') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="password" name="install[password_conf]" size="16" required />
+                                                <!-- <div class="clearer"></div> -->
+                                                <label class="required"><strong><?php _e('Administrator email') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[email]" size="50" maxlength="80" required />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <div class="forminfo">
+                                            <h3><?php _e('Board setup') ?></h3>
+                                            <p><?php _e('Info 11') ?></p>
+                                        </div>
+                                        <fieldset>
+                                            <legend><?php _e('General information') ?></legend>
+                                            <div class="infldset">
+                                                <label class="required"><strong><?php _e('Board title') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[title]" value="<? echo $data['title'] ?>" size="60" maxlength="255" required />
+                                                <label><?php _e('Board description') ?></label>
+                                                <input type="text" name="install[description]" value="<? echo $data['description'] ?>" size="60" maxlength="255" required />
+                                                <label class="required"><strong><?php _e('Base URL') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[base_url]" value="<? echo $data['base_url'] ?>" size="60" maxlength="100" required />
+                                                <label class="required"><strong><?php _e('Default language') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <select name="install[default_lang]" required />
+                                                <?php
+                                                foreach ($languages as $lang) {
+                                                    echo "\t\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').' >'.$lang.'</option>'."\n";
+                                                }
+                                                ?>
+                                            </select>
+                                        </div>
+                                    </fieldset>
+                                </div>
+
+                                <p class="buttons"><input type="submit" value="<?php _e('Start install') ?>" /></p>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </div>
+        <div class="end-box"><div><!-- Bottom Corners --></div></div>
+    </div>
+</body>
+</html>
diff --git a/style/FeatherBB/view/login/form.php b/style/FeatherBB/view/login/form.php
new file mode 100644
index 00000000..13d1744b
--- /dev/null
+++ b/style/FeatherBB/view/login/form.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Login') ?></span></h2>
+	<div class="box">
+		<form id="login" method="post" action="<?php echo get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Login legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
+						<label class="conl required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
+						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
+
+						<div class="rbox clearb">
+							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php _e('Remember me') ?><br /></label>
+						</div>
+
+						<p class="clearb"><?php _e('Login info') ?></p>
+						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="login" value="<?php _e('Login') ?>" tabindex="4" /></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/login/index.html b/style/FeatherBB/view/login/index.html
new file mode 100644
index 00000000..89337b2f
--- /dev/null
+++ b/style/FeatherBB/view/login/index.html
@@ -0,0 +1 @@
+<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/login/password_forgotten.php b/style/FeatherBB/view/login/password_forgotten.php
new file mode 100644
index 00000000..41c0a121
--- /dev/null
+++ b/style/FeatherBB/view/login/password_forgotten.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+// If there are errors, we display them
+if (!empty($errors)) {
+    ?>
+<div id="posterror" class="block">
+	<h2><span><?php _e('New password errors') ?></span></h2>
+	<div class="box">
+		<div class="inbox error-info">
+			<p><?php _e('New passworderrors info') ?></p>
+			<ul class="error-list">
+<?php
+
+    foreach ($errors as $cur_error) {
+        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+    }
+    ?>
+			</ul>
+		</div>
+	</div>
+</div>
+
+<?php
+
+}
+?>
+<div class="blockform">
+	<h2><span><?php _e('Request pass') ?></span></h2>
+	<div class="box">
+		<form id="request_pass" method="post" action="<?php echo get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Request pass legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
+						<p><?php _e('Request pass info') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="request_pass" value="<?php _e('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a><?php endif; ?></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/message.php b/style/FeatherBB/view/message.php
new file mode 100644
index 00000000..740b040e
--- /dev/null
+++ b/style/FeatherBB/view/message.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="msg" class="block">
+	<h2><span><?php _e('Info') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<p><?php echo $message ?></p>
+<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php _e('Go back') ?></a></p>
+<?php endif;
+    ?>		</div>
+	</div>
+</div>
diff --git a/style/FeatherBB/view/misc/email.php b/style/FeatherBB/view/misc/email.php
new file mode 100644
index 00000000..eb44dafb
--- /dev/null
+++ b/style/FeatherBB/view/misc/email.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="emailform" class="blockform">
+	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
+	<div class="box">
+		<form id="email" method="post" action="<?php echo get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Write email') ?></legend>
+					<div class="infldset txtarea">
+						<input type="hidden" name="form_sent" value="1" />
+						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
+						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
+						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
+						<p><?php _e('Email disclosure note') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/misc/index.html b/style/FeatherBB/view/misc/index.html
new file mode 100644
index 00000000..89337b2f
--- /dev/null
+++ b/style/FeatherBB/view/misc/index.html
@@ -0,0 +1 @@
+<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/misc/report.php b/style/FeatherBB/view/misc/report.php
new file mode 100644
index 00000000..252042c7
--- /dev/null
+++ b/style/FeatherBB/view/misc/report.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox">
+		<ul class="crumbs">
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
+		</ul>
+	</div>
+</div>
+
+<div id="reportform" class="blockform">
+	<h2><span><?php _e('Report post') ?></span></h2>
+	<div class="box">
+		<form id="report" method="post" action="<?php echo get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Reason desc') ?></legend>
+					<div class="infldset txtarea">
+						<input type="hidden" name="form_sent" value="1" />
+						<label class="required"><strong><?php _e('Reason') ?> <span><?php _e('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/misc/rules.php b/style/FeatherBB/view/misc/rules.php
new file mode 100644
index 00000000..366880ee
--- /dev/null
+++ b/style/FeatherBB/view/misc/rules.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="rules" class="block">
+	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
+	<div class="box">
+		<div id="rules-block" class="inbox">
+			<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/delete_posts.php b/style/FeatherBB/view/moderate/delete_posts.php
new file mode 100644
index 00000000..00b80920
--- /dev/null
+++ b/style/FeatherBB/view/moderate/delete_posts.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Delete posts') ?></span></h2>
+	<div class="box">
+		<form method="post" action="">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Confirm delete legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
+						<p><?php _e('Delete posts comply') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/delete_topics.php b/style/FeatherBB/view/moderate/delete_topics.php
new file mode 100644
index 00000000..d0ab1eed
--- /dev/null
+++ b/style/FeatherBB/view/moderate/delete_topics.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="blockform">
+	<h2><span><?php _e('Delete topics') ?></span></h2>
+	<div class="box">
+		<form method="post" action="">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Confirm delete legend') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Delete topics comply') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/index.html b/style/FeatherBB/view/moderate/index.html
new file mode 100644
index 00000000..89337b2f
--- /dev/null
+++ b/style/FeatherBB/view/moderate/index.html
@@ -0,0 +1 @@
+<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/moderate/merge_topics.php b/style/FeatherBB/view/moderate/merge_topics.php
new file mode 100644
index 00000000..820cedee
--- /dev/null
+++ b/style/FeatherBB/view/moderate/merge_topics.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="blockform">
+	<h2><span><?php _e('Merge topics') ?></span></h2>
+	<div class="box">
+		<form method="post" action="">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Confirm merge legend') ?></legend>
+					<div class="infldset">
+						<div class="rbox">
+							<label><input type="checkbox" name="with_redirect" value="1" /><?php _e('Leave redirect') ?><br /></label>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php _e('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/moderator_forum.php b/style/FeatherBB/view/moderate/moderator_forum.php
new file mode 100644
index 00000000..35b67b41
--- /dev/null
+++ b/style/FeatherBB/view/moderate/moderator_forum.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<form method="post" action="<?php echo get_link('moderate/forum/'.$id.'/') ?>">
+<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<input type="hidden" name="page" value="<?php echo feather_escape($p) ?>" />
+<div id="vf" class="blocktable">
+	<h2><span><?php echo feather_escape($cur_forum['forum_name']) ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
+					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php endif; ?>					<th class="tcr"><?php _e('Last post') ?></th>
+					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+			
+			<?php
+            $topic_count = 0;
+            $button_status = '';
+            foreach ($topic_data as $topic) {
+                ++$topic_count;
+                ?>
+							<tr class="<?php echo $topic['item_status'] ?>">
+					<td class="tcl">
+						<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo forum_number_format($topic_count + $start_from) ?></div></div>
+						<div class="tclcon">
+							<div>
+								<?php echo $topic['subject_disp']."\n" ?>
+							</div>
+						</div>
+					</td>
+					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_replies']) : '-' ?></td>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_views']) : '-' ?></td>
+<?php endif;
+                ?>					<td class="tcr"><?php echo $topic['last_post_disp'] ?></td>
+					<td class="tcmod"><input type="checkbox" name="topics[<?php echo $topic['id'] ?>]" value="1" /></td>
+				</tr>
+			<?php
+
+            }
+            if (empty($topic_data)):
+                $colspan = ($feather_config['o_topic_views'] == '1') ? 5 : 4;
+                $button_status = ' disabled="disabled"';
+                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
+            endif;
+            ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php _e('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php _e('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php _e('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php _e('Close') ?>"<?php echo $button_status ?> /></p>
+			<div class="clearer"></div>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
+		</ul>
+		<div class="clearer"></div>
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/move_topics.php b/style/FeatherBB/view/moderate/move_topics.php
new file mode 100644
index 00000000..e72ae5cb
--- /dev/null
+++ b/style/FeatherBB/view/moderate/move_topics.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="blockform">
+	<h2><span><?php echo($action == 'single') ? __('Move topic') : __('Move topics') ?></span></h2>
+	<div class="box">
+		<form method="post" action="">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+			<input type="hidden" name="topics" value="<?php echo $topics ?>" />
+				<fieldset>
+					<legend><?php _e('Move legend') ?></legend>
+					<div class="infldset">
+						<label><?php _e('Move to') ?>
+						<br /><select name="move_to_forum">
+								<?php echo $list_forums ?>
+							</optgroup>
+						</select>
+						<br /></label>
+						<div class="rbox">
+							<label><input type="checkbox" name="with_redirect" value="1"<?php if ($action == 'single') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Leave redirect') ?><br /></label>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php _e('Move') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/posts_view.php b/style/FeatherBB/view/moderate/posts_view.php
new file mode 100644
index 00000000..482a1c49
--- /dev/null
+++ b/style/FeatherBB/view/moderate/posts_view.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<form method="post" action="">
+<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<?php
+$post_count = 0; // Keep track of post numbers
+foreach ($post_data as $post) {
+    $post_count++;
+    ?>
+	<div id="p<?php echo $post['id'] ?>" class="blockpost<?php if ($post['id'] == $cur_topic['first_post_id']) {
+    echo ' firstpost';
+}
+    ?><?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($post_count == 1) {
+    echo ' blockpost1';
+}
+    ?>">
+		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<div class="postbody">
+					<div class="postleft">
+						<dl>
+							<dt><strong><?php echo $post['poster_disp'] ?></strong></dt>
+							<dd class="usertitle"><strong><?php echo $post['user_title'] ?></strong></dd>
+						</dl>
+					</div>
+					<div class="postright">
+						<h3 class="nosize"><?php _e('Message') ?></h3>
+						<div class="postmsg">
+							<?php echo $post['message']."\n" ?>
+	<?php if ($post['edited'] != '') {
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+}
+    ?>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="inbox">
+				<div class="postfoot clearb">
+					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.__('Select').'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.__('Cannot select first').'</p>' ?></div>
+				</div>
+			</div>
+		</div>
+	</div>
+<?php
+
+}
+?>
+
+<div class="postlinksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php _e('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /></p>
+			<div class="clearer"></div>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
+		</ul>
+		<div class="clearer"></div>
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/style/FeatherBB/view/moderate/split_posts.php b/style/FeatherBB/view/moderate/split_posts.php
new file mode 100644
index 00000000..7c59b0b9
--- /dev/null
+++ b/style/FeatherBB/view/moderate/split_posts.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Split posts') ?></span></h2>
+	<div class="box">
+		<form id="subject" method="post" action="">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Confirm split legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
+						<label class="required"><strong><?php _e('New subject') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
+						<label><?php _e('Move to') ?>
+						<br /><select name="move_to_forum">
+								<?php echo $list_forums ?>
+							</optgroup>
+						</select>
+						<br /></label>
+						<p><?php _e('Split posts comply') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php _e('Split') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/post.php b/style/FeatherBB/view/post.php
new file mode 100644
index 00000000..f1d22d07
--- /dev/null
+++ b/style/FeatherBB/view/post.php
@@ -0,0 +1,213 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="linkst">
+	<div class="inbox">
+		<ul class="crumbs">
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
+<?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
+<?php endif; ?>
+<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_posting['subject']) ?></a></li>
+<?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
+		</ul>
+	</div>
+</div>
+
+<?php
+
+// If there are errors, we display them
+if (!empty($errors)) {
+    ?>
+<div id="posterror" class="block">
+	<h2><span><?php _e('Post errors') ?></span></h2>
+	<div class="box">
+		<div class="inbox error-info">
+			<p><?php _e('Post errors info') ?></p>
+			<ul class="error-list">
+<?php
+
+    foreach ($errors as $cur_error) {
+        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+    }
+    ?>
+			</ul>
+		</div>
+	</div>
+</div>
+
+<?php
+
+} elseif ($feather->request->post('preview')) {
+    require_once FEATHER_ROOT.'include/parser.php';
+    $preview_message = parse_message($post['message'], $post['hide_smilies']);
+
+    ?>
+<div id="postpreview" class="blockpost">
+	<h2><span><?php _e('Post preview') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<div class="postbody">
+				<div class="postright">
+					<div class="postmsg">
+						<?php echo $preview_message."\n" ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<?php
+
+}
+
+
+$cur_index = 1;
+
+?>
+<!-- Init BBcode editor toolbar -->
+<script>
+    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
+        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
+</script>
+<script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
+
+<div id="postform" class="blockform">
+	<h2><span><?php echo $action ?></span></h2>
+	<div class="box">
+		<?php echo $form."\n" ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Write message legend') ?></legend>
+					<div class="infldset txtarea">
+						<input type="hidden" name="form_sent" value="1" />
+                                                <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<?php
+if ($feather->user->is_guest) {
+    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+    $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
+    ?>
+						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
+    echo feather_escape($post['username']);
+}
+    ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
+    echo feather_escape($post['email']);
+}
+    ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<div class="clearer"></div>
+<?php
+
+}
+if ($fid): ?>
+						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
+    echo feather_escape($post['subject']);
+} ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
+                        <script>postEditorToolbar('req_message');</script>
+						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
+						<ul class="bblinks">
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+						</ul>
+					</div>
+				</fieldset>
+<?php
+if (!empty($checkboxes)) {
+    ?>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Options') ?></legend>
+					<div class="infldset">
+						<div class="rbox">
+							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
+						</div>
+					</div>
+				</fieldset>
+<?php
+
+}
+
+?>
+			</div>
+			<?php if ($feather->user->is_guest) : ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Robot title') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Robot info')    ?></p>
+						<label class="required"><strong><?php
+                             $question = array_keys($lang_antispam_questions);
+                             $qencoded = md5($question[$index_questions]);
+                             echo sprintf(__('Robot question'), $question[$index_questions]);?>
+							 <span><?php _e('Required') ?></span></strong>
+							 <br />
+							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
+						</label>
+					</div>
+				</fieldset>
+			</div>
+			<?php endif; ?>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
+
+
+<?php
+if ($tid && $feather_config['o_topic_review'] != '0') :
+?>
+<div id="postreview">
+	<h2><span><?php _e('Topic review') ?></span></h2>
+
+	<?php
+    // Set background switching on
+    $post_count = 0;
+
+    foreach ($post_data as $post) {
+        ++$post_count;
+        ?>
+	<div class="blockpost">
+	<div class="box<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?>">
+		<div class="inbox">
+			<div class="postbody">
+				<div class="postleft">
+					<dl>
+						<dt><strong><?php echo feather_escape($post['poster']) ?></strong></dt>
+						<dd><span><?php echo format_time($post['posted']) ?></span></dd>
+					</dl>
+				</div>
+				<div class="postright">
+					<div class="postmsg">
+						<?php echo $post['message']."\n" ?>
+					</div>
+				</div>
+			</div>
+			<div class="clearer"></div>
+		</div>
+	</div>
+</div>
+	<?php
+
+    }
+    ?>
+
+</div>
+<?php endif;?>
diff --git a/style/FeatherBB/view/profile/change_mail.php b/style/FeatherBB/view/profile/change_mail.php
new file mode 100644
index 00000000..f8d25e99
--- /dev/null
+++ b/style/FeatherBB/view/profile/change_mail.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Change email') ?></span></h2>
+	<div class="box">
+		<form id="change_email" method="post" action="<?php echo get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Email legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<label class="required"><strong><?php _e('New email') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
+						<label class="required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
+						<p><?php _e('Email instructions') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="new_email" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/change_pass.php b/style/FeatherBB/view/profile/change_pass.php
new file mode 100644
index 00000000..3f4285fb
--- /dev/null
+++ b/style/FeatherBB/view/profile/change_pass.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Change pass') ?></span></h2>
+	<div class="box">
+		<form id="change_pass" method="post" action="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<input type="hidden" name="form_sent" value="1" />
+				<fieldset>
+					<legend><?php _e('Change pass legend') ?></legend>
+					<div class="infldset">
+<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php _e('Old pass') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input type="password" name="req_old_password" size="16" /><br /></label>
+<?php endif; ?>						<label class="conl required"><strong><?php _e('New pass') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input type="password" name="req_new_password1" size="16" /><br /></label>
+						<label class="conl required"><strong><?php _e('Confirm new pass') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input type="password" name="req_new_password2" size="16" /><br /></label>
+						<p class="clearb"><?php _e('Pass info') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/delete_user.php b/style/FeatherBB/view/profile/delete_user.php
new file mode 100644
index 00000000..0fd42f52
--- /dev/null
+++ b/style/FeatherBB/view/profile/delete_user.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Confirm delete user') ?></span></h2>
+	<div class="box">
+		<form id="confirm_del_user" method="post" action="<?php echo get_link('user/'.$id.'/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Confirm delete legend') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Confirmation info').' <strong>'.feather_escape($username).'</strong>.' ?></p>
+						<div class="rbox">
+							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
+						</div>
+						<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/index.html b/style/FeatherBB/view/profile/index.html
new file mode 100644
index 00000000..89337b2f
--- /dev/null
+++ b/style/FeatherBB/view/profile/index.html
@@ -0,0 +1 @@
+<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/profile/menu.php b/style/FeatherBB/view/profile/menu.php
new file mode 100644
index 00000000..4627f8db
--- /dev/null
+++ b/style/FeatherBB/view/profile/menu.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="profile" class="block2col">
+	<div class="blockmenu">
+		<h2><span><?php _e('Profile menu') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<ul>
+					<li<?php if ($page == 'essentials') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
+					<li<?php if ($page == 'personal') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
+					<li<?php if ($page == 'messaging') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
+<?php if ($feather_config['o_avatars'] == '1' || $feather_config['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
+<?php endif;
+    ?>					<li<?php if ($page == 'display') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
+					<li<?php if ($page == 'privacy') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
+<?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
+<?php endif;
+    ?>				</ul>
+			</div>
+		</div>
+	</div>
diff --git a/style/FeatherBB/view/profile/section_admin.php b/style/FeatherBB/view/profile/section_admin.php
new file mode 100644
index 00000000..18ba2f12
--- /dev/null
+++ b/style/FeatherBB/view/profile/section_admin.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+	<div class="blockform">
+		<h2><span><?php echo feather_escape($user['username']).' - '.__('Section admin') ?></span></h2>
+		<div class="box">
+			<form id="profile7" method="post" action="<?php echo get_link('user/'.$id.'/section/admin/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+				<input type="hidden" name="form_sent" value="1" />
+					<fieldset>
+<?php
+
+        if ($feather->user->g_moderator == '1') {
+            ?>
+						<legend><?php _e('Delete ban legend') ?></legend>
+						<div class="infldset">
+							<p><input type="submit" name="ban" value="<?php _e('Ban user') ?>" /></p>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+        } else {
+            if ($feather->user->id != $id) {
+                ?>
+						<legend><?php _e('Group membership legend') ?></legend>
+						<div class="infldset">
+							<select id="group_id" name="group_id">
+                                                            <?php echo $group_list ?>
+							</select>
+							<input type="submit" name="update_group_membership" value="<?php _e('Save') ?>" />
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+<?php
+
+            }
+
+            ?>
+						<legend><?php _e('Delete ban legend') ?></legend>
+						<div class="infldset">
+							<input type="submit" name="delete_user" value="<?php _e('Delete user') ?>" /> <input type="submit" name="ban" value="<?php _e('Ban user') ?>" />
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+            if ($user['g_moderator'] == '1' || $user['g_id'] == FEATHER_ADMIN) {
+                ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Set mods legend') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Moderator in info') ?></p>
+                                                        <?php echo $forum_list ?>
+								</div>
+							</div>
+							<br class="clearb" /><input type="submit" name="update_forums" value="<?php _e('Update forums') ?>" />
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+            }
+        }
+
+?>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/section_display.php b/style/FeatherBB/view/profile/section_display.php
new file mode 100644
index 00000000..5da0f4b4
--- /dev/null
+++ b/style/FeatherBB/view/profile/section_display.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section display') ?></span></h2>
+	<div class="box">
+		<form id="profile5" method="post" action="<?php echo get_link('user/'.$id.'/section/display/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div><input type="hidden" name="form_sent" value="1" /></div>
+<?php
+
+    $styles = forum_list_styles();
+
+    // Only display the style selection box if there's more than one style available
+    if (count($styles) == 1) {
+        echo "\t\t\t".'<div><input type="hidden" name="form_style" value="'.$styles[0].'" /></div>'."\n";
+    } elseif (count($styles) > 1) {
+        ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Style legend') ?></legend>
+					<div class="infldset">
+						<label><?php _e('Styles') ?><br />
+						<select name="form_style">
+<?php
+
+        foreach ($styles as $temp) {
+            if ($user['style'] == $temp) {
+                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.str_replace('_', ' ', $temp).'</option>'."\n";
+            } else {
+                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.str_replace('_', ' ', $temp).'</option>'."\n";
+            }
+        }
+
+        ?>
+						</select>
+						<br /></label>
+					</div>
+				</fieldset>
+			</div>
+<?php
+
+    }
+
+?>
+<?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1' || $feather_config['o_signatures'] == '1' || $feather_config['o_avatars'] == '1' || ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1')): ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Post display legend') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Post display info') ?></p>
+						<div class="rbox">
+<?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Show smilies') ?><br /></label>
+<?php endif; if ($feather_config['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Show sigs') ?><br /></label>
+<?php endif; if ($feather_config['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Show avatars') ?><br /></label>
+<?php endif; if ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Show images') ?><br /></label>
+<?php endif; if ($feather_config['o_signatures'] == '1' && $feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Show images sigs') ?><br /></label>
+<?php endif; ?>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Pagination legend') ?></legend>
+					<div class="infldset">
+						<label class="conl"><?php _e('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
+						<label class="conl"><?php _e('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
+						<p class="clearb"><?php _e('Paginate info') ?> <?php _e('Leave blank') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/section_essentials.php b/style/FeatherBB/view/profile/section_essentials.php
new file mode 100644
index 00000000..0050f89c
--- /dev/null
+++ b/style/FeatherBB/view/profile/section_essentials.php
@@ -0,0 +1,258 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section essentials') ?></span></h2>
+	<div class="box">
+		<form id="profile1" method="post" action="<?php echo get_link('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Username and pass legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<?php echo $user_disp['username_field'] ?>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
+<?php endif; ?>						</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Email legend') ?></legend>
+					<div class="infldset">
+						<?php echo $user_disp['email_field'] ?>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Localisation legend') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Time zone info') ?></p>
+						<label><?php _e('Time zone')."\n" ?>
+						<br /><select name="form_timezone">
+							<option value="-12"<?php if ($user['timezone'] == -12) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-12:00') ?></option>
+							<option value="-11"<?php if ($user['timezone'] == -11) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-11:00') ?></option>
+							<option value="-10"<?php if ($user['timezone'] == -10) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-10:00') ?></option>
+							<option value="-9.5"<?php if ($user['timezone'] == -9.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-09:30') ?></option>
+							<option value="-9"<?php if ($user['timezone'] == -9) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-09:00') ?></option>
+							<option value="-8.5"<?php if ($user['timezone'] == -8.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-08:30') ?></option>
+							<option value="-8"<?php if ($user['timezone'] == -8) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-08:00') ?></option>
+							<option value="-7"<?php if ($user['timezone'] == -7) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-07:00') ?></option>
+							<option value="-6"<?php if ($user['timezone'] == -6) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-06:00') ?></option>
+							<option value="-5"<?php if ($user['timezone'] == -5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-05:00') ?></option>
+							<option value="-4"<?php if ($user['timezone'] == -4) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-04:00') ?></option>
+							<option value="-3.5"<?php if ($user['timezone'] == -3.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-03:30') ?></option>
+							<option value="-3"<?php if ($user['timezone'] == -3) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-03:00') ?></option>
+							<option value="-2"<?php if ($user['timezone'] == -2) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-02:00') ?></option>
+							<option value="-1"<?php if ($user['timezone'] == -1) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-01:00') ?></option>
+							<option value="0"<?php if ($user['timezone'] == 0) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC') ?></option>
+							<option value="1"<?php if ($user['timezone'] == 1) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+01:00') ?></option>
+							<option value="2"<?php if ($user['timezone'] == 2) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+02:00') ?></option>
+							<option value="3"<?php if ($user['timezone'] == 3) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+03:00') ?></option>
+							<option value="3.5"<?php if ($user['timezone'] == 3.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+03:30') ?></option>
+							<option value="4"<?php if ($user['timezone'] == 4) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+04:00') ?></option>
+							<option value="4.5"<?php if ($user['timezone'] == 4.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+04:30') ?></option>
+							<option value="5"<?php if ($user['timezone'] == 5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+05:00') ?></option>
+							<option value="5.5"<?php if ($user['timezone'] == 5.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+05:30') ?></option>
+							<option value="5.75"<?php if ($user['timezone'] == 5.75) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+05:45') ?></option>
+							<option value="6"<?php if ($user['timezone'] == 6) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+06:00') ?></option>
+							<option value="6.5"<?php if ($user['timezone'] == 6.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+06:30') ?></option>
+							<option value="7"<?php if ($user['timezone'] == 7) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+07:00') ?></option>
+							<option value="8"<?php if ($user['timezone'] == 8) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+08:00') ?></option>
+							<option value="8.75"<?php if ($user['timezone'] == 8.75) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+08:45') ?></option>
+							<option value="9"<?php if ($user['timezone'] == 9) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+09:00') ?></option>
+							<option value="9.5"<?php if ($user['timezone'] == 9.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+09:30') ?></option>
+							<option value="10"<?php if ($user['timezone'] == 10) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+10:00') ?></option>
+							<option value="10.5"<?php if ($user['timezone'] == 10.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+10:30') ?></option>
+							<option value="11"<?php if ($user['timezone'] == 11) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+11:00') ?></option>
+							<option value="11.5"<?php if ($user['timezone'] == 11.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+11:30') ?></option>
+							<option value="12"<?php if ($user['timezone'] == 12) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+12:00') ?></option>
+							<option value="12.75"<?php if ($user['timezone'] == 12.75) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+12:45') ?></option>
+							<option value="13"<?php if ($user['timezone'] == 13) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+13:00') ?></option>
+							<option value="14"<?php if ($user['timezone'] == 14) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+14:00') ?></option>
+						</select>
+						<br /></label>
+						<div class="rbox">
+							<label><input type="checkbox" name="form_dst" value="1"<?php if ($user['dst'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('DST') ?><br /></label>
+						</div>
+						<label><?php _e('Time format') ?>
+
+						<br /><select name="form_time_format">
+<?php
+                            foreach (array_unique($forum_time_formats) as $key => $time_format) {
+                                echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
+                                if ($user['time_format'] == $key) {
+                                    echo ' selected="selected"';
+                                }
+                                echo '>'. format_time(time(), false, null, $time_format, true, true);
+                                if ($key == 0) {
+                                    echo ' ('.__('Default').')';
+                                }
+                                echo "</option>\n";
+                            }
+                            ?>
+						</select>
+						<br /></label>
+						<label><?php _e('Date format') ?>
+
+						<br /><select name="form_date_format">
+<?php
+                            foreach (array_unique($forum_date_formats) as $key => $date_format) {
+                                echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
+                                if ($user['date_format'] == $key) {
+                                    echo ' selected="selected"';
+                                }
+                                echo '>'. format_time(time(), true, $date_format, null, false, true);
+                                if ($key == 0) {
+                                    echo ' ('.__('Default').')';
+                                }
+                                echo "</option>\n";
+                            }
+                            ?>
+						</select>
+						<br /></label>
+
+<?php
+
+    $languages = forum_list_langs();
+
+    // Only display the language selection box if there's more than one language available
+    if (count($languages) > 1) {
+        ?>
+						<label><?php _e('Language') ?>
+						<br /><select name="form_language">
+<?php
+
+        foreach ($languages as $temp) {
+            if ($user['language'] == $temp) {
+                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
+            } else {
+                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
+            }
+        }
+
+        ?>
+						</select>
+						<br /></label>
+<?php
+
+    }
+
+?>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('User activity') ?></legend>
+					<div class="infldset">
+						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
+						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
+						<?php echo $user_disp['posts_field'] ?>
+<?php if ($feather->user->is_admmod): ?>							<label><?php _e('Admin note') ?><br />
+						<input id="admin_note" type="text" name="admin_note" value="<?php echo feather_escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
+<?php endif; ?>						</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/section_messaging.php b/style/FeatherBB/view/profile/section_messaging.php
new file mode 100644
index 00000000..d944ee43
--- /dev/null
+++ b/style/FeatherBB/view/profile/section_messaging.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section messaging') ?></span></h2>
+	<div class="box">
+		<form id="profile3" method="post" action="<?php echo get_link('user/'.$id.'/section/messaging/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Contact details legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
+						<label><?php _e('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
+						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
+						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/section_personal.php b/style/FeatherBB/view/profile/section_personal.php
new file mode 100644
index 00000000..a765e0aa
--- /dev/null
+++ b/style/FeatherBB/view/profile/section_personal.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personal') ?></span></h2>
+	<div class="box">
+		<form id="profile2" method="post" action="<?php echo get_link('user/'.$id.'/section/personal/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Personal details legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
+<?php if (isset($title_field)): ?>							<?php echo $title_field ?>
+<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/section_personality.php b/style/FeatherBB/view/profile/section_personality.php
new file mode 100644
index 00000000..3624e5e6
--- /dev/null
+++ b/style/FeatherBB/view/profile/section_personality.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personality') ?></span></h2>
+	<div class="box">
+		<form id="profile4" method="post" action="<?php echo get_link('user/'.$id.'/section/personality/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div><input type="hidden" name="form_sent" value="1" /></div>
+<?php if ($feather_config['o_avatars'] == '1'): ?>				<div class="inform">
+				<fieldset id="profileavatar">
+					<legend><?php _e('Avatar legend') ?></legend>
+					<div class="infldset">
+<?php if ($user_avatar): ?>							<div class="useravatar"><?php echo $user_avatar ?></div>
+<?php endif; ?>							<p><?php _e('Avatar info') ?></p>
+						<p class="clearb actions"><?php echo $avatar_field ?></p>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; if ($feather_config['o_signatures'] == '1'): ?>				<div class="inform">
+				<fieldset>
+					<legend><?php _e('Signature legend') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Signature info') ?></p>
+						<div class="txtarea">
+							<label><?php printf(__('Sig max size'), forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
+							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
+						</div>
+						<ul class="bblinks">
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+						</ul>
+						<?php echo $signature_preview ?>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
diff --git a/style/FeatherBB/view/profile/section_privacy.php b/style/FeatherBB/view/profile/section_privacy.php
new file mode 100644
index 00000000..36930415
--- /dev/null
+++ b/style/FeatherBB/view/profile/section_privacy.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section privacy') ?></span></h2>
+	<div class="box">
+		<form id="profile6" method="post" action="<?php echo get_link('user/'.$id.'/section/privacy/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Privacy options legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<p><?php _e('Email setting info') ?></p>
+						<div class="rbox">
+							<label><input type="radio" name="form_email_setting" value="0"<?php if ($user['email_setting'] == '0') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Email setting 1') ?><br /></label>
+							<label><input type="radio" name="form_email_setting" value="1"<?php if ($user['email_setting'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Email setting 2') ?><br /></label>
+							<label><input type="radio" name="form_email_setting" value="2"<?php if ($user['email_setting'] == '2') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Email setting 3') ?><br /></label>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+<?php if ($feather_config['o_forum_subscriptions'] == '1' || $feather_config['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
+				<fieldset>
+					<legend><?php _e('Subscription legend') ?></legend>
+					<div class="infldset">
+						<div class="rbox">
+							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Notify full') ?><br /></label>
+<?php if ($feather_config['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Auto notify full') ?><br /></label>
+<?php endif; ?>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/upload_avatar.php b/style/FeatherBB/view/profile/upload_avatar.php
new file mode 100644
index 00000000..4131569c
--- /dev/null
+++ b/style/FeatherBB/view/profile/upload_avatar.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Upload avatar') ?></span></h2>
+	<div class="box">
+		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Upload avatar legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
+						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
+						<p><?php _e('Avatar desc').' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.__('bytes').' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="upload" value="<?php _e('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/profile/view_profile.php b/style/FeatherBB/view/profile/view_profile.php
new file mode 100644
index 00000000..d30181fd
--- /dev/null
+++ b/style/FeatherBB/view/profile/view_profile.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="viewprofile" class="block">
+	<h2><span><?php _e('Profile') ?></span></h2>
+	<div class="box">
+		<div class="fakeform">
+			<div class="inform">
+				<fieldset>
+				<legend><?php _e('Section personal') ?></legend>
+					<div class="infldset">
+						<dl>
+							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personal'])."\n" ?>
+						</dl>
+						<div class="clearer"></div>
+					</div>
+				</fieldset>
+			</div>
+<?php if (!empty($user_info['messaging'])): ?>			<div class="inform">
+				<fieldset>
+				<legend><?php _e('Section messaging') ?></legend>
+					<div class="infldset">
+						<dl>
+							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['messaging'])."\n" ?>
+						</dl>
+						<div class="clearer"></div>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; if (!empty($user_info['personality'])): ?>			<div class="inform">
+				<fieldset>
+				<legend><?php _e('Section personality') ?></legend>
+					<div class="infldset">
+						<dl>
+							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personality'])."\n" ?>
+						</dl>
+						<div class="clearer"></div>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; ?>			<div class="inform">
+				<fieldset>
+				<legend><?php _e('User activity') ?></legend>
+					<div class="infldset">
+						<dl>
+							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['activity'])."\n" ?>
+						</dl>
+						<div class="clearer"></div>
+					</div>
+				</fieldset>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/register/email.php b/style/FeatherBB/view/register/email.php
new file mode 100644
index 00000000..e26ad690
--- /dev/null
+++ b/style/FeatherBB/view/register/email.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div id="emailform" class="blockform">
+	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($recipient) ?></span></h2>
+	<div class="box">
+		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Write email') ?></legend>
+					<div class="infldset txtarea">
+						<input type="hidden" name="form_sent" value="1" />
+						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
+						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
+						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
+						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
+						<p><?php _e('Email disclosure note') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/register/form.php b/style/FeatherBB/view/register/form.php
new file mode 100644
index 00000000..f1a360ef
--- /dev/null
+++ b/style/FeatherBB/view/register/form.php
@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+// If there are errors, we display them
+if (!empty($errors)) {
+    ?>
+<div id="posterror" class="block">
+	<h2><span><?php _e('Registration errors') ?></span></h2>
+	<div class="box">
+		<div class="inbox error-info">
+			<p><?php _e('Registration errors info') ?></p>
+			<ul class="error-list">
+<?php
+
+    foreach ($errors as $cur_error) {
+        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+    }
+    ?>
+			</ul>
+		</div>
+	</div>
+</div>
+
+<?php
+
+}
+?>
+<div id="regform" class="blockform">
+	<h2><span><?php _e('Register') ?></span></h2>
+	<div class="box">
+		<form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
+		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<div class="forminfo">
+					<h3><?php _e('Important information') ?></h3>
+					<p><?php _e('Desc 1') ?></p>
+					<p><?php _e('Desc 2') ?></p>
+				</div>
+				<fieldset>
+					<legend><?php _e('Username legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<input type="hidden" name="username" value="" />
+						<input type="hidden" name="password" value="" />
+						<label class="required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
+    echo feather_escape($feather->request->post('req_user'));
+} ?>" size="25" maxlength="25" /><br /></label>
+					</div>
+				</fieldset>
+			</div>
+<?php if ($feather_config['o_regs_verify'] == '0'): ?>			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Pass legend') ?></legend>
+					<div class="infldset">
+						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
+    echo feather_escape($feather->request->post('req_password1'));
+} ?>" size="16" /><br /></label>
+						<label class="conl required"><strong><?php _e('Confirm pass') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
+    echo feather_escape($feather->request->post('req_password2'));
+} ?>" size="16" /><br /></label>
+						<p class="clearb"><?php _e('Pass info') ?></p>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; ?>			<div class="inform">
+				<fieldset>
+					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
+					<div class="infldset">
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
+<?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
+    echo feather_escape($feather->request->post('req_email1'));
+} ?>" size="50" maxlength="80" /><br /></label>
+<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
+    echo feather_escape($feather->request->post('req_email2'));
+} ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>					</div>
+				</fieldset>
+			</div>
+<?php
+        // Only display the language selection box if there's more than one language available
+        if (count($languages) > 1) {
+            ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Localisation legend') ?></legend>
+					<div class="infldset">
+							<label><?php _e('Language') ?>
+							<br /><select name="language">
+<?php
+
+            foreach ($languages as $temp) {
+                if ($feather_config['o_default_lang'] == $temp) {
+                    echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
+                } else {
+                    echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
+                }
+            }
+
+            ?>
+							</select>
+							<br /></label>
+					</div>
+				</fieldset>
+			</div>
+<?php
+
+        }
+?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Robot title') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Robot info')    ?></p>
+						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php _e('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="register" value="<?php _e('Register') ?>" /></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/register/index.html b/style/FeatherBB/view/register/index.html
new file mode 100644
index 00000000..89337b2f
--- /dev/null
+++ b/style/FeatherBB/view/register/index.html
@@ -0,0 +1 @@
+<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/register/rules.php b/style/FeatherBB/view/register/rules.php
new file mode 100644
index 00000000..cef62405
--- /dev/null
+++ b/style/FeatherBB/view/register/rules.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div id="rules" class="blockform">
+	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
+	<div class="box">
+		<form method="get" action="<?php echo get_link('register/') ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Rules legend') ?></legend>
+					<div class="infldset">
+						<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="agree" value="<?php _e('Agree') ?>" /> <input type="submit" name="cancel" value="<?php _e('Cancel') ?>" /></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/footer.php b/style/FeatherBB/view/search/footer.php
new file mode 100644
index 00000000..a73ed5aa
--- /dev/null
+++ b/style/FeatherBB/view/search/footer.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+if ($search['show_as'] == 'topics') :
+?>
+			</tbody>
+		</table>
+		</div>
+	</div>
+</div>
+
+<?php
+endif;
+?>
+
+<div class="postlinksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
+		</ul>
+<?php echo(!empty($search['forum_actions']) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $search['forum_actions']).'</p>'."\n" : '') ?>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/form.php b/style/FeatherBB/view/search/form.php
new file mode 100644
index 00000000..4731b068
--- /dev/null
+++ b/style/FeatherBB/view/search/form.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div id="searchform" class="blockform">
+	<h2><span><?php _e('Search') ?></span></h2>
+	<div class="box">
+		<form id="search" method="get" action="">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Search criteria legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="action" value="search" />
+						<label class="conl"><?php _e('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
+						<label class="conl"><?php _e('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
+						<p class="clearb"><?php _e('Search info') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Search in legend') ?></legend>
+					<div class="infldset">
+					<?php echo $forums ?>
+						<label class="conl"><?php _e('Search in')."\n" ?>
+						<br /><select id="search_in" name="search_in">
+							<option value="0"><?php _e('Message and subject') ?></option>
+							<option value="1"><?php _e('Message only') ?></option>
+							<option value="-1"><?php _e('Topic only') ?></option>
+						</select>
+						<br /></label>
+						<p class="clearl"><?php _e('Search in info') ?></p>
+<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Search results legend') ?></legend>
+					<div class="infldset">
+						<label class="conl"><?php _e('Sort by')."\n" ?>
+						<br /><select name="sort_by">
+							<option value="0"><?php _e('Sort by post time') ?></option>
+							<option value="1"><?php _e('Sort by author') ?></option>
+							<option value="2"><?php _e('Sort by subject') ?></option>
+							<option value="3"><?php _e('Sort by forum') ?></option>
+						</select>
+						<br /></label>
+						<label class="conl"><?php _e('Sort order')."\n" ?>
+						<br /><select name="sort_dir">
+							<option value="DESC"><?php _e('Descending') ?></option>
+							<option value="ASC"><?php _e('Ascending') ?></option>
+						</select>
+						<br /></label>
+						<label class="conl"><?php _e('Show as')."\n" ?>
+						<br /><select name="show_as">
+							<option value="topics"><?php _e('Show as topics') ?></option>
+							<option value="posts"><?php _e('Show as posts') ?></option>
+						</select>
+						<br /></label>
+						<p class="clearb"><?php _e('Search results info') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/header.php b/style/FeatherBB/view/search/header.php
new file mode 100644
index 00000000..01af597a
--- /dev/null
+++ b/style/FeatherBB/view/search/header.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<?php
+if ($search['show_as'] == 'topics') :
+?>
+<div id="vf" class="blocktable">
+	<h2><span><?php _e('Search results') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
+					<th class="tc2" scope="col"><?php _e('Forum') ?></th>
+					<th class="tc3" scope="col"><?php _e('Replies') ?></th>
+					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+endif;
diff --git a/style/FeatherBB/view/search/index.html b/style/FeatherBB/view/search/index.html
new file mode 100644
index 00000000..89337b2f
--- /dev/null
+++ b/style/FeatherBB/view/search/index.html
@@ -0,0 +1 @@
+<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/search/posts.php b/style/FeatherBB/view/search/posts.php
new file mode 100644
index 00000000..c575f9c2
--- /dev/null
+++ b/style/FeatherBB/view/search/posts.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockpost<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($cur_search['pid'] == $cur_search['first_post_id']) {
+    echo ' firstpost';
+} ?><?php if ($post_count == 1) {
+    echo ' blockpost1';
+} ?><?php if ($cur_search['item_status'] != '') {
+    echo ' '.$cur_search['item_status'];
+} ?>">
+<h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
+    _e('Re').' ';
+} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
+<div class="box">
+	<div class="inbox">
+		<div class="postbody">
+			<div class="postleft">
+				<dl>
+					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
+<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
+<?php endif; ?>
+					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
+				</dl>
+			</div>
+			<div class="postright">
+				<div class="postmsg">
+					<?php echo $cur_search['message']."\n" ?>
+				</div>
+			</div>
+			<div class="clearer"></div>
+		</div>
+	</div>
+	<div class="inbox">
+		<div class="postfoot clearb">
+			<div class="postfootright">
+				<ul>
+					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
+					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/search/topics.php b/style/FeatherBB/view/search/topics.php
new file mode 100644
index 00000000..af843193
--- /dev/null
+++ b/style/FeatherBB/view/search/topics.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<tr class="<?php echo $cur_search['item_status'] ?>">
+	<td class="tcl">
+		<div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo forum_number_format($topic_count + $start_from) ?></div></div>
+		<div class="tclcon">
+			<div>
+				<?php echo $subject."\n" ?>
+			</div>
+		</div>
+	</td>
+	<td class="tc2"><?php echo $forum ?></td>
+	<td class="tc3"><?php echo forum_number_format($cur_search['num_replies']) ?></td>
+	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
+</tr>
\ No newline at end of file
diff --git a/style/FeatherBB/view/userlist.php b/style/FeatherBB/view/userlist.php
new file mode 100644
index 00000000..26c24027
--- /dev/null
+++ b/style/FeatherBB/view/userlist.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="blockform">
+	<h2><span><?php _e('User search') ?></span></h2>
+	<div class="box">
+		<form id="userlist" method="get" action="">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('User find legend') ?></legend>
+					<div class="infldset">
+<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
+<?php endif; ?>						<label class="conl"><?php _e('User group')."\n" ?>
+						<br /><select name="show_group">
+							<option value="-1"<?php if ($show_group == -1) {
+    echo ' selected="selected"';
+} ?>><?php _e('All users') ?></option>
+<?php echo $dropdown_menu ?>
+						</select>
+						<br /></label>
+						<label class="conl"><?php _e('Sort by')."\n" ?>
+						<br /><select name="sort_by">
+							<option value="username"<?php if ($sort_by == 'username') {
+    echo ' selected="selected"';
+} ?>><?php _e('Username') ?></option>
+							<option value="registered"<?php if ($sort_by == 'registered') {
+    echo ' selected="selected"';
+} ?>><?php _e('Registered') ?></option>
+<?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
+    echo ' selected="selected"';
+} ?>><?php _e('No of posts') ?></option>
+<?php endif; ?>						</select>
+						<br /></label>
+						<label class="conl"><?php _e('Sort order')."\n" ?>
+						<br /><select name="sort_dir">
+							<option value="ASC"<?php if ($sort_dir == 'ASC') {
+    echo ' selected="selected"';
+} ?>><?php _e('Ascending') ?></option>
+							<option value="DESC"<?php if ($sort_dir == 'DESC') {
+    echo ' selected="selected"';
+} ?>><?php _e('Descending') ?></option>
+						</select>
+						<br /></label>
+						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? __('User search info').' ' : '').__('User sort info'); ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
+		</form>
+	</div>
+</div>
+
+<div class="linkst">
+	<div class="inbox">
+		<p class="pagelink"><?php echo $paging_links ?></p>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<div id="users1" class="blocktable">
+	<h2><span><?php _e('User list') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Username') ?></th>
+					<th class="tc2" scope="col"><?php _e('Title') ?></th>
+<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Registered') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+			<?php
+            foreach ($userlist_data as $user) {
+                ?>
+					<tr>
+						<td class="tcl"><?php echo '<a href="'.get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
+						<td class="tc2"><?php echo get_title($user) ?></td>
+	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo forum_number_format($user['num_posts']) ?></td>
+	<?php endif;
+                ?>
+						<td class="tcr"><?php echo format_time($user['registered'], true) ?></td>
+					</tr>
+			<?php
+
+            }
+            if (empty($userlist_data)) {
+                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.__('No hits').'</td></tr>'."\n";
+            }
+            ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox">
+		<p class="pagelink"><?php echo $paging_links ?></p>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/viewforum.php b/style/FeatherBB/view/viewforum.php
new file mode 100644
index 00000000..a35faf22
--- /dev/null
+++ b/style/FeatherBB/view/viewforum.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+<?php echo $post_link ?>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<div id="vf" class="blocktable">
+	<h2><span><?php echo feather_escape($cur_forum['forum_name']) ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
+					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
+<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+			<?php
+            $topic_count = 0;
+            foreach ($forum_data as $topic) {
+                ++$topic_count;
+                ?>
+					<tr class="<?php echo $topic['item_status'] ?>">
+						<td class="tcl">
+							<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo forum_number_format($topic_count + $start_from) ?></div></div>
+							<div class="tclcon">
+								<div>
+									<?php echo $topic['subject_formatted']."\n" ?>
+								</div>
+							</div>
+						</td>
+						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_replies']) : '-' ?></td>
+	<?php if ($feather_config['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_views']) : '-' ?></td>
+	<?php endif;
+                ?>					<td class="tcr"><?php echo $topic['last_post_formatted'] ?></td>
+					</tr>
+			<?php
+
+            }
+            if (empty($forum_data)):
+            ?>
+					<tr class="rowodd inone">
+						<td class="tcl" colspan="<?php echo($feather_config['o_topic_views'] == 1) ? 4 : 3 ?>">
+							<div class="icon inone"><div class="nosize"><!-- --></div></div>
+							<div class="tclcon">
+								<div>
+									<strong><?php _e('Empty forum') ?></strong>
+								</div>
+							</div>
+						</td>
+					</tr>
+			<?php
+            endif;
+            ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+<?php echo $post_link ?>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
+		</ul>
+<?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/FeatherBB/view/viewtopic.php b/style/FeatherBB/view/viewtopic.php
new file mode 100644
index 00000000..e2681757
--- /dev/null
+++ b/style/FeatherBB/view/viewtopic.php
@@ -0,0 +1,204 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+<?php echo $post_link ?>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<?php
+$post_count = 1;
+foreach ($post_data as $post) {
+    ?>
+<div id="p<?php echo $post['id'] ?>" class="blockpost<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($post['id'] == $cur_topic['first_post_id']) {
+    echo ' firstpost';
+}
+    ?><?php if ($post_count == 1) {
+    echo ' blockpost1';
+}
+    ?>">
+	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<div class="postbody">
+				<div class="postleft">
+					<dl>
+						<dt><strong><?php echo $post['username_formatted'] ?></strong></dt>
+						<dd class="usertitle"><strong><?php echo $post['user_title_formatted'] ?></strong></dd>
+<?php if ($post['user_avatar'] != '') {
+    echo "\t\t\t\t\t\t".'<dd class="postavatar">'.$post['user_avatar'].'</dd>'."\n";
+}
+    ?>
+<?php if (count($post['user_info'])) {
+    echo "\t\t\t\t\t\t".implode("\n\t\t\t\t\t\t", $post['user_info'])."\n";
+}
+    ?>
+<?php if (count($post['user_contacts'])) {
+    echo "\t\t\t\t\t\t".'<dd class="usercontacts">'.implode(' ', $post['user_contacts']).'</dd>'."\n";
+}
+    ?>
+					</dl>
+				</div>
+				<div class="postright">
+					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
+    _e('Re').' ';
+}
+    ?><?php echo feather_escape($cur_topic['subject']) ?></h3>
+					<div class="postmsg">
+						<?php echo $post['message']."\n" ?>
+<?php if ($post['edited'] != '') {
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+}
+    ?>
+					</div>
+<?php if ($post['signature_formatted'] != '') {
+    echo "\t\t\t\t\t".'<div class="postsignature postmsg"><hr />'.$post['signature_formatted'].'</div>'."\n";
+}
+    ?>
+				</div>
+			</div>
+		</div>
+		<div class="inbox">
+			<div class="postfoot clearb">
+				<div class="postfootleft"><?php if ($post['poster_id'] > 1) {
+    echo '<p>'.$post['is_online_formatted'].'</p>';
+}
+    ?></div>
+<?php if (count($post['post_actions'])) {
+    echo "\t\t\t\t".'<div class="postfootright">'."\n\t\t\t\t\t".'<ul>'."\n\t\t\t\t\t\t".implode("\n\t\t\t\t\t\t", $post['post_actions'])."\n\t\t\t\t\t".'</ul>'."\n\t\t\t\t".'</div>'."\n";
+}
+    ?>
+			</div>
+		</div>
+	</div>
+</div>
+<?php
+    ++$post_count;
+}
+?>
+
+<div class="postlinksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+<?php echo $post_link ?>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
+		</ul>
+<?php echo $subscraction ?>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<?php
+
+// Display quick post if enabled
+if ($quickpost) {
+    $cur_index = 1;
+
+    ?>
+<div id="quickpost" class="blockform">
+	<h2><span><?php _e('Quick post') ?></span></h2>
+	<div class="box">
+		<form id="quickpostform" method="post" action="<?php echo get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Write message legend') ?></legend>
+					<div class="infldset txtarea">
+						<input type="hidden" name="form_sent" value="1" />
+						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
+						<input type="hidden" name="page" value="<?php echo feather_escape($p) ?>" />
+<?php if ($feather_config['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
+<?php endif;
+
+    if ($feather->user->is_guest) {
+        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+        $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
+        ?>
+						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<div class="clearer"></div>
+<?php
+
+    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.__('Message').' <span>'.__('Required').'</span></strong><br />';
+    } else {
+        echo "\t\t\t\t\t\t".'<label>';
+    }
+
+    ?>
+<!-- Init BBcode editor toolbar -->
+<script>
+    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
+        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
+</script>
+<script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
+<script>postEditorToolbar('req_message');</script>
+
+<textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
+						<ul class="bblinks">
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
+    ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+    ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
+    ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
+    ?></span></li>
+						</ul>
+					</div>
+				</fieldset>
+			</div>
+			<?php if ($feather->user->is_guest) : ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Robot title') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Robot info')    ?></p>
+						<label class="required"><strong><?php
+                             $question = array_keys($lang_antispam_questions);
+    $qencoded = md5($question[$index_questions]);
+    echo sprintf(__('Robot question'), $question[$index_questions]);
+    ?>
+							 <span><?php _e('Required') ?></span></strong>
+							 <br />
+							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
+						</label>
+					</div>
+				</fieldset>
+			</div>
+			<?php endif;
+    ?>
+			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php _e('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
+		</form>
+	</div>
+</div>
+<?php
+
+}

From 981637cfab968aaddebcd2cb06b7fa596fdf72b5 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 22 Aug 2015 21:25:03 +0200
Subject: [PATCH 127/353] Remove useless debug log

---
 Slim/Extras/Middleware/FeatherBBAuth.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Slim/Extras/Middleware/FeatherBBAuth.php b/Slim/Extras/Middleware/FeatherBBAuth.php
index fec39fa0..20f124e9 100644
--- a/Slim/Extras/Middleware/FeatherBBAuth.php
+++ b/Slim/Extras/Middleware/FeatherBBAuth.php
@@ -291,7 +291,6 @@ public function call()
 
         // Configure Slim
         $this->app->config('templates.path', $this->app->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
-        var_dump($this->app->view->getTemplatePathname('header.php'));
         $this->next->call();
     }
 }

From c3fd8c70642baaa03287d6257391241cc21609f1 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 22 Aug 2015 21:27:10 +0200
Subject: [PATCH 128/353] Remove old installer

---
 install/dblayer/common_db.php     |   49 -
 install/dblayer/index.html        |    1 -
 install/dblayer/mysql.php         |  389 ------
 install/dblayer/mysql_innodb.php  |  404 ------
 install/dblayer/mysqli.php        |  397 ------
 install/dblayer/mysqli_innodb.php |  411 ------
 install/dblayer/pgsql.php         |  454 -------
 install/dblayer/sqlite.php        |  648 ----------
 install/dblayer/sqlite3.php       |  686 ----------
 install/index.php                 | 1990 -----------------------------
 10 files changed, 5429 deletions(-)
 delete mode 100644 install/dblayer/common_db.php
 delete mode 100644 install/dblayer/index.html
 delete mode 100644 install/dblayer/mysql.php
 delete mode 100644 install/dblayer/mysql_innodb.php
 delete mode 100644 install/dblayer/mysqli.php
 delete mode 100644 install/dblayer/mysqli_innodb.php
 delete mode 100644 install/dblayer/pgsql.php
 delete mode 100644 install/dblayer/sqlite.php
 delete mode 100644 install/dblayer/sqlite3.php
 delete mode 100644 install/index.php

diff --git a/install/dblayer/common_db.php b/install/dblayer/common_db.php
deleted file mode 100644
index 26870fe2..00000000
--- a/install/dblayer/common_db.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-
-// Load the appropriate DB layer class
-switch ($db_type) {
-    case 'mysql':
-        require_once FEATHER_ROOT.'install/dblayer/mysql.php';
-        break;
-
-    case 'mysql_innodb':
-        require_once FEATHER_ROOT.'install/dblayer/mysql_innodb.php';
-        break;
-
-    case 'mysqli':
-        require_once FEATHER_ROOT.'install/dblayer/mysqli.php';
-        break;
-
-    case 'mysqli_innodb':
-        require_once FEATHER_ROOT.'install/dblayer/mysqli_innodb.php';
-        break;
-
-    case 'pgsql':
-        require_once FEATHER_ROOT.'install/dblayer/pgsql.php';
-        break;
-
-    case 'sqlite':
-        require_once FEATHER_ROOT.'install/dblayer/sqlite.php';
-        break;
-        
-    case 'sqlite3':
-        require_once FEATHER_ROOT.'install/dblayer/sqlite3.php';
-        break;
-
-    default:
-        error('\''.$db_type.'\' is not a valid database type. Please check settings in config.php.', __FILE__, __LINE__);
-        break;
-}
\ No newline at end of file
diff --git a/install/dblayer/index.html b/install/dblayer/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/install/dblayer/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/install/dblayer/mysql.php b/install/dblayer/mysql.php
deleted file mode 100644
index 00cc0950..00000000
--- a/install/dblayer/mysql.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure we have built in support for MySQL
-if (!function_exists('mysql_connect')) {
-    exit('This PHP environment doesn\'t have MySQL support built in. MySQL support is required if you want to use a MySQL database to run this forum. Consult the PHP documentation for further assistance.');
-}
-
-
-class DBLayer
-{
-    public $prefix;
-    public $link_id;
-    public $query_result;
-
-    public $saved_queries = array();
-    public $num_queries = 0;
-
-    public $error_no = false;
-    public $error_msg = 'Unknown';
-
-    public $datatype_transformations = array(
-        '%^SERIAL$%'    =>    'INT(10) UNSIGNED AUTO_INCREMENT'
-    );
-
-
-    public function __construct($db_host, $db_username, $db_password, $db_name, $db_prefix, $p_connect)
-    {
-        $this->prefix = $db_prefix;
-
-        if ($p_connect) {
-            $this->link_id = @mysql_pconnect($db_host, $db_username, $db_password);
-        } else {
-            $this->link_id = @mysql_connect($db_host, $db_username, $db_password);
-        }
-
-        if ($this->link_id) {
-            if (!@mysql_select_db($db_name, $this->link_id)) {
-                error('Unable to select database. MySQL reported: '.mysql_error(), __FILE__, __LINE__);
-            }
-        } else {
-            error('Unable to connect to MySQL server. MySQL reported: '.mysql_error(), __FILE__, __LINE__);
-        }
-
-        // Setup the client-server character set (UTF-8)
-        if (!defined('FORUM_NO_SET_NAMES')) {
-            $this->set_names('utf8');
-        }
-
-        return $this->link_id;
-    }
-
-
-    public function start_transaction()
-    {
-        return;
-    }
-
-
-    public function end_transaction()
-    {
-        return;
-    }
-
-
-    public function query($sql, $unbuffered = false)
-    {
-        if (defined('FEATHER_SHOW_QUERIES')) {
-            $q_start = get_microtime();
-        }
-
-        if ($unbuffered) {
-            $this->query_result = @mysql_unbuffered_query($sql, $this->link_id);
-        } else {
-            $this->query_result = @mysql_query($sql, $this->link_id);
-        }
-
-        if ($this->query_result) {
-            if (defined('FEATHER_SHOW_QUERIES')) {
-                $this->saved_queries[] = array($sql, sprintf('%.5f', get_microtime() - $q_start));
-            }
-
-            ++$this->num_queries;
-
-            return $this->query_result;
-        } else {
-            if (defined('FEATHER_SHOW_QUERIES')) {
-                $this->saved_queries[] = array($sql, 0);
-            }
-
-            $this->error_no = @mysql_errno($this->link_id);
-            $this->error_msg = @mysql_error($this->link_id);
-
-            return false;
-        }
-    }
-
-
-    public function result($query_id = 0, $row = 0, $col = 0)
-    {
-        return ($query_id) ? @mysql_result($query_id, $row, $col) : false;
-    }
-
-
-    public function fetch_assoc($query_id = 0)
-    {
-        return ($query_id) ? @mysql_fetch_assoc($query_id) : false;
-    }
-
-
-    public function fetch_row($query_id = 0)
-    {
-        return ($query_id) ? @mysql_fetch_row($query_id) : false;
-    }
-
-
-    public function num_rows($query_id = 0)
-    {
-        return ($query_id) ? @mysql_num_rows($query_id) : false;
-    }
-
-
-    public function affected_rows()
-    {
-        return ($this->link_id) ? @mysql_affected_rows($this->link_id) : false;
-    }
-
-
-    public function insert_id()
-    {
-        return ($this->link_id) ? @mysql_insert_id($this->link_id) : false;
-    }
-
-
-    public function get_num_queries()
-    {
-        return $this->num_queries;
-    }
-
-
-    public function get_saved_queries()
-    {
-        return $this->saved_queries;
-    }
-
-
-    public function free_result($query_id = false)
-    {
-        return ($query_id) ? @mysql_free_result($query_id) : false;
-    }
-
-
-    public function escape($str)
-    {
-        if (is_array($str)) {
-            return '';
-        } elseif (function_exists('mysql_real_escape_string')) {
-            return mysql_real_escape_string($str, $this->link_id);
-        } else {
-            return mysql_escape_string($str);
-        }
-    }
-
-
-    public function error()
-    {
-        $result['error_sql'] = @current(@end($this->saved_queries));
-        $result['error_no'] = $this->error_no;
-        $result['error_msg'] = $this->error_msg;
-
-        return $result;
-    }
-
-
-    public function close()
-    {
-        if ($this->link_id) {
-            if ($this->query_result) {
-                @mysql_free_result($this->query_result);
-            }
-
-            return @mysql_close($this->link_id);
-        } else {
-            return false;
-        }
-    }
-
-    public function get_names()
-    {
-        $result = $this->query('SHOW VARIABLES LIKE \'character_set_connection\'');
-        return $this->result($result, 0, 1);
-    }
-
-
-    public function set_names($names)
-    {
-        return $this->query('SET NAMES \''.$this->escape($names).'\'');
-    }
-
-
-    public function get_version()
-    {
-        $result = $this->query('SELECT VERSION()');
-
-        return array(
-            'name'        => 'MySQL Standard',
-            'version'    => preg_replace('%^([^-]+).*$%', '\\1', $this->result($result))
-        );
-    }
-
-
-    public function table_exists($table_name, $no_prefix = false)
-    {
-        $result = $this->query('SHOW TABLES LIKE \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\'');
-        return $this->num_rows($result) > 0;
-    }
-
-
-    public function field_exists($table_name, $field_name, $no_prefix = false)
-    {
-        $result = $this->query('SHOW COLUMNS FROM '.($no_prefix ? '' : $this->prefix).$table_name.' LIKE \''.$this->escape($field_name).'\'');
-        return $this->num_rows($result) > 0;
-    }
-
-
-    public function index_exists($table_name, $index_name, $no_prefix = false)
-    {
-        $exists = false;
-
-        $result = $this->query('SHOW INDEX FROM '.($no_prefix ? '' : $this->prefix).$table_name);
-        while ($cur_index = $this->fetch_assoc($result)) {
-            if (strtolower($cur_index['Key_name']) == strtolower(($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name)) {
-                $exists = true;
-                break;
-            }
-        }
-
-        return $exists;
-    }
-
-
-    public function create_table($table_name, $schema, $no_prefix = false)
-    {
-        if ($this->table_exists($table_name, $no_prefix)) {
-            return true;
-        }
-
-        $query = 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$table_name." (\n";
-
-        // Go through every schema element and add it to the query
-        foreach ($schema['FIELDS'] as $field_name => $field_data) {
-            $field_data['datatype'] = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_data['datatype']);
-
-            $query .= $field_name.' '.$field_data['datatype'];
-
-            if (isset($field_data['collation'])) {
-                $query .= 'CHARACTER SET utf8 COLLATE utf8_'.$field_data['collation'];
-            }
-
-            if (!$field_data['allow_null']) {
-                $query .= ' NOT NULL';
-            }
-
-            if (isset($field_data['default'])) {
-                $query .= ' DEFAULT '.$field_data['default'];
-            }
-
-            $query .= ",\n";
-        }
-
-        // If we have a primary key, add it
-        if (isset($schema['PRIMARY KEY'])) {
-            $query .= 'PRIMARY KEY ('.implode(',', $schema['PRIMARY KEY']).'),'."\n";
-        }
-
-        // Add unique keys
-        if (isset($schema['UNIQUE KEYS'])) {
-            foreach ($schema['UNIQUE KEYS'] as $key_name => $key_fields) {
-                $query .= 'UNIQUE KEY '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$key_name.'('.implode(',', $key_fields).'),'."\n";
-            }
-        }
-
-        // Add indexes
-        if (isset($schema['INDEXES'])) {
-            foreach ($schema['INDEXES'] as $index_name => $index_fields) {
-                $query .= 'KEY '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name.'('.implode(',', $index_fields).'),'."\n";
-            }
-        }
-
-        // We remove the last two characters (a newline and a comma) and add on the ending
-        $query = substr($query, 0, strlen($query) - 2)."\n".') ENGINE = '.(isset($schema['ENGINE']) ? $schema['ENGINE'] : 'MyISAM').' CHARACTER SET utf8';
-
-        return $this->query($query) ? true : false;
-    }
-
-
-    public function drop_table($table_name, $no_prefix = false)
-    {
-        if (!$this->table_exists($table_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('DROP TABLE '.($no_prefix ? '' : $this->prefix).$table_name) ? true : false;
-    }
-
-
-    public function rename_table($old_table, $new_table, $no_prefix = false)
-    {
-        // If the new table exists and the old one doesn't, then we're happy
-        if ($this->table_exists($new_table, $no_prefix) && !$this->table_exists($old_table, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$old_table.' RENAME TO '.($no_prefix ? '' : $this->prefix).$new_table) ? true : false;
-    }
-
-
-    public function add_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
-    {
-        if ($this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        $field_type = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_type);
-
-        if (!is_null($default_value) && !is_int($default_value) && !is_float($default_value)) {
-            $default_value = '\''.$this->escape($default_value).'\'';
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' ADD '.$field_name.' '.$field_type.($allow_null ? '' : ' NOT NULL').(!is_null($default_value) ? ' DEFAULT '.$default_value : '').(!is_null($after_field) ? ' AFTER '.$after_field : '')) ? true : false;
-    }
-
-
-    public function alter_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
-    {
-        if (!$this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        $field_type = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_type);
-
-        if (!is_null($default_value) && !is_int($default_value) && !is_float($default_value)) {
-            $default_value = '\''.$this->escape($default_value).'\'';
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' MODIFY '.$field_name.' '.$field_type.($allow_null ? '' : ' NOT NULL').(!is_null($default_value) ? ' DEFAULT '.$default_value : '').(!is_null($after_field) ? ' AFTER '.$after_field : '')) ? true : false;
-    }
-
-
-    public function drop_field($table_name, $field_name, $no_prefix = false)
-    {
-        if (!$this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' DROP '.$field_name) ? true : false;
-    }
-
-
-    public function add_index($table_name, $index_name, $index_fields, $unique = false, $no_prefix = false)
-    {
-        if ($this->index_exists($table_name, $index_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' ADD '.($unique ? 'UNIQUE ' : '').'INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name.' ('.implode(',', $index_fields).')') ? true : false;
-    }
-
-
-    public function drop_index($table_name, $index_name, $no_prefix = false)
-    {
-        if (!$this->index_exists($table_name, $index_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' DROP INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name) ? true : false;
-    }
-
-    public function truncate_table($table_name, $no_prefix = false)
-    {
-        return $this->query('TRUNCATE TABLE '.($no_prefix ? '' : $this->prefix).$table_name) ? true : false;
-    }
-}
diff --git a/install/dblayer/mysql_innodb.php b/install/dblayer/mysql_innodb.php
deleted file mode 100644
index 79137ba6..00000000
--- a/install/dblayer/mysql_innodb.php
+++ /dev/null
@@ -1,404 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure we have built in support for MySQL
-if (!function_exists('mysql_connect')) {
-    exit('This PHP environment doesn\'t have MySQL support built in. MySQL support is required if you want to use a MySQL database to run this forum. Consult the PHP documentation for further assistance.');
-}
-
-
-class DBLayer
-{
-    public $prefix;
-    public $link_id;
-    public $query_result;
-    public $in_transaction = 0;
-
-    public $saved_queries = array();
-    public $num_queries = 0;
-
-    public $error_no = false;
-    public $error_msg = 'Unknown';
-
-    public $datatype_transformations = array(
-        '%^SERIAL$%'    =>    'INT(10) UNSIGNED AUTO_INCREMENT'
-    );
-
-
-    public function __construct($db_host, $db_username, $db_password, $db_name, $db_prefix, $p_connect)
-    {
-        $this->prefix = $db_prefix;
-
-        if ($p_connect) {
-            $this->link_id = @mysql_pconnect($db_host, $db_username, $db_password);
-        } else {
-            $this->link_id = @mysql_connect($db_host, $db_username, $db_password);
-        }
-
-        if ($this->link_id) {
-            if (!@mysql_select_db($db_name, $this->link_id)) {
-                error('Unable to select database. MySQL reported: '.mysql_error(), __FILE__, __LINE__);
-            }
-        } else {
-            error('Unable to connect to MySQL server. MySQL reported: '.mysql_error(), __FILE__, __LINE__);
-        }
-
-        // Setup the client-server character set (UTF-8)
-        if (!defined('FORUM_NO_SET_NAMES')) {
-            $this->set_names('utf8');
-        }
-
-        return $this->link_id;
-    }
-
-
-    public function start_transaction()
-    {
-        ++$this->in_transaction;
-
-        mysql_query('START TRANSACTION', $this->link_id);
-        return;
-    }
-
-
-    public function end_transaction()
-    {
-        --$this->in_transaction;
-
-        mysql_query('COMMIT', $this->link_id);
-        return;
-    }
-
-
-    public function query($sql, $unbuffered = false)
-    {
-        if (defined('FEATHER_SHOW_QUERIES')) {
-            $q_start = get_microtime();
-        }
-
-        if ($unbuffered) {
-            $this->query_result = @mysql_unbuffered_query($sql, $this->link_id);
-        } else {
-            $this->query_result = @mysql_query($sql, $this->link_id);
-        }
-
-        if ($this->query_result) {
-            if (defined('FEATHER_SHOW_QUERIES')) {
-                $this->saved_queries[] = array($sql, sprintf('%.5f', get_microtime() - $q_start));
-            }
-
-            ++$this->num_queries;
-
-            return $this->query_result;
-        } else {
-            if (defined('FEATHER_SHOW_QUERIES')) {
-                $this->saved_queries[] = array($sql, 0);
-            }
-
-            $this->error_no = @mysql_errno($this->link_id);
-            $this->error_msg = @mysql_error($this->link_id);
-
-            // Rollback transaction
-            if ($this->in_transaction) {
-                mysql_query('ROLLBACK', $this->link_id);
-            }
-
-            --$this->in_transaction;
-
-            return false;
-        }
-    }
-
-
-    public function result($query_id = 0, $row = 0, $col = 0)
-    {
-        return ($query_id) ? @mysql_result($query_id, $row, $col) : false;
-    }
-
-
-    public function fetch_assoc($query_id = 0)
-    {
-        return ($query_id) ? @mysql_fetch_assoc($query_id) : false;
-    }
-
-
-    public function fetch_row($query_id = 0)
-    {
-        return ($query_id) ? @mysql_fetch_row($query_id) : false;
-    }
-
-
-    public function num_rows($query_id = 0)
-    {
-        return ($query_id) ? @mysql_num_rows($query_id) : false;
-    }
-
-
-    public function affected_rows()
-    {
-        return ($this->link_id) ? @mysql_affected_rows($this->link_id) : false;
-    }
-
-
-    public function insert_id()
-    {
-        return ($this->link_id) ? @mysql_insert_id($this->link_id) : false;
-    }
-
-
-    public function get_num_queries()
-    {
-        return $this->num_queries;
-    }
-
-
-    public function get_saved_queries()
-    {
-        return $this->saved_queries;
-    }
-
-
-    public function free_result($query_id = false)
-    {
-        return ($query_id) ? @mysql_free_result($query_id) : false;
-    }
-
-
-    public function escape($str)
-    {
-        if (is_array($str)) {
-            return '';
-        } elseif (function_exists('mysql_real_escape_string')) {
-            return mysql_real_escape_string($str, $this->link_id);
-        } else {
-            return mysql_escape_string($str);
-        }
-    }
-
-
-    public function error()
-    {
-        $result['error_sql'] = @current(@end($this->saved_queries));
-        $result['error_no'] = $this->error_no;
-        $result['error_msg'] = $this->error_msg;
-
-        return $result;
-    }
-
-
-    public function close()
-    {
-        if ($this->link_id) {
-            if ($this->query_result) {
-                @mysql_free_result($this->query_result);
-            }
-
-            return @mysql_close($this->link_id);
-        } else {
-            return false;
-        }
-    }
-
-
-    public function get_names()
-    {
-        $result = $this->query('SHOW VARIABLES LIKE \'character_set_connection\'');
-        return $this->result($result, 0, 1);
-    }
-
-
-    public function set_names($names)
-    {
-        return $this->query('SET NAMES \''.$this->escape($names).'\'');
-    }
-
-
-    public function get_version()
-    {
-        $result = $this->query('SELECT VERSION()');
-
-        return array(
-            'name'        => 'MySQL Standard (InnoDB)',
-            'version'    => preg_replace('%^([^-]+).*$%', '\\1', $this->result($result))
-        );
-    }
-
-
-    public function table_exists($table_name, $no_prefix = false)
-    {
-        $result = $this->query('SHOW TABLES LIKE \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\'');
-        return $this->num_rows($result) > 0;
-    }
-
-
-    public function field_exists($table_name, $field_name, $no_prefix = false)
-    {
-        $result = $this->query('SHOW COLUMNS FROM '.($no_prefix ? '' : $this->prefix).$table_name.' LIKE \''.$this->escape($field_name).'\'');
-        return $this->num_rows($result) > 0;
-    }
-
-
-    public function index_exists($table_name, $index_name, $no_prefix = false)
-    {
-        $exists = false;
-
-        $result = $this->query('SHOW INDEX FROM '.($no_prefix ? '' : $this->prefix).$table_name);
-        while ($cur_index = $this->fetch_assoc($result)) {
-            if (strtolower($cur_index['Key_name']) == strtolower(($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name)) {
-                $exists = true;
-                break;
-            }
-        }
-
-        return $exists;
-    }
-
-
-    public function create_table($table_name, $schema, $no_prefix = false)
-    {
-        if ($this->table_exists($table_name, $no_prefix)) {
-            return true;
-        }
-
-        $query = 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$table_name." (\n";
-
-        // Go through every schema element and add it to the query
-        foreach ($schema['FIELDS'] as $field_name => $field_data) {
-            $field_data['datatype'] = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_data['datatype']);
-
-            $query .= $field_name.' '.$field_data['datatype'];
-
-            if (isset($field_data['collation'])) {
-                $query .= 'CHARACTER SET utf8 COLLATE utf8_'.$field_data['collation'];
-            }
-
-            if (!$field_data['allow_null']) {
-                $query .= ' NOT NULL';
-            }
-
-            if (isset($field_data['default'])) {
-                $query .= ' DEFAULT '.$field_data['default'];
-            }
-
-            $query .= ",\n";
-        }
-
-        // If we have a primary key, add it
-        if (isset($schema['PRIMARY KEY'])) {
-            $query .= 'PRIMARY KEY ('.implode(',', $schema['PRIMARY KEY']).'),'."\n";
-        }
-
-        // Add unique keys
-        if (isset($schema['UNIQUE KEYS'])) {
-            foreach ($schema['UNIQUE KEYS'] as $key_name => $key_fields) {
-                $query .= 'UNIQUE KEY '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$key_name.'('.implode(',', $key_fields).'),'."\n";
-            }
-        }
-
-        // Add indexes
-        if (isset($schema['INDEXES'])) {
-            foreach ($schema['INDEXES'] as $index_name => $index_fields) {
-                $query .= 'KEY '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name.'('.implode(',', $index_fields).'),'."\n";
-            }
-        }
-
-        // We remove the last two characters (a newline and a comma) and add on the ending
-        $query = substr($query, 0, strlen($query) - 2)."\n".') ENGINE = '.(isset($schema['ENGINE']) ? $schema['ENGINE'] : 'InnoDB').' CHARACTER SET utf8';
-
-        return $this->query($query) ? true : false;
-    }
-
-
-    public function drop_table($table_name, $no_prefix = false)
-    {
-        if (!$this->table_exists($table_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('DROP TABLE '.($no_prefix ? '' : $this->prefix).$table_name) ? true : false;
-    }
-
-
-    public function rename_table($old_table, $new_table, $no_prefix = false)
-    {
-        // If the new table exists and the old one doesn't, then we're happy
-        if ($this->table_exists($new_table, $no_prefix) && !$this->table_exists($old_table, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$old_table.' RENAME TO '.($no_prefix ? '' : $this->prefix).$new_table) ? true : false;
-    }
-
-
-    public function add_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
-    {
-        if ($this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        $field_type = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_type);
-
-        if (!is_null($default_value) && !is_int($default_value) && !is_float($default_value)) {
-            $default_value = '\''.$this->escape($default_value).'\'';
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' ADD '.$field_name.' '.$field_type.($allow_null ? '' : ' NOT NULL').(!is_null($default_value) ? ' DEFAULT '.$default_value : '').(!is_null($after_field) ? ' AFTER '.$after_field : '')) ? true : false;
-    }
-
-
-    public function alter_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
-    {
-        if (!$this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        $field_type = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_type);
-
-        if (!is_null($default_value) && !is_int($default_value) && !is_float($default_value)) {
-            $default_value = '\''.$this->escape($default_value).'\'';
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' MODIFY '.$field_name.' '.$field_type.($allow_null ? '' : ' NOT NULL').(!is_null($default_value) ? ' DEFAULT '.$default_value : '').(!is_null($after_field) ? ' AFTER '.$after_field : '')) ? true : false;
-    }
-
-
-    public function drop_field($table_name, $field_name, $no_prefix = false)
-    {
-        if (!$this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' DROP '.$field_name) ? true : false;
-    }
-
-
-    public function add_index($table_name, $index_name, $index_fields, $unique = false, $no_prefix = false)
-    {
-        if ($this->index_exists($table_name, $index_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' ADD '.($unique ? 'UNIQUE ' : '').'INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name.' ('.implode(',', $index_fields).')') ? true : false;
-    }
-
-
-    public function drop_index($table_name, $index_name, $no_prefix = false)
-    {
-        if (!$this->index_exists($table_name, $index_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' DROP INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name) ? true : false;
-    }
-
-    public function truncate_table($table_name, $no_prefix = false)
-    {
-        return $this->query('TRUNCATE TABLE '.($no_prefix ? '' : $this->prefix).$table_name) ? true : false;
-    }
-}
diff --git a/install/dblayer/mysqli.php b/install/dblayer/mysqli.php
deleted file mode 100644
index a22b6945..00000000
--- a/install/dblayer/mysqli.php
+++ /dev/null
@@ -1,397 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure we have built in support for MySQL
-if (!function_exists('mysqli_connect')) {
-    exit('This PHP environment doesn\'t have Improved MySQL (mysqli) support built in. Improved MySQL support is required if you want to use a MySQL 4.1 (or later) database to run this forum. Consult the PHP documentation for further assistance.');
-}
-
-
-class DBLayer
-{
-    public $prefix;
-    public $link_id;
-    public $query_result;
-
-    public $saved_queries = array();
-    public $num_queries = 0;
-
-    public $error_no = false;
-    public $error_msg = 'Unknown';
-
-    public $datatype_transformations = array(
-        '%^SERIAL$%'    =>    'INT(10) UNSIGNED AUTO_INCREMENT'
-    );
-
-
-    public function __construct($db_host, $db_username, $db_password, $db_name, $db_prefix, $p_connect)
-    {
-        $this->prefix = $db_prefix;
-
-        // Was a custom port supplied with $db_host?
-        if (strpos($db_host, ':') !== false) {
-            list($db_host, $db_port) = explode(':', $db_host);
-        }
-
-        // Persistent connection in MySQLi are only available in PHP 5.3 and later releases
-        $p_connect = $p_connect && version_compare(PHP_VERSION, '5.3.0', '>=') ? 'p:' : '';
-
-        if (isset($db_port)) {
-            $this->link_id = @mysqli_connect($p_connect.$db_host, $db_username, $db_password, $db_name, $db_port);
-        } else {
-            $this->link_id = @mysqli_connect($p_connect.$db_host, $db_username, $db_password, $db_name);
-        }
-
-        if (!$this->link_id) {
-            error('Unable to connect to MySQL and select database. MySQL reported: '.mysqli_connect_error(), __FILE__, __LINE__);
-        }
-
-        // Setup the client-server character set (UTF-8)
-        if (!defined('FORUM_NO_SET_NAMES')) {
-            $this->set_names('utf8');
-        }
-
-        return $this->link_id;
-    }
-
-
-    public function start_transaction()
-    {
-        return;
-    }
-
-
-    public function end_transaction()
-    {
-        return;
-    }
-
-
-    public function query($sql, $unbuffered = false)
-    {
-        if (defined('FEATHER_SHOW_QUERIES')) {
-            $q_start = get_microtime();
-        }
-
-        $this->query_result = @mysqli_query($this->link_id, $sql);
-
-        if ($this->query_result) {
-            if (defined('FEATHER_SHOW_QUERIES')) {
-                $this->saved_queries[] = array($sql, sprintf('%.5f', get_microtime() - $q_start));
-            }
-
-            ++$this->num_queries;
-
-            return $this->query_result;
-        } else {
-            if (defined('FEATHER_SHOW_QUERIES')) {
-                $this->saved_queries[] = array($sql, 0);
-            }
-
-            $this->error_no = @mysqli_errno($this->link_id);
-            $this->error_msg = @mysqli_error($this->link_id);
-
-            return false;
-        }
-    }
-
-
-    public function result($query_id = 0, $row = 0, $col = 0)
-    {
-        if ($query_id) {
-            if ($row !== 0 && @mysqli_data_seek($query_id, $row) === false) {
-                return false;
-            }
-
-            $cur_row = @mysqli_fetch_row($query_id);
-            if ($cur_row === false) {
-                return false;
-            }
-
-            return $cur_row[$col];
-        } else {
-            return false;
-        }
-    }
-
-
-    public function fetch_assoc($query_id = 0)
-    {
-        return ($query_id) ? @mysqli_fetch_assoc($query_id) : false;
-    }
-
-
-    public function fetch_row($query_id = 0)
-    {
-        return ($query_id) ? @mysqli_fetch_row($query_id) : false;
-    }
-
-
-    public function num_rows($query_id = 0)
-    {
-        return ($query_id) ? @mysqli_num_rows($query_id) : false;
-    }
-
-
-    public function affected_rows()
-    {
-        return ($this->link_id) ? @mysqli_affected_rows($this->link_id) : false;
-    }
-
-
-    public function insert_id()
-    {
-        return ($this->link_id) ? @mysqli_insert_id($this->link_id) : false;
-    }
-
-
-    public function get_num_queries()
-    {
-        return $this->num_queries;
-    }
-
-
-    public function get_saved_queries()
-    {
-        return $this->saved_queries;
-    }
-
-
-    public function free_result($query_id = false)
-    {
-        return ($query_id) ? @mysqli_free_result($query_id) : false;
-    }
-
-
-    public function escape($str)
-    {
-        return is_array($str) ? '' : mysqli_real_escape_string($this->link_id, $str);
-    }
-
-
-    public function error()
-    {
-        $result['error_sql'] = @current(@end($this->saved_queries));
-        $result['error_no'] = $this->error_no;
-        $result['error_msg'] = $this->error_msg;
-
-        return $result;
-    }
-
-
-    public function close()
-    {
-        if ($this->link_id) {
-            if ($this->query_result) {
-                @mysqli_free_result($this->query_result);
-            }
-
-            return @mysqli_close($this->link_id);
-        } else {
-            return false;
-        }
-    }
-
-
-    public function get_names()
-    {
-        $result = $this->query('SHOW VARIABLES LIKE \'character_set_connection\'');
-        return $this->result($result, 0, 1);
-    }
-
-
-    public function set_names($names)
-    {
-        return $this->query('SET NAMES \''.$this->escape($names).'\'');
-    }
-
-
-    public function get_version()
-    {
-        $result = $this->query('SELECT VERSION()');
-
-        return array(
-            'name'        => 'MySQL Improved',
-            'version'    => preg_replace('%^([^-]+).*$%', '\\1', $this->result($result))
-        );
-    }
-
-
-    public function table_exists($table_name, $no_prefix = false)
-    {
-        $result = $this->query('SHOW TABLES LIKE \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\'');
-        return $this->num_rows($result) > 0;
-    }
-
-
-    public function field_exists($table_name, $field_name, $no_prefix = false)
-    {
-        $result = $this->query('SHOW COLUMNS FROM '.($no_prefix ? '' : $this->prefix).$table_name.' LIKE \''.$this->escape($field_name).'\'');
-        return $this->num_rows($result) > 0;
-    }
-
-
-    public function index_exists($table_name, $index_name, $no_prefix = false)
-    {
-        $exists = false;
-
-        $result = $this->query('SHOW INDEX FROM '.($no_prefix ? '' : $this->prefix).$table_name);
-        while ($cur_index = $this->fetch_assoc($result)) {
-            if (strtolower($cur_index['Key_name']) == strtolower(($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name)) {
-                $exists = true;
-                break;
-            }
-        }
-
-        return $exists;
-    }
-
-
-    public function create_table($table_name, $schema, $no_prefix = false)
-    {
-        if ($this->table_exists($table_name, $no_prefix)) {
-            return true;
-        }
-
-        $query = 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$table_name." (\n";
-
-        // Go through every schema element and add it to the query
-        foreach ($schema['FIELDS'] as $field_name => $field_data) {
-            $field_data['datatype'] = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_data['datatype']);
-
-            $query .= $field_name.' '.$field_data['datatype'];
-
-            if (isset($field_data['collation'])) {
-                $query .= 'CHARACTER SET utf8 COLLATE utf8_'.$field_data['collation'];
-            }
-
-            if (!$field_data['allow_null']) {
-                $query .= ' NOT NULL';
-            }
-
-            if (isset($field_data['default'])) {
-                $query .= ' DEFAULT '.$field_data['default'];
-            }
-
-            $query .= ",\n";
-        }
-
-        // If we have a primary key, add it
-        if (isset($schema['PRIMARY KEY'])) {
-            $query .= 'PRIMARY KEY ('.implode(',', $schema['PRIMARY KEY']).'),'."\n";
-        }
-
-        // Add unique keys
-        if (isset($schema['UNIQUE KEYS'])) {
-            foreach ($schema['UNIQUE KEYS'] as $key_name => $key_fields) {
-                $query .= 'UNIQUE KEY '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$key_name.'('.implode(',', $key_fields).'),'."\n";
-            }
-        }
-
-        // Add indexes
-        if (isset($schema['INDEXES'])) {
-            foreach ($schema['INDEXES'] as $index_name => $index_fields) {
-                $query .= 'KEY '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name.'('.implode(',', $index_fields).'),'."\n";
-            }
-        }
-
-        // We remove the last two characters (a newline and a comma) and add on the ending
-        $query = substr($query, 0, strlen($query) - 2)."\n".') ENGINE = '.(isset($schema['ENGINE']) ? $schema['ENGINE'] : 'MyISAM').' CHARACTER SET utf8';
-
-        return $this->query($query) ? true : false;
-    }
-
-
-    public function drop_table($table_name, $no_prefix = false)
-    {
-        if (!$this->table_exists($table_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('DROP TABLE '.($no_prefix ? '' : $this->prefix).$table_name) ? true : false;
-    }
-
-
-    public function rename_table($old_table, $new_table, $no_prefix = false)
-    {
-        // If the new table exists and the old one doesn't, then we're happy
-        if ($this->table_exists($new_table, $no_prefix) && !$this->table_exists($old_table, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$old_table.' RENAME TO '.($no_prefix ? '' : $this->prefix).$new_table) ? true : false;
-    }
-
-
-    public function add_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
-    {
-        if ($this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        $field_type = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_type);
-
-        if (!is_null($default_value) && !is_int($default_value) && !is_float($default_value)) {
-            $default_value = '\''.$this->escape($default_value).'\'';
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' ADD '.$field_name.' '.$field_type.($allow_null ? '' : ' NOT NULL').(!is_null($default_value) ? ' DEFAULT '.$default_value : '').(!is_null($after_field) ? ' AFTER '.$after_field : '')) ? true : false;
-    }
-
-
-    public function alter_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
-    {
-        if (!$this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        $field_type = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_type);
-
-        if (!is_null($default_value) && !is_int($default_value) && !is_float($default_value)) {
-            $default_value = '\''.$this->escape($default_value).'\'';
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' MODIFY '.$field_name.' '.$field_type.($allow_null ? '' : ' NOT NULL').(!is_null($default_value) ? ' DEFAULT '.$default_value : '').(!is_null($after_field) ? ' AFTER '.$after_field : '')) ? true : false;
-    }
-
-
-    public function drop_field($table_name, $field_name, $no_prefix = false)
-    {
-        if (!$this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' DROP '.$field_name) ? true : false;
-    }
-
-
-    public function add_index($table_name, $index_name, $index_fields, $unique = false, $no_prefix = false)
-    {
-        if ($this->index_exists($table_name, $index_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' ADD '.($unique ? 'UNIQUE ' : '').'INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name.' ('.implode(',', $index_fields).')') ? true : false;
-    }
-
-
-    public function drop_index($table_name, $index_name, $no_prefix = false)
-    {
-        if (!$this->index_exists($table_name, $index_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' DROP INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name) ? true : false;
-    }
-
-    public function truncate_table($table_name, $no_prefix = false)
-    {
-        return $this->query('TRUNCATE TABLE '.($no_prefix ? '' : $this->prefix).$table_name) ? true : false;
-    }
-}
diff --git a/install/dblayer/mysqli_innodb.php b/install/dblayer/mysqli_innodb.php
deleted file mode 100644
index 509bdff7..00000000
--- a/install/dblayer/mysqli_innodb.php
+++ /dev/null
@@ -1,411 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure we have built in support for MySQL
-if (!function_exists('mysqli_connect')) {
-    exit('This PHP environment doesn\'t have Improved MySQL (mysqli) support built in. Improved MySQL support is required if you want to use a MySQL 4.1 (or later) database to run this forum. Consult the PHP documentation for further assistance.');
-}
-
-
-class DBLayer
-{
-    public $prefix;
-    public $link_id;
-    public $query_result;
-
-    public $saved_queries = array();
-    public $num_queries = 0;
-    public $in_transaction = 0;
-
-    public $error_no = false;
-    public $error_msg = 'Unknown';
-
-    public $datatype_transformations = array(
-        '%^SERIAL$%'    =>    'INT(10) UNSIGNED AUTO_INCREMENT'
-    );
-
-
-    public function __construct($db_host, $db_username, $db_password, $db_name, $db_prefix, $p_connect)
-    {
-        $this->prefix = $db_prefix;
-
-        // Was a custom port supplied with $db_host?
-        if (strpos($db_host, ':') !== false) {
-            list($db_host, $db_port) = explode(':', $db_host);
-        }
-
-        // Persistent connection in MySQLi are only available in PHP 5.3 and later releases
-        $p_connect = $p_connect && version_compare(PHP_VERSION, '5.3.0', '>=') ? 'p:' : '';
-
-        if (isset($db_port)) {
-            $this->link_id = @mysqli_connect($p_connect.$db_host, $db_username, $db_password, $db_name, $db_port);
-        } else {
-            $this->link_id = @mysqli_connect($p_connect.$db_host, $db_username, $db_password, $db_name);
-        }
-
-        if (!$this->link_id) {
-            error('Unable to connect to MySQL and select database. MySQL reported: '.mysqli_connect_error(), __FILE__, __LINE__);
-        }
-
-        // Setup the client-server character set (UTF-8)
-        if (!defined('FORUM_NO_SET_NAMES')) {
-            $this->set_names('utf8');
-        }
-
-        return $this->link_id;
-    }
-
-
-    public function start_transaction()
-    {
-        ++$this->in_transaction;
-
-        mysqli_query($this->link_id, 'START TRANSACTION');
-        return;
-    }
-
-
-    public function end_transaction()
-    {
-        --$this->in_transaction;
-
-        mysqli_query($this->link_id, 'COMMIT');
-        return;
-    }
-
-
-    public function query($sql, $unbuffered = false)
-    {
-        if (defined('FEATHER_SHOW_QUERIES')) {
-            $q_start = get_microtime();
-        }
-
-        $this->query_result = @mysqli_query($this->link_id, $sql);
-
-        if ($this->query_result) {
-            if (defined('FEATHER_SHOW_QUERIES')) {
-                $this->saved_queries[] = array($sql, sprintf('%.5f', get_microtime() - $q_start));
-            }
-
-            ++$this->num_queries;
-
-            return $this->query_result;
-        } else {
-            if (defined('FEATHER_SHOW_QUERIES')) {
-                $this->saved_queries[] = array($sql, 0);
-            }
-
-            $this->error_no = @mysqli_errno($this->link_id);
-            $this->error_msg = @mysqli_error($this->link_id);
-
-            // Rollback transaction
-            if ($this->in_transaction) {
-                mysqli_query($this->link_id, 'ROLLBACK');
-            }
-
-            --$this->in_transaction;
-
-            return false;
-        }
-    }
-
-
-    public function result($query_id = 0, $row = 0, $col = 0)
-    {
-        if ($query_id) {
-            if ($row !== 0 && @mysqli_data_seek($query_id, $row) === false) {
-                return false;
-            }
-
-            $cur_row = @mysqli_fetch_row($query_id);
-            if ($cur_row === false) {
-                return false;
-            }
-
-            return $cur_row[$col];
-        } else {
-            return false;
-        }
-    }
-
-
-    public function fetch_assoc($query_id = 0)
-    {
-        return ($query_id) ? @mysqli_fetch_assoc($query_id) : false;
-    }
-
-
-    public function fetch_row($query_id = 0)
-    {
-        return ($query_id) ? @mysqli_fetch_row($query_id) : false;
-    }
-
-
-    public function num_rows($query_id = 0)
-    {
-        return ($query_id) ? @mysqli_num_rows($query_id) : false;
-    }
-
-
-    public function affected_rows()
-    {
-        return ($this->link_id) ? @mysqli_affected_rows($this->link_id) : false;
-    }
-
-
-    public function insert_id()
-    {
-        return ($this->link_id) ? @mysqli_insert_id($this->link_id) : false;
-    }
-
-
-    public function get_num_queries()
-    {
-        return $this->num_queries;
-    }
-
-
-    public function get_saved_queries()
-    {
-        return $this->saved_queries;
-    }
-
-
-    public function free_result($query_id = false)
-    {
-        return ($query_id) ? @mysqli_free_result($query_id) : false;
-    }
-
-
-    public function escape($str)
-    {
-        return is_array($str) ? '' : mysqli_real_escape_string($this->link_id, $str);
-    }
-
-
-    public function error()
-    {
-        $result['error_sql'] = @current(@end($this->saved_queries));
-        $result['error_no'] = $this->error_no;
-        $result['error_msg'] = $this->error_msg;
-
-        return $result;
-    }
-
-
-    public function close()
-    {
-        if ($this->link_id) {
-            if ($this->query_result) {
-                @mysqli_free_result($this->query_result);
-            }
-
-            return @mysqli_close($this->link_id);
-        } else {
-            return false;
-        }
-    }
-
-
-    public function get_names()
-    {
-        $result = $this->query('SHOW VARIABLES LIKE \'character_set_connection\'');
-        return $this->result($result, 0, 1);
-    }
-
-
-    public function set_names($names)
-    {
-        return $this->query('SET NAMES \''.$this->escape($names).'\'');
-    }
-
-
-    public function get_version()
-    {
-        $result = $this->query('SELECT VERSION()');
-
-        return array(
-            'name'        => 'MySQL Improved (InnoDB)',
-            'version'    => preg_replace('%^([^-]+).*$%', '\\1', $this->result($result))
-        );
-    }
-
-
-    public function table_exists($table_name, $no_prefix = false)
-    {
-        $result = $this->query('SHOW TABLES LIKE \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\'');
-        return $this->num_rows($result) > 0;
-    }
-
-
-    public function field_exists($table_name, $field_name, $no_prefix = false)
-    {
-        $result = $this->query('SHOW COLUMNS FROM '.($no_prefix ? '' : $this->prefix).$table_name.' LIKE \''.$this->escape($field_name).'\'');
-        return $this->num_rows($result) > 0;
-    }
-
-
-    public function index_exists($table_name, $index_name, $no_prefix = false)
-    {
-        $exists = false;
-
-        $result = $this->query('SHOW INDEX FROM '.($no_prefix ? '' : $this->prefix).$table_name);
-        while ($cur_index = $this->fetch_assoc($result)) {
-            if (strtolower($cur_index['Key_name']) == strtolower(($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name)) {
-                $exists = true;
-                break;
-            }
-        }
-
-        return $exists;
-    }
-
-
-    public function create_table($table_name, $schema, $no_prefix = false)
-    {
-        if ($this->table_exists($table_name, $no_prefix)) {
-            return true;
-        }
-
-        $query = 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$table_name." (\n";
-
-        // Go through every schema element and add it to the query
-        foreach ($schema['FIELDS'] as $field_name => $field_data) {
-            $field_data['datatype'] = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_data['datatype']);
-
-            $query .= $field_name.' '.$field_data['datatype'];
-
-            if (isset($field_data['collation'])) {
-                $query .= 'CHARACTER SET utf8 COLLATE utf8_'.$field_data['collation'];
-            }
-
-            if (!$field_data['allow_null']) {
-                $query .= ' NOT NULL';
-            }
-
-            if (isset($field_data['default'])) {
-                $query .= ' DEFAULT '.$field_data['default'];
-            }
-
-            $query .= ",\n";
-        }
-
-        // If we have a primary key, add it
-        if (isset($schema['PRIMARY KEY'])) {
-            $query .= 'PRIMARY KEY ('.implode(',', $schema['PRIMARY KEY']).'),'."\n";
-        }
-
-        // Add unique keys
-        if (isset($schema['UNIQUE KEYS'])) {
-            foreach ($schema['UNIQUE KEYS'] as $key_name => $key_fields) {
-                $query .= 'UNIQUE KEY '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$key_name.'('.implode(',', $key_fields).'),'."\n";
-            }
-        }
-
-        // Add indexes
-        if (isset($schema['INDEXES'])) {
-            foreach ($schema['INDEXES'] as $index_name => $index_fields) {
-                $query .= 'KEY '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name.'('.implode(',', $index_fields).'),'."\n";
-            }
-        }
-
-        // We remove the last two characters (a newline and a comma) and add on the ending
-        $query = substr($query, 0, strlen($query) - 2)."\n".') ENGINE = '.(isset($schema['ENGINE']) ? $schema['ENGINE'] : 'InnoDB').' CHARACTER SET utf8';
-
-        return $this->query($query) ? true : false;
-    }
-
-
-    public function drop_table($table_name, $no_prefix = false)
-    {
-        if (!$this->table_exists($table_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('DROP TABLE '.($no_prefix ? '' : $this->prefix).$table_name) ? true : false;
-    }
-
-
-    public function rename_table($old_table, $new_table, $no_prefix = false)
-    {
-        // If the new table exists and the old one doesn't, then we're happy
-        if ($this->table_exists($new_table, $no_prefix) && !$this->table_exists($old_table, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$old_table.' RENAME TO '.($no_prefix ? '' : $this->prefix).$new_table) ? true : false;
-    }
-
-
-    public function add_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
-    {
-        if ($this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        $field_type = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_type);
-
-        if (!is_null($default_value) && !is_int($default_value) && !is_float($default_value)) {
-            $default_value = '\''.$this->escape($default_value).'\'';
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' ADD '.$field_name.' '.$field_type.($allow_null ? '' : ' NOT NULL').(!is_null($default_value) ? ' DEFAULT '.$default_value : '').(!is_null($after_field) ? ' AFTER '.$after_field : '')) ? true : false;
-    }
-
-
-    public function alter_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
-    {
-        if (!$this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        $field_type = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_type);
-
-        if (!is_null($default_value) && !is_int($default_value) && !is_float($default_value)) {
-            $default_value = '\''.$this->escape($default_value).'\'';
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' MODIFY '.$field_name.' '.$field_type.($allow_null ? '' : ' NOT NULL').(!is_null($default_value) ? ' DEFAULT '.$default_value : '').(!is_null($after_field) ? ' AFTER '.$after_field : '')) ? true : false;
-    }
-
-
-    public function drop_field($table_name, $field_name, $no_prefix = false)
-    {
-        if (!$this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' DROP '.$field_name) ? true : false;
-    }
-
-
-    public function add_index($table_name, $index_name, $index_fields, $unique = false, $no_prefix = false)
-    {
-        if ($this->index_exists($table_name, $index_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' ADD '.($unique ? 'UNIQUE ' : '').'INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name.' ('.implode(',', $index_fields).')') ? true : false;
-    }
-
-
-    public function drop_index($table_name, $index_name, $no_prefix = false)
-    {
-        if (!$this->index_exists($table_name, $index_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' DROP INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name) ? true : false;
-    }
-
-    public function truncate_table($table_name, $no_prefix = false)
-    {
-        return $this->query('TRUNCATE TABLE '.($no_prefix ? '' : $this->prefix).$table_name) ? true : false;
-    }
-}
diff --git a/install/dblayer/pgsql.php b/install/dblayer/pgsql.php
deleted file mode 100644
index 2585e43f..00000000
--- a/install/dblayer/pgsql.php
+++ /dev/null
@@ -1,454 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure we have built in support for PostgreSQL
-if (!function_exists('pg_connect')) {
-    exit('This PHP environment doesn\'t have PostgreSQL support built in. PostgreSQL support is required if you want to use a PostgreSQL database to run this forum. Consult the PHP documentation for further assistance.');
-}
-
-
-class DBLayer
-{
-    public $prefix;
-    public $link_id;
-    public $query_result;
-    public $last_query_text = array();
-    public $in_transaction = 0;
-
-    public $saved_queries = array();
-    public $num_queries = 0;
-
-    public $error_no = false;
-    public $error_msg = 'Unknown';
-
-    public $datatype_transformations = array(
-        '%^(TINY|SMALL)INT( )?(\\([0-9]+\\))?( )?(UNSIGNED)?$%i'            =>    'SMALLINT',
-        '%^(MEDIUM)?INT( )?(\\([0-9]+\\))?( )?(UNSIGNED)?$%i'                =>    'INTEGER',
-        '%^BIGINT( )?(\\([0-9]+\\))?( )?(UNSIGNED)?$%i'                        =>    'BIGINT',
-        '%^(TINY|MEDIUM|LONG)?TEXT$%i'                                        =>    'TEXT',
-        '%^DOUBLE( )?(\\([0-9,]+\\))?( )?(UNSIGNED)?$%i'                    =>    'DOUBLE PRECISION',
-        '%^FLOAT( )?(\\([0-9]+\\))?( )?(UNSIGNED)?$%i'                        =>    'REAL'
-    );
-
-
-    public function __construct($db_host, $db_username, $db_password, $db_name, $db_prefix, $p_connect)
-    {
-        $this->prefix = $db_prefix;
-
-        if ($db_host) {
-            if (strpos($db_host, ':') !== false) {
-                list($db_host, $dbport) = explode(':', $db_host);
-                $connect_str[] = 'host='.$db_host.' port='.$dbport;
-            } else {
-                $connect_str[] = 'host='.$db_host;
-            }
-        }
-
-        if ($db_name) {
-            $connect_str[] = 'dbname='.$db_name;
-        }
-
-        if ($db_username) {
-            $connect_str[] = 'user='.$db_username;
-        }
-
-        if ($db_password) {
-            $connect_str[] = 'password='.$db_password;
-        }
-
-        if ($p_connect) {
-            $this->link_id = @pg_pconnect(implode(' ', $connect_str));
-        } else {
-            $this->link_id = @pg_connect(implode(' ', $connect_str));
-        }
-
-        if (!$this->link_id) {
-            error('Unable to connect to PostgreSQL server', __FILE__, __LINE__);
-        }
-
-        // Setup the client-server character set (UTF-8)
-        if (!defined('FORUM_NO_SET_NAMES')) {
-            $this->set_names('utf8');
-        }
-
-        return $this->link_id;
-    }
-
-
-    public function start_transaction()
-    {
-        ++$this->in_transaction;
-
-        return (@pg_query($this->link_id, 'BEGIN')) ? true : false;
-    }
-
-
-    public function end_transaction()
-    {
-        --$this->in_transaction;
-
-        if (@pg_query($this->link_id, 'COMMIT')) {
-            return true;
-        } else {
-            @pg_query($this->link_id, 'ROLLBACK');
-            return false;
-        }
-    }
-
-
-    public function query($sql, $unbuffered = false) // $unbuffered is ignored since there is no pgsql_unbuffered_query()
-    {
-        if (strrpos($sql, 'LIMIT') !== false) {
-            $sql = preg_replace('%LIMIT ([0-9]+),([ 0-9]+)%', 'LIMIT \\2 OFFSET \\1', $sql);
-        }
-
-        if (defined('FEATHER_SHOW_QUERIES')) {
-            $q_start = get_microtime();
-        }
-
-        @pg_send_query($this->link_id, $sql);
-        $this->query_result = @pg_get_result($this->link_id);
-
-        if (pg_result_status($this->query_result) != PGSQL_FATAL_ERROR) {
-            if (defined('FEATHER_SHOW_QUERIES')) {
-                $this->saved_queries[] = array($sql, sprintf('%.5f', get_microtime() - $q_start));
-            }
-
-            ++$this->num_queries;
-
-            $this->last_query_text[intval($this->query_result)] = $sql;
-
-            return $this->query_result;
-        } else {
-            if (defined('FEATHER_SHOW_QUERIES')) {
-                $this->saved_queries[] = array($sql, 0);
-            }
-
-            $this->error_no = false;
-            $this->error_msg = @pg_result_error($this->query_result);
-
-            if ($this->in_transaction) {
-                @pg_query($this->link_id, 'ROLLBACK');
-            }
-
-            --$this->in_transaction;
-
-            return false;
-        }
-    }
-
-
-    public function result($query_id = 0, $row = 0, $col = 0)
-    {
-        return ($query_id) ? @pg_fetch_result($query_id, $row, $col) : false;
-    }
-
-
-    public function fetch_assoc($query_id = 0)
-    {
-        return ($query_id) ? @pg_fetch_assoc($query_id) : false;
-    }
-
-
-    public function fetch_row($query_id = 0)
-    {
-        return ($query_id) ? @pg_fetch_row($query_id) : false;
-    }
-
-
-    public function num_rows($query_id = 0)
-    {
-        return ($query_id) ? @pg_num_rows($query_id) : false;
-    }
-
-
-    public function affected_rows()
-    {
-        return ($this->query_result) ? @pg_affected_rows($this->query_result) : false;
-    }
-
-
-    public function insert_id()
-    {
-        $query_id = $this->query_result;
-
-        if ($query_id && $this->last_query_text[intval($query_id)] != '') {
-            if (preg_match('%^INSERT INTO ([a-z0-9\_\-]+)%is', $this->last_query_text[intval($query_id)], $table_name)) {
-                // Hack (don't ask)
-                if (substr($table_name[1], -6) == 'groups') {
-                    $table_name[1] .= '_g';
-                }
-
-                $temp_q_id = @pg_query($this->link_id, 'SELECT currval(\''.$table_name[1].'_id_seq\')');
-                return ($temp_q_id) ? intval(@pg_fetch_result($temp_q_id, 0)) : false;
-            }
-        }
-
-        return false;
-    }
-
-
-    public function get_num_queries()
-    {
-        return $this->num_queries;
-    }
-
-
-    public function get_saved_queries()
-    {
-        return $this->saved_queries;
-    }
-
-
-    public function free_result($query_id = false)
-    {
-        if (!$query_id) {
-            $query_id = $this->query_result;
-        }
-
-        return ($query_id) ? @pg_free_result($query_id) : false;
-    }
-
-
-    public function escape($str)
-    {
-        return is_array($str) ? '' : pg_escape_string($str);
-    }
-
-
-    public function error()
-    {
-        $result['error_sql'] = @current(@end($this->saved_queries));
-        $result['error_no'] = $this->error_no;
-        $result['error_msg'] = $this->error_msg;
-
-        return $result;
-    }
-
-
-    public function close()
-    {
-        if ($this->link_id) {
-            if ($this->in_transaction) {
-                if (defined('FEATHER_SHOW_QUERIES')) {
-                    $this->saved_queries[] = array('COMMIT', 0);
-                }
-
-                @pg_query($this->link_id, 'COMMIT');
-            }
-
-            if ($this->query_result) {
-                @pg_free_result($this->query_result);
-            }
-
-            return @pg_close($this->link_id);
-        } else {
-            return false;
-        }
-    }
-
-
-    public function get_names()
-    {
-        $result = $this->query('SHOW client_encoding');
-        return strtolower($this->result($result)); // MySQL returns lowercase so lets be consistent
-    }
-
-
-    public function set_names($names)
-    {
-        return $this->query('SET NAMES \''.$this->escape($names).'\'');
-    }
-
-
-    public function get_version()
-    {
-        $result = $this->query('SELECT VERSION()');
-
-        return array(
-            'name'        => 'PostgreSQL',
-            'version'    => preg_replace('%^[^0-9]+([^\s,-]+).*$%', '\\1', $this->result($result))
-        );
-    }
-
-
-    public function table_exists($table_name, $no_prefix = false)
-    {
-        $result = $this->query('SELECT 1 FROM pg_class WHERE relname = \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\'');
-        return $this->num_rows($result) > 0;
-    }
-
-
-    public function field_exists($table_name, $field_name, $no_prefix = false)
-    {
-        $result = $this->query('SELECT 1 FROM pg_class c INNER JOIN pg_attribute a ON a.attrelid = c.oid WHERE c.relname = \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\' AND a.attname = \''.$this->escape($field_name).'\'');
-        return $this->num_rows($result) > 0;
-    }
-
-
-    public function index_exists($table_name, $index_name, $no_prefix = false)
-    {
-        $result = $this->query('SELECT 1 FROM pg_index i INNER JOIN pg_class c1 ON c1.oid = i.indrelid INNER JOIN pg_class c2 ON c2.oid = i.indexrelid WHERE c1.relname = \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\' AND c2.relname = \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'_'.$this->escape($index_name).'\'');
-        return $this->num_rows($result) > 0;
-    }
-
-
-    public function create_table($table_name, $schema, $no_prefix = false)
-    {
-        if ($this->table_exists($table_name, $no_prefix)) {
-            return true;
-        }
-
-        $query = 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$table_name." (\n";
-
-        // Go through every schema element and add it to the query
-        foreach ($schema['FIELDS'] as $field_name => $field_data) {
-            $field_data['datatype'] = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_data['datatype']);
-
-            $query .= $field_name.' '.$field_data['datatype'];
-
-            // The SERIAL datatype is a special case where we don't need to say not null
-            if (!$field_data['allow_null'] && $field_data['datatype'] != 'SERIAL') {
-                $query .= ' NOT NULL';
-            }
-
-            if (isset($field_data['default'])) {
-                $query .= ' DEFAULT '.$field_data['default'];
-            }
-
-            $query .= ",\n";
-        }
-
-        // If we have a primary key, add it
-        if (isset($schema['PRIMARY KEY'])) {
-            $query .= 'PRIMARY KEY ('.implode(',', $schema['PRIMARY KEY']).'),'."\n";
-        }
-
-        // Add unique keys
-        if (isset($schema['UNIQUE KEYS'])) {
-            foreach ($schema['UNIQUE KEYS'] as $key_name => $key_fields) {
-                $query .= 'UNIQUE ('.implode(',', $key_fields).'),'."\n";
-            }
-        }
-
-        // We remove the last two characters (a newline and a comma) and add on the ending
-        $query = substr($query, 0, strlen($query) - 2)."\n".')';
-
-        $result = $this->query($query) ? true : false;
-
-        // Add indexes
-        if (isset($schema['INDEXES'])) {
-            foreach ($schema['INDEXES'] as $index_name => $index_fields) {
-                $result &= $this->add_index($table_name, $index_name, $index_fields, false, $no_prefix);
-            }
-        }
-
-        return $result;
-    }
-
-
-    public function drop_table($table_name, $no_prefix = false)
-    {
-        if (!$this->table_exists($table_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('DROP TABLE '.($no_prefix ? '' : $this->prefix).$table_name) ? true : false;
-    }
-
-
-    public function rename_table($old_table, $new_table, $no_prefix = false)
-    {
-        // If the new table exists and the old one doesn't, then we're happy
-        if ($this->table_exists($new_table, $no_prefix) && !$this->table_exists($old_table, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$old_table.' RENAME TO '.($no_prefix ? '' : $this->prefix).$new_table) ? true : false;
-    }
-
-
-    public function add_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
-    {
-        if ($this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        $field_type = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_type);
-
-        $result = $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' ADD '.$field_name.' '.$field_type) ? true : false;
-
-        if (!is_null($default_value)) {
-            if (!is_int($default_value) && !is_float($default_value)) {
-                $default_value = '\''.$this->escape($default_value).'\'';
-            }
-
-            $result &= $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' ALTER '.$field_name.' SET DEFAULT '.$default_value) ? true : false;
-            $result &= $this->query('UPDATE '.($no_prefix ? '' : $this->prefix).$table_name.' SET '.$field_name.'='.$default_value) ? true : false;
-        }
-
-        if (!$allow_null) {
-            $result &= $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' ALTER '.$field_name.' SET NOT NULL') ? true : false;
-        }
-
-        return $result;
-    }
-
-
-    public function alter_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
-    {
-        if (!$this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        $field_type = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_type);
-
-        $result = $this->add_field($table_name, 'tmp_'.$field_name, $field_type, $allow_null, $default_value, $after_field, $no_prefix);
-        $result &= $this->query('UPDATE '.($no_prefix ? '' : $this->prefix).$table_name.' SET tmp_'.$field_name.' = '.$field_name) ? true : false;
-        $result &= $this->drop_field($table_name, $field_name, $no_prefix);
-        $result &= $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' RENAME COLUMN tmp_'.$field_name.' TO '.$field_name) ? true : false;
-
-        return $result;
-    }
-
-
-    public function drop_field($table_name, $field_name, $no_prefix = false)
-    {
-        if (!$this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' DROP '.$field_name) ? true : false;
-    }
-
-
-    public function add_index($table_name, $index_name, $index_fields, $unique = false, $no_prefix = false)
-    {
-        if ($this->index_exists($table_name, $index_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('CREATE '.($unique ? 'UNIQUE ' : '').'INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name.' ON '.($no_prefix ? '' : $this->prefix).$table_name.'('.implode(',', $index_fields).')') ? true : false;
-    }
-
-
-    public function drop_index($table_name, $index_name, $no_prefix = false)
-    {
-        if (!$this->index_exists($table_name, $index_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('DROP INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name) ? true : false;
-    }
-
-    public function truncate_table($table_name, $no_prefix = false)
-    {
-        return $this->query('DELETE FROM '.($no_prefix ? '' : $this->prefix).$table_name) ? true : false;
-    }
-}
diff --git a/install/dblayer/sqlite.php b/install/dblayer/sqlite.php
deleted file mode 100644
index 8c2416d3..00000000
--- a/install/dblayer/sqlite.php
+++ /dev/null
@@ -1,648 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure we have built in support for SQLite
-if (!function_exists('sqlite_open')) {
-    exit('This PHP environment doesn\'t have SQLite support built in. SQLite support is required if you want to use a SQLite database to run this forum. Consult the PHP documentation for further assistance.');
-}
-
-
-class DBLayer
-{
-    public $prefix;
-    public $link_id;
-    public $query_result;
-    public $in_transaction = 0;
-
-    public $saved_queries = array();
-    public $num_queries = 0;
-
-    public $error_no = false;
-    public $error_msg = 'Unknown';
-
-    public $datatype_transformations = array(
-        '%^SERIAL$%'                                                            =>    'INTEGER',
-        '%^(TINY|SMALL|MEDIUM|BIG)?INT( )?(\\([0-9]+\\))?( )?(UNSIGNED)?$%i'    =>    'INTEGER',
-        '%^(TINY|MEDIUM|LONG)?TEXT$%i'                                            =>    'TEXT'
-    );
-
-    public function forum_is_writable($path)
-    {
-        if (is_dir($path)) {
-            $path = rtrim($path, '/').'/';
-            return forum_is_writable($path.uniqid(mt_rand()).'.tmp');
-        }
-
-        // Check temporary file for read/write capabilities
-        $rm = file_exists($path);
-        $f = @fopen($path, 'a');
-
-        if ($f === false) {
-            return false;
-        }
-
-        fclose($f);
-
-        if (!$rm) {
-            @unlink($path);
-        }
-
-        return true;
-    }
-
-
-    public function __construct($db_host, $db_username, $db_password, $db_name, $db_prefix, $p_connect)
-    {
-        // Prepend $db_name with the path to the forum root directory
-        $db_name = FEATHER_ROOT.$db_name;
-
-        $this->prefix = $db_prefix;
-
-        if (!file_exists($db_name)) {
-            @touch($db_name);
-            @chmod($db_name, 0666);
-            if (!file_exists($db_name)) {
-                error('Unable to create new database \''.$db_name.'\'. Permission denied', __FILE__, __LINE__);
-            }
-        }
-
-        if (!is_readable($db_name)) {
-            error('Unable to open database \''.$db_name.'\' for reading. Permission denied', __FILE__, __LINE__);
-        }
-
-        if (!$this->forum_is_writable($db_name)) {
-            error('Unable to open database \''.$db_name.'\' for writing. Permission denied', __FILE__, __LINE__);
-        }
-
-        if ($p_connect) {
-            $this->link_id = @sqlite_popen($db_name, 0666, $sqlite_error);
-        } else {
-            $this->link_id = @sqlite_open($db_name, 0666, $sqlite_error);
-        }
-
-        if (!$this->link_id) {
-            error('Unable to open database \''.$db_name.'\'. SQLite reported: '.$sqlite_error, __FILE__, __LINE__);
-        } else {
-            return $this->link_id;
-        }
-    }
-
-
-    public function start_transaction()
-    {
-        ++$this->in_transaction;
-
-        return (@sqlite_query($this->link_id, 'BEGIN')) ? true : false;
-    }
-
-
-    public function end_transaction()
-    {
-        --$this->in_transaction;
-
-        if (@sqlite_query($this->link_id, 'COMMIT')) {
-            return true;
-        } else {
-            @sqlite_query($this->link_id, 'ROLLBACK');
-            return false;
-        }
-    }
-
-
-    public function query($sql, $unbuffered = false)
-    {
-        if (defined('FEATHER_SHOW_QUERIES')) {
-            $q_start = get_microtime();
-        }
-
-        if ($unbuffered) {
-            $this->query_result = @sqlite_unbuffered_query($this->link_id, $sql);
-        } else {
-            $this->query_result = @sqlite_query($this->link_id, $sql);
-        }
-
-        if ($this->query_result) {
-            if (defined('FEATHER_SHOW_QUERIES')) {
-                $this->saved_queries[] = array($sql, sprintf('%.5f', get_microtime() - $q_start));
-            }
-
-            ++$this->num_queries;
-
-            return $this->query_result;
-        } else {
-            if (defined('FEATHER_SHOW_QUERIES')) {
-                $this->saved_queries[] = array($sql, 0);
-            }
-
-            $this->error_no = @sqlite_last_error($this->link_id);
-            $this->error_msg = @sqlite_error_string($this->error_no);
-
-            if ($this->in_transaction) {
-                @sqlite_query($this->link_id, 'ROLLBACK');
-            }
-
-            --$this->in_transaction;
-
-            return false;
-        }
-    }
-
-
-    public function result($query_id = 0, $row = 0, $col = 0)
-    {
-        if ($query_id) {
-            if ($row !== 0 && @sqlite_seek($query_id, $row) === false) {
-                return false;
-            }
-
-            $cur_row = @sqlite_current($query_id);
-            if ($cur_row === false) {
-                return false;
-            }
-
-            return $cur_row[$col];
-        } else {
-            return false;
-        }
-    }
-
-
-    public function fetch_assoc($query_id = 0)
-    {
-        if ($query_id) {
-            $cur_row = @sqlite_fetch_array($query_id, SQLITE_ASSOC);
-            if ($cur_row) {
-                // Horrible hack to get rid of table names and table aliases from the array keys
-                foreach ($cur_row as $key => $value) {
-                    $dot_spot = strpos($key, '.');
-                    if ($dot_spot !== false) {
-                        unset($cur_row[$key]);
-                        $key = substr($key, $dot_spot+1);
-                        $cur_row[$key] = $value;
-                    }
-                }
-            }
-
-            return $cur_row;
-        } else {
-            return false;
-        }
-    }
-
-
-    public function fetch_row($query_id = 0)
-    {
-        return ($query_id) ? @sqlite_fetch_array($query_id, SQLITE_NUM) : false;
-    }
-
-
-    public function num_rows($query_id = 0)
-    {
-        return ($query_id) ? @sqlite_num_rows($query_id) : false;
-    }
-
-
-    public function affected_rows()
-    {
-        return ($this->link_id) ? @sqlite_changes($this->link_id) : false;
-    }
-
-
-    public function insert_id()
-    {
-        return ($this->link_id) ? @sqlite_last_insert_rowid($this->link_id) : false;
-    }
-
-
-    public function get_num_queries()
-    {
-        return $this->num_queries;
-    }
-
-
-    public function get_saved_queries()
-    {
-        return $this->saved_queries;
-    }
-
-
-    public function free_result($query_id = false)
-    {
-        return true;
-    }
-
-
-    public function escape($str)
-    {
-        return is_array($str) ? '' : sqlite_escape_string($str);
-    }
-
-
-    public function error()
-    {
-        $result['error_sql'] = @current(@end($this->saved_queries));
-        $result['error_no'] = $this->error_no;
-        $result['error_msg'] = $this->error_msg;
-
-        return $result;
-    }
-
-
-    public function close()
-    {
-        if ($this->link_id) {
-            if ($this->in_transaction) {
-                if (defined('FEATHER_SHOW_QUERIES')) {
-                    $this->saved_queries[] = array('COMMIT', 0);
-                }
-
-                @sqlite_query($this->link_id, 'COMMIT');
-            }
-
-            return @sqlite_close($this->link_id);
-        } else {
-            return false;
-        }
-    }
-
-
-    public function get_names()
-    {
-        return '';
-    }
-
-
-    public function set_names($names)
-    {
-        return true;
-    }
-
-
-    public function get_version()
-    {
-        return array(
-            'name'        => 'SQLite',
-            'version'    => sqlite_libversion()
-        );
-    }
-
-
-    public function table_exists($table_name, $no_prefix = false)
-    {
-        $result = $this->query('SELECT 1 FROM sqlite_master WHERE name = \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\' AND type=\'table\'');
-        return $this->num_rows($result) > 0;
-    }
-
-
-    public function field_exists($table_name, $field_name, $no_prefix = false)
-    {
-        $result = $this->query('SELECT sql FROM sqlite_master WHERE name = \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\' AND type=\'table\'');
-        if (!$this->num_rows($result)) {
-            return false;
-        }
-
-        return preg_match('%[\r\n]'.preg_quote($field_name, '%').' %', $this->result($result));
-    }
-
-
-    public function index_exists($table_name, $index_name, $no_prefix = false)
-    {
-        $result = $this->query('SELECT 1 FROM sqlite_master WHERE tbl_name = \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\' AND name = \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'_'.$this->escape($index_name).'\' AND type=\'index\'');
-        return $this->num_rows($result) > 0;
-    }
-
-
-    public function create_table($table_name, $schema, $no_prefix = false)
-    {
-        if ($this->table_exists($table_name, $no_prefix)) {
-            return true;
-        }
-
-        $query = 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$table_name." (\n";
-
-        // Go through every schema element and add it to the query
-        foreach ($schema['FIELDS'] as $field_name => $field_data) {
-            $field_data['datatype'] = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_data['datatype']);
-
-            $query .= $field_name.' '.$field_data['datatype'];
-
-            if (!$field_data['allow_null']) {
-                $query .= ' NOT NULL';
-            }
-
-            if (isset($field_data['default'])) {
-                $query .= ' DEFAULT '.$field_data['default'];
-            }
-
-            $query .= ",\n";
-        }
-
-        // If we have a primary key, add it
-        if (isset($schema['PRIMARY KEY'])) {
-            $query .= 'PRIMARY KEY ('.implode(',', $schema['PRIMARY KEY']).'),'."\n";
-        }
-
-        // Add unique keys
-        if (isset($schema['UNIQUE KEYS'])) {
-            foreach ($schema['UNIQUE KEYS'] as $key_name => $key_fields) {
-                $query .= 'UNIQUE ('.implode(',', $key_fields).'),'."\n";
-            }
-        }
-
-        // We remove the last two characters (a newline and a comma) and add on the ending
-        $query = substr($query, 0, strlen($query) - 2)."\n".')';
-
-        $result = $this->query($query) ? true : false;
-
-        // Add indexes
-        if (isset($schema['INDEXES'])) {
-            foreach ($schema['INDEXES'] as $index_name => $index_fields) {
-                $result &= $this->add_index($table_name, $index_name, $index_fields, false, $no_prefix);
-            }
-        }
-
-        return $result;
-    }
-
-
-    public function drop_table($table_name, $no_prefix = false)
-    {
-        if (!$this->table_exists($table_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('DROP TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($table_name)) ? true : false;
-    }
-
-
-    public function rename_table($old_table, $new_table, $no_prefix = false)
-    {
-        // If the old table does not exist
-        if (!$this->table_exists($old_table, $no_prefix)) {
-            return false;
-        }
-        // If the table names are the same
-        elseif ($old_table == $new_table) {
-            return true;
-        }
-        // If the new table already exists
-        elseif ($this->table_exists($new_table, $no_prefix)) {
-            return false;
-        }
-
-        $table = $this->get_table_info($old_table, $no_prefix);
-
-        // Create new table
-        $query = str_replace('CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($old_table).' (', 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($new_table).' (', $table['sql']);
-        $result = $this->query($query) ? true : false;
-
-        // Recreate indexes
-        if (!empty($table['indices'])) {
-            foreach ($table['indices'] as $cur_index) {
-                $query = str_replace('CREATE INDEX '.($no_prefix ? '' : $this->prefix).$this->escape($old_table), 'CREATE INDEX '.($no_prefix ? '' : $this->prefix).$this->escape($new_table), $cur_index);
-                $query = str_replace('ON '.($no_prefix ? '' : $this->prefix).$this->escape($old_table), 'ON '.($no_prefix ? '' : $this->prefix).$this->escape($new_table), $query);
-                $result &= $this->query($query) ? true : false;
-            }
-        }
-
-        // Copy content across
-        $result &= $this->query('INSERT INTO '.($no_prefix ? '' : $this->prefix).$this->escape($new_table).' SELECT * FROM '.($no_prefix ? '' : $this->prefix).$this->escape($old_table)) ? true : false;
-
-        // Drop the old table if the new one exists
-        if ($this->table_exists($new_table, $no_prefix)) {
-            $result &= $this->drop_table($old_table, $no_prefix);
-        }
-
-        return $result;
-    }
-
-
-    public function get_table_info($table_name, $no_prefix = false)
-    {
-        // Grab table info
-        $result = $this->query('SELECT sql FROM sqlite_master WHERE tbl_name = \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\' ORDER BY type DESC') or error('Unable to fetch table information', __FILE__, __LINE__, $this->error());
-        $num_rows = $this->num_rows($result);
-
-        if ($num_rows == 0) {
-            return;
-        }
-
-        $table = array();
-        $table['indices'] = array();
-        while ($cur_index = $this->fetch_assoc($result)) {
-            if (empty($cur_index['sql'])) {
-                continue;
-            }
-
-            if (!isset($table['sql'])) {
-                $table['sql'] = $cur_index['sql'];
-            } else {
-                $table['indices'][] = $cur_index['sql'];
-            }
-        }
-
-        // Work out the columns in the table currently
-        $table_lines = explode("\n", $table['sql']);
-        $table['columns'] = array();
-        foreach ($table_lines as $table_line) {
-            $table_line = trim($table_line, " \t\n\r,"); // trim spaces, tabs, newlines, and commas
-            if (substr($table_line, 0, 12) == 'CREATE TABLE') {
-                continue;
-            } elseif (substr($table_line, 0, 11) == 'PRIMARY KEY') {
-                $table['primary_key'] = $table_line;
-            } elseif (substr($table_line, 0, 6) == 'UNIQUE') {
-                $table['unique'] = $table_line;
-            } elseif (substr($table_line, 0, strpos($table_line, ' ')) != '') {
-                $table['columns'][substr($table_line, 0, strpos($table_line, ' '))] = trim(substr($table_line, strpos($table_line, ' ')));
-            }
-        }
-
-        return $table;
-    }
-
-
-    public function add_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
-    {
-        if ($this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        $table = $this->get_table_info($table_name, $no_prefix);
-
-        // Create temp table
-        $now = time();
-        $tmptable = str_replace('CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).' (', 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'_t'.$now.' (', $table['sql']);
-        $result = $this->query($tmptable) ? true : false;
-        $result &= $this->query('INSERT INTO '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'_t'.$now.' SELECT * FROM '.($no_prefix ? '' : $this->prefix).$this->escape($table_name)) ? true : false;
-
-        // Create new table sql
-        $field_type = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_type);
-        $query = $field_type;
-
-        if (!$allow_null) {
-            $query .= ' NOT NULL';
-        }
-        
-        if ($default_value === '') {
-            $default_value = '\'\'';
-        }
-
-        if (!is_null($default_value)) {
-            $query .= ' DEFAULT '.$default_value;
-        }
-
-        $old_columns = array_keys($table['columns']);
-
-        // Determine the proper offset
-        if (!is_null($after_field)) {
-            $offset = array_search($after_field, array_keys($table['columns']), true) + 1;
-        } else {
-            $offset = count($table['columns']);
-        }
-
-        // Out of bounds checks
-        if ($offset > count($table['columns'])) {
-            $offset = count($table['columns']);
-        } elseif ($offset < 0) {
-            $offset = 0;
-        }
-
-        if (!is_null($field_name) && $field_name !== '') {
-            $table['columns'] = array_merge(array_slice($table['columns'], 0, $offset), array($field_name => $query), array_slice($table['columns'], $offset));
-        }
-
-        $new_table = 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).' (';
-
-        foreach ($table['columns'] as $cur_column => $column_details) {
-            $new_table .= "\n".$cur_column.' '.$column_details.',';
-        }
-
-        if (isset($table['unique'])) {
-            $new_table .= "\n".$table['unique'].',';
-        }
-
-        if (isset($table['primary_key'])) {
-            $new_table .= "\n".$table['primary_key'].',';
-        }
-
-        $new_table = trim($new_table, ',')."\n".');';
-
-        // Drop old table
-        $result &= $this->drop_table($table_name, $no_prefix);
-
-        // Create new table
-        $result &= $this->query($new_table) ? true : false;
-
-        // Recreate indexes
-        if (!empty($table['indices'])) {
-            foreach ($table['indices'] as $cur_index) {
-                $result &= $this->query($cur_index) ? true : false;
-            }
-        }
-
-        // Copy content back
-        $result &= $this->query('INSERT INTO '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).' ('.implode(', ', $old_columns).') SELECT * FROM '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'_t'.$now) ? true : false;
-
-        // Drop temp table
-        $result &= $this->drop_table($table_name.'_t'.$now, $no_prefix);
-
-        return $result;
-    }
-
-
-    public function alter_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
-    {
-        // Unneeded for SQLite
-        return true;
-    }
-
-
-    public function drop_field($table_name, $field_name, $no_prefix = false)
-    {
-        if (!$this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        $table = $this->get_table_info($table_name, $no_prefix);
-
-        // Create temp table
-        $now = time();
-        $tmptable = str_replace('CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).' (', 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'_t'.$now.' (', $table['sql']);
-        $result = $this->query($tmptable) ? true : false;
-        $result &= $this->query('INSERT INTO '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'_t'.$now.' SELECT * FROM '.($no_prefix ? '' : $this->prefix).$this->escape($table_name)) ? true : false;
-
-        // Work out the columns we need to keep and the sql for the new table
-        unset($table['columns'][$field_name]);
-        $new_columns = array_keys($table['columns']);
-
-        $new_table = 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).' (';
-
-        foreach ($table['columns'] as $cur_column => $column_details) {
-            $new_table .= "\n".$cur_column.' '.$column_details.',';
-        }
-
-        if (isset($table['unique'])) {
-            $new_table .= "\n".$table['unique'].',';
-        }
-
-        if (isset($table['primary_key'])) {
-            $new_table .= "\n".$table['primary_key'].',';
-        }
-
-        $new_table = trim($new_table, ',')."\n".');';
-
-        // Drop old table
-        $result &= $this->drop_table($table_name, $no_prefix);
-
-        // Create new table
-        $result &= $this->query($new_table) ? true : false;
-
-        // Recreate indexes
-        if (!empty($table['indices'])) {
-            foreach ($table['indices'] as $cur_index) {
-                if (!preg_match('%\('.preg_quote($field_name, '%').'\)%', $cur_index)) {
-                    $result &= $this->query($cur_index) ? true : false;
-                }
-            }
-        }
-
-        // Copy content back
-        $result &= $this->query('INSERT INTO '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).' SELECT '.implode(', ', $new_columns).' FROM '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'_t'.$now) ? true : false;
-
-        // Drop temp table
-        $result &= $this->drop_table($table_name.'_t'.$now, $no_prefix);
-
-        return $result;
-    }
-
-
-    public function add_index($table_name, $index_name, $index_fields, $unique = false, $no_prefix = false)
-    {
-        if ($this->index_exists($table_name, $index_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('CREATE '.($unique ? 'UNIQUE ' : '').'INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name.' ON '.($no_prefix ? '' : $this->prefix).$table_name.'('.implode(',', $index_fields).')') ? true : false;
-    }
-
-
-    public function drop_index($table_name, $index_name, $no_prefix = false)
-    {
-        if (!$this->index_exists($table_name, $index_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('DROP INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name) ? true : false;
-    }
-
-    public function truncate_table($table_name, $no_prefix = false)
-    {
-        return $this->query('DELETE FROM '.($no_prefix ? '' : $this->prefix).$table_name) ? true : false;
-    }
-}
diff --git a/install/dblayer/sqlite3.php b/install/dblayer/sqlite3.php
deleted file mode 100644
index 9b6438c6..00000000
--- a/install/dblayer/sqlite3.php
+++ /dev/null
@@ -1,686 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * SQLite3 DB Layer based on work by Koos
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure we have built in support for SQLite3
-if (!class_exists('SQLite3')) {
-    exit('This PHP environment doesn\'t have SQLite3 support built in. SQLite3 support is required if you want to use a SQLite3 database to run this forum. Consult the PHP documentation for further assistance.');
-}
-
-
-class DBLayer
-{
-    public $prefix;
-    public $link_id;
-    public $query_result;
-    public $in_transaction = 0;
-
-    public $last_query;
-    public $saved_queries = array();
-    public $num_queries = 0;
-
-    public $error_no = false;
-    public $error_msg = 'Unknown';
-
-    public $datatype_transformations = array(
-        '%^SERIAL$%'                                                            =>    'INTEGER',
-        '%^(TINY|SMALL|MEDIUM|BIG)?INT( )?(\\([0-9]+\\))?( )?(UNSIGNED)?$%i'    =>    'INTEGER',
-        '%^(TINY|MEDIUM|LONG)?TEXT$%i'                                            =>    'TEXT'
-    );
-
-    public function forum_is_writable($path)
-    {
-        if (is_dir($path)) {
-            $path = rtrim($path, '/').'/';
-            return forum_is_writable($path.uniqid(mt_rand()).'.tmp');
-        }
-
-        // Check temporary file for read/write capabilities
-        $rm = file_exists($path);
-        $f = @fopen($path, 'a');
-
-        if ($f === false) {
-            return false;
-        }
-
-        fclose($f);
-
-        if (!$rm) {
-            @unlink($path);
-        }
-
-        return true;
-    }
-
-
-    public function __construct($db_host, $db_username, $db_password, $db_name, $db_prefix, $p_connect)
-    {
-        // Prepend $db_name with the path to the forum root directory
-        $db_name = FEATHER_ROOT.$db_name;
-
-        $this->prefix = $db_prefix;
-
-        if (!file_exists($db_name)) {
-            @touch($db_name);
-            @chmod($db_name, 0666);
-            if (!file_exists($db_name)) {
-                error('Unable to create new database \''.$db_name.'\'. Permission denied', __FILE__, __LINE__);
-            }
-        }
-
-        if (!is_readable($db_name)) {
-            error('Unable to open database \''.$db_name.'\' for reading. Permission denied', __FILE__, __LINE__);
-        }
-
-        if (!$this->forum_is_writable($db_name)) {
-            error('Unable to open database \''.$db_name.'\' for writing. Permission denied', __FILE__, __LINE__);
-        }
-
-        @$this->link_id = new SQLite3($db_name, SQLITE3_OPEN_READWRITE);
-
-        if (!$this->link_id) {
-            error('Unable to open database \''.$db_name.'\'.', __FILE__, __LINE__);
-        } else {
-            return $this->link_id;
-        }
-    }
-
-
-    public function start_transaction()
-    {
-        ++$this->in_transaction;
-
-        return ($this->link_id->exec('BEGIN TRANSACTION')) ? true : false;
-    }
-
-
-    public function end_transaction()
-    {
-        --$this->in_transaction;
-
-        if ($this->link_id->exec('COMMIT')) {
-            return true;
-        } else {
-            $this->link_id->exec('ROLLBACK');
-            return false;
-        }
-    }
-
-
-    public function query($sql, $unbuffered = false)
-    {
-        if (strlen($sql) > 140000) {
-            exit('Insane query. Aborting.');
-        }
-
-        $this->last_query = $sql;
-
-        if (defined('FEATHER_SHOW_QUERIES')) {
-            $q_start = get_microtime();
-        }
-
-        $this->query_result = $this->link_id->query($sql);
-
-        if ($this->query_result) {
-            if (defined('FEATHER_SHOW_QUERIES')) {
-                $this->saved_queries[] = array($sql, sprintf('%.5f', get_microtime() - $q_start));
-            }
-
-            ++$this->num_queries;
-
-            return $this->query_result;
-        } else {
-            if (defined('FEATHER_SHOW_QUERIES')) {
-                $this->saved_queries[] = array($sql, 0);
-            }
-
-            $this->error_no = $this->link_id->lastErrorCode();
-            $this->error_msg = $this->link_id->lastErrorMsg();
-
-            if ($this->in_transaction) {
-                $this->link_id->exec('ROLLBACK');
-            }
-
-            --$this->in_transaction;
-
-            return false;
-        }
-    }
-
-
-    public function result($query_id = 0, $row = 0, $col = 0)
-    {
-        if ($query_id) {
-            $result_rows = array();
-            while ($cur_result_row = @$query_id->fetchArray(SQLITE3_NUM)) {
-                $result_rows[] = $cur_result_row;
-            }
-
-            if (!empty($result_rows) && array_key_exists($row, $result_rows)) {
-                $cur_row = $result_rows[$row];
-            }
-
-            if (isset($cur_row)) {
-                return $cur_row[$col];
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
-    }
-
-
-    public function fetch_assoc($query_id = 0)
-    {
-        if ($query_id) {
-            $cur_row = @$query_id->fetchArray(SQLITE3_ASSOC);
-            if ($cur_row) {
-                // Horrible hack to get rid of table names and table aliases from the array keys
-                foreach ($cur_row as $key => $value) {
-                    $dot_spot = strpos($key, '.');
-                    if ($dot_spot !== false) {
-                        unset($cur_row[$key]);
-                        $key = substr($key, $dot_spot+1);
-                        $cur_row[$key] = $value;
-                    }
-                }
-            }
-
-            return $cur_row;
-        } else {
-            return false;
-        }
-    }
-
-
-    public function fetch_row($query_id = 0)
-    {
-        return ($query_id) ? @$query_id->fetchArray(SQLITE3_NUM) : false;
-    }
-
-
-    public function num_rows($query_id = 0)
-    {
-        if ($query_id && preg_match('/\bSELECT\b/i', $this->last_query)) {
-            $num_rows_query = preg_replace('/\bSELECT\b(.*)\bFROM\b/imsU', 'SELECT COUNT(*) FROM', $this->last_query);
-            $result = $this->query($num_rows_query);
-
-            return intval($this->result($result));
-        } else {
-            return false;
-        }
-    }
-
-
-    public function affected_rows()
-    {
-        return ($this->query_result) ? $this->link_id->changes() : false;
-    }
-
-
-    public function insert_id()
-    {
-        return ($this->link_id) ? $this->link_id->lastInsertRowID() : false;
-    }
-
-
-    public function get_num_queries()
-    {
-        return $this->num_queries;
-    }
-
-
-    public function get_saved_queries()
-    {
-        return $this->saved_queries;
-    }
-
-
-    public function free_result($query_id = false)
-    {
-        if ($query_id) {
-            @$query_id->finalize();
-        }
-
-        return true;
-    }
-
-
-    public function escape($str)
-    {
-        return is_array($str) ? '' : $this->link_id->escapeString($str);
-    }
-
-
-    public function error()
-    {
-        $result['error_sql'] = @current(@end($this->saved_queries));
-        $result['error_no'] = $this->error_no;
-        $result['error_msg'] = $this->error_msg;
-
-        return $result;
-    }
-
-
-    public function close()
-    {
-        if ($this->link_id) {
-            if ($this->in_transaction) {
-                if (defined('FEATHER_SHOW_QUERIES')) {
-                    $this->saved_queries[] = array('COMMIT', 0);
-                }
-
-                $this->link_id->exec('COMMIT');
-            }
-
-            return @$this->link_id->close();
-        } else {
-            return false;
-        }
-    }
-
-
-    public function get_names()
-    {
-        return '';
-    }
-
-
-    public function set_names($names)
-    {
-        return true;
-    }
-
-
-    public function get_version()
-    {
-        $info = SQLite3::version();
-
-        return array(
-            'name'        => 'SQLite3',
-            'version'    => $info['versionString']
-        );
-    }
-
-
-    public function table_exists($table_name, $no_prefix = false)
-    {
-        $result = $this->query('SELECT COUNT(type) FROM sqlite_master WHERE name = \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\' AND type=\'table\'');
-        $table_exists = (intval($this->result($result)) > 0);
-
-        // Free results for DROP
-        if ($result instanceof Sqlite3Result) {
-            $this->free_result($result);
-        }
-
-        return $table_exists;
-    }
-
-
-    public function field_exists($table_name, $field_name, $no_prefix = false)
-    {
-        $result = $this->query('SELECT sql FROM sqlite_master WHERE name = \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\' AND type=\'table\'');
-        $sql = $this->result($result);
-
-        if (is_null($sql) || $sql === false) {
-            return false;
-        }
-
-        return (preg_match('%[\r\n]'.preg_quote($field_name).' %', $sql) === 1);
-    }
-
-
-    public function index_exists($table_name, $index_name, $no_prefix = false)
-    {
-        $result = $this->query('SELECT COUNT(type) FROM sqlite_master WHERE tbl_name = \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\' AND name = \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'_'.$this->escape($index_name).'\' AND type=\'index\'');
-        $index_exists = (intval($this->result($result)) > 0);
-
-        // Free results for DROP
-        if ($result instanceof Sqlite3Result) {
-            $this->free_result($result);
-        }
-
-        return $index_exists;
-    }
-
-
-    public function create_table($table_name, $schema, $no_prefix = false)
-    {
-        if ($this->table_exists($table_name, $no_prefix)) {
-            return true;
-        }
-
-        $query = 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$table_name." (\n";
-
-        // Go through every schema element and add it to the query
-        foreach ($schema['FIELDS'] as $field_name => $field_data) {
-            $field_data['datatype'] = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_data['datatype']);
-
-            $query .= $field_name.' '.$field_data['datatype'];
-
-            if (!$field_data['allow_null']) {
-                $query .= ' NOT NULL';
-            }
-
-            if (isset($field_data['default'])) {
-                $query .= ' DEFAULT '.$field_data['default'];
-            }
-
-            $query .= ",\n";
-        }
-
-        // If we have a primary key, add it
-        if (isset($schema['PRIMARY KEY'])) {
-            $query .= 'PRIMARY KEY ('.implode(',', $schema['PRIMARY KEY']).'),'."\n";
-        }
-
-        // Add unique keys
-        if (isset($schema['UNIQUE KEYS'])) {
-            foreach ($schema['UNIQUE KEYS'] as $key_name => $key_fields) {
-                $query .= 'UNIQUE ('.implode(',', $key_fields).'),'."\n";
-            }
-        }
-
-        // We remove the last two characters (a newline and a comma) and add on the ending
-        $query = substr($query, 0, strlen($query) - 2)."\n".')';
-
-        $result = $this->query($query) ? true : false;
-
-        // Add indexes
-        if (isset($schema['INDEXES'])) {
-            foreach ($schema['INDEXES'] as $index_name => $index_fields) {
-                $result &= $this->add_index($table_name, $index_name, $index_fields, false, $no_prefix);
-            }
-        }
-
-        return $result;
-    }
-
-
-    public function drop_table($table_name, $no_prefix = false)
-    {
-        if (!$this->table_exists($table_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('DROP TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($table_name)) ? true : false;
-    }
-
-
-    public function rename_table($old_table, $new_table, $no_prefix = false)
-    {
-        // If the old table does not exist
-        if (!$this->table_exists($old_table, $no_prefix)) {
-            return false;
-        }
-        // If the table names are the same
-        elseif ($old_table == $new_table) {
-            return true;
-        }
-        // If the new table already exists
-        elseif ($this->table_exists($new_table, $no_prefix)) {
-            return false;
-        }
-
-        $table = $this->get_table_info($old_table, $no_prefix);
-
-        // Create new table
-        $query = str_replace('CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($old_table).' (', 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($new_table).' (', $table['sql']);
-        $result = $this->query($query) ? true : false;
-
-        // Recreate indexes
-        if (!empty($table['indices'])) {
-            foreach ($table['indices'] as $cur_index) {
-                $query = str_replace('CREATE INDEX '.($no_prefix ? '' : $this->prefix).$this->escape($old_table), 'CREATE INDEX '.($no_prefix ? '' : $this->prefix).$this->escape($new_table), $cur_index);
-                $query = str_replace('ON '.($no_prefix ? '' : $this->prefix).$this->escape($old_table), 'ON '.($no_prefix ? '' : $this->prefix).$this->escape($new_table), $query);
-                $result &= $this->query($query) ? true : false;
-            }
-        }
-
-        // Copy content across
-        $result &= $this->query('INSERT INTO '.($no_prefix ? '' : $this->prefix).$this->escape($new_table).' SELECT * FROM '.($no_prefix ? '' : $this->prefix).$this->escape($old_table)) ? true : false;
-
-        // Drop the old table if the new one exists
-        if ($this->table_exists($new_table, $no_prefix)) {
-            $result &= $this->drop_table($old_table, $no_prefix);
-        }
-
-        return $result;
-    }
-
-
-    public function get_table_info($table_name, $no_prefix = false)
-    {
-        // Grab table info
-        $result = $this->query('SELECT sql FROM sqlite_master WHERE tbl_name = \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\' ORDER BY type DESC') or error('Unable to fetch table information', __FILE__, __LINE__, $this->error());
-
-        $table = array();
-        $table['indices'] = array();
-        $num_rows = 0;
-
-        while ($cur_index = $this->fetch_assoc($result)) {
-            if (empty($cur_index['sql'])) {
-                continue;
-            }
-
-            if (!isset($table['sql'])) {
-                $table['sql'] = $cur_index['sql'];
-            } else {
-                $table['indices'][] = $cur_index['sql'];
-            }
-
-            ++$num_rows;
-        }
-
-        // Check for empty
-        if ($num_rows < 1) {
-            return;
-        }
-
-
-        // Work out the columns in the table currently
-        $table_lines = explode("\n", $table['sql']);
-        $table['columns'] = array();
-        foreach ($table_lines as $table_line) {
-            $table_line = trim($table_line, " \t\n\r,"); // trim spaces, tabs, newlines, and commas
-            if (substr($table_line, 0, 12) == 'CREATE TABLE') {
-                continue;
-            } elseif (substr($table_line, 0, 11) == 'PRIMARY KEY') {
-                $table['primary_key'] = $table_line;
-            } elseif (substr($table_line, 0, 6) == 'UNIQUE') {
-                $table['unique'] = $table_line;
-            } elseif (substr($table_line, 0, strpos($table_line, ' ')) != '') {
-                $table['columns'][substr($table_line, 0, strpos($table_line, ' '))] = trim(substr($table_line, strpos($table_line, ' ')));
-            }
-        }
-
-        return $table;
-    }
-
-
-    public function add_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
-    {
-        if ($this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        $table = $this->get_table_info($table_name, $no_prefix);
-
-        // Create temp table
-        $now = time();
-        $tmptable = str_replace('CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).' (', 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'_t'.$now.' (', $table['sql']);
-        $result = $this->query($tmptable) ? true : false;
-        $result &= $this->query('INSERT INTO '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'_t'.$now.' SELECT * FROM '.($no_prefix ? '' : $this->prefix).$this->escape($table_name)) ? true : false;
-
-        // Create new table sql
-        $field_type = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_type);
-        $query = $field_type;
-
-        if (!$allow_null) {
-            $query .= ' NOT NULL';
-        }
-        
-        if ($default_value === '') {
-            $default_value = '\'\'';
-        }
-
-        if (!is_null($default_value)) {
-            $query .= ' DEFAULT '.$default_value;
-        }
-
-        $old_columns = array_keys($table['columns']);
-
-        // Determine the proper offset
-        if (!is_null($after_field)) {
-            $offset = array_search($after_field, array_keys($table['columns']), true) + 1;
-        } else {
-            $offset = count($table['columns']);
-        }
-
-        // Out of bounds checks
-        if ($offset > count($table['columns'])) {
-            $offset = count($table['columns']);
-        } elseif ($offset < 0) {
-            $offset = 0;
-        }
-
-        if (!is_null($field_name) && $field_name !== '') {
-            $table['columns'] = array_merge(array_slice($table['columns'], 0, $offset), array($field_name => $query), array_slice($table['columns'], $offset));
-        }
-
-        $new_table = 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).' (';
-
-        foreach ($table['columns'] as $cur_column => $column_details) {
-            $new_table .= "\n".$cur_column.' '.$column_details.',';
-        }
-
-        if (isset($table['unique'])) {
-            $new_table .= "\n".$table['unique'].',';
-        }
-
-        if (isset($table['primary_key'])) {
-            $new_table .= "\n".$table['primary_key'].',';
-        }
-
-        $new_table = trim($new_table, ',')."\n".');';
-
-        // Drop old table
-        $result &= $this->drop_table($table_name, $no_prefix);
-
-        // Create new table
-        $result &= $this->query($new_table) ? true : false;
-
-        // Recreate indexes
-        if (!empty($table['indices'])) {
-            foreach ($table['indices'] as $cur_index) {
-                $result &= $this->query($cur_index) ? true : false;
-            }
-        }
-
-        // Copy content back
-        $result &= $this->query('INSERT INTO '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).' ('.implode(', ', $old_columns).') SELECT * FROM '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'_t'.$now) ? true : false;
-
-        // Drop temp table
-        $result &= $this->drop_table($table_name.'_t'.$now, $no_prefix);
-
-        return $result;
-    }
-
-
-    public function alter_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
-    {
-        // Unneeded for SQLite
-        return true;
-    }
-
-
-    public function drop_field($table_name, $field_name, $no_prefix = false)
-    {
-        if (!$this->field_exists($table_name, $field_name, $no_prefix)) {
-            return true;
-        }
-
-        $table = $this->get_table_info($table_name, $no_prefix);
-
-        // Create temp table
-        $now = time();
-        $tmptable = str_replace('CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).' (', 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'_t'.$now.' (', $table['sql']);
-        $result = $this->query($tmptable) ? true : false;
-        $result &= $this->query('INSERT INTO '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'_t'.$now.' SELECT * FROM '.($no_prefix ? '' : $this->prefix).$this->escape($table_name)) ? true : false;
-
-        // Work out the columns we need to keep and the sql for the new table
-        unset($table['columns'][$field_name]);
-        $new_columns = array_keys($table['columns']);
-
-        $new_table = 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).' (';
-
-        foreach ($table['columns'] as $cur_column => $column_details) {
-            $new_table .= "\n".$cur_column.' '.$column_details.',';
-        }
-
-        if (isset($table['unique'])) {
-            $new_table .= "\n".$table['unique'].',';
-        }
-
-        if (isset($table['primary_key'])) {
-            $new_table .= "\n".$table['primary_key'].',';
-        }
-
-        $new_table = trim($new_table, ',')."\n".');';
-
-        // Drop old table
-        $result &= $this->drop_table($table_name, $no_prefix);
-
-        // Create new table
-        $result &= $this->query($new_table) ? true : false;
-
-        // Recreate indexes
-        if (!empty($table['indices'])) {
-            foreach ($table['indices'] as $cur_index) {
-                if (!preg_match('%\('.preg_quote($field_name, '%').'\)%', $cur_index)) {
-                    $result &= $this->query($cur_index) ? true : false;
-                }
-            }
-        }
-
-        // Copy content back
-        $result &= $this->query('INSERT INTO '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).' SELECT '.implode(', ', $new_columns).' FROM '.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'_t'.$now) ? true : false;
-
-        // Drop temp table
-        $result &= $this->drop_table($table_name.'_t'.$now, $no_prefix);
-
-        return $result;
-    }
-
-
-    public function add_index($table_name, $index_name, $index_fields, $unique = false, $no_prefix = false)
-    {
-        if ($this->index_exists($table_name, $index_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('CREATE '.($unique ? 'UNIQUE ' : '').'INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name.' ON '.($no_prefix ? '' : $this->prefix).$table_name.'('.implode(',', $index_fields).')') ? true : false;
-    }
-
-
-    public function drop_index($table_name, $index_name, $no_prefix = false)
-    {
-        if (!$this->index_exists($table_name, $index_name, $no_prefix)) {
-            return true;
-        }
-
-        return $this->query('DROP INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name) ? true : false;
-    }
-
-    public function truncate_table($table_name, $no_prefix = false)
-    {
-        return $this->query('DELETE FROM '.($no_prefix ? '' : $this->prefix).$table_name) ? true : false;
-    }
-}
diff --git a/install/index.php b/install/index.php
deleted file mode 100644
index 6c481fa4..00000000
--- a/install/index.php
+++ /dev/null
@@ -1,1990 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// The FeatherBB version this script installs
-define('FORUM_VERSION', '1.0.0');
-
-define('FORUM_DB_REVISION', 21);
-define('FORUM_SI_REVISION', 2);
-define('FORUM_PARSER_REVISION', 2);
-
-define('MIN_PHP_VERSION', '5.3.0');
-define('MIN_MYSQL_VERSION', '4.1.2');
-define('MIN_PGSQL_VERSION', '7.0.0');
-define('FEATHER_SEARCH_MIN_WORD', 3);
-define('FEATHER_SEARCH_MAX_WORD', 20);
-
-define('FEATHER_ROOT', dirname(dirname(__FILE__)).'/');
-
-// Send the Content-type header in case the web server is setup to send something else
-header('Content-type: text/html; charset=utf-8');
-
-// Load Slim Framework
-require FEATHER_ROOT.'Slim/Slim.php';
-\Slim\Slim::registerAutoloader();
-
-// Instantiate Slim
-$feather = new \Slim\Slim();
-
-// Load the functions script
-require FEATHER_ROOT.'include/functions.php';
-
-// Load UTF-8 functions
-require FEATHER_ROOT.'include/utf8/utf8.php';
-
-//
-// Check whether a file/folder is writable.
-//
-// This function also works on Windows Server where ACLs seem to be ignored.
-//
-function forum_is_writable($path)
-{
-    if (is_dir($path)) {
-        $path = rtrim($path, '/').'/';
-        return forum_is_writable($path.uniqid(mt_rand()).'.tmp');
-    }
-
-    // Check temporary file for read/write capabilities
-    $rm = file_exists($path);
-    $f = @fopen($path, 'a');
-
-    if ($f === false) {
-        return false;
-    }
-
-    fclose($f);
-
-    if (!$rm) {
-        @unlink($path);
-    }
-
-    return true;
-}
-
-//
-// Removes any "bad" characters (characters which mess with the display of a page, are invisible, etc) from the given string
-// See: http://kb.mozillazine.org/Network.IDN.blacklist_chars
-//
-function remove_bad_characters($array)
-{
-    static $bad_utf8_chars;
-
-    if (!isset($bad_utf8_chars)) {
-        $bad_utf8_chars = array(
-            "\xcc\xb7"        => '',        // COMBINING SHORT SOLIDUS OVERLAY		0337	*
-            "\xcc\xb8"        => '',        // COMBINING LONG SOLIDUS OVERLAY		0338	*
-            "\xe1\x85\x9F"    => '',        // HANGUL CHOSEONG FILLER				115F	*
-            "\xe1\x85\xA0"    => '',        // HANGUL JUNGSEONG FILLER				1160	*
-            "\xe2\x80\x8b"    => '',        // ZERO WIDTH SPACE						200B	*
-            "\xe2\x80\x8c"    => '',        // ZERO WIDTH NON-JOINER				200C
-            "\xe2\x80\x8d"    => '',        // ZERO WIDTH JOINER					200D
-            "\xe2\x80\x8e"    => '',        // LEFT-TO-RIGHT MARK					200E
-            "\xe2\x80\x8f"    => '',        // RIGHT-TO-LEFT MARK					200F
-            "\xe2\x80\xaa"    => '',        // LEFT-TO-RIGHT EMBEDDING				202A
-            "\xe2\x80\xab"    => '',        // RIGHT-TO-LEFT EMBEDDING				202B
-            "\xe2\x80\xac"    => '',        // POP DIRECTIONAL FORMATTING			202C
-            "\xe2\x80\xad"    => '',        // LEFT-TO-RIGHT OVERRIDE				202D
-            "\xe2\x80\xae"    => '',        // RIGHT-TO-LEFT OVERRIDE				202E
-            "\xe2\x80\xaf"    => '',        // NARROW NO-BREAK SPACE				202F	*
-            "\xe2\x81\x9f"    => '',        // MEDIUM MATHEMATICAL SPACE			205F	*
-            "\xe2\x81\xa0"    => '',        // WORD JOINER							2060
-            "\xe3\x85\xa4"    => '',        // HANGUL FILLER						3164	*
-            "\xef\xbb\xbf"    => '',        // ZERO WIDTH NO-BREAK SPACE			FEFF
-            "\xef\xbe\xa0"    => '',        // HALFWIDTH HANGUL FILLER				FFA0	*
-            "\xef\xbf\xb9"    => '',        // INTERLINEAR ANNOTATION ANCHOR		FFF9	*
-            "\xef\xbf\xba"    => '',        // INTERLINEAR ANNOTATION SEPARATOR		FFFA	*
-            "\xef\xbf\xbb"    => '',        // INTERLINEAR ANNOTATION TERMINATOR	FFFB	*
-            "\xef\xbf\xbc"    => '',        // OBJECT REPLACEMENT CHARACTER			FFFC	*
-            "\xef\xbf\xbd"    => '',        // REPLACEMENT CHARACTER				FFFD	*
-            "\xe2\x80\x80"    => ' ',        // EN QUAD								2000	*
-            "\xe2\x80\x81"    => ' ',        // EM QUAD								2001	*
-            "\xe2\x80\x82"    => ' ',        // EN SPACE								2002	*
-            "\xe2\x80\x83"    => ' ',        // EM SPACE								2003	*
-            "\xe2\x80\x84"    => ' ',        // THREE-PER-EM SPACE					2004	*
-            "\xe2\x80\x85"    => ' ',        // FOUR-PER-EM SPACE					2005	*
-            "\xe2\x80\x86"    => ' ',        // SIX-PER-EM SPACE						2006	*
-            "\xe2\x80\x87"    => ' ',        // FIGURE SPACE							2007	*
-            "\xe2\x80\x88"    => ' ',        // FEATHERCTUATION SPACE					2008	*
-            "\xe2\x80\x89"    => ' ',        // THIN SPACE							2009	*
-            "\xe2\x80\x8a"    => ' ',        // HAIR SPACE							200A	*
-            "\xE3\x80\x80"    => ' ',        // IDEOGRAPHIC SPACE					3000	*
-        );
-    }
-
-    if (is_array($array)) {
-        return array_map('remove_bad_characters', $array);
-    }
-
-    // Strip out any invalid characters
-    $array = utf8_bad_strip($array);
-
-    // Remove control characters
-    $array = preg_replace('%[\x00-\x08\x0b-\x0c\x0e-\x1f]%', '', $array);
-
-    // Replace some "bad" characters
-    $array = str_replace(array_keys($bad_utf8_chars), array_values($bad_utf8_chars), $array);
-
-    return $array;
-}
-
-// Strip out "bad" UTF-8 characters
-$_GET = remove_bad_characters($_GET);
-$_POST = remove_bad_characters($_POST);
-$_COOKIE = remove_bad_characters($_COOKIE);
-$_REQUEST = remove_bad_characters($_REQUEST);
-
-//
-// Unset any variables instantiated as a result of register_globals being enabled
-//
-$register_globals = ini_get('register_globals');
-if ($register_globals === '' || $register_globals === '0' || strtolower($register_globals) === 'off') {
-    return;
-}
-
-// Prevent script.php?GLOBALS[foo]=bar
-if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) {
-    exit('I\'ll have a steak sandwich and... a steak sandwich.');
-}
-
-// Variables that shouldn't be unset
-$no_unset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
-
-// Remove elements in $GLOBALS that are present in any of the superglobals
-$input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array());
-foreach ($input as $k => $v) {
-    if (!in_array($k, $no_unset) && isset($GLOBALS[$k])) {
-        unset($GLOBALS[$k]);
-        unset($GLOBALS[$k]); // Double unset to circumvent the zend_hash_del_key_or_index hole in PHP <4.4.3 and <5.1.4
-    }
-}
-
-// Disable error reporting for uninitialized variables
-error_reporting(E_ALL);
-
-// Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
-setlocale(LC_CTYPE, 'C');
-
-// Turn off magic_quotes_runtime
-if (get_magic_quotes_runtime()) {
-    set_magic_quotes_runtime(0);
-}
-
-// Strip slashes from GET/POST/COOKIE (if magic_quotes_gpc is enabled)
-if (get_magic_quotes_gpc()) {
-    function stripslashes_array($array)
-    {
-        return is_array($array) ? array_map('stripslashes_array', $array) : stripslashes($array);
-    }
-
-    $_GET = stripslashes_array($_GET);
-    $_POST = stripslashes_array($_POST);
-    $_COOKIE = stripslashes_array($_COOKIE);
-    $_REQUEST = stripslashes_array($_REQUEST);
-}
-
-// Turn off PHP time limit
-@set_time_limit(0);
-
-
-// If we've been passed a default language, use it
-$install_lang = isset($_POST['install_lang']) ? feather_trim($_POST['install_lang']) : 'English';
-
-// Make sure we got a valid language string
-$install_lang = preg_replace('%[\.\\\/]%', '', $install_lang);
-
-// If such a language pack doesn't exist, or isn't up-to-date enough to translate this page, default to English
-if (!file_exists(FEATHER_ROOT.'lang/'.$feather->user->language.'/install.mo')) {
-    $install_lang = 'English';
-}
-
-// Load l10n
-require_once FEATHER_ROOT.'include/pomo/MO.php';
-require_once FEATHER_ROOT.'include/l10n.php';
-
-load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$install_lang.'/install.mo');
-
-if (file_exists(FEATHER_ROOT.'include/config.php')) {
-    // Check to see whether FeatherBB is already installed
-    include FEATHER_ROOT.'include/config.php';
-
-    // If FEATHER is defined, config.php is probably valid and thus the software is installed
-    if (defined('FEATHER')) {
-        exit(__('Already installed'));
-    }
-}
-
-// Define FEATHER because email.php requires it
-define('FEATHER', 1);
-
-// If the cache directory is not specified, we use the default setting
-if (!defined('FORUM_CACHE_DIR')) {
-    define('FORUM_CACHE_DIR', FEATHER_ROOT.'cache/');
-}
-
-// Make sure we are running at least MIN_PHP_VERSION
-if (!function_exists('version_compare') || version_compare(PHP_VERSION, MIN_PHP_VERSION, '<')) {
-    exit(sprintf(__('You are running error'), 'PHP', PHP_VERSION, FORUM_VERSION, MIN_PHP_VERSION));
-}
-
-
-
-//
-// Display a simple error message
-//
-function error($message, $file = null, $line = null, $db_error = false)
-{
-    global $feather_config;
-    // Set some default settings if the script failed before $feather_config could be populated
-    if (empty($feather_config)) {
-        $feather_config = array(
-            'o_board_title'    => 'FluxBB',
-            'o_gzip'        => '0'
-        );
-    }
-    // Empty all output buffers and stop buffering
-    while (@ob_end_clean());
-    // "Restart" output buffering if we are using ob_gzhandler (since the gzip header is already sent)
-    if ($feather_config['o_gzip'] && extension_loaded('zlib')) {
-        ob_start('ob_gzhandler');
-    }
-    // Send no-cache headers
-    header('Expires: Thu, 21 Jul 1977 07:30:00 GMT'); // When yours truly first set eyes on this world! :)
-    header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-    header('Cache-Control: post-check=0, pre-check=0', false);
-    header('Pragma: no-cache'); // For HTTP/1.0 compatibility
-    // Send the Content-type header in case the web server is setup to send something else
-    header('Content-type: text/html; charset=utf-8');
-    ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<?php $page_title = array(feather_escape($feather_config['o_board_title']), 'Error') ?>
-<title><?php echo generate_page_title($page_title) ?></title>
-<style type="text/css">
-<!--
-BODY {MARGIN: 10% 20% auto 20%; font: 10px Verdana, Arial, Helvetica, sans-serif}
-#errorbox {BORDER: 1px solid #B84623}
-H2 {MARGIN: 0; COLOR: #FFFFFF; BACKGROUND-COLOR: #B84623; FONT-SIZE: 1.1em; PADDING: 5px 4px}
-#errorbox DIV {PADDING: 6px 5px; BACKGROUND-COLOR: #F1F1F1}
--->
-</style>
-</head>
-<body>
-
-<div id="errorbox">
-	<h2>An error was encountered</h2>
-	<div>
-<?php
-    if (defined('FEATHER_DEBUG') && !is_null($file) && !is_null($line)) {
-        echo "\t\t".'<strong>File:</strong> '.$file.'<br />'."\n\t\t".'<strong>Line:</strong> '.$line.'<br /><br />'."\n\t\t".'<strong>FluxBB reported</strong>: '.$message."\n";
-        if ($db_error) {
-            echo "\t\t".'<br /><br /><strong>Database reported:</strong> '.feather_escape($db_error['error_msg']).(($db_error['error_no']) ? ' (Errno: '.$db_error['error_no'].')' : '')."\n";
-            if ($db_error['error_sql'] != '') {
-                echo "\t\t".'<br /><br /><strong>Failed query:</strong> '.feather_escape($db_error['error_sql'])."\n";
-            }
-        }
-    } else {
-        echo "\t\t".'Error: <strong>'.$message.'.</strong>'."\n";
-    }
-    ?>
-	</div>
-</div>
-
-</body>
-</html>
-<?php
-    // If a database connection was established (before this error) we close it
-    if ($db_error) {
-        $GLOBALS['db']->close();
-    }
-    exit;
-}
-
-
-//
-// Generate output to be used for config.php
-//
-function generate_config_file()
-{
-    global $db_type, $db_host, $db_name, $db_username, $db_password, $db_prefix, $cookie_name, $cookie_seed;
-
-    return '<?php'."\n\n".'$feather_user_settings = array('."\n\t".'\'db_type\' => \''.$db_type."',\n\t".'\'db_host\' => \''.$db_host."',\n\t".'\'db_name\' => \''.addslashes($db_name)."',\n\t".'\'db_user\' => \''.addslashes($db_username)."',\n\t".'\'db_pass\' => \''.addslashes($db_password)."',\n\t".'\'db_prefix\' => \''.addslashes($db_prefix)."'\n);\n\n".'$p_connect = false;'."\n\n".'$cookie_name = '."'".$cookie_name."';\n".'$cookie_domain = '."'';\n".'$cookie_path = '."'/';\n".'$cookie_secure = 0;'."\n".'$cookie_seed = \''.random_key(16, false, true)."';\n";
-}
-
-
-if (isset($_POST['generate_config'])) {
-    header('Content-Type: text/x-delimtext; name="config.php"');
-    header('Content-disposition: attachment; filename=config.php');
-
-    $db_type = $_POST['db_type'];
-    $db_host = $_POST['db_host'];
-    $db_name = $_POST['db_name'];
-    $db_username = $_POST['db_username'];
-    $db_password = $_POST['db_password'];
-    $db_prefix = $_POST['db_prefix'];
-    $cookie_name = $_POST['cookie_name'];
-    $cookie_seed = $_POST['cookie_seed'];
-
-    echo generate_config_file();
-    exit;
-}
-
-
-if (!isset($_POST['form_sent'])) {
-    // Make an educated guess regarding base_url
-    $base_url  = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://';    // protocol
-    $base_url .= preg_replace('%:(80|443)$%', '', $_SERVER['HTTP_HOST']);                            // host[:port]
-    $base_url .= str_replace('\\', '/', dirname($_SERVER['SCRIPT_NAME']));                            // path
-
-    if (substr($base_url, -1) == '/') {
-        $base_url = str_replace('/install', '', $base_url);
-        $base_url = substr($base_url, 0, -1);
-    }
-
-    $db_type = $db_name = $db_username = $db_prefix = $username = $email = '';
-    $db_host = 'localhost';
-    $title = __('My FeatherBB Forum');
-    $description = '<p><span>'.__('Description').'</span></p>';
-    $default_lang = $install_lang;
-    $default_style = 'FeatherBB';
-} else {
-    $db_type = $_POST['req_db_type'];
-    $db_host = feather_trim($_POST['req_db_host']);
-    $db_name = feather_trim($_POST['req_db_name']);
-    $db_username = feather_trim($_POST['db_username']);
-    $db_password = feather_trim($_POST['db_password']);
-    $db_prefix = feather_trim($_POST['db_prefix']);
-    $username = feather_trim($_POST['req_username']);
-    $email = strtolower(feather_trim($_POST['req_email']));
-    $password1 = feather_trim($_POST['req_password1']);
-    $password2 = feather_trim($_POST['req_password2']);
-    $title = feather_trim($_POST['req_title']);
-    $description = feather_trim($_POST['desc']);
-    $base_url = feather_trim($_POST['req_base_url']);
-    $default_lang = feather_trim($_POST['req_default_lang']);
-    $default_style = 'FeatherBB';
-    $alerts = array();
-
-    // Make sure base_url doesn't end with a slash
-    if (substr($base_url, -1) == '/') {
-        $base_url = substr($base_url, 0, -1);
-    }
-
-    // Validate username and passwords
-    if (feather_strlen($username) < 2) {
-        $alerts[] = __('Username 1');
-    } elseif (feather_strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
-        $alerts[] = __('Username 2');
-    } elseif (!strcasecmp($username, 'Guest')) {
-        $alerts[] = __('Username 3');
-    } elseif (preg_match('%[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}%', $username) || preg_match('%((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))%', $username)) {
-        $alerts[] = __('Username 4');
-    } elseif ((strpos($username, '[') !== false || strpos($username, ']') !== false) && strpos($username, '\'') !== false && strpos($username, '"') !== false) {
-        $alerts[] = __('Username 5');
-    } elseif (preg_match('%(?:\[/?(?:b|u|i|h|colou?r|quote|code|img|url|email|list)\]|\[(?:code|quote|list)=)%i', $username)) {
-        $alerts[] = __('Username 6');
-    }
-
-    if (feather_strlen($password1) < 6) {
-        $alerts[] = __('Short password');
-    } elseif ($password1 != $password2) {
-        $alerts[] = __('Passwords not match');
-    }
-
-    // Validate email
-    require FEATHER_ROOT.'include/email.php';
-
-    if (!is_valid_email($email)) {
-        $alerts[] = __('Wrong email');
-    }
-
-    if ($title == '') {
-        $alerts[] = __('No board title');
-    }
-
-    $languages = forum_list_langs();
-    if (!in_array($default_lang, $languages)) {
-        $alerts[] = __('Error default language');
-    }
-
-    $styles = forum_list_styles();
-    if (!in_array($default_style, $styles)) {
-        $alerts[] = __('Error default style');
-    }
-}
-
-// Check if the cache directory is writable
-if (!forum_is_writable(FORUM_CACHE_DIR)) {
-    $alerts[] = sprintf(__('Alert cache'), FORUM_CACHE_DIR);
-}
-
-// Check if default avatar directory is writable
-if (!forum_is_writable(FEATHER_ROOT.'img/avatars/')) {
-    $alerts[] = sprintf(__('Alert avatar'), FEATHER_ROOT.'img/avatars/');
-}
-
-if (!isset($_POST['form_sent']) || !empty($alerts)) {
-    // Determine available database extensions
-    $dual_mysql = false;
-    $db_extensions = array();
-    $mysql_innodb = false;
-    if (function_exists('mysqli_connect')) {
-        $db_extensions[] = array('mysqli', 'MySQL Improved');
-        $db_extensions[] = array('mysqli_innodb', 'MySQL Improved (InnoDB)');
-        $mysql_innodb = true;
-    }
-    if (function_exists('mysql_connect')) {
-        $db_extensions[] = array('mysql', 'MySQL Standard');
-        $db_extensions[] = array('mysql_innodb', 'MySQL Standard (InnoDB)');
-        $mysql_innodb = true;
-
-        if (count($db_extensions) > 2) {
-            $dual_mysql = true;
-        }
-    }
-    if (function_exists('sqlite_open')) {
-        $db_extensions[] = array('sqlite', 'SQLite');
-    }
-    if (class_exists('SQLite3')) {
-        $db_extensions[] = array('sqlite3', 'SQLite3');
-    }
-    if (function_exists('pg_connect')) {
-        $db_extensions[] = array('pgsql', 'PostgreSQL');
-    }
-
-    if (empty($db_extensions)) {
-        error(__('No DB extensions'));
-    }
-
-    // Fetch a list of installed languages
-    $languages = forum_list_langs();
-
-    ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><?php _e('FeatherBB Installation') ?></title>
-<link rel="stylesheet" type="text/css" href="../style/<?php echo $default_style ?>.css" />
-<script type="text/javascript">
-/* <![CDATA[ */
-function process_form(the_form)
-{
-	var required_fields = {
-		"req_db_type": "<?php _e('Database type') ?>",
-		"req_db_host": "<?php _e('Database server hostname') ?>",
-		"req_db_name": "<?php _e('Database name') ?>",
-		"req_username": "<?php _e('Administrator username') ?>",
-		"req_password1": "<?php _e('Password') ?>",
-		"req_password2": "<?php _e('Confirm password') ?>",
-		"req_email": "<?php _e('Administrator email') ?>",
-		"req_title": "<?php _e('Board title') ?>",
-		"req_base_url": "<?php _e('Base URL') ?>"
-	};
-	if (document.all || document.getElementById)
-	{
-		for (var i = 0; i < the_form.length; ++i)
-		{
-			var elem = the_form.elements[i];
-			if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
-			{
-				alert('"' + required_fields[elem.name] + '" <?php _e('Required field') ?>');
-				elem.focus();
-				return false;
-			}
-		}
-	}
-	return true;
-}
-/* ]]> */
-</script>
-</head>
-<body onload="document.getElementById('install').req_db_type.focus();document.getElementById('install').start.disabled=false;" onunload="">
-
-<div id="puninstall" class="pun">
-<div class="top-box"><div><!-- Top Corners --></div></div>
-<div class="punwrap">
-
-<section class="container">
-	<div id="brdheader" class="block">
-		<div class="box">
-			<div id="brdtitle" class="inbox">
-				<h1><span><?php _e('FeatherBB Installation') ?></span></h1>
-				<div id="brddesc"><p><?php _e('Welcome') ?></p></div>
-			</div>
-		</div>
-	</div>
-</section>
-
-<section class="container">
-	<div id="brdmain">
-	<?php if (count($languages) > 1): ?><div class="blockform">
-		<h2><span><?php _e('Choose install language') ?></span></h2>
-		<div class="box">
-			<form id="install" method="post" action="">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Install language') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Choose install language info') ?></p>
-							<label><strong><?php _e('Install language') ?></strong>
-							<br /><select name="install_lang">
-<?php
-
-            foreach ($languages as $temp) {
-                if ($temp == $install_lang) {
-                    echo "\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
-                } else {
-                    echo "\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
-                }
-            }
-
-    ?>
-							</select>
-							<br /></label>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="start" value="<?php _e('Change language') ?>" /></p>
-			</form>
-		</div>
-	</div>
-	<?php endif;
-    ?>
-
-	<div class="blockform">
-		<h2><span><?php echo sprintf(__('Install'), FORUM_VERSION) ?></span></h2>
-		<div class="box">
-			<form id="install" method="post" action="" onsubmit="this.start.disabled=true;if(process_form(this)){return true;}else{this.start.disabled=false;return false;}">
-			<div><input type="hidden" name="form_sent" value="1" /><input type="hidden" name="install_lang" value="<?php echo feather_escape($install_lang) ?>" /></div>
-				<div class="inform">
-	<?php if (!empty($alerts)): ?>				<div class="forminfo error-info">
-						<h3><?php _e('Errors') ?></h3>
-						<ul class="error-list">
-<?php
-
-    foreach ($alerts as $cur_alert) {
-        echo "\t\t\t\t\t\t".'<li><strong>'.$cur_alert.'</strong></li>'."\n";
-    }
-    ?>
-						</ul>
-					</div>
-	<?php endif;
-    ?>			</div>
-				<div class="inform">
-					<div class="forminfo">
-						<h3><?php _e('Database setup') ?></h3>
-						<p><?php _e('Info 1') ?></p>
-					</div>
-					<fieldset>
-					<legend><?php _e('Select database') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Info 2') ?></p>
-							<label class="required"><strong><?php _e('Database type') ?> <span><?php _e('Required') ?></span></strong>
-							<br /><select name="req_db_type">
-<?php
-
-        foreach ($db_extensions as $temp) {
-            if ($temp[0] == $db_type) {
-                echo "\t\t\t\t\t\t\t".'<option value="'.$temp[0].'" selected="selected">'.$temp[1].'</option>'."\n";
-            } else {
-                echo "\t\t\t\t\t\t\t".'<option value="'.$temp[0].'">'.$temp[1].'</option>'."\n";
-            }
-        }
-
-    ?>
-							</select>
-							<br /></label>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Database hostname') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Info 3') ?></p>
-							<label class="required"><strong><?php _e('Database server hostname') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_db_host" value="<?php echo feather_escape($db_host) ?>" size="50" /><br /></label>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Database enter name') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Info 4') ?></p>
-							<label class="required"><strong><?php _e('Database name') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_db_name" type="text" name="req_db_name" value="<?php echo feather_escape($db_name) ?>" size="30" /><br /></label>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Database enter informations') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Info 5') ?></p>
-							<label class="conl"><?php _e('Database username') ?><br /><input type="text" name="db_username" value="<?php echo feather_escape($db_username) ?>" size="30" /><br /></label>
-							<label class="conl"><?php _e('Database password') ?><br /><input type="password" name="db_password" size="30" /><br /></label>
-							<div class="clearer"></div>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Database enter prefix') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Info 6') ?></p>
-							<label><?php _e('Table prefix') ?><br /><input id="db_prefix" type="text" name="db_prefix" value="<?php echo feather_escape($db_prefix) ?>" size="20" maxlength="30" /><br /></label>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<div class="forminfo">
-						<h3><?php _e('Administration setup') ?></h3>
-						<p><?php _e('Info 7') ?></p>
-					</div>
-					<fieldset>
-						<legend><?php _e('Administration setup') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Info 8') ?></p>
-							<label class="required"><strong><?php _e('Administrator username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
-							<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_password1" type="password" name="req_password1" size="16" /><br /></label>
-							<label class="conl required"><strong><?php _e('Confirm password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" size="16" /><br /></label>
-							<div class="clearer"></div>
-							<label class="required"><strong><?php _e('Administrator email') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" value="<?php echo feather_escape($email) ?>" size="50" maxlength="80" /><br /></label>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<div class="forminfo">
-						<h3><?php _e('Board setup') ?></h3>
-						<p><?php _e('Info 11') ?></p>
-					</div>
-					<fieldset>
-						<legend><?php _e('General information') ?></legend>
-						<div class="infldset">
-							<label class="required"><strong><?php _e('Board title') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_title" type="text" name="req_title" value="<?php echo feather_escape($title) ?>" size="60" maxlength="255" /><br /></label>
-							<label><?php _e('Board description') ?><br /><input id="desc" type="text" name="desc" value="<?php echo feather_escape($description) ?>" size="60" maxlength="255" /><br /></label>
-							<label class="required"><strong><?php _e('Base URL') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_base_url" type="text" name="req_base_url" value="<?php echo feather_escape($base_url) ?>" size="60" maxlength="100" /><br /></label>
-							<label class="required"><strong><?php _e('Default language') ?> <span><?php _e('Required') ?></span></strong><br /><select id="req_default_lang" name="req_default_lang">
-<?php
-
-            $languages = forum_list_langs();
-    foreach ($languages as $temp) {
-        if ($temp == $default_lang) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
-        } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
-        }
-    }
-
-    ?>
-							</select><br /></label>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="start" value="<?php _e('Start install') ?>" /></p>
-			</form>
-		</div>
-	</div>
-	</div>
-</section>
-
-</div>
-<div class="end-box"><div><!-- Bottom Corners --></div></div>
-</div>
-
-</body>
-</html>
-<?php
-
-} else {
-    // Load the appropriate DB layer class
-    switch ($db_type) {
-        case 'mysql':
-            require FEATHER_ROOT.'install/dblayer/mysql.php';
-            break;
-
-        case 'mysql_innodb':
-            require FEATHER_ROOT.'install/dblayer/mysql_innodb.php';
-            break;
-
-        case 'mysqli':
-            require FEATHER_ROOT.'install/dblayer/mysqli.php';
-            break;
-
-        case 'mysqli_innodb':
-            require FEATHER_ROOT.'install/dblayer/mysqli_innodb.php';
-            break;
-
-        case 'pgsql':
-            require FEATHER_ROOT.'install/dblayer/pgsql.php';
-            break;
-
-        case 'sqlite':
-            require FEATHER_ROOT.'install/dblayer/sqlite.php';
-            break;
-
-        case 'sqlite3':
-            require FEATHER_ROOT.'install/dblayer/sqlite3.php';
-            break;
-
-        default:
-            error(sprintf(__('DB type not valid'), feather_escape($db_type)));
-    }
-
-    // Create the database object (and connect/select db)
-    $db = new DBLayer($db_host, $db_username, $db_password, $db_name, $db_prefix, false);
-
-    // Validate prefix
-    if (strlen($db_prefix) > 0 && (!preg_match('%^[a-zA-Z_][a-zA-Z0-9_]*$%', $db_prefix) || strlen($db_prefix) > 40)) {
-        error(sprintf(__('Table prefix error'), $db->prefix));
-    }
-
-    // Do some DB type specific checks
-    switch ($db_type) {
-        case 'mysql':
-        case 'mysqli':
-        case 'mysql_innodb':
-        case 'mysqli_innodb':
-            $mysql_info = $db->get_version();
-            if (version_compare($mysql_info['version'], MIN_MYSQL_VERSION, '<')) {
-                error(sprintf(__('You are running error'), 'MySQL', $mysql_info['version'], FORUM_VERSION, MIN_MYSQL_VERSION));
-            }
-            break;
-
-        case 'pgsql':
-            $pgsql_info = $db->get_version();
-            if (version_compare($pgsql_info['version'], MIN_PGSQL_VERSION, '<')) {
-                error(sprintf(__('You are running error'), 'PostgreSQL', $pgsql_info['version'], FORUM_VERSION, MIN_PGSQL_VERSION));
-            }
-            break;
-
-        case 'sqlite':
-        case 'sqlite3':
-            if (strtolower($db_prefix) == 'sqlite_') {
-                error(__('Prefix reserved'));
-            }
-            break;
-    }
-
-
-    // Make sure FeatherBB isn't already installed
-    $result = $db->query('SELECT 1 FROM '.$db_prefix.'users WHERE id=1');
-    if ($db->num_rows($result)) {
-        error(sprintf(__('Existing table error'), $db_prefix, $db_name));
-    }
-
-    // Check if InnoDB is available
-    if ($db_type == 'mysql_innodb' || $db_type == 'mysqli_innodb') {
-        $result = $db->query('SHOW VARIABLES LIKE \'have_innodb\'');
-        list(, $result) = $db->fetch_row($result);
-        if ((strtoupper($result) != 'YES')) {
-            error(__('InnoDB off'));
-        }
-    }
-
-
-    // Start a transaction
-    $db->start_transaction();
-
-
-    // Create all tables
-    $schema = array(
-        'FIELDS'        => array(
-            'id'            => array(
-                'datatype'        => 'SERIAL',
-                'allow_null'    => false
-            ),
-            'username'        => array(
-                'datatype'        => 'VARCHAR(200)',
-                'allow_null'    => true
-            ),
-            'ip'            => array(
-                'datatype'        => 'VARCHAR(255)',
-                'allow_null'    => true
-            ),
-            'email'            => array(
-                'datatype'        => 'VARCHAR(80)',
-                'allow_null'    => true
-            ),
-            'message'        => array(
-                'datatype'        => 'VARCHAR(255)',
-                'allow_null'    => true
-            ),
-            'expire'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => true
-            ),
-            'ban_creator'    => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            )
-        ),
-        'PRIMARY KEY'    => array('id'),
-        'INDEXES'        => array(
-            'username_idx'    => array('username')
-        )
-    );
-
-    if ($db_type == 'mysql' || $db_type == 'mysqli' || $db_type == 'mysql_innodb' || $db_type == 'mysqli_innodb') {
-        $schema['INDEXES']['username_idx'] = array('username(25)');
-    }
-
-    $db->create_table('bans', $schema) or error('Unable to create bans table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'id'            => array(
-                'datatype'        => 'SERIAL',
-                'allow_null'    => false
-            ),
-            'cat_name'        => array(
-                'datatype'        => 'VARCHAR(80)',
-                'allow_null'    => false,
-                'default'        => '\'New Category\''
-            ),
-            'disp_position'    => array(
-                'datatype'        => 'INT(10)',
-                'allow_null'    => false,
-                'default'        => '0'
-            )
-        ),
-        'PRIMARY KEY'    => array('id')
-    );
-
-    $db->create_table('categories', $schema) or error('Unable to create categories table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'id'            => array(
-                'datatype'        => 'SERIAL',
-                'allow_null'    => false
-            ),
-            'search_for'    => array(
-                'datatype'        => 'VARCHAR(60)',
-                'allow_null'    => false,
-                'default'        => '\'\''
-            ),
-            'replace_with'    => array(
-                'datatype'        => 'VARCHAR(60)',
-                'allow_null'    => false,
-                'default'        => '\'\''
-            )
-        ),
-        'PRIMARY KEY'    => array('id')
-    );
-
-    $db->create_table('censoring', $schema) or error('Unable to create censoring table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'conf_name'        => array(
-                'datatype'        => 'VARCHAR(255)',
-                'allow_null'    => false,
-                'default'        => '\'\''
-            ),
-            'conf_value'    => array(
-                'datatype'        => 'TEXT',
-                'allow_null'    => true
-            )
-        ),
-        'PRIMARY KEY'    => array('conf_name')
-    );
-
-    $db->create_table('config', $schema) or error('Unable to create config table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'group_id'        => array(
-                'datatype'        => 'INT(10)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'forum_id'        => array(
-                'datatype'        => 'INT(10)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'read_forum'    => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'post_replies'    => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'post_topics'    => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            )
-        ),
-        'PRIMARY KEY'    => array('group_id', 'forum_id')
-    );
-
-    $db->create_table('forum_perms', $schema) or error('Unable to create forum_perms table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'id'            => array(
-                'datatype'        => 'SERIAL',
-                'allow_null'    => false
-            ),
-            'forum_name'    => array(
-                'datatype'        => 'VARCHAR(80)',
-                'allow_null'    => false,
-                'default'        => '\'New forum\''
-            ),
-            'forum_desc'    => array(
-                'datatype'        => 'TEXT',
-                'allow_null'    => true
-            ),
-            'redirect_url'    => array(
-                'datatype'        => 'VARCHAR(100)',
-                'allow_null'    => true
-            ),
-            'moderators'    => array(
-                'datatype'        => 'TEXT',
-                'allow_null'    => true
-            ),
-            'num_topics'    => array(
-                'datatype'        => 'MEDIUMINT(8) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'num_posts'        => array(
-                'datatype'        => 'MEDIUMINT(8) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'last_post'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => true
-            ),
-            'last_post_id'    => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => true
-            ),
-            'last_poster'    => array(
-                'datatype'        => 'VARCHAR(200)',
-                'allow_null'    => true
-            ),
-            'sort_by'        => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'disp_position'    => array(
-                'datatype'        => 'INT(10)',
-                'allow_null'    => false,
-                'default'        =>    '0'
-            ),
-            'cat_id'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        =>    '0'
-            )
-        ),
-        'PRIMARY KEY'    => array('id')
-    );
-
-    $db->create_table('forums', $schema) or error('Unable to create forums table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'g_id'                        => array(
-                'datatype'        => 'SERIAL',
-                'allow_null'    => false
-            ),
-            'g_title'                    => array(
-                'datatype'        => 'VARCHAR(50)',
-                'allow_null'    => false,
-                'default'        => '\'\''
-            ),
-            'g_user_title'                => array(
-                'datatype'        => 'VARCHAR(50)',
-                'allow_null'    => true
-            ),
-            'g_promote_min_posts'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'g_promote_next_group'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'g_moderator'                => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'g_mod_edit_users'            => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'g_mod_rename_users'        => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'g_mod_change_passwords'    => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'g_mod_ban_users'            => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'g_mod_promote_users'            => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'g_read_board'                => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'g_view_users'                => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'g_post_replies'            => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'g_post_topics'                => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'g_edit_posts'                => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'g_delete_posts'            => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'g_delete_topics'            => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'g_post_links'                => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'g_set_title'                => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'g_search'                    => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'g_search_users'            => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'g_send_email'                => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'g_post_flood'                => array(
-                'datatype'        => 'SMALLINT(6)',
-                'allow_null'    => false,
-                'default'        => '30'
-            ),
-            'g_search_flood'            => array(
-                'datatype'        => 'SMALLINT(6)',
-                'allow_null'    => false,
-                'default'        => '30'
-            ),
-            'g_email_flood'                => array(
-                'datatype'        => 'SMALLINT(6)',
-                'allow_null'    => false,
-                'default'        => '60'
-            ),
-            'g_report_flood'            => array(
-                'datatype'        => 'SMALLINT(6)',
-                'allow_null'    => false,
-                'default'        => '60'
-            )
-        ),
-        'PRIMARY KEY'    => array('g_id')
-    );
-
-    $db->create_table('groups', $schema) or error('Unable to create groups table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'user_id'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'ident'            => array(
-                'datatype'        => 'VARCHAR(200)',
-                'allow_null'    => false,
-                'default'        => '\'\''
-            ),
-            'logged'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'idle'            => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'last_post'            => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => true
-            ),
-            'last_search'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => true
-            ),
-        ),
-        'UNIQUE KEYS'    => array(
-            'user_id_ident_idx'    => array('user_id', 'ident')
-        ),
-        'INDEXES'        => array(
-            'ident_idx'        => array('ident'),
-            'logged_idx'    => array('logged')
-        )
-    );
-
-    if ($db_type == 'mysql' || $db_type == 'mysqli' || $db_type == 'mysql_innodb' || $db_type == 'mysqli_innodb') {
-        $schema['UNIQUE KEYS']['user_id_ident_idx'] = array('user_id', 'ident(25)');
-        $schema['INDEXES']['ident_idx'] = array('ident(25)');
-    }
-
-    if ($db_type == 'mysql_innodb' || $db_type == 'mysqli_innodb') {
-        $schema['ENGINE'] = 'InnoDB';
-    }
-
-    $db->create_table('online', $schema) or error('Unable to create online table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'id'            => array(
-                'datatype'        => 'SERIAL',
-                'allow_null'    => false
-            ),
-            'poster'        => array(
-                'datatype'        => 'VARCHAR(200)',
-                'allow_null'    => false,
-                'default'        => '\'\''
-            ),
-            'poster_id'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'poster_ip'        => array(
-                'datatype'        => 'VARCHAR(39)',
-                'allow_null'    => true
-            ),
-            'poster_email'    => array(
-                'datatype'        => 'VARCHAR(80)',
-                'allow_null'    => true
-            ),
-            'message'        => array(
-                'datatype'        => 'MEDIUMTEXT',
-                'allow_null'    => true
-            ),
-            'hide_smilies'    => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'posted'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'edited'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => true
-            ),
-            'edited_by'        => array(
-                'datatype'        => 'VARCHAR(200)',
-                'allow_null'    => true
-            ),
-            'topic_id'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            )
-        ),
-        'PRIMARY KEY'    => array('id'),
-        'INDEXES'        => array(
-            'topic_id_idx'    => array('topic_id'),
-            'multi_idx'        => array('poster_id', 'topic_id')
-        )
-    );
-
-    $db->create_table('posts', $schema) or error('Unable to create posts table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'id'            => array(
-                'datatype'        => 'SERIAL',
-                'allow_null'    => false
-            ),
-            'post_id'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'topic_id'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'forum_id'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'reported_by'    => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'created'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'message'        => array(
-                'datatype'        => 'TEXT',
-                'allow_null'    => true
-            ),
-            'zapped'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => true
-            ),
-            'zapped_by'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => true
-            )
-        ),
-        'PRIMARY KEY'    => array('id'),
-        'INDEXES'        => array(
-            'zapped_idx'    => array('zapped')
-        )
-    );
-
-    $db->create_table('reports', $schema) or error('Unable to create reports table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'id'            => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'ident'            => array(
-                'datatype'        => 'VARCHAR(200)',
-                'allow_null'    => false,
-                'default'        => '\'\''
-            ),
-            'search_data'    => array(
-                'datatype'        => 'MEDIUMTEXT',
-                'allow_null'    => true
-            )
-        ),
-        'PRIMARY KEY'    => array('id'),
-        'INDEXES'        => array(
-            'ident_idx'    => array('ident')
-        )
-    );
-
-    if ($db_type == 'mysql' || $db_type == 'mysqli' || $db_type == 'mysql_innodb' || $db_type == 'mysqli_innodb') {
-        $schema['INDEXES']['ident_idx'] = array('ident(8)');
-    }
-
-    $db->create_table('search_cache', $schema) or error('Unable to create search_cache table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'post_id'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'word_id'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'subject_match'    => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            )
-        ),
-        'INDEXES'        => array(
-            'word_id_idx'    => array('word_id'),
-            'post_id_idx'    => array('post_id')
-        )
-    );
-
-    $db->create_table('search_matches', $schema) or error('Unable to create search_matches table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'id'            => array(
-                'datatype'        => 'SERIAL',
-                'allow_null'    => false
-            ),
-            'word'            => array(
-                'datatype'        => 'VARCHAR(20)',
-                'allow_null'    => false,
-                'default'        => '\'\'',
-                'collation'        => 'bin'
-            )
-        ),
-        'PRIMARY KEY'    => array('word'),
-        'INDEXES'        => array(
-            'id_idx'    => array('id')
-        )
-    );
-
-    if ($db_type == 'sqlite' || $db_type == 'sqlite3') {
-        $schema['PRIMARY KEY'] = array('id');
-        $schema['UNIQUE KEYS'] = array('word_idx'    => array('word'));
-    }
-
-    $db->create_table('search_words', $schema) or error('Unable to create search_words table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'user_id'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'topic_id'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            )
-        ),
-        'PRIMARY KEY'    => array('user_id', 'topic_id')
-    );
-
-    $db->create_table('topic_subscriptions', $schema) or error('Unable to create topic subscriptions table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'user_id'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'forum_id'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            )
-        ),
-        'PRIMARY KEY'    => array('user_id', 'forum_id')
-    );
-
-    $db->create_table('forum_subscriptions', $schema) or error('Unable to create forum subscriptions table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'id'            => array(
-                'datatype'        => 'SERIAL',
-                'allow_null'    => false
-            ),
-            'poster'        => array(
-                'datatype'        => 'VARCHAR(200)',
-                'allow_null'    => false,
-                'default'        => '\'\''
-            ),
-            'subject'        => array(
-                'datatype'        => 'VARCHAR(255)',
-                'allow_null'    => false,
-                'default'        => '\'\''
-            ),
-            'posted'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'first_post_id'    => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'last_post'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'last_post_id'    => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'last_poster'    => array(
-                'datatype'        => 'VARCHAR(200)',
-                'allow_null'    => true
-            ),
-            'num_views'        => array(
-                'datatype'        => 'MEDIUMINT(8) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'num_replies'    => array(
-                'datatype'        => 'MEDIUMINT(8) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'closed'        => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'sticky'        => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'moved_to'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => true
-            ),
-            'forum_id'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            )
-        ),
-        'PRIMARY KEY'    => array('id'),
-        'INDEXES'        => array(
-            'forum_id_idx'        => array('forum_id'),
-            'moved_to_idx'        => array('moved_to'),
-            'last_post_idx'        => array('last_post'),
-            'first_post_id_idx'    => array('first_post_id')
-        )
-    );
-
-    $db->create_table('topics', $schema) or error('Unable to create topics table', __FILE__, __LINE__, $db->error());
-
-
-    $schema = array(
-        'FIELDS'        => array(
-            'id'                => array(
-                'datatype'        => 'SERIAL',
-                'allow_null'    => false
-            ),
-            'group_id'            => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '3'
-            ),
-            'username'            => array(
-                'datatype'        => 'VARCHAR(200)',
-                'allow_null'    => false,
-                'default'        => '\'\''
-            ),
-            'password'            => array(
-                'datatype'        => 'VARCHAR(40)',
-                'allow_null'    => false,
-                'default'        => '\'\''
-            ),
-            'email'                => array(
-                'datatype'        => 'VARCHAR(80)',
-                'allow_null'    => false,
-                'default'        => '\'\''
-            ),
-            'title'                => array(
-                'datatype'        => 'VARCHAR(50)',
-                'allow_null'    => true
-            ),
-            'realname'            => array(
-                'datatype'        => 'VARCHAR(40)',
-                'allow_null'    => true
-            ),
-            'url'                => array(
-                'datatype'        => 'VARCHAR(100)',
-                'allow_null'    => true
-            ),
-            'jabber'            => array(
-                'datatype'        => 'VARCHAR(80)',
-                'allow_null'    => true
-            ),
-            'icq'                => array(
-                'datatype'        => 'VARCHAR(12)',
-                'allow_null'    => true
-            ),
-            'msn'                => array(
-                'datatype'        => 'VARCHAR(80)',
-                'allow_null'    => true
-            ),
-            'aim'                => array(
-                'datatype'        => 'VARCHAR(30)',
-                'allow_null'    => true
-            ),
-            'yahoo'                => array(
-                'datatype'        => 'VARCHAR(30)',
-                'allow_null'    => true
-            ),
-            'location'            => array(
-                'datatype'        => 'VARCHAR(30)',
-                'allow_null'    => true
-            ),
-            'signature'            => array(
-                'datatype'        => 'TEXT',
-                'allow_null'    => true
-            ),
-            'disp_topics'        => array(
-                'datatype'        => 'TINYINT(3) UNSIGNED',
-                'allow_null'    => true
-            ),
-            'disp_posts'        => array(
-                'datatype'        => 'TINYINT(3) UNSIGNED',
-                'allow_null'    => true
-            ),
-            'email_setting'        => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'notify_with_post'    => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'auto_notify'        => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'show_smilies'        => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'show_img'            => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'show_img_sig'        => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'show_avatars'        => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'show_sig'            => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '1'
-            ),
-            'timezone'            => array(
-                'datatype'        => 'FLOAT',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'dst'                => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'time_format'        => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'date_format'        => array(
-                'datatype'        => 'TINYINT(1)',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'language'            => array(
-                'datatype'        => 'VARCHAR(25)',
-                'allow_null'    => false,
-                'default'        => '\''.$db->escape($default_lang).'\''
-            ),
-            'style'                => array(
-                'datatype'        => 'VARCHAR(25)',
-                'allow_null'    => false,
-                'default'        => '\''.$db->escape($default_style).'\''
-            ),
-            'num_posts'            => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'last_post'            => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => true
-            ),
-            'last_search'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => true
-            ),
-            'last_email_sent'    => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => true
-            ),
-            'last_report_sent'    => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => true
-            ),
-            'registered'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'registration_ip'    => array(
-                'datatype'        => 'VARCHAR(39)',
-                'allow_null'    => false,
-                'default'        => '\'0.0.0.0\''
-            ),
-            'last_visit'        => array(
-                'datatype'        => 'INT(10) UNSIGNED',
-                'allow_null'    => false,
-                'default'        => '0'
-            ),
-            'admin_note'        => array(
-                'datatype'        => 'VARCHAR(30)',
-                'allow_null'    => true
-            ),
-            'activate_string'    => array(
-                'datatype'        => 'VARCHAR(80)',
-                'allow_null'    => true
-            ),
-            'activate_key'        => array(
-                'datatype'        => 'VARCHAR(8)',
-                'allow_null'    => true
-            ),
-        ),
-        'PRIMARY KEY'    => array('id'),
-        'UNIQUE KEYS'    => array(
-            'username_idx'        => array('username')
-        ),
-        'INDEXES'        => array(
-            'registered_idx'    => array('registered')
-        )
-    );
-
-    if ($db_type == 'mysql' || $db_type == 'mysqli' || $db_type == 'mysql_innodb' || $db_type == 'mysqli_innodb') {
-        $schema['UNIQUE KEYS']['username_idx'] = array('username(25)');
-    }
-
-    $db->create_table('users', $schema) or error('Unable to create users table', __FILE__, __LINE__, $db->error());
-
-
-    $now = time();
-
-    // Insert the four preset groups
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '1, ' : '').'\''.$db->escape(__('Administrators')).'\', \''.$db->escape(__('Administrator')).'\', 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
-
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_mod_promote_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '2, ' : '').'\''.$db->escape(__('Moderators')).'\', \''.$db->escape(__('Moderator')).'\', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
-
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '3, ' : '').'\''.$db->escape(__('Guests')).'\', NULL, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 60, 30, 0, 0)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
-
-    $db->query('INSERT INTO '.$db->prefix.'groups ('.($db_type != 'pgsql' ? 'g_id, ' : '').'g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES('.($db_type != 'pgsql' ? '4, ' : '').'\''.$db->escape(__('Members')).'\', NULL, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 60, 30, 60, 60)') or error('Unable to add group', __FILE__, __LINE__, $db->error());
-
-    // Insert guest and first admin user
-    $db->query('INSERT INTO '.$db_prefix.'users (group_id, username, password, email) VALUES(3, \''.$db->escape(__('Guest')).'\', \''.$db->escape(__('Guest')).'\', \''.$db->escape(__('Guest')).'\')')
-        or error('Unable to add guest user. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
-
-    $db->query('INSERT INTO '.$db_prefix.'users (group_id, username, password, email, language, style, num_posts, last_post, registered, registration_ip, last_visit) VALUES(1, \''.$db->escape($username).'\', \''.feather_hash($password1).'\', \''.$email.'\', \''.$db->escape($default_lang).'\', \''.$db->escape($default_style).'\', 1, '.$now.', '.$now.', \''.$db->escape(get_remote_address()).'\', '.$now.')')
-        or error('Unable to add administrator user. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
-
-    // Enable/disable avatars depending on file_uploads setting in PHP configuration
-    $avatars = in_array(strtolower(@ini_get('file_uploads')), array('on', 'true', '1')) ? 1 : 0;
-
-    // Insert config data
-    $feather_config = array(
-        'o_cur_version'                => FORUM_VERSION,
-        'o_database_revision'        => FORUM_DB_REVISION,
-        'o_searchindex_revision'    => FORUM_SI_REVISION,
-        'o_parser_revision'            => FORUM_PARSER_REVISION,
-        'o_board_title'                => $title,
-        'o_board_desc'                => $description,
-        'o_default_timezone'        => 0,
-        'o_time_format'                => 'H:i:s',
-        'o_date_format'                => 'Y-m-d',
-        'o_timeout_visit'            => 1800,
-        'o_timeout_online'            => 300,
-        'o_redirect_delay'            => 1,
-        'o_show_version'            => 0,
-        'o_show_user_info'            => 1,
-        'o_show_post_count'            => 1,
-        'o_signatures'                => 1,
-        'o_smilies'                    => 1,
-        'o_smilies_sig'                => 1,
-        'o_make_links'                => 1,
-        'o_default_lang'            => $default_lang,
-        'o_default_style'            => $default_style,
-        'o_default_user_group'        => 4,
-        'o_topic_review'            => 15,
-        'o_disp_topics_default'        => 30,
-        'o_disp_posts_default'        => 25,
-        'o_indent_num_spaces'        => 4,
-        'o_quote_depth'                => 3,
-        'o_quickpost'                => 1,
-        'o_users_online'            => 1,
-        'o_censoring'                => 0,
-        'o_show_dot'                => 0,
-        'o_topic_views'                => 1,
-        'o_quickjump'                => 1,
-        'o_gzip'                    => 0,
-        'o_additional_navlinks'        => '',
-        'o_report_method'            => 0,
-        'o_regs_report'                => 0,
-        'o_default_email_setting'    => 1,
-        'o_mailing_list'            => $email,
-        'o_avatars'                    => $avatars,
-        'o_avatars_dir'                => 'img/avatars',
-        'o_avatars_width'            => 60,
-        'o_avatars_height'            => 60,
-        'o_avatars_size'            => 10240,
-        'o_search_all_forums'        => 1,
-        'o_base_url'                => $base_url,
-        'o_admin_email'                => $email,
-        'o_webmaster_email'            => $email,
-        'o_forum_subscriptions'        => 1,
-        'o_topic_subscriptions'        => 1,
-        'o_smtp_host'                => null,
-        'o_smtp_user'                => null,
-        'o_smtp_pass'                => null,
-        'o_smtp_ssl'                => 0,
-        'o_regs_allow'                => 1,
-        'o_regs_verify'                => 0,
-        'o_announcement'            => 0,
-        'o_announcement_message'    => __('Announcement'),
-        'o_rules'                    => 0,
-        'o_rules_message'            => __('Rules'),
-        'o_maintenance'                => 0,
-        'o_maintenance_message'        => __('Maintenance message'),
-        'o_default_dst'                => 0,
-        'o_feed_type'                => 2,
-        'o_feed_ttl'                => 0,
-        'p_message_bbcode'            => 1,
-        'p_message_img_tag'            => 1,
-        'p_message_all_caps'        => 1,
-        'p_subject_all_caps'        => 1,
-        'p_sig_all_caps'            => 1,
-        'p_sig_bbcode'                => 1,
-        'p_sig_img_tag'                => 0,
-        'p_sig_length'                => 400,
-        'p_sig_lines'                => 4,
-        'p_allow_banned_email'        => 1,
-        'p_allow_dupe_email'        => 0,
-        'p_force_guest_email'        => 1
-    );
-
-    foreach ($feather_config as $conf_name => $conf_value) {
-        $db->query('INSERT INTO '.$db_prefix.'config (conf_name, conf_value) VALUES(\''.$conf_name.'\', '.(is_null($conf_value) ? 'NULL' : '\''.$db->escape($conf_value).'\'').')')
-            or error('Unable to insert into table '.$db_prefix.'config. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
-    }
-
-    // Insert some other default data
-    $subject = __('Test post');
-    $message = __('Message');
-
-    $db->query('INSERT INTO '.$db_prefix.'categories (cat_name, disp_position) VALUES(\''.$db->escape(__('Test category')).'\', 1)')
-        or error('Unable to insert into table '.$db_prefix.'categories. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
-
-    $db->query('INSERT INTO '.$db_prefix.'forums (forum_name, forum_desc, num_topics, num_posts, last_post, last_post_id, last_poster, disp_position, cat_id) VALUES(\''.$db->escape(__('Test forum')).'\', \''.$db->escape(__('This is just a test forum')).'\', 1, 1, '.$now.', 1, \''.$db->escape($username).'\', 1, 1)')
-        or error('Unable to insert into table '.$db_prefix.'forums. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
-
-    $db->query('INSERT INTO '.$db_prefix.'topics (poster, subject, posted, first_post_id, last_post, last_post_id, last_poster, forum_id) VALUES(\''.$db->escape($username).'\', \''.$db->escape($subject).'\', '.$now.', 1, '.$now.', 1, \''.$db->escape($username).'\', 1)')
-        or error('Unable to insert into table '.$db_prefix.'topics. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
-
-    $db->query('INSERT INTO '.$db_prefix.'posts (poster, poster_id, poster_ip, message, posted, topic_id) VALUES(\''.$db->escape($username).'\', 2, \''.$db->escape(get_remote_address()).'\', \''.$db->escape($message).'\', '.$now.', 1)')
-        or error('Unable to insert into table '.$db_prefix.'posts. Please check your configuration and try again', __FILE__, __LINE__, $db->error());
-
-    $db->end_transaction();
-
-
-    $alerts = array();
-
-    // Check if we disabled uploading avatars because file_uploads was disabled
-    if ($avatars == '0') {
-        $alerts[] = __('Alert upload');
-    }
-
-    // Add some random bytes at the end of the cookie name to prevent collisions
-    $cookie_name = 'feather_cookie_'.random_key(6, false, true);
-
-    // Generate the config.php file data
-    $config = generate_config_file();
-
-    // Attempt to write config.php and serve it up for download if writing fails
-    $written = false;
-    if (forum_is_writable(FEATHER_ROOT)) {
-        $fh = @fopen(FEATHER_ROOT.'include/config.php', 'wb');
-        if ($fh) {
-            fwrite($fh, $config);
-            fclose($fh);
-
-            $written = true;
-        }
-    }
-
-    // Rename htaccess if rewrite is possible
-    if (function_exists('apache_get_modules') && in_array('mod_rewrite', apache_get_modules())) {
-        rename(FEATHER_ROOT.'.htaccess.dist', FEATHER_ROOT.'.htaccess');
-    }
-
-
-    ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><?php _e('FeatherBB Installation') ?></title>
-<link rel="stylesheet" type="text/css" href="../style/<?php echo $default_style ?>.css" />
-</head>
-<body>
-
-<div id="puninstall" class="pun">
-<div class="top-box"><div><!-- Top Corners --></div></div>
-<div class="punwrap">
-
-<section class="container">
-    <div id="brdheader" class="block">
-            <div class="box">
-                    <div id="brdtitle" class="inbox">
-                            <h1><span><?php _e('FeatherBB Installation') ?></span></h1>
-                            <div id="brddesc"><p><?php _e('FeatherBB has been installed') ?></p></div>
-                    </div>
-            </div>
-    </div>
-
-    <div id="brdmain">
-
-    <div class="blockform">
-            <h2><span><?php _e('Final instructions') ?></span></h2>
-            <div class="box">
-    <?php
-
-    if (!$written) {
-        ?>
-                    <form method="post" action="">
-                            <div class="inform">
-                                    <div class="forminfo">
-                                            <p><?php _e('Info 17') ?></p>
-                                            <p><?php _e('Info 18') ?></p>
-                                    </div>
-                                    <input type="hidden" name="generate_config" value="1" />
-                                    <input type="hidden" name="db_type" value="<?php echo $db_type;
-        ?>" />
-                                    <input type="hidden" name="db_host" value="<?php echo $db_host;
-        ?>" />
-                                    <input type="hidden" name="db_name" value="<?php echo feather_escape($db_name);
-        ?>" />
-                                    <input type="hidden" name="db_username" value="<?php echo feather_escape($db_username);
-        ?>" />
-                                    <input type="hidden" name="db_password" value="<?php echo feather_escape($db_password);
-        ?>" />
-                                    <input type="hidden" name="db_prefix" value="<?php echo feather_escape($db_prefix);
-        ?>" />
-                                    <input type="hidden" name="cookie_name" value="<?php echo feather_escape($cookie_name);
-        ?>" />
-                                    <input type="hidden" name="cookie_seed" value="<?php echo feather_escape($cookie_seed);
-        ?>" />
-
-    <?php if (!empty($alerts)): ?>				<div class="forminfo error-info">
-                                            <ul class="error-list">
-    <?php
-
-    foreach ($alerts as $cur_alert) {
-        echo "\t\t\t\t\t".'<li>'.$cur_alert.'</li>'."\n";
-    }
-        ?>
-                                            </ul>
-                                    </div>
-    <?php endif;
-        ?>			</div>
-                            <p class="buttons"><input type="submit" value="<?php _e('Download config.php file') ?>" /></p>
-                    </form>
-
-    <?php
-
-    } else {
-        ?>
-                    <div class="fakeform">
-                            <div class="inform">
-                                    <div class="forminfo">
-                                            <p><?php _e('FeatherBB fully installed') ?></p>
-                                    </div>
-                            </div>
-                    </div>
-    <?php
-
-    }
-
-        ?>
-            </div>
-    </div>
-</section>
-
-</div>
-
-</div>
-<div class="end-box"><div><!-- Bottom Corners --></div></div>
-</div>
-
-</body>
-</html>
-<?php
-
-}

From bdfe4d472f2c9c08606270cc3cc423f1cec31ca0 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 22 Aug 2015 21:31:35 +0200
Subject: [PATCH 129/353] Remove useless index.html

Handled by .htaccess / URL rewriting
---
 Slim/Exception/index.html                         | 1 -
 Slim/Helper/index.html                            | 1 -
 Slim/Http/index.html                              | 1 -
 Slim/Middleware/index.html                        | 1 -
 Slim/index.html                                   | 1 -
 controller/admin/index.html                       | 1 -
 img/avatars/index.html                            | 1 -
 img/index.html                                    | 1 -
 img/smilies/index.html                            | 1 -
 include/index.html                                | 1 -
 include/user/index.html                           | 1 -
 include/utf8/index.html                           | 1 -
 include/utf8/mbstring/index.html                  | 1 -
 include/utf8/native/index.html                    | 1 -
 include/utf8/utils/index.html                     | 1 -
 lang/English/index.html                           | 1 -
 lang/English/mail_templates/index.html            | 1 -
 lang/index.html                                   | 1 -
 model/admin/index.html                            | 1 -
 model/index.html                                  | 1 -
 plugins/index.html                                | 1 -
 style/FeatherBB/fonts/index.html                  | 0
 style/FeatherBB/img/index.html                    | 0
 style/FeatherBB/index.html                        | 0
 style/FeatherBB/view/admin/bans/index.html        | 1 -
 style/FeatherBB/view/admin/forums/index.html      | 1 -
 style/FeatherBB/view/admin/index.html             | 1 -
 style/FeatherBB/view/admin/maintenance/index.html | 1 -
 style/FeatherBB/view/index.html                   | 1 -
 style/FeatherBB/view/login/index.html             | 1 -
 style/FeatherBB/view/misc/index.html              | 1 -
 style/FeatherBB/view/moderate/index.html          | 1 -
 style/FeatherBB/view/profile/index.html           | 1 -
 style/FeatherBB/view/register/index.html          | 1 -
 style/FeatherBB/view/search/index.html            | 1 -
 style/imports/index.html                          | 1 -
 view/admin/bans/index.html                        | 1 -
 view/admin/forums/index.html                      | 1 -
 view/admin/index.html                             | 1 -
 view/admin/maintenance/index.html                 | 1 -
 view/index.html                                   | 1 -
 view/login/index.html                             | 1 -
 view/misc/index.html                              | 1 -
 view/moderate/index.html                          | 1 -
 view/profile/index.html                           | 1 -
 view/register/index.html                          | 1 -
 view/search/index.html                            | 1 -
 47 files changed, 44 deletions(-)
 delete mode 100644 Slim/Exception/index.html
 delete mode 100644 Slim/Helper/index.html
 delete mode 100644 Slim/Http/index.html
 delete mode 100644 Slim/Middleware/index.html
 delete mode 100644 Slim/index.html
 delete mode 100644 controller/admin/index.html
 delete mode 100644 img/avatars/index.html
 delete mode 100644 img/index.html
 delete mode 100644 img/smilies/index.html
 delete mode 100644 include/index.html
 delete mode 100644 include/user/index.html
 delete mode 100644 include/utf8/index.html
 delete mode 100644 include/utf8/mbstring/index.html
 delete mode 100644 include/utf8/native/index.html
 delete mode 100644 include/utf8/utils/index.html
 delete mode 100644 lang/English/index.html
 delete mode 100644 lang/English/mail_templates/index.html
 delete mode 100644 lang/index.html
 delete mode 100644 model/admin/index.html
 delete mode 100644 model/index.html
 delete mode 100644 plugins/index.html
 delete mode 100644 style/FeatherBB/fonts/index.html
 delete mode 100644 style/FeatherBB/img/index.html
 delete mode 100644 style/FeatherBB/index.html
 delete mode 100644 style/FeatherBB/view/admin/bans/index.html
 delete mode 100644 style/FeatherBB/view/admin/forums/index.html
 delete mode 100644 style/FeatherBB/view/admin/index.html
 delete mode 100644 style/FeatherBB/view/admin/maintenance/index.html
 delete mode 100644 style/FeatherBB/view/index.html
 delete mode 100644 style/FeatherBB/view/login/index.html
 delete mode 100644 style/FeatherBB/view/misc/index.html
 delete mode 100644 style/FeatherBB/view/moderate/index.html
 delete mode 100644 style/FeatherBB/view/profile/index.html
 delete mode 100644 style/FeatherBB/view/register/index.html
 delete mode 100644 style/FeatherBB/view/search/index.html
 delete mode 100644 style/imports/index.html
 delete mode 100644 view/admin/bans/index.html
 delete mode 100644 view/admin/forums/index.html
 delete mode 100644 view/admin/index.html
 delete mode 100644 view/admin/maintenance/index.html
 delete mode 100644 view/index.html
 delete mode 100644 view/login/index.html
 delete mode 100644 view/misc/index.html
 delete mode 100644 view/moderate/index.html
 delete mode 100644 view/profile/index.html
 delete mode 100644 view/register/index.html
 delete mode 100644 view/search/index.html

diff --git a/Slim/Exception/index.html b/Slim/Exception/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/Slim/Exception/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/Slim/Helper/index.html b/Slim/Helper/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/Slim/Helper/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/Slim/Http/index.html b/Slim/Http/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/Slim/Http/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/Slim/Middleware/index.html b/Slim/Middleware/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/Slim/Middleware/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/Slim/index.html b/Slim/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/Slim/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/controller/admin/index.html b/controller/admin/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/controller/admin/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/img/avatars/index.html b/img/avatars/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/img/avatars/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/img/index.html b/img/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/img/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/img/smilies/index.html b/img/smilies/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/img/smilies/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/include/index.html b/include/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/include/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/include/user/index.html b/include/user/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/include/user/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/include/utf8/index.html b/include/utf8/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/include/utf8/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/include/utf8/mbstring/index.html b/include/utf8/mbstring/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/include/utf8/mbstring/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/include/utf8/native/index.html b/include/utf8/native/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/include/utf8/native/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/include/utf8/utils/index.html b/include/utf8/utils/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/include/utf8/utils/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/lang/English/index.html b/lang/English/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/lang/English/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/lang/English/mail_templates/index.html b/lang/English/mail_templates/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/lang/English/mail_templates/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/lang/index.html b/lang/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/lang/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/model/admin/index.html b/model/admin/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/model/admin/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/model/index.html b/model/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/model/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/plugins/index.html b/plugins/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/plugins/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/fonts/index.html b/style/FeatherBB/fonts/index.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/style/FeatherBB/img/index.html b/style/FeatherBB/img/index.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/style/FeatherBB/index.html b/style/FeatherBB/index.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/style/FeatherBB/view/admin/bans/index.html b/style/FeatherBB/view/admin/bans/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/admin/bans/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/admin/forums/index.html b/style/FeatherBB/view/admin/forums/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/admin/forums/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/admin/index.html b/style/FeatherBB/view/admin/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/admin/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/admin/maintenance/index.html b/style/FeatherBB/view/admin/maintenance/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/admin/maintenance/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/index.html b/style/FeatherBB/view/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/login/index.html b/style/FeatherBB/view/login/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/login/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/misc/index.html b/style/FeatherBB/view/misc/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/misc/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/moderate/index.html b/style/FeatherBB/view/moderate/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/moderate/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/profile/index.html b/style/FeatherBB/view/profile/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/profile/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/register/index.html b/style/FeatherBB/view/register/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/register/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/FeatherBB/view/search/index.html b/style/FeatherBB/view/search/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/FeatherBB/view/search/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/style/imports/index.html b/style/imports/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/style/imports/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/view/admin/bans/index.html b/view/admin/bans/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/view/admin/bans/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/view/admin/forums/index.html b/view/admin/forums/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/view/admin/forums/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/view/admin/index.html b/view/admin/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/view/admin/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/view/admin/maintenance/index.html b/view/admin/maintenance/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/view/admin/maintenance/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/view/index.html b/view/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/view/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/view/login/index.html b/view/login/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/view/login/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/view/misc/index.html b/view/misc/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/view/misc/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/view/moderate/index.html b/view/moderate/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/view/moderate/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/view/profile/index.html b/view/profile/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/view/profile/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/view/register/index.html b/view/register/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/view/register/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/view/search/index.html b/view/search/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/view/search/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>

From 6a40a1a1da017f32ec090cd93dc858db92a0ac61 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 22 Aug 2015 22:00:56 +0200
Subject: [PATCH 130/353] Changes in namespaces

Create FeatherBB namespace
Reorganise files
---
 .../classes/auth.class.php                    |  4 +--
 include/classes/autoload.class.php            | 31 +++++++++++++++++++
 .../classes/core.class.php                    |  6 ++--
 index.php                                     | 16 +++++-----
 4 files changed, 45 insertions(+), 12 deletions(-)
 rename Slim/Extras/Middleware/FeatherBBAuth.php => include/classes/auth.class.php (99%)
 create mode 100644 include/classes/autoload.class.php
 rename Slim/Extras/Middleware/FeatherBBLoader.php => include/classes/core.class.php (98%)

diff --git a/Slim/Extras/Middleware/FeatherBBAuth.php b/include/classes/auth.class.php
similarity index 99%
rename from Slim/Extras/Middleware/FeatherBBAuth.php
rename to include/classes/auth.class.php
index 20f124e9..d26f871b 100644
--- a/Slim/Extras/Middleware/FeatherBBAuth.php
+++ b/include/classes/auth.class.php
@@ -11,10 +11,10 @@
  *
  */
 
-namespace Slim\Extras\Middleware;
+namespace FeatherBB;
 use DB;
 
-class FeatherBBAuth extends \Slim\Middleware
+class Auth extends \Slim\Middleware
 {
     protected $model;
 
diff --git a/include/classes/autoload.class.php b/include/classes/autoload.class.php
new file mode 100644
index 00000000..a8bf8e35
--- /dev/null
+++ b/include/classes/autoload.class.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace FeatherBB;
+
+class Loader
+{
+    protected static $paths = array('include/classes/');
+
+    public static function autoload($class)
+    {
+        foreach (self::$paths as $path) {
+            $class_file = $path.strtolower(str_replace(__NAMESPACE__.'\\', '', $class)).'.class.php';
+            if (is_file($class_file)) {
+                require $class_file;
+            }
+        }
+    }
+
+    public static function registerAutoloader()
+    {
+        spl_autoload_register(__NAMESPACE__ . '\Loader::autoload');
+    }
+}
+ ?>
diff --git a/Slim/Extras/Middleware/FeatherBBLoader.php b/include/classes/core.class.php
similarity index 98%
rename from Slim/Extras/Middleware/FeatherBBLoader.php
rename to include/classes/core.class.php
index 5b17e8ce..c3884a51 100644
--- a/Slim/Extras/Middleware/FeatherBBLoader.php
+++ b/include/classes/core.class.php
@@ -11,10 +11,10 @@
  *
  */
 
-namespace Slim\Extras\Middleware;
+namespace FeatherBB;
 use DB;
 
-class FeatherBBLoader extends \Slim\Middleware
+class Core extends \Slim\Middleware
 {
     protected $forum_env,
               $forum_settings;
@@ -31,7 +31,7 @@ public function __construct(array $data)
                                   'cache_dir' => 'cache/',
                                   'debug'   => false), $data);
         // Define some core variables
-        $this->forum_env['FEATHER_ROOT'] = realpath(dirname(__FILE__).'/../../../').'/';
+        $this->forum_env['FEATHER_ROOT'] = realpath(dirname(__FILE__).'/../../').'/';
         $this->forum_env['FORUM_CACHE_DIR'] = is_writable($this->forum_env['FEATHER_ROOT'].$data['cache_dir']) ? realpath($this->forum_env['FEATHER_ROOT'].$data['cache_dir']).'/' : null;
         $this->forum_env['FORUM_CONFIG_FILE'] = $this->forum_env['FEATHER_ROOT'].$data['config_file'];
         $this->forum_env['FEATHER_DEBUG'] = $this->forum_env['FEATHER_SHOW_QUERIES'] = ($data['debug'] == 'all');
diff --git a/index.php b/index.php
index 5b22fd16..6402f375 100644
--- a/index.php
+++ b/index.php
@@ -17,17 +17,19 @@
 require 'Slim/Slim.php';
 \Slim\Slim::registerAutoloader();
 
-// Instantiate Slim
+// Instantiate Slim and add CSRF
 $feather = new \Slim\Slim();
+$feather->add(new \Slim\Extras\Middleware\CsrfGuard('featherbb_csrf'));
+
+// Load FeatherBB
+require 'include/classes/autoload.class.php';
+\FeatherBB\Loader::registerAutoloader();
+
 $feather_settings = array('config_file' => 'include/config.php',
                           'cache_dir' => 'cache/',
                           'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
-
-// Load middlewares
-$feather->add(new \Slim\Extras\Middleware\CsrfGuard('featherbb_csrf')); // CSRF
-$feather->add(new \Slim\Extras\Middleware\FeatherBBAuth());
-$feather->add(new \Slim\Extras\Middleware\FeatherBBLoader($feather_settings)); // FeatherBB
- // FeatherBB
+$feather->add(new \FeatherBB\Auth());
+$feather->add(new \FeatherBB\Core($feather_settings));
 
 // Load the routes
 require 'include/routes.php';

From aa143a3ee8da206b271b7aa0cc89504f3cc38f03 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 22 Aug 2015 22:05:08 +0200
Subject: [PATCH 131/353] Remove FluxBB logo

---
 img/test.png | Bin 2055 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 img/test.png

diff --git a/img/test.png b/img/test.png
deleted file mode 100644
index 4241f08ad3367a60d646ba679e2e163d4cfd14d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2055
zcmV+i2>ADjP)<h;3K|Lk000e1NJLTq005@|001ut0{{R3u`4QT0007cP)t-sJv}{z
zyX<R|#AlJjP=B<DyX<_l=>Px!jlJw<ki=?|#6D=8`}_On=jS+Nj89KbK0ZG@MNmLQ
zN6*jCS#y$4T4hI2TRlELV1%zjN>Wv2b3R2(Ib@eYai>IetZkXhM|rVKg1bmiSU*BV
ze4)l_hNEGCr#?tjWQ@E+NK8#uUY?$wi@WOn{{DKg<XUipdY{68fPj3b(Sx?=KT20V
zKtVu3LP<$Ufq{WFU63?ejyp$KKTcmgLr6VKTsvl)KWw5wQDaJew@p`KWsbpaZf?rT
z%7%u9Pkpj_tlx8^)l7M<K}}h9qts}KrcPgULPkq}tlihw*MYR+K~rW{Z;nMwRC1lp
zdZ5LIv);$Y$E2jB_xJZ`XlU^8@K1WGNq4A4aH2p(N=Z{*P-1mUTWxrz)lz1Bex}WZ
zv*YdU?SzDc^Yiod_4U%y(zmy_LvWr(bfZ9Sq(E(%IAD}IXOLTqzBgc#K5Cz8leuD)
z$bGHeRD!iVYL!=YnNEbhNqn_Whrv&Wz(-D1ZI;MXX@g~nwOo0eh_~osc#cI%P+xV5
zcbU6dT3X!P+*nvxu&}U3Mn;p9ldG$%-{0SHrrJJXjyPU`YMs$?oW@>!qEcaQWQ470
zkiu?_t9F{dXN<dJV`Jjt;+&kEyu7^X>gt!5mr_zveSLjhU0slnkWF=?NpPA-W{Eyr
zf>vvQI$?!%qRwD~t8I#>X^yghtk+|TyIp>$SZ<1Cf}M$piHW%7gRRy{R%F4!!F6?Y
zd9UDnv*uoo!fBh$KW3O(gt0kchB{hzI#q2$V17hukxN->Tz8O5ZIot(r*xUUWqy@$
zmAZF#cUzlRuK)lANl8RORCwC$*lAZ2R~*OjzbM=gV>^UkG+k_^Sh0Xwn?S2tZ4v|!
z1F0Y&pduiJC|wszOBX?QWOLtDtZS`X-D~%Ke?|S>naND1!yMAmlhSkYeR5~+Ig|4_
zH<y_q6fIh`XcImm0Xb>Hm+%Z){6BEMfhM%m=@gw0qGf~xfkL}diWUSr+}TCw*V57>
zhaD8TYFobkqJ_}oQ<3OAzww9fmypr{leV<qFzN2@h>eY%Pm$^=uKP%IE=QvC<NHto
zDU|~E7)hnNJIhRNLfvrIQ>5ChIv+wy6z8|3l%hI$)}&NI?pP#5(z$z$xUvr;(fQpT
zIQNj!eA%hZ#hrx|p}vB1DT&TU&<f%uXq`!VC+`}Z+bKd#MFR0wJ%=Rc18{ybrt?WS
zXH#TK-iSzYK8n^5Z|Q4jLOGY_=jU&bo$n*r`3?%(Y27q0N%{Vr4u|6aMhDVt-XzC%
z??S25-rh_S%UUUw<vqh^jI+LtWakG+cD{nbcFvzPY0_%t199>^#(I9E?Qy7|kye&^
z?ACF{*p@zjLpmE?>B6k{YydM=et!dFTknx^)vqJj`7V;3FQV}|DXE7`gHY=o6JO;@
z#w-HH4^ITxNF$*^015T>r?b9FW9M5)zdv6><8+d90WQ1kCb7e&6hZ^(%tB(v0?fi$
zUd9qhY@vlU7=HPMd-v}BGQ_z;(r-ZHbyDgbTvui#<S^B{h&KYK)LF(p<twW=sfn>u
zWKim^UAyu~cVEg!T4(*dV6($@k~<9--o!yyS=u}jo2EE-GBypv{i-vIv6F_*jEsz2
z`APpClASq7>r|@`+eugW7M)G@9#c1IoYF!Dw9eCvl^Z(a;^Hz$`#gek3L+(UM@PrC
zlwh4CcWKe0MWPd9isHmcv$Cto0PUe}(-FJQiPg*2I)@lLF+OKeQPJ<DYhQD7^LC6E
zb8~ZVDo&i#sc!~psPlGN7ipdF;iyvMtgOJ_(U?y4Jw)%^R8UZGm2_>xbP2}Id3ky5
ziW4VmDVY7p3p@w?#VMQ~W{GDg#5r)biZy{bF6XRSvksE39hjbpu?C|}apEK<<kBLv
znnIlE+1c6tEiC<%on&VKGs6~E@dwe^PWAm$@0=bJ6ElZ&&6qrSGI#po<Kv4-E*U3t
zN$r=qy1ISIq0V*d*7cWT^bZP>a|AO@i4Dw>nDw7Ir?2JRAl?4-Ze`4$8L~fJjnf!w
z3di{}TK4ZcT{~Lmw6?a!l<1t4iD&(g>O^O@FlMx(g>Zf@JC`HXnG?42N6=bEcNUv(
zSdW^`=KXpnzcB?gP8u@4feLZRB{|<j%cMg%*N5#a0qydr&b#J=0{P6SR`0|Ei4AC+
zkPnkVpTSu|+W(7b37qG`b_$;Oc#klOv-;>Ee6(;G&K=34IV%K>vys0$8B_=7rJo2T
zJc~r<h4pZr57&tU*nA{as5<TK<{I&GGqUNNQ1y|<+0R%%8MH4BZBu>^SxksCr~Dkg
z(+Arpg~XdVLv_}e_uGlr#-W=Pr}98z3pLJ4+(UcGpc(^b&Z_X8)Xt&4Li_Z#xgJl@
zS#s!Ts=Tl^4)qBkPG{C}mOjL}!S6bAu!>axZq&uA1+w#1Bsp`=U06YX!&$vQo(JOf
znRh*s(|J(&;~}Bt5Z|M1PB>XrcGF3J6|<CkNpiB0@{{F#6)e!y8`ke&Pb1MO2&AdY
zX0vT3U2T}ICaF#BGd!N_#kF>#T3fL=qq)TDvmq-DKEXS2>)x?U5*xrNI@Rdi>7uby
lo&Pwy5dEDtTC`~6=}$IXV*MH8r7{2j002ovPDHLkV1fe=2A==`


From 3537eb029688ae64e549e6ecdcad2cad71909f00 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 22 Aug 2015 22:13:42 +0200
Subject: [PATCH 132/353] Update srand.php

---
 include/srand.php | 108 ++++++++++++++++++++++++----------------------
 1 file changed, 56 insertions(+), 52 deletions(-)

diff --git a/include/srand.php b/include/srand.php
index 04dc702e..82dc007a 100644
--- a/include/srand.php
+++ b/include/srand.php
@@ -37,7 +37,7 @@
  */
 function secure_random_bytes($len = 10)
 {
- 
+
    /*
     * Our primary choice for a cryptographic strong randomness function is
     * openssl_random_pseudo_bytes.
@@ -45,11 +45,12 @@ function secure_random_bytes($len = 10)
    $SSLstr = '4'; // http://xkcd.com/221/
    if (function_exists('openssl_random_pseudo_bytes') &&
        (version_compare(PHP_VERSION, '5.3.4') >= 0 ||
-        substr(PHP_OS, 0, 3) !== 'WIN')) {
-       $SSLstr = openssl_random_pseudo_bytes($len, $strong);
-       if ($strong) {
-           return $SSLstr;
-       }
+	substr(PHP_OS, 0, 3) !== 'WIN'))
+   {
+      $SSLstr = openssl_random_pseudo_bytes($len, $strong);
+      if ($strong) {
+         return $SSLstr;
+      }
    }
 
    /*
@@ -63,10 +64,10 @@ function secure_random_bytes($len = 10)
    if (function_exists('mcrypt_create_iv') &&
       (version_compare(PHP_VERSION, '5.3.7') >= 0 ||
        substr(PHP_OS, 0, 3) !== 'WIN')) {
-       $str = mcrypt_create_iv($len, MCRYPT_DEV_URANDOM);
-       if ($str !== false) {
-           return $str;
-       }
+      $str = mcrypt_create_iv($len, MCRYPT_DEV_URANDOM);
+      if ($str !== false) {
+         return $str;
+      }
    }
 
 
@@ -78,43 +79,45 @@ function secure_random_bytes($len = 10)
     * time needed to compute a number of SHA-1 hashes.
     */
    $str = '';
-    $bits_per_round = 2; // bits of entropy collected in each clock drift round
+   $bits_per_round = 2; // bits of entropy collected in each clock drift round
    $msec_per_round = 400; // expected running time of each round in microseconds
    $hash_len = 20; // SHA-1 Hash length
    $total = $len; // total bytes of entropy to collect
 
    $handle = @fopen('/dev/urandom', 'rb');
-    if ($handle && function_exists('stream_set_read_buffer')) {
-        @stream_set_read_buffer($handle, 0);
-    }
+   if ($handle && function_exists('stream_set_read_buffer')) {
+      @stream_set_read_buffer($handle, 0);
+   }
 
-    do {
-        $bytes = ($total > $hash_len)? $hash_len : $total;
-        $total -= $bytes;
+   do
+   {
+      $bytes = ($total > $hash_len)? $hash_len : $total;
+      $total -= $bytes;
 
       //collect any entropy available from the PHP system and filesystem
       $entropy = rand() . uniqid(mt_rand(), true) . $SSLstr;
-        $entropy .= implode('', @fstat(@fopen(__FILE__, 'r')));
-        $entropy .= memory_get_usage() . getmypid();
-        $entropy .= serialize($_ENV) . serialize($_SERVER);
-        if (function_exists('posix_times')) {
-            $entropy .= serialize(posix_times());
-        }
-        if (function_exists('zend_thread_id')) {
-            $entropy .= zend_thread_id();
-        }
-        if ($handle) {
-            $entropy .= @fread($handle, $bytes);
-        } else {
-            // Measure the time that the operations will take on average
-         for ($i = 0; $i < 3; $i++) {
-             $c1 = get_microtime();
-             $var = sha1(mt_rand());
-             for ($j = 0; $j < 50; $j++) {
-                 $var = sha1($var);
-             }
-             $c2 = get_microtime();
-             $entropy .= $c1 . $c2;
+      $entropy .= implode('', @fstat(@fopen( __FILE__, 'r')));
+      $entropy .= memory_get_usage() . getmypid();
+      $entropy .= serialize($_ENV) . serialize($_SERVER);
+      if (function_exists('posix_times')) {
+        $entropy .= serialize(posix_times());
+      }
+      if (function_exists('zend_thread_id')) {
+        $entropy .= zend_thread_id();
+      }
+      if ($handle) {
+         $entropy .= @fread($handle, $bytes);
+      } else  {
+         // Measure the time that the operations will take on average
+         for ($i = 0; $i < 3; $i++)
+         {
+            $c1 = microtime(true);
+            $var = sha1(mt_rand());
+            for ($j = 0; $j < 50; $j++) {
+               $var = sha1($var);
+            }
+            $c2 = microtime(true);
+    	    $entropy .= $c1 . $c2;
          }
 
          // Based on the above measurement determine the total rounds
@@ -124,22 +127,23 @@ function secure_random_bytes($len = 10)
          // Take the additional measurements. On average we can expect
          // at least $bits_per_round bits of entropy from each measurement.
          $iter = $bytes * (int) (ceil(8 / $bits_per_round));
-            for ($i = 0; $i < $iter; $i++) {
-                $c1 = get_microtime();
-                $var = sha1(mt_rand());
-                for ($j = 0; $j < $rounds; $j++) {
-                    $var = sha1($var);
-                }
-                $c2 = get_microtime();
-                $entropy .= $c1 . $c2;
+         for ($i = 0; $i < $iter; $i++) {
+            $c1 = microtime();
+            $var = sha1(mt_rand());
+            for ($j = 0; $j < $rounds; $j++) {
+               $var = sha1($var);
             }
-        }
+            $c2 = microtime();
+            $entropy .= $c1 . $c2;
+         }
+
+      }
       // We assume sha1 is a deterministic extractor for the $entropy variable.
       $str .= sha1($entropy, true);
-    } while ($len > strlen($str));
+   } while ($len > strlen($str));
 
-    if ($handle) {
-        @fclose($handle);
-    }
-    return substr($str, 0, $len);
+   if ($handle) {
+      @fclose($handle);
+   }
+   return substr($str, 0, $len);
 }

From b8670979e21bbebf3d90db51c19981dceda8f01a Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sun, 23 Aug 2015 11:05:56 +0200
Subject: [PATCH 133/353] Add stopwords in cache

Various bug fixes
---
 extern.php             |  6 +++---
 include/cache.php      | 49 ------------------------------------------
 include/functions.php  | 18 ++++++++--------
 include/search_idx.php | 17 ++++++---------
 model/cache.php        | 12 +++++++++++
 5 files changed, 30 insertions(+), 72 deletions(-)

diff --git a/extern.php b/extern.php
index 327693d0..065258fa 100644
--- a/extern.php
+++ b/extern.php
@@ -716,11 +716,11 @@ function output_html($feed)
 // Show board statistics
 elseif ($action == 'stats') {
 
-    if (!$this->feather->cache->isCached('users_info')) {
-        $this->feather->cache->store('users_info', \model\cache::get_users_info());
+    if (!$feather->cache->isCached('users_info')) {
+        $feather->cache->store('users_info', \model\cache::get_users_info());
     }
 
-    $stats = $this->feather->cache->retrieve('users_info');
+    $stats = $feather->cache->retrieve('users_info');
 
     $stats_query = \DB::for_table('forums')
                         ->select_expr('SUM(num_topics)', 'total_topics')
diff --git a/include/cache.php b/include/cache.php
index db7add9a..7f7b0f4e 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -7,55 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-//
-// Generate a cache ID based on the last modification time for all stopwords files
-//
-function generate_stopwords_cache_id()
-{
-    $files = glob(FEATHER_ROOT.'lang/*/stopwords.txt');
-    if ($files === false) {
-        return 'cache_id_error';
-    }
-
-    $hash = array();
-
-    foreach ($files as $file) {
-        $hash[] = $file;
-        $hash[] = filemtime($file);
-    }
-
-    return sha1(implode('|', $hash));
-}
-
-
-//
-// Generate the stopwords cache PHP script
-//
-function generate_stopwords_cache()
-{
-    $stopwords = array();
-
-    $d = dir(FEATHER_ROOT.'lang');
-    while (($entry = $d->read()) !== false) {
-        if ($entry{0} == '.') {
-            continue;
-        }
-
-        if (is_dir(FEATHER_ROOT.'lang/'.$entry) && file_exists(FEATHER_ROOT.'lang/'.$entry.'/stopwords.txt')) {
-            $stopwords = array_merge($stopwords, file(FEATHER_ROOT.'lang/'.$entry.'/stopwords.txt'));
-        }
-    }
-    $d->close();
-
-    // Tidy up and filter the stopwords
-    $stopwords = array_map('feather_trim', $stopwords);
-    $stopwords = array_filter($stopwords);
-
-    // Output stopwords as PHP code
-    $content = '<?php'."\n\n".'$cache_id = \''.generate_stopwords_cache_id().'\';'."\n".'if ($cache_id != generate_stopwords_cache_id()) return;'."\n\n".'define(\'FEATHER_STOPWORDS_LOADED\', 1);'."\n\n".'$stopwords = '.var_export($stopwords, true).';'."\n\n".'?>';
-    featherbb_write_cache_file('cache_stopwords.php', $content);
-}
-
 
 //
 // Safely write out a cache file.
diff --git a/include/functions.php b/include/functions.php
index cd8ccc1e..ad27e8d8 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -76,11 +76,11 @@ function get_admin_ids()
 {
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
-    if (!$this->feather->cache->isCached('admin_ids')) {
-        $this->feather->cache->store('admin_ids', \model\cache::get_admin_ids());
+    if (!$feather->cache->isCached('admin_ids')) {
+        $feather->cache->store('admin_ids', \model\cache::get_admin_ids());
     }
 
-    return $this->feather->cache->retrieve('admin_ids');
+    return $feather->cache->retrieve('admin_ids');
 }
 
 
@@ -421,14 +421,14 @@ function censor_words($text)
 
     $feather = \Slim\Slim::getInstance();
 
-    if (!$this->feather->cache->isCached('search_for')) {
-        $this->feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
-        $search_for = $this->feather->cache->retrieve('search_for');
+    if (!$feather->cache->isCached('search_for')) {
+        $feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
+        $search_for = $feather->cache->retrieve('search_for');
     }
 
-    if (!$this->feather->cache->isCached('replace_with')) {
-        $this->feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
-        $replace_with = $this->feather->cache->retrieve('replace_with');
+    if (!$feather->cache->isCached('replace_with')) {
+        $feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
+        $replace_with = $feather->cache->retrieve('replace_with');
     }
 
     if (!empty($search_for) && !empty($replace_with)) {
diff --git a/include/search_idx.php b/include/search_idx.php
index 364ec00e..225c3571 100644
--- a/include/search_idx.php
+++ b/include/search_idx.php
@@ -83,24 +83,19 @@ function validate_search_word($word, $idx)
 {
     static $stopwords;
 
+    // Get Slim current session
+    $feather = \Slim\Slim::getInstance();
+
     // If the word is a keyword we don't want to index it, but we do want to be allowed to search it
     if (is_keyword($word)) {
         return !$idx;
     }
 
     if (!isset($stopwords)) {
-        if (file_exists(FORUM_CACHE_DIR.'cache_stopwords.php')) {
-            include FORUM_CACHE_DIR.'cache_stopwords.php';
-        }
-
-        if (!defined('FEATHER_STOPWORDS_LOADED')) {
-            if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                require FEATHER_ROOT.'include/cache.php';
-            }
-
-            generate_stopwords_cache();
-            require FORUM_CACHE_DIR.'cache_stopwords.php';
+        if (!$feather->cache->isCached('stopwords')) {
+            $feather->cache->store('stopwords', \model\cache::get_config(), '+1 week');
         }
+        $stopwords = $feather->cache->retrieve('stopwords');
     }
 
     // If it is a stopword it isn't valid
diff --git a/model/cache.php b/model/cache.php
index 33d7906d..c0f485a3 100644
--- a/model/cache.php
+++ b/model/cache.php
@@ -114,4 +114,16 @@ public static function get_quickjump()
         }
         return $output;
     }
+
+    public static function get_stopwords($lang_path)
+    {
+        $files = new \DirectoryIterator($lang_path);
+        $stopwords = array();
+        foreach($files as $file) {
+            if(!$file->isDot() && $file->getBasename() != '.DS_Store' && $file->isDir() && file_exists($file->getPathName().'/stopwords.txt')) {
+                $stopwords = array_merge($stopwords, file($file->getPathName().'/stopwords.txt'));
+            }
+        }
+        return array_map('feather_trim', $stopwords);
+    }
 }

From 435cb0e75e985da9d19026abbb2e447bfa830663 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sun, 23 Aug 2015 11:08:53 +0200
Subject: [PATCH 134/353] Remove legacy dblayer references

---
 model/admin/users.php |  2 +-
 model/profile.php     |  2 +-
 model/search.php      | 18 +++++-------------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/model/admin/users.php b/model/admin/users.php
index 58ccea8a..738f2e4f 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -338,7 +338,7 @@ public function delete_users()
                                         ->order_by('posted')
                                         ->find_one_col('id');
 
-                        if ($this->db->result($result2) == $cur_post['id']) {
+                        if ($result2 == $cur_post['id']) {
                             delete_topic($cur_post['topic_id']);
                         } else {
                             delete_post($cur_post['id'], $cur_post['topic_id']);
diff --git a/model/profile.php b/model/profile.php
index 71c06b8c..581c314f 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -607,7 +607,7 @@ public function delete_user($id)
                             ->order_by('posted')
                             ->find_one_col('id');
 
-                        if ($this->db->result($result2) == $cur_post['id']) {
+                        if ($result2 == $cur_post['id']) {
                             delete_topic($cur_post['topic_id']);
                         } else {
                             delete_post($cur_post['id'], $cur_post['topic_id']);
diff --git a/model/search.php b/model/search.php
index ba8ba002..3bd0de2a 100644
--- a/model/search.php
+++ b/model/search.php
@@ -21,8 +21,8 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
     }
- 
- 
+
+
     public function get_search_results()
     {
         global $lang_search;
@@ -533,14 +533,6 @@ public function get_search_results()
                 ->set($insert_cache)
                 ->save();
 
-            if ($search_type[0] != 'action') {
-                $this->db->end_transaction();
-                $this->db->close();
-
-                // Redirect the user to the cached result page
-                header('Location: '.get_link('search/?search_id='.$search_id));
-                exit;
-            }
         }
 
         // If we're on the new posts search, display a "mark all as read" link
@@ -778,7 +770,7 @@ public function display_search_results($search)
     public function get_list_forums()
     {
         global $lang_search;
-        
+
         $output = '';
 
         $select_get_list_forums = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.redirect_url');
@@ -838,7 +830,7 @@ public function get_list_forums()
             $output .= "\t\t\t\t\t\t".'<select id="forum" name="forum">'."\n";
 
             $cur_category = 0;
-            while ($cur_forum = $this->db->fetch_assoc($result)) {
+            foreach($result as $cur_forum) {
                 if ($cur_forum['cid'] != $cur_category) {
                     // A new category since last iteration?
 
@@ -857,7 +849,7 @@ public function get_list_forums()
             $output .= "\t\t\t\t\t\t".'</select>'."\n";
             $output .= "\t\t\t\t\t\t".'<br /></label>'."\n";
         }
-        
+
         return $output;
     }
 }

From 3f04fb539acc880406b75f5c158acbfbb1500056 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sun, 23 Aug 2015 11:14:49 +0200
Subject: [PATCH 135/353] Add featherBB logo

---
 img/logo.png | Bin 0 -> 52011 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 img/logo.png

diff --git a/img/logo.png b/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3315969c11b563cbd0c96864d2795ec198086d4
GIT binary patch
literal 52011
zcmX6^WmFqo*9{Qd-Q8UZ1&X`7x41(o?izwS6n9E-cPJX9xKkX8TX84o$Mb$aW+t;%
zR_5L_$M)VQQR=F4=qMy800018L0($({W|>LfrapXei?RM2LM0-1!)Ow@0=4OL{mJS
z$Dl^`Wp~NLA6`H_tVEKmNPRVt+dtPA0~pa|KT2__^s%sS9ZGHBJ7_*qQG<A8ib8He
z38;!}lGk(Jp1Sxqx+j3DFZt-1=N%Sn%uavD9lJN4+T#o?lVk`CEN9+A$a?O9Yz@OS
zF_8pF(Q&EypIcH^IgEB&Uj5^Ozr00EwjygTKEanywQs6q@0M0nWO=Q&>o|Iyv>B^Q
z^m0Pk4q)y6{}&3~A_&-kn4=5s7sJgM5`>1PgzmlYs)TLEBCrU*@@w7adi_D#y<(ZX
z60ts|AVCOS2>$eROFK%ZN2S_yFr2XjB8EKR@sJjoD~903o^zj#9##B(Wrg`Fnp$-S
zJfv;ky4Nus@55Q~*6uuPc-p+eUIZ_~ito}kOE}v+LF9Av&P*UGi1SkKvl~eUJRk%F
zYLUKKPJ`PQYJf)sNvOe8PJKqvH&Pp-H!Z6UBFTVL660DlVnC^>c!kaJ@`L(bgdhHk
z-|Xq3gDEN8ZhgjhMY4p6e7Dn0vI4A}B=`yY!Xn|93Gn_9n<f$t1cUYiOyq{F`2+{M
z0YH0H7MIL_{{$qGb{9>`1L~3tW=?vcXg&pK^^#GQfWBr!kmQ?qxh(L(L_#c)^~vC~
zb|u*1p4Z#4uA{~fHpce%2f53B2hE(1C5QsgS9IjmJw3ZHHYr3%P|VpBu`I3xEM^iy
z<^x-)I3OP&vDll_fv`k0jp33EZ0(b10(6^pV&9IQr-@CQ#Z3En01;<$Ah}g839<rU
z`L#JPY0!NywP%C>=IQ&MbnE;3hNXj{rRj5o+X(RbgX3(!QKqq3$2H5=w*&EqKL@hL
zg|xI7m<AeRS<Hjm#HWC)5)OAV87iNpJsC6d8TFH(!mxNG`SGafs2iMy<nt0cS-hE_
z>ALRNBolopRz?rVd8E7fTb~R+SQ(JK+c5X{pIvFm(kj-b{4L!Y1<I7*2sEfY*+a70
z_6CqrXyHcY;$-=f5n^T*mk0kr_sx!Lk&Xl58vl`v%OVMkCys^foLGYGi>wbNIc!@V
zz?&AZ?ZoSap$r#6ud2cA_OeL~Hz#A9=oP~<{33-6&}GTkU^H+BfF!NK^ZxQ7t_gta
z15Cu75%KieH<RwM#w0e%|5hb~w?SuSx==+SvRf*2ZuzMt_tVkWWlvB4>4N8n9E+&N
z`j4U_@Vsc~!ZxZQvYV?;P7IOtG!lx*R9Yz?aK|&`uq^h#4=xfCtN~J{`DCd3LkFN#
z@fy6MmZk>G2Wd2rvod1kQ^q|m_GTjIj<RUt2aP=-S5MF<eHg6FI{7&&2rUclz!J4Y
z>>ees=V7}!2tI-0#jSg;F_R5_fF@=VHri=8m^K+MoU6QwU$<S)c;q?q1G&g!Da^Y=
z3gLBHp~A@R96*K>0n8G{dWkq?((qs+RKg-qFc69?VZWye&d`0#i!$9K<<8DJ^oPaZ
z`GyUe@c}y1Z8B#?$G<J5<)s4>^5)3U#P9h{)UJyT(!Pv-5%e0q3f8xrp^V%<W~8&U
z`sf?~X7!kP`qvL=x+EKml)JrPWYIoZJzjR9H<2rv+aDe$m=`%I^gTKI;UbEB-({G=
zq{rqZ58YFYpjWnD<8kiZatK*-((%om%YwexbTI1~wF($`3*fTwLF|p4x!wBOONJ$i
z_`%Z~O&|GBMkVCgo07|-6v(WV{`HgoL^{yzHyzgow+t7mR|wQU9Q+Gng0R1%3eP&1
zEJAK5q?}$Rod`=dD?n2Va1$SeWknBH{%SKSb{PP_KQ#k0-pUCU;(Y!cgcao6psfEM
z(1-;OgUA7m*6#lX-e}0jTf8s%7L8r3ri>@D0`Aw-*b#qi{=M$cGm^s)fm;6kk%J$F
zI}|50Com;)KkHW8wbJFcBa6OsJa5uaB+=jI>tSwT{ts1?f$>Vgp$BGMf0Z9%Pxd+Z
zoM1p-M1qASN?F$L6-E~#u3?bU=5@$XH>)q-$h{GvY(aO(JQ@|r3y<=%7@E&Ko^IPn
zHAsS7L4GT9{qZZEG*G^13#;xs@>v}fMje=_Lw`CbdnP}I4L41O-~|J33a8yhWZQFy
zUx6r*?*pF>>`*xRqM;x3k%E%{D*-MpKD<P$&3)dw9ERJ>zJ>9A(DUVoxcmE_I7%@a
z)gI0-yiO|(8ap1x?H=d8uRggJ=JJq16iq-Pr+g-Od`8Jql4iAM*;0o|K7e7fVCpwG
zMOG4G){SWgEc%fV9IPxuw|Ueim=M~+!x>Uv3(vhEo9OGvqk)|``w}&oQYL>*MKdwv
zutGyQS9_TarTq?1^=^4mP5-XY(5mGL6KfTHV9aVA3<8U_lA`ZJ($k>fr`bIco}%;g
z)4!G{#p%XD0Z`X=``Mz-pMsURjFbYV6t%|MwWySxtt#27Uq1_L)-HluJ3PeRz#K;3
zT3*0^6!U;of<c%_=2er1&Zo{xx!}nYI!1sUi+uIC0u`Yc&^nfvvaz7_G9Fd)p6}pm
zB6HN)*E~jSJ6Jg&_kvPl7ADL>W}l0le<OnV6rl2YJSx1j^o@k*xs>L=T6Cya^nhU4
zKYTJPV@uLl;wu#1^zHBA#5}Fza=^<%w@H(en3J*f{>JN|ehh(1miTnf?Qq1<Lb`V;
z(m|Wk$x`QY&R!HQMNp^ly74+iXV2@iuS=J&sP`M4T0&E0a}oR)qL}lW%8M`F>5@yp
zyj6lBZ_nkm*czHHI5B6psc*xZFJtQ1hs#1E$+Wre%{cM%(P9TimGZ|`po?i1obG`J
z?;M2$Sw=V9qAC_$G8VEwEXr)+q1!wimqjsHpw1s%cZaMSw+a*w^mmi^_ZYcs+HHim
z58@@R%3JIKk`)mXi(<kW22izmT6d<wSqIl`Ky;^nB_p~{F8zDoerwT#EFiX?F(a3A
zw&_>BR0IQ^``P%?JSm4k*h<6al_MqC_+L&}1N<f?O_6YNj@tucoVA4g!8>ORDj6Ye
zww|6ts@1Cl3*Y7#nC)&3y90i}47h17CR@+wVWA?mteKet@FTfVR*U_k=F`FRC|y6P
z=r4MnQ1y`)RKY2mf9d66P~z02A>yJKIGZ+C9@9R%KdJIZ4+45)n+c0}$$V93%Z9b_
z<t=$ZKYdyB*AsG}cofR_j1v*VRnTc~A1@H|a6#er_LeEp*d%%bFIEiOBfP@C-I`D7
zi;vs~zZW^$JZ~D>ok3D;XTQte0IW8PWxFdpilFB(!ZdaZWm^h|nL^+CX<o;61=yi9
zc8`78q0si#rc7a<KV_l;n{Kuch0H`-88vV|@QzzTv2G43jpwPvdZG(Xfzai{k~0Dd
zFYl2xS+57d_F|M!$>C7h67FjkSb{5q>9(&xZqFnt50Uq`h5;*ZwLa~gH)84$NCo49
z(B?TPj19wvJu#FH)IFE^i|O=ljfORLktXJq5|1)@n)9n}ZVwl~NhtLEbRh3wrSm1t
zD7{n6TRz?ElklQY&yZC0bTiGuTXiQ*U7(S*L&RqO)YI;+Lq}fyx`o#hMzer-T}9K?
z9=Psnk4@BxH36S{7;XO+B-LW$SG`1n`QS=;GgNIX$PM80?ryTGh#B>5r4SbT!wVzR
z!ATRqe&Zp$E-ddkAJ-z&i75teesC&C*cCIQ_Q3@90|5ohKI8*N6_Ce{%o3Ic7t^YW
zk{oV7D;U*Kh&!>cUGWUwP30ezzKjjFvy2ErO|H%MG3GvC9<d4#`d4b0h0EecWv~5T
z9b@NH-~edQEcARu6Cx26mH?U$@c#h$W3szO{lDn6QTNxDe5sOa8%Bw^>po1vAQy7C
zUnx|}UyXL`tTz$kAd0xUJ&MCBIw9SPRjIUN*zaQ_UH!g&6+=ZNcJ>Oj*)Tf2*VFS8
z9ztz%ENIMr=`LZV>aLp&s5>mlZui)+O%9ydjQ1zqKp0;#maq*2ZnIwhHsw%%gV)uN
z_t*#hqI%=k&-DC=vJI*y7}vY`){CP5u?n&Bu)J>BRJ5CEaZ<mx`MvhNkyiPW2RrN0
za_%ezm=2DPLC7BRVBCU*$*X`qP#~AZuP#U|x-o_>L-U1%X)#P<i8x7IDQQN}k^&fR
zig?<R1OECt{C)QmKD7Iybioa0bC7?+Z~dmPlwPRTdltQ47aI(F56}!4*xnr+8E<$l
z(vn<%?eX>n(eO`eK!j+3Y~16qiJ7M6kNkFy%1%Woe3=^{jn{Yh$hwr2s;UIBeOA4m
zMLlD)Mu{Bwh~#)OK~q3Z@5`gdarm>f;xldUFP%gll_cCOe=5tYXdj#^-G7#|g|53E
z2Vi_aqAc!(hA@ooqE-s7Rd{j%pB#5)05K5QR9KoSw5Qg|90^xUg-@U?iuD<)RgS-c
z1DbA2*>dDalFU-BW@6d-<o2y9tE7BxH-bo<!1+q3SIC~;{dIW+_P=Q590;~BU5Mqj
zu*@5Lyq)3Z_MoBZaR23gJN?6`Lvq?S3(e`JKB;JFdse>6mO2jxD4M^B3L}jt#QzvI
zof*6Cdpw*(l%F$BhsBSi37eWTLO0E%7_Ix44iwdbs_8?nT^SAJhHApHzRC3}CT1mM
zS02p@voHqZbItf43eP5rzBg+sV4|-VZ2B<tdq36jh$oWwrFN3lLj9Tdk0+X|BFE>0
zj=FF*6Pc&hT0<WrfQn7p;G_m`$0V!1cPvA-4N6Mn`+0hdcG}dO?Wjn!c3!E9s-+*n
zzuFoTlvK}fgwB9^P_3dAJZsik@19g%^;Fs$KKb@VRu8>iNu7A~JNl{giAlRdu^S>`
z%3st9210g1)>XUStRXSSF5&G?SPpsqkIsDx6i;*+wYvePH854M9~LCA#GLrv?}b1*
z%}X5MHq&Rc@g@Gn;M4+#H-rq-8%ZvUFWV4%_>E`!I-Zvkdj#Ei7h2C?=<Qf9OFakO
z`<F-hO))@bri0OpVB*zhyo@P7(v14NTJZceAsfIAaEPfJS2%ni!5}yrSw@E(cB-o#
zocYgEe%=pV!s+aTBt&u%{z{wo!mhCPJH&sLa6G>erSq5}0R5q(GH&kUv!d9P7@2`t
zCxO8L&>3wwi_aq5cBVolXQ|$zRMmOK*lQhMui%bd7$*f9d!0)h?>;j<j5PF{`*U#2
zRJrEK((G4bej)$Bm)~7PtNixoVl8hf>pgz=@#NU?S!R@4Tx{v}vTv}JI5b~5;aN*R
zgw1?sNTQWLEyWL-5#X{Aazgm9V30Vg9KQy?559omvZ#ii=UA2~DG`6DEl)t02+=)D
zv29aG<oUJUPFmGxcjQlla{;vERa>Eqtl+6ZwIz@x;^a%C>2*3wls}krOR^iyu~W7D
zXf)#i{n=~y^NG~^(R~@w^4}km{YCG)#CKmf%wfpf^jZysji34H)bZ`Xd9bGYaaO6^
zww>;16@bhnpZev>=-Jz|p{TR-S!mObDmoGgHDtu<=CHB`Y?|PWRt024<{Dipkrs5t
z(aQKn#Ws%>O2>610L42LFbeW#)1Qwne44o}#tcqnp2$gZJllES4?8$zYLD~16^Mmn
zox?FwW8g-CD|wo^Y>4O`JrD=rIEQB|D+6tJX=#!PjMPe+KHz)s;=&-Vr-PJd7fs%F
zDcAC2*#Py2IYke?$N>$r8uZAYAAVwEiU~We@hw7#$#JDpV|PcjB;l$h6>zsI*XI~u
zE9NU6Ib-V_*9YUA9gjx>#T*W#^-M&(xpbf7Ncn96jBS1l`gT~mb6lv>I4LQDs*{dx
zJ~vvJV4XfA@ekZN)6)Aq`@EvahOoSiQz11!X(F`!lN8Hu@QQ$(B9t%$d&Sew!+5gy
z^eW+l{EIa-G^K$M11Bsay;r0*&t=cX!NP74WMv@Pem7MrC8%qV|Cjqw!rS(1jwMu_
z?GqzYH+IgJKROz<ncs2sKKth;hqZyd$1#(dw!-_;a7Y`%mtWuc<kYB1r9OQ*^`te_
zk^2i9VocK~^tI*-H%80v-^ImPIZoZsvkq3htIO~H-B;3s3_5>3SHmc2EjqvO1CV44
zG$hyf!P?sMVYMNtAVV5?<VOZhP%48s13QZq&Mjr#tUQxj=Mk#utG`<>N|}5}!G%%d
zW{L8N-Xt6==$8zZ1>Czos_Gk1j>8n<km1Q#C7x4o1!Wg+7U0m9n+_KKg!~hXlGpn5
zZX{AHxN1*wQ$CKcqcjyjHXmy74{a4-B~8+v1tkBz>y_47X8-LKRYYiHR-EloOUr*J
z^wofv{R@t>`-!{pL0Yw8%@`-8;8h=L*xYIgp{lQ(%1^w3CR+Im=Qaf%Ipe5>at5sh
zQYZflm=!VTizp?i$hd1s|DJ7dQmn^FC?jQj@3-A^2>6eSD}`1Ddv&ZGy;=$LCso+|
z!em>+QA+MshvKJ1Ye@!5oPzy}wPIvb3<od~DLqr!$24xSSt=%n3|<<XKkoVB2;Om7
znkYz286Z%|V5zfJdmgCo<mZp6U}e{xmlR<%T@svJxt$EY8gcBwW5}19C(58a8xaG5
z`AmMU!??>veaS>ttL@V8o}&EWhDjP;QsG~xj6x(dRl<0sy>_cSkn+WxM-Y#!fYt*C
zFP=mFq};N5BzaX+hr8V^3(mD|vD2A@9Bew!!@sl2LxzC_Hd36Zru;KUsvRREZ)R25
zElZ{;lT)a&ERboRCSw0$p%!@gWD~4I#BKM{J?K%n8w2Np?%}9WkTV3xpV>4_xSflj
zD~dl092X^W%k=W?xyj_E$fBHID!f+!$(%>+%aw5PRO^I?@Ec!`y(mwq{s&cGm=$a(
z8Xec?EDbuVUqk)&6TFYNWBeSFz{Eq}$}te_$?T+-sl+2irKhk78NO=Xtm=~h<K0^D
zl;horDUOw{e6dA#@9SBTTux03HF4sUd?q%gHd@FvJ{ewnceql;KUGvPd`RQE=!?j@
z-2-=-=qu=R5b9%_4sPeYrwDu*6OH}5OHotNNq;Vj31c``7$1M?jD$s$as3desb~@-
zeB*NuSg=kQW&b`Oe*ZuY{43m<KjSOHJy-{S^&2}Rb}s-~mmF2-1{P7~1MyZ1(Eqjg
z9d#gJ*vov?o=5K?s{)E4JHC)QCpNBfar=~l-|ZK6u3618<jnP!gRD!U8iiQ(iE%|O
z7<#RSczwJO0=@r)P6o6M><vbPe#bQxtu5`%i<;*LrE@?hf|i1~8v4B1AGMO?pR-d_
zLNi!Oic9+HcwEtSmpp}Xikr+mI{N$SX6KXrwamsAXK(OE<p%|(KLDsa{tXO{0{MPP
za<a2C2S*`t(fV4IY6YR%9q}8UI2_IHNny3Ldtau%G&B-_U2XAkdqA=dix&|MmC{-F
zF~ujB0rLyJL;uD5UPU<QzH8l;LgG|W6xHAYie|B#ty1P@lPjYs4Nbwa3$DH$K)W+h
zS)Y&tHvd;b__DP0PGX4#N1i-5ix)PF(MSz~GaZViGLj2lW5kf>TTK`XQ|XhW5C=%Q
zk{TB!pB0d|paB%}-10j1a$j`%1a(med!E$ZD~SpX^Ozajlop7?7Qm3v%EppKx$f_m
zF}a4rsY{>9Hi!{t0im4ZC2X)5G(8)~_~5x+A@1ykySP!(fM-$SXVl(5rD_M002G|q
zBEdwhoX5}V`~0W;>Ei`2yG;zM0R<7Q%n9H=`-#jQ=@f3&tN}l;_FuUU{$7a^(j8%v
zp|!FoKy5J<Jehmo){E)h4t0Kvpi}>vcl02?7Y|)BC4K;1GC54KAZ~sQ>YqP6U>I96
zUr{$c6CSf8@WI3rd|*QmN&{e^Pz?1*x#M_pp?bAhDo^_5@%A4vtFeYvDx}xZ>sL|1
z_jcF;5@k+_{y!kHNY-V$+V;;Y192gx%p(;3w>8;84_lDay6TQ~Kx}BJ<9gzTIQf}8
z1Q(E)09IC_d$8>h{1*vi37hzi9C?S>ryhsjWN<M%np0T+7rzMDeR5iTW`lsD$W(N7
zd6T)Xk_8Wyw$0mZDmmbWLkM6%A43z@j)@r^PUZ~dCBL%D$lVJbcefC;BY`oAgdwut
zKu!&=Wr7R3%Ty*3zPC5djry-#R+T)2Bfm8AIJNz7SsbKX^n1(m+oY32XRcvX4m(}T
z-zD6eYu3&rrQlu_!3AqA7MCliZK@|$`xB9=4y1_+<$4N@ChO^rY7$F->Iqjc{jP34
zfbp&8G9sIL^BFDxu0m7}c73zA+Bn!Wnbl%6gbF}ChX=(XSp(=!8dVs{fU|SPn#?)c
z2*-yo;VNzEah4{JO!t(iAdk9O7RL>c*!6c>^SBkHQ=WXS2F6!cXOwDDc7_}UUgVp4
zn2b8}%gKek1CDF0SH&(LQ;dRi@GnzJR9%4kjd2|;1y2{BE!9(DC>mnrIU^RkO{d=I
zFrzp}AXXI!49YHqFgX=HBRDTJ8jCIQ7-WvTGmGxJ--oI4x$RR9nH__md)ZE}PaB*D
zR<>xwTq54WScZ4*2Cj70s=GT_n=UT1r5c|<8*|`}k5YsefQ+edM~gV&(!9i#D|IKb
zX=l*Q(HL?eih{X{sq(m}M(HWM7K43ZhFn%FbM-uVg!j(O%64>I%r5cDv>Wfx+qS|?
z#%g6`VD65ujwN69H<F!bwJ}U3f`S;5=8UGcZmvJ6``Z9dovR`)WEv&cA9r6?>Cb&g
z4XqaLH-+i{TDz$DIq&^{?M2AyH#$^o=_EoLK^SuZ@)v}0h^!NRIS~2zsHkxtCikGx
zXR%9eZ?n>|550>{PxC=bHpB)R`UJT;cubY?zZ1T_KF5<!31PO}C1Q0a8ghPH(&?s>
z(nit!VTi?thK}x|m|3(rf<-SMiWrJo2EpG&OV3wlCj__b&%9CGq1r#1zd*74C(9>S
zsW;`P=M=q;@lENGMzp0E$QsYV%BoG<j1qDTw4(=98?fsMimCp$@cM%5h{)y+CM+3Z
z2OQ4dD5HK!%Tp;Y3~zqSZW+F@tYMcap_^rr7smx;)bej6v`{<NWie*{!=Qw{zE8u{
zh2S3A;2`cpju2S^#ZOqK->u~!ngP__%TznuYyj^6AkJY`!GkO^p_Pi$hH9G5)Z|%H
zom;wYZTtE+<FBg(s;h}QHCqj_tzIa)Elk8Tp-(&_Fu9li#-pMo@i5GzvEsk*DcCcy
z8K^-Xw%2w|=Th-Nskp)vnVHHZ?1GeLeLP4{uj|{Vt$J07;0BtcdJL!LC04~4B32I+
zvFa=|UDy~PgU1T1FmjF2T$JvGHq8LptD=t02&4G#*X}sj4-8kYX*>&G)YYRBq%Z7v
z(cp;83wv2|GVFDl?U8je&u;wbK=)l}x}s^~;GZ*si8xdvKpAnOPjFQ&H)|<~l7OZl
zJpFG+0Zrb-Rr?ByPY59VO<>N&;M2#0YVBB9N<mE{7-Rhl*0;{7&;OP0TzopexSl`m
z5A^BrC-YA&a2)A)&id(N1C74drdI;KO{Qq?(BgvdQ}R~|!#a<ET8p8yLWedys@0a$
zHDrm{XV)X`^aEO1)GtKsRMSjst(~1!$^>u8`KNX*+AiH(n_OvWAHNdhOdqo8Lw--d
zVLpHJOZQT**nP&#>Z+<(%ku?{Fa6ap-J2_5Y1eK}Q|7dMjK(ce{sLsfyOo|%p}YmK
zN{DJE!jj-LHA$Ab*ir1y(n?#77P8x6HGSt#N23-ONM?`#=kivH+hI#J7F?nN%hOu_
zjHdrZO){XRrcsI8S0TQ%ra}f(9OfKeN8M56!N3*GJ+HB+Jy=-UQ4zfSi26L-E{6HG
z@Uo(_p+Urf92FUP;cVdAmyUPx%D_znpfP%60>dN7SY5s`F0x5Tk|1q26(O^>VJ9uS
zH@h9=i451O>-bnLIffwAt5KT-18JeK!@M%EDa!noSJV<V@v;^2z{Rr+xsqCXxL!q5
zV|IC{EC<ejKBh!$E~C61fS1CK%aUc)9bF%WG;?_Pz;sfG+Y6QsB_kykBQjXGaqx*6
z@{`2SowB_q^}TrQGqHXEVAo*-$h&b3JL*#erHo;RK1}IDF6aJJMQ(;lkQVZO7ngh_
zo@)y@k>&ue&cHDDQHxTmo7RViV;Q=V+X#@~@z%o{+xo#hZ9bJPXVx&#l~r_Ts?&Pw
z-NgyK+=xD%RMu_+OF!$SfQat3wegg>>fg57E~9atciH0I!Ks_*?vM|<D~}eNR1-U9
zbu2vcu)e`md}rzsqoGo&ekA!0Pfhf3WjEN)rw4AT2-mf}=ol<rIPm-D2JXfcxvdha
z&a+&R6<wx-S9jpl5(#iVfL%Q|9c0_S2{6sTMQ64@9bPxJ`i`<&sm?tp?|gc7l83_e
zDIJ7^8+3PmLq@LzSAU2pqjD3B+CWg}kfb5{!N5y&E9*EmNB!?zyk{+cmyA7HVeCWf
zH1Tj^d`$A*BCD?+hwKs?RP@G@`O1i6h^qtJDD1d`QBOx=`XRMjvmX&QKzcuDIM$sb
zt+Vi-BTp`+t%}fm50FI0%xuK_N4YZl9&Gm>t4cPB$Uv!7NI{)m!@8CoCXYl?LGhqc
z3$OFHWSq>hVZ??qMt$T>V=!1*{63iY=@T&4_3D3w5)R9ygoa|U5Ajy>Zg!MEUe&(R
zjB<*C+LQtbt{u-V+>eHv!u&tgiv9LbC$7av0uXU!D{+;-oOBCW-7H(#4GL6OUaIh7
z^>C>7pUAA6hNLAG_Z8g%jET+T$!4#h<~4|WtT10P4fDN2!TZfG>3tTK&n497wrJ#e
zR7@+^cSH)+x1{USP@-UAW>yMS_$h;0RhP}5kPrdV7ujBA-6Wk(GN`HKS}Wn?wFf3E
z94}_^C-{++WP)M0EGNZWr5_aAGQii%Nz`4$yQsZwT!Q3+t|vrRiWY%IW+%&yPLvKu
zs05wY80`|;dU`r$zy0QQLJ+7~PAL6q^fyl727UcuW$kbiSw?1FEb4q6N5=|gsROzJ
zm7#(xQ>rgw;i#J3;U8p_G-AG>wDRTKsOHel;bg9jXRb*Dv9ulYl+~q+3^ZiD3#KBm
z<CQcFcVoD+o5t^#{aE$Gj=m#El8}6}6P^`+S1l>Atd<D#*golKo?I`JXQ|kHTUFc?
z&oz$;#Q0C`?P28`2}$U8EM<R_`KL_UQfSl>Pj2RGw^*Y>DiBp!QNj2#^2b)|ChOLr
zZ57kV{bugJT!cA1a?Ff|S%-2Sb-g@9IQhi4kjyx(6nT00bvv@F^642`x%f496}onc
zweQVVV}o(j&I(lD0ca^C+@EK^vu}`jl72$1a=6vriJt5*OvE_}#-SRFUSGqCzG681
zFcG7>pGyeVDWvicF1oaP-R&%WPDa-Qrz%7#TWja0<GhUXRgM=cj8A&<lqU^JLloJa
z?VcUMe*#8AWv==3SQ!qWTm3`vFo)gG<}dA1(4VrI!L%1bO^1w0d+)KrU;Ho}`qv;q
zw#sJ9aOmR3JJQ1ff4t?4M;Fq(mF(+!12@ATdhFFLTBn*{#$mJ++wNw?`=<peG<JW!
z!#XlgP0Z2#y($}bj<Dqx3{Ga;a$iV)%(p`J7t$WH`Zbzj6{PaTku=s2>n-ll%W(Rn
zwp$6H5)6YhHXJGg=>6R`%(a;8o+7ERFvRnKa5C7w#4yFGR-qp|?*67(+q#W2xYj5s
zMebj`;rS6U(U@#gG(Hpen%d&a8_GUF18pC+8ao5doU`tqjf7bnBV!10Hm5xDVBSHn
zp!g|lWoLr8;2oT4_nSxEXP1t}_qcgLtBS_>ej21koI&}9svkBs8_?YQ4ie?-J|9KI
zAzVL+q1TXyS@qzJ^JUA|%?hJbLdZZ~Av#NJ>r;GWRfS_n7lwo(Is!F%bv$<1i5kbN
zQaind7UY=L4lb7!t@kFCi~-PzM|kLcf(W$#n~4bjhkwnB?_xCC_^3mGklR&QOu#5%
z6>4~HWER}e!`s=*#GCje&wt=yBaKEM>6)J1%F01Vi0}5ebNfFXztUCO8an>x&nLZs
zK-^1*u_E1w&ua@H)G}I&1PXlCmukZzw_XbV+Q~I}j=B@Vy7*abjkYfU`Hy1=c!zfF
zc$dtwwI?l~F-Ym)X@Sb~fB*R>ohO=0n=ju=sP}sy%2*$@v&)3;sNTs&c2oR*b#=*O
z3M?d@G0e7TT^MS|KiFy4tsNX%^pUh|imB+qP5?urAE@g-`^dGxR4Tjh{K8v9w05{p
zH68p%4s@H?RN}HAWJh4#qzX3pgjkhx2p_gtP`7Hx)idSFML3`rf)7b_3aMBNU+#VG
znt;py#jSPHY#O-EzPV!ZVZ!Fv%XBdQ9=>w?p#+1=f*pA2!wzJnVn>CmymXL)RPZ8a
zmJHKboq6>I;XjE)5c^T@CNFe6T%U=0Z0>6f^*~FgtWVn+3-exixwsmZPT$(2`Xdsc
zLxH(^8P^`$bf^M>EdS9gPLjcC4d&z<k2-Jy72BkAhAFAcqZIbaew#3sN>sgUyP<|N
z1Ox>5z02i{ZW?)gdKc%i(xLFk1XU*J;)#6a4$5uDBhv6@q2|$#jgiSH3%s$$2O}Sm
z1?FA?%gu=<-D=T>bod%}U+DaYJ7I33u(Ts>OT*F4zEiIX-zJ%o!XxIa(t*l5Kj9<N
z&BY+uZ{ylsiRxEF7E!lB7sPFz+my)0JW22sSE4Yw4CHQ?l22^Tr-K^7T;@M<&2Pw@
zPtQ{ee=(h;^Rn>BX#AD6ks$N-1wmg(!1Dqr5oY;l`v5W&-Sg@qwDDlC5Bl(!SOB<>
z>c_`B33|1Y9U=8rV+&O<byP;$cv^o1r0diOW{$s0kPs7ZBe_}cl8+js3Lrar|CbTp
zO;xMd$1HkXk{#Nr;)h@E|BMO!5fR&;4dt93Ik6Z7h-MIwlk;=lDI`%X#GnV8f&}^$
zKLdb>;IcsM{Ls!QrDC<8RaJ$Oq02PBEMey#X}nT4@74OF=Z|kEZl^w0oFn*&#7+jc
z|J?UL+DL`M+j!UEi4dd514Tlmdu8JQRJ+0q!Sdit-N9g*VA&AHXoNzhLh4h9A{P!s
zfCBcqn%uC1t@GOM!Vb^}U|X4ObI&QPA`wQdsdlLo1jDfg;;j84Nx%Bc^eHCi{2M{=
z*K}UwjN#E<6si$Ioay1%XY^UN_*kGDNC=_E$aOC@E#Ii=={&aj#o_v=+<pH3)8{Jk
z#;KR9v4_f}#CGQ&&s|1d<kwQy-p;Wuy5q#%-(n`k2|)Tcm5JkIZ=27NL2}PRmXoQ~
zN^+_3SFsl5Rarh6=gFFZon8x7HRs&*usPl?_h;*3l6_y+e{mNlk^eHS`0|{t$-y-i
z;q$I&!OUph;rV?e<gM)QH)1T(GP1-{D<h)5;?#6luB$)(D6*JP=;tpIKh?eZqVlqF
zece-=$M(5Q^?D<s&d`LLP|L7jwWQIiJr;q4rH;nH{+*hcl3rSP(aJEfR)3nSd)uKf
z34kxH2`bn)=t`aPvKS}3Hy!-cJ^$>9v`yf{?%8xWq_=z8``p=LnxdLC@6RuWraPlU
z2jTQVABVR`%Xl-B1%*WO?}L9?e}t_9^^paB<#3cI2gt}IJL%lu!Wb%$WYn*}19GVA
zs2nogU*bt`7VcSI*zx=)ZfEuG@FY{Bc9QY?1MvJgcoH>~UJR)wcT2S!d$tM%RY?^4
zHzWU<J#6y+->!&rNrQ)6A<XB-ND~v`hMP|*k;v-NRn(>(W8FjR<`Y?Mg>CS0vw5BE
z@~n!?a~y2_JmE*AHM>1>jB_TcPjRnoukMy%m!EH9zH_0E6MZOg@!w%c;#L!ZCoCOS
zViGV`*KK#VGY*`*8bFqcPy`wLHxMHmXYmh>c(y`kEDh<NEN%5|?0V{e^+pJF5E35m
zY)}Q+$_kr!-Hv&>m1@F5V+6$ORDN^}rD`c&*2E4Q2$p>(%9p|bcF^;|I5Vo4y#C;!
zFxwoh(z@>)%*>n-rn{N~Mrl0tHl{I>3|LFl)E~3U%8OS|+c?AEr*fZe<|qS^0F^nB
z_*ZpiU4;F+o@4B^vhIhVZc3^_T@1KNmNq)9`*$q3041-xl9^V_<r!dxxj4WHn?vxY
z8C1+uw&ulj_0&qi5geMx+}(Zt2#0Hj;w~Z*k$D(cRImQa%QY}NYLJtKg|+|5r2F~l
zocrxP6;zLrvJ+s;zZR`5MxC!Roe|v%47vzlSz_aAm15)_jIu`53g>g`83*j0#<OyY
zI)hT{G<D~zzZknrwnohX6bN2|hW}&aW#nP|9xi8jFP1Fo>plL7i+}suX{8j*CUao(
zD0B|=r`YbKmipXeyMo6+dBsy;#;V))djl^Z=#Y}dAq_4B%d*?5TP>irw}^&R7=BWo
z`<de7(bzPvU8IDIOjQx|PQ$5$H{ijaZ$-9vSOZ*GM+8jeHKRTcQA`1faVlFcZ8R6@
zux2<i1;<B{FzOJ1Q>hYiQTM0j@W%BKC1RVgwL5@F)#J!m!<Nzv^pDCjau;}8QSt@J
z){?(bgV3nPrNt!}Sa@<X4-^>aQPS71y|^qQ&R{FA<$rReTMexa-ctG}W@mc|Su8If
zFYIkF_ZPu!q#_Gg?sxPDZxDlMUGso{!zU7z0`J#{hZ$*i5j_aiHrk}r%-^iNxL;aQ
z37nsK{+r5t!&TU9yH<sbXHX&G4~JCfJi}?Ezskg9<o<FGPgB!;DQ=wpX;^b(MYB<^
z_4{{&S_s}6#!r)oo&-EzPyz{G1sbD}(jw7(U!PAOV-B5OO%{wm_><wI{P&{k^|W4|
z*rb8L+Vsx@_9V(OUs}&r;7i#C=<YfURT+UM*Zb%sro~DCNl{dsL!UPQYbn1Sf#o$L
zV3?ptSqY}Jz5G1PM=48s=b#rw02bg9ZXO=|SyRCjgU!seSOe%!IE7jxlaek;0uMt6
z6ZJk&Ig&4PF$FnR>bq|;TR+Q{DNQ`6w?ND}6ML=;68jtC?7JahQqdmIi}vRuYCgNt
zg!(ph-of9WZ)=zkTd~&po6Wp)Z49>~71p!A3*NWIJ`t|EbgKHkBxOy9Z&Lpy);Ah#
zPob|8L+vgeJBHLj0X2^6hqg#$RnOFQo~J8aUo0777-rud_5RM}%ts|-lG&~`2FX0~
zo%d{1D%3KcIzr?%3tGQM;0X^ZQnC;y92SoPr;2sH6hm-TO?e%+Sr;lWD=I4Tk{Pg;
z&2?+kPs5XqT9545j0AgFMJN)6Z8D0}{j})0hC4>RSp)Aa1(rRe-%2cmeXL}{#*>{t
z(XUnMCuPT=Icv|t*4@6gS@>DDJ=NTk-*ycwy$fe}b9q4^;tug?yGJ`B*qofhU@j9D
z;_omu>jqO~Rx%_A^NBoPCB<a_2s*!!o5BNu4$}KR@3e(z>hp6l<7Ictx78j>$o*;R
zYHNRbQqa)MPw(!}H<Z76ZLhlIwSKty%17D?r&>3{w|0{ApPh9?oDaDT{+4;x;=3q3
zHmj37!V%|V!LKszGJ^x1#w`+Z=r=c1pycuE`poNy?Jzpds8PKSpgbB#Z?*kkmojb%
zGj8M>q{!T_TXbjxCZS%k@&d_AD)CwW{l5DL-F)F+AGlgp)UEaN>Z-4ZjQMJAPD5M&
zy{4+FLb5Qs;LBwKnSs*0CRY5h$kY=hcG^f0bF{oImB0rh8o2`NdF}FG@AdilcD?X}
zSr=-sCYn+#GYaa@ogULtOpNs39#|<V*{(h!Lf$={t|3%=V^m*)3NDjp_-UUt>Tt&C
z9{PoXiDQltF?=sgkY7inNzgJ=h7l#7M)V5NVXu8o5b{gtqLa$Jo!xsgqN5_CKLwJN
zG*;K1ycI^G-c&EXIgdp-f%~kYL~8`|0qRA|bL)-L$eFQqY|Z($5C49Q!L&(P-@P;#
z3Hi{!rvAQ$dd!hyuxXpNeJ>G+kh*!w`20HT5~@=Am|O{c3fzecL)EMPZi0^X*=NX2
zm!5%8KR_hV?7ucXUz$wd(Z(vC$joi&^yAPMCmB6you!g1v4B^(lYEY;q@eAl@N}S(
z`V2G2XR6|FoINLb_@ZC5Z35)v^duPcnvo9NJL<QEx0r8IqA&D0;xXm(L-C-2Kg=Qv
z3VbvZaRJ0B4i0lFFI3V|$^Yyp7?pAox0Gs}!`9R^AQEan9;H*#`ii9KwT5{Y?wU(3
z3lVfozG2kpv&*N#{?MfU1Lagt^~~7(FgFMOiY>#44M@Zc6-^!#=PMZJD;_5SR-eSg
zu;N@AzUPiNMt?TB1OkF>p9FFtADo@@%F&>j2m8TMYdz(%zj(Yq7ME>KM0a`uMpHtA
zxH%Lhw|!uU^ogb~%a+R8x2AYJp%b)@hrx%<@!wX&-3ouXwq>!ndOZjw)9dd#(b3Tf
zlR=p#r>E5cP97ds^!`#5YA)PYY7T)P(Kj|9Tt?>p29k;qvKe+i^PH=zI&OzD=09^f
ztrfln|0hi};h8Z0P+Mra7+bPFh5xo{aZIa3yAt8~tIO{s_^_*Gm5k$KWU;qvoA|{1
zsYBT?U@>#uS&~+9sM0UsJ|z|EUfZ*F?QbzrQoQ`ZuqH!LW1<g$Hq}T-M5tVkZf-$)
za5dHSLZj8mR$th6P5jmwcZ^3)e8oN+D!yFEIbT29RsD}Z98`-#O!3^A>;FWh_}z9n
z3#nJ8n-ABlbIIGrS8uy>H0rN|El#)HtKGC^llGBNUG?TR*&_N}1oiWx)0~GuYM0D2
zOSkJrv&YokPsCpcNjns<tIw%=#%q|Y7Wb8RkMqe^Nj*~jMt*@(&g$CpCcUxMsECMN
z`n2QCMMXE*(u^>97i)PVhS%FWJ}i}@5hJI&FQx79_y21Cjd_#?Gbw2Djr8E<0$Eu!
zNTbCPD0foR^;FBw7z@)!yG&pJR^3XMa#jhOorR882~^|wS+Io}EDYMZy4O!BL7#~e
zrm|`Rn4?)aHa}&eg?t1^RAK~2$-AjyDiLNCgx}-dejC?`^o;H)zO3=RO?uNT#lZI%
z@TYB{q401MKfN&R01qzG8VYW6&j?<o+_g9dwl0Q8eyb2c2kkfu<TBA5<=|g=93~f*
z?Ov$2nwd)%n!0*yTm_c3e0hNP*O=yq+0|aVI>z1zY)pV_eQi0Lv*}v-p4yPir0~4@
z+?><#Uw`NRxzP3Bj7OnGAC2b2XuAR~5&&haDo@iW?vTN+ecf>?k#)+H^zH6c$g9s1
zHXly6#j|4$Ia$hIc<rPCi6W=@bhY(c48?l&XFfYH*X+v^=6W#xO`eF47vz_sXyVdR
z8B+?xcA?6we|Sho?V2)Bz#R#kHYF*GyX<h3rO|ElsLG3e-Bb*H;p$cIXIvV05ldIv
z=M%`CRY>SCd)?ckr`Ml3*tN8wg?kQ0tmz_X&dgEe&=ADx`g77%^L3%%P1?uYxp_sa
zG&<TcA30g!V6g-*(*M_0Is>%|Zr74lv$kLR+WBzeQ&_lZau#^)XLwY6n)q~sRSZGo
zO8X|b=De`oSzCL+qBkp)cAdkOF%(l;OEgM+ep`Ew_J=L&NkU{~Y-lZwurLqK-sX`X
z%{I!hCGTWK852p+cHl`;R(_iKgYfLG08HHPw)6Lquw;VHmvt{5Wil%Q_DA;rdb<jV
zV6HC$bj^O}b`SoBWN)|u2(X|}5Dj)_mCy+mG1&=g)pm*#A;^4T#C`0v`c`KiYb`3e
z%()m62C-3?Ei+|i9R+U-8tXS^`HH-I-z_Z=z0%!jA}oC(X=07ChO7zJ479&ePc2E+
zi&jw{75NABm*u7O`lNRG_sGaHrUyC(m3F8#l6q4GymR;c-$I$OH0~C=!`@GITTco9
zhQ<O%czG2;N<XdJ!x<pKAb^B*)*=wFinhu|W}~W0OWKc5fV1Tr4d=YmuJSWmVH3f*
z#dfAsP}zaot?=gzD+MYH^C4VT1g}T&DhEzG*>;-dUWVl-yaVEUZvHi}0*+4DPtrkN
z=?Bgmo{Xjf^uockJjnnZx&l4jwA5ZaJslnHn%xX<hTX^yV3a;0Uq^4-O;n%#Og&>L
zN;frj)#V^*&nCaw{})>v>1qooXW#FW^De@gj{eT>M=7emaneG|&<WP{X>+R>)VW*n
zODt&Z3PQy4HYR1z#hC&1hv|Iqub0LpG$aCd{&dx^EMpwHXI_mvycHKlbkGtMklkh`
ztFpc*EUdwp;^NC-E+4J1fO?>a%!1;T4hn9X*~$zru~qT0qlmEZ12SE;ac**>zu*;b
zIC@BlH01Jj(eJ*`?)ZI3XGp%PG5a-II^{b<0GoY2P~8^AS@CPRq1LcE>k$O{Ar>{K
zgp(-*Sxw7Z+md{($Lt+4S)wjqI3w-r*0$KsKL}!<Ih2Nq!LVhYETT*}l>HemFu@il
znsRuEmwpvZrl;Mz6d!rQvq*yc@wd7|<4uc1vSrZFNJ{!sNchF(!%)n$e&rh8l{mdQ
z3oACAhJQm@nKM~8=1Dn}LO+^2q~J*~_s55VUROHovzsoz`%@{R%bHvvuU&Gy`wQ;#
z?9)t{9%ci8YrK~K&rnf=gqF1_2SZD!C>shYCUSMwS~2RUI9lJ4q^%qd-R`+&G$c{|
zyj$95w-%A#`5ZuxES3Fth7-Ss3A(khpN&A;5!nz78U16uvQMi#=TSdwsk-QfjxLGU
zR+)ElDc)GtUjG>LuXezD{pL5Dx=!n(CI*ZWRM8`5NUKY+$`F3qcF#8zOGWDjPkUz1
zUb^82_K44eJNe$QNV0G;muRZbJ>wC_u3hM2-0R1?^Vn4FJOP(o;lV6n$~^dkldgN?
zTg~Jk?lk<nS*6PE{n?`eKizv5uHI&>kAA11yR2dFAepc1Fu@zxtT%YH<9u>s3k~&F
zf-6{;6uHAGUMdG5pN!gR!Z1$HghW_M2pKUkew2M%3-1?>Xy%o<Z)4x?s1DpKVx_i+
z=IF)e|KJgwG4KJCL<s@YmPWAB?V%{bJ(SlfjY<~k9~)uNrUy}G+_4kF!lIb!FQyH=
zClC4i`VF50<YeT8NnDY6Wf#$YC}4Qu)8s7igSx=iSdHO6&fXbl>_0Dhw;hYSh*^bn
z@9cb>$_=8g?hkyP;D(!7Uc*`N6Ms+uK$EFQ7&0jYZ}Yz-t&vRRz7HQ{>h7_h|6cmu
zEvVFe0D&%tD0M#uS_F2-UUl5+YM{B;|DD~qavGu;d!O;wdcH?4Zp0OZ7X1|~bYh`&
zUA6)sJqNFzV$6)x$i%#RrngLHAO`v9l$<_O>KzC^+u`3sESF(yhttO2F550ediumW
z1TEQgj)PppIR$y7SiRWWljUNiN?n$AyNxm_FUY;Kz2QiI!%$mif?IozS}tS1jnrlm
zgG5QyKju5$4D+%^Qz{dQxlja6LqjfE2H4Rjh<KQfv@i(?O0UOnenLagaaq>Ms#DMn
z_9uX@-eToqZGOW%;-E@%v4U1|J$ke&53qaqORt6?WjVI3tbSGQF<gm{{cO5;H(92M
z2AsGi8h~5b`l@@^FR^Q5E2;2Bpzk(0(|Zb?<WD9mE(I;^4`OK<8EJ9a*dS334u>=#
z1^}D`C!4Z!)tVjpR#9`Onmq4I&xJ3hf5)X9hbTwcfk}KXBSTMrA)^5<Wy7NNrwTsk
zw~0ua!u^;nwT}y+Yb7P23Z%?Pw=wq-eDq3DV`2}(ls1lGs;6|6ZJPi3=2Izkc2!6N
zLpHzO9yI_d*JbS8h+#wDC8I|fLtiI#jS=(NC5f~P;OeMqU%9X>8oth{r4>a`HPh*k
z_qf&)g<A<(X=`T=5m-_nVQO?lk|nC?G~UBQ<O2Fr&HZVE?fGsc+sZkd9$Z<RDWf##
zqAeP_i?a4X=I@4IPp6u+v@#l~|8y{jd*Kuuj;?n3l$R55wOgJX+jTw3m`_FPzcWZH
zw<+y7L&J*)B9OOjq9p@Z4Sm}KsFr^CgW7v=PYN(YQe+g{R@J!XpF6r|F^MNgVP#kL
z@Wwzg=D1@vB=CxkP1&0A_$S?iq@~#(USE$j48-#|mSs<BZpoS4tmp)C-O2l9AuvO3
zOE+if0Pa6DlrOxU-{4va$za5D1gJxRs>a6dQp>i1%NnOZA)OEPY7hOf6jvB3uwV5v
zl)Ynf2=Vc+!DzIDo!FMaVUjK`X4DP5omP2KR?d0He5jRV!rq&kF2o;&V~sd@F;E3w
z0hTbsf|8fiWL$YjnZ4$}%F29q-+>m-ZFIR-p;muSwd%s`^SIbFze0v^3C&I>oP0~(
z1Yek!VJ63G#4&RXOSPm)ywJ_eqY+Z}9u7k=a!8bz9#W1aQhapul?4u9DFm&UP17Ly
zP@C{95RHM%Q%KB>mQW!5S|}EaAt7xZ9hgXm49MI+O>owUwMn7Fc652ud|gg(HdG_&
zGrYCLK$-(?()C)Jt9kAE)=DVg1hfT&A~CA=($y8nvJfxw=Q+OO03DRkbT1Ba7t1uD
zwEo3Urdt9?HNV~-F8U{qVN&8_TWX_Z<!1Ej-$!oEBri+<wd*~agG|QxGjz=T&!;Oc
zi^FAUa;EM2GJbc)kP}bS<s`?=(#{n-(a_PlD-J`S11!Vrsf)Rm+e)MwQIK7%CE=Vm
za2|omE@ofX&1%q)jLXZz;@l7VL-D%Dy9Pa?*!aNrBs|GdaFf};r@k<M-kx+eMl((B
zuKYJ5D#qJ#Rj#A(m(KrAwR}N_y}rDVTE`B`{`b{C`}o&_SHd5v%T6)@hW=0kjV&li
zl+TLH^XhDh)9>Dm)&QjZDT}i)$wm3O9Dj`NiIkadTr<C{+pI(5Apus*>CvNCdBe)J
zIojPsUo^7W6kuwN(q*wHKuaelI+ZQoEZA(0DsH|liY;=TJHNx9frR+iv>+jZ+)Osy
z1wly~Hm`*UN>`T(?$c3LTH0LIjKb~x`TPXwn%M{?N?AO#TeJf(JMLCBVW8_4BcXrf
zKm!;y!xMvId`v0`!IljV-2&(sjsN)i;^U)#<R^@e&m}03%R%@k^`{({H0EOZ;bAaN
zqg$AVho+Cc&y|!voB_~}2wWLSmXXm<($$s^h|pbm{#baxznJ{pN}$HQ8znzB{wXwq
z)_!yk1yxE6yP|?sS>8WTMAUHwZzn$}a4Zdgpx8Dx>RW$wMa@;r>s|7aZEvMYf|IA2
zRWs}@HEAQB@lb1-nP4hV4fll||G>@VQ?8=xaOlXpR`0dBYEVOb^@5Zy8CfM_rQ}wG
z3K>SprC0P5*n2VJz~Cm<l!C+B>aq}Sn(GS)eNAIisuRa$<w%QbQ7_j2GoZ-0f!sB<
z!tf!pO)e|tS@+a#_>Xu`V*7O>gpd@qRggqQMs7z$>S4@0GG&W%Lv!R|R@0X4{l9yG
zWB?TgMYp!vtG(e3=Cg=XzXQ&0B&%zF|BkKIb+HSl(Xon*S{+sc9K_%)f*0)JJ3lo@
zp-H-c^UYY6peZtpoOjzg27pQnhrXK{r9w7IqK89Sl8YC}&qRa$gK?49DtDRbCr>^c
zws1Ski-ZgUb`EQcmW+K)Y$r+<W{*kqIMMyn$W7SJpIY!&4%t*zyOqMk?UGBf?gzsT
zFQ+*Ka6-ijhvCCkM1DYc!^OuhJF*h@$iC58T}XS;6b5*OcbW(h6$U7EIjXIsU%dTo
zV?G-Qz-btY=J&%Cum$KZa%18Fd;P>*i;95f_mJRZMwgzKr-X#x*C$IZhgdv)t>1*a
zvB2ItCU?(Www=R78wpUSznwOiEq?d=2XGJ9SMlWiK4D?>^r@-;{BW?f6`Fe(eOWF=
zN`}u7r{>Ev49P&<ZU+n1X8)9i&t~8<Z;jfU?BJ3q>@~K05>@4O+=~+wbkQfLrpEgF
zwhlE6v^6v6g6Jq2+9vD0vYrEbcA9Jwa%kq9IwoM_#TX0#S2m?inYnhYaVW?$ymWWi
z8l63>r+IrA|LVziSFtXI$^==z9W;6JG8LDc!)Z5e`luA92B^C@GQda^$PDz*obc1v
zHDDsSGb7zv5<CAN0PH{$ze?f6vYb0<F5ao0Nir;#?kE4dcki~ZLF1sJh3~v0fg?9}
z_im8~5mToQG$BQ`fyDfr^7&by5d7(m<K6j_Pd6g%{c)maH;sIHpGq>TF|PV9DBxC7
zWMp_afUAA`rcI%-UGjCWUZ@Uy!wu-k!dU<QUAsafZPzY79)Ra|OB0&t6(0oLhweId
z47IejZQHpMf<8b0&>?8FWo6~%Mh1QI>1M4P)sHEU1lb_~tnl!tC}^s=xvRcLXGYx*
zo;^D+Uzn^u`l;{CqTiM*0Qr+qlM@M@vaZllx#lq-Yvx^t-HSp#^&PwU2V0t+3;|0b
z-05^q7ai?Jgw70EE%qlHVYpJmSjKlH7`Ap{GO?w}Fy4R$vP`aQ_2ht#a0bz6m`a4n
z1+XNFB6?+FUuC7ogYeGEiIo#EKls#rUembvH-YOO%fx6Rp$;07hz^><8J*~K4v2hy
z9o~$Ohw1I+n+Fa=?Ie$<qy)e@d-e-2AmMD?Wrq$mdX{TuFGvCDAINXmUua;{;9G&m
zLjtKZjRkx$m_<PJiO&hty-;XO#&K!T5|p6M4$`O+3{Xg})t#L_i>kY3VB%tbHNLNU
z^<<xwrcE2nM`nKe_RU|yb6(h^eS0JbCL~;N0rEjEyR1*2W-l^!{nJBo01TrKUbYq`
zSpN36q05mNIdI_l?*Tv?-caXBlpHB8E`J2iedvx8V=5=0(_h~02p-s2XXnnN9g!Ea
zX%nLAR$ubnRp?xp*XGb6n5GC&g7R+UcfMR2soXQ&ZfI(ekx@}GPsmL7y0Lhkh}i%R
z<bl9gnUj;7`|TBsEnTvF@TTuSctBsnwzK1tCjI~a5-j>H$nt^w$w-!2pE3mryP7Q{
zqhZ77CyK|T#75x*g%2pr1M58q&`zDsJFm+-jICe4cI~>$gEEj&n<$g9OE10Tl0n%p
zk>uyYB(Zht_U$N>4L!hN*y5>_3C2Be;Lsrm5#<9334vg1(4c;Om~P_Y>ehuu5E?3N
z|42iVD_d!Ls-EKa3!qB2+mXqv`dZl1WVkRgCuBkzR=QPH6&2X_`=V#h_HQtD^~Q@X
zihEj>TuHOdor?~FNAK}?WJa`%Vj@C9q$s(;w^*x_rbHB6hMhi(D6Dk({H{!gLniLY
zsG=HS$0GASWQO#C$Z_CVg0F+a_Ds>s+$qnGj+RkVNXG*}#KqOABg0!|(ZjGX8IBtk
z7BW*tf61sSxYF&iM|uY4gV_Z8NRT}uf*U4EUkOZH0Pe$wWzoc4Hyt=|>H&n!dOWC^
z6^PCvA4#fRmMTeC`6tqeZWlGmL{M?649mv%iiASUJ0>PN8t<DlDCC*L)CNPBjB1nn
zSFT*Y{)Zm`9Ltt&{EkCOC3=*%YL#~)XJz7~{QTeYZ^xpaPnHJqC!zTI2?<%5jriIV
zi-M%2=;)9T{Gr;@x%|mc=g|rgnuYAYAO&De<C0v7`;(N@lLT2{93w$ZU3DfOh&)1h
z8>CkR=W$3Mi1dYUePF70TJU&5E88Fqz~zzxD>^zZu3<yQ1}yEou+CgnK7GN0ci;Ws
z1IG5>cIp%a8azG0;lzQFQe-t=6^>k!ATG)ID}5m33}z|8PGNXRu!09XVSiYbD-!}1
zVYaw0T+euabz`HV;6$%qKPCo1fqZfqb}KWwqaTlmKq4PSQ2`)u2bW9ccaX1w0Eq-X
zMNj4B9X}4>T)%$jP6P?O`|k3=`$sYM^2>`BZQst=haaw30h81E^;@@MK~Pd!k?5IR
z`?+hIz-oRUk&knrcoa3vT5v+tTC-*_g`pEAOi>)YA3>sKe*VFO&|FX>4D&%@8Rg&N
zz_E1MvW*)tEb}9M(*lmOi>xr-KMOhepP)TOx21ch9V>9TBK{TrEE*FzhVhm0bi?!n
z0i1&Rwp^e#b-fHzPiSc9h|r_L1hZ1V1c_hBB^P13B7C+gR0?*!!kl5)!Y>y<kibNL
z4m5BQndoUU6P=HLM9gOrn;<8~uSk;4avh~864)|5ivz_9|1i-vWQJ!F#usTF960<_
z*_YnsB4eF}e=o+Bkh6@>2<D$$DY(0KZPhCFNydh*==Kph&{bEJ4Ld%Dv6-PS)L*)c
zu`P=aT?-RW<P}jZp~+|~wUsiO%1HQ2HKL`K+cIq;bDU*rMn-ucpF<@4+0$*o`w^y#
z1iu`<21oEgk}bo|H3@$P6XgX_%pQR3{gN$1sgue}d|%^wpRd|sL&kP#h08yTzt<VQ
zQqglg8NDndkPBZ^ylqGo=DEqXTsz5Bow0%XQe?JQf9zYL4-!B*1@Eh>$|&)IYQ4#L
z9<7&ckD9Oj4f}m|6r0So$pBfycO_~Z<M)uDBfNrzu5(Ryh9IF3H3$$E93nKH@PiSv
z-Ip@vUc&*K!gV>odHees=mR+bMU*C%^+fd7$%!W?8Wja5iQ~sa6xdMB&vd21?SJ*)
z!Q<yK_WJ0z-^xinaDeL@I@8CF%{!8_!t!;TePo%i&T<kBo-+IN(K3CNCvR9e%#r4^
zpO~qowQt|CW9QCtWeS^iUfzKN2X0p;h_-FpwL>rNjvYI7YWF&0ix+?T=@<QiGphL}
z4gD+<5-$2ot$1^CR;)mHC7Ei3DJv)wy`bRKDU4rKR9FZT77ROx+M$f&R;`-9j4)ng
zx=YiK-wzWMHE{AL$pp6W*)cJ)PehOji=Th(wS#kz8Q-^Wr%tE^Mb7_B*W9^pzRB3y
zk$d-wm3(w$qyP*fW1Pc48UctY^V{yA+EHmL@sW;`3CmnM1T}5}7#O!^M!5ngnQ_kV
zkWnLpUAC4@qfGvqndrzk7h$zVr@ufe+BBKLZZoReQlM?{xH4>+!jI{*ygqcMbcR!u
zRsH%h;jl@Qdh-x9=61WYWHg?Pf`UGS>j6->+wtRt<3w2Q$-+Wtwk6|BN}yqgTD+;j
ziG=cgj&vh)K3!HhMujZg@A1)3o%-OOlJTb+oSIeKwcVR}hjZ2?rXD%+JN^k-^gobg
z!a7T-Ngj$Ha?vKzuIJC!lKmM~Pituq=Md;3Z@?)N`J}zMriqFKjLPGv8D48tP~rjv
zg~^qvgjSM7!Nn7?b-NMo6?_~*-q1kg{Zr^Z_yE%tnX+W#C+SpG(MR&%)~(}TKpFP|
z1G;p9^Opqs=YkN{dhm9fi4q;ASCvA}ZZ)Hz`6W}rqS_Z6O;$S!N{##9qonkJ!HvR_
zgM$Ks0%^}^`ZJFv!<f%_hS)Y~QolX`qDPMo9bnqKZu5{FIM4t2&&w|B)QPd-!+ZCJ
zsi|}4R;}Qhih3;k(VD;^0sQ#!Q>OqJo37b*BTQguQH<h+=wpa*U24Q-o&^yW4AA^g
zydP!oSFBjKZr3ixIB+~!-225BE#UZbkOd%TDQUe~2Nw6h1ETn>cEJTK#p{KW94=l7
zAks$wvrNrDbV`RaGK!7PbT#2coGAn=qNI%IC=qQ#c_YDq6f6o6_NhXFSs;Nd=>Dc~
zQ?iL0`5Q_6MpI>?U~oD3;VXOgjDKDM$1*{Tefi~@HK=g~=R2IzxC3<#^onRMe-Z`G
z28Suv2q#XV*|S<<#=-yA6!|ru<0psP>LQf2#u+u^muk-t_pLuaCI(e*yLD^V4w~7}
zp*?#dKjZ4F2Mub|hOztZz4qF!?;;#`=umtfFraH!07%1UVq@Lz;8-sS6f`<o)FLB)
z?b<C{@E(^fTeS*dv>P^T*|KjR*CfZ6j1O*X6_{O0&8I*}1m1uB`f+gpCiG*(JeMt7
zz8o6s7oUH&`0G_Z7_2xw+vs%f#-g*2EFZ{OM)8dj24u|`HOgMk{+ump#ti?7(!D!3
zsN?9fhiazbv%|8&KISXFHnvu<owF8tbNywUp=t1Oz*!A}%Jq+rP_0(1aK{@y2bglQ
z<;uOJq~!JT|6siE2BA-JfY|B&I|M~VSI=iveC4kX)pMCFWs=5>d=X}tXj~6S0WN?b
zQx+;m_^a@pr0c_Mx>1TmL|;{T5RPjbV$X%<RPT=1d=y9g>*is@+P}qEtGgR+3oT{r
z)mPtG^=@abdGuMo9!}Ylw^mGu<RiN;4IQp8<>L<V=V&=h)W8x(|7F_J>J$M;Q?yj6
zK~;-zV(F{UIL?UHNGT4H;cW{<d+8$j2(eCZdgHldK8(YG0`^X)a|GU-E5@->Mx!}I
zG@2vBF&&>nhP$qFtmWGgAz!;L#`hvM!mzHPcRJ^ZO#JskXR6X4&P;wMK99JkqchxZ
zFcy7##1+WTK^rYm3MJlgDSRsS6}Ager59;@Len!EH&tp?ef@)l=5Ud$Eme_-_jzpX
z$@|ME@co|`kA!Ad`cQc}wk4$%6*%r+?q3E7aAeqyX@$xJB{a?yyg&Yp!9;ekY#<de
z+nt55+~}*KZh)o}byZaBh{t5K7fftriDhK~oZJ;FSANR@?1PRU7UgOyR)~Hb{s)Wl
zj^yMfPTH~KH~WLJ=vO7n2XdBBeBFe8Su>h6aYQ;oZO**BurN)-iV;DPNa%v03O<X*
z|B8=q`XWpiJ$hVtA!9rK#`#86x!rT?o_}B@X^Lvqs&#9uRQvbu_eHNos6M;ky!S6q
z_k&GcWF|k?s1a7OEnA`&Ai_V<Et{`g?>uq@rA<UfLc_N}Q9&}CH$NX4(a<B1Ka7Mi
zT;HZm%U56vhie~#8ezDyw{>|r68&1XZ1rmE){M=WlUP1tgbH(gzw3t|e%h0<$D`kQ
z2fm!}aID9JqN7r^RKvHB9^CJOoXNorn(!~>#gi|B3x0>;YY6~_@EwFojf+Z(V4W@U
zXJ&Dvo&jLxXUtU9g{dS-#B3BT;m02h3v<a}g;4BAbzF=mN}0HVYFdTJ@k3|Gk|ijb
z4nQg_EEUf76Jv@WgfHvJJtyu*DHr&f5N%aZP*{j9Uk*$K;0upTYH%qQ>5IYW!M++*
za;0YVU-@mS_t5Oc_~#owgHk5-=GUF4ejlRv<y8D0jvP61k4)4AaL{|7`{cZ*KKx+Q
zCfOmdYu8`>55%J1g)9x^Y@raCs)h_fO;c%tC@ZU(`7KROTps-gf(fQ9*}w>0rNwcb
z?Za07fs6hORl;d4qMDrVIX{pBU1o-BOll<_Pi3WNuId;FaVHxk1;TjKWuy=pNysTI
zJI3Kk@_7V&AxT0&>s%{g@=S~?o$Oa!F*paddM-x$Vm`+NG4^Ti6~h34VFyA#u^Gk~
zX(BU#0{_r+rmJ}%>P(14n{0+kraQQZ#eTnR1<U7d1Ut+9D)U-y5zH&^S6wZ_YNv%{
zLQs3d{4?cMvMMmH#(OBAP&G*uD?D16jC>1x8zP!5Gvr>p_woszow6a8yer-dJ{P}L
zQQ^Ib1IE}>rz*ZtHL0{k_La831F+d}+u@qdci9=x#$@@(TB}0wR_OUClsU*$mx||z
zi$j$wnWuwoojNfw&@k-1Y|q%|sq+z(f%zZ&=fQ)AM)Tjx6pzPKssL&3+^3&L-VL%j
zm~Z;@pYaQ~=qx152XdB>W3BTUhksZuB8-k7|1ak`WK<L-%%QTB$#yUP1$>Ci^b|cw
zG>+mV1-?Nj9g-r;vqJ#ld<eimHb_cP8(CJ{a<8J9<VqIsB1@J83dRfDK34WvkvD7B
zyg8h$!*Y8qYWZ(fdgM(`Z@-Ovj+6JxGJ9r{z!mIqsNuVS_^jovQ2!-_eu|t6<|&F5
z8a19|u|kgr=aiIGRA5_FR91%PICSUnvCs(i?mc`M8q}^`2M$2f+OlQ$ZfIuTUb$^M
zR_2>F?b?Nm?F}2YZ->ix&Du?y4&8zCe)s{UKX5*d@7k4@2hEOa6!(`tRQox8QVEpP
zoS{55@~u;G$oO~^en$dkkB<<A*ST|t4)Cd<))f)}DeA5wQHJI2-o1A(oao!O?bv}l
z68^iGfX;$Pj}{c*xu1G!{(J!(2-?-3c}9fgPR2K9(Vv+t4df3_@eNT$HzC0>$p1j$
z!?$KfH;ZZ<H5&r0s0iVd0f#kWf>IcBcL@)7cazR;fQ?wCrWohlMviTfnO=xLe7^9V
z3V|3C6TJp2&ayIT!=_Rjm1%IJ%M4<%-*Acx0h2CQ=olIrh!n^&C67!@2+x(p1bsdL
z0$lPDNuuLjXc*UIX3ZKmZsbS+NTWtL@4KrwzsT6Mf6Pl<@-pUGRwjHXA8DyJbRe|p
zY4)Hdx|Anj)AVHNG}mno1H!}#A2Twdu(Z=Sxi$IbaGl+BB&c*`?fseopM3OmJ?MVe
zBY=}JJ$Q~p{BAO@1wNJ<-!xrq3%XbEbc4@QncNK<%BZVWpEda)wi*AuTvNY(bZ1#L
z7vF$)kMA4p6As*e^<PRE|DxQy?4rVsmK~p1Je338`W+h&?gVg`mBI8#(RsFOZK>KW
zzAe<!v=W)2j_aOn_<W;9-TBgDAzQ$*Z@Voop997O3oy<#vH;|dPLL=1J@>$}50Mr6
zpRh1@ec4D!_8bqa`Gr;>8Xql^z5@s{QQL{)We&*mAp#)CAt)$(7Gb}nffxyaDaQTn
zG8zk{d;?s;F!TX`AbKg-ltp<MD6WTbsraGPYZ!YdZq&3vgBWYxT$XdE>p$uF)qwTu
z89TYSbbZxDET~tu7Br*4ELl(vd5X+OU}@4cBu!5?yG=vFoddp<>1sTz#6>1~rqQF^
zX%85_g7Y#IkkA)GcQZOx*vMpLnh)lR)xV8QY6d_g+hsUzngTxp1-!4=*vQ9G+_8SU
zx^)2zv9VE6h@xt6dEL4QDroWo2aLy6!zeNw0uZ!krKwSBP==<7t{!|IhwnOZyd)7m
zi{r;pQUvAsv4E(&s!Fu_wH4dagF6{wTv_8wzV6)ND_3sb3{7dr4rG=KK=a>yL^O7q
zWC6#yN)~|pK`FjL!bMq`&6)}6q+NHN)2XGFCkp55+hGe-2@o>{_j53WWeWbO8Com%
zh!PkRD=T55aNXu|IYuiu5>Z(Yfay{IqR)iPNS7;Y8Z&s@nl+@<C-R9v;9c-RhYl$A
zchL)7x-`94o&TvI#x`8F^QPlt`HsbGJqupF)5<+v%t*{$I)MX2$joY{*;$Z=BHlu(
zIuGy{oFM3OIcJJq+^&!a5e;PkFZJn&h(HRQbfyCcMbwn2ZRLE|@q+NxoKGf0?3XZ!
zC@K5-Hm(uGJQ+PFteq72&<I2JxYol-?!3))wOurfl3~{<0Ro_K+$;Ncp!QUa4uQk?
zlRZVxL`CamXfmFsw6wBPw3t13>{zh?iW4WG@$Gv*KmX)Lu7OOhs`74EK?hXa(w1fu
zK+Dok|DERME+6{+_l)h?xqEwFPo#$8Te<sg4jj3OldR0~bDb;z`GXNv(`8+li`kz3
zP*16zdh!9g-R+LK)SW7#d5(m16f64v!r5)Cl=WpSTMY1!6trAG^b{gITk9|Ow~`qc
zLhz<3ASt`B?2|G8Q*U=~cZHmT0FG=uK~#=S)`#f196)AOWR-`?8c+y7<(kbzA8J-j
z<7;Y}SCA%G)s%=R=Mh~JH32JpXe7<}ihA11_Z%4<%UIDkFk_1reflX90YCaUXZbcR
z;10c5cvN4*$4%1w2v?;Je{7J3&|>D-`0SR8`KL16&nCl1`D_PaKR>=)%T>`ws49%-
zh2|qx`{|lp7Ejdea4Y*=Y?TOO4$+5;^PQU026uC&mWj_I`sz^;ttF}v+h^J`QMx3|
z9de0_17dhY*jgmah0X|_5$G(4;)k!go4T%H%pDd|&-tjx{YZx9!3FqW=x$Zjo&ga4
zo)nJ<+oGcKM*z?z-<B>ycywvD=kuz5(gy(zs=SwHqL%|iY0nDr-pd}TsKEJElO<$T
zS9zz1&VFfHnr%l=>6Ho&NL<6P<IWNs(gF(zJ|Eu_?-C#Xo_B2B{=)vYMtOXgv~K!-
z=Z<mSDcVFW&i2=bF4Ri2?e-JT-k4XMb1ZQ-H8-~CTqi4x_YX$#P0*{ne}DeX*qI|Y
zSJz8QHf>_8?d$E{Xy2Z(W-qmT1;y)@ERh-5M53x}DpvSC7hU)XU*TWWyLb2QjD7Xh
zmtW@O@RcYhm>yKeJ-L$Y-o0nfZXbwJ7H)*2uH__(+ZhHU)Pj=EaJgcQijv+9kB5t{
zDMAdTI;RJh`cMgqSdq7F+q!k*#*97pTypZ?{)Uya*9)J@lboJ<3W<Q<eFt9-3@g&~
z6DZwb3oa>w4u7Inm1a+OWSq7Hhz!3?r&26I`_qgPBI&_J5e-d^k6N=NiF{590-%yD
z>N*M=HkT@?St11`RA^jNDU&o=lEj`~Gptt4SCm#sQ>9hp{p`kd<}h8lPD_#RjiSvc
zj9E5*qWyIKp+iTGz-hl`&8k(Ku8}5D<csi4b!kaurCzO9`#cE=1*g_-cw*k#wZHve
zf<<QoSy5PjG}8HZV!Q4-h}z(Fp34;~@&|s5ly5{*AR&x~H$^K|R#r@aK!-t$GR<Z9
zuQGkfYoy5p>s{Fa(C5QSn4IcnXE97Nu;D-ccw*wU*UAznSeXka`BmsIv3)y$1D1Gm
zI5N$y#$1!ttk00+om{hIiQ2E5p1)>v6El?v393V@oByq`Ke^_3wJ3#-n;LDUoObrQ
zI%>{Iuh}oeTmt1ZPaL$TVnVt2ezDvD47~sTd+%XEv3m8&mEV1b@6$8s#QpsHudc2t
zI_2}}K7?D}aDxRL7X1{mOjv(35<ZWMFV^*{s^CgN5bUtQlXLS-6mVASMkCP_!xwR@
z61>6r6Yzl`G0pv?+Z$3X6WeefIN7U2nQxU>A;&iw2qmKh6BA)k`b_2jAQRTCS>wn5
z<u8mOs{porDth>3|D2pPBN_W)!QnyPLp6LgfyW0?I4u(X0`XEo&#9dDDlSS7xbu~d
zM1UtmJx0k;&k=~=QUcu;9Mx4@Fb8{%j69i?;Qgj(D+PpUbRC5Zi|cIW@r}FIxGLyq
zV3zE(#D5gY$gkPHb?3H&cc3-yzJ2gm_@>E<1OCr_pCTL^zaF{u`HTe$1!MF1j2&BW
za_#yj<|yAreB*?^S((FEF<8OugLCB9uy?O)`1In7`SCDm{aDjli~g)+0m$!6TMmFj
zX0TFln>LpWzxSR+pLFWPbeX|T6h1O63+2iED_Euu4Phz&|A3%@k_EH!7G<xNw-%Yn
z!vG|<VcK-t5OKzC{6oFWHBr7p^leBi-@#azCv0BWX5lP8i45xE@x=>EKZcJ%AEFP1
zK+}co+&h&kAgIrptuNCN?Udu4DvK@JGGX%R@K&2Ps9DwV->qM*&sV;OkAnHi_ks^U
zgjiZKZT&Zg|IV*pz-nYW5b;mKS5sD2HOU<*c8Rj_-urwHYMF@n@+SogS44ver}$C(
zyD;rI?sGhV_W*O3KUI{4@1`Y);DVvT;cS%L5Wosk(0f|8e<0tEWjVIN@;Eb&OCN}A
z+$2nd@|}s&A=*2(`x#%!YxilIeTX#K$ri04GaS?T`*_&)uy>*WPQP9*oY<4$%MgaA
z90|bi&%iS!z#&COk!i2k25SrWcAqvxmSmCl^H1|XkM~gWaOpSrzDgb{DuR<7X?>!V
z?;^k7Yjg(mUN66C@m+t#CZog)hlx~exioFL(0D4<nJU7(FSc!Peq7i!>SXi_b*{eW
z_15EVx%QQ}QuOHX=<yL5^`F^t-R4cZ?Z@sBiGl3?LVZ2k!H&Q4js+YRfh-@$?@XIF
zfnR-<dB9Vrj=1{naqlkLzhBqO%h9QgX!t7h2IK-ivAi7Nv@2HR<iHdWpcH9zsz1Nc
zb7(6ylGDW(Gq!Hs+O=pEx^w4_9lLJ9i8Xx$F>}xr93@K{H%9ThiVDPA!A72c$Kkt#
z55Vv_Q0WWGjh4m~csd}6&Og6P7nC4*=9y{J;OjWS2?=s934$-?yYEE!=)FY`LUXaD
zfm!X0YK?pyHj(d9S?Tp+e9t7logu@LwX|T<nKbpG{gr2u_?!gI2`g<9Z#6W7p!)?H
zOr^-@b7j{4esG@5y#Mb+^Jgq*T;uN4^3^PEPq#l1{g#62UBUY~<RnQS3i*Iw5)344
zrrK<HKk%J6g7UvPfM#O;tzK>O8WJ^|HjR%*{}e=*K{G@#d*Q3G%TgwIZ+Kttyt8oO
zQUH&Sd71B;Yw`}G(bN0y|M;7*=v*R81Noh3^G5KMSISTA+jqVYeBeNnCcS%)8B_aw
zY9T8uHxHkAT;z?zL;<lRJLa9K0J}7rR8Ns5O{yEo5+)>gMLr3Ib{f|O=S5(J4#8FT
z8DuI*lhxH%%ky#Hw*<+~c*xW~dbF?*nu?a9iBvgV3!Vkdj7edhVrWQq_)eTo09sg`
zkdSKr+_rjrVx_R%`~480fIA3C&!np9p-+hGLs&iav;Z9RI>(B?YKpvv6xcxk#N=~}
zmAtNi=hvVhpbP*pg<Z>*xE!z$lwfx{!()N~B2$}bdxoKLn2Xg_<59SAoAWq8v}LU2
z$d<1(>=Wcfzr?m$<hiWY+ENff@O;o$Fl;uypQA_NR7YQ!RWMkgL!dryo&_8h{Wr1z
z<Ts{GN5GvrvC-hyTC+yrC;P<LOX!`I-uz{ql}y>ZOPrb#e4Wb`lId6}N{Sq+?kILG
zXCs16$QI1X%Vj1xvO9#pPPH|_N?*TTf0}I<f<@Zo4O5nfi)XCd|Bt<^fU~OF`up6P
zo&kmqNfQwiqy!1Y0`(c7&-NMEQqnL%hbW>LFMQVXGoJBmFu*1ii;(UZVtVG*`SySB
zv(CQv+<PVvkT~oA)6J=U&OP_eT6?v>VPH(Kk*JC*S_o+iUHRZN;q$|?mX^`UkU9^Z
zbW_7db)IBw?tt8!o7ZzjG&6Y`s@87U2rxFkU`g)wCMe>#=R*;0Y($B1!Lv~MB>0SO
zAt<Cl$|#+}dTI+`%F%PE`7J+#@7E9(42J9G_jifbv06yvZ=?v*npQ7$ri*K2u4lP`
zxj<?#MoE(H5QKr+!EPzJQlJP^QH~KFynw$EyqAT1Y$#u)%ZPF^qMdS#dB(v66$k`m
zxNHu;Vu5%sJz1}a`3#d&>de%>3EzwTUkcNhW^^(H^^yWZn#`o>ieDwJ_gu)qpEsj@
zjUUn3BynoO6y&EQO-o*kAPWAezKm`}B^L<3&Ayi2)uN-|OjKh|o}M@b;l&v((`Tjr
zld<&2($Z0DEIB!O8mjyvAr#SJA9tR2-XgByeb(*M`HQB_>mmimv}BPWI8x{!4mo5?
zjtT1s)6YKvbLPlC9$eQ50k_<8>17W*@X^OunHQG){OgM^TCcnMr~dunl-_d3=FQu;
z!!)&sQ|$c2ST4DwZ(mfi-7#>-j$QX~jpy2*e){>^$dzwI+3p<lZ)nf}rZ23&u>yyw
z42g@-P-Jg()u|Bk=W2rwAXco;w_WF-&IQ_fLFh#ef(hi?Zwm`0ql)aME*Pw4w2F;b
ziBpC<f`)OvcM^5%GddpTQl~$8eq<x7$eLE7*Lrqj7_JdE>x%9i81eaYjKsRA=ZSo-
zcpV8bpE-XVh7JRr>?}z4HBErB<De^gzv^VD8J!2^an$fdP(x;B?Kv5<7^_pK)|~Xm
zqzMX9ZmFrV1#MCi7Ys?Vs&3@-yK>}v^pBCj6$d!Mck<3V@4ffcSB(Ai<BA{Gtp4Bs
zxWM>w_=qd7JPbd1hmK=%G>{`q;d_9KzhzGg7{)3QZ^i%2d-SloPBZ#G`2B&K1GiUx
zALt?Qm6*<7#;#&NMV>(kf0Cb;KQ4<ViWaZ3!4w6~j#XEn*dAwLwHQ19v<|IKe%Yv<
zHJY*a1TnU1)z+=JFXc~I31!uVMgd>S#MnFwN*r|i+>@k@Umo{O@%coV^Hi@F<<Y5D
z6AU<_Uj}-0&t)uOiZtnf?HWDYUt#|cwYyG{#S-P`#!+Dc8&TdA8kcXfx4CDMnwJ=G
zK|x`m{5(>S2-BWOaP-uZW#BauB(BJE@vcVhXFN5z0BD}j#FL4zW?9{qYhSN3t`Q_n
zPd*3vG|9=boV(X6!>5z_CiO-wv*Z~`(-S+%=M}%3u-@DCN<<Z5Ci8fZwSqh54=N}?
zW2ggz3$`FJl#Bloe4qP!=MRD)FZ-fw6ijr>Il;HKZR?iJyLS5hT;m8Z*Jvj((4m7O
zM}Qn5TCoi1+gEo3C;vyIu+%WHZ=Vd`ZQk7Odi2%9$~tso==ae2%I{ZPTvP<c!LsEF
zS-(2^c!cLcn2yTJ%Vz{qWXTT62xW0b<6may!pW0|47r-m<vzvLjMZiAzpuZ`ff5?K
zc41}v%P$)@$}myM;38J+27`5Hd9uYZkM53q9^*VD*um5@$>q@|8htEWM#3Hv1t-fy
zKd^s14>5ecJrSlKE*PeGr>N2*=-ZJn877_NWF$&rMUVZ|;3=h3@;iwyF_tzfrK9Zo
zAq5MLV#Erc`hj2@{}-mFfv)RC!XMHsbL3l!6d?L-x~{dy%AbpXvy{dZ_*8mWq{m6s
ztRl}#ASpamn<9FU?}sT8Vbj>3KM1X$L=@H|5NHJj#l?8fs5ORd_N}%=`x);^Tcd4=
z@PXvGN}%y9zHHHVE3fDC?%BO-|2}@DxNHCZTX!t{Zuld=eo*-@${~kh$q^ujmFmu2
zx(I08SPG68J_(Nt3tPIVbp$6hI<@IyCCK#QXP+$u$t|%nxpG_!MOf)1Z&S}kz5~XF
zD`L+hlg|GA`yWQBkQ!R8t7={)j%4T=bdDHA)Rx{uWAG{X-DPEEVA#_=9^o_5S&wi?
zl=r^6#$$Zp9DeAbzx;qkRE--$16h7Kz}UinEjjJ?&W!!=__}pqaME>egsaNC83}h`
z;WiJCXI~-=IFO@%sS6X1WRd8yA)>E3l$W_X^5-bztQqy63=@o}t#?xS`~36o^Gx)9
zBN)Bt{70Gc-ut}&E#><YrzJj=@SR}vQlPxT&*S@3wkJ<dx<t0zg-M9dG7$nH@&1I1
zz26F7gXkP6!f_GiIzfmASp&<^OrXi3yuEPB_h6!UjOz>6mo9u?S?CSOkB=-b5AyFf
z+>vFWxMA6QT!j281i@J0zz>Gc7YUr@{(11Fl$S%q2n}OA@;J&L@OKS%<Da{S)?4~=
zWH_<wH+KU~nzrtCxz&EtbjDo04FQ(LWG;(XI4p0xw8iR2{r<cLyLayY<hkdVABn0n
zQ@8F}xN!I*n;gO6&>td4fE*S|dlY?LUF@>OVsMS@Eg5^}<>4#<d2Ilqlve({a~o&6
z5FGPQJI!v!(D=}2ShKqCbl>GNqNCUn`zJVXAb;?I!CZi_S_^BvAQ;V+nqlEK>&a#_
zINwDJ+Hh`I3&UBQ7zh|)wqHWPJoRc$%^Po&34tkh%e(_bZN2mEN1eao4F3CbSAAc!
zGtviOO~jKaaC}QMZZ6jATx>0jJWD<iLkrcM@E3xiW@-4G<3dvKgu^-ddHnfG10zD8
ziC*n4*9bn(U~PyImYd@~hd=i~_r1mB>v%wz@HV?o=lfr9|4vaz;{1NvRf6GWbIqm!
z-~YMmVlCG&rE!L@b#;A39sS%_8>Y6OjCrpIo7SeeZ!|QfHGJ%)Eq2|+_b=whH;R@2
zukIFxujd|d-QOZhpz!y5nyWzUFEZ{kQX37yVU%7$wcp<2MafM09JauClcMGr7i@`e
zuBWGGWWd>8zjfWZ2x<t84-X7CLw}ArbKZD^pIu+CsfQ-}L}$Q}IS*F$%XP@1>X1!d
zt3!W`diVZ^po|RZEI;*BVzA+GbSC-p|Nh^HKm9sv7|zlxA(oL88W$W#c>^}3Goq-p
z6vhp4T`(|K=4;4Ic6mIakVlp(6Cyj~A$qIhhi%_(`4aksq^812Yi5!Qk`0vhJrp@p
zOu=(AJKK6j#m^s`*=?3bx11Mmo=B&<xi33<-st%wKRt_I>O_xr+M6e5Rq(u){i>u%
z^!=>o&~a!=c<=S=*Q*DO@2t04w{G<cV;5f7t5@gFYV6XbLkBdBO`DaPig4T~I3b8Z
z59=X4{M~nKJ1b&)rzgk0DTf^T<K$={hnQ-w0IpcprX08;Kqf2Z6JVi_0KPK)4q&XX
zq`2Ha_7;&Po-oCJUjOL8JbzcdAbn6fE1q-ON^profRuOf&kJykAz>q5vraKO5e|{(
zNXD!!KsYM&0&FMF^i4+C>rHE~Jil{eE{OhKx)r9OFM0x8VOg-~QaEAP`*xlbnvQ2q
znw)g8jE<6Fy3(hDqKDGt5)rio&EQg3FBiYgJ=1l8mT34!jI4N&E626e1Jlh6Em`Yr
z6gd=Ox9+dpj|v7pUCzhn*Q9Smgva*Mmbx$H8cMftqCQy_BXm!9ErKa3=m~jXB7zt+
z1bDUxAYPy`XgrwN{gpIf;e7Z^WTKs0B-$Y?81s21x+lOimik=Ej6@Wjd`7E_O!TB_
zveXQ+b)e}a-0iy)VYQxbd@l>r*hJ|=@xASR(Dx#r|D%-mlJOoUx+lVU&ks(3sVw!P
zw6Bvo@$081BqW@R4D{eQJa=JXNlGc-zhl_Wfq5T_{w$)8$L`&E_e0ZMwDbFSe*5>f
zRw84(#o+(x%h?9D{_W4VHCVWH__M*%>i&)$a;Pfggz+9yy6L7H1_QHaKR5uWRf{x^
zWI=F#g3yr<#Ms?;Pnv|Py1RGp+b5%jWc6JuUGP<(J{NGtnm@R(5YFnQOTYg<UKp>H
znl^3mVyl;g?S3Sxt?u0`dyGe9War3?a2Q+QBp)&2`s*1x_x&?oYw{1q-fROf_R~*m
z)*!R|+i!pUb^m@aJf9CMWQ=e!n@(H9gav(voZNDhPIPEOf{_|gP}mkxR9?xr6Q=kk
z!|9zkHE}AUttgsGY;y*iG9!69oZ++|B^pKf^l8b-c%I}L$;o)0#6&r7%5=G%Jj3vP
z7y`n)AHN%-yTHgJO<d};P}s2CC-bzqKpG?e6&Neyq{!J#&TtfA7sms^agj}<aJD<w
zm?uX%!{G$a&)>fv0zdBo1llsT|KS4%@H-LZ)kDmzDold$_utp7L9MH8Teoi6vpXd6
z#aXy(*R8vd_~#Tsbm+*CW5PNl1S>RX>eN#|0DP0E(;t~sC<-Yw7Kpr7xtl8@s)CEk
zOjSAGybhV>V<aP&0!r>TN5i1fvuBqsty`nK`>Cg*{Q8zV0Tkuiym{+Z2&|18!KlIb
z1Y;cIAC0h3zrU;ujL+|v8Sqq_iHbVHAcmDPdZ8O7N5V22T#m%ZN#KZaQlx;8`+bvT
zNe*nuC@PsBfyTW?RMlh%7*ze0*U8a0g#=Z!;GpO(AxCqS;2=g%Vgw8y`|!LN(eV#s
zaGZ3C<5OZp&vcmnP$V7EQ)_SBczfRcj4fOC^UoVL;Qg&wv2Gp8@GtDO{7Qs9fArDU
zUo-aQmtTLqd^rU4Z@;bP8q3amcHV>Q@V2PqWaRg`j1%UOf`h+tJa4#ve@AdQ^k<M`
z!a5{0W{j+2+o(~;xj=rXT##gBk!9HZV*n*sz|g895U8pu=YzSPYJ6+xM2Ff?obBqU
z^#sO=>tV_PgW?Q$3ijWB|Ba9L7^r+Szx4+g`{ndqJu(JDgDEWBwk;wNFI&zZ)>Pb;
z{J&(lrKQqmq7wJySo}!Qu;NElEv!9z)Nzs5@mJpscpeCbgeg*Uk$D$fL%LDa?s`0J
zqYB3*&Boi;x59T5AHViY^sH8S8?~RTSresJQfEp{WbfYmd@y)Q-1BsBe<9|7mwk$H
z>sDFPL-kD|fi3ed_Uy^agN6_u&l<z2?Vja&filda`j_<KPy7oX*YMA|IU->&$5m*A
zB{O$aYhFoIA;3FT3eMWKGc(}>`EBpYm0S387Z&6nC@$i<pwKw_^>YM=Lw_bY0^}e`
zGQf@<YqbR)d8EU9ATT;J9msfm_ikw_@_MByg*1?|&H!gXs{tc_L4FH&RaAp1FecP3
za2{;)zROZBGj`gh9V+4iWS$?jkrG@X?R$Q|;e0J$3;|L)A~>9}zx<`oq_fZFjC-xj
zuUK~zz*okuB{SEqLnErqPwjs=c3wS8?*V3~<!WZ>aZx7T&}fY0MHb;SCc{vcaec0_
z*T`3pW56Hy5-WKwF24*7S3VSNs8)dYSELnfEt$ZgiY^)rmDU&;;Hy0Dh|(bojHss%
z%}n$hBN{5#@Xe&5S~1`L0X`6_)=Qd+$c&$$wsEz%4kE3GSP0~b2S=$FQRSE;TYTys
zqU6dn-y)dE5)<JTXDn@X>dcg-d~BK4B4r6ob4gR-Ye`8?o{>C_v08m<_RN^iSosHh
zp)rcFFBU9Z_`_cq`}Ngd&R+lNTWwe&`;PtNuI*b37A_w?4x-K>hyFZr1js>BrWd$>
zcfB!y+db?tAe2p-1!*9uf+7US#{g$A%>cA|O`S>AUMmtH{?TQh_~-HYYNgCc%{Aux
zA~veaN`W!{dFA{%Pm(vqD?2}Avr<v|Lih~+^5X?=MDc7d*uEVlQr_zTFt#$VrKOuc
zKif}nN0O17!MP~t9xs|I+t}-(J|1TLlo8yk=ZHLo98I2y=rfI(f<(_Y!hEy!g(6Qy
zGp@|mq`?(Og@9nx@`^-IwqcNUiLh6sLCW$bVjCQvo<{}`=<>cUeSr|f8W(62#eFn!
zK91o$H-F-6`T3c=P85}NPvSbn1&r0LSEnvCgqp8rybMhzy?uJSwAUG{x2WF5b)Vwz
z`O@U?;IlC^?MJvj@H~V(AWaA~_KN!zXd?TkA2?9J1<3L%f4XM%^^Cng;k_B(q1M?Y
z{I0+K```L9_9}b-uIsl=5l->3_TRWe4jnmi1js>B%9}v%-e(EoFVYM6d?+{~N{-wD
zsPI=JE5j$7JxF8}+YmWZ$+v>i7cj|`mrLJ+9f{6?NK~6HO-+c+f(hrIdv3bv!V9HI
z3k>mdL2&Apm4Tt{d#GRtiY!7uk|jXMRAmYj$zw^NXz~6PdEEXPm4jN2?rh_LEBY+b
zWx_JikwunG*Hk$21lc&sxGKx&RG7>6Pl$dFS;|F<A@@YL7snbjs9QHP(=eg&_uIUA
z)28qV!2pKu3CjTlKcxLNZD#5W{w!H~HkFqbKCV!N^WBK5!+v~A@B!_(dC!I&cQUs7
z>)qe)T`ux<@=-AW21R`SA7A}x*XA2Th^5lm?m>e@jjB;kKFJ!`zdwf@`m@LpAO}U4
zTv9U(H2!Cw3juVk03{}p20{sUv`vhkoap*10HU#yldIBiA~+VJfR9gvGBJ{AtTF+D
zzJVx)SW;3lv4}I=GtM~WlqO9WyWoOOom#bGY}=gx7Z@D@##XG@xw8RhR_=>jE@&jl
z$*HL|YDC!Z$)}OdX6t<A&C*x~hgp+Jkx{tB@L`zISWmg@X#BeJRDT*ur<k>+TylQ*
zYz}0Y*K*hLOjMd1zwRjyzs_CHRa-_&krP~AU+c6Qr=&OI8r`|+XCohij@Q4u_O~@Z
z7GbfM!RelyEQ=4KGL<kL6(vtgTEPYRsD!EBzo=*`szC);ws4yB{Zc^4{h_R|h@vVf
zDKCe~4Y6^u#7JQw1oWQ!_dQrJ7|~Sw9!8k0=<w(lCa|AnG*xs@^rf88vmV(SdU$Rf
zLvZXrsGp}p4jmzK1W2{$s;k-vdh0FHJX)O$BqkOLQW^)Du!upp1<92twH5_qI{D;A
zjbQrt>@&{9E3jynk18uGAIZmBe0&0$iwpxUDw1Krb`%_o0_}|5a6`YVx^`vkiYt2d
zJo8MIF!<5OpUnHb2V?U(|8{k<hUYIU+qjW4)`awQ2o7TGBtYnMc$2(d4`;-_44==J
zuEKJuxFJ=EB~1zIckEA|o_toqX>e*MO-H$Lik70<Rrpj13ovpG-~v^fDsc)wV=-g-
zLyC$@&Qp32LJ;sgMIV;ETh0Y?Nt4osvQ?{m@B0h$2bB&->)ySi3dgAZJ9g~ZgZIrf
zvR8vb^C}!#_@+EAo#9kHmjoPD<29Y(t%YEm;C?^48n00W_)d=P;`&lonF<HaKTt3P
z-~alh>(=FQfgv;v{pqJ!5n9A@jiUga{`{2|H~jS%piv{aHN?p5$<1wjCJ@=n(jkWq
zA2|Y~O5}E@rvW)RCkbM#Nkbq!P6`6o1T$<m8{iE3M?eV*V%Q{LNHal<kjxO5(Mxs|
z7{f&Y!eXBY&I!$tVX0NoTx!(F$VlNU^1gk$cRziVy8my27~AO1n++ol1jqhC>bm0M
zf*}X^cF6&9R!2uuv7P*?ZJa@Fb>+G?$^DX%G8QRtsK+`vk^MdW7X+4w_wha~`H_s*
z%uA7sIyW+^Nt?u<<3D2M{)9+8WEO_)lFup1q~|Klgq@{*<NAT`U*yWwepAs`ra;Ki
z4!DMhd4<JHh4Sh;naCou%$0$TiA;3yElyxeMWM;-kyQiddEL47pFsye(?oUiPb+?T
z0CjWGdE>8ZxTf*d@R6zqxgGtI4e%$r8W=J}{(kPgmj!@+{mwiGa0G`#N0yvCkSfu&
z*S2U0v}uzeh%@F)z%_vc0SO2a7-YgC!9u1OI*+caQA1XH1yxky0|{!FhvuV|er0s-
zxoz4sYpMhXX-dllp~dXJhbl6GRYtJ|Ork#r@;{`Br=URg@Gc)!`T9C~9!sEW+|nuJ
zABo%>Um(YpI*BYv5;dpg`;et%<iC+;4`ETaZk;-{YcqDrDXm(;B-p7_=gu8EFm~DE
z%P#HJOWqCN(`TQ3{`oJz&`g61wr;DM;4q)(YGC?wQG1h(83RL?9`4^?3Jxp<9CGN$
zlOsSXr24CxPXnH+ea7p6V&Dz_1B5@L?XnR-gwJCPpw9P9@Q4x^fw6!RG<Bb<H5<LG
zag|IQi%*;j&ldt@EZ0SXa)mDQ2|N=$6JyU$oGLS~d*^l@dGg7~UjQ-op&*3k?tKs%
zLEf1K1+mqcnAzblmJH*Oc}&&Pie%W4wYIF+i<Ntpbc#og;^-G<&8e)Y*|TKSm)SEs
z_D(%0teJ8t<mccs^<b8YU&i~H#8~ZXGBaVSJL#mx|EOOd&4pXN-0XSATEB6|Ysld5
z*s(*0wr??Z{`uYJckIa6Mc-U_VYhCK^;*y?yX!p0TE5h(70yqcnKlzXm92Mf*|K*p
zW3Oy|b>OG#16}7mIsd7puRQsr;QOJ@okdZ@5zjpr@6Cc%ECHH6|5Fk$E%B#+0l)sr
zIs(0OWcB8@Z?|a+EL&zbk3$X}335zWHk9!KaKm%$-T^Y7%-9Gpwy6kUtl^`8>jLt1
zP=X+78nkT+kVya+1ZM%9p?v}{=AG=Gh$tTKt?q37OPnA7c>;mpr$&Cn55gHA3W-c_
z-{izSiBlOXWkno{{<itrYrAyepW}y=C7vr7d;8<JKYs6R^u8`Egim4R%FTZhn#W3X
zPmgm$5+Fw75)zE2DQkfdMr$@Uq4VVB5wTbl*ek<y!Nzl#?0cSV>^1(QklnBmZY-+t
zX3H>NJtsQ67khP06)DV^m9{*sA7kka(`ThWV-z7gjgN_SFUUNPj~nVfjd0sq57)RG
zjh#YU_*K{P_gORC7xRXCi^jdItSk@+@rA;He;jxYn%bJ3>(?WJvY;UUn!;6#<##QZ
z4^2vRNaRnnzkUAuSP<mp?LDphOR+GRhwrKG12z83){Xh}!&y&k@7H`*dfRPn$F&`0
zAE>?JN1#t1x%KK&{d*v@l*;|<-vDi&Yb$8e^>*_(<j|2MM}XK+W<JoZTOC27cwHHy
zY%*&BvY-b7H?2MnDxMhX1t?P%HDn5o16WK|U25c1R22VtV8X(EtRoCrFo8iB;Mz0K
zJngi`jTvjxrd6xDbs5_%NcOS7^RHXCZ=Y;irRykBayTh&IBzA_)T>v&eqH{)PwLS4
zoO;j5C@#FWMn5)OTKjy)8sFF8jyiLdAgf=$P92yOS(d(Cw6uL#zYYS5O0Mv?)E)bg
zKVI|*V;eSX*#b>0KfkC5C0Mq8y1jQ^9>SLQy^9R<q9VCJ(upoRBg$>ei*e)nty|%o
z5A62)%Z=a(T$h@XoW%5n3!myXX6;o2-@mu*`CM>xiWM9`eh-{<k}R_M_~X(vb=6ho
z38K*$8T)R$v0Zy$)ti6#OL54dLr9JQv7xm6K$k95ii9%DJ9h%|^JTtA&6;eafT?M4
z=9MED*yn)qJ&<N%R_Fa(z@(Ivq$CkdWG6tz%W&LK&Cr}sretIgAXL){u46cn`|B6w
zwfSD%cdH=AwrwjeMt(zaaeh9wsi<K}N?KaRW2!2y+2L=JcM?ova7{yNpjukgnNLJb
z85!0ndPw^*;yfxtPSIEtrIoZJ@wP<HCL8D0f40^f8Ez|UQyI}s54rDf-EAb=MHyJR
zym(oT#v2LaI0}y-3N7!~yu2c=DQx&?%a)zXpfN~6uw%!LfqUP<0>J;YzjYj^eQz!x
z5H?(BRP{B31*D+ZyZ68We6I-4B@>-6QI`8h7YyO=IS?9$-tlL)KJ}D_4OXnk&Kfwd
z+j;N2bKd!#yPn%=<x1=K_`?#Q=K|Sa?8A;ygG)-1ng*SvkCy`E#+7Hc2i|l9heJmt
zIReB&-Y&qHF-<QA>enx<1@IN?&48|-`6iH&5n2RrHr5H?4C+RJ|LK1Yh!P^BQG?3=
z9{^#f0N?HkL<kat8a1ldI{6nc#La)xWT(OGNDT$zBLvgc>~JO;K8gH}al+g)8VtVE
z>FwTb#u;ag>r%gmZGTrDz}U*tb=`OJ=iHRBbEm9^>zU}yMpfJN4A}mClYM<WKEdEG
z@=O(pgA={{`sBsQmnQze&wDO;N#fJ0KSk2C#HsMDr1necoA?4hz9jil2w46!qBvsW
zRN29gi?=MJ*r4#)l$Hjw%XL%}F1Wv#Z*TT*>$kH%-c$K#Xl`(=!xU6{dfB@H{@%)-
zFCT^dMZ-#l!$gQ6X8(M~N`{w=Kv{E<SUFB;1~WvI*cn=m`!g<hmbv~Xqp*zVu^d;a
z`z0~zE|EztO=nzv8?W*AQC?Kmm0iI1=d)g-qu_}0a?vSpRM|+}H#9CZ4%!|0s37KW
z-*ay~bAO{mef)(3yPVQ7_1$;dEjZ=+I?q2|vq!IP-MgH(aN*L`K*AJO0Q}`gtut`>
z((qW|>W<6{z-wZV5F}i1Tns$4ul)mnBRCv7y2&Z$9z|!I(Nxf{zxEM?Uf&?bL=aYs
z_3JOW6ll>R2{nv3!z~^TFt%C{qHsXUS>0R^YEFR|o0ADJ)@vc4?)=U>UwwuAi+A4n
z_+vyzfkj4YBgl-F32>R2i29*oi2L^K*#pgJ$dKDM^x%T4R;|=W-CQ&HNDzOnzwW#T
znnd0M#g8CC4;}2F8BiE3f@Ni1gS-!EG!O`2l%9#`h=GJT*@K(%LP|%Jjwl-`s{L}r
z4ae1}2w_wLVz#DHpAc&}u2It}$7tP}OUI3H+Z@ugta%r5UL!m=SBCG>{*vK-Ki(Sz
z0|Xxtg-xU3R?#q_;f0_{SWSzFxkDNLi!SQYrDaRT`t|GDwP{l>D7z*;;9c=i$6gsd
ze((HmN3H+>O6EyKK~z5Y^5yb=q0rI=02d4?z`O5C!9c!^I3zR=k$KK>`|TY%0WZCD
z@V{Y)96EC3XdnhjU+~>`Hx#5Yy(xO>`T+o#cC@L=RSHCyune+>^O{a*gF&*M0w&e0
znU*H|YIwcS46xpf6d>X8d^$LnpWuw|NicNT7o=&^MvWj4>ej6>2sM|M2~zhxFsQUN
zB|-X3{9%;N*tZWhf0G`vc_9z*|L%`?KU#FAxi&@{jTWqCUWh?<rAzF6AThzqaf5ed
zu@d7*MDa$^Ujqr6!^%dc&BXT*9*<xJqHu9&oG2sD_ajRJ?*W<xz764-fEM_OIzJ;L
zJskq0Q>V6Vk*0U&o&EZqe!4OVqGC;gPuB~F_zPIWtZeOHLU8n5vIywgS9B`Y9)DcU
z)~Z#sX(|qdfIIIzw=>`f4u_5{as-H=x^tUM1n$1A$<+X7NYeq%aNh^^J=pZ-rfZw7
zZJwStFmGqxPBtkxAK(n>6M!?W6##l;1AMzJAWDdoz!pzoz525N=NsJt#h4p!r~u_a
z8ozT-GG7UE4&|w7u%E5hswd>)<9zs3iiQ;}#)`RC&5XwqCo^`#Etf7snCZ?}Ieuqs
z-GucMH}aMChFcE|LWaBFkIo%`{0&*7u=FqVFW46hodA2Y-YV>tAIp*9wnk!IjyZ#5
z{|opj3n37-T$F9cd59tt8Q_Szn$LRTxaQY2SBB7pM2)HN(4gN_6FtB6Qll864pS3p
z5_*qtr^5E)xkd)}$gp5A{EX!Eixa<NtkJ1;uS;Jp1nuK>5>X~S<1uI?b?0VgCN1Wy
zzGb85aJ)u(Y7izk&rO~Sg&@k&n0LHB-hT_*>3RCqSMw(n&j>YsbXMaFGOtK{p+nK4
zvllH}boNWDWUu>EPo+dss)-gu^?)_cvU`E+8wi(L=O6z4$G;(m96IuJ!V3_e7r5~2
zX7hlgduwk87~8fV;Ed(gQ~%cb?%%G{#%d$9q20O#wj0q_Jpe8+x&d53ECKk0eFRwW
zbwCLa3hSk4tkRJHoY2xV)i_jFPX=SWhslbwpoq?dT=(e~<o99O!EaII@YX?>FFU(4
zzkZt68*ancibZQ0ty#p_mOBcEW`^PXMOnnd_~H=c+YA5DG-(?0OhRcDUDv!=!H36r
zJR&+u(PaEj@5)&_YCet9wZKy{-7lDA_!!WsucHiu)jtT27cod9B4$8Y`N%r71&G?J
zTNh!ur;cs@NW&W$JNN9<Pe(q-nN3@?fT_=&tG6%vnz3E??Yd~!vqBKRFEYj5?$bm`
zmQ%bFy%#Z-`E;!(Q=fzhkkhm3dwTwi58nUzw(g(*^^^;GoqQnkjGC{cJk1K;JX0tR
ze{0@cza3DI1W$`gmw6{~^J|1ga%1Bzoq-?v9g45QA&34fI^hLK#;3qJ@78(@P^C8t
zhXRbXeDSRRo;MHW2PM%;TptgJ9^N^w9A&bi{p?HuGyIoKAPG|dE<l<CN`OQbBb3G)
zmrG`vhr?i~BI_cXv2GW4?hV1=^}0lPa+-hJT|4jD`ygYxKR9q_(zNQl0WC)+B6=qw
z8cXaEz6Guc)x?(DjpvJ@Y&KIoovtU!tZhn!lq-KcHPz^n$HO8hHS7<U3DZ%4mB-7x
zPZUM7xMpxt?MAqN<Hq&tLl8A@-mqbf#}KC6vSlV`^rxTRw5fbP;~x3)d&xU3FApZV
z-MhDMM<>A2TLJ#*{D3k|(%3{0V`=pO6^{Mm4{KKM*zWgVcSEmUEl(XaN(c<rx33-o
zBHo_G7h_vqU-&o%4LYwouyl5Hz9EMkI$G(37a$_x_ovfdqrM%)0E!<07;A7*qidSq
ztptc!Rd+nV1&$j~*U@nb|0M=b`zac$><J*&X)AmceuxjB555guFDu)%OB7F>0Y-Z6
zxh>bo*0S<`s{}E&@8!~VDVJh~)YR5(DlVTMNqn80qW_;5y}>%hK3&c)Tk-~jQV>uH
z5Gl~ehfrA!FXY4Hd27|GT^sNBq>t;j%b3O3$u~E>vgQ*gpDy>;uAQEa_jU5gO%mV(
zVzb%Mn8{vN|D^Z1Ul3zk?*RCF9R(;2B4s)tdZo`mmEO97a6b@UmjEjk#MrW>t5@yb
zRaSOVllt}2(q4F>v<w(HknT(KQe^@1g;~Ex^@4$+L%VecW;=qzq2r29Z~>B(lzJb~
z@!aH}0aZmeze{1~lJZcn)ys{W)ST`1xW3|=250D@wE$!O9{|Q`^auF<jsRz1p8$OS
zEC3}#K&l26395a9P|5^QPsI6lLfQACCF{gGX=2x~U3~s_`%ind!83wUofG1W_xBrr
zzj6I7jIFzF-O6<<p)qM=PMgC8SBckKI0NCdzR6zXYkcSPq2nGh$6<2I$Vg3v0CVLs
zVXIF*Cuy4JEB+?B`QA$WTJ$HGf+()k)TC*$*LdPoW5qrZWyrZem;wfxIwN_J_gh4D
zr7TIf2<6g!KI6J1_z>#UsWCe-z9zI*n!Z@~cn3)^6b}Pblw1DU0AmN*0_uBmO>l{_
z=)O?^f)PN7Rs%6s?{t6*k~07`Kb4*-?*cGZu(NPy$vwK>VspJEzVm`Xt(AUx`Q-x#
zLcc_`9SIJrz>qbmB0hi-j;lQZ4DHbU4dAg^fBd)VkV8iwo#0`-H{8(eQ{a_X+WZ$#
zjQ*Q%7BBwkYR2ZwnKf&&Plj_s1NcRd+CEhfWB(DvSXV*tL4Yt1h_NdLsdDZs1)<gw
zNIlV=cTSqLa3M@-iHY^<VUN@R?%8qq<su_~R1rF2o6%OM2~zVPYeZ3Qd3n<Gv`vtT
zA~Va!TTD+h()Z9#km19qrA$%zg8)^7j7*6I1+ol236jKVfSNZ+kTPkSCdvvm4gSQ^
z$8lrN-hh+G;n49-C#(kIaRYt(CJTxUyLC_SPBLx(VYLD^O;tuzRmw*|#Py>9z5<>I
zsQVodq*lmeGO-ewgfJTzV2c(_nqVcJR>arAS&Xe%y{ymbK8msS5L5wUJ4%QI=lYug
z#y0&8P#OXG5GZ4xOn|iCI}u>4)hhr@T_E*7Nh2Z6j!cK;g#Z^&TLHD71V!>B0F9>P
z??Cya<ohK-WJ^L|lo~aw`uFd30r0^GN9@Hq<j|i;C#V29>7-hh0asm>k|G;35u+#@
z32+9sF6pk6_e92cIQ$N0D9-{)P*4;V+1L~70kW17@-tdD22?c8&i?}#YqAzVMmE41
z+#*0RNKOd|i_M&q_9z6|rPsCl91Lw+!M1;G+s*~gwE$z63*v%hCSdqzkKh|5(^An;
zKnVzXFI4)aXc(XvyyqrB<dJZwghAhAfWM!c0LB{M3~)jG7{K4h3P9w;j7L5U`8udn
z%bwN%*B}=G{C*<={{9yLT%%Y7sQFT60$gxR1DGm7L$%C=w_N$USeAftnzsPHpTe#O
zZut8JeF3=b9dhWzp%c`EHFBghJx!U?_H95#N0BLI``!B=hN&Y<A6|0LJrFsvk<?;A
zN>iZ>^EU*k74*%57<)vJa@zJ6#Msk<80#zu;iw>Fl+T|1-FJ-La?6Dm!eo`6o|J_7
zmh=TsW*lIwi=e~zhIR^4rZ`&JlO{!<-%3_Z!WyNNG6P`jthWHhS_)FpP$Z!91u2ta
z;ShieiU$Ccd;zKBzDa;`mXk)2F$-X<;okwJNz(I^V6!&*vgW;zMj|zhJ$qy$r?zkR
z=?m-_c=)~vha5V3>4eijd>){8Z_+%h;g^vOpajD(LN=|8kj^8`g>3OV?gsday&X{d
zNi(7Q5)lI=0n(|{>8B$BFfA=H5%(bmM<%ax1yv9(Y9(Xkd|)u37$pgU0}lgSP&@>v
z=d8>mW)&1xqR-tz5M#{*F?Q;G0Ls_{>iv<RA^}beo_rPSmI3_vegl*sAd?em6lsFg
z`>fpz;O|if)cdCQU`Ev$+cd9LaD+nu*D!<tx#*&c`vN=GR{fXfkVD5GonQjQ?M_Sr
zI(8%*J26UPAT**Ssc1DjN*@%tA|(bB7!7bncPXGWjCG{|KfeTEEK?9;YXzw%q5IQH
zo8~|3tY*z3pNp=mw;tdO@M0h$LD68eWZNfAf%flf2XF@X8KCZOuC#9j7>Wr3CQ->1
zv-FCEXg{s&8wf&a6%b>xZ$+%2J1`vJ8pLWqeGVcrNm29~2~ckVfW}RLdVlnNkOo5|
zeZGQWfbxZqz_4mi<SaKoA1xFDz_Mj52=wcB=@kHUGlv{<=mZlWJ$j@*3S?v?z6vOt
zdMFFv3}X+#8OR9sg`R5I#Bbx{zX6rULE)dYqNSDgf{p-Zl<xqHoh^v5-vyxqAi&re
zuK|p$z5!4I$+Jn@giP&iJGSlEzJswX{Q<_#{|w;Q{|`_CgBWnp2LNNG9|4L{>OBCy
zLSGChpG?}L0AtCQ0gTnU3Q&wReHy?S_D=v~Nz(yk5~}$Lz~9SSfWMCcfMWP-1gUUb
z(lGYF1Mu-HKxtO=c}Sx{IeAnCPMHEQ*0?#q1(s2(ENvE`qNV(w0Q^4F05vZO3R!9-
zHmZw0uR9k|=Y@X-e*BTu1iE&;>~BC-oAEm2(1}4Om;mY1CuthMKX?lug3*oz__z;1
zm07-<pQrm}Z6nf5G9Cvwqr4d43-<+p5+IZZlD7q5tb-uNUKgaC={*(zTx0ncz}Sv^
z04|XB0*w7~EuiulTE7V>hDkPlGTG2dyv_(fF=Aqj<Rq51dxj#4fHFb-Dqs@%9E$z{
zC_za+h|Q${Kk-@t7W@rR&T|TPE<F=a_i<$coPqBGVi|d@*#H-?Jpsm=T?_Efw-QjM
zHhLb?;P(9k-~x37pxy@s8Ib9a?nfF1eXkVeD>aR&Q!gJ1j2d;Mf1wUJbS%*cBS2)>
z?iptgqp~s(tMfE8E;v?XT#wa@L<1p1&=BLMm95nTL(cfUmjWu>lsX$y<}{hSNI=j$
zWU`{?pfKG=&jBi5flN5W5Xl!{GHOd}-9RxAyD}%Ahjl-@Mu4&P0w&S<+wKIoAh`oj
z`>nnaTJf8jg(yD81x5m(OituXKjjWU%|kwrZJPkTy&X{d>ABs*0Io450TF_BCZGhA
z)%PJ20rm0Hw{d^o6@LK`-r$f!4pl}ci~#YS2DEA8$p!e1X9Wx!w=!Mm!vN9fs2q)p
zgbC{`&fw<&%7jw(F~G+$0B2;K0mkb82ViXV3jkwn2LOz9`U+rd<ud?ZF+T`!M%NKg
z;iJ1g2lxv7b%3!}F9H1g9Dtv<6;L&|v|NBQ#<76C^P5ad)Kb@U&Ko8s5@6+{0Tq5r
zD}6IsX&k`s+aKWLFhDVUV%#m71B}&t0#M<z_38qQWnKet!L}aY_wNj-JQ0clGfj0J
z0scYm5HJNo@>GCphF1byfb<1ahI;5zfY0+O5aE-l4{+V31@KVwtDXT~oN$DHmJT^|
zOw$Px#_O3Vqk;ls$kas6Z7NboBjqz}yKB!Lv@D(M%g!EEt{7u`L5vASgRh{^n-8G#
z1BkIz*8z<EIsjm7fFR{uo|O)82KyqQ7$vRXsWH_pf+C`X3;{s`fL7qNq9y@ghP~2g
z6om|q1!DVpSi@DV6w|oLAoAg~eFsn)1Vvw&rXeHB%G4wb&81){pfob_k&xh`yb#i?
z$W%wBD7p{rCxKe@2%rRoDOjn@x@g$(<(H{xz<>d=LD;T)jn9{TIDdr>Idr_y38H}@
zmm)gc)GSRw)m3G=Rg=($2nmJyRL)<s)k>I%@)-(S0xB$)d?fiF0V-diu^?reC&57s
ze1jlW8fAx|2q*bp0Y3f+L}(P2aAMOmLngT(pq|^Rq1Xuy3WGgEkn-`6ph%nvsQKvq
z&~sBKM-s^NTwAUN_<Q*thz*xbO9YgYoZeT1X8^|P%mvhZ^d5?a0O(Z?M1*6H1Ni)+
z3HdY6v}*_q9^9%MP+sl`4u>2%csgMOh}j6q61Hn6K*HmLV<S5WT36KMj4yl?P|jTP
zbr9nuK|z9mqMu5`fU@CJO{iXiVg-R|IvNS6=d=?5CK;L)h1sSHQX`qjC>)mron3wh
zX*TO_0{G{<7l;juC4orqg)|Tn2&B=GFNZXZq*;LSjnMmKwFS(1=>5|7LV|?e7YQWy
z*}yw(`=1It_?vuRk-Z}wa>${Br4vMec+H;FrW4gL>6j~Y5q+Z=5ITP&ytkmBco<gJ
zX=%wb!01TRps?2+{|9ge{a=8w`qu&cj>`bfV4DMs<@Ev3b_w7N?@d5OTe+75su&<K
zKq?!a*aqOwaTTC^0L18PWB^>CxB&IZ$tU2S4=9rk`8xc)0i{8Z6TjpUfD3>jfco6D
zzwmv4kL>~3BfWG)M9C5=dp;3hEZGAvmU%V6-_u`#SkqL}B>;b(&H!WkM*;jkEdW0M
zPJo#Sk`!G=@58$Y*nXE+2cB=1{xb0B9ok1g@Zlr=({sq7<CsnmAIM23$)bCkHko+@
zWIMM+U(rYz(Kp<1>#cX+&DbfYprsLKe1eq5us{%F-32L=&)b63O1YaL#(uaGU~JX(
zfHHBNF9?CgAhjYl6WWa8jTBWyWQ~3zBF%;bW@SVIf;5cnf|QTKF1m`Mz)XQ*j1*ng
zT#(Wzs2>LjEYc`QQ?W*c(Rn0DsZ@!zDzAGH@Xdv7Zvy%*ZFM$KSSX*nN;&%uIpk0^
z=>*Y0>@&{o1PC$6{rmUrgCNoMX3by%BF07nh!`A=6xGzQKcF(I*9%f6Fv^!8Q_h)!
zlwhLsOrOQ=0-Uo8RGCQQ*!M6HCx7B008wW^tkc{Y7Hkz16xK`vf=pm%35qo_k#B@D
z=IQg%d!_sniY_BTY7NIF!66hbZQVMVAbRsHCu>0dXNT!$<d8!SMbL3CK(w$=OY^yM
z^_r4VnbA3xmATcqOjTm@KiK!-?vK=dV!%|}iHKJ4R3)}y37`Z89j7Y1^c*BOtb)ys
zNU)G*L%tPS$<y<hEBtu?Q_*JhUPxmZEf7=u&?+#jEnwTd4KQ~4>p-l4roJ9l9|#>M
z&4vUA-H*zvlYk~cP89&i1StA8vAJ{W)d5D2K2HPk^Z(ed#UY0rstz6Z0wnD}O(*s2
zdHVl_LOUjZ@h!WRd>_G7AVP51FxY~E{CqHe3KJFiX8d@K0)W53zW@>C%L@U<G9Cl?
zi5Ci(jFX(|6y?<Hd4RE9jR3`1X~j<E<x7VHDr1^Tl29oY{d_=`FDH^KbjD=Zs&bxF
z8G6c}sPikJqMvGK0*r~Fw(9*}dJn+gOLu^=l>-1(#+{y%GR8^ZQK^=|rvMiS-vdfe
zkbp>D0&q>^TR`1c9{{|xMf$38dR=`Tux?%aZ{1qG3&mUn^*lsBD~B9%h@AjFklMA*
zIs2Z0g9n$Cty=x!OS5KCR1dY5B}PmF#2WQf{~3U>+XSh3&-yRG*!*q)W19sr*7+kq
zF?y<jMU0fnvS0lZpjOxvbw!#AX&Cf8^`8bfW1Rvh(~jBO+n`2*)V!2`LS)snD1nix
z_0s)GAd;!cN;D6hPlAs$BDz1BxM(Dk9XZWOppj|HY-w8rEL#@z0}noU+Z_N3-B(1(
z)8*LkIXSL%s^vQ5&|#$GUIWow9#2wI^M8lKg5k}wma;IzcP(MOBv8s~0I^kNDPgU3
z0iYPJnTTkV-XKOxPHB-x$XEC&R|0B2GT~5*S`u_5AbbY^&X@-Pu_h-wBA-m&gMcy_
z5u@MV1K=9ZcYyso6sAjp!s@FbQx}EhQZyOuCjmi%kjk&q_4GVt_XBh1-kJy8e}DD9
zZKQI7esTndLk=AQI_?DsgVl+(eOTAE9Mq`tkM^hfIU`GW6yOZ_Gk}=_gftRj`~^OM
zA0H}U(w@fv&azGh7|VPDQ0G%vD@7G;{RLpGQz^jL$k{+dIIdB8gG@FDLI7v{L4Y&b
z^8o%_mjDsP{|pLt1Ng`21}I+)J70jY6#_9tCMRnxEMbY`&s{PcPy&>EAyo4#JsIHR
zV*no?1-Jm21Mu@E1L}UoZvvsvp0U7Jy@M@*dGqztfcf*;TwrNyHbB6JkZK7+ODYiQ
zNZ(#`5Wf$H9CGL&=@>C#!Po@KHjFPl7e*id@kcpQFKQb7{yMcgo;!GO-u(rIt5(1E
zTIQ3<$!<3^1Tvk_O5U!96fw@>f)vB2mH#P%l&OlMj7V_&C`hfauMwn5aU5=<9__pC
z1C%q{bZQ%>Itm)F3W&t1Ky0`!X-br#PDGj=ne^y$%c6z(`Lg%!tsCyT2YC1F>V2Af
z@0BA0r9p!R$+0Sd$__c?(4nSdL<0dU22HCY$CXC4)a$O3jQox}WS++zcO2LctX->z
zJf4(9&Z_I;JeisY+dISoR@%hqDACRIg&1TNC}iuWJO)!kF&Hrk7IJ#;zaLNxlzc9<
zLf3PEL-&R#Z-smoB*2O;0l2{10I2iLJPxDpMnW>6_NSx*jI}%!P`(v1t<mQ<`+QiU
zs$>U0h!D`MS*!&3=RfZr4AA#k8Igz`KVFVa{vpQ!PPJTz96Ac<7!e>uu)2f(`A-@p
zBWvGYY7|SCN(R@e)s~bko40QH>Z@?Fe@s!4mhN)-214Tqg^G)jxJSMa*LXnP!ORD-
zIM=PEN{A?ImV6(SPeDEpnvZH+vHk*;5<MR=<bojp-+ly8_q8SxT74qc#6Qv?Xg_Hh
zRNRp?il(aoeqCok`6@_2(dVPjZN5LQXRz=OKWNLeWo+5G=idEypt>4DCnIqB!;aDW
z&#7hn<M!&!=a54V9S%B1OjuPQ5ntP<Pu(|w@#E9Vfo|RM&MfN;r?uWA@p~i!`bTfu
z_WAirBcQ6UR*i!?`LP88W`_8Ag4B7$h^h9|p8EmDeio#h;JteR5q(5T0j05+QCNcj
zWm+<eKH7yF8?9v%zXKSnu>#<0_jEuNAFT5vpq$tA`KjR&1qF~#Bqp!K@Tn9HEiJ`!
zZtAytT-lsGd%T;xV_mN4$qoKe)8o7At+R%W7&P?$!Ryyo{AEGs19j_`^eE7+n`;1Y
z-u$u$fwpgj-T|g1%ky4nF2@6d{@9PiA%`3~lyv+E5DO(Hq^H%Zo0pgRXu?#TWoCxP
z)q5HOpr~l|YIFvqFj9&dBC^v!D6{%nLF#;3kyC!h);j^dLcbeetgj#yc5BUCr_q`q
zC{1$eI!fT9qKITlqq6jr*AW^IsOO{kC`yb>O;%Hvl>&iK2=8I>;?=7mNLH*^w+`d3
zU3>S6s>ER~u)~)v-m`b{lE-F$)TwIUO7rF^F9I*VSZ6$d;x5K}+zW(41%<!`7s$N}
z7gqTTcgP`!jyN4-CakJca&og~mtGPGgu~m$zjrPe=`Pog&p<%9TyO@{%HA5DOJt44
zA|HrVQ?cer(2AW(dXNS}CZvYX0*uvr22jpvs<B0ajZ96Iku^ba=g&ZFeuiC;0FmDx
z4C45zRa>{hXY=KkD^~1%5WbZI2Vjy@F9xC`H<t^JrCe}iRs3|f-IkaD+;&^7OrS@P
zI*$Tea3%m;&~5|v?2%DlH{K|(a|DM&4jl`0lxiSk;-F|73fnxpog7zQFUO6y$#MNH
za@@A9PDaPpgYT_Vhxu3vOWeKN@88@4>*LV4;&aibqO2?!#O%JwS`Jp`3Eu(yMf3vH
z6X;(647tmInK3OAuK9Jv9|HUdngPmLzWREAvFrZ|a6vH_P)>Hwg#Z^E7XcB~e~s{6
zvw@VMNs!6QPGg}&KsyQqf}e%?=h(hu-&y{7sC`v96xZ$Dn?D%yZn$;VX$Uvou_Lby
z<_(YM;xwC4%6$*{um26@|JRs4b*j)fp7`!N_9oEw;nZ7z3*0G}18v&)#sTfxHQEZa
zYe$KLW{H!t1X^v`2IOAgZwtI?e7}W5|G<yNA%`3~!gQ1h5IZ90>ZjeLi6=FcOgyrY
z(S7&TsnPN5!4E83#=O9yMdhRR-2c<na26L0!?=HcK>-8@v;i<uYt>sKyA1U)f|Tip
zqL5YzLM}AG*rkhr%2)n}ipoX=MnjYO`Pxl?gVTNO+HKn)&^Fw<?JkUgF~PCbsYx3y
z@((Mz=G}ICOMe{j_ipcXkUi!5_LUjsy?e_NCm9)3l7+&ODdU_<v5;mYeMI^BQX}g8
zvAoNw>krS{aL6HtjszWJCagu5%CT#k@-pD9w`5VnR;{E{c<$V_zb{|$^xx;tuU+Sy
z4)@-Nb3GoIgjCONpASxNcm}W{CKFanMz_&#!YTl$NFbS>ti=pZdJ^C(?sI@c{{{*R
z%gXS)>(=eq0YSKN<E~v8*VNqfUkHx!4+CSO1jQIOw&EFe9p{&q@7sq~y8iM5`!}rT
zTG|i(S9UD#*|W*T@V#95I62*EBp(gs(~yadG$U%wyLl5Zf4*ovAH4l`dW(nt%{b(c
zLr0p9F#$sK^UpGhsb|lvTYyE2diDYuHIh#8K7H1$+qCKP&$))-u9MK_ekCYiP=Uq)
z{Q<rTDn>|&bVODSgovEcRH}nYdXS)@J{W&g^T^LHDS?37uwnOZtmJ>bX8n3R@21<O
z;D|$GDw;14$j{%j31d+a!f!*Nk`ibJ?g_!M2v1I#ku(hgu~x0L^yFlZCu4QSZOsQ|
zJf6`!V?T;QT000*_%FRb3Uj9Svrf=Z!z49p*1^9Cha7U~Xr*IRfDmolwkHob=YO)V
z#jbnLtOIbtansth>uzRjt)722oXC7xJO;i6zFeLqs=rQ6oEmAHml@I#g2UKm;{{BC
zQ2srjI_B+O0;mp$pUeaJi~R?nTHl)C!da{*d@X#go~|!N$HPZtD^^Xz3Vz$R-S>$`
zP&4%DaH8|Q6Cm)|UiKh-G2sz`^9s*L_^y0TvsG_6IHsrr`e=l+%DX@y!tcX1C6B9j
zI0Vfh;bO1oqv7*GQ1~XN&V&Gf!KoRF9Jb<^7LizJ_=bG503~4Q{ZQiK_Q8NYe*f>l
z_m>tV1FxRSt^?*cg2N$)j$=B;d?5Ceo(3#k+O0d#zCCFO3m1NOG4e6??#+7uD{j8R
zP6Gp_@K#FDql|Pbk>H@{C@Mvg_W%GlKA=onG#@csYtciygg+v?^R11YViE+6=O+PR
z_VF;bNq||eGfS8l=UMxJ(B~&-KAGw^H3W9tz4v|KvL*8AsicfU4morpkn7KWfI~$x
ze_+xiszpU6tIW*wSzwgVG9t@`69ct|>)MUfK#I1_k{!l<D15h4GE8D57_6;fDO$@k
z6&WKr`^l6<Bkd=XlG)<bA|PTCB`t}G*5l=)02QW8?{)3(Kz_ay9Dgy&GdhC9p?E|~
zq+@+_$c~P)7o_E+{k2B-%+0_3+I~kncbi*IdyO)*7vy|BX>kfnSDuMr_{6C9KMdGw
z1Qb<t`7%JQ)PEHOp9G-tE@Y=X&bZw`<(dR#k`tph8NcPY`vO3XriMe;*&LVAQ+&Vp
zN33S#`V!!R^;19zj{PqKMePgT0p1=|s007|pQwqbe{4iiRkfy-Lx+g656`sL23%Dm
zuV0P{<#G(U<DXZWd@!>gi=<ogqO$*tr#O;yoCy#v7(D5zCp8&6wn@`E^}N0b6Iu&W
zrA4-E*~$sN5SiCeGz^F>rbyIT5Mw6`Qi*xeNvxuch^zv^DmYAmFad}aFl0K45jZ3e
z3{#c$xLvI)+D{`9X<`&bM&Zapkt_J_yI=^o#mKL58Z#YQI<hO<R6{dPGe)#Ch@_y!
z6KWL%VZ%<Li>FR1!T){bA-A2tkmmx71$=Uhon5!JegwVt^BxZJ1mf@4^!VHUgzDbm
zNCfi#Idt5Zu!s^8Yh|8t>VgIN`O;QTwtLD`09%dh0BAMg&`6BFr69GRqOPdl$H7Kh
zS?_1vA44{#rpo4};*MluBa;+GOKocnY`RSf#-2T;;ON>_&gKY?s?p&wiDc$Qj~NFl
z9!XFn7vuj)C1CZwa$h+F2FAUaax6@P_Tcpwq=R{S0>vq6bO+tR(xm9IJVB0_)fFmF
zfItX(f*vqbjMyLW2E36Y?bpH~H_lU|WW-t+d+3bFk;@(<4Ba}i%Kpyu_}5i3>hYgL
z3)3f%qbo#$))lfmSEY3Pn!=9pD6CjYEUH_lP17HLEDo<(3yp(T*kp=IOG{0KGn{-F
zrVqsEc}^?)v_}Cx;pGCRAfg09DuP&5G8sQLRj=atb^^nCoCG30rx`W&Frb14%1VKq
zJInpRYp=0)ff=95S)KfhXgWN9_-O@lG}q$BU7}a|T<DAcd;M}ddL?gNHPeb8<P)YP
zX<rKRy<pgp$E`#wYdRjet*&y1q~@aOZd9=jN6&}p<INv-sVAf{9Jy?@{<byqO#8o*
zO8$QAKBwKa^7E>zteOYSYV6l7&#93>30I(z88g#6IBqnO<4%C=VT+eO_RpfC#GmWV
zJ*(a3+xITtTW9ZsCp}+tHlXq}@&^O_E6oB_J_8AmMtK1Ls`CNHwr-WCFJjDAr#T5C
znorLKm~x63qj}s7M3~NU1=Kub+A=gD|2#mISfS@2Cw}PS(8b{?TUvx0gd2obFHa8_
z0UK`*OaYc(5t<8pWfUpgu;EYmYK|mjSA4j7Hh(L#4qNng@&U;GT9_EVl`+#;5`8_f
z?XW8xahAzqf-#I4+aVhkgu5CmXmOns9+JUFUQg^_%^mMwk)%E~=GV1YffM~4HUdkF
zeShkR4IQi)kN1w^%w>7bnD=e{9xXG``I>P*U4D;D3Ch@e_B6%?ah~v)qT^Pzs+n=-
z88_YV=%dN0`v-r~YsipBjT-&E(ccy0m!(fsSgLiU-{%`Z^)RQ7gLK|XK@lb|a>5&?
zCTn6Mk)5-?q9`yNcexU$)_MZIjMSO<97rH%`oI2FTDEKV@*l<+NrVVgK9T6qXb6c$
zVy0CCkfS?DtkxTd+^<&B(TqhgPEBf@F$~CVg)H|It2fz_agff6zdnwfSJNvxOPw1}
zvpJkp;eGyWPE-Y*AnJS6)b|@R6)hOe3uDe8Z)<jSAM<FV<4yx1^0<<d>(rh<zpQN6
z=ul|Lkg~F}1}GLt44lGUO%s+elJhxp4!~LRUO+K)%D6UtC<d8=VVnT9SdTdFb|V~D
z(_FbS%r<EnN`Xk>gYAR__-GOmYSe(w#qCZ^ls+5mVfdlG&Q=G<urO=Py8m^}o_(l>
z`{tX6=k56nH>=-&c;>Gz{V_q2P$tLt0>TyY8{3|s+#Ah&Lnea_7|va>!qh7l2!=*t
zvK{fSh;!p#X9y-e_C6KgjYw)9dZqWN<alLoyb3~!=CN71S9r}4CB16*6rY0((7IKS
zsPEa(K<MpM-Bof7(s3(5SP9$1b}U@zpA*V<HwlMJXOuo(TIzCHqm#@`ZsV6hHJ<1=
z2@Db-B_%Ew`fsGAwP=A_!7i7_gM17k2ntbk*OQuxz8!JsZDTy8TAv4H)Y+_AhTteW
zxR*jiJ?6V~kz+@r^WWEB%kj@Dr~bzTg)hpKqy$93SZRBL@vaJ+CL_~HTH#;3VItD(
zZRU0wNp)BHHm06RsG4`FzTqg^2Vf^eDp-G4;~9<&S?^zwU?j~VLXgP)%JfL@Mf{Hb
z?9X<X>9`djd&(DYdhCtT(&Rn0{?WA4l4NPR>QrWJAmz>lj6ZY!2Yb%{0LF^@0({lk
z1W;wv_dT>_3##tAdi%cJyoqZveNy|?Zy+@Vn7Xta&xI+M;g3K3UEl`@BHv_DY;Z#2
z)EbXh;{ynZCKB|x=y>iqeH9mo#s3U5(N0&m_c_%wdV|-U>wXt#vDwofXnBV$=GdTq
zuqn{06?+W`8>%x!SCPPY@<};DRQ@5#uG(o8`ygn^MvR>PG?hCy`g}6|gp93dhE9_h
z0wT)s8*zQaesXTdw|$#i%h+?mmfb!)Fv^yFXjq2*EPvDiTOHP3@%0Bk$I(p{i_YkC
zbn7uqkN(~2=EA1>;lD>e9k&96DEL<S%_T2?FubHBm|b4dN!7kGNOJ+41!vaHtiv^n
zI!^(N?d|~ZuYV_?!gt*hTrQD+;SGO|7O;rRS}!uai;K0Z_&A=u&Jy6{<kX4(XmtI?
zXrBf|4X&dq!P2zla`}7^Gy#7>{-zBJ7U+5)P*hx8Eb}_<xFcan!rKXNPnlA$UcKAv
zy`Pa`<a-Pujmp0r;7{WP`1bd}>V@ok;31>s)x55M>}^)6AymsbEeV087-^->MX%vZ
zCX*8VArfOJ6OZ{+dc=8}>AckGdC7DX&lz128S~hmHIR{}c6iySa&KoDTiJ*8eh$T>
zXpMuZ1%@1@?@F`ys;~~MlBw?)rQ=?JgqO3i+P2?s^e6bku;^QBO|fh_wtT-;t5YJ3
zN~Ccp)0GSdCNdKOjSO#V!d^_qxh1Mf{NG@=D5i*`C{CD=(4b+h+C6*1LsPFo#C*d6
zE|_WoDqNSsbMxN;7B4O<2B-=yX&BX|!x6qpdCOs!JHnLY3I(;GCfR?ai3!_eQi}cq
zwCDwz$>`tEUN>4{4T#ooDiIuUKI>tQ+t&^@jMMyFc5e9Nm{t90B#l*8!SROHAHO&4
zTJ}2sFFP{kE>e(SuxiZ56CIBVXfzdRVRtZfrn|mtnwGG8mpACm@pzM_n?8_UlA-rY
z?YFewQgzv?`T%3wUIA1Bo;5Sv6dXooIgQquRFpyP{t8efN6gw-hG3zvT&nIH$^y1+
z3nl|gQ~kSu@23_O02^-$>Hy`!qh%H-Wc|rz$A38oQ^G=vHY}NB^&G^>Du|3q;_Tj~
z8_zW$>bf^+pWa_=576cD{#sVl^DfhKjO#my|37DaQvEq&e|yX4To$k904M8t11!f2
zE$=bS*nT7KYzIL$&!s5)Am>|P84s4M_ow-K+8jUJlzkZQ8=bEe6EvW<TwxXYX1dVn
zU!48Kny!wYD6A8V=FXK2UDqXp*Y#%2n!nKUC0)N>kgi`QNY`7x0l?q{La}vF#3&fP
zI!^OS(~_EB*4)x{>3iYZQ-Q!}d3@<oQ8LRlZ=OsOdG=ZPoY!6}N7NIp3Q>`gE3cH}
z<A%58`RC>MPFp!98&!#_k}(ZEK^W^oauhkl5u<4$g1gWq&l9><Sd7Rg)+0wi93QWZ
zm;1G_99<#){9+p;{v}7TpBdX+fH2+ooVKIUMZU6;9c?3hf7KmbuA^f-V#N(}4(WWl
z@%zQ7$Bz6L88PB_%K!B7D-EjA6>^0<0c;~zUv4Lq$-kTA;^V(K<8k+aDyF`Dr2u&U
zeKIMDQdw`H`#PuBRn^&Df{=2zX%n`6zM3^r3o9w9Zr!uak{*ou^((klq!V19HET~E
zqNiSZ>5o1CMc+z6^Oql`VCvXWn$X&}w`QVCdhIniK2j{lt#`)G>5A);W^(<V&9~o(
z)>P~)x*}aIo;gUJkAL+y=6~IO#;EW}VO*}_AKn&YMR$@_v$C%EDx0sWrXcG)hsuO>
zu=5-(E8D|mO8bNFJI0H_;`%gbOVgvbqBGWMTWTDd9(KW0<qo++FsTN70kh&*z!&o%
z$Bn7+xc7lX)90T{p9b~xOG-*<0I)2>*O5bshEzk!bFb@Ob}x)V2M(-RgG9vr`(ZHB
zH18x7WAu7!&W2#|dQwvwHrTt@lbd=;{fwNPy@Qs|dFI7AbE@`Sq-mUShVbcYH{YD#
z1KPAnP667rlVehnVG`>?!2nc}CBFu+a3Na{+<L2=Z}Vnla<a*%WqP*!!_+NIR|AXB
ziM~#Y<BE>DCeATki~5s2gHBcF+ss(?1UDsMawBJtJi{350%Nm{XU(Dst9WNtz4H%N
zFqzj^A|UL1BuAQI**<?YpW`6su@w=lLV*$auXxFrBrqtmU!Eg<cdoEo)XIY3pvnYA
zY1Mr0V~|cT4TR{ibg6+1%D-ag6+5pyIWW55`hx588+j-1x))$<Piue+jP`)?QCQ2M
zYrOz<oGlPwu73l2AJFat{C?M)02efG0cp#84*;plOy7v%JE6u;R9b~Ji=vId+O=hw
zz=!7++);Q>!5u&R81w`@LC=b-_?>4;ABgr9JSpn4Y7im|`H%N+OxdbA=^c#Y56a`L
zy*#eZF&I(4aehJcb*zbT99i$#{J;9fw$)=m)XX@q%sB4})=KPui2WY-{5kxHq;i8%
zCK%(K7{*!IwjJ4>XEUFbahrmM&bRX=EilHOmg~QWzdz=FcJnQWf7qPYa$N6Wx!<2m
zF@n$-EAh$AHa_3Omd{a<z=+sek%l4nMD8VT25rkNh!1EQIEtviu$!t9huu`EpghsM
zsr7q4?&t&+ASazvI}`Z*_g=jLpN~qDkQ19a4U#k4t^*)3eA-Xjb{+n#<=RO=P}JA1
zoxp|-GV1HK*JOg@C!a`D6B7KarXt$b`Wri5kN&KY=f_>qMF@g;#aB#<XQIkB4%z(S
z+ZK<rT=!?K%<S%K_uQ2|=fRp-V(wE-Q&eU5v77HGT@lAKHANqbqKGPAar6eptfr^P
z{pvpzj0;f_cF7T@DO{;cQ+&N9q6JHnDbZ62jF^W#I^XXhq!UztFxIOluySSEEa0@$
z*4_lD<J9Ma!g#IWxYn>;Yd;Qa{|&m11QhuyWOdwS%lrZ0z4zqVxw+Db4GOyq#srNa
zn?KPq$#|nIv@k7gmB&pDfkhvW9IgAKwySBPs>*TtLpoZkkyiJ4s%wfmXhCw2g2nEB
zw)_7K-%0$c)D^s`_};fjfuQRu8Y*JS2+@K6q+pOGU+~u@x7{IWnhLq;I0Qw=L*e9M
zccM}MA-{(0M>@)W*N2}@FdqnG*W3%7aRwU*w0fza1HdNfuK@gnhQMdtLfwJuu9sIe
z`KM(3BogY^4~zu3ND*PUX^%<)K_x<ncHbwfl7>QNRbD|Gn~CA}bzt__YK8F0XlHOt
z;CtWKcZz`CT-G2;BWS^LV4h-m{M-o<e`#)mQPnX_Q7}DWo(w~yfaAO;gF#3hhrcD8
z!ITt3)@YYXsb}<PY7|-Vw__-~YPYF0yp?Ey<++Uc$&>(NW4w8_1(xe=?r#c0>j~MG
z(ID}@K|SKn8)Fiq{q%XQ3jul#>-S?fPbJT1Zfnfu!YUEzzBR@D?>4qlI2Q0vlFnv{
z_nK|JvsU4+LRPIN(ps@jY_a}@zLs6eK8!XA*$EcfFY_>{_$9m*^0*-wT=Kl22m8Zr
zO)nQ=w;_+UVU`jchdey`n57d=1G(lZVD4Pz0`9$c=RE*QlmN_#p6b_c<tpHV59Cz`
z8-5pkouO0c`gL-D_|5p|nc<O|E7Iv(U@+u#WonALZn&{M!~S`zyWft?mGvQ7xgIVJ
z;7~uuAH6SKU)g)B^msK*Yvz5cshL=gN1qjKGL2_i$}+CYjyI<@XWP&avW)Y^f4WZl
zsX!zQOY;1%i!=oY24!+0C%4hSN|*gha5e;n?t&3Y-j5ReVx8SFpa0L$(2fZ@;RMLl
zR{@(gNsZv7lQs+DKcYgQv^1~_s9k&A0f3^lDkF=a7%RtcZnWu0m0P0{8<yiP+IG3(
z&mR?cUx9C<x^d@+I*O>OWMypTb7UL)tEzd}%xg6v*_o88YibHtvA}9&^Hz0#WrD|g
z+|IXDi6GJAo>!@hI#vUSoIk!#LPa@6M+X}J*Hzf8igv;l1O*8Oa&kjc!2e~VD=8>~
zUYF5d#h*Zef+`!thSgT|{0>z_c43Xj9bMfIXw!xS2kkE(1<=;#pI1$AM4Nh$U?jG}
zlEH^pNew|aGzcS)0c#;B#o1bx+o<OnHL}=5H?KEh)Qki&P3^ZPqFJ}?62B@-NV7|T
zI@Aefw$G7U@&3y0YrU?r_fc7bn(h3#6<<dbcL5M*+iF6LIlq$oRp$GON}yBDYE!?^
z^@uIG(9w<SbY`jjWEB8vlnWzO8;UZuBQv%mW1uKJmNW{C&@)^SMKuxoB=^hcC>lwd
zpl*OcZ_t|}vYz}2lmT99q|e$54y%dMp{mje;{(w>z~BQ^x4m2t|542c_z!RrFncz;
z7BCsW0{l;FY1pzG8GoQRh~s_Pr`m;lyjFj~HJOj4`qg4(xJ*k#fG;c7?$EIR|MVxM
z#$YDIjTOfkD-$;PyV=8H|HCX%j8DWeOfzc9u&G;Z`6lD&X?)rq(fe(E0M<X4Y|Cgv
z=1SPOAK8G-mA;J+rOLMBY@6q!`?)Rmu{qz)2V;Fs{VU^u$L4vnEh8N#-^K)+^DRWb
ztMKQ>js?-@n=Ah>jZyBOX#5=V4c|zzq06R<^Rrly*h&!L&V$(~j%@z#e3s9jXCDi*
zFhB2ER+A%}<*_{NZ+r}L)Z%{$0k(y0;>VkCydK9hv5ftu-K~G2{hPh6ea4@6Cx5E7
zhL-}ytM#k{o5t_6R6B>sQb5o08M3WWPyEL(J8^!@_G^9hFZ4^b$Mp|bPZ*#g1r5Z4
z=(uQBL?)-U%(sA#qC^OUkm$*dt~;b*lo@RmVtXCLXtLRrY&%p%I_^zam-Pgarui~}
z!l6<Fal5G_;eq`?e*Wq;K<(O**J{@q8pIn>D^T4SBYY0-Xm?w=!T1v_D@Nth$TsG)
zgw0mAa<49#3^m&_R&v~Abk*#IbGS@gM29W&+hY2$&QG<)s+!nlw{5-N=KYo;1Bg>%
z1mhdbidhNYKZ_-EWQ*DKuxf%^0Py4KEL}^B5J-6ly5Re3bBNCwX;RW7bO_ZCF^)+p
z%P1C@9hqPUABXTykp8Bt>$zCSl1~wuAjFc`FHKWqYC?mqfR9W~<%uK+D4)VU+R2U_
z4dO`Cac;uWG|ySU$*+*$pd*yQEotqI;_Pr#ZKc`zzmVwx(-U>*BU6$XXP|bj+)u|7
zWkk4(_8X&SJuhKO^mf$zEY?KzM{6dzjTLfbrWmULvornJUH3<8I$8HyKfl$qWj(LD
zrZ4OJu`^xSz5mKSH_c<co&**B-i&#qX=#{YGJ-M3B}cx^e~Fs0!q)U?Mkxdd7aXqf
zBv>dPLX4T(BXX}==}X3MH7QAFb)+duCu38#p#_jXLWd|J(~`VSUP&XrM-H6e$eO@J
zlx7$5NX-Em+tQ>|o=ABVB`I>OTyR)@Iga4?v*>s;VP(r9!nE-=(D`Nk9DuQ+VF3RD
z-wE)Q(nOBgKh<Ib*bZGX`X#JPFq}DB2M<hC59>dB(&e<qANpWp42gQWj3pZ;si46y
zo-nqVHr*JlHtL?1ky(x#WNX4%U^&lf!_AJ~Z<2LCZGT}iZ;$x<W1hzoJ)f<KAlovZ
z^?nx9m}zpeT(3`vzRom7^)YsMZSFrQ{`1+{z+)Jcah<85jklba6@8o(4$HJ-#OE5t
zCJGbPWMMSQW#ufy=O4m<MIW&9vA);(iFwOd8E4#Qvo0K2>>BMewwP-KqgbJ~o$nv6
zKhF_nE^Vmx7XQ9V^+$D>oZOs~pUTgBPHV5V;MeK;JK8mRmbO{jqBr5Q-mG`kmht-~
zYY%Ek{Jf9YnR=eCyYAALBM?`suhn;L;UZuO%h7M;zmMBp*XpC$0)0UEO_8$NkPC?h
z`2K<(SCB1$m_hg}OiWS)g**^2Ffmzu59Q2Ce>BY7p+Ad`6BCxb^YV&wfTwC}O@M(r
zw+ccVC=mbo*XKBASkbzL9RGRsRC%4TG7Jh01PXz{cw(HexzS@~iF(ydsIwj?hGqAM
zWp})~(LUyOB{uyk`%G+1IJW0kVp6h;uCkt2+4ETMXZ;*xVxrM{pU^nt`1ttqTTE1X
zlxa{W(->(KVl3r?U>Kh-k<DZ?IK!tE|1j4OP3Py&)E||mD|iKTD)5IGr2$6R?CV(h
z<B&)}g~@1~E<6qLI7KZPCZ(*<1elKCp@2yV1|?`H{sdDHxTR?+=ygm>4q53KH(|wR
zNJ%AfzbD{w=`-{hY)y+6bc`A>5&6I3Sh?LuexmN?#^|+d$Bc%_$~0wJx9v<+hG4Qa
zRoR+!CdS`ynp!4C&to;w*qMH8k57#MeCAl$aZ5Cr?fnmOe@xVwjfu<7v}N6{ENZMW
z0chv5u?Rdr7Z4;E%u#p_!Vnx<S$MoO13|!mkwb7WuWKX(m1OYZsl#Mq65BOh+vK(z
z?JzY@(1n@@9asnL^6+>F0Z&lZjV_NmMK6UW3fHzSqn98!D0+!ZOF^$=T5`yajxhmJ
z@gKIYTvV$H`h9M<=r$4dc(i%iJa&JJ79=>VEp3Y*<#=_UZ277gf<a3${$x^S$k9$<
zSVv-%c0P?5K~f3BwPV=U<CQUJtKf-Y#1rE`Z?&JVs{Jo)1eW!AY&AZ+@Lh|q#~S`h
z6r(BHM2*=wy<?)d;%joFjPrH6PW<w+v`JiZ(P$e2ASl?m5ENW1)@Fys!IMCmi8~~&
zpTaehu;Hl?{s-*Gc^F*}xUOJZ!{cRmD+Gj8F<i~P!`KEXAaET#59tLYC@_D}OJS~6
z*DM@C;gF=G)d!L-hv+}-q%rdEIb0tl9z3(svoy_phpThxC9Yiky70=-O`P#;4F5}8
z@0r-PTf5WGEN=dSR$E)CoziUCfk6O6Gz-A=nn2$D2c~iKLIHPB4Wkj0-3mX3(HK4s
zeQNY>oowT@ZT*8Y1c^R5`t#cTVVX92@<~i$aVdPh@s9<T>&eH_)AF2lwr3W7Kk`My
zB&u0`C)t(EYaD0B=hi1$_FM07^Z9j4G@Hr5=zL>8@qeo+Du&_9&oSJ1f5h;8#(hhT
zZI`i4`@01{72~C5_;mF577TSa=O4;}=&CR)VA*^=E-HkE!1Pq@CjL1Jv^i`v*F4T+
z?X+Ay#AjT_I_W{SlQm#p^7&q8*Sa=`L;5M&6YkymSp5;LTi_zDXq*#rdG6q%Xs*^b
z_yNmeb3>j$uJk=5{*31gu)_DF-*1un+>Y<Tp+7`Nn-3&g4%Wmjkne)D24eq*?%!Ow
z?qJC6Y3z2RjZ3-aav`2PT$-3DdTH~Oe(wu=Uevwkph2l=sc9*xBS!o#NNFHtrR8Pi
zWpBT|Y4gTS8#g^&Pu|1o>##9Fm}IvCvlRrE(Hh2C*?g7xKq|Yws^^=>tpcNpz7)Ip
zt?$toEm1{Gv%DWV9x|TCZDo9hPN~uRu{gI!8|P25`YK2lwF(xiz_B^6EGpbqw_LB;
zf8WB?6oyI3__)T1<F4^WttR1<P$nyXg8Ll#Ieg#9?>|;!IL4~(I&{p_QD(x5pAnpK
zKxDRF$%aC3xI<cFj|a7FLggM2>ES9B1=5qkA!%Yl16iM!!`Hn#l}oppu1ZRZi%Uw-
zA__#NDLWrV+{|!hZ&I?FXzWZ;cBU>nQ<U|*m@v}`HutNdkD{`0Rl7|0N;2D{!&F&J
zCN!hbB2aV-19p=Dpl_0TFB;o{piyni*fvZ<Y*Jv1JTE{U8_J`u_oH=K<b0On@;Y*Q
zlgUZfrjQd|Y-`4G&2*068x%!tl!;0T5cd#Vr@KUvO)&~h#CT_+iEMy0Ed{-zZnI%(
z;)>9(R>4u#g^EKC9UeN$1V}Vx=E>3T(==Ci?G;ZhG>(v)1zaw%E(^Kch&9m@eLi6@
zPDn^_yFG~>Z(17UhsV>dT|iLm-1!Ic4-^!vT`RYerpYmep-+mx-(<YT@yhZSDsv87
zkJ||rx}VjjQdOt+!RBLF^BSx^3A>URj74mdfCw6zgdV-}Hdo@=nof*aesh{`j5$IO
z=t>aKXfS#Y2?7!T#^^5_8NEMBFpOkAIj^RR<GOJ_b5sICY|HA(*e;;wBLN{t>HOx~
zU&~Q<(I}6H9+QGF<dL6S3JQn{IhMX(RgKnq+%Y{lbY$sh^MPdJf2oC<U`%C;ppp1C
zCq0hDs?b9Ap6eSn(zP%AAI~@X6#aSjB4?!8T9F>$j5LS;5rvbI+AcWr^VWMWU8K$8
zxFtE6N|q1>UI*5!@wfH2Eo)mcT<%RY-a|~3jbU>SlkMGNBCwj2Ow)<s8z3J?OrF6-
z#&%E3JS_hC))FAP^?9t<S*|DF$p5o<^|4YNReWad-F?dgT3#eHU=<pL1WQO28yXwF
z8k)2cZPHj{n$$nEsVyMTzVuPv7fbmN+N6pl#e_E0m{jc_Mw8n3MHFLAE0I)EqY+b4
z3HAvo-*5NryLZMpbI!TDJM48I2AhS>ZxT-C^UmEz&bf2GCbOXkZ+(8g^4e*CnXSQB
zx#4q$X#8e+kI0Shm;H`$ZWr50Pz+fH`4h`{d()o@`wPjZ(=h=oHMRX9q9Qx~H8CK5
zoK`H|ES78cmoupPNyR6VR|Oc8d$s$!nNhd?YKi;M<~g0Zr>{-5qls(3Uwm3ac8foV
zcMQ-o;*49bAo^VYE8@Fue^Sh&_xT4>xq<2*qxYLibb$Kb#@|z`%m%U<_nZBl`ONG6
zKgqK_v^_DD+w=znyr<|e8wjefW}bjA+wO~JuZJ()BrewM3FNT3MfMg7`s4D=bbqmE
zKLaPLVxeHaUQL>Ib-{sT+)SHx=gK=)EWP8|XS=6#Pnp!cY}tr|5T_k1_jvcryJye5
z^wP-5k(2L?`~r=j^)G49NbU=WiK+_njJ0|FdGp)ZNW6K>$e;A)Yi8_3O`fiwXl8@(
z;~f0wQop%GV7WL4=T&4|R7?T{zT^{W#6~*-f(U*050s9(U|n~u52n!r)lXTJ-52{7
zv&B^C%N_OuXRjT$4rhgaR$<|~r~(oLa)aB?4!zsoui)2evN>eG>d$e!zI&pK{c>$V
z6YUQOxVq56Dy-4T?C<XU+V2xPRSyJKNfS*2cgD1$BNspgITdVOyOar~Nw$<0F633%
z29m7`xOnUs)+U<8b)wm58F};li1fTT1mEV6ljYWUs-kAW!78IILb2dr#_OqoQqKlp
zhz_%=$ES3r8}QrVQeIL8ftlF2y4@{B-bh=A_9q(KA@_x?gOy8;!7b=z`M6!rd7%P@
zzrXDt5EXTj^CrXdB&(ccl)C5dFq2q?q;(@T3T+WOA{A1MzXMZ!cV>KVEl^t;!T%Q;
z5O8gw(@r2wjCT5BV6=r@;<T;*P4<khjkl^jVwFh>Mfp9kNc6_B`CR%~+E>`V;JO9p
z=Pg{m{H7ywj(qs#@6YEI-~J*L%i6wG?Wy*hUUziG(bxa_#)d~lzvwrc@{G{g7k1qZ
z6DfV6W|7IusZRaAsz>`OCQoH#n%f6GMkTZ7;rJ(A|9~8F^=)KJ(3$tqpk;`ggmQ5P
zkZlWf@rhXC+)br8;AlUMPt8-VKNY>M{Tt>PdSCW-lIa0_JhjKvo_Gv5cJ;MtjiW|9
zW82rsRIan@*Tk6ogx&XE@q%2Whvi-Jq8ijo%@4(&#Hw_O{F3eOw&SOm+r`)I>0^PM
zZGLZ`x8An@8dPtlM?D7bZMG(;diuORgujzMNV%V0#{HO!)c(^vFQi<zRX#zLbNU(W
z`U3*qSLiSS(%Ox8<_Vzj>tpL2!(UX}A4MwFN=>%{L@GUQ;&|nqEACpdbo+Lvx|+Ot
zH81$*FF>*1%uhf$Z~&ZkkNth$KI~;9bQXX{sw`$W311E6eW5Z~#naBM)<a73l+Vz7
zx6!8dRN<Gj;{8a|@TELJDxz(T^DRx~Rw2g+L}Z5Ce&H9Dd?rHyqbtscTrdTGAGhy5
zQVs2DdQOvjDjUC>R7$4a4*4|PopJU08Yp^L?-hI0H!(XbtCTP+YZ{y1;_s3!MG7ZS
zSC5d6l`h+z*t1;)1O!|ObeamQ++0P5@UL0Ut?@SXPhgx$VY~p>lPj%HC5ZudtaC}y
zRq84gyKcUjXI35Dicmyt3<^Yo0DLbVW~fZ7bfo~ROgQ-o)6vn^?OA_c%kd^}9=0om
z`GJ*cu1n*nF{y0_n}R_qVLqsOV87cejbY!?s2Jv3T5#hA-FT=AT92M<YS1sY%E);s
z*`E?sP_(b2s<`*C3%mVTO7mDHCD6OcNK|1F&AgRB)npX7sg92uWyOFMTzan+9n(Qj
z=?J}<AUkU#1;K%WY^;R!(aD+;e&^X@{1e6{s-v<92ne|1=rjRBXl=AS^#(GCQWY2q
z3KFN;j*}#EsM|g=0Ya!$E7fYQ0AU+I#u#ZPCwymmfr5A`a(xK$`oi|8-BA00-_G-z
z#u-}2P`ecn?)eSWF>Vu~K(X&<8M-?`upl6TQ?TnKa-;0W=gOo(5E;2i_Mt#>HU|(m
z5elGqlC4X#MSiX6y=9a-+rl<eLR*K@C?J@U%|S$K@OO(+{2gPmHZd*MPykGF#&F2B
zgzeD~wp)SV1Op3*3sc((igwNnK~Mw)yqD-SH(n2yFouKh&)I3&jcxUQxbNeho*tgb
zY1_?hP->gbt~|T)%$t9_51cp!C;iUuJ!ALS+NY3a0cR9HFy5&0sXupBcC*}a?52Hg
z&fI0Gz4^;nE*3ukA`ThI!L`S!q#hApk*mQKS+0?L?0878_f^YKBXCPKkaSOqTharT
zj>$vzxnCB~i-&Cc3sxZ9s)yxg#ZEb<H<(wI7Dv)lK4cEd-`W0ei{Hp!Cg;s=wO=ew
zd&MKB&kVc$tWYD)3+jHc-nseSYhJ_mNmkJNT`$}TOh3%FflE|G*uFP60y@vDiGQD8
zweD{WE({0==u~u?4WtdSyQ019s&RaeL;Z@Vzc^TCcsrEi$B#Y_<$(ui9q+w4Qn|7b
zDSH)>D$1}e#1kO7?wu`DcF<kXqDD3hu)mbu=*$Mt+Rc<~2vxZi=E*KGh>TfLM6$H&
ztF>}nav~iPyTxwVZ8pQb47eU7dvQi+RV%Vr8%0F3ZDBsHS2>;+S2EEr``~R95b%CN
zhpMpJA@AlmVEq6v<7(%`srNyF2oOMnahXOVW!nS`AWp7G?W8gil2k#4Z4+E)imISX
z>!=!{^}5J*AW>xo*;LVXf#aAe-AtolbpcdLN}~!%X>|(fQ5yZbR?~Z|=-8AD>PSau
z%SmITM#&GM0GxUrRY;ZYW|dLpcy3%uxpjMRQw<0R=y(-YJJjPU^mm|)jEsH;$_+R0
z2y-ixk%zHXrIQBh*xB|m`Xi!`Qai^tyn-}&oaRwnLEEgeEfL*I^NOU}s(}i}D0c0V
zT@=Z@9>&#qvfN3}Ic#8GPutmU-|`%;$4<kgr;w4KEAh;1e<(1g3!Ss?pfU;w2)Ne4
zDlCrM;N*u>ry`v>bKXawJow<;k3xCtt(!JLdGST;pHJ~2bLS$RGY9F6=a629SJ#Se
zx*@^Ob=5AA@N(%yFEE<$MMq^35D*X$&<ef);jFoQ0o05cNN3GLI(zm9J_uzQ1^ThT
zxba4$d{UW4)&#ydDvJ-vizNR)(|~}0fX>HN#<22IiZG*R0pO<q@r~Mv=T+5|omDiX
zvdGDW6%Y^*5O9^*Kscp{K1dDTRi&J^+fO&1WlQDx9Pv$&*POD1-EuSIFsCR9f+HXx
zAmG|So)=c$MM-&gcxNiA7B?UU1Ox;G{5M?X4AW=$mn#4!nx;D-ARr(hARr(hAmEDN
dKLG#$|Nl?Rsoc2X`gi~U002ovPDHLkV1hYid!+yX

literal 0
HcmV?d00001


From d2da525c49606301cdf25e2335045cc46fc734e9 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 23 Aug 2015 15:52:04 +0200
Subject: [PATCH 136/353] Add more hooks

---
 model/profile.php | 166 ++++++++++++++++++++++++++++------------------
 1 file changed, 102 insertions(+), 64 deletions(-)

diff --git a/model/profile.php b/model/profile.php
index c28a9c20..e82f8a82 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -762,8 +762,12 @@ public function update_profile($id, $info, $section)
     {
         global $pd;
 
+        $info = $this->hook->fire('update_profile_start', $info, $id, $section);
+
         $username_updated = false;
 
+        $section = $this->hook->fire('update_profile_section', $section, $id, $info);
+
         // Validate input depending on section
         switch ($section) {
             case 'essentials':
@@ -980,6 +984,7 @@ public function update_profile($id, $info, $section)
                 message(__('Bad request'), '404');
         }
 
+        $form = $this->hook->fire('update_profile_form', $form, $section, $id, $info);
 
         // Single quotes around non-empty values and nothing for empty values
         $temp = array();
@@ -991,55 +996,65 @@ public function update_profile($id, $info, $section)
             message(__('Bad request'), '404');
         }
 
-        DB::for_table('users')->where('id', $id)
-            ->find_one()
-            ->set($temp)
-            ->save();
+        $update_user = DB::for_table('users')
+                        ->where('id', $id)
+                        ->find_one()
+                        ->set($temp);
+        $update_user = $this->hook->fireDB('update_profile_query', $update_user);
+        $update_user = $update_user->save();
 
         // If we changed the username we have to update some stuff
         if ($username_updated) {
-            $bans_updated = DB::for_table('bans')->where('username', $info['old_username'])
-                                ->update_many('username', $form['username']);
-
-            DB::for_table('posts')
-                ->where('poster_id', $id)
-                ->update_many('poster', $form['username']);
-
-            DB::for_table('posts')
-                ->where('edited_by', $info['old_username'])
-                ->update_many('edited_by', $form['username']);
-
-            DB::for_table('topics')
-                ->where('poster', $info['old_username'])
-                ->update_many('poster', $form['username']);
-
-            DB::for_table('topics')
-                ->where('last_poster', $info['old_username'])
-                ->update_many('last_poster', $form['username']);
-
-            DB::for_table('forums')
-                ->where('last_poster', $info['old_username'])
-                ->update_many('last_poster', $form['username']);
-
-            DB::for_table('online')
-                ->where('ident', $info['old_username'])
-                ->update_many('ident', $form['username']);
+            $bans_updated = DB::for_table('bans')
+                                ->where('username', $info['old_username']);
+            $bans_updated = $this->hook->fireDB('update_profile_bans_updated', $bans_updated);
+            $bans_updated = $bans_updated->update_many('username', $form['username']);
+
+            $update_poster_id = DB::for_table('posts')
+                                ->where('poster_id', $id);
+            $update_poster_id = $this->hook->fireDB('update_profile_poster_id', $update_poster_id);
+            $update_poster_id = $update_poster_id->update_many('poster', $form['username']);
+
+            $update_posts = DB::for_table('posts')
+                                ->where('edited_by', $info['old_username']);
+            $update_posts = $this->hook->fireDB('update_profile_posts', $update_posts);
+            $update_posts = $update_posts->update_many('edited_by', $form['username']);
+
+            $update_topics_poster = DB::for_table('topics')
+                                      ->where('poster', $info['old_username']);
+            $update_topics_poster = $this->hook->fireDB('update_profile_topics_poster', $update_topics_poster);
+            $update_topics_poster = $update_topics_poster->update_many('poster', $form['username']);
+
+            $update_topics_last_poster = DB::for_table('topics')
+                                            ->where('last_poster', $info['old_username']);
+            $update_topics_last_poster = $this->hook->fireDB('update_profile_topics_last_poster', $update_topics_last_poster);
+            $update_topics_last_poster = $update_topics_last_poster->update_many('last_poster', $form['username']);
+
+            $update_forums = DB::for_table('forums')
+                                ->where('last_poster', $info['old_username']);
+            $update_forums = $this->hook->fireDB('update_profile_forums', $update_forums);
+            $update_forums = $update_forums->update_many('last_poster', $form['username']);
+
+            $update_online = DB::for_table('online')
+                                ->where('ident', $info['old_username']);
+            $update_online = $this->hook->fireDB('update_profile_online', $update_online);
+            $update_online = $update_online->update_many('ident', $form['username']);
 
             // If the user is a moderator or an administrator we have to update the moderator lists
             $group_id = DB::for_table('users')
-                ->where('id', $id)
-                ->find_one_col('group_id');
+                            ->where('id', $id);
+            $group_id = $this->hook->fireDB('update_profile_group_id', $update_online);
+            $group_id = $group_id->find_one_col('group_id');
 
             $group_mod = DB::for_table('groups')
-                ->where('g_id', $group_id)
-                ->find_one_col('g_moderator');
+                            ->where('g_id', $group_id);
+            $group_mod = $this->hook->fireDB('update_profile_group_mod', $group_mod);
+            $group_mod = $group_mod->find_one_col('g_moderator');
 
             if ($group_id == FEATHER_ADMIN || $group_mod == '1') {
-                $select_mods = array('id', 'moderators');
 
-                $result = DB::for_table('forums')
-                    ->select_many($select_mods)
-                    ->find_many();
+                // Loop through all forums
+                $result = $this->loop_mod_forums();
 
                 foreach($result as $cur_forum) {
                     $cur_moderators = ($cur_forum['moderators'] != '') ? unserialize($cur_forum['moderators']) : array();
@@ -1049,10 +1064,12 @@ public function update_profile($id, $info, $section)
                         $cur_moderators[$form['username']] = $id;
                         uksort($cur_moderators, 'utf8_strcasecmp');
 
-                        DB::for_table('forums')->where('id', $cur_forum['id'])
-                            ->find_one()
-                            ->set('moderators', serialize($cur_moderators))
-                            ->save();
+                        $update_mods = DB::for_table('forums')
+                                        ->where('id', $cur_forum['id'])
+                                        ->find_one()
+                                        ->set('moderators', serialize($cur_moderators));
+                        $update_mods = $this->hook->fireDB('update_profile_mods', $update_mods);
+                        $update_mods = $update_mods->save();
                     }
                 }
             }
@@ -1070,21 +1087,22 @@ public function update_profile($id, $info, $section)
             }
         }
 
+        $section = $this->hook->fireDB('update_profile', $section, $id);
+
         redirect(get_link('user/'.$id.'/section/'.$section.'/'), __('Profile redirect'));
     }
 
     public function get_user_info($id)
     {
-
-
-        $select_get_user_info = array('u.id', 'u.username', 'u.email', 'u.title', 'u.realname', 'u.url', 'u.jabber', 'u.icq', 'u.msn', 'u.aim', 'u.yahoo', 'u.location', 'u.signature', 'u.disp_topics', 'u.disp_posts', 'u.email_setting', 'u.notify_with_post', 'u.auto_notify', 'u.show_smilies', 'u.show_img', 'u.show_img_sig', 'u.show_avatars', 'u.show_sig', 'u.timezone', 'u.dst', 'u.language', 'u.style', 'u.num_posts', 'u.last_post', 'u.registered', 'u.registration_ip', 'u.admin_note', 'u.date_format', 'u.time_format', 'u.last_visit', 'g.g_id', 'g.g_user_title', 'g.g_moderator');
+        $user['select'] = array('u.id', 'u.username', 'u.email', 'u.title', 'u.realname', 'u.url', 'u.jabber', 'u.icq', 'u.msn', 'u.aim', 'u.yahoo', 'u.location', 'u.signature', 'u.disp_topics', 'u.disp_posts', 'u.email_setting', 'u.notify_with_post', 'u.auto_notify', 'u.show_smilies', 'u.show_img', 'u.show_img_sig', 'u.show_avatars', 'u.show_sig', 'u.timezone', 'u.dst', 'u.language', 'u.style', 'u.num_posts', 'u.last_post', 'u.registered', 'u.registration_ip', 'u.admin_note', 'u.date_format', 'u.time_format', 'u.last_visit', 'g.g_id', 'g.g_user_title', 'g.g_moderator');
 
         $user = DB::for_table('users')
-            ->table_alias('u')
-            ->select_many($select_get_user_info)
-            ->left_outer_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
-            ->where('u.id', $id)
-            ->find_one();
+                    ->table_alias('u')
+                    ->select_many($user['select'])
+                    ->left_outer_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
+                    ->where('u.id', $id);
+        $user = $this->hook->fireDB('get_user_info', $user);
+        $user = $user->find_one();
 
         if (!$user) {
             message(__('Bad request'), '404');
@@ -1097,6 +1115,8 @@ public function parse_user_info($user)
     {
         $user_info = array();
 
+        $user_info = $this->hook->fire('parse_user_info_start', $user_info, $user);
+
         $user_info['personal'][] = '<dt>'.__('Username').'</dt>';
         $user_info['personal'][] = '<dd>'.feather_escape($user['username']).'</dd>';
 
@@ -1203,6 +1223,8 @@ public function parse_user_info($user)
         $user_info['activity'][] = '<dt>'.__('Registered').'</dt>';
         $user_info['activity'][] = '<dd>'.format_time($user['registered'], true).'</dd>';
 
+        $user_info = $this->hook->fire('parse_user_info', $user_info);
+
         return $user_info;
     }
 
@@ -1210,6 +1232,8 @@ public function edit_essentials($id, $user)
     {
         $user_disp = array();
 
+        $user_disp = $this->hook->fire('edit_essentials_start', $user_disp, $id, $user);
+
         if ($this->user->is_admmod) {
             if ($this->user->g_id == FEATHER_ADMIN || $this->user->g_mod_rename_users == '1') {
                 $user_disp['username_field'] = '<label class="required"><strong>'.__('Username').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_username" value="'.feather_escape($user['username']).'" size="25" maxlength="25" /><br /></label>'."\n";
@@ -1248,6 +1272,8 @@ public function edit_essentials($id, $user)
 
         $user_disp['posts_field'] .= (!empty($posts_actions) ? '<p class="actions">'.implode(' - ', $posts_actions).'</p>' : '')."\n";
 
+        $user_disp = $this->hook->fire('edit_essentials', $user_disp);
+
         return $user_disp;
     }
 
@@ -1255,12 +1281,16 @@ public function get_group_list($user)
     {
         $output = '';
 
-        $select_group_list = array('g_id', 'g_title');
+        $user = $this->hook->fire('get_group_list_start', $user);
 
-        $result = DB::for_table('groups')->select_many($select_group_list)
-                      ->where_not_equal('g_id', FEATHER_GUEST)
-                      ->order_by('g_title')
-                      ->find_many();
+        $result['select'] = array('g_id', 'g_title');
+
+        $result = DB::for_table('groups')
+                    ->select_many($result['select'])
+                    ->where_not_equal('g_id', FEATHER_GUEST)
+                    ->order_by('g_title');
+        $result = $this->hook->fireDB('get_group_list_query', $result);
+        $result = $result->find_many();
 
         foreach ($result as $cur_group) {
             if ($cur_group['g_id'] == $user['g_id'] || ($cur_group['g_id'] == $this->config['o_default_user_group'] && $user['g_id'] == '')) {
@@ -1269,6 +1299,8 @@ public function get_group_list($user)
                 $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
             }
         }
+
+        $output = $this->hook->fire('get_group_list', $output);
         
         return $output;
     }
@@ -1277,22 +1309,24 @@ public function get_forum_list($id)
     {
         $output = '';
 
-        $select_get_forum_list = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.moderators');
-        $order_by_get_forum_list = array('c.disp_position', 'c.id', 'f.disp_position');
+        $id = $this->hook->fire('get_forum_list_start', $id);
+
+        $result['select'] = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.moderators');
+        $result['order_by'] = array('c.disp_position', 'c.id', 'f.disp_position');
 
         $result = DB::for_table('categories')
-            ->table_alias('c')
-            ->select_many($select_get_forum_list)
-            ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
-            ->where_null('f.redirect_url')
-            ->order_by_many($order_by_get_forum_list)
-            ->find_many();
+                    ->table_alias('c')
+                    ->select_many($result['select'])
+                    ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
+                    ->where_null('f.redirect_url')
+                    ->order_by_many($result['order_by']);
+        $result = $this->hook->fireDB('get_forum_list', $result);
+        $result = $result->find_many();
 
         $cur_category = 0;
         foreach($result as $cur_forum) {
             if ($cur_forum['cid'] != $cur_category) {
                 // A new category since last iteration?
-
                 if ($cur_category) {
                     $output .= "\n\t\t\t\t\t\t\t\t".'</div>';
                 }
@@ -1309,6 +1343,8 @@ public function get_forum_list($id)
 
             $output .= "\n\t\t\t\t\t\t\t\t\t".'<label><input type="checkbox" name="moderator_in['.$cur_forum['fid'].']" value="1"'.((in_array($id, $moderators)) ? ' checked="checked"' : '').' />'.feather_escape($cur_forum['forum_name']).'<br /></label>'."\n";
         }
+
+        $output = $this->hook->fire('get_forum_list', $output);
         
         return $output;
     }
@@ -1318,6 +1354,8 @@ public function get_forum_list($id)
     //
     public function generate_profile_menu($page = '', $id)
     {
+        $page = $this->hook->fire('generate_profile_menu', $page, $id);
+
         $this->feather->render('profile/menu.php', array(
             'id' => $id,
             'feather_config' => $this->config,

From 6e35a321cfc4c4903335235961346ba096e990d5 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 23 Aug 2015 16:03:53 +0200
Subject: [PATCH 137/353] Get rid of get_remote_address

---
 Slim/Extras/Middleware/FeatherBB.php |  2 +-
 controller/header.php                |  2 +-
 include/functions.php                | 13 -------------
 model/login.php                      |  4 ++--
 model/post.php                       | 10 +++++-----
 model/register.php                   |  6 +++---
 model/search.php                     |  6 +++---
 7 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/Slim/Extras/Middleware/FeatherBB.php b/Slim/Extras/Middleware/FeatherBB.php
index f9e1b6b5..1bebe18a 100644
--- a/Slim/Extras/Middleware/FeatherBB.php
+++ b/Slim/Extras/Middleware/FeatherBB.php
@@ -393,7 +393,7 @@ public function check_bans()
 
         // Add a dot or a colon (depending on IPv4/IPv6) at the end of the IP address to prevent banned address
         // 192.168.0.5 from matching e.g. 192.168.0.50
-        $user_ip = get_remote_address();
+        $user_ip = $this->app->request->getIp();
         $user_ip .= (strpos($user_ip, '.') !== false) ? '.' : ':';
 
         $bans_altered = false;
diff --git a/controller/header.php b/controller/header.php
index edcbcb50..0036e4c5 100644
--- a/controller/header.php
+++ b/controller/header.php
@@ -143,7 +143,7 @@ private function getNavlinks()
                 $links[] = '<li id="navadmin"'.((FEATHER_ACTIVE_PAGE == 'admin') ? ' class="isactive"' : '').'><a href="'.get_link('admin/').'">'.__('Admin').'</a></li>';
             }
 
-            $links[] = '<li id="navlogout"><a href="'.get_link('logout/id/'.$this->user->id.'/token/'.feather_hash($this->user->id.feather_hash(get_remote_address()))).'/">'.__('Logout').'</a></li>';
+            $links[] = '<li id="navlogout"><a href="'.get_link('logout/id/'.$this->user->id.'/token/'.feather_hash($this->user->id.feather_hash($this->request->getIp()))).'/">'.__('Logout').'</a></li>';
         }
 
         // Are there any additional navlinks we should insert into the array before imploding it?
diff --git a/include/functions.php b/include/functions.php
index c50c714b..7f582dcf 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -811,19 +811,6 @@ function feather_hash($str)
 }
 
 
-//
-// Try to determine the correct remote IP-address
-//
-function get_remote_address()
-{
-    $feather = \Slim\Slim::getInstance();
-
-    $remote_addr = $feather->request->getIp();
-
-    return $remote_addr;
-}
-
-
 //
 // Calls htmlspecialchars with a few options already set
 //
diff --git a/model/login.php b/model/login.php
index 28631803..cf25dedd 100644
--- a/model/login.php
+++ b/model/login.php
@@ -67,7 +67,7 @@ public function login()
         }
 
         // Remove this user's guest entry from the online list
-        $delete_online = DB::for_table('online')->where('ident', get_remote_address());
+        $delete_online = DB::for_table('online')->where('ident', $this->request->getIp());
         $delete_online = $this->hook->fireDB('delete_online_login', $delete_online);
         $delete_online = $delete_online->delete_many();
 
@@ -89,7 +89,7 @@ public function logout($id, $token)
     {
         $token = $this->hook->fire('logout_start', $token, $id);
 
-        if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != feather_hash($this->user->id.feather_hash(get_remote_address()))) {
+        if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != feather_hash($this->user->id.feather_hash($this->request->getIp()))) {
             header('Location: '.get_base_url());
             exit;
         }
diff --git a/model/post.php b/model/post.php
index 49fed8d0..f4f096cf 100644
--- a/model/post.php
+++ b/model/post.php
@@ -245,7 +245,7 @@ public function insert_reply($post, $tid, $cur_posting, $is_subscribed)
             $query['insert'] = array(
                 'poster' => $post['username'],
                 'poster_id' => $this->user->id,
-                'poster_ip' => get_remote_address(),
+                'poster_ip' => $this->request->getIp(),
                 'message' => $post['message'],
                 'hide_smilies' => $post['hide_smilies'],
                 'posted'  => $post['time'],
@@ -292,7 +292,7 @@ public function insert_reply($post, $tid, $cur_posting, $is_subscribed)
             // It's a guest. Insert the new post
             $query['insert'] = array(
                 'poster' => $post['username'],
-                'poster_ip' => get_remote_address(),
+                'poster_ip' => $this->request->getIp(),
                 'message' => $post['message'],
                 'hide_smilies' => $post['hide_smilies'],
                 'posted'  => $post['time'],
@@ -496,7 +496,7 @@ public function insert_topic($post, $fid)
             $query['insert'] = array(
                 'poster' => $post['username'],
                 'poster_id' => $this->user->id,
-                'poster_ip' => get_remote_address(),
+                'poster_ip' => $this->request->getIp(),
                 'message' => $post['message'],
                 'hide_smilies' => $post['hide_smilies'],
                 'posted'  => $post['time'],
@@ -513,7 +513,7 @@ public function insert_topic($post, $fid)
             // Create the post ("topic post")
             $query['insert'] = array(
                 'poster' => $post['username'],
-                'poster_ip' => get_remote_address(),
+                'poster_ip' => $this->request->getIp(),
                 'message' => $post['message'],
                 'hide_smilies' => $post['hide_smilies'],
                 'posted'  => $post['time'],
@@ -712,7 +712,7 @@ public function increment_post_count($post, $new_tid)
         } else {
             // Update the last_post field for guests
             $last_post = DB::for_table('online')
-                            ->where('ident', get_remote_address())
+                            ->where('ident', $this->request->getIp())
                             ->find_one()
                             ->set('last_post', $post['time']);
             $last_post = $this->hook->fireDB('increment_post_count_last_post', $last_post);
diff --git a/model/register.php b/model/register.php
index 53dd5e8d..c1dfba9e 100644
--- a/model/register.php
+++ b/model/register.php
@@ -24,14 +24,14 @@ public function __construct()
  
     public function check_for_errors()
     {
-        global $lang_register, $lang_antispam, $lang_antispam_questions;
+        global $lang_antispam, $lang_antispam_questions;
 
         $user = array();
         $user['errors'] = '';
 
         // Check that someone from this IP didn't register a user within the last hour (DoS prevention)
         $already_registered = DB::for_table('users')
-                                  ->where('registration_ip', get_remote_address())
+                                  ->where('registration_ip', $this->request->getIp())
                                   ->where_gt('registered', time() - 3600)
                                   ->find_one();
 
@@ -141,7 +141,7 @@ public function insert_user($user)
             'language'        => $user['language'],
             'style'           => $this->config['o_default_style'],
             'registered'      => $now,
-            'registration_ip' => get_remote_address(),
+            'registration_ip' => $this->request->getIp(),
             'last_visit'      => $now,
         );
 
diff --git a/model/search.php b/model/search.php
index ba8ba002..555fa112 100644
--- a/model/search.php
+++ b/model/search.php
@@ -98,7 +98,7 @@ public function get_search_results()
 
         // If a valid search_id was supplied we attempt to fetch the search results from the db
         if (isset($search_id)) {
-            $ident = ($this->user->is_guest) ? get_remote_address() : $this->user->username;
+            $ident = ($this->user->is_guest) ? $this->request->getIp() : $this->user->username;
 
             $search_data = DB::for_table('search_cache')
                                 ->where('id', $search_id)
@@ -135,7 +135,7 @@ public function get_search_results()
                     DB::for_table('users')->where('id', $this->user->id)
                                                         ->update_many('last_search', time());
                 } else {
-                    DB::for_table('online')->where('ident', get_remote_address())
+                    DB::for_table('online')->where('ident', $this->request->getIp())
                                                          ->update_many('last_search', time());
                 }
 
@@ -520,7 +520,7 @@ public function get_search_results()
             ));
             $search_id = mt_rand(1, 2147483647);
 
-            $ident = ($this->user->is_guest) ? get_remote_address() : $this->user->username;
+            $ident = ($this->user->is_guest) ? $this->request->getIp() : $this->user->username;
 
             $insert_cache = array(
                 'id'   =>  $search_id,

From 75d5f7556562a4237f47206d3e6f7c0ab5fa7a19 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 23 Aug 2015 16:35:07 +0200
Subject: [PATCH 138/353] Add more hooks

---
 model/register.php | 53 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 14 deletions(-)

diff --git a/model/register.php b/model/register.php
index c1dfba9e..fb190d64 100644
--- a/model/register.php
+++ b/model/register.php
@@ -20,6 +20,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
  
     public function check_for_errors()
@@ -29,11 +30,14 @@ public function check_for_errors()
         $user = array();
         $user['errors'] = '';
 
+        $user = $this->hook->fire('check_for_errors_start', $user);
+
         // Check that someone from this IP didn't register a user within the last hour (DoS prevention)
         $already_registered = DB::for_table('users')
                                   ->where('registration_ip', $this->request->getIp())
-                                  ->where_gt('registered', time() - 3600)
-                                  ->find_one();
+                                  ->where_gt('registered', time() - 3600);
+        $already_registered = $this->hook->fireDB('check_for_errors_ip_query', $already_registered);
+        $already_registered = $already_registered->find_one();
 
         if ($already_registered) {
             message(__('Registration flood'));
@@ -94,9 +98,11 @@ public function check_for_errors()
         // Check if someone else already has registered with that email address
         $dupe_list = array();
 
-        $dupe_mail = DB::for_table('users')->select('username')
-            ->where('email', $user['email1'])
-            ->find_many();
+        $dupe_mail = DB::for_table('users')
+                        ->select('username')
+                        ->where('email', $user['email1']);
+        $dupe_mail = $this->hook->fireDB('check_for_errors_dupe', $dupe_mail);
+        $dupe_mail = $dupe_mail->find_many();
 
         if ($dupe_mail) {
             if ($this->config['p_allow_dupe_email'] == '0') {
@@ -118,11 +124,15 @@ public function check_for_errors()
             $user['language'] = $this->config['o_default_lang'];
         }
 
+        $user = $this->hook->fire('check_for_errors', $user);
+
         return $user;
     }
 
     public function insert_user($user)
     {
+        $user = $this->hook->fire('insert_user_start', $user);
+
         // Insert the new user into the database. We do this now to get the last inserted ID for later use
         $now = time();
 
@@ -130,7 +140,7 @@ public function insert_user($user)
         $password_hash = feather_hash($user['password1']);
 
         // Add the user
-        $insert_user = array(
+        $user['insert'] = array(
             'username'        => $user['username'],
             'group_id'        => $intial_group_id,
             'password'        => $password_hash,
@@ -145,10 +155,11 @@ public function insert_user($user)
             'last_visit'      => $now,
         );
 
-        DB::for_table('users')
-            ->create()
-            ->set($insert_user)
-            ->save();
+        $user = DB::for_table('users')
+                    ->create()
+                    ->set($user['insert']);
+        $user = $this->hook->fireDB('insert_user_query', $user);
+        $user = $user->save();
 
         $new_uid = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'users');
 
@@ -168,16 +179,19 @@ public function insert_user($user)
             if (isset($user['banned_email'])) {
                 // Load the "banned email register" template
                 $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/banned_email_register.tpl'));
+                $mail_tpl = $this->hook->fire('insert_user_banned_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
                 $first_crlf = strpos($mail_tpl, "\n");
                 $mail_subject = trim(substr($mail_tpl, 8, $first_crlf-8));
-                $mail_message = trim(substr($mail_tpl, $first_crlf));
+                $mail_subject = $this->hook->fire('insert_user_banned_mail_subject', $mail_subject);
 
+                $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
                 $mail_message = str_replace('<email>', $user['email1'], $mail_message);
                 $mail_message = str_replace('<profile_url>', get_link('user/'.$new_uid.'/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
+                $mail_message = $this->hook->fire('insert_user_banned_mail_message', $mail_message);
 
                 feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
             }
@@ -186,16 +200,19 @@ public function insert_user($user)
             if (!empty($dupe_list)) {
                 // Load the "dupe email register" template
                 $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/dupe_email_register.tpl'));
+                $mail_tpl = $this->hook->fire('insert_user_dupe_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
                 $first_crlf = strpos($mail_tpl, "\n");
                 $mail_subject = trim(substr($mail_tpl, 8, $first_crlf-8));
-                $mail_message = trim(substr($mail_tpl, $first_crlf));
+                $mail_subject = $this->hook->fire('insert_user_dupe_mail_subject', $mail_subject);
 
+                $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
                 $mail_message = str_replace('<dupe_list>', implode(', ', $dupe_list), $mail_message);
                 $mail_message = str_replace('<profile_url>', get_link('user/'.$new_uid.'/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
+                $mail_message = $this->hook->fire('insert_user_dupe_mail_message', $mail_message);
 
                 feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
             }
@@ -204,17 +221,20 @@ public function insert_user($user)
             if ($this->config['o_regs_report'] == '1') {
                 // Load the "new user" template
                 $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/new_user.tpl'));
+                $mail_tpl = $this->hook->fire('insert_user_new_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
                 $first_crlf = strpos($mail_tpl, "\n");
                 $mail_subject = trim(substr($mail_tpl, 8, $first_crlf-8));
-                $mail_message = trim(substr($mail_tpl, $first_crlf));
+                $mail_subject = $this->hook->fire('insert_user_new_mail_subject', $mail_subject);
 
+                $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
                 $mail_message = str_replace('<base_url>', get_base_url().'/', $mail_message);
                 $mail_message = str_replace('<profile_url>', get_link('user/'.$new_uid.'/'), $mail_message);
                 $mail_message = str_replace('<admin_url>', get_link('user/'.$new_uid.'/section/admin/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
+                $mail_message = $this->hook->fire('insert_user_new_mail_message', $mail_message);
 
                 feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
             }
@@ -224,18 +244,21 @@ public function insert_user($user)
         if ($this->config['o_regs_verify'] == '1') {
             // Load the "welcome" template
             $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/welcome.tpl'));
+            $mail_tpl = $this->hook->fire('insert_user_welcome_mail_tpl', $mail_tpl);
 
             // The first row contains the subject
             $first_crlf = strpos($mail_tpl, "\n");
             $mail_subject = trim(substr($mail_tpl, 8, $first_crlf-8));
-            $mail_message = trim(substr($mail_tpl, $first_crlf));
+            $mail_subject = $this->hook->fire('insert_user_welcome_mail_subject', $mail_subject);
 
+            $mail_message = trim(substr($mail_tpl, $first_crlf));
             $mail_subject = str_replace('<board_title>', $this->config['o_board_title'], $mail_subject);
             $mail_message = str_replace('<base_url>', get_base_url().'/', $mail_message);
             $mail_message = str_replace('<username>', $user['username'], $mail_message);
             $mail_message = str_replace('<password>', $user['password1'], $mail_message);
             $mail_message = str_replace('<login_url>', get_link('login/'), $mail_message);
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
+            $mail_message = $this->hook->fire('insert_user_welcome_mail_message', $mail_message);
 
             feather_mail($user['email1'], $mail_subject, $mail_message);
 
@@ -244,6 +267,8 @@ public function insert_user($user)
 
         feather_setcookie($new_uid, $password_hash, time() + $this->config['o_timeout_visit']);
 
+        $this->hook->fire('insert_user');
+
         redirect(get_base_url(), __('Reg complete'));
     }
 }

From 1fbcafb3cc73baf634ce367d1df15b01c4eda6cc Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 23 Aug 2015 16:35:30 +0200
Subject: [PATCH 139/353] Switch remaining $lang_ to gettext

---
 model/search.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/model/search.php b/model/search.php
index 555fa112..18b6925b 100644
--- a/model/search.php
+++ b/model/search.php
@@ -25,8 +25,6 @@ public function __construct()
  
     public function get_search_results()
     {
-        global $lang_search;
-
         $search = array();
 
         $action = ($this->request->get('action')) ? $this->request->get('action') : null;
@@ -635,20 +633,20 @@ public function get_search_results()
                     $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), feather_escape($subscriber_name)).'</a>';
                 } else {
                     $search_url = str_replace('_', '/', $search_type[1]);
-                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/'.$search_url.'/').'">'.$lang_search['Quick search '.$search_type[1]].'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/'.$search_url.'/').'">'.__('Quick search '.$search_type[1]).'</a>';
                 }
             } else {
                 $keywords = $author = '';
 
                 if ($search_type[0] == 'both') {
                     list($keywords, $author) = $search_type[1];
-                    $search['crumbs_text']['search_type'] = sprintf($lang_search['By both show as '.$show_as], feather_escape($keywords), feather_escape($author));
+                    $search['crumbs_text']['search_type'] = sprintf(__('By both show as '.$show_as), feather_escape($keywords), feather_escape($author));
                 } elseif ($search_type[0] == 'keywords') {
                     $keywords = $search_type[1];
-                    $search['crumbs_text']['search_type'] = sprintf($lang_search['By keywords show as '.$show_as], feather_escape($keywords));
+                    $search['crumbs_text']['search_type'] = sprintf(__('By keywords show as '.$show_as), feather_escape($keywords));
                 } elseif ($search_type[0] == 'author') {
                     $author = $search_type[1];
-                    $search['crumbs_text']['search_type'] = sprintf($lang_search['By user show as '.$show_as], feather_escape($author));
+                    $search['crumbs_text']['search_type'] = sprintf(__('By user show as '.$show_as), feather_escape($author));
                 }
 
                 $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=search&amp;keywords='.urlencode($keywords).'&amp;author='.urlencode($author).'&amp;forums='.$search_type[2].'&amp;search_in='.$search_type[3].'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir.'&amp;show_as='.$show_as).'">'.$search['crumbs_text']['search_type'].'</a>';
@@ -662,7 +660,7 @@ public function get_search_results()
 
     public function display_search_results($search)
     {
-        global $lang_search, $pd;
+        global $pd;
 
         // Get topic/forum tracking data
         if (!$this->user->is_guest) {
@@ -710,7 +708,6 @@ public function display_search_results($search)
                     'url_topic' => $url_topic,
                     'cur_search' => $cur_search,
                     'forum' => $forum,
-                    'lang_search' => $lang_search,
                     )
                 );
             } else {
@@ -777,8 +774,6 @@ public function display_search_results($search)
 
     public function get_list_forums()
     {
-        global $lang_search;
-        
         $output = '';
 
         $select_get_list_forums = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.redirect_url');

From c6a65e44974f0697e1a4cb66400ab10ea9ebf314 Mon Sep 17 00:00:00 2001
From: capkokoon <capkokoon@users.noreply.github.com>
Date: Sun, 23 Aug 2015 16:38:04 +0200
Subject: [PATCH 140/353] Delete .htaccess

---
 .htaccess | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 .htaccess

diff --git a/.htaccess b/.htaccess
deleted file mode 100644
index 33353df3..00000000
--- a/.htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-RewriteEngine On
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^ index.php [QSA,L]
-Options -Indexes

From 972f280ebdfc4dc1200f68c89aa0bda3da442f9e Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 23 Aug 2015 17:17:37 +0200
Subject: [PATCH 141/353] Merge branch 'hooks' into development

---
 include/cache.php               | 236 ---------------
 include/classes/core.class.php  |  10 +-
 include/classes/hooks.class.php |   4 +-
 model/admin/options.php         |  14 +-
 model/index.php                 | 127 +++++---
 model/login.php                 | 107 ++++---
 model/profile.php               | 508 ++++++++++++++++++++------------
 7 files changed, 487 insertions(+), 519 deletions(-)

diff --git a/include/cache.php b/include/cache.php
index b92c5ded..e862ed62 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -7,226 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-
-//
-// Generate the config cache PHP script
-//
-function generate_config_cache()
-{
-    // Get the forum config from the DB
-    $result = \DB::for_table('config')->find_array();
-
-    $output = array();
-    foreach ($result as $cur_config_item) {
-        $output[$cur_config_item['conf_name']] = $cur_config_item['conf_value'];
-    }
-
-    // Output config as PHP code
-    $content = '<?php'."\n\n".'define(\'FEATHER_CONFIG_LOADED\', 1);'."\n\n".'$feather_config = '.var_export($output, true).';'."\n\n".'?>';
-    featherbb_write_cache_file('cache_config.php', $content);
-}
-
-
-//
-// Generate the bans cache PHP script
-//
-function generate_bans_cache()
-{
-    // Get the ban list from the DB
-    $result = \DB::for_table('bans')->find_array();
-
-    $output = array();
-    foreach ($result as $cur_ban) {
-        $output[] = $cur_ban;
-    }
-
-    // Output ban list as PHP code
-    $content = '<?php'."\n\n".'define(\'FEATHER_BANS_LOADED\', 1);'."\n\n".'$feather_bans = '.var_export($output, true).';'."\n\n".'?>';
-    featherbb_write_cache_file('cache_bans.php', $content);
-}
-
-
-//
-// Generate quick jump cache PHP scripts
-//
-function generate_quickjump_cache($group_id = false)
-{
-
-
-    $groups = array();
-
-    // If a group_id was supplied, we generate the quick jump cache for that group only
-    if ($group_id !== false) {
-        // Is this group even allowed to read forums?
-        $read_board = \DB::for_table('groups')->where('g_id', $group_id)
-                            ->find_one_col('g_read_board');
-
-        $groups[$group_id] = $read_board;
-    } else {
-        // A group_id was not supplied, so we generate the quick jump cache for all groups
-        $select_quickjump_all_groups = array('g_id', 'g_read_board');
-        $result = \DB::for_table('groups')->select_many($select_quickjump_all_groups)
-                        ->find_many();
-
-        foreach ($result as $row) {
-            $groups[$row['g_id']] = $row['g_read_board'];
-        }
-    }
-
-    // Loop through the groups in $groups and output the cache for each of them
-    foreach ($groups as $group_id => $read_board) {
-        // Output quick jump as PHP code
-        $output = '<?php'."\n\n".'if (!defined(\'FEATHER\')) exit;'."\n".'define(\'FEATHER_QJ_LOADED\', 1);'."\n".'$forum_id = isset($forum_id) ? $forum_id : 0;'."\n\n".'?>';
-
-        if ($read_board == '1') {
-            $select_generate_quickjump_cache = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.redirect_url');
-            $where_generate_quickjump_cache = array(
-                array('fp.read_forum' => 'IS NULL'),
-                array('fp.read_forum' => '1')
-            );
-            $order_by_generate_quickjump_cache = array('c.disp_position', 'c.id', 'f.disp_position');
-
-            $result = \DB::for_table('categories')
-                            ->table_alias('c')
-                            ->select_many($select_generate_quickjump_cache)
-                            ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
-                            ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
-                            ->left_outer_join('forum_perms', array('fp.group_id', '=', $group_id), null, true)
-                            ->where_any_is($where_generate_quickjump_cache)
-                            ->where_null('f.redirect_url')
-                            ->order_by_many($order_by_generate_quickjump_cache)
-                            ->find_many();
-
-            if ($result) {
-                $output .= "\t\t\t\t".'<form id="qjump" method="get" action="">'."\n\t\t\t\t\t".'<div><label><span><?php _e(\'Jump to\') ?>'.'<br /></span>'."\n\t\t\t\t\t".'<select name="id" onchange="window.location=(\''.get_link('forum/').'\'+this.options[this.selectedIndex].value)">'."\n";
-
-                $cur_category = 0;
-                foreach ($result as $cur_forum) {
-                    if ($cur_forum['cid'] != $cur_category) {
-                        // A new category since last iteration?
-
-                        if ($cur_category) {
-                            $output .= "\t\t\t\t\t\t".'</optgroup>'."\n";
-                        }
-
-                        $output .= "\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cur_forum['cat_name']).'">'."\n";
-                        $cur_category = $cur_forum['cid'];
-                    }
-
-                    $redirect_tag = ($cur_forum['redirect_url'] != '') ? ' &gt;&gt;&gt;' : '';
-                    $output .= "\t\t\t\t\t\t\t".'<option value="'.$cur_forum['fid'].'/'.url_friendly($cur_forum['forum_name']).'/'.'"<?php echo ($forum_id == '.$cur_forum['fid'].') ? \' selected="selected"\' : \'\' ?>>'.feather_escape($cur_forum['forum_name']).$redirect_tag.'</option>'."\n";
-                }
-
-                $output .= "\t\t\t\t\t\t".'</optgroup>'."\n\t\t\t\t\t".'</select></label>'."\n\t\t\t\t\t".'<noscript><input type="submit" value="<?php _e(\'Go\') ?>" accesskey="g" /></noscript>'."\n\t\t\t\t\t".'</div>'."\n\t\t\t\t".'</form>'."\n";
-            }
-        }
-
-        featherbb_write_cache_file('cache_quickjump_'.$group_id.'.php', $output);
-    }
-}
-
-
-//
-// Generate the censoring cache PHP script
-//
-function generate_censoring_cache()
-{
-    $select_generate_censoring_cache = array('search_for', 'replace_with');
-    $result = \DB::for_table('censoring')->select_many($select_generate_censoring_cache)
-                    ->find_many();
-
-    $search_for = $replace_with = array();
-    $i = 0;
-    foreach ($result as $row) {
-        $replace_with[$i] = $row['replace_with'];
-        $search_for[$i] = '%(?<=[^\p{L}\p{N}])('.str_replace('\*', '[\p{L}\p{N}]*?', preg_quote($row['search_for'], '%')).')(?=[^\p{L}\p{N}])%iu';
-        ++$i;
-    }
-
-    // Output censored words as PHP code
-    $content = '<?php'."\n\n".'define(\'FEATHER_CENSOR_LOADED\', 1);'."\n\n".'$search_for = '.var_export($search_for, true).';'."\n\n".'$replace_with = '.var_export($replace_with, true).';'."\n\n".'?>';
-    featherbb_write_cache_file('cache_censoring.php', $content);
-}
-
-
-//
-// Generate the stopwords cache PHP script
-//
-function generate_stopwords_cache()
-{
-    $stopwords = array();
-
-    $d = dir(FEATHER_ROOT.'lang');
-    while (($entry = $d->read()) !== false) {
-        if ($entry{0} == '.') {
-            continue;
-        }
-
-        if (is_dir(FEATHER_ROOT.'lang/'.$entry) && file_exists(FEATHER_ROOT.'lang/'.$entry.'/stopwords.txt')) {
-            $stopwords = array_merge($stopwords, file(FEATHER_ROOT.'lang/'.$entry.'/stopwords.txt'));
-        }
-    }
-    $d->close();
-
-    // Tidy up and filter the stopwords
-    $stopwords = array_map('feather_trim', $stopwords);
-    $stopwords = array_filter($stopwords);
-
-    // Output stopwords as PHP code
-    $content = '<?php'."\n\n".'$cache_id = \''.generate_stopwords_cache_id().'\';'."\n".'if ($cache_id != generate_stopwords_cache_id()) return;'."\n\n".'define(\'FEATHER_STOPWORDS_LOADED\', 1);'."\n\n".'$stopwords = '.var_export($stopwords, true).';'."\n\n".'?>';
-    featherbb_write_cache_file('cache_stopwords.php', $content);
-}
-
-
-//
-// Load some information about the latest registered users
-//
-function generate_users_info_cache()
-{
-    $stats = array();
-
-    $stats['total_users'] = (\DB::for_table('users')->where_not_equal('group_id', FEATHER_UNVERIFIED)
-                                ->count('id')) - 1;
-
-    $select_generate_users_info_cache = array('id', 'username');
-    $last_user = \DB::for_table('users')->select_many($select_generate_users_info_cache)
-                        ->where_not_equal('group_id', FEATHER_UNVERIFIED)
-                        ->order_by_desc('registered')
-                        ->limit(1)
-                        ->find_array();
-    $stats['last_user'] = $last_user[0];
-
-    // Output users info as PHP code
-    $content = '<?php'."\n\n".'define(\'FEATHER_USERS_INFO_LOADED\', 1);'."\n\n".'$stats = '.var_export($stats, true).';'."\n\n".'?>';
-    featherbb_write_cache_file('cache_users_info.php', $content);
-}
-
-
-//
-// Generate the admins cache PHP script
-//
-function generate_admins_cache()
-{
-    // Get admins from the DB
-    $result = \DB::for_table('users')->select('id')
-                    ->where('group_id', FEATHER_ADMIN)
-                    ->find_array();
-
-    $output = array();
-    foreach ($result as $row) {
-        $output[] = $row['id'];
-    }
-
-    // Output admin list as PHP code
-    $content = '<?php'."\n\n".'define(\'FEATHER_ADMINS_LOADED\', 1);'."\n\n".'$feather_admins = '.var_export($output, true).';'."\n\n".'?>';
-    featherbb_write_cache_file('cache_admins.php', $content);
-}
-
 
 //
 // Safely write out a cache file.
@@ -250,22 +30,6 @@ function featherbb_write_cache_file($file, $content)
 }
 
 
-//
-// Delete all feed caches
-//
-function clear_feed_cache()
-{
-    $d = dir(FORUM_CACHE_DIR);
-    while (($entry = $d->read()) !== false) {
-        if (substr($entry, 0, 10) == 'cache_feed' && substr($entry, -4) == '.php') {
-            @unlink(FORUM_CACHE_DIR.$entry);
-        }
-        featherbb_invalidate_cached_file(FORUM_CACHE_DIR.$entry);
-    }
-    $d->close();
-}
-
-
 //
 // Invalidate updated php files that are cached by an opcache
 //
diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index c3884a51..a35d4912 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -41,12 +41,14 @@ public function __construct(array $data)
         $this->env_to_globals($this->forum_env); // Legacy
 
         // Load files
-        require $this->forum_env['FEATHER_ROOT'].'include/utf8/utf8.php'; // ?
+        require $this->forum_env['FEATHER_ROOT'].'include/utf8/utf8.php';
         require $this->forum_env['FEATHER_ROOT'].'include/functions.php';
         require $this->forum_env['FEATHER_ROOT'].'include/pomo/MO.php';
         require $this->forum_env['FEATHER_ROOT'].'include/l10n.php';
-        require $this->forum_env['FEATHER_ROOT'].'include/idiorm.php';
+        require $this->forum_env['FEATHER_ROOT'].'include/classes/database.class.php';
         require $this->forum_env['FEATHER_ROOT'].'include/classes/cache.class.php';
+        require $this->forum_env['FEATHER_ROOT'].'include/classes/hooks.class.php';
+        require $this->forum_env['FEATHER_ROOT'].'plugins/test/plugintest.php';
 
         // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
         setlocale(LC_CTYPE, 'C');
@@ -225,6 +227,10 @@ public function call()
         $this->app->config = $this->forum_settings; // Legacy
         extract($this->forum_settings); // Legacy
 
+        // Hooks
+        $this->app->hooks = new \FeatherBB\Hooks();
+        new \plugin\plugintest();
+
         // Define time formats
         $forum_time_formats = array($this->forum_settings['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
         $forum_date_formats = array($this->forum_settings['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
diff --git a/include/classes/hooks.class.php b/include/classes/hooks.class.php
index c8ed4387..3976277b 100644
--- a/include/classes/hooks.class.php
+++ b/include/classes/hooks.class.php
@@ -7,7 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-class hooks extends \Slim\Slim
+namespace FeatherBB;
+
+class Hooks extends \Slim\Slim
 {
     /**
      * Assign hook
diff --git a/model/admin/options.php b/model/admin/options.php
index a92ade18..ddfafbe6 100644
--- a/model/admin/options.php
+++ b/model/admin/options.php
@@ -231,11 +231,23 @@ public function update_options()
         }
 
         generate_config_cache();
-        clear_feed_cache();
+        $this->clear_feed_cache();
 
         redirect(get_link('admin/options/'), __('Options updated redirect'));
     }
 
+    public function clear_feed_cache()
+    {
+        $d = dir(FORUM_CACHE_DIR);
+        while (($entry = $d->read()) !== false) {
+            if (substr($entry, 0, 10) == 'cache_feed' && substr($entry, -4) == '.php') {
+                @unlink(FORUM_CACHE_DIR.$entry);
+            }
+            featherbb_invalidate_cached_file(FORUM_CACHE_DIR.$entry);
+        }
+        $d->close();
+    }
+
     public function get_styles()
     {
         $styles = forum_list_styles();
diff --git a/model/index.php b/model/index.php
index 0a7ac667..c5cf6066 100644
--- a/model/index.php
+++ b/model/index.php
@@ -21,23 +21,30 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
 
     // Returns page head
     public function get_page_head()
     {
+        $this->hook->fire('get_page_head_start');
+
         if ($this->config['o_feed_type'] == '1') {
             $page_head = array('feed' => '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;type=rss" title="'.__('RSS active topics feed').'" />');
         } elseif ($this->config['o_feed_type'] == '2') {
             $page_head = array('feed' => '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;type=atom" title="'.__('Atom active topics feed').'" />');
         }
 
+        $page_head = $this->hook->fire('get_page_head', $page_head);
+
         return $page_head;
     }
 
     // Returns forum action
     public function get_forum_actions()
     {
+        $this->hook->fire('get_forum_actions_start');
+
         $forum_actions = array();
 
         // Display a "mark all as read" link
@@ -45,31 +52,38 @@ public function get_forum_actions()
             $forum_actions[] = '<a href="'.get_link('mark-read/').'">'.__('Mark all as read').'</a>';
         }
 
+        $forum_actions = $this->hook->fire('get_forum_actions', $forum_actions);
+
         return $forum_actions;
     }
 
     // Detects if a "new" icon has to be displayed
     public function get_new_posts()
     {
-        $select_get_new_posts = array('f.id', 'f.last_post');
-        $where_get_new_posts_any = array(
+        $this->hook->fire('get_new_posts_start');
+
+        $query['select'] = array('f.id', 'f.last_post');
+        $query['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
 
-        $result = DB::for_table('forums')
+        $query = DB::for_table('forums')
             ->table_alias('f')
-            ->select_many($select_get_new_posts)
+            ->select_many($query['select'])
             ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
             ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-            ->where_any_is($where_get_new_posts_any)
-            ->where_gt('f.last_post', $this->user->last_visit)
-            ->find_result_set();
+            ->where_any_is($query['where'])
+            ->where_gt('f.last_post', $this->user->last_visit);
+
+        $query = $this->hook->fireDB('query_get_new_posts', $query);
+
+        $query = $query->find_result_set();
 
         $forums = $new_topics = array();
         $tracked_topics = get_tracked_topics();
 
-        foreach ($result as $cur_forum) {
+        foreach ($query as $cur_forum) {
             if (!isset($tracked_topics['forums'][$cur_forum->id]) || $tracked_topics['forums'][$cur_forum->id] < $cur_forum->last_post) {
                 $forums[$cur_forum->id] = $cur_forum->last_post;
             }
@@ -79,16 +93,19 @@ public function get_new_posts()
             if (empty($tracked_topics['topics'])) {
                 $new_topics = $forums;
             } else {
-                $select_get_new_posts_tracked_topics = array('forum_id', 'id', 'last_post');
+                $query['select'] = array('forum_id', 'id', 'last_post');
 
-                $result = DB::for_table('topics')
-                    ->select_many($select_get_new_posts_tracked_topics)
+                $query = DB::for_table('topics')
+                    ->select_many($query['select'])
                     ->where_in('forum_id', array_keys($forums))
                     ->where_gt('last_post', $this->user->last_visit)
-                    ->where_null('moved_to')
-                    ->find_result_set();
+                    ->where_null('moved_to');
+
+                $query = $this->hook->fireDB('get_new_posts_query', $query);
+
+                $query = $query->find_result_set();
 
-                foreach ($result as $cur_topic) {
+                foreach ($query as $cur_topic) {
                     if (!isset($new_topics[$cur_topic->forum_id]) && (!isset($tracked_topics['forums'][$cur_topic->forum_id]) || $tracked_topics['forums'][$cur_topic->forum_id] < $forums[$cur_topic->forum_id]) && (!isset($tracked_topics['topics'][$cur_topic->id]) || $tracked_topics['topics'][$cur_topic->id] < $cur_topic->last_post)) {
                         $new_topics[$cur_topic->forum_id] = $forums[$cur_topic->forum_id];
                     }
@@ -96,37 +113,44 @@ public function get_new_posts()
             }
         }
 
-            return $new_topics;
+        $new_topics = $this->hook->fire('get_new_posts', $new_topics);
+
+        return $new_topics;
     }
 
     // Returns the elements needed to display categories and their forums
     public function print_categories_forums()
     {
+        $this->hook->fire('print_categories_forums_start');
+
         // Get list of forums and topics with new posts since last visit
         if (!$this->user->is_guest) {
             $new_topics = $this->get_new_posts();
         }
 
-        $select_print_categories_forums = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.forum_desc', 'f.redirect_url', 'f.moderators', 'f.num_topics', 'f.num_posts', 'f.last_post', 'f.last_post_id', 'f.last_poster');
-        $where_print_categories_forums = array(
+        $query['select'] = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.forum_desc', 'f.redirect_url', 'f.moderators', 'f.num_topics', 'f.num_posts', 'f.last_post', 'f.last_post_id', 'f.last_poster');
+        $query['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
-        $order_by_print_categories_forums = array('c.disp_position', 'c.id', 'f.disp_position');
+        $query['order_by'] = array('c.disp_position', 'c.id', 'f.disp_position');
 
-        $result = DB::for_table('categories')
+        $query = DB::for_table('categories')
             ->table_alias('c')
-            ->select_many($select_print_categories_forums)
+            ->select_many($query['select'])
             ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
             ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
             ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-            ->where_any_is($where_print_categories_forums)
-            ->order_by_many($order_by_print_categories_forums)
-            ->find_result_set();
+            ->where_any_is($query['where'])
+            ->order_by_many($query['order_by']);
+
+        $query = $this->hook->fireDB('query_print_categories_forums', $query);
+
+        $query = $query->find_result_set();
 
         $index_data = array();
         $i = 0;
-        foreach ($result as $cur_forum) {
+        foreach ($query as $cur_forum) {
             if ($i == 0) {
                 $cur_forum->cur_category = 0;
                 $cur_forum->forum_count_formatted = 0;
@@ -140,7 +164,6 @@ public function print_categories_forums()
 
             if ($cur_forum->cid != $cur_cat) {
                 // A new category since last iteration?
-
                 $cur_forum->forum_count_formatted = 0;
                 $cur_forum->cur_category = $cur_forum->cid;
             }
@@ -204,25 +227,33 @@ public function print_categories_forums()
             ++$i;
         }
 
+        $index_data = $this->hook->fire('print_categories_forums', $index_data);
+
         return $index_data;
     }
 
     // Returns the elements needed to display stats
     public function collect_stats()
     {
+        $this->hook->fire('collect_stats_start');
+
+        // Collect some statistics from the database
         if (!$this->feather->cache->isCached('users_info')) {
             $this->feather->cache->store('users_info', \model\cache::get_users_info());
         }
 
         $stats = $this->feather->cache->retrieve('users_info');
 
-        $stats_query = DB::for_table('forums')
-                        ->select_expr('SUM(num_topics)', 'total_topics')
-                        ->select_expr('SUM(num_posts)', 'total_posts')
-                        ->find_one();
+        $query = DB::for_table('forums')
+            ->select_expr('SUM(num_topics)', 'total_topics')
+            ->select_expr('SUM(num_posts)', 'total_posts');
+
+        $query = $this->hook->fireDB('collect_stats_query', $query);
+
+        $query = $query->find_one();
 
-        $stats['total_topics'] = intval($stats_query['total_topics']);
-        $stats['total_posts'] = intval($stats_query['total_posts']);
+        $stats['total_topics'] = intval($query['total_topics']);
+        $stats['total_posts'] = intval($query['total_posts']);
 
         if ($this->user->g_view_users == '1') {
             $stats['newest_user'] = '<a href="'.get_link('user/'.$stats['last_user']['id']).'/">'.feather_escape($stats['last_user']['username']).'</a>';
@@ -230,27 +261,34 @@ public function collect_stats()
             $stats['newest_user'] = feather_escape($stats['last_user']['username']);
         }
 
+        $stats = $this->hook->fire('collect_stats', $stats);
+
         return $stats;
     }
 
     // Returns the elements needed to display users online
     public function fetch_users_online()
     {
+        $this->hook->fire('fetch_users_online_start');
+
         // Fetch users online info and generate strings for output
-        $num_guests = 0;
         $online = array();
+        $online['num_guests'] = 0;
+
+        $query['select'] = array('user_id', 'ident');
+        $query['where'] = array('idle' => '0');
+        $query['order_by'] = array('ident');
 
-        $select_fetch_users_online = array('user_id', 'ident');
-        $where_fetch_users_online = array('idle' => '0');
-        $order_by_fetch_users_online = array('ident');
+        $query = DB::for_table('online')
+            ->select_many($query['select'])
+            ->where($query['where'])
+            ->order_by_many($query['order_by']);
 
-        $result = DB::for_table('online')
-            ->select_many($select_fetch_users_online)
-            ->where($where_fetch_users_online)
-            ->order_by_many($order_by_fetch_users_online)
-            ->find_result_set();
+        $query = $this->hook->fireDB('query_fetch_users_online', $query);
 
-        foreach($result as $user_online) {
+        $query = $query->find_result_set();
+
+        foreach($query as $user_online) {
             if ($user_online->user_id > 1) {
                 if ($this->user->g_view_users == '1') {
                     $online['users'][] = "\n\t\t\t\t".'<dd><a href="'.get_link('user/'.$user_online->user_id).'/">'.feather_escape($user_online->ident).'</a>';
@@ -258,7 +296,7 @@ public function fetch_users_online()
                     $online['users'][] = "\n\t\t\t\t".'<dd>'.feather_escape($user_online->ident);
                 }
             } else {
-                ++$num_guests;
+                ++$online['num_guests'];
             }
         }
 
@@ -267,8 +305,9 @@ public function fetch_users_online()
         } else {
             $online['num_users'] = 0;
         }
-        $online['num_guests'] = $num_guests;
+
+        $online = $this->hook->fire('fetch_users_online', $online);
 
         return $online;
     }
-}
+}
\ No newline at end of file
diff --git a/model/login.php b/model/login.php
index f3234e59..a2660698 100644
--- a/model/login.php
+++ b/model/login.php
@@ -20,49 +20,43 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
 
     public function login()
     {
+        $this->hook->fire('login_start');
+
         $form_username = feather_trim($this->request->post('req_username'));
         $form_password = feather_trim($this->request->post('req_password'));
         $save_pass = $this->request->post('save_pass');
 
-        $user = DB::for_table('users')->where('username', $form_username)->find_one();
+        $user = DB::for_table('users')->where('username', $form_username);
+
+        $user = $this->hook->fireDB('find_user_login', $user);
+
+        $user = $user->find_one();
 
         $authorized = false;
 
         if (!empty($user->password)) {
             $form_password_hash = feather_hash($form_password); // Will result in a SHA-1 hash
-
-            // If the length isn't 40 then the password isn't using sha1, so it must be md5 from 1.2
-            // Maybe this should be removed
-            if (strlen($user->password) != 40) {
-                if (md5($form_password) == $user->password) {
-                    $authorized = true;
-
-                    DB::for_table('users')->where('id', $user->id)
-                                                              ->find_one()
-                                                              ->set('password', $form_password_hash)
-                                                              ->save();
-                }
-            }
-            // Otherwise we should have a normal sha1 password
-            else {
-                $authorized = ($user->password == $form_password_hash);
-            }
+            $authorized = ($user->password == $form_password_hash);
         }
 
+        $authorized = $this->hook->fire('authorized_login', $authorized);
+
         if (!$authorized) {
             message(__('Wrong user/pass').' <a href="'.get_link('login/action/forget/').'">'.__('Forgotten pass').'</a>');
         }
 
         // Update the status if this is the first time the user logged in
         if ($user->group_id == FEATHER_UNVERIFIED) {
-            DB::for_table('users')->where('id', $user->id)
-                                                      ->find_one()
-                                                      ->set('group_id', $this->config['o_default_user_group'])
-                                                      ->save();
+            $update_usergroup = DB::for_table('users')->where('id', $user->id)
+                ->find_one()
+                ->set('group_id', $this->config['o_default_user_group']);
+            $update_usergroup = $this->hook->fireDB('update_usergroup_login', $update_usergroup);
+            $update_usergroup = $update_usergroup->save();
 
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
@@ -73,10 +67,12 @@ public function login()
         }
 
         // Remove this user's guest entry from the online list
-        DB::for_table('online')->where('ident', get_remote_address())
-                                                   ->delete_many();
+        $delete_online = DB::for_table('online')->where('ident', $this->request->getIp());
+        $delete_online = $this->hook->fireDB('delete_online_login', $delete_online);
+        $delete_online = $delete_online->delete_many();
 
         $expire = ($save_pass == '1') ? time() + 1209600 : time() + $this->config['o_timeout_visit'];
+        $expire = $this->hook->fire('expire_login', $expire);
         feather_setcookie($user->id, $form_password_hash, $expire);
 
         // Reset tracked topics
@@ -84,29 +80,36 @@ public function login()
 
         // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after login)
         $redirect_url = validate_redirect($this->request->post('redirect_url'), get_base_url());
+        $redirect_url = $this->hook->fire('redirect_url_login', $redirect_url);
 
         redirect(feather_escape($redirect_url), __('Login redirect'));
     }
 
     public function logout($id, $token)
     {
-        if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != feather_hash($this->user->id.feather_hash(get_remote_address()))) {
+        $token = $this->hook->fire('logout_start', $token, $id);
+
+        if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != feather_hash($this->user->id.feather_hash($this->request->getIp()))) {
             header('Location: '.get_base_url());
             exit;
         }
 
         // Remove user from "users online" list
-        DB::for_table('online')->where('user_id', $this->user->id)
-                                                   ->delete_many();
+        $delete_online = DB::for_table('online')->where('user_id', $this->user->id);
+        $delete_online = $this->hook->fireDB('delete_online_logout', $delete_online);
+        $delete_online = $delete_online->delete_many();
 
         // Update last_visit (make sure there's something to update it with)
         if (isset($this->user->logged)) {
-            DB::for_table('users')->where('id', $this->user->id)
-                                                      ->find_one()
-                                                      ->set('last_visit', $this->user->logged)
-                                                      ->save();
+            $update_last_visit = DB::for_table('users')->where('id', $this->user->id)
+                ->find_one()
+                ->set('last_visit', $this->user->logged);
+            $update_last_visit = $this->hook->fireDB('update_online_logout', $update_last_visit);
+            $update_last_visit = $update_last_visit->save();
         }
 
+        $this->hook->fire('logout_end');
+
         feather_setcookie(1, feather_hash(uniqid(rand(), true)), time() + 31536000);
 
         redirect(get_base_url(), __('Logout redirect'));
@@ -114,6 +117,8 @@ public function logout($id, $token)
 
     public function password_forgotten()
     {
+        $this->hook->fire('password_forgotten_start');
+
         if (!$this->user->is_guest) {
             header('Location: '.get_base_url());
             exit;
@@ -132,16 +137,18 @@ public function password_forgotten()
 
             // Did everything go according to plan?
             if (empty($errors)) {
-                $select_password_forgotten = array('id', 'username', 'last_email_sent');
+                $result['select'] = array('id', 'username', 'last_email_sent');
 
                 $result = DB::for_table('users')
-                    ->select_many($select_password_forgotten)
-                    ->where('email', $email)
-                    ->find_many();
+                    ->select_many($result['select'])
+                    ->where('email', $email);
+                $result = $this->hook->fireDB('password_forgotten_query', $result);
+                $result = $result->find_many();
 
                 if ($result) {
                     // Load the "activate password" template
                     $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/activate_password.tpl'));
+                    $mail_tpl = $this->hook->fire('mail_tpl_password_forgotten', $mail_tpl);
 
                     // The first row contains the subject
                     $first_crlf = strpos($mail_tpl, "\n");
@@ -152,6 +159,8 @@ public function password_forgotten()
                     $mail_message = str_replace('<base_url>', get_base_url().'/', $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
+                    $mail_message = $this->hook->fire('mail_message_password_forgotten', $mail_message);
+
                     // Loop through users we found
                     foreach($result as $cur_hit) {
                         if ($cur_hit->last_email_sent != '' && (time() - $cur_hit->last_email_sent) < 3600 && (time() - $cur_hit->last_email_sent) >= 0) {
@@ -162,23 +171,25 @@ public function password_forgotten()
                         $new_password = random_pass(12);
                         $new_password_key = random_pass(8);
 
-                        $update_password = array(
+                        $query['update'] = array(
                             'activate_string' => feather_hash($new_password),
                             'activate_key'    => $new_password_key,
                             'last_email_sent' => time()
                         );
 
-                        DB::for_table('users')->where('id', $cur_hit->id)
-                                                                  ->find_one()
-                                                                  ->set($update_password)
-                                                                  ->save();
+                        $query = DB::for_table('users')->where('id', $cur_hit->id)
+                            ->find_one()
+                            ->set($query['update']);
+                        $query = $this->hook->fireDB('password_forgotten_mail_query', $query);
+                        $query = $query->save();
 
                         // Do the user specific replacements to the template
                         $cur_mail_message = str_replace('<username>', $cur_hit->username, $mail_message);
                         $cur_mail_message = str_replace('<activation_url>', get_link('user/'.$cur_hit->id.'/action/change_pass/?key='.$new_password_key), $cur_mail_message);
                         $cur_mail_message = str_replace('<new_password>', $new_password, $cur_mail_message);
+                        $cur_mail_message = $this->hook->fire('cur_mail_message_password_forgotten', $cur_mail_message);
 
-                        pun_mail($email, $mail_subject, $cur_mail_message);
+                        feather_mail($email, $mail_subject, $cur_mail_message);
                     }
 
                     message(__('Forget mail').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
@@ -188,13 +199,17 @@ public function password_forgotten()
             }
         }
 
+        $errors = $this->hook->fire('password_forgotten', $errors);
+
         return $errors;
     }
 
-    public function get_redirect_url($server_data)
+    public function get_redirect_url()
     {
-        if (!empty($server_data['HTTP_REFERER'])) {
-            $redirect_url = validate_redirect($server_data['HTTP_REFERER'], null);
+        $this->hook->fire('get_redirect_url_start');
+
+        if (!empty($this->request->getReferrer())) {
+            $redirect_url = validate_redirect($this->request->getReferrer(), null);
         }
 
         if (!isset($redirect_url)) {
@@ -203,6 +218,8 @@ public function get_redirect_url($server_data)
             $redirect_url .= '#p'.$matches[1];
         }
 
+        $redirect_url = $this->hook->fire('get_redirect_url', $redirect_url);
+
         return $redirect_url;
     }
-}
+}
\ No newline at end of file
diff --git a/model/profile.php b/model/profile.php
index 581c314f..62a5809b 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -20,33 +20,40 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
 
     public function change_pass($id)
     {
+        $id = $this->hook->fire('change_pass_start', $id);
+
         if ($this->request->get('key')) {
+
+            $key = $this->request->get('key');
+            $key = $this->hook->fire('change_pass_key', $key);
+
             // If the user is already logged in we shouldn't be here :)
             if (!$this->user->is_guest) {
                 header('Location: '.get_base_url());
                 exit;
             }
 
-            $key = $this->request->get('key');
-
             $cur_user = DB::for_table('users')
-                ->where('id', $id)
-                ->find_one();
+                ->where('id', $id);
+            $cur_user = $this->hook->fireDB('change_pass_user_query', $cur_user);
+            $cur_user = $cur_user->find_one();
 
             if ($key == '' || $key != $cur_user['activate_key']) {
                 message(__('Pass key bad').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
             } else {
-                DB::for_table('users')
+                $query = DB::for_table('users')
                     ->where('id', $id)
                     ->find_one()
                     ->set('password', $cur_user['activate_string'])
                     ->set_expr('activate_string', 'NULL')
-                    ->set_expr('activate_key', 'NULL')
-                    ->save();
+                    ->set_expr('activate_key', 'NULL');
+                $query = $this->hook->fireDB('change_pass_activate_query', $query);
+                $query = $query->save();
 
                 message(__('Pass updated'), true);
             }
@@ -54,19 +61,22 @@ public function change_pass($id)
 
         // Make sure we are allowed to change this user's password
         if ($this->user->id != $id) {
+            $id = $this->hook->fire('change_pass_key_not_id', $id);
+
             if (!$this->user->is_admmod) { // A regular user trying to change another user's password?
                 message(__('No permission'), '403');
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's password?
 
-                $select_change_password = array('u.group_id', 'g.g_moderator');
+                $user['select'] = array('u.group_id', 'g.g_moderator');
 
                 $user = DB::for_table('users')
                     ->table_alias('u')
-                    ->select_many($select_change_password)
+                    ->select_many($user['select'])
                     ->inner_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
-                    ->where('u.id', $id)
-                    ->find_one();
+                    ->where('u.id', $id);
+                $user = $this->hook->fireDB('change_pass_user_query', $user);
+                $user = $user->find_one();
 
                 if (!$user) {
                     message(__('Bad request'), '404');
@@ -91,8 +101,9 @@ public function change_pass($id)
             }
 
             $cur_user = DB::for_table('users')
-                ->where('id', $id)
-                ->find_one();
+                ->where('id', $id);
+            $cur_user = $this->hook->fireDB('change_pass_find_user', $cur_user);
+            $cur_user = $cur_user->find_one();
 
             $authorized = false;
 
@@ -110,36 +121,44 @@ public function change_pass($id)
 
             $new_password_hash = feather_hash($new_password1);
 
-            DB::for_table('users')->where('id', $id)
+            $update_password = DB::for_table('users')
+                ->where('id', $id)
                 ->find_one()
-                ->set('password', $new_password_hash)
-                ->save();
+                ->set('password', $new_password_hash);
+            $update_password = $this->hook->fireDB('change_pass_query', $update_password);
+            $update_password = $update_password->save();
 
             if ($this->user->id == $id) {
                 feather_setcookie($this->user->id, $new_password_hash, time() + $this->config['o_timeout_visit']);
             }
 
+            $this->hook->fire('change_pass');
+
             redirect(get_link('user/'.$id.'/section/essentials/'), __('Pass updated redirect'));
         }
     }
 
     public function change_email($id)
     {
+        $id = $this->hook->fire('change_email_start', $id);
+
         // Make sure we are allowed to change this user's email
         if ($this->user->id != $id) {
+            $id = $this->hook->fire('change_email_not_id', $id);
+
             if (!$this->user->is_admmod) { // A regular user trying to change another user's email?
                 message(__('No permission'), '403');
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's email?
-
-                $select_change_mail = array('u.group_id', 'g.g_moderator');
+                $user['select'] = array('u.group_id', 'g.g_moderator');
 
                 $user = DB::for_table('users')
                     ->table_alias('u')
-                    ->select_many($select_change_mail)
+                    ->select_many($user['select'])
                     ->inner_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
-                    ->where('u.id', $id)
-                    ->find_one();
+                    ->where('u.id', $id);
+                $user = $this->hook->fireDB('change_email_not_id_query', $user);
+                $user = $user->find_one();
 
                 if (!$user) {
                     message(__('Bad request'), '404');
@@ -153,25 +172,30 @@ public function change_email($id)
 
         if ($this->request->get('key')) {
             $key = $this->request->get('key');
+            $key = $this->hook->fire('change_email_key', $key);
 
             $new_email_key = DB::for_table('users')
-                ->where('id', $id)
-                ->find_one_col('activate_key');
+                ->where('id', $id);
+            $new_email_key = $this->hook->fireDB('change_email_key_query', $new_email_key);
+            $new_email_key = $new_email_key->find_one_col('activate_key');
 
             if ($key == '' || $key != $new_email_key) {
                 message(__('Email key bad').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
             } else {
-                DB::for_table('users')
+                $update_mail = DB::for_table('users')
                     ->where('id', $id)
                     ->find_one()
                     ->set_expr('email', 'activate_string')
                     ->set_expr('activate_string', 'NULL')
-                    ->set_expr('activate_key', 'NULL')
-                    ->save();
+                    ->set_expr('activate_key', 'NULL');
+                $update_mail = $this->hook->fireDB('change_email_query', $update_mail);
+                $update_mail = $update_mail->save();
 
                 message(__('Email updated'), true);
             }
         } elseif ($this->request->isPost()) {
+            $this->hook->fire('change_email_post');
+
             if (feather_hash($this->request->post('req_password')) !== $this->user->password) {
                 message(__('Wrong pass'));
             }
@@ -180,6 +204,7 @@ public function change_email($id)
 
             // Validate the email address
             $new_email = strtolower(feather_trim($this->request->post('req_new_email')));
+            $new_email = $this->hook->fire('change_email_new_email', $new_email);
             if (!is_valid_email($new_email)) {
                 message(__('Invalid email'));
             }
@@ -191,28 +216,32 @@ public function change_email($id)
                 } elseif ($this->config['o_mailing_list'] != '') {
                     // Load the "banned email change" template
                     $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/banned_email_change.tpl'));
+                    $mail_tpl = $this->hook->fire('change_email_mail_tpl', $mail_tpl);
 
                     // The first row contains the subject
                     $first_crlf = strpos($mail_tpl, "\n");
                     $mail_subject = trim(substr($mail_tpl, 8, $first_crlf-8));
-                    $mail_message = trim(substr($mail_tpl, $first_crlf));
+                    $mail_subject = $this->hook->fire('change_email_mail_subject', $mail_subject);
 
+                    $mail_message = trim(substr($mail_tpl, $first_crlf));
                     $mail_message = str_replace('<username>', $this->user->username, $mail_message);
                     $mail_message = str_replace('<email>', $new_email, $mail_message);
                     $mail_message = str_replace('<profile_url>', get_link('user/'.$id.'/'), $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
+                    $mail_message = $this->hook->fire('change_email_mail_message', $mail_message);
 
-                    pun_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+                    feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
                 }
             }
 
             // Check if someone else already has registered with that email address
-            $select_change_mail = array('id', 'username');
+            $result['select'] = array('id', 'username');
 
             $result = DB::for_table('users')
-                ->select_many($select_change_mail)
-                ->where('email', $new_email)
-                ->find_many();
+                ->select_many($result['select'])
+                ->where('email', $new_email);
+            $result = $this->hook->fireDB('change_email_check_mail', $result);
+            $result = $result->find_many();
 
             if ($result) {
                 if ($this->config['p_allow_dupe_email'] == '0') {
@@ -224,56 +253,70 @@ public function change_email($id)
 
                     // Load the "dupe email change" template
                     $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/dupe_email_change.tpl'));
+                    $mail_tpl = $this->hook->fire('change_email_mail_dupe_tpl', $mail_tpl);
 
                     // The first row contains the subject
                     $first_crlf = strpos($mail_tpl, "\n");
                     $mail_subject = trim(substr($mail_tpl, 8, $first_crlf-8));
-                    $mail_message = trim(substr($mail_tpl, $first_crlf));
+                    $mail_subject = $this->hook->fire('change_email_mail_dupe_subject', $mail_subject);
 
+                    $mail_message = trim(substr($mail_tpl, $first_crlf));
                     $mail_message = str_replace('<username>', $this->user->username, $mail_message);
                     $mail_message = str_replace('<dupe_list>', implode(', ', $dupe_list), $mail_message);
                     $mail_message = str_replace('<profile_url>', get_link('user/'.$id.'/'), $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
+                    $mail_message = $this->hook->fire('change_email_mail_dupe_message', $mail_message);
 
-                    pun_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+                    feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
                 }
             }
 
 
             $new_email_key = random_pass(8);
+            $new_email_key = $this->hook->fire('change_email_new_email_key', $new_email_key);
 
             // Update the user
-            $update_user = array(
+            unset($user);
+            $user['update'] = array(
                 'activate_string' => $new_email,
                 'activate_key'  => $new_email_key,
             );
-
-            DB::for_table('users')->where('id', tid)
+            $user = DB::for_table('users')
+                ->where('id', tid)
                 ->find_one()
-                ->set($update_user)
-                ->save();
+                ->set($user['update']);
+            $user = $this->hook->fireDB('change_email_user_query', $user);
+            $user = $user->save();
 
             // Load the "activate email" template
             $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/activate_email.tpl'));
+            $mail_tpl = $this->hook->fire('change_email_mail_activate_tpl', $mail_tpl);
 
             // The first row contains the subject
             $first_crlf = strpos($mail_tpl, "\n");
             $mail_subject = trim(substr($mail_tpl, 8, $first_crlf-8));
-            $mail_message = trim(substr($mail_tpl, $first_crlf));
+            $mail_subject = $this->hook->fire('change_email_mail_activate_subject', $mail_subject);
 
+            $mail_message = trim(substr($mail_tpl, $first_crlf));
             $mail_message = str_replace('<username>', $this->user->username, $mail_message);
             $mail_message = str_replace('<base_url>', get_base_url(), $mail_message);
             $mail_message = str_replace('<activation_url>', get_link('user/'.$id.'/action/change_email/?key='.$new_email_key), $mail_message);
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
+            $mail_message = $this->hook->fire('change_email_mail_activate_message', $mail_message);
+
+            feather_mail($new_email, $mail_subject, $mail_message);
 
-            pun_mail($new_email, $mail_subject, $mail_message);
+            $this->hook->fire('change_email_sent');
 
             message(__('Activate email sent').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
         }
+        $this->hook->fire('change_email');
     }
 
     public function upload_avatar($id, $files_data)
     {
+        $files_data = $this->hook->fire('upload_avatar_start', $files_data, $id);
+
         if (!isset($files_data['req_file'])) {
             message(__('No file'));
         }
@@ -310,6 +353,8 @@ public function upload_avatar($id, $files_data)
         }
 
         if (is_uploaded_file($uploaded_file['tmp_name'])) {
+            $uploaded_file = $this->hook->fire('upload_avatar_is_uploaded_file', $uploaded_file);
+
             // Preliminary file check, adequate in most cases
             $allowed_types = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/png', 'image/x-png');
             if (!in_array($uploaded_file['type'], $allowed_types)) {
@@ -355,21 +400,28 @@ public function upload_avatar($id, $files_data)
             message(__('Unknown failure'));
         }
 
+        $uploaded_file = $this->hook->fire('upload_avatar', $uploaded_file);
+
         redirect(get_link('user/'.$id.'/section/personality/'), __('Avatar upload redirect'));
     }
 
     public function update_group_membership($id)
     {
+        $id = $this->hook->fire('update_group_membership_start', $id);
+
         $new_group_id = intval($this->request->post('group_id'));
 
         $old_group_id = DB::for_table('users')
-            ->where('id', $id)
-            ->find_one_col('group_id');
+            ->where('id', $id);
+        $old_group_id = $this->hook->fireDB('update_group_membership_old_group', $old_group_id);
+        $old_group_id = $old_group_id->find_one_col('group_id');
 
-        DB::for_table('users')->where('id', $id)
+        $update_group = DB::for_table('users')
+            ->where('id', $id)
             ->find_one()
-            ->set('group_id', $new_group_id)
-            ->save();
+            ->set('group_id', $new_group_id);
+        $update_group = $this->hook->fireDB('update_group_membership_update_group', $update_group);
+        $update_group = $update_group->save();
 
         // Regenerate the users info cache
         if (!$this->feather->cache->isCached('users_info')) {
@@ -383,17 +435,15 @@ public function update_group_membership($id)
         }
 
         $new_group_mod = DB::for_table('groups')
-            ->where('g_id', $new_group_id)
-            ->find_one_col('g_moderator');
+            ->where('g_id', $new_group_id);
+        $new_group_mod = $this->hook->fireDB('update_group_membership_new_mod', $new_group_mod);
+        $new_group_mod = $new_group_mod->find_one_col('g_moderator');
 
         // If the user was a moderator or an administrator, we remove him/her from the moderator list in all forums as well
         if ($new_group_id != FEATHER_ADMIN && $new_group_mod != '1') {
 
-            $select_mods = array('id', 'moderators');
-
-            $result = DB::for_table('forums')
-                ->select_many($select_mods)
-                ->find_many();
+            // Loop through all forums
+            $result = $this->loop_mod_forums();
 
             foreach($result as $cur_forum) {
                 $cur_moderators = ($cur_forum['moderators'] != '') ? unserialize($cur_forum['moderators']) : array();
@@ -402,21 +452,23 @@ public function update_group_membership($id)
                     $username = array_search($id, $cur_moderators);
                     unset($cur_moderators[$username]);
 
+                    $update_forums = DB::for_table('forums')
+                        ->where('id', $cur_forum['id'])
+                        ->find_one();
+
                     if (!empty($cur_moderators)) {
-                        DB::for_table('forums')->where('id', $cur_forum['id'])
-                            ->find_one()
-                            ->set('moderators', serialize($cur_moderators))
-                            ->save();
+                        $update_forums = $update_forums->set('moderators', serialize($cur_moderators));
                     } else {
-                        DB::for_table('forums')->where('id', $cur_forum['id'])
-                            ->find_one()
-                            ->set_expr('moderators', 'NULL')
-                            ->save();
+                        $update_forums = $update_forums->set_expr('moderators', 'NULL');
                     }
+                    $update_forums = $this->hook->fireDB('update_group_membership_mod_forums', $update_forums);
+                    $update_forums = $update_forums->save();
                 }
             }
         }
 
+        $id = $this->hook->fire('update_group_membership', $id);
+
         redirect(get_link('user/'.$id.'/section/admin/'), __('Group membership redirect'));
     }
 
@@ -427,9 +479,23 @@ public function get_username($id)
             ->where('id', $id)
             ->find_one_col('username');
 
+        $username = $this->hook->fire('get_username', $username);
+
         return $username;
     }
 
+    public function loop_mod_forums()
+    {
+        $result['select'] = array('id', 'moderators');
+
+        $result = DB::for_table('forums')
+            ->select_many($result['select']);
+        $result = $this->hook->fireDB('loop_mod_forums', $result);
+        $result = $result->find_many();
+
+        return $result;
+    }
+
     public function update_mod_forums($id)
     {
         $username = $this->get_username($id);
@@ -437,11 +503,7 @@ public function update_mod_forums($id)
         $moderator_in = ($this->request->post('moderator_in')) ? array_keys($this->request->post('moderator_in')) : array();
 
         // Loop through all forums
-        $select_mods = array('id', 'moderators');
-
-        $result = DB::for_table('forums')
-            ->select_many($select_mods)
-            ->find_many();
+        $result = $this->loop_mod_forums();
 
         foreach($result as $cur_forum) {
             $cur_moderators = ($cur_forum['moderators'] != '') ? unserialize($cur_forum['moderators']) : array();
@@ -450,34 +512,40 @@ public function update_mod_forums($id)
                 $cur_moderators[$username] = $id;
                 uksort($cur_moderators, 'utf8_strcasecmp');
 
-                DB::for_table('forums')->where('id', $cur_forum['id'])
+                $update_forums = DB::for_table('forums')
+                    ->where('id', $cur_forum['id'])
                     ->find_one()
-                    ->set('moderators', serialize($cur_moderators))
-                    ->save();
+                    ->set('moderators', serialize($cur_moderators));
+                $update_forums = $this->hook->fireDB('update_mod_forums_query', $update_forums);
+                $update_forums = $update_forums->save();
             }
             // If the user shouldn't have moderator access (and he/she already has it)
             elseif (!in_array($cur_forum['id'], $moderator_in) && in_array($id, $cur_moderators)) {
                 unset($cur_moderators[$username]);
 
+                $update_forums = DB::for_table('forums')
+                    ->where('id', $cur_forum['id'])
+                    ->find_one();
+
                 if (!empty($cur_moderators)) {
-                    DB::for_table('forums')->where('id', $cur_forum['id'])
-                        ->find_one()
-                        ->set('moderators', serialize($cur_moderators))
-                        ->save();
+                    $update_forums = $update_forums->set('moderators', serialize($cur_moderators));
                 } else {
-                    DB::for_table('forums')->where('id', $cur_forum['id'])
-                        ->find_one()
-                        ->set_expr('moderators', 'NULL')
-                        ->save();
+                    $update_forums = $update_forums->set_expr('moderators', 'NULL');
                 }
+                $update_forums = $this->hook->fireDB('update_mod_forums_query', $update_forums);
+                $update_forums = $update_forums->save();
             }
         }
 
+        $id = $this->hook->fire('update_mod_forums', $id);
+
         redirect(get_link('user/'.$id.'/section/admin/'), __('Update forums redirect'));
     }
 
     public function ban_user($id)
     {
+        $id = $this->hook->fire('ban_user_start', $id);
+
         // Get the username of the user we are banning
         $username = $this->get_username($id);
 
@@ -485,8 +553,9 @@ public function ban_user($id)
         $ban_id = DB::for_table('bans')
             ->where('username', $username)
             ->order_by_expr('expire IS NULL DESC')
-            ->order_by_desc('expire')
-            ->find_one_col('id');
+            ->order_by_desc('expire');
+        $ban_id = $this->hook->fireDB('ban_user_query', $ban_id);
+        $ban_id = $ban_id->find_one_col('id');
 
         if ($ban_id) {
             redirect(get_link('admin/bans/edit/'.$ban_id.'/'), __('Ban redirect'));
@@ -497,36 +566,47 @@ public function ban_user($id)
 
     public function promote_user($id)
     {
+        $id = $this->hook->fire('promote_user_start', $id);
+
         $pid = $this->request->get('pid') ? intval($this->request->get('pid')) : 0;
 
         // Find the group ID to promote the user to
         $next_group_id = DB::for_table('groups')
             ->table_alias('g')
             ->inner_join('users', array('u.group_id', '=', 'g.g_id'), 'u')
-            ->where('u.id', $id)
-            ->find_one_col('g.g_promote_next_group');
+            ->where('u.id', $id);
+        $next_group_id = $this->hook->fireDB('promote_user_group_id', $next_group_id);
+        $next_group_id = $next_group_id->find_one_col('g.g_promote_next_group');
 
         if (!$next_group_id) {
             message(__('Bad request'), '404');
         }
 
         // Update the user
-        DB::for_table('users')->where('id', $id)
+        $update_user = DB::for_table('users')
+            ->where('id', $id)
             ->find_one()
-            ->set('group_id', $next_group_id)
-            ->save();
+            ->set('group_id', $next_group_id);
+        $update_user = $this->hook->fireDB('promote_user_query', $update_user);
+        $update_user = $update_user->save();
+
+        $pid = $this->hook->fire('promote_user', $pid);
 
         redirect(get_link('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
     }
 
     public function delete_user($id)
     {
+        $id = $this->hook->fire('delete_user_start', $id);
+
         // Get the username and group of the user we are deleting
-        $select_info_delete_user = array('group_id', 'username');
+        $result['select'] = array('group_id', 'username');
 
-        $result = DB::for_table('users')->where('id', $id)
-            ->select_many($select_info_delete_user)
-            ->find_one();
+        $result = DB::for_table('users')
+            ->where('id', $id)
+            ->select_many($result['select']);
+        $result = $this->hook->fireDB('delete_user_username', $result);
+        $result = $result->find_one();
 
         $group_id = $result['group_id'];
         $username = $result['username'];
@@ -538,15 +618,14 @@ public function delete_user($id)
         if ($this->request->post('delete_user_comply')) {
             // If the user is a moderator or an administrator, we remove him/her from the moderator list in all forums as well
             $group_mod = DB::for_table('groups')
-                ->where('g_id', $group_id)
-                ->find_one_col('g_moderator');
+                ->where('g_id', $group_id);
+            $group_mod = $this->hook->fireDB('delete_user_group_mod', $group_mod);
+            $group_mod = $group_mod->find_one_col('g_moderator');
 
             if ($group_id == FEATHER_ADMIN || $group_mod == '1') {
-                $select_info_delete_moderators = array('id', 'moderators');
 
-                $result = DB::for_table('forums')
-                    ->select_many($select_info_delete_moderators)
-                    ->find_many();
+                // Loop through all forums
+                $result = $this->loop_mod_forums();
 
                 foreach($result as $cur_forum) {
                     $cur_moderators = ($cur_forum['moderators'] != '') ? unserialize($cur_forum['moderators']) : array();
@@ -554,33 +633,37 @@ public function delete_user($id)
                     if (in_array($id, $cur_moderators)) {
                         unset($cur_moderators[$username]);
 
+                        $update_forums = DB::for_table('forums')
+                            ->where('id', $cur_forum['id'])
+                            ->find_one();
+
                         if (!empty($cur_moderators)) {
-                            DB::for_table('forums')->where('id', $cur_forum['id'])
-                                ->find_one()
-                                ->set('moderators', serialize($cur_moderators))
-                                ->save();
+                            $update_forums = $update_forums->set('moderators', serialize($cur_moderators));
                         } else {
-                            DB::for_table('forums')->where('id', $cur_forum['id'])
-                                ->find_one()
-                                ->set_expr('moderators', 'NULL')
-                                ->save();
+                            $update_forums = $update_forums->set_expr('moderators', 'NULL');
                         }
+                        $update_forums = $this->hook->fireDB('update_mod_forums_query', $update_forums);
+                        $update_forums = $update_forums->save();
                     }
                 }
             }
 
             // Delete any subscriptions
-            DB::for_table('topic_subscriptions')
-                ->where('user_id', $id)
-                ->delete_many();
-            DB::for_table('forum_subscriptions')
-                ->where('user_id', $id)
-                ->delete_many();
+            $delete_subscriptions = DB::for_table('topic_subscriptions')
+                ->where('user_id', $id);
+            $delete_subscriptions = $this->hook->fireDB('delete_user_subscriptions_topic', $delete_subscriptions);
+            $delete_subscriptions = $delete_subscriptions->delete_many();
+            unset($delete_subscriptions);
+            $delete_subscriptions = DB::for_table('forum_subscriptions')
+                ->where('user_id', $id);
+            $delete_subscriptions = $this->hook->fireDB('delete_user_subscriptions_forum', $delete_subscriptions);
+            $delete_subscriptions = $delete_subscriptions->delete_many();
 
             // Remove him/her from the online list (if they happen to be logged in)
-            DB::for_table('online')
-                ->where('user_id', $id)
-                ->delete_many();
+            $delete_online = DB::for_table('online')
+                ->where('user_id', $id);
+            $delete_online = $this->hook->fireDB('delete_user_online', $delete_online);
+            $delete_online = $delete_online->delete_many();
 
             // Should we delete all posts made by this user?
             if ($this->request->post('delete_posts')) {
@@ -588,24 +671,29 @@ public function delete_user($id)
                 // Hold on, this could take some time!
                 @set_time_limit(0);
 
+                $this->hook->fire('delete_user_posts');
+
                 // Find all posts made by this user
-                $select_user_posts = array('p.id', 'p.topic_id', 't.forum_id');
+                unset($result);
+                $result['select'] = array('p.id', 'p.topic_id', 't.forum_id');
 
                 $result = DB::for_table('posts')
                     ->table_alias('p')
-                    ->select_many($select_user_posts)
+                    ->select_many($result['select'])
                     ->inner_join('topics', array('t.id', '=', 'p.topic_id'), 't')
                     ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
-                    ->where('p.poster_id', $id)
-                    ->find_many();
+                    ->where('p.poster_id', $id);
+                $result = $this->hook->fireDB('delete_user_posts_first_query', $result);
+                $result = $result->find_many();
 
                 if ($result) {
                     foreach($result as $cur_post) {
                         // Determine whether this post is the "topic post" or not
                         $result2 = DB::for_table('posts')
                             ->where('topic_id', $cur_post['topic_id'])
-                            ->order_by('posted')
-                            ->find_one_col('id');
+                            ->order_by('posted');
+                        $result2 = $this->hook->fireDB('delete_user_posts_second_query', $result2);
+                        $result2 = $result2->find_one_col('id');
 
                         if ($result2 == $cur_post['id']) {
                             delete_topic($cur_post['topic_id']);
@@ -618,15 +706,16 @@ public function delete_user($id)
                 }
             } else {
                 // Set all his/her posts to guest
-                DB::for_table('posts')
-                    ->where_in('poster_id', '1')
-                    ->update_many('poster_id', $id);
+                $update_guest = DB::for_table('posts')
+                    ->where_in('poster_id', '1');
+                $update_guest = $this->hook->fireDB('delete_user_posts_guest_query', $update_guest);
+                $update_guest = $update_guest->update_many('poster_id', $id);
             }
 
             // Delete the user
-            DB::for_table('users')
-                ->where('id', $id)
-                ->delete_many();
+            $delete_user = DB::for_table('users')
+                ->where('id', $id);
+            $delete_user = $delete_user->delete_many();
 
             // Delete user avatar
             delete_avatar($id);
@@ -642,24 +731,25 @@ public function delete_user($id)
                 $this->feather->cache->store('admin_ids', \model\cache::get_admin_ids());
             }
 
+            $this->hook->fire('delete_user');
+
             redirect(get_base_url(), __('User delete redirect'));
         }
     }
 
     public function fetch_user_group($id)
     {
-
-
         $info = array();
 
-        $select_fetch_user_group = array('old_username' => 'u.username', 'group_id' => 'u.group_id', 'is_moderator' => 'g.g_moderator');
+        $info['select'] = array('old_username' => 'u.username', 'group_id' => 'u.group_id', 'is_moderator' => 'g.g_moderator');
 
         $info = DB::for_table('users')
             ->table_alias('u')
-            ->select_many($select_fetch_user_group)
+            ->select_many($info['select'])
             ->left_outer_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
-            ->where('u.id', $id)
-            ->find_one();
+            ->where('u.id', $id);
+        $info = $this->hook->fireDB('fetch_user_group', $info);
+        $info = $info->find_one();
 
         if (!$info) {
             message(__('Bad request'), '404');
@@ -672,8 +762,12 @@ public function update_profile($id, $info, $section)
     {
         global $pd;
 
+        $info = $this->hook->fire('update_profile_start', $info, $id, $section);
+
         $username_updated = false;
 
+        $section = $this->hook->fire('update_profile_section', $section, $id, $info);
+
         // Validate input depending on section
         switch ($section) {
             case 'essentials':
@@ -890,6 +984,7 @@ public function update_profile($id, $info, $section)
                 message(__('Bad request'), '404');
         }
 
+        $form = $this->hook->fire('update_profile_form', $form, $section, $id, $info);
 
         // Single quotes around non-empty values and nothing for empty values
         $temp = array();
@@ -901,55 +996,65 @@ public function update_profile($id, $info, $section)
             message(__('Bad request'), '404');
         }
 
-        DB::for_table('users')->where('id', $id)
+        $update_user = DB::for_table('users')
+            ->where('id', $id)
             ->find_one()
-            ->set($temp)
-            ->save();
+            ->set($temp);
+        $update_user = $this->hook->fireDB('update_profile_query', $update_user);
+        $update_user = $update_user->save();
 
         // If we changed the username we have to update some stuff
         if ($username_updated) {
-            $bans_updated = DB::for_table('bans')->where('username', $info['old_username'])
-                                ->update_many('username', $form['username']);
-
-            DB::for_table('posts')
-                ->where('poster_id', $id)
-                ->update_many('poster', $form['username']);
-
-            DB::for_table('posts')
-                ->where('edited_by', $info['old_username'])
-                ->update_many('edited_by', $form['username']);
-
-            DB::for_table('topics')
-                ->where('poster', $info['old_username'])
-                ->update_many('poster', $form['username']);
-
-            DB::for_table('topics')
-                ->where('last_poster', $info['old_username'])
-                ->update_many('last_poster', $form['username']);
-
-            DB::for_table('forums')
-                ->where('last_poster', $info['old_username'])
-                ->update_many('last_poster', $form['username']);
-
-            DB::for_table('online')
-                ->where('ident', $info['old_username'])
-                ->update_many('ident', $form['username']);
+            $bans_updated = DB::for_table('bans')
+                ->where('username', $info['old_username']);
+            $bans_updated = $this->hook->fireDB('update_profile_bans_updated', $bans_updated);
+            $bans_updated = $bans_updated->update_many('username', $form['username']);
+
+            $update_poster_id = DB::for_table('posts')
+                ->where('poster_id', $id);
+            $update_poster_id = $this->hook->fireDB('update_profile_poster_id', $update_poster_id);
+            $update_poster_id = $update_poster_id->update_many('poster', $form['username']);
+
+            $update_posts = DB::for_table('posts')
+                ->where('edited_by', $info['old_username']);
+            $update_posts = $this->hook->fireDB('update_profile_posts', $update_posts);
+            $update_posts = $update_posts->update_many('edited_by', $form['username']);
+
+            $update_topics_poster = DB::for_table('topics')
+                ->where('poster', $info['old_username']);
+            $update_topics_poster = $this->hook->fireDB('update_profile_topics_poster', $update_topics_poster);
+            $update_topics_poster = $update_topics_poster->update_many('poster', $form['username']);
+
+            $update_topics_last_poster = DB::for_table('topics')
+                ->where('last_poster', $info['old_username']);
+            $update_topics_last_poster = $this->hook->fireDB('update_profile_topics_last_poster', $update_topics_last_poster);
+            $update_topics_last_poster = $update_topics_last_poster->update_many('last_poster', $form['username']);
+
+            $update_forums = DB::for_table('forums')
+                ->where('last_poster', $info['old_username']);
+            $update_forums = $this->hook->fireDB('update_profile_forums', $update_forums);
+            $update_forums = $update_forums->update_many('last_poster', $form['username']);
+
+            $update_online = DB::for_table('online')
+                ->where('ident', $info['old_username']);
+            $update_online = $this->hook->fireDB('update_profile_online', $update_online);
+            $update_online = $update_online->update_many('ident', $form['username']);
 
             // If the user is a moderator or an administrator we have to update the moderator lists
             $group_id = DB::for_table('users')
-                ->where('id', $id)
-                ->find_one_col('group_id');
+                ->where('id', $id);
+            $group_id = $this->hook->fireDB('update_profile_group_id', $update_online);
+            $group_id = $group_id->find_one_col('group_id');
 
             $group_mod = DB::for_table('groups')
-                ->where('g_id', $group_id)
-                ->find_one_col('g_moderator');
+                ->where('g_id', $group_id);
+            $group_mod = $this->hook->fireDB('update_profile_group_mod', $group_mod);
+            $group_mod = $group_mod->find_one_col('g_moderator');
 
             if ($group_id == FEATHER_ADMIN || $group_mod == '1') {
-                $select_mods = array('id', 'moderators');
 
-                $result = DB::for_table('forums')
-                    ->select_many($select_mods)
-                    ->find_many();
+                // Loop through all forums
+                $result = $this->loop_mod_forums();
 
                 foreach($result as $cur_forum) {
                     $cur_moderators = ($cur_forum['moderators'] != '') ? unserialize($cur_forum['moderators']) : array();
@@ -959,10 +1064,12 @@ public function update_profile($id, $info, $section)
                         $cur_moderators[$form['username']] = $id;
                         uksort($cur_moderators, 'utf8_strcasecmp');
 
-                        DB::for_table('forums')->where('id', $cur_forum['id'])
+                        $update_mods = DB::for_table('forums')
+                            ->where('id', $cur_forum['id'])
                             ->find_one()
-                            ->set('moderators', serialize($cur_moderators))
-                            ->save();
+                            ->set('moderators', serialize($cur_moderators));
+                        $update_mods = $this->hook->fireDB('update_profile_mods', $update_mods);
+                        $update_mods = $update_mods->save();
                     }
                 }
             }
@@ -980,21 +1087,22 @@ public function update_profile($id, $info, $section)
             }
         }
 
+        $section = $this->hook->fireDB('update_profile', $section, $id);
+
         redirect(get_link('user/'.$id.'/section/'.$section.'/'), __('Profile redirect'));
     }
 
     public function get_user_info($id)
     {
-
-
-        $select_get_user_info = array('u.id', 'u.username', 'u.email', 'u.title', 'u.realname', 'u.url', 'u.jabber', 'u.icq', 'u.msn', 'u.aim', 'u.yahoo', 'u.location', 'u.signature', 'u.disp_topics', 'u.disp_posts', 'u.email_setting', 'u.notify_with_post', 'u.auto_notify', 'u.show_smilies', 'u.show_img', 'u.show_img_sig', 'u.show_avatars', 'u.show_sig', 'u.timezone', 'u.dst', 'u.language', 'u.style', 'u.num_posts', 'u.last_post', 'u.registered', 'u.registration_ip', 'u.admin_note', 'u.date_format', 'u.time_format', 'u.last_visit', 'g.g_id', 'g.g_user_title', 'g.g_moderator');
+        $user['select'] = array('u.id', 'u.username', 'u.email', 'u.title', 'u.realname', 'u.url', 'u.jabber', 'u.icq', 'u.msn', 'u.aim', 'u.yahoo', 'u.location', 'u.signature', 'u.disp_topics', 'u.disp_posts', 'u.email_setting', 'u.notify_with_post', 'u.auto_notify', 'u.show_smilies', 'u.show_img', 'u.show_img_sig', 'u.show_avatars', 'u.show_sig', 'u.timezone', 'u.dst', 'u.language', 'u.style', 'u.num_posts', 'u.last_post', 'u.registered', 'u.registration_ip', 'u.admin_note', 'u.date_format', 'u.time_format', 'u.last_visit', 'g.g_id', 'g.g_user_title', 'g.g_moderator');
 
         $user = DB::for_table('users')
             ->table_alias('u')
-            ->select_many($select_get_user_info)
+            ->select_many($user['select'])
             ->left_outer_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
-            ->where('u.id', $id)
-            ->find_one();
+            ->where('u.id', $id);
+        $user = $this->hook->fireDB('get_user_info', $user);
+        $user = $user->find_one();
 
         if (!$user) {
             message(__('Bad request'), '404');
@@ -1007,6 +1115,8 @@ public function parse_user_info($user)
     {
         $user_info = array();
 
+        $user_info = $this->hook->fire('parse_user_info_start', $user_info, $user);
+
         $user_info['personal'][] = '<dt>'.__('Username').'</dt>';
         $user_info['personal'][] = '<dd>'.feather_escape($user['username']).'</dd>';
 
@@ -1113,6 +1223,8 @@ public function parse_user_info($user)
         $user_info['activity'][] = '<dt>'.__('Registered').'</dt>';
         $user_info['activity'][] = '<dd>'.format_time($user['registered'], true).'</dd>';
 
+        $user_info = $this->hook->fire('parse_user_info', $user_info);
+
         return $user_info;
     }
 
@@ -1120,6 +1232,8 @@ public function edit_essentials($id, $user)
     {
         $user_disp = array();
 
+        $user_disp = $this->hook->fire('edit_essentials_start', $user_disp, $id, $user);
+
         if ($this->user->is_admmod) {
             if ($this->user->g_id == FEATHER_ADMIN || $this->user->g_mod_rename_users == '1') {
                 $user_disp['username_field'] = '<label class="required"><strong>'.__('Username').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_username" value="'.feather_escape($user['username']).'" size="25" maxlength="25" /><br /></label>'."\n";
@@ -1158,6 +1272,8 @@ public function edit_essentials($id, $user)
 
         $user_disp['posts_field'] .= (!empty($posts_actions) ? '<p class="actions">'.implode(' - ', $posts_actions).'</p>' : '')."\n";
 
+        $user_disp = $this->hook->fire('edit_essentials', $user_disp);
+
         return $user_disp;
     }
 
@@ -1165,12 +1281,16 @@ public function get_group_list($user)
     {
         $output = '';
 
-        $select_group_list = array('g_id', 'g_title');
+        $user = $this->hook->fire('get_group_list_start', $user);
+
+        $result['select'] = array('g_id', 'g_title');
 
-        $result = DB::for_table('groups')->select_many($select_group_list)
-                      ->where_not_equal('g_id', FEATHER_GUEST)
-                      ->order_by('g_title')
-                      ->find_many();
+        $result = DB::for_table('groups')
+            ->select_many($result['select'])
+            ->where_not_equal('g_id', FEATHER_GUEST)
+            ->order_by('g_title');
+        $result = $this->hook->fireDB('get_group_list_query', $result);
+        $result = $result->find_many();
 
         foreach ($result as $cur_group) {
             if ($cur_group['g_id'] == $user['g_id'] || ($cur_group['g_id'] == $this->config['o_default_user_group'] && $user['g_id'] == '')) {
@@ -1180,6 +1300,8 @@ public function get_group_list($user)
             }
         }
 
+        $output = $this->hook->fire('get_group_list', $output);
+
         return $output;
     }
 
@@ -1187,22 +1309,24 @@ public function get_forum_list($id)
     {
         $output = '';
 
-        $select_get_forum_list = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.moderators');
-        $order_by_get_forum_list = array('c.disp_position', 'c.id', 'f.disp_position');
+        $id = $this->hook->fire('get_forum_list_start', $id);
+
+        $result['select'] = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.moderators');
+        $result['order_by'] = array('c.disp_position', 'c.id', 'f.disp_position');
 
         $result = DB::for_table('categories')
             ->table_alias('c')
-            ->select_many($select_get_forum_list)
+            ->select_many($result['select'])
             ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
             ->where_null('f.redirect_url')
-            ->order_by_many($order_by_get_forum_list)
-            ->find_many();
+            ->order_by_many($result['order_by']);
+        $result = $this->hook->fireDB('get_forum_list', $result);
+        $result = $result->find_many();
 
         $cur_category = 0;
         foreach($result as $cur_forum) {
             if ($cur_forum['cid'] != $cur_category) {
                 // A new category since last iteration?
-
                 if ($cur_category) {
                     $output .= "\n\t\t\t\t\t\t\t\t".'</div>';
                 }
@@ -1220,6 +1344,8 @@ public function get_forum_list($id)
             $output .= "\n\t\t\t\t\t\t\t\t\t".'<label><input type="checkbox" name="moderator_in['.$cur_forum['fid'].']" value="1"'.((in_array($id, $moderators)) ? ' checked="checked"' : '').' />'.feather_escape($cur_forum['forum_name']).'<br /></label>'."\n";
         }
 
+        $output = $this->hook->fire('get_forum_list', $output);
+
         return $output;
     }
 
@@ -1228,11 +1354,13 @@ public function get_forum_list($id)
     //
     public function generate_profile_menu($page = '', $id)
     {
+        $page = $this->hook->fire('generate_profile_menu', $page, $id);
+
         $this->feather->render('profile/menu.php', array(
-            'id' => $id,
-            'feather_config' => $this->config,
-            'feather_user' => $this->user,
-            'page' => $page,
+                'id' => $id,
+                'feather_config' => $this->config,
+                'feather_user' => $this->user,
+                'page' => $page,
             )
         );
     }

From 822fa6ef0a57b46290e04491243eb7a214bae6b1 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 23 Aug 2015 17:18:44 +0200
Subject: [PATCH 142/353] Coding style

---
 model/login.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/model/login.php b/model/login.php
index a2660698..d845dcce 100644
--- a/model/login.php
+++ b/model/login.php
@@ -177,9 +177,10 @@ public function password_forgotten()
                             'last_email_sent' => time()
                         );
 
-                        $query = DB::for_table('users')->where('id', $cur_hit->id)
-                            ->find_one()
-                            ->set($query['update']);
+                        $query = DB::for_table('users')
+                                    ->where('id', $cur_hit->id)
+                                    ->find_one()
+                                    ->set($query['update']);
                         $query = $this->hook->fireDB('password_forgotten_mail_query', $query);
                         $query = $query->save();
 

From c7d4f5622ce60ff579c02a6482587810d9257fd1 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 23 Aug 2015 17:21:10 +0200
Subject: [PATCH 143/353] Coding style

---
 include/classes/autoload.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/classes/autoload.class.php b/include/classes/autoload.class.php
index a8bf8e35..9349d336 100644
--- a/include/classes/autoload.class.php
+++ b/include/classes/autoload.class.php
@@ -28,4 +28,3 @@ public static function registerAutoloader()
         spl_autoload_register(__NAMESPACE__ . '\Loader::autoload');
     }
 }
- ?>

From 838142f4eb3c9822a2b5a4fdac9d8dc88d600e95 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 23 Aug 2015 17:22:12 +0200
Subject: [PATCH 144/353] Coding style

---
 include/classes/core.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index a35d4912..35a94725 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -229,7 +229,7 @@ public function call()
 
         // Hooks
         $this->app->hooks = new \FeatherBB\Hooks();
-        new \plugin\plugintest();
+        new \plugin\plugintest(); // TODO: remove
 
         // Define time formats
         $forum_time_formats = array($this->forum_settings['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');

From cc0ba1c978499044807805746c028785b9d70042 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 23 Aug 2015 17:31:04 +0200
Subject: [PATCH 145/353] Coding style

---
 include/classes/auth.class.php | 10 ++++++----
 model/auth.php                 | 20 +++++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index d26f871b..6b7e5232 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -97,9 +97,10 @@ public function update_users_online()
         // Fetch all online list entries that are older than "o_timeout_online"
         $select_update_users_online = array('user_id', 'ident', 'logged', 'idle');
 
-        $result = \DB::for_table('online')->select_many($select_update_users_online)
-            ->where_lt('logged', $this->app->now-$this->app->forum_settings['o_timeout_online'])
-            ->find_many();
+        $result = \DB::for_table('online')
+                    ->select_many($select_update_users_online)
+                    ->where_lt('logged', $this->app->now-$this->app->forum_settings['o_timeout_online'])
+                    ->find_many();
 
         foreach ($result as $cur_user) {
             // If the entry is a guest, delete it
@@ -173,7 +174,8 @@ public function check_bans()
             }
 
             if ($is_banned) {
-                \DB::for_table('online')->where('ident', $this->app->user->username)
+                \DB::for_table('online')
+                    ->where('ident', $this->app->user->username)
                     ->delete_many();
                 message(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.feather_escape($this->app->forum_settings['o_admin_email']).'">'.feather_escape($this->app->forum_settings['o_admin_email']).'</a>.', true, true, true);
             }
diff --git a/model/auth.php b/model/auth.php
index 15b896a2..2b11849e 100644
--- a/model/auth.php
+++ b/model/auth.php
@@ -15,23 +15,25 @@ class auth
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
+        $this->hook = $this->feather->hooks;
     }
 
     public function load_user($user_id)
     {
         $user_id = (int) $user_id;
-        $select_load_user = array('u.*', 'g.*', 'o.logged', 'o.idle');
-        $where_load_user = array('u.id' => $user_id);
-        $left_outer_join_load_user = ($user_id == 1) ? $this->feather->request->getIp() : 'u.id';
+        $result['select'] = array('u.*', 'g.*', 'o.logged', 'o.idle');
+        $result['where'] = array('u.id' => $user_id);
+        $result['join'] = ($user_id == 1) ? $this->feather->request->getIp() : 'u.id';
         $escape = ($user_id == 1) ? true : false;
 
         $result = DB::for_table('users')
-            ->table_alias('u')
-            ->select_many($select_load_user)
-            ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
-            ->left_outer_join('online', array('o.user_id', '=', $left_outer_join_load_user), 'o', $escape)
-            ->where($where_load_user)
-            ->find_result_set();
+                    ->table_alias('u')
+                    ->select_many($result['select'])
+                    ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
+                    ->left_outer_join('online', array('o.user_id', '=', $result['join']), 'o', $escape)
+                    ->where($result['where']);
+        //$result = $this->hook->fireDB('load_user_query', $result);
+        $result = $result->find_result_set();
 
         foreach ($result as $user) {
             return $user;

From 50ecd79dd975b422db9ff860044abac69e96b1b4 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 23 Aug 2015 17:33:45 +0200
Subject: [PATCH 146/353] Fix minor issues

---
 include/classes/auth.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index 6b7e5232..06324b40 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -135,7 +135,7 @@ public function check_bans()
 
         // Add a dot or a colon (depending on IPv4/IPv6) at the end of the IP address to prevent banned address
         // 192.168.0.5 from matching e.g. 192.168.0.50
-        $user_ip = get_remote_address();
+        $user_ip = $this->app->request->getIp();
         $user_ip .= (strpos($user_ip, '.') !== false) ? '.' : ':';
 
         $bans_altered = false;
@@ -292,7 +292,7 @@ public function call()
         $this->update_users_online();
 
         // Configure Slim
-        $this->app->config('templates.path', $this->app->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
+        $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? $this->app->forum_env['FEATHER_ROOT'].'style/'.$this->app->user->style.'/view' : $this->app->forum_env['FEATHER_ROOT'].'view');
         $this->next->call();
     }
 }

From 76235137bc793770d2b8cbb685144db41f6fc32e Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 23 Aug 2015 17:39:52 +0200
Subject: [PATCH 147/353] Fix image link and rebrand variable

---
 lang/English/help.mo          | Bin 4255 -> 4261 bytes
 lang/English/help.po          |   4 ++--
 style/FeatherBB/view/help.php |   2 +-
 view/help.php                 |   2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lang/English/help.mo b/lang/English/help.mo
index 2d7673164737d5e1eb6a7b3ff25813f9d4072fa3..0cc4462a25c7bd1f4e0b9612a952aefa7842a618 100644
GIT binary patch
delta 773
zcmXZZODKd<6u|K_d^4V7yo<#!sL3O;kx&#C8Y1OUN-U<3g=8VAZ^6n+W+7Rykz}Dr
zu~KZL?69IN!~!*GW@W+uaO(E`?z!K6oO|w0XfL$B>=ud0ha-}WDP9q}62L4hL_d~W
zT#vcLEtrWB%)nv$KVi<Ai%64IKDutr#<wlr_lo<s(HR3iCS2Ks8`OgzFdbho4L?y6
zO=1D2ut*arMolDSajnHo7I$EP{}If=F^gw>?*9Qx4Csa{n1`FFl{r97<O1{Y7WKeq
z9Po&|BTd@K@*6wx6x+#06H1ytsQYEGSSwtHM_A?3(T(p=Z}x_oX##bD!#n7BDeA&7
zo?{(qVy{S(1RpK2P9A|g9LH%a#B1}({6dN-ZW_DjLO<$8LF~pF4B;H=4L7hAw=jzL
zs87>MJ@sk2@Dh7bD;eMx+(9Z)D^YK8v&EhN@u2k4X=K7E>f5X#O}6;x0S8!(#~8#%
zEWvNHi0sRV8*m8wV?C*d9*HGWM?C&mpR?<WPA*JE=TG8JzR&uxxKnWw&RX>T0t_li
A`Tzg`

delta 767
zcmXZZODIKA6oBD%y3X}D-jAX@I+Dl;N%F|VYoK%`CQKxesTin3DH8*A3}ixiOeg~x
zC<B=&6G<^rl!0^;x9$YRzgV@~-&y<Y$J%S}`CI<lLXa;a@f49v{6U&zx*{ItVHTEI
zT!*>D&6t6`n2v+?f7F~ZXOSjLbh>WE#y2e9btU-Q=!AhN6V7eICF;Sqn1)Z7im#}N
zCa?g1P!lO&u_jWE8rN9dXmLB{Fy4#VIAZZ+H26PYjse|p5%X{zi*O$`ku%gvU7;TE
zfCG-m3(};8EWfZ5Pq2+_G@*p~jk;fy#aiJ~JVHO<LpQ!bz1cHrrXM!$@D4g&h`P|n
zQ>;c!>=9}5MyDnI#9{PUG=}3?h!^I)8ApmIfx|AkFco#9V(h{y^l=*XhO5|$Ax_{m
z>eDn)PkovWyufbMN~UuQ?jU8Tm8h|}!Q%G+I3_)O)H5N5`Zmi*laNji*uh#n#B#jD
v5=@#oWM4sCi$mBK_C*eytS}iFb|mai*^bQ2&WD~?d0gbayBZvO-lqEtl!8cE

diff --git a/lang/English/help.po b/lang/English/help.po
index 8947956a..2d7c7c52 100644
--- a/lang/English/help.po
+++ b/lang/English/help.po
@@ -80,8 +80,8 @@ msgstr "My email address"
 msgid "Images info"
 msgstr "If you want to display an image you can use the img tag. The text appearing after the \"=\" sign in the opening tag is used for the alt attribute and should be included whenever possible."
 
-msgid "FluxBB bbcode test"
-msgstr "FluxBB bbcode test"
+msgid "FeatherBB bbcode test"
+msgstr "FeatherBB bbcode test"
 
 msgid "Test topic"
 msgstr "Test topic"
diff --git a/style/FeatherBB/view/help.php b/style/FeatherBB/view/help.php
index b5477db4..2ecf9e36 100644
--- a/style/FeatherBB/view/help.php
+++ b/style/FeatherBB/view/help.php
@@ -57,7 +57,7 @@
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
-		<p><code>[img=<?php _e('FluxBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php _e('FluxBB bbcode test') ?>" /></samp></p>
+		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
 <h2><span><?php _e('Quotes') ?></span></h2>
diff --git a/view/help.php b/view/help.php
index b5477db4..2ecf9e36 100644
--- a/view/help.php
+++ b/view/help.php
@@ -57,7 +57,7 @@
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
-		<p><code>[img=<?php _e('FluxBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/test.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/test.png" alt="<?php _e('FluxBB bbcode test') ?>" /></samp></p>
+		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
 <h2><span><?php _e('Quotes') ?></span></h2>

From b7376973daaa387f3a136f6a8ee14e9b07c7bdb1 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 23 Aug 2015 18:13:47 +0200
Subject: [PATCH 148/353] Switch remaining $lang_ to gettext

---
 model/search.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/model/search.php b/model/search.php
index 3bd0de2a..c1f97531 100644
--- a/model/search.php
+++ b/model/search.php
@@ -25,8 +25,6 @@ public function __construct()
 
     public function get_search_results()
     {
-        global $lang_search;
-
         $search = array();
 
         $action = ($this->request->get('action')) ? $this->request->get('action') : null;
@@ -627,20 +625,20 @@ public function get_search_results()
                     $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), feather_escape($subscriber_name)).'</a>';
                 } else {
                     $search_url = str_replace('_', '/', $search_type[1]);
-                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/'.$search_url.'/').'">'.$lang_search['Quick search '.$search_type[1]].'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/'.$search_url.'/').'">'.__('Quick search '.$search_type[1]).'</a>';
                 }
             } else {
                 $keywords = $author = '';
 
                 if ($search_type[0] == 'both') {
                     list($keywords, $author) = $search_type[1];
-                    $search['crumbs_text']['search_type'] = sprintf($lang_search['By both show as '.$show_as], feather_escape($keywords), feather_escape($author));
+                    $search['crumbs_text']['search_type'] = sprintf(__('By both show as '.$show_as), feather_escape($keywords), feather_escape($author));
                 } elseif ($search_type[0] == 'keywords') {
                     $keywords = $search_type[1];
-                    $search['crumbs_text']['search_type'] = sprintf($lang_search['By keywords show as '.$show_as], feather_escape($keywords));
+                    $search['crumbs_text']['search_type'] = sprintf(__('By keywords show as '.$show_as), feather_escape($keywords));
                 } elseif ($search_type[0] == 'author') {
                     $author = $search_type[1];
-                    $search['crumbs_text']['search_type'] = sprintf($lang_search['By user show as '.$show_as], feather_escape($author));
+                    $search['crumbs_text']['search_type'] = sprintf(__('By user show as '.$show_as), feather_escape($author));
                 }
 
                 $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=search&amp;keywords='.urlencode($keywords).'&amp;author='.urlencode($author).'&amp;forums='.$search_type[2].'&amp;search_in='.$search_type[3].'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir.'&amp;show_as='.$show_as).'">'.$search['crumbs_text']['search_type'].'</a>';
@@ -654,7 +652,7 @@ public function get_search_results()
 
     public function display_search_results($search)
     {
-        global $lang_search, $pd;
+        global $pd;
 
         // Get topic/forum tracking data
         if (!$this->user->is_guest) {
@@ -702,7 +700,6 @@ public function display_search_results($search)
                     'url_topic' => $url_topic,
                     'cur_search' => $cur_search,
                     'forum' => $forum,
-                    'lang_search' => $lang_search,
                     )
                 );
             } else {
@@ -769,8 +766,6 @@ public function display_search_results($search)
 
     public function get_list_forums()
     {
-        global $lang_search;
-
         $output = '';
 
         $select_get_list_forums = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.redirect_url');

From bc389df3c4270b147122b8760c089cd6f5a0e096 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 23 Aug 2015 18:26:58 +0200
Subject: [PATCH 149/353] Minor fixes

---
 model/install.php   | 6 ++++--
 model/search.php    | 1 -
 model/viewtopic.php | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/model/install.php b/model/install.php
index 30d1c2ad..3590b585 100644
--- a/model/install.php
+++ b/model/install.php
@@ -388,6 +388,7 @@ public static function load_default_user()
 
     public static function load_admin_user(array $data)
     {
+        $feather = \Slim\Slim::getInstance();
         $now = time();
         return $user = array(
             'group_id' => 1,
@@ -399,19 +400,20 @@ public static function load_admin_user(array $data)
             'num_posts' => 1,
             'last_post' => $now,
             'registered' => $now,
-            'registration_ip' => get_remote_address(),
+            'registration_ip' => $feather->request->getIp(),
             'last_visit' => $now);
     }
 
     public static function load_mock_forum_data(array $data)
     {
+        $feather = \Slim\Slim::getInstance();
         $cat_name = __('Test category');
         $subject = __('Test post');
         $message = __('Message');
         $forum_name = __('Test forum');
         $forum_desc = __('This is just a test forum');
         $now = time();
-        $ip = get_remote_address();
+        $ip = $feather->request->getIp();
 
         return $mock_data = array(
             'categories' => array('cat_name' => $cat_name,
diff --git a/model/search.php b/model/search.php
index c1f97531..cc0f027a 100644
--- a/model/search.php
+++ b/model/search.php
@@ -22,7 +22,6 @@ public function __construct()
         $this->request = $this->feather->request;
     }
 
-
     public function get_search_results()
     {
         $search = array();
diff --git a/model/viewtopic.php b/model/viewtopic.php
index 1f32514a..b4776ff1 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -241,7 +241,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
         }
 
         if (empty($post_ids)) {
-            error('The post table and topic table seem to be out of sync!', __FILE__, __LINE__);
+            message('The post table and topic table seem to be out of sync!');
         }
 
         // Retrieve the posts (and their respective poster/online status)

From 8cb913c485f20c478456e824f0427bdd9e059026 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 24 Aug 2015 02:00:40 +0200
Subject: [PATCH 150/353] Half of model/admin folder hooks

---
 controller/admin/forums.php                   | 10 +--
 controller/admin/groups.php                   |  3 +-
 model/admin/bans.php                          | 53 +++++++++---
 model/admin/categories.php                    | 28 ++++---
 model/admin/censoring.php                     | 23 ++++--
 model/admin/forums.php                        | 76 ++++++++++++------
 model/admin/groups.php                        | 80 ++++++++++++++-----
 model/admin/maintenance.php                   | 10 +--
 .../view/admin/groups/delete_group.php        |  6 +-
 9 files changed, 202 insertions(+), 87 deletions(-)

diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index e71517f5..e54c624e 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -100,8 +100,8 @@ public function edit_forum($forum_id)
                     $permissions_data['post_replies'] = (isset($this->request->post('post_replies_new')[$perm_group['g_id']])) ? '1' : '0';
                     $permissions_data['post_topics'] = (isset($this->request->post('post_topics_new')[$perm_group['g_id']])) ? '1' : '0';
                     // Check if the new settings differ from the old
-                    if ($permissions_data['read_forum'] != $this->request->post('read_forum_old')[$perm_group['g_id']] || 
-                        $permissions_data['post_replies'] != $this->request->post('post_replies_old')[$perm_group['g_id']] || 
+                    if ($permissions_data['read_forum'] != $this->request->post('read_forum_old')[$perm_group['g_id']] ||
+                        $permissions_data['post_replies'] != $this->request->post('post_replies_old')[$perm_group['g_id']] ||
                         $permissions_data['post_topics'] != $this->request->post('post_topics_old')[$perm_group['g_id']]) {
                             // If there is no group permissions override for this forum
                             if ($permissions_data['read_forum'] == '1' && $permissions_data['post_replies'] == $perm_group['g_post_replies'] && $permissions_data['post_topics'] == $perm_group['g_post_topics']) {
@@ -120,7 +120,7 @@ public function edit_forum($forum_id)
                 generate_quickjump_cache();
 
                 redirect(get_link('admin/forums/edit/'.$forum_id.'/'), __('Forum updated redirect'));
-                
+
             } elseif ($this->request->post('revert_perms')) {
                 $this->model->delete_permissions($forum_id);
 
@@ -195,7 +195,7 @@ public function delete_forum($forum_id)
             $this->footer->display();
         }
     }
-    
+
     // -- //
 
     public function edit_positions()
@@ -214,7 +214,7 @@ public function edit_positions()
 
         redirect(get_link('admin/forums/'), __('Forums updated redirect'));
     }
-    
+
     public function display()
     {
         if ($this->user->g_id != FEATHER_ADMIN) {
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index ec69692b..e803beee 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -29,7 +29,7 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
-    
+
     public function display()
     {
         if ($this->user->g_id != FEATHER_ADMIN) {
@@ -119,6 +119,7 @@ public function delete($id)
         $this->feather->render('admin/groups/delete_group.php', array(
                 'id'    => $id,
                 'group_info'      =>  $this->model->get_title_members($id),
+                'group_list_delete'      =>  $this->model->get_group_list_delete($id),
             )
         );
 
diff --git a/model/admin/bans.php b/model/admin/bans.php
index c0a85f60..fcfb6a91 100644
--- a/model/admin/bans.php
+++ b/model/admin/bans.php
@@ -20,12 +20,15 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
- 
+
     public function add_ban_info($id = null)
     {
         $ban = array();
 
+        $id = $this->hook->fire('add_ban_info_start', $id);
+
         // If the ID of the user to ban was provided through GET (a link from profile.php)
         if (is_numeric($id)) {
             $ban['user_id'] = $id;
@@ -35,8 +38,10 @@ public function add_ban_info($id = null)
 
             $select_add_ban_info = array('group_id', 'username', 'email');
             $result = DB::for_table('users')->select_many($select_add_ban_info)
-                        ->where('id', $ban['user_id'])
-                        ->find_one();
+                        ->where('id', $ban['user_id']);
+
+            $result = $this->hook->fireDB('add_ban_info_query', $result);
+            $result = $result->find_one();
 
             if ($result) {
                 $group_id = $result['group_id'];
@@ -54,8 +59,11 @@ public function add_ban_info($id = null)
                 $select_add_ban_info = array('id', 'group_id', 'username', 'email');
                 $result = DB::for_table('users')->select_many($select_add_ban_info)
                     ->where('username', $ban['ban_user'])
-                    ->where_gt('id', 1)
-                    ->find_one();
+                    ->where_gt('id', 1);
+
+                $result = $this->hook->fireDB('add_ban_info_query', $result);
+                $result = $result->find_one();
+
                 if ($result) {
                     $ban['user_id'] = $result['id'];
                     $group_id = $result['group_id'];
@@ -95,6 +103,8 @@ public function add_ban_info($id = null)
 
         $ban['mode'] = 'add';
 
+        $ban = $this->hook->fire('add_ban_info', $ban);
+
         return $ban;
     }
 
@@ -102,12 +112,16 @@ public function edit_ban_info($id)
     {
         $ban = array();
 
+        $id = $this->hook->fire('edit_ban_info_start', $id);
+
         $ban['id'] = $id;
 
         $select_edit_ban_info = array('username', 'ip', 'email', 'message', 'expire');
         $result = DB::for_table('bans')->select_many($select_edit_ban_info)
-            ->where('id', $ban['id'])
-            ->find_one();
+            ->where('id', $ban['id']);
+
+        $result = $this->hook->fireDB('edit_ban_info_query', $result);
+        $result = $result->find_one();
 
         if ($result) {
             $ban['ban_user'] = $result['username'];
@@ -124,6 +138,8 @@ public function edit_ban_info($id)
 
         $ban['mode'] = 'edit';
 
+        $ban = $this->hook->fire('edit_ban_info', $ban);
+
         return $ban;
     }
 
@@ -135,6 +151,8 @@ public function insert_ban()
         $ban_message = feather_trim($this->request->post('ban_message'));
         $ban_expire = feather_trim($this->request->post('ban_expire'));
 
+        $this->hook->fire('insert_ban_start', $ban_user, $ban_ip, $ban_email, $ban_message, $ban_expire);
+
         if ($ban_user == '' && $ban_ip == '' && $ban_email == '') {
             message(__('Must enter message'));
         } elseif (strtolower($ban_user) == 'guest') {
@@ -238,16 +256,18 @@ public function insert_ban()
             'expire'    =>  $ban_expire,
         );
 
+        $insert_update_ban = $this->hook->fire('insert_ban_data', $insert_update_ban);
+
         if ($this->request->post('mode') == 'add') {
             $insert_update_ban['ban_creator'] = $this->user->id;
 
-            DB::for_table('bans')
+            $result = DB::for_table('bans')
                 ->create()
                 ->set($insert_update_ban)
                 ->save();
         } else {
 
-            DB::for_table('bans')
+            $result = DB::for_table('bans')
                 ->where('id', $this->request->post('ban_id'))
                 ->find_one()
                 ->set($insert_update_ban)
@@ -266,9 +286,12 @@ public function insert_ban()
 
     public function remove_ban($ban_id)
     {
-        DB::for_table('bans')->where('id', $ban_id)
-                    ->find_one()
-                    ->delete();
+        $ban_id = $this->hook->fire('remove_ban', $ban_id);
+
+        $result = DB::for_table('bans')->where('id', $ban_id)
+                    ->find_one();
+        $result = $this->hook->fireDB('remove_ban_query', $result);
+        $result = $result->delete();
 
         // Regenerate the bans cache
         if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
@@ -284,6 +307,8 @@ public function find_ban($start_from = false)
     {
         $ban_info = array();
 
+        $this->hook->fire('find_ban_start');
+
         // trim() all elements in $form
         $ban_info['conditions'] = $ban_info['query_str'] = array();
 
@@ -351,7 +376,7 @@ public function find_ban($start_from = false)
                              ->order_by($ban_info['order_by'], $ban_info['direction'])
                              ->offset($start_from)
                              ->limit(50)
-                            ->find_many();
+                             ->find_many();
 
             foreach ($result as $cur_ban) {
                 $ban_info['data'][] = $cur_ban;
@@ -361,6 +386,8 @@ public function find_ban($start_from = false)
             $ban_info['num_bans'] = $result->count('id');
         }
 
+        $this->hook->fire('find_ban', $ban_info);
+
         return $ban_info;
     }
 }
diff --git a/model/admin/categories.php b/model/admin/categories.php
index 7e8010c1..d2ac4352 100644
--- a/model/admin/categories.php
+++ b/model/admin/categories.php
@@ -20,10 +20,13 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
 
     public function add_category($cat_name)
     {
+        $cat_name = $this->hook->fire('add_category', $cat_name);
+
         $set_add_category = array('cat_name' => $cat_name);
 
         return DB::for_table('categories')
@@ -34,6 +37,8 @@ public function add_category($cat_name)
 
     public function update_category(array $category)
     {
+        $category = $this->hook->fire('update_category', $category);
+
         $set_update_category = array('cat_name' => $category['name'],
                                     'disp_position' => $category['order']);
 
@@ -45,10 +50,13 @@ public function update_category(array $category)
 
     public function delete_category($cat_to_delete)
     {
+        $cat_to_delete = $this->hook->fire('delete_category_start', $cat_to_delete);
+
         $forums_in_cat = DB::for_table('forums')
                             ->select('id')
-                            ->where('cat_id', $cat_to_delete)
-                            ->find_many();
+                            ->where('cat_id', $cat_to_delete);
+        $forums_in_cat = $this->hook->fireDB('delete_forums_in_cat_query', $forums_in_cat);
+        $forums_in_cat = $forums_in_cat->find_many();
 
         foreach ($forums_in_cat as $forum) {
             // Prune all posts and topics
@@ -66,17 +74,18 @@ public function delete_category($cat_to_delete)
                     ->table_alias('t1')
                     ->left_outer_join('topics', array('t1.moved_to', '=', 't2.id'), 't2')
                     ->where_null('t2.id')
-                    ->where_not_null('t1.moved_to')
-                    ->find_many();
+                    ->where_not_null('t1.moved_to');
+        $orphans = $this->hook->fireDB('delete_orphan_forums_query', $orphans);
+        $orphans = $orphans->find_many();
 
         if (count($orphans) > 0) {
             $orphans->delete_many();
         }
 
         // Delete category
-        DB::for_table('categories')
-            ->find_one($cat_to_delete)
-            ->delete();
+        $result = DB::for_table('categories');
+        $result = $this->hook->fireDB('find_forums_in_cat', $result);
+        $result = $result->find_one($cat_to_delete)->delete();
 
         return true;
     }
@@ -88,8 +97,9 @@ public function get_cat_list()
 
         $cat_list = DB::for_table('categories')
             ->select($select_get_cat_list)
-            ->order_by_asc('disp_position')
-            ->find_array();
+            ->order_by_asc('disp_position');
+        $cat_list = $this->hook->fireDB('get_cat_list', $cat_list);
+        $cat_list = $cat_list->find_array();
 
         return $cat_list;
     }
diff --git a/model/admin/censoring.php b/model/admin/censoring.php
index 473769ca..fb134562 100644
--- a/model/admin/censoring.php
+++ b/model/admin/censoring.php
@@ -20,6 +20,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
 
     public function add_word()
@@ -34,7 +35,9 @@ public function add_word()
         $set_search_word = array('search_for' => $search_for,
                                 'replace_with' => $replace_with);
 
-        DB::for_table('censoring')
+        $set_search_word = $this->hook->fire('add_censoring_word_data', $set_search_word);
+
+        $result = DB::for_table('censoring')
             ->create()
             ->set($set_search_word)
             ->save();
@@ -63,7 +66,9 @@ public function update_word()
         $set_search_word = array('search_for' => $search_for,
                                 'replace_with' => $replace_with);
 
-        DB::for_table('censoring')
+        $set_search_word = $this->hook->fire('update_censoring_word_start', $set_search_word);
+
+        $result = DB::for_table('censoring')
             ->find_one($id)
             ->set($set_search_word)
             ->save();
@@ -81,10 +86,11 @@ public function update_word()
     public function remove_word()
     {
         $id = intval(key($this->request->post('remove')));
+        $id = $this->hook->fire('remove_censoring_word_start', $id);
 
-        DB::for_table('censoring')
-            ->find_one($id)
-            ->delete();
+        $result = DB::for_table('censoring')->find_one($id);
+        $result = $this->hook->fireDB('remove_censoring_word', $result);
+        $result = $result->delete();
 
         // Regenerate the censoring cache
         if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
@@ -101,9 +107,10 @@ public function get_words()
         $word_data = array();
 
         $word_data = DB::for_table('censoring')
-                        ->order_by_asc('id')
-                        ->find_array();
+                        ->order_by_asc('id');
+        $word_data = $this->hook->fireDB('update_censoring_word_query', $word_data);
+        $word_data = $word_data->find_array();
 
         return $word_data;
     }
-}
\ No newline at end of file
+}
diff --git a/model/admin/forums.php b/model/admin/forums.php
index e5c62007..67bfeb69 100644
--- a/model/admin/forums.php
+++ b/model/admin/forums.php
@@ -20,10 +20,11 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
- 
+
     //
-    // Forum 
+    // Forum
     //
 
     public function add_forum($cat_id, $forum_name)
@@ -31,6 +32,8 @@ public function add_forum($cat_id, $forum_name)
         $set_add_forum = array('forum_name' => $forum_name,
                                 'cat_id' => $cat_id);
 
+        $set_add_forum = $this->hook->fire('add_forum', $set_add_forum);
+
         $forum = DB::for_table('forums')
                     ->create()
                     ->set($set_add_forum);
@@ -41,10 +44,13 @@ public function add_forum($cat_id, $forum_name)
 
     public function update_forum($forum_id, array $forum_data)
     {
-        return DB::for_table('forums')
+        $update_forum = DB::for_table('forums')
                     ->find_one($forum_id)
-                    ->set($forum_data)
-                    ->save();
+                    ->set($forum_data);
+        $update_forum = $this->hook->fireDB('update_forum_query', $update_forum);
+        $update_forum = $update_forum->save();
+
+        return $update_forum;
     }
 
     public function delete_forum($forum_id)
@@ -52,31 +58,34 @@ public function delete_forum($forum_id)
         // Load the maintenance.php model file for prune public function
         require FEATHER_ROOT . 'model/admin/maintenance.php';
 
+        $forum_id = $this->hook->fire('delete_forum_start', $forum_id);
+
         // Prune all posts and topics
         $this->maintenance = new \model\admin\maintenance();
         $this->maintenance->prune($forum_id, 1, -1);
 
         // Delete the forum
-        DB::for_table('forums')
-            ->find_one($forum_id)
-            ->delete();
+        $delete_forum = DB::for_table('forums')->find_one($forum_id);
+        $delete_forum = $this->hook->fireDB('delete_forum_query', $delete_forum);
+        $delete_forum->delete();
 
         // Delete forum specific group permissions and subscriptions
-        DB::for_table('forum_perms')
-            ->where('forum_id', $forum_id)
-            ->delete_many();
+        $delete_forum_perms = DB::for_table('forum_perms')->where('forum_id', $forum_id);
+        $delete_forum_perms = $this->hook->fireDB('delete_forum_perms_query', $delete_forum_perms);
+        $delete_forum_perms->delete_many();
 
-        DB::for_table('forum_subscriptions')
-            ->where('forum_id', $forum_id)
-            ->delete_many();
+        $delete_forum_subs = DB::for_table('forum_subscriptions')->where('forum_id', $forum_id);
+        $delete_forum_subs = $this->hook->fireDB('delete_forum_subs_query', $delete_forum_subs);
+        $delete_forum_subs->delete_many();
 
         // Delete orphaned redirect topics
         $orphans = DB::for_table('topics')
                     ->table_alias('t1')
                     ->left_outer_join('topics', array('t1.moved_to', '=', 't2.id'), 't2')
                     ->where_null('t2.id')
-                    ->where_not_null('t1.moved_to')
-                    ->find_many();
+                    ->where_not_null('t1.moved_to');
+        $orphans = $this->hook->fireDB('delete_orphan_redirect_topics_query', $orphans);
+        $orphans = $orphans->find_many();
 
         if (count($orphans) > 0) {
             $orphans->delete_many();
@@ -88,14 +97,17 @@ public function delete_forum($forum_id)
     public function get_forum_info($forum_id)
     {
         $result = DB::for_table('forums')
-                    ->where('id', $forum_id)
-                    ->find_array();
+                    ->where('id', $forum_id);
+        $result = $this->hook->fireDB('get_forum_infos', $result);
+        $result = $result->find_array();
+
         return $result[0];
     }
 
     public function get_forums()
     {
         $forum_data = array();
+        $forum_data = $this->hook->fire('get_forums_start', $forum_data);
 
         $select_get_forums = array('cid' => 'c.id', 'c.cat_name', 'cat_position' => 'c.disp_position', 'fid' => 'f.id', 'f.forum_name', 'forum_position' => 'f.disp_position');
 
@@ -104,8 +116,9 @@ public function get_forums()
                     ->select_many($select_get_forums)
                     ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
                     ->order_by_asc('f.disp_position')
-                    ->order_by_asc('c.disp_position')
-                    ->find_array();
+                    ->order_by_asc('c.disp_position');
+        $result = $this->hook->fireDB('get_forums_query', $result);
+        $result = $result->find_array();
 
         foreach ($result as $forum) {
             if (!isset($forum_data[$forum['cid']])) {
@@ -117,11 +130,15 @@ public function get_forums()
                                                                'forum_name' => $forum['forum_name'],
                                                                'position' => $forum['forum_position']);
         }
+
+        $forum_data = $this->hook->fire('get_forums', $forum_data);
         return $forum_data;
     }
 
     public function update_positions($forum_id, $position)
     {
+        $this->hook->fire('update_positions_start', $forum_id, $position);
+
         return DB::for_table('forums')
                 ->find_one($forum_id)
                 ->set('disp_position', $position)
@@ -135,6 +152,7 @@ public function update_positions($forum_id, $position)
     public function get_permissions($forum_id)
     {
         $perm_data = array();
+        $forum_id = $this->hook->fire('get_permissions_start', $forum_id);
 
         $select_permissions = array('g.g_id', 'g.g_title', 'g.g_read_board', 'g.g_post_replies', 'g.g_post_topics', 'fp.read_forum', 'fp.post_replies', 'fp.post_topics');
 
@@ -143,8 +161,9 @@ public function get_permissions($forum_id)
                         ->select_many($select_permissions)
                         ->left_outer_join('forum_perms', 'g.g_id=fp.group_id AND fp.forum_id='.$forum_id, 'fp') // Workaround
                         ->where_not_equal('g.g_id', FEATHER_ADMIN)
-                        ->order_by_asc('g.g_id')
-                        ->find_many();
+                        ->order_by_asc('g.g_id');
+        $permissions = $this->hook->fireDB('get_permissions_query', $permissions);
+        $permissions = $permissions->find_many();
 
         foreach($permissions as $cur_perm) {
             $cur_perm['read_forum'] = ($cur_perm['read_forum'] != '0') ? true : false;
@@ -159,6 +178,7 @@ public function get_permissions($forum_id)
             $perm_data[] = $cur_perm;
         }
 
+        $perm_data = $this->hook->fire('get_permissions', $perm_data);
         return $perm_data;
     }
 
@@ -173,11 +193,17 @@ public function get_default_group_permissions($fetch_admin = true)
             $result->where_not_equal('g_id', FEATHER_ADMIN);
         }
 
-        return $result->order_by_asc('g_id')->find_array();
+        $result = $result->order_by_asc('g_id');
+        $result = $this->hook->fireDB('get_default_group_permissions_query', $result);
+        $result = $result->find_array();
+
+        return $result;
     }
 
     public function update_permissions(array $permissions_data)
     {
+        $permissions_data = $this->hook->fire('update_permissions_start', $permissions_data);
+
         $permissions = DB::for_table('forum_perms')
                             ->where('forum_id', $permissions_data['forum_id'])
                             ->where('group_id', $permissions_data['group_id'])
@@ -192,7 +218,7 @@ public function update_permissions(array $permissions_data)
 
     }
 
-    public function delete_permissions($forum_id, $group_id = null) 
+    public function delete_permissions($forum_id, $group_id = null)
     {
         $result = DB::for_table('forum_perms')
                     ->where('forum_id', $forum_id);
@@ -201,6 +227,8 @@ public function delete_permissions($forum_id, $group_id = null)
             $result->where('group_id', $group_id);
         }
 
+        $result = $this->hook->fireDB('delete_permissions_query', $result);
+
         return $result->delete_many();
     }
 }
diff --git a/model/admin/groups.php b/model/admin/groups.php
index bf3cd7df..0ec9abe7 100644
--- a/model/admin/groups.php
+++ b/model/admin/groups.php
@@ -20,16 +20,20 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
- 
+
     public function fetch_groups()
     {
         $result = DB::for_table('groups')->order_by('g_id')->find_many();
+        $this->hook->fireDB('fetch_groups_query', $result);
         $groups = array();
         foreach ($result as $cur_group) {
             $groups[$cur_group['g_id']] = $cur_group;
         }
 
+        $groups = $this->hook->fire('fetch_groups', $groups);
+
         return $groups;
     }
 
@@ -39,6 +43,7 @@ public function info_add_group($groups, $id)
 
         if ($this->request->post('add_group')) {
             $group['base_group'] = intval($this->request->post('base_group'));
+            $group['base_group'] = $this->hook->fire('add_user_group', $group['base_group']);
             $group['info'] = $groups[$group['base_group']];
 
             $group['mode'] = 'add';
@@ -48,11 +53,14 @@ public function info_add_group($groups, $id)
                 message(__('Bad request'), '404');
             }
 
+            $groups[$id] = $this->hook->fire('update_user_group', $groups[$id]);
+
             $group['info'] = $groups[$id];
 
             $group['mode'] = 'edit';
         }
 
+        $group = $this->hook->fire('info_add_group', $group);
         return $group;
     }
 
@@ -70,26 +78,35 @@ public function get_group_list($groups, $group)
             }
         }
 
+        $output = $this->hook->fire('get_group_list', $output);
         return $output;
     }
 
     public function get_group_list_delete($group_id)
     {
+        $group_id = $this->hook->fire('get_group_list_delete_start', $group_id);
+
         $select_get_group_list_delete = array('g_id', 'g_title');
         $result = DB::for_table('groups')->select_many($select_get_group_list_delete)
                         ->where_not_equal('g_id', FEATHER_GUEST)
                         ->where_not_equal('g_id', $group_id)
-                        ->order_by('g_title')
-                        ->find_many();
+                        ->order_by('g_title');
+        $result = $this->hook->fireDB('get_group_list_delete', $result);
+        $result = $result->find_many();
+
+        $output = '';
 
         foreach ($result as $cur_group) {
             if ($cur_group['g_id'] == FEATHER_MEMBER) {
                 // Pre-select the pre-defined Members group
-                echo "\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
             } else {
-                echo "\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
             }
         }
+
+        $output = $this->hook->fire('get_group_list.output', $output);
+        return $output;
     }
 
     public function add_edit_group($groups)
@@ -100,11 +117,21 @@ public function add_edit_group($groups)
             $group_id = 0;
         }
 
+        $group_id = $this->hook->fire('add_edit_group_start', $group_id);
+
         // Is this the admin group? (special rules apply)
         $is_admin_group = ($this->request->post('group_id') && $this->request->post('group_id') == FEATHER_ADMIN) ? true : false;
 
+        // Set group title
         $title = feather_trim($this->request->post('req_title'));
+        if ($title == '') {
+            message(__('Must enter title message'));
+        }
+        $title = $this->hook->fire('add_edit_group_set_title', $title);
+        // Set user title
         $user_title = feather_trim($this->request->post('user_title'));
+        $user_title = ($user_title != '') ? $user_title : 'NULL';
+        $user_title = $this->hook->fire('add_edit_group_set_user_title', $user_title);
 
         $promote_min_posts = $this->request->post('promote_min_posts') ? intval($this->request->post('promote_min_posts')) : '0';
         if ($this->request->post('promote_next_group') &&
@@ -139,12 +166,6 @@ public function add_edit_group($groups)
         $email_flood = ($this->request->post('email_flood') && $this->request->post('email_flood') >= 0) ? $this->request->post('email_flood') : '0';
         $report_flood = ($this->request->post('report_flood') >= 0) ? $this->request->post('report_flood') : '0';
 
-        if ($title == '') {
-            message(__('Must enter title message'));
-        }
-
-        $user_title = ($user_title != '') ? $user_title : 'NULL';
-
         $insert_update_group = array(
             'g_title'               =>  $title,
             'g_user_title'          =>  $user_title,
@@ -174,7 +195,10 @@ public function add_edit_group($groups)
             'g_report_flood'        =>  $report_flood,
         );
 
+        $insert_update_group = $this->hook->fire('add_edit_group_data', $insert_update_group);
+
         if ($this->request->post('mode') == 'add') {
+            // Creating a new group
             $title_exists = DB::for_table('groups')->where('g_title', $title)->find_one();
             if ($title_exists) {
                 message(sprintf(__('Title already exists message'), feather_escape($title)));
@@ -185,12 +209,14 @@ public function add_edit_group($groups)
                 ->set($insert_update_group)
                 ->save();
             $new_group_id = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'groups');
+            $new_group_id = $this->hook->fire('add_edit_group.new_group_id', $new_group_id);
 
             // Now lets copy the forum specific permissions from the group which this group is based on
             $select_forum_perms = array('forum_id', 'read_forum', 'post_replies', 'post_topics');
             $result = DB::for_table('forum_perms')->select_many($select_forum_perms)
-                            ->where('group_id', $this->request->post('base_group'))
-                            ->find_many();
+                            ->where('group_id', $this->request->post('base_group'));
+            $result = $this->hook->fireDB('add_edit_group.select_forum_perms_query', $result);
+            $result = $result->find_many();
 
             foreach ($result as $cur_forum_perm) {
                 $insert_perms = array(
@@ -207,6 +233,7 @@ public function add_edit_group($groups)
                         ->save();
             }
         } else {
+            // We are editing an existing group
             $title_exists = DB::for_table('groups')->where('g_title', $title)->where_not_equal('g_id', $this->request->post('group_id'))->find_one();
             if ($title_exists) {
                 message(sprintf(__('Title already exists message'), feather_escape($title)));
@@ -230,6 +257,7 @@ public function add_edit_group($groups)
         }
 
         $group_id = $this->request->post('mode') == 'add' ? $new_group_id : $this->request->post('group_id');
+        $group_id = $this->hook->fire('add_edit_group.group_id', $group_id);
 
         generate_quickjump_cache($group_id);
 
@@ -243,6 +271,7 @@ public function add_edit_group($groups)
     public function set_default_group($groups)
     {
         $group_id = intval($this->request->post('default_group'));
+        $group_id = $this->hook->fire('set_default_group.group_id', $group_id);
 
         // Make sure it's not the admin or guest groups
         if ($group_id == FEATHER_ADMIN || $group_id == FEATHER_GUEST) {
@@ -269,22 +298,28 @@ public function set_default_group($groups)
 
     public function check_members($group_id)
     {
+        $group_id = $this->hook->fire('check_members_start', $group_id);
+
         $is_member = DB::for_table('groups')->table_alias('g')
             ->select('g.g_title')
             ->select_expr('COUNT(u.id)', 'members')
             ->inner_join('users', array('g.g_id', '=', 'u.group_id'), 'u')
             ->where('g.g_id', $group_id)
             ->group_by('g.g_id')
-            ->group_by('g_title')
-            ->find_one();
+            ->group_by('g_title');
+        $is_member = $this->hook->fireDB('check_members', $is_member);
+        $is_member = $is_member->find_one();
 
         return (bool) $is_member;
     }
 
     public function delete_group($group_id)
     {
+        $group_id = $this->hook->fire('delete_group.group_id', $group_id);
+
         if ($this->request->post('del_group')) {
             $move_to_group = intval($this->request->post('move_to_group'));
+            $move_to_group = $this->hook->fire('delete_group.move_to_group', $move_to_group);
             DB::for_table('users')->where('group_id', $group_id)
                                                       ->update_many('group_id', $move_to_group);
         }
@@ -306,26 +341,33 @@ public function delete_group($group_id)
 
     public function get_group_title($group_id)
     {
-        $group_title = DB::for_table('groups')->where('g_id', $group_id)
-                            ->find_one_col('g_title');
+        $group_id = $this->hook->fireDB('get_group_title.group_id', $group_id);
+
+        $group_title = DB::for_table('groups')->where('g_id', $group_id);
+        $group_title = $this->hook->fireDB('get_group_title.query', $group_title);
+        $group_title = $group_title->find_one_col('g_title');
 
         return $group_title;
     }
 
     public function get_title_members($group_id)
     {
+        $group_id = $this->hook->fire('get_title_members.group_id', $group_id);
+
         $group = DB::for_table('groups')->table_alias('g')
                     ->select('g.g_title')
                     ->select_expr('COUNT(u.id)', 'members')
                     ->inner_join('users', array('g.g_id', '=', 'u.group_id'), 'u')
                     ->where('g.g_id', $group_id)
                     ->group_by('g.g_id')
-                    ->group_by('g_title')
-                    ->find_one();
+                    ->group_by('g_title');
+        $group = $this->hook->fireDB('get_title_members.query', $group);
+        $group = $group->find_one();
 
         $group_info['title'] = $group['g_title'];
         $group_info['members'] = $group['members'];
 
+        $group_info = $this->hook->fire('get_title_members.group_info', $group_info);
         return $group_info;
     }
 }
diff --git a/model/admin/maintenance.php b/model/admin/maintenance.php
index d05fb7ec..b61e0434 100644
--- a/model/admin/maintenance.php
+++ b/model/admin/maintenance.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
     }
- 
+
     public function rebuild()
     {
         $per_page = $this->request->get('i_per_page') ? intval($this->request->get('i_per_page')) : 0;
@@ -272,10 +272,10 @@ public function get_categories()
 
             $output .=  "\t\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$forum['fid'].'">'.feather_escape($forum['forum_name']).'</option>'."\n";
         }
-        
+
         return $output;
     }
-    
+
     public function get_first_id()
     {
         $first_id = '';
@@ -284,7 +284,7 @@ public function get_first_id()
         if ($first_id_sql) {
             $first_id = $first_id_sql;
         }
-        
+
         return $first_id;
     }
-}
\ No newline at end of file
+}
diff --git a/style/FeatherBB/view/admin/groups/delete_group.php b/style/FeatherBB/view/admin/groups/delete_group.php
index 693baab1..aea315d0 100644
--- a/style/FeatherBB/view/admin/groups/delete_group.php
+++ b/style/FeatherBB/view/admin/groups/delete_group.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -25,7 +25,7 @@
 							<p><?php printf(__('Move users info'), feather_escape($group_info['title']), forum_number_format($group_info['members'])) ?></p>
 							<label><?php _e('Move users label') ?>
 							<select name="move_to_group">
-								<?php get_group_list_delete($id); ?>
+								<?= $group_list_delete; ?>
 							</select>
 							<br /></label>
 						</div>
@@ -36,4 +36,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>

From f3ed0c573e241a10c120b7eaccfd12837dfcebac Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 24 Aug 2015 11:24:23 +0200
Subject: [PATCH 151/353] Fix deleting group view

---
 view/admin/groups/delete_group.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/view/admin/groups/delete_group.php b/view/admin/groups/delete_group.php
index 693baab1..aea315d0 100644
--- a/view/admin/groups/delete_group.php
+++ b/view/admin/groups/delete_group.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -25,7 +25,7 @@
 							<p><?php printf(__('Move users info'), feather_escape($group_info['title']), forum_number_format($group_info['members'])) ?></p>
 							<label><?php _e('Move users label') ?>
 							<select name="move_to_group">
-								<?php get_group_list_delete($id); ?>
+								<?= $group_list_delete; ?>
 							</select>
 							<br /></label>
 						</div>
@@ -36,4 +36,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>

From b253dbb66213a4ba001707f1f72521ce9cea8dd1 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Mon, 24 Aug 2015 15:04:50 +0200
Subject: [PATCH 152/353] Add more hooks

---
 model/search.php | 162 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 104 insertions(+), 58 deletions(-)

diff --git a/model/search.php b/model/search.php
index cc0f027a..da5f93a0 100644
--- a/model/search.php
+++ b/model/search.php
@@ -20,12 +20,15 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
 
     public function get_search_results()
     {
         $search = array();
 
+        $search = $this->hook->fire('get_search_results_start', $search);
+
         $action = ($this->request->get('action')) ? $this->request->get('action') : null;
         $forums = $this->request->get('forums') ? (is_array($this->request->get('forums')) ? $this->request->get('forums') : array_filter(explode(',', $this->request->get('forums')))) : ($this->request->get('forums') ? array($this->request->get('forums')) : array());
         $sort_dir = ($this->request->get('sort_dir') && $this->request->get('sort_dir') == 'DESC') ? 'DESC' : 'ASC';
@@ -95,15 +98,17 @@ public function get_search_results()
 
         // If a valid search_id was supplied we attempt to fetch the search results from the db
         if (isset($search_id)) {
-            $ident = ($this->user->is_guest) ? get_remote_address() : $this->user->username;
+            $ident = ($this->user->is_guest) ? $this->request->getIp() : $this->user->username;
 
             $search_data = DB::for_table('search_cache')
                                 ->where('id', $search_id)
-                                ->where('ident', $ident)
-                                ->find_one_col('search_data');
+                                ->where('ident', $ident);
+            $search_data = $this->hook->fireDB('get_search_results_search_data_query', $search_data);
+            $search_data = $search_data->find_one_col('search_data');
 
             if ($search_data) {
                 $temp = unserialize($search_data);
+                $temp = $this->hook->fire('get_search_results_temp', $temp);
 
                 $search_ids = unserialize($temp['search_ids']);
                 $num_hits = $temp['num_hits'];
@@ -129,12 +134,14 @@ public function get_search_results()
                 }
 
                 if (!$this->user->is_guest) {
-                    DB::for_table('users')->where('id', $this->user->id)
-                                                        ->update_many('last_search', time());
+                    $update_last_search = DB::for_table('users')
+                                            ->where('id', $this->user->id);
                 } else {
-                    DB::for_table('online')->where('ident', get_remote_address())
-                                                         ->update_many('last_search', time());
+                    $update_last_search = DB::for_table('online')
+                                            ->where('ident', $this->request->getIp());
                 }
+                $update_last_search = $this->hook->fireDB('get_search_results_update_last_search', $update_last_search);
+                $update_last_search = $update_last_search->update_many('last_search', time());
 
                 switch ($sort_by) {
                     case 1:
@@ -163,10 +170,13 @@ public function get_search_results()
                         break;
                 }
 
+                $sort_by = $this->hook->fire('get_search_results_sort_by', $sort_by);
+
                 // If it's a search for keywords
                 if ($keywords) {
                     // split the keywords into words
                     $keywords_array = split_words($keywords, false);
+                    $keywords_array = $this->hook->fire('get_search_results_keywords_array', $keywords_array);
 
                     if (empty($keywords_array)) {
                         message(__('No hits'));
@@ -174,6 +184,7 @@ public function get_search_results()
 
                     // Should we search in message body or topic subject specifically?
                     $search_in_cond = ($search_in) ? (($search_in > 0) ? ' AND m.subject_match = 0' : ' AND m.subject_match = 1') : '';
+                    $search_in_cond = $this->hook->fire('get_search_results_search_cond', $search_in_cond);
 
                     $word_count = 0;
                     $match_type = 'and';
@@ -193,11 +204,14 @@ public function get_search_results()
                                     $where_cond = str_replace('*', '%', $cur_word);
                                     $where_cond_cjk = ($search_in ? (($search_in > 0) ? 'p.message LIKE %:where_cond%' : 't.subject LIKE %:where_cond%') : 'p.message LIKE %:where_cond% OR t.subject LIKE %:where_cond%');
 
-                                    $result = DB::for_table('posts')->raw_query('SELECT p.id AS post_id, p.topic_id, '.$sort_by_sql.' AS sort_by FROM '.$this->feather->forum_settings['db_prefix'].'posts AS p INNER JOIN '.$this->feather->forum_settings['db_prefix'].'topics AS t ON t.id=p.topic_id LEFT JOIN '.$this->feather->forum_settings['db_prefix'].'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$this->user->g_id.') WHERE ('.$where_cond_cjk.') AND (fp.read_forum IS NULL OR fp.read_forum=1)'.$forum_sql, array(':where_cond' => $where_cond))->find_many();
+                                    $result = DB::for_table('posts')->raw_query('SELECT p.id AS post_id, p.topic_id, '.$sort_by_sql.' AS sort_by FROM '.$this->feather->forum_settings['db_prefix'].'posts AS p INNER JOIN '.$this->feather->forum_settings['db_prefix'].'topics AS t ON t.id=p.topic_id LEFT JOIN '.$this->feather->forum_settings['db_prefix'].'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$this->user->g_id.') WHERE ('.$where_cond_cjk.') AND (fp.read_forum IS NULL OR fp.read_forum=1)'.$forum_sql, array(':where_cond' => $where_cond));
                                 } else {
-                                    $result = DB::for_table('posts')->raw_query('SELECT m.post_id, p.topic_id, '.$sort_by_sql.' AS sort_by FROM '.$this->feather->forum_settings['db_prefix'].'search_words AS w INNER JOIN '.$this->feather->forum_settings['db_prefix'].'search_matches AS m ON m.word_id = w.id INNER JOIN '.$this->feather->forum_settings['db_prefix'].'posts AS p ON p.id=m.post_id INNER JOIN '.$this->feather->forum_settings['db_prefix'].'topics AS t ON t.id=p.topic_id LEFT JOIN '.$this->feather->forum_settings['db_prefix'].'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$this->user->g_id.') WHERE w.word LIKE :where_cond'.$search_in_cond.' AND (fp.read_forum IS NULL OR fp.read_forum=1)'.$forum_sql, array(':where_cond' => str_replace('*', '%', $cur_word)))->find_many();
+                                    $result = DB::for_table('posts')->raw_query('SELECT m.post_id, p.topic_id, '.$sort_by_sql.' AS sort_by FROM '.$this->feather->forum_settings['db_prefix'].'search_words AS w INNER JOIN '.$this->feather->forum_settings['db_prefix'].'search_matches AS m ON m.word_id = w.id INNER JOIN '.$this->feather->forum_settings['db_prefix'].'posts AS p ON p.id=m.post_id INNER JOIN '.$this->feather->forum_settings['db_prefix'].'topics AS t ON t.id=p.topic_id LEFT JOIN '.$this->feather->forum_settings['db_prefix'].'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$this->user->g_id.') WHERE w.word LIKE :where_cond'.$search_in_cond.' AND (fp.read_forum IS NULL OR fp.read_forum=1)'.$forum_sql, array(':where_cond' => str_replace('*', '%', $cur_word)));
                                 }
 
+                                $result = $this->hook->fireDB('get_search_results_search_first_query', $result);
+                                $result = $result->find_many();
+
                                 $row = array();
                                 foreach($result as $temp) {
                                     $row[$temp['post_id']] = $temp['topic_id'];
@@ -232,25 +246,26 @@ public function get_search_results()
                         }
                     }
 
+                    $keyword_results = $this->hook->fire('get_search_results_search_keyword_results', $keyword_results);
                     // Sort the results - annoyingly array_multisort re-indexes arrays with numeric keys, so we need to split the keys out into a separate array then combine them again after
                     $post_ids = array_keys($keyword_results);
                     $topic_ids = array_values($keyword_results);
 
                     array_multisort(array_values($sort_data), $sort_dir == 'DESC' ? SORT_DESC : SORT_ASC, $sort_type, $post_ids, $topic_ids);
 
-                    // combine the arrays back into a key=>value array (array_combine is PHP5 only unfortunately)
-                    $num_results = count($keyword_results);
-                    $keyword_results = array();
-                    for ($i = 0;$i < $num_results;$i++) {
-                        $keyword_results[$post_ids[$i]] = $topic_ids[$i];
-                    }
+                    // combine the arrays back into a key => value array
+                    $keyword_results = array_combine($post_ids, $topic_ids);
 
                     unset($sort_data, $post_ids, $topic_ids);
                 }
 
                 // If it's a search for author name (and that author name isn't Guest)
                 if ($author && $author != 'guest' && $author != utf8_strtolower(__('Guest'))) {
-                    $username_exists = DB::for_table('users')->select('id')->where_like('username', $author)->find_many();
+                    $username_exists = DB::for_table('users')
+                                        ->select('id')
+                                        ->where_like('username', $author);
+                    $username_exists = $this->hook->fireDB('get_search_results_username_exists', $username_exists);
+                    $username_exists = $username_exists->find_many();
 
                     if ($username_exists) {
                         $user_ids = array();
@@ -258,7 +273,9 @@ public function get_search_results()
                             $user_ids[] = $row['id'];
                         }
 
-                        $result = DB::for_table('posts')->raw_query('SELECT p.id AS post_id, p.topic_id FROM '.$this->feather->forum_settings['db_prefix'].'posts AS p INNER JOIN '.$this->feather->forum_settings['db_prefix'].'topics AS t ON t.id=p.topic_id LEFT JOIN '.$this->feather->forum_settings['db_prefix'].'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$this->user->g_id.') WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND p.poster_id IN('.implode(',', $user_ids).')'.$forum_sql.' ORDER BY '.$sort_by_sql.' '.$sort_dir)->find_many();
+                        $result = DB::for_table('posts')->raw_query('SELECT p.id AS post_id, p.topic_id FROM '.$this->feather->forum_settings['db_prefix'].'posts AS p INNER JOIN '.$this->feather->forum_settings['db_prefix'].'topics AS t ON t.id=p.topic_id LEFT JOIN '.$this->feather->forum_settings['db_prefix'].'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$this->user->g_id.') WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND p.poster_id IN('.implode(',', $user_ids).')'.$forum_sql.' ORDER BY '.$sort_by_sql.' '.$sort_dir);
+                        $result = $this->hook->fireDB('get_search_results_search_second_query', $result);
+                        $result = $result->find_many();
 
                         foreach($result as $temp) {
                             $author_results[$temp['post_id']] = $temp['topic_id'];
@@ -281,6 +298,9 @@ public function get_search_results()
                     $search_type = array('author', feather_trim($this->request->get('author')), implode(',', $forums), $search_in);
                 }
 
+                $search_ids = $this->hook->fire('get_search_results_search_ids', $search_ids);
+                $search_type = $this->hook->fire('get_search_results_search_type', $search_type);
+
                 unset($keyword_results, $author_results);
 
                 if ($show_as == 'topics') {
@@ -291,6 +311,9 @@ public function get_search_results()
 
                 $search_ids = array_unique($search_ids);
 
+                $search_ids = $this->hook->fire('get_search_results_search_ids', $search_ids);
+                $search_type = $this->hook->fire('get_search_results_search_type', $search_type);
+
                 $num_hits = count($search_ids);
                 if (!$num_hits) {
                     message(__('No hits'));
@@ -302,7 +325,7 @@ public function get_search_results()
                 $sort_by = 0;
                 $sort_dir = 'DESC';
 
-                $where_search_action = array(
+                $result['where'] = array(
                     array('fp.read_forum' => 'IS NULL'),
                     array('fp.read_forum' => '1')
                 );
@@ -318,7 +341,7 @@ public function get_search_results()
                                 ->select('t.id')
                                 ->left_outer_join('forum_perms', array('fp.forum_id', '=', 't.forum_id'), 'fp')
                                 ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-                                ->where_any_is($where_search_action)
+                                ->where_any_is($result['where'])
                                 ->where_gt('t.last_post', $this->user->last_visit)
                                 ->where_null('t.moved_to')
                                 ->order_by_desc('t.last_post');
@@ -328,6 +351,7 @@ public function get_search_results()
                         $result = $result->where('t.forum_id', intval($this->request->get('fid')));
                     }
 
+                    $result = $this->hook->fire('get_search_results_topic_query', $result);
                     $result = $result->find_many();
 
                     $num_hits = count($result);
@@ -343,7 +367,7 @@ public function get_search_results()
                                 ->select('t.id')
                                 ->left_outer_join('forum_perms', array('fp.forum_id', '=', 't.forum_id'), 'fp')
                                 ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-                                ->where_any_is($where_search_action)
+                                ->where_any_is($result['where'])
                                 ->where_gt('t.last_post', time() - $interval)
                                 ->where_null('t.moved_to')
                                 ->order_by_desc('t.last_post');
@@ -352,6 +376,7 @@ public function get_search_results()
                         $result = $result->where('t.forum_id', intval($this->request->get('fid')));
                     }
 
+                    $result = $this->hook->fire('get_search_results_topic_query', $result);
                     $result = $result->find_many();
 
                     $num_hits = count($result);
@@ -368,16 +393,15 @@ public function get_search_results()
                                 ->inner_join('posts', array('t.id', '=', 'p.topic_id'), 'p')
                                 ->left_outer_join('forum_perms', array('fp.forum_id', '=', 't.forum_id'), 'fp')
                                 ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-                                ->where_any_is($where_search_action)
+                                ->where_any_is($result['where'])
                                 ->where('p.poster_id', $this->user->id)
                                 ->group_by('t.id');
 
-                    $feather = \Slim\Slim::getInstance();
-
-                    if ($feather->forum_settings['db_type'] == 'pgsql') {
+                    if ($this->feather->forum_settings['db_type'] == 'pgsql') {
                         $result = $result->group_by('t.last_post');
                     }
 
+                    $result = $this->hook->fire('get_search_results_topic_query', $result);
                     $result = $result->find_many();
 
                     $num_hits = count($result);
@@ -396,10 +420,11 @@ public function get_search_results()
                                 ->inner_join('topics', array('p.topic_id', '=', 't.id'), 't')
                                 ->left_outer_join('forum_perms', array('fp.forum_id', '=', 't.forum_id'), 'fp')
                                 ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-                                ->where_any_is($where_search_action)
+                                ->where_any_is($result['where'])
                                 ->where('p.poster_id', $user_id)
                                 ->order_by_desc('p.posted');
 
+                    $result = $this->hook->fire('get_search_results_post_query', $result);
                     $result = $result->find_many();
 
                     $num_hits = count($result);
@@ -419,10 +444,11 @@ public function get_search_results()
                                 ->inner_join('posts', array('t.first_post_id', '=', 'p.id'), 'p')
                                 ->left_outer_join('forum_perms', array('fp.forum_id', '=', 't.forum_id'), 'fp')
                                 ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-                                ->where_any_is($where_search_action)
+                                ->where_any_is($result['where'])
                                 ->where('p.poster_id', $user_id)
                                 ->order_by_desc('t.last_post');
 
+                    $result = $this->hook->fire('get_search_results_topic_query', $result);
                     $result = $result->find_many();
 
                     $num_hits = count($result);
@@ -447,9 +473,10 @@ public function get_search_results()
                                 ->inner_join('topic_subscriptions', array('s.user_id', '=', $user_id), null, true)
                                 ->left_outer_join('forum_perms', array('fp.forum_id', '=', 't.forum_id'), 'fp')
                                 ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-                                ->where_any_is($where_search_action)
+                                ->where_any_is($result['where'])
                                 ->order_by_desc('t.last_post');
 
+                    $result = $this->hook->fire('get_search_results_topic_query', $result);
                     $result = $result->find_many();
 
                     $num_hits = count($result);
@@ -470,9 +497,10 @@ public function get_search_results()
                                 ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
                                 ->where('t.num_replies', 0)
                                 ->where_null('t.moved_to')
-                                ->where_any_is($where_search_action)
+                                ->where_any_is($result['where'])
                                 ->order_by_desc('t.last_post');
 
+                    $result = $this->hook->fire('get_search_results_topic_query', $result);
                     $result = $result->find_many();
 
                     $num_hits = count($result);
@@ -496,14 +524,20 @@ public function get_search_results()
 
             // Prune "old" search results
             $old_searches = array();
-            $result = DB::for_table('online')->select('ident')->find_many();
+            $result = DB::for_table('online')
+                        ->select('ident');
+            $result = $this->hook->fireDB('get_search_results_prune_search', $result);
+            $result = $result->find_many();
 
             if ($result) {
                 foreach($result as $row) {
                     $old_searches[] = $row['ident'];
                 }
 
-                DB::for_table('search_cache')->where_not_in('ident', $old_searches)->delete_many();
+                $delete_cache = DB::for_table('search_cache')
+                    ->where_not_in('ident', $old_searches);
+                $delete_cache = $this->hook->fireDB('get_search_results_delete_cache', $delete_cache);
+                $delete_cache = $delete_cache->delete_many();
             }
 
             // Fill an array with our results and search properties
@@ -517,19 +551,19 @@ public function get_search_results()
             ));
             $search_id = mt_rand(1, 2147483647);
 
-            $ident = ($this->user->is_guest) ? get_remote_address() : $this->user->username;
+            $ident = ($this->user->is_guest) ? $this->request->getIp() : $this->user->username;
 
-            $insert_cache = array(
+            $cache['insert'] = array(
                 'id'   =>  $search_id,
                 'ident'  =>  $ident,
                 'search_data'  =>  $temp,
             );
 
-            DB::for_table('search_cache')
-                ->create()
-                ->set($insert_cache)
-                ->save();
-
+            $cache = DB::for_table('search_cache')
+                        ->create()
+                        ->set($cache['insert']);
+            $cache = $this->hook->fireDB('get_search_results_update_cache', $cache);
+            $cache = $cache->save();
         }
 
         // If we're on the new posts search, display a "mark all as read" link
@@ -576,29 +610,28 @@ public function get_search_results()
 
             // Run the query and fetch the results
             if ($show_as == 'posts') {
-                $select_search_post = array('pid' => 'p.id', 'pposter' => 'p.poster', 'pposted' => 'p.posted', 'p.poster_id', 'p.message', 'p.hide_smilies', 'tid' => 't.id', 't.poster', 't.subject', 't.first_post_id', 't.last_post', 't.last_post_id', 't.last_poster', 't.num_replies', 't.forum_id', 'f.forum_name');
+                $result['select'] = array('pid' => 'p.id', 'pposter' => 'p.poster', 'pposted' => 'p.posted', 'p.poster_id', 'p.message', 'p.hide_smilies', 'tid' => 't.id', 't.poster', 't.subject', 't.first_post_id', 't.last_post', 't.last_post_id', 't.last_poster', 't.num_replies', 't.forum_id', 'f.forum_name');
 
                 $result = DB::for_table('posts')
                                 ->table_alias('p')
-                                ->select_many($select_search_post)
+                                ->select_many($result['select'])
                                 ->inner_join('topics', array('t.id', '=', 'p.topic_id'), 't')
                                 ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
                                 ->where_in('p.id', $search_ids)
-                                ->order_by($sort_by_sql, $sort_dir)
-                                ->find_many();
-
+                                ->order_by($sort_by_sql, $sort_dir);
+                $result = $this->hook->fireDB('get_search_results_select_posts_query', $result);
             } else {
-
-                $select_search_topic = array('tid' => 't.id', 't.poster', 't.subject', 't.last_post', 't.last_post_id', 't.last_poster', 't.num_replies', 't.closed', 't.sticky', 't.forum_id', 'f.forum_name');
+                $result['select'] = array('tid' => 't.id', 't.poster', 't.subject', 't.last_post', 't.last_post_id', 't.last_poster', 't.num_replies', 't.closed', 't.sticky', 't.forum_id', 'f.forum_name');
 
                 $result = DB::for_table('topics')
-                    ->table_alias('t')
-                    ->select_many($select_search_topic)
-                    ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
-                    ->where_in('t.id', $search_ids)
-                    ->order_by($sort_by_sql, $sort_dir)
-                    ->find_many();
+                                ->table_alias('t')
+                                ->select_many($result['select'])
+                                ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
+                                ->where_in('t.id', $search_ids)
+                                ->order_by($sort_by_sql, $sort_dir);
+                $result = $this->hook->fireDB('get_search_results_select_topics_query', $result);
             }
+            $result = $result->find_many();
 
             $search['search_set'] = array();
             foreach($result as $row) {
@@ -615,7 +648,10 @@ public function get_search_results()
                 } elseif ($search_type[1] == 'show_subscriptions') {
                     // Fetch username of subscriber
                     $subscriber_id = $search_type[2];
-                    $subscriber_name = DB::for_table('users')->where('id', $subscriber_id)->find_one_col('username');
+                    $subscriber_name = DB::for_table('users')
+                                            ->where('id', $subscriber_id);
+                    $subscriber_name = $this->hook->fireDB('get_search_results_subscriber_name', $result);
+                    $subscriber_name = $subscriber_name->find_one_col('username');
 
                     if (!$subscriber_name) {
                         message(__('Bad request'), '404');
@@ -646,6 +682,8 @@ public function get_search_results()
 
         $search['show_as'] = $show_as;
 
+        $search = $this->hook->fire('get_search_results', $search);
+
         return $search;
     }
 
@@ -653,6 +691,8 @@ public function display_search_results($search)
     {
         global $pd;
 
+        $search = $this->hook->fire('display_search_results_start', $search);
+
         // Get topic/forum tracking data
         if (!$this->user->is_guest) {
             $tracked_topics = get_tracked_topics();
@@ -761,29 +801,33 @@ public function display_search_results($search)
                 );
             }
         }
+        $search = $this->hook->fire('display_search_results', $search);
     }
 
     public function get_list_forums()
     {
         $output = '';
 
-        $select_get_list_forums = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.redirect_url');
-        $where_get_list_forums = array(
+        $output = $this->hook->fire('get_list_forums_start', $output);
+
+        $result['select'] = array('cid' => 'c.id', 'c.cat_name', 'fid' => 'f.id', 'f.forum_name', 'f.redirect_url');
+        $result['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
-        $order_by_get_list_forums = array('c.disp_position', 'c.id', 'f.disp_position');
+        $result['order_by'] = array('c.disp_position', 'c.id', 'f.disp_position');
 
         $result = DB::for_table('categories')
                     ->table_alias('c')
-                    ->select_many($select_get_list_forums)
+                    ->select_many($result['select'])
                     ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
                     ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
                     ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-                    ->where_any_is($where_get_list_forums)
+                    ->where_any_is($result['where'])
                     ->where_null('f.redirect_url')
-                    ->order_by_many($order_by_get_list_forums)
-                    ->find_many();
+                    ->order_by_many($result['order_by']);
+        $result = $this->hook->fireDB('get_list_forums_query', $result);
+        $result = $result->find_many();
 
         // We either show a list of forums of which multiple can be selected
         if ($this->config['o_search_all_forums'] == '1' || $this->user->is_admmod) {
@@ -844,6 +888,8 @@ public function get_list_forums()
             $output .= "\t\t\t\t\t\t".'<br /></label>'."\n";
         }
 
+        $output = $this->hook->fire('get_list_forums', $output);
+
         return $output;
     }
 }

From 1677f66068fdf0527b1a55a720f3226c8a5bb9b2 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Mon, 24 Aug 2015 15:05:14 +0200
Subject: [PATCH 153/353] Add support for strings

---
 include/classes/hooks.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/classes/hooks.class.php b/include/classes/hooks.class.php
index 3976277b..cf30078b 100644
--- a/include/classes/hooks.class.php
+++ b/include/classes/hooks.class.php
@@ -64,7 +64,9 @@ public function fire($name)
                 }
             }
 
-            if ($count == 1) {
+            // If we only have one hook binded or the argument is not an array,
+            // let's return the first output
+            if ($count == 1 || !is_array($args[0])) {
                 return $output[0];
             }
             else {

From 0c1d0e658a66e6d24a544da5785c71fd2890b529 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Mon, 24 Aug 2015 15:05:32 +0200
Subject: [PATCH 154/353] Get rid of get_remote_address

---
 extern.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extern.php b/extern.php
index 065258fa..705bedd3 100644
--- a/extern.php
+++ b/extern.php
@@ -122,7 +122,7 @@ function set_default_user()
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
 
-    $remote_addr = get_remote_address();
+    $remote_addr = $feather->request->getIp();
 
     // Fetch guest user
     $select_set_default_user = array('u.*', 'g.*', 'o.logged', 'o.last_post', 'o.last_search');

From f88f9cf702e52dd866b7dcb401def6e0557474da Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Mon, 24 Aug 2015 15:47:32 +0200
Subject: [PATCH 155/353] Add more hooks

---
 include/classes/hooks.class.php |  2 +-
 model/userlist.php              | 42 ++++++++++----
 model/viewforum.php             | 95 +++++++++++++++++++------------
 model/viewtopic.php             | 99 +++++++++++++++++++++++----------
 4 files changed, 160 insertions(+), 78 deletions(-)

diff --git a/include/classes/hooks.class.php b/include/classes/hooks.class.php
index cf30078b..e524099f 100644
--- a/include/classes/hooks.class.php
+++ b/include/classes/hooks.class.php
@@ -38,7 +38,7 @@ public function fire($name)
         array_shift($args);
 
         if (!isset($this->hooks[$name])) {
-            $this->hooks[$name] = array(array());
+            //$this->hooks[$name] = array(array());
             if (isset ($args[0])) {
                 return $args[0];
             }
diff --git a/model/userlist.php b/model/userlist.php
index ce586eb5..e0ed9d95 100644
--- a/model/userlist.php
+++ b/model/userlist.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
  
     // Counts the numeber of user for a specific query
@@ -40,20 +41,26 @@ public function fetch_user_count($username, $show_group)
 
         $num_users = $num_users->count('id');
 
+        $num_users = $this->hook->fire('fetch_user_count', $num_users);
+
         return $num_users;
     }
 
     // Generates the dropdown menu containing groups
     public function generate_dropdown_menu($show_group)
     {
+        $show_group = $this->hook->fire('generate_dropdown_menu_start', $show_group);
+
         $dropdown_menu = '';
 
-        $select_dropdown_menu = array('g_id', 'g_title');
+        $result['select'] = array('g_id', 'g_title');
 
-        $result = DB::for_table('groups')->select_many($select_dropdown_menu)
+        $result = DB::for_table('groups')
+                        ->select_many($result['select'])
                         ->where_not_equal('g_id', FEATHER_GUEST)
-                        ->order_by('g_id')
-                        ->find_many();
+                        ->order_by('g_id');
+        $result = $this->hook->fireDB('generate_dropdown_menu_query', $result);
+        $result = $result->find_many();
 
         foreach($result as $cur_group) {
             if ($cur_group['g_id'] == $show_group) {
@@ -62,6 +69,8 @@ public function generate_dropdown_menu($show_group)
                 $dropdown_menu .= "\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
             }
         }
+
+        $dropdown_menu = $this->hook->fire('generate_dropdown_menu', $dropdown_menu);
         
         return $dropdown_menu;
     }
@@ -71,8 +80,11 @@ public function print_users($username, $start_from, $sort_by, $sort_dir, $show_g
     {
         $userlist_data = array();
 
+        $username = $this->hook->fire('print_users_start', $username, $start_from, $sort_by, $sort_dir, $show_group);
+
         // Retrieve a list of user IDs, LIMIT is (really) expensive so we only fetch the IDs here then later fetch the remaining data
-        $result = DB::for_table('users')->select('u.id')
+        $result = DB::for_table('users')
+                    ->select('u.id')
                     ->table_alias('u')
                     ->where_gt('u.id', 1)
                     ->where_not_equal('u.group_id', FEATHER_UNVERIFIED);
@@ -87,8 +99,10 @@ public function print_users($username, $start_from, $sort_by, $sort_dir, $show_g
         $result = $result->order_by($sort_by, $sort_dir)
                          ->order_by_asc('u.id')
                          ->limit(50)
-                         ->offset($start_from)
-                         ->find_many();
+                         ->offset($start_from);
+
+        $result = $this->hook->fireDB('print_users_query', $result);
+        $result = $result->find_many();
 
         if ($result) {
             $user_ids = array();
@@ -97,21 +111,25 @@ public function print_users($username, $start_from, $sort_by, $sort_dir, $show_g
             }
 
             // Grab the users
-            $select_users = array('u.id', 'u.username', 'u.title', 'u.num_posts', 'u.registered', 'g.g_id', 'g.g_user_title');
+            $result['select'] = array('u.id', 'u.username', 'u.title', 'u.num_posts', 'u.registered', 'g.g_id', 'g.g_user_title');
 
-            $result = DB::for_table('users')->table_alias('u')
-                          ->select_many($select_users)
+            $result = DB::for_table('users')
+                          ->table_alias('u')
+                          ->select_many($result['select'])
                           ->left_outer_join('groups' ,array('g.g_id', '=', 'u.group_id'), 'g')
                           ->where_in('u.id', $user_ids)
                           ->order_by($sort_by, $sort_dir)
-                          ->order_by_asc('u.id')
-                          ->find_many();
+                          ->order_by_asc('u.id');
+            $result = $this->hook->fireDB('print_users_grab_query', $result);
+            $result = $result->find_many();
 
             foreach($result as $user_data) {
                 $userlist_data[] = $user_data;
             }
         }
 
+        $userlist_data = $this->hook->fire('print_users', $userlist_data);
+
         return $userlist_data;
     }
 }
\ No newline at end of file
diff --git a/model/viewforum.php b/model/viewforum.php
index 7eee1586..6579c292 100644
--- a/model/viewforum.php
+++ b/model/viewforum.php
@@ -20,53 +20,59 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
  
     // Returns basic informations about the forum
     public function get_info_forum($id)
     {
+        $id = $this->hook->fire('get_info_forum_start', $id);
 
-
-        $where_get_info_forum = array(
+        $cur_forum['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
 
         if (!$this->user->is_guest) {
-            $select_get_info_forum = array('f.forum_name', 'f.redirect_url', 'f.moderators', 'f.num_topics', 'f.sort_by', 'fp.post_topics', 'is_subscribed' => 's.user_id');
+            $cur_forum['select'] = array('f.forum_name', 'f.redirect_url', 'f.moderators', 'f.num_topics', 'f.sort_by', 'fp.post_topics', 'is_subscribed' => 's.user_id');
 
             $cur_forum = DB::for_table('forums')->table_alias('f')
-                            ->select_many($select_get_info_forum)
+                            ->select_many($cur_forum['select'])
                             ->left_outer_join('forum_subscriptions', array('f.id', '=', 's.forum_id'), 's')
                             ->left_outer_join('forum_subscriptions', array('s.user_id', '=', $this->user->id), null, true)
                             ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
                             ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-                            ->where_any_is($where_get_info_forum)
-                            ->where('f.id', $id)
-                            ->find_one();
+                            ->where_any_is($cur_forum['where'])
+                            ->where('f.id', $id);
         } else {
-            $select_get_info_forum = array('f.forum_name', 'f.redirect_url', 'f.moderators', 'f.num_topics', 'f.sort_by', 'fp.post_topics');
+            $cur_forum['select'] = array('f.forum_name', 'f.redirect_url', 'f.moderators', 'f.num_topics', 'f.sort_by', 'fp.post_topics');
 
             $cur_forum = DB::for_table('forums')->table_alias('f')
-                ->select_many($select_get_info_forum)
-                ->select_expr(0, 'is_subscribed')
-                ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
-                ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-                ->where_any_is($where_get_info_forum)
-                ->where('f.id', $id)
-                ->find_one();
+                            ->select_many($cur_forum['select'])
+                            ->select_expr(0, 'is_subscribed')
+                            ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
+                            ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
+                            ->where_any_is($cur_forum['where'])
+                            ->where('f.id', $id);
         }
 
+        $cur_forum = $this->hook->fireDB('get_info_forum_query', $cur_forum);
+        $cur_forum = $cur_forum->find_one();
+
         if (!$cur_forum) {
             message(__('Bad request'), '404');
         }
 
+        $cur_forum = $this->hook->fire('get_info_forum', $cur_forum);
+
         return $cur_forum;
     }
 
     // Returns the text required by the query to sort the forum
     public function sort_forum_by($sort_by_sql)
     {
+        $sort_by_sql = $this->hook->fire('sort_forum_by_start', $sort_by_sql);
+
         switch ($sort_by_sql) {
             case 0:
                 $sort_by = 'last_post DESC';
@@ -81,15 +87,19 @@ public function sort_forum_by($sort_by_sql)
                 $sort_by = 'last_post DESC';
                 break;
         }
+
+        $sort_by = $this->hook->fire('sort_forum_by', $sort_by);
+
         return $sort_by;
     }
 
     // Adds relationship meta tags
     public function get_page_head($forum_id, $num_pages, $p, $url_forum)
     {
+        $page_head = array();
 
+        $page_head = $this->hook->fire('get_page_head_start', $page_head, $forum_id, $num_pages, $p, $url_forum);
 
-        $page_head = array();
         $page_head['canonical'] = "\t".'<link href="'.get_link('forum/'.$forum_id.'/'.$url_forum.'/').'" rel="canonical" />';
 
         if ($num_pages > 1) {
@@ -107,6 +117,8 @@ public function get_page_head($forum_id, $num_pages, $p, $url_forum)
             $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom" title="'.__('Atom forum feed').'" />';
         }
 
+        $page_head = $this->hook->fire('get_page_head', $page_head);
+
         return $page_head;
     }
 
@@ -115,6 +127,8 @@ public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
     {
         $forum_actions = array();
 
+        $forum_actions = $this->hook->fire('get_page_head_start', $forum_actions, $forum_id, $subscriptions, $is_subscribed);
+
         if (!$this->user->is_guest) {
             if ($subscriptions == 1) {
                 if ($is_subscribed) {
@@ -127,26 +141,32 @@ public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
             $forum_actions[] = '<a href="'.get_link('mark-forum-read/'.$forum_id.'/').'">'.__('Mark forum read').'</a>';
         }
 
+        $forum_actions = $this->hook->fire('get_page_head', $forum_actions);
+
         return $forum_actions;
     }
 
     // Returns the elements needed to display topics
     public function print_topics($forum_id, $sort_by, $start_from)
     {
+        $forum_id = $this->hook->fire('print_topics_start', $forum_id, $sort_by, $start_from);
+
         // Get topic/forum tracking data
         if (!$this->user->is_guest) {
             $tracked_topics = get_tracked_topics();
         }
 
         // Retrieve a list of topic IDs, LIMIT is (really) expensive so we only fetch the IDs here then later fetch the remaining data
-        $result = DB::for_table('topics')->select('id')
+        $result = DB::for_table('topics')
+                        ->select('id')
                         ->where('forum_id', $forum_id)
                         ->order_by_desc('sticky')
                         ->order_by_expr($sort_by)
                         ->order_by_desc('id')
                         ->limit($this->user->disp_topics)
-                        ->offset($start_from)
-                        ->find_many();
+                        ->offset($start_from);
+        $result = $this->hook->fire('print_topics_ids_query', $result);
+        $result = $result->find_many();
 
         $forum_data = array();
 
@@ -160,30 +180,33 @@ public function print_topics($forum_id, $sort_by, $start_from)
             // Fetch list of topics to display on this page
             if ($this->user->is_guest || $this->config['o_show_dot'] == '0') {
                 // Without "the dot"
-                $select_print_topics = array('id', 'poster', 'subject', 'posted', 'last_post', 'last_post_id', 'last_poster', 'num_views', 'num_replies', 'closed', 'sticky', 'moved_to');
+                $result['select'] = array('id', 'poster', 'subject', 'posted', 'last_post', 'last_post_id', 'last_poster', 'num_views', 'num_replies', 'closed', 'sticky', 'moved_to');
 
-                $result = DB::for_table('topics')->select_many($select_print_topics)
+                $result = DB::for_table('topics')
+                            ->select_many($result['select'])
                             ->where_in('id', $topic_ids)
                             ->order_by_desc('sticky')
                             ->order_by_expr($sort_by)
-                            ->order_by_desc('id')
-                            ->find_many();
+                            ->order_by_desc('id');
             } else {
                 // With "the dot"
-                $select_print_topics = array('has_posted' => 'p.poster_id', 't.id', 't.subject', 't.poster', 't.posted', 't.last_post', 't.last_post_id', 't.last_poster', 't.num_views', 't.num_replies', 't.closed', 't.sticky', 't.moved_to');
-
-                $result = DB::for_table('topics')->table_alias('t')
-                    ->select_many($select_print_topics)
-                    ->left_outer_join('posts', array('t.id', '=', 'p.topic_id'), 'p')
-                    ->left_outer_join('posts', array('p.poster_id', '=', $this->user->id), null, true)
-                    ->where_in('t.id', $topic_ids)
-                    ->group_by('t.id')
-                    ->order_by_desc('sticky')
-                    ->order_by_expr($sort_by)
-                    ->order_by_desc('id')
-                    ->find_many();
+                $result['select'] = array('has_posted' => 'p.poster_id', 't.id', 't.subject', 't.poster', 't.posted', 't.last_post', 't.last_post_id', 't.last_poster', 't.num_views', 't.num_replies', 't.closed', 't.sticky', 't.moved_to');
+
+                $result = DB::for_table('topics')
+                            ->table_alias('t')
+                            ->select_many($result['select'])
+                            ->left_outer_join('posts', array('t.id', '=', 'p.topic_id'), 'p')
+                            ->left_outer_join('posts', array('p.poster_id', '=', $this->user->id), null, true)
+                            ->where_in('t.id', $topic_ids)
+                            ->group_by('t.id')
+                            ->order_by_desc('sticky')
+                            ->order_by_expr($sort_by)
+                            ->order_by_desc('id');
             }
 
+            $result = $this->hook->fireDB('print_topics_query', $result);
+            $result = $result->find_many();
+
             $topic_count = 0;
             foreach ($result as $cur_topic) {
                 ++$topic_count;
@@ -257,6 +280,8 @@ public function print_topics($forum_id, $sort_by, $start_from)
             }
         }
 
+        $forum_data = $this->hook->fire('print_topics', $forum_data);
+
         return $forum_data;
     }
 }
diff --git a/model/viewtopic.php b/model/viewtopic.php
index b4776ff1..444b23ef 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -20,17 +20,21 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
 
-    // Redirects to a post in particular
+    // Redirect to a post in particular
     public function redirect_to_post($post_id)
     {
-        $select_info_topic = array('topic_id', 'posted');
+        $post_id = $this->hook->fire('redirect_to_post', $post_id);
+
+        $result['select'] = array('topic_id', 'posted');
 
         $result = DB::for_table('posts')
-                      ->select_many($select_info_topic)
-                      ->where('id', $post_id)
-                      ->find_one();
+                      ->select_many($result['select'])
+                      ->where('id', $post_id);
+        $result = $this->hook->fireDB('redirect_to_post_query', $result);
+        $result = $result->find_one();
 
         if (!$result) {
             message(__('Bad request'), '404');
@@ -45,14 +49,20 @@ public function redirect_to_post($post_id)
                         ->where_lt('posted', $posted)
                         ->count('id');
 
+        $num_posts = $this->hook->fire('redirect_to_post_num', $num_posts);
+
         $post['get_p'] = ceil(($num_posts + 1) / $this->user->disp_posts);
 
+        $post = $this->hook->fire('redirect_to_post', $post);
+
         return $post;
     }
 
-    // Redirects to new posts or last post
+    // Redirect to new posts or last post
     public function handle_actions($topic_id, $action)
     {
+        $action = $this->hook->fire('handle_actions_start', $action, $topic_id);
+
         // If action=new, we redirect to the first new post (if any)
         if ($action == 'new') {
             if (!$this->user->is_guest) {
@@ -65,6 +75,8 @@ public function handle_actions($topic_id, $action)
                                         ->where_gt('posted', $last_viewed)
                                         ->min('id');
 
+                $first_new_post_id = $this->hook->fire('handle_actions_first_new', $first_new_post_id);
+
                 if ($first_new_post_id) {
                     header('Location: '.get_base_url().'/post/'.$first_new_post_id.'/#p'.$first_new_post_id);
                     exit;
@@ -81,17 +93,21 @@ public function handle_actions($topic_id, $action)
                                 ->where('topic_id', $topic_id)
                                 ->max('id');
 
+            $last_post_id = $this->hook->fire('handle_actions_last_post', $last_post_id);
+
             if ($last_post_id) {
                 header('Location: '.get_base_url().'/post/'.$last_post_id.'/#p'.$last_post_id);
                 exit;
             }
         }
+
+        $this->hook->fire('handle_actions', $action, $topic_id);
     }
 
     // Gets some info about the topic
     public function get_info_topic($id)
     {
-        $where_get_info_topic = array(
+        $cur_topic['where'] = array(
             array('fp.read_forum' => 'IS NULL'),
             array('fp.read_forum' => '1')
         );
@@ -107,10 +123,9 @@ public function get_info_topic($id)
                             ->left_outer_join('topic_subscriptions', array('s.user_id', '=', $this->user->id), null, true)
                             ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
                             ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-                            ->where_any_is($where_get_info_topic)
+                            ->where_any_is($cur_topic['where'])
                             ->where('t.id', $id)
-                            ->where_null('t.moved_to')
-                            ->find_one();
+                            ->where_null('t.moved_to');
         } else {
             $select_get_info_topic = array('t.subject', 't.closed', 't.num_replies', 't.sticky', 't.first_post_id', 'forum_id' => 'f.id', 'f.forum_name', 'f.moderators', 'fp.post_replies');
 
@@ -121,22 +136,28 @@ public function get_info_topic($id)
                             ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
                             ->left_outer_join('forum_perms', array('fp.forum_id', '=', 'f.id'), 'fp')
                             ->left_outer_join('forum_perms', array('fp.group_id', '=', $this->user->g_id), null, true)
-                            ->where_any_is($where_get_info_topic)
+                            ->where_any_is($cur_topic['where'])
                             ->where('t.id', $id)
-                            ->where_null('t.moved_to')
-                            ->find_one();
+                            ->where_null('t.moved_to');
         }
 
+        $cur_topic = $this->hook->fireDB('get_info_topic_query', $cur_topic);
+        $cur_topic = $cur_topic->find_one();
+
         if (!$cur_topic) {
             message(__('Bad request'), '404');
         }
 
+        $cur_topic = $this->hook->fire('get_info_topic', $cur_topic);
+
         return $cur_topic;
     }
 
     // Generates the post link
     public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
     {
+        $closed = $this->hook->fire('get_post_link_start', $closed, $topic_id, $post_replies, $is_admmod);
+
         if ($closed == '0') {
             if (($post_replies == '' && $this->user->g_post_replies == '1') || $post_replies == '1' || $is_admmod) {
                 $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a></p>'."\n";
@@ -153,6 +174,8 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
             $post_link = "\t\t\t".'<p class="postlink conr">'.$post_link.'</p>'."\n";
         }
 
+        $post_link = $this->hook->fire('get_post_link_start', $post_link, $topic_id, $closed, $post_replies, $is_admmod);
+
         return $post_link;
     }
 
@@ -172,6 +195,8 @@ public function is_quickpost($post_replies, $closed, $is_admmod)
             $quickpost = true;
         }
 
+        $quickpost = $this->hook->fire('is_quickpost', $quickpost, $post_replies, $closed, $is_admmod);
+
         return $quickpost;
     }
 
@@ -189,15 +214,18 @@ public function get_subscraction($is_subscribed, $topic_id)
             $subscraction = '';
         }
 
+        $subscraction = $this->hook->fire('get_subscraction', $subscraction, $is_subscribed, $topic_id);
+
         return $subscraction;
     }
 
     // Adds relationship meta tags
     public function get_page_head($topic_id, $num_pages, $p, $url_topic)
     {
+        $page_head = array();
 
+        $page_head = $this->hook->fire('get_page_head_start', $page_head, $topic_id, $num_pages, $p, $url_topic);
 
-        $page_head = array();
         $page_head['canonical'] = "\t".'<link href="'.get_link('topic/'.$topic_id.'/'.$url_topic.'/').'" rel="canonical" />';
 
         if ($num_pages > 1) {
@@ -215,6 +243,8 @@ public function get_page_head($topic_id, $num_pages, $p, $url_topic)
             $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=atom" title="'.__('Atom topic feed').'" />';
         }
 
+        $page_head = $this->hook->fire('get_page_head', $page_head, $topic_id, $num_pages, $p, $url_topic);
+
         return $page_head;
     }
 
@@ -225,15 +255,19 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
 
         $post_data = array();
 
+        $post_data = $this->hook->fire('print_posts_start', $post_data, $topic_id, $start_from, $cur_topic, $is_admmod);
+
         $post_count = 0; // Keep track of post numbers
 
         // Retrieve a list of post IDs, LIMIT is (really) expensive so we only fetch the IDs here then later fetch the remaining data
-        $result = DB::for_table('posts')->select('id')
+        $result = DB::for_table('posts')
+                    ->select('id')
                     ->where('topic_id', $topic_id)
                     ->order_by('id')
                     ->limit($this->user->disp_topics)
-                    ->offset($start_from)
-                    ->find_many();
+                    ->offset($start_from);
+        $result = $this->hook->fireDB('print_posts_ids_query', $result);
+        $result = $result->find_many();
 
         $post_ids = array();
         foreach ($result as $cur_post_id) {
@@ -245,17 +279,18 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
         }
 
         // Retrieve the posts (and their respective poster/online status)
-        $select_print_posts = array('u.email', 'u.title', 'u.url', 'u.location', 'u.signature', 'u.email_setting', 'u.num_posts', 'u.registered', 'u.admin_note', 'p.id','username' => 'p.poster', 'p.poster_id', 'p.poster_ip', 'p.poster_email', 'p.message', 'p.hide_smilies', 'p.posted', 'p.edited', 'p.edited_by', 'g.g_id', 'g.g_user_title', 'g.g_promote_next_group', 'is_online' => 'o.user_id');
+        $result['select'] = array('u.email', 'u.title', 'u.url', 'u.location', 'u.signature', 'u.email_setting', 'u.num_posts', 'u.registered', 'u.admin_note', 'p.id','username' => 'p.poster', 'p.poster_id', 'p.poster_ip', 'p.poster_email', 'p.message', 'p.hide_smilies', 'p.posted', 'p.edited', 'p.edited_by', 'g.g_id', 'g.g_user_title', 'g.g_promote_next_group', 'is_online' => 'o.user_id');
 
         $result = DB::for_table('posts')
-            ->table_alias('p')
-            ->select_many($select_print_posts)
-            ->inner_join('users', array('u.id', '=', 'p.poster_id'), 'u')
-            ->inner_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
-            ->raw_join('LEFT OUTER JOIN '.$this->feather->forum_settings['db_prefix'].'online', "o.user_id!=1 AND o.idle=0 AND o.user_id=u.id", 'o')
-            ->where_in('p.id', $post_ids)
-            ->order_by('p.id')
-            ->find_array();
+                    ->table_alias('p')
+                    ->select_many($result['select'])
+                    ->inner_join('users', array('u.id', '=', 'p.poster_id'), 'u')
+                    ->inner_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
+                    ->raw_join('LEFT OUTER JOIN '.$this->feather->forum_settings['db_prefix'].'online', "o.user_id!=1 AND o.idle=0 AND o.user_id=u.id", 'o')
+                    ->where_in('p.id', $post_ids)
+                    ->order_by('p.id');
+        $result = $this->hook->fireDB('print_posts_query', $result);
+        $result = $result->find_array();
 
         foreach($result as $cur_post) {
             $post_count++;
@@ -396,16 +431,20 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
             $post_data[] = $cur_post;
         }
 
+        $post_data = $this->hook->fire('print_posts', $post_data);
+
         return $post_data;
     }
     
     public function increment_views($id)
     {
         if ($this->config['o_topic_views'] == '1') {
-            DB::for_table('topics')->where('id', $id)
-                ->find_one()
-                ->set_expr('num_views', 'num_views+1')
-                ->save();
+            $query = DB::for_table('topics')
+                        ->where('id', $id)
+                        ->find_one()
+                        ->set_expr('num_views', 'num_views+1');
+            $query = $this->hook->fire('increment_views', $query);
+            $query = $query->save();
         }
     }
 }

From c0396b6b82994b81aa21579d7eedd81a88da498a Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 24 Aug 2015 16:28:20 +0200
Subject: [PATCH 156/353] Complete hooks in model/admin folder

---
 model/admin/maintenance.php |  39 ++++++++++---
 model/admin/options.php     |  18 ++++--
 model/admin/parser.php      |   7 ++-
 model/admin/permissions.php |   6 +-
 model/admin/reports.php     |  30 ++++++----
 model/admin/statistics.php  |  12 +++-
 model/admin/users.php       | 113 +++++++++++++++++++++++++-----------
 7 files changed, 159 insertions(+), 66 deletions(-)

diff --git a/model/admin/maintenance.php b/model/admin/maintenance.php
index b61e0434..92f92461 100644
--- a/model/admin/maintenance.php
+++ b/model/admin/maintenance.php
@@ -20,11 +20,13 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
 
     public function rebuild()
     {
         $per_page = $this->request->get('i_per_page') ? intval($this->request->get('i_per_page')) : 0;
+        $per_page = $this->hook->fire('maintenance.rebuild.per_page', $per_page);
 
         // Check per page is > 0
         if ($per_page < 1) {
@@ -58,7 +60,9 @@ public function get_query_str()
         $query_str = '';
 
         $per_page = $this->request->get('i_per_page') ? intval($this->request->get('i_per_page')) : 0;
+        $per_page = $this->hook->fire('maintenance.get_query_str.per_page', $per_page);
         $start_at = $this->request->get('i_start_at') ? intval($this->request->get('i_start_at')) : 0;
+        $start_at = $this->hook->fire('maintenance.get_query_str.start_at', $start_at);
 
         require FEATHER_ROOT.'include/search_idx.php';
 
@@ -70,8 +74,9 @@ public function get_query_str()
                         ->inner_join('topics', array('t.id', '=', 'p.topic_id'), 't')
                         ->where_gte('p.id', $start_at)
                         ->order_by_asc('p.id')
-                        ->limit($per_page)
-                        ->find_many();
+                        ->limit($per_page);
+        $result = $this->hook->fireDB('maintenance.get_query_str.query', $result);
+        $result = $result->find_many();
 
         $end_at = 0;
         foreach ($result as $cur_item) {
@@ -100,6 +105,7 @@ public function get_query_str()
         $pdo = DB::get_db();
         $pdo = null;
 
+        $query_str = $this->hook->fire('maintenance.get_query_str', $query_str);
         return $query_str;
     }
 
@@ -126,6 +132,7 @@ public function prune($forum_id, $prune_sticky, $prune_date)
         foreach ($topics_id as $row) {
             $topic_ids[] = $row['id'];
         }
+        $topic_ids = $this->hook->fire('maintenance.prune.topic_ids', $topic_ids);
 
         if (!empty($topic_ids)) {
             // Fetch posts to prune
@@ -137,6 +144,7 @@ public function prune($forum_id, $prune_sticky, $prune_date)
             foreach ($posts_id as $row) {
                 $post_ids[] = $row['id'];
             }
+            $post_ids = $this->hook->fire('maintenance.prune.post_ids', $post_ids);
 
             if ($post_ids != '') {
                 // Delete topics
@@ -162,12 +170,15 @@ public function prune($forum_id, $prune_sticky, $prune_date)
     public function prune_comply($prune_from, $prune_sticky)
     {
         $prune_days = intval($this->request->post('prune_days'));
+        $prune_days = $this->hook->fire('maintenance.prune_comply.prune_days', $prune_days);
         $prune_date = ($prune_days) ? time() - ($prune_days * 86400) : -1;
 
         @set_time_limit(0);
 
         if ($prune_from == 'all') {
-            $result = DB::for_table('forums')->select('id')->find_array();
+            $result = DB::for_table('forums')->select('id');
+            $result = $this->hook->fireDB('maintenance.prune_comply.query', $result);
+            $result = $result->find_array();
 
             if (!empty($result)) {
                 foreach ($result as $row) {
@@ -186,14 +197,16 @@ public function prune_comply($prune_from, $prune_sticky)
                         ->select('t1.id')
                         ->left_outer_join('topics', array('t1.moved_to', '=', 't2.id'), 't2')
                         ->where_null('t2.id')
-                        ->where_not_null('t1.moved_to')
-                        ->find_array();
+                        ->where_not_null('t1.moved_to');
+        $result = $this->hook->fireDB('maintenance.prune_comply.orphans_query', $result);
+        $result = $result->find_array();
 
         $orphans = array();
         if (!empty($result)) {
             foreach ($result as $row) {
                 $orphans[] = $row['id'];
             }
+            $orphans = $this->hook->fire('maintenance.prune_comply.orphans', $orphans);
 
             DB::for_table('topics')
                     ->where_in('id', $orphans)
@@ -214,6 +227,8 @@ public function get_info_prune($prune_sticky, $prune_from)
 
         $prune['date'] = time() - ($prune['days'] * 86400);
 
+        $prune = $this->hook->fire('maintenance.get_info_prune.prune_dates', $prune);
+
         // Concatenate together the query for counting number of topics to prune
         $query = DB::for_table('topics')->where_lt('last_post', $prune['date'])
                         ->where_null('moved_to');
@@ -226,8 +241,10 @@ public function get_info_prune($prune_sticky, $prune_from)
             $query = $query->where('forum_id', intval($prune_from));
 
             // Fetch the forum name (just for cosmetic reasons)
-            $forum = DB::for_table('forums')->where('id', $prune_from)
-                        ->find_one_col('forum_name');
+            $forum = DB::for_table('forums')->where('id', $prune_from);
+            $forum = $this->hook->fireDB('maintenance.get_info_prune.forum_query', $forum);
+            $forum = $forum->find_one_col('forum_name');
+
             $prune['forum'] = '"'.feather_escape($forum).'"';
         } else {
             $prune['forum'] = __('All forums');
@@ -239,6 +256,7 @@ public function get_info_prune($prune_sticky, $prune_from)
             message(sprintf(__('No old topics message'), $prune['days']));
         }
 
+        $prune = $this->hook->fire('maintenance.get_info_prune.prune', $prune);
         return $prune;
     }
 
@@ -254,8 +272,9 @@ public function get_categories()
                     ->select_many($select_get_categories)
                     ->inner_join('forums', array('c.id', '=', 'f.cat_id'), 'f')
                     ->where_null('f.redirect_url')
-                    ->order_by_many($order_by_get_categories)
-                    ->find_many();
+                    ->order_by_many($order_by_get_categories);
+        $result = $this->hook->fireDB('maintenance.get_categories.query', $result);
+        $result = $result->find_many();
 
         $cur_category = 0;
         foreach ($result as $forum) {
@@ -273,6 +292,7 @@ public function get_categories()
             $output .=  "\t\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$forum['fid'].'">'.feather_escape($forum['forum_name']).'</option>'."\n";
         }
 
+        $output = $this->hook->fire('maintenance.get_categories.output', $output);
         return $output;
     }
 
@@ -285,6 +305,7 @@ public function get_first_id()
             $first_id = $first_id_sql;
         }
 
+        $first_id = $this->hook->fire('maintenance.get_first_id', $first_id);
         return $first_id;
     }
 }
diff --git a/model/admin/options.php b/model/admin/options.php
index ddfafbe6..d1734ac0 100644
--- a/model/admin/options.php
+++ b/model/admin/options.php
@@ -20,8 +20,9 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
- 
+
     public function update_options()
     {
         $form = array(
@@ -86,6 +87,8 @@ public function update_options()
             'maintenance_message'    => feather_trim($this->request->post('form_maintenance_message')),
         );
 
+        $form = $this->hook->fire('options.update_options.form', $form);
+
         if ($form['board_title'] == '') {
             message(__('Must enter title message'));
         }
@@ -239,6 +242,7 @@ public function update_options()
     public function clear_feed_cache()
     {
         $d = dir(FORUM_CACHE_DIR);
+        $d = $this->hook->fire('options.clear_feed_cache.directory', $d);
         while (($entry = $d->read()) !== false) {
             if (substr($entry, 0, 10) == 'cache_feed' && substr($entry, -4) == '.php') {
                 @unlink(FORUM_CACHE_DIR.$entry);
@@ -251,7 +255,8 @@ public function clear_feed_cache()
     public function get_styles()
     {
         $styles = forum_list_styles();
-        
+        $styles = $this->hook->fire('options.get_styles.styles', $styles);
+
         $output = '';
 
         foreach ($styles as $temp) {
@@ -261,20 +266,23 @@ public function get_styles()
                 $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.str_replace('_', ' ', $temp).'</option>'."\n";
             }
         }
-        
+
+        $output = $this->hook->fire('options.get_styles.output', $output);
         return $output;
     }
 
     public function get_times()
     {
         $times = array(5, 15, 30, 60);
-        
+        $times = $this->hook->fire('options.get_times.times', $times);
+
         $output = '';
 
         foreach ($times as $time) {
             $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$time.'"'.($this->config['o_feed_ttl'] == $time ? ' selected="selected"' : '').'>'.sprintf(__('Minutes'), $time).'</option>'."\n";
         }
-        
+
+        $output = $this->hook->fire('options.get_times.output', $output);
         return $output;
     }
 }
diff --git a/model/admin/parser.php b/model/admin/parser.php
index 260b6f09..71c8b6d9 100644
--- a/model/admin/parser.php
+++ b/model/admin/parser.php
@@ -21,19 +21,22 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
- 
+
     // Helper public function returns array of smiley image files
     //   stored in the img/smilies directory.
     public function get_smiley_files()
     {
         $imgfiles = array();
         $filelist = scandir(FEATHER_ROOT.'img/smilies');
+        $filelist = $this->hook->fire('parser.get_smiley_files.filelist', $filelist);
         foreach ($filelist as $file) {
             if (preg_match('/\.(?:png|gif|jpe?g)$/', $file)) {
                 $imgfiles[] = $file;
             }
         }
+        $imgfiles = $this->hook->fire('parser.get_smiley_files.imgfiles', $imgfiles);
         return $imgfiles;
     }
-}
\ No newline at end of file
+}
diff --git a/model/admin/permissions.php b/model/admin/permissions.php
index 2666f587..19d409fd 100644
--- a/model/admin/permissions.php
+++ b/model/admin/permissions.php
@@ -20,11 +20,13 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
- 
+
     public function update_permissions()
     {
         $form = array_map('intval', $this->request->post('form'));
+        $form = $this->hook->fire('permissions.update_permissions.form', $form);
 
         foreach ($form as $key => $input) {
             // Make sure the input is never a negative value
@@ -48,4 +50,4 @@ public function update_permissions()
 
         redirect(get_link('admin/permissions/'), __('Perms updated redirect'));
     }
-}
\ No newline at end of file
+}
diff --git a/model/admin/reports.php b/model/admin/reports.php
index a6a653a2..d0500dc1 100644
--- a/model/admin/reports.php
+++ b/model/admin/reports.php
@@ -20,19 +20,22 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
 
     public function zap_report()
     {
         $zap_id = intval(key($this->request->post('zap_id')));
+        $zap_id = $this->hook->fire('reports.zap_report.zap_id', $zap_id);
 
-        $result = DB::for_table('reports')
-            ->where('id', $zap_id)
-            ->find_one_col('zapped');
+        $result = DB::for_table('reports')->where('id', $zap_id);
+        $result = $this->hook->fireDB('reports.zap_report.query', $result);
+        $result = $result->find_one_col('zapped');
 
-        $set_zap_report = array('zapped' => time(),
-            'zapped_by' => $this->user->id);
+        $set_zap_report = array('zapped' => time(), 'zapped_by' => $this->user->id);
+        $set_zap_report = $this->hook->fire('reports.zap_report.set_zap_report', $set_zap_report);
 
+        // Update report to indicate it has been zapped
         if (!$result) {
             DB::for_table('reports')
                 ->where('id', $zap_id)
@@ -41,6 +44,7 @@ public function zap_report()
                 ->save();
         }
 
+        // Remove zapped reports to keep only last 10
         $threshold = DB::for_table('reports')
             ->where_not_null('zapped')
             ->order_by_desc('zapped')
@@ -69,16 +73,16 @@ public function get_reports()
             ->left_outer_join('forums', array('r.forum_id', '=', 'f.id'), 'f')
             ->left_outer_join('users', array('r.reported_by', '=', 'u.id'), 'u')
             ->where_null('r.zapped')
-            ->order_by_desc('created')
-            ->find_array();
+            ->order_by_desc('created');
+        $reports = $this->hook->fireDB('reports.get_reports.query', $reports);
+        $reports = $reports->find_array();
 
+        $reports = $this->hook->fire('reports.get_reports', $reports);
         return $reports;
     }
 
     public function get_zapped_reports()
     {
-        global $lang_admin_reports;
-
         $zapped_reports = array();
         $select_zapped_reports = array('r.id', 'r.topic_id', 'r.forum_id', 'r.reported_by', 'r.message', 'r.zapped', 'zapped_by_id' => 'r.zapped_by', 'pid' => 'p.id', 't.subject', 'f.forum_name', 'reporter' => 'u.username', 'zapped_by' => 'u2.username');
         $zapped_reports = DB::for_table('reports')
@@ -91,9 +95,11 @@ public function get_zapped_reports()
             ->left_outer_join('users', array('r.zapped_by', '=', 'u2.id'), 'u2')
             ->where_not_null('r.zapped')
             ->order_by_desc('zapped')
-            ->limit(10)
-            ->find_array();
+            ->limit(10);
+        $zapped_reports = $this->hook->fireDB('reports.get_zapped_reports.query', $zapped_reports);
+        $zapped_reports = $zapped_reports->find_array();
 
+        $zapped_reports = $this->hook->fire('reports.get_zapped_reports', $zapped_reports);
         return $zapped_reports;
     }
-}
\ No newline at end of file
+}
diff --git a/model/admin/statistics.php b/model/admin/statistics.php
index 225392e0..64417069 100644
--- a/model/admin/statistics.php
+++ b/model/admin/statistics.php
@@ -20,8 +20,9 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
- 
+
     public function get_server_load()
     {
         if (@file_exists('/proc/loadavg') && is_readable('/proc/loadavg')) {
@@ -38,6 +39,8 @@ public function get_server_load()
             }
 
             $load_averages = @explode(' ', $load_averages);
+            $load_averages = $this->hook->fire('model.statistics.get_server_load.load_averages', $load_averages);
+
             $server_load = isset($load_averages[2]) ? $load_averages[0].' '.$load_averages[1].' '.$load_averages[2] : __('Not available');
         } elseif (!in_array(PHP_OS, array('WINNT', 'WIN32')) && preg_match('%averages?: ([0-9\.]+),?\s+([0-9\.]+),?\s+([0-9\.]+)%i', @exec('uptime'), $load_averages)) {
             $server_load = $load_averages[1].' '.$load_averages[2].' '.$load_averages[3];
@@ -45,6 +48,7 @@ public function get_server_load()
             $server_load = __('Not available');
         }
 
+        $server_load = $this->hook->fire('model.statistics.get_server_load.server_load', $server_load);
         return $server_load;
     }
 
@@ -53,6 +57,7 @@ public function get_num_online()
         $num_online = DB::for_table('online')->where('idle', 0)
                             ->count('user_id');
 
+        $num_online = $this->hook->fire('model.statistics.get_num_online.num_online', $num_online);
         return $num_online;
     }
 
@@ -63,6 +68,7 @@ public function get_total_size()
         if ($this->feather->forum_settings['db_type'] == 'mysql' || $this->feather->forum_settings['db_type'] == 'mysqli' || $this->feather->forum_settings['db_type'] == 'mysql_innodb' || $this->feather->forum_settings['db_type'] == 'mysqli_innodb') {
             // Calculate total db size/row count
             $result = DB::for_table('users')->raw_query('SHOW TABLE STATUS LIKE \''.$this->feather->forum_settings['db_prefix'].'%\'')->find_many();
+            $result = $this->hook->fire('model.statistics.get_total_size.raw_data', $result);
 
             $total['size'] = $total['records'] = 0;
             foreach ($result as $status) {
@@ -73,6 +79,7 @@ public function get_total_size()
             $total['size'] = file_size($total['size']);
         }
 
+        $total = $this->hook->fire('model.statistics.get_total_size.total', $total);
         return $total;
     }
 
@@ -94,6 +101,7 @@ public function get_php_accelerator()
             $php_accelerator = __('NA');
         }
 
+        $php_accelerator = $this->hook->fire('model.statistics.get_php_accelerator', $php_accelerator);
         return $php_accelerator;
     }
-}
\ No newline at end of file
+}
diff --git a/model/admin/users.php b/model/admin/users.php
index 738f2e4f..2d5da7f8 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -20,13 +20,14 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        $this->hook = $this->feather->hooks;
     }
 
     public function get_num_ip($ip_stats)
     {
-        $num_ips = DB::for_table('posts')->where('poster_id', $ip_stats)
-                        ->group_by('poster_ip')
-                        ->count('poster_ip');
+        $num_ips = DB::for_table('posts')->where('poster_id', $ip_stats)->group_by('poster_ip');
+        $num_ips = $this->hook->fireDB('model.users.get_num_ip', $num_ips);
+        $num_ips = $num_ips->count('poster_ip');
 
         return $num_ips;
     }
@@ -43,38 +44,46 @@ public function get_ip_stats($ip_stats, $start_from)
                     ->group_by('poster_ip')
                     ->order_by_desc('last_used')
                     ->offset($start_from)
-                    ->limit(50)
-                    ->find_many();
+                    ->limit(50);
+        $result = $this->hook->fireDB('model.users.get_ip_stats.query', $result);
+        $result = $result->find_many();
+
         if ($result) {
             foreach ($result as $cur_ip) {
                 $ip_data[] = $cur_ip;
             }
         }
 
+        $ip_data = $this->hook->fire('model.users.get_ip_stats.ip_data', $ip_data);
         return $ip_data;
     }
 
     public function get_num_users_ip($ip)
     {
-        $num_users = DB::for_table('posts')->where('poster_ip', $ip)
-                        ->distinct()
-                        ->count('poster_id');
+        $num_users = DB::for_table('posts')->where('poster_ip', $ip)->distinct();
+        $num_users = $this->hook->fireDB('model.users.get_num_users_ip.query', $num_users);
+        $num_users = $num_users->count('poster_id');
 
         return $num_users;
     }
 
     public function get_num_users_search($conditions)
     {
+        $conditions = $this->hook->fire('model.users.get_num_users_search.conditions', $conditions);
+
         $num_users = DB::for_table('users')->table_alias('u')
                         ->left_outer_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
-                        ->where_raw('u.id>1'.(!empty($conditions) ? ' AND '.implode(' AND ', $conditions) : ''))
-                        ->count('id');
+                        ->where_raw('u.id>1'.(!empty($conditions) ? ' AND '.implode(' AND ', $conditions) : ''));
+        $num_users = $this->hook->fireDB('model.users.get_num_users_search.query', $num_users);
+        $num_users = $num_users->count('id');
 
         return $num_users;
     }
 
     public function get_info_poster($ip, $start_from)
     {
+        $ip = $this->hook->fire('model.users.get_info_poster.ip', $ip);
+
         $info = array();
 
         $select_info_get_info_poster = array('poster_id', 'poster');
@@ -84,8 +93,9 @@ public function get_info_poster($ip, $start_from)
                         ->where('poster_ip', $ip)
                         ->order_by_asc('poster')
                         ->offset($start_from)
-                        ->limit(50)
-                        ->find_many();
+                        ->limit(50);
+        $result = $this->hook->fireDB('model.users.get_info_poster.select_info_get_info_poster', $result);
+        $result = $result->find_many();
 
         $info['num_posts'] = count($result);
 
@@ -102,14 +112,16 @@ public function get_info_poster($ip, $start_from)
                 ->select_many($select_get_info_poster)
                 ->inner_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
                 ->where_gt('u.id', 1)
-                ->where_in('u.id', $poster_ids)
-                ->find_many();
+                ->where_in('u.id', $poster_ids);
+            $result = $this->hook->fireDB('model.users.get_info_poster.select_get_info_poster', $result);
+            $result = $result->find_many();
 
             foreach ($result as $cur_user) {
                 $info['user_data'][$cur_user['id']] = $cur_user;
             }
         }
 
+        $info = $this->hook->fire('model.users.get_info_poster.info', $info);
         return $info;
     }
 
@@ -127,6 +139,8 @@ public function move_users()
             $move['user_ids'] = array();
         }
 
+        $move['user_ids'] = $this->hook->fire('model.users.move_users.user_ids', $move['user_ids']);
+
         if (empty($move['user_ids'])) {
             message(__('No users selected'));
         }
@@ -145,8 +159,9 @@ public function move_users()
 
         $result = DB::for_table('groups')->select_many($select_user_groups)
             ->where_not_in('g_id', $where_not_in)
-            ->order_by_asc('g_title')
-            ->find_many();
+            ->order_by_asc('g_title');
+        $result = $this->hook->fireDB('model.users.move_users.all_user_groups_query', $result);
+        $result = $result->find_many();
 
         foreach ($result as $row) {
             $move['all_groups'][$row['g_id']] = $row['g_title'];
@@ -154,6 +169,7 @@ public function move_users()
 
         if ($this->request->post('move_users_comply')) {
             $new_group = $this->request->post('new_group') && isset($move['all_groups'][$this->request->post('new_group')]) ? $this->request->post('new_group') : message(__('Invalid group message'));
+            $new_group = $this->hook->fire('model.users.move_users.new_group', $new_group);
 
             // Is the new group a moderator group?
             $new_group_mod = DB::for_table('groups')->where('g_id', $new_group)
@@ -163,8 +179,10 @@ public function move_users()
             $user_groups = array();
             $select_fetch_user_groups = array('id', 'group_id');
             $result = DB::for_table('users')->select_many($select_fetch_user_groups)
-                            ->where_in('id', $move['user_ids'])
-                            ->find_many();
+                ->where_in('id', $move['user_ids']);
+            $result = $this->hook->fireDB('model.users.move_users.user_groups_query', $result);
+            $result = $result->find_many();
+
             foreach($result as $cur_user) {
                 if (!isset($user_groups[$cur_user['group_id']])) {
                     $user_groups[$cur_user['group_id']] = array();
@@ -185,6 +203,8 @@ public function move_users()
                 }
             }
 
+            $user_groups = $this->hook->fire('model.users.move_users.user_groups', $user_groups);
+
             if (!empty($user_groups) && $new_group != FEATHER_ADMIN && $new_group_mod != '1') {
                 // Fetch forum list and clean up their moderator list
                 $select_mods = array('id', 'moderators');
@@ -220,6 +240,7 @@ public function move_users()
             redirect(get_link('admin/users/'), __('Users move redirect'));
         }
 
+        $move = $this->hook->fire('model.users.move_users.move', $move);
         return $move;
     }
 
@@ -235,6 +256,8 @@ public function delete_users()
             $user_ids = array();
         }
 
+        $user_ids = $this->hook->fire('model.users.delete_users.user_ids', $user_ids);
+
         if (empty($user_ids)) {
             message(__('No users selected'));
         }
@@ -253,7 +276,9 @@ public function delete_users()
             $select_fetch_user_groups = array('id', 'group_id');
             $result = DB::for_table('users')->select_many($select_fetch_user_groups)
                 ->where_in('id', $user_ids)
-                ->find_many();
+            $result = $this->hook->fireDB('model.users.delete_users.user_groups_query', $result);
+            $result = $result->find_many();
+
             foreach($result as $cur_user) {
 
                 if (!isset($user_groups[$cur_user['group_id']])) {
@@ -275,6 +300,8 @@ public function delete_users()
                 }
             }
 
+            $user_groups = $this->hook->fire('model.users.delete_users.user_groups', $user_groups);
+
             // Fetch forum list and clean up their moderator list
             $select_mods = array('id', 'moderators');
             $result = DB::for_table('forums')
@@ -324,12 +351,14 @@ public function delete_users()
                 $select_user_posts = array('p.id', 'p.topic_id', 't.forum_id');
 
                 $result = DB::for_table('posts')
-                            ->table_alias('p')
-                            ->select_many($select_user_posts)
-                            ->inner_join('topics', array('t.id', '=', 'p.topic_id'), 't')
-                            ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
-                            ->where('p.poster_id', $user_ids)
-                            ->find_many();
+                    ->table_alias('p')
+                    ->select_many($select_user_posts)
+                    ->inner_join('topics', array('t.id', '=', 'p.topic_id'), 't')
+                    ->inner_join('forums', array('f.id', '=', 't.forum_id'), 'f')
+                    ->where('p.poster_id', $user_ids);
+                $result = $this->hook->fireDB('model.users.delete_users.user_posts_query', $result);
+                $result = $result->find_many();
+
                 if ($result) {
                     foreach($result as $cur_post) {
                         // Determine whether this post is the "topic post" or not
@@ -349,6 +378,7 @@ public function delete_users()
                 }
             } else {
                 // Set all their posts to guest
+                // TODO: invert where_in and update_many values ? To test.
                 DB::for_table('posts')
                         ->where_in('poster_id', '1')
                         ->update_many('poster_id', $user_ids);
@@ -390,6 +420,8 @@ public function ban_users()
             $user_ids = array();
         }
 
+        $user_ids = $this->hook->fire('model.users.ban_users.user_ids', $user_ids);
+
         if (empty($user_ids)) {
             message(__('No users selected'));
         }
@@ -417,6 +449,8 @@ public function ban_users()
             $ban_expire = feather_trim($this->request->post('ban_expire'));
             $ban_the_ip = $this->request->post('ban_the_ip') ? intval($this->request->post('ban_the_ip')) : 0;
 
+            $this->hook->fire('model.users.ban_users.comply', $ban_message, $ban_expire, $ban_the_ip);
+
             if ($ban_expire != '' && $ban_expire != 'Never') {
                 $ban_expire = strtotime($ban_expire . ' GMT');
 
@@ -440,8 +474,10 @@ public function ban_users()
             $user_info = array();
             $select_fetch_user_information = array('id', 'username', 'email', 'registration_ip');
             $result = DB::for_table('users')->select_many($select_fetch_user_information)
-                ->where_in('id', $user_ids)
-                ->find_many();
+                ->where_in('id', $user_ids);
+            $result = $this->hook->fireDB('model.users.ban_users.user_info_query', $result);
+            $result = $result->find_many();
+
             foreach ($result as $cur_user) {
                 $user_info[$cur_user['id']] = array('username' => $cur_user['username'], 'email' => $cur_user['email'], 'ip' => $cur_user['registration_ip']);
             }
@@ -454,6 +490,8 @@ public function ban_users()
                 }
             }
 
+            $user_info = $this->hook->fire('model.users.ban_users.user_info', $user_info);
+
             // And insert the bans!
             foreach ($user_ids as $user_id) {
                 $ban_username = $user_info[$user_id]['username'];
@@ -469,6 +507,8 @@ public function ban_users()
                     'ban_creator' => $this->user->id,
                 );
 
+                $insert_update_ban = $this->hook->fire('model.users.ban_users.ban_data', $insert_update_ban);
+
                 if ($this->request->post('mode') == 'add') {
                     $insert_update_ban['ban_creator'] = $this->user->id;
 
@@ -490,6 +530,7 @@ public function ban_users()
     public function get_user_search()
     {
         $form = $this->request->get('form') ? $this->request->get('form') : array();
+        $form = $this->hook->fire('model.users.get_user_search.form', $form);
 
         $search = array();
 
@@ -601,6 +642,7 @@ public function get_user_search()
             $search['conditions'][] = 'u.group_id='.$user_group;
         }
 
+        $search = $this->hook->fire('model.users.get_user_search.search', $search);
         return $search;
     }
 
@@ -610,13 +652,14 @@ public function print_users($conditions, $order_by, $direction, $start_from)
 
         $select_print_users = array('u.id', 'u.username', 'u.email', 'u.title', 'u.num_posts', 'u.admin_note', 'g.g_id', 'g.g_user_title');
         $result = DB::for_table('users')->table_alias('u')
-                        ->select_many($select_print_users)
-                        ->left_outer_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
-                        ->where_raw('u.id>1'.(!empty($conditions) ? ' AND '.implode(' AND ', $conditions) : ''))
-                        ->offset($start_from)
-                        ->limit(50)
-                        ->order_by($order_by, $direction)
-                        ->find_many();
+            ->select_many($select_print_users)
+            ->left_outer_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
+            ->where_raw('u.id>1'.(!empty($conditions) ? ' AND '.implode(' AND ', $conditions) : ''))
+            ->offset($start_from)
+            ->limit(50)
+            ->order_by($order_by, $direction);
+        $result = $this->hook->fireDB('model.users.print_users.query', $result);
+        $result = $result->find_many();
 
         if ($result) {
             foreach ($result as $cur_user) {
@@ -631,6 +674,7 @@ public function print_users($conditions, $order_by, $direction, $start_from)
             }
         }
 
+        $user_data = $this->hook->fire('model.users.print_users.user_data', $user_data);
         return $user_data;
     }
 
@@ -647,6 +691,7 @@ public function get_group_list()
             $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
         }
 
+        $output = $this->hook->fire('model.users.get_group_list.output', $output);
         return $output;
     }
 }

From bbde09ae2a2bc994d0511aa6b06f1aa05edb4fa3 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 24 Aug 2015 16:34:29 +0200
Subject: [PATCH 157/353] Small bug fix

Wrong parameter passed to hook in moderate.php model, function
display_ip_address_post()
---
 model/moderate.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/model/moderate.php b/model/moderate.php
index ebb24753..1b1949f5 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -22,7 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
     }
- 
+
     public function display_ip_info($ip)
     {
         $ip = $this->hook->fire('display_ip_info', $ip);
@@ -35,7 +35,7 @@ public function display_ip_address_post($pid)
 
         $ip = DB::for_table('posts')
             ->where('id', $pid);
-        $ip = $this->hook->fireDB('display_ip_address_post_query', $pid);
+        $ip = $this->hook->fireDB('display_ip_address_post_query', $ip);
         $ip = $ip->find_one_col('poster_ip');
 
         if (!$ip) {
@@ -493,7 +493,7 @@ public function display_posts_view($tid, $start_from)
     public function move_topics_to($fid, $tfid = null, $param = null)
     {
         $fid = $this->hook->fire('move_topics_to_start', $fid);
-        
+
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
             message(__('Bad request'), '404');
         }
@@ -983,7 +983,7 @@ public function display_topics($fid, $sort_by, $start_from)
 
         return $topic_data;
     }
-    
+
     public function stick_topic($id, $fid)
     {
         $stick_topic = DB::for_table('topics')
@@ -1005,7 +1005,7 @@ public function unstick_topic($id, $fid)
         $unstick_topic = $this->hook->fireDB('unstick_topic', $unstick_topic);
         $unstick_topic = $unstick_topic->save();
     }
-    
+
     public function open_topic($id, $fid)
     {
         $open_topic = DB::for_table('topics')
@@ -1016,7 +1016,7 @@ public function open_topic($id, $fid)
         $open_topic = $this->hook->fireDB('open_topic', $open_topic);
         $open_topic = $open_topic->save();
     }
-    
+
     public function close_topic($id, $fid)
     {
         $close_topic = DB::for_table('topics')
@@ -1027,7 +1027,7 @@ public function close_topic($id, $fid)
         $close_topic = $this->hook->fireDB('close_topic', $close_topic);
         $close_topic = $close_topic->save();
     }
-    
+
     public function close_multiple_topics($action, $topics, $fid)
     {
         $close_multiple_topics = DB::for_table('topics')
@@ -1035,7 +1035,7 @@ public function close_multiple_topics($action, $topics, $fid)
         $close_multiple_topics = $this->hook->fireDB('open_topic', $close_multiple_topics);
         $close_multiple_topics = $close_multiple_topics->update_many('closed', $action);
     }
-    
+
     public function get_subject_tid($id)
     {
         $subject = DB::for_table('topics')

From c723af68473bacaa9c1b77e8cb59f0e88ddfe475 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 24 Aug 2015 17:56:56 +0200
Subject: [PATCH 158/353] Prettier notifications display

---
 js/common.js                    |  1 +
 style/FeatherBB.css             | 54 +++++++++++++++++++++++++--------
 style/FeatherBB/view/header.php | 21 ++++++++-----
 3 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/js/common.js b/js/common.js
index a915c4e5..226c1374 100644
--- a/js/common.js
+++ b/js/common.js
@@ -33,6 +33,7 @@ function unselect_checkboxes(curFormId, link, new_string) {
 	return false;
 }
 
+// Useless functions (former flash message show/hide, maybe to use later)
 function fadeOut(id, val) {
 	if (isNaN(val)) {
 		val = 9;
diff --git a/style/FeatherBB.css b/style/FeatherBB.css
index b2646697..be3f9568 100644
--- a/style/FeatherBB.css
+++ b/style/FeatherBB.css
@@ -28,7 +28,6 @@ th {
 }
 #announce,
 #msg,
-#msgflash,
 #posterror {
     text-shadow: 0 1px 0 rgba(255, 255, 255, .5)
 }
@@ -1239,16 +1238,7 @@ footer .footer-link a {
 #viewprofile .fakeform .inform fieldset dd {
     margin: 0 0 15px
 }
-#msgflash {
-    opacity: 0;
-    position: fixed;
-    top: 40px;
-    right: 40px;
-    min-width: 230px;
-    max-width: 400px;
-}
 #msg,
-#msgflash,
 #posterror {
     margin: 15px 0;
     padding: 8px 35px 8px 14px;
@@ -1258,13 +1248,11 @@ footer .footer-link a {
     border-radius: 4px
 }
 #msg h2,
-#msgflash h2,
 #posterror h2 {
     margin: 0 0 4px;
     font-size: 18px
 }
 #msg p,
-#msgflash p,
 #posterror p {
     margin: 0 0 2px
 }
@@ -1273,6 +1261,48 @@ footer .footer-link a {
     border: 1px solid #ebccd1;
     color: #a94442
 }
+.flashmsg {
+    position: fixed;
+    min-width: 220px;
+    max-width: 500px;
+    top: 5%;
+    right: 5%;
+    margin-left: -250px;
+    padding: 1em;
+    z-index: 100;
+    opacity: 0;
+    pointer-events: none;
+    box-shadow: 0 3px 6px rgba(0,0,0,0.25);
+    border: 1px solid #bbb;
+    color: #147880;
+    background: #d2ecea;
+    background: -webkit-linear-gradient(top, #d2ecea, #b3e1e4);
+    background:    -moz-linear-gradient(top, #d2ecea, #b3e1e4);
+    background:         linear-gradient(top, #d2ecea, #b3e1e4);
+    -webkit-transform: translateY(-100%);
+       -moz-transform: translateY(-100%);
+        -ms-transform: translateY(-100%);
+         -o-transform: translateY(-100%);
+            transform: translateY(-100%);
+    -webkit-transition: all 0.75s ease-out;
+       -moz-transition: all 0.75s ease-out;
+        -ms-transition: all 0.75s ease-out;
+         -o-transition: all 0.75s ease-out;
+            transition: all 0.75s ease-out;
+}
+.flashmsg.show {
+    opacity: 1;
+    pointer-events: auto;
+    -webkit-transform: translateY(0%);
+       -moz-transform: translateY(0%);
+        -ms-transform: translateY(0%);
+         -o-transform: translateY(0%);
+            transform: translateY(0%);
+}
+.flashmsg h2 {
+    margin: 0 0 4px;
+    font-size: 18px
+}
 input[type=submit] {
     border-radius: 3px;
     border: 2px solid #00acc1;
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
index 9da121c2..9b662b3a 100644
--- a/style/FeatherBB/view/header.php
+++ b/style/FeatherBB/view/header.php
@@ -113,15 +113,20 @@ function process_form(the_form)
         <?php endif; ?>
         <?php if (isset($flash['message'])) : ?>
             <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
-            <div id="msgflash" class="block">
-                <h2><span><?php _e('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
-                <div class="box">
-                    <div class="inbox">
-                        <p><?php echo feather_escape($flash['message']) ?></p>
-                    </div>
-                </div>
+            <script type="text/javascript">
+                window.onload = function() {
+                    var flashMessage = document.getElementById('flashmsg');
+                    flashMessage.className = 'flashmsg show';
+                    setTimeout(function () {
+                        flashMessage.className = 'flashmsg';
+                    }, 10000);
+                    return false;
+                }
+            </script>
+            <div class="flashmsg" id="flashmsg">
+                <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
+                <p><?= feather_escape($flash['message']) ?></p>
             </div>
-            <script type="text/javascript">fadeIn('msgflash', 0);</script>
         <?php endif; ?>
     </div>
 

From a3269eee2ed8594932d40d0a0c2e325da6107a76 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Mon, 24 Aug 2015 21:15:27 +0200
Subject: [PATCH 159/353] Cleanup caching system

---
 extern.php              | 22 ++++++++++++++++++++
 include/cache.php       | 46 -----------------------------------------
 model/admin/options.php | 12 +++++------
 3 files changed, 28 insertions(+), 52 deletions(-)
 delete mode 100644 include/cache.php

diff --git a/extern.php b/extern.php
index 705bedd3..cd24d1a6 100644
--- a/extern.php
+++ b/extern.php
@@ -86,6 +86,28 @@
     define('FORUM_EXTERN_MAX_SUBJECT_LENGTH', 30);
 }
 
+function featherbb_write_cache_file($file, $content)
+{
+    $fh = @fopen(FORUM_CACHE_DIR.$file, 'wb');
+    if (!$fh) {
+        error('Unable to write cache file '.feather_escape($file).' to cache directory. Please make sure PHP has write access to the directory \''.feather_escape(FORUM_CACHE_DIR).'\'', __FILE__, __LINE__);
+    }
+
+    flock($fh, LOCK_EX);
+    ftruncate($fh, 0);
+
+    fwrite($fh, $content);
+
+    flock($fh, LOCK_UN);
+    fclose($fh);
+
+    if (function_exists('opcache_invalidate')) {
+        opcache_invalidate(FORUM_CACHE_DIR.$file, true);
+    } elseif (function_exists('apc_delete_file')) {
+        @apc_delete_file(FORUM_CACHE_DIR.$file);
+    }
+}
+
 //
 // Converts the CDATA end sequence ]]> into ]]&gt;
 //
diff --git a/include/cache.php b/include/cache.php
deleted file mode 100644
index e862ed62..00000000
--- a/include/cache.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-
-//
-// Safely write out a cache file.
-//
-function featherbb_write_cache_file($file, $content)
-{
-    $fh = @fopen(FORUM_CACHE_DIR.$file, 'wb');
-    if (!$fh) {
-        error('Unable to write cache file '.feather_escape($file).' to cache directory. Please make sure PHP has write access to the directory \''.feather_escape(FORUM_CACHE_DIR).'\'', __FILE__, __LINE__);
-    }
-
-    flock($fh, LOCK_EX);
-    ftruncate($fh, 0);
-
-    fwrite($fh, $content);
-
-    flock($fh, LOCK_UN);
-    fclose($fh);
-
-    featherbb_invalidate_cached_file(FORUM_CACHE_DIR.$file);
-}
-
-
-//
-// Invalidate updated php files that are cached by an opcache
-//
-function featherbb_invalidate_cached_file($file)
-{
-    if (function_exists('opcache_invalidate')) {
-        opcache_invalidate($file, true);
-    } elseif (function_exists('apc_delete_file')) {
-        @apc_delete_file($file);
-    }
-}
-
-
-define('FORUM_CACHE_FUNCTIONS_LOADED', true);
diff --git a/model/admin/options.php b/model/admin/options.php
index d1734ac0..0ba912ed 100644
--- a/model/admin/options.php
+++ b/model/admin/options.php
@@ -229,11 +229,7 @@ public function update_options()
         }
 
         // Regenerate the config cache
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-
-        generate_config_cache();
+        $this->feather->cache->store('config', \model\cache::get_config());
         $this->clear_feed_cache();
 
         redirect(get_link('admin/options/'), __('Options updated redirect'));
@@ -247,7 +243,11 @@ public function clear_feed_cache()
             if (substr($entry, 0, 10) == 'cache_feed' && substr($entry, -4) == '.php') {
                 @unlink(FORUM_CACHE_DIR.$entry);
             }
-            featherbb_invalidate_cached_file(FORUM_CACHE_DIR.$entry);
+            if (function_exists('opcache_invalidate')) {
+                opcache_invalidate(FORUM_CACHE_DIR.$entry, true);
+            } elseif (function_exists('apc_delete_file')) {
+                @apc_delete_file(FORUM_CACHE_DIR.$entry);
+            }
         }
         $d->close();
     }

From 739c2daac867c15847f2923e8f785bf84b2bf898 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 11:45:53 +0200
Subject: [PATCH 160/353] Initial commit of FeatherBB view (from Slim/View)

---
 include/classes/view.class.php | 245 +++++++++++++++++++++++++++++++++
 1 file changed, 245 insertions(+)
 create mode 100644 include/classes/view.class.php

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
new file mode 100644
index 00000000..0b35ac14
--- /dev/null
+++ b/include/classes/view.class.php
@@ -0,0 +1,245 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+ namespace FeatherBB;
+
+ class View
+ {
+     /**
+      * Data available to the view templates
+      * @var \Slim\Helper\Set
+      */
+     protected $data;
+
+     /**
+      * Path to templates base directory (without trailing slash)
+      * @var string
+      */
+     protected $templatesDirectory;
+
+     /**
+      * Constructor
+      */
+     public function __construct()
+     {
+         $this->data = new \Slim\Helper\Set();
+     }
+
+     /********************************************************************************
+      * Data methods
+      *******************************************************************************/
+
+     /**
+      * Does view data have value with key?
+      * @param  string  $key
+      * @return boolean
+      */
+     public function has($key)
+     {
+         return $this->data->has($key);
+     }
+
+     /**
+      * Return view data value with key
+      * @param  string $key
+      * @return mixed
+      */
+     public function get($key)
+     {
+         return $this->data->get($key);
+     }
+
+     /**
+      * Set view data value with key
+      * @param string $key
+      * @param mixed $value
+      */
+     public function set($key, $value)
+     {
+         $this->data->set($key, $value);
+     }
+
+     /**
+      * Set view data value as Closure with key
+      * @param string $key
+      * @param mixed $value
+      */
+     public function keep($key, \Closure $value)
+     {
+         $this->data->keep($key, $value);
+     }
+
+     /**
+      * Return view data
+      * @return array
+      */
+     public function all()
+     {
+         return $this->data->all();
+     }
+
+     /**
+      * Replace view data
+      * @param  array  $data
+      */
+     public function replace(array $data)
+     {
+         $this->data->replace($data);
+     }
+
+     /**
+      * Clear view data
+      */
+     public function clear()
+     {
+         $this->data->clear();
+     }
+
+     /********************************************************************************
+      * Legacy data methods
+      *******************************************************************************/
+
+     /**
+      * DEPRECATION WARNING! This method will be removed in the next major point release
+      *
+      * Get data from view
+      */
+     public function getData($key = null)
+     {
+         if (!is_null($key)) {
+             return isset($this->data[$key]) ? $this->data[$key] : null;
+         }
+
+         return $this->data->all();
+     }
+
+     /**
+      * DEPRECATION WARNING! This method will be removed in the next major point release
+      *
+      * Set data for view
+      */
+     public function setData()
+     {
+         $args = func_get_args();
+         if (count($args) === 1 && is_array($args[0])) {
+             $this->data->replace($args[0]);
+         } elseif (count($args) === 2) {
+             // Ensure original behavior is maintained. DO NOT invoke stored Closures.
+             if (is_object($args[1]) && method_exists($args[1], '__invoke')) {
+                 $this->data->set($args[0], $this->data->protect($args[1]));
+             } else {
+                 $this->data->set($args[0], $args[1]);
+             }
+         } else {
+             throw new \InvalidArgumentException('Cannot set View data with provided arguments. Usage: `View::setData( $key, $value );` or `View::setData([ key => value, ... ]);`');
+         }
+     }
+
+     /**
+      * DEPRECATION WARNING! This method will be removed in the next major point release
+      *
+      * Append data to view
+      * @param  array $data
+      */
+     public function appendData($data)
+     {
+         if (!is_array($data)) {
+             throw new \InvalidArgumentException('Cannot append view data. Expected array argument.');
+         }
+         $this->data->replace($data);
+     }
+
+     /********************************************************************************
+      * Resolve template paths
+      *******************************************************************************/
+
+     /**
+      * Set the base directory that contains view templates
+      * @param   string $directory
+      * @throws  \InvalidArgumentException If directory is not a directory
+      */
+     public function setTemplatesDirectory($directory)
+     {
+         $this->templatesDirectory = rtrim($directory, DIRECTORY_SEPARATOR);
+     }
+
+     /**
+      * Get templates base directory
+      * @return string
+      */
+     public function getTemplatesDirectory()
+     {
+         return $this->templatesDirectory;
+     }
+
+     /**
+      * Get fully qualified path to template file using templates base directory
+      * @param  string $file The template file pathname relative to templates base directory
+      * @return string
+      */
+     public function getTemplatePathname($file)
+     {
+         return $this->templatesDirectory . DIRECTORY_SEPARATOR . ltrim($file, DIRECTORY_SEPARATOR);
+     }
+
+     /********************************************************************************
+      * Rendering
+      *******************************************************************************/
+
+     /**
+      * Display template
+      *
+      * This method echoes the rendered template to the current output buffer
+      *
+      * @param  string   $template   Pathname of template file relative to templates directory
+      * @param  array    $data       Any additonal data to be passed to the template.
+      */
+     public function display($template, $data = null)
+     {
+         echo $this->fetch($template, $data);
+     }
+
+     /**
+      * Return the contents of a rendered template file
+      *
+      * @param    string $template   The template pathname, relative to the template base directory
+      * @param    array  $data       Any additonal data to be passed to the template.
+      * @return string               The rendered template
+      */
+     public function fetch($template, $data = null)
+     {
+         return $this->render($template, $data);
+     }
+
+     /**
+      * Render a template file
+      *
+      * NOTE: This method should be overridden by custom view subclasses
+      *
+      * @param  string $template     The template pathname, relative to the template base directory
+      * @param  array  $data         Any additonal data to be passed to the template.
+      * @return string               The rendered template
+      * @throws \RuntimeException    If resolved template pathname is not a valid file
+      */
+     protected function render($template, $data = null)
+     {
+         $templatePathname = $this->getTemplatePathname($template);
+         if (!is_file($templatePathname)) {
+             throw new \RuntimeException("View cannot render `$template` because the template does not exist");
+         }
+
+         $data = array_merge($this->data->all(), (array) $data);
+         extract($data);
+         ob_start();
+         require $templatePathname;
+
+         return ob_get_clean();
+     }
+ }
+ ?>

From 94fc0a09c7208ecbae27bd708c5bfd2829e5fbd4 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 11:46:59 +0200
Subject: [PATCH 161/353] Cleaning stuff and register new view as singleton

---
 include/classes/core.class.php | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index 35a94725..0d6fa290 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -52,6 +52,7 @@ public function __construct(array $data)
 
         // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
         setlocale(LC_CTYPE, 'C');
+        opcache_reset();
 	}
 
     public static function load_default_forum_env()
@@ -174,7 +175,12 @@ public function call()
         // Set headers
         $this->set_headers();
 
-        // Populate FeatherBB Slim object with forum_env vars
+        // Block prefetch requests
+        if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) {
+            return $this->app->response->setStatus(403); // Send forbidden header
+        }
+
+        // Populate Slim object with forum_env vars
         $this->hydrate('forum_env', $this->forum_env);
         // Record start time
         $this->app->start = get_microtime();
@@ -182,17 +188,21 @@ public function call()
         $this->app->now = function () {
             return time();
         };
-        // Load cache feature
+        // Load FeatherBB cache
         $this->app->container->singleton('cache', function ($container) {
             $path = $container->forum_env['FORUM_CACHE_DIR'];
             return new \FeatherBB\Cache(array('name' => 'feather',
                                                'path' => $path,
                                                'extension' => '.cache'));
         });
-
-        if ((isset($this->app->environment['HTTP_X_MOZ'])) && ($this->app->environment['HTTP_X_MOZ'] == 'prefetch')) { // Block prefetch requests
-            return $this->app->response->setStatus(403); // Send forbidden header
-        }
+        // Load FeatherBB view
+        $this->app->container->singleton('view2', function($container) {
+            return new \FeatherBB\View();
+        });
+        // Load FeatherBB hooks
+        $this->app->container->singleton('hooks', function () {
+            return new \FeatherBB\Hooks();
+        });
 
         if (!is_file($this->forum_env['FORUM_CONFIG_FILE'])) {
             $installer = new \controller\install;
@@ -200,6 +210,7 @@ public function call()
             return;
         }
 
+        // Load config from disk
         $config_file = json_decode(file_get_contents($this->forum_env['FORUM_CONFIG_FILE']), true);
         if (!is_null($config_file)) {
             $this->forum_settings = array_merge(self::load_default_forum_settings(), $config_file);
@@ -222,14 +233,15 @@ public function call()
         // Finalize forum_settings array
         $this->forum_settings = array_merge($feather_config, $this->forum_settings);
 
+        // Set default style
+        $this->app->view->setStyle($this->forum_settings['o_default_style']);
+
         // Populate FeatherBB Slim object with forum_settings vars
         $this->hydrate('forum_settings', $this->forum_settings);
         $this->app->config = $this->forum_settings; // Legacy
         extract($this->forum_settings); // Legacy
 
-        // Hooks
-        $this->app->hooks = new \FeatherBB\Hooks();
-        new \plugin\plugintest(); // TODO: remove
+        new \plugin\plugintest();
 
         // Define time formats
         $forum_time_formats = array($this->forum_settings['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');

From a98fcd47c6e11fd15e09fe46b1b27704b7453000 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 11:49:04 +0200
Subject: [PATCH 162/353] Implement view fallback

---
 include/classes/auth.class.php |  2 --
 include/classes/view.class.php | 22 ++++++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index 06324b40..48fa5c39 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -291,8 +291,6 @@ public function call()
         // Update online list
         $this->update_users_online();
 
-        // Configure Slim
-        $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? $this->app->forum_env['FEATHER_ROOT'].'style/'.$this->app->user->style.'/view' : $this->app->forum_env['FEATHER_ROOT'].'view');
         $this->next->call();
     }
 }
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 0b35ac14..e3ea7935 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -21,7 +21,8 @@ class View
       * Path to templates base directory (without trailing slash)
       * @var string
       */
-     protected $templatesDirectory;
+     protected $templatesDirectory,
+               $app;
 
      /**
       * Constructor
@@ -29,6 +30,7 @@ class View
      public function __construct()
      {
          $this->data = new \Slim\Helper\Set();
+         $this->app = \Slim\Slim::getInstance();
      }
 
      /********************************************************************************
@@ -183,10 +185,17 @@ public function getTemplatesDirectory()
       * @param  string $file The template file pathname relative to templates base directory
       * @return string
       */
-     public function getTemplatePathname($file)
-     {
-         return $this->templatesDirectory . DIRECTORY_SEPARATOR . ltrim($file, DIRECTORY_SEPARATOR);
-     }
+      public function getTemplatePathname($file)
+      {
+          $pathname = $this->templatesDirectory . DIRECTORY_SEPARATOR . ltrim($file, DIRECTORY_SEPARATOR);
+          if (!is_file($pathname)) {
+              $pathname = $this->app->forum_env['FEATHER_ROOT'] . 'view/' . ltrim($file, DIRECTORY_SEPARATOR); // Fallback on default view
+              if (!is_file($pathname)) {
+                  throw new \RuntimeException("View cannot render `$file` because the template does not exist");
+              }
+          }
+          return $pathname;
+      }
 
      /********************************************************************************
       * Rendering
@@ -230,9 +239,6 @@ public function fetch($template, $data = null)
      protected function render($template, $data = null)
      {
          $templatePathname = $this->getTemplatePathname($template);
-         if (!is_file($templatePathname)) {
-             throw new \RuntimeException("View cannot render `$template` because the template does not exist");
-         }
 
          $data = array_merge($this->data->all(), (array) $data);
          extract($data);

From a4aa1b5c68fff85e028f9bf255b79343f4c812ef Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 11:53:37 +0200
Subject: [PATCH 163/353] Implement setStyle method

---
 include/classes/core.class.php |  3 ++-
 include/classes/view.class.php | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index 0d6fa290..b73e3e3b 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -234,7 +234,7 @@ public function call()
         $this->forum_settings = array_merge($feather_config, $this->forum_settings);
 
         // Set default style
-        $this->app->view->setStyle($this->forum_settings['o_default_style']);
+        $this->app->view2->setStyle($this->forum_settings['o_default_style']);
 
         // Populate FeatherBB Slim object with forum_settings vars
         $this->hydrate('forum_settings', $this->forum_settings);
@@ -247,6 +247,7 @@ public function call()
         $forum_time_formats = array($this->forum_settings['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
         $forum_date_formats = array($this->forum_settings['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
 
+        $this->app->config('templates.path', $this->app->forum_env['FEATHER_ROOT'].'style/FeatherBB/view/');
         // Call FeatherBBAuth middleware
         $this->next->call();
     }
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index e3ea7935..1dbb720f 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -247,5 +247,23 @@ protected function render($template, $data = null)
 
          return ob_get_clean();
      }
+
+     // Getters & Setters
+
+     public function setStyle($style)
+     {
+         if (!is_dir($this->app->forum_env['FEATHER_ROOT'].'style/'.$style.'/view/')) {
+             throw new \InvalidArgumentException('The style '.$style.' doesn\'t exist');
+         }
+         $this->data->set('style', (string) $style);
+         $this->setTemplatesDirectory($this->app->forum_env['FEATHER_ROOT'].'style/'.$style.'/view');
+         return $this;
+     }
+
+     public function getStyle()
+     {
+         return $this->data['style'];
+     }
+
  }
  ?>

From 1b0f05d60d8401de9a23b46c683f0092e8d1e0ce Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 12:23:48 +0200
Subject: [PATCH 164/353] Add setPageInfo method

---
 include/classes/core.class.php |  3 +++
 include/classes/view.class.php | 42 +++++++++++++++++++++++-----------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index b73e3e3b..d88511e2 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -247,6 +247,9 @@ public function call()
         $forum_time_formats = array($this->forum_settings['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
         $forum_date_formats = array($this->forum_settings['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
 
+        // test
+        $this->app->view2->setPageInfo(array('title' => 'C\'est un test'));
+
         $this->app->config('templates.path', $this->app->forum_env['FEATHER_ROOT'].'style/FeatherBB/view/');
         // Call FeatherBBAuth middleware
         $this->next->call();
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 1dbb720f..50e51b96 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -11,25 +11,20 @@
 
  class View
  {
-     /**
-      * Data available to the view templates
-      * @var \Slim\Helper\Set
-      */
-     protected $data;
-
-     /**
-      * Path to templates base directory (without trailing slash)
-      * @var string
-      */
-     protected $templatesDirectory,
-               $app;
+     protected $data,
+               $templatesDirectory,
+               $app,
+               $page,
+               $validation = array(
+                   'title' => 'strval',
+                   'page_number' => 'intval');
 
      /**
       * Constructor
       */
      public function __construct()
      {
-         $this->data = new \Slim\Helper\Set();
+         $this->data = $this->page = new \Slim\Helper\Set();
          $this->app = \Slim\Slim::getInstance();
      }
 
@@ -265,5 +260,26 @@ public function getStyle()
          return $this->data['style'];
      }
 
+     public function setPageInfo(array $data)
+     {
+         foreach ($data as $key => $value) {
+             list($key, $value) = $this->validate($key, $value);
+             $this->page->set($key, $value);
+         }
+     }
+
+     public function getPageInfo()
+     {
+         return $this->page->all();
+     }
+
+     protected function validate($key, $value)
+     {
+         $key = (string) $key;
+         if (function_exists($this->validation[$key])) {
+             $value = $this->validation[$key]($value);
+         }
+         return array($key, $value);
+     }
  }
  ?>

From 9046f9b81205b02c8250f8905a98ea4e7853ca49 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 12:27:02 +0200
Subject: [PATCH 165/353] Add default page info

---
 include/classes/view.class.php | 37 +++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 50e51b96..416c20f8 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -17,7 +17,18 @@ class View
                $page,
                $validation = array(
                    'title' => 'strval',
-                   'page_number' => 'intval');
+                   'page_number' => 'intval',
+                   'active_page' => 'strval',
+                   'focus_element' => 'strval',
+                   'is_indexed' => 'boolval',
+                   'page_head' => 'strval',
+                   'paging_links' => 'strval',
+                   'required_fields' => 'strval',
+                   'has_reports' => 'boolval',
+                   'footer_style' => 'strval',
+                   'fid' => 'intval',
+                   'pid' => 'intval',
+                   'tid' => 'intval');
 
      /**
       * Constructor
@@ -281,5 +292,29 @@ protected function validate($key, $value)
          }
          return array($key, $value);
      }
+
+     protected function getDefaultPageInfo()
+     {
+         if (!$this->app->cache->isCached('quickjump')) {
+             $this->app->cache->store('quickjump', \model\cache::get_quickjump());
+         }
+
+         return array(
+             'title' => $this->app->forum_settings['o_board_title'],
+             'page_number' => null,
+             'active_page' => 'index',
+             'focus_element' => null,
+             'is_indexed' => true,
+             'page_head' => null,
+             'paging_links' => null,
+             'required_fields' => null,
+             'has_reports' => \model\header::get_reports(),
+             'footer_style' => null,
+             'quickjump' => $this->app->cache->retrieve('quickjump'),
+             'fid' => null,
+             'pid' => null,
+             'tid' => null,
+         );
+     }
  }
  ?>

From f88e42dea9f3dca590be8ee0c32a11ecea9409d9 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 12:28:40 +0200
Subject: [PATCH 166/353] Fix undefined field in validation

---
 include/classes/view.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 416c20f8..327418ad 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -16,7 +16,6 @@ class View
                $app,
                $page,
                $validation = array(
-                   'title' => 'strval',
                    'page_number' => 'intval',
                    'active_page' => 'strval',
                    'focus_element' => 'strval',
@@ -287,8 +286,10 @@ public function getPageInfo()
      protected function validate($key, $value)
      {
          $key = (string) $key;
-         if (function_exists($this->validation[$key])) {
-             $value = $this->validation[$key]($value);
+         if (isset($this->validation[$key])) {
+             if (function_exists($this->validation[$key])) {
+                 $value = $this->validation[$key]($value);
+             }
          }
          return array($key, $value);
      }

From 31b49019113197cd1d5e0f22f864b070148f7e05 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 12:43:18 +0200
Subject: [PATCH 167/353] Merge new data into existing data array

---
 include/classes/view.class.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 327418ad..0ee2238b 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -243,12 +243,10 @@ public function fetch($template, $data = null)
       */
      protected function render($template, $data = null)
      {
-         $templatePathname = $this->getTemplatePathname($template);
-
-         $data = array_merge($this->data->all(), (array) $data);
+         $data = array_merge($this->getDefaultPageInfo(), $this->page->all(), $this->data->all(), (array) $data);
          extract($data);
          ob_start();
-         require $templatePathname;
+         require $this->getTemplatePathname($template);
 
          return ob_get_clean();
      }

From 31b0e9162848971244d9427b652b523886a3be5f Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 12:44:59 +0200
Subject: [PATCH 168/353] Add view.alter_data hook

---
 include/classes/view.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 0ee2238b..017110dd 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -244,6 +244,7 @@ public function fetch($template, $data = null)
      protected function render($template, $data = null)
      {
          $data = array_merge($this->getDefaultPageInfo(), $this->page->all(), $this->data->all(), (array) $data);
+         $data = $this->app->hooks('view.alter_data', $data);
          extract($data);
          ob_start();
          require $this->getTemplatePathname($template);

From 54c2ecdf50900884dada8fb98e252e0cbe61e5d3 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 13:03:59 +0200
Subject: [PATCH 169/353] Add admin_console and fix typo in hooks

---
 include/classes/view.class.php      |   6 +-
 model/header.php                    |  28 ++----
 style/FeatherBB/view/header.new.php | 143 ++++++++++++++++++++++++++++
 3 files changed, 155 insertions(+), 22 deletions(-)
 create mode 100644 style/FeatherBB/view/header.new.php

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 017110dd..387c7760 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -20,6 +20,7 @@ class View
                    'active_page' => 'strval',
                    'focus_element' => 'strval',
                    'is_indexed' => 'boolval',
+                   'admin_console' => 'boolval',
                    'page_head' => 'strval',
                    'paging_links' => 'strval',
                    'required_fields' => 'strval',
@@ -243,8 +244,8 @@ public function fetch($template, $data = null)
       */
      protected function render($template, $data = null)
      {
-         $data = array_merge($this->getDefaultPageInfo(), $this->page->all(), $this->data->all(), (array) $data);
-         $data = $this->app->hooks('view.alter_data', $data);
+         $data = array_merge($this->getDefaultPageInfo(), $this->page->all(), $this->data->all(), array('feather', \Slim\Slim::getInstance()), (array) $data);
+         $data = $this->app->hooks->fire('view.alter_data', $data);
          extract($data);
          ob_start();
          require $this->getTemplatePathname($template);
@@ -305,6 +306,7 @@ protected function getDefaultPageInfo()
              'active_page' => 'index',
              'focus_element' => null,
              'is_indexed' => true,
+             'admin_console' => false,
              'page_head' => null,
              'paging_links' => null,
              'required_fields' => null,
diff --git a/model/header.php b/model/header.php
index 8a254fa5..56192f72 100644
--- a/model/header.php
+++ b/model/header.php
@@ -13,30 +13,18 @@
 
 class header
 {
-    public function __construct()
-    {
-        $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->hook = $this->feather->hooks;
-    }
+    protected static $app;
 
-    public function get_reports()
+    public static function get_reports()
     {
-        $this->hook->fire('get_reports_start');
+        self::$app = \Slim\Slim::getInstance();
 
-        $result_header = DB::for_table('reports')->where_null('zapped');
+        self::$app->hooks->fire('get_reports_start');
 
-        $result_header = $this->hook->fireDB('get_reports_query', $result_header);
-
-        $result_header = $result_header->find_one();
+        $result_header = DB::for_table('reports')->where_null('zapped');
 
-        if ($result_header) {
-            return true;
-        }
+        $result_header = self::$app->hooks->fireDB('get_reports_query', $result_header);
 
-        return false;
+        return (bool) $result_header->find_one();
     }
-}
\ No newline at end of file
+}
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
new file mode 100644
index 00000000..60742ffb
--- /dev/null
+++ b/style/FeatherBB/view/header.new.php
@@ -0,0 +1,143 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+?>
+<!doctype html>
+<html lang="<?php _e('lang_identifier') ?>">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
+<?php if ($is_indexed) {
+    echo "\t".'<meta name="robots" content="noindex, follow">'."\n";
+} ?>
+    <title><?php echo generate_page_title($title, $page_number) ?></title>
+    <link rel="stylesheet" type="text/css" href="<?php echo get_base_url() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
+<?php if ($admin_console) {
+    if (file_exists($feather->forum_env['FEATHER_ROOT'].'style/'.$feather->user->style.'/base_admin.css')) {
+        echo "\t".'<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/'.$feather->user->style.'/base_admin.css" />'."\n";
+    } else {
+        echo "\t".'<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/imports/base_admin.css" />'."\n";
+    }
+}
+
+if (isset($required_fields)) :
+    // Output JavaScript to validate form (make sure required fields are filled out)
+
+    ?>
+    <script type="text/javascript">
+        /* <![CDATA[ */
+        function process_form(the_form)
+        {
+            var required_fields = {
+                <?php
+                    // Output a JavaScript object with localised field names
+                    $tpl_temp = count($required_fields);
+                    foreach ($required_fields as $elem_orig => $elem_trans) {
+                        echo "\t\t\"".$elem_orig.'": "'.addslashes(str_replace('&#160;', ' ', $elem_trans));
+                        if (--$tpl_temp) {
+                            echo "\",\n";
+                        } else {
+                            echo "\"\n\t};\n";
+                        }
+                    }
+                    ?>
+                if (document.all || document.getElementById)
+            {
+                for (var i = 0; i < the_form.length; ++i)
+                {
+                    var elem = the_form.elements[i];
+                    if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
+                    {
+                        alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
+                        elem.focus();
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        /* ]]> */
+    </script>
+    <?php
+endif;
+if (!empty($page_head)) :
+    echo implode("\n", $page_head)."\n";
+endif;
+?>
+</head>
+
+<body id="pun<?= $active_page ?>"<?= $focus_element; ?>>
+
+<header>
+
+    <nav>
+        <div class="container">
+            <div class="phone-menu" id="phone-button">
+                <a class="button-phone"></a>
+            </div>
+            <div id="phone">
+                <?php echo $navlinks ?>
+                <div class="navbar-right">
+                    <form method="get" action="/search" class="nav-search">
+                        <input type="hidden" name="action" value="search">
+                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php _e('Search') ?>">
+                    </form>
+                </div>
+            </div>
+        </div>
+    </nav>
+
+    <div class="container">
+        <div class="container-title-status">
+            <h1 class="title-site">
+                <a href="<?php echo get_base_url() ?>" title="" class="site-name">
+                    <p><?php echo feather_escape($feather_config['o_board_title']) ?></p>
+                </a>
+                <div id="brddesc"><?php echo htmlspecialchars_decode($feather_config['o_board_desc']) ?></div>
+            </h1>
+            <div class="status-avatar">
+                <?php echo $page_info ?>
+            </div>
+            <div class="clear"></div>
+        </div>
+        <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
+            <div id="announce" class="block">
+                <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
+                <div class="box">
+                    <div id="announce-block" class="inbox">
+                        <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
+                    </div>
+                </div>
+            </div>
+        <?php endif; ?>
+        <?php if (isset($flash['message'])) : ?>
+            <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
+            <script type="text/javascript">
+                window.onload = function() {
+                    var flashMessage = document.getElementById('flashmsg');
+                    flashMessage.className = 'flashmsg show';
+                    setTimeout(function () {
+                        flashMessage.className = 'flashmsg';
+                    }, 10000);
+                    return false;
+                }
+            </script>
+            <div class="flashmsg" id="flashmsg">
+                <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
+                <p><?= feather_escape($flash['message']) ?></p>
+            </div>
+        <?php endif; ?>
+    </div>
+
+</header>
+
+<section class="container">
+    <div id="brdmain">

From 5f885a4cda5ad064a9df911b43766a4d5a35d7bc Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 13:06:42 +0200
Subject: [PATCH 170/353] Fix feather object injection in view

---
 include/classes/view.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 387c7760..3613c622 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -244,7 +244,7 @@ public function fetch($template, $data = null)
       */
      protected function render($template, $data = null)
      {
-         $data = array_merge($this->getDefaultPageInfo(), $this->page->all(), $this->data->all(), array('feather', \Slim\Slim::getInstance()), (array) $data);
+         $data = array_merge($this->getDefaultPageInfo(), $this->page->all(), $this->data->all(), array('feather' => \Slim\Slim::getInstance()), (array) $data);
          $data = $this->app->hooks->fire('view.alter_data', $data);
          extract($data);
          ob_start();

From 0d1f2d933dc4ee522edb6786bd796c43e3f996cb Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 13:13:28 +0200
Subject: [PATCH 171/353] Add focus_element and nav links in view

---
 include/classes/view.class.php      |  1 -
 style/FeatherBB/view/header.new.php | 48 ++++++++++++++++++++++++++---
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 3613c622..8dc57d74 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -21,7 +21,6 @@ class View
                    'focus_element' => 'strval',
                    'is_indexed' => 'boolval',
                    'admin_console' => 'boolval',
-                   'page_head' => 'strval',
                    'paging_links' => 'strval',
                    'required_fields' => 'strval',
                    'has_reports' => 'boolval',
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index 60742ffb..3066b926 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -74,17 +74,57 @@ function process_form(the_form)
 ?>
 </head>
 
-<body id="pun<?= $active_page ?>"<?= $focus_element; ?>>
-
+<body id="pun<?= $active_page ?>" <?= ($focus_element ? 'onload="document.getElementById(\''.$focus_element[0].'\').elements[\''.$focus_element[1].'\'].focus();"' : '')?>>
 <header>
-
     <nav>
         <div class="container">
             <div class="phone-menu" id="phone-button">
                 <a class="button-phone"></a>
             </div>
             <div id="phone">
-                <?php echo $navlinks ?>
+                <div id="brdmenu" class="inbox">
+                    <ul>
+<?php
+echo "\t\t\t\t\t\t".'<li id="navindex"'.(($active_page == 'index') ? ' class="isactive"' : '').'><a href="'.get_base_url().'/">'.__('Index').'</a></li>'."\n";
+
+if ($feather->user->g_read_board == '1' && $feather->user->g_view_users == '1') {
+    echo "\t\t\t\t\t\t".'<li id="navuserlist"'.(($active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.get_link('userlist/').'">'.__('User list').'</a></li>'."\n";
+}
+
+if ($feather->forum_settings['o_rules'] == '1' && (!$feather->user->is_guest || $feather->user->g_read_board == '1' || $feather->forum_settings['o_regs_allow'] == '1')) {
+    echo "\t\t\t\t\t\t".'<li id="navrules"'.(($active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.get_link('rules/').'">'.__('Rules').'</a></li>'."\n";
+}
+
+if ($feather->user->g_read_board == '1' && $feather->user->g_search == '1') {
+    echo "\t\t\t\t\t\t".'<li id="navsearch"'.(($active_page == 'search') ? ' class="isactive"' : '').'><a href="'.get_link('search/').'">'.__('Search').'</a></li>'."\n";
+}
+
+if ($feather->user->is_guest) {
+    echo "\t\t\t\t\t\t".'<li id="navregister"'.(($active_page == 'register') ? ' class="isactive"' : '').'><a href="'.get_link('register/').'">'.__('Register').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogin"'.(($active_page == 'login') ? ' class="isactive"' : '').'><a href="'.get_link('login/').'">'.__('Login').'</a></li>'."\n";
+} else {
+    echo "\t\t\t\t\t\t".'<li id="navprofile"'.(($active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.get_link('user/'.$feather->user->id.'/').'">'.__('Profile').'</a></li>'."\n";
+
+    if ($feather->user->is_admmod) {
+        echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.get_link('admin/').'">'.__('Admin').'</a></li>'."\n";
+    }
+
+    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.get_link('logout/id/'.$feather->user->id.'/token/'.feather_hash($feather->user->id.feather_hash($this->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
+}
+
+// // Are there any additional navlinks we should insert into the array before imploding it?
+// if ($feather->user->g_read_board == '1' && $feather->forum_settings['o_additional_navlinks'] != '') {
+//     if (preg_match_all('%([0-9]+)\s*=\s*(.*?)\n%s', $feather->forum_settings['o_additional_navlinks']."\n", $extra_links)) {
+//         // Insert any additional links into the $links array (at the correct index)
+//         $num_links = count($extra_links[1]);
+//         for ($i = 0; $i < $num_links; ++$i) {
+//             array_splice($links, $extra_links[1][$i], 0, array('<li id="navextra'.($i + 1).'">'.$extra_links[2][$i].'</li>'));
+//         }
+//     }
+// }
+?>
+                        </ul>
+                    </div>
                 <div class="navbar-right">
                     <form method="get" action="/search" class="nav-search">
                         <input type="hidden" name="action" value="search">

From 689baf3df984996f25084b03e6d2148787618733 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 13:30:48 +0200
Subject: [PATCH 172/353] Finish refactor header.php

---
 include/classes/view.class.php      |  1 +
 style/FeatherBB/view/header.new.php | 49 +++++++++++++++++++++++++----
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 8dc57d74..c240e44c 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -21,6 +21,7 @@ class View
                    'focus_element' => 'strval',
                    'is_indexed' => 'boolval',
                    'admin_console' => 'boolval',
+                   'has_reports' => 'boolval',
                    'paging_links' => 'strval',
                    'required_fields' => 'strval',
                    'has_reports' => 'boolval',
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index 3066b926..70b8da63 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -109,7 +109,7 @@ function process_form(the_form)
         echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.get_link('admin/').'">'.__('Admin').'</a></li>'."\n";
     }
 
-    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.get_link('logout/id/'.$feather->user->id.'/token/'.feather_hash($feather->user->id.feather_hash($this->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.get_link('logout/id/'.$feather->user->id.'/token/'.feather_hash($feather->user->id.feather_hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
 }
 
 // // Are there any additional navlinks we should insert into the array before imploding it?
@@ -139,21 +139,58 @@ function process_form(the_form)
         <div class="container-title-status">
             <h1 class="title-site">
                 <a href="<?php echo get_base_url() ?>" title="" class="site-name">
-                    <p><?php echo feather_escape($feather_config['o_board_title']) ?></p>
+                    <p><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></p>
                 </a>
-                <div id="brddesc"><?php echo htmlspecialchars_decode($feather_config['o_board_desc']) ?></div>
+                <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
             </h1>
             <div class="status-avatar">
-                <?php echo $page_info ?>
+                <div id="brdwelcome" class="inbox">
+
+<?php
+if ($feather->user->is_guest) { ?>
+                    <p class="conl"><?= __('Not logged in')?></p>
+<?php } else {
+    echo "\t\t\t\t\t".'<ul class="conl">';
+    echo "\t\t\t\t\t\t".'<li><span>'.__('Logged in as').' <strong>'.feather_escape($feather->user->username).'</strong></span></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li><span>'.sprintf(__('Last visit'), format_time($feather->user->last_visit)).'</span></li>'."\n";
+
+    if ($feather->user->is_admmod) {
+        if ($feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2') {
+            if ($has_reports) {
+                echo "\t\t\t\t\t\t".'<li class="reportlink"><span><strong><a href="'.get_link('admin/reports/').'">'.__('New reports').'</a></strong></span></li>'."\n";
+            }
+        }
+
+        if ($feather->forum_settings['o_maintenance'] == '1') {
+            echo "\t\t\t\t\t\t".'<li class="maintenancelink"><span><strong><a href="'.get_link('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>'."\n";
+        }
+    }
+    echo "\t\t\t\t\t".'</ul>'."\n";
+}
+
+if ($feather->user->g_read_board == '1' && $feather->user->g_search == '1') {
+    echo "\t\t\t\t\t".'<ul class="conr">'."\n";
+    echo "\t\t\t\t\t\t".'<li><span>'.__('Topic searches').' ';
+    if (!$feather->user->is_guest) {
+        echo '<a href="'.get_link('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a> | ';
+        echo '<a href="'.get_link('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a> | ';
+    }
+    echo '<a href="'.get_link('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a> | ';
+    echo '<a href="'.get_link('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
+    echo '</li>'."\n";
+    echo "\t\t\t\t".'</ul>'."\n";
+} ?>
+                <div class="clearer"></div>
+                </div>
             </div>
             <div class="clear"></div>
         </div>
-        <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
+        <?php if ($feather->user->g_read_board == '1' && $feather->forum_settings['o_announcement'] == '1') : ?>
             <div id="announce" class="block">
                 <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
                 <div class="box">
                     <div id="announce-block" class="inbox">
-                        <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
+                        <div class="usercontent"><?php echo $feather->forum_settings['o_announcement_message'] ?></div>
                     </div>
                 </div>
             </div>

From f04393e53578527bff85428c3430c4ec01eec660 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 13:31:03 +0200
Subject: [PATCH 173/353] Remove test value and add test index

---
 controller/index.php           | 31 ++++++++++++++++---------------
 include/classes/core.class.php |  3 ---
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/controller/index.php b/controller/index.php
index a6e0e72e..0bd236b6 100644
--- a/controller/index.php
+++ b/controller/index.php
@@ -35,20 +35,21 @@ public function display()
             message(__('No view'), '403');
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']));
-
-        $this->header->setTitle($page_title)->setActivePage('index')->allowIndex()->display();
-
-        $this->feather->render('index.php', array(
-                            'index_data' => $this->model->print_categories_forums(),
-                            'stats' => $this->model->collect_stats(),
-                            'feather_config' => $this->config,
-                            'online'    =>    $this->model->fetch_users_online(),
-                            'forum_actions'        =>    $this->model->get_forum_actions(),
-                            'cur_cat'   => 0,
-                            )
-                    );
-
-        $this->footer->display();
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->config['o_board_title'])),
+            'active_page' => 'index',
+            'is_indexed' => true,
+        ));
+        $this->feather->view2->display('header.new.php');
+
+        // $this->feather->render('index.php', array(
+        //                     'index_data' => $this->model->print_categories_forums(),
+        //                     'stats' => $this->model->collect_stats(),
+        //                     'feather_config' => $this->config,
+        //                     'online'    =>    $this->model->fetch_users_online(),
+        //                     'forum_actions'        =>    $this->model->get_forum_actions(),
+        //                     'cur_cat'   => 0,
+        //                     )
+        //             );
     }
 }
diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index d88511e2..b73e3e3b 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -247,9 +247,6 @@ public function call()
         $forum_time_formats = array($this->forum_settings['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
         $forum_date_formats = array($this->forum_settings['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
 
-        // test
-        $this->app->view2->setPageInfo(array('title' => 'C\'est un test'));
-
         $this->app->config('templates.path', $this->app->forum_env['FEATHER_ROOT'].'style/FeatherBB/view/');
         // Call FeatherBBAuth middleware
         $this->next->call();

From 16bb8d155527c962c8b42cdcdc3c0d77b0c0f9d1 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 13:36:58 +0200
Subject: [PATCH 174/353] Start refactoring footer

---
 style/FeatherBB/view/footer.new.php | 147 ++++++++++++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 style/FeatherBB/view/footer.new.php

diff --git a/style/FeatherBB/view/footer.new.php b/style/FeatherBB/view/footer.new.php
new file mode 100644
index 00000000..ace935f3
--- /dev/null
+++ b/style/FeatherBB/view/footer.new.php
@@ -0,0 +1,147 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+?>
+</div>
+
+<div id="brdfooter" class="block">
+	<h2><span><?php _e('Board footer') ?></span></h2>
+	<div class="box">
+<?php
+
+if (isset($footer_style) && ($footer_style == 'viewforum' || $footer_style == 'viewtopic') && $feather->user->is_admmod) {
+    echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
+
+    if ($footer_style == 'viewforum') {
+        echo "\t\t\t".'<dl>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$fid.'/page/'.$page_number.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t".'</dl>'."\n";
+    } elseif ($footer_style == 'viewtopic') {
+        if (isset($pid)) {
+            $parameter = 'param/'.$pid.'/';
+        } elseif (isset($page_number) && $page_number != 1) {
+            $parameter = 'param/'.$page_number.'/';
+        } else {
+            $parameter = '';
+        }
+
+
+        echo "\t\t\t".'<dl>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
+        // TODO: all
+        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/moderate/page/'.$page_number.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+
+        if ($cur_topic['closed'] == '1') {
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+        } else {
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+        }
+
+        if ($cur_topic['sticky'] == '1') {
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+        } else {
+            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+        }
+
+        echo "\t\t\t".'</dl>'."\n";
+    }
+
+    echo "\t\t\t".'<div class="clearer"></div>'."\n\t\t".'</div>'."\n";
+}
+
+?>
+		<div id="brdfooternav" class="inbox">
+
+<?php
+// Display the "Jump to" drop list
+if ($feather->forum_settings['o_quickjump'] == '1' && !empty($quickjump)) { ?>
+			<div class="conl">
+			<form id="qjump" method="get" action="">
+				<div><label><span><?php _e('Jump to') ?><br /></span></label>
+					<select name="id" onchange="window.location=('<?php echo get_link('forum/') ?>'+this.options[this.selectedIndex].value)">
+<?php
+		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
+			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
+			foreach ($cat_data['cat_forums'] as $forum) {
+				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.url_friendly($forum['forum_name']).'"'.($fid == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
+			}
+			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
+		} ?>
+					</select>
+					<noscript><input type="submit" value="<?php _e('Go') ?>" accesskey="g" /></noscript>
+				</div>
+			</form>
+			</div>
+<?php } ?>
+
+			<div class="conr">
+<?php
+
+if ($footer_style == 'index') {
+    if ($feather->forum_settings['o_feed_type'] == '1') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
+    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
+    }
+} elseif ($footer_style == 'viewforum') {
+    if ($feather->forum_settings['o_feed_type'] == '1') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
+    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
+    }
+} elseif ($footer_style == 'viewtopic') {
+    if ($feather->forum_settings['o_feed_type'] == '1') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
+    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
+    }
+}
+
+?>
+				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather->forum_settings['o_show_version'] == '1') ? ' '.$feather->forum_settings['o_cur_version'] : '')) ?></p>
+			</div>
+			<div class="clearer"></div>
+		</div>
+	</div>
+</div>
+<?php
+
+// Display debug info (if enabled/defined)
+if ($feather->forum_env['FEATHER_SHOW_INFO']) {
+    echo '<p id="debugtime">[ ';
+
+    // Calculate script generation time
+    $time_diff = sprintf('%.3f', get_microtime() - $feather->start);
+    echo sprintf(__('Querytime'), $time_diff, count(\DB::get_query_log()[0]));
+
+    if (function_exists('memory_get_usage')) {
+        echo ' - '.sprintf(__('Memory usage'), file_size(memory_get_usage()));
+
+        if (function_exists('memory_get_peak_usage')) {
+            echo ' '.sprintf(__('Peak usage'), file_size(memory_get_peak_usage()));
+        }
+    }
+
+    echo ' ]</p>'."\n";
+}
+// Display executed queries (if enabled)
+if ($feather->forum_env['FEATHER_SHOW_QUERIES']) {
+    display_saved_queries();
+}
+?>
+
+</section>
+
+<script src="<?php echo get_base_url() ?>/style/FeatherBB/phone.min.js"></script>
+
+</body>
+</html>

From a1095263b6acc623b2d5194b91da2d5daa710c86 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 13:41:30 +0200
Subject: [PATCH 175/353] Fix typos in footer.php

---
 style/FeatherBB/view/footer.new.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/style/FeatherBB/view/footer.new.php b/style/FeatherBB/view/footer.new.php
index ace935f3..7a7bf6f2 100644
--- a/style/FeatherBB/view/footer.new.php
+++ b/style/FeatherBB/view/footer.new.php
@@ -100,9 +100,9 @@
     }
 } elseif ($footer_style == 'viewtopic') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
     }
 }
 

From c5ee908cee671d30be1e75339f87806cbec04c0e Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 13:47:04 +0200
Subject: [PATCH 176/353] Fix indendation and render header/footer in view
 class

---
 include/classes/view.class.php      |  2 ++
 style/FeatherBB/view/header.new.php | 43 ++++++++++++++---------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index c240e44c..0463f988 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -248,7 +248,9 @@ protected function render($template, $data = null)
          $data = $this->app->hooks->fire('view.alter_data', $data);
          extract($data);
          ob_start();
+         require $this->getTemplatePathname('header.new.php');
          require $this->getTemplatePathname($template);
+         require $this->getTemplatePathname('footer.new.php');
 
          return ob_get_clean();
      }
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index 70b8da63..262af7fb 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -186,34 +186,33 @@ function process_form(the_form)
             <div class="clear"></div>
         </div>
         <?php if ($feather->user->g_read_board == '1' && $feather->forum_settings['o_announcement'] == '1') : ?>
-            <div id="announce" class="block">
-                <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
-                <div class="box">
-                    <div id="announce-block" class="inbox">
-                        <div class="usercontent"><?php echo $feather->forum_settings['o_announcement_message'] ?></div>
-                    </div>
+        <div id="announce" class="block">
+            <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
+            <div class="box">
+                <div id="announce-block" class="inbox">
+                    <div class="usercontent"><?php echo $feather->forum_settings['o_announcement_message'] ?></div>
                 </div>
             </div>
+        </div>
         <?php endif; ?>
         <?php if (isset($flash['message'])) : ?>
-            <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
-            <script type="text/javascript">
-                window.onload = function() {
-                    var flashMessage = document.getElementById('flashmsg');
-                    flashMessage.className = 'flashmsg show';
-                    setTimeout(function () {
-                        flashMessage.className = 'flashmsg';
-                    }, 10000);
-                    return false;
-                }
-            </script>
-            <div class="flashmsg" id="flashmsg">
-                <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
-                <p><?= feather_escape($flash['message']) ?></p>
-            </div>
+        <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
+        <script type="text/javascript">
+            window.onload = function() {
+                var flashMessage = document.getElementById('flashmsg');
+                flashMessage.className = 'flashmsg show';
+                setTimeout(function () {
+                    flashMessage.className = 'flashmsg';
+                }, 10000);
+                return false;
+            }
+        </script>
+        <div class="flashmsg" id="flashmsg">
+            <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
+            <p><?= feather_escape($flash['message']) ?></p>
+        </div>
         <?php endif; ?>
     </div>
-
 </header>
 
 <section class="container">

From 9f151bbb2a6f86b8d93bc3f5ae4c42f5d1faa826 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 14:03:43 +0200
Subject: [PATCH 177/353] First draft of asset manager

---
 include/classes/view.class.php      | 23 ++++++++++++++++++++---
 style/FeatherBB/view/header.new.php |  6 ++++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 0463f988..8b801cf1 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -11,10 +11,11 @@
 
  class View
  {
-     protected $data,
-               $templatesDirectory,
+     protected $templatesDirectory,
                $app,
+               $data,
                $page,
+               $assets,
                $validation = array(
                    'page_number' => 'intval',
                    'active_page' => 'strval',
@@ -244,7 +245,7 @@ public function fetch($template, $data = null)
       */
      protected function render($template, $data = null)
      {
-         $data = array_merge($this->getDefaultPageInfo(), $this->page->all(), $this->data->all(), array('feather' => \Slim\Slim::getInstance()), (array) $data);
+         $data = array_merge($this->getDefaultPageInfo(), array('assets' => $this->assets), $this->page->all(), $this->data->all(), array('feather' => \Slim\Slim::getInstance()), (array) $data);
          $data = $this->app->hooks->fire('view.alter_data', $data);
          extract($data);
          ob_start();
@@ -264,6 +265,7 @@ public function setStyle($style)
          }
          $this->data->set('style', (string) $style);
          $this->setTemplatesDirectory($this->app->forum_env['FEATHER_ROOT'].'style/'.$style.'/view');
+         $this->addAsset('css', 'style/'.$style.'.css');
          return $this;
      }
 
@@ -320,5 +322,20 @@ protected function getDefaultPageInfo()
              'tid' => null,
          );
      }
+
+     public function addAsset($type, $asset, $params = null)
+     {
+         $type = (string) $type;
+         if (!in_array($type, array('js', 'css'))) {
+             throw new \Exception('Invalid asset type : ' . $type);
+         }
+         if (!is_file($this->app->forum_env['FEATHER_ROOT'].$asset)) {
+             throw new \Exception('The asset file ' . $asset . ' does not exist');
+         }
+         $this->assets[$type][] = array(
+             'file' => $asset,
+             'params' => $params
+         );
+     }
  }
  ?>
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index 262af7fb..0761df89 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -19,8 +19,10 @@
     echo "\t".'<meta name="robots" content="noindex, follow">'."\n";
 } ?>
     <title><?php echo generate_page_title($title, $page_number) ?></title>
-    <link rel="stylesheet" type="text/css" href="<?php echo get_base_url() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
-<?php if ($admin_console) {
+<?php foreach ($assets['css'] as $style) {
+    echo "\t".'<link rel="stylesheet" type="text/css" href="'.get_base_url().'/'.$style['file'].'">'."\n";
+}
+if ($admin_console) {
     if (file_exists($feather->forum_env['FEATHER_ROOT'].'style/'.$feather->user->style.'/base_admin.css')) {
         echo "\t".'<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/'.$feather->user->style.'/base_admin.css" />'."\n";
     } else {

From 13446be85115fb133244420c7940a0041e4342cb Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 26 Aug 2015 16:11:51 +0200
Subject: [PATCH 178/353] Email class

---
 include/classes/core.class.php  |   4 +
 include/classes/email.class.php | 404 +++++++++++++++++++++++++++++++
 include/email.php               | 406 --------------------------------
 include/utf8/utf8.php           |   2 +-
 model/admin/bans.php            |   5 +-
 model/admin/options.php         |   8 +-
 model/login.php                 |   7 +-
 model/misc.php                  |   9 +-
 model/post.php                  |  29 +--
 model/profile.php               |  17 +-
 model/register.php              |  15 +-
 11 files changed, 446 insertions(+), 460 deletions(-)
 create mode 100644 include/classes/email.class.php
 delete mode 100644 include/email.php

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index 35a94725..47de4a4c 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -48,6 +48,7 @@ public function __construct(array $data)
         require $this->forum_env['FEATHER_ROOT'].'include/classes/database.class.php';
         require $this->forum_env['FEATHER_ROOT'].'include/classes/cache.class.php';
         require $this->forum_env['FEATHER_ROOT'].'include/classes/hooks.class.php';
+        require $this->forum_env['FEATHER_ROOT'].'include/classes/email.class.php';
         require $this->forum_env['FEATHER_ROOT'].'plugins/test/plugintest.php';
 
         // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
@@ -231,6 +232,9 @@ public function call()
         $this->app->hooks = new \FeatherBB\Hooks();
         new \plugin\plugintest(); // TODO: remove
 
+        // Email
+        $this->app->email = new \FeatherBB\Email();
+
         // Define time formats
         $forum_time_formats = array($this->forum_settings['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
         $forum_date_formats = array($this->forum_settings['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
diff --git a/include/classes/email.class.php b/include/classes/email.class.php
new file mode 100644
index 00000000..4c6b7869
--- /dev/null
+++ b/include/classes/email.class.php
@@ -0,0 +1,404 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace FeatherBB;
+
+class Email
+{
+    public function __construct()
+    {
+        $this->feather = \Slim\Slim::getInstance();
+        $this->config = $this->feather->config;
+        require FEATHER_ROOT . 'include/utf8/utils/ascii.php';
+    }
+    
+    //
+    // Validate an email address
+    //
+    public function is_valid_email($email)
+    {
+        if (strlen($email) > 80) {
+            return false;
+        }
+
+        return preg_match('%^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|("[^"]+"))@((\[\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\])|(([a-zA-Z\d\-]+\.)+[a-zA-Z]{2,}))$%', $email);
+    }
+
+
+    //
+    // Check if $email is banned
+    //
+    public function is_banned_email($email)
+    {
+        global $feather_bans;
+
+        foreach ($feather_bans as $cur_ban) {
+            if ($cur_ban['email'] != '' &&
+                ($email == $cur_ban['email'] ||
+                    (strpos($cur_ban['email'], '@') === false && stristr($email, '@' . $cur_ban['email'])))
+            ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+
+    //
+    // Only encode with base64, if there is at least one unicode character in the string
+    //
+    public function encode_mail_text($str)
+    {
+        if (utf8_is_ascii($str)) {
+            return $str;
+        }
+
+        return '=?UTF-8?B?' . base64_encode($str) . '?=';
+    }
+
+    //
+    // Extract blocks from a text with a starting and ending string
+    // This public function always matches the most outer block so nesting is possible
+    //
+    public function extract_blocks($text, $start, $end, $retab = true)
+    {
+        $code = array();
+        $start_len = strlen($start);
+        $end_len = strlen($end);
+        $regex = '%(?:' . preg_quote($start, '%') . '|' . preg_quote($end, '%') . ')%';
+        $matches = array();
+
+        if (preg_match_all($regex, $text, $matches)) {
+            $counter = $offset = 0;
+            $start_pos = $end_pos = false;
+
+            foreach ($matches[0] as $match) {
+                if ($match == $start) {
+                    if ($counter == 0) {
+                        $start_pos = strpos($text, $start);
+                    }
+                    $counter++;
+                } elseif ($match == $end) {
+                    $counter--;
+                    if ($counter == 0) {
+                        $end_pos = strpos($text, $end, $offset + 1);
+                    }
+                    $offset = strpos($text, $end, $offset + 1);
+                }
+
+                if ($start_pos !== false && $end_pos !== false) {
+                    $code[] = substr($text, $start_pos + $start_len,
+                        $end_pos - $start_pos - $start_len);
+                    $text = substr_replace($text, "\1", $start_pos,
+                        $end_pos - $start_pos + $end_len);
+                    $start_pos = $end_pos = false;
+                    $offset = 0;
+                }
+            }
+        }
+
+        if ($this->config['o_indent_num_spaces'] != 8 && $retab) {
+            $spaces = str_repeat(' ', $this->config['o_indent_num_spaces']);
+            $text = str_replace("\t", $spaces, $text);
+        }
+
+        return array($code, $text);
+    }
+
+
+    //
+    // Make a post email safe
+    //
+    public function bbcode2email($text, $wrap_length = 72)
+    {
+        static $base_url;
+
+        if (!isset($base_url)) {
+            $base_url = get_base_url();
+        }
+
+        $text = feather_trim($text, "\t\n ");
+
+        $shortcut_urls = array(
+            'topic' => '/topic/$1/',
+            'post' => '/post/$1/#p$1',
+            'forum' => '/forum/$1/',
+            'user' => '/user/$1/',
+        );
+
+        // Split code blocks and text so BBcode in codeblocks won't be touched
+        list($code, $text) = $this->extract_blocks($text, '[code]', '[/code]');
+
+        // Strip all bbcodes, except the quote, url, img, email, code and list items bbcodes
+        $text = preg_replace(array(
+            '%\[/?(?!(?:quote|url|topic|post|user|forum|img|email|code|list|\*))[a-z]+(?:=[^\]]+)?\]%i',
+            '%\n\[/?list(?:=[^\]]+)?\]%i' // A separate regex for the list tags to get rid of some whitespace
+        ), '', $text);
+
+        // Match the deepest nested bbcode
+        // An adapted example from Mastering Regular Expressions
+        $match_quote_regex = '%
+            \[(quote|\*|url|img|email|topic|post|user|forum)(?:=([^\]]+))?\]
+            (
+                (?>[^\[]*)
+                (?>
+                    (?!\[/?\1(?:=[^\]]+)?\])
+                    \[
+                    [^\[]*
+                )*
+            )
+            \[/\1\]
+        %ix';
+
+        $url_index = 1;
+        $url_stack = array();
+        while (preg_match($match_quote_regex, $text, $matches)) {
+            // Quotes
+            if ($matches[1] == 'quote') {
+                // Put '>' or '> ' at the start of a line
+                $replacement = preg_replace(
+                    array('%^(?=\>)%m', '%^(?!\>)%m'),
+                    array('>', '> '),
+                    $matches[2] . " said:\n" . $matches[3]);
+            } // List items
+            elseif ($matches[1] == '*') {
+                $replacement = ' * ' . $matches[3];
+            } // URLs and emails
+            elseif (in_array($matches[1], array('url', 'email'))) {
+                if (!empty($matches[2])) {
+                    $replacement = '[' . $matches[3] . '][' . $url_index . ']';
+                    $url_stack[$url_index] = $matches[2];
+                    $url_index++;
+                } else {
+                    $replacement = '[' . $matches[3] . ']';
+                }
+            } // Images
+            elseif ($matches[1] == 'img') {
+                if (!empty($matches[2])) {
+                    $replacement = '[' . $matches[2] . '][' . $url_index . ']';
+                } else {
+                    $replacement = '[' . basename($matches[3]) . '][' . $url_index . ']';
+                }
+
+                $url_stack[$url_index] = $matches[3];
+                $url_index++;
+            } // Topic, post, forum and user URLs
+            elseif (in_array($matches[1], array('topic', 'post', 'forum', 'user'))) {
+                $url = isset($shortcut_urls[$matches[1]]) ? $base_url . $shortcut_urls[$matches[1]] : '';
+
+                if (!empty($matches[2])) {
+                    $replacement = '[' . $matches[3] . '][' . $url_index . ']';
+                    $url_stack[$url_index] = str_replace('$1', $matches[2], $url);
+                    $url_index++;
+                } else {
+                    $replacement = '[' . str_replace('$1', $matches[3], $url) . ']';
+                }
+            }
+
+            // Update the main text if there is a replacement
+            if (!is_null($replacement)) {
+                $text = str_replace($matches[0], $replacement, $text);
+                $replacement = null;
+            }
+        }
+
+        // Put code blocks and text together
+        if (isset($code)) {
+            $parts = explode("\1", $text);
+            $text = '';
+            foreach ($parts as $i => $part) {
+                $text .= $part;
+                if (isset($code[$i])) {
+                    $text .= trim($code[$i], "\n\r");
+                }
+            }
+        }
+
+        // Put URLs at the bottom
+        if ($url_stack) {
+            $text .= "\n\n";
+            foreach ($url_stack as $i => $url) {
+                $text .= "\n" . ' [' . $i . ']: ' . $url;
+            }
+        }
+
+        // Wrap lines if $wrap_length is higher than -1
+        if ($wrap_length > -1) {
+            // Split all lines and wrap them individually
+            $parts = explode("\n", $text);
+            foreach ($parts as $k => $part) {
+                preg_match('%^(>+ )?(.*)%', $part, $matches);
+                $parts[$k] = wordwrap($matches[1] . $matches[2], $wrap_length -
+                    strlen($matches[1]), "\n" . $matches[1]);
+            }
+
+            return implode("\n", $parts);
+        } else {
+            return $text;
+        }
+    }
+
+
+    //
+    // Wrapper for PHP's mail()
+    //
+    public function feather_mail($to, $subject, $message, $reply_to_email = '', $reply_to_name = '')
+    {
+        // Define line breaks in mail headers; possible values can be PHP_EOL, "\r\n", "\n" or "\r"
+        if (!defined('FORUM_EOL'))
+        {
+            define('FORUM_EOL', PHP_EOL);
+        }
+
+        // Use \r\n for SMTP servers, the system's line ending for local mailers
+        $smtp = $this->config['o_smtp_host'] != '';
+        $EOL = $smtp ? "\r\n" : FORUM_EOL;
+
+        // Default sender/return address
+        $from_name = sprintf(__('Mailer'), $this->config['o_board_title']);
+        $from_email = $this->config['o_webmaster_email'];
+
+        // Do a little spring cleaning
+        $to = feather_trim(preg_replace('%[\n\r]+%s', '', $to));
+        $subject = feather_trim(preg_replace('%[\n\r]+%s', '', $subject));
+        $from_email = feather_trim(preg_replace('%[\n\r:]+%s', '', $from_email));
+        $from_name = feather_trim(preg_replace('%[\n\r:]+%s', '', str_replace('"', '', $from_name)));
+        $reply_to_email = feather_trim(preg_replace('%[\n\r:]+%s', '', $reply_to_email));
+        $reply_to_name = feather_trim(preg_replace('%[\n\r:]+%s', '', str_replace('"', '', $reply_to_name)));
+
+        // Set up some headers to take advantage of UTF-8
+        $from = '"' . $this->encode_mail_text($from_name) . '" <' . $from_email . '>';
+        $subject = $this->encode_mail_text($subject);
+
+        $headers = 'From: ' . $from . $EOL . 'Date: ' . gmdate('r') . $EOL . 'MIME-Version: 1.0' . $EOL . 'Content-transfer-encoding: 8bit' . $EOL . 'Content-type: text/plain; charset=utf-8' . $EOL . 'X-Mailer: FeatherBB Mailer';
+
+        // If we specified a reply-to email, we deal with it here
+        if (!empty($reply_to_email)) {
+            $reply_to = '"' . $this->encode_mail_text($reply_to_name) . '" <' . $reply_to_email . '>';
+
+            $headers .= $EOL . 'Reply-To: ' . $reply_to;
+        }
+
+        // Make sure all linebreaks are LF in message (and strip out any NULL bytes)
+        $message = str_replace("\0", '', feather_linebreaks($message));
+        $message = str_replace("\n", $EOL, $message);
+
+        if ($smtp) {
+            $this->smtp_mail($to, $subject, $message, $headers);
+        }
+        else {
+            mail($to, $subject, $message, $headers);
+        }
+    }
+
+
+    //
+    // This public function was originally a part of the phpBB Group forum software phpBB2 (http://www.phpbb.com)
+    // They deserve all the credit for writing it. I made small modifications for it to suit PunBB and its coding standards
+    //
+    public function server_parse($socket, $expected_response)
+    {
+        $server_response = '';
+        while (substr($server_response, 3, 1) != ' ') {
+            if (!($server_response = fgets($socket, 256))) {
+                message('Couldn\'t get mail server response codes. Please contact the forum administrator.', __FILE__, __LINE__);
+            }
+        }
+
+        if (!(substr($server_response, 0, 3) == $expected_response)) {
+            message('Unable to send email. Please contact the forum administrator with the following error message reported by the SMTP server: "' . $server_response . '"', __FILE__, __LINE__);
+        }
+    }
+
+
+    //
+    // This public function was originally a part of the phpBB Group forum software phpBB2 (http://www.phpbb.com)
+    // They deserve all the credit for writing it. I made small modifications for it to suit PunBB and its coding standards.
+    //
+    public function smtp_mail($to, $subject, $message, $headers = '')
+    {
+        static $local_host;
+
+        $recipients = explode(',', $to);
+
+        // Sanitize the message
+        $message = str_replace("\r\n.", "\r\n..", $message);
+        $message = (substr($message, 0, 1) == '.' ? '.' . $message : $message);
+
+        // Are we using port 25 or a custom port?
+        if (strpos($this->config['o_smtp_host'], ':') !== false) {
+            list($smtp_host, $smtp_port) = explode(':', $this->config['o_smtp_host']);
+        } else {
+            $smtp_host = $this->config['o_smtp_host'];
+            $smtp_port = 25;
+        }
+
+        if ($this->config['o_smtp_ssl'] == '1') {
+            $smtp_host = 'ssl://' . $smtp_host;
+        }
+
+        if (!($socket = fsockopen($smtp_host, $smtp_port, $errno, $errstr, 15))) {
+            message('Could not connect to smtp host "' . $this->config['o_smtp_host'] . '" (' . $errno . ') (' . $errstr . ')', __FILE__, __LINE__);
+        }
+
+        $this->server_parse($socket, '220');
+
+        if (!isset($local_host)) {
+            // Here we try to determine the *real* hostname (reverse DNS entry preferably)
+            $local_host = php_uname('n');
+
+            // Able to resolve name to IP
+            if (($local_addr = @gethostbyname($local_host)) !== $local_host) {
+                // Able to resolve IP back to name
+                if (($local_name = @gethostbyaddr($local_addr)) !== $local_addr) {
+                    $local_host = $local_name;
+                }
+            }
+        }
+
+        if ($this->config['o_smtp_user'] != '' && $this->config['o_smtp_pass'] != '') {
+            fwrite($socket, 'EHLO ' . $local_host . "\r\n");
+            $this->server_parse($socket, '250');
+
+            fwrite($socket, 'AUTH LOGIN' . "\r\n");
+            $this->server_parse($socket, '334');
+
+            fwrite($socket, base64_encode($this->config['o_smtp_user']) . "\r\n");
+            $this->server_parse($socket, '334');
+
+            fwrite($socket, base64_encode($this->config['o_smtp_pass']) . "\r\n");
+            $this->server_parse($socket, '235');
+        } else {
+            fwrite($socket, 'HELO ' . $local_host . "\r\n");
+            $this->server_parse($socket, '250');
+        }
+
+        fwrite($socket, 'MAIL FROM: <' . $this->config['o_webmaster_email'] . '>' . "\r\n");
+        $this->server_parse($socket, '250');
+
+        foreach ($recipients as $email) {
+            fwrite($socket, 'RCPT TO: <' . $email . '>' . "\r\n");
+            $this->server_parse($socket, '250');
+        }
+
+        fwrite($socket, 'DATA' . "\r\n");
+        $this->server_parse($socket, '354');
+
+        fwrite($socket, 'Subject: ' . $subject . "\r\n" . 'To: <' . implode('>, <', $recipients) . '>' . "\r\n" . $headers . "\r\n\r\n" . $message . "\r\n");
+
+        fwrite($socket, '.' . "\r\n");
+        $this->server_parse($socket, '250');
+
+        fwrite($socket, 'QUIT' . "\r\n");
+        fclose($socket);
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/include/email.php b/include/email.php
deleted file mode 100644
index 3281d9eb..00000000
--- a/include/email.php
+++ /dev/null
@@ -1,406 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-// Define line breaks in mail headers; possible values can be PHP_EOL, "\r\n", "\n" or "\r"
-if (!defined('FORUM_EOL')) {
-    define('FORUM_EOL', PHP_EOL);
-}
-
-require FEATHER_ROOT.'include/utf8/utils/ascii.php';
-
-//
-// Validate an email address
-//
-function is_valid_email($email)
-{
-    if (strlen($email) > 80) {
-        return false;
-    }
-
-    return preg_match('%^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|("[^"]+"))@((\[\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\])|(([a-zA-Z\d\-]+\.)+[a-zA-Z]{2,}))$%', $email);
-}
-
-
-//
-// Check if $email is banned
-//
-function is_banned_email($email)
-{
-    global $feather_bans;
-
-    foreach ($feather_bans as $cur_ban) {
-        if ($cur_ban['email'] != '' &&
-            ($email == $cur_ban['email'] ||
-            (strpos($cur_ban['email'], '@') === false && stristr($email, '@'.$cur_ban['email'])))) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-//
-// Only encode with base64, if there is at least one unicode character in the string
-//
-function encode_mail_text($str)
-{
-    if (utf8_is_ascii($str)) {
-        return $str;
-    }
-
-    return '=?UTF-8?B?'.base64_encode($str).'?=';
-}
-
-//
-// Extract blocks from a text with a starting and ending string
-// This function always matches the most outer block so nesting is possible
-//
-function extract_blocks($text, $start, $end, $retab = true)
-{
-    global $feather_config;
-
-    $code = array();
-    $start_len = strlen($start);
-    $end_len = strlen($end);
-    $regex = '%(?:'.preg_quote($start, '%').'|'.preg_quote($end, '%').')%';
-    $matches = array();
-
-    if (preg_match_all($regex, $text, $matches)) {
-        $counter = $offset = 0;
-        $start_pos = $end_pos = false;
-
-        foreach ($matches[0] as $match) {
-            if ($match == $start) {
-                if ($counter == 0) {
-                    $start_pos = strpos($text, $start);
-                }
-                $counter++;
-            } elseif ($match == $end) {
-                $counter--;
-                if ($counter == 0) {
-                    $end_pos = strpos($text, $end, $offset + 1);
-                }
-                $offset = strpos($text, $end, $offset + 1);
-            }
-
-            if ($start_pos !== false && $end_pos !== false) {
-                $code[] = substr($text, $start_pos + $start_len,
-                    $end_pos - $start_pos - $start_len);
-                $text = substr_replace($text, "\1", $start_pos,
-                    $end_pos - $start_pos + $end_len);
-                $start_pos = $end_pos = false;
-                $offset = 0;
-            }
-        }
-    }
-
-    if ($feather_config['o_indent_num_spaces'] != 8 && $retab) {
-        $spaces = str_repeat(' ', $feather_config['o_indent_num_spaces']);
-        $text = str_replace("\t", $spaces, $text);
-    }
-
-    return array($code, $text);
-}
-
-
-//
-// Make a post email safe
-//
-function bbcode2email($text, $wrap_length = 72)
-{
-    static $base_url;
-
-    if (!isset($base_url)) {
-        $base_url = get_base_url();
-    }
-
-    $text = feather_trim($text, "\t\n ");
-
-    $shortcut_urls = array(
-        'topic' => '/topic/$1/',
-        'post' => '/post/$1/#p$1',
-        'forum' => '/forum/$1/',
-        'user' => '/user/$1/',
-    );
-
-    // Split code blocks and text so BBcode in codeblocks won't be touched
-    list($code, $text) = extract_blocks($text, '[code]', '[/code]');
-
-    // Strip all bbcodes, except the quote, url, img, email, code and list items bbcodes
-    $text = preg_replace(array(
-        '%\[/?(?!(?:quote|url|topic|post|user|forum|img|email|code|list|\*))[a-z]+(?:=[^\]]+)?\]%i',
-        '%\n\[/?list(?:=[^\]]+)?\]%i' // A separate regex for the list tags to get rid of some whitespace
-    ), '', $text);
-
-    // Match the deepest nested bbcode
-    // An adapted example from Mastering Regular Expressions
-    $match_quote_regex = '%
-		\[(quote|\*|url|img|email|topic|post|user|forum)(?:=([^\]]+))?\]
-		(
-			(?>[^\[]*)
-			(?>
-				(?!\[/?\1(?:=[^\]]+)?\])
-				\[
-				[^\[]*
-			)*
-		)
-		\[/\1\]
-	%ix';
-
-    $url_index = 1;
-    $url_stack = array();
-    while (preg_match($match_quote_regex, $text, $matches)) {
-        // Quotes
-        if ($matches[1] == 'quote') {
-            // Put '>' or '> ' at the start of a line
-            $replacement = preg_replace(
-                array('%^(?=\>)%m', '%^(?!\>)%m'),
-                array('>', '> '),
-                $matches[2]." said:\n".$matches[3]);
-        }
-
-        // List items
-        elseif ($matches[1] == '*') {
-            $replacement = ' * '.$matches[3];
-        }
-
-        // URLs and emails
-        elseif (in_array($matches[1], array('url', 'email'))) {
-            if (!empty($matches[2])) {
-                $replacement = '['.$matches[3].']['.$url_index.']';
-                $url_stack[$url_index] = $matches[2];
-                $url_index++;
-            } else {
-                $replacement = '['.$matches[3].']';
-            }
-        }
-
-        // Images
-        elseif ($matches[1] == 'img') {
-            if (!empty($matches[2])) {
-                $replacement = '['.$matches[2].']['.$url_index.']';
-            } else {
-                $replacement = '['.basename($matches[3]).']['.$url_index.']';
-            }
-
-            $url_stack[$url_index] = $matches[3];
-            $url_index++;
-        }
-
-        // Topic, post, forum and user URLs
-        elseif (in_array($matches[1], array('topic', 'post', 'forum', 'user'))) {
-            $url = isset($shortcut_urls[$matches[1]]) ? $base_url.$shortcut_urls[$matches[1]] : '';
-
-            if (!empty($matches[2])) {
-                $replacement = '['.$matches[3].']['.$url_index.']';
-                $url_stack[$url_index] = str_replace('$1', $matches[2], $url);
-                $url_index++;
-            } else {
-                $replacement = '['.str_replace('$1', $matches[3], $url).']';
-            }
-        }
-
-        // Update the main text if there is a replacement
-        if (!is_null($replacement)) {
-            $text = str_replace($matches[0], $replacement, $text);
-            $replacement = null;
-        }
-    }
-
-    // Put code blocks and text together
-    if (isset($code)) {
-        $parts = explode("\1", $text);
-        $text = '';
-        foreach ($parts as $i => $part) {
-            $text .= $part;
-            if (isset($code[$i])) {
-                $text .= trim($code[$i], "\n\r");
-            }
-        }
-    }
-
-    // Put URLs at the bottom
-    if ($url_stack) {
-        $text .= "\n\n";
-        foreach ($url_stack as $i => $url) {
-            $text .= "\n".' ['.$i.']: '.$url;
-        }
-    }
-
-    // Wrap lines if $wrap_length is higher than -1
-    if ($wrap_length > -1) {
-        // Split all lines and wrap them individually
-        $parts = explode("\n", $text);
-        foreach ($parts as $k => $part) {
-            preg_match('%^(>+ )?(.*)%', $part, $matches);
-            $parts[$k] = wordwrap($matches[1].$matches[2], $wrap_length -
-                strlen($matches[1]), "\n".$matches[1]);
-        }
-
-        return implode("\n", $parts);
-    } else {
-        return $text;
-    }
-}
-
-
-//
-// Wrapper for PHP's mail()
-//
-function feather_mail($to, $subject, $message, $reply_to_email = '', $reply_to_name = '')
-{
-    global $feather_config;
-
-    // Use \r\n for SMTP servers, the system's line ending for local mailers
-    $smtp = $feather_config['o_smtp_host'] != '';
-    $EOL = $smtp ? "\r\n" : FORUM_EOL;
-
-    // Default sender/return address
-    $from_name = sprintf(__('Mailer'), $feather_config['o_board_title']);
-    $from_email = $feather_config['o_webmaster_email'];
-
-    // Do a little spring cleaning
-    $to = feather_trim(preg_replace('%[\n\r]+%s', '', $to));
-    $subject = feather_trim(preg_replace('%[\n\r]+%s', '', $subject));
-    $from_email = feather_trim(preg_replace('%[\n\r:]+%s', '', $from_email));
-    $from_name = feather_trim(preg_replace('%[\n\r:]+%s', '', str_replace('"', '', $from_name)));
-    $reply_to_email = feather_trim(preg_replace('%[\n\r:]+%s', '', $reply_to_email));
-    $reply_to_name = feather_trim(preg_replace('%[\n\r:]+%s', '', str_replace('"', '', $reply_to_name)));
-
-    // Set up some headers to take advantage of UTF-8
-    $from = '"'.encode_mail_text($from_name).'" <'.$from_email.'>';
-    $subject = encode_mail_text($subject);
-
-    $headers = 'From: '.$from.$EOL.'Date: '.gmdate('r').$EOL.'MIME-Version: 1.0'.$EOL.'Content-transfer-encoding: 8bit'.$EOL.'Content-type: text/plain; charset=utf-8'.$EOL.'X-Mailer: FeatherBB Mailer';
-
-    // If we specified a reply-to email, we deal with it here
-    if (!empty($reply_to_email)) {
-        $reply_to = '"'.encode_mail_text($reply_to_name).'" <'.$reply_to_email.'>';
-
-        $headers .= $EOL.'Reply-To: '.$reply_to;
-    }
-
-    // Make sure all linebreaks are LF in message (and strip out any NULL bytes)
-    $message = str_replace("\0", '', feather_linebreaks($message));
-    $message = str_replace("\n", $EOL, $message);
-    
-    $mailer = $smtp ? 'smtp_mail' : 'mail';
-    $mailer($to, $subject, $message, $headers);
-}
-
-
-//
-// This function was originally a part of the phpBB Group forum software phpBB2 (http://www.phpbb.com)
-// They deserve all the credit for writing it. I made small modifications for it to suit PunBB and its coding standards
-//
-function server_parse($socket, $expected_response)
-{
-    $server_response = '';
-    while (substr($server_response, 3, 1) != ' ') {
-        if (!($server_response = fgets($socket, 256))) {
-            error('Couldn\'t get mail server response codes. Please contact the forum administrator.', __FILE__, __LINE__);
-        }
-    }
-
-    if (!(substr($server_response, 0, 3) == $expected_response)) {
-        error('Unable to send email. Please contact the forum administrator with the following error message reported by the SMTP server: "'.$server_response.'"', __FILE__, __LINE__);
-    }
-}
-
-
-//
-// This function was originally a part of the phpBB Group forum software phpBB2 (http://www.phpbb.com)
-// They deserve all the credit for writing it. I made small modifications for it to suit PunBB and its coding standards.
-//
-function smtp_mail($to, $subject, $message, $headers = '')
-{
-    global $feather_config;
-    static $local_host;
-
-    $recipients = explode(',', $to);
-
-    // Sanitize the message
-    $message = str_replace("\r\n.", "\r\n..", $message);
-    $message = (substr($message, 0, 1) == '.' ? '.'.$message : $message);
-
-    // Are we using port 25 or a custom port?
-    if (strpos($feather_config['o_smtp_host'], ':') !== false) {
-        list($smtp_host, $smtp_port) = explode(':', $feather_config['o_smtp_host']);
-    } else {
-        $smtp_host = $feather_config['o_smtp_host'];
-        $smtp_port = 25;
-    }
-
-    if ($feather_config['o_smtp_ssl'] == '1') {
-        $smtp_host = 'ssl://'.$smtp_host;
-    }
-
-    if (!($socket = fsockopen($smtp_host, $smtp_port, $errno, $errstr, 15))) {
-        error('Could not connect to smtp host "'.$feather_config['o_smtp_host'].'" ('.$errno.') ('.$errstr.')', __FILE__, __LINE__);
-    }
-
-    server_parse($socket, '220');
-
-    if (!isset($local_host)) {
-        // Here we try to determine the *real* hostname (reverse DNS entry preferably)
-        $local_host = php_uname('n');
-
-        // Able to resolve name to IP
-        if (($local_addr = @gethostbyname($local_host)) !== $local_host) {
-            // Able to resolve IP back to name
-            if (($local_name = @gethostbyaddr($local_addr)) !== $local_addr) {
-                $local_host = $local_name;
-            }
-        }
-    }
-
-    if ($feather_config['o_smtp_user'] != '' && $feather_config['o_smtp_pass'] != '') {
-        fwrite($socket, 'EHLO '.$local_host."\r\n");
-        server_parse($socket, '250');
-
-        fwrite($socket, 'AUTH LOGIN'."\r\n");
-        server_parse($socket, '334');
-
-        fwrite($socket, base64_encode($feather_config['o_smtp_user'])."\r\n");
-        server_parse($socket, '334');
-
-        fwrite($socket, base64_encode($feather_config['o_smtp_pass'])."\r\n");
-        server_parse($socket, '235');
-    } else {
-        fwrite($socket, 'HELO '.$local_host."\r\n");
-        server_parse($socket, '250');
-    }
-
-    fwrite($socket, 'MAIL FROM: <'.$feather_config['o_webmaster_email'].'>'."\r\n");
-    server_parse($socket, '250');
-
-    foreach ($recipients as $email) {
-        fwrite($socket, 'RCPT TO: <'.$email.'>'."\r\n");
-        server_parse($socket, '250');
-    }
-
-    fwrite($socket, 'DATA'."\r\n");
-    server_parse($socket, '354');
-
-    fwrite($socket, 'Subject: '.$subject."\r\n".'To: <'.implode('>, <', $recipients).'>'."\r\n".$headers."\r\n\r\n".$message."\r\n");
-
-    fwrite($socket, '.'."\r\n");
-    server_parse($socket, '250');
-
-    fwrite($socket, 'QUIT'."\r\n");
-    fclose($socket);
-
-    return true;
-}
diff --git a/include/utf8/utf8.php b/include/utf8/utf8.php
index c80a0dce..7f0a2b45 100644
--- a/include/utf8/utf8.php
+++ b/include/utf8/utf8.php
@@ -4,7 +4,7 @@
 * This is the dynamic loader for the library. It checks whether you have
 * the mbstring extension available and includes relevant files
 * on that basis, falling back to the native (as in written in PHP) version
-* if mbstring is unavailabe.
+* if mbstring is unavailable.
 *
 * It's probably easiest to use this, if you don't want to understand
 * the dependencies involved, in conjunction with PHP versions etc. At
diff --git a/model/admin/bans.php b/model/admin/bans.php
index b7b8fa11..1fd0a997 100644
--- a/model/admin/bans.php
+++ b/model/admin/bans.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
+        $this->email = $this->feather->email;
     }
 
     public function add_ban_info($id = null)
@@ -218,9 +219,7 @@ public function insert_ban()
             $ban_ip = implode(' ', $addresses);
         }
 
-        require FEATHER_ROOT.'include/email.php';
-
-        if ($ban_email != '' && !is_valid_email($ban_email)) {
+        if ($ban_email != '' && !$this->email->is_valid_email($ban_email)) {
             if (!preg_match('%^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,63})$%', $ban_email)) {
                 message(__('Invalid e-mail message'));
             }
diff --git a/model/admin/options.php b/model/admin/options.php
index 0ba912ed..18749061 100644
--- a/model/admin/options.php
+++ b/model/admin/options.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
+        $this->email = $this->feather->email;
     }
 
     public function update_options()
@@ -125,14 +126,11 @@ public function update_options()
             $form['date_format'] = 'Y-m-d';
         }
 
-
-        require FEATHER_ROOT.'include/email.php';
-
-        if (!is_valid_email($form['admin_email'])) {
+        if (!$this->email->is_valid_email($form['admin_email'])) {
             message(__('Invalid e-mail message'));
         }
 
-        if (!is_valid_email($form['webmaster_email'])) {
+        if (!$this->email->is_valid_email($form['webmaster_email'])) {
             message(__('Invalid webmaster e-mail message'));
         }
 
diff --git a/model/login.php b/model/login.php
index d845dcce..0aa32a04 100644
--- a/model/login.php
+++ b/model/login.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
+        $this->email = $this->feather->email;
     }
 
     public function login()
@@ -127,11 +128,9 @@ public function password_forgotten()
         $errors = array();
 
         if ($this->feather->request()->isPost()) {
-            require FEATHER_ROOT.'include/email.php';
-
             // Validate the email address
             $email = strtolower(feather_trim($this->request->post('req_email')));
-            if (!is_valid_email($email)) {
+            if (!$this->email->is_valid_email($email)) {
                 $errors[] = __('Invalid email');
             }
 
@@ -190,7 +189,7 @@ public function password_forgotten()
                         $cur_mail_message = str_replace('<new_password>', $new_password, $cur_mail_message);
                         $cur_mail_message = $this->hook->fire('cur_mail_message_password_forgotten', $cur_mail_message);
 
-                        feather_mail($email, $mail_subject, $cur_mail_message);
+                        $this->email->feather_mail($email, $mail_subject, $cur_mail_message);
                     }
 
                     message(__('Forget mail').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
diff --git a/model/misc.php b/model/misc.php
index e24ccd93..96479d42 100644
--- a/model/misc.php
+++ b/model/misc.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
+        $this->email = $this->feather->email;
     }
  
     public function update_last_visit()
@@ -97,9 +98,7 @@ public function send_email($mail)
 
         $mail_message = $this->hook->fire('send_email_mail_message', $mail_message);
 
-        require_once FEATHER_ROOT.'include/email.php';
-
-        feather_mail($mail['recipient_email'], $mail_subject, $mail_message, $this->user->email, $this->user->username);
+        $this->email->feather_mail($mail['recipient_email'], $mail_subject, $mail_message, $this->user->email, $this->user->username);
 
         $update_last_mail_sent = DB::for_table('users')->where('id', $this->user->id)
                                                   ->find_one()
@@ -212,9 +211,7 @@ public function insert_report($post_id)
 
                 $mail_message = $this->hook->fire('insert_report_mail_message', $mail_message);
 
-                require FEATHER_ROOT.'include/email.php';
-
-                feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+                $this->email->feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
             }
         }
 
diff --git a/model/post.php b/model/post.php
index f4f096cf..2e8d2737 100644
--- a/model/post.php
+++ b/model/post.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
+        $this->email = $this->feather->email;
     }
  
     //  Get some info about the post
@@ -131,17 +132,15 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
             $email = strtolower(feather_trim(($this->config['p_force_guest_email'] == '1') ? $this->request->post('req_email') : $this->request->post('email')));
 
             if ($this->config['p_force_guest_email'] == '1' || $email != '') {
-                require FEATHER_ROOT.'include/email.php';
-
                 $errors = $this->hook->fire('check_errors_before_post_email', $errors, $email);
 
-                if (!is_valid_email($email)) {
+                if (!$this->email->is_valid_email($email)) {
                     $errors[] = __('Invalid email');
                 }
 
                 // Check if it's a banned email address
                 // we should only check guests because members' addresses are already verified
-                if ($this->user->is_guest && is_banned_email($email)) {
+                if ($this->user->is_guest && $this->email->is_banned_email($email)) {
                     if ($this->config['p_allow_banned_email'] == '0') {
                         $errors[] = __('Banned email');
                     }
@@ -372,16 +371,14 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
         $result = $result->find_many();
 
         if ($result) {
-            require_once FEATHER_ROOT.'include/email.php';
-
             $notification_emails = array();
 
             $censored_message = feather_trim(censor_words($post['message']));
 
             if ($this->config['o_censoring'] == '1') {
-                $cleaned_message = bbcode2email($censored_message, -1);
+                $cleaned_message = $this->email->bbcode2email($censored_message, -1);
             } else {
-                $cleaned_message = bbcode2email($post['message'], -1);
+                $cleaned_message = $this->email->bbcode2email($post['message'], -1);
             }
 
             // Loop through subscribed users and send emails
@@ -436,9 +433,9 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
                 // We have to double check here because the templates could be missing
                 if (isset($notification_emails[$cur_subscriber['language']])) {
                     if ($cur_subscriber['notify_with_post'] == '0') {
-                        feather_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][0], $notification_emails[$cur_subscriber['language']][1]);
+                        $this->email->feather_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][0], $notification_emails[$cur_subscriber['language']][1]);
                     } else {
-                        feather_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][2], $notification_emails[$cur_subscriber['language']][3]);
+                        $this->email->feather_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][2], $notification_emails[$cur_subscriber['language']][3]);
                     }
                 }
             }
@@ -581,17 +578,15 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
         $result = $result->find_many();
 
         if ($result) {
-            require_once FEATHER_ROOT.'include/email.php';
-
             $notification_emails = array();
 
             $censored_message = feather_trim(censor_words($post['message']));
             $censored_subject = feather_trim(censor_words($post['subject']));
 
             if ($this->config['o_censoring'] == '1') {
-                $cleaned_message = bbcode2email($censored_message, -1);
+                $cleaned_message = $this->email->bbcode2email($censored_message, -1);
             } else {
-                $cleaned_message = bbcode2email($post['message'], -1);
+                $cleaned_message = $this->email->bbcode2email($post['message'], -1);
             }
 
             // Loop through subscribed users and send emails
@@ -644,9 +639,9 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
                 // We have to double check here because the templates could be missing
                 if (isset($notification_emails[$cur_subscriber['language']])) {
                     if ($cur_subscriber['notify_with_post'] == '0') {
-                        feather_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][0], $notification_emails[$cur_subscriber['language']][1]);
+                        $this->email->feather_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][0], $notification_emails[$cur_subscriber['language']][1]);
                     } else {
-                        feather_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][2], $notification_emails[$cur_subscriber['language']][3]);
+                        $this->email->feather_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][2], $notification_emails[$cur_subscriber['language']][3]);
                     }
                 }
             }
@@ -677,7 +672,7 @@ public function warn_banned_user($post, $new_pid)
         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
         $mail_message = $this->hook->fire('warn_banned_user_mail_message', $mail_message);
 
-        feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+        $this->email->feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
     }
 
     // Increment post count, change group if needed
diff --git a/model/profile.php b/model/profile.php
index 62a5809b..e4a1aae6 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
+        $this->email = $this->feather->email;
     }
 
     public function change_pass($id)
@@ -200,17 +201,15 @@ public function change_email($id)
                 message(__('Wrong pass'));
             }
 
-            require FEATHER_ROOT.'include/email.php';
-
             // Validate the email address
             $new_email = strtolower(feather_trim($this->request->post('req_new_email')));
             $new_email = $this->hook->fire('change_email_new_email', $new_email);
-            if (!is_valid_email($new_email)) {
+            if (!$this->email->is_valid_email($new_email)) {
                 message(__('Invalid email'));
             }
 
             // Check if it's a banned email address
-            if (is_banned_email($new_email)) {
+            if ($this->email->is_banned_email($new_email)) {
                 if ($this->config['p_allow_banned_email'] == '0') {
                     message(__('Banned email'));
                 } elseif ($this->config['o_mailing_list'] != '') {
@@ -230,7 +229,7 @@ public function change_email($id)
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                     $mail_message = $this->hook->fire('change_email_mail_message', $mail_message);
 
-                    feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+                    $this->email->feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
                 }
             }
 
@@ -267,7 +266,7 @@ public function change_email($id)
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                     $mail_message = $this->hook->fire('change_email_mail_dupe_message', $mail_message);
 
-                    feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+                    $this->email->feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
                 }
             }
 
@@ -304,7 +303,7 @@ public function change_email($id)
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
             $mail_message = $this->hook->fire('change_email_mail_activate_message', $mail_message);
 
-            feather_mail($new_email, $mail_subject, $mail_message);
+            $this->email->feather_mail($new_email, $mail_subject, $mail_message);
 
             $this->hook->fire('change_email_sent');
 
@@ -813,11 +812,9 @@ public function update_profile($id, $info, $section)
                 }
 
                 if ($this->config['o_regs_verify'] == '0' || $this->user->is_admmod) {
-                    require FEATHER_ROOT.'include/email.php';
-
                     // Validate the email address
                     $form['email'] = strtolower(feather_trim($this->request->post('req_email')));
-                    if (!is_valid_email($form['email'])) {
+                    if (!$this->email->is_valid_email($form['email'])) {
                         message(__('Invalid email'));
                     }
                 }
diff --git a/model/register.php b/model/register.php
index 21c18b6e..5dfa5282 100644
--- a/model/register.php
+++ b/model/register.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
+        $this->email = $this->feather->email;
     }
 
     public function check_for_errors()
@@ -79,16 +80,14 @@ public function check_for_errors()
         }
 
         // Validate email
-        require FEATHER_ROOT.'include/email.php';
-
-        if (!is_valid_email($user['email1'])) {
+        if (!$this->email->is_valid_email($user['email1'])) {
             $user['errors'][] = __('Invalid email');
         } elseif ($this->config['o_regs_verify'] == '1' && $user['email1'] != $email2) {
             $user['errors'][] = __('Email not match');
         }
 
         // Check if it's a banned email address
-        if (is_banned_email($user['email1'])) {
+        if ($this->email->is_banned_email($user['email1'])) {
             if ($this->config['p_allow_banned_email'] == '0') {
                 $user['errors'][] = __('Banned email');
             }
@@ -193,7 +192,7 @@ public function insert_user($user)
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                 $mail_message = $this->hook->fire('insert_user_banned_mail_message', $mail_message);
 
-                feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+                $this->email->feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
             }
 
             // If we previously found out that the email was a dupe
@@ -214,7 +213,7 @@ public function insert_user($user)
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                 $mail_message = $this->hook->fire('insert_user_dupe_mail_message', $mail_message);
 
-                feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+                $this->email->feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
             }
 
             // Should we alert people on the admin mailing list that a new user has registered?
@@ -236,7 +235,7 @@ public function insert_user($user)
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                 $mail_message = $this->hook->fire('insert_user_new_mail_message', $mail_message);
 
-                feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
+                $this->email->feather_mail($this->config['o_mailing_list'], $mail_subject, $mail_message);
             }
         }
 
@@ -260,7 +259,7 @@ public function insert_user($user)
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
             $mail_message = $this->hook->fire('insert_user_welcome_mail_message', $mail_message);
 
-            feather_mail($user['email1'], $mail_subject, $mail_message);
+            $this->email->feather_mail($user['email1'], $mail_subject, $mail_message);
 
             message(__('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
         }

From 8b1fa0bddcb24020d38eb1c619b060b99ad1a1c5 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 16:32:30 +0200
Subject: [PATCH 179/353] Finish asset manager + various fixes

---
 include/classes/core.class.php      |  3 +++
 include/classes/view.class.php      | 15 +++++++++++++--
 style/FeatherBB/view/footer.new.php |  7 ++++---
 style/FeatherBB/view/header.new.php |  7 +++----
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index b73e3e3b..fbbd8861 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -235,6 +235,9 @@ public function call()
 
         // Set default style
         $this->app->view2->setStyle($this->forum_settings['o_default_style']);
+        // Set defaults assets
+        $this->app->view2->addAsset('js', 'style/FeatherBB/phone.min.js');
+        $this->app->view2->addAsset('js', 'js/common.js');
 
         // Populate FeatherBB Slim object with forum_settings vars
         $this->hydrate('forum_settings', $this->forum_settings);
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 8b801cf1..a886e37b 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -230,6 +230,14 @@ public function display($template, $data = null)
       */
      public function fetch($template, $data = null)
      {
+         // Force flash messages
+         if (isset($this->app->environment['slim.flash'])) {
+             $this->data->set('flash', $this->app->environment['slim.flash']);
+         }
+         $data = array_merge($this->getDefaultPageInfo(), $this->page->all(), $this->data->all(), (array) $data);
+         $data['feather'] = \Slim\Slim::getInstance();
+         $data['assets'] = $this->getAssets();
+         $data = $this->app->hooks->fire('view.alter_data', $data);
          return $this->render($template, $data);
      }
 
@@ -245,8 +253,6 @@ public function fetch($template, $data = null)
       */
      protected function render($template, $data = null)
      {
-         $data = array_merge($this->getDefaultPageInfo(), array('assets' => $this->assets), $this->page->all(), $this->data->all(), array('feather' => \Slim\Slim::getInstance()), (array) $data);
-         $data = $this->app->hooks->fire('view.alter_data', $data);
          extract($data);
          ob_start();
          require $this->getTemplatePathname('header.new.php');
@@ -337,5 +343,10 @@ public function addAsset($type, $asset, $params = null)
              'params' => $params
          );
      }
+
+     public function getAssets()
+     {
+         return $this->assets;
+     }
  }
  ?>
diff --git a/style/FeatherBB/view/footer.new.php b/style/FeatherBB/view/footer.new.php
index 7a7bf6f2..26d09007 100644
--- a/style/FeatherBB/view/footer.new.php
+++ b/style/FeatherBB/view/footer.new.php
@@ -140,8 +140,9 @@
 ?>
 
 </section>
-
-<script src="<?php echo get_base_url() ?>/style/FeatherBB/phone.min.js"></script>
-
 </body>
+<!-- JS -->
+<?php foreach ($assets['js'] as $script) {
+    echo '<script src="'.get_base_url().'/'.$script['file'].'"></script>'."\n";
+} ?>
 </html>
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index 0761df89..539d17ba 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -19,6 +19,7 @@
     echo "\t".'<meta name="robots" content="noindex, follow">'."\n";
 } ?>
     <title><?php echo generate_page_title($title, $page_number) ?></title>
+    <!-- CSS -->
 <?php foreach ($assets['css'] as $style) {
     echo "\t".'<link rel="stylesheet" type="text/css" href="'.get_base_url().'/'.$style['file'].'">'."\n";
 }
@@ -28,8 +29,7 @@
     } else {
         echo "\t".'<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/imports/base_admin.css" />'."\n";
     }
-}
-
+}  
 if (isset($required_fields)) :
     // Output JavaScript to validate form (make sure required fields are filled out)
 
@@ -76,7 +76,7 @@ function process_form(the_form)
 ?>
 </head>
 
-<body id="pun<?= $active_page ?>" <?= ($focus_element ? 'onload="document.getElementById(\''.$focus_element[0].'\').elements[\''.$focus_element[1].'\'].focus();"' : '')?>>
+<body id="pun<?= $active_page ?>"<?= ($focus_element ? ' onload="document.getElementById(\''.$focus_element[0].'\').elements[\''.$focus_element[1].'\'].focus();"' : '')?>>
 <header>
     <nav>
         <div class="container">
@@ -198,7 +198,6 @@ function process_form(the_form)
         </div>
         <?php endif; ?>
         <?php if (isset($flash['message'])) : ?>
-        <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
         <script type="text/javascript">
             window.onload = function() {
                 var flashMessage = document.getElementById('flashmsg');

From 9778c6be00ca23a575a80dc6b60a567dce551121 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 16:33:05 +0200
Subject: [PATCH 180/353] Move index on new view

---
 controller/index.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/controller/index.php b/controller/index.php
index 0bd236b6..b8cdc01a 100644
--- a/controller/index.php
+++ b/controller/index.php
@@ -35,21 +35,21 @@ public function display()
             message(__('No view'), '403');
         }
 
+
         $this->feather->view2->setPageInfo(array(
             'title' => array(feather_escape($this->config['o_board_title'])),
             'active_page' => 'index',
             'is_indexed' => true,
         ));
-        $this->feather->view2->display('header.new.php');
-
-        // $this->feather->render('index.php', array(
-        //                     'index_data' => $this->model->print_categories_forums(),
-        //                     'stats' => $this->model->collect_stats(),
-        //                     'feather_config' => $this->config,
-        //                     'online'    =>    $this->model->fetch_users_online(),
-        //                     'forum_actions'        =>    $this->model->get_forum_actions(),
-        //                     'cur_cat'   => 0,
-        //                     )
-        //             );
+
+        $this->feather->view2->display('index.php', array(
+                            'index_data' => $this->model->print_categories_forums(),
+                            'stats' => $this->model->collect_stats(),
+                            'feather_config' => $this->config,
+                            'online'    =>    $this->model->fetch_users_online(),
+                            'forum_actions'        =>    $this->model->get_forum_actions(),
+                            'cur_cat'   => 0,
+                            )
+                    );
     }
 }

From be82daa06219dd8f8148097db200617f353f677f Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 26 Aug 2015 17:22:25 +0200
Subject: [PATCH 181/353] Use the autoloader

---
 include/classes/core.class.php | 6 ------
 model/admin/bans.php           | 2 +-
 model/admin/options.php        | 2 +-
 model/login.php                | 2 +-
 model/misc.php                 | 2 +-
 model/post.php                 | 2 +-
 model/profile.php              | 2 +-
 model/register.php             | 2 +-
 8 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index 47de4a4c..fb86f11e 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -46,9 +46,6 @@ public function __construct(array $data)
         require $this->forum_env['FEATHER_ROOT'].'include/pomo/MO.php';
         require $this->forum_env['FEATHER_ROOT'].'include/l10n.php';
         require $this->forum_env['FEATHER_ROOT'].'include/classes/database.class.php';
-        require $this->forum_env['FEATHER_ROOT'].'include/classes/cache.class.php';
-        require $this->forum_env['FEATHER_ROOT'].'include/classes/hooks.class.php';
-        require $this->forum_env['FEATHER_ROOT'].'include/classes/email.class.php';
         require $this->forum_env['FEATHER_ROOT'].'plugins/test/plugintest.php';
 
         // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
@@ -232,9 +229,6 @@ public function call()
         $this->app->hooks = new \FeatherBB\Hooks();
         new \plugin\plugintest(); // TODO: remove
 
-        // Email
-        $this->app->email = new \FeatherBB\Email();
-
         // Define time formats
         $forum_time_formats = array($this->forum_settings['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
         $forum_date_formats = array($this->forum_settings['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
diff --git a/model/admin/bans.php b/model/admin/bans.php
index 1fd0a997..4ad60838 100644
--- a/model/admin/bans.php
+++ b/model/admin/bans.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->email = $this->feather->email;
+        $this->email = new \FeatherBB\Email();
     }
 
     public function add_ban_info($id = null)
diff --git a/model/admin/options.php b/model/admin/options.php
index 18749061..0438c158 100644
--- a/model/admin/options.php
+++ b/model/admin/options.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->email = $this->feather->email;
+        $this->email = new \FeatherBB\Email();
     }
 
     public function update_options()
diff --git a/model/login.php b/model/login.php
index 0aa32a04..7bbdacff 100644
--- a/model/login.php
+++ b/model/login.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->email = $this->feather->email;
+        $this->email = new \FeatherBB\Email();
     }
 
     public function login()
diff --git a/model/misc.php b/model/misc.php
index 96479d42..8d35dca6 100644
--- a/model/misc.php
+++ b/model/misc.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->email = $this->feather->email;
+        $this->email = new \FeatherBB\Email();
     }
  
     public function update_last_visit()
diff --git a/model/post.php b/model/post.php
index 2e8d2737..7b333e7f 100644
--- a/model/post.php
+++ b/model/post.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->email = $this->feather->email;
+        $this->email = new \FeatherBB\Email();
     }
  
     //  Get some info about the post
diff --git a/model/profile.php b/model/profile.php
index e4a1aae6..523716cc 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->email = $this->feather->email;
+        $this->email = new \FeatherBB\Email();
     }
 
     public function change_pass($id)
diff --git a/model/register.php b/model/register.php
index 5dfa5282..ca30f1a2 100644
--- a/model/register.php
+++ b/model/register.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->email = $this->feather->email;
+        $this->email = new \FeatherBB\Email();
     }
 
     public function check_for_errors()

From 10b41a2066825090f8429dce380181f5e6258f6a Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 26 Aug 2015 17:57:14 +0200
Subject: [PATCH 182/353] Add search class

---
 controller/post.php              |   2 -
 controller/search.php            |   2 -
 include/classes/search.class.php | 356 +++++++++++++++++++++++++++++++
 include/functions.php            |   4 +-
 include/search_idx.php           | 355 ------------------------------
 model/admin/maintenance.php      |  14 +-
 model/admin/users.php            |   8 +-
 model/delete.php                 |   2 -
 model/edit.php                   |   7 +-
 model/moderate.php               |   8 +-
 model/post.php                   |   5 +-
 model/profile.php                |   1 -
 model/search.php                 |   7 +-
 13 files changed, 382 insertions(+), 389 deletions(-)
 create mode 100644 include/classes/search.class.php
 delete mode 100644 include/search_idx.php

diff --git a/controller/post.php b/controller/post.php
index a4778ec9..6c680faa 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -100,8 +100,6 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
                 // Did everything go according to plan?
                 if (empty($errors) && !$this->request->post('preview')) {
-                    require FEATHER_ROOT.'include/search_idx.php';
-
                         // If it's a reply
                         if ($tid) {
                             // Insert the reply, get the new_pid
diff --git a/controller/search.php b/controller/search.php
index 186a25ec..5d91d5d5 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -41,8 +41,6 @@ public function display()
             message(__('No search permission'), false, '403 Forbidden');
         }
 
-        require FEATHER_ROOT.'include/search_idx.php';
-
         // Figure out what to do :-)
         if ($this->request->get('action') || ($this->request->get('search_id'))) {
             $search = $this->model->get_search_results();
diff --git a/include/classes/search.class.php b/include/classes/search.class.php
new file mode 100644
index 00000000..c802ffe2
--- /dev/null
+++ b/include/classes/search.class.php
@@ -0,0 +1,356 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// The contents of this file are very much inspired by the file functions_search.php
+// from the phpBB Group forum software phpBB2 (http://www.phpbb.com)
+
+namespace FeatherBB;
+
+class Search
+{
+    public function __construct()
+    {
+        $this->feather = \Slim\Slim::getInstance();
+
+        // Make a regex that will match CJK or Hangul characters
+        define('FEATHER_CJK_HANGUL_REGEX', '[' .
+            '\x{1100}-\x{11FF}' .        // Hangul Jamo							1100-11FF		(http://www.fileformat.info/info/unicode/block/hangul_jamo/index.htm)
+            '\x{3130}-\x{318F}' .        // Hangul Compatibility Jamo			3130-318F		(http://www.fileformat.info/info/unicode/block/hangul_compatibility_jamo/index.htm)
+            '\x{AC00}-\x{D7AF}' .        // Hangul Syllables						AC00-D7AF		(http://www.fileformat.info/info/unicode/block/hangul_syllables/index.htm)
+
+            // Hiragana
+            '\x{3040}-\x{309F}' .        // Hiragana								3040-309F		(http://www.fileformat.info/info/unicode/block/hiragana/index.htm)
+
+            // Katakana
+            '\x{30A0}-\x{30FF}' .        // Katakana								30A0-30FF		(http://www.fileformat.info/info/unicode/block/katakana/index.htm)
+            '\x{31F0}-\x{31FF}' .        // Katakana Phonetic Extensions			31F0-31FF		(http://www.fileformat.info/info/unicode/block/katakana_phonetic_extensions/index.htm)
+
+            // CJK Unified Ideographs	(http://en.wikipedia.org/wiki/CJK_Unified_Ideographs)
+            '\x{2E80}-\x{2EFF}' .        // CJK Radicals Supplement				2E80-2EFF		(http://www.fileformat.info/info/unicode/block/cjk_radicals_supplement/index.htm)
+            '\x{2F00}-\x{2FDF}' .        // Kangxi Radicals						2F00-2FDF		(http://www.fileformat.info/info/unicode/block/kangxi_radicals/index.htm)
+            '\x{2FF0}-\x{2FFF}' .        // Ideographic Description Characters	2FF0-2FFF		(http://www.fileformat.info/info/unicode/block/ideographic_description_characters/index.htm)
+            '\x{3000}-\x{303F}' .        // CJK Symbols and Punctuation			3000-303F		(http://www.fileformat.info/info/unicode/block/cjk_symbols_and_punctuation/index.htm)
+            '\x{31C0}-\x{31EF}' .        // CJK Strokes							31C0-31EF		(http://www.fileformat.info/info/unicode/block/cjk_strokes/index.htm)
+            '\x{3200}-\x{32FF}' .        // Enclosed CJK Letters and Months		3200-32FF		(http://www.fileformat.info/info/unicode/block/enclosed_cjk_letters_and_months/index.htm)
+            '\x{3400}-\x{4DBF}' .        // CJK Unified Ideographs Extension A	3400-4DBF		(http://www.fileformat.info/info/unicode/block/cjk_unified_ideographs_extension_a/index.htm)
+            '\x{4E00}-\x{9FFF}' .        // CJK Unified Ideographs				4E00-9FFF		(http://www.fileformat.info/info/unicode/block/cjk_unified_ideographs/index.htm)
+            '\x{20000}-\x{2A6DF}' .        // CJK Unified Ideographs Extension B	20000-2A6DF		(http://www.fileformat.info/info/unicode/block/cjk_unified_ideographs_extension_b/index.htm)
+            ']');
+    }
+
+
+    //
+    // "Cleans up" a text string and returns an array of unique words
+    // This function depends on the current locale setting
+    //
+    public function split_words($text, $idx)
+    {
+        // Remove BBCode
+        $text = preg_replace('%\[/?(b|u|s|ins|del|em|i|h|colou?r|quote|code|img|url|email|list|topic|post|forum|user)(?:\=[^\]]*)?\]%', ' ', $text);
+
+        // Remove any apostrophes or dashes which aren't part of words
+        $text = substr(ucp_preg_replace('%((?<=[^\p{L}\p{N}])[\'\-]|[\'\-](?=[^\p{L}\p{N}]))%u', '', ' ' . $text . ' '), 1, -1);
+
+        // Remove punctuation and symbols (actually anything that isn't a letter or number), allow apostrophes and dashes (and % * if we aren't indexing)
+        $text = ucp_preg_replace('%(?![\'\-' . ($idx ? '' : '\%\*') . '])[^\p{L}\p{N}]+%u', ' ', $text);
+
+        // Replace multiple whitespace or dashes
+        $text = preg_replace('%(\s){2,}%u', '\1', $text);
+
+        // Fill an array with all the words
+        $words = array_unique(explode(' ', $text));
+
+        // Remove any words that should not be indexed
+        foreach ($words as $key => $value) {
+            // If the word shouldn't be indexed, remove it
+            if (!$this->validate_search_word($value, $idx)) {
+                unset($words[$key]);
+            }
+        }
+
+        return $words;
+    }
+
+
+    //
+    // Checks if a word is a valid searchable word
+    //
+    public function validate_search_word($word, $idx)
+    {
+        static $stopwords;
+
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+
+        // If the word is a keyword we don't want to index it, but we do want to be allowed to search it
+        if ($this->is_keyword($word)) {
+            return !$idx;
+        }
+
+        if (!isset($stopwords)) {
+            if (!$feather->cache->isCached('stopwords')) {
+                $feather->cache->store('stopwords', \model\cache::get_config(), '+1 week');
+            }
+            $stopwords = $feather->cache->retrieve('stopwords');
+        }
+
+        // If it is a stopword it isn't valid
+        if (in_array($word, $stopwords)) {
+            return false;
+        }
+
+        // If the word is CJK we don't want to index it, but we do want to be allowed to search it
+        if ($this->is_cjk($word)) {
+            return !$idx;
+        }
+
+        // Exclude % and * when checking whether current word is valid
+        $word = str_replace(array('%', '*'), '', $word);
+
+        // Check the word is within the min/max length
+        $num_chars = feather_strlen($word);
+        return $num_chars >= FEATHER_SEARCH_MIN_WORD && $num_chars <= FEATHER_SEARCH_MAX_WORD;
+    }
+
+
+    //
+    // Check a given word is a search keyword.
+    //
+    public function is_keyword($word)
+    {
+        return $word == 'and' || $word == 'or' || $word == 'not';
+    }
+
+
+    //
+    // Check if a given word is CJK or Hangul.
+    //
+    public function is_cjk($word)
+    {
+        return preg_match('%^' . FEATHER_CJK_HANGUL_REGEX . '+$%u', $word) ? true : false;
+    }
+
+
+    //
+    // Strip [img] [url] and [email] out of the message so we don't index their contents
+    //
+    public function strip_bbcode($text)
+    {
+        static $patterns;
+
+        if (!isset($patterns)) {
+            $patterns = array(
+                '%\[img=([^\]]*+)\]([^[]*+)\[/img\]%' => '$2 $1',    // Keep the url and description
+                '%\[(url|email)=([^\]]*+)\]([^[]*+(?:(?!\[/\1\])\[[^[]*+)*)\[/\1\]%' => '$2 $3',    // Keep the url and text
+                '%\[(img|url|email)\]([^[]*+(?:(?!\[/\1\])\[[^[]*+)*)\[/\1\]%' => '$2',        // Keep the url
+                '%\[(topic|post|forum|user)\][1-9]\d*\[/\1\]%' => ' ',        // Do not index topic/post/forum/user ID
+            );
+        }
+
+        return preg_replace(array_keys($patterns), array_values($patterns), $text);
+    }
+
+
+    //
+    // Updates the search index with the contents of $post_id (and $subject)
+    //
+    public function update_search_index($mode, $post_id, $message, $subject = null)
+    {
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+
+        $message = utf8_strtolower($message);
+        $subject = utf8_strtolower($subject);
+
+        // Remove any bbcode that we shouldn't index
+        $message = $this->strip_bbcode($message);
+
+        // Split old and new post/subject to obtain array of 'words'
+        $words_message = $this->split_words($message, true);
+        $words_subject = ($subject) ? $this->split_words($subject, true) : array();
+
+        if ($mode == 'edit') {
+            $select_update_search_index = array('w.id', 'w.word', 'm.subject_match');
+            $result = \DB::for_table('search_words')->table_alias('w')
+                ->select_many($select_update_search_index)
+                ->inner_join('search_matches', array('w.id', '=', 'm.word_id'), 'm')
+                ->where('m.post_id', $post_id)
+                ->find_many();
+
+            // Declare here to stop array_keys() and array_diff() from complaining if not set
+            $cur_words['post'] = array();
+            $cur_words['subject'] = array();
+
+            foreach ($result as $row) {
+                $match_in = ($row['subject_match']) ? 'subject' : 'post';
+                $cur_words[$match_in][$row['word']] = $row['id'];
+            }
+
+            $pdo = \DB::get_db();
+            $pdo = null;
+
+            $words['add']['post'] = array_diff($words_message, array_keys($cur_words['post']));
+            $words['add']['subject'] = array_diff($words_subject, array_keys($cur_words['subject']));
+            $words['del']['post'] = array_diff(array_keys($cur_words['post']), $words_message);
+            $words['del']['subject'] = array_diff(array_keys($cur_words['subject']), $words_subject);
+        } else {
+            $words['add']['post'] = $words_message;
+            $words['add']['subject'] = $words_subject;
+            $words['del']['post'] = array();
+            $words['del']['subject'] = array();
+        }
+
+        unset($words_message);
+        unset($words_subject);
+
+        // Get unique words from the above arrays
+        $unique_words = array_unique(array_merge($words['add']['post'], $words['add']['subject']));
+
+        if (!empty($unique_words)) {
+            $select_unique_words = array('id', 'word');
+            $result = \DB::for_table('search_words')->select_many($select_unique_words)
+                ->where_in('word', $unique_words)
+                ->find_many();
+
+            $word_ids = array();
+            foreach ($result as $row) {
+                $word_ids[$row['word']] = $row['id'];
+            }
+
+            $pdo = \DB::get_db();
+            $pdo = null;
+
+            $new_words = array_values(array_diff($unique_words, array_keys($word_ids)));
+
+            unset($unique_words);
+
+            if (!empty($new_words)) {
+                switch ($feather->forum_settings['db_type']) {
+                    case 'mysql':
+                    case 'mysqli':
+                    case 'mysql_innodb':
+                    case 'mysqli_innodb':
+                        // Quite dirty, right? :-)
+                        $placeholders = rtrim(str_repeat('(?), ', count($new_words)), ', ');
+                        \DB::for_table('search_words')
+                            ->raw_execute('INSERT INTO ' . $feather->forum_settings['db_prefix'] . 'search_words (word) VALUES ' . $placeholders, $new_words);
+                        break;
+
+                    default:
+                        foreach ($new_words as $word) {
+                            $word_insert['word'] = $word;
+                            \DB::for_table('search_words')
+                                ->create()
+                                ->set($word_insert)
+                                ->save();
+                        }
+                        break;
+                }
+            }
+
+            unset($new_words);
+        }
+
+        // Delete matches (only if editing a post)
+        foreach ($words['del'] as $match_in => $wordlist) {
+            $subject_match = ($match_in == 'subject') ? 1 : 0;
+
+            if (!empty($wordlist)) {
+
+                $sql = array();
+                foreach ($wordlist as $word) {
+                    $sql[] = $cur_words[$match_in][$word];
+                }
+
+                \DB::for_table('search_matches')
+                    ->where_in('word_id', $sql)
+                    ->where('post_id', $post_id)
+                    ->where('subject_match', $subject_match)
+                    ->delete_many();
+            }
+        }
+
+        // Add new matches
+        foreach ($words['add'] as $match_in => $wordlist) {
+            $subject_match = ($match_in == 'subject') ? 1 : 0;
+
+            if (!empty($wordlist)) {
+                $wordlist = array_values($wordlist);
+                $placeholders = rtrim(str_repeat('?, ', count($wordlist)), ', ');
+                \DB::for_table('search_words')
+                    ->raw_execute('INSERT INTO ' . $feather->forum_settings['db_prefix'] . 'search_matches (post_id, word_id, subject_match) SELECT ' . $post_id . ', id, ' . $subject_match . ' FROM ' . $feather->forum_settings['db_prefix'] . 'search_words WHERE word IN (' . $placeholders . ')', $wordlist);
+            }
+        }
+
+        unset($words);
+    }
+
+
+    //
+    // Strip search index of indexed words in $post_ids
+    //
+    public function strip_search_index($post_ids)
+    {
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+
+        if (!is_array($post_ids)) {
+            $post_ids_sql = explode(',', $post_ids);
+        } else {
+            $post_ids_sql = $post_ids;
+        }
+
+        switch ($feather->forum_settings['db_type']) {
+            case 'mysql':
+            case 'mysqli':
+            case 'mysql_innodb':
+            case 'mysqli_innodb': {
+                $result = \DB::for_table('search_matches')->select('word_id')
+                    ->where_in('post_id', $post_ids_sql)
+                    ->group_by('word_id')
+                    ->find_many();
+
+                if ($result) {
+                    $word_ids = '';
+                    foreach ($result as $row) {
+                        $word_ids[] = $row['word_id'];
+                    }
+
+                    $result = \DB::for_table('search_matches')->select('word_id')
+                        ->where_in('word_id', $word_ids)
+                        ->group_by('word_id')
+                        ->having_raw('COUNT(word_id)=1')
+                        ->find_many();
+
+                    if ($result) {
+                        $word_ids = '';
+                        foreach ($result as $row) {
+                            $word_ids[] = $row['word_id'];
+                        }
+
+                        \DB::for_table('search_words')
+                            ->where_in('id', $word_ids)
+                            ->delete_many();
+                    }
+                }
+                break;
+            }
+
+            default:
+                \DB::for_table('search_matches')
+                    ->where_raw('id IN(SELECT word_id FROM ' . $feather->forum_settings['db_prefix'] . 'search_matches WHERE word_id IN(SELECT word_id FROM ' . $feather->forum_settings['db_prefix'] . 'search_matches WHERE post_id IN(' . $post_ids . ') GROUP BY word_id) GROUP BY word_id HAVING COUNT(word_id)=1)')
+                    ->delete_many();
+                break;
+
+                \DB::for_table('search_matches')
+                    ->where_in('post_id', $post_ids_sql)
+                    ->delete_many();
+        }
+    }
+}
\ No newline at end of file
diff --git a/include/functions.php b/include/functions.php
index 007c9e9e..54787b86 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -370,7 +370,9 @@ function delete_post($post_id, $topic_id)
         ->find_one()
         ->delete();
 
-    strip_search_index($post_id);
+    $search = new \FeatherBB\Search();
+
+    $search->strip_search_index($post_id);
 
     // Count number of replies in the topic
     $num_replies = \DB::for_table('posts')->where('topic_id', $topic_id)->count() - 1;
diff --git a/include/search_idx.php b/include/search_idx.php
deleted file mode 100644
index 225c3571..00000000
--- a/include/search_idx.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// The contents of this file are very much inspired by the file functions_search.php
-// from the phpBB Group forum software phpBB2 (http://www.phpbb.com)
-
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-
-// Make a regex that will match CJK or Hangul characters
-define('FEATHER_CJK_HANGUL_REGEX', '['.
-    '\x{1100}-\x{11FF}'.        // Hangul Jamo							1100-11FF		(http://www.fileformat.info/info/unicode/block/hangul_jamo/index.htm)
-    '\x{3130}-\x{318F}'.        // Hangul Compatibility Jamo			3130-318F		(http://www.fileformat.info/info/unicode/block/hangul_compatibility_jamo/index.htm)
-    '\x{AC00}-\x{D7AF}'.        // Hangul Syllables						AC00-D7AF		(http://www.fileformat.info/info/unicode/block/hangul_syllables/index.htm)
-
-    // Hiragana
-    '\x{3040}-\x{309F}'.        // Hiragana								3040-309F		(http://www.fileformat.info/info/unicode/block/hiragana/index.htm)
-
-    // Katakana
-    '\x{30A0}-\x{30FF}'.        // Katakana								30A0-30FF		(http://www.fileformat.info/info/unicode/block/katakana/index.htm)
-    '\x{31F0}-\x{31FF}'.        // Katakana Phonetic Extensions			31F0-31FF		(http://www.fileformat.info/info/unicode/block/katakana_phonetic_extensions/index.htm)
-
-    // CJK Unified Ideographs	(http://en.wikipedia.org/wiki/CJK_Unified_Ideographs)
-    '\x{2E80}-\x{2EFF}'.        // CJK Radicals Supplement				2E80-2EFF		(http://www.fileformat.info/info/unicode/block/cjk_radicals_supplement/index.htm)
-    '\x{2F00}-\x{2FDF}'.        // Kangxi Radicals						2F00-2FDF		(http://www.fileformat.info/info/unicode/block/kangxi_radicals/index.htm)
-    '\x{2FF0}-\x{2FFF}'.        // Ideographic Description Characters	2FF0-2FFF		(http://www.fileformat.info/info/unicode/block/ideographic_description_characters/index.htm)
-    '\x{3000}-\x{303F}'.        // CJK Symbols and Punctuation			3000-303F		(http://www.fileformat.info/info/unicode/block/cjk_symbols_and_punctuation/index.htm)
-    '\x{31C0}-\x{31EF}'.        // CJK Strokes							31C0-31EF		(http://www.fileformat.info/info/unicode/block/cjk_strokes/index.htm)
-    '\x{3200}-\x{32FF}'.        // Enclosed CJK Letters and Months		3200-32FF		(http://www.fileformat.info/info/unicode/block/enclosed_cjk_letters_and_months/index.htm)
-    '\x{3400}-\x{4DBF}'.        // CJK Unified Ideographs Extension A	3400-4DBF		(http://www.fileformat.info/info/unicode/block/cjk_unified_ideographs_extension_a/index.htm)
-    '\x{4E00}-\x{9FFF}'.        // CJK Unified Ideographs				4E00-9FFF		(http://www.fileformat.info/info/unicode/block/cjk_unified_ideographs/index.htm)
-    '\x{20000}-\x{2A6DF}'.        // CJK Unified Ideographs Extension B	20000-2A6DF		(http://www.fileformat.info/info/unicode/block/cjk_unified_ideographs_extension_b/index.htm)
-']');
-
-
-//
-// "Cleans up" a text string and returns an array of unique words
-// This function depends on the current locale setting
-//
-function split_words($text, $idx)
-{
-    // Remove BBCode
-    $text = preg_replace('%\[/?(b|u|s|ins|del|em|i|h|colou?r|quote|code|img|url|email|list|topic|post|forum|user)(?:\=[^\]]*)?\]%', ' ', $text);
-
-    // Remove any apostrophes or dashes which aren't part of words
-    $text = substr(ucp_preg_replace('%((?<=[^\p{L}\p{N}])[\'\-]|[\'\-](?=[^\p{L}\p{N}]))%u', '', ' '.$text.' '), 1, -1);
-
-    // Remove punctuation and symbols (actually anything that isn't a letter or number), allow apostrophes and dashes (and % * if we aren't indexing)
-    $text = ucp_preg_replace('%(?![\'\-'.($idx ? '' : '\%\*').'])[^\p{L}\p{N}]+%u', ' ', $text);
-
-    // Replace multiple whitespace or dashes
-    $text = preg_replace('%(\s){2,}%u', '\1', $text);
-
-    // Fill an array with all the words
-    $words = array_unique(explode(' ', $text));
-
-    // Remove any words that should not be indexed
-    foreach ($words as $key => $value) {
-        // If the word shouldn't be indexed, remove it
-        if (!validate_search_word($value, $idx)) {
-            unset($words[$key]);
-        }
-    }
-
-    return $words;
-}
-
-
-//
-// Checks if a word is a valid searchable word
-//
-function validate_search_word($word, $idx)
-{
-    static $stopwords;
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    // If the word is a keyword we don't want to index it, but we do want to be allowed to search it
-    if (is_keyword($word)) {
-        return !$idx;
-    }
-
-    if (!isset($stopwords)) {
-        if (!$feather->cache->isCached('stopwords')) {
-            $feather->cache->store('stopwords', \model\cache::get_config(), '+1 week');
-        }
-        $stopwords = $feather->cache->retrieve('stopwords');
-    }
-
-    // If it is a stopword it isn't valid
-    if (in_array($word, $stopwords)) {
-        return false;
-    }
-
-    // If the word is CJK we don't want to index it, but we do want to be allowed to search it
-    if (is_cjk($word)) {
-        return !$idx;
-    }
-
-    // Exclude % and * when checking whether current word is valid
-    $word = str_replace(array('%', '*'), '', $word);
-
-    // Check the word is within the min/max length
-    $num_chars = feather_strlen($word);
-    return $num_chars >= FEATHER_SEARCH_MIN_WORD && $num_chars <= FEATHER_SEARCH_MAX_WORD;
-}
-
-
-//
-// Check a given word is a search keyword.
-//
-function is_keyword($word)
-{
-    return $word == 'and' || $word == 'or' || $word == 'not';
-}
-
-
-//
-// Check if a given word is CJK or Hangul.
-//
-function is_cjk($word)
-{
-    return preg_match('%^'.FEATHER_CJK_HANGUL_REGEX.'+$%u', $word) ? true : false;
-}
-
-
-//
-// Strip [img] [url] and [email] out of the message so we don't index their contents
-//
-function strip_bbcode($text)
-{
-    static $patterns;
-
-    if (!isset($patterns)) {
-        $patterns = array(
-            '%\[img=([^\]]*+)\]([^[]*+)\[/img\]%'                                    =>    '$2 $1',    // Keep the url and description
-            '%\[(url|email)=([^\]]*+)\]([^[]*+(?:(?!\[/\1\])\[[^[]*+)*)\[/\1\]%'    =>    '$2 $3',    // Keep the url and text
-            '%\[(img|url|email)\]([^[]*+(?:(?!\[/\1\])\[[^[]*+)*)\[/\1\]%'            =>    '$2',        // Keep the url
-            '%\[(topic|post|forum|user)\][1-9]\d*\[/\1\]%'                            =>    ' ',        // Do not index topic/post/forum/user ID
-        );
-    }
-
-    return preg_replace(array_keys($patterns), array_values($patterns), $text);
-}
-
-
-//
-// Updates the search index with the contents of $post_id (and $subject)
-//
-function update_search_index($mode, $post_id, $message, $subject = null)
-{
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    $message = utf8_strtolower($message);
-    $subject = utf8_strtolower($subject);
-
-    // Remove any bbcode that we shouldn't index
-    $message = strip_bbcode($message);
-
-    // Split old and new post/subject to obtain array of 'words'
-    $words_message = split_words($message, true);
-    $words_subject = ($subject) ? split_words($subject, true) : array();
-
-    if ($mode == 'edit') {
-        $select_update_search_index = array('w.id', 'w.word', 'm.subject_match');
-        $result = \DB::for_table('search_words')->table_alias('w')
-                        ->select_many($select_update_search_index)
-                        ->inner_join('search_matches', array('w.id', '=', 'm.word_id'), 'm')
-                        ->where('m.post_id', $post_id)
-                        ->find_many();
-
-        // Declare here to stop array_keys() and array_diff() from complaining if not set
-        $cur_words['post'] = array();
-        $cur_words['subject'] = array();
-
-        foreach ($result as $row) {
-            $match_in = ($row['subject_match']) ? 'subject' : 'post';
-            $cur_words[$match_in][$row['word']] = $row['id'];
-        }
-
-        $pdo = \DB::get_db();
-        $pdo = null;
-
-        $words['add']['post'] = array_diff($words_message, array_keys($cur_words['post']));
-        $words['add']['subject'] = array_diff($words_subject, array_keys($cur_words['subject']));
-        $words['del']['post'] = array_diff(array_keys($cur_words['post']), $words_message);
-        $words['del']['subject'] = array_diff(array_keys($cur_words['subject']), $words_subject);
-    } else {
-        $words['add']['post'] = $words_message;
-        $words['add']['subject'] = $words_subject;
-        $words['del']['post'] = array();
-        $words['del']['subject'] = array();
-    }
-
-    unset($words_message);
-    unset($words_subject);
-
-    // Get unique words from the above arrays
-    $unique_words = array_unique(array_merge($words['add']['post'], $words['add']['subject']));
-
-    if (!empty($unique_words)) {
-        $select_unique_words = array('id', 'word');
-        $result = \DB::for_table('search_words')->select_many($select_unique_words)
-                        ->where_in('word', $unique_words)
-                        ->find_many();
-
-        $word_ids = array();
-        foreach ($result as $row) {
-            $word_ids[$row['word']] = $row['id'];
-        }
-
-        $pdo = \DB::get_db();
-        $pdo = null;
-
-        $new_words = array_values(array_diff($unique_words, array_keys($word_ids)));
-
-        unset($unique_words);
-
-        if (!empty($new_words)) {
-            switch ($feather->forum_settings['db_type']) {
-                case 'mysql':
-                case 'mysqli':
-                case 'mysql_innodb':
-                case 'mysqli_innodb':
-                    // Quite dirty, right? :-)
-                    $placeholders = rtrim(str_repeat('(?), ', count($new_words)), ', ');
-                    \DB::for_table('search_words')
-                        ->raw_execute('INSERT INTO '.$feather->forum_settings['db_prefix'].'search_words (word) VALUES '.$placeholders, $new_words);
-                    break;
-
-                default:
-                    foreach ($new_words as $word) {
-                        $word_insert['word'] = $word;
-                        \DB::for_table('search_words')
-                            ->create()
-                            ->set($word_insert)
-                            ->save();
-                    }
-                    break;
-            }
-        }
-
-        unset($new_words);
-    }
-
-    // Delete matches (only if editing a post)
-    foreach ($words['del'] as $match_in => $wordlist) {
-        $subject_match = ($match_in == 'subject') ? 1 : 0;
-
-        if (!empty($wordlist)) {
-
-            $sql = array();
-            foreach ($wordlist as $word) {
-                $sql[] = $cur_words[$match_in][$word];
-            }
-
-            \DB::for_table('search_matches')
-                    ->where_in('word_id', $sql)
-                    ->where('post_id', $post_id)
-                    ->where('subject_match', $subject_match)
-                    ->delete_many();
-        }
-    }
-
-    // Add new matches
-    foreach ($words['add'] as $match_in => $wordlist) {
-        $subject_match = ($match_in == 'subject') ? 1 : 0;
-
-        if (!empty($wordlist)) {
-            $wordlist = array_values($wordlist);
-            $placeholders = rtrim(str_repeat('?, ', count($wordlist)), ', ');
-            \DB::for_table('search_words')
-                ->raw_execute('INSERT INTO '.$feather->forum_settings['db_prefix'].'search_matches (post_id, word_id, subject_match) SELECT '.$post_id.', id, '.$subject_match.' FROM '.$feather->forum_settings['db_prefix'].'search_words WHERE word IN ('.$placeholders.')', $wordlist);
-        }
-    }
-
-    unset($words);
-}
-
-
-//
-// Strip search index of indexed words in $post_ids
-//
-function strip_search_index($post_ids)
-{
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    if (!is_array($post_ids)) {
-        $post_ids_sql = explode(',', $post_ids);
-    }
-    else {
-        $post_ids_sql = $post_ids;
-    }
-
-    switch ($feather->forum_settings['db_type']) {
-        case 'mysql':
-        case 'mysqli':
-        case 'mysql_innodb':
-        case 'mysqli_innodb':
-        {
-            $result = \DB::for_table('search_matches')->select('word_id')
-                ->where_in('post_id', $post_ids_sql)
-                ->group_by('word_id')
-                ->find_many();
-
-            if ($result) {
-                $word_ids = '';
-                foreach ($result as $row) {
-                    $word_ids[] = $row['word_id'];
-                }
-
-                $result = \DB::for_table('search_matches')->select('word_id')
-                                    ->where_in('word_id', $word_ids)
-                                    ->group_by('word_id')
-                                    ->having_raw('COUNT(word_id)=1')
-                                    ->find_many();
-
-                if ($result) {
-                    $word_ids = '';
-                    foreach ($result as $row) {
-                        $word_ids[] = $row['word_id'];
-                    }
-
-                    \DB::for_table('search_words')
-                        ->where_in('id', $word_ids)
-                        ->delete_many();
-                }
-            }
-            break;
-        }
-
-        default:
-            \DB::for_table('search_matches')
-                ->where_raw('id IN(SELECT word_id FROM '.$feather->forum_settings['db_prefix'].'search_matches WHERE word_id IN(SELECT word_id FROM '.$feather->forum_settings['db_prefix'].'search_matches WHERE post_id IN('.$post_ids.') GROUP BY word_id) GROUP BY word_id HAVING COUNT(word_id)=1)')
-                ->delete_many();
-            break;
-
-        \DB::for_table('search_matches')
-            ->where_in('post_id', $post_ids_sql)
-            ->delete_many();
-    }
-}
diff --git a/model/admin/maintenance.php b/model/admin/maintenance.php
index 92f92461..913fc563 100644
--- a/model/admin/maintenance.php
+++ b/model/admin/maintenance.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
+        $this->search = new \FeatherBB\Search();
     }
 
     public function rebuild()
@@ -64,13 +65,11 @@ public function get_query_str()
         $start_at = $this->request->get('i_start_at') ? intval($this->request->get('i_start_at')) : 0;
         $start_at = $this->hook->fire('maintenance.get_query_str.start_at', $start_at);
 
-        require FEATHER_ROOT.'include/search_idx.php';
-
         // Fetch posts to process this cycle
-        $select_get_query_str = array('p.id', 'p.message', 't.subject', 't.first_post_id');
+        $result['select'] = array('p.id', 'p.message', 't.subject', 't.first_post_id');
 
         $result = DB::for_table('posts')->table_alias('p')
-                        ->select_many($select_get_query_str)
+                        ->select_many($result['select'])
                         ->inner_join('topics', array('t.id', '=', 'p.topic_id'), 't')
                         ->where_gte('p.id', $start_at)
                         ->order_by_asc('p.id')
@@ -83,9 +82,9 @@ public function get_query_str()
             echo '<p><span>'.sprintf(__('Processing post'), $cur_item['id']).'</span></p>'."\n";
 
             if ($cur_item['id'] == $cur_item['first_post_id']) {
-                update_search_index('post', $cur_item['id'], $cur_item['message'], $cur_item['subject']);
+                $this->search->update_search_index('post', $cur_item['id'], $cur_item['message'], $cur_item['subject']);
             } else {
-                update_search_index('post', $cur_item['id'], $cur_item['message']);
+                $this->search->update_search_index('post', $cur_item['id'], $cur_item['message']);
             }
 
             $end_at = $cur_item['id'];
@@ -161,8 +160,7 @@ public function prune($forum_id, $prune_sticky, $prune_date)
                         ->delete_many();
 
                 // We removed a bunch of posts, so now we have to update the search index
-                require_once FEATHER_ROOT.'include/search_idx.php';
-                strip_search_index($post_ids);
+                $this->search->strip_search_index($post_ids);
             }
         }
     }
diff --git a/model/admin/users.php b/model/admin/users.php
index 2d5da7f8..1f4e72bf 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -273,9 +273,10 @@ public function delete_users()
         if ($this->request->post('delete_users_comply')) {
             // Fetch user groups
             $user_groups = array();
-            $select_fetch_user_groups = array('id', 'group_id');
-            $result = DB::for_table('users')->select_many($select_fetch_user_groups)
-                ->where_in('id', $user_ids)
+            $result['select'] = array('id', 'group_id');
+            $result = DB::for_table('users')
+                        ->select_many($result['select'])
+                        ->where_in('id', $user_ids);
             $result = $this->hook->fireDB('model.users.delete_users.user_groups_query', $result);
             $result = $result->find_many();
 
@@ -344,7 +345,6 @@ public function delete_users()
 
             // Should we delete all posts made by these users?
             if ($this->request->post('delete_posts')) {
-                require FEATHER_ROOT.'include/search_idx.php';
                 @set_time_limit(0);
 
                 // Find all posts made by this user
diff --git a/model/delete.php b/model/delete.php
index a1983700..c79e7915 100644
--- a/model/delete.php
+++ b/model/delete.php
@@ -58,8 +58,6 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
     {
         $this->hook->fire('handle_deletion_start', $is_topic_post, $id, $tid, $fid);
 
-        require FEATHER_ROOT.'include/search_idx.php';
-
         if ($is_topic_post) {
             $this->hook->fire('handle_deletion_topic_post', $tid, $fid);
 
diff --git a/model/edit.php b/model/edit.php
index b1b54f47..0620aa77 100644
--- a/model/edit.php
+++ b/model/edit.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
+        $this->search = new \FeatherBB\Search();
     }
 
     // Fetch some info about the post, the topic and the forum
@@ -155,8 +156,6 @@ public function edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod)
     {
         $this->hook->fire('edit_post_start');
 
-        require FEATHER_ROOT.'include/search_idx.php';
-
         if ($can_edit_subject) {
             // Update the topic and any redirect topics
             $where_topic = array(
@@ -178,9 +177,9 @@ public function edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod)
             $query = $query->save();
 
             // We changed the subject, so we need to take that into account when we update the search words
-            update_search_index('edit', $id, $post['message'], $post['subject']);
+            $this->search->update_search_index('edit', $id, $post['message'], $post['subject']);
         } else {
-            update_search_index('edit', $id, $post['message']);
+            $this->search->update_search_index('edit', $id, $post['message']);
         }
         
         // Update the post
diff --git a/model/moderate.php b/model/moderate.php
index 1b1949f5..36a02d82 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
+        $this->search = new \FeatherBB\Search();
     }
 
     public function display_ip_info($ip)
@@ -124,8 +125,7 @@ public function delete_posts($tid, $fid, $p = null)
             $delete_posts = $this->hook->fireDB('delete_posts_query', $delete_posts);
             $delete_posts = $delete_posts->delete_many();
 
-            require FEATHER_ROOT.'include/search_idx.php';
-            strip_search_index($posts);
+            $this->search->strip_search_index($posts);
 
             // Get last_post, last_post_id, and last_poster for the topic after deletion
             $last_post['select'] = array('id', 'poster', 'posted');
@@ -748,8 +748,6 @@ public function delete_topics($topics, $fid)
             message(__('Bad request'), '404');
         }
 
-        require FEATHER_ROOT.'include/search_idx.php';
-
         $topics_sql = explode(',', $topics);
 
         // Verify that the topic IDs are valid
@@ -808,7 +806,7 @@ public function delete_topics($topics, $fid)
 
         // We have to check that we actually have a list of post IDs since we could be deleting just a redirect topic
         if ($post_ids != '') {
-            strip_search_index($post_ids);
+            $this->search->strip_search_index($post_ids);
         }
 
         // Delete posts
diff --git a/model/post.php b/model/post.php
index 7b333e7f..be330c1a 100644
--- a/model/post.php
+++ b/model/post.php
@@ -22,6 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
         $this->email = new \FeatherBB\Email();
+        $this->search = new \FeatherBB\Search();
     }
  
     //  Get some info about the post
@@ -326,7 +327,7 @@ public function insert_reply($post, $tid, $cur_posting, $is_subscribed)
         $topic = $this->hook->fireDB('insert_reply_update_query', $topic);
         $topic = $topic->save();
 
-        update_search_index('post', $new['pid'], $post['message']);
+        $this->search->update_search_index('post', $new['pid'], $post['message']);
 
         update_forum($cur_posting['id']);
 
@@ -542,7 +543,7 @@ public function insert_topic($post, $fid)
         $topic = $this->hook->fireDB('insert_topic_post_topic', $topic);
         $topic = $topic->save();
 
-        update_search_index('post', $new['pid'], $post['message'], $post['subject']);
+        $this->search->update_search_index('post', $new['pid'], $post['message'], $post['subject']);
 
         update_forum($fid);
 
diff --git a/model/profile.php b/model/profile.php
index 523716cc..917e0433 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -666,7 +666,6 @@ public function delete_user($id)
 
             // Should we delete all posts made by this user?
             if ($this->request->post('delete_posts')) {
-                require FEATHER_ROOT.'include/search_idx.php';
                 // Hold on, this could take some time!
                 @set_time_limit(0);
 
diff --git a/model/search.php b/model/search.php
index da5f93a0..8facdca0 100644
--- a/model/search.php
+++ b/model/search.php
@@ -21,6 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
+        $this->search = new \FeatherBB\Search();
     }
 
     public function get_search_results()
@@ -54,7 +55,7 @@ public function get_search_results()
             $keywords = ($this->request->get('keywords')) ? utf8_strtolower(feather_trim($this->request->get('keywords'))) : null;
             $author = ($this->request->get('author')) ? utf8_strtolower(feather_trim($this->request->get('author'))) : null;
 
-            if (preg_match('%^[\*\%]+$%', $keywords) || (feather_strlen(str_replace(array('*', '%'), '', $keywords)) < FEATHER_SEARCH_MIN_WORD && !is_cjk($keywords))) {
+            if (preg_match('%^[\*\%]+$%', $keywords) || (feather_strlen(str_replace(array('*', '%'), '', $keywords)) < FEATHER_SEARCH_MIN_WORD && !$this->search->is_cjk($keywords))) {
                 $keywords = '';
             }
 
@@ -175,7 +176,7 @@ public function get_search_results()
                 // If it's a search for keywords
                 if ($keywords) {
                     // split the keywords into words
-                    $keywords_array = split_words($keywords, false);
+                    $keywords_array = $this->search->split_words($keywords, false);
                     $keywords_array = $this->hook->fire('get_search_results_keywords_array', $keywords_array);
 
                     if (empty($keywords_array)) {
@@ -200,7 +201,7 @@ public function get_search_results()
 
                             default:
                             {
-                                if (is_cjk($cur_word)) {
+                                if ($this->search->is_cjk($cur_word)) {
                                     $where_cond = str_replace('*', '%', $cur_word);
                                     $where_cond_cjk = ($search_in ? (($search_in > 0) ? 'p.message LIKE %:where_cond%' : 't.subject LIKE %:where_cond%') : 'p.message LIKE %:where_cond% OR t.subject LIKE %:where_cond%');
 

From fab6ee53cdd53544eb620f16a1a6f655dc3eeaa7 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 26 Aug 2015 17:59:16 +0200
Subject: [PATCH 183/353] Move POMO lib

---
 include/classes/core.class.php                                  | 2 +-
 include/{ => classes}/pomo/.editorconfig                        | 0
 include/{ => classes}/pomo/MO.php                               | 0
 include/{ => classes}/pomo/PO.php                               | 0
 include/{ => classes}/pomo/Streams/CachedFileReader.php         | 0
 include/{ => classes}/pomo/Streams/CachedIntFileReader.php      | 0
 include/{ => classes}/pomo/Streams/FileReader.php               | 0
 include/{ => classes}/pomo/Streams/Reader.php                   | 0
 include/{ => classes}/pomo/Streams/StringReader.php             | 0
 include/{ => classes}/pomo/Translations/EntryTranslations.php   | 0
 include/{ => classes}/pomo/Translations/GettextTranslations.php | 0
 include/{ => classes}/pomo/Translations/NOOPTranslations.php    | 0
 include/{ => classes}/pomo/Translations/Translations.php        | 0
 .../{ => classes}/pomo/Translations/TranslationsInterface.php   | 0
 14 files changed, 1 insertion(+), 1 deletion(-)
 rename include/{ => classes}/pomo/.editorconfig (100%)
 rename include/{ => classes}/pomo/MO.php (100%)
 rename include/{ => classes}/pomo/PO.php (100%)
 rename include/{ => classes}/pomo/Streams/CachedFileReader.php (100%)
 rename include/{ => classes}/pomo/Streams/CachedIntFileReader.php (100%)
 rename include/{ => classes}/pomo/Streams/FileReader.php (100%)
 rename include/{ => classes}/pomo/Streams/Reader.php (100%)
 rename include/{ => classes}/pomo/Streams/StringReader.php (100%)
 rename include/{ => classes}/pomo/Translations/EntryTranslations.php (100%)
 rename include/{ => classes}/pomo/Translations/GettextTranslations.php (100%)
 rename include/{ => classes}/pomo/Translations/NOOPTranslations.php (100%)
 rename include/{ => classes}/pomo/Translations/Translations.php (100%)
 rename include/{ => classes}/pomo/Translations/TranslationsInterface.php (100%)

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index fb86f11e..0f987704 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -43,7 +43,7 @@ public function __construct(array $data)
         // Load files
         require $this->forum_env['FEATHER_ROOT'].'include/utf8/utf8.php';
         require $this->forum_env['FEATHER_ROOT'].'include/functions.php';
-        require $this->forum_env['FEATHER_ROOT'].'include/pomo/MO.php';
+        require $this->forum_env['FEATHER_ROOT'].'include/classes/pomo/MO.php';
         require $this->forum_env['FEATHER_ROOT'].'include/l10n.php';
         require $this->forum_env['FEATHER_ROOT'].'include/classes/database.class.php';
         require $this->forum_env['FEATHER_ROOT'].'plugins/test/plugintest.php';
diff --git a/include/pomo/.editorconfig b/include/classes/pomo/.editorconfig
similarity index 100%
rename from include/pomo/.editorconfig
rename to include/classes/pomo/.editorconfig
diff --git a/include/pomo/MO.php b/include/classes/pomo/MO.php
similarity index 100%
rename from include/pomo/MO.php
rename to include/classes/pomo/MO.php
diff --git a/include/pomo/PO.php b/include/classes/pomo/PO.php
similarity index 100%
rename from include/pomo/PO.php
rename to include/classes/pomo/PO.php
diff --git a/include/pomo/Streams/CachedFileReader.php b/include/classes/pomo/Streams/CachedFileReader.php
similarity index 100%
rename from include/pomo/Streams/CachedFileReader.php
rename to include/classes/pomo/Streams/CachedFileReader.php
diff --git a/include/pomo/Streams/CachedIntFileReader.php b/include/classes/pomo/Streams/CachedIntFileReader.php
similarity index 100%
rename from include/pomo/Streams/CachedIntFileReader.php
rename to include/classes/pomo/Streams/CachedIntFileReader.php
diff --git a/include/pomo/Streams/FileReader.php b/include/classes/pomo/Streams/FileReader.php
similarity index 100%
rename from include/pomo/Streams/FileReader.php
rename to include/classes/pomo/Streams/FileReader.php
diff --git a/include/pomo/Streams/Reader.php b/include/classes/pomo/Streams/Reader.php
similarity index 100%
rename from include/pomo/Streams/Reader.php
rename to include/classes/pomo/Streams/Reader.php
diff --git a/include/pomo/Streams/StringReader.php b/include/classes/pomo/Streams/StringReader.php
similarity index 100%
rename from include/pomo/Streams/StringReader.php
rename to include/classes/pomo/Streams/StringReader.php
diff --git a/include/pomo/Translations/EntryTranslations.php b/include/classes/pomo/Translations/EntryTranslations.php
similarity index 100%
rename from include/pomo/Translations/EntryTranslations.php
rename to include/classes/pomo/Translations/EntryTranslations.php
diff --git a/include/pomo/Translations/GettextTranslations.php b/include/classes/pomo/Translations/GettextTranslations.php
similarity index 100%
rename from include/pomo/Translations/GettextTranslations.php
rename to include/classes/pomo/Translations/GettextTranslations.php
diff --git a/include/pomo/Translations/NOOPTranslations.php b/include/classes/pomo/Translations/NOOPTranslations.php
similarity index 100%
rename from include/pomo/Translations/NOOPTranslations.php
rename to include/classes/pomo/Translations/NOOPTranslations.php
diff --git a/include/pomo/Translations/Translations.php b/include/classes/pomo/Translations/Translations.php
similarity index 100%
rename from include/pomo/Translations/Translations.php
rename to include/classes/pomo/Translations/Translations.php
diff --git a/include/pomo/Translations/TranslationsInterface.php b/include/classes/pomo/Translations/TranslationsInterface.php
similarity index 100%
rename from include/pomo/Translations/TranslationsInterface.php
rename to include/classes/pomo/Translations/TranslationsInterface.php

From 66e6555430cad5813aa187cc820c608eab2b845b Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 26 Aug 2015 18:00:19 +0200
Subject: [PATCH 184/353] Use DB

---
 include/classes/search.class.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/include/classes/search.class.php b/include/classes/search.class.php
index c802ffe2..7eacc72a 100644
--- a/include/classes/search.class.php
+++ b/include/classes/search.class.php
@@ -11,6 +11,7 @@
 // from the phpBB Group forum software phpBB2 (http://www.phpbb.com)
 
 namespace FeatherBB;
+use DB;
 
 class Search
 {
@@ -177,7 +178,7 @@ public function update_search_index($mode, $post_id, $message, $subject = null)
 
         if ($mode == 'edit') {
             $select_update_search_index = array('w.id', 'w.word', 'm.subject_match');
-            $result = \DB::for_table('search_words')->table_alias('w')
+            $result = DB::for_table('search_words')->table_alias('w')
                 ->select_many($select_update_search_index)
                 ->inner_join('search_matches', array('w.id', '=', 'm.word_id'), 'm')
                 ->where('m.post_id', $post_id)
@@ -192,7 +193,7 @@ public function update_search_index($mode, $post_id, $message, $subject = null)
                 $cur_words[$match_in][$row['word']] = $row['id'];
             }
 
-            $pdo = \DB::get_db();
+            $pdo = DB::get_db();
             $pdo = null;
 
             $words['add']['post'] = array_diff($words_message, array_keys($cur_words['post']));
@@ -214,7 +215,7 @@ public function update_search_index($mode, $post_id, $message, $subject = null)
 
         if (!empty($unique_words)) {
             $select_unique_words = array('id', 'word');
-            $result = \DB::for_table('search_words')->select_many($select_unique_words)
+            $result = DB::for_table('search_words')->select_many($select_unique_words)
                 ->where_in('word', $unique_words)
                 ->find_many();
 
@@ -223,7 +224,7 @@ public function update_search_index($mode, $post_id, $message, $subject = null)
                 $word_ids[$row['word']] = $row['id'];
             }
 
-            $pdo = \DB::get_db();
+            $pdo = DB::get_db();
             $pdo = null;
 
             $new_words = array_values(array_diff($unique_words, array_keys($word_ids)));
@@ -238,14 +239,14 @@ public function update_search_index($mode, $post_id, $message, $subject = null)
                     case 'mysqli_innodb':
                         // Quite dirty, right? :-)
                         $placeholders = rtrim(str_repeat('(?), ', count($new_words)), ', ');
-                        \DB::for_table('search_words')
+                        DB::for_table('search_words')
                             ->raw_execute('INSERT INTO ' . $feather->forum_settings['db_prefix'] . 'search_words (word) VALUES ' . $placeholders, $new_words);
                         break;
 
                     default:
                         foreach ($new_words as $word) {
                             $word_insert['word'] = $word;
-                            \DB::for_table('search_words')
+                            DB::for_table('search_words')
                                 ->create()
                                 ->set($word_insert)
                                 ->save();
@@ -268,7 +269,7 @@ public function update_search_index($mode, $post_id, $message, $subject = null)
                     $sql[] = $cur_words[$match_in][$word];
                 }
 
-                \DB::for_table('search_matches')
+                DB::for_table('search_matches')
                     ->where_in('word_id', $sql)
                     ->where('post_id', $post_id)
                     ->where('subject_match', $subject_match)
@@ -283,7 +284,7 @@ public function update_search_index($mode, $post_id, $message, $subject = null)
             if (!empty($wordlist)) {
                 $wordlist = array_values($wordlist);
                 $placeholders = rtrim(str_repeat('?, ', count($wordlist)), ', ');
-                \DB::for_table('search_words')
+                DB::for_table('search_words')
                     ->raw_execute('INSERT INTO ' . $feather->forum_settings['db_prefix'] . 'search_matches (post_id, word_id, subject_match) SELECT ' . $post_id . ', id, ' . $subject_match . ' FROM ' . $feather->forum_settings['db_prefix'] . 'search_words WHERE word IN (' . $placeholders . ')', $wordlist);
             }
         }
@@ -311,7 +312,7 @@ public function strip_search_index($post_ids)
             case 'mysqli':
             case 'mysql_innodb':
             case 'mysqli_innodb': {
-                $result = \DB::for_table('search_matches')->select('word_id')
+                $result = DB::for_table('search_matches')->select('word_id')
                     ->where_in('post_id', $post_ids_sql)
                     ->group_by('word_id')
                     ->find_many();
@@ -322,7 +323,7 @@ public function strip_search_index($post_ids)
                         $word_ids[] = $row['word_id'];
                     }
 
-                    $result = \DB::for_table('search_matches')->select('word_id')
+                    $result = DB::for_table('search_matches')->select('word_id')
                         ->where_in('word_id', $word_ids)
                         ->group_by('word_id')
                         ->having_raw('COUNT(word_id)=1')
@@ -334,7 +335,7 @@ public function strip_search_index($post_ids)
                             $word_ids[] = $row['word_id'];
                         }
 
-                        \DB::for_table('search_words')
+                        DB::for_table('search_words')
                             ->where_in('id', $word_ids)
                             ->delete_many();
                     }
@@ -343,12 +344,12 @@ public function strip_search_index($post_ids)
             }
 
             default:
-                \DB::for_table('search_matches')
+                DB::for_table('search_matches')
                     ->where_raw('id IN(SELECT word_id FROM ' . $feather->forum_settings['db_prefix'] . 'search_matches WHERE word_id IN(SELECT word_id FROM ' . $feather->forum_settings['db_prefix'] . 'search_matches WHERE post_id IN(' . $post_ids . ') GROUP BY word_id) GROUP BY word_id HAVING COUNT(word_id)=1)')
                     ->delete_many();
                 break;
 
-                \DB::for_table('search_matches')
+                DB::for_table('search_matches')
                     ->where_in('post_id', $post_ids_sql)
                     ->delete_many();
         }

From 2cae9b0bc88dd61f90ac22b488e8b51531bc1e98 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 26 Aug 2015 18:08:18 +0200
Subject: [PATCH 185/353] Add setcookie to auth model

---
 include/classes/auth.class.php |  4 ++--
 include/functions.php          | 15 ---------------
 model/auth.php                 | 14 ++++++++++++++
 model/login.php                |  5 +++--
 model/profile.php              |  3 ++-
 model/register.php             |  3 ++-
 6 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index 06324b40..141f2e43 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -236,7 +236,7 @@ public function call()
             if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'style/'.$this->app->user->style.'.css')) {
                 $this->app->user->style = $this->app->forum_settings['o_default_style'];
             }
-            feather_setcookie($this->app->user->id, $this->app->user->password, $expires);
+            $this->model->feather_setcookie($this->app->user->id, $this->app->user->password, $expires);
             $this->update_online();
         } else {
             $this->app->user = $this->model->load_user(1);
@@ -274,7 +274,7 @@ public function call()
                      ->update_many('logged', time());
             }
 
-            feather_setcookie(1, feather_hash(uniqid(rand(), true)), $this->app->now + 31536000);
+            $this->model->feather_setcookie(1, feather_hash(uniqid(rand(), true)), $this->app->now + 31536000);
         }
 
         load_textdomain('featherbb', $this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.mo');
diff --git a/include/functions.php b/include/functions.php
index 54787b86..09330114 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -84,21 +84,6 @@ function get_admin_ids()
 }
 
 
-//
-// Wrapper for Slim setCookie method
-//
-function feather_setcookie($user_id, $password, $expires)
-{
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-    $cookie_data = array('user_id' => $user_id,
-        'password_hash' => hash_hmac('sha1', $password, $feather->forum_settings['cookie_seed'].'_password_hash'),
-        'expires' => $expires,
-        'checksum' => hash_hmac('sha1', $user_id.$expires, $feather->forum_settings['cookie_seed'].'_checksum'));
-    $feather->setCookie($feather->forum_settings['cookie_name'], json_encode($cookie_data), $expires);
-}
-
-
 //
 // Check username
 //
diff --git a/model/auth.php b/model/auth.php
index 2b11849e..f59830ff 100644
--- a/model/auth.php
+++ b/model/auth.php
@@ -39,4 +39,18 @@ public function load_user($user_id)
             return $user;
         }
     }
+
+    //
+    // Wrapper for Slim setCookie method
+    //
+    public function feather_setcookie($user_id, $password, $expires)
+    {
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+        $cookie_data = array('user_id' => $user_id,
+            'password_hash' => hash_hmac('sha1', $password, $feather->forum_settings['cookie_seed'].'_password_hash'),
+            'expires' => $expires,
+            'checksum' => hash_hmac('sha1', $user_id.$expires, $feather->forum_settings['cookie_seed'].'_checksum'));
+        $feather->setCookie($feather->forum_settings['cookie_name'], json_encode($cookie_data), $expires);
+    }
 }
diff --git a/model/login.php b/model/login.php
index 7bbdacff..c52b4cf8 100644
--- a/model/login.php
+++ b/model/login.php
@@ -22,6 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
         $this->email = new \FeatherBB\Email();
+        $this->auth = new \model\auth();
     }
 
     public function login()
@@ -74,7 +75,7 @@ public function login()
 
         $expire = ($save_pass == '1') ? time() + 1209600 : time() + $this->config['o_timeout_visit'];
         $expire = $this->hook->fire('expire_login', $expire);
-        feather_setcookie($user->id, $form_password_hash, $expire);
+        $this->auth->feather_setcookie($user->id, $form_password_hash, $expire);
 
         // Reset tracked topics
         set_tracked_topics(null);
@@ -111,7 +112,7 @@ public function logout($id, $token)
 
         $this->hook->fire('logout_end');
 
-        feather_setcookie(1, feather_hash(uniqid(rand(), true)), time() + 31536000);
+        $this->auth->feather_setcookie(1, feather_hash(uniqid(rand(), true)), time() + 31536000);
 
         redirect(get_base_url(), __('Logout redirect'));
     }
diff --git a/model/profile.php b/model/profile.php
index 917e0433..a40b1da1 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -22,6 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
         $this->email = new \FeatherBB\Email();
+        $this->auth = new \model\auth();
     }
 
     public function change_pass($id)
@@ -130,7 +131,7 @@ public function change_pass($id)
             $update_password = $update_password->save();
 
             if ($this->user->id == $id) {
-                feather_setcookie($this->user->id, $new_password_hash, time() + $this->config['o_timeout_visit']);
+                $this->auth->feather_setcookie($this->user->id, $new_password_hash, time() + $this->config['o_timeout_visit']);
             }
 
             $this->hook->fire('change_pass');
diff --git a/model/register.php b/model/register.php
index ca30f1a2..d775cdd4 100644
--- a/model/register.php
+++ b/model/register.php
@@ -22,6 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
         $this->email = new \FeatherBB\Email();
+        $this->auth = new \model\auth();
     }
 
     public function check_for_errors()
@@ -264,7 +265,7 @@ public function insert_user($user)
             message(__('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
         }
 
-        feather_setcookie($new_uid, $password_hash, time() + $this->config['o_timeout_visit']);
+        $this->auth->feather_setcookie($new_uid, $password_hash, time() + $this->config['o_timeout_visit']);
 
         $this->hook->fire('insert_user');
 

From c50466dbb4f14249d7b94326813a68a82332728e Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 18:40:23 +0200
Subject: [PATCH 186/353] Use singleton for email loading

---
 include/classes/core.class.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index bddc3cbd..af26bcf0 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -46,9 +46,6 @@ public function __construct(array $data)
         require $this->forum_env['FEATHER_ROOT'].'include/pomo/MO.php';
         require $this->forum_env['FEATHER_ROOT'].'include/l10n.php';
         require $this->forum_env['FEATHER_ROOT'].'include/classes/database.class.php';
-        require $this->forum_env['FEATHER_ROOT'].'include/classes/cache.class.php';
-        require $this->forum_env['FEATHER_ROOT'].'include/classes/hooks.class.php';
-        require $this->forum_env['FEATHER_ROOT'].'include/classes/email.class.php';
         require $this->forum_env['FEATHER_ROOT'].'plugins/test/plugintest.php';
 
         // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
@@ -204,6 +201,10 @@ public function call()
         $this->app->container->singleton('hooks', function () {
             return new \FeatherBB\Hooks();
         });
+        // Load FeatherBB email class
+        $this->app->container->singleton('email', function () {
+            return new \FeatherBB\Email();
+        });
 
         if (!is_file($this->forum_env['FORUM_CONFIG_FILE'])) {
             $installer = new \controller\install;
@@ -234,9 +235,8 @@ public function call()
         // Finalize forum_settings array
         $this->forum_settings = array_merge($feather_config, $this->forum_settings);
 
-        // Set default style
+        // Set default style and assets
         $this->app->view2->setStyle($this->forum_settings['o_default_style']);
-        // Set defaults assets
         $this->app->view2->addAsset('js', 'style/FeatherBB/phone.min.js');
         $this->app->view2->addAsset('js', 'js/common.js');
 
@@ -247,9 +247,6 @@ public function call()
 
         new \plugin\plugintest();
 
-        // Email
-        $this->app->email = new \FeatherBB\Email();
-
         // Define time formats
         $forum_time_formats = array($this->forum_settings['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
         $forum_date_formats = array($this->forum_settings['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');

From 7bd6ab84ff29c409050a3b75bfb164a3ecbf2f07 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 18:58:13 +0200
Subject: [PATCH 187/353] Remove opcache reset function

---
 include/classes/core.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index 3f4810b5..296fb9a6 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -50,7 +50,6 @@ public function __construct(array $data)
 
         // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
         setlocale(LC_CTYPE, 'C');
-        opcache_reset();
 	}
 
     public static function load_default_forum_env()

From 392ba44f64251df4bcb345a14749b9b8b5c26096 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Wed, 26 Aug 2015 19:17:06 +0200
Subject: [PATCH 188/353] Patch installer to use new namespace

---
 controller/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controller/install.php b/controller/install.php
index 9f26b624..a083113e 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -166,7 +166,7 @@ public function create_config(array $data)
 
     public function create_db(array $data)
     {
-        \Slim\Extras\Middleware\FeatherBBLoader::init_db($data);
+        \FeatherBB\Core::init_db($data);
 
         // Load appropriate language
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$data['default_lang'].'/install.mo');

From 56dbb5564aa704a145cbd9a587ab60a068a21f66 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 26 Aug 2015 19:25:06 +0200
Subject: [PATCH 189/353] Better loading for emails

---
 model/admin/bans.php    | 2 +-
 model/admin/options.php | 2 +-
 model/login.php         | 2 +-
 model/misc.php          | 2 +-
 model/post.php          | 2 +-
 model/profile.php       | 2 +-
 model/register.php      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/model/admin/bans.php b/model/admin/bans.php
index 4ad60838..1fd0a997 100644
--- a/model/admin/bans.php
+++ b/model/admin/bans.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->email = new \FeatherBB\Email();
+        $this->email = $this->feather->email;
     }
 
     public function add_ban_info($id = null)
diff --git a/model/admin/options.php b/model/admin/options.php
index 0438c158..18749061 100644
--- a/model/admin/options.php
+++ b/model/admin/options.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->email = new \FeatherBB\Email();
+        $this->email = $this->feather->email;
     }
 
     public function update_options()
diff --git a/model/login.php b/model/login.php
index c52b4cf8..2aa08f95 100644
--- a/model/login.php
+++ b/model/login.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->email = new \FeatherBB\Email();
+        $this->email = $this->feather->email;
         $this->auth = new \model\auth();
     }
 
diff --git a/model/misc.php b/model/misc.php
index 8d35dca6..96479d42 100644
--- a/model/misc.php
+++ b/model/misc.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->email = new \FeatherBB\Email();
+        $this->email = $this->feather->email;
     }
  
     public function update_last_visit()
diff --git a/model/post.php b/model/post.php
index be330c1a..8cf39e2e 100644
--- a/model/post.php
+++ b/model/post.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->email = new \FeatherBB\Email();
+        $this->email = $this->feather->email;
         $this->search = new \FeatherBB\Search();
     }
  
diff --git a/model/profile.php b/model/profile.php
index a40b1da1..4b90aa02 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->email = new \FeatherBB\Email();
+        $this->email = $this->feather->email;
         $this->auth = new \model\auth();
     }
 
diff --git a/model/register.php b/model/register.php
index d775cdd4..0337425f 100644
--- a/model/register.php
+++ b/model/register.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->email = new \FeatherBB\Email();
+        $this->email = $this->feather->email;
         $this->auth = new \model\auth();
     }
 

From 550766930b11bfec26217a6b11920b57191305e7 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 26 Aug 2015 19:31:42 +0200
Subject: [PATCH 190/353] Escape default title

---
 include/classes/view.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index a886e37b..bf5b8e64 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -311,7 +311,7 @@ protected function getDefaultPageInfo()
          }
 
          return array(
-             'title' => $this->app->forum_settings['o_board_title'],
+             'title' => feather_escape($this->app->forum_settings['o_board_title']),
              'page_number' => null,
              'active_page' => 'index',
              'focus_element' => null,

From 35b3d82af29445abe0ba0800fd3f6b46cf0abf31 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 26 Aug 2015 21:30:08 +0200
Subject: [PATCH 191/353] Update CsrfGuard to work with new views

---
 include/classes/core.class.php                |  2 +-
 .../classes/csrf.class.php                    | 35 +++++--------------
 include/classes/view.class.php                |  2 ++
 index.php                                     |  8 ++---
 4 files changed, 15 insertions(+), 32 deletions(-)
 rename Slim/Extras/Middleware/CsrfGuard.php => include/classes/csrf.class.php (67%)
 mode change 100755 => 100644

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index 296fb9a6..7053b0ab 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -193,7 +193,7 @@ public function call()
                                                'extension' => '.cache'));
         });
         // Load FeatherBB view
-        $this->app->container->singleton('view2', function($container) {
+        $this->app->container->singleton('view2', function() {
             return new \FeatherBB\View();
         });
         // Load FeatherBB hooks
diff --git a/Slim/Extras/Middleware/CsrfGuard.php b/include/classes/csrf.class.php
old mode 100755
new mode 100644
similarity index 67%
rename from Slim/Extras/Middleware/CsrfGuard.php
rename to include/classes/csrf.class.php
index 6f08546b..418b1837
--- a/Slim/Extras/Middleware/CsrfGuard.php
+++ b/include/classes/csrf.class.php
@@ -11,32 +11,10 @@
  * $app->add(new \Slim\Extras\Middleware\CsrfGuard());
  *
  */
-namespace Slim\Extras\Middleware;
+namespace FeatherBB;
 
-class CsrfGuard extends \Slim\Middleware
+class Csrf extends \Slim\Middleware
 {
-    /**
-     * CSRF token key name.
-     *
-     * @var string
-     */
-    protected $key;
-
-    /**
-     * Constructor.
-     *
-     * @param string    $key        The CSRF token key name.
-     * @return void
-     */
-    public function __construct($key = 'csrf_token')
-    {
-        if (!is_string($key) || empty($key) || preg_match('/[^a-zA-Z0-9\-\_]/', $key)) {
-            throw new \OutOfBoundsException('Invalid CSRF token key "' . $key . '"');
-        }
-
-        $this->key = $key;
-    }
-
     /**
      * Call middleware.
      *
@@ -63,24 +41,27 @@ public function check() {
             throw new \Exception('Sessions are required to use the CSRF Guard middleware.');
         }
 
+        $this->key = 'featherbb_csrf';
+
         if (!isset($_SESSION[$this->key])) {
             $_SESSION[$this->key] = sha1(serialize($_SERVER) . rand(0, 0xffffffff));
         }
 
-        $token = $_SESSION[$this->key];
+        $this->token = $_SESSION[$this->key];
 
         // Validate the CSRF token.
         if (in_array($this->app->request()->getMethod(), array('POST', 'PUT', 'DELETE'))) {
             $userToken = $this->app->request()->post($this->key);
-            if ($token !== $userToken) {
+            if ($this->token !== $userToken) {
                 $this->app->halt(400, 'Invalid or missing CSRF token.');
             }
         }
 
         // Assign CSRF token key and value to view.
+        // Legacy
         $this->app->view()->appendData(array(
             'csrf_key'      => $this->key,
-            'csrf_token'    => $token,
+            'csrf_token'    => $this->token,
         ));
     }
 }
\ No newline at end of file
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index bf5b8e64..73912dd0 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -326,6 +326,8 @@ protected function getDefaultPageInfo()
              'fid' => null,
              'pid' => null,
              'tid' => null,
+             'csrf_key' => 'featherbb_csrf',
+             'csrf_token' => $this->app->csrf->token,
          );
      }
 
diff --git a/index.php b/index.php
index 6402f375..88e12d56 100644
--- a/index.php
+++ b/index.php
@@ -17,14 +17,14 @@
 require 'Slim/Slim.php';
 \Slim\Slim::registerAutoloader();
 
-// Instantiate Slim and add CSRF
-$feather = new \Slim\Slim();
-$feather->add(new \Slim\Extras\Middleware\CsrfGuard('featherbb_csrf'));
-
 // Load FeatherBB
 require 'include/classes/autoload.class.php';
 \FeatherBB\Loader::registerAutoloader();
 
+// Instantiate Slim and add CSRF
+$feather = new \Slim\Slim();
+$feather->add($feather->csrf = new \FeatherBB\Csrf());
+
 $feather_settings = array('config_file' => 'include/config.php',
                           'cache_dir' => 'cache/',
                           'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)

From 3a894e11886b731a497444b8b661442fbe87ad3f Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 26 Aug 2015 22:23:39 +0200
Subject: [PATCH 192/353] Switch view system

---
 controller/profile.php         | 141 +++++++++++++++++----------------
 controller/register.php        |  27 +++----
 controller/userlist.php        |  17 ++--
 controller/viewforum.php       |  21 ++---
 controller/viewtopic.php       |  18 ++---
 include/classes/view.class.php |  43 ++++++----
 model/post.php                 |   3 +-
 model/profile.php              |   4 +-
 model/register.php             |   1 +
 9 files changed, 150 insertions(+), 125 deletions(-)

diff --git a/controller/profile.php b/controller/profile.php
index c1b17ee6..cac4b10b 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -65,18 +65,17 @@ public function display($id, $section = null)
 
             $this->model->delete_user($id, $this->feather);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Confirm delete user'));
+            $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Confirm delete user')),
+                'active_page' => 'profile',
+            ));
 
-            $this->header->setTitle($page_title)->setActivePage('profile')->display();
-
-            $this->feather->render('profile/delete_user.php', array(
+            $this->feather->view2->display('profile/delete_user.php', array(
                                     'username' => $this->model->get_username($id),
                                     'id' => $id,
                                     )
                             );
 
-            $this->footer->display();
-
         } elseif ($this->request->post('form_sent')) {
 
             // Fetch the user group of the user we are editing
@@ -96,8 +95,6 @@ public function display($id, $section = null)
 
         $user = $this->model->get_user_info($id);
 
-        $last_post = format_time($user['last_post']);
-
         if ($user['signature'] != '') {
             require FEATHER_ROOT.'include/parser.php';
             $parsed_signature = parse_signature($user['signature']);
@@ -113,61 +110,65 @@ public function display($id, $section = null)
             // or the user is another mod
                 $user_info = $this->model->parse_user_info($user);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), sprintf(__('Users profile'), feather_escape($user['username'])));
+            $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), sprintf(__('Users profile'), feather_escape($user['username']))),
+                'active_page' => 'profile',
+            ));
 
-            $this->header->setTitle($page_title)->setActivePage('profile')->allowIndex()->display();
-
-            $this->feather->render('profile/view_profile.php', array(
+            $this->feather->view2->display('profile/view_profile.php', array(
                         'user_info' => $user_info,
                         )
                 );
-
-            $this->footer->display();
         } else {
             if (!$section || $section == 'essentials') {
                 $user_disp = $this->model->edit_essentials($id, $user);
 
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section essentials'));
-                $required_fields = array('req_username' => __('Username'), 'req_email' => __('Email'));
-
-                $this->header->setTitle($page_title)->setActivePage('profile')->setRequiredFields($required_fields)->display();
+                $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section essentials')),
+                    'required_fields' => array('req_username' => __('Username'), 'req_email' => __('Email')),
+                    'active_page' => 'profile',
+                ));
 
                 $this->model->generate_profile_menu('essentials', $id);
 
-                $this->feather->render('profile/section_essentials.php', array(
+                $this->feather->view2->display('profile/section_essentials.php', array(
                                 'feather' => $this->feather,
                                 'id' => $id,
                                 'user' => $user,
                                 'user_disp' => $user_disp,
                                 'forum_time_formats' => $forum_time_formats,
                                 'forum_date_formats' => $forum_date_formats,
-                                )
-                        );
+                                ),
+                    2);
             } elseif ($section == 'personal') {
                 if ($this->user->g_set_title == '1') {
                     $title_field = '<label>'.__('Title').' <em>('.__('Leave blank').')</em><br /><input type="text" name="title" value="'.feather_escape($user['title']).'" size="30" maxlength="50" /><br /></label>'."\n";
                 }
 
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personal'));
-
-                $this->header->setTitle($page_title)->setActivePage('profile')->display();
+                $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personal')),
+                    'active_page' => 'profile',
+                ));
 
                 $this->model->generate_profile_menu('personal', $id);
 
-                $this->feather->render('profile/section_personal.php', array(
+                $this->feather->view2->display('profile/section_personal.php', array(
                                 'user' => $user,
                                 'feather' => $this->feather,
+                                'title_field' => $title_field
                                 )
                         );
 
             } elseif ($section == 'messaging') {
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section messaging'));
 
-                $this->header->setTitle($page_title)->setActivePage('profile')->display();
+                $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section messaging')),
+                    'active_page' => 'profile',
+                ));
 
                 $this->model->generate_profile_menu('messaging', $id);
 
-                $this->feather->render('profile/section_messaging.php', array(
+                $this->feather->view2->display('profile/section_messaging.php', array(
                                 'user' => $user,
                                 )
                         );
@@ -192,13 +193,14 @@ public function display($id, $section = null)
                     $signature_preview = '<p>'.__('No sig').'</p>'."\n";
                 }
 
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personality'));
-
-                $this->header->setTitle($page_title)->setActivePage('profile')->display();
+                $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personality')),
+                    'active_page' => 'profile',
+                ));
 
                 $this->model->generate_profile_menu('personality', $id);
 
-                $this->feather->render('profile/section_personality.php', array(
+                $this->feather->view2->display('profile/section_personality.php', array(
                                 'user_avatar' => $user_avatar,
                                 'avatar_field' => $avatar_field,
                                 'signature_preview' => $signature_preview,
@@ -208,41 +210,47 @@ public function display($id, $section = null)
                         );
 
             } elseif ($section == 'display') {
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section display'));
 
-                $this->header->setTitle($page_title)->setActivePage('profile')->display();
+                $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section display')),
+                    'active_page' => 'profile',
+                ));
 
                 $this->model->generate_profile_menu('display', $id);
 
-                $this->feather->render('profile/section_display.php', array(
+                $this->feather->view2->display('profile/section_display.php', array(
                                 'user' => $user,
                                 )
                         );
 
             } elseif ($section == 'privacy') {
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section privacy'));
 
-                $this->header->setTitle($page_title)->setActivePage('profile')->display();
+                $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section privacy')),
+                    'active_page' => 'profile',
+                ));
 
                 $this->model->generate_profile_menu('privacy', $id);
 
-                $this->feather->render('profile/section_privacy.php', array(
+                $this->feather->view2->display('profile/section_privacy.php', array(
                                 'user' => $user,
                                 )
                         );
 
             } elseif ($section == 'admin') {
+
                 if (!$this->user->is_admmod || ($this->user->g_moderator == '1' && $this->user->g_mod_ban_users == '0')) {
                     message(__('Bad request'), false, '403 Forbidden');
                 }
 
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section admin'));
-
-                $this->header->setTitle($page_title)->setActivePage('profile')->display();
+                $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section admin')),
+                    'active_page' => 'profile',
+                ));
 
                 $this->model->generate_profile_menu('admin', $id);
 
-                $this->feather->render('profile/section_admin.php', array(
+                $this->feather->view2->display('profile/section_admin.php', array(
                                 'user' => $user,
                                 'forum_list' => $this->model->get_forum_list($id),
                                 'group_list' => $this->model->get_group_list($user),
@@ -253,8 +261,6 @@ public function display($id, $section = null)
             } else {
                 message(__('Bad request'), '404');
             }
-
-            $this->footer->display();
         }
     }
 
@@ -276,34 +282,32 @@ public function action($id, $action)
         if ($action == 'change_pass') {
             $this->model->change_pass($id, $this->feather);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Change pass'));
-            $required_fields = array('req_old_password' => __('Old pass'), 'req_new_password1' => __('New pass'), 'req_new_password2' => __('Confirm new pass'));
-            $focus_element = array('change_pass', ((!$this->user->is_admmod) ? 'req_old_password' : 'req_new_password1'));
-
-            $this->header->setTitle($page_title)->setActivePage('profile')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+            $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Change pass')),
+                'active_page' => 'profile',
+                'required_fields' => array('req_old_password' => __('Old pass'), 'req_new_password1' => __('New pass'), 'req_new_password2' => __('Confirm new pass')),
+                'focus_element' => array('change_pass', ((!$this->user->is_admmod) ? 'req_old_password' : 'req_new_password1')),
+            ));
 
-            $this->feather->render('profile/change_pass.php', array(
+            $this->feather->view2->display('profile/change_pass.php', array(
                                     'feather' => $this->feather,
                                     'id' => $id,
                                     )
                             );
-
-            $this->footer->display();
         } elseif ($action == 'change_email') {
             $this->model->change_email($id, $this->feather);
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Change email'));
-            $required_fields = array('req_new_email' => __('New email'), 'req_password' => __('Password'));
-            $focus_element = array('change_email', 'req_new_email');
-
-            $this->header->setTitle($page_title)->setActivePage('profile')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+            $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Change email')),
+                'active_page' => 'profile',
+                'required_fields' => array('req_new_email' => __('New email'), 'req_password' => __('Password')),
+                'focus_element' => array('change_email', 'req_new_email'),
+            ));
 
-            $this->feather->render('profile/change_mail.php', array(
+            $this->feather->view2->display('profile/change_mail.php', array(
                                     'id' => $id,
                                     )
                             );
-
-            $this->footer->display();
         } elseif ($action == 'upload_avatar' || $action == 'upload_avatar2') {
             if ($this->config['o_avatars'] == '0') {
                 message(__('Avatars disabled'));
@@ -317,27 +321,24 @@ public function action($id, $action)
                 $this->model->upload_avatar($id, $_FILES);
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Profile'), __('Upload avatar'));
-            $required_fields = array('req_file' => __('File'));
-            $focus_element = array('upload_avatar', 'req_file');
-
-            $this->header->setTitle($page_title)->setActivePage('profile')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+            $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Upload avatar')),
+                'active_page' => 'profile',
+                'required_fields' =>  array('req_file' => __('File')),
+                'focus_element' => array('upload_avatar', 'req_file'),
+            ));
 
-            $this->feather->render('profile/upload_avatar.php', array(
+            $this->feather->view2->display('profile/upload_avatar.php', array(
                                     'feather_config' => $this->config,
                                     'id' => $id,
                                     )
                             );
 
-            $this->footer->display();
-
         } elseif ($action == 'delete_avatar') {
             if ($this->user->id != $id && !$this->user->is_admmod) {
                 message(__('No permission'), '403');
             }
 
-
-
             $this->model->delete_avatar($id);
 
             redirect(get_link('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
diff --git a/controller/register.php b/controller/register.php
index 6ff7e16c..ef580e88 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -48,10 +48,6 @@ public function display()
             message(__('No new regs'));
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Register'));
-        $required_fields = array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => __('Confirm pass'), 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => __('Robot title'));
-        $focus_element = array('register', 'req_user');
-
         $user['timezone'] = isset($user['timezone']) ? $user['timezone'] : $this->config['o_default_timezone'];
         $user['dst'] = isset($user['dst']) ? $user['dst'] : $this->config['o_default_dst'];
         $user['email_setting'] = isset($user['email_setting']) ? $user['email_setting'] : $this->config['o_default_email_setting'];
@@ -66,9 +62,15 @@ public function display()
             }
         }
 
-        $this->header->setTitle($page_title)->setActivePage('register')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->config['o_board_title']), __('Register')),
+            'focus_element' => array('register', 'req_user'),
+            'required_fields' => array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => __('Confirm pass'), 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => __('Robot title')),
+            'active_page' => 'register',
+            'is_indexed' => true,
+        ));
 
-        $this->feather->render('register/form.php', array(
+        $this->feather->view2->display('register/form.php', array(
                             'errors' => $user['errors'],
                             'feather_config' => $this->config,
                             'index_questions'    =>    $index_questions,
@@ -78,8 +80,6 @@ public function display()
                             'qencoded' => md5(array_keys($lang_antispam_questions)[$index_questions]),
                             )
                     );
-
-        $this->footer->display();
     }
 
     public function cancel()
@@ -106,15 +106,14 @@ public function rules()
             redirect(get_link('register/agree/'));
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Register'), __('Forum rules'));
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->config['o_board_title']), __('Register'), __('Forum rules')),
+            'active_page' => 'register',
+        ));
 
-        $this->header->setTitle($page_title)->setActivePage('register')->display();
-
-        $this->feather->render('register/rules.php', array(
+        $this->feather->view2->display('register/rules.php', array(
                             'feather_config'    =>    $this->config,
                             )
                     );
-
-        $this->footer->display();
     }
 }
diff --git a/controller/userlist.php b/controller/userlist.php
index f03dd841..44a42e5d 100644
--- a/controller/userlist.php
+++ b/controller/userlist.php
@@ -54,17 +54,26 @@ public function display()
         $p = (!$this->request->get('p') || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
         $start_from = 50 * ($p - 1);
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('User list'));
         if ($this->user->g_search_users == '1') {
             $focus_element = array('userlist', 'username');
         }
+        else {
+            $focus_element = array();
+        }
 
         // Generate paging links
         $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
 
-        $this->header->setTitle($page_title)->setActivePage('userlist')->setPage($p)->setFocusElement($focus_element)->setPagingLinks($paging_links)->allowIndex()->display();
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->config['o_board_title']), __('User list')),
+            'active_page' => 'userlist',
+            'page_number'  =>  $p,
+            'paging_links'  =>  $paging_links,
+            'focus_element' => $focus_element,
+            'is_indexed' => true,
+        ));
 
-        $this->feather->render('userlist.php', array(
+        $this->feather->view2->display('userlist.php', array(
                             'feather' => $this->feather,
                             'username' => $username,
                             'show_group' => $show_group,
@@ -77,7 +86,5 @@ public function display()
                             'userlist_data' => $this->model->print_users($username, $start_from, $sort_by, $sort_dir, $show_group),
                             )
                     );
-
-        $this->footer->display();
     }
 }
diff --git a/controller/viewforum.php b/controller/viewforum.php
index 1571b04d..032c58ab 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -73,14 +73,16 @@ public function display($id, $name = null, $page = null)
 
         $forum_actions = $this->model->get_forum_actions($id, $this->config['o_forum_subscriptions'], $cur_forum['is_subscribed']);
 
-
-        $page_title = array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name']));
-
-        $page_head = $this->model->get_page_head($id, $num_pages, $p, $url_forum);
-
-        $this->header->setTitle($page_title)->setActivePage('viewforum')->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->allowIndex()->display();
-
-        $this->feather->render('viewforum.php', array(
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name'])),
+            'active_page' => 'viewforum',
+            'page_number'  =>  $p,
+            'paging_links'  =>  $paging_links,
+            'page_head'  =>  $this->model->get_page_head($id, $num_pages, $p, $url_forum),
+            'is_indexed' => true,
+        ));
+
+        $this->feather->view2->display('viewforum.php', array(
                             'id' => $id,
                             'forum_data' => $this->model->print_topics($id, $sort_by, $start_from),
                             'cur_forum' => $cur_forum,
@@ -90,9 +92,8 @@ public function display($id, $name = null, $page = null)
                             'start_from' => $start_from,
                             'url_forum' => $url_forum,
                             'forum_actions' => $forum_actions,
+                            'feather_config' => $this->config,
                             )
                     );
-
-        $this->footer->display('viewforum', $id, $p, '', $id, $num_pages);
     }
 }
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index bd6f0087..8bba869e 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -86,12 +86,14 @@ public function display($id = null, $name = null, $page = null, $pid = null)
 
         $subscraction = $this->model->get_subscraction($cur_topic['is_subscribed'], $id);
 
-        // Add relationship meta tags
-        $page_head = $this->model->get_page_head($id, $num_pages, $p, $url_topic);
-
-        $page_title = array(feather_escape($this->config['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject']));
-
-        $this->header->setTitle($page_title)->setActivePage('viewtopic')->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->allowIndex()->display();
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->config['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject'])),
+            'active_page' => 'viewtopic',
+            'page_number'  =>  $p,
+            'paging_links'  =>  $paging_links,
+            'page_head'  =>  $this->model->get_page_head($id, $num_pages, $p, $url_topic),
+            'is_indexed' => true,
+        ));
 
         require FEATHER_ROOT.'include/parser.php';
 
@@ -114,7 +116,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
             'promptQuote' => __('promptQuote')
         );
 
-        $this->feather->render('viewtopic.php', array(
+        $this->feather->view2->display('viewtopic.php', array(
                             'id' => $id,
                             'p' => $p,
                             'post_data' => $this->model->print_posts($id, $start_from, $cur_topic, $is_admmod),
@@ -139,8 +141,6 @@ public function display($id = null, $name = null, $page = null, $pid = null)
 
         // Increment "num_views" for topic
         $this->model->increment_views($id);
-
-        $this->footer->display('viewtopic', $id, $p, $pid, $cur_topic['forum_id'], $num_pages);
     }
 
     public function viewpost($pid)
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 73912dd0..07d6efb3 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -19,12 +19,12 @@ class View
                $validation = array(
                    'page_number' => 'intval',
                    'active_page' => 'strval',
-                   'focus_element' => 'strval',
+                   //'focus_element' => 'strval',
                    'is_indexed' => 'boolval',
                    'admin_console' => 'boolval',
                    'has_reports' => 'boolval',
                    'paging_links' => 'strval',
-                   'required_fields' => 'strval',
+                   //'required_fields' => 'strval',
                    'has_reports' => 'boolval',
                    'footer_style' => 'strval',
                    'fid' => 'intval',
@@ -216,9 +216,9 @@ public function getTemplatePathname($file)
       * @param  string   $template   Pathname of template file relative to templates directory
       * @param  array    $data       Any additonal data to be passed to the template.
       */
-     public function display($template, $data = null)
+     public function display($template, $data = null, $keep_rendering = null)
      {
-         echo $this->fetch($template, $data);
+         echo $this->fetch($template, $data, $keep_rendering);
      }
 
      /**
@@ -228,7 +228,7 @@ public function display($template, $data = null)
       * @param    array  $data       Any additonal data to be passed to the template.
       * @return string               The rendered template
       */
-     public function fetch($template, $data = null)
+     public function fetch($template, $data = null, $keep_rendering = null)
      {
          // Force flash messages
          if (isset($this->app->environment['slim.flash'])) {
@@ -238,7 +238,7 @@ public function fetch($template, $data = null)
          $data['feather'] = \Slim\Slim::getInstance();
          $data['assets'] = $this->getAssets();
          $data = $this->app->hooks->fire('view.alter_data', $data);
-         return $this->render($template, $data);
+         return $this->render($template, $data, $keep_rendering);
      }
 
      /**
@@ -251,15 +251,32 @@ public function fetch($template, $data = null)
       * @return string               The rendered template
       * @throws \RuntimeException    If resolved template pathname is not a valid file
       */
-     protected function render($template, $data = null)
+     protected function render($template, $data = null, $keep_rendering = null)
      {
          extract($data);
-         ob_start();
-         require $this->getTemplatePathname('header.new.php');
-         require $this->getTemplatePathname($template);
-         require $this->getTemplatePathname('footer.new.php');
 
-         return ob_get_clean();
+         if ($keep_rendering) {
+             ob_start();
+
+             if ($keep_rendering == 1) {
+                 require $this->getTemplatePathname('header.new.php');
+             }
+
+             require $this->getTemplatePathname($template);
+
+             if ($keep_rendering == 2) {
+                 require $this->getTemplatePathname('footer.new.php');
+             }
+
+             return ob_get_clean();
+         }
+         else {
+             ob_start();
+             require $this->getTemplatePathname('header.new.php');
+             require $this->getTemplatePathname($template);
+             require $this->getTemplatePathname('footer.new.php');
+             return ob_get_clean();
+         }
      }
 
      // Getters & Setters
@@ -326,8 +343,6 @@ protected function getDefaultPageInfo()
              'fid' => null,
              'pid' => null,
              'tid' => null,
-             'csrf_key' => 'featherbb_csrf',
-             'csrf_token' => $this->app->csrf->token,
          );
      }
 
diff --git a/model/post.php b/model/post.php
index 8cf39e2e..24fe3e71 100644
--- a/model/post.php
+++ b/model/post.php
@@ -531,6 +531,7 @@ public function insert_topic($post, $fid)
         $new['pid'] = DB::get_db()->lastInsertId($this->feather->forum_settings['db_prefix'].'topics');
 
         // Update the topic with last_post_id
+        unset($topic);
         $topic['update'] = array(
             'last_post_id'  =>  $new['pid'],
             'first_post_id' =>  $new['pid'],
@@ -575,7 +576,7 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
                     ->where_any_is($result['where'])
                     ->where('s.forum_id', $cur_posting['id'])
                     ->where_not_equal('u.id', $this->user->id);
-        $result = $this->hook->fireDB('send_notifications_new_topic_query');
+        $result = $this->hook->fireDB('send_notifications_new_topic_query', $result);
         $result = $result->find_many();
 
         if ($result) {
diff --git a/model/profile.php b/model/profile.php
index 4b90aa02..ad5eecd6 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -1353,12 +1353,12 @@ public function generate_profile_menu($page = '', $id)
     {
         $page = $this->hook->fire('generate_profile_menu', $page, $id);
 
-        $this->feather->render('profile/menu.php', array(
+        $this->feather->view2->display('profile/menu.php', array(
                 'id' => $id,
                 'feather_config' => $this->config,
                 'feather_user' => $this->user,
                 'page' => $page,
             )
-        );
+        , 1);
     }
 }
diff --git a/model/register.php b/model/register.php
index 0337425f..226b4238 100644
--- a/model/register.php
+++ b/model/register.php
@@ -69,6 +69,7 @@ public function check_for_errors()
         }
 
         // Antispam feature
+        require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
         $question = $this->request->post('captcha_q') ? trim($this->request->post('captcha_q')) : '';
         $answer = $this->request->post('captcha') ? strtoupper(trim($this->request->post('captcha'))) : '';
         $lang_antispam_questions_array = array();

From 410a15f8c13bcfcff35e5ca8a880d6b4e289659e Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 26 Aug 2015 22:38:43 +0200
Subject: [PATCH 193/353] Restore commits

---
 include/classes/csrf.class.php | 18 ++++++++++--------
 include/classes/view.class.php | 13 ++++++++++++-
 index.php                      |  2 +-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/include/classes/csrf.class.php b/include/classes/csrf.class.php
index 418b1837..c2e0646d 100644
--- a/include/classes/csrf.class.php
+++ b/include/classes/csrf.class.php
@@ -5,22 +5,21 @@
  * Use this middleware with your Slim Framework application
  * to protect you from CSRF attacks.
  *
- * USAGE
- *
- * $app = new \Slim\Slim();
- * $app->add(new \Slim\Extras\Middleware\CsrfGuard());
- *
  */
+
 namespace FeatherBB;
 
 class Csrf extends \Slim\Middleware
 {
+    protected $key,
+        $token;
+
     /**
      * Call middleware.
      *
      * @return void
      */
-    public function call() 
+    public function call()
     {
         // Attach as hook.
         $this->app->hook('slim.before', array($this, 'check'));
@@ -58,10 +57,13 @@ public function check() {
         }
 
         // Assign CSRF token key and value to view.
-        // Legacy
         $this->app->view()->appendData(array(
             'csrf_key'      => $this->key,
             'csrf_token'    => $this->token,
         ));
+        $this->app->view2->replace(array(
+            'csrf_key'      => $this->key,
+            'csrf_token'    => $this->token,
+        ));
     }
-}
\ No newline at end of file
+}
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 07d6efb3..366c6af5 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -365,5 +365,16 @@ public function getAssets()
      {
          return $this->assets;
      }
+
+     public function __call($method, $args)
+     {
+         $method = mb_substr(preg_replace_callback('/([A-Z])/', function ($c) {
+             return "_" . strtolower($c[1]);
+         }, $method), 4);
+         if (empty($args)) {
+             $args = null;
+         }
+         list($key, $value) = $this->validate($method, $args);
+         $this->page->set($key, $value);
+     }
  }
- ?>
diff --git a/index.php b/index.php
index 88e12d56..277c67d2 100644
--- a/index.php
+++ b/index.php
@@ -23,7 +23,7 @@
 
 // Instantiate Slim and add CSRF
 $feather = new \Slim\Slim();
-$feather->add($feather->csrf = new \FeatherBB\Csrf());
+$feather->add(new \FeatherBB\Csrf());
 
 $feather_settings = array('config_file' => 'include/config.php',
                           'cache_dir' => 'cache/',

From 49a477c815ec5172049614e6197e29fd091cdf6f Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 26 Aug 2015 22:58:31 +0200
Subject: [PATCH 194/353] Don't check for new reports unless admmod

---
 controller/profile.php         |  2 --
 include/classes/view.class.php | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/controller/profile.php b/controller/profile.php
index cac4b10b..c3d3bd5a 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\profile();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/profile.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 366c6af5..75f92734 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -255,9 +255,9 @@ protected function render($template, $data = null, $keep_rendering = null)
      {
          extract($data);
 
-         if ($keep_rendering) {
-             ob_start();
+         ob_start();
 
+         if ($keep_rendering) {
              if ($keep_rendering == 1) {
                  require $this->getTemplatePathname('header.new.php');
              }
@@ -267,16 +267,14 @@ protected function render($template, $data = null, $keep_rendering = null)
              if ($keep_rendering == 2) {
                  require $this->getTemplatePathname('footer.new.php');
              }
-
-             return ob_get_clean();
          }
          else {
-             ob_start();
              require $this->getTemplatePathname('header.new.php');
              require $this->getTemplatePathname($template);
              require $this->getTemplatePathname('footer.new.php');
-             return ob_get_clean();
          }
+
+         return ob_get_clean();
      }
 
      // Getters & Setters
@@ -327,7 +325,7 @@ protected function getDefaultPageInfo()
              $this->app->cache->store('quickjump', \model\cache::get_quickjump());
          }
 
-         return array(
+         $header = array(
              'title' => feather_escape($this->app->forum_settings['o_board_title']),
              'page_number' => null,
              'active_page' => 'index',
@@ -337,13 +335,18 @@ protected function getDefaultPageInfo()
              'page_head' => null,
              'paging_links' => null,
              'required_fields' => null,
-             'has_reports' => \model\header::get_reports(),
              'footer_style' => null,
              'quickjump' => $this->app->cache->retrieve('quickjump'),
              'fid' => null,
              'pid' => null,
              'tid' => null,
          );
+
+         if ($this->app->user->is_admmod) {
+             $header['has_reports'] = \model\header::get_reports();
+         }
+
+         return $header;
      }
 
      public function addAsset($type, $asset, $params = null)

From 0e2f4b1bb374e9af1f2b44fe11cad91125c3caba Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 26 Aug 2015 23:24:16 +0200
Subject: [PATCH 195/353] Fix profile bug

---
 controller/profile.php          | 37 ++++++++++++++++++++-------------
 include/classes/hooks.class.php |  2 +-
 include/classes/view.class.php  |  5 ++++-
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/controller/profile.php b/controller/profile.php
index c3d3bd5a..c05383ab 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -115,8 +115,9 @@ public function display($id, $section = null)
 
             $this->feather->view2->display('profile/view_profile.php', array(
                         'user_info' => $user_info,
-                        )
-                );
+                        'id' => $id
+                    ),
+                2);
         } else {
             if (!$section || $section == 'essentials') {
                 $user_disp = $this->model->edit_essentials($id, $user);
@@ -153,9 +154,10 @@ public function display($id, $section = null)
                 $this->feather->view2->display('profile/section_personal.php', array(
                                 'user' => $user,
                                 'feather' => $this->feather,
-                                'title_field' => $title_field
-                                )
-                        );
+                                'title_field' => $title_field,
+                                'id' => $id
+                                ),
+                        2);
 
             } elseif ($section == 'messaging') {
 
@@ -168,8 +170,9 @@ public function display($id, $section = null)
 
                 $this->feather->view2->display('profile/section_messaging.php', array(
                                 'user' => $user,
-                                )
-                        );
+                                'id' => $id
+                                ),
+                        2);
 
             } elseif ($section == 'personality') {
                 if ($this->config['o_avatars'] == '0' && $this->config['o_signatures'] == '0') {
@@ -204,8 +207,9 @@ public function display($id, $section = null)
                                 'signature_preview' => $signature_preview,
                                 'user' => $user,
                                 'feather' => $this->feather,
-                                )
-                        );
+                                'id' => $id
+                            ),
+                    2);
 
             } elseif ($section == 'display') {
 
@@ -218,8 +222,9 @@ public function display($id, $section = null)
 
                 $this->feather->view2->display('profile/section_display.php', array(
                                 'user' => $user,
-                                )
-                        );
+                                'id' => $id
+                            ),
+                    2);
 
             } elseif ($section == 'privacy') {
 
@@ -232,8 +237,9 @@ public function display($id, $section = null)
 
                 $this->feather->view2->display('profile/section_privacy.php', array(
                                 'user' => $user,
-                                )
-                        );
+                                'id' => $id
+                            ),
+                    2);
 
             } elseif ($section == 'admin') {
 
@@ -253,8 +259,9 @@ public function display($id, $section = null)
                                 'forum_list' => $this->model->get_forum_list($id),
                                 'group_list' => $this->model->get_group_list($user),
                                 'feather' => $this->feather,
-                                )
-                        );
+                                'id' => $id
+                            ),
+                    2);
 
             } else {
                 message(__('Bad request'), '404');
diff --git a/include/classes/hooks.class.php b/include/classes/hooks.class.php
index e524099f..8cefd9b4 100644
--- a/include/classes/hooks.class.php
+++ b/include/classes/hooks.class.php
@@ -93,7 +93,7 @@ public function fireDB($name)
         array_shift($args);
 
         if (!isset($this->hooks[$name])) {
-            $this->hooks[$name] = array(array());
+            //$this->hooks[$name] = array(array());
             return $args[0];
         }
         if (!empty($this->hooks[$name])) {
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 75f92734..6d7c3eaf 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -16,6 +16,7 @@ class View
                $data,
                $page,
                $assets,
+               $noReport,
                $validation = array(
                    'page_number' => 'intval',
                    'active_page' => 'strval',
@@ -259,6 +260,7 @@ protected function render($template, $data = null, $keep_rendering = null)
 
          if ($keep_rendering) {
              if ($keep_rendering == 1) {
+                 $this->noReport = true;
                  require $this->getTemplatePathname('header.new.php');
              }
 
@@ -340,9 +342,10 @@ protected function getDefaultPageInfo()
              'fid' => null,
              'pid' => null,
              'tid' => null,
+             'feather_config' => $this->app->config,
          );
 
-         if ($this->app->user->is_admmod) {
+         if ($this->app->user->is_admmod && !$this->noReport) {
              $header['has_reports'] = \model\header::get_reports();
          }
 

From 6808f7246775433747363be5acbdbc5de6e15dd9 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 12:48:45 +0200
Subject: [PATCH 196/353] Add addTemplate and getTemplates methods + refactor
 render

---
 include/classes/view.class.php | 154 +++++++++++++++------------------
 1 file changed, 72 insertions(+), 82 deletions(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 6d7c3eaf..382779d5 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -12,6 +12,7 @@
  class View
  {
      protected $templatesDirectory,
+               $templates,
                $app,
                $data,
                $page,
@@ -199,37 +200,22 @@ public function getTemplatePathname($file)
           if (!is_file($pathname)) {
               $pathname = $this->app->forum_env['FEATHER_ROOT'] . 'view/' . ltrim($file, DIRECTORY_SEPARATOR); // Fallback on default view
               if (!is_file($pathname)) {
-                  throw new \RuntimeException("View cannot render `$file` because the template does not exist");
+                  throw new \RuntimeException("View cannot add template `$file` to stack because the template does not exist");
               }
           }
-          return $pathname;
+          return (string) $pathname;
       }
 
      /********************************************************************************
       * Rendering
       *******************************************************************************/
 
-     /**
-      * Display template
-      *
-      * This method echoes the rendered template to the current output buffer
-      *
-      * @param  string   $template   Pathname of template file relative to templates directory
-      * @param  array    $data       Any additonal data to be passed to the template.
-      */
-     public function display($template, $data = null, $keep_rendering = null)
+     public function display($data = null)
      {
-         echo $this->fetch($template, $data, $keep_rendering);
+         echo $this->fetch($data);
      }
 
-     /**
-      * Return the contents of a rendered template file
-      *
-      * @param    string $template   The template pathname, relative to the template base directory
-      * @param    array  $data       Any additonal data to be passed to the template.
-      * @return string               The rendered template
-      */
-     public function fetch($template, $data = null, $keep_rendering = null)
+     public function fetch($data = null)
      {
          // Force flash messages
          if (isset($this->app->environment['slim.flash'])) {
@@ -239,47 +225,25 @@ public function fetch($template, $data = null, $keep_rendering = null)
          $data['feather'] = \Slim\Slim::getInstance();
          $data['assets'] = $this->getAssets();
          $data = $this->app->hooks->fire('view.alter_data', $data);
-         return $this->render($template, $data, $keep_rendering);
+         return $this->render($data);
      }
 
-     /**
-      * Render a template file
-      *
-      * NOTE: This method should be overridden by custom view subclasses
-      *
-      * @param  string $template     The template pathname, relative to the template base directory
-      * @param  array  $data         Any additonal data to be passed to the template.
-      * @return string               The rendered template
-      * @throws \RuntimeException    If resolved template pathname is not a valid file
-      */
-     protected function render($template, $data = null, $keep_rendering = null)
+     protected function render($data = null)
      {
          extract($data);
-
          ob_start();
 
-         if ($keep_rendering) {
-             if ($keep_rendering == 1) {
-                 $this->noReport = true;
-                 require $this->getTemplatePathname('header.new.php');
-             }
-
-             require $this->getTemplatePathname($template);
-
-             if ($keep_rendering == 2) {
-                 require $this->getTemplatePathname('footer.new.php');
-             }
-         }
-         else {
-             require $this->getTemplatePathname('header.new.php');
-             require $this->getTemplatePathname($template);
-             require $this->getTemplatePathname('footer.new.php');
+         require $this->getTemplatePathname('header.new.php');
+         foreach ($this->getTemplates() as $tpl) {
+             require $tpl;
          }
-
+         require $this->getTemplatePathname('footer.new.php');
          return ob_get_clean();
      }
 
-     // Getters & Setters
+     /********************************************************************************
+      * Getters and setters
+      *******************************************************************************/
 
      public function setStyle($style)
      {
@@ -303,6 +267,7 @@ public function setPageInfo(array $data)
              list($key, $value) = $this->validate($key, $value);
              $this->page->set($key, $value);
          }
+         return $this;
      }
 
      public function getPageInfo()
@@ -321,37 +286,6 @@ protected function validate($key, $value)
          return array($key, $value);
      }
 
-     protected function getDefaultPageInfo()
-     {
-         if (!$this->app->cache->isCached('quickjump')) {
-             $this->app->cache->store('quickjump', \model\cache::get_quickjump());
-         }
-
-         $header = array(
-             'title' => feather_escape($this->app->forum_settings['o_board_title']),
-             'page_number' => null,
-             'active_page' => 'index',
-             'focus_element' => null,
-             'is_indexed' => true,
-             'admin_console' => false,
-             'page_head' => null,
-             'paging_links' => null,
-             'required_fields' => null,
-             'footer_style' => null,
-             'quickjump' => $this->app->cache->retrieve('quickjump'),
-             'fid' => null,
-             'pid' => null,
-             'tid' => null,
-             'feather_config' => $this->app->config,
-         );
-
-         if ($this->app->user->is_admmod && !$this->noReport) {
-             $header['has_reports'] = \model\header::get_reports();
-         }
-
-         return $header;
-     }
-
      public function addAsset($type, $asset, $params = null)
      {
          $type = (string) $type;
@@ -372,6 +306,31 @@ public function getAssets()
          return $this->assets;
      }
 
+     public function addTemplate($tpl, $priority = 10)
+     {
+         $tpl = (array) $tpl;
+         foreach ($tpl as $key => $tpl_file) {
+             $this->templates[(int) $priority][] = $this->getTemplatePathname((string) $tpl_file);
+         }
+         return $this;
+     }
+
+     public function getTemplates()
+     {
+         $output = array();
+         if (count($this->templates) > 1) {
+             ksort($this->templates);
+         }
+         foreach ($this->templates as $priority) {
+             if (!empty($priority)) {
+                 foreach ($priority as $tpl) {
+                    $output[] = $tpl;
+                 }
+             }
+         }
+         return $output;
+     }
+
      public function __call($method, $args)
      {
          $method = mb_substr(preg_replace_callback('/([A-Z])/', function ($c) {
@@ -383,4 +342,35 @@ public function __call($method, $args)
          list($key, $value) = $this->validate($method, $args);
          $this->page->set($key, $value);
      }
+
+     protected function getDefaultPageInfo()
+     {
+         if (!$this->app->cache->isCached('quickjump')) {
+             $this->app->cache->store('quickjump', \model\cache::get_quickjump());
+         }
+
+         $data = array(
+             'title' => feather_escape($this->app->forum_settings['o_board_title']),
+             'page_number' => null,
+             'active_page' => 'index',
+             'focus_element' => null,
+             'is_indexed' => true,
+             'admin_console' => false,
+             'page_head' => null,
+             'paging_links' => null,
+             'required_fields' => null,
+             'footer_style' => null,
+             'quickjump' => $this->app->cache->retrieve('quickjump'),
+             'fid' => null,
+             'pid' => null,
+             'tid' => null,
+             'feather_config' => $this->app->config,
+         );
+
+         if ($this->app->user->is_admmod) {
+             $data['has_reports'] = \model\header::get_reports();
+         }
+
+         return $data;
+     }
  }

From 91db8ca5c0a1335c18fe03ced0d555937dbc44e3 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 12:48:59 +0200
Subject: [PATCH 197/353] Adapt controller\index to new view

---
 controller/index.php | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/controller/index.php b/controller/index.php
index b8cdc01a..40b06c76 100644
--- a/controller/index.php
+++ b/controller/index.php
@@ -14,42 +14,26 @@ class index
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\index();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/index.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->feather->user->language.'/index.mo');
     }
 
     public function display()
     {
-        if ($this->user->g_read_board == '0') {
+        if ($this->feather->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
 
-
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->config['o_board_title'])),
+            'title' => array(feather_escape($this->feather->forum_settings['o_board_title'])),
             'active_page' => 'index',
             'is_indexed' => true,
-        ));
-
-        $this->feather->view2->display('index.php', array(
-                            'index_data' => $this->model->print_categories_forums(),
-                            'stats' => $this->model->collect_stats(),
-                            'feather_config' => $this->config,
-                            'online'    =>    $this->model->fetch_users_online(),
-                            'forum_actions'        =>    $this->model->get_forum_actions(),
-                            'cur_cat'   => 0,
-                            )
-                    );
+            'index_data' => $this->model->print_categories_forums(),
+            'stats' => $this->model->collect_stats(),
+            'feather_config' => $this->feather->forum_settings,
+            'online'    =>    $this->model->fetch_users_online(),
+            'forum_actions'        =>    $this->model->get_forum_actions(),
+            'cur_cat'   => 0
+        ))->addTemplate('index.php')->display();
     }
 }

From 747be8b5b0b1a3bcaa87331eb37da5322201aec4 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 12:49:11 +0200
Subject: [PATCH 198/353] Adapt controller\profile to new view

---
 controller/profile.php | 140 ++++++++++++++++-------------------------
 1 file changed, 53 insertions(+), 87 deletions(-)

diff --git a/controller/profile.php b/controller/profile.php
index c05383ab..5e7ea6c4 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -66,13 +66,12 @@ public function display($id, $section = null)
             $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Confirm delete user')),
                 'active_page' => 'profile',
+                'username' => $this->model->get_username($id),
+                'id' => $id,
             ));
 
-            $this->feather->view2->display('profile/delete_user.php', array(
-                                    'username' => $this->model->get_username($id),
-                                    'id' => $id,
-                                    )
-                            );
+            $this->feather->view2->addTemplate('profile/delete_user.php');
+            $this->feather->view2->display();
 
         } elseif ($this->request->post('form_sent')) {
 
@@ -111,13 +110,11 @@ public function display($id, $section = null)
             $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->config['o_board_title']), sprintf(__('Users profile'), feather_escape($user['username']))),
                 'active_page' => 'profile',
+                'user_info' => $user_info,
+                'id' => $id
             ));
 
-            $this->feather->view2->display('profile/view_profile.php', array(
-                        'user_info' => $user_info,
-                        'id' => $id
-                    ),
-                2);
+            $this->feather->view2->addTemplate('profile/view_profile.php');
         } else {
             if (!$section || $section == 'essentials') {
                 $user_disp = $this->model->edit_essentials($id, $user);
@@ -126,19 +123,16 @@ public function display($id, $section = null)
                     'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section essentials')),
                     'required_fields' => array('req_username' => __('Username'), 'req_email' => __('Email')),
                     'active_page' => 'profile',
+                    'id' => $id,
+                    'page' => 'essentials',
+                    'user' => $user,
+                    'user_disp' => $user_disp,
+                    'forum_time_formats' => $forum_time_formats,
+                    'forum_date_formats' => $forum_date_formats,
                 ));
 
-                $this->model->generate_profile_menu('essentials', $id);
-
-                $this->feather->view2->display('profile/section_essentials.php', array(
-                                'feather' => $this->feather,
-                                'id' => $id,
-                                'user' => $user,
-                                'user_disp' => $user_disp,
-                                'forum_time_formats' => $forum_time_formats,
-                                'forum_date_formats' => $forum_date_formats,
-                                ),
-                    2);
+                $this->feather->view2->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_essentials.php')->display();
+
             } elseif ($section == 'personal') {
                 if ($this->user->g_set_title == '1') {
                     $title_field = '<label>'.__('Title').' <em>('.__('Leave blank').')</em><br /><input type="text" name="title" value="'.feather_escape($user['title']).'" size="30" maxlength="50" /><br /></label>'."\n";
@@ -147,32 +141,25 @@ public function display($id, $section = null)
                 $this->feather->view2->setPageInfo(array(
                     'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personal')),
                     'active_page' => 'profile',
+                    'id' => $id,
+                    'page' => 'personal',
+                    'user' => $user,
+                    'title_field' => $title_field,
                 ));
 
-                $this->model->generate_profile_menu('personal', $id);
-
-                $this->feather->view2->display('profile/section_personal.php', array(
-                                'user' => $user,
-                                'feather' => $this->feather,
-                                'title_field' => $title_field,
-                                'id' => $id
-                                ),
-                        2);
+                $this->feather->view2->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_personal.php')->display();
 
             } elseif ($section == 'messaging') {
 
                 $this->feather->view2->setPageInfo(array(
                     'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section messaging')),
                     'active_page' => 'profile',
+                    'page' => 'messaging',
+                    'user' => $user,
+                    'id' => $id
                 ));
 
-                $this->model->generate_profile_menu('messaging', $id);
-
-                $this->feather->view2->display('profile/section_messaging.php', array(
-                                'user' => $user,
-                                'id' => $id
-                                ),
-                        2);
+                $this->feather->view2->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_messaging.php')->display();
 
             } elseif ($section == 'personality') {
                 if ($this->config['o_avatars'] == '0' && $this->config['o_signatures'] == '0') {
@@ -197,49 +184,39 @@ public function display($id, $section = null)
                 $this->feather->view2->setPageInfo(array(
                     'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personality')),
                     'active_page' => 'profile',
+                    'user_avatar' => $user_avatar,
+                    'avatar_field' => $avatar_field,
+                    'signature_preview' => $signature_preview,
+                    'page' => 'personality',
+                    'user' => $user,
+                    'id' => $id,
                 ));
 
-                $this->model->generate_profile_menu('personality', $id);
-
-                $this->feather->view2->display('profile/section_personality.php', array(
-                                'user_avatar' => $user_avatar,
-                                'avatar_field' => $avatar_field,
-                                'signature_preview' => $signature_preview,
-                                'user' => $user,
-                                'feather' => $this->feather,
-                                'id' => $id
-                            ),
-                    2);
+                $this->feather->view2->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_personality.php')->display();
 
             } elseif ($section == 'display') {
 
                 $this->feather->view2->setPageInfo(array(
                     'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section display')),
                     'active_page' => 'profile',
+                    'page' => 'display',
+                    'user' => $user,
+                    'id' => $id
                 ));
 
-                $this->model->generate_profile_menu('display', $id);
-
-                $this->feather->view2->display('profile/section_display.php', array(
-                                'user' => $user,
-                                'id' => $id
-                            ),
-                    2);
+                $this->feather->view2->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_display.php')->display();
 
             } elseif ($section == 'privacy') {
 
                 $this->feather->view2->setPageInfo(array(
                     'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section privacy')),
                     'active_page' => 'profile',
+                    'page' => 'privacy',
+                    'user' => $user,
+                    'id' => $id
                 ));
 
-                $this->model->generate_profile_menu('privacy', $id);
-
-                $this->feather->view2->display('profile/section_privacy.php', array(
-                                'user' => $user,
-                                'id' => $id
-                            ),
-                    2);
+                $this->feather->view2->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_privacy.php')->display();
 
             } elseif ($section == 'admin') {
 
@@ -250,19 +227,14 @@ public function display($id, $section = null)
                 $this->feather->view2->setPageInfo(array(
                     'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section admin')),
                     'active_page' => 'profile',
+                    'page' => 'admin',
+                    'user' => $user,
+                    'forum_list' => $this->model->get_forum_list($id),
+                    'group_list' => $this->model->get_group_list($user),
+                    'id' => $id
                 ));
 
-                $this->model->generate_profile_menu('admin', $id);
-
-                $this->feather->view2->display('profile/section_admin.php', array(
-                                'user' => $user,
-                                'forum_list' => $this->model->get_forum_list($id),
-                                'group_list' => $this->model->get_group_list($user),
-                                'feather' => $this->feather,
-                                'id' => $id
-                            ),
-                    2);
-
+                $this->feather->view2->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_admin.php')->display();
             } else {
                 message(__('Bad request'), '404');
             }
@@ -290,15 +262,13 @@ public function action($id, $action)
             $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Change pass')),
                 'active_page' => 'profile',
+                'id' => $id,
                 'required_fields' => array('req_old_password' => __('Old pass'), 'req_new_password1' => __('New pass'), 'req_new_password2' => __('Confirm new pass')),
                 'focus_element' => array('change_pass', ((!$this->user->is_admmod) ? 'req_old_password' : 'req_new_password1')),
             ));
 
-            $this->feather->view2->display('profile/change_pass.php', array(
-                                    'feather' => $this->feather,
-                                    'id' => $id,
-                                    )
-                            );
+            $this->feather->view2->addTemplate('profile/change_pass.php')->display();
+
         } elseif ($action == 'change_email') {
             $this->model->change_email($id, $this->feather);
 
@@ -307,12 +277,11 @@ public function action($id, $action)
                 'active_page' => 'profile',
                 'required_fields' => array('req_new_email' => __('New email'), 'req_password' => __('Password')),
                 'focus_element' => array('change_email', 'req_new_email'),
+                'id' => $id,
             ));
 
-            $this->feather->view2->display('profile/change_mail.php', array(
-                                    'id' => $id,
-                                    )
-                            );
+            $this->feather->view2->addTemplate('profile/change_mail.php')->display();
+
         } elseif ($action == 'upload_avatar' || $action == 'upload_avatar2') {
             if ($this->config['o_avatars'] == '0') {
                 message(__('Avatars disabled'));
@@ -331,13 +300,10 @@ public function action($id, $action)
                 'active_page' => 'profile',
                 'required_fields' =>  array('req_file' => __('File')),
                 'focus_element' => array('upload_avatar', 'req_file'),
+                'id' => $id,
             ));
 
-            $this->feather->view2->display('profile/upload_avatar.php', array(
-                                    'feather_config' => $this->config,
-                                    'id' => $id,
-                                    )
-                            );
+            $this->feather->view2->addTemplate('profile/upload_avatar.php')->display();
 
         } elseif ($action == 'delete_avatar') {
             if ($this->user->id != $id && !$this->user->is_admmod) {

From a1afadf5926a467045424f01fe81dcd3acd5dc9a Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 12:49:23 +0200
Subject: [PATCH 199/353] Remove generate_profile_menu method

---
 model/profile.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/model/profile.php b/model/profile.php
index ad5eecd6..79910176 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -1345,20 +1345,4 @@ public function get_forum_list($id)
 
         return $output;
     }
-
-    //
-    // Display the profile navigation menu
-    //
-    public function generate_profile_menu($page = '', $id)
-    {
-        $page = $this->hook->fire('generate_profile_menu', $page, $id);
-
-        $this->feather->view2->display('profile/menu.php', array(
-                'id' => $id,
-                'feather_config' => $this->config,
-                'feather_user' => $this->user,
-                'page' => $page,
-            )
-        , 1);
-    }
 }

From 2c35afbd8115c2511a9a277439268aeb567d8514 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 12:49:39 +0200
Subject: [PATCH 200/353] Remove legacy variables

---
 style/FeatherBB/view/profile/menu.php          | 4 ++--
 style/FeatherBB/view/profile/upload_avatar.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/style/FeatherBB/view/profile/menu.php b/style/FeatherBB/view/profile/menu.php
index 4627f8db..12b3b47f 100644
--- a/style/FeatherBB/view/profile/menu.php
+++ b/style/FeatherBB/view/profile/menu.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -31,7 +31,7 @@
     echo ' class="isactive"';
 }
     ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
-<?php if ($feather_config['o_avatars'] == '1' || $feather_config['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
+<?php if ($feather->forum_settings['o_avatars'] == '1' || $feather->forum_settings['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
     ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
diff --git a/style/FeatherBB/view/profile/upload_avatar.php b/style/FeatherBB/view/profile/upload_avatar.php
index 4131569c..91fb9425 100644
--- a/style/FeatherBB/view/profile/upload_avatar.php
+++ b/style/FeatherBB/view/profile/upload_avatar.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -23,13 +23,13 @@
 					<legend><?php _e('Upload avatar legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
+						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php _e('Avatar desc').' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.__('bytes').' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
+						<p><?php _e('Avatar desc').' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
 			<p class="buttons"><input type="submit" name="upload" value="<?php _e('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>

From d872aeeeeda6a044cba2e21e9be1a330f4247f6d Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 15:13:56 +0200
Subject: [PATCH 201/353] Move view forum and view topic in new view

---
 controller/viewforum.php           | 48 ++++++++++++--------
 controller/viewtopic.php           | 73 +++++++++++-------------------
 style/FeatherBB/view/viewforum.php | 10 ++--
 style/FeatherBB/view/viewtopic.php | 18 ++++----
 4 files changed, 70 insertions(+), 79 deletions(-)

diff --git a/controller/viewforum.php b/controller/viewforum.php
index 032c58ab..176116f0 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -15,7 +15,6 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->header = new \controller\header();
@@ -71,29 +70,40 @@ public function display($id, $name = null, $page = null)
         // Generate paging links
         $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'forum/'.$id.'/'.$url_forum.'/#');
 
-        $forum_actions = $this->model->get_forum_actions($id, $this->config['o_forum_subscriptions'], $cur_forum['is_subscribed']);
+        $forum_actions = $this->model->get_forum_actions($id, $this->feather->forum_settings['o_forum_subscriptions'], $cur_forum['is_subscribed']);
+
+        $page_head = array();
+        $page_head['canonical'] = "\t".'<link href="'.get_link('forum/'.$id.'/'.$url_forum.'/').'" rel="canonical" />';
+
+        if ($num_pages > 1) {
+            if ($p > 1) {
+                $page_head['prev'] = "\t".'<link href="'.get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/').'" rel="prev" />';
+            }
+            if ($p < $num_pages) {
+                $page_head['next'] = "\t".'<link href="'.get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/').'" rel="next" />';
+            }
+        }
+
+        if ($this->feather->forum_settings['o_feed_type'] == '1') {
+            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;fid='.$id.'&amp;type=rss" title="'.__('RSS forum feed').'" />';
+        } elseif ($this->feather->forum_settings['o_feed_type'] == '2') {
+            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;fid='.$id.'&amp;type=atom" title="'.__('Atom forum feed').'" />';
+        }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name'])),
+            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), feather_escape($cur_forum['forum_name'])),
             'active_page' => 'viewforum',
             'page_number'  =>  $p,
             'paging_links'  =>  $paging_links,
-            'page_head'  =>  $this->model->get_page_head($id, $num_pages, $p, $url_forum),
             'is_indexed' => true,
-        ));
-
-        $this->feather->view2->display('viewforum.php', array(
-                            'id' => $id,
-                            'forum_data' => $this->model->print_topics($id, $sort_by, $start_from),
-                            'cur_forum' => $cur_forum,
-                            'paging_links' => $paging_links,
-                            'post_link' => $post_link,
-                            'is_admmod' => $is_admmod,
-                            'start_from' => $start_from,
-                            'url_forum' => $url_forum,
-                            'forum_actions' => $forum_actions,
-                            'feather_config' => $this->config,
-                            )
-                    );
+            'id' => $id,
+            'forum_data' => $this->model->print_topics($id, $sort_by, $start_from),
+            'cur_forum' => $cur_forum,
+            'page_head' => $page_head,
+            'post_link' => $post_link,
+            'start_from' => $start_from,
+            'url_forum' => $url_forum,
+            'forum_actions' => $forum_actions,
+        ))->addTemplate('viewforum.php')->display();
     }
 }
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index 8bba869e..99d7ac09 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -18,17 +18,10 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\viewtopic();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/topic.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/topic.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/post.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/bbeditor.mo');
     }
 
     public function display($id = null, $name = null, $page = null, $pid = null)
@@ -40,12 +33,9 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         }
 
         // Antispam feature
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
-        // Load the viewtopic.php model file
-        require_once FEATHER_ROOT.'model/viewtopic.php';
-
         // Fetch some informations about the topic
         $cur_topic = $this->model->get_info_topic($id);
 
@@ -86,16 +76,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
 
         $subscraction = $this->model->get_subscraction($cur_topic['is_subscribed'], $id);
 
-        $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->config['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject'])),
-            'active_page' => 'viewtopic',
-            'page_number'  =>  $p,
-            'paging_links'  =>  $paging_links,
-            'page_head'  =>  $this->model->get_page_head($id, $num_pages, $p, $url_topic),
-            'is_indexed' => true,
-        ));
-
-        require FEATHER_ROOT.'include/parser.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'include/parser.php';
 
         $lang_bbeditor = array(
             'btnBold' => __('btnBold'),
@@ -116,28 +97,28 @@ public function display($id = null, $name = null, $page = null, $pid = null)
             'promptQuote' => __('promptQuote')
         );
 
-        $this->feather->view2->display('viewtopic.php', array(
-                            'id' => $id,
-                            'p' => $p,
-                            'post_data' => $this->model->print_posts($id, $start_from, $cur_topic, $is_admmod),
-                            'cur_topic'    =>    $cur_topic,
-                            'subscraction'    =>    $subscraction,
-                            'is_admmod'    =>    $is_admmod,
-                            'feather_config' => $this->config,
-                            'paging_links' => $paging_links,
-                            'post_link' => $post_link,
-                            'start_from' => $start_from,
-                            'lang_antispam' => $lang_antispam,
-                            'pid' => $pid,
-                            'quickpost'        =>    $quickpost,
-                            'index_questions'        =>    $index_questions,
-                            'lang_antispam_questions'        =>    $lang_antispam_questions,
-                            'lang_bbeditor'    =>    $lang_bbeditor,
-                            'url_forum'        =>    $url_forum,
-                            'url_topic'        =>    $url_topic,
-                            'feather'          =>    $this->feather,
-                            )
-                    );
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->config['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject'])),
+            'active_page' => 'viewtopic',
+            'page_number'  =>  $p,
+            'paging_links'  =>  $paging_links,
+            'page_head'  =>  $this->model->get_page_head($id, $num_pages, $p, $url_topic),
+            'is_indexed' => true,
+            'id' => $id,
+            'pid' => $pid,
+            'post_data' => $this->model->print_posts($id, $start_from, $cur_topic, $is_admmod),
+            'cur_topic'    =>    $cur_topic,
+            'subscraction'    =>    $subscraction,
+            'post_link' => $post_link,
+            'start_from' => $start_from,
+            'lang_antispam' => $lang_antispam,
+            'quickpost'        =>    $quickpost,
+            'index_questions'        =>    $index_questions,
+            'lang_antispam_questions'        =>    $lang_antispam_questions,
+            'lang_bbeditor'    =>    $lang_bbeditor,
+            'url_forum'        =>    $url_forum,
+            'url_topic'        =>    $url_topic,
+        ))->addTemplate('viewtopic.php')->display();
 
         // Increment "num_views" for topic
         $this->model->increment_views($id);
diff --git a/style/FeatherBB/view/viewforum.php b/style/FeatherBB/view/viewforum.php
index a35faf22..a9673fa0 100644
--- a/style/FeatherBB/view/viewforum.php
+++ b/style/FeatherBB/view/viewforum.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -36,7 +36,7 @@
 				<tr>
 					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
 					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
 <?php endif; ?>					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
 				</tr>
 			</thead>
@@ -56,7 +56,7 @@
 							</div>
 						</td>
 						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_replies']) : '-' ?></td>
-	<?php if ($feather_config['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_views']) : '-' ?></td>
+	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_views']) : '-' ?></td>
 	<?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_formatted'] ?></td>
 					</tr>
@@ -66,7 +66,7 @@
             if (empty($forum_data)):
             ?>
 					<tr class="rowodd inone">
-						<td class="tcl" colspan="<?php echo($feather_config['o_topic_views'] == 1) ? 4 : 3 ?>">
+						<td class="tcl" colspan="<?php echo($feather->forum_settings['o_topic_views'] == 1) ? 4 : 3 ?>">
 							<div class="icon inone"><div class="nosize"><!-- --></div></div>
 							<div class="tclcon">
 								<div>
@@ -97,4 +97,4 @@
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
 		<div class="clearer"></div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/FeatherBB/view/viewtopic.php b/style/FeatherBB/view/viewtopic.php
index e2681757..e982045b 100644
--- a/style/FeatherBB/view/viewtopic.php
+++ b/style/FeatherBB/view/viewtopic.php
@@ -134,16 +134,16 @@
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
-						<input type="hidden" name="page" value="<?php echo feather_escape($p) ?>" />
-<?php if ($feather_config['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
+						<input type="hidden" name="page" value="<?php echo feather_escape($page_number) ?>" />
+<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
 <?php endif;
 
     if ($feather->user->is_guest) {
-        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-        $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
+        $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+        $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
         ?>
 						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
 <?php
 
@@ -163,13 +163,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>

From d212d0428e5630e1a0377d2e58951e9f10fdfe7e Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 15:14:04 +0200
Subject: [PATCH 202/353] Tidy up view class

---
 include/classes/view.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 382779d5..ba16ace4 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -17,7 +17,6 @@ class View
                $data,
                $page,
                $assets,
-               $noReport,
                $validation = array(
                    'page_number' => 'intval',
                    'active_page' => 'strval',
@@ -364,7 +363,6 @@ protected function getDefaultPageInfo()
              'fid' => null,
              'pid' => null,
              'tid' => null,
-             'feather_config' => $this->app->config,
          );
 
          if ($this->app->user->is_admmod) {

From 19c5bfb40410be033a7145d80185288ce916b7ab Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 15:14:12 +0200
Subject: [PATCH 203/353] Remove legacy vars in index

---
 style/FeatherBB/view/index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/style/FeatherBB/view/index.php b/style/FeatherBB/view/index.php
index 3142e1bd..cc51e8b5 100644
--- a/style/FeatherBB/view/index.php
+++ b/style/FeatherBB/view/index.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -92,13 +92,13 @@
 			<dl class="conl">
 				<dt><strong><?php _e('User info') ?></strong></dt>
 				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
-				<?php if ($feather_config['o_users_online'] == 1) : ?>
+				<?php if ($feather->forum_settings['o_users_online'] == 1) : ?>
 				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
 				<dd><span><?php printf(__('Guests online'), '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
 				<?php endif; ?>
 			</dl>
 			<?php
-            if ($feather_config['o_users_online'] == 1) :
+            if ($feather->forum_settings['o_users_online'] == 1) :
                 if ($online['num_users'] > 0) {
                     echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
                 } else {
@@ -108,4 +108,4 @@
             ?>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>

From e9e65c8221cd195a3da2b81c03d5b04d584d03f6 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 27 Aug 2015 15:19:24 +0200
Subject: [PATCH 204/353] New view

---
 controller/post.php            | 14 ++++-----
 controller/search.php          | 57 ++++++++++++++++++----------------
 model/search.php               |  8 +++--
 view/profile/menu.php          |  4 +--
 view/profile/upload_avatar.php |  8 ++---
 5 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/controller/post.php b/controller/post.php
index 6c680faa..fd8534d5 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -166,7 +166,6 @@ public function newpost($fid = null, $tid = null, $qid = null)
             $url_topic = '';
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $action);
         $required_fields = array('req_email' => __('Email'), 'req_subject' => __('Subject'), 'req_message' => __('Message'));
         if ($this->user->is_guest) {
             $required_fields['captcha'] = __('Robot title');
@@ -181,8 +180,6 @@ public function newpost($fid = null, $tid = null, $qid = null)
             $focus_element[] = 'req_username';
         }
 
-        $this->header->setTitle($page_title)->setActivePage('post')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
-
         // Get the current state of checkboxes
         $checkboxes = $this->model->get_checkboxes($fid, $is_admmod, $is_subscribed);
 
@@ -212,7 +209,11 @@ public function newpost($fid = null, $tid = null, $qid = null)
             'promptQuote' => __('promptQuote')
         );
 
-        $this->feather->render('post.php', array(
+        $this->feather->view2->setPageInfo(array(
+                            'title' => array(feather_escape($this->config['o_board_title']), $action),
+                            'required_fields' => $required_fields,
+                            'focus_element' => $focus_element,
+                            'active_page' => 'post',
                             'post' => $post,
                             'tid' => $tid,
                             'fid' => $fid,
@@ -233,9 +234,6 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             'url_topic' => $url_topic,
                             'quote' => $quote,
                             'errors'    =>    $errors,
-                            )
-                    );
-
-        $this->footer->display();
+                            ))->addTemplate('post.php')->display();
     }
 }
diff --git a/controller/search.php b/controller/search.php
index 5d91d5d5..5a6e5319 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -47,45 +47,48 @@ public function display()
 
                 // We have results to display
                 if (isset($search['is_result'])) {
-                    $page_title = array(feather_escape($this->config['o_board_title']), __('Search results'));
-
-                    $this->header->setTitle($page_title)->setActivePage('search')->display();
-
-                    $this->feather->render('search/header.php', array(
-                                'search' => $search,
-                                )
-                        );
 
                     if ($search['show_as'] == 'posts') {
                         require FEATHER_ROOT.'include/parser.php';
                     }
 
+                    $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Search results')),
+                        'active_page' => 'search',
+                    ));
+
                     $this->model->display_search_results($search, $this->feather);
 
-                    $this->feather->render('search/footer.php', array(
-                                'search' => $search,
-                                )
-                        );
+                    $this->feather->view2->setPageInfo(array(
+                        'search' => $search,
+                    ));
+
+                    $this->feather->view2->addTemplate('search/header.php', 1);
+
+                    if ($search['show_as'] == 'posts') {
+                        $this->feather->view2->addTemplate('search/posts.php', 5);
+                    }
+                    else {
+                        $this->feather->view2->addTemplate('search/topics.php', 5);
+                    }
+
+                    $this->feather->view2->addTemplate('search/footer.php', 10)->display();
 
-                    $this->footer->display();
                 } else {
                     message(__('No hits'));
                 }
         }
-
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Search'));
-        $focus_element = array('search', 'keywords');
-
-        $this->header->setTitle($page_title)->setActivePage('search')->setFocusElement($focus_element)->display();
-
-        $this->feather->render('search/form.php', array(
-                            'feather_config' => $this->config,
-                            'feather' => $this->feather,
-                            'forums' => $this->model->get_list_forums(),
-                            )
-                    );
-
-        $this->footer->display();
+        // Display the form
+        else {
+            $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Search')),
+                'active_page' => 'search',
+                'focus_element' => array('search', 'keywords'),
+                'is_indexed' => true,
+                'feather' => $this->feather,
+                'forums' => $this->model->get_list_forums(),
+            ))->addTemplate('search/form.php')->display();
+        }
     }
 
     public function quicksearches($show)
diff --git a/model/search.php b/model/search.php
index 8facdca0..e27188e5 100644
--- a/model/search.php
+++ b/model/search.php
@@ -536,7 +536,7 @@ public function get_search_results()
                 }
 
                 $delete_cache = DB::for_table('search_cache')
-                    ->where_not_in('ident', $old_searches);
+                                    ->where_not_in('ident', $old_searches);
                 $delete_cache = $this->hook->fireDB('get_search_results_delete_cache', $delete_cache);
                 $delete_cache = $delete_cache->delete_many();
             }
@@ -735,7 +735,7 @@ public function display_search_results($search)
                     $cur_search['pposter_disp'] = '<strong>'.$pposter.'</strong>';
                 }
 
-                $this->feather->render('search/posts.php', array(
+                $this->feather->view2->setPageInfo(array(
                     'post_count' => $post_count,
                     'url_topic' => $url_topic,
                     'cur_search' => $cur_search,
@@ -792,12 +792,14 @@ public function display_search_results($search)
                     $start_from = $cur_search['start_from'];
                 }
 
-                $this->feather->render('search/topics.php', array(
+                $this->feather->view2->setPageInfo(array(
                     'cur_search' => $cur_search,
                     'start_from' => $start_from,
                     'topic_count' => $topic_count,
                     'subject' => $subject,
                     'forum' => $forum,
+                    'post_count' => $post_count,
+                    'url_topic' => $url_topic,
                     )
                 );
             }
diff --git a/view/profile/menu.php b/view/profile/menu.php
index 4627f8db..12b3b47f 100644
--- a/view/profile/menu.php
+++ b/view/profile/menu.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -31,7 +31,7 @@
     echo ' class="isactive"';
 }
     ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
-<?php if ($feather_config['o_avatars'] == '1' || $feather_config['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
+<?php if ($feather->forum_settings['o_avatars'] == '1' || $feather->forum_settings['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
     ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
index 4131569c..91fb9425 100644
--- a/view/profile/upload_avatar.php
+++ b/view/profile/upload_avatar.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -23,13 +23,13 @@
 					<legend><?php _e('Upload avatar legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
+						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php _e('Avatar desc').' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.__('bytes').' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
+						<p><?php _e('Avatar desc').' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
 			<p class="buttons"><input type="submit" name="upload" value="<?php _e('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>

From 7e5e1de3f44e2c1f7b91eaf86082b6dd3b7c7644 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 27 Aug 2015 15:29:30 +0200
Subject: [PATCH 205/353] Restore footer actions

---
 style/FeatherBB/view/footer.new.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/style/FeatherBB/view/footer.new.php b/style/FeatherBB/view/footer.new.php
index 26d09007..de5cdb2e 100644
--- a/style/FeatherBB/view/footer.new.php
+++ b/style/FeatherBB/view/footer.new.php
@@ -15,15 +15,15 @@
 	<div class="box">
 <?php
 
-if (isset($footer_style) && ($footer_style == 'viewforum' || $footer_style == 'viewtopic') && $feather->user->is_admmod) {
+if (isset($active_page) && ($active_page == 'viewforum' || $active_page == 'viewtopic') && $feather->user->is_admmod) {
     echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
 
-    if ($footer_style == 'viewforum') {
+    if ($active_page == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$fid.'/page/'.$page_number.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
-    } elseif ($footer_style == 'viewtopic') {
+    } elseif ($active_page == 'viewtopic') {
         if (isset($pid)) {
             $parameter = 'param/'.$pid.'/';
         } elseif (isset($page_number) && $page_number != 1) {
@@ -86,19 +86,19 @@
 			<div class="conr">
 <?php
 
-if ($footer_style == 'index') {
+if ($active_page == 'index') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
-} elseif ($footer_style == 'viewforum') {
+} elseif ($active_page == 'viewforum') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
-} elseif ($footer_style == 'viewtopic') {
+} elseif ($active_page == 'viewtopic') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {

From e556e1c0834dc9f6338b381e51c32486a6b8f3c9 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 15:15:50 +0200
Subject: [PATCH 206/353] Clean up things

---
 include/classes/csrf.class.php |  32 +-
 include/classes/view.class.php | 740 ++++++++++++++++-----------------
 2 files changed, 386 insertions(+), 386 deletions(-)

diff --git a/include/classes/csrf.class.php b/include/classes/csrf.class.php
index c2e0646d..823dd96e 100644
--- a/include/classes/csrf.class.php
+++ b/include/classes/csrf.class.php
@@ -1,24 +1,24 @@
 <?php
 /**
- * CSRF Guard
- *
- * Use this middleware with your Slim Framework application
- * to protect you from CSRF attacks.
- *
- */
+* CSRF Guard
+*
+* Use this middleware with your Slim Framework application
+* to protect you from CSRF attacks.
+*
+*/
 
 namespace FeatherBB;
 
 class Csrf extends \Slim\Middleware
 {
     protected $key,
-        $token;
+    $token;
 
     /**
-     * Call middleware.
-     *
-     * @return void
-     */
+    * Call middleware.
+    *
+    * @return void
+    */
     public function call()
     {
         // Attach as hook.
@@ -29,11 +29,11 @@ public function call()
     }
 
     /**
-     * Check CSRF token is valid.
-     * Note: Also checks POST data to see if a Moneris RVAR CSRF token exists.
-     *
-     * @return void
-     */
+    * Check CSRF token is valid.
+    * Note: Also checks POST data to see if a Moneris RVAR CSRF token exists.
+    *
+    * @return void
+    */
     public function check() {
         // Check sessions are enabled.
         if (session_id() === '') {
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index ba16ace4..bea59322 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -1,374 +1,374 @@
 <?php
 
 /**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
- namespace FeatherBB;
-
- class View
- {
-     protected $templatesDirectory,
-               $templates,
-               $app,
-               $data,
-               $page,
-               $assets,
-               $validation = array(
-                   'page_number' => 'intval',
-                   'active_page' => 'strval',
-                   //'focus_element' => 'strval',
-                   'is_indexed' => 'boolval',
-                   'admin_console' => 'boolval',
-                   'has_reports' => 'boolval',
-                   'paging_links' => 'strval',
-                   //'required_fields' => 'strval',
-                   'has_reports' => 'boolval',
-                   'footer_style' => 'strval',
-                   'fid' => 'intval',
-                   'pid' => 'intval',
-                   'tid' => 'intval');
-
-     /**
-      * Constructor
-      */
-     public function __construct()
-     {
-         $this->data = $this->page = new \Slim\Helper\Set();
-         $this->app = \Slim\Slim::getInstance();
-     }
-
-     /********************************************************************************
-      * Data methods
-      *******************************************************************************/
-
-     /**
-      * Does view data have value with key?
-      * @param  string  $key
-      * @return boolean
-      */
-     public function has($key)
-     {
-         return $this->data->has($key);
-     }
-
-     /**
-      * Return view data value with key
-      * @param  string $key
-      * @return mixed
-      */
-     public function get($key)
-     {
-         return $this->data->get($key);
-     }
-
-     /**
-      * Set view data value with key
-      * @param string $key
-      * @param mixed $value
-      */
-     public function set($key, $value)
-     {
-         $this->data->set($key, $value);
-     }
-
-     /**
-      * Set view data value as Closure with key
-      * @param string $key
-      * @param mixed $value
-      */
-     public function keep($key, \Closure $value)
-     {
-         $this->data->keep($key, $value);
-     }
-
-     /**
-      * Return view data
-      * @return array
-      */
-     public function all()
-     {
-         return $this->data->all();
-     }
-
-     /**
-      * Replace view data
-      * @param  array  $data
-      */
-     public function replace(array $data)
-     {
-         $this->data->replace($data);
-     }
-
-     /**
-      * Clear view data
-      */
-     public function clear()
-     {
-         $this->data->clear();
-     }
-
-     /********************************************************************************
-      * Legacy data methods
-      *******************************************************************************/
-
-     /**
-      * DEPRECATION WARNING! This method will be removed in the next major point release
-      *
-      * Get data from view
-      */
-     public function getData($key = null)
-     {
-         if (!is_null($key)) {
-             return isset($this->data[$key]) ? $this->data[$key] : null;
-         }
-
-         return $this->data->all();
-     }
-
-     /**
-      * DEPRECATION WARNING! This method will be removed in the next major point release
-      *
-      * Set data for view
-      */
-     public function setData()
-     {
-         $args = func_get_args();
-         if (count($args) === 1 && is_array($args[0])) {
-             $this->data->replace($args[0]);
-         } elseif (count($args) === 2) {
-             // Ensure original behavior is maintained. DO NOT invoke stored Closures.
-             if (is_object($args[1]) && method_exists($args[1], '__invoke')) {
-                 $this->data->set($args[0], $this->data->protect($args[1]));
-             } else {
-                 $this->data->set($args[0], $args[1]);
-             }
-         } else {
-             throw new \InvalidArgumentException('Cannot set View data with provided arguments. Usage: `View::setData( $key, $value );` or `View::setData([ key => value, ... ]);`');
-         }
-     }
-
-     /**
-      * DEPRECATION WARNING! This method will be removed in the next major point release
-      *
-      * Append data to view
-      * @param  array $data
-      */
-     public function appendData($data)
-     {
-         if (!is_array($data)) {
-             throw new \InvalidArgumentException('Cannot append view data. Expected array argument.');
-         }
-         $this->data->replace($data);
-     }
-
-     /********************************************************************************
-      * Resolve template paths
-      *******************************************************************************/
-
-     /**
-      * Set the base directory that contains view templates
-      * @param   string $directory
-      * @throws  \InvalidArgumentException If directory is not a directory
-      */
-     public function setTemplatesDirectory($directory)
-     {
-         $this->templatesDirectory = rtrim($directory, DIRECTORY_SEPARATOR);
-     }
-
-     /**
-      * Get templates base directory
-      * @return string
-      */
-     public function getTemplatesDirectory()
-     {
-         return $this->templatesDirectory;
-     }
-
-     /**
-      * Get fully qualified path to template file using templates base directory
-      * @param  string $file The template file pathname relative to templates base directory
-      * @return string
-      */
-      public function getTemplatePathname($file)
-      {
-          $pathname = $this->templatesDirectory . DIRECTORY_SEPARATOR . ltrim($file, DIRECTORY_SEPARATOR);
-          if (!is_file($pathname)) {
-              $pathname = $this->app->forum_env['FEATHER_ROOT'] . 'view/' . ltrim($file, DIRECTORY_SEPARATOR); // Fallback on default view
-              if (!is_file($pathname)) {
-                  throw new \RuntimeException("View cannot add template `$file` to stack because the template does not exist");
-              }
-          }
-          return (string) $pathname;
-      }
-
-     /********************************************************************************
-      * Rendering
-      *******************************************************************************/
-
-     public function display($data = null)
-     {
-         echo $this->fetch($data);
-     }
-
-     public function fetch($data = null)
-     {
-         // Force flash messages
-         if (isset($this->app->environment['slim.flash'])) {
-             $this->data->set('flash', $this->app->environment['slim.flash']);
-         }
-         $data = array_merge($this->getDefaultPageInfo(), $this->page->all(), $this->data->all(), (array) $data);
-         $data['feather'] = \Slim\Slim::getInstance();
-         $data['assets'] = $this->getAssets();
-         $data = $this->app->hooks->fire('view.alter_data', $data);
-         return $this->render($data);
-     }
-
-     protected function render($data = null)
-     {
-         extract($data);
-         ob_start();
-
-         require $this->getTemplatePathname('header.new.php');
-         foreach ($this->getTemplates() as $tpl) {
-             require $tpl;
-         }
-         require $this->getTemplatePathname('footer.new.php');
-         return ob_get_clean();
-     }
-
-     /********************************************************************************
-      * Getters and setters
-      *******************************************************************************/
-
-     public function setStyle($style)
-     {
-         if (!is_dir($this->app->forum_env['FEATHER_ROOT'].'style/'.$style.'/view/')) {
-             throw new \InvalidArgumentException('The style '.$style.' doesn\'t exist');
-         }
-         $this->data->set('style', (string) $style);
-         $this->setTemplatesDirectory($this->app->forum_env['FEATHER_ROOT'].'style/'.$style.'/view');
-         $this->addAsset('css', 'style/'.$style.'.css');
-         return $this;
-     }
-
-     public function getStyle()
-     {
-         return $this->data['style'];
-     }
-
-     public function setPageInfo(array $data)
-     {
-         foreach ($data as $key => $value) {
-             list($key, $value) = $this->validate($key, $value);
-             $this->page->set($key, $value);
-         }
-         return $this;
-     }
-
-     public function getPageInfo()
-     {
-         return $this->page->all();
-     }
-
-     protected function validate($key, $value)
-     {
-         $key = (string) $key;
-         if (isset($this->validation[$key])) {
-             if (function_exists($this->validation[$key])) {
-                 $value = $this->validation[$key]($value);
-             }
-         }
-         return array($key, $value);
-     }
-
-     public function addAsset($type, $asset, $params = null)
-     {
-         $type = (string) $type;
-         if (!in_array($type, array('js', 'css'))) {
-             throw new \Exception('Invalid asset type : ' . $type);
-         }
-         if (!is_file($this->app->forum_env['FEATHER_ROOT'].$asset)) {
-             throw new \Exception('The asset file ' . $asset . ' does not exist');
-         }
-         $this->assets[$type][] = array(
-             'file' => $asset,
-             'params' => $params
-         );
-     }
-
-     public function getAssets()
-     {
-         return $this->assets;
-     }
-
-     public function addTemplate($tpl, $priority = 10)
-     {
-         $tpl = (array) $tpl;
-         foreach ($tpl as $key => $tpl_file) {
-             $this->templates[(int) $priority][] = $this->getTemplatePathname((string) $tpl_file);
-         }
-         return $this;
-     }
-
-     public function getTemplates()
-     {
-         $output = array();
-         if (count($this->templates) > 1) {
-             ksort($this->templates);
-         }
-         foreach ($this->templates as $priority) {
-             if (!empty($priority)) {
-                 foreach ($priority as $tpl) {
+* Copyright (C) 2015 FeatherBB
+* based on code by (C) 2008-2012 FluxBB
+* and Rickard Andersson (C) 2002-2008 PunBB
+* License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+*/
+
+namespace FeatherBB;
+
+class View
+{
+    protected $templatesDirectory,
+    $templates,
+    $app,
+    $data,
+    $page,
+    $assets,
+    $validation = array(
+        'page_number' => 'intval',
+        'active_page' => 'strval',
+        //'focus_element' => 'strval',
+        'is_indexed' => 'boolval',
+        'admin_console' => 'boolval',
+        'has_reports' => 'boolval',
+        'paging_links' => 'strval',
+        //'required_fields' => 'strval',
+        'has_reports' => 'boolval',
+        'footer_style' => 'strval',
+        'fid' => 'intval',
+        'pid' => 'intval',
+        'tid' => 'intval');
+
+    /**
+    * Constructor
+    */
+    public function __construct()
+    {
+        $this->data = $this->page = new \Slim\Helper\Set();
+        $this->app = \Slim\Slim::getInstance();
+    }
+
+    /********************************************************************************
+    * Data methods
+    *******************************************************************************/
+
+    /**
+    * Does view data have value with key?
+    * @param  string  $key
+    * @return boolean
+    */
+    public function has($key)
+    {
+        return $this->data->has($key);
+    }
+
+    /**
+    * Return view data value with key
+    * @param  string $key
+    * @return mixed
+    */
+    public function get($key)
+    {
+        return $this->data->get($key);
+    }
+
+    /**
+    * Set view data value with key
+    * @param string $key
+    * @param mixed $value
+    */
+    public function set($key, $value)
+    {
+        $this->data->set($key, $value);
+    }
+
+    /**
+    * Set view data value as Closure with key
+    * @param string $key
+    * @param mixed $value
+    */
+    public function keep($key, \Closure $value)
+    {
+        $this->data->keep($key, $value);
+    }
+
+    /**
+    * Return view data
+    * @return array
+    */
+    public function all()
+    {
+        return $this->data->all();
+    }
+
+    /**
+    * Replace view data
+    * @param  array  $data
+    */
+    public function replace(array $data)
+    {
+        $this->data->replace($data);
+    }
+
+    /**
+    * Clear view data
+    */
+    public function clear()
+    {
+        $this->data->clear();
+    }
+
+    /********************************************************************************
+    * Legacy data methods
+    *******************************************************************************/
+
+    /**
+    * DEPRECATION WARNING! This method will be removed in the next major point release
+    *
+    * Get data from view
+    */
+    public function getData($key = null)
+    {
+        if (!is_null($key)) {
+            return isset($this->data[$key]) ? $this->data[$key] : null;
+        }
+
+        return $this->data->all();
+    }
+
+    /**
+    * DEPRECATION WARNING! This method will be removed in the next major point release
+    *
+    * Set data for view
+    */
+    public function setData()
+    {
+        $args = func_get_args();
+        if (count($args) === 1 && is_array($args[0])) {
+            $this->data->replace($args[0]);
+        } elseif (count($args) === 2) {
+            // Ensure original behavior is maintained. DO NOT invoke stored Closures.
+            if (is_object($args[1]) && method_exists($args[1], '__invoke')) {
+                $this->data->set($args[0], $this->data->protect($args[1]));
+            } else {
+                $this->data->set($args[0], $args[1]);
+            }
+        } else {
+            throw new \InvalidArgumentException('Cannot set View data with provided arguments. Usage: `View::setData( $key, $value );` or `View::setData([ key => value, ... ]);`');
+        }
+    }
+
+    /**
+    * DEPRECATION WARNING! This method will be removed in the next major point release
+    *
+    * Append data to view
+    * @param  array $data
+    */
+    public function appendData($data)
+    {
+        if (!is_array($data)) {
+            throw new \InvalidArgumentException('Cannot append view data. Expected array argument.');
+        }
+        $this->data->replace($data);
+    }
+
+    /********************************************************************************
+    * Resolve template paths
+    *******************************************************************************/
+
+    /**
+    * Set the base directory that contains view templates
+    * @param   string $directory
+    * @throws  \InvalidArgumentException If directory is not a directory
+    */
+    public function setTemplatesDirectory($directory)
+    {
+        $this->templatesDirectory = rtrim($directory, DIRECTORY_SEPARATOR);
+    }
+
+    /**
+    * Get templates base directory
+    * @return string
+    */
+    public function getTemplatesDirectory()
+    {
+        return $this->templatesDirectory;
+    }
+
+    /**
+    * Get fully qualified path to template file using templates base directory
+    * @param  string $file The template file pathname relative to templates base directory
+    * @return string
+    */
+    public function getTemplatePathname($file)
+    {
+        $pathname = $this->templatesDirectory . DIRECTORY_SEPARATOR . ltrim($file, DIRECTORY_SEPARATOR);
+        if (!is_file($pathname)) {
+            $pathname = $this->app->forum_env['FEATHER_ROOT'] . 'view/' . ltrim($file, DIRECTORY_SEPARATOR); // Fallback on default view
+            if (!is_file($pathname)) {
+                throw new \RuntimeException("View cannot add template `$file` to stack because the template does not exist");
+            }
+        }
+        return (string) $pathname;
+    }
+
+    /********************************************************************************
+    * Rendering
+    *******************************************************************************/
+
+    public function display($data = null)
+    {
+        echo $this->fetch($data);
+    }
+
+    public function fetch($data = null)
+    {
+        // Force flash messages
+        if (isset($this->app->environment['slim.flash'])) {
+            $this->data->set('flash', $this->app->environment['slim.flash']);
+        }
+        $data = array_merge($this->getDefaultPageInfo(), $this->page->all(), $this->data->all(), (array) $data);
+        $data['feather'] = \Slim\Slim::getInstance();
+        $data['assets'] = $this->getAssets();
+        $data = $this->app->hooks->fire('view.alter_data', $data);
+        return $this->render($data);
+    }
+
+    protected function render($data = null)
+    {
+        extract($data);
+        ob_start();
+
+        require $this->getTemplatePathname('header.new.php');
+        foreach ($this->getTemplates() as $tpl) {
+            require $tpl;
+        }
+        require $this->getTemplatePathname('footer.new.php');
+        return ob_get_clean();
+    }
+
+    /********************************************************************************
+    * Getters and setters
+    *******************************************************************************/
+
+    public function setStyle($style)
+    {
+        if (!is_dir($this->app->forum_env['FEATHER_ROOT'].'style/'.$style.'/view/')) {
+            throw new \InvalidArgumentException('The style '.$style.' doesn\'t exist');
+        }
+        $this->data->set('style', (string) $style);
+        $this->setTemplatesDirectory($this->app->forum_env['FEATHER_ROOT'].'style/'.$style.'/view');
+        $this->addAsset('css', 'style/'.$style.'.css');
+        return $this;
+    }
+
+    public function getStyle()
+    {
+        return $this->data['style'];
+    }
+
+    public function setPageInfo(array $data)
+    {
+        foreach ($data as $key => $value) {
+            list($key, $value) = $this->validate($key, $value);
+            $this->page->set($key, $value);
+        }
+        return $this;
+    }
+
+    public function getPageInfo()
+    {
+        return $this->page->all();
+    }
+
+    protected function validate($key, $value)
+    {
+        $key = (string) $key;
+        if (isset($this->validation[$key])) {
+            if (function_exists($this->validation[$key])) {
+                $value = $this->validation[$key]($value);
+            }
+        }
+        return array($key, $value);
+    }
+
+    public function addAsset($type, $asset, $params = null)
+    {
+        $type = (string) $type;
+        if (!in_array($type, array('js', 'css'))) {
+            throw new \Exception('Invalid asset type : ' . $type);
+        }
+        if (!is_file($this->app->forum_env['FEATHER_ROOT'].$asset)) {
+            throw new \Exception('The asset file ' . $asset . ' does not exist');
+        }
+        $this->assets[$type][] = array(
+            'file' => $asset,
+            'params' => $params
+        );
+    }
+
+    public function getAssets()
+    {
+        return $this->assets;
+    }
+
+    public function addTemplate($tpl, $priority = 10)
+    {
+        $tpl = (array) $tpl;
+        foreach ($tpl as $key => $tpl_file) {
+            $this->templates[(int) $priority][] = $this->getTemplatePathname((string) $tpl_file);
+        }
+        return $this;
+    }
+
+    public function getTemplates()
+    {
+        $output = array();
+        if (count($this->templates) > 1) {
+            ksort($this->templates);
+        }
+        foreach ($this->templates as $priority) {
+            if (!empty($priority)) {
+                foreach ($priority as $tpl) {
                     $output[] = $tpl;
-                 }
-             }
-         }
-         return $output;
-     }
-
-     public function __call($method, $args)
-     {
-         $method = mb_substr(preg_replace_callback('/([A-Z])/', function ($c) {
-             return "_" . strtolower($c[1]);
-         }, $method), 4);
-         if (empty($args)) {
-             $args = null;
-         }
-         list($key, $value) = $this->validate($method, $args);
-         $this->page->set($key, $value);
-     }
-
-     protected function getDefaultPageInfo()
-     {
-         if (!$this->app->cache->isCached('quickjump')) {
-             $this->app->cache->store('quickjump', \model\cache::get_quickjump());
-         }
-
-         $data = array(
-             'title' => feather_escape($this->app->forum_settings['o_board_title']),
-             'page_number' => null,
-             'active_page' => 'index',
-             'focus_element' => null,
-             'is_indexed' => true,
-             'admin_console' => false,
-             'page_head' => null,
-             'paging_links' => null,
-             'required_fields' => null,
-             'footer_style' => null,
-             'quickjump' => $this->app->cache->retrieve('quickjump'),
-             'fid' => null,
-             'pid' => null,
-             'tid' => null,
-         );
-
-         if ($this->app->user->is_admmod) {
-             $data['has_reports'] = \model\header::get_reports();
-         }
-
-         return $data;
-     }
- }
+                }
+            }
+        }
+        return $output;
+    }
+
+    public function __call($method, $args)
+    {
+        $method = mb_substr(preg_replace_callback('/([A-Z])/', function ($c) {
+            return "_" . strtolower($c[1]);
+        }, $method), 4);
+        if (empty($args)) {
+            $args = null;
+        }
+        list($key, $value) = $this->validate($method, $args);
+        $this->page->set($key, $value);
+    }
+
+    protected function getDefaultPageInfo()
+    {
+        if (!$this->app->cache->isCached('quickjump')) {
+            $this->app->cache->store('quickjump', \model\cache::get_quickjump());
+        }
+
+        $data = array(
+            'title' => feather_escape($this->app->forum_settings['o_board_title']),
+            'page_number' => null,
+            'active_page' => 'index',
+            'focus_element' => null,
+            'is_indexed' => true,
+            'admin_console' => false,
+            'page_head' => null,
+            'paging_links' => null,
+            'required_fields' => null,
+            'footer_style' => null,
+            'quickjump' => $this->app->cache->retrieve('quickjump'),
+            'fid' => null,
+            'pid' => null,
+            'tid' => null,
+        );
+
+        if ($this->app->user->is_admmod) {
+            $data['has_reports'] = \model\header::get_reports();
+        }
+
+        return $data;
+    }
+}

From 9d10254cbba84f9dc81d77b6ca51d26796175fb2 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 15:57:54 +0200
Subject: [PATCH 207/353] Add support for custom params in assetManager

---
 include/classes/view.class.php      | 24 ++++++++++++++++++++----
 style/FeatherBB/view/footer.new.php |  7 ++++++-
 style/FeatherBB/view/header.new.php |  9 +++++++--
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index bea59322..da46ec7a 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -285,17 +285,19 @@ protected function validate($key, $value)
         return array($key, $value);
     }
 
-    public function addAsset($type, $asset, $params = null)
+    public function addAsset($type, $asset, $params = array())
     {
         $type = (string) $type;
-        if (!in_array($type, array('js', 'css'))) {
+        if (!in_array($type, array('js', 'css', 'alternate'))) {
             throw new \Exception('Invalid asset type : ' . $type);
         }
-        if (!is_file($this->app->forum_env['FEATHER_ROOT'].$asset)) {
+        if (in_array($type, array('js', 'css')) && !is_file($this->app->forum_env['FEATHER_ROOT'].$asset)) {
             throw new \Exception('The asset file ' . $asset . ' does not exist');
         }
+
+        $params = array_merge(static::getDefaultParams($type), $params);
         $this->assets[$type][] = array(
-            'file' => $asset,
+            'file' => (string) $asset,
             'params' => $params
         );
     }
@@ -371,4 +373,18 @@ protected function getDefaultPageInfo()
 
         return $data;
     }
+
+    protected static function getDefaultParams($type)
+    {
+        switch($type) {
+            case 'js':
+                return array('type' => 'text/javascript');
+            case 'css':
+                return array('rel' => 'stylesheet', 'type' => 'text/css');
+            case 'alternate':
+                return array('rel' => 'alternate', 'type' => 'application/atom+xml');
+            default:
+                return array();
+        }
+    }
 }
diff --git a/style/FeatherBB/view/footer.new.php b/style/FeatherBB/view/footer.new.php
index de5cdb2e..a749b61d 100644
--- a/style/FeatherBB/view/footer.new.php
+++ b/style/FeatherBB/view/footer.new.php
@@ -143,6 +143,11 @@
 </body>
 <!-- JS -->
 <?php foreach ($assets['js'] as $script) {
-    echo '<script src="'.get_base_url().'/'.$script['file'].'"></script>'."\n";
+
+    echo '<script ';
+    foreach ($script['params'] as $key => $value) {
+        echo $key.'="'.$value.'" ';
+    }
+    echo 'href="'.get_base_url().'/'.$script['file'].'"/>'."\n";
 } ?>
 </html>
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index 539d17ba..b1f1fc85 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -21,7 +21,12 @@
     <title><?php echo generate_page_title($title, $page_number) ?></title>
     <!-- CSS -->
 <?php foreach ($assets['css'] as $style) {
-    echo "\t".'<link rel="stylesheet" type="text/css" href="'.get_base_url().'/'.$style['file'].'">'."\n";
+
+    echo "\t".'<link ';
+    foreach ($style['params'] as $key => $value) {
+        echo $key.'="'.$value.'" ';
+    }
+    echo 'href="'.get_base_url().'/'.$style['file'].'">'."\n";
 }
 if ($admin_console) {
     if (file_exists($feather->forum_env['FEATHER_ROOT'].'style/'.$feather->user->style.'/base_admin.css')) {
@@ -29,7 +34,7 @@
     } else {
         echo "\t".'<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/imports/base_admin.css" />'."\n";
     }
-}  
+}
 if (isset($required_fields)) :
     // Output JavaScript to validate form (make sure required fields are filled out)
 

From d825dcb623551247540fb08310f966fd43e5379a Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 16:28:58 +0200
Subject: [PATCH 208/353] Add support for canonical, feed, prev, next link
 types in assetManager

---
 controller/viewforum.php       | 35 +++++++++++-----------------------
 include/classes/view.class.php | 10 ++++++++--
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/controller/viewforum.php b/controller/viewforum.php
index 176116f0..ff661f89 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -14,23 +14,13 @@ class viewforum
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\viewforum();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/forum.mo');
     }
 
     public function display($id, $name = null, $page = null)
     {
-        if ($this->user->g_read_board == '0') {
+        if ($this->feather->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
 
@@ -49,22 +39,22 @@ public function display($id, $name = null, $page = null)
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
         $mods_array = ($cur_forum['moderators'] != '') ? unserialize($cur_forum['moderators']) : array();
-        $is_admmod = ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && array_key_exists($this->user->username, $mods_array))) ? true : false;
+        $is_admmod = ($this->feather->user->g_id == FEATHER_ADMIN || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
 
         $sort_by = $this->model->sort_forum_by($cur_forum['sort_by']);
 
         // Can we or can we not post new topics?
-        if (($cur_forum['post_topics'] == '' && $this->user->g_post_topics == '1') || $cur_forum['post_topics'] == '1' || $is_admmod) {
+        if (($cur_forum['post_topics'] == '' && $this->feather->user->g_post_topics == '1') || $cur_forum['post_topics'] == '1' || $is_admmod) {
             $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/new-topic/'.$id.'/').'">'.__('Post topic').'</a></p>'."\n";
         } else {
             $post_link = '';
         }
 
         // Determine the topic offset (based on $page)
-        $num_pages = ceil($cur_forum['num_topics'] / $this->user->disp_topics);
+        $num_pages = ceil($cur_forum['num_topics'] / $this->feather->user->disp_topics);
 
         $p = (!isset($page) || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
-        $start_from = $this->user->disp_topics * ($p - 1);
+        $start_from = $this->feather->user->disp_topics * ($p - 1);
         $url_forum = url_friendly($cur_forum['forum_name']);
 
         // Generate paging links
@@ -72,22 +62,20 @@ public function display($id, $name = null, $page = null)
 
         $forum_actions = $this->model->get_forum_actions($id, $this->feather->forum_settings['o_forum_subscriptions'], $cur_forum['is_subscribed']);
 
-        $page_head = array();
-        $page_head['canonical'] = "\t".'<link href="'.get_link('forum/'.$id.'/'.$url_forum.'/').'" rel="canonical" />';
-
+        $this->feather->view2->addAsset('canonical', get_link('forum/'.$id.'/'.$url_forum.'/'));
         if ($num_pages > 1) {
             if ($p > 1) {
-                $page_head['prev'] = "\t".'<link href="'.get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/').'" rel="prev" />';
+                $this->feather->view2->addAsset('prev', get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
             }
             if ($p < $num_pages) {
-                $page_head['next'] = "\t".'<link href="'.get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/').'" rel="next" />';
+                $this->feather->view2->addAsset('next', get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
             }
         }
 
         if ($this->feather->forum_settings['o_feed_type'] == '1') {
-            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;fid='.$id.'&amp;type=rss" title="'.__('RSS forum feed').'" />';
+            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=rss', array('title' => __('RSS forum feed')));
         } elseif ($this->feather->forum_settings['o_feed_type'] == '2') {
-            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;fid='.$id.'&amp;type=atom" title="'.__('Atom forum feed').'" />';
+            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=atom', array('title' => __('Atom forum feed')));
         }
 
         $this->feather->view2->setPageInfo(array(
@@ -99,7 +87,6 @@ public function display($id, $name = null, $page = null)
             'id' => $id,
             'forum_data' => $this->model->print_topics($id, $sort_by, $start_from),
             'cur_forum' => $cur_forum,
-            'page_head' => $page_head,
             'post_link' => $post_link,
             'start_from' => $start_from,
             'url_forum' => $url_forum,
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index da46ec7a..9e8a8daf 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -288,7 +288,7 @@ protected function validate($key, $value)
     public function addAsset($type, $asset, $params = array())
     {
         $type = (string) $type;
-        if (!in_array($type, array('js', 'css', 'alternate'))) {
+        if (!in_array($type, array('js', 'css', 'feed', 'canonical', 'prev', 'next'))) {
             throw new \Exception('Invalid asset type : ' . $type);
         }
         if (in_array($type, array('js', 'css')) && !is_file($this->app->forum_env['FEATHER_ROOT'].$asset)) {
@@ -381,8 +381,14 @@ protected static function getDefaultParams($type)
                 return array('type' => 'text/javascript');
             case 'css':
                 return array('rel' => 'stylesheet', 'type' => 'text/css');
-            case 'alternate':
+            case 'feed':
                 return array('rel' => 'alternate', 'type' => 'application/atom+xml');
+            case 'canonical':
+                return array('rel' => 'canonical');
+            case 'prev':
+                return array('rel' => 'prev');
+            case 'next':
+                return array('rel' => 'next');
             default:
                 return array();
         }

From 585beb3b6176f9b277b8d34abfef41c6493a7e06 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 16:29:07 +0200
Subject: [PATCH 209/353] Update asset display in header/footer

---
 style/FeatherBB/view/footer.new.php |  1 -
 style/FeatherBB/view/header.new.php | 19 ++++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/style/FeatherBB/view/footer.new.php b/style/FeatherBB/view/footer.new.php
index a749b61d..13b79669 100644
--- a/style/FeatherBB/view/footer.new.php
+++ b/style/FeatherBB/view/footer.new.php
@@ -143,7 +143,6 @@
 </body>
 <!-- JS -->
 <?php foreach ($assets['js'] as $script) {
-
     echo '<script ';
     foreach ($script['params'] as $key => $value) {
         echo $key.'="'.$value.'" ';
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index b1f1fc85..ff65adda 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -19,14 +19,19 @@
     echo "\t".'<meta name="robots" content="noindex, follow">'."\n";
 } ?>
     <title><?php echo generate_page_title($title, $page_number) ?></title>
-    <!-- CSS -->
-<?php foreach ($assets['css'] as $style) {
-
-    echo "\t".'<link ';
-    foreach ($style['params'] as $key => $value) {
-        echo $key.'="'.$value.'" ';
+<?php
+foreach($assets as $type => $items) {
+    if ($type == 'js') {
+        continue;
+    }
+    echo "\t".'<!-- '.ucfirst($type).' -->'."\n";
+    foreach ($items as $item) {
+        echo "\t".'<link ';
+        foreach ($item['params'] as $key => $value) {
+            echo $key.'="'.$value.'" ';
+        }
+        echo 'href="'.get_base_url().'/'.$item['file'].'">'."\n";
     }
-    echo 'href="'.get_base_url().'/'.$style['file'].'">'."\n";
 }
 if ($admin_console) {
     if (file_exists($feather->forum_env['FEATHER_ROOT'].'style/'.$feather->user->style.'/base_admin.css')) {

From 65af954529a17da298b4bc79d9dc72b085dd3d42 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 16:38:45 +0200
Subject: [PATCH 210/353] Update view topic to use assetManager

---
 controller/viewtopic.php       | 45 ++++++++++++++++++++--------------
 include/classes/view.class.php |  3 +++
 model/viewforum.php            | 31 +----------------------
 model/viewtopic.php            | 31 +----------------------
 4 files changed, 32 insertions(+), 78 deletions(-)

diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index 99d7ac09..a37d1f3c 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -14,26 +14,22 @@ class viewtopic
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
         $this->model = new \model\viewtopic();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/topic.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/post.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/bbeditor.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/topic.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/post.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/bbeditor.mo');
     }
 
     public function display($id = null, $name = null, $page = null, $pid = null)
     {
         global $pd;
 
-        if ($this->user->g_read_board == '0') {
+        if ($this->feather->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
 
         // Antispam feature
-        require $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/antispam.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
         // Fetch some informations about the topic
@@ -41,7 +37,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
         $mods_array = ($cur_topic['moderators'] != '') ? unserialize($cur_topic['moderators']) : array();
-        $is_admmod = ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && array_key_exists($this->user->username, $mods_array))) ? true : false;
+        $is_admmod = ($this->feather->user->g_id == FEATHER_ADMIN || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
         if ($is_admmod) {
             $admin_ids = get_admin_ids();
         }
@@ -50,17 +46,17 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         $post_link = $this->model->get_post_link($id, $cur_topic['closed'], $cur_topic['post_replies'], $is_admmod);
 
         // Add/update this topic in our list of tracked topics
-        if (!$this->user->is_guest) {
+        if (!$this->feather->user->is_guest) {
             $tracked_topics = get_tracked_topics();
             $tracked_topics['topics'][$id] = time();
             set_tracked_topics($tracked_topics);
         }
 
         // Determine the post offset (based on $_GET['p'])
-        $num_pages = ceil(($cur_topic['num_replies'] + 1) / $this->user->disp_posts);
+        $num_pages = ceil(($cur_topic['num_replies'] + 1) / $this->feather->user->disp_posts);
 
         $p = (!isset($page) || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
-        $start_from = $this->user->disp_posts * ($p - 1);
+        $start_from = $this->feather->user->disp_posts * ($p - 1);
 
         $url_topic = url_friendly($cur_topic['subject']);
         $url_forum = url_friendly($cur_topic['forum_name']);
@@ -68,16 +64,14 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         // Generate paging links
         $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'topic/'.$id.'/'.$url_topic.'/#');
 
-        if ($this->config['o_censoring'] == '1') {
+        if ($this->feather->forum_settings['o_censoring'] == '1') {
             $cur_topic['subject'] = censor_words($cur_topic['subject']);
         }
 
         $quickpost = $this->model->is_quickpost($cur_topic['post_replies'], $cur_topic['closed'], $is_admmod);
-
         $subscraction = $this->model->get_subscraction($cur_topic['is_subscribed'], $id);
 
         require $this->feather->forum_env['FEATHER_ROOT'].'include/parser.php';
-
         $lang_bbeditor = array(
             'btnBold' => __('btnBold'),
             'btnItalic' => __('btnItalic'),
@@ -97,12 +91,27 @@ public function display($id = null, $name = null, $page = null, $pid = null)
             'promptQuote' => __('promptQuote')
         );
 
+        $this->feather->view2->addAsset('canonical', get_link('forum/'.$id.'/'.$url_forum.'/'));
+        if ($num_pages > 1) {
+            if ($p > 1) {
+                $this->feather->view2->addAsset('prev', get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
+            }
+            if ($p < $num_pages) {
+                $this->feather->view2->addAsset('next', get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
+            }
+        }
+
+        if ($this->feather->forum_settings['o_feed_type'] == '1') {
+            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=rss', array('title' => __('RSS forum feed')));
+        } elseif ($this->feather->forum_settings['o_feed_type'] == '2') {
+            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=atom', array('title' => __('Atom forum feed')));
+        }
+
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->config['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject'])),
+            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject'])),
             'active_page' => 'viewtopic',
             'page_number'  =>  $p,
             'paging_links'  =>  $paging_links,
-            'page_head'  =>  $this->model->get_page_head($id, $num_pages, $p, $url_topic),
             'is_indexed' => true,
             'id' => $id,
             'pid' => $pid,
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 9e8a8daf..4259cda6 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -296,6 +296,9 @@ public function addAsset($type, $asset, $params = array())
         }
 
         $params = array_merge(static::getDefaultParams($type), $params);
+        if (isset($params['title'])) {
+            $params['title'] = feather_escape($params['title']);
+        }
         $this->assets[$type][] = array(
             'file' => (string) $asset,
             'params' => $params
diff --git a/model/viewforum.php b/model/viewforum.php
index 6579c292..d88a0e6c 100644
--- a/model/viewforum.php
+++ b/model/viewforum.php
@@ -22,7 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
     }
- 
+
     // Returns basic informations about the forum
     public function get_info_forum($id)
     {
@@ -93,35 +93,6 @@ public function sort_forum_by($sort_by_sql)
         return $sort_by;
     }
 
-    // Adds relationship meta tags
-    public function get_page_head($forum_id, $num_pages, $p, $url_forum)
-    {
-        $page_head = array();
-
-        $page_head = $this->hook->fire('get_page_head_start', $page_head, $forum_id, $num_pages, $p, $url_forum);
-
-        $page_head['canonical'] = "\t".'<link href="'.get_link('forum/'.$forum_id.'/'.$url_forum.'/').'" rel="canonical" />';
-
-        if ($num_pages > 1) {
-            if ($p > 1) {
-                $page_head['prev'] = "\t".'<link href="'.get_link('forum/'.$forum_id.'/'.$url_forum.'/page/'.($p - 1).'/').'" rel="prev" />';
-            }
-            if ($p < $num_pages) {
-                $page_head['next'] = "\t".'<link href="'.get_link('forum/'.$forum_id.'/'.$url_forum.'/page/'.($p + 1).'/').'" rel="next" />';
-            }
-        }
-
-        if ($this->config['o_feed_type'] == '1') {
-            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss" title="'.__('RSS forum feed').'" />';
-        } elseif ($this->config['o_feed_type'] == '2') {
-            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom" title="'.__('Atom forum feed').'" />';
-        }
-
-        $page_head = $this->hook->fire('get_page_head', $page_head);
-
-        return $page_head;
-    }
-
     // Returns forum action
     public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
     {
diff --git a/model/viewtopic.php b/model/viewtopic.php
index 444b23ef..6a8f6674 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -219,35 +219,6 @@ public function get_subscraction($is_subscribed, $topic_id)
         return $subscraction;
     }
 
-    // Adds relationship meta tags
-    public function get_page_head($topic_id, $num_pages, $p, $url_topic)
-    {
-        $page_head = array();
-
-        $page_head = $this->hook->fire('get_page_head_start', $page_head, $topic_id, $num_pages, $p, $url_topic);
-
-        $page_head['canonical'] = "\t".'<link href="'.get_link('topic/'.$topic_id.'/'.$url_topic.'/').'" rel="canonical" />';
-
-        if ($num_pages > 1) {
-            if ($p > 1) {
-                $page_head['prev'] = "\t".'<link href="'.get_link('topic/'.$topic_id.'/'.$url_topic.'/page/'.($p - 1).'/').'" rel="prev" />';
-            }
-            if ($p < $num_pages) {
-                $page_head['next'] = "\t".'<link href="'.get_link('topic/'.$topic_id.'/'.$url_topic.'/page/'.($p + 1).'/').'" rel="next" />';
-            }
-        }
-
-        if ($this->config['o_feed_type'] == '1') {
-            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=rss" title="'.__('RSS topic feed').'" />';
-        } elseif ($this->config['o_feed_type'] == '2') {
-            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=atom" title="'.__('Atom topic feed').'" />';
-        }
-
-        $page_head = $this->hook->fire('get_page_head', $page_head, $topic_id, $num_pages, $p, $url_topic);
-
-        return $page_head;
-    }
-
     // Prints the posts
     public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
     {
@@ -435,7 +406,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
 
         return $post_data;
     }
-    
+
     public function increment_views($id)
     {
         if ($this->config['o_topic_views'] == '1') {

From 8d4eb7601d85ef790aa59cfb6d1977c73611a2b8 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 16:54:18 +0200
Subject: [PATCH 211/353] Update userlist controller

---
 controller/userlist.php | 58 ++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 38 deletions(-)

diff --git a/controller/userlist.php b/controller/userlist.php
index 44a42e5d..671724dc 100644
--- a/controller/userlist.php
+++ b/controller/userlist.php
@@ -14,47 +14,36 @@ class userlist
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\userlist();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/search.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/userlist.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/search.mo');
     }
 
     public function display()
     {
-        if ($this->user->g_read_board == '0') {
+        if ($this->feather->user->g_read_board == '0') {
             message(__('No view'), '403');
-        } elseif ($this->user->g_view_users == '0') {
+        } elseif ($this->feather->user->g_view_users == '0') {
             message(__('No permission'), '403');
         }
 
         // Determine if we are allowed to view post counts
-        $show_post_count = ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) ? true : false;
+        $show_post_count = ($this->feather->forum_settings['o_show_post_count'] == '1' || $this->feather->user->is_admmod) ? true : false;
 
-        $username = $this->request->get('username') && $this->user->g_search_users == '1' ? feather_trim($this->request->get('username')) : '';
-        $show_group = $this->request->get('show_group') ? intval($this->request->get('show_group')) : -1;
-        $sort_by = $this->request->get('sort_by') && (in_array($this->request->get('sort_by'), array('username', 'registered')) || ($this->request->get('sort_by') == 'num_posts' && $show_post_count)) ? $this->request->get('sort_by') : 'username';
-        $sort_dir = $this->request->get('sort_dir') && $this->request->get('sort_dir') == 'DESC' ? 'DESC' : 'ASC';
+        $username = $this->feather->request->get('username') && $this->feather->user->g_search_users == '1' ? feather_trim($this->feather->request->get('username')) : '';
+        $show_group = $this->feather->request->get('show_group') ? intval($this->feather->request->get('show_group')) : -1;
+        $sort_by = $this->feather->request->get('sort_by') && (in_array($this->feather->request->get('sort_by'), array('username', 'registered')) || ($this->feather->request->get('sort_by') == 'num_posts' && $show_post_count)) ? $this->feather->request->get('sort_by') : 'username';
+        $sort_dir = $this->feather->request->get('sort_dir') && $this->feather->request->get('sort_dir') == 'DESC' ? 'DESC' : 'ASC';
 
         $num_users = $this->model->fetch_user_count($username, $show_group);
 
         // Determine the user offset (based on $page)
         $num_pages = ceil($num_users / 50);
 
-        $p = (!$this->request->get('p') || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
+        $p = (!$this->feather->request->get('p') || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
         $start_from = 50 * ($p - 1);
 
-        if ($this->user->g_search_users == '1') {
+        if ($this->feather->user->g_search_users == '1') {
             $focus_element = array('userlist', 'username');
         }
         else {
@@ -65,26 +54,19 @@ public function display()
         $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->config['o_board_title']), __('User list')),
+            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('User list')),
             'active_page' => 'userlist',
             'page_number'  =>  $p,
             'paging_links'  =>  $paging_links,
             'focus_element' => $focus_element,
             'is_indexed' => true,
-        ));
-
-        $this->feather->view2->display('userlist.php', array(
-                            'feather' => $this->feather,
-                            'username' => $username,
-                            'show_group' => $show_group,
-                            'sort_by' => $sort_by,
-                            'sort_dir' => $sort_dir,
-                            'show_post_count' => $show_post_count,
-                            'paging_links' => $paging_links,
-                            'feather_config' => $this->config,
-                            'dropdown_menu' => $this->model->generate_dropdown_menu($show_group),
-                            'userlist_data' => $this->model->print_users($username, $start_from, $sort_by, $sort_dir, $show_group),
-                            )
-                    );
+            'username' => $username,
+            'show_group' => $show_group,
+            'sort_by' => $sort_by,
+            'sort_dir' => $sort_dir,
+            'show_post_count' => $show_post_count,
+            'dropdown_menu' => $this->model->generate_dropdown_menu($show_group),
+            'userlist_data' => $this->model->print_users($username, $start_from, $sort_by, $sort_dir, $show_group),
+        ))->addTemplate('userlist.php')->display();
     }
 }

From 52cb64a10e23efcc8702961cf597a49bcd899164 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 16:58:46 +0200
Subject: [PATCH 212/353] Update post controller and view

---
 controller/post.php           | 61 +++++++++++++----------------------
 style/FeatherBB/view/post.php | 16 ++++-----
 2 files changed, 31 insertions(+), 46 deletions(-)

diff --git a/controller/post.php b/controller/post.php
index fd8534d5..5400a9dc 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -14,23 +14,12 @@ class post
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\post();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/post.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/register.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/antispam.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/bbeditor.mo');
     }
 
     public function newreply($fid = null, $tid = null, $qid = null)
@@ -41,11 +30,11 @@ public function newreply($fid = null, $tid = null, $qid = null)
     public function newpost($fid = null, $tid = null, $qid = null)
     {
         // Antispam feature
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
         // If $_POST['username'] is filled, we are facing a bot
-        if ($this->request->post('username')) {
+        if ($this->feather->request->post('username')) {
             message(__('Bad request'), '404');
         }
 
@@ -61,11 +50,11 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
         $mods_array = ($cur_posting['moderators'] != '') ? unserialize($cur_posting['moderators']) : array();
-        $is_admmod = ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && array_key_exists($this->user->username, $mods_array))) ? true : false;
+        $is_admmod = ($this->feather->user->g_id == FEATHER_ADMIN || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
 
         // Do we have permission to post?
-        if ((($tid && (($cur_posting['post_replies'] == '' && $this->user->g_post_replies == '0') || $cur_posting['post_replies'] == '0')) ||
-                ($fid && (($cur_posting['post_topics'] == '' && $this->user->g_post_topics == '0') || $cur_posting['post_topics'] == '0')) ||
+        if ((($tid && (($cur_posting['post_replies'] == '' && $this->feather->user->g_post_replies == '0') || $cur_posting['post_replies'] == '0')) ||
+                ($fid && (($cur_posting['post_topics'] == '' && $this->feather->user->g_post_topics == '0') || $cur_posting['post_topics'] == '0')) ||
                 (isset($cur_posting['closed']) && $cur_posting['closed'] == '1')) &&
                 !$is_admmod) {
             message(__('No permission'), '403');
@@ -80,14 +69,14 @@ public function newpost($fid = null, $tid = null, $qid = null)
         if ($this->feather->request()->isPost()) {
 
                 // Include $pid and $page if needed for confirm_referrer function called in check_errors_before_post()
-                if ($this->request->post('pid')) {
-                    $pid = $this->request->post('pid');
+                if ($this->feather->request->post('pid')) {
+                    $pid = $this->feather->request->post('pid');
                 } else {
                     $pid = '';
                 }
 
-            if ($this->request->post('page')) {
-                $page = $this->request->post('page');
+            if ($this->feather->request->post('page')) {
+                $page = $this->feather->request->post('page');
             } else {
                 $page = '';
             }
@@ -99,14 +88,14 @@ public function newpost($fid = null, $tid = null, $qid = null)
                 $post = $this->model->setup_variables($errors, $is_admmod);
 
                 // Did everything go according to plan?
-                if (empty($errors) && !$this->request->post('preview')) {
+                if (empty($errors) && !$this->feather->request->post('preview')) {
                         // If it's a reply
                         if ($tid) {
                             // Insert the reply, get the new_pid
                                 $new = $this->model->insert_reply($post, $tid, $cur_posting, $is_subscribed);
 
                                 // Should we send out notifications?
-                                if ($this->config['o_topic_subscriptions'] == '1') {
+                                if ($this->feather->forum_settings['o_topic_subscriptions'] == '1') {
                                     $this->model->send_notifications_reply($tid, $cur_posting, $new['pid'], $post);
                                 }
                         }
@@ -116,18 +105,18 @@ public function newpost($fid = null, $tid = null, $qid = null)
                                 $new = $this->model->insert_topic($post, $fid);
 
                                 // Should we send out notifications?
-                                if ($this->config['o_forum_subscriptions'] == '1') {
+                                if ($this->feather->forum_settings['o_forum_subscriptions'] == '1') {
                                     $this->model->send_notifications_new_topic($post, $cur_posting, $new['tid']);
                                 }
                         }
 
                         // If we previously found out that the email was banned
-                        if ($this->user->is_guest && isset($errors['banned_email']) && $this->config['o_mailing_list'] != '') {
+                        if ($this->feather->user->is_guest && isset($errors['banned_email']) && $this->feather->forum_settings['o_mailing_list'] != '') {
                             $this->model->warn_banned_user($post, $new['pid']);
                         }
 
                         // If the posting user is logged in, increment his/her post count
-                        if (!$this->user->is_guest) {
+                        if (!$this->feather->user->is_guest) {
                             $this->model->increment_post_count($post, $new['tid']);
                         }
 
@@ -167,13 +156,13 @@ public function newpost($fid = null, $tid = null, $qid = null)
         }
 
         $required_fields = array('req_email' => __('Email'), 'req_subject' => __('Subject'), 'req_message' => __('Message'));
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             $required_fields['captcha'] = __('Robot title');
         }
 
         // Set focus element (new post or new reply to an existing post ?)
         $focus_element[] = 'post';
-        if (!$this->user->is_guest) {
+        if (!$this->feather->user->is_guest) {
             $focus_element[] = ($fid) ? 'req_subject' : 'req_message';
         } else {
             $required_fields['req_username'] = __('Guest name');
@@ -184,7 +173,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
         $checkboxes = $this->model->get_checkboxes($fid, $is_admmod, $is_subscribed);
 
         // Check to see if the topic review is to be displayed
-        if ($tid && $this->config['o_topic_review'] != '0') {
+        if ($tid && $this->feather->forum_settings['o_topic_review'] != '0') {
             $post_data = $this->model->topic_review($tid);
         } else {
             $post_data = '';
@@ -210,23 +199,19 @@ public function newpost($fid = null, $tid = null, $qid = null)
         );
 
         $this->feather->view2->setPageInfo(array(
-                            'title' => array(feather_escape($this->config['o_board_title']), $action),
+                            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), $action),
                             'required_fields' => $required_fields,
                             'focus_element' => $focus_element,
                             'active_page' => 'post',
                             'post' => $post,
                             'tid' => $tid,
                             'fid' => $fid,
-                            'feather_config' => $this->config,
-                            'feather_user' => $this->user,
                             'cur_posting' => $cur_posting,
                             'lang_antispam' => $lang_antispam,
                             'lang_antispam_questions' => $lang_antispam_questions,
                             'lang_bbeditor'    =>    $lang_bbeditor,
                             'index_questions' => $index_questions,
                             'checkboxes' => $checkboxes,
-                            'cur_posting' => $cur_posting,
-                            'feather' => $this->feather,
                             'action' => $action,
                             'form' => $form,
                             'post_data' => $post_data,
diff --git a/style/FeatherBB/view/post.php b/style/FeatherBB/view/post.php
index f1d22d07..ee2531da 100644
--- a/style/FeatherBB/view/post.php
+++ b/style/FeatherBB/view/post.php
@@ -98,14 +98,14 @@
                                                 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if ($feather->user->is_guest) {
-    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-    $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
+    $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+    $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
 						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
     echo feather_escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
+						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
     echo feather_escape($post['email']);
 }
     ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
@@ -121,10 +121,10 @@
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -172,7 +172,7 @@
 
 
 <?php
-if ($tid && $feather_config['o_topic_review'] != '0') :
+if ($tid && $feather->forum_settings['o_topic_review'] != '0') :
 ?>
 <div id="postreview">
 	<h2><span><?php _e('Topic review') ?></span></h2>

From 8320676987ec0bf84c2af7fd906f0a83d2c4970f Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 17:11:51 +0200
Subject: [PATCH 213/353] Update misc controller and views

---
 controller/misc.php                 | 103 ++++++++++------------------
 style/FeatherBB/view/misc/email.php |   4 +-
 style/FeatherBB/view/misc/rules.php |   6 +-
 3 files changed, 43 insertions(+), 70 deletions(-)

diff --git a/controller/misc.php b/controller/misc.php
index 8ca7d4eb..914b0561 100644
--- a/controller/misc.php
+++ b/controller/misc.php
@@ -1,11 +1,11 @@
 <?php
 
 /**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
+* Copyright (C) 2015 FeatherBB
+* based on code by (C) 2008-2012 FluxBB
+* and Rickard Andersson (C) 2002-2008 PunBB
+* License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+*/
 
 namespace controller;
 
@@ -14,43 +14,26 @@ class misc
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\misc();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/misc.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/register.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/misc.mo');
     }
 
     public function rules()
     {
-        if ($this->config['o_rules'] == '0' || ($this->user->is_guest && $this->user->g_read_board == '0' && $this->config['o_regs_allow'] == '0')) {
+        if ($this->feather->forum_settings['o_rules'] == '0' || ($this->feather->user->is_guest && $this->feather->user->g_read_board == '0' && $this->feather->forum_settings['o_regs_allow'] == '0')) {
             message(__('Bad request'), '404');
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Forum rules'));
-
-        $this->header->setTitle($page_title)->setActivePage('rules')->display();
-
-        $this->feather->render('misc/rules.php', array(
-                'feather_config' => $this->config,
-                )
-        );
-
-        $this->footer->display();
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Forum rules')),
+            'active_page' => 'rules'
+            ))->addTemplate('misc/rules.php')->display();
     }
 
     public function markread()
     {
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             message(__('No permission'), '403');
         }
 
@@ -64,7 +47,7 @@ public function markread()
 
     public function markforumread($id)
     {
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             message(__('No permission'), '403');
         }
 
@@ -77,7 +60,7 @@ public function markforumread($id)
 
     public function subscribeforum($id)
     {
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             message(__('No permission'), '403');
         }
 
@@ -86,7 +69,7 @@ public function subscribeforum($id)
 
     public function subscribetopic($id)
     {
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             message(__('No permission'), '403');
         }
 
@@ -95,7 +78,7 @@ public function subscribetopic($id)
 
     public function unsubscribeforum($id)
     {
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             message(__('No permission'), '403');
         }
 
@@ -104,7 +87,7 @@ public function unsubscribeforum($id)
 
     public function unsubscribetopic($id)
     {
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             message(__('No permission'), '403');
         }
 
@@ -113,7 +96,7 @@ public function unsubscribetopic($id)
 
     public function email($id)
     {
-        if ($this->user->is_guest || $this->user->g_send_email == '0') {
+        if ($this->feather->user->is_guest || $this->feather->user->g_send_email == '0') {
             message(__('No permission'), '403');
         }
 
@@ -123,7 +106,7 @@ public function email($id)
 
         $mail = $this->model->get_info_mail($id);
 
-        if ($mail['email_setting'] == 2 && !$this->user->is_admmod) {
+        if ($mail['email_setting'] == 2 && !$this->feather->user->is_admmod) {
             message(__('Form email disabled'));
         }
 
@@ -132,24 +115,19 @@ public function email($id)
             $this->model->send_email($mail);
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Send email to').' '.feather_escape($mail['recipient']));
-        $required_fields = array('req_subject' => __('Email subject'), 'req_message' => __('Email message'));
-        $focus_element = array('email', 'req_subject');
-
-        $this->header->setTitle($page_title)->setActivePage('email')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
-
-        $this->feather->render('misc/email.php', array(
-                'id' => $id,
-                'mail' => $mail,
-                )
-        );
-
-        $this->footer->display();
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Send email to').' '.feather_escape($mail['recipient'])),
+            'active_page' => 'email',
+            'required_fields' => array('req_subject' => __('Email subject'), 'req_message' => __('Email message')),
+            'focus_element' => array('email', 'req_subject'),
+            'id' => $id,
+            'mail' => $mail
+            ))->addTemplate('misc/email.php')->display();
     }
 
     public function report($id)
     {
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             message(__('No permission'), '403');
         }
 
@@ -160,22 +138,17 @@ public function report($id)
         // Fetch some info about the post, the topic and the forum
         $cur_post = $this->model->get_info_report($id);
 
-        if ($this->config['o_censoring'] == '1') {
+        if ($this->feather->forum_settings['o_censoring'] == '1') {
             $cur_post['subject'] = censor_words($cur_post['subject']);
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Report post'));
-        $required_fields = array('req_reason' => __('Reason'));
-        $focus_element = array('report', 'req_reason');
-
-        $this->header->setTitle($page_title)->setActivePage('report')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
-
-        $this->feather->render('misc/report.php', array(
-                'id' => $id,
-                'cur_post' => $cur_post,
-                )
-        );
-
-        $this->footer->display();
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Report post')),
+            'active_page' => 'report',
+            'required_fields' => array('req_reason' => __('Reason')),
+            'focus_element' => array('report', 'req_reason'),
+            'id' => $id,
+            'cur_post' => $cur_post
+            ))->addTemplate('misc/report.php')->display();
     }
 }
diff --git a/style/FeatherBB/view/misc/email.php b/style/FeatherBB/view/misc/email.php
index eb44dafb..06f96f55 100644
--- a/style/FeatherBB/view/misc/email.php
+++ b/style/FeatherBB/view/misc/email.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -34,4 +34,4 @@
 			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/FeatherBB/view/misc/rules.php b/style/FeatherBB/view/misc/rules.php
index 366880ee..feb662ad 100644
--- a/style/FeatherBB/view/misc/rules.php
+++ b/style/FeatherBB/view/misc/rules.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -17,7 +17,7 @@
 	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<div id="rules-block" class="inbox">
-			<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
+			<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>

From 64ed94d138375e05837696d51ed8fed8cda76406 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Thu, 27 Aug 2015 17:17:26 +0200
Subject: [PATCH 214/353] Update delete controller

---
 controller/delete.php | 52 ++++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 35 deletions(-)

diff --git a/controller/delete.php b/controller/delete.php
index e6dc453d..a1eb2a45 100644
--- a/controller/delete.php
+++ b/controller/delete.php
@@ -14,76 +14,58 @@ class delete
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\delete();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/delete.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/delete.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/post.mo');
     }
 
     public function deletepost($id)
     {
         global $pd;
 
-        if ($this->user->g_read_board == '0') {
+        if ($this->feather->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
 
         // Fetch some informations about the post, the topic and the forum
         $cur_post = $this->model->get_info_delete($id);
 
-        if ($this->config['o_censoring'] == '1') {
+        if ($this->feather->forum_settings['o_censoring'] == '1') {
             $cur_post['subject'] = censor_words($cur_post['subject']);
         }
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
         $mods_array = ($cur_post['moderators'] != '') ? unserialize($cur_post['moderators']) : array();
-        $is_admmod = ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && array_key_exists($this->user->username, $mods_array))) ? true : false;
+        $is_admmod = ($this->feather->user->g_id == FEATHER_ADMIN || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
 
         $is_topic_post = ($id == $cur_post['first_post_id']) ? true : false;
 
         // Do we have permission to edit this post?
-        if (($this->user->g_delete_posts == '0' ||
-                ($this->user->g_delete_topics == '0' && $is_topic_post) ||
-                $cur_post['poster_id'] != $this->user->id ||
+        if (($this->feather->user->g_delete_posts == '0' ||
+                ($this->feather->user->g_delete_topics == '0' && $is_topic_post) ||
+                $cur_post['poster_id'] != $this->feather->user->id ||
                 $cur_post['closed'] == '1') &&
                 !$is_admmod) {
             message(__('No permission'), '403');
         }
 
-        if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
+        if ($is_admmod && $this->feather->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
             message(__('No permission'), '403');
         }
 
-
         if ($this->feather->request()->isPost()) {
             $this->model->handle_deletion($is_topic_post, $id, $cur_post['tid'], $cur_post['fid']);
         }
 
-
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Delete post'));
-
-        $this->header->setTitle($page_title)->setActivePage('delete')->display();
-
-        require FEATHER_ROOT.'include/parser.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'include/parser.php';
         $cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
 
-        $this->feather->render('delete.php', array(
-                            'cur_post' => $cur_post,
-                            'id' => $id,
-                            'is_topic_post' => $is_topic_post,
-                            )
-                    );
-
-        $this->footer->display();
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Delete post')),
+            'active_page' => 'delete',
+            'cur_post' => $cur_post,
+            'id' => $id,
+            'is_topic_post' => $is_topic_post
+        ))->addTemplate('delete.php')->display();
     }
 }

From a697647ac153d91bd975765f581e258e91ed8ecb Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 27 Aug 2015 17:33:06 +0200
Subject: [PATCH 215/353] Clean views

---
 style/FeatherBB/view/admin/censoring.php      |   2 +-
 .../view/admin/groups/add_edit_group.php      |   2 +-
 .../view/admin/groups/admin_groups.php        |   4 +-
 style/FeatherBB/view/admin/index.php          |   2 +-
 style/FeatherBB/view/admin/menu.php           |   2 +-
 style/FeatherBB/view/admin/options.php        | 264 +++++++++---------
 style/FeatherBB/view/admin/parser.php         |   2 +-
 style/FeatherBB/view/admin/permissions.php    |  44 +--
 style/FeatherBB/view/edit.php                 |   8 +-
 style/FeatherBB/view/footer.php               |  16 +-
 style/FeatherBB/view/header.php               |   8 +-
 style/FeatherBB/view/help.php                 |   2 +-
 .../view/moderate/moderator_forum.php         |   6 +-
 .../view/profile/section_display.php          |  12 +-
 .../view/profile/section_personality.php      |  14 +-
 .../view/profile/section_privacy.php          |   4 +-
 style/FeatherBB/view/register/form.php        |  10 +-
 style/FeatherBB/view/register/rules.php       |   2 +-
 style/FeatherBB/view/search/form.php          |   2 +-
 19 files changed, 203 insertions(+), 203 deletions(-)

diff --git a/style/FeatherBB/view/admin/censoring.php b/style/FeatherBB/view/admin/censoring.php
index 71c253f7..cf080869 100644
--- a/style/FeatherBB/view/admin/censoring.php
+++ b/style/FeatherBB/view/admin/censoring.php
@@ -22,7 +22,7 @@
 					<fieldset>
 						<legend><?php _e('Add word subhead') ?></legend>
 						<div class="infldset">
-							<p><?php _e('Add word info').' '.($feather_config['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
+							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
 							<table>
 							<thead>
 								<tr>
diff --git a/style/FeatherBB/view/admin/groups/add_edit_group.php b/style/FeatherBB/view/admin/groups/add_edit_group.php
index bc2bc244..ae278dce 100644
--- a/style/FeatherBB/view/admin/groups/add_edit_group.php
+++ b/style/FeatherBB/view/admin/groups/add_edit_group.php
@@ -54,7 +54,7 @@
 										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
 									</td>
 								</tr>
-<?php if ($group['mode'] != 'edit' || $feather_config['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
+<?php if ($group['mode'] != 'edit' || $feather->forum_settings['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
 									<th scope="row"> <?php _e('Mod privileges label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
diff --git a/style/FeatherBB/view/admin/groups/admin_groups.php b/style/FeatherBB/view/admin/groups/admin_groups.php
index 643b4883..aff5db98 100644
--- a/style/FeatherBB/view/admin/groups/admin_groups.php
+++ b/style/FeatherBB/view/admin/groups/admin_groups.php
@@ -31,7 +31,7 @@
 
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
-        if ($cur_group['g_id'] == $feather_config['o_default_user_group']) {
+        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
         } else {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
@@ -64,7 +64,7 @@
 
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
-        if ($cur_group['g_id'] == $feather_config['o_default_user_group']) {
+        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
         } else {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
diff --git a/style/FeatherBB/view/admin/index.php b/style/FeatherBB/view/admin/index.php
index dc0dcf8c..f369b039 100644
--- a/style/FeatherBB/view/admin/index.php
+++ b/style/FeatherBB/view/admin/index.php
@@ -45,7 +45,7 @@
 				<dl>
 					<dt><?php _e('FeatherBB version label') ?></dt>
 					<dd>
-						<?php printf(__('FeatherBB version data')."\n", $feather_config['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
+						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
 					</dd>
 					<dt><?php _e('Server statistics label') ?></dt>
 					<dd>
diff --git a/style/FeatherBB/view/admin/menu.php b/style/FeatherBB/view/admin/menu.php
index b33c2727..d958a4ab 100644
--- a/style/FeatherBB/view/admin/menu.php
+++ b/style/FeatherBB/view/admin/menu.php
@@ -32,7 +32,7 @@
 }
     ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
 <?php endif;
-    if ($is_admin || $feather_config['o_report_method'] == '0' || $feather_config['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
+    if ($is_admin || $feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
     echo ' class="isactive"';
 }
     ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
diff --git a/style/FeatherBB/view/admin/options.php b/style/FeatherBB/view/admin/options.php
index faa8e34c..88c2c0b6 100644
--- a/style/FeatherBB/view/admin/options.php
+++ b/style/FeatherBB/view/admin/options.php
@@ -28,21 +28,21 @@
 								<tr>
 									<th scope="row"><?php _e('Board title label') ?></th>
 									<td>
-										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather_config['o_board_title']) ?>" />
+										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>" />
 										<span><?php _e('Board title help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Board desc label') ?></th>
 									<td>
-										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather_config['o_board_desc']) ?></textarea>
+										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather->forum_settings['o_board_desc']) ?></textarea>
 										<span><?php _e('Board desc help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Base URL label') ?></th>
 									<td>
-										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather_config['o_base_url']) ?>" />
+										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather->forum_settings['o_base_url']) ?>" />
 										<span><?php _e('Base URL help') ?></span>
 									</td>
 								</tr>
@@ -50,124 +50,124 @@
 									<th scope="row"><?php _e('Timezone label') ?></th>
 									<td>
 										<select name="form_default_timezone">
-											<option value="-12"<?php if ($feather_config['o_default_timezone'] == -12) {
+											<option value="-12"<?php if ($feather->forum_settings['o_default_timezone'] == -12) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-12:00') ?></option>
-											<option value="-11"<?php if ($feather_config['o_default_timezone'] == -11) {
+											<option value="-11"<?php if ($feather->forum_settings['o_default_timezone'] == -11) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-11:00') ?></option>
-											<option value="-10"<?php if ($feather_config['o_default_timezone'] == -10) {
+											<option value="-10"<?php if ($feather->forum_settings['o_default_timezone'] == -10) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-10:00') ?></option>
-											<option value="-9.5"<?php if ($feather_config['o_default_timezone'] == -9.5) {
+											<option value="-9.5"<?php if ($feather->forum_settings['o_default_timezone'] == -9.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-09:30') ?></option>
-											<option value="-9"<?php if ($feather_config['o_default_timezone'] == -9) {
+											<option value="-9"<?php if ($feather->forum_settings['o_default_timezone'] == -9) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-09:00') ?></option>
-											<option value="-8.5"<?php if ($feather_config['o_default_timezone'] == -8.5) {
+											<option value="-8.5"<?php if ($feather->forum_settings['o_default_timezone'] == -8.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-08:30') ?></option>
-											<option value="-8"<?php if ($feather_config['o_default_timezone'] == -8) {
+											<option value="-8"<?php if ($feather->forum_settings['o_default_timezone'] == -8) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-08:00') ?></option>
-											<option value="-7"<?php if ($feather_config['o_default_timezone'] == -7) {
+											<option value="-7"<?php if ($feather->forum_settings['o_default_timezone'] == -7) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-07:00') ?></option>
-											<option value="-6"<?php if ($feather_config['o_default_timezone'] == -6) {
+											<option value="-6"<?php if ($feather->forum_settings['o_default_timezone'] == -6) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-06:00') ?></option>
-											<option value="-5"<?php if ($feather_config['o_default_timezone'] == -5) {
+											<option value="-5"<?php if ($feather->forum_settings['o_default_timezone'] == -5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-05:00') ?></option>
-											<option value="-4"<?php if ($feather_config['o_default_timezone'] == -4) {
+											<option value="-4"<?php if ($feather->forum_settings['o_default_timezone'] == -4) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-04:00') ?></option>
-											<option value="-3.5"<?php if ($feather_config['o_default_timezone'] == -3.5) {
+											<option value="-3.5"<?php if ($feather->forum_settings['o_default_timezone'] == -3.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-03:30') ?></option>
-											<option value="-3"<?php if ($feather_config['o_default_timezone'] == -3) {
+											<option value="-3"<?php if ($feather->forum_settings['o_default_timezone'] == -3) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-03:00') ?></option>
-											<option value="-2"<?php if ($feather_config['o_default_timezone'] == -2) {
+											<option value="-2"<?php if ($feather->forum_settings['o_default_timezone'] == -2) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-02:00') ?></option>
-											<option value="-1"<?php if ($feather_config['o_default_timezone'] == -1) {
+											<option value="-1"<?php if ($feather->forum_settings['o_default_timezone'] == -1) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-01:00') ?></option>
-											<option value="0"<?php if ($feather_config['o_default_timezone'] == 0) {
+											<option value="0"<?php if ($feather->forum_settings['o_default_timezone'] == 0) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC') ?></option>
-											<option value="1"<?php if ($feather_config['o_default_timezone'] == 1) {
+											<option value="1"<?php if ($feather->forum_settings['o_default_timezone'] == 1) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+01:00') ?></option>
-											<option value="2"<?php if ($feather_config['o_default_timezone'] == 2) {
+											<option value="2"<?php if ($feather->forum_settings['o_default_timezone'] == 2) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+02:00') ?></option>
-											<option value="3"<?php if ($feather_config['o_default_timezone'] == 3) {
+											<option value="3"<?php if ($feather->forum_settings['o_default_timezone'] == 3) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+03:00') ?></option>
-											<option value="3.5"<?php if ($feather_config['o_default_timezone'] == 3.5) {
+											<option value="3.5"<?php if ($feather->forum_settings['o_default_timezone'] == 3.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+03:30') ?></option>
-											<option value="4"<?php if ($feather_config['o_default_timezone'] == 4) {
+											<option value="4"<?php if ($feather->forum_settings['o_default_timezone'] == 4) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+04:00') ?></option>
-											<option value="4.5"<?php if ($feather_config['o_default_timezone'] == 4.5) {
+											<option value="4.5"<?php if ($feather->forum_settings['o_default_timezone'] == 4.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+04:30') ?></option>
-											<option value="5"<?php if ($feather_config['o_default_timezone'] == 5) {
+											<option value="5"<?php if ($feather->forum_settings['o_default_timezone'] == 5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+05:00') ?></option>
-											<option value="5.5"<?php if ($feather_config['o_default_timezone'] == 5.5) {
+											<option value="5.5"<?php if ($feather->forum_settings['o_default_timezone'] == 5.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+05:30') ?></option>
-											<option value="5.75"<?php if ($feather_config['o_default_timezone'] == 5.75) {
+											<option value="5.75"<?php if ($feather->forum_settings['o_default_timezone'] == 5.75) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+05:45') ?></option>
-											<option value="6"<?php if ($feather_config['o_default_timezone'] == 6) {
+											<option value="6"<?php if ($feather->forum_settings['o_default_timezone'] == 6) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+06:00') ?></option>
-											<option value="6.5"<?php if ($feather_config['o_default_timezone'] == 6.5) {
+											<option value="6.5"<?php if ($feather->forum_settings['o_default_timezone'] == 6.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+06:30') ?></option>
-											<option value="7"<?php if ($feather_config['o_default_timezone'] == 7) {
+											<option value="7"<?php if ($feather->forum_settings['o_default_timezone'] == 7) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+07:00') ?></option>
-											<option value="8"<?php if ($feather_config['o_default_timezone'] == 8) {
+											<option value="8"<?php if ($feather->forum_settings['o_default_timezone'] == 8) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+08:00') ?></option>
-											<option value="8.75"<?php if ($feather_config['o_default_timezone'] == 8.75) {
+											<option value="8.75"<?php if ($feather->forum_settings['o_default_timezone'] == 8.75) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+08:45') ?></option>
-											<option value="9"<?php if ($feather_config['o_default_timezone'] == 9) {
+											<option value="9"<?php if ($feather->forum_settings['o_default_timezone'] == 9) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+09:00') ?></option>
-											<option value="9.5"<?php if ($feather_config['o_default_timezone'] == 9.5) {
+											<option value="9.5"<?php if ($feather->forum_settings['o_default_timezone'] == 9.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+09:30') ?></option>
-											<option value="10"<?php if ($feather_config['o_default_timezone'] == 10) {
+											<option value="10"<?php if ($feather->forum_settings['o_default_timezone'] == 10) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+10:00') ?></option>
-											<option value="10.5"<?php if ($feather_config['o_default_timezone'] == 10.5) {
+											<option value="10.5"<?php if ($feather->forum_settings['o_default_timezone'] == 10.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+10:30') ?></option>
-											<option value="11"<?php if ($feather_config['o_default_timezone'] == 11) {
+											<option value="11"<?php if ($feather->forum_settings['o_default_timezone'] == 11) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+11:00') ?></option>
-											<option value="11.5"<?php if ($feather_config['o_default_timezone'] == 11.5) {
+											<option value="11.5"<?php if ($feather->forum_settings['o_default_timezone'] == 11.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+11:30') ?></option>
-											<option value="12"<?php if ($feather_config['o_default_timezone'] == 12) {
+											<option value="12"<?php if ($feather->forum_settings['o_default_timezone'] == 12) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+12:00') ?></option>
-											<option value="12.75"<?php if ($feather_config['o_default_timezone'] == 12.75) {
+											<option value="12.75"<?php if ($feather->forum_settings['o_default_timezone'] == 12.75) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+12:45') ?></option>
-											<option value="13"<?php if ($feather_config['o_default_timezone'] == 13) {
+											<option value="13"<?php if ($feather->forum_settings['o_default_timezone'] == 13) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+13:00') ?></option>
-											<option value="14"<?php if ($feather_config['o_default_timezone'] == 14) {
+											<option value="14"<?php if ($feather->forum_settings['o_default_timezone'] == 14) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+14:00') ?></option>
 										</select>
@@ -177,10 +177,10 @@
 								<tr>
 									<th scope="row"><?php _e('DST label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather_config['o_default_dst'] == '1') {
+										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather->forum_settings['o_default_dst'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather_config['o_default_dst'] == '0') {
+										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather->forum_settings['o_default_dst'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('DST help') ?></span>
@@ -192,7 +192,7 @@
 										<select name="form_default_lang">
 <?php
         foreach ($languages as $temp) {
-            if ($feather_config['o_default_lang'] == $temp) {
+            if ($feather->forum_settings['o_default_lang'] == $temp) {
                 echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
             } else {
                 echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
@@ -231,35 +231,35 @@
 								<tr>
 									<th scope="row"><?php _e('Time format label') ?></th>
 									<td>
-										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_time_format']) ?>" />
-										<span><?php printf(__('Time format help'), gmdate($feather_config['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather->forum_settings['o_time_format']) ?>" />
+										<span><?php printf(__('Time format help'), gmdate($feather->forum_settings['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Date format label') ?></th>
 									<td>
-										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_date_format']) ?>" />
-										<span><?php printf(__('Date format help'), gmdate($feather_config['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather->forum_settings['o_date_format']) ?>" />
+										<span><?php printf(__('Date format help'), gmdate($feather->forum_settings['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Visit timeout label') ?></th>
 									<td>
-										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_visit'] ?>" />
+										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_visit'] ?>" />
 										<span><?php _e('Visit timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Online timeout label') ?></th>
 									<td>
-										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_online'] ?>" />
+										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_online'] ?>" />
 										<span><?php _e('Online timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Redirect time label') ?></th>
 									<td>
-										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather_config['o_redirect_delay'] ?>" />
+										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_redirect_delay'] ?>" />
 										<span><?php _e('Redirect time help') ?></span>
 									</td>
 								</tr>
@@ -275,10 +275,10 @@
 								<tr>
 									<th scope="row"><?php _e('Version number label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather_config['o_show_version'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather->forum_settings['o_show_version'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather_config['o_show_version'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather->forum_settings['o_show_version'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Version number help') ?></span>
@@ -287,10 +287,10 @@
 								<tr>
 									<th scope="row"><?php _e('Info in posts label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather_config['o_show_user_info'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather->forum_settings['o_show_user_info'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather_config['o_show_user_info'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather->forum_settings['o_show_user_info'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Info in posts help') ?></span>
@@ -299,10 +299,10 @@
 								<tr>
 									<th scope="row"><?php _e('Post count label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather_config['o_show_post_count'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather->forum_settings['o_show_post_count'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather_config['o_show_post_count'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather->forum_settings['o_show_post_count'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Post count help') ?></span>
@@ -311,10 +311,10 @@
 								<tr>
 									<th scope="row"><?php _e('Smilies label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather_config['o_smilies'] == '1') {
+										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather->forum_settings['o_smilies'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather_config['o_smilies'] == '0') {
+										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather->forum_settings['o_smilies'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Smilies help') ?></span>
@@ -323,10 +323,10 @@
 								<tr>
 									<th scope="row"><?php _e('Smilies sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather_config['o_smilies_sig'] == '1') {
+										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather->forum_settings['o_smilies_sig'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather_config['o_smilies_sig'] == '0') {
+										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather->forum_settings['o_smilies_sig'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Smilies sigs help') ?></span>
@@ -335,10 +335,10 @@
 								<tr>
 									<th scope="row"><?php _e('Clickable links label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather_config['o_make_links'] == '1') {
+										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather->forum_settings['o_make_links'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather_config['o_make_links'] == '0') {
+										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather->forum_settings['o_make_links'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Clickable links help') ?></span>
@@ -347,35 +347,35 @@
 								<tr>
 									<th scope="row"><?php _e('Topic review label') ?></th>
 									<td>
-										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather_config['o_topic_review'] ?>" />
+										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_topic_review'] ?>" />
 										<span><?php _e('Topic review help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Topics per page label') ?></th>
 									<td>
-										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_topics_default'] ?>" />
+										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_topics_default'] ?>" />
 										<span><?php _e('Topics per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Posts per page label') ?></th>
 									<td>
-										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_posts_default'] ?>" />
+										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_posts_default'] ?>" />
 										<span><?php _e('Posts per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Indent label') ?></th>
 									<td>
-										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather_config['o_indent_num_spaces'] ?>" />
+										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_indent_num_spaces'] ?>" />
 										<span><?php _e('Indent help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Quote depth label') ?></th>
 									<td>
-										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather_config['o_quote_depth'] ?>" />
+										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_quote_depth'] ?>" />
 										<span><?php _e('Quote depth help') ?></span>
 									</td>
 								</tr>
@@ -391,10 +391,10 @@
 								<tr>
 									<th scope="row"><?php _e('Quick post label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather_config['o_quickpost'] == '1') {
+										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather->forum_settings['o_quickpost'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather_config['o_quickpost'] == '0') {
+										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather->forum_settings['o_quickpost'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Quick post help') ?></span>
@@ -403,10 +403,10 @@
 								<tr>
 									<th scope="row"><?php _e('Users online label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather_config['o_users_online'] == '1') {
+										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather->forum_settings['o_users_online'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather_config['o_users_online'] == '0') {
+										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather->forum_settings['o_users_online'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Users online help') ?></span>
@@ -415,10 +415,10 @@
 								<tr>
 									<th scope="row"><a name="censoring"></a><?php _e('Censor words label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather_config['o_censoring'] == '1') {
+										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather->forum_settings['o_censoring'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather_config['o_censoring'] == '0') {
+										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
@@ -427,10 +427,10 @@
 								<tr>
 									<th scope="row"><a name="signatures"></a><?php _e('Signatures label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather_config['o_signatures'] == '1') {
+										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather->forum_settings['o_signatures'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather_config['o_signatures'] == '0') {
+										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather->forum_settings['o_signatures'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Signatures help') ?></span>
@@ -439,10 +439,10 @@
 								<tr>
 									<th scope="row"><?php _e('User has posted label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather_config['o_show_dot'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather->forum_settings['o_show_dot'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather_config['o_show_dot'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather->forum_settings['o_show_dot'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('User has posted help') ?></span>
@@ -451,10 +451,10 @@
 								<tr>
 									<th scope="row"><?php _e('Topic views label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather_config['o_topic_views'] == '1') {
+										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather->forum_settings['o_topic_views'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather_config['o_topic_views'] == '0') {
+										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather->forum_settings['o_topic_views'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Topic views help') ?></span>
@@ -463,10 +463,10 @@
 								<tr>
 									<th scope="row"><?php _e('Quick jump label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather_config['o_quickjump'] == '1') {
+										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather->forum_settings['o_quickjump'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather_config['o_quickjump'] == '0') {
+										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather->forum_settings['o_quickjump'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Quick jump help') ?></span>
@@ -475,10 +475,10 @@
 								<tr>
 									<th scope="row"><?php _e('GZip label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather_config['o_gzip'] == '1') {
+										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather->forum_settings['o_gzip'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather_config['o_gzip'] == '0') {
+										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather->forum_settings['o_gzip'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('GZip help') ?></span>
@@ -487,10 +487,10 @@
 								<tr>
 									<th scope="row"><?php _e('Search all label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather_config['o_search_all_forums'] == '1') {
+										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather->forum_settings['o_search_all_forums'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather_config['o_search_all_forums'] == '0') {
+										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather->forum_settings['o_search_all_forums'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Search all help') ?></span>
@@ -499,7 +499,7 @@
 								<tr>
 									<th scope="row"><?php _e('Menu items label') ?></th>
 									<td>
-										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather_config['o_additional_navlinks']) ?></textarea>
+										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
 										<span><?php _e('Menu items help') ?></span>
 									</td>
 								</tr>
@@ -515,13 +515,13 @@
 								<tr>
 									<th scope="row"><?php _e('Default feed label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather_config['o_feed_type'] == '0') {
+										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather->forum_settings['o_feed_type'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('None') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather_config['o_feed_type'] == '1') {
+										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather->forum_settings['o_feed_type'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('RSS') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather_config['o_feed_type'] == '2') {
+										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather->forum_settings['o_feed_type'] == '2') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Atom') ?></strong></label>
 										<span class="clearb"><?php _e('Default feed help') ?></span>
@@ -531,7 +531,7 @@
 									<th scope="row"><?php _e('Feed TTL label') ?></th>
 									<td>
 										<select name="form_feed_ttl">
-											<option value="0"<?php if ($feather_config['o_feed_ttl'] == '0') {
+											<option value="0"<?php if ($feather->forum_settings['o_feed_ttl'] == '0') {
     echo ' selected="selected"';
 } ?>><?php _e('No cache') ?></option>
 											<?php echo $times ?>
@@ -551,13 +551,13 @@
 								<tr>
 									<th scope="row"><?php _e('Reporting method label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather_config['o_report_method'] == '0') {
+										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather->forum_settings['o_report_method'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Internal') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather_config['o_report_method'] == '1') {
+										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather->forum_settings['o_report_method'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('By e-mail') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather_config['o_report_method'] == '2') {
+										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather->forum_settings['o_report_method'] == '2') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Both') ?></strong></label>
 										<span class="clearb"><?php _e('Reporting method help') ?></span>
@@ -566,7 +566,7 @@
 								<tr>
 									<th scope="row"><?php _e('Mailing list label') ?></th>
 									<td>
-										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather_config['o_mailing_list']) ?></textarea>
+										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_mailing_list']) ?></textarea>
 										<span><?php _e('Mailing list help') ?></span>
 									</td>
 								</tr>
@@ -582,10 +582,10 @@
 								<tr>
 									<th scope="row"><?php _e('Use avatars label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather_config['o_avatars'] == '1') {
+										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather->forum_settings['o_avatars'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather_config['o_avatars'] == '0') {
+										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather->forum_settings['o_avatars'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Use avatars help') ?></span>
@@ -594,28 +594,28 @@
 								<tr>
 									<th scope="row"><?php _e('Upload directory label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather_config['o_avatars_dir']) ?>" />
+										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather->forum_settings['o_avatars_dir']) ?>" />
 										<span><?php _e('Upload directory help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max width label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_width'] ?>" />
+										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_width'] ?>" />
 										<span><?php _e('Max width help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max height label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_height'] ?>" />
+										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_height'] ?>" />
 										<span><?php _e('Max height help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max size label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather_config['o_avatars_size'] ?>" />
+										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 										<span><?php _e('Max size help') ?></span>
 									</td>
 								</tr>
@@ -631,24 +631,24 @@
 								<tr>
 									<th scope="row"><?php _e('Admin e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_admin_email']) ?>" />
+										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather->forum_settings['o_admin_email']) ?>" />
 										<span><?php _e('Admin e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_webmaster_email']) ?>" />
+										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather->forum_settings['o_webmaster_email']) ?>" />
 										<span><?php _e('Webmaster e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Forum subscriptions label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather_config['o_forum_subscriptions'] == '1') {
+										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather_config['o_forum_subscriptions'] == '0') {
+										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Forum subscriptions help') ?></span>
@@ -657,10 +657,10 @@
 								<tr>
 									<th scope="row"><?php _e('Topic subscriptions label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather_config['o_topic_subscriptions'] == '1') {
+										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather_config['o_topic_subscriptions'] == '0') {
+										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Topic subscriptions help') ?></span>
@@ -669,14 +669,14 @@
 								<tr>
 									<th scope="row"><?php _e('SMTP address label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather_config['o_smtp_host']) ?>" />
+										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather->forum_settings['o_smtp_host']) ?>" />
 										<span><?php _e('SMTP address help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('SMTP username label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather_config['o_smtp_user']) ?>" />
+										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather->forum_settings['o_smtp_user']) ?>" />
 										<span><?php _e('SMTP username help') ?></span>
 									</td>
 								</tr>
@@ -684,7 +684,7 @@
 									<th scope="row"><?php _e('SMTP password label') ?></th>
 									<td>
 										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
-<?php $smtp_pass = !empty($feather_config['o_smtp_pass']) ? random_key(feather_strlen($feather_config['o_smtp_pass']), true) : ''; ?>
+<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key(feather_strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
 										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<span><?php _e('SMTP password help') ?></span>
@@ -693,10 +693,10 @@
 								<tr>
 									<th scope="row"><?php _e('SMTP SSL label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather_config['o_smtp_ssl'] == '1') {
+										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather->forum_settings['o_smtp_ssl'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather_config['o_smtp_ssl'] == '0') {
+										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather->forum_settings['o_smtp_ssl'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('SMTP SSL help') ?></span>
@@ -714,10 +714,10 @@
 								<tr>
 									<th scope="row"><?php _e('Allow new label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather_config['o_regs_allow'] == '1') {
+										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather->forum_settings['o_regs_allow'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather_config['o_regs_allow'] == '0') {
+										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather->forum_settings['o_regs_allow'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Allow new help') ?></span>
@@ -726,10 +726,10 @@
 								<tr>
 									<th scope="row"><?php _e('Verify label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather_config['o_regs_verify'] == '1') {
+										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather->forum_settings['o_regs_verify'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather_config['o_regs_verify'] == '0') {
+										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather->forum_settings['o_regs_verify'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Verify help') ?></span>
@@ -738,10 +738,10 @@
 								<tr>
 									<th scope="row"><?php _e('Report new label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather_config['o_regs_report'] == '1') {
+										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather->forum_settings['o_regs_report'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather_config['o_regs_report'] == '0') {
+										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather->forum_settings['o_regs_report'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Report new help') ?></span>
@@ -750,10 +750,10 @@
 								<tr>
 									<th scope="row"><?php _e('Use rules label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather_config['o_rules'] == '1') {
+										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather->forum_settings['o_rules'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather_config['o_rules'] == '0') {
+										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather->forum_settings['o_rules'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Use rules help') ?></span>
@@ -762,7 +762,7 @@
 								<tr>
 									<th scope="row"><?php _e('Rules label') ?></th>
 									<td>
-										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather_config['o_rules_message']) ?></textarea>
+										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather->forum_settings['o_rules_message']) ?></textarea>
 										<span><?php _e('Rules help') ?></span>
 									</td>
 								</tr>
@@ -770,13 +770,13 @@
 									<th scope="row"><?php _e('E-mail default label') ?></th>
 									<td>
 										<span><?php _e('E-mail default help') ?></span>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather_config['o_default_email_setting'] == '0') {
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather->forum_settings['o_default_email_setting'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<?php _e('Display e-mail label') ?></label>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather_config['o_default_email_setting'] == '1') {
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather->forum_settings['o_default_email_setting'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<?php _e('Hide allow form label') ?></label>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather_config['o_default_email_setting'] == '2') {
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather->forum_settings['o_default_email_setting'] == '2') {
     echo ' checked="checked"';
 } ?> />&#160;<?php _e('Hide both label') ?></label>
 									</td>
@@ -793,10 +793,10 @@
 								<tr>
 									<th scope="row"><?php _e('Display announcement label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather_config['o_announcement'] == '1') {
+										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather->forum_settings['o_announcement'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather_config['o_announcement'] == '0') {
+										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather->forum_settings['o_announcement'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Display announcement help') ?></span>
@@ -805,7 +805,7 @@
 								<tr>
 									<th scope="row"><?php _e('Announcement message label') ?></th>
 									<td>
-										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_announcement_message']) ?></textarea>
+										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_announcement_message']) ?></textarea>
 										<span><?php _e('Announcement message help') ?></span>
 									</td>
 								</tr>
@@ -821,10 +821,10 @@
 								<tr>
 									<th scope="row"><a name="maintenance"></a><?php _e('Maintenance mode label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather_config['o_maintenance'] == '1') {
+										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather->forum_settings['o_maintenance'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather_config['o_maintenance'] == '0') {
+										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather->forum_settings['o_maintenance'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Maintenance mode help') ?></span>
@@ -833,7 +833,7 @@
 								<tr>
 									<th scope="row"><?php _e('Maintenance message label') ?></th>
 									<td>
-										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_maintenance_message']) ?></textarea>
+										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
 										<span><?php _e('Maintenance message help') ?></span>
 									</td>
 								</tr>
diff --git a/style/FeatherBB/view/admin/parser.php b/style/FeatherBB/view/admin/parser.php
index aec1f767..e32369b6 100644
--- a/style/FeatherBB/view/admin/parser.php
+++ b/style/FeatherBB/view/admin/parser.php
@@ -208,7 +208,7 @@
 									<th scope="row"><?php echo($lang_admin_parser['smiley_upload']); ?></th>
  <?php if (ini_get('file_uploads')) {
     ?>
-									<td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
+									<td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 										<input type="file" name="new_smiley" id="upload_smiley" /></td>
 									<td><input type="submit" name="upload" value="<?php echo($lang_admin_parser['upload_button']);
     ?>" /></td>
diff --git a/style/FeatherBB/view/admin/permissions.php b/style/FeatherBB/view/admin/permissions.php
index a70328ae..2b1bf413 100644
--- a/style/FeatherBB/view/admin/permissions.php
+++ b/style/FeatherBB/view/admin/permissions.php
@@ -28,10 +28,10 @@
 								<tr>
 									<th scope="row"><?php _e('BBCode label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather_config['p_message_bbcode'] == '1') {
+										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather->forum_settings['p_message_bbcode'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather_config['p_message_bbcode'] == '0') {
+										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather->forum_settings['p_message_bbcode'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('BBCode help') ?></span>
@@ -40,10 +40,10 @@
 								<tr>
 									<th scope="row"><?php _e('Image tag label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather_config['p_message_img_tag'] == '1') {
+										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather->forum_settings['p_message_img_tag'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather_config['p_message_img_tag'] == '0') {
+										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather->forum_settings['p_message_img_tag'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Image tag help') ?></span>
@@ -52,10 +52,10 @@
 								<tr>
 									<th scope="row"><?php _e('All caps message label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather_config['p_message_all_caps'] == '1') {
+										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather->forum_settings['p_message_all_caps'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather_config['p_message_all_caps'] == '0') {
+										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather->forum_settings['p_message_all_caps'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('All caps message help') ?></span>
@@ -64,10 +64,10 @@
 								<tr>
 									<th scope="row"><?php _e('All caps subject label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather_config['p_subject_all_caps'] == '1') {
+										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather->forum_settings['p_subject_all_caps'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather_config['p_subject_all_caps'] == '0') {
+										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather->forum_settings['p_subject_all_caps'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('All caps subject help') ?></span>
@@ -76,10 +76,10 @@
 								<tr>
 									<th scope="row"><?php _e('Require e-mail label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather_config['p_force_guest_email'] == '1') {
+										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather->forum_settings['p_force_guest_email'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather_config['p_force_guest_email'] == '0') {
+										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather->forum_settings['p_force_guest_email'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Require e-mail help') ?></span>
@@ -97,10 +97,10 @@
 								<tr>
 									<th scope="row"><?php _e('BBCode sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather_config['p_sig_bbcode'] == '1') {
+										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather->forum_settings['p_sig_bbcode'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather_config['p_sig_bbcode'] == '0') {
+										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather->forum_settings['p_sig_bbcode'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('BBCode sigs help') ?></span>
@@ -109,10 +109,10 @@
 								<tr>
 									<th scope="row"><?php _e('Image tag sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather_config['p_sig_img_tag'] == '1') {
+										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather->forum_settings['p_sig_img_tag'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather_config['p_sig_img_tag'] == '0') {
+										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather->forum_settings['p_sig_img_tag'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Image tag sigs help') ?></span>
@@ -121,10 +121,10 @@
 								<tr>
 									<th scope="row"><?php _e('All caps sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather_config['p_sig_all_caps'] == '1') {
+										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather->forum_settings['p_sig_all_caps'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather_config['p_sig_all_caps'] == '0') {
+										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather->forum_settings['p_sig_all_caps'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('All caps sigs help') ?></span>
@@ -133,14 +133,14 @@
 								<tr>
 									<th scope="row"><?php _e('Max sig length label') ?></th>
 									<td>
-										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather_config['p_sig_length'] ?>" />
+										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather->forum_settings['p_sig_length'] ?>" />
 										<span class="clearb"><?php _e('Max sig length help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max sig lines label') ?></th>
 									<td>
-										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather_config['p_sig_lines'] ?>" />
+										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather->forum_settings['p_sig_lines'] ?>" />
 										<span class="clearb"><?php _e('Max sig lines help') ?></span>
 									</td>
 								</tr>
@@ -156,10 +156,10 @@
 								<tr>
 									<th scope="row"><?php _e('Banned e-mail label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather_config['p_allow_banned_email'] == '1') {
+										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather->forum_settings['p_allow_banned_email'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather_config['p_allow_banned_email'] == '0') {
+										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather->forum_settings['p_allow_banned_email'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Banned e-mail help') ?></span>
@@ -168,10 +168,10 @@
 								<tr>
 									<th scope="row"><?php _e('Duplicate e-mail label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather_config['p_allow_dupe_email'] == '1') {
+										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather_config['p_allow_dupe_email'] == '0') {
+										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Duplicate e-mail help') ?></span>
diff --git a/style/FeatherBB/view/edit.php b/style/FeatherBB/view/edit.php
index 48a692e8..829d0c17 100644
--- a/style/FeatherBB/view/edit.php
+++ b/style/FeatherBB/view/edit.php
@@ -89,10 +89,10 @@
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
index 470d5c6b..2826444c 100644
--- a/style/FeatherBB/view/footer.php
+++ b/style/FeatherBB/view/footer.php
@@ -63,7 +63,7 @@
 
 <?php
 // Display the "Jump to" drop list
-if ($feather_config['o_quickjump'] == '1' && !empty($quickjump)) { ?>
+if ($feather->forum_settings['o_quickjump'] == '1' && !empty($quickjump)) { ?>
 			<div class="conl">
 			<form id="qjump" method="get" action="">
 				<div><label><span><?php _e('Jump to') ?><br /></span></label>
@@ -87,27 +87,27 @@
 <?php
 
 if ($footer_style == 'index') {
-    if ($feather_config['o_feed_type'] == '1') {
+    if ($feather->forum_settings['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
-    } elseif ($feather_config['o_feed_type'] == '2') {
+    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewforum') {
-    if ($feather_config['o_feed_type'] == '1') {
+    if ($feather->forum_settings['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
-    } elseif ($feather_config['o_feed_type'] == '2') {
+    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewtopic') {
-    if ($feather_config['o_feed_type'] == '1') {
+    if ($feather->forum_settings['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
-    } elseif ($feather_config['o_feed_type'] == '2') {
+    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
     }
 }
 
 ?>
-				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
+				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather->forum_settings['o_show_version'] == '1') ? ' '.$feather->forum_settings['o_cur_version'] : '')) ?></p>
 			</div>
 			<div class="clearer"></div>
 		</div>
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
index 9b662b3a..0068a5f6 100644
--- a/style/FeatherBB/view/header.php
+++ b/style/FeatherBB/view/header.php
@@ -92,21 +92,21 @@ function process_form(the_form)
         <div class="container-title-status">
             <h1 class="title-site">
                 <a href="<?php echo get_base_url() ?>" title="" class="site-name">
-                    <p><?php echo feather_escape($feather_config['o_board_title']) ?></p>
+                    <p><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></p>
                 </a>
-                <div id="brddesc"><?php echo htmlspecialchars_decode($feather_config['o_board_desc']) ?></div>
+                <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
             </h1>
             <div class="status-avatar">
                 <?php echo $page_info ?>
             </div>
             <div class="clear"></div>
         </div>
-        <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
+        <?php if ($feather->user->g_read_board == '1' && $feather->forum_settings['o_announcement'] == '1') : ?>
             <div id="announce" class="block">
                 <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
                 <div class="box">
                     <div id="announce-block" class="inbox">
-                        <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
+                        <div class="usercontent"><?php echo $feather->forum_settings['o_announcement_message'] ?></div>
                     </div>
                 </div>
             </div>
diff --git a/style/FeatherBB/view/help.php b/style/FeatherBB/view/help.php
index 2ecf9e36..d171ddab 100644
--- a/style/FeatherBB/view/help.php
+++ b/style/FeatherBB/view/help.php
@@ -41,7 +41,7 @@
 <div class="box">
 	<div class="inbox">
 		<p><?php _e('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
+		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
 		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
 		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
diff --git a/style/FeatherBB/view/moderate/moderator_forum.php b/style/FeatherBB/view/moderate/moderator_forum.php
index 35b67b41..8b636222 100644
--- a/style/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/FeatherBB/view/moderate/moderator_forum.php
@@ -40,7 +40,7 @@
 				<tr>
 					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
 					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
 <?php endif; ?>					<th class="tcr"><?php _e('Last post') ?></th>
 					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
 				</tr>
@@ -63,7 +63,7 @@
 						</div>
 					</td>
 					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_replies']) : '-' ?></td>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_views']) : '-' ?></td>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_views']) : '-' ?></td>
 <?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_disp'] ?></td>
 					<td class="tcmod"><input type="checkbox" name="topics[<?php echo $topic['id'] ?>]" value="1" /></td>
@@ -72,7 +72,7 @@
 
             }
             if (empty($topic_data)):
-                $colspan = ($feather_config['o_topic_views'] == '1') ? 5 : 4;
+                $colspan = ($feather->forum_settings['o_topic_views'] == '1') ? 5 : 4;
                 $button_status = ' disabled="disabled"';
                 echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
             endif;
diff --git a/style/FeatherBB/view/profile/section_display.php b/style/FeatherBB/view/profile/section_display.php
index 5da0f4b4..ced4459f 100644
--- a/style/FeatherBB/view/profile/section_display.php
+++ b/style/FeatherBB/view/profile/section_display.php
@@ -55,26 +55,26 @@
     }
 
 ?>
-<?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1' || $feather_config['o_signatures'] == '1' || $feather_config['o_avatars'] == '1' || ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1')): ?>
+<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1' || $feather->forum_settings['o_signatures'] == '1' || $feather->forum_settings['o_avatars'] == '1' || ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1')): ?>
 			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Post display legend') ?></legend>
 					<div class="infldset">
 						<p><?php _e('Post display info') ?></p>
 						<div class="rbox">
-<?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
+<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show smilies') ?><br /></label>
-<?php endif; if ($feather_config['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show sigs') ?><br /></label>
-<?php endif; if ($feather_config['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
+<?php endif; if ($feather->forum_settings['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show avatars') ?><br /></label>
-<?php endif; if ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
+<?php endif; if ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show images') ?><br /></label>
-<?php endif; if ($feather_config['o_signatures'] == '1' && $feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1' && $feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show images sigs') ?><br /></label>
 <?php endif; ?>
diff --git a/style/FeatherBB/view/profile/section_personality.php b/style/FeatherBB/view/profile/section_personality.php
index 3624e5e6..2b8f9c82 100644
--- a/style/FeatherBB/view/profile/section_personality.php
+++ b/style/FeatherBB/view/profile/section_personality.php
@@ -19,7 +19,7 @@
 		<form id="profile4" method="post" action="<?php echo get_link('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
-<?php if ($feather_config['o_avatars'] == '1'): ?>				<div class="inform">
+<?php if ($feather->forum_settings['o_avatars'] == '1'): ?>				<div class="inform">
 				<fieldset id="profileavatar">
 					<legend><?php _e('Avatar legend') ?></legend>
 					<div class="infldset">
@@ -29,20 +29,20 @@
 					</div>
 				</fieldset>
 			</div>
-<?php endif; if ($feather_config['o_signatures'] == '1'): ?>				<div class="inform">
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>				<div class="inform">
 				<fieldset>
 					<legend><?php _e('Signature legend') ?></legend>
 					<div class="infldset">
 						<p><?php _e('Signature info') ?></p>
 						<div class="txtarea">
-							<label><?php printf(__('Sig max size'), forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
+							<label><?php printf(__('Sig max size'), forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
diff --git a/style/FeatherBB/view/profile/section_privacy.php b/style/FeatherBB/view/profile/section_privacy.php
index 36930415..1d972113 100644
--- a/style/FeatherBB/view/profile/section_privacy.php
+++ b/style/FeatherBB/view/profile/section_privacy.php
@@ -38,7 +38,7 @@
 					</div>
 				</fieldset>
 			</div>
-<?php if ($feather_config['o_forum_subscriptions'] == '1' || $feather_config['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
+<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1' || $feather->forum_settings['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
 				<fieldset>
 					<legend><?php _e('Subscription legend') ?></legend>
 					<div class="infldset">
@@ -46,7 +46,7 @@
 							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Notify full') ?><br /></label>
-<?php if ($feather_config['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
+<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Auto notify full') ?><br /></label>
 <?php endif; ?>
diff --git a/style/FeatherBB/view/register/form.php b/style/FeatherBB/view/register/form.php
index f1a360ef..bdff9a2b 100644
--- a/style/FeatherBB/view/register/form.php
+++ b/style/FeatherBB/view/register/form.php
@@ -59,7 +59,7 @@
 					</div>
 				</fieldset>
 			</div>
-<?php if ($feather_config['o_regs_verify'] == '0'): ?>			<div class="inform">
+<?php if ($feather->forum_settings['o_regs_verify'] == '0'): ?>			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Pass legend') ?></legend>
 					<div class="infldset">
@@ -75,14 +75,14 @@
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
+					<legend><?php echo($feather->forum_settings['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
+<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
 <?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
     echo feather_escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
+<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
     echo feather_escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
@@ -102,7 +102,7 @@
 <?php
 
             foreach ($languages as $temp) {
-                if ($feather_config['o_default_lang'] == $temp) {
+                if ($feather->forum_settings['o_default_lang'] == $temp) {
                     echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
                 } else {
                     echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
diff --git a/style/FeatherBB/view/register/rules.php b/style/FeatherBB/view/register/rules.php
index cef62405..7f986063 100644
--- a/style/FeatherBB/view/register/rules.php
+++ b/style/FeatherBB/view/register/rules.php
@@ -22,7 +22,7 @@
 				<fieldset>
 					<legend><?php _e('Rules legend') ?></legend>
 					<div class="infldset">
-						<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
+						<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/search/form.php b/style/FeatherBB/view/search/form.php
index 4731b068..16cd788a 100644
--- a/style/FeatherBB/view/search/form.php
+++ b/style/FeatherBB/view/search/form.php
@@ -41,7 +41,7 @@
 						</select>
 						<br /></label>
 						<p class="clearl"><?php _e('Search in info') ?></p>
-<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
+<?php echo($feather->forum_settings['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
 					</div>
 				</fieldset>
 			</div>

From 9ba8e584512bfad3c83d0300f159982340076c75 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 27 Aug 2015 17:33:24 +0200
Subject: [PATCH 216/353] Clean controllers

---
 controller/admin/censoring.php   |   1 -
 controller/admin/forums.php      |   2 -
 controller/admin/groups.php      |   2 -
 controller/admin/index.php       |  20 ++---
 controller/admin/options.php     |   3 -
 controller/admin/parser.php      |   2 -
 controller/admin/permissions.php |   5 +-
 controller/admin/statistics.php  |   2 -
 controller/edit.php              |   3 -
 controller/footer.php            |   4 -
 controller/header.php            |   3 -
 controller/index.php             |   1 -
 controller/install.php           |   2 -
 controller/login.php             |  38 ++++-----
 controller/moderate.php          | 136 +++++++++++--------------------
 controller/register.php          |  39 ++++-----
 controller/search.php            |   1 -
 controller/viewforum.php         |   8 +-
 controller/viewtopic.php         |   2 +
 include/common_admin.php         |   7 +-
 model/moderate.php               |   8 +-
 21 files changed, 102 insertions(+), 187 deletions(-)

diff --git a/controller/admin/censoring.php b/controller/admin/censoring.php
index 6406b9eb..850b4492 100644
--- a/controller/admin/censoring.php
+++ b/controller/admin/censoring.php
@@ -59,7 +59,6 @@ public function display()
         generate_admin_menu('censoring');
 
         $this->feather->render('admin/censoring.php', array(
-                'feather_config'    =>    $this->config,
                 'word_data'    =>    $this->model->get_words(),
             )
         );
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index b1718ed8..b57c096e 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -131,7 +131,6 @@ public function edit_forum($forum_id)
             generate_admin_menu('forums');
 
             $this->feather->render('admin/forums/permissions.php', array(
-                    'feather_config' => $this->config,
                     'perm_data' => $this->model->get_permissions($forum_id),
                     'cur_index'     =>  7,
                     'cur_forum' => $this->model->get_forum_info($forum_id),
@@ -206,7 +205,6 @@ public function display()
 
         $categories_model = new \model\admin\categories();
         $this->feather->render('admin/forums/admin_forums.php', array(
-                'feather_config' => $this->config,
                 'cat_list'      => $categories_model->get_cat_list(),
                 'forum_data'    =>  $this->model->get_forums(),
                 'cur_index'     =>  4,
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index f2682dc8..7a48234f 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -50,7 +50,6 @@ public function display()
         generate_admin_menu('groups');
 
         $this->feather->render('admin/groups/admin_groups.php', array(
-                'feather_config'    =>    $this->config,
                 'groups' => $groups,
                 'cur_index' => 5,
             )
@@ -142,7 +141,6 @@ public function addedit($id = '')
             $group = $this->model->info_add_group($groups, $id);
 
             $this->feather->render('admin/groups/add_edit_group.php', array(
-                    'feather_config'    =>    $this->config,
                     'group'    =>    $group,
                     'groups'    =>    $groups,
                     'id'    => $id,
diff --git a/controller/admin/index.php b/controller/admin/index.php
index e48cad10..ccafe51c 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/index.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
     }
@@ -78,20 +76,14 @@ public function display($action = null)
             }
         }
 
-        $install_folder_exists = is_dir(FEATHER_ROOT.'install');
-
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Index'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('index');
 
-        $this->feather->render('admin/index.php', array(
-                            'install_file_exists'    =>    $install_folder_exists,
-                            'feather_config'    =>    $this->config,
+        $this->feather->view2->setPageInfo(array(
+                            'page_title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Index')),
+                            'active_page' => 'admin',
+                            'admin_console' => true,
+                            'install_file_exists'    =>   is_dir(FEATHER_ROOT.'install'),
                             )
-                    );
-
-        $this->footer->display();
+                    )->addTemplate('admin/index.php')->display();
     }
 }
diff --git a/controller/admin/options.php b/controller/admin/options.php
index 230a9dbf..2a640c18 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -47,12 +47,9 @@ public function display()
         generate_admin_menu('options');
 
         $this->feather->render('admin/options.php', array(
-                'feather_config'    =>    $this->config,
-                'feather_user'    =>    $this->user,
                 'languages' => forum_list_langs(),
                 'styles' => $this->model->get_styles(),
                 'times' => $this->model->get_times(),
-                'feather'    =>    $this->feather,
             )
         );
 
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index e2c42f34..81db5407 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -218,11 +218,9 @@ public function display()
 
         $this->feather->render('admin/parser.php', array(
                 'lang_admin_parser'    =>    $lang_admin_parser,
-
                 'smiley_files' => $this->model->get_smiley_files(),
                 'bbcd' =>   $bbcd,
                 'config' => $config,
-                'feather_config' => $this->config,
                 'smilies' =>    $smilies,
                 'i'     =>  -1,
             )
diff --git a/controller/admin/permissions.php b/controller/admin/permissions.php
index 78133649..9abbabe6 100644
--- a/controller/admin/permissions.php
+++ b/controller/admin/permissions.php
@@ -47,10 +47,7 @@ public function display()
 
         generate_admin_menu('permissions');
 
-        $this->feather->render('admin/permissions.php', array(
-                'feather_config'    =>    $this->config,
-            )
-        );
+        $this->feather->render('admin/permissions.php');
 
         $this->footer->display();
     }
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index 65dae86d..a7c29d0d 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -45,13 +45,11 @@ public function display()
         $total = $this->model->get_total_size();
 
         $this->feather->render('admin/statistics.php', array(
-                'feather_config'    =>    $this->config,
                 'server_load'    =>    $this->model->get_server_load(),
                 'num_online'    =>    $this->model->get_num_online(),
                 'total_size'    =>    $total['size'],
                 'total_records'    =>    $total['records'],
                 'php_accelerator'    =>    $this->model->get_php_accelerator(),
-                'feather'    =>    $this->feather,
             )
         );
 
diff --git a/controller/edit.php b/controller/edit.php
index 27e7f445..0065a307 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -120,10 +120,7 @@ public function editpost($id)
                             'errors' => $errors,
                             'preview_message' => $preview_message,
                             'id' => $id,
-                            'feather_config' => $this->config,
-                            'feather_user' => $this->user,
                             'checkboxes' => $this->model->get_checkboxes($can_edit_subject, $is_admmod, $cur_post, 1),
-                            'feather' => $this->feather,
                             'can_edit_subject' => $can_edit_subject,
                             'lang_bbeditor'    =>    $lang_bbeditor,
                             'post' => $post,
diff --git a/controller/footer.php b/controller/footer.php
index a05ffdd2..60a4f6c9 100644
--- a/controller/footer.php
+++ b/controller/footer.php
@@ -47,14 +47,10 @@ public function display($footer_style = null, $id = null, $p = null, $pid = null
                             'id' => $id,
                             'p' => $p,
                             'pid' => $pid,
-                            'feather_user' => $this->user,
-                            'feather_config' => $this->config,
                             'feather_start' => $this->start,
-                            'footer_style' => $footer_style,
                             'quickjump' => $this->feather->cache->retrieve('quickjump'),
                             'forum_id' => $forum_id,
                             'num_pages' => $num_pages,
-                            'feather' => $this->feather,
                             )
                     );
 
diff --git a/controller/header.php b/controller/header.php
index ebc8c550..df89879b 100644
--- a/controller/header.php
+++ b/controller/header.php
@@ -131,14 +131,11 @@ public function display()
         $this->feather->render('header.php', array(
                 'page_title' => $this->title,
                 'p' => $this->page,
-                'feather_user' => $this->user,
-                'feather_config' => $this->config,
                 '_SERVER' => $_SERVER,
                 'page_head' => $this->page_head,
                 'active_page' => $this->active_page,
                 'paging_links' => $this->paging_links,
                 'required_fields' => $this->required_fields,
-                'feather' => $this->feather,
                 'focus_element' => $focus_element,
                 'navlinks' => $navlinks,
                 'page_info' => $page_info,
diff --git a/controller/index.php b/controller/index.php
index 40b06c76..df1c4c8d 100644
--- a/controller/index.php
+++ b/controller/index.php
@@ -30,7 +30,6 @@ public function display()
             'is_indexed' => true,
             'index_data' => $this->model->print_categories_forums(),
             'stats' => $this->model->collect_stats(),
-            'feather_config' => $this->feather->forum_settings,
             'online'    =>    $this->model->fetch_users_online(),
             'forum_actions'        =>    $this->model->get_forum_actions(),
             'cur_cat'   => 0
diff --git a/controller/install.php b/controller/install.php
index a083113e..0f1133be 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -115,7 +115,6 @@ public function run()
             if (!empty($this->errors)) {
                 $this->feather->view()->setTemplatesDirectory($this->feather->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
                 $this->feather->view()->display('install.php', array(
-                                                        'feather' => $this->feather,
                                                         'languages' => $this->available_langs,
                                                         'supported_dbs' => $this->supported_dbs,
                                                         'data' => $data,
@@ -137,7 +136,6 @@ public function run()
             }
             $this->feather->view()->setTemplatesDirectory($this->feather->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
             $this->feather->view()->display('install.php', array(
-                                                'feather' => $this->feather,
                                                 'languages' => $this->available_langs,
                                                 'supported_dbs' => $this->supported_dbs,
                                                 'data' => $data,
diff --git a/controller/login.php b/controller/login.php
index 669c6cd8..a6aab50a 100644
--- a/controller/login.php
+++ b/controller/login.php
@@ -39,18 +39,14 @@ public function display()
         // TODO?: Try to determine if the data in HTTP_REFERER is valid (if not, we redirect to index.php after login)
         $redirect_url = $this->model->get_redirect_url();
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Login'));
-        $required_fields = array('req_username' => __('Username'), 'req_password' => __('Password'));
-        $focus_element = array('login', 'req_username');
-
-        $this->header->setTitle($page_title)->setActivePage('login')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
-
-        $this->feather->render('login/form.php', array(
+        $this->feather->view2->setPageInfo(array(
                             'redirect_url'    =>    $redirect_url,
+                            'active_page' => 'login',
+                            'title' => array(feather_escape($this->config['o_board_title']), __('Login')),
+                            'required_fields' => array('req_username' => __('Username'), 'req_password' => __('Password')),
+                            'focus_element' => array('login', 'req_username'),
                             )
-                    );
-
-        $this->footer->display();
+                    )->addTemplate('login/form.php')->display();
     }
 
     public function logmein()
@@ -81,19 +77,13 @@ public function forget()
             exit;
         }
 
-        $errors = $this->model->password_forgotten();
-
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Request pass'));
-        $required_fields = array('req_email' => __('Email'));
-        $focus_element = array('request_pass', 'req_email');
-
-        $this->header->setTitle($page_title)->setActivePage('login')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
-
-        $this->feather->render('login/password_forgotten.php', array(
-                            'errors'    =>    $errors,
-                            )
-                    );
-
-        $this->footer->display();
+        $this->feather->view2->setPageInfo(array(
+                'errors'    =>    $this->model->password_forgotten(),
+                'active_page' => 'login',
+                'title' => array(feather_escape($this->config['o_board_title']), __('Request pass')),
+                'required_fields' => array('req_email' => __('Email')),
+                'focus_element' => array('request_pass', 'req_email'),
+            )
+        )->addTemplate('login/password_forgotten.php')->display();
     }
 }
diff --git a/controller/moderate.php b/controller/moderate.php
index 84d81727..c20ec362 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -105,19 +105,15 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->display();
-
-            $this->feather->render('moderate/move_topics.php', array(
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                    'active_page' => 'moderate',
                     'action'    =>    'multi',
                     'id'    =>    $fid,
                     'topics'    =>    $topics,
                     'list_forums'   => $this->model->get_forum_list_move($fid),
                 )
-            );
-
-            $this->footer->display();
+            )->addTemplate('moderate/move_topics.php')->display();
         }
 
         // Stick a topic
@@ -163,19 +159,16 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->display();
-
-            $this->feather->render('moderate/move_topics.php', array(
+            $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                        'active_page' => 'moderate',
+                        'page' => $p,
                         'action'    =>    'single',
                         'id'    =>    $id,
                         'topics'    =>    $id,
                         'list_forums'   => $this->model->get_forum_list_move($fid),
                         )
-                );
-
-            $this->footer->display();
+                )->addTemplate('moderate/move_topics.php')->display();
         }
 
         // Moderate a topic
@@ -185,34 +178,28 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 if ($this->request->post('delete_posts') || $this->request->post('delete_posts_comply')) {
                     $posts = $this->model->delete_posts($id, $fid, $p);
 
-                    $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
-
-                    $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->display();
-
-                    $this->feather->render('moderate/delete_posts.php', array(
-                        'id' => $id,
-                        'posts' => $posts,
-                        )
-                    );
-
-                    $this->footer->display();
+                    $this->feather->view2->setPageInfo(array(
+                            'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                            'active_page' => 'moderate',
+                            'page' => $p,
+                            'id' => $id,
+                            'posts' => $posts,
+                        ))
+                        ->addTemplate('moderate/delete_posts.php')->display();
                 }
             if ($this->request->post('split_posts') || $this->request->post('split_posts_comply')) {
-                $posts = $this->model->split_posts($id, $fid, $p);
-
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
-                $focus_element = array('subject','new_subject');
 
-                $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->setFocusElement($focus_element)->display();
-
-                $this->feather->render('moderate/split_posts.php', array(
+                $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                        'focus_element' => array('subject','new_subject'),
+                        'page' => $p,
+                        'active_page' => 'moderate',
                         'id' => $id,
-                        'posts' => $posts,
+                        'posts' => $this->model->split_posts($id, $fid, $p),
                         'list_forums' => $this->model->get_forum_list_split($id),
                         )
-                );
+                )->addTemplate('moderate/split_posts.php')->display();
 
-                $this->footer->display();
             }
 
                 // Show the moderate posts view
@@ -224,31 +211,25 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                         $this->user->disp_posts = $cur_topic['num_replies'] + 1;
                 }*/
 
-                // Generate paging links
-                $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/#');
-
             if ($this->config['o_censoring'] == '1') {
                 $cur_topic['subject'] = censor_words($cur_topic['subject']);
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject']));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->setPagingLinks($paging_links)->display();
-
-            $this->feather->render('moderate/posts_view.php', array(
+            $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject'])),
+                        'page' => $p,
+                        'active_page' => 'moderate',
                         'cur_topic' => $cur_topic,
                         'url_topic' => url_friendly($cur_topic['subject']),
                         'url_forum' => url_friendly($cur_topic['forum_name']),
                         'fid' => $fid,
                         'id' => $id,
-                        'paging_links' => $paging_links,
+                        'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/#'),
                         'post_data' => $this->model->display_posts_view($id, $start_from),
                         'button_status' => $button_status,
                         'start_from' => $start_from,
                         )
-                );
-
-            $this->footer->display();
+                )->addTemplate('moderate/posts_view.php')->display();
         }
     }
 
@@ -284,24 +265,19 @@ public function display($id, $name = null, $page = null)
         $start_from = $this->user->disp_topics * ($p - 1);
         $url_forum = url_friendly($cur_forum['forum_name']);
 
-        // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/forum/'.$id.'/#');
-
-        $page_title = array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name']));
-
-        $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->setPagingLinks($paging_links)->display();
-
-        $this->feather->render('moderate/moderator_forum.php', array(
+        $this->feather->view2->setPageInfo(array(
+                            'title' => array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name'])),
+                            'active_page' => 'moderate',
+                            'page' => $p,
                             'id' => $id,
                             'p' => $p,
                             'url_forum' => $url_forum,
                             'cur_forum' => $cur_forum,
-                            'paging_links' => $paging_links,
-                            'feather_config' => $this->config,
+                            'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/forum/'.$id.'/#'),
                             'topic_data' => $this->model->display_topics($id, $sort_by, $start_from),
                             'start_from' => $start_from,
                             )
-                    );
+                    )->addTemplate('moderate/moderator_forum.php')->display();
 
         $this->footer->display();
     }
@@ -331,24 +307,18 @@ public function dealposts($fid)
                 message(__('No topics selected'));
             }
 
-            $topics = implode(',', array_map('intval', array_keys($topics)));
-
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->display();
-
-            $this->feather->render('moderate/move_topics.php', array(
+            $this->feather->view2->setPageInfo(array(
                         'action'    =>    'multi',
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                        'active_page' => 'moderate',
                         'id'    =>    $fid,
-                        'topics'    =>    $topics,
+                        'topics'    =>    implode(',', array_map('intval', array_keys($topics))),
                         'list_forums'   => $this->model->get_forum_list_move($fid),
                         )
-                );
-
-            $this->footer->display();
+                )->addTemplate('moderate/move_topics.php')->display();
         }
 
         // Merge two or more topics
@@ -362,17 +332,13 @@ public function dealposts($fid)
                 message(__('Not enough topics selected'));
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->display();
-
-            $this->feather->render('moderate/merge_topics.php', array(
+            $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                        'active_page' => 'moderate',
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
                         )
-                );
-
-            $this->footer->display();
+                )->addTemplate('moderate/merge_topics.php')->display();
         }
 
         // Delete one or more topics
@@ -386,17 +352,13 @@ public function dealposts($fid)
                 $this->model->delete_topics($topics, $fid);
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->display();
-
-            $this->feather->render('moderate/delete_topics.php', array(
+            $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                        'active_page' => 'moderate',
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
                         )
-                );
-
-            $this->footer->display();
+                )->addTemplate('moderate/delete_topics.php')->display();
         }
 
 
diff --git a/controller/register.php b/controller/register.php
index ef580e88..5258ec6f 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -62,24 +62,19 @@ public function display()
             }
         }
 
-        $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->config['o_board_title']), __('Register')),
-            'focus_element' => array('register', 'req_user'),
-            'required_fields' => array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => __('Confirm pass'), 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => __('Robot title')),
-            'active_page' => 'register',
-            'is_indexed' => true,
-        ));
-
-        $this->feather->view2->display('register/form.php', array(
-                            'errors' => $user['errors'],
-                            'feather_config' => $this->config,
-                            'index_questions'    =>    $index_questions,
-                            'feather'    =>    $this->feather,
-                            'languages' => forum_list_langs(),
-                            'question' => array_keys($lang_antispam_questions),
-                            'qencoded' => md5(array_keys($lang_antispam_questions)[$index_questions]),
+            $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Register')),
+                        'focus_element' => array('register', 'req_user'),
+                        'required_fields' => array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => __('Confirm pass'), 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => __('Robot title')),
+                        'active_page' => 'register',
+                        'is_indexed' => true,
+                        'errors' => $user['errors'],
+                        'index_questions'    =>    $index_questions,
+                        'languages' => forum_list_langs(),
+                        'question' => array_keys($lang_antispam_questions),
+                        'qencoded' => md5(array_keys($lang_antispam_questions)[$index_questions]),
                             )
-                    );
+                    )->addTemplate('register/form.php')->display();
     }
 
     public function cancel()
@@ -107,13 +102,9 @@ public function rules()
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->config['o_board_title']), __('Register'), __('Forum rules')),
-            'active_page' => 'register',
-        ));
-
-        $this->feather->view2->display('register/rules.php', array(
-                            'feather_config'    =>    $this->config,
+                            'title' => array(feather_escape($this->config['o_board_title']), __('Register'), __('Forum rules')),
+                            'active_page' => 'register',
                             )
-                    );
+                    )->addTemplate('register/rules.php')->display();
     }
 }
diff --git a/controller/search.php b/controller/search.php
index 5a6e5319..c692c862 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -85,7 +85,6 @@ public function display()
                 'active_page' => 'search',
                 'focus_element' => array('search', 'keywords'),
                 'is_indexed' => true,
-                'feather' => $this->feather,
                 'forums' => $this->model->get_list_forums(),
             ))->addTemplate('search/form.php')->display();
         }
diff --git a/controller/viewforum.php b/controller/viewforum.php
index ff661f89..7206f604 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -15,7 +15,12 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \model\viewforum();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/forum.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
+    }
+
+    public function __autoload($class_name)
+    {
+        require FEATHER_ROOT . $class_name . '.php';
     }
 
     public function display($id, $name = null, $page = null)
@@ -85,6 +90,7 @@ public function display($id, $name = null, $page = null)
             'paging_links'  =>  $paging_links,
             'is_indexed' => true,
             'id' => $id,
+            'fid' => $id,
             'forum_data' => $this->model->print_topics($id, $sort_by, $start_from),
             'cur_forum' => $cur_forum,
             'post_link' => $post_link,
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index a37d1f3c..6abdf274 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -115,6 +115,8 @@ public function display($id = null, $name = null, $page = null, $pid = null)
             'is_indexed' => true,
             'id' => $id,
             'pid' => $pid,
+            'tid' => $id,
+            'fid' => $cur_topic['forum_id'],
             'post_data' => $this->model->print_posts($id, $start_from, $cur_topic, $is_admmod),
             'cur_topic'    =>    $cur_topic,
             'subscraction'    =>    $subscraction,
diff --git a/include/common_admin.php b/include/common_admin.php
index 228b2fa2..c1778f08 100644
--- a/include/common_admin.php
+++ b/include/common_admin.php
@@ -37,14 +37,13 @@ function generate_admin_menu($page = '')
     // See if there are any plugins
     $plugins = forum_list_plugins($is_admin);
 
-    $feather->render('admin/menu.php', array(
+    $feather->view2->setPageInfo(array(
         'page'    =>    $page,
         'is_admin'    =>    $is_admin,
         'feather_config'    =>    $feather->config,
-        'feather_user'    =>    $feather->user,
         'plugins'    =>    $plugins,
-        )
-    );
+        ), 1
+    )->addTemplate('admin/menu.php');
 }
 
 //
diff --git a/model/moderate.php b/model/moderate.php
index 36a02d82..d2f53fc8 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -561,7 +561,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
                 $moved_to = $moved_to->find_one();
 
                 // Create the redirect topic
-                $move_topics_to['insert'] = array(
+                $insert_move_topics_to = array(
                     'poster' => $moved_to['poster'],
                     'subject'  => $moved_to['subject'],
                     'posted'  => $moved_to['posted'],
@@ -573,7 +573,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
                 // Insert the report
                 $move_topics_to = DB::for_table('topics')
                                     ->create()
-                                    ->set($move_topics_to['insert']);
+                                    ->set($insert_move_topics_to);
                 $move_topics_to = $this->hook->fireDB('move_topics_to_redirect', $move_topics_to);
                 $move_topics_to = $move_topics_to->save();
 
@@ -608,7 +608,7 @@ public function check_move_possible()
                     ->where_any_is($result['where'])
                     ->where_null('f.redirect_url')
                     ->order_by_many($result['order_by']);
-        $result = $this->hook->fireDB('check_move_possible');
+        $result = $this->hook->fireDB('check_move_possible', $result);
         $result = $result->find_many();
 
         if (count($result) < 2) {
@@ -798,6 +798,8 @@ public function delete_topics($topics, $fid)
         $find_ids = $this->hook->fireDB('delete_topics_find_ids', $find_ids);
         $find_ids = $find_ids->find_many();
 
+        $ids_post = array();
+
         foreach ($find_ids as $id) {
             $ids_post[] = $id['id'];
         }

From 9b2f85dd7a805051c4d9c0bc4a76f205c21fe4e0 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 27 Aug 2015 18:12:13 +0200
Subject: [PATCH 217/353] Update more views

---
 controller/admin/bans.php        |  66 +++-----
 controller/admin/categories.php  |  15 +-
 controller/admin/censoring.php   |  17 +-
 controller/admin/forums.php      |   8 +-
 controller/admin/groups.php      |  12 +-
 controller/admin/maintenance.php |   8 +-
 controller/admin/options.php     |   6 +-
 controller/admin/parser.php      |   6 +-
 controller/admin/permissions.php |   6 +-
 controller/admin/plugins.php     |   6 +-
 controller/admin/reports.php     |   6 +-
 controller/admin/statistics.php  |   6 +-
 controller/admin/users.php       |  18 +--
 controller/edit.php              |   6 +-
 controller/footer.php            |  69 --------
 controller/header.php            | 266 -------------------------------
 controller/help.php              |  13 +-
 controller/login.php             |   4 +-
 controller/moderate.php          |   6 +-
 controller/register.php          |   4 +-
 controller/search.php            |   4 +-
 include/classes/auth.class.php   |  28 ++--
 include/functions.php            |  27 +---
 23 files changed, 109 insertions(+), 498 deletions(-)
 delete mode 100644 controller/footer.php
 delete mode 100644 controller/header.php

diff --git a/controller/admin/bans.php b/controller/admin/bans.php
index 0a3dd9d2..e6a8d6ff 100644
--- a/controller/admin/bans.php
+++ b/controller/admin/bans.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\admin\bans();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/bans.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -46,33 +44,27 @@ public function display()
             $p = (!$this->request->get('p') || $this->request->get('p') <= 1 || $this->request->get('p') > $num_pages) ? 1 : intval($this->request->get('p'));
             $start_from = 50 * ($p - 1);
 
-            // Generate paging links
-            $paging_links = '<span class="pages-label">' . __('Pages') . ' </span>' . paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str']));
-
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'), __('Results head'));
-
-            $this->header->setTitle($page_title)->setActivePage('admin')->setPage($p)->setPagingLinks($paging_links)->enableAdminConsole()->display();
-
             $ban_data = $this->model->find_ban($start_from);
 
-            $this->feather->render('admin/bans/search_ban.php', array(
+            $this->feather->view2->setPageInfo(array(
+                    'admin_console' => true,
+                    'page' => $p,
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'), __('Results head')),
+                    'paging_links' => '<span class="pages-label">' . __('Pages') . ' </span>' . paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str'])),
                     'ban_data' => $ban_data['data'],
                 )
-            );
-
-            $this->footer->display();
+            )->addTemplate('admin/bans/search_ban.php')->display();
         }
+        else {
+            generate_admin_menu('bans');
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
-        $focus_element = array('bans', 'new_ban_user');
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->enableAdminConsole()->display();
-
-        generate_admin_menu('bans');
-
-        $this->feather->render('admin/bans/admin_bans.php');
-
-        $this->footer->display();
+            $this->feather->view2->setPageInfo(array(
+                    'admin_console' => true,
+                    'focus_element' => array('bans', 'new_ban_user'),
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans')),
+                )
+            )->addTemplate('admin/bans/admin_bans.php')->display();
+        }
     }
 
     public function add($id = null)
@@ -85,19 +77,15 @@ public function add($id = null)
             $this->model->insert_ban();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
-        $focus_element = array('bans2', 'ban_user');
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->enableAdminConsole()->display();
-
         generate_admin_menu('bans');
 
-        $this->feather->render('admin/bans/add_ban.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'admin_console' => true,
+                'focus_element' => array('bans2', 'ban_user'),
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans')),
                 'ban' => $this->model->add_ban_info($id),
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/bans/add_ban.php')->display();
     }
 
     public function delete($id)
@@ -120,18 +108,14 @@ public function edit($id)
             $this->model->insert_ban();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
-        $focus_element = array('bans2', 'ban_user');
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->enableAdminConsole()->display();
-
         generate_admin_menu('bans');
 
-        $this->feather->render('admin/bans/add_ban.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'admin_console' => true,
+                'focus_element' => array('bans2', 'ban_user'),
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans')),
                 'ban' => $this->model->edit_ban_info($id),
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/bans/add_ban.php')->display();
     }
 }
diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index 397c2c73..e3b88025 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\admin\categories();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/categories.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -103,16 +101,13 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Categories'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('categories');
 
-        $this->feather->render('admin/categories.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Categories')),
+                'active_page' => 'admin',
+                'admin_console' => true,
                 'cat_list' => $this->model->get_cat_list(),
-            ));
-
-        $this->footer->display();
+            ))->addTemplate('admin/categories.php')->display();;
     }
 }
diff --git a/controller/admin/censoring.php b/controller/admin/censoring.php
index 850b4492..a7367eb9 100644
--- a/controller/admin/censoring.php
+++ b/controller/admin/censoring.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\admin\censoring();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/censoring.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -51,18 +49,15 @@ public function display()
             $this->model->remove_word();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Censoring'));
-        $focus_element = array('censoring', 'new_search_for');
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->enableAdminConsole()->display();
-
         generate_admin_menu('censoring');
 
-        $this->feather->render('admin/censoring.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title'    =>    array(feather_escape($this->config['o_board_title']), __('Admin'), __('Censoring')),
+                'focus_element'    =>    array('censoring', 'new_search_for'),
+                'active_page'    =>    'admin',
+                'admin_console'    =>    true,
                 'word_data'    =>    $this->model->get_words(),
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/censoring.php')->display();
     }
 }
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index b57c096e..8206fcdd 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\admin\forums();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/forums.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -138,7 +136,7 @@ public function edit_forum($forum_id)
                 )
             );
 
-            $this->footer->display();
+
         }
     }
 
@@ -168,7 +166,7 @@ public function delete_forum($forum_id)
                 )
             );
 
-            $this->footer->display();
+
         }
     }
 
@@ -211,6 +209,6 @@ public function display()
             )
         );
 
-        $this->footer->display();
+
     }
 }
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index 7a48234f..0fc1e004 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\admin\groups();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/groups.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -55,7 +55,7 @@ public function display()
             )
         );
 
-        $this->footer->display();
+
     }
 
     public function delete($id)
@@ -95,7 +95,7 @@ public function delete($id)
                     )
                 );
 
-                $this->footer->display();
+
             }
         }
 
@@ -112,7 +112,7 @@ public function delete($id)
             )
         );
 
-        $this->footer->display();
+
     }
 
     public function addedit($id = '')
@@ -148,7 +148,7 @@ public function addedit($id = '')
                 )
             );
 
-            $this->footer->display();
+
         }
     }
 }
diff --git a/controller/admin/maintenance.php b/controller/admin/maintenance.php
index d58d7e52..bf942e45 100644
--- a/controller/admin/maintenance.php
+++ b/controller/admin/maintenance.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\admin\maintenance();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/maintenance.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -79,7 +79,7 @@ public function display()
                 )
             );
 
-            $this->footer->display();
+
         }
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Maintenance'));
@@ -94,6 +94,6 @@ public function display()
             )
         );
 
-        $this->footer->display();
+
     }
 }
diff --git a/controller/admin/options.php b/controller/admin/options.php
index 2a640c18..545f797b 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\admin\options();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/options.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -53,6 +53,6 @@ public function display()
             )
         );
 
-        $this->footer->display();
+
     }
 }
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index 81db5407..6178bd88 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\admin\parser();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/parser.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -226,6 +226,6 @@ public function display()
             )
         );
 
-        $this->footer->display();
+
     }
 }
diff --git a/controller/admin/permissions.php b/controller/admin/permissions.php
index 9abbabe6..80ed8712 100644
--- a/controller/admin/permissions.php
+++ b/controller/admin/permissions.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\admin\permissions();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/permissions.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -49,6 +49,6 @@ public function display()
 
         $this->feather->render('admin/permissions.php');
 
-        $this->footer->display();
+
     }
 }
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index 61f72ac7..bc0f9496 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\admin\plugins();
         require FEATHER_ROOT . 'include/common_admin.php';
     }
@@ -71,6 +71,6 @@ public function display()
 
         $this->feather->render('admin/loader.php');
 
-        $this->footer->display();
+
     }
 }
diff --git a/controller/admin/reports.php b/controller/admin/reports.php
index 3a9ced60..6c0ea0cc 100644
--- a/controller/admin/reports.php
+++ b/controller/admin/reports.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\admin\reports();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/reports.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -53,6 +53,6 @@ public function display()
             )
         );
 
-        $this->footer->display();
+
     }
 }
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index a7c29d0d..8f422881 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\admin\statistics();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/index.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -53,7 +53,7 @@ public function display()
             )
         );
 
-        $this->footer->display();
+
     }
 
 
diff --git a/controller/admin/users.php b/controller/admin/users.php
index aecd2f43..55e2e4b0 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\admin\users();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/users.mo');
         $this->header->enableAdminConsole();
@@ -56,7 +56,7 @@ public function display()
                 )
             );
 
-            $this->footer->display();
+
         }
 
 
@@ -79,7 +79,7 @@ public function display()
                 )
             );
 
-            $this->footer->display();
+
         }
 
 
@@ -103,7 +103,7 @@ public function display()
                 )
             );
 
-            $this->footer->display();
+
         }
 
         // Display bans
@@ -145,7 +145,7 @@ public function display()
                 )
             );
 
-            $this->footer->display();
+
         }
 
         $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'));
@@ -160,7 +160,7 @@ public function display()
             )
         );
 
-        $this->footer->display();
+
     }
 
     // Show IP statistics for a certain user ID
@@ -192,7 +192,7 @@ public function ipstats($id)
             )
         );
 
-        $this->footer->display();
+
     }
 
     // Show IP statistics for a certain user IP
@@ -228,6 +228,6 @@ public function showusers($ip)
             )
         );
 
-        $this->footer->display();
+
     }
 }
diff --git a/controller/edit.php b/controller/edit.php
index 0065a307..0239c17e 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\edit();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
@@ -127,6 +127,6 @@ public function editpost($id)
                             )
                     );
 
-        $this->footer->display();
+
     }
 }
diff --git a/controller/footer.php b/controller/footer.php
deleted file mode 100644
index 60a4f6c9..00000000
--- a/controller/footer.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-namespace controller;
-
-class footer
-{
-    public function __construct()
-    {
-        $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->dontStop = false;
-    }
-
-    public function dontStop() {
-        $this->dontStop = true;
-    }
-
-    public function display($footer_style = null, $id = null, $p = null, $pid = null, $forum_id = null, $num_pages = null)
-    {
-        // Render the footer
-        // If no footer style has been specified, we use the default (only copyright/debug info)
-        $footer_style = isset($footer_style) ? $footer_style : null;
-
-        $id = isset($id) ? $id : null;
-        $p = isset($p) ? $p : null;
-        $pid = isset($pid) ? $pid : null;
-
-        $forum_id = isset($forum_id) ? $forum_id : null;
-
-        $num_pages = isset($num_pages) ? $num_pages : null;
-
-        if (!$this->feather->cache->isCached('quickjump')) {
-            $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
-        }
-
-        $this->feather->render('footer.php', array(
-                            'id' => $id,
-                            'p' => $p,
-                            'pid' => $pid,
-                            'feather_start' => $this->start,
-                            'quickjump' => $this->feather->cache->retrieve('quickjump'),
-                            'forum_id' => $forum_id,
-                            'num_pages' => $num_pages,
-                            )
-                    );
-
-        // Close Idiorm connection
-        $pdo = \DB::get_db();
-        $pdo = null;
-
-        // If we need to stop the application outside a route
-        if ($this->dontStop) {
-            die();
-        }
-
-        // If we reached this far, we shouldn't execute more code
-        $this->feather->stop();
-    }
-}
diff --git a/controller/header.php b/controller/header.php
deleted file mode 100644
index df89879b..00000000
--- a/controller/header.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-namespace controller;
-
-class header
-{
-    public function __construct()
-    {
-        $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->model = new \model\header();
-    }
-
-    private $title;
-
-    private $page;
-
-    private $focus_element;
-
-    private $paging_links;
-
-    private $required_fields;
-
-    private $page_head;
-
-    private $active_page;
-
-    private $admin_console;
-
-    private $allow_index;
-
-    public function setTitle($title)
-    {
-        $this->title = $title;
-
-        return $this;
-    }
-
-    public function setPage($page)
-    {
-        $this->page = $page;
-
-        return $this;
-    }
-
-    public function setFocusElement($focus_element)
-    {
-        $this->focus_element = $focus_element;
-
-        return $this;
-    }
-
-    public function setPagingLinks($paging_links)
-    {
-        $this->paging_links = $paging_links;
-
-        return $this;
-    }
-
-    public function setRequiredFields($required_fields)
-    {
-        $this->required_fields = $required_fields;
-
-        return $this;
-    }
-
-    public function setPageHead($page_head)
-    {
-        $this->page_head = $page_head;
-
-        return $this;
-    }
-
-    public function setActivePage($active_page)
-    {
-        $this->active_page = $active_page;
-
-        return $this;
-    }
-
-    public function enableAdminConsole()
-    {
-        $this->admin_console = true;
-
-        return $this;
-    }
-
-    public function allowIndex()
-    {
-        $this->allow_index = true;
-
-        return $this;
-    }
-
-    public function display()
-    {
-        if (!defined('FEATHER_HEADER')) {
-            define('FEATHER_HEADER', 1);
-        }
-
-        // Render the header
-        $this->title = isset($this->title) ? $this->title : feather_escape($this->config['o_board_title']);
-
-        // Define $p if it's not set to avoid a PHP notice
-        $this->page = isset($this->page) ? $this->page : null;
-
-        // Set default safe values
-        $this->page_head = isset($this->page_head) ? $this->page_head : null;
-        $this->paging_links = isset($this->paging_links) ? $this->paging_links : null;
-        $this->required_fields = isset($this->required_fields) ? $this->required_fields : null;
-
-        $navlinks = $this->getNavlinks();
-        $page_info = $this->getStatus();
-        $admin_console = $this->getAdminConsole();
-
-        // Show the robots meta only if enabled
-        $allow_index = ($this->allow_index === true) ? '' : '<meta name="ROBOTS" content="NOINDEX, FOLLOW" />'."\n";
-
-        $focus_element = isset($this->focus_element) ? ' onload="document.getElementById(\''.$this->focus_element[0].'\').elements[\''.$this->focus_element[1].'\'].focus();"' : '';
-
-        $this->feather->render('header.php', array(
-                'page_title' => $this->title,
-                'p' => $this->page,
-                '_SERVER' => $_SERVER,
-                'page_head' => $this->page_head,
-                'active_page' => $this->active_page,
-                'paging_links' => $this->paging_links,
-                'required_fields' => $this->required_fields,
-                'focus_element' => $focus_element,
-                'navlinks' => $navlinks,
-                'page_info' => $page_info,
-                'admin_console' => $admin_console,
-                'allow_index' => $allow_index,
-            )
-        );
-    }
-
-    private function getNavlinks()
-    {
-        $links = array();
-
-        // Index should always be displayed
-        $links[] = '<li id="navindex"'.(($this->active_page == 'index') ? ' class="isactive"' : '').'><a href="'.get_base_url().'/">'.__('Index').'</a></li>';
-
-        if ($this->user->g_read_board == '1' && $this->user->g_view_users == '1') {
-            $links[] = '<li id="navuserlist"'.(($this->active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.get_link('userlist/').'">'.__('User list').'</a></li>';
-        }
-
-        if ($this->config['o_rules'] == '1' && (!$this->user->is_guest || $this->user->g_read_board == '1' || $this->config['o_regs_allow'] == '1')) {
-            $links[] = '<li id="navrules"'.(($this->active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.get_link('rules/').'">'.__('Rules').'</a></li>';
-        }
-
-        if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-            $links[] = '<li id="navsearch"'.(($this->active_page == 'search') ? ' class="isactive"' : '').'><a href="'.get_link('search/').'">'.__('Search').'</a></li>';
-        }
-
-        if ($this->user->is_guest) {
-            $links[] = '<li id="navregister"'.(($this->active_page == 'register') ? ' class="isactive"' : '').'><a href="'.get_link('register/').'">'.__('Register').'</a></li>';
-            $links[] = '<li id="navlogin"'.(($this->active_page == 'login') ? ' class="isactive"' : '').'><a href="'.get_link('login/').'">'.__('Login').'</a></li>';
-        } else {
-            $links[] = '<li id="navprofile"'.(($this->active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.get_link('user/'.$this->user->id.'/').'">'.__('Profile').'</a></li>';
-
-            if ($this->user->is_admmod) {
-                $links[] = '<li id="navadmin"'.(($this->active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.get_link('admin/').'">'.__('Admin').'</a></li>';
-            }
-
-            $links[] = '<li id="navlogout"><a href="'.get_link('logout/id/'.$this->user->id.'/token/'.feather_hash($this->user->id.feather_hash($this->request->getIp()))).'/">'.__('Logout').'</a></li>';
-        }
-
-        // Are there any additional navlinks we should insert into the array before imploding it?
-        if ($this->user->g_read_board == '1' && $this->config['o_additional_navlinks'] != '') {
-            if (preg_match_all('%([0-9]+)\s*=\s*(.*?)\n%s', $this->config['o_additional_navlinks']."\n", $extra_links)) {
-                // Insert any additional links into the $links array (at the correct index)
-                $num_links = count($extra_links[1]);
-                for ($i = 0; $i < $num_links; ++$i) {
-                    array_splice($links, $extra_links[1][$i], 0, array('<li id="navextra'.($i + 1).'">'.$extra_links[2][$i].'</li>'));
-                }
-            }
-        }
-
-        $navlinks = '<div id="brdmenu" class="inbox">'."\n\t\t\t".'<ul>'."\n\t\t\t\t".implode("\n\t\t\t\t", $links)."\n\t\t\t".'</ul>'."\n\t\t".'</div>';
-
-        return $navlinks;
-    }
-
-    private function getStatus()
-    {
-        $page_statusinfo = $page_topicsearches = array();
-
-        if ($this->user->is_guest) {
-            $page_statusinfo = '<p class="conl">'.__('Not logged in').'</p>';
-        } else {
-            $page_statusinfo[] = '<li><span>'.__('Logged in as').' <strong>'.feather_escape($this->user->username).'</strong></span></li>';
-            $page_statusinfo[] = '<li><span>'.sprintf(__('Last visit'), format_time($this->user->last_visit)).'</span></li>';
-
-            if ($this->user->is_admmod) {
-                if ($this->config['o_report_method'] == '0' || $this->config['o_report_method'] == '2') {
-                    if ($this->model->get_reports()) {
-                        $page_statusinfo[] = '<li class="reportlink"><span><strong><a href="'.get_link('admin/reports/').'">'.__('New reports').'</a></strong></span></li>';
-                    }
-                }
-
-                if ($this->config['o_maintenance'] == '1') {
-                    $page_statusinfo[] = '<li class="maintenancelink"><span><strong><a href="'.get_link('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>';
-                }
-            }
-
-            if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-                $page_topicsearches[] = '<a href="'.get_link('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a>';
-                $page_topicsearches[] = '<a href="'.get_link('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a>';
-            }
-        }
-
-        // Quick searches
-        if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-            $page_topicsearches[] = '<a href="'.get_link('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a>';
-            $page_topicsearches[] = '<a href="'.get_link('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
-        }
-
-        // Generate all that jazz
-        $page_info = '<div id="brdwelcome" class="inbox">';
-
-        // The status information
-        if (is_array($page_statusinfo)) {
-            $page_info .= "\n\t\t\t".'<ul class="conl">';
-            $page_info .= "\n\t\t\t\t".implode("\n\t\t\t\t", $page_statusinfo);
-            $page_info .= "\n\t\t\t".'</ul>';
-        } else {
-            $page_info .= "\n\t\t\t".$page_statusinfo;
-        }
-
-        // Generate quicklinks
-        if (!empty($page_topicsearches)) {
-            $page_info .= "\n\t\t\t".'<ul class="conr">';
-            $page_info .= "\n\t\t\t\t".'<li><span>'.__('Topic searches').' '.implode(' | ', $page_topicsearches).'</span></li>';
-            $page_info .= "\n\t\t\t".'</ul>';
-        }
-
-        $page_info .= "\n\t\t\t".'<div class="clearer"></div>'."\n\t\t".'</div>';
-
-        return $page_info;
-    }
-
-    protected function getAdminConsole()
-    {
-        if ($this->admin_console === true) {
-            if (file_exists(FEATHER_ROOT.'style/'.$this->user->style.'/base_admin.css')) {
-                return '<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/'.$this->user->style.'/base_admin.css" />'."\n";
-            } else {
-                return '<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/imports/base_admin.css" />'."\n";
-            }
-        } else {
-            return '';
-        }
-    }
-}
diff --git a/controller/help.php b/controller/help.php
index 36f44c4e..45dff1bb 100644
--- a/controller/help.php
+++ b/controller/help.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/help.mo');
     }
 
@@ -34,12 +32,9 @@ public function display()
             message(__('No view'), '403');
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Help'));
-
-        $this->header->setTitle($page_title)->setActivePage('help')->display();
-
-        $this->feather->render('help.php');
-
-        $this->footer->display();
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->config['o_board_title']), __('Help')),
+            'active_page' => 'help',
+        ))->addTemplate('help.php')->display();
     }
 }
diff --git a/controller/login.php b/controller/login.php
index a6aab50a..30c9c5f3 100644
--- a/controller/login.php
+++ b/controller/login.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\login();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/login.mo');
     }
diff --git a/controller/moderate.php b/controller/moderate.php
index c20ec362..7ea2a272 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\moderate();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/topic.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
@@ -279,7 +279,7 @@ public function display($id, $name = null, $page = null)
                             )
                     )->addTemplate('moderate/moderator_forum.php')->display();
 
-        $this->footer->display();
+
     }
 
     public function dealposts($fid)
diff --git a/controller/register.php b/controller/register.php
index 5258ec6f..b1016b99 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\register();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
diff --git a/controller/search.php b/controller/search.php
index c692c862..f5361e1d 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\search();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/search.mo');
diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index 4d93a4c1..64d1f82d 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -194,25 +194,15 @@ public function maintenance_message()
         $replace = array('&#160; &#160; ', '&#160; ', ' &#160;');
         $message = str_replace($pattern, $replace, $this->app->forum_settings['o_maintenance_message']);
 
-        $page_title = array(feather_escape($this->app->forum_settings['o_board_title']), __('Maintenance'));
-
-        $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? $this->app->forum_env['FEATHER_ROOT'].'style/'.$this->app->user->style.'/view' : $this->app->forum_env['FEATHER_ROOT'].'view');
-
-        $header = new \controller\header();
-
-        $header->setTitle($page_title)->setActivePage('index')->display();
-
-        $this->app->render('message.php', array(
-                'message'    =>    $message,
-                'no_back_link'    =>    '',
-            )
-        );
-
-        $footer = new \controller\footer();
-
-        $footer->dontStop();
-
-        $footer->display();
+        $this->app->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->app->forum_settings['o_board_title']), __('Maintenance')),
+            'active_page' => 'index',
+            'message'    =>    $message,
+            'no_back_link'    =>    '',
+        ))->addTemplate('message.php')->display();
+
+        // Don't display anything after a message
+        $this->app->stop();
     }
 
     public function call()
diff --git a/include/functions.php b/include/functions.php
index 09330114..c9c4087d 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -589,7 +589,7 @@ function paginate_old($num_pages, $cur_page, $link)
 //
 // Display a message
 //
-function message($msg, $http_status = null, $no_back_link = false, $dontStop = false)
+function message($msg, $http_status = null, $no_back_link = false)
 {
     // Did we receive a custom header?
     if (!is_null($http_status)) {
@@ -608,29 +608,18 @@ function message($msg, $http_status = null, $no_back_link = false, $dontStop = f
     $feather->response->setBody('');
 
     if (!defined('FEATHER_HEADER')) {
-        $page_title = array(feather_escape($feather->config['o_board_title']), __('Info'));
-
-        require_once FEATHER_ROOT.'controller/header.php';
-
-        $header = new \controller\header();
-
-        $header->setTitle($page_title)->display();
+        $feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($feather->config['o_board_title']), __('Info')),
+        ));
     }
 
-    $feather->render('message.php', array(
+    $feather->view2->setPageInfo(array(
         'message'    =>    $msg,
         'no_back_link'    => $no_back_link,
-        ));
-
-    require_once FEATHER_ROOT.'controller/footer.php';
-
-    $footer = new \controller\footer();
-
-    if ($dontStop) {
-        $footer->dontStop();
-    }
+        ))->addTemplate('message.php')->display();
 
-    $footer->display();
+    // Don't display anything after a message
+    $feather->stop();
 }
 
 

From 14ee7f1c039311e276098a3a3d3aa745690599d0 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 27 Aug 2015 21:31:34 +0200
Subject: [PATCH 218/353] New template engine

---
 controller/admin/categories.php  |   2 +-
 controller/admin/forums.php      |  48 +++++------
 controller/admin/groups.php      |  63 ++++++---------
 controller/admin/index.php       |   2 +-
 controller/admin/maintenance.php |  26 +++---
 controller/admin/options.php     |  15 ++--
 controller/admin/parser.php      |  16 ++--
 controller/admin/permissions.php |  15 ++--
 controller/admin/plugins.php     |  16 ++--
 controller/admin/reports.php     |  13 ++-
 controller/admin/statistics.php  |  13 ++-
 controller/admin/users.php       | 132 ++++++++++++-------------------
 include/classes/core.class.php   |   1 -
 model/admin/groups.php           |   6 +-
 14 files changed, 139 insertions(+), 229 deletions(-)

diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index e3b88025..916506be 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -108,6 +108,6 @@ public function display()
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'cat_list' => $this->model->get_cat_list(),
-            ))->addTemplate('admin/categories.php')->display();;
+            ))->addTemplate('admin/categories.php')->display();
     }
 }
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index 8206fcdd..ba4cfa60 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -121,22 +121,18 @@ public function edit_forum($forum_id)
             }
 
         } else {
-
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums'));
-
-            $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
             generate_admin_menu('forums');
 
-            $this->feather->render('admin/forums/permissions.php', array(
+            $this->feather->view2->setPageInfo(array(
+                    'title'    =>    array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums')),
+                    'active_page'    =>    'admin',
+                    'admin_console'    =>    true,
                     'perm_data' => $this->model->get_permissions($forum_id),
                     'cur_index'     =>  7,
                     'cur_forum' => $this->model->get_forum_info($forum_id),
                     'forum_data' => $this->model->get_forums(),
                 )
-            );
-
-
+            )->addTemplate('admin/forums/permissions.php')->display();
         }
     }
 
@@ -153,20 +149,17 @@ public function delete_forum($forum_id)
 
             redirect(get_link('admin/forums/'), __('Forum deleted redirect'));
 
-        } else { // If the user hasn't confirmed the delete
-
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums'));
-
-            $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
+        } else { // If the user hasn't confirmed
 
             generate_admin_menu('forums');
 
-            $this->feather->render('admin/forums/delete_forum.php', array(
+            $this->feather->view2->setPageInfo(array(
+                    'title'    =>    array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums')),
+                    'active_page'    =>    'admin',
+                    'admin_console'    =>    true,
                     'cur_forum' => $this->model->get_forum_info($forum_id),
                 )
-            );
-
-
+            )->addTemplate('admin/forums/delete_forum.php')->display();
         }
     }
 
@@ -195,20 +188,17 @@ public function display()
             $this->edit_positions();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('forums');
 
         $categories_model = new \model\admin\categories();
-        $this->feather->render('admin/forums/admin_forums.php', array(
-                'cat_list'      => $categories_model->get_cat_list(),
-                'forum_data'    =>  $this->model->get_forums(),
-                'cur_index'     =>  4,
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums')),
+                'active_page' => 'admin',
+                'admin_console' => true,
+                'cat_list' => $categories_model->get_cat_list(),
+                'forum_data' => $this->model->get_forums(),
+                'cur_index' => 4,
             )
-        );
-
-
+        )->addTemplate('admin/forums/admin_forums.php')->display();
     }
 }
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index 0fc1e004..2ccffa6a 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-
-
         $this->model = new \model\admin\groups();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/groups.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -43,19 +41,16 @@ public function display()
             $this->model->set_default_group($groups, $this->feather);
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('groups');
 
-        $this->feather->render('admin/groups/admin_groups.php', array(
-                'groups' => $groups,
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                'active_page' => 'admin',
+                'admin_console' => true,
+                'groups' => $this->model->fetch_groups(),
                 'cur_index' => 5,
             )
-        );
-
-
+        )->addTemplate('admin/groups/admin_groups.php')->display();
     }
 
     public function delete($id)
@@ -81,38 +76,30 @@ public function delete($id)
             if ($this->request->post('del_group_comply') || $this->request->post('del_group')) {
                 $this->model->delete_group($id);
             } else {
-                $group_title = $this->model->get_group_title($id);
-
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
-
-                $this->header->setTitle($page_title)->setActivePage('admin')->display();
-
                 generate_admin_menu('groups');
 
-                $this->feather->render('admin/groups/confirm_delete.php', array(
-                        'group_title'      =>  $group_title,
+                $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                        'active_page' => 'admin',
+                        'admin_console' => true,
+                        'group_title'      =>  $this->model->get_group_title($id),
                         'id'    => $id,
                     )
-                );
-
-
+                )->addTemplate('admin/groups/confirm_delete.php')->display();
             }
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('groups');
 
-        $this->feather->render('admin/groups/delete_group.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                'active_page' => 'admin',
+                'admin_console' => true,
                 'id'    => $id,
                 'group_info'      =>  $this->model->get_title_members($id),
                 'group_list_delete'      =>  $this->model->get_group_list_delete($id),
             )
-        );
-
-
+        )->addTemplate('admin/groups/delete_group.php')->display();
     }
 
     public function addedit($id = '')
@@ -130,25 +117,23 @@ public function addedit($id = '')
 
         // Add/edit a group (stage 1)
         elseif ($this->request->post('add_group') || isset($id)) {
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
-            $required_fields = array('req_title' => __('Group title label'));
-            $focus_element = array('groups2', 'req_title');
-
-            $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->setRequiredFields($required_fields)->enableAdminConsole()->display();
 
             generate_admin_menu('groups');
 
             $group = $this->model->info_add_group($groups, $id);
 
-            $this->feather->render('admin/groups/add_edit_group.php', array(
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                    'active_page' => 'admin',
+                    'admin_console' => true,
+                    'focus_element' => array('groups2', 'req_title'),
+                    'required_fields' => array('req_title' => __('Group title label')),
                     'group'    =>    $group,
                     'groups'    =>    $groups,
                     'id'    => $id,
                     'group_list'    => $this->model->get_group_list($groups, $group),
                 )
-            );
-
-
+            )->addTemplate('admin/groups/delete_group.php')->display();
         }
     }
 }
diff --git a/controller/admin/index.php b/controller/admin/index.php
index ccafe51c..1069a7cb 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -79,7 +79,7 @@ public function display($action = null)
         generate_admin_menu('index');
 
         $this->feather->view2->setPageInfo(array(
-                            'page_title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Index')),
+                            'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Index')),
                             'active_page' => 'admin',
                             'admin_console' => true,
                             'install_file_exists'    =>   is_dir(FEATHER_ROOT.'install'),
diff --git a/controller/admin/maintenance.php b/controller/admin/maintenance.php
index bf942e45..cd8c237b 100644
--- a/controller/admin/maintenance.php
+++ b/controller/admin/maintenance.php
@@ -62,38 +62,32 @@ public function display()
             $prune_from = feather_trim($this->request->post('prune_from'));
             $prune_sticky = intval($this->request->post('prune_sticky'));
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Prune'));
-
-            $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
             generate_admin_menu('maintenance');
 
             if ($this->request->post('prune_comply')) {
                 $this->model->prune_comply($prune_from, $prune_sticky);
             }
 
-            $this->feather->render('admin/maintenance/prune.php', array(
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Prune')),
+                    'active_page' => 'admin',
+                    'admin_console' => true,
                     'prune_sticky'    =>    $prune_sticky,
                     'prune_from'    =>    $prune_from,
                     'prune' => $this->model->get_info_prune($prune_sticky, $prune_from),
                 )
-            );
-
-
+            )->addTemplate('admin/maintenance/prune.php')->display();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Maintenance'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('maintenance');
 
-        $this->feather->render('admin/maintenance/admin_maintenance.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Maintenance')),
+                'active_page' => 'admin',
+                'admin_console' => true,
                 'first_id' => $this->model->get_first_id(),
                 'categories' => $this->model->get_categories(),
             )
-        );
-
-
+        )->addTemplate('admin/maintenance/admin_maintenance.php')->display();
     }
 }
diff --git a/controller/admin/options.php b/controller/admin/options.php
index 545f797b..589b48cb 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-
-
         $this->model = new \model\admin\options();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/options.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -40,19 +38,16 @@ public function display()
             $this->model->update_options();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Options'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('options');
 
-        $this->feather->render('admin/options.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Options')),
+                'active_page' => 'admin',
+                'admin_console' => true,
                 'languages' => forum_list_langs(),
                 'styles' => $this->model->get_styles(),
                 'times' => $this->model->get_times(),
             )
-        );
-
-
+        )->addTemplate('admin/options.php')->display();
     }
 }
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index 6178bd88..30b48a08 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-
-
         $this->model = new \model\admin\parser();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/parser.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -209,14 +207,12 @@ public function display()
             redirect(get_link('admin/parser/'), $lang_admin_parser['save_success']);
         }
 
-
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Parser'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('parser');
 
-        $this->feather->render('admin/parser.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Parser')),
+                'active_page' => 'admin',
+                'admin_console' => true,
                 'lang_admin_parser'    =>    $lang_admin_parser,
                 'smiley_files' => $this->model->get_smiley_files(),
                 'bbcd' =>   $bbcd,
@@ -224,8 +220,6 @@ public function display()
                 'smilies' =>    $smilies,
                 'i'     =>  -1,
             )
-        );
-
-
+        )->addTemplate('admin/parser.php')->display();
     }
 }
diff --git a/controller/admin/permissions.php b/controller/admin/permissions.php
index 80ed8712..ac1881bd 100644
--- a/controller/admin/permissions.php
+++ b/controller/admin/permissions.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-
-
         $this->model = new \model\admin\permissions();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/permissions.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -41,14 +39,13 @@ public function display()
             $this->model->update_permissions();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Permissions'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('permissions');
 
-        $this->feather->render('admin/permissions.php');
-
-
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Permissions')),
+                'active_page' => 'admin',
+                'admin_console' => true,
+            )
+        )->addTemplate('admin/permissions.php')->display();
     }
 }
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index bc0f9496..24f35961 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -18,9 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-
-
-        $this->model = new \model\admin\plugins();
         require FEATHER_ROOT . 'include/common_admin.php';
     }
 
@@ -57,10 +54,6 @@ public function display()
             $_SERVER['REQUEST_URI'] = (isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : '').'?'.(isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '');
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), str_replace('_', ' ', substr($plugin, strpos($plugin, '_') + 1, -4)));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         // Attempt to load the plugin. We don't use @ here to suppress error messages,
         // because if we did and a parse error occurred in the plugin, we would only
         // get the "blank page of death"
@@ -69,8 +62,11 @@ public function display()
             message(sprintf(__('Plugin failed message'), $plugin));
         }
 
-        $this->feather->render('admin/loader.php');
-
-
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), str_replace('_', ' ', substr($plugin, strpos($plugin, '_') + 1, -4))),
+                'active_page' => 'admin',
+                'admin_console' => true,
+            )
+        )->addTemplate('admin/loader.php')->display();
     }
 }
diff --git a/controller/admin/reports.php b/controller/admin/reports.php
index 6c0ea0cc..7e2c933a 100644
--- a/controller/admin/reports.php
+++ b/controller/admin/reports.php
@@ -41,18 +41,15 @@ public function display()
             $this->model->zap_report();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Reports'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('reports');
 
-        $this->feather->render('admin/reports.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Reports')),
+                'active_page' => 'admin',
+                'admin_console' => true,
                 'report_data'   =>  $this->model->get_reports(),
                 'report_zapped_data'   =>  $this->model->get_zapped_reports(),
             )
-        );
-
-
+        )->addTemplate('admin/reports.php')->display();
     }
 }
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index 8f422881..7bd279af 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -36,24 +36,21 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Server statistics'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('index');
 
         $total = $this->model->get_total_size();
 
-        $this->feather->render('admin/statistics.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Server statistics')),
+                'active_page' => 'admin',
+                'admin_console' => true,
                 'server_load'    =>    $this->model->get_server_load(),
                 'num_online'    =>    $this->model->get_num_online(),
                 'total_size'    =>    $total['size'],
                 'total_records'    =>    $total['records'],
                 'php_accelerator'    =>    $this->model->get_php_accelerator(),
             )
-        );
-
-
+        )->addTemplate('admin/statistics.php')->display();
     }
 
 
diff --git a/controller/admin/users.php b/controller/admin/users.php
index 55e2e4b0..705234ef 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -18,11 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-
-
         $this->model = new \model\admin\users();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/users.mo');
-        $this->header->enableAdminConsole();
         require FEATHER_ROOT . 'include/common_admin.php';
     }
 
@@ -43,20 +40,15 @@ public function display()
                 message(__('No permission'), '403');
             }
 
-            $move = $this->model->move_users();
-
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Move users'));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->display();
-
             generate_admin_menu('users');
 
-            $this->feather->render('admin/users/move_users.php', array(
-                    'move'              =>  $move,
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Move users')),
+                    'active_page' => 'moderate',
+                    'admin_console' => true,
+                    'move'              =>  $this->model->move_users(),
                 )
-            );
-
-
+            )->addTemplate('admin/users/move_users.php')->display();
         }
 
 
@@ -66,20 +58,15 @@ public function display()
                 message(__('No permission'), '403');
             }
 
-            $user_ids = $this->model->delete_users();
-
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Delete users'));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->display();
-
             generate_admin_menu('users');
 
-            $this->feather->render('admin/users/delete_users.php', array(
-                    'user_ids'          => $user_ids,
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Delete users')),
+                    'active_page' => 'moderate',
+                    'admin_console' => true,
+                    'user_ids'          => $this->model->delete_users(),
                 )
-            );
-
-
+            )->addTemplate('admin/users/delete_users.php')->display();
         }
 
 
@@ -89,21 +76,16 @@ public function display()
                 message(__('No permission'), '403');
             }
 
-            $user_ids = $this->model->ban_users();
-
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
-            $focus_element = array('bans2', 'ban_message');
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->setFocusElement($focus_element)->display();
-
             generate_admin_menu('users');
 
-            $this->feather->render('admin/users/ban_users.php', array(
-                    'user_ids'          => $user_ids,
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Bans')),
+                    'active_page' => 'moderate',
+                    'focus_element' => array('bans2', 'ban_message'),
+                    'admin_console' => true,
+                    'user_ids'          => $this->model->ban_users(),
                 )
-            );
-
-
+            )->addTemplate('admin/users/ban_users.php')->display();
         }
 
         // Display bans
@@ -128,13 +110,13 @@ public function display()
             $can_delete = $can_move = $this->user->g_id == FEATHER_ADMIN;
             $can_ban = $this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && $this->user->g_mod_ban_users == '1');
             $can_action = ($can_delete || $can_ban || $can_move) && $num_users > 0;
+            $this->feather->view2->addAsset('js', 'js/common.js', array('type' => 'text/javascript'));
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head'));
-            $page_head = array('js' => '<script type="text/javascript" src="'.get_base_url().'/js/common.js"></script>');
-
-            $this->header->setTitle($page_title)->setActivePage('admin')->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->display();
-
-            $this->feather->render('admin/users/find_users.php', array(
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
+                    'active_page' => 'admin',
+                    'admin_console' => true,
+                    'paging_links' => $paging_links,
                     'search' => $search,
                     'start_from' => $start_from,
                     'can_delete' => $can_delete,
@@ -143,24 +125,20 @@ public function display()
                     'can_move' => $can_move,
                     'user_data' =>  $this->model->print_users($search['conditions'], $search['order_by'], $search['direction'], $start_from),
                 )
-            );
-
-
+            )->addTemplate('admin/users/find_users.php')->display();
         }
+        else {
+            generate_admin_menu('users');
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'));
-        $focus_element = array('find_user', 'form[username]');
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->display();
-
-        generate_admin_menu('users');
-
-        $this->feather->render('admin/users/admin_users.php', array(
-                'group_list' => $this->model->get_group_list(),
-            )
-        );
-
-
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users')),
+                    'active_page' => 'admin',
+                    'admin_console' => true,
+                    'focus_element' => array('find_user', 'form[username]'),
+                    'group_list' => $this->model->get_group_list(),
+                )
+            )->addTemplate('admin/users/admin_users.php')->display();
+        }
     }
 
     // Show IP statistics for a certain user ID
@@ -179,20 +157,16 @@ public function ipstats($id)
         $p = (!$this->request->get('p') || $this->request->get('p') <= 1 || $this->request->get('p') > $num_pages) ? 1 : intval($this->request->get('p'));
         $start_from = 50 * ($p - 1);
 
-        // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$id);
-
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->setPage($p)->setPagingLinks($paging_links)->display();
-
-        $this->feather->render('admin/users/search_ip.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
+                'active_page' => 'admin',
+                'admin_console' => true,
+                'page' => $p,
+                'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$id),
                 'start_from'        =>  $start_from,
                 'ip_data'   =>  $this->model->get_ip_stats($id, $start_from),
             )
-        );
-
-
+        )->addTemplate('admin/users/search_ip.php')->display();
     }
 
     // Show IP statistics for a certain user IP
@@ -215,19 +189,15 @@ public function showusers($ip)
         $p = (!$this->request->get('p') || $this->request->get('p') <= 1 || $this->request->get('p') > $num_pages) ? 1 : intval($this->request->get('p'));
         $start_from = 50 * ($p - 1);
 
-        // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$ip);
-
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->setPage($p)->setPagingLinks($paging_links)->display();
-
-        $this->feather->render('admin/users/show_users.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
+                'active_page' => 'admin',
+                'admin_console' => true,
+                'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$ip),
+                'page' => $p,
                 'start_from'        =>  $start_from,
                 'info'   =>  $this->model->get_info_poster($ip, $start_from),
             )
-        );
-
-
+        )->addTemplate('admin/users/show_users.php')->display();
     }
 }
diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index 7053b0ab..cf1ca6c3 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -237,7 +237,6 @@ public function call()
         // Set default style and assets
         $this->app->view2->setStyle($this->forum_settings['o_default_style']);
         $this->app->view2->addAsset('js', 'style/FeatherBB/phone.min.js');
-        $this->app->view2->addAsset('js', 'js/common.js');
 
         // Populate FeatherBB Slim object with forum_settings vars
         $this->hydrate('forum_settings', $this->forum_settings);
diff --git a/model/admin/groups.php b/model/admin/groups.php
index 04218d1c..7f6b3d6b 100644
--- a/model/admin/groups.php
+++ b/model/admin/groups.php
@@ -283,11 +283,7 @@ public function set_default_group($groups)
                                                    ->update_many('conf_value', $group_id);
 
         // Regenerate the config cache
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-
-        generate_config_cache();
+        $this->feather->cache->store('config', \model\cache::get_config());
 
         redirect(get_link('admin/groups/'), __('Default group redirect'));
     }

From 4f21148800347d44451cf9f01f286ccf01549ae1 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 27 Aug 2015 21:34:55 +0200
Subject: [PATCH 219/353] Remove legacy templates.path

---
 include/classes/core.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index cf1ca6c3..9da291be 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -249,7 +249,6 @@ public function call()
         $forum_time_formats = array($this->forum_settings['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
         $forum_date_formats = array($this->forum_settings['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
 
-        $this->app->config('templates.path', $this->app->forum_env['FEATHER_ROOT'].'style/FeatherBB/view/');
         // Call FeatherBBAuth middleware
         $this->next->call();
     }

From 420b1b7a94ed713e6e09bca54d687379db79cf6e Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 27 Aug 2015 21:41:08 +0200
Subject: [PATCH 220/353] Update /view folder

---
 view/admin/censoring.php             |   2 +-
 view/admin/groups/add_edit_group.php |   2 +-
 view/admin/groups/admin_groups.php   |   4 +-
 view/admin/index.php                 |   2 +-
 view/admin/menu.php                  |   2 +-
 view/admin/options.php               | 264 +++++++++++++--------------
 view/admin/parser.php                |   2 +-
 view/admin/permissions.php           |  44 ++---
 view/edit.php                        |   8 +-
 view/help.php                        |   2 +-
 view/index.php                       |   8 +-
 view/misc/email.php                  |   4 +-
 view/misc/rules.php                  |   6 +-
 view/moderate/moderator_forum.php    |   6 +-
 view/post.php                        |  16 +-
 view/profile/section_display.php     |  12 +-
 view/profile/section_personality.php |  14 +-
 view/profile/section_privacy.php     |   4 +-
 view/register/form.php               |  10 +-
 view/register/rules.php              |   2 +-
 view/search/form.php                 |   2 +-
 view/viewforum.php                   |  10 +-
 view/viewtopic.php                   |  18 +-
 23 files changed, 222 insertions(+), 222 deletions(-)

diff --git a/view/admin/censoring.php b/view/admin/censoring.php
index 71c253f7..cf080869 100644
--- a/view/admin/censoring.php
+++ b/view/admin/censoring.php
@@ -22,7 +22,7 @@
 					<fieldset>
 						<legend><?php _e('Add word subhead') ?></legend>
 						<div class="infldset">
-							<p><?php _e('Add word info').' '.($feather_config['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
+							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
 							<table>
 							<thead>
 								<tr>
diff --git a/view/admin/groups/add_edit_group.php b/view/admin/groups/add_edit_group.php
index bc2bc244..ae278dce 100644
--- a/view/admin/groups/add_edit_group.php
+++ b/view/admin/groups/add_edit_group.php
@@ -54,7 +54,7 @@
 										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
 									</td>
 								</tr>
-<?php if ($group['mode'] != 'edit' || $feather_config['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
+<?php if ($group['mode'] != 'edit' || $feather->forum_settings['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
 									<th scope="row"> <?php _e('Mod privileges label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
diff --git a/view/admin/groups/admin_groups.php b/view/admin/groups/admin_groups.php
index 643b4883..aff5db98 100644
--- a/view/admin/groups/admin_groups.php
+++ b/view/admin/groups/admin_groups.php
@@ -31,7 +31,7 @@
 
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
-        if ($cur_group['g_id'] == $feather_config['o_default_user_group']) {
+        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
         } else {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
@@ -64,7 +64,7 @@
 
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
-        if ($cur_group['g_id'] == $feather_config['o_default_user_group']) {
+        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
         } else {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
diff --git a/view/admin/index.php b/view/admin/index.php
index dc0dcf8c..f369b039 100644
--- a/view/admin/index.php
+++ b/view/admin/index.php
@@ -45,7 +45,7 @@
 				<dl>
 					<dt><?php _e('FeatherBB version label') ?></dt>
 					<dd>
-						<?php printf(__('FeatherBB version data')."\n", $feather_config['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
+						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
 					</dd>
 					<dt><?php _e('Server statistics label') ?></dt>
 					<dd>
diff --git a/view/admin/menu.php b/view/admin/menu.php
index b33c2727..d958a4ab 100644
--- a/view/admin/menu.php
+++ b/view/admin/menu.php
@@ -32,7 +32,7 @@
 }
     ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
 <?php endif;
-    if ($is_admin || $feather_config['o_report_method'] == '0' || $feather_config['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
+    if ($is_admin || $feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
     echo ' class="isactive"';
 }
     ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
diff --git a/view/admin/options.php b/view/admin/options.php
index faa8e34c..88c2c0b6 100644
--- a/view/admin/options.php
+++ b/view/admin/options.php
@@ -28,21 +28,21 @@
 								<tr>
 									<th scope="row"><?php _e('Board title label') ?></th>
 									<td>
-										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather_config['o_board_title']) ?>" />
+										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>" />
 										<span><?php _e('Board title help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Board desc label') ?></th>
 									<td>
-										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather_config['o_board_desc']) ?></textarea>
+										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather->forum_settings['o_board_desc']) ?></textarea>
 										<span><?php _e('Board desc help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Base URL label') ?></th>
 									<td>
-										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather_config['o_base_url']) ?>" />
+										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather->forum_settings['o_base_url']) ?>" />
 										<span><?php _e('Base URL help') ?></span>
 									</td>
 								</tr>
@@ -50,124 +50,124 @@
 									<th scope="row"><?php _e('Timezone label') ?></th>
 									<td>
 										<select name="form_default_timezone">
-											<option value="-12"<?php if ($feather_config['o_default_timezone'] == -12) {
+											<option value="-12"<?php if ($feather->forum_settings['o_default_timezone'] == -12) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-12:00') ?></option>
-											<option value="-11"<?php if ($feather_config['o_default_timezone'] == -11) {
+											<option value="-11"<?php if ($feather->forum_settings['o_default_timezone'] == -11) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-11:00') ?></option>
-											<option value="-10"<?php if ($feather_config['o_default_timezone'] == -10) {
+											<option value="-10"<?php if ($feather->forum_settings['o_default_timezone'] == -10) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-10:00') ?></option>
-											<option value="-9.5"<?php if ($feather_config['o_default_timezone'] == -9.5) {
+											<option value="-9.5"<?php if ($feather->forum_settings['o_default_timezone'] == -9.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-09:30') ?></option>
-											<option value="-9"<?php if ($feather_config['o_default_timezone'] == -9) {
+											<option value="-9"<?php if ($feather->forum_settings['o_default_timezone'] == -9) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-09:00') ?></option>
-											<option value="-8.5"<?php if ($feather_config['o_default_timezone'] == -8.5) {
+											<option value="-8.5"<?php if ($feather->forum_settings['o_default_timezone'] == -8.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-08:30') ?></option>
-											<option value="-8"<?php if ($feather_config['o_default_timezone'] == -8) {
+											<option value="-8"<?php if ($feather->forum_settings['o_default_timezone'] == -8) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-08:00') ?></option>
-											<option value="-7"<?php if ($feather_config['o_default_timezone'] == -7) {
+											<option value="-7"<?php if ($feather->forum_settings['o_default_timezone'] == -7) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-07:00') ?></option>
-											<option value="-6"<?php if ($feather_config['o_default_timezone'] == -6) {
+											<option value="-6"<?php if ($feather->forum_settings['o_default_timezone'] == -6) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-06:00') ?></option>
-											<option value="-5"<?php if ($feather_config['o_default_timezone'] == -5) {
+											<option value="-5"<?php if ($feather->forum_settings['o_default_timezone'] == -5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-05:00') ?></option>
-											<option value="-4"<?php if ($feather_config['o_default_timezone'] == -4) {
+											<option value="-4"<?php if ($feather->forum_settings['o_default_timezone'] == -4) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-04:00') ?></option>
-											<option value="-3.5"<?php if ($feather_config['o_default_timezone'] == -3.5) {
+											<option value="-3.5"<?php if ($feather->forum_settings['o_default_timezone'] == -3.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-03:30') ?></option>
-											<option value="-3"<?php if ($feather_config['o_default_timezone'] == -3) {
+											<option value="-3"<?php if ($feather->forum_settings['o_default_timezone'] == -3) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-03:00') ?></option>
-											<option value="-2"<?php if ($feather_config['o_default_timezone'] == -2) {
+											<option value="-2"<?php if ($feather->forum_settings['o_default_timezone'] == -2) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-02:00') ?></option>
-											<option value="-1"<?php if ($feather_config['o_default_timezone'] == -1) {
+											<option value="-1"<?php if ($feather->forum_settings['o_default_timezone'] == -1) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-01:00') ?></option>
-											<option value="0"<?php if ($feather_config['o_default_timezone'] == 0) {
+											<option value="0"<?php if ($feather->forum_settings['o_default_timezone'] == 0) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC') ?></option>
-											<option value="1"<?php if ($feather_config['o_default_timezone'] == 1) {
+											<option value="1"<?php if ($feather->forum_settings['o_default_timezone'] == 1) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+01:00') ?></option>
-											<option value="2"<?php if ($feather_config['o_default_timezone'] == 2) {
+											<option value="2"<?php if ($feather->forum_settings['o_default_timezone'] == 2) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+02:00') ?></option>
-											<option value="3"<?php if ($feather_config['o_default_timezone'] == 3) {
+											<option value="3"<?php if ($feather->forum_settings['o_default_timezone'] == 3) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+03:00') ?></option>
-											<option value="3.5"<?php if ($feather_config['o_default_timezone'] == 3.5) {
+											<option value="3.5"<?php if ($feather->forum_settings['o_default_timezone'] == 3.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+03:30') ?></option>
-											<option value="4"<?php if ($feather_config['o_default_timezone'] == 4) {
+											<option value="4"<?php if ($feather->forum_settings['o_default_timezone'] == 4) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+04:00') ?></option>
-											<option value="4.5"<?php if ($feather_config['o_default_timezone'] == 4.5) {
+											<option value="4.5"<?php if ($feather->forum_settings['o_default_timezone'] == 4.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+04:30') ?></option>
-											<option value="5"<?php if ($feather_config['o_default_timezone'] == 5) {
+											<option value="5"<?php if ($feather->forum_settings['o_default_timezone'] == 5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+05:00') ?></option>
-											<option value="5.5"<?php if ($feather_config['o_default_timezone'] == 5.5) {
+											<option value="5.5"<?php if ($feather->forum_settings['o_default_timezone'] == 5.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+05:30') ?></option>
-											<option value="5.75"<?php if ($feather_config['o_default_timezone'] == 5.75) {
+											<option value="5.75"<?php if ($feather->forum_settings['o_default_timezone'] == 5.75) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+05:45') ?></option>
-											<option value="6"<?php if ($feather_config['o_default_timezone'] == 6) {
+											<option value="6"<?php if ($feather->forum_settings['o_default_timezone'] == 6) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+06:00') ?></option>
-											<option value="6.5"<?php if ($feather_config['o_default_timezone'] == 6.5) {
+											<option value="6.5"<?php if ($feather->forum_settings['o_default_timezone'] == 6.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+06:30') ?></option>
-											<option value="7"<?php if ($feather_config['o_default_timezone'] == 7) {
+											<option value="7"<?php if ($feather->forum_settings['o_default_timezone'] == 7) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+07:00') ?></option>
-											<option value="8"<?php if ($feather_config['o_default_timezone'] == 8) {
+											<option value="8"<?php if ($feather->forum_settings['o_default_timezone'] == 8) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+08:00') ?></option>
-											<option value="8.75"<?php if ($feather_config['o_default_timezone'] == 8.75) {
+											<option value="8.75"<?php if ($feather->forum_settings['o_default_timezone'] == 8.75) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+08:45') ?></option>
-											<option value="9"<?php if ($feather_config['o_default_timezone'] == 9) {
+											<option value="9"<?php if ($feather->forum_settings['o_default_timezone'] == 9) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+09:00') ?></option>
-											<option value="9.5"<?php if ($feather_config['o_default_timezone'] == 9.5) {
+											<option value="9.5"<?php if ($feather->forum_settings['o_default_timezone'] == 9.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+09:30') ?></option>
-											<option value="10"<?php if ($feather_config['o_default_timezone'] == 10) {
+											<option value="10"<?php if ($feather->forum_settings['o_default_timezone'] == 10) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+10:00') ?></option>
-											<option value="10.5"<?php if ($feather_config['o_default_timezone'] == 10.5) {
+											<option value="10.5"<?php if ($feather->forum_settings['o_default_timezone'] == 10.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+10:30') ?></option>
-											<option value="11"<?php if ($feather_config['o_default_timezone'] == 11) {
+											<option value="11"<?php if ($feather->forum_settings['o_default_timezone'] == 11) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+11:00') ?></option>
-											<option value="11.5"<?php if ($feather_config['o_default_timezone'] == 11.5) {
+											<option value="11.5"<?php if ($feather->forum_settings['o_default_timezone'] == 11.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+11:30') ?></option>
-											<option value="12"<?php if ($feather_config['o_default_timezone'] == 12) {
+											<option value="12"<?php if ($feather->forum_settings['o_default_timezone'] == 12) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+12:00') ?></option>
-											<option value="12.75"<?php if ($feather_config['o_default_timezone'] == 12.75) {
+											<option value="12.75"<?php if ($feather->forum_settings['o_default_timezone'] == 12.75) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+12:45') ?></option>
-											<option value="13"<?php if ($feather_config['o_default_timezone'] == 13) {
+											<option value="13"<?php if ($feather->forum_settings['o_default_timezone'] == 13) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+13:00') ?></option>
-											<option value="14"<?php if ($feather_config['o_default_timezone'] == 14) {
+											<option value="14"<?php if ($feather->forum_settings['o_default_timezone'] == 14) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+14:00') ?></option>
 										</select>
@@ -177,10 +177,10 @@
 								<tr>
 									<th scope="row"><?php _e('DST label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather_config['o_default_dst'] == '1') {
+										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather->forum_settings['o_default_dst'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather_config['o_default_dst'] == '0') {
+										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather->forum_settings['o_default_dst'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('DST help') ?></span>
@@ -192,7 +192,7 @@
 										<select name="form_default_lang">
 <?php
         foreach ($languages as $temp) {
-            if ($feather_config['o_default_lang'] == $temp) {
+            if ($feather->forum_settings['o_default_lang'] == $temp) {
                 echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
             } else {
                 echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
@@ -231,35 +231,35 @@
 								<tr>
 									<th scope="row"><?php _e('Time format label') ?></th>
 									<td>
-										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_time_format']) ?>" />
-										<span><?php printf(__('Time format help'), gmdate($feather_config['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather->forum_settings['o_time_format']) ?>" />
+										<span><?php printf(__('Time format help'), gmdate($feather->forum_settings['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Date format label') ?></th>
 									<td>
-										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_date_format']) ?>" />
-										<span><?php printf(__('Date format help'), gmdate($feather_config['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather->forum_settings['o_date_format']) ?>" />
+										<span><?php printf(__('Date format help'), gmdate($feather->forum_settings['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Visit timeout label') ?></th>
 									<td>
-										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_visit'] ?>" />
+										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_visit'] ?>" />
 										<span><?php _e('Visit timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Online timeout label') ?></th>
 									<td>
-										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_online'] ?>" />
+										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_online'] ?>" />
 										<span><?php _e('Online timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Redirect time label') ?></th>
 									<td>
-										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather_config['o_redirect_delay'] ?>" />
+										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_redirect_delay'] ?>" />
 										<span><?php _e('Redirect time help') ?></span>
 									</td>
 								</tr>
@@ -275,10 +275,10 @@
 								<tr>
 									<th scope="row"><?php _e('Version number label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather_config['o_show_version'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather->forum_settings['o_show_version'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather_config['o_show_version'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather->forum_settings['o_show_version'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Version number help') ?></span>
@@ -287,10 +287,10 @@
 								<tr>
 									<th scope="row"><?php _e('Info in posts label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather_config['o_show_user_info'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather->forum_settings['o_show_user_info'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather_config['o_show_user_info'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather->forum_settings['o_show_user_info'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Info in posts help') ?></span>
@@ -299,10 +299,10 @@
 								<tr>
 									<th scope="row"><?php _e('Post count label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather_config['o_show_post_count'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather->forum_settings['o_show_post_count'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather_config['o_show_post_count'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather->forum_settings['o_show_post_count'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Post count help') ?></span>
@@ -311,10 +311,10 @@
 								<tr>
 									<th scope="row"><?php _e('Smilies label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather_config['o_smilies'] == '1') {
+										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather->forum_settings['o_smilies'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather_config['o_smilies'] == '0') {
+										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather->forum_settings['o_smilies'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Smilies help') ?></span>
@@ -323,10 +323,10 @@
 								<tr>
 									<th scope="row"><?php _e('Smilies sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather_config['o_smilies_sig'] == '1') {
+										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather->forum_settings['o_smilies_sig'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather_config['o_smilies_sig'] == '0') {
+										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather->forum_settings['o_smilies_sig'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Smilies sigs help') ?></span>
@@ -335,10 +335,10 @@
 								<tr>
 									<th scope="row"><?php _e('Clickable links label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather_config['o_make_links'] == '1') {
+										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather->forum_settings['o_make_links'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather_config['o_make_links'] == '0') {
+										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather->forum_settings['o_make_links'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Clickable links help') ?></span>
@@ -347,35 +347,35 @@
 								<tr>
 									<th scope="row"><?php _e('Topic review label') ?></th>
 									<td>
-										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather_config['o_topic_review'] ?>" />
+										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_topic_review'] ?>" />
 										<span><?php _e('Topic review help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Topics per page label') ?></th>
 									<td>
-										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_topics_default'] ?>" />
+										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_topics_default'] ?>" />
 										<span><?php _e('Topics per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Posts per page label') ?></th>
 									<td>
-										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_posts_default'] ?>" />
+										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_posts_default'] ?>" />
 										<span><?php _e('Posts per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Indent label') ?></th>
 									<td>
-										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather_config['o_indent_num_spaces'] ?>" />
+										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_indent_num_spaces'] ?>" />
 										<span><?php _e('Indent help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Quote depth label') ?></th>
 									<td>
-										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather_config['o_quote_depth'] ?>" />
+										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_quote_depth'] ?>" />
 										<span><?php _e('Quote depth help') ?></span>
 									</td>
 								</tr>
@@ -391,10 +391,10 @@
 								<tr>
 									<th scope="row"><?php _e('Quick post label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather_config['o_quickpost'] == '1') {
+										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather->forum_settings['o_quickpost'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather_config['o_quickpost'] == '0') {
+										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather->forum_settings['o_quickpost'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Quick post help') ?></span>
@@ -403,10 +403,10 @@
 								<tr>
 									<th scope="row"><?php _e('Users online label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather_config['o_users_online'] == '1') {
+										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather->forum_settings['o_users_online'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather_config['o_users_online'] == '0') {
+										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather->forum_settings['o_users_online'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Users online help') ?></span>
@@ -415,10 +415,10 @@
 								<tr>
 									<th scope="row"><a name="censoring"></a><?php _e('Censor words label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather_config['o_censoring'] == '1') {
+										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather->forum_settings['o_censoring'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather_config['o_censoring'] == '0') {
+										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
@@ -427,10 +427,10 @@
 								<tr>
 									<th scope="row"><a name="signatures"></a><?php _e('Signatures label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather_config['o_signatures'] == '1') {
+										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather->forum_settings['o_signatures'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather_config['o_signatures'] == '0') {
+										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather->forum_settings['o_signatures'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Signatures help') ?></span>
@@ -439,10 +439,10 @@
 								<tr>
 									<th scope="row"><?php _e('User has posted label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather_config['o_show_dot'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather->forum_settings['o_show_dot'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather_config['o_show_dot'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather->forum_settings['o_show_dot'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('User has posted help') ?></span>
@@ -451,10 +451,10 @@
 								<tr>
 									<th scope="row"><?php _e('Topic views label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather_config['o_topic_views'] == '1') {
+										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather->forum_settings['o_topic_views'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather_config['o_topic_views'] == '0') {
+										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather->forum_settings['o_topic_views'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Topic views help') ?></span>
@@ -463,10 +463,10 @@
 								<tr>
 									<th scope="row"><?php _e('Quick jump label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather_config['o_quickjump'] == '1') {
+										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather->forum_settings['o_quickjump'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather_config['o_quickjump'] == '0') {
+										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather->forum_settings['o_quickjump'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Quick jump help') ?></span>
@@ -475,10 +475,10 @@
 								<tr>
 									<th scope="row"><?php _e('GZip label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather_config['o_gzip'] == '1') {
+										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather->forum_settings['o_gzip'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather_config['o_gzip'] == '0') {
+										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather->forum_settings['o_gzip'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('GZip help') ?></span>
@@ -487,10 +487,10 @@
 								<tr>
 									<th scope="row"><?php _e('Search all label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather_config['o_search_all_forums'] == '1') {
+										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather->forum_settings['o_search_all_forums'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather_config['o_search_all_forums'] == '0') {
+										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather->forum_settings['o_search_all_forums'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Search all help') ?></span>
@@ -499,7 +499,7 @@
 								<tr>
 									<th scope="row"><?php _e('Menu items label') ?></th>
 									<td>
-										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather_config['o_additional_navlinks']) ?></textarea>
+										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
 										<span><?php _e('Menu items help') ?></span>
 									</td>
 								</tr>
@@ -515,13 +515,13 @@
 								<tr>
 									<th scope="row"><?php _e('Default feed label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather_config['o_feed_type'] == '0') {
+										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather->forum_settings['o_feed_type'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('None') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather_config['o_feed_type'] == '1') {
+										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather->forum_settings['o_feed_type'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('RSS') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather_config['o_feed_type'] == '2') {
+										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather->forum_settings['o_feed_type'] == '2') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Atom') ?></strong></label>
 										<span class="clearb"><?php _e('Default feed help') ?></span>
@@ -531,7 +531,7 @@
 									<th scope="row"><?php _e('Feed TTL label') ?></th>
 									<td>
 										<select name="form_feed_ttl">
-											<option value="0"<?php if ($feather_config['o_feed_ttl'] == '0') {
+											<option value="0"<?php if ($feather->forum_settings['o_feed_ttl'] == '0') {
     echo ' selected="selected"';
 } ?>><?php _e('No cache') ?></option>
 											<?php echo $times ?>
@@ -551,13 +551,13 @@
 								<tr>
 									<th scope="row"><?php _e('Reporting method label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather_config['o_report_method'] == '0') {
+										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather->forum_settings['o_report_method'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Internal') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather_config['o_report_method'] == '1') {
+										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather->forum_settings['o_report_method'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('By e-mail') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather_config['o_report_method'] == '2') {
+										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather->forum_settings['o_report_method'] == '2') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Both') ?></strong></label>
 										<span class="clearb"><?php _e('Reporting method help') ?></span>
@@ -566,7 +566,7 @@
 								<tr>
 									<th scope="row"><?php _e('Mailing list label') ?></th>
 									<td>
-										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather_config['o_mailing_list']) ?></textarea>
+										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_mailing_list']) ?></textarea>
 										<span><?php _e('Mailing list help') ?></span>
 									</td>
 								</tr>
@@ -582,10 +582,10 @@
 								<tr>
 									<th scope="row"><?php _e('Use avatars label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather_config['o_avatars'] == '1') {
+										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather->forum_settings['o_avatars'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather_config['o_avatars'] == '0') {
+										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather->forum_settings['o_avatars'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Use avatars help') ?></span>
@@ -594,28 +594,28 @@
 								<tr>
 									<th scope="row"><?php _e('Upload directory label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather_config['o_avatars_dir']) ?>" />
+										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather->forum_settings['o_avatars_dir']) ?>" />
 										<span><?php _e('Upload directory help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max width label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_width'] ?>" />
+										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_width'] ?>" />
 										<span><?php _e('Max width help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max height label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_height'] ?>" />
+										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_height'] ?>" />
 										<span><?php _e('Max height help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max size label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather_config['o_avatars_size'] ?>" />
+										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 										<span><?php _e('Max size help') ?></span>
 									</td>
 								</tr>
@@ -631,24 +631,24 @@
 								<tr>
 									<th scope="row"><?php _e('Admin e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_admin_email']) ?>" />
+										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather->forum_settings['o_admin_email']) ?>" />
 										<span><?php _e('Admin e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_webmaster_email']) ?>" />
+										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather->forum_settings['o_webmaster_email']) ?>" />
 										<span><?php _e('Webmaster e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Forum subscriptions label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather_config['o_forum_subscriptions'] == '1') {
+										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather_config['o_forum_subscriptions'] == '0') {
+										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Forum subscriptions help') ?></span>
@@ -657,10 +657,10 @@
 								<tr>
 									<th scope="row"><?php _e('Topic subscriptions label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather_config['o_topic_subscriptions'] == '1') {
+										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather_config['o_topic_subscriptions'] == '0') {
+										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Topic subscriptions help') ?></span>
@@ -669,14 +669,14 @@
 								<tr>
 									<th scope="row"><?php _e('SMTP address label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather_config['o_smtp_host']) ?>" />
+										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather->forum_settings['o_smtp_host']) ?>" />
 										<span><?php _e('SMTP address help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('SMTP username label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather_config['o_smtp_user']) ?>" />
+										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather->forum_settings['o_smtp_user']) ?>" />
 										<span><?php _e('SMTP username help') ?></span>
 									</td>
 								</tr>
@@ -684,7 +684,7 @@
 									<th scope="row"><?php _e('SMTP password label') ?></th>
 									<td>
 										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
-<?php $smtp_pass = !empty($feather_config['o_smtp_pass']) ? random_key(feather_strlen($feather_config['o_smtp_pass']), true) : ''; ?>
+<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key(feather_strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
 										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<span><?php _e('SMTP password help') ?></span>
@@ -693,10 +693,10 @@
 								<tr>
 									<th scope="row"><?php _e('SMTP SSL label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather_config['o_smtp_ssl'] == '1') {
+										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather->forum_settings['o_smtp_ssl'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather_config['o_smtp_ssl'] == '0') {
+										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather->forum_settings['o_smtp_ssl'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('SMTP SSL help') ?></span>
@@ -714,10 +714,10 @@
 								<tr>
 									<th scope="row"><?php _e('Allow new label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather_config['o_regs_allow'] == '1') {
+										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather->forum_settings['o_regs_allow'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather_config['o_regs_allow'] == '0') {
+										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather->forum_settings['o_regs_allow'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Allow new help') ?></span>
@@ -726,10 +726,10 @@
 								<tr>
 									<th scope="row"><?php _e('Verify label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather_config['o_regs_verify'] == '1') {
+										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather->forum_settings['o_regs_verify'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather_config['o_regs_verify'] == '0') {
+										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather->forum_settings['o_regs_verify'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Verify help') ?></span>
@@ -738,10 +738,10 @@
 								<tr>
 									<th scope="row"><?php _e('Report new label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather_config['o_regs_report'] == '1') {
+										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather->forum_settings['o_regs_report'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather_config['o_regs_report'] == '0') {
+										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather->forum_settings['o_regs_report'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Report new help') ?></span>
@@ -750,10 +750,10 @@
 								<tr>
 									<th scope="row"><?php _e('Use rules label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather_config['o_rules'] == '1') {
+										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather->forum_settings['o_rules'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather_config['o_rules'] == '0') {
+										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather->forum_settings['o_rules'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Use rules help') ?></span>
@@ -762,7 +762,7 @@
 								<tr>
 									<th scope="row"><?php _e('Rules label') ?></th>
 									<td>
-										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather_config['o_rules_message']) ?></textarea>
+										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather->forum_settings['o_rules_message']) ?></textarea>
 										<span><?php _e('Rules help') ?></span>
 									</td>
 								</tr>
@@ -770,13 +770,13 @@
 									<th scope="row"><?php _e('E-mail default label') ?></th>
 									<td>
 										<span><?php _e('E-mail default help') ?></span>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather_config['o_default_email_setting'] == '0') {
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather->forum_settings['o_default_email_setting'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<?php _e('Display e-mail label') ?></label>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather_config['o_default_email_setting'] == '1') {
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather->forum_settings['o_default_email_setting'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<?php _e('Hide allow form label') ?></label>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather_config['o_default_email_setting'] == '2') {
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather->forum_settings['o_default_email_setting'] == '2') {
     echo ' checked="checked"';
 } ?> />&#160;<?php _e('Hide both label') ?></label>
 									</td>
@@ -793,10 +793,10 @@
 								<tr>
 									<th scope="row"><?php _e('Display announcement label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather_config['o_announcement'] == '1') {
+										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather->forum_settings['o_announcement'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather_config['o_announcement'] == '0') {
+										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather->forum_settings['o_announcement'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Display announcement help') ?></span>
@@ -805,7 +805,7 @@
 								<tr>
 									<th scope="row"><?php _e('Announcement message label') ?></th>
 									<td>
-										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_announcement_message']) ?></textarea>
+										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_announcement_message']) ?></textarea>
 										<span><?php _e('Announcement message help') ?></span>
 									</td>
 								</tr>
@@ -821,10 +821,10 @@
 								<tr>
 									<th scope="row"><a name="maintenance"></a><?php _e('Maintenance mode label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather_config['o_maintenance'] == '1') {
+										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather->forum_settings['o_maintenance'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather_config['o_maintenance'] == '0') {
+										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather->forum_settings['o_maintenance'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Maintenance mode help') ?></span>
@@ -833,7 +833,7 @@
 								<tr>
 									<th scope="row"><?php _e('Maintenance message label') ?></th>
 									<td>
-										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_maintenance_message']) ?></textarea>
+										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
 										<span><?php _e('Maintenance message help') ?></span>
 									</td>
 								</tr>
diff --git a/view/admin/parser.php b/view/admin/parser.php
index aec1f767..e32369b6 100644
--- a/view/admin/parser.php
+++ b/view/admin/parser.php
@@ -208,7 +208,7 @@
 									<th scope="row"><?php echo($lang_admin_parser['smiley_upload']); ?></th>
  <?php if (ini_get('file_uploads')) {
     ?>
-									<td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
+									<td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 										<input type="file" name="new_smiley" id="upload_smiley" /></td>
 									<td><input type="submit" name="upload" value="<?php echo($lang_admin_parser['upload_button']);
     ?>" /></td>
diff --git a/view/admin/permissions.php b/view/admin/permissions.php
index a70328ae..2b1bf413 100644
--- a/view/admin/permissions.php
+++ b/view/admin/permissions.php
@@ -28,10 +28,10 @@
 								<tr>
 									<th scope="row"><?php _e('BBCode label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather_config['p_message_bbcode'] == '1') {
+										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather->forum_settings['p_message_bbcode'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather_config['p_message_bbcode'] == '0') {
+										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather->forum_settings['p_message_bbcode'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('BBCode help') ?></span>
@@ -40,10 +40,10 @@
 								<tr>
 									<th scope="row"><?php _e('Image tag label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather_config['p_message_img_tag'] == '1') {
+										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather->forum_settings['p_message_img_tag'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather_config['p_message_img_tag'] == '0') {
+										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather->forum_settings['p_message_img_tag'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Image tag help') ?></span>
@@ -52,10 +52,10 @@
 								<tr>
 									<th scope="row"><?php _e('All caps message label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather_config['p_message_all_caps'] == '1') {
+										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather->forum_settings['p_message_all_caps'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather_config['p_message_all_caps'] == '0') {
+										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather->forum_settings['p_message_all_caps'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('All caps message help') ?></span>
@@ -64,10 +64,10 @@
 								<tr>
 									<th scope="row"><?php _e('All caps subject label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather_config['p_subject_all_caps'] == '1') {
+										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather->forum_settings['p_subject_all_caps'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather_config['p_subject_all_caps'] == '0') {
+										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather->forum_settings['p_subject_all_caps'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('All caps subject help') ?></span>
@@ -76,10 +76,10 @@
 								<tr>
 									<th scope="row"><?php _e('Require e-mail label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather_config['p_force_guest_email'] == '1') {
+										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather->forum_settings['p_force_guest_email'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather_config['p_force_guest_email'] == '0') {
+										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather->forum_settings['p_force_guest_email'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Require e-mail help') ?></span>
@@ -97,10 +97,10 @@
 								<tr>
 									<th scope="row"><?php _e('BBCode sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather_config['p_sig_bbcode'] == '1') {
+										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather->forum_settings['p_sig_bbcode'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather_config['p_sig_bbcode'] == '0') {
+										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather->forum_settings['p_sig_bbcode'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('BBCode sigs help') ?></span>
@@ -109,10 +109,10 @@
 								<tr>
 									<th scope="row"><?php _e('Image tag sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather_config['p_sig_img_tag'] == '1') {
+										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather->forum_settings['p_sig_img_tag'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather_config['p_sig_img_tag'] == '0') {
+										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather->forum_settings['p_sig_img_tag'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Image tag sigs help') ?></span>
@@ -121,10 +121,10 @@
 								<tr>
 									<th scope="row"><?php _e('All caps sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather_config['p_sig_all_caps'] == '1') {
+										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather->forum_settings['p_sig_all_caps'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather_config['p_sig_all_caps'] == '0') {
+										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather->forum_settings['p_sig_all_caps'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('All caps sigs help') ?></span>
@@ -133,14 +133,14 @@
 								<tr>
 									<th scope="row"><?php _e('Max sig length label') ?></th>
 									<td>
-										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather_config['p_sig_length'] ?>" />
+										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather->forum_settings['p_sig_length'] ?>" />
 										<span class="clearb"><?php _e('Max sig length help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max sig lines label') ?></th>
 									<td>
-										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather_config['p_sig_lines'] ?>" />
+										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather->forum_settings['p_sig_lines'] ?>" />
 										<span class="clearb"><?php _e('Max sig lines help') ?></span>
 									</td>
 								</tr>
@@ -156,10 +156,10 @@
 								<tr>
 									<th scope="row"><?php _e('Banned e-mail label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather_config['p_allow_banned_email'] == '1') {
+										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather->forum_settings['p_allow_banned_email'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather_config['p_allow_banned_email'] == '0') {
+										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather->forum_settings['p_allow_banned_email'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Banned e-mail help') ?></span>
@@ -168,10 +168,10 @@
 								<tr>
 									<th scope="row"><?php _e('Duplicate e-mail label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather_config['p_allow_dupe_email'] == '1') {
+										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather_config['p_allow_dupe_email'] == '0') {
+										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Duplicate e-mail help') ?></span>
diff --git a/view/edit.php b/view/edit.php
index 48a692e8..829d0c17 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -89,10 +89,10 @@
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/view/help.php b/view/help.php
index 2ecf9e36..d171ddab 100644
--- a/view/help.php
+++ b/view/help.php
@@ -41,7 +41,7 @@
 <div class="box">
 	<div class="inbox">
 		<p><?php _e('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
+		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
 		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
 		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
diff --git a/view/index.php b/view/index.php
index 3142e1bd..cc51e8b5 100644
--- a/view/index.php
+++ b/view/index.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -92,13 +92,13 @@
 			<dl class="conl">
 				<dt><strong><?php _e('User info') ?></strong></dt>
 				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
-				<?php if ($feather_config['o_users_online'] == 1) : ?>
+				<?php if ($feather->forum_settings['o_users_online'] == 1) : ?>
 				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
 				<dd><span><?php printf(__('Guests online'), '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
 				<?php endif; ?>
 			</dl>
 			<?php
-            if ($feather_config['o_users_online'] == 1) :
+            if ($feather->forum_settings['o_users_online'] == 1) :
                 if ($online['num_users'] > 0) {
                     echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
                 } else {
@@ -108,4 +108,4 @@
             ?>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/misc/email.php b/view/misc/email.php
index eb44dafb..06f96f55 100644
--- a/view/misc/email.php
+++ b/view/misc/email.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -34,4 +34,4 @@
 			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/misc/rules.php b/view/misc/rules.php
index 366880ee..feb662ad 100644
--- a/view/misc/rules.php
+++ b/view/misc/rules.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -17,7 +17,7 @@
 	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<div id="rules-block" class="inbox">
-			<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
+			<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
index 35b67b41..8b636222 100644
--- a/view/moderate/moderator_forum.php
+++ b/view/moderate/moderator_forum.php
@@ -40,7 +40,7 @@
 				<tr>
 					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
 					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
 <?php endif; ?>					<th class="tcr"><?php _e('Last post') ?></th>
 					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
 				</tr>
@@ -63,7 +63,7 @@
 						</div>
 					</td>
 					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_replies']) : '-' ?></td>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_views']) : '-' ?></td>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_views']) : '-' ?></td>
 <?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_disp'] ?></td>
 					<td class="tcmod"><input type="checkbox" name="topics[<?php echo $topic['id'] ?>]" value="1" /></td>
@@ -72,7 +72,7 @@
 
             }
             if (empty($topic_data)):
-                $colspan = ($feather_config['o_topic_views'] == '1') ? 5 : 4;
+                $colspan = ($feather->forum_settings['o_topic_views'] == '1') ? 5 : 4;
                 $button_status = ' disabled="disabled"';
                 echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
             endif;
diff --git a/view/post.php b/view/post.php
index f1d22d07..ee2531da 100644
--- a/view/post.php
+++ b/view/post.php
@@ -98,14 +98,14 @@
                                                 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if ($feather->user->is_guest) {
-    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-    $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
+    $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+    $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
 						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
     echo feather_escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
+						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
     echo feather_escape($post['email']);
 }
     ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
@@ -121,10 +121,10 @@
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -172,7 +172,7 @@
 
 
 <?php
-if ($tid && $feather_config['o_topic_review'] != '0') :
+if ($tid && $feather->forum_settings['o_topic_review'] != '0') :
 ?>
 <div id="postreview">
 	<h2><span><?php _e('Topic review') ?></span></h2>
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
index 5da0f4b4..ced4459f 100644
--- a/view/profile/section_display.php
+++ b/view/profile/section_display.php
@@ -55,26 +55,26 @@
     }
 
 ?>
-<?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1' || $feather_config['o_signatures'] == '1' || $feather_config['o_avatars'] == '1' || ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1')): ?>
+<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1' || $feather->forum_settings['o_signatures'] == '1' || $feather->forum_settings['o_avatars'] == '1' || ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1')): ?>
 			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Post display legend') ?></legend>
 					<div class="infldset">
 						<p><?php _e('Post display info') ?></p>
 						<div class="rbox">
-<?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
+<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show smilies') ?><br /></label>
-<?php endif; if ($feather_config['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show sigs') ?><br /></label>
-<?php endif; if ($feather_config['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
+<?php endif; if ($feather->forum_settings['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show avatars') ?><br /></label>
-<?php endif; if ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
+<?php endif; if ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show images') ?><br /></label>
-<?php endif; if ($feather_config['o_signatures'] == '1' && $feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1' && $feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show images sigs') ?><br /></label>
 <?php endif; ?>
diff --git a/view/profile/section_personality.php b/view/profile/section_personality.php
index 3624e5e6..2b8f9c82 100644
--- a/view/profile/section_personality.php
+++ b/view/profile/section_personality.php
@@ -19,7 +19,7 @@
 		<form id="profile4" method="post" action="<?php echo get_link('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
-<?php if ($feather_config['o_avatars'] == '1'): ?>				<div class="inform">
+<?php if ($feather->forum_settings['o_avatars'] == '1'): ?>				<div class="inform">
 				<fieldset id="profileavatar">
 					<legend><?php _e('Avatar legend') ?></legend>
 					<div class="infldset">
@@ -29,20 +29,20 @@
 					</div>
 				</fieldset>
 			</div>
-<?php endif; if ($feather_config['o_signatures'] == '1'): ?>				<div class="inform">
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>				<div class="inform">
 				<fieldset>
 					<legend><?php _e('Signature legend') ?></legend>
 					<div class="infldset">
 						<p><?php _e('Signature info') ?></p>
 						<div class="txtarea">
-							<label><?php printf(__('Sig max size'), forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
+							<label><?php printf(__('Sig max size'), forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
diff --git a/view/profile/section_privacy.php b/view/profile/section_privacy.php
index 36930415..1d972113 100644
--- a/view/profile/section_privacy.php
+++ b/view/profile/section_privacy.php
@@ -38,7 +38,7 @@
 					</div>
 				</fieldset>
 			</div>
-<?php if ($feather_config['o_forum_subscriptions'] == '1' || $feather_config['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
+<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1' || $feather->forum_settings['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
 				<fieldset>
 					<legend><?php _e('Subscription legend') ?></legend>
 					<div class="infldset">
@@ -46,7 +46,7 @@
 							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Notify full') ?><br /></label>
-<?php if ($feather_config['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
+<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Auto notify full') ?><br /></label>
 <?php endif; ?>
diff --git a/view/register/form.php b/view/register/form.php
index f1a360ef..bdff9a2b 100644
--- a/view/register/form.php
+++ b/view/register/form.php
@@ -59,7 +59,7 @@
 					</div>
 				</fieldset>
 			</div>
-<?php if ($feather_config['o_regs_verify'] == '0'): ?>			<div class="inform">
+<?php if ($feather->forum_settings['o_regs_verify'] == '0'): ?>			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Pass legend') ?></legend>
 					<div class="infldset">
@@ -75,14 +75,14 @@
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
+					<legend><?php echo($feather->forum_settings['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
+<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
 <?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
     echo feather_escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
+<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
     echo feather_escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
@@ -102,7 +102,7 @@
 <?php
 
             foreach ($languages as $temp) {
-                if ($feather_config['o_default_lang'] == $temp) {
+                if ($feather->forum_settings['o_default_lang'] == $temp) {
                     echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
                 } else {
                     echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
diff --git a/view/register/rules.php b/view/register/rules.php
index cef62405..7f986063 100644
--- a/view/register/rules.php
+++ b/view/register/rules.php
@@ -22,7 +22,7 @@
 				<fieldset>
 					<legend><?php _e('Rules legend') ?></legend>
 					<div class="infldset">
-						<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
+						<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/search/form.php b/view/search/form.php
index 4731b068..16cd788a 100644
--- a/view/search/form.php
+++ b/view/search/form.php
@@ -41,7 +41,7 @@
 						</select>
 						<br /></label>
 						<p class="clearl"><?php _e('Search in info') ?></p>
-<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
+<?php echo($feather->forum_settings['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/viewforum.php b/view/viewforum.php
index a35faf22..a9673fa0 100644
--- a/view/viewforum.php
+++ b/view/viewforum.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -36,7 +36,7 @@
 				<tr>
 					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
 					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
 <?php endif; ?>					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
 				</tr>
 			</thead>
@@ -56,7 +56,7 @@
 							</div>
 						</td>
 						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_replies']) : '-' ?></td>
-	<?php if ($feather_config['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_views']) : '-' ?></td>
+	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_views']) : '-' ?></td>
 	<?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_formatted'] ?></td>
 					</tr>
@@ -66,7 +66,7 @@
             if (empty($forum_data)):
             ?>
 					<tr class="rowodd inone">
-						<td class="tcl" colspan="<?php echo($feather_config['o_topic_views'] == 1) ? 4 : 3 ?>">
+						<td class="tcl" colspan="<?php echo($feather->forum_settings['o_topic_views'] == 1) ? 4 : 3 ?>">
 							<div class="icon inone"><div class="nosize"><!-- --></div></div>
 							<div class="tclcon">
 								<div>
@@ -97,4 +97,4 @@
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
 		<div class="clearer"></div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/viewtopic.php b/view/viewtopic.php
index e2681757..e982045b 100644
--- a/view/viewtopic.php
+++ b/view/viewtopic.php
@@ -134,16 +134,16 @@
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
-						<input type="hidden" name="page" value="<?php echo feather_escape($p) ?>" />
-<?php if ($feather_config['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
+						<input type="hidden" name="page" value="<?php echo feather_escape($page_number) ?>" />
+<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
 <?php endif;
 
     if ($feather->user->is_guest) {
-        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-        $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
+        $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+        $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
         ?>
 						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
 <?php
 
@@ -163,13 +163,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>

From 3f64d51d0ed7a6d73affed7baa287bac0e7c7748 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 27 Aug 2015 21:41:21 +0200
Subject: [PATCH 221/353] Add the first hook

---
 include/classes/core.class.php | 3 +++
 include/routes.php             | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index 9da291be..b36bb627 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -205,6 +205,9 @@ public function call()
             return new \FeatherBB\Email();
         });
 
+        // This is the very first hook fired
+        $this->app->hooks->fire('core.start');
+
         if (!is_file($this->forum_env['FORUM_CONFIG_FILE'])) {
             $installer = new \controller\install;
             $installer->run();
diff --git a/include/routes.php b/include/routes.php
index 499af8df..4d6e1e96 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -163,4 +163,4 @@
 // 404 not found
 $feather->notFound(function () {
     message(__('Bad request'), '404');
-});
+});
\ No newline at end of file

From e3aafee77a98d7dc74e55eeead7a3867555c9835 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 27 Aug 2015 21:47:29 +0200
Subject: [PATCH 222/353] Get rid of some $feather_config

---
 extern.php            | 71 ++++++++++++++++++-------------------------
 include/functions.php |  4 +--
 2 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/extern.php b/extern.php
index cd24d1a6..656aa1ea 100644
--- a/extern.php
+++ b/extern.php
@@ -57,26 +57,23 @@
 
 define('FEATHER_QUIET_VISIT', 1);
 
-if (!defined('FEATHER_ROOT')) {
-    define('FEATHER_ROOT', dirname(__FILE__).'/');
-}
-
 // Load Slim Framework
 require 'Slim/Slim.php';
 \Slim\Slim::registerAutoloader();
 
-// Instantiate Slim
-$feather = new \Slim\Slim();
+// Load FeatherBB
+require 'include/classes/autoload.class.php';
+\FeatherBB\Loader::registerAutoloader();
 
-// Load the config
-require 'include/config.php';
-
-// Load middlewares
-$feather->add(new \Slim\Extras\Middleware\CsrfGuard('featherbb_csrf')); // CSRF
-$feather->add(new \Slim\Extras\Middleware\FeatherBB($feather_user_settings)); // FeatherBB
+// Instantiate Slim and add CSRF
+$feather = new \Slim\Slim();
+$feather->add(new \FeatherBB\Csrf());
 
-$feather->config('cookies.encrypt', true);
-$feather->config('debug', true); // As long as we're developing FeatherBB
+$feather_settings = array('config_file' => 'include/config.php',
+    'cache_dir' => 'cache/',
+    'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
+$feather->add(new \FeatherBB\Auth());
+$feather->add(new \FeatherBB\Core($feather_settings));
 
 load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/common.mo');
 load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/index.mo');
@@ -139,8 +136,6 @@ function get_current_url($max_length = 0)
 //
 function set_default_user()
 {
-    global $feather_config;
-
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
 
@@ -188,12 +183,12 @@ function set_default_user()
             ->update_many('logged', time());
     }
 
-    $feather->user->disp_topics = $feather_config['o_disp_topics_default'];
-    $feather->user->disp_posts = $feather_config['o_disp_posts_default'];
-    $feather->user->timezone = $feather_config['o_default_timezone'];
-    $feather->user->dst = $feather_config['o_default_dst'];
-    $feather->user->language = $feather_config['o_default_lang'];
-    $feather->user->style = $feather_config['o_default_style'];
+    $feather->user->disp_topics = $feather->forum_settings['o_disp_topics_default'];
+    $feather->user->disp_posts = $feather->forum_settings['o_disp_posts_default'];
+    $feather->user->timezone = $feather->forum_settings['o_default_timezone'];
+    $feather->user->dst = $feather->forum_settings['o_default_dst'];
+    $feather->user->language = $feather->forum_settings['o_default_lang'];
+    $feather->user->style = $feather->forum_settings['o_default_style'];
     $feather->user->is_guest = true;
     $feather->user->is_admmod = false;
 }
@@ -266,13 +261,13 @@ function authenticate_user($user, $password, $password_is_hash = false)
 //
 function http_authenticate_user()
 {
-    global $feather_config, $feather;
+    global $feather;
 
     if (!$feather->user->is_guest) {
         return;
     }
 
-    header('WWW-Authenticate: Basic realm="'.$feather_config['o_board_title'].' External Syndication"');
+    header('WWW-Authenticate: Basic realm="'.$feather->forum_settings['o_board_title'].' External Syndication"');
     header('HTTP/1.0 401 Unauthorized');
 }
 
@@ -282,8 +277,6 @@ function http_authenticate_user()
 //
 function output_rss($feed)
 {
-    global $feather_config;
-
     // Send XML/no cache headers
     header('Content-Type: application/xml; charset=utf-8');
     header('Expires: '.gmdate('D, d M Y H:i:s').' GMT');
@@ -299,8 +292,8 @@ function output_rss($feed)
     echo "\t\t".'<description><![CDATA['.escape_cdata($feed['description']).']]></description>'."\n";
     echo "\t\t".'<lastBuildDate>'.gmdate('r', count($feed['items']) ? $feed['items'][0]['pubdate'] : time()).'</lastBuildDate>'."\n";
 
-    if ($feather_config['o_show_version'] == '1') {
-        echo "\t\t".'<generator>FeatherBB '.$feather_config['o_cur_version'].'</generator>'."\n";
+    if ($feather->forum_settings['o_show_version'] == '1') {
+        echo "\t\t".'<generator>FeatherBB '.$feather->forum_settings['o_cur_version'].'</generator>'."\n";
     } else {
         echo "\t\t".'<generator>FeatherBB</generator>'."\n";
     }
@@ -327,8 +320,6 @@ function output_rss($feed)
 //
 function output_atom($feed)
 {
-    global $feather_config;
-
     // Send XML/no cache headers
     header('Content-Type: application/atom+xml; charset=utf-8');
     header('Expires: '.gmdate('D, d M Y H:i:s').' GMT');
@@ -343,8 +334,8 @@ function output_atom($feed)
     echo "\t".'<link href="'.feather_escape($feed['link']).'"/>'."\n";
     echo "\t".'<updated>'.gmdate('Y-m-d\TH:i:s\Z', count($feed['items']) ? $feed['items'][0]['pubdate'] : time()).'</updated>'."\n";
 
-    if ($feather_config['o_show_version'] == '1') {
-        echo "\t".'<generator version="'.$feather_config['o_cur_version'].'">FluxBB</generator>'."\n";
+    if ($feather->forum_settings['o_show_version'] == '1') {
+        echo "\t".'<generator version="'.$feather->forum_settings['o_cur_version'].'">FluxBB</generator>'."\n";
     } else {
         echo "\t".'<generator>FluxBB</generator>'."\n";
     }
@@ -385,8 +376,6 @@ function output_atom($feed)
 //
 function output_xml($feed)
 {
-    global $feather_config;
-
     // Send XML/no cache headers
     header('Content-Type: application/xml; charset=utf-8');
     header('Expires: '.gmdate('D, d M Y H:i:s').' GMT');
@@ -488,13 +477,13 @@ function output_html($feed)
             exit(__('Bad request'));
         }
 
-        if ($feather_config['o_censoring'] == '1') {
+        if ($feather->forum_settings['o_censoring'] == '1') {
             $cur_topic['subject'] = censor_words($cur_topic['subject']);
         }
 
         // Setup the feed
         $feed = array(
-            'title'        =>    $feather_config['o_board_title'].__('Title separator').$cur_topic['subject'],
+            'title'        =>    $feather->forum_settings['o_board_title'].__('Title separator').$cur_topic['subject'],
             'link'            =>    get_link('topic/'.$tid.'/'.url_friendly($cur_topic['subject']).'/'),
             'description'        =>    sprintf(__('RSS description topic'), $cur_topic['subject']),
             'items'            =>    array(),
@@ -589,7 +578,7 @@ function output_html($feed)
         }
 
         // Only attempt to cache if caching is enabled and we have all or a single forum
-        if ($feather_config['o_feed_ttl'] > 0 && ($forum_sql == '' || ($forum_name != '' && !isset($_GET['nfid'])))) {
+        if ($feather->forum_settings['o_feed_ttl'] > 0 && ($forum_sql == '' || ($forum_name != '' && !isset($_GET['nfid'])))) {
             $cache_id = 'feed'.sha1($feather->user->g_id.'|'.__('lang_identifier').'|'.($order_posted ? '1' : '0').($forum_name == '' ? '' : '|'.$fids[0]));
         }
 
@@ -602,9 +591,9 @@ function output_html($feed)
         if (!isset($feed) || $cache_expire < $now) {
             // Setup the feed
             $feed = array(
-                'title'        =>    $feather_config['o_board_title'].$forum_name,
+                'title'        =>    $feather->forum_settings['o_board_title'].$forum_name,
                 'link'            =>    '/index.php',
-                'description'    =>    sprintf(__('RSS description'), $feather_config['o_board_title']),
+                'description'    =>    sprintf(__('RSS description'), $feather->forum_settings['o_board_title']),
                 'items'            =>    array(),
                 'type'            =>    'topics'
             );
@@ -628,7 +617,7 @@ function output_html($feed)
                         ->find_array();
 
             foreach ($result as $cur_topic) {
-                if ($feather_config['o_censoring'] == '1') {
+                if ($feather->forum_settings['o_censoring'] == '1') {
                     $cur_topic['subject'] = censor_words($cur_topic['subject']);
                 }
 
@@ -664,7 +653,7 @@ function output_html($feed)
                     require FEATHER_ROOT.'include/cache.php';
                 }
 
-                $content = '<?php'."\n\n".'$feed = '.var_export($feed, true).';'."\n\n".'$cache_expire = '.($now + ($feather_config['o_feed_ttl'] * 60)).';'."\n\n".'?>';
+                $content = '<?php'."\n\n".'$feed = '.var_export($feed, true).';'."\n\n".'$cache_expire = '.($now + ($feather->forum_settings['o_feed_ttl'] * 60)).';'."\n\n".'?>';
                 featherbb_write_cache_file('cache_'.$cache_id.'.php', $content);
             }
         }
diff --git a/include/functions.php b/include/functions.php
index c9c4087d..2189bb05 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -89,7 +89,7 @@ function get_admin_ids()
 //
 function check_username($username, $errors, $exclude_id = null)
 {
-    global $feather, $feather_config, $errors, $feather_bans;
+    global $feather, $errors, $feather_bans;
 
     // Include UTF-8 function
     require_once FEATHER_ROOT.'include/utf8/strcasecmp.php';
@@ -116,7 +116,7 @@ function check_username($username, $errors, $exclude_id = null)
     }
 
     // Check username for any censored words
-    if ($feather_config['o_censoring'] == '1' && censor_words($username) != $username) {
+    if ($feather->forum_settings['o_censoring'] == '1' && censor_words($username) != $username) {
         $errors[] = __('Username censor');
     }
 

From 9a9fa3f727e5362dac721597af40c33320f8ce4b Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Fri, 28 Aug 2015 02:35:57 +0200
Subject: [PATCH 223/353] Begin plugins management

---
 .gitignore                             |   2 +
 composer.json                          |  19 +++
 controller/admin/plugins.php           |  62 ++++++-
 include/classes/core.class.php         |   5 +-
 include/classes/plugin.class.php       | 213 +++++++++++++++++++++++++
 include/routes.php                     |   6 +-
 index.php                              |   7 +-
 plugins/Test.plugin.php                |  48 ++++++
 plugins/Test2.plugin.php               |  48 ++++++
 plugins/test/plugintest.php            |   2 +-
 style/FeatherBB.css                    |  63 ++++++++
 style/FeatherBB/view/admin/menu.php    |  73 +++------
 style/FeatherBB/view/admin/plugins.php |  54 +++++++
 view/admin/menu.php                    |   4 +-
 14 files changed, 544 insertions(+), 62 deletions(-)
 create mode 100644 composer.json
 create mode 100644 include/classes/plugin.class.php
 create mode 100644 plugins/Test.plugin.php
 create mode 100644 plugins/Test2.plugin.php
 create mode 100644 style/FeatherBB/view/admin/plugins.php

diff --git a/.gitignore b/.gitignore
index b1fc652e..be477e41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ include/config.php
 nbproject/
 lang/French
 .htaccess
+vendor
+composer.lock
diff --git a/composer.json b/composer.json
new file mode 100644
index 00000000..5e356d38
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "featherbb/featherbb",
+    "type": "project",
+    "license": "GNU General Public Licence",
+    "description": "A multi-framework Composer library installer",
+    "keywords": ["forum", "lightweight", "featherbb"],
+    "homepage": "http://featherbb.github.com/installers/",
+    "authors": [
+        {"name": "adaur"},
+        {"name": "capkokoon"},
+        {"name": "beaver"}
+    ],
+    "autoload": {
+        "classmap": ["plugins", "include/classes"]
+    },
+    "require-dev": {
+        "phpunit/phpunit": "4.1.*"
+    }
+}
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index 61f72ac7..83e1f480 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -20,7 +20,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->header = new \controller\header();
         $this->footer = new \controller\footer();
-        $this->model = new \model\admin\plugins();
+        // $this->model = new \model\admin\plugins();
         require FEATHER_ROOT . 'include/common_admin.php';
     }
 
@@ -29,6 +29,66 @@ public function __autoload($class_name)
         require FEATHER_ROOT . $class_name . '.php';
     }
 
+    public function index()
+    {
+        if (!$this->user->is_admmod) {
+            message(__('No permission'), '403');
+        }
+
+        // Update permissions
+        // if ($this->feather->request->isPost()) {
+        //     $this->model->update_permissions();
+        // }
+
+        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Permissions'));
+
+        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
+
+        generate_admin_menu('plugins');
+
+        $pluginsList = \FeatherBB\Plugin::getPluginsList();
+
+        $this->feather->render('admin/plugins.php', array(
+                'pluginsList'    =>    $pluginsList
+            )
+        );
+
+        $this->footer->display();
+    }
+
+    public function activate()
+    {
+        if (!$this->user->is_admmod) {
+            message(__('No permission'), '403');
+        }
+
+        // Update permissions
+        // if ($this->feather->request->isPost()) {
+        //     $this->model->update_permissions();
+        // }
+
+        // The plugin to load should be supplied via GET
+        $plugin = $this->request->get('plugin') ? $this->request->get('plugin') : null;
+        if (!$plugin) {
+            message(__('Bad request'), '404');
+        }
+
+        // Require all valide filenames...
+        \FeatherBB\Plugin::getPluginsList();
+        // And make sure the plugin actually extends base Plugin class
+        if (!property_exists('\plugin\\'.$plugin, 'isFeatherPlugin')) {
+            message(sprintf(__('No plugin message'), $plugin));
+        }
+
+        try {
+            \FeatherBB\Plugin::activate($plugin);
+            redirect(get_link('admin/plugins/'), "Plugin $plugin activated");
+        } catch (\Exception $e) {
+            redirect(get_link('admin/plugins/'), $e->getMessage());
+        }
+
+    }
+
     public function display()
     {
         if (!$this->user->is_admmod) {
diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index 7053b0ab..bcba7571 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -46,7 +46,7 @@ public function __construct(array $data)
         require $this->forum_env['FEATHER_ROOT'].'include/classes/pomo/MO.php';
         require $this->forum_env['FEATHER_ROOT'].'include/l10n.php';
         require $this->forum_env['FEATHER_ROOT'].'include/classes/database.class.php';
-        require $this->forum_env['FEATHER_ROOT'].'plugins/test/plugintest.php';
+        // require $this->forum_env['FEATHER_ROOT'].'plugins/test/plugintest.php';
 
         // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
         setlocale(LC_CTYPE, 'C');
@@ -244,7 +244,8 @@ public function call()
         $this->app->config = $this->forum_settings; // Legacy
         extract($this->forum_settings); // Legacy
 
-        new \plugin\plugintest();
+        // new \plugin\plugintest();
+        \FeatherBB\Plugin::runActivePlugins();
 
         // Define time formats
         $forum_time_formats = array($this->forum_settings['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
diff --git a/include/classes/plugin.class.php b/include/classes/plugin.class.php
new file mode 100644
index 00000000..24d72ea5
--- /dev/null
+++ b/include/classes/plugin.class.php
@@ -0,0 +1,213 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher.
+ */
+
+namespace FeatherBB;
+
+use DB;
+
+class Plugin
+{
+
+    /**
+     * @var object
+     */
+    protected $feather;
+
+    /**
+     * @var object
+     */
+    protected $hooks;
+
+    /**
+     * Ensure daughter plugin classes (users ones) are extending
+     * this default class
+     *
+     * @var boolval
+     */
+    protected $isFeatherPlugin;
+
+    /**
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * @var string
+     */
+    protected $version;
+
+    /**
+     * @var string
+     */
+    protected $author;
+
+    /**
+     * @var string
+     */
+    protected $description;
+
+    /**
+     * @var string
+     */
+    protected $updateUrl;
+
+    /**
+     * Structure of database table to create.
+     *
+     * @var array
+     */
+    protected $databaseScheme = array();
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        $this->feather = \Slim\Slim::getInstance();
+        $this->user = $this->feather->user;
+        $this->hook = $this->feather->hooks;
+    }
+
+    /**
+     * Get a list of all available plugins.
+     */
+    public static function getPluginsList()
+    {
+        $plugins = array();
+
+        // Get all files declaring a new plugin
+        $directory = new \RecursiveDirectoryIterator('plugins');
+        $iterator = new \RecursiveIteratorIterator($directory);
+        $pluginClasses = new \RegexIterator($iterator, '/^.+\/(\\w+)\.plugin\.php$/i', \RecursiveRegexIterator::GET_MATCH);
+
+        // Require these files to access their properties and display them in view
+        foreach ($pluginClasses as $pluginClass) {
+            require $pluginClass[0];
+            $className = "\plugin\\".$pluginClass[1];
+            $plugins[$pluginClass[1]] = new $className();
+        }
+
+        return $plugins;
+    }
+
+    /**
+     * Execute hooks of activated plugins
+     */
+    public static function runActivePlugins()
+    {
+        // Get all files declaring a new plugin
+        $directory = new \RecursiveDirectoryIterator('plugins');
+        $iterator = new \RecursiveIteratorIterator($directory);
+        $pluginClasses = new \RegexIterator($iterator, '/^.+\/(\\w+)\.plugin\.php$/i', \RecursiveRegexIterator::GET_MATCH);
+
+        $feather = \Slim\Slim::getInstance();
+        $activePlugins = $feather->cache->retrieve('active_plugins') ? $feather->cache->retrieve('active_plugins') : array();
+
+        // Require these files to access their properties and display them in view
+        foreach ($pluginClasses as $pluginClass) {
+            require $pluginClass[0];
+            $className = "\plugin\\".$pluginClass[1];
+            $plugin = new $className();
+            $plugin->runHooks();
+        }
+
+        return true;
+    }
+
+    /**
+     * Activate a plugin based on class name
+     */
+    public static function activate($pluginName)
+    {
+        // Instantiate the plugin
+        $className = "\plugin\\".$pluginName;
+        $plugin = new $className;
+
+        // TODO: Allow creation of new tables in database
+        // \FeatherBB\Core::init_db($data);;
+        // $feather = \Slim\Slim::getInstance();
+        // // Handle db prefix
+        // $db_prefix = $feather->forum_settings['db_prefix']
+        // // Create tables
+        // foreach ($this->getDatabaseScheme() as $table => $sql) {
+        //     if (!$this->createTable($db_prefix.$table, $sql)) {
+        //         // Error handling
+        //         $this->errors[] = 'A problem was encountered while creating table '.$table;
+        //     }
+        // }
+        // // Populate tables with default values
+        // foreach ($this->loadMockData() as $group_name => $group_data) {
+        //     $this->model->addData('groups', $group_data);
+        // }
+
+        $feather = \Slim\Slim::getInstance();
+        $activePlugins = $feather->cache->isCached('active_plugins') ? $feather->cache->retrieve('active_plugins') : array();
+
+        // $feather->cache->delete('active_plugins');
+        // Check if plugin isn't already activated
+        if (!array_key_exists($pluginName, $activePlugins)) {
+            $activePlugins[$pluginName] = true;
+            $feather->cache->store('active_plugins', $activePlugins);
+            return true;
+        }
+        throw new \Exception("Plugin $pluginName already activated", 1);
+    }
+
+    protected function runHooks()
+    {
+        // Daughter classes may configure hooks in this function
+    }
+
+    /**
+     * Getters
+     */
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function getVersion()
+    {
+        return $this->version;
+    }
+
+    public function getAuthor()
+    {
+        return $this->author;
+    }
+
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    protected function getDatabaseScheme()
+    {
+        return $this->databaseScheme;
+    }
+
+
+    protected function createTable($table_name, $sql)
+    {
+        $db = DB::get_db();
+        $req = preg_replace('/%t%/', '`'.$table_name.'`', $sql);
+        return $db->exec($req);
+    }
+
+    // protected function addData($table_name, array $data)
+    // {
+    //     return (bool) DB::for_table($table_name)
+    //                     ->create()
+    //                     ->set($data)
+    //                     ->save();
+    // }
+
+
+}
diff --git a/include/routes.php b/include/routes.php
index 499af8df..0e58f819 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -143,7 +143,11 @@
     });
 
     // Admin plugins
-    $feather->map('/loader(/)', '\controller\admin\plugins:display')->via('GET', 'POST');
+    $feather->group('/plugins', function() use ($feather) {
+        $feather->map('/(/)', '\controller\admin\plugins:index')->via('GET', 'POST');
+        $feather->map('/activate(/)', '\controller\admin\plugins:activate')->via('GET');
+        // $feather->map('/loader(/)', '\controller\admin\plugins:display')->via('GET', 'POST');
+    });
 
     // Admin maintenance
     $feather->map('/maintenance(/)', '\controller\admin\maintenance:display')->via('GET', 'POST');
diff --git a/index.php b/index.php
index 277c67d2..630afa88 100644
--- a/index.php
+++ b/index.php
@@ -17,9 +17,12 @@
 require 'Slim/Slim.php';
 \Slim\Slim::registerAutoloader();
 
+// Load dependencies
+require 'vendor/autoload.php';
+
 // Load FeatherBB
-require 'include/classes/autoload.class.php';
-\FeatherBB\Loader::registerAutoloader();
+// require 'include/classes/autoload.class.php';
+// \FeatherBB\Loader::registerAutoloader();
 
 // Instantiate Slim and add CSRF
 $feather = new \Slim\Slim();
diff --git a/plugins/Test.plugin.php b/plugins/Test.plugin.php
new file mode 100644
index 00000000..04ddea4c
--- /dev/null
+++ b/plugins/Test.plugin.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace plugin;
+
+use \FeatherBB\Plugin as Plugin;
+
+class Test extends Plugin
+{
+    protected $name = 'Test plugin';
+    protected $description = "Just a useless plugin to check everything is all right! And it seems so ;)";
+
+    public function runHooks()
+    {
+        // $this->feather = \Slim\Slim::getInstance();
+        // $this->start = $this->feather->start;
+        // $this->config = $this->feather->config;
+        // $this->user = $this->feather->user;
+        // $this->request = $this->feather->request;
+        // $this->hook = $this->feather->hooks;
+        //
+        $this->hook->bind('get_forum_actions', function ($forum_actions) {
+            $forum_actions[] = '<a href="' . get_link('mark-read/') . '">Test1</a>';
+            return $forum_actions;
+        });
+        //
+        // $this->hook->bind('get_forum_actions', function ($forum_actions) {
+        //     $forum_actions[] = '<a href="' . get_link('mark-read/') . '">Test2</a>';
+        //     return $forum_actions;
+        // });
+        //
+        // $this->hook->bind('query_fetch_users_online', function ($query) {
+        //     $query = $query->limit(50);
+        //     return $query;
+        // });
+
+        /*$this->hook->bind('query_fetch_users_online', function ($query) {
+            $query = $query->offset(50);
+            return $query;
+        });*/
+    }
+}
diff --git a/plugins/Test2.plugin.php b/plugins/Test2.plugin.php
new file mode 100644
index 00000000..8541512e
--- /dev/null
+++ b/plugins/Test2.plugin.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace plugin;
+
+use \FeatherBB\Plugin as Plugin;
+
+class Test2 extends Plugin
+{
+    protected $name = 'Test 2 plugin';
+    protected $description = "Just a useless plugin to check everything is all right! And it seems so ;)";
+
+    public function __construct()
+    {
+        // $this->feather = \Slim\Slim::getInstance();
+        // $this->start = $this->feather->start;
+        // $this->config = $this->feather->config;
+        // $this->user = $this->feather->user;
+        // $this->request = $this->feather->request;
+        // $this->hook = $this->feather->hooks;
+        //
+        // $this->hook->bind('get_forum_actions', function ($forum_actions) {
+        //     $forum_actions[] = '<a href="' . get_link('mark-read/') . '">Test1</a>';
+        //     return $forum_actions;
+        // });
+        //
+        // $this->hook->bind('get_forum_actions', function ($forum_actions) {
+        //     $forum_actions[] = '<a href="' . get_link('mark-read/') . '">Test2</a>';
+        //     return $forum_actions;
+        // });
+        //
+        // $this->hook->bind('query_fetch_users_online', function ($query) {
+        //     $query = $query->limit(50);
+        //     return $query;
+        // });
+
+        /*$this->hook->bind('query_fetch_users_online', function ($query) {
+            $query = $query->offset(50);
+            return $query;
+        });*/
+    }
+}
diff --git a/plugins/test/plugintest.php b/plugins/test/plugintest.php
index c9fe31f2..55460cab 100644
--- a/plugins/test/plugintest.php
+++ b/plugins/test/plugintest.php
@@ -41,4 +41,4 @@ public function __construct()
             return $query;
         });*/
     }
-}
\ No newline at end of file
+}
diff --git a/style/FeatherBB.css b/style/FeatherBB.css
index be3f9568..af06e9ca 100644
--- a/style/FeatherBB.css
+++ b/style/FeatherBB.css
@@ -1744,3 +1744,66 @@ body #puninstall {
 #puninstall.pun div.punwrap section.container div#brdmain div.blockform div.box form#install div.inform fieldset div.infldset p{
 	margin-bottom: 12px;
 }
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+td,
+th {
+  padding: 0;
+}
+table {
+  background-color: transparent;
+}
+caption {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  color: #777777;
+  text-align: left;
+}
+th {
+  text-align: left;
+}
+.table {
+  width: 100%;
+  max-width: 100%;
+  margin-bottom: 20px;
+}
+.table > thead > tr > th,
+.table > tbody > tr > th,
+.table > tfoot > tr > th,
+.table > thead > tr > td,
+.table > tbody > tr > td,
+.table > tfoot > tr > td {
+  padding: 8px;
+  line-height: 1.42857143;
+  vertical-align: top;
+  border-top: 1px solid #dddddd;
+}
+.table > thead > tr > th {
+  vertical-align: bottom;
+  border-bottom: 2px solid #dddddd;
+}
+.table > caption + thead > tr:first-child > th,
+.table > colgroup + thead > tr:first-child > th,
+.table > thead:first-child > tr:first-child > th,
+.table > caption + thead > tr:first-child > td,
+.table > colgroup + thead > tr:first-child > td,
+.table > thead:first-child > tr:first-child > td {
+  border-top: 0;
+}
+.table > thead > tr > td.active,
+.table > tbody > tr > td.active,
+.table > tfoot > tr > td.active,
+.table > thead > tr > th.active,
+.table > tbody > tr > th.active,
+.table > tfoot > tr > th.active,
+.table > thead > tr.active > td,
+.table > tbody > tr.active > td,
+.table > tfoot > tr.active > td,
+.table > thead > tr.active > th,
+.table > tbody > tr.active > th,
+.table > tfoot > tr.active > th {
+  background-color: #f5f5f5;
+}
diff --git a/style/FeatherBB/view/admin/menu.php b/style/FeatherBB/view/admin/menu.php
index b33c2727..4be6ff1d 100644
--- a/style/FeatherBB/view/admin/menu.php
+++ b/style/FeatherBB/view/admin/menu.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -19,25 +19,15 @@
 		<div class="box">
 			<div class="inbox">
 				<ul>
-					<li<?php if ($page == 'index') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo get_link('admin/') ?>"><?php _e('Index') ?></a></li>
-					<li<?php if ($page == 'users') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
-<?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
-<?php endif;
-    if ($is_admin || $feather_config['o_report_method'] == '0' || $feather_config['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
-<?php endif;
-    ?>				</ul>
+					<li<?= ($page == 'index') ? ' class="isactive"' : ''; ?>><a href="<?php echo get_link('admin/') ?>"><?php _e('Index') ?></a></li>
+					<li<?= ($page == 'users') ? ' class="isactive"' : ''; ?>><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+                <?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>
+                    <li<?= ($page == 'bans') ? ' class="isactive"' : ''; ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+                <?php endif;
+                if ($is_admin || $feather_config['o_report_method'] == '0' || $feather_config['o_report_method'] == '2'): ?>
+                    <li<?= ($page == 'reports') ? ' class="isactive"' : ''; ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
+                <?php endif; ?>
+				</ul>
 			</div>
 		</div>
 <?php
@@ -48,38 +38,15 @@
 		<div class="box">
 			<div class="inbox">
 				<ul>
-					<li<?php if ($page == 'options') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/options/') ?>"><?php _e('Options') ?></a></li>
-					<li<?php if ($page == 'permissions') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
-					<li<?php if ($page == 'categories') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
-					<li<?php if ($page == 'forums') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
-					<li<?php if ($page == 'groups') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
-					<li<?php if ($page == 'censoring') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
-					<li<?php if ($page == 'parser') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
-					<li<?php if ($page == 'maintenance') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo get_link('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
+					<li<?= ($page == 'options') ? ' class="isactive"' : ''; ?>><a href="<?= get_link('admin/options/') ?>"><?php _e('Options') ?></a></li>
+					<li<?= ($page == 'permissions') ? ' class="isactive"' : ''; ?>><a href="<?= get_link('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
+					<li<?= ($page == 'categories') ? ' class="isactive"' : ''; ?>><a href="<?= get_link('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
+					<li<?= ($page == 'forums') ? ' class="isactive"' : ''; ?>><a href="<?= get_link('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
+					<li<?= ($page == 'groups') ? ' class="isactive"' : ''; ?>><a href="<?= get_link('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
+					<li<?= ($page == 'plugins') ? ' class="isactive"' : ''; ?>><a href="<?= get_link('admin/plugins/') ?>"><?= 'Plugins'; ?></a></li>
+					<li<?= ($page == 'censoring') ? ' class="isactive"' : ''; ?>><a href="<?= get_link('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
+					<li<?= ($page == 'parser') ? ' class="isactive"' : ''; ?>><a href="<?= get_link('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
+					<li<?= ($page == 'maintenance') ? ' class="isactive"' : ''; ?>><a href="<?= get_link('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
 				</ul>
 			</div>
 		</div>
@@ -109,4 +76,4 @@
     }
 
     ?>
-	</div>
\ No newline at end of file
+	</div>
diff --git a/style/FeatherBB/view/admin/plugins.php b/style/FeatherBB/view/admin/plugins.php
new file mode 100644
index 00000000..ab69b6d8
--- /dev/null
+++ b/style/FeatherBB/view/admin/plugins.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+<div class="block">
+    <h2>Plugins</h2>
+    <div class="box">
+        <div class="inbox">
+            <table class="table">
+                <caption>The following plugins are available</caption>
+                <thead>
+                    <tr>
+                        <th>Extension</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php foreach ($pluginsList as $class => $plugin) : ?>
+                        <tr>
+                            <td>
+                                <strong><?= $plugin->getName(); ?></strong>
+                                <div class="plugin-actions">
+                                    <a href="<?= get_link('/admin/plugins/activate?plugin='.$class) ?>">Activate</a>
+
+                                </div>
+                            </td>
+                            <td>
+                                <?= $plugin->getDescription(); ?>
+                                <div class="plugin-details">
+                                    Version <?= $plugin->getVersion(); ?> |
+                                    By <?= $plugin->getAuthor(); ?>
+                                </div>
+                            </td>
+                        </tr>
+                    <?php endforeach; ?>
+                </tbody>
+            </table>
+            <p style="text-align:right"><?= count($pluginsList) ?> éléments</p>
+        </div>
+    </div>
+</div>
+
+	<div class="clearer"></div>
+</div>
diff --git a/view/admin/menu.php b/view/admin/menu.php
index b33c2727..29d6bee7 100644
--- a/view/admin/menu.php
+++ b/view/admin/menu.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -109,4 +109,4 @@
     }
 
     ?>
-	</div>
\ No newline at end of file
+	</div>

From 3659413dfd534c86bdb1533bf96a1661e7b68e51 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Fri, 28 Aug 2015 02:55:46 +0200
Subject: [PATCH 224/353] Merge branch 'development' into 'plugins' & solve
 conflicts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lot of improvements to be done, this is just a « first brick » commit.
---
 controller/admin/bans.php                     |  66 +-
 controller/admin/categories.php               |  15 +-
 controller/admin/censoring.php                |  18 +-
 controller/admin/forums.php                   |  52 +-
 controller/admin/groups.php                   |  65 +-
 controller/admin/index.php                    |  20 +-
 controller/admin/maintenance.php              |  30 +-
 controller/admin/options.php                  |  18 +-
 controller/admin/parser.php                   |  18 +-
 controller/admin/permissions.php              |  16 +-
 controller/admin/plugins.php                  |  39 +-
 controller/admin/reports.php                  |  17 +-
 controller/admin/statistics.php               |  19 +-
 controller/admin/users.php                    | 132 ++-
 controller/delete.php                         |  52 +-
 controller/edit.php                           |   9 +-
 controller/footer.php                         |  73 --
 controller/header.php                         | 269 ------
 controller/help.php                           |  13 +-
 controller/index.php                          |   1 -
 controller/install.php                        |   2 -
 controller/login.php                          |  42 +-
 controller/misc.php                           | 103 +--
 controller/moderate.php                       | 142 ++--
 controller/post.php                           |  73 +-
 controller/register.php                       |  43 +-
 controller/search.php                         |  60 +-
 controller/userlist.php                       |  58 +-
 controller/viewforum.php                      |  61 +-
 controller/viewtopic.php                      | 108 ++-
 extern.php                                    |  71 +-
 include/classes/auth.class.php                |  28 +-
 include/classes/core.class.php                |   5 +-
 include/classes/csrf.class.php                |  32 +-
 include/classes/plugin.class.php              |   2 +-
 include/classes/view.class.php                | 767 +++++++++---------
 include/common_admin.php                      |   7 +-
 include/functions.php                         |  31 +-
 include/routes.php                            |   2 +-
 model/admin/groups.php                        |   6 +-
 model/moderate.php                            |   8 +-
 model/search.php                              |   8 +-
 model/viewforum.php                           |  31 +-
 model/viewtopic.php                           |  31 +-
 style/FeatherBB/view/admin/censoring.php      |   2 +-
 .../view/admin/groups/add_edit_group.php      |   2 +-
 .../view/admin/groups/admin_groups.php        |   4 +-
 style/FeatherBB/view/admin/index.php          |   2 +-
 style/FeatherBB/view/admin/options.php        | 264 +++---
 style/FeatherBB/view/admin/parser.php         |   2 +-
 style/FeatherBB/view/admin/permissions.php    |  44 +-
 style/FeatherBB/view/edit.php                 |   8 +-
 style/FeatherBB/view/footer.new.php           |  18 +-
 style/FeatherBB/view/footer.php               |  16 +-
 style/FeatherBB/view/header.new.php           |  18 +-
 style/FeatherBB/view/header.php               |   8 +-
 style/FeatherBB/view/help.php                 |   2 +-
 style/FeatherBB/view/index.php                |   8 +-
 style/FeatherBB/view/misc/email.php           |   4 +-
 style/FeatherBB/view/misc/rules.php           |   6 +-
 .../view/moderate/moderator_forum.php         |   6 +-
 style/FeatherBB/view/post.php                 |  16 +-
 .../view/profile/section_display.php          |  12 +-
 .../view/profile/section_personality.php      |  14 +-
 .../view/profile/section_privacy.php          |   4 +-
 style/FeatherBB/view/register/form.php        |  10 +-
 style/FeatherBB/view/register/rules.php       |   2 +-
 style/FeatherBB/view/search/form.php          |   2 +-
 style/FeatherBB/view/viewforum.php            |  10 +-
 style/FeatherBB/view/viewtopic.php            |  18 +-
 view/admin/censoring.php                      |   2 +-
 view/admin/groups/add_edit_group.php          |   2 +-
 view/admin/groups/admin_groups.php            |   4 +-
 view/admin/index.php                          |   2 +-
 view/admin/menu.php                           |   2 +-
 view/admin/options.php                        | 264 +++---
 view/admin/parser.php                         |   2 +-
 view/admin/permissions.php                    |  44 +-
 view/edit.php                                 |   8 +-
 view/help.php                                 |   2 +-
 view/index.php                                |   8 +-
 view/misc/email.php                           |   4 +-
 view/misc/rules.php                           |   6 +-
 view/moderate/moderator_forum.php             |   6 +-
 view/post.php                                 |  16 +-
 view/profile/menu.php                         |   4 +-
 view/profile/section_display.php              |  12 +-
 view/profile/section_personality.php          |  14 +-
 view/profile/section_privacy.php              |   4 +-
 view/profile/upload_avatar.php                |   8 +-
 view/register/form.php                        |  10 +-
 view/register/rules.php                       |   2 +-
 view/search/form.php                          |   2 +-
 view/viewforum.php                            |  10 +-
 view/viewtopic.php                            |  18 +-
 95 files changed, 1473 insertions(+), 2148 deletions(-)
 delete mode 100644 controller/footer.php
 delete mode 100644 controller/header.php

diff --git a/controller/admin/bans.php b/controller/admin/bans.php
index 0a3dd9d2..e6a8d6ff 100644
--- a/controller/admin/bans.php
+++ b/controller/admin/bans.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\admin\bans();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/bans.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -46,33 +44,27 @@ public function display()
             $p = (!$this->request->get('p') || $this->request->get('p') <= 1 || $this->request->get('p') > $num_pages) ? 1 : intval($this->request->get('p'));
             $start_from = 50 * ($p - 1);
 
-            // Generate paging links
-            $paging_links = '<span class="pages-label">' . __('Pages') . ' </span>' . paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str']));
-
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'), __('Results head'));
-
-            $this->header->setTitle($page_title)->setActivePage('admin')->setPage($p)->setPagingLinks($paging_links)->enableAdminConsole()->display();
-
             $ban_data = $this->model->find_ban($start_from);
 
-            $this->feather->render('admin/bans/search_ban.php', array(
+            $this->feather->view2->setPageInfo(array(
+                    'admin_console' => true,
+                    'page' => $p,
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'), __('Results head')),
+                    'paging_links' => '<span class="pages-label">' . __('Pages') . ' </span>' . paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str'])),
                     'ban_data' => $ban_data['data'],
                 )
-            );
-
-            $this->footer->display();
+            )->addTemplate('admin/bans/search_ban.php')->display();
         }
+        else {
+            generate_admin_menu('bans');
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
-        $focus_element = array('bans', 'new_ban_user');
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->enableAdminConsole()->display();
-
-        generate_admin_menu('bans');
-
-        $this->feather->render('admin/bans/admin_bans.php');
-
-        $this->footer->display();
+            $this->feather->view2->setPageInfo(array(
+                    'admin_console' => true,
+                    'focus_element' => array('bans', 'new_ban_user'),
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans')),
+                )
+            )->addTemplate('admin/bans/admin_bans.php')->display();
+        }
     }
 
     public function add($id = null)
@@ -85,19 +77,15 @@ public function add($id = null)
             $this->model->insert_ban();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
-        $focus_element = array('bans2', 'ban_user');
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->enableAdminConsole()->display();
-
         generate_admin_menu('bans');
 
-        $this->feather->render('admin/bans/add_ban.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'admin_console' => true,
+                'focus_element' => array('bans2', 'ban_user'),
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans')),
                 'ban' => $this->model->add_ban_info($id),
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/bans/add_ban.php')->display();
     }
 
     public function delete($id)
@@ -120,18 +108,14 @@ public function edit($id)
             $this->model->insert_ban();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
-        $focus_element = array('bans2', 'ban_user');
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->enableAdminConsole()->display();
-
         generate_admin_menu('bans');
 
-        $this->feather->render('admin/bans/add_ban.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'admin_console' => true,
+                'focus_element' => array('bans2', 'ban_user'),
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans')),
                 'ban' => $this->model->edit_ban_info($id),
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/bans/add_ban.php')->display();
     }
 }
diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index 397c2c73..916506be 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\admin\categories();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/categories.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -103,16 +101,13 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Categories'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('categories');
 
-        $this->feather->render('admin/categories.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Categories')),
+                'active_page' => 'admin',
+                'admin_console' => true,
                 'cat_list' => $this->model->get_cat_list(),
-            ));
-
-        $this->footer->display();
+            ))->addTemplate('admin/categories.php')->display();
     }
 }
diff --git a/controller/admin/censoring.php b/controller/admin/censoring.php
index 6406b9eb..a7367eb9 100644
--- a/controller/admin/censoring.php
+++ b/controller/admin/censoring.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\admin\censoring();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/censoring.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -51,19 +49,15 @@ public function display()
             $this->model->remove_word();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Censoring'));
-        $focus_element = array('censoring', 'new_search_for');
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->enableAdminConsole()->display();
-
         generate_admin_menu('censoring');
 
-        $this->feather->render('admin/censoring.php', array(
-                'feather_config'    =>    $this->config,
+        $this->feather->view2->setPageInfo(array(
+                'title'    =>    array(feather_escape($this->config['o_board_title']), __('Admin'), __('Censoring')),
+                'focus_element'    =>    array('censoring', 'new_search_for'),
+                'active_page'    =>    'admin',
+                'admin_console'    =>    true,
                 'word_data'    =>    $this->model->get_words(),
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/censoring.php')->display();
     }
 }
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index b1718ed8..ba4cfa60 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\admin\forums();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/forums.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -123,23 +121,18 @@ public function edit_forum($forum_id)
             }
 
         } else {
-
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums'));
-
-            $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
             generate_admin_menu('forums');
 
-            $this->feather->render('admin/forums/permissions.php', array(
-                    'feather_config' => $this->config,
+            $this->feather->view2->setPageInfo(array(
+                    'title'    =>    array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums')),
+                    'active_page'    =>    'admin',
+                    'admin_console'    =>    true,
                     'perm_data' => $this->model->get_permissions($forum_id),
                     'cur_index'     =>  7,
                     'cur_forum' => $this->model->get_forum_info($forum_id),
                     'forum_data' => $this->model->get_forums(),
                 )
-            );
-
-            $this->footer->display();
+            )->addTemplate('admin/forums/permissions.php')->display();
         }
     }
 
@@ -156,20 +149,17 @@ public function delete_forum($forum_id)
 
             redirect(get_link('admin/forums/'), __('Forum deleted redirect'));
 
-        } else { // If the user hasn't confirmed the delete
-
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums'));
-
-            $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
+        } else { // If the user hasn't confirmed
 
             generate_admin_menu('forums');
 
-            $this->feather->render('admin/forums/delete_forum.php', array(
+            $this->feather->view2->setPageInfo(array(
+                    'title'    =>    array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums')),
+                    'active_page'    =>    'admin',
+                    'admin_console'    =>    true,
                     'cur_forum' => $this->model->get_forum_info($forum_id),
                 )
-            );
-
-            $this->footer->display();
+            )->addTemplate('admin/forums/delete_forum.php')->display();
         }
     }
 
@@ -198,21 +188,17 @@ public function display()
             $this->edit_positions();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('forums');
 
         $categories_model = new \model\admin\categories();
-        $this->feather->render('admin/forums/admin_forums.php', array(
-                'feather_config' => $this->config,
-                'cat_list'      => $categories_model->get_cat_list(),
-                'forum_data'    =>  $this->model->get_forums(),
-                'cur_index'     =>  4,
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums')),
+                'active_page' => 'admin',
+                'admin_console' => true,
+                'cat_list' => $categories_model->get_cat_list(),
+                'forum_data' => $this->model->get_forums(),
+                'cur_index' => 4,
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/forums/admin_forums.php')->display();
     }
 }
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index f2682dc8..2ccffa6a 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\admin\groups();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/groups.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -43,20 +41,16 @@ public function display()
             $this->model->set_default_group($groups, $this->feather);
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('groups');
 
-        $this->feather->render('admin/groups/admin_groups.php', array(
-                'feather_config'    =>    $this->config,
-                'groups' => $groups,
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                'active_page' => 'admin',
+                'admin_console' => true,
+                'groups' => $this->model->fetch_groups(),
                 'cur_index' => 5,
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/groups/admin_groups.php')->display();
     }
 
     public function delete($id)
@@ -82,38 +76,30 @@ public function delete($id)
             if ($this->request->post('del_group_comply') || $this->request->post('del_group')) {
                 $this->model->delete_group($id);
             } else {
-                $group_title = $this->model->get_group_title($id);
-
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
-
-                $this->header->setTitle($page_title)->setActivePage('admin')->display();
-
                 generate_admin_menu('groups');
 
-                $this->feather->render('admin/groups/confirm_delete.php', array(
-                        'group_title'      =>  $group_title,
+                $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                        'active_page' => 'admin',
+                        'admin_console' => true,
+                        'group_title'      =>  $this->model->get_group_title($id),
                         'id'    => $id,
                     )
-                );
-
-                $this->footer->display();
+                )->addTemplate('admin/groups/confirm_delete.php')->display();
             }
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('groups');
 
-        $this->feather->render('admin/groups/delete_group.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                'active_page' => 'admin',
+                'admin_console' => true,
                 'id'    => $id,
                 'group_info'      =>  $this->model->get_title_members($id),
                 'group_list_delete'      =>  $this->model->get_group_list_delete($id),
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/groups/delete_group.php')->display();
     }
 
     public function addedit($id = '')
@@ -131,26 +117,23 @@ public function addedit($id = '')
 
         // Add/edit a group (stage 1)
         elseif ($this->request->post('add_group') || isset($id)) {
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups'));
-            $required_fields = array('req_title' => __('Group title label'));
-            $focus_element = array('groups2', 'req_title');
-
-            $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->setRequiredFields($required_fields)->enableAdminConsole()->display();
 
             generate_admin_menu('groups');
 
             $group = $this->model->info_add_group($groups, $id);
 
-            $this->feather->render('admin/groups/add_edit_group.php', array(
-                    'feather_config'    =>    $this->config,
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                    'active_page' => 'admin',
+                    'admin_console' => true,
+                    'focus_element' => array('groups2', 'req_title'),
+                    'required_fields' => array('req_title' => __('Group title label')),
                     'group'    =>    $group,
                     'groups'    =>    $groups,
                     'id'    => $id,
                     'group_list'    => $this->model->get_group_list($groups, $group),
                 )
-            );
-
-            $this->footer->display();
+            )->addTemplate('admin/groups/delete_group.php')->display();
         }
     }
 }
diff --git a/controller/admin/index.php b/controller/admin/index.php
index e48cad10..1069a7cb 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/index.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
     }
@@ -78,20 +76,14 @@ public function display($action = null)
             }
         }
 
-        $install_folder_exists = is_dir(FEATHER_ROOT.'install');
-
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Index'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('index');
 
-        $this->feather->render('admin/index.php', array(
-                            'install_file_exists'    =>    $install_folder_exists,
-                            'feather_config'    =>    $this->config,
+        $this->feather->view2->setPageInfo(array(
+                            'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Index')),
+                            'active_page' => 'admin',
+                            'admin_console' => true,
+                            'install_file_exists'    =>   is_dir(FEATHER_ROOT.'install'),
                             )
-                    );
-
-        $this->footer->display();
+                    )->addTemplate('admin/index.php')->display();
     }
 }
diff --git a/controller/admin/maintenance.php b/controller/admin/maintenance.php
index d58d7e52..cd8c237b 100644
--- a/controller/admin/maintenance.php
+++ b/controller/admin/maintenance.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\admin\maintenance();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/maintenance.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -62,38 +62,32 @@ public function display()
             $prune_from = feather_trim($this->request->post('prune_from'));
             $prune_sticky = intval($this->request->post('prune_sticky'));
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Prune'));
-
-            $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
             generate_admin_menu('maintenance');
 
             if ($this->request->post('prune_comply')) {
                 $this->model->prune_comply($prune_from, $prune_sticky);
             }
 
-            $this->feather->render('admin/maintenance/prune.php', array(
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Prune')),
+                    'active_page' => 'admin',
+                    'admin_console' => true,
                     'prune_sticky'    =>    $prune_sticky,
                     'prune_from'    =>    $prune_from,
                     'prune' => $this->model->get_info_prune($prune_sticky, $prune_from),
                 )
-            );
-
-            $this->footer->display();
+            )->addTemplate('admin/maintenance/prune.php')->display();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Maintenance'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('maintenance');
 
-        $this->feather->render('admin/maintenance/admin_maintenance.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Maintenance')),
+                'active_page' => 'admin',
+                'admin_console' => true,
                 'first_id' => $this->model->get_first_id(),
                 'categories' => $this->model->get_categories(),
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/maintenance/admin_maintenance.php')->display();
     }
 }
diff --git a/controller/admin/options.php b/controller/admin/options.php
index 230a9dbf..589b48cb 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\admin\options();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/options.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -40,22 +38,16 @@ public function display()
             $this->model->update_options();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Options'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('options');
 
-        $this->feather->render('admin/options.php', array(
-                'feather_config'    =>    $this->config,
-                'feather_user'    =>    $this->user,
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Options')),
+                'active_page' => 'admin',
+                'admin_console' => true,
                 'languages' => forum_list_langs(),
                 'styles' => $this->model->get_styles(),
                 'times' => $this->model->get_times(),
-                'feather'    =>    $this->feather,
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/options.php')->display();
     }
 }
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index e2c42f34..30b48a08 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\admin\parser();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/parser.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -209,25 +207,19 @@ public function display()
             redirect(get_link('admin/parser/'), $lang_admin_parser['save_success']);
         }
 
-
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Parser'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('parser');
 
-        $this->feather->render('admin/parser.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Parser')),
+                'active_page' => 'admin',
+                'admin_console' => true,
                 'lang_admin_parser'    =>    $lang_admin_parser,
-
                 'smiley_files' => $this->model->get_smiley_files(),
                 'bbcd' =>   $bbcd,
                 'config' => $config,
-                'feather_config' => $this->config,
                 'smilies' =>    $smilies,
                 'i'     =>  -1,
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/parser.php')->display();
     }
 }
diff --git a/controller/admin/permissions.php b/controller/admin/permissions.php
index 78133649..ac1881bd 100644
--- a/controller/admin/permissions.php
+++ b/controller/admin/permissions.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\admin\permissions();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/permissions.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -41,17 +39,13 @@ public function display()
             $this->model->update_permissions();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Permissions'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('permissions');
 
-        $this->feather->render('admin/permissions.php', array(
-                'feather_config'    =>    $this->config,
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Permissions')),
+                'active_page' => 'admin',
+                'admin_console' => true,
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/permissions.php')->display();
     }
 }
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index 83e1f480..3bfe6102 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -18,9 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
-        // $this->model = new \model\admin\plugins();
         require FEATHER_ROOT . 'include/common_admin.php';
     }
 
@@ -40,20 +37,27 @@ public function index()
         //     $this->model->update_permissions();
         // }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Permissions'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
+        // $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
 
         generate_admin_menu('plugins');
 
         $pluginsList = \FeatherBB\Plugin::getPluginsList();
 
-        $this->feather->render('admin/plugins.php', array(
-                'pluginsList'    =>    $pluginsList
+        $this->feather->view2->setPageInfo(array(
+                'admin_console' => true,
+                'active_page' => 'admin',
+                'focus_element' => array('bans', 'new_ban_user'),
+                'pluginsList'    =>    $pluginsList,
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), 'Plugins'),
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/plugins.php')->display();
+
+        // $this->feather->render('admin/plugins.php', array(
+        //         'pluginsList'    =>    $pluginsList
+        //     )
+        // );
+        //
+        // $this->footer->display();
     }
 
     public function activate()
@@ -117,10 +121,6 @@ public function display()
             $_SERVER['REQUEST_URI'] = (isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : '').'?'.(isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '');
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), str_replace('_', ' ', substr($plugin, strpos($plugin, '_') + 1, -4)));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         // Attempt to load the plugin. We don't use @ here to suppress error messages,
         // because if we did and a parse error occurred in the plugin, we would only
         // get the "blank page of death"
@@ -129,8 +129,11 @@ public function display()
             message(sprintf(__('Plugin failed message'), $plugin));
         }
 
-        $this->feather->render('admin/loader.php');
-
-        $this->footer->display();
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), str_replace('_', ' ', substr($plugin, strpos($plugin, '_') + 1, -4))),
+                'active_page' => 'admin',
+                'admin_console' => true,
+            )
+        )->addTemplate('admin/loader.php')->display();
     }
 }
diff --git a/controller/admin/reports.php b/controller/admin/reports.php
index 3a9ced60..7e2c933a 100644
--- a/controller/admin/reports.php
+++ b/controller/admin/reports.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\admin\reports();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/reports.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -41,18 +41,15 @@ public function display()
             $this->model->zap_report();
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Reports'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('reports');
 
-        $this->feather->render('admin/reports.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Reports')),
+                'active_page' => 'admin',
+                'admin_console' => true,
                 'report_data'   =>  $this->model->get_reports(),
                 'report_zapped_data'   =>  $this->model->get_zapped_reports(),
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/reports.php')->display();
     }
 }
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index 65dae86d..7bd279af 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\admin\statistics();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/index.mo');
         require FEATHER_ROOT . 'include/common_admin.php';
@@ -36,26 +36,21 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Server statistics'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->enableAdminConsole()->display();
-
         generate_admin_menu('index');
 
         $total = $this->model->get_total_size();
 
-        $this->feather->render('admin/statistics.php', array(
-                'feather_config'    =>    $this->config,
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Server statistics')),
+                'active_page' => 'admin',
+                'admin_console' => true,
                 'server_load'    =>    $this->model->get_server_load(),
                 'num_online'    =>    $this->model->get_num_online(),
                 'total_size'    =>    $total['size'],
                 'total_records'    =>    $total['records'],
                 'php_accelerator'    =>    $this->model->get_php_accelerator(),
-                'feather'    =>    $this->feather,
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/statistics.php')->display();
     }
 
 
diff --git a/controller/admin/users.php b/controller/admin/users.php
index aecd2f43..705234ef 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -18,11 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\admin\users();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/users.mo');
-        $this->header->enableAdminConsole();
         require FEATHER_ROOT . 'include/common_admin.php';
     }
 
@@ -43,20 +40,15 @@ public function display()
                 message(__('No permission'), '403');
             }
 
-            $move = $this->model->move_users();
-
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Move users'));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->display();
-
             generate_admin_menu('users');
 
-            $this->feather->render('admin/users/move_users.php', array(
-                    'move'              =>  $move,
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Move users')),
+                    'active_page' => 'moderate',
+                    'admin_console' => true,
+                    'move'              =>  $this->model->move_users(),
                 )
-            );
-
-            $this->footer->display();
+            )->addTemplate('admin/users/move_users.php')->display();
         }
 
 
@@ -66,20 +58,15 @@ public function display()
                 message(__('No permission'), '403');
             }
 
-            $user_ids = $this->model->delete_users();
-
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Delete users'));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->display();
-
             generate_admin_menu('users');
 
-            $this->feather->render('admin/users/delete_users.php', array(
-                    'user_ids'          => $user_ids,
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Delete users')),
+                    'active_page' => 'moderate',
+                    'admin_console' => true,
+                    'user_ids'          => $this->model->delete_users(),
                 )
-            );
-
-            $this->footer->display();
+            )->addTemplate('admin/users/delete_users.php')->display();
         }
 
 
@@ -89,21 +76,16 @@ public function display()
                 message(__('No permission'), '403');
             }
 
-            $user_ids = $this->model->ban_users();
-
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'));
-            $focus_element = array('bans2', 'ban_message');
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->setFocusElement($focus_element)->display();
-
             generate_admin_menu('users');
 
-            $this->feather->render('admin/users/ban_users.php', array(
-                    'user_ids'          => $user_ids,
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Bans')),
+                    'active_page' => 'moderate',
+                    'focus_element' => array('bans2', 'ban_message'),
+                    'admin_console' => true,
+                    'user_ids'          => $this->model->ban_users(),
                 )
-            );
-
-            $this->footer->display();
+            )->addTemplate('admin/users/ban_users.php')->display();
         }
 
         // Display bans
@@ -128,13 +110,13 @@ public function display()
             $can_delete = $can_move = $this->user->g_id == FEATHER_ADMIN;
             $can_ban = $this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && $this->user->g_mod_ban_users == '1');
             $can_action = ($can_delete || $can_ban || $can_move) && $num_users > 0;
+            $this->feather->view2->addAsset('js', 'js/common.js', array('type' => 'text/javascript'));
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head'));
-            $page_head = array('js' => '<script type="text/javascript" src="'.get_base_url().'/js/common.js"></script>');
-
-            $this->header->setTitle($page_title)->setActivePage('admin')->setPage($p)->setPagingLinks($paging_links)->setPageHead($page_head)->display();
-
-            $this->feather->render('admin/users/find_users.php', array(
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
+                    'active_page' => 'admin',
+                    'admin_console' => true,
+                    'paging_links' => $paging_links,
                     'search' => $search,
                     'start_from' => $start_from,
                     'can_delete' => $can_delete,
@@ -143,24 +125,20 @@ public function display()
                     'can_move' => $can_move,
                     'user_data' =>  $this->model->print_users($search['conditions'], $search['order_by'], $search['direction'], $start_from),
                 )
-            );
-
-            $this->footer->display();
+            )->addTemplate('admin/users/find_users.php')->display();
         }
+        else {
+            generate_admin_menu('users');
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'));
-        $focus_element = array('find_user', 'form[username]');
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->setFocusElement($focus_element)->display();
-
-        generate_admin_menu('users');
-
-        $this->feather->render('admin/users/admin_users.php', array(
-                'group_list' => $this->model->get_group_list(),
-            )
-        );
-
-        $this->footer->display();
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users')),
+                    'active_page' => 'admin',
+                    'admin_console' => true,
+                    'focus_element' => array('find_user', 'form[username]'),
+                    'group_list' => $this->model->get_group_list(),
+                )
+            )->addTemplate('admin/users/admin_users.php')->display();
+        }
     }
 
     // Show IP statistics for a certain user ID
@@ -179,20 +157,16 @@ public function ipstats($id)
         $p = (!$this->request->get('p') || $this->request->get('p') <= 1 || $this->request->get('p') > $num_pages) ? 1 : intval($this->request->get('p'));
         $start_from = 50 * ($p - 1);
 
-        // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$id);
-
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->setPage($p)->setPagingLinks($paging_links)->display();
-
-        $this->feather->render('admin/users/search_ip.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
+                'active_page' => 'admin',
+                'admin_console' => true,
+                'page' => $p,
+                'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$id),
                 'start_from'        =>  $start_from,
                 'ip_data'   =>  $this->model->get_ip_stats($id, $start_from),
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/users/search_ip.php')->display();
     }
 
     // Show IP statistics for a certain user IP
@@ -215,19 +189,15 @@ public function showusers($ip)
         $p = (!$this->request->get('p') || $this->request->get('p') <= 1 || $this->request->get('p') > $num_pages) ? 1 : intval($this->request->get('p'));
         $start_from = 50 * ($p - 1);
 
-        // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$ip);
-
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head'));
-
-        $this->header->setTitle($page_title)->setActivePage('admin')->setPage($p)->setPagingLinks($paging_links)->display();
-
-        $this->feather->render('admin/users/show_users.php', array(
+        $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
+                'active_page' => 'admin',
+                'admin_console' => true,
+                'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$ip),
+                'page' => $p,
                 'start_from'        =>  $start_from,
                 'info'   =>  $this->model->get_info_poster($ip, $start_from),
             )
-        );
-
-        $this->footer->display();
+        )->addTemplate('admin/users/show_users.php')->display();
     }
 }
diff --git a/controller/delete.php b/controller/delete.php
index e6dc453d..a1eb2a45 100644
--- a/controller/delete.php
+++ b/controller/delete.php
@@ -14,76 +14,58 @@ class delete
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\delete();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/delete.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/delete.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/post.mo');
     }
 
     public function deletepost($id)
     {
         global $pd;
 
-        if ($this->user->g_read_board == '0') {
+        if ($this->feather->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
 
         // Fetch some informations about the post, the topic and the forum
         $cur_post = $this->model->get_info_delete($id);
 
-        if ($this->config['o_censoring'] == '1') {
+        if ($this->feather->forum_settings['o_censoring'] == '1') {
             $cur_post['subject'] = censor_words($cur_post['subject']);
         }
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
         $mods_array = ($cur_post['moderators'] != '') ? unserialize($cur_post['moderators']) : array();
-        $is_admmod = ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && array_key_exists($this->user->username, $mods_array))) ? true : false;
+        $is_admmod = ($this->feather->user->g_id == FEATHER_ADMIN || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
 
         $is_topic_post = ($id == $cur_post['first_post_id']) ? true : false;
 
         // Do we have permission to edit this post?
-        if (($this->user->g_delete_posts == '0' ||
-                ($this->user->g_delete_topics == '0' && $is_topic_post) ||
-                $cur_post['poster_id'] != $this->user->id ||
+        if (($this->feather->user->g_delete_posts == '0' ||
+                ($this->feather->user->g_delete_topics == '0' && $is_topic_post) ||
+                $cur_post['poster_id'] != $this->feather->user->id ||
                 $cur_post['closed'] == '1') &&
                 !$is_admmod) {
             message(__('No permission'), '403');
         }
 
-        if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
+        if ($is_admmod && $this->feather->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
             message(__('No permission'), '403');
         }
 
-
         if ($this->feather->request()->isPost()) {
             $this->model->handle_deletion($is_topic_post, $id, $cur_post['tid'], $cur_post['fid']);
         }
 
-
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Delete post'));
-
-        $this->header->setTitle($page_title)->setActivePage('delete')->display();
-
-        require FEATHER_ROOT.'include/parser.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'include/parser.php';
         $cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
 
-        $this->feather->render('delete.php', array(
-                            'cur_post' => $cur_post,
-                            'id' => $id,
-                            'is_topic_post' => $is_topic_post,
-                            )
-                    );
-
-        $this->footer->display();
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Delete post')),
+            'active_page' => 'delete',
+            'cur_post' => $cur_post,
+            'id' => $id,
+            'is_topic_post' => $is_topic_post
+        ))->addTemplate('delete.php')->display();
     }
 }
diff --git a/controller/edit.php b/controller/edit.php
index 27e7f445..0239c17e 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\edit();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
@@ -120,16 +120,13 @@ public function editpost($id)
                             'errors' => $errors,
                             'preview_message' => $preview_message,
                             'id' => $id,
-                            'feather_config' => $this->config,
-                            'feather_user' => $this->user,
                             'checkboxes' => $this->model->get_checkboxes($can_edit_subject, $is_admmod, $cur_post, 1),
-                            'feather' => $this->feather,
                             'can_edit_subject' => $can_edit_subject,
                             'lang_bbeditor'    =>    $lang_bbeditor,
                             'post' => $post,
                             )
                     );
 
-        $this->footer->display();
+
     }
 }
diff --git a/controller/footer.php b/controller/footer.php
deleted file mode 100644
index a05ffdd2..00000000
--- a/controller/footer.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-namespace controller;
-
-class footer
-{
-    public function __construct()
-    {
-        $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->dontStop = false;
-    }
-
-    public function dontStop() {
-        $this->dontStop = true;
-    }
-
-    public function display($footer_style = null, $id = null, $p = null, $pid = null, $forum_id = null, $num_pages = null)
-    {
-        // Render the footer
-        // If no footer style has been specified, we use the default (only copyright/debug info)
-        $footer_style = isset($footer_style) ? $footer_style : null;
-
-        $id = isset($id) ? $id : null;
-        $p = isset($p) ? $p : null;
-        $pid = isset($pid) ? $pid : null;
-
-        $forum_id = isset($forum_id) ? $forum_id : null;
-
-        $num_pages = isset($num_pages) ? $num_pages : null;
-
-        if (!$this->feather->cache->isCached('quickjump')) {
-            $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
-        }
-
-        $this->feather->render('footer.php', array(
-                            'id' => $id,
-                            'p' => $p,
-                            'pid' => $pid,
-                            'feather_user' => $this->user,
-                            'feather_config' => $this->config,
-                            'feather_start' => $this->start,
-                            'footer_style' => $footer_style,
-                            'quickjump' => $this->feather->cache->retrieve('quickjump'),
-                            'forum_id' => $forum_id,
-                            'num_pages' => $num_pages,
-                            'feather' => $this->feather,
-                            )
-                    );
-
-        // Close Idiorm connection
-        $pdo = \DB::get_db();
-        $pdo = null;
-
-        // If we need to stop the application outside a route
-        if ($this->dontStop) {
-            die();
-        }
-
-        // If we reached this far, we shouldn't execute more code
-        $this->feather->stop();
-    }
-}
diff --git a/controller/header.php b/controller/header.php
deleted file mode 100644
index ebc8c550..00000000
--- a/controller/header.php
+++ /dev/null
@@ -1,269 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-namespace controller;
-
-class header
-{
-    public function __construct()
-    {
-        $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->model = new \model\header();
-    }
-
-    private $title;
-
-    private $page;
-
-    private $focus_element;
-
-    private $paging_links;
-
-    private $required_fields;
-
-    private $page_head;
-
-    private $active_page;
-
-    private $admin_console;
-
-    private $allow_index;
-
-    public function setTitle($title)
-    {
-        $this->title = $title;
-
-        return $this;
-    }
-
-    public function setPage($page)
-    {
-        $this->page = $page;
-
-        return $this;
-    }
-
-    public function setFocusElement($focus_element)
-    {
-        $this->focus_element = $focus_element;
-
-        return $this;
-    }
-
-    public function setPagingLinks($paging_links)
-    {
-        $this->paging_links = $paging_links;
-
-        return $this;
-    }
-
-    public function setRequiredFields($required_fields)
-    {
-        $this->required_fields = $required_fields;
-
-        return $this;
-    }
-
-    public function setPageHead($page_head)
-    {
-        $this->page_head = $page_head;
-
-        return $this;
-    }
-
-    public function setActivePage($active_page)
-    {
-        $this->active_page = $active_page;
-
-        return $this;
-    }
-
-    public function enableAdminConsole()
-    {
-        $this->admin_console = true;
-
-        return $this;
-    }
-
-    public function allowIndex()
-    {
-        $this->allow_index = true;
-
-        return $this;
-    }
-
-    public function display()
-    {
-        if (!defined('FEATHER_HEADER')) {
-            define('FEATHER_HEADER', 1);
-        }
-
-        // Render the header
-        $this->title = isset($this->title) ? $this->title : feather_escape($this->config['o_board_title']);
-
-        // Define $p if it's not set to avoid a PHP notice
-        $this->page = isset($this->page) ? $this->page : null;
-
-        // Set default safe values
-        $this->page_head = isset($this->page_head) ? $this->page_head : null;
-        $this->paging_links = isset($this->paging_links) ? $this->paging_links : null;
-        $this->required_fields = isset($this->required_fields) ? $this->required_fields : null;
-
-        $navlinks = $this->getNavlinks();
-        $page_info = $this->getStatus();
-        $admin_console = $this->getAdminConsole();
-
-        // Show the robots meta only if enabled
-        $allow_index = ($this->allow_index === true) ? '' : '<meta name="ROBOTS" content="NOINDEX, FOLLOW" />'."\n";
-
-        $focus_element = isset($this->focus_element) ? ' onload="document.getElementById(\''.$this->focus_element[0].'\').elements[\''.$this->focus_element[1].'\'].focus();"' : '';
-
-        $this->feather->render('header.php', array(
-                'page_title' => $this->title,
-                'p' => $this->page,
-                'feather_user' => $this->user,
-                'feather_config' => $this->config,
-                '_SERVER' => $_SERVER,
-                'page_head' => $this->page_head,
-                'active_page' => $this->active_page,
-                'paging_links' => $this->paging_links,
-                'required_fields' => $this->required_fields,
-                'feather' => $this->feather,
-                'focus_element' => $focus_element,
-                'navlinks' => $navlinks,
-                'page_info' => $page_info,
-                'admin_console' => $admin_console,
-                'allow_index' => $allow_index,
-            )
-        );
-    }
-
-    private function getNavlinks()
-    {
-        $links = array();
-
-        // Index should always be displayed
-        $links[] = '<li id="navindex"'.(($this->active_page == 'index') ? ' class="isactive"' : '').'><a href="'.get_base_url().'/">'.__('Index').'</a></li>';
-
-        if ($this->user->g_read_board == '1' && $this->user->g_view_users == '1') {
-            $links[] = '<li id="navuserlist"'.(($this->active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.get_link('userlist/').'">'.__('User list').'</a></li>';
-        }
-
-        if ($this->config['o_rules'] == '1' && (!$this->user->is_guest || $this->user->g_read_board == '1' || $this->config['o_regs_allow'] == '1')) {
-            $links[] = '<li id="navrules"'.(($this->active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.get_link('rules/').'">'.__('Rules').'</a></li>';
-        }
-
-        if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-            $links[] = '<li id="navsearch"'.(($this->active_page == 'search') ? ' class="isactive"' : '').'><a href="'.get_link('search/').'">'.__('Search').'</a></li>';
-        }
-
-        if ($this->user->is_guest) {
-            $links[] = '<li id="navregister"'.(($this->active_page == 'register') ? ' class="isactive"' : '').'><a href="'.get_link('register/').'">'.__('Register').'</a></li>';
-            $links[] = '<li id="navlogin"'.(($this->active_page == 'login') ? ' class="isactive"' : '').'><a href="'.get_link('login/').'">'.__('Login').'</a></li>';
-        } else {
-            $links[] = '<li id="navprofile"'.(($this->active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.get_link('user/'.$this->user->id.'/').'">'.__('Profile').'</a></li>';
-
-            if ($this->user->is_admmod) {
-                $links[] = '<li id="navadmin"'.(($this->active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.get_link('admin/').'">'.__('Admin').'</a></li>';
-            }
-
-            $links[] = '<li id="navlogout"><a href="'.get_link('logout/id/'.$this->user->id.'/token/'.feather_hash($this->user->id.feather_hash($this->request->getIp()))).'/">'.__('Logout').'</a></li>';
-        }
-
-        // Are there any additional navlinks we should insert into the array before imploding it?
-        if ($this->user->g_read_board == '1' && $this->config['o_additional_navlinks'] != '') {
-            if (preg_match_all('%([0-9]+)\s*=\s*(.*?)\n%s', $this->config['o_additional_navlinks']."\n", $extra_links)) {
-                // Insert any additional links into the $links array (at the correct index)
-                $num_links = count($extra_links[1]);
-                for ($i = 0; $i < $num_links; ++$i) {
-                    array_splice($links, $extra_links[1][$i], 0, array('<li id="navextra'.($i + 1).'">'.$extra_links[2][$i].'</li>'));
-                }
-            }
-        }
-
-        $navlinks = '<div id="brdmenu" class="inbox">'."\n\t\t\t".'<ul>'."\n\t\t\t\t".implode("\n\t\t\t\t", $links)."\n\t\t\t".'</ul>'."\n\t\t".'</div>';
-
-        return $navlinks;
-    }
-
-    private function getStatus()
-    {
-        $page_statusinfo = $page_topicsearches = array();
-
-        if ($this->user->is_guest) {
-            $page_statusinfo = '<p class="conl">'.__('Not logged in').'</p>';
-        } else {
-            $page_statusinfo[] = '<li><span>'.__('Logged in as').' <strong>'.feather_escape($this->user->username).'</strong></span></li>';
-            $page_statusinfo[] = '<li><span>'.sprintf(__('Last visit'), format_time($this->user->last_visit)).'</span></li>';
-
-            if ($this->user->is_admmod) {
-                if ($this->config['o_report_method'] == '0' || $this->config['o_report_method'] == '2') {
-                    if ($this->model->get_reports()) {
-                        $page_statusinfo[] = '<li class="reportlink"><span><strong><a href="'.get_link('admin/reports/').'">'.__('New reports').'</a></strong></span></li>';
-                    }
-                }
-
-                if ($this->config['o_maintenance'] == '1') {
-                    $page_statusinfo[] = '<li class="maintenancelink"><span><strong><a href="'.get_link('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>';
-                }
-            }
-
-            if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-                $page_topicsearches[] = '<a href="'.get_link('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a>';
-                $page_topicsearches[] = '<a href="'.get_link('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a>';
-            }
-        }
-
-        // Quick searches
-        if ($this->user->g_read_board == '1' && $this->user->g_search == '1') {
-            $page_topicsearches[] = '<a href="'.get_link('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a>';
-            $page_topicsearches[] = '<a href="'.get_link('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
-        }
-
-        // Generate all that jazz
-        $page_info = '<div id="brdwelcome" class="inbox">';
-
-        // The status information
-        if (is_array($page_statusinfo)) {
-            $page_info .= "\n\t\t\t".'<ul class="conl">';
-            $page_info .= "\n\t\t\t\t".implode("\n\t\t\t\t", $page_statusinfo);
-            $page_info .= "\n\t\t\t".'</ul>';
-        } else {
-            $page_info .= "\n\t\t\t".$page_statusinfo;
-        }
-
-        // Generate quicklinks
-        if (!empty($page_topicsearches)) {
-            $page_info .= "\n\t\t\t".'<ul class="conr">';
-            $page_info .= "\n\t\t\t\t".'<li><span>'.__('Topic searches').' '.implode(' | ', $page_topicsearches).'</span></li>';
-            $page_info .= "\n\t\t\t".'</ul>';
-        }
-
-        $page_info .= "\n\t\t\t".'<div class="clearer"></div>'."\n\t\t".'</div>';
-
-        return $page_info;
-    }
-
-    protected function getAdminConsole()
-    {
-        if ($this->admin_console === true) {
-            if (file_exists(FEATHER_ROOT.'style/'.$this->user->style.'/base_admin.css')) {
-                return '<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/'.$this->user->style.'/base_admin.css" />'."\n";
-            } else {
-                return '<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/imports/base_admin.css" />'."\n";
-            }
-        } else {
-            return '';
-        }
-    }
-}
diff --git a/controller/help.php b/controller/help.php
index 36f44c4e..45dff1bb 100644
--- a/controller/help.php
+++ b/controller/help.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/help.mo');
     }
 
@@ -34,12 +32,9 @@ public function display()
             message(__('No view'), '403');
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Help'));
-
-        $this->header->setTitle($page_title)->setActivePage('help')->display();
-
-        $this->feather->render('help.php');
-
-        $this->footer->display();
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->config['o_board_title']), __('Help')),
+            'active_page' => 'help',
+        ))->addTemplate('help.php')->display();
     }
 }
diff --git a/controller/index.php b/controller/index.php
index 40b06c76..df1c4c8d 100644
--- a/controller/index.php
+++ b/controller/index.php
@@ -30,7 +30,6 @@ public function display()
             'is_indexed' => true,
             'index_data' => $this->model->print_categories_forums(),
             'stats' => $this->model->collect_stats(),
-            'feather_config' => $this->feather->forum_settings,
             'online'    =>    $this->model->fetch_users_online(),
             'forum_actions'        =>    $this->model->get_forum_actions(),
             'cur_cat'   => 0
diff --git a/controller/install.php b/controller/install.php
index a083113e..0f1133be 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -115,7 +115,6 @@ public function run()
             if (!empty($this->errors)) {
                 $this->feather->view()->setTemplatesDirectory($this->feather->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
                 $this->feather->view()->display('install.php', array(
-                                                        'feather' => $this->feather,
                                                         'languages' => $this->available_langs,
                                                         'supported_dbs' => $this->supported_dbs,
                                                         'data' => $data,
@@ -137,7 +136,6 @@ public function run()
             }
             $this->feather->view()->setTemplatesDirectory($this->feather->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
             $this->feather->view()->display('install.php', array(
-                                                'feather' => $this->feather,
                                                 'languages' => $this->available_langs,
                                                 'supported_dbs' => $this->supported_dbs,
                                                 'data' => $data,
diff --git a/controller/login.php b/controller/login.php
index 669c6cd8..30c9c5f3 100644
--- a/controller/login.php
+++ b/controller/login.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\login();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/login.mo');
     }
@@ -39,18 +39,14 @@ public function display()
         // TODO?: Try to determine if the data in HTTP_REFERER is valid (if not, we redirect to index.php after login)
         $redirect_url = $this->model->get_redirect_url();
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Login'));
-        $required_fields = array('req_username' => __('Username'), 'req_password' => __('Password'));
-        $focus_element = array('login', 'req_username');
-
-        $this->header->setTitle($page_title)->setActivePage('login')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
-
-        $this->feather->render('login/form.php', array(
+        $this->feather->view2->setPageInfo(array(
                             'redirect_url'    =>    $redirect_url,
+                            'active_page' => 'login',
+                            'title' => array(feather_escape($this->config['o_board_title']), __('Login')),
+                            'required_fields' => array('req_username' => __('Username'), 'req_password' => __('Password')),
+                            'focus_element' => array('login', 'req_username'),
                             )
-                    );
-
-        $this->footer->display();
+                    )->addTemplate('login/form.php')->display();
     }
 
     public function logmein()
@@ -81,19 +77,13 @@ public function forget()
             exit;
         }
 
-        $errors = $this->model->password_forgotten();
-
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Request pass'));
-        $required_fields = array('req_email' => __('Email'));
-        $focus_element = array('request_pass', 'req_email');
-
-        $this->header->setTitle($page_title)->setActivePage('login')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
-
-        $this->feather->render('login/password_forgotten.php', array(
-                            'errors'    =>    $errors,
-                            )
-                    );
-
-        $this->footer->display();
+        $this->feather->view2->setPageInfo(array(
+                'errors'    =>    $this->model->password_forgotten(),
+                'active_page' => 'login',
+                'title' => array(feather_escape($this->config['o_board_title']), __('Request pass')),
+                'required_fields' => array('req_email' => __('Email')),
+                'focus_element' => array('request_pass', 'req_email'),
+            )
+        )->addTemplate('login/password_forgotten.php')->display();
     }
 }
diff --git a/controller/misc.php b/controller/misc.php
index 8ca7d4eb..914b0561 100644
--- a/controller/misc.php
+++ b/controller/misc.php
@@ -1,11 +1,11 @@
 <?php
 
 /**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
+* Copyright (C) 2015 FeatherBB
+* based on code by (C) 2008-2012 FluxBB
+* and Rickard Andersson (C) 2002-2008 PunBB
+* License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+*/
 
 namespace controller;
 
@@ -14,43 +14,26 @@ class misc
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\misc();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/misc.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/register.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/misc.mo');
     }
 
     public function rules()
     {
-        if ($this->config['o_rules'] == '0' || ($this->user->is_guest && $this->user->g_read_board == '0' && $this->config['o_regs_allow'] == '0')) {
+        if ($this->feather->forum_settings['o_rules'] == '0' || ($this->feather->user->is_guest && $this->feather->user->g_read_board == '0' && $this->feather->forum_settings['o_regs_allow'] == '0')) {
             message(__('Bad request'), '404');
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Forum rules'));
-
-        $this->header->setTitle($page_title)->setActivePage('rules')->display();
-
-        $this->feather->render('misc/rules.php', array(
-                'feather_config' => $this->config,
-                )
-        );
-
-        $this->footer->display();
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Forum rules')),
+            'active_page' => 'rules'
+            ))->addTemplate('misc/rules.php')->display();
     }
 
     public function markread()
     {
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             message(__('No permission'), '403');
         }
 
@@ -64,7 +47,7 @@ public function markread()
 
     public function markforumread($id)
     {
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             message(__('No permission'), '403');
         }
 
@@ -77,7 +60,7 @@ public function markforumread($id)
 
     public function subscribeforum($id)
     {
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             message(__('No permission'), '403');
         }
 
@@ -86,7 +69,7 @@ public function subscribeforum($id)
 
     public function subscribetopic($id)
     {
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             message(__('No permission'), '403');
         }
 
@@ -95,7 +78,7 @@ public function subscribetopic($id)
 
     public function unsubscribeforum($id)
     {
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             message(__('No permission'), '403');
         }
 
@@ -104,7 +87,7 @@ public function unsubscribeforum($id)
 
     public function unsubscribetopic($id)
     {
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             message(__('No permission'), '403');
         }
 
@@ -113,7 +96,7 @@ public function unsubscribetopic($id)
 
     public function email($id)
     {
-        if ($this->user->is_guest || $this->user->g_send_email == '0') {
+        if ($this->feather->user->is_guest || $this->feather->user->g_send_email == '0') {
             message(__('No permission'), '403');
         }
 
@@ -123,7 +106,7 @@ public function email($id)
 
         $mail = $this->model->get_info_mail($id);
 
-        if ($mail['email_setting'] == 2 && !$this->user->is_admmod) {
+        if ($mail['email_setting'] == 2 && !$this->feather->user->is_admmod) {
             message(__('Form email disabled'));
         }
 
@@ -132,24 +115,19 @@ public function email($id)
             $this->model->send_email($mail);
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Send email to').' '.feather_escape($mail['recipient']));
-        $required_fields = array('req_subject' => __('Email subject'), 'req_message' => __('Email message'));
-        $focus_element = array('email', 'req_subject');
-
-        $this->header->setTitle($page_title)->setActivePage('email')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
-
-        $this->feather->render('misc/email.php', array(
-                'id' => $id,
-                'mail' => $mail,
-                )
-        );
-
-        $this->footer->display();
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Send email to').' '.feather_escape($mail['recipient'])),
+            'active_page' => 'email',
+            'required_fields' => array('req_subject' => __('Email subject'), 'req_message' => __('Email message')),
+            'focus_element' => array('email', 'req_subject'),
+            'id' => $id,
+            'mail' => $mail
+            ))->addTemplate('misc/email.php')->display();
     }
 
     public function report($id)
     {
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             message(__('No permission'), '403');
         }
 
@@ -160,22 +138,17 @@ public function report($id)
         // Fetch some info about the post, the topic and the forum
         $cur_post = $this->model->get_info_report($id);
 
-        if ($this->config['o_censoring'] == '1') {
+        if ($this->feather->forum_settings['o_censoring'] == '1') {
             $cur_post['subject'] = censor_words($cur_post['subject']);
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Report post'));
-        $required_fields = array('req_reason' => __('Reason'));
-        $focus_element = array('report', 'req_reason');
-
-        $this->header->setTitle($page_title)->setActivePage('report')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
-
-        $this->feather->render('misc/report.php', array(
-                'id' => $id,
-                'cur_post' => $cur_post,
-                )
-        );
-
-        $this->footer->display();
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Report post')),
+            'active_page' => 'report',
+            'required_fields' => array('req_reason' => __('Reason')),
+            'focus_element' => array('report', 'req_reason'),
+            'id' => $id,
+            'cur_post' => $cur_post
+            ))->addTemplate('misc/report.php')->display();
     }
 }
diff --git a/controller/moderate.php b/controller/moderate.php
index 84d81727..7ea2a272 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\moderate();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/topic.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
@@ -105,19 +105,15 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->display();
-
-            $this->feather->render('moderate/move_topics.php', array(
+            $this->feather->view2->setPageInfo(array(
+                    'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                    'active_page' => 'moderate',
                     'action'    =>    'multi',
                     'id'    =>    $fid,
                     'topics'    =>    $topics,
                     'list_forums'   => $this->model->get_forum_list_move($fid),
                 )
-            );
-
-            $this->footer->display();
+            )->addTemplate('moderate/move_topics.php')->display();
         }
 
         // Stick a topic
@@ -163,19 +159,16 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->display();
-
-            $this->feather->render('moderate/move_topics.php', array(
+            $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                        'active_page' => 'moderate',
+                        'page' => $p,
                         'action'    =>    'single',
                         'id'    =>    $id,
                         'topics'    =>    $id,
                         'list_forums'   => $this->model->get_forum_list_move($fid),
                         )
-                );
-
-            $this->footer->display();
+                )->addTemplate('moderate/move_topics.php')->display();
         }
 
         // Moderate a topic
@@ -185,34 +178,28 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 if ($this->request->post('delete_posts') || $this->request->post('delete_posts_comply')) {
                     $posts = $this->model->delete_posts($id, $fid, $p);
 
-                    $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
-
-                    $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->display();
-
-                    $this->feather->render('moderate/delete_posts.php', array(
-                        'id' => $id,
-                        'posts' => $posts,
-                        )
-                    );
-
-                    $this->footer->display();
+                    $this->feather->view2->setPageInfo(array(
+                            'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                            'active_page' => 'moderate',
+                            'page' => $p,
+                            'id' => $id,
+                            'posts' => $posts,
+                        ))
+                        ->addTemplate('moderate/delete_posts.php')->display();
                 }
             if ($this->request->post('split_posts') || $this->request->post('split_posts_comply')) {
-                $posts = $this->model->split_posts($id, $fid, $p);
 
-                $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
-                $focus_element = array('subject','new_subject');
-
-                $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->setFocusElement($focus_element)->display();
-
-                $this->feather->render('moderate/split_posts.php', array(
+                $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                        'focus_element' => array('subject','new_subject'),
+                        'page' => $p,
+                        'active_page' => 'moderate',
                         'id' => $id,
-                        'posts' => $posts,
+                        'posts' => $this->model->split_posts($id, $fid, $p),
                         'list_forums' => $this->model->get_forum_list_split($id),
                         )
-                );
+                )->addTemplate('moderate/split_posts.php')->display();
 
-                $this->footer->display();
             }
 
                 // Show the moderate posts view
@@ -224,31 +211,25 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                         $this->user->disp_posts = $cur_topic['num_replies'] + 1;
                 }*/
 
-                // Generate paging links
-                $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/#');
-
             if ($this->config['o_censoring'] == '1') {
                 $cur_topic['subject'] = censor_words($cur_topic['subject']);
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject']));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->setPagingLinks($paging_links)->display();
-
-            $this->feather->render('moderate/posts_view.php', array(
+            $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject'])),
+                        'page' => $p,
+                        'active_page' => 'moderate',
                         'cur_topic' => $cur_topic,
                         'url_topic' => url_friendly($cur_topic['subject']),
                         'url_forum' => url_friendly($cur_topic['forum_name']),
                         'fid' => $fid,
                         'id' => $id,
-                        'paging_links' => $paging_links,
+                        'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/#'),
                         'post_data' => $this->model->display_posts_view($id, $start_from),
                         'button_status' => $button_status,
                         'start_from' => $start_from,
                         )
-                );
-
-            $this->footer->display();
+                )->addTemplate('moderate/posts_view.php')->display();
         }
     }
 
@@ -284,26 +265,21 @@ public function display($id, $name = null, $page = null)
         $start_from = $this->user->disp_topics * ($p - 1);
         $url_forum = url_friendly($cur_forum['forum_name']);
 
-        // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/forum/'.$id.'/#');
-
-        $page_title = array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name']));
-
-        $this->header->setTitle($page_title)->setActivePage('moderate')->setPage($p)->setPagingLinks($paging_links)->display();
-
-        $this->feather->render('moderate/moderator_forum.php', array(
+        $this->feather->view2->setPageInfo(array(
+                            'title' => array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name'])),
+                            'active_page' => 'moderate',
+                            'page' => $p,
                             'id' => $id,
                             'p' => $p,
                             'url_forum' => $url_forum,
                             'cur_forum' => $cur_forum,
-                            'paging_links' => $paging_links,
-                            'feather_config' => $this->config,
+                            'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/forum/'.$id.'/#'),
                             'topic_data' => $this->model->display_topics($id, $sort_by, $start_from),
                             'start_from' => $start_from,
                             )
-                    );
+                    )->addTemplate('moderate/moderator_forum.php')->display();
+
 
-        $this->footer->display();
     }
 
     public function dealposts($fid)
@@ -331,24 +307,18 @@ public function dealposts($fid)
                 message(__('No topics selected'));
             }
 
-            $topics = implode(',', array_map('intval', array_keys($topics)));
-
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->display();
-
-            $this->feather->render('moderate/move_topics.php', array(
+            $this->feather->view2->setPageInfo(array(
                         'action'    =>    'multi',
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                        'active_page' => 'moderate',
                         'id'    =>    $fid,
-                        'topics'    =>    $topics,
+                        'topics'    =>    implode(',', array_map('intval', array_keys($topics))),
                         'list_forums'   => $this->model->get_forum_list_move($fid),
                         )
-                );
-
-            $this->footer->display();
+                )->addTemplate('moderate/move_topics.php')->display();
         }
 
         // Merge two or more topics
@@ -362,17 +332,13 @@ public function dealposts($fid)
                 message(__('Not enough topics selected'));
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->display();
-
-            $this->feather->render('moderate/merge_topics.php', array(
+            $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                        'active_page' => 'moderate',
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
                         )
-                );
-
-            $this->footer->display();
+                )->addTemplate('moderate/merge_topics.php')->display();
         }
 
         // Delete one or more topics
@@ -386,17 +352,13 @@ public function dealposts($fid)
                 $this->model->delete_topics($topics, $fid);
             }
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Moderate'));
-
-            $this->header->setTitle($page_title)->setActivePage('moderate')->display();
-
-            $this->feather->render('moderate/delete_topics.php', array(
+            $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                        'active_page' => 'moderate',
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
                         )
-                );
-
-            $this->footer->display();
+                )->addTemplate('moderate/delete_topics.php')->display();
         }
 
 
diff --git a/controller/post.php b/controller/post.php
index 6c680faa..5400a9dc 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -14,23 +14,12 @@ class post
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\post();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/post.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/register.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/antispam.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/bbeditor.mo');
     }
 
     public function newreply($fid = null, $tid = null, $qid = null)
@@ -41,11 +30,11 @@ public function newreply($fid = null, $tid = null, $qid = null)
     public function newpost($fid = null, $tid = null, $qid = null)
     {
         // Antispam feature
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
         // If $_POST['username'] is filled, we are facing a bot
-        if ($this->request->post('username')) {
+        if ($this->feather->request->post('username')) {
             message(__('Bad request'), '404');
         }
 
@@ -61,11 +50,11 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
         $mods_array = ($cur_posting['moderators'] != '') ? unserialize($cur_posting['moderators']) : array();
-        $is_admmod = ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && array_key_exists($this->user->username, $mods_array))) ? true : false;
+        $is_admmod = ($this->feather->user->g_id == FEATHER_ADMIN || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
 
         // Do we have permission to post?
-        if ((($tid && (($cur_posting['post_replies'] == '' && $this->user->g_post_replies == '0') || $cur_posting['post_replies'] == '0')) ||
-                ($fid && (($cur_posting['post_topics'] == '' && $this->user->g_post_topics == '0') || $cur_posting['post_topics'] == '0')) ||
+        if ((($tid && (($cur_posting['post_replies'] == '' && $this->feather->user->g_post_replies == '0') || $cur_posting['post_replies'] == '0')) ||
+                ($fid && (($cur_posting['post_topics'] == '' && $this->feather->user->g_post_topics == '0') || $cur_posting['post_topics'] == '0')) ||
                 (isset($cur_posting['closed']) && $cur_posting['closed'] == '1')) &&
                 !$is_admmod) {
             message(__('No permission'), '403');
@@ -80,14 +69,14 @@ public function newpost($fid = null, $tid = null, $qid = null)
         if ($this->feather->request()->isPost()) {
 
                 // Include $pid and $page if needed for confirm_referrer function called in check_errors_before_post()
-                if ($this->request->post('pid')) {
-                    $pid = $this->request->post('pid');
+                if ($this->feather->request->post('pid')) {
+                    $pid = $this->feather->request->post('pid');
                 } else {
                     $pid = '';
                 }
 
-            if ($this->request->post('page')) {
-                $page = $this->request->post('page');
+            if ($this->feather->request->post('page')) {
+                $page = $this->feather->request->post('page');
             } else {
                 $page = '';
             }
@@ -99,14 +88,14 @@ public function newpost($fid = null, $tid = null, $qid = null)
                 $post = $this->model->setup_variables($errors, $is_admmod);
 
                 // Did everything go according to plan?
-                if (empty($errors) && !$this->request->post('preview')) {
+                if (empty($errors) && !$this->feather->request->post('preview')) {
                         // If it's a reply
                         if ($tid) {
                             // Insert the reply, get the new_pid
                                 $new = $this->model->insert_reply($post, $tid, $cur_posting, $is_subscribed);
 
                                 // Should we send out notifications?
-                                if ($this->config['o_topic_subscriptions'] == '1') {
+                                if ($this->feather->forum_settings['o_topic_subscriptions'] == '1') {
                                     $this->model->send_notifications_reply($tid, $cur_posting, $new['pid'], $post);
                                 }
                         }
@@ -116,18 +105,18 @@ public function newpost($fid = null, $tid = null, $qid = null)
                                 $new = $this->model->insert_topic($post, $fid);
 
                                 // Should we send out notifications?
-                                if ($this->config['o_forum_subscriptions'] == '1') {
+                                if ($this->feather->forum_settings['o_forum_subscriptions'] == '1') {
                                     $this->model->send_notifications_new_topic($post, $cur_posting, $new['tid']);
                                 }
                         }
 
                         // If we previously found out that the email was banned
-                        if ($this->user->is_guest && isset($errors['banned_email']) && $this->config['o_mailing_list'] != '') {
+                        if ($this->feather->user->is_guest && isset($errors['banned_email']) && $this->feather->forum_settings['o_mailing_list'] != '') {
                             $this->model->warn_banned_user($post, $new['pid']);
                         }
 
                         // If the posting user is logged in, increment his/her post count
-                        if (!$this->user->is_guest) {
+                        if (!$this->feather->user->is_guest) {
                             $this->model->increment_post_count($post, $new['tid']);
                         }
 
@@ -166,28 +155,25 @@ public function newpost($fid = null, $tid = null, $qid = null)
             $url_topic = '';
         }
 
-        $page_title = array(feather_escape($this->config['o_board_title']), $action);
         $required_fields = array('req_email' => __('Email'), 'req_subject' => __('Subject'), 'req_message' => __('Message'));
-        if ($this->user->is_guest) {
+        if ($this->feather->user->is_guest) {
             $required_fields['captcha'] = __('Robot title');
         }
 
         // Set focus element (new post or new reply to an existing post ?)
         $focus_element[] = 'post';
-        if (!$this->user->is_guest) {
+        if (!$this->feather->user->is_guest) {
             $focus_element[] = ($fid) ? 'req_subject' : 'req_message';
         } else {
             $required_fields['req_username'] = __('Guest name');
             $focus_element[] = 'req_username';
         }
 
-        $this->header->setTitle($page_title)->setActivePage('post')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
-
         // Get the current state of checkboxes
         $checkboxes = $this->model->get_checkboxes($fid, $is_admmod, $is_subscribed);
 
         // Check to see if the topic review is to be displayed
-        if ($tid && $this->config['o_topic_review'] != '0') {
+        if ($tid && $this->feather->forum_settings['o_topic_review'] != '0') {
             $post_data = $this->model->topic_review($tid);
         } else {
             $post_data = '';
@@ -212,20 +198,20 @@ public function newpost($fid = null, $tid = null, $qid = null)
             'promptQuote' => __('promptQuote')
         );
 
-        $this->feather->render('post.php', array(
+        $this->feather->view2->setPageInfo(array(
+                            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), $action),
+                            'required_fields' => $required_fields,
+                            'focus_element' => $focus_element,
+                            'active_page' => 'post',
                             'post' => $post,
                             'tid' => $tid,
                             'fid' => $fid,
-                            'feather_config' => $this->config,
-                            'feather_user' => $this->user,
                             'cur_posting' => $cur_posting,
                             'lang_antispam' => $lang_antispam,
                             'lang_antispam_questions' => $lang_antispam_questions,
                             'lang_bbeditor'    =>    $lang_bbeditor,
                             'index_questions' => $index_questions,
                             'checkboxes' => $checkboxes,
-                            'cur_posting' => $cur_posting,
-                            'feather' => $this->feather,
                             'action' => $action,
                             'form' => $form,
                             'post_data' => $post_data,
@@ -233,9 +219,6 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             'url_topic' => $url_topic,
                             'quote' => $quote,
                             'errors'    =>    $errors,
-                            )
-                    );
-
-        $this->footer->display();
+                            ))->addTemplate('post.php')->display();
     }
 }
diff --git a/controller/register.php b/controller/register.php
index ef580e88..b1016b99 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\register();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
@@ -62,24 +62,19 @@ public function display()
             }
         }
 
-        $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->config['o_board_title']), __('Register')),
-            'focus_element' => array('register', 'req_user'),
-            'required_fields' => array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => __('Confirm pass'), 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => __('Robot title')),
-            'active_page' => 'register',
-            'is_indexed' => true,
-        ));
-
-        $this->feather->view2->display('register/form.php', array(
-                            'errors' => $user['errors'],
-                            'feather_config' => $this->config,
-                            'index_questions'    =>    $index_questions,
-                            'feather'    =>    $this->feather,
-                            'languages' => forum_list_langs(),
-                            'question' => array_keys($lang_antispam_questions),
-                            'qencoded' => md5(array_keys($lang_antispam_questions)[$index_questions]),
+            $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Register')),
+                        'focus_element' => array('register', 'req_user'),
+                        'required_fields' => array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => __('Confirm pass'), 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => __('Robot title')),
+                        'active_page' => 'register',
+                        'is_indexed' => true,
+                        'errors' => $user['errors'],
+                        'index_questions'    =>    $index_questions,
+                        'languages' => forum_list_langs(),
+                        'question' => array_keys($lang_antispam_questions),
+                        'qencoded' => md5(array_keys($lang_antispam_questions)[$index_questions]),
                             )
-                    );
+                    )->addTemplate('register/form.php')->display();
     }
 
     public function cancel()
@@ -107,13 +102,9 @@ public function rules()
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->config['o_board_title']), __('Register'), __('Forum rules')),
-            'active_page' => 'register',
-        ));
-
-        $this->feather->view2->display('register/rules.php', array(
-                            'feather_config'    =>    $this->config,
+                            'title' => array(feather_escape($this->config['o_board_title']), __('Register'), __('Forum rules')),
+                            'active_page' => 'register',
                             )
-                    );
+                    )->addTemplate('register/rules.php')->display();
     }
 }
diff --git a/controller/search.php b/controller/search.php
index 5d91d5d5..f5361e1d 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
+
+
         $this->model = new \model\search();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/search.mo');
@@ -47,45 +47,47 @@ public function display()
 
                 // We have results to display
                 if (isset($search['is_result'])) {
-                    $page_title = array(feather_escape($this->config['o_board_title']), __('Search results'));
-
-                    $this->header->setTitle($page_title)->setActivePage('search')->display();
-
-                    $this->feather->render('search/header.php', array(
-                                'search' => $search,
-                                )
-                        );
 
                     if ($search['show_as'] == 'posts') {
                         require FEATHER_ROOT.'include/parser.php';
                     }
 
+                    $this->feather->view2->setPageInfo(array(
+                        'title' => array(feather_escape($this->config['o_board_title']), __('Search results')),
+                        'active_page' => 'search',
+                    ));
+
                     $this->model->display_search_results($search, $this->feather);
 
-                    $this->feather->render('search/footer.php', array(
-                                'search' => $search,
-                                )
-                        );
+                    $this->feather->view2->setPageInfo(array(
+                        'search' => $search,
+                    ));
+
+                    $this->feather->view2->addTemplate('search/header.php', 1);
+
+                    if ($search['show_as'] == 'posts') {
+                        $this->feather->view2->addTemplate('search/posts.php', 5);
+                    }
+                    else {
+                        $this->feather->view2->addTemplate('search/topics.php', 5);
+                    }
+
+                    $this->feather->view2->addTemplate('search/footer.php', 10)->display();
 
-                    $this->footer->display();
                 } else {
                     message(__('No hits'));
                 }
         }
-
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Search'));
-        $focus_element = array('search', 'keywords');
-
-        $this->header->setTitle($page_title)->setActivePage('search')->setFocusElement($focus_element)->display();
-
-        $this->feather->render('search/form.php', array(
-                            'feather_config' => $this->config,
-                            'feather' => $this->feather,
-                            'forums' => $this->model->get_list_forums(),
-                            )
-                    );
-
-        $this->footer->display();
+        // Display the form
+        else {
+            $this->feather->view2->setPageInfo(array(
+                'title' => array(feather_escape($this->config['o_board_title']), __('Search')),
+                'active_page' => 'search',
+                'focus_element' => array('search', 'keywords'),
+                'is_indexed' => true,
+                'forums' => $this->model->get_list_forums(),
+            ))->addTemplate('search/form.php')->display();
+        }
     }
 
     public function quicksearches($show)
diff --git a/controller/userlist.php b/controller/userlist.php
index 44a42e5d..671724dc 100644
--- a/controller/userlist.php
+++ b/controller/userlist.php
@@ -14,47 +14,36 @@ class userlist
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\userlist();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/search.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/userlist.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/search.mo');
     }
 
     public function display()
     {
-        if ($this->user->g_read_board == '0') {
+        if ($this->feather->user->g_read_board == '0') {
             message(__('No view'), '403');
-        } elseif ($this->user->g_view_users == '0') {
+        } elseif ($this->feather->user->g_view_users == '0') {
             message(__('No permission'), '403');
         }
 
         // Determine if we are allowed to view post counts
-        $show_post_count = ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) ? true : false;
+        $show_post_count = ($this->feather->forum_settings['o_show_post_count'] == '1' || $this->feather->user->is_admmod) ? true : false;
 
-        $username = $this->request->get('username') && $this->user->g_search_users == '1' ? feather_trim($this->request->get('username')) : '';
-        $show_group = $this->request->get('show_group') ? intval($this->request->get('show_group')) : -1;
-        $sort_by = $this->request->get('sort_by') && (in_array($this->request->get('sort_by'), array('username', 'registered')) || ($this->request->get('sort_by') == 'num_posts' && $show_post_count)) ? $this->request->get('sort_by') : 'username';
-        $sort_dir = $this->request->get('sort_dir') && $this->request->get('sort_dir') == 'DESC' ? 'DESC' : 'ASC';
+        $username = $this->feather->request->get('username') && $this->feather->user->g_search_users == '1' ? feather_trim($this->feather->request->get('username')) : '';
+        $show_group = $this->feather->request->get('show_group') ? intval($this->feather->request->get('show_group')) : -1;
+        $sort_by = $this->feather->request->get('sort_by') && (in_array($this->feather->request->get('sort_by'), array('username', 'registered')) || ($this->feather->request->get('sort_by') == 'num_posts' && $show_post_count)) ? $this->feather->request->get('sort_by') : 'username';
+        $sort_dir = $this->feather->request->get('sort_dir') && $this->feather->request->get('sort_dir') == 'DESC' ? 'DESC' : 'ASC';
 
         $num_users = $this->model->fetch_user_count($username, $show_group);
 
         // Determine the user offset (based on $page)
         $num_pages = ceil($num_users / 50);
 
-        $p = (!$this->request->get('p') || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
+        $p = (!$this->feather->request->get('p') || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
         $start_from = 50 * ($p - 1);
 
-        if ($this->user->g_search_users == '1') {
+        if ($this->feather->user->g_search_users == '1') {
             $focus_element = array('userlist', 'username');
         }
         else {
@@ -65,26 +54,19 @@ public function display()
         $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->config['o_board_title']), __('User list')),
+            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('User list')),
             'active_page' => 'userlist',
             'page_number'  =>  $p,
             'paging_links'  =>  $paging_links,
             'focus_element' => $focus_element,
             'is_indexed' => true,
-        ));
-
-        $this->feather->view2->display('userlist.php', array(
-                            'feather' => $this->feather,
-                            'username' => $username,
-                            'show_group' => $show_group,
-                            'sort_by' => $sort_by,
-                            'sort_dir' => $sort_dir,
-                            'show_post_count' => $show_post_count,
-                            'paging_links' => $paging_links,
-                            'feather_config' => $this->config,
-                            'dropdown_menu' => $this->model->generate_dropdown_menu($show_group),
-                            'userlist_data' => $this->model->print_users($username, $start_from, $sort_by, $sort_dir, $show_group),
-                            )
-                    );
+            'username' => $username,
+            'show_group' => $show_group,
+            'sort_by' => $sort_by,
+            'sort_dir' => $sort_dir,
+            'show_post_count' => $show_post_count,
+            'dropdown_menu' => $this->model->generate_dropdown_menu($show_group),
+            'userlist_data' => $this->model->print_users($username, $start_from, $sort_by, $sort_dir, $show_group),
+        ))->addTemplate('userlist.php')->display();
     }
 }
diff --git a/controller/viewforum.php b/controller/viewforum.php
index 032c58ab..7206f604 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -14,12 +14,6 @@ class viewforum
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\viewforum();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
     }
@@ -31,7 +25,7 @@ public function __autoload($class_name)
 
     public function display($id, $name = null, $page = null)
     {
-        if ($this->user->g_read_board == '0') {
+        if ($this->feather->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
 
@@ -50,50 +44,59 @@ public function display($id, $name = null, $page = null)
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
         $mods_array = ($cur_forum['moderators'] != '') ? unserialize($cur_forum['moderators']) : array();
-        $is_admmod = ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && array_key_exists($this->user->username, $mods_array))) ? true : false;
+        $is_admmod = ($this->feather->user->g_id == FEATHER_ADMIN || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
 
         $sort_by = $this->model->sort_forum_by($cur_forum['sort_by']);
 
         // Can we or can we not post new topics?
-        if (($cur_forum['post_topics'] == '' && $this->user->g_post_topics == '1') || $cur_forum['post_topics'] == '1' || $is_admmod) {
+        if (($cur_forum['post_topics'] == '' && $this->feather->user->g_post_topics == '1') || $cur_forum['post_topics'] == '1' || $is_admmod) {
             $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/new-topic/'.$id.'/').'">'.__('Post topic').'</a></p>'."\n";
         } else {
             $post_link = '';
         }
 
         // Determine the topic offset (based on $page)
-        $num_pages = ceil($cur_forum['num_topics'] / $this->user->disp_topics);
+        $num_pages = ceil($cur_forum['num_topics'] / $this->feather->user->disp_topics);
 
         $p = (!isset($page) || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
-        $start_from = $this->user->disp_topics * ($p - 1);
+        $start_from = $this->feather->user->disp_topics * ($p - 1);
         $url_forum = url_friendly($cur_forum['forum_name']);
 
         // Generate paging links
         $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'forum/'.$id.'/'.$url_forum.'/#');
 
-        $forum_actions = $this->model->get_forum_actions($id, $this->config['o_forum_subscriptions'], $cur_forum['is_subscribed']);
+        $forum_actions = $this->model->get_forum_actions($id, $this->feather->forum_settings['o_forum_subscriptions'], $cur_forum['is_subscribed']);
+
+        $this->feather->view2->addAsset('canonical', get_link('forum/'.$id.'/'.$url_forum.'/'));
+        if ($num_pages > 1) {
+            if ($p > 1) {
+                $this->feather->view2->addAsset('prev', get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
+            }
+            if ($p < $num_pages) {
+                $this->feather->view2->addAsset('next', get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
+            }
+        }
+
+        if ($this->feather->forum_settings['o_feed_type'] == '1') {
+            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=rss', array('title' => __('RSS forum feed')));
+        } elseif ($this->feather->forum_settings['o_feed_type'] == '2') {
+            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=atom', array('title' => __('Atom forum feed')));
+        }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name'])),
+            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), feather_escape($cur_forum['forum_name'])),
             'active_page' => 'viewforum',
             'page_number'  =>  $p,
             'paging_links'  =>  $paging_links,
-            'page_head'  =>  $this->model->get_page_head($id, $num_pages, $p, $url_forum),
             'is_indexed' => true,
-        ));
-
-        $this->feather->view2->display('viewforum.php', array(
-                            'id' => $id,
-                            'forum_data' => $this->model->print_topics($id, $sort_by, $start_from),
-                            'cur_forum' => $cur_forum,
-                            'paging_links' => $paging_links,
-                            'post_link' => $post_link,
-                            'is_admmod' => $is_admmod,
-                            'start_from' => $start_from,
-                            'url_forum' => $url_forum,
-                            'forum_actions' => $forum_actions,
-                            'feather_config' => $this->config,
-                            )
-                    );
+            'id' => $id,
+            'fid' => $id,
+            'forum_data' => $this->model->print_topics($id, $sort_by, $start_from),
+            'cur_forum' => $cur_forum,
+            'post_link' => $post_link,
+            'start_from' => $start_from,
+            'url_forum' => $url_forum,
+            'forum_actions' => $forum_actions,
+        ))->addTemplate('viewforum.php')->display();
     }
 }
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index 8bba869e..6abdf274 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -14,44 +14,30 @@ class viewtopic
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->header = new \controller\header();
-        $this->footer = new \controller\footer();
         $this->model = new \model\viewtopic();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/topic.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/topic.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/post.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/bbeditor.mo');
     }
 
     public function display($id = null, $name = null, $page = null, $pid = null)
     {
         global $pd;
 
-        if ($this->user->g_read_board == '0') {
+        if ($this->feather->user->g_read_board == '0') {
             message(__('No view'), '403');
         }
 
         // Antispam feature
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
-        // Load the viewtopic.php model file
-        require_once FEATHER_ROOT.'model/viewtopic.php';
-
         // Fetch some informations about the topic
         $cur_topic = $this->model->get_info_topic($id);
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
         $mods_array = ($cur_topic['moderators'] != '') ? unserialize($cur_topic['moderators']) : array();
-        $is_admmod = ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && array_key_exists($this->user->username, $mods_array))) ? true : false;
+        $is_admmod = ($this->feather->user->g_id == FEATHER_ADMIN || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
         if ($is_admmod) {
             $admin_ids = get_admin_ids();
         }
@@ -60,17 +46,17 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         $post_link = $this->model->get_post_link($id, $cur_topic['closed'], $cur_topic['post_replies'], $is_admmod);
 
         // Add/update this topic in our list of tracked topics
-        if (!$this->user->is_guest) {
+        if (!$this->feather->user->is_guest) {
             $tracked_topics = get_tracked_topics();
             $tracked_topics['topics'][$id] = time();
             set_tracked_topics($tracked_topics);
         }
 
         // Determine the post offset (based on $_GET['p'])
-        $num_pages = ceil(($cur_topic['num_replies'] + 1) / $this->user->disp_posts);
+        $num_pages = ceil(($cur_topic['num_replies'] + 1) / $this->feather->user->disp_posts);
 
         $p = (!isset($page) || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
-        $start_from = $this->user->disp_posts * ($p - 1);
+        $start_from = $this->feather->user->disp_posts * ($p - 1);
 
         $url_topic = url_friendly($cur_topic['subject']);
         $url_forum = url_friendly($cur_topic['forum_name']);
@@ -78,25 +64,14 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         // Generate paging links
         $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'topic/'.$id.'/'.$url_topic.'/#');
 
-        if ($this->config['o_censoring'] == '1') {
+        if ($this->feather->forum_settings['o_censoring'] == '1') {
             $cur_topic['subject'] = censor_words($cur_topic['subject']);
         }
 
         $quickpost = $this->model->is_quickpost($cur_topic['post_replies'], $cur_topic['closed'], $is_admmod);
-
         $subscraction = $this->model->get_subscraction($cur_topic['is_subscribed'], $id);
 
-        $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->config['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject'])),
-            'active_page' => 'viewtopic',
-            'page_number'  =>  $p,
-            'paging_links'  =>  $paging_links,
-            'page_head'  =>  $this->model->get_page_head($id, $num_pages, $p, $url_topic),
-            'is_indexed' => true,
-        ));
-
-        require FEATHER_ROOT.'include/parser.php';
-
+        require $this->feather->forum_env['FEATHER_ROOT'].'include/parser.php';
         $lang_bbeditor = array(
             'btnBold' => __('btnBold'),
             'btnItalic' => __('btnItalic'),
@@ -116,28 +91,45 @@ public function display($id = null, $name = null, $page = null, $pid = null)
             'promptQuote' => __('promptQuote')
         );
 
-        $this->feather->view2->display('viewtopic.php', array(
-                            'id' => $id,
-                            'p' => $p,
-                            'post_data' => $this->model->print_posts($id, $start_from, $cur_topic, $is_admmod),
-                            'cur_topic'    =>    $cur_topic,
-                            'subscraction'    =>    $subscraction,
-                            'is_admmod'    =>    $is_admmod,
-                            'feather_config' => $this->config,
-                            'paging_links' => $paging_links,
-                            'post_link' => $post_link,
-                            'start_from' => $start_from,
-                            'lang_antispam' => $lang_antispam,
-                            'pid' => $pid,
-                            'quickpost'        =>    $quickpost,
-                            'index_questions'        =>    $index_questions,
-                            'lang_antispam_questions'        =>    $lang_antispam_questions,
-                            'lang_bbeditor'    =>    $lang_bbeditor,
-                            'url_forum'        =>    $url_forum,
-                            'url_topic'        =>    $url_topic,
-                            'feather'          =>    $this->feather,
-                            )
-                    );
+        $this->feather->view2->addAsset('canonical', get_link('forum/'.$id.'/'.$url_forum.'/'));
+        if ($num_pages > 1) {
+            if ($p > 1) {
+                $this->feather->view2->addAsset('prev', get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
+            }
+            if ($p < $num_pages) {
+                $this->feather->view2->addAsset('next', get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
+            }
+        }
+
+        if ($this->feather->forum_settings['o_feed_type'] == '1') {
+            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=rss', array('title' => __('RSS forum feed')));
+        } elseif ($this->feather->forum_settings['o_feed_type'] == '2') {
+            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=atom', array('title' => __('Atom forum feed')));
+        }
+
+        $this->feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject'])),
+            'active_page' => 'viewtopic',
+            'page_number'  =>  $p,
+            'paging_links'  =>  $paging_links,
+            'is_indexed' => true,
+            'id' => $id,
+            'pid' => $pid,
+            'tid' => $id,
+            'fid' => $cur_topic['forum_id'],
+            'post_data' => $this->model->print_posts($id, $start_from, $cur_topic, $is_admmod),
+            'cur_topic'    =>    $cur_topic,
+            'subscraction'    =>    $subscraction,
+            'post_link' => $post_link,
+            'start_from' => $start_from,
+            'lang_antispam' => $lang_antispam,
+            'quickpost'        =>    $quickpost,
+            'index_questions'        =>    $index_questions,
+            'lang_antispam_questions'        =>    $lang_antispam_questions,
+            'lang_bbeditor'    =>    $lang_bbeditor,
+            'url_forum'        =>    $url_forum,
+            'url_topic'        =>    $url_topic,
+        ))->addTemplate('viewtopic.php')->display();
 
         // Increment "num_views" for topic
         $this->model->increment_views($id);
diff --git a/extern.php b/extern.php
index cd24d1a6..656aa1ea 100644
--- a/extern.php
+++ b/extern.php
@@ -57,26 +57,23 @@
 
 define('FEATHER_QUIET_VISIT', 1);
 
-if (!defined('FEATHER_ROOT')) {
-    define('FEATHER_ROOT', dirname(__FILE__).'/');
-}
-
 // Load Slim Framework
 require 'Slim/Slim.php';
 \Slim\Slim::registerAutoloader();
 
-// Instantiate Slim
-$feather = new \Slim\Slim();
+// Load FeatherBB
+require 'include/classes/autoload.class.php';
+\FeatherBB\Loader::registerAutoloader();
 
-// Load the config
-require 'include/config.php';
-
-// Load middlewares
-$feather->add(new \Slim\Extras\Middleware\CsrfGuard('featherbb_csrf')); // CSRF
-$feather->add(new \Slim\Extras\Middleware\FeatherBB($feather_user_settings)); // FeatherBB
+// Instantiate Slim and add CSRF
+$feather = new \Slim\Slim();
+$feather->add(new \FeatherBB\Csrf());
 
-$feather->config('cookies.encrypt', true);
-$feather->config('debug', true); // As long as we're developing FeatherBB
+$feather_settings = array('config_file' => 'include/config.php',
+    'cache_dir' => 'cache/',
+    'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
+$feather->add(new \FeatherBB\Auth());
+$feather->add(new \FeatherBB\Core($feather_settings));
 
 load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/common.mo');
 load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/index.mo');
@@ -139,8 +136,6 @@ function get_current_url($max_length = 0)
 //
 function set_default_user()
 {
-    global $feather_config;
-
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
 
@@ -188,12 +183,12 @@ function set_default_user()
             ->update_many('logged', time());
     }
 
-    $feather->user->disp_topics = $feather_config['o_disp_topics_default'];
-    $feather->user->disp_posts = $feather_config['o_disp_posts_default'];
-    $feather->user->timezone = $feather_config['o_default_timezone'];
-    $feather->user->dst = $feather_config['o_default_dst'];
-    $feather->user->language = $feather_config['o_default_lang'];
-    $feather->user->style = $feather_config['o_default_style'];
+    $feather->user->disp_topics = $feather->forum_settings['o_disp_topics_default'];
+    $feather->user->disp_posts = $feather->forum_settings['o_disp_posts_default'];
+    $feather->user->timezone = $feather->forum_settings['o_default_timezone'];
+    $feather->user->dst = $feather->forum_settings['o_default_dst'];
+    $feather->user->language = $feather->forum_settings['o_default_lang'];
+    $feather->user->style = $feather->forum_settings['o_default_style'];
     $feather->user->is_guest = true;
     $feather->user->is_admmod = false;
 }
@@ -266,13 +261,13 @@ function authenticate_user($user, $password, $password_is_hash = false)
 //
 function http_authenticate_user()
 {
-    global $feather_config, $feather;
+    global $feather;
 
     if (!$feather->user->is_guest) {
         return;
     }
 
-    header('WWW-Authenticate: Basic realm="'.$feather_config['o_board_title'].' External Syndication"');
+    header('WWW-Authenticate: Basic realm="'.$feather->forum_settings['o_board_title'].' External Syndication"');
     header('HTTP/1.0 401 Unauthorized');
 }
 
@@ -282,8 +277,6 @@ function http_authenticate_user()
 //
 function output_rss($feed)
 {
-    global $feather_config;
-
     // Send XML/no cache headers
     header('Content-Type: application/xml; charset=utf-8');
     header('Expires: '.gmdate('D, d M Y H:i:s').' GMT');
@@ -299,8 +292,8 @@ function output_rss($feed)
     echo "\t\t".'<description><![CDATA['.escape_cdata($feed['description']).']]></description>'."\n";
     echo "\t\t".'<lastBuildDate>'.gmdate('r', count($feed['items']) ? $feed['items'][0]['pubdate'] : time()).'</lastBuildDate>'."\n";
 
-    if ($feather_config['o_show_version'] == '1') {
-        echo "\t\t".'<generator>FeatherBB '.$feather_config['o_cur_version'].'</generator>'."\n";
+    if ($feather->forum_settings['o_show_version'] == '1') {
+        echo "\t\t".'<generator>FeatherBB '.$feather->forum_settings['o_cur_version'].'</generator>'."\n";
     } else {
         echo "\t\t".'<generator>FeatherBB</generator>'."\n";
     }
@@ -327,8 +320,6 @@ function output_rss($feed)
 //
 function output_atom($feed)
 {
-    global $feather_config;
-
     // Send XML/no cache headers
     header('Content-Type: application/atom+xml; charset=utf-8');
     header('Expires: '.gmdate('D, d M Y H:i:s').' GMT');
@@ -343,8 +334,8 @@ function output_atom($feed)
     echo "\t".'<link href="'.feather_escape($feed['link']).'"/>'."\n";
     echo "\t".'<updated>'.gmdate('Y-m-d\TH:i:s\Z', count($feed['items']) ? $feed['items'][0]['pubdate'] : time()).'</updated>'."\n";
 
-    if ($feather_config['o_show_version'] == '1') {
-        echo "\t".'<generator version="'.$feather_config['o_cur_version'].'">FluxBB</generator>'."\n";
+    if ($feather->forum_settings['o_show_version'] == '1') {
+        echo "\t".'<generator version="'.$feather->forum_settings['o_cur_version'].'">FluxBB</generator>'."\n";
     } else {
         echo "\t".'<generator>FluxBB</generator>'."\n";
     }
@@ -385,8 +376,6 @@ function output_atom($feed)
 //
 function output_xml($feed)
 {
-    global $feather_config;
-
     // Send XML/no cache headers
     header('Content-Type: application/xml; charset=utf-8');
     header('Expires: '.gmdate('D, d M Y H:i:s').' GMT');
@@ -488,13 +477,13 @@ function output_html($feed)
             exit(__('Bad request'));
         }
 
-        if ($feather_config['o_censoring'] == '1') {
+        if ($feather->forum_settings['o_censoring'] == '1') {
             $cur_topic['subject'] = censor_words($cur_topic['subject']);
         }
 
         // Setup the feed
         $feed = array(
-            'title'        =>    $feather_config['o_board_title'].__('Title separator').$cur_topic['subject'],
+            'title'        =>    $feather->forum_settings['o_board_title'].__('Title separator').$cur_topic['subject'],
             'link'            =>    get_link('topic/'.$tid.'/'.url_friendly($cur_topic['subject']).'/'),
             'description'        =>    sprintf(__('RSS description topic'), $cur_topic['subject']),
             'items'            =>    array(),
@@ -589,7 +578,7 @@ function output_html($feed)
         }
 
         // Only attempt to cache if caching is enabled and we have all or a single forum
-        if ($feather_config['o_feed_ttl'] > 0 && ($forum_sql == '' || ($forum_name != '' && !isset($_GET['nfid'])))) {
+        if ($feather->forum_settings['o_feed_ttl'] > 0 && ($forum_sql == '' || ($forum_name != '' && !isset($_GET['nfid'])))) {
             $cache_id = 'feed'.sha1($feather->user->g_id.'|'.__('lang_identifier').'|'.($order_posted ? '1' : '0').($forum_name == '' ? '' : '|'.$fids[0]));
         }
 
@@ -602,9 +591,9 @@ function output_html($feed)
         if (!isset($feed) || $cache_expire < $now) {
             // Setup the feed
             $feed = array(
-                'title'        =>    $feather_config['o_board_title'].$forum_name,
+                'title'        =>    $feather->forum_settings['o_board_title'].$forum_name,
                 'link'            =>    '/index.php',
-                'description'    =>    sprintf(__('RSS description'), $feather_config['o_board_title']),
+                'description'    =>    sprintf(__('RSS description'), $feather->forum_settings['o_board_title']),
                 'items'            =>    array(),
                 'type'            =>    'topics'
             );
@@ -628,7 +617,7 @@ function output_html($feed)
                         ->find_array();
 
             foreach ($result as $cur_topic) {
-                if ($feather_config['o_censoring'] == '1') {
+                if ($feather->forum_settings['o_censoring'] == '1') {
                     $cur_topic['subject'] = censor_words($cur_topic['subject']);
                 }
 
@@ -664,7 +653,7 @@ function output_html($feed)
                     require FEATHER_ROOT.'include/cache.php';
                 }
 
-                $content = '<?php'."\n\n".'$feed = '.var_export($feed, true).';'."\n\n".'$cache_expire = '.($now + ($feather_config['o_feed_ttl'] * 60)).';'."\n\n".'?>';
+                $content = '<?php'."\n\n".'$feed = '.var_export($feed, true).';'."\n\n".'$cache_expire = '.($now + ($feather->forum_settings['o_feed_ttl'] * 60)).';'."\n\n".'?>';
                 featherbb_write_cache_file('cache_'.$cache_id.'.php', $content);
             }
         }
diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index 4d93a4c1..64d1f82d 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -194,25 +194,15 @@ public function maintenance_message()
         $replace = array('&#160; &#160; ', '&#160; ', ' &#160;');
         $message = str_replace($pattern, $replace, $this->app->forum_settings['o_maintenance_message']);
 
-        $page_title = array(feather_escape($this->app->forum_settings['o_board_title']), __('Maintenance'));
-
-        $this->app->config('templates.path', (is_dir('style/'.$this->app->user->style.'/view')) ? $this->app->forum_env['FEATHER_ROOT'].'style/'.$this->app->user->style.'/view' : $this->app->forum_env['FEATHER_ROOT'].'view');
-
-        $header = new \controller\header();
-
-        $header->setTitle($page_title)->setActivePage('index')->display();
-
-        $this->app->render('message.php', array(
-                'message'    =>    $message,
-                'no_back_link'    =>    '',
-            )
-        );
-
-        $footer = new \controller\footer();
-
-        $footer->dontStop();
-
-        $footer->display();
+        $this->app->view2->setPageInfo(array(
+            'title' => array(feather_escape($this->app->forum_settings['o_board_title']), __('Maintenance')),
+            'active_page' => 'index',
+            'message'    =>    $message,
+            'no_back_link'    =>    '',
+        ))->addTemplate('message.php')->display();
+
+        // Don't display anything after a message
+        $this->app->stop();
     }
 
     public function call()
diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index bcba7571..0b175c9c 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -205,6 +205,9 @@ public function call()
             return new \FeatherBB\Email();
         });
 
+        // This is the very first hook fired
+        $this->app->hooks->fire('core.start');
+
         if (!is_file($this->forum_env['FORUM_CONFIG_FILE'])) {
             $installer = new \controller\install;
             $installer->run();
@@ -237,7 +240,6 @@ public function call()
         // Set default style and assets
         $this->app->view2->setStyle($this->forum_settings['o_default_style']);
         $this->app->view2->addAsset('js', 'style/FeatherBB/phone.min.js');
-        $this->app->view2->addAsset('js', 'js/common.js');
 
         // Populate FeatherBB Slim object with forum_settings vars
         $this->hydrate('forum_settings', $this->forum_settings);
@@ -251,7 +253,6 @@ public function call()
         $forum_time_formats = array($this->forum_settings['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
         $forum_date_formats = array($this->forum_settings['o_date_format'], 'Y-m-d', 'Y-d-m', 'd-m-Y', 'm-d-Y', 'M j Y', 'jS M Y');
 
-        $this->app->config('templates.path', $this->app->forum_env['FEATHER_ROOT'].'style/FeatherBB/view/');
         // Call FeatherBBAuth middleware
         $this->next->call();
     }
diff --git a/include/classes/csrf.class.php b/include/classes/csrf.class.php
index c2e0646d..823dd96e 100644
--- a/include/classes/csrf.class.php
+++ b/include/classes/csrf.class.php
@@ -1,24 +1,24 @@
 <?php
 /**
- * CSRF Guard
- *
- * Use this middleware with your Slim Framework application
- * to protect you from CSRF attacks.
- *
- */
+* CSRF Guard
+*
+* Use this middleware with your Slim Framework application
+* to protect you from CSRF attacks.
+*
+*/
 
 namespace FeatherBB;
 
 class Csrf extends \Slim\Middleware
 {
     protected $key,
-        $token;
+    $token;
 
     /**
-     * Call middleware.
-     *
-     * @return void
-     */
+    * Call middleware.
+    *
+    * @return void
+    */
     public function call()
     {
         // Attach as hook.
@@ -29,11 +29,11 @@ public function call()
     }
 
     /**
-     * Check CSRF token is valid.
-     * Note: Also checks POST data to see if a Moneris RVAR CSRF token exists.
-     *
-     * @return void
-     */
+    * Check CSRF token is valid.
+    * Note: Also checks POST data to see if a Moneris RVAR CSRF token exists.
+    *
+    * @return void
+    */
     public function check() {
         // Check sessions are enabled.
         if (session_id() === '') {
diff --git a/include/classes/plugin.class.php b/include/classes/plugin.class.php
index 24d72ea5..3e7217f3 100644
--- a/include/classes/plugin.class.php
+++ b/include/classes/plugin.class.php
@@ -88,7 +88,7 @@ public static function getPluginsList()
 
         // Require these files to access their properties and display them in view
         foreach ($pluginClasses as $pluginClass) {
-            require $pluginClass[0];
+            // require $pluginClass[0];
             $className = "\plugin\\".$pluginClass[1];
             $plugins[$pluginClass[1]] = new $className();
         }
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 382779d5..4259cda6 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -1,376 +1,399 @@
 <?php
 
 /**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
- namespace FeatherBB;
-
- class View
- {
-     protected $templatesDirectory,
-               $templates,
-               $app,
-               $data,
-               $page,
-               $assets,
-               $noReport,
-               $validation = array(
-                   'page_number' => 'intval',
-                   'active_page' => 'strval',
-                   //'focus_element' => 'strval',
-                   'is_indexed' => 'boolval',
-                   'admin_console' => 'boolval',
-                   'has_reports' => 'boolval',
-                   'paging_links' => 'strval',
-                   //'required_fields' => 'strval',
-                   'has_reports' => 'boolval',
-                   'footer_style' => 'strval',
-                   'fid' => 'intval',
-                   'pid' => 'intval',
-                   'tid' => 'intval');
-
-     /**
-      * Constructor
-      */
-     public function __construct()
-     {
-         $this->data = $this->page = new \Slim\Helper\Set();
-         $this->app = \Slim\Slim::getInstance();
-     }
-
-     /********************************************************************************
-      * Data methods
-      *******************************************************************************/
-
-     /**
-      * Does view data have value with key?
-      * @param  string  $key
-      * @return boolean
-      */
-     public function has($key)
-     {
-         return $this->data->has($key);
-     }
-
-     /**
-      * Return view data value with key
-      * @param  string $key
-      * @return mixed
-      */
-     public function get($key)
-     {
-         return $this->data->get($key);
-     }
-
-     /**
-      * Set view data value with key
-      * @param string $key
-      * @param mixed $value
-      */
-     public function set($key, $value)
-     {
-         $this->data->set($key, $value);
-     }
-
-     /**
-      * Set view data value as Closure with key
-      * @param string $key
-      * @param mixed $value
-      */
-     public function keep($key, \Closure $value)
-     {
-         $this->data->keep($key, $value);
-     }
-
-     /**
-      * Return view data
-      * @return array
-      */
-     public function all()
-     {
-         return $this->data->all();
-     }
-
-     /**
-      * Replace view data
-      * @param  array  $data
-      */
-     public function replace(array $data)
-     {
-         $this->data->replace($data);
-     }
-
-     /**
-      * Clear view data
-      */
-     public function clear()
-     {
-         $this->data->clear();
-     }
-
-     /********************************************************************************
-      * Legacy data methods
-      *******************************************************************************/
-
-     /**
-      * DEPRECATION WARNING! This method will be removed in the next major point release
-      *
-      * Get data from view
-      */
-     public function getData($key = null)
-     {
-         if (!is_null($key)) {
-             return isset($this->data[$key]) ? $this->data[$key] : null;
-         }
-
-         return $this->data->all();
-     }
-
-     /**
-      * DEPRECATION WARNING! This method will be removed in the next major point release
-      *
-      * Set data for view
-      */
-     public function setData()
-     {
-         $args = func_get_args();
-         if (count($args) === 1 && is_array($args[0])) {
-             $this->data->replace($args[0]);
-         } elseif (count($args) === 2) {
-             // Ensure original behavior is maintained. DO NOT invoke stored Closures.
-             if (is_object($args[1]) && method_exists($args[1], '__invoke')) {
-                 $this->data->set($args[0], $this->data->protect($args[1]));
-             } else {
-                 $this->data->set($args[0], $args[1]);
-             }
-         } else {
-             throw new \InvalidArgumentException('Cannot set View data with provided arguments. Usage: `View::setData( $key, $value );` or `View::setData([ key => value, ... ]);`');
-         }
-     }
-
-     /**
-      * DEPRECATION WARNING! This method will be removed in the next major point release
-      *
-      * Append data to view
-      * @param  array $data
-      */
-     public function appendData($data)
-     {
-         if (!is_array($data)) {
-             throw new \InvalidArgumentException('Cannot append view data. Expected array argument.');
-         }
-         $this->data->replace($data);
-     }
-
-     /********************************************************************************
-      * Resolve template paths
-      *******************************************************************************/
-
-     /**
-      * Set the base directory that contains view templates
-      * @param   string $directory
-      * @throws  \InvalidArgumentException If directory is not a directory
-      */
-     public function setTemplatesDirectory($directory)
-     {
-         $this->templatesDirectory = rtrim($directory, DIRECTORY_SEPARATOR);
-     }
-
-     /**
-      * Get templates base directory
-      * @return string
-      */
-     public function getTemplatesDirectory()
-     {
-         return $this->templatesDirectory;
-     }
-
-     /**
-      * Get fully qualified path to template file using templates base directory
-      * @param  string $file The template file pathname relative to templates base directory
-      * @return string
-      */
-      public function getTemplatePathname($file)
-      {
-          $pathname = $this->templatesDirectory . DIRECTORY_SEPARATOR . ltrim($file, DIRECTORY_SEPARATOR);
-          if (!is_file($pathname)) {
-              $pathname = $this->app->forum_env['FEATHER_ROOT'] . 'view/' . ltrim($file, DIRECTORY_SEPARATOR); // Fallback on default view
-              if (!is_file($pathname)) {
-                  throw new \RuntimeException("View cannot add template `$file` to stack because the template does not exist");
-              }
-          }
-          return (string) $pathname;
-      }
-
-     /********************************************************************************
-      * Rendering
-      *******************************************************************************/
-
-     public function display($data = null)
-     {
-         echo $this->fetch($data);
-     }
-
-     public function fetch($data = null)
-     {
-         // Force flash messages
-         if (isset($this->app->environment['slim.flash'])) {
-             $this->data->set('flash', $this->app->environment['slim.flash']);
-         }
-         $data = array_merge($this->getDefaultPageInfo(), $this->page->all(), $this->data->all(), (array) $data);
-         $data['feather'] = \Slim\Slim::getInstance();
-         $data['assets'] = $this->getAssets();
-         $data = $this->app->hooks->fire('view.alter_data', $data);
-         return $this->render($data);
-     }
-
-     protected function render($data = null)
-     {
-         extract($data);
-         ob_start();
-
-         require $this->getTemplatePathname('header.new.php');
-         foreach ($this->getTemplates() as $tpl) {
-             require $tpl;
-         }
-         require $this->getTemplatePathname('footer.new.php');
-         return ob_get_clean();
-     }
-
-     /********************************************************************************
-      * Getters and setters
-      *******************************************************************************/
-
-     public function setStyle($style)
-     {
-         if (!is_dir($this->app->forum_env['FEATHER_ROOT'].'style/'.$style.'/view/')) {
-             throw new \InvalidArgumentException('The style '.$style.' doesn\'t exist');
-         }
-         $this->data->set('style', (string) $style);
-         $this->setTemplatesDirectory($this->app->forum_env['FEATHER_ROOT'].'style/'.$style.'/view');
-         $this->addAsset('css', 'style/'.$style.'.css');
-         return $this;
-     }
-
-     public function getStyle()
-     {
-         return $this->data['style'];
-     }
-
-     public function setPageInfo(array $data)
-     {
-         foreach ($data as $key => $value) {
-             list($key, $value) = $this->validate($key, $value);
-             $this->page->set($key, $value);
-         }
-         return $this;
-     }
-
-     public function getPageInfo()
-     {
-         return $this->page->all();
-     }
-
-     protected function validate($key, $value)
-     {
-         $key = (string) $key;
-         if (isset($this->validation[$key])) {
-             if (function_exists($this->validation[$key])) {
-                 $value = $this->validation[$key]($value);
-             }
-         }
-         return array($key, $value);
-     }
-
-     public function addAsset($type, $asset, $params = null)
-     {
-         $type = (string) $type;
-         if (!in_array($type, array('js', 'css'))) {
-             throw new \Exception('Invalid asset type : ' . $type);
-         }
-         if (!is_file($this->app->forum_env['FEATHER_ROOT'].$asset)) {
-             throw new \Exception('The asset file ' . $asset . ' does not exist');
-         }
-         $this->assets[$type][] = array(
-             'file' => $asset,
-             'params' => $params
-         );
-     }
-
-     public function getAssets()
-     {
-         return $this->assets;
-     }
-
-     public function addTemplate($tpl, $priority = 10)
-     {
-         $tpl = (array) $tpl;
-         foreach ($tpl as $key => $tpl_file) {
-             $this->templates[(int) $priority][] = $this->getTemplatePathname((string) $tpl_file);
-         }
-         return $this;
-     }
-
-     public function getTemplates()
-     {
-         $output = array();
-         if (count($this->templates) > 1) {
-             ksort($this->templates);
-         }
-         foreach ($this->templates as $priority) {
-             if (!empty($priority)) {
-                 foreach ($priority as $tpl) {
+* Copyright (C) 2015 FeatherBB
+* based on code by (C) 2008-2012 FluxBB
+* and Rickard Andersson (C) 2002-2008 PunBB
+* License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+*/
+
+namespace FeatherBB;
+
+class View
+{
+    protected $templatesDirectory,
+    $templates,
+    $app,
+    $data,
+    $page,
+    $assets,
+    $validation = array(
+        'page_number' => 'intval',
+        'active_page' => 'strval',
+        //'focus_element' => 'strval',
+        'is_indexed' => 'boolval',
+        'admin_console' => 'boolval',
+        'has_reports' => 'boolval',
+        'paging_links' => 'strval',
+        //'required_fields' => 'strval',
+        'has_reports' => 'boolval',
+        'footer_style' => 'strval',
+        'fid' => 'intval',
+        'pid' => 'intval',
+        'tid' => 'intval');
+
+    /**
+    * Constructor
+    */
+    public function __construct()
+    {
+        $this->data = $this->page = new \Slim\Helper\Set();
+        $this->app = \Slim\Slim::getInstance();
+    }
+
+    /********************************************************************************
+    * Data methods
+    *******************************************************************************/
+
+    /**
+    * Does view data have value with key?
+    * @param  string  $key
+    * @return boolean
+    */
+    public function has($key)
+    {
+        return $this->data->has($key);
+    }
+
+    /**
+    * Return view data value with key
+    * @param  string $key
+    * @return mixed
+    */
+    public function get($key)
+    {
+        return $this->data->get($key);
+    }
+
+    /**
+    * Set view data value with key
+    * @param string $key
+    * @param mixed $value
+    */
+    public function set($key, $value)
+    {
+        $this->data->set($key, $value);
+    }
+
+    /**
+    * Set view data value as Closure with key
+    * @param string $key
+    * @param mixed $value
+    */
+    public function keep($key, \Closure $value)
+    {
+        $this->data->keep($key, $value);
+    }
+
+    /**
+    * Return view data
+    * @return array
+    */
+    public function all()
+    {
+        return $this->data->all();
+    }
+
+    /**
+    * Replace view data
+    * @param  array  $data
+    */
+    public function replace(array $data)
+    {
+        $this->data->replace($data);
+    }
+
+    /**
+    * Clear view data
+    */
+    public function clear()
+    {
+        $this->data->clear();
+    }
+
+    /********************************************************************************
+    * Legacy data methods
+    *******************************************************************************/
+
+    /**
+    * DEPRECATION WARNING! This method will be removed in the next major point release
+    *
+    * Get data from view
+    */
+    public function getData($key = null)
+    {
+        if (!is_null($key)) {
+            return isset($this->data[$key]) ? $this->data[$key] : null;
+        }
+
+        return $this->data->all();
+    }
+
+    /**
+    * DEPRECATION WARNING! This method will be removed in the next major point release
+    *
+    * Set data for view
+    */
+    public function setData()
+    {
+        $args = func_get_args();
+        if (count($args) === 1 && is_array($args[0])) {
+            $this->data->replace($args[0]);
+        } elseif (count($args) === 2) {
+            // Ensure original behavior is maintained. DO NOT invoke stored Closures.
+            if (is_object($args[1]) && method_exists($args[1], '__invoke')) {
+                $this->data->set($args[0], $this->data->protect($args[1]));
+            } else {
+                $this->data->set($args[0], $args[1]);
+            }
+        } else {
+            throw new \InvalidArgumentException('Cannot set View data with provided arguments. Usage: `View::setData( $key, $value );` or `View::setData([ key => value, ... ]);`');
+        }
+    }
+
+    /**
+    * DEPRECATION WARNING! This method will be removed in the next major point release
+    *
+    * Append data to view
+    * @param  array $data
+    */
+    public function appendData($data)
+    {
+        if (!is_array($data)) {
+            throw new \InvalidArgumentException('Cannot append view data. Expected array argument.');
+        }
+        $this->data->replace($data);
+    }
+
+    /********************************************************************************
+    * Resolve template paths
+    *******************************************************************************/
+
+    /**
+    * Set the base directory that contains view templates
+    * @param   string $directory
+    * @throws  \InvalidArgumentException If directory is not a directory
+    */
+    public function setTemplatesDirectory($directory)
+    {
+        $this->templatesDirectory = rtrim($directory, DIRECTORY_SEPARATOR);
+    }
+
+    /**
+    * Get templates base directory
+    * @return string
+    */
+    public function getTemplatesDirectory()
+    {
+        return $this->templatesDirectory;
+    }
+
+    /**
+    * Get fully qualified path to template file using templates base directory
+    * @param  string $file The template file pathname relative to templates base directory
+    * @return string
+    */
+    public function getTemplatePathname($file)
+    {
+        $pathname = $this->templatesDirectory . DIRECTORY_SEPARATOR . ltrim($file, DIRECTORY_SEPARATOR);
+        if (!is_file($pathname)) {
+            $pathname = $this->app->forum_env['FEATHER_ROOT'] . 'view/' . ltrim($file, DIRECTORY_SEPARATOR); // Fallback on default view
+            if (!is_file($pathname)) {
+                throw new \RuntimeException("View cannot add template `$file` to stack because the template does not exist");
+            }
+        }
+        return (string) $pathname;
+    }
+
+    /********************************************************************************
+    * Rendering
+    *******************************************************************************/
+
+    public function display($data = null)
+    {
+        echo $this->fetch($data);
+    }
+
+    public function fetch($data = null)
+    {
+        // Force flash messages
+        if (isset($this->app->environment['slim.flash'])) {
+            $this->data->set('flash', $this->app->environment['slim.flash']);
+        }
+        $data = array_merge($this->getDefaultPageInfo(), $this->page->all(), $this->data->all(), (array) $data);
+        $data['feather'] = \Slim\Slim::getInstance();
+        $data['assets'] = $this->getAssets();
+        $data = $this->app->hooks->fire('view.alter_data', $data);
+        return $this->render($data);
+    }
+
+    protected function render($data = null)
+    {
+        extract($data);
+        ob_start();
+
+        require $this->getTemplatePathname('header.new.php');
+        foreach ($this->getTemplates() as $tpl) {
+            require $tpl;
+        }
+        require $this->getTemplatePathname('footer.new.php');
+        return ob_get_clean();
+    }
+
+    /********************************************************************************
+    * Getters and setters
+    *******************************************************************************/
+
+    public function setStyle($style)
+    {
+        if (!is_dir($this->app->forum_env['FEATHER_ROOT'].'style/'.$style.'/view/')) {
+            throw new \InvalidArgumentException('The style '.$style.' doesn\'t exist');
+        }
+        $this->data->set('style', (string) $style);
+        $this->setTemplatesDirectory($this->app->forum_env['FEATHER_ROOT'].'style/'.$style.'/view');
+        $this->addAsset('css', 'style/'.$style.'.css');
+        return $this;
+    }
+
+    public function getStyle()
+    {
+        return $this->data['style'];
+    }
+
+    public function setPageInfo(array $data)
+    {
+        foreach ($data as $key => $value) {
+            list($key, $value) = $this->validate($key, $value);
+            $this->page->set($key, $value);
+        }
+        return $this;
+    }
+
+    public function getPageInfo()
+    {
+        return $this->page->all();
+    }
+
+    protected function validate($key, $value)
+    {
+        $key = (string) $key;
+        if (isset($this->validation[$key])) {
+            if (function_exists($this->validation[$key])) {
+                $value = $this->validation[$key]($value);
+            }
+        }
+        return array($key, $value);
+    }
+
+    public function addAsset($type, $asset, $params = array())
+    {
+        $type = (string) $type;
+        if (!in_array($type, array('js', 'css', 'feed', 'canonical', 'prev', 'next'))) {
+            throw new \Exception('Invalid asset type : ' . $type);
+        }
+        if (in_array($type, array('js', 'css')) && !is_file($this->app->forum_env['FEATHER_ROOT'].$asset)) {
+            throw new \Exception('The asset file ' . $asset . ' does not exist');
+        }
+
+        $params = array_merge(static::getDefaultParams($type), $params);
+        if (isset($params['title'])) {
+            $params['title'] = feather_escape($params['title']);
+        }
+        $this->assets[$type][] = array(
+            'file' => (string) $asset,
+            'params' => $params
+        );
+    }
+
+    public function getAssets()
+    {
+        return $this->assets;
+    }
+
+    public function addTemplate($tpl, $priority = 10)
+    {
+        $tpl = (array) $tpl;
+        foreach ($tpl as $key => $tpl_file) {
+            $this->templates[(int) $priority][] = $this->getTemplatePathname((string) $tpl_file);
+        }
+        return $this;
+    }
+
+    public function getTemplates()
+    {
+        $output = array();
+        if (count($this->templates) > 1) {
+            ksort($this->templates);
+        }
+        foreach ($this->templates as $priority) {
+            if (!empty($priority)) {
+                foreach ($priority as $tpl) {
                     $output[] = $tpl;
-                 }
-             }
-         }
-         return $output;
-     }
-
-     public function __call($method, $args)
-     {
-         $method = mb_substr(preg_replace_callback('/([A-Z])/', function ($c) {
-             return "_" . strtolower($c[1]);
-         }, $method), 4);
-         if (empty($args)) {
-             $args = null;
-         }
-         list($key, $value) = $this->validate($method, $args);
-         $this->page->set($key, $value);
-     }
-
-     protected function getDefaultPageInfo()
-     {
-         if (!$this->app->cache->isCached('quickjump')) {
-             $this->app->cache->store('quickjump', \model\cache::get_quickjump());
-         }
-
-         $data = array(
-             'title' => feather_escape($this->app->forum_settings['o_board_title']),
-             'page_number' => null,
-             'active_page' => 'index',
-             'focus_element' => null,
-             'is_indexed' => true,
-             'admin_console' => false,
-             'page_head' => null,
-             'paging_links' => null,
-             'required_fields' => null,
-             'footer_style' => null,
-             'quickjump' => $this->app->cache->retrieve('quickjump'),
-             'fid' => null,
-             'pid' => null,
-             'tid' => null,
-             'feather_config' => $this->app->config,
-         );
-
-         if ($this->app->user->is_admmod) {
-             $data['has_reports'] = \model\header::get_reports();
-         }
-
-         return $data;
-     }
- }
+                }
+            }
+        }
+        return $output;
+    }
+
+    public function __call($method, $args)
+    {
+        $method = mb_substr(preg_replace_callback('/([A-Z])/', function ($c) {
+            return "_" . strtolower($c[1]);
+        }, $method), 4);
+        if (empty($args)) {
+            $args = null;
+        }
+        list($key, $value) = $this->validate($method, $args);
+        $this->page->set($key, $value);
+    }
+
+    protected function getDefaultPageInfo()
+    {
+        if (!$this->app->cache->isCached('quickjump')) {
+            $this->app->cache->store('quickjump', \model\cache::get_quickjump());
+        }
+
+        $data = array(
+            'title' => feather_escape($this->app->forum_settings['o_board_title']),
+            'page_number' => null,
+            'active_page' => 'index',
+            'focus_element' => null,
+            'is_indexed' => true,
+            'admin_console' => false,
+            'page_head' => null,
+            'paging_links' => null,
+            'required_fields' => null,
+            'footer_style' => null,
+            'quickjump' => $this->app->cache->retrieve('quickjump'),
+            'fid' => null,
+            'pid' => null,
+            'tid' => null,
+        );
+
+        if ($this->app->user->is_admmod) {
+            $data['has_reports'] = \model\header::get_reports();
+        }
+
+        return $data;
+    }
+
+    protected static function getDefaultParams($type)
+    {
+        switch($type) {
+            case 'js':
+                return array('type' => 'text/javascript');
+            case 'css':
+                return array('rel' => 'stylesheet', 'type' => 'text/css');
+            case 'feed':
+                return array('rel' => 'alternate', 'type' => 'application/atom+xml');
+            case 'canonical':
+                return array('rel' => 'canonical');
+            case 'prev':
+                return array('rel' => 'prev');
+            case 'next':
+                return array('rel' => 'next');
+            default:
+                return array();
+        }
+    }
+}
diff --git a/include/common_admin.php b/include/common_admin.php
index 228b2fa2..c1778f08 100644
--- a/include/common_admin.php
+++ b/include/common_admin.php
@@ -37,14 +37,13 @@ function generate_admin_menu($page = '')
     // See if there are any plugins
     $plugins = forum_list_plugins($is_admin);
 
-    $feather->render('admin/menu.php', array(
+    $feather->view2->setPageInfo(array(
         'page'    =>    $page,
         'is_admin'    =>    $is_admin,
         'feather_config'    =>    $feather->config,
-        'feather_user'    =>    $feather->user,
         'plugins'    =>    $plugins,
-        )
-    );
+        ), 1
+    )->addTemplate('admin/menu.php');
 }
 
 //
diff --git a/include/functions.php b/include/functions.php
index 09330114..2189bb05 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -89,7 +89,7 @@ function get_admin_ids()
 //
 function check_username($username, $errors, $exclude_id = null)
 {
-    global $feather, $feather_config, $errors, $feather_bans;
+    global $feather, $errors, $feather_bans;
 
     // Include UTF-8 function
     require_once FEATHER_ROOT.'include/utf8/strcasecmp.php';
@@ -116,7 +116,7 @@ function check_username($username, $errors, $exclude_id = null)
     }
 
     // Check username for any censored words
-    if ($feather_config['o_censoring'] == '1' && censor_words($username) != $username) {
+    if ($feather->forum_settings['o_censoring'] == '1' && censor_words($username) != $username) {
         $errors[] = __('Username censor');
     }
 
@@ -589,7 +589,7 @@ function paginate_old($num_pages, $cur_page, $link)
 //
 // Display a message
 //
-function message($msg, $http_status = null, $no_back_link = false, $dontStop = false)
+function message($msg, $http_status = null, $no_back_link = false)
 {
     // Did we receive a custom header?
     if (!is_null($http_status)) {
@@ -608,29 +608,18 @@ function message($msg, $http_status = null, $no_back_link = false, $dontStop = f
     $feather->response->setBody('');
 
     if (!defined('FEATHER_HEADER')) {
-        $page_title = array(feather_escape($feather->config['o_board_title']), __('Info'));
-
-        require_once FEATHER_ROOT.'controller/header.php';
-
-        $header = new \controller\header();
-
-        $header->setTitle($page_title)->display();
+        $feather->view2->setPageInfo(array(
+            'title' => array(feather_escape($feather->config['o_board_title']), __('Info')),
+        ));
     }
 
-    $feather->render('message.php', array(
+    $feather->view2->setPageInfo(array(
         'message'    =>    $msg,
         'no_back_link'    => $no_back_link,
-        ));
-
-    require_once FEATHER_ROOT.'controller/footer.php';
-
-    $footer = new \controller\footer();
-
-    if ($dontStop) {
-        $footer->dontStop();
-    }
+        ))->addTemplate('message.php')->display();
 
-    $footer->display();
+    // Don't display anything after a message
+    $feather->stop();
 }
 
 
diff --git a/include/routes.php b/include/routes.php
index 0e58f819..74281f92 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -167,4 +167,4 @@
 // 404 not found
 $feather->notFound(function () {
     message(__('Bad request'), '404');
-});
+});
\ No newline at end of file
diff --git a/model/admin/groups.php b/model/admin/groups.php
index 04218d1c..7f6b3d6b 100644
--- a/model/admin/groups.php
+++ b/model/admin/groups.php
@@ -283,11 +283,7 @@ public function set_default_group($groups)
                                                    ->update_many('conf_value', $group_id);
 
         // Regenerate the config cache
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
-        }
-
-        generate_config_cache();
+        $this->feather->cache->store('config', \model\cache::get_config());
 
         redirect(get_link('admin/groups/'), __('Default group redirect'));
     }
diff --git a/model/moderate.php b/model/moderate.php
index 36a02d82..d2f53fc8 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -561,7 +561,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
                 $moved_to = $moved_to->find_one();
 
                 // Create the redirect topic
-                $move_topics_to['insert'] = array(
+                $insert_move_topics_to = array(
                     'poster' => $moved_to['poster'],
                     'subject'  => $moved_to['subject'],
                     'posted'  => $moved_to['posted'],
@@ -573,7 +573,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
                 // Insert the report
                 $move_topics_to = DB::for_table('topics')
                                     ->create()
-                                    ->set($move_topics_to['insert']);
+                                    ->set($insert_move_topics_to);
                 $move_topics_to = $this->hook->fireDB('move_topics_to_redirect', $move_topics_to);
                 $move_topics_to = $move_topics_to->save();
 
@@ -608,7 +608,7 @@ public function check_move_possible()
                     ->where_any_is($result['where'])
                     ->where_null('f.redirect_url')
                     ->order_by_many($result['order_by']);
-        $result = $this->hook->fireDB('check_move_possible');
+        $result = $this->hook->fireDB('check_move_possible', $result);
         $result = $result->find_many();
 
         if (count($result) < 2) {
@@ -798,6 +798,8 @@ public function delete_topics($topics, $fid)
         $find_ids = $this->hook->fireDB('delete_topics_find_ids', $find_ids);
         $find_ids = $find_ids->find_many();
 
+        $ids_post = array();
+
         foreach ($find_ids as $id) {
             $ids_post[] = $id['id'];
         }
diff --git a/model/search.php b/model/search.php
index 8facdca0..e27188e5 100644
--- a/model/search.php
+++ b/model/search.php
@@ -536,7 +536,7 @@ public function get_search_results()
                 }
 
                 $delete_cache = DB::for_table('search_cache')
-                    ->where_not_in('ident', $old_searches);
+                                    ->where_not_in('ident', $old_searches);
                 $delete_cache = $this->hook->fireDB('get_search_results_delete_cache', $delete_cache);
                 $delete_cache = $delete_cache->delete_many();
             }
@@ -735,7 +735,7 @@ public function display_search_results($search)
                     $cur_search['pposter_disp'] = '<strong>'.$pposter.'</strong>';
                 }
 
-                $this->feather->render('search/posts.php', array(
+                $this->feather->view2->setPageInfo(array(
                     'post_count' => $post_count,
                     'url_topic' => $url_topic,
                     'cur_search' => $cur_search,
@@ -792,12 +792,14 @@ public function display_search_results($search)
                     $start_from = $cur_search['start_from'];
                 }
 
-                $this->feather->render('search/topics.php', array(
+                $this->feather->view2->setPageInfo(array(
                     'cur_search' => $cur_search,
                     'start_from' => $start_from,
                     'topic_count' => $topic_count,
                     'subject' => $subject,
                     'forum' => $forum,
+                    'post_count' => $post_count,
+                    'url_topic' => $url_topic,
                     )
                 );
             }
diff --git a/model/viewforum.php b/model/viewforum.php
index 6579c292..d88a0e6c 100644
--- a/model/viewforum.php
+++ b/model/viewforum.php
@@ -22,7 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
     }
- 
+
     // Returns basic informations about the forum
     public function get_info_forum($id)
     {
@@ -93,35 +93,6 @@ public function sort_forum_by($sort_by_sql)
         return $sort_by;
     }
 
-    // Adds relationship meta tags
-    public function get_page_head($forum_id, $num_pages, $p, $url_forum)
-    {
-        $page_head = array();
-
-        $page_head = $this->hook->fire('get_page_head_start', $page_head, $forum_id, $num_pages, $p, $url_forum);
-
-        $page_head['canonical'] = "\t".'<link href="'.get_link('forum/'.$forum_id.'/'.$url_forum.'/').'" rel="canonical" />';
-
-        if ($num_pages > 1) {
-            if ($p > 1) {
-                $page_head['prev'] = "\t".'<link href="'.get_link('forum/'.$forum_id.'/'.$url_forum.'/page/'.($p - 1).'/').'" rel="prev" />';
-            }
-            if ($p < $num_pages) {
-                $page_head['next'] = "\t".'<link href="'.get_link('forum/'.$forum_id.'/'.$url_forum.'/page/'.($p + 1).'/').'" rel="next" />';
-            }
-        }
-
-        if ($this->config['o_feed_type'] == '1') {
-            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss" title="'.__('RSS forum feed').'" />';
-        } elseif ($this->config['o_feed_type'] == '2') {
-            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom" title="'.__('Atom forum feed').'" />';
-        }
-
-        $page_head = $this->hook->fire('get_page_head', $page_head);
-
-        return $page_head;
-    }
-
     // Returns forum action
     public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
     {
diff --git a/model/viewtopic.php b/model/viewtopic.php
index 444b23ef..6a8f6674 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -219,35 +219,6 @@ public function get_subscraction($is_subscribed, $topic_id)
         return $subscraction;
     }
 
-    // Adds relationship meta tags
-    public function get_page_head($topic_id, $num_pages, $p, $url_topic)
-    {
-        $page_head = array();
-
-        $page_head = $this->hook->fire('get_page_head_start', $page_head, $topic_id, $num_pages, $p, $url_topic);
-
-        $page_head['canonical'] = "\t".'<link href="'.get_link('topic/'.$topic_id.'/'.$url_topic.'/').'" rel="canonical" />';
-
-        if ($num_pages > 1) {
-            if ($p > 1) {
-                $page_head['prev'] = "\t".'<link href="'.get_link('topic/'.$topic_id.'/'.$url_topic.'/page/'.($p - 1).'/').'" rel="prev" />';
-            }
-            if ($p < $num_pages) {
-                $page_head['next'] = "\t".'<link href="'.get_link('topic/'.$topic_id.'/'.$url_topic.'/page/'.($p + 1).'/').'" rel="next" />';
-            }
-        }
-
-        if ($this->config['o_feed_type'] == '1') {
-            $page_head['feed'] = '<link rel="alternate" type="application/rss+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=rss" title="'.__('RSS topic feed').'" />';
-        } elseif ($this->config['o_feed_type'] == '2') {
-            $page_head['feed'] = '<link rel="alternate" type="application/atom+xml" href="extern.php?action=feed&amp;tid='.$topic_id.'&amp;type=atom" title="'.__('Atom topic feed').'" />';
-        }
-
-        $page_head = $this->hook->fire('get_page_head', $page_head, $topic_id, $num_pages, $p, $url_topic);
-
-        return $page_head;
-    }
-
     // Prints the posts
     public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
     {
@@ -435,7 +406,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
 
         return $post_data;
     }
-    
+
     public function increment_views($id)
     {
         if ($this->config['o_topic_views'] == '1') {
diff --git a/style/FeatherBB/view/admin/censoring.php b/style/FeatherBB/view/admin/censoring.php
index 71c253f7..cf080869 100644
--- a/style/FeatherBB/view/admin/censoring.php
+++ b/style/FeatherBB/view/admin/censoring.php
@@ -22,7 +22,7 @@
 					<fieldset>
 						<legend><?php _e('Add word subhead') ?></legend>
 						<div class="infldset">
-							<p><?php _e('Add word info').' '.($feather_config['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
+							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
 							<table>
 							<thead>
 								<tr>
diff --git a/style/FeatherBB/view/admin/groups/add_edit_group.php b/style/FeatherBB/view/admin/groups/add_edit_group.php
index bc2bc244..ae278dce 100644
--- a/style/FeatherBB/view/admin/groups/add_edit_group.php
+++ b/style/FeatherBB/view/admin/groups/add_edit_group.php
@@ -54,7 +54,7 @@
 										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
 									</td>
 								</tr>
-<?php if ($group['mode'] != 'edit' || $feather_config['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
+<?php if ($group['mode'] != 'edit' || $feather->forum_settings['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
 									<th scope="row"> <?php _e('Mod privileges label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
diff --git a/style/FeatherBB/view/admin/groups/admin_groups.php b/style/FeatherBB/view/admin/groups/admin_groups.php
index 643b4883..aff5db98 100644
--- a/style/FeatherBB/view/admin/groups/admin_groups.php
+++ b/style/FeatherBB/view/admin/groups/admin_groups.php
@@ -31,7 +31,7 @@
 
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
-        if ($cur_group['g_id'] == $feather_config['o_default_user_group']) {
+        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
         } else {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
@@ -64,7 +64,7 @@
 
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
-        if ($cur_group['g_id'] == $feather_config['o_default_user_group']) {
+        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
         } else {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
diff --git a/style/FeatherBB/view/admin/index.php b/style/FeatherBB/view/admin/index.php
index dc0dcf8c..f369b039 100644
--- a/style/FeatherBB/view/admin/index.php
+++ b/style/FeatherBB/view/admin/index.php
@@ -45,7 +45,7 @@
 				<dl>
 					<dt><?php _e('FeatherBB version label') ?></dt>
 					<dd>
-						<?php printf(__('FeatherBB version data')."\n", $feather_config['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
+						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
 					</dd>
 					<dt><?php _e('Server statistics label') ?></dt>
 					<dd>
diff --git a/style/FeatherBB/view/admin/options.php b/style/FeatherBB/view/admin/options.php
index faa8e34c..88c2c0b6 100644
--- a/style/FeatherBB/view/admin/options.php
+++ b/style/FeatherBB/view/admin/options.php
@@ -28,21 +28,21 @@
 								<tr>
 									<th scope="row"><?php _e('Board title label') ?></th>
 									<td>
-										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather_config['o_board_title']) ?>" />
+										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>" />
 										<span><?php _e('Board title help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Board desc label') ?></th>
 									<td>
-										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather_config['o_board_desc']) ?></textarea>
+										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather->forum_settings['o_board_desc']) ?></textarea>
 										<span><?php _e('Board desc help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Base URL label') ?></th>
 									<td>
-										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather_config['o_base_url']) ?>" />
+										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather->forum_settings['o_base_url']) ?>" />
 										<span><?php _e('Base URL help') ?></span>
 									</td>
 								</tr>
@@ -50,124 +50,124 @@
 									<th scope="row"><?php _e('Timezone label') ?></th>
 									<td>
 										<select name="form_default_timezone">
-											<option value="-12"<?php if ($feather_config['o_default_timezone'] == -12) {
+											<option value="-12"<?php if ($feather->forum_settings['o_default_timezone'] == -12) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-12:00') ?></option>
-											<option value="-11"<?php if ($feather_config['o_default_timezone'] == -11) {
+											<option value="-11"<?php if ($feather->forum_settings['o_default_timezone'] == -11) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-11:00') ?></option>
-											<option value="-10"<?php if ($feather_config['o_default_timezone'] == -10) {
+											<option value="-10"<?php if ($feather->forum_settings['o_default_timezone'] == -10) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-10:00') ?></option>
-											<option value="-9.5"<?php if ($feather_config['o_default_timezone'] == -9.5) {
+											<option value="-9.5"<?php if ($feather->forum_settings['o_default_timezone'] == -9.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-09:30') ?></option>
-											<option value="-9"<?php if ($feather_config['o_default_timezone'] == -9) {
+											<option value="-9"<?php if ($feather->forum_settings['o_default_timezone'] == -9) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-09:00') ?></option>
-											<option value="-8.5"<?php if ($feather_config['o_default_timezone'] == -8.5) {
+											<option value="-8.5"<?php if ($feather->forum_settings['o_default_timezone'] == -8.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-08:30') ?></option>
-											<option value="-8"<?php if ($feather_config['o_default_timezone'] == -8) {
+											<option value="-8"<?php if ($feather->forum_settings['o_default_timezone'] == -8) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-08:00') ?></option>
-											<option value="-7"<?php if ($feather_config['o_default_timezone'] == -7) {
+											<option value="-7"<?php if ($feather->forum_settings['o_default_timezone'] == -7) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-07:00') ?></option>
-											<option value="-6"<?php if ($feather_config['o_default_timezone'] == -6) {
+											<option value="-6"<?php if ($feather->forum_settings['o_default_timezone'] == -6) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-06:00') ?></option>
-											<option value="-5"<?php if ($feather_config['o_default_timezone'] == -5) {
+											<option value="-5"<?php if ($feather->forum_settings['o_default_timezone'] == -5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-05:00') ?></option>
-											<option value="-4"<?php if ($feather_config['o_default_timezone'] == -4) {
+											<option value="-4"<?php if ($feather->forum_settings['o_default_timezone'] == -4) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-04:00') ?></option>
-											<option value="-3.5"<?php if ($feather_config['o_default_timezone'] == -3.5) {
+											<option value="-3.5"<?php if ($feather->forum_settings['o_default_timezone'] == -3.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-03:30') ?></option>
-											<option value="-3"<?php if ($feather_config['o_default_timezone'] == -3) {
+											<option value="-3"<?php if ($feather->forum_settings['o_default_timezone'] == -3) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-03:00') ?></option>
-											<option value="-2"<?php if ($feather_config['o_default_timezone'] == -2) {
+											<option value="-2"<?php if ($feather->forum_settings['o_default_timezone'] == -2) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-02:00') ?></option>
-											<option value="-1"<?php if ($feather_config['o_default_timezone'] == -1) {
+											<option value="-1"<?php if ($feather->forum_settings['o_default_timezone'] == -1) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-01:00') ?></option>
-											<option value="0"<?php if ($feather_config['o_default_timezone'] == 0) {
+											<option value="0"<?php if ($feather->forum_settings['o_default_timezone'] == 0) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC') ?></option>
-											<option value="1"<?php if ($feather_config['o_default_timezone'] == 1) {
+											<option value="1"<?php if ($feather->forum_settings['o_default_timezone'] == 1) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+01:00') ?></option>
-											<option value="2"<?php if ($feather_config['o_default_timezone'] == 2) {
+											<option value="2"<?php if ($feather->forum_settings['o_default_timezone'] == 2) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+02:00') ?></option>
-											<option value="3"<?php if ($feather_config['o_default_timezone'] == 3) {
+											<option value="3"<?php if ($feather->forum_settings['o_default_timezone'] == 3) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+03:00') ?></option>
-											<option value="3.5"<?php if ($feather_config['o_default_timezone'] == 3.5) {
+											<option value="3.5"<?php if ($feather->forum_settings['o_default_timezone'] == 3.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+03:30') ?></option>
-											<option value="4"<?php if ($feather_config['o_default_timezone'] == 4) {
+											<option value="4"<?php if ($feather->forum_settings['o_default_timezone'] == 4) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+04:00') ?></option>
-											<option value="4.5"<?php if ($feather_config['o_default_timezone'] == 4.5) {
+											<option value="4.5"<?php if ($feather->forum_settings['o_default_timezone'] == 4.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+04:30') ?></option>
-											<option value="5"<?php if ($feather_config['o_default_timezone'] == 5) {
+											<option value="5"<?php if ($feather->forum_settings['o_default_timezone'] == 5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+05:00') ?></option>
-											<option value="5.5"<?php if ($feather_config['o_default_timezone'] == 5.5) {
+											<option value="5.5"<?php if ($feather->forum_settings['o_default_timezone'] == 5.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+05:30') ?></option>
-											<option value="5.75"<?php if ($feather_config['o_default_timezone'] == 5.75) {
+											<option value="5.75"<?php if ($feather->forum_settings['o_default_timezone'] == 5.75) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+05:45') ?></option>
-											<option value="6"<?php if ($feather_config['o_default_timezone'] == 6) {
+											<option value="6"<?php if ($feather->forum_settings['o_default_timezone'] == 6) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+06:00') ?></option>
-											<option value="6.5"<?php if ($feather_config['o_default_timezone'] == 6.5) {
+											<option value="6.5"<?php if ($feather->forum_settings['o_default_timezone'] == 6.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+06:30') ?></option>
-											<option value="7"<?php if ($feather_config['o_default_timezone'] == 7) {
+											<option value="7"<?php if ($feather->forum_settings['o_default_timezone'] == 7) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+07:00') ?></option>
-											<option value="8"<?php if ($feather_config['o_default_timezone'] == 8) {
+											<option value="8"<?php if ($feather->forum_settings['o_default_timezone'] == 8) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+08:00') ?></option>
-											<option value="8.75"<?php if ($feather_config['o_default_timezone'] == 8.75) {
+											<option value="8.75"<?php if ($feather->forum_settings['o_default_timezone'] == 8.75) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+08:45') ?></option>
-											<option value="9"<?php if ($feather_config['o_default_timezone'] == 9) {
+											<option value="9"<?php if ($feather->forum_settings['o_default_timezone'] == 9) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+09:00') ?></option>
-											<option value="9.5"<?php if ($feather_config['o_default_timezone'] == 9.5) {
+											<option value="9.5"<?php if ($feather->forum_settings['o_default_timezone'] == 9.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+09:30') ?></option>
-											<option value="10"<?php if ($feather_config['o_default_timezone'] == 10) {
+											<option value="10"<?php if ($feather->forum_settings['o_default_timezone'] == 10) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+10:00') ?></option>
-											<option value="10.5"<?php if ($feather_config['o_default_timezone'] == 10.5) {
+											<option value="10.5"<?php if ($feather->forum_settings['o_default_timezone'] == 10.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+10:30') ?></option>
-											<option value="11"<?php if ($feather_config['o_default_timezone'] == 11) {
+											<option value="11"<?php if ($feather->forum_settings['o_default_timezone'] == 11) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+11:00') ?></option>
-											<option value="11.5"<?php if ($feather_config['o_default_timezone'] == 11.5) {
+											<option value="11.5"<?php if ($feather->forum_settings['o_default_timezone'] == 11.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+11:30') ?></option>
-											<option value="12"<?php if ($feather_config['o_default_timezone'] == 12) {
+											<option value="12"<?php if ($feather->forum_settings['o_default_timezone'] == 12) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+12:00') ?></option>
-											<option value="12.75"<?php if ($feather_config['o_default_timezone'] == 12.75) {
+											<option value="12.75"<?php if ($feather->forum_settings['o_default_timezone'] == 12.75) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+12:45') ?></option>
-											<option value="13"<?php if ($feather_config['o_default_timezone'] == 13) {
+											<option value="13"<?php if ($feather->forum_settings['o_default_timezone'] == 13) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+13:00') ?></option>
-											<option value="14"<?php if ($feather_config['o_default_timezone'] == 14) {
+											<option value="14"<?php if ($feather->forum_settings['o_default_timezone'] == 14) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+14:00') ?></option>
 										</select>
@@ -177,10 +177,10 @@
 								<tr>
 									<th scope="row"><?php _e('DST label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather_config['o_default_dst'] == '1') {
+										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather->forum_settings['o_default_dst'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather_config['o_default_dst'] == '0') {
+										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather->forum_settings['o_default_dst'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('DST help') ?></span>
@@ -192,7 +192,7 @@
 										<select name="form_default_lang">
 <?php
         foreach ($languages as $temp) {
-            if ($feather_config['o_default_lang'] == $temp) {
+            if ($feather->forum_settings['o_default_lang'] == $temp) {
                 echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
             } else {
                 echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
@@ -231,35 +231,35 @@
 								<tr>
 									<th scope="row"><?php _e('Time format label') ?></th>
 									<td>
-										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_time_format']) ?>" />
-										<span><?php printf(__('Time format help'), gmdate($feather_config['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather->forum_settings['o_time_format']) ?>" />
+										<span><?php printf(__('Time format help'), gmdate($feather->forum_settings['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Date format label') ?></th>
 									<td>
-										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_date_format']) ?>" />
-										<span><?php printf(__('Date format help'), gmdate($feather_config['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather->forum_settings['o_date_format']) ?>" />
+										<span><?php printf(__('Date format help'), gmdate($feather->forum_settings['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Visit timeout label') ?></th>
 									<td>
-										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_visit'] ?>" />
+										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_visit'] ?>" />
 										<span><?php _e('Visit timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Online timeout label') ?></th>
 									<td>
-										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_online'] ?>" />
+										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_online'] ?>" />
 										<span><?php _e('Online timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Redirect time label') ?></th>
 									<td>
-										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather_config['o_redirect_delay'] ?>" />
+										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_redirect_delay'] ?>" />
 										<span><?php _e('Redirect time help') ?></span>
 									</td>
 								</tr>
@@ -275,10 +275,10 @@
 								<tr>
 									<th scope="row"><?php _e('Version number label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather_config['o_show_version'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather->forum_settings['o_show_version'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather_config['o_show_version'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather->forum_settings['o_show_version'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Version number help') ?></span>
@@ -287,10 +287,10 @@
 								<tr>
 									<th scope="row"><?php _e('Info in posts label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather_config['o_show_user_info'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather->forum_settings['o_show_user_info'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather_config['o_show_user_info'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather->forum_settings['o_show_user_info'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Info in posts help') ?></span>
@@ -299,10 +299,10 @@
 								<tr>
 									<th scope="row"><?php _e('Post count label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather_config['o_show_post_count'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather->forum_settings['o_show_post_count'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather_config['o_show_post_count'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather->forum_settings['o_show_post_count'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Post count help') ?></span>
@@ -311,10 +311,10 @@
 								<tr>
 									<th scope="row"><?php _e('Smilies label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather_config['o_smilies'] == '1') {
+										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather->forum_settings['o_smilies'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather_config['o_smilies'] == '0') {
+										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather->forum_settings['o_smilies'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Smilies help') ?></span>
@@ -323,10 +323,10 @@
 								<tr>
 									<th scope="row"><?php _e('Smilies sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather_config['o_smilies_sig'] == '1') {
+										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather->forum_settings['o_smilies_sig'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather_config['o_smilies_sig'] == '0') {
+										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather->forum_settings['o_smilies_sig'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Smilies sigs help') ?></span>
@@ -335,10 +335,10 @@
 								<tr>
 									<th scope="row"><?php _e('Clickable links label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather_config['o_make_links'] == '1') {
+										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather->forum_settings['o_make_links'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather_config['o_make_links'] == '0') {
+										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather->forum_settings['o_make_links'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Clickable links help') ?></span>
@@ -347,35 +347,35 @@
 								<tr>
 									<th scope="row"><?php _e('Topic review label') ?></th>
 									<td>
-										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather_config['o_topic_review'] ?>" />
+										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_topic_review'] ?>" />
 										<span><?php _e('Topic review help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Topics per page label') ?></th>
 									<td>
-										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_topics_default'] ?>" />
+										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_topics_default'] ?>" />
 										<span><?php _e('Topics per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Posts per page label') ?></th>
 									<td>
-										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_posts_default'] ?>" />
+										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_posts_default'] ?>" />
 										<span><?php _e('Posts per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Indent label') ?></th>
 									<td>
-										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather_config['o_indent_num_spaces'] ?>" />
+										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_indent_num_spaces'] ?>" />
 										<span><?php _e('Indent help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Quote depth label') ?></th>
 									<td>
-										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather_config['o_quote_depth'] ?>" />
+										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_quote_depth'] ?>" />
 										<span><?php _e('Quote depth help') ?></span>
 									</td>
 								</tr>
@@ -391,10 +391,10 @@
 								<tr>
 									<th scope="row"><?php _e('Quick post label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather_config['o_quickpost'] == '1') {
+										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather->forum_settings['o_quickpost'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather_config['o_quickpost'] == '0') {
+										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather->forum_settings['o_quickpost'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Quick post help') ?></span>
@@ -403,10 +403,10 @@
 								<tr>
 									<th scope="row"><?php _e('Users online label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather_config['o_users_online'] == '1') {
+										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather->forum_settings['o_users_online'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather_config['o_users_online'] == '0') {
+										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather->forum_settings['o_users_online'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Users online help') ?></span>
@@ -415,10 +415,10 @@
 								<tr>
 									<th scope="row"><a name="censoring"></a><?php _e('Censor words label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather_config['o_censoring'] == '1') {
+										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather->forum_settings['o_censoring'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather_config['o_censoring'] == '0') {
+										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
@@ -427,10 +427,10 @@
 								<tr>
 									<th scope="row"><a name="signatures"></a><?php _e('Signatures label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather_config['o_signatures'] == '1') {
+										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather->forum_settings['o_signatures'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather_config['o_signatures'] == '0') {
+										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather->forum_settings['o_signatures'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Signatures help') ?></span>
@@ -439,10 +439,10 @@
 								<tr>
 									<th scope="row"><?php _e('User has posted label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather_config['o_show_dot'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather->forum_settings['o_show_dot'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather_config['o_show_dot'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather->forum_settings['o_show_dot'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('User has posted help') ?></span>
@@ -451,10 +451,10 @@
 								<tr>
 									<th scope="row"><?php _e('Topic views label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather_config['o_topic_views'] == '1') {
+										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather->forum_settings['o_topic_views'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather_config['o_topic_views'] == '0') {
+										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather->forum_settings['o_topic_views'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Topic views help') ?></span>
@@ -463,10 +463,10 @@
 								<tr>
 									<th scope="row"><?php _e('Quick jump label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather_config['o_quickjump'] == '1') {
+										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather->forum_settings['o_quickjump'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather_config['o_quickjump'] == '0') {
+										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather->forum_settings['o_quickjump'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Quick jump help') ?></span>
@@ -475,10 +475,10 @@
 								<tr>
 									<th scope="row"><?php _e('GZip label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather_config['o_gzip'] == '1') {
+										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather->forum_settings['o_gzip'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather_config['o_gzip'] == '0') {
+										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather->forum_settings['o_gzip'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('GZip help') ?></span>
@@ -487,10 +487,10 @@
 								<tr>
 									<th scope="row"><?php _e('Search all label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather_config['o_search_all_forums'] == '1') {
+										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather->forum_settings['o_search_all_forums'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather_config['o_search_all_forums'] == '0') {
+										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather->forum_settings['o_search_all_forums'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Search all help') ?></span>
@@ -499,7 +499,7 @@
 								<tr>
 									<th scope="row"><?php _e('Menu items label') ?></th>
 									<td>
-										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather_config['o_additional_navlinks']) ?></textarea>
+										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
 										<span><?php _e('Menu items help') ?></span>
 									</td>
 								</tr>
@@ -515,13 +515,13 @@
 								<tr>
 									<th scope="row"><?php _e('Default feed label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather_config['o_feed_type'] == '0') {
+										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather->forum_settings['o_feed_type'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('None') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather_config['o_feed_type'] == '1') {
+										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather->forum_settings['o_feed_type'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('RSS') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather_config['o_feed_type'] == '2') {
+										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather->forum_settings['o_feed_type'] == '2') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Atom') ?></strong></label>
 										<span class="clearb"><?php _e('Default feed help') ?></span>
@@ -531,7 +531,7 @@
 									<th scope="row"><?php _e('Feed TTL label') ?></th>
 									<td>
 										<select name="form_feed_ttl">
-											<option value="0"<?php if ($feather_config['o_feed_ttl'] == '0') {
+											<option value="0"<?php if ($feather->forum_settings['o_feed_ttl'] == '0') {
     echo ' selected="selected"';
 } ?>><?php _e('No cache') ?></option>
 											<?php echo $times ?>
@@ -551,13 +551,13 @@
 								<tr>
 									<th scope="row"><?php _e('Reporting method label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather_config['o_report_method'] == '0') {
+										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather->forum_settings['o_report_method'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Internal') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather_config['o_report_method'] == '1') {
+										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather->forum_settings['o_report_method'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('By e-mail') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather_config['o_report_method'] == '2') {
+										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather->forum_settings['o_report_method'] == '2') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Both') ?></strong></label>
 										<span class="clearb"><?php _e('Reporting method help') ?></span>
@@ -566,7 +566,7 @@
 								<tr>
 									<th scope="row"><?php _e('Mailing list label') ?></th>
 									<td>
-										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather_config['o_mailing_list']) ?></textarea>
+										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_mailing_list']) ?></textarea>
 										<span><?php _e('Mailing list help') ?></span>
 									</td>
 								</tr>
@@ -582,10 +582,10 @@
 								<tr>
 									<th scope="row"><?php _e('Use avatars label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather_config['o_avatars'] == '1') {
+										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather->forum_settings['o_avatars'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather_config['o_avatars'] == '0') {
+										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather->forum_settings['o_avatars'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Use avatars help') ?></span>
@@ -594,28 +594,28 @@
 								<tr>
 									<th scope="row"><?php _e('Upload directory label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather_config['o_avatars_dir']) ?>" />
+										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather->forum_settings['o_avatars_dir']) ?>" />
 										<span><?php _e('Upload directory help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max width label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_width'] ?>" />
+										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_width'] ?>" />
 										<span><?php _e('Max width help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max height label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_height'] ?>" />
+										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_height'] ?>" />
 										<span><?php _e('Max height help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max size label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather_config['o_avatars_size'] ?>" />
+										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 										<span><?php _e('Max size help') ?></span>
 									</td>
 								</tr>
@@ -631,24 +631,24 @@
 								<tr>
 									<th scope="row"><?php _e('Admin e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_admin_email']) ?>" />
+										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather->forum_settings['o_admin_email']) ?>" />
 										<span><?php _e('Admin e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_webmaster_email']) ?>" />
+										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather->forum_settings['o_webmaster_email']) ?>" />
 										<span><?php _e('Webmaster e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Forum subscriptions label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather_config['o_forum_subscriptions'] == '1') {
+										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather_config['o_forum_subscriptions'] == '0') {
+										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Forum subscriptions help') ?></span>
@@ -657,10 +657,10 @@
 								<tr>
 									<th scope="row"><?php _e('Topic subscriptions label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather_config['o_topic_subscriptions'] == '1') {
+										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather_config['o_topic_subscriptions'] == '0') {
+										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Topic subscriptions help') ?></span>
@@ -669,14 +669,14 @@
 								<tr>
 									<th scope="row"><?php _e('SMTP address label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather_config['o_smtp_host']) ?>" />
+										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather->forum_settings['o_smtp_host']) ?>" />
 										<span><?php _e('SMTP address help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('SMTP username label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather_config['o_smtp_user']) ?>" />
+										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather->forum_settings['o_smtp_user']) ?>" />
 										<span><?php _e('SMTP username help') ?></span>
 									</td>
 								</tr>
@@ -684,7 +684,7 @@
 									<th scope="row"><?php _e('SMTP password label') ?></th>
 									<td>
 										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
-<?php $smtp_pass = !empty($feather_config['o_smtp_pass']) ? random_key(feather_strlen($feather_config['o_smtp_pass']), true) : ''; ?>
+<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key(feather_strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
 										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<span><?php _e('SMTP password help') ?></span>
@@ -693,10 +693,10 @@
 								<tr>
 									<th scope="row"><?php _e('SMTP SSL label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather_config['o_smtp_ssl'] == '1') {
+										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather->forum_settings['o_smtp_ssl'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather_config['o_smtp_ssl'] == '0') {
+										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather->forum_settings['o_smtp_ssl'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('SMTP SSL help') ?></span>
@@ -714,10 +714,10 @@
 								<tr>
 									<th scope="row"><?php _e('Allow new label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather_config['o_regs_allow'] == '1') {
+										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather->forum_settings['o_regs_allow'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather_config['o_regs_allow'] == '0') {
+										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather->forum_settings['o_regs_allow'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Allow new help') ?></span>
@@ -726,10 +726,10 @@
 								<tr>
 									<th scope="row"><?php _e('Verify label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather_config['o_regs_verify'] == '1') {
+										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather->forum_settings['o_regs_verify'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather_config['o_regs_verify'] == '0') {
+										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather->forum_settings['o_regs_verify'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Verify help') ?></span>
@@ -738,10 +738,10 @@
 								<tr>
 									<th scope="row"><?php _e('Report new label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather_config['o_regs_report'] == '1') {
+										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather->forum_settings['o_regs_report'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather_config['o_regs_report'] == '0') {
+										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather->forum_settings['o_regs_report'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Report new help') ?></span>
@@ -750,10 +750,10 @@
 								<tr>
 									<th scope="row"><?php _e('Use rules label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather_config['o_rules'] == '1') {
+										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather->forum_settings['o_rules'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather_config['o_rules'] == '0') {
+										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather->forum_settings['o_rules'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Use rules help') ?></span>
@@ -762,7 +762,7 @@
 								<tr>
 									<th scope="row"><?php _e('Rules label') ?></th>
 									<td>
-										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather_config['o_rules_message']) ?></textarea>
+										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather->forum_settings['o_rules_message']) ?></textarea>
 										<span><?php _e('Rules help') ?></span>
 									</td>
 								</tr>
@@ -770,13 +770,13 @@
 									<th scope="row"><?php _e('E-mail default label') ?></th>
 									<td>
 										<span><?php _e('E-mail default help') ?></span>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather_config['o_default_email_setting'] == '0') {
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather->forum_settings['o_default_email_setting'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<?php _e('Display e-mail label') ?></label>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather_config['o_default_email_setting'] == '1') {
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather->forum_settings['o_default_email_setting'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<?php _e('Hide allow form label') ?></label>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather_config['o_default_email_setting'] == '2') {
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather->forum_settings['o_default_email_setting'] == '2') {
     echo ' checked="checked"';
 } ?> />&#160;<?php _e('Hide both label') ?></label>
 									</td>
@@ -793,10 +793,10 @@
 								<tr>
 									<th scope="row"><?php _e('Display announcement label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather_config['o_announcement'] == '1') {
+										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather->forum_settings['o_announcement'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather_config['o_announcement'] == '0') {
+										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather->forum_settings['o_announcement'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Display announcement help') ?></span>
@@ -805,7 +805,7 @@
 								<tr>
 									<th scope="row"><?php _e('Announcement message label') ?></th>
 									<td>
-										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_announcement_message']) ?></textarea>
+										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_announcement_message']) ?></textarea>
 										<span><?php _e('Announcement message help') ?></span>
 									</td>
 								</tr>
@@ -821,10 +821,10 @@
 								<tr>
 									<th scope="row"><a name="maintenance"></a><?php _e('Maintenance mode label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather_config['o_maintenance'] == '1') {
+										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather->forum_settings['o_maintenance'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather_config['o_maintenance'] == '0') {
+										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather->forum_settings['o_maintenance'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Maintenance mode help') ?></span>
@@ -833,7 +833,7 @@
 								<tr>
 									<th scope="row"><?php _e('Maintenance message label') ?></th>
 									<td>
-										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_maintenance_message']) ?></textarea>
+										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
 										<span><?php _e('Maintenance message help') ?></span>
 									</td>
 								</tr>
diff --git a/style/FeatherBB/view/admin/parser.php b/style/FeatherBB/view/admin/parser.php
index aec1f767..e32369b6 100644
--- a/style/FeatherBB/view/admin/parser.php
+++ b/style/FeatherBB/view/admin/parser.php
@@ -208,7 +208,7 @@
 									<th scope="row"><?php echo($lang_admin_parser['smiley_upload']); ?></th>
  <?php if (ini_get('file_uploads')) {
     ?>
-									<td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
+									<td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 										<input type="file" name="new_smiley" id="upload_smiley" /></td>
 									<td><input type="submit" name="upload" value="<?php echo($lang_admin_parser['upload_button']);
     ?>" /></td>
diff --git a/style/FeatherBB/view/admin/permissions.php b/style/FeatherBB/view/admin/permissions.php
index a70328ae..2b1bf413 100644
--- a/style/FeatherBB/view/admin/permissions.php
+++ b/style/FeatherBB/view/admin/permissions.php
@@ -28,10 +28,10 @@
 								<tr>
 									<th scope="row"><?php _e('BBCode label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather_config['p_message_bbcode'] == '1') {
+										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather->forum_settings['p_message_bbcode'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather_config['p_message_bbcode'] == '0') {
+										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather->forum_settings['p_message_bbcode'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('BBCode help') ?></span>
@@ -40,10 +40,10 @@
 								<tr>
 									<th scope="row"><?php _e('Image tag label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather_config['p_message_img_tag'] == '1') {
+										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather->forum_settings['p_message_img_tag'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather_config['p_message_img_tag'] == '0') {
+										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather->forum_settings['p_message_img_tag'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Image tag help') ?></span>
@@ -52,10 +52,10 @@
 								<tr>
 									<th scope="row"><?php _e('All caps message label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather_config['p_message_all_caps'] == '1') {
+										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather->forum_settings['p_message_all_caps'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather_config['p_message_all_caps'] == '0') {
+										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather->forum_settings['p_message_all_caps'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('All caps message help') ?></span>
@@ -64,10 +64,10 @@
 								<tr>
 									<th scope="row"><?php _e('All caps subject label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather_config['p_subject_all_caps'] == '1') {
+										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather->forum_settings['p_subject_all_caps'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather_config['p_subject_all_caps'] == '0') {
+										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather->forum_settings['p_subject_all_caps'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('All caps subject help') ?></span>
@@ -76,10 +76,10 @@
 								<tr>
 									<th scope="row"><?php _e('Require e-mail label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather_config['p_force_guest_email'] == '1') {
+										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather->forum_settings['p_force_guest_email'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather_config['p_force_guest_email'] == '0') {
+										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather->forum_settings['p_force_guest_email'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Require e-mail help') ?></span>
@@ -97,10 +97,10 @@
 								<tr>
 									<th scope="row"><?php _e('BBCode sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather_config['p_sig_bbcode'] == '1') {
+										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather->forum_settings['p_sig_bbcode'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather_config['p_sig_bbcode'] == '0') {
+										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather->forum_settings['p_sig_bbcode'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('BBCode sigs help') ?></span>
@@ -109,10 +109,10 @@
 								<tr>
 									<th scope="row"><?php _e('Image tag sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather_config['p_sig_img_tag'] == '1') {
+										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather->forum_settings['p_sig_img_tag'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather_config['p_sig_img_tag'] == '0') {
+										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather->forum_settings['p_sig_img_tag'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Image tag sigs help') ?></span>
@@ -121,10 +121,10 @@
 								<tr>
 									<th scope="row"><?php _e('All caps sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather_config['p_sig_all_caps'] == '1') {
+										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather->forum_settings['p_sig_all_caps'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather_config['p_sig_all_caps'] == '0') {
+										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather->forum_settings['p_sig_all_caps'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('All caps sigs help') ?></span>
@@ -133,14 +133,14 @@
 								<tr>
 									<th scope="row"><?php _e('Max sig length label') ?></th>
 									<td>
-										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather_config['p_sig_length'] ?>" />
+										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather->forum_settings['p_sig_length'] ?>" />
 										<span class="clearb"><?php _e('Max sig length help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max sig lines label') ?></th>
 									<td>
-										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather_config['p_sig_lines'] ?>" />
+										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather->forum_settings['p_sig_lines'] ?>" />
 										<span class="clearb"><?php _e('Max sig lines help') ?></span>
 									</td>
 								</tr>
@@ -156,10 +156,10 @@
 								<tr>
 									<th scope="row"><?php _e('Banned e-mail label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather_config['p_allow_banned_email'] == '1') {
+										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather->forum_settings['p_allow_banned_email'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather_config['p_allow_banned_email'] == '0') {
+										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather->forum_settings['p_allow_banned_email'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Banned e-mail help') ?></span>
@@ -168,10 +168,10 @@
 								<tr>
 									<th scope="row"><?php _e('Duplicate e-mail label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather_config['p_allow_dupe_email'] == '1') {
+										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather_config['p_allow_dupe_email'] == '0') {
+										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Duplicate e-mail help') ?></span>
diff --git a/style/FeatherBB/view/edit.php b/style/FeatherBB/view/edit.php
index 48a692e8..829d0c17 100644
--- a/style/FeatherBB/view/edit.php
+++ b/style/FeatherBB/view/edit.php
@@ -89,10 +89,10 @@
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/style/FeatherBB/view/footer.new.php b/style/FeatherBB/view/footer.new.php
index 26d09007..13b79669 100644
--- a/style/FeatherBB/view/footer.new.php
+++ b/style/FeatherBB/view/footer.new.php
@@ -15,15 +15,15 @@
 	<div class="box">
 <?php
 
-if (isset($footer_style) && ($footer_style == 'viewforum' || $footer_style == 'viewtopic') && $feather->user->is_admmod) {
+if (isset($active_page) && ($active_page == 'viewforum' || $active_page == 'viewtopic') && $feather->user->is_admmod) {
     echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
 
-    if ($footer_style == 'viewforum') {
+    if ($active_page == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$fid.'/page/'.$page_number.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
-    } elseif ($footer_style == 'viewtopic') {
+    } elseif ($active_page == 'viewtopic') {
         if (isset($pid)) {
             $parameter = 'param/'.$pid.'/';
         } elseif (isset($page_number) && $page_number != 1) {
@@ -86,19 +86,19 @@
 			<div class="conr">
 <?php
 
-if ($footer_style == 'index') {
+if ($active_page == 'index') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
-} elseif ($footer_style == 'viewforum') {
+} elseif ($active_page == 'viewforum') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
-} elseif ($footer_style == 'viewtopic') {
+} elseif ($active_page == 'viewtopic') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
@@ -143,6 +143,10 @@
 </body>
 <!-- JS -->
 <?php foreach ($assets['js'] as $script) {
-    echo '<script src="'.get_base_url().'/'.$script['file'].'"></script>'."\n";
+    echo '<script ';
+    foreach ($script['params'] as $key => $value) {
+        echo $key.'="'.$value.'" ';
+    }
+    echo 'href="'.get_base_url().'/'.$script['file'].'"/>'."\n";
 } ?>
 </html>
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
index 470d5c6b..2826444c 100644
--- a/style/FeatherBB/view/footer.php
+++ b/style/FeatherBB/view/footer.php
@@ -63,7 +63,7 @@
 
 <?php
 // Display the "Jump to" drop list
-if ($feather_config['o_quickjump'] == '1' && !empty($quickjump)) { ?>
+if ($feather->forum_settings['o_quickjump'] == '1' && !empty($quickjump)) { ?>
 			<div class="conl">
 			<form id="qjump" method="get" action="">
 				<div><label><span><?php _e('Jump to') ?><br /></span></label>
@@ -87,27 +87,27 @@
 <?php
 
 if ($footer_style == 'index') {
-    if ($feather_config['o_feed_type'] == '1') {
+    if ($feather->forum_settings['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
-    } elseif ($feather_config['o_feed_type'] == '2') {
+    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewforum') {
-    if ($feather_config['o_feed_type'] == '1') {
+    if ($feather->forum_settings['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
-    } elseif ($feather_config['o_feed_type'] == '2') {
+    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewtopic') {
-    if ($feather_config['o_feed_type'] == '1') {
+    if ($feather->forum_settings['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
-    } elseif ($feather_config['o_feed_type'] == '2') {
+    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
     }
 }
 
 ?>
-				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
+				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather->forum_settings['o_show_version'] == '1') ? ' '.$feather->forum_settings['o_cur_version'] : '')) ?></p>
 			</div>
 			<div class="clearer"></div>
 		</div>
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index 539d17ba..ff65adda 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -19,9 +19,19 @@
     echo "\t".'<meta name="robots" content="noindex, follow">'."\n";
 } ?>
     <title><?php echo generate_page_title($title, $page_number) ?></title>
-    <!-- CSS -->
-<?php foreach ($assets['css'] as $style) {
-    echo "\t".'<link rel="stylesheet" type="text/css" href="'.get_base_url().'/'.$style['file'].'">'."\n";
+<?php
+foreach($assets as $type => $items) {
+    if ($type == 'js') {
+        continue;
+    }
+    echo "\t".'<!-- '.ucfirst($type).' -->'."\n";
+    foreach ($items as $item) {
+        echo "\t".'<link ';
+        foreach ($item['params'] as $key => $value) {
+            echo $key.'="'.$value.'" ';
+        }
+        echo 'href="'.get_base_url().'/'.$item['file'].'">'."\n";
+    }
 }
 if ($admin_console) {
     if (file_exists($feather->forum_env['FEATHER_ROOT'].'style/'.$feather->user->style.'/base_admin.css')) {
@@ -29,7 +39,7 @@
     } else {
         echo "\t".'<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/imports/base_admin.css" />'."\n";
     }
-}  
+}
 if (isset($required_fields)) :
     // Output JavaScript to validate form (make sure required fields are filled out)
 
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
index 9b662b3a..0068a5f6 100644
--- a/style/FeatherBB/view/header.php
+++ b/style/FeatherBB/view/header.php
@@ -92,21 +92,21 @@ function process_form(the_form)
         <div class="container-title-status">
             <h1 class="title-site">
                 <a href="<?php echo get_base_url() ?>" title="" class="site-name">
-                    <p><?php echo feather_escape($feather_config['o_board_title']) ?></p>
+                    <p><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></p>
                 </a>
-                <div id="brddesc"><?php echo htmlspecialchars_decode($feather_config['o_board_desc']) ?></div>
+                <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
             </h1>
             <div class="status-avatar">
                 <?php echo $page_info ?>
             </div>
             <div class="clear"></div>
         </div>
-        <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
+        <?php if ($feather->user->g_read_board == '1' && $feather->forum_settings['o_announcement'] == '1') : ?>
             <div id="announce" class="block">
                 <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
                 <div class="box">
                     <div id="announce-block" class="inbox">
-                        <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
+                        <div class="usercontent"><?php echo $feather->forum_settings['o_announcement_message'] ?></div>
                     </div>
                 </div>
             </div>
diff --git a/style/FeatherBB/view/help.php b/style/FeatherBB/view/help.php
index 2ecf9e36..d171ddab 100644
--- a/style/FeatherBB/view/help.php
+++ b/style/FeatherBB/view/help.php
@@ -41,7 +41,7 @@
 <div class="box">
 	<div class="inbox">
 		<p><?php _e('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
+		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
 		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
 		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
diff --git a/style/FeatherBB/view/index.php b/style/FeatherBB/view/index.php
index 3142e1bd..cc51e8b5 100644
--- a/style/FeatherBB/view/index.php
+++ b/style/FeatherBB/view/index.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -92,13 +92,13 @@
 			<dl class="conl">
 				<dt><strong><?php _e('User info') ?></strong></dt>
 				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
-				<?php if ($feather_config['o_users_online'] == 1) : ?>
+				<?php if ($feather->forum_settings['o_users_online'] == 1) : ?>
 				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
 				<dd><span><?php printf(__('Guests online'), '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
 				<?php endif; ?>
 			</dl>
 			<?php
-            if ($feather_config['o_users_online'] == 1) :
+            if ($feather->forum_settings['o_users_online'] == 1) :
                 if ($online['num_users'] > 0) {
                     echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
                 } else {
@@ -108,4 +108,4 @@
             ?>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/FeatherBB/view/misc/email.php b/style/FeatherBB/view/misc/email.php
index eb44dafb..06f96f55 100644
--- a/style/FeatherBB/view/misc/email.php
+++ b/style/FeatherBB/view/misc/email.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -34,4 +34,4 @@
 			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/FeatherBB/view/misc/rules.php b/style/FeatherBB/view/misc/rules.php
index 366880ee..feb662ad 100644
--- a/style/FeatherBB/view/misc/rules.php
+++ b/style/FeatherBB/view/misc/rules.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -17,7 +17,7 @@
 	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<div id="rules-block" class="inbox">
-			<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
+			<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/FeatherBB/view/moderate/moderator_forum.php b/style/FeatherBB/view/moderate/moderator_forum.php
index 35b67b41..8b636222 100644
--- a/style/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/FeatherBB/view/moderate/moderator_forum.php
@@ -40,7 +40,7 @@
 				<tr>
 					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
 					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
 <?php endif; ?>					<th class="tcr"><?php _e('Last post') ?></th>
 					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
 				</tr>
@@ -63,7 +63,7 @@
 						</div>
 					</td>
 					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_replies']) : '-' ?></td>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_views']) : '-' ?></td>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_views']) : '-' ?></td>
 <?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_disp'] ?></td>
 					<td class="tcmod"><input type="checkbox" name="topics[<?php echo $topic['id'] ?>]" value="1" /></td>
@@ -72,7 +72,7 @@
 
             }
             if (empty($topic_data)):
-                $colspan = ($feather_config['o_topic_views'] == '1') ? 5 : 4;
+                $colspan = ($feather->forum_settings['o_topic_views'] == '1') ? 5 : 4;
                 $button_status = ' disabled="disabled"';
                 echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
             endif;
diff --git a/style/FeatherBB/view/post.php b/style/FeatherBB/view/post.php
index f1d22d07..ee2531da 100644
--- a/style/FeatherBB/view/post.php
+++ b/style/FeatherBB/view/post.php
@@ -98,14 +98,14 @@
                                                 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if ($feather->user->is_guest) {
-    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-    $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
+    $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+    $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
 						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
     echo feather_escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
+						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
     echo feather_escape($post['email']);
 }
     ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
@@ -121,10 +121,10 @@
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -172,7 +172,7 @@
 
 
 <?php
-if ($tid && $feather_config['o_topic_review'] != '0') :
+if ($tid && $feather->forum_settings['o_topic_review'] != '0') :
 ?>
 <div id="postreview">
 	<h2><span><?php _e('Topic review') ?></span></h2>
diff --git a/style/FeatherBB/view/profile/section_display.php b/style/FeatherBB/view/profile/section_display.php
index 5da0f4b4..ced4459f 100644
--- a/style/FeatherBB/view/profile/section_display.php
+++ b/style/FeatherBB/view/profile/section_display.php
@@ -55,26 +55,26 @@
     }
 
 ?>
-<?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1' || $feather_config['o_signatures'] == '1' || $feather_config['o_avatars'] == '1' || ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1')): ?>
+<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1' || $feather->forum_settings['o_signatures'] == '1' || $feather->forum_settings['o_avatars'] == '1' || ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1')): ?>
 			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Post display legend') ?></legend>
 					<div class="infldset">
 						<p><?php _e('Post display info') ?></p>
 						<div class="rbox">
-<?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
+<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show smilies') ?><br /></label>
-<?php endif; if ($feather_config['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show sigs') ?><br /></label>
-<?php endif; if ($feather_config['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
+<?php endif; if ($feather->forum_settings['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show avatars') ?><br /></label>
-<?php endif; if ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
+<?php endif; if ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show images') ?><br /></label>
-<?php endif; if ($feather_config['o_signatures'] == '1' && $feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1' && $feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show images sigs') ?><br /></label>
 <?php endif; ?>
diff --git a/style/FeatherBB/view/profile/section_personality.php b/style/FeatherBB/view/profile/section_personality.php
index 3624e5e6..2b8f9c82 100644
--- a/style/FeatherBB/view/profile/section_personality.php
+++ b/style/FeatherBB/view/profile/section_personality.php
@@ -19,7 +19,7 @@
 		<form id="profile4" method="post" action="<?php echo get_link('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
-<?php if ($feather_config['o_avatars'] == '1'): ?>				<div class="inform">
+<?php if ($feather->forum_settings['o_avatars'] == '1'): ?>				<div class="inform">
 				<fieldset id="profileavatar">
 					<legend><?php _e('Avatar legend') ?></legend>
 					<div class="infldset">
@@ -29,20 +29,20 @@
 					</div>
 				</fieldset>
 			</div>
-<?php endif; if ($feather_config['o_signatures'] == '1'): ?>				<div class="inform">
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>				<div class="inform">
 				<fieldset>
 					<legend><?php _e('Signature legend') ?></legend>
 					<div class="infldset">
 						<p><?php _e('Signature info') ?></p>
 						<div class="txtarea">
-							<label><?php printf(__('Sig max size'), forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
+							<label><?php printf(__('Sig max size'), forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
diff --git a/style/FeatherBB/view/profile/section_privacy.php b/style/FeatherBB/view/profile/section_privacy.php
index 36930415..1d972113 100644
--- a/style/FeatherBB/view/profile/section_privacy.php
+++ b/style/FeatherBB/view/profile/section_privacy.php
@@ -38,7 +38,7 @@
 					</div>
 				</fieldset>
 			</div>
-<?php if ($feather_config['o_forum_subscriptions'] == '1' || $feather_config['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
+<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1' || $feather->forum_settings['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
 				<fieldset>
 					<legend><?php _e('Subscription legend') ?></legend>
 					<div class="infldset">
@@ -46,7 +46,7 @@
 							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Notify full') ?><br /></label>
-<?php if ($feather_config['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
+<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Auto notify full') ?><br /></label>
 <?php endif; ?>
diff --git a/style/FeatherBB/view/register/form.php b/style/FeatherBB/view/register/form.php
index f1a360ef..bdff9a2b 100644
--- a/style/FeatherBB/view/register/form.php
+++ b/style/FeatherBB/view/register/form.php
@@ -59,7 +59,7 @@
 					</div>
 				</fieldset>
 			</div>
-<?php if ($feather_config['o_regs_verify'] == '0'): ?>			<div class="inform">
+<?php if ($feather->forum_settings['o_regs_verify'] == '0'): ?>			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Pass legend') ?></legend>
 					<div class="infldset">
@@ -75,14 +75,14 @@
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
+					<legend><?php echo($feather->forum_settings['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
+<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
 <?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
     echo feather_escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
+<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
     echo feather_escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
@@ -102,7 +102,7 @@
 <?php
 
             foreach ($languages as $temp) {
-                if ($feather_config['o_default_lang'] == $temp) {
+                if ($feather->forum_settings['o_default_lang'] == $temp) {
                     echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
                 } else {
                     echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
diff --git a/style/FeatherBB/view/register/rules.php b/style/FeatherBB/view/register/rules.php
index cef62405..7f986063 100644
--- a/style/FeatherBB/view/register/rules.php
+++ b/style/FeatherBB/view/register/rules.php
@@ -22,7 +22,7 @@
 				<fieldset>
 					<legend><?php _e('Rules legend') ?></legend>
 					<div class="infldset">
-						<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
+						<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/search/form.php b/style/FeatherBB/view/search/form.php
index 4731b068..16cd788a 100644
--- a/style/FeatherBB/view/search/form.php
+++ b/style/FeatherBB/view/search/form.php
@@ -41,7 +41,7 @@
 						</select>
 						<br /></label>
 						<p class="clearl"><?php _e('Search in info') ?></p>
-<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
+<?php echo($feather->forum_settings['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/viewforum.php b/style/FeatherBB/view/viewforum.php
index a35faf22..a9673fa0 100644
--- a/style/FeatherBB/view/viewforum.php
+++ b/style/FeatherBB/view/viewforum.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -36,7 +36,7 @@
 				<tr>
 					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
 					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
 <?php endif; ?>					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
 				</tr>
 			</thead>
@@ -56,7 +56,7 @@
 							</div>
 						</td>
 						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_replies']) : '-' ?></td>
-	<?php if ($feather_config['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_views']) : '-' ?></td>
+	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_views']) : '-' ?></td>
 	<?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_formatted'] ?></td>
 					</tr>
@@ -66,7 +66,7 @@
             if (empty($forum_data)):
             ?>
 					<tr class="rowodd inone">
-						<td class="tcl" colspan="<?php echo($feather_config['o_topic_views'] == 1) ? 4 : 3 ?>">
+						<td class="tcl" colspan="<?php echo($feather->forum_settings['o_topic_views'] == 1) ? 4 : 3 ?>">
 							<div class="icon inone"><div class="nosize"><!-- --></div></div>
 							<div class="tclcon">
 								<div>
@@ -97,4 +97,4 @@
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
 		<div class="clearer"></div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/FeatherBB/view/viewtopic.php b/style/FeatherBB/view/viewtopic.php
index e2681757..e982045b 100644
--- a/style/FeatherBB/view/viewtopic.php
+++ b/style/FeatherBB/view/viewtopic.php
@@ -134,16 +134,16 @@
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
-						<input type="hidden" name="page" value="<?php echo feather_escape($p) ?>" />
-<?php if ($feather_config['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
+						<input type="hidden" name="page" value="<?php echo feather_escape($page_number) ?>" />
+<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
 <?php endif;
 
     if ($feather->user->is_guest) {
-        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-        $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
+        $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+        $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
         ?>
 						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
 <?php
 
@@ -163,13 +163,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>
diff --git a/view/admin/censoring.php b/view/admin/censoring.php
index 71c253f7..cf080869 100644
--- a/view/admin/censoring.php
+++ b/view/admin/censoring.php
@@ -22,7 +22,7 @@
 					<fieldset>
 						<legend><?php _e('Add word subhead') ?></legend>
 						<div class="infldset">
-							<p><?php _e('Add word info').' '.($feather_config['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
+							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
 							<table>
 							<thead>
 								<tr>
diff --git a/view/admin/groups/add_edit_group.php b/view/admin/groups/add_edit_group.php
index bc2bc244..ae278dce 100644
--- a/view/admin/groups/add_edit_group.php
+++ b/view/admin/groups/add_edit_group.php
@@ -54,7 +54,7 @@
 										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
 									</td>
 								</tr>
-<?php if ($group['mode'] != 'edit' || $feather_config['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
+<?php if ($group['mode'] != 'edit' || $feather->forum_settings['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
 									<th scope="row"> <?php _e('Mod privileges label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
diff --git a/view/admin/groups/admin_groups.php b/view/admin/groups/admin_groups.php
index 643b4883..aff5db98 100644
--- a/view/admin/groups/admin_groups.php
+++ b/view/admin/groups/admin_groups.php
@@ -31,7 +31,7 @@
 
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
-        if ($cur_group['g_id'] == $feather_config['o_default_user_group']) {
+        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
         } else {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
@@ -64,7 +64,7 @@
 
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
-        if ($cur_group['g_id'] == $feather_config['o_default_user_group']) {
+        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
         } else {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
diff --git a/view/admin/index.php b/view/admin/index.php
index dc0dcf8c..f369b039 100644
--- a/view/admin/index.php
+++ b/view/admin/index.php
@@ -45,7 +45,7 @@
 				<dl>
 					<dt><?php _e('FeatherBB version label') ?></dt>
 					<dd>
-						<?php printf(__('FeatherBB version data')."\n", $feather_config['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
+						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
 					</dd>
 					<dt><?php _e('Server statistics label') ?></dt>
 					<dd>
diff --git a/view/admin/menu.php b/view/admin/menu.php
index 29d6bee7..fd7c79b3 100644
--- a/view/admin/menu.php
+++ b/view/admin/menu.php
@@ -32,7 +32,7 @@
 }
     ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
 <?php endif;
-    if ($is_admin || $feather_config['o_report_method'] == '0' || $feather_config['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
+    if ($is_admin || $feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
     echo ' class="isactive"';
 }
     ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
diff --git a/view/admin/options.php b/view/admin/options.php
index faa8e34c..88c2c0b6 100644
--- a/view/admin/options.php
+++ b/view/admin/options.php
@@ -28,21 +28,21 @@
 								<tr>
 									<th scope="row"><?php _e('Board title label') ?></th>
 									<td>
-										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather_config['o_board_title']) ?>" />
+										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>" />
 										<span><?php _e('Board title help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Board desc label') ?></th>
 									<td>
-										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather_config['o_board_desc']) ?></textarea>
+										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather->forum_settings['o_board_desc']) ?></textarea>
 										<span><?php _e('Board desc help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Base URL label') ?></th>
 									<td>
-										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather_config['o_base_url']) ?>" />
+										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather->forum_settings['o_base_url']) ?>" />
 										<span><?php _e('Base URL help') ?></span>
 									</td>
 								</tr>
@@ -50,124 +50,124 @@
 									<th scope="row"><?php _e('Timezone label') ?></th>
 									<td>
 										<select name="form_default_timezone">
-											<option value="-12"<?php if ($feather_config['o_default_timezone'] == -12) {
+											<option value="-12"<?php if ($feather->forum_settings['o_default_timezone'] == -12) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-12:00') ?></option>
-											<option value="-11"<?php if ($feather_config['o_default_timezone'] == -11) {
+											<option value="-11"<?php if ($feather->forum_settings['o_default_timezone'] == -11) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-11:00') ?></option>
-											<option value="-10"<?php if ($feather_config['o_default_timezone'] == -10) {
+											<option value="-10"<?php if ($feather->forum_settings['o_default_timezone'] == -10) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-10:00') ?></option>
-											<option value="-9.5"<?php if ($feather_config['o_default_timezone'] == -9.5) {
+											<option value="-9.5"<?php if ($feather->forum_settings['o_default_timezone'] == -9.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-09:30') ?></option>
-											<option value="-9"<?php if ($feather_config['o_default_timezone'] == -9) {
+											<option value="-9"<?php if ($feather->forum_settings['o_default_timezone'] == -9) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-09:00') ?></option>
-											<option value="-8.5"<?php if ($feather_config['o_default_timezone'] == -8.5) {
+											<option value="-8.5"<?php if ($feather->forum_settings['o_default_timezone'] == -8.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-08:30') ?></option>
-											<option value="-8"<?php if ($feather_config['o_default_timezone'] == -8) {
+											<option value="-8"<?php if ($feather->forum_settings['o_default_timezone'] == -8) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-08:00') ?></option>
-											<option value="-7"<?php if ($feather_config['o_default_timezone'] == -7) {
+											<option value="-7"<?php if ($feather->forum_settings['o_default_timezone'] == -7) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-07:00') ?></option>
-											<option value="-6"<?php if ($feather_config['o_default_timezone'] == -6) {
+											<option value="-6"<?php if ($feather->forum_settings['o_default_timezone'] == -6) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-06:00') ?></option>
-											<option value="-5"<?php if ($feather_config['o_default_timezone'] == -5) {
+											<option value="-5"<?php if ($feather->forum_settings['o_default_timezone'] == -5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-05:00') ?></option>
-											<option value="-4"<?php if ($feather_config['o_default_timezone'] == -4) {
+											<option value="-4"<?php if ($feather->forum_settings['o_default_timezone'] == -4) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-04:00') ?></option>
-											<option value="-3.5"<?php if ($feather_config['o_default_timezone'] == -3.5) {
+											<option value="-3.5"<?php if ($feather->forum_settings['o_default_timezone'] == -3.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-03:30') ?></option>
-											<option value="-3"<?php if ($feather_config['o_default_timezone'] == -3) {
+											<option value="-3"<?php if ($feather->forum_settings['o_default_timezone'] == -3) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-03:00') ?></option>
-											<option value="-2"<?php if ($feather_config['o_default_timezone'] == -2) {
+											<option value="-2"<?php if ($feather->forum_settings['o_default_timezone'] == -2) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-02:00') ?></option>
-											<option value="-1"<?php if ($feather_config['o_default_timezone'] == -1) {
+											<option value="-1"<?php if ($feather->forum_settings['o_default_timezone'] == -1) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC-01:00') ?></option>
-											<option value="0"<?php if ($feather_config['o_default_timezone'] == 0) {
+											<option value="0"<?php if ($feather->forum_settings['o_default_timezone'] == 0) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC') ?></option>
-											<option value="1"<?php if ($feather_config['o_default_timezone'] == 1) {
+											<option value="1"<?php if ($feather->forum_settings['o_default_timezone'] == 1) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+01:00') ?></option>
-											<option value="2"<?php if ($feather_config['o_default_timezone'] == 2) {
+											<option value="2"<?php if ($feather->forum_settings['o_default_timezone'] == 2) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+02:00') ?></option>
-											<option value="3"<?php if ($feather_config['o_default_timezone'] == 3) {
+											<option value="3"<?php if ($feather->forum_settings['o_default_timezone'] == 3) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+03:00') ?></option>
-											<option value="3.5"<?php if ($feather_config['o_default_timezone'] == 3.5) {
+											<option value="3.5"<?php if ($feather->forum_settings['o_default_timezone'] == 3.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+03:30') ?></option>
-											<option value="4"<?php if ($feather_config['o_default_timezone'] == 4) {
+											<option value="4"<?php if ($feather->forum_settings['o_default_timezone'] == 4) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+04:00') ?></option>
-											<option value="4.5"<?php if ($feather_config['o_default_timezone'] == 4.5) {
+											<option value="4.5"<?php if ($feather->forum_settings['o_default_timezone'] == 4.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+04:30') ?></option>
-											<option value="5"<?php if ($feather_config['o_default_timezone'] == 5) {
+											<option value="5"<?php if ($feather->forum_settings['o_default_timezone'] == 5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+05:00') ?></option>
-											<option value="5.5"<?php if ($feather_config['o_default_timezone'] == 5.5) {
+											<option value="5.5"<?php if ($feather->forum_settings['o_default_timezone'] == 5.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+05:30') ?></option>
-											<option value="5.75"<?php if ($feather_config['o_default_timezone'] == 5.75) {
+											<option value="5.75"<?php if ($feather->forum_settings['o_default_timezone'] == 5.75) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+05:45') ?></option>
-											<option value="6"<?php if ($feather_config['o_default_timezone'] == 6) {
+											<option value="6"<?php if ($feather->forum_settings['o_default_timezone'] == 6) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+06:00') ?></option>
-											<option value="6.5"<?php if ($feather_config['o_default_timezone'] == 6.5) {
+											<option value="6.5"<?php if ($feather->forum_settings['o_default_timezone'] == 6.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+06:30') ?></option>
-											<option value="7"<?php if ($feather_config['o_default_timezone'] == 7) {
+											<option value="7"<?php if ($feather->forum_settings['o_default_timezone'] == 7) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+07:00') ?></option>
-											<option value="8"<?php if ($feather_config['o_default_timezone'] == 8) {
+											<option value="8"<?php if ($feather->forum_settings['o_default_timezone'] == 8) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+08:00') ?></option>
-											<option value="8.75"<?php if ($feather_config['o_default_timezone'] == 8.75) {
+											<option value="8.75"<?php if ($feather->forum_settings['o_default_timezone'] == 8.75) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+08:45') ?></option>
-											<option value="9"<?php if ($feather_config['o_default_timezone'] == 9) {
+											<option value="9"<?php if ($feather->forum_settings['o_default_timezone'] == 9) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+09:00') ?></option>
-											<option value="9.5"<?php if ($feather_config['o_default_timezone'] == 9.5) {
+											<option value="9.5"<?php if ($feather->forum_settings['o_default_timezone'] == 9.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+09:30') ?></option>
-											<option value="10"<?php if ($feather_config['o_default_timezone'] == 10) {
+											<option value="10"<?php if ($feather->forum_settings['o_default_timezone'] == 10) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+10:00') ?></option>
-											<option value="10.5"<?php if ($feather_config['o_default_timezone'] == 10.5) {
+											<option value="10.5"<?php if ($feather->forum_settings['o_default_timezone'] == 10.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+10:30') ?></option>
-											<option value="11"<?php if ($feather_config['o_default_timezone'] == 11) {
+											<option value="11"<?php if ($feather->forum_settings['o_default_timezone'] == 11) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+11:00') ?></option>
-											<option value="11.5"<?php if ($feather_config['o_default_timezone'] == 11.5) {
+											<option value="11.5"<?php if ($feather->forum_settings['o_default_timezone'] == 11.5) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+11:30') ?></option>
-											<option value="12"<?php if ($feather_config['o_default_timezone'] == 12) {
+											<option value="12"<?php if ($feather->forum_settings['o_default_timezone'] == 12) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+12:00') ?></option>
-											<option value="12.75"<?php if ($feather_config['o_default_timezone'] == 12.75) {
+											<option value="12.75"<?php if ($feather->forum_settings['o_default_timezone'] == 12.75) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+12:45') ?></option>
-											<option value="13"<?php if ($feather_config['o_default_timezone'] == 13) {
+											<option value="13"<?php if ($feather->forum_settings['o_default_timezone'] == 13) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+13:00') ?></option>
-											<option value="14"<?php if ($feather_config['o_default_timezone'] == 14) {
+											<option value="14"<?php if ($feather->forum_settings['o_default_timezone'] == 14) {
     echo ' selected="selected"';
 } ?>><?php _e('UTC+14:00') ?></option>
 										</select>
@@ -177,10 +177,10 @@
 								<tr>
 									<th scope="row"><?php _e('DST label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather_config['o_default_dst'] == '1') {
+										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather->forum_settings['o_default_dst'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather_config['o_default_dst'] == '0') {
+										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather->forum_settings['o_default_dst'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('DST help') ?></span>
@@ -192,7 +192,7 @@
 										<select name="form_default_lang">
 <?php
         foreach ($languages as $temp) {
-            if ($feather_config['o_default_lang'] == $temp) {
+            if ($feather->forum_settings['o_default_lang'] == $temp) {
                 echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
             } else {
                 echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
@@ -231,35 +231,35 @@
 								<tr>
 									<th scope="row"><?php _e('Time format label') ?></th>
 									<td>
-										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_time_format']) ?>" />
-										<span><?php printf(__('Time format help'), gmdate($feather_config['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather->forum_settings['o_time_format']) ?>" />
+										<span><?php printf(__('Time format help'), gmdate($feather->forum_settings['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Date format label') ?></th>
 									<td>
-										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather_config['o_date_format']) ?>" />
-										<span><?php printf(__('Date format help'), gmdate($feather_config['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather->forum_settings['o_date_format']) ?>" />
+										<span><?php printf(__('Date format help'), gmdate($feather->forum_settings['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Visit timeout label') ?></th>
 									<td>
-										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_visit'] ?>" />
+										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_visit'] ?>" />
 										<span><?php _e('Visit timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Online timeout label') ?></th>
 									<td>
-										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather_config['o_timeout_online'] ?>" />
+										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_online'] ?>" />
 										<span><?php _e('Online timeout help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Redirect time label') ?></th>
 									<td>
-										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather_config['o_redirect_delay'] ?>" />
+										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_redirect_delay'] ?>" />
 										<span><?php _e('Redirect time help') ?></span>
 									</td>
 								</tr>
@@ -275,10 +275,10 @@
 								<tr>
 									<th scope="row"><?php _e('Version number label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather_config['o_show_version'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather->forum_settings['o_show_version'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather_config['o_show_version'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather->forum_settings['o_show_version'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Version number help') ?></span>
@@ -287,10 +287,10 @@
 								<tr>
 									<th scope="row"><?php _e('Info in posts label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather_config['o_show_user_info'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather->forum_settings['o_show_user_info'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather_config['o_show_user_info'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather->forum_settings['o_show_user_info'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Info in posts help') ?></span>
@@ -299,10 +299,10 @@
 								<tr>
 									<th scope="row"><?php _e('Post count label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather_config['o_show_post_count'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather->forum_settings['o_show_post_count'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather_config['o_show_post_count'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather->forum_settings['o_show_post_count'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Post count help') ?></span>
@@ -311,10 +311,10 @@
 								<tr>
 									<th scope="row"><?php _e('Smilies label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather_config['o_smilies'] == '1') {
+										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather->forum_settings['o_smilies'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather_config['o_smilies'] == '0') {
+										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather->forum_settings['o_smilies'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Smilies help') ?></span>
@@ -323,10 +323,10 @@
 								<tr>
 									<th scope="row"><?php _e('Smilies sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather_config['o_smilies_sig'] == '1') {
+										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather->forum_settings['o_smilies_sig'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather_config['o_smilies_sig'] == '0') {
+										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather->forum_settings['o_smilies_sig'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Smilies sigs help') ?></span>
@@ -335,10 +335,10 @@
 								<tr>
 									<th scope="row"><?php _e('Clickable links label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather_config['o_make_links'] == '1') {
+										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather->forum_settings['o_make_links'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather_config['o_make_links'] == '0') {
+										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather->forum_settings['o_make_links'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Clickable links help') ?></span>
@@ -347,35 +347,35 @@
 								<tr>
 									<th scope="row"><?php _e('Topic review label') ?></th>
 									<td>
-										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather_config['o_topic_review'] ?>" />
+										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_topic_review'] ?>" />
 										<span><?php _e('Topic review help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Topics per page label') ?></th>
 									<td>
-										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_topics_default'] ?>" />
+										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_topics_default'] ?>" />
 										<span><?php _e('Topics per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Posts per page label') ?></th>
 									<td>
-										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather_config['o_disp_posts_default'] ?>" />
+										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_posts_default'] ?>" />
 										<span><?php _e('Posts per page help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Indent label') ?></th>
 									<td>
-										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather_config['o_indent_num_spaces'] ?>" />
+										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_indent_num_spaces'] ?>" />
 										<span><?php _e('Indent help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Quote depth label') ?></th>
 									<td>
-										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather_config['o_quote_depth'] ?>" />
+										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_quote_depth'] ?>" />
 										<span><?php _e('Quote depth help') ?></span>
 									</td>
 								</tr>
@@ -391,10 +391,10 @@
 								<tr>
 									<th scope="row"><?php _e('Quick post label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather_config['o_quickpost'] == '1') {
+										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather->forum_settings['o_quickpost'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather_config['o_quickpost'] == '0') {
+										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather->forum_settings['o_quickpost'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Quick post help') ?></span>
@@ -403,10 +403,10 @@
 								<tr>
 									<th scope="row"><?php _e('Users online label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather_config['o_users_online'] == '1') {
+										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather->forum_settings['o_users_online'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather_config['o_users_online'] == '0') {
+										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather->forum_settings['o_users_online'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Users online help') ?></span>
@@ -415,10 +415,10 @@
 								<tr>
 									<th scope="row"><a name="censoring"></a><?php _e('Censor words label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather_config['o_censoring'] == '1') {
+										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather->forum_settings['o_censoring'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather_config['o_censoring'] == '0') {
+										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
@@ -427,10 +427,10 @@
 								<tr>
 									<th scope="row"><a name="signatures"></a><?php _e('Signatures label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather_config['o_signatures'] == '1') {
+										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather->forum_settings['o_signatures'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather_config['o_signatures'] == '0') {
+										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather->forum_settings['o_signatures'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Signatures help') ?></span>
@@ -439,10 +439,10 @@
 								<tr>
 									<th scope="row"><?php _e('User has posted label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather_config['o_show_dot'] == '1') {
+										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather->forum_settings['o_show_dot'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather_config['o_show_dot'] == '0') {
+										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather->forum_settings['o_show_dot'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('User has posted help') ?></span>
@@ -451,10 +451,10 @@
 								<tr>
 									<th scope="row"><?php _e('Topic views label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather_config['o_topic_views'] == '1') {
+										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather->forum_settings['o_topic_views'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather_config['o_topic_views'] == '0') {
+										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather->forum_settings['o_topic_views'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Topic views help') ?></span>
@@ -463,10 +463,10 @@
 								<tr>
 									<th scope="row"><?php _e('Quick jump label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather_config['o_quickjump'] == '1') {
+										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather->forum_settings['o_quickjump'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather_config['o_quickjump'] == '0') {
+										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather->forum_settings['o_quickjump'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Quick jump help') ?></span>
@@ -475,10 +475,10 @@
 								<tr>
 									<th scope="row"><?php _e('GZip label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather_config['o_gzip'] == '1') {
+										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather->forum_settings['o_gzip'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather_config['o_gzip'] == '0') {
+										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather->forum_settings['o_gzip'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('GZip help') ?></span>
@@ -487,10 +487,10 @@
 								<tr>
 									<th scope="row"><?php _e('Search all label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather_config['o_search_all_forums'] == '1') {
+										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather->forum_settings['o_search_all_forums'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather_config['o_search_all_forums'] == '0') {
+										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather->forum_settings['o_search_all_forums'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Search all help') ?></span>
@@ -499,7 +499,7 @@
 								<tr>
 									<th scope="row"><?php _e('Menu items label') ?></th>
 									<td>
-										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather_config['o_additional_navlinks']) ?></textarea>
+										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
 										<span><?php _e('Menu items help') ?></span>
 									</td>
 								</tr>
@@ -515,13 +515,13 @@
 								<tr>
 									<th scope="row"><?php _e('Default feed label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather_config['o_feed_type'] == '0') {
+										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather->forum_settings['o_feed_type'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('None') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather_config['o_feed_type'] == '1') {
+										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather->forum_settings['o_feed_type'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('RSS') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather_config['o_feed_type'] == '2') {
+										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather->forum_settings['o_feed_type'] == '2') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Atom') ?></strong></label>
 										<span class="clearb"><?php _e('Default feed help') ?></span>
@@ -531,7 +531,7 @@
 									<th scope="row"><?php _e('Feed TTL label') ?></th>
 									<td>
 										<select name="form_feed_ttl">
-											<option value="0"<?php if ($feather_config['o_feed_ttl'] == '0') {
+											<option value="0"<?php if ($feather->forum_settings['o_feed_ttl'] == '0') {
     echo ' selected="selected"';
 } ?>><?php _e('No cache') ?></option>
 											<?php echo $times ?>
@@ -551,13 +551,13 @@
 								<tr>
 									<th scope="row"><?php _e('Reporting method label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather_config['o_report_method'] == '0') {
+										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather->forum_settings['o_report_method'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Internal') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather_config['o_report_method'] == '1') {
+										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather->forum_settings['o_report_method'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('By e-mail') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather_config['o_report_method'] == '2') {
+										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather->forum_settings['o_report_method'] == '2') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Both') ?></strong></label>
 										<span class="clearb"><?php _e('Reporting method help') ?></span>
@@ -566,7 +566,7 @@
 								<tr>
 									<th scope="row"><?php _e('Mailing list label') ?></th>
 									<td>
-										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather_config['o_mailing_list']) ?></textarea>
+										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_mailing_list']) ?></textarea>
 										<span><?php _e('Mailing list help') ?></span>
 									</td>
 								</tr>
@@ -582,10 +582,10 @@
 								<tr>
 									<th scope="row"><?php _e('Use avatars label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather_config['o_avatars'] == '1') {
+										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather->forum_settings['o_avatars'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather_config['o_avatars'] == '0') {
+										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather->forum_settings['o_avatars'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Use avatars help') ?></span>
@@ -594,28 +594,28 @@
 								<tr>
 									<th scope="row"><?php _e('Upload directory label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather_config['o_avatars_dir']) ?>" />
+										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather->forum_settings['o_avatars_dir']) ?>" />
 										<span><?php _e('Upload directory help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max width label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_width'] ?>" />
+										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_width'] ?>" />
 										<span><?php _e('Max width help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max height label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather_config['o_avatars_height'] ?>" />
+										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_height'] ?>" />
 										<span><?php _e('Max height help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max size label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather_config['o_avatars_size'] ?>" />
+										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 										<span><?php _e('Max size help') ?></span>
 									</td>
 								</tr>
@@ -631,24 +631,24 @@
 								<tr>
 									<th scope="row"><?php _e('Admin e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_admin_email']) ?>" />
+										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather->forum_settings['o_admin_email']) ?>" />
 										<span><?php _e('Admin e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather_config['o_webmaster_email']) ?>" />
+										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather->forum_settings['o_webmaster_email']) ?>" />
 										<span><?php _e('Webmaster e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Forum subscriptions label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather_config['o_forum_subscriptions'] == '1') {
+										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather_config['o_forum_subscriptions'] == '0') {
+										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Forum subscriptions help') ?></span>
@@ -657,10 +657,10 @@
 								<tr>
 									<th scope="row"><?php _e('Topic subscriptions label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather_config['o_topic_subscriptions'] == '1') {
+										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather_config['o_topic_subscriptions'] == '0') {
+										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Topic subscriptions help') ?></span>
@@ -669,14 +669,14 @@
 								<tr>
 									<th scope="row"><?php _e('SMTP address label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather_config['o_smtp_host']) ?>" />
+										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather->forum_settings['o_smtp_host']) ?>" />
 										<span><?php _e('SMTP address help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('SMTP username label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather_config['o_smtp_user']) ?>" />
+										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather->forum_settings['o_smtp_user']) ?>" />
 										<span><?php _e('SMTP username help') ?></span>
 									</td>
 								</tr>
@@ -684,7 +684,7 @@
 									<th scope="row"><?php _e('SMTP password label') ?></th>
 									<td>
 										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
-<?php $smtp_pass = !empty($feather_config['o_smtp_pass']) ? random_key(feather_strlen($feather_config['o_smtp_pass']), true) : ''; ?>
+<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key(feather_strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
 										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<span><?php _e('SMTP password help') ?></span>
@@ -693,10 +693,10 @@
 								<tr>
 									<th scope="row"><?php _e('SMTP SSL label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather_config['o_smtp_ssl'] == '1') {
+										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather->forum_settings['o_smtp_ssl'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather_config['o_smtp_ssl'] == '0') {
+										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather->forum_settings['o_smtp_ssl'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('SMTP SSL help') ?></span>
@@ -714,10 +714,10 @@
 								<tr>
 									<th scope="row"><?php _e('Allow new label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather_config['o_regs_allow'] == '1') {
+										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather->forum_settings['o_regs_allow'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather_config['o_regs_allow'] == '0') {
+										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather->forum_settings['o_regs_allow'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Allow new help') ?></span>
@@ -726,10 +726,10 @@
 								<tr>
 									<th scope="row"><?php _e('Verify label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather_config['o_regs_verify'] == '1') {
+										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather->forum_settings['o_regs_verify'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather_config['o_regs_verify'] == '0') {
+										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather->forum_settings['o_regs_verify'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Verify help') ?></span>
@@ -738,10 +738,10 @@
 								<tr>
 									<th scope="row"><?php _e('Report new label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather_config['o_regs_report'] == '1') {
+										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather->forum_settings['o_regs_report'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather_config['o_regs_report'] == '0') {
+										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather->forum_settings['o_regs_report'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Report new help') ?></span>
@@ -750,10 +750,10 @@
 								<tr>
 									<th scope="row"><?php _e('Use rules label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather_config['o_rules'] == '1') {
+										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather->forum_settings['o_rules'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather_config['o_rules'] == '0') {
+										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather->forum_settings['o_rules'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Use rules help') ?></span>
@@ -762,7 +762,7 @@
 								<tr>
 									<th scope="row"><?php _e('Rules label') ?></th>
 									<td>
-										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather_config['o_rules_message']) ?></textarea>
+										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather->forum_settings['o_rules_message']) ?></textarea>
 										<span><?php _e('Rules help') ?></span>
 									</td>
 								</tr>
@@ -770,13 +770,13 @@
 									<th scope="row"><?php _e('E-mail default label') ?></th>
 									<td>
 										<span><?php _e('E-mail default help') ?></span>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather_config['o_default_email_setting'] == '0') {
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather->forum_settings['o_default_email_setting'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<?php _e('Display e-mail label') ?></label>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather_config['o_default_email_setting'] == '1') {
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather->forum_settings['o_default_email_setting'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<?php _e('Hide allow form label') ?></label>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather_config['o_default_email_setting'] == '2') {
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather->forum_settings['o_default_email_setting'] == '2') {
     echo ' checked="checked"';
 } ?> />&#160;<?php _e('Hide both label') ?></label>
 									</td>
@@ -793,10 +793,10 @@
 								<tr>
 									<th scope="row"><?php _e('Display announcement label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather_config['o_announcement'] == '1') {
+										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather->forum_settings['o_announcement'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather_config['o_announcement'] == '0') {
+										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather->forum_settings['o_announcement'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Display announcement help') ?></span>
@@ -805,7 +805,7 @@
 								<tr>
 									<th scope="row"><?php _e('Announcement message label') ?></th>
 									<td>
-										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_announcement_message']) ?></textarea>
+										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_announcement_message']) ?></textarea>
 										<span><?php _e('Announcement message help') ?></span>
 									</td>
 								</tr>
@@ -821,10 +821,10 @@
 								<tr>
 									<th scope="row"><a name="maintenance"></a><?php _e('Maintenance mode label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather_config['o_maintenance'] == '1') {
+										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather->forum_settings['o_maintenance'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather_config['o_maintenance'] == '0') {
+										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather->forum_settings['o_maintenance'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Maintenance mode help') ?></span>
@@ -833,7 +833,7 @@
 								<tr>
 									<th scope="row"><?php _e('Maintenance message label') ?></th>
 									<td>
-										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather_config['o_maintenance_message']) ?></textarea>
+										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
 										<span><?php _e('Maintenance message help') ?></span>
 									</td>
 								</tr>
diff --git a/view/admin/parser.php b/view/admin/parser.php
index aec1f767..e32369b6 100644
--- a/view/admin/parser.php
+++ b/view/admin/parser.php
@@ -208,7 +208,7 @@
 									<th scope="row"><?php echo($lang_admin_parser['smiley_upload']); ?></th>
  <?php if (ini_get('file_uploads')) {
     ?>
-									<td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
+									<td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 										<input type="file" name="new_smiley" id="upload_smiley" /></td>
 									<td><input type="submit" name="upload" value="<?php echo($lang_admin_parser['upload_button']);
     ?>" /></td>
diff --git a/view/admin/permissions.php b/view/admin/permissions.php
index a70328ae..2b1bf413 100644
--- a/view/admin/permissions.php
+++ b/view/admin/permissions.php
@@ -28,10 +28,10 @@
 								<tr>
 									<th scope="row"><?php _e('BBCode label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather_config['p_message_bbcode'] == '1') {
+										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather->forum_settings['p_message_bbcode'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather_config['p_message_bbcode'] == '0') {
+										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather->forum_settings['p_message_bbcode'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('BBCode help') ?></span>
@@ -40,10 +40,10 @@
 								<tr>
 									<th scope="row"><?php _e('Image tag label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather_config['p_message_img_tag'] == '1') {
+										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather->forum_settings['p_message_img_tag'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather_config['p_message_img_tag'] == '0') {
+										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather->forum_settings['p_message_img_tag'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Image tag help') ?></span>
@@ -52,10 +52,10 @@
 								<tr>
 									<th scope="row"><?php _e('All caps message label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather_config['p_message_all_caps'] == '1') {
+										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather->forum_settings['p_message_all_caps'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather_config['p_message_all_caps'] == '0') {
+										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather->forum_settings['p_message_all_caps'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('All caps message help') ?></span>
@@ -64,10 +64,10 @@
 								<tr>
 									<th scope="row"><?php _e('All caps subject label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather_config['p_subject_all_caps'] == '1') {
+										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather->forum_settings['p_subject_all_caps'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather_config['p_subject_all_caps'] == '0') {
+										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather->forum_settings['p_subject_all_caps'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('All caps subject help') ?></span>
@@ -76,10 +76,10 @@
 								<tr>
 									<th scope="row"><?php _e('Require e-mail label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather_config['p_force_guest_email'] == '1') {
+										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather->forum_settings['p_force_guest_email'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather_config['p_force_guest_email'] == '0') {
+										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather->forum_settings['p_force_guest_email'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Require e-mail help') ?></span>
@@ -97,10 +97,10 @@
 								<tr>
 									<th scope="row"><?php _e('BBCode sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather_config['p_sig_bbcode'] == '1') {
+										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather->forum_settings['p_sig_bbcode'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather_config['p_sig_bbcode'] == '0') {
+										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather->forum_settings['p_sig_bbcode'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('BBCode sigs help') ?></span>
@@ -109,10 +109,10 @@
 								<tr>
 									<th scope="row"><?php _e('Image tag sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather_config['p_sig_img_tag'] == '1') {
+										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather->forum_settings['p_sig_img_tag'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather_config['p_sig_img_tag'] == '0') {
+										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather->forum_settings['p_sig_img_tag'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Image tag sigs help') ?></span>
@@ -121,10 +121,10 @@
 								<tr>
 									<th scope="row"><?php _e('All caps sigs label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather_config['p_sig_all_caps'] == '1') {
+										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather->forum_settings['p_sig_all_caps'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather_config['p_sig_all_caps'] == '0') {
+										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather->forum_settings['p_sig_all_caps'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('All caps sigs help') ?></span>
@@ -133,14 +133,14 @@
 								<tr>
 									<th scope="row"><?php _e('Max sig length label') ?></th>
 									<td>
-										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather_config['p_sig_length'] ?>" />
+										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather->forum_settings['p_sig_length'] ?>" />
 										<span class="clearb"><?php _e('Max sig length help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Max sig lines label') ?></th>
 									<td>
-										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather_config['p_sig_lines'] ?>" />
+										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather->forum_settings['p_sig_lines'] ?>" />
 										<span class="clearb"><?php _e('Max sig lines help') ?></span>
 									</td>
 								</tr>
@@ -156,10 +156,10 @@
 								<tr>
 									<th scope="row"><?php _e('Banned e-mail label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather_config['p_allow_banned_email'] == '1') {
+										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather->forum_settings['p_allow_banned_email'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather_config['p_allow_banned_email'] == '0') {
+										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather->forum_settings['p_allow_banned_email'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Banned e-mail help') ?></span>
@@ -168,10 +168,10 @@
 								<tr>
 									<th scope="row"><?php _e('Duplicate e-mail label') ?></th>
 									<td>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather_config['p_allow_dupe_email'] == '1') {
+										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '1') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather_config['p_allow_dupe_email'] == '0') {
+										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
 										<span class="clearb"><?php _e('Duplicate e-mail help') ?></span>
diff --git a/view/edit.php b/view/edit.php
index 48a692e8..829d0c17 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -89,10 +89,10 @@
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/view/help.php b/view/help.php
index 2ecf9e36..d171ddab 100644
--- a/view/help.php
+++ b/view/help.php
@@ -41,7 +41,7 @@
 <div class="box">
 	<div class="inbox">
 		<p><?php _e('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather_config['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather_config['o_board_title']) ?></a></samp></p>
+		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
 		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
 		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
diff --git a/view/index.php b/view/index.php
index 3142e1bd..cc51e8b5 100644
--- a/view/index.php
+++ b/view/index.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -92,13 +92,13 @@
 			<dl class="conl">
 				<dt><strong><?php _e('User info') ?></strong></dt>
 				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
-				<?php if ($feather_config['o_users_online'] == 1) : ?>
+				<?php if ($feather->forum_settings['o_users_online'] == 1) : ?>
 				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
 				<dd><span><?php printf(__('Guests online'), '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
 				<?php endif; ?>
 			</dl>
 			<?php
-            if ($feather_config['o_users_online'] == 1) :
+            if ($feather->forum_settings['o_users_online'] == 1) :
                 if ($online['num_users'] > 0) {
                     echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
                 } else {
@@ -108,4 +108,4 @@
             ?>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/misc/email.php b/view/misc/email.php
index eb44dafb..06f96f55 100644
--- a/view/misc/email.php
+++ b/view/misc/email.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -34,4 +34,4 @@
 			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/misc/rules.php b/view/misc/rules.php
index 366880ee..feb662ad 100644
--- a/view/misc/rules.php
+++ b/view/misc/rules.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -17,7 +17,7 @@
 	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
 	<div class="box">
 		<div id="rules-block" class="inbox">
-			<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
+			<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
index 35b67b41..8b636222 100644
--- a/view/moderate/moderator_forum.php
+++ b/view/moderate/moderator_forum.php
@@ -40,7 +40,7 @@
 				<tr>
 					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
 					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
 <?php endif; ?>					<th class="tcr"><?php _e('Last post') ?></th>
 					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
 				</tr>
@@ -63,7 +63,7 @@
 						</div>
 					</td>
 					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_replies']) : '-' ?></td>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_views']) : '-' ?></td>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_views']) : '-' ?></td>
 <?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_disp'] ?></td>
 					<td class="tcmod"><input type="checkbox" name="topics[<?php echo $topic['id'] ?>]" value="1" /></td>
@@ -72,7 +72,7 @@
 
             }
             if (empty($topic_data)):
-                $colspan = ($feather_config['o_topic_views'] == '1') ? 5 : 4;
+                $colspan = ($feather->forum_settings['o_topic_views'] == '1') ? 5 : 4;
                 $button_status = ' disabled="disabled"';
                 echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
             endif;
diff --git a/view/post.php b/view/post.php
index f1d22d07..ee2531da 100644
--- a/view/post.php
+++ b/view/post.php
@@ -98,14 +98,14 @@
                                                 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if ($feather->user->is_guest) {
-    $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-    $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
+    $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+    $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
 						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
     echo feather_escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
+						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
     echo feather_escape($post['email']);
 }
     ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
@@ -121,10 +121,10 @@
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
@@ -172,7 +172,7 @@
 
 
 <?php
-if ($tid && $feather_config['o_topic_review'] != '0') :
+if ($tid && $feather->forum_settings['o_topic_review'] != '0') :
 ?>
 <div id="postreview">
 	<h2><span><?php _e('Topic review') ?></span></h2>
diff --git a/view/profile/menu.php b/view/profile/menu.php
index 4627f8db..12b3b47f 100644
--- a/view/profile/menu.php
+++ b/view/profile/menu.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -31,7 +31,7 @@
     echo ' class="isactive"';
 }
     ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
-<?php if ($feather_config['o_avatars'] == '1' || $feather_config['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
+<?php if ($feather->forum_settings['o_avatars'] == '1' || $feather->forum_settings['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
     ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
index 5da0f4b4..ced4459f 100644
--- a/view/profile/section_display.php
+++ b/view/profile/section_display.php
@@ -55,26 +55,26 @@
     }
 
 ?>
-<?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1' || $feather_config['o_signatures'] == '1' || $feather_config['o_avatars'] == '1' || ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1')): ?>
+<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1' || $feather->forum_settings['o_signatures'] == '1' || $feather->forum_settings['o_avatars'] == '1' || ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1')): ?>
 			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Post display legend') ?></legend>
 					<div class="infldset">
 						<p><?php _e('Post display info') ?></p>
 						<div class="rbox">
-<?php if ($feather_config['o_smilies'] == '1' || $feather_config['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
+<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show smilies') ?><br /></label>
-<?php endif; if ($feather_config['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show sigs') ?><br /></label>
-<?php endif; if ($feather_config['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
+<?php endif; if ($feather->forum_settings['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show avatars') ?><br /></label>
-<?php endif; if ($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
+<?php endif; if ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show images') ?><br /></label>
-<?php endif; if ($feather_config['o_signatures'] == '1' && $feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1' && $feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Show images sigs') ?><br /></label>
 <?php endif; ?>
diff --git a/view/profile/section_personality.php b/view/profile/section_personality.php
index 3624e5e6..2b8f9c82 100644
--- a/view/profile/section_personality.php
+++ b/view/profile/section_personality.php
@@ -19,7 +19,7 @@
 		<form id="profile4" method="post" action="<?php echo get_link('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
-<?php if ($feather_config['o_avatars'] == '1'): ?>				<div class="inform">
+<?php if ($feather->forum_settings['o_avatars'] == '1'): ?>				<div class="inform">
 				<fieldset id="profileavatar">
 					<legend><?php _e('Avatar legend') ?></legend>
 					<div class="infldset">
@@ -29,20 +29,20 @@
 					</div>
 				</fieldset>
 			</div>
-<?php endif; if ($feather_config['o_signatures'] == '1'): ?>				<div class="inform">
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>				<div class="inform">
 				<fieldset>
 					<legend><?php _e('Signature legend') ?></legend>
 					<div class="infldset">
 						<p><?php _e('Signature info') ?></p>
 						<div class="txtarea">
-							<label><?php printf(__('Sig max size'), forum_number_format($feather_config['p_sig_length']), $feather_config['p_sig_lines']) ?><br />
+							<label><?php printf(__('Sig max size'), forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_sig_bbcode'] == '1' && $feather_config['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
diff --git a/view/profile/section_privacy.php b/view/profile/section_privacy.php
index 36930415..1d972113 100644
--- a/view/profile/section_privacy.php
+++ b/view/profile/section_privacy.php
@@ -38,7 +38,7 @@
 					</div>
 				</fieldset>
 			</div>
-<?php if ($feather_config['o_forum_subscriptions'] == '1' || $feather_config['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
+<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1' || $feather->forum_settings['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
 				<fieldset>
 					<legend><?php _e('Subscription legend') ?></legend>
 					<div class="infldset">
@@ -46,7 +46,7 @@
 							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Notify full') ?><br /></label>
-<?php if ($feather_config['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
+<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
     echo ' checked="checked"';
 } ?> /><?php _e('Auto notify full') ?><br /></label>
 <?php endif; ?>
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
index 4131569c..91fb9425 100644
--- a/view/profile/upload_avatar.php
+++ b/view/profile/upload_avatar.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -23,13 +23,13 @@
 					<legend><?php _e('Upload avatar legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather_config['o_avatars_size'] ?>" />
+						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php _e('Avatar desc').' '.$feather_config['o_avatars_width'].' x '.$feather_config['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather_config['o_avatars_size']).' '.__('bytes').' ('.file_size($feather_config['o_avatars_size']).').' ?></p>
+						<p><?php _e('Avatar desc').' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
 			<p class="buttons"><input type="submit" name="upload" value="<?php _e('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/register/form.php b/view/register/form.php
index f1a360ef..bdff9a2b 100644
--- a/view/register/form.php
+++ b/view/register/form.php
@@ -59,7 +59,7 @@
 					</div>
 				</fieldset>
 			</div>
-<?php if ($feather_config['o_regs_verify'] == '0'): ?>			<div class="inform">
+<?php if ($feather->forum_settings['o_regs_verify'] == '0'): ?>			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Pass legend') ?></legend>
 					<div class="infldset">
@@ -75,14 +75,14 @@
 			</div>
 <?php endif; ?>			<div class="inform">
 				<fieldset>
-					<legend><?php echo($feather_config['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
+					<legend><?php echo($feather->forum_settings['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
+<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
 <?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
     echo feather_escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather_config['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
+<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
     echo feather_escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
@@ -102,7 +102,7 @@
 <?php
 
             foreach ($languages as $temp) {
-                if ($feather_config['o_default_lang'] == $temp) {
+                if ($feather->forum_settings['o_default_lang'] == $temp) {
                     echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
                 } else {
                     echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
diff --git a/view/register/rules.php b/view/register/rules.php
index cef62405..7f986063 100644
--- a/view/register/rules.php
+++ b/view/register/rules.php
@@ -22,7 +22,7 @@
 				<fieldset>
 					<legend><?php _e('Rules legend') ?></legend>
 					<div class="infldset">
-						<div class="usercontent"><?php echo $feather_config['o_rules_message'] ?></div>
+						<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/search/form.php b/view/search/form.php
index 4731b068..16cd788a 100644
--- a/view/search/form.php
+++ b/view/search/form.php
@@ -41,7 +41,7 @@
 						</select>
 						<br /></label>
 						<p class="clearl"><?php _e('Search in info') ?></p>
-<?php echo($feather_config['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
+<?php echo($feather->forum_settings['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/viewforum.php b/view/viewforum.php
index a35faf22..a9673fa0 100644
--- a/view/viewforum.php
+++ b/view/viewforum.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -36,7 +36,7 @@
 				<tr>
 					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
 					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather_config['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
 <?php endif; ?>					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
 				</tr>
 			</thead>
@@ -56,7 +56,7 @@
 							</div>
 						</td>
 						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_replies']) : '-' ?></td>
-	<?php if ($feather_config['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_views']) : '-' ?></td>
+	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_views']) : '-' ?></td>
 	<?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_formatted'] ?></td>
 					</tr>
@@ -66,7 +66,7 @@
             if (empty($forum_data)):
             ?>
 					<tr class="rowodd inone">
-						<td class="tcl" colspan="<?php echo($feather_config['o_topic_views'] == 1) ? 4 : 3 ?>">
+						<td class="tcl" colspan="<?php echo($feather->forum_settings['o_topic_views'] == 1) ? 4 : 3 ?>">
 							<div class="icon inone"><div class="nosize"><!-- --></div></div>
 							<div class="tclcon">
 								<div>
@@ -97,4 +97,4 @@
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
 		<div class="clearer"></div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/viewtopic.php b/view/viewtopic.php
index e2681757..e982045b 100644
--- a/view/viewtopic.php
+++ b/view/viewtopic.php
@@ -134,16 +134,16 @@
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
-						<input type="hidden" name="page" value="<?php echo feather_escape($p) ?>" />
-<?php if ($feather_config['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
+						<input type="hidden" name="page" value="<?php echo feather_escape($page_number) ?>" />
+<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
 <?php endif;
 
     if ($feather->user->is_guest) {
-        $email_label = ($feather_config['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-        $email_form_name = ($feather_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
+        $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+        $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
         ?>
 						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
 <?php
 
@@ -163,13 +163,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather_config['p_message_bbcode'] == '1' && $feather_config['p_message_img_tag'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather_config['o_smilies'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>

From 921980178ef10a625d0ddfdfb4eddcecb810cf7d Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Fri, 28 Aug 2015 10:43:25 +0200
Subject: [PATCH 225/353] Update admin/maintenance/rebuild controller and view

---
 controller/admin/maintenance.php              | 48 +++++++------------
 .../view/admin/maintenance/rebuild.php        | 27 ++---------
 2 files changed, 19 insertions(+), 56 deletions(-)

diff --git a/controller/admin/maintenance.php b/controller/admin/maintenance.php
index cd8c237b..42343ecc 100644
--- a/controller/admin/maintenance.php
+++ b/controller/admin/maintenance.php
@@ -14,62 +14,46 @@ class maintenance
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-
-
         $this->model = new \model\admin\maintenance();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/maintenance.mo');
-        require FEATHER_ROOT . 'include/common_admin.php';
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/admin/maintenance.mo');
+        require $this->feather->forum_env['FEATHER_ROOT'] . 'include/common_admin.php';
     }
 
     public function display()
     {
-        if ($this->user->g_id != FEATHER_ADMIN) {
+        if ($this->feather->user->g_id != FEATHER_ADMIN) {
             message(__('No permission'), '403');
         }
 
         $action = '';
-        if ($this->request->post('action')) {
-            $action = $this->request->post('action');
-        } elseif ($this->request->get('action')) {
-            $action = $this->request->get('action');
+        if ($this->feather->request->post('action')) {
+            $action = $this->feather->request->post('action');
+        } elseif ($this->feather->request->get('action')) {
+            $action = $this->feather->request->get('action');
         }
 
         if ($action == 'rebuild') {
             $this->model->rebuild();
 
-            $page_title = array(feather_escape($this->config['o_board_title']), __('Rebuilding search index'));
-
-            $this->feather->render('admin/maintenance/rebuild.php', array(
-                    'page_title'    =>    $page_title,
+            $this->feather->view2->setPageInfo(array(
+                    'page_title'    =>    array(feather_escape($this->feather->forum_settings['o_board_title']), __('Rebuilding search index')),
+                    'query_str' => $this->model->get_query_str()
                 )
-            );
-
-            $query_str = $this->model->get_query_str();
-
-            exit('<script type="text/javascript">window.location="'.get_link('admin/maintenance/').$query_str.'"</script><hr /><p>'.sprintf(__('Javascript redirect failed'), '<a href="'.get_link('admin/maintenance/').$query_str.'">'.__('Click here').'</a>').'</p>');
+            )->addTemplate('admin/maintenance/rebuild.php')->display();
         }
 
         if ($action == 'prune') {
-            $prune_from = feather_trim($this->request->post('prune_from'));
-            $prune_sticky = intval($this->request->post('prune_sticky'));
+            $prune_from = feather_trim($this->feather->request->post('prune_from'));
+            $prune_sticky = intval($this->feather->request->post('prune_sticky'));
 
             generate_admin_menu('maintenance');
 
-            if ($this->request->post('prune_comply')) {
+            if ($this->feather->request->post('prune_comply')) {
                 $this->model->prune_comply($prune_from, $prune_sticky);
             }
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Prune')),
+                    'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Prune')),
                     'active_page' => 'admin',
                     'admin_console' => true,
                     'prune_sticky'    =>    $prune_sticky,
@@ -82,7 +66,7 @@ public function display()
         generate_admin_menu('maintenance');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Maintenance')),
+                'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Maintenance')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'first_id' => $this->model->get_first_id(),
diff --git a/style/FeatherBB/view/admin/maintenance/rebuild.php b/style/FeatherBB/view/admin/maintenance/rebuild.php
index 5bd6ffc0..0d24339b 100644
--- a/style/FeatherBB/view/admin/maintenance/rebuild.php
+++ b/style/FeatherBB/view/admin/maintenance/rebuild.php
@@ -6,33 +6,12 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
 }
 ?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><?php echo generate_page_title($page_title) ?></title>
-<style type="text/css">
-body {
-	font: 12px Verdana, Arial, Helvetica, sans-serif;
-	color: #333333;
-	background-color: #FFFFFF
-}
-
-h1 {
-	font-size: 16px;
-	font-weight: normal;
-}
-</style>
-</head>
-<body>
-
 <h1><?php _e('Rebuilding index info') ?></h1>
-<hr />
\ No newline at end of file
+<script type="text/javascript">window.location="<?= get_link('admin/maintenance/').$query_str ?>"</script>
+<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.get_link('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>

From 7daccd883b276466bbfa569b45e7cb526ecbf192 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Fri, 28 Aug 2015 10:46:08 +0200
Subject: [PATCH 226/353] Remove remaining feather_config var

---
 include/common_admin.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/common_admin.php b/include/common_admin.php
index c1778f08..a166af6a 100644
--- a/include/common_admin.php
+++ b/include/common_admin.php
@@ -33,14 +33,13 @@ function generate_admin_menu($page = '')
     $feather = \Slim\Slim::getInstance();
 
     $is_admin = $feather->user->g_id == FEATHER_ADMIN ? true : false;
-    
+
     // See if there are any plugins
     $plugins = forum_list_plugins($is_admin);
 
     $feather->view2->setPageInfo(array(
         'page'    =>    $page,
         'is_admin'    =>    $is_admin,
-        'feather_config'    =>    $feather->config,
         'plugins'    =>    $plugins,
         ), 1
     )->addTemplate('admin/menu.php');

From af31e1b2916a5519055eb1edd1e6662281cb49ac Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Fri, 28 Aug 2015 12:30:42 +0200
Subject: [PATCH 227/353] First attempt to check route permissions

---
 include/classes/auth.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index 64d1f82d..012841ce 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -281,6 +281,12 @@ public function call()
         // Update online list
         $this->update_users_online();
 
+        $this->app->hook('slim.before.dispatch', function() {
+            if(preg_match('/\/admin/', $this->app->router->getCurrentRoute()->getPattern()) && $this->app->user->g_id != $this->app->forum_env['FEATHER_ADMIN']) {
+                $this->app->flash('message', __('No permission'));
+                $this->app->redirect(get_link('/'), 403);
+            }
+        });
         $this->next->call();
     }
 }

From 8091fbcc522031c43cc0b6710b616e7fd53966ed Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Fri, 28 Aug 2015 12:48:06 +0200
Subject: [PATCH 228/353] Add middleware check for admin routes

---
 .gitignore         |  2 ++
 include/routes.php | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index b1fc652e..be477e41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ include/config.php
 nbproject/
 lang/French
 .htaccess
+vendor
+composer.lock
diff --git a/include/routes.php b/include/routes.php
index 4d6e1e96..a1229f75 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -7,6 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+/**
+ * middleware to check if user is admin, if it's not redirect to homepage.
+ */
+$isAdmin = function() use ($feather) {
+    if($feather->user->g_id != $feather->forum_env['FEATHER_ADMIN']) {
+        redirect(get_link('/'), __('No permission'));
+    }
+};
 
 // Index
 $feather->get('/', '\controller\index:display');
@@ -88,7 +96,7 @@
 });
 
 // Admin routes
-$feather->group('/admin', function() use ($feather) {
+$feather->group('/admin', $isAdmin, function() use ($feather) {
 
     // Admin index
     $feather->get('(/action/:action)(/)', '\controller\admin\index:display');
@@ -163,4 +171,4 @@
 // 404 not found
 $feather->notFound(function () {
     message(__('Bad request'), '404');
-});
\ No newline at end of file
+});

From 1591b301517886f6c4477207f4bf35191204b147 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Fri, 28 Aug 2015 13:09:06 +0200
Subject: [PATCH 229/353] Create AdminUtils class

Replaces the include/common_admin.php
---
 controller/admin/bans.php            | 11 +++---
 controller/admin/categories.php      |  7 ++--
 controller/admin/censoring.php       |  7 ++--
 controller/admin/forums.php          | 11 +++---
 controller/admin/groups.php          | 13 +++---
 controller/admin/index.php           | 11 +++---
 controller/admin/maintenance.php     |  5 +--
 controller/admin/options.php         |  5 +--
 controller/admin/parser.php          |  5 +--
 controller/admin/permissions.php     |  7 ++--
 controller/admin/reports.php         |  7 ++--
 controller/admin/statistics.php      |  7 ++--
 controller/admin/users.php           | 13 +++---
 include/classes/AdminUtils.class.php | 59 ++++++++++++++++++++++++++++
 include/classes/Utils.class.php      | 30 ++++++++++++++
 15 files changed, 137 insertions(+), 61 deletions(-)
 create mode 100644 include/classes/AdminUtils.class.php
 create mode 100644 include/classes/Utils.class.php

diff --git a/controller/admin/bans.php b/controller/admin/bans.php
index e6a8d6ff..16d6f741 100644
--- a/controller/admin/bans.php
+++ b/controller/admin/bans.php
@@ -19,13 +19,12 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\bans();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/bans.mo');
-        require FEATHER_ROOT . 'include/common_admin.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/bans.mo');
     }
 
     public function __autoload($class_name)
     {
-        require FEATHER_ROOT . $class_name . '.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
     }
 
     public function display()
@@ -56,7 +55,7 @@ public function display()
             )->addTemplate('admin/bans/search_ban.php')->display();
         }
         else {
-            generate_admin_menu('bans');
+            \FeatherBB\AdminUtils::generateAdminMenu('bans');
 
             $this->feather->view2->setPageInfo(array(
                     'admin_console' => true,
@@ -77,7 +76,7 @@ public function add($id = null)
             $this->model->insert_ban();
         }
 
-        generate_admin_menu('bans');
+        \FeatherBB\AdminUtils::generateAdminMenu('bans');
 
         $this->feather->view2->setPageInfo(array(
                 'admin_console' => true,
@@ -108,7 +107,7 @@ public function edit($id)
             $this->model->insert_ban();
         }
 
-        generate_admin_menu('bans');
+        \FeatherBB\AdminUtils::generateAdminMenu('bans');
 
         $this->feather->view2->setPageInfo(array(
                 'admin_console' => true,
diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index 916506be..cd9f22a2 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -19,13 +19,12 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\categories();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/categories.mo');
-        require FEATHER_ROOT . 'include/common_admin.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/categories.mo');
     }
 
     public function __autoload($class_name)
     {
-        require FEATHER_ROOT.$class_name.'.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].$class_name.'.php';
     }
 
     public function add_category()
@@ -101,7 +100,7 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        generate_admin_menu('categories');
+        \FeatherBB\AdminUtils::generateAdminMenu('categories');
 
         $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Categories')),
diff --git a/controller/admin/censoring.php b/controller/admin/censoring.php
index a7367eb9..7c80fd54 100644
--- a/controller/admin/censoring.php
+++ b/controller/admin/censoring.php
@@ -19,13 +19,12 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\censoring();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/censoring.mo');
-        require FEATHER_ROOT . 'include/common_admin.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/censoring.mo');
     }
 
     public function __autoload($class_name)
     {
-        require FEATHER_ROOT . $class_name . '.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
     }
 
     public function display()
@@ -49,7 +48,7 @@ public function display()
             $this->model->remove_word();
         }
 
-        generate_admin_menu('censoring');
+        \FeatherBB\AdminUtils::generateAdminMenu('censoring');
 
         $this->feather->view2->setPageInfo(array(
                 'title'    =>    array(feather_escape($this->config['o_board_title']), __('Admin'), __('Censoring')),
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index ba4cfa60..2f21597b 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -19,13 +19,12 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\forums();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/forums.mo');
-        require FEATHER_ROOT . 'include/common_admin.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/forums.mo');
     }
 
     public function __autoload($class_name)
     {
-        require FEATHER_ROOT . $class_name . '.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
     }
 
     //
@@ -121,7 +120,7 @@ public function edit_forum($forum_id)
             }
 
         } else {
-            generate_admin_menu('forums');
+            \FeatherBB\AdminUtils::generateAdminMenu('forums');
 
             $this->feather->view2->setPageInfo(array(
                     'title'    =>    array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums')),
@@ -151,7 +150,7 @@ public function delete_forum($forum_id)
 
         } else { // If the user hasn't confirmed
 
-            generate_admin_menu('forums');
+            \FeatherBB\AdminUtils::generateAdminMenu('forums');
 
             $this->feather->view2->setPageInfo(array(
                     'title'    =>    array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums')),
@@ -188,7 +187,7 @@ public function display()
             $this->edit_positions();
         }
 
-        generate_admin_menu('forums');
+        \FeatherBB\AdminUtils::generateAdminMenu('forums');
 
         $categories_model = new \model\admin\categories();
         $this->feather->view2->setPageInfo(array(
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index 2ccffa6a..3f0e4ea9 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -19,13 +19,12 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\groups();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/groups.mo');
-        require FEATHER_ROOT . 'include/common_admin.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/groups.mo');
     }
 
     public function __autoload($class_name)
     {
-        require FEATHER_ROOT . $class_name . '.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
     }
 
     public function display()
@@ -41,7 +40,7 @@ public function display()
             $this->model->set_default_group($groups, $this->feather);
         }
 
-        generate_admin_menu('groups');
+        \FeatherBB\AdminUtils::generateAdminMenu('groups');
 
         $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
@@ -76,7 +75,7 @@ public function delete($id)
             if ($this->request->post('del_group_comply') || $this->request->post('del_group')) {
                 $this->model->delete_group($id);
             } else {
-                generate_admin_menu('groups');
+                \FeatherBB\AdminUtils::generateAdminMenu('groups');
 
                 $this->feather->view2->setPageInfo(array(
                         'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
@@ -89,7 +88,7 @@ public function delete($id)
             }
         }
 
-        generate_admin_menu('groups');
+        \FeatherBB\AdminUtils::generateAdminMenu('groups');
 
         $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
@@ -118,7 +117,7 @@ public function addedit($id = '')
         // Add/edit a group (stage 1)
         elseif ($this->request->post('add_group') || isset($id)) {
 
-            generate_admin_menu('groups');
+            \FeatherBB\AdminUtils::generateAdminMenu('groups');
 
             $group = $this->model->info_add_group($groups, $id);
 
diff --git a/controller/admin/index.php b/controller/admin/index.php
index 1069a7cb..87ff57c6 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -18,13 +18,12 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/index.mo');
-        require FEATHER_ROOT . 'include/common_admin.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/index.mo');
     }
 
     public function __autoload($class_name)
     {
-        require FEATHER_ROOT . $class_name . '.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
     }
 
     public function remove_install_folder($directory)
@@ -67,7 +66,7 @@ public function display($action = null)
         }
         // Remove /install
         elseif ($action == 'remove_install_file') {
-            $deleted = $this->remove_install_folder(FEATHER_ROOT.'install');
+            $deleted = $this->remove_install_folder($this->feather->forum_env['FEATHER_ROOT'].'install');
 
             if ($deleted) {
                 redirect(get_link('admin/'), __('Deleted install.php redirect'));
@@ -76,13 +75,13 @@ public function display($action = null)
             }
         }
 
-        generate_admin_menu('index');
+        \FeatherBB\AdminUtils::generateAdminMenu('index');
 
         $this->feather->view2->setPageInfo(array(
                             'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Index')),
                             'active_page' => 'admin',
                             'admin_console' => true,
-                            'install_file_exists'    =>   is_dir(FEATHER_ROOT.'install'),
+                            'install_file_exists'    =>   is_dir($this->feather->forum_env['FEATHER_ROOT'].'install'),
                             )
                     )->addTemplate('admin/index.php')->display();
     }
diff --git a/controller/admin/maintenance.php b/controller/admin/maintenance.php
index 42343ecc..aba79e7d 100644
--- a/controller/admin/maintenance.php
+++ b/controller/admin/maintenance.php
@@ -16,7 +16,6 @@ public function __construct()
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \model\admin\maintenance();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/admin/maintenance.mo');
-        require $this->feather->forum_env['FEATHER_ROOT'] . 'include/common_admin.php';
     }
 
     public function display()
@@ -46,7 +45,7 @@ public function display()
             $prune_from = feather_trim($this->feather->request->post('prune_from'));
             $prune_sticky = intval($this->feather->request->post('prune_sticky'));
 
-            generate_admin_menu('maintenance');
+            \FeatherBB\AdminUtils::generateAdminMenu('maintenance');
 
             if ($this->feather->request->post('prune_comply')) {
                 $this->model->prune_comply($prune_from, $prune_sticky);
@@ -63,7 +62,7 @@ public function display()
             )->addTemplate('admin/maintenance/prune.php')->display();
         }
 
-        generate_admin_menu('maintenance');
+        \FeatherBB\AdminUtils::generateAdminMenu('maintenance');
 
         $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Maintenance')),
diff --git a/controller/admin/options.php b/controller/admin/options.php
index 589b48cb..0903873b 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -19,8 +19,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\options();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/options.mo');
-        require FEATHER_ROOT . 'include/common_admin.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/options.mo');
     }
 
     public function __autoload($class_name)
@@ -38,7 +37,7 @@ public function display()
             $this->model->update_options();
         }
 
-        generate_admin_menu('options');
+        \FeatherBB\AdminUtils::generateAdminMenu('options');
 
         $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Options')),
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index 30b48a08..56db8f50 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -19,8 +19,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\parser();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/parser.mo');
-        require FEATHER_ROOT . 'include/common_admin.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/parser.mo');
     }
 
     public function __autoload($class_name)
@@ -207,7 +206,7 @@ public function display()
             redirect(get_link('admin/parser/'), $lang_admin_parser['save_success']);
         }
 
-        generate_admin_menu('parser');
+        \FeatherBB\AdminUtils::generateAdminMenu('parser');
 
         $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Parser')),
diff --git a/controller/admin/permissions.php b/controller/admin/permissions.php
index ac1881bd..be2364e9 100644
--- a/controller/admin/permissions.php
+++ b/controller/admin/permissions.php
@@ -19,13 +19,12 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\permissions();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/permissions.mo');
-        require FEATHER_ROOT . 'include/common_admin.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/permissions.mo');
     }
 
     public function __autoload($class_name)
     {
-        require FEATHER_ROOT . $class_name . '.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
     }
 
     public function display()
@@ -39,7 +38,7 @@ public function display()
             $this->model->update_permissions();
         }
 
-        generate_admin_menu('permissions');
+        \FeatherBB\AdminUtils::generateAdminMenu('permissions');
 
         $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Permissions')),
diff --git a/controller/admin/reports.php b/controller/admin/reports.php
index 7e2c933a..b3b7a092 100644
--- a/controller/admin/reports.php
+++ b/controller/admin/reports.php
@@ -21,13 +21,12 @@ public function __construct()
 
 
         $this->model = new \model\admin\reports();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/reports.mo');
-        require FEATHER_ROOT . 'include/common_admin.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/reports.mo');
     }
 
     public function __autoload($class_name)
     {
-        require FEATHER_ROOT . $class_name . '.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
     }
 
     public function display()
@@ -41,7 +40,7 @@ public function display()
             $this->model->zap_report();
         }
 
-        generate_admin_menu('reports');
+        \FeatherBB\AdminUtils::generateAdminMenu('reports');
 
         $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Reports')),
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index 7bd279af..5a27a454 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -21,13 +21,12 @@ public function __construct()
 
 
         $this->model = new \model\admin\statistics();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/index.mo');
-        require FEATHER_ROOT . 'include/common_admin.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/index.mo');
     }
 
     public function __autoload($class_name)
     {
-        require FEATHER_ROOT . $class_name . '.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
     }
 
     public function display()
@@ -36,7 +35,7 @@ public function display()
             message(__('No permission'), '403');
         }
 
-        generate_admin_menu('index');
+        \FeatherBB\AdminUtils::generateAdminMenu('index');
 
         $total = $this->model->get_total_size();
 
diff --git a/controller/admin/users.php b/controller/admin/users.php
index 705234ef..17cd8aaf 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -19,13 +19,12 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\users();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/users.mo');
-        require FEATHER_ROOT . 'include/common_admin.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/users.mo');
     }
 
     public function __autoload($class_name)
     {
-        require FEATHER_ROOT . $class_name . '.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
     }
 
     public function display()
@@ -40,7 +39,7 @@ public function display()
                 message(__('No permission'), '403');
             }
 
-            generate_admin_menu('users');
+            \FeatherBB\AdminUtils::generateAdminMenu('users');
 
             $this->feather->view2->setPageInfo(array(
                     'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Move users')),
@@ -58,7 +57,7 @@ public function display()
                 message(__('No permission'), '403');
             }
 
-            generate_admin_menu('users');
+            \FeatherBB\AdminUtils::generateAdminMenu('users');
 
             $this->feather->view2->setPageInfo(array(
                     'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Delete users')),
@@ -76,7 +75,7 @@ public function display()
                 message(__('No permission'), '403');
             }
 
-            generate_admin_menu('users');
+            \FeatherBB\AdminUtils::generateAdminMenu('users');
 
             $this->feather->view2->setPageInfo(array(
                     'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Bans')),
@@ -128,7 +127,7 @@ public function display()
             )->addTemplate('admin/users/find_users.php')->display();
         }
         else {
-            generate_admin_menu('users');
+            \FeatherBB\AdminUtils::generateAdminMenu('users');
 
             $this->feather->view2->setPageInfo(array(
                     'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users')),
diff --git a/include/classes/AdminUtils.class.php b/include/classes/AdminUtils.class.php
new file mode 100644
index 00000000..29fe4c78
--- /dev/null
+++ b/include/classes/AdminUtils.class.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace FeatherBB;
+
+class AdminUtils
+{
+
+    public static function generateAdminMenu($page = '')
+    {
+        $feather = \Slim\Slim::getInstance();
+
+        $is_admin = ($feather->user->g_id == $feather->forum_env['FEATHER_ADMIN']) ? true : false;
+
+        // See if there are any plugins
+        // $plugins = forum_list_plugins($is_admin);
+        $plugins = array();
+
+        $feather->view2->setPageInfo(array(
+            'page'    =>    $page,
+            'is_admin'    =>    $is_admin,
+            'plugins'    =>    $plugins,
+            ), 1
+        )->addTemplate('admin/menu.php');
+    }
+
+    // Will be removed when plugins branch is finished
+
+    // public static function forum_list_plugins($is_admin)
+    // {
+    //     $plugins = array();
+    //
+    //     $d = dir(FEATHER_ROOT.'plugins');
+    //     if (!$d) {
+    //         return $plugins;
+    //     }
+    //
+    //     while (($entry = $d->read()) !== false) {
+    //         if (!is_dir(FEATHER_ROOT.'plugins/'.$entry) && preg_match('%^AM?P_(\w+)\.php$%i', $entry)) {
+    //             $prefix = substr($entry, 0, strpos($entry, '_'));
+    //
+    //             if ($prefix == 'AMP' || ($is_admin && $prefix == 'AP')) {
+    //                 $plugins[$entry] = substr($entry, strlen($prefix) + 1, -4);
+    //             }
+    //         }
+    //     }
+    //     $d->close();
+    //
+    //     natcasesort($plugins);
+    //
+    //     return $plugins;
+    // }
+}
diff --git a/include/classes/Utils.class.php b/include/classes/Utils.class.php
new file mode 100644
index 00000000..67ea590c
--- /dev/null
+++ b/include/classes/Utils.class.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace FeatherBB;
+
+class Utils
+{
+    protected static $paths = array('include/classes/');
+
+    public static function autoload($class)
+    {
+        foreach (self::$paths as $path) {
+            $class_file = $path.strtolower(str_replace(__NAMESPACE__.'\\', '', $class)).'.class.php';
+            if (is_file($class_file)) {
+                require $class_file;
+            }
+        }
+    }
+
+    public static function registerAutoloader()
+    {
+        spl_autoload_register(__NAMESPACE__ . '\Loader::autoload');
+    }
+}

From 6722b7d20903c41575620be2edc523598daeab59 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 28 Aug 2015 14:26:33 +0200
Subject: [PATCH 230/353] Better handling of permissions

---
 controller/admin/statistics.php |  2 --
 controller/moderate.php         | 24 ------------------------
 controller/search.php           |  2 --
 controller/viewforum.php        |  2 +-
 include/classes/auth.class.php  |  6 ------
 include/routes.php              | 22 +++++++++++-----------
 6 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index 5a27a454..9453836f 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-
-
         $this->model = new \model\admin\statistics();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/index.mo');
     }
diff --git a/controller/moderate.php b/controller/moderate.php
index 7ea2a272..5c65e775 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -38,13 +38,6 @@ public function gethostpost($pid)
             message(__('No view'), '403');
         }
 
-
-        // This particular function doesn't require forum-based moderator access. It can be used
-        // by all moderators and admins
-        if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
-        }
-
         $this->model->display_ip_address_post($pid);
     }
 
@@ -54,13 +47,6 @@ public function gethostip($ip)
             message(__('No view'), '403');
         }
 
-
-        // This particular function doesn't require forum-based moderator access. It can be used
-        // by all moderators and admins
-        if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
-        }
-
         $this->model->display_ip_info($ip);
     }
 
@@ -70,14 +56,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             message(__('No view'), '403');
         }
 
-
-        // This particular function doesn't require forum-based moderator access. It can be used
-        // by all moderators and admins
         if ($action == 'get_host') {
-            if (!$this->user->is_admmod) {
-                message(__('No permission'), '403');
-            }
-
             $this->model->display_ip_address();
         }
 
@@ -239,7 +218,6 @@ public function display($id, $name = null, $page = null)
             message(__('No view'), '403');
         }
 
-
         // Make sure that only admmods allowed access this page
         $moderators = $this->model->get_moderators($id);
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
@@ -278,8 +256,6 @@ public function display($id, $name = null, $page = null)
                             'start_from' => $start_from,
                             )
                     )->addTemplate('moderate/moderator_forum.php')->display();
-
-
     }
 
     public function dealposts($fid)
diff --git a/controller/search.php b/controller/search.php
index f5361e1d..58490662 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-
-
         $this->model = new \model\search();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/search.mo');
diff --git a/controller/viewforum.php b/controller/viewforum.php
index 7206f604..49252f71 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -15,7 +15,7 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \model\viewforum();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->feather->user->language.'/forum.mo');
     }
 
     public function __autoload($class_name)
diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index 012841ce..64d1f82d 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -281,12 +281,6 @@ public function call()
         // Update online list
         $this->update_users_online();
 
-        $this->app->hook('slim.before.dispatch', function() {
-            if(preg_match('/\/admin/', $this->app->router->getCurrentRoute()->getPattern()) && $this->app->user->g_id != $this->app->forum_env['FEATHER_ADMIN']) {
-                $this->app->flash('message', __('No permission'));
-                $this->app->redirect(get_link('/'), 403);
-            }
-        });
         $this->next->call();
     }
 }
diff --git a/include/routes.php b/include/routes.php
index a1229f75..d3352985 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -7,15 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-/**
- * middleware to check if user is admin, if it's not redirect to homepage.
- */
-$isAdmin = function() use ($feather) {
-    if($feather->user->g_id != $feather->forum_env['FEATHER_ADMIN']) {
-        redirect(get_link('/'), __('No permission'));
-    }
-};
-
 // Index
 $feather->get('/', '\controller\index:display');
 
@@ -85,8 +76,17 @@
     $feather->map('/:id(/action/:action)(/)', '\controller\profile:action')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
 });
 
+/**
+ * Middleware to check if user is allowed to moderate, if he's not redirect to homepage.
+ */
+$isAdmmod = function() use ($feather) {
+    if(!$feather->user->is_admmod) {
+        redirect(get_base_url(), __('No permission'));
+    }
+};
+
 // Moderate routes
-$feather->group('/moderate', function() use ($feather) {
+$feather->group('/moderate', $isAdmmod, function() use ($feather) {
     $feather->get('/forum/:id(/:name)(/page/:page)(/)', '\controller\moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
     $feather->get('/get-host/post/:pid(/)', '\controller\moderate:gethostpost')->conditions(array('pid' => '[0-9]+'));
     $feather->get('/get-host/ip/:ip(/)', '\controller\moderate:gethostip');
@@ -96,7 +96,7 @@
 });
 
 // Admin routes
-$feather->group('/admin', $isAdmin, function() use ($feather) {
+$feather->group('/admin', $isAdmmod, function() use ($feather) {
 
     // Admin index
     $feather->get('(/action/:action)(/)', '\controller\admin\index:display');

From bb07cddefbadc7eac45a67b1fac5a7ba318e6396 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 28 Aug 2015 15:32:55 +0200
Subject: [PATCH 231/353] Windows compatibility

---
 controller/admin/plugins.php     | 12 ++++----
 include/classes/plugin.class.php | 47 ++++++++++++++++----------------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index 3bfe6102..ce7de69b 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -77,18 +77,18 @@ public function activate()
             message(__('Bad request'), '404');
         }
 
-        // Require all valide filenames...
+        // Require all valid filenames...
         \FeatherBB\Plugin::getPluginsList();
         // And make sure the plugin actually extends base Plugin class
         if (!property_exists('\plugin\\'.$plugin, 'isFeatherPlugin')) {
-            message(sprintf(__('No plugin message'), $plugin));
+            message(sprintf(__('No plugin message'), feather_escape($plugin)));
         }
 
         try {
             \FeatherBB\Plugin::activate($plugin);
-            redirect(get_link('admin/plugins/'), "Plugin $plugin activated");
+            redirect(get_link('admin/plugins/'), 'Plugin '.feather_escape($plugin).' activated');
         } catch (\Exception $e) {
-            redirect(get_link('admin/plugins/'), $e->getMessage());
+            redirect(get_link('admin/plugins/'), feather_escape($e->getMessage()));
         }
 
     }
@@ -113,7 +113,7 @@ public function display()
 
         // Make sure the file actually exists
         if (!file_exists(FEATHER_ROOT.'plugins/'.$plugin)) {
-            message(sprintf(__('No plugin message'), $plugin));
+            message(sprintf(__('No plugin message'), feather_escape($plugin)));
         }
 
         // Construct REQUEST_URI if it isn't set TODO?
@@ -126,7 +126,7 @@ public function display()
         // get the "blank page of death"
         include FEATHER_ROOT.'plugins/'.$plugin;
         if (!defined('FEATHER_PLUGIN_LOADED')) {
-            message(sprintf(__('Plugin failed message'), $plugin));
+            message(sprintf(__('Plugin failed message'), feather_escape($plugin)));
         }
 
         $this->feather->view2->setPageInfo(array(
diff --git a/include/classes/plugin.class.php b/include/classes/plugin.class.php
index 3e7217f3..3d1cc7c9 100644
--- a/include/classes/plugin.class.php
+++ b/include/classes/plugin.class.php
@@ -81,18 +81,19 @@ public static function getPluginsList()
     {
         $plugins = array();
 
-        // Get all files declaring a new plugin
-        $directory = new \RecursiveDirectoryIterator('plugins');
-        $iterator = new \RecursiveIteratorIterator($directory);
-        $pluginClasses = new \RegexIterator($iterator, '/^.+\/(\\w+)\.plugin\.php$/i', \RecursiveRegexIterator::GET_MATCH);
-
-        // Require these files to access their properties and display them in view
-        foreach ($pluginClasses as $pluginClass) {
-            // require $pluginClass[0];
-            $className = "\plugin\\".$pluginClass[1];
-            $plugins[$pluginClass[1]] = new $className();
+        $d = dir(FEATHER_ROOT.'plugins');
+        if (!$d) {
+            return $plugins;
         }
 
+        while (($entry = $d->read()) !== false) {
+            if (!is_dir(FEATHER_ROOT.'plugins/'.$entry) && preg_match('%^(\w+)\.plugin\.php$%i', $entry, $plugin)) {
+                $className = "\plugin\\".$plugin[1];
+                $plugins[$plugin[1]] = new $className();
+            }
+        }
+        $d->close();
+
         return $plugins;
     }
 
@@ -101,23 +102,23 @@ public static function getPluginsList()
      */
     public static function runActivePlugins()
     {
-        // Get all files declaring a new plugin
-        $directory = new \RecursiveDirectoryIterator('plugins');
-        $iterator = new \RecursiveIteratorIterator($directory);
-        $pluginClasses = new \RegexIterator($iterator, '/^.+\/(\\w+)\.plugin\.php$/i', \RecursiveRegexIterator::GET_MATCH);
-
         $feather = \Slim\Slim::getInstance();
-        $activePlugins = $feather->cache->retrieve('active_plugins') ? $feather->cache->retrieve('active_plugins') : array();
-
-        // Require these files to access their properties and display them in view
-        foreach ($pluginClasses as $pluginClass) {
-            require $pluginClass[0];
-            $className = "\plugin\\".$pluginClass[1];
-            $plugin = new $className();
-            $plugin->runHooks();
+        //$activePlugins = $feather->cache->retrieve('active_plugins') ? $feather->cache->retrieve('active_plugins') : array();
+
+        $d = dir(FEATHER_ROOT.'plugins');
+
+        while (($entry = $d->read()) !== false) {
+            if (!is_dir(FEATHER_ROOT.'plugins/'.$entry) && preg_match('%^(\w+)\.plugin\.php$%i', $entry, $plugin)) {
+                require FEATHER_ROOT.'plugins/'.$plugin[0];
+                $className = "\plugin\\".$plugin[1];
+                $newPlugin = new $className();
+                $newPlugin->runHooks();
+            }
         }
+        $d->close();
 
         return true;
+
     }
 
     /**

From c91776e89c11dd6629b677f96d94871d56da482d Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 28 Aug 2015 16:03:55 +0200
Subject: [PATCH 232/353] Better permissions handling

---
 controller/admin/bans.php        | 20 ++++----------------
 controller/admin/categories.php  | 16 ----------------
 controller/admin/censoring.php   |  4 ----
 controller/admin/forums.php      | 16 ----------------
 controller/admin/groups.php      | 14 +-------------
 controller/admin/index.php       |  4 ----
 controller/admin/maintenance.php |  4 ----
 controller/admin/options.php     |  4 ----
 controller/admin/parser.php      |  4 ----
 controller/admin/permissions.php |  4 ----
 controller/admin/plugins.php     |  4 ----
 controller/admin/reports.php     |  6 ------
 controller/admin/statistics.php  |  8 --------
 controller/admin/users.php       | 12 ------------
 include/routes.php               | 25 +++++++++++++++++--------
 15 files changed, 22 insertions(+), 123 deletions(-)

diff --git a/controller/admin/bans.php b/controller/admin/bans.php
index 16d6f741..e450e04c 100644
--- a/controller/admin/bans.php
+++ b/controller/admin/bans.php
@@ -20,6 +20,10 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->model = new \model\admin\bans();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/bans.mo');
+
+        if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
+            message(__('No permission'), '403');
+        }
     }
 
     public function __autoload($class_name)
@@ -29,10 +33,6 @@ public function __autoload($class_name)
 
     public function display()
     {
-        if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message(__('No permission'), '403');
-        }
-
         // Display bans
         if ($this->request->get('find_ban')) {
             $ban_info = $this->model->find_ban();
@@ -68,10 +68,6 @@ public function display()
 
     public function add($id = null)
     {
-        if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message(__('No permission'), '403');
-        }
-
         if ($this->request->post('add_edit_ban')) {
             $this->model->insert_ban();
         }
@@ -89,20 +85,12 @@ public function add($id = null)
 
     public function delete($id)
     {
-        if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message(__('No permission'), '403');
-        }
-
         // Remove the ban
         $this->model->remove_ban($id);
     }
 
     public function edit($id)
     {
-        if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message(__('No permission'), '403');
-        }
-
         if ($this->request->post('add_edit_ban')) {
             $this->model->insert_ban();
         }
diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index cd9f22a2..fde60846 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -29,10 +29,6 @@ public function __autoload($class_name)
 
     public function add_category()
     {
-        if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         $cat_name = feather_trim($this->request->post('cat_name'));
         if ($cat_name == '') {
             redirect(get_link('admin/categories/'), __('Must enter name message'));
@@ -47,10 +43,6 @@ public function add_category()
 
     public function edit_categories()
     {
-        if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         if (empty($this->request->post('cat'))) {
             message(__('Bad request'), '404');
         }
@@ -73,10 +65,6 @@ public function edit_categories()
 
     public function delete_category()
     {
-        if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         $cat_to_delete = (int) $this->request->post('cat_to_delete');
 
         if ($cat_to_delete < 1) {
@@ -96,10 +84,6 @@ public function delete_category()
 
     public function display()
     {
-        if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         \FeatherBB\AdminUtils::generateAdminMenu('categories');
 
         $this->feather->view2->setPageInfo(array(
diff --git a/controller/admin/censoring.php b/controller/admin/censoring.php
index 7c80fd54..2d738891 100644
--- a/controller/admin/censoring.php
+++ b/controller/admin/censoring.php
@@ -29,10 +29,6 @@ public function __autoload($class_name)
 
     public function display()
     {
-        if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         // Add a censor word
         if ($this->request->post('add_word')) {
             $this->model->add_word();
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index 2f21597b..b12d3980 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -33,10 +33,6 @@ public function __autoload($class_name)
 
     public function add_forum()
     {
-        if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         $cat_id = (int) $this->request->post('cat');
 
         if ($cat_id < 1) {
@@ -54,10 +50,6 @@ public function add_forum()
 
     public function edit_forum($forum_id)
     {
-        if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         if($this->request->isPost()) {
             if ($this->request->post('save') && $this->request->post('read_forum_old')) {
 
@@ -137,10 +129,6 @@ public function edit_forum($forum_id)
 
     public function delete_forum($forum_id)
     {
-        if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         if($this->request->isPost()) {
             $this->model->delete_forum($forum_id);
             // Regenerate the quick jump cache
@@ -179,10 +167,6 @@ public function edit_positions()
 
     public function display()
     {
-        if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         if ($this->request->post('update_positions')) {
             $this->edit_positions();
         }
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index 3f0e4ea9..dea27bee 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -29,10 +29,6 @@ public function __autoload($class_name)
 
     public function display()
     {
-        if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         $groups = $this->model->fetch_groups();
 
         // Set default group
@@ -54,10 +50,6 @@ public function display()
 
     public function delete($id)
     {
-        if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         if ($id < 5) {
             message(__('Bad request'), '404');
         }
@@ -103,10 +95,6 @@ public function delete($id)
 
     public function addedit($id = '')
     {
-        if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         $groups = $this->model->fetch_groups();
 
         // Add/edit a group (stage 2)
@@ -132,7 +120,7 @@ public function addedit($id = '')
                     'id'    => $id,
                     'group_list'    => $this->model->get_group_list($groups, $group),
                 )
-            )->addTemplate('admin/groups/delete_group.php')->display();
+            )->addTemplate('admin/groups/add_edit_group.php')->display();
         }
     }
 }
diff --git a/controller/admin/index.php b/controller/admin/index.php
index 87ff57c6..d864cc97 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -43,10 +43,6 @@ public function remove_install_folder($directory)
 
     public function display($action = null)
     {
-        if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
-        }
-
         // Check for upgrade
         if ($action == 'check_upgrade') {
             if (!ini_get('allow_url_fopen')) {
diff --git a/controller/admin/maintenance.php b/controller/admin/maintenance.php
index aba79e7d..88108ada 100644
--- a/controller/admin/maintenance.php
+++ b/controller/admin/maintenance.php
@@ -20,10 +20,6 @@ public function __construct()
 
     public function display()
     {
-        if ($this->feather->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         $action = '';
         if ($this->feather->request->post('action')) {
             $action = $this->feather->request->post('action');
diff --git a/controller/admin/options.php b/controller/admin/options.php
index 0903873b..34cf6f1c 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -29,10 +29,6 @@ public function __autoload($class_name)
 
     public function display()
     {
-        if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         if ($this->feather->request->isPost()) {
             $this->model->update_options();
         }
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index 56db8f50..a2f8c7ea 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -31,10 +31,6 @@ public function display()
     {
         global $lang_admin_parser;
 
-        if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         // Legacy
         require FEATHER_ROOT . 'lang/' . $this->user->language . '/admin/parser.php';
 
diff --git a/controller/admin/permissions.php b/controller/admin/permissions.php
index be2364e9..20614a18 100644
--- a/controller/admin/permissions.php
+++ b/controller/admin/permissions.php
@@ -29,10 +29,6 @@ public function __autoload($class_name)
 
     public function display()
     {
-        if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
-        }
-
         // Update permissions
         if ($this->feather->request->isPost()) {
             $this->model->update_permissions();
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index 24f35961..a86e4b55 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -28,10 +28,6 @@ public function __autoload($class_name)
 
     public function display()
     {
-        if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
-        }
-
         // The plugin to load should be supplied via GET
         $plugin = $this->request->get('plugin') ? $this->request->get('plugin') : '';
         if (!preg_match('%^AM?P_(\w*?)\.php$%i', $plugin)) {
diff --git a/controller/admin/reports.php b/controller/admin/reports.php
index b3b7a092..5330c24f 100644
--- a/controller/admin/reports.php
+++ b/controller/admin/reports.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-
-
         $this->model = new \model\admin\reports();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/reports.mo');
     }
@@ -31,10 +29,6 @@ public function __autoload($class_name)
 
     public function display()
     {
-        if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
-        }
-
         // Zap a report
         if ($this->feather->request->isPost()) {
             $this->model->zap_report();
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index 9453836f..26c56f49 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -29,10 +29,6 @@ public function __autoload($class_name)
 
     public function display()
     {
-        if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
-        }
-
         \FeatherBB\AdminUtils::generateAdminMenu('index');
 
         $total = $this->model->get_total_size();
@@ -53,10 +49,6 @@ public function display()
 
     public function phpinfo()
     {
-        if ($this->user->g_id != FEATHER_ADMIN) {
-            message(__('No permission'), '403');
-        }
-
         // Show phpinfo() output
         // Is phpinfo() a disabled function?
         if (strpos(strtolower((string) ini_get('disable_functions')), 'phpinfo') !== false) {
diff --git a/controller/admin/users.php b/controller/admin/users.php
index 17cd8aaf..c8b93334 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -29,10 +29,6 @@ public function __autoload($class_name)
 
     public function display()
     {
-        if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
-        }
-
         // Move multiple users to other user groups
         if ($this->request->post('move_users') || $this->request->post('move_users_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
@@ -143,10 +139,6 @@ public function display()
     // Show IP statistics for a certain user ID
     public function ipstats($id)
     {
-        if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
-        }
-
         // Fetch ip count
         $num_ips = $this->model->get_num_ip($id);
 
@@ -171,10 +163,6 @@ public function ipstats($id)
     // Show IP statistics for a certain user IP
     public function showusers($ip)
     {
-        if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
-        }
-
         if (!@preg_match('%^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$%', $ip) && !@preg_match('%^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$%', $ip)) {
             message(__('Bad IP message'));
         }
diff --git a/include/routes.php b/include/routes.php
index d3352985..8d2c54e3 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -98,6 +98,15 @@
 // Admin routes
 $feather->group('/admin', $isAdmmod, function() use ($feather) {
 
+    /**
+     * Middleware to check if user is admin.
+     */
+    $isAdmin = function() use ($feather) {
+        if($feather->user->g_id != FEATHER_ADMIN) {
+            redirect(get_base_url(), __('No permission'));
+        }
+    };
+
     // Admin index
     $feather->get('(/action/:action)(/)', '\controller\admin\index:display');
     $feather->get('/index(/)', '\controller\admin\index:display');
@@ -111,10 +120,10 @@
     });
 
     // Admin options
-    $feather->map('/options(/)', '\controller\admin\options:display')->via('GET', 'POST');
+    $feather->map('/options(/)', $isAdmin, '\controller\admin\options:display')->via('GET', 'POST');
 
     // Admin categories
-    $feather->group('/categories', function() use ($feather) {
+    $feather->group('/categories', $isAdmin, function() use ($feather) {
         $feather->get('(/)', '\controller\admin\categories:display');
         $feather->post('/add(/)', '\controller\admin\categories:add_category');
         $feather->post('/edit(/)', '\controller\admin\categories:edit_categories');
@@ -122,20 +131,20 @@
     });
 
     // Admin censoring
-    $feather->map('/censoring(/)', '\controller\admin\censoring:display')->via('GET', 'POST');
+    $feather->map('/censoring(/)', $isAdmin, '\controller\admin\censoring:display')->via('GET', 'POST');
 
     // Admin reports
     $feather->map('/reports(/)', '\controller\admin\reports:display')->via('GET', 'POST');
 
     // Admin permissions
-    $feather->map('/permissions(/)', '\controller\admin\permissions:display')->via('GET', 'POST');
+    $feather->map('/permissions(/)', $isAdmin, '\controller\admin\permissions:display')->via('GET', 'POST');
 
     // Admin statistics
     $feather->get('/statistics(/)', '\controller\admin\statistics:display');
     $feather->get('/phpinfo(/)', '\controller\admin\statistics:phpinfo');
 
     // Admin forums
-    $feather->group('/forums', function() use ($feather) {
+    $feather->group('/forums', $isAdmin, function() use ($feather) {
         $feather->map('(/)', '\controller\admin\forums:display')->via('GET', 'POST');
         $feather->post('/add(/)', '\controller\admin\forums:add_forum');
         $feather->map('/edit/:id(/)', '\controller\admin\forums:edit_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
@@ -143,7 +152,7 @@
     });
 
     // Admin groups
-    $feather->group('/groups', function() use ($feather) {
+    $feather->group('/groups', $isAdmin, function() use ($feather) {
         $feather->map('(/)', '\controller\admin\groups:display')->via('GET', 'POST');
         $feather->map('/add(/)', '\controller\admin\groups:addedit')->via('GET', 'POST');
         $feather->map('/edit/:id(/)', '\controller\admin\groups:addedit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
@@ -154,10 +163,10 @@
     $feather->map('/loader(/)', '\controller\admin\plugins:display')->via('GET', 'POST');
 
     // Admin maintenance
-    $feather->map('/maintenance(/)', '\controller\admin\maintenance:display')->via('GET', 'POST');
+    $feather->map('/maintenance(/)', $isAdmin, '\controller\admin\maintenance:display')->via('GET', 'POST');
 
     // Admin parser
-    $feather->map('/parser(/)', '\controller\admin\parser:display')->via('GET', 'POST');
+    $feather->map('/parser(/)', $isAdmin, '\controller\admin\parser:display')->via('GET', 'POST');
 
     // Admin users
     $feather->group('/users', function() use ($feather) {

From 5c5723f1d1a06cbc41b2edeee1ee2347c1dc0bdc Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 28 Aug 2015 16:04:05 +0200
Subject: [PATCH 233/353] Fix is_admmod var

---
 include/classes/auth.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index 64d1f82d..4932c96b 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -213,7 +213,7 @@ public function call()
             $this->app->user = $this->model->load_user($cookie['user_id']);
             $expires = ($cookie['expires'] > $this->app->now + $this->app->forum_settings['o_timeout_visit']) ? $this->app->now + 1209600 : $this->app->now + $this->app->forum_settings['o_timeout_visit'];
             $this->app->user->is_guest = false;
-            $this->app->user->is_admmod = $this->app->user->g_id == $this->app->forum_env['FEATHER_ADMIN'] || $this->app->g_moderator == '1';
+            $this->app->user->is_admmod = $this->app->user->g_id == $this->app->forum_env['FEATHER_ADMIN'] || $this->app->user->g_moderator == '1';
             if (!$this->app->user->disp_topics) {
                 $this->app->user->disp_topics = $this->app->forum_settings['o_disp_topics_default'];
             }

From 2d1efc82aec683cf6b7241958edfa9cf5a2c2208 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Fri, 28 Aug 2015 18:31:16 +0200
Subject: [PATCH 234/353] Solve conflicts from update

---
 controller/admin/maintenance.php    | 29 -------------------------
 controller/admin/options.php        |  4 ----
 controller/admin/parser.php         |  4 ----
 controller/admin/permissions.php    |  4 ----
 controller/admin/reports.php        |  9 --------
 controller/admin/statistics.php     |  9 --------
 controller/admin/users.php          | 33 -----------------------------
 controller/moderate.php             |  2 --
 controller/search.php               |  5 -----
 include/common_admin.php            |  4 ----
 style/FeatherBB/view/admin/menu.php | 12 -----------
 11 files changed, 115 deletions(-)

diff --git a/controller/admin/maintenance.php b/controller/admin/maintenance.php
index 279a8f52..88108ada 100644
--- a/controller/admin/maintenance.php
+++ b/controller/admin/maintenance.php
@@ -14,15 +14,6 @@ class maintenance
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-<<<<<<< HEAD
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-
-
-=======
->>>>>>> development
         $this->model = new \model\admin\maintenance();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/admin/maintenance.mo');
     }
@@ -47,30 +38,17 @@ public function display()
         }
 
         if ($action == 'prune') {
-<<<<<<< HEAD
-            $prune_from = feather_trim($this->request->post('prune_from'));
-            $prune_sticky = intval($this->request->post('prune_sticky'));
-
-            generate_admin_menu('maintenance');
-
-            if ($this->request->post('prune_comply')) {
-=======
             $prune_from = feather_trim($this->feather->request->post('prune_from'));
             $prune_sticky = intval($this->feather->request->post('prune_sticky'));
 
             \FeatherBB\AdminUtils::generateAdminMenu('maintenance');
 
             if ($this->feather->request->post('prune_comply')) {
->>>>>>> development
                 $this->model->prune_comply($prune_from, $prune_sticky);
             }
 
             $this->feather->view2->setPageInfo(array(
-<<<<<<< HEAD
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Prune')),
-=======
                     'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Prune')),
->>>>>>> development
                     'active_page' => 'admin',
                     'admin_console' => true,
                     'prune_sticky'    =>    $prune_sticky,
@@ -80,17 +58,10 @@ public function display()
             )->addTemplate('admin/maintenance/prune.php')->display();
         }
 
-<<<<<<< HEAD
-        generate_admin_menu('maintenance');
-
-        $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Maintenance')),
-=======
         \FeatherBB\AdminUtils::generateAdminMenu('maintenance');
 
         $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Maintenance')),
->>>>>>> development
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'first_id' => $this->model->get_first_id(),
diff --git a/controller/admin/options.php b/controller/admin/options.php
index a5e85ef4..34cf6f1c 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -33,11 +33,7 @@ public function display()
             $this->model->update_options();
         }
 
-<<<<<<< HEAD
-        generate_admin_menu('options');
-=======
         \FeatherBB\AdminUtils::generateAdminMenu('options');
->>>>>>> development
 
         $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Options')),
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index d2aa7d2e..a2f8c7ea 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -202,11 +202,7 @@ public function display()
             redirect(get_link('admin/parser/'), $lang_admin_parser['save_success']);
         }
 
-<<<<<<< HEAD
-        generate_admin_menu('parser');
-=======
         \FeatherBB\AdminUtils::generateAdminMenu('parser');
->>>>>>> development
 
         $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Parser')),
diff --git a/controller/admin/permissions.php b/controller/admin/permissions.php
index d086b110..20614a18 100644
--- a/controller/admin/permissions.php
+++ b/controller/admin/permissions.php
@@ -34,11 +34,7 @@ public function display()
             $this->model->update_permissions();
         }
 
-<<<<<<< HEAD
-        generate_admin_menu('permissions');
-=======
         \FeatherBB\AdminUtils::generateAdminMenu('permissions');
->>>>>>> development
 
         $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Permissions')),
diff --git a/controller/admin/reports.php b/controller/admin/reports.php
index 35a06f9f..5330c24f 100644
--- a/controller/admin/reports.php
+++ b/controller/admin/reports.php
@@ -18,11 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-<<<<<<< HEAD
-
-
-=======
->>>>>>> development
         $this->model = new \model\admin\reports();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/reports.mo');
     }
@@ -39,11 +34,7 @@ public function display()
             $this->model->zap_report();
         }
 
-<<<<<<< HEAD
-        generate_admin_menu('reports');
-=======
         \FeatherBB\AdminUtils::generateAdminMenu('reports');
->>>>>>> development
 
         $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Reports')),
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index 67bff2b8..bcaf9b46 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -18,11 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-<<<<<<< HEAD
-
-
-=======
->>>>>>> development
         $this->model = new \model\admin\statistics();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/index.mo');
     }
@@ -34,15 +29,11 @@ public function __autoload($class_name)
 
     public function display()
     {
-<<<<<<< HEAD
         if (!$this->user->is_admmod) {
             message(__('No permission'), '403');
         }
 
-        generate_admin_menu('index');
-=======
         \FeatherBB\AdminUtils::generateAdminMenu('index');
->>>>>>> development
 
         $total = $this->model->get_total_size();
 
diff --git a/controller/admin/users.php b/controller/admin/users.php
index 6c5cb69d..c8b93334 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -19,12 +19,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\users();
-<<<<<<< HEAD
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/admin/users.mo');
-        require FEATHER_ROOT . 'include/common_admin.php';
-=======
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/users.mo');
->>>>>>> development
     }
 
     public function __autoload($class_name)
@@ -40,11 +35,7 @@ public function display()
                 message(__('No permission'), '403');
             }
 
-<<<<<<< HEAD
-            generate_admin_menu('users');
-=======
             \FeatherBB\AdminUtils::generateAdminMenu('users');
->>>>>>> development
 
             $this->feather->view2->setPageInfo(array(
                     'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Move users')),
@@ -62,11 +53,7 @@ public function display()
                 message(__('No permission'), '403');
             }
 
-<<<<<<< HEAD
-            generate_admin_menu('users');
-=======
             \FeatherBB\AdminUtils::generateAdminMenu('users');
->>>>>>> development
 
             $this->feather->view2->setPageInfo(array(
                     'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Delete users')),
@@ -84,11 +71,7 @@ public function display()
                 message(__('No permission'), '403');
             }
 
-<<<<<<< HEAD
-            generate_admin_menu('users');
-=======
             \FeatherBB\AdminUtils::generateAdminMenu('users');
->>>>>>> development
 
             $this->feather->view2->setPageInfo(array(
                     'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Bans')),
@@ -138,21 +121,6 @@ public function display()
                     'user_data' =>  $this->model->print_users($search['conditions'], $search['order_by'], $search['direction'], $start_from),
                 )
             )->addTemplate('admin/users/find_users.php')->display();
-<<<<<<< HEAD
-        }
-        else {
-            generate_admin_menu('users');
-
-            $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users')),
-                    'active_page' => 'admin',
-                    'admin_console' => true,
-                    'focus_element' => array('find_user', 'form[username]'),
-                    'group_list' => $this->model->get_group_list(),
-                )
-            )->addTemplate('admin/users/admin_users.php')->display();
-        }
-=======
         }
         else {
             \FeatherBB\AdminUtils::generateAdminMenu('users');
@@ -166,7 +134,6 @@ public function display()
                 )
             )->addTemplate('admin/users/admin_users.php')->display();
         }
->>>>>>> development
     }
 
     // Show IP statistics for a certain user ID
diff --git a/controller/moderate.php b/controller/moderate.php
index 5c65e775..0cb485d5 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-
-
         $this->model = new \model\moderate();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/topic.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
diff --git a/controller/search.php b/controller/search.php
index 589ffe41..58490662 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -18,11 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-<<<<<<< HEAD
-
-
-=======
->>>>>>> development
         $this->model = new \model\search();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/search.mo');
diff --git a/include/common_admin.php b/include/common_admin.php
index 48cbd9de..a166af6a 100644
--- a/include/common_admin.php
+++ b/include/common_admin.php
@@ -40,10 +40,6 @@ function generate_admin_menu($page = '')
     $feather->view2->setPageInfo(array(
         'page'    =>    $page,
         'is_admin'    =>    $is_admin,
-<<<<<<< HEAD
-        'feather_config'    =>    $feather->config,
-=======
->>>>>>> development
         'plugins'    =>    $plugins,
         ), 1
     )->addTemplate('admin/menu.php');
diff --git a/style/FeatherBB/view/admin/menu.php b/style/FeatherBB/view/admin/menu.php
index ee145aa8..09257e7c 100644
--- a/style/FeatherBB/view/admin/menu.php
+++ b/style/FeatherBB/view/admin/menu.php
@@ -19,17 +19,6 @@
 		<div class="box">
 			<div class="inbox">
 				<ul>
-<<<<<<< HEAD
-					<li<?= ($page == 'index') ? ' class="isactive"' : ''; ?>><a href="<?php echo get_link('admin/') ?>"><?php _e('Index') ?></a></li>
-					<li<?= ($page == 'users') ? ' class="isactive"' : ''; ?>><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
-                <?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>
-                    <li<?= ($page == 'bans') ? ' class="isactive"' : ''; ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
-                <?php endif;
-                if ($is_admin || $feather_config['o_report_method'] == '0' || $feather_config['o_report_method'] == '2'): ?>
-                    <li<?= ($page == 'reports') ? ' class="isactive"' : ''; ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
-                <?php endif; ?>
-				</ul>
-=======
 					<li<?php if ($page == 'index') {
     echo ' class="isactive"';
 }
@@ -49,7 +38,6 @@
     ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
 <?php endif;
     ?>				</ul>
->>>>>>> development
 			</div>
 		</div>
 <?php

From a58942e94a2a44674c90e0024b8374966f81969f Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 28 Aug 2015 21:57:30 +0200
Subject: [PATCH 235/353] Setup URL lib

---
 controller/admin/bans.php                     |   2 +-
 controller/admin/categories.php               |  16 +-
 controller/admin/forums.php                   |  18 +-
 controller/admin/index.php                    |   2 +-
 controller/admin/parser.php                   |   6 +-
 controller/admin/users.php                    |   6 +-
 controller/edit.php                           |   2 +-
 controller/install.php                        |   2 +-
 controller/misc.php                           |   2 +-
 controller/moderate.php                       |  20 +-
 controller/post.php                           |  12 +-
 controller/profile.php                        |   8 +-
 controller/register.php                       |   2 +-
 controller/search.php                         |   2 +-
 controller/userlist.php                       |   2 +-
 controller/viewforum.php                      |  12 +-
 controller/viewtopic.php                      |  12 +-
 include/classes/core.class.php                |   4 +
 include/classes/url.class.php                 | 777 ++++++++++++++++++
 include/functions.php                         | 191 -----
 include/url_replace.php                       | 589 -------------
 model/admin/bans.php                          |   4 +-
 model/admin/censoring.php                     |   6 +-
 model/admin/groups.php                        |   8 +-
 model/admin/maintenance.php                   |   2 +-
 model/admin/options.php                       |   2 +-
 model/admin/permissions.php                   |   2 +-
 model/admin/reports.php                       |   2 +-
 model/admin/users.php                         |   6 +-
 model/delete.php                              |   4 +-
 model/index.php                               |  14 +-
 model/login.php                               |   4 +-
 model/misc.php                                |  14 +-
 model/moderate.php                            |  30 +-
 model/post.php                                |  18 +-
 model/profile.php                             |  40 +-
 model/register.php                            |  10 +-
 model/search.php                              |  26 +-
 model/viewforum.php                           |  20 +-
 model/viewtopic.php                           |  30 +-
 plugins/test/plugintest.php                   |   4 +-
 .../FeatherBB/view/admin/bans/admin_bans.php  |   4 +-
 .../FeatherBB/view/admin/bans/search_ban.php  |  12 +-
 style/FeatherBB/view/admin/categories.php     |   8 +-
 style/FeatherBB/view/admin/censoring.php      |   4 +-
 .../view/admin/forums/admin_forums.php        |   6 +-
 .../view/admin/forums/delete_forum.php        |   2 +-
 .../view/admin/forums/permissions.php         |   2 +-
 .../view/admin/groups/admin_groups.php        |   6 +-
 .../view/admin/groups/confirm_delete.php      |   4 +-
 .../view/admin/groups/delete_group.php        |   2 +-
 style/FeatherBB/view/admin/index.php          |   6 +-
 .../admin/maintenance/admin_maintenance.php   |   8 +-
 .../view/admin/maintenance/prune.php          |   2 +-
 .../view/admin/maintenance/rebuild.php        |   4 +-
 style/FeatherBB/view/admin/menu.php           |  26 +-
 style/FeatherBB/view/admin/options.php        |   4 +-
 style/FeatherBB/view/admin/parser.php         |   2 +-
 style/FeatherBB/view/admin/permissions.php    |   2 +-
 style/FeatherBB/view/admin/reports.php        |  20 +-
 style/FeatherBB/view/admin/statistics.php     |   2 +-
 .../view/admin/users/admin_users.php          |   4 +-
 .../FeatherBB/view/admin/users/ban_users.php  |   2 +-
 .../view/admin/users/delete_users.php         |   2 +-
 .../FeatherBB/view/admin/users/find_users.php |  14 +-
 .../FeatherBB/view/admin/users/move_users.php |   2 +-
 .../FeatherBB/view/admin/users/search_ip.php  |  12 +-
 .../FeatherBB/view/admin/users/show_users.php |  12 +-
 style/FeatherBB/view/delete.php               |   6 +-
 style/FeatherBB/view/edit.php                 |  14 +-
 style/FeatherBB/view/footer.new.php           |  20 +-
 style/FeatherBB/view/footer.php               |  20 +-
 style/FeatherBB/view/header.new.php           |  28 +-
 style/FeatherBB/view/help.php                 |  18 +-
 style/FeatherBB/view/login/form.php           |   4 +-
 .../view/login/password_forgotten.php         |   2 +-
 style/FeatherBB/view/misc/email.php           |   2 +-
 style/FeatherBB/view/misc/report.php          |   6 +-
 .../view/moderate/moderator_forum.php         |   6 +-
 style/FeatherBB/view/moderate/posts_view.php  |  10 +-
 style/FeatherBB/view/post.php                 |  12 +-
 style/FeatherBB/view/profile/change_mail.php  |   2 +-
 style/FeatherBB/view/profile/change_pass.php  |   2 +-
 style/FeatherBB/view/profile/delete_user.php  |   2 +-
 style/FeatherBB/view/profile/menu.php         |  14 +-
 .../FeatherBB/view/profile/section_admin.php  |   2 +-
 .../view/profile/section_display.php          |   2 +-
 .../view/profile/section_essentials.php       |   6 +-
 .../view/profile/section_messaging.php        |   2 +-
 .../view/profile/section_personal.php         |   2 +-
 .../view/profile/section_personality.php      |  10 +-
 .../view/profile/section_privacy.php          |   2 +-
 .../FeatherBB/view/profile/upload_avatar.php  |   2 +-
 style/FeatherBB/view/register/rules.php       |   2 +-
 style/FeatherBB/view/search/footer.php        |   2 +-
 style/FeatherBB/view/search/header.php        |   2 +-
 style/FeatherBB/view/search/posts.php         |   6 +-
 style/FeatherBB/view/search/topics.php        |   2 +-
 style/FeatherBB/view/userlist.php             |   2 +-
 style/FeatherBB/view/viewforum.php            |   4 +-
 style/FeatherBB/view/viewtopic.php            |  20 +-
 view/admin/bans/admin_bans.php                |   4 +-
 view/admin/bans/search_ban.php                |  12 +-
 view/admin/categories.php                     |   8 +-
 view/admin/censoring.php                      |   4 +-
 view/admin/forums/admin_forums.php            |   6 +-
 view/admin/forums/delete_forum.php            |   2 +-
 view/admin/forums/permissions.php             |   2 +-
 view/admin/groups/admin_groups.php            |   6 +-
 view/admin/groups/confirm_delete.php          |   4 +-
 view/admin/groups/delete_group.php            |   2 +-
 view/admin/index.php                          |   6 +-
 view/admin/maintenance/admin_maintenance.php  |   8 +-
 view/admin/maintenance/prune.php              |   2 +-
 view/admin/maintenance/rebuild.php            |  27 +-
 view/admin/menu.php                           |  26 +-
 view/admin/options.php                        |   4 +-
 view/admin/parser.php                         |   2 +-
 view/admin/permissions.php                    |   2 +-
 view/admin/reports.php                        |  20 +-
 view/admin/statistics.php                     |   2 +-
 view/admin/users/admin_users.php              |   4 +-
 view/admin/users/ban_users.php                |   2 +-
 view/admin/users/delete_users.php             |   2 +-
 view/admin/users/find_users.php               |  14 +-
 view/admin/users/move_users.php               |   2 +-
 view/admin/users/search_ip.php                |  12 +-
 view/admin/users/show_users.php               |  12 +-
 view/delete.php                               |   6 +-
 view/edit.php                                 |  14 +-
 view/footer.php                               |   2 +-
 view/help.php                                 |  18 +-
 view/login/form.php                           |   4 +-
 view/login/password_forgotten.php             |   2 +-
 view/misc/email.php                           |   2 +-
 view/misc/report.php                          |   6 +-
 view/moderate/moderator_forum.php             |   6 +-
 view/moderate/posts_view.php                  |  10 +-
 view/post.php                                 |  12 +-
 view/profile/change_mail.php                  |   2 +-
 view/profile/change_pass.php                  |   2 +-
 view/profile/delete_user.php                  |   2 +-
 view/profile/menu.php                         |  14 +-
 view/profile/section_admin.php                |   2 +-
 view/profile/section_display.php              |   2 +-
 view/profile/section_essentials.php           |   6 +-
 view/profile/section_messaging.php            |   2 +-
 view/profile/section_personal.php             |   2 +-
 view/profile/section_personality.php          |  10 +-
 view/profile/section_privacy.php              |   2 +-
 view/profile/upload_avatar.php                |   2 +-
 view/register/rules.php                       |   2 +-
 view/search/footer.php                        |   2 +-
 view/search/header.php                        |   2 +-
 view/search/posts.php                         |   6 +-
 view/search/topics.php                        |   2 +-
 view/userlist.php                             |   2 +-
 view/viewforum.php                            |   4 +-
 view/viewtopic.php                            |  20 +-
 159 files changed, 1345 insertions(+), 1365 deletions(-)
 create mode 100644 include/classes/url.class.php
 delete mode 100644 include/url_replace.php

diff --git a/controller/admin/bans.php b/controller/admin/bans.php
index e450e04c..2e88ab5f 100644
--- a/controller/admin/bans.php
+++ b/controller/admin/bans.php
@@ -49,7 +49,7 @@ public function display()
                     'admin_console' => true,
                     'page' => $p,
                     'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'), __('Results head')),
-                    'paging_links' => '<span class="pages-label">' . __('Pages') . ' </span>' . paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str'])),
+                    'paging_links' => '<span class="pages-label">' . __('Pages') . ' </span>' . $this->feather->url->paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str'])),
                     'ban_data' => $ban_data['data'],
                 )
             )->addTemplate('admin/bans/search_ban.php')->display();
diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index fde60846..4da8c180 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -31,13 +31,13 @@ public function add_category()
     {
         $cat_name = feather_trim($this->request->post('cat_name'));
         if ($cat_name == '') {
-            redirect(get_link('admin/categories/'), __('Must enter name message'));
+            redirect($this->feather->url->get_link('admin/categories/'), __('Must enter name message'));
         }
 
         if ($this->model->add_category($cat_name)) {
-            redirect(get_link('admin/categories/'), __('Category added redirect'));
+            redirect($this->feather->url->get_link('admin/categories/'), __('Category added redirect'));
         } else { //TODO, add error message
-            redirect(get_link('admin/categories/'), __('Category added redirect'));
+            redirect($this->feather->url->get_link('admin/categories/'), __('Category added redirect'));
         }
     }
 
@@ -52,7 +52,7 @@ public function edit_categories()
                               'name' => feather_escape($properties['name']),
                               'order' => (int) $properties['order'], );
             if ($category['name'] == '') {
-                redirect(get_link('admin/categories/'), __('Must enter name message'));
+                redirect($this->feather->url->get_link('admin/categories/'), __('Must enter name message'));
             }
             $this->model->update_category($category);
         }
@@ -60,7 +60,7 @@ public function edit_categories()
         // Regenerate the quick jump cache
         $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
-        redirect(get_link('admin/categories/'), __('Categories updated redirect'));
+        redirect($this->feather->url->get_link('admin/categories/'), __('Categories updated redirect'));
     }
 
     public function delete_category()
@@ -72,13 +72,13 @@ public function delete_category()
         }
 
         if (intval($this->request->post('disclaimer')) != 1) {
-            redirect(get_link('admin/categories/'), __('Delete category not validated'));
+            redirect($this->feather->url->get_link('admin/categories/'), __('Delete category not validated'));
         }
 
         if ($this->model->delete_category($cat_to_delete)) {
-            redirect(get_link('admin/categories/'), __('Category deleted redirect'));
+            redirect($this->feather->url->get_link('admin/categories/'), __('Category deleted redirect'));
         } else {
-            redirect(get_link('admin/categories/'), __('Unable to delete category'));
+            redirect($this->feather->url->get_link('admin/categories/'), __('Unable to delete category'));
         }
     }
 
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index b12d3980..55e3df55 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -36,15 +36,15 @@ public function add_forum()
         $cat_id = (int) $this->request->post('cat');
 
         if ($cat_id < 1) {
-            redirect(get_link('admin/forums/'), __('Must be valid category'));
+            redirect($this->feather->url->get_link('admin/forums/'), __('Must be valid category'));
         }
 
         if ($fid = $this->model->add_forum($cat_id, __('New forum'))) {
             // Regenerate the quick jump cache
             $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
-            redirect(get_link('admin/forums/edit/'.$fid.'/'), __('Forum added redirect'));
+            redirect($this->feather->url->get_link('admin/forums/edit/'.$fid.'/'), __('Forum added redirect'));
         } else {
-            redirect(get_link('admin/forums/'), __('Unable to add forum'));
+            redirect($this->feather->url->get_link('admin/forums/'), __('Unable to add forum'));
         }
     }
 
@@ -61,10 +61,10 @@ public function edit_forum($forum_id)
                                     'redirect_url' => url_valid($this->request->post('redirect_url')) ? feather_escape($this->request->post('redirect_url')) : NULL);
 
                 if ($forum_data['forum_name'] == '') {
-                    redirect(get_link('admin/forums/edit/'.$forum_id.'/'), __('Must enter name message'));
+                    redirect($this->feather->url->get_link('admin/forums/edit/'.$forum_id.'/'), __('Must enter name message'));
                 }
                 if ($forum_data['cat_id'] < 1) {
-                    redirect(get_link('admin/forums/edit/'.$forum_id.'/'), __('Must be valid category'));
+                    redirect($this->feather->url->get_link('admin/forums/edit/'.$forum_id.'/'), __('Must be valid category'));
                 }
 
                 $this->model->update_forum($forum_id, $forum_data);
@@ -100,7 +100,7 @@ public function edit_forum($forum_id)
                 // Regenerate the quick jump cache
                 $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
-                redirect(get_link('admin/forums/edit/'.$forum_id.'/'), __('Forum updated redirect'));
+                redirect($this->feather->url->get_link('admin/forums/edit/'.$forum_id.'/'), __('Forum updated redirect'));
 
             } elseif ($this->request->post('revert_perms')) {
                 $this->model->delete_permissions($forum_id);
@@ -108,7 +108,7 @@ public function edit_forum($forum_id)
                 // Regenerate the quick jump cache
                 $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
-                redirect(get_link('admin/forums/edit/'.$forum_id.'/'), __('Perms reverted redirect'));
+                redirect($this->feather->url->get_link('admin/forums/edit/'.$forum_id.'/'), __('Perms reverted redirect'));
             }
 
         } else {
@@ -134,7 +134,7 @@ public function delete_forum($forum_id)
             // Regenerate the quick jump cache
             $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
-            redirect(get_link('admin/forums/'), __('Forum deleted redirect'));
+            redirect($this->feather->url->get_link('admin/forums/'), __('Forum deleted redirect'));
 
         } else { // If the user hasn't confirmed
 
@@ -162,7 +162,7 @@ public function edit_positions()
         // Regenerate the quick jump cache
         $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
-        redirect(get_link('admin/forums/'), __('Forums updated redirect'));
+        redirect($this->feather->url->get_link('admin/forums/'), __('Forums updated redirect'));
     }
 
     public function display()
diff --git a/controller/admin/index.php b/controller/admin/index.php
index d864cc97..6ecdb650 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -65,7 +65,7 @@ public function display($action = null)
             $deleted = $this->remove_install_folder($this->feather->forum_env['FEATHER_ROOT'].'install');
 
             if ($deleted) {
-                redirect(get_link('admin/'), __('Deleted install.php redirect'));
+                redirect($this->feather->url->get_link('admin/'), __('Deleted install.php redirect'));
             } else {
                 message(__('Delete install.php failed'));
             }
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index a2f8c7ea..3889a2c4 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -41,7 +41,7 @@ public function display()
         if ($this->request->post('reset') || !file_exists($cache_file)) {
             require_once(FEATHER_ROOT.'include/bbcd_source.php');
             require_once(FEATHER_ROOT.'include/bbcd_compile.php');
-            redirect(get_link('admin/parser/'), $lang_admin_parser['reset_success']);
+            redirect($this->feather->url->get_link('admin/parser/'), $lang_admin_parser['reset_success']);
         }
 
         // Load the current BBCode $pd array from include/parser_data.inc.php.
@@ -65,7 +65,7 @@ public function display()
                             if (preg_match('%^image/%', $f['type'])) {        // If we have an image file type?
                                 if ($f['size'] > 0 && $f['size'] <= $this->config['o_avatars_size']) {
                                     if (move_uploaded_file($f['tmp_name'], FEATHER_ROOT .'img/smilies/'. $name)) {
-                                        redirect(get_link('admin/parser/'), $lang_admin_parser['upload success']);
+                                        redirect($this->feather->url->get_link('admin/parser/'), $lang_admin_parser['upload success']);
                                     } else { //  Error #1: 'Smiley upload failed. Unable to move to smiley folder.'.
                                         message($lang_admin_parser['upload_err_1']);
                                     }
@@ -199,7 +199,7 @@ public function display()
             }
 
             require_once('include/bbcd_compile.php'); // Compile $bbcd and save into $pd['bbcd']
-            redirect(get_link('admin/parser/'), $lang_admin_parser['save_success']);
+            redirect($this->feather->url->get_link('admin/parser/'), $lang_admin_parser['save_success']);
         }
 
         \FeatherBB\AdminUtils::generateAdminMenu('parser');
diff --git a/controller/admin/users.php b/controller/admin/users.php
index c8b93334..b4903b1a 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -99,7 +99,7 @@ public function display()
             $start_from = 50 * ($p - 1);
 
             // Generate paging links
-            $paging_links = '<span class="pages-label">' . __('Pages') . ' </span>' . paginate_old($num_pages, $p, '?find_user=&amp;'.implode('&amp;', $search['query_str']));
+            $paging_links = '<span class="pages-label">' . __('Pages') . ' </span>' . $this->feather->url->paginate_old($num_pages, $p, '?find_user=&amp;'.implode('&amp;', $search['query_str']));
 
             // Some helper variables for permissions
             $can_delete = $can_move = $this->user->g_id == FEATHER_ADMIN;
@@ -153,7 +153,7 @@ public function ipstats($id)
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'page' => $p,
-                'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$id),
+                'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate_old($num_pages, $p, '?ip_stats='.$id),
                 'start_from'        =>  $start_from,
                 'ip_data'   =>  $this->model->get_ip_stats($id, $start_from),
             )
@@ -180,7 +180,7 @@ public function showusers($ip)
                 'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
                 'active_page' => 'admin',
                 'admin_console' => true,
-                'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?ip_stats='.$ip),
+                'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate_old($num_pages, $p, '?ip_stats='.$ip),
                 'page' => $p,
                 'start_from'        =>  $start_from,
                 'info'   =>  $this->model->get_info_poster($ip, $start_from),
diff --git a/controller/edit.php b/controller/edit.php
index 0239c17e..8fbdeef5 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -76,7 +76,7 @@ public function editpost($id)
                 // Edit the post
                 $this->model->edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod);
 
-                redirect(get_link('post/'.$id.'/#p'.$id), __('Post redirect'));
+                redirect($this->feather->url->get_link('post/'.$id.'/#p'.$id), __('Post redirect'));
             }
         } else {
             $post = '';
diff --git a/controller/install.php b/controller/install.php
index 0f1133be..bdc8cf24 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -203,7 +203,7 @@ public function create_db(array $data)
         $flash->save();
 
         // Redirect to homepage
-        redirect(get_link('/'));
+        redirect($this->feather->url->get_link('/'));
     }
 
     public function write_config($json)
diff --git a/controller/misc.php b/controller/misc.php
index 914b0561..77f6491b 100644
--- a/controller/misc.php
+++ b/controller/misc.php
@@ -55,7 +55,7 @@ public function markforumread($id)
         $tracked_topics['forums'][$id] = time();
         set_tracked_topics($tracked_topics);
 
-        redirect(get_link('forum/'.$id.'/'), __('Mark forum read redirect'));
+        redirect($this->feather->url->get_link('forum/'.$id.'/'), __('Mark forum read redirect'));
     }
 
     public function subscribeforum($id)
diff --git a/controller/moderate.php b/controller/moderate.php
index 5c65e775..758ad1c4 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -99,7 +99,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         if ($action == 'stick') {
             $this->model->stick_topic($id, $fid);
 
-            redirect(get_link('topic/'.$id.'/'), __('Stick topic redirect'));
+            redirect($this->feather->url->get_link('topic/'.$id.'/'), __('Stick topic redirect'));
         }
 
 
@@ -107,21 +107,21 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         if ($action == 'unstick') {
             $this->model->unstick_topic($id, $fid);
 
-            redirect(get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
+            redirect($this->feather->url->get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
         }
 
         // Open a topic
         if ($action == 'open') {
             $this->model->open_topic($id, $fid);
 
-            redirect(get_link('topic/'.$id.'/'), __('Open topic redirect'));
+            redirect($this->feather->url->get_link('topic/'.$id.'/'), __('Open topic redirect'));
         }
 
         // Close a topic
         if ($action == 'close') {
             $this->model->close_topic($id, $fid);
 
-            redirect(get_link('topic/'.$id.'/'), __('Close topic redirect'));
+            redirect($this->feather->url->get_link('topic/'.$id.'/'), __('Close topic redirect'));
         }
 
         $cur_topic = $this->model->get_topic_info($fid, $id);
@@ -199,11 +199,11 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                         'page' => $p,
                         'active_page' => 'moderate',
                         'cur_topic' => $cur_topic,
-                        'url_topic' => url_friendly($cur_topic['subject']),
-                        'url_forum' => url_friendly($cur_topic['forum_name']),
+                        'url_topic' => $this->feather->url->url_friendly($cur_topic['subject']),
+                        'url_forum' => $this->feather->url->url_friendly($cur_topic['forum_name']),
                         'fid' => $fid,
                         'id' => $id,
-                        'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/#'),
+                        'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate($num_pages, $p, 'moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/#'),
                         'post_data' => $this->model->display_posts_view($id, $start_from),
                         'button_status' => $button_status,
                         'start_from' => $start_from,
@@ -241,7 +241,7 @@ public function display($id, $name = null, $page = null)
 
         $p = (!isset($page) || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
         $start_from = $this->user->disp_topics * ($p - 1);
-        $url_forum = url_friendly($cur_forum['forum_name']);
+        $url_forum = $this->feather->url->url_friendly($cur_forum['forum_name']);
 
         $this->feather->view2->setPageInfo(array(
                             'title' => array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name'])),
@@ -251,7 +251,7 @@ public function display($id, $name = null, $page = null)
                             'p' => $p,
                             'url_forum' => $url_forum,
                             'cur_forum' => $cur_forum,
-                            'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'moderate/forum/'.$id.'/#'),
+                            'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate($num_pages, $p, 'moderate/forum/'.$id.'/#'),
                             'topic_data' => $this->model->display_topics($id, $sort_by, $start_from),
                             'start_from' => $start_from,
                             )
@@ -352,7 +352,7 @@ public function dealposts($fid)
                 $this->model->close_multiple_topics($action, $topics, $fid);
 
                 $redirect_msg = ($action) ? __('Close topics redirect') : __('Open topics redirect');
-                redirect(get_link('moderate/forum/'.$fid.'/'), $redirect_msg);
+                redirect($this->feather->url->get_link('moderate/forum/'.$fid.'/'), $redirect_msg);
             }
         }
     }
diff --git a/controller/post.php b/controller/post.php
index 5400a9dc..ec676380 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -120,7 +120,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             $this->model->increment_post_count($post, $new['tid']);
                         }
 
-                    redirect(get_link('post/'.$new['pid'].'/#p'.$new['pid']), __('Post redirect'));
+                    redirect($this->feather->url->get_link('post/'.$new['pid'].'/#p'.$new['pid']), __('Post redirect'));
                 }
         }
 
@@ -129,28 +129,28 @@ public function newpost($fid = null, $tid = null, $qid = null)
         // If a topic ID was specified in the url (it's a reply)
         if ($tid) {
             $action = __('Post a reply');
-            $form = '<form id="post" method="post" action="'.get_link('post/reply/'.$tid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
+            $form = '<form id="post" method="post" action="'.$this->feather->url->get_link('post/reply/'.$tid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
 
                 // If a quote ID was specified in the url
                 if (isset($qid)) {
                     $quote = $this->model->get_quote_message($qid, $tid);
-                    $form = '<form id="post" method="post" action="'.get_link('post/reply/'.$tid.'/quote/'.$qid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
+                    $form = '<form id="post" method="post" action="'.$this->feather->url->get_link('post/reply/'.$tid.'/quote/'.$qid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
                 }
         }
         // If a forum ID was specified in the url (new topic)
         elseif ($fid) {
             $action = __('Post new topic');
-            $form = '<form id="post" method="post" action="'.get_link('post/new-topic/'.$fid.'/').'" onsubmit="return process_form(this)">';
+            $form = '<form id="post" method="post" action="'.$this->feather->url->get_link('post/new-topic/'.$fid.'/').'" onsubmit="return process_form(this)">';
         } else {
             message(__('Bad request'), '404');
         }
 
-        $url_forum = url_friendly($cur_posting['forum_name']);
+        $url_forum = $this->feather->url->url_friendly($cur_posting['forum_name']);
 
         $is_subscribed = $tid && $cur_posting['is_subscribed'];
 
         if (isset($cur_posting['subject'])) {
-            $url_topic = url_friendly($cur_posting['subject']);
+            $url_topic = $this->feather->url->url_friendly($cur_posting['subject']);
         } else {
             $url_topic = '';
         }
diff --git a/controller/profile.php b/controller/profile.php
index 5e7ea6c4..a05d9b5f 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -166,13 +166,13 @@ public function display($id, $section = null)
                     message(__('Bad request'), '404');
                 }
 
-                $avatar_field = '<span><a href="'.get_link('user/'.$id.'/action/upload_avatar/').'">'.__('Change avatar').'</a></span>';
+                $avatar_field = '<span><a href="'.$this->feather->url->get_link('user/'.$id.'/action/upload_avatar/').'">'.__('Change avatar').'</a></span>';
 
                 $user_avatar = generate_avatar_markup($id);
                 if ($user_avatar) {
-                    $avatar_field .= ' <span><a href="'.get_link('user/'.$id.'/action/delete_avatar/').'">'.__('Delete avatar').'</a></span>';
+                    $avatar_field .= ' <span><a href="'.$this->feather->url->get_link('user/'.$id.'/action/delete_avatar/').'">'.__('Delete avatar').'</a></span>';
                 } else {
-                    $avatar_field = '<span><a href="'.get_link('user/'.$id.'/action/upload_avatar/').'">'.__('Upload avatar').'</a></span>';
+                    $avatar_field = '<span><a href="'.$this->feather->url->get_link('user/'.$id.'/action/upload_avatar/').'">'.__('Upload avatar').'</a></span>';
                 }
 
                 if ($user['signature'] != '') {
@@ -312,7 +312,7 @@ public function action($id, $action)
 
             $this->model->delete_avatar($id);
 
-            redirect(get_link('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
+            redirect($this->feather->url->get_link('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
         } elseif ($action == 'promote') {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_promote_users == '0')) {
                 message(__('No permission'), '403');
diff --git a/controller/register.php b/controller/register.php
index b1016b99..e2963cee 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -98,7 +98,7 @@ public function rules()
         }
 
         if ($this->config['o_rules'] != '1') {
-            redirect(get_link('register/agree/'));
+            redirect($this->feather->url->get_link('register/agree/'));
         }
 
         $this->feather->view2->setPageInfo(array(
diff --git a/controller/search.php b/controller/search.php
index 58490662..9405fbeb 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -90,6 +90,6 @@ public function display()
 
     public function quicksearches($show)
     {
-        redirect(get_link('search/?action=show_'.$show));
+        redirect($this->feather->url->get_link('search/?action=show_'.$show));
     }
 }
diff --git a/controller/userlist.php b/controller/userlist.php
index 671724dc..fed9c086 100644
--- a/controller/userlist.php
+++ b/controller/userlist.php
@@ -51,7 +51,7 @@ public function display()
         }
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
 
         $this->feather->view2->setPageInfo(array(
             'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('User list')),
diff --git a/controller/viewforum.php b/controller/viewforum.php
index 49252f71..f1f07a67 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -50,7 +50,7 @@ public function display($id, $name = null, $page = null)
 
         // Can we or can we not post new topics?
         if (($cur_forum['post_topics'] == '' && $this->feather->user->g_post_topics == '1') || $cur_forum['post_topics'] == '1' || $is_admmod) {
-            $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/new-topic/'.$id.'/').'">'.__('Post topic').'</a></p>'."\n";
+            $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.$this->feather->url->get_link('post/new-topic/'.$id.'/').'">'.__('Post topic').'</a></p>'."\n";
         } else {
             $post_link = '';
         }
@@ -60,20 +60,20 @@ public function display($id, $name = null, $page = null)
 
         $p = (!isset($page) || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
         $start_from = $this->feather->user->disp_topics * ($p - 1);
-        $url_forum = url_friendly($cur_forum['forum_name']);
+        $url_forum = $this->feather->url->url_friendly($cur_forum['forum_name']);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'forum/'.$id.'/'.$url_forum.'/#');
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate($num_pages, $p, 'forum/'.$id.'/'.$url_forum.'/#');
 
         $forum_actions = $this->model->get_forum_actions($id, $this->feather->forum_settings['o_forum_subscriptions'], $cur_forum['is_subscribed']);
 
-        $this->feather->view2->addAsset('canonical', get_link('forum/'.$id.'/'.$url_forum.'/'));
+        $this->feather->view2->addAsset('canonical', $this->feather->url->get_link('forum/'.$id.'/'.$url_forum.'/'));
         if ($num_pages > 1) {
             if ($p > 1) {
-                $this->feather->view2->addAsset('prev', get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
+                $this->feather->view2->addAsset('prev', $this->feather->url->get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
             }
             if ($p < $num_pages) {
-                $this->feather->view2->addAsset('next', get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
+                $this->feather->view2->addAsset('next', $this->feather->url->get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
             }
         }
 
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index 6abdf274..a8bf757a 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -58,11 +58,11 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         $p = (!isset($page) || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
         $start_from = $this->feather->user->disp_posts * ($p - 1);
 
-        $url_topic = url_friendly($cur_topic['subject']);
-        $url_forum = url_friendly($cur_topic['forum_name']);
+        $url_topic = $this->feather->url->url_friendly($cur_topic['subject']);
+        $url_forum = $this->feather->url->url_friendly($cur_topic['forum_name']);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.paginate($num_pages, $p, 'topic/'.$id.'/'.$url_topic.'/#');
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate($num_pages, $p, 'topic/'.$id.'/'.$url_topic.'/#');
 
         if ($this->feather->forum_settings['o_censoring'] == '1') {
             $cur_topic['subject'] = censor_words($cur_topic['subject']);
@@ -91,13 +91,13 @@ public function display($id = null, $name = null, $page = null, $pid = null)
             'promptQuote' => __('promptQuote')
         );
 
-        $this->feather->view2->addAsset('canonical', get_link('forum/'.$id.'/'.$url_forum.'/'));
+        $this->feather->view2->addAsset('canonical', $this->feather->url->get_link('forum/'.$id.'/'.$url_forum.'/'));
         if ($num_pages > 1) {
             if ($p > 1) {
-                $this->feather->view2->addAsset('prev', get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
+                $this->feather->view2->addAsset('prev', $this->feather->url->get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
             }
             if ($p < $num_pages) {
-                $this->feather->view2->addAsset('next', get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
+                $this->feather->view2->addAsset('next', $this->feather->url->get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
             }
         }
 
diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index b36bb627..78811653 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -196,6 +196,10 @@ public function call()
         $this->app->container->singleton('view2', function() {
             return new \FeatherBB\View();
         });
+        // Load FeatherBB url class
+        $this->app->container->singleton('url', function () {
+            return new \FeatherBB\Url();
+        });
         // Load FeatherBB hooks
         $this->app->container->singleton('hooks', function () {
             return new \FeatherBB\Hooks();
diff --git a/include/classes/url.class.php b/include/classes/url.class.php
new file mode 100644
index 00000000..f9340f33
--- /dev/null
+++ b/include/classes/url.class.php
@@ -0,0 +1,777 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace FeatherBB;
+
+class Url
+{
+    protected $url_replace = array(
+                                    '�' => 'A',
+                                    '�' => 'A',
+                                    '�' => 'A',
+                                    '�' => 'A',
+                                    '�' => 'Ae',
+                                    '�' => 'A',
+                                    '�' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '�' => 'C',
+                                    '?' => 'C',
+                                    '?' => 'C',
+                                    '?' => 'C',
+                                    '?' => 'C',
+                                    '?' => 'D',
+                                    '?' => 'D',
+                                    '�' => 'E',
+                                    '�' => 'E',
+                                    '�' => 'E',
+                                    '�' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'G',
+                                    '?' => 'G',
+                                    '?' => 'G',
+                                    '?' => 'G',
+                                    '?' => 'H',
+                                    '?' => 'H',
+                                    '�' => 'I',
+                                    '�' => 'I',
+                                    '�' => 'I',
+                                    '�' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'IJ',
+                                    '?' => 'J',
+                                    '?' => 'K',
+                                    '?' => 'K',
+                                    '?' => 'K',
+                                    '?' => 'K',
+                                    '?' => 'K',
+                                    '?' => 'L',
+                                    '�' => 'N',
+                                    '?' => 'N',
+                                    '?' => 'N',
+                                    '?' => 'N',
+                                    '?' => 'N',
+                                    '�' => 'O',
+                                    '�' => 'O',
+                                    '�' => 'O',
+                                    '�' => 'O',
+                                    '�' => 'Oe',
+                                    '�' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '�' => 'OE',
+                                    '?' => 'R',
+                                    '?' => 'R',
+                                    '?' => 'R',
+                                    '?' => 'S',
+                                    '?' => 'S',
+                                    '?' => 'S',
+                                    '?' => 'S',
+                                    '�' => 'S',
+                                    '?' => 'T',
+                                    '?' => 'T',
+                                    '?' => 'T',
+                                    '?' => 'T',
+                                    '�' => 'U',
+                                    '�' => 'U',
+                                    '�' => 'U',
+                                    '�' => 'Ue',
+                                    '?' => 'U',
+                                    '?' => 'U',
+                                    '?' => 'U',
+                                    '?' => 'U',
+                                    '?' => 'U',
+                                    '?' => 'U',
+                                    '?' => 'W',
+                                    '?' => 'Y',
+                                    '�' => 'Y',
+                                    '�' => 'Y',
+                                    '?' => 'Z',
+                                    '?' => 'Z',
+                                    '�' => 'Z',
+                                    '�' => 'a',
+                                    '�' => 'a',
+                                    '�' => 'a',
+                                    '�' => 'a',
+                                    '�' => 'ae',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '�' => 'a',
+                                    '�' => 'ae',
+                                    '�' => 'c',
+                                    '?' => 'c',
+                                    '?' => 'c',
+                                    '?' => 'c',
+                                    '?' => 'c',
+                                    '?' => 'd',
+                                    '?' => 'd',
+                                    '�' => 'e',
+                                    '�' => 'e',
+                                    '�' => 'e',
+                                    '�' => 'e',
+                                    '?' => 'e',
+                                    '?' => 'e',
+                                    '?' => 'e',
+                                    '?' => 'e',
+                                    '?' => 'e',
+                                    '�' => 'f',
+                                    '?' => 'g',
+                                    '?' => 'g',
+                                    '?' => 'g',
+                                    '?' => 'g',
+                                    '?' => 'h',
+                                    '?' => 'h',
+                                    '�' => 'i',
+                                    '�' => 'i',
+                                    '�' => 'i',
+                                    '�' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'ij',
+                                    '?' => 'j',
+                                    '?' => 'k',
+                                    '?' => 'k',
+                                    '?' => 'l',
+                                    '?' => 'l',
+                                    '?' => 'l',
+                                    '?' => 'l',
+                                    '?' => 'l',
+                                    '�' => 'n',
+                                    '?' => 'n',
+                                    '?' => 'n',
+                                    '?' => 'n',
+                                    '?' => 'n',
+                                    '?' => 'n',
+                                    '�' => 'o',
+                                    '�' => 'o',
+                                    '�' => 'o',
+                                    '�' => 'o',
+                                    '�' => 'oe',
+                                    '�' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '�' => 'oe',
+                                    '?' => 'r',
+                                    '?' => 'r',
+                                    '?' => 'r',
+                                    '?' => 's',
+                                    '�' => 's',
+                                    '?' => 't',
+                                    '�' => 'u',
+                                    '�' => 'u',
+                                    '�' => 'u',
+                                    '�' => 'ue',
+                                    '?' => 'u',
+                                    '?' => 'u',
+                                    '?' => 'u',
+                                    '?' => 'u',
+                                    '?' => 'u',
+                                    '?' => 'u',
+                                    '?' => 'w',
+                                    '�' => 'y',
+                                    '�' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'z',
+                                    '?' => 'z',
+                                    '�' => 'z',
+                                    '�' => 'ss',
+                                    '?' => 'ss',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'A',
+                                    '?' => 'B',
+                                    '?' => 'G',
+                                    '?' => 'D',
+                                    '?' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'Z',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'TH',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'K',
+                                    '?' => 'L',
+                                    '?' => 'M',
+                                    '?' => 'N',
+                                    '?' => 'KS',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'P',
+                                    '?' => 'R',
+                                    '?' => 'R',
+                                    '?' => 'S',
+                                    '?' => 'T',
+                                    '?' => 'Y',
+                                    '?' => 'Y',
+                                    '?' => 'Y',
+                                    '?' => 'Y',
+                                    '?' => 'Y',
+                                    '?' => 'Y',
+                                    '?' => 'Y',
+                                    '?' => 'Y',
+                                    '?' => 'Y',
+                                    '?' => 'Y',
+                                    '?' => 'Y',
+                                    '?' => 'F',
+                                    '?' => 'X',
+                                    '?' => 'PS',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'O',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'a',
+                                    '?' => 'b',
+                                    '?' => 'g',
+                                    '?' => 'd',
+                                    '?' => 'e',
+                                    '?' => 'e',
+                                    '?' => 'e',
+                                    '?' => 'e',
+                                    '?' => 'e',
+                                    '?' => 'e',
+                                    '?' => 'e',
+                                    '?' => 'e',
+                                    '?' => 'e',
+                                    '?' => 'e',
+                                    '?' => 'z',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'th',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'i',
+                                    '?' => 'k',
+                                    '?' => 'l',
+                                    '?' => 'm',
+                                    '?' => 'n',
+                                    '?' => 'ks',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'p',
+                                    '?' => 'r',
+                                    '?' => 'r',
+                                    '?' => 'r',
+                                    '?' => 's',
+                                    '?' => 's',
+                                    '?' => 't',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'y',
+                                    '?' => 'f',
+                                    '?' => 'x',
+                                    '?' => 'ps',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '?' => 'o',
+                                    '�' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => 'A',
+                                    '?' => 'B',
+                                    '?' => 'V',
+                                    '?' => 'G',
+                                    '?' => 'D',
+                                    '?' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'ZH',
+                                    '?' => 'Z',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'K',
+                                    '?' => 'L',
+                                    '?' => 'M',
+                                    '?' => 'N',
+                                    '?' => 'O',
+                                    '?' => 'P',
+                                    '?' => 'R',
+                                    '?' => 'S',
+                                    '?' => 'T',
+                                    '?' => 'U',
+                                    '?' => 'F',
+                                    '?' => 'KH',
+                                    '?' => 'TS',
+                                    '?' => 'CH',
+                                    '?' => 'SH',
+                                    '?' => 'SHCH',
+                                    '?' => 'Y',
+                                    '?' => 'E',
+                                    '?' => 'YU',
+                                    '?' => 'YA',
+                                    '?' => 'A',
+                                    '?' => 'B',
+                                    '?' => 'V',
+                                    '?' => 'G',
+                                    '?' => 'D',
+                                    '?' => 'E',
+                                    '?' => 'E',
+                                    '?' => 'ZH',
+                                    '?' => 'Z',
+                                    '?' => 'I',
+                                    '?' => 'I',
+                                    '?' => 'K',
+                                    '?' => 'L',
+                                    '?' => 'M',
+                                    '?' => 'N',
+                                    '?' => 'O',
+                                    '?' => 'P',
+                                    '?' => 'R',
+                                    '?' => 'S',
+                                    '?' => 'T',
+                                    '?' => 'U',
+                                    '?' => 'F',
+                                    '?' => 'KH',
+                                    '?' => 'TS',
+                                    '?' => 'CH',
+                                    '?' => 'SH',
+                                    '?' => 'SHCH',
+                                    '?' => 'Y',
+                                    '?' => 'E',
+                                    '?' => 'YU',
+                                    '?' => 'YA',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+                                    '?' => '',
+
+                                    '?' => 'YE',
+                                    '?' => 'YE',
+                                    '?' => 'YI',
+                                    '?' => 'YI',
+                                    '?' => 'KG',
+                                    '?' => 'KG',
+
+                                    '�' => 'd',
+                                    '�' => 'D',
+                                    '�' => 'th',
+                                    '�' => 'TH',
+
+                                    '&'    =>    '-',
+                                    '/'    =>    '-',
+                                    '('    =>    '-',
+                                    '"'    =>    '-',
+                                    "'"    =>    '-',
+
+                                );
+
+    //
+    // Generate a string with numbered links (for multipage scripts)
+    //
+    public function paginate($num_pages, $cur_page, $link, $args = null)
+    {
+        $pages = array();
+        $link_to_all = false;
+
+        // If $cur_page == -1, we link to all pages (used in viewforum.php)
+        if ($cur_page == -1) {
+            $cur_page = 1;
+            $link_to_all = true;
+        }
+
+        if ($num_pages <= 1) {
+            $pages = array('<strong class="item1">1</strong>');
+        } else {
+            // Add a previous page link
+            if ($num_pages > 1 && $cur_page > 1) {
+                $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.$this->get_sublink($link, 'page/$1', ($cur_page - 1), $args).'">'.__('Previous').'</a>';
+            }
+
+            if ($cur_page > 3) {
+                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'">1</a>';
+
+                if ($cur_page > 5) {
+                    $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
+                }
+            }
+
+            // Don't ask me how the following works. It just does, OK? :-)
+            for ($current = ($cur_page == 5) ? $cur_page - 3 : $cur_page - 2, $stop = ($cur_page + 4 == $num_pages) ? $cur_page + 4 : $cur_page + 3; $current < $stop; ++$current) {
+                if ($current < 1 || $current > $num_pages) {
+                    continue;
+                } elseif ($current != $cur_page || $link_to_all) {
+                    $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.str_replace('#', '', $this->get_sublink($link, 'page/$1', $current, $args)).'">'.forum_number_format($current).'</a>';
+                } else {
+                    $pages[] = '<strong'.(empty($pages) ? ' class="item1"' : '').'>'.forum_number_format($current).'</strong>';
+                }
+            }
+
+            if ($cur_page <= ($num_pages-3)) {
+                if ($cur_page != ($num_pages-3) && $cur_page != ($num_pages-4)) {
+                    $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
+                }
+
+                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$this->get_sublink($link, 'page/$1', $num_pages, $args).'">'.forum_number_format($num_pages).'</a>';
+            }
+
+            // Add a next page link
+            if ($num_pages > 1 && !$link_to_all && $cur_page < $num_pages) {
+                $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.$this->get_sublink($link, 'page/$1', ($cur_page + 1), $args).'">'.__('Next').'</a>';
+            }
+        }
+
+        return implode(' ', $pages);
+    }
+
+    //
+    // Generate a string with numbered links (for multipage scripts)
+    // Old FluxBB-style function for search page
+    //
+    public function paginate_old($num_pages, $cur_page, $link)
+    {
+        $pages = array();
+        $link_to_all = false;
+
+        // If $cur_page == -1, we link to all pages (used in viewforum.php)
+        if ($cur_page == -1) {
+            $cur_page = 1;
+            $link_to_all = true;
+        }
+
+        if ($num_pages <= 1) {
+            $pages = array('<strong class="item1">1</strong>');
+        } else {
+            // Add a previous page link
+            if ($num_pages > 1 && $cur_page > 1) {
+                $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.($cur_page == 2 ? '' : '&amp;p='.($cur_page - 1)).'">'.__('Previous').'</a>';
+            }
+
+            if ($cur_page > 3) {
+                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'">1</a>';
+
+                if ($cur_page > 5) {
+                    $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
+                }
+            }
+
+            // Don't ask me how the following works. It just does, OK? :-)
+            for ($current = ($cur_page == 5) ? $cur_page - 3 : $cur_page - 2, $stop = ($cur_page + 4 == $num_pages) ? $cur_page + 4 : $cur_page + 3; $current < $stop; ++$current) {
+                if ($current < 1 || $current > $num_pages) {
+                    continue;
+                } elseif ($current != $cur_page || $link_to_all) {
+                    $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.($current == 1 ? '' : '&amp;p='.$current).'">'.forum_number_format($current).'</a>';
+                } else {
+                    $pages[] = '<strong'.(empty($pages) ? ' class="item1"' : '').'>'.forum_number_format($current).'</strong>';
+                }
+            }
+
+            if ($cur_page <= ($num_pages-3)) {
+                if ($cur_page != ($num_pages-3) && $cur_page != ($num_pages-4)) {
+                    $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
+                }
+
+                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.$num_pages.'">'.forum_number_format($num_pages).'</a>';
+            }
+
+            // Add a next page link
+            if ($num_pages > 1 && !$link_to_all && $cur_page < $num_pages) {
+                $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.($cur_page +1).'">'.__('Next').'</a>';
+            }
+        }
+
+        return implode(' ', $pages);
+    }
+
+    //
+    // Make a string safe to use in a URL
+    // Inspired by (c) Panther <http://www.pantherforum.org/>
+    //
+    public function url_friendly($str)
+    {
+        $str = strtr($str, $this->url_replace);
+        $str = strtolower(utf8_decode($str));
+        $str = feather_trim(preg_replace(array('/[^a-z0-9\s]/', '/[\s]+/'), array('', '-'), $str), '-');
+
+        if (empty($str)) {
+            $str = 'view';
+        }
+
+        return $str;
+    }
+
+    //
+    // Generate link to another page on the forum
+    // Inspired by (c) Panther <http://www.pantherforum.org/>
+    //
+    public function get_link($link, $args = null)
+    {
+        if (function_exists('apache_get_modules') && in_array('mod_rewrite', apache_get_modules())) { // If we have Apache's mod_rewrite enabled
+            $base_url = get_base_url();
+        } else {
+            $base_url = get_base_url().'/index.php';
+        }
+
+        $gen_link = $link;
+        if ($args == null) {
+            $gen_link = $base_url.'/'.$link;
+        } elseif (!is_array($args)) {
+            $gen_link = $base_url.'/'.str_replace('$1', $args, $link);
+        } else {
+            for ($i = 0; isset($args[$i]); ++$i) {
+                $gen_link = str_replace('$'.($i + 1), $args[$i], $gen_link);
+            }
+            $gen_link = $base_url.'/'.$gen_link;
+        }
+
+        return $gen_link;
+    }
+
+    //
+    // Generate a hyperlink with parameters and anchor and a subsection such as a subpage
+    // Inspired by (c) Panther <http://www.pantherforum.org/>
+    //
+    private function get_sublink($link, $sublink, $subarg, $args = null)
+    {
+        $base_url = get_base_url();
+
+        if ($sublink == 'p$1' && $subarg == 1) {
+            return $this->get_link($link, $args);
+        }
+
+        $gen_link = $link;
+        if (!is_array($args) && $args != null) {
+            $gen_link = str_replace('$1', $args, $link);
+        } else {
+            for ($i = 0; isset($args[$i]); ++$i) {
+                $gen_link = str_replace('$'.($i + 1), $args[$i], $gen_link);
+            }
+        }
+
+        $gen_link = $base_url.'/'.str_replace('#', str_replace('$1', str_replace('$1', $subarg, $sublink), '$1/'), $gen_link);
+
+        return $gen_link;
+    }
+}
\ No newline at end of file
diff --git a/include/functions.php b/include/functions.php
index 2189bb05..d29a8d6c 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -468,124 +468,6 @@ function get_title($user)
 }
 
 
-//
-// Generate a string with numbered links (for multipage scripts)
-//
-function paginate($num_pages, $cur_page, $link, $args = null)
-{
-    $pages = array();
-    $link_to_all = false;
-
-    // If $cur_page == -1, we link to all pages (used in viewforum.php)
-    if ($cur_page == -1) {
-        $cur_page = 1;
-        $link_to_all = true;
-    }
-
-    if ($num_pages <= 1) {
-        $pages = array('<strong class="item1">1</strong>');
-    } else {
-        // Add a previous page link
-        if ($num_pages > 1 && $cur_page > 1) {
-            $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', ($cur_page - 1), $args).'">'.__('Previous').'</a>';
-        }
-
-        if ($cur_page > 3) {
-            $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'">1</a>';
-
-            if ($cur_page > 5) {
-                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
-            }
-        }
-
-        // Don't ask me how the following works. It just does, OK? :-)
-        for ($current = ($cur_page == 5) ? $cur_page - 3 : $cur_page - 2, $stop = ($cur_page + 4 == $num_pages) ? $cur_page + 4 : $cur_page + 3; $current < $stop; ++$current) {
-            if ($current < 1 || $current > $num_pages) {
-                continue;
-            } elseif ($current != $cur_page || $link_to_all) {
-                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.str_replace('#', '', get_sublink($link, 'page/$1', $current, $args)).'">'.forum_number_format($current).'</a>';
-            } else {
-                $pages[] = '<strong'.(empty($pages) ? ' class="item1"' : '').'>'.forum_number_format($current).'</strong>';
-            }
-        }
-
-        if ($cur_page <= ($num_pages-3)) {
-            if ($cur_page != ($num_pages-3) && $cur_page != ($num_pages-4)) {
-                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
-            }
-
-            $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', $num_pages, $args).'">'.forum_number_format($num_pages).'</a>';
-        }
-
-        // Add a next page link
-        if ($num_pages > 1 && !$link_to_all && $cur_page < $num_pages) {
-            $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.get_sublink($link, 'page/$1', ($cur_page + 1), $args).'">'.__('Next').'</a>';
-        }
-    }
-
-    return implode(' ', $pages);
-}
-
-//
-// Generate a string with numbered links (for multipage scripts)
-// Old FluxBB-style function for search page
-//
-function paginate_old($num_pages, $cur_page, $link)
-{
-    $pages = array();
-    $link_to_all = false;
-
-    // If $cur_page == -1, we link to all pages (used in viewforum.php)
-    if ($cur_page == -1) {
-        $cur_page = 1;
-        $link_to_all = true;
-    }
-
-    if ($num_pages <= 1) {
-        $pages = array('<strong class="item1">1</strong>');
-    } else {
-        // Add a previous page link
-        if ($num_pages > 1 && $cur_page > 1) {
-            $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.($cur_page == 2 ? '' : '&amp;p='.($cur_page - 1)).'">'.__('Previous').'</a>';
-        }
-
-        if ($cur_page > 3) {
-            $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'">1</a>';
-
-            if ($cur_page > 5) {
-                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
-            }
-        }
-
-        // Don't ask me how the following works. It just does, OK? :-)
-        for ($current = ($cur_page == 5) ? $cur_page - 3 : $cur_page - 2, $stop = ($cur_page + 4 == $num_pages) ? $cur_page + 4 : $cur_page + 3; $current < $stop; ++$current) {
-            if ($current < 1 || $current > $num_pages) {
-                continue;
-            } elseif ($current != $cur_page || $link_to_all) {
-                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.($current == 1 ? '' : '&amp;p='.$current).'">'.forum_number_format($current).'</a>';
-            } else {
-                $pages[] = '<strong'.(empty($pages) ? ' class="item1"' : '').'>'.forum_number_format($current).'</strong>';
-            }
-        }
-
-        if ($cur_page <= ($num_pages-3)) {
-            if ($cur_page != ($num_pages-3) && $cur_page != ($num_pages-4)) {
-                $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
-            }
-
-            $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.$num_pages.'">'.forum_number_format($num_pages).'</a>';
-        }
-
-        // Add a next page link
-        if ($num_pages > 1 && !$link_to_all && $cur_page < $num_pages) {
-            $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.($cur_page +1).'">'.__('Next').'</a>';
-        }
-    }
-
-    return implode(' ', $pages);
-}
-
-
 //
 // Display a message
 //
@@ -1108,79 +990,6 @@ function generate_stopwords_cache_id()
     return sha1(implode('|', $hash));
 }
 
-//
-// Make a string safe to use in a URL
-// Inspired by (c) Panther <http://www.pantherforum.org/>
-//
-function url_friendly($str)
-{
-    require FEATHER_ROOT.'include/url_replace.php';
-
-    $str = strtr($str, $url_replace);
-    $str = strtolower(utf8_decode($str));
-    $str = feather_trim(preg_replace(array('/[^a-z0-9\s]/', '/[\s]+/'), array('', '-'), $str), '-');
-
-    if (empty($str)) {
-        $str = 'view';
-    }
-
-    return $str;
-}
-
-//
-// Generate link to another page on the forum
-// Inspired by (c) Panther <http://www.pantherforum.org/>
-//
-function get_link($link, $args = null)
-{
-    if (function_exists('apache_get_modules') && in_array('mod_rewrite', apache_get_modules())) { // If we have Apache's mod_rewrite enabled
-        $base_url = get_base_url();
-    } else {
-        $base_url = get_base_url().'/index.php';
-    }
-
-    $gen_link = $link;
-    if ($args == null) {
-        $gen_link = $base_url.'/'.$link;
-    } elseif (!is_array($args)) {
-        $gen_link = $base_url.'/'.str_replace('$1', $args, $link);
-    } else {
-        for ($i = 0; isset($args[$i]); ++$i) {
-            $gen_link = str_replace('$'.($i + 1), $args[$i], $gen_link);
-        }
-        $gen_link = $base_url.'/'.$gen_link;
-    }
-
-    return $gen_link;
-}
-
-
-//
-// Generate a hyperlink with parameters and anchor and a subsection such as a subpage
-// Inspired by (c) Panther <http://www.pantherforum.org/>
-//
-function get_sublink($link, $sublink, $subarg, $args = null)
-{
-    $base_url = get_base_url();
-
-    if ($sublink == 'p$1' && $subarg == 1) {
-        return get_link($link, $args);
-    }
-
-    $gen_link = $link;
-    if (!is_array($args) && $args != null) {
-        $gen_link = str_replace('$1', $args, $link);
-    } else {
-        for ($i = 0; isset($args[$i]); ++$i) {
-            $gen_link = str_replace('$'.($i + 1), $args[$i], $gen_link);
-        }
-    }
-
-    $gen_link = $base_url.'/'.str_replace('#', str_replace('$1', str_replace('$1', $subarg, $sublink), '$1/'), $gen_link);
-
-    return $gen_link;
-}
-
 // Generate breadcrumbs from an array of name and URLs
 function breadcrumbs_admin(array $links)
 {
diff --git a/include/url_replace.php b/include/url_replace.php
deleted file mode 100644
index 2e232759..00000000
--- a/include/url_replace.php
+++ /dev/null
@@ -1,589 +0,0 @@
-<?php
- 
-/**
- * Copyright (C) 2015 FeatherBB
- * url_replace.php is inspired by (c) Panther <http://www.pantherforum.org/>
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Replacements will be carried out by url_friendly() function
-$url_replace = array(
-    
-    'À' => 'A',
-    'Á' => 'A',
-    'Â' => 'A',
-    'Ã' => 'A',
-    'Ä' => 'Ae',
-    'Å' => 'A',
-    'Æ' => 'A',
-    'Ā' => 'A',
-    'Ą' => 'A',
-    'Ă' => 'A',
-    'Ç' => 'C',
-    'Ć' => 'C',
-    'Č' => 'C',
-    'Ĉ' => 'C',
-    'Ċ' => 'C',
-    'Ď' => 'D',
-    'Đ' => 'D',
-    'È' => 'E',
-    'É' => 'E',
-    'Ê' => 'E',
-    'Ë' => 'E',
-    'Ē' => 'E',
-    'Ę' => 'E',
-    'Ě' => 'E',
-    'Ĕ' => 'E',
-    'Ė' => 'E',
-    'Ĝ' => 'G',
-    'Ğ' => 'G',
-    'Ġ' => 'G',
-    'Ģ' => 'G',
-    'Ĥ' => 'H',
-    'Ħ' => 'H',
-    'Ì' => 'I',
-    'Í' => 'I',
-    'Î' => 'I',
-    'Ï' => 'I',
-    'Ī' => 'I',
-    'Ĩ' => 'I',
-    'Ĭ' => 'I',
-    'Į' => 'I',
-    'İ' => 'I',
-    'IJ' => 'IJ',
-    'Ĵ' => 'J',
-    'Ķ' => 'K',
-    'Ľ' => 'K',
-    'Ĺ' => 'K',
-    'Ļ' => 'K',
-    'Ŀ' => 'K',
-    'Ł' => 'L',
-    'Ñ' => 'N',
-    'Ń' => 'N',
-    'Ň' => 'N',
-    'Ņ' => 'N',
-    'Ŋ' => 'N',
-    'Ò' => 'O',
-    'Ó' => 'O',
-    'Ô' => 'O',
-    'Õ' => 'O',
-    'Ö' => 'Oe',
-    'Ø' => 'O',
-    'Ō' => 'O',
-    'Ő' => 'O',
-    'Ŏ' => 'O',
-    'Œ' => 'OE',
-    'Ŕ' => 'R',
-    'Ř' => 'R',
-    'Ŗ' => 'R',
-    'Ś' => 'S',
-    'Ş' => 'S',
-    'Ŝ' => 'S',
-    'Ș' => 'S',
-    'Š' => 'S',
-    'Ť' => 'T',
-    'Ţ' => 'T',
-    'Ŧ' => 'T',
-    'Ț' => 'T',
-    'Ù' => 'U',
-    'Ú' => 'U',
-    'Û' => 'U',
-    'Ü' => 'Ue',
-    'Ū' => 'U',
-    'Ů' => 'U',
-    'Ű' => 'U',
-    'Ŭ' => 'U',
-    'Ũ' => 'U',
-    'Ų' => 'U',
-    'Ŵ' => 'W',
-    'Ŷ' => 'Y',
-    'Ÿ' => 'Y',
-    'Ý' => 'Y',
-    'Ź' => 'Z',
-    'Ż' => 'Z',
-    'Ž' => 'Z',
-    'à' => 'a',
-    'á' => 'a',
-    'â' => 'a',
-    'ã' => 'a',
-    'ä' => 'ae',
-    'ā' => 'a',
-    'ą' => 'a',
-    'ă' => 'a',
-    'å' => 'a',
-    'æ' => 'ae',
-    'ç' => 'c',
-    'ć' => 'c',
-    'č' => 'c',
-    'ĉ' => 'c',
-    'ċ' => 'c',
-    'ď' => 'd',
-    'đ' => 'd',
-    'è' => 'e',
-    'é' => 'e',
-    'ê' => 'e',
-    'ë' => 'e',
-    'ē' => 'e',
-    'ę' => 'e',
-    'ě' => 'e',
-    'ĕ' => 'e',
-    'ė' => 'e',
-    'ƒ' => 'f',
-    'ĝ' => 'g',
-    'ğ' => 'g',
-    'ġ' => 'g',
-    'ģ' => 'g',
-    'ĥ' => 'h',
-    'ħ' => 'h',
-    'ì' => 'i',
-    'í' => 'i',
-    'î' => 'i',
-    'ï' => 'i',
-    'ī' => 'i',
-    'ĩ' => 'i',
-    'ĭ' => 'i',
-    'į' => 'i',
-    'ı' => 'i',
-    'ij' => 'ij',
-    'ĵ' => 'j',
-    'ķ' => 'k',
-    'ĸ' => 'k',
-    'ł' => 'l',
-    'ľ' => 'l',
-    'ĺ' => 'l',
-    'ļ' => 'l',
-    'ŀ' => 'l',
-    'ñ' => 'n',
-    'ń' => 'n',
-    'ň' => 'n',
-    'ņ' => 'n',
-    'ʼn' => 'n',
-    'ŋ' => 'n',
-    'ò' => 'o',
-    'ó' => 'o',
-    'ô' => 'o',
-    'õ' => 'o',
-    'ö' => 'oe',
-    'ø' => 'o',
-    'ō' => 'o',
-    'ő' => 'o',
-    'ŏ' => 'o',
-    'œ' => 'oe',
-    'ŕ' => 'r',
-    'ř' => 'r',
-    'ŗ' => 'r',
-    'ś' => 's',
-    'š' => 's',
-    'ť' => 't',
-    'ù' => 'u',
-    'ú' => 'u',
-    'û' => 'u',
-    'ü' => 'ue',
-    'ū' => 'u',
-    'ů' => 'u',
-    'ű' => 'u',
-    'ŭ' => 'u',
-    'ũ' => 'u',
-    'ų' => 'u',
-    'ŵ' => 'w',
-    'ÿ' => 'y',
-    'ý' => 'y',
-    'ŷ' => 'y',
-    'ż' => 'z',
-    'ź' => 'z',
-    'ž' => 'z',
-    'ß' => 'ss',
-    'ſ' => 'ss',
-    'Α' => 'A',
-    'Ά' => 'A',
-    'Ἀ' => 'A',
-    'Ἁ' => 'A',
-    'Ἂ' => 'A',
-    'Ἃ' => 'A',
-    'Ἄ' => 'A',
-    'Ἅ' => 'A',
-    'Ἆ' => 'A',
-    'Ἇ' => 'A',
-    'ᾈ' => 'A',
-    'ᾉ' => 'A',
-    'ᾊ' => 'A',
-    'ᾋ' => 'A',
-    'ᾌ' => 'A',
-    'ᾍ' => 'A',
-    'ᾎ' => 'A',
-    'ᾏ' => 'A',
-    'Ᾰ' => 'A',
-    'Ᾱ' => 'A',
-    'Ὰ' => 'A',
-    'Ά' => 'A',
-    'ᾼ' => 'A',
-    'Β' => 'B',
-    'Γ' => 'G',
-    'Δ' => 'D',
-    'Ε' => 'E',
-    'Έ' => 'E',
-    'Ἐ' => 'E',
-    'Ἑ' => 'E',
-    'Ἒ' => 'E',
-    'Ἓ' => 'E',
-    'Ἔ' => 'E',
-    'Ἕ' => 'E',
-    'Έ' => 'E',
-    'Ὲ' => 'E',
-    'Ζ' => 'Z',
-    'Η' => 'I',
-    'Ή' => 'I',
-    'Ἠ' => 'I',
-    'Ἡ' => 'I',
-    'Ἢ' => 'I',
-    'Ἣ' => 'I',
-    'Ἤ' => 'I',
-    'Ἥ' => 'I',
-    'Ἦ' => 'I',
-    'Ἧ' => 'I',
-    'ᾘ' => 'I',
-    'ᾙ' => 'I',
-    'ᾚ' => 'I',
-    'ᾛ' => 'I',
-    'ᾜ' => 'I',
-    'ᾝ' => 'I',
-    'ᾞ' => 'I',
-    'ᾟ' => 'I',
-    'Ὴ' => 'I',
-    'Ή' => 'I',
-    'ῌ' => 'I',
-    'Θ' => 'TH',
-    'Ι' => 'I',
-    'Ί' => 'I',
-    'Ϊ' => 'I',
-    'Ἰ' => 'I',
-    'Ἱ' => 'I',
-    'Ἲ' => 'I',
-    'Ἳ' => 'I',
-    'Ἴ' => 'I',
-    'Ἵ' => 'I',
-    'Ἶ' => 'I',
-    'Ἷ' => 'I',
-    'Ῐ' => 'I',
-    'Ῑ' => 'I',
-    'Ὶ' => 'I',
-    'Ί' => 'I',
-    'Κ' => 'K',
-    'Λ' => 'L',
-    'Μ' => 'M',
-    'Ν' => 'N',
-    'Ξ' => 'KS',
-    'Ο' => 'O',
-    'Ό' => 'O',
-    'Ὀ' => 'O',
-    'Ὁ' => 'O',
-    'Ὂ' => 'O',
-    'Ὃ' => 'O',
-    'Ὄ' => 'O',
-    'Ὅ' => 'O',
-    'Ὸ' => 'O',
-    'Ό' => 'O',
-    'Π' => 'P',
-    'Ρ' => 'R',
-    'Ῥ' => 'R',
-    'Σ' => 'S',
-    'Τ' => 'T',
-    'Υ' => 'Y',
-    'Ύ' => 'Y',
-    'Ϋ' => 'Y',
-    'Ὑ' => 'Y',
-    'Ὓ' => 'Y',
-    'Ὕ' => 'Y',
-    'Ὗ' => 'Y',
-    'Ῠ' => 'Y',
-    'Ῡ' => 'Y',
-    'Ὺ' => 'Y',
-    'Ύ' => 'Y',
-    'Φ' => 'F',
-    'Χ' => 'X',
-    'Ψ' => 'PS',
-    'Ω' => 'O',
-    'Ώ' => 'O',
-    'Ὠ' => 'O',
-    'Ὡ' => 'O',
-    'Ὢ' => 'O',
-    'Ὣ' => 'O',
-    'Ὤ' => 'O',
-    'Ὥ' => 'O',
-    'Ὦ' => 'O',
-    'Ὧ' => 'O',
-    'ᾨ' => 'O',
-    'ᾩ' => 'O',
-    'ᾪ' => 'O',
-    'ᾫ' => 'O',
-    'ᾬ' => 'O',
-    'ᾭ' => 'O',
-    'ᾮ' => 'O',
-    'ᾯ' => 'O',
-    'Ὼ' => 'O',
-    'Ώ' => 'O',
-    'ῼ' => 'O',
-    'α' => 'a',
-    'ά' => 'a',
-    'ἀ' => 'a',
-    'ἁ' => 'a',
-    'ἂ' => 'a',
-    'ἃ' => 'a',
-    'ἄ' => 'a',
-    'ἅ' => 'a',
-    'ἆ' => 'a',
-    'ἇ' => 'a',
-    'ᾀ' => 'a',
-    'ᾁ' => 'a',
-    'ᾂ' => 'a',
-    'ᾃ' => 'a',
-    'ᾄ' => 'a',
-    'ᾅ' => 'a',
-    'ᾆ' => 'a',
-    'ᾇ' => 'a',
-    'ὰ' => 'a',
-    'ά' => 'a',
-    'ᾰ' => 'a',
-    'ᾱ' => 'a',
-    'ᾲ' => 'a',
-    'ᾳ' => 'a',
-    'ᾴ' => 'a',
-    'ᾶ' => 'a',
-    'ᾷ' => 'a',
-    'β' => 'b',
-    'γ' => 'g',
-    'δ' => 'd',
-    'ε' => 'e',
-    'έ' => 'e',
-    'ἐ' => 'e',
-    'ἑ' => 'e',
-    'ἒ' => 'e',
-    'ἓ' => 'e',
-    'ἔ' => 'e',
-    'ἕ' => 'e',
-    'ὲ' => 'e',
-    'έ' => 'e',
-    'ζ' => 'z',
-    'η' => 'i',
-    'ή' => 'i',
-    'ἠ' => 'i',
-    'ἡ' => 'i',
-    'ἢ' => 'i',
-    'ἣ' => 'i',
-    'ἤ' => 'i',
-    'ἥ' => 'i',
-    'ἦ' => 'i',
-    'ἧ' => 'i',
-    'ᾐ' => 'i',
-    'ᾑ' => 'i',
-    'ᾒ' => 'i',
-    'ᾓ' => 'i',
-    'ᾔ' => 'i',
-    'ᾕ' => 'i',
-    'ᾖ' => 'i',
-    'ᾗ' => 'i',
-    'ὴ' => 'i',
-    'ή' => 'i',
-    'ῂ' => 'i',
-    'ῃ' => 'i',
-    'ῄ' => 'i',
-    'ῆ' => 'i',
-    'ῇ' => 'i',
-    'θ' => 'th',
-    'ι' => 'i',
-    'ί' => 'i',
-    'ϊ' => 'i',
-    'ΐ' => 'i',
-    'ἰ' => 'i',
-    'ἱ' => 'i',
-    'ἲ' => 'i',
-    'ἳ' => 'i',
-    'ἴ' => 'i',
-    'ἵ' => 'i',
-    'ἶ' => 'i',
-    'ἷ' => 'i',
-    'ὶ' => 'i',
-    'ί' => 'i',
-    'ῐ' => 'i',
-    'ῑ' => 'i',
-    'ῒ' => 'i',
-    'ΐ' => 'i',
-    'ΐ' => 'i',
-    'ῖ' => 'i',
-    'ῗ' => 'i',
-    'κ' => 'k',
-    'λ' => 'l',
-    'μ' => 'm',
-    'ν' => 'n',
-    'ξ' => 'ks',
-    'ο' => 'o',
-    'ό' => 'o',
-    'ὀ' => 'o',
-    'ὁ' => 'o',
-    'ὂ' => 'o',
-    'ὃ' => 'o',
-    'ὄ' => 'o',
-    'ὅ' => 'o',
-    'ὸ' => 'o',
-    'ό' => 'o',
-    'π' => 'p',
-    'ρ' => 'r',
-    'ῤ' => 'r',
-    'ῥ' => 'r',
-    'σ' => 's',
-    'ς' => 's',
-    'τ' => 't',
-    'υ' => 'y',
-    'ύ' => 'y',
-    'ϋ' => 'y',
-    'ΰ' => 'y',
-    'ὐ' => 'y',
-    'ὑ' => 'y',
-    'ὒ' => 'y',
-    'ὓ' => 'y',
-    'ὔ' => 'y',
-    'ὕ' => 'y',
-    'ὖ' => 'y',
-    'ὗ' => 'y',
-    'ὺ' => 'y',
-    'ύ' => 'y',
-    'ῠ' => 'y',
-    'ῡ' => 'y',
-    'ῢ' => 'y',
-    'ΰ' => 'y',
-    'ῦ' => 'y',
-    'ῧ' => 'y',
-    'φ' => 'f',
-    'χ' => 'x',
-    'ψ' => 'ps',
-    'ω' => 'o',
-    'ώ' => 'o',
-    'ὠ' => 'o',
-    'ὡ' => 'o',
-    'ὢ' => 'o',
-    'ὣ' => 'o',
-    'ὤ' => 'o',
-    'ὥ' => 'o',
-    'ὦ' => 'o',
-    'ὧ' => 'o',
-    'ᾠ' => 'o',
-    'ᾡ' => 'o',
-    'ᾢ' => 'o',
-    'ᾣ' => 'o',
-    'ᾤ' => 'o',
-    'ᾥ' => 'o',
-    'ᾦ' => 'o',
-    'ᾧ' => 'o',
-    'ὼ' => 'o',
-    'ώ' => 'o',
-    'ῲ' => 'o',
-    'ῳ' => 'o',
-    'ῴ' => 'o',
-    'ῶ' => 'o',
-    'ῷ' => 'o',
-    '¨' => '',
-    '΅' => '',
-    '᾿' => '',
-    '῾' => '',
-    '῍' => '',
-    '῝' => '',
-    '῎' => '',
-    '῞' => '',
-    '῏' => '',
-    '῟' => '',
-    '῀' => '',
-    '῁' => '',
-    '΄' => '',
-    '΅' => '',
-    '`' => '',
-    '῭' => '',
-    'ͺ' => '',
-    '᾽' => '',
-    'А' => 'A',
-    'Б' => 'B',
-    'В' => 'V',
-    'Г' => 'G',
-    'Д' => 'D',
-    'Е' => 'E',
-    'Ё' => 'E',
-    'Ж' => 'ZH',
-    'З' => 'Z',
-    'И' => 'I',
-    'Й' => 'I',
-    'К' => 'K',
-    'Л' => 'L',
-    'М' => 'M',
-    'Н' => 'N',
-    'О' => 'O',
-    'П' => 'P',
-    'Р' => 'R',
-    'С' => 'S',
-    'Т' => 'T',
-    'У' => 'U',
-    'Ф' => 'F',
-    'Х' => 'KH',
-    'Ц' => 'TS',
-    'Ч' => 'CH',
-    'Ш' => 'SH',
-    'Щ' => 'SHCH',
-    'Ы' => 'Y',
-    'Э' => 'E',
-    'Ю' => 'YU',
-    'Я' => 'YA',
-    'а' => 'A',
-    'б' => 'B',
-    'в' => 'V',
-    'г' => 'G',
-    'д' => 'D',
-    'е' => 'E',
-    'ё' => 'E',
-    'ж' => 'ZH',
-    'з' => 'Z',
-    'и' => 'I',
-    'й' => 'I',
-    'к' => 'K',
-    'л' => 'L',
-    'м' => 'M',
-    'н' => 'N',
-    'о' => 'O',
-    'п' => 'P',
-    'р' => 'R',
-    'с' => 'S',
-    'т' => 'T',
-    'у' => 'U',
-    'ф' => 'F',
-    'х' => 'KH',
-    'ц' => 'TS',
-    'ч' => 'CH',
-    'ш' => 'SH',
-    'щ' => 'SHCH',
-    'ы' => 'Y',
-    'э' => 'E',
-    'ю' => 'YU',
-    'я' => 'YA',
-    'Ъ' => '',
-    'ъ' => '',
-    'Ь' => '',
-    'ь' => '',
-    
-    'Є' => 'YE',
-    'є' => 'YE',
-    'Ї' => 'YI',
-    'ї' => 'YI',
-    'Ґ' => 'KG',
-    'ґ' => 'KG',
-    
-    'ð' => 'd',
-    'Ð' => 'D',
-    'þ' => 'th',
-    'Þ' => 'TH',
-    
-    '&'    =>    '-',
-    '/'    =>    '-',
-    '('    =>    '-',
-    '"'    =>    '-',
-    "'"    =>    '-',
-    
-);
diff --git a/model/admin/bans.php b/model/admin/bans.php
index 1fd0a997..f89d6054 100644
--- a/model/admin/bans.php
+++ b/model/admin/bans.php
@@ -276,7 +276,7 @@ public function insert_ban()
         // Regenerate the bans cache
         $this->feather->cache->store('bans', \model\cache::get_bans());
 
-        redirect(get_link('admin/bans/'), __('Ban edited redirect'));
+        redirect($this->feather->url->get_link('admin/bans/'), __('Ban edited redirect'));
     }
 
     public function remove_ban($ban_id)
@@ -291,7 +291,7 @@ public function remove_ban($ban_id)
         // Regenerate the bans cache
         $this->feather->cache->store('bans', \model\cache::get_bans());
 
-        redirect(get_link('admin/bans/'), __('Ban removed redirect'));
+        redirect($this->feather->url->get_link('admin/bans/'), __('Ban removed redirect'));
     }
 
     public function find_ban($start_from = false)
diff --git a/model/admin/censoring.php b/model/admin/censoring.php
index 73e14d85..488e94be 100644
--- a/model/admin/censoring.php
+++ b/model/admin/censoring.php
@@ -46,7 +46,7 @@ public function add_word()
         $this->feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
         $this->feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
 
-        redirect(get_link('admin/censoring/'), __('Word added redirect'));
+        redirect($this->feather->url->get_link('admin/censoring/'), __('Word added redirect'));
     }
 
     public function update_word()
@@ -74,7 +74,7 @@ public function update_word()
         $this->feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
         $this->feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
 
-        redirect(get_link('admin/censoring/'), __('Word updated redirect'));
+        redirect($this->feather->url->get_link('admin/censoring/'), __('Word updated redirect'));
     }
 
     public function remove_word()
@@ -90,7 +90,7 @@ public function remove_word()
         $this->feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
         $this->feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
 
-        redirect(get_link('admin/censoring/'),  __('Word removed redirect'));
+        redirect($this->feather->url->get_link('admin/censoring/'),  __('Word removed redirect'));
     }
 
     public function get_words()
diff --git a/model/admin/groups.php b/model/admin/groups.php
index 7f6b3d6b..88ac1247 100644
--- a/model/admin/groups.php
+++ b/model/admin/groups.php
@@ -258,9 +258,9 @@ public function add_edit_group($groups)
         $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
         if ($this->request->post('mode') == 'edit') {
-            redirect(get_link('admin/groups/'), __('Group edited redirect'));
+            redirect($this->feather->url->get_link('admin/groups/'), __('Group edited redirect'));
         } else {
-            redirect(get_link('admin/groups/'), __('Group added redirect'));
+            redirect($this->feather->url->get_link('admin/groups/'), __('Group added redirect'));
         }
     }
 
@@ -285,7 +285,7 @@ public function set_default_group($groups)
         // Regenerate the config cache
         $this->feather->cache->store('config', \model\cache::get_config());
 
-        redirect(get_link('admin/groups/'), __('Default group redirect'));
+        redirect($this->feather->url->get_link('admin/groups/'), __('Default group redirect'));
     }
 
     public function check_members($group_id)
@@ -328,7 +328,7 @@ public function delete_group($group_id)
         DB::for_table('groups')->where('g_promote_next_group', $group_id)
                                                    ->update_many('g_promote_next_group', 0);
 
-        redirect(get_link('admin/groups/'), __('Group removed redirect'));
+        redirect($this->feather->url->get_link('admin/groups/'), __('Group removed redirect'));
     }
 
     public function get_group_title($group_id)
diff --git a/model/admin/maintenance.php b/model/admin/maintenance.php
index 913fc563..5d9636a5 100644
--- a/model/admin/maintenance.php
+++ b/model/admin/maintenance.php
@@ -211,7 +211,7 @@ public function prune_comply($prune_from, $prune_sticky)
                     ->delete_many();
         }
 
-        redirect(get_link('admin/maintenance/'), __('Posts pruned redirect'));
+        redirect($this->feather->url->get_link('admin/maintenance/'), __('Posts pruned redirect'));
     }
 
     public function get_info_prune($prune_sticky, $prune_from)
diff --git a/model/admin/options.php b/model/admin/options.php
index 18749061..c0adf8c3 100644
--- a/model/admin/options.php
+++ b/model/admin/options.php
@@ -230,7 +230,7 @@ public function update_options()
         $this->feather->cache->store('config', \model\cache::get_config());
         $this->clear_feed_cache();
 
-        redirect(get_link('admin/options/'), __('Options updated redirect'));
+        redirect($this->feather->url->get_link('admin/options/'), __('Options updated redirect'));
     }
 
     public function clear_feed_cache()
diff --git a/model/admin/permissions.php b/model/admin/permissions.php
index 19d409fd..42a3ea46 100644
--- a/model/admin/permissions.php
+++ b/model/admin/permissions.php
@@ -48,6 +48,6 @@ public function update_permissions()
 
         generate_config_cache();
 
-        redirect(get_link('admin/permissions/'), __('Perms updated redirect'));
+        redirect($this->feather->url->get_link('admin/permissions/'), __('Perms updated redirect'));
     }
 }
diff --git a/model/admin/reports.php b/model/admin/reports.php
index d0500dc1..af24e0fd 100644
--- a/model/admin/reports.php
+++ b/model/admin/reports.php
@@ -58,7 +58,7 @@ public function zap_report()
                 ->delete_many();
         }
 
-        redirect(get_link('admin/reports/'), __('Report zapped redirect'));
+        redirect($this->feather->url->get_link('admin/reports/'), __('Report zapped redirect'));
     }
 
     public function get_reports()
diff --git a/model/admin/users.php b/model/admin/users.php
index 1f4e72bf..0ac78492 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -237,7 +237,7 @@ public function move_users()
             DB::for_table('users')->where_in('id', $move['user_ids'])
                                                       ->update_many('group_id', $new_group);
 
-            redirect(get_link('admin/users/'), __('Users move redirect'));
+            redirect($this->feather->url->get_link('admin/users/'), __('Users move redirect'));
         }
 
         $move = $this->hook->fire('model.users.move_users.move', $move);
@@ -402,7 +402,7 @@ public function delete_users()
 
             $stats = $this->feather->cache->retrieve('users_info');
 
-            redirect(get_link('admin/users/'), __('Users delete redirect'));
+            redirect($this->feather->url->get_link('admin/users/'), __('Users delete redirect'));
         }
 
         return $user_ids;
@@ -521,7 +521,7 @@ public function ban_users()
                 // Regenerate the bans cache
                 $this->feather->cache->store('bans', \model\cache::get_bans());
 
-                redirect(get_link('admin/users/'), __('Users banned redirect'));
+                redirect($this->feather->url->get_link('admin/users/'), __('Users banned redirect'));
             }
         }
         return $user_ids;
diff --git a/model/delete.php b/model/delete.php
index c79e7915..1ef9b86b 100644
--- a/model/delete.php
+++ b/model/delete.php
@@ -65,7 +65,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
             delete_topic($tid);
             update_forum($fid);
 
-            redirect(get_link('forum/'.$fid.'/'), __('Topic del redirect'));
+            redirect($this->feather->url->get_link('forum/'.$fid.'/'), __('Topic del redirect'));
         } else {
             $this->hook->fire('handle_deletion', $tid, $fid, $id);
 
@@ -84,7 +84,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
 
             $post = $post->find_one();
 
-            redirect(get_link('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
+            redirect($this->feather->url->get_link('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
         }
     }
 }
diff --git a/model/index.php b/model/index.php
index c5cf6066..978d7363 100644
--- a/model/index.php
+++ b/model/index.php
@@ -49,7 +49,7 @@ public function get_forum_actions()
 
         // Display a "mark all as read" link
         if (!$this->user->is_guest) {
-            $forum_actions[] = '<a href="'.get_link('mark-read/').'">'.__('Mark all as read').'</a>';
+            $forum_actions[] = '<a href="'.$this->feather->url->get_link('mark-read/').'">'.__('Mark all as read').'</a>';
         }
 
         $forum_actions = $this->hook->fire('get_forum_actions', $forum_actions);
@@ -177,7 +177,7 @@ public function print_categories_forums()
             // Are there new posts since our last visit?
             if (isset($new_topics[$cur_forum->fid])) {
                 $cur_forum->item_status .= ' inew';
-                $forum_field_new = '<span class="newtext">[ <a href="'.get_link('search/?action=show_new&amp;fid='.$cur_forum->fid).'">'.__('New posts').'</a> ]</span>';
+                $forum_field_new = '<span class="newtext">[ <a href="'.$this->feather->url->get_link('search/?action=show_new&amp;fid='.$cur_forum->fid).'">'.__('New posts').'</a> ]</span>';
                 $cur_forum->icon_type = 'icon icon-new';
             }
 
@@ -188,7 +188,7 @@ public function print_categories_forums()
                 $cur_forum->item_status .= ' iredirect';
                 $cur_forum->icon_type = 'icon';
             } else {
-                $cur_forum->forum_field = '<h3><a href="'.get_link('forum/'.$cur_forum->fid.'/'.url_friendly($cur_forum->forum_name)).'/'.'">'.feather_escape($cur_forum->forum_name).'</a>'.(!empty($forum_field_new) ? ' '.$forum_field_new : '').'</h3>';
+                $cur_forum->forum_field = '<h3><a href="'.$this->feather->url->get_link('forum/'.$cur_forum->fid.'/'.$this->feather->url->url_friendly($cur_forum->forum_name)).'/'.'">'.feather_escape($cur_forum->forum_name).'</a>'.(!empty($forum_field_new) ? ' '.$forum_field_new : '').'</h3>';
                 $cur_forum->num_topics_formatted = $cur_forum->num_topics;
                 $cur_forum->num_posts_formatted = $cur_forum->num_posts;
             }
@@ -199,7 +199,7 @@ public function print_categories_forums()
 
             // If there is a last_post/last_poster
             if ($cur_forum->last_post != '') {
-                $cur_forum->last_post_formatted = '<a href="'.get_link('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.format_time($cur_forum->last_post).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_forum->last_poster).'</span>';
+                $cur_forum->last_post_formatted = '<a href="'.$this->feather->url->get_link('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.format_time($cur_forum->last_post).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_forum->last_poster).'</span>';
             } elseif ($cur_forum->redirect_url != '') {
                 $cur_forum->last_post_formatted = '- - -';
             } else {
@@ -212,7 +212,7 @@ public function print_categories_forums()
 
                 foreach ($mods_array as $mod_username => $mod_id) {
                     if ($this->user->g_view_users == '1') {
-                        $moderators[] = '<a href="'.get_link('user/'.$mod_id.'/').'">'.feather_escape($mod_username).'</a>';
+                        $moderators[] = '<a href="'.$this->feather->url->get_link('user/'.$mod_id.'/').'">'.feather_escape($mod_username).'</a>';
                     } else {
                         $moderators[] = feather_escape($mod_username);
                     }
@@ -256,7 +256,7 @@ public function collect_stats()
         $stats['total_posts'] = intval($query['total_posts']);
 
         if ($this->user->g_view_users == '1') {
-            $stats['newest_user'] = '<a href="'.get_link('user/'.$stats['last_user']['id']).'/">'.feather_escape($stats['last_user']['username']).'</a>';
+            $stats['newest_user'] = '<a href="'.$this->feather->url->get_link('user/'.$stats['last_user']['id']).'/">'.feather_escape($stats['last_user']['username']).'</a>';
         } else {
             $stats['newest_user'] = feather_escape($stats['last_user']['username']);
         }
@@ -291,7 +291,7 @@ public function fetch_users_online()
         foreach($query as $user_online) {
             if ($user_online->user_id > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $online['users'][] = "\n\t\t\t\t".'<dd><a href="'.get_link('user/'.$user_online->user_id).'/">'.feather_escape($user_online->ident).'</a>';
+                    $online['users'][] = "\n\t\t\t\t".'<dd><a href="'.$this->feather->url->get_link('user/'.$user_online->user_id).'/">'.feather_escape($user_online->ident).'</a>';
                 } else {
                     $online['users'][] = "\n\t\t\t\t".'<dd>'.feather_escape($user_online->ident);
                 }
diff --git a/model/login.php b/model/login.php
index 2aa08f95..78f743e3 100644
--- a/model/login.php
+++ b/model/login.php
@@ -49,7 +49,7 @@ public function login()
         $authorized = $this->hook->fire('authorized_login', $authorized);
 
         if (!$authorized) {
-            message(__('Wrong user/pass').' <a href="'.get_link('login/action/forget/').'">'.__('Forgotten pass').'</a>');
+            message(__('Wrong user/pass').' <a href="'.$this->feather->url->get_link('login/action/forget/').'">'.__('Forgotten pass').'</a>');
         }
 
         // Update the status if this is the first time the user logged in
@@ -186,7 +186,7 @@ public function password_forgotten()
 
                         // Do the user specific replacements to the template
                         $cur_mail_message = str_replace('<username>', $cur_hit->username, $mail_message);
-                        $cur_mail_message = str_replace('<activation_url>', get_link('user/'.$cur_hit->id.'/action/change_pass/?key='.$new_password_key), $cur_mail_message);
+                        $cur_mail_message = str_replace('<activation_url>', $this->feather->url->get_link('user/'.$cur_hit->id.'/action/change_pass/?key='.$new_password_key), $cur_mail_message);
                         $cur_mail_message = str_replace('<new_password>', $new_password, $cur_mail_message);
                         $cur_mail_message = $this->hook->fire('cur_mail_message_password_forgotten', $cur_mail_message);
 
diff --git a/model/misc.php b/model/misc.php
index 96479d42..208a059a 100644
--- a/model/misc.php
+++ b/model/misc.php
@@ -123,7 +123,7 @@ public function get_redirect_url($recipient_id)
         }
 
         if (!isset($redirect_url)) {
-            $redirect_url = get_link('user/'.$recipient_id.'/');
+            $redirect_url = $this->feather->url->get_link('user/'.$recipient_id.'/');
         } elseif (preg_match('%viewtopic\.php\?pid=(\d+)$%', $redirect_url, $matches)) {
             $redirect_url .= '#p'.$matches[1];
         }
@@ -205,7 +205,7 @@ public function insert_report($post_id)
                 $mail_subject = str_replace('<forum_id>', $report['forum_id'], $mail_subject);
                 $mail_subject = str_replace('<topic_subject>', $report['subject'], $mail_subject);
                 $mail_message = str_replace('<username>', $this->user->username, $mail_message);
-                $mail_message = str_replace('<post_url>', get_link('post/'.$post_id.'/#p'.$post_id), $mail_message);
+                $mail_message = str_replace('<post_url>', $this->feather->url->get_link('post/'.$post_id.'/#p'.$post_id), $mail_message);
                 $mail_message = str_replace('<reason>', $reason, $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
@@ -221,7 +221,7 @@ public function insert_report($post_id)
         $last_report_sent = $this->hook->fireDB('insert_last_report_sent', $last_report_sent);
         $last_report_sent = $last_report_sent->save();
 
-        redirect(get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['subject']).'/'), __('Report redirect'));
+        redirect($this->feather->url->get_link('forum/'.$report['forum_id'].'/'.$this->feather->url->url_friendly($report['subject']).'/'), __('Report redirect'));
     }
 
     public function get_info_report($post_id)
@@ -305,7 +305,7 @@ public function subscribe_topic($topic_id)
         $subscription = $this->hook->fireDB('subscribe_topic_query', $subscription);
         $subscription = $subscription->save();
 
-        redirect(get_link('topic/'.$topic_id.'/'), __('Subscribe redirect'));
+        redirect($this->feather->url->get_link('topic/'.$topic_id.'/'), __('Subscribe redirect'));
     }
 
     public function unsubscribe_topic($topic_id)
@@ -333,7 +333,7 @@ public function unsubscribe_topic($topic_id)
         $delete = $this->hook->fireDB('unsubscribe_topic_query', $delete);
         $delete = $delete->delete_many();
 
-        redirect(get_link('topic/'.$topic_id.'/'), __('Unsubscribe redirect'));
+        redirect($this->feather->url->get_link('topic/'.$topic_id.'/'), __('Unsubscribe redirect'));
     }
 
     public function unsubscribe_forum($forum_id)
@@ -361,7 +361,7 @@ public function unsubscribe_forum($forum_id)
         $delete = $this->hook->fireDB('unsubscribe_forum_query', $delete);
         $delete = $delete->delete_many();
 
-        redirect(get_link('forum/'.$forum_id.'/'), __('Unsubscribe redirect'));
+        redirect($this->feather->url->get_link('forum/'.$forum_id.'/'), __('Unsubscribe redirect'));
     }
 
     public function subscribe_forum($forum_id)
@@ -412,6 +412,6 @@ public function subscribe_forum($forum_id)
         $subscription = $this->hook->fireDB('subscribe_forum_query', $subscription);
         $subscription = $subscription->save();
 
-        redirect(get_link('forum/'.$forum_id.'/'), __('Subscribe redirect'));
+        redirect($this->feather->url->get_link('forum/'.$forum_id.'/'), __('Subscribe redirect'));
     }
 }
diff --git a/model/moderate.php b/model/moderate.php
index d2f53fc8..eade841e 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -27,7 +27,7 @@ public function __construct()
     public function display_ip_info($ip)
     {
         $ip = $this->hook->fire('display_ip_info', $ip);
-        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.$this->feather->url->get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function display_ip_address_post($pid)
@@ -45,7 +45,7 @@ public function display_ip_address_post($pid)
 
         $ip = $this->hook->fire('display_ip_address_post', $ip);
 
-        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.$this->feather->url->get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function get_moderators($fid)
@@ -155,7 +155,7 @@ public function delete_posts($tid, $fid, $p = null)
 
             update_forum($fid);
 
-            redirect(get_link('topic/'.$tid.'/'), __('Delete posts redirect'));
+            redirect($this->feather->url->get_link('topic/'.$tid.'/'), __('Delete posts redirect'));
         }
 
         $posts = $this->hook->fire('delete_posts', $posts);
@@ -316,7 +316,7 @@ public function split_posts($tid, $fid, $p = null)
             update_forum($fid);
             update_forum($move_to_forum);
 
-            redirect(get_link('topic/'.$new_tid.'/'), __('Split posts redirect'));
+            redirect($this->feather->url->get_link('topic/'.$new_tid.'/'), __('Split posts redirect'));
         }
 
         $posts = $this->hook->fire('split_posts', $posts);
@@ -460,7 +460,7 @@ public function display_posts_view($tid, $start_from)
             // If the poster is a registered user
             if ($cur_post->poster_id > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $cur_post->poster_disp = '<a href="'.get_link('user/'.$cur_post->poster_id.'/').'">'.feather_escape($cur_post->poster).'</a>';
+                    $cur_post->poster_disp = '<a href="'.$this->feather->url->get_link('user/'.$cur_post->poster_id.'/').'">'.feather_escape($cur_post->poster).'</a>';
                 } else {
                     $cur_post->poster_disp = feather_escape($cur_post->poster);
                 }
@@ -585,7 +585,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
 
         $redirect_msg = (count($topics) > 1) ? __('Move topics redirect') : __('Move topic redirect');
         $redirect_msg = $this->hook->fire('move_topics_to_redirect_message', $redirect_msg);
-        redirect(get_link('forum/'.$move_to_forum.'/'), $redirect_msg);
+        redirect($this->feather->url->get_link('forum/'.$move_to_forum.'/'), $redirect_msg);
     }
 
     public function check_move_possible()
@@ -737,7 +737,7 @@ public function merge_topics($fid)
 
         // Update the forum FROM which the topic was moved and redirect
         update_forum($fid);
-        redirect(get_link('forum/'.$fid.'/'), __('Merge topics redirect'));
+        redirect($this->feather->url->get_link('forum/'.$fid.'/'), __('Merge topics redirect'));
     }
 
     public function delete_topics($topics, $fid)
@@ -821,7 +821,7 @@ public function delete_topics($topics, $fid)
 
         $this->hook->fire('delete_topics');
 
-        redirect(get_link('forum/'.$fid.'/'), __('Delete topics redirect'));
+        redirect($this->feather->url->get_link('forum/'.$fid.'/'), __('Delete topics redirect'));
     }
 
     public function get_forum_info($fid)
@@ -918,10 +918,10 @@ public function display_topics($fid, $sort_by, $start_from)
                 $status_text = array();
                 $cur_topic['item_status'] = ($topic_count % 2 == 0) ? 'roweven' : 'rowodd';
                 $cur_topic['icon_type'] = 'icon';
-                $url_topic = url_friendly($cur_topic['subject']);
+                $url_topic = $this->feather->url->url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_disp'] = '<a href="'.get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_disp'] = '<a href="'.$this->feather->url->get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
                     $cur_topic['ghost_topic'] = false;
                 } else {
                     $cur_topic['last_post_disp'] = '- - -';
@@ -938,13 +938,13 @@ public function display_topics($fid, $sort_by, $start_from)
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get_link('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_disp'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
@@ -953,7 +953,7 @@ public function display_topics($fid, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_disp'] = '<strong>'.$cur_topic['subject_disp'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->url->get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
@@ -964,7 +964,7 @@ public function display_topics($fid, $sort_by, $start_from)
                 $num_pages_topic = ceil(($cur_topic['num_replies'] + 1) / $this->user->disp_posts);
 
                 if ($num_pages_topic > 1) {
-                    $subject_multipage = '<span class="pagestext">[ '.paginate($num_pages_topic, -1, 'topic/'.$cur_topic['id'].'/'.$url_topic.'/#').' ]</span>';
+                    $subject_multipage = '<span class="pagestext">[ '.$this->feather->url->paginate($num_pages_topic, -1, 'topic/'.$cur_topic['id'].'/'.$url_topic.'/#').' ]</span>';
                 } else {
                     $subject_multipage = null;
                 }
diff --git a/model/post.php b/model/post.php
index 24fe3e71..c65589fb 100644
--- a/model/post.php
+++ b/model/post.php
@@ -408,8 +408,8 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
                         $mail_subject = str_replace('<topic_subject>', $cur_posting['subject'], $mail_subject);
                         $mail_message = str_replace('<topic_subject>', $cur_posting['subject'], $mail_message);
                         $mail_message = str_replace('<replier>', $post['username'], $mail_message);
-                        $mail_message = str_replace('<post_url>', get_link('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
-                        $mail_message = str_replace('<unsubscribe_url>', get_link('unsubscribe/topic/'.$tid.'/'), $mail_message);
+                        $mail_message = str_replace('<post_url>', $this->feather->url->get_link('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
+                        $mail_message = str_replace('<unsubscribe_url>', $this->feather->url->get_link('unsubscribe/topic/'.$tid.'/'), $mail_message);
                         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                         $mail_message = $this->hook->fire('send_notifications_reply_mail_message', $mail_message);
 
@@ -417,8 +417,8 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
                         $mail_message_full = str_replace('<topic_subject>', $cur_posting['subject'], $mail_message_full);
                         $mail_message_full = str_replace('<replier>', $post['username'], $mail_message_full);
                         $mail_message_full = str_replace('<message>', $cleaned_message, $mail_message_full);
-                        $mail_message_full = str_replace('<post_url>', get_link('post/'.$new_pid.'/#p'.$new_pid), $mail_message_full);
-                        $mail_message_full = str_replace('<unsubscribe_url>', get_link('unsubscribe/topic/'.$tid.'/'), $mail_message_full);
+                        $mail_message_full = str_replace('<post_url>', $this->feather->url->get_link('post/'.$new_pid.'/#p'.$new_pid), $mail_message_full);
+                        $mail_message_full = str_replace('<unsubscribe_url>', $this->feather->url->get_link('unsubscribe/topic/'.$tid.'/'), $mail_message_full);
                         $mail_message_full = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message_full);
                         $mail_message_full = $this->hook->fire('send_notifications_reply_mail_message_full', $mail_message_full);
 
@@ -616,8 +616,8 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
                         $mail_message = str_replace('<topic_subject>', $this->config['o_censoring'] == '1' ? $censored_subject : $post['subject'], $mail_message);
                         $mail_message = str_replace('<forum_name>', $cur_posting['forum_name'], $mail_message);
                         $mail_message = str_replace('<poster>', $post['username'], $mail_message);
-                        $mail_message = str_replace('<topic_url>', get_link('topic/'.$new_tid.'/'), $mail_message);
-                        $mail_message = str_replace('<unsubscribe_url>', get_link('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message);
+                        $mail_message = str_replace('<topic_url>', $this->feather->url->get_link('topic/'.$new_tid.'/'), $mail_message);
+                        $mail_message = str_replace('<unsubscribe_url>', $this->feather->url->get_link('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message);
                         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                         $mail_message = $this->hook->fire('send_notifications_new_topic_mail_message', $mail_message);
 
@@ -626,8 +626,8 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
                         $mail_message_full = str_replace('<forum_name>', $cur_posting['forum_name'], $mail_message_full);
                         $mail_message_full = str_replace('<poster>', $post['username'], $mail_message_full);
                         $mail_message_full = str_replace('<message>', $cleaned_message, $mail_message_full);
-                        $mail_message_full = str_replace('<topic_url>', get_link('topic/'.$new_tid.'/'), $mail_message_full);
-                        $mail_message_full = str_replace('<unsubscribe_url>', get_link('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message_full);
+                        $mail_message_full = str_replace('<topic_url>', $this->feather->url->get_link('topic/'.$new_tid.'/'), $mail_message_full);
+                        $mail_message_full = str_replace('<unsubscribe_url>', $this->feather->url->get_link('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message_full);
                         $mail_message_full = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message_full);
                         $mail_message_full = $this->hook->fire('send_notifications_new_topic_mail_message_full', $mail_message_full);
 
@@ -670,7 +670,7 @@ public function warn_banned_user($post, $new_pid)
 
         $mail_message = str_replace('<username>', $post['username'], $mail_message);
         $mail_message = str_replace('<email>', $post['email'], $mail_message);
-        $mail_message = str_replace('<post_url>', get_link('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
+        $mail_message = str_replace('<post_url>', $this->feather->url->get_link('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
         $mail_message = $this->hook->fire('warn_banned_user_mail_message', $mail_message);
 
diff --git a/model/profile.php b/model/profile.php
index 79910176..c09c70d5 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -136,7 +136,7 @@ public function change_pass($id)
 
             $this->hook->fire('change_pass');
 
-            redirect(get_link('user/'.$id.'/section/essentials/'), __('Pass updated redirect'));
+            redirect($this->feather->url->get_link('user/'.$id.'/section/essentials/'), __('Pass updated redirect'));
         }
     }
 
@@ -226,7 +226,7 @@ public function change_email($id)
                     $mail_message = trim(substr($mail_tpl, $first_crlf));
                     $mail_message = str_replace('<username>', $this->user->username, $mail_message);
                     $mail_message = str_replace('<email>', $new_email, $mail_message);
-                    $mail_message = str_replace('<profile_url>', get_link('user/'.$id.'/'), $mail_message);
+                    $mail_message = str_replace('<profile_url>', $this->feather->url->get_link('user/'.$id.'/'), $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                     $mail_message = $this->hook->fire('change_email_mail_message', $mail_message);
 
@@ -263,7 +263,7 @@ public function change_email($id)
                     $mail_message = trim(substr($mail_tpl, $first_crlf));
                     $mail_message = str_replace('<username>', $this->user->username, $mail_message);
                     $mail_message = str_replace('<dupe_list>', implode(', ', $dupe_list), $mail_message);
-                    $mail_message = str_replace('<profile_url>', get_link('user/'.$id.'/'), $mail_message);
+                    $mail_message = str_replace('<profile_url>', $this->feather->url->get_link('user/'.$id.'/'), $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                     $mail_message = $this->hook->fire('change_email_mail_dupe_message', $mail_message);
 
@@ -300,7 +300,7 @@ public function change_email($id)
             $mail_message = trim(substr($mail_tpl, $first_crlf));
             $mail_message = str_replace('<username>', $this->user->username, $mail_message);
             $mail_message = str_replace('<base_url>', get_base_url(), $mail_message);
-            $mail_message = str_replace('<activation_url>', get_link('user/'.$id.'/action/change_email/?key='.$new_email_key), $mail_message);
+            $mail_message = str_replace('<activation_url>', $this->feather->url->get_link('user/'.$id.'/action/change_email/?key='.$new_email_key), $mail_message);
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
             $mail_message = $this->hook->fire('change_email_mail_activate_message', $mail_message);
 
@@ -402,7 +402,7 @@ public function upload_avatar($id, $files_data)
 
         $uploaded_file = $this->hook->fire('upload_avatar', $uploaded_file);
 
-        redirect(get_link('user/'.$id.'/section/personality/'), __('Avatar upload redirect'));
+        redirect($this->feather->url->get_link('user/'.$id.'/section/personality/'), __('Avatar upload redirect'));
     }
 
     public function update_group_membership($id)
@@ -469,7 +469,7 @@ public function update_group_membership($id)
 
         $id = $this->hook->fire('update_group_membership', $id);
 
-        redirect(get_link('user/'.$id.'/section/admin/'), __('Group membership redirect'));
+        redirect($this->feather->url->get_link('user/'.$id.'/section/admin/'), __('Group membership redirect'));
     }
 
     public function get_username($id)
@@ -539,7 +539,7 @@ public function update_mod_forums($id)
 
         $id = $this->hook->fire('update_mod_forums', $id);
 
-        redirect(get_link('user/'.$id.'/section/admin/'), __('Update forums redirect'));
+        redirect($this->feather->url->get_link('user/'.$id.'/section/admin/'), __('Update forums redirect'));
     }
 
     public function ban_user($id)
@@ -558,9 +558,9 @@ public function ban_user($id)
         $ban_id = $ban_id->find_one_col('id');
 
         if ($ban_id) {
-            redirect(get_link('admin/bans/edit/'.$ban_id.'/'), __('Ban redirect'));
+            redirect($this->feather->url->get_link('admin/bans/edit/'.$ban_id.'/'), __('Ban redirect'));
         } else {
-            redirect(get_link('admin/bans/add/'.$id.'/'), __('Ban redirect'));
+            redirect($this->feather->url->get_link('admin/bans/add/'.$id.'/'), __('Ban redirect'));
         }
     }
 
@@ -592,7 +592,7 @@ public function promote_user($id)
 
         $pid = $this->hook->fire('promote_user', $pid);
 
-        redirect(get_link('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
+        redirect($this->feather->url->get_link('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
     }
 
     public function delete_user($id)
@@ -1086,7 +1086,7 @@ public function update_profile($id, $info, $section)
 
         $section = $this->hook->fireDB('update_profile', $section, $id);
 
-        redirect(get_link('user/'.$id.'/section/'.$section.'/'), __('Profile redirect'));
+        redirect($this->feather->url->get_link('user/'.$id.'/section/'.$section.'/'), __('Profile redirect'));
     }
 
     public function get_user_info($id)
@@ -1140,7 +1140,7 @@ public function parse_user_info($user)
         if ($user['email_setting'] == '0' && !$this->user->is_guest && $this->user->g_send_email == '1') {
             $user['email_field'] = '<a href="mailto:'.feather_escape($user['email']).'">'.feather_escape($user['email']).'</a>';
         } elseif ($user['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-            $user['email_field'] = '<a href="'.get_link('email/'.$user['id'].'/').'">'.__('Send email').'</a>';
+            $user['email_field'] = '<a href="'.$this->feather->url->get_link('email/'.$user['id'].'/').'">'.__('Send email').'</a>';
         } else {
             $user['email_field'] = '';
         }
@@ -1196,11 +1196,11 @@ public function parse_user_info($user)
         if ($this->user->g_search == '1') {
             $quick_searches = array();
             if ($user['num_posts'] > 0) {
-                $quick_searches[] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$user['id']).'">'.__('Show topics').'</a>';
-                $quick_searches[] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Show posts').'</a>';
+                $quick_searches[] = '<a href="'.$this->feather->url->get_link('search/?action=show_user_topics&amp;user_id='.$user['id']).'">'.__('Show topics').'</a>';
+                $quick_searches[] = '<a href="'.$this->feather->url->get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Show posts').'</a>';
             }
             if ($this->user->is_admmod && $this->config['o_topic_subscriptions'] == '1') {
-                $quick_searches[] = '<a href="'.get_link('search/?action=show_subscriptions&amp;user_id='.$user['id']).'">'.__('Show subscriptions').'</a>';
+                $quick_searches[] = '<a href="'.$this->feather->url->get_link('search/?action=show_subscriptions&amp;user_id='.$user['id']).'">'.__('Show subscriptions').'</a>';
             }
 
             if (!empty($quick_searches)) {
@@ -1238,12 +1238,12 @@ public function edit_essentials($id, $user)
                 $user_disp['username_field'] = '<p>'.sprintf(__('Username info'), feather_escape($user['username'])).'</p>'."\n";
             }
 
-            $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.feather_escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.get_link('email/'.$id.'/').'">'.__('Send email').'</a></span></p>'."\n";
+            $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.feather_escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.$this->feather->url->get_link('email/'.$id.'/').'">'.__('Send email').'</a></span></p>'."\n";
         } else {
             $user_disp['username_field'] = '<p>'.__('Username').': '.feather_escape($user['username']).'</p>'."\n";
 
             if ($this->config['o_regs_verify'] == '1') {
-                $user_disp['email_field'] = '<p>'.sprintf(__('Email info'), feather_escape($user['email']).' - <a href="'.get_link('user/'.$id.'/action/change_email/').'">'.__('Change email').'</a>').'</p>'."\n";
+                $user_disp['email_field'] = '<p>'.sprintf(__('Email info'), feather_escape($user['email']).' - <a href="'.$this->feather->url->get_link('user/'.$id.'/action/change_email/').'">'.__('Change email').'</a>').'</p>'."\n";
             } else {
                 $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.$user['email'].'" size="40" maxlength="80" /><br /></label>'."\n";
             }
@@ -1259,11 +1259,11 @@ public function edit_essentials($id, $user)
         }
 
         if ($this->user->g_search == '1' || $this->user->g_id == FEATHER_ADMIN) {
-            $posts_actions[] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$id).'">'.__('Show topics').'</a>';
-            $posts_actions[] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$id).'">'.__('Show posts').'</a>';
+            $posts_actions[] = '<a href="'.$this->feather->url->get_link('search/?action=show_user_topics&amp;user_id='.$id).'">'.__('Show topics').'</a>';
+            $posts_actions[] = '<a href="'.$this->feather->url->get_link('search/?action=show_user_posts&amp;user_id='.$id).'">'.__('Show posts').'</a>';
 
             if ($this->config['o_topic_subscriptions'] == '1') {
-                $posts_actions[] = '<a href="'.get_link('search/?action=show_subscriptions&amp;user_id='.$id).'">'.__('Show subscriptions').'</a>';
+                $posts_actions[] = '<a href="'.$this->feather->url->get_link('search/?action=show_subscriptions&amp;user_id='.$id).'">'.__('Show subscriptions').'</a>';
             }
         }
 
diff --git a/model/register.php b/model/register.php
index 226b4238..bc5e2467 100644
--- a/model/register.php
+++ b/model/register.php
@@ -190,7 +190,7 @@ public function insert_user($user)
                 $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
                 $mail_message = str_replace('<email>', $user['email1'], $mail_message);
-                $mail_message = str_replace('<profile_url>', get_link('user/'.$new_uid.'/'), $mail_message);
+                $mail_message = str_replace('<profile_url>', $this->feather->url->get_link('user/'.$new_uid.'/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                 $mail_message = $this->hook->fire('insert_user_banned_mail_message', $mail_message);
 
@@ -211,7 +211,7 @@ public function insert_user($user)
                 $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
                 $mail_message = str_replace('<dupe_list>', implode(', ', $dupe_list), $mail_message);
-                $mail_message = str_replace('<profile_url>', get_link('user/'.$new_uid.'/'), $mail_message);
+                $mail_message = str_replace('<profile_url>', $this->feather->url->get_link('user/'.$new_uid.'/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                 $mail_message = $this->hook->fire('insert_user_dupe_mail_message', $mail_message);
 
@@ -232,8 +232,8 @@ public function insert_user($user)
                 $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
                 $mail_message = str_replace('<base_url>', get_base_url().'/', $mail_message);
-                $mail_message = str_replace('<profile_url>', get_link('user/'.$new_uid.'/'), $mail_message);
-                $mail_message = str_replace('<admin_url>', get_link('user/'.$new_uid.'/section/admin/'), $mail_message);
+                $mail_message = str_replace('<profile_url>', $this->feather->url->get_link('user/'.$new_uid.'/'), $mail_message);
+                $mail_message = str_replace('<admin_url>', $this->feather->url->get_link('user/'.$new_uid.'/section/admin/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                 $mail_message = $this->hook->fire('insert_user_new_mail_message', $mail_message);
 
@@ -257,7 +257,7 @@ public function insert_user($user)
             $mail_message = str_replace('<base_url>', get_base_url().'/', $mail_message);
             $mail_message = str_replace('<username>', $user['username'], $mail_message);
             $mail_message = str_replace('<password>', $user['password1'], $mail_message);
-            $mail_message = str_replace('<login_url>', get_link('login/'), $mail_message);
+            $mail_message = str_replace('<login_url>', $this->feather->url->get_link('login/'), $mail_message);
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
             $mail_message = $this->hook->fire('insert_user_welcome_mail_message', $mail_message);
 
diff --git a/model/search.php b/model/search.php
index e27188e5..5c1c713f 100644
--- a/model/search.php
+++ b/model/search.php
@@ -569,7 +569,7 @@ public function get_search_results()
 
         // If we're on the new posts search, display a "mark all as read" link
         if (!$this->user->is_guest && $search_type[0] == 'action' && $search_type[1] == 'show_new') {
-            $search['forum_actions'][] = '<a href="'.get_link('mark-read/').'">'.__('Mark all as read').'</a>';
+            $search['forum_actions'][] = '<a href="'.$this->feather->url->get_link('mark-read/').'">'.__('Mark all as read').'</a>';
         }
 
         // Fetch results to display
@@ -604,7 +604,7 @@ public function get_search_results()
             $search['start_from'] = $start_from;
 
             // Generate paging links
-            $search['paging_links'] = '<span class="pages-label">'.__('Pages').' </span>'.paginate_old($num_pages, $p, '?search_id='.$search_id);
+            $search['paging_links'] = '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate_old($num_pages, $p, '?search_id='.$search_id);
 
             // throw away the first $start_from of $search_ids, only keep the top $per_page of $search_ids
             $search_ids = array_slice($search_ids, $start_from, $per_page);
@@ -643,9 +643,9 @@ public function get_search_results()
 
             if ($search_type[0] == 'action') {
                 if ($search_type[1] == 'show_user_topics') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_topics'), feather_escape($search['search_set'][0]['poster'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get_link('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_topics'), feather_escape($search['search_set'][0]['poster'])).'</a>';
                 } elseif ($search_type[1] == 'show_user_posts') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_posts'), feather_escape($search['search_set'][0]['pposter'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get_link('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_posts'), feather_escape($search['search_set'][0]['pposter'])).'</a>';
                 } elseif ($search_type[1] == 'show_subscriptions') {
                     // Fetch username of subscriber
                     $subscriber_id = $search_type[2];
@@ -658,10 +658,10 @@ public function get_search_results()
                         message(__('Bad request'), '404');
                     }
 
-                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), feather_escape($subscriber_name)).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get_link('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), feather_escape($subscriber_name)).'</a>';
                 } else {
                     $search_url = str_replace('_', '/', $search_type[1]);
-                    $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/'.$search_url.'/').'">'.__('Quick search '.$search_type[1]).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get_link('search/'.$search_url.'/').'">'.__('Quick search '.$search_type[1]).'</a>';
                 }
             } else {
                 $keywords = $author = '';
@@ -677,7 +677,7 @@ public function get_search_results()
                     $search['crumbs_text']['search_type'] = sprintf(__('By user show as '.$show_as), feather_escape($author));
                 }
 
-                $search['crumbs_text']['search_type'] = '<a href="'.get_link('search/?action=search&amp;keywords='.urlencode($keywords).'&amp;author='.urlencode($author).'&amp;forums='.$search_type[2].'&amp;search_in='.$search_type[3].'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir.'&amp;show_as='.$show_as).'">'.$search['crumbs_text']['search_type'].'</a>';
+                $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get_link('search/?action=search&amp;keywords='.urlencode($keywords).'&amp;author='.urlencode($author).'&amp;forums='.$search_type[2].'&amp;search_in='.$search_type[3].'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir.'&amp;show_as='.$show_as).'">'.$search['crumbs_text']['search_type'].'</a>';
             }
         }
 
@@ -702,8 +702,8 @@ public function display_search_results($search)
         $post_count = $topic_count = 0;
 
         foreach ($search['search_set'] as $cur_search) {
-            $forum = '<a href="'.get_link('forum/'.$cur_search['forum_id'].'/'.url_friendly($cur_search['forum_name']).'/').'">'.feather_escape($cur_search['forum_name']).'</a>';
-            $url_topic = url_friendly($cur_search['subject']);
+            $forum = '<a href="'.$this->feather->url->get_link('forum/'.$cur_search['forum_id'].'/'.$this->feather->url->url_friendly($cur_search['forum_name']).'/').'">'.feather_escape($cur_search['forum_name']).'</a>';
+            $url_topic = $this->feather->url->url_friendly($cur_search['subject']);
 
             if ($this->config['o_censoring'] == '1') {
                 $cur_search['subject'] = censor_words($cur_search['subject']);
@@ -730,7 +730,7 @@ public function display_search_results($search)
                 $pposter = feather_escape($cur_search['pposter']);
 
                 if ($cur_search['poster_id'] > 1 && $this->user->g_view_users == '1') {
-                    $cur_search['pposter_disp'] = '<strong><a href="'.get_link('user/'.$cur_search['poster_id'].'/').'">'.$pposter.'</a></strong>';
+                    $cur_search['pposter_disp'] = '<strong><a href="'.$this->feather->url->get_link('user/'.$cur_search['poster_id'].'/').'">'.$pposter.'</a></strong>';
                 } else {
                     $cur_search['pposter_disp'] = '<strong>'.$pposter.'</strong>';
                 }
@@ -748,7 +748,7 @@ public function display_search_results($search)
                 $cur_search['item_status'] = ($topic_count % 2 == 0) ? 'roweven' : 'rowodd';
                 $cur_search['icon_type'] = 'icon';
 
-                $subject = '<a href="'.get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.feather_escape($cur_search['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['poster']).'</span>';
+                $subject = '<a href="'.$this->feather->url->get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.feather_escape($cur_search['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['poster']).'</span>';
 
                 if ($cur_search['sticky'] == '1') {
                     $cur_search['item_status'] .= ' isticky';
@@ -764,7 +764,7 @@ public function display_search_results($search)
                     $cur_search['item_status'] .= ' inew';
                     $cur_search['icon_type'] = 'icon icon-new';
                     $subject = '<strong>'.$subject.'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_search['tid'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->url->get_link('topic/'.$cur_search['tid'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
@@ -775,7 +775,7 @@ public function display_search_results($search)
                 $num_pages_topic = ceil(($cur_search['num_replies'] + 1) / $this->user->disp_posts);
 
                 if ($num_pages_topic > 1) {
-                    $subject_multipage = '<span class="pagestext">[ '.paginate($num_pages_topic, -1, 'topic/'.$cur_search['tid'].'/'.$url_topic.'/#').' ]</span>';
+                    $subject_multipage = '<span class="pagestext">[ '.$this->feather->url->paginate($num_pages_topic, -1, 'topic/'.$cur_search['tid'].'/'.$url_topic.'/#').' ]</span>';
                 } else {
                     $subject_multipage = null;
                 }
diff --git a/model/viewforum.php b/model/viewforum.php
index d88a0e6c..779d6999 100644
--- a/model/viewforum.php
+++ b/model/viewforum.php
@@ -103,13 +103,13 @@ public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
         if (!$this->user->is_guest) {
             if ($subscriptions == 1) {
                 if ($is_subscribed) {
-                    $forum_actions[] = '<span>'.__('Is subscribed').' - </span><a href="'.get_link('unsubscribe/forum/'.$forum_id.'/').'">'.__('Unsubscribe').'</a>';
+                    $forum_actions[] = '<span>'.__('Is subscribed').' - </span><a href="'.$this->feather->url->get_link('unsubscribe/forum/'.$forum_id.'/').'">'.__('Unsubscribe').'</a>';
                 } else {
-                    $forum_actions[] = '<a href="'.get_link('subscribe/forum/'.$forum_id.'/').'">'.__('Subscribe').'</a>';
+                    $forum_actions[] = '<a href="'.$this->feather->url->get_link('subscribe/forum/'.$forum_id.'/').'">'.__('Subscribe').'</a>';
                 }
             }
 
-            $forum_actions[] = '<a href="'.get_link('mark-forum-read/'.$forum_id.'/').'">'.__('Mark forum read').'</a>';
+            $forum_actions[] = '<a href="'.$this->feather->url->get_link('mark-forum-read/'.$forum_id.'/').'">'.__('Mark forum read').'</a>';
         }
 
         $forum_actions = $this->hook->fire('get_page_head', $forum_actions);
@@ -184,10 +184,10 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 $status_text = array();
                 $cur_topic['item_status'] = ($topic_count % 2 == 0) ? 'roweven' : 'rowodd';
                 $cur_topic['icon_type'] = 'icon';
-                $url_subject = url_friendly($cur_topic['subject']);
+                $url_subject = $this->feather->url->url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_formatted'] = '<a href="'.get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_formatted'] = '<a href="'.$this->feather->url->get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
                 } else {
                     $cur_topic['last_post_formatted'] = '- - -';
                 }
@@ -202,13 +202,13 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get_link('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_formatted'] = '<a href="'.get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
@@ -217,7 +217,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_formatted'] = '<strong>'.$cur_topic['subject_formatted'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->url->get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
@@ -236,7 +236,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 $num_pages_topic = ceil(($cur_topic['num_replies'] + 1) / $this->user->disp_posts);
 
                 if ($num_pages_topic > 1) {
-                    $subject_multipage = '<span class="pagestext">[ '.paginate($num_pages_topic, -1, 'topic/'.$cur_topic['id'].'/'.$url_subject.'/#').' ]</span>';
+                    $subject_multipage = '<span class="pagestext">[ '.$this->feather->url->paginate($num_pages_topic, -1, 'topic/'.$cur_topic['id'].'/'.$url_subject.'/#').' ]</span>';
                 } else {
                     $subject_multipage = null;
                 }
diff --git a/model/viewtopic.php b/model/viewtopic.php
index 6a8f6674..81ab1b86 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -160,7 +160,7 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
 
         if ($closed == '0') {
             if (($post_replies == '' && $this->user->g_post_replies == '1') || $post_replies == '1' || $is_admmod) {
-                $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.get_link('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a></p>'."\n";
+                $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.$this->feather->url->get_link('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a></p>'."\n";
             } else {
                 $post_link = '';
             }
@@ -168,7 +168,7 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
             $post_link = __('Topic closed');
 
             if ($is_admmod) {
-                $post_link .= ' / <a href="'.get_link('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a>';
+                $post_link .= ' / <a href="'.$this->feather->url->get_link('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a>';
             }
 
             $post_link = "\t\t\t".'<p class="postlink conr">'.$post_link.'</p>'."\n";
@@ -206,9 +206,9 @@ public function get_subscraction($is_subscribed, $topic_id)
         if (!$this->user->is_guest && $this->config['o_topic_subscriptions'] == '1') {
             if ($is_subscribed) {
                 // I apologize for the variable naming here. It's a mix of subscription and action I guess :-)
-                $subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.__('Is subscribed').' - </span><a href="'.get_link('unsubscribe/topic/'.$topic_id.'/').'">'.__('Unsubscribe').'</a></p>'."\n";
+                $subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.__('Is subscribed').' - </span><a href="'.$this->feather->url->get_link('unsubscribe/topic/'.$topic_id.'/').'">'.__('Unsubscribe').'</a></p>'."\n";
             } else {
-                $subscraction = "\t\t".'<p class="subscribelink clearb"><a href="'.get_link('subscribe/topic/'.$topic_id.'/').'">'.__('Subscribe').'</a></p>'."\n";
+                $subscraction = "\t\t".'<p class="subscribelink clearb"><a href="'.$this->feather->url->get_link('subscribe/topic/'.$topic_id.'/').'">'.__('Subscribe').'</a></p>'."\n";
             }
         } else {
             $subscraction = '';
@@ -317,7 +317,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                     if ((($cur_post['email_setting'] == '0' && !$this->user->is_guest) || $this->user->is_admmod) && $this->user->g_send_email == '1') {
                         $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['email']).'">'.__('Email').'</a></span>';
                     } elseif ($cur_post['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.get_link('email/'.$cur_post['poster_id'].'/').'">'.__('Email').'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.$this->feather->url->get_link('email/'.$cur_post['poster_id'].'/').'">'.__('Email').'</a></span>';
                     }
 
                     if ($cur_post['url'] != '') {
@@ -336,7 +336,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 }
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="'.get_link('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get_link('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
 
                     if ($cur_post['admin_note'] != '') {
                         $cur_post['user_info'][] = '<dd><span>'.__('Note').' <strong>'.feather_escape($cur_post['admin_note']).'</strong></span></dd>';
@@ -349,7 +349,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 $cur_post['user_title_formatted'] = get_title($cur_post);
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="'.get_link('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get_link('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
                 }
 
                 if ($this->config['o_show_user_info'] == '1' && $cur_post['poster_email'] != '' && !$this->user->is_guest && $this->user->g_send_email == '1') {
@@ -360,30 +360,30 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
             // Generation post action array (quote, edit, delete etc.)
             if (!$is_admmod) {
                 if (!$this->user->is_guest) {
-                    $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.get_link('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.$this->feather->url->get_link('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
                 }
 
                 if ($cur_topic['closed'] == '0') {
                     if ($cur_post['poster_id'] == $this->user->id) {
                         if ((($start_from + $post_count) == 1 && $this->user->g_delete_topics == '1') || (($start_from + $post_count) > 1 && $this->user->g_delete_posts == '1')) {
-                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
+                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.$this->feather->url->get_link('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
                         }
                         if ($this->user->g_edit_posts == '1') {
-                            $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
+                            $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.$this->feather->url->get_link('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
                         }
                     }
 
                     if (($cur_topic['post_replies'] == '' && $this->user->g_post_replies == '1') || $cur_topic['post_replies'] == '1') {
-                        $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
+                        $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.$this->feather->url->get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
                     }
                 }
             } else {
-                $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.get_link('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
+                $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.$this->feather->url->get_link('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
                 if ($this->user->g_id == FEATHER_ADMIN || !in_array($cur_post['poster_id'], $admin_ids)) {
-                    $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.get_link('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
-                    $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.get_link('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.$this->feather->url->get_link('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.$this->feather->url->get_link('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
                 }
-                $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
+                $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.$this->feather->url->get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
             }
 
             // Perform the main parsing of the message (BBCode, smilies, censor words etc)
diff --git a/plugins/test/plugintest.php b/plugins/test/plugintest.php
index c9fe31f2..20b9d907 100644
--- a/plugins/test/plugintest.php
+++ b/plugins/test/plugintest.php
@@ -22,12 +22,12 @@ public function __construct()
         $this->hook = $this->feather->hooks;
 
         $this->hook->bind('get_forum_actions', function ($forum_actions) {
-            $forum_actions[] = '<a href="' . get_link('mark-read/') . '">Test1</a>';
+            $forum_actions[] = '<a href="' . $this->feather->url->get_link('mark-read/') . '">Test1</a>';
             return $forum_actions;
         });
 
         $this->hook->bind('get_forum_actions', function ($forum_actions) {
-            $forum_actions[] = '<a href="' . get_link('mark-read/') . '">Test2</a>';
+            $forum_actions[] = '<a href="' . $this->feather->url->get_link('mark-read/') . '">Test2</a>';
             return $forum_actions;
         });
 
diff --git a/style/FeatherBB/view/admin/bans/admin_bans.php b/style/FeatherBB/view/admin/bans/admin_bans.php
index 3d714e7f..50e72e76 100644
--- a/style/FeatherBB/view/admin/bans/admin_bans.php
+++ b/style/FeatherBB/view/admin/bans/admin_bans.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('New ban head') ?></span></h2>
 		<div class="box">
-			<form id="bans" method="post" action="<?php echo get_link('admin/bans/add/') ?>">
+			<form id="bans" method="post" action="<?php echo $feather->url->get_link('admin/bans/add/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
@@ -39,7 +39,7 @@
 
 		<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
 		<div class="box">
-			<form id="find_bans" method="get" action="<?php echo get_link('admin/bans/') ?>">
+			<form id="find_bans" method="get" action="<?php echo $feather->url->get_link('admin/bans/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
 				<div class="inform">
diff --git a/style/FeatherBB/view/admin/bans/search_ban.php b/style/FeatherBB/view/admin/bans/search_ban.php
index 0d057182..676b3e63 100644
--- a/style/FeatherBB/view/admin/bans/search_ban.php
+++ b/style/FeatherBB/view/admin/bans/search_ban.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -55,8 +55,8 @@
 					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? feather_escape($cur_ban['ip']) : '&#160;' ?></td>
 					<td class="tc4"><?php echo format_time($cur_ban['expire'], true) ?></td>
 					<td class="tc5"><?php echo($cur_ban['message'] != '') ? feather_escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.get_link('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
-					<td class="tcr"><?php echo '<a href="'.get_link('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.get_link('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
+					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get_link('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get_link('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
 				</tr>
 <?php
 
@@ -78,8 +78,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
         <ul class="crumbs">
-            <li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+            <li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+            <li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
             <li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
         </ul>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/admin/categories.php b/style/FeatherBB/view/admin/categories.php
index c8786528..370838ac 100644
--- a/style/FeatherBB/view/admin/categories.php
+++ b/style/FeatherBB/view/admin/categories.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Add categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/categories/add/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/categories/add/') ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('Add categories subhead') ?></legend>
@@ -27,7 +27,7 @@
 									<td>
 										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
-										<span><?php printf(__('Add category help'), '<a href="'.get_link('admin/forums').'">'.__('Forums').'</a>') ?></span>
+										<span><?php printf(__('Add category help'), '<a href="'.$feather->url->get_link('admin/forums').'">'.__('Forums').'</a>') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -39,7 +39,7 @@
 
 <?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/categories/delete') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/categories/delete') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
@@ -71,7 +71,7 @@
 
 <?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/categories/edit/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/categories/edit/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/style/FeatherBB/view/admin/censoring.php b/style/FeatherBB/view/admin/censoring.php
index cf080869..69977dfa 100644
--- a/style/FeatherBB/view/admin/censoring.php
+++ b/style/FeatherBB/view/admin/censoring.php
@@ -16,13 +16,13 @@
 	<div class="blockform">
 		<h2><span><?php _e('Censoring head') ?></span></h2>
 		<div class="box">
-			<form id="censoring" method="post" action="<?php echo get_link('admin/censoring/') ?>">
+			<form id="censoring" method="post" action="<?php echo $feather->url->get_link('admin/censoring/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('Add word subhead') ?></legend>
 						<div class="infldset">
-							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
+							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.$feather->url->get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.$feather->url->get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
 							<table>
 							<thead>
 								<tr>
diff --git a/style/FeatherBB/view/admin/forums/admin_forums.php b/style/FeatherBB/view/admin/forums/admin_forums.php
index e966e6f5..cbd5a6c0 100644
--- a/style/FeatherBB/view/admin/forums/admin_forums.php
+++ b/style/FeatherBB/view/admin/forums/admin_forums.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Add forum head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/forums/add') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/forums/add') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if (!empty($cat_list)) {
@@ -65,7 +65,7 @@
     ?>
 		<h2 class="block2"><span><?php _e('Manage forums head') ?></span></h2>
 		<div class="box">
-			<form id="edforum" method="post" action="<?php echo get_link('admin/forums/') ?>">
+			<form id="edforum" method="post" action="<?php echo $feather->url->get_link('admin/forums/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
 <?php
@@ -88,7 +88,7 @@
 	foreach ($cat_data['cat_forums'] as $forum) {
         ?>
 								<tr>
-									<td class="tcl"><a href="<?php echo get_link('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo get_link('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
+									<td class="tcl"><a href="<?php echo $feather->url->get_link('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get_link('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
 									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
 									<td class="tcr"><strong><?php echo feather_escape($forum['forum_name']) ?></strong></td>
 								</tr>
diff --git a/style/FeatherBB/view/admin/forums/delete_forum.php b/style/FeatherBB/view/admin/forums/delete_forum.php
index 6a5263ba..86954f4d 100644
--- a/style/FeatherBB/view/admin/forums/delete_forum.php
+++ b/style/FeatherBB/view/admin/forums/delete_forum.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Confirm delete head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/style/FeatherBB/view/admin/forums/permissions.php b/style/FeatherBB/view/admin/forums/permissions.php
index df092f46..8f358170 100644
--- a/style/FeatherBB/view/admin/forums/permissions.php
+++ b/style/FeatherBB/view/admin/forums/permissions.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Edit forum head') ?></span></h2>
 		<div class="box">
-			<form id="edit_forum" method="post" action="<?php echo get_link('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
+			<form id="edit_forum" method="post" action="<?php echo $feather->url->get_link('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
 				<div class="inform">
diff --git a/style/FeatherBB/view/admin/groups/admin_groups.php b/style/FeatherBB/view/admin/groups/admin_groups.php
index aff5db98..d776239e 100644
--- a/style/FeatherBB/view/admin/groups/admin_groups.php
+++ b/style/FeatherBB/view/admin/groups/admin_groups.php
@@ -18,7 +18,7 @@
 		<div class="box">
 				<div class="inform">
 					<fieldset>
-                        <form id="groups" method="post" action="<?php echo get_link('admin/groups/add/') ?>">
+                        <form id="groups" method="post" action="<?php echo $feather->url->get_link('admin/groups/add/') ?>">
                         <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 						<legend><?php _e('Add group subhead') ?></legend>
 						<div class="infldset">
@@ -51,7 +51,7 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-                        <form id="groups" method="post" action="<?php echo get_link('admin/groups/') ?>">
+                        <form id="groups" method="post" action="<?php echo $feather->url->get_link('admin/groups/') ?>">
                         	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 						<legend><?php _e('Default group subhead') ?></legend>
 						<div class="infldset">
@@ -95,7 +95,7 @@
 							<table>
 <?php
 foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.get_link('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.get_link('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get_link('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get_link('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
 }
 
 ?>
diff --git a/style/FeatherBB/view/admin/groups/confirm_delete.php b/style/FeatherBB/view/admin/groups/confirm_delete.php
index ca595ab3..df490091 100644
--- a/style/FeatherBB/view/admin/groups/confirm_delete.php
+++ b/style/FeatherBB/view/admin/groups/confirm_delete.php
@@ -16,10 +16,10 @@
 	<div class="blockform">
 		<h2><span><?php _e('Group delete head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
-				<input type="hidden" name="group_to_delete" value="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>" />
+				<input type="hidden" name="group_to_delete" value="<?php echo $feather->url->get_link('admin/groups/delete/'.$id.'/') ?>" />
 					<fieldset>
 						<legend><?php _e('Confirm delete subhead') ?></legend>
 						<div class="infldset">
diff --git a/style/FeatherBB/view/admin/groups/delete_group.php b/style/FeatherBB/view/admin/groups/delete_group.php
index aea315d0..a878dcbb 100644
--- a/style/FeatherBB/view/admin/groups/delete_group.php
+++ b/style/FeatherBB/view/admin/groups/delete_group.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Delete group head') ?></span></h2>
 		<div class="box">
-			<form id="groups" method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
+			<form id="groups" method="post" action="<?php echo $feather->url->get_link('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/style/FeatherBB/view/admin/index.php b/style/FeatherBB/view/admin/index.php
index f369b039..710a0e0e 100644
--- a/style/FeatherBB/view/admin/index.php
+++ b/style/FeatherBB/view/admin/index.php
@@ -35,7 +35,7 @@
 <?php if ($install_file_exists) : ?>
 		<h2 class="block2"><span><?php _e('Alerts head') ?></span></h2>
 		<div id="adalerts" class="box">
-			<p><?php printf(__('Install file exists'), '<a href="'.get_link('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
+			<p><?php printf(__('Install file exists'), '<a href="'.$feather->url->get_link('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
 		</div>
 <?php endif; ?>
 
@@ -45,11 +45,11 @@
 				<dl>
 					<dt><?php _e('FeatherBB version label') ?></dt>
 					<dd>
-						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
+						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.$feather->url->get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
 					</dd>
 					<dt><?php _e('Server statistics label') ?></dt>
 					<dd>
-						<a href="<?php echo get_link('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
+						<a href="<?php echo $feather->url->get_link('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
 					</dd>
 					<dt><?php _e('Support label') ?></dt>
 					<dd>
diff --git a/style/FeatherBB/view/admin/maintenance/admin_maintenance.php b/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
index 068b914b..6bd9ade5 100644
--- a/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
+++ b/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
@@ -16,13 +16,13 @@
 	<div class="blockform">
 		<h2><span><?php _e('Maintenance head') ?></span></h2>
 		<div class="box">
-			<form method="get" action="<?php echo get_link('admin/maintenance/') ?>">
+			<form method="get" action="<?php echo $feather->url->get_link('admin/maintenance/') ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="rebuild" />
 					<fieldset>
 						<legend><?php _e('Rebuild index subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Rebuild index info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<p><?php printf(__('Rebuild index info'), '<a href="'.$feather->url->get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php _e('Posts per cycle label') ?></th>
@@ -52,7 +52,7 @@
 				</div>
 			</form>
 
-			<form method="post" action="<?php echo get_link('admin/maintenance/') ?>" onsubmit="return process_form(this)">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/maintenance/') ?>" onsubmit="return process_form(this)">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
@@ -87,7 +87,7 @@
 									</td>
 								</tr>
 							</table>
-							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.$feather->url->get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
 							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php _e('Prune') ?>" tabindex="8" /></div>
 						</div>
 					</fieldset>
diff --git a/style/FeatherBB/view/admin/maintenance/prune.php b/style/FeatherBB/view/admin/maintenance/prune.php
index 9e3b0d2b..fcfd7918 100644
--- a/style/FeatherBB/view/admin/maintenance/prune.php
+++ b/style/FeatherBB/view/admin/maintenance/prune.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Prune head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/maintenance/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/maintenance/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
diff --git a/style/FeatherBB/view/admin/maintenance/rebuild.php b/style/FeatherBB/view/admin/maintenance/rebuild.php
index 0d24339b..b4f9434b 100644
--- a/style/FeatherBB/view/admin/maintenance/rebuild.php
+++ b/style/FeatherBB/view/admin/maintenance/rebuild.php
@@ -13,5 +13,5 @@
 }
 ?>
 <h1><?php _e('Rebuilding index info') ?></h1>
-<script type="text/javascript">window.location="<?= get_link('admin/maintenance/').$query_str ?>"</script>
-<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.get_link('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>
+<script type="text/javascript">window.location="<?= $feather->url->get_link('admin/maintenance/').$query_str ?>"</script>
+<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.$feather->url->get_link('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>
diff --git a/style/FeatherBB/view/admin/menu.php b/style/FeatherBB/view/admin/menu.php
index d958a4ab..abc7f7ed 100644
--- a/style/FeatherBB/view/admin/menu.php
+++ b/style/FeatherBB/view/admin/menu.php
@@ -22,20 +22,20 @@
 					<li<?php if ($page == 'index') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/') ?>"><?php _e('Index') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Index') ?></a></li>
 					<li<?php if ($page == 'users') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 <?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
 <?php endif;
     if ($is_admin || $feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
@@ -51,35 +51,35 @@
 					<li<?php if ($page == 'options') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/options/') ?>"><?php _e('Options') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/options/') ?>"><?php _e('Options') ?></a></li>
 					<li<?php if ($page == 'permissions') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
 					<li<?php if ($page == 'categories') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
 					<li<?php if ($page == 'forums') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
 					<li<?php if ($page == 'groups') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
 					<li<?php if ($page == 'censoring') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
 					<li<?php if ($page == 'parser') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
 					<li<?php if ($page == 'maintenance') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
 				</ul>
 			</div>
 		</div>
@@ -97,7 +97,7 @@
 <?php
 
         foreach ($plugins as $plugin_name => $plugin) {
-            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.get_link('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
+            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
         }
 
         ?>
diff --git a/style/FeatherBB/view/admin/options.php b/style/FeatherBB/view/admin/options.php
index 88c2c0b6..161058ea 100644
--- a/style/FeatherBB/view/admin/options.php
+++ b/style/FeatherBB/view/admin/options.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Options head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/options/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/options/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
@@ -421,7 +421,7 @@
 										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
+										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.$feather->url->get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
diff --git a/style/FeatherBB/view/admin/parser.php b/style/FeatherBB/view/admin/parser.php
index e32369b6..df29eb0d 100644
--- a/style/FeatherBB/view/admin/parser.php
+++ b/style/FeatherBB/view/admin/parser.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php echo $lang_admin_parser['Parser head'] ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/parser/') ?>" enctype="multipart/form-data">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/parser/') ?>" enctype="multipart/form-data">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop">
 					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
diff --git a/style/FeatherBB/view/admin/permissions.php b/style/FeatherBB/view/admin/permissions.php
index 2b1bf413..e8201e72 100644
--- a/style/FeatherBB/view/admin/permissions.php
+++ b/style/FeatherBB/view/admin/permissions.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Permissions head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/permissions/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/permissions/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
diff --git a/style/FeatherBB/view/admin/reports.php b/style/FeatherBB/view/admin/reports.php
index 63251681..163e25b0 100644
--- a/style/FeatherBB/view/admin/reports.php
+++ b/style/FeatherBB/view/admin/reports.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('New reports head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/reports/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/reports/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if (!empty($report_data)) {
@@ -28,10 +28,10 @@
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get_link('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => $feather->url->get_link('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
@@ -74,14 +74,14 @@
         ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.get_link('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
+						<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get_link('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get_link('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => $feather->url->get_link('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?></th>
diff --git a/style/FeatherBB/view/admin/statistics.php b/style/FeatherBB/view/admin/statistics.php
index 5306b027..d7e779d6 100644
--- a/style/FeatherBB/view/admin/statistics.php
+++ b/style/FeatherBB/view/admin/statistics.php
@@ -25,7 +25,7 @@
 <?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
 					<dd>
 						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
-						<?php printf(__('Environment data version'), phpversion(), '<a href="'.get_link('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
+						<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->url->get_link('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
 						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
 					</dd>
 					<dt><?php _e('Database label') ?></dt>
diff --git a/style/FeatherBB/view/admin/users/admin_users.php b/style/FeatherBB/view/admin/users/admin_users.php
index 27e99a16..20b0a521 100644
--- a/style/FeatherBB/view/admin/users/admin_users.php
+++ b/style/FeatherBB/view/admin/users/admin_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('User search head') ?></span></h2>
 		<div class="box">
-			<form id="find_user" method="get" action="<?php echo get_link('admin/users/') ?>">
+			<form id="find_user" method="get" action="<?php echo $feather->url->get_link('admin/users/') ?>">
 				<p class="submittop"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="1" /></p>
 				<div class="inform">
 					<fieldset>
@@ -150,7 +150,7 @@
 
 		<h2 class="block2"><span><?php _e('IP search head') ?></span></h2>
 		<div class="box">
-			<form method="get" action="<?php echo get_link('admin/users/') ?>">
+			<form method="get" action="<?php echo $feather->url->get_link('admin/users/') ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('IP search subhead') ?></legend>
diff --git a/style/FeatherBB/view/admin/users/ban_users.php b/style/FeatherBB/view/admin/users/ban_users.php
index e929c043..1d7bebd2 100644
--- a/style/FeatherBB/view/admin/users/ban_users.php
+++ b/style/FeatherBB/view/admin/users/ban_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Ban users') ?></span></h2>
 		<div class="box">
-			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo get_link('admin/users') ?>">
+			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo $feather->url->get_link('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
diff --git a/style/FeatherBB/view/admin/users/delete_users.php b/style/FeatherBB/view/admin/users/delete_users.php
index a82c22ec..29630f72 100644
--- a/style/FeatherBB/view/admin/users/delete_users.php
+++ b/style/FeatherBB/view/admin/users/delete_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Delete users') ?></span></h2>
 		<div class="box">
-			<form name="confirm_del_users" method="post" action="<?php echo get_link('admin/users') ?>">
+			<form name="confirm_del_users" method="post" action="<?php echo $feather->url->get_link('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
diff --git a/style/FeatherBB/view/admin/users/find_users.php b/style/FeatherBB/view/admin/users/find_users.php
index d426177d..168ff16b 100644
--- a/style/FeatherBB/view/admin/users/find_users.php
+++ b/style/FeatherBB/view/admin/users/find_users.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -28,7 +28,7 @@
 </div>
 
 
-<form id="search-users-form" action="<?php echo get_link('admin/users/') ?>" method="post">
+<form id="search-users-form" action="<?php echo $feather->url->get_link('admin/users/') ?>" method="post">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <div id="users2" class="blocktable">
 	<h2><span><?php _e('Results head') ?></span></h2>
@@ -54,12 +54,12 @@
         foreach ($user_data as $user) {
             ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
 					<td class="tc2"><a href="mailto:<?php echo feather_escape($user['email']) ?>"><?php echo feather_escape($user['email']) ?></a></td>
 					<td class="tc3"><?php echo $user['user_title'] ?></td>
 					<td class="tc4"><?php echo forum_number_format($user['num_posts']) ?></td>
 					<td class="tc5"><?php echo($user['admin_note'] != '') ? feather_escape($user['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
 <?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
 <?php endif;
             ?>
@@ -90,8 +90,8 @@
     ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/admin/users/move_users.php b/style/FeatherBB/view/admin/users/move_users.php
index d43303e8..ee7e6419 100644
--- a/style/FeatherBB/view/admin/users/move_users.php
+++ b/style/FeatherBB/view/admin/users/move_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Move users') ?></span></h2>
 		<div class="box">
-			<form name="confirm_move_users" method="post" action="<?php echo get_link('admin/users/') ?>">
+			<form name="confirm_move_users" method="post" action="<?php echo $feather->url->get_link('admin/users/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
 				<div class="inform">
diff --git a/style/FeatherBB/view/admin/users/search_ip.php b/style/FeatherBB/view/admin/users/search_ip.php
index a17e7ac5..ad3ce72a 100644
--- a/style/FeatherBB/view/admin/users/search_ip.php
+++ b/style/FeatherBB/view/admin/users/search_ip.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -45,10 +45,10 @@
         foreach ($ip_data as $ip) {
             ?>
 				<tr>
-					<td class="tcl"><a href="<?php echo get_link('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
+					<td class="tcl"><a href="<?php echo $feather->url->get_link('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
 					<td class="tc2"><?php echo format_time($ip['last_used']) ?></td>
 					<td class="tc3"><?php echo $ip['used_times'] ?></td>
-					<td class="tcr"><a href="<?php echo get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
+					<td class="tcr"><a href="<?php echo $feather->url->get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
 				</tr>
 <?php
 
@@ -70,8 +70,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/admin/users/show_users.php b/style/FeatherBB/view/admin/users/show_users.php
index 4ab008c7..b662779c 100644
--- a/style/FeatherBB/view/admin/users/show_users.php
+++ b/style/FeatherBB/view/admin/users/show_users.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -51,12 +51,12 @@
             if (isset($info['user_data'][$cur_poster['poster_id']])) {
                 ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.get_link('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.feather_escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get_link('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.feather_escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
 					<td class="tc2"><a href="mailto:<?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
 					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
 					<td class="tc4"><?php echo forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
 					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? feather_escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
 				</tr>
 <?php
 
@@ -91,8 +91,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/delete.php b/style/FeatherBB/view/delete.php
index 8a2d6959..be4aa85c 100644
--- a/style/FeatherBB/view/delete.php
+++ b/style/FeatherBB/view/delete.php
@@ -17,8 +17,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="index.php"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>
@@ -27,7 +27,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Delete post') ?></span></h2>
 	<div class="box">
-		<form method="post" action="<?php echo get_link('delete/'.$id.'/') ?>">
+		<form method="post" action="<?php echo $feather->url->get_link('delete/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
diff --git a/style/FeatherBB/view/edit.php b/style/FeatherBB/view/edit.php
index 829d0c17..0cce7ef5 100644
--- a/style/FeatherBB/view/edit.php
+++ b/style/FeatherBB/view/edit.php
@@ -20,8 +20,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
 		</ul>
 	</div>
@@ -76,7 +76,7 @@
 <div id="editform" class="blockform">
 	<h2><span><?php _e('Edit post') ?></span></h2>
 	<div class="box">
-		<form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
+		<form id="edit" method="post" action="<?php echo $feather->url->get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -89,10 +89,10 @@
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/style/FeatherBB/view/footer.new.php b/style/FeatherBB/view/footer.new.php
index 13b79669..7779ef23 100644
--- a/style/FeatherBB/view/footer.new.php
+++ b/style/FeatherBB/view/footer.new.php
@@ -21,7 +21,7 @@
     if ($active_page == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$fid.'/page/'.$page_number.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/forum/'.$fid.'/page/'.$page_number.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($active_page == 'viewtopic') {
         if (isset($pid)) {
@@ -36,20 +36,20 @@
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/moderate/page/'.$page_number.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+        //echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/moderate/page/'.$page_number.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
 
         if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
         }
 
         if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
         }
 
         echo "\t\t\t".'</dl>'."\n";
@@ -67,12 +67,12 @@
 			<div class="conl">
 			<form id="qjump" method="get" action="">
 				<div><label><span><?php _e('Jump to') ?><br /></span></label>
-					<select name="id" onchange="window.location=('<?php echo get_link('forum/') ?>'+this.options[this.selectedIndex].value)">
+					<select name="id" onchange="window.location=('<?php echo $feather->url->get_link('forum/') ?>'+this.options[this.selectedIndex].value)">
 <?php
 		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
 			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
 			foreach ($cat_data['cat_forums'] as $forum) {
-				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.url_friendly($forum['forum_name']).'"'.($fid == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
+				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($fid == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
 			}
 			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
 		} ?>
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
index 2826444c..d825d4c3 100644
--- a/style/FeatherBB/view/footer.php
+++ b/style/FeatherBB/view/footer.php
@@ -21,7 +21,7 @@
     if ($footer_style == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($footer_style == 'viewtopic') {
         if (isset($pid)) {
@@ -36,20 +36,20 @@
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+        //echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
 
         if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
         }
 
         if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
         }
 
         echo "\t\t\t".'</dl>'."\n";
@@ -67,12 +67,12 @@
 			<div class="conl">
 			<form id="qjump" method="get" action="">
 				<div><label><span><?php _e('Jump to') ?><br /></span></label>
-					<select name="id" onchange="window.location=('<?php echo get_link('forum/') ?>'+this.options[this.selectedIndex].value)">
+					<select name="id" onchange="window.location=('<?php echo $feather->url->get_link('forum/') ?>'+this.options[this.selectedIndex].value)">
 <?php
 		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
 			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
 			foreach ($cat_data['cat_forums'] as $forum) {
-				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
+				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
 			}
 			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
 		} ?>
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index ff65adda..1acfb081 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -100,28 +100,28 @@ function process_form(the_form)
 echo "\t\t\t\t\t\t".'<li id="navindex"'.(($active_page == 'index') ? ' class="isactive"' : '').'><a href="'.get_base_url().'/">'.__('Index').'</a></li>'."\n";
 
 if ($feather->user->g_read_board == '1' && $feather->user->g_view_users == '1') {
-    echo "\t\t\t\t\t\t".'<li id="navuserlist"'.(($active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.get_link('userlist/').'">'.__('User list').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navuserlist"'.(($active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('userlist/').'">'.__('User list').'</a></li>'."\n";
 }
 
 if ($feather->forum_settings['o_rules'] == '1' && (!$feather->user->is_guest || $feather->user->g_read_board == '1' || $feather->forum_settings['o_regs_allow'] == '1')) {
-    echo "\t\t\t\t\t\t".'<li id="navrules"'.(($active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.get_link('rules/').'">'.__('Rules').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navrules"'.(($active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('rules/').'">'.__('Rules').'</a></li>'."\n";
 }
 
 if ($feather->user->g_read_board == '1' && $feather->user->g_search == '1') {
-    echo "\t\t\t\t\t\t".'<li id="navsearch"'.(($active_page == 'search') ? ' class="isactive"' : '').'><a href="'.get_link('search/').'">'.__('Search').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navsearch"'.(($active_page == 'search') ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('search/').'">'.__('Search').'</a></li>'."\n";
 }
 
 if ($feather->user->is_guest) {
-    echo "\t\t\t\t\t\t".'<li id="navregister"'.(($active_page == 'register') ? ' class="isactive"' : '').'><a href="'.get_link('register/').'">'.__('Register').'</a></li>'."\n";
-    echo "\t\t\t\t\t\t".'<li id="navlogin"'.(($active_page == 'login') ? ' class="isactive"' : '').'><a href="'.get_link('login/').'">'.__('Login').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navregister"'.(($active_page == 'register') ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('register/').'">'.__('Register').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogin"'.(($active_page == 'login') ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('login/').'">'.__('Login').'</a></li>'."\n";
 } else {
-    echo "\t\t\t\t\t\t".'<li id="navprofile"'.(($active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.get_link('user/'.$feather->user->id.'/').'">'.__('Profile').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navprofile"'.(($active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('user/'.$feather->user->id.'/').'">'.__('Profile').'</a></li>'."\n";
 
     if ($feather->user->is_admmod) {
-        echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.get_link('admin/').'">'.__('Admin').'</a></li>'."\n";
+        echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('admin/').'">'.__('Admin').'</a></li>'."\n";
     }
 
-    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.get_link('logout/id/'.$feather->user->id.'/token/'.feather_hash($feather->user->id.feather_hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.$feather->url->get_link('logout/id/'.$feather->user->id.'/token/'.feather_hash($feather->user->id.feather_hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
 }
 
 // // Are there any additional navlinks we should insert into the array before imploding it?
@@ -169,12 +169,12 @@ function process_form(the_form)
     if ($feather->user->is_admmod) {
         if ($feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2') {
             if ($has_reports) {
-                echo "\t\t\t\t\t\t".'<li class="reportlink"><span><strong><a href="'.get_link('admin/reports/').'">'.__('New reports').'</a></strong></span></li>'."\n";
+                echo "\t\t\t\t\t\t".'<li class="reportlink"><span><strong><a href="'.$feather->url->get_link('admin/reports/').'">'.__('New reports').'</a></strong></span></li>'."\n";
             }
         }
 
         if ($feather->forum_settings['o_maintenance'] == '1') {
-            echo "\t\t\t\t\t\t".'<li class="maintenancelink"><span><strong><a href="'.get_link('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>'."\n";
+            echo "\t\t\t\t\t\t".'<li class="maintenancelink"><span><strong><a href="'.$feather->url->get_link('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>'."\n";
         }
     }
     echo "\t\t\t\t\t".'</ul>'."\n";
@@ -184,11 +184,11 @@ function process_form(the_form)
     echo "\t\t\t\t\t".'<ul class="conr">'."\n";
     echo "\t\t\t\t\t\t".'<li><span>'.__('Topic searches').' ';
     if (!$feather->user->is_guest) {
-        echo '<a href="'.get_link('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a> | ';
-        echo '<a href="'.get_link('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a> | ';
+        echo '<a href="'.$feather->url->get_link('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a> | ';
+        echo '<a href="'.$feather->url->get_link('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a> | ';
     }
-    echo '<a href="'.get_link('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a> | ';
-    echo '<a href="'.get_link('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
+    echo '<a href="'.$feather->url->get_link('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a> | ';
+    echo '<a href="'.$feather->url->get_link('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
     echo '</li>'."\n";
     echo "\t\t\t\t".'</ul>'."\n";
 } ?>
diff --git a/style/FeatherBB/view/help.php b/style/FeatherBB/view/help.php
index d171ddab..af94b274 100644
--- a/style/FeatherBB/view/help.php
+++ b/style/FeatherBB/view/help.php
@@ -43,17 +43,17 @@
 		<p><?php _e('Links info') ?></p>
 		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
 		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php _e('This help page') ?></a></samp></p>
+		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('/help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
 		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
-		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
+		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('topic/1/') ?>"><?php echo $feather->url->get_link('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('post/1/#p1') ?>"><?php echo $feather->url->get_link('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('forum/1/') ?>"><?php echo $feather->url->get_link('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('user/2/') ?>"><?php echo $feather->url->get_link('user/2/') ?></a></samp></p>
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
diff --git a/style/FeatherBB/view/login/form.php b/style/FeatherBB/view/login/form.php
index 13d1744b..76d9cb3d 100644
--- a/style/FeatherBB/view/login/form.php
+++ b/style/FeatherBB/view/login/form.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Login') ?></span></h2>
 	<div class="box">
-		<form id="login" method="post" action="<?php echo get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
+		<form id="login" method="post" action="<?php echo $feather->url->get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -32,7 +32,7 @@
 						</div>
 
 						<p class="clearb"><?php _e('Login info') ?></p>
-						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
+						<p class="actions"><span><a href="<?php echo $feather->url->get_link('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo $feather->url->get_link('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/login/password_forgotten.php b/style/FeatherBB/view/login/password_forgotten.php
index 41c0a121..d9617fe9 100644
--- a/style/FeatherBB/view/login/password_forgotten.php
+++ b/style/FeatherBB/view/login/password_forgotten.php
@@ -39,7 +39,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Request pass') ?></span></h2>
 	<div class="box">
-		<form id="request_pass" method="post" action="<?php echo get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
+		<form id="request_pass" method="post" action="<?php echo $feather->url->get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/misc/email.php b/style/FeatherBB/view/misc/email.php
index 06f96f55..b4ed730d 100644
--- a/style/FeatherBB/view/misc/email.php
+++ b/style/FeatherBB/view/misc/email.php
@@ -16,7 +16,7 @@
 <div id="emailform" class="blockform">
 	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
 	<div class="box">
-		<form id="email" method="post" action="<?php echo get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="email" method="post" action="<?php echo $feather->url->get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/misc/report.php b/style/FeatherBB/view/misc/report.php
index 252042c7..1b55893b 100644
--- a/style/FeatherBB/view/misc/report.php
+++ b/style/FeatherBB/view/misc/report.php
@@ -17,8 +17,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
 		</ul>
 	</div>
@@ -27,7 +27,7 @@
 <div id="reportform" class="blockform">
 	<h2><span><?php _e('Report post') ?></span></h2>
 	<div class="box">
-		<form id="report" method="post" action="<?php echo get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="report" method="post" action="<?php echo $feather->url->get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/moderate/moderator_forum.php b/style/FeatherBB/view/moderate/moderator_forum.php
index 8b636222..f6819d21 100644
--- a/style/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/FeatherBB/view/moderate/moderator_forum.php
@@ -18,7 +18,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -28,7 +28,7 @@
 	</div>
 </div>
 
-<form method="post" action="<?php echo get_link('moderate/forum/'.$id.'/') ?>">
+<form method="post" action="<?php echo $feather->url->get_link('moderate/forum/'.$id.'/') ?>">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <input type="hidden" name="page" value="<?php echo feather_escape($p) ?>" />
 <div id="vf" class="blocktable">
@@ -92,7 +92,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/moderate/posts_view.php b/style/FeatherBB/view/moderate/posts_view.php
index 482a1c49..ad68aa3d 100644
--- a/style/FeatherBB/view/moderate/posts_view.php
+++ b/style/FeatherBB/view/moderate/posts_view.php
@@ -17,8 +17,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -42,7 +42,7 @@
     echo ' blockpost1';
 }
     ?>">
-		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
+		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<div class="postbody">
@@ -85,8 +85,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/post.php b/style/FeatherBB/view/post.php
index ee2531da..1030f8d3 100644
--- a/style/FeatherBB/view/post.php
+++ b/style/FeatherBB/view/post.php
@@ -18,10 +18,10 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
-<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_posting['subject']) ?></a></li>
+<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_posting['subject']) ?></a></li>
 <?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
 		</ul>
 	</div>
@@ -121,10 +121,10 @@
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/style/FeatherBB/view/profile/change_mail.php b/style/FeatherBB/view/profile/change_mail.php
index f8d25e99..0c97e20c 100644
--- a/style/FeatherBB/view/profile/change_mail.php
+++ b/style/FeatherBB/view/profile/change_mail.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Change email') ?></span></h2>
 	<div class="box">
-		<form id="change_email" method="post" action="<?php echo get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
+		<form id="change_email" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/profile/change_pass.php b/style/FeatherBB/view/profile/change_pass.php
index 3f4285fb..39cd0ed1 100644
--- a/style/FeatherBB/view/profile/change_pass.php
+++ b/style/FeatherBB/view/profile/change_pass.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Change pass') ?></span></h2>
 	<div class="box">
-		<form id="change_pass" method="post" action="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
+		<form id="change_pass" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
diff --git a/style/FeatherBB/view/profile/delete_user.php b/style/FeatherBB/view/profile/delete_user.php
index 0fd42f52..c950017c 100644
--- a/style/FeatherBB/view/profile/delete_user.php
+++ b/style/FeatherBB/view/profile/delete_user.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Confirm delete user') ?></span></h2>
 	<div class="box">
-		<form id="confirm_del_user" method="post" action="<?php echo get_link('user/'.$id.'/') ?>">
+		<form id="confirm_del_user" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/profile/menu.php b/style/FeatherBB/view/profile/menu.php
index 12b3b47f..73f384c8 100644
--- a/style/FeatherBB/view/profile/menu.php
+++ b/style/FeatherBB/view/profile/menu.php
@@ -22,32 +22,32 @@
 					<li<?php if ($page == 'essentials') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
 					<li<?php if ($page == 'personal') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
 					<li<?php if ($page == 'messaging') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
 <?php if ($feather->forum_settings['o_avatars'] == '1' || $feather->forum_settings['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
 <?php endif;
     ?>					<li<?php if ($page == 'display') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
 					<li<?php if ($page == 'privacy') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
 <?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
diff --git a/style/FeatherBB/view/profile/section_admin.php b/style/FeatherBB/view/profile/section_admin.php
index 18ba2f12..05d190f4 100644
--- a/style/FeatherBB/view/profile/section_admin.php
+++ b/style/FeatherBB/view/profile/section_admin.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php echo feather_escape($user['username']).' - '.__('Section admin') ?></span></h2>
 		<div class="box">
-			<form id="profile7" method="post" action="<?php echo get_link('user/'.$id.'/section/admin/') ?>">
+			<form id="profile7" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/admin/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
diff --git a/style/FeatherBB/view/profile/section_display.php b/style/FeatherBB/view/profile/section_display.php
index ced4459f..209bf9b5 100644
--- a/style/FeatherBB/view/profile/section_display.php
+++ b/style/FeatherBB/view/profile/section_display.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section display') ?></span></h2>
 	<div class="box">
-		<form id="profile5" method="post" action="<?php echo get_link('user/'.$id.'/section/display/') ?>">
+		<form id="profile5" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/display/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php
diff --git a/style/FeatherBB/view/profile/section_essentials.php b/style/FeatherBB/view/profile/section_essentials.php
index 0050f89c..107cfeaa 100644
--- a/style/FeatherBB/view/profile/section_essentials.php
+++ b/style/FeatherBB/view/profile/section_essentials.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section essentials') ?></span></h2>
 	<div class="box">
-		<form id="profile1" method="post" action="<?php echo get_link('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
+		<form id="profile1" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -24,7 +24,7 @@
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo $feather->url->get_link('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
@@ -241,7 +241,7 @@
 				<fieldset>
 					<legend><?php _e('User activity') ?></legend>
 					<div class="infldset">
-						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
 						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
 						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
diff --git a/style/FeatherBB/view/profile/section_messaging.php b/style/FeatherBB/view/profile/section_messaging.php
index d944ee43..91532065 100644
--- a/style/FeatherBB/view/profile/section_messaging.php
+++ b/style/FeatherBB/view/profile/section_messaging.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section messaging') ?></span></h2>
 	<div class="box">
-		<form id="profile3" method="post" action="<?php echo get_link('user/'.$id.'/section/messaging/') ?>">
+		<form id="profile3" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/messaging/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/profile/section_personal.php b/style/FeatherBB/view/profile/section_personal.php
index a765e0aa..f9d9fea8 100644
--- a/style/FeatherBB/view/profile/section_personal.php
+++ b/style/FeatherBB/view/profile/section_personal.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personal') ?></span></h2>
 	<div class="box">
-		<form id="profile2" method="post" action="<?php echo get_link('user/'.$id.'/section/personal/') ?>">
+		<form id="profile2" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/personal/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/profile/section_personality.php b/style/FeatherBB/view/profile/section_personality.php
index 2b8f9c82..a1df5d8d 100644
--- a/style/FeatherBB/view/profile/section_personality.php
+++ b/style/FeatherBB/view/profile/section_personality.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personality') ?></span></h2>
 	<div class="box">
-		<form id="profile4" method="post" action="<?php echo get_link('user/'.$id.'/section/personality/') ?>">
+		<form id="profile4" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php if ($feather->forum_settings['o_avatars'] == '1'): ?>				<div class="inform">
@@ -39,10 +39,10 @@
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
diff --git a/style/FeatherBB/view/profile/section_privacy.php b/style/FeatherBB/view/profile/section_privacy.php
index 1d972113..b3262b07 100644
--- a/style/FeatherBB/view/profile/section_privacy.php
+++ b/style/FeatherBB/view/profile/section_privacy.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section privacy') ?></span></h2>
 	<div class="box">
-		<form id="profile6" method="post" action="<?php echo get_link('user/'.$id.'/section/privacy/') ?>">
+		<form id="profile6" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/privacy/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/profile/upload_avatar.php b/style/FeatherBB/view/profile/upload_avatar.php
index 91fb9425..a1cda00a 100644
--- a/style/FeatherBB/view/profile/upload_avatar.php
+++ b/style/FeatherBB/view/profile/upload_avatar.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Upload avatar') ?></span></h2>
 	<div class="box">
-		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
+		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo $feather->url->get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/register/rules.php b/style/FeatherBB/view/register/rules.php
index 7f986063..edb24b38 100644
--- a/style/FeatherBB/view/register/rules.php
+++ b/style/FeatherBB/view/register/rules.php
@@ -17,7 +17,7 @@
 <div id="rules" class="blockform">
 	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
 	<div class="box">
-		<form method="get" action="<?php echo get_link('register/') ?>">
+		<form method="get" action="<?php echo $feather->url->get_link('register/') ?>">
 			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Rules legend') ?></legend>
diff --git a/style/FeatherBB/view/search/footer.php b/style/FeatherBB/view/search/footer.php
index a73ed5aa..1a77744e 100644
--- a/style/FeatherBB/view/search/footer.php
+++ b/style/FeatherBB/view/search/footer.php
@@ -31,7 +31,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
 <?php echo(!empty($search['forum_actions']) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $search['forum_actions']).'</p>'."\n" : '') ?>
diff --git a/style/FeatherBB/view/search/header.php b/style/FeatherBB/view/search/header.php
index 01af597a..5d6eed99 100644
--- a/style/FeatherBB/view/search/header.php
+++ b/style/FeatherBB/view/search/header.php
@@ -17,7 +17,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
 		<div class="pagepost">
diff --git a/style/FeatherBB/view/search/posts.php b/style/FeatherBB/view/search/posts.php
index c575f9c2..def30d38 100644
--- a/style/FeatherBB/view/search/posts.php
+++ b/style/FeatherBB/view/search/posts.php
@@ -22,7 +22,7 @@
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
     _e('Re').' ';
-} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
+} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
 		<div class="postbody">
@@ -46,8 +46,8 @@
 		<div class="postfoot clearb">
 			<div class="postfootright">
 				<ul>
-					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
-					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
+					<li><span><a href="<?php echo $feather->url->get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
+					<li><span><a href="<?php echo $feather->url->get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
 				</ul>
 			</div>
 		</div>
diff --git a/style/FeatherBB/view/search/topics.php b/style/FeatherBB/view/search/topics.php
index af843193..fc7df148 100644
--- a/style/FeatherBB/view/search/topics.php
+++ b/style/FeatherBB/view/search/topics.php
@@ -25,5 +25,5 @@
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
 	<td class="tc3"><?php echo forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
+	<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
 </tr>
\ No newline at end of file
diff --git a/style/FeatherBB/view/userlist.php b/style/FeatherBB/view/userlist.php
index 26c24027..fb8dd579 100644
--- a/style/FeatherBB/view/userlist.php
+++ b/style/FeatherBB/view/userlist.php
@@ -87,7 +87,7 @@
             foreach ($userlist_data as $user) {
                 ?>
 					<tr>
-						<td class="tcl"><?php echo '<a href="'.get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
+						<td class="tcl"><?php echo '<a href="'.$feather->url->get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
 						<td class="tc2"><?php echo get_title($user) ?></td>
 	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo forum_number_format($user['num_posts']) ?></td>
 	<?php endif;
diff --git a/style/FeatherBB/view/viewforum.php b/style/FeatherBB/view/viewforum.php
index a9673fa0..1c696ed0 100644
--- a/style/FeatherBB/view/viewforum.php
+++ b/style/FeatherBB/view/viewforum.php
@@ -17,7 +17,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -92,7 +92,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/viewtopic.php b/style/FeatherBB/view/viewtopic.php
index e982045b..cfd4c4c5 100644
--- a/style/FeatherBB/view/viewtopic.php
+++ b/style/FeatherBB/view/viewtopic.php
@@ -18,8 +18,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -40,7 +40,7 @@
     echo ' blockpost1';
 }
     ?>">
-	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
+	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -108,8 +108,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 <?php echo $subscraction ?>
 		<div class="clearer"></div>
@@ -126,7 +126,7 @@
 <div id="quickpost" class="blockform">
 	<h2><span><?php _e('Quick post') ?></span></h2>
 	<div class="box">
-		<form id="quickpostform" method="post" action="<?php echo get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="quickpostform" method="post" action="<?php echo $feather->url->get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -163,13 +163,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>
diff --git a/view/admin/bans/admin_bans.php b/view/admin/bans/admin_bans.php
index 3d714e7f..50e72e76 100644
--- a/view/admin/bans/admin_bans.php
+++ b/view/admin/bans/admin_bans.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('New ban head') ?></span></h2>
 		<div class="box">
-			<form id="bans" method="post" action="<?php echo get_link('admin/bans/add/') ?>">
+			<form id="bans" method="post" action="<?php echo $feather->url->get_link('admin/bans/add/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
@@ -39,7 +39,7 @@
 
 		<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
 		<div class="box">
-			<form id="find_bans" method="get" action="<?php echo get_link('admin/bans/') ?>">
+			<form id="find_bans" method="get" action="<?php echo $feather->url->get_link('admin/bans/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
 				<div class="inform">
diff --git a/view/admin/bans/search_ban.php b/view/admin/bans/search_ban.php
index 0d057182..676b3e63 100644
--- a/view/admin/bans/search_ban.php
+++ b/view/admin/bans/search_ban.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -55,8 +55,8 @@
 					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? feather_escape($cur_ban['ip']) : '&#160;' ?></td>
 					<td class="tc4"><?php echo format_time($cur_ban['expire'], true) ?></td>
 					<td class="tc5"><?php echo($cur_ban['message'] != '') ? feather_escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.get_link('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
-					<td class="tcr"><?php echo '<a href="'.get_link('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.get_link('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
+					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get_link('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get_link('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
 				</tr>
 <?php
 
@@ -78,8 +78,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
         <ul class="crumbs">
-            <li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+            <li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+            <li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
             <li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
         </ul>
 		<div class="clearer"></div>
diff --git a/view/admin/categories.php b/view/admin/categories.php
index c8786528..370838ac 100644
--- a/view/admin/categories.php
+++ b/view/admin/categories.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Add categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/categories/add/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/categories/add/') ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('Add categories subhead') ?></legend>
@@ -27,7 +27,7 @@
 									<td>
 										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
-										<span><?php printf(__('Add category help'), '<a href="'.get_link('admin/forums').'">'.__('Forums').'</a>') ?></span>
+										<span><?php printf(__('Add category help'), '<a href="'.$feather->url->get_link('admin/forums').'">'.__('Forums').'</a>') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -39,7 +39,7 @@
 
 <?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/categories/delete') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/categories/delete') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
@@ -71,7 +71,7 @@
 
 <?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/categories/edit/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/categories/edit/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/view/admin/censoring.php b/view/admin/censoring.php
index cf080869..69977dfa 100644
--- a/view/admin/censoring.php
+++ b/view/admin/censoring.php
@@ -16,13 +16,13 @@
 	<div class="blockform">
 		<h2><span><?php _e('Censoring head') ?></span></h2>
 		<div class="box">
-			<form id="censoring" method="post" action="<?php echo get_link('admin/censoring/') ?>">
+			<form id="censoring" method="post" action="<?php echo $feather->url->get_link('admin/censoring/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('Add word subhead') ?></legend>
 						<div class="infldset">
-							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
+							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.$feather->url->get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.$feather->url->get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
 							<table>
 							<thead>
 								<tr>
diff --git a/view/admin/forums/admin_forums.php b/view/admin/forums/admin_forums.php
index e966e6f5..cbd5a6c0 100644
--- a/view/admin/forums/admin_forums.php
+++ b/view/admin/forums/admin_forums.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Add forum head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/forums/add') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/forums/add') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if (!empty($cat_list)) {
@@ -65,7 +65,7 @@
     ?>
 		<h2 class="block2"><span><?php _e('Manage forums head') ?></span></h2>
 		<div class="box">
-			<form id="edforum" method="post" action="<?php echo get_link('admin/forums/') ?>">
+			<form id="edforum" method="post" action="<?php echo $feather->url->get_link('admin/forums/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
 <?php
@@ -88,7 +88,7 @@
 	foreach ($cat_data['cat_forums'] as $forum) {
         ?>
 								<tr>
-									<td class="tcl"><a href="<?php echo get_link('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo get_link('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
+									<td class="tcl"><a href="<?php echo $feather->url->get_link('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get_link('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
 									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
 									<td class="tcr"><strong><?php echo feather_escape($forum['forum_name']) ?></strong></td>
 								</tr>
diff --git a/view/admin/forums/delete_forum.php b/view/admin/forums/delete_forum.php
index 6a5263ba..86954f4d 100644
--- a/view/admin/forums/delete_forum.php
+++ b/view/admin/forums/delete_forum.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Confirm delete head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/view/admin/forums/permissions.php b/view/admin/forums/permissions.php
index df092f46..8f358170 100644
--- a/view/admin/forums/permissions.php
+++ b/view/admin/forums/permissions.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Edit forum head') ?></span></h2>
 		<div class="box">
-			<form id="edit_forum" method="post" action="<?php echo get_link('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
+			<form id="edit_forum" method="post" action="<?php echo $feather->url->get_link('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
 				<div class="inform">
diff --git a/view/admin/groups/admin_groups.php b/view/admin/groups/admin_groups.php
index aff5db98..d776239e 100644
--- a/view/admin/groups/admin_groups.php
+++ b/view/admin/groups/admin_groups.php
@@ -18,7 +18,7 @@
 		<div class="box">
 				<div class="inform">
 					<fieldset>
-                        <form id="groups" method="post" action="<?php echo get_link('admin/groups/add/') ?>">
+                        <form id="groups" method="post" action="<?php echo $feather->url->get_link('admin/groups/add/') ?>">
                         <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 						<legend><?php _e('Add group subhead') ?></legend>
 						<div class="infldset">
@@ -51,7 +51,7 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-                        <form id="groups" method="post" action="<?php echo get_link('admin/groups/') ?>">
+                        <form id="groups" method="post" action="<?php echo $feather->url->get_link('admin/groups/') ?>">
                         	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 						<legend><?php _e('Default group subhead') ?></legend>
 						<div class="infldset">
@@ -95,7 +95,7 @@
 							<table>
 <?php
 foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.get_link('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.get_link('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get_link('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get_link('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
 }
 
 ?>
diff --git a/view/admin/groups/confirm_delete.php b/view/admin/groups/confirm_delete.php
index ca595ab3..df490091 100644
--- a/view/admin/groups/confirm_delete.php
+++ b/view/admin/groups/confirm_delete.php
@@ -16,10 +16,10 @@
 	<div class="blockform">
 		<h2><span><?php _e('Group delete head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
-				<input type="hidden" name="group_to_delete" value="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>" />
+				<input type="hidden" name="group_to_delete" value="<?php echo $feather->url->get_link('admin/groups/delete/'.$id.'/') ?>" />
 					<fieldset>
 						<legend><?php _e('Confirm delete subhead') ?></legend>
 						<div class="infldset">
diff --git a/view/admin/groups/delete_group.php b/view/admin/groups/delete_group.php
index aea315d0..a878dcbb 100644
--- a/view/admin/groups/delete_group.php
+++ b/view/admin/groups/delete_group.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Delete group head') ?></span></h2>
 		<div class="box">
-			<form id="groups" method="post" action="<?php echo get_link('admin/groups/delete/'.$id.'/') ?>">
+			<form id="groups" method="post" action="<?php echo $feather->url->get_link('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/view/admin/index.php b/view/admin/index.php
index f369b039..710a0e0e 100644
--- a/view/admin/index.php
+++ b/view/admin/index.php
@@ -35,7 +35,7 @@
 <?php if ($install_file_exists) : ?>
 		<h2 class="block2"><span><?php _e('Alerts head') ?></span></h2>
 		<div id="adalerts" class="box">
-			<p><?php printf(__('Install file exists'), '<a href="'.get_link('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
+			<p><?php printf(__('Install file exists'), '<a href="'.$feather->url->get_link('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
 		</div>
 <?php endif; ?>
 
@@ -45,11 +45,11 @@
 				<dl>
 					<dt><?php _e('FeatherBB version label') ?></dt>
 					<dd>
-						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
+						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.$feather->url->get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
 					</dd>
 					<dt><?php _e('Server statistics label') ?></dt>
 					<dd>
-						<a href="<?php echo get_link('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
+						<a href="<?php echo $feather->url->get_link('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
 					</dd>
 					<dt><?php _e('Support label') ?></dt>
 					<dd>
diff --git a/view/admin/maintenance/admin_maintenance.php b/view/admin/maintenance/admin_maintenance.php
index 068b914b..6bd9ade5 100644
--- a/view/admin/maintenance/admin_maintenance.php
+++ b/view/admin/maintenance/admin_maintenance.php
@@ -16,13 +16,13 @@
 	<div class="blockform">
 		<h2><span><?php _e('Maintenance head') ?></span></h2>
 		<div class="box">
-			<form method="get" action="<?php echo get_link('admin/maintenance/') ?>">
+			<form method="get" action="<?php echo $feather->url->get_link('admin/maintenance/') ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="rebuild" />
 					<fieldset>
 						<legend><?php _e('Rebuild index subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Rebuild index info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<p><?php printf(__('Rebuild index info'), '<a href="'.$feather->url->get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php _e('Posts per cycle label') ?></th>
@@ -52,7 +52,7 @@
 				</div>
 			</form>
 
-			<form method="post" action="<?php echo get_link('admin/maintenance/') ?>" onsubmit="return process_form(this)">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/maintenance/') ?>" onsubmit="return process_form(this)">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
@@ -87,7 +87,7 @@
 									</td>
 								</tr>
 							</table>
-							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.$feather->url->get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
 							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php _e('Prune') ?>" tabindex="8" /></div>
 						</div>
 					</fieldset>
diff --git a/view/admin/maintenance/prune.php b/view/admin/maintenance/prune.php
index 9e3b0d2b..fcfd7918 100644
--- a/view/admin/maintenance/prune.php
+++ b/view/admin/maintenance/prune.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Prune head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/maintenance/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/maintenance/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
diff --git a/view/admin/maintenance/rebuild.php b/view/admin/maintenance/rebuild.php
index 5bd6ffc0..b4f9434b 100644
--- a/view/admin/maintenance/rebuild.php
+++ b/view/admin/maintenance/rebuild.php
@@ -6,33 +6,12 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
 }
 ?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><?php echo generate_page_title($page_title) ?></title>
-<style type="text/css">
-body {
-	font: 12px Verdana, Arial, Helvetica, sans-serif;
-	color: #333333;
-	background-color: #FFFFFF
-}
-
-h1 {
-	font-size: 16px;
-	font-weight: normal;
-}
-</style>
-</head>
-<body>
-
 <h1><?php _e('Rebuilding index info') ?></h1>
-<hr />
\ No newline at end of file
+<script type="text/javascript">window.location="<?= $feather->url->get_link('admin/maintenance/').$query_str ?>"</script>
+<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.$feather->url->get_link('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>
diff --git a/view/admin/menu.php b/view/admin/menu.php
index d958a4ab..abc7f7ed 100644
--- a/view/admin/menu.php
+++ b/view/admin/menu.php
@@ -22,20 +22,20 @@
 					<li<?php if ($page == 'index') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/') ?>"><?php _e('Index') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Index') ?></a></li>
 					<li<?php if ($page == 'users') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 <?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
 <?php endif;
     if ($is_admin || $feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
@@ -51,35 +51,35 @@
 					<li<?php if ($page == 'options') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/options/') ?>"><?php _e('Options') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/options/') ?>"><?php _e('Options') ?></a></li>
 					<li<?php if ($page == 'permissions') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
 					<li<?php if ($page == 'categories') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
 					<li<?php if ($page == 'forums') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
 					<li<?php if ($page == 'groups') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
 					<li<?php if ($page == 'censoring') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
 					<li<?php if ($page == 'parser') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
 					<li<?php if ($page == 'maintenance') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo get_link('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get_link('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
 				</ul>
 			</div>
 		</div>
@@ -97,7 +97,7 @@
 <?php
 
         foreach ($plugins as $plugin_name => $plugin) {
-            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.get_link('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
+            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
         }
 
         ?>
diff --git a/view/admin/options.php b/view/admin/options.php
index 88c2c0b6..161058ea 100644
--- a/view/admin/options.php
+++ b/view/admin/options.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Options head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/options/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/options/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
@@ -421,7 +421,7 @@
 										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
+										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.$feather->url->get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
diff --git a/view/admin/parser.php b/view/admin/parser.php
index e32369b6..df29eb0d 100644
--- a/view/admin/parser.php
+++ b/view/admin/parser.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php echo $lang_admin_parser['Parser head'] ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/parser/') ?>" enctype="multipart/form-data">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/parser/') ?>" enctype="multipart/form-data">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop">
 					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
diff --git a/view/admin/permissions.php b/view/admin/permissions.php
index 2b1bf413..e8201e72 100644
--- a/view/admin/permissions.php
+++ b/view/admin/permissions.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Permissions head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/permissions/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/permissions/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
diff --git a/view/admin/reports.php b/view/admin/reports.php
index 63251681..163e25b0 100644
--- a/view/admin/reports.php
+++ b/view/admin/reports.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('New reports head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo get_link('admin/reports/') ?>">
+			<form method="post" action="<?php echo $feather->url->get_link('admin/reports/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if (!empty($report_data)) {
@@ -28,10 +28,10 @@
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get_link('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => $feather->url->get_link('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
@@ -74,14 +74,14 @@
         ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.get_link('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
+						<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get_link('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => get_link('forum/'.$report['forum_id'].'/'.url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => get_link('forum/'.$report['topic_id'].'/'.url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get_link('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => $feather->url->get_link('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?></th>
diff --git a/view/admin/statistics.php b/view/admin/statistics.php
index 5306b027..d7e779d6 100644
--- a/view/admin/statistics.php
+++ b/view/admin/statistics.php
@@ -25,7 +25,7 @@
 <?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
 					<dd>
 						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
-						<?php printf(__('Environment data version'), phpversion(), '<a href="'.get_link('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
+						<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->url->get_link('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
 						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
 					</dd>
 					<dt><?php _e('Database label') ?></dt>
diff --git a/view/admin/users/admin_users.php b/view/admin/users/admin_users.php
index 27e99a16..20b0a521 100644
--- a/view/admin/users/admin_users.php
+++ b/view/admin/users/admin_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('User search head') ?></span></h2>
 		<div class="box">
-			<form id="find_user" method="get" action="<?php echo get_link('admin/users/') ?>">
+			<form id="find_user" method="get" action="<?php echo $feather->url->get_link('admin/users/') ?>">
 				<p class="submittop"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="1" /></p>
 				<div class="inform">
 					<fieldset>
@@ -150,7 +150,7 @@
 
 		<h2 class="block2"><span><?php _e('IP search head') ?></span></h2>
 		<div class="box">
-			<form method="get" action="<?php echo get_link('admin/users/') ?>">
+			<form method="get" action="<?php echo $feather->url->get_link('admin/users/') ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('IP search subhead') ?></legend>
diff --git a/view/admin/users/ban_users.php b/view/admin/users/ban_users.php
index e929c043..1d7bebd2 100644
--- a/view/admin/users/ban_users.php
+++ b/view/admin/users/ban_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Ban users') ?></span></h2>
 		<div class="box">
-			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo get_link('admin/users') ?>">
+			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo $feather->url->get_link('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
diff --git a/view/admin/users/delete_users.php b/view/admin/users/delete_users.php
index a82c22ec..29630f72 100644
--- a/view/admin/users/delete_users.php
+++ b/view/admin/users/delete_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Delete users') ?></span></h2>
 		<div class="box">
-			<form name="confirm_del_users" method="post" action="<?php echo get_link('admin/users') ?>">
+			<form name="confirm_del_users" method="post" action="<?php echo $feather->url->get_link('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
diff --git a/view/admin/users/find_users.php b/view/admin/users/find_users.php
index d426177d..168ff16b 100644
--- a/view/admin/users/find_users.php
+++ b/view/admin/users/find_users.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -28,7 +28,7 @@
 </div>
 
 
-<form id="search-users-form" action="<?php echo get_link('admin/users/') ?>" method="post">
+<form id="search-users-form" action="<?php echo $feather->url->get_link('admin/users/') ?>" method="post">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <div id="users2" class="blocktable">
 	<h2><span><?php _e('Results head') ?></span></h2>
@@ -54,12 +54,12 @@
         foreach ($user_data as $user) {
             ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
 					<td class="tc2"><a href="mailto:<?php echo feather_escape($user['email']) ?>"><?php echo feather_escape($user['email']) ?></a></td>
 					<td class="tc3"><?php echo $user['user_title'] ?></td>
 					<td class="tc4"><?php echo forum_number_format($user['num_posts']) ?></td>
 					<td class="tc5"><?php echo($user['admin_note'] != '') ? feather_escape($user['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
 <?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
 <?php endif;
             ?>
@@ -90,8 +90,8 @@
     ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/view/admin/users/move_users.php b/view/admin/users/move_users.php
index d43303e8..ee7e6419 100644
--- a/view/admin/users/move_users.php
+++ b/view/admin/users/move_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Move users') ?></span></h2>
 		<div class="box">
-			<form name="confirm_move_users" method="post" action="<?php echo get_link('admin/users/') ?>">
+			<form name="confirm_move_users" method="post" action="<?php echo $feather->url->get_link('admin/users/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
 				<div class="inform">
diff --git a/view/admin/users/search_ip.php b/view/admin/users/search_ip.php
index a17e7ac5..ad3ce72a 100644
--- a/view/admin/users/search_ip.php
+++ b/view/admin/users/search_ip.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -45,10 +45,10 @@
         foreach ($ip_data as $ip) {
             ?>
 				<tr>
-					<td class="tcl"><a href="<?php echo get_link('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
+					<td class="tcl"><a href="<?php echo $feather->url->get_link('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
 					<td class="tc2"><?php echo format_time($ip['last_used']) ?></td>
 					<td class="tc3"><?php echo $ip['used_times'] ?></td>
-					<td class="tcr"><a href="<?php echo get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
+					<td class="tcr"><a href="<?php echo $feather->url->get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
 				</tr>
 <?php
 
@@ -70,8 +70,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/view/admin/users/show_users.php b/view/admin/users/show_users.php
index 4ab008c7..b662779c 100644
--- a/view/admin/users/show_users.php
+++ b/view/admin/users/show_users.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -51,12 +51,12 @@
             if (isset($info['user_data'][$cur_poster['poster_id']])) {
                 ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.get_link('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.feather_escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get_link('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.feather_escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
 					<td class="tc2"><a href="mailto:<?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
 					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
 					<td class="tc4"><?php echo forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
 					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? feather_escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.get_link('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
 				</tr>
 <?php
 
@@ -91,8 +91,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/view/delete.php b/view/delete.php
index 8a2d6959..be4aa85c 100644
--- a/view/delete.php
+++ b/view/delete.php
@@ -17,8 +17,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="index.php"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>
@@ -27,7 +27,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Delete post') ?></span></h2>
 	<div class="box">
-		<form method="post" action="<?php echo get_link('delete/'.$id.'/') ?>">
+		<form method="post" action="<?php echo $feather->url->get_link('delete/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
diff --git a/view/edit.php b/view/edit.php
index 829d0c17..0cce7ef5 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -20,8 +20,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$cur_post['tid'].'/'.url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
 		</ul>
 	</div>
@@ -76,7 +76,7 @@
 <div id="editform" class="blockform">
 	<h2><span><?php _e('Edit post') ?></span></h2>
 	<div class="box">
-		<form id="edit" method="post" action="<?php echo get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
+		<form id="edit" method="post" action="<?php echo $feather->url->get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -89,10 +89,10 @@
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/view/footer.php b/view/footer.php
index 470d5c6b..b02351ce 100644
--- a/view/footer.php
+++ b/view/footer.php
@@ -72,7 +72,7 @@
 		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
 			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
 			foreach ($cat_data['cat_forums'] as $forum) {
-				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
+				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
 			}
 			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
 		} ?>
diff --git a/view/help.php b/view/help.php
index d171ddab..af94b274 100644
--- a/view/help.php
+++ b/view/help.php
@@ -43,17 +43,17 @@
 		<p><?php _e('Links info') ?></p>
 		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
 		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('/help') ?>"><?php _e('This help page') ?></a></samp></p>
+		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('/help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
 		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
-		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php echo get_link('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('post/1/#p1') ?>"><?php echo get_link('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('forum/1/') ?>"><?php echo get_link('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo get_link('user/2/') ?>"><?php echo get_link('user/2/') ?></a></samp></p>
+		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('topic/1/') ?>"><?php echo $feather->url->get_link('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('post/1/#p1') ?>"><?php echo $feather->url->get_link('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('forum/1/') ?>"><?php echo $feather->url->get_link('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('user/2/') ?>"><?php echo $feather->url->get_link('user/2/') ?></a></samp></p>
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
diff --git a/view/login/form.php b/view/login/form.php
index 13d1744b..76d9cb3d 100644
--- a/view/login/form.php
+++ b/view/login/form.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Login') ?></span></h2>
 	<div class="box">
-		<form id="login" method="post" action="<?php echo get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
+		<form id="login" method="post" action="<?php echo $feather->url->get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -32,7 +32,7 @@
 						</div>
 
 						<p class="clearb"><?php _e('Login info') ?></p>
-						<p class="actions"><span><a href="<?php echo get_link('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo get_link('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
+						<p class="actions"><span><a href="<?php echo $feather->url->get_link('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo $feather->url->get_link('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/login/password_forgotten.php b/view/login/password_forgotten.php
index 41c0a121..d9617fe9 100644
--- a/view/login/password_forgotten.php
+++ b/view/login/password_forgotten.php
@@ -39,7 +39,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Request pass') ?></span></h2>
 	<div class="box">
-		<form id="request_pass" method="post" action="<?php echo get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
+		<form id="request_pass" method="post" action="<?php echo $feather->url->get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/misc/email.php b/view/misc/email.php
index 06f96f55..b4ed730d 100644
--- a/view/misc/email.php
+++ b/view/misc/email.php
@@ -16,7 +16,7 @@
 <div id="emailform" class="blockform">
 	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
 	<div class="box">
-		<form id="email" method="post" action="<?php echo get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="email" method="post" action="<?php echo $feather->url->get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/misc/report.php b/view/misc/report.php
index 252042c7..1b55893b 100644
--- a/view/misc/report.php
+++ b/view/misc/report.php
@@ -17,8 +17,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_post['fid'].'/'.url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
 		</ul>
 	</div>
@@ -27,7 +27,7 @@
 <div id="reportform" class="blockform">
 	<h2><span><?php _e('Report post') ?></span></h2>
 	<div class="box">
-		<form id="report" method="post" action="<?php echo get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="report" method="post" action="<?php echo $feather->url->get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
index 8b636222..f6819d21 100644
--- a/view/moderate/moderator_forum.php
+++ b/view/moderate/moderator_forum.php
@@ -18,7 +18,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -28,7 +28,7 @@
 	</div>
 </div>
 
-<form method="post" action="<?php echo get_link('moderate/forum/'.$id.'/') ?>">
+<form method="post" action="<?php echo $feather->url->get_link('moderate/forum/'.$id.'/') ?>">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <input type="hidden" name="page" value="<?php echo feather_escape($p) ?>" />
 <div id="vf" class="blocktable">
@@ -92,7 +92,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/view/moderate/posts_view.php b/view/moderate/posts_view.php
index 482a1c49..ad68aa3d 100644
--- a/view/moderate/posts_view.php
+++ b/view/moderate/posts_view.php
@@ -17,8 +17,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -42,7 +42,7 @@
     echo ' blockpost1';
 }
     ?>">
-		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
+		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<div class="postbody">
@@ -85,8 +85,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/view/post.php b/view/post.php
index ee2531da..1030f8d3 100644
--- a/view/post.php
+++ b/view/post.php
@@ -18,10 +18,10 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
-<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo get_link('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_posting['subject']) ?></a></li>
+<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_posting['subject']) ?></a></li>
 <?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
 		</ul>
 	</div>
@@ -121,10 +121,10 @@
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/view/profile/change_mail.php b/view/profile/change_mail.php
index f8d25e99..0c97e20c 100644
--- a/view/profile/change_mail.php
+++ b/view/profile/change_mail.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Change email') ?></span></h2>
 	<div class="box">
-		<form id="change_email" method="post" action="<?php echo get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
+		<form id="change_email" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/profile/change_pass.php b/view/profile/change_pass.php
index 3f4285fb..39cd0ed1 100644
--- a/view/profile/change_pass.php
+++ b/view/profile/change_pass.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Change pass') ?></span></h2>
 	<div class="box">
-		<form id="change_pass" method="post" action="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
+		<form id="change_pass" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
diff --git a/view/profile/delete_user.php b/view/profile/delete_user.php
index 0fd42f52..c950017c 100644
--- a/view/profile/delete_user.php
+++ b/view/profile/delete_user.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Confirm delete user') ?></span></h2>
 	<div class="box">
-		<form id="confirm_del_user" method="post" action="<?php echo get_link('user/'.$id.'/') ?>">
+		<form id="confirm_del_user" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/profile/menu.php b/view/profile/menu.php
index 12b3b47f..73f384c8 100644
--- a/view/profile/menu.php
+++ b/view/profile/menu.php
@@ -22,32 +22,32 @@
 					<li<?php if ($page == 'essentials') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
 					<li<?php if ($page == 'personal') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
 					<li<?php if ($page == 'messaging') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
 <?php if ($feather->forum_settings['o_avatars'] == '1' || $feather->forum_settings['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
 <?php endif;
     ?>					<li<?php if ($page == 'display') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
 					<li<?php if ($page == 'privacy') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
 <?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo get_link('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
diff --git a/view/profile/section_admin.php b/view/profile/section_admin.php
index 18ba2f12..05d190f4 100644
--- a/view/profile/section_admin.php
+++ b/view/profile/section_admin.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php echo feather_escape($user['username']).' - '.__('Section admin') ?></span></h2>
 		<div class="box">
-			<form id="profile7" method="post" action="<?php echo get_link('user/'.$id.'/section/admin/') ?>">
+			<form id="profile7" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/admin/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
index ced4459f..209bf9b5 100644
--- a/view/profile/section_display.php
+++ b/view/profile/section_display.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section display') ?></span></h2>
 	<div class="box">
-		<form id="profile5" method="post" action="<?php echo get_link('user/'.$id.'/section/display/') ?>">
+		<form id="profile5" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/display/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php
diff --git a/view/profile/section_essentials.php b/view/profile/section_essentials.php
index 0050f89c..107cfeaa 100644
--- a/view/profile/section_essentials.php
+++ b/view/profile/section_essentials.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section essentials') ?></span></h2>
 	<div class="box">
-		<form id="profile1" method="post" action="<?php echo get_link('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
+		<form id="profile1" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -24,7 +24,7 @@
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo get_link('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo $feather->url->get_link('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
@@ -241,7 +241,7 @@
 				<fieldset>
 					<legend><?php _e('User activity') ?></legend>
 					<div class="infldset">
-						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
 						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
 						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
diff --git a/view/profile/section_messaging.php b/view/profile/section_messaging.php
index d944ee43..91532065 100644
--- a/view/profile/section_messaging.php
+++ b/view/profile/section_messaging.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section messaging') ?></span></h2>
 	<div class="box">
-		<form id="profile3" method="post" action="<?php echo get_link('user/'.$id.'/section/messaging/') ?>">
+		<form id="profile3" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/messaging/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/profile/section_personal.php b/view/profile/section_personal.php
index a765e0aa..f9d9fea8 100644
--- a/view/profile/section_personal.php
+++ b/view/profile/section_personal.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personal') ?></span></h2>
 	<div class="box">
-		<form id="profile2" method="post" action="<?php echo get_link('user/'.$id.'/section/personal/') ?>">
+		<form id="profile2" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/personal/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/profile/section_personality.php b/view/profile/section_personality.php
index 2b8f9c82..a1df5d8d 100644
--- a/view/profile/section_personality.php
+++ b/view/profile/section_personality.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personality') ?></span></h2>
 	<div class="box">
-		<form id="profile4" method="post" action="<?php echo get_link('user/'.$id.'/section/personality/') ?>">
+		<form id="profile4" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php if ($feather->forum_settings['o_avatars'] == '1'): ?>				<div class="inform">
@@ -39,10 +39,10 @@
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
diff --git a/view/profile/section_privacy.php b/view/profile/section_privacy.php
index 1d972113..b3262b07 100644
--- a/view/profile/section_privacy.php
+++ b/view/profile/section_privacy.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section privacy') ?></span></h2>
 	<div class="box">
-		<form id="profile6" method="post" action="<?php echo get_link('user/'.$id.'/section/privacy/') ?>">
+		<form id="profile6" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/privacy/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
index 91fb9425..a1cda00a 100644
--- a/view/profile/upload_avatar.php
+++ b/view/profile/upload_avatar.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Upload avatar') ?></span></h2>
 	<div class="box">
-		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
+		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo $feather->url->get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/register/rules.php b/view/register/rules.php
index 7f986063..edb24b38 100644
--- a/view/register/rules.php
+++ b/view/register/rules.php
@@ -17,7 +17,7 @@
 <div id="rules" class="blockform">
 	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
 	<div class="box">
-		<form method="get" action="<?php echo get_link('register/') ?>">
+		<form method="get" action="<?php echo $feather->url->get_link('register/') ?>">
 			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Rules legend') ?></legend>
diff --git a/view/search/footer.php b/view/search/footer.php
index a73ed5aa..1a77744e 100644
--- a/view/search/footer.php
+++ b/view/search/footer.php
@@ -31,7 +31,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
 <?php echo(!empty($search['forum_actions']) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $search['forum_actions']).'</p>'."\n" : '') ?>
diff --git a/view/search/header.php b/view/search/header.php
index 01af597a..5d6eed99 100644
--- a/view/search/header.php
+++ b/view/search/header.php
@@ -17,7 +17,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
 		<div class="pagepost">
diff --git a/view/search/posts.php b/view/search/posts.php
index c575f9c2..def30d38 100644
--- a/view/search/posts.php
+++ b/view/search/posts.php
@@ -22,7 +22,7 @@
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
     _e('Re').' ';
-} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
+} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
 		<div class="postbody">
@@ -46,8 +46,8 @@
 		<div class="postfoot clearb">
 			<div class="postfootright">
 				<ul>
-					<li><span><a href="<?php echo get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
-					<li><span><a href="<?php echo get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
+					<li><span><a href="<?php echo $feather->url->get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
+					<li><span><a href="<?php echo $feather->url->get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
 				</ul>
 			</div>
 		</div>
diff --git a/view/search/topics.php b/view/search/topics.php
index af843193..fc7df148 100644
--- a/view/search/topics.php
+++ b/view/search/topics.php
@@ -25,5 +25,5 @@
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
 	<td class="tc3"><?php echo forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
+	<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
 </tr>
\ No newline at end of file
diff --git a/view/userlist.php b/view/userlist.php
index 26c24027..fb8dd579 100644
--- a/view/userlist.php
+++ b/view/userlist.php
@@ -87,7 +87,7 @@
             foreach ($userlist_data as $user) {
                 ?>
 					<tr>
-						<td class="tcl"><?php echo '<a href="'.get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
+						<td class="tcl"><?php echo '<a href="'.$feather->url->get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
 						<td class="tc2"><?php echo get_title($user) ?></td>
 	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo forum_number_format($user['num_posts']) ?></td>
 	<?php endif;
diff --git a/view/viewforum.php b/view/viewforum.php
index a9673fa0..1c696ed0 100644
--- a/view/viewforum.php
+++ b/view/viewforum.php
@@ -17,7 +17,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -92,7 +92,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
 		<div class="clearer"></div>
diff --git a/view/viewtopic.php b/view/viewtopic.php
index e982045b..cfd4c4c5 100644
--- a/view/viewtopic.php
+++ b/view/viewtopic.php
@@ -18,8 +18,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -40,7 +40,7 @@
     echo ' blockpost1';
 }
     ?>">
-	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
+	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -108,8 +108,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 <?php echo $subscraction ?>
 		<div class="clearer"></div>
@@ -126,7 +126,7 @@
 <div id="quickpost" class="blockform">
 	<h2><span><?php _e('Quick post') ?></span></h2>
 	<div class="box">
-		<form id="quickpostform" method="post" action="<?php echo get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="quickpostform" method="post" action="<?php echo $feather->url->get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -163,13 +163,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>

From 42a8cc3f73007cfe99fead385ba0fbd57c3b73a7 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 28 Aug 2015 22:04:23 +0200
Subject: [PATCH 236/353] Rename get_link

---
 controller/admin/categories.php               | 16 ++++----
 controller/admin/forums.php                   | 18 ++++-----
 controller/admin/index.php                    |  2 +-
 controller/admin/parser.php                   |  6 +--
 controller/edit.php                           |  2 +-
 controller/install.php                        |  2 +-
 controller/misc.php                           |  2 +-
 controller/moderate.php                       | 10 ++---
 controller/post.php                           |  8 ++--
 controller/profile.php                        |  8 ++--
 controller/register.php                       |  2 +-
 controller/search.php                         |  2 +-
 controller/viewforum.php                      |  8 ++--
 controller/viewtopic.php                      |  6 +--
 extern.php                                    | 14 +++----
 include/classes/url.class.php                 |  4 +-
 include/parser.php                            |  2 +-
 model/admin/bans.php                          |  4 +-
 model/admin/censoring.php                     |  6 +--
 model/admin/groups.php                        |  8 ++--
 model/admin/maintenance.php                   |  2 +-
 model/admin/options.php                       |  2 +-
 model/admin/permissions.php                   |  2 +-
 model/admin/reports.php                       |  2 +-
 model/admin/users.php                         |  6 +--
 model/delete.php                              |  4 +-
 model/index.php                               | 14 +++----
 model/login.php                               |  4 +-
 model/misc.php                                | 14 +++----
 model/moderate.php                            | 26 ++++++------
 model/post.php                                | 18 ++++-----
 model/profile.php                             | 40 +++++++++----------
 model/register.php                            | 10 ++---
 model/search.php                              | 20 +++++-----
 model/viewforum.php                           | 16 ++++----
 model/viewtopic.php                           | 30 +++++++-------
 plugins/test/plugintest.php                   |  4 +-
 .../FeatherBB/view/admin/bans/admin_bans.php  |  4 +-
 .../FeatherBB/view/admin/bans/search_ban.php  | 12 +++---
 style/FeatherBB/view/admin/categories.php     |  8 ++--
 style/FeatherBB/view/admin/censoring.php      |  4 +-
 .../view/admin/forums/admin_forums.php        |  6 +--
 .../view/admin/forums/delete_forum.php        |  2 +-
 .../view/admin/forums/permissions.php         |  2 +-
 .../view/admin/groups/admin_groups.php        |  6 +--
 .../view/admin/groups/confirm_delete.php      |  4 +-
 .../view/admin/groups/delete_group.php        |  2 +-
 style/FeatherBB/view/admin/index.php          |  6 +--
 .../admin/maintenance/admin_maintenance.php   |  8 ++--
 .../view/admin/maintenance/prune.php          |  2 +-
 .../view/admin/maintenance/rebuild.php        |  4 +-
 style/FeatherBB/view/admin/menu.php           | 26 ++++++------
 style/FeatherBB/view/admin/options.php        |  4 +-
 style/FeatherBB/view/admin/parser.php         |  2 +-
 style/FeatherBB/view/admin/permissions.php    |  2 +-
 style/FeatherBB/view/admin/reports.php        | 20 +++++-----
 style/FeatherBB/view/admin/statistics.php     |  2 +-
 .../view/admin/users/admin_users.php          |  4 +-
 .../FeatherBB/view/admin/users/ban_users.php  |  2 +-
 .../view/admin/users/delete_users.php         |  2 +-
 .../FeatherBB/view/admin/users/find_users.php | 14 +++----
 .../FeatherBB/view/admin/users/move_users.php |  2 +-
 .../FeatherBB/view/admin/users/search_ip.php  | 12 +++---
 .../FeatherBB/view/admin/users/show_users.php | 12 +++---
 style/FeatherBB/view/delete.php               |  6 +--
 style/FeatherBB/view/edit.php                 | 14 +++----
 style/FeatherBB/view/footer.new.php           | 18 ++++-----
 style/FeatherBB/view/footer.php               | 18 ++++-----
 style/FeatherBB/view/header.new.php           | 28 ++++++-------
 style/FeatherBB/view/help.php                 | 18 ++++-----
 style/FeatherBB/view/login/form.php           |  4 +-
 .../view/login/password_forgotten.php         |  2 +-
 style/FeatherBB/view/misc/email.php           |  2 +-
 style/FeatherBB/view/misc/report.php          |  6 +--
 .../view/moderate/moderator_forum.php         |  6 +--
 style/FeatherBB/view/moderate/posts_view.php  | 10 ++---
 style/FeatherBB/view/post.php                 | 12 +++---
 style/FeatherBB/view/profile/change_mail.php  |  2 +-
 style/FeatherBB/view/profile/change_pass.php  |  2 +-
 style/FeatherBB/view/profile/delete_user.php  |  2 +-
 style/FeatherBB/view/profile/menu.php         | 14 +++----
 .../FeatherBB/view/profile/section_admin.php  |  2 +-
 .../view/profile/section_display.php          |  2 +-
 .../view/profile/section_essentials.php       |  6 +--
 .../view/profile/section_messaging.php        |  2 +-
 .../view/profile/section_personal.php         |  2 +-
 .../view/profile/section_personality.php      | 10 ++---
 .../view/profile/section_privacy.php          |  2 +-
 .../FeatherBB/view/profile/upload_avatar.php  |  2 +-
 style/FeatherBB/view/register/rules.php       |  2 +-
 style/FeatherBB/view/search/footer.php        |  2 +-
 style/FeatherBB/view/search/header.php        |  2 +-
 style/FeatherBB/view/search/posts.php         |  6 +--
 style/FeatherBB/view/search/topics.php        |  2 +-
 style/FeatherBB/view/userlist.php             |  2 +-
 style/FeatherBB/view/viewforum.php            |  4 +-
 style/FeatherBB/view/viewtopic.php            | 20 +++++-----
 view/admin/bans/admin_bans.php                |  4 +-
 view/admin/bans/search_ban.php                | 12 +++---
 view/admin/categories.php                     |  8 ++--
 view/admin/censoring.php                      |  4 +-
 view/admin/forums/admin_forums.php            |  6 +--
 view/admin/forums/delete_forum.php            |  2 +-
 view/admin/forums/permissions.php             |  2 +-
 view/admin/groups/admin_groups.php            |  6 +--
 view/admin/groups/confirm_delete.php          |  4 +-
 view/admin/groups/delete_group.php            |  2 +-
 view/admin/index.php                          |  6 +--
 view/admin/maintenance/admin_maintenance.php  |  8 ++--
 view/admin/maintenance/prune.php              |  2 +-
 view/admin/maintenance/rebuild.php            |  4 +-
 view/admin/menu.php                           | 26 ++++++------
 view/admin/options.php                        |  4 +-
 view/admin/parser.php                         |  2 +-
 view/admin/permissions.php                    |  2 +-
 view/admin/reports.php                        | 20 +++++-----
 view/admin/statistics.php                     |  2 +-
 view/admin/users/admin_users.php              |  4 +-
 view/admin/users/ban_users.php                |  2 +-
 view/admin/users/delete_users.php             |  2 +-
 view/admin/users/find_users.php               | 14 +++----
 view/admin/users/move_users.php               |  2 +-
 view/admin/users/search_ip.php                | 12 +++---
 view/admin/users/show_users.php               | 12 +++---
 view/delete.php                               |  6 +--
 view/edit.php                                 | 14 +++----
 view/footer.php                               | 18 ++++-----
 view/help.php                                 | 18 ++++-----
 view/login/form.php                           |  4 +-
 view/login/password_forgotten.php             |  2 +-
 view/misc/email.php                           |  2 +-
 view/misc/report.php                          |  6 +--
 view/moderate/moderator_forum.php             |  6 +--
 view/moderate/posts_view.php                  | 10 ++---
 view/post.php                                 | 12 +++---
 view/profile/change_mail.php                  |  2 +-
 view/profile/change_pass.php                  |  2 +-
 view/profile/delete_user.php                  |  2 +-
 view/profile/menu.php                         | 14 +++----
 view/profile/section_admin.php                |  2 +-
 view/profile/section_display.php              |  2 +-
 view/profile/section_essentials.php           |  6 +--
 view/profile/section_messaging.php            |  2 +-
 view/profile/section_personal.php             |  2 +-
 view/profile/section_personality.php          | 10 ++---
 view/profile/section_privacy.php              |  2 +-
 view/profile/upload_avatar.php                |  2 +-
 view/register/rules.php                       |  2 +-
 view/search/footer.php                        |  2 +-
 view/search/header.php                        |  2 +-
 view/search/posts.php                         |  6 +--
 view/search/topics.php                        |  2 +-
 view/userlist.php                             |  2 +-
 view/viewforum.php                            |  4 +-
 view/viewtopic.php                            | 20 +++++-----
 155 files changed, 555 insertions(+), 555 deletions(-)

diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index 4da8c180..5ad70ca7 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -31,13 +31,13 @@ public function add_category()
     {
         $cat_name = feather_trim($this->request->post('cat_name'));
         if ($cat_name == '') {
-            redirect($this->feather->url->get_link('admin/categories/'), __('Must enter name message'));
+            redirect($this->feather->url->get('admin/categories/'), __('Must enter name message'));
         }
 
         if ($this->model->add_category($cat_name)) {
-            redirect($this->feather->url->get_link('admin/categories/'), __('Category added redirect'));
+            redirect($this->feather->url->get('admin/categories/'), __('Category added redirect'));
         } else { //TODO, add error message
-            redirect($this->feather->url->get_link('admin/categories/'), __('Category added redirect'));
+            redirect($this->feather->url->get('admin/categories/'), __('Category added redirect'));
         }
     }
 
@@ -52,7 +52,7 @@ public function edit_categories()
                               'name' => feather_escape($properties['name']),
                               'order' => (int) $properties['order'], );
             if ($category['name'] == '') {
-                redirect($this->feather->url->get_link('admin/categories/'), __('Must enter name message'));
+                redirect($this->feather->url->get('admin/categories/'), __('Must enter name message'));
             }
             $this->model->update_category($category);
         }
@@ -60,7 +60,7 @@ public function edit_categories()
         // Regenerate the quick jump cache
         $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
-        redirect($this->feather->url->get_link('admin/categories/'), __('Categories updated redirect'));
+        redirect($this->feather->url->get('admin/categories/'), __('Categories updated redirect'));
     }
 
     public function delete_category()
@@ -72,13 +72,13 @@ public function delete_category()
         }
 
         if (intval($this->request->post('disclaimer')) != 1) {
-            redirect($this->feather->url->get_link('admin/categories/'), __('Delete category not validated'));
+            redirect($this->feather->url->get('admin/categories/'), __('Delete category not validated'));
         }
 
         if ($this->model->delete_category($cat_to_delete)) {
-            redirect($this->feather->url->get_link('admin/categories/'), __('Category deleted redirect'));
+            redirect($this->feather->url->get('admin/categories/'), __('Category deleted redirect'));
         } else {
-            redirect($this->feather->url->get_link('admin/categories/'), __('Unable to delete category'));
+            redirect($this->feather->url->get('admin/categories/'), __('Unable to delete category'));
         }
     }
 
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index 55e3df55..d7902cd4 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -36,15 +36,15 @@ public function add_forum()
         $cat_id = (int) $this->request->post('cat');
 
         if ($cat_id < 1) {
-            redirect($this->feather->url->get_link('admin/forums/'), __('Must be valid category'));
+            redirect($this->feather->url->get('admin/forums/'), __('Must be valid category'));
         }
 
         if ($fid = $this->model->add_forum($cat_id, __('New forum'))) {
             // Regenerate the quick jump cache
             $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
-            redirect($this->feather->url->get_link('admin/forums/edit/'.$fid.'/'), __('Forum added redirect'));
+            redirect($this->feather->url->get('admin/forums/edit/'.$fid.'/'), __('Forum added redirect'));
         } else {
-            redirect($this->feather->url->get_link('admin/forums/'), __('Unable to add forum'));
+            redirect($this->feather->url->get('admin/forums/'), __('Unable to add forum'));
         }
     }
 
@@ -61,10 +61,10 @@ public function edit_forum($forum_id)
                                     'redirect_url' => url_valid($this->request->post('redirect_url')) ? feather_escape($this->request->post('redirect_url')) : NULL);
 
                 if ($forum_data['forum_name'] == '') {
-                    redirect($this->feather->url->get_link('admin/forums/edit/'.$forum_id.'/'), __('Must enter name message'));
+                    redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Must enter name message'));
                 }
                 if ($forum_data['cat_id'] < 1) {
-                    redirect($this->feather->url->get_link('admin/forums/edit/'.$forum_id.'/'), __('Must be valid category'));
+                    redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Must be valid category'));
                 }
 
                 $this->model->update_forum($forum_id, $forum_data);
@@ -100,7 +100,7 @@ public function edit_forum($forum_id)
                 // Regenerate the quick jump cache
                 $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
-                redirect($this->feather->url->get_link('admin/forums/edit/'.$forum_id.'/'), __('Forum updated redirect'));
+                redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Forum updated redirect'));
 
             } elseif ($this->request->post('revert_perms')) {
                 $this->model->delete_permissions($forum_id);
@@ -108,7 +108,7 @@ public function edit_forum($forum_id)
                 // Regenerate the quick jump cache
                 $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
-                redirect($this->feather->url->get_link('admin/forums/edit/'.$forum_id.'/'), __('Perms reverted redirect'));
+                redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Perms reverted redirect'));
             }
 
         } else {
@@ -134,7 +134,7 @@ public function delete_forum($forum_id)
             // Regenerate the quick jump cache
             $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
-            redirect($this->feather->url->get_link('admin/forums/'), __('Forum deleted redirect'));
+            redirect($this->feather->url->get('admin/forums/'), __('Forum deleted redirect'));
 
         } else { // If the user hasn't confirmed
 
@@ -162,7 +162,7 @@ public function edit_positions()
         // Regenerate the quick jump cache
         $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
-        redirect($this->feather->url->get_link('admin/forums/'), __('Forums updated redirect'));
+        redirect($this->feather->url->get('admin/forums/'), __('Forums updated redirect'));
     }
 
     public function display()
diff --git a/controller/admin/index.php b/controller/admin/index.php
index 6ecdb650..d4f46e6b 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -65,7 +65,7 @@ public function display($action = null)
             $deleted = $this->remove_install_folder($this->feather->forum_env['FEATHER_ROOT'].'install');
 
             if ($deleted) {
-                redirect($this->feather->url->get_link('admin/'), __('Deleted install.php redirect'));
+                redirect($this->feather->url->get('admin/'), __('Deleted install.php redirect'));
             } else {
                 message(__('Delete install.php failed'));
             }
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index 3889a2c4..c7886c16 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -41,7 +41,7 @@ public function display()
         if ($this->request->post('reset') || !file_exists($cache_file)) {
             require_once(FEATHER_ROOT.'include/bbcd_source.php');
             require_once(FEATHER_ROOT.'include/bbcd_compile.php');
-            redirect($this->feather->url->get_link('admin/parser/'), $lang_admin_parser['reset_success']);
+            redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['reset_success']);
         }
 
         // Load the current BBCode $pd array from include/parser_data.inc.php.
@@ -65,7 +65,7 @@ public function display()
                             if (preg_match('%^image/%', $f['type'])) {        // If we have an image file type?
                                 if ($f['size'] > 0 && $f['size'] <= $this->config['o_avatars_size']) {
                                     if (move_uploaded_file($f['tmp_name'], FEATHER_ROOT .'img/smilies/'. $name)) {
-                                        redirect($this->feather->url->get_link('admin/parser/'), $lang_admin_parser['upload success']);
+                                        redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['upload success']);
                                     } else { //  Error #1: 'Smiley upload failed. Unable to move to smiley folder.'.
                                         message($lang_admin_parser['upload_err_1']);
                                     }
@@ -199,7 +199,7 @@ public function display()
             }
 
             require_once('include/bbcd_compile.php'); // Compile $bbcd and save into $pd['bbcd']
-            redirect($this->feather->url->get_link('admin/parser/'), $lang_admin_parser['save_success']);
+            redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['save_success']);
         }
 
         \FeatherBB\AdminUtils::generateAdminMenu('parser');
diff --git a/controller/edit.php b/controller/edit.php
index 8fbdeef5..2a8afaae 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -76,7 +76,7 @@ public function editpost($id)
                 // Edit the post
                 $this->model->edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod);
 
-                redirect($this->feather->url->get_link('post/'.$id.'/#p'.$id), __('Post redirect'));
+                redirect($this->feather->url->get('post/'.$id.'/#p'.$id), __('Post redirect'));
             }
         } else {
             $post = '';
diff --git a/controller/install.php b/controller/install.php
index bdc8cf24..fc11fe6a 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -203,7 +203,7 @@ public function create_db(array $data)
         $flash->save();
 
         // Redirect to homepage
-        redirect($this->feather->url->get_link('/'));
+        redirect($this->feather->url->get('/'));
     }
 
     public function write_config($json)
diff --git a/controller/misc.php b/controller/misc.php
index 77f6491b..4f887129 100644
--- a/controller/misc.php
+++ b/controller/misc.php
@@ -55,7 +55,7 @@ public function markforumread($id)
         $tracked_topics['forums'][$id] = time();
         set_tracked_topics($tracked_topics);
 
-        redirect($this->feather->url->get_link('forum/'.$id.'/'), __('Mark forum read redirect'));
+        redirect($this->feather->url->get('forum/'.$id.'/'), __('Mark forum read redirect'));
     }
 
     public function subscribeforum($id)
diff --git a/controller/moderate.php b/controller/moderate.php
index 758ad1c4..a8cd1761 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -99,7 +99,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         if ($action == 'stick') {
             $this->model->stick_topic($id, $fid);
 
-            redirect($this->feather->url->get_link('topic/'.$id.'/'), __('Stick topic redirect'));
+            redirect($this->feather->url->get('topic/'.$id.'/'), __('Stick topic redirect'));
         }
 
 
@@ -107,21 +107,21 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         if ($action == 'unstick') {
             $this->model->unstick_topic($id, $fid);
 
-            redirect($this->feather->url->get_link('topic/'.$id.'/'), __('Unstick topic redirect'));
+            redirect($this->feather->url->get('topic/'.$id.'/'), __('Unstick topic redirect'));
         }
 
         // Open a topic
         if ($action == 'open') {
             $this->model->open_topic($id, $fid);
 
-            redirect($this->feather->url->get_link('topic/'.$id.'/'), __('Open topic redirect'));
+            redirect($this->feather->url->get('topic/'.$id.'/'), __('Open topic redirect'));
         }
 
         // Close a topic
         if ($action == 'close') {
             $this->model->close_topic($id, $fid);
 
-            redirect($this->feather->url->get_link('topic/'.$id.'/'), __('Close topic redirect'));
+            redirect($this->feather->url->get('topic/'.$id.'/'), __('Close topic redirect'));
         }
 
         $cur_topic = $this->model->get_topic_info($fid, $id);
@@ -352,7 +352,7 @@ public function dealposts($fid)
                 $this->model->close_multiple_topics($action, $topics, $fid);
 
                 $redirect_msg = ($action) ? __('Close topics redirect') : __('Open topics redirect');
-                redirect($this->feather->url->get_link('moderate/forum/'.$fid.'/'), $redirect_msg);
+                redirect($this->feather->url->get('moderate/forum/'.$fid.'/'), $redirect_msg);
             }
         }
     }
diff --git a/controller/post.php b/controller/post.php
index ec676380..9a27fdd4 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -120,7 +120,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             $this->model->increment_post_count($post, $new['tid']);
                         }
 
-                    redirect($this->feather->url->get_link('post/'.$new['pid'].'/#p'.$new['pid']), __('Post redirect'));
+                    redirect($this->feather->url->get('post/'.$new['pid'].'/#p'.$new['pid']), __('Post redirect'));
                 }
         }
 
@@ -129,18 +129,18 @@ public function newpost($fid = null, $tid = null, $qid = null)
         // If a topic ID was specified in the url (it's a reply)
         if ($tid) {
             $action = __('Post a reply');
-            $form = '<form id="post" method="post" action="'.$this->feather->url->get_link('post/reply/'.$tid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
+            $form = '<form id="post" method="post" action="'.$this->feather->url->get('post/reply/'.$tid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
 
                 // If a quote ID was specified in the url
                 if (isset($qid)) {
                     $quote = $this->model->get_quote_message($qid, $tid);
-                    $form = '<form id="post" method="post" action="'.$this->feather->url->get_link('post/reply/'.$tid.'/quote/'.$qid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
+                    $form = '<form id="post" method="post" action="'.$this->feather->url->get('post/reply/'.$tid.'/quote/'.$qid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
                 }
         }
         // If a forum ID was specified in the url (new topic)
         elseif ($fid) {
             $action = __('Post new topic');
-            $form = '<form id="post" method="post" action="'.$this->feather->url->get_link('post/new-topic/'.$fid.'/').'" onsubmit="return process_form(this)">';
+            $form = '<form id="post" method="post" action="'.$this->feather->url->get('post/new-topic/'.$fid.'/').'" onsubmit="return process_form(this)">';
         } else {
             message(__('Bad request'), '404');
         }
diff --git a/controller/profile.php b/controller/profile.php
index a05d9b5f..c0baa91a 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -166,13 +166,13 @@ public function display($id, $section = null)
                     message(__('Bad request'), '404');
                 }
 
-                $avatar_field = '<span><a href="'.$this->feather->url->get_link('user/'.$id.'/action/upload_avatar/').'">'.__('Change avatar').'</a></span>';
+                $avatar_field = '<span><a href="'.$this->feather->url->get('user/'.$id.'/action/upload_avatar/').'">'.__('Change avatar').'</a></span>';
 
                 $user_avatar = generate_avatar_markup($id);
                 if ($user_avatar) {
-                    $avatar_field .= ' <span><a href="'.$this->feather->url->get_link('user/'.$id.'/action/delete_avatar/').'">'.__('Delete avatar').'</a></span>';
+                    $avatar_field .= ' <span><a href="'.$this->feather->url->get('user/'.$id.'/action/delete_avatar/').'">'.__('Delete avatar').'</a></span>';
                 } else {
-                    $avatar_field = '<span><a href="'.$this->feather->url->get_link('user/'.$id.'/action/upload_avatar/').'">'.__('Upload avatar').'</a></span>';
+                    $avatar_field = '<span><a href="'.$this->feather->url->get('user/'.$id.'/action/upload_avatar/').'">'.__('Upload avatar').'</a></span>';
                 }
 
                 if ($user['signature'] != '') {
@@ -312,7 +312,7 @@ public function action($id, $action)
 
             $this->model->delete_avatar($id);
 
-            redirect($this->feather->url->get_link('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
+            redirect($this->feather->url->get('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
         } elseif ($action == 'promote') {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_promote_users == '0')) {
                 message(__('No permission'), '403');
diff --git a/controller/register.php b/controller/register.php
index e2963cee..0223fd76 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -98,7 +98,7 @@ public function rules()
         }
 
         if ($this->config['o_rules'] != '1') {
-            redirect($this->feather->url->get_link('register/agree/'));
+            redirect($this->feather->url->get('register/agree/'));
         }
 
         $this->feather->view2->setPageInfo(array(
diff --git a/controller/search.php b/controller/search.php
index 9405fbeb..d96cba10 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -90,6 +90,6 @@ public function display()
 
     public function quicksearches($show)
     {
-        redirect($this->feather->url->get_link('search/?action=show_'.$show));
+        redirect($this->feather->url->get('search/?action=show_'.$show));
     }
 }
diff --git a/controller/viewforum.php b/controller/viewforum.php
index f1f07a67..694c4712 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -50,7 +50,7 @@ public function display($id, $name = null, $page = null)
 
         // Can we or can we not post new topics?
         if (($cur_forum['post_topics'] == '' && $this->feather->user->g_post_topics == '1') || $cur_forum['post_topics'] == '1' || $is_admmod) {
-            $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.$this->feather->url->get_link('post/new-topic/'.$id.'/').'">'.__('Post topic').'</a></p>'."\n";
+            $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.$this->feather->url->get('post/new-topic/'.$id.'/').'">'.__('Post topic').'</a></p>'."\n";
         } else {
             $post_link = '';
         }
@@ -67,13 +67,13 @@ public function display($id, $name = null, $page = null)
 
         $forum_actions = $this->model->get_forum_actions($id, $this->feather->forum_settings['o_forum_subscriptions'], $cur_forum['is_subscribed']);
 
-        $this->feather->view2->addAsset('canonical', $this->feather->url->get_link('forum/'.$id.'/'.$url_forum.'/'));
+        $this->feather->view2->addAsset('canonical', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/'));
         if ($num_pages > 1) {
             if ($p > 1) {
-                $this->feather->view2->addAsset('prev', $this->feather->url->get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
+                $this->feather->view2->addAsset('prev', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
             }
             if ($p < $num_pages) {
-                $this->feather->view2->addAsset('next', $this->feather->url->get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
+                $this->feather->view2->addAsset('next', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
             }
         }
 
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index a8bf757a..17fb2608 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -91,13 +91,13 @@ public function display($id = null, $name = null, $page = null, $pid = null)
             'promptQuote' => __('promptQuote')
         );
 
-        $this->feather->view2->addAsset('canonical', $this->feather->url->get_link('forum/'.$id.'/'.$url_forum.'/'));
+        $this->feather->view2->addAsset('canonical', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/'));
         if ($num_pages > 1) {
             if ($p > 1) {
-                $this->feather->view2->addAsset('prev', $this->feather->url->get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
+                $this->feather->view2->addAsset('prev', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
             }
             if ($p < $num_pages) {
-                $this->feather->view2->addAsset('next', $this->feather->url->get_link('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
+                $this->feather->view2->addAsset('next', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
             }
         }
 
diff --git a/extern.php b/extern.php
index 656aa1ea..94076507 100644
--- a/extern.php
+++ b/extern.php
@@ -484,7 +484,7 @@ function output_html($feed)
         // Setup the feed
         $feed = array(
             'title'        =>    $feather->forum_settings['o_board_title'].__('Title separator').$cur_topic['subject'],
-            'link'            =>    get_link('topic/'.$tid.'/'.url_friendly($cur_topic['subject']).'/'),
+            'link'            =>    get('topic/'.$tid.'/'.url_friendly($cur_topic['subject']).'/'),
             'description'        =>    sprintf(__('RSS description topic'), $cur_topic['subject']),
             'items'            =>    array(),
             'type'            =>    'posts'
@@ -508,7 +508,7 @@ function output_html($feed)
             $item = array(
                 'id'            =>    $cur_post['id'],
                 'title'            =>    $cur_topic['first_post_id'] == $cur_post['id'] ? $cur_topic['subject'] : __('RSS reply').$cur_topic['subject'],
-                'link'            =>    get_link('post/'.$cur_post['id'].'/#p'.$cur_post['id']),
+                'link'            =>    get('post/'.$cur_post['id'].'/#p'.$cur_post['id']),
                 'description'        =>    $cur_post['message'],
                 'author'        =>    array(
                     'name'    => $cur_post['poster'],
@@ -521,7 +521,7 @@ function output_html($feed)
                     $item['author']['email'] = $cur_post['email'];
                 }
 
-                $item['author']['uri'] = get_link('user/'.$cur_post['poster_id'].'/');
+                $item['author']['uri'] = get('user/'.$cur_post['poster_id'].'/');
             } elseif ($cur_post['poster_email'] != '' && !$feather->user->is_guest) {
                 $item['author']['email'] = $cur_post['poster_email'];
             }
@@ -626,7 +626,7 @@ function output_html($feed)
                 $item = array(
                     'id'            =>    $cur_topic['id'],
                     'title'            =>    $cur_topic['subject'],
-                    'link'            =>    get_link('topic/'.$cur_topic['id'].'/'.url_friendly($cur_topic['subject']).'/').($order_posted ? '' : '/action/new/'),
+                    'link'            =>    get('topic/'.$cur_topic['id'].'/'.url_friendly($cur_topic['subject']).'/').($order_posted ? '' : '/action/new/'),
                     'description'    =>    $cur_topic['message'],
                     'author'        =>    array(
                         'name'    => $order_posted ? $cur_topic['poster'] : $cur_topic['last_poster']
@@ -639,7 +639,7 @@ function output_html($feed)
                         $item['author']['email'] = $cur_topic['email'];
                     }
 
-                    $item['author']['uri'] = get_link('user/'.$cur_topic['poster_id'].'/');
+                    $item['author']['uri'] = get('user/'.$cur_topic['poster_id'].'/');
                 } elseif ($cur_topic['poster_email'] != '' && !$feather->user->is_guest) {
                     $item['author']['email'] = $cur_topic['poster_email'];
                 }
@@ -700,7 +700,7 @@ function output_html($feed)
 
     foreach ($result as $feather_user_online) {
         if ($feather_user_online['user_id'] > 1) {
-            $users[] = ($feather->user->g_view_users == '1') ? '<a href="'.get_link('user/'.$feather_user_online['user_id'].'/').'">'.feather_escape($feather_user_online['ident']).'</a>' : feather_escape($feather_user_online['ident']);
+            $users[] = ($feather->user->g_view_users == '1') ? '<a href="'.get('user/'.$feather_user_online['user_id'].'/').'">'.feather_escape($feather_user_online['ident']).'</a>' : feather_escape($feather_user_online['ident']);
             ++$num_users;
         } else {
             ++$num_guests;
@@ -748,7 +748,7 @@ function output_html($feed)
     header('Pragma: public');
 
     echo sprintf(__('No of users'), forum_number_format($stats['total_users'])).'<br />'."\n";
-    echo sprintf(__('Newest user'), (($feather->user->g_view_users == '1') ? '<a href="'.get_link('user/'.$stats['last_user']['id'].'/').'">'.feather_escape($stats['last_user']['username']).'</a>' : feather_escape($stats['last_user']['username']))).'<br />'."\n";
+    echo sprintf(__('Newest user'), (($feather->user->g_view_users == '1') ? '<a href="'.get('user/'.$stats['last_user']['id'].'/').'">'.feather_escape($stats['last_user']['username']).'</a>' : feather_escape($stats['last_user']['username']))).'<br />'."\n";
     echo sprintf(__('No of topics'), forum_number_format($stats['total_topics'])).'<br />'."\n";
     echo sprintf(__('No of posts'), forum_number_format($stats['total_posts'])).'<br />'."\n";
 
diff --git a/include/classes/url.class.php b/include/classes/url.class.php
index f9340f33..87a43f76 100644
--- a/include/classes/url.class.php
+++ b/include/classes/url.class.php
@@ -726,7 +726,7 @@ public function url_friendly($str)
     // Generate link to another page on the forum
     // Inspired by (c) Panther <http://www.pantherforum.org/>
     //
-    public function get_link($link, $args = null)
+    public function get($link, $args = null)
     {
         if (function_exists('apache_get_modules') && in_array('mod_rewrite', apache_get_modules())) { // If we have Apache's mod_rewrite enabled
             $base_url = get_base_url();
@@ -758,7 +758,7 @@ private function get_sublink($link, $sublink, $subarg, $args = null)
         $base_url = get_base_url();
 
         if ($sublink == 'p$1' && $subarg == 1) {
-            return $this->get_link($link, $args);
+            return $this->get($link, $args);
         }
 
         $gen_link = $link;
diff --git a/include/parser.php b/include/parser.php
index 69ee422d..331ab973 100644
--- a/include/parser.php
+++ b/include/parser.php
@@ -881,7 +881,7 @@ function _parse_bbcode_callback($matches)
                 $attribute = preg_replace('/\s*#\d++$/S', '', $attribute); // Strip post id from attribute.
                 $attribute .= ' '. __('wrote');  // Append language-specific "wrote:".
                 if ($pd['config']['quote_links']) {
-                    $attribute = ' <a href="'. get_link('post/'.$m[1].'/#p'.$m[1]) .'">'. $attribute .'</a>';
+                    $attribute = ' <a href="'. get('post/'.$m[1].'/#p'.$m[1]) .'">'. $attribute .'</a>';
                 }
             } else {
                 $attribute .= ' '. __('wrote');
diff --git a/model/admin/bans.php b/model/admin/bans.php
index f89d6054..42feda83 100644
--- a/model/admin/bans.php
+++ b/model/admin/bans.php
@@ -276,7 +276,7 @@ public function insert_ban()
         // Regenerate the bans cache
         $this->feather->cache->store('bans', \model\cache::get_bans());
 
-        redirect($this->feather->url->get_link('admin/bans/'), __('Ban edited redirect'));
+        redirect($this->feather->url->get('admin/bans/'), __('Ban edited redirect'));
     }
 
     public function remove_ban($ban_id)
@@ -291,7 +291,7 @@ public function remove_ban($ban_id)
         // Regenerate the bans cache
         $this->feather->cache->store('bans', \model\cache::get_bans());
 
-        redirect($this->feather->url->get_link('admin/bans/'), __('Ban removed redirect'));
+        redirect($this->feather->url->get('admin/bans/'), __('Ban removed redirect'));
     }
 
     public function find_ban($start_from = false)
diff --git a/model/admin/censoring.php b/model/admin/censoring.php
index 488e94be..1385e7b1 100644
--- a/model/admin/censoring.php
+++ b/model/admin/censoring.php
@@ -46,7 +46,7 @@ public function add_word()
         $this->feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
         $this->feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
 
-        redirect($this->feather->url->get_link('admin/censoring/'), __('Word added redirect'));
+        redirect($this->feather->url->get('admin/censoring/'), __('Word added redirect'));
     }
 
     public function update_word()
@@ -74,7 +74,7 @@ public function update_word()
         $this->feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
         $this->feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
 
-        redirect($this->feather->url->get_link('admin/censoring/'), __('Word updated redirect'));
+        redirect($this->feather->url->get('admin/censoring/'), __('Word updated redirect'));
     }
 
     public function remove_word()
@@ -90,7 +90,7 @@ public function remove_word()
         $this->feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
         $this->feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
 
-        redirect($this->feather->url->get_link('admin/censoring/'),  __('Word removed redirect'));
+        redirect($this->feather->url->get('admin/censoring/'),  __('Word removed redirect'));
     }
 
     public function get_words()
diff --git a/model/admin/groups.php b/model/admin/groups.php
index 88ac1247..e52208c5 100644
--- a/model/admin/groups.php
+++ b/model/admin/groups.php
@@ -258,9 +258,9 @@ public function add_edit_group($groups)
         $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
 
         if ($this->request->post('mode') == 'edit') {
-            redirect($this->feather->url->get_link('admin/groups/'), __('Group edited redirect'));
+            redirect($this->feather->url->get('admin/groups/'), __('Group edited redirect'));
         } else {
-            redirect($this->feather->url->get_link('admin/groups/'), __('Group added redirect'));
+            redirect($this->feather->url->get('admin/groups/'), __('Group added redirect'));
         }
     }
 
@@ -285,7 +285,7 @@ public function set_default_group($groups)
         // Regenerate the config cache
         $this->feather->cache->store('config', \model\cache::get_config());
 
-        redirect($this->feather->url->get_link('admin/groups/'), __('Default group redirect'));
+        redirect($this->feather->url->get('admin/groups/'), __('Default group redirect'));
     }
 
     public function check_members($group_id)
@@ -328,7 +328,7 @@ public function delete_group($group_id)
         DB::for_table('groups')->where('g_promote_next_group', $group_id)
                                                    ->update_many('g_promote_next_group', 0);
 
-        redirect($this->feather->url->get_link('admin/groups/'), __('Group removed redirect'));
+        redirect($this->feather->url->get('admin/groups/'), __('Group removed redirect'));
     }
 
     public function get_group_title($group_id)
diff --git a/model/admin/maintenance.php b/model/admin/maintenance.php
index 5d9636a5..2ae02599 100644
--- a/model/admin/maintenance.php
+++ b/model/admin/maintenance.php
@@ -211,7 +211,7 @@ public function prune_comply($prune_from, $prune_sticky)
                     ->delete_many();
         }
 
-        redirect($this->feather->url->get_link('admin/maintenance/'), __('Posts pruned redirect'));
+        redirect($this->feather->url->get('admin/maintenance/'), __('Posts pruned redirect'));
     }
 
     public function get_info_prune($prune_sticky, $prune_from)
diff --git a/model/admin/options.php b/model/admin/options.php
index c0adf8c3..d79e37b3 100644
--- a/model/admin/options.php
+++ b/model/admin/options.php
@@ -230,7 +230,7 @@ public function update_options()
         $this->feather->cache->store('config', \model\cache::get_config());
         $this->clear_feed_cache();
 
-        redirect($this->feather->url->get_link('admin/options/'), __('Options updated redirect'));
+        redirect($this->feather->url->get('admin/options/'), __('Options updated redirect'));
     }
 
     public function clear_feed_cache()
diff --git a/model/admin/permissions.php b/model/admin/permissions.php
index 42a3ea46..5267b64b 100644
--- a/model/admin/permissions.php
+++ b/model/admin/permissions.php
@@ -48,6 +48,6 @@ public function update_permissions()
 
         generate_config_cache();
 
-        redirect($this->feather->url->get_link('admin/permissions/'), __('Perms updated redirect'));
+        redirect($this->feather->url->get('admin/permissions/'), __('Perms updated redirect'));
     }
 }
diff --git a/model/admin/reports.php b/model/admin/reports.php
index af24e0fd..23c768dc 100644
--- a/model/admin/reports.php
+++ b/model/admin/reports.php
@@ -58,7 +58,7 @@ public function zap_report()
                 ->delete_many();
         }
 
-        redirect($this->feather->url->get_link('admin/reports/'), __('Report zapped redirect'));
+        redirect($this->feather->url->get('admin/reports/'), __('Report zapped redirect'));
     }
 
     public function get_reports()
diff --git a/model/admin/users.php b/model/admin/users.php
index 0ac78492..e14f0034 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -237,7 +237,7 @@ public function move_users()
             DB::for_table('users')->where_in('id', $move['user_ids'])
                                                       ->update_many('group_id', $new_group);
 
-            redirect($this->feather->url->get_link('admin/users/'), __('Users move redirect'));
+            redirect($this->feather->url->get('admin/users/'), __('Users move redirect'));
         }
 
         $move = $this->hook->fire('model.users.move_users.move', $move);
@@ -402,7 +402,7 @@ public function delete_users()
 
             $stats = $this->feather->cache->retrieve('users_info');
 
-            redirect($this->feather->url->get_link('admin/users/'), __('Users delete redirect'));
+            redirect($this->feather->url->get('admin/users/'), __('Users delete redirect'));
         }
 
         return $user_ids;
@@ -521,7 +521,7 @@ public function ban_users()
                 // Regenerate the bans cache
                 $this->feather->cache->store('bans', \model\cache::get_bans());
 
-                redirect($this->feather->url->get_link('admin/users/'), __('Users banned redirect'));
+                redirect($this->feather->url->get('admin/users/'), __('Users banned redirect'));
             }
         }
         return $user_ids;
diff --git a/model/delete.php b/model/delete.php
index 1ef9b86b..8033ab21 100644
--- a/model/delete.php
+++ b/model/delete.php
@@ -65,7 +65,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
             delete_topic($tid);
             update_forum($fid);
 
-            redirect($this->feather->url->get_link('forum/'.$fid.'/'), __('Topic del redirect'));
+            redirect($this->feather->url->get('forum/'.$fid.'/'), __('Topic del redirect'));
         } else {
             $this->hook->fire('handle_deletion', $tid, $fid, $id);
 
@@ -84,7 +84,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
 
             $post = $post->find_one();
 
-            redirect($this->feather->url->get_link('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
+            redirect($this->feather->url->get('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
         }
     }
 }
diff --git a/model/index.php b/model/index.php
index 978d7363..488e18ff 100644
--- a/model/index.php
+++ b/model/index.php
@@ -49,7 +49,7 @@ public function get_forum_actions()
 
         // Display a "mark all as read" link
         if (!$this->user->is_guest) {
-            $forum_actions[] = '<a href="'.$this->feather->url->get_link('mark-read/').'">'.__('Mark all as read').'</a>';
+            $forum_actions[] = '<a href="'.$this->feather->url->get('mark-read/').'">'.__('Mark all as read').'</a>';
         }
 
         $forum_actions = $this->hook->fire('get_forum_actions', $forum_actions);
@@ -177,7 +177,7 @@ public function print_categories_forums()
             // Are there new posts since our last visit?
             if (isset($new_topics[$cur_forum->fid])) {
                 $cur_forum->item_status .= ' inew';
-                $forum_field_new = '<span class="newtext">[ <a href="'.$this->feather->url->get_link('search/?action=show_new&amp;fid='.$cur_forum->fid).'">'.__('New posts').'</a> ]</span>';
+                $forum_field_new = '<span class="newtext">[ <a href="'.$this->feather->url->get('search/?action=show_new&amp;fid='.$cur_forum->fid).'">'.__('New posts').'</a> ]</span>';
                 $cur_forum->icon_type = 'icon icon-new';
             }
 
@@ -188,7 +188,7 @@ public function print_categories_forums()
                 $cur_forum->item_status .= ' iredirect';
                 $cur_forum->icon_type = 'icon';
             } else {
-                $cur_forum->forum_field = '<h3><a href="'.$this->feather->url->get_link('forum/'.$cur_forum->fid.'/'.$this->feather->url->url_friendly($cur_forum->forum_name)).'/'.'">'.feather_escape($cur_forum->forum_name).'</a>'.(!empty($forum_field_new) ? ' '.$forum_field_new : '').'</h3>';
+                $cur_forum->forum_field = '<h3><a href="'.$this->feather->url->get('forum/'.$cur_forum->fid.'/'.$this->feather->url->url_friendly($cur_forum->forum_name)).'/'.'">'.feather_escape($cur_forum->forum_name).'</a>'.(!empty($forum_field_new) ? ' '.$forum_field_new : '').'</h3>';
                 $cur_forum->num_topics_formatted = $cur_forum->num_topics;
                 $cur_forum->num_posts_formatted = $cur_forum->num_posts;
             }
@@ -199,7 +199,7 @@ public function print_categories_forums()
 
             // If there is a last_post/last_poster
             if ($cur_forum->last_post != '') {
-                $cur_forum->last_post_formatted = '<a href="'.$this->feather->url->get_link('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.format_time($cur_forum->last_post).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_forum->last_poster).'</span>';
+                $cur_forum->last_post_formatted = '<a href="'.$this->feather->url->get('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.format_time($cur_forum->last_post).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_forum->last_poster).'</span>';
             } elseif ($cur_forum->redirect_url != '') {
                 $cur_forum->last_post_formatted = '- - -';
             } else {
@@ -212,7 +212,7 @@ public function print_categories_forums()
 
                 foreach ($mods_array as $mod_username => $mod_id) {
                     if ($this->user->g_view_users == '1') {
-                        $moderators[] = '<a href="'.$this->feather->url->get_link('user/'.$mod_id.'/').'">'.feather_escape($mod_username).'</a>';
+                        $moderators[] = '<a href="'.$this->feather->url->get('user/'.$mod_id.'/').'">'.feather_escape($mod_username).'</a>';
                     } else {
                         $moderators[] = feather_escape($mod_username);
                     }
@@ -256,7 +256,7 @@ public function collect_stats()
         $stats['total_posts'] = intval($query['total_posts']);
 
         if ($this->user->g_view_users == '1') {
-            $stats['newest_user'] = '<a href="'.$this->feather->url->get_link('user/'.$stats['last_user']['id']).'/">'.feather_escape($stats['last_user']['username']).'</a>';
+            $stats['newest_user'] = '<a href="'.$this->feather->url->get('user/'.$stats['last_user']['id']).'/">'.feather_escape($stats['last_user']['username']).'</a>';
         } else {
             $stats['newest_user'] = feather_escape($stats['last_user']['username']);
         }
@@ -291,7 +291,7 @@ public function fetch_users_online()
         foreach($query as $user_online) {
             if ($user_online->user_id > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $online['users'][] = "\n\t\t\t\t".'<dd><a href="'.$this->feather->url->get_link('user/'.$user_online->user_id).'/">'.feather_escape($user_online->ident).'</a>';
+                    $online['users'][] = "\n\t\t\t\t".'<dd><a href="'.$this->feather->url->get('user/'.$user_online->user_id).'/">'.feather_escape($user_online->ident).'</a>';
                 } else {
                     $online['users'][] = "\n\t\t\t\t".'<dd>'.feather_escape($user_online->ident);
                 }
diff --git a/model/login.php b/model/login.php
index 78f743e3..472bc4f7 100644
--- a/model/login.php
+++ b/model/login.php
@@ -49,7 +49,7 @@ public function login()
         $authorized = $this->hook->fire('authorized_login', $authorized);
 
         if (!$authorized) {
-            message(__('Wrong user/pass').' <a href="'.$this->feather->url->get_link('login/action/forget/').'">'.__('Forgotten pass').'</a>');
+            message(__('Wrong user/pass').' <a href="'.$this->feather->url->get('login/action/forget/').'">'.__('Forgotten pass').'</a>');
         }
 
         // Update the status if this is the first time the user logged in
@@ -186,7 +186,7 @@ public function password_forgotten()
 
                         // Do the user specific replacements to the template
                         $cur_mail_message = str_replace('<username>', $cur_hit->username, $mail_message);
-                        $cur_mail_message = str_replace('<activation_url>', $this->feather->url->get_link('user/'.$cur_hit->id.'/action/change_pass/?key='.$new_password_key), $cur_mail_message);
+                        $cur_mail_message = str_replace('<activation_url>', $this->feather->url->get('user/'.$cur_hit->id.'/action/change_pass/?key='.$new_password_key), $cur_mail_message);
                         $cur_mail_message = str_replace('<new_password>', $new_password, $cur_mail_message);
                         $cur_mail_message = $this->hook->fire('cur_mail_message_password_forgotten', $cur_mail_message);
 
diff --git a/model/misc.php b/model/misc.php
index 208a059a..75125f4c 100644
--- a/model/misc.php
+++ b/model/misc.php
@@ -123,7 +123,7 @@ public function get_redirect_url($recipient_id)
         }
 
         if (!isset($redirect_url)) {
-            $redirect_url = $this->feather->url->get_link('user/'.$recipient_id.'/');
+            $redirect_url = $this->feather->url->get('user/'.$recipient_id.'/');
         } elseif (preg_match('%viewtopic\.php\?pid=(\d+)$%', $redirect_url, $matches)) {
             $redirect_url .= '#p'.$matches[1];
         }
@@ -205,7 +205,7 @@ public function insert_report($post_id)
                 $mail_subject = str_replace('<forum_id>', $report['forum_id'], $mail_subject);
                 $mail_subject = str_replace('<topic_subject>', $report['subject'], $mail_subject);
                 $mail_message = str_replace('<username>', $this->user->username, $mail_message);
-                $mail_message = str_replace('<post_url>', $this->feather->url->get_link('post/'.$post_id.'/#p'.$post_id), $mail_message);
+                $mail_message = str_replace('<post_url>', $this->feather->url->get('post/'.$post_id.'/#p'.$post_id), $mail_message);
                 $mail_message = str_replace('<reason>', $reason, $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
@@ -221,7 +221,7 @@ public function insert_report($post_id)
         $last_report_sent = $this->hook->fireDB('insert_last_report_sent', $last_report_sent);
         $last_report_sent = $last_report_sent->save();
 
-        redirect($this->feather->url->get_link('forum/'.$report['forum_id'].'/'.$this->feather->url->url_friendly($report['subject']).'/'), __('Report redirect'));
+        redirect($this->feather->url->get('forum/'.$report['forum_id'].'/'.$this->feather->url->url_friendly($report['subject']).'/'), __('Report redirect'));
     }
 
     public function get_info_report($post_id)
@@ -305,7 +305,7 @@ public function subscribe_topic($topic_id)
         $subscription = $this->hook->fireDB('subscribe_topic_query', $subscription);
         $subscription = $subscription->save();
 
-        redirect($this->feather->url->get_link('topic/'.$topic_id.'/'), __('Subscribe redirect'));
+        redirect($this->feather->url->get('topic/'.$topic_id.'/'), __('Subscribe redirect'));
     }
 
     public function unsubscribe_topic($topic_id)
@@ -333,7 +333,7 @@ public function unsubscribe_topic($topic_id)
         $delete = $this->hook->fireDB('unsubscribe_topic_query', $delete);
         $delete = $delete->delete_many();
 
-        redirect($this->feather->url->get_link('topic/'.$topic_id.'/'), __('Unsubscribe redirect'));
+        redirect($this->feather->url->get('topic/'.$topic_id.'/'), __('Unsubscribe redirect'));
     }
 
     public function unsubscribe_forum($forum_id)
@@ -361,7 +361,7 @@ public function unsubscribe_forum($forum_id)
         $delete = $this->hook->fireDB('unsubscribe_forum_query', $delete);
         $delete = $delete->delete_many();
 
-        redirect($this->feather->url->get_link('forum/'.$forum_id.'/'), __('Unsubscribe redirect'));
+        redirect($this->feather->url->get('forum/'.$forum_id.'/'), __('Unsubscribe redirect'));
     }
 
     public function subscribe_forum($forum_id)
@@ -412,6 +412,6 @@ public function subscribe_forum($forum_id)
         $subscription = $this->hook->fireDB('subscribe_forum_query', $subscription);
         $subscription = $subscription->save();
 
-        redirect($this->feather->url->get_link('forum/'.$forum_id.'/'), __('Subscribe redirect'));
+        redirect($this->feather->url->get('forum/'.$forum_id.'/'), __('Subscribe redirect'));
     }
 }
diff --git a/model/moderate.php b/model/moderate.php
index eade841e..0adda595 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -27,7 +27,7 @@ public function __construct()
     public function display_ip_info($ip)
     {
         $ip = $this->hook->fire('display_ip_info', $ip);
-        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.$this->feather->url->get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.$this->feather->url->get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function display_ip_address_post($pid)
@@ -45,7 +45,7 @@ public function display_ip_address_post($pid)
 
         $ip = $this->hook->fire('display_ip_address_post', $ip);
 
-        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.$this->feather->url->get_link('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.$this->feather->url->get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function get_moderators($fid)
@@ -155,7 +155,7 @@ public function delete_posts($tid, $fid, $p = null)
 
             update_forum($fid);
 
-            redirect($this->feather->url->get_link('topic/'.$tid.'/'), __('Delete posts redirect'));
+            redirect($this->feather->url->get('topic/'.$tid.'/'), __('Delete posts redirect'));
         }
 
         $posts = $this->hook->fire('delete_posts', $posts);
@@ -316,7 +316,7 @@ public function split_posts($tid, $fid, $p = null)
             update_forum($fid);
             update_forum($move_to_forum);
 
-            redirect($this->feather->url->get_link('topic/'.$new_tid.'/'), __('Split posts redirect'));
+            redirect($this->feather->url->get('topic/'.$new_tid.'/'), __('Split posts redirect'));
         }
 
         $posts = $this->hook->fire('split_posts', $posts);
@@ -460,7 +460,7 @@ public function display_posts_view($tid, $start_from)
             // If the poster is a registered user
             if ($cur_post->poster_id > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $cur_post->poster_disp = '<a href="'.$this->feather->url->get_link('user/'.$cur_post->poster_id.'/').'">'.feather_escape($cur_post->poster).'</a>';
+                    $cur_post->poster_disp = '<a href="'.$this->feather->url->get('user/'.$cur_post->poster_id.'/').'">'.feather_escape($cur_post->poster).'</a>';
                 } else {
                     $cur_post->poster_disp = feather_escape($cur_post->poster);
                 }
@@ -585,7 +585,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
 
         $redirect_msg = (count($topics) > 1) ? __('Move topics redirect') : __('Move topic redirect');
         $redirect_msg = $this->hook->fire('move_topics_to_redirect_message', $redirect_msg);
-        redirect($this->feather->url->get_link('forum/'.$move_to_forum.'/'), $redirect_msg);
+        redirect($this->feather->url->get('forum/'.$move_to_forum.'/'), $redirect_msg);
     }
 
     public function check_move_possible()
@@ -737,7 +737,7 @@ public function merge_topics($fid)
 
         // Update the forum FROM which the topic was moved and redirect
         update_forum($fid);
-        redirect($this->feather->url->get_link('forum/'.$fid.'/'), __('Merge topics redirect'));
+        redirect($this->feather->url->get('forum/'.$fid.'/'), __('Merge topics redirect'));
     }
 
     public function delete_topics($topics, $fid)
@@ -821,7 +821,7 @@ public function delete_topics($topics, $fid)
 
         $this->hook->fire('delete_topics');
 
-        redirect($this->feather->url->get_link('forum/'.$fid.'/'), __('Delete topics redirect'));
+        redirect($this->feather->url->get('forum/'.$fid.'/'), __('Delete topics redirect'));
     }
 
     public function get_forum_info($fid)
@@ -921,7 +921,7 @@ public function display_topics($fid, $sort_by, $start_from)
                 $url_topic = $this->feather->url->url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_disp'] = '<a href="'.$this->feather->url->get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_disp'] = '<a href="'.$this->feather->url->get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
                     $cur_topic['ghost_topic'] = false;
                 } else {
                     $cur_topic['last_post_disp'] = '- - -';
@@ -938,13 +938,13 @@ public function display_topics($fid, $sort_by, $start_from)
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get_link('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get_link('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
@@ -953,7 +953,7 @@ public function display_topics($fid, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_disp'] = '<strong>'.$cur_topic['subject_disp'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->url->get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
diff --git a/model/post.php b/model/post.php
index c65589fb..3071793a 100644
--- a/model/post.php
+++ b/model/post.php
@@ -408,8 +408,8 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
                         $mail_subject = str_replace('<topic_subject>', $cur_posting['subject'], $mail_subject);
                         $mail_message = str_replace('<topic_subject>', $cur_posting['subject'], $mail_message);
                         $mail_message = str_replace('<replier>', $post['username'], $mail_message);
-                        $mail_message = str_replace('<post_url>', $this->feather->url->get_link('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
-                        $mail_message = str_replace('<unsubscribe_url>', $this->feather->url->get_link('unsubscribe/topic/'.$tid.'/'), $mail_message);
+                        $mail_message = str_replace('<post_url>', $this->feather->url->get('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
+                        $mail_message = str_replace('<unsubscribe_url>', $this->feather->url->get('unsubscribe/topic/'.$tid.'/'), $mail_message);
                         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                         $mail_message = $this->hook->fire('send_notifications_reply_mail_message', $mail_message);
 
@@ -417,8 +417,8 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
                         $mail_message_full = str_replace('<topic_subject>', $cur_posting['subject'], $mail_message_full);
                         $mail_message_full = str_replace('<replier>', $post['username'], $mail_message_full);
                         $mail_message_full = str_replace('<message>', $cleaned_message, $mail_message_full);
-                        $mail_message_full = str_replace('<post_url>', $this->feather->url->get_link('post/'.$new_pid.'/#p'.$new_pid), $mail_message_full);
-                        $mail_message_full = str_replace('<unsubscribe_url>', $this->feather->url->get_link('unsubscribe/topic/'.$tid.'/'), $mail_message_full);
+                        $mail_message_full = str_replace('<post_url>', $this->feather->url->get('post/'.$new_pid.'/#p'.$new_pid), $mail_message_full);
+                        $mail_message_full = str_replace('<unsubscribe_url>', $this->feather->url->get('unsubscribe/topic/'.$tid.'/'), $mail_message_full);
                         $mail_message_full = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message_full);
                         $mail_message_full = $this->hook->fire('send_notifications_reply_mail_message_full', $mail_message_full);
 
@@ -616,8 +616,8 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
                         $mail_message = str_replace('<topic_subject>', $this->config['o_censoring'] == '1' ? $censored_subject : $post['subject'], $mail_message);
                         $mail_message = str_replace('<forum_name>', $cur_posting['forum_name'], $mail_message);
                         $mail_message = str_replace('<poster>', $post['username'], $mail_message);
-                        $mail_message = str_replace('<topic_url>', $this->feather->url->get_link('topic/'.$new_tid.'/'), $mail_message);
-                        $mail_message = str_replace('<unsubscribe_url>', $this->feather->url->get_link('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message);
+                        $mail_message = str_replace('<topic_url>', $this->feather->url->get('topic/'.$new_tid.'/'), $mail_message);
+                        $mail_message = str_replace('<unsubscribe_url>', $this->feather->url->get('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message);
                         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                         $mail_message = $this->hook->fire('send_notifications_new_topic_mail_message', $mail_message);
 
@@ -626,8 +626,8 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
                         $mail_message_full = str_replace('<forum_name>', $cur_posting['forum_name'], $mail_message_full);
                         $mail_message_full = str_replace('<poster>', $post['username'], $mail_message_full);
                         $mail_message_full = str_replace('<message>', $cleaned_message, $mail_message_full);
-                        $mail_message_full = str_replace('<topic_url>', $this->feather->url->get_link('topic/'.$new_tid.'/'), $mail_message_full);
-                        $mail_message_full = str_replace('<unsubscribe_url>', $this->feather->url->get_link('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message_full);
+                        $mail_message_full = str_replace('<topic_url>', $this->feather->url->get('topic/'.$new_tid.'/'), $mail_message_full);
+                        $mail_message_full = str_replace('<unsubscribe_url>', $this->feather->url->get('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message_full);
                         $mail_message_full = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message_full);
                         $mail_message_full = $this->hook->fire('send_notifications_new_topic_mail_message_full', $mail_message_full);
 
@@ -670,7 +670,7 @@ public function warn_banned_user($post, $new_pid)
 
         $mail_message = str_replace('<username>', $post['username'], $mail_message);
         $mail_message = str_replace('<email>', $post['email'], $mail_message);
-        $mail_message = str_replace('<post_url>', $this->feather->url->get_link('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
+        $mail_message = str_replace('<post_url>', $this->feather->url->get('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
         $mail_message = $this->hook->fire('warn_banned_user_mail_message', $mail_message);
 
diff --git a/model/profile.php b/model/profile.php
index c09c70d5..4dd5cad7 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -136,7 +136,7 @@ public function change_pass($id)
 
             $this->hook->fire('change_pass');
 
-            redirect($this->feather->url->get_link('user/'.$id.'/section/essentials/'), __('Pass updated redirect'));
+            redirect($this->feather->url->get('user/'.$id.'/section/essentials/'), __('Pass updated redirect'));
         }
     }
 
@@ -226,7 +226,7 @@ public function change_email($id)
                     $mail_message = trim(substr($mail_tpl, $first_crlf));
                     $mail_message = str_replace('<username>', $this->user->username, $mail_message);
                     $mail_message = str_replace('<email>', $new_email, $mail_message);
-                    $mail_message = str_replace('<profile_url>', $this->feather->url->get_link('user/'.$id.'/'), $mail_message);
+                    $mail_message = str_replace('<profile_url>', $this->feather->url->get('user/'.$id.'/'), $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                     $mail_message = $this->hook->fire('change_email_mail_message', $mail_message);
 
@@ -263,7 +263,7 @@ public function change_email($id)
                     $mail_message = trim(substr($mail_tpl, $first_crlf));
                     $mail_message = str_replace('<username>', $this->user->username, $mail_message);
                     $mail_message = str_replace('<dupe_list>', implode(', ', $dupe_list), $mail_message);
-                    $mail_message = str_replace('<profile_url>', $this->feather->url->get_link('user/'.$id.'/'), $mail_message);
+                    $mail_message = str_replace('<profile_url>', $this->feather->url->get('user/'.$id.'/'), $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                     $mail_message = $this->hook->fire('change_email_mail_dupe_message', $mail_message);
 
@@ -300,7 +300,7 @@ public function change_email($id)
             $mail_message = trim(substr($mail_tpl, $first_crlf));
             $mail_message = str_replace('<username>', $this->user->username, $mail_message);
             $mail_message = str_replace('<base_url>', get_base_url(), $mail_message);
-            $mail_message = str_replace('<activation_url>', $this->feather->url->get_link('user/'.$id.'/action/change_email/?key='.$new_email_key), $mail_message);
+            $mail_message = str_replace('<activation_url>', $this->feather->url->get('user/'.$id.'/action/change_email/?key='.$new_email_key), $mail_message);
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
             $mail_message = $this->hook->fire('change_email_mail_activate_message', $mail_message);
 
@@ -402,7 +402,7 @@ public function upload_avatar($id, $files_data)
 
         $uploaded_file = $this->hook->fire('upload_avatar', $uploaded_file);
 
-        redirect($this->feather->url->get_link('user/'.$id.'/section/personality/'), __('Avatar upload redirect'));
+        redirect($this->feather->url->get('user/'.$id.'/section/personality/'), __('Avatar upload redirect'));
     }
 
     public function update_group_membership($id)
@@ -469,7 +469,7 @@ public function update_group_membership($id)
 
         $id = $this->hook->fire('update_group_membership', $id);
 
-        redirect($this->feather->url->get_link('user/'.$id.'/section/admin/'), __('Group membership redirect'));
+        redirect($this->feather->url->get('user/'.$id.'/section/admin/'), __('Group membership redirect'));
     }
 
     public function get_username($id)
@@ -539,7 +539,7 @@ public function update_mod_forums($id)
 
         $id = $this->hook->fire('update_mod_forums', $id);
 
-        redirect($this->feather->url->get_link('user/'.$id.'/section/admin/'), __('Update forums redirect'));
+        redirect($this->feather->url->get('user/'.$id.'/section/admin/'), __('Update forums redirect'));
     }
 
     public function ban_user($id)
@@ -558,9 +558,9 @@ public function ban_user($id)
         $ban_id = $ban_id->find_one_col('id');
 
         if ($ban_id) {
-            redirect($this->feather->url->get_link('admin/bans/edit/'.$ban_id.'/'), __('Ban redirect'));
+            redirect($this->feather->url->get('admin/bans/edit/'.$ban_id.'/'), __('Ban redirect'));
         } else {
-            redirect($this->feather->url->get_link('admin/bans/add/'.$id.'/'), __('Ban redirect'));
+            redirect($this->feather->url->get('admin/bans/add/'.$id.'/'), __('Ban redirect'));
         }
     }
 
@@ -592,7 +592,7 @@ public function promote_user($id)
 
         $pid = $this->hook->fire('promote_user', $pid);
 
-        redirect($this->feather->url->get_link('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
+        redirect($this->feather->url->get('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
     }
 
     public function delete_user($id)
@@ -1086,7 +1086,7 @@ public function update_profile($id, $info, $section)
 
         $section = $this->hook->fireDB('update_profile', $section, $id);
 
-        redirect($this->feather->url->get_link('user/'.$id.'/section/'.$section.'/'), __('Profile redirect'));
+        redirect($this->feather->url->get('user/'.$id.'/section/'.$section.'/'), __('Profile redirect'));
     }
 
     public function get_user_info($id)
@@ -1140,7 +1140,7 @@ public function parse_user_info($user)
         if ($user['email_setting'] == '0' && !$this->user->is_guest && $this->user->g_send_email == '1') {
             $user['email_field'] = '<a href="mailto:'.feather_escape($user['email']).'">'.feather_escape($user['email']).'</a>';
         } elseif ($user['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-            $user['email_field'] = '<a href="'.$this->feather->url->get_link('email/'.$user['id'].'/').'">'.__('Send email').'</a>';
+            $user['email_field'] = '<a href="'.$this->feather->url->get('email/'.$user['id'].'/').'">'.__('Send email').'</a>';
         } else {
             $user['email_field'] = '';
         }
@@ -1196,11 +1196,11 @@ public function parse_user_info($user)
         if ($this->user->g_search == '1') {
             $quick_searches = array();
             if ($user['num_posts'] > 0) {
-                $quick_searches[] = '<a href="'.$this->feather->url->get_link('search/?action=show_user_topics&amp;user_id='.$user['id']).'">'.__('Show topics').'</a>';
-                $quick_searches[] = '<a href="'.$this->feather->url->get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Show posts').'</a>';
+                $quick_searches[] = '<a href="'.$this->feather->url->get('search/?action=show_user_topics&amp;user_id='.$user['id']).'">'.__('Show topics').'</a>';
+                $quick_searches[] = '<a href="'.$this->feather->url->get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Show posts').'</a>';
             }
             if ($this->user->is_admmod && $this->config['o_topic_subscriptions'] == '1') {
-                $quick_searches[] = '<a href="'.$this->feather->url->get_link('search/?action=show_subscriptions&amp;user_id='.$user['id']).'">'.__('Show subscriptions').'</a>';
+                $quick_searches[] = '<a href="'.$this->feather->url->get('search/?action=show_subscriptions&amp;user_id='.$user['id']).'">'.__('Show subscriptions').'</a>';
             }
 
             if (!empty($quick_searches)) {
@@ -1238,12 +1238,12 @@ public function edit_essentials($id, $user)
                 $user_disp['username_field'] = '<p>'.sprintf(__('Username info'), feather_escape($user['username'])).'</p>'."\n";
             }
 
-            $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.feather_escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.$this->feather->url->get_link('email/'.$id.'/').'">'.__('Send email').'</a></span></p>'."\n";
+            $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.feather_escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.$this->feather->url->get('email/'.$id.'/').'">'.__('Send email').'</a></span></p>'."\n";
         } else {
             $user_disp['username_field'] = '<p>'.__('Username').': '.feather_escape($user['username']).'</p>'."\n";
 
             if ($this->config['o_regs_verify'] == '1') {
-                $user_disp['email_field'] = '<p>'.sprintf(__('Email info'), feather_escape($user['email']).' - <a href="'.$this->feather->url->get_link('user/'.$id.'/action/change_email/').'">'.__('Change email').'</a>').'</p>'."\n";
+                $user_disp['email_field'] = '<p>'.sprintf(__('Email info'), feather_escape($user['email']).' - <a href="'.$this->feather->url->get('user/'.$id.'/action/change_email/').'">'.__('Change email').'</a>').'</p>'."\n";
             } else {
                 $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.$user['email'].'" size="40" maxlength="80" /><br /></label>'."\n";
             }
@@ -1259,11 +1259,11 @@ public function edit_essentials($id, $user)
         }
 
         if ($this->user->g_search == '1' || $this->user->g_id == FEATHER_ADMIN) {
-            $posts_actions[] = '<a href="'.$this->feather->url->get_link('search/?action=show_user_topics&amp;user_id='.$id).'">'.__('Show topics').'</a>';
-            $posts_actions[] = '<a href="'.$this->feather->url->get_link('search/?action=show_user_posts&amp;user_id='.$id).'">'.__('Show posts').'</a>';
+            $posts_actions[] = '<a href="'.$this->feather->url->get('search/?action=show_user_topics&amp;user_id='.$id).'">'.__('Show topics').'</a>';
+            $posts_actions[] = '<a href="'.$this->feather->url->get('search/?action=show_user_posts&amp;user_id='.$id).'">'.__('Show posts').'</a>';
 
             if ($this->config['o_topic_subscriptions'] == '1') {
-                $posts_actions[] = '<a href="'.$this->feather->url->get_link('search/?action=show_subscriptions&amp;user_id='.$id).'">'.__('Show subscriptions').'</a>';
+                $posts_actions[] = '<a href="'.$this->feather->url->get('search/?action=show_subscriptions&amp;user_id='.$id).'">'.__('Show subscriptions').'</a>';
             }
         }
 
diff --git a/model/register.php b/model/register.php
index bc5e2467..57bbbe0c 100644
--- a/model/register.php
+++ b/model/register.php
@@ -190,7 +190,7 @@ public function insert_user($user)
                 $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
                 $mail_message = str_replace('<email>', $user['email1'], $mail_message);
-                $mail_message = str_replace('<profile_url>', $this->feather->url->get_link('user/'.$new_uid.'/'), $mail_message);
+                $mail_message = str_replace('<profile_url>', $this->feather->url->get('user/'.$new_uid.'/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                 $mail_message = $this->hook->fire('insert_user_banned_mail_message', $mail_message);
 
@@ -211,7 +211,7 @@ public function insert_user($user)
                 $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
                 $mail_message = str_replace('<dupe_list>', implode(', ', $dupe_list), $mail_message);
-                $mail_message = str_replace('<profile_url>', $this->feather->url->get_link('user/'.$new_uid.'/'), $mail_message);
+                $mail_message = str_replace('<profile_url>', $this->feather->url->get('user/'.$new_uid.'/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                 $mail_message = $this->hook->fire('insert_user_dupe_mail_message', $mail_message);
 
@@ -232,8 +232,8 @@ public function insert_user($user)
                 $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
                 $mail_message = str_replace('<base_url>', get_base_url().'/', $mail_message);
-                $mail_message = str_replace('<profile_url>', $this->feather->url->get_link('user/'.$new_uid.'/'), $mail_message);
-                $mail_message = str_replace('<admin_url>', $this->feather->url->get_link('user/'.$new_uid.'/section/admin/'), $mail_message);
+                $mail_message = str_replace('<profile_url>', $this->feather->url->get('user/'.$new_uid.'/'), $mail_message);
+                $mail_message = str_replace('<admin_url>', $this->feather->url->get('user/'.$new_uid.'/section/admin/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                 $mail_message = $this->hook->fire('insert_user_new_mail_message', $mail_message);
 
@@ -257,7 +257,7 @@ public function insert_user($user)
             $mail_message = str_replace('<base_url>', get_base_url().'/', $mail_message);
             $mail_message = str_replace('<username>', $user['username'], $mail_message);
             $mail_message = str_replace('<password>', $user['password1'], $mail_message);
-            $mail_message = str_replace('<login_url>', $this->feather->url->get_link('login/'), $mail_message);
+            $mail_message = str_replace('<login_url>', $this->feather->url->get('login/'), $mail_message);
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
             $mail_message = $this->hook->fire('insert_user_welcome_mail_message', $mail_message);
 
diff --git a/model/search.php b/model/search.php
index 5c1c713f..b454cb25 100644
--- a/model/search.php
+++ b/model/search.php
@@ -569,7 +569,7 @@ public function get_search_results()
 
         // If we're on the new posts search, display a "mark all as read" link
         if (!$this->user->is_guest && $search_type[0] == 'action' && $search_type[1] == 'show_new') {
-            $search['forum_actions'][] = '<a href="'.$this->feather->url->get_link('mark-read/').'">'.__('Mark all as read').'</a>';
+            $search['forum_actions'][] = '<a href="'.$this->feather->url->get('mark-read/').'">'.__('Mark all as read').'</a>';
         }
 
         // Fetch results to display
@@ -643,9 +643,9 @@ public function get_search_results()
 
             if ($search_type[0] == 'action') {
                 if ($search_type[1] == 'show_user_topics') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get_link('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_topics'), feather_escape($search['search_set'][0]['poster'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_topics'), feather_escape($search['search_set'][0]['poster'])).'</a>';
                 } elseif ($search_type[1] == 'show_user_posts') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get_link('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_posts'), feather_escape($search['search_set'][0]['pposter'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_posts'), feather_escape($search['search_set'][0]['pposter'])).'</a>';
                 } elseif ($search_type[1] == 'show_subscriptions') {
                     // Fetch username of subscriber
                     $subscriber_id = $search_type[2];
@@ -658,10 +658,10 @@ public function get_search_results()
                         message(__('Bad request'), '404');
                     }
 
-                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get_link('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), feather_escape($subscriber_name)).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), feather_escape($subscriber_name)).'</a>';
                 } else {
                     $search_url = str_replace('_', '/', $search_type[1]);
-                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get_link('search/'.$search_url.'/').'">'.__('Quick search '.$search_type[1]).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/'.$search_url.'/').'">'.__('Quick search '.$search_type[1]).'</a>';
                 }
             } else {
                 $keywords = $author = '';
@@ -677,7 +677,7 @@ public function get_search_results()
                     $search['crumbs_text']['search_type'] = sprintf(__('By user show as '.$show_as), feather_escape($author));
                 }
 
-                $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get_link('search/?action=search&amp;keywords='.urlencode($keywords).'&amp;author='.urlencode($author).'&amp;forums='.$search_type[2].'&amp;search_in='.$search_type[3].'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir.'&amp;show_as='.$show_as).'">'.$search['crumbs_text']['search_type'].'</a>';
+                $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=search&amp;keywords='.urlencode($keywords).'&amp;author='.urlencode($author).'&amp;forums='.$search_type[2].'&amp;search_in='.$search_type[3].'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir.'&amp;show_as='.$show_as).'">'.$search['crumbs_text']['search_type'].'</a>';
             }
         }
 
@@ -702,7 +702,7 @@ public function display_search_results($search)
         $post_count = $topic_count = 0;
 
         foreach ($search['search_set'] as $cur_search) {
-            $forum = '<a href="'.$this->feather->url->get_link('forum/'.$cur_search['forum_id'].'/'.$this->feather->url->url_friendly($cur_search['forum_name']).'/').'">'.feather_escape($cur_search['forum_name']).'</a>';
+            $forum = '<a href="'.$this->feather->url->get('forum/'.$cur_search['forum_id'].'/'.$this->feather->url->url_friendly($cur_search['forum_name']).'/').'">'.feather_escape($cur_search['forum_name']).'</a>';
             $url_topic = $this->feather->url->url_friendly($cur_search['subject']);
 
             if ($this->config['o_censoring'] == '1') {
@@ -730,7 +730,7 @@ public function display_search_results($search)
                 $pposter = feather_escape($cur_search['pposter']);
 
                 if ($cur_search['poster_id'] > 1 && $this->user->g_view_users == '1') {
-                    $cur_search['pposter_disp'] = '<strong><a href="'.$this->feather->url->get_link('user/'.$cur_search['poster_id'].'/').'">'.$pposter.'</a></strong>';
+                    $cur_search['pposter_disp'] = '<strong><a href="'.$this->feather->url->get('user/'.$cur_search['poster_id'].'/').'">'.$pposter.'</a></strong>';
                 } else {
                     $cur_search['pposter_disp'] = '<strong>'.$pposter.'</strong>';
                 }
@@ -748,7 +748,7 @@ public function display_search_results($search)
                 $cur_search['item_status'] = ($topic_count % 2 == 0) ? 'roweven' : 'rowodd';
                 $cur_search['icon_type'] = 'icon';
 
-                $subject = '<a href="'.$this->feather->url->get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.feather_escape($cur_search['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['poster']).'</span>';
+                $subject = '<a href="'.$this->feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.feather_escape($cur_search['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['poster']).'</span>';
 
                 if ($cur_search['sticky'] == '1') {
                     $cur_search['item_status'] .= ' isticky';
@@ -764,7 +764,7 @@ public function display_search_results($search)
                     $cur_search['item_status'] .= ' inew';
                     $cur_search['icon_type'] = 'icon icon-new';
                     $subject = '<strong>'.$subject.'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->url->get_link('topic/'.$cur_search['tid'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->url->get('topic/'.$cur_search['tid'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
diff --git a/model/viewforum.php b/model/viewforum.php
index 779d6999..0044e4a8 100644
--- a/model/viewforum.php
+++ b/model/viewforum.php
@@ -103,13 +103,13 @@ public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
         if (!$this->user->is_guest) {
             if ($subscriptions == 1) {
                 if ($is_subscribed) {
-                    $forum_actions[] = '<span>'.__('Is subscribed').' - </span><a href="'.$this->feather->url->get_link('unsubscribe/forum/'.$forum_id.'/').'">'.__('Unsubscribe').'</a>';
+                    $forum_actions[] = '<span>'.__('Is subscribed').' - </span><a href="'.$this->feather->url->get('unsubscribe/forum/'.$forum_id.'/').'">'.__('Unsubscribe').'</a>';
                 } else {
-                    $forum_actions[] = '<a href="'.$this->feather->url->get_link('subscribe/forum/'.$forum_id.'/').'">'.__('Subscribe').'</a>';
+                    $forum_actions[] = '<a href="'.$this->feather->url->get('subscribe/forum/'.$forum_id.'/').'">'.__('Subscribe').'</a>';
                 }
             }
 
-            $forum_actions[] = '<a href="'.$this->feather->url->get_link('mark-forum-read/'.$forum_id.'/').'">'.__('Mark forum read').'</a>';
+            $forum_actions[] = '<a href="'.$this->feather->url->get('mark-forum-read/'.$forum_id.'/').'">'.__('Mark forum read').'</a>';
         }
 
         $forum_actions = $this->hook->fire('get_page_head', $forum_actions);
@@ -187,7 +187,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 $url_subject = $this->feather->url->url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_formatted'] = '<a href="'.$this->feather->url->get_link('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_formatted'] = '<a href="'.$this->feather->url->get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
                 } else {
                     $cur_topic['last_post_formatted'] = '- - -';
                 }
@@ -202,13 +202,13 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get_link('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get_link('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
@@ -217,7 +217,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_formatted'] = '<strong>'.$cur_topic['subject_formatted'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->url->get_link('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
diff --git a/model/viewtopic.php b/model/viewtopic.php
index 81ab1b86..8b913eb0 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -160,7 +160,7 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
 
         if ($closed == '0') {
             if (($post_replies == '' && $this->user->g_post_replies == '1') || $post_replies == '1' || $is_admmod) {
-                $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.$this->feather->url->get_link('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a></p>'."\n";
+                $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.$this->feather->url->get('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a></p>'."\n";
             } else {
                 $post_link = '';
             }
@@ -168,7 +168,7 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
             $post_link = __('Topic closed');
 
             if ($is_admmod) {
-                $post_link .= ' / <a href="'.$this->feather->url->get_link('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a>';
+                $post_link .= ' / <a href="'.$this->feather->url->get('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a>';
             }
 
             $post_link = "\t\t\t".'<p class="postlink conr">'.$post_link.'</p>'."\n";
@@ -206,9 +206,9 @@ public function get_subscraction($is_subscribed, $topic_id)
         if (!$this->user->is_guest && $this->config['o_topic_subscriptions'] == '1') {
             if ($is_subscribed) {
                 // I apologize for the variable naming here. It's a mix of subscription and action I guess :-)
-                $subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.__('Is subscribed').' - </span><a href="'.$this->feather->url->get_link('unsubscribe/topic/'.$topic_id.'/').'">'.__('Unsubscribe').'</a></p>'."\n";
+                $subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.__('Is subscribed').' - </span><a href="'.$this->feather->url->get('unsubscribe/topic/'.$topic_id.'/').'">'.__('Unsubscribe').'</a></p>'."\n";
             } else {
-                $subscraction = "\t\t".'<p class="subscribelink clearb"><a href="'.$this->feather->url->get_link('subscribe/topic/'.$topic_id.'/').'">'.__('Subscribe').'</a></p>'."\n";
+                $subscraction = "\t\t".'<p class="subscribelink clearb"><a href="'.$this->feather->url->get('subscribe/topic/'.$topic_id.'/').'">'.__('Subscribe').'</a></p>'."\n";
             }
         } else {
             $subscraction = '';
@@ -317,7 +317,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                     if ((($cur_post['email_setting'] == '0' && !$this->user->is_guest) || $this->user->is_admmod) && $this->user->g_send_email == '1') {
                         $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['email']).'">'.__('Email').'</a></span>';
                     } elseif ($cur_post['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.$this->feather->url->get_link('email/'.$cur_post['poster_id'].'/').'">'.__('Email').'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.$this->feather->url->get('email/'.$cur_post['poster_id'].'/').'">'.__('Email').'</a></span>';
                     }
 
                     if ($cur_post['url'] != '') {
@@ -336,7 +336,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 }
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get_link('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
 
                     if ($cur_post['admin_note'] != '') {
                         $cur_post['user_info'][] = '<dd><span>'.__('Note').' <strong>'.feather_escape($cur_post['admin_note']).'</strong></span></dd>';
@@ -349,7 +349,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 $cur_post['user_title_formatted'] = get_title($cur_post);
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get_link('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
                 }
 
                 if ($this->config['o_show_user_info'] == '1' && $cur_post['poster_email'] != '' && !$this->user->is_guest && $this->user->g_send_email == '1') {
@@ -360,30 +360,30 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
             // Generation post action array (quote, edit, delete etc.)
             if (!$is_admmod) {
                 if (!$this->user->is_guest) {
-                    $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.$this->feather->url->get_link('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.$this->feather->url->get('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
                 }
 
                 if ($cur_topic['closed'] == '0') {
                     if ($cur_post['poster_id'] == $this->user->id) {
                         if ((($start_from + $post_count) == 1 && $this->user->g_delete_topics == '1') || (($start_from + $post_count) > 1 && $this->user->g_delete_posts == '1')) {
-                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.$this->feather->url->get_link('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
+                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.$this->feather->url->get('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
                         }
                         if ($this->user->g_edit_posts == '1') {
-                            $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.$this->feather->url->get_link('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
+                            $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.$this->feather->url->get('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
                         }
                     }
 
                     if (($cur_topic['post_replies'] == '' && $this->user->g_post_replies == '1') || $cur_topic['post_replies'] == '1') {
-                        $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.$this->feather->url->get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
+                        $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.$this->feather->url->get('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
                     }
                 }
             } else {
-                $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.$this->feather->url->get_link('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
+                $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.$this->feather->url->get('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
                 if ($this->user->g_id == FEATHER_ADMIN || !in_array($cur_post['poster_id'], $admin_ids)) {
-                    $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.$this->feather->url->get_link('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
-                    $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.$this->feather->url->get_link('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.$this->feather->url->get('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.$this->feather->url->get('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
                 }
-                $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.$this->feather->url->get_link('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
+                $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.$this->feather->url->get('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
             }
 
             // Perform the main parsing of the message (BBCode, smilies, censor words etc)
diff --git a/plugins/test/plugintest.php b/plugins/test/plugintest.php
index 20b9d907..4820e357 100644
--- a/plugins/test/plugintest.php
+++ b/plugins/test/plugintest.php
@@ -22,12 +22,12 @@ public function __construct()
         $this->hook = $this->feather->hooks;
 
         $this->hook->bind('get_forum_actions', function ($forum_actions) {
-            $forum_actions[] = '<a href="' . $this->feather->url->get_link('mark-read/') . '">Test1</a>';
+            $forum_actions[] = '<a href="' . $this->feather->url->get('mark-read/') . '">Test1</a>';
             return $forum_actions;
         });
 
         $this->hook->bind('get_forum_actions', function ($forum_actions) {
-            $forum_actions[] = '<a href="' . $this->feather->url->get_link('mark-read/') . '">Test2</a>';
+            $forum_actions[] = '<a href="' . $this->feather->url->get('mark-read/') . '">Test2</a>';
             return $forum_actions;
         });
 
diff --git a/style/FeatherBB/view/admin/bans/admin_bans.php b/style/FeatherBB/view/admin/bans/admin_bans.php
index 50e72e76..14b13968 100644
--- a/style/FeatherBB/view/admin/bans/admin_bans.php
+++ b/style/FeatherBB/view/admin/bans/admin_bans.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('New ban head') ?></span></h2>
 		<div class="box">
-			<form id="bans" method="post" action="<?php echo $feather->url->get_link('admin/bans/add/') ?>">
+			<form id="bans" method="post" action="<?php echo $feather->url->get('admin/bans/add/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
@@ -39,7 +39,7 @@
 
 		<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
 		<div class="box">
-			<form id="find_bans" method="get" action="<?php echo $feather->url->get_link('admin/bans/') ?>">
+			<form id="find_bans" method="get" action="<?php echo $feather->url->get('admin/bans/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
 				<div class="inform">
diff --git a/style/FeatherBB/view/admin/bans/search_ban.php b/style/FeatherBB/view/admin/bans/search_ban.php
index 676b3e63..b8aefcbb 100644
--- a/style/FeatherBB/view/admin/bans/search_ban.php
+++ b/style/FeatherBB/view/admin/bans/search_ban.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -55,8 +55,8 @@
 					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? feather_escape($cur_ban['ip']) : '&#160;' ?></td>
 					<td class="tc4"><?php echo format_time($cur_ban['expire'], true) ?></td>
 					<td class="tc5"><?php echo($cur_ban['message'] != '') ? feather_escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get_link('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get_link('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
+					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
 				</tr>
 <?php
 
@@ -78,8 +78,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
         <ul class="crumbs">
-            <li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+            <li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+            <li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
             <li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
         </ul>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/admin/categories.php b/style/FeatherBB/view/admin/categories.php
index 370838ac..7d922439 100644
--- a/style/FeatherBB/view/admin/categories.php
+++ b/style/FeatherBB/view/admin/categories.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Add categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/categories/add/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/categories/add/') ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('Add categories subhead') ?></legend>
@@ -27,7 +27,7 @@
 									<td>
 										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
-										<span><?php printf(__('Add category help'), '<a href="'.$feather->url->get_link('admin/forums').'">'.__('Forums').'</a>') ?></span>
+										<span><?php printf(__('Add category help'), '<a href="'.$feather->url->get('admin/forums').'">'.__('Forums').'</a>') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -39,7 +39,7 @@
 
 <?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/categories/delete') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/categories/delete') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
@@ -71,7 +71,7 @@
 
 <?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/categories/edit/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/categories/edit/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/style/FeatherBB/view/admin/censoring.php b/style/FeatherBB/view/admin/censoring.php
index 69977dfa..bcd64ca5 100644
--- a/style/FeatherBB/view/admin/censoring.php
+++ b/style/FeatherBB/view/admin/censoring.php
@@ -16,13 +16,13 @@
 	<div class="blockform">
 		<h2><span><?php _e('Censoring head') ?></span></h2>
 		<div class="box">
-			<form id="censoring" method="post" action="<?php echo $feather->url->get_link('admin/censoring/') ?>">
+			<form id="censoring" method="post" action="<?php echo $feather->url->get('admin/censoring/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('Add word subhead') ?></legend>
 						<div class="infldset">
-							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.$feather->url->get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.$feather->url->get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
+							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
 							<table>
 							<thead>
 								<tr>
diff --git a/style/FeatherBB/view/admin/forums/admin_forums.php b/style/FeatherBB/view/admin/forums/admin_forums.php
index cbd5a6c0..a2525106 100644
--- a/style/FeatherBB/view/admin/forums/admin_forums.php
+++ b/style/FeatherBB/view/admin/forums/admin_forums.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Add forum head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/forums/add') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/forums/add') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if (!empty($cat_list)) {
@@ -65,7 +65,7 @@
     ?>
 		<h2 class="block2"><span><?php _e('Manage forums head') ?></span></h2>
 		<div class="box">
-			<form id="edforum" method="post" action="<?php echo $feather->url->get_link('admin/forums/') ?>">
+			<form id="edforum" method="post" action="<?php echo $feather->url->get('admin/forums/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
 <?php
@@ -88,7 +88,7 @@
 	foreach ($cat_data['cat_forums'] as $forum) {
         ?>
 								<tr>
-									<td class="tcl"><a href="<?php echo $feather->url->get_link('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get_link('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
+									<td class="tcl"><a href="<?php echo $feather->url->get('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
 									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
 									<td class="tcr"><strong><?php echo feather_escape($forum['forum_name']) ?></strong></td>
 								</tr>
diff --git a/style/FeatherBB/view/admin/forums/delete_forum.php b/style/FeatherBB/view/admin/forums/delete_forum.php
index 86954f4d..4a2df3f1 100644
--- a/style/FeatherBB/view/admin/forums/delete_forum.php
+++ b/style/FeatherBB/view/admin/forums/delete_forum.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Confirm delete head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/style/FeatherBB/view/admin/forums/permissions.php b/style/FeatherBB/view/admin/forums/permissions.php
index 8f358170..7b394b63 100644
--- a/style/FeatherBB/view/admin/forums/permissions.php
+++ b/style/FeatherBB/view/admin/forums/permissions.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Edit forum head') ?></span></h2>
 		<div class="box">
-			<form id="edit_forum" method="post" action="<?php echo $feather->url->get_link('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
+			<form id="edit_forum" method="post" action="<?php echo $feather->url->get('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
 				<div class="inform">
diff --git a/style/FeatherBB/view/admin/groups/admin_groups.php b/style/FeatherBB/view/admin/groups/admin_groups.php
index d776239e..10b68fa4 100644
--- a/style/FeatherBB/view/admin/groups/admin_groups.php
+++ b/style/FeatherBB/view/admin/groups/admin_groups.php
@@ -18,7 +18,7 @@
 		<div class="box">
 				<div class="inform">
 					<fieldset>
-                        <form id="groups" method="post" action="<?php echo $feather->url->get_link('admin/groups/add/') ?>">
+                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/add/') ?>">
                         <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 						<legend><?php _e('Add group subhead') ?></legend>
 						<div class="infldset">
@@ -51,7 +51,7 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-                        <form id="groups" method="post" action="<?php echo $feather->url->get_link('admin/groups/') ?>">
+                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/') ?>">
                         	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 						<legend><?php _e('Default group subhead') ?></legend>
 						<div class="infldset">
@@ -95,7 +95,7 @@
 							<table>
 <?php
 foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get_link('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get_link('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
 }
 
 ?>
diff --git a/style/FeatherBB/view/admin/groups/confirm_delete.php b/style/FeatherBB/view/admin/groups/confirm_delete.php
index df490091..91b0b84e 100644
--- a/style/FeatherBB/view/admin/groups/confirm_delete.php
+++ b/style/FeatherBB/view/admin/groups/confirm_delete.php
@@ -16,10 +16,10 @@
 	<div class="blockform">
 		<h2><span><?php _e('Group delete head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/groups/delete/'.$id.'/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
-				<input type="hidden" name="group_to_delete" value="<?php echo $feather->url->get_link('admin/groups/delete/'.$id.'/') ?>" />
+				<input type="hidden" name="group_to_delete" value="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>" />
 					<fieldset>
 						<legend><?php _e('Confirm delete subhead') ?></legend>
 						<div class="infldset">
diff --git a/style/FeatherBB/view/admin/groups/delete_group.php b/style/FeatherBB/view/admin/groups/delete_group.php
index a878dcbb..c9cd76e8 100644
--- a/style/FeatherBB/view/admin/groups/delete_group.php
+++ b/style/FeatherBB/view/admin/groups/delete_group.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Delete group head') ?></span></h2>
 		<div class="box">
-			<form id="groups" method="post" action="<?php echo $feather->url->get_link('admin/groups/delete/'.$id.'/') ?>">
+			<form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/style/FeatherBB/view/admin/index.php b/style/FeatherBB/view/admin/index.php
index 710a0e0e..4dcbbbbb 100644
--- a/style/FeatherBB/view/admin/index.php
+++ b/style/FeatherBB/view/admin/index.php
@@ -35,7 +35,7 @@
 <?php if ($install_file_exists) : ?>
 		<h2 class="block2"><span><?php _e('Alerts head') ?></span></h2>
 		<div id="adalerts" class="box">
-			<p><?php printf(__('Install file exists'), '<a href="'.$feather->url->get_link('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
+			<p><?php printf(__('Install file exists'), '<a href="'.$feather->url->get('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
 		</div>
 <?php endif; ?>
 
@@ -45,11 +45,11 @@
 				<dl>
 					<dt><?php _e('FeatherBB version label') ?></dt>
 					<dd>
-						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.$feather->url->get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
+						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.$feather->url->get('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
 					</dd>
 					<dt><?php _e('Server statistics label') ?></dt>
 					<dd>
-						<a href="<?php echo $feather->url->get_link('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
+						<a href="<?php echo $feather->url->get('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
 					</dd>
 					<dt><?php _e('Support label') ?></dt>
 					<dd>
diff --git a/style/FeatherBB/view/admin/maintenance/admin_maintenance.php b/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
index 6bd9ade5..0e70cca3 100644
--- a/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
+++ b/style/FeatherBB/view/admin/maintenance/admin_maintenance.php
@@ -16,13 +16,13 @@
 	<div class="blockform">
 		<h2><span><?php _e('Maintenance head') ?></span></h2>
 		<div class="box">
-			<form method="get" action="<?php echo $feather->url->get_link('admin/maintenance/') ?>">
+			<form method="get" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="rebuild" />
 					<fieldset>
 						<legend><?php _e('Rebuild index subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Rebuild index info'), '<a href="'.$feather->url->get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<p><?php printf(__('Rebuild index info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php _e('Posts per cycle label') ?></th>
@@ -52,7 +52,7 @@
 				</div>
 			</form>
 
-			<form method="post" action="<?php echo $feather->url->get_link('admin/maintenance/') ?>" onsubmit="return process_form(this)">
+			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>" onsubmit="return process_form(this)">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
@@ -87,7 +87,7 @@
 									</td>
 								</tr>
 							</table>
-							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.$feather->url->get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
 							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php _e('Prune') ?>" tabindex="8" /></div>
 						</div>
 					</fieldset>
diff --git a/style/FeatherBB/view/admin/maintenance/prune.php b/style/FeatherBB/view/admin/maintenance/prune.php
index fcfd7918..0232957a 100644
--- a/style/FeatherBB/view/admin/maintenance/prune.php
+++ b/style/FeatherBB/view/admin/maintenance/prune.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Prune head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/maintenance/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
diff --git a/style/FeatherBB/view/admin/maintenance/rebuild.php b/style/FeatherBB/view/admin/maintenance/rebuild.php
index b4f9434b..576d1ecf 100644
--- a/style/FeatherBB/view/admin/maintenance/rebuild.php
+++ b/style/FeatherBB/view/admin/maintenance/rebuild.php
@@ -13,5 +13,5 @@
 }
 ?>
 <h1><?php _e('Rebuilding index info') ?></h1>
-<script type="text/javascript">window.location="<?= $feather->url->get_link('admin/maintenance/').$query_str ?>"</script>
-<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.$feather->url->get_link('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>
+<script type="text/javascript">window.location="<?= $feather->url->get('admin/maintenance/').$query_str ?>"</script>
+<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.$feather->url->get('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>
diff --git a/style/FeatherBB/view/admin/menu.php b/style/FeatherBB/view/admin/menu.php
index abc7f7ed..cadb9915 100644
--- a/style/FeatherBB/view/admin/menu.php
+++ b/style/FeatherBB/view/admin/menu.php
@@ -22,20 +22,20 @@
 					<li<?php if ($page == 'index') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Index') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Index') ?></a></li>
 					<li<?php if ($page == 'users') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 <?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
 <?php endif;
     if ($is_admin || $feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
@@ -51,35 +51,35 @@
 					<li<?php if ($page == 'options') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/options/') ?>"><?php _e('Options') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/options/') ?>"><?php _e('Options') ?></a></li>
 					<li<?php if ($page == 'permissions') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
 					<li<?php if ($page == 'categories') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
 					<li<?php if ($page == 'forums') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
 					<li<?php if ($page == 'groups') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
 					<li<?php if ($page == 'censoring') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
 					<li<?php if ($page == 'parser') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
 					<li<?php if ($page == 'maintenance') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
 				</ul>
 			</div>
 		</div>
@@ -97,7 +97,7 @@
 <?php
 
         foreach ($plugins as $plugin_name => $plugin) {
-            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
+            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.$feather->url->get('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
         }
 
         ?>
diff --git a/style/FeatherBB/view/admin/options.php b/style/FeatherBB/view/admin/options.php
index 161058ea..867e95b1 100644
--- a/style/FeatherBB/view/admin/options.php
+++ b/style/FeatherBB/view/admin/options.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Options head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/options/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/options/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
@@ -421,7 +421,7 @@
 										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.$feather->url->get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
+										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.$feather->url->get('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
diff --git a/style/FeatherBB/view/admin/parser.php b/style/FeatherBB/view/admin/parser.php
index df29eb0d..35699c2b 100644
--- a/style/FeatherBB/view/admin/parser.php
+++ b/style/FeatherBB/view/admin/parser.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php echo $lang_admin_parser['Parser head'] ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/parser/') ?>" enctype="multipart/form-data">
+			<form method="post" action="<?php echo $feather->url->get('admin/parser/') ?>" enctype="multipart/form-data">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop">
 					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
diff --git a/style/FeatherBB/view/admin/permissions.php b/style/FeatherBB/view/admin/permissions.php
index e8201e72..1fe92218 100644
--- a/style/FeatherBB/view/admin/permissions.php
+++ b/style/FeatherBB/view/admin/permissions.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Permissions head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/permissions/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/permissions/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
diff --git a/style/FeatherBB/view/admin/reports.php b/style/FeatherBB/view/admin/reports.php
index 163e25b0..c5249f65 100644
--- a/style/FeatherBB/view/admin/reports.php
+++ b/style/FeatherBB/view/admin/reports.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('New reports head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/reports/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/reports/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if (!empty($report_data)) {
@@ -28,10 +28,10 @@
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get_link('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => $feather->url->get_link('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
@@ -74,14 +74,14 @@
         ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get_link('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
+						<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get_link('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => $feather->url->get_link('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?></th>
diff --git a/style/FeatherBB/view/admin/statistics.php b/style/FeatherBB/view/admin/statistics.php
index d7e779d6..f97ff25c 100644
--- a/style/FeatherBB/view/admin/statistics.php
+++ b/style/FeatherBB/view/admin/statistics.php
@@ -25,7 +25,7 @@
 <?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
 					<dd>
 						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
-						<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->url->get_link('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
+						<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->url->get('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
 						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
 					</dd>
 					<dt><?php _e('Database label') ?></dt>
diff --git a/style/FeatherBB/view/admin/users/admin_users.php b/style/FeatherBB/view/admin/users/admin_users.php
index 20b0a521..74a05472 100644
--- a/style/FeatherBB/view/admin/users/admin_users.php
+++ b/style/FeatherBB/view/admin/users/admin_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('User search head') ?></span></h2>
 		<div class="box">
-			<form id="find_user" method="get" action="<?php echo $feather->url->get_link('admin/users/') ?>">
+			<form id="find_user" method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
 				<p class="submittop"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="1" /></p>
 				<div class="inform">
 					<fieldset>
@@ -150,7 +150,7 @@
 
 		<h2 class="block2"><span><?php _e('IP search head') ?></span></h2>
 		<div class="box">
-			<form method="get" action="<?php echo $feather->url->get_link('admin/users/') ?>">
+			<form method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('IP search subhead') ?></legend>
diff --git a/style/FeatherBB/view/admin/users/ban_users.php b/style/FeatherBB/view/admin/users/ban_users.php
index 1d7bebd2..8e06caff 100644
--- a/style/FeatherBB/view/admin/users/ban_users.php
+++ b/style/FeatherBB/view/admin/users/ban_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Ban users') ?></span></h2>
 		<div class="box">
-			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo $feather->url->get_link('admin/users') ?>">
+			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
diff --git a/style/FeatherBB/view/admin/users/delete_users.php b/style/FeatherBB/view/admin/users/delete_users.php
index 29630f72..1a4360c6 100644
--- a/style/FeatherBB/view/admin/users/delete_users.php
+++ b/style/FeatherBB/view/admin/users/delete_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Delete users') ?></span></h2>
 		<div class="box">
-			<form name="confirm_del_users" method="post" action="<?php echo $feather->url->get_link('admin/users') ?>">
+			<form name="confirm_del_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
diff --git a/style/FeatherBB/view/admin/users/find_users.php b/style/FeatherBB/view/admin/users/find_users.php
index 168ff16b..390c8eaf 100644
--- a/style/FeatherBB/view/admin/users/find_users.php
+++ b/style/FeatherBB/view/admin/users/find_users.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -28,7 +28,7 @@
 </div>
 
 
-<form id="search-users-form" action="<?php echo $feather->url->get_link('admin/users/') ?>" method="post">
+<form id="search-users-form" action="<?php echo $feather->url->get('admin/users/') ?>" method="post">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <div id="users2" class="blocktable">
 	<h2><span><?php _e('Results head') ?></span></h2>
@@ -54,12 +54,12 @@
         foreach ($user_data as $user) {
             ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
 					<td class="tc2"><a href="mailto:<?php echo feather_escape($user['email']) ?>"><?php echo feather_escape($user['email']) ?></a></td>
 					<td class="tc3"><?php echo $user['user_title'] ?></td>
 					<td class="tc4"><?php echo forum_number_format($user['num_posts']) ?></td>
 					<td class="tc5"><?php echo($user['admin_note'] != '') ? feather_escape($user['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
 <?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
 <?php endif;
             ?>
@@ -90,8 +90,8 @@
     ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/admin/users/move_users.php b/style/FeatherBB/view/admin/users/move_users.php
index ee7e6419..54ebe40f 100644
--- a/style/FeatherBB/view/admin/users/move_users.php
+++ b/style/FeatherBB/view/admin/users/move_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Move users') ?></span></h2>
 		<div class="box">
-			<form name="confirm_move_users" method="post" action="<?php echo $feather->url->get_link('admin/users/') ?>">
+			<form name="confirm_move_users" method="post" action="<?php echo $feather->url->get('admin/users/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
 				<div class="inform">
diff --git a/style/FeatherBB/view/admin/users/search_ip.php b/style/FeatherBB/view/admin/users/search_ip.php
index ad3ce72a..58d2bda8 100644
--- a/style/FeatherBB/view/admin/users/search_ip.php
+++ b/style/FeatherBB/view/admin/users/search_ip.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -45,10 +45,10 @@
         foreach ($ip_data as $ip) {
             ?>
 				<tr>
-					<td class="tcl"><a href="<?php echo $feather->url->get_link('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
+					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
 					<td class="tc2"><?php echo format_time($ip['last_used']) ?></td>
 					<td class="tc3"><?php echo $ip['used_times'] ?></td>
-					<td class="tcr"><a href="<?php echo $feather->url->get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
+					<td class="tcr"><a href="<?php echo $feather->url->get('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
 				</tr>
 <?php
 
@@ -70,8 +70,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/admin/users/show_users.php b/style/FeatherBB/view/admin/users/show_users.php
index b662779c..aa5b74d1 100644
--- a/style/FeatherBB/view/admin/users/show_users.php
+++ b/style/FeatherBB/view/admin/users/show_users.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -51,12 +51,12 @@
             if (isset($info['user_data'][$cur_poster['poster_id']])) {
                 ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get_link('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.feather_escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.feather_escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
 					<td class="tc2"><a href="mailto:<?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
 					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
 					<td class="tc4"><?php echo forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
 					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? feather_escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
 				</tr>
 <?php
 
@@ -91,8 +91,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/delete.php b/style/FeatherBB/view/delete.php
index be4aa85c..3bce4ce2 100644
--- a/style/FeatherBB/view/delete.php
+++ b/style/FeatherBB/view/delete.php
@@ -17,8 +17,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="index.php"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>
@@ -27,7 +27,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Delete post') ?></span></h2>
 	<div class="box">
-		<form method="post" action="<?php echo $feather->url->get_link('delete/'.$id.'/') ?>">
+		<form method="post" action="<?php echo $feather->url->get('delete/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
diff --git a/style/FeatherBB/view/edit.php b/style/FeatherBB/view/edit.php
index 0cce7ef5..0d4943d2 100644
--- a/style/FeatherBB/view/edit.php
+++ b/style/FeatherBB/view/edit.php
@@ -20,8 +20,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
 		</ul>
 	</div>
@@ -76,7 +76,7 @@
 <div id="editform" class="blockform">
 	<h2><span><?php _e('Edit post') ?></span></h2>
 	<div class="box">
-		<form id="edit" method="post" action="<?php echo $feather->url->get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
+		<form id="edit" method="post" action="<?php echo $feather->url->get('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -89,10 +89,10 @@
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/style/FeatherBB/view/footer.new.php b/style/FeatherBB/view/footer.new.php
index 7779ef23..f55a6e59 100644
--- a/style/FeatherBB/view/footer.new.php
+++ b/style/FeatherBB/view/footer.new.php
@@ -21,7 +21,7 @@
     if ($active_page == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/forum/'.$fid.'/page/'.$page_number.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/forum/'.$fid.'/page/'.$page_number.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($active_page == 'viewtopic') {
         if (isset($pid)) {
@@ -36,20 +36,20 @@
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/moderate/page/'.$page_number.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+        //echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/moderate/page/'.$page_number.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
 
         if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
         }
 
         if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$tid.'/forum/'.$fid.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
         }
 
         echo "\t\t\t".'</dl>'."\n";
@@ -67,7 +67,7 @@
 			<div class="conl">
 			<form id="qjump" method="get" action="">
 				<div><label><span><?php _e('Jump to') ?><br /></span></label>
-					<select name="id" onchange="window.location=('<?php echo $feather->url->get_link('forum/') ?>'+this.options[this.selectedIndex].value)">
+					<select name="id" onchange="window.location=('<?php echo $feather->url->get('forum/') ?>'+this.options[this.selectedIndex].value)">
 <?php
 		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
 			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
index d825d4c3..75897053 100644
--- a/style/FeatherBB/view/footer.php
+++ b/style/FeatherBB/view/footer.php
@@ -21,7 +21,7 @@
     if ($footer_style == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($footer_style == 'viewtopic') {
         if (isset($pid)) {
@@ -36,20 +36,20 @@
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+        //echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
 
         if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
         }
 
         if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
         }
 
         echo "\t\t\t".'</dl>'."\n";
@@ -67,7 +67,7 @@
 			<div class="conl">
 			<form id="qjump" method="get" action="">
 				<div><label><span><?php _e('Jump to') ?><br /></span></label>
-					<select name="id" onchange="window.location=('<?php echo $feather->url->get_link('forum/') ?>'+this.options[this.selectedIndex].value)">
+					<select name="id" onchange="window.location=('<?php echo $feather->url->get('forum/') ?>'+this.options[this.selectedIndex].value)">
 <?php
 		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
 			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index 1acfb081..89ea8cec 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -100,28 +100,28 @@ function process_form(the_form)
 echo "\t\t\t\t\t\t".'<li id="navindex"'.(($active_page == 'index') ? ' class="isactive"' : '').'><a href="'.get_base_url().'/">'.__('Index').'</a></li>'."\n";
 
 if ($feather->user->g_read_board == '1' && $feather->user->g_view_users == '1') {
-    echo "\t\t\t\t\t\t".'<li id="navuserlist"'.(($active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('userlist/').'">'.__('User list').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navuserlist"'.(($active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('userlist/').'">'.__('User list').'</a></li>'."\n";
 }
 
 if ($feather->forum_settings['o_rules'] == '1' && (!$feather->user->is_guest || $feather->user->g_read_board == '1' || $feather->forum_settings['o_regs_allow'] == '1')) {
-    echo "\t\t\t\t\t\t".'<li id="navrules"'.(($active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('rules/').'">'.__('Rules').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navrules"'.(($active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('rules/').'">'.__('Rules').'</a></li>'."\n";
 }
 
 if ($feather->user->g_read_board == '1' && $feather->user->g_search == '1') {
-    echo "\t\t\t\t\t\t".'<li id="navsearch"'.(($active_page == 'search') ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('search/').'">'.__('Search').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navsearch"'.(($active_page == 'search') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('search/').'">'.__('Search').'</a></li>'."\n";
 }
 
 if ($feather->user->is_guest) {
-    echo "\t\t\t\t\t\t".'<li id="navregister"'.(($active_page == 'register') ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('register/').'">'.__('Register').'</a></li>'."\n";
-    echo "\t\t\t\t\t\t".'<li id="navlogin"'.(($active_page == 'login') ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('login/').'">'.__('Login').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navregister"'.(($active_page == 'register') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('register/').'">'.__('Register').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogin"'.(($active_page == 'login') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('login/').'">'.__('Login').'</a></li>'."\n";
 } else {
-    echo "\t\t\t\t\t\t".'<li id="navprofile"'.(($active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('user/'.$feather->user->id.'/').'">'.__('Profile').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navprofile"'.(($active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('user/'.$feather->user->id.'/').'">'.__('Profile').'</a></li>'."\n";
 
     if ($feather->user->is_admmod) {
-        echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('admin/').'">'.__('Admin').'</a></li>'."\n";
+        echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('admin/').'">'.__('Admin').'</a></li>'."\n";
     }
 
-    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.$feather->url->get_link('logout/id/'.$feather->user->id.'/token/'.feather_hash($feather->user->id.feather_hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.$feather->url->get('logout/id/'.$feather->user->id.'/token/'.feather_hash($feather->user->id.feather_hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
 }
 
 // // Are there any additional navlinks we should insert into the array before imploding it?
@@ -169,12 +169,12 @@ function process_form(the_form)
     if ($feather->user->is_admmod) {
         if ($feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2') {
             if ($has_reports) {
-                echo "\t\t\t\t\t\t".'<li class="reportlink"><span><strong><a href="'.$feather->url->get_link('admin/reports/').'">'.__('New reports').'</a></strong></span></li>'."\n";
+                echo "\t\t\t\t\t\t".'<li class="reportlink"><span><strong><a href="'.$feather->url->get('admin/reports/').'">'.__('New reports').'</a></strong></span></li>'."\n";
             }
         }
 
         if ($feather->forum_settings['o_maintenance'] == '1') {
-            echo "\t\t\t\t\t\t".'<li class="maintenancelink"><span><strong><a href="'.$feather->url->get_link('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>'."\n";
+            echo "\t\t\t\t\t\t".'<li class="maintenancelink"><span><strong><a href="'.$feather->url->get('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>'."\n";
         }
     }
     echo "\t\t\t\t\t".'</ul>'."\n";
@@ -184,11 +184,11 @@ function process_form(the_form)
     echo "\t\t\t\t\t".'<ul class="conr">'."\n";
     echo "\t\t\t\t\t\t".'<li><span>'.__('Topic searches').' ';
     if (!$feather->user->is_guest) {
-        echo '<a href="'.$feather->url->get_link('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a> | ';
-        echo '<a href="'.$feather->url->get_link('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a> | ';
+        echo '<a href="'.$feather->url->get('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a> | ';
+        echo '<a href="'.$feather->url->get('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a> | ';
     }
-    echo '<a href="'.$feather->url->get_link('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a> | ';
-    echo '<a href="'.$feather->url->get_link('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
+    echo '<a href="'.$feather->url->get('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a> | ';
+    echo '<a href="'.$feather->url->get('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
     echo '</li>'."\n";
     echo "\t\t\t\t".'</ul>'."\n";
 } ?>
diff --git a/style/FeatherBB/view/help.php b/style/FeatherBB/view/help.php
index af94b274..2e8ab828 100644
--- a/style/FeatherBB/view/help.php
+++ b/style/FeatherBB/view/help.php
@@ -43,17 +43,17 @@
 		<p><?php _e('Links info') ?></p>
 		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
 		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('/help') ?>"><?php _e('This help page') ?></a></samp></p>
+		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
 		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
-		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('topic/1/') ?>"><?php echo $feather->url->get_link('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('post/1/#p1') ?>"><?php echo $feather->url->get_link('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('forum/1/') ?>"><?php echo $feather->url->get_link('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('user/2/') ?>"><?php echo $feather->url->get_link('user/2/') ?></a></samp></p>
+		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php echo $feather->url->get('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php echo $feather->url->get('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('forum/1/') ?>"><?php echo $feather->url->get('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php echo $feather->url->get('user/2/') ?></a></samp></p>
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
diff --git a/style/FeatherBB/view/login/form.php b/style/FeatherBB/view/login/form.php
index 76d9cb3d..1ad355cd 100644
--- a/style/FeatherBB/view/login/form.php
+++ b/style/FeatherBB/view/login/form.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Login') ?></span></h2>
 	<div class="box">
-		<form id="login" method="post" action="<?php echo $feather->url->get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
+		<form id="login" method="post" action="<?php echo $feather->url->get('login/action/in/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -32,7 +32,7 @@
 						</div>
 
 						<p class="clearb"><?php _e('Login info') ?></p>
-						<p class="actions"><span><a href="<?php echo $feather->url->get_link('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo $feather->url->get_link('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
+						<p class="actions"><span><a href="<?php echo $feather->url->get('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo $feather->url->get('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/login/password_forgotten.php b/style/FeatherBB/view/login/password_forgotten.php
index d9617fe9..432f9aee 100644
--- a/style/FeatherBB/view/login/password_forgotten.php
+++ b/style/FeatherBB/view/login/password_forgotten.php
@@ -39,7 +39,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Request pass') ?></span></h2>
 	<div class="box">
-		<form id="request_pass" method="post" action="<?php echo $feather->url->get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
+		<form id="request_pass" method="post" action="<?php echo $feather->url->get('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/misc/email.php b/style/FeatherBB/view/misc/email.php
index b4ed730d..2c9921bd 100644
--- a/style/FeatherBB/view/misc/email.php
+++ b/style/FeatherBB/view/misc/email.php
@@ -16,7 +16,7 @@
 <div id="emailform" class="blockform">
 	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
 	<div class="box">
-		<form id="email" method="post" action="<?php echo $feather->url->get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="email" method="post" action="<?php echo $feather->url->get('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/misc/report.php b/style/FeatherBB/view/misc/report.php
index 1b55893b..cf8aa64c 100644
--- a/style/FeatherBB/view/misc/report.php
+++ b/style/FeatherBB/view/misc/report.php
@@ -17,8 +17,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
 		</ul>
 	</div>
@@ -27,7 +27,7 @@
 <div id="reportform" class="blockform">
 	<h2><span><?php _e('Report post') ?></span></h2>
 	<div class="box">
-		<form id="report" method="post" action="<?php echo $feather->url->get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="report" method="post" action="<?php echo $feather->url->get('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/moderate/moderator_forum.php b/style/FeatherBB/view/moderate/moderator_forum.php
index f6819d21..dfd1c431 100644
--- a/style/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/FeatherBB/view/moderate/moderator_forum.php
@@ -18,7 +18,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -28,7 +28,7 @@
 	</div>
 </div>
 
-<form method="post" action="<?php echo $feather->url->get_link('moderate/forum/'.$id.'/') ?>">
+<form method="post" action="<?php echo $feather->url->get('moderate/forum/'.$id.'/') ?>">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <input type="hidden" name="page" value="<?php echo feather_escape($p) ?>" />
 <div id="vf" class="blocktable">
@@ -92,7 +92,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/moderate/posts_view.php b/style/FeatherBB/view/moderate/posts_view.php
index ad68aa3d..d71fad09 100644
--- a/style/FeatherBB/view/moderate/posts_view.php
+++ b/style/FeatherBB/view/moderate/posts_view.php
@@ -17,8 +17,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -42,7 +42,7 @@
     echo ' blockpost1';
 }
     ?>">
-		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
+		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<div class="postbody">
@@ -85,8 +85,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/post.php b/style/FeatherBB/view/post.php
index 1030f8d3..b4df1f8e 100644
--- a/style/FeatherBB/view/post.php
+++ b/style/FeatherBB/view/post.php
@@ -18,10 +18,10 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
-<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_posting['subject']) ?></a></li>
+<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_posting['subject']) ?></a></li>
 <?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
 		</ul>
 	</div>
@@ -121,10 +121,10 @@
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/style/FeatherBB/view/profile/change_mail.php b/style/FeatherBB/view/profile/change_mail.php
index 0c97e20c..1e59ab54 100644
--- a/style/FeatherBB/view/profile/change_mail.php
+++ b/style/FeatherBB/view/profile/change_mail.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Change email') ?></span></h2>
 	<div class="box">
-		<form id="change_email" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
+		<form id="change_email" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/profile/change_pass.php b/style/FeatherBB/view/profile/change_pass.php
index 39cd0ed1..1bacb173 100644
--- a/style/FeatherBB/view/profile/change_pass.php
+++ b/style/FeatherBB/view/profile/change_pass.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Change pass') ?></span></h2>
 	<div class="box">
-		<form id="change_pass" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
+		<form id="change_pass" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
diff --git a/style/FeatherBB/view/profile/delete_user.php b/style/FeatherBB/view/profile/delete_user.php
index c950017c..5b22471a 100644
--- a/style/FeatherBB/view/profile/delete_user.php
+++ b/style/FeatherBB/view/profile/delete_user.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Confirm delete user') ?></span></h2>
 	<div class="box">
-		<form id="confirm_del_user" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/') ?>">
+		<form id="confirm_del_user" method="post" action="<?php echo $feather->url->get('user/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/profile/menu.php b/style/FeatherBB/view/profile/menu.php
index 73f384c8..a46fef80 100644
--- a/style/FeatherBB/view/profile/menu.php
+++ b/style/FeatherBB/view/profile/menu.php
@@ -22,32 +22,32 @@
 					<li<?php if ($page == 'essentials') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
 					<li<?php if ($page == 'personal') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
 					<li<?php if ($page == 'messaging') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
 <?php if ($feather->forum_settings['o_avatars'] == '1' || $feather->forum_settings['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
 <?php endif;
     ?>					<li<?php if ($page == 'display') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
 					<li<?php if ($page == 'privacy') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
 <?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
diff --git a/style/FeatherBB/view/profile/section_admin.php b/style/FeatherBB/view/profile/section_admin.php
index 05d190f4..a73c3fb9 100644
--- a/style/FeatherBB/view/profile/section_admin.php
+++ b/style/FeatherBB/view/profile/section_admin.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php echo feather_escape($user['username']).' - '.__('Section admin') ?></span></h2>
 		<div class="box">
-			<form id="profile7" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/admin/') ?>">
+			<form id="profile7" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
diff --git a/style/FeatherBB/view/profile/section_display.php b/style/FeatherBB/view/profile/section_display.php
index 209bf9b5..3277bf29 100644
--- a/style/FeatherBB/view/profile/section_display.php
+++ b/style/FeatherBB/view/profile/section_display.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section display') ?></span></h2>
 	<div class="box">
-		<form id="profile5" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/display/') ?>">
+		<form id="profile5" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php
diff --git a/style/FeatherBB/view/profile/section_essentials.php b/style/FeatherBB/view/profile/section_essentials.php
index 107cfeaa..bb97256c 100644
--- a/style/FeatherBB/view/profile/section_essentials.php
+++ b/style/FeatherBB/view/profile/section_essentials.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section essentials') ?></span></h2>
 	<div class="box">
-		<form id="profile1" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
+		<form id="profile1" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -24,7 +24,7 @@
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo $feather->url->get_link('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
@@ -241,7 +241,7 @@
 				<fieldset>
 					<legend><?php _e('User activity') ?></legend>
 					<div class="infldset">
-						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
 						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
 						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
diff --git a/style/FeatherBB/view/profile/section_messaging.php b/style/FeatherBB/view/profile/section_messaging.php
index 91532065..8597a115 100644
--- a/style/FeatherBB/view/profile/section_messaging.php
+++ b/style/FeatherBB/view/profile/section_messaging.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section messaging') ?></span></h2>
 	<div class="box">
-		<form id="profile3" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/messaging/') ?>">
+		<form id="profile3" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/profile/section_personal.php b/style/FeatherBB/view/profile/section_personal.php
index f9d9fea8..80c19741 100644
--- a/style/FeatherBB/view/profile/section_personal.php
+++ b/style/FeatherBB/view/profile/section_personal.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personal') ?></span></h2>
 	<div class="box">
-		<form id="profile2" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/personal/') ?>">
+		<form id="profile2" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/profile/section_personality.php b/style/FeatherBB/view/profile/section_personality.php
index a1df5d8d..f2692e75 100644
--- a/style/FeatherBB/view/profile/section_personality.php
+++ b/style/FeatherBB/view/profile/section_personality.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personality') ?></span></h2>
 	<div class="box">
-		<form id="profile4" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/personality/') ?>">
+		<form id="profile4" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php if ($feather->forum_settings['o_avatars'] == '1'): ?>				<div class="inform">
@@ -39,10 +39,10 @@
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
diff --git a/style/FeatherBB/view/profile/section_privacy.php b/style/FeatherBB/view/profile/section_privacy.php
index b3262b07..d978904e 100644
--- a/style/FeatherBB/view/profile/section_privacy.php
+++ b/style/FeatherBB/view/profile/section_privacy.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section privacy') ?></span></h2>
 	<div class="box">
-		<form id="profile6" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/privacy/') ?>">
+		<form id="profile6" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/profile/upload_avatar.php b/style/FeatherBB/view/profile/upload_avatar.php
index a1cda00a..ba880454 100644
--- a/style/FeatherBB/view/profile/upload_avatar.php
+++ b/style/FeatherBB/view/profile/upload_avatar.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Upload avatar') ?></span></h2>
 	<div class="box">
-		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo $feather->url->get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
+		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo $feather->url->get('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/FeatherBB/view/register/rules.php b/style/FeatherBB/view/register/rules.php
index edb24b38..326c96ad 100644
--- a/style/FeatherBB/view/register/rules.php
+++ b/style/FeatherBB/view/register/rules.php
@@ -17,7 +17,7 @@
 <div id="rules" class="blockform">
 	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
 	<div class="box">
-		<form method="get" action="<?php echo $feather->url->get_link('register/') ?>">
+		<form method="get" action="<?php echo $feather->url->get('register/') ?>">
 			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Rules legend') ?></legend>
diff --git a/style/FeatherBB/view/search/footer.php b/style/FeatherBB/view/search/footer.php
index 1a77744e..c76aaa97 100644
--- a/style/FeatherBB/view/search/footer.php
+++ b/style/FeatherBB/view/search/footer.php
@@ -31,7 +31,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
 <?php echo(!empty($search['forum_actions']) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $search['forum_actions']).'</p>'."\n" : '') ?>
diff --git a/style/FeatherBB/view/search/header.php b/style/FeatherBB/view/search/header.php
index 5d6eed99..00b4385c 100644
--- a/style/FeatherBB/view/search/header.php
+++ b/style/FeatherBB/view/search/header.php
@@ -17,7 +17,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
 		<div class="pagepost">
diff --git a/style/FeatherBB/view/search/posts.php b/style/FeatherBB/view/search/posts.php
index def30d38..d0eab7cc 100644
--- a/style/FeatherBB/view/search/posts.php
+++ b/style/FeatherBB/view/search/posts.php
@@ -22,7 +22,7 @@
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
     _e('Re').' ';
-} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
+} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
 		<div class="postbody">
@@ -46,8 +46,8 @@
 		<div class="postfoot clearb">
 			<div class="postfootright">
 				<ul>
-					<li><span><a href="<?php echo $feather->url->get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
-					<li><span><a href="<?php echo $feather->url->get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
+					<li><span><a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
+					<li><span><a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
 				</ul>
 			</div>
 		</div>
diff --git a/style/FeatherBB/view/search/topics.php b/style/FeatherBB/view/search/topics.php
index fc7df148..7cead694 100644
--- a/style/FeatherBB/view/search/topics.php
+++ b/style/FeatherBB/view/search/topics.php
@@ -25,5 +25,5 @@
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
 	<td class="tc3"><?php echo forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
+	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
 </tr>
\ No newline at end of file
diff --git a/style/FeatherBB/view/userlist.php b/style/FeatherBB/view/userlist.php
index fb8dd579..a686ba5b 100644
--- a/style/FeatherBB/view/userlist.php
+++ b/style/FeatherBB/view/userlist.php
@@ -87,7 +87,7 @@
             foreach ($userlist_data as $user) {
                 ?>
 					<tr>
-						<td class="tcl"><?php echo '<a href="'.$feather->url->get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
+						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
 						<td class="tc2"><?php echo get_title($user) ?></td>
 	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo forum_number_format($user['num_posts']) ?></td>
 	<?php endif;
diff --git a/style/FeatherBB/view/viewforum.php b/style/FeatherBB/view/viewforum.php
index 1c696ed0..e8370fe7 100644
--- a/style/FeatherBB/view/viewforum.php
+++ b/style/FeatherBB/view/viewforum.php
@@ -17,7 +17,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -92,7 +92,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/viewtopic.php b/style/FeatherBB/view/viewtopic.php
index cfd4c4c5..76324e67 100644
--- a/style/FeatherBB/view/viewtopic.php
+++ b/style/FeatherBB/view/viewtopic.php
@@ -18,8 +18,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -40,7 +40,7 @@
     echo ' blockpost1';
 }
     ?>">
-	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
+	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -108,8 +108,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 <?php echo $subscraction ?>
 		<div class="clearer"></div>
@@ -126,7 +126,7 @@
 <div id="quickpost" class="blockform">
 	<h2><span><?php _e('Quick post') ?></span></h2>
 	<div class="box">
-		<form id="quickpostform" method="post" action="<?php echo $feather->url->get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="quickpostform" method="post" action="<?php echo $feather->url->get('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -163,13 +163,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>
diff --git a/view/admin/bans/admin_bans.php b/view/admin/bans/admin_bans.php
index 50e72e76..14b13968 100644
--- a/view/admin/bans/admin_bans.php
+++ b/view/admin/bans/admin_bans.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('New ban head') ?></span></h2>
 		<div class="box">
-			<form id="bans" method="post" action="<?php echo $feather->url->get_link('admin/bans/add/') ?>">
+			<form id="bans" method="post" action="<?php echo $feather->url->get('admin/bans/add/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
@@ -39,7 +39,7 @@
 
 		<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
 		<div class="box">
-			<form id="find_bans" method="get" action="<?php echo $feather->url->get_link('admin/bans/') ?>">
+			<form id="find_bans" method="get" action="<?php echo $feather->url->get('admin/bans/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
 				<div class="inform">
diff --git a/view/admin/bans/search_ban.php b/view/admin/bans/search_ban.php
index 676b3e63..b8aefcbb 100644
--- a/view/admin/bans/search_ban.php
+++ b/view/admin/bans/search_ban.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -55,8 +55,8 @@
 					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? feather_escape($cur_ban['ip']) : '&#160;' ?></td>
 					<td class="tc4"><?php echo format_time($cur_ban['expire'], true) ?></td>
 					<td class="tc5"><?php echo($cur_ban['message'] != '') ? feather_escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get_link('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get_link('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
+					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
 				</tr>
 <?php
 
@@ -78,8 +78,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
         <ul class="crumbs">
-            <li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+            <li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+            <li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
             <li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
         </ul>
 		<div class="clearer"></div>
diff --git a/view/admin/categories.php b/view/admin/categories.php
index 370838ac..7d922439 100644
--- a/view/admin/categories.php
+++ b/view/admin/categories.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Add categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/categories/add/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/categories/add/') ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('Add categories subhead') ?></legend>
@@ -27,7 +27,7 @@
 									<td>
 										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
-										<span><?php printf(__('Add category help'), '<a href="'.$feather->url->get_link('admin/forums').'">'.__('Forums').'</a>') ?></span>
+										<span><?php printf(__('Add category help'), '<a href="'.$feather->url->get('admin/forums').'">'.__('Forums').'</a>') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -39,7 +39,7 @@
 
 <?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/categories/delete') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/categories/delete') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
@@ -71,7 +71,7 @@
 
 <?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/categories/edit/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/categories/edit/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/view/admin/censoring.php b/view/admin/censoring.php
index 69977dfa..bcd64ca5 100644
--- a/view/admin/censoring.php
+++ b/view/admin/censoring.php
@@ -16,13 +16,13 @@
 	<div class="blockform">
 		<h2><span><?php _e('Censoring head') ?></span></h2>
 		<div class="box">
-			<form id="censoring" method="post" action="<?php echo $feather->url->get_link('admin/censoring/') ?>">
+			<form id="censoring" method="post" action="<?php echo $feather->url->get('admin/censoring/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('Add word subhead') ?></legend>
 						<div class="infldset">
-							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.$feather->url->get_link('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.$feather->url->get_link('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
+							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
 							<table>
 							<thead>
 								<tr>
diff --git a/view/admin/forums/admin_forums.php b/view/admin/forums/admin_forums.php
index cbd5a6c0..a2525106 100644
--- a/view/admin/forums/admin_forums.php
+++ b/view/admin/forums/admin_forums.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Add forum head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/forums/add') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/forums/add') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if (!empty($cat_list)) {
@@ -65,7 +65,7 @@
     ?>
 		<h2 class="block2"><span><?php _e('Manage forums head') ?></span></h2>
 		<div class="box">
-			<form id="edforum" method="post" action="<?php echo $feather->url->get_link('admin/forums/') ?>">
+			<form id="edforum" method="post" action="<?php echo $feather->url->get('admin/forums/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
 <?php
@@ -88,7 +88,7 @@
 	foreach ($cat_data['cat_forums'] as $forum) {
         ?>
 								<tr>
-									<td class="tcl"><a href="<?php echo $feather->url->get_link('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get_link('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
+									<td class="tcl"><a href="<?php echo $feather->url->get('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
 									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
 									<td class="tcr"><strong><?php echo feather_escape($forum['forum_name']) ?></strong></td>
 								</tr>
diff --git a/view/admin/forums/delete_forum.php b/view/admin/forums/delete_forum.php
index 86954f4d..4a2df3f1 100644
--- a/view/admin/forums/delete_forum.php
+++ b/view/admin/forums/delete_forum.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Confirm delete head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/view/admin/forums/permissions.php b/view/admin/forums/permissions.php
index 8f358170..7b394b63 100644
--- a/view/admin/forums/permissions.php
+++ b/view/admin/forums/permissions.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Edit forum head') ?></span></h2>
 		<div class="box">
-			<form id="edit_forum" method="post" action="<?php echo $feather->url->get_link('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
+			<form id="edit_forum" method="post" action="<?php echo $feather->url->get('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
 				<div class="inform">
diff --git a/view/admin/groups/admin_groups.php b/view/admin/groups/admin_groups.php
index d776239e..10b68fa4 100644
--- a/view/admin/groups/admin_groups.php
+++ b/view/admin/groups/admin_groups.php
@@ -18,7 +18,7 @@
 		<div class="box">
 				<div class="inform">
 					<fieldset>
-                        <form id="groups" method="post" action="<?php echo $feather->url->get_link('admin/groups/add/') ?>">
+                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/add/') ?>">
                         <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 						<legend><?php _e('Add group subhead') ?></legend>
 						<div class="infldset">
@@ -51,7 +51,7 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-                        <form id="groups" method="post" action="<?php echo $feather->url->get_link('admin/groups/') ?>">
+                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/') ?>">
                         	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 						<legend><?php _e('Default group subhead') ?></legend>
 						<div class="infldset">
@@ -95,7 +95,7 @@
 							<table>
 <?php
 foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get_link('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get_link('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
 }
 
 ?>
diff --git a/view/admin/groups/confirm_delete.php b/view/admin/groups/confirm_delete.php
index df490091..91b0b84e 100644
--- a/view/admin/groups/confirm_delete.php
+++ b/view/admin/groups/confirm_delete.php
@@ -16,10 +16,10 @@
 	<div class="blockform">
 		<h2><span><?php _e('Group delete head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/groups/delete/'.$id.'/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
-				<input type="hidden" name="group_to_delete" value="<?php echo $feather->url->get_link('admin/groups/delete/'.$id.'/') ?>" />
+				<input type="hidden" name="group_to_delete" value="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>" />
 					<fieldset>
 						<legend><?php _e('Confirm delete subhead') ?></legend>
 						<div class="infldset">
diff --git a/view/admin/groups/delete_group.php b/view/admin/groups/delete_group.php
index a878dcbb..c9cd76e8 100644
--- a/view/admin/groups/delete_group.php
+++ b/view/admin/groups/delete_group.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Delete group head') ?></span></h2>
 		<div class="box">
-			<form id="groups" method="post" action="<?php echo $feather->url->get_link('admin/groups/delete/'.$id.'/') ?>">
+			<form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/view/admin/index.php b/view/admin/index.php
index 710a0e0e..4dcbbbbb 100644
--- a/view/admin/index.php
+++ b/view/admin/index.php
@@ -35,7 +35,7 @@
 <?php if ($install_file_exists) : ?>
 		<h2 class="block2"><span><?php _e('Alerts head') ?></span></h2>
 		<div id="adalerts" class="box">
-			<p><?php printf(__('Install file exists'), '<a href="'.$feather->url->get_link('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
+			<p><?php printf(__('Install file exists'), '<a href="'.$feather->url->get('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
 		</div>
 <?php endif; ?>
 
@@ -45,11 +45,11 @@
 				<dl>
 					<dt><?php _e('FeatherBB version label') ?></dt>
 					<dd>
-						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.$feather->url->get_link('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
+						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.$feather->url->get('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
 					</dd>
 					<dt><?php _e('Server statistics label') ?></dt>
 					<dd>
-						<a href="<?php echo $feather->url->get_link('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
+						<a href="<?php echo $feather->url->get('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
 					</dd>
 					<dt><?php _e('Support label') ?></dt>
 					<dd>
diff --git a/view/admin/maintenance/admin_maintenance.php b/view/admin/maintenance/admin_maintenance.php
index 6bd9ade5..0e70cca3 100644
--- a/view/admin/maintenance/admin_maintenance.php
+++ b/view/admin/maintenance/admin_maintenance.php
@@ -16,13 +16,13 @@
 	<div class="blockform">
 		<h2><span><?php _e('Maintenance head') ?></span></h2>
 		<div class="box">
-			<form method="get" action="<?php echo $feather->url->get_link('admin/maintenance/') ?>">
+			<form method="get" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="rebuild" />
 					<fieldset>
 						<legend><?php _e('Rebuild index subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Rebuild index info'), '<a href="'.$feather->url->get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<p><?php printf(__('Rebuild index info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php _e('Posts per cycle label') ?></th>
@@ -52,7 +52,7 @@
 				</div>
 			</form>
 
-			<form method="post" action="<?php echo $feather->url->get_link('admin/maintenance/') ?>" onsubmit="return process_form(this)">
+			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>" onsubmit="return process_form(this)">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
@@ -87,7 +87,7 @@
 									</td>
 								</tr>
 							</table>
-							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.$feather->url->get_link('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
 							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php _e('Prune') ?>" tabindex="8" /></div>
 						</div>
 					</fieldset>
diff --git a/view/admin/maintenance/prune.php b/view/admin/maintenance/prune.php
index fcfd7918..0232957a 100644
--- a/view/admin/maintenance/prune.php
+++ b/view/admin/maintenance/prune.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Prune head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/maintenance/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
diff --git a/view/admin/maintenance/rebuild.php b/view/admin/maintenance/rebuild.php
index b4f9434b..576d1ecf 100644
--- a/view/admin/maintenance/rebuild.php
+++ b/view/admin/maintenance/rebuild.php
@@ -13,5 +13,5 @@
 }
 ?>
 <h1><?php _e('Rebuilding index info') ?></h1>
-<script type="text/javascript">window.location="<?= $feather->url->get_link('admin/maintenance/').$query_str ?>"</script>
-<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.$feather->url->get_link('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>
+<script type="text/javascript">window.location="<?= $feather->url->get('admin/maintenance/').$query_str ?>"</script>
+<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.$feather->url->get('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>
diff --git a/view/admin/menu.php b/view/admin/menu.php
index abc7f7ed..cadb9915 100644
--- a/view/admin/menu.php
+++ b/view/admin/menu.php
@@ -22,20 +22,20 @@
 					<li<?php if ($page == 'index') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Index') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Index') ?></a></li>
 					<li<?php if ($page == 'users') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 <?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
 <?php endif;
     if ($is_admin || $feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
@@ -51,35 +51,35 @@
 					<li<?php if ($page == 'options') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/options/') ?>"><?php _e('Options') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/options/') ?>"><?php _e('Options') ?></a></li>
 					<li<?php if ($page == 'permissions') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
 					<li<?php if ($page == 'categories') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
 					<li<?php if ($page == 'forums') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
 					<li<?php if ($page == 'groups') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
 					<li<?php if ($page == 'censoring') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
 					<li<?php if ($page == 'parser') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
 					<li<?php if ($page == 'maintenance') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get_link('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
+        ?>><a href="<?php echo $feather->url->get('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
 				</ul>
 			</div>
 		</div>
@@ -97,7 +97,7 @@
 <?php
 
         foreach ($plugins as $plugin_name => $plugin) {
-            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.$feather->url->get_link('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
+            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.$feather->url->get('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
         }
 
         ?>
diff --git a/view/admin/options.php b/view/admin/options.php
index 161058ea..867e95b1 100644
--- a/view/admin/options.php
+++ b/view/admin/options.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Options head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/options/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/options/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
@@ -421,7 +421,7 @@
 										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.$feather->url->get_link('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
+										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.$feather->url->get('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
diff --git a/view/admin/parser.php b/view/admin/parser.php
index df29eb0d..35699c2b 100644
--- a/view/admin/parser.php
+++ b/view/admin/parser.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php echo $lang_admin_parser['Parser head'] ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/parser/') ?>" enctype="multipart/form-data">
+			<form method="post" action="<?php echo $feather->url->get('admin/parser/') ?>" enctype="multipart/form-data">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop">
 					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
diff --git a/view/admin/permissions.php b/view/admin/permissions.php
index e8201e72..1fe92218 100644
--- a/view/admin/permissions.php
+++ b/view/admin/permissions.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Permissions head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/permissions/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/permissions/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
diff --git a/view/admin/reports.php b/view/admin/reports.php
index 163e25b0..c5249f65 100644
--- a/view/admin/reports.php
+++ b/view/admin/reports.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('New reports head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get_link('admin/reports/') ?>">
+			<form method="post" action="<?php echo $feather->url->get('admin/reports/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if (!empty($report_data)) {
@@ -28,10 +28,10 @@
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get_link('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => $feather->url->get_link('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
@@ -74,14 +74,14 @@
         ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get_link('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
+						<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get_link('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get_link('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => $feather->url->get_link('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get_link('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?></th>
diff --git a/view/admin/statistics.php b/view/admin/statistics.php
index d7e779d6..f97ff25c 100644
--- a/view/admin/statistics.php
+++ b/view/admin/statistics.php
@@ -25,7 +25,7 @@
 <?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
 					<dd>
 						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
-						<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->url->get_link('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
+						<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->url->get('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
 						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
 					</dd>
 					<dt><?php _e('Database label') ?></dt>
diff --git a/view/admin/users/admin_users.php b/view/admin/users/admin_users.php
index 20b0a521..74a05472 100644
--- a/view/admin/users/admin_users.php
+++ b/view/admin/users/admin_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('User search head') ?></span></h2>
 		<div class="box">
-			<form id="find_user" method="get" action="<?php echo $feather->url->get_link('admin/users/') ?>">
+			<form id="find_user" method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
 				<p class="submittop"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="1" /></p>
 				<div class="inform">
 					<fieldset>
@@ -150,7 +150,7 @@
 
 		<h2 class="block2"><span><?php _e('IP search head') ?></span></h2>
 		<div class="box">
-			<form method="get" action="<?php echo $feather->url->get_link('admin/users/') ?>">
+			<form method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('IP search subhead') ?></legend>
diff --git a/view/admin/users/ban_users.php b/view/admin/users/ban_users.php
index 1d7bebd2..8e06caff 100644
--- a/view/admin/users/ban_users.php
+++ b/view/admin/users/ban_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Ban users') ?></span></h2>
 		<div class="box">
-			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo $feather->url->get_link('admin/users') ?>">
+			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
diff --git a/view/admin/users/delete_users.php b/view/admin/users/delete_users.php
index 29630f72..1a4360c6 100644
--- a/view/admin/users/delete_users.php
+++ b/view/admin/users/delete_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Delete users') ?></span></h2>
 		<div class="box">
-			<form name="confirm_del_users" method="post" action="<?php echo $feather->url->get_link('admin/users') ?>">
+			<form name="confirm_del_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
diff --git a/view/admin/users/find_users.php b/view/admin/users/find_users.php
index 168ff16b..390c8eaf 100644
--- a/view/admin/users/find_users.php
+++ b/view/admin/users/find_users.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -28,7 +28,7 @@
 </div>
 
 
-<form id="search-users-form" action="<?php echo $feather->url->get_link('admin/users/') ?>" method="post">
+<form id="search-users-form" action="<?php echo $feather->url->get('admin/users/') ?>" method="post">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <div id="users2" class="blocktable">
 	<h2><span><?php _e('Results head') ?></span></h2>
@@ -54,12 +54,12 @@
         foreach ($user_data as $user) {
             ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
 					<td class="tc2"><a href="mailto:<?php echo feather_escape($user['email']) ?>"><?php echo feather_escape($user['email']) ?></a></td>
 					<td class="tc3"><?php echo $user['user_title'] ?></td>
 					<td class="tc4"><?php echo forum_number_format($user['num_posts']) ?></td>
 					<td class="tc5"><?php echo($user['admin_note'] != '') ? feather_escape($user['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get_link('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
 <?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
 <?php endif;
             ?>
@@ -90,8 +90,8 @@
     ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get_link('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/view/admin/users/move_users.php b/view/admin/users/move_users.php
index ee7e6419..54ebe40f 100644
--- a/view/admin/users/move_users.php
+++ b/view/admin/users/move_users.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Move users') ?></span></h2>
 		<div class="box">
-			<form name="confirm_move_users" method="post" action="<?php echo $feather->url->get_link('admin/users/') ?>">
+			<form name="confirm_move_users" method="post" action="<?php echo $feather->url->get('admin/users/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
 				<div class="inform">
diff --git a/view/admin/users/search_ip.php b/view/admin/users/search_ip.php
index ad3ce72a..58d2bda8 100644
--- a/view/admin/users/search_ip.php
+++ b/view/admin/users/search_ip.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -45,10 +45,10 @@
         foreach ($ip_data as $ip) {
             ?>
 				<tr>
-					<td class="tcl"><a href="<?php echo $feather->url->get_link('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
+					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
 					<td class="tc2"><?php echo format_time($ip['last_used']) ?></td>
 					<td class="tc3"><?php echo $ip['used_times'] ?></td>
-					<td class="tcr"><a href="<?php echo $feather->url->get_link('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
+					<td class="tcr"><a href="<?php echo $feather->url->get('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
 				</tr>
 <?php
 
@@ -70,8 +70,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/view/admin/users/show_users.php b/view/admin/users/show_users.php
index b662779c..aa5b74d1 100644
--- a/view/admin/users/show_users.php
+++ b/view/admin/users/show_users.php
@@ -16,8 +16,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -51,12 +51,12 @@
             if (isset($info['user_data'][$cur_poster['poster_id']])) {
                 ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get_link('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.feather_escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.feather_escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
 					<td class="tc2"><a href="mailto:<?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
 					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
 					<td class="tc4"><?php echo forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
 					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? feather_escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
 				</tr>
 <?php
 
@@ -91,8 +91,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get_link('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/view/delete.php b/view/delete.php
index be4aa85c..3bce4ce2 100644
--- a/view/delete.php
+++ b/view/delete.php
@@ -17,8 +17,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="index.php"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>
@@ -27,7 +27,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Delete post') ?></span></h2>
 	<div class="box">
-		<form method="post" action="<?php echo $feather->url->get_link('delete/'.$id.'/') ?>">
+		<form method="post" action="<?php echo $feather->url->get('delete/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
diff --git a/view/edit.php b/view/edit.php
index 0cce7ef5..0d4943d2 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -20,8 +20,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
 		</ul>
 	</div>
@@ -76,7 +76,7 @@
 <div id="editform" class="blockform">
 	<h2><span><?php _e('Edit post') ?></span></h2>
 	<div class="box">
-		<form id="edit" method="post" action="<?php echo $feather->url->get_link('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
+		<form id="edit" method="post" action="<?php echo $feather->url->get('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -89,10 +89,10 @@
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/view/footer.php b/view/footer.php
index b02351ce..7fa865c4 100644
--- a/view/footer.php
+++ b/view/footer.php
@@ -21,7 +21,7 @@
     if ($footer_style == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($footer_style == 'viewtopic') {
         if (isset($pid)) {
@@ -36,20 +36,20 @@
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+        //echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
 
         if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
         }
 
         if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get_link('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
         }
 
         echo "\t\t\t".'</dl>'."\n";
@@ -67,7 +67,7 @@
 			<div class="conl">
 			<form id="qjump" method="get" action="">
 				<div><label><span><?php _e('Jump to') ?><br /></span></label>
-					<select name="id" onchange="window.location=('<?php echo get_link('forum/') ?>'+this.options[this.selectedIndex].value)">
+					<select name="id" onchange="window.location=('<?php echo get('forum/') ?>'+this.options[this.selectedIndex].value)">
 <?php
 		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
 			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
diff --git a/view/help.php b/view/help.php
index af94b274..2e8ab828 100644
--- a/view/help.php
+++ b/view/help.php
@@ -43,17 +43,17 @@
 		<p><?php _e('Links info') ?></p>
 		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
 		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('/help') ?>"><?php _e('This help page') ?></a></samp></p>
+		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
 		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
-		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('topic/1/') ?>"><?php echo $feather->url->get_link('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('post/1/#p1') ?>"><?php echo $feather->url->get_link('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('forum/1/') ?>"><?php echo $feather->url->get_link('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get_link('user/2/') ?>"><?php echo $feather->url->get_link('user/2/') ?></a></samp></p>
+		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php echo $feather->url->get('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php echo $feather->url->get('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('forum/1/') ?>"><?php echo $feather->url->get('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php echo $feather->url->get('user/2/') ?></a></samp></p>
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
diff --git a/view/login/form.php b/view/login/form.php
index 76d9cb3d..1ad355cd 100644
--- a/view/login/form.php
+++ b/view/login/form.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Login') ?></span></h2>
 	<div class="box">
-		<form id="login" method="post" action="<?php echo $feather->url->get_link('login/action/in/') ?>" onsubmit="return process_form(this)">
+		<form id="login" method="post" action="<?php echo $feather->url->get('login/action/in/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -32,7 +32,7 @@
 						</div>
 
 						<p class="clearb"><?php _e('Login info') ?></p>
-						<p class="actions"><span><a href="<?php echo $feather->url->get_link('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo $feather->url->get_link('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
+						<p class="actions"><span><a href="<?php echo $feather->url->get('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo $feather->url->get('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/login/password_forgotten.php b/view/login/password_forgotten.php
index d9617fe9..432f9aee 100644
--- a/view/login/password_forgotten.php
+++ b/view/login/password_forgotten.php
@@ -39,7 +39,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Request pass') ?></span></h2>
 	<div class="box">
-		<form id="request_pass" method="post" action="<?php echo $feather->url->get_link('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
+		<form id="request_pass" method="post" action="<?php echo $feather->url->get('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/misc/email.php b/view/misc/email.php
index b4ed730d..2c9921bd 100644
--- a/view/misc/email.php
+++ b/view/misc/email.php
@@ -16,7 +16,7 @@
 <div id="emailform" class="blockform">
 	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
 	<div class="box">
-		<form id="email" method="post" action="<?php echo $feather->url->get_link('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="email" method="post" action="<?php echo $feather->url->get('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/misc/report.php b/view/misc/report.php
index 1b55893b..cf8aa64c 100644
--- a/view/misc/report.php
+++ b/view/misc/report.php
@@ -17,8 +17,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
 		</ul>
 	</div>
@@ -27,7 +27,7 @@
 <div id="reportform" class="blockform">
 	<h2><span><?php _e('Report post') ?></span></h2>
 	<div class="box">
-		<form id="report" method="post" action="<?php echo $feather->url->get_link('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="report" method="post" action="<?php echo $feather->url->get('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
index f6819d21..dfd1c431 100644
--- a/view/moderate/moderator_forum.php
+++ b/view/moderate/moderator_forum.php
@@ -18,7 +18,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -28,7 +28,7 @@
 	</div>
 </div>
 
-<form method="post" action="<?php echo $feather->url->get_link('moderate/forum/'.$id.'/') ?>">
+<form method="post" action="<?php echo $feather->url->get('moderate/forum/'.$id.'/') ?>">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <input type="hidden" name="page" value="<?php echo feather_escape($p) ?>" />
 <div id="vf" class="blocktable">
@@ -92,7 +92,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/view/moderate/posts_view.php b/view/moderate/posts_view.php
index ad68aa3d..d71fad09 100644
--- a/view/moderate/posts_view.php
+++ b/view/moderate/posts_view.php
@@ -17,8 +17,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -42,7 +42,7 @@
     echo ' blockpost1';
 }
     ?>">
-		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
+		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<div class="postbody">
@@ -85,8 +85,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/view/post.php b/view/post.php
index 1030f8d3..b4df1f8e 100644
--- a/view/post.php
+++ b/view/post.php
@@ -18,10 +18,10 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
-<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_posting['subject']) ?></a></li>
+<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_posting['subject']) ?></a></li>
 <?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
 		</ul>
 	</div>
@@ -121,10 +121,10 @@
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/view/profile/change_mail.php b/view/profile/change_mail.php
index 0c97e20c..1e59ab54 100644
--- a/view/profile/change_mail.php
+++ b/view/profile/change_mail.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Change email') ?></span></h2>
 	<div class="box">
-		<form id="change_email" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
+		<form id="change_email" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/profile/change_pass.php b/view/profile/change_pass.php
index 39cd0ed1..1bacb173 100644
--- a/view/profile/change_pass.php
+++ b/view/profile/change_pass.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Change pass') ?></span></h2>
 	<div class="box">
-		<form id="change_pass" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
+		<form id="change_pass" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
diff --git a/view/profile/delete_user.php b/view/profile/delete_user.php
index c950017c..5b22471a 100644
--- a/view/profile/delete_user.php
+++ b/view/profile/delete_user.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Confirm delete user') ?></span></h2>
 	<div class="box">
-		<form id="confirm_del_user" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/') ?>">
+		<form id="confirm_del_user" method="post" action="<?php echo $feather->url->get('user/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/profile/menu.php b/view/profile/menu.php
index 73f384c8..a46fef80 100644
--- a/view/profile/menu.php
+++ b/view/profile/menu.php
@@ -22,32 +22,32 @@
 					<li<?php if ($page == 'essentials') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
 					<li<?php if ($page == 'personal') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
 					<li<?php if ($page == 'messaging') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
 <?php if ($feather->forum_settings['o_avatars'] == '1' || $feather->forum_settings['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
 <?php endif;
     ?>					<li<?php if ($page == 'display') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
 					<li<?php if ($page == 'privacy') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
 <?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get_link('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
diff --git a/view/profile/section_admin.php b/view/profile/section_admin.php
index 05d190f4..a73c3fb9 100644
--- a/view/profile/section_admin.php
+++ b/view/profile/section_admin.php
@@ -16,7 +16,7 @@
 	<div class="blockform">
 		<h2><span><?php echo feather_escape($user['username']).' - '.__('Section admin') ?></span></h2>
 		<div class="box">
-			<form id="profile7" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/admin/') ?>">
+			<form id="profile7" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
index 209bf9b5..3277bf29 100644
--- a/view/profile/section_display.php
+++ b/view/profile/section_display.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section display') ?></span></h2>
 	<div class="box">
-		<form id="profile5" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/display/') ?>">
+		<form id="profile5" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php
diff --git a/view/profile/section_essentials.php b/view/profile/section_essentials.php
index 107cfeaa..bb97256c 100644
--- a/view/profile/section_essentials.php
+++ b/view/profile/section_essentials.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section essentials') ?></span></h2>
 	<div class="box">
-		<form id="profile1" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
+		<form id="profile1" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -24,7 +24,7 @@
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo $feather->url->get_link('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
@@ -241,7 +241,7 @@
 				<fieldset>
 					<legend><?php _e('User activity') ?></legend>
 					<div class="infldset">
-						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get_link('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
 						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
 						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
diff --git a/view/profile/section_messaging.php b/view/profile/section_messaging.php
index 91532065..8597a115 100644
--- a/view/profile/section_messaging.php
+++ b/view/profile/section_messaging.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section messaging') ?></span></h2>
 	<div class="box">
-		<form id="profile3" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/messaging/') ?>">
+		<form id="profile3" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/profile/section_personal.php b/view/profile/section_personal.php
index f9d9fea8..80c19741 100644
--- a/view/profile/section_personal.php
+++ b/view/profile/section_personal.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personal') ?></span></h2>
 	<div class="box">
-		<form id="profile2" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/personal/') ?>">
+		<form id="profile2" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/profile/section_personality.php b/view/profile/section_personality.php
index a1df5d8d..f2692e75 100644
--- a/view/profile/section_personality.php
+++ b/view/profile/section_personality.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personality') ?></span></h2>
 	<div class="box">
-		<form id="profile4" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/personality/') ?>">
+		<form id="profile4" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php if ($feather->forum_settings['o_avatars'] == '1'): ?>				<div class="inform">
@@ -39,10 +39,10 @@
 							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
diff --git a/view/profile/section_privacy.php b/view/profile/section_privacy.php
index b3262b07..d978904e 100644
--- a/view/profile/section_privacy.php
+++ b/view/profile/section_privacy.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section privacy') ?></span></h2>
 	<div class="box">
-		<form id="profile6" method="post" action="<?php echo $feather->url->get_link('user/'.$id.'/section/privacy/') ?>">
+		<form id="profile6" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
index a1cda00a..ba880454 100644
--- a/view/profile/upload_avatar.php
+++ b/view/profile/upload_avatar.php
@@ -16,7 +16,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Upload avatar') ?></span></h2>
 	<div class="box">
-		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo $feather->url->get_link('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
+		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo $feather->url->get('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/view/register/rules.php b/view/register/rules.php
index edb24b38..326c96ad 100644
--- a/view/register/rules.php
+++ b/view/register/rules.php
@@ -17,7 +17,7 @@
 <div id="rules" class="blockform">
 	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
 	<div class="box">
-		<form method="get" action="<?php echo $feather->url->get_link('register/') ?>">
+		<form method="get" action="<?php echo $feather->url->get('register/') ?>">
 			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Rules legend') ?></legend>
diff --git a/view/search/footer.php b/view/search/footer.php
index 1a77744e..c76aaa97 100644
--- a/view/search/footer.php
+++ b/view/search/footer.php
@@ -31,7 +31,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
 <?php echo(!empty($search['forum_actions']) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $search['forum_actions']).'</p>'."\n" : '') ?>
diff --git a/view/search/header.php b/view/search/header.php
index 5d6eed99..00b4385c 100644
--- a/view/search/header.php
+++ b/view/search/header.php
@@ -17,7 +17,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
 		<div class="pagepost">
diff --git a/view/search/posts.php b/view/search/posts.php
index def30d38..d0eab7cc 100644
--- a/view/search/posts.php
+++ b/view/search/posts.php
@@ -22,7 +22,7 @@
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
     _e('Re').' ';
-} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
+} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
 		<div class="postbody">
@@ -46,8 +46,8 @@
 		<div class="postfoot clearb">
 			<div class="postfootright">
 				<ul>
-					<li><span><a href="<?php echo $feather->url->get_link('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
-					<li><span><a href="<?php echo $feather->url->get_link('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
+					<li><span><a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
+					<li><span><a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
 				</ul>
 			</div>
 		</div>
diff --git a/view/search/topics.php b/view/search/topics.php
index fc7df148..7cead694 100644
--- a/view/search/topics.php
+++ b/view/search/topics.php
@@ -25,5 +25,5 @@
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
 	<td class="tc3"><?php echo forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.$feather->url->get_link('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
+	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
 </tr>
\ No newline at end of file
diff --git a/view/userlist.php b/view/userlist.php
index fb8dd579..a686ba5b 100644
--- a/view/userlist.php
+++ b/view/userlist.php
@@ -87,7 +87,7 @@
             foreach ($userlist_data as $user) {
                 ?>
 					<tr>
-						<td class="tcl"><?php echo '<a href="'.$feather->url->get_link('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
+						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
 						<td class="tc2"><?php echo get_title($user) ?></td>
 	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo forum_number_format($user['num_posts']) ?></td>
 	<?php endif;
diff --git a/view/viewforum.php b/view/viewforum.php
index 1c696ed0..e8370fe7 100644
--- a/view/viewforum.php
+++ b/view/viewforum.php
@@ -17,7 +17,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -92,7 +92,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get_link('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
 		<div class="clearer"></div>
diff --git a/view/viewtopic.php b/view/viewtopic.php
index cfd4c4c5..76324e67 100644
--- a/view/viewtopic.php
+++ b/view/viewtopic.php
@@ -18,8 +18,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -40,7 +40,7 @@
     echo ' blockpost1';
 }
     ?>">
-	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get_link('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
+	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -108,8 +108,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get_link('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get_link('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 <?php echo $subscraction ?>
 		<div class="clearer"></div>
@@ -126,7 +126,7 @@
 <div id="quickpost" class="blockform">
 	<h2><span><?php _e('Quick post') ?></span></h2>
 	<div class="box">
-		<form id="quickpostform" method="post" action="<?php echo $feather->url->get_link('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="quickpostform" method="post" action="<?php echo $feather->url->get('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -163,13 +163,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get_link('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get_link('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>

From 3e58666e263aec4ceeeac25c7486d9560558c6f6 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 28 Aug 2015 22:23:43 +0200
Subject: [PATCH 237/353] Add more URL methods

---
 controller/admin/forums.php                   |   2 +-
 controller/edit.php                           |  18 +-
 controller/login.php                          |   6 +-
 controller/misc.php                           |   2 +-
 controller/register.php                       |   6 +-
 extern.php                                    |   6 +-
 include/bbcd_compile.php                      |   2 +-
 include/classes/email.class.php               |   2 +-
 include/classes/url.class.php                 | 176 ++++++++++++++++-
 include/functions.php                         | 181 +-----------------
 include/parser.php                            |   9 +-
 include/routes.php                            |   4 +-
 model/login.php                               |  12 +-
 model/misc.php                                |   2 +-
 model/profile.php                             |   8 +-
 model/register.php                            |   6 +-
 model/viewtopic.php                           |   8 +-
 style/FeatherBB/view/edit.php                 |   6 +-
 style/FeatherBB/view/footer.new.php           |  14 +-
 style/FeatherBB/view/footer.php               |  14 +-
 style/FeatherBB/view/header.new.php           |  10 +-
 style/FeatherBB/view/header.php               |   6 +-
 style/FeatherBB/view/help.php                 |   6 +-
 style/FeatherBB/view/misc/report.php          |   2 +-
 .../view/moderate/moderator_forum.php         |   4 +-
 style/FeatherBB/view/moderate/posts_view.php  |   4 +-
 style/FeatherBB/view/post.php                 |   6 +-
 style/FeatherBB/view/search/footer.php        |   2 +-
 style/FeatherBB/view/search/header.php        |   2 +-
 style/FeatherBB/view/viewforum.php            |   4 +-
 style/FeatherBB/view/viewtopic.php            |   8 +-
 view/edit.php                                 |   6 +-
 view/footer.php                               |  14 +-
 view/header.php                               |   6 +-
 view/help.php                                 |   6 +-
 view/misc/report.php                          |   2 +-
 view/moderate/moderator_forum.php             |   4 +-
 view/moderate/posts_view.php                  |   4 +-
 view/post.php                                 |   6 +-
 view/search/footer.php                        |   2 +-
 view/search/header.php                        |   2 +-
 view/viewforum.php                            |   4 +-
 view/viewtopic.php                            |   8 +-
 43 files changed, 297 insertions(+), 305 deletions(-)

diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index d7902cd4..8b8cb1c1 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -58,7 +58,7 @@ public function edit_forum($forum_id)
                                     'forum_desc' => $this->request->post('forum_desc') ? feather_linebreaks(feather_trim($this->request->post('forum_desc'))) : NULL,
                                     'cat_id' => (int) $this->request->post('cat_id'),
                                     'sort_by' => (int) $this->request->post('sort_by'),
-                                    'redirect_url' => url_valid($this->request->post('redirect_url')) ? feather_escape($this->request->post('redirect_url')) : NULL);
+                                    'redirect_url' => $this->feather->url->is_valid($this->request->post('redirect_url')) ? feather_escape($this->request->post('redirect_url')) : NULL);
 
                 if ($forum_data['forum_name'] == '') {
                     redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Must enter name message'));
diff --git a/controller/edit.php b/controller/edit.php
index 2a8afaae..1787e8ed 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-
-
         $this->model = new \model\edit();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
@@ -82,13 +80,6 @@ public function editpost($id)
             $post = '';
         }
 
-
-        $page_title = array(feather_escape($this->config['o_board_title']), __('Edit post'));
-        $required_fields = array('req_subject' => __('Subject'), 'req_message' => __('Message'));
-        $focus_element = array('edit', 'req_message');
-
-        $this->header->setTitle($page_title)->setActivePage('edit')->setFocusElement($focus_element)->setRequiredFields($required_fields)->display();
-
         if ($this->request->post('preview')) {
             require_once FEATHER_ROOT.'include/parser.php';
             $preview_message = parse_message($post['message'], $post['hide_smilies']);
@@ -115,7 +106,10 @@ public function editpost($id)
             'promptQuote' => __('promptQuote')
         );
 
-        $this->feather->render('edit.php', array(
+        $this->feather->view2->setPageInfo(array(
+                            'title' => array(feather_escape($this->config['o_board_title']), __('Edit post')),
+                            'required_fields' => array('req_subject' => __('Subject'), 'req_message' => __('Message')),
+                            'focus_element' => array('edit', 'req_message'),
                             'cur_post' => $cur_post,
                             'errors' => $errors,
                             'preview_message' => $preview_message,
@@ -125,8 +119,6 @@ public function editpost($id)
                             'lang_bbeditor'    =>    $lang_bbeditor,
                             'post' => $post,
                             )
-                    );
-
-
+                    )->addTemplate('edit.php')->display();
     }
 }
diff --git a/controller/login.php b/controller/login.php
index 30c9c5f3..0b2879c8 100644
--- a/controller/login.php
+++ b/controller/login.php
@@ -32,7 +32,7 @@ public function __autoload($class_name)
     public function display()
     {
         if (!$this->user->is_guest) {
-            header('Location: '.get_base_url());
+            header('Location: '.$this->feather->url->base());
             exit;
         }
 
@@ -54,7 +54,7 @@ public function logmein()
         define('FEATHER_QUIET_VISIT', 1);
 
         if (!$this->user->is_guest) {
-            header('Location: '.get_base_url());
+            header('Location: '.$this->feather->url->base());
             exit;
         }
 
@@ -73,7 +73,7 @@ public function forget()
         define('FEATHER_QUIET_VISIT', 1);
 
         if (!$this->user->is_guest) {
-            header('Location: '.get_base_url());
+            header('Location: '.$this->feather->url->base());
             exit;
         }
 
diff --git a/controller/misc.php b/controller/misc.php
index 4f887129..f576043f 100644
--- a/controller/misc.php
+++ b/controller/misc.php
@@ -42,7 +42,7 @@ public function markread()
         // Reset tracked topics
         set_tracked_topics(null);
 
-        redirect(get_base_url(), __('Mark read redirect'));
+        redirect($this->feather->url->base(), __('Mark read redirect'));
     }
 
     public function markforumread($id)
diff --git a/controller/register.php b/controller/register.php
index 0223fd76..98249519 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -34,7 +34,7 @@ public function __autoload($class_name)
     public function display()
     {
         if (!$this->user->is_guest) {
-            header('Location: '.get_base_url());
+            header('Location: '.$this->feather->url->base());
             exit;
         }
 
@@ -79,7 +79,7 @@ public function display()
 
     public function cancel()
     {
-        redirect(get_base_url());
+        redirect($this->feather->url->base());
     }
 
     public function rules()
@@ -88,7 +88,7 @@ public function rules()
 
         // If we are logged in, we shouldn't be here
         if (!$this->user->is_guest) {
-            header('Location: '.get_base_url());
+            header('Location: '.$this->feather->url->base());
             exit;
         }
 
diff --git a/extern.php b/extern.php
index 94076507..ee7ba6ef 100644
--- a/extern.php
+++ b/extern.php
@@ -664,13 +664,13 @@ function output_html($feed)
         }
 
         // Prepend the current base URL onto some links. Done after caching to handle http/https correctly
-        $feed['link'] = get_base_url(true).$feed['link'];
+        $feed['link'] = base(true).$feed['link'];
 
         foreach ($feed['items'] as $key => $item) {
-            $feed['items'][$key]['link'] = get_base_url(true).$item['link'];
+            $feed['items'][$key]['link'] = base(true).$item['link'];
 
             if (isset($item['author']['uri'])) {
-                $feed['items'][$key]['author']['uri'] = get_base_url(true).$item['author']['uri'];
+                $feed['items'][$key]['author']['uri'] = base(true).$item['author']['uri'];
             }
         }
 
diff --git a/include/bbcd_compile.php b/include/bbcd_compile.php
index bb02f705..b860102a 100644
--- a/include/bbcd_compile.php
+++ b/include/bbcd_compile.php
@@ -181,7 +181,7 @@
 // Validate and compute replacement texts for smilies array.
 $re_keys = array();                                    // Array of regex-safe smiley texts.
 $file_path = FEATHER_ROOT . 'img/smilies/';                // File system path to smilies.
-$url_path = get_base_url(true);                        // Convert abs URL to relative URL.
+$url_path = base(true);                        // Convert abs URL to relative URL.
 $url_path = preg_replace('%^https?://[^/]++(.*)$%i', '$1', $url_path) . '/img/smilies/';
 foreach ($smilies as $smiley_text => $smiley_img) {    // Loop through all smilieys in array.
     $file = $file_path . $smiley_img['file'];        // Local file system address of smiley.
diff --git a/include/classes/email.class.php b/include/classes/email.class.php
index 4c6b7869..0727326a 100644
--- a/include/classes/email.class.php
+++ b/include/classes/email.class.php
@@ -121,7 +121,7 @@ public function bbcode2email($text, $wrap_length = 72)
         static $base_url;
 
         if (!isset($base_url)) {
-            $base_url = get_base_url();
+            $base_url = base();
         }
 
         $text = feather_trim($text, "\t\n ");
diff --git a/include/classes/url.class.php b/include/classes/url.class.php
index 87a43f76..0798aa2d 100644
--- a/include/classes/url.class.php
+++ b/include/classes/url.class.php
@@ -729,9 +729,9 @@ public function url_friendly($str)
     public function get($link, $args = null)
     {
         if (function_exists('apache_get_modules') && in_array('mod_rewrite', apache_get_modules())) { // If we have Apache's mod_rewrite enabled
-            $base_url = get_base_url();
+            $base_url = $this->base();
         } else {
-            $base_url = get_base_url().'/index.php';
+            $base_url = $this->base().'/index.php';
         }
 
         $gen_link = $link;
@@ -755,7 +755,7 @@ public function get($link, $args = null)
     //
     private function get_sublink($link, $sublink, $subarg, $args = null)
     {
-        $base_url = get_base_url();
+        $base_url = $this->base();
 
         if ($sublink == 'p$1' && $subarg == 1) {
             return $this->get($link, $args);
@@ -774,4 +774,174 @@ private function get_sublink($link, $sublink, $subarg, $args = null)
 
         return $gen_link;
     }
+
+    //
+    // Fetch the current protocol in use - http or https
+    //
+    public function protocol()
+    {
+        $protocol = 'http';
+
+        // Check if the server is claiming to using HTTPS
+        if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') {
+            $protocol = 'https';
+        }
+
+        // If we are behind a reverse proxy try to decide which protocol it is using
+        if (defined('FORUM_BEHIND_REVERSE_PROXY')) {
+            // Check if we are behind a Microsoft based reverse proxy
+            if (!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) != 'off') {
+                $protocol = 'https';
+            }
+
+            // Check if we're behind a "proper" reverse proxy, and what protocol it's using
+            if (!empty($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
+                $protocol = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']);
+            }
+        }
+
+        return $protocol;
+    }
+
+    //
+    // Fetch the base_url, optionally support HTTPS and HTTP
+    //
+    public function base($support_https = false)
+    {
+        static $base_url;
+
+        $feather = \Slim\Slim::getInstance();
+
+        if (!$support_https) {
+            return $feather->config['o_base_url'];
+        }
+
+        if (!isset($base_url)) {
+            // Make sure we are using the correct protocol
+            $base_url = str_replace(array('http://', 'https://'), $this->protocol().'://', $feather->config['o_base_url']);
+        }
+
+        return $base_url;
+    }
+
+    //
+    // function is_valid($url) {
+    //
+    // Return associative array of valid URI components, or FALSE if $url is not
+    // RFC-3986 compliant. If the passed URL begins with: "www." or "ftp.", then
+    // "http://" or "ftp://" is prepended and the corrected full-url is stored in
+    // the return array with a key name "url". This value should be used by the caller.
+    //
+    // Return value: FALSE if $url is not valid, otherwise array of URI components:
+    // e.g.
+    // Given: "http://www.jmrware.com:80/articles?height=10&width=75#fragone"
+    // Array(
+    //	  [scheme] => http
+    //	  [authority] => www.jmrware.com:80
+    //	  [userinfo] =>
+    //	  [host] => www.jmrware.com
+    //	  [IP_literal] =>
+    //	  [IPV6address] =>
+    //	  [ls32] =>
+    //	  [IPvFuture] =>
+    //	  [IPv4address] =>
+    //	  [regname] => www.jmrware.com
+    //	  [port] => 80
+    //	  [path_abempty] => /articles
+    //	  [query] => height=10&width=75
+    //	  [fragment] => fragone
+    //	  [url] => http://www.jmrware.com:80/articles?height=10&width=75#fragone
+    // )
+    public function is_valid($url)
+    {
+        if (strpos($url, 'www.') === 0) {
+            $url = 'http://'. $url;
+        }
+        if (strpos($url, 'ftp.') === 0) {
+            $url = 'ftp://'. $url;
+        }
+        if (!preg_match('/# Valid absolute URI having a non-empty, valid DNS host.
+		^
+		(?P<scheme>[A-Za-z][A-Za-z0-9+\-.]*):\/\/
+		(?P<authority>
+		  (?:(?P<userinfo>(?:[A-Za-z0-9\-._~!$&\'()*+,;=:]|%[0-9A-Fa-f]{2})*)@)?
+		  (?P<host>
+			(?P<IP_literal>
+			  \[
+			  (?:
+				(?P<IPV6address>
+				  (?:												 (?:[0-9A-Fa-f]{1,4}:){6}
+				  |												   ::(?:[0-9A-Fa-f]{1,4}:){5}
+				  | (?:							 [0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){4}
+				  | (?:(?:[0-9A-Fa-f]{1,4}:){0,1}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){3}
+				  | (?:(?:[0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){2}
+				  | (?:(?:[0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})?::	[0-9A-Fa-f]{1,4}:
+				  | (?:(?:[0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})?::
+				  )
+				  (?P<ls32>[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}
+				  | (?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}
+					   (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)
+				  )
+				|	(?:(?:[0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})?::	[0-9A-Fa-f]{1,4}
+				|	(?:(?:[0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})?::
+				)
+			  | (?P<IPvFuture>[Vv][0-9A-Fa-f]+\.[A-Za-z0-9\-._~!$&\'()*+,;=:]+)
+			  )
+			  \]
+			)
+		  | (?P<IPv4address>(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}
+							   (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))
+		  | (?P<regname>(?:[A-Za-z0-9\-._~!$&\'()*+,;=]|%[0-9A-Fa-f]{2})+)
+		  )
+		  (?::(?P<port>[0-9]*))?
+		)
+		(?P<path_abempty>(?:\/(?:[A-Za-z0-9\-._~!$&\'()*+,;=:@]|%[0-9A-Fa-f]{2})*)*)
+		(?:\?(?P<query>		  (?:[A-Za-z0-9\-._~!$&\'()*+,;=:@\\/?]|%[0-9A-Fa-f]{2})*))?
+		(?:\#(?P<fragment>	  (?:[A-Za-z0-9\-._~!$&\'()*+,;=:@\\/?]|%[0-9A-Fa-f]{2})*))?
+		$
+		/mx', $url, $m)) {
+            return false;
+        }
+        switch ($m['scheme']) {
+            case 'https':
+            case 'http':
+                if ($m['userinfo']) {
+                    return false;
+                } // HTTP scheme does not allow userinfo.
+                break;
+            case 'ftps':
+            case 'ftp':
+                break;
+            default:
+                return false;    // Unrecognised URI scheme. Default to FALSE.
+        }
+        // Validate host name conforms to DNS "dot-separated-parts".
+        if ($m{'regname'}) {
+            // If host regname specified, check for DNS conformance.
+
+            if (!preg_match('/# HTTP DNS host name.
+			^					   # Anchor to beginning of string.
+			(?!.{256})			   # Overall host length is less than 256 chars.
+			(?:					   # Group dot separated host part alternatives.
+			  [0-9A-Za-z]\.		   # Either a single alphanum followed by dot
+			|					   # or... part has more than one char (63 chars max).
+			  [0-9A-Za-z]		   # Part first char is alphanum (no dash).
+			  [\-0-9A-Za-z]{0,61}  # Internal chars are alphanum plus dash.
+			  [0-9A-Za-z]		   # Part last char is alphanum (no dash).
+			  \.				   # Each part followed by literal dot.
+			)*					   # One or more parts before top level domain.
+			(?:					   # Top level domains
+			  [A-Za-z]{2,63}|	   # Country codes are exactly two alpha chars.
+			  xn--[0-9A-Za-z]{4,59})		   # Internationalized Domain Name (IDN)
+			$					   # Anchor to end of string.
+			/ix', $m['host'])) {
+                return false;
+            }
+        }
+        $m['url'] = $url;
+        for ($i = 0; isset($m[$i]); ++$i) {
+            unset($m[$i]);
+        }
+        return $m; // return TRUE == array of useful named $matches plus the valid $url.
+    }
 }
\ No newline at end of file
diff --git a/include/functions.php b/include/functions.php
index d29a8d6c..5e46afff 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -19,56 +19,6 @@ function get_microtime()
 }
 
 
-//
-// Fetch the current protocol in use - http or https
-//
-function get_current_protocol()
-{
-    $protocol = 'http';
-
-    // Check if the server is claiming to using HTTPS
-    if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') {
-        $protocol = 'https';
-    }
-
-    // If we are behind a reverse proxy try to decide which protocol it is using
-    if (defined('FORUM_BEHIND_REVERSE_PROXY')) {
-        // Check if we are behind a Microsoft based reverse proxy
-        if (!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) != 'off') {
-            $protocol = 'https';
-        }
-
-        // Check if we're behind a "proper" reverse proxy, and what protocol it's using
-        if (!empty($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
-            $protocol = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']);
-        }
-    }
-
-    return $protocol;
-}
-
-
-//
-// Fetch the base_url, optionally support HTTPS and HTTP
-//
-function get_base_url($support_https = false)
-{
-    global $feather_config;
-    static $base_url;
-
-    if (!$support_https) {
-        return $feather_config['o_base_url'];
-    }
-
-    if (!isset($base_url)) {
-        // Make sure we are using the correct protocol
-        $base_url = str_replace(array('http://', 'https://'), get_current_protocol().'://', $feather_config['o_base_url']);
-    }
-
-    return $base_url;
-}
-
-
 //
 // Fetch admin IDs
 //
@@ -147,16 +97,16 @@ function check_username($username, $errors, $exclude_id = null)
 //
 function generate_avatar_markup($user_id)
 {
-    global $feather_config;
+    $feather = \Slim\Slim::getInstance();
 
     $filetypes = array('jpg', 'gif', 'png');
     $avatar_markup = '';
 
     foreach ($filetypes as $cur_type) {
-        $path = $feather_config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type;
+        $path = $feather->config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type;
 
         if (file_exists(FEATHER_ROOT.$path) && $img_size = getimagesize(FEATHER_ROOT.$path)) {
-            $avatar_markup = '<img src="'.feather_escape(get_base_url(true).'/'.$path.'?m='.filemtime(FEATHER_ROOT.$path)).'" '.$img_size[3].' alt="" />';
+            $avatar_markup = '<img src="'.feather_escape($feather->url->base(true).'/'.$path.'?m='.filemtime(FEATHER_ROOT.$path)).'" '.$img_size[3].' alt="" />';
             break;
         }
     }
@@ -596,6 +546,7 @@ function random_key($len, $readable = false, $hash = false)
 function validate_redirect($redirect_url, $fallback_url)
 {
     $referrer = parse_url(strtolower($redirect_url));
+    $feather = \Slim\Slim::getInstance();
 
     // Make sure the host component exists
     if (!isset($referrer['host'])) {
@@ -612,7 +563,7 @@ function validate_redirect($redirect_url, $fallback_url)
         $referrer['path'] = '';
     }
 
-    $valid = parse_url(strtolower(get_base_url()));
+    $valid = parse_url(strtolower($feather->url->base()));
 
     // Remove www subdomain if it exists
     if (strpos($valid['host'], 'www.') === 0) {
@@ -793,128 +744,6 @@ function forum_list_langs()
     return $languages;
 }
 
-
-//
-// function url_valid($url) {
-//
-// Return associative array of valid URI components, or FALSE if $url is not
-// RFC-3986 compliant. If the passed URL begins with: "www." or "ftp.", then
-// "http://" or "ftp://" is prepended and the corrected full-url is stored in
-// the return array with a key name "url". This value should be used by the caller.
-//
-// Return value: FALSE if $url is not valid, otherwise array of URI components:
-// e.g.
-// Given: "http://www.jmrware.com:80/articles?height=10&width=75#fragone"
-// Array(
-//	  [scheme] => http
-//	  [authority] => www.jmrware.com:80
-//	  [userinfo] =>
-//	  [host] => www.jmrware.com
-//	  [IP_literal] =>
-//	  [IPV6address] =>
-//	  [ls32] =>
-//	  [IPvFuture] =>
-//	  [IPv4address] =>
-//	  [regname] => www.jmrware.com
-//	  [port] => 80
-//	  [path_abempty] => /articles
-//	  [query] => height=10&width=75
-//	  [fragment] => fragone
-//	  [url] => http://www.jmrware.com:80/articles?height=10&width=75#fragone
-// )
-function url_valid($url)
-{
-    if (strpos($url, 'www.') === 0) {
-        $url = 'http://'. $url;
-    }
-    if (strpos($url, 'ftp.') === 0) {
-        $url = 'ftp://'. $url;
-    }
-    if (!preg_match('/# Valid absolute URI having a non-empty, valid DNS host.
-		^
-		(?P<scheme>[A-Za-z][A-Za-z0-9+\-.]*):\/\/
-		(?P<authority>
-		  (?:(?P<userinfo>(?:[A-Za-z0-9\-._~!$&\'()*+,;=:]|%[0-9A-Fa-f]{2})*)@)?
-		  (?P<host>
-			(?P<IP_literal>
-			  \[
-			  (?:
-				(?P<IPV6address>
-				  (?:												 (?:[0-9A-Fa-f]{1,4}:){6}
-				  |												   ::(?:[0-9A-Fa-f]{1,4}:){5}
-				  | (?:							 [0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){4}
-				  | (?:(?:[0-9A-Fa-f]{1,4}:){0,1}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){3}
-				  | (?:(?:[0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){2}
-				  | (?:(?:[0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})?::	[0-9A-Fa-f]{1,4}:
-				  | (?:(?:[0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})?::
-				  )
-				  (?P<ls32>[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}
-				  | (?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}
-					   (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)
-				  )
-				|	(?:(?:[0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})?::	[0-9A-Fa-f]{1,4}
-				|	(?:(?:[0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})?::
-				)
-			  | (?P<IPvFuture>[Vv][0-9A-Fa-f]+\.[A-Za-z0-9\-._~!$&\'()*+,;=:]+)
-			  )
-			  \]
-			)
-		  | (?P<IPv4address>(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}
-							   (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))
-		  | (?P<regname>(?:[A-Za-z0-9\-._~!$&\'()*+,;=]|%[0-9A-Fa-f]{2})+)
-		  )
-		  (?::(?P<port>[0-9]*))?
-		)
-		(?P<path_abempty>(?:\/(?:[A-Za-z0-9\-._~!$&\'()*+,;=:@]|%[0-9A-Fa-f]{2})*)*)
-		(?:\?(?P<query>		  (?:[A-Za-z0-9\-._~!$&\'()*+,;=:@\\/?]|%[0-9A-Fa-f]{2})*))?
-		(?:\#(?P<fragment>	  (?:[A-Za-z0-9\-._~!$&\'()*+,;=:@\\/?]|%[0-9A-Fa-f]{2})*))?
-		$
-		/mx', $url, $m)) {
-        return false;
-    }
-    switch ($m['scheme']) {
-    case 'https':
-    case 'http':
-        if ($m['userinfo']) {
-            return false;
-        } // HTTP scheme does not allow userinfo.
-        break;
-    case 'ftps':
-    case 'ftp':
-        break;
-    default:
-        return false;    // Unrecognised URI scheme. Default to FALSE.
-    }
-    // Validate host name conforms to DNS "dot-separated-parts".
-    if ($m{'regname'}) {
-        // If host regname specified, check for DNS conformance.
-
-        if (!preg_match('/# HTTP DNS host name.
-			^					   # Anchor to beginning of string.
-			(?!.{256})			   # Overall host length is less than 256 chars.
-			(?:					   # Group dot separated host part alternatives.
-			  [0-9A-Za-z]\.		   # Either a single alphanum followed by dot
-			|					   # or... part has more than one char (63 chars max).
-			  [0-9A-Za-z]		   # Part first char is alphanum (no dash).
-			  [\-0-9A-Za-z]{0,61}  # Internal chars are alphanum plus dash.
-			  [0-9A-Za-z]		   # Part last char is alphanum (no dash).
-			  \.				   # Each part followed by literal dot.
-			)*					   # One or more parts before top level domain.
-			(?:					   # Top level domains
-			  [A-Za-z]{2,63}|	   # Country codes are exactly two alpha chars.
-			  xn--[0-9A-Za-z]{4,59})		   # Internationalized Domain Name (IDN)
-			$					   # Anchor to end of string.
-			/ix', $m['host'])) {
-            return false;
-        }
-    }
-    $m['url'] = $url;
-    for ($i = 0; isset($m[$i]); ++$i) {
-        unset($m[$i]);
-    }
-    return $m; // return TRUE == array of useful named $matches plus the valid $url.
-}
-
 //
 // Replace string matching regular expression
 //
diff --git a/include/parser.php b/include/parser.php
index 331ab973..fa9f2215 100644
--- a/include/parser.php
+++ b/include/parser.php
@@ -86,8 +86,9 @@ function linkify($text)
 }
 function _linkify_callback($m)
 { // Only linkify valid urls.
+    $feather = \Slim\Slim::getInstance();
     $url = $m[2] . $m[5] . $m[8] . $m[11] . $m[14];
-    if (is_array($u = url_valid($url))) {
+    if (is_array($u = $feather->url->is_valid($url))) {
         if (preg_match('%\.(?:jpe?g|gif|png)$%Si', $u['path_abempty'])) {
             return    $m[1].$m[4].$m[7].$m[10].$m[13] .'[img]'. $u['url'] .'[/img]'. $m[3].$m[6].$m[9].$m[12];
         } else {
@@ -268,7 +269,7 @@ function _preparse_bbcode_callback($matches)
         if ($feather->user->g_post_links != '1') {
             $new_errors[] = __('BBerr cannot post URLs');
         }
-        else if (($m = url_valid($contents))) {
+        else if (($m = $feather->url->is_valid($contents))) {
             $contents = $m['url']; // Fetch possibly more complete url address.
         } else { // Error #10a: 'Invalid URL name: %s'.
             $new_errors[] = sprintf(__('BBerr Invalid URL name'), $contents);
@@ -305,7 +306,7 @@ function _preparse_bbcode_callback($matches)
         break;
 
     case 'url':
-        if (($m = url_valid($attribute))) {
+        if (($m = $feather->url->is_valid($attribute))) {
             $attribute = $m['url']; // Fetch possibly more complete url address.
         } else { // Error #10b: 'Invalid URL name: %s'.
             $new_errors[] = sprintf(__('BBerr Invalid URL name'), $attribute);
@@ -334,7 +335,7 @@ function _preparse_bbcode_callback($matches)
     switch ($tagname) {
     case 'img': // Handle bad image url, file too big, then scale-to-fit within forum defaults if too large.
         if ($tag['depth'] === 1) { // Check if not overly nested?
-            if (($pd['ipass'] === 2) && $pd['config']['valid_imgs'] && url_valid($contents)) { // Valid URI?
+            if (($pd['ipass'] === 2) && $pd['config']['valid_imgs'] && $feather->url->is_valid($contents)) { // Valid URI?
                 // Yes. Fetch file headers containing file type and size ("Content-Type" and "Content-Length").
                 if (($http = @get_headers($contents)) !== false && is_array($http)) {
                     if (preg_match('/\b200\s++OK\s*+$/i', $http[0])) { // Good response header?
diff --git a/include/routes.php b/include/routes.php
index 8d2c54e3..c2180bbd 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -81,7 +81,7 @@
  */
 $isAdmmod = function() use ($feather) {
     if(!$feather->user->is_admmod) {
-        redirect(get_base_url(), __('No permission'));
+        redirect(base(), __('No permission'));
     }
 };
 
@@ -103,7 +103,7 @@
      */
     $isAdmin = function() use ($feather) {
         if($feather->user->g_id != FEATHER_ADMIN) {
-            redirect(get_base_url(), __('No permission'));
+            redirect(base(), __('No permission'));
         }
     };
 
diff --git a/model/login.php b/model/login.php
index 472bc4f7..91ce85a6 100644
--- a/model/login.php
+++ b/model/login.php
@@ -81,7 +81,7 @@ public function login()
         set_tracked_topics(null);
 
         // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after login)
-        $redirect_url = validate_redirect($this->request->post('redirect_url'), get_base_url());
+        $redirect_url = validate_redirect($this->request->post('redirect_url'), $this->feather->url->base());
         $redirect_url = $this->hook->fire('redirect_url_login', $redirect_url);
 
         redirect(feather_escape($redirect_url), __('Login redirect'));
@@ -92,7 +92,7 @@ public function logout($id, $token)
         $token = $this->hook->fire('logout_start', $token, $id);
 
         if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != feather_hash($this->user->id.feather_hash($this->request->getIp()))) {
-            header('Location: '.get_base_url());
+            header('Location: '.$this->feather->url->base());
             exit;
         }
 
@@ -114,7 +114,7 @@ public function logout($id, $token)
 
         $this->auth->feather_setcookie(1, feather_hash(uniqid(rand(), true)), time() + 31536000);
 
-        redirect(get_base_url(), __('Logout redirect'));
+        redirect($this->feather->url->base(), __('Logout redirect'));
     }
 
     public function password_forgotten()
@@ -122,7 +122,7 @@ public function password_forgotten()
         $this->hook->fire('password_forgotten_start');
 
         if (!$this->user->is_guest) {
-            header('Location: '.get_base_url());
+            header('Location: '.$this->feather->url->base());
             exit;
         }
         // Start with a clean slate
@@ -156,7 +156,7 @@ public function password_forgotten()
                     $mail_message = trim(substr($mail_tpl, $first_crlf));
 
                     // Do the generic replacements first (they apply to all emails sent out here)
-                    $mail_message = str_replace('<base_url>', get_base_url().'/', $mail_message);
+                    $mail_message = str_replace('<base_url>', $this->feather->url->base().'/', $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
                     $mail_message = $this->hook->fire('mail_message_password_forgotten', $mail_message);
@@ -214,7 +214,7 @@ public function get_redirect_url()
         }
 
         if (!isset($redirect_url)) {
-            $redirect_url = get_base_url();
+            $redirect_url = $this->feather->url->base();
         } elseif (preg_match('%viewtopic\.php\?pid=(\d+)$%', $redirect_url, $matches)) { // TODO
             $redirect_url .= '#p'.$matches[1];
         }
diff --git a/model/misc.php b/model/misc.php
index 75125f4c..74930372 100644
--- a/model/misc.php
+++ b/model/misc.php
@@ -109,7 +109,7 @@ public function send_email($mail)
         // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after the email is sent) TODO
         //$redirect_url = validate_redirect($this->request->post('redirect_url'), 'index.php');
 
-        redirect(get_base_url(), __('Email sent redirect'));
+        redirect($this->feather->url->base(), __('Email sent redirect'));
     }
 
     public function get_redirect_url($recipient_id)
diff --git a/model/profile.php b/model/profile.php
index 4dd5cad7..5939a52d 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -36,7 +36,7 @@ public function change_pass($id)
 
             // If the user is already logged in we shouldn't be here :)
             if (!$this->user->is_guest) {
-                header('Location: '.get_base_url());
+                header('Location: '.$this->feather->url->base());
                 exit;
             }
 
@@ -299,7 +299,7 @@ public function change_email($id)
 
             $mail_message = trim(substr($mail_tpl, $first_crlf));
             $mail_message = str_replace('<username>', $this->user->username, $mail_message);
-            $mail_message = str_replace('<base_url>', get_base_url(), $mail_message);
+            $mail_message = str_replace('<base_url>', $this->feather->url->base(), $mail_message);
             $mail_message = str_replace('<activation_url>', $this->feather->url->get('user/'.$id.'/action/change_email/?key='.$new_email_key), $mail_message);
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
             $mail_message = $this->hook->fire('change_email_mail_activate_message', $mail_message);
@@ -732,7 +732,7 @@ public function delete_user($id)
 
             $this->hook->fire('delete_user');
 
-            redirect(get_base_url(), __('User delete redirect'));
+            redirect($this->feather->url->base(), __('User delete redirect'));
         }
     }
 
@@ -833,7 +833,7 @@ public function update_profile($id, $info, $section)
                 // Add http:// if the URL doesn't contain it already (while allowing https://, too)
                 if ($this->user->g_post_links == '1') {
                     if ($form['url'] != '') {
-                        $url = url_valid($form['url']);
+                        $url = $this->feather->url->is_valid($form['url']);
 
                         if ($url === false) {
                             message(__('Invalid website URL'));
diff --git a/model/register.php b/model/register.php
index 57bbbe0c..072ad320 100644
--- a/model/register.php
+++ b/model/register.php
@@ -231,7 +231,7 @@ public function insert_user($user)
 
                 $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
-                $mail_message = str_replace('<base_url>', get_base_url().'/', $mail_message);
+                $mail_message = str_replace('<base_url>', $this->feather->url->base().'/', $mail_message);
                 $mail_message = str_replace('<profile_url>', $this->feather->url->get('user/'.$new_uid.'/'), $mail_message);
                 $mail_message = str_replace('<admin_url>', $this->feather->url->get('user/'.$new_uid.'/section/admin/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
@@ -254,7 +254,7 @@ public function insert_user($user)
 
             $mail_message = trim(substr($mail_tpl, $first_crlf));
             $mail_subject = str_replace('<board_title>', $this->config['o_board_title'], $mail_subject);
-            $mail_message = str_replace('<base_url>', get_base_url().'/', $mail_message);
+            $mail_message = str_replace('<base_url>', $this->feather->url->base().'/', $mail_message);
             $mail_message = str_replace('<username>', $user['username'], $mail_message);
             $mail_message = str_replace('<password>', $user['password1'], $mail_message);
             $mail_message = str_replace('<login_url>', $this->feather->url->get('login/'), $mail_message);
@@ -270,6 +270,6 @@ public function insert_user($user)
 
         $this->hook->fire('insert_user');
 
-        redirect(get_base_url(), __('Reg complete'));
+        redirect($this->feather->url->base(), __('Reg complete'));
     }
 }
diff --git a/model/viewtopic.php b/model/viewtopic.php
index 8b913eb0..30a900b5 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -78,7 +78,7 @@ public function handle_actions($topic_id, $action)
                 $first_new_post_id = $this->hook->fire('handle_actions_first_new', $first_new_post_id);
 
                 if ($first_new_post_id) {
-                    header('Location: '.get_base_url().'/post/'.$first_new_post_id.'/#p'.$first_new_post_id);
+                    header('Location: '.$this->feather->url->base().'/post/'.$first_new_post_id.'/#p'.$first_new_post_id);
                     exit;
                 }
             }
@@ -96,7 +96,7 @@ public function handle_actions($topic_id, $action)
             $last_post_id = $this->hook->fire('handle_actions_last_post', $last_post_id);
 
             if ($last_post_id) {
-                header('Location: '.get_base_url().'/post/'.$last_post_id.'/#p'.$last_post_id);
+                header('Location: '.$this->feather->url->base().'/post/'.$last_post_id.'/#p'.$last_post_id);
                 exit;
             }
         }
@@ -275,7 +275,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
             // If the poster is a registered user
             if ($cur_post['poster_id'] > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $cur_post['username_formatted'] = '<a href="'.get_base_url().'/user/'.$cur_post['poster_id'].'/">'.feather_escape($cur_post['username']).'</a>';
+                    $cur_post['username_formatted'] = '<a href="'.$this->feather->url->base().'/user/'.$cur_post['poster_id'].'/">'.feather_escape($cur_post['username']).'</a>';
                 } else {
                     $cur_post['username_formatted'] = feather_escape($cur_post['username']);
                 }
@@ -331,7 +331,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
 
                 if ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && $this->user->g_mod_promote_users == '1')) {
                     if ($cur_post['g_promote_next_group']) {
-                        $cur_post['user_info'][] = '<dd><span><a href="'.get_base_url().'/user/'.$cur_post['poster_id'].'/action/promote/pid/'.$cur_post['id'].'">'.__('Promote user').'</a></span></dd>';
+                        $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->base().'/user/'.$cur_post['poster_id'].'/action/promote/pid/'.$cur_post['id'].'">'.__('Promote user').'</a></span></dd>';
                     }
                 }
 
diff --git a/style/FeatherBB/view/edit.php b/style/FeatherBB/view/edit.php
index 0d4943d2..3b248d18 100644
--- a/style/FeatherBB/view/edit.php
+++ b/style/FeatherBB/view/edit.php
@@ -19,7 +19,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
@@ -69,10 +69,10 @@
 ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
+    var baseUrl = '<?php echo feather_escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
-<script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
+<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
 <div id="editform" class="blockform">
 	<h2><span><?php _e('Edit post') ?></span></h2>
 	<div class="box">
diff --git a/style/FeatherBB/view/footer.new.php b/style/FeatherBB/view/footer.new.php
index f55a6e59..1dc36f2c 100644
--- a/style/FeatherBB/view/footer.new.php
+++ b/style/FeatherBB/view/footer.new.php
@@ -88,21 +88,21 @@
 
 if ($active_page == 'index') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
 } elseif ($active_page == 'viewforum') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
 } elseif ($active_page == 'viewtopic') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
     }
 }
 
@@ -147,6 +147,6 @@
     foreach ($script['params'] as $key => $value) {
         echo $key.'="'.$value.'" ';
     }
-    echo 'href="'.get_base_url().'/'.$script['file'].'"/>'."\n";
+    echo 'href="'.$feather->url->base().'/'.$script['file'].'"/>'."\n";
 } ?>
 </html>
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
index 75897053..e70ef72a 100644
--- a/style/FeatherBB/view/footer.php
+++ b/style/FeatherBB/view/footer.php
@@ -88,21 +88,21 @@
 
 if ($footer_style == 'index') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewforum') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewtopic') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
     }
 }
 
@@ -141,7 +141,7 @@
 
 </section>
 
-<script src="<?php echo get_base_url() ?>/style/FeatherBB/phone.min.js"></script>
+<script src="<?php echo $feather->url->base() ?>/style/FeatherBB/phone.min.js"></script>
 
 </body>
 </html>
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index 89ea8cec..784fcf2f 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -30,14 +30,14 @@
         foreach ($item['params'] as $key => $value) {
             echo $key.'="'.$value.'" ';
         }
-        echo 'href="'.get_base_url().'/'.$item['file'].'">'."\n";
+        echo 'href="'.$feather->url->base().'/'.$item['file'].'">'."\n";
     }
 }
 if ($admin_console) {
     if (file_exists($feather->forum_env['FEATHER_ROOT'].'style/'.$feather->user->style.'/base_admin.css')) {
-        echo "\t".'<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/'.$feather->user->style.'/base_admin.css" />'."\n";
+        echo "\t".'<link rel="stylesheet" type="text/css" href="'.$feather->url->base().'/style/'.$feather->user->style.'/base_admin.css" />'."\n";
     } else {
-        echo "\t".'<link rel="stylesheet" type="text/css" href="'.get_base_url().'/style/imports/base_admin.css" />'."\n";
+        echo "\t".'<link rel="stylesheet" type="text/css" href="'.$feather->url->base().'/style/imports/base_admin.css" />'."\n";
     }
 }
 if (isset($required_fields)) :
@@ -97,7 +97,7 @@ function process_form(the_form)
                 <div id="brdmenu" class="inbox">
                     <ul>
 <?php
-echo "\t\t\t\t\t\t".'<li id="navindex"'.(($active_page == 'index') ? ' class="isactive"' : '').'><a href="'.get_base_url().'/">'.__('Index').'</a></li>'."\n";
+echo "\t\t\t\t\t\t".'<li id="navindex"'.(($active_page == 'index') ? ' class="isactive"' : '').'><a href="'.$feather->url->base().'/">'.__('Index').'</a></li>'."\n";
 
 if ($feather->user->g_read_board == '1' && $feather->user->g_view_users == '1') {
     echo "\t\t\t\t\t\t".'<li id="navuserlist"'.(($active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('userlist/').'">'.__('User list').'</a></li>'."\n";
@@ -150,7 +150,7 @@ function process_form(the_form)
     <div class="container">
         <div class="container-title-status">
             <h1 class="title-site">
-                <a href="<?php echo get_base_url() ?>" title="" class="site-name">
+                <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
                     <p><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></p>
                 </a>
                 <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
index 0068a5f6..a5cba96e 100644
--- a/style/FeatherBB/view/header.php
+++ b/style/FeatherBB/view/header.php
@@ -15,7 +15,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
 <title><?php echo generate_page_title($page_title, $p) ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo get_base_url() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $feather->url->base() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
 <?php
 
 echo $allow_index;
@@ -91,7 +91,7 @@ function process_form(the_form)
     <div class="container">
         <div class="container-title-status">
             <h1 class="title-site">
-                <a href="<?php echo get_base_url() ?>" title="" class="site-name">
+                <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
                     <p><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></p>
                 </a>
                 <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
@@ -112,7 +112,7 @@ function process_form(the_form)
             </div>
         <?php endif; ?>
         <?php if (isset($flash['message'])) : ?>
-            <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
+            <script type="text/javascript" src="<?=$feather->url->base();?>/js/common.js"></script>
             <script type="text/javascript">
                 window.onload = function() {
                     var flashMessage = document.getElementById('flashmsg');
diff --git a/style/FeatherBB/view/help.php b/style/FeatherBB/view/help.php
index 2e8ab828..06e642f2 100644
--- a/style/FeatherBB/view/help.php
+++ b/style/FeatherBB/view/help.php
@@ -41,8 +41,8 @@
 <div class="box">
 	<div class="inbox">
 		<p><?php _e('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
+		<p><a name="url"></a><code>[url=<?php echo feather_escape($feather->url->base(true).'/') ?>]<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape($feather->url->base(true).'/') ?>"><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo feather_escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape($feather->url->base(true).'/') ?>"><?php echo feather_escape($feather->url->base(true).'/') ?></a></samp></p>
 		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
 		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
@@ -57,7 +57,7 @@
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
-		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
+		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo feather_escape($feather->url->base(true)) ?>/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape($feather->url->base(true)) ?>/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
 <h2><span><?php _e('Quotes') ?></span></h2>
diff --git a/style/FeatherBB/view/misc/report.php b/style/FeatherBB/view/misc/report.php
index cf8aa64c..acb6c729 100644
--- a/style/FeatherBB/view/misc/report.php
+++ b/style/FeatherBB/view/misc/report.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
diff --git a/style/FeatherBB/view/moderate/moderator_forum.php b/style/FeatherBB/view/moderate/moderator_forum.php
index dfd1c431..b61c3104 100644
--- a/style/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/FeatherBB/view/moderate/moderator_forum.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
@@ -91,7 +91,7 @@
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
diff --git a/style/FeatherBB/view/moderate/posts_view.php b/style/FeatherBB/view/moderate/posts_view.php
index d71fad09..a2c6ecea 100644
--- a/style/FeatherBB/view/moderate/posts_view.php
+++ b/style/FeatherBB/view/moderate/posts_view.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
@@ -84,7 +84,7 @@
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
diff --git a/style/FeatherBB/view/post.php b/style/FeatherBB/view/post.php
index b4df1f8e..72264f67 100644
--- a/style/FeatherBB/view/post.php
+++ b/style/FeatherBB/view/post.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
@@ -81,10 +81,10 @@
 ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
+    var baseUrl = '<?php echo feather_escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
-<script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
+<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
 
 <div id="postform" class="blockform">
 	<h2><span><?php echo $action ?></span></h2>
diff --git a/style/FeatherBB/view/search/footer.php b/style/FeatherBB/view/search/footer.php
index c76aaa97..0dd6fc5e 100644
--- a/style/FeatherBB/view/search/footer.php
+++ b/style/FeatherBB/view/search/footer.php
@@ -30,7 +30,7 @@
 			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
diff --git a/style/FeatherBB/view/search/header.php b/style/FeatherBB/view/search/header.php
index 00b4385c..de5e1f0a 100644
--- a/style/FeatherBB/view/search/header.php
+++ b/style/FeatherBB/view/search/header.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
diff --git a/style/FeatherBB/view/viewforum.php b/style/FeatherBB/view/viewforum.php
index e8370fe7..0855bd20 100644
--- a/style/FeatherBB/view/viewforum.php
+++ b/style/FeatherBB/view/viewforum.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -91,7 +91,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
diff --git a/style/FeatherBB/view/viewtopic.php b/style/FeatherBB/view/viewtopic.php
index 76324e67..7e7c088b 100644
--- a/style/FeatherBB/view/viewtopic.php
+++ b/style/FeatherBB/view/viewtopic.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -107,7 +107,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -155,10 +155,10 @@
     ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
+    var baseUrl = '<?php echo feather_escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
-<script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
+<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
 <script>postEditorToolbar('req_message');</script>
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
diff --git a/view/edit.php b/view/edit.php
index 0d4943d2..3b248d18 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -19,7 +19,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
@@ -69,10 +69,10 @@
 ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
+    var baseUrl = '<?php echo feather_escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
-<script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
+<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
 <div id="editform" class="blockform">
 	<h2><span><?php _e('Edit post') ?></span></h2>
 	<div class="box">
diff --git a/view/footer.php b/view/footer.php
index 7fa865c4..1e95637f 100644
--- a/view/footer.php
+++ b/view/footer.php
@@ -88,21 +88,21 @@
 
 if ($footer_style == 'index') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewforum') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewtopic') {
     if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.get_base_url().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
     }
 }
 
@@ -141,7 +141,7 @@
 
 </section>
 
-<script src="<?php echo get_base_url() ?>/style/FeatherBB/phone.min.js"></script>
+<script src="<?php echo $feather->url->base() ?>/style/FeatherBB/phone.min.js"></script>
 
 </body>
 </html>
diff --git a/view/header.php b/view/header.php
index 9da121c2..7d751f35 100644
--- a/view/header.php
+++ b/view/header.php
@@ -15,7 +15,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
 <title><?php echo generate_page_title($page_title, $p) ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo get_base_url() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $feather->url->base() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
 <?php
 
 echo $allow_index;
@@ -91,7 +91,7 @@ function process_form(the_form)
     <div class="container">
         <div class="container-title-status">
             <h1 class="title-site">
-                <a href="<?php echo get_base_url() ?>" title="" class="site-name">
+                <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
                     <p><?php echo feather_escape($feather_config['o_board_title']) ?></p>
                 </a>
                 <div id="brddesc"><?php echo htmlspecialchars_decode($feather_config['o_board_desc']) ?></div>
@@ -112,7 +112,7 @@ function process_form(the_form)
             </div>
         <?php endif; ?>
         <?php if (isset($flash['message'])) : ?>
-            <script type="text/javascript" src="<?=get_base_url();?>/js/common.js"></script>
+            <script type="text/javascript" src="<?=$feather->url->base();?>/js/common.js"></script>
             <div id="msgflash" class="block">
                 <h2><span><?php _e('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
                 <div class="box">
diff --git a/view/help.php b/view/help.php
index 2e8ab828..06e642f2 100644
--- a/view/help.php
+++ b/view/help.php
@@ -41,8 +41,8 @@
 <div class="box">
 	<div class="inbox">
 		<p><?php _e('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape(get_base_url(true).'/') ?>]<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo feather_escape(get_base_url(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape(get_base_url(true).'/') ?>"><?php echo feather_escape(get_base_url(true).'/') ?></a></samp></p>
+		<p><a name="url"></a><code>[url=<?php echo feather_escape($feather->url->base(true).'/') ?>]<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape($feather->url->base(true).'/') ?>"><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo feather_escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape($feather->url->base(true).'/') ?>"><?php echo feather_escape($feather->url->base(true).'/') ?></a></samp></p>
 		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
 		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
@@ -57,7 +57,7 @@
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
-		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo feather_escape(get_base_url(true)) ?>/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape(get_base_url(true)) ?>/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
+		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo feather_escape($feather->url->base(true)) ?>/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape($feather->url->base(true)) ?>/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
 <h2><span><?php _e('Quotes') ?></span></h2>
diff --git a/view/misc/report.php b/view/misc/report.php
index cf8aa64c..acb6c729 100644
--- a/view/misc/report.php
+++ b/view/misc/report.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
index dfd1c431..b61c3104 100644
--- a/view/moderate/moderator_forum.php
+++ b/view/moderate/moderator_forum.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
@@ -91,7 +91,7 @@
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
diff --git a/view/moderate/posts_view.php b/view/moderate/posts_view.php
index d71fad09..a2c6ecea 100644
--- a/view/moderate/posts_view.php
+++ b/view/moderate/posts_view.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
@@ -84,7 +84,7 @@
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
diff --git a/view/post.php b/view/post.php
index b4df1f8e..72264f67 100644
--- a/view/post.php
+++ b/view/post.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
@@ -81,10 +81,10 @@
 ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
+    var baseUrl = '<?php echo feather_escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
-<script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
+<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
 
 <div id="postform" class="blockform">
 	<h2><span><?php echo $action ?></span></h2>
diff --git a/view/search/footer.php b/view/search/footer.php
index c76aaa97..0dd6fc5e 100644
--- a/view/search/footer.php
+++ b/view/search/footer.php
@@ -30,7 +30,7 @@
 			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
diff --git a/view/search/header.php b/view/search/header.php
index 00b4385c..de5e1f0a 100644
--- a/view/search/header.php
+++ b/view/search/header.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
diff --git a/view/viewforum.php b/view/viewforum.php
index e8370fe7..0855bd20 100644
--- a/view/viewforum.php
+++ b/view/viewforum.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -91,7 +91,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
diff --git a/view/viewtopic.php b/view/viewtopic.php
index 76324e67..7e7c088b 100644
--- a/view/viewtopic.php
+++ b/view/viewtopic.php
@@ -17,7 +17,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -107,7 +107,7 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo get_base_url() ?>/"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
@@ -155,10 +155,10 @@
     ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo feather_escape(get_base_url(true)); ?>',
+    var baseUrl = '<?php echo feather_escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
-<script src="<?php echo get_base_url() ?>/js/bbeditor.js"></script>
+<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
 <script>postEditorToolbar('req_message');</script>
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>

From 139e5ea134d17aeb8fdb80f61597427aafeabcff Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 28 Aug 2015 22:40:16 +0200
Subject: [PATCH 238/353] Add debug class

---
 include/classes/core.class.php      |  4 ++
 include/classes/debug.class.php     | 77 +++++++++++++++++++++++++++++
 include/functions.php               | 48 ------------------
 style/FeatherBB/view/footer.new.php | 18 +------
 style/FeatherBB/view/footer.php     | 18 +------
 view/footer.php                     | 19 ++-----
 6 files changed, 88 insertions(+), 96 deletions(-)
 create mode 100644 include/classes/debug.class.php

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index 78811653..70f6e681 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -208,6 +208,10 @@ public function call()
         $this->app->container->singleton('email', function () {
             return new \FeatherBB\Email();
         });
+        // Load FeatherBB debug class
+        $this->app->container->singleton('debug', function () {
+            return new \FeatherBB\Debug();
+        });
 
         // This is the very first hook fired
         $this->app->hooks->fire('core.start');
diff --git a/include/classes/debug.class.php b/include/classes/debug.class.php
new file mode 100644
index 00000000..ef0d63e8
--- /dev/null
+++ b/include/classes/debug.class.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace FeatherBB;
+use DB;
+
+class Debug
+{
+    //
+    // Display executed queries (if enabled)
+    //
+    public function queries()
+    {
+        ?>
+        <div id="debug" class="blocktable">
+            <h2><span><?php _e('Debug table') ?></span></h2>
+            <div class="box">
+                <div class="inbox">
+                    <table>
+                        <thead>
+                        <tr>
+                            <th class="tcl" scope="col"><?php _e('Query times') ?></th>
+                            <th class="tcr" scope="col"><?php _e('Query') ?></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <?php
+                        $query_time_total = 0;
+                        $i = 0;
+                        foreach (DB::get_query_log()[1] as $query) {
+                            $query_time = DB::get_query_log()[0][$i];
+                            ?>
+                            <tr>
+                                <td class="tcl"><?php echo feather_escape(round($query_time, 6)) ?></td>
+                                <td class="tcr"><?php echo feather_escape($query) ?></td>
+                            </tr>
+                            <?php
+                            $query_time_total .= $query_time;
+                            ++$i;
+                        }
+                        ?>
+                        <tr>
+                            <td class="tcl" colspan="2"><?php printf(__('Total query time'), round($query_time_total, 6).' s') ?></td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+        <?php
+    }
+
+    public function info() {
+        $feather = \Slim\Slim::getInstance();
+        echo '<p id="debugtime">[ ';
+
+        // Calculate script generation time
+        $time_diff = sprintf('%.3f', get_microtime() - $feather->start);
+        echo sprintf(__('Querytime'), $time_diff, count(\DB::get_query_log()[0]));
+
+        if (function_exists('memory_get_usage')) {
+            echo ' - '.sprintf(__('Memory usage'), file_size(memory_get_usage()));
+
+            if (function_exists('memory_get_peak_usage')) {
+                echo ' '.sprintf(__('Peak usage'), file_size(memory_get_peak_usage()));
+            }
+        }
+
+        echo ' ]</p>'."\n";
+    }
+}
\ No newline at end of file
diff --git a/include/functions.php b/include/functions.php
index 5e46afff..316e88d5 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -833,51 +833,3 @@ function breadcrumbs_admin(array $links)
     return implode(' » ', $tmp);
 }
 
-
-
-// DEBUG FUNCTIONS BELOW
-
-//
-// Display executed queries (if enabled)
-//
-function display_saved_queries()
-{
-    ?>
-
-<div id="debug" class="blocktable">
-	<h2><span><?php _e('Debug table') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Query times') ?></th>
-					<th class="tcr" scope="col"><?php _e('Query') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-
-    $query_time_total = 0.0;
-    $i = 0;
-    foreach (\DB::get_query_log()[1] as $query) {
-        ?>
-                <tr>
-					<td class="tcl"><?php echo feather_escape(round(\DB::get_query_log()[0][$i], 6)) ?></td>
-					<td class="tcr"><?php echo feather_escape($query) ?></td>
-				</tr>
-        <?php
-        ++$i;
-    }
-        ?>
-				<tr>
-					<td class="tcl" colspan="2"><?php printf(__('Total query time'), $query_time_total.' s') ?></td>
-				</tr>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-<?php
-
-}
diff --git a/style/FeatherBB/view/footer.new.php b/style/FeatherBB/view/footer.new.php
index 1dc36f2c..1fc50bef 100644
--- a/style/FeatherBB/view/footer.new.php
+++ b/style/FeatherBB/view/footer.new.php
@@ -117,25 +117,11 @@
 
 // Display debug info (if enabled/defined)
 if ($feather->forum_env['FEATHER_SHOW_INFO']) {
-    echo '<p id="debugtime">[ ';
-
-    // Calculate script generation time
-    $time_diff = sprintf('%.3f', get_microtime() - $feather->start);
-    echo sprintf(__('Querytime'), $time_diff, count(\DB::get_query_log()[0]));
-
-    if (function_exists('memory_get_usage')) {
-        echo ' - '.sprintf(__('Memory usage'), file_size(memory_get_usage()));
-
-        if (function_exists('memory_get_peak_usage')) {
-            echo ' '.sprintf(__('Peak usage'), file_size(memory_get_peak_usage()));
-        }
-    }
-
-    echo ' ]</p>'."\n";
+    $feather->debug->info();
 }
 // Display executed queries (if enabled)
 if ($feather->forum_env['FEATHER_SHOW_QUERIES']) {
-    display_saved_queries();
+    $feather->debug->queries();
 }
 ?>
 
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
index e70ef72a..e149e22e 100644
--- a/style/FeatherBB/view/footer.php
+++ b/style/FeatherBB/view/footer.php
@@ -117,25 +117,11 @@
 
 // Display debug info (if enabled/defined)
 if ($feather->forum_env['FEATHER_SHOW_INFO']) {
-    echo '<p id="debugtime">[ ';
-
-    // Calculate script generation time
-    $time_diff = sprintf('%.3f', get_microtime() - $feather_start);
-    echo sprintf(__('Querytime'), $time_diff, count(\DB::get_query_log()[0]));
-
-    if (function_exists('memory_get_usage')) {
-        echo ' - '.sprintf(__('Memory usage'), file_size(memory_get_usage()));
-
-        if (function_exists('memory_get_peak_usage')) {
-            echo ' '.sprintf(__('Peak usage'), file_size(memory_get_peak_usage()));
-        }
-    }
-
-    echo ' ]</p>'."\n";
+    $feather->debug->info();
 }
 // Display executed queries (if enabled)
 if ($feather->forum_env['FEATHER_SHOW_QUERIES']) {
-    display_saved_queries();
+    $feather->debug->queries();
 }
 ?>
 
diff --git a/view/footer.php b/view/footer.php
index 1e95637f..2cad803c 100644
--- a/view/footer.php
+++ b/view/footer.php
@@ -117,25 +117,12 @@
 
 // Display debug info (if enabled/defined)
 if ($feather->forum_env['FEATHER_SHOW_INFO']) {
-    echo '<p id="debugtime">[ ';
-
-    // Calculate script generation time
-    $time_diff = sprintf('%.3f', get_microtime() - $feather_start);
-    echo sprintf(__('Querytime'), $time_diff, count(\DB::get_query_log()[0]));
-
-    if (function_exists('memory_get_usage')) {
-        echo ' - '.sprintf(__('Memory usage'), file_size(memory_get_usage()));
-
-        if (function_exists('memory_get_peak_usage')) {
-            echo ' '.sprintf(__('Peak usage'), file_size(memory_get_peak_usage()));
-        }
-    }
-
-    echo ' ]</p>'."\n";
+    $feather->debug->info();
 }
+
 // Display executed queries (if enabled)
 if ($feather->forum_env['FEATHER_SHOW_QUERIES']) {
-    display_saved_queries();
+    $feather->debug->queries();
 }
 ?>
 

From 984d495301936fb26a42ff45247cc41a094bbfd2 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Fri, 28 Aug 2015 22:40:48 +0200
Subject: [PATCH 239/353] Use DB

---
 include/classes/debug.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/classes/debug.class.php b/include/classes/debug.class.php
index ef0d63e8..d5c0ca02 100644
--- a/include/classes/debug.class.php
+++ b/include/classes/debug.class.php
@@ -62,7 +62,7 @@ public function info() {
 
         // Calculate script generation time
         $time_diff = sprintf('%.3f', get_microtime() - $feather->start);
-        echo sprintf(__('Querytime'), $time_diff, count(\DB::get_query_log()[0]));
+        echo sprintf(__('Querytime'), $time_diff, count(DB::get_query_log()[0]));
 
         if (function_exists('memory_get_usage')) {
             echo ' - '.sprintf(__('Memory usage'), file_size(memory_get_usage()));

From 2ad5d1cd6b5df2a5f33d52a91b29d86c8566edf4 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 11:32:39 +0200
Subject: [PATCH 240/353] Tweak debug mode

---
 include/classes/core.class.php      |  4 --
 include/classes/debug.class.php     | 77 -----------------------------
 include/classes/view.class.php      |  7 +++
 model/debug.php                     | 36 ++++++++++++++
 style/FeatherBB/view/footer.new.php | 40 +++++++++++----
 5 files changed, 74 insertions(+), 90 deletions(-)
 delete mode 100644 include/classes/debug.class.php
 create mode 100644 model/debug.php

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index 70f6e681..78811653 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -208,10 +208,6 @@ public function call()
         $this->app->container->singleton('email', function () {
             return new \FeatherBB\Email();
         });
-        // Load FeatherBB debug class
-        $this->app->container->singleton('debug', function () {
-            return new \FeatherBB\Debug();
-        });
 
         // This is the very first hook fired
         $this->app->hooks->fire('core.start');
diff --git a/include/classes/debug.class.php b/include/classes/debug.class.php
deleted file mode 100644
index d5c0ca02..00000000
--- a/include/classes/debug.class.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-namespace FeatherBB;
-use DB;
-
-class Debug
-{
-    //
-    // Display executed queries (if enabled)
-    //
-    public function queries()
-    {
-        ?>
-        <div id="debug" class="blocktable">
-            <h2><span><?php _e('Debug table') ?></span></h2>
-            <div class="box">
-                <div class="inbox">
-                    <table>
-                        <thead>
-                        <tr>
-                            <th class="tcl" scope="col"><?php _e('Query times') ?></th>
-                            <th class="tcr" scope="col"><?php _e('Query') ?></th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <?php
-                        $query_time_total = 0;
-                        $i = 0;
-                        foreach (DB::get_query_log()[1] as $query) {
-                            $query_time = DB::get_query_log()[0][$i];
-                            ?>
-                            <tr>
-                                <td class="tcl"><?php echo feather_escape(round($query_time, 6)) ?></td>
-                                <td class="tcr"><?php echo feather_escape($query) ?></td>
-                            </tr>
-                            <?php
-                            $query_time_total .= $query_time;
-                            ++$i;
-                        }
-                        ?>
-                        <tr>
-                            <td class="tcl" colspan="2"><?php printf(__('Total query time'), round($query_time_total, 6).' s') ?></td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-        <?php
-    }
-
-    public function info() {
-        $feather = \Slim\Slim::getInstance();
-        echo '<p id="debugtime">[ ';
-
-        // Calculate script generation time
-        $time_diff = sprintf('%.3f', get_microtime() - $feather->start);
-        echo sprintf(__('Querytime'), $time_diff, count(DB::get_query_log()[0]));
-
-        if (function_exists('memory_get_usage')) {
-            echo ' - '.sprintf(__('Memory usage'), file_size(memory_get_usage()));
-
-            if (function_exists('memory_get_peak_usage')) {
-                echo ' '.sprintf(__('Peak usage'), file_size(memory_get_peak_usage()));
-            }
-        }
-
-        echo ' ]</p>'."\n";
-    }
-}
\ No newline at end of file
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 4259cda6..4140bd34 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -374,6 +374,13 @@ protected function getDefaultPageInfo()
             $data['has_reports'] = \model\header::get_reports();
         }
 
+        if ($this->app->forum_env['FEATHER_SHOW_INFO']) {
+            $data['exec_info'] = \model\debug::get_info();
+            if ($this->app->forum_env['FEATHER_SHOW_QUERIES']) {
+                $data['queries_info'] = \model\debug::get_queries();
+            }
+        }
+
         return $data;
     }
 
diff --git a/model/debug.php b/model/debug.php
new file mode 100644
index 00000000..42209dba
--- /dev/null
+++ b/model/debug.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+* Copyright (C) 2015 FeatherBB
+* based on code by (C) 2008-2012 FluxBB
+* and Rickard Andersson (C) 2002-2008 PunBB
+* License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+*/
+
+namespace model;
+use DB;
+
+class debug
+{
+    protected static $app;
+
+    public static function get_queries()
+    {
+        $data = array();
+        $data['raw'] = array_combine(DB::get_query_log()[0], DB::get_query_log()[1]);
+        $data['total_time'] = array_sum(array_keys($data['raw']));
+        return $data;
+    }
+
+    public static function get_info()
+    {
+        self::$app = \Slim\Slim::getInstance();
+
+        $data = array(
+            'nb_queries' => count(DB::get_query_log()[0]),
+            'exec_time' => (get_microtime() - self::$app->start));
+        $data['mem_usage'] = (function_exists('memory_get_usage')) ? file_size(memory_get_usage()) : 'N/A';
+        $data['mem_peak_usage'] = (function_exists('memory_get_peak_usage')) ? file_size(memory_get_peak_usage()) : 'N/A';
+        return $data;
+    }
+}
diff --git a/style/FeatherBB/view/footer.new.php b/style/FeatherBB/view/footer.new.php
index 1fc50bef..7565a387 100644
--- a/style/FeatherBB/view/footer.new.php
+++ b/style/FeatherBB/view/footer.new.php
@@ -116,15 +116,37 @@
 <?php
 
 // Display debug info (if enabled/defined)
-if ($feather->forum_env['FEATHER_SHOW_INFO']) {
-    $feather->debug->info();
-}
-// Display executed queries (if enabled)
-if ($feather->forum_env['FEATHER_SHOW_QUERIES']) {
-    $feather->debug->queries();
-}
-?>
-
+if (!empty($exec_info)) { ?>
+	<p id="debugtime">[ <?= sprintf(__('Querytime'), round($exec_info['exec_time'], 6), $exec_info['nb_queries']).' - '.sprintf(__('Memory usage'), $exec_info['mem_usage']).' '.sprintf(__('Peak usage'), $exec_info['mem_peak_usage'])?>]</p>
+<? }
+if (!empty($queries_info)) { ?>
+	<div id="debug" class="blocktable">
+		<h2><span><?php _e('Debug table') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<table>
+					<thead>
+						<tr>
+							<th class="tcl" scope="col"><?php _e('Query times') ?></th>
+							<th class="tcr" scope="col"><?php _e('Query') ?></th>
+						</tr>
+					</thead>
+					<tbody>
+<?php foreach ($queries_info['raw'] as $time => $sql) {
+	echo "\t\t\t\t\t\t".'<tr>'."\n";
+	echo "\t\t\t\t\t\t\t".'<td class="tcl">'.feather_escape(round($time, 8)).'</td>'."\n";
+	echo "\t\t\t\t\t\t\t".'<td class="tcr">'.feather_escape($sql).'</td>'."\n";
+	echo "\t\t\t\t\t\t".'</tr>'."\n";
+} ?>
+						<tr>
+							<td class="tcl" colspan="2"><?= sprintf(__('Total query time'), round($queries_info['total_time'], 7)).' s' ?></td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
+<? } ?>
 </section>
 </body>
 <!-- JS -->

From a688b6aa005c492022a2d71674004aeeb9669a16 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 12:10:21 +0200
Subject: [PATCH 241/353] Add nested parameter in view class to disable
 header/footer rendering

---
 include/classes/view.class.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 4140bd34..8f1c61c0 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -209,13 +209,14 @@ public function getTemplatePathname($file)
     * Rendering
     *******************************************************************************/
 
-    public function display($data = null)
+    public function display($nested = true)
     {
-        echo $this->fetch($data);
+        echo $this->fetch($nested);
     }
 
-    public function fetch($data = null)
+    protected function fetch($nested = true)
     {
+        $data = array();
         // Force flash messages
         if (isset($this->app->environment['slim.flash'])) {
             $this->data->set('flash', $this->app->environment['slim.flash']);
@@ -224,19 +225,23 @@ public function fetch($data = null)
         $data['feather'] = \Slim\Slim::getInstance();
         $data['assets'] = $this->getAssets();
         $data = $this->app->hooks->fire('view.alter_data', $data);
-        return $this->render($data);
+        return $this->render($data, $nested);
     }
 
-    protected function render($data = null)
+    protected function render($data = null, $nested = true)
     {
         extract($data);
         ob_start();
 
-        require $this->getTemplatePathname('header.new.php');
+        if ($nested) {
+            require $this->getTemplatePathname('header.new.php');
+        }
         foreach ($this->getTemplates() as $tpl) {
             require $tpl;
         }
-        require $this->getTemplatePathname('footer.new.php');
+        if ($nested) {
+            require $this->getTemplatePathname('footer.new.php');
+        }
         return ob_get_clean();
     }
 
@@ -370,7 +375,7 @@ protected function getDefaultPageInfo()
             'tid' => null,
         );
 
-        if ($this->app->user->is_admmod) {
+        if (is_object($this->app->user) && $this->app->user->is_admmod) {
             $data['has_reports'] = \model\header::get_reports();
         }
 

From f111c98d7ce850bb8f4949d5afed28c4d5f45ed3 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 12:10:29 +0200
Subject: [PATCH 242/353] Update installer to new view

---
 controller/install.php | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/controller/install.php b/controller/install.php
index fc11fe6a..69b16ee9 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -28,6 +28,7 @@ public function __construct()
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \model\install();
         $this->available_langs = forum_list_langs();
+        $this->feather->view2->setStyle('FeatherBB');
     }
 
     public function run()
@@ -113,13 +114,12 @@ public function run()
 
             // End validation and check errors
             if (!empty($this->errors)) {
-                $this->feather->view()->setTemplatesDirectory($this->feather->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
-                $this->feather->view()->display('install.php', array(
+                $this->feather->view2->setPageInfo(array(
                                                         'languages' => $this->available_langs,
                                                         'supported_dbs' => $this->supported_dbs,
                                                         'data' => $data,
                                                         'errors' => $this->errors,
-                                                    ));
+                                                    ))->addTemplate('install.php')->display(false);
             } else {
                 $data['default_style'] = $this->default_style;
                 $data['avatars'] = in_array(strtolower(@ini_get('file_uploads')), array('on', 'true', '1')) ? 1 : 0;
@@ -131,15 +131,12 @@ public function run()
                           'description' => __('Description'),
                           'base_url' => $base_url,
                           'default_lang' => $this->install_lang);
-            if (isset($this->environment['slim.flash'])) {
-                $this->feather->view()->set('flash', $this->environment['slim.flash']);
-            }
-            $this->feather->view()->setTemplatesDirectory($this->feather->forum_env['FEATHER_ROOT'].'style/FeatherBB/view');
-            $this->feather->view()->display('install.php', array(
-                                                'languages' => $this->available_langs,
-                                                'supported_dbs' => $this->supported_dbs,
-                                                'data' => $data,
-                                                'alerts' => array()));
+          $this->feather->view2->setPageInfo(array(
+                                                  'languages' => $this->available_langs,
+                                                  'supported_dbs' => $this->supported_dbs,
+                                                  'data' => $data,
+                                                  'alerts' => array(),
+                                              ))->addTemplate('install.php')->display(false);
         }
     }
 
@@ -157,7 +154,7 @@ public function create_config(array $data)
                                              'cookie_seed' => random_key(16, false, true)));
 
         // ... And write it on disk
-        if ($this->write_config(json_encode($config, JSON_PRETTY_PRINT))) {
+        if ($this->write_config($config)) {
             $this->create_db($data);
         }
     }
@@ -206,9 +203,9 @@ public function create_db(array $data)
         redirect($this->feather->url->get('/'));
     }
 
-    public function write_config($json)
+    public function write_config($array)
     {
-        return file_put_contents($this->feather->forum_env['FORUM_CONFIG_FILE'], $json);
+        return file_put_contents($this->feather->forum_env['FORUM_CONFIG_FILE'], '<?php'."\n".'$featherbb_config = '.var_export($array, true).';');
     }
 
     public function write_htaccess()

From feede8259befb44a712f6615e5b86987f110c269 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 12:10:41 +0200
Subject: [PATCH 243/353] Change config format from JSON to PHP

---
 include/classes/core.class.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index 78811653..97ab83f1 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -167,7 +167,7 @@ public function set_headers()
 
     public function call()
     {
-        global $forum_time_formats, $forum_date_formats, $feather_config; // Legacy
+        global $forum_time_formats, $forum_date_formats; // Legacy
 
         // Set headers
         $this->set_headers();
@@ -219,9 +219,9 @@ public function call()
         }
 
         // Load config from disk
-        $config_file = json_decode(file_get_contents($this->forum_env['FORUM_CONFIG_FILE']), true);
-        if (!is_null($config_file)) {
-            $this->forum_settings = array_merge(self::load_default_forum_settings(), $config_file);
+        include $this->forum_env['FORUM_CONFIG_FILE'];
+        if (isset($featherbb_config) && is_array($featherbb_config)) {
+            $this->forum_settings = array_merge(self::load_default_forum_settings(), $featherbb_config);
         } else {
             $this->app->response->setStatus(500); // Send forbidden header
             return $this->app->response->setBody('Wrong config file format');
@@ -237,9 +237,8 @@ public function call()
             $this->app->cache->store('config', \model\cache::get_config());
         }
 
-        $feather_config = $this->app->cache->retrieve('config');
         // Finalize forum_settings array
-        $this->forum_settings = array_merge($feather_config, $this->forum_settings);
+        $this->forum_settings = array_merge($this->app->cache->retrieve('config'), $this->forum_settings);
 
         // Set default style and assets
         $this->app->view2->setStyle($this->forum_settings['o_default_style']);

From 3a2db58ca9eb9cb3fef336ca0bbe8cf4150ef8b8 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 12:10:55 +0200
Subject: [PATCH 244/353] Add checks in model\debug

---
 model/debug.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/model/debug.php b/model/debug.php
index 42209dba..d753fb8c 100644
--- a/model/debug.php
+++ b/model/debug.php
@@ -16,6 +16,9 @@ class debug
 
     public static function get_queries()
     {
+        if (empty(DB::get_query_log())) {
+            return null;
+        }
         $data = array();
         $data['raw'] = array_combine(DB::get_query_log()[0], DB::get_query_log()[1]);
         $data['total_time'] = array_sum(array_keys($data['raw']));
@@ -26,9 +29,8 @@ public static function get_info()
     {
         self::$app = \Slim\Slim::getInstance();
 
-        $data = array(
-            'nb_queries' => count(DB::get_query_log()[0]),
-            'exec_time' => (get_microtime() - self::$app->start));
+        $data = array('exec_time' => (get_microtime() - self::$app->start));
+        $data['nb_queries'] = (isset(DB::get_query_log()[0])) ? count(DB::get_query_log()[0]) : 'N/A';
         $data['mem_usage'] = (function_exists('memory_get_usage')) ? file_size(memory_get_usage()) : 'N/A';
         $data['mem_peak_usage'] = (function_exists('memory_get_peak_usage')) ? file_size(memory_get_peak_usage()) : 'N/A';
         return $data;

From d6fbe36b1212aaf07ef019d9d7e30e089ae96d61 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sat, 29 Aug 2015 12:53:47 +0200
Subject: [PATCH 245/353] Various fixes

---
 Plugins/Test.php                       | 4 ++--
 controller/admin/plugins.php           | 8 ++++----
 include/routes.php                     | 3 ++-
 index.php                              | 4 ++--
 style/FeatherBB/view/admin/menu.php    | 4 ++++
 style/FeatherBB/view/admin/plugins.php | 4 ++--
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Plugins/Test.php b/Plugins/Test.php
index 4a927277..a0a8cf37 100644
--- a/Plugins/Test.php
+++ b/Plugins/Test.php
@@ -32,12 +32,12 @@ public function runHooks()
     public function run()
     {
         $this->hooks->bind('get_forum_actions', function ($forum_actions) {
-           $forum_actions[] = '<a href="' . get_link('mark-read/') . '">Test1</a>';
+           $forum_actions[] = '<a href="' . $this->feather->url->get('mark-read/') . '">Test1</a>';
            return $forum_actions;
         });
 
         $this->hooks->bind('get_forum_actions', function ($forum_actions) {
-            $forum_actions[] = '<a href="' . get_link('mark-read/') . '">Test2</a>';
+            $forum_actions[] = '<a href="' . $this->feather->url->get('mark-read/') . '">Test2</a>';
             return $forum_actions;
         });
     }
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index fbb3295e..237a1410 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -67,10 +67,10 @@ public function activate()
         try {
             $plugin->activate($class);
         } catch (\Exception $e) {
-            redirect(get_link('admin/plugins/'), feather_escape($e->getMessage()));
+            redirect($this->feather->url->get('admin/plugins/'), feather_escape($e->getMessage()));
         }
         // Plugin has been activated, confirm and redirect
-        redirect(get_link('admin/plugins/'), 'Plugin "'.$class::$name.'" activated!');
+        redirect($this->feather->url->get('admin/plugins/'), 'Plugin "'.$class::$name.'" activated!');
     }
 
     public function deactivate()
@@ -85,10 +85,10 @@ public function deactivate()
         try {
             $plugin->deactivate($class);
         } catch (\Exception $e) {
-            redirect(get_link('admin/plugins/'), feather_escape($e->getMessage()));
+            redirect($this->feather->url->get('admin/plugins/'), feather_escape($e->getMessage()));
         }
         // Plugin has been activated, confirm and redirect
-        redirect(get_link('admin/plugins/'), 'Plugin "'.$class::$name.'" deactivated!');
+        redirect($this->feather->url->get('admin/plugins/'), 'Plugin "'.$class::$name.'" deactivated!');
     }
 
     public function display()
diff --git a/include/routes.php b/include/routes.php
index 6c80aac8..60f8c8cf 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -163,6 +163,7 @@
     $feather->group('/plugins', function() use ($feather) {
         $feather->map('/(/)', '\controller\admin\plugins:index')->via('GET', 'POST');
         $feather->map('/activate(/)', '\controller\admin\plugins:activate')->via('GET');
+        $feather->map('/deactivate(/)', '\controller\admin\plugins:deactivate')->via('GET');
         // $feather->map('/loader(/)', '\controller\admin\plugins:display')->via('GET', 'POST');
     });
 
@@ -184,4 +185,4 @@
 // 404 not found
 $feather->notFound(function () {
     message(__('Bad request'), '404');
-});
\ No newline at end of file
+});
diff --git a/index.php b/index.php
index 630afa88..15b38fb4 100644
--- a/index.php
+++ b/index.php
@@ -21,8 +21,8 @@
 require 'vendor/autoload.php';
 
 // Load FeatherBB
-// require 'include/classes/autoload.class.php';
-// \FeatherBB\Loader::registerAutoloader();
+require 'include/classes/autoload.class.php';
+\FeatherBB\Loader::registerAutoloader();
 
 // Instantiate Slim and add CSRF
 $feather = new \Slim\Slim();
diff --git a/style/FeatherBB/view/admin/menu.php b/style/FeatherBB/view/admin/menu.php
index bf468a21..da238ac6 100644
--- a/style/FeatherBB/view/admin/menu.php
+++ b/style/FeatherBB/view/admin/menu.php
@@ -68,6 +68,10 @@
     echo ' class="isactive"';
 }
         ?>><a href="<?php echo $feather->url->get('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
+					<li<?php if ($page == 'plugins') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/plugins/') ?>"><?= 'Plugins'; ?></a></li>
 					<li<?php if ($page == 'censoring') {
     echo ' class="isactive"';
 }
diff --git a/style/FeatherBB/view/admin/plugins.php b/style/FeatherBB/view/admin/plugins.php
index ee21fffe..c09245ed 100644
--- a/style/FeatherBB/view/admin/plugins.php
+++ b/style/FeatherBB/view/admin/plugins.php
@@ -31,9 +31,9 @@
                                 <strong><?= $class::$name; ?></strong>
                                 <div class="plugin-actions">
                                     <?php if (array_key_exists($class, $activePlugins)) { ?>
-                                        <a href="<?= get_link('/admin/plugins/deactivate?plugin='.$class) ?>">Deactivate</a>
+                                        <a href="<?= $feather->url->get('/admin/plugins/deactivate?plugin='.$class) ?>">Deactivate</a>
                                     <?php } else { ?>
-                                        <a href="<?= get_link('/admin/plugins/activate?plugin='.$class) ?>">Activate</a>
+                                        <a href="<?= $feather->url->get('/admin/plugins/activate?plugin='.$class) ?>">Activate</a>
                                     <?php } ?>
                                 </div>
                             </td>

From 6d9889c4a4002381cc628b22fa0b8773c7aaed1e Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 12:55:00 +0200
Subject: [PATCH 246/353] First attempt to handle Exceptions

---
 include/routes.php               | 14 ++++++++++++--
 index.php                        |  2 +-
 model/viewforum.php              |  3 ++-
 style/FeatherBB.css              |  7 +++++++
 style/FeatherBB/view/message.php |  6 +++---
 view/message.php                 |  6 +++---
 6 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/include/routes.php b/include/routes.php
index c2180bbd..460566a6 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -178,6 +178,16 @@
 });
 
 // 404 not found
-$feather->notFound(function () {
-    message(__('Bad request'), '404');
+$feather->notFound(function () use ($feather){
+    throw new \Exception('Page not found', 404);
+});
+
+$feather->error(function (\Exception $e) use ($feather) {
+    $feather->response->setStatus($e->getCode());
+    $feather->view2->setPageInfo(array(
+        'title' => array(feather_escape($feather->config['o_board_title']), __('Error')),
+        'msg'    =>   $e->getMessage(),
+        'no_back_link'    => false,
+        ))->addTemplate('message.php')->display();
+    $feather->stop();
 });
diff --git a/index.php b/index.php
index 277c67d2..30191ae2 100644
--- a/index.php
+++ b/index.php
@@ -27,7 +27,7 @@
 
 $feather_settings = array('config_file' => 'include/config.php',
                           'cache_dir' => 'cache/',
-                          'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
+                          'debug' => false); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
 $feather->add(new \FeatherBB\Auth());
 $feather->add(new \FeatherBB\Core($feather_settings));
 
diff --git a/model/viewforum.php b/model/viewforum.php
index 0044e4a8..d1f57e7e 100644
--- a/model/viewforum.php
+++ b/model/viewforum.php
@@ -60,7 +60,8 @@ public function get_info_forum($id)
         $cur_forum = $cur_forum->find_one();
 
         if (!$cur_forum) {
-            message(__('Bad request'), '404');
+            //message(__('Bad request'), '404');
+            throw new \Exception(__('Bad request'), '404');
         }
 
         $cur_forum = $this->hook->fire('get_info_forum', $cur_forum);
diff --git a/style/FeatherBB.css b/style/FeatherBB.css
index be3f9568..ae505380 100644
--- a/style/FeatherBB.css
+++ b/style/FeatherBB.css
@@ -1261,6 +1261,13 @@ footer .footer-link a {
     border: 1px solid #ebccd1;
     color: #a94442
 }
+
+.error {
+    background-color: #f2dede !important;
+    border: 1px solid #ebccd1 !important;
+    color: #a94442 !important
+}
+
 .flashmsg {
     position: fixed;
     min-width: 220px;
diff --git a/style/FeatherBB/view/message.php b/style/FeatherBB/view/message.php
index 740b040e..e3d23d0e 100644
--- a/style/FeatherBB/view/message.php
+++ b/style/FeatherBB/view/message.php
@@ -13,11 +13,11 @@
 }
 
 ?>
-<div id="msg" class="block">
-	<h2><span><?php _e('Info') ?></span></h2>
+<div id="msg" class="block error">
+	<h2><span><?= __('Error') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
-			<p><?php echo $message ?></p>
+			<p><?php echo $msg ?></p>
 <?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php _e('Go back') ?></a></p>
 <?php endif;
     ?>		</div>
diff --git a/view/message.php b/view/message.php
index 740b040e..e3d23d0e 100644
--- a/view/message.php
+++ b/view/message.php
@@ -13,11 +13,11 @@
 }
 
 ?>
-<div id="msg" class="block">
-	<h2><span><?php _e('Info') ?></span></h2>
+<div id="msg" class="block error">
+	<h2><span><?= __('Error') ?></span></h2>
 	<div class="box">
 		<div class="inbox">
-			<p><?php echo $message ?></p>
+			<p><?php echo $msg ?></p>
 <?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php _e('Go back') ?></a></p>
 <?php endif;
     ?>		</div>

From 803cbeadc1f562677bdc5da2a8bac0c1bc354966 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sat, 29 Aug 2015 13:54:34 +0200
Subject: [PATCH 247/353] Fix conflicts on admin/groups controller

---
 controller/admin/groups.php    | 16 ----------------
 include/classes/core.class.php |  2 +-
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index fdec86a0..dea27bee 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -67,11 +67,7 @@ public function delete($id)
             if ($this->request->post('del_group_comply') || $this->request->post('del_group')) {
                 $this->model->delete_group($id);
             } else {
-<<<<<<< HEAD
-                generate_admin_menu('groups');
-=======
                 \FeatherBB\AdminUtils::generateAdminMenu('groups');
->>>>>>> development
 
                 $this->feather->view2->setPageInfo(array(
                         'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
@@ -84,11 +80,7 @@ public function delete($id)
             }
         }
 
-<<<<<<< HEAD
-        generate_admin_menu('groups');
-=======
         \FeatherBB\AdminUtils::generateAdminMenu('groups');
->>>>>>> development
 
         $this->feather->view2->setPageInfo(array(
                 'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
@@ -113,11 +105,7 @@ public function addedit($id = '')
         // Add/edit a group (stage 1)
         elseif ($this->request->post('add_group') || isset($id)) {
 
-<<<<<<< HEAD
-            generate_admin_menu('groups');
-=======
             \FeatherBB\AdminUtils::generateAdminMenu('groups');
->>>>>>> development
 
             $group = $this->model->info_add_group($groups, $id);
 
@@ -132,11 +120,7 @@ public function addedit($id = '')
                     'id'    => $id,
                     'group_list'    => $this->model->get_group_list($groups, $group),
                 )
-<<<<<<< HEAD
-            )->addTemplate('admin/groups/delete_group.php')->display();
-=======
             )->addTemplate('admin/groups/add_edit_group.php')->display();
->>>>>>> development
         }
     }
 }
diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index 921ebdcb..79c413fc 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -249,7 +249,7 @@ public function call()
         $this->app->config = $this->forum_settings; // Legacy
         extract($this->forum_settings); // Legacy
 
-        // new \plugin\plugintest();
+        // Run hooks of activated plugins
         \FeatherBB\Plugin::runActivePlugins();
 
         // Define time formats

From 0de9e16090fde86de0c10aa04e7e611078ae48f1 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sat, 29 Aug 2015 14:05:35 +0200
Subject: [PATCH 248/353] Change util files case

---
 include/classes/{AdminUtils.class.php => adminutils.class.php} | 0
 include/classes/{Utils.class.php => utils.class.php}           | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename include/classes/{AdminUtils.class.php => adminutils.class.php} (100%)
 rename include/classes/{Utils.class.php => utils.class.php} (100%)

diff --git a/include/classes/AdminUtils.class.php b/include/classes/adminutils.class.php
similarity index 100%
rename from include/classes/AdminUtils.class.php
rename to include/classes/adminutils.class.php
diff --git a/include/classes/Utils.class.php b/include/classes/utils.class.php
similarity index 100%
rename from include/classes/Utils.class.php
rename to include/classes/utils.class.php

From d3a718f51a9d8771df71535a50ccd947a1e199bc Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 29 Aug 2015 14:20:05 +0200
Subject: [PATCH 249/353] Fix short tag

---
 style/FeatherBB/view/footer.new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/style/FeatherBB/view/footer.new.php b/style/FeatherBB/view/footer.new.php
index 7565a387..48d8e705 100644
--- a/style/FeatherBB/view/footer.new.php
+++ b/style/FeatherBB/view/footer.new.php
@@ -146,7 +146,7 @@
 			</div>
 		</div>
 	</div>
-<? } ?>
+<?php } ?>
 </section>
 </body>
 <!-- JS -->

From 7f31516d823703b5816875b169962e34a8bd86d6 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sat, 29 Aug 2015 15:47:08 +0200
Subject: [PATCH 250/353] Small fixes for new installations

---
 img/avatars/.gitkeep           | 0
 include/bbcd_compile.php       | 3 ++-
 include/classes/view.class.php | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 img/avatars/.gitkeep

diff --git a/img/avatars/.gitkeep b/img/avatars/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/include/bbcd_compile.php b/include/bbcd_compile.php
index b860102a..89f002c2 100644
--- a/include/bbcd_compile.php
+++ b/include/bbcd_compile.php
@@ -178,10 +178,11 @@
     $pd['config']['valid_imgs'] = false;
 }
 
+$feather = \Slim\Slim::getInstance();
 // Validate and compute replacement texts for smilies array.
 $re_keys = array();                                    // Array of regex-safe smiley texts.
 $file_path = FEATHER_ROOT . 'img/smilies/';                // File system path to smilies.
-$url_path = base(true);                        // Convert abs URL to relative URL.
+$url_path = $feather->url->base(true);                        // Convert abs URL to relative URL.
 $url_path = preg_replace('%^https?://[^/]++(.*)$%i', '$1', $url_path) . '/img/smilies/';
 foreach ($smilies as $smiley_text => $smiley_img) {    // Loop through all smilieys in array.
     $file = $file_path . $smiley_img['file'];        // Local file system address of smiley.
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 8f1c61c0..1a5507a1 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -354,7 +354,8 @@ public function __call($method, $args)
 
     protected function getDefaultPageInfo()
     {
-        if (!$this->app->cache->isCached('quickjump')) {
+        // Check if config file exists to avoid error when installing forum
+        if (!$this->app->cache->isCached('quickjump') && is_file($this->app->forum_env['FORUM_CONFIG_FILE'])) {
             $this->app->cache->store('quickjump', \model\cache::get_quickjump());
         }
 

From 448fe66cdc0c2c2a1752f31050c5c7268cd2bb38 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 16:22:04 +0200
Subject: [PATCH 251/353] Add custom FeatherBB\Error class

---
 controller/admin/bans.php       |  2 +-
 controller/admin/categories.php |  4 ++--
 controller/admin/groups.php     |  4 ++--
 controller/admin/index.php      |  4 ++--
 include/classes/error.class.php | 18 ++++++++++++++++++
 include/routes.php              |  3 ++-
 6 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 include/classes/error.class.php

diff --git a/controller/admin/bans.php b/controller/admin/bans.php
index b10c6e67..964ca2c9 100644
--- a/controller/admin/bans.php
+++ b/controller/admin/bans.php
@@ -22,7 +22,7 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/bans.mo');
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), '403');
         }
     }
 
diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index 5ad70ca7..da164cdb 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -44,7 +44,7 @@ public function add_category()
     public function edit_categories()
     {
         if (empty($this->request->post('cat'))) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), '400');
         }
 
         foreach ($this->request->post('cat') as $cat_id => $properties) {
@@ -68,7 +68,7 @@ public function delete_category()
         $cat_to_delete = (int) $this->request->post('cat_to_delete');
 
         if ($cat_to_delete < 1) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), '400');
         }
 
         if (intval($this->request->post('disclaimer')) != 1) {
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index dea27bee..2386b2a6 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -51,12 +51,12 @@ public function display()
     public function delete($id)
     {
         if ($id < 5) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 403);
         }
 
         // Make sure we don't remove the default group
         if ($id == $this->config['o_default_user_group']) {
-            message(__('Cannot remove default message'));
+            throw new \FeatherBB\Error(__('Cannot remove default message'), 403);
         }
 
         // Check if this group has any members
diff --git a/controller/admin/index.php b/controller/admin/index.php
index d4f46e6b..a8589548 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -51,11 +51,11 @@ public function display($action = null)
 
             $latest_version = trim(@file_get_contents('http://featherbb.org/latest_version'));
             if (empty($latest_version)) {
-                message(__('Upgrade check failed message'));
+                throw new \FeatherBB\Error(__('Upgrade check failed message'), 500);
             }
 
             if (version_compare($this->config['o_cur_version'], $latest_version, '>=')) {
-                message(__('Running latest version message'));
+                message(__('Running latest version message'), 200);
             } else {
                 message(sprintf(__('New version available message'), '<a href="http://featherbb.org/">FeatherBB.org</a>'));
             }
diff --git a/include/classes/error.class.php b/include/classes/error.class.php
new file mode 100644
index 00000000..68142588
--- /dev/null
+++ b/include/classes/error.class.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace FeatherBB;
+
+class Error extends \Exception
+{
+    public function __construct($message, $code = 0)
+    {
+        parent::__construct($message, $code, null);
+    }
+}
diff --git a/include/routes.php b/include/routes.php
index 88da30de..81cf2749 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -184,13 +184,14 @@
 
 // 404 not found
 $feather->notFound(function () use ($feather){
-    throw new \Exception('Page not found', 404);
+    throw new \FeatherBB\Error('Page not found', 404);
 });
 
 $feather->error(function (\Exception $e) use ($feather) {
     $feather->response->setStatus($e->getCode());
     $feather->view2->setPageInfo(array(
         'title' => array(feather_escape($feather->config['o_board_title']), __('Error')),
+        'msg_title' => __('Error');
         'msg'    =>   $e->getMessage(),
         'no_back_link'    => false,
         ))->addTemplate('message.php')->display();

From 79a2d39ae90cf58a2b8c3f9669c5f21236711f3e Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 16:22:36 +0200
Subject: [PATCH 252/353] Update view forum and rename message.php

---
 model/viewforum.php                             |  3 +--
 style/FeatherBB/view/{message.php => error.php} | 17 +++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename style/FeatherBB/view/{message.php => error.php} (52%)

diff --git a/model/viewforum.php b/model/viewforum.php
index d1f57e7e..126ee3dc 100644
--- a/model/viewforum.php
+++ b/model/viewforum.php
@@ -60,8 +60,7 @@ public function get_info_forum($id)
         $cur_forum = $cur_forum->find_one();
 
         if (!$cur_forum) {
-            //message(__('Bad request'), '404');
-            throw new \Exception(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), '404');
         }
 
         $cur_forum = $this->hook->fire('get_info_forum', $cur_forum);
diff --git a/style/FeatherBB/view/message.php b/style/FeatherBB/view/error.php
similarity index 52%
rename from style/FeatherBB/view/message.php
rename to style/FeatherBB/view/error.php
index e3d23d0e..d638a206 100644
--- a/style/FeatherBB/view/message.php
+++ b/style/FeatherBB/view/error.php
@@ -14,12 +14,13 @@
 
 ?>
 <div id="msg" class="block error">
-	<h2><span><?= __('Error') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<p><?php echo $msg ?></p>
-<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php _e('Go back') ?></a></p>
-<?php endif;
-    ?>		</div>
-	</div>
+    <h2><span><?= $msg_title ?></span></h2>
+    <div class="box">
+        <div class="inbox">
+            <p><?php echo $msg ?></p>
+            <?php if (!$no_back_link) {
+                echo "\t\t\t".'<p><a href="javascript: history.go(-1)">'.__('Go back').'</a></p>';
+            } ?>
+        </div>
+    </div>
 </div>

From 5d5ebc7a5a5aea2d3ac5f544946fc628a52f5478 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 16:23:40 +0200
Subject: [PATCH 253/353] Patch error handling

---
 include/routes.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/routes.php b/include/routes.php
index 81cf2749..657909cf 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -191,9 +191,9 @@
     $feather->response->setStatus($e->getCode());
     $feather->view2->setPageInfo(array(
         'title' => array(feather_escape($feather->config['o_board_title']), __('Error')),
-        'msg_title' => __('Error');
+        'msg_title' => __('Error'),
         'msg'    =>   $e->getMessage(),
         'no_back_link'    => false,
-        ))->addTemplate('message.php')->display();
+        ))->addTemplate('error.php')->display();
     $feather->stop();
 });

From 777e048cba33264f91e06942e029bcd9170e343a Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 16:31:48 +0200
Subject: [PATCH 254/353] Add addMessage helper in view

---
 include/classes/view.class.php      | 11 +++++++++--
 include/functions.php               |  3 +--
 style/FeatherBB/view/header.new.php |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 1a5507a1..b557f6ae 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -20,12 +20,10 @@ class View
     $validation = array(
         'page_number' => 'intval',
         'active_page' => 'strval',
-        //'focus_element' => 'strval',
         'is_indexed' => 'boolval',
         'admin_console' => 'boolval',
         'has_reports' => 'boolval',
         'paging_links' => 'strval',
-        //'required_fields' => 'strval',
         'has_reports' => 'boolval',
         'footer_style' => 'strval',
         'fid' => 'intval',
@@ -340,6 +338,15 @@ public function getTemplates()
         return $output;
     }
 
+    public function addMessage($msg, $type = 'info')
+    {
+        if (isset($this->environment['slim.flash'])) {
+            if (in_array($type, array('info', 'error'))) {
+                $this->environment['slim.flash']->set($type, (string) $msg);
+            }
+        }
+    }
+
     public function __call($method, $args)
     {
         $method = mb_substr(preg_replace_callback('/([A-Z])/', function ($c) {
diff --git a/include/functions.php b/include/functions.php
index 316e88d5..6c27ec5e 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -674,7 +674,7 @@ function redirect($destination_url, $message = null)
     $feather = \Slim\Slim::getInstance();
 
     // Add a flash message
-    $feather->flash('message', $message);
+    $feather->flash('info', $message);
 
     $feather->redirect($destination_url);
 }
@@ -832,4 +832,3 @@ function breadcrumbs_admin(array $links)
     }
     return implode(' » ', $tmp);
 }
-
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index 784fcf2f..8efb1869 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -220,7 +220,7 @@ function process_form(the_form)
         </script>
         <div class="flashmsg" id="flashmsg">
             <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
-            <p><?= feather_escape($flash['message']) ?></p>
+            <p><?= feather_escape($flash['info']) ?></p>
         </div>
         <?php endif; ?>
     </div>

From eef24523820854f64cc739083bd66bf3617fef03 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 16:59:13 +0200
Subject: [PATCH 255/353] Fix typos

---
 include/classes/view.class.php      | 4 ++--
 style/FeatherBB/view/header.new.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index b557f6ae..d63e8881 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -340,9 +340,9 @@ public function getTemplates()
 
     public function addMessage($msg, $type = 'info')
     {
-        if (isset($this->environment['slim.flash'])) {
+        if (isset($this->app->environment['slim.flash'])) {
             if (in_array($type, array('info', 'error'))) {
-                $this->environment['slim.flash']->set($type, (string) $msg);
+                $this->app->environment['slim.flash']->now($type, (string) $msg);
             }
         }
     }
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index 8efb1869..57687b3c 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -206,8 +206,8 @@ function process_form(the_form)
                 </div>
             </div>
         </div>
-        <?php endif; ?>
-        <?php if (isset($flash['message'])) : ?>
+    <?php endif; ?>
+        <?php if (isset($flash['info'])) : ?>
         <script type="text/javascript">
             window.onload = function() {
                 var flashMessage = document.getElementById('flashmsg');

From 3b397eceba541f1990c9f64f0afda871e38bfe7a Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 16:59:22 +0200
Subject: [PATCH 256/353] Update admin/index with new Exception

---
 controller/admin/index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/controller/admin/index.php b/controller/admin/index.php
index a8589548..aa9fbae7 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -46,7 +46,7 @@ public function display($action = null)
         // Check for upgrade
         if ($action == 'check_upgrade') {
             if (!ini_get('allow_url_fopen')) {
-                message(__('fopen disabled message'));
+                throw new \FeatherBB\Error(__('fopen disabled message'), 500);
             }
 
             $latest_version = trim(@file_get_contents('http://featherbb.org/latest_version'));
@@ -55,9 +55,9 @@ public function display($action = null)
             }
 
             if (version_compare($this->config['o_cur_version'], $latest_version, '>=')) {
-                message(__('Running latest version message'), 200);
+                redirect($this->feather->url->get('admin/'), __('Running latest version message'));
             } else {
-                message(sprintf(__('New version available message'), '<a href="http://featherbb.org/">FeatherBB.org</a>'));
+                redirect($this->feather->url->get('admin/'), sprintf(__('New version available message'), '<a href="http://featherbb.org/">FeatherBB.org</a>'));
             }
         }
         // Remove /install
@@ -67,7 +67,7 @@ public function display($action = null)
             if ($deleted) {
                 redirect($this->feather->url->get('admin/'), __('Deleted install.php redirect'));
             } else {
-                message(__('Delete install.php failed'));
+                throw new \FeatherBB\Error(__('Delete install.php failed'), 500);
             }
         }
 

From f0c87ea8cd2d25b02fb3f1c736285372671d8ef1 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 17:33:51 +0200
Subject: [PATCH 257/353] Start updating exceptions

---
 controller/admin/parser.php     | 20 ++++++++++----------
 controller/admin/plugins.php    | 14 +++++++-------
 controller/admin/statistics.php |  9 ++-------
 controller/admin/users.php      |  8 ++++----
 controller/delete.php           |  6 +++---
 controller/edit.php             |  6 +++---
 controller/help.php             |  2 +-
 controller/index.php            |  2 +-
 controller/misc.php             | 22 +++++++++++-----------
 controller/moderate.php         | 28 ++++++++++++++--------------
 include/routes.php              |  2 +-
 11 files changed, 57 insertions(+), 62 deletions(-)

diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index c7886c16..c9ab21f9 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -67,26 +67,26 @@ public function display()
                                     if (move_uploaded_file($f['tmp_name'], FEATHER_ROOT .'img/smilies/'. $name)) {
                                         redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['upload success']);
                                     } else { //  Error #1: 'Smiley upload failed. Unable to move to smiley folder.'.
-                                        message($lang_admin_parser['upload_err_1']);
+                                        throw new \FeatherBB\Error($lang_admin_parser['upload_err_1'], 500);
                                     }
                                 } else { // Error #2: 'Smiley upload failed. File is too big.'
-                                    message($lang_admin_parser['upload_err_2']);
+                                    throw new \FeatherBB\Error($lang_admin_parser['upload_err_2'], 400);
                                 }
                             } else { // Error #3: 'Smiley upload failed. File type is not an image.'.
-                                message($lang_admin_parser['upload_err_3']);
+                                throw new \FeatherBB\Error($lang_admin_parser['upload_err_3'], 400);
                             }
                         } else { // Error #4: 'Smiley upload failed. Bad filename.'
-                            message($lang_admin_parser['upload_err_4']);
+                            throw new \FeatherBB\Error($lang_admin_parser['upload_err_4'], 400);
                         }
                         break;
                     case 1: // case 1 similar to case 2 so fall through...
-                    case 2: message($lang_admin_parser['upload_err_2']);    // File exceeds MAX_FILE_SIZE.
-                    case 3: message($lang_admin_parser['upload_err_5']);    // File only partially uploaded.
+                    case 2: throw new \FeatherBB\Error($lang_admin_parser['upload_err_2'], 400);    // File exceeds MAX_FILE_SIZE.
+                    case 3: throw new \FeatherBB\Error($lang_admin_parser['upload_err_5'], 400);    // File only partially uploaded.
                     //		case 4: break; // No error. Normal response when this form element left empty
-                    case 4: message($lang_admin_parser['upload_err_6']);    // No filename.
-                    case 6: message($lang_admin_parser['upload_err_7']);    // No temp folder.
-                    case 7: message($lang_admin_parser['upload_err_8']);    // Cannot write to disk.
-                    default: message($lang_admin_parser['upload_err_9']);        // Generic/unknown error
+                    case 4: throw new \FeatherBB\Error($lang_admin_parser['upload_err_6'], 400);    // No filename.
+                    case 6: throw new \FeatherBB\Error($lang_admin_parser['upload_err_7'], 500);    // No temp folder.
+                    case 7: throw new \FeatherBB\Error($lang_admin_parser['upload_err_8'], 500);    // Cannot write to disk.
+                    default: throw new \FeatherBB\Error($lang_admin_parser['upload_err_9'], 500);        // Generic/unknown error
                 }
             }
 
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index 237a1410..a53e71a8 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -55,12 +55,12 @@ public function activate()
         // The plugin to load should be supplied via GET
         $class = $this->request->get('plugin') ? $this->request->get('plugin') : null;
         if (!$class) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         // Check if plugin follows PSR-4 conventions and extends base forum plugin
         if (!class_exists($class) || !property_exists($class, 'isValidFBPlugin')) {
-            message(sprintf(__('No plugin message'), feather_escape($class)));
+            throw new \FeatherBB\Error(sprintf(__('No plugin message'), feather_escape($class)), 400);
         }
 
         $plugin = new $class;
@@ -78,7 +78,7 @@ public function deactivate()
         // The plugin to load should be supplied via GET
         $class = $this->request->get('plugin') ? $this->request->get('plugin') : null;
         if (!$class) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         $plugin = new $class;
@@ -96,18 +96,18 @@ public function display()
         // The plugin to load should be supplied via GET
         $plugin = $this->request->get('plugin') ? $this->request->get('plugin') : '';
         if (!preg_match('%^AM?P_(\w*?)\.php$%i', $plugin)) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         // AP_ == Admins only, AMP_ == admins and moderators
         $prefix = substr($plugin, 0, strpos($plugin, '_'));
         if ($this->user->g_moderator == '1' && $prefix == 'AP') {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         // Make sure the file actually exists
         if (!file_exists(FEATHER_ROOT.'plugins/'.$plugin)) {
-            message(sprintf(__('No plugin message'), feather_escape($plugin)));
+            throw new \FeatherBB\Error(sprintf(__('No plugin message'), feather_escape($plugin)), 400);
         }
 
         // Construct REQUEST_URI if it isn't set TODO?
@@ -120,7 +120,7 @@ public function display()
         // get the "blank page of death"
         include FEATHER_ROOT.'plugins/'.$plugin;
         if (!defined('FEATHER_PLUGIN_LOADED')) {
-            message(sprintf(__('Plugin failed message'), feather_escape($plugin)));
+            throw new \FeatherBB\Error(sprintf(__('Plugin failed message'), feather_escape($plugin)));
         }
 
         $this->feather->view2->setPageInfo(array(
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index bcaf9b46..a69261d2 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -22,15 +22,10 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/index.mo');
     }
 
-    public function __autoload($class_name)
-    {
-        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
-    }
-
     public function display()
     {
         if (!$this->user->is_admmod) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         \FeatherBB\AdminUtils::generateAdminMenu('index');
@@ -56,7 +51,7 @@ public function phpinfo()
         // Show phpinfo() output
         // Is phpinfo() a disabled function?
         if (strpos(strtolower((string) ini_get('disable_functions')), 'phpinfo') !== false) {
-            message(__('PHPinfo disabled message'));
+            throw new \FeatherBB\Error(__('PHPinfo disabled message'), 404);
         }
 
         phpinfo();
diff --git a/controller/admin/users.php b/controller/admin/users.php
index b4903b1a..337e7760 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -32,7 +32,7 @@ public function display()
         // Move multiple users to other user groups
         if ($this->request->post('move_users') || $this->request->post('move_users_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message(__('No permission'), '403');
+                throw new \FeatherBB\Error(__('No permission'), 403);
             }
 
             \FeatherBB\AdminUtils::generateAdminMenu('users');
@@ -50,7 +50,7 @@ public function display()
         // Delete multiple users
         if ($this->request->post('delete_users') || $this->request->post('delete_users_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message(__('No permission'), '403');
+                throw new \FeatherBB\Error(__('No permission'), 403);
             }
 
             \FeatherBB\AdminUtils::generateAdminMenu('users');
@@ -68,7 +68,7 @@ public function display()
         // Ban multiple users
         if ($this->request->post('ban_users') || $this->request->post('ban_users_comply')) {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-                message(__('No permission'), '403');
+                throw new \FeatherBB\Error(__('No permission'), 403);
             }
 
             \FeatherBB\AdminUtils::generateAdminMenu('users');
@@ -164,7 +164,7 @@ public function ipstats($id)
     public function showusers($ip)
     {
         if (!@preg_match('%^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$%', $ip) && !@preg_match('%^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$%', $ip)) {
-            message(__('Bad IP message'));
+            throw new \FeatherBB\Error(__('Bad IP message'), 400);
         }
 
         // Fetch user count
diff --git a/controller/delete.php b/controller/delete.php
index a1eb2a45..e808fb08 100644
--- a/controller/delete.php
+++ b/controller/delete.php
@@ -24,7 +24,7 @@ public function deletepost($id)
         global $pd;
 
         if ($this->feather->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            throw new \FeatherBB\Error(__('No view'), 403);
         }
 
         // Fetch some informations about the post, the topic and the forum
@@ -46,11 +46,11 @@ public function deletepost($id)
                 $cur_post['poster_id'] != $this->feather->user->id ||
                 $cur_post['closed'] == '1') &&
                 !$is_admmod) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         if ($is_admmod && $this->feather->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         if ($this->feather->request()->isPost()) {
diff --git a/controller/edit.php b/controller/edit.php
index 1787e8ed..d916c6b3 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -33,7 +33,7 @@ public function __autoload($class_name)
     public function editpost($id)
     {
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            throw new \FeatherBB\Error(__('No view'), 403);
         }
 
         // Fetch some informations about the post, the topic and the forum
@@ -52,11 +52,11 @@ public function editpost($id)
 
         // Do we have permission to edit this post?
         if (($this->user->g_edit_posts == '0' || $cur_post['poster_id'] != $this->user->id || $cur_post['closed'] == '1') && !$is_admmod) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         // Start with a clean slate
diff --git a/controller/help.php b/controller/help.php
index 45dff1bb..41aea09f 100644
--- a/controller/help.php
+++ b/controller/help.php
@@ -29,7 +29,7 @@ public function __autoload($class_name)
     public function display()
     {
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            throw new \FeatherBB\Error(__('No view'), 403);
         }
 
         $this->feather->view2->setPageInfo(array(
diff --git a/controller/index.php b/controller/index.php
index df1c4c8d..3922a57c 100644
--- a/controller/index.php
+++ b/controller/index.php
@@ -21,7 +21,7 @@ public function __construct()
     public function display()
     {
         if ($this->feather->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            throw new \FeatherBB\Error(__('No view'), 403);
         }
 
         $this->feather->view2->setPageInfo(array(
diff --git a/controller/misc.php b/controller/misc.php
index f576043f..bcb3147f 100644
--- a/controller/misc.php
+++ b/controller/misc.php
@@ -22,7 +22,7 @@ public function __construct()
     public function rules()
     {
         if ($this->feather->forum_settings['o_rules'] == '0' || ($this->feather->user->is_guest && $this->feather->user->g_read_board == '0' && $this->feather->forum_settings['o_regs_allow'] == '0')) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         $this->feather->view2->setPageInfo(array(
@@ -34,7 +34,7 @@ public function rules()
     public function markread()
     {
         if ($this->feather->user->is_guest) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         $this->model->update_last_visit();
@@ -48,7 +48,7 @@ public function markread()
     public function markforumread($id)
     {
         if ($this->feather->user->is_guest) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         $tracked_topics = get_tracked_topics();
@@ -61,7 +61,7 @@ public function markforumread($id)
     public function subscribeforum($id)
     {
         if ($this->feather->user->is_guest) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         $this->model->subscribe_forum($id);
@@ -70,7 +70,7 @@ public function subscribeforum($id)
     public function subscribetopic($id)
     {
         if ($this->feather->user->is_guest) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         $this->model->subscribe_topic($id);
@@ -79,7 +79,7 @@ public function subscribetopic($id)
     public function unsubscribeforum($id)
     {
         if ($this->feather->user->is_guest) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         $this->model->unsubscribe_forum($id);
@@ -88,7 +88,7 @@ public function unsubscribeforum($id)
     public function unsubscribetopic($id)
     {
         if ($this->feather->user->is_guest) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         $this->model->unsubscribe_topic($id);
@@ -97,17 +97,17 @@ public function unsubscribetopic($id)
     public function email($id)
     {
         if ($this->feather->user->is_guest || $this->feather->user->g_send_email == '0') {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         if ($id < 2) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         $mail = $this->model->get_info_mail($id);
 
         if ($mail['email_setting'] == 2 && !$this->feather->user->is_admmod) {
-            message(__('Form email disabled'));
+            throw new \FeatherBB\Error(__('Form email disabled'), 403);
         }
 
 
@@ -128,7 +128,7 @@ public function email($id)
     public function report($id)
     {
         if ($this->feather->user->is_guest) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         if ($this->feather->request()->isPost()) {
diff --git a/controller/moderate.php b/controller/moderate.php
index 7d5d03e2..b1915bab 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -33,7 +33,7 @@ public function __autoload($class_name)
     public function gethostpost($pid)
     {
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            throw new \FeatherBB\Error(__('No view'), 403);
         }
 
         $this->model->display_ip_address_post($pid);
@@ -42,7 +42,7 @@ public function gethostpost($pid)
     public function gethostip($ip)
     {
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            throw new \FeatherBB\Error(__('No view'), 403);
         }
 
         $this->model->display_ip_info($ip);
@@ -51,7 +51,7 @@ public function gethostip($ip)
     public function moderatetopic($id = null, $fid = null, $action = null, $param = null)
     {
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            throw new \FeatherBB\Error(__('No view'), 403);
         }
 
         if ($action == 'get_host') {
@@ -63,7 +63,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         // Move one topic
@@ -74,7 +74,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                message(__('No topics selected'));
+                throw new \FeatherBB\Error(__('No topics selected'), 400);
             }
 
             $topics = implode(',', array_map('intval', array_keys($topics)));
@@ -213,7 +213,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
     public function display($id, $name = null, $page = null)
     {
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            throw new \FeatherBB\Error(__('No view'), 403);
         }
 
         // Make sure that only admmods allowed access this page
@@ -221,7 +221,7 @@ public function display($id, $name = null, $page = null)
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         // Fetch some info about the forum
@@ -229,7 +229,7 @@ public function display($id, $name = null, $page = null)
 
         // Is this a redirect forum? In that case, abort!
         if ($cur_forum['redirect_url'] != '') {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), '404');
         }
 
         $sort_by = $this->model->forum_sort_by($cur_forum['sort_by']);
@@ -259,7 +259,7 @@ public function display($id, $name = null, $page = null)
     public function dealposts($fid)
     {
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            throw new \FeatherBB\Error(__('No view'), 403);
         }
 
         // Make sure that only admmods allowed access this page
@@ -267,7 +267,7 @@ public function dealposts($fid)
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         // Move one or more topics
@@ -278,7 +278,7 @@ public function dealposts($fid)
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                message(__('No topics selected'));
+                throw new \FeatherBB\Error(__('No topics selected'), 400);
             }
 
             // Check if there are enough forums to move the topic
@@ -303,7 +303,7 @@ public function dealposts($fid)
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (count($topics) < 2) {
-                message(__('Not enough topics selected'));
+                throw new \FeatherBB\Error(__('Not enough topics selected'), 400);
             }
 
             $this->feather->view2->setPageInfo(array(
@@ -319,7 +319,7 @@ public function dealposts($fid)
         elseif ($this->request->post('delete_topics') || $this->request->post('delete_topics_comply')) {
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                message(__('No topics selected'));
+                throw new \FeatherBB\Error(__('No topics selected'), 400);
             }
 
             if ($this->request->post('delete_topics_comply')) {
@@ -344,7 +344,7 @@ public function dealposts($fid)
             if ($this->request->post('open') || $this->request->post('close')) {
                 $topics = $this->request->post('topics') ? @array_map('intval', @array_keys($this->request->post('topics'))) : array();
                 if (empty($topics)) {
-                    message(__('No topics selected'));
+                    throw new \FeatherBB\Error(__('No topics selected'), 400);
                 }
 
                 $this->model->close_multiple_topics($action, $topics, $fid);
diff --git a/include/routes.php b/include/routes.php
index 657909cf..cc841098 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -81,7 +81,7 @@
  */
 $isAdmmod = function() use ($feather) {
     if(!$feather->user->is_admmod) {
-        redirect(base(), __('No permission'));
+        redirect($feather->url->base(), __('No permission'));
     }
 };
 

From 79c4d141628bab01ad02f5971e9d96846848219b Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 29 Aug 2015 17:53:34 +0200
Subject: [PATCH 258/353] Fixe base function

---
 extern.php                      | 6 +++---
 include/classes/email.class.php | 2 +-
 include/routes.php              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extern.php b/extern.php
index ee7ba6ef..78bf3732 100644
--- a/extern.php
+++ b/extern.php
@@ -664,13 +664,13 @@ function output_html($feed)
         }
 
         // Prepend the current base URL onto some links. Done after caching to handle http/https correctly
-        $feed['link'] = base(true).$feed['link'];
+        $feed['link'] = $feather->url->base(true).$feed['link'];
 
         foreach ($feed['items'] as $key => $item) {
-            $feed['items'][$key]['link'] = base(true).$item['link'];
+            $feed['items'][$key]['link'] = $feather->url->base(true).$item['link'];
 
             if (isset($item['author']['uri'])) {
-                $feed['items'][$key]['author']['uri'] = base(true).$item['author']['uri'];
+                $feed['items'][$key]['author']['uri'] = $feather->url->base(true).$item['author']['uri'];
             }
         }
 
diff --git a/include/classes/email.class.php b/include/classes/email.class.php
index 0727326a..e960ba55 100644
--- a/include/classes/email.class.php
+++ b/include/classes/email.class.php
@@ -121,7 +121,7 @@ public function bbcode2email($text, $wrap_length = 72)
         static $base_url;
 
         if (!isset($base_url)) {
-            $base_url = base();
+            $base_url = $this->feather->url->base();
         }
 
         $text = feather_trim($text, "\t\n ");
diff --git a/include/routes.php b/include/routes.php
index cc841098..dc0cec94 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -103,7 +103,7 @@
      */
     $isAdmin = function() use ($feather) {
         if($feather->user->g_id != FEATHER_ADMIN) {
-            redirect(base(), __('No permission'));
+            redirect($feather->url->base(), __('No permission'));
         }
     };
 

From 8235bcb802c05f49a0183608b7ccb735573a48b4 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 18:10:11 +0200
Subject: [PATCH 259/353] Update more controllers with new error exception

---
 controller/post.php             | 10 +++++-----
 controller/profile.php          | 30 +++++++++++++++---------------
 controller/register.php         |  4 ++--
 controller/userlist.php         |  4 ++--
 include/classes/error.class.php |  2 +-
 model/edit.php                  | 10 +++++-----
 model/login.php                 |  8 ++++----
 7 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/controller/post.php b/controller/post.php
index 9a27fdd4..2e4c2f95 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -35,7 +35,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // If $_POST['username'] is filled, we are facing a bot
         if ($this->feather->request->post('username')) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         // Fetch some info about the topic and/or the forum
@@ -45,7 +45,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // Is someone trying to post into a redirect forum?
         if ($cur_posting['redirect_url'] != '') {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
@@ -57,7 +57,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
                 ($fid && (($cur_posting['post_topics'] == '' && $this->feather->user->g_post_topics == '0') || $cur_posting['post_topics'] == '0')) ||
                 (isset($cur_posting['closed']) && $cur_posting['closed'] == '1')) &&
                 !$is_admmod) {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         // Start with a clean slate
@@ -133,7 +133,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
                 // If a quote ID was specified in the url
                 if (isset($qid)) {
-                    $quote = $this->model->get_quote_message($qid, $tid);
+                    $quote = $this->model->get_quote_throw new \FeatherBB\Error($qid, $tid);
                     $form = '<form id="post" method="post" action="'.$this->feather->url->get('post/reply/'.$tid.'/quote/'.$qid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
                 }
         }
@@ -142,7 +142,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
             $action = __('Post new topic');
             $form = '<form id="post" method="post" action="'.$this->feather->url->get('post/new-topic/'.$fid.'/').'" onsubmit="return process_form(this)">';
         } else {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         $url_forum = $this->feather->url->url_friendly($cur_posting['forum_name']);
diff --git a/controller/profile.php b/controller/profile.php
index c0baa91a..5b270bf4 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -40,25 +40,25 @@ public function display($id, $section = null)
 
         if ($this->request->post('update_group_membership')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message(__('No permission'), '403');
+                throw new \FeatherBB\Error(__('No permission'), 403);
             }
 
             $this->model->update_group_membership($id, $this->feather);
         } elseif ($this->request->post('update_forums')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message(__('No permission'), '403');
+                throw new \FeatherBB\Error(__('No permission'), 403);
             }
 
             $this->model->update_mod_forums($id, $this->feather);
         } elseif ($this->request->post('ban')) {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-                message(__('No permission'), '403');
+                throw new \FeatherBB\Error(__('No permission'), 403);
             }
 
             $this->model->ban_user($id);
         } elseif ($this->request->post('delete_user') || $this->request->post('delete_user_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                message(__('No permission'), '403');
+                throw new \FeatherBB\Error(__('No permission'), 403);
             }
 
             $this->model->delete_user($id, $this->feather);
@@ -84,7 +84,7 @@ public function display($id, $section = null)
                                     ($this->user->g_mod_edit_users == '0' ||                         // mods aren't allowed to edit users
                                     $info['group_id'] == FEATHER_ADMIN ||                            // or the user is an admin
                                     $info['is_moderator'])))) {                                      // or the user is another mod
-                                    message(__('No permission'), '403');
+                                    throw new \FeatherBB\Error(__('No permission'), 403);
             }
 
             $this->model->update_profile($id, $info, $section, $this->feather);
@@ -163,7 +163,7 @@ public function display($id, $section = null)
 
             } elseif ($section == 'personality') {
                 if ($this->config['o_avatars'] == '0' && $this->config['o_signatures'] == '0') {
-                    message(__('Bad request'), '404');
+                    throw new \FeatherBB\Error(__('Bad request'), 404);
                 }
 
                 $avatar_field = '<span><a href="'.$this->feather->url->get('user/'.$id.'/action/upload_avatar/').'">'.__('Change avatar').'</a></span>';
@@ -221,7 +221,7 @@ public function display($id, $section = null)
             } elseif ($section == 'admin') {
 
                 if (!$this->user->is_admmod || ($this->user->g_moderator == '1' && $this->user->g_mod_ban_users == '0')) {
-                    message(__('Bad request'), false, '403 Forbidden');
+                    throw new \FeatherBB\Error(__('Bad request'), 404);
                 }
 
                 $this->feather->view2->setPageInfo(array(
@@ -236,7 +236,7 @@ public function display($id, $section = null)
 
                 $this->feather->view2->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_admin.php')->display();
             } else {
-                message(__('Bad request'), '404');
+                throw new \FeatherBB\Error(__('Bad request'), 404);
             }
         }
     }
@@ -250,9 +250,9 @@ public function action($id, $action)
 
         if ($action != 'change_pass' || !$this->request->get('key')) {
             if ($this->user->g_read_board == '0') {
-                message(__('No view'), '403');
+                throw new \FeatherBB\Error(__('No view'), 403);
             } elseif ($this->user->g_view_users == '0' && ($this->user->is_guest || $this->user->id != $id)) {
-                message(__('No permission'), '403');
+                throw new \FeatherBB\Error(__('No permission'), 403);
             }
         }
 
@@ -284,11 +284,11 @@ public function action($id, $action)
 
         } elseif ($action == 'upload_avatar' || $action == 'upload_avatar2') {
             if ($this->config['o_avatars'] == '0') {
-                message(__('Avatars disabled'));
+                throw new \FeatherBB\Error(__('Avatars disabled'), 400);
             }
 
             if ($this->user->id != $id && !$this->user->is_admmod) {
-                message(__('No permission'), '403');
+                throw new \FeatherBB\Error(__('No permission'), 403);
             }
 
             if ($this->feather->request()->isPost()) {
@@ -307,7 +307,7 @@ public function action($id, $action)
 
         } elseif ($action == 'delete_avatar') {
             if ($this->user->id != $id && !$this->user->is_admmod) {
-                message(__('No permission'), '403');
+                throw new \FeatherBB\Error(__('No permission'), 403);
             }
 
             $this->model->delete_avatar($id);
@@ -315,12 +315,12 @@ public function action($id, $action)
             redirect($this->feather->url->get('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
         } elseif ($action == 'promote') {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_promote_users == '0')) {
-                message(__('No permission'), '403');
+                throw new \FeatherBB\Error(__('No permission'), 403);
             }
 
             $this->model->promote_user($id, $this->feather);
         } else {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
     }
 }
diff --git a/controller/register.php b/controller/register.php
index 98249519..8e297035 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -45,7 +45,7 @@ public function display()
         // Display an error message if new registrations are disabled
         // If $_REQUEST['username'] or $_REQUEST['password'] are filled, we are facing a bot
         if ($this->config['o_regs_allow'] == '0' || $this->request->post('username') || $this->request->post('password')) {
-            message(__('No new regs'));
+            throw new \FeatherBB\Error(__('No new regs'), 403);
         }
 
         $user['timezone'] = isset($user['timezone']) ? $user['timezone'] : $this->config['o_default_timezone'];
@@ -94,7 +94,7 @@ public function rules()
 
         // Display an error message if new registrations are disabled
         if ($this->config['o_regs_allow'] == '0') {
-            message(__('No new regs'));
+            throw new \FeatherBB\Error(__('No new regs'), 403);
         }
 
         if ($this->config['o_rules'] != '1') {
diff --git a/controller/userlist.php b/controller/userlist.php
index fed9c086..f8147c01 100644
--- a/controller/userlist.php
+++ b/controller/userlist.php
@@ -22,9 +22,9 @@ public function __construct()
     public function display()
     {
         if ($this->feather->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            throw new \FeatherBB\Error(__('No view'), 403);
         } elseif ($this->feather->user->g_view_users == '0') {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         // Determine if we are allowed to view post counts
diff --git a/include/classes/error.class.php b/include/classes/error.class.php
index 68142588..4616f8b5 100644
--- a/include/classes/error.class.php
+++ b/include/classes/error.class.php
@@ -11,7 +11,7 @@
 
 class Error extends \Exception
 {
-    public function __construct($message, $code = 0)
+    public function __construct($message, $code = 200)
     {
         parent::__construct($message, $code, null);
     }
diff --git a/model/edit.php b/model/edit.php
index 0620aa77..266badfc 100644
--- a/model/edit.php
+++ b/model/edit.php
@@ -50,7 +50,7 @@ public function get_info_edit($id)
         $cur_post = $cur_post->find_one();
 
         if (!$cur_post) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         return $cur_post;
@@ -162,12 +162,12 @@ public function edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod)
                 array('id' => $cur_post['tid']),
                 array('moved_to' => $cur_post['tid'])
             );
-            
+
             $query['update_topic'] = array(
                 'subject' => $post['subject'],
                 'sticky'  => $post['stick_topic']
             );
-            
+
             $query = DB::for_table('topics')->where_any_is($where_topic)
                                             ->find_one()
                                             ->set($query['update_topic']);
@@ -181,14 +181,14 @@ public function edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod)
         } else {
             $this->search->update_search_index('edit', $id, $post['message']);
         }
-        
+
         // Update the post
         unset($query);
         $query['update_post'] = array(
             'message' => $post['message'],
             'hide_smilies'  => $post['hide_smilies']
         );
-        
+
         if (!$this->request->post('silent') || !$is_admmod) {
             $query['update_post']['edited'] = time();
             $query['update_post']['edited_by'] = $this->user->username;
diff --git a/model/login.php b/model/login.php
index 91ce85a6..931330a2 100644
--- a/model/login.php
+++ b/model/login.php
@@ -49,7 +49,7 @@ public function login()
         $authorized = $this->hook->fire('authorized_login', $authorized);
 
         if (!$authorized) {
-            message(__('Wrong user/pass').' <a href="'.$this->feather->url->get('login/action/forget/').'">'.__('Forgotten pass').'</a>');
+            throw new \FeatherBB\Error(__('Wrong user/pass').' <a href="'.$this->feather->url->get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
         }
 
         // Update the status if this is the first time the user logged in
@@ -164,7 +164,7 @@ public function password_forgotten()
                     // Loop through users we found
                     foreach($result as $cur_hit) {
                         if ($cur_hit->last_email_sent != '' && (time() - $cur_hit->last_email_sent) < 3600 && (time() - $cur_hit->last_email_sent) >= 0) {
-                            message(sprintf(__('Email flood'), intval((3600 - (time() - $cur_hit->last_email_sent)) / 60)), true);
+                            throw new \FeatherBB\Error(sprintf(__('Email flood'), intval((3600 - (time() - $cur_hit->last_email_sent)) / 60)), 429);
                         }
 
                         // Generate a new password and a new password activation code
@@ -193,7 +193,7 @@ public function password_forgotten()
                         $this->email->feather_mail($email, $mail_subject, $cur_mail_message);
                     }
 
-                    message(__('Forget mail').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
+                    throw new \FeatherBB\Error(__('Forget mail').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', 400);
                 } else {
                     $errors[] = __('No email match').' '.htmlspecialchars($email).'.';
                 }
@@ -223,4 +223,4 @@ public function get_redirect_url()
 
         return $redirect_url;
     }
-}
\ No newline at end of file
+}

From 76cc0bc1048b2d30cf8fb00ac827a46a22e5aa0d Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 18:19:48 +0200
Subject: [PATCH 260/353] Update more controllers to use new exception

---
 controller/viewforum.php        |  4 +--
 controller/viewtopic.php        |  2 +-
 include/classes/auth.class.php  |  2 +-
 include/classes/email.class.php | 10 +++----
 model/misc.php                  | 52 ++++++++++++++++-----------------
 5 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/controller/viewforum.php b/controller/viewforum.php
index 694c4712..4e65517c 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -26,11 +26,11 @@ public function __autoload($class_name)
     public function display($id, $name = null, $page = null)
     {
         if ($this->feather->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            throw new \FeatherBB\Error(__('No view'), 403);
         }
 
         if ($id < 1) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         // Fetch some informations about the forum
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index 17fb2608..b6745ec9 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -25,7 +25,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         global $pd;
 
         if ($this->feather->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            throw new \FeatherBB\Error(__('No view'), 403);
         }
 
         // Antispam feature
diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index 4932c96b..9da319fe 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -177,7 +177,7 @@ public function check_bans()
                 \DB::for_table('online')
                     ->where('ident', $this->app->user->username)
                     ->delete_many();
-                message(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.feather_escape($this->app->forum_settings['o_admin_email']).'">'.feather_escape($this->app->forum_settings['o_admin_email']).'</a>.', true, true, true);
+                throw new \FeatherBB\Error(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.feather_escape($this->app->forum_settings['o_admin_email']).'">'.feather_escape($this->app->forum_settings['o_admin_email']).'</a>.', 403);
             }
         }
 
diff --git a/include/classes/email.class.php b/include/classes/email.class.php
index e960ba55..7061ecec 100644
--- a/include/classes/email.class.php
+++ b/include/classes/email.class.php
@@ -17,7 +17,7 @@ public function __construct()
         $this->config = $this->feather->config;
         require FEATHER_ROOT . 'include/utf8/utils/ascii.php';
     }
-    
+
     //
     // Validate an email address
     //
@@ -308,12 +308,12 @@ public function server_parse($socket, $expected_response)
         $server_response = '';
         while (substr($server_response, 3, 1) != ' ') {
             if (!($server_response = fgets($socket, 256))) {
-                message('Couldn\'t get mail server response codes. Please contact the forum administrator.', __FILE__, __LINE__);
+                throw new \FeatherBB\Error('Couldn\'t get mail server response codes. Please contact the forum administrator.', 500);
             }
         }
 
         if (!(substr($server_response, 0, 3) == $expected_response)) {
-            message('Unable to send email. Please contact the forum administrator with the following error message reported by the SMTP server: "' . $server_response . '"', __FILE__, __LINE__);
+            throw new \FeatherBB\Error('Unable to send email. Please contact the forum administrator with the following error message reported by the SMTP server: "' . $server_response . '"', 500);
         }
     }
 
@@ -345,7 +345,7 @@ public function smtp_mail($to, $subject, $message, $headers = '')
         }
 
         if (!($socket = fsockopen($smtp_host, $smtp_port, $errno, $errstr, 15))) {
-            message('Could not connect to smtp host "' . $this->config['o_smtp_host'] . '" (' . $errno . ') (' . $errstr . ')', __FILE__, __LINE__);
+            throw new \FeatherBB\Error('Could not connect to smtp host "' . $this->config['o_smtp_host'] . '" (' . $errno . ') (' . $errstr . ')', 500);
         }
 
         $this->server_parse($socket, '220');
@@ -401,4 +401,4 @@ public function smtp_mail($to, $subject, $message, $headers = '')
 
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/model/misc.php b/model/misc.php
index 74930372..7c4035a3 100644
--- a/model/misc.php
+++ b/model/misc.php
@@ -23,7 +23,7 @@ public function __construct()
         $this->hook = $this->feather->hooks;
         $this->email = $this->feather->email;
     }
- 
+
     public function update_last_visit()
     {
         $this->hook->fire('update_last_visit_start');
@@ -40,17 +40,17 @@ public function get_info_mail($recipient_id)
         $recipient_id = $this->hook->fire('get_info_mail_start', $recipient_id);
 
         $mail['select'] = array('username', 'email', 'email_setting');
-        
+
         $mail = DB::for_table('users')
                 ->select_many($mail['select'])
                 ->where('id', $recipient_id);
         $mail = $this->hook->fireDB('get_info_mail_query', $mail);
         $mail = $mail->find_one();
-        
+
         if (!$mail) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
-        
+
         $mail['recipient'] = $mail['username'];
         $mail['recipient_email'] = $mail['email'];
 
@@ -68,17 +68,17 @@ public function send_email($mail)
         $message = feather_trim($this->request->post('req_message'));
 
         if ($subject == '') {
-            message(__('No email subject'));
+            throw new \FeatherBB\Error(__('No email subject'), 400);
         } elseif ($message == '') {
-            message(__('No email message'));
+            throw new \FeatherBB\Error(__('No email message'), 400);
         }
         // Here we use strlen() not feather_strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         elseif (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            message(__('Too long email message'));
+            throw new \FeatherBB\Error(__('Too long email message'), 400);
         }
 
         if ($this->user->last_email_sent != '' && (time() - $this->user->last_email_sent) < $this->user->g_email_flood && (time() - $this->user->last_email_sent) >= 0) {
-            message(sprintf(__('Email flood'), $this->user->g_email_flood, $this->user->g_email_flood - (time() - $this->user->last_email_sent)));
+            throw new \FeatherBB\Error(sprintf(__('Email flood'), $this->user->g_email_flood, $this->user->g_email_flood - (time() - $this->user->last_email_sent)), 429);
         }
 
         // Load the "form email" template
@@ -140,13 +140,13 @@ public function insert_report($post_id)
         // Clean up reason from POST
         $reason = feather_linebreaks(feather_trim($this->request->post('req_reason')));
         if ($reason == '') {
-            message(__('No reason'));
+            throw new \FeatherBB\Error(__('No reason'), 400);
         } elseif (strlen($reason) > 65535) { // TEXT field can only hold 65535 bytes
-            message(__('Reason too long'));
+            throw new \FeatherBB\Error(__('Reason too long'), 400);
         }
 
         if ($this->user->last_report_sent != '' && (time() - $this->user->last_report_sent) < $this->user->g_report_flood && (time() - $this->user->last_report_sent) >= 0) {
-            message(sprintf(__('Report flood'), $this->user->g_report_flood, $this->user->g_report_flood - (time() - $this->user->last_report_sent)));
+            throw new \FeatherBB\Error(sprintf(__('Report flood'), $this->user->g_report_flood, $this->user->g_report_flood - (time() - $this->user->last_report_sent)), 429);
         }
 
         // Get the topic ID
@@ -156,7 +156,7 @@ public function insert_report($post_id)
         $topic = $topic->find_one();
 
         if (!$topic) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         // Get the subject and forum ID
@@ -167,12 +167,12 @@ public function insert_report($post_id)
         $report = $report->find_one();
 
         if (!$report) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         // Should we use the internal report handling?
         if ($this->config['o_report_method'] == '0' || $this->config['o_report_method'] == '2') {
-            
+
             // Insert the report
             $query['insert'] = array(
                 'post_id' => $post_id,
@@ -247,7 +247,7 @@ public function get_info_report($post_id)
         $cur_post = $cur_post->find_one();
 
         if (!$cur_post) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         $cur_post = $this->hook->fire('get_info_report', $cur_post);
@@ -260,7 +260,7 @@ public function subscribe_topic($topic_id)
         $topic_id = $this->hook->fire('subscribe_topic_start', $topic_id);
 
         if ($this->config['o_topic_subscriptions'] != '1') {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         // Make sure the user can view the topic
@@ -280,7 +280,7 @@ public function subscribe_topic($topic_id)
         $authorized = $authorized->find_one();
 
         if (!$authorized) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         $is_subscribed = DB::for_table('topic_subscriptions')
@@ -290,7 +290,7 @@ public function subscribe_topic($topic_id)
         $is_subscribed = $is_subscribed->find_one();
 
         if ($is_subscribed) {
-            message(__('Already subscribed topic'));
+            throw new \FeatherBB\Error(__('Already subscribed topic'), 400);
         }
 
         $subscription['insert'] = array(
@@ -313,7 +313,7 @@ public function unsubscribe_topic($topic_id)
         $topic_id = $this->hook->fire('unsubscribe_topic_start', $topic_id);
 
         if ($this->config['o_topic_subscriptions'] != '1') {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         $is_subscribed = DB::for_table('topic_subscriptions')
@@ -323,7 +323,7 @@ public function unsubscribe_topic($topic_id)
         $is_subscribed = $is_subscribed->find_one();
 
         if (!$is_subscribed) {
-            message(__('Not subscribed topic'));
+            throw new \FeatherBB\Error(__('Not subscribed topic'), 400);
         }
 
         // Delete the subscription
@@ -341,7 +341,7 @@ public function unsubscribe_forum($forum_id)
         $forum_id = $this->hook->fire('unsubscribe_forum_start', $forum_id);
 
         if ($this->config['o_forum_subscriptions'] != '1') {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         $is_subscribed = DB::for_table('forum_subscriptions')
@@ -351,7 +351,7 @@ public function unsubscribe_forum($forum_id)
         $is_subscribed = $is_subscribed->find_one();
 
         if (!$is_subscribed) {
-            message(__('Not subscribed forum'));
+            throw new \FeatherBB\Error(__('Not subscribed forum'), 400);
         }
 
         // Delete the subscription
@@ -369,7 +369,7 @@ public function subscribe_forum($forum_id)
         $forum_id = $this->hook->fire('subscribe_forum_start', $forum_id);
 
         if ($this->config['o_forum_subscriptions'] != '1') {
-            message(__('No permission'), '403');
+            throw new \FeatherBB\Error(__('No permission'), 403);
         }
 
         // Make sure the user can view the forum
@@ -388,7 +388,7 @@ public function subscribe_forum($forum_id)
         $authorized = $authorized->find_one();
 
         if (!$authorized) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         $is_subscribed = DB::for_table('forum_subscriptions')
@@ -398,7 +398,7 @@ public function subscribe_forum($forum_id)
         $is_subscribed = $is_subscribed->find_one();
 
         if ($is_subscribed) {
-            message(__('Already subscribed forum'));
+            throw new \FeatherBB\Error(__('Already subscribed forum'), 400);
         }
 
         // Insert the subscription

From 770cce4f8f21c10d1e6eb4c7a58aa85136d7799f Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 18:26:55 +0200
Subject: [PATCH 261/353] Update more (more!) controllers

---
 model/admin/bans.php        | 34 +++++++++++++++++-----------------
 model/admin/censoring.php   |  4 ++--
 model/admin/groups.php      | 12 ++++++------
 model/admin/maintenance.php |  6 +++---
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/model/admin/bans.php b/model/admin/bans.php
index 42feda83..ddf4fb1b 100644
--- a/model/admin/bans.php
+++ b/model/admin/bans.php
@@ -34,7 +34,7 @@ public function add_ban_info($id = null)
         if (is_numeric($id)) {
             $ban['user_id'] = $id;
             if ($ban['user_id'] < 2) {
-                message(__('Bad request'), '404');
+                throw new \FeatherBB\Error(__('Bad request'), 404);
             }
 
             $select_add_ban_info = array('group_id', 'username', 'email');
@@ -49,7 +49,7 @@ public function add_ban_info($id = null)
                 $ban['ban_user'] = $result['username'];
                 $ban['email'] = $result['email'];
             } else {
-                message(__('No user ID message'));
+                throw new \FeatherBB\Error(__('No user ID message'), 404);
             }
         } else {
             // Otherwise the username is in POST
@@ -71,7 +71,7 @@ public function add_ban_info($id = null)
                     $ban['ban_user'] = $result['username'];
                     $ban['email'] = $result['email'];
                 } else {
-                    message(__('No user message'));
+                    throw new \FeatherBB\Error(__('No user message'), 404);
                 }
             }
         }
@@ -79,14 +79,14 @@ public function add_ban_info($id = null)
         // Make sure we're not banning an admin or moderator
         if (isset($group_id)) {
             if ($group_id == FEATHER_ADMIN) {
-                message(sprintf(__('User is admin message'), feather_escape($ban['ban_user'])));
+                throw new \FeatherBB\Error(sprintf(__('User is admin message'), feather_escape($ban['ban_user'])), 403);
             }
 
             $is_moderator_group = DB::for_table('groups')->where('g_id', $group_id)
                                         ->find_one_col('g_moderator');
 
             if ($is_moderator_group) {
-                message(sprintf(__('User is mod message'), feather_escape($ban['ban_user'])));
+                throw new \FeatherBB\Error(sprintf(__('User is mod message'), feather_escape($ban['ban_user'])), 403);
             }
         }
 
@@ -131,7 +131,7 @@ public function edit_ban_info($id)
             $ban['message'] = $result['message'];
             $ban['expire'] = $result['expire'];
         } else {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         $diff = ($this->user->timezone + $this->user->dst) * 3600;
@@ -155,9 +155,9 @@ public function insert_ban()
         $this->hook->fire('insert_ban_start', $ban_user, $ban_ip, $ban_email, $ban_message, $ban_expire);
 
         if ($ban_user == '' && $ban_ip == '' && $ban_email == '') {
-            message(__('Must enter message'));
+            throw new \FeatherBB\Error(__('Must enter message'), 400);
         } elseif (strtolower($ban_user) == 'guest') {
-            message(__('Cannot ban guest message'));
+            throw new \FeatherBB\Error(__('Cannot ban guest message'), 400);
         }
 
         // Make sure we're not banning an admin or moderator
@@ -168,14 +168,14 @@ public function insert_ban()
 
             if ($group_id) {
                 if ($group_id == FEATHER_ADMIN) {
-                    message(sprintf(__('User is admin message'), feather_escape($ban_user)));
+                    throw new \FeatherBB\Error(sprintf(__('User is admin message'), feather_escape($ban_user)), 403);
                 }
 
                 $is_moderator_group = DB::for_table('groups')->where('g_id', $group_id)
                                             ->find_one_col('g_moderator');
 
                 if ($is_moderator_group) {
-                    message(sprintf(__('User is mod message'), feather_escape($ban_user)));
+                    throw new \FeatherBB\Error(sprintf(__('User is mod message'), feather_escape($ban_user)), 403);
                 }
             }
         }
@@ -194,7 +194,7 @@ public function insert_ban()
                         $octets[$c] = ltrim($octets[$c], "0");
 
                         if ($c > 7 || (!empty($octets[$c]) && !ctype_xdigit($octets[$c])) || intval($octets[$c], 16) > 65535) {
-                            message(__('Invalid IP message'));
+                            throw new \FeatherBB\Error(__('Invalid IP message'), 400);
                         }
                     }
 
@@ -207,7 +207,7 @@ public function insert_ban()
                         $octets[$c] = (strlen($octets[$c]) > 1) ? ltrim($octets[$c], "0") : $octets[$c];
 
                         if ($c > 3 || preg_match('%[^0-9]%', $octets[$c]) || intval($octets[$c]) > 255) {
-                            message(__('Invalid IP message'));
+                            throw new \FeatherBB\Error(__('Invalid IP message'), 400);
                         }
                     }
 
@@ -221,7 +221,7 @@ public function insert_ban()
 
         if ($ban_email != '' && !$this->email->is_valid_email($ban_email)) {
             if (!preg_match('%^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,63})$%', $ban_email)) {
-                message(__('Invalid e-mail message'));
+                throw new \FeatherBB\Error(__('Invalid e-mail message'), 400);
             }
         }
 
@@ -229,14 +229,14 @@ public function insert_ban()
             $ban_expire = strtotime($ban_expire.' GMT');
 
             if ($ban_expire == -1 || !$ban_expire) {
-                message(__('Invalid date message').' '.__('Invalid date reasons'));
+                throw new \FeatherBB\Error(__('Invalid date message').' '.__('Invalid date reasons'), 400);
             }
 
             $diff = ($this->user->timezone + $this->user->dst) * 3600;
             $ban_expire -= $diff;
 
             if ($ban_expire <= time()) {
-                message(__('Invalid date message').' '.__('Invalid date reasons'));
+                throw new \FeatherBB\Error(__('Invalid date message').' '.__('Invalid date reasons'), 400);
             }
         } else {
             $ban_expire = 'NULL';
@@ -321,7 +321,7 @@ public function find_ban($start_from = false)
 
             $expire_after = strtotime($expire_after);
             if ($expire_after === false || $expire_after == -1) {
-                message(__('Invalid date message'));
+                throw new \FeatherBB\Error(__('Invalid date message'), 400);
             }
 
             $result = $result->where_gt('b.expire', $expire_after);
@@ -331,7 +331,7 @@ public function find_ban($start_from = false)
 
             $expire_before = strtotime($expire_before);
             if ($expire_before === false || $expire_before == -1) {
-                message(__('Invalid date message'));
+                throw new \FeatherBB\Error(__('Invalid date message'), 400);
             }
 
             $result = $result->where_lt('b.expire', $expire_before);
diff --git a/model/admin/censoring.php b/model/admin/censoring.php
index 1385e7b1..dd9378c8 100644
--- a/model/admin/censoring.php
+++ b/model/admin/censoring.php
@@ -29,7 +29,7 @@ public function add_word()
         $replace_with = feather_trim($this->request->post('new_replace_with'));
 
         if ($search_for == '') {
-            message(__('Must enter word message'));
+            throw new \FeatherBB\Error(__('Must enter word message'), 400);
         }
 
         $set_search_word = array('search_for' => $search_for,
@@ -57,7 +57,7 @@ public function update_word()
         $replace_with = feather_trim($this->request->post('replace_with')[$id]);
 
         if ($search_for == '') {
-            message(__('Must enter word message'));
+            throw new \FeatherBB\Error(__('Must enter word message'), 400);
         }
 
         $set_search_word = array('search_for' => $search_for,
diff --git a/model/admin/groups.php b/model/admin/groups.php
index e52208c5..e7fdc362 100644
--- a/model/admin/groups.php
+++ b/model/admin/groups.php
@@ -50,7 +50,7 @@ public function info_add_group($groups, $id)
         } else {
             // We are editing a group
             if (!isset($groups[$id])) {
-                message(__('Bad request'), '404');
+                throw new \FeatherBB\Error(__('Bad request'), 404);
             }
 
             $groups[$id] = $this->hook->fire('update_user_group', $groups[$id]);
@@ -125,7 +125,7 @@ public function add_edit_group($groups)
         // Set group title
         $title = feather_trim($this->request->post('req_title'));
         if ($title == '') {
-            message(__('Must enter title message'));
+            throw new \FeatherBB\Error(__('Must enter title message'), 400);
         }
         $title = $this->hook->fire('add_edit_group_set_title', $title);
         // Set user title
@@ -201,7 +201,7 @@ public function add_edit_group($groups)
             // Creating a new group
             $title_exists = DB::for_table('groups')->where('g_title', $title)->find_one();
             if ($title_exists) {
-                message(sprintf(__('Title already exists message'), feather_escape($title)));
+                throw new \FeatherBB\Error(sprintf(__('Title already exists message'), feather_escape($title)), 400);
             }
 
             DB::for_table('groups')
@@ -236,7 +236,7 @@ public function add_edit_group($groups)
             // We are editing an existing group
             $title_exists = DB::for_table('groups')->where('g_title', $title)->where_not_equal('g_id', $this->request->post('group_id'))->find_one();
             if ($title_exists) {
-                message(sprintf(__('Title already exists message'), feather_escape($title)));
+                throw new \FeatherBB\Error(sprintf(__('Title already exists message'), feather_escape($title)), 400);
             }
             DB::for_table('groups')
                     ->find_one($this->request->post('group_id'))
@@ -271,12 +271,12 @@ public function set_default_group($groups)
 
         // Make sure it's not the admin or guest groups
         if ($group_id == FEATHER_ADMIN || $group_id == FEATHER_GUEST) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         // Make sure it's not a moderator group
         if ($groups[$group_id]['g_moderator'] != 0) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         DB::for_table('config')->where('conf_name', 'o_default_user_group')
diff --git a/model/admin/maintenance.php b/model/admin/maintenance.php
index 2ae02599..205da212 100644
--- a/model/admin/maintenance.php
+++ b/model/admin/maintenance.php
@@ -31,7 +31,7 @@ public function rebuild()
 
         // Check per page is > 0
         if ($per_page < 1) {
-            message(__('Posts must be integer message'));
+            throw new \FeatherBB\Error(__('Posts must be integer message'), 400);
         }
 
         @set_time_limit(0);
@@ -220,7 +220,7 @@ public function get_info_prune($prune_sticky, $prune_from)
 
         $prune['days'] = feather_trim($this->request->post('req_prune_days'));
         if ($prune['days'] == '' || preg_match('%[^0-9]%', $prune['days'])) {
-            message(__('Days must be integer message'));
+            throw new \FeatherBB\Error(__('Days must be integer message'), 400);
         }
 
         $prune['date'] = time() - ($prune['days'] * 86400);
@@ -251,7 +251,7 @@ public function get_info_prune($prune_sticky, $prune_from)
         $prune['num_topics'] = $query->count('id');
 
         if (!$prune['num_topics']) {
-            message(sprintf(__('No old topics message'), $prune['days']));
+            throw new \FeatherBB\Error(sprintf(__('No old topics message'), $prune['days']), 204);
         }
 
         $prune = $this->hook->fire('maintenance.get_info_prune.prune', $prune);

From 488d7599ee582bf1ac4b519c6f01dacbd98e575f Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 29 Aug 2015 19:09:22 +0200
Subject: [PATCH 262/353] Add Utils lib

---
 controller/admin/bans.php                     |   8 +-
 controller/admin/categories.php               |   6 +-
 controller/admin/censoring.php                |   2 +-
 controller/admin/forums.php                   |  14 +-
 controller/admin/groups.php                   |   8 +-
 controller/admin/index.php                    |   2 +-
 controller/admin/maintenance.php              |   8 +-
 controller/admin/options.php                  |   2 +-
 controller/admin/parser.php                   |   2 +-
 controller/admin/permissions.php              |   2 +-
 controller/admin/plugins.php                  |  14 +-
 controller/admin/reports.php                  |   2 +-
 controller/admin/statistics.php               |   2 +-
 controller/admin/users.php                    |  14 +-
 controller/delete.php                         |   2 +-
 controller/edit.php                           |   2 +-
 controller/help.php                           |   2 +-
 controller/index.php                          |   2 +-
 controller/install.php                        |  10 +-
 controller/login.php                          |   4 +-
 controller/misc.php                           |   6 +-
 controller/moderate.php                       |  18 +-
 controller/post.php                           |   2 +-
 controller/profile.php                        |  26 +--
 controller/register.php                       |   4 +-
 controller/search.php                         |   4 +-
 controller/userlist.php                       |   4 +-
 controller/viewforum.php                      |   2 +-
 controller/viewtopic.php                      |   2 +-
 extern.php                                    |  52 ++---
 include/classes/auth.class.php                |   4 +-
 include/classes/core.class.php                |   6 +-
 include/classes/email.class.php               |  16 +-
 include/classes/search.class.php              |  15 +-
 include/classes/url.class.php                 |  19 +-
 include/classes/utils.class.php               | 164 ++++++++++++-
 include/classes/view.class.php                |   5 +-
 include/common_admin.php                      |   2 +-
 include/functions.php                         | 215 ++----------------
 include/routes.php                            |   2 +-
 model/admin/bans.php                          |  26 +--
 model/admin/censoring.php                     |   8 +-
 model/admin/groups.php                        |  16 +-
 model/admin/maintenance.php                   |   8 +-
 model/admin/options.php                       |  46 ++--
 model/admin/users.php                         |  26 +--
 model/cache.php                               |   2 +-
 model/debug.php                               |   6 +-
 model/edit.php                                |  24 +-
 model/index.php                               |  18 +-
 model/login.php                               |  10 +-
 model/misc.php                                |  12 +-
 model/moderate.php                            |  26 +--
 model/post.php                                |  44 ++--
 model/profile.php                             | 106 ++++-----
 model/register.php                            |  14 +-
 model/search.php                              |  38 ++--
 model/userlist.php                            |   4 +-
 model/viewforum.php                           |   8 +-
 model/viewtopic.php                           |  24 +-
 style/FeatherBB/view/admin/bans/add_ban.php   |   8 +-
 .../FeatherBB/view/admin/bans/search_ban.php  |  12 +-
 style/FeatherBB/view/admin/categories.php     |   4 +-
 style/FeatherBB/view/admin/censoring.php      |   2 +-
 .../view/admin/forums/admin_forums.php        |   6 +-
 .../view/admin/forums/permissions.php         |  10 +-
 .../view/admin/groups/add_edit_group.php      |   6 +-
 .../view/admin/groups/admin_groups.php        |  10 +-
 .../view/admin/groups/confirm_delete.php      |   2 +-
 .../view/admin/groups/delete_group.php        |   2 +-
 .../view/admin/maintenance/prune.php          |   2 +-
 style/FeatherBB/view/admin/options.php        |  32 +--
 style/FeatherBB/view/admin/parser.php         |   8 +-
 style/FeatherBB/view/admin/reports.php        |  12 +-
 style/FeatherBB/view/admin/statistics.php     |   2 +-
 .../FeatherBB/view/admin/users/find_users.php |   8 +-
 .../FeatherBB/view/admin/users/move_users.php |   2 +-
 .../FeatherBB/view/admin/users/search_ip.php  |   4 +-
 .../FeatherBB/view/admin/users/show_users.php |  10 +-
 style/FeatherBB/view/delete.php               |  10 +-
 style/FeatherBB/view/edit.php                 |  10 +-
 style/FeatherBB/view/footer.new.php           |   6 +-
 style/FeatherBB/view/footer.php               |   2 +-
 style/FeatherBB/view/header.new.php           |   8 +-
 style/FeatherBB/view/header.php               |   4 +-
 style/FeatherBB/view/help.php                 |   6 +-
 style/FeatherBB/view/index.php                |  18 +-
 style/FeatherBB/view/login/form.php           |   2 +-
 style/FeatherBB/view/misc/email.php           |   2 +-
 style/FeatherBB/view/misc/report.php          |   4 +-
 .../view/moderate/moderator_forum.php         |  14 +-
 style/FeatherBB/view/moderate/posts_view.php  |  12 +-
 style/FeatherBB/view/post.php                 |  20 +-
 style/FeatherBB/view/profile/delete_user.php  |   2 +-
 .../FeatherBB/view/profile/section_admin.php  |   2 +-
 .../view/profile/section_display.php          |   2 +-
 .../view/profile/section_essentials.php       |  14 +-
 .../view/profile/section_messaging.php        |  10 +-
 .../view/profile/section_personal.php         |   8 +-
 .../view/profile/section_personality.php      |   6 +-
 .../view/profile/section_privacy.php          |   2 +-
 .../FeatherBB/view/profile/upload_avatar.php  |   2 +-
 style/FeatherBB/view/register/email.php       |   4 +-
 style/FeatherBB/view/register/form.php        |  10 +-
 style/FeatherBB/view/search/posts.php         |   4 +-
 style/FeatherBB/view/search/topics.php        |   6 +-
 style/FeatherBB/view/userlist.php             |   8 +-
 style/FeatherBB/view/viewforum.php            |  12 +-
 style/FeatherBB/view/viewtopic.php            |  20 +-
 view/admin/options.php                        |   2 +-
 view/post.php                                 |   2 +-
 111 files changed, 745 insertions(+), 773 deletions(-)

diff --git a/controller/admin/bans.php b/controller/admin/bans.php
index 964ca2c9..66fc80c5 100644
--- a/controller/admin/bans.php
+++ b/controller/admin/bans.php
@@ -48,7 +48,7 @@ public function display()
             $this->feather->view2->setPageInfo(array(
                     'admin_console' => true,
                     'page' => $p,
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans'), __('Results head')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Bans'), __('Results head')),
                     'paging_links' => '<span class="pages-label">' . __('Pages') . ' </span>' . $this->feather->url->paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str'])),
                     'ban_data' => $ban_data['data'],
                 )
@@ -60,7 +60,7 @@ public function display()
             $this->feather->view2->setPageInfo(array(
                     'admin_console' => true,
                     'focus_element' => array('bans', 'new_ban_user'),
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Bans')),
                 )
             )->addTemplate('admin/bans/admin_bans.php')->display();
         }
@@ -77,7 +77,7 @@ public function add($id = null)
         $this->feather->view2->setPageInfo(array(
                 'admin_console' => true,
                 'focus_element' => array('bans2', 'ban_user'),
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Bans')),
                 'ban' => $this->model->add_ban_info($id),
             )
         )->addTemplate('admin/bans/add_ban.php')->display();
@@ -99,7 +99,7 @@ public function edit($id)
         $this->feather->view2->setPageInfo(array(
                 'admin_console' => true,
                 'focus_element' => array('bans2', 'ban_user'),
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Bans')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Bans')),
                 'ban' => $this->model->edit_ban_info($id),
             )
         )->addTemplate('admin/bans/add_ban.php')->display();
diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index da164cdb..a14c6467 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -29,7 +29,7 @@ public function __autoload($class_name)
 
     public function add_category()
     {
-        $cat_name = feather_trim($this->request->post('cat_name'));
+        $cat_name = $this->feather->utils->trim($this->request->post('cat_name'));
         if ($cat_name == '') {
             redirect($this->feather->url->get('admin/categories/'), __('Must enter name message'));
         }
@@ -49,7 +49,7 @@ public function edit_categories()
 
         foreach ($this->request->post('cat') as $cat_id => $properties) {
             $category = array('id' => (int) $cat_id,
-                              'name' => feather_escape($properties['name']),
+                              'name' => $this->feather->utils->escape($properties['name']),
                               'order' => (int) $properties['order'], );
             if ($category['name'] == '') {
                 redirect($this->feather->url->get('admin/categories/'), __('Must enter name message'));
@@ -87,7 +87,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('categories');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Categories')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Categories')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'cat_list' => $this->model->get_cat_list(),
diff --git a/controller/admin/censoring.php b/controller/admin/censoring.php
index 2d738891..634e2401 100644
--- a/controller/admin/censoring.php
+++ b/controller/admin/censoring.php
@@ -47,7 +47,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('censoring');
 
         $this->feather->view2->setPageInfo(array(
-                'title'    =>    array(feather_escape($this->config['o_board_title']), __('Admin'), __('Censoring')),
+                'title'    =>    array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Censoring')),
                 'focus_element'    =>    array('censoring', 'new_search_for'),
                 'active_page'    =>    'admin',
                 'admin_console'    =>    true,
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index 8b8cb1c1..a23f3fad 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -54,11 +54,11 @@ public function edit_forum($forum_id)
             if ($this->request->post('save') && $this->request->post('read_forum_old')) {
 
                 // Forums parameters / TODO : better handling of wrong parameters
-                $forum_data = array('forum_name' => feather_escape($this->request->post('forum_name')),
-                                    'forum_desc' => $this->request->post('forum_desc') ? feather_linebreaks(feather_trim($this->request->post('forum_desc'))) : NULL,
+                $forum_data = array('forum_name' => $this->feather->utils->escape($this->request->post('forum_name')),
+                                    'forum_desc' => $this->request->post('forum_desc') ? $this->feather->utils->linebreaks($this->feather->utils->trim($this->request->post('forum_desc'))) : NULL,
                                     'cat_id' => (int) $this->request->post('cat_id'),
                                     'sort_by' => (int) $this->request->post('sort_by'),
-                                    'redirect_url' => $this->feather->url->is_valid($this->request->post('redirect_url')) ? feather_escape($this->request->post('redirect_url')) : NULL);
+                                    'redirect_url' => $this->feather->url->is_valid($this->request->post('redirect_url')) ? $this->feather->utils->escape($this->request->post('redirect_url')) : NULL);
 
                 if ($forum_data['forum_name'] == '') {
                     redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Must enter name message'));
@@ -115,7 +115,7 @@ public function edit_forum($forum_id)
             \FeatherBB\AdminUtils::generateAdminMenu('forums');
 
             $this->feather->view2->setPageInfo(array(
-                    'title'    =>    array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums')),
+                    'title'    =>    array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Forums')),
                     'active_page'    =>    'admin',
                     'admin_console'    =>    true,
                     'perm_data' => $this->model->get_permissions($forum_id),
@@ -141,7 +141,7 @@ public function delete_forum($forum_id)
             \FeatherBB\AdminUtils::generateAdminMenu('forums');
 
             $this->feather->view2->setPageInfo(array(
-                    'title'    =>    array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums')),
+                    'title'    =>    array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Forums')),
                     'active_page'    =>    'admin',
                     'admin_console'    =>    true,
                     'cur_forum' => $this->model->get_forum_info($forum_id),
@@ -155,7 +155,7 @@ public function delete_forum($forum_id)
     public function edit_positions()
     {
         foreach ($this->request->post('position') as $forum_id => $position) {
-            $position = (int) feather_trim($position);
+            $position = (int) $this->feather->utils->trim($position);
             $this->model->update_positions($forum_id, $position);
         }
 
@@ -175,7 +175,7 @@ public function display()
 
         $categories_model = new \model\admin\categories();
         $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Forums')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Forums')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'cat_list' => $categories_model->get_cat_list(),
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index 2386b2a6..f02b6be7 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -39,7 +39,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('groups');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('User groups')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'groups' => $this->model->fetch_groups(),
@@ -70,7 +70,7 @@ public function delete($id)
                 \FeatherBB\AdminUtils::generateAdminMenu('groups');
 
                 $this->feather->view2->setPageInfo(array(
-                        'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('User groups')),
                         'active_page' => 'admin',
                         'admin_console' => true,
                         'group_title'      =>  $this->model->get_group_title($id),
@@ -83,7 +83,7 @@ public function delete($id)
         \FeatherBB\AdminUtils::generateAdminMenu('groups');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('User groups')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'id'    => $id,
@@ -110,7 +110,7 @@ public function addedit($id = '')
             $group = $this->model->info_add_group($groups, $id);
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('User groups')),
                     'active_page' => 'admin',
                     'admin_console' => true,
                     'focus_element' => array('groups2', 'req_title'),
diff --git a/controller/admin/index.php b/controller/admin/index.php
index aa9fbae7..ce49946f 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -74,7 +74,7 @@ public function display($action = null)
         \FeatherBB\AdminUtils::generateAdminMenu('index');
 
         $this->feather->view2->setPageInfo(array(
-                            'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Index')),
+                            'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Index')),
                             'active_page' => 'admin',
                             'admin_console' => true,
                             'install_file_exists'    =>   is_dir($this->feather->forum_env['FEATHER_ROOT'].'install'),
diff --git a/controller/admin/maintenance.php b/controller/admin/maintenance.php
index 88108ada..6b6fbe1a 100644
--- a/controller/admin/maintenance.php
+++ b/controller/admin/maintenance.php
@@ -31,14 +31,14 @@ public function display()
             $this->model->rebuild();
 
             $this->feather->view2->setPageInfo(array(
-                    'page_title'    =>    array(feather_escape($this->feather->forum_settings['o_board_title']), __('Rebuilding search index')),
+                    'page_title'    =>    array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Rebuilding search index')),
                     'query_str' => $this->model->get_query_str()
                 )
             )->addTemplate('admin/maintenance/rebuild.php')->display();
         }
 
         if ($action == 'prune') {
-            $prune_from = feather_trim($this->feather->request->post('prune_from'));
+            $prune_from = $this->feather->utils->trim($this->feather->request->post('prune_from'));
             $prune_sticky = intval($this->feather->request->post('prune_sticky'));
 
             \FeatherBB\AdminUtils::generateAdminMenu('maintenance');
@@ -48,7 +48,7 @@ public function display()
             }
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Prune')),
+                    'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Prune')),
                     'active_page' => 'admin',
                     'admin_console' => true,
                     'prune_sticky'    =>    $prune_sticky,
@@ -61,7 +61,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('maintenance');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Maintenance')),
+                'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Maintenance')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'first_id' => $this->model->get_first_id(),
diff --git a/controller/admin/options.php b/controller/admin/options.php
index 34cf6f1c..31960949 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -36,7 +36,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('options');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Options')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Options')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'languages' => forum_list_langs(),
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index c9ab21f9..fb3244b9 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -205,7 +205,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('parser');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Parser')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Parser')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'lang_admin_parser'    =>    $lang_admin_parser,
diff --git a/controller/admin/permissions.php b/controller/admin/permissions.php
index 20614a18..a728b9cd 100644
--- a/controller/admin/permissions.php
+++ b/controller/admin/permissions.php
@@ -37,7 +37,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('permissions');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Permissions')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Permissions')),
                 'active_page' => 'admin',
                 'admin_console' => true,
             )
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index a53e71a8..cab74960 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -45,7 +45,7 @@ public function index()
                 'active_page' => 'admin',
                 'pluginsList'    =>    $pluginsList,
                 'activePlugins'    =>    $activePlugins,
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), 'Plugins'),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), 'Plugins'),
             )
         )->addTemplate('admin/plugins.php')->display();
     }
@@ -60,14 +60,14 @@ public function activate()
 
         // Check if plugin follows PSR-4 conventions and extends base forum plugin
         if (!class_exists($class) || !property_exists($class, 'isValidFBPlugin')) {
-            throw new \FeatherBB\Error(sprintf(__('No plugin message'), feather_escape($class)), 400);
+            throw new \FeatherBB\Error(sprintf(__('No plugin message'), $this->feather->utils->escape($class)), 400);
         }
 
         $plugin = new $class;
         try {
             $plugin->activate($class);
         } catch (\Exception $e) {
-            redirect($this->feather->url->get('admin/plugins/'), feather_escape($e->getMessage()));
+            redirect($this->feather->url->get('admin/plugins/'), $this->feather->utils->escape($e->getMessage()));
         }
         // Plugin has been activated, confirm and redirect
         redirect($this->feather->url->get('admin/plugins/'), 'Plugin "'.$class::$name.'" activated!');
@@ -85,7 +85,7 @@ public function deactivate()
         try {
             $plugin->deactivate($class);
         } catch (\Exception $e) {
-            redirect($this->feather->url->get('admin/plugins/'), feather_escape($e->getMessage()));
+            redirect($this->feather->url->get('admin/plugins/'), $this->feather->utils->escape($e->getMessage()));
         }
         // Plugin has been activated, confirm and redirect
         redirect($this->feather->url->get('admin/plugins/'), 'Plugin "'.$class::$name.'" deactivated!');
@@ -107,7 +107,7 @@ public function display()
 
         // Make sure the file actually exists
         if (!file_exists(FEATHER_ROOT.'plugins/'.$plugin)) {
-            throw new \FeatherBB\Error(sprintf(__('No plugin message'), feather_escape($plugin)), 400);
+            throw new \FeatherBB\Error(sprintf(__('No plugin message'), $this->feather->utils->escape($plugin)), 400);
         }
 
         // Construct REQUEST_URI if it isn't set TODO?
@@ -120,11 +120,11 @@ public function display()
         // get the "blank page of death"
         include FEATHER_ROOT.'plugins/'.$plugin;
         if (!defined('FEATHER_PLUGIN_LOADED')) {
-            throw new \FeatherBB\Error(sprintf(__('Plugin failed message'), feather_escape($plugin)));
+            throw new \FeatherBB\Error(sprintf(__('Plugin failed message'), $this->feather->utils->escape($plugin)));
         }
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), str_replace('_', ' ', substr($plugin, strpos($plugin, '_') + 1, -4))),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), str_replace('_', ' ', substr($plugin, strpos($plugin, '_') + 1, -4))),
                 'active_page' => 'admin',
                 'admin_console' => true,
             )
diff --git a/controller/admin/reports.php b/controller/admin/reports.php
index 5330c24f..233523ab 100644
--- a/controller/admin/reports.php
+++ b/controller/admin/reports.php
@@ -37,7 +37,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('reports');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Reports')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Reports')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'report_data'   =>  $this->model->get_reports(),
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index a69261d2..e8349a0d 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -33,7 +33,7 @@ public function display()
         $total = $this->model->get_total_size();
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Server statistics')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Server statistics')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'server_load'    =>    $this->model->get_server_load(),
diff --git a/controller/admin/users.php b/controller/admin/users.php
index 337e7760..66882418 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -38,7 +38,7 @@ public function display()
             \FeatherBB\AdminUtils::generateAdminMenu('users');
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Move users')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Move users')),
                     'active_page' => 'moderate',
                     'admin_console' => true,
                     'move'              =>  $this->model->move_users(),
@@ -56,7 +56,7 @@ public function display()
             \FeatherBB\AdminUtils::generateAdminMenu('users');
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Delete users')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Delete users')),
                     'active_page' => 'moderate',
                     'admin_console' => true,
                     'user_ids'          => $this->model->delete_users(),
@@ -74,7 +74,7 @@ public function display()
             \FeatherBB\AdminUtils::generateAdminMenu('users');
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Bans')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Bans')),
                     'active_page' => 'moderate',
                     'focus_element' => array('bans2', 'ban_message'),
                     'admin_console' => true,
@@ -108,7 +108,7 @@ public function display()
             $this->feather->view2->addAsset('js', 'js/common.js', array('type' => 'text/javascript'));
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
                     'active_page' => 'admin',
                     'admin_console' => true,
                     'paging_links' => $paging_links,
@@ -126,7 +126,7 @@ public function display()
             \FeatherBB\AdminUtils::generateAdminMenu('users');
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Users')),
                     'active_page' => 'admin',
                     'admin_console' => true,
                     'focus_element' => array('find_user', 'form[username]'),
@@ -149,7 +149,7 @@ public function ipstats($id)
         $start_from = 50 * ($p - 1);
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'page' => $p,
@@ -177,7 +177,7 @@ public function showusers($ip)
         $start_from = 50 * ($p - 1);
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate_old($num_pages, $p, '?ip_stats='.$ip),
diff --git a/controller/delete.php b/controller/delete.php
index e808fb08..f939068d 100644
--- a/controller/delete.php
+++ b/controller/delete.php
@@ -61,7 +61,7 @@ public function deletepost($id)
         $cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Delete post')),
+            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Delete post')),
             'active_page' => 'delete',
             'cur_post' => $cur_post,
             'id' => $id,
diff --git a/controller/edit.php b/controller/edit.php
index d916c6b3..e1a0e504 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -107,7 +107,7 @@ public function editpost($id)
         );
 
         $this->feather->view2->setPageInfo(array(
-                            'title' => array(feather_escape($this->config['o_board_title']), __('Edit post')),
+                            'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Edit post')),
                             'required_fields' => array('req_subject' => __('Subject'), 'req_message' => __('Message')),
                             'focus_element' => array('edit', 'req_message'),
                             'cur_post' => $cur_post,
diff --git a/controller/help.php b/controller/help.php
index 41aea09f..e96f2c33 100644
--- a/controller/help.php
+++ b/controller/help.php
@@ -33,7 +33,7 @@ public function display()
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->config['o_board_title']), __('Help')),
+            'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Help')),
             'active_page' => 'help',
         ))->addTemplate('help.php')->display();
     }
diff --git a/controller/index.php b/controller/index.php
index 3922a57c..862c0d16 100644
--- a/controller/index.php
+++ b/controller/index.php
@@ -25,7 +25,7 @@ public function display()
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->feather->forum_settings['o_board_title'])),
+            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title'])),
             'active_page' => 'index',
             'is_indexed' => true,
             'index_data' => $this->model->print_categories_forums(),
diff --git a/controller/install.php b/controller/install.php
index 69b16ee9..05ac8dba 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -34,7 +34,7 @@ public function __construct()
     public function run()
     {
         if (!empty($this->feather->request->post('choose_lang'))) {
-            if (in_array(feather_trim($this->feather->request->post('install_lang')), $this->available_langs)) {
+            if (in_array($this->feather->utils->trim($this->feather->request->post('install_lang')), $this->available_langs)) {
                 $this->install_lang = $this->feather->request->post('install_lang');
             }
         }
@@ -43,7 +43,7 @@ public function run()
         if ($this->feather->request->isPost() && empty($this->feather->request->post('choose_lang'))) {
             $missing_fields = array();
             $data = array_map(function ($item) {
-                return feather_escape(feather_trim($item));
+                return $this->feather->utils->escape($this->feather->utils->trim($item));
             }, $this->feather->request->post('install'));
 
             foreach ($data as $field => $value) {
@@ -66,9 +66,9 @@ public function run()
                 }
 
                 // Validate username and passwords
-                if (feather_strlen($data['username']) < 2) {
+                if ($this->feather->utils->strlen($data['username']) < 2) {
                     $this->errors[] = __('Username 1');
-                } elseif (feather_strlen($data['username']) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
+                } elseif ($this->feather->utils->strlen($data['username']) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
                     $this->errors[] = __('Username 2');
                 } elseif (!strcasecmp($data['username'], 'Guest')) {
                     $this->errors[] = __('Username 3');
@@ -80,7 +80,7 @@ public function run()
                     $this->errors[] = __('Username 6');
                 }
 
-                if (feather_strlen($data['password']) < 6) {
+                if ($this->feather->utils->strlen($data['password']) < 6) {
                     $this->errors[] = __('Short password');
                 } elseif ($data['password'] != $data['password_conf']) {
                     $this->errors[] = __('Passwords not match');
diff --git a/controller/login.php b/controller/login.php
index 0b2879c8..4ab68868 100644
--- a/controller/login.php
+++ b/controller/login.php
@@ -42,7 +42,7 @@ public function display()
         $this->feather->view2->setPageInfo(array(
                             'redirect_url'    =>    $redirect_url,
                             'active_page' => 'login',
-                            'title' => array(feather_escape($this->config['o_board_title']), __('Login')),
+                            'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Login')),
                             'required_fields' => array('req_username' => __('Username'), 'req_password' => __('Password')),
                             'focus_element' => array('login', 'req_username'),
                             )
@@ -80,7 +80,7 @@ public function forget()
         $this->feather->view2->setPageInfo(array(
                 'errors'    =>    $this->model->password_forgotten(),
                 'active_page' => 'login',
-                'title' => array(feather_escape($this->config['o_board_title']), __('Request pass')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Request pass')),
                 'required_fields' => array('req_email' => __('Email')),
                 'focus_element' => array('request_pass', 'req_email'),
             )
diff --git a/controller/misc.php b/controller/misc.php
index bcb3147f..0a6440d2 100644
--- a/controller/misc.php
+++ b/controller/misc.php
@@ -26,7 +26,7 @@ public function rules()
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Forum rules')),
+            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Forum rules')),
             'active_page' => 'rules'
             ))->addTemplate('misc/rules.php')->display();
     }
@@ -116,7 +116,7 @@ public function email($id)
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Send email to').' '.feather_escape($mail['recipient'])),
+            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Send email to').' '.$this->feather->utils->escape($mail['recipient'])),
             'active_page' => 'email',
             'required_fields' => array('req_subject' => __('Email subject'), 'req_message' => __('Email message')),
             'focus_element' => array('email', 'req_subject'),
@@ -143,7 +143,7 @@ public function report($id)
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('Report post')),
+            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Report post')),
             'active_page' => 'report',
             'required_fields' => array('req_reason' => __('Reason')),
             'focus_element' => array('report', 'req_reason'),
diff --git a/controller/moderate.php b/controller/moderate.php
index b1915bab..e2614b7d 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -83,7 +83,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             $this->model->check_move_possible();
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Moderate')),
                     'active_page' => 'moderate',
                     'action'    =>    'multi',
                     'id'    =>    $fid,
@@ -137,7 +137,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             $this->model->check_move_possible();
 
             $this->feather->view2->setPageInfo(array(
-                        'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Moderate')),
                         'active_page' => 'moderate',
                         'page' => $p,
                         'action'    =>    'single',
@@ -156,7 +156,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                     $posts = $this->model->delete_posts($id, $fid, $p);
 
                     $this->feather->view2->setPageInfo(array(
-                            'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                            'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Moderate')),
                             'active_page' => 'moderate',
                             'page' => $p,
                             'id' => $id,
@@ -167,7 +167,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             if ($this->request->post('split_posts') || $this->request->post('split_posts_comply')) {
 
                 $this->feather->view2->setPageInfo(array(
-                        'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Moderate')),
                         'focus_element' => array('subject','new_subject'),
                         'page' => $p,
                         'active_page' => 'moderate',
@@ -193,7 +193,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             }
 
             $this->feather->view2->setPageInfo(array(
-                        'title' => array(feather_escape($this->config['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject'])),
+                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), $this->feather->utils->escape($cur_topic['forum_name']), $this->feather->utils->escape($cur_topic['subject'])),
                         'page' => $p,
                         'active_page' => 'moderate',
                         'cur_topic' => $cur_topic,
@@ -242,7 +242,7 @@ public function display($id, $name = null, $page = null)
         $url_forum = $this->feather->url->url_friendly($cur_forum['forum_name']);
 
         $this->feather->view2->setPageInfo(array(
-                            'title' => array(feather_escape($this->config['o_board_title']), feather_escape($cur_forum['forum_name'])),
+                            'title' => array($this->feather->utils->escape($this->config['o_board_title']), $this->feather->utils->escape($cur_forum['forum_name'])),
                             'active_page' => 'moderate',
                             'page' => $p,
                             'id' => $id,
@@ -286,7 +286,7 @@ public function dealposts($fid)
 
             $this->feather->view2->setPageInfo(array(
                         'action'    =>    'multi',
-                        'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Moderate')),
                         'active_page' => 'moderate',
                         'id'    =>    $fid,
                         'topics'    =>    implode(',', array_map('intval', array_keys($topics))),
@@ -307,7 +307,7 @@ public function dealposts($fid)
             }
 
             $this->feather->view2->setPageInfo(array(
-                        'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Moderate')),
                         'active_page' => 'moderate',
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
@@ -327,7 +327,7 @@ public function dealposts($fid)
             }
 
             $this->feather->view2->setPageInfo(array(
-                        'title' => array(feather_escape($this->config['o_board_title']), __('Moderate')),
+                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Moderate')),
                         'active_page' => 'moderate',
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
diff --git a/controller/post.php b/controller/post.php
index 9a27fdd4..3b0ca311 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -199,7 +199,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
         );
 
         $this->feather->view2->setPageInfo(array(
-                            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), $action),
+                            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), $action),
                             'required_fields' => $required_fields,
                             'focus_element' => $focus_element,
                             'active_page' => 'post',
diff --git a/controller/profile.php b/controller/profile.php
index c0baa91a..8bdf1f93 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -64,7 +64,7 @@ public function display($id, $section = null)
             $this->model->delete_user($id, $this->feather);
 
             $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Confirm delete user')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Confirm delete user')),
                 'active_page' => 'profile',
                 'username' => $this->model->get_username($id),
                 'id' => $id,
@@ -108,7 +108,7 @@ public function display($id, $section = null)
                 $user_info = $this->model->parse_user_info($user);
 
             $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), sprintf(__('Users profile'), feather_escape($user['username']))),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), sprintf(__('Users profile'), $this->feather->utils->escape($user['username']))),
                 'active_page' => 'profile',
                 'user_info' => $user_info,
                 'id' => $id
@@ -120,7 +120,7 @@ public function display($id, $section = null)
                 $user_disp = $this->model->edit_essentials($id, $user);
 
                 $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section essentials')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Section essentials')),
                     'required_fields' => array('req_username' => __('Username'), 'req_email' => __('Email')),
                     'active_page' => 'profile',
                     'id' => $id,
@@ -135,11 +135,11 @@ public function display($id, $section = null)
 
             } elseif ($section == 'personal') {
                 if ($this->user->g_set_title == '1') {
-                    $title_field = '<label>'.__('Title').' <em>('.__('Leave blank').')</em><br /><input type="text" name="title" value="'.feather_escape($user['title']).'" size="30" maxlength="50" /><br /></label>'."\n";
+                    $title_field = '<label>'.__('Title').' <em>('.__('Leave blank').')</em><br /><input type="text" name="title" value="'.$this->feather->utils->escape($user['title']).'" size="30" maxlength="50" /><br /></label>'."\n";
                 }
 
                 $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personal')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Section personal')),
                     'active_page' => 'profile',
                     'id' => $id,
                     'page' => 'personal',
@@ -152,7 +152,7 @@ public function display($id, $section = null)
             } elseif ($section == 'messaging') {
 
                 $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section messaging')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Section messaging')),
                     'active_page' => 'profile',
                     'page' => 'messaging',
                     'user' => $user,
@@ -182,7 +182,7 @@ public function display($id, $section = null)
                 }
 
                 $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section personality')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Section personality')),
                     'active_page' => 'profile',
                     'user_avatar' => $user_avatar,
                     'avatar_field' => $avatar_field,
@@ -197,7 +197,7 @@ public function display($id, $section = null)
             } elseif ($section == 'display') {
 
                 $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section display')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Section display')),
                     'active_page' => 'profile',
                     'page' => 'display',
                     'user' => $user,
@@ -209,7 +209,7 @@ public function display($id, $section = null)
             } elseif ($section == 'privacy') {
 
                 $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section privacy')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Section privacy')),
                     'active_page' => 'profile',
                     'page' => 'privacy',
                     'user' => $user,
@@ -225,7 +225,7 @@ public function display($id, $section = null)
                 }
 
                 $this->feather->view2->setPageInfo(array(
-                    'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Section admin')),
+                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Section admin')),
                     'active_page' => 'profile',
                     'page' => 'admin',
                     'user' => $user,
@@ -260,7 +260,7 @@ public function action($id, $action)
             $this->model->change_pass($id, $this->feather);
 
             $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Change pass')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Change pass')),
                 'active_page' => 'profile',
                 'id' => $id,
                 'required_fields' => array('req_old_password' => __('Old pass'), 'req_new_password1' => __('New pass'), 'req_new_password2' => __('Confirm new pass')),
@@ -273,7 +273,7 @@ public function action($id, $action)
             $this->model->change_email($id, $this->feather);
 
             $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Change email')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Change email')),
                 'active_page' => 'profile',
                 'required_fields' => array('req_new_email' => __('New email'), 'req_password' => __('Password')),
                 'focus_element' => array('change_email', 'req_new_email'),
@@ -296,7 +296,7 @@ public function action($id, $action)
             }
 
             $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Profile'), __('Upload avatar')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Upload avatar')),
                 'active_page' => 'profile',
                 'required_fields' =>  array('req_file' => __('File')),
                 'focus_element' => array('upload_avatar', 'req_file'),
diff --git a/controller/register.php b/controller/register.php
index 98249519..3eb7ebce 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -63,7 +63,7 @@ public function display()
         }
 
             $this->feather->view2->setPageInfo(array(
-                        'title' => array(feather_escape($this->config['o_board_title']), __('Register')),
+                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Register')),
                         'focus_element' => array('register', 'req_user'),
                         'required_fields' => array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => __('Confirm pass'), 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => __('Robot title')),
                         'active_page' => 'register',
@@ -102,7 +102,7 @@ public function rules()
         }
 
         $this->feather->view2->setPageInfo(array(
-                            'title' => array(feather_escape($this->config['o_board_title']), __('Register'), __('Forum rules')),
+                            'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Register'), __('Forum rules')),
                             'active_page' => 'register',
                             )
                     )->addTemplate('register/rules.php')->display();
diff --git a/controller/search.php b/controller/search.php
index d96cba10..02e02f04 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -51,7 +51,7 @@ public function display()
                     }
 
                     $this->feather->view2->setPageInfo(array(
-                        'title' => array(feather_escape($this->config['o_board_title']), __('Search results')),
+                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Search results')),
                         'active_page' => 'search',
                     ));
 
@@ -79,7 +79,7 @@ public function display()
         // Display the form
         else {
             $this->feather->view2->setPageInfo(array(
-                'title' => array(feather_escape($this->config['o_board_title']), __('Search')),
+                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Search')),
                 'active_page' => 'search',
                 'focus_element' => array('search', 'keywords'),
                 'is_indexed' => true,
diff --git a/controller/userlist.php b/controller/userlist.php
index fed9c086..fe59f7e8 100644
--- a/controller/userlist.php
+++ b/controller/userlist.php
@@ -30,7 +30,7 @@ public function display()
         // Determine if we are allowed to view post counts
         $show_post_count = ($this->feather->forum_settings['o_show_post_count'] == '1' || $this->feather->user->is_admmod) ? true : false;
 
-        $username = $this->feather->request->get('username') && $this->feather->user->g_search_users == '1' ? feather_trim($this->feather->request->get('username')) : '';
+        $username = $this->feather->request->get('username') && $this->feather->user->g_search_users == '1' ? $this->feather->utils->trim($this->feather->request->get('username')) : '';
         $show_group = $this->feather->request->get('show_group') ? intval($this->feather->request->get('show_group')) : -1;
         $sort_by = $this->feather->request->get('sort_by') && (in_array($this->feather->request->get('sort_by'), array('username', 'registered')) || ($this->feather->request->get('sort_by') == 'num_posts' && $show_post_count)) ? $this->feather->request->get('sort_by') : 'username';
         $sort_dir = $this->feather->request->get('sort_dir') && $this->feather->request->get('sort_dir') == 'DESC' ? 'DESC' : 'ASC';
@@ -54,7 +54,7 @@ public function display()
         $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), __('User list')),
+            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('User list')),
             'active_page' => 'userlist',
             'page_number'  =>  $p,
             'paging_links'  =>  $paging_links,
diff --git a/controller/viewforum.php b/controller/viewforum.php
index 694c4712..1d292f46 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -84,7 +84,7 @@ public function display($id, $name = null, $page = null)
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), feather_escape($cur_forum['forum_name'])),
+            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), $this->feather->utils->escape($cur_forum['forum_name'])),
             'active_page' => 'viewforum',
             'page_number'  =>  $p,
             'paging_links'  =>  $paging_links,
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index 17fb2608..eb7a306c 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -108,7 +108,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->feather->forum_settings['o_board_title']), feather_escape($cur_topic['forum_name']), feather_escape($cur_topic['subject'])),
+            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), $this->feather->utils->escape($cur_topic['forum_name']), $this->feather->utils->escape($cur_topic['subject'])),
             'active_page' => 'viewtopic',
             'page_number'  =>  $p,
             'paging_links'  =>  $paging_links,
diff --git a/extern.php b/extern.php
index 78bf3732..916b8b46 100644
--- a/extern.php
+++ b/extern.php
@@ -87,7 +87,7 @@ function featherbb_write_cache_file($file, $content)
 {
     $fh = @fopen(FORUM_CACHE_DIR.$file, 'wb');
     if (!$fh) {
-        error('Unable to write cache file '.feather_escape($file).' to cache directory. Please make sure PHP has write access to the directory \''.feather_escape(FORUM_CACHE_DIR).'\'', __FILE__, __LINE__);
+        error('Unable to write cache file '.$feather->utils->escape($file).' to cache directory. Please make sure PHP has write access to the directory \''.$feather->utils->escape(FORUM_CACHE_DIR).'\'', __FILE__, __LINE__);
     }
 
     flock($fh, LOCK_EX);
@@ -286,9 +286,9 @@ function output_rss($feed)
     echo '<?xml version="1.0" encoding="utf-8"?>'."\n";
     echo '<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">'."\n";
     echo "\t".'<channel>'."\n";
-    echo "\t\t".'<atom:link href="'.feather_escape(get_current_url()).'" rel="self" type="application/rss+xml" />'."\n";
+    echo "\t\t".'<atom:link href="'.$feather->utils->escape(get_current_url()).'" rel="self" type="application/rss+xml" />'."\n";
     echo "\t\t".'<title><![CDATA['.escape_cdata($feed['title']).']]></title>'."\n";
-    echo "\t\t".'<link>'.feather_escape($feed['link']).'</link>'."\n";
+    echo "\t\t".'<link>'.$feather->utils->escape($feed['link']).'</link>'."\n";
     echo "\t\t".'<description><![CDATA['.escape_cdata($feed['description']).']]></description>'."\n";
     echo "\t\t".'<lastBuildDate>'.gmdate('r', count($feed['items']) ? $feed['items'][0]['pubdate'] : time()).'</lastBuildDate>'."\n";
 
@@ -301,11 +301,11 @@ function output_rss($feed)
     foreach ($feed['items'] as $item) {
         echo "\t\t".'<item>'."\n";
         echo "\t\t\t".'<title><![CDATA['.escape_cdata($item['title']).']]></title>'."\n";
-        echo "\t\t\t".'<link>'.feather_escape($item['link']).'</link>'."\n";
+        echo "\t\t\t".'<link>'.$feather->utils->escape($item['link']).'</link>'."\n";
         echo "\t\t\t".'<description><![CDATA['.escape_cdata($item['description']).']]></description>'."\n";
         echo "\t\t\t".'<author><![CDATA['.(isset($item['author']['email']) ? escape_cdata($item['author']['email']) : 'dummy@example.com').' ('.escape_cdata($item['author']['name']).')]]></author>'."\n";
         echo "\t\t\t".'<pubDate>'.gmdate('r', $item['pubdate']).'</pubDate>'."\n";
-        echo "\t\t\t".'<guid>'.feather_escape($item['link']).'</guid>'."\n";
+        echo "\t\t\t".'<guid>'.$feather->utils->escape($item['link']).'</guid>'."\n";
 
         echo "\t\t".'</item>'."\n";
     }
@@ -330,8 +330,8 @@ function output_atom($feed)
     echo '<feed xmlns="http://www.w3.org/2005/Atom">'."\n";
 
     echo "\t".'<title type="html"><![CDATA['.escape_cdata($feed['title']).']]></title>'."\n";
-    echo "\t".'<link rel="self" href="'.feather_escape(get_current_url()).'"/>'."\n";
-    echo "\t".'<link href="'.feather_escape($feed['link']).'"/>'."\n";
+    echo "\t".'<link rel="self" href="'.$feather->utils->escape(get_current_url()).'"/>'."\n";
+    echo "\t".'<link href="'.$feather->utils->escape($feed['link']).'"/>'."\n";
     echo "\t".'<updated>'.gmdate('Y-m-d\TH:i:s\Z', count($feed['items']) ? $feed['items'][0]['pubdate'] : time()).'</updated>'."\n";
 
     if ($feather->forum_settings['o_show_version'] == '1') {
@@ -340,14 +340,14 @@ function output_atom($feed)
         echo "\t".'<generator>FluxBB</generator>'."\n";
     }
 
-    echo "\t".'<id>'.feather_escape($feed['link']).'</id>'."\n";
+    echo "\t".'<id>'.$feather->utils->escape($feed['link']).'</id>'."\n";
 
     $content_tag = ($feed['type'] == 'posts') ? 'content' : 'summary';
 
     foreach ($feed['items'] as $item) {
         echo "\t".'<entry>'."\n";
         echo "\t\t".'<title type="html"><![CDATA['.escape_cdata($item['title']).']]></title>'."\n";
-        echo "\t\t".'<link rel="alternate" href="'.feather_escape($item['link']).'"/>'."\n";
+        echo "\t\t".'<link rel="alternate" href="'.$feather->utils->escape($item['link']).'"/>'."\n";
         echo "\t\t".'<'.$content_tag.' type="html"><![CDATA['.escape_cdata($item['description']).']]></'.$content_tag.'>'."\n";
         echo "\t\t".'<author>'."\n";
         echo "\t\t\t".'<name><![CDATA['.escape_cdata($item['author']['name']).']]></name>'."\n";
@@ -357,13 +357,13 @@ function output_atom($feed)
         }
 
         if (isset($item['author']['uri'])) {
-            echo "\t\t\t".'<uri>'.feather_escape($item['author']['uri']).'</uri>'."\n";
+            echo "\t\t\t".'<uri>'.$feather->utils->escape($item['author']['uri']).'</uri>'."\n";
         }
 
         echo "\t\t".'</author>'."\n";
         echo "\t\t".'<updated>'.gmdate('Y-m-d\TH:i:s\Z', $item['pubdate']).'</updated>'."\n";
 
-        echo "\t\t".'<id>'.feather_escape($item['link']).'</id>'."\n";
+        echo "\t\t".'<id>'.$feather->utils->escape($item['link']).'</id>'."\n";
         echo "\t".'</entry>'."\n";
     }
 
@@ -384,7 +384,7 @@ function output_xml($feed)
 
     echo '<?xml version="1.0" encoding="utf-8"?>'."\n";
     echo '<source>'."\n";
-    echo "\t".'<url>'.feather_escape($feed['link']).'</url>'."\n";
+    echo "\t".'<url>'.$feather->utils->escape($feed['link']).'</url>'."\n";
 
     $forum_tag = ($feed['type'] == 'posts') ? 'post' : 'topic';
 
@@ -392,7 +392,7 @@ function output_xml($feed)
         echo "\t".'<'.$forum_tag.' id="'.$item['id'].'">'."\n";
 
         echo "\t\t".'<title><![CDATA['.escape_cdata($item['title']).']]></title>'."\n";
-        echo "\t\t".'<link>'.feather_escape($item['link']).'</link>'."\n";
+        echo "\t\t".'<link>'.$feather->utils->escape($item['link']).'</link>'."\n";
         echo "\t\t".'<content><![CDATA['.escape_cdata($item['description']).']]></content>'."\n";
         echo "\t\t".'<author>'."\n";
         echo "\t\t\t".'<name><![CDATA['.escape_cdata($item['author']['name']).']]></name>'."\n";
@@ -402,7 +402,7 @@ function output_xml($feed)
         }
 
         if (isset($item['author']['uri'])) {
-            echo "\t\t\t".'<uri>'.feather_escape($item['author']['uri']).'</uri>'."\n";
+            echo "\t\t\t".'<uri>'.$feather->utils->escape($item['author']['uri']).'</uri>'."\n";
         }
 
         echo "\t\t".'</author>'."\n";
@@ -428,12 +428,12 @@ function output_html($feed)
 
     foreach ($feed['items'] as $item) {
         if (utf8_strlen($item['title']) > FORUM_EXTERN_MAX_SUBJECT_LENGTH) {
-            $subject_truncated = feather_escape(feather_trim(utf8_substr($item['title'], 0, (FORUM_EXTERN_MAX_SUBJECT_LENGTH - 5)))).' …';
+            $subject_truncated = $feather->utils->escape($feather->utils->trim(utf8_substr($item['title'], 0, (FORUM_EXTERN_MAX_SUBJECT_LENGTH - 5)))).' …';
         } else {
-            $subject_truncated = feather_escape($item['title']);
+            $subject_truncated = $feather->utils->escape($item['title']);
         }
 
-        echo '<li><a href="'.feather_escape($item['link']).'" title="'.feather_escape($item['title']).'">'.$subject_truncated.'</a></li>'."\n";
+        echo '<li><a href="'.$feather->utils->escape($item['link']).'" title="'.$feather->utils->escape($item['title']).'">'.$subject_truncated.'</a></li>'."\n";
     }
 }
 
@@ -540,7 +540,7 @@ function output_html($feed)
 
         // Were any forum IDs supplied?
         if (isset($_GET['fid']) && is_scalar($_GET['fid']) && $_GET['fid'] != '') {
-            $fids = explode(',', feather_trim($_GET['fid']));
+            $fids = explode(',', $feather->utils->trim($_GET['fid']));
             $fids = array_map('intval', $fids);
 
             if (!empty($fids)) {
@@ -569,7 +569,7 @@ function output_html($feed)
 
         // Any forum IDs to exclude?
         if (isset($_GET['nfid']) && is_scalar($_GET['nfid']) && $_GET['nfid'] != '') {
-            $nfids = explode(',', feather_trim($_GET['nfid']));
+            $nfids = explode(',', $feather->utils->trim($_GET['nfid']));
             $nfids = array_map('intval', $nfids);
 
             if (!empty($nfids)) {
@@ -700,7 +700,7 @@ function output_html($feed)
 
     foreach ($result as $feather_user_online) {
         if ($feather_user_online['user_id'] > 1) {
-            $users[] = ($feather->user->g_view_users == '1') ? '<a href="'.get('user/'.$feather_user_online['user_id'].'/').'">'.feather_escape($feather_user_online['ident']).'</a>' : feather_escape($feather_user_online['ident']);
+            $users[] = ($feather->user->g_view_users == '1') ? '<a href="'.get('user/'.$feather_user_online['user_id'].'/').'">'.$feather->utils->escape($feather_user_online['ident']).'</a>' : $feather->utils->escape($feather_user_online['ident']);
             ++$num_users;
         } else {
             ++$num_guests;
@@ -713,12 +713,12 @@ function output_html($feed)
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
 
-    echo sprintf(__('Guests online'), forum_number_format($num_guests)).'<br />'."\n";
+    echo sprintf(__('Guests online'), $feather->utils->forum_number_format($num_guests)).'<br />'."\n";
 
     if ($action == 'online_full' && !empty($users)) {
         echo sprintf(__('Users online'), implode(', ', $users)).'<br />'."\n";
     } else {
-        echo sprintf(__('Users online'), forum_number_format($num_users)).'<br />'."\n";
+        echo sprintf(__('Users online'), $feather->utils->forum_number_format($num_users)).'<br />'."\n";
     }
 
     exit;
@@ -747,10 +747,10 @@ function output_html($feed)
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
 
-    echo sprintf(__('No of users'), forum_number_format($stats['total_users'])).'<br />'."\n";
-    echo sprintf(__('Newest user'), (($feather->user->g_view_users == '1') ? '<a href="'.get('user/'.$stats['last_user']['id'].'/').'">'.feather_escape($stats['last_user']['username']).'</a>' : feather_escape($stats['last_user']['username']))).'<br />'."\n";
-    echo sprintf(__('No of topics'), forum_number_format($stats['total_topics'])).'<br />'."\n";
-    echo sprintf(__('No of posts'), forum_number_format($stats['total_posts'])).'<br />'."\n";
+    echo sprintf(__('No of users'), $feather->utils->forum_number_format($stats['total_users'])).'<br />'."\n";
+    echo sprintf(__('Newest user'), (($feather->user->g_view_users == '1') ? '<a href="'.get('user/'.$stats['last_user']['id'].'/').'">'.$feather->utils->escape($stats['last_user']['username']).'</a>' : $feather->utils->escape($stats['last_user']['username']))).'<br />'."\n";
+    echo sprintf(__('No of topics'), $feather->utils->forum_number_format($stats['total_topics'])).'<br />'."\n";
+    echo sprintf(__('No of posts'), $feather->utils->forum_number_format($stats['total_posts'])).'<br />'."\n";
 
     exit;
 }
diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index 4932c96b..85ffd208 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -177,7 +177,7 @@ public function check_bans()
                 \DB::for_table('online')
                     ->where('ident', $this->app->user->username)
                     ->delete_many();
-                message(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.feather_escape($this->app->forum_settings['o_admin_email']).'">'.feather_escape($this->app->forum_settings['o_admin_email']).'</a>.', true, true, true);
+                message(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower($this->app->utils->format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.$this->app->utils->escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.$this->app->utils->escape($this->app->forum_settings['o_admin_email']).'">'.$this->app->utils->escape($this->app->forum_settings['o_admin_email']).'</a>.', true, true);
             }
         }
 
@@ -195,7 +195,7 @@ public function maintenance_message()
         $message = str_replace($pattern, $replace, $this->app->forum_settings['o_maintenance_message']);
 
         $this->app->view2->setPageInfo(array(
-            'title' => array(feather_escape($this->app->forum_settings['o_board_title']), __('Maintenance')),
+            'title' => array($this->app->utils->escape($this->app->forum_settings['o_board_title']), __('Maintenance')),
             'active_page' => 'index',
             'message'    =>    $message,
             'no_back_link'    =>    '',
diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index 79c413fc..e05956b8 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -179,8 +179,12 @@ public function call()
 
         // Populate Slim object with forum_env vars
         $this->hydrate('forum_env', $this->forum_env);
+        // Load FeatherBB utils class
+        $this->app->container->singleton('utils', function () {
+            return new \FeatherBB\Utils();
+        });
         // Record start time
-        $this->app->start = get_microtime();
+        $this->app->start = $this->app->utils->get_microtime();
         // Define now var
         $this->app->now = function () {
             return time();
diff --git a/include/classes/email.class.php b/include/classes/email.class.php
index e960ba55..39c2602b 100644
--- a/include/classes/email.class.php
+++ b/include/classes/email.class.php
@@ -124,7 +124,7 @@ public function bbcode2email($text, $wrap_length = 72)
             $base_url = $this->feather->url->base();
         }
 
-        $text = feather_trim($text, "\t\n ");
+        $text = $this->feather->utils->trim($text, "\t\n ");
 
         $shortcut_urls = array(
             'topic' => '/topic/$1/',
@@ -266,12 +266,12 @@ public function feather_mail($to, $subject, $message, $reply_to_email = '', $rep
         $from_email = $this->config['o_webmaster_email'];
 
         // Do a little spring cleaning
-        $to = feather_trim(preg_replace('%[\n\r]+%s', '', $to));
-        $subject = feather_trim(preg_replace('%[\n\r]+%s', '', $subject));
-        $from_email = feather_trim(preg_replace('%[\n\r:]+%s', '', $from_email));
-        $from_name = feather_trim(preg_replace('%[\n\r:]+%s', '', str_replace('"', '', $from_name)));
-        $reply_to_email = feather_trim(preg_replace('%[\n\r:]+%s', '', $reply_to_email));
-        $reply_to_name = feather_trim(preg_replace('%[\n\r:]+%s', '', str_replace('"', '', $reply_to_name)));
+        $to = $this->feather->utils->trim(preg_replace('%[\n\r]+%s', '', $to));
+        $subject = $this->feather->utils->trim(preg_replace('%[\n\r]+%s', '', $subject));
+        $from_email = $this->feather->utils->trim(preg_replace('%[\n\r:]+%s', '', $from_email));
+        $from_name = $this->feather->utils->trim(preg_replace('%[\n\r:]+%s', '', str_replace('"', '', $from_name)));
+        $reply_to_email = $this->feather->utils->trim(preg_replace('%[\n\r:]+%s', '', $reply_to_email));
+        $reply_to_name = $this->feather->utils->trim(preg_replace('%[\n\r:]+%s', '', str_replace('"', '', $reply_to_name)));
 
         // Set up some headers to take advantage of UTF-8
         $from = '"' . $this->encode_mail_text($from_name) . '" <' . $from_email . '>';
@@ -287,7 +287,7 @@ public function feather_mail($to, $subject, $message, $reply_to_email = '', $rep
         }
 
         // Make sure all linebreaks are LF in message (and strip out any NULL bytes)
-        $message = str_replace("\0", '', feather_linebreaks($message));
+        $message = str_replace("\0", '', $this->feather->utils->linebreaks($message));
         $message = str_replace("\n", $EOL, $message);
 
         if ($smtp) {
diff --git a/include/classes/search.class.php b/include/classes/search.class.php
index 7eacc72a..4d1ab048 100644
--- a/include/classes/search.class.php
+++ b/include/classes/search.class.php
@@ -56,10 +56,10 @@ public function split_words($text, $idx)
         $text = preg_replace('%\[/?(b|u|s|ins|del|em|i|h|colou?r|quote|code|img|url|email|list|topic|post|forum|user)(?:\=[^\]]*)?\]%', ' ', $text);
 
         // Remove any apostrophes or dashes which aren't part of words
-        $text = substr(ucp_preg_replace('%((?<=[^\p{L}\p{N}])[\'\-]|[\'\-](?=[^\p{L}\p{N}]))%u', '', ' ' . $text . ' '), 1, -1);
+        $text = substr($this->feather->utils->ucp_preg_replace('%((?<=[^\p{L}\p{N}])[\'\-]|[\'\-](?=[^\p{L}\p{N}]))%u', '', ' ' . $text . ' '), 1, -1);
 
         // Remove punctuation and symbols (actually anything that isn't a letter or number), allow apostrophes and dashes (and % * if we aren't indexing)
-        $text = ucp_preg_replace('%(?![\'\-' . ($idx ? '' : '\%\*') . '])[^\p{L}\p{N}]+%u', ' ', $text);
+        $text = $this->feather->utils->ucp_preg_replace('%(?![\'\-' . ($idx ? '' : '\%\*') . '])[^\p{L}\p{N}]+%u', ' ', $text);
 
         // Replace multiple whitespace or dashes
         $text = preg_replace('%(\s){2,}%u', '\1', $text);
@@ -86,19 +86,16 @@ public function validate_search_word($word, $idx)
     {
         static $stopwords;
 
-        // Get Slim current session
-        $feather = \Slim\Slim::getInstance();
-
         // If the word is a keyword we don't want to index it, but we do want to be allowed to search it
         if ($this->is_keyword($word)) {
             return !$idx;
         }
 
         if (!isset($stopwords)) {
-            if (!$feather->cache->isCached('stopwords')) {
-                $feather->cache->store('stopwords', \model\cache::get_config(), '+1 week');
+            if (!$this->feather->cache->isCached('stopwords')) {
+                $this->feather->cache->store('stopwords', \model\cache::get_config(), '+1 week');
             }
-            $stopwords = $feather->cache->retrieve('stopwords');
+            $stopwords = $this->feather->cache->retrieve('stopwords');
         }
 
         // If it is a stopword it isn't valid
@@ -115,7 +112,7 @@ public function validate_search_word($word, $idx)
         $word = str_replace(array('%', '*'), '', $word);
 
         // Check the word is within the min/max length
-        $num_chars = feather_strlen($word);
+        $num_chars = $this->feather->utils->strlen($word);
         return $num_chars >= FEATHER_SEARCH_MIN_WORD && $num_chars <= FEATHER_SEARCH_MAX_WORD;
     }
 
diff --git a/include/classes/url.class.php b/include/classes/url.class.php
index 0798aa2d..6b70dd86 100644
--- a/include/classes/url.class.php
+++ b/include/classes/url.class.php
@@ -588,6 +588,11 @@ class Url
 
                                 );
 
+    public function __construct()
+    {
+        $this->feather = \Slim\Slim::getInstance();
+    }
+
     //
     // Generate a string with numbered links (for multipage scripts)
     //
@@ -623,9 +628,9 @@ public function paginate($num_pages, $cur_page, $link, $args = null)
                 if ($current < 1 || $current > $num_pages) {
                     continue;
                 } elseif ($current != $cur_page || $link_to_all) {
-                    $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.str_replace('#', '', $this->get_sublink($link, 'page/$1', $current, $args)).'">'.forum_number_format($current).'</a>';
+                    $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.str_replace('#', '', $this->get_sublink($link, 'page/$1', $current, $args)).'">'.$this->feather->utils->forum_number_format($current).'</a>';
                 } else {
-                    $pages[] = '<strong'.(empty($pages) ? ' class="item1"' : '').'>'.forum_number_format($current).'</strong>';
+                    $pages[] = '<strong'.(empty($pages) ? ' class="item1"' : '').'>'.$this->feather->utils->forum_number_format($current).'</strong>';
                 }
             }
 
@@ -634,7 +639,7 @@ public function paginate($num_pages, $cur_page, $link, $args = null)
                     $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
                 }
 
-                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$this->get_sublink($link, 'page/$1', $num_pages, $args).'">'.forum_number_format($num_pages).'</a>';
+                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$this->get_sublink($link, 'page/$1', $num_pages, $args).'">'.$this->feather->utils->forum_number_format($num_pages).'</a>';
             }
 
             // Add a next page link
@@ -682,9 +687,9 @@ public function paginate_old($num_pages, $cur_page, $link)
                 if ($current < 1 || $current > $num_pages) {
                     continue;
                 } elseif ($current != $cur_page || $link_to_all) {
-                    $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.($current == 1 ? '' : '&amp;p='.$current).'">'.forum_number_format($current).'</a>';
+                    $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.($current == 1 ? '' : '&amp;p='.$current).'">'.$this->feather->utils->forum_number_format($current).'</a>';
                 } else {
-                    $pages[] = '<strong'.(empty($pages) ? ' class="item1"' : '').'>'.forum_number_format($current).'</strong>';
+                    $pages[] = '<strong'.(empty($pages) ? ' class="item1"' : '').'>'.$this->feather->utils->forum_number_format($current).'</strong>';
                 }
             }
 
@@ -693,7 +698,7 @@ public function paginate_old($num_pages, $cur_page, $link)
                     $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
                 }
 
-                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.$num_pages.'">'.forum_number_format($num_pages).'</a>';
+                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.$num_pages.'">'.$this->feather->utils->forum_number_format($num_pages).'</a>';
             }
 
             // Add a next page link
@@ -713,7 +718,7 @@ public function url_friendly($str)
     {
         $str = strtr($str, $this->url_replace);
         $str = strtolower(utf8_decode($str));
-        $str = feather_trim(preg_replace(array('/[^a-z0-9\s]/', '/[\s]+/'), array('', '-'), $str), '-');
+        $str = $this->feather->utils->trim(preg_replace(array('/[^a-z0-9\s]/', '/[\s]+/'), array('', '-'), $str), '-');
 
         if (empty($str)) {
             $str = 'view';
diff --git a/include/classes/utils.class.php b/include/classes/utils.class.php
index 67ea590c..d20a8884 100644
--- a/include/classes/utils.class.php
+++ b/include/classes/utils.class.php
@@ -11,20 +11,168 @@
 
 class Utils
 {
-    protected static $paths = array('include/classes/');
+    public function __construct()
+    {
+        $this->feather = \Slim\Slim::getInstance();
+    }
 
-    public static function autoload($class)
+    //
+    // Return current timestamp (with microseconds) as a float
+    //
+    function get_microtime()
     {
-        foreach (self::$paths as $path) {
-            $class_file = $path.strtolower(str_replace(__NAMESPACE__.'\\', '', $class)).'.class.php';
-            if (is_file($class_file)) {
-                require $class_file;
+        list($usec, $sec) = explode(' ', microtime());
+        return ((float)$usec + (float)$sec);
+    }
+
+    //
+    // Replace four-byte characters with a question mark
+    //
+    // As MySQL cannot properly handle four-byte characters with the default utf-8
+    // charset up until version 5.5.3 (where a special charset has to be used), they
+    // need to be replaced, by question marks in this case.
+    //
+    public function strip_bad_multibyte_chars($str)
+    {
+        $result = '';
+        $length = strlen($str);
+
+        for ($i = 0; $i < $length; $i++) {
+            // Replace four-byte characters (11110www 10zzzzzz 10yyyyyy 10xxxxxx)
+            $ord = ord($str[$i]);
+            if ($ord >= 240 && $ord <= 244) {
+                $result .= '?';
+                $i += 3;
+            } else {
+                $result .= $str[$i];
             }
         }
+
+        return $result;
     }
 
-    public static function registerAutoloader()
+    //
+    // A wrapper for PHP's number_format function
+    //
+    public function forum_number_format($number, $decimals = 0)
     {
-        spl_autoload_register(__NAMESPACE__ . '\Loader::autoload');
+        return is_numeric($number) ? number_format($number, $decimals, __('lang_decimal_point'), __('lang_thousands_sep')) : $number;
+    }
+
+    //
+    // Format a time string according to $time_format and time zones
+    //
+    public function format_time($timestamp, $date_only = false, $date_format = null, $time_format = null, $time_only = false, $no_text = false)
+    {
+        global $forum_date_formats, $forum_time_formats;
+
+        if ($timestamp == '') {
+            return __('Never');
+        }
+
+        $diff = ($this->feather->user->timezone + $this->feather->user->dst) * 3600;
+        $timestamp += $diff;
+        $now = time();
+
+        if (is_null($date_format)) {
+            $date_format = $forum_date_formats[$this->feather->user->date_format];
+        }
+
+        if (is_null($time_format)) {
+            $time_format = $forum_time_formats[$this->feather->user->time_format];
+        }
+
+        $date = gmdate($date_format, $timestamp);
+        $today = gmdate($date_format, $now+$diff);
+        $yesterday = gmdate($date_format, $now+$diff-86400);
+
+        if (!$no_text) {
+            if ($date == $today) {
+                $date = __('Today');
+            } elseif ($date == $yesterday) {
+                $date = __('Yesterday');
+            }
+        }
+
+        if ($date_only) {
+            return $date;
+        } elseif ($time_only) {
+            return gmdate($time_format, $timestamp);
+        } else {
+            return $date.' '.gmdate($time_format, $timestamp);
+        }
+    }
+
+
+    //
+    // Calls htmlspecialchars with a few options already set
+    //
+    public function escape($str)
+    {
+        return htmlspecialchars($str, ENT_QUOTES, 'UTF-8');
+    }
+
+
+    //
+    // A wrapper for utf8_strlen for compatibility
+    //
+    public function strlen($str)
+    {
+        return utf8_strlen($str);
+    }
+
+
+    //
+    // Convert \r\n and \r to \n
+    //
+    public function linebreaks($str)
+    {
+        return str_replace(array("\r\n", "\r"), "\n", $str);
+    }
+
+
+    //
+    // A wrapper for utf8_trim for compatibility
+    //
+    public function trim($str, $charlist = false)
+    {
+        return is_string($str) ? utf8_trim($str, $charlist) : '';
+    }
+
+    //
+    // Checks if a string is in all uppercase
+    //
+    public function is_all_uppercase($string)
+    {
+        return utf8_strtoupper($string) == $string && utf8_strtolower($string) != $string;
+    }
+
+    //
+    // Replace string matching regular expression
+    //
+    // This function takes care of possibly disabled unicode properties in PCRE builds
+    //
+    public function ucp_preg_replace($pattern, $replace, $subject, $callback = false)
+    {
+        if ($callback) {
+            $replaced = preg_replace_callback($pattern, create_function('$matches', 'return '.$replace.';'), $subject);
+        } else {
+            $replaced = preg_replace($pattern, $replace, $subject);
+        }
+
+        // If preg_replace() returns false, this probably means unicode support is not built-in, so we need to modify the pattern a little
+        if ($replaced === false) {
+            if (is_array($pattern)) {
+                foreach ($pattern as $cur_key => $cur_pattern) {
+                    $pattern[$cur_key] = str_replace('\p{L}\p{N}', '\w', $cur_pattern);
+                }
+
+                $replaced = preg_replace($pattern, $replace, $subject);
+            } else {
+                $replaced = preg_replace(str_replace('\p{L}\p{N}', '\w', $pattern), $replace, $subject);
+            }
+        }
+
+        return $replaced;
     }
 }
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index d63e8881..0df5a0c0 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -24,7 +24,6 @@ class View
         'admin_console' => 'boolval',
         'has_reports' => 'boolval',
         'paging_links' => 'strval',
-        'has_reports' => 'boolval',
         'footer_style' => 'strval',
         'fid' => 'intval',
         'pid' => 'intval',
@@ -300,7 +299,7 @@ public function addAsset($type, $asset, $params = array())
 
         $params = array_merge(static::getDefaultParams($type), $params);
         if (isset($params['title'])) {
-            $params['title'] = feather_escape($params['title']);
+            $params['title'] = $this->app->utils->escape($params['title']);
         }
         $this->assets[$type][] = array(
             'file' => (string) $asset,
@@ -367,7 +366,7 @@ protected function getDefaultPageInfo()
         }
 
         $data = array(
-            'title' => feather_escape($this->app->forum_settings['o_board_title']),
+            'title' => $this->app->utils->escape($this->app->forum_settings['o_board_title']),
             'page_number' => null,
             'active_page' => 'index',
             'focus_element' => null,
diff --git a/include/common_admin.php b/include/common_admin.php
index a166af6a..5c10847c 100644
--- a/include/common_admin.php
+++ b/include/common_admin.php
@@ -19,7 +19,7 @@
 if (file_exists(FEATHER_ROOT.'lang/'.$feather->user->language.'/admin/common.mo')) {
     load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/admin/common.mo');
 } else {
-    die('There is no valid language pack \''.feather_escape($feather->user->language).'\' installed. Please reinstall a language of that name');
+    die('There is no valid language pack \''.$feather->utils->escape($feather->user->language).'\' installed. Please reinstall a language of that name');
 }
 
 // To be removed
diff --git a/include/functions.php b/include/functions.php
index 6c27ec5e..f0356c81 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -8,17 +8,6 @@
  */
 
 
-
-//
-// Return current timestamp (with microseconds) as a float
-//
-function get_microtime()
-{
-    list($usec, $sec) = explode(' ', microtime());
-    return ((float)$usec + (float)$sec);
-}
-
-
 //
 // Fetch admin IDs
 //
@@ -51,9 +40,9 @@ function check_username($username, $errors, $exclude_id = null)
     $username = preg_replace('%\s+%s', ' ', $username);
 
     // Validate username
-    if (feather_strlen($username) < 2) {
+    if ($feather->utils->strlen($username) < 2) {
         $errors[] = __('Username too short');
-    } elseif (feather_strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
+    } elseif ($feather->utils->strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
         $errors[] = __('Username too long');
     } elseif (!strcasecmp($username, 'Guest') || !utf8_strcasecmp($username, __('Guest'))) {
         $errors[] = __('Username guest');
@@ -73,11 +62,11 @@ function check_username($username, $errors, $exclude_id = null)
     // Check that the username (or a too similar username) is not already registered
     $query = (!is_null($exclude_id)) ? ' AND id!='.$exclude_id : '';
 
-    $result = \DB::for_table('online')->raw_query('SELECT username FROM '.$feather->forum_settings['db_prefix'].'users WHERE (UPPER(username)=UPPER(:username1) OR UPPER(username)=UPPER(:username2)) AND id>1'.$query, array(':username1' => $username, ':username2' => ucp_preg_replace('%[^\p{L}\p{N}]%u', '', $username)))->find_one();
+    $result = \DB::for_table('online')->raw_query('SELECT username FROM '.$feather->forum_settings['db_prefix'].'users WHERE (UPPER(username)=UPPER(:username1) OR UPPER(username)=UPPER(:username2)) AND id>1'.$query, array(':username1' => $username, ':username2' => $feather->utils->ucp_preg_replace('%[^\p{L}\p{N}]%u', '', $username)))->find_one();
 
     if ($result) {
         $busy = $result['username'];
-        $errors[] = __('Username dupe 1').' '.feather_escape($busy).'. '.__('Username dupe 2');
+        $errors[] = __('Username dupe 1').' '.$feather->utils->escape($busy).'. '.__('Username dupe 2');
     }
 
     // Check username for any banned usernames
@@ -106,7 +95,7 @@ function generate_avatar_markup($user_id)
         $path = $feather->config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type;
 
         if (file_exists(FEATHER_ROOT.$path) && $img_size = getimagesize(FEATHER_ROOT.$path)) {
-            $avatar_markup = '<img src="'.feather_escape($feather->url->base(true).'/'.$path.'?m='.filemtime(FEATHER_ROOT.$path)).'" '.$img_size[3].' alt="" />';
+            $avatar_markup = '<img src="'.$feather->utils->escape($feather->url->base(true).'/'.$path.'?m='.filemtime(FEATHER_ROOT.$path)).'" '.$img_size[3].' alt="" />';
             break;
         }
     }
@@ -120,6 +109,8 @@ function generate_avatar_markup($user_id)
 //
 function generate_page_title($page_title, $p = null)
 {
+    $feather = \Slim\Slim::getInstance();
+
     if (!is_array($page_title)) {
         $page_title = array($page_title);
     }
@@ -127,7 +118,7 @@ function generate_page_title($page_title, $p = null)
     $page_title = array_reverse($page_title);
 
     if ($p > 1) {
-        $page_title[0] .= ' ('.sprintf(__('Page'), forum_number_format($p)).')';
+        $page_title[0] .= ' ('.sprintf(__('Page'), $feather->utils->forum_number_format($p)).')';
     }
 
     $crumbs = implode(__('Title separator'), $page_title);
@@ -369,7 +360,7 @@ function censor_words($text)
     }
 
     if (!empty($search_for) && !empty($replace_with)) {
-        return substr(ucp_preg_replace($search_for, $replace_with, ' '.$text.' '), 1, -1);
+        return substr($feather->utils->ucp_preg_replace($search_for, $replace_with, ' '.$text.' '), 1, -1);
     } else {
         return $text;
     }
@@ -385,6 +376,8 @@ function get_title($user)
     global $feather_bans;
     static $ban_list;
 
+    $feather = \Slim\Slim::getInstance();
+
     // If not already built in a previous call, build an array of lowercase banned usernames
     if (empty($ban_list)) {
         $ban_list = array();
@@ -395,7 +388,7 @@ function get_title($user)
 
     // If the user has a custom title
     if ($user['title'] != '') {
-        $user_title = feather_escape($user['title']);
+        $user_title = $feather->utils->escape($user['title']);
     }
     // If the user is banned
     elseif (in_array(utf8_strtolower($user['username']), $ban_list)) {
@@ -403,7 +396,7 @@ function get_title($user)
     }
     // If the user group has a default user title
     elseif ($user['g_user_title'] != '') {
-        $user_title = feather_escape($user['g_user_title']);
+        $user_title = $feather->utils->escape($user['g_user_title']);
     }
     // If the user is a guest
     elseif ($user['g_id'] == FEATHER_GUEST) {
@@ -441,7 +434,7 @@ function message($msg, $http_status = null, $no_back_link = false)
 
     if (!defined('FEATHER_HEADER')) {
         $feather->view2->setPageInfo(array(
-            'title' => array(feather_escape($feather->config['o_board_title']), __('Info')),
+            'title' => array($feather->utils->escape($feather->config['o_board_title']), __('Info')),
         ));
     }
 
@@ -455,63 +448,6 @@ function message($msg, $http_status = null, $no_back_link = false)
 }
 
 
-//
-// Format a time string according to $time_format and time zones
-//
-function format_time($timestamp, $date_only = false, $date_format = null, $time_format = null, $time_only = false, $no_text = false)
-{
-    global $forum_date_formats, $forum_time_formats;
-
-    if ($timestamp == '') {
-        return __('Never');
-    }
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    $diff = ($feather->user->timezone + $feather->user->dst) * 3600;
-    $timestamp += $diff;
-    $now = time();
-
-    if (is_null($date_format)) {
-        $date_format = $forum_date_formats[$feather->user->date_format];
-    }
-
-    if (is_null($time_format)) {
-        $time_format = $forum_time_formats[$feather->user->time_format];
-    }
-
-    $date = gmdate($date_format, $timestamp);
-    $today = gmdate($date_format, $now+$diff);
-    $yesterday = gmdate($date_format, $now+$diff-86400);
-
-    if (!$no_text) {
-        if ($date == $today) {
-            $date = __('Today');
-        } elseif ($date == $yesterday) {
-            $date = __('Yesterday');
-        }
-    }
-
-    if ($date_only) {
-        return $date;
-    } elseif ($time_only) {
-        return gmdate($time_format, $timestamp);
-    } else {
-        return $date.' '.gmdate($time_format, $timestamp);
-    }
-}
-
-
-//
-// A wrapper for PHP's number_format function
-//
-function forum_number_format($number, $decimals = 0)
-{
-    return is_numeric($number) ? number_format($number, $decimals, __('lang_decimal_point'), __('lang_thousands_sep')) : $number;
-}
-
-
 //
 // Generate a random key of length $len
 //
@@ -602,70 +538,6 @@ function feather_hash($str)
 }
 
 
-//
-// Calls htmlspecialchars with a few options already set
-//
-function feather_escape($str)
-{
-    return htmlspecialchars($str, ENT_QUOTES, 'UTF-8');
-}
-
-
-//
-// Calls htmlspecialchars_decode with a few options already set
-//
-function feather_htmlspecialchars_decode($str)
-{
-    if (function_exists('htmlspecialchars_decode')) {
-        return htmlspecialchars_decode($str, ENT_QUOTES);
-    }
-
-    static $translations;
-    if (!isset($translations)) {
-        $translations = get_html_translation_table(HTML_SPECIALCHARS, ENT_QUOTES);
-        $translations['&#039;'] = '\''; // get_html_translation_table doesn't include &#039; which is what htmlspecialchars translates ' to, but apparently that is okay?! http://bugs.php.net/bug.php?id=25927
-        $translations = array_flip($translations);
-    }
-
-    return strtr($str, $translations);
-}
-
-
-//
-// A wrapper for utf8_strlen for compatibility
-//
-function feather_strlen($str)
-{
-    return utf8_strlen($str);
-}
-
-
-//
-// Convert \r\n and \r to \n
-//
-function feather_linebreaks($str)
-{
-    return str_replace(array("\r\n", "\r"), "\n", $str);
-}
-
-
-//
-// A wrapper for utf8_trim for compatibility
-//
-function feather_trim($str, $charlist = false)
-{
-    return is_string($str) ? utf8_trim($str, $charlist) : '';
-}
-
-//
-// Checks if a string is in all uppercase
-//
-function is_all_uppercase($string)
-{
-    return utf8_strtoupper($string) == $string && utf8_strtolower($string) != $string;
-}
-
-
 //
 // Display $message and redirect user to $destination_url
 //
@@ -744,61 +616,6 @@ function forum_list_langs()
     return $languages;
 }
 
-//
-// Replace string matching regular expression
-//
-// This function takes care of possibly disabled unicode properties in PCRE builds
-//
-function ucp_preg_replace($pattern, $replace, $subject, $callback = false)
-{
-    if ($callback) {
-        $replaced = preg_replace_callback($pattern, create_function('$matches', 'return '.$replace.';'), $subject);
-    } else {
-        $replaced = preg_replace($pattern, $replace, $subject);
-    }
-
-    // If preg_replace() returns false, this probably means unicode support is not built-in, so we need to modify the pattern a little
-    if ($replaced === false) {
-        if (is_array($pattern)) {
-            foreach ($pattern as $cur_key => $cur_pattern) {
-                $pattern[$cur_key] = str_replace('\p{L}\p{N}', '\w', $cur_pattern);
-            }
-
-            $replaced = preg_replace($pattern, $replace, $subject);
-        } else {
-            $replaced = preg_replace(str_replace('\p{L}\p{N}', '\w', $pattern), $replace, $subject);
-        }
-    }
-
-    return $replaced;
-}
-
-//
-// Replace four-byte characters with a question mark
-//
-// As MySQL cannot properly handle four-byte characters with the default utf-8
-// charset up until version 5.5.3 (where a special charset has to be used), they
-// need to be replaced, by question marks in this case.
-//
-function strip_bad_multibyte_chars($str)
-{
-    $result = '';
-    $length = strlen($str);
-
-    for ($i = 0; $i < $length; $i++) {
-        // Replace four-byte characters (11110www 10zzzzzz 10yyyyyy 10xxxxxx)
-        $ord = ord($str[$i]);
-        if ($ord >= 240 && $ord <= 244) {
-            $result .= '?';
-            $i += 3;
-        } else {
-            $result .= $str[$i];
-        }
-    }
-
-    return $result;
-}
-
 //
 // Generate a cache ID based on the last modification time for all stopwords files
 //
@@ -822,9 +639,11 @@ function generate_stopwords_cache_id()
 // Generate breadcrumbs from an array of name and URLs
 function breadcrumbs_admin(array $links)
 {
+    $feather = \Slim\Slim::getInstance();
+
     foreach ($links as $name => $url) {
         if ($name != '' && $url != '') {
-            $tmp[] = '<span><a href="' . $url . '">'.feather_escape($name).'</a></span>';
+            $tmp[] = '<span><a href="' . $url . '">'.$feather->utils->escape($name).'</a></span>';
         } else {
             $tmp[] = '<span>'.__('Deleted').'</span>';
             return implode(' » ', $tmp);
diff --git a/include/routes.php b/include/routes.php
index dc0cec94..622bf4fd 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -190,7 +190,7 @@
 $feather->error(function (\Exception $e) use ($feather) {
     $feather->response->setStatus($e->getCode());
     $feather->view2->setPageInfo(array(
-        'title' => array(feather_escape($feather->config['o_board_title']), __('Error')),
+        'title' => array($feather->utils->escape($feather->config['o_board_title']), __('Error')),
         'msg_title' => __('Error'),
         'msg'    =>   $e->getMessage(),
         'no_back_link'    => false,
diff --git a/model/admin/bans.php b/model/admin/bans.php
index 42feda83..9d46d232 100644
--- a/model/admin/bans.php
+++ b/model/admin/bans.php
@@ -54,7 +54,7 @@ public function add_ban_info($id = null)
         } else {
             // Otherwise the username is in POST
 
-            $ban['ban_user'] = feather_trim($this->request->post('new_ban_user'));
+            $ban['ban_user'] = $this->feather->utils->trim($this->request->post('new_ban_user'));
 
             if ($ban['ban_user'] != '') {
                 $select_add_ban_info = array('id', 'group_id', 'username', 'email');
@@ -79,14 +79,14 @@ public function add_ban_info($id = null)
         // Make sure we're not banning an admin or moderator
         if (isset($group_id)) {
             if ($group_id == FEATHER_ADMIN) {
-                message(sprintf(__('User is admin message'), feather_escape($ban['ban_user'])));
+                message(sprintf(__('User is admin message'), $this->feather->utils->escape($ban['ban_user'])));
             }
 
             $is_moderator_group = DB::for_table('groups')->where('g_id', $group_id)
                                         ->find_one_col('g_moderator');
 
             if ($is_moderator_group) {
-                message(sprintf(__('User is mod message'), feather_escape($ban['ban_user'])));
+                message(sprintf(__('User is mod message'), $this->feather->utils->escape($ban['ban_user'])));
             }
         }
 
@@ -146,11 +146,11 @@ public function edit_ban_info($id)
 
     public function insert_ban()
     {
-        $ban_user = feather_trim($this->request->post('ban_user'));
-        $ban_ip = feather_trim($this->request->post('ban_ip'));
-        $ban_email = strtolower(feather_trim($this->request->post('ban_email')));
-        $ban_message = feather_trim($this->request->post('ban_message'));
-        $ban_expire = feather_trim($this->request->post('ban_expire'));
+        $ban_user = $this->feather->utils->trim($this->request->post('ban_user'));
+        $ban_ip = $this->feather->utils->trim($this->request->post('ban_ip'));
+        $ban_email = strtolower($this->feather->utils->trim($this->request->post('ban_email')));
+        $ban_message = $this->feather->utils->trim($this->request->post('ban_message'));
+        $ban_expire = $this->feather->utils->trim($this->request->post('ban_expire'));
 
         $this->hook->fire('insert_ban_start', $ban_user, $ban_ip, $ban_email, $ban_message, $ban_expire);
 
@@ -168,14 +168,14 @@ public function insert_ban()
 
             if ($group_id) {
                 if ($group_id == FEATHER_ADMIN) {
-                    message(sprintf(__('User is admin message'), feather_escape($ban_user)));
+                    message(sprintf(__('User is admin message'), $this->feather->utils->escape($ban_user)));
                 }
 
                 $is_moderator_group = DB::for_table('groups')->where('g_id', $group_id)
                                             ->find_one_col('g_moderator');
 
                 if ($is_moderator_group) {
-                    message(sprintf(__('User is mod message'), feather_escape($ban_user)));
+                    message(sprintf(__('User is mod message'), $this->feather->utils->escape($ban_user)));
                 }
             }
         }
@@ -184,7 +184,7 @@ public function insert_ban()
         if ($ban_ip != '') {
             $ban_ip = preg_replace('%\s{2,}%S', ' ', $ban_ip);
             $addresses = explode(' ', $ban_ip);
-            $addresses = array_map('feather_trim', $addresses);
+            $addresses = array_map('trim', $addresses);
 
             for ($i = 0; $i < count($addresses); ++$i) {
                 if (strpos($addresses[$i], ':') !== false) {
@@ -303,8 +303,8 @@ public function find_ban($start_from = false)
         // trim() all elements in $form
         $ban_info['conditions'] = $ban_info['query_str'] = array();
 
-        $expire_after = $this->request->get('expire_after') ? feather_trim($this->request->get('expire_after')) : '';
-        $expire_before = $this->request->get('expire_before') ? feather_trim($this->request->get('expire_before')) : '';
+        $expire_after = $this->request->get('expire_after') ? $this->feather->utils->trim($this->request->get('expire_after')) : '';
+        $expire_before = $this->request->get('expire_before') ? $this->feather->utils->trim($this->request->get('expire_before')) : '';
         $ban_info['order_by'] = $this->request->get('order_by') && in_array($this->request->get('order_by'), array('username', 'ip', 'email', 'expire')) ? 'b.'.$this->request->get('order_by') : 'b.username';
         $ban_info['direction'] = $this->request->get('direction') && $this->request->get('direction') == 'DESC' ? 'DESC' : 'ASC';
 
diff --git a/model/admin/censoring.php b/model/admin/censoring.php
index 1385e7b1..34662f45 100644
--- a/model/admin/censoring.php
+++ b/model/admin/censoring.php
@@ -25,8 +25,8 @@ public function __construct()
 
     public function add_word()
     {
-        $search_for = feather_trim($this->request->post('new_search_for'));
-        $replace_with = feather_trim($this->request->post('new_replace_with'));
+        $search_for = $this->feather->utils->trim($this->request->post('new_search_for'));
+        $replace_with = $this->feather->utils->trim($this->request->post('new_replace_with'));
 
         if ($search_for == '') {
             message(__('Must enter word message'));
@@ -53,8 +53,8 @@ public function update_word()
     {
         $id = intval(key($this->request->post('update')));
 
-        $search_for = feather_trim($this->request->post('search_for')[$id]);
-        $replace_with = feather_trim($this->request->post('replace_with')[$id]);
+        $search_for = $this->feather->utils->trim($this->request->post('search_for')[$id]);
+        $replace_with = $this->feather->utils->trim($this->request->post('replace_with')[$id]);
 
         if ($search_for == '') {
             message(__('Must enter word message'));
diff --git a/model/admin/groups.php b/model/admin/groups.php
index e52208c5..d6448c94 100644
--- a/model/admin/groups.php
+++ b/model/admin/groups.php
@@ -71,9 +71,9 @@ public function get_group_list($groups, $group)
         foreach ($groups as $cur_group) {
             if (($cur_group['g_id'] != $group['info']['g_id'] || $group['mode'] == 'add') && $cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
                 if ($cur_group['g_id'] == $group['info']['g_promote_next_group']) {
-                    $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+                    $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
                 } else {
-                    $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+                    $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
                 }
             }
         }
@@ -99,9 +99,9 @@ public function get_group_list_delete($group_id)
         foreach ($result as $cur_group) {
             if ($cur_group['g_id'] == FEATHER_MEMBER) {
                 // Pre-select the pre-defined Members group
-                $output .= "\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
             } else {
-                $output .= "\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
             }
         }
 
@@ -123,13 +123,13 @@ public function add_edit_group($groups)
         $is_admin_group = ($this->request->post('group_id') && $this->request->post('group_id') == FEATHER_ADMIN) ? true : false;
 
         // Set group title
-        $title = feather_trim($this->request->post('req_title'));
+        $title = $this->feather->utils->trim($this->request->post('req_title'));
         if ($title == '') {
             message(__('Must enter title message'));
         }
         $title = $this->hook->fire('add_edit_group_set_title', $title);
         // Set user title
-        $user_title = feather_trim($this->request->post('user_title'));
+        $user_title = $this->feather->utils->trim($this->request->post('user_title'));
         $user_title = ($user_title != '') ? $user_title : 'NULL';
         $user_title = $this->hook->fire('add_edit_group_set_user_title', $user_title);
 
@@ -201,7 +201,7 @@ public function add_edit_group($groups)
             // Creating a new group
             $title_exists = DB::for_table('groups')->where('g_title', $title)->find_one();
             if ($title_exists) {
-                message(sprintf(__('Title already exists message'), feather_escape($title)));
+                message(sprintf(__('Title already exists message'), $this->feather->utils->escape($title)));
             }
 
             DB::for_table('groups')
@@ -236,7 +236,7 @@ public function add_edit_group($groups)
             // We are editing an existing group
             $title_exists = DB::for_table('groups')->where('g_title', $title)->where_not_equal('g_id', $this->request->post('group_id'))->find_one();
             if ($title_exists) {
-                message(sprintf(__('Title already exists message'), feather_escape($title)));
+                message(sprintf(__('Title already exists message'), $this->feather->utils->escape($title)));
             }
             DB::for_table('groups')
                     ->find_one($this->request->post('group_id'))
diff --git a/model/admin/maintenance.php b/model/admin/maintenance.php
index 2ae02599..30e0a21f 100644
--- a/model/admin/maintenance.php
+++ b/model/admin/maintenance.php
@@ -218,7 +218,7 @@ public function get_info_prune($prune_sticky, $prune_from)
     {
         $prune = array();
 
-        $prune['days'] = feather_trim($this->request->post('req_prune_days'));
+        $prune['days'] = $this->feather->utils->trim($this->request->post('req_prune_days'));
         if ($prune['days'] == '' || preg_match('%[^0-9]%', $prune['days'])) {
             message(__('Days must be integer message'));
         }
@@ -243,7 +243,7 @@ public function get_info_prune($prune_sticky, $prune_from)
             $forum = $this->hook->fireDB('maintenance.get_info_prune.forum_query', $forum);
             $forum = $forum->find_one_col('forum_name');
 
-            $prune['forum'] = '"'.feather_escape($forum).'"';
+            $prune['forum'] = '"'.$this->feather->utils->escape($forum).'"';
         } else {
             $prune['forum'] = __('All forums');
         }
@@ -283,11 +283,11 @@ public function get_categories()
                     $output .= "\t\t\t\t\t\t\t\t\t\t\t".'</optgroup>'."\n";
                 }
 
-                $output .=  "\t\t\t\t\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($forum['cat_name']).'">'."\n";
+                $output .=  "\t\t\t\t\t\t\t\t\t\t\t".'<optgroup label="'.$this->feather->utils->escape($forum['cat_name']).'">'."\n";
                 $cur_category = $forum['cid'];
             }
 
-            $output .=  "\t\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$forum['fid'].'">'.feather_escape($forum['forum_name']).'</option>'."\n";
+            $output .=  "\t\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$forum['fid'].'">'.$this->feather->utils->escape($forum['forum_name']).'</option>'."\n";
         }
 
         $output = $this->hook->fire('maintenance.get_categories.output', $output);
diff --git a/model/admin/options.php b/model/admin/options.php
index d79e37b3..98fa5488 100644
--- a/model/admin/options.php
+++ b/model/admin/options.php
@@ -27,15 +27,15 @@ public function __construct()
     public function update_options()
     {
         $form = array(
-            'board_title'            => feather_trim($this->request->post('form_board_title')),
-            'board_desc'            => feather_trim($this->request->post('form_board_desc')),
-            'base_url'                => feather_trim($this->request->post('form_base_url')),
+            'board_title'            => $this->feather->utils->trim($this->request->post('form_board_title')),
+            'board_desc'            => $this->feather->utils->trim($this->request->post('form_board_desc')),
+            'base_url'                => $this->feather->utils->trim($this->request->post('form_base_url')),
             'default_timezone'        => floatval($this->request->post('form_default_timezone')),
             'default_dst'            => $this->request->post('form_default_dst') != '1' ? '0' : '1',
-            'default_lang'            => feather_trim($this->request->post('form_default_lang')),
-            'default_style'            => feather_trim($this->request->post('form_default_style')),
-            'time_format'            => feather_trim($this->request->post('form_time_format')),
-            'date_format'            => feather_trim($this->request->post('form_date_format')),
+            'default_lang'            => $this->feather->utils->trim($this->request->post('form_default_lang')),
+            'default_style'            => $this->feather->utils->trim($this->request->post('form_default_style')),
+            'time_format'            => $this->feather->utils->trim($this->request->post('form_time_format')),
+            'date_format'            => $this->feather->utils->trim($this->request->post('form_date_format')),
             'timeout_visit'            => (intval($this->request->post('form_timeout_visit')) > 0) ? intval($this->request->post('form_timeout_visit')) : 1,
             'timeout_online'        => (intval($this->request->post('form_timeout_online')) > 0) ? intval($this->request->post('form_timeout_online')) : 1,
             'redirect_delay'        => (intval($this->request->post('form_redirect_delay')) >= 0) ? intval($this->request->post('form_redirect_delay')) : 0,
@@ -59,33 +59,33 @@ public function update_options()
             'quickjump'                => $this->request->post('form_quickjump') != '1' ? '0' : '1',
             'gzip'                    => $this->request->post('form_gzip') != '1' ? '0' : '1',
             'search_all_forums'        => $this->request->post('form_search_all_forums') != '1' ? '0' : '1',
-            'additional_navlinks'    => feather_trim($this->request->post('form_additional_navlinks')),
+            'additional_navlinks'    => $this->feather->utils->trim($this->request->post('form_additional_navlinks')),
             'feed_type'                => intval($this->request->post('form_feed_type')),
             'feed_ttl'                => intval($this->request->post('form_feed_ttl')),
             'report_method'            => intval($this->request->post('form_report_method')),
-            'mailing_list'            => feather_trim($this->request->post('form_mailing_list')),
+            'mailing_list'            => $this->feather->utils->trim($this->request->post('form_mailing_list')),
             'avatars'                => $this->request->post('form_avatars') != '1' ? '0' : '1',
-            'avatars_dir'            => feather_trim($this->request->post('form_avatars_dir')),
+            'avatars_dir'            => $this->feather->utils->trim($this->request->post('form_avatars_dir')),
             'avatars_width'            => (intval($this->request->post('form_avatars_width')) > 0) ? intval($this->request->post('form_avatars_width')) : 1,
             'avatars_height'        => (intval($this->request->post('form_avatars_height')) > 0) ? intval($this->request->post('form_avatars_height')) : 1,
             'avatars_size'            => (intval($this->request->post('form_avatars_size')) > 0) ? intval($this->request->post('form_avatars_size')) : 1,
-            'admin_email'            => strtolower(feather_trim($this->request->post('form_admin_email'))),
-            'webmaster_email'        => strtolower(feather_trim($this->request->post('form_webmaster_email'))),
+            'admin_email'            => strtolower($this->feather->utils->trim($this->request->post('form_admin_email'))),
+            'webmaster_email'        => strtolower($this->feather->utils->trim($this->request->post('form_webmaster_email'))),
             'forum_subscriptions'    => $this->request->post('form_forum_subscriptions') != '1' ? '0' : '1',
             'topic_subscriptions'    => $this->request->post('form_topic_subscriptions') != '1' ? '0' : '1',
-            'smtp_host'                => feather_trim($this->request->post('form_smtp_host')),
-            'smtp_user'                => feather_trim($this->request->post('form_smtp_user')),
+            'smtp_host'                => $this->feather->utils->trim($this->request->post('form_smtp_host')),
+            'smtp_user'                => $this->feather->utils->trim($this->request->post('form_smtp_user')),
             'smtp_ssl'                => $this->request->post('form_smtp_ssl') != '1' ? '0' : '1',
             'regs_allow'            => $this->request->post('form_regs_allow') != '1' ? '0' : '1',
             'regs_verify'            => $this->request->post('form_regs_verify') != '1' ? '0' : '1',
             'regs_report'            => $this->request->post('form_regs_report') != '1' ? '0' : '1',
             'rules'                    => $this->request->post('form_rules') != '1' ? '0' : '1',
-            'rules_message'            => feather_trim($this->request->post('form_rules_message')),
+            'rules_message'            => $this->feather->utils->trim($this->request->post('form_rules_message')),
             'default_email_setting'    => intval($this->request->post('form_default_email_setting')),
             'announcement'            => $this->request->post('form_announcement') != '1' ? '0' : '1',
-            'announcement_message'    => feather_trim($this->request->post('form_announcement_message')),
+            'announcement_message'    => $this->feather->utils->trim($this->request->post('form_announcement_message')),
             'maintenance'            => $this->request->post('form_maintenance') != '1' ? '0' : '1',
-            'maintenance_message'    => feather_trim($this->request->post('form_maintenance_message')),
+            'maintenance_message'    => $this->feather->utils->trim($this->request->post('form_maintenance_message')),
         );
 
         $form = $this->hook->fire('options.update_options.form', $form);
@@ -144,13 +144,13 @@ public function update_options()
         }
 
         if ($form['additional_navlinks'] != '') {
-            $form['additional_navlinks'] = feather_trim(feather_linebreaks($form['additional_navlinks']));
+            $form['additional_navlinks'] = $this->feather->utils->trim($this->feather->utils->linebreaks($form['additional_navlinks']));
         }
 
         // Change or enter a SMTP password
         if ($this->request->post('form_smtp_change_pass')) {
-            $smtp_pass1 = $this->request->post('form_smtp_pass1') ? feather_trim($this->request->post('form_smtp_pass1')) : '';
-            $smtp_pass2 = $this->request->post('form_smtp_pass2') ? feather_trim($this->request->post('form_smtp_pass2')) : '';
+            $smtp_pass1 = $this->request->post('form_smtp_pass1') ? $this->feather->utils->trim($this->request->post('form_smtp_pass1')) : '';
+            $smtp_pass2 = $this->request->post('form_smtp_pass2') ? $this->feather->utils->trim($this->request->post('form_smtp_pass2')) : '';
 
             if ($smtp_pass1 == $smtp_pass2) {
                 $form['smtp_pass'] = $smtp_pass1;
@@ -160,21 +160,21 @@ public function update_options()
         }
 
         if ($form['announcement_message'] != '') {
-            $form['announcement_message'] = feather_linebreaks($form['announcement_message']);
+            $form['announcement_message'] = $this->feather->utils->linebreaks($form['announcement_message']);
         } else {
             $form['announcement_message'] = __('Enter announcement here');
             $form['announcement'] = '0';
         }
 
         if ($form['rules_message'] != '') {
-            $form['rules_message'] = feather_linebreaks($form['rules_message']);
+            $form['rules_message'] = $this->feather->utils->linebreaks($form['rules_message']);
         } else {
             $form['rules_message'] = __('Enter rules here');
             $form['rules'] = '0';
         }
 
         if ($form['maintenance_message'] != '') {
-            $form['maintenance_message'] = feather_linebreaks($form['maintenance_message']);
+            $form['maintenance_message'] = $this->feather->utils->linebreaks($form['maintenance_message']);
         } else {
             $form['maintenance_message'] = __('Default maintenance message');
             $form['maintenance'] = '0';
diff --git a/model/admin/users.php b/model/admin/users.php
index e14f0034..2b0b850c 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -445,8 +445,8 @@ public function ban_users()
         }
 
         if ($this->request->post('ban_users_comply')) {
-            $ban_message = feather_trim($this->request->post('ban_message'));
-            $ban_expire = feather_trim($this->request->post('ban_expire'));
+            $ban_message = $this->feather->utils->trim($this->request->post('ban_message'));
+            $ban_expire = $this->feather->utils->trim($this->request->post('ban_expire'));
             $ban_the_ip = $this->request->post('ban_the_ip') ? intval($this->request->post('ban_the_ip')) : 0;
 
             $this->hook->fire('model.users.ban_users.comply', $ban_message, $ban_expire, $ban_the_ip);
@@ -535,16 +535,16 @@ public function get_user_search()
         $search = array();
 
         // trim() all elements in $form
-        $form = array_map('feather_trim', $form);
-
-        $posts_greater = $this->request->get('posts_greater') ? feather_trim($this->request->get('posts_greater')) : '';
-        $posts_less = $this->request->get('posts_less') ? feather_trim($this->request->get('posts_less')) : '';
-        $last_post_after = $this->request->get('last_post_after') ? feather_trim($this->request->get('last_post_after')) : '';
-        $last_post_before = $this->request->get('last_post_before') ? feather_trim($this->request->get('last_post_before')) : '';
-        $last_visit_after = $this->request->get('last_visit_after') ? feather_trim($this->request->get('last_visit_after')) : '';
-        $last_visit_before = $this->request->get('last_visit_before') ? feather_trim($this->request->get('last_visit_before')) : '';
-        $registered_after = $this->request->get('registered_after') ? feather_trim($this->request->get('registered_after')) : '';
-        $registered_before = $this->request->get('registered_before') ? feather_trim($this->request->get('registered_before')) : '';
+        $form = array_map('trim', $form);
+
+        $posts_greater = $this->request->get('posts_greater') ? $this->feather->utils->trim($this->request->get('posts_greater')) : '';
+        $posts_less = $this->request->get('posts_less') ? $this->feather->utils->trim($this->request->get('posts_less')) : '';
+        $last_post_after = $this->request->get('last_post_after') ? $this->feather->utils->trim($this->request->get('last_post_after')) : '';
+        $last_post_before = $this->request->get('last_post_before') ? $this->feather->utils->trim($this->request->get('last_post_before')) : '';
+        $last_visit_after = $this->request->get('last_visit_after') ? $this->feather->utils->trim($this->request->get('last_visit_after')) : '';
+        $last_visit_before = $this->request->get('last_visit_before') ? $this->feather->utils->trim($this->request->get('last_visit_before')) : '';
+        $registered_after = $this->request->get('registered_after') ? $this->feather->utils->trim($this->request->get('registered_after')) : '';
+        $registered_before = $this->request->get('registered_before') ? $this->feather->utils->trim($this->request->get('registered_before')) : '';
         $order_by = $search['order_by'] = $this->request->get('order_by') && in_array($this->request->get('order_by'), array('username', 'email', 'num_posts', 'last_post', 'last_visit', 'registered')) ? $this->request->get('order_by') : 'username';
         $direction = $search['direction'] = $this->request->get('direction') && $this->request->get('direction') == 'DESC' ? 'DESC' : 'ASC';
         $user_group = $this->request->get('user_group') ? intval($this->request->get('user_group')) : -1;
@@ -688,7 +688,7 @@ public function get_group_list()
                         ->order_by('g_title');
 
         foreach ($result as $cur_group) {
-            $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+            $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
         }
 
         $output = $this->hook->fire('model.users.get_group_list.output', $output);
diff --git a/model/cache.php b/model/cache.php
index c0f485a3..92d596b3 100644
--- a/model/cache.php
+++ b/model/cache.php
@@ -124,6 +124,6 @@ public static function get_stopwords($lang_path)
                 $stopwords = array_merge($stopwords, file($file->getPathName().'/stopwords.txt'));
             }
         }
-        return array_map('feather_trim', $stopwords);
+        return array_map('trim', $stopwords);
     }
 }
diff --git a/model/debug.php b/model/debug.php
index d753fb8c..c1049c44 100644
--- a/model/debug.php
+++ b/model/debug.php
@@ -12,7 +12,7 @@
 
 class debug
 {
-    protected static $app;
+    protected static $feather;
 
     public static function get_queries()
     {
@@ -27,9 +27,9 @@ public static function get_queries()
 
     public static function get_info()
     {
-        self::$app = \Slim\Slim::getInstance();
+        self::$feather = \Slim\Slim::getInstance();
 
-        $data = array('exec_time' => (get_microtime() - self::$app->start));
+        $data = array('exec_time' => (self::$feather->utils->get_microtime() - self::$feather->start));
         $data['nb_queries'] = (isset(DB::get_query_log()[0])) ? count(DB::get_query_log()[0]) : 'N/A';
         $data['mem_usage'] = (function_exists('memory_get_usage')) ? file_size(memory_get_usage()) : 'N/A';
         $data['mem_peak_usage'] = (function_exists('memory_get_peak_usage')) ? file_size(memory_get_peak_usage()) : 'N/A';
diff --git a/model/edit.php b/model/edit.php
index 0620aa77..16b3ef0c 100644
--- a/model/edit.php
+++ b/model/edit.php
@@ -64,30 +64,30 @@ public function check_errors_before_edit($can_edit_subject, $errors)
 
         // If it's a topic it must contain a subject
         if ($can_edit_subject) {
-            $subject = feather_trim($this->request->post('req_subject'));
+            $subject = $this->feather->utils->trim($this->request->post('req_subject'));
 
             if ($this->config['o_censoring'] == '1') {
-                $censored_subject = feather_trim(censor_words($subject));
+                $censored_subject = $this->feather->utils->trim(censor_words($subject));
             }
 
             if ($subject == '') {
                 $errors[] = __('No subject');
             } elseif ($this->config['o_censoring'] == '1' && $censored_subject == '') {
                 $errors[] = __('No subject after censoring');
-            } elseif (feather_strlen($subject) > 70) {
+            } elseif ($this->feather->utils->strlen($subject) > 70) {
                 $errors[] = __('Too long subject');
-            } elseif ($this->config['p_subject_all_caps'] == '0' && is_all_uppercase($subject) && !$this->user->is_admmod) {
+            } elseif ($this->config['p_subject_all_caps'] == '0' && $this->feather->utils->is_all_uppercase($subject) && !$this->user->is_admmod) {
                 $errors[] = __('All caps subject');
             }
         }
 
         // Clean up message from POST
-        $message = feather_linebreaks(feather_trim($this->request->post('req_message')));
+        $message = $this->feather->utils->linebreaks($this->feather->utils->trim($this->request->post('req_message')));
 
-        // Here we use strlen() not feather_strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
+        // Here we use strlen() not $this->feather->utils->strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         if (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            $errors[] = sprintf(__('Too long message'), forum_number_format(FEATHER_MAX_POSTSIZE));
-        } elseif ($this->config['p_message_all_caps'] == '0' && is_all_uppercase($message) && !$this->user->is_admmod) {
+            $errors[] = sprintf(__('Too long message'), $this->feather->utils->forum_number_format(FEATHER_MAX_POSTSIZE));
+        } elseif ($this->config['p_message_all_caps'] == '0' && $this->feather->utils->is_all_uppercase($message) && !$this->user->is_admmod) {
             $errors[] = __('All caps message');
         }
 
@@ -102,7 +102,7 @@ public function check_errors_before_edit($can_edit_subject, $errors)
                 $errors[] = __('No message');
             } elseif ($this->config['o_censoring'] == '1') {
                 // Censor message to see if that causes problems
-                $censored_message = feather_trim(censor_words($message));
+                $censored_message = $this->feather->utils->trim(censor_words($message));
 
                 if ($censored_message == '') {
                     $errors[] = __('No message after censoring');
@@ -131,7 +131,7 @@ public function setup_variables($cur_post, $is_admmod, $can_edit_subject, $error
         }
 
         // Clean up message from POST
-        $post['message'] = feather_linebreaks(feather_trim($this->request->post('req_message')));
+        $post['message'] = $this->feather->utils->linebreaks($this->feather->utils->trim($this->request->post('req_message')));
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
@@ -140,11 +140,11 @@ public function setup_variables($cur_post, $is_admmod, $can_edit_subject, $error
         }
 
         // Replace four-byte characters (MySQL cannot handle them)
-        $post['message'] = strip_bad_multibyte_chars($post['message']);
+        $post['message'] = $this->feather->utils->strip_bad_multibyte_chars($post['message']);
 
         // Get the subject
         if ($can_edit_subject) {
-            $post['subject'] = feather_trim($this->request->post('req_subject'));
+            $post['subject'] = $this->feather->utils->trim($this->request->post('req_subject'));
         }
 
         $post = $this->hook->fire('setup_variables_edit', $post);
diff --git a/model/index.php b/model/index.php
index 488e18ff..c67ec5dc 100644
--- a/model/index.php
+++ b/model/index.php
@@ -183,12 +183,12 @@ public function print_categories_forums()
 
             // Is this a redirect forum?
             if ($cur_forum->redirect_url != '') {
-                $cur_forum->forum_field = '<h3><span class="redirtext">'.__('Link to').'</span> <a href="'.feather_escape($cur_forum->redirect_url).'" title="'.__('Link to').' '.feather_escape($cur_forum->redirect_url).'">'.feather_escape($cur_forum->forum_name).'</a></h3>';
+                $cur_forum->forum_field = '<h3><span class="redirtext">'.__('Link to').'</span> <a href="'.$this->feather->utils->escape($cur_forum->redirect_url).'" title="'.__('Link to').' '.$this->feather->utils->escape($cur_forum->redirect_url).'">'.$this->feather->utils->escape($cur_forum->forum_name).'</a></h3>';
                 $cur_forum->num_topics_formatted = $cur_forum->num_posts_formatted = '-';
                 $cur_forum->item_status .= ' iredirect';
                 $cur_forum->icon_type = 'icon';
             } else {
-                $cur_forum->forum_field = '<h3><a href="'.$this->feather->url->get('forum/'.$cur_forum->fid.'/'.$this->feather->url->url_friendly($cur_forum->forum_name)).'/'.'">'.feather_escape($cur_forum->forum_name).'</a>'.(!empty($forum_field_new) ? ' '.$forum_field_new : '').'</h3>';
+                $cur_forum->forum_field = '<h3><a href="'.$this->feather->url->get('forum/'.$cur_forum->fid.'/'.$this->feather->url->url_friendly($cur_forum->forum_name)).'/'.'">'.$this->feather->utils->escape($cur_forum->forum_name).'</a>'.(!empty($forum_field_new) ? ' '.$forum_field_new : '').'</h3>';
                 $cur_forum->num_topics_formatted = $cur_forum->num_topics;
                 $cur_forum->num_posts_formatted = $cur_forum->num_posts;
             }
@@ -199,7 +199,7 @@ public function print_categories_forums()
 
             // If there is a last_post/last_poster
             if ($cur_forum->last_post != '') {
-                $cur_forum->last_post_formatted = '<a href="'.$this->feather->url->get('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.format_time($cur_forum->last_post).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_forum->last_poster).'</span>';
+                $cur_forum->last_post_formatted = '<a href="'.$this->feather->url->get('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.$this->feather->utils->format_time($cur_forum->last_post).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_forum->last_poster).'</span>';
             } elseif ($cur_forum->redirect_url != '') {
                 $cur_forum->last_post_formatted = '- - -';
             } else {
@@ -212,9 +212,9 @@ public function print_categories_forums()
 
                 foreach ($mods_array as $mod_username => $mod_id) {
                     if ($this->user->g_view_users == '1') {
-                        $moderators[] = '<a href="'.$this->feather->url->get('user/'.$mod_id.'/').'">'.feather_escape($mod_username).'</a>';
+                        $moderators[] = '<a href="'.$this->feather->url->get('user/'.$mod_id.'/').'">'.$this->feather->utils->escape($mod_username).'</a>';
                     } else {
-                        $moderators[] = feather_escape($mod_username);
+                        $moderators[] = $this->feather->utils->escape($mod_username);
                     }
                 }
 
@@ -256,9 +256,9 @@ public function collect_stats()
         $stats['total_posts'] = intval($query['total_posts']);
 
         if ($this->user->g_view_users == '1') {
-            $stats['newest_user'] = '<a href="'.$this->feather->url->get('user/'.$stats['last_user']['id']).'/">'.feather_escape($stats['last_user']['username']).'</a>';
+            $stats['newest_user'] = '<a href="'.$this->feather->url->get('user/'.$stats['last_user']['id']).'/">'.$this->feather->utils->escape($stats['last_user']['username']).'</a>';
         } else {
-            $stats['newest_user'] = feather_escape($stats['last_user']['username']);
+            $stats['newest_user'] = $this->feather->utils->escape($stats['last_user']['username']);
         }
 
         $stats = $this->hook->fire('collect_stats', $stats);
@@ -291,9 +291,9 @@ public function fetch_users_online()
         foreach($query as $user_online) {
             if ($user_online->user_id > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $online['users'][] = "\n\t\t\t\t".'<dd><a href="'.$this->feather->url->get('user/'.$user_online->user_id).'/">'.feather_escape($user_online->ident).'</a>';
+                    $online['users'][] = "\n\t\t\t\t".'<dd><a href="'.$this->feather->url->get('user/'.$user_online->user_id).'/">'.$this->feather->utils->escape($user_online->ident).'</a>';
                 } else {
-                    $online['users'][] = "\n\t\t\t\t".'<dd>'.feather_escape($user_online->ident);
+                    $online['users'][] = "\n\t\t\t\t".'<dd>'.$this->feather->utils->escape($user_online->ident);
                 }
             } else {
                 ++$online['num_guests'];
diff --git a/model/login.php b/model/login.php
index 91ce85a6..693c940d 100644
--- a/model/login.php
+++ b/model/login.php
@@ -29,8 +29,8 @@ public function login()
     {
         $this->hook->fire('login_start');
 
-        $form_username = feather_trim($this->request->post('req_username'));
-        $form_password = feather_trim($this->request->post('req_password'));
+        $form_username = $this->feather->utils->trim($this->request->post('req_username'));
+        $form_password = $this->feather->utils->trim($this->request->post('req_password'));
         $save_pass = $this->request->post('save_pass');
 
         $user = DB::for_table('users')->where('username', $form_username);
@@ -84,7 +84,7 @@ public function login()
         $redirect_url = validate_redirect($this->request->post('redirect_url'), $this->feather->url->base());
         $redirect_url = $this->hook->fire('redirect_url_login', $redirect_url);
 
-        redirect(feather_escape($redirect_url), __('Login redirect'));
+        redirect($this->feather->utils->escape($redirect_url), __('Login redirect'));
     }
 
     public function logout($id, $token)
@@ -130,7 +130,7 @@ public function password_forgotten()
 
         if ($this->feather->request()->isPost()) {
             // Validate the email address
-            $email = strtolower(feather_trim($this->request->post('req_email')));
+            $email = strtolower($this->feather->utils->trim($this->request->post('req_email')));
             if (!$this->email->is_valid_email($email)) {
                 $errors[] = __('Invalid email');
             }
@@ -193,7 +193,7 @@ public function password_forgotten()
                         $this->email->feather_mail($email, $mail_subject, $cur_mail_message);
                     }
 
-                    message(__('Forget mail').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
+                    message(__('Forget mail').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.', true);
                 } else {
                     $errors[] = __('No email match').' '.htmlspecialchars($email).'.';
                 }
diff --git a/model/misc.php b/model/misc.php
index 74930372..b95f333d 100644
--- a/model/misc.php
+++ b/model/misc.php
@@ -64,15 +64,15 @@ public function send_email($mail)
         $mail = $this->hook->fire('send_email_start', $mail);
 
         // Clean up message and subject from POST
-        $subject = feather_trim($this->request->post('req_subject'));
-        $message = feather_trim($this->request->post('req_message'));
+        $subject = $this->feather->utils->trim($this->request->post('req_subject'));
+        $message = $this->feather->utils->trim($this->request->post('req_message'));
 
         if ($subject == '') {
             message(__('No email subject'));
         } elseif ($message == '') {
             message(__('No email message'));
         }
-        // Here we use strlen() not feather_strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
+        // Here we use strlen() not $this->feather->utils->strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         elseif (strlen($message) > FEATHER_MAX_POSTSIZE) {
             message(__('Too long email message'));
         }
@@ -87,8 +87,8 @@ public function send_email($mail)
 
         // The first row contains the subject
         $first_crlf = strpos($mail_tpl, "\n");
-        $mail_subject = feather_trim(substr($mail_tpl, 8, $first_crlf-8));
-        $mail_message = feather_trim(substr($mail_tpl, $first_crlf));
+        $mail_subject = $this->feather->utils->trim(substr($mail_tpl, 8, $first_crlf-8));
+        $mail_message = $this->feather->utils->trim(substr($mail_tpl, $first_crlf));
 
         $mail_subject = str_replace('<mail_subject>', $subject, $mail_subject);
         $mail_message = str_replace('<sender>', $this->user->username, $mail_message);
@@ -138,7 +138,7 @@ public function insert_report($post_id)
         $post_id = $this->hook->fire('insert_report_start', $post_id);
 
         // Clean up reason from POST
-        $reason = feather_linebreaks(feather_trim($this->request->post('req_reason')));
+        $reason = $this->feather->utils->linebreaks($this->feather->utils->trim($this->request->post('req_reason')));
         if ($reason == '') {
             message(__('No reason'));
         } elseif (strlen($reason) > 65535) { // TEXT field can only hold 65535 bytes
diff --git a/model/moderate.php b/model/moderate.php
index 0adda595..c6ad1f8b 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -219,11 +219,11 @@ public function split_posts($tid, $fid, $p = null)
             }
 
             // Check subject
-            $new_subject = $this->request->post('new_subject') ? feather_trim($this->request->post('new_subject')) : '';
+            $new_subject = $this->request->post('new_subject') ? $this->feather->utils->trim($this->request->post('new_subject')) : '';
 
             if ($new_subject == '') {
                 message(__('No subject'));
-            } elseif (feather_strlen($new_subject) > 70) {
+            } elseif ($this->feather->utils->strlen($new_subject) > 70) {
                 message(__('Too long subject'));
             }
 
@@ -357,11 +357,11 @@ public function get_forum_list_split($id)
                     $output .= "\t\t\t\t\t\t\t".'</optgroup>'."\n";
                 }
 
-                $output .= "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cur_forum->cat_name).'">'."\n";
+                $output .= "\t\t\t\t\t\t\t".'<optgroup label="'.$this->feather->utils->escape($cur_forum->cat_name).'">'."\n";
                 $cur_category = $cur_forum->cid;
             }
 
-            $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_forum->fid.'"'.($id == $cur_forum->fid ? ' selected="selected"' : '').'>'.feather_escape($cur_forum->forum_name).'</option>'."\n";
+            $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_forum->fid.'"'.($id == $cur_forum->fid ? ' selected="selected"' : '').'>'.$this->feather->utils->escape($cur_forum->forum_name).'</option>'."\n";
         }
 
         $output = $this->hook->fire('get_forum_list_split', $output);
@@ -402,12 +402,12 @@ public function get_forum_list_move($id)
                     $output .= "\t\t\t\t\t\t\t".'</optgroup>'."\n";
                 }
 
-                $output .= "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cur_forum->cat_name).'">'."\n";
+                $output .= "\t\t\t\t\t\t\t".'<optgroup label="'.$this->feather->utils->escape($cur_forum->cat_name).'">'."\n";
                 $cur_category = $cur_forum->cid;
             }
 
             if ($cur_forum->fid != $id) {
-                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_forum->fid.'">'.feather_escape($cur_forum->forum_name).'</option>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_forum->fid.'">'.$this->feather->utils->escape($cur_forum->forum_name).'</option>'."\n";
             }
         }
 
@@ -460,9 +460,9 @@ public function display_posts_view($tid, $start_from)
             // If the poster is a registered user
             if ($cur_post->poster_id > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $cur_post->poster_disp = '<a href="'.$this->feather->url->get('user/'.$cur_post->poster_id.'/').'">'.feather_escape($cur_post->poster).'</a>';
+                    $cur_post->poster_disp = '<a href="'.$this->feather->url->get('user/'.$cur_post->poster_id.'/').'">'.$this->feather->utils->escape($cur_post->poster).'</a>';
                 } else {
-                    $cur_post->poster_disp = feather_escape($cur_post->poster);
+                    $cur_post->poster_disp = $this->feather->utils->escape($cur_post->poster);
                 }
 
                 // get_title() requires that an element 'username' be present in the array
@@ -475,7 +475,7 @@ public function display_posts_view($tid, $start_from)
             }
             // If the poster is a guest (or a user that has been deleted)
             else {
-                $cur_post->poster_disp = feather_escape($cur_post->poster);
+                $cur_post->poster_disp = $this->feather->utils->escape($cur_post->poster);
                 $cur_post->user_title = __('Guest');
             }
 
@@ -921,7 +921,7 @@ public function display_topics($fid, $sort_by, $start_from)
                 $url_topic = $this->feather->url->url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_disp'] = '<a href="'.$this->feather->url->get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_disp'] = '<a href="'.$this->feather->url->get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.$this->feather->utils->format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['last_poster']).'</span>';
                     $cur_topic['ghost_topic'] = false;
                 } else {
                     $cur_topic['last_post_disp'] = '- - -';
@@ -938,13 +938,13 @@ public function display_topics($fid, $sort_by, $start_from)
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.$this->feather->utils->escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.$this->feather->utils->escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.$this->feather->utils->escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
diff --git a/model/post.php b/model/post.php
index 3071793a..7f7f6530 100644
--- a/model/post.php
+++ b/model/post.php
@@ -84,7 +84,7 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
         if ($this->user->is_guest) {
 
             // It's a guest, so we have to validate the username
-            $errors = check_username(feather_trim($this->request->post('req_username')), $errors);
+            $errors = check_username($this->feather->utils->trim($this->request->post('req_username')), $errors);
 
             $errors = $this->hook->fire('check_errors_before_post_antispam', $errors);
 
@@ -108,11 +108,11 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
 
         // If it's a new topic
         if ($fid) {
-            $subject = feather_trim($this->request->post('req_subject'));
+            $subject = $this->feather->utils->trim($this->request->post('req_subject'));
             $subject = $this->hook->fire('check_errors_before_new_topic_subject', $subject);
 
             if ($this->config['o_censoring'] == '1') {
-                $censored_subject = feather_trim(censor_words($subject));
+                $censored_subject = $this->feather->utils->trim(censor_words($subject));
                 $censored_subject = $this->hook->fire('check_errors_before_censored', $censored_subject);
             }
 
@@ -120,9 +120,9 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
                 $errors[] = __('No subject');
             } elseif ($this->config['o_censoring'] == '1' && $censored_subject == '') {
                 $errors[] = __('No subject after censoring');
-            } elseif (feather_strlen($subject) > 70) {
+            } elseif ($this->feather->utils->strlen($subject) > 70) {
                 $errors[] = __('Too long subject');
-            } elseif ($this->config['p_subject_all_caps'] == '0' && is_all_uppercase($subject) && !$this->user->is_admmod) {
+            } elseif ($this->config['p_subject_all_caps'] == '0' && $this->feather->utils->is_all_uppercase($subject) && !$this->user->is_admmod) {
                 $errors[] = __('All caps subject');
             }
 
@@ -130,7 +130,7 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
         }
 
         if ($this->user->is_guest) {
-            $email = strtolower(feather_trim(($this->config['p_force_guest_email'] == '1') ? $this->request->post('req_email') : $this->request->post('email')));
+            $email = strtolower($this->feather->utils->trim(($this->config['p_force_guest_email'] == '1') ? $this->request->post('req_email') : $this->request->post('email')));
 
             if ($this->config['p_force_guest_email'] == '1' || $email != '') {
                 $errors = $this->hook->fire('check_errors_before_post_email', $errors, $email);
@@ -152,13 +152,13 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
         }
 
         // Clean up message from POST
-        $message = feather_linebreaks(feather_trim($this->request->post('req_message')));
+        $message = $this->feather->utils->linebreaks($this->feather->utils->trim($this->request->post('req_message')));
         $message = $this->hook->fire('check_errors_before_post_message', $message);
 
-        // Here we use strlen() not feather_strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
+        // Here we use strlen() not $this->feather->utils->strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         if (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            $errors[] = sprintf(__('Too long message'), forum_number_format(FEATHER_MAX_POSTSIZE));
-        } elseif ($this->config['p_message_all_caps'] == '0' && is_all_uppercase($message) && !$this->user->is_admmod) {
+            $errors[] = sprintf(__('Too long message'), $this->feather->utils->forum_number_format(FEATHER_MAX_POSTSIZE));
+        } elseif ($this->config['p_message_all_caps'] == '0' && $this->feather->utils->is_all_uppercase($message) && !$this->user->is_admmod) {
             $errors[] = __('All caps message');
         }
 
@@ -175,7 +175,7 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
                 $errors[] = __('No message');
             } elseif ($this->config['o_censoring'] == '1') {
                 // Censor message to see if that causes problems
-                $censored_message = feather_trim(censor_words($message));
+                $censored_message = $this->feather->utils->trim(censor_words($message));
 
                 if ($censored_message == '') {
                     $errors[] = __('No message after censoring');
@@ -201,19 +201,19 @@ public function setup_variables($errors, $is_admmod)
         }
         // Otherwise it should be in $feather ($_POST)
         else {
-            $post['username'] = feather_trim($this->request->post('req_username'));
-            $post['email'] = strtolower(feather_trim(($this->config['p_force_guest_email'] == '1') ? $this->request->post('req_email') : $this->request->post('email')));
+            $post['username'] = $this->feather->utils->trim($this->request->post('req_username'));
+            $post['email'] = strtolower($this->feather->utils->trim(($this->config['p_force_guest_email'] == '1') ? $this->request->post('req_email') : $this->request->post('email')));
         }
 
         if ($this->request->post('req_subject')) {
-            $post['subject'] = feather_trim($this->request->post('req_subject'));
+            $post['subject'] = $this->feather->utils->trim($this->request->post('req_subject'));
         }
 
         $post['hide_smilies'] = $this->request->post('hide_smilies') ? '1' : '0';
         $post['subscribe'] = $this->request->post('subscribe') ? '1' : '0';
         $post['stick_topic'] = $this->request->post('stick_topic') && $is_admmod ? '1' : '0';
 
-        $post['message']  = feather_linebreaks(feather_trim($this->request->post('req_message')));
+        $post['message']  = $this->feather->utils->linebreaks($this->feather->utils->trim($this->request->post('req_message')));
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
@@ -222,7 +222,7 @@ public function setup_variables($errors, $is_admmod)
         }
 
         // Replace four-byte characters (MySQL cannot handle them)
-        $post['message'] = strip_bad_multibyte_chars($post['message']);
+        $post['message'] = $this->feather->utils->strip_bad_multibyte_chars($post['message']);
 
         $post['time'] = time();
 
@@ -374,7 +374,7 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
         if ($result) {
             $notification_emails = array();
 
-            $censored_message = feather_trim(censor_words($post['message']));
+            $censored_message = $this->feather->utils->trim(censor_words($post['message']));
 
             if ($this->config['o_censoring'] == '1') {
                 $cleaned_message = $this->email->bbcode2email($censored_message, -1);
@@ -582,8 +582,8 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
         if ($result) {
             $notification_emails = array();
 
-            $censored_message = feather_trim(censor_words($post['message']));
-            $censored_subject = feather_trim(censor_words($post['subject']));
+            $censored_message = $this->feather->utils->trim(censor_words($post['message']));
+            $censored_subject = $this->feather->utils->trim(censor_words($post['subject']));
 
             if ($this->config['o_censoring'] == '1') {
                 $cleaned_message = $this->email->bbcode2email($censored_message, -1);
@@ -796,7 +796,7 @@ public function get_quote_message($qid, $tid)
             $quote['message'] = censor_words($quote['message']);
         }
 
-        $quote['message'] = feather_escape($quote['message']);
+        $quote['message'] = $this->feather->utils->escape($quote['message']);
 
         if ($this->config['p_message_bbcode'] == '1') {    // Sanitize username for inclusion within QUOTE BBCode attribute.
                 //   This is a bit tricky because a username can have any "special"
@@ -805,10 +805,10 @@ public function get_quote_message($qid, $tid)
                     // Check if we need to quote it.
                     // Post has special chars. Escape escapes and quotes then wrap in quotes.
                     if (strpos($quote['poster'], '"') !== false && strpos($quote['poster'], '\'') === false) { // If there are double quotes but no single quotes, use single quotes,
-                        $quote['poster'] = feather_escape(str_replace('\\', '\\\\', $quote['poster']));
+                        $quote['poster'] = $this->feather->utils->escape(str_replace('\\', '\\\\', $quote['poster']));
                         $quote['poster'] = '\''. $quote['poster'] .'#'. $qid .'\'';
                     } else { // otherwise use double quotes.
-                        $quote['poster'] = feather_escape(str_replace(array('\\', '"'), array('\\\\', '\\"'), $quote['poster']));
+                        $quote['poster'] = $this->feather->utils->escape(str_replace(array('\\', '"'), array('\\\\', '\\"'), $quote['poster']));
                         $quote['poster'] = '"'. $quote['poster'] .'#'. $qid .'"';
                     }
                 } else {
diff --git a/model/profile.php b/model/profile.php
index 5939a52d..f57acd1e 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -46,7 +46,7 @@ public function change_pass($id)
             $cur_user = $cur_user->find_one();
 
             if ($key == '' || $key != $cur_user['activate_key']) {
-                message(__('Pass key bad').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
+                message(__('Pass key bad').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.');
             } else {
                 $query = DB::for_table('users')
                     ->where('id', $id)
@@ -91,14 +91,14 @@ public function change_pass($id)
         }
 
         if ($this->request->isPost()) {
-            $old_password = $this->request->post('req_old_password') ? feather_trim($this->request->post('req_old_password')) : '';
-            $new_password1 = feather_trim($this->request->post('req_new_password1'));
-            $new_password2 = feather_trim($this->request->post('req_new_password2'));
+            $old_password = $this->request->post('req_old_password') ? $this->feather->utils->trim($this->request->post('req_old_password')) : '';
+            $new_password1 = $this->feather->utils->trim($this->request->post('req_new_password1'));
+            $new_password2 = $this->feather->utils->trim($this->request->post('req_new_password2'));
 
             if ($new_password1 != $new_password2) {
                 message(__('Pass not match'));
             }
-            if (feather_strlen($new_password1) < 6) {
+            if ($this->feather->utils->strlen($new_password1) < 6) {
                 message(__('Pass too short'));
             }
 
@@ -182,7 +182,7 @@ public function change_email($id)
             $new_email_key = $new_email_key->find_one_col('activate_key');
 
             if ($key == '' || $key != $new_email_key) {
-                message(__('Email key bad').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
+                message(__('Email key bad').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.');
             } else {
                 $update_mail = DB::for_table('users')
                     ->where('id', $id)
@@ -203,7 +203,7 @@ public function change_email($id)
             }
 
             // Validate the email address
-            $new_email = strtolower(feather_trim($this->request->post('req_new_email')));
+            $new_email = strtolower($this->feather->utils->trim($this->request->post('req_new_email')));
             $new_email = $this->hook->fire('change_email_new_email', $new_email);
             if (!$this->email->is_valid_email($new_email)) {
                 message(__('Invalid email'));
@@ -308,7 +308,7 @@ public function change_email($id)
 
             $this->hook->fire('change_email_sent');
 
-            message(__('Activate email sent').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
+            message(__('Activate email sent').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.', true);
         }
         $this->hook->fire('change_email');
     }
@@ -363,12 +363,12 @@ public function upload_avatar($id, $files_data)
 
             // Make sure the file isn't too big
             if ($uploaded_file['size'] > $this->config['o_avatars_size']) {
-                message(__('Too large').' '.forum_number_format($this->config['o_avatars_size']).' '.__('bytes').'.');
+                message(__('Too large').' '.$this->feather->utils->forum_number_format($this->config['o_avatars_size']).' '.__('bytes').'.');
             }
 
             // Move the file to the avatar directory. We do this before checking the width/height to circumvent open_basedir restrictions
             if (!@move_uploaded_file($uploaded_file['tmp_name'], FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp')) {
-                message(__('Move failed').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
+                message(__('Move failed').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.');
             }
 
             list($width, $height, $type, ) = @getimagesize(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
@@ -781,18 +781,18 @@ public function update_profile($id, $info, $section)
                 // Make sure we got a valid language string
                 if ($this->request->post('form_language')) {
                     $languages = forum_list_langs();
-                    $form['language'] = feather_trim($this->request->post('form_language'));
+                    $form['language'] = $this->feather->utils->trim($this->request->post('form_language'));
                     if (!in_array($form['language'], $languages)) {
                         message(__('Bad request'), '404');
                     }
                 }
 
                 if ($this->user->is_admmod) {
-                    $form['admin_note'] = feather_trim($this->request->post('admin_note'));
+                    $form['admin_note'] = $this->feather->utils->trim($this->request->post('admin_note'));
 
                     // Are we allowed to change usernames?
                     if ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && $this->user->g_mod_rename_users == '1')) {
-                        $form['username'] = feather_trim($this->request->post('req_username'));
+                        $form['username'] = $this->feather->utils->trim($this->request->post('req_username'));
 
                         if ($form['username'] != $info['old_username']) {
                             $errors = '';
@@ -813,7 +813,7 @@ public function update_profile($id, $info, $section)
 
                 if ($this->config['o_regs_verify'] == '0' || $this->user->is_admmod) {
                     // Validate the email address
-                    $form['email'] = strtolower(feather_trim($this->request->post('req_email')));
+                    $form['email'] = strtolower($this->feather->utils->trim($this->request->post('req_email')));
                     if (!$this->email->is_valid_email($form['email'])) {
                         message(__('Invalid email'));
                     }
@@ -825,9 +825,9 @@ public function update_profile($id, $info, $section)
             case 'personal':
             {
                 $form = array(
-                    'realname'        => $this->request->post('form_realname') ? feather_trim($this->request->post('form_realname')) : '',
-                    'url'            => $this->request->post('form_url') ? feather_trim($this->request->post('form_url')) : '',
-                    'location'        => $this->request->post('form_location') ? feather_trim($this->request->post('form_location')) : '',
+                    'realname'        => $this->request->post('form_realname') ? $this->feather->utils->trim($this->request->post('form_realname')) : '',
+                    'url'            => $this->request->post('form_url') ? $this->feather->utils->trim($this->request->post('form_url')) : '',
+                    'location'        => $this->request->post('form_location') ? $this->feather->utils->trim($this->request->post('form_location')) : '',
                 );
 
                 // Add http:// if the URL doesn't contain it already (while allowing https://, too)
@@ -850,9 +850,9 @@ public function update_profile($id, $info, $section)
                 }
 
                 if ($this->user->g_id == FEATHER_ADMIN) {
-                    $form['title'] = feather_trim($this->request->post('title'));
+                    $form['title'] = $this->feather->utils->trim($this->request->post('title'));
                 } elseif ($this->user->g_set_title == '1') {
-                    $form['title'] = feather_trim($this->request->post('title'));
+                    $form['title'] = $this->feather->utils->trim($this->request->post('title'));
 
                     if ($form['title'] != '') {
                         // A list of words that the title may not contain
@@ -871,11 +871,11 @@ public function update_profile($id, $info, $section)
             case 'messaging':
             {
                 $form = array(
-                    'jabber'        => feather_trim($this->request->post('form_jabber')),
-                    'icq'            => feather_trim($this->request->post('form_icq')),
-                    'msn'            => feather_trim($this->request->post('form_msn')),
-                    'aim'            => feather_trim($this->request->post('form_aim')),
-                    'yahoo'            => feather_trim($this->request->post('form_yahoo')),
+                    'jabber'        => $this->feather->utils->trim($this->request->post('form_jabber')),
+                    'icq'            => $this->feather->utils->trim($this->request->post('form_icq')),
+                    'msn'            => $this->feather->utils->trim($this->request->post('form_msn')),
+                    'aim'            => $this->feather->utils->trim($this->request->post('form_aim')),
+                    'yahoo'            => $this->feather->utils->trim($this->request->post('form_yahoo')),
                 );
 
                 // If the ICQ UIN contains anything other than digits it's invalid
@@ -892,14 +892,14 @@ public function update_profile($id, $info, $section)
 
                 // Clean up signature from POST
                 if ($this->config['o_signatures'] == '1') {
-                    $form['signature'] = feather_linebreaks(feather_trim($this->request->post('signature')));
+                    $form['signature'] = $this->feather->utils->linebreaks($this->feather->utils->trim($this->request->post('signature')));
 
                     // Validate signature
-                    if (feather_strlen($form['signature']) > $this->config['p_sig_length']) {
-                        message(sprintf(__('Sig too long'), $this->config['p_sig_length'], feather_strlen($form['signature']) - $this->config['p_sig_length']));
+                    if ($this->feather->utils->strlen($form['signature']) > $this->config['p_sig_length']) {
+                        message(sprintf(__('Sig too long'), $this->config['p_sig_length'], $this->feather->utils->strlen($form['signature']) - $this->config['p_sig_length']));
                     } elseif (substr_count($form['signature'], "\n") > ($this->config['p_sig_lines']-1)) {
                         message(sprintf(__('Sig too many lines'), $this->config['p_sig_lines']));
-                    } elseif ($form['signature'] && $this->config['p_sig_all_caps'] == '0' && is_all_uppercase($form['signature']) && !$this->user->is_admmod) {
+                    } elseif ($form['signature'] && $this->config['p_sig_all_caps'] == '0' && $this->feather->utils->is_all_uppercase($form['signature']) && !$this->user->is_admmod) {
                         $form['signature'] = utf8_ucwords(utf8_strtolower($form['signature']));
                     }
 
@@ -923,8 +923,8 @@ public function update_profile($id, $info, $section)
             case 'display':
             {
                 $form = array(
-                    'disp_topics'        => feather_trim($this->request->post('form_disp_topics')),
-                    'disp_posts'        => feather_trim($this->request->post('form_disp_posts')),
+                    'disp_topics'        => $this->feather->utils->trim($this->request->post('form_disp_topics')),
+                    'disp_posts'        => $this->feather->utils->trim($this->request->post('form_disp_posts')),
                     'show_smilies'        => $this->request->post('form_show_smilies') ? '1' : '0',
                     'show_img'            => $this->request->post('form_show_img') ? '1' : '0',
                     'show_img_sig'        => $this->request->post('form_show_img_sig') ? '1' : '0',
@@ -953,7 +953,7 @@ public function update_profile($id, $info, $section)
                 // Make sure we got a valid style string
                 if ($this->request->post('form_style')) {
                     $styles = forum_list_styles();
-                    $form['style'] = feather_trim($this->request->post('form_style'));
+                    $form['style'] = $this->feather->utils->trim($this->request->post('form_style'));
                     if (!in_array($form['style'], $styles)) {
                         message(__('Bad request'), '404');
                     }
@@ -1115,7 +1115,7 @@ public function parse_user_info($user)
         $user_info = $this->hook->fire('parse_user_info_start', $user_info, $user);
 
         $user_info['personal'][] = '<dt>'.__('Username').'</dt>';
-        $user_info['personal'][] = '<dd>'.feather_escape($user['username']).'</dd>';
+        $user_info['personal'][] = '<dd>'.$this->feather->utils->escape($user['username']).'</dd>';
 
         $user_title_field = get_title($user);
         $user_info['personal'][] = '<dt>'.__('Title').'</dt>';
@@ -1123,22 +1123,22 @@ public function parse_user_info($user)
 
         if ($user['realname'] != '') {
             $user_info['personal'][] = '<dt>'.__('Realname').'</dt>';
-            $user_info['personal'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['realname']) : $user['realname']).'</dd>';
+            $user_info['personal'][] = '<dd>'.$this->feather->utils->escape(($this->config['o_censoring'] == '1') ? censor_words($user['realname']) : $user['realname']).'</dd>';
         }
 
         if ($user['location'] != '') {
             $user_info['personal'][] = '<dt>'.__('Location').'</dt>';
-            $user_info['personal'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['location']) : $user['location']).'</dd>';
+            $user_info['personal'][] = '<dd>'.$this->feather->utils->escape(($this->config['o_censoring'] == '1') ? censor_words($user['location']) : $user['location']).'</dd>';
         }
 
         if ($user['url'] != '') {
-            $user['url'] = feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['url']) : $user['url']);
+            $user['url'] = $this->feather->utils->escape(($this->config['o_censoring'] == '1') ? censor_words($user['url']) : $user['url']);
             $user_info['personal'][] = '<dt>'.__('Website').'</dt>';
             $user_info['personal'][] = '<dd><span class="website"><a href="'.$user['url'].'" rel="nofollow">'.$user['url'].'</a></span></dd>';
         }
 
         if ($user['email_setting'] == '0' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-            $user['email_field'] = '<a href="mailto:'.feather_escape($user['email']).'">'.feather_escape($user['email']).'</a>';
+            $user['email_field'] = '<a href="mailto:'.$this->feather->utils->escape($user['email']).'">'.$this->feather->utils->escape($user['email']).'</a>';
         } elseif ($user['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
             $user['email_field'] = '<a href="'.$this->feather->url->get('email/'.$user['id'].'/').'">'.__('Send email').'</a>';
         } else {
@@ -1151,7 +1151,7 @@ public function parse_user_info($user)
 
         if ($user['jabber'] != '') {
             $user_info['messaging'][] = '<dt>'.__('Jabber').'</dt>';
-            $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['jabber']) : $user['jabber']).'</dd>';
+            $user_info['messaging'][] = '<dd>'.$this->feather->utils->escape(($this->config['o_censoring'] == '1') ? censor_words($user['jabber']) : $user['jabber']).'</dd>';
         }
 
         if ($user['icq'] != '') {
@@ -1161,17 +1161,17 @@ public function parse_user_info($user)
 
         if ($user['msn'] != '') {
             $user_info['messaging'][] = '<dt>'.__('MSN').'</dt>';
-            $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['msn']) : $user['msn']).'</dd>';
+            $user_info['messaging'][] = '<dd>'.$this->feather->utils->escape(($this->config['o_censoring'] == '1') ? censor_words($user['msn']) : $user['msn']).'</dd>';
         }
 
         if ($user['aim'] != '') {
             $user_info['messaging'][] = '<dt>'.__('AOL IM').'</dt>';
-            $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['aim']) : $user['aim']).'</dd>';
+            $user_info['messaging'][] = '<dd>'.$this->feather->utils->escape(($this->config['o_censoring'] == '1') ? censor_words($user['aim']) : $user['aim']).'</dd>';
         }
 
         if ($user['yahoo'] != '') {
             $user_info['messaging'][] = '<dt>'.__('Yahoo').'</dt>';
-            $user_info['messaging'][] = '<dd>'.feather_escape(($this->config['o_censoring'] == '1') ? censor_words($user['yahoo']) : $user['yahoo']).'</dd>';
+            $user_info['messaging'][] = '<dd>'.$this->feather->utils->escape(($this->config['o_censoring'] == '1') ? censor_words($user['yahoo']) : $user['yahoo']).'</dd>';
         }
 
         if ($this->config['o_avatars'] == '1') {
@@ -1191,7 +1191,7 @@ public function parse_user_info($user)
 
         $posts_field = '';
         if ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) {
-            $posts_field = forum_number_format($user['num_posts']);
+            $posts_field = $this->feather->utils->forum_number_format($user['num_posts']);
         }
         if ($this->user->g_search == '1') {
             $quick_searches = array();
@@ -1214,11 +1214,11 @@ public function parse_user_info($user)
 
         if ($user['num_posts'] > 0) {
             $user_info['activity'][] = '<dt>'.__('Last post').'</dt>';
-            $user_info['activity'][] = '<dd>'.format_time($user['last_post']).'</dd>';
+            $user_info['activity'][] = '<dd>'.$this->feather->utils->format_time($user['last_post']).'</dd>';
         }
 
         $user_info['activity'][] = '<dt>'.__('Registered').'</dt>';
-        $user_info['activity'][] = '<dd>'.format_time($user['registered'], true).'</dd>';
+        $user_info['activity'][] = '<dd>'.$this->feather->utils->format_time($user['registered'], true).'</dd>';
 
         $user_info = $this->hook->fire('parse_user_info', $user_info);
 
@@ -1233,17 +1233,17 @@ public function edit_essentials($id, $user)
 
         if ($this->user->is_admmod) {
             if ($this->user->g_id == FEATHER_ADMIN || $this->user->g_mod_rename_users == '1') {
-                $user_disp['username_field'] = '<label class="required"><strong>'.__('Username').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_username" value="'.feather_escape($user['username']).'" size="25" maxlength="25" /><br /></label>'."\n";
+                $user_disp['username_field'] = '<label class="required"><strong>'.__('Username').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_username" value="'.$this->feather->utils->escape($user['username']).'" size="25" maxlength="25" /><br /></label>'."\n";
             } else {
-                $user_disp['username_field'] = '<p>'.sprintf(__('Username info'), feather_escape($user['username'])).'</p>'."\n";
+                $user_disp['username_field'] = '<p>'.sprintf(__('Username info'), $this->feather->utils->escape($user['username'])).'</p>'."\n";
             }
 
-            $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.feather_escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.$this->feather->url->get('email/'.$id.'/').'">'.__('Send email').'</a></span></p>'."\n";
+            $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.$this->feather->utils->escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.$this->feather->url->get('email/'.$id.'/').'">'.__('Send email').'</a></span></p>'."\n";
         } else {
-            $user_disp['username_field'] = '<p>'.__('Username').': '.feather_escape($user['username']).'</p>'."\n";
+            $user_disp['username_field'] = '<p>'.__('Username').': '.$this->feather->utils->escape($user['username']).'</p>'."\n";
 
             if ($this->config['o_regs_verify'] == '1') {
-                $user_disp['email_field'] = '<p>'.sprintf(__('Email info'), feather_escape($user['email']).' - <a href="'.$this->feather->url->get('user/'.$id.'/action/change_email/').'">'.__('Change email').'</a>').'</p>'."\n";
+                $user_disp['email_field'] = '<p>'.sprintf(__('Email info'), $this->feather->utils->escape($user['email']).' - <a href="'.$this->feather->url->get('user/'.$id.'/action/change_email/').'">'.__('Change email').'</a>').'</p>'."\n";
             } else {
                 $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.$user['email'].'" size="40" maxlength="80" /><br /></label>'."\n";
             }
@@ -1255,7 +1255,7 @@ public function edit_essentials($id, $user)
         if ($this->user->g_id == FEATHER_ADMIN) {
             $user_disp['posts_field'] .= '<label>'.__('Posts').'<br /><input type="text" name="num_posts" value="'.$user['num_posts'].'" size="8" maxlength="8" /><br /></label>';
         } elseif ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) {
-            $posts_actions[] = sprintf(__('Posts info'), forum_number_format($user['num_posts']));
+            $posts_actions[] = sprintf(__('Posts info'), $this->feather->utils->forum_number_format($user['num_posts']));
         }
 
         if ($this->user->g_search == '1' || $this->user->g_id == FEATHER_ADMIN) {
@@ -1291,9 +1291,9 @@ public function get_group_list($user)
 
         foreach ($result as $cur_group) {
             if ($cur_group['g_id'] == $user['g_id'] || ($cur_group['g_id'] == $this->config['o_default_user_group'] && $user['g_id'] == '')) {
-                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
             } else {
-                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
             }
         }
 
@@ -1332,13 +1332,13 @@ public function get_forum_list($id)
                     $output .= "\n\t\t\t\t\t\t\t".'</div>'."\n";
                 }
 
-                $output .= "\t\t\t\t\t\t\t".'<div class="conl">'."\n\t\t\t\t\t\t\t\t".'<p><strong>'.feather_escape($cur_forum['cat_name']).'</strong></p>'."\n\t\t\t\t\t\t\t\t".'<div class="rbox">';
+                $output .= "\t\t\t\t\t\t\t".'<div class="conl">'."\n\t\t\t\t\t\t\t\t".'<p><strong>'.$this->feather->utils->escape($cur_forum['cat_name']).'</strong></p>'."\n\t\t\t\t\t\t\t\t".'<div class="rbox">';
                 $cur_category = $cur_forum['cid'];
             }
 
             $moderators = ($cur_forum['moderators'] != '') ? unserialize($cur_forum['moderators']) : array();
 
-            $output .= "\n\t\t\t\t\t\t\t\t\t".'<label><input type="checkbox" name="moderator_in['.$cur_forum['fid'].']" value="1"'.((in_array($id, $moderators)) ? ' checked="checked"' : '').' />'.feather_escape($cur_forum['forum_name']).'<br /></label>'."\n";
+            $output .= "\n\t\t\t\t\t\t\t\t\t".'<label><input type="checkbox" name="moderator_in['.$cur_forum['fid'].']" value="1"'.((in_array($id, $moderators)) ? ' checked="checked"' : '').' />'.$this->feather->utils->escape($cur_forum['forum_name']).'<br /></label>'."\n";
         }
 
         $output = $this->hook->fire('get_forum_list', $output);
diff --git a/model/register.php b/model/register.php
index 072ad320..65750b45 100644
--- a/model/register.php
+++ b/model/register.php
@@ -46,23 +46,23 @@ public function check_for_errors()
         }
 
 
-        $user['username'] = feather_trim($this->request->post('req_user'));
-        $user['email1'] = strtolower(feather_trim($this->request->post('req_email1')));
+        $user['username'] = $this->feather->utils->trim($this->request->post('req_user'));
+        $user['email1'] = strtolower($this->feather->utils->trim($this->request->post('req_email1')));
 
         if ($this->config['o_regs_verify'] == '1') {
-            $email2 = strtolower(feather_trim($this->request->post('req_email2')));
+            $email2 = strtolower($this->feather->utils->trim($this->request->post('req_email2')));
 
             $user['password1'] = random_pass(12);
             $password2 = $user['password1'];
         } else {
-            $user['password1'] = feather_trim($this->request->post('req_password1'));
-            $password2 = feather_trim($this->request->post('req_password2'));
+            $user['password1'] = $this->feather->utils->trim($this->request->post('req_password1'));
+            $password2 = $this->feather->utils->trim($this->request->post('req_password2'));
         }
 
         // Validate username and passwords
         $user['errors'] = check_username($user['username'], $user['errors']);
 
-        if (feather_strlen($user['password1']) < 6) {
+        if ($this->feather->utils->strlen($user['password1']) < 6) {
             $user['errors'][] = __('Pass too short');
         } elseif ($user['password1'] != $password2) {
             $user['errors'][] = __('Pass not match');
@@ -263,7 +263,7 @@ public function insert_user($user)
 
             $this->email->feather_mail($user['email1'], $mail_subject, $mail_message);
 
-            message(__('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
+            message(__('Reg email').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.', true);
         }
 
         $this->auth->feather_setcookie($new_uid, $password_hash, time() + $this->config['o_timeout_visit']);
diff --git a/model/search.php b/model/search.php
index b454cb25..9e77d444 100644
--- a/model/search.php
+++ b/model/search.php
@@ -52,14 +52,14 @@ public function get_search_results()
         }
         // If it's a regular search (keywords and/or author)
         elseif ($action == 'search') {
-            $keywords = ($this->request->get('keywords')) ? utf8_strtolower(feather_trim($this->request->get('keywords'))) : null;
-            $author = ($this->request->get('author')) ? utf8_strtolower(feather_trim($this->request->get('author'))) : null;
+            $keywords = ($this->request->get('keywords')) ? utf8_strtolower($this->feather->utils->trim($this->request->get('keywords'))) : null;
+            $author = ($this->request->get('author')) ? utf8_strtolower($this->feather->utils->trim($this->request->get('author'))) : null;
 
-            if (preg_match('%^[\*\%]+$%', $keywords) || (feather_strlen(str_replace(array('*', '%'), '', $keywords)) < FEATHER_SEARCH_MIN_WORD && !$this->search->is_cjk($keywords))) {
+            if (preg_match('%^[\*\%]+$%', $keywords) || ($this->feather->utils->strlen(str_replace(array('*', '%'), '', $keywords)) < FEATHER_SEARCH_MIN_WORD && !$this->search->is_cjk($keywords))) {
                 $keywords = '';
             }
 
-            if (preg_match('%^[\*\%]+$%', $author) || feather_strlen(str_replace(array('*', '%'), '', $author)) < 2) {
+            if (preg_match('%^[\*\%]+$%', $author) || $this->feather->utils->strlen(str_replace(array('*', '%'), '', $author)) < 2) {
                 $author = '';
             }
 
@@ -290,13 +290,13 @@ public function get_search_results()
                 // If we searched for both keywords and author name we want the intersection between the results
                 if ($author && $keywords) {
                     $search_ids = array_intersect_assoc($keyword_results, $author_results);
-                    $search_type = array('both', array($keywords, feather_trim($this->request->get('author'))), implode(',', $forums), $search_in);
+                    $search_type = array('both', array($keywords, $this->feather->utils->trim($this->request->get('author'))), implode(',', $forums), $search_in);
                 } elseif ($keywords) {
                     $search_ids = $keyword_results;
                     $search_type = array('keywords', $keywords, implode(',', $forums), $search_in);
                 } else {
                     $search_ids = $author_results;
-                    $search_type = array('author', feather_trim($this->request->get('author')), implode(',', $forums), $search_in);
+                    $search_type = array('author', $this->feather->utils->trim($this->request->get('author')), implode(',', $forums), $search_in);
                 }
 
                 $search_ids = $this->hook->fire('get_search_results_search_ids', $search_ids);
@@ -643,9 +643,9 @@ public function get_search_results()
 
             if ($search_type[0] == 'action') {
                 if ($search_type[1] == 'show_user_topics') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_topics'), feather_escape($search['search_set'][0]['poster'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_topics'), $this->feather->utils->escape($search['search_set'][0]['poster'])).'</a>';
                 } elseif ($search_type[1] == 'show_user_posts') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_posts'), feather_escape($search['search_set'][0]['pposter'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_posts'), $this->feather->utils->escape($search['search_set'][0]['pposter'])).'</a>';
                 } elseif ($search_type[1] == 'show_subscriptions') {
                     // Fetch username of subscriber
                     $subscriber_id = $search_type[2];
@@ -658,7 +658,7 @@ public function get_search_results()
                         message(__('Bad request'), '404');
                     }
 
-                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), feather_escape($subscriber_name)).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), $this->feather->utils->escape($subscriber_name)).'</a>';
                 } else {
                     $search_url = str_replace('_', '/', $search_type[1]);
                     $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/'.$search_url.'/').'">'.__('Quick search '.$search_type[1]).'</a>';
@@ -668,13 +668,13 @@ public function get_search_results()
 
                 if ($search_type[0] == 'both') {
                     list($keywords, $author) = $search_type[1];
-                    $search['crumbs_text']['search_type'] = sprintf(__('By both show as '.$show_as), feather_escape($keywords), feather_escape($author));
+                    $search['crumbs_text']['search_type'] = sprintf(__('By both show as '.$show_as), $this->feather->utils->escape($keywords), $this->feather->utils->escape($author));
                 } elseif ($search_type[0] == 'keywords') {
                     $keywords = $search_type[1];
-                    $search['crumbs_text']['search_type'] = sprintf(__('By keywords show as '.$show_as), feather_escape($keywords));
+                    $search['crumbs_text']['search_type'] = sprintf(__('By keywords show as '.$show_as), $this->feather->utils->escape($keywords));
                 } elseif ($search_type[0] == 'author') {
                     $author = $search_type[1];
-                    $search['crumbs_text']['search_type'] = sprintf(__('By user show as '.$show_as), feather_escape($author));
+                    $search['crumbs_text']['search_type'] = sprintf(__('By user show as '.$show_as), $this->feather->utils->escape($author));
                 }
 
                 $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=search&amp;keywords='.urlencode($keywords).'&amp;author='.urlencode($author).'&amp;forums='.$search_type[2].'&amp;search_in='.$search_type[3].'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir.'&amp;show_as='.$show_as).'">'.$search['crumbs_text']['search_type'].'</a>';
@@ -702,7 +702,7 @@ public function display_search_results($search)
         $post_count = $topic_count = 0;
 
         foreach ($search['search_set'] as $cur_search) {
-            $forum = '<a href="'.$this->feather->url->get('forum/'.$cur_search['forum_id'].'/'.$this->feather->url->url_friendly($cur_search['forum_name']).'/').'">'.feather_escape($cur_search['forum_name']).'</a>';
+            $forum = '<a href="'.$this->feather->url->get('forum/'.$cur_search['forum_id'].'/'.$this->feather->url->url_friendly($cur_search['forum_name']).'/').'">'.$this->feather->utils->escape($cur_search['forum_name']).'</a>';
             $url_topic = $this->feather->url->url_friendly($cur_search['subject']);
 
             if ($this->config['o_censoring'] == '1') {
@@ -727,7 +727,7 @@ public function display_search_results($search)
                 }
 
                 $cur_search['message'] = parse_message($cur_search['message'], $cur_search['hide_smilies']);
-                $pposter = feather_escape($cur_search['pposter']);
+                $pposter = $this->feather->utils->escape($cur_search['pposter']);
 
                 if ($cur_search['poster_id'] > 1 && $this->user->g_view_users == '1') {
                     $cur_search['pposter_disp'] = '<strong><a href="'.$this->feather->url->get('user/'.$cur_search['poster_id'].'/').'">'.$pposter.'</a></strong>';
@@ -748,7 +748,7 @@ public function display_search_results($search)
                 $cur_search['item_status'] = ($topic_count % 2 == 0) ? 'roweven' : 'rowodd';
                 $cur_search['icon_type'] = 'icon';
 
-                $subject = '<a href="'.$this->feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.feather_escape($cur_search['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['poster']).'</span>';
+                $subject = '<a href="'.$this->feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.$this->feather->utils->escape($cur_search['subject']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_search['poster']).'</span>';
 
                 if ($cur_search['sticky'] == '1') {
                     $cur_search['item_status'] .= ' isticky';
@@ -848,12 +848,12 @@ public function get_list_forums()
                         $output .= "\t\t\t\t\t\t\t".'</fieldset>'."\n";
                     }
 
-                    $output .= "\t\t\t\t\t\t\t".'<fieldset><legend><span>'.feather_escape($cur_forum['cat_name']).'</span></legend>'."\n";
+                    $output .= "\t\t\t\t\t\t\t".'<fieldset><legend><span>'.$this->feather->utils->escape($cur_forum['cat_name']).'</span></legend>'."\n";
                     $output .= "\t\t\t\t\t\t\t\t".'<div class="rbox">';
                     $cur_category = $cur_forum['cid'];
                 }
 
-                $output .= "\t\t\t\t\t\t\t\t".'<label><input type="checkbox" name="forums[]" id="forum-'.$cur_forum['fid'].'" value="'.$cur_forum['fid'].'" />'.feather_escape($cur_forum['forum_name']).'</label>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t".'<label><input type="checkbox" name="forums[]" id="forum-'.$cur_forum['fid'].'" value="'.$cur_forum['fid'].'" />'.$this->feather->utils->escape($cur_forum['forum_name']).'</label>'."\n";
             }
 
             if ($cur_category) {
@@ -879,11 +879,11 @@ public function get_list_forums()
                         $output .= "\t\t\t\t\t\t\t".'</optgroup>'."\n";
                     }
 
-                    $output .= "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cur_forum['cat_name']).'">'."\n";
+                    $output .= "\t\t\t\t\t\t\t".'<optgroup label="'.$this->feather->utils->escape($cur_forum['cat_name']).'">'."\n";
                     $cur_category = $cur_forum['cid'];
                 }
 
-                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_forum['fid'].'">'.feather_escape($cur_forum['forum_name']).'</option>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_forum['fid'].'">'.$this->feather->utils->escape($cur_forum['forum_name']).'</option>'."\n";
             }
 
             $output .= "\t\t\t\t\t\t\t".'</optgroup>'."\n";
diff --git a/model/userlist.php b/model/userlist.php
index e0ed9d95..9fd8b1c3 100644
--- a/model/userlist.php
+++ b/model/userlist.php
@@ -64,9 +64,9 @@ public function generate_dropdown_menu($show_group)
 
         foreach($result as $cur_group) {
             if ($cur_group['g_id'] == $show_group) {
-                $dropdown_menu .= "\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+                $dropdown_menu .= "\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
             } else {
-                $dropdown_menu .= "\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+                $dropdown_menu .= "\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
             }
         }
 
diff --git a/model/viewforum.php b/model/viewforum.php
index 126ee3dc..0dad4af8 100644
--- a/model/viewforum.php
+++ b/model/viewforum.php
@@ -187,7 +187,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 $url_subject = $this->feather->url->url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_formatted'] = '<a href="'.$this->feather->url->get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_formatted'] = '<a href="'.$this->feather->url->get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.$this->feather->utils->format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['last_poster']).'</span>';
                 } else {
                     $cur_topic['last_post_formatted'] = '- - -';
                 }
@@ -202,13 +202,13 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.$this->feather->utils->escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.$this->feather->utils->escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.feather_escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.$this->feather->utils->escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
diff --git a/model/viewtopic.php b/model/viewtopic.php
index 30a900b5..2b8d28ad 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -275,9 +275,9 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
             // If the poster is a registered user
             if ($cur_post['poster_id'] > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $cur_post['username_formatted'] = '<a href="'.$this->feather->url->base().'/user/'.$cur_post['poster_id'].'/">'.feather_escape($cur_post['username']).'</a>';
+                    $cur_post['username_formatted'] = '<a href="'.$this->feather->url->base().'/user/'.$cur_post['poster_id'].'/">'.$this->feather->utils->escape($cur_post['username']).'</a>';
                 } else {
-                    $cur_post['username_formatted'] = feather_escape($cur_post['username']);
+                    $cur_post['username_formatted'] = $this->feather->utils->escape($cur_post['username']);
                 }
 
                 $cur_post['user_title_formatted'] = get_title($cur_post);
@@ -304,18 +304,18 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                             $cur_post['location'] = censor_words($cur_post['location']);
                         }
 
-                        $cur_post['user_info'][] = '<dd><span>'.__('From').' '.feather_escape($cur_post['location']).'</span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.__('From').' '.$this->feather->utils->escape($cur_post['location']).'</span></dd>';
                     }
 
-                    $cur_post['user_info'][] = '<dd><span>'.__('Registered topic').' '.format_time($cur_post['registered'], true).'</span></dd>';
+                    $cur_post['user_info'][] = '<dd><span>'.__('Registered topic').' '.$this->feather->utils->format_time($cur_post['registered'], true).'</span></dd>';
 
                     if ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) {
-                        $cur_post['user_info'][] = '<dd><span>'.__('Posts topic').' '.forum_number_format($cur_post['num_posts']).'</span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.__('Posts topic').' '.$this->feather->utils->forum_number_format($cur_post['num_posts']).'</span></dd>';
                     }
 
                     // Now let's deal with the contact links (Email and URL)
                     if ((($cur_post['email_setting'] == '0' && !$this->user->is_guest) || $this->user->is_admmod) && $this->user->g_send_email == '1') {
-                        $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['email']).'">'.__('Email').'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.$this->feather->utils->escape($cur_post['email']).'">'.__('Email').'</a></span>';
                     } elseif ($cur_post['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
                         $cur_post['user_contacts'][] = '<span class="email"><a href="'.$this->feather->url->get('email/'.$cur_post['poster_id'].'/').'">'.__('Email').'</a></span>';
                     }
@@ -325,7 +325,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                             $cur_post['url'] = censor_words($cur_post['url']);
                         }
 
-                        $cur_post['user_contacts'][] = '<span class="website"><a href="'.feather_escape($cur_post['url']).'" rel="nofollow">'.__('Website').'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="website"><a href="'.$this->feather->utils->escape($cur_post['url']).'" rel="nofollow">'.__('Website').'</a></span>';
                     }
                 }
 
@@ -336,24 +336,24 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 }
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.$this->feather->utils->escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
 
                     if ($cur_post['admin_note'] != '') {
-                        $cur_post['user_info'][] = '<dd><span>'.__('Note').' <strong>'.feather_escape($cur_post['admin_note']).'</strong></span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.__('Note').' <strong>'.$this->feather->utils->escape($cur_post['admin_note']).'</strong></span></dd>';
                     }
                 }
             }
             // If the poster is a guest (or a user that has been deleted)
             else {
-                $cur_post['username_formatted'] = feather_escape($cur_post['username']);
+                $cur_post['username_formatted'] = $this->feather->utils->escape($cur_post['username']);
                 $cur_post['user_title_formatted'] = get_title($cur_post);
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.feather_escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.$this->feather->utils->escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
                 }
 
                 if ($this->config['o_show_user_info'] == '1' && $cur_post['poster_email'] != '' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-                    $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.feather_escape($cur_post['poster_email']).'">'.__('Email').'</a></span>';
+                    $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.$this->feather->utils->escape($cur_post['poster_email']).'">'.__('Email').'</a></span>';
                 }
             }
 
diff --git a/style/FeatherBB/view/admin/bans/add_ban.php b/style/FeatherBB/view/admin/bans/add_ban.php
index 8170a2a9..1bda2c69 100644
--- a/style/FeatherBB/view/admin/bans/add_ban.php
+++ b/style/FeatherBB/view/admin/bans/add_ban.php
@@ -31,7 +31,7 @@
 								<th scope="row"><?php _e('Username label') ?></th>
 								<td>
 									<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
-										echo feather_escape($ban['ban_user']);
+										echo $feather->utils->escape($ban['ban_user']);
 									} ?>" tabindex="1" />
 									<span><?php _e('Username help') ?></span>
 								</td>
@@ -40,7 +40,7 @@
 								<th scope="row"><?php _e('IP label') ?></th>
 								<td>
 									<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
-										echo feather_escape($ban['ip']);
+										echo $feather->utils->escape($ban['ip']);
 									} ?>" tabindex="2" />
 										<span><?php _e('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
 												printf(' '.__('IP help link'), '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.__('here').'</a>');
@@ -51,7 +51,7 @@
 								<th scope="row"><?php _e('E-mail label') ?></th>
 								<td>
 									<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
-										echo feather_escape($ban['email']);
+										echo $feather->utils->escape($ban['email']);
 									} ?>" tabindex="3" />
 									<span><?php _e('E-mail help') ?></span>
 								</td>
@@ -70,7 +70,7 @@
 								<th scope="row"><?php _e('Ban message label') ?></th>
 								<td>
 									<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
-										echo feather_escape($ban['message']);
+										echo $feather->utils->escape($ban['message']);
 									} ?>" tabindex="4" />
 									<span><?php _e('Ban message help') ?></span>
 								</td>
diff --git a/style/FeatherBB/view/admin/bans/search_ban.php b/style/FeatherBB/view/admin/bans/search_ban.php
index b8aefcbb..356a0baa 100644
--- a/style/FeatherBB/view/admin/bans/search_ban.php
+++ b/style/FeatherBB/view/admin/bans/search_ban.php
@@ -50,12 +50,12 @@
         foreach ($ban_data as $cur_ban) {
             ?>
 				<tr>
-					<td class="tcl"><?php echo($cur_ban['username'] != '') ? feather_escape($cur_ban['username']) : '&#160;' ?></td>
-					<td class="tc2"><?php echo($cur_ban['email'] != '') ? feather_escape($cur_ban['email']) : '&#160;' ?></td>
-					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? feather_escape($cur_ban['ip']) : '&#160;' ?></td>
-					<td class="tc4"><?php echo format_time($cur_ban['expire'], true) ?></td>
-					<td class="tc5"><?php echo($cur_ban['message'] != '') ? feather_escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
+					<td class="tcl"><?php echo($cur_ban['username'] != '') ? $feather->utils->escape($cur_ban['username']) : '&#160;' ?></td>
+					<td class="tc2"><?php echo($cur_ban['email'] != '') ? $feather->utils->escape($cur_ban['email']) : '&#160;' ?></td>
+					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? $feather->utils->escape($cur_ban['ip']) : '&#160;' ?></td>
+					<td class="tc4"><?php echo $feather->utils->format_time($cur_ban['expire'], true) ?></td>
+					<td class="tc5"><?php echo($cur_ban['message'] != '') ? $feather->utils->escape($cur_ban['message']) : '&#160;' ?></td>
+					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.$feather->utils->escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
 					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
 				</tr>
 <?php
diff --git a/style/FeatherBB/view/admin/categories.php b/style/FeatherBB/view/admin/categories.php
index 7d922439..3a2057b7 100644
--- a/style/FeatherBB/view/admin/categories.php
+++ b/style/FeatherBB/view/admin/categories.php
@@ -53,7 +53,7 @@
 <?php
 
     foreach ($cat_list as $cur_cat) {
-        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.feather_escape($cur_cat['cat_name']).'</option>'."\n";
+        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.$feather->utils->escape($cur_cat['cat_name']).'</option>'."\n";
     }
 
 ?>
@@ -90,7 +90,7 @@
     foreach ($cat_list as $cur_cat) {
         ?>
 								<tr>
-									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo feather_escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
+									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo $feather->utils->escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
 									<td><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][order]" value="<?php echo $cur_cat['disp_position'] ?>" size="3" maxlength="3" /></td>
 								</tr>
 <?php
diff --git a/style/FeatherBB/view/admin/censoring.php b/style/FeatherBB/view/admin/censoring.php
index bcd64ca5..54a063a6 100644
--- a/style/FeatherBB/view/admin/censoring.php
+++ b/style/FeatherBB/view/admin/censoring.php
@@ -61,7 +61,7 @@
 <?php
 
     foreach ($word_data as $word) {
-        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.feather_escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.feather_escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
+        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.$feather->utils->escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.$feather->utils->escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
     }
 
     ?>
diff --git a/style/FeatherBB/view/admin/forums/admin_forums.php b/style/FeatherBB/view/admin/forums/admin_forums.php
index a2525106..abcd2bf7 100644
--- a/style/FeatherBB/view/admin/forums/admin_forums.php
+++ b/style/FeatherBB/view/admin/forums/admin_forums.php
@@ -31,7 +31,7 @@
 									<td>
 										<select name="cat" tabindex="1">
 											<?php  foreach ($cat_list as $cat) {
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.feather_escape($cat['cat_name']).'</option>'."\n";
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.$feather->utils->escape($cat['cat_name']).'</option>'."\n";
 											} ?>
 										</select>
 										<span><?php _e('Add forum help') ?></span>
@@ -73,7 +73,7 @@
             ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php _e('Category subhead') ?> <?php echo feather_escape($cat_data['cat_name']) ?></legend>
+						<legend><?php _e('Category subhead') ?> <?php echo $feather->utils->escape($cat_data['cat_name']) ?></legend>
 						<div class="infldset">
 							<table>
 							<thead>
@@ -90,7 +90,7 @@
 								<tr>
 									<td class="tcl"><a href="<?php echo $feather->url->get('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
 									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
-									<td class="tcr"><strong><?php echo feather_escape($forum['forum_name']) ?></strong></td>
+									<td class="tcr"><strong><?php echo $feather->utils->escape($forum['forum_name']) ?></strong></td>
 								</tr>
 <?php
     }
diff --git a/style/FeatherBB/view/admin/forums/permissions.php b/style/FeatherBB/view/admin/forums/permissions.php
index 7b394b63..8368cfa9 100644
--- a/style/FeatherBB/view/admin/forums/permissions.php
+++ b/style/FeatherBB/view/admin/forums/permissions.php
@@ -26,11 +26,11 @@
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php _e('Forum name label') ?></th>
-									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo feather_escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
+									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo $feather->utils->escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Forum description label') ?></th>
-									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo feather_escape($cur_forum['forum_desc']) ?></textarea></td>
+									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo $feather->utils->escape($cur_forum['forum_desc']) ?></textarea></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Category label') ?></th>
@@ -38,7 +38,7 @@
 										<select name="cat_id" tabindex="3">
 											<?php  foreach ($forum_data as $cat_id => $cat_data) {
 												$selected = ($cat_id == $cur_forum['cat_id']) ? 'selected="selected"' : '';
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.feather_escape($cat_data['cat_name']).'</option>'."\n";
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.$feather->utils->escape($cat_data['cat_name']).'</option>'."\n";
 											} ?>
 										</select>
 									</td>
@@ -61,7 +61,7 @@
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Redirect label') ?></th>
-									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.feather_escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
+									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.$feather->utils->escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
 								</tr>
 							</table>
 						</div>
@@ -86,7 +86,7 @@
     foreach ($perm_data as $perm) {
         ?>
 								<tr>
-									<th class="atcl"><?php echo feather_escape($perm['g_title']) ?></th>
+									<th class="atcl"><?php echo $feather->utils->escape($perm['g_title']) ?></th>
 									<td<?php if (!$perm['read_forum_def']) {
     echo ' class="nodefault"';
 }
diff --git a/style/FeatherBB/view/admin/groups/add_edit_group.php b/style/FeatherBB/view/admin/groups/add_edit_group.php
index ae278dce..f09d4255 100644
--- a/style/FeatherBB/view/admin/groups/add_edit_group.php
+++ b/style/FeatherBB/view/admin/groups/add_edit_group.php
@@ -32,14 +32,14 @@
 									<th scope="row"><?php _e('Group title label') ?></th>
 									<td>
 										<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
-    echo feather_escape($group['info']['g_title']);
+    echo $feather->utils->escape($group['info']['g_title']);
 } ?>" tabindex="1" />
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('User title label') ?></th>
 									<td>
-										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
+										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo $feather->utils->escape($group['info']['g_user_title']) ?>" tabindex="2" />
 										<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
 									</td>
 								</tr>
@@ -50,7 +50,7 @@
 											<option value="0"><?php _e('Disable promotion') ?></option>
 											<?php echo $group_list ?>
 										</select>
-										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo feather_escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
+										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo $feather->utils->escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
 										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
 									</td>
 								</tr>
diff --git a/style/FeatherBB/view/admin/groups/admin_groups.php b/style/FeatherBB/view/admin/groups/admin_groups.php
index 10b68fa4..6d43231a 100644
--- a/style/FeatherBB/view/admin/groups/admin_groups.php
+++ b/style/FeatherBB/view/admin/groups/admin_groups.php
@@ -32,9 +32,9 @@
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
         if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
         } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
         }
     }
 }
@@ -65,9 +65,9 @@
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
         if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
         } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
         }
     }
 }
@@ -95,7 +95,7 @@
 							<table>
 <?php
 foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.$feather->utils->escape($cur_group['g_title']).'</td></tr>'."\n";
 }
 
 ?>
diff --git a/style/FeatherBB/view/admin/groups/confirm_delete.php b/style/FeatherBB/view/admin/groups/confirm_delete.php
index 91b0b84e..2ea97c75 100644
--- a/style/FeatherBB/view/admin/groups/confirm_delete.php
+++ b/style/FeatherBB/view/admin/groups/confirm_delete.php
@@ -23,7 +23,7 @@
 					<fieldset>
 						<legend><?php _e('Confirm delete subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Confirm delete info'), feather_escape($group_title)) ?></p>
+							<p><?php printf(__('Confirm delete info'), $feather->utils->escape($group_title)) ?></p>
 							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
 						</div>
 					</fieldset>
diff --git a/style/FeatherBB/view/admin/groups/delete_group.php b/style/FeatherBB/view/admin/groups/delete_group.php
index c9cd76e8..be55e2a4 100644
--- a/style/FeatherBB/view/admin/groups/delete_group.php
+++ b/style/FeatherBB/view/admin/groups/delete_group.php
@@ -22,7 +22,7 @@
 					<fieldset>
 						<legend><?php _e('Move users subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Move users info'), feather_escape($group_info['title']), forum_number_format($group_info['members'])) ?></p>
+							<p><?php printf(__('Move users info'), $feather->utils->escape($group_info['title']), $feather->utils->forum_number_format($group_info['members'])) ?></p>
 							<label><?php _e('Move users label') ?>
 							<select name="move_to_group">
 								<?= $group_list_delete; ?>
diff --git a/style/FeatherBB/view/admin/maintenance/prune.php b/style/FeatherBB/view/admin/maintenance/prune.php
index 0232957a..fa4aea34 100644
--- a/style/FeatherBB/view/admin/maintenance/prune.php
+++ b/style/FeatherBB/view/admin/maintenance/prune.php
@@ -26,7 +26,7 @@
 					<fieldset>
 						<legend><?php _e('Confirm prune subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], forum_number_format($prune['num_topics'])) ?></p>
+							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], $feather->utils->forum_number_format($prune['num_topics'])) ?></p>
 							<p class="warntext"><?php _e('Confirm prune warn') ?></p>
 						</div>
 					</fieldset>
diff --git a/style/FeatherBB/view/admin/options.php b/style/FeatherBB/view/admin/options.php
index 867e95b1..98e4eed5 100644
--- a/style/FeatherBB/view/admin/options.php
+++ b/style/FeatherBB/view/admin/options.php
@@ -28,21 +28,21 @@
 								<tr>
 									<th scope="row"><?php _e('Board title label') ?></th>
 									<td>
-										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>" />
+										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?>" />
 										<span><?php _e('Board title help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Board desc label') ?></th>
 									<td>
-										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather->forum_settings['o_board_desc']) ?></textarea>
+										<textarea name="form_board_desc" cols="60" rows="3"><?php echo $feather->utils->escape($feather->forum_settings['o_board_desc']) ?></textarea>
 										<span><?php _e('Board desc help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Base URL label') ?></th>
 									<td>
-										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather->forum_settings['o_base_url']) ?>" />
+										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo $feather->utils->escape($feather->forum_settings['o_base_url']) ?>" />
 										<span><?php _e('Base URL help') ?></span>
 									</td>
 								</tr>
@@ -231,14 +231,14 @@
 								<tr>
 									<th scope="row"><?php _e('Time format label') ?></th>
 									<td>
-										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather->forum_settings['o_time_format']) ?>" />
+										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo $feather->utils->escape($feather->forum_settings['o_time_format']) ?>" />
 										<span><?php printf(__('Time format help'), gmdate($feather->forum_settings['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Date format label') ?></th>
 									<td>
-										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather->forum_settings['o_date_format']) ?>" />
+										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo $feather->utils->escape($feather->forum_settings['o_date_format']) ?>" />
 										<span><?php printf(__('Date format help'), gmdate($feather->forum_settings['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
@@ -499,7 +499,7 @@
 								<tr>
 									<th scope="row"><?php _e('Menu items label') ?></th>
 									<td>
-										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
+										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
 										<span><?php _e('Menu items help') ?></span>
 									</td>
 								</tr>
@@ -566,7 +566,7 @@
 								<tr>
 									<th scope="row"><?php _e('Mailing list label') ?></th>
 									<td>
-										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_mailing_list']) ?></textarea>
+										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_mailing_list']) ?></textarea>
 										<span><?php _e('Mailing list help') ?></span>
 									</td>
 								</tr>
@@ -594,7 +594,7 @@
 								<tr>
 									<th scope="row"><?php _e('Upload directory label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather->forum_settings['o_avatars_dir']) ?>" />
+										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo $feather->utils->escape($feather->forum_settings['o_avatars_dir']) ?>" />
 										<span><?php _e('Upload directory help') ?></span>
 									</td>
 								</tr>
@@ -631,14 +631,14 @@
 								<tr>
 									<th scope="row"><?php _e('Admin e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather->forum_settings['o_admin_email']) ?>" />
+										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo $feather->utils->escape($feather->forum_settings['o_admin_email']) ?>" />
 										<span><?php _e('Admin e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather->forum_settings['o_webmaster_email']) ?>" />
+										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo $feather->utils->escape($feather->forum_settings['o_webmaster_email']) ?>" />
 										<span><?php _e('Webmaster e-mail help') ?></span>
 									</td>
 								</tr>
@@ -669,14 +669,14 @@
 								<tr>
 									<th scope="row"><?php _e('SMTP address label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather->forum_settings['o_smtp_host']) ?>" />
+										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo $feather->utils->escape($feather->forum_settings['o_smtp_host']) ?>" />
 										<span><?php _e('SMTP address help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('SMTP username label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather->forum_settings['o_smtp_user']) ?>" />
+										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo $feather->utils->escape($feather->forum_settings['o_smtp_user']) ?>" />
 										<span><?php _e('SMTP username help') ?></span>
 									</td>
 								</tr>
@@ -684,7 +684,7 @@
 									<th scope="row"><?php _e('SMTP password label') ?></th>
 									<td>
 										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
-<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key(feather_strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
+<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key($feather->utils->strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
 										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<span><?php _e('SMTP password help') ?></span>
@@ -762,7 +762,7 @@
 								<tr>
 									<th scope="row"><?php _e('Rules label') ?></th>
 									<td>
-										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather->forum_settings['o_rules_message']) ?></textarea>
+										<textarea name="form_rules_message" rows="10" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_rules_message']) ?></textarea>
 										<span><?php _e('Rules help') ?></span>
 									</td>
 								</tr>
@@ -805,7 +805,7 @@
 								<tr>
 									<th scope="row"><?php _e('Announcement message label') ?></th>
 									<td>
-										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_announcement_message']) ?></textarea>
+										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_announcement_message']) ?></textarea>
 										<span><?php _e('Announcement message help') ?></span>
 									</td>
 								</tr>
@@ -833,7 +833,7 @@
 								<tr>
 									<th scope="row"><?php _e('Maintenance message label') ?></th>
 									<td>
-										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
+										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
 										<span><?php _e('Maintenance message help') ?></span>
 									</td>
 								</tr>
diff --git a/style/FeatherBB/view/admin/parser.php b/style/FeatherBB/view/admin/parser.php
index 35699c2b..35ee0cbe 100644
--- a/style/FeatherBB/view/admin/parser.php
+++ b/style/FeatherBB/view/admin/parser.php
@@ -87,12 +87,12 @@
 										<input type="radio" name="config[valid_imgs]" value="1"<?php if ($config['valid_imgs']) {
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
+    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
 } ?> /> <strong><?php _e('Yes') ?></strong>
 										<input type="radio" name="config[valid_imgs]" value="0"<?php if (!$config['valid_imgs']) {
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
+    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
 } ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td><?php echo $lang_admin_parser['valid_imgs help'] ?></td>
@@ -101,7 +101,7 @@
 									<th scope="row"><?php echo $lang_admin_parser['max_size'] ?></th>
 									<td colspan="2">
 										<input type="text" name="config[max_size]" size="10" maxlength="8" value="<?php echo($config['max_size'])?>"<?php if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
+    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
 } ?> />
 									</td>
 									<td><span><?php echo $lang_admin_parser['max_size help'] ?></span></td>
@@ -165,7 +165,7 @@
         ?>
 								<tr>
 									<td><input type="text" name="smiley_text[<?php echo($i);
-        ?>]" value="<?php echo(feather_escape($key));
+        ?>]" value="<?php echo($feather->utils->escape($key));
         ?>" size="20" maxlength="80" /></td>
 									<td>
 										<select name="smiley_file[<?php echo($i);
diff --git a/style/FeatherBB/view/admin/reports.php b/style/FeatherBB/view/admin/reports.php
index c5249f65..d16db894 100644
--- a/style/FeatherBB/view/admin/reports.php
+++ b/style/FeatherBB/view/admin/reports.php
@@ -24,18 +24,18 @@
         ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php printf(__('Report subhead'), format_time($report['created'])) ?></legend>
+						<legend><?php printf(__('Report subhead'), $feather->utils->format_time($report['created'])) ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
 									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
-									<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
+									<td><?php echo str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
 								</tr>
 							</table>
 						</div>
@@ -74,18 +74,18 @@
         ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
+						<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.$feather->utils->escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
 									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?></th>
-									<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
+									<td><?php echo str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
 								</tr>
 							</table>
 						</div>
diff --git a/style/FeatherBB/view/admin/statistics.php b/style/FeatherBB/view/admin/statistics.php
index f97ff25c..f2fd7a9a 100644
--- a/style/FeatherBB/view/admin/statistics.php
+++ b/style/FeatherBB/view/admin/statistics.php
@@ -30,7 +30,7 @@
 					</dd>
 					<dt><?php _e('Database label') ?></dt>
 					<dd>
-<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", forum_number_format($total_records)) ?>
+<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", $feather->utils->forum_number_format($total_records)) ?>
 						<br /><?php printf(__('Database data size')."\n", $total_size) ?>
 <?php endif; ?>					</dd>
 <?php endif; ?>
diff --git a/style/FeatherBB/view/admin/users/find_users.php b/style/FeatherBB/view/admin/users/find_users.php
index 390c8eaf..3ddd2324 100644
--- a/style/FeatherBB/view/admin/users/find_users.php
+++ b/style/FeatherBB/view/admin/users/find_users.php
@@ -54,11 +54,11 @@
         foreach ($user_data as $user) {
             ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo feather_escape($user['email']) ?>"><?php echo feather_escape($user['email']) ?></a></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.$feather->utils->escape($user['username']).'</a>' ?></td>
+					<td class="tc2"><a href="mailto:<?php echo $feather->utils->escape($user['email']) ?>"><?php echo $feather->utils->escape($user['email']) ?></a></td>
 					<td class="tc3"><?php echo $user['user_title'] ?></td>
-					<td class="tc4"><?php echo forum_number_format($user['num_posts']) ?></td>
-					<td class="tc5"><?php echo($user['admin_note'] != '') ? feather_escape($user['admin_note']) : '&#160;' ?></td>
+					<td class="tc4"><?php echo $feather->utils->forum_number_format($user['num_posts']) ?></td>
+					<td class="tc5"><?php echo($user['admin_note'] != '') ? $feather->utils->escape($user['admin_note']) : '&#160;' ?></td>
 					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
 <?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
 <?php endif;
diff --git a/style/FeatherBB/view/admin/users/move_users.php b/style/FeatherBB/view/admin/users/move_users.php
index 54ebe40f..a2f96b91 100644
--- a/style/FeatherBB/view/admin/users/move_users.php
+++ b/style/FeatherBB/view/admin/users/move_users.php
@@ -28,7 +28,7 @@
 									<th scope="row"><?php _e('New group label') ?></th>
 									<td>
 										<select name="new_group" tabindex="1">
-<?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo feather_escape($group) ?></option>
+<?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo $feather->utils->escape($group) ?></option>
 <?php endforeach;
     ?>
 										</select>
diff --git a/style/FeatherBB/view/admin/users/search_ip.php b/style/FeatherBB/view/admin/users/search_ip.php
index 58d2bda8..a4db0174 100644
--- a/style/FeatherBB/view/admin/users/search_ip.php
+++ b/style/FeatherBB/view/admin/users/search_ip.php
@@ -45,8 +45,8 @@
         foreach ($ip_data as $ip) {
             ?>
 				<tr>
-					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
-					<td class="tc2"><?php echo format_time($ip['last_used']) ?></td>
+					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.$feather->utils->escape($ip['poster_ip']).'/') ?>"><?php echo $feather->utils->escape($ip['poster_ip']) ?></a></td>
+					<td class="tc2"><?php echo $feather->utils->format_time($ip['last_used']) ?></td>
 					<td class="tc3"><?php echo $ip['used_times'] ?></td>
 					<td class="tcr"><a href="<?php echo $feather->url->get('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
 				</tr>
diff --git a/style/FeatherBB/view/admin/users/show_users.php b/style/FeatherBB/view/admin/users/show_users.php
index aa5b74d1..99fccb06 100644
--- a/style/FeatherBB/view/admin/users/show_users.php
+++ b/style/FeatherBB/view/admin/users/show_users.php
@@ -51,11 +51,11 @@
             if (isset($info['user_data'][$cur_poster['poster_id']])) {
                 ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.feather_escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.$feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
+					<td class="tc2"><a href="mailto:<?php echo $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
 					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
-					<td class="tc4"><?php echo forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
-					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? feather_escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
+					<td class="tc4"><?php echo $feather->utils->forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
+					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
 					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
 				</tr>
 <?php
@@ -63,7 +63,7 @@
             } else {
                 ?>
 				<tr>
-					<td class="tcl"><?php echo feather_escape($cur_poster['poster']) ?></td>
+					<td class="tcl"><?php echo $feather->utils->escape($cur_poster['poster']) ?></td>
 					<td class="tc2">&#160;</td>
 					<td class="tc3"><?php _e('Results guest') ?></td>
 					<td class="tc4">&#160;</td>
diff --git a/style/FeatherBB/view/delete.php b/style/FeatherBB/view/delete.php
index 3bce4ce2..616986a1 100644
--- a/style/FeatherBB/view/delete.php
+++ b/style/FeatherBB/view/delete.php
@@ -17,8 +17,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="index.php"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>
@@ -31,7 +31,7 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
+					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.$feather->utils->escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
 					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
 				</div>
 			</div>
@@ -47,8 +47,8 @@
 				<div class="postbody">
 					<div class="postleft">
 						<dl>
-							<dt><strong><?php echo feather_escape($cur_post['poster']) ?></strong></dt>
-							<dd><span><?php echo format_time($cur_post['posted']) ?></span></dd>
+							<dt><strong><?php echo $feather->utils->escape($cur_post['poster']) ?></strong></dt>
+							<dd><span><?php echo $feather->utils->format_time($cur_post['posted']) ?></span></dd>
 						</dl>
 					</div>
 					<div class="postright">
diff --git a/style/FeatherBB/view/edit.php b/style/FeatherBB/view/edit.php
index 3b248d18..ea9c3abe 100644
--- a/style/FeatherBB/view/edit.php
+++ b/style/FeatherBB/view/edit.php
@@ -20,8 +20,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
 		</ul>
 	</div>
@@ -69,7 +69,7 @@
 ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo feather_escape($feather->url->base(true)); ?>',
+    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
@@ -84,10 +84,10 @@
 					<input type="hidden" name="form_sent" value="1" />
 					<div class="infldset txtarea">
 <?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
+						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo $feather->utils->escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
 <?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
 						<script>postEditorToolbar('req_message');</script>
-                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
+                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo $feather->utils->escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
 							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
 							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
diff --git a/style/FeatherBB/view/footer.new.php b/style/FeatherBB/view/footer.new.php
index 48d8e705..770c3f0a 100644
--- a/style/FeatherBB/view/footer.new.php
+++ b/style/FeatherBB/view/footer.new.php
@@ -70,7 +70,7 @@
 					<select name="id" onchange="window.location=('<?php echo $feather->url->get('forum/') ?>'+this.options[this.selectedIndex].value)">
 <?php
 		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
-			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
+			echo "\t\t\t\t\t\t\t".'<optgroup label="'.$feather->utils->escape($cat_data['cat_name']).'">'."\n";
 			foreach ($cat_data['cat_forums'] as $forum) {
 				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($fid == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
 			}
@@ -134,8 +134,8 @@
 					<tbody>
 <?php foreach ($queries_info['raw'] as $time => $sql) {
 	echo "\t\t\t\t\t\t".'<tr>'."\n";
-	echo "\t\t\t\t\t\t\t".'<td class="tcl">'.feather_escape(round($time, 8)).'</td>'."\n";
-	echo "\t\t\t\t\t\t\t".'<td class="tcr">'.feather_escape($sql).'</td>'."\n";
+	echo "\t\t\t\t\t\t\t".'<td class="tcl">'.$feather->utils->escape(round($time, 8)).'</td>'."\n";
+	echo "\t\t\t\t\t\t\t".'<td class="tcr">'.$feather->utils->escape($sql).'</td>'."\n";
 	echo "\t\t\t\t\t\t".'</tr>'."\n";
 } ?>
 						<tr>
diff --git a/style/FeatherBB/view/footer.php b/style/FeatherBB/view/footer.php
index e149e22e..4932ccfa 100644
--- a/style/FeatherBB/view/footer.php
+++ b/style/FeatherBB/view/footer.php
@@ -70,7 +70,7 @@
 					<select name="id" onchange="window.location=('<?php echo $feather->url->get('forum/') ?>'+this.options[this.selectedIndex].value)">
 <?php
 		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
-			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
+			echo "\t\t\t\t\t\t\t".'<optgroup label="'.$feather->utils->escape($cat_data['cat_name']).'">'."\n";
 			foreach ($cat_data['cat_forums'] as $forum) {
 				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
 			}
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index 57687b3c..932a094f 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -151,7 +151,7 @@ function process_form(the_form)
         <div class="container-title-status">
             <h1 class="title-site">
                 <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
-                    <p><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></p>
+                    <p><?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?></p>
                 </a>
                 <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
             </h1>
@@ -163,8 +163,8 @@ function process_form(the_form)
                     <p class="conl"><?= __('Not logged in')?></p>
 <?php } else {
     echo "\t\t\t\t\t".'<ul class="conl">';
-    echo "\t\t\t\t\t\t".'<li><span>'.__('Logged in as').' <strong>'.feather_escape($feather->user->username).'</strong></span></li>'."\n";
-    echo "\t\t\t\t\t\t".'<li><span>'.sprintf(__('Last visit'), format_time($feather->user->last_visit)).'</span></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li><span>'.__('Logged in as').' <strong>'.$feather->utils->escape($feather->user->username).'</strong></span></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li><span>'.sprintf(__('Last visit'), $feather->utils->format_time($feather->user->last_visit)).'</span></li>'."\n";
 
     if ($feather->user->is_admmod) {
         if ($feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2') {
@@ -220,7 +220,7 @@ function process_form(the_form)
         </script>
         <div class="flashmsg" id="flashmsg">
             <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
-            <p><?= feather_escape($flash['info']) ?></p>
+            <p><?= $feather->utils->escape($flash['info']) ?></p>
         </div>
         <?php endif; ?>
     </div>
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
index a5cba96e..2f11da78 100644
--- a/style/FeatherBB/view/header.php
+++ b/style/FeatherBB/view/header.php
@@ -92,7 +92,7 @@ function process_form(the_form)
         <div class="container-title-status">
             <h1 class="title-site">
                 <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
-                    <p><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></p>
+                    <p><?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?></p>
                 </a>
                 <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
             </h1>
@@ -125,7 +125,7 @@ function process_form(the_form)
             </script>
             <div class="flashmsg" id="flashmsg">
                 <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
-                <p><?= feather_escape($flash['message']) ?></p>
+                <p><?= $feather->utils->escape($flash['message']) ?></p>
             </div>
         <?php endif; ?>
     </div>
diff --git a/style/FeatherBB/view/help.php b/style/FeatherBB/view/help.php
index 06e642f2..00669948 100644
--- a/style/FeatherBB/view/help.php
+++ b/style/FeatherBB/view/help.php
@@ -41,8 +41,8 @@
 <div class="box">
 	<div class="inbox">
 		<p><?php _e('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape($feather->url->base(true).'/') ?>]<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape($feather->url->base(true).'/') ?>"><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo feather_escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape($feather->url->base(true).'/') ?>"><?php echo feather_escape($feather->url->base(true).'/') ?></a></samp></p>
+		<p><a name="url"></a><code>[url=<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>]<?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>"><?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>"><?php echo $feather->utils->escape($feather->url->base(true).'/') ?></a></samp></p>
 		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
 		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
@@ -57,7 +57,7 @@
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
-		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo feather_escape($feather->url->base(true)) ?>/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape($feather->url->base(true)) ?>/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
+		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo $feather->utils->escape($feather->url->base(true)) ?>/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo $feather->utils->escape($feather->url->base(true)) ?>/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
 <h2><span><?php _e('Quotes') ?></span></h2>
diff --git a/style/FeatherBB/view/index.php b/style/FeatherBB/view/index.php
index cc51e8b5..826fa47e 100644
--- a/style/FeatherBB/view/index.php
+++ b/style/FeatherBB/view/index.php
@@ -27,7 +27,7 @@
 	<?php endif;
     ?>
 	<div id="idx<?php echo $forum->cid ?>" class="blocktable">
-	<h2><span><?php echo feather_escape($forum->cat_name) ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($forum->cat_name) ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
@@ -46,15 +46,15 @@
     ?>
 				<tr class="<?php echo $forum->item_status ?>">
 					<td class="tcl">
-						<div class="<?php echo $forum->icon_type ?>"><div class="nosize"><?php echo forum_number_format($forum->forum_count_formatted) ?></div></div>
+						<div class="<?php echo $forum->icon_type ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($forum->forum_count_formatted) ?></div></div>
 						<div class="tclcon">
 							<div>
 								<?php echo $forum->forum_field."\n".$forum->moderators_formatted ?>
 							</div>
 						</div>
 					</td>
-					<td class="tc2"><?php echo forum_number_format($forum->num_topics_formatted) ?></td>
-					<td class="tc3"><?php echo forum_number_format($forum->num_posts_formatted) ?></td>
+					<td class="tc2"><?php echo $feather->utils->forum_number_format($forum->num_topics_formatted) ?></td>
+					<td class="tc3"><?php echo $feather->utils->forum_number_format($forum->num_posts_formatted) ?></td>
 					<td class="tcr"><?php echo $forum->last_post_formatted ?></td>
 				</tr>
 	<?php
@@ -85,16 +85,16 @@
 		<div class="inbox">
 			<dl class="conr">
 				<dt><strong><?php _e('Board stats') ?></strong></dt>
-				<dd><span><?php printf(__('No of users'), '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of topics'), '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of posts'), '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of users'), '<strong>'.$feather->utils->forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of topics'), '<strong>'.$feather->utils->forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of posts'), '<strong>'.$feather->utils->forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
 			</dl>
 			<dl class="conl">
 				<dt><strong><?php _e('User info') ?></strong></dt>
 				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
 				<?php if ($feather->forum_settings['o_users_online'] == 1) : ?>
-				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('Guests online'), '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Users online'), '<strong>'.$feather->utils->forum_number_format($online['num_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Guests online'), '<strong>'.$feather->utils->forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
 				<?php endif; ?>
 			</dl>
 			<?php
diff --git a/style/FeatherBB/view/login/form.php b/style/FeatherBB/view/login/form.php
index 1ad355cd..6a6d70a0 100644
--- a/style/FeatherBB/view/login/form.php
+++ b/style/FeatherBB/view/login/form.php
@@ -23,7 +23,7 @@
 					<legend><?php _e('Login legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
+						<input type="hidden" name="redirect_url" value="<?php echo $feather->utils->escape($redirect_url) ?>" />
 						<label class="conl required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
 						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
 
diff --git a/style/FeatherBB/view/misc/email.php b/style/FeatherBB/view/misc/email.php
index 2c9921bd..867ac9ee 100644
--- a/style/FeatherBB/view/misc/email.php
+++ b/style/FeatherBB/view/misc/email.php
@@ -14,7 +14,7 @@
 
 ?>
 <div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
+	<h2><span><?php _e('Send email to') ?> <?php echo $feather->utils->escape($mail['recipient']) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="<?php echo $feather->url->get('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/style/FeatherBB/view/misc/report.php b/style/FeatherBB/view/misc/report.php
index acb6c729..6eeead9c 100644
--- a/style/FeatherBB/view/misc/report.php
+++ b/style/FeatherBB/view/misc/report.php
@@ -17,8 +17,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
 		</ul>
 	</div>
diff --git a/style/FeatherBB/view/moderate/moderator_forum.php b/style/FeatherBB/view/moderate/moderator_forum.php
index b61c3104..06c6987b 100644
--- a/style/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/FeatherBB/view/moderate/moderator_forum.php
@@ -18,7 +18,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -30,9 +30,9 @@
 
 <form method="post" action="<?php echo $feather->url->get('moderate/forum/'.$id.'/') ?>">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<input type="hidden" name="page" value="<?php echo feather_escape($p) ?>" />
+<input type="hidden" name="page" value="<?php echo $feather->utils->escape($p) ?>" />
 <div id="vf" class="blocktable">
-	<h2><span><?php echo feather_escape($cur_forum['forum_name']) ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
@@ -55,15 +55,15 @@
                 ?>
 							<tr class="<?php echo $topic['item_status'] ?>">
 					<td class="tcl">
-						<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo forum_number_format($topic_count + $start_from) ?></div></div>
+						<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
 						<div class="tclcon">
 							<div>
 								<?php echo $topic['subject_disp']."\n" ?>
 							</div>
 						</div>
 					</td>
-					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_replies']) : '-' ?></td>
-<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_views']) : '-' ?></td>
+					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? $feather->utils->forum_number_format($topic['num_replies']) : '-' ?></td>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? $feather->utils->forum_number_format($topic['num_views']) : '-' ?></td>
 <?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_disp'] ?></td>
 					<td class="tcmod"><input type="checkbox" name="topics[<?php echo $topic['id'] ?>]" value="1" /></td>
@@ -92,7 +92,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/moderate/posts_view.php b/style/FeatherBB/view/moderate/posts_view.php
index a2c6ecea..0338555a 100644
--- a/style/FeatherBB/view/moderate/posts_view.php
+++ b/style/FeatherBB/view/moderate/posts_view.php
@@ -17,8 +17,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -42,7 +42,7 @@
     echo ' blockpost1';
 }
     ?>">
-		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
+		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<div class="postbody">
@@ -57,7 +57,7 @@
 						<div class="postmsg">
 							<?php echo $post['message']."\n" ?>
 	<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.$feather->utils->escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 						</div>
@@ -85,8 +85,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/post.php b/style/FeatherBB/view/post.php
index 72264f67..d0b60d54 100644
--- a/style/FeatherBB/view/post.php
+++ b/style/FeatherBB/view/post.php
@@ -18,10 +18,10 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
-<?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_posting['forum_name']) ?></a></li>
+<?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo $feather->utils->escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
-<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_posting['subject']) ?></a></li>
+<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_posting['subject']) ?></a></li>
 <?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
 		</ul>
 	</div>
@@ -81,7 +81,7 @@
 ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo feather_escape($feather->url->base(true)); ?>',
+    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
@@ -102,11 +102,11 @@
     $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
 						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
-    echo feather_escape($post['username']);
+    echo $feather->utils->escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
-    echo feather_escape($post['email']);
+    echo $feather->utils->escape($post['email']);
 }
     ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
@@ -115,11 +115,11 @@
 }
 if ($fid): ?>
 						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
-    echo feather_escape($post['subject']);
+    echo $feather->utils->escape($post['subject']);
 } ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 <?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
                         <script>postEditorToolbar('req_message');</script>
-						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
+						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? $feather->utils->linebreaks($feather->utils->trim($feather->utils->escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
 							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
 							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
@@ -190,8 +190,8 @@
 			<div class="postbody">
 				<div class="postleft">
 					<dl>
-						<dt><strong><?php echo feather_escape($post['poster']) ?></strong></dt>
-						<dd><span><?php echo format_time($post['posted']) ?></span></dd>
+						<dt><strong><?php echo $feather->utils->escape($post['poster']) ?></strong></dt>
+						<dd><span><?php echo $feather->utils->format_time($post['posted']) ?></span></dd>
 					</dl>
 				</div>
 				<div class="postright">
diff --git a/style/FeatherBB/view/profile/delete_user.php b/style/FeatherBB/view/profile/delete_user.php
index 5b22471a..84a3b58d 100644
--- a/style/FeatherBB/view/profile/delete_user.php
+++ b/style/FeatherBB/view/profile/delete_user.php
@@ -22,7 +22,7 @@
 				<fieldset>
 					<legend><?php _e('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php _e('Confirmation info').' <strong>'.feather_escape($username).'</strong>.' ?></p>
+						<p><?php _e('Confirmation info').' <strong>'.$feather->utils->escape($username).'</strong>.' ?></p>
 						<div class="rbox">
 							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
 						</div>
diff --git a/style/FeatherBB/view/profile/section_admin.php b/style/FeatherBB/view/profile/section_admin.php
index a73c3fb9..f06eb7d4 100644
--- a/style/FeatherBB/view/profile/section_admin.php
+++ b/style/FeatherBB/view/profile/section_admin.php
@@ -14,7 +14,7 @@
 
 ?>
 	<div class="blockform">
-		<h2><span><?php echo feather_escape($user['username']).' - '.__('Section admin') ?></span></h2>
+		<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section admin') ?></span></h2>
 		<div class="box">
 			<form id="profile7" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/style/FeatherBB/view/profile/section_display.php b/style/FeatherBB/view/profile/section_display.php
index 3277bf29..8fc83a15 100644
--- a/style/FeatherBB/view/profile/section_display.php
+++ b/style/FeatherBB/view/profile/section_display.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section display') ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section display') ?></span></h2>
 	<div class="box">
 		<form id="profile5" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/style/FeatherBB/view/profile/section_essentials.php b/style/FeatherBB/view/profile/section_essentials.php
index bb97256c..3d82ca0b 100644
--- a/style/FeatherBB/view/profile/section_essentials.php
+++ b/style/FeatherBB/view/profile/section_essentials.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section essentials') ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section essentials') ?></span></h2>
 	<div class="box">
 		<form id="profile1" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -179,7 +179,7 @@
                                 if ($user['time_format'] == $key) {
                                     echo ' selected="selected"';
                                 }
-                                echo '>'. format_time(time(), false, null, $time_format, true, true);
+                                echo '>'. $feather->utils->format_time(time(), false, null, $time_format, true, true);
                                 if ($key == 0) {
                                     echo ' ('.__('Default').')';
                                 }
@@ -197,7 +197,7 @@
                                 if ($user['date_format'] == $key) {
                                     echo ' selected="selected"';
                                 }
-                                echo '>'. format_time(time(), true, $date_format, null, false, true);
+                                echo '>'. $feather->utils->format_time(time(), true, $date_format, null, false, true);
                                 if ($key == 0) {
                                     echo ' ('.__('Default').')';
                                 }
@@ -241,12 +241,12 @@
 				<fieldset>
 					<legend><?php _e('User activity') ?></legend>
 					<div class="infldset">
-						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
-						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
-						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
+						<p><?php printf(__('Registered info'), $feather->utils->format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.$feather->utils->escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Last post info'), $feather->utils->format_time($user['last_post'])) ?></p>
+						<p><?php printf(__('Last visit info'), $feather->utils->format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
 <?php if ($feather->user->is_admmod): ?>							<label><?php _e('Admin note') ?><br />
-						<input id="admin_note" type="text" name="admin_note" value="<?php echo feather_escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
+						<input id="admin_note" type="text" name="admin_note" value="<?php echo $feather->utils->escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/profile/section_messaging.php b/style/FeatherBB/view/profile/section_messaging.php
index 8597a115..2d3268dd 100644
--- a/style/FeatherBB/view/profile/section_messaging.php
+++ b/style/FeatherBB/view/profile/section_messaging.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section messaging') ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section messaging') ?></span></h2>
 	<div class="box">
 		<form id="profile3" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -23,11 +23,11 @@
 					<legend><?php _e('Contact details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
+						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo $feather->utils->escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
 						<label><?php _e('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo $feather->utils->escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
+						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo $feather->utils->escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo $feather->utils->escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/profile/section_personal.php b/style/FeatherBB/view/profile/section_personal.php
index 80c19741..5ae81801 100644
--- a/style/FeatherBB/view/profile/section_personal.php
+++ b/style/FeatherBB/view/profile/section_personal.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personal') ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section personal') ?></span></h2>
 	<div class="box">
 		<form id="profile2" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -23,10 +23,10 @@
 					<legend><?php _e('Personal details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
+						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo $feather->utils->escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
 <?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo $feather->utils->escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo $feather->utils->escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>
 					</div>
 				</fieldset>
diff --git a/style/FeatherBB/view/profile/section_personality.php b/style/FeatherBB/view/profile/section_personality.php
index f2692e75..ae9f7b0f 100644
--- a/style/FeatherBB/view/profile/section_personality.php
+++ b/style/FeatherBB/view/profile/section_personality.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personality') ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section personality') ?></span></h2>
 	<div class="box">
 		<form id="profile4" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -35,8 +35,8 @@
 					<div class="infldset">
 						<p><?php _e('Signature info') ?></p>
 						<div class="txtarea">
-							<label><?php printf(__('Sig max size'), forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
-							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
+							<label><?php printf(__('Sig max size'), $feather->utils->forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
+							<textarea name="signature" rows="4" cols="65"><?php echo $feather->utils->escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
 							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
diff --git a/style/FeatherBB/view/profile/section_privacy.php b/style/FeatherBB/view/profile/section_privacy.php
index d978904e..48715858 100644
--- a/style/FeatherBB/view/profile/section_privacy.php
+++ b/style/FeatherBB/view/profile/section_privacy.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section privacy') ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section privacy') ?></span></h2>
 	<div class="box">
 		<form id="profile6" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/style/FeatherBB/view/profile/upload_avatar.php b/style/FeatherBB/view/profile/upload_avatar.php
index ba880454..15261a67 100644
--- a/style/FeatherBB/view/profile/upload_avatar.php
+++ b/style/FeatherBB/view/profile/upload_avatar.php
@@ -25,7 +25,7 @@
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php _e('Avatar desc').' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
+						<p><?php _e('Avatar desc').' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/FeatherBB/view/register/email.php b/style/FeatherBB/view/register/email.php
index e26ad690..a93188f9 100644
--- a/style/FeatherBB/view/register/email.php
+++ b/style/FeatherBB/view/register/email.php
@@ -15,7 +15,7 @@
 ?>
 
 <div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($recipient) ?></span></h2>
+	<h2><span><?php _e('Send email to') ?> <?php echo $feather->utils->escape($recipient) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -24,7 +24,7 @@
 					<legend><?php _e('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
+						<input type="hidden" name="redirect_url" value="<?php echo $feather->utils->escape($redirect_url) ?>" />
 						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
 						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
diff --git a/style/FeatherBB/view/register/form.php b/style/FeatherBB/view/register/form.php
index bdff9a2b..d7deb65f 100644
--- a/style/FeatherBB/view/register/form.php
+++ b/style/FeatherBB/view/register/form.php
@@ -54,7 +54,7 @@
 						<input type="hidden" name="username" value="" />
 						<input type="hidden" name="password" value="" />
 						<label class="required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
-    echo feather_escape($feather->request->post('req_user'));
+    echo $feather->utils->escape($feather->request->post('req_user'));
 } ?>" size="25" maxlength="25" /><br /></label>
 					</div>
 				</fieldset>
@@ -64,10 +64,10 @@
 					<legend><?php _e('Pass legend') ?></legend>
 					<div class="infldset">
 						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
-    echo feather_escape($feather->request->post('req_password1'));
+    echo $feather->utils->escape($feather->request->post('req_password1'));
 } ?>" size="16" /><br /></label>
 						<label class="conl required"><strong><?php _e('Confirm pass') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
-    echo feather_escape($feather->request->post('req_password2'));
+    echo $feather->utils->escape($feather->request->post('req_password2'));
 } ?>" size="16" /><br /></label>
 						<p class="clearb"><?php _e('Pass info') ?></p>
 					</div>
@@ -80,11 +80,11 @@
 <?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
 <?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
-    echo feather_escape($feather->request->post('req_email1'));
+    echo $feather->utils->escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
 <?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
-    echo feather_escape($feather->request->post('req_email2'));
+    echo $feather->utils->escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>					</div>
 				</fieldset>
diff --git a/style/FeatherBB/view/search/posts.php b/style/FeatherBB/view/search/posts.php
index d0eab7cc..3a2be8ef 100644
--- a/style/FeatherBB/view/search/posts.php
+++ b/style/FeatherBB/view/search/posts.php
@@ -22,14 +22,14 @@
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
     _e('Re').' ';
-} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
+} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
 		<div class="postbody">
 			<div class="postleft">
 				<dl>
 					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
+<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.$feather->utils->forum_number_format($cur_search['num_replies']) ?></span></dd>
 <?php endif; ?>
 					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
 				</dl>
diff --git a/style/FeatherBB/view/search/topics.php b/style/FeatherBB/view/search/topics.php
index 7cead694..265cbb27 100644
--- a/style/FeatherBB/view/search/topics.php
+++ b/style/FeatherBB/view/search/topics.php
@@ -16,7 +16,7 @@
 
 <tr class="<?php echo $cur_search['item_status'] ?>">
 	<td class="tcl">
-		<div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo forum_number_format($topic_count + $start_from) ?></div></div>
+		<div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
 		<div class="tclcon">
 			<div>
 				<?php echo $subject."\n" ?>
@@ -24,6 +24,6 @@
 		</div>
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
-	<td class="tc3"><?php echo forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
+	<td class="tc3"><?php echo $feather->utils->forum_number_format($cur_search['num_replies']) ?></td>
+	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.$feather->utils->format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.$feather->utils->escape($cur_search['last_poster']) ?></span></td>
 </tr>
\ No newline at end of file
diff --git a/style/FeatherBB/view/userlist.php b/style/FeatherBB/view/userlist.php
index a686ba5b..3166d107 100644
--- a/style/FeatherBB/view/userlist.php
+++ b/style/FeatherBB/view/userlist.php
@@ -21,7 +21,7 @@
 				<fieldset>
 					<legend><?php _e('User find legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
+<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo $feather->utils->escape($username) ?>" size="25" maxlength="25" /><br /></label>
 <?php endif; ?>						<label class="conl"><?php _e('User group')."\n" ?>
 						<br /><select name="show_group">
 							<option value="-1"<?php if ($show_group == -1) {
@@ -87,12 +87,12 @@
             foreach ($userlist_data as $user) {
                 ?>
 					<tr>
-						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
+						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.$feather->utils->escape($user['username']).'</a>' ?></td>
 						<td class="tc2"><?php echo get_title($user) ?></td>
-	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo forum_number_format($user['num_posts']) ?></td>
+	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo $feather->utils->forum_number_format($user['num_posts']) ?></td>
 	<?php endif;
                 ?>
-						<td class="tcr"><?php echo format_time($user['registered'], true) ?></td>
+						<td class="tcr"><?php echo $feather->utils->format_time($user['registered'], true) ?></td>
 					</tr>
 			<?php
 
diff --git a/style/FeatherBB/view/viewforum.php b/style/FeatherBB/view/viewforum.php
index 0855bd20..dbf440af 100644
--- a/style/FeatherBB/view/viewforum.php
+++ b/style/FeatherBB/view/viewforum.php
@@ -17,7 +17,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -28,7 +28,7 @@
 </div>
 
 <div id="vf" class="blocktable">
-	<h2><span><?php echo feather_escape($cur_forum['forum_name']) ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
@@ -48,15 +48,15 @@
                 ?>
 					<tr class="<?php echo $topic['item_status'] ?>">
 						<td class="tcl">
-							<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo forum_number_format($topic_count + $start_from) ?></div></div>
+							<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
 							<div class="tclcon">
 								<div>
 									<?php echo $topic['subject_formatted']."\n" ?>
 								</div>
 							</div>
 						</td>
-						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_replies']) : '-' ?></td>
-	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_views']) : '-' ?></td>
+						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? $feather->utils->forum_number_format($topic['num_replies']) : '-' ?></td>
+	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? $feather->utils->forum_number_format($topic['num_views']) : '-' ?></td>
 	<?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_formatted'] ?></td>
 					</tr>
@@ -92,7 +92,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
 		<div class="clearer"></div>
diff --git a/style/FeatherBB/view/viewtopic.php b/style/FeatherBB/view/viewtopic.php
index 7e7c088b..d16a862c 100644
--- a/style/FeatherBB/view/viewtopic.php
+++ b/style/FeatherBB/view/viewtopic.php
@@ -18,8 +18,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -40,7 +40,7 @@
     echo ' blockpost1';
 }
     ?>">
-	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
+	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -66,11 +66,11 @@
 					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
     _e('Re').' ';
 }
-    ?><?php echo feather_escape($cur_topic['subject']) ?></h3>
+    ?><?php echo $feather->utils->escape($cur_topic['subject']) ?></h3>
 					<div class="postmsg">
 						<?php echo $post['message']."\n" ?>
 <?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.$feather->utils->escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 					</div>
@@ -108,8 +108,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 <?php echo $subscraction ?>
 		<div class="clearer"></div>
@@ -133,8 +133,8 @@
 					<legend><?php _e('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
-						<input type="hidden" name="page" value="<?php echo feather_escape($page_number) ?>" />
+						<input type="hidden" name="pid" value="<?php echo $feather->utils->escape($pid) ?>" />
+						<input type="hidden" name="page" value="<?php echo $feather->utils->escape($page_number) ?>" />
 <?php if ($feather->forum_settings['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
 <?php endif;
 
@@ -155,7 +155,7 @@
     ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo feather_escape($feather->url->base(true)); ?>',
+    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
diff --git a/view/admin/options.php b/view/admin/options.php
index 867e95b1..454efe27 100644
--- a/view/admin/options.php
+++ b/view/admin/options.php
@@ -684,7 +684,7 @@
 									<th scope="row"><?php _e('SMTP password label') ?></th>
 									<td>
 										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
-<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key(feather_strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
+<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key(strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
 										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<span><?php _e('SMTP password help') ?></span>
diff --git a/view/post.php b/view/post.php
index 72264f67..21f8bc7d 100644
--- a/view/post.php
+++ b/view/post.php
@@ -119,7 +119,7 @@
 } ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 <?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
                         <script>postEditorToolbar('req_message');</script>
-						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? feather_linebreaks(feather_trim(feather_escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
+						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? $feather->utils->linebreaks($feather->utils->trim($feather->utils->escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
 							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
 							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>

From 0c850bfbc46fe83977fe2933cd3591a8ee1f5a9d Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 29 Aug 2015 19:16:17 +0200
Subject: [PATCH 263/353] Merge branch 'development' of
 https://github.com/featherbb/featherbb into development

Conflicts:
	include/classes/auth.class.php
	model/admin/bans.php
	model/admin/groups.php
	model/login.php
---
 controller/post.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controller/post.php b/controller/post.php
index 5a0a5762..9ab0b212 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -133,7 +133,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
                 // If a quote ID was specified in the url
                 if (isset($qid)) {
-                    $quote = $this->model->get_quote_throw new \FeatherBB\Error($qid, $tid);
+                    $quote = $this->model->get_quote_message($qid, $tid);
                     $form = '<form id="post" method="post" action="'.$this->feather->url->get('post/reply/'.$tid.'/quote/'.$qid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
                 }
         }

From f6be1726506808001e8b1e4a81424b1093f405b7 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 29 Aug 2015 19:18:43 +0200
Subject: [PATCH 264/353] Fix feather_escape

---
 include/classes/auth.class.php | 2 +-
 model/admin/groups.php         | 4 ++--
 model/login.php                | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index bc796fab..86fb1e6a 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -177,7 +177,7 @@ public function check_bans()
                 \DB::for_table('online')
                     ->where('ident', $this->app->user->username)
                     ->delete_many();
-                throw new \FeatherBB\Error(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.feather_escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.feather_escape($this->app->forum_settings['o_admin_email']).'">'.feather_escape($this->app->forum_settings['o_admin_email']).'</a>.', 403);
+                throw new \FeatherBB\Error(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.$this->app->utils->escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.$this->app->utils->escape($this->app->forum_settings['o_admin_email']).'">'.$this->app->utils->escape($this->app->forum_settings['o_admin_email']).'</a>.', 403);
             }
         }
 
diff --git a/model/admin/groups.php b/model/admin/groups.php
index a32cc6f1..aae8939e 100644
--- a/model/admin/groups.php
+++ b/model/admin/groups.php
@@ -71,9 +71,9 @@ public function get_group_list($groups, $group)
         foreach ($groups as $cur_group) {
             if (($cur_group['g_id'] != $group['info']['g_id'] || $group['mode'] == 'add') && $cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
                 if ($cur_group['g_id'] == $group['info']['g_promote_next_group']) {
-                    $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+                    $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
                 } else {
-                    $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+                    $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
                 }
             }
         }
diff --git a/model/login.php b/model/login.php
index 5b00531e..33020f13 100644
--- a/model/login.php
+++ b/model/login.php
@@ -193,9 +193,9 @@ public function password_forgotten()
                         $this->email->feather_mail($email, $mail_subject, $cur_mail_message);
                     }
 
-                    throw new \FeatherBB\Error(__('Forget mail').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', 400);
+                    throw new \FeatherBB\Error(__('Forget mail').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.', 400);
                 } else {
-                    $errors[] = __('No email match').' '.htmlspecialchars($email).'.';
+                    $errors[] = __('No email match').' '.$this->feather->utils->escape($email).'.';
                 }
             }
         }

From ca8c9ddfb84f6d3160d470a2509d09a3fb21abaa Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 29 Aug 2015 19:20:54 +0200
Subject: [PATCH 265/353] Update view folder

---
 style/FeatherBB/view/delete.php      |  2 +-
 view/admin/bans/add_ban.php          |  8 +++----
 view/admin/bans/search_ban.php       | 12 +++++------
 view/admin/categories.php            |  4 ++--
 view/admin/censoring.php             |  2 +-
 view/admin/forums/admin_forums.php   |  6 +++---
 view/admin/forums/permissions.php    | 10 ++++-----
 view/admin/groups/add_edit_group.php |  6 +++---
 view/admin/groups/admin_groups.php   | 10 ++++-----
 view/admin/groups/confirm_delete.php |  2 +-
 view/admin/groups/delete_group.php   |  2 +-
 view/admin/maintenance/prune.php     |  2 +-
 view/admin/menu.php                  |  4 ++++
 view/admin/options.php               | 32 ++++++++++++++--------------
 view/admin/parser.php                |  8 +++----
 view/admin/reports.php               | 12 +++++------
 view/admin/statistics.php            |  2 +-
 view/admin/users/find_users.php      |  8 +++----
 view/admin/users/move_users.php      |  2 +-
 view/admin/users/search_ip.php       |  4 ++--
 view/admin/users/show_users.php      | 10 ++++-----
 view/delete.php                      | 16 +++++++-------
 view/edit.php                        | 10 ++++-----
 view/error.php                       | 26 ++++++++++++++++++++++
 view/help.php                        |  6 +++---
 view/index.php                       | 18 ++++++++--------
 view/login/form.php                  |  2 +-
 view/misc/email.php                  |  2 +-
 view/misc/report.php                 |  4 ++--
 view/moderate/moderator_forum.php    | 14 ++++++------
 view/moderate/posts_view.php         | 12 +++++------
 view/post.php                        | 18 ++++++++--------
 view/profile/delete_user.php         |  2 +-
 view/profile/section_admin.php       |  2 +-
 view/profile/section_display.php     |  2 +-
 view/profile/section_essentials.php  | 14 ++++++------
 view/profile/section_messaging.php   | 10 ++++-----
 view/profile/section_personal.php    |  8 +++----
 view/profile/section_personality.php |  6 +++---
 view/profile/section_privacy.php     |  2 +-
 view/profile/upload_avatar.php       |  2 +-
 view/register/email.php              |  4 ++--
 view/register/form.php               | 10 ++++-----
 view/search/posts.php                |  4 ++--
 view/search/topics.php               |  6 +++---
 view/userlist.php                    |  8 +++----
 view/viewforum.php                   | 12 +++++------
 view/viewtopic.php                   | 20 ++++++++---------
 48 files changed, 209 insertions(+), 179 deletions(-)
 create mode 100644 view/error.php

diff --git a/style/FeatherBB/view/delete.php b/style/FeatherBB/view/delete.php
index 616986a1..abfc0a7f 100644
--- a/style/FeatherBB/view/delete.php
+++ b/style/FeatherBB/view/delete.php
@@ -16,7 +16,7 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="index.php"><?php _e('Index') ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
diff --git a/view/admin/bans/add_ban.php b/view/admin/bans/add_ban.php
index 8170a2a9..1bda2c69 100644
--- a/view/admin/bans/add_ban.php
+++ b/view/admin/bans/add_ban.php
@@ -31,7 +31,7 @@
 								<th scope="row"><?php _e('Username label') ?></th>
 								<td>
 									<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
-										echo feather_escape($ban['ban_user']);
+										echo $feather->utils->escape($ban['ban_user']);
 									} ?>" tabindex="1" />
 									<span><?php _e('Username help') ?></span>
 								</td>
@@ -40,7 +40,7 @@
 								<th scope="row"><?php _e('IP label') ?></th>
 								<td>
 									<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
-										echo feather_escape($ban['ip']);
+										echo $feather->utils->escape($ban['ip']);
 									} ?>" tabindex="2" />
 										<span><?php _e('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
 												printf(' '.__('IP help link'), '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.__('here').'</a>');
@@ -51,7 +51,7 @@
 								<th scope="row"><?php _e('E-mail label') ?></th>
 								<td>
 									<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
-										echo feather_escape($ban['email']);
+										echo $feather->utils->escape($ban['email']);
 									} ?>" tabindex="3" />
 									<span><?php _e('E-mail help') ?></span>
 								</td>
@@ -70,7 +70,7 @@
 								<th scope="row"><?php _e('Ban message label') ?></th>
 								<td>
 									<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
-										echo feather_escape($ban['message']);
+										echo $feather->utils->escape($ban['message']);
 									} ?>" tabindex="4" />
 									<span><?php _e('Ban message help') ?></span>
 								</td>
diff --git a/view/admin/bans/search_ban.php b/view/admin/bans/search_ban.php
index b8aefcbb..356a0baa 100644
--- a/view/admin/bans/search_ban.php
+++ b/view/admin/bans/search_ban.php
@@ -50,12 +50,12 @@
         foreach ($ban_data as $cur_ban) {
             ?>
 				<tr>
-					<td class="tcl"><?php echo($cur_ban['username'] != '') ? feather_escape($cur_ban['username']) : '&#160;' ?></td>
-					<td class="tc2"><?php echo($cur_ban['email'] != '') ? feather_escape($cur_ban['email']) : '&#160;' ?></td>
-					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? feather_escape($cur_ban['ip']) : '&#160;' ?></td>
-					<td class="tc4"><?php echo format_time($cur_ban['expire'], true) ?></td>
-					<td class="tc5"><?php echo($cur_ban['message'] != '') ? feather_escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.feather_escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
+					<td class="tcl"><?php echo($cur_ban['username'] != '') ? $feather->utils->escape($cur_ban['username']) : '&#160;' ?></td>
+					<td class="tc2"><?php echo($cur_ban['email'] != '') ? $feather->utils->escape($cur_ban['email']) : '&#160;' ?></td>
+					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? $feather->utils->escape($cur_ban['ip']) : '&#160;' ?></td>
+					<td class="tc4"><?php echo $feather->utils->format_time($cur_ban['expire'], true) ?></td>
+					<td class="tc5"><?php echo($cur_ban['message'] != '') ? $feather->utils->escape($cur_ban['message']) : '&#160;' ?></td>
+					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.$feather->utils->escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
 					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
 				</tr>
 <?php
diff --git a/view/admin/categories.php b/view/admin/categories.php
index 7d922439..3a2057b7 100644
--- a/view/admin/categories.php
+++ b/view/admin/categories.php
@@ -53,7 +53,7 @@
 <?php
 
     foreach ($cat_list as $cur_cat) {
-        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.feather_escape($cur_cat['cat_name']).'</option>'."\n";
+        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.$feather->utils->escape($cur_cat['cat_name']).'</option>'."\n";
     }
 
 ?>
@@ -90,7 +90,7 @@
     foreach ($cat_list as $cur_cat) {
         ?>
 								<tr>
-									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo feather_escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
+									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo $feather->utils->escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
 									<td><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][order]" value="<?php echo $cur_cat['disp_position'] ?>" size="3" maxlength="3" /></td>
 								</tr>
 <?php
diff --git a/view/admin/censoring.php b/view/admin/censoring.php
index bcd64ca5..54a063a6 100644
--- a/view/admin/censoring.php
+++ b/view/admin/censoring.php
@@ -61,7 +61,7 @@
 <?php
 
     foreach ($word_data as $word) {
-        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.feather_escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.feather_escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
+        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.$feather->utils->escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.$feather->utils->escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
     }
 
     ?>
diff --git a/view/admin/forums/admin_forums.php b/view/admin/forums/admin_forums.php
index a2525106..abcd2bf7 100644
--- a/view/admin/forums/admin_forums.php
+++ b/view/admin/forums/admin_forums.php
@@ -31,7 +31,7 @@
 									<td>
 										<select name="cat" tabindex="1">
 											<?php  foreach ($cat_list as $cat) {
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.feather_escape($cat['cat_name']).'</option>'."\n";
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.$feather->utils->escape($cat['cat_name']).'</option>'."\n";
 											} ?>
 										</select>
 										<span><?php _e('Add forum help') ?></span>
@@ -73,7 +73,7 @@
             ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php _e('Category subhead') ?> <?php echo feather_escape($cat_data['cat_name']) ?></legend>
+						<legend><?php _e('Category subhead') ?> <?php echo $feather->utils->escape($cat_data['cat_name']) ?></legend>
 						<div class="infldset">
 							<table>
 							<thead>
@@ -90,7 +90,7 @@
 								<tr>
 									<td class="tcl"><a href="<?php echo $feather->url->get('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
 									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
-									<td class="tcr"><strong><?php echo feather_escape($forum['forum_name']) ?></strong></td>
+									<td class="tcr"><strong><?php echo $feather->utils->escape($forum['forum_name']) ?></strong></td>
 								</tr>
 <?php
     }
diff --git a/view/admin/forums/permissions.php b/view/admin/forums/permissions.php
index 7b394b63..8368cfa9 100644
--- a/view/admin/forums/permissions.php
+++ b/view/admin/forums/permissions.php
@@ -26,11 +26,11 @@
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php _e('Forum name label') ?></th>
-									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo feather_escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
+									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo $feather->utils->escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Forum description label') ?></th>
-									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo feather_escape($cur_forum['forum_desc']) ?></textarea></td>
+									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo $feather->utils->escape($cur_forum['forum_desc']) ?></textarea></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Category label') ?></th>
@@ -38,7 +38,7 @@
 										<select name="cat_id" tabindex="3">
 											<?php  foreach ($forum_data as $cat_id => $cat_data) {
 												$selected = ($cat_id == $cur_forum['cat_id']) ? 'selected="selected"' : '';
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.feather_escape($cat_data['cat_name']).'</option>'."\n";
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.$feather->utils->escape($cat_data['cat_name']).'</option>'."\n";
 											} ?>
 										</select>
 									</td>
@@ -61,7 +61,7 @@
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Redirect label') ?></th>
-									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.feather_escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
+									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.$feather->utils->escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
 								</tr>
 							</table>
 						</div>
@@ -86,7 +86,7 @@
     foreach ($perm_data as $perm) {
         ?>
 								<tr>
-									<th class="atcl"><?php echo feather_escape($perm['g_title']) ?></th>
+									<th class="atcl"><?php echo $feather->utils->escape($perm['g_title']) ?></th>
 									<td<?php if (!$perm['read_forum_def']) {
     echo ' class="nodefault"';
 }
diff --git a/view/admin/groups/add_edit_group.php b/view/admin/groups/add_edit_group.php
index ae278dce..f09d4255 100644
--- a/view/admin/groups/add_edit_group.php
+++ b/view/admin/groups/add_edit_group.php
@@ -32,14 +32,14 @@
 									<th scope="row"><?php _e('Group title label') ?></th>
 									<td>
 										<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
-    echo feather_escape($group['info']['g_title']);
+    echo $feather->utils->escape($group['info']['g_title']);
 } ?>" tabindex="1" />
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('User title label') ?></th>
 									<td>
-										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo feather_escape($group['info']['g_user_title']) ?>" tabindex="2" />
+										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo $feather->utils->escape($group['info']['g_user_title']) ?>" tabindex="2" />
 										<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
 									</td>
 								</tr>
@@ -50,7 +50,7 @@
 											<option value="0"><?php _e('Disable promotion') ?></option>
 											<?php echo $group_list ?>
 										</select>
-										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo feather_escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
+										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo $feather->utils->escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
 										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
 									</td>
 								</tr>
diff --git a/view/admin/groups/admin_groups.php b/view/admin/groups/admin_groups.php
index 10b68fa4..6d43231a 100644
--- a/view/admin/groups/admin_groups.php
+++ b/view/admin/groups/admin_groups.php
@@ -32,9 +32,9 @@
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
         if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
         } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
         }
     }
 }
@@ -65,9 +65,9 @@
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
         if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
         } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.feather_escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
         }
     }
 }
@@ -95,7 +95,7 @@
 							<table>
 <?php
 foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.feather_escape($cur_group['g_title']).'</td></tr>'."\n";
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.$feather->utils->escape($cur_group['g_title']).'</td></tr>'."\n";
 }
 
 ?>
diff --git a/view/admin/groups/confirm_delete.php b/view/admin/groups/confirm_delete.php
index 91b0b84e..2ea97c75 100644
--- a/view/admin/groups/confirm_delete.php
+++ b/view/admin/groups/confirm_delete.php
@@ -23,7 +23,7 @@
 					<fieldset>
 						<legend><?php _e('Confirm delete subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Confirm delete info'), feather_escape($group_title)) ?></p>
+							<p><?php printf(__('Confirm delete info'), $feather->utils->escape($group_title)) ?></p>
 							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
 						</div>
 					</fieldset>
diff --git a/view/admin/groups/delete_group.php b/view/admin/groups/delete_group.php
index c9cd76e8..be55e2a4 100644
--- a/view/admin/groups/delete_group.php
+++ b/view/admin/groups/delete_group.php
@@ -22,7 +22,7 @@
 					<fieldset>
 						<legend><?php _e('Move users subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Move users info'), feather_escape($group_info['title']), forum_number_format($group_info['members'])) ?></p>
+							<p><?php printf(__('Move users info'), $feather->utils->escape($group_info['title']), $feather->utils->forum_number_format($group_info['members'])) ?></p>
 							<label><?php _e('Move users label') ?>
 							<select name="move_to_group">
 								<?= $group_list_delete; ?>
diff --git a/view/admin/maintenance/prune.php b/view/admin/maintenance/prune.php
index 0232957a..fa4aea34 100644
--- a/view/admin/maintenance/prune.php
+++ b/view/admin/maintenance/prune.php
@@ -26,7 +26,7 @@
 					<fieldset>
 						<legend><?php _e('Confirm prune subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], forum_number_format($prune['num_topics'])) ?></p>
+							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], $feather->utils->forum_number_format($prune['num_topics'])) ?></p>
 							<p class="warntext"><?php _e('Confirm prune warn') ?></p>
 						</div>
 					</fieldset>
diff --git a/view/admin/menu.php b/view/admin/menu.php
index bf468a21..da238ac6 100644
--- a/view/admin/menu.php
+++ b/view/admin/menu.php
@@ -68,6 +68,10 @@
     echo ' class="isactive"';
 }
         ?>><a href="<?php echo $feather->url->get('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
+					<li<?php if ($page == 'plugins') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/plugins/') ?>"><?= 'Plugins'; ?></a></li>
 					<li<?php if ($page == 'censoring') {
     echo ' class="isactive"';
 }
diff --git a/view/admin/options.php b/view/admin/options.php
index 454efe27..98e4eed5 100644
--- a/view/admin/options.php
+++ b/view/admin/options.php
@@ -28,21 +28,21 @@
 								<tr>
 									<th scope="row"><?php _e('Board title label') ?></th>
 									<td>
-										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>" />
+										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?>" />
 										<span><?php _e('Board title help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Board desc label') ?></th>
 									<td>
-										<textarea name="form_board_desc" cols="60" rows="3"><?php echo feather_escape($feather->forum_settings['o_board_desc']) ?></textarea>
+										<textarea name="form_board_desc" cols="60" rows="3"><?php echo $feather->utils->escape($feather->forum_settings['o_board_desc']) ?></textarea>
 										<span><?php _e('Board desc help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Base URL label') ?></th>
 									<td>
-										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo feather_escape($feather->forum_settings['o_base_url']) ?>" />
+										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo $feather->utils->escape($feather->forum_settings['o_base_url']) ?>" />
 										<span><?php _e('Base URL help') ?></span>
 									</td>
 								</tr>
@@ -231,14 +231,14 @@
 								<tr>
 									<th scope="row"><?php _e('Time format label') ?></th>
 									<td>
-										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo feather_escape($feather->forum_settings['o_time_format']) ?>" />
+										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo $feather->utils->escape($feather->forum_settings['o_time_format']) ?>" />
 										<span><?php printf(__('Time format help'), gmdate($feather->forum_settings['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Date format label') ?></th>
 									<td>
-										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo feather_escape($feather->forum_settings['o_date_format']) ?>" />
+										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo $feather->utils->escape($feather->forum_settings['o_date_format']) ?>" />
 										<span><?php printf(__('Date format help'), gmdate($feather->forum_settings['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
@@ -499,7 +499,7 @@
 								<tr>
 									<th scope="row"><?php _e('Menu items label') ?></th>
 									<td>
-										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo feather_escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
+										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
 										<span><?php _e('Menu items help') ?></span>
 									</td>
 								</tr>
@@ -566,7 +566,7 @@
 								<tr>
 									<th scope="row"><?php _e('Mailing list label') ?></th>
 									<td>
-										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_mailing_list']) ?></textarea>
+										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_mailing_list']) ?></textarea>
 										<span><?php _e('Mailing list help') ?></span>
 									</td>
 								</tr>
@@ -594,7 +594,7 @@
 								<tr>
 									<th scope="row"><?php _e('Upload directory label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo feather_escape($feather->forum_settings['o_avatars_dir']) ?>" />
+										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo $feather->utils->escape($feather->forum_settings['o_avatars_dir']) ?>" />
 										<span><?php _e('Upload directory help') ?></span>
 									</td>
 								</tr>
@@ -631,14 +631,14 @@
 								<tr>
 									<th scope="row"><?php _e('Admin e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo feather_escape($feather->forum_settings['o_admin_email']) ?>" />
+										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo $feather->utils->escape($feather->forum_settings['o_admin_email']) ?>" />
 										<span><?php _e('Admin e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo feather_escape($feather->forum_settings['o_webmaster_email']) ?>" />
+										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo $feather->utils->escape($feather->forum_settings['o_webmaster_email']) ?>" />
 										<span><?php _e('Webmaster e-mail help') ?></span>
 									</td>
 								</tr>
@@ -669,14 +669,14 @@
 								<tr>
 									<th scope="row"><?php _e('SMTP address label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo feather_escape($feather->forum_settings['o_smtp_host']) ?>" />
+										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo $feather->utils->escape($feather->forum_settings['o_smtp_host']) ?>" />
 										<span><?php _e('SMTP address help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('SMTP username label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo feather_escape($feather->forum_settings['o_smtp_user']) ?>" />
+										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo $feather->utils->escape($feather->forum_settings['o_smtp_user']) ?>" />
 										<span><?php _e('SMTP username help') ?></span>
 									</td>
 								</tr>
@@ -684,7 +684,7 @@
 									<th scope="row"><?php _e('SMTP password label') ?></th>
 									<td>
 										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
-<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key(strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
+<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key($feather->utils->strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
 										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<span><?php _e('SMTP password help') ?></span>
@@ -762,7 +762,7 @@
 								<tr>
 									<th scope="row"><?php _e('Rules label') ?></th>
 									<td>
-										<textarea name="form_rules_message" rows="10" cols="55"><?php echo feather_escape($feather->forum_settings['o_rules_message']) ?></textarea>
+										<textarea name="form_rules_message" rows="10" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_rules_message']) ?></textarea>
 										<span><?php _e('Rules help') ?></span>
 									</td>
 								</tr>
@@ -805,7 +805,7 @@
 								<tr>
 									<th scope="row"><?php _e('Announcement message label') ?></th>
 									<td>
-										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_announcement_message']) ?></textarea>
+										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_announcement_message']) ?></textarea>
 										<span><?php _e('Announcement message help') ?></span>
 									</td>
 								</tr>
@@ -833,7 +833,7 @@
 								<tr>
 									<th scope="row"><?php _e('Maintenance message label') ?></th>
 									<td>
-										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo feather_escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
+										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
 										<span><?php _e('Maintenance message help') ?></span>
 									</td>
 								</tr>
diff --git a/view/admin/parser.php b/view/admin/parser.php
index 35699c2b..35ee0cbe 100644
--- a/view/admin/parser.php
+++ b/view/admin/parser.php
@@ -87,12 +87,12 @@
 										<input type="radio" name="config[valid_imgs]" value="1"<?php if ($config['valid_imgs']) {
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
+    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
 } ?> /> <strong><?php _e('Yes') ?></strong>
 										<input type="radio" name="config[valid_imgs]" value="0"<?php if (!$config['valid_imgs']) {
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
+    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
 } ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td><?php echo $lang_admin_parser['valid_imgs help'] ?></td>
@@ -101,7 +101,7 @@
 									<th scope="row"><?php echo $lang_admin_parser['max_size'] ?></th>
 									<td colspan="2">
 										<input type="text" name="config[max_size]" size="10" maxlength="8" value="<?php echo($config['max_size'])?>"<?php if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. feather_escape($lang_admin_parser['unavailable']) .'"');
+    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
 } ?> />
 									</td>
 									<td><span><?php echo $lang_admin_parser['max_size help'] ?></span></td>
@@ -165,7 +165,7 @@
         ?>
 								<tr>
 									<td><input type="text" name="smiley_text[<?php echo($i);
-        ?>]" value="<?php echo(feather_escape($key));
+        ?>]" value="<?php echo($feather->utils->escape($key));
         ?>" size="20" maxlength="80" /></td>
 									<td>
 										<select name="smiley_file[<?php echo($i);
diff --git a/view/admin/reports.php b/view/admin/reports.php
index c5249f65..d16db894 100644
--- a/view/admin/reports.php
+++ b/view/admin/reports.php
@@ -24,18 +24,18 @@
         ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php printf(__('Report subhead'), format_time($report['created'])) ?></legend>
+						<legend><?php printf(__('Report subhead'), $feather->utils->format_time($report['created'])) ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
 									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
-									<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
+									<td><?php echo str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
 								</tr>
 							</table>
 						</div>
@@ -74,18 +74,18 @@
         ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php printf(__('Zapped subhead'), format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.feather_escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
+						<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.$feather->utils->escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.feather_escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
 									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?></th>
-									<td><?php echo str_replace("\n", '<br />', feather_escape($report['message'])) ?></td>
+									<td><?php echo str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
 								</tr>
 							</table>
 						</div>
diff --git a/view/admin/statistics.php b/view/admin/statistics.php
index f97ff25c..f2fd7a9a 100644
--- a/view/admin/statistics.php
+++ b/view/admin/statistics.php
@@ -30,7 +30,7 @@
 					</dd>
 					<dt><?php _e('Database label') ?></dt>
 					<dd>
-<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", forum_number_format($total_records)) ?>
+<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", $feather->utils->forum_number_format($total_records)) ?>
 						<br /><?php printf(__('Database data size')."\n", $total_size) ?>
 <?php endif; ?>					</dd>
 <?php endif; ?>
diff --git a/view/admin/users/find_users.php b/view/admin/users/find_users.php
index 390c8eaf..3ddd2324 100644
--- a/view/admin/users/find_users.php
+++ b/view/admin/users/find_users.php
@@ -54,11 +54,11 @@
         foreach ($user_data as $user) {
             ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo feather_escape($user['email']) ?>"><?php echo feather_escape($user['email']) ?></a></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.$feather->utils->escape($user['username']).'</a>' ?></td>
+					<td class="tc2"><a href="mailto:<?php echo $feather->utils->escape($user['email']) ?>"><?php echo $feather->utils->escape($user['email']) ?></a></td>
 					<td class="tc3"><?php echo $user['user_title'] ?></td>
-					<td class="tc4"><?php echo forum_number_format($user['num_posts']) ?></td>
-					<td class="tc5"><?php echo($user['admin_note'] != '') ? feather_escape($user['admin_note']) : '&#160;' ?></td>
+					<td class="tc4"><?php echo $feather->utils->forum_number_format($user['num_posts']) ?></td>
+					<td class="tc5"><?php echo($user['admin_note'] != '') ? $feather->utils->escape($user['admin_note']) : '&#160;' ?></td>
 					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
 <?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
 <?php endif;
diff --git a/view/admin/users/move_users.php b/view/admin/users/move_users.php
index 54ebe40f..a2f96b91 100644
--- a/view/admin/users/move_users.php
+++ b/view/admin/users/move_users.php
@@ -28,7 +28,7 @@
 									<th scope="row"><?php _e('New group label') ?></th>
 									<td>
 										<select name="new_group" tabindex="1">
-<?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo feather_escape($group) ?></option>
+<?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo $feather->utils->escape($group) ?></option>
 <?php endforeach;
     ?>
 										</select>
diff --git a/view/admin/users/search_ip.php b/view/admin/users/search_ip.php
index 58d2bda8..a4db0174 100644
--- a/view/admin/users/search_ip.php
+++ b/view/admin/users/search_ip.php
@@ -45,8 +45,8 @@
         foreach ($ip_data as $ip) {
             ?>
 				<tr>
-					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.feather_escape($ip['poster_ip']).'/') ?>"><?php echo feather_escape($ip['poster_ip']) ?></a></td>
-					<td class="tc2"><?php echo format_time($ip['last_used']) ?></td>
+					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.$feather->utils->escape($ip['poster_ip']).'/') ?>"><?php echo $feather->utils->escape($ip['poster_ip']) ?></a></td>
+					<td class="tc2"><?php echo $feather->utils->format_time($ip['last_used']) ?></td>
 					<td class="tc3"><?php echo $ip['used_times'] ?></td>
 					<td class="tcr"><a href="<?php echo $feather->url->get('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
 				</tr>
diff --git a/view/admin/users/show_users.php b/view/admin/users/show_users.php
index aa5b74d1..99fccb06 100644
--- a/view/admin/users/show_users.php
+++ b/view/admin/users/show_users.php
@@ -51,11 +51,11 @@
             if (isset($info['user_data'][$cur_poster['poster_id']])) {
                 ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.feather_escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo feather_escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.$feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
+					<td class="tc2"><a href="mailto:<?php echo $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
 					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
-					<td class="tc4"><?php echo forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
-					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? feather_escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
+					<td class="tc4"><?php echo $feather->utils->forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
+					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
 					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
 				</tr>
 <?php
@@ -63,7 +63,7 @@
             } else {
                 ?>
 				<tr>
-					<td class="tcl"><?php echo feather_escape($cur_poster['poster']) ?></td>
+					<td class="tcl"><?php echo $feather->utils->escape($cur_poster['poster']) ?></td>
 					<td class="tc2">&#160;</td>
 					<td class="tc3"><?php _e('Results guest') ?></td>
 					<td class="tc4">&#160;</td>
diff --git a/view/delete.php b/view/delete.php
index 3bce4ce2..70453628 100644
--- a/view/delete.php
+++ b/view/delete.php
@@ -6,19 +6,19 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
-    exit;
+	exit;
 }
 ?>
 
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="index.php"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><a href="<?php echo $feather->url->base() ?>>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>
@@ -31,7 +31,7 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.feather_escape($cur_post['poster']).'</strong>', format_time($cur_post['posted'])) ?></span></h3>
+					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.$feather->utils->escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
 					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
 				</div>
 			</div>
@@ -47,8 +47,8 @@
 				<div class="postbody">
 					<div class="postleft">
 						<dl>
-							<dt><strong><?php echo feather_escape($cur_post['poster']) ?></strong></dt>
-							<dd><span><?php echo format_time($cur_post['posted']) ?></span></dd>
+							<dt><strong><?php echo $feather->utils->escape($cur_post['poster']) ?></strong></dt>
+							<dd><span><?php echo $feather->utils->format_time($cur_post['posted']) ?></span></dd>
 						</dl>
 					</div>
 					<div class="postright">
diff --git a/view/edit.php b/view/edit.php
index 3b248d18..ea9c3abe 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -20,8 +20,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
 		</ul>
 	</div>
@@ -69,7 +69,7 @@
 ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo feather_escape($feather->url->base(true)); ?>',
+    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
@@ -84,10 +84,10 @@
 					<input type="hidden" name="form_sent" value="1" />
 					<div class="infldset txtarea">
 <?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo feather_escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
+						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo $feather->utils->escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
 <?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
 						<script>postEditorToolbar('req_message');</script>
-                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo feather_escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
+                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo $feather->utils->escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
 							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
 							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
diff --git a/view/error.php b/view/error.php
new file mode 100644
index 00000000..d638a206
--- /dev/null
+++ b/view/error.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="msg" class="block error">
+    <h2><span><?= $msg_title ?></span></h2>
+    <div class="box">
+        <div class="inbox">
+            <p><?php echo $msg ?></p>
+            <?php if (!$no_back_link) {
+                echo "\t\t\t".'<p><a href="javascript: history.go(-1)">'.__('Go back').'</a></p>';
+            } ?>
+        </div>
+    </div>
+</div>
diff --git a/view/help.php b/view/help.php
index 06e642f2..00669948 100644
--- a/view/help.php
+++ b/view/help.php
@@ -41,8 +41,8 @@
 <div class="box">
 	<div class="inbox">
 		<p><?php _e('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo feather_escape($feather->url->base(true).'/') ?>]<?php echo feather_escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape($feather->url->base(true).'/') ?>"><?php echo feather_escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo feather_escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo feather_escape($feather->url->base(true).'/') ?>"><?php echo feather_escape($feather->url->base(true).'/') ?></a></samp></p>
+		<p><a name="url"></a><code>[url=<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>]<?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>"><?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>"><?php echo $feather->utils->escape($feather->url->base(true).'/') ?></a></samp></p>
 		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
 		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
@@ -57,7 +57,7 @@
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
-		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo feather_escape($feather->url->base(true)) ?>/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo feather_escape($feather->url->base(true)) ?>/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
+		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo $feather->utils->escape($feather->url->base(true)) ?>/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo $feather->utils->escape($feather->url->base(true)) ?>/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
 <h2><span><?php _e('Quotes') ?></span></h2>
diff --git a/view/index.php b/view/index.php
index cc51e8b5..826fa47e 100644
--- a/view/index.php
+++ b/view/index.php
@@ -27,7 +27,7 @@
 	<?php endif;
     ?>
 	<div id="idx<?php echo $forum->cid ?>" class="blocktable">
-	<h2><span><?php echo feather_escape($forum->cat_name) ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($forum->cat_name) ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
@@ -46,15 +46,15 @@
     ?>
 				<tr class="<?php echo $forum->item_status ?>">
 					<td class="tcl">
-						<div class="<?php echo $forum->icon_type ?>"><div class="nosize"><?php echo forum_number_format($forum->forum_count_formatted) ?></div></div>
+						<div class="<?php echo $forum->icon_type ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($forum->forum_count_formatted) ?></div></div>
 						<div class="tclcon">
 							<div>
 								<?php echo $forum->forum_field."\n".$forum->moderators_formatted ?>
 							</div>
 						</div>
 					</td>
-					<td class="tc2"><?php echo forum_number_format($forum->num_topics_formatted) ?></td>
-					<td class="tc3"><?php echo forum_number_format($forum->num_posts_formatted) ?></td>
+					<td class="tc2"><?php echo $feather->utils->forum_number_format($forum->num_topics_formatted) ?></td>
+					<td class="tc3"><?php echo $feather->utils->forum_number_format($forum->num_posts_formatted) ?></td>
 					<td class="tcr"><?php echo $forum->last_post_formatted ?></td>
 				</tr>
 	<?php
@@ -85,16 +85,16 @@
 		<div class="inbox">
 			<dl class="conr">
 				<dt><strong><?php _e('Board stats') ?></strong></dt>
-				<dd><span><?php printf(__('No of users'), '<strong>'.forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of topics'), '<strong>'.forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of posts'), '<strong>'.forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of users'), '<strong>'.$feather->utils->forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of topics'), '<strong>'.$feather->utils->forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of posts'), '<strong>'.$feather->utils->forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
 			</dl>
 			<dl class="conl">
 				<dt><strong><?php _e('User info') ?></strong></dt>
 				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
 				<?php if ($feather->forum_settings['o_users_online'] == 1) : ?>
-				<dd><span><?php printf(__('Users online'), '<strong>'.forum_number_format($online['num_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('Guests online'), '<strong>'.forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Users online'), '<strong>'.$feather->utils->forum_number_format($online['num_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Guests online'), '<strong>'.$feather->utils->forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
 				<?php endif; ?>
 			</dl>
 			<?php
diff --git a/view/login/form.php b/view/login/form.php
index 1ad355cd..6a6d70a0 100644
--- a/view/login/form.php
+++ b/view/login/form.php
@@ -23,7 +23,7 @@
 					<legend><?php _e('Login legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
+						<input type="hidden" name="redirect_url" value="<?php echo $feather->utils->escape($redirect_url) ?>" />
 						<label class="conl required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
 						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
 
diff --git a/view/misc/email.php b/view/misc/email.php
index 2c9921bd..867ac9ee 100644
--- a/view/misc/email.php
+++ b/view/misc/email.php
@@ -14,7 +14,7 @@
 
 ?>
 <div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($mail['recipient']) ?></span></h2>
+	<h2><span><?php _e('Send email to') ?> <?php echo $feather->utils->escape($mail['recipient']) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="<?php echo $feather->url->get('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/view/misc/report.php b/view/misc/report.php
index acb6c729..6eeead9c 100644
--- a/view/misc/report.php
+++ b/view/misc/report.php
@@ -17,8 +17,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo feather_escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo feather_escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
 		</ul>
 	</div>
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
index b61c3104..06c6987b 100644
--- a/view/moderate/moderator_forum.php
+++ b/view/moderate/moderator_forum.php
@@ -18,7 +18,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -30,9 +30,9 @@
 
 <form method="post" action="<?php echo $feather->url->get('moderate/forum/'.$id.'/') ?>">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<input type="hidden" name="page" value="<?php echo feather_escape($p) ?>" />
+<input type="hidden" name="page" value="<?php echo $feather->utils->escape($p) ?>" />
 <div id="vf" class="blocktable">
-	<h2><span><?php echo feather_escape($cur_forum['forum_name']) ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
@@ -55,15 +55,15 @@
                 ?>
 							<tr class="<?php echo $topic['item_status'] ?>">
 					<td class="tcl">
-						<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo forum_number_format($topic_count + $start_from) ?></div></div>
+						<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
 						<div class="tclcon">
 							<div>
 								<?php echo $topic['subject_disp']."\n" ?>
 							</div>
 						</div>
 					</td>
-					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_replies']) : '-' ?></td>
-<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? forum_number_format($topic['num_views']) : '-' ?></td>
+					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? $feather->utils->forum_number_format($topic['num_replies']) : '-' ?></td>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? $feather->utils->forum_number_format($topic['num_views']) : '-' ?></td>
 <?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_disp'] ?></td>
 					<td class="tcmod"><input type="checkbox" name="topics[<?php echo $topic['id'] ?>]" value="1" /></td>
@@ -92,7 +92,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/view/moderate/posts_view.php b/view/moderate/posts_view.php
index a2c6ecea..0338555a 100644
--- a/view/moderate/posts_view.php
+++ b/view/moderate/posts_view.php
@@ -17,8 +17,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -42,7 +42,7 @@
     echo ' blockpost1';
 }
     ?>">
-		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
+		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<div class="postbody">
@@ -57,7 +57,7 @@
 						<div class="postmsg">
 							<?php echo $post['message']."\n" ?>
 	<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.$feather->utils->escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 						</div>
@@ -85,8 +85,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/view/post.php b/view/post.php
index 21f8bc7d..d0b60d54 100644
--- a/view/post.php
+++ b/view/post.php
@@ -18,10 +18,10 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_posting['forum_name']) ?></a></li>
-<?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo feather_escape($feather->request->post('req_subject')) ?></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_posting['forum_name']) ?></a></li>
+<?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo $feather->utils->escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
-<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_posting['subject']) ?></a></li>
+<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_posting['subject']) ?></a></li>
 <?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
 		</ul>
 	</div>
@@ -81,7 +81,7 @@
 ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo feather_escape($feather->url->base(true)); ?>',
+    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
@@ -102,11 +102,11 @@
     $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
 						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
-    echo feather_escape($post['username']);
+    echo $feather->utils->escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
-    echo feather_escape($post['email']);
+    echo $feather->utils->escape($post['email']);
 }
     ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
@@ -115,7 +115,7 @@
 }
 if ($fid): ?>
 						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
-    echo feather_escape($post['subject']);
+    echo $feather->utils->escape($post['subject']);
 } ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 <?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
                         <script>postEditorToolbar('req_message');</script>
@@ -190,8 +190,8 @@
 			<div class="postbody">
 				<div class="postleft">
 					<dl>
-						<dt><strong><?php echo feather_escape($post['poster']) ?></strong></dt>
-						<dd><span><?php echo format_time($post['posted']) ?></span></dd>
+						<dt><strong><?php echo $feather->utils->escape($post['poster']) ?></strong></dt>
+						<dd><span><?php echo $feather->utils->format_time($post['posted']) ?></span></dd>
 					</dl>
 				</div>
 				<div class="postright">
diff --git a/view/profile/delete_user.php b/view/profile/delete_user.php
index 5b22471a..84a3b58d 100644
--- a/view/profile/delete_user.php
+++ b/view/profile/delete_user.php
@@ -22,7 +22,7 @@
 				<fieldset>
 					<legend><?php _e('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php _e('Confirmation info').' <strong>'.feather_escape($username).'</strong>.' ?></p>
+						<p><?php _e('Confirmation info').' <strong>'.$feather->utils->escape($username).'</strong>.' ?></p>
 						<div class="rbox">
 							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
 						</div>
diff --git a/view/profile/section_admin.php b/view/profile/section_admin.php
index a73c3fb9..f06eb7d4 100644
--- a/view/profile/section_admin.php
+++ b/view/profile/section_admin.php
@@ -14,7 +14,7 @@
 
 ?>
 	<div class="blockform">
-		<h2><span><?php echo feather_escape($user['username']).' - '.__('Section admin') ?></span></h2>
+		<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section admin') ?></span></h2>
 		<div class="box">
 			<form id="profile7" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
index 3277bf29..8fc83a15 100644
--- a/view/profile/section_display.php
+++ b/view/profile/section_display.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section display') ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section display') ?></span></h2>
 	<div class="box">
 		<form id="profile5" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/view/profile/section_essentials.php b/view/profile/section_essentials.php
index bb97256c..3d82ca0b 100644
--- a/view/profile/section_essentials.php
+++ b/view/profile/section_essentials.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section essentials') ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section essentials') ?></span></h2>
 	<div class="box">
 		<form id="profile1" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -179,7 +179,7 @@
                                 if ($user['time_format'] == $key) {
                                     echo ' selected="selected"';
                                 }
-                                echo '>'. format_time(time(), false, null, $time_format, true, true);
+                                echo '>'. $feather->utils->format_time(time(), false, null, $time_format, true, true);
                                 if ($key == 0) {
                                     echo ' ('.__('Default').')';
                                 }
@@ -197,7 +197,7 @@
                                 if ($user['date_format'] == $key) {
                                     echo ' selected="selected"';
                                 }
-                                echo '>'. format_time(time(), true, $date_format, null, false, true);
+                                echo '>'. $feather->utils->format_time(time(), true, $date_format, null, false, true);
                                 if ($key == 0) {
                                     echo ' ('.__('Default').')';
                                 }
@@ -241,12 +241,12 @@
 				<fieldset>
 					<legend><?php _e('User activity') ?></legend>
 					<div class="infldset">
-						<p><?php printf(__('Registered info'), format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.feather_escape($user['registration_ip']).'</a>)' : '')) ?></p>
-						<p><?php printf(__('Last post info'), format_time($user['last_post'])) ?></p>
-						<p><?php printf(__('Last visit info'), format_time($user['last_visit'])) ?></p>
+						<p><?php printf(__('Registered info'), $feather->utils->format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.$feather->utils->escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Last post info'), $feather->utils->format_time($user['last_post'])) ?></p>
+						<p><?php printf(__('Last visit info'), $feather->utils->format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
 <?php if ($feather->user->is_admmod): ?>							<label><?php _e('Admin note') ?><br />
-						<input id="admin_note" type="text" name="admin_note" value="<?php echo feather_escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
+						<input id="admin_note" type="text" name="admin_note" value="<?php echo $feather->utils->escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
diff --git a/view/profile/section_messaging.php b/view/profile/section_messaging.php
index 8597a115..2d3268dd 100644
--- a/view/profile/section_messaging.php
+++ b/view/profile/section_messaging.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section messaging') ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section messaging') ?></span></h2>
 	<div class="box">
 		<form id="profile3" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -23,11 +23,11 @@
 					<legend><?php _e('Contact details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo feather_escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
+						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo $feather->utils->escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
 						<label><?php _e('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo feather_escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo feather_escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo feather_escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo $feather->utils->escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
+						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo $feather->utils->escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo $feather->utils->escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/profile/section_personal.php b/view/profile/section_personal.php
index 80c19741..5ae81801 100644
--- a/view/profile/section_personal.php
+++ b/view/profile/section_personal.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personal') ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section personal') ?></span></h2>
 	<div class="box">
 		<form id="profile2" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -23,10 +23,10 @@
 					<legend><?php _e('Personal details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo feather_escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
+						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo $feather->utils->escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
 <?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo feather_escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo feather_escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo $feather->utils->escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo $feather->utils->escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>
 					</div>
 				</fieldset>
diff --git a/view/profile/section_personality.php b/view/profile/section_personality.php
index f2692e75..ae9f7b0f 100644
--- a/view/profile/section_personality.php
+++ b/view/profile/section_personality.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section personality') ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section personality') ?></span></h2>
 	<div class="box">
 		<form id="profile4" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -35,8 +35,8 @@
 					<div class="infldset">
 						<p><?php _e('Signature info') ?></p>
 						<div class="txtarea">
-							<label><?php printf(__('Sig max size'), forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
-							<textarea name="signature" rows="4" cols="65"><?php echo feather_escape($user['signature']) ?></textarea><br /></label>
+							<label><?php printf(__('Sig max size'), $feather->utils->forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
+							<textarea name="signature" rows="4" cols="65"><?php echo $feather->utils->escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
 							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
diff --git a/view/profile/section_privacy.php b/view/profile/section_privacy.php
index d978904e..48715858 100644
--- a/view/profile/section_privacy.php
+++ b/view/profile/section_privacy.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo feather_escape($user['username']).' - '.__('Section privacy') ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section privacy') ?></span></h2>
 	<div class="box">
 		<form id="profile6" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
index ba880454..15261a67 100644
--- a/view/profile/upload_avatar.php
+++ b/view/profile/upload_avatar.php
@@ -25,7 +25,7 @@
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php _e('Avatar desc').' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
+						<p><?php _e('Avatar desc').' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/register/email.php b/view/register/email.php
index e26ad690..a93188f9 100644
--- a/view/register/email.php
+++ b/view/register/email.php
@@ -15,7 +15,7 @@
 ?>
 
 <div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo feather_escape($recipient) ?></span></h2>
+	<h2><span><?php _e('Send email to') ?> <?php echo $feather->utils->escape($recipient) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -24,7 +24,7 @@
 					<legend><?php _e('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="redirect_url" value="<?php echo feather_escape($redirect_url) ?>" />
+						<input type="hidden" name="redirect_url" value="<?php echo $feather->utils->escape($redirect_url) ?>" />
 						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
 						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
diff --git a/view/register/form.php b/view/register/form.php
index bdff9a2b..d7deb65f 100644
--- a/view/register/form.php
+++ b/view/register/form.php
@@ -54,7 +54,7 @@
 						<input type="hidden" name="username" value="" />
 						<input type="hidden" name="password" value="" />
 						<label class="required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
-    echo feather_escape($feather->request->post('req_user'));
+    echo $feather->utils->escape($feather->request->post('req_user'));
 } ?>" size="25" maxlength="25" /><br /></label>
 					</div>
 				</fieldset>
@@ -64,10 +64,10 @@
 					<legend><?php _e('Pass legend') ?></legend>
 					<div class="infldset">
 						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
-    echo feather_escape($feather->request->post('req_password1'));
+    echo $feather->utils->escape($feather->request->post('req_password1'));
 } ?>" size="16" /><br /></label>
 						<label class="conl required"><strong><?php _e('Confirm pass') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
-    echo feather_escape($feather->request->post('req_password2'));
+    echo $feather->utils->escape($feather->request->post('req_password2'));
 } ?>" size="16" /><br /></label>
 						<p class="clearb"><?php _e('Pass info') ?></p>
 					</div>
@@ -80,11 +80,11 @@
 <?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
 <?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
-    echo feather_escape($feather->request->post('req_email1'));
+    echo $feather->utils->escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
 <?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
-    echo feather_escape($feather->request->post('req_email2'));
+    echo $feather->utils->escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>					</div>
 				</fieldset>
diff --git a/view/search/posts.php b/view/search/posts.php
index d0eab7cc..3a2be8ef 100644
--- a/view/search/posts.php
+++ b/view/search/posts.php
@@ -22,14 +22,14 @@
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
     _e('Re').' ';
-} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo format_time($cur_search['pposted']) ?></a></span></span></h2>
+} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
 		<div class="postbody">
 			<div class="postleft">
 				<dl>
 					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.forum_number_format($cur_search['num_replies']) ?></span></dd>
+<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.$feather->utils->forum_number_format($cur_search['num_replies']) ?></span></dd>
 <?php endif; ?>
 					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
 				</dl>
diff --git a/view/search/topics.php b/view/search/topics.php
index 7cead694..265cbb27 100644
--- a/view/search/topics.php
+++ b/view/search/topics.php
@@ -16,7 +16,7 @@
 
 <tr class="<?php echo $cur_search['item_status'] ?>">
 	<td class="tcl">
-		<div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo forum_number_format($topic_count + $start_from) ?></div></div>
+		<div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
 		<div class="tclcon">
 			<div>
 				<?php echo $subject."\n" ?>
@@ -24,6 +24,6 @@
 		</div>
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
-	<td class="tc3"><?php echo forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.feather_escape($cur_search['last_poster']) ?></span></td>
+	<td class="tc3"><?php echo $feather->utils->forum_number_format($cur_search['num_replies']) ?></td>
+	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.$feather->utils->format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.$feather->utils->escape($cur_search['last_poster']) ?></span></td>
 </tr>
\ No newline at end of file
diff --git a/view/userlist.php b/view/userlist.php
index a686ba5b..3166d107 100644
--- a/view/userlist.php
+++ b/view/userlist.php
@@ -21,7 +21,7 @@
 				<fieldset>
 					<legend><?php _e('User find legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo feather_escape($username) ?>" size="25" maxlength="25" /><br /></label>
+<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo $feather->utils->escape($username) ?>" size="25" maxlength="25" /><br /></label>
 <?php endif; ?>						<label class="conl"><?php _e('User group')."\n" ?>
 						<br /><select name="show_group">
 							<option value="-1"<?php if ($show_group == -1) {
@@ -87,12 +87,12 @@
             foreach ($userlist_data as $user) {
                 ?>
 					<tr>
-						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.feather_escape($user['username']).'</a>' ?></td>
+						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.$feather->utils->escape($user['username']).'</a>' ?></td>
 						<td class="tc2"><?php echo get_title($user) ?></td>
-	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo forum_number_format($user['num_posts']) ?></td>
+	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo $feather->utils->forum_number_format($user['num_posts']) ?></td>
 	<?php endif;
                 ?>
-						<td class="tcr"><?php echo format_time($user['registered'], true) ?></td>
+						<td class="tcr"><?php echo $feather->utils->format_time($user['registered'], true) ?></td>
 					</tr>
 			<?php
 
diff --git a/view/viewforum.php b/view/viewforum.php
index 0855bd20..dbf440af 100644
--- a/view/viewforum.php
+++ b/view/viewforum.php
@@ -17,7 +17,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -28,7 +28,7 @@
 </div>
 
 <div id="vf" class="blocktable">
-	<h2><span><?php echo feather_escape($cur_forum['forum_name']) ?></span></h2>
+	<h2><span><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
@@ -48,15 +48,15 @@
                 ?>
 					<tr class="<?php echo $topic['item_status'] ?>">
 						<td class="tcl">
-							<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo forum_number_format($topic_count + $start_from) ?></div></div>
+							<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
 							<div class="tclcon">
 								<div>
 									<?php echo $topic['subject_formatted']."\n" ?>
 								</div>
 							</div>
 						</td>
-						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_replies']) : '-' ?></td>
-	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? forum_number_format($topic['num_views']) : '-' ?></td>
+						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? $feather->utils->forum_number_format($topic['num_replies']) : '-' ?></td>
+	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? $feather->utils->forum_number_format($topic['num_views']) : '-' ?></td>
 	<?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_formatted'] ?></td>
 					</tr>
@@ -92,7 +92,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
 		<div class="clearer"></div>
diff --git a/view/viewtopic.php b/view/viewtopic.php
index 7e7c088b..d16a862c 100644
--- a/view/viewtopic.php
+++ b/view/viewtopic.php
@@ -18,8 +18,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -40,7 +40,7 @@
     echo ' blockpost1';
 }
     ?>">
-	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo format_time($post['posted']) ?></a></span></h2>
+	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -66,11 +66,11 @@
 					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
     _e('Re').' ';
 }
-    ?><?php echo feather_escape($cur_topic['subject']) ?></h3>
+    ?><?php echo $feather->utils->escape($cur_topic['subject']) ?></h3>
 					<div class="postmsg">
 						<?php echo $post['message']."\n" ?>
 <?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.feather_escape($post['edited_by']).' ('.format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.$feather->utils->escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 					</div>
@@ -108,8 +108,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo feather_escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo feather_escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 <?php echo $subscraction ?>
 		<div class="clearer"></div>
@@ -133,8 +133,8 @@
 					<legend><?php _e('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="pid" value="<?php echo feather_escape($pid) ?>" />
-						<input type="hidden" name="page" value="<?php echo feather_escape($page_number) ?>" />
+						<input type="hidden" name="pid" value="<?php echo $feather->utils->escape($pid) ?>" />
+						<input type="hidden" name="page" value="<?php echo $feather->utils->escape($page_number) ?>" />
 <?php if ($feather->forum_settings['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
 <?php endif;
 
@@ -155,7 +155,7 @@
     ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo feather_escape($feather->url->base(true)); ?>',
+    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>

From c257b2b78be0164771c4dce8cb33fd9474ba7599 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sat, 29 Aug 2015 20:42:31 +0200
Subject: [PATCH 266/353] Windows plugins list compatibility

And update composer.son
---
 composer.json                         | 2 +-
 controller/admin/plugins.php          | 4 ++--
 include/classes/adminutils.class.php  | 6 +++---
 vendor/composer/autoload_classmap.php | 6 ++++--
 vendor/composer/autoload_psr4.php     | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 31e224c7..938feef8 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
     "autoload": {
         "classmap": ["include/classes/"],
         "psr-4" : {
-            "Plugins\\" : "/plugin"
+            "Plugins\\" : "/plugins"
         }
     }
 }
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index cab74960..24e31ea6 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -70,7 +70,7 @@ public function activate()
             redirect($this->feather->url->get('admin/plugins/'), $this->feather->utils->escape($e->getMessage()));
         }
         // Plugin has been activated, confirm and redirect
-        redirect($this->feather->url->get('admin/plugins/'), 'Plugin "'.$class::$name.'" activated!');
+        redirect($this->feather->url->get('admin/plugins/'), 'Plugin "'.$this->feather->utils->escape($class::$name).'" activated!');
     }
 
     public function deactivate()
@@ -88,7 +88,7 @@ public function deactivate()
             redirect($this->feather->url->get('admin/plugins/'), $this->feather->utils->escape($e->getMessage()));
         }
         // Plugin has been activated, confirm and redirect
-        redirect($this->feather->url->get('admin/plugins/'), 'Plugin "'.$class::$name.'" deactivated!');
+        redirect($this->feather->url->get('admin/plugins/'), 'Plugin "'.$this->feather->utils->escape($class::$name).'" deactivated!');
     }
 
     public function display()
diff --git a/include/classes/adminutils.class.php b/include/classes/adminutils.class.php
index 27da2df2..149da35c 100644
--- a/include/classes/adminutils.class.php
+++ b/include/classes/adminutils.class.php
@@ -37,10 +37,10 @@ public static function getPluginFiles($folder = '')
     {
         $plugin_files = array();
 
-        $plugins_dir = new \RecursiveDirectoryIterator(FEATHER_ROOT.'Plugins/'.$folder);
+        $plugins_dir = new \RecursiveDirectoryIterator(FEATHER_ROOT.'plugins/'.$folder);
         $iterator = new \RecursiveIteratorIterator($plugins_dir);
         $iterator->setMaxDepth(1);
-        $php_files = new \RegexIterator($iterator, '/^.+\.php$/i', \RecursiveRegexIterator::GET_MATCH);
+        $php_files = new \RegexIterator($iterator, '/.+\.php$/i', \RecursiveRegexIterator::GET_MATCH);
 
         foreach ($php_files as $file) {
             $plugin_files[] = $file[0];
@@ -63,7 +63,7 @@ public static function getValidPlugins($folder = '')
 
         foreach ($plugin_files as $key => $file_path) {
             // Remove forum base path
-            $relative_path = "/".preg_replace("/" . preg_quote($feather_root, "/") . "/", '', $file_path);
+            $relative_path = DIRECTORY_SEPARATOR.preg_replace("/" . preg_quote($feather_root, "/") . "/", '', $file_path);
             preg_match('/^(.+)\.php$/i', $relative_path, $class_name);
             $parts = explode(DIRECTORY_SEPARATOR, $class_name[1]);
             $name_space = join($parts, "\\");
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 619a68c3..958ecee3 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -10,17 +10,19 @@
     'CachedIntFileReader' => $baseDir . '/include/classes/pomo/Streams/CachedIntFileReader.php',
     'DB' => $baseDir . '/include/classes/database.class.php',
     'EntryTranslations' => $baseDir . '/include/classes/pomo/Translations/EntryTranslations.php',
-    'FeatherBB\\AdminUtils' => $baseDir . '/include/classes/AdminUtils.class.php',
+    'FeatherBB\\AdminUtils' => $baseDir . '/include/classes/adminutils.class.php',
     'FeatherBB\\Auth' => $baseDir . '/include/classes/auth.class.php',
     'FeatherBB\\Cache' => $baseDir . '/include/classes/cache.class.php',
     'FeatherBB\\Core' => $baseDir . '/include/classes/core.class.php',
     'FeatherBB\\Csrf' => $baseDir . '/include/classes/csrf.class.php',
     'FeatherBB\\Email' => $baseDir . '/include/classes/email.class.php',
+    'FeatherBB\\Error' => $baseDir . '/include/classes/error.class.php',
     'FeatherBB\\Hooks' => $baseDir . '/include/classes/hooks.class.php',
     'FeatherBB\\Loader' => $baseDir . '/include/classes/autoload.class.php',
     'FeatherBB\\Plugin' => $baseDir . '/include/classes/plugin.class.php',
     'FeatherBB\\Search' => $baseDir . '/include/classes/search.class.php',
-    'FeatherBB\\Utils' => $baseDir . '/include/classes/Utils.class.php',
+    'FeatherBB\\Url' => $baseDir . '/include/classes/url.class.php',
+    'FeatherBB\\Utils' => $baseDir . '/include/classes/utils.class.php',
     'FeatherBB\\View' => $baseDir . '/include/classes/view.class.php',
     'FileReader' => $baseDir . '/include/classes/pomo/Streams/FileReader.php',
     'GettextTranslations' => $baseDir . '/include/classes/pomo/Translations/GettextTranslations.php',
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index aa8765e1..4f5d91ac 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -6,5 +6,5 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Plugins\\' => array('/plugin'),
+    'Plugins\\' => array('/plugins'),
 );

From 3fa16c4a8d3ea76c1b84e96d5d550d00d34b88d6 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sat, 29 Aug 2015 20:48:46 +0200
Subject: [PATCH 267/353] Finish to update files with new exception

---
 model/admin/options.php | 24 ++++++++++----------
 model/admin/users.php   | 34 ++++++++++++++--------------
 model/delete.php        |  6 ++---
 model/moderate.php      | 50 ++++++++++++++++++++---------------------
 model/register.php      |  6 ++---
 model/search.php        | 42 +++++++++++++++++-----------------
 model/viewtopic.php     |  6 ++---
 7 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/model/admin/options.php b/model/admin/options.php
index d79e37b3..7d013513 100644
--- a/model/admin/options.php
+++ b/model/admin/options.php
@@ -91,7 +91,7 @@ public function update_options()
         $form = $this->hook->fire('options.update_options.form', $form);
 
         if ($form['board_title'] == '') {
-            message(__('Must enter title message'));
+            throw new \FeatherBB\Error(__('Must enter title message'), 400);
         }
 
         // Make sure base_url doesn't end with a slash
@@ -102,7 +102,7 @@ public function update_options()
         // Convert IDN to Punycode if needed
         if (preg_match('/[^\x00-\x7F]/', $form['base_url'])) {
             if (!function_exists('idn_to_ascii')) {
-                message(__('Base URL problem'));
+                throw new \FeatherBB\Error(__('Base URL problem'), 400);
             } else {
                 $form['base_url'] = idn_to_ascii($form['base_url']);
             }
@@ -110,12 +110,12 @@ public function update_options()
 
         $languages = forum_list_langs();
         if (!in_array($form['default_lang'], $languages)) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         $styles = forum_list_styles();
         if (!in_array($form['default_style'], $styles)) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         if ($form['time_format'] == '') {
@@ -127,11 +127,11 @@ public function update_options()
         }
 
         if (!$this->email->is_valid_email($form['admin_email'])) {
-            message(__('Invalid e-mail message'));
+            throw new \FeatherBB\Error(__('Invalid e-mail message'), 400);
         }
 
         if (!$this->email->is_valid_email($form['webmaster_email'])) {
-            message(__('Invalid webmaster e-mail message'));
+            throw new \FeatherBB\Error(__('Invalid webmaster e-mail message'), 400);
         }
 
         if ($form['mailing_list'] != '') {
@@ -155,7 +155,7 @@ public function update_options()
             if ($smtp_pass1 == $smtp_pass2) {
                 $form['smtp_pass'] = $smtp_pass1;
             } else {
-                message(__('SMTP passwords did not match'));
+                throw new \FeatherBB\Error(__('SMTP passwords did not match'), 400);
             }
         }
 
@@ -194,23 +194,23 @@ public function update_options()
         }
 
         if ($form['feed_type'] < 0 || $form['feed_type'] > 2) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         if ($form['feed_ttl'] < 0) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         if ($form['report_method'] < 0 || $form['report_method'] > 2) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         if ($form['default_email_setting'] < 0 || $form['default_email_setting'] > 2) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         if ($form['timeout_online'] >= $form['timeout_visit']) {
-            message(__('Timeout error message'));
+            throw new \FeatherBB\Error(__('Timeout error message'), 400);
         }
 
         foreach ($form as $key => $input) {
diff --git a/model/admin/users.php b/model/admin/users.php
index e14f0034..349a6c77 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -142,7 +142,7 @@ public function move_users()
         $move['user_ids'] = $this->hook->fire('model.users.move_users.user_ids', $move['user_ids']);
 
         if (empty($move['user_ids'])) {
-            message(__('No users selected'));
+            throw new \FeatherBB\Error(__('No users selected'), 404);
         }
 
         // Are we trying to batch move any admins?
@@ -150,7 +150,7 @@ public function move_users()
                         ->where('group_id', FEATHER_ADMIN)
                         ->find_one();
         if ($is_admin) {
-            message(__('No move admins message'));
+            throw new \FeatherBB\Error(__('No move admins message'), 403);
         }
 
         // Fetch all user groups
@@ -168,7 +168,7 @@ public function move_users()
         }
 
         if ($this->request->post('move_users_comply')) {
-            $new_group = $this->request->post('new_group') && isset($move['all_groups'][$this->request->post('new_group')]) ? $this->request->post('new_group') : message(__('Invalid group message'));
+            $new_group = $this->request->post('new_group') && isset($move['all_groups'][$this->request->post('new_group')]) ? $this->request->post('new_group') : throw new \FeatherBB\Error(__('Invalid group message'), 400);
             $new_group = $this->hook->fire('model.users.move_users.new_group', $new_group);
 
             // Is the new group a moderator group?
@@ -259,7 +259,7 @@ public function delete_users()
         $user_ids = $this->hook->fire('model.users.delete_users.user_ids', $user_ids);
 
         if (empty($user_ids)) {
-            message(__('No users selected'));
+            throw new \FeatherBB\Error(__('No users selected'), 404);
         }
 
         // Are we trying to delete any admins?
@@ -267,7 +267,7 @@ public function delete_users()
             ->where('group_id', FEATHER_ADMIN)
             ->find_one();
         if ($is_admin) {
-            message(__('No delete admins message'));
+            throw new \FeatherBB\Error(__('No delete admins message'), 403);
         }
 
         if ($this->request->post('delete_users_comply')) {
@@ -423,7 +423,7 @@ public function ban_users()
         $user_ids = $this->hook->fire('model.users.ban_users.user_ids', $user_ids);
 
         if (empty($user_ids)) {
-            message(__('No users selected'));
+            throw new \FeatherBB\Error(__('No users selected'), 404);
         }
 
         // Are we trying to ban any admins?
@@ -431,7 +431,7 @@ public function ban_users()
             ->where('group_id', FEATHER_ADMIN)
             ->find_one();
         if ($is_admin) {
-            message(__('No ban admins message'));
+            throw new \FeatherBB\Error(__('No ban admins message'), 403);
         }
 
         // Also, we cannot ban moderators
@@ -441,7 +441,7 @@ public function ban_users()
             ->where_in('u.id', $user_ids)
             ->find_one();
         if ($is_mod) {
-            message(__('No ban mods message'));
+            throw new \FeatherBB\Error(__('No ban mods message'), 403);
         }
 
         if ($this->request->post('ban_users_comply')) {
@@ -455,14 +455,14 @@ public function ban_users()
                 $ban_expire = strtotime($ban_expire . ' GMT');
 
                 if ($ban_expire == -1 || !$ban_expire) {
-                    message(__('Invalid date message') . ' ' . __('Invalid date reasons'));
+                    throw new \FeatherBB\Error(__('Invalid date message') . ' ' . __('Invalid date reasons'), 400);
                 }
 
                 $diff = ($this->user->timezone + $this->user->dst) * 3600;
                 $ban_expire -= $diff;
 
                 if ($ban_expire <= time()) {
-                    message(__('Invalid date message') . ' ' . __('Invalid date reasons'));
+                    throw new \FeatherBB\Error(__('Invalid date message') . ' ' . __('Invalid date reasons'), 400);
                 }
             } else {
                 $ban_expire = 'NULL';
@@ -554,7 +554,7 @@ public function get_user_search()
         $search['query_str'][] = 'user_group='.$user_group;
 
         if (preg_match('%[^0-9]%', $posts_greater.$posts_less)) {
-            message(__('Non numeric message'));
+            throw new \FeatherBB\Error(__('Non numeric message'), 400);
         }
 
         $search['conditions'] = array();
@@ -565,7 +565,7 @@ public function get_user_search()
 
             $last_post_after = strtotime($last_post_after);
             if ($last_post_after === false || $last_post_after == -1) {
-                message(__('Invalid date time message'));
+                throw new \FeatherBB\Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.last_post>'.$last_post_after;
@@ -575,7 +575,7 @@ public function get_user_search()
 
             $last_post_before = strtotime($last_post_before);
             if ($last_post_before === false || $last_post_before == -1) {
-                message(__('Invalid date time message'));
+                throw new \FeatherBB\Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.last_post<'.$last_post_before;
@@ -585,7 +585,7 @@ public function get_user_search()
 
             $last_visit_after = strtotime($last_visit_after);
             if ($last_visit_after === false || $last_visit_after == -1) {
-                message(__('Invalid date time message'));
+                throw new \FeatherBB\Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.last_visit>'.$last_visit_after;
@@ -595,7 +595,7 @@ public function get_user_search()
 
             $last_visit_before = strtotime($last_visit_before);
             if ($last_visit_before === false || $last_visit_before == -1) {
-                message(__('Invalid date time message'));
+                throw new \FeatherBB\Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.last_visit<'.$last_visit_before;
@@ -605,7 +605,7 @@ public function get_user_search()
 
             $registered_after = strtotime($registered_after);
             if ($registered_after === false || $registered_after == -1) {
-                message(__('Invalid date time message'));
+                throw new \FeatherBB\Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.registered>'.$registered_after;
@@ -615,7 +615,7 @@ public function get_user_search()
 
             $registered_before = strtotime($registered_before);
             if ($registered_before === false || $registered_before == -1) {
-                message(__('Invalid date time message'));
+                throw new \FeatherBB\Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.registered<'.$registered_before;
diff --git a/model/delete.php b/model/delete.php
index 8033ab21..4ad61140 100644
--- a/model/delete.php
+++ b/model/delete.php
@@ -22,7 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
     }
- 
+
     public function get_info_delete($id)
     {
         $id = $this->hook->fire('get_info_delete_start', $id);
@@ -46,9 +46,9 @@ public function get_info_delete($id)
         $query = $this->hook->fireDB('get_info_delete_query', $query);
 
         $query = $query->find_one();
-        
+
         if (!$query) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         return $query;
diff --git a/model/moderate.php b/model/moderate.php
index 0adda595..910b7f00 100644
--- a/model/moderate.php
+++ b/model/moderate.php
@@ -40,7 +40,7 @@ public function display_ip_address_post($pid)
         $ip = $ip->find_one_col('poster_ip');
 
         if (!$ip) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         $ip = $this->hook->fire('display_ip_address_post', $ip);
@@ -81,7 +81,7 @@ public function get_topic_info($fid, $tid)
         $cur_topic = $cur_topic->find_one();
 
         if (!$cur_topic) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         return $cur_topic;
@@ -93,12 +93,12 @@ public function delete_posts($tid, $fid, $p = null)
         $posts = $this->hook->fire('delete_posts_start', $posts, $tid, $fid);
 
         if (empty($posts)) {
-            message(__('No posts selected'));
+            throw new \FeatherBB\Error(__('No posts selected'), 404);
         }
 
         if ($this->request->post('delete_posts_comply')) {
             if (@preg_match('%[^0-9,]%', $posts)) {
-                message(__('Bad request'), '404');
+                throw new \FeatherBB\Error(__('Bad request'), 400);
             }
 
             // Verify that the post IDs are valid
@@ -116,7 +116,7 @@ public function delete_posts($tid, $fid, $p = null)
             $result = $result->find_many();
 
             if (count($result) != substr_count($posts, ',') + 1) {
-                message(__('Bad request'), '404');
+                throw new \FeatherBB\Error(__('Bad request'), 400);
             }
 
             // Delete the posts
@@ -168,17 +168,17 @@ public function split_posts($tid, $fid, $p = null)
         $posts = $this->request->post('posts') ? $this->request->post('posts') : array();
         $posts = $this->hook->fire('split_posts_start', $posts, $tid, $fid);
         if (empty($posts)) {
-            message(__('No posts selected'));
+            throw new \FeatherBB\Error(__('No posts selected'), 404);
         }
 
         if ($this->request->post('split_posts_comply')) {
             if (@preg_match('%[^0-9,]%', $posts)) {
-                message(__('Bad request'), '404');
+                throw new \FeatherBB\Error(__('Bad request'), 400);
             }
 
             $move_to_forum = $this->request->post('move_to_forum') ? intval($this->request->post('move_to_forum')) : 0;
             if ($move_to_forum < 1) {
-                message(__('Bad request'), '404');
+                throw new \FeatherBB\Error(__('Bad request'), 400);
             }
 
             // How many posts did we just split off?
@@ -194,7 +194,7 @@ public function split_posts($tid, $fid, $p = null)
             $result = $result->find_many();
 
             if (count($result) != $num_posts_splitted) {
-                message(__('Bad request'), '404');
+                throw new \FeatherBB\Error(__('Bad request'), 400);
             }
 
             unset($result);
@@ -215,16 +215,16 @@ public function split_posts($tid, $fid, $p = null)
             $result = $result->find_one();
 
             if (!$result) {
-                message(__('Bad request'), '404');
+                throw new \FeatherBB\Error(__('Bad request'), 404);
             }
 
             // Check subject
             $new_subject = $this->request->post('new_subject') ? feather_trim($this->request->post('new_subject')) : '';
 
             if ($new_subject == '') {
-                message(__('No subject'));
+                throw new \FeatherBB\Error(__('No subject'), 400);
             } elseif (feather_strlen($new_subject) > 70) {
-                message(__('Too long subject'));
+                throw new \FeatherBB\Error(__('Too long subject'), 400);
             }
 
             // Get data from the new first post
@@ -495,13 +495,13 @@ public function move_topics_to($fid, $tfid = null, $param = null)
         $fid = $this->hook->fire('move_topics_to_start', $fid);
 
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         $topics = explode(',', $this->request->post('topics'));
         $move_to_forum = $this->request->post('move_to_forum') ? intval($this->request->post('move_to_forum')) : 0;
         if (empty($topics) || $move_to_forum < 1) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         // Verify that the topic IDs are valid
@@ -512,7 +512,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
         $result = $result->find_many();
 
         if (count($result) != count($topics)) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
 
@@ -532,7 +532,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
         $authorized = $authorized->find_one();
 
         if (!$authorized) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         // Delete any redirect topics if there are any (only if we moved/copied the topic back to where it was once moved from)
@@ -612,7 +612,7 @@ public function check_move_possible()
         $result = $result->find_many();
 
         if (count($result) < 2) {
-            message(__('Nowhere to move'));
+            throw new \FeatherBB\Error(__('Nowhere to move'), 403);
         }
     }
 
@@ -621,12 +621,12 @@ public function merge_topics($fid)
         $fid = $this->hook->fire('merge_topics_start', $fid);
 
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         $topics = explode(',', $this->request->post('topics'));
         if (count($topics) < 2) {
-            message(__('Not enough topics selected'));
+            throw new \FeatherBB\Error(__('Not enough topics selected'), 400);
         }
 
         // Verify that the topic IDs are valid (redirect links will point to the merged topic after the merge)
@@ -637,7 +637,7 @@ public function merge_topics($fid)
         $result = $result->find_many();
 
         if (count($result) != count($topics)) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         // The topic that we are merging into is the one with the smallest ID
@@ -745,7 +745,7 @@ public function delete_topics($topics, $fid)
         $this->hook->fire('delete_topics');
 
         if (@preg_match('%[^0-9,]%', $topics)) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         $topics_sql = explode(',', $topics);
@@ -758,7 +758,7 @@ public function delete_topics($topics, $fid)
         $result = $result->find_many();
 
         if (count($result) != substr_count($topics, ',') + 1) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 400);
         }
 
         // Verify that the posts are not by admins
@@ -769,7 +769,7 @@ public function delete_topics($topics, $fid)
             $authorized = $this->hook->fireDB('delete_topics_authorized', $authorized);
             $authorized = $authorized->find_many();
             if ($authorized) {
-                message(__('No permission'), '403');
+                throw new \FeatherBB\Error(__('No permission'), 403);
             }
         }
 
@@ -843,7 +843,7 @@ public function get_forum_info($fid)
         $cur_forum = $cur_forum->find_one();
 
         if (!$cur_forum) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         return $cur_forum;
@@ -1044,7 +1044,7 @@ public function get_subject_tid($id)
         $subject = $subject->find_one_col('subject');
 
         if (!$subject) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         return $subject;
diff --git a/model/register.php b/model/register.php
index 072ad320..a9722392 100644
--- a/model/register.php
+++ b/model/register.php
@@ -42,7 +42,7 @@ public function check_for_errors()
         $already_registered = $already_registered->find_one();
 
         if ($already_registered) {
-            message(__('Registration flood'));
+            throw new \FeatherBB\Error(__('Registration flood'), 429);
         }
 
 
@@ -119,7 +119,7 @@ public function check_for_errors()
         if ($this->request->post('language')) {
             $user['language'] = preg_replace('%[\.\\\/]%', '', $this->request->post('language'));
             if (!file_exists(FEATHER_ROOT.'lang/'.$user['language'].'/common.po')) {
-                message(__('Bad request'), '404');
+                throw new \FeatherBB\Error(__('Bad request'), 500);
             }
         } else {
             $user['language'] = $this->config['o_default_lang'];
@@ -263,7 +263,7 @@ public function insert_user($user)
 
             $this->email->feather_mail($user['email1'], $mail_subject, $mail_message);
 
-            message(__('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.', true);
+            redirect($this->feather->url->base(),__('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
         }
 
         $this->auth->feather_setcookie($new_uid, $password_hash, time() + $this->config['o_timeout_visit']);
diff --git a/model/search.php b/model/search.php
index b454cb25..a3170ca3 100644
--- a/model/search.php
+++ b/model/search.php
@@ -47,7 +47,7 @@ public function get_search_results()
         if ($this->request->get('search_id')) {
             $search_id = intval($this->request->get('search_id'));
             if ($search_id < 1) {
-                message(__('Bad request'), '404');
+                throw new \FeatherBB\Error(__('Bad request'), 400);
             }
         }
         // If it's a regular search (keywords and/or author)
@@ -64,7 +64,7 @@ public function get_search_results()
             }
 
             if (!$keywords && !$author) {
-                message(__('No terms'));
+                throw new \FeatherBB\Error(__('No terms'), 400);
             }
 
             if ($author) {
@@ -79,21 +79,21 @@ public function get_search_results()
         elseif ($action == 'show_user_posts' || $action == 'show_user_topics' || $action == 'show_subscriptions') {
             $user_id = ($this->request->get('user_id')) ? intval($this->request->get('user_id')) : $this->user->id;
             if ($user_id < 2) {
-                message(__('Bad request'), '404');
+                throw new \FeatherBB\Error(__('Bad request'), 404);
             }
 
             // Subscribed topics can only be viewed by admins, moderators and the users themselves
             if ($action == 'show_subscriptions' && !$this->user->is_admmod && $user_id != $this->user->id) {
-                message(__('No permission'), '403');
+                throw new \FeatherBB\Error(__('No permission'), 403);
             }
         } elseif ($action == 'show_recent') {
             $interval = $this->request->get('value') ? intval($this->request->get('value')) : 86400;
         } elseif ($action == 'show_replies') {
             if ($this->user->is_guest) {
-                message(__('Bad request'), '404');
+                throw new \FeatherBB\Error(__('Bad request'), 404);
             }
         } elseif ($action != 'show_new' && $action != 'show_unanswered') {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
 
@@ -120,7 +120,7 @@ public function get_search_results()
 
                 unset($temp);
             } else {
-                message(__('No hits'));
+                throw new \FeatherBB\Error(__('No hits'), 204);
             }
         } else {
             $keyword_results = $author_results = array();
@@ -131,7 +131,7 @@ public function get_search_results()
             if (!empty($author) || !empty($keywords)) {
                 // Flood protection
                 if ($this->user->last_search && (time() - $this->user->last_search) < $this->user->g_search_flood && (time() - $this->user->last_search) >= 0) {
-                    message(sprintf(__('Search flood'), $this->user->g_search_flood, $this->user->g_search_flood - (time() - $this->user->last_search)));
+                    throw new \FeatherBB\Error(sprintf(__('Search flood'), $this->user->g_search_flood, $this->user->g_search_flood - (time() - $this->user->last_search)), 429);
                 }
 
                 if (!$this->user->is_guest) {
@@ -180,7 +180,7 @@ public function get_search_results()
                     $keywords_array = $this->hook->fire('get_search_results_keywords_array', $keywords_array);
 
                     if (empty($keywords_array)) {
-                        message(__('No hits'));
+                        throw new \FeatherBB\Error(__('No hits'), 400);
                     }
 
                     // Should we search in message body or topic subject specifically?
@@ -317,7 +317,7 @@ public function get_search_results()
 
                 $num_hits = count($search_ids);
                 if (!$num_hits) {
-                    message(__('No hits'));
+                    throw new \FeatherBB\Error(__('No hits'), 204);
                 }
             } elseif ($action == 'show_new' || $action == 'show_recent' || $action == 'show_replies' || $action == 'show_user_posts' || $action == 'show_user_topics' || $action == 'show_subscriptions' || $action == 'show_unanswered') {
                 $search_type = array('action', $action);
@@ -334,7 +334,7 @@ public function get_search_results()
                 // If it's a search for new posts since last visit
                 if ($action == 'show_new') {
                     if ($this->user->is_guest) {
-                        message(__('No permission'), '403');
+                        throw new \FeatherBB\Error(__('No permission'), 403);
                     }
 
                     $result = DB::for_table('topics')
@@ -358,7 +358,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message(__('No new posts'));
+                        throw new \FeatherBB\Error(__('No new posts'), 204);
                     }
                 }
                 // If it's a search for recent posts (in a certain time interval)
@@ -383,7 +383,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message(__('No recent posts'));
+                        throw new \FeatherBB\Error(__('No recent posts'), 204);
                     }
                 }
                 // If it's a search for topics in which the user has posted
@@ -408,7 +408,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message(__('No user posts'));
+                        throw new \FeatherBB\Error(__('No user posts'), 204);
                     }
                 }
                 // If it's a search for posts by a specific user ID
@@ -431,7 +431,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message(__('No user posts'));
+                        throw new \FeatherBB\Error(__('No user posts'), 404);
                     }
 
                     // Pass on the user ID so that we can later know whose posts we're searching for
@@ -455,7 +455,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message(__('No user topics'));
+                        throw new \FeatherBB\Error(__('No user topics'), 404);
                     }
 
                     // Pass on the user ID so that we can later know whose topics we're searching for
@@ -464,7 +464,7 @@ public function get_search_results()
                 // If it's a search for subscribed topics
                 elseif ($action == 'show_subscriptions') {
                     if ($this->user->is_guest) {
-                        message(__('Bad request'), '404');
+                        throw new \FeatherBB\Error(__('Bad request'), 404);
                     }
 
                     $result = DB::for_table('topics')
@@ -483,7 +483,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message(__('No subscriptions'));
+                        throw new \FeatherBB\Error(__('No subscriptions'), 404);
                     }
 
                     // Pass on user ID so that we can later know whose subscriptions we're searching for
@@ -507,7 +507,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        message(__('No unanswered'));
+                        throw new \FeatherBB\Error(__('No unanswered'), 404);
                     }
                 }
 
@@ -519,7 +519,7 @@ public function get_search_results()
                 $pdo = DB::get_db();
                 $pdo = null;
             } else {
-                message(__('Bad request'), '404');
+                throw new \FeatherBB\Error(__('Bad request'), 404);
             }
 
 
@@ -655,7 +655,7 @@ public function get_search_results()
                     $subscriber_name = $subscriber_name->find_one_col('username');
 
                     if (!$subscriber_name) {
-                        message(__('Bad request'), '404');
+                        throw new \FeatherBB\Error(__('Bad request'), 404);
                     }
 
                     $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), feather_escape($subscriber_name)).'</a>';
diff --git a/model/viewtopic.php b/model/viewtopic.php
index 30a900b5..3d8f7e71 100644
--- a/model/viewtopic.php
+++ b/model/viewtopic.php
@@ -37,7 +37,7 @@ public function redirect_to_post($post_id)
         $result = $result->find_one();
 
         if (!$result) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         $post['topic_id'] = $result['topic_id'];
@@ -145,7 +145,7 @@ public function get_info_topic($id)
         $cur_topic = $cur_topic->find_one();
 
         if (!$cur_topic) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         $cur_topic = $this->hook->fire('get_info_topic', $cur_topic);
@@ -246,7 +246,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
         }
 
         if (empty($post_ids)) {
-            message('The post table and topic table seem to be out of sync!');
+            throw new \FeatherBB\Error('The post table and topic table seem to be out of sync!', 500);
         }
 
         // Retrieve the posts (and their respective poster/online status)

From 8e364655144d56f091e76eac882d8110653a6cfa Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 30 Aug 2015 01:28:19 +0200
Subject: [PATCH 268/353] New notification types and redirect function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Allowed notification types : info, warning, error, success.
Set flash message to array(_type_, _message_) or just message string to
use default « info » style.
Use $feather->url->redirect to replace functions.php
---
 controller/admin/plugins.php        |   4 +-
 include/classes/url.class.php       | 171 +++++++++++++++-------------
 style/FeatherBB.css                 |  43 +++++--
 style/FeatherBB/view/header.new.php |  12 +-
 style/FeatherBB/view/header.php     |  33 +++---
 5 files changed, 150 insertions(+), 113 deletions(-)

diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index 24e31ea6..435521d2 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -70,7 +70,7 @@ public function activate()
             redirect($this->feather->url->get('admin/plugins/'), $this->feather->utils->escape($e->getMessage()));
         }
         // Plugin has been activated, confirm and redirect
-        redirect($this->feather->url->get('admin/plugins/'), 'Plugin "'.$this->feather->utils->escape($class::$name).'" activated!');
+        $this->feather->url->redirect($this->feather->url->get('admin/plugins/'), 'Plugin "'.$class::$name.'" activated!');
     }
 
     public function deactivate()
@@ -88,7 +88,7 @@ public function deactivate()
             redirect($this->feather->url->get('admin/plugins/'), $this->feather->utils->escape($e->getMessage()));
         }
         // Plugin has been activated, confirm and redirect
-        redirect($this->feather->url->get('admin/plugins/'), 'Plugin "'.$this->feather->utils->escape($class::$name).'" deactivated!');
+        $this->feather->url->redirect($this->feather->url->get('admin/plugins/'), array('warning', 'Plugin "'.$class::$name.'" deactivated!'));
     }
 
     public function display()
diff --git a/include/classes/url.class.php b/include/classes/url.class.php
index 6b70dd86..eb060970 100644
--- a/include/classes/url.class.php
+++ b/include/classes/url.class.php
@@ -12,27 +12,27 @@
 class Url
 {
     protected $url_replace = array(
-                                    '�' => 'A',
-                                    '�' => 'A',
-                                    '�' => 'A',
-                                    '�' => 'A',
-                                    '�' => 'Ae',
-                                    '�' => 'A',
-                                    '�' => 'A',
+                                    'À' => 'A',
+                                    'Á' => 'A',
+                                    'Â' => 'A',
+                                    'Ã' => 'A',
+                                    'Ä' => 'Ae',
+                                    'Å' => 'A',
+                                    'Æ' => 'A',
                                     '?' => 'A',
                                     '?' => 'A',
                                     '?' => 'A',
-                                    '�' => 'C',
+                                    'Ç' => 'C',
                                     '?' => 'C',
                                     '?' => 'C',
                                     '?' => 'C',
                                     '?' => 'C',
                                     '?' => 'D',
                                     '?' => 'D',
-                                    '�' => 'E',
-                                    '�' => 'E',
-                                    '�' => 'E',
-                                    '�' => 'E',
+                                    'È' => 'E',
+                                    'É' => 'E',
+                                    'Ê' => 'E',
+                                    'Ë' => 'E',
                                     '?' => 'E',
                                     '?' => 'E',
                                     '?' => 'E',
@@ -44,10 +44,10 @@ class Url
                                     '?' => 'G',
                                     '?' => 'H',
                                     '?' => 'H',
-                                    '�' => 'I',
-                                    '�' => 'I',
-                                    '�' => 'I',
-                                    '�' => 'I',
+                                    'Ì' => 'I',
+                                    'Í' => 'I',
+                                    'Î' => 'I',
+                                    'Ï' => 'I',
                                     '?' => 'I',
                                     '?' => 'I',
                                     '?' => 'I',
@@ -61,21 +61,21 @@ class Url
                                     '?' => 'K',
                                     '?' => 'K',
                                     '?' => 'L',
-                                    '�' => 'N',
+                                    'Ñ' => 'N',
                                     '?' => 'N',
                                     '?' => 'N',
                                     '?' => 'N',
                                     '?' => 'N',
-                                    '�' => 'O',
-                                    '�' => 'O',
-                                    '�' => 'O',
-                                    '�' => 'O',
-                                    '�' => 'Oe',
-                                    '�' => 'O',
+                                    'Ò' => 'O',
+                                    'Ó' => 'O',
+                                    'Ô' => 'O',
+                                    'Õ' => 'O',
+                                    'Ö' => 'Oe',
+                                    'Ø' => 'O',
                                     '?' => 'O',
                                     '?' => 'O',
                                     '?' => 'O',
-                                    '�' => 'OE',
+                                    'Œ' => 'OE',
                                     '?' => 'R',
                                     '?' => 'R',
                                     '?' => 'R',
@@ -83,15 +83,15 @@ class Url
                                     '?' => 'S',
                                     '?' => 'S',
                                     '?' => 'S',
-                                    '�' => 'S',
+                                    'Š' => 'S',
                                     '?' => 'T',
                                     '?' => 'T',
                                     '?' => 'T',
                                     '?' => 'T',
-                                    '�' => 'U',
-                                    '�' => 'U',
-                                    '�' => 'U',
-                                    '�' => 'Ue',
+                                    'Ù' => 'U',
+                                    'Ú' => 'U',
+                                    'Û' => 'U',
+                                    'Ü' => 'Ue',
                                     '?' => 'U',
                                     '?' => 'U',
                                     '?' => 'U',
@@ -100,48 +100,48 @@ class Url
                                     '?' => 'U',
                                     '?' => 'W',
                                     '?' => 'Y',
-                                    '�' => 'Y',
-                                    '�' => 'Y',
+                                    'Ÿ' => 'Y',
+                                    'Ý' => 'Y',
                                     '?' => 'Z',
                                     '?' => 'Z',
-                                    '�' => 'Z',
-                                    '�' => 'a',
-                                    '�' => 'a',
-                                    '�' => 'a',
-                                    '�' => 'a',
-                                    '�' => 'ae',
+                                    'Ž' => 'Z',
+                                    'à' => 'a',
+                                    'á' => 'a',
+                                    'â' => 'a',
+                                    'ã' => 'a',
+                                    'ä' => 'ae',
                                     '?' => 'a',
                                     '?' => 'a',
                                     '?' => 'a',
-                                    '�' => 'a',
-                                    '�' => 'ae',
-                                    '�' => 'c',
+                                    'å' => 'a',
+                                    'æ' => 'ae',
+                                    'ç' => 'c',
                                     '?' => 'c',
                                     '?' => 'c',
                                     '?' => 'c',
                                     '?' => 'c',
                                     '?' => 'd',
                                     '?' => 'd',
-                                    '�' => 'e',
-                                    '�' => 'e',
-                                    '�' => 'e',
-                                    '�' => 'e',
+                                    'è' => 'e',
+                                    'é' => 'e',
+                                    'ê' => 'e',
+                                    'ë' => 'e',
                                     '?' => 'e',
                                     '?' => 'e',
                                     '?' => 'e',
                                     '?' => 'e',
                                     '?' => 'e',
-                                    '�' => 'f',
+                                    'ƒ' => 'f',
                                     '?' => 'g',
                                     '?' => 'g',
                                     '?' => 'g',
                                     '?' => 'g',
                                     '?' => 'h',
                                     '?' => 'h',
-                                    '�' => 'i',
-                                    '�' => 'i',
-                                    '�' => 'i',
-                                    '�' => 'i',
+                                    'ì' => 'i',
+                                    'í' => 'i',
+                                    'î' => 'i',
+                                    'ï' => 'i',
                                     '?' => 'i',
                                     '?' => 'i',
                                     '?' => 'i',
@@ -156,32 +156,32 @@ class Url
                                     '?' => 'l',
                                     '?' => 'l',
                                     '?' => 'l',
-                                    '�' => 'n',
+                                    'ñ' => 'n',
                                     '?' => 'n',
                                     '?' => 'n',
                                     '?' => 'n',
                                     '?' => 'n',
                                     '?' => 'n',
-                                    '�' => 'o',
-                                    '�' => 'o',
-                                    '�' => 'o',
-                                    '�' => 'o',
-                                    '�' => 'oe',
-                                    '�' => 'o',
+                                    'ò' => 'o',
+                                    'ó' => 'o',
+                                    'ô' => 'o',
+                                    'õ' => 'o',
+                                    'ö' => 'oe',
+                                    'ø' => 'o',
                                     '?' => 'o',
                                     '?' => 'o',
                                     '?' => 'o',
-                                    '�' => 'oe',
+                                    'œ' => 'oe',
                                     '?' => 'r',
                                     '?' => 'r',
                                     '?' => 'r',
                                     '?' => 's',
-                                    '�' => 's',
+                                    'š' => 's',
                                     '?' => 't',
-                                    '�' => 'u',
-                                    '�' => 'u',
-                                    '�' => 'u',
-                                    '�' => 'ue',
+                                    'ù' => 'u',
+                                    'ú' => 'u',
+                                    'û' => 'u',
+                                    'ü' => 'ue',
                                     '?' => 'u',
                                     '?' => 'u',
                                     '?' => 'u',
@@ -189,13 +189,13 @@ class Url
                                     '?' => 'u',
                                     '?' => 'u',
                                     '?' => 'w',
-                                    '�' => 'y',
-                                    '�' => 'y',
+                                    'ÿ' => 'y',
+                                    'ý' => 'y',
                                     '?' => 'y',
                                     '?' => 'z',
                                     '?' => 'z',
-                                    '�' => 'z',
-                                    '�' => 'ss',
+                                    'ž' => 'z',
+                                    'ß' => 'ss',
                                     '?' => 'ss',
                                     '?' => 'A',
                                     '?' => 'A',
@@ -483,7 +483,7 @@ class Url
                                     '?' => 'o',
                                     '?' => 'o',
                                     '?' => 'o',
-                                    '�' => '',
+                                    '¨' => '',
                                     '?' => '',
                                     '?' => '',
                                     '?' => '',
@@ -567,26 +567,22 @@ class Url
                                     '?' => '',
                                     '?' => '',
                                     '?' => '',
-
                                     '?' => 'YE',
                                     '?' => 'YE',
                                     '?' => 'YI',
                                     '?' => 'YI',
                                     '?' => 'KG',
                                     '?' => 'KG',
-
-                                    '�' => 'd',
-                                    '�' => 'D',
-                                    '�' => 'th',
-                                    '�' => 'TH',
-
+                                    'ð' => 'd',
+                                    'Ð' => 'D',
+                                    'þ' => 'th',
+                                    'Þ' => 'TH',
                                     '&'    =>    '-',
                                     '/'    =>    '-',
                                     '('    =>    '-',
                                     '"'    =>    '-',
                                     "'"    =>    '-',
-
-                                );
+                            );
 
     public function __construct()
     {
@@ -815,15 +811,13 @@ public function base($support_https = false)
     {
         static $base_url;
 
-        $feather = \Slim\Slim::getInstance();
-
         if (!$support_https) {
-            return $feather->config['o_base_url'];
+            return $this->feather->config['o_base_url'];
         }
 
         if (!isset($base_url)) {
             // Make sure we are using the correct protocol
-            $base_url = str_replace(array('http://', 'https://'), $this->protocol().'://', $feather->config['o_base_url']);
+            $base_url = str_replace(array('http://', 'https://'), $this->protocol().'://', $this->feather->config['o_base_url']);
         }
 
         return $base_url;
@@ -949,4 +943,19 @@ public function is_valid($url)
         }
         return $m; // return TRUE == array of useful named $matches plus the valid $url.
     }
-}
\ No newline at end of file
+
+
+    //
+    // Display $message and redirect user to $destination_url
+    //
+    public function redirect($destination_url, $message = null, $status = 302)
+    {
+        // Set default type to info if not provided
+        if (!is_array($message))
+            $message = array('info', $message);
+        // Add a flash message
+        $this->feather->flash($message[0], $message[1]);
+
+        $this->feather->redirect($destination_url);
+    }
+}
diff --git a/style/FeatherBB.css b/style/FeatherBB.css
index 84a75715..89fc161c 100644
--- a/style/FeatherBB.css
+++ b/style/FeatherBB.css
@@ -1268,6 +1268,7 @@ footer .footer-link a {
     color: #a94442 !important
 }
 
+
 .flashmsg {
     position: fixed;
     min-width: 220px;
@@ -1281,11 +1282,6 @@ footer .footer-link a {
     pointer-events: none;
     box-shadow: 0 3px 6px rgba(0,0,0,0.25);
     border: 1px solid #bbb;
-    color: #147880;
-    background: #d2ecea;
-    background: -webkit-linear-gradient(top, #d2ecea, #b3e1e4);
-    background:    -moz-linear-gradient(top, #d2ecea, #b3e1e4);
-    background:         linear-gradient(top, #d2ecea, #b3e1e4);
     -webkit-transform: translateY(-100%);
        -moz-transform: translateY(-100%);
         -ms-transform: translateY(-100%);
@@ -1297,6 +1293,38 @@ footer .footer-link a {
          -o-transition: all 0.75s ease-out;
             transition: all 0.75s ease-out;
 }
+.flashmsg h2 {
+    margin: 0 0 4px;
+    font-size: 18px
+}
+.flashmsg.error {
+    background: #ebccd1;
+    background: -webkit-linear-gradient(top, #f2dede, #ebccd1);
+    background:    -moz-linear-gradient(top, #f2dede, #ebccd1);
+    background:         linear-gradient(top, #f2dede, #ebccd1);
+    color: #a94442 !important
+}
+.flashmsg.info {
+    background: #b3e1e4;
+    background: -webkit-linear-gradient(top, #d2ecea, #b3e1e4);
+    background:    -moz-linear-gradient(top, #d2ecea, #b3e1e4);
+    background:         linear-gradient(top, #d2ecea, #b3e1e4);
+    color: #147880 !important;
+}
+.flashmsg.warning {
+    background: #edc58c;
+    background: -webkit-linear-gradient(top, #e8d1af, #edc58c);
+    background:    -moz-linear-gradient(top, #f0ad4e, #f0ad4e);
+    background:         linear-gradient(top, #f0ad4e, #f0ad4e);
+    color: #8c5a13 !important;
+}
+.flashmsg.success {
+    background: #a1e9a1;
+    background: -webkit-linear-gradient(top, #cde9cd, #a1e9a1);
+    background:    -moz-linear-gradient(top, #cde9cd, #a1e9a1);
+    background:         linear-gradient(top, #cde9cd, #a1e9a1);
+    color: #2c752c !important;
+}
 .flashmsg.show {
     opacity: 1;
     pointer-events: auto;
@@ -1306,10 +1334,7 @@ footer .footer-link a {
          -o-transform: translateY(0%);
             transform: translateY(0%);
 }
-.flashmsg h2 {
-    margin: 0 0 4px;
-    font-size: 18px
-}
+
 input[type=submit] {
     border-radius: 3px;
     border: 2px solid #00acc1;
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index 932a094f..0db548fd 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -207,21 +207,23 @@ function process_form(the_form)
             </div>
         </div>
     <?php endif; ?>
-        <?php if (isset($flash['info'])) : ?>
+        <?php if (!empty($flash->getMessages())) : ?>
         <script type="text/javascript">
             window.onload = function() {
                 var flashMessage = document.getElementById('flashmsg');
-                flashMessage.className = 'flashmsg show';
+                flashMessage.className = 'flashmsg '+flashMessage.getAttribute('data-type')+' show';
                 setTimeout(function () {
-                    flashMessage.className = 'flashmsg';
+                    flashMessage.className = 'flashmsg '+flashMessage.getAttribute('data-type');
                 }, 10000);
                 return false;
             }
         </script>
-        <div class="flashmsg" id="flashmsg">
+        <?php foreach ($flash->getMessages() as $type => $message) { ?>
+        <div class="flashmsg info" data-type="<?= $type; ?>" id="flashmsg">
             <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
-            <p><?= $feather->utils->escape($flash['info']) ?></p>
+            <p><?= $feather->utils->escape($message) ?></p>
         </div>
+        <?php } ?>
         <?php endif; ?>
     </div>
 </header>
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
index 2f11da78..b4dfdbdd 100644
--- a/style/FeatherBB/view/header.php
+++ b/style/FeatherBB/view/header.php
@@ -111,22 +111,23 @@ function process_form(the_form)
                 </div>
             </div>
         <?php endif; ?>
-        <?php if (isset($flash['message'])) : ?>
-            <script type="text/javascript" src="<?=$feather->url->base();?>/js/common.js"></script>
-            <script type="text/javascript">
-                window.onload = function() {
-                    var flashMessage = document.getElementById('flashmsg');
-                    flashMessage.className = 'flashmsg show';
-                    setTimeout(function () {
-                        flashMessage.className = 'flashmsg';
-                    }, 10000);
-                    return false;
-                }
-            </script>
-            <div class="flashmsg" id="flashmsg">
-                <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
-                <p><?= $feather->utils->escape($flash['message']) ?></p>
-            </div>
+        <?php if (!empty($flash->getMessages())) : ?>
+        <script type="text/javascript">
+            window.onload = function() {
+                var flashMessage = document.getElementById('flashmsg');
+                flashMessage.className = 'flashmsg '+flashMessage.getAttribute('data-type')+' show';
+                setTimeout(function () {
+                    flashMessage.className = 'flashmsg '+flashMessage.getAttribute('data-type');
+                }, 10000);
+                return false;
+            }
+        </script>
+        <?php foreach ($flash->getMessages() as $type => $message) { ?>
+        <div class="flashmsg info" data-type="<?= $type; ?>" id="flashmsg">
+            <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
+            <p><?= $feather->utils->escape($message) ?></p>
+        </div>
+        <?php } ?>
         <?php endif; ?>
     </div>
 

From 8329ce4da3a15bc20510cba8c4058b129dfe3829 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sun, 30 Aug 2015 12:02:58 +0200
Subject: [PATCH 269/353] Various tweaks, get rid of old code

---
 controller/login.php          |  3 +--
 controller/register.php       |  2 --
 controller/search.php         |  8 +++----
 include/classes/url.class.php | 43 ++++------------------------------
 include/functions.php         | 44 -----------------------------------
 index.php                     |  2 +-
 model/login.php               |  4 ++--
 model/register.php            |  5 +---
 8 files changed, 13 insertions(+), 98 deletions(-)

diff --git a/controller/login.php b/controller/login.php
index 4ab68868..32709227 100644
--- a/controller/login.php
+++ b/controller/login.php
@@ -32,8 +32,7 @@ public function __autoload($class_name)
     public function display()
     {
         if (!$this->user->is_guest) {
-            header('Location: '.$this->feather->url->base());
-            exit;
+            $this->feather->url->redirect($this->feather->url->get('/'), 'Already logged in');
         }
 
         // TODO?: Try to determine if the data in HTTP_REFERER is valid (if not, we redirect to index.php after login)
diff --git a/controller/register.php b/controller/register.php
index 0c35663c..08d2646c 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -18,8 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-
-
         $this->model = new \model\register();
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
diff --git a/controller/search.php b/controller/search.php
index 02e02f04..afa8d659 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -34,15 +34,15 @@ public function display()
         global $pd;
 
         if ($this->user->g_read_board == '0') {
-            message(__('No view'), '403');
+            throw new \FeatherBB\Error(__('No view'), 403);
         } elseif ($this->user->g_search == '0') {
-            message(__('No search permission'), false, '403 Forbidden');
+            throw new \FeatherBB\Error(__('No search permission'), 403);
         }
 
         // Figure out what to do :-)
         if ($this->request->get('action') || ($this->request->get('search_id'))) {
-            $search = $this->model->get_search_results();
 
+            $search = $this->model->get_search_results();
                 // We have results to display
                 if (isset($search['is_result'])) {
 
@@ -73,7 +73,7 @@ public function display()
                     $this->feather->view2->addTemplate('search/footer.php', 10)->display();
 
                 } else {
-                    message(__('No hits'));
+                    redirect($this->feather->url->get('search/'), __('No hits'));
                 }
         }
         // Display the form
diff --git a/include/classes/url.class.php b/include/classes/url.class.php
index eb060970..ae7a5730 100644
--- a/include/classes/url.class.php
+++ b/include/classes/url.class.php
@@ -729,11 +729,7 @@ public function url_friendly($str)
     //
     public function get($link, $args = null)
     {
-        if (function_exists('apache_get_modules') && in_array('mod_rewrite', apache_get_modules())) { // If we have Apache's mod_rewrite enabled
-            $base_url = $this->base();
-        } else {
-            $base_url = $this->base().'/index.php';
-        }
+        $base_url = $this->base();
 
         $gen_link = $link;
         if ($args == null) {
@@ -781,46 +777,15 @@ private function get_sublink($link, $sublink, $subarg, $args = null)
     //
     public function protocol()
     {
-        $protocol = 'http';
-
-        // Check if the server is claiming to using HTTPS
-        if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') {
-            $protocol = 'https';
-        }
-
-        // If we are behind a reverse proxy try to decide which protocol it is using
-        if (defined('FORUM_BEHIND_REVERSE_PROXY')) {
-            // Check if we are behind a Microsoft based reverse proxy
-            if (!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) != 'off') {
-                $protocol = 'https';
-            }
-
-            // Check if we're behind a "proper" reverse proxy, and what protocol it's using
-            if (!empty($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
-                $protocol = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']);
-            }
-        }
-
-        return $protocol;
+        return $this->feather->request->getScheme();
     }
 
     //
     // Fetch the base_url, optionally support HTTPS and HTTP
     //
-    public function base($support_https = false)
+    public function base()
     {
-        static $base_url;
-
-        if (!$support_https) {
-            return $this->feather->config['o_base_url'];
-        }
-
-        if (!isset($base_url)) {
-            // Make sure we are using the correct protocol
-            $base_url = str_replace(array('http://', 'https://'), $this->protocol().'://', $this->feather->config['o_base_url']);
-        }
-
-        return $base_url;
+        return $this->feather->request->getScriptName();
     }
 
     //
diff --git a/include/functions.php b/include/functions.php
index f0356c81..67d20f94 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -475,50 +475,6 @@ function random_key($len, $readable = false, $hash = false)
     return $key;
 }
 
-
-//
-// Validate the given redirect URL, use the fallback otherwise
-//
-function validate_redirect($redirect_url, $fallback_url)
-{
-    $referrer = parse_url(strtolower($redirect_url));
-    $feather = \Slim\Slim::getInstance();
-
-    // Make sure the host component exists
-    if (!isset($referrer['host'])) {
-        $referrer['host'] = '';
-    }
-
-    // Remove www subdomain if it exists
-    if (strpos($referrer['host'], 'www.') === 0) {
-        $referrer['host'] = substr($referrer['host'], 4);
-    }
-
-    // Make sure the path component exists
-    if (!isset($referrer['path'])) {
-        $referrer['path'] = '';
-    }
-
-    $valid = parse_url(strtolower($feather->url->base()));
-
-    // Remove www subdomain if it exists
-    if (strpos($valid['host'], 'www.') === 0) {
-        $valid['host'] = substr($valid['host'], 4);
-    }
-
-    // Make sure the path component exists
-    if (!isset($valid['path'])) {
-        $valid['path'] = '';
-    }
-
-    if ($referrer['host'] == $valid['host'] && preg_match('%^'.preg_quote($valid['path'], '%').'/(.*?)\.php%i', $referrer['path'])) {
-        return $redirect_url;
-    } else {
-        return $fallback_url;
-    }
-}
-
-
 //
 // Generate a random password of length $len
 // Compatibility wrapper for random_key
diff --git a/index.php b/index.php
index f5ca8608..15b38fb4 100644
--- a/index.php
+++ b/index.php
@@ -30,7 +30,7 @@
 
 $feather_settings = array('config_file' => 'include/config.php',
                           'cache_dir' => 'cache/',
-                          'debug' => false); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
+                          'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
 $feather->add(new \FeatherBB\Auth());
 $feather->add(new \FeatherBB\Core($feather_settings));
 
diff --git a/model/login.php b/model/login.php
index 33020f13..e236cf55 100644
--- a/model/login.php
+++ b/model/login.php
@@ -81,7 +81,7 @@ public function login()
         set_tracked_topics(null);
 
         // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after login)
-        $redirect_url = validate_redirect($this->request->post('redirect_url'), $this->feather->url->base());
+        $redirect_url = $this->request->post('redirect_url');
         $redirect_url = $this->hook->fire('redirect_url_login', $redirect_url);
 
         redirect($this->feather->utils->escape($redirect_url), __('Login redirect'));
@@ -210,7 +210,7 @@ public function get_redirect_url()
         $this->hook->fire('get_redirect_url_start');
 
         if (!empty($this->request->getReferrer())) {
-            $redirect_url = validate_redirect($this->request->getReferrer(), null);
+            $redirect_url = $this->request->getReferrer();
         }
 
         if (!isset($redirect_url)) {
diff --git a/model/register.php b/model/register.php
index 01e0964a..dbd579fc 100644
--- a/model/register.php
+++ b/model/register.php
@@ -263,11 +263,8 @@ public function insert_user($user)
 
             $this->email->feather_mail($user['email1'], $mail_subject, $mail_message);
 
-<<<<<<< HEAD
             redirect($this->feather->url->base(),__('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
-=======
-            message(__('Reg email').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.', true);
->>>>>>> origin/development
+
         }
 
         $this->auth->feather_setcookie($new_uid, $password_hash, time() + $this->config['o_timeout_visit']);

From 86954043b0c55e515d6360b86897dff5877fdafb Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sun, 30 Aug 2015 12:46:20 +0200
Subject: [PATCH 270/353] Start to rewrite login controller

---
 controller/auth.php                 | 107 ++++++++++++++++++++++++++++
 controller/login.php                |   3 -
 include/routes.php                  |  18 +++--
 model/auth.php                      |  54 +++++++++++---
 style/FeatherBB/view/header.new.php |   4 +-
 style/FeatherBB/view/login/form.php |   7 +-
 6 files changed, 170 insertions(+), 23 deletions(-)
 create mode 100644 controller/auth.php

diff --git a/controller/auth.php b/controller/auth.php
new file mode 100644
index 00000000..3a3f7589
--- /dev/null
+++ b/controller/auth.php
@@ -0,0 +1,107 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace controller;
+use DB;
+class auth
+{
+    public function __construct()
+    {
+        $this->feather = \Slim\Slim::getInstance();
+        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->feather->user->language.'/login.mo');
+    }
+
+    public function login()
+    {
+        if (!$this->feather->user->is_guest) {
+            $this->feather->url->redirect($this->feather->url->get('/'), 'Already logged in');
+        }
+
+        if ($this->feather->request->isPost()) {
+            $this->feather->hooks->fire('login_start');
+            $form_username = $this->feather->utils->trim($this->feather->request->post('req_username'));
+            $form_password = $this->feather->utils->trim($this->feather->request->post('req_password'));
+            $save_pass = (bool) $this->feather->request->post('save_pass');
+
+            $user = \model\auth::get_user_from_name($form_username);
+
+            if (!empty($user->password)) {
+                $form_password_hash = feather_hash($form_password); // Will result in a SHA-1 hash
+                if ($user->password == $form_password_hash) {
+                    if ($user->group_id == FEATHER_UNVERIFIED) {
+                        \model\auth::update_group($user->id, $this->feather->forum_settings['o_default_user_group']);
+                        if (!$this->feather->cache->isCached('users_info')) {
+                            $this->feather->cache->store('users_info', \model\cache::get_users_info());
+                        }
+                    }
+
+                    \model\auth::delete_online_by_ip($this->feather->request->getIp());
+                    // Reset tracked topics
+                    set_tracked_topics(null);
+
+                    $expire = ($save_pass) ? $this->feather->now + 1209600 : $this->feather->now + $this->feather->forum_settings['o_timeout_visit'];
+                    $expire = $this->feather->hooks->fire('expire_login', $expire);
+                    \model\auth::feather_setcookie($user->id, $form_password_hash, $expire);
+
+                    $this->feather->url->redirect($this->feather->url->base(), __('Login redirect'));
+                }
+            } else {
+                throw new \FeatherBB\Error(__('Wrong user/pass').' <a href="'.$this->feather->url->get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
+            }
+        } else {
+            $this->feather->view2->setPageInfo(array(
+                                'active_page' => 'login',
+                                'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Login')),
+                                'required_fields' => array('req_username' => __('Username'), 'req_password' => __('Password')),
+                                'focus_element' => array('login', 'req_username'),
+                                )
+                        )->addTemplate('login/form.php')->display();
+        }
+    }
+
+    public function logout($token)
+    {
+        $token = $this->feather->hooks->fire('logout_start', $token);
+
+        if ($this->feather->user->is_guest || !isset($token) || $token != feather_hash($this->feather->user->id.feather_hash($this->feather->request->getIp()))) {
+            $this->feather->url->redirect($this->feather->url->get('/'), 'Not logged in');
+        }
+
+        \model\auth::delete_online_by_id($this->feather->user->id);
+
+        // Update last_visit (make sure there's something to update it with)
+        if (isset($this->feather->user->logged)) {
+            $update_last_visit = DB::for_table('users')->where('id', $this->feather->user->id)
+                ->find_one()
+                ->set('last_visit', $this->feather->user->logged);
+            $update_last_visit = $this->feather->hooks->fireDB('update_online_logout', $update_last_visit);
+            $update_last_visit = $update_last_visit->save();
+        }
+
+        \model\auth::feather_setcookie(1, feather_hash(uniqid(rand(), true)), time() + 31536000);
+        $this->feather->hooks->fire('logout_end');
+        redirect($this->feather->url->base(), __('Logout redirect'));
+    }
+
+    public function forget()
+    {
+        if (!$this->feather->user->is_guest) {
+            $this->feather->url->redirect($this->feather->url->get('/'), 'Already logged in');
+        }
+
+        $this->feather->view2->setPageInfo(array(
+//                'errors'    =>    $this->model->password_forgotten(),
+                'active_page' => 'login',
+                'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Request pass')),
+                'required_fields' => array('req_email' => __('Email')),
+                'focus_element' => array('request_pass', 'req_email'),
+            )
+        )->addTemplate('login/password_forgotten.php')->display();
+    }
+}
diff --git a/controller/login.php b/controller/login.php
index 32709227..bd41c6a1 100644
--- a/controller/login.php
+++ b/controller/login.php
@@ -35,9 +35,6 @@ public function display()
             $this->feather->url->redirect($this->feather->url->get('/'), 'Already logged in');
         }
 
-        // TODO?: Try to determine if the data in HTTP_REFERER is valid (if not, we redirect to index.php after login)
-        $redirect_url = $this->model->get_redirect_url();
-
         $this->feather->view2->setPageInfo(array(
                             'redirect_url'    =>    $redirect_url,
                             'active_page' => 'login',
diff --git a/include/routes.php b/include/routes.php
index 622bf4fd..a30a097a 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -23,13 +23,19 @@
 // Userlist
 $feather->get('/userlist(/)', '\controller\userlist:display');
 
-// Login routes
-$feather->group('/login', function() use ($feather) {
-    $feather->get('(/)', '\controller\login:display');
-    $feather->post('/action/in(/)', '\controller\login:logmein');
-    $feather->map('/action/forget(/)', '\controller\login:forget')->via('GET', 'POST');
+// Auth routes
+$feather->group('/auth', function() use ($feather) {
+    $feather->get('(/)', function () use ($feather) {
+        if (!$feather->user->is_guest) {
+            $this->feather->url->redirect($this->feather->url->get('/'));
+        } else {
+            $this->feather->url->redirect($this->feather->url->get('/auth/login'));
+        }
+    });
+    $feather->map('/login(/)', '\controller\auth:login')->via('GET', 'POST');
+    $feather->map('/forget(/)', '\controller\auth:forget')->via('GET', 'POST');
+    $feather->get('/logout/token/:token(/)', '\controller\auth:logout');
 });
-$feather->get('/logout/id/:id/token/:token(/)', '\controller\login:logmeout')->conditions(array('id' => '[0-9]+'));
 
 // Register routes
 $feather->group('/register', function() use ($feather) {
diff --git a/model/auth.php b/model/auth.php
index f59830ff..7d06f191 100644
--- a/model/auth.php
+++ b/model/auth.php
@@ -15,15 +15,17 @@ class auth
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->hook = $this->feather->hooks;
     }
 
-    public function load_user($user_id)
+    public static function load_user($user_id)
     {
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+
         $user_id = (int) $user_id;
         $result['select'] = array('u.*', 'g.*', 'o.logged', 'o.idle');
         $result['where'] = array('u.id' => $user_id);
-        $result['join'] = ($user_id == 1) ? $this->feather->request->getIp() : 'u.id';
+        $result['join'] = ($user_id == 1) ? $feather->request->getIp() : 'u.id';
         $escape = ($user_id == 1) ? true : false;
 
         $result = DB::for_table('users')
@@ -32,7 +34,6 @@ public function load_user($user_id)
                     ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
                     ->left_outer_join('online', array('o.user_id', '=', $result['join']), 'o', $escape)
                     ->where($result['where']);
-        //$result = $this->hook->fireDB('load_user_query', $result);
         $result = $result->find_result_set();
 
         foreach ($result as $user) {
@@ -40,10 +41,47 @@ public function load_user($user_id)
         }
     }
 
-    //
-    // Wrapper for Slim setCookie method
-    //
-    public function feather_setcookie($user_id, $password, $expires)
+    public static function delete_online_by_ip($ip)
+    {
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+
+        $delete_online = DB::for_table('online')->where('ident', $ip);
+        $delete_online = $feather->hooks->fireDB('delete_online_login', $delete_online);
+        return $delete_online->delete_many();
+    }
+
+    public static function delete_online_by_id($user_id)
+    {
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+
+        // Remove user from "users online" list
+        $delete_online = DB::for_table('online')->where('user_id', $user_id);
+        $delete_online = $feather->hooks->fireDB('delete_online_logout', $delete_online);
+        return $delete_online->delete_many();
+    }
+
+    public static function get_user_from_name($username)
+    {
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+
+        $user = DB::for_table('users')->where('username', $username);
+        $user = $feather->hooks->fireDB('find_user_login', $user);
+        return $user->find_one();
+    }
+
+    public static function update_group($user_id, $group_id)
+    {
+        $update_usergroup = DB::for_table('users')->where('id', $user_id)
+            ->find_one()
+            ->set('group_id', $group_id);
+        $update_usergroup = $this->feather->hooks->fireDB('update_usergroup_login', $update_usergroup);
+        return $update_usergroup->save();
+    }
+
+    public static function feather_setcookie($user_id, $password, $expires)
     {
         // Get Slim current session
         $feather = \Slim\Slim::getInstance();
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index 0db548fd..9ed418d2 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -113,7 +113,7 @@ function process_form(the_form)
 
 if ($feather->user->is_guest) {
     echo "\t\t\t\t\t\t".'<li id="navregister"'.(($active_page == 'register') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('register/').'">'.__('Register').'</a></li>'."\n";
-    echo "\t\t\t\t\t\t".'<li id="navlogin"'.(($active_page == 'login') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('login/').'">'.__('Login').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogin"'.(($active_page == 'login') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('auth/login/').'">'.__('Login').'</a></li>'."\n";
 } else {
     echo "\t\t\t\t\t\t".'<li id="navprofile"'.(($active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('user/'.$feather->user->id.'/').'">'.__('Profile').'</a></li>'."\n";
 
@@ -121,7 +121,7 @@ function process_form(the_form)
         echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('admin/').'">'.__('Admin').'</a></li>'."\n";
     }
 
-    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.$feather->url->get('logout/id/'.$feather->user->id.'/token/'.feather_hash($feather->user->id.feather_hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.$feather->url->get('auth/logout/token/'.feather_hash($feather->user->id.feather_hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
 }
 
 // // Are there any additional navlinks we should insert into the array before imploding it?
diff --git a/style/FeatherBB/view/login/form.php b/style/FeatherBB/view/login/form.php
index 6a6d70a0..59808e7f 100644
--- a/style/FeatherBB/view/login/form.php
+++ b/style/FeatherBB/view/login/form.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -16,14 +16,13 @@
 <div class="blockform">
 	<h2><span><?php _e('Login') ?></span></h2>
 	<div class="box">
-		<form id="login" method="post" action="<?php echo $feather->url->get('login/action/in/') ?>" onsubmit="return process_form(this)">
+		<form id="login" method="post" action="<?php echo $feather->url->get('auth/login') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Login legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="redirect_url" value="<?php echo $feather->utils->escape($redirect_url) ?>" />
 						<label class="conl required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
 						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
 
@@ -39,4 +38,4 @@
 			<p class="buttons"><input type="submit" name="login" value="<?php _e('Login') ?>" tabindex="4" /></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>

From ba94ff7a89253ca30bc5c5a894cb2a47781eb19f Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 30 Aug 2015 14:38:39 +0200
Subject: [PATCH 271/353] Remove common_admin.php file & fix in users model

---
 controller/admin/plugins.php     |  5 +--
 include/classes/plugin.class.php |  2 -
 include/common_admin.php         | 74 --------------------------------
 model/admin/users.php            |  6 ++-
 4 files changed, 7 insertions(+), 80 deletions(-)
 delete mode 100644 include/common_admin.php

diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index 435521d2..75b73c56 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -18,7 +18,6 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        require FEATHER_ROOT . 'include/common_admin.php';
     }
 
     public function __autoload($class_name)
@@ -33,7 +32,7 @@ public function index()
         //     $this->model->update_permissions();
         // }
 
-        generate_admin_menu('plugins');
+        \FeatherBB\AdminUtils::generateAdminMenu('plugins');
 
         $pluginsList = \FeatherBB\AdminUtils::getValidPlugins();
         // var_dump($pluginsList);
@@ -67,7 +66,7 @@ public function activate()
         try {
             $plugin->activate($class);
         } catch (\Exception $e) {
-            redirect($this->feather->url->get('admin/plugins/'), $this->feather->utils->escape($e->getMessage()));
+            redirect($this->feather->url->get('admin/plugins/'), $e->getMessage());
         }
         // Plugin has been activated, confirm and redirect
         $this->feather->url->redirect($this->feather->url->get('admin/plugins/'), 'Plugin "'.$class::$name.'" activated!');
diff --git a/include/classes/plugin.class.php b/include/classes/plugin.class.php
index 02fae9b8..2a74e4b6 100644
--- a/include/classes/plugin.class.php
+++ b/include/classes/plugin.class.php
@@ -114,8 +114,6 @@ public function activate($pluginName)
         //     $this->model->addData('groups', $group_data);
         // }
 
-        // TODO: Install assets in public folder if _assets folder exists
-
         $activePlugins = $this->feather->cache->isCached('active_plugins') ? $this->feather->cache->retrieve('active_plugins') : array();
 
         // Check if plugin isn't already activated
diff --git a/include/common_admin.php b/include/common_admin.php
deleted file mode 100644
index 5c10847c..00000000
--- a/include/common_admin.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-// TODO: refactor
-$feather = \Slim\Slim::getInstance();
-
-// Load the admin common lang file
-if (file_exists(FEATHER_ROOT.'lang/'.$feather->user->language.'/admin/common.mo')) {
-    load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/admin/common.mo');
-} else {
-    die('There is no valid language pack \''.$feather->utils->escape($feather->user->language).'\' installed. Please reinstall a language of that name');
-}
-
-// To be removed
-$admin_language = 'English/admin';
-
-//
-// Display the admin navigation menu
-//
-function generate_admin_menu($page = '')
-{
-    $feather = \Slim\Slim::getInstance();
-
-    $is_admin = $feather->user->g_id == FEATHER_ADMIN ? true : false;
-
-    // See if there are any plugins
-    $plugins = forum_list_plugins($is_admin);
-
-    $feather->view2->setPageInfo(array(
-        'page'    =>    $page,
-        'is_admin'    =>    $is_admin,
-        'plugins'    =>    $plugins,
-        ), 1
-    )->addTemplate('admin/menu.php');
-}
-
-//
-// Fetch a list of available admin plugins
-//
-function forum_list_plugins($is_admin)
-{
-    $plugins = array();
-
-    $d = dir(FEATHER_ROOT.'plugins');
-    if (!$d) {
-        return $plugins;
-    }
-
-    while (($entry = $d->read()) !== false) {
-        if (!is_dir(FEATHER_ROOT.'plugins/'.$entry) && preg_match('%^AM?P_(\w+)\.php$%i', $entry)) {
-            $prefix = substr($entry, 0, strpos($entry, '_'));
-
-            if ($prefix == 'AMP' || ($is_admin && $prefix == 'AP')) {
-                $plugins[$entry] = substr($entry, strlen($prefix) + 1, -4);
-            }
-        }
-    }
-    $d->close();
-
-    natcasesort($plugins);
-
-    return $plugins;
-}
diff --git a/model/admin/users.php b/model/admin/users.php
index c27463d2..7af9db8e 100644
--- a/model/admin/users.php
+++ b/model/admin/users.php
@@ -168,7 +168,11 @@ public function move_users()
         }
 
         if ($this->request->post('move_users_comply')) {
-            $new_group = $this->request->post('new_group') && isset($move['all_groups'][$this->request->post('new_group')]) ? $this->request->post('new_group') : throw new \FeatherBB\Error(__('Invalid group message'), 400);
+            if ( $this->request->post('new_group') && isset($move['all_groups'][$this->request->post('new_group')]) ) {
+                $new_group = $this->request->post('new_group');
+            } else {
+                throw new \FeatherBB\Error(__('Invalid group message'), 400);
+            }
             $new_group = $this->hook->fire('model.users.move_users.new_group', $new_group);
 
             // Is the new group a moderator group?

From f10399c5f06cf617f927f1f1d6d04be6467b0ffa Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sun, 30 Aug 2015 16:00:42 +0200
Subject: [PATCH 272/353] Rewrite forget password feature

---
 controller/auth.php                           | 55 +++++++++++++++++--
 model/auth.php                                | 44 +++++++++++++++
 .../view/login/password_forgotten.php         |  6 +-
 3 files changed, 97 insertions(+), 8 deletions(-)

diff --git a/controller/auth.php b/controller/auth.php
index 3a3f7589..6537d665 100644
--- a/controller/auth.php
+++ b/controller/auth.php
@@ -77,15 +77,12 @@ public function logout($token)
 
         // Update last_visit (make sure there's something to update it with)
         if (isset($this->feather->user->logged)) {
-            $update_last_visit = DB::for_table('users')->where('id', $this->feather->user->id)
-                ->find_one()
-                ->set('last_visit', $this->feather->user->logged);
-            $update_last_visit = $this->feather->hooks->fireDB('update_online_logout', $update_last_visit);
-            $update_last_visit = $update_last_visit->save();
+            \model\auth::set_last_visit($this->feather->user->id, $this->feather->user->logged);
         }
 
         \model\auth::feather_setcookie(1, feather_hash(uniqid(rand(), true)), time() + 31536000);
         $this->feather->hooks->fire('logout_end');
+
         redirect($this->feather->url->base(), __('Logout redirect'));
     }
 
@@ -95,6 +92,54 @@ public function forget()
             $this->feather->url->redirect($this->feather->url->get('/'), 'Already logged in');
         }
 
+        if ($this->feather->request->isPost()) {
+            // Validate the email address
+            $email = strtolower($this->feather->utils->trim($this->feather->request->post('req_email')));
+            if (!$this->feather->email->is_valid_email($email)) {
+                throw new \FeatherBB\Error(__('Invalid email'), 400);
+            }
+            $user = \model\auth::get_user_from_email($email);
+
+            if ($user) {
+                // Load the "activate password" template
+                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->feather->user->language.'/mail_templates/activate_password.tpl'));
+                $mail_tpl = $this->feather->hooks->fire('mail_tpl_password_forgotten', $mail_tpl);
+
+                // The first row contains the subject
+                $first_crlf = strpos($mail_tpl, "\n");
+                $mail_subject = trim(substr($mail_tpl, 8, $first_crlf-8));
+                $mail_message = trim(substr($mail_tpl, $first_crlf));
+
+                // Do the generic replacements first (they apply to all emails sent out here)
+                $mail_message = str_replace('<base_url>', $this->feather->url->base().'/', $mail_message);
+                $mail_message = str_replace('<board_mailer>', $this->feather->forum_settings['o_board_title'], $mail_message);
+
+                $mail_message = $this->feather->hooks->fire('mail_message_password_forgotten', $mail_message);
+
+                if ($user->last_email_sent != '' && (time() - $user->last_email_sent) < 3600 && (time() - $user->last_email_sent) >= 0) {
+                    throw new \FeatherBB\Error(sprintf(__('Email flood'), intval((3600 - (time() - $user->last_email_sent)) / 60)), 429);
+                }
+
+                // Generate a new password and a new password activation code
+                $new_password = random_pass(12);
+                $new_password_key = random_pass(8);
+
+                \model\auth::set_new_password($new_password, $new_password_key, $user->id)
+
+                // Do the user specific replacements to the template
+                $cur_mail_message = str_replace('<username>', $user->username, $mail_message);
+                $cur_mail_message = str_replace('<activation_url>', $this->feather->url->get('user/'.$user->id.'/action/change_pass/?key='.$new_password_key), $cur_mail_message);
+                $cur_mail_message = str_replace('<new_password>', $new_password, $cur_mail_message);
+                $cur_mail_message = $this->feather->hooks->fire('cur_mail_message_password_forgotten', $cur_mail_message);
+
+                $this->feather->email->feather_mail($email, $mail_subject, $cur_mail_message);
+
+                $this->feather->url->redirect($this->feather->url->get('/'), __('Forget mail').' <a href="mailto:'.$this->feather->utils->escape($this->feather->forum_settings['o_admin_email']).'">'.$this->feather->utils->escape($this->feather->forum_settings['o_admin_email']).'</a>.', 200);
+            } else {
+                throw new \FeatherBB\Error(__('No email match').' '.$this->feather->utils->escape($email).'.', 400);
+            }
+        }
+
         $this->feather->view2->setPageInfo(array(
 //                'errors'    =>    $this->model->password_forgotten(),
                 'active_page' => 'login',
diff --git a/model/auth.php b/model/auth.php
index 7d06f191..8266e574 100644
--- a/model/auth.php
+++ b/model/auth.php
@@ -72,6 +72,19 @@ public static function get_user_from_name($username)
         return $user->find_one();
     }
 
+    public static function get_user_from_email($email)
+    {
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+
+        $result['select'] = array('id', 'username', 'last_email_sent');
+        $result = DB::for_table('users')
+            ->select_many($result['select'])
+            ->where('email', $email);
+        $result = $feather->hooks->fireDB('password_forgotten_query', $result);
+        return $result->find_one();
+    }
+
     public static function update_group($user_id, $group_id)
     {
         $update_usergroup = DB::for_table('users')->where('id', $user_id)
@@ -81,6 +94,37 @@ public static function update_group($user_id, $group_id)
         return $update_usergroup->save();
     }
 
+    public static function set_last_visit($user_id, $last_visit)
+    {
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+
+        $update_last_visit = DB::for_table('users')->where('id', (int) $user_id)
+            ->find_one()
+            ->set('last_visit', (int) $last_visit);
+        $update_last_visit = $feather->hooks->fireDB('update_online_logout', $update_last_visit);
+        return $update_last_visit->save();
+    }
+
+    public static function set_new_password($pass, $key, $user_id)
+    {
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+
+        $query['update'] = array(
+            'activate_string' => feather_hash($pass),
+            'activate_key'    => $key,
+            'last_email_sent' => $feather->now
+        );
+
+        $query = DB::for_table('users')
+                    ->where('id', $user_id)
+                    ->find_one()
+                    ->set($query['update']);
+        $query = $feather->hooks->fireDB('password_forgotten_mail_query', $query);
+        return $query->save();
+    }
+
     public static function feather_setcookie($user_id, $password, $expires)
     {
         // Get Slim current session
diff --git a/style/FeatherBB/view/login/password_forgotten.php b/style/FeatherBB/view/login/password_forgotten.php
index 432f9aee..1ca9b389 100644
--- a/style/FeatherBB/view/login/password_forgotten.php
+++ b/style/FeatherBB/view/login/password_forgotten.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -39,7 +39,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Request pass') ?></span></h2>
 	<div class="box">
-		<form id="request_pass" method="post" action="<?php echo $feather->url->get('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
+		<form id="request_pass" method="post" action="<?php echo $feather->url->get('auth/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -54,4 +54,4 @@
 			<p class="buttons"><input type="submit" name="request_pass" value="<?php _e('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a><?php endif; ?></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>

From 6470b985788d89b6bbe078e7b6bc7163d15be3f9 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sun, 30 Aug 2015 16:00:54 +0200
Subject: [PATCH 273/353] Get rid of some message()

---
 model/profile.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/model/profile.php b/model/profile.php
index f57acd1e..1e76b655 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -46,7 +46,7 @@ public function change_pass($id)
             $cur_user = $cur_user->find_one();
 
             if ($key == '' || $key != $cur_user['activate_key']) {
-                message(__('Pass key bad').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.');
+                throw new \FeatherBB\Error(__('Pass key bad').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.', 400);
             } else {
                 $query = DB::for_table('users')
                     ->where('id', $id)
@@ -57,7 +57,7 @@ public function change_pass($id)
                 $query = $this->hook->fireDB('change_pass_activate_query', $query);
                 $query = $query->save();
 
-                message(__('Pass updated'), true);
+                $this->feather->url->redirect($this->feather->url->get('/'), __('Pass updated'));
             }
         }
 
@@ -66,7 +66,7 @@ public function change_pass($id)
             $id = $this->hook->fire('change_pass_key_not_id', $id);
 
             if (!$this->user->is_admmod) { // A regular user trying to change another user's password?
-                message(__('No permission'), '403');
+                throw new \FeatherBB\Error(__('No permission'), 403);
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's password?
 
@@ -81,11 +81,11 @@ public function change_pass($id)
                 $user = $user->find_one();
 
                 if (!$user) {
-                    message(__('Bad request'), '404');
+                    throw new \FeatherBB\Error(__('Bad request'), 404);
                 }
 
                 if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == FEATHER_ADMIN || $user['g_moderator'] == '1') {
-                    message(__('No permission'), '403');
+                    throw new \FeatherBB\Error(__('No permission'), 403);
                 }
             }
         }
@@ -96,10 +96,10 @@ public function change_pass($id)
             $new_password2 = $this->feather->utils->trim($this->request->post('req_new_password2'));
 
             if ($new_password1 != $new_password2) {
-                message(__('Pass not match'));
+                throw new \FeatherBB\Error(__('Pass not match'), 400);
             }
             if ($this->feather->utils->strlen($new_password1) < 6) {
-                message(__('Pass too short'));
+                throw new \FeatherBB\Error(__('Pass too short'), 400);
             }
 
             $cur_user = DB::for_table('users')
@@ -118,7 +118,7 @@ public function change_pass($id)
             }
 
             if (!$authorized) {
-                message(__('Wrong pass'));
+                throw new \FeatherBB\Error(__('Wrong pass'), 403);
             }
 
             $new_password_hash = feather_hash($new_password1);
@@ -149,7 +149,7 @@ public function change_email($id)
             $id = $this->hook->fire('change_email_not_id', $id);
 
             if (!$this->user->is_admmod) { // A regular user trying to change another user's email?
-                message(__('No permission'), '403');
+                throw new \FeatherBB\Error(__('No permission'), 403);
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's email?
                 $user['select'] = array('u.group_id', 'g.g_moderator');
@@ -163,11 +163,11 @@ public function change_email($id)
                 $user = $user->find_one();
 
                 if (!$user) {
-                    message(__('Bad request'), '404');
+                    throw new \FeatherBB\Error(__('Bad request'), 404);
                 }
 
                 if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == FEATHER_ADMIN || $user['g_moderator'] == '1') {
-                    message(__('No permission'), '403');
+                    throw new \FeatherBB\Error(__('No permission'), 403);
                 }
             }
         }
@@ -182,7 +182,7 @@ public function change_email($id)
             $new_email_key = $new_email_key->find_one_col('activate_key');
 
             if ($key == '' || $key != $new_email_key) {
-                message(__('Email key bad').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.');
+                throw new \FeatherBB\Error(__('Email key bad').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.', 400);
             } else {
                 $update_mail = DB::for_table('users')
                     ->where('id', $id)
@@ -193,26 +193,26 @@ public function change_email($id)
                 $update_mail = $this->hook->fireDB('change_email_query', $update_mail);
                 $update_mail = $update_mail->save();
 
-                message(__('Email updated'), true);
+                $this->feather->url->redirect($this->feather->url->get('/'), __('Email updated'));
             }
         } elseif ($this->request->isPost()) {
             $this->hook->fire('change_email_post');
 
             if (feather_hash($this->request->post('req_password')) !== $this->user->password) {
-                message(__('Wrong pass'));
+                throw new \FeatherBB\Error(__('Wrong pass'), 400);
             }
 
             // Validate the email address
             $new_email = strtolower($this->feather->utils->trim($this->request->post('req_new_email')));
             $new_email = $this->hook->fire('change_email_new_email', $new_email);
             if (!$this->email->is_valid_email($new_email)) {
-                message(__('Invalid email'));
+                throw new \FeatherBB\Error(__('Invalid email'), 400);
             }
 
             // Check if it's a banned email address
             if ($this->email->is_banned_email($new_email)) {
                 if ($this->config['p_allow_banned_email'] == '0') {
-                    message(__('Banned email'));
+                    throw new \FeatherBB\Error(__('Banned email'), 403);
                 } elseif ($this->config['o_mailing_list'] != '') {
                     // Load the "banned email change" template
                     $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/banned_email_change.tpl'));
@@ -245,7 +245,7 @@ public function change_email($id)
 
             if ($result) {
                 if ($this->config['p_allow_dupe_email'] == '0') {
-                    message(__('Dupe email'));
+                    throw new \FeatherBB\Error(__('Dupe email'), 400);
                 } elseif ($this->config['o_mailing_list'] != '') {
                     foreach($result as $cur_dupe) {
                         $dupe_list[] = $cur_dupe['username'];

From deec0f18719fae1232afbd185945f166d50242a2 Mon Sep 17 00:00:00 2001
From: capkokoon <cap.kokoon@gmail.com>
Date: Sun, 30 Aug 2015 16:04:23 +0200
Subject: [PATCH 274/353] Fix typos

---
 controller/auth.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/controller/auth.php b/controller/auth.php
index 6537d665..e7d9708b 100644
--- a/controller/auth.php
+++ b/controller/auth.php
@@ -51,9 +51,8 @@ public function login()
 
                     $this->feather->url->redirect($this->feather->url->base(), __('Login redirect'));
                 }
-            } else {
-                throw new \FeatherBB\Error(__('Wrong user/pass').' <a href="'.$this->feather->url->get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
             }
+            throw new \FeatherBB\Error(__('Wrong user/pass').' <a href="'.$this->feather->url->get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
         } else {
             $this->feather->view2->setPageInfo(array(
                                 'active_page' => 'login',
@@ -124,7 +123,7 @@ public function forget()
                 $new_password = random_pass(12);
                 $new_password_key = random_pass(8);
 
-                \model\auth::set_new_password($new_password, $new_password_key, $user->id)
+                \model\auth::set_new_password($new_password, $new_password_key, $user->id);
 
                 // Do the user specific replacements to the template
                 $cur_mail_message = str_replace('<username>', $user->username, $mail_message);

From a7e18982f0f9c3461dfac7683d7315df81ec9680 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 30 Aug 2015 17:38:39 +0200
Subject: [PATCH 275/353] Move functions out of functions.php

---
 controller/admin/reports.php           |  4 +++-
 controller/auth.php                    |  6 +++---
 extern.php                             |  2 +-
 include/classes/adminutils.class.php   | 29 ++++++++++++++++++++++++++
 include/classes/auth.class.php         |  2 +-
 include/classes/utils.class.php        | 11 +++++++++-
 include/functions.php                  | 25 ----------------------
 model/install.php                      |  2 +-
 model/login.php                        |  8 +++----
 model/profile.php                      |  6 +++---
 model/register.php                     |  2 +-
 style/FeatherBB/view/admin/reports.php | 16 +++++++-------
 style/FeatherBB/view/header.new.php    |  2 +-
 view/admin/reports.php                 | 16 +++++++-------
 14 files changed, 73 insertions(+), 58 deletions(-)

diff --git a/controller/admin/reports.php b/controller/admin/reports.php
index 233523ab..4aba65e8 100644
--- a/controller/admin/reports.php
+++ b/controller/admin/reports.php
@@ -9,6 +9,8 @@
 
 namespace controller\admin;
 
+use FeatherBB\AdminUtils;
+
 class reports
 {
     public function __construct()
@@ -34,7 +36,7 @@ public function display()
             $this->model->zap_report();
         }
 
-        \FeatherBB\AdminUtils::generateAdminMenu('reports');
+        AdminUtils::generateAdminMenu('reports');
 
         $this->feather->view2->setPageInfo(array(
                 'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Reports')),
diff --git a/controller/auth.php b/controller/auth.php
index 3a3f7589..67c37544 100644
--- a/controller/auth.php
+++ b/controller/auth.php
@@ -32,7 +32,7 @@ public function login()
             $user = \model\auth::get_user_from_name($form_username);
 
             if (!empty($user->password)) {
-                $form_password_hash = feather_hash($form_password); // Will result in a SHA-1 hash
+                $form_password_hash = \FeatherBB\Utils::feather_hash($form_password); // Will result in a SHA-1 hash
                 if ($user->password == $form_password_hash) {
                     if ($user->group_id == FEATHER_UNVERIFIED) {
                         \model\auth::update_group($user->id, $this->feather->forum_settings['o_default_user_group']);
@@ -69,7 +69,7 @@ public function logout($token)
     {
         $token = $this->feather->hooks->fire('logout_start', $token);
 
-        if ($this->feather->user->is_guest || !isset($token) || $token != feather_hash($this->feather->user->id.feather_hash($this->feather->request->getIp()))) {
+        if ($this->feather->user->is_guest || !isset($token) || $token != \FeatherBB\Utils::feather_hash($this->feather->user->id.\FeatherBB\Utils::feather_hash($this->feather->request->getIp()))) {
             $this->feather->url->redirect($this->feather->url->get('/'), 'Not logged in');
         }
 
@@ -84,7 +84,7 @@ public function logout($token)
             $update_last_visit = $update_last_visit->save();
         }
 
-        \model\auth::feather_setcookie(1, feather_hash(uniqid(rand(), true)), time() + 31536000);
+        \model\auth::feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), time() + 31536000);
         $this->feather->hooks->fire('logout_end');
         redirect($this->feather->url->base(), __('Logout redirect'));
     }
diff --git a/extern.php b/extern.php
index 916b8b46..1f85454a 100644
--- a/extern.php
+++ b/extern.php
@@ -224,7 +224,7 @@ function authenticate_user($user, $password, $password_is_hash = false)
 
     if (!isset($feather->user->id) ||
         ($password_is_hash && $password != $feather->user->password) ||
-        (!$password_is_hash && feather_hash($password) != $feather->user->password)) {
+        (!$password_is_hash && \FeatherBB\Utils::feather_hash($password) != $feather->user->password)) {
         set_default_user();
     } else {
         $feather->user->is_guest = false;
diff --git a/include/classes/adminutils.class.php b/include/classes/adminutils.class.php
index 149da35c..6934bd08 100644
--- a/include/classes/adminutils.class.php
+++ b/include/classes/adminutils.class.php
@@ -77,4 +77,33 @@ public static function getValidPlugins($folder = '')
         ksort($valid_plugins);
         return $valid_plugins;
     }
+
+    /**
+     * Generate breadcrumbs from an array of name and URLs
+     */
+    public static function breadcrumbs_admin(array $links)
+    {
+        foreach ($links as $name => $url) {
+            if ($name != '' && $url != '') {
+                $tmp[] = '<span><a href="' . $url . '">'.Utils::escape($name).'</a></span>';
+            } else {
+                $tmp[] = '<span>'.__('Deleted').'</span>';
+                return implode(' » ', $tmp);
+            }
+        }
+        return implode(' » ', $tmp);
+    }
+
+    
+    /**
+     * Fetch admin IDs
+     */
+    public static function get_admin_ids()
+    {
+        if (!$this->feather->cache->isCached('admin_ids')) {
+            $this->feather->cache->store('admin_ids', \model\cache::get_admin_ids());
+        }
+
+        return $this->feather->cache->retrieve('admin_ids');
+    }
 }
diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index 86fb1e6a..e427c744 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -264,7 +264,7 @@ public function call()
                      ->update_many('logged', time());
             }
 
-            $this->model->feather_setcookie(1, feather_hash(uniqid(rand(), true)), $this->app->now + 31536000);
+            $this->model->feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), $this->app->now + 31536000);
         }
 
         load_textdomain('featherbb', $this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.mo');
diff --git a/include/classes/utils.class.php b/include/classes/utils.class.php
index d20a8884..195bde27 100644
--- a/include/classes/utils.class.php
+++ b/include/classes/utils.class.php
@@ -107,7 +107,7 @@ public function format_time($timestamp, $date_only = false, $date_format = null,
     //
     // Calls htmlspecialchars with a few options already set
     //
-    public function escape($str)
+    public static function escape($str)
     {
         return htmlspecialchars($str, ENT_QUOTES, 'UTF-8');
     }
@@ -175,4 +175,13 @@ public function ucp_preg_replace($pattern, $replace, $subject, $callback = false
 
         return $replaced;
     }
+
+
+    //
+    // Compute a hash of $str
+    //
+    public static function feather_hash($str)
+    {
+        return sha1($str);
+    }
 }
diff --git a/include/functions.php b/include/functions.php
index 67d20f94..03b326bb 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -485,15 +485,6 @@ function random_pass($len)
 }
 
 
-//
-// Compute a hash of $str
-//
-function feather_hash($str)
-{
-    return sha1($str);
-}
-
-
 //
 // Display $message and redirect user to $destination_url
 //
@@ -591,19 +582,3 @@ function generate_stopwords_cache_id()
 
     return sha1(implode('|', $hash));
 }
-
-// Generate breadcrumbs from an array of name and URLs
-function breadcrumbs_admin(array $links)
-{
-    $feather = \Slim\Slim::getInstance();
-
-    foreach ($links as $name => $url) {
-        if ($name != '' && $url != '') {
-            $tmp[] = '<span><a href="' . $url . '">'.$feather->utils->escape($name).'</a></span>';
-        } else {
-            $tmp[] = '<span>'.__('Deleted').'</span>';
-            return implode(' » ', $tmp);
-        }
-    }
-    return implode(' » ', $tmp);
-}
diff --git a/model/install.php b/model/install.php
index 3590b585..dde9faac 100644
--- a/model/install.php
+++ b/model/install.php
@@ -393,7 +393,7 @@ public static function load_admin_user(array $data)
         return $user = array(
             'group_id' => 1,
             'username' => $data['username'],
-            'password' => feather_hash($data['password']),
+            'password' => \FeatherBB\Utils::feather_hash($data['password']),
             'email' => $data['email'],
             'language' => $data['default_lang'],
             'style' => $data['default_style'],
diff --git a/model/login.php b/model/login.php
index e236cf55..ff28e584 100644
--- a/model/login.php
+++ b/model/login.php
@@ -42,7 +42,7 @@ public function login()
         $authorized = false;
 
         if (!empty($user->password)) {
-            $form_password_hash = feather_hash($form_password); // Will result in a SHA-1 hash
+            $form_password_hash = \FeatherBB\Utils::feather_hash($form_password); // Will result in a SHA-1 hash
             $authorized = ($user->password == $form_password_hash);
         }
 
@@ -91,7 +91,7 @@ public function logout($id, $token)
     {
         $token = $this->hook->fire('logout_start', $token, $id);
 
-        if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != feather_hash($this->user->id.feather_hash($this->request->getIp()))) {
+        if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != \FeatherBB\Utils::feather_hash($this->user->id.\FeatherBB\Utils::feather_hash($this->request->getIp()))) {
             header('Location: '.$this->feather->url->base());
             exit;
         }
@@ -112,7 +112,7 @@ public function logout($id, $token)
 
         $this->hook->fire('logout_end');
 
-        $this->auth->feather_setcookie(1, feather_hash(uniqid(rand(), true)), time() + 31536000);
+        $this->auth->feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), time() + 31536000);
 
         redirect($this->feather->url->base(), __('Logout redirect'));
     }
@@ -172,7 +172,7 @@ public function password_forgotten()
                         $new_password_key = random_pass(8);
 
                         $query['update'] = array(
-                            'activate_string' => feather_hash($new_password),
+                            'activate_string' => \FeatherBB\Utils::feather_hash($new_password),
                             'activate_key'    => $new_password_key,
                             'last_email_sent' => time()
                         );
diff --git a/model/profile.php b/model/profile.php
index f57acd1e..2731fa7e 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -110,7 +110,7 @@ public function change_pass($id)
             $authorized = false;
 
             if (!empty($cur_user['password'])) {
-                $old_password_hash = feather_hash($old_password);
+                $old_password_hash = \FeatherBB\Utils::feather_hash($old_password);
 
                 if ($cur_user['password'] == $old_password_hash || $this->user->is_admmod) {
                     $authorized = true;
@@ -121,7 +121,7 @@ public function change_pass($id)
                 message(__('Wrong pass'));
             }
 
-            $new_password_hash = feather_hash($new_password1);
+            $new_password_hash = \FeatherBB\Utils::feather_hash($new_password1);
 
             $update_password = DB::for_table('users')
                 ->where('id', $id)
@@ -198,7 +198,7 @@ public function change_email($id)
         } elseif ($this->request->isPost()) {
             $this->hook->fire('change_email_post');
 
-            if (feather_hash($this->request->post('req_password')) !== $this->user->password) {
+            if (\FeatherBB\Utils::feather_hash($this->request->post('req_password')) !== $this->user->password) {
                 message(__('Wrong pass'));
             }
 
diff --git a/model/register.php b/model/register.php
index dbd579fc..9a609e96 100644
--- a/model/register.php
+++ b/model/register.php
@@ -138,7 +138,7 @@ public function insert_user($user)
         $now = time();
 
         $intial_group_id = ($this->config['o_regs_verify'] == '0') ? $this->config['o_default_user_group'] : FEATHER_UNVERIFIED;
-        $password_hash = feather_hash($user['password1']);
+        $password_hash = \FeatherBB\Utils::feather_hash($user['password1']);
 
         // Add the user
         $user['insert'] = array(
diff --git a/style/FeatherBB/view/admin/reports.php b/style/FeatherBB/view/admin/reports.php
index d16db894..b364bfdc 100644
--- a/style/FeatherBB/view/admin/reports.php
+++ b/style/FeatherBB/view/admin/reports.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -16,8 +16,8 @@
 	<div class="blockform">
 		<h2><span><?php _e('New reports head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/reports/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<form method="post" action="<?= $feather->url->get('admin/reports/') ?>">
+				<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
 <?php
 if (!empty($report_data)) {
     foreach ($report_data as $report) {
@@ -29,13 +29,13 @@
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
-									<td><?php echo str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
+									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?= $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
+									<td><?= str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
 								</tr>
 							</table>
 						</div>
@@ -79,13 +79,13 @@
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?></th>
-									<td><?php echo str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
+									<td><?= str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
 								</tr>
 							</table>
 						</div>
diff --git a/style/FeatherBB/view/header.new.php b/style/FeatherBB/view/header.new.php
index 9ed418d2..0299b47d 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/FeatherBB/view/header.new.php
@@ -121,7 +121,7 @@ function process_form(the_form)
         echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('admin/').'">'.__('Admin').'</a></li>'."\n";
     }
 
-    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.$feather->url->get('auth/logout/token/'.feather_hash($feather->user->id.feather_hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.$feather->url->get('auth/logout/token/'.\FeatherBB\Utils::feather_hash($feather->user->id.\FeatherBB\Utils::feather_hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
 }
 
 // // Are there any additional navlinks we should insert into the array before imploding it?
diff --git a/view/admin/reports.php b/view/admin/reports.php
index d16db894..b364bfdc 100644
--- a/view/admin/reports.php
+++ b/view/admin/reports.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -16,8 +16,8 @@
 	<div class="blockform">
 		<h2><span><?php _e('New reports head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/reports/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<form method="post" action="<?= $feather->url->get('admin/reports/') ?>">
+				<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
 <?php
 if (!empty($report_data)) {
     foreach ($report_data as $report) {
@@ -29,13 +29,13 @@
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
-									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?php echo $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
-									<td><?php echo str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
+									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?= $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
+									<td><?= str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
 								</tr>
 							</table>
 						</div>
@@ -79,13 +79,13 @@
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?php echo breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?></th>
-									<td><?php echo str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
+									<td><?= str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
 								</tr>
 							</table>
 						</div>

From 0cdfc05c636c5b3544b6ba48fe161357d17192e7 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 30 Aug 2015 20:29:14 +0200
Subject: [PATCH 276/353] Create Lister class, and start moving themes

---
 controller/admin/options.php                  |    2 +-
 controller/admin/plugins.php                  |    2 +-
 controller/admin/users.php                    |    2 +-
 controller/install.php                        |    4 +-
 controller/register.php                       |    2 +-
 include/classes/adminutils.class.php          |   50 +-
 include/classes/auth.class.php                |    2 +-
 include/classes/core.class.php                |    2 +-
 include/classes/lister.class.php              |  102 +
 include/classes/view.class.php                |    7 +-
 include/functions.php                         |   50 -
 model/admin/options.php                       |   25 +-
 model/profile.php                             |    4 +-
 {js => style/imports}/bbeditor.js             |    0
 {js => style/imports}/colorPicker.js          |    0
 {js => style/imports}/common.js               |   30 -
 style/{ => themes}/FeatherBB/base_admin.css   |    0
 .../FeatherBB/fonts/BebasNeue-webfont.eot     |  Bin
 .../FeatherBB/fonts/BebasNeue-webfont.svg     |    0
 .../FeatherBB/fonts/BebasNeue-webfont.ttf     |  Bin
 .../FeatherBB/fonts/BebasNeue-webfont.woff    |  Bin
 style/{ => themes}/FeatherBB/img/closed.png   |  Bin
 style/{ => themes}/FeatherBB/img/new.png      |  Bin
 style/{ => themes}/FeatherBB/img/old.png      |  Bin
 style/{ => themes}/FeatherBB/img/sticky.png   |  Bin
 style/{ => themes}/FeatherBB/phone.min.js     |    0
 .../FeatherBB/style.css}                      |   12 +-
 .../FeatherBB/view/admin/bans/add_ban.php     |    0
 .../FeatherBB/view/admin/bans/admin_bans.php  |    0
 .../FeatherBB/view/admin/bans/search_ban.php  |    0
 .../FeatherBB/view/admin/categories.php       |    0
 .../FeatherBB/view/admin/censoring.php        |    0
 .../view/admin/forums/admin_forums.php        |    0
 .../view/admin/forums/delete_forum.php        |    0
 .../view/admin/forums/permissions.php         |    0
 .../view/admin/groups/add_edit_group.php      |    0
 .../view/admin/groups/admin_groups.php        |    0
 .../view/admin/groups/confirm_delete.php      |    0
 .../view/admin/groups/delete_group.php        |    0
 .../FeatherBB/view/admin/index.php            |    0
 .../FeatherBB/view/admin/loader.php           |    0
 .../admin/maintenance/admin_maintenance.php   |    0
 .../view/admin/maintenance/prune.php          |    0
 .../view/admin/maintenance/rebuild.php        |    0
 .../FeatherBB/view/admin/menu.php             |    0
 .../FeatherBB/view/admin/options.php          |   15 +-
 .../FeatherBB/view/admin/parser.php           |    0
 .../FeatherBB/view/admin/permissions.php      |    0
 .../FeatherBB/view/admin/plugins.php          |    0
 .../FeatherBB/view/admin/reports.php          |    0
 .../FeatherBB/view/admin/statistics.php       |    0
 .../view/admin/users/admin_users.php          |    0
 .../FeatherBB/view/admin/users/ban_users.php  |    0
 .../view/admin/users/delete_users.php         |    0
 .../FeatherBB/view/admin/users/find_users.php |    0
 .../FeatherBB/view/admin/users/move_users.php |    0
 .../FeatherBB/view/admin/users/search_ip.php  |    0
 .../FeatherBB/view/admin/users/show_users.php |    0
 style/{ => themes}/FeatherBB/view/delete.php  |    0
 style/{ => themes}/FeatherBB/view/edit.php    |    0
 style/{ => themes}/FeatherBB/view/error.php   |    0
 .../FeatherBB/view/footer.new.php             |    2 +-
 style/{ => themes}/FeatherBB/view/footer.php  |    2 +-
 style/themes/FeatherBB/view/header.new.php    |  233 ++
 style/{ => themes}/FeatherBB/view/header.php  |    0
 style/{ => themes}/FeatherBB/view/help.php    |    0
 style/{ => themes}/FeatherBB/view/index.php   |    0
 style/{ => themes}/FeatherBB/view/install.php |    0
 .../FeatherBB/view/login/form.php             |    0
 .../view/login/password_forgotten.php         |    0
 .../FeatherBB/view/misc/email.php             |    0
 .../FeatherBB/view/misc/report.php            |    0
 .../FeatherBB/view/misc/rules.php             |    0
 .../FeatherBB/view/moderate/delete_posts.php  |    0
 .../FeatherBB/view/moderate/delete_topics.php |    0
 .../FeatherBB/view/moderate/merge_topics.php  |    0
 .../view/moderate/moderator_forum.php         |    0
 .../FeatherBB/view/moderate/move_topics.php   |    0
 .../FeatherBB/view/moderate/posts_view.php    |    0
 .../FeatherBB/view/moderate/split_posts.php   |    0
 style/{ => themes}/FeatherBB/view/post.php    |    0
 .../FeatherBB/view/profile/change_mail.php    |    0
 .../FeatherBB/view/profile/change_pass.php    |    0
 .../FeatherBB/view/profile/delete_user.php    |    0
 .../FeatherBB/view/profile/menu.php           |    0
 .../FeatherBB/view/profile/section_admin.php  |    0
 .../view/profile/section_display.php          |    6 +-
 .../view/profile/section_essentials.php       |    6 +-
 .../view/profile/section_messaging.php        |    0
 .../view/profile/section_personal.php         |    0
 .../view/profile/section_personality.php      |    0
 .../view/profile/section_privacy.php          |    0
 .../FeatherBB/view/profile/upload_avatar.php  |    0
 .../FeatherBB/view/profile/view_profile.php   |    0
 .../FeatherBB/view/register/email.php         |    0
 .../FeatherBB/view/register/form.php          |    0
 .../FeatherBB/view/register/rules.php         |    0
 .../FeatherBB/view/search/footer.php          |    0
 .../FeatherBB/view/search/form.php            |    0
 .../FeatherBB/view/search/header.php          |    0
 .../FeatherBB/view/search/posts.php           |    0
 .../FeatherBB/view/search/topics.php          |    0
 .../{ => themes}/FeatherBB/view/userlist.php  |    0
 .../{ => themes}/FeatherBB/view/viewforum.php |    0
 .../{ => themes}/FeatherBB/view/viewtopic.php |    0
 style/themes/MyFeatherBB/base_admin.css       |    1 +
 .../MyFeatherBB/fonts/BebasNeue-webfont.eot   |  Bin 0 -> 16442 bytes
 .../MyFeatherBB/fonts/BebasNeue-webfont.svg   | 1991 +++++++++++++++++
 .../MyFeatherBB/fonts/BebasNeue-webfont.ttf   |  Bin 0 -> 48968 bytes
 .../MyFeatherBB/fonts/BebasNeue-webfont.woff  |  Bin 0 -> 17824 bytes
 style/themes/MyFeatherBB/img/closed.png       |  Bin 0 -> 1835 bytes
 style/themes/MyFeatherBB/img/new.png          |  Bin 0 -> 1897 bytes
 style/themes/MyFeatherBB/img/old.png          |  Bin 0 -> 1551 bytes
 style/themes/MyFeatherBB/img/sticky.png       |  Bin 0 -> 1816 bytes
 style/themes/MyFeatherBB/phone.min.js         |    1 +
 style/themes/MyFeatherBB/style.css            | 1841 +++++++++++++++
 .../MyFeatherBB/view/admin/bans/add_ban.php   |   96 +
 .../view/admin/bans/admin_bans.php            |  102 +
 .../view/admin/bans/search_ban.php            |   87 +
 .../MyFeatherBB/view/admin/categories.php     |  111 +
 .../MyFeatherBB/view/admin/censoring.php      |   84 +
 .../view/admin/forums/admin_forums.php        |  114 +
 .../view/admin/forums/delete_forum.php        |   35 +
 .../view/admin/forums/permissions.php         |  137 ++
 .../view/admin/groups/add_edit_group.php      |  311 +++
 .../view/admin/groups/admin_groups.php        |  110 +
 .../view/admin/groups/confirm_delete.php      |   36 +
 .../view/admin/groups/delete_group.php        |   39 +
 style/themes/MyFeatherBB/view/admin/index.php |   63 +
 .../themes/MyFeatherBB/view/admin/loader.php  |   17 +
 .../admin/maintenance/admin_maintenance.php   |   99 +
 .../view/admin/maintenance/prune.php          |   39 +
 .../view/admin/maintenance/rebuild.php        |   17 +
 style/themes/MyFeatherBB/view/admin/menu.php  |  116 +
 .../themes/MyFeatherBB/view/admin/options.php |  840 +++++++
 .../themes/MyFeatherBB/view/admin/parser.php  |  299 +++
 .../MyFeatherBB/view/admin/permissions.php    |  189 ++
 .../themes/MyFeatherBB/view/admin/plugins.php |   57 +
 .../themes/MyFeatherBB/view/admin/reports.php |  116 +
 .../MyFeatherBB/view/admin/statistics.php     |   42 +
 .../view/admin/users/admin_users.php          |  172 ++
 .../view/admin/users/ban_users.php            |   58 +
 .../view/admin/users/delete_users.php         |   39 +
 .../view/admin/users/find_users.php           |  100 +
 .../view/admin/users/move_users.php           |   47 +
 .../view/admin/users/search_ip.php            |   79 +
 .../view/admin/users/show_users.php           |  100 +
 style/themes/MyFeatherBB/view/delete.php      |   64 +
 style/themes/MyFeatherBB/view/edit.php        |  119 +
 style/themes/MyFeatherBB/view/error.php       |   26 +
 style/themes/MyFeatherBB/view/footer.new.php  |  160 ++
 style/themes/MyFeatherBB/view/footer.php      |  133 ++
 .../MyFeatherBB}/view/header.new.php          |    4 +-
 style/themes/MyFeatherBB/view/header.php      |  137 ++
 style/themes/MyFeatherBB/view/help.php        |  141 ++
 style/themes/MyFeatherBB/view/index.php       |  111 +
 style/themes/MyFeatherBB/view/install.php     |  222 ++
 style/themes/MyFeatherBB/view/login/form.php  |   41 +
 .../view/login/password_forgotten.php         |   57 +
 style/themes/MyFeatherBB/view/misc/email.php  |   37 +
 style/themes/MyFeatherBB/view/misc/report.php |   44 +
 style/themes/MyFeatherBB/view/misc/rules.php  |   23 +
 .../view/moderate/delete_posts.php            |   33 +
 .../view/moderate/delete_topics.php           |   34 +
 .../view/moderate/merge_topics.php            |   36 +
 .../view/moderate/moderator_forum.php         |  101 +
 .../MyFeatherBB/view/moderate/move_topics.php |   44 +
 .../MyFeatherBB/view/moderate/posts_view.php  |   95 +
 .../MyFeatherBB/view/moderate/split_posts.php |   40 +
 style/themes/MyFeatherBB/view/post.php        |  213 ++
 .../MyFeatherBB/view/profile/change_mail.php  |   35 +
 .../MyFeatherBB/view/profile/change_pass.php  |   39 +
 .../MyFeatherBB/view/profile/delete_user.php  |   36 +
 .../themes/MyFeatherBB/view/profile/menu.php  |   55 +
 .../view/profile/section_admin.php            |   87 +
 .../view/profile/section_display.php          |  101 +
 .../view/profile/section_essentials.php       |  258 +++
 .../view/profile/section_messaging.php        |   39 +
 .../view/profile/section_personal.php         |   39 +
 .../view/profile/section_personality.php      |   56 +
 .../view/profile/section_privacy.php          |   62 +
 .../view/profile/upload_avatar.php            |   35 +
 .../MyFeatherBB/view/profile/view_profile.php |   66 +
 .../MyFeatherBB/view/register/email.php       |   39 +
 .../themes/MyFeatherBB/view/register/form.php |  134 ++
 .../MyFeatherBB/view/register/rules.php       |   32 +
 .../themes/MyFeatherBB/view/search/footer.php |   40 +
 style/themes/MyFeatherBB/view/search/form.php |   79 +
 .../themes/MyFeatherBB/view/search/header.php |   48 +
 .../themes/MyFeatherBB/view/search/posts.php  |   56 +
 .../themes/MyFeatherBB/view/search/topics.php |   29 +
 style/themes/MyFeatherBB/view/userlist.php    |  115 +
 style/themes/MyFeatherBB/view/viewforum.php   |  100 +
 style/themes/MyFeatherBB/view/viewtopic.php   |  204 ++
 view/footer.php                               |    2 +-
 view/profile/section_display.php              |    6 +-
 view/profile/section_essentials.php           |    6 +-
 197 files changed, 11678 insertions(+), 180 deletions(-)
 create mode 100644 include/classes/lister.class.php
 rename {js => style/imports}/bbeditor.js (100%)
 rename {js => style/imports}/colorPicker.js (100%)
 rename {js => style/imports}/common.js (63%)
 rename style/{ => themes}/FeatherBB/base_admin.css (100%)
 rename style/{ => themes}/FeatherBB/fonts/BebasNeue-webfont.eot (100%)
 rename style/{ => themes}/FeatherBB/fonts/BebasNeue-webfont.svg (100%)
 rename style/{ => themes}/FeatherBB/fonts/BebasNeue-webfont.ttf (100%)
 rename style/{ => themes}/FeatherBB/fonts/BebasNeue-webfont.woff (100%)
 rename style/{ => themes}/FeatherBB/img/closed.png (100%)
 rename style/{ => themes}/FeatherBB/img/new.png (100%)
 rename style/{ => themes}/FeatherBB/img/old.png (100%)
 rename style/{ => themes}/FeatherBB/img/sticky.png (100%)
 rename style/{ => themes}/FeatherBB/phone.min.js (100%)
 rename style/{FeatherBB.css => themes/FeatherBB/style.css} (98%)
 rename style/{ => themes}/FeatherBB/view/admin/bans/add_ban.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/bans/admin_bans.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/bans/search_ban.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/categories.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/censoring.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/forums/admin_forums.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/forums/delete_forum.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/forums/permissions.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/groups/add_edit_group.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/groups/admin_groups.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/groups/confirm_delete.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/groups/delete_group.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/index.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/loader.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/maintenance/admin_maintenance.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/maintenance/prune.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/maintenance/rebuild.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/menu.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/options.php (99%)
 rename style/{ => themes}/FeatherBB/view/admin/parser.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/permissions.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/plugins.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/reports.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/statistics.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/users/admin_users.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/users/ban_users.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/users/delete_users.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/users/find_users.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/users/move_users.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/users/search_ip.php (100%)
 rename style/{ => themes}/FeatherBB/view/admin/users/show_users.php (100%)
 rename style/{ => themes}/FeatherBB/view/delete.php (100%)
 rename style/{ => themes}/FeatherBB/view/edit.php (100%)
 rename style/{ => themes}/FeatherBB/view/error.php (100%)
 rename style/{ => themes}/FeatherBB/view/footer.new.php (98%)
 rename style/{ => themes}/FeatherBB/view/footer.php (98%)
 create mode 100644 style/themes/FeatherBB/view/header.new.php
 rename style/{ => themes}/FeatherBB/view/header.php (100%)
 rename style/{ => themes}/FeatherBB/view/help.php (100%)
 rename style/{ => themes}/FeatherBB/view/index.php (100%)
 rename style/{ => themes}/FeatherBB/view/install.php (100%)
 rename style/{ => themes}/FeatherBB/view/login/form.php (100%)
 rename style/{ => themes}/FeatherBB/view/login/password_forgotten.php (100%)
 rename style/{ => themes}/FeatherBB/view/misc/email.php (100%)
 rename style/{ => themes}/FeatherBB/view/misc/report.php (100%)
 rename style/{ => themes}/FeatherBB/view/misc/rules.php (100%)
 rename style/{ => themes}/FeatherBB/view/moderate/delete_posts.php (100%)
 rename style/{ => themes}/FeatherBB/view/moderate/delete_topics.php (100%)
 rename style/{ => themes}/FeatherBB/view/moderate/merge_topics.php (100%)
 rename style/{ => themes}/FeatherBB/view/moderate/moderator_forum.php (100%)
 rename style/{ => themes}/FeatherBB/view/moderate/move_topics.php (100%)
 rename style/{ => themes}/FeatherBB/view/moderate/posts_view.php (100%)
 rename style/{ => themes}/FeatherBB/view/moderate/split_posts.php (100%)
 rename style/{ => themes}/FeatherBB/view/post.php (100%)
 rename style/{ => themes}/FeatherBB/view/profile/change_mail.php (100%)
 rename style/{ => themes}/FeatherBB/view/profile/change_pass.php (100%)
 rename style/{ => themes}/FeatherBB/view/profile/delete_user.php (100%)
 rename style/{ => themes}/FeatherBB/view/profile/menu.php (100%)
 rename style/{ => themes}/FeatherBB/view/profile/section_admin.php (100%)
 rename style/{ => themes}/FeatherBB/view/profile/section_display.php (98%)
 rename style/{ => themes}/FeatherBB/view/profile/section_essentials.php (99%)
 rename style/{ => themes}/FeatherBB/view/profile/section_messaging.php (100%)
 rename style/{ => themes}/FeatherBB/view/profile/section_personal.php (100%)
 rename style/{ => themes}/FeatherBB/view/profile/section_personality.php (100%)
 rename style/{ => themes}/FeatherBB/view/profile/section_privacy.php (100%)
 rename style/{ => themes}/FeatherBB/view/profile/upload_avatar.php (100%)
 rename style/{ => themes}/FeatherBB/view/profile/view_profile.php (100%)
 rename style/{ => themes}/FeatherBB/view/register/email.php (100%)
 rename style/{ => themes}/FeatherBB/view/register/form.php (100%)
 rename style/{ => themes}/FeatherBB/view/register/rules.php (100%)
 rename style/{ => themes}/FeatherBB/view/search/footer.php (100%)
 rename style/{ => themes}/FeatherBB/view/search/form.php (100%)
 rename style/{ => themes}/FeatherBB/view/search/header.php (100%)
 rename style/{ => themes}/FeatherBB/view/search/posts.php (100%)
 rename style/{ => themes}/FeatherBB/view/search/topics.php (100%)
 rename style/{ => themes}/FeatherBB/view/userlist.php (100%)
 rename style/{ => themes}/FeatherBB/view/viewforum.php (100%)
 rename style/{ => themes}/FeatherBB/view/viewtopic.php (100%)
 create mode 100644 style/themes/MyFeatherBB/base_admin.css
 create mode 100644 style/themes/MyFeatherBB/fonts/BebasNeue-webfont.eot
 create mode 100644 style/themes/MyFeatherBB/fonts/BebasNeue-webfont.svg
 create mode 100644 style/themes/MyFeatherBB/fonts/BebasNeue-webfont.ttf
 create mode 100644 style/themes/MyFeatherBB/fonts/BebasNeue-webfont.woff
 create mode 100644 style/themes/MyFeatherBB/img/closed.png
 create mode 100644 style/themes/MyFeatherBB/img/new.png
 create mode 100644 style/themes/MyFeatherBB/img/old.png
 create mode 100644 style/themes/MyFeatherBB/img/sticky.png
 create mode 100644 style/themes/MyFeatherBB/phone.min.js
 create mode 100644 style/themes/MyFeatherBB/style.css
 create mode 100644 style/themes/MyFeatherBB/view/admin/bans/add_ban.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/bans/admin_bans.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/bans/search_ban.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/categories.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/censoring.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/forums/admin_forums.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/forums/delete_forum.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/forums/permissions.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/groups/add_edit_group.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/groups/admin_groups.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/groups/confirm_delete.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/groups/delete_group.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/index.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/loader.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/maintenance/admin_maintenance.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/maintenance/prune.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/maintenance/rebuild.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/menu.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/options.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/parser.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/permissions.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/plugins.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/reports.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/statistics.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/users/admin_users.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/users/ban_users.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/users/delete_users.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/users/find_users.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/users/move_users.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/users/search_ip.php
 create mode 100644 style/themes/MyFeatherBB/view/admin/users/show_users.php
 create mode 100644 style/themes/MyFeatherBB/view/delete.php
 create mode 100644 style/themes/MyFeatherBB/view/edit.php
 create mode 100644 style/themes/MyFeatherBB/view/error.php
 create mode 100644 style/themes/MyFeatherBB/view/footer.new.php
 create mode 100644 style/themes/MyFeatherBB/view/footer.php
 rename style/{FeatherBB => themes/MyFeatherBB}/view/header.new.php (98%)
 create mode 100644 style/themes/MyFeatherBB/view/header.php
 create mode 100644 style/themes/MyFeatherBB/view/help.php
 create mode 100644 style/themes/MyFeatherBB/view/index.php
 create mode 100644 style/themes/MyFeatherBB/view/install.php
 create mode 100644 style/themes/MyFeatherBB/view/login/form.php
 create mode 100644 style/themes/MyFeatherBB/view/login/password_forgotten.php
 create mode 100644 style/themes/MyFeatherBB/view/misc/email.php
 create mode 100644 style/themes/MyFeatherBB/view/misc/report.php
 create mode 100644 style/themes/MyFeatherBB/view/misc/rules.php
 create mode 100644 style/themes/MyFeatherBB/view/moderate/delete_posts.php
 create mode 100644 style/themes/MyFeatherBB/view/moderate/delete_topics.php
 create mode 100644 style/themes/MyFeatherBB/view/moderate/merge_topics.php
 create mode 100644 style/themes/MyFeatherBB/view/moderate/moderator_forum.php
 create mode 100644 style/themes/MyFeatherBB/view/moderate/move_topics.php
 create mode 100644 style/themes/MyFeatherBB/view/moderate/posts_view.php
 create mode 100644 style/themes/MyFeatherBB/view/moderate/split_posts.php
 create mode 100644 style/themes/MyFeatherBB/view/post.php
 create mode 100644 style/themes/MyFeatherBB/view/profile/change_mail.php
 create mode 100644 style/themes/MyFeatherBB/view/profile/change_pass.php
 create mode 100644 style/themes/MyFeatherBB/view/profile/delete_user.php
 create mode 100644 style/themes/MyFeatherBB/view/profile/menu.php
 create mode 100644 style/themes/MyFeatherBB/view/profile/section_admin.php
 create mode 100644 style/themes/MyFeatherBB/view/profile/section_display.php
 create mode 100644 style/themes/MyFeatherBB/view/profile/section_essentials.php
 create mode 100644 style/themes/MyFeatherBB/view/profile/section_messaging.php
 create mode 100644 style/themes/MyFeatherBB/view/profile/section_personal.php
 create mode 100644 style/themes/MyFeatherBB/view/profile/section_personality.php
 create mode 100644 style/themes/MyFeatherBB/view/profile/section_privacy.php
 create mode 100644 style/themes/MyFeatherBB/view/profile/upload_avatar.php
 create mode 100644 style/themes/MyFeatherBB/view/profile/view_profile.php
 create mode 100644 style/themes/MyFeatherBB/view/register/email.php
 create mode 100644 style/themes/MyFeatherBB/view/register/form.php
 create mode 100644 style/themes/MyFeatherBB/view/register/rules.php
 create mode 100644 style/themes/MyFeatherBB/view/search/footer.php
 create mode 100644 style/themes/MyFeatherBB/view/search/form.php
 create mode 100644 style/themes/MyFeatherBB/view/search/header.php
 create mode 100644 style/themes/MyFeatherBB/view/search/posts.php
 create mode 100644 style/themes/MyFeatherBB/view/search/topics.php
 create mode 100644 style/themes/MyFeatherBB/view/userlist.php
 create mode 100644 style/themes/MyFeatherBB/view/viewforum.php
 create mode 100644 style/themes/MyFeatherBB/view/viewtopic.php

diff --git a/controller/admin/options.php b/controller/admin/options.php
index 31960949..ae47aec5 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -39,7 +39,7 @@ public function display()
                 'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Options')),
                 'active_page' => 'admin',
                 'admin_console' => true,
-                'languages' => forum_list_langs(),
+                'languages' => $this->model->get_langs(),
                 'styles' => $this->model->get_styles(),
                 'times' => $this->model->get_times(),
             )
diff --git a/controller/admin/plugins.php b/controller/admin/plugins.php
index 75b73c56..c38a1ef2 100644
--- a/controller/admin/plugins.php
+++ b/controller/admin/plugins.php
@@ -34,7 +34,7 @@ public function index()
 
         \FeatherBB\AdminUtils::generateAdminMenu('plugins');
 
-        $pluginsList = \FeatherBB\AdminUtils::getValidPlugins();
+        $pluginsList = \FeatherBB\Lister::getValidPlugins();
         // var_dump($pluginsList);
         $activePlugins = $this->feather->cache->isCached('active_plugins') ? $this->feather->cache->retrieve('active_plugins') : array();
         // var_dump($activePlugins);
diff --git a/controller/admin/users.php b/controller/admin/users.php
index 66882418..b0130364 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -105,7 +105,7 @@ public function display()
             $can_delete = $can_move = $this->user->g_id == FEATHER_ADMIN;
             $can_ban = $this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && $this->user->g_mod_ban_users == '1');
             $can_action = ($can_delete || $can_ban || $can_move) && $num_users > 0;
-            $this->feather->view2->addAsset('js', 'js/common.js', array('type' => 'text/javascript'));
+            $this->feather->view2->addAsset('js', 'style/imports/common.js', array('type' => 'text/javascript'));
 
             $this->feather->view2->setPageInfo(array(
                     'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
diff --git a/controller/install.php b/controller/install.php
index 05ac8dba..b959a84d 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -27,7 +27,7 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \model\install();
-        $this->available_langs = forum_list_langs();
+        $this->available_langs = \FeatherBB\Lister::getLangs();
         $this->feather->view2->setStyle('FeatherBB');
     }
 
@@ -92,7 +92,7 @@ public function run()
                 }
 
                 // Validate language
-                if (!in_array($data['default_lang'], forum_list_langs())) {
+                if (!in_array($data['default_lang'], \FeatherBB\Lister::getLangs())) {
                     $this->errors[] = __('Error default language');
                 }
 
diff --git a/controller/register.php b/controller/register.php
index 08d2646c..cb1a8541 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -68,7 +68,7 @@ public function display()
                         'is_indexed' => true,
                         'errors' => $user['errors'],
                         'index_questions'    =>    $index_questions,
-                        'languages' => forum_list_langs(),
+                        'languages' => \FeatherBB\Lister::getLangs(),
                         'question' => array_keys($lang_antispam_questions),
                         'qencoded' => md5(array_keys($lang_antispam_questions)[$index_questions]),
                             )
diff --git a/include/classes/adminutils.class.php b/include/classes/adminutils.class.php
index 6934bd08..4f60e514 100644
--- a/include/classes/adminutils.class.php
+++ b/include/classes/adminutils.class.php
@@ -30,54 +30,6 @@ public static function generateAdminMenu($page = '')
         )->addTemplate('admin/menu.php');
     }
 
-    /**
-     * Get all php files in plugin folder.
-     */
-    public static function getPluginFiles($folder = '')
-    {
-        $plugin_files = array();
-
-        $plugins_dir = new \RecursiveDirectoryIterator(FEATHER_ROOT.'plugins/'.$folder);
-        $iterator = new \RecursiveIteratorIterator($plugins_dir);
-        $iterator->setMaxDepth(1);
-        $php_files = new \RegexIterator($iterator, '/.+\.php$/i', \RecursiveRegexIterator::GET_MATCH);
-
-        foreach ($php_files as $file) {
-            $plugin_files[] = $file[0];
-        }
-
-        return $plugin_files;
-    }
-
-    /**
-     * Get all valid plugin files.
-     */
-    public static function getValidPlugins($folder = '')
-    {
-        $valid_plugins = array();
-
-        $plugin_files = self::getPluginFiles($folder);
-
-        $feather = \Slim\Slim::getInstance();
-        $feather_root = $feather->forum_env['FEATHER_ROOT'];
-
-        foreach ($plugin_files as $key => $file_path) {
-            // Remove forum base path
-            $relative_path = DIRECTORY_SEPARATOR.preg_replace("/" . preg_quote($feather_root, "/") . "/", '', $file_path);
-            preg_match('/^(.+)\.php$/i', $relative_path, $class_name);
-            $parts = explode(DIRECTORY_SEPARATOR, $class_name[1]);
-            $name_space = join($parts, "\\");
-            // Check if plugin follows PSR-4 conventions and extends base forum plugin
-            if (class_exists($name_space) && property_exists($name_space, 'isValidFBPlugin')) {
-                $class = new $name_space;
-                $valid_plugins[end($parts)] =  $name_space;
-            }
-        }
-
-        ksort($valid_plugins);
-        return $valid_plugins;
-    }
-
     /**
      * Generate breadcrumbs from an array of name and URLs
      */
@@ -94,7 +46,7 @@ public static function breadcrumbs_admin(array $links)
         return implode(' » ', $tmp);
     }
 
-    
+
     /**
      * Fetch admin IDs
      */
diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index e427c744..608e0c36 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -223,7 +223,7 @@ public function call()
             if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language)) {
                 $this->app->user->language = $this->app->forum_settings['o_default_lang'];
             }
-            if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'style/'.$this->app->user->style.'.css')) {
+            if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'style/themes/'.$this->app->user->style.'/style.css')) {
                 $this->app->user->style = $this->app->forum_settings['o_default_style'];
             }
             $this->model->feather_setcookie($this->app->user->id, $this->app->user->password, $expires);
diff --git a/include/classes/core.class.php b/include/classes/core.class.php
index e05956b8..b6da52c6 100644
--- a/include/classes/core.class.php
+++ b/include/classes/core.class.php
@@ -246,7 +246,7 @@ public function call()
 
         // Set default style and assets
         $this->app->view2->setStyle($this->forum_settings['o_default_style']);
-        $this->app->view2->addAsset('js', 'style/FeatherBB/phone.min.js');
+        $this->app->view2->addAsset('js', 'style/themes/FeatherBB/phone.min.js');
 
         // Populate FeatherBB Slim object with forum_settings vars
         $this->hydrate('forum_settings', $this->forum_settings);
diff --git a/include/classes/lister.class.php b/include/classes/lister.class.php
new file mode 100644
index 00000000..414c7bf7
--- /dev/null
+++ b/include/classes/lister.class.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace FeatherBB;
+
+class Lister
+{
+    /**
+     * Get all php files in plugin folder.
+     */
+    public static function getPluginFiles($folder = '')
+    {
+        $plugin_files = array();
+
+        $plugins_dir = new \RecursiveDirectoryIterator(FEATHER_ROOT.'plugins/'.$folder);
+        $iterator = new \RecursiveIteratorIterator($plugins_dir);
+        $iterator->setMaxDepth(1);
+        $php_files = new \RegexIterator($iterator, '/.+\.php$/i', \RecursiveRegexIterator::GET_MATCH);
+
+        foreach ($php_files as $file) {
+            $plugin_files[] = $file[0];
+        }
+
+        return $plugin_files;
+    }
+
+    /**
+     * Get all valid plugin files.
+     */
+    public static function getValidPlugins($folder = '')
+    {
+        $valid_plugins = array();
+
+        $plugin_files = self::getPluginFiles($folder);
+
+        $feather = \Slim\Slim::getInstance();
+        $feather_root = $feather->forum_env['FEATHER_ROOT'];
+
+        foreach ($plugin_files as $key => $file_path) {
+            // Remove forum base path
+            $relative_path = DIRECTORY_SEPARATOR.preg_replace("/" . preg_quote($feather_root, "/") . "/", '', $file_path);
+            preg_match('/^(.+)\.php$/i', $relative_path, $class_name);
+            $parts = explode(DIRECTORY_SEPARATOR, $class_name[1]);
+            $name_space = join($parts, "\\");
+            // Check if plugin follows PSR-4 conventions and extends base forum plugin
+            if (class_exists($name_space) && property_exists($name_space, 'isValidFBPlugin')) {
+                $class = new $name_space;
+                $valid_plugins[end($parts)] =  $name_space;
+            }
+        }
+
+        ksort($valid_plugins);
+        return $valid_plugins;
+    }
+
+    /**
+     * Get available styles
+     */
+    public static function getStyles()
+    {
+        $feather = \Slim\Slim::getInstance();
+        $styles = array();
+
+        $iterator = new \DirectoryIterator($feather->forum_env['FEATHER_ROOT'].'style/themes');
+        foreach ($iterator as $child) {
+            if(!$child->isDot() && $child->isDir() && file_exists($child->getPathname().DIRECTORY_SEPARATOR.'style.css')) {
+                // If the theme is well formed, add it to the list
+                $styles[] = $child->getFileName();
+            }
+        }
+
+        natcasesort($styles);
+        return $styles;
+    }
+
+    /**
+     * Get available langs
+     */
+    public static function getLangs($folder = '')
+    {
+        $feather = \Slim\Slim::getInstance();
+        $langs = array();
+
+        $iterator = new \DirectoryIterator($feather->forum_env['FEATHER_ROOT'].'lang');
+        foreach ($iterator as $child) {
+            if(!$child->isDot() && $child->isDir() && file_exists($child->getPathname().DIRECTORY_SEPARATOR.'common.po')) {
+                // If the lang pack is well formed, add it to the list
+                $langs[] = $child->getFileName();
+            }
+        }
+
+        natcasesort($langs);
+        return $langs;
+    }
+
+}
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 0df5a0c0..ecacd478 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -208,6 +208,7 @@ public function getTemplatePathname($file)
 
     public function display($nested = true)
     {
+        // $this->setStyle($this->app->user->style);
         echo $this->fetch($nested);
     }
 
@@ -248,12 +249,12 @@ protected function render($data = null, $nested = true)
 
     public function setStyle($style)
     {
-        if (!is_dir($this->app->forum_env['FEATHER_ROOT'].'style/'.$style.'/view/')) {
+        if (!is_dir($this->app->forum_env['FEATHER_ROOT'].'style/themes/'.$style.'/view/')) {
             throw new \InvalidArgumentException('The style '.$style.' doesn\'t exist');
         }
         $this->data->set('style', (string) $style);
-        $this->setTemplatesDirectory($this->app->forum_env['FEATHER_ROOT'].'style/'.$style.'/view');
-        $this->addAsset('css', 'style/'.$style.'.css');
+        $this->setTemplatesDirectory($this->app->forum_env['FEATHER_ROOT'].'style/themes/'.$style.'/view');
+        $this->addAsset('css', 'style/themes/'.$style.'/style.css');
         return $this;
     }
 
diff --git a/include/functions.php b/include/functions.php
index 03b326bb..11f0609f 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -513,56 +513,6 @@ function file_size($size)
     return sprintf(__('Size unit '.$units[$i]), round($size, 2));
 }
 
-
-//
-// Fetch a list of available styles
-//
-function forum_list_styles()
-{
-    $styles = array();
-
-    $d = dir(FEATHER_ROOT.'style');
-    while (($entry = $d->read()) !== false) {
-        if ($entry{0} == '.') {
-            continue;
-        }
-
-        if (substr($entry, -4) == '.css') {
-            $styles[] = substr($entry, 0, -4);
-        }
-    }
-    $d->close();
-
-    natcasesort($styles);
-
-    return $styles;
-}
-
-
-//
-// Fetch a list of available language packs
-//
-function forum_list_langs()
-{
-    $languages = array();
-
-    $d = dir(FEATHER_ROOT.'lang');
-    while (($entry = $d->read()) !== false) {
-        if ($entry{0} == '.') {
-            continue;
-        }
-
-        if (is_dir(FEATHER_ROOT.'lang/'.$entry) && file_exists(FEATHER_ROOT.'lang/'.$entry.'/common.po')) {
-            $languages[] = $entry;
-        }
-    }
-    $d->close();
-
-    natcasesort($languages);
-
-    return $languages;
-}
-
 //
 // Generate a cache ID based on the last modification time for all stopwords files
 //
diff --git a/model/admin/options.php b/model/admin/options.php
index f58688e9..dc2be5e5 100644
--- a/model/admin/options.php
+++ b/model/admin/options.php
@@ -108,12 +108,12 @@ public function update_options()
             }
         }
 
-        $languages = forum_list_langs();
+        $languages = \FeatherBB\Lister::getLangs();
         if (!in_array($form['default_lang'], $languages)) {
             throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
-        $styles = forum_list_styles();
+        $styles = \FeatherBB\Lister::getStyles();
         if (!in_array($form['default_style'], $styles)) {
             throw new \FeatherBB\Error(__('Bad request'), 404);
         }
@@ -252,7 +252,7 @@ public function clear_feed_cache()
 
     public function get_styles()
     {
-        $styles = forum_list_styles();
+        $styles = \FeatherBB\Lister::getStyles();
         $styles = $this->hook->fire('options.get_styles.styles', $styles);
 
         $output = '';
@@ -269,6 +269,25 @@ public function get_styles()
         return $output;
     }
 
+    public function get_langs()
+    {
+        $langs = \FeatherBB\Lister::getLangs();
+        $langs = $this->hook->fire('options.get_langs.langs', $langs);
+
+        $output = '';
+
+        foreach ($langs as $temp) {
+            if ($this->config['o_default_lang'] == $temp) {
+                $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.str_replace('_', ' ', $temp).'</option>'."\n";
+            } else {
+                $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.str_replace('_', ' ', $temp).'</option>'."\n";
+            }
+        }
+
+        $output = $this->hook->fire('options.get_langs.output', $output);
+        return $output;
+    }
+
     public function get_times()
     {
         $times = array(5, 15, 30, 60);
diff --git a/model/profile.php b/model/profile.php
index 2731fa7e..f0c8fd0c 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -780,7 +780,7 @@ public function update_profile($id, $info, $section)
 
                 // Make sure we got a valid language string
                 if ($this->request->post('form_language')) {
-                    $languages = forum_list_langs();
+                    $languages = \FeatherBB\Lister::getLangs();
                     $form['language'] = $this->feather->utils->trim($this->request->post('form_language'));
                     if (!in_array($form['language'], $languages)) {
                         message(__('Bad request'), '404');
@@ -952,7 +952,7 @@ public function update_profile($id, $info, $section)
 
                 // Make sure we got a valid style string
                 if ($this->request->post('form_style')) {
-                    $styles = forum_list_styles();
+                    $styles = \FeatherBB\Lister::getStyles();
                     $form['style'] = $this->feather->utils->trim($this->request->post('form_style'));
                     if (!in_array($form['style'], $styles)) {
                         message(__('Bad request'), '404');
diff --git a/js/bbeditor.js b/style/imports/bbeditor.js
similarity index 100%
rename from js/bbeditor.js
rename to style/imports/bbeditor.js
diff --git a/js/colorPicker.js b/style/imports/colorPicker.js
similarity index 100%
rename from js/colorPicker.js
rename to style/imports/colorPicker.js
diff --git a/js/common.js b/style/imports/common.js
similarity index 63%
rename from js/common.js
rename to style/imports/common.js
index 226c1374..91cd00e4 100644
--- a/js/common.js
+++ b/style/imports/common.js
@@ -32,33 +32,3 @@ function unselect_checkboxes(curFormId, link, new_string) {
 
 	return false;
 }
-
-// Useless functions (former flash message show/hide, maybe to use later)
-function fadeOut(id, val) {
-	if (isNaN(val)) {
-		val = 9;
-	}
-	document.getElementById(id).style.opacity = '0.' + val;
-	//For IE
-	document.getElementById(id).style.filter = 'alpha(opacity=' + val + '0)';
-	if (val > 0) {
-		val--;
-		setTimeout('fadeOut("' + id + '",' + val + ')', 120);
-	} else {
-		return;
-	}
-}
-
-function fadeIn(id, val) {
-	if (isNaN(val)) { val = 0; }
-	document.getElementById(id).style.opacity = '0.' + val;
-	//For IE
-	document.getElementById(id).style.filter = 'alpha(opacity=' + val + '0)';
-
-	if (val < 9) {
-		val++;
-		setTimeout('fadeIn("' + id + '",' + val + ')', 120);
-	} else {
-		return;
-	}
-}
diff --git a/style/FeatherBB/base_admin.css b/style/themes/FeatherBB/base_admin.css
similarity index 100%
rename from style/FeatherBB/base_admin.css
rename to style/themes/FeatherBB/base_admin.css
diff --git a/style/FeatherBB/fonts/BebasNeue-webfont.eot b/style/themes/FeatherBB/fonts/BebasNeue-webfont.eot
similarity index 100%
rename from style/FeatherBB/fonts/BebasNeue-webfont.eot
rename to style/themes/FeatherBB/fonts/BebasNeue-webfont.eot
diff --git a/style/FeatherBB/fonts/BebasNeue-webfont.svg b/style/themes/FeatherBB/fonts/BebasNeue-webfont.svg
similarity index 100%
rename from style/FeatherBB/fonts/BebasNeue-webfont.svg
rename to style/themes/FeatherBB/fonts/BebasNeue-webfont.svg
diff --git a/style/FeatherBB/fonts/BebasNeue-webfont.ttf b/style/themes/FeatherBB/fonts/BebasNeue-webfont.ttf
similarity index 100%
rename from style/FeatherBB/fonts/BebasNeue-webfont.ttf
rename to style/themes/FeatherBB/fonts/BebasNeue-webfont.ttf
diff --git a/style/FeatherBB/fonts/BebasNeue-webfont.woff b/style/themes/FeatherBB/fonts/BebasNeue-webfont.woff
similarity index 100%
rename from style/FeatherBB/fonts/BebasNeue-webfont.woff
rename to style/themes/FeatherBB/fonts/BebasNeue-webfont.woff
diff --git a/style/FeatherBB/img/closed.png b/style/themes/FeatherBB/img/closed.png
similarity index 100%
rename from style/FeatherBB/img/closed.png
rename to style/themes/FeatherBB/img/closed.png
diff --git a/style/FeatherBB/img/new.png b/style/themes/FeatherBB/img/new.png
similarity index 100%
rename from style/FeatherBB/img/new.png
rename to style/themes/FeatherBB/img/new.png
diff --git a/style/FeatherBB/img/old.png b/style/themes/FeatherBB/img/old.png
similarity index 100%
rename from style/FeatherBB/img/old.png
rename to style/themes/FeatherBB/img/old.png
diff --git a/style/FeatherBB/img/sticky.png b/style/themes/FeatherBB/img/sticky.png
similarity index 100%
rename from style/FeatherBB/img/sticky.png
rename to style/themes/FeatherBB/img/sticky.png
diff --git a/style/FeatherBB/phone.min.js b/style/themes/FeatherBB/phone.min.js
similarity index 100%
rename from style/FeatherBB/phone.min.js
rename to style/themes/FeatherBB/phone.min.js
diff --git a/style/FeatherBB.css b/style/themes/FeatherBB/style.css
similarity index 98%
rename from style/FeatherBB.css
rename to style/themes/FeatherBB/style.css
index 89fc161c..c3ca1bda 100644
--- a/style/FeatherBB.css
+++ b/style/themes/FeatherBB/style.css
@@ -413,7 +413,7 @@ section .blocktable .box table tbody tr .tcl {
     padding: 7px 8px
 }
 section .blocktable .box table tbody tr .tcl .icon {
-    background-image: url(FeatherBB/img/old.png);
+    background-image: url(img/old.png);
     height: 32px;
     width: 32px;
 	margin-right: 5px;
@@ -423,13 +423,13 @@ section .blocktable .box table tbody tr .tcl .icon .nosize {
     display: none
 }
 section .blocktable .box table tbody tr .tcl .icon-new {
-    background-image: url(FeatherBB/img/new.png);
+    background-image: url(img/new.png);
 }
 section .blocktable .box table tbody tr .tcl .icon-sticky {
-    background-image: url(FeatherBB/img/sticky.png);
+    background-image: url(img/sticky.png);
 }
 section .blocktable .box table tbody tr .tcl .icon-closed {
-    background-image: url(FeatherBB/img/closed.png);
+    background-image: url(img/closed.png);
 }
 section .blocktable .box table tbody tr .tcl .tclcon {
     margin-left: 35px;
@@ -1412,8 +1412,8 @@ input[type=submit]:focus {
 }
 @font-face {
     font-family: bebas_neueregular;
-    src: url(FeatherBB/fonts/BebasNeue-webfont.eot);
-    src: url(FeatherBB/fonts/BebasNeue-webfont.eot?#iefix)format("embedded-opentype"), url(FeatherBB/fonts/BebasNeue-webfont.woff)format("woff"), url(FeatherBB/fonts/BebasNeue-webfont.ttf)format("truetype"), url(FeatherBB/fonts/BebasNeue-webfont.svg#bebas_neueregular)format("svg");
+    src: url(fonts/BebasNeue-webfont.eot);
+    src: url(fonts/BebasNeue-webfont.eot?#iefix)format("embedded-opentype"), url(fonts/BebasNeue-webfont.woff)format("woff"), url(fonts/BebasNeue-webfont.ttf)format("truetype"), url(fonts/BebasNeue-webfont.svg#bebas_neueregular)format("svg");
     font-weight: 400;
     font-style: normal
 }
diff --git a/style/FeatherBB/view/admin/bans/add_ban.php b/style/themes/FeatherBB/view/admin/bans/add_ban.php
similarity index 100%
rename from style/FeatherBB/view/admin/bans/add_ban.php
rename to style/themes/FeatherBB/view/admin/bans/add_ban.php
diff --git a/style/FeatherBB/view/admin/bans/admin_bans.php b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
similarity index 100%
rename from style/FeatherBB/view/admin/bans/admin_bans.php
rename to style/themes/FeatherBB/view/admin/bans/admin_bans.php
diff --git a/style/FeatherBB/view/admin/bans/search_ban.php b/style/themes/FeatherBB/view/admin/bans/search_ban.php
similarity index 100%
rename from style/FeatherBB/view/admin/bans/search_ban.php
rename to style/themes/FeatherBB/view/admin/bans/search_ban.php
diff --git a/style/FeatherBB/view/admin/categories.php b/style/themes/FeatherBB/view/admin/categories.php
similarity index 100%
rename from style/FeatherBB/view/admin/categories.php
rename to style/themes/FeatherBB/view/admin/categories.php
diff --git a/style/FeatherBB/view/admin/censoring.php b/style/themes/FeatherBB/view/admin/censoring.php
similarity index 100%
rename from style/FeatherBB/view/admin/censoring.php
rename to style/themes/FeatherBB/view/admin/censoring.php
diff --git a/style/FeatherBB/view/admin/forums/admin_forums.php b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
similarity index 100%
rename from style/FeatherBB/view/admin/forums/admin_forums.php
rename to style/themes/FeatherBB/view/admin/forums/admin_forums.php
diff --git a/style/FeatherBB/view/admin/forums/delete_forum.php b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
similarity index 100%
rename from style/FeatherBB/view/admin/forums/delete_forum.php
rename to style/themes/FeatherBB/view/admin/forums/delete_forum.php
diff --git a/style/FeatherBB/view/admin/forums/permissions.php b/style/themes/FeatherBB/view/admin/forums/permissions.php
similarity index 100%
rename from style/FeatherBB/view/admin/forums/permissions.php
rename to style/themes/FeatherBB/view/admin/forums/permissions.php
diff --git a/style/FeatherBB/view/admin/groups/add_edit_group.php b/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
similarity index 100%
rename from style/FeatherBB/view/admin/groups/add_edit_group.php
rename to style/themes/FeatherBB/view/admin/groups/add_edit_group.php
diff --git a/style/FeatherBB/view/admin/groups/admin_groups.php b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
similarity index 100%
rename from style/FeatherBB/view/admin/groups/admin_groups.php
rename to style/themes/FeatherBB/view/admin/groups/admin_groups.php
diff --git a/style/FeatherBB/view/admin/groups/confirm_delete.php b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
similarity index 100%
rename from style/FeatherBB/view/admin/groups/confirm_delete.php
rename to style/themes/FeatherBB/view/admin/groups/confirm_delete.php
diff --git a/style/FeatherBB/view/admin/groups/delete_group.php b/style/themes/FeatherBB/view/admin/groups/delete_group.php
similarity index 100%
rename from style/FeatherBB/view/admin/groups/delete_group.php
rename to style/themes/FeatherBB/view/admin/groups/delete_group.php
diff --git a/style/FeatherBB/view/admin/index.php b/style/themes/FeatherBB/view/admin/index.php
similarity index 100%
rename from style/FeatherBB/view/admin/index.php
rename to style/themes/FeatherBB/view/admin/index.php
diff --git a/style/FeatherBB/view/admin/loader.php b/style/themes/FeatherBB/view/admin/loader.php
similarity index 100%
rename from style/FeatherBB/view/admin/loader.php
rename to style/themes/FeatherBB/view/admin/loader.php
diff --git a/style/FeatherBB/view/admin/maintenance/admin_maintenance.php b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
similarity index 100%
rename from style/FeatherBB/view/admin/maintenance/admin_maintenance.php
rename to style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
diff --git a/style/FeatherBB/view/admin/maintenance/prune.php b/style/themes/FeatherBB/view/admin/maintenance/prune.php
similarity index 100%
rename from style/FeatherBB/view/admin/maintenance/prune.php
rename to style/themes/FeatherBB/view/admin/maintenance/prune.php
diff --git a/style/FeatherBB/view/admin/maintenance/rebuild.php b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
similarity index 100%
rename from style/FeatherBB/view/admin/maintenance/rebuild.php
rename to style/themes/FeatherBB/view/admin/maintenance/rebuild.php
diff --git a/style/FeatherBB/view/admin/menu.php b/style/themes/FeatherBB/view/admin/menu.php
similarity index 100%
rename from style/FeatherBB/view/admin/menu.php
rename to style/themes/FeatherBB/view/admin/menu.php
diff --git a/style/FeatherBB/view/admin/options.php b/style/themes/FeatherBB/view/admin/options.php
similarity index 99%
rename from style/FeatherBB/view/admin/options.php
rename to style/themes/FeatherBB/view/admin/options.php
index 98e4eed5..78ed0fa6 100644
--- a/style/FeatherBB/view/admin/options.php
+++ b/style/themes/FeatherBB/view/admin/options.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -190,16 +190,7 @@
 									<th scope="row"><?php _e('Language label') ?></th>
 									<td>
 										<select name="form_default_lang">
-<?php
-        foreach ($languages as $temp) {
-            if ($feather->forum_settings['o_default_lang'] == $temp) {
-                echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
-            } else {
-                echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
-            }
-        }
-
-?>
+                                            <?php echo $languages; ?>
 										</select>
 										<span><?php _e('Language help') ?></span>
 									</td>
@@ -846,4 +837,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/FeatherBB/view/admin/parser.php b/style/themes/FeatherBB/view/admin/parser.php
similarity index 100%
rename from style/FeatherBB/view/admin/parser.php
rename to style/themes/FeatherBB/view/admin/parser.php
diff --git a/style/FeatherBB/view/admin/permissions.php b/style/themes/FeatherBB/view/admin/permissions.php
similarity index 100%
rename from style/FeatherBB/view/admin/permissions.php
rename to style/themes/FeatherBB/view/admin/permissions.php
diff --git a/style/FeatherBB/view/admin/plugins.php b/style/themes/FeatherBB/view/admin/plugins.php
similarity index 100%
rename from style/FeatherBB/view/admin/plugins.php
rename to style/themes/FeatherBB/view/admin/plugins.php
diff --git a/style/FeatherBB/view/admin/reports.php b/style/themes/FeatherBB/view/admin/reports.php
similarity index 100%
rename from style/FeatherBB/view/admin/reports.php
rename to style/themes/FeatherBB/view/admin/reports.php
diff --git a/style/FeatherBB/view/admin/statistics.php b/style/themes/FeatherBB/view/admin/statistics.php
similarity index 100%
rename from style/FeatherBB/view/admin/statistics.php
rename to style/themes/FeatherBB/view/admin/statistics.php
diff --git a/style/FeatherBB/view/admin/users/admin_users.php b/style/themes/FeatherBB/view/admin/users/admin_users.php
similarity index 100%
rename from style/FeatherBB/view/admin/users/admin_users.php
rename to style/themes/FeatherBB/view/admin/users/admin_users.php
diff --git a/style/FeatherBB/view/admin/users/ban_users.php b/style/themes/FeatherBB/view/admin/users/ban_users.php
similarity index 100%
rename from style/FeatherBB/view/admin/users/ban_users.php
rename to style/themes/FeatherBB/view/admin/users/ban_users.php
diff --git a/style/FeatherBB/view/admin/users/delete_users.php b/style/themes/FeatherBB/view/admin/users/delete_users.php
similarity index 100%
rename from style/FeatherBB/view/admin/users/delete_users.php
rename to style/themes/FeatherBB/view/admin/users/delete_users.php
diff --git a/style/FeatherBB/view/admin/users/find_users.php b/style/themes/FeatherBB/view/admin/users/find_users.php
similarity index 100%
rename from style/FeatherBB/view/admin/users/find_users.php
rename to style/themes/FeatherBB/view/admin/users/find_users.php
diff --git a/style/FeatherBB/view/admin/users/move_users.php b/style/themes/FeatherBB/view/admin/users/move_users.php
similarity index 100%
rename from style/FeatherBB/view/admin/users/move_users.php
rename to style/themes/FeatherBB/view/admin/users/move_users.php
diff --git a/style/FeatherBB/view/admin/users/search_ip.php b/style/themes/FeatherBB/view/admin/users/search_ip.php
similarity index 100%
rename from style/FeatherBB/view/admin/users/search_ip.php
rename to style/themes/FeatherBB/view/admin/users/search_ip.php
diff --git a/style/FeatherBB/view/admin/users/show_users.php b/style/themes/FeatherBB/view/admin/users/show_users.php
similarity index 100%
rename from style/FeatherBB/view/admin/users/show_users.php
rename to style/themes/FeatherBB/view/admin/users/show_users.php
diff --git a/style/FeatherBB/view/delete.php b/style/themes/FeatherBB/view/delete.php
similarity index 100%
rename from style/FeatherBB/view/delete.php
rename to style/themes/FeatherBB/view/delete.php
diff --git a/style/FeatherBB/view/edit.php b/style/themes/FeatherBB/view/edit.php
similarity index 100%
rename from style/FeatherBB/view/edit.php
rename to style/themes/FeatherBB/view/edit.php
diff --git a/style/FeatherBB/view/error.php b/style/themes/FeatherBB/view/error.php
similarity index 100%
rename from style/FeatherBB/view/error.php
rename to style/themes/FeatherBB/view/error.php
diff --git a/style/FeatherBB/view/footer.new.php b/style/themes/FeatherBB/view/footer.new.php
similarity index 98%
rename from style/FeatherBB/view/footer.new.php
rename to style/themes/FeatherBB/view/footer.new.php
index 770c3f0a..b66f807c 100644
--- a/style/FeatherBB/view/footer.new.php
+++ b/style/themes/FeatherBB/view/footer.new.php
@@ -155,6 +155,6 @@
     foreach ($script['params'] as $key => $value) {
         echo $key.'="'.$value.'" ';
     }
-    echo 'href="'.$feather->url->base().'/'.$script['file'].'"/>'."\n";
+    echo 'src="'.$feather->url->base().'/'.$script['file'].'"/></script>'."\n";
 } ?>
 </html>
diff --git a/style/FeatherBB/view/footer.php b/style/themes/FeatherBB/view/footer.php
similarity index 98%
rename from style/FeatherBB/view/footer.php
rename to style/themes/FeatherBB/view/footer.php
index 4932ccfa..9e19de90 100644
--- a/style/FeatherBB/view/footer.php
+++ b/style/themes/FeatherBB/view/footer.php
@@ -127,7 +127,7 @@
 
 </section>
 
-<script src="<?php echo $feather->url->base() ?>/style/FeatherBB/phone.min.js"></script>
+<script src="<?php echo $feather->url->base() ?>/style/themes/FeatherBB/phone.min.js"></script>
 
 </body>
 </html>
diff --git a/style/themes/FeatherBB/view/header.new.php b/style/themes/FeatherBB/view/header.new.php
new file mode 100644
index 00000000..cba067ee
--- /dev/null
+++ b/style/themes/FeatherBB/view/header.new.php
@@ -0,0 +1,233 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+?>
+<!doctype html>
+<html lang="<?php _e('lang_identifier') ?>">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
+<?php if ($is_indexed) {
+    echo "\t".'<meta name="robots" content="noindex, follow">'."\n";
+} ?>
+    <title><?php echo generate_page_title($title, $page_number) ?></title>
+<?php
+
+foreach($assets as $type => $items) {
+    if ($type == 'js') {
+        continue;
+    }
+    echo "\t".'<!-- '.ucfirst($type).' -->'."\n";
+    foreach ($items as $item) {
+        echo "\t".'<link ';
+        foreach ($item['params'] as $key => $value) {
+            echo $key.'="'.$value.'" ';
+        }
+        echo 'href="'.$feather->url->base().'/'.$item['file'].'">'."\n";
+    }
+}
+if ($admin_console) {
+    if (file_exists($feather->forum_env['FEATHER_ROOT'].'style/themes/'.$feather->user->style.'/base_admin.css')) {
+        echo "\t".'<link rel="stylesheet" type="text/css" href="'.$feather->url->base().'/style/themes/'.$feather->user->style.'/base_admin.css" />'."\n";
+    } else {
+        echo "\t".'<link rel="stylesheet" type="text/css" href="'.$feather->url->base().'/style/imports/base_admin.css" />'."\n";
+    }
+}
+if (isset($required_fields)) :
+    // Output JavaScript to validate form (make sure required fields are filled out)
+
+    ?>
+    <script type="text/javascript">
+        /* <![CDATA[ */
+        function process_form(the_form)
+        {
+            var required_fields = {
+                <?php
+                    // Output a JavaScript object with localised field names
+                    $tpl_temp = count($required_fields);
+                    foreach ($required_fields as $elem_orig => $elem_trans) {
+                        echo "\t\t\"".$elem_orig.'": "'.addslashes(str_replace('&#160;', ' ', $elem_trans));
+                        if (--$tpl_temp) {
+                            echo "\",\n";
+                        } else {
+                            echo "\"\n\t};\n";
+                        }
+                    }
+                    ?>
+                if (document.all || document.getElementById)
+            {
+                for (var i = 0; i < the_form.length; ++i)
+                {
+                    var elem = the_form.elements[i];
+                    if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
+                    {
+                        alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
+                        elem.focus();
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        /* ]]> */
+    </script>
+    <?php
+endif;
+if (!empty($page_head)) :
+    echo implode("\n", $page_head)."\n";
+endif;
+?>
+</head>
+
+<body id="pun<?= $active_page ?>"<?= ($focus_element ? ' onload="document.getElementById(\''.$focus_element[0].'\').elements[\''.$focus_element[1].'\'].focus();"' : '')?>>
+<header>
+    <nav>
+        <div class="container">
+            <div class="phone-menu" id="phone-button">
+                <a class="button-phone"></a>
+            </div>
+            <div id="phone">
+                <div id="brdmenu" class="inbox">
+                    <ul>
+<?php
+echo "\t\t\t\t\t\t".'<li id="navindex"'.(($active_page == 'index') ? ' class="isactive"' : '').'><a href="'.$feather->url->base().'/">'.__('Index').'</a></li>'."\n";
+
+if ($feather->user->g_read_board == '1' && $feather->user->g_view_users == '1') {
+    echo "\t\t\t\t\t\t".'<li id="navuserlist"'.(($active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('userlist/').'">'.__('User list').'</a></li>'."\n";
+}
+
+if ($feather->forum_settings['o_rules'] == '1' && (!$feather->user->is_guest || $feather->user->g_read_board == '1' || $feather->forum_settings['o_regs_allow'] == '1')) {
+    echo "\t\t\t\t\t\t".'<li id="navrules"'.(($active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('rules/').'">'.__('Rules').'</a></li>'."\n";
+}
+
+if ($feather->user->g_read_board == '1' && $feather->user->g_search == '1') {
+    echo "\t\t\t\t\t\t".'<li id="navsearch"'.(($active_page == 'search') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('search/').'">'.__('Search').'</a></li>'."\n";
+}
+
+if ($feather->user->is_guest) {
+    echo "\t\t\t\t\t\t".'<li id="navregister"'.(($active_page == 'register') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('register/').'">'.__('Register').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogin"'.(($active_page == 'login') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('auth/login/').'">'.__('Login').'</a></li>'."\n";
+} else {
+    echo "\t\t\t\t\t\t".'<li id="navprofile"'.(($active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('user/'.$feather->user->id.'/').'">'.__('Profile').'</a></li>'."\n";
+
+    if ($feather->user->is_admmod) {
+        echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('admin/').'">'.__('Admin').'</a></li>'."\n";
+    }
+
+    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.$feather->url->get('auth/logout/token/'.\FeatherBB\Utils::feather_hash($feather->user->id.\FeatherBB\Utils::feather_hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
+}
+
+// // Are there any additional navlinks we should insert into the array before imploding it?
+// if ($feather->user->g_read_board == '1' && $feather->forum_settings['o_additional_navlinks'] != '') {
+//     if (preg_match_all('%([0-9]+)\s*=\s*(.*?)\n%s', $feather->forum_settings['o_additional_navlinks']."\n", $extra_links)) {
+//         // Insert any additional links into the $links array (at the correct index)
+//         $num_links = count($extra_links[1]);
+//         for ($i = 0; $i < $num_links; ++$i) {
+//             array_splice($links, $extra_links[1][$i], 0, array('<li id="navextra'.($i + 1).'">'.$extra_links[2][$i].'</li>'));
+//         }
+//     }
+// }
+?>
+                        </ul>
+                    </div>
+                <div class="navbar-right">
+                    <form method="get" action="/search" class="nav-search">
+                        <input type="hidden" name="action" value="search">
+                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php _e('Search') ?>">
+                    </form>
+                </div>
+            </div>
+        </div>
+    </nav>
+
+    <div class="container">
+        <div class="container-title-status">
+            <h1 class="title-site">
+                <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
+                    <p><?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?></p>
+                </a>
+                <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
+            </h1>
+            <div class="status-avatar">
+                <div id="brdwelcome" class="inbox">
+
+<?php
+if ($feather->user->is_guest) { ?>
+                    <p class="conl"><?= __('Not logged in')?></p>
+<?php } else {
+    echo "\t\t\t\t\t".'<ul class="conl">';
+    echo "\t\t\t\t\t\t".'<li><span>'.__('Logged in as').' <strong>'.$feather->utils->escape($feather->user->username).'</strong></span></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li><span>'.sprintf(__('Last visit'), $feather->utils->format_time($feather->user->last_visit)).'</span></li>'."\n";
+
+    if ($feather->user->is_admmod) {
+        if ($feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2') {
+            if ($has_reports) {
+                echo "\t\t\t\t\t\t".'<li class="reportlink"><span><strong><a href="'.$feather->url->get('admin/reports/').'">'.__('New reports').'</a></strong></span></li>'."\n";
+            }
+        }
+
+        if ($feather->forum_settings['o_maintenance'] == '1') {
+            echo "\t\t\t\t\t\t".'<li class="maintenancelink"><span><strong><a href="'.$feather->url->get('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>'."\n";
+        }
+    }
+    echo "\t\t\t\t\t".'</ul>'."\n";
+}
+
+if ($feather->user->g_read_board == '1' && $feather->user->g_search == '1') {
+    echo "\t\t\t\t\t".'<ul class="conr">'."\n";
+    echo "\t\t\t\t\t\t".'<li><span>'.__('Topic searches').' ';
+    if (!$feather->user->is_guest) {
+        echo '<a href="'.$feather->url->get('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a> | ';
+        echo '<a href="'.$feather->url->get('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a> | ';
+    }
+    echo '<a href="'.$feather->url->get('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a> | ';
+    echo '<a href="'.$feather->url->get('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
+    echo '</li>'."\n";
+    echo "\t\t\t\t".'</ul>'."\n";
+} ?>
+                <div class="clearer"></div>
+                </div>
+            </div>
+            <div class="clear"></div>
+        </div>
+        <?php if ($feather->user->g_read_board == '1' && $feather->forum_settings['o_announcement'] == '1') : ?>
+        <div id="announce" class="block">
+            <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
+            <div class="box">
+                <div id="announce-block" class="inbox">
+                    <div class="usercontent"><?php echo $feather->forum_settings['o_announcement_message'] ?></div>
+                </div>
+            </div>
+        </div>
+    <?php endif; ?>
+        <?php if (!empty($flash->getMessages())) : ?>
+        <script type="text/javascript">
+            window.onload = function() {
+                var flashMessage = document.getElementById('flashmsg');
+                flashMessage.className = 'flashmsg '+flashMessage.getAttribute('data-type')+' show';
+                setTimeout(function () {
+                    flashMessage.className = 'flashmsg '+flashMessage.getAttribute('data-type');
+                }, 10000);
+                return false;
+            }
+        </script>
+        <?php foreach ($flash->getMessages() as $type => $message) { ?>
+        <div class="flashmsg info" data-type="<?= $type; ?>" id="flashmsg">
+            <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
+            <p><?= $feather->utils->escape($message) ?></p>
+        </div>
+        <?php } ?>
+        <?php endif; ?>
+    </div>
+</header>
+
+<section class="container">
+    <div id="brdmain">
diff --git a/style/FeatherBB/view/header.php b/style/themes/FeatherBB/view/header.php
similarity index 100%
rename from style/FeatherBB/view/header.php
rename to style/themes/FeatherBB/view/header.php
diff --git a/style/FeatherBB/view/help.php b/style/themes/FeatherBB/view/help.php
similarity index 100%
rename from style/FeatherBB/view/help.php
rename to style/themes/FeatherBB/view/help.php
diff --git a/style/FeatherBB/view/index.php b/style/themes/FeatherBB/view/index.php
similarity index 100%
rename from style/FeatherBB/view/index.php
rename to style/themes/FeatherBB/view/index.php
diff --git a/style/FeatherBB/view/install.php b/style/themes/FeatherBB/view/install.php
similarity index 100%
rename from style/FeatherBB/view/install.php
rename to style/themes/FeatherBB/view/install.php
diff --git a/style/FeatherBB/view/login/form.php b/style/themes/FeatherBB/view/login/form.php
similarity index 100%
rename from style/FeatherBB/view/login/form.php
rename to style/themes/FeatherBB/view/login/form.php
diff --git a/style/FeatherBB/view/login/password_forgotten.php b/style/themes/FeatherBB/view/login/password_forgotten.php
similarity index 100%
rename from style/FeatherBB/view/login/password_forgotten.php
rename to style/themes/FeatherBB/view/login/password_forgotten.php
diff --git a/style/FeatherBB/view/misc/email.php b/style/themes/FeatherBB/view/misc/email.php
similarity index 100%
rename from style/FeatherBB/view/misc/email.php
rename to style/themes/FeatherBB/view/misc/email.php
diff --git a/style/FeatherBB/view/misc/report.php b/style/themes/FeatherBB/view/misc/report.php
similarity index 100%
rename from style/FeatherBB/view/misc/report.php
rename to style/themes/FeatherBB/view/misc/report.php
diff --git a/style/FeatherBB/view/misc/rules.php b/style/themes/FeatherBB/view/misc/rules.php
similarity index 100%
rename from style/FeatherBB/view/misc/rules.php
rename to style/themes/FeatherBB/view/misc/rules.php
diff --git a/style/FeatherBB/view/moderate/delete_posts.php b/style/themes/FeatherBB/view/moderate/delete_posts.php
similarity index 100%
rename from style/FeatherBB/view/moderate/delete_posts.php
rename to style/themes/FeatherBB/view/moderate/delete_posts.php
diff --git a/style/FeatherBB/view/moderate/delete_topics.php b/style/themes/FeatherBB/view/moderate/delete_topics.php
similarity index 100%
rename from style/FeatherBB/view/moderate/delete_topics.php
rename to style/themes/FeatherBB/view/moderate/delete_topics.php
diff --git a/style/FeatherBB/view/moderate/merge_topics.php b/style/themes/FeatherBB/view/moderate/merge_topics.php
similarity index 100%
rename from style/FeatherBB/view/moderate/merge_topics.php
rename to style/themes/FeatherBB/view/moderate/merge_topics.php
diff --git a/style/FeatherBB/view/moderate/moderator_forum.php b/style/themes/FeatherBB/view/moderate/moderator_forum.php
similarity index 100%
rename from style/FeatherBB/view/moderate/moderator_forum.php
rename to style/themes/FeatherBB/view/moderate/moderator_forum.php
diff --git a/style/FeatherBB/view/moderate/move_topics.php b/style/themes/FeatherBB/view/moderate/move_topics.php
similarity index 100%
rename from style/FeatherBB/view/moderate/move_topics.php
rename to style/themes/FeatherBB/view/moderate/move_topics.php
diff --git a/style/FeatherBB/view/moderate/posts_view.php b/style/themes/FeatherBB/view/moderate/posts_view.php
similarity index 100%
rename from style/FeatherBB/view/moderate/posts_view.php
rename to style/themes/FeatherBB/view/moderate/posts_view.php
diff --git a/style/FeatherBB/view/moderate/split_posts.php b/style/themes/FeatherBB/view/moderate/split_posts.php
similarity index 100%
rename from style/FeatherBB/view/moderate/split_posts.php
rename to style/themes/FeatherBB/view/moderate/split_posts.php
diff --git a/style/FeatherBB/view/post.php b/style/themes/FeatherBB/view/post.php
similarity index 100%
rename from style/FeatherBB/view/post.php
rename to style/themes/FeatherBB/view/post.php
diff --git a/style/FeatherBB/view/profile/change_mail.php b/style/themes/FeatherBB/view/profile/change_mail.php
similarity index 100%
rename from style/FeatherBB/view/profile/change_mail.php
rename to style/themes/FeatherBB/view/profile/change_mail.php
diff --git a/style/FeatherBB/view/profile/change_pass.php b/style/themes/FeatherBB/view/profile/change_pass.php
similarity index 100%
rename from style/FeatherBB/view/profile/change_pass.php
rename to style/themes/FeatherBB/view/profile/change_pass.php
diff --git a/style/FeatherBB/view/profile/delete_user.php b/style/themes/FeatherBB/view/profile/delete_user.php
similarity index 100%
rename from style/FeatherBB/view/profile/delete_user.php
rename to style/themes/FeatherBB/view/profile/delete_user.php
diff --git a/style/FeatherBB/view/profile/menu.php b/style/themes/FeatherBB/view/profile/menu.php
similarity index 100%
rename from style/FeatherBB/view/profile/menu.php
rename to style/themes/FeatherBB/view/profile/menu.php
diff --git a/style/FeatherBB/view/profile/section_admin.php b/style/themes/FeatherBB/view/profile/section_admin.php
similarity index 100%
rename from style/FeatherBB/view/profile/section_admin.php
rename to style/themes/FeatherBB/view/profile/section_admin.php
diff --git a/style/FeatherBB/view/profile/section_display.php b/style/themes/FeatherBB/view/profile/section_display.php
similarity index 98%
rename from style/FeatherBB/view/profile/section_display.php
rename to style/themes/FeatherBB/view/profile/section_display.php
index 8fc83a15..7cce9e3c 100644
--- a/style/FeatherBB/view/profile/section_display.php
+++ b/style/themes/FeatherBB/view/profile/section_display.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -21,7 +21,7 @@
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php
 
-    $styles = forum_list_styles();
+    $styles = \FeatherBB\Lister::getStyles();
 
     // Only display the style selection box if there's more than one style available
     if (count($styles) == 1) {
@@ -98,4 +98,4 @@
 	</div>
 </div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/FeatherBB/view/profile/section_essentials.php b/style/themes/FeatherBB/view/profile/section_essentials.php
similarity index 99%
rename from style/FeatherBB/view/profile/section_essentials.php
rename to style/themes/FeatherBB/view/profile/section_essentials.php
index 3d82ca0b..b45114f6 100644
--- a/style/FeatherBB/view/profile/section_essentials.php
+++ b/style/themes/FeatherBB/view/profile/section_essentials.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -209,7 +209,7 @@
 
 <?php
 
-    $languages = forum_list_langs();
+    $languages = \FeatherBB\Lister::getLangs();
 
     // Only display the language selection box if there's more than one language available
     if (count($languages) > 1) {
@@ -255,4 +255,4 @@
 	</div>
 </div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/FeatherBB/view/profile/section_messaging.php b/style/themes/FeatherBB/view/profile/section_messaging.php
similarity index 100%
rename from style/FeatherBB/view/profile/section_messaging.php
rename to style/themes/FeatherBB/view/profile/section_messaging.php
diff --git a/style/FeatherBB/view/profile/section_personal.php b/style/themes/FeatherBB/view/profile/section_personal.php
similarity index 100%
rename from style/FeatherBB/view/profile/section_personal.php
rename to style/themes/FeatherBB/view/profile/section_personal.php
diff --git a/style/FeatherBB/view/profile/section_personality.php b/style/themes/FeatherBB/view/profile/section_personality.php
similarity index 100%
rename from style/FeatherBB/view/profile/section_personality.php
rename to style/themes/FeatherBB/view/profile/section_personality.php
diff --git a/style/FeatherBB/view/profile/section_privacy.php b/style/themes/FeatherBB/view/profile/section_privacy.php
similarity index 100%
rename from style/FeatherBB/view/profile/section_privacy.php
rename to style/themes/FeatherBB/view/profile/section_privacy.php
diff --git a/style/FeatherBB/view/profile/upload_avatar.php b/style/themes/FeatherBB/view/profile/upload_avatar.php
similarity index 100%
rename from style/FeatherBB/view/profile/upload_avatar.php
rename to style/themes/FeatherBB/view/profile/upload_avatar.php
diff --git a/style/FeatherBB/view/profile/view_profile.php b/style/themes/FeatherBB/view/profile/view_profile.php
similarity index 100%
rename from style/FeatherBB/view/profile/view_profile.php
rename to style/themes/FeatherBB/view/profile/view_profile.php
diff --git a/style/FeatherBB/view/register/email.php b/style/themes/FeatherBB/view/register/email.php
similarity index 100%
rename from style/FeatherBB/view/register/email.php
rename to style/themes/FeatherBB/view/register/email.php
diff --git a/style/FeatherBB/view/register/form.php b/style/themes/FeatherBB/view/register/form.php
similarity index 100%
rename from style/FeatherBB/view/register/form.php
rename to style/themes/FeatherBB/view/register/form.php
diff --git a/style/FeatherBB/view/register/rules.php b/style/themes/FeatherBB/view/register/rules.php
similarity index 100%
rename from style/FeatherBB/view/register/rules.php
rename to style/themes/FeatherBB/view/register/rules.php
diff --git a/style/FeatherBB/view/search/footer.php b/style/themes/FeatherBB/view/search/footer.php
similarity index 100%
rename from style/FeatherBB/view/search/footer.php
rename to style/themes/FeatherBB/view/search/footer.php
diff --git a/style/FeatherBB/view/search/form.php b/style/themes/FeatherBB/view/search/form.php
similarity index 100%
rename from style/FeatherBB/view/search/form.php
rename to style/themes/FeatherBB/view/search/form.php
diff --git a/style/FeatherBB/view/search/header.php b/style/themes/FeatherBB/view/search/header.php
similarity index 100%
rename from style/FeatherBB/view/search/header.php
rename to style/themes/FeatherBB/view/search/header.php
diff --git a/style/FeatherBB/view/search/posts.php b/style/themes/FeatherBB/view/search/posts.php
similarity index 100%
rename from style/FeatherBB/view/search/posts.php
rename to style/themes/FeatherBB/view/search/posts.php
diff --git a/style/FeatherBB/view/search/topics.php b/style/themes/FeatherBB/view/search/topics.php
similarity index 100%
rename from style/FeatherBB/view/search/topics.php
rename to style/themes/FeatherBB/view/search/topics.php
diff --git a/style/FeatherBB/view/userlist.php b/style/themes/FeatherBB/view/userlist.php
similarity index 100%
rename from style/FeatherBB/view/userlist.php
rename to style/themes/FeatherBB/view/userlist.php
diff --git a/style/FeatherBB/view/viewforum.php b/style/themes/FeatherBB/view/viewforum.php
similarity index 100%
rename from style/FeatherBB/view/viewforum.php
rename to style/themes/FeatherBB/view/viewforum.php
diff --git a/style/FeatherBB/view/viewtopic.php b/style/themes/FeatherBB/view/viewtopic.php
similarity index 100%
rename from style/FeatherBB/view/viewtopic.php
rename to style/themes/FeatherBB/view/viewtopic.php
diff --git a/style/themes/MyFeatherBB/base_admin.css b/style/themes/MyFeatherBB/base_admin.css
new file mode 100644
index 00000000..c86ecfa6
--- /dev/null
+++ b/style/themes/MyFeatherBB/base_admin.css
@@ -0,0 +1 @@
+#adminmenu{float:left;width:27.5%}#adminconsole .block{width:70%;margin:0 0 0 30%}#adminconsole .block h2{border:1px solid #d8d8d8;border-bottom:none;padding:5px;margin:0;text-indent:10px;font-weight:400;font-size:18px;background-color:#f5f5f5;border-radius:3px 3px 0 0}#adminconsole .block .box{border-radius:0 0 3px 3px;border:1px solid #d8d8d8;background-color:#fff;margin-bottom:15px}#adminconsole .block .box .inbox,#adminconsole.block2col div.block div#adalerts.box p{padding:15px}#adminconsole .block #adintro p{padding:0 0 7px}#adminconsole .block #adstats dl{margin:0}#adminconsole .block #adstats dl dt{font-weight:700;padding:2px}#adminconsole .block #adstats dl dd{padding:2px;margin:0 0 7px}#adminconsole .blockform{width:70%;margin:0 0 0 30%}#adminconsole .blockform .box{margin-bottom:15px}#adminconsole .blockform .box .inbox{padding:15px}#adminconsole .blockform .box #stopspamforum span{font-weight:700}#adminconsole .blockform .box .submitend,#adminconsole .blockform .box .submittop{margin:7px;text-align: center;}#adminconsole .blockform .box .infldset tr{border-top:2px solid #d8d8d8;border-bottom:2px solid #d8d8d8}#adminconsole .blockform .box .infldset tr:first-child{border-top:none}#adminconsole .blockform .box .infldset tr:last-child{border-bottom:none}#adminconsole .blockform .box .infldset tr th{width:15em;vertical-align:top;text-align:left;padding:7px;font-weight:400}#adminconsole .blockform .box .infldset tr td{padding:7px}#adminconsole .blockform .box .infldset tr td input{box-shadow:inset 0 1px 2px rgba(0,0,0,.075);border:1px solid #ccc;border-radius:3px;background-color:#fafafa;padding:6px 8px;margin:6px 0}#adminconsole .blockform .box .infldset tr td input:focus{border:1px solid #51a7e8;background-color:#fff;box-shadow:0 0 5px rgba(81,167,232,.5);outline:0}#adminconsole .blockform .box .infldset tr td textarea{margin:7px 0;box-shadow:inset 0 1px 2px rgba(0,0,0,.075);border:1px solid #ccc;border-radius:3px;background-color:#fafafa;padding:7px 8px}#adminconsole .blockform .box .infldset tr td textarea:focus{border:1px solid #51a7e8;background-color:#fff;box-shadow:0 0 5px rgba(81,167,232,.5);outline:0}#adminconsole .blockform .box .infldset tr td label,#adminconsole .blockform .box .infldset tr td span{display:block}#adminconsole .blockform .box .infldset tr td .conl{display:inline-block;margin-left:3px}#adminconsole .blockform .box .infldset tr .location span{display:inline}#adminconsole .clearer{clear:both}input[type=radio]:focus{box-shadow:none!important}@media only screen and (max-width:768px){.block,.blockform{margin:0!important}.block{width:100%!important}.block label input{width:80%!important}.blockform{width:100%!important}.blockform td,.blockform th{display:block}.blockform input,.blockform textarea{width:80%}.blockform input[type=checkbox]{width:7%!important}}
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.eot b/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.eot
new file mode 100644
index 0000000000000000000000000000000000000000..6170eea058e048efde81c3818aa506d0a806a5cc
GIT binary patch
literal 16442
zcmZvCRZtvG@aD2Cu(-P|?(XjH?k>UIB`ogl?iyTzhT!gQA-DyC1c!wCRo(sT9`0tU
ztH1fWtNUdhrl(s_900Hs0|0>kZ4lr;jSLSD1OnlJFff1=7{Gs=vN{_8P@?po?SEGK
z{{c9|6P*9U{a=j(kObHOECCh(PXGj<`XBcGPXGWkfaZVt(|;$Y|7;%rF+>2}{}_+|
z{Okd)0GI!~IRLEx3HyHn08syb<3RqOC;)(@mYn+k&Huj<EFdoiz)lU|*8_-2W6hq&
zP52q=P1+f`D~9+{TJ?A^e`1z-qJ4ss3fmzX`5O0l|DFLZ7msgo(l$q_PtX?U-tq{S
zvh+4DCC+R28nNC!S+SC(m(XP-d~(faDwk-=F;G@^MRdy6*yU>_ERfLMl@Jqvw|1$k
znY3P1;ms*BXrao~;eX|%C`4w|3t%zMHc*@}NMhvQTgj^HVox(RI)X<$SgdswK5&5V
zO^nWMM_XpXQ9#cS9A06~i=$!+sn*ZRY>xnMp)ZloNNI4zEwC~gI%t>QLKT$}5|T07
z=!$V(wnAYPkf?UhnkKw`$yR1Zt#)5F@+_!=_kBy=-m^=s7_{}8+Co_~AKl(W*rwkP
zAcDgCMaexuyWh1MHKN%m4rwO~xaE$umpOCaQKHCreGi3q!<8hZWoJ8P>t`uHXX}5q
zyTOnS2>GMdAurd(bBQ^i*c#+5Zh#jBBfHkZG=fsrrLn9}6(K~)%K@f$5HDj_3x!c5
zooN;fhpBw|0FkdY&(eEv^B*LYMIR^$MAr;tyO9m~Cx??zrZJso;gSjn_D!8j9`eu!
z3mY5+c5%_Zk5j~YM3!@oo=I&>Y5+Ar=h9RrFg&5B;u6xl$`MKaK!2n<$d_<;_!A&0
z)*k)joSLxtKZ(Dw8Gl%gm42rQ)!ic_*T>SP>UE@MOj9YrNvP8Q4xd->21$7kDrzKg
z?b}&gkNI`-gF#u)o7`%6!WTsuMTO5%h((C5$Y|NGOKg$<))JtY-#@p-A1^cNKdPi!
zE~iaZ=HSA1^f9c}6y$|x_rR&zlk}XtgdL!{Z3HKG{i|Vn4A~Gp=&=4{G-){!5-<{i
zyqe6U`<$v_DKl*qx%jusSIze?@}zcu6?rJ1Fp~)amVsBX(yzr*p=XFtBN4Pzq#?d~
zx1c6vZ`Nk#Nh}a1ci!I;flv$??#4ABf)f(UyS<V5q!l9eOdfeSG_nY8C!$NRv+Wy!
zq);p0<fPsc&~@A{AV}4NL&t4l2$@D~*19#Cq+QJ@JxB?#-+%T5V;}`tBNsNv3-An6
zVGnqVtUa5dNthskk<YY+UY8Ev9%^_jNI3McH2xIkCH``DpY8bSzn_jYYH@nd?-*~q
zb+PW#_w|#GU6*&?+PJZ|lL&XjDtHTTVU4y&a!GgZsv;b$J&7?n7WB_M?eaZ??sNRA
zxmaAkFz|0SbJ<kQ>ExIuQT@=&7ri2T+Sb(-uksEu`UknG{eAgZ3kF>I>8J{CYG$G#
z`cH8HrC2F#_uP8DG%gR)m4ED#wnb4!Tf9m{%1D{3QDO*t&b{v)OULk+5#`^rj^uxG
zfJf>zN9!$L0cRz{4+@=|@;Q0Mx_{Vph(CMAezsr~_)MQ6ArRQJi+9&q`K{p&#un;^
zxu*^7q8V(okauG!g5zdVOfwQEnUhpxr~+c6%!$|yh;t}mv%_9BgSpKix#E!L0SOnV
z#2IL0FAry_s*<O+#lqB_XSJD-gjAIgtd&-<@?4L~j^oWvFp;rc&L3Jrw_NshptsFA
z5>}JLB;1MOt;IzeIkXqUrQd41Ce$`8fTb&i#jg{03};8Z@#`XT+kV5aqIyc`!0NmB
zFom9aUo90@6fC1mY|)@s+CsSs?SXx@_yfg-J}Z{2d$R>`{lgA*_|b;Ey0*N$=Ac+E
z@vC026aH^<-|-=4Bmu#@z^Fv><=Y(^`M4w%6+Ca8l2*cLsLJaf(jjwg<pDzLI0!hE
z49ZXQ17-=rXP%3>BeK5$Ma(%6=K^Ed5z+$T`Fkl5TkYA54GSr#<w^#TVRyR>F!?b2
zVH-)tlp*+i%_)Zi;@=jd<JjHB8{Ji@(7*@bTPN(B($d*+*ptuTr8pmoBDKLbqQck=
zMW`X<EQd}YF|Jm=B7K7-tVL>hgQQ>!;{hG*lo8?Jjb65)rE=+!GfyBo?+=ZeZ5~|O
z9hcEjHscB}IraCnhV5n?Jq1}c=5rGoY>wA+1G>Q+vHG+eoEhS6NTFyI;+qvVxXPS3
zXPUTZ0p~HEGiuKBvi8r&U*uMx`JCGx;?gAdRBkA{ZAAyrqrcmRR!r#z+Jn6GPafkN
z+(%3p==D{RLqh?Pyz-fX6z<#w=~KO7mU$RsrM)Q-xVEH`uAKq?Z8*Syw4FR#0i*UG
zq?2(T|1`PJ*2&@`OW9N2kTYXafWs{7uj{7Yi9*dKYlLOjXg6&sM>2;XB*jcvju@wZ
z!Y-gtN0l>8(((QwL65%4(5P0RV;+c0p$C^k5I88!MOc2gh*G8h%pa*)ALN0o{e_f=
zta45Vq{XdS;k6Ke&tH$JTu2E%OTem-AgLmYoP+nMR*sb41mEYXn#E_gFyNH^WY37x
znEu!B5mSlx6ShnvfrxR5J;QQoLy(4`JzZEyTFx_ck$!aY0WAT4WVz{r-HgHQ2UY^3
zeW!FeVwIkkc|W7=R+&a*0B=o(h3Vfq8UkJZeHM&->q2%M3Ivf^FnZkK*#f;JIx_L}
zoL)X(7C3WLSSx#|vAdvYP<PTtAPA-VdDqk}{wneKl<_5ZY6nL)yDfXDNqJ7Uq>8(d
zq#xI8=GZ||GP8DiPg-j1&J!wq$CX|X6Pp{;XCRp>g)K>WIU{9WIuaL26Jfw@LzBk5
z#F<tQPi8}rqPwMulZC02EN^|~Oh2UrDmz>v6v|VwS1?a|50KnD2W28DfO6(jJoNKB
z`S}B}**wD&(;(@7rwBB$Y2Aavu>$Du#``>UuV`{hbEgPsIM7oBh^E~s0@Wm5<=}86
z?(kq1?n#A7<p7X5#$ylmkzyK(ekt5KSmN-{-VNp>I*VTr`;NHB81Bd!7tOfro^N;>
zh5loN{caB>978G_xWi#d{1wq+L8y87-a@Lk*W!cJFzRZ-Qh5JI6kHq<-sUoLsXf{m
z`!#1N=Uk3)WUHjt6)$ZVb`@fo>wh#QW~ovpgbT;cTRb9Y0Y@QLv$>>lMll5`lG0MU
zo|@qgRt5gZsi1b)b74zb1%BD*giIz4d=AYD9JnXJ5@6jea-VixRVolpo;Ymdq6_oQ
zO)HgAd<HJ*OQ<lsv|<V;(2_<TF7ySf0ywn8U8@zNAC(Eg!QZcxhlA%|svv}S;;x0|
zcZtemvPQ9}l;?!svDZX_DJImFnAi&gR^Wm*rdk^$=ossn)CEU%ptHqL22CWG6C`cu
zf}n(AVj;Ruxinn(Xw70<$(Ify$hmrNk)L}DzMcO|d{g)72|e#=v0_;qyZ`SnyYk`r
zM#I3OfD|Be^PeB?WfK^}Xsr8MD)SU_KlAFVbpOs%SUlN&A;UBCocGh8?LO^cHuIbS
z=vFnb=_>Es;S$?AEH)Qy7X|EdKMCJcy0;0x2pv&G7p(<EFbhAljZnbOXYxrRqm$Gn
zBHHmIghts`$WA!SD;wHcC96nB#Gnar0I}rxul}VZheQ43YI6>6JR<ziV1d)vx=Fg>
z8qa5xOJ;T>g>)K=x{r(G)LDtEIrXxUGgKr|7@426^x+>qKOtlb`2#i@Og?eZP#u1{
zuv_lX&2&RyTua_%HB?hYoBEsCTOIaL-0#VEygj<%<QPK?s$Z1hF8Zbv%Z=y=_6;y`
zQmgZP{IpWsFXU0P|2v3%BZx}j$Ky%Wl)uI&yx$}W5)BRK&PCFF*I!OneiO7G`Vu?4
zp&)>qCcm{=FOK*`h6NY)cg|LNPbApA{=`MK<XaAij>V||HFsnN>v#5*soKtx=B9@e
za|_w>?hu5lgL*v;Kj!+^rQytjmOsKjXm~FsVK#q=m#Nc_`HBBm8zlRKh(dtJ6+Ai8
ze}yUg{gaZB^y|4dRc{t!oD!90l2YUtQz~Wm=!D7`e7jM)u(RV>V7d9`K2>u>ThD5@
zdDf41N(zxJp=8TWhD9_chm({tAAw!f)d>wrZ^I7d`o&6IjXE6!C8_Ta;uWDgm|cmu
zm%oTehfUv`^UB%!2$<pm-?6o=pS0lWINuau0*J5nOk?|Z;LbXBe|9T8UH{hn?D<ra
zens|8K}_gjB>gcmudM$5q`^qxl`*VQZMWTFNDbwTDdMdsn@mlPezi_%{-DRB4ep}O
z<ZacM;%(LNAX_<`_WNZLi-rc)S`AIhA}C|&42s>USSsg|X_KTv*?6Bvfrc7k*cUUI
zjS9n}%&n-x$RVRaSd&mUmCk{b$|GyEVNrlP!L=~S$UM%32?@Z^1hIm}A6zj+9%69s
zAQDmvU?@;qRl7<@j=|}6x=0ELw~HZp_6^Kb9g5IEf)O|jM7m^$JcNZIOTN|Zj1c*5
zje{e^p)^kHBo0xqg`v=+OE3va3v5P$_)*adcwc@KnobPhCo)H1Z-7mhEpg*%Ml)PO
zpfBa7)um%^0T4atcZp-FLy=IxfbNYuB>hRl#88!M83#qwIuc^{sT$sg7!1-p6IUOa
zb1`5KTS3NlV`E!yv8=0$_^#|bnfP8f9nRk~J+&XPE~2VRy2_T4Vcm}>6q6%*De+vQ
zAr!QqQS>#yRN7NSL=f=L*-N{|(kfpf)R(;{X)9>4g{Q!#M82WYtJuK0G>PGc#O||)
zu+*ZhodUu{h4q4ckE6>BvTJcFWVwQ1VJ+n$?Zu_*VnisyJ8v&VynR{Xi<@Vm7LoOs
z#ca92Kl7;}NmP37z4rw-u8q;8Vr$Z>LfXU=b21h11LfjSG4PLt3N{OXbV!S#50+Lz
zMWfKom{O4H8(pBu>{J(3@<=$N#<Dp~4SxkKMglos(w^7%P^wECbbL@#*?<jg2Eh~>
zHG45Y>maSJ6TqT-fRHw%T=VB1<HJsnJZS8g83b{?Nm6grp2BZV{#c`kEQ+oTLSu&7
zHM8Z%6>)W+H8NwAi8bqg#6pOWgKQ=(sBr@VKW@+bvxH?Pvs>jssDR0QWEd3uX82%G
z*w5_}lu&%L+=xO59&xk})bEP~t|UK<JU0m{2d%-hAer?FRPAr=zaii!*3jZ9EMT*n
zGRTizx@>`DKp&$886#Bu7M_{uM>xGfG+Ze;4=m=MwKL2SADs`G!p~t-fVl6lAK%w|
zT&xidSg~^i!j<R&KYk|!i8FfY2w*;pY;+5bDQT!2x#a$i2)0$mYY6xz3B0F<SW<yP
z8dt5QZLbFcEvVW>4nhP3$P;sd$RUaNZtORdM3-(tKXp7n5;Q9SkZV*5^z9q0bnpv?
z``r#;5pQ@zSYeciK>jUvo~~w=@J2CavJfg18dbZ{7|@ljHiv$So~fm|Qs<pGdd!}O
zBH%xSZ?_2}fvi&w$3oQAs%=7(G8q9S|Ivd~t8SRtWhke?3TAkU^2bpP-uc+Yzj)sY
zw4+zj5T5zIm(9gaMr%@Bf^dv8Y}@~H#|W^Cf3*L0DjCnwBMYb4R5FO(!I2_aaK2YU
z=z9@E(ahU9<52FpirsrF?@5CcLr`C$XBXkkGw!6bDp}~vjPkI+h$tJ?tfks;D%E$0
zVHAKETQUgG&VorBNxA1&a=^YTVcHBAM}fnotW4U7c->mT?(;~Q+=-6eq2L6T6rW#w
z=H?`XAxDjZ=6|cKQL^KYl1zEJZO4(&)n-3fvzty}$dHxf4>4PQf#X|-MMp1<AlPA_
z67Fc?yyIR#;OJGd6B#bvk>|@zl0m&!kt=Q(Ed9hP1}bdCf2Sr1wu>}HaK*K&@=W(*
z=<;olf*;oQd!D7nN3DlQVgZPGsB9<l2DS|yqS2SmVkeHatLflQ7D$uSk4-K2<*z<)
z_#1_%4_#hOxDkbgm=A*du>aB;ynQ6#ec?cV!|jbm>Q$UE3o7~M7i;?Mp6?n%IgO2G
zFb(eFPSJ5zQv(A+VJs<V1o(?HZGI_>V3tnlxqqW*b(RERxmUV%@{GG8oQX5{&nt3N
zdigD8a~iG;FnzI4!7mcX#xG11;k*s40<i_PKg7?gaB%ny^srR0VfQ%+9@BkYwz^9*
zJ)BbTi;YNoYQ$2Qi>XNe7pEYGqN(t+S%FS5OhHgUtovyWP%uP+GLEyR&FMJy-D5_W
z8^%Z@-M%0&EN4lJLQ?Z>Qr)(;3T<d{TT2at0G3j}G(QH$36$S{jvnQn{QZMzFYN7C
z3+LXL!M7_j%qPz^VAg~;fcF4vQ&NZT6iwTS9zN4+ig$m)d}tTzUPOXe9=8{d>RdH@
zlTAfm5M*uQL$xEI!<bspIqWyr7GqUItMaG_8L0c1B}Bn{4@k>PO8AJP7gLnnOFLF5
zolhWIU$-{VC5IRC5=IZ}zs9v|=Re16tY*Ir*^-PV5Qq)=%6c#1G_m#v;_pr?y`_DK
zrxAx4F_T{5&7Oz%PHzDDSbHj=rt3k$6o&WTxKeX>iVc9KDIb0ahuL~Om3d&9(^JY)
zDCu2+?$Khg2e?I1f2mVvj_NMsBEY6~s;|2^V)wHL(=3EwMH9ihZ=R8*QXsu#hOS-@
z_^R~9)6S<ZTpJi){@_>AN)BO2saX-G5z{IG!EmyFC}+Xd8XS1;)AfEtW}go{M$)*V
zWFgupa6-&Ox8#465^GMWfw7~at7#<^sZ{XsCMJ1SL~D03OOfG4Sca;qYzltVKR4oX
z)T)Jj9i+x>sX;$x4?9>~<rZVc<tVdE<()K++?Ji;0qY&bN>=98%EelwRn+$%xcy>4
zB}hRGQ9YE8S@Ux6lAS>-vJJ0h)r|>9vk}brgoZ@2tEkNCf?O*dFe#yZ=G7YclvvL0
zdv>o$wl`lTevLsw1d~bqqsK}As89Y=4M|5V6V{z3Qb}dRK-$J}!P|ciT6e|K_#CTg
z?y-r})U8iAyq=Az<v|E|UT<7gBimZxmOXP8BWWL)M*JMMZfku!dn@I(YfDg>QI{Dl
zTenp(Xm8ySAzTwLKCFKZHE(YP*=BDoHZW|N>NjSVFLpn&azqf`j~GAZl*=QcJg0H|
zh;?q&DONPj4x1dJhlV~!HFYo6#D3b5RTnCcJZ5Jbu797rFdSv)Rn2iX`;i$gckOT<
z9qAXu4HJu|FmNYh+!>BW_$XG!@?}mjghv(Ih{5F+w@`?|+tk!$`rS<CIdEe0=&$TF
zSMm<svh=2&o+SZ6`y`4d0De4^_mDs<k~1n)_iGI^cwiESXy!}$l5LP(c|mZAmpqGY
z%d;e=y<LmynQ{$RyN%<InoITHNTfDZ7;}eEUNHf6T(>L|ye2&*^NBxLL1l{t=ke^G
zzlM;M)2qud_s)49rZWZ;G6x?xQbtM&39%PW$dzyhlgR`SPv)|ff_NR76aim~(A7X~
zG6sGcSV6bYLi$Q}xK8>EysdOfjl0~iecP+C3L@M(1~4<CL7TC=(`#`Sfw`4EMnHxq
zeyUllL@V!VUFr3ChJ<@EXB80}$CAdl`BK%q7V9^W1fg(6Lsh-qo^&gtyJR_fbz91)
z7NqL0o8o4c^CnpknGtGZaVzWu#5~{ThjKTI%w18Jb;&C>^#s(VD5Wxm$@n@hk8t{e
z^h2C^_8=dj_%HrgR**93UcVQ+KZ0`OId|GC-t7J=w3rtUCaSr<&A(`wRp?`QGe}}s
zP@7~uql~ILgy!YaVWxfw1~2rm{UW1>`%rKYKQGKaqAd_g`Q8Su{-ko1WK`!fE26fP
z)|`~e&mXTk15+wOUrNFzmXbwErn#2j-7ecosjZM1H=9=Qa`8AA$z!KbE?*Nuk`gD6
z@JD?zk%w)OQ7{_OEay_f-1C!3=cA{<h_TQ4Ftox;Rd*Hb;ypdYiP~+DI4w3dA#(J`
z*W-6Ti{3b*o&nRSq7&-h{fL+3Cb&7-`jv{ZyorLuk!)flzn*AWK4V6=LM?y%8@iqO
zTrRj~&mR^ElFlujST?R01M-I=PhxGTcRb4)P$ZxI>`7BUKCeC-{lN2b{iaxGQ%eG!
z79NV>2yC+<$n>T3tyvaq9v;j_<=RNG#*#q3{O_6}9p0&~Gh#1Dz#2-S!TV2d%kRhA
zm~(op$y0S^DQ=hxK7Z3HP}|DC2>5tVDZ=4qhKJ@VxB8TEpD>Z+BIQ5)-HWKy?PfW|
zM8aXofEmI!F|6$l&8ppm{vy3cQ5<Idney8IO6tZ!yPa1AA`_1m_w8D4PIYD%*5uBM
zM^=LiW(yZKmWIxuydt8pX3$EN3@fwLj1zlAwbXO&5h5O=GEj_~JCn?uJ&on%I)y>|
zF*#td@3*wl{*@MOunkG2O2BWe6ZWi=x)Cd_qc1MFP&ZphU3QBB@raIc%%?^oCmX!Z
zo?VtMa?htQk=V${lNVr}?z#|wvIm>HUt`GPW|0mQZX(k+Dvjz-qt#KMgr;2LO<gnS
zB9F3v>VkHF+AW8RDf8H6zwImS!^$aYBh)iE36?NWcE!`fqxQF<G6I{J`#H++p@C|d
ziGh-V5Cp(TUeVsqY@d8Ul!t4Hq0vZ9d9VnOHp+|x&9)Amo-XTtcQ^hzu6iTOs~Fd}
z@Lcgoh%Ve|#HrSk|ETqN=xARSgCVM9#~PvPZQ(MGluN5*#fS+3{&J{A=e*e9#%lG{
zntRsYafImKcn=+b`ztIzE>EI&OI6l&bF}ybu`e`bT?r96CP_eaHrVNG@&<<XhPvnS
zOx3nUP)`h%$ig#jd*%hI`dd35PBU`hrYM7!SU}>AiKyPim*$twDu%lGWngeb{T{^y
zu<hP9>-F`^p#psoV1chp$HyJ#Fos&y(p@u`JtmnhM{8mb!th^US}mUMy7(=4T(A^<
znO@7%p<}u9h&|){Rp8q=N{k}Q?SON2$Ialg`p=UNgZh!r+I<#d<F<XqD{<)-<>vRI
zqxX0fRJyf!E`Keks(&0sej)ZvMK<S^N6ZvtLab@A*eT(<Mp)MvrmR|92d*=l>)C%V
z95hN+38Ril{+g3YkNC+J=`59`hQW*y>%4-+?-RI$VL8`1-_JVTAgW^s3Fb!g3+g1k
zhA2@{L1R25=6b<E`0Wko*gsE!81L9HeAU^9Kl+6TJzoE(!^!*rocU<}ynNqbdEvv<
z@+?AUy{N{Ox(3V@C?StA{@5vXr1<kJYp_;TVeC5lYs2+eLQcC-pM!{(e0`$H71!Uv
zg$~Wl=WP@~mF=Z?9(D1K5H{?-B*-wPgBdXsOE>+nN&m$O<mz~P8bU>XNOZ`w6ZWHG
zJT`<sb&4QUWr~V3c&05QHU77@Pj9w!%i=S$m)w^JVBB4kW35{B47Lv(mL`Lg)+6WY
zalPHNPBIcH99|}^sC*1inL`Aay5SCk#HRJIUASOY)&&>aI;Qc~6A}?F^!1%#=!e(U
zaaX375ox6QsIiy0^zB1JFB7XoTU0z>nKQc%qow$iRxb9@H>HroOy~<zK72@!jHe#H
z(C|;h2w}=9NQai}(ArJItJ2M1?9|NPz!KS=%cby!pAl29r0O^@-|7xT)AwHP|Nb=$
z`}ch#77mbra?yBwK+IO5$7`R&o!j&3_|+r#3hOW@9&hx;ElyQ!*{ZYE=V)(|oLH-^
zr#;d{Of(2e!dP7+l-B9zOPDm?O02}$*_SActX*0^Zj<4N*LbHMfdSoV5C@GMo=)~y
zf)wnUj9&TJiQ(Fc4{0%1xpG4x$7y8oy7O@S`~6%xiex>42wtqm@OSm|9N0m<br@kq
z!+RxMh1LQL%ZCGY<4<^a>t_rkk_y%=rG!QJdvEW48-n8RXcjW5mT!S+6;hLwYb2Pb
zBNr0Cz50%Ut@JqPEwUOSN@q3fj|5eZG|GF%Otwv7-3ECtv_CBPG*@39bmOgvot)F`
zAFs^@l0{C^+u|olYEQ`)`L-0~Je}hv=D?Ku-9hw35$iivuuH8LiMg14zXkW{a>K>$
z(xO)@Vyx-L)T$L~T*n!HVH_Ow?6f6!M?D6uoFD+_GHDT4P#`xPAVPPTG`yZ;T;Ck&
z*^SxDEqIF-m!-NPL|m~J(Is0Xd%bvycZcSE)@jYN@d$2M+~3(ao^Xgcg=5c1GKC=2
zIkm76?K|{nGgK80kiM}5ZinV|Zh(fLl*kTu;7d$HZOD<w_2%3Z9EkcuvfVvGC4nqb
zzS-6nqVQpez%?(cTK~(Iqn>Yg3}N$+tjp==WMVDtU+ni<Utg<f4SU!w`HJ~PLR$b5
zR<d-88Wsa9I?X0MuJG|PUi^{kE6KZ#r9AW&{kn;=>d3#6mwSv=E38zbP5+HTBLNO?
zJ8&k>?N-CwIg!h%oZHU^vJrOD@(ga-9e_3Y;#j|{WLWMx;zamQH}*p$rvU1$->5}z
zjlO{HzhRIgHD6rW=eZ#nTK<x5sBe>xnL&W>oN;;rX5eZCas|?qTzUV!c8Yn*FT`yh
z0XcTdhry&+sl`{RA$Cgk3`m$2M??#hA)JB4xVu=U@LE@fefDE(54>+yY@==8;u5g$
z8x7ULT<nsONdwXhV(>r9Fp+p@qoJ7ZV@7cFC6X$(r+I~V$ywhz8%ke@#*RNkmg#Gr
z=)|R;DRl=6UhfRa*hJzZ;UTio6W3W#$Uu-&|LY8gJqJI_3;+D`iYF*NwpNg+#K!vk
z4+LJeNdA~oG(W8{fgg69=L!md!JLrfRLeaMaaLb%0BrfED5s=G2%|~da9+`{i;~L>
z<47>#0Km(V`f(#<@zbd;YV?B<aWuh;TE|fZ<T3p((%r>EZAtlM+t&*R6)l{i(a|jf
z@UALgge-#Od|5c99F)Tg=XD<1eioK%f#N|wx44R*1)q(vu$O%CY)i0_VD=*Eun$k)
zQqjaM@8#CuEU`X5fCFFX<dUf98pNe-C2@!XmOn?Xx$~|WYvwtg$4-hxDbq9oIICR<
zp=8wdB6Ghco0Z0E6lMw4!`bT#zrn-vjfMY;87(?2X$jvT8#fWdM#Ye`xB)~^iI^v#
zaF{zyJbfNfIkcUxmUrNG4V82;s?5P&KL3e?^t*`zM?D2LY!rb>bJIfE(p*doB~)D^
zGKpD#<ffop)1+jBh9?Ni=ss`qN<6T`0$M&_;a&h9i(-4$+yE{YIu@D6>Gc*gY_Xrq
zYa`$pCIY3n8;0?sS`rFA_#p1XfH;sk6TGFh{uAOlj`TodobIltj_fY*xTyBkra2?R
zOcV4=T*TW^gG0Q4R^M849nJfsM<B)8x@sUEwoXn*Zlp}UkAOwwAXT4vQK-$3Ga6B_
z%*sSKS2?Ves`6GS!xk3Cxk~GFSwikc@(kWR!g0ycbk$7)K$Y=)1oaZ;4;%f88o2bi
z#a@0!i<J`OF#$T}_-TjfO^{w}vIIwI9`d;!KTV@92PbfeK8t#T$3)W|XF(SzsWRd1
z4Za<+BT0c~kl#RMDjOqW@OZ`{uy(%jW}iPEb)@=2MnP<RYtv7|X7Al{0>ZupvgP4O
zC$CCmkP#@rhfv7xJyBt~M3bu?^>f(c)OPR1>WiAh7&Z($$_@rm%;39AMRJDp=;;pv
z`tJvsnckMshU36EiEX5vQ%PCtZa&U)s-&>-)kDMqlVl}Dq7Wy~lG1R}S+xt2g8KP%
ziORX<M!=~DRy*A#p70_t0rzE&(Iut!Utl=nTXzXeuJtvre&$Aty)|_CyoCN^qQA__
z;WhnTOGSibG~YSp=MpH!U9PMWG-ZpSubSUSX@3Yol2TS}%{eBC!0A4rkiT{6krv&W
zWHZ*+cu$2s`-xx(I)lLIDF7p1d4NY_vPqXIAHR68Z|6f3B2^`ih6E*7#2)7&W-0E2
z#3!$X&)cKDv(sinha2M;#Y~4)Jj73fJ|5B~CooUI429T@KQJ&gK@7&iO9eW%v)evy
z9&Sir5o-UhU5JN%*^QC`aKy8iMm1gZICz(#2D|&tgv&3_RWvMHID(YlKL13Mj1-ll
zHqa*^6)%k-qoDYNhXpnZ4KrAy2%+DQq3Ir=kdP$6bR+b2Sr|yk)z%@PT{H75c`go{
z=toEcLpK9>Mv+6Y6`x5b_Mob>GWU}3RSZ9+&#^GOjJU)he2|=EL4erwtvX6euwR&*
zQx~QgCcSWh+Lw8pJUe*G4|b6>s|!?HkXV_;e%_bGiNwD}800QL_b*CHif%dFqtW6k
zLk<u{Mff=#QG#%2L}D`?dtGAd3qvGKXmKg&unOt2;5a}=vfhzz`|Fc_d0(XzXF`K^
zZwz0mV_wP9iJ^=P3q&}<`GyEA2(2?hBT3maLQ{!#sW}!kfzqZ_XmH(#ShN7Y-R-+O
ztI37r;_vMA8r<W7h`-;=!|6qRge7102qmc}j`@zz@U$1xGAL}+N<kx%tRE-@uZRPw
zk4e&UOAjHr^}>j9lpo}FjO2E!GDA&9@QtmNPM9NRLj+?Kl6ck8pXTt!us$P_&U_yT
z2f=6}NxQ+|r9@;1LO`~bZs2%~=XNqxKQM+H5K3~oG$fB0-HnX##|Aj$9GLC0erB15
zNfW0Kg@`f0q6(4n#MiHAzYnJ~lbSiW!?SN1%v#_LC+g%NqFiquyjJFq)R%{(`ywKK
zV*gSi4wh%eoK)BOx|2Dmjk)fjLfwL5Mj&x&D?BJ_o)z8Y9`?s<q7~ac^hk5*p`mi;
zu<(u^Z{q+kXjRoGWjNwV;V#`_1qyzq2|T~D3f4{SBrg{GTA$r?6$(~OJUF$y+l`v7
z%$>JJ7QtebfVgpyCaWnp)MJ0yLrS>8vb;6Un9m%xyZbU(iz<_XUh*E3Y&jPicHym5
zMDrI`m}jFN3zjm+R?_2P4|Q@dw<DVhVxi2(OH+xdZ%+SfuhivxLQ2}RcYPU?!Tqjg
zfYF8~i_E)kJCbK8m@kFM&a@F;D<Nmdh+SY3m6Hqm1|=&39;qTMC=iap7@+}BFM#^r
z-zauEMr^gpA{5h_hh|I<MQI$~1?o+@tfLQaXoSfUUtR6cu2&FzDt~or66Ho9)Aik_
zb6=asvPLpdo<O--@~j1EXJA3=2=Yr(6X_i0ZAceleEbDRQs>gaipeqwqV>l_%BfQJ
zl$!}Ng{>!1L|{(AB|<)eZA1~PjCewN?mlcT?(us0IIiB|5OLhW*bw~=MQ6ec?`4Q2
zv#S^@DWeeY{ruBly3%6gGT}oNO{n;bNIoVJwKlPZDC4}|;BHiqyvJxiYeUIzXq7;#
zT|x3-*oha9rY($U!KH>}O3q`B^Lsr&PzC}2y57L)c`g7$6@4@s{9KiLMeb!iaB^`d
z#5Gx`_`8%v>Ll7=q9`ZUHel#CGN%u|h6GDQ=Ff8ph4Y5ORVl)V5fcNUgFhr-5|#C_
zwG$`iPm9NxvW4CDWm!y-p-fOnp_#_tU2N$HX`^D&#yjJp{8SuSG0tq}5N#mJ3oQWm
zqe#<ekBp?&o;^wTK(%D)bDt=UJRyCgfBHAAUM{XSE*cSCh|k<doMI#2($;0D;n`A=
z<XEKrcEc_G(Oa29u_yLEa;8mN@`=0=dB`mGWlTlt74dTMU2%L-p04pI{bBApX4KlN
zZ4A<@ZlG!^49;V<)i;X3EsD|mbsAN<V7OV;PsaJVxB@)BpDk-AlBqFp3h)W?Rj0be
zSUUL4yPg@5ykIWY5KmPp+JI&Q)i7D68Pi&=35Q5)T85S1*}mTYEOnVZuyCgGkTyGt
z8WW)5pJLI{F+J4%ah5oMfe(hFQ6Y-BqVYqv6q=lQehY!oYq&KqlIv5YEh|?f5{56@
zMrf4>FLt$mT?v^1Y285G?W}&0D)HS2a0Q#{UDiMw7WODlz60BDK&)Ni38aA`G=mMK
zfuBo;9bj<UCFR2@-c>g$I#eO+7A+Sg2ggXKbJuwENY9+CiP238q|~QZW7KH`dUYaL
z8!!_O2YK5MG|09LXLs>P*NE2puVy9J&pSL?qRmJu4(@l)=fet^+YX_z^$<1Uc+@g$
zdndH=+E63kE(Aj;wi8W{D;4$)`bqEFXxL@Q{g#|3-e8>rs#f;qFW1DwvENY@<M+b6
zgupraJs9BdWcD&g;^Xzu%@0OKFNr=OT=fNet0Y!qzV02I%GuY#cWzxJDsh)^->h}J
zJe=dlq>Tbo-ru&SPNS;L?O0FFl#5CdcfZa2bgvyc826|Mwf*5n@RD071<1_jbYyex
z5+!3UuH{~j3;H?)>?vwv+~b{zQ76hQ#v=l^t)xvbn(JFx6?J%bzHh_df-?wJkIR--
zM`WPiU8hO7S`E@k<-_vAX3BmnHgM^F%J-F7cj~NErfcd&&2k99bNsuj_ao;wK!NJ?
z=t_!(($(~7$8hJA3(Ymvm!dyOs?a+M!|5q5L(@JQf+%nK)5UXRU%H^mEAkjwj?5HI
zMOgAQq~UPL<L{2KIuWc#tZj6*k!9IbBBD#1GxmmjTm*JZ9AQR$Z~$4}n>vZPv@xQM
zZh@-3JhUQ^#!Rd1RJEo$pZ{+U+4s+3?lp%O*~)+avMMOU&+CY?XRGRe(gVxResX=U
z&2eUB@7VlqyQ*Q;3e7dvwJHsjC@W8Vuc4!5yZxH)QBL<nBe0>nJyVfV)AAkk^||dW
z;Jn(7qBZJ!0}Xf=8S$K4-R?WWf`%C}m&{BeXVV3G=R%ExkHe??7%`M6Peg*p1`C6~
zFr2m$#q+If7AHg+MoX4Fcf&os4t|uETah}(lfj?4JRC{aC;y(eDfAr*0jj=#$teVy
z1eE7xibj{pj{ktV=c{G3!xGNq%jB1;7TI10z<*sLP6*~LQROOI=g)t`B>qw1;c+JI
z$PgYIf;ETmZ0$`fgf!%RH&MYY3%#(Y0<I$Um8`|l_MOjD35~JWRQ3)@RsU>3la~zO
zkDYw}TWVdeHlQ}^Bs8Xoxy#;^8uz#DUIxx4DRRzFzWCwg3|{v~)1_Jy_``D;wastJ
zoQ_ZNUnyy3Rv4o0k0Cp_HV4W60s_(V-h;UenwmK&64%^C%>jxIDxr776QULC4<?O$
zRJ<LVaR9|Ug?7;#0z;isXv8gsqz>F>H2Qq2<EBXkSGBB8v^Ne(3@-%$hw%dG5r)Xk
zZqyGKG8oOGnmmX;y^|4)_u>VXy%@<iez}a!{cWzZAfw?w(Q8pU#N_i%Cn-_ciXW_g
z4xp;jKA;nP=~b20h5pE;*vIqhKzV+Q38s8MP!DEqs3Trk8WGo{8^2@bZEzaPC;z-7
z=;h@jdt)6Mv0;#@psluoF!1JLo^HwrH>~ZNc+CT6)Jyo_Cu$k_EPy7e5yQ5MF&^dU
zbuwrloVXwQ<zzb|B+{K2F+W#ugYR$~D+kc&MdC(xOl+Tclem{yUwxQIdwwYO3(G<O
z>lRmpwA8!dZP~I=A%nJ`LVK@#MzMDdgjt=isgJ(q9u7Tub6?k+=3OmTPpK@wm)MVy
zezta5@3`fTdslo$-q{r0w6;wd@9RSnk97yBsWO$62(pC&vCv}VeammuV}fV}Nt^dr
z3qo?w2$5-U&onknoSB#*x+|+xYa+jYVP9_*4cxKm(6Ro?7c16~jQ(Tl_4Y@7W;?3z
zPx|Z39>w^HE8zrKWxX~rjeM^7UTZr73|3te>gB)*?4A>TPhlP)ij|oueL~U{gt=<#
zxL;eSq_Df%ZJus`eng6?OEFlt$s)-}93D=kqYhIe@=^5wB8pmftU|B8>=v$N9b#WD
zMt{#bu%`ft=OOhSMFQ$2tel`|(;tv+(mjt5X@mDM+evNsOxn)ndgf~OzEH_A5Rq)G
z<E3A9Q5V+Q#V!Z)&?zI+riTn_*SetdERvDeVR8E(%qVuWT)jtLQ+Ao6D9Oa_+bZU$
zMH+plW)3?uV~8u2)m*a(lW9;dYuw+Agh8y0`md^=%U)RGMJmrYbDZqKSj~}TY@v@@
z`**8DI}m=8z#QAWeIC^cmSPpos}`iT!gbyuZlOI@XyxnNg?CO-t@}dSOI!sm)}2d-
z|7oDw7H?%|%?I7H`pNTE<2qd>2j#zd-{7DjZbb0xVfU94ep6#z5goY_4&D|sw9m`;
z7si;vxV!SIeO+CxiCaZnZR;;{;7w!rDD2yqT+o-bBK3YZy%!njew@63-@3Cp20kT1
z+31_?thg$riK2{^Qx?`?)s<2g+F`!sGBuou+B0QHvbBKfgqR+5J8p{h7@p>#8&y(J
z^Zgb<CXwuVwzUs-hG!=!AlYYCj-CaLA64FIW$i?Mk)D!54Y$y<7ze3@(}zAEM-`ny
z5skqW$1IL`v}H8%AnI0}zbB^#$&he~@KzQ;0<zf)izG(gw}XfBlB)?WF5lvl!a5yC
z2XpwW*RbMLhZ;bNgY-rb;q`kt1jqmM5TvF_NiTN&T4k94se(}Gkg<si6NF6LC3iEX
zW4TJ7F)?LxPWKFNm&$IKX}DYSE`RnnH+*>&0x>6XH}KAr#8y%$r&1A7$b^sG))Y|`
zEcwwZ+^u$0TQlGF8FD{rA)jR#eG2Dqmt=M)0ifc?gQK&;_j2l-UBoC-s1_}{M_P$#
zpGKwjEd@H<y<&#S_8Uhzs?JblB!xy}tYul!cS%80D3uO4{W`i#8Z;?OJNfuIiZp_u
z7s#e9lV(miETcAB4jtw90!=YtgQdz2+WLeWYV_0IsI0nma9Y-Xw2aGJgC8VU4lkdj
z8^xxDs2UuYGUT>=c(pLU==jn^tectqs;CW0fyWjw>-hNy!L%CN;()W^54{-m6Raf<
zpcsRLiB7yj5WXHxmgJJ7$S1Jt9L4Z~_W9Y4tjInzwSvq&zn8bmOGhW#VIsKEQxc?%
zD11L2{&>ldQT8rThG01iNJ>2H_3vbU|C(FZ-Q37NPEbNM7IGe@UE0!y6XEukenk}E
zaVPCji>?g=8Nq-si?7zN6wtC;^2QR7^9tf-{hRtG|B3o28EP<`le12+$qCnSO5wo6
zJ^8iaG6My;e}H;{G87TogeR#I2b_qb$|;Yb#1x=l)?cz^r1swv8BucAW{q41h=*$^
z0eazbXN`MD2^2XePB3Oh6Lky7QPwQ@<}Tynr#K!c_qYFi?N;Vs;buf?U7^l~=x9>K
z_DP(&XjRaRRH0D7YUt?u!_}l6B-YZ~264Zn!~wV^h)yCh3$|E1IVMT!f1lg%uKElJ
zmV6-;VyfQ0oOW1UwfO0V<3Qu}q)_sXv=+SZm6^7l<|s6y*OCEmjca!>s9fJoG_?`|
z>b~JO8puuHcH++;A%T$nAg^kQseJc*g6F91$y;N`>3q&Pw@mtPMnkrDk}8T*Nub5`
z>Y(;HOc>P!vHL7l_B(8d-_gDxe?6g1sgso6r#^qP)QwMR@aRo2RAxn~=75LPtWngZ
zzs7Y#08hdK5h@EbkEOd!x#n=dD1^7(5x?A(F#gRZ)A^tAIiA*|Cho%&E_!Iu100<T
z0&k`HY#xxhF-*x|_*(8CPdY~)L=k*;fpWoiSS<_PFi^!tp)|jDU-$zHKV%Y0Xcxs#
zRspW+OGnl)<ObbId#6{R1meHOr^me)qSHm}ORh{h1^wy+$Rz?XOte)dXG%v>xAbxC
zcN8Vu^~;*^+@9qbSfvMeLst`#aFuTCf{?ZFd^eOpdAtb%tPSNc{v<)BZTynsLy~}+
z3Z{6D`@JfBq^5?o&I-Y8R9Ixa5wwnbVD^cWHUbf|iKZbeYO~`5uRyHNDW#%6T2SGY
z9YENFSQ*1J^G`K~%I~Gjr9nlHIuLFT)(G7*Exrpio~C~C-n^^oD8w-R8wNIiJZ6r@
z9Ngt$=-Ll9Bs4C3yRMpAkHG(?m48?<^aC4i9b<7xsovx2@TKY5(X|INdDY1t?lldh
zW4%@f4*Y=mNtL1bxZJ;(*22fm1Yw#w=z8)Fhn=%PS?}7@EZoscq|O*fGGmCOS^*M%
z1z_{zQu*|HG%^M1SVOW+Tuo1^FlW;`@NzY9q(YM5-l}AZJMf@sh0;@hG6tJDlX`4U
z)w=DBL(_uFt%_>)pAtY{`m8|0*h=T8Ky=3!(WDkJ#{W9*`V=a68VBNYg#Wcq8?$d&
zPFS=M4iJZjN51l%rYo|J)y|BTbOn_jJCP%?;##PB`Nr^uOD1Qf%{tRRwJ&{g?AF+?
zL1vJR7?nT}scWW|t)>Pcx4N>M7^>KuydJdD5;X{Tdy{qZq*TFh?c#K<f=n3_#kVG{
zjkI7cO5pS{Qt1S;ZTZE&unE_T)G4GK%*BbOI+gonm5I0+8U-xnx%diGIheFKg2LcD
zJSZGLdOl6_tbWg8B2hIR<{1dVE6Vr91j*G~Bk~hWG}U|vuTcT^*_lyS-gQ9(I<QhC
z>l&LT7p$cR%CC7p0JB}|ru|?Dp)dShI7|HK);I!jRW*M@>|<6TQq)hsuyB}Jt-)id
zE`sn24lSmqcmr}9J|1VykE+4tn-x}p#+DHUGX8bok$LGB6r3gZkUnv>A#g#0fFlo*
z4x?Xea8y%6yPo;BAETDNh!4ZH`HbFQL@JtHYp@F7#N+j$&?H}L*-y$PvbFRIu7;yj
zga1(oH0%K36DTWpl#da?U5ngsa}mu=7FE?zdQ4_?@|1QpVi!_R;?_grH2+kS0Oty+
zU``_Xy&5?}L*c=mu5c~m(mF`VPUlu#mW!SxMmi0ffsbyl;gIN&AYDKCA;k2a5%Da6
zl|K%tf)Z7CFFiqSPF}`)Ujnn1)HQ%~$>WjDjEj&H%S)_=72$k+&I&}u)brbw;L~Hy
zj4YjgrCBq}z>FAmKHqplfVPgPORc{ohzk}k6m0!D@>-q%%rP>dtsWMgL%UZdF)B2;
zj;3+wj)HquaArehSjI8S{@|y<#zTou(qm3_v;JO|X^%r`lARRLmkVntq(-l<)c^N6
zNTS<gWK7@8ff?HMW6j$29Xh1{lVTucsOS%6Wy`$-J#w$v=PV&G#h(a*VrJo61;g*0
z7HhU#Hw%;-c{2Kmv-605t`wCEaR>_aLtoV#snd1l-H`jJKTxQ@e@l~lfuYA+`Pz3z
z&eg;;^>^Ws_cMDY69W-y7!idFCXx+1k$Vy149@*a4dHe4><dChVz-Lw7zAxx8$%bc
zUtTxBzLbpZ5b3QDisK}SNC`R;v%Wzn>|qXO2=1hYDZ`p@2B;KN*0Y~vhj&cXG}q+y
zMBx7!KT@s!RULsBv%*a_L)6Fr<<a4C?BJhZQw^aC(b?yzC%Ni4nG|`W9|gTF1tg!n
ztYRe;xY6|m4c}Cl@SEK(4$vX7N?ZXZ-kq(GK^RqL&Sax|tLz)M1k*<`adH3vX}y8#
zcRpUie&mnYH8=j5uu^3^aQ$CQQbK9Wx)^r|Rm3F_kD6Bcwc5GuZHF)sIGK)q_Jv<6
z)3}8PqiwWJ%d1+Bv^B29V2jz^q`eTHfG@b`uz#zJ+G{Bp*1g_&y3G8+I>@aiS-pjp
zXMDWEuBt(GVeo|{nUqX4<wv?7UZP2W9GTlWUmoF4!rLZM=a$Lx?th}=|NKqlT=n65
zTSCcaky1$v1IiW4NWyJ*pOKD{%2jPvD0RQ9x0c(c*@Ah>ip-`yMk#Xqb!Svw5jH(a
zFo3UKy`y6t1;&||2qqC?*ee_&YrjF}{<!#cl=$#w(oiYEllLLCi;h3apt7lvz1u<f
zB<ymdjhM9$zleUPzkXoQ9W>-$ItFE-`saeq<#T;xA1mO0Ucv-wwwlj~Q<~|UYuvZv
zE)h12Kzsr<iz;X9keOWdxK{MVsg<LMb1W=uRDPHABM}+e1s5)*&LwQ8FYRXp7$p5>
zS>PM=R7!jsvxo#TwrjV|8%Ik&eS5FPSnUz*TO*`A-rx3}ck2KYt2F&NY)>DJ<*~h_
zD=K>OY$I??#-0xBIe*EnwofDpyuXjVCa^mdt4x|`R?bVOAM!{^R6bKv;V<0+vFx@=
z2c^4dc+eSF{ll?<G4a(;tAso!{%-X@7piVgyuyR7$+u%#?9QFEE3+lw3Rnl*2;5B-
z?aM2ww@T9@!nKwnt@xjX;ob@*eLenn(quTo7B9(-gOxp~!>&on@e{>=92W}iQ=UAx
zas3q*RkE3$2^b5v3%G|NA3U8{AdEy?R1BW7UEzE47|btE=x%sIeR`sAJJ`AO`djn7
zJ)n)uHB%8uxH=pfG|B%FXOK8Y_oYIrru1&H_Nf8r;^VmNwJ|%`c|%dp_t4#k5yy9f
zDWp+Bm48og4*N<y^AD0fqXQn<hL_7SeM>avcvg;e!!lXP7dR_(;l$Z2t`K-Kfc_js
z<1OtecKBqh)Lx(_p3W*m(AW96zi*hK3k=oGAISX~KnIFv9Fvxc;9;B(ZnNMP+RG1p
zMWXDPhAMb;(NI}y`xl6)rSX32UgP*y0`PZhxM|e4yTFa<AuIg%djg(C`m)N3^_Tp0
z<nge?wt(oK0__(JRp<n3PaHjFwR~F(-5vq@z8rca{Thm(kwXcSR%m7a?%zVJ!T8WL
z3L*ti*lp?xG9LKUtv`A~p~hRMYD1nN)$y33RXn02Ui0`&5eRn+R?ZWUM`|vN#eq^%
zk3_zg0WtUO`J<P%iOw}lwLT#-86YNbiJEmo)yENeN*Ji5es3`DKo|%uf;mNgQv#pP
zOP(!!Gn7=cn-xhp`3Pv;)jcGPvF;6{tet8*sa-7V%fT$IvY30A?mheeC>O16Jm5lj
z29VufvB-!d%=x)%mk)7IB{7H?^w<{HZQeSYS^54YXWyX1v+!KYNGS)-!62{c1#(!U
z%>4ZwC`R>}3`ACl6wE~)HDa23Ex^$u8ZD3{XC+%eb0(x+_Zh}!So|INNj{+i4kz-J
z7oWtW)GvZFQaZKuLbb=sRiH0a;iDcc6uCt_G81hQbCEvnoHEB>vUKt%m?l5-3Jv!C
zo{4=gl5Hs@?Y*BO{D)N0!<ec03NeT6^iudADnX)eqj|zI=r6hV6grH}`;~Q*F>U``
zcQlx59gQtc4bZhJDV3+}gxwPwBrxoMYpFB{K#!VB9nj-&Tx1p}-TojTqSKZE)I^1`
z6adE1E!qTQ#jITRAc0DjV9s%K#$)sj4_Cnz@X4<LWb4HnE5d%Jq*))ak57^;%o7go
zIVnmqp#>=@YU=IFioXXOroIhvBuZM`{W#(uX)~!m0ZM2O4UBBS)tRugNyDKihzhGX
zU^qL&jQ+rDR_{m0kLzUEJMQtQb}B+6cQ}=3RYSA1crfeAZoxn%UYxi-gSRmLi=LhA
zT^_N4z4oq*NKkQ;r}uYd)OPFYPp0z+7YVH$<p^)(-5-s*${>*3ZOjvyYe!~zPO4EK
zF^fER(!lh7XzeU0zJ{V*dr+x(D(~$}Z6~|3UxnFsHu<JA^^~4Ih;kpM9ovWEbdc$s
z9<|bxfAXL}aEiJV;~Xwsw_?Xp9qx23OxR7OkXFn0a*x?fxc#^$b##S7gR=Ga2ey#n
ziLdPr7RC<rLx#3?QvF8=4qeybcSte#eSUv~e|KR58%W|66PM7!nLuM0%Fefl1x)lw
zld_$8{aybJ4wwCrRh#8G+3I3r^C=@(Rw!#AdlvbjI<M>(Sr9xK;zxTL4K%re<$!A%
zNEhQCg4&K`Ul>1G=wAC}BIvW$@y4)4@PaYLxIdF}7eo<H4eJK*ya{gxxu?SWwSzZ2
jc&#w*EJVf6hcI9H#JM+MljnKowQ1Q6sqbHBOjZ6D6XFsk

literal 0
HcmV?d00001

diff --git a/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.svg b/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.svg
new file mode 100644
index 00000000..badd447f
--- /dev/null
+++ b/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.svg
@@ -0,0 +1,1991 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="bebas_neueregular" horiz-adv-x="396" >
+<font-face units-per-em="1000" ascent="800" descent="-200" />
+<missing-glyph horiz-adv-x="155" />
+<glyph horiz-adv-x="1000" />
+<glyph horiz-adv-x="1000" />
+<glyph unicode="&#xd;" horiz-adv-x="1000" />
+<glyph unicode=" "  horiz-adv-x="155" />
+<glyph unicode="&#x09;" horiz-adv-x="155" />
+<glyph unicode="&#xa0;" horiz-adv-x="155" />
+<glyph unicode="!" horiz-adv-x="190" d="M40 408v292h110v-292l-14 -253h-82zM42 0v106h106v-106h-106z" />
+<glyph unicode="&#x22;" horiz-adv-x="325" d="M40 700h106l-16 -206h-75zM179 700h106l-16 -206h-75z" />
+<glyph unicode="#" horiz-adv-x="410" d="M15 200l8 78h49l19 183h-50l8 78h50l17 161h90l-17 -161h65l17 161h90l-17 -161h51l-8 -78h-51l-19 -183h51l-8 -78h-51l-21 -200h-90l21 200h-65l-21 -200h-90l21 200h-49zM162 278h65l19 183h-65z" />
+<glyph unicode="$" d="M34 178v48h104v-55q0 -68 57 -68t57 68q0 39 -22 71.5t-53.5 57.5t-63.5 52.5t-54 71t-22 98.5q0 145 116 171v52h90v-52q118 -24 118 -171v-22h-104v29q0 69 -55 69t-55 -69q0 -39 22 -71.5t53.5 -57.5t63.5 -52.5t54 -71t22 -98.5q0 -72 -30.5 -116t-88.5 -56v-51h-90 v51q-119 24 -119 172z" />
+<glyph unicode="%" horiz-adv-x="627" d="M34 363v230q0 54 27 83t79 29t79 -29t27 -83v-230q0 -54 -27 -83t-79 -29t-79 29t-27 83zM104 358q0 -44 36 -44t36 44v240q0 44 -36 44t-36 -44v-240zM140 0l276 700h65l-276 -700h-65zM381 107v230q0 54 27 83t79 29t79 -29t27 -83v-230q0 -54 -27 -83t-79 -29t-79 29 t-27 83zM451 102q0 -44 36 -44t36 44v240q0 44 -36 44t-36 -44v-240z" />
+<glyph unicode="&#x26;" horiz-adv-x="414" d="M41 152v71q0 113 76 147q-76 32 -76 144v13q0 173 164 173h126v-100h-124q-56 0 -56 -68v-43q0 -40 16.5 -57t49.5 -17h48v78h110v-78h29v-100h-29v-230q0 -57 12 -85h-112q-8 22 -10 55q-29 -63 -102 -63q-122 0 -122 160zM151 161q0 -69 57 -69q54 0 57 61v162h-42 q-38 0 -55 -20.5t-17 -68.5v-65z" />
+<glyph unicode="'" horiz-adv-x="180" d="M37 700h106l-16 -206h-75z" />
+<glyph unicode="(" horiz-adv-x="251" d="M47 153v394q0 83 35.5 118t118.5 35h34v-90h-27q-27 0 -39 -13.5t-12 -49.5v-394q0 -36 12 -49.5t39 -13.5h27v-90h-34q-83 0 -118.5 35t-35.5 118z" />
+<glyph unicode=")" horiz-adv-x="251" d="M16 0v90h27q27 0 39 13.5t12 49.5v394q0 36 -12 49.5t-39 13.5h-27v90h34q83 0 118.5 -35t35.5 -118v-394q0 -83 -35.5 -118t-118.5 -35h-34z" />
+<glyph unicode="*" d="M2 525l28 85l149 -75l-26 165h90l-26 -165l149 75l28 -85l-164 -28l117 -117l-72 -53l-77 148l-77 -148l-72 53l117 117z" />
+<glyph unicode="+" d="M25 311v78h134v135h78v-135h134v-78h-134v-137h-78v137h-134z" />
+<glyph unicode="," horiz-adv-x="186" d="M40 0v106h106v-95l-48 -111h-45l29 100h-42z" />
+<glyph unicode="-" horiz-adv-x="270" d="M35 300v100h200v-100h-200z" />
+<glyph unicode="." horiz-adv-x="186" d="M40 0v106h106v-106h-106z" />
+<glyph unicode="/" horiz-adv-x="381" d="M5 0l276 700h95l-276 -700h-95z" />
+<glyph unicode="0" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
+<glyph unicode="1" d="M108 534v78q57 0 81 22t40 66h74v-700h-110v534h-85z" />
+<glyph unicode="2" d="M40 0v86q0 57 22.5 104.5t54.5 83t64 70t54.5 81.5t22.5 103q0 45 -14.5 62.5t-42.5 17.5q-57 0 -57 -69v-75h-104v68q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5q0 -64 -24.5 -120.5t-58.5 -96.5t-67 -75t-53.5 -70.5t-14.5 -69.5h208v-100h-318z" />
+<glyph unicode="3" d="M34 168v58h104v-65q0 -69 57 -69q28 0 42.5 17.5t14.5 61.5v55q0 48 -17 68.5t-55 20.5h-37v100h43q33 0 49.5 17t16.5 57v39q0 45 -14.5 62.5t-42.5 17.5q-57 0 -57 -69v-45h-104v38q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5v-18q0 -112 -77 -144q77 -34 77 -147 v-55q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
+<glyph unicode="4" d="M14 127v100l200 473h120v-473h52v-100h-52v-127h-110v127h-210zM115 227h109v259z" />
+<glyph unicode="5" d="M35 168v58h104v-65q0 -68 57 -68t57 68v154q0 69 -57 69t-57 -69v-21h-104l20 406h290v-100h-191l-9 -167q31 51 96 51q122 0 122 -160v-156q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
+<glyph unicode="6" d="M33 168v358q0 182 168 182q80 0 122 -45.5t42 -130.5v-18h-104v25q0 69 -57 69q-31 0 -46 -19t-15 -67v-128q29 62 102 62q122 0 122 -160v-128q0 -84 -43 -130t-124 -46t-124 46t-43 130zM143 161q0 -68 57 -68t57 68v126q0 69 -57 69t-57 -69v-126z" />
+<glyph unicode="7" d="M33 600v100h330v-96l-162 -604h-110l161 600h-219z" />
+<glyph unicode="8" d="M26 168v55q0 108 68 146q-68 37 -68 141v22q0 84 44.5 130t127.5 46t127.5 -46t44.5 -130v-22q0 -103 -68 -141q68 -38 68 -146v-55q0 -84 -44.5 -130t-127.5 -46t-127.5 46t-44.5 130zM136 171q0 -79 62 -79q61 0 62 79v65q0 79 -62 79t-62 -79v-65zM136 489 q0 -74 62 -74t62 74v39q0 80 -62 80t-62 -80v-39z" />
+<glyph unicode="9" d="M29 404v128q0 84 43 130t124 46t124 -46t43 -130v-358q0 -182 -168 -182q-80 0 -122 45.5t-42 130.5v18h104v-25q0 -69 57 -69q31 0 46 19t15 67v128q-29 -62 -102 -62q-122 0 -122 160zM139 413q0 -69 57 -69t57 69v126q0 68 -57 68t-57 -68v-126z" />
+<glyph unicode=":" horiz-adv-x="186" d="M40 0v106h106v-106h-106zM40 381v106h106v-106h-106z" />
+<glyph unicode=";" horiz-adv-x="186" d="M40 0v106h106v-95l-48 -111h-45l29 100h-42zM40 381v106h106v-106h-106z" />
+<glyph unicode="&#x3c;" d="M30 311v78l326 120v-79l-224 -80l224 -80v-79z" />
+<glyph unicode="=" d="M35 230v78h326v-78h-326zM35 392v78h326v-78h-326z" />
+<glyph unicode="&#x3e;" d="M40 191v79l224 80l-224 80v79l326 -120v-78z" />
+<glyph unicode="?" horiz-adv-x="360" d="M20 463v69q0 85 41 130.5t121 45.5t121 -45.5t41 -130.5q0 -61 -20.5 -111.5t-44.5 -78t-44.5 -67t-20.5 -81.5q0 -22 4 -39h-98q-6 18 -6 43q0 51 19 93.5t41 69t41 73.5t19 105q0 69 -55 69t-55 -69v-76h-104zM115 0v106h106v-106h-106z" />
+<glyph unicode="@" horiz-adv-x="689" d="M24 290q0 94 23.5 175t68 142.5t116 97t161.5 35.5q148 0 213 -80t65 -214q0 -87 -19 -152.5t-50 -100t-62.5 -50.5t-63.5 -16q-82 0 -88 66q-31 -63 -97 -60q-106 3 -90 154l11 101q8 74 39 112t83 36q62 -1 82 -62l6 58h96l-30 -289q-3 -25 20 -25q39 0 59.5 69.5 t20.5 156.5q0 98 -49 154.5t-150 56.5q-132 0 -201.5 -98t-69.5 -272q0 -124 58.5 -192.5t174.5 -68.5q119 0 207 68l-8 -96q-84 -56 -205 -56q-163 0 -242 93.5t-79 256.5zM298 292q-7 -64 43 -66q23 -1 37.5 14.5t18.5 48.5l10 95q3 28 -9 42t-34 14q-24 1 -38.5 -14 t-18.5 -49z" />
+<glyph unicode="A" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM145 222h106l-53 354z" />
+<glyph unicode="B" horiz-adv-x="406" d="M40 0v700h166q85 0 124 -39.5t39 -121.5v-25q0 -108 -71 -141q82 -32 82 -150v-57q0 -81 -42.5 -123.5t-124.5 -42.5h-173zM150 100h63q29 0 43 15.5t14 53.5v61q0 48 -16.5 66.5t-54.5 18.5h-49v-215zM150 415h43q33 0 49.5 17t16.5 57v39q0 72 -56 72h-53v-185z" />
+<glyph unicode="C" horiz-adv-x="386" d="M31 168v364q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5v-68h-104v75q0 69 -57 69t-57 -69v-378q0 -68 57 -68t57 68v100h104v-93q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
+<glyph unicode="D" horiz-adv-x="408" d="M40 0v700h174q164 0 164 -173v-354q0 -173 -164 -173h-174zM150 100h62q56 0 56 68v364q0 68 -56 68h-62v-500z" />
+<glyph unicode="E" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300z" />
+<glyph unicode="F" horiz-adv-x="344" d="M40 0v700h291v-100h-181v-211h142v-100h-142v-289h-110z" />
+<glyph unicode="G" horiz-adv-x="390" d="M31 168v364q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5v-68h-104v75q0 69 -57 69t-57 -69v-378q0 -68 57 -68t57 68v129h-50v100h154v-222q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
+<glyph unicode="H" horiz-adv-x="427" d="M40 0v700h110v-300h125v300h112v-700h-112v300h-125v-300h-110z" />
+<glyph unicode="I" horiz-adv-x="190" d="M40 0v700h110v-700h-110z" />
+<glyph unicode="J" horiz-adv-x="256" d="M10 0v100q12 -1 38 -1q63 0 63 67v534h110v-526q0 -176 -158 -176q-35 0 -53 2z" />
+<glyph unicode="K" horiz-adv-x="414" d="M40 0v700h110v-305l144 305h110l-153 -312l153 -388h-113l-107 279l-34 -64v-215h-110z" />
+<glyph unicode="L" horiz-adv-x="339" d="M40 0v700h110v-600h181v-100h-291z" />
+<glyph unicode="M" horiz-adv-x="541" d="M39 0v700h153l81 -497l75 497h153v-700h-104v502l-76 -502h-104l-82 495v-495h-96z" />
+<glyph unicode="N" horiz-adv-x="427" d="M39 0v700h138l113 -419v419h98v-700h-113l-137 507v-507h-99z" />
+<glyph unicode="O" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
+<glyph unicode="P" horiz-adv-x="377" d="M40 0v700h162q164 0 164 -173v-91q0 -173 -164 -173h-52v-263h-110zM150 363h52q27 0 40.5 15t13.5 51v105q0 36 -13.5 51t-40.5 15h-52v-237z" />
+<glyph unicode="Q" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -59 -21 -98q6 -15 31 -15h10v-98h-15q-71 0 -95 48q-36 -13 -77 -13q-81 0 -124 46t-43 130zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
+<glyph unicode="R" horiz-adv-x="402" d="M40 0v700h166q85 0 124 -39.5t39 -121.5v-55q0 -108 -72 -142q73 -31 73 -149v-108q0 -57 12 -85h-112q-10 30 -10 86v110q0 48 -17 68.5t-55 20.5h-38v-285h-110zM150 385h43q33 0 49.5 17t16.5 57v69q0 72 -56 72h-53v-215z" />
+<glyph unicode="S" horiz-adv-x="374" d="M23 168v43h104v-50q0 -68 57 -68t57 68q0 39 -22 73.5t-53.5 62.5t-63.5 58.5t-54 76t-22 100.5q0 85 41 130.5t121 45.5t121 -45.5t41 -130.5v-22h-104v29q0 69 -55 69t-55 -69q0 -29 12 -55t31 -47t42 -41.5t45.5 -43t41.5 -48t31 -60.5t12 -76q0 -85 -42 -130.5 t-122 -45.5t-122 45.5t-42 130.5z" />
+<glyph unicode="T" horiz-adv-x="356" d="M8 600v100h340v-100h-115v-600h-110v600h-115z" />
+<glyph unicode="U" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
+<glyph unicode="V" horiz-adv-x="402" d="M11 700h111l84 -571l84 571h101l-108 -700h-164z" />
+<glyph unicode="W" horiz-adv-x="563" d="M15 700h107l59 -552l53 552h106l55 -556l57 556h96l-78 -700h-146l-40 373l-40 -373h-151z" />
+<glyph unicode="X" horiz-adv-x="430" d="M15 0l123 360l-115 340h114l83 -258l85 258h102l-115 -340l123 -360h-116l-90 277l-91 -277h-103z" />
+<glyph unicode="Y" d="M4 700h115l84 -319l84 319h105l-139 -468v-232h-110v232z" />
+<glyph unicode="Z" horiz-adv-x="370" d="M23 0v98l209 502h-199v100h312v-98l-209 -502h209v-100h-322z" />
+<glyph unicode="[" horiz-adv-x="251" d="M47 0v700h182v-90h-72v-520h72v-90h-182z" />
+<glyph unicode="\" horiz-adv-x="381" d="M5 700h95l276 -700h-95z" />
+<glyph unicode="]" horiz-adv-x="251" d="M22 0v90h72v520h-72v90h182v-700h-182z" />
+<glyph unicode="^" d="M20 390l139 310h78l139 -310h-88l-90 210l-90 -210h-88z" />
+<glyph unicode="_" horiz-adv-x="500" d="M0 -10h500v-80h-500v80z" />
+<glyph unicode="`" horiz-adv-x="250" d="M44 848h113l68 -111h-79z" />
+<glyph unicode="a" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM145 222h106l-53 354z" />
+<glyph unicode="b" horiz-adv-x="406" d="M40 0v700h166q85 0 124 -39.5t39 -121.5v-25q0 -108 -71 -141q82 -32 82 -150v-57q0 -81 -42.5 -123.5t-124.5 -42.5h-173zM150 100h63q29 0 43 15.5t14 53.5v61q0 48 -16.5 66.5t-54.5 18.5h-49v-215zM150 415h43q33 0 49.5 17t16.5 57v39q0 72 -56 72h-53v-185z" />
+<glyph unicode="c" horiz-adv-x="386" d="M31 168v364q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5v-68h-104v75q0 69 -57 69t-57 -69v-378q0 -68 57 -68t57 68v100h104v-93q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
+<glyph unicode="d" horiz-adv-x="408" d="M40 0v700h174q164 0 164 -173v-354q0 -173 -164 -173h-174zM150 100h62q56 0 56 68v364q0 68 -56 68h-62v-500z" />
+<glyph unicode="e" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300z" />
+<glyph unicode="f" horiz-adv-x="344" d="M40 0v700h291v-100h-181v-211h142v-100h-142v-289h-110z" />
+<glyph unicode="g" horiz-adv-x="390" d="M31 168v364q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5v-68h-104v75q0 69 -57 69t-57 -69v-378q0 -68 57 -68t57 68v129h-50v100h154v-222q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
+<glyph unicode="h" horiz-adv-x="427" d="M40 0v700h110v-300h125v300h112v-700h-112v300h-125v-300h-110z" />
+<glyph unicode="i" horiz-adv-x="190" d="M40 0v700h110v-700h-110z" />
+<glyph unicode="j" horiz-adv-x="256" d="M10 0v100q12 -1 38 -1q63 0 63 67v534h110v-526q0 -176 -158 -176q-35 0 -53 2z" />
+<glyph unicode="k" horiz-adv-x="414" d="M40 0v700h110v-305l144 305h110l-153 -312l153 -388h-113l-107 279l-34 -64v-215h-110z" />
+<glyph unicode="l" horiz-adv-x="339" d="M40 0v700h110v-600h181v-100h-291z" />
+<glyph unicode="m" horiz-adv-x="541" d="M39 0v700h153l81 -497l75 497h153v-700h-104v502l-76 -502h-104l-82 495v-495h-96z" />
+<glyph unicode="n" horiz-adv-x="427" d="M39 0v700h138l113 -419v419h98v-700h-113l-137 507v-507h-99z" />
+<glyph unicode="o" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
+<glyph unicode="p" horiz-adv-x="377" d="M40 0v700h162q164 0 164 -173v-91q0 -173 -164 -173h-52v-263h-110zM150 363h52q27 0 40.5 15t13.5 51v105q0 36 -13.5 51t-40.5 15h-52v-237z" />
+<glyph unicode="q" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -59 -21 -98q6 -15 31 -15h10v-98h-15q-71 0 -95 48q-36 -13 -77 -13q-81 0 -124 46t-43 130zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
+<glyph unicode="r" horiz-adv-x="402" d="M40 0v700h166q85 0 124 -39.5t39 -121.5v-55q0 -108 -72 -142q73 -31 73 -149v-108q0 -57 12 -85h-112q-10 30 -10 86v110q0 48 -17 68.5t-55 20.5h-38v-285h-110zM150 385h43q33 0 49.5 17t16.5 57v69q0 72 -56 72h-53v-215z" />
+<glyph unicode="s" horiz-adv-x="374" d="M23 168v43h104v-50q0 -68 57 -68t57 68q0 39 -22 73.5t-53.5 62.5t-63.5 58.5t-54 76t-22 100.5q0 85 41 130.5t121 45.5t121 -45.5t41 -130.5v-22h-104v29q0 69 -55 69t-55 -69q0 -29 12 -55t31 -47t42 -41.5t45.5 -43t41.5 -48t31 -60.5t12 -76q0 -85 -42 -130.5 t-122 -45.5t-122 45.5t-42 130.5z" />
+<glyph unicode="t" horiz-adv-x="356" d="M8 600v100h340v-100h-115v-600h-110v600h-115z" />
+<glyph unicode="u" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
+<glyph unicode="v" horiz-adv-x="402" d="M11 700h111l84 -571l84 571h101l-108 -700h-164z" />
+<glyph unicode="w" horiz-adv-x="563" d="M15 700h107l59 -552l53 552h106l55 -556l57 556h96l-78 -700h-146l-40 373l-40 -373h-151z" />
+<glyph unicode="x" horiz-adv-x="430" d="M15 0l123 360l-115 340h114l83 -258l85 258h102l-115 -340l123 -360h-116l-90 277l-91 -277h-103z" />
+<glyph unicode="y" d="M4 700h115l84 -319l84 319h105l-139 -468v-232h-110v232z" />
+<glyph unicode="z" horiz-adv-x="370" d="M23 0v98l209 502h-199v100h312v-98l-209 -502h209v-100h-322z" />
+<glyph unicode="{" horiz-adv-x="257" d="M11 305v90q31 0 42 12.5t13 47.5l8 134q4 55 33.5 83t77.5 28h56v-90h-16q-27 0 -39 -15.5t-14 -55.5l-5 -100q-4 -73 -65 -89q61 -16 65 -89l5 -100q2 -40 14 -55.5t39 -15.5h16v-90h-56q-48 0 -77.5 28t-33.5 83l-8 134q-2 35 -13 47.5t-42 12.5z" />
+<glyph unicode="|" horiz-adv-x="500" d="M210 -65v830h90v-830h-90z" />
+<glyph unicode="}" horiz-adv-x="257" d="M16 0v90h16q27 0 39 15.5t14 55.5l5 100q4 73 65 89q-61 16 -65 89l-5 100q-2 40 -14 55.5t-39 15.5h-16v90h56q48 0 77.5 -28t33.5 -83l8 -134q2 -35 13 -47.5t42 -12.5v-90q-31 0 -42 -12.5t-13 -47.5l-8 -134q-4 -55 -33.5 -83t-77.5 -28h-56z" />
+<glyph unicode="~" d="M8 332q34 51 61.5 70.5t57.5 19.5q29 0 76 -30.5t67 -30.5q16 0 28.5 11.5t37.5 45.5l52 -54q-34 -50 -61 -68t-58 -18q-29 0 -76 30.5t-67 30.5q-17 0 -29.5 -11.5t-36.5 -45.5z" />
+<glyph unicode="&#xa1;" horiz-adv-x="190" d="M40 0v292l14 253h82l14 -253v-292h-110zM42 594v106h106v-106h-106z" />
+<glyph unicode="&#xa2;" d="M36 208v284q0 145 117 171v52h90v-51q121 -24 121 -172v-48h-104v55q0 69 -57 69t-57 -69v-298q0 -68 57 -68t57 68v80h104v-73q0 -149 -121 -172v-51h-90v52q-117 24 -117 171z" />
+<glyph unicode="&#xa3;" d="M30 0v96q40 0 67 30.5t28 83.5h-81v85h67q-7 19 -27.5 60t-32 81.5t-11.5 95.5q0 85 41 130.5t121 45.5t121 -45.5t41 -130.5v-69h-104v76q0 69 -55 69t-55 -69q0 -55 12 -97.5t30.5 -81.5t24.5 -65h121v-85h-114q-7 -71 -56 -110h189v-100h-327z" />
+<glyph unicode="&#xa5;" d="M7 700h115l81 -309l81 309h105l-128 -429h83v-55h-91v-45h91v-55h-91v-116h-110v116h-91v55h91v45h-91v55h82z" />
+<glyph unicode="&#xa6;" horiz-adv-x="500" d="M210 -65v355h90v-355h-90zM210 410v355h90v-355h-90z" />
+<glyph unicode="&#xa7;" d="M35 314q0 83 69 122q-69 45 -69 130q0 63 42 102.5t120 39.5t120 -37t42 -99v-36h-104v21q0 27 -14.5 43.5t-40.5 16.5q-55 0 -55 -56q0 -22 22 -38.5t53.5 -30t63.5 -31.5t54 -53.5t22 -86.5q0 -83 -70 -123q70 -43 70 -129q0 -63 -42 -102.5t-120 -39.5t-120 37t-42 99 v50h104v-35q0 -27 14.5 -43.5t40.5 -16.5q55 0 55 56q0 22 -22 38.5t-53.5 30t-63.5 31.5t-54 53.5t-22 86.5zM140 318q0 -28 15.5 -45t45.5 -32q24 4 39 25.5t15 50.5q0 46 -62 76q-24 -4 -38.5 -25t-14.5 -50z" />
+<glyph unicode="&#xa8;" horiz-adv-x="250" d="M1 737v96h96v-96h-96zM153 737v96h96v-96h-96z" />
+<glyph unicode="&#xa9;" horiz-adv-x="736" d="M20 350q0 155 99.5 256.5t248.5 101.5t248.5 -101.5t99.5 -256.5t-99.5 -256.5t-248.5 -101.5t-248.5 101.5t-99.5 256.5zM92 350q0 -125 78.5 -206.5t197.5 -81.5t197.5 81.5t78.5 206.5t-78.5 206.5t-197.5 81.5t-197.5 -81.5t-78.5 -206.5zM251 252v194q0 124 113 124 t113 -124v-36h-72v42q0 48 -39 48t-39 -48v-204q0 -47 39 -47t39 47v60h72v-56q0 -122 -113 -122t-113 122z" />
+<glyph unicode="&#xaa;" horiz-adv-x="278" d="M30 218v69h212v-69h-212zM30 429v4q0 67 37 95t105 30v46q0 37 -28 37q-34 0 -34 -43v-23h-66v19q0 111 103 111q95 0 95 -111v-261h-59l-4 48q-17 -53 -71 -53q-78 0 -78 101zM100 435q0 -43 36 -43q33 0 36 36v78q-72 -3 -72 -62v-9z" />
+<glyph unicode="&#xab;" horiz-adv-x="355" d="M16 351l62 257h99l-61 -257l61 -273h-99zM178 351l62 257h99l-61 -257l61 -273h-99z" />
+<glyph unicode="&#xac;" d="M25 311v78h346v-215h-78v137h-268z" />
+<glyph unicode="&#xad;" horiz-adv-x="270" d="M35 300v100h200v-100h-200z" />
+<glyph unicode="&#xae;" horiz-adv-x="736" d="M20 350q0 155 99.5 256.5t248.5 101.5t248.5 -101.5t99.5 -256.5t-99.5 -256.5t-248.5 -101.5t-248.5 101.5t-99.5 256.5zM92 350q0 -125 78.5 -206.5t197.5 -81.5t197.5 81.5t78.5 206.5t-78.5 206.5t-197.5 81.5t-197.5 -81.5t-78.5 -206.5zM258 136v428h116 q113 0 113 -112v-9q0 -76 -52 -99q52 -21 52 -103v-46q0 -39 9 -59h-78q-7 18 -7 60v46q0 34 -12 48t-39 14h-26v-168h-76zM334 374h31q46 0 46 51v18q0 51 -41 51h-36v-120z" />
+<glyph unicode="&#xaf;" horiz-adv-x="250" d="M10 741v78h230v-78h-230z" />
+<glyph unicode="&#xb0;" horiz-adv-x="228" d="M15 609q0 41 29 70t70 29t70 -29t29 -70t-29 -70t-70 -29t-70 29t-29 70zM65 609q0 -20 14.5 -34.5t34.5 -14.5t34.5 14.5t14.5 34.5t-14.5 34.5t-34.5 14.5t-34.5 -14.5t-14.5 -34.5z" />
+<glyph unicode="&#xb1;" d="M35 174v78h124v80h-124v78h124v114h78v-114h124v-78h-124v-80h124v-78h-326z" />
+<glyph unicode="&#xb2;" horiz-adv-x="280" d="M42 351v54q0 36 14 66.5t34.5 53l41 45t34.5 53t14 65.5q0 50 -36 50t-36 -44v-47h-66v43q0 111 104 111t104 -111q0 -49 -23.5 -93.5t-51 -70.5t-48 -56t-15.5 -56h132v-63h-202z" />
+<glyph unicode="&#xb3;" horiz-adv-x="280" d="M36 458v36h66v-41q0 -44 36 -44t36 51v34q0 31 -10.5 43.5t-34.5 12.5h-24v63h27q42 0 42 48v25q0 51 -36 51t-36 -44v-28h-66v23q0 112 104 112t104 -112v-11q0 -71 -49 -91q49 -21 49 -93v-35q0 -112 -104 -112t-104 112z" />
+<glyph unicode="&#xb4;" horiz-adv-x="250" d="M27 737l68 111h108l-102 -111h-74z" />
+<glyph unicode="&#xb6;" d="M14 436v91q0 173 164 173h178v-765h-80v685h-54v-685h-80l2 330q-62 0 -96 47t-34 124z" />
+<glyph unicode="&#xb7;" horiz-adv-x="186" d="M40 297v106h106v-106h-106z" />
+<glyph unicode="&#xb8;" horiz-adv-x="250" d="M26 -79h74v-8q0 -20 22 -20q25 0 25 24q0 26 -36 26h-10v71h48v-53q38 0 56 -10.5t18 -36.5q0 -37 -25 -49t-76 -12q-96 0 -96 58v10z" />
+<glyph unicode="&#xb9;" horiz-adv-x="200" d="M25 690v49q36 0 51.5 14t26.5 42h46v-444h-70v339h-54z" />
+<glyph unicode="&#xba;" horiz-adv-x="280" d="M34 218v69h212v-69h-212zM34 439v155q0 53 27.5 82t78.5 29t78.5 -29t27.5 -82v-155q0 -53 -27.5 -82t-78.5 -29t-78.5 29t-27.5 82zM104 435q0 -43 36 -43t36 43v163q0 43 -36 43t-36 -43v-163z" />
+<glyph unicode="&#xbb;" horiz-adv-x="355" d="M16 78l61 273l-61 257h99l62 -257l-62 -273h-99zM178 78l61 273l-61 257h99l62 -257l-62 -273h-99z" />
+<glyph unicode="&#xbc;" horiz-adv-x="627" d="M65 595v49q36 0 51.5 14t26.5 42h46v-444h-70v339h-54zM160 0l276 700h65l-276 -700h-65zM371 80v64l127 300h76v-300h33v-64h-33v-80h-69v80h-134zM434 144h71v164z" />
+<glyph unicode="&#xbd;" horiz-adv-x="627" d="M65 595v49q36 0 51.5 14t26.5 42h46v-444h-70v339h-54zM130 0l276 700h65l-276 -700h-65zM389 0v54q0 36 14 66.5t34.5 53l41 45t34.5 53t14 65.5q0 50 -36 50t-36 -44v-47h-66v43q0 111 104 111t104 -111q0 -49 -23.5 -93.5t-51 -70.5t-48 -56t-15.5 -56h132v-63h-202z " />
+<glyph unicode="&#xbe;" horiz-adv-x="627" d="M36 363v36h66v-41q0 -44 36 -44t36 51v34q0 31 -10.5 43.5t-34.5 12.5h-24v63h27q42 0 42 48v25q0 51 -36 51t-36 -44v-28h-66v23q0 112 104 112t104 -112v-11q0 -71 -49 -91q49 -21 49 -93v-35q0 -112 -104 -112t-104 112zM170 0l276 700h65l-276 -700h-65zM371 80v64 l127 300h76v-300h33v-64h-33v-80h-69v80h-134zM434 144h71v164z" />
+<glyph unicode="&#xbf;" horiz-adv-x="360" d="M16 168q0 61 20.5 111.5t44.5 78t44.5 67t20.5 81.5q0 22 -4 39h98q6 -18 6 -43q0 -51 -19 -93.5t-41 -69t-41 -73.5t-19 -105q0 -69 55 -69t55 69v76h104v-69q0 -85 -41 -130.5t-121 -45.5t-121 45.5t-41 130.5zM139 594v106h106v-106h-106z" />
+<glyph unicode="&#xc0;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM83 848h113l68 -111h-79zM145 222h106l-53 354z" />
+<glyph unicode="&#xc1;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM145 222h106l-53 354zM145 737l68 111h108l-102 -111h-74z" />
+<glyph unicode="&#xc2;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM65 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94zM145 222h106l-53 354z" />
+<glyph unicode="&#xc3;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM68 770q25 68 85 68q23 0 50 -12.5t40 -12.5q29 0 43 29l53 -37q-25 -68 -85 -68q-22 0 -49 12.5t-41 12.5q-29 0 -43 -29zM145 222h106l-53 354z" />
+<glyph unicode="&#xc4;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM79 737v96h96v-96h-96zM145 222h106l-53 354zM231 737v96h96v-96h-96z" />
+<glyph unicode="&#xc5;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM123 814q0 34 23 57t57 23t57 -23t23 -57t-23 -57t-57 -23t-57 23t-23 57zM145 222h106l-53 354zM173 814q0 -13 8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5t-8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5z" />
+<glyph unicode="&#xc6;" horiz-adv-x="580" d="M4 0l187 700h361v-100h-190v-195h151v-100h-151v-205h190v-100h-300v127h-111l-32 -127h-105zM166 222h86v337z" />
+<glyph unicode="&#xc7;" horiz-adv-x="386" d="M31 168v364q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5v-68h-104v75q0 69 -57 69t-57 -69v-378q0 -68 57 -68t57 68v100h104v-93q0 -78 -36.5 -123.5t-105.5 -51.5v-32q38 0 56 -10.5t18 -36.5q0 -37 -25 -49t-76 -12q-96 0 -96 58v10h74v-8q0 -20 22 -20q25 0 25 24 q0 26 -36 26h-10v51q-138 14 -138 174z" />
+<glyph unicode="&#xc8;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM68 848h113l68 -111h-79z" />
+<glyph unicode="&#xc9;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM131 737l68 111h108l-102 -111h-74z" />
+<glyph unicode="&#xca;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM50 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94z" />
+<glyph unicode="&#xcb;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM65 737v96h96v-96h-96zM217 737v96h96v-96h-96z" />
+<glyph unicode="&#xcc;" horiz-adv-x="190" d="M-25 848h113l68 -111h-79zM40 0v700h110v-700h-110z" />
+<glyph unicode="&#xcd;" horiz-adv-x="190" d="M37 737l68 111h108l-102 -111h-74zM40 0v700h110v-700h-110z" />
+<glyph unicode="&#xce;" horiz-adv-x="190" d="M-43 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94zM40 0v700h110v-700h-110z" />
+<glyph unicode="&#xcf;" horiz-adv-x="190" d="M-29 737v96h96v-96h-96zM40 0v700h110v-700h-110zM123 737v96h96v-96h-96z" />
+<glyph unicode="&#xd0;" horiz-adv-x="408" d="M4 305v90h36v305h174q164 0 164 -173v-354q0 -173 -164 -173h-174v305h-36zM150 100h62q56 0 56 68v364q0 68 -56 68h-62v-205h68v-90h-68v-205z" />
+<glyph unicode="&#xd1;" horiz-adv-x="427" d="M39 0v700h138l113 -419v419h98v-700h-113l-137 507v-507h-99zM78 770q25 68 85 68q23 0 50 -12.5t40 -12.5q29 0 43 29l53 -37q-25 -68 -85 -68q-22 0 -49 12.5t-41 12.5q-29 0 -43 -29z" />
+<glyph unicode="&#xd2;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM77 848h113l68 -111h-79zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
+<glyph unicode="&#xd3;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM140 737l68 111h108l-102 -111h-74zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
+<glyph unicode="&#xd4;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM59 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
+<glyph unicode="&#xd5;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM63 770q25 68 85 68q22 0 49 -12.5t41 -12.5q29 0 43 29l53 -37q-25 -68 -85 -68q-23 0 -50 12.5t-40 12.5q-29 0 -43 -29zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69 t-57 -69v-378z" />
+<glyph unicode="&#xd6;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM74 737v96h96v-96h-96zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378zM226 737v96h96v-96h-96z" />
+<glyph unicode="&#xd7;" d="M38 244l106 106l-105 105l53 53l106 -105l106 106l53 -53l-106 -106l106 -106l-53 -53l-106 106l-107 -106z" />
+<glyph unicode="&#xd8;" d="M31 168v364q0 84 43 130t124 46q60 0 100 -26l20 55l37 -13l-26 -71q36 -43 36 -121v-364q0 -84 -43 -130t-124 -46q-62 0 -100 25l-20 -54l-37 13l25 70q-35 46 -35 122zM141 251l112 309q-7 48 -55 48q-57 0 -57 -69v-288zM142 140q8 -48 56 -48q57 0 57 69v288z" />
+<glyph unicode="&#xd9;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM79 848h113l68 -111h-79z" />
+<glyph unicode="&#xda;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM142 737l68 111h108l-102 -111h-74z" />
+<glyph unicode="&#xdb;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM62 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94z" />
+<glyph unicode="&#xdc;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM77 737v96h96v-96h-96zM229 737v96h96v-96h-96z" />
+<glyph unicode="&#xdd;" d="M4 700h115l84 -319l84 319h105l-139 -468v-232h-110v232zM144 737l68 111h108l-102 -111h-74z" />
+<glyph unicode="&#xde;" horiz-adv-x="377" d="M40 0v700h110v-80h52q164 0 164 -173v-91q0 -173 -164 -173h-52v-183h-110zM150 283h52q27 0 40.5 15t13.5 51v105q0 36 -13.5 51t-40.5 15h-52v-237z" />
+<glyph unicode="&#xdf;" horiz-adv-x="748" d="M23 168v43h104v-50q0 -68 57 -68t57 68q0 39 -22 73.5t-53.5 62.5t-63.5 58.5t-54 76t-22 100.5q0 85 41 130.5t121 45.5t121 -45.5t41 -130.5v-22h-104v29q0 69 -55 69t-55 -69q0 -29 12 -55t31 -47t42 -41.5t45.5 -43t41.5 -48t31 -60.5t12 -76q0 -85 -42 -130.5 t-122 -45.5t-122 45.5t-42 130.5zM397 168v43h104v-50q0 -68 57 -68t57 68q0 29 -12 55t-31 47t-41.5 41.5t-45.5 43t-42 48t-31 60.5t-12 76q0 85 41 130.5t121 45.5t121 -45.5t41 -130.5v-22h-104v29q0 69 -55 69t-55 -69q0 -29 12 -55t31 -47t42 -41.5t45.5 -43t41.5 -48 t31 -60.5t12 -76q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
+<glyph unicode="&#xe0;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM83 848h113l68 -111h-79zM145 222h106l-53 354z" />
+<glyph unicode="&#xe1;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM145 222h106l-53 354zM145 737l68 111h108l-102 -111h-74z" />
+<glyph unicode="&#xe2;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM65 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94zM145 222h106l-53 354z" />
+<glyph unicode="&#xe3;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM68 770q25 68 85 68q23 0 50 -12.5t40 -12.5q29 0 43 29l53 -37q-25 -68 -85 -68q-22 0 -49 12.5t-41 12.5q-29 0 -43 -29zM145 222h106l-53 354z" />
+<glyph unicode="&#xe4;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM79 737v96h96v-96h-96zM145 222h106l-53 354zM231 737v96h96v-96h-96z" />
+<glyph unicode="&#xe5;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM123 814q0 34 23 57t57 23t57 -23t23 -57t-23 -57t-57 -23t-57 23t-23 57zM145 222h106l-53 354zM173 814q0 -13 8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5t-8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5z" />
+<glyph unicode="&#xe6;" horiz-adv-x="580" d="M4 0l187 700h361v-100h-190v-195h151v-100h-151v-205h190v-100h-300v127h-111l-32 -127h-105zM166 222h86v337z" />
+<glyph unicode="&#xe7;" horiz-adv-x="386" d="M31 168v364q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5v-68h-104v75q0 69 -57 69t-57 -69v-378q0 -68 57 -68t57 68v100h104v-93q0 -78 -36.5 -123.5t-105.5 -51.5v-32q38 0 56 -10.5t18 -36.5q0 -37 -25 -49t-76 -12q-96 0 -96 58v10h74v-8q0 -20 22 -20q25 0 25 24 q0 26 -36 26h-10v51q-138 14 -138 174z" />
+<glyph unicode="&#xe8;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM68 848h113l68 -111h-79z" />
+<glyph unicode="&#xe9;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM131 737l68 111h108l-102 -111h-74z" />
+<glyph unicode="&#xea;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM50 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94z" />
+<glyph unicode="&#xeb;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM65 737v96h96v-96h-96zM217 737v96h96v-96h-96z" />
+<glyph unicode="&#xec;" horiz-adv-x="190" d="M-25 848h113l68 -111h-79zM40 0v700h110v-700h-110z" />
+<glyph unicode="&#xed;" horiz-adv-x="190" d="M37 737l68 111h108l-102 -111h-74zM40 0v700h110v-700h-110z" />
+<glyph unicode="&#xee;" horiz-adv-x="190" d="M-43 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94zM40 0v700h110v-700h-110z" />
+<glyph unicode="&#xef;" horiz-adv-x="190" d="M-29 737v96h96v-96h-96zM40 0v700h110v-700h-110zM123 737v96h96v-96h-96z" />
+<glyph unicode="&#xf0;" horiz-adv-x="408" d="M4 305v90h36v305h174q164 0 164 -173v-354q0 -173 -164 -173h-174v305h-36zM150 100h62q56 0 56 68v364q0 68 -56 68h-62v-205h68v-90h-68v-205z" />
+<glyph unicode="&#xf1;" horiz-adv-x="427" d="M39 0v700h138l113 -419v419h98v-700h-113l-137 507v-507h-99zM78 770q25 68 85 68q23 0 50 -12.5t40 -12.5q29 0 43 29l53 -37q-25 -68 -85 -68q-22 0 -49 12.5t-41 12.5q-29 0 -43 -29z" />
+<glyph unicode="&#xf2;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM77 848h113l68 -111h-79zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
+<glyph unicode="&#xf3;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM140 737l68 111h108l-102 -111h-74zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
+<glyph unicode="&#xf4;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM59 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
+<glyph unicode="&#xf5;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM63 770q25 68 85 68q22 0 49 -12.5t41 -12.5q29 0 43 29l53 -37q-25 -68 -85 -68q-23 0 -50 12.5t-40 12.5q-29 0 -43 -29zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69 t-57 -69v-378z" />
+<glyph unicode="&#xf6;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM74 737v96h96v-96h-96zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378zM226 737v96h96v-96h-96z" />
+<glyph unicode="&#xf7;" d="M25 311v78h346v-78h-346zM145 144v106h106v-106h-106zM145 449v106h106v-106h-106z" />
+<glyph unicode="&#xf8;" d="M31 168v364q0 84 43 130t124 46q60 0 100 -26l20 55l37 -13l-26 -71q36 -43 36 -121v-364q0 -84 -43 -130t-124 -46q-62 0 -100 25l-20 -54l-37 13l25 70q-35 46 -35 122zM141 251l112 309q-7 48 -55 48q-57 0 -57 -69v-288zM142 140q8 -48 56 -48q57 0 57 69v288z" />
+<glyph unicode="&#xf9;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM79 848h113l68 -111h-79z" />
+<glyph unicode="&#xfa;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM142 737l68 111h108l-102 -111h-74z" />
+<glyph unicode="&#xfb;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM62 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94z" />
+<glyph unicode="&#xfc;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM77 737v96h96v-96h-96zM229 737v96h96v-96h-96z" />
+<glyph unicode="&#xfd;" d="M4 700h115l84 -319l84 319h105l-139 -468v-232h-110v232zM144 737l68 111h108l-102 -111h-74z" />
+<glyph unicode="&#xfe;" horiz-adv-x="377" d="M40 0v700h110v-80h52q164 0 164 -173v-91q0 -173 -164 -173h-52v-183h-110zM150 283h52q27 0 40.5 15t13.5 51v105q0 36 -13.5 51t-40.5 15h-52v-237z" />
+<glyph unicode="&#xff;" d="M4 700h115l84 -319l84 319h105l-139 -468v-232h-110v232zM78 737v96h96v-96h-96zM230 737v96h96v-96h-96z" />
+<glyph unicode="&#x152;" horiz-adv-x="586" d="M30 173v354q0 173 164 173h364v-100h-190v-195h151v-100h-151v-205h190v-100h-364q-164 0 -164 173zM140 168q0 -68 56 -68h62v500h-62q-56 0 -56 -68v-364z" />
+<glyph unicode="&#x153;" horiz-adv-x="586" d="M30 173v354q0 173 164 173h364v-100h-190v-195h151v-100h-151v-205h190v-100h-364q-164 0 -164 173zM140 168q0 -68 56 -68h62v500h-62q-56 0 -56 -68v-364z" />
+<glyph unicode="&#x178;" d="M4 700h115l84 -319l84 319h105l-139 -468v-232h-110v232zM78 737v96h96v-96h-96zM230 737v96h96v-96h-96z" />
+<glyph unicode="&#x2c6;" horiz-adv-x="250" d="M-13 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94z" />
+<glyph unicode="&#x2dc;" horiz-adv-x="250" d="M-10 770q25 68 85 68q22 0 49.5 -12.5t40.5 -12.5q29 0 43 29l53 -37q-25 -68 -85 -68q-22 0 -49 12.5t-41 12.5q-29 0 -43 -29z" />
+<glyph unicode="&#x2000;" horiz-adv-x="447" />
+<glyph unicode="&#x2001;" horiz-adv-x="894" />
+<glyph unicode="&#x2002;" horiz-adv-x="447" />
+<glyph unicode="&#x2003;" horiz-adv-x="894" />
+<glyph unicode="&#x2004;" horiz-adv-x="298" />
+<glyph unicode="&#x2005;" horiz-adv-x="223" />
+<glyph unicode="&#x2006;" horiz-adv-x="149" />
+<glyph unicode="&#x2007;" horiz-adv-x="149" />
+<glyph unicode="&#x2008;" horiz-adv-x="111" />
+<glyph unicode="&#x2009;" horiz-adv-x="178" />
+<glyph unicode="&#x200a;" horiz-adv-x="49" />
+<glyph unicode="&#x2010;" horiz-adv-x="270" d="M35 300v100h200v-100h-200z" />
+<glyph unicode="&#x2011;" horiz-adv-x="270" d="M35 300v100h200v-100h-200z" />
+<glyph unicode="&#x2012;" horiz-adv-x="270" d="M35 300v100h200v-100h-200z" />
+<glyph unicode="&#x2013;" horiz-adv-x="500" d="M0 305v90h500v-90h-500z" />
+<glyph unicode="&#x2014;" horiz-adv-x="1000" d="M0 305v90h1000v-90h-1000z" />
+<glyph unicode="&#x2018;" horiz-adv-x="186" d="M40 494v95l48 111h45l-29 -100h42v-106h-106z" />
+<glyph unicode="&#x2019;" horiz-adv-x="186" d="M40 594v106h106v-95l-48 -111h-45l29 100h-42z" />
+<glyph unicode="&#x201a;" horiz-adv-x="186" d="M40 0v106h106v-95l-48 -111h-45l29 100h-42z" />
+<glyph unicode="&#x201c;" horiz-adv-x="332" d="M40 494v95l48 111h45l-29 -100h42v-106h-106zM186 494v95l48 111h45l-29 -100h42v-106h-106z" />
+<glyph unicode="&#x201d;" horiz-adv-x="332" d="M40 594v106h106v-95l-48 -111h-45l29 100h-42zM186 594v106h106v-95l-48 -111h-45l29 100h-42z" />
+<glyph unicode="&#x201e;" horiz-adv-x="332" d="M40 0v106h106v-95l-48 -111h-45l29 100h-42zM186 0v106h106v-95l-48 -111h-45l29 100h-42z" />
+<glyph unicode="&#x2022;" d="M59 350q0 58 40.5 98.5t98.5 40.5t98.5 -40.5t40.5 -98.5t-40.5 -98.5t-98.5 -40.5t-98.5 40.5t-40.5 98.5z" />
+<glyph unicode="&#x2026;" horiz-adv-x="478" d="M40 0v106h106v-106h-106zM186 0v106h106v-106h-106zM332 0v106h106v-106h-106z" />
+<glyph unicode="&#x202f;" horiz-adv-x="178" />
+<glyph unicode="&#x2039;" horiz-adv-x="196" d="M16 351l60 266h104l-59 -266l59 -282h-104z" />
+<glyph unicode="&#x203a;" horiz-adv-x="196" d="M16 69l59 282l-59 266h104l60 -266l-60 -282h-104z" />
+<glyph unicode="&#x205f;" horiz-adv-x="223" />
+<glyph unicode="&#x20ac;" d="M19 270v55h28v55h-28v55h28v97q0 85 40.5 130.5t120.5 45.5t120.5 -45.5t40.5 -130.5v-51h-104v58q0 69 -54 69t-54 -69v-104h154v-55h-154v-55h154v-55h-154v-109q0 -68 54 -68t54 68v63h104v-56q0 -85 -40.5 -130.5t-120.5 -45.5t-120.5 45.5t-40.5 130.5v102h-28z" />
+<glyph unicode="&#x2122;" horiz-adv-x="586" d="M10 636v64h216v-64h-73v-292h-70v292h-73zM268 344v356h97l52 -250l47 250h97v-356h-66v253l-47 -253h-66l-53 251v-251h-61z" />
+<glyph unicode="&#xe000;" horiz-adv-x="700" d="M0 0v700h700v-700h-700z" />
+<hkern u1="&#x28;" u2="&#x178;" k="-5" />
+<hkern u1="&#x28;" u2="&#xff;" k="-5" />
+<hkern u1="&#x28;" u2="&#xfd;" k="-5" />
+<hkern u1="&#x28;" u2="&#xdd;" k="-5" />
+<hkern u1="&#x28;" u2="y" k="-5" />
+<hkern u1="&#x28;" u2="w" k="-3" />
+<hkern u1="&#x28;" u2="v" k="-3" />
+<hkern u1="&#x28;" u2="t" k="-8" />
+<hkern u1="&#x28;" u2="Y" k="-5" />
+<hkern u1="&#x28;" u2="W" k="-3" />
+<hkern u1="&#x28;" u2="V" k="-3" />
+<hkern u1="&#x28;" u2="T" k="-8" />
+<hkern u1="&#x2c;" u2="&#x178;" k="80" />
+<hkern u1="&#x2c;" u2="&#x153;" k="10" />
+<hkern u1="&#x2c;" u2="&#x152;" k="10" />
+<hkern u1="&#x2c;" u2="&#xff;" k="80" />
+<hkern u1="&#x2c;" u2="&#xfd;" k="80" />
+<hkern u1="&#x2c;" u2="&#xfc;" k="6" />
+<hkern u1="&#x2c;" u2="&#xfb;" k="6" />
+<hkern u1="&#x2c;" u2="&#xfa;" k="6" />
+<hkern u1="&#x2c;" u2="&#xf9;" k="6" />
+<hkern u1="&#x2c;" u2="&#xf8;" k="10" />
+<hkern u1="&#x2c;" u2="&#xf6;" k="10" />
+<hkern u1="&#x2c;" u2="&#xf5;" k="10" />
+<hkern u1="&#x2c;" u2="&#xf4;" k="10" />
+<hkern u1="&#x2c;" u2="&#xf3;" k="10" />
+<hkern u1="&#x2c;" u2="&#xf2;" k="10" />
+<hkern u1="&#x2c;" u2="&#xe7;" k="10" />
+<hkern u1="&#x2c;" u2="&#xdf;" k="5" />
+<hkern u1="&#x2c;" u2="&#xdd;" k="80" />
+<hkern u1="&#x2c;" u2="&#xdc;" k="6" />
+<hkern u1="&#x2c;" u2="&#xdb;" k="6" />
+<hkern u1="&#x2c;" u2="&#xda;" k="6" />
+<hkern u1="&#x2c;" u2="&#xd9;" k="6" />
+<hkern u1="&#x2c;" u2="&#xd8;" k="10" />
+<hkern u1="&#x2c;" u2="&#xd6;" k="10" />
+<hkern u1="&#x2c;" u2="&#xd5;" k="10" />
+<hkern u1="&#x2c;" u2="&#xd4;" k="10" />
+<hkern u1="&#x2c;" u2="&#xd3;" k="10" />
+<hkern u1="&#x2c;" u2="&#xd2;" k="10" />
+<hkern u1="&#x2c;" u2="&#xc7;" k="10" />
+<hkern u1="&#x2c;" u2="y" k="80" />
+<hkern u1="&#x2c;" u2="w" k="40" />
+<hkern u1="&#x2c;" u2="v" k="60" />
+<hkern u1="&#x2c;" u2="u" k="6" />
+<hkern u1="&#x2c;" u2="t" k="60" />
+<hkern u1="&#x2c;" u2="s" k="5" />
+<hkern u1="&#x2c;" u2="q" k="10" />
+<hkern u1="&#x2c;" u2="o" k="10" />
+<hkern u1="&#x2c;" u2="g" k="10" />
+<hkern u1="&#x2c;" u2="c" k="10" />
+<hkern u1="&#x2c;" u2="Y" k="80" />
+<hkern u1="&#x2c;" u2="W" k="40" />
+<hkern u1="&#x2c;" u2="V" k="60" />
+<hkern u1="&#x2c;" u2="U" k="6" />
+<hkern u1="&#x2c;" u2="T" k="60" />
+<hkern u1="&#x2c;" u2="S" k="5" />
+<hkern u1="&#x2c;" u2="Q" k="10" />
+<hkern u1="&#x2c;" u2="O" k="10" />
+<hkern u1="&#x2c;" u2="G" k="10" />
+<hkern u1="&#x2c;" u2="C" k="10" />
+<hkern u1="&#x2d;" u2="x" k="15" />
+<hkern u1="&#x2d;" u2="v" k="10" />
+<hkern u1="&#x2d;" u2="X" k="15" />
+<hkern u1="&#x2d;" u2="V" k="10" />
+<hkern u1="&#x2e;" u2="&#x178;" k="80" />
+<hkern u1="&#x2e;" u2="&#x153;" k="10" />
+<hkern u1="&#x2e;" u2="&#x152;" k="10" />
+<hkern u1="&#x2e;" u2="&#xff;" k="80" />
+<hkern u1="&#x2e;" u2="&#xfd;" k="80" />
+<hkern u1="&#x2e;" u2="&#xfc;" k="6" />
+<hkern u1="&#x2e;" u2="&#xfb;" k="6" />
+<hkern u1="&#x2e;" u2="&#xfa;" k="6" />
+<hkern u1="&#x2e;" u2="&#xf9;" k="6" />
+<hkern u1="&#x2e;" u2="&#xf8;" k="10" />
+<hkern u1="&#x2e;" u2="&#xf6;" k="10" />
+<hkern u1="&#x2e;" u2="&#xf5;" k="10" />
+<hkern u1="&#x2e;" u2="&#xf4;" k="10" />
+<hkern u1="&#x2e;" u2="&#xf3;" k="10" />
+<hkern u1="&#x2e;" u2="&#xf2;" k="10" />
+<hkern u1="&#x2e;" u2="&#xe7;" k="10" />
+<hkern u1="&#x2e;" u2="&#xdf;" k="5" />
+<hkern u1="&#x2e;" u2="&#xdd;" k="80" />
+<hkern u1="&#x2e;" u2="&#xdc;" k="6" />
+<hkern u1="&#x2e;" u2="&#xdb;" k="6" />
+<hkern u1="&#x2e;" u2="&#xda;" k="6" />
+<hkern u1="&#x2e;" u2="&#xd9;" k="6" />
+<hkern u1="&#x2e;" u2="&#xd8;" k="10" />
+<hkern u1="&#x2e;" u2="&#xd6;" k="10" />
+<hkern u1="&#x2e;" u2="&#xd5;" k="10" />
+<hkern u1="&#x2e;" u2="&#xd4;" k="10" />
+<hkern u1="&#x2e;" u2="&#xd3;" k="10" />
+<hkern u1="&#x2e;" u2="&#xd2;" k="10" />
+<hkern u1="&#x2e;" u2="&#xc7;" k="10" />
+<hkern u1="&#x2e;" u2="y" k="80" />
+<hkern u1="&#x2e;" u2="w" k="40" />
+<hkern u1="&#x2e;" u2="v" k="60" />
+<hkern u1="&#x2e;" u2="u" k="6" />
+<hkern u1="&#x2e;" u2="t" k="60" />
+<hkern u1="&#x2e;" u2="s" k="5" />
+<hkern u1="&#x2e;" u2="q" k="10" />
+<hkern u1="&#x2e;" u2="o" k="10" />
+<hkern u1="&#x2e;" u2="g" k="10" />
+<hkern u1="&#x2e;" u2="c" k="10" />
+<hkern u1="&#x2e;" u2="Y" k="80" />
+<hkern u1="&#x2e;" u2="W" k="40" />
+<hkern u1="&#x2e;" u2="V" k="60" />
+<hkern u1="&#x2e;" u2="U" k="6" />
+<hkern u1="&#x2e;" u2="T" k="60" />
+<hkern u1="&#x2e;" u2="S" k="5" />
+<hkern u1="&#x2e;" u2="Q" k="10" />
+<hkern u1="&#x2e;" u2="O" k="10" />
+<hkern u1="&#x2e;" u2="G" k="10" />
+<hkern u1="&#x2e;" u2="C" k="10" />
+<hkern u1="&#x2f;" u2="&#x2f;" k="180" />
+<hkern u1="&#x3a;" u2="&#x178;" k="20" />
+<hkern u1="&#x3a;" u2="&#xff;" k="20" />
+<hkern u1="&#x3a;" u2="&#xfd;" k="20" />
+<hkern u1="&#x3a;" u2="&#xdd;" k="20" />
+<hkern u1="&#x3a;" u2="y" k="20" />
+<hkern u1="&#x3a;" u2="t" k="35" />
+<hkern u1="&#x3a;" u2="Y" k="20" />
+<hkern u1="&#x3a;" u2="T" k="35" />
+<hkern u1="&#x3b;" u2="&#x178;" k="20" />
+<hkern u1="&#x3b;" u2="&#xff;" k="20" />
+<hkern u1="&#x3b;" u2="&#xfd;" k="20" />
+<hkern u1="&#x3b;" u2="&#xdd;" k="20" />
+<hkern u1="&#x3b;" u2="y" k="20" />
+<hkern u1="&#x3b;" u2="t" k="35" />
+<hkern u1="&#x3b;" u2="Y" k="20" />
+<hkern u1="&#x3b;" u2="T" k="35" />
+<hkern u1="A" u2="&#x201d;" k="60" />
+<hkern u1="A" u2="&#x201c;" k="60" />
+<hkern u1="A" u2="&#x2019;" k="60" />
+<hkern u1="A" u2="&#x2018;" k="60" />
+<hkern u1="A" u2="&#x153;" k="1" />
+<hkern u1="A" u2="&#x152;" k="1" />
+<hkern u1="A" u2="v" k="25" />
+<hkern u1="A" u2="q" k="1" />
+<hkern u1="A" u2="V" k="25" />
+<hkern u1="A" u2="Q" k="1" />
+<hkern u1="A" u2="&#x3f;" k="30" />
+<hkern u1="B" u2="&#x2026;" k="5" />
+<hkern u1="B" u2="&#x201e;" k="5" />
+<hkern u1="B" u2="&#x201d;" k="10" />
+<hkern u1="B" u2="&#x201c;" k="10" />
+<hkern u1="B" u2="&#x201a;" k="5" />
+<hkern u1="B" u2="&#x2019;" k="10" />
+<hkern u1="B" u2="&#x2018;" k="10" />
+<hkern u1="B" u2="x" k="3" />
+<hkern u1="B" u2="v" k="4" />
+<hkern u1="B" u2="X" k="3" />
+<hkern u1="B" u2="V" k="4" />
+<hkern u1="B" u2="&#x2e;" k="5" />
+<hkern u1="B" u2="&#x2c;" k="5" />
+<hkern u1="C" u2="&#x2026;" k="6" />
+<hkern u1="C" u2="&#x201e;" k="6" />
+<hkern u1="C" u2="&#x201d;" k="6" />
+<hkern u1="C" u2="&#x201c;" k="6" />
+<hkern u1="C" u2="&#x201a;" k="6" />
+<hkern u1="C" u2="&#x2019;" k="6" />
+<hkern u1="C" u2="&#x2018;" k="6" />
+<hkern u1="C" u2="x" k="11" />
+<hkern u1="C" u2="X" k="11" />
+<hkern u1="C" u2="&#x2e;" k="6" />
+<hkern u1="C" u2="&#x2c;" k="6" />
+<hkern u1="D" u2="&#x2026;" k="10" />
+<hkern u1="D" u2="&#x201e;" k="10" />
+<hkern u1="D" u2="&#x201d;" k="10" />
+<hkern u1="D" u2="&#x201c;" k="10" />
+<hkern u1="D" u2="&#x201a;" k="10" />
+<hkern u1="D" u2="&#x2019;" k="10" />
+<hkern u1="D" u2="&#x2018;" k="10" />
+<hkern u1="D" u2="x" k="15" />
+<hkern u1="D" u2="v" k="1" />
+<hkern u1="D" u2="X" k="15" />
+<hkern u1="D" u2="V" k="1" />
+<hkern u1="D" u2="&#x2e;" k="10" />
+<hkern u1="D" u2="&#x2c;" k="10" />
+<hkern u1="F" u2="&#x2026;" k="70" />
+<hkern u1="F" u2="&#x201e;" k="70" />
+<hkern u1="F" u2="&#x201a;" k="70" />
+<hkern u1="F" u2="&#x7d;" k="-5" />
+<hkern u1="F" u2="]" k="-5" />
+<hkern u1="F" u2="&#x2e;" k="70" />
+<hkern u1="F" u2="&#x2c;" k="70" />
+<hkern u1="F" u2="&#x29;" k="-5" />
+<hkern u1="G" u2="&#x2026;" k="10" />
+<hkern u1="G" u2="&#x201e;" k="10" />
+<hkern u1="G" u2="&#x201d;" k="10" />
+<hkern u1="G" u2="&#x201c;" k="10" />
+<hkern u1="G" u2="&#x201a;" k="10" />
+<hkern u1="G" u2="&#x2019;" k="10" />
+<hkern u1="G" u2="&#x2018;" k="10" />
+<hkern u1="G" u2="x" k="15" />
+<hkern u1="G" u2="v" k="1" />
+<hkern u1="G" u2="X" k="15" />
+<hkern u1="G" u2="V" k="1" />
+<hkern u1="G" u2="&#x2e;" k="10" />
+<hkern u1="G" u2="&#x2c;" k="10" />
+<hkern u1="J" u2="&#x2026;" k="6" />
+<hkern u1="J" u2="&#x201e;" k="6" />
+<hkern u1="J" u2="&#x201a;" k="6" />
+<hkern u1="J" u2="&#x2e;" k="6" />
+<hkern u1="J" u2="&#x2c;" k="6" />
+<hkern u1="K" u2="&#x153;" k="7" />
+<hkern u1="K" u2="&#x152;" k="7" />
+<hkern u1="K" u2="q" k="7" />
+<hkern u1="K" u2="Q" k="7" />
+<hkern u1="L" u2="&#x201d;" k="75" />
+<hkern u1="L" u2="&#x201c;" k="75" />
+<hkern u1="L" u2="&#x2019;" k="75" />
+<hkern u1="L" u2="&#x2018;" k="75" />
+<hkern u1="L" u2="&#x7d;" k="-8" />
+<hkern u1="L" u2="v" k="33" />
+<hkern u1="L" u2="]" k="-8" />
+<hkern u1="L" u2="V" k="33" />
+<hkern u1="L" u2="&#x3f;" k="30" />
+<hkern u1="L" u2="&#x29;" k="-8" />
+<hkern u1="O" u2="&#x2026;" k="10" />
+<hkern u1="O" u2="&#x201e;" k="10" />
+<hkern u1="O" u2="&#x201d;" k="10" />
+<hkern u1="O" u2="&#x201c;" k="10" />
+<hkern u1="O" u2="&#x201a;" k="10" />
+<hkern u1="O" u2="&#x2019;" k="10" />
+<hkern u1="O" u2="&#x2018;" k="10" />
+<hkern u1="O" u2="x" k="15" />
+<hkern u1="O" u2="v" k="1" />
+<hkern u1="O" u2="X" k="15" />
+<hkern u1="O" u2="V" k="1" />
+<hkern u1="O" u2="&#x2e;" k="10" />
+<hkern u1="O" u2="&#x2c;" k="10" />
+<hkern u1="P" u2="&#x2026;" k="80" />
+<hkern u1="P" u2="&#x201e;" k="80" />
+<hkern u1="P" u2="&#x201a;" k="80" />
+<hkern u1="P" u2="x" k="11" />
+<hkern u1="P" u2="X" k="11" />
+<hkern u1="P" u2="&#x2e;" k="80" />
+<hkern u1="P" u2="&#x2c;" k="80" />
+<hkern u1="Q" u2="&#x201d;" k="10" />
+<hkern u1="Q" u2="&#x201c;" k="10" />
+<hkern u1="Q" u2="&#x2019;" k="10" />
+<hkern u1="Q" u2="&#x2018;" k="10" />
+<hkern u1="Q" u2="&#x178;" k="13" />
+<hkern u1="Q" u2="&#xff;" k="13" />
+<hkern u1="Q" u2="&#xfd;" k="13" />
+<hkern u1="Q" u2="&#xdd;" k="13" />
+<hkern u1="Q" u2="y" k="13" />
+<hkern u1="Q" u2="v" k="1" />
+<hkern u1="Q" u2="Y" k="13" />
+<hkern u1="Q" u2="V" k="1" />
+<hkern u1="R" u2="v" k="2" />
+<hkern u1="R" u2="V" k="2" />
+<hkern u1="S" u2="&#x2026;" k="5" />
+<hkern u1="S" u2="&#x201e;" k="5" />
+<hkern u1="S" u2="&#x201d;" k="5" />
+<hkern u1="S" u2="&#x201c;" k="5" />
+<hkern u1="S" u2="&#x201a;" k="5" />
+<hkern u1="S" u2="&#x2019;" k="5" />
+<hkern u1="S" u2="&#x2018;" k="5" />
+<hkern u1="S" u2="x" k="8" />
+<hkern u1="S" u2="v" k="1" />
+<hkern u1="S" u2="X" k="8" />
+<hkern u1="S" u2="V" k="1" />
+<hkern u1="S" u2="&#x2e;" k="5" />
+<hkern u1="S" u2="&#x2c;" k="5" />
+<hkern u1="T" u2="&#x2026;" k="60" />
+<hkern u1="T" u2="&#x201e;" k="60" />
+<hkern u1="T" u2="&#x201a;" k="60" />
+<hkern u1="T" u2="&#x7d;" k="-8" />
+<hkern u1="T" u2="]" k="-8" />
+<hkern u1="T" u2="&#x3b;" k="35" />
+<hkern u1="T" u2="&#x3a;" k="35" />
+<hkern u1="T" u2="&#x2e;" k="60" />
+<hkern u1="T" u2="&#x2c;" k="60" />
+<hkern u1="T" u2="&#x29;" k="-8" />
+<hkern u1="U" u2="&#x2026;" k="6" />
+<hkern u1="U" u2="&#x201e;" k="6" />
+<hkern u1="U" u2="&#x201a;" k="6" />
+<hkern u1="U" u2="&#x2e;" k="6" />
+<hkern u1="U" u2="&#x2c;" k="6" />
+<hkern u1="V" u2="&#x2026;" k="60" />
+<hkern u1="V" u2="&#x201e;" k="60" />
+<hkern u1="V" u2="&#x201a;" k="60" />
+<hkern u1="V" u2="&#x153;" k="1" />
+<hkern u1="V" u2="&#x152;" k="1" />
+<hkern u1="V" u2="&#xf8;" k="1" />
+<hkern u1="V" u2="&#xf6;" k="1" />
+<hkern u1="V" u2="&#xf5;" k="1" />
+<hkern u1="V" u2="&#xf4;" k="1" />
+<hkern u1="V" u2="&#xf3;" k="1" />
+<hkern u1="V" u2="&#xf2;" k="1" />
+<hkern u1="V" u2="&#xe7;" k="1" />
+<hkern u1="V" u2="&#xe6;" k="46" />
+<hkern u1="V" u2="&#xe5;" k="25" />
+<hkern u1="V" u2="&#xe4;" k="25" />
+<hkern u1="V" u2="&#xe3;" k="25" />
+<hkern u1="V" u2="&#xe2;" k="25" />
+<hkern u1="V" u2="&#xe1;" k="25" />
+<hkern u1="V" u2="&#xe0;" k="25" />
+<hkern u1="V" u2="&#xd8;" k="1" />
+<hkern u1="V" u2="&#xd6;" k="1" />
+<hkern u1="V" u2="&#xd5;" k="1" />
+<hkern u1="V" u2="&#xd4;" k="1" />
+<hkern u1="V" u2="&#xd3;" k="1" />
+<hkern u1="V" u2="&#xd2;" k="1" />
+<hkern u1="V" u2="&#xc7;" k="1" />
+<hkern u1="V" u2="&#xc6;" k="46" />
+<hkern u1="V" u2="&#xc5;" k="25" />
+<hkern u1="V" u2="&#xc4;" k="25" />
+<hkern u1="V" u2="&#xc3;" k="25" />
+<hkern u1="V" u2="&#xc2;" k="25" />
+<hkern u1="V" u2="&#xc1;" k="25" />
+<hkern u1="V" u2="&#xc0;" k="25" />
+<hkern u1="V" u2="&#xad;" k="10" />
+<hkern u1="V" u2="&#x7d;" k="-3" />
+<hkern u1="V" u2="q" k="1" />
+<hkern u1="V" u2="o" k="1" />
+<hkern u1="V" u2="j" k="25" />
+<hkern u1="V" u2="g" k="1" />
+<hkern u1="V" u2="c" k="1" />
+<hkern u1="V" u2="a" k="25" />
+<hkern u1="V" u2="]" k="-3" />
+<hkern u1="V" u2="Q" k="1" />
+<hkern u1="V" u2="O" k="1" />
+<hkern u1="V" u2="J" k="25" />
+<hkern u1="V" u2="G" k="1" />
+<hkern u1="V" u2="C" k="1" />
+<hkern u1="V" u2="A" k="25" />
+<hkern u1="V" u2="&#x2e;" k="60" />
+<hkern u1="V" u2="&#x2d;" k="10" />
+<hkern u1="V" u2="&#x2c;" k="60" />
+<hkern u1="V" u2="&#x29;" k="-3" />
+<hkern u1="W" u2="&#x2026;" k="40" />
+<hkern u1="W" u2="&#x201e;" k="40" />
+<hkern u1="W" u2="&#x201a;" k="40" />
+<hkern u1="W" u2="&#x7d;" k="-3" />
+<hkern u1="W" u2="]" k="-3" />
+<hkern u1="W" u2="&#x2e;" k="40" />
+<hkern u1="W" u2="&#x2c;" k="40" />
+<hkern u1="W" u2="&#x29;" k="-3" />
+<hkern u1="X" u2="&#x201d;" k="2" />
+<hkern u1="X" u2="&#x201c;" k="2" />
+<hkern u1="X" u2="&#x2019;" k="2" />
+<hkern u1="X" u2="&#x2018;" k="2" />
+<hkern u1="X" u2="&#x153;" k="15" />
+<hkern u1="X" u2="&#x152;" k="15" />
+<hkern u1="X" u2="&#xf8;" k="15" />
+<hkern u1="X" u2="&#xf6;" k="15" />
+<hkern u1="X" u2="&#xf5;" k="15" />
+<hkern u1="X" u2="&#xf4;" k="15" />
+<hkern u1="X" u2="&#xf3;" k="15" />
+<hkern u1="X" u2="&#xf2;" k="15" />
+<hkern u1="X" u2="&#xe7;" k="15" />
+<hkern u1="X" u2="&#xdf;" k="8" />
+<hkern u1="X" u2="&#xd8;" k="15" />
+<hkern u1="X" u2="&#xd6;" k="15" />
+<hkern u1="X" u2="&#xd5;" k="15" />
+<hkern u1="X" u2="&#xd4;" k="15" />
+<hkern u1="X" u2="&#xd3;" k="15" />
+<hkern u1="X" u2="&#xd2;" k="15" />
+<hkern u1="X" u2="&#xc7;" k="15" />
+<hkern u1="X" u2="&#xad;" k="15" />
+<hkern u1="X" u2="s" k="8" />
+<hkern u1="X" u2="q" k="15" />
+<hkern u1="X" u2="o" k="15" />
+<hkern u1="X" u2="g" k="15" />
+<hkern u1="X" u2="c" k="15" />
+<hkern u1="X" u2="S" k="8" />
+<hkern u1="X" u2="Q" k="15" />
+<hkern u1="X" u2="O" k="15" />
+<hkern u1="X" u2="G" k="15" />
+<hkern u1="X" u2="C" k="15" />
+<hkern u1="X" u2="&#x2d;" k="15" />
+<hkern u1="Y" u2="&#x2026;" k="80" />
+<hkern u1="Y" u2="&#x201e;" k="80" />
+<hkern u1="Y" u2="&#x201a;" k="80" />
+<hkern u1="Y" u2="&#x153;" k="15" />
+<hkern u1="Y" u2="&#x152;" k="15" />
+<hkern u1="Y" u2="&#x7d;" k="-5" />
+<hkern u1="Y" u2="q" k="15" />
+<hkern u1="Y" u2="]" k="-5" />
+<hkern u1="Y" u2="Q" k="15" />
+<hkern u1="Y" u2="&#x3b;" k="20" />
+<hkern u1="Y" u2="&#x3a;" k="20" />
+<hkern u1="Y" u2="&#x2e;" k="80" />
+<hkern u1="Y" u2="&#x2c;" k="80" />
+<hkern u1="Y" u2="&#x29;" k="-5" />
+<hkern u1="[" u2="&#x178;" k="-5" />
+<hkern u1="[" u2="&#xff;" k="-5" />
+<hkern u1="[" u2="&#xfd;" k="-5" />
+<hkern u1="[" u2="&#xdd;" k="-5" />
+<hkern u1="[" u2="y" k="-5" />
+<hkern u1="[" u2="w" k="-3" />
+<hkern u1="[" u2="v" k="-3" />
+<hkern u1="[" u2="t" k="-8" />
+<hkern u1="[" u2="Y" k="-5" />
+<hkern u1="[" u2="W" k="-3" />
+<hkern u1="[" u2="V" k="-3" />
+<hkern u1="[" u2="T" k="-8" />
+<hkern u1="a" u2="&#x201d;" k="60" />
+<hkern u1="a" u2="&#x201c;" k="60" />
+<hkern u1="a" u2="&#x2019;" k="60" />
+<hkern u1="a" u2="&#x2018;" k="60" />
+<hkern u1="a" u2="&#x153;" k="1" />
+<hkern u1="a" u2="&#x152;" k="1" />
+<hkern u1="a" u2="v" k="25" />
+<hkern u1="a" u2="q" k="1" />
+<hkern u1="a" u2="V" k="25" />
+<hkern u1="a" u2="Q" k="1" />
+<hkern u1="a" u2="&#x3f;" k="30" />
+<hkern u1="b" u2="&#x2026;" k="5" />
+<hkern u1="b" u2="&#x201e;" k="5" />
+<hkern u1="b" u2="&#x201d;" k="10" />
+<hkern u1="b" u2="&#x201c;" k="10" />
+<hkern u1="b" u2="&#x201a;" k="5" />
+<hkern u1="b" u2="&#x2019;" k="10" />
+<hkern u1="b" u2="&#x2018;" k="10" />
+<hkern u1="b" u2="x" k="3" />
+<hkern u1="b" u2="v" k="4" />
+<hkern u1="b" u2="X" k="3" />
+<hkern u1="b" u2="V" k="4" />
+<hkern u1="b" u2="&#x2e;" k="5" />
+<hkern u1="b" u2="&#x2c;" k="5" />
+<hkern u1="c" u2="&#x2026;" k="6" />
+<hkern u1="c" u2="&#x201e;" k="6" />
+<hkern u1="c" u2="&#x201d;" k="6" />
+<hkern u1="c" u2="&#x201c;" k="6" />
+<hkern u1="c" u2="&#x201a;" k="6" />
+<hkern u1="c" u2="&#x2019;" k="6" />
+<hkern u1="c" u2="&#x2018;" k="6" />
+<hkern u1="c" u2="x" k="11" />
+<hkern u1="c" u2="X" k="11" />
+<hkern u1="c" u2="&#x2e;" k="6" />
+<hkern u1="c" u2="&#x2c;" k="6" />
+<hkern u1="d" u2="&#x2026;" k="10" />
+<hkern u1="d" u2="&#x201e;" k="10" />
+<hkern u1="d" u2="&#x201d;" k="10" />
+<hkern u1="d" u2="&#x201c;" k="10" />
+<hkern u1="d" u2="&#x201a;" k="10" />
+<hkern u1="d" u2="&#x2019;" k="10" />
+<hkern u1="d" u2="&#x2018;" k="10" />
+<hkern u1="d" u2="x" k="15" />
+<hkern u1="d" u2="v" k="1" />
+<hkern u1="d" u2="X" k="15" />
+<hkern u1="d" u2="V" k="1" />
+<hkern u1="d" u2="&#x2e;" k="10" />
+<hkern u1="d" u2="&#x2c;" k="10" />
+<hkern u1="f" u2="&#x2026;" k="70" />
+<hkern u1="f" u2="&#x201e;" k="70" />
+<hkern u1="f" u2="&#x201a;" k="70" />
+<hkern u1="f" u2="&#x7d;" k="-5" />
+<hkern u1="f" u2="]" k="-5" />
+<hkern u1="f" u2="&#x2e;" k="70" />
+<hkern u1="f" u2="&#x2c;" k="70" />
+<hkern u1="f" u2="&#x29;" k="-5" />
+<hkern u1="g" u2="&#x2026;" k="10" />
+<hkern u1="g" u2="&#x201e;" k="10" />
+<hkern u1="g" u2="&#x201d;" k="10" />
+<hkern u1="g" u2="&#x201c;" k="10" />
+<hkern u1="g" u2="&#x201a;" k="10" />
+<hkern u1="g" u2="&#x2019;" k="10" />
+<hkern u1="g" u2="&#x2018;" k="10" />
+<hkern u1="g" u2="x" k="15" />
+<hkern u1="g" u2="v" k="1" />
+<hkern u1="g" u2="X" k="15" />
+<hkern u1="g" u2="V" k="1" />
+<hkern u1="g" u2="&#x2e;" k="10" />
+<hkern u1="g" u2="&#x2c;" k="10" />
+<hkern u1="j" u2="&#x2026;" k="6" />
+<hkern u1="j" u2="&#x201e;" k="6" />
+<hkern u1="j" u2="&#x201a;" k="6" />
+<hkern u1="j" u2="&#x2e;" k="6" />
+<hkern u1="j" u2="&#x2c;" k="6" />
+<hkern u1="k" u2="&#x153;" k="7" />
+<hkern u1="k" u2="&#x152;" k="7" />
+<hkern u1="k" u2="q" k="7" />
+<hkern u1="k" u2="Q" k="7" />
+<hkern u1="l" u2="&#x201d;" k="75" />
+<hkern u1="l" u2="&#x201c;" k="75" />
+<hkern u1="l" u2="&#x2019;" k="75" />
+<hkern u1="l" u2="&#x2018;" k="75" />
+<hkern u1="l" u2="&#x7d;" k="-8" />
+<hkern u1="l" u2="v" k="33" />
+<hkern u1="l" u2="]" k="-8" />
+<hkern u1="l" u2="V" k="33" />
+<hkern u1="l" u2="&#x3f;" k="30" />
+<hkern u1="l" u2="&#x29;" k="-8" />
+<hkern u1="o" u2="&#x2026;" k="10" />
+<hkern u1="o" u2="&#x201e;" k="10" />
+<hkern u1="o" u2="&#x201d;" k="10" />
+<hkern u1="o" u2="&#x201c;" k="10" />
+<hkern u1="o" u2="&#x201a;" k="10" />
+<hkern u1="o" u2="&#x2019;" k="10" />
+<hkern u1="o" u2="&#x2018;" k="10" />
+<hkern u1="o" u2="x" k="15" />
+<hkern u1="o" u2="v" k="1" />
+<hkern u1="o" u2="X" k="15" />
+<hkern u1="o" u2="V" k="1" />
+<hkern u1="o" u2="&#x2e;" k="10" />
+<hkern u1="o" u2="&#x2c;" k="10" />
+<hkern u1="p" u2="&#x2026;" k="80" />
+<hkern u1="p" u2="&#x201e;" k="80" />
+<hkern u1="p" u2="&#x201a;" k="80" />
+<hkern u1="p" u2="x" k="11" />
+<hkern u1="p" u2="X" k="11" />
+<hkern u1="p" u2="&#x2e;" k="80" />
+<hkern u1="p" u2="&#x2c;" k="80" />
+<hkern u1="q" u2="&#x201d;" k="10" />
+<hkern u1="q" u2="&#x201c;" k="10" />
+<hkern u1="q" u2="&#x2019;" k="10" />
+<hkern u1="q" u2="&#x2018;" k="10" />
+<hkern u1="q" u2="&#x178;" k="13" />
+<hkern u1="q" u2="&#xff;" k="13" />
+<hkern u1="q" u2="&#xfd;" k="13" />
+<hkern u1="q" u2="&#xdd;" k="13" />
+<hkern u1="q" u2="y" k="13" />
+<hkern u1="q" u2="v" k="1" />
+<hkern u1="q" u2="Y" k="13" />
+<hkern u1="q" u2="V" k="1" />
+<hkern u1="r" u2="v" k="2" />
+<hkern u1="r" u2="V" k="2" />
+<hkern u1="s" u2="&#x2026;" k="5" />
+<hkern u1="s" u2="&#x201e;" k="5" />
+<hkern u1="s" u2="&#x201d;" k="5" />
+<hkern u1="s" u2="&#x201c;" k="5" />
+<hkern u1="s" u2="&#x201a;" k="5" />
+<hkern u1="s" u2="&#x2019;" k="5" />
+<hkern u1="s" u2="&#x2018;" k="5" />
+<hkern u1="s" u2="x" k="8" />
+<hkern u1="s" u2="v" k="1" />
+<hkern u1="s" u2="X" k="8" />
+<hkern u1="s" u2="V" k="1" />
+<hkern u1="s" u2="&#x2e;" k="5" />
+<hkern u1="s" u2="&#x2c;" k="5" />
+<hkern u1="t" u2="&#x2026;" k="60" />
+<hkern u1="t" u2="&#x201e;" k="60" />
+<hkern u1="t" u2="&#x201a;" k="60" />
+<hkern u1="t" u2="&#x7d;" k="-8" />
+<hkern u1="t" u2="]" k="-8" />
+<hkern u1="t" u2="&#x3b;" k="35" />
+<hkern u1="t" u2="&#x3a;" k="35" />
+<hkern u1="t" u2="&#x2e;" k="60" />
+<hkern u1="t" u2="&#x2c;" k="60" />
+<hkern u1="t" u2="&#x29;" k="-8" />
+<hkern u1="u" u2="&#x2026;" k="6" />
+<hkern u1="u" u2="&#x201e;" k="6" />
+<hkern u1="u" u2="&#x201a;" k="6" />
+<hkern u1="u" u2="&#x2e;" k="6" />
+<hkern u1="u" u2="&#x2c;" k="6" />
+<hkern u1="v" u2="&#x2026;" k="60" />
+<hkern u1="v" u2="&#x201e;" k="60" />
+<hkern u1="v" u2="&#x201a;" k="60" />
+<hkern u1="v" u2="&#x153;" k="1" />
+<hkern u1="v" u2="&#x152;" k="1" />
+<hkern u1="v" u2="&#xf8;" k="1" />
+<hkern u1="v" u2="&#xf6;" k="1" />
+<hkern u1="v" u2="&#xf5;" k="1" />
+<hkern u1="v" u2="&#xf4;" k="1" />
+<hkern u1="v" u2="&#xf3;" k="1" />
+<hkern u1="v" u2="&#xf2;" k="1" />
+<hkern u1="v" u2="&#xe7;" k="1" />
+<hkern u1="v" u2="&#xe6;" k="46" />
+<hkern u1="v" u2="&#xe5;" k="25" />
+<hkern u1="v" u2="&#xe4;" k="25" />
+<hkern u1="v" u2="&#xe3;" k="25" />
+<hkern u1="v" u2="&#xe2;" k="25" />
+<hkern u1="v" u2="&#xe1;" k="25" />
+<hkern u1="v" u2="&#xe0;" k="25" />
+<hkern u1="v" u2="&#xd8;" k="1" />
+<hkern u1="v" u2="&#xd6;" k="1" />
+<hkern u1="v" u2="&#xd5;" k="1" />
+<hkern u1="v" u2="&#xd4;" k="1" />
+<hkern u1="v" u2="&#xd3;" k="1" />
+<hkern u1="v" u2="&#xd2;" k="1" />
+<hkern u1="v" u2="&#xc7;" k="1" />
+<hkern u1="v" u2="&#xc6;" k="46" />
+<hkern u1="v" u2="&#xc5;" k="25" />
+<hkern u1="v" u2="&#xc4;" k="25" />
+<hkern u1="v" u2="&#xc3;" k="25" />
+<hkern u1="v" u2="&#xc2;" k="25" />
+<hkern u1="v" u2="&#xc1;" k="25" />
+<hkern u1="v" u2="&#xc0;" k="25" />
+<hkern u1="v" u2="&#xad;" k="10" />
+<hkern u1="v" u2="&#x7d;" k="-3" />
+<hkern u1="v" u2="q" k="1" />
+<hkern u1="v" u2="o" k="1" />
+<hkern u1="v" u2="j" k="25" />
+<hkern u1="v" u2="g" k="1" />
+<hkern u1="v" u2="c" k="1" />
+<hkern u1="v" u2="a" k="25" />
+<hkern u1="v" u2="]" k="-3" />
+<hkern u1="v" u2="Q" k="1" />
+<hkern u1="v" u2="O" k="1" />
+<hkern u1="v" u2="J" k="25" />
+<hkern u1="v" u2="G" k="1" />
+<hkern u1="v" u2="C" k="1" />
+<hkern u1="v" u2="A" k="25" />
+<hkern u1="v" u2="&#x2e;" k="60" />
+<hkern u1="v" u2="&#x2d;" k="10" />
+<hkern u1="v" u2="&#x2c;" k="60" />
+<hkern u1="v" u2="&#x29;" k="-3" />
+<hkern u1="w" u2="&#x2026;" k="40" />
+<hkern u1="w" u2="&#x201e;" k="40" />
+<hkern u1="w" u2="&#x201a;" k="40" />
+<hkern u1="w" u2="&#x7d;" k="-3" />
+<hkern u1="w" u2="]" k="-3" />
+<hkern u1="w" u2="&#x2e;" k="40" />
+<hkern u1="w" u2="&#x2c;" k="40" />
+<hkern u1="w" u2="&#x29;" k="-3" />
+<hkern u1="x" u2="&#x201d;" k="2" />
+<hkern u1="x" u2="&#x201c;" k="2" />
+<hkern u1="x" u2="&#x2019;" k="2" />
+<hkern u1="x" u2="&#x2018;" k="2" />
+<hkern u1="x" u2="&#x153;" k="15" />
+<hkern u1="x" u2="&#x152;" k="15" />
+<hkern u1="x" u2="&#xf8;" k="15" />
+<hkern u1="x" u2="&#xf6;" k="15" />
+<hkern u1="x" u2="&#xf5;" k="15" />
+<hkern u1="x" u2="&#xf4;" k="15" />
+<hkern u1="x" u2="&#xf3;" k="15" />
+<hkern u1="x" u2="&#xf2;" k="15" />
+<hkern u1="x" u2="&#xe7;" k="15" />
+<hkern u1="x" u2="&#xdf;" k="8" />
+<hkern u1="x" u2="&#xd8;" k="15" />
+<hkern u1="x" u2="&#xd6;" k="15" />
+<hkern u1="x" u2="&#xd5;" k="15" />
+<hkern u1="x" u2="&#xd4;" k="15" />
+<hkern u1="x" u2="&#xd3;" k="15" />
+<hkern u1="x" u2="&#xd2;" k="15" />
+<hkern u1="x" u2="&#xc7;" k="15" />
+<hkern u1="x" u2="&#xad;" k="15" />
+<hkern u1="x" u2="s" k="8" />
+<hkern u1="x" u2="q" k="15" />
+<hkern u1="x" u2="o" k="15" />
+<hkern u1="x" u2="g" k="15" />
+<hkern u1="x" u2="c" k="15" />
+<hkern u1="x" u2="S" k="8" />
+<hkern u1="x" u2="Q" k="15" />
+<hkern u1="x" u2="O" k="15" />
+<hkern u1="x" u2="G" k="15" />
+<hkern u1="x" u2="C" k="15" />
+<hkern u1="x" u2="&#x2d;" k="15" />
+<hkern u1="y" u2="&#x2026;" k="80" />
+<hkern u1="y" u2="&#x201e;" k="80" />
+<hkern u1="y" u2="&#x201a;" k="80" />
+<hkern u1="y" u2="&#x153;" k="15" />
+<hkern u1="y" u2="&#x152;" k="15" />
+<hkern u1="y" u2="&#x7d;" k="-5" />
+<hkern u1="y" u2="q" k="15" />
+<hkern u1="y" u2="]" k="-5" />
+<hkern u1="y" u2="Q" k="15" />
+<hkern u1="y" u2="&#x3b;" k="20" />
+<hkern u1="y" u2="&#x3a;" k="20" />
+<hkern u1="y" u2="&#x2e;" k="80" />
+<hkern u1="y" u2="&#x2c;" k="80" />
+<hkern u1="y" u2="&#x29;" k="-5" />
+<hkern u1="&#x7b;" u2="&#x178;" k="-5" />
+<hkern u1="&#x7b;" u2="&#xff;" k="-5" />
+<hkern u1="&#x7b;" u2="&#xfd;" k="-5" />
+<hkern u1="&#x7b;" u2="&#xdd;" k="-5" />
+<hkern u1="&#x7b;" u2="y" k="-5" />
+<hkern u1="&#x7b;" u2="w" k="-3" />
+<hkern u1="&#x7b;" u2="v" k="-3" />
+<hkern u1="&#x7b;" u2="t" k="-8" />
+<hkern u1="&#x7b;" u2="Y" k="-5" />
+<hkern u1="&#x7b;" u2="W" k="-3" />
+<hkern u1="&#x7b;" u2="V" k="-3" />
+<hkern u1="&#x7b;" u2="T" k="-8" />
+<hkern u1="&#xad;" u2="x" k="15" />
+<hkern u1="&#xad;" u2="v" k="10" />
+<hkern u1="&#xad;" u2="X" k="15" />
+<hkern u1="&#xad;" u2="V" k="10" />
+<hkern u1="&#xbf;" u2="&#x178;" k="30" />
+<hkern u1="&#xbf;" u2="&#xff;" k="30" />
+<hkern u1="&#xbf;" u2="&#xfd;" k="30" />
+<hkern u1="&#xbf;" u2="&#xdd;" k="30" />
+<hkern u1="&#xbf;" u2="y" k="30" />
+<hkern u1="&#xbf;" u2="w" k="20" />
+<hkern u1="&#xbf;" u2="v" k="30" />
+<hkern u1="&#xbf;" u2="t" k="42" />
+<hkern u1="&#xbf;" u2="Y" k="30" />
+<hkern u1="&#xbf;" u2="W" k="20" />
+<hkern u1="&#xbf;" u2="V" k="30" />
+<hkern u1="&#xbf;" u2="T" k="42" />
+<hkern u1="&#xc0;" u2="&#x201d;" k="60" />
+<hkern u1="&#xc0;" u2="&#x201c;" k="60" />
+<hkern u1="&#xc0;" u2="&#x2019;" k="60" />
+<hkern u1="&#xc0;" u2="&#x2018;" k="60" />
+<hkern u1="&#xc0;" u2="&#x153;" k="1" />
+<hkern u1="&#xc0;" u2="&#x152;" k="1" />
+<hkern u1="&#xc0;" u2="v" k="25" />
+<hkern u1="&#xc0;" u2="q" k="1" />
+<hkern u1="&#xc0;" u2="V" k="25" />
+<hkern u1="&#xc0;" u2="Q" k="1" />
+<hkern u1="&#xc0;" u2="&#x3f;" k="30" />
+<hkern u1="&#xc1;" u2="&#x201d;" k="60" />
+<hkern u1="&#xc1;" u2="&#x201c;" k="60" />
+<hkern u1="&#xc1;" u2="&#x2019;" k="60" />
+<hkern u1="&#xc1;" u2="&#x2018;" k="60" />
+<hkern u1="&#xc1;" u2="&#x153;" k="1" />
+<hkern u1="&#xc1;" u2="&#x152;" k="1" />
+<hkern u1="&#xc1;" u2="v" k="25" />
+<hkern u1="&#xc1;" u2="q" k="1" />
+<hkern u1="&#xc1;" u2="V" k="25" />
+<hkern u1="&#xc1;" u2="Q" k="1" />
+<hkern u1="&#xc1;" u2="&#x3f;" k="30" />
+<hkern u1="&#xc2;" u2="&#x201d;" k="60" />
+<hkern u1="&#xc2;" u2="&#x201c;" k="60" />
+<hkern u1="&#xc2;" u2="&#x2019;" k="60" />
+<hkern u1="&#xc2;" u2="&#x2018;" k="60" />
+<hkern u1="&#xc2;" u2="&#x153;" k="1" />
+<hkern u1="&#xc2;" u2="&#x152;" k="1" />
+<hkern u1="&#xc2;" u2="v" k="25" />
+<hkern u1="&#xc2;" u2="q" k="1" />
+<hkern u1="&#xc2;" u2="V" k="25" />
+<hkern u1="&#xc2;" u2="Q" k="1" />
+<hkern u1="&#xc2;" u2="&#x3f;" k="30" />
+<hkern u1="&#xc3;" u2="&#x201d;" k="60" />
+<hkern u1="&#xc3;" u2="&#x201c;" k="60" />
+<hkern u1="&#xc3;" u2="&#x2019;" k="60" />
+<hkern u1="&#xc3;" u2="&#x2018;" k="60" />
+<hkern u1="&#xc3;" u2="&#x153;" k="1" />
+<hkern u1="&#xc3;" u2="&#x152;" k="1" />
+<hkern u1="&#xc3;" u2="v" k="25" />
+<hkern u1="&#xc3;" u2="q" k="1" />
+<hkern u1="&#xc3;" u2="V" k="25" />
+<hkern u1="&#xc3;" u2="Q" k="1" />
+<hkern u1="&#xc3;" u2="&#x3f;" k="30" />
+<hkern u1="&#xc4;" u2="&#x201d;" k="60" />
+<hkern u1="&#xc4;" u2="&#x201c;" k="60" />
+<hkern u1="&#xc4;" u2="&#x2019;" k="60" />
+<hkern u1="&#xc4;" u2="&#x2018;" k="60" />
+<hkern u1="&#xc4;" u2="&#x153;" k="1" />
+<hkern u1="&#xc4;" u2="&#x152;" k="1" />
+<hkern u1="&#xc4;" u2="v" k="25" />
+<hkern u1="&#xc4;" u2="q" k="1" />
+<hkern u1="&#xc4;" u2="V" k="25" />
+<hkern u1="&#xc4;" u2="Q" k="1" />
+<hkern u1="&#xc4;" u2="&#x3f;" k="30" />
+<hkern u1="&#xc5;" u2="&#x201d;" k="60" />
+<hkern u1="&#xc5;" u2="&#x201c;" k="60" />
+<hkern u1="&#xc5;" u2="&#x2019;" k="60" />
+<hkern u1="&#xc5;" u2="&#x2018;" k="60" />
+<hkern u1="&#xc5;" u2="&#x153;" k="1" />
+<hkern u1="&#xc5;" u2="&#x152;" k="1" />
+<hkern u1="&#xc5;" u2="v" k="25" />
+<hkern u1="&#xc5;" u2="q" k="1" />
+<hkern u1="&#xc5;" u2="V" k="25" />
+<hkern u1="&#xc5;" u2="Q" k="1" />
+<hkern u1="&#xc5;" u2="&#x3f;" k="30" />
+<hkern u1="&#xc7;" u2="&#x2026;" k="6" />
+<hkern u1="&#xc7;" u2="&#x201e;" k="6" />
+<hkern u1="&#xc7;" u2="&#x201d;" k="6" />
+<hkern u1="&#xc7;" u2="&#x201c;" k="6" />
+<hkern u1="&#xc7;" u2="&#x201a;" k="6" />
+<hkern u1="&#xc7;" u2="&#x2019;" k="6" />
+<hkern u1="&#xc7;" u2="&#x2018;" k="6" />
+<hkern u1="&#xc7;" u2="x" k="11" />
+<hkern u1="&#xc7;" u2="X" k="11" />
+<hkern u1="&#xc7;" u2="&#x2e;" k="6" />
+<hkern u1="&#xc7;" u2="&#x2c;" k="6" />
+<hkern u1="&#xd0;" u2="&#x2026;" k="10" />
+<hkern u1="&#xd0;" u2="&#x201e;" k="10" />
+<hkern u1="&#xd0;" u2="&#x201d;" k="10" />
+<hkern u1="&#xd0;" u2="&#x201c;" k="10" />
+<hkern u1="&#xd0;" u2="&#x201a;" k="10" />
+<hkern u1="&#xd0;" u2="&#x2019;" k="10" />
+<hkern u1="&#xd0;" u2="&#x2018;" k="10" />
+<hkern u1="&#xd0;" u2="x" k="15" />
+<hkern u1="&#xd0;" u2="v" k="1" />
+<hkern u1="&#xd0;" u2="X" k="15" />
+<hkern u1="&#xd0;" u2="V" k="1" />
+<hkern u1="&#xd0;" u2="&#x2e;" k="10" />
+<hkern u1="&#xd0;" u2="&#x2c;" k="10" />
+<hkern u1="&#xd2;" u2="&#x2026;" k="10" />
+<hkern u1="&#xd2;" u2="&#x201e;" k="10" />
+<hkern u1="&#xd2;" u2="&#x201d;" k="10" />
+<hkern u1="&#xd2;" u2="&#x201c;" k="10" />
+<hkern u1="&#xd2;" u2="&#x201a;" k="10" />
+<hkern u1="&#xd2;" u2="&#x2019;" k="10" />
+<hkern u1="&#xd2;" u2="&#x2018;" k="10" />
+<hkern u1="&#xd2;" u2="x" k="15" />
+<hkern u1="&#xd2;" u2="v" k="1" />
+<hkern u1="&#xd2;" u2="X" k="15" />
+<hkern u1="&#xd2;" u2="V" k="1" />
+<hkern u1="&#xd2;" u2="&#x2e;" k="10" />
+<hkern u1="&#xd2;" u2="&#x2c;" k="10" />
+<hkern u1="&#xd3;" u2="&#x2026;" k="10" />
+<hkern u1="&#xd3;" u2="&#x201e;" k="10" />
+<hkern u1="&#xd3;" u2="&#x201d;" k="10" />
+<hkern u1="&#xd3;" u2="&#x201c;" k="10" />
+<hkern u1="&#xd3;" u2="&#x201a;" k="10" />
+<hkern u1="&#xd3;" u2="&#x2019;" k="10" />
+<hkern u1="&#xd3;" u2="&#x2018;" k="10" />
+<hkern u1="&#xd3;" u2="x" k="15" />
+<hkern u1="&#xd3;" u2="v" k="1" />
+<hkern u1="&#xd3;" u2="X" k="15" />
+<hkern u1="&#xd3;" u2="V" k="1" />
+<hkern u1="&#xd3;" u2="&#x2e;" k="10" />
+<hkern u1="&#xd3;" u2="&#x2c;" k="10" />
+<hkern u1="&#xd4;" u2="&#x2026;" k="10" />
+<hkern u1="&#xd4;" u2="&#x201e;" k="10" />
+<hkern u1="&#xd4;" u2="&#x201d;" k="10" />
+<hkern u1="&#xd4;" u2="&#x201c;" k="10" />
+<hkern u1="&#xd4;" u2="&#x201a;" k="10" />
+<hkern u1="&#xd4;" u2="&#x2019;" k="10" />
+<hkern u1="&#xd4;" u2="&#x2018;" k="10" />
+<hkern u1="&#xd4;" u2="x" k="15" />
+<hkern u1="&#xd4;" u2="v" k="1" />
+<hkern u1="&#xd4;" u2="X" k="15" />
+<hkern u1="&#xd4;" u2="V" k="1" />
+<hkern u1="&#xd4;" u2="&#x2e;" k="10" />
+<hkern u1="&#xd4;" u2="&#x2c;" k="10" />
+<hkern u1="&#xd5;" u2="&#x2026;" k="10" />
+<hkern u1="&#xd5;" u2="&#x201e;" k="10" />
+<hkern u1="&#xd5;" u2="&#x201d;" k="10" />
+<hkern u1="&#xd5;" u2="&#x201c;" k="10" />
+<hkern u1="&#xd5;" u2="&#x201a;" k="10" />
+<hkern u1="&#xd5;" u2="&#x2019;" k="10" />
+<hkern u1="&#xd5;" u2="&#x2018;" k="10" />
+<hkern u1="&#xd5;" u2="x" k="15" />
+<hkern u1="&#xd5;" u2="v" k="1" />
+<hkern u1="&#xd5;" u2="X" k="15" />
+<hkern u1="&#xd5;" u2="V" k="1" />
+<hkern u1="&#xd5;" u2="&#x2e;" k="10" />
+<hkern u1="&#xd5;" u2="&#x2c;" k="10" />
+<hkern u1="&#xd6;" u2="&#x2026;" k="10" />
+<hkern u1="&#xd6;" u2="&#x201e;" k="10" />
+<hkern u1="&#xd6;" u2="&#x201d;" k="10" />
+<hkern u1="&#xd6;" u2="&#x201c;" k="10" />
+<hkern u1="&#xd6;" u2="&#x201a;" k="10" />
+<hkern u1="&#xd6;" u2="&#x2019;" k="10" />
+<hkern u1="&#xd6;" u2="&#x2018;" k="10" />
+<hkern u1="&#xd6;" u2="x" k="15" />
+<hkern u1="&#xd6;" u2="v" k="1" />
+<hkern u1="&#xd6;" u2="X" k="15" />
+<hkern u1="&#xd6;" u2="V" k="1" />
+<hkern u1="&#xd6;" u2="&#x2e;" k="10" />
+<hkern u1="&#xd6;" u2="&#x2c;" k="10" />
+<hkern u1="&#xd8;" u2="&#x2026;" k="10" />
+<hkern u1="&#xd8;" u2="&#x201e;" k="10" />
+<hkern u1="&#xd8;" u2="&#x201d;" k="10" />
+<hkern u1="&#xd8;" u2="&#x201c;" k="10" />
+<hkern u1="&#xd8;" u2="&#x201a;" k="10" />
+<hkern u1="&#xd8;" u2="&#x2019;" k="10" />
+<hkern u1="&#xd8;" u2="&#x2018;" k="10" />
+<hkern u1="&#xd8;" u2="x" k="15" />
+<hkern u1="&#xd8;" u2="v" k="1" />
+<hkern u1="&#xd8;" u2="X" k="15" />
+<hkern u1="&#xd8;" u2="V" k="1" />
+<hkern u1="&#xd8;" u2="&#x2e;" k="10" />
+<hkern u1="&#xd8;" u2="&#x2c;" k="10" />
+<hkern u1="&#xd9;" u2="&#x2026;" k="6" />
+<hkern u1="&#xd9;" u2="&#x201e;" k="6" />
+<hkern u1="&#xd9;" u2="&#x201a;" k="6" />
+<hkern u1="&#xd9;" u2="&#x2e;" k="6" />
+<hkern u1="&#xd9;" u2="&#x2c;" k="6" />
+<hkern u1="&#xda;" u2="&#x2026;" k="6" />
+<hkern u1="&#xda;" u2="&#x201e;" k="6" />
+<hkern u1="&#xda;" u2="&#x201a;" k="6" />
+<hkern u1="&#xda;" u2="&#x2e;" k="6" />
+<hkern u1="&#xda;" u2="&#x2c;" k="6" />
+<hkern u1="&#xdb;" u2="&#x2026;" k="6" />
+<hkern u1="&#xdb;" u2="&#x201e;" k="6" />
+<hkern u1="&#xdb;" u2="&#x201a;" k="6" />
+<hkern u1="&#xdb;" u2="&#x2e;" k="6" />
+<hkern u1="&#xdb;" u2="&#x2c;" k="6" />
+<hkern u1="&#xdc;" u2="&#x2026;" k="6" />
+<hkern u1="&#xdc;" u2="&#x201e;" k="6" />
+<hkern u1="&#xdc;" u2="&#x201a;" k="6" />
+<hkern u1="&#xdc;" u2="&#x2e;" k="6" />
+<hkern u1="&#xdc;" u2="&#x2c;" k="6" />
+<hkern u1="&#xdd;" u2="&#x2026;" k="80" />
+<hkern u1="&#xdd;" u2="&#x201e;" k="80" />
+<hkern u1="&#xdd;" u2="&#x201a;" k="80" />
+<hkern u1="&#xdd;" u2="&#x153;" k="15" />
+<hkern u1="&#xdd;" u2="&#x152;" k="15" />
+<hkern u1="&#xdd;" u2="&#x7d;" k="-5" />
+<hkern u1="&#xdd;" u2="q" k="15" />
+<hkern u1="&#xdd;" u2="]" k="-5" />
+<hkern u1="&#xdd;" u2="Q" k="15" />
+<hkern u1="&#xdd;" u2="&#x3b;" k="20" />
+<hkern u1="&#xdd;" u2="&#x3a;" k="20" />
+<hkern u1="&#xdd;" u2="&#x2e;" k="80" />
+<hkern u1="&#xdd;" u2="&#x2c;" k="80" />
+<hkern u1="&#xdd;" u2="&#x29;" k="-5" />
+<hkern u1="&#xde;" u2="&#x2026;" k="80" />
+<hkern u1="&#xde;" u2="&#x201e;" k="80" />
+<hkern u1="&#xde;" u2="&#x201a;" k="80" />
+<hkern u1="&#xde;" u2="&#x178;" k="9" />
+<hkern u1="&#xde;" u2="&#xff;" k="9" />
+<hkern u1="&#xde;" u2="&#xfd;" k="9" />
+<hkern u1="&#xde;" u2="&#xe6;" k="20" />
+<hkern u1="&#xde;" u2="&#xe5;" k="2" />
+<hkern u1="&#xde;" u2="&#xe4;" k="2" />
+<hkern u1="&#xde;" u2="&#xe3;" k="2" />
+<hkern u1="&#xde;" u2="&#xe2;" k="2" />
+<hkern u1="&#xde;" u2="&#xe1;" k="2" />
+<hkern u1="&#xde;" u2="&#xe0;" k="2" />
+<hkern u1="&#xde;" u2="&#xdd;" k="9" />
+<hkern u1="&#xde;" u2="&#xc6;" k="20" />
+<hkern u1="&#xde;" u2="&#xc5;" k="2" />
+<hkern u1="&#xde;" u2="&#xc4;" k="2" />
+<hkern u1="&#xde;" u2="&#xc3;" k="2" />
+<hkern u1="&#xde;" u2="&#xc2;" k="2" />
+<hkern u1="&#xde;" u2="&#xc1;" k="2" />
+<hkern u1="&#xde;" u2="&#xc0;" k="2" />
+<hkern u1="&#xde;" u2="z" k="10" />
+<hkern u1="&#xde;" u2="y" k="9" />
+<hkern u1="&#xde;" u2="x" k="20" />
+<hkern u1="&#xde;" u2="j" k="8" />
+<hkern u1="&#xde;" u2="a" k="2" />
+<hkern u1="&#xde;" u2="Z" k="10" />
+<hkern u1="&#xde;" u2="Y" k="9" />
+<hkern u1="&#xde;" u2="X" k="20" />
+<hkern u1="&#xde;" u2="J" k="8" />
+<hkern u1="&#xde;" u2="A" k="2" />
+<hkern u1="&#xde;" u2="&#x2e;" k="80" />
+<hkern u1="&#xde;" u2="&#x2c;" k="80" />
+<hkern u1="&#xdf;" u2="&#x2026;" k="5" />
+<hkern u1="&#xdf;" u2="&#x201e;" k="5" />
+<hkern u1="&#xdf;" u2="&#x201d;" k="5" />
+<hkern u1="&#xdf;" u2="&#x201c;" k="5" />
+<hkern u1="&#xdf;" u2="&#x201a;" k="5" />
+<hkern u1="&#xdf;" u2="&#x2019;" k="5" />
+<hkern u1="&#xdf;" u2="&#x2018;" k="5" />
+<hkern u1="&#xdf;" u2="x" k="8" />
+<hkern u1="&#xdf;" u2="v" k="1" />
+<hkern u1="&#xdf;" u2="X" k="8" />
+<hkern u1="&#xdf;" u2="V" k="1" />
+<hkern u1="&#xdf;" u2="&#x2e;" k="5" />
+<hkern u1="&#xdf;" u2="&#x2c;" k="5" />
+<hkern u1="&#xe0;" u2="&#x201d;" k="60" />
+<hkern u1="&#xe0;" u2="&#x201c;" k="60" />
+<hkern u1="&#xe0;" u2="&#x2019;" k="60" />
+<hkern u1="&#xe0;" u2="&#x2018;" k="60" />
+<hkern u1="&#xe0;" u2="&#x153;" k="1" />
+<hkern u1="&#xe0;" u2="&#x152;" k="1" />
+<hkern u1="&#xe0;" u2="v" k="25" />
+<hkern u1="&#xe0;" u2="q" k="1" />
+<hkern u1="&#xe0;" u2="V" k="25" />
+<hkern u1="&#xe0;" u2="Q" k="1" />
+<hkern u1="&#xe0;" u2="&#x3f;" k="30" />
+<hkern u1="&#xe1;" u2="&#x201d;" k="60" />
+<hkern u1="&#xe1;" u2="&#x201c;" k="60" />
+<hkern u1="&#xe1;" u2="&#x2019;" k="60" />
+<hkern u1="&#xe1;" u2="&#x2018;" k="60" />
+<hkern u1="&#xe1;" u2="&#x153;" k="1" />
+<hkern u1="&#xe1;" u2="&#x152;" k="1" />
+<hkern u1="&#xe1;" u2="v" k="25" />
+<hkern u1="&#xe1;" u2="q" k="1" />
+<hkern u1="&#xe1;" u2="V" k="25" />
+<hkern u1="&#xe1;" u2="Q" k="1" />
+<hkern u1="&#xe1;" u2="&#x3f;" k="30" />
+<hkern u1="&#xe2;" u2="&#x201d;" k="60" />
+<hkern u1="&#xe2;" u2="&#x201c;" k="60" />
+<hkern u1="&#xe2;" u2="&#x2019;" k="60" />
+<hkern u1="&#xe2;" u2="&#x2018;" k="60" />
+<hkern u1="&#xe2;" u2="&#x153;" k="1" />
+<hkern u1="&#xe2;" u2="&#x152;" k="1" />
+<hkern u1="&#xe2;" u2="v" k="25" />
+<hkern u1="&#xe2;" u2="q" k="1" />
+<hkern u1="&#xe2;" u2="V" k="25" />
+<hkern u1="&#xe2;" u2="Q" k="1" />
+<hkern u1="&#xe2;" u2="&#x3f;" k="30" />
+<hkern u1="&#xe3;" u2="&#x201d;" k="60" />
+<hkern u1="&#xe3;" u2="&#x201c;" k="60" />
+<hkern u1="&#xe3;" u2="&#x2019;" k="60" />
+<hkern u1="&#xe3;" u2="&#x2018;" k="60" />
+<hkern u1="&#xe3;" u2="&#x153;" k="1" />
+<hkern u1="&#xe3;" u2="&#x152;" k="1" />
+<hkern u1="&#xe3;" u2="v" k="25" />
+<hkern u1="&#xe3;" u2="q" k="1" />
+<hkern u1="&#xe3;" u2="V" k="25" />
+<hkern u1="&#xe3;" u2="Q" k="1" />
+<hkern u1="&#xe3;" u2="&#x3f;" k="30" />
+<hkern u1="&#xe4;" u2="&#x201d;" k="60" />
+<hkern u1="&#xe4;" u2="&#x201c;" k="60" />
+<hkern u1="&#xe4;" u2="&#x2019;" k="60" />
+<hkern u1="&#xe4;" u2="&#x2018;" k="60" />
+<hkern u1="&#xe4;" u2="&#x153;" k="1" />
+<hkern u1="&#xe4;" u2="&#x152;" k="1" />
+<hkern u1="&#xe4;" u2="v" k="25" />
+<hkern u1="&#xe4;" u2="q" k="1" />
+<hkern u1="&#xe4;" u2="V" k="25" />
+<hkern u1="&#xe4;" u2="Q" k="1" />
+<hkern u1="&#xe4;" u2="&#x3f;" k="30" />
+<hkern u1="&#xe5;" u2="&#x201d;" k="60" />
+<hkern u1="&#xe5;" u2="&#x201c;" k="60" />
+<hkern u1="&#xe5;" u2="&#x2019;" k="60" />
+<hkern u1="&#xe5;" u2="&#x2018;" k="60" />
+<hkern u1="&#xe5;" u2="&#x153;" k="1" />
+<hkern u1="&#xe5;" u2="&#x152;" k="1" />
+<hkern u1="&#xe5;" u2="v" k="25" />
+<hkern u1="&#xe5;" u2="q" k="1" />
+<hkern u1="&#xe5;" u2="V" k="25" />
+<hkern u1="&#xe5;" u2="Q" k="1" />
+<hkern u1="&#xe5;" u2="&#x3f;" k="30" />
+<hkern u1="&#xe7;" u2="&#x2026;" k="6" />
+<hkern u1="&#xe7;" u2="&#x201e;" k="6" />
+<hkern u1="&#xe7;" u2="&#x201d;" k="6" />
+<hkern u1="&#xe7;" u2="&#x201c;" k="6" />
+<hkern u1="&#xe7;" u2="&#x201a;" k="6" />
+<hkern u1="&#xe7;" u2="&#x2019;" k="6" />
+<hkern u1="&#xe7;" u2="&#x2018;" k="6" />
+<hkern u1="&#xe7;" u2="x" k="11" />
+<hkern u1="&#xe7;" u2="X" k="11" />
+<hkern u1="&#xe7;" u2="&#x2e;" k="6" />
+<hkern u1="&#xe7;" u2="&#x2c;" k="6" />
+<hkern u1="&#xf0;" u2="&#x2026;" k="10" />
+<hkern u1="&#xf0;" u2="&#x201e;" k="10" />
+<hkern u1="&#xf0;" u2="&#x201d;" k="10" />
+<hkern u1="&#xf0;" u2="&#x201c;" k="10" />
+<hkern u1="&#xf0;" u2="&#x201a;" k="10" />
+<hkern u1="&#xf0;" u2="&#x2019;" k="10" />
+<hkern u1="&#xf0;" u2="&#x2018;" k="10" />
+<hkern u1="&#xf0;" u2="x" k="15" />
+<hkern u1="&#xf0;" u2="v" k="1" />
+<hkern u1="&#xf0;" u2="X" k="15" />
+<hkern u1="&#xf0;" u2="V" k="1" />
+<hkern u1="&#xf0;" u2="&#x2e;" k="10" />
+<hkern u1="&#xf0;" u2="&#x2c;" k="10" />
+<hkern u1="&#xf2;" u2="&#x2026;" k="10" />
+<hkern u1="&#xf2;" u2="&#x201e;" k="10" />
+<hkern u1="&#xf2;" u2="&#x201d;" k="10" />
+<hkern u1="&#xf2;" u2="&#x201c;" k="10" />
+<hkern u1="&#xf2;" u2="&#x201a;" k="10" />
+<hkern u1="&#xf2;" u2="&#x2019;" k="10" />
+<hkern u1="&#xf2;" u2="&#x2018;" k="10" />
+<hkern u1="&#xf2;" u2="x" k="15" />
+<hkern u1="&#xf2;" u2="v" k="1" />
+<hkern u1="&#xf2;" u2="X" k="15" />
+<hkern u1="&#xf2;" u2="V" k="1" />
+<hkern u1="&#xf2;" u2="&#x2e;" k="10" />
+<hkern u1="&#xf2;" u2="&#x2c;" k="10" />
+<hkern u1="&#xf3;" u2="&#x2026;" k="10" />
+<hkern u1="&#xf3;" u2="&#x201e;" k="10" />
+<hkern u1="&#xf3;" u2="&#x201d;" k="10" />
+<hkern u1="&#xf3;" u2="&#x201c;" k="10" />
+<hkern u1="&#xf3;" u2="&#x201a;" k="10" />
+<hkern u1="&#xf3;" u2="&#x2019;" k="10" />
+<hkern u1="&#xf3;" u2="&#x2018;" k="10" />
+<hkern u1="&#xf3;" u2="x" k="15" />
+<hkern u1="&#xf3;" u2="v" k="1" />
+<hkern u1="&#xf3;" u2="X" k="15" />
+<hkern u1="&#xf3;" u2="V" k="1" />
+<hkern u1="&#xf3;" u2="&#x2e;" k="10" />
+<hkern u1="&#xf3;" u2="&#x2c;" k="10" />
+<hkern u1="&#xf4;" u2="&#x2026;" k="10" />
+<hkern u1="&#xf4;" u2="&#x201e;" k="10" />
+<hkern u1="&#xf4;" u2="&#x201d;" k="10" />
+<hkern u1="&#xf4;" u2="&#x201c;" k="10" />
+<hkern u1="&#xf4;" u2="&#x201a;" k="10" />
+<hkern u1="&#xf4;" u2="&#x2019;" k="10" />
+<hkern u1="&#xf4;" u2="&#x2018;" k="10" />
+<hkern u1="&#xf4;" u2="x" k="15" />
+<hkern u1="&#xf4;" u2="v" k="1" />
+<hkern u1="&#xf4;" u2="X" k="15" />
+<hkern u1="&#xf4;" u2="V" k="1" />
+<hkern u1="&#xf4;" u2="&#x2e;" k="10" />
+<hkern u1="&#xf4;" u2="&#x2c;" k="10" />
+<hkern u1="&#xf5;" u2="&#x2026;" k="10" />
+<hkern u1="&#xf5;" u2="&#x201e;" k="10" />
+<hkern u1="&#xf5;" u2="&#x201d;" k="10" />
+<hkern u1="&#xf5;" u2="&#x201c;" k="10" />
+<hkern u1="&#xf5;" u2="&#x201a;" k="10" />
+<hkern u1="&#xf5;" u2="&#x2019;" k="10" />
+<hkern u1="&#xf5;" u2="&#x2018;" k="10" />
+<hkern u1="&#xf5;" u2="x" k="15" />
+<hkern u1="&#xf5;" u2="v" k="1" />
+<hkern u1="&#xf5;" u2="X" k="15" />
+<hkern u1="&#xf5;" u2="V" k="1" />
+<hkern u1="&#xf5;" u2="&#x2e;" k="10" />
+<hkern u1="&#xf5;" u2="&#x2c;" k="10" />
+<hkern u1="&#xf6;" u2="&#x2026;" k="10" />
+<hkern u1="&#xf6;" u2="&#x201e;" k="10" />
+<hkern u1="&#xf6;" u2="&#x201d;" k="10" />
+<hkern u1="&#xf6;" u2="&#x201c;" k="10" />
+<hkern u1="&#xf6;" u2="&#x201a;" k="10" />
+<hkern u1="&#xf6;" u2="&#x2019;" k="10" />
+<hkern u1="&#xf6;" u2="&#x2018;" k="10" />
+<hkern u1="&#xf6;" u2="x" k="15" />
+<hkern u1="&#xf6;" u2="v" k="1" />
+<hkern u1="&#xf6;" u2="X" k="15" />
+<hkern u1="&#xf6;" u2="V" k="1" />
+<hkern u1="&#xf6;" u2="&#x2e;" k="10" />
+<hkern u1="&#xf6;" u2="&#x2c;" k="10" />
+<hkern u1="&#xf8;" u2="&#x2026;" k="10" />
+<hkern u1="&#xf8;" u2="&#x201e;" k="10" />
+<hkern u1="&#xf8;" u2="&#x201d;" k="10" />
+<hkern u1="&#xf8;" u2="&#x201c;" k="10" />
+<hkern u1="&#xf8;" u2="&#x201a;" k="10" />
+<hkern u1="&#xf8;" u2="&#x2019;" k="10" />
+<hkern u1="&#xf8;" u2="&#x2018;" k="10" />
+<hkern u1="&#xf8;" u2="x" k="15" />
+<hkern u1="&#xf8;" u2="v" k="1" />
+<hkern u1="&#xf8;" u2="X" k="15" />
+<hkern u1="&#xf8;" u2="V" k="1" />
+<hkern u1="&#xf8;" u2="&#x2e;" k="10" />
+<hkern u1="&#xf8;" u2="&#x2c;" k="10" />
+<hkern u1="&#xf9;" u2="&#x2026;" k="6" />
+<hkern u1="&#xf9;" u2="&#x201e;" k="6" />
+<hkern u1="&#xf9;" u2="&#x201a;" k="6" />
+<hkern u1="&#xf9;" u2="&#x2e;" k="6" />
+<hkern u1="&#xf9;" u2="&#x2c;" k="6" />
+<hkern u1="&#xfa;" u2="&#x2026;" k="6" />
+<hkern u1="&#xfa;" u2="&#x201e;" k="6" />
+<hkern u1="&#xfa;" u2="&#x201a;" k="6" />
+<hkern u1="&#xfa;" u2="&#x2e;" k="6" />
+<hkern u1="&#xfa;" u2="&#x2c;" k="6" />
+<hkern u1="&#xfb;" u2="&#x2026;" k="6" />
+<hkern u1="&#xfb;" u2="&#x201e;" k="6" />
+<hkern u1="&#xfb;" u2="&#x201a;" k="6" />
+<hkern u1="&#xfb;" u2="&#x2e;" k="6" />
+<hkern u1="&#xfb;" u2="&#x2c;" k="6" />
+<hkern u1="&#xfc;" u2="&#x2026;" k="6" />
+<hkern u1="&#xfc;" u2="&#x201e;" k="6" />
+<hkern u1="&#xfc;" u2="&#x201a;" k="6" />
+<hkern u1="&#xfc;" u2="&#x2e;" k="6" />
+<hkern u1="&#xfc;" u2="&#x2c;" k="6" />
+<hkern u1="&#xfd;" u2="&#x2026;" k="80" />
+<hkern u1="&#xfd;" u2="&#x201e;" k="80" />
+<hkern u1="&#xfd;" u2="&#x201a;" k="80" />
+<hkern u1="&#xfd;" u2="&#x153;" k="15" />
+<hkern u1="&#xfd;" u2="&#x152;" k="15" />
+<hkern u1="&#xfd;" u2="&#x7d;" k="-5" />
+<hkern u1="&#xfd;" u2="q" k="15" />
+<hkern u1="&#xfd;" u2="]" k="-5" />
+<hkern u1="&#xfd;" u2="Q" k="15" />
+<hkern u1="&#xfd;" u2="&#x3b;" k="20" />
+<hkern u1="&#xfd;" u2="&#x3a;" k="20" />
+<hkern u1="&#xfd;" u2="&#x2e;" k="80" />
+<hkern u1="&#xfd;" u2="&#x2c;" k="80" />
+<hkern u1="&#xfd;" u2="&#x29;" k="-5" />
+<hkern u1="&#xfe;" u2="&#x2026;" k="80" />
+<hkern u1="&#xfe;" u2="&#x201e;" k="80" />
+<hkern u1="&#xfe;" u2="&#x201a;" k="80" />
+<hkern u1="&#xfe;" u2="&#x178;" k="9" />
+<hkern u1="&#xfe;" u2="&#xff;" k="9" />
+<hkern u1="&#xfe;" u2="&#xfd;" k="9" />
+<hkern u1="&#xfe;" u2="&#xe6;" k="20" />
+<hkern u1="&#xfe;" u2="&#xe5;" k="2" />
+<hkern u1="&#xfe;" u2="&#xe4;" k="2" />
+<hkern u1="&#xfe;" u2="&#xe3;" k="2" />
+<hkern u1="&#xfe;" u2="&#xe2;" k="2" />
+<hkern u1="&#xfe;" u2="&#xe1;" k="2" />
+<hkern u1="&#xfe;" u2="&#xe0;" k="2" />
+<hkern u1="&#xfe;" u2="&#xdd;" k="9" />
+<hkern u1="&#xfe;" u2="&#xc6;" k="20" />
+<hkern u1="&#xfe;" u2="&#xc5;" k="2" />
+<hkern u1="&#xfe;" u2="&#xc4;" k="2" />
+<hkern u1="&#xfe;" u2="&#xc3;" k="2" />
+<hkern u1="&#xfe;" u2="&#xc2;" k="2" />
+<hkern u1="&#xfe;" u2="&#xc1;" k="2" />
+<hkern u1="&#xfe;" u2="&#xc0;" k="2" />
+<hkern u1="&#xfe;" u2="z" k="10" />
+<hkern u1="&#xfe;" u2="y" k="9" />
+<hkern u1="&#xfe;" u2="x" k="20" />
+<hkern u1="&#xfe;" u2="j" k="8" />
+<hkern u1="&#xfe;" u2="a" k="2" />
+<hkern u1="&#xfe;" u2="Z" k="10" />
+<hkern u1="&#xfe;" u2="Y" k="9" />
+<hkern u1="&#xfe;" u2="X" k="20" />
+<hkern u1="&#xfe;" u2="J" k="8" />
+<hkern u1="&#xfe;" u2="A" k="2" />
+<hkern u1="&#xfe;" u2="&#x2e;" k="80" />
+<hkern u1="&#xfe;" u2="&#x2c;" k="80" />
+<hkern u1="&#xff;" u2="&#x2026;" k="80" />
+<hkern u1="&#xff;" u2="&#x201e;" k="80" />
+<hkern u1="&#xff;" u2="&#x201a;" k="80" />
+<hkern u1="&#xff;" u2="&#x153;" k="15" />
+<hkern u1="&#xff;" u2="&#x152;" k="15" />
+<hkern u1="&#xff;" u2="&#x7d;" k="-5" />
+<hkern u1="&#xff;" u2="q" k="15" />
+<hkern u1="&#xff;" u2="]" k="-5" />
+<hkern u1="&#xff;" u2="Q" k="15" />
+<hkern u1="&#xff;" u2="&#x3b;" k="20" />
+<hkern u1="&#xff;" u2="&#x3a;" k="20" />
+<hkern u1="&#xff;" u2="&#x2e;" k="80" />
+<hkern u1="&#xff;" u2="&#x2c;" k="80" />
+<hkern u1="&#xff;" u2="&#x29;" k="-5" />
+<hkern u1="&#x178;" u2="&#x2026;" k="80" />
+<hkern u1="&#x178;" u2="&#x201e;" k="80" />
+<hkern u1="&#x178;" u2="&#x201a;" k="80" />
+<hkern u1="&#x178;" u2="&#x153;" k="15" />
+<hkern u1="&#x178;" u2="&#x152;" k="15" />
+<hkern u1="&#x178;" u2="&#x7d;" k="-5" />
+<hkern u1="&#x178;" u2="q" k="15" />
+<hkern u1="&#x178;" u2="]" k="-5" />
+<hkern u1="&#x178;" u2="Q" k="15" />
+<hkern u1="&#x178;" u2="&#x3b;" k="20" />
+<hkern u1="&#x178;" u2="&#x3a;" k="20" />
+<hkern u1="&#x178;" u2="&#x2e;" k="80" />
+<hkern u1="&#x178;" u2="&#x2c;" k="80" />
+<hkern u1="&#x178;" u2="&#x29;" k="-5" />
+<hkern u1="&#x2018;" u2="&#x153;" k="10" />
+<hkern u1="&#x2018;" u2="&#x152;" k="10" />
+<hkern u1="&#x2018;" u2="&#xf8;" k="10" />
+<hkern u1="&#x2018;" u2="&#xf6;" k="10" />
+<hkern u1="&#x2018;" u2="&#xf5;" k="10" />
+<hkern u1="&#x2018;" u2="&#xf4;" k="10" />
+<hkern u1="&#x2018;" u2="&#xf3;" k="10" />
+<hkern u1="&#x2018;" u2="&#xf2;" k="10" />
+<hkern u1="&#x2018;" u2="&#xe7;" k="10" />
+<hkern u1="&#x2018;" u2="&#xe5;" k="60" />
+<hkern u1="&#x2018;" u2="&#xe4;" k="60" />
+<hkern u1="&#x2018;" u2="&#xe3;" k="60" />
+<hkern u1="&#x2018;" u2="&#xe2;" k="60" />
+<hkern u1="&#x2018;" u2="&#xe1;" k="60" />
+<hkern u1="&#x2018;" u2="&#xe0;" k="60" />
+<hkern u1="&#x2018;" u2="&#xdf;" k="5" />
+<hkern u1="&#x2018;" u2="&#xd8;" k="10" />
+<hkern u1="&#x2018;" u2="&#xd6;" k="10" />
+<hkern u1="&#x2018;" u2="&#xd5;" k="10" />
+<hkern u1="&#x2018;" u2="&#xd4;" k="10" />
+<hkern u1="&#x2018;" u2="&#xd3;" k="10" />
+<hkern u1="&#x2018;" u2="&#xd2;" k="10" />
+<hkern u1="&#x2018;" u2="&#xc7;" k="10" />
+<hkern u1="&#x2018;" u2="&#xc5;" k="60" />
+<hkern u1="&#x2018;" u2="&#xc4;" k="60" />
+<hkern u1="&#x2018;" u2="&#xc3;" k="60" />
+<hkern u1="&#x2018;" u2="&#xc2;" k="60" />
+<hkern u1="&#x2018;" u2="&#xc1;" k="60" />
+<hkern u1="&#x2018;" u2="&#xc0;" k="60" />
+<hkern u1="&#x2018;" u2="z" k="4" />
+<hkern u1="&#x2018;" u2="x" k="2" />
+<hkern u1="&#x2018;" u2="s" k="5" />
+<hkern u1="&#x2018;" u2="q" k="10" />
+<hkern u1="&#x2018;" u2="o" k="10" />
+<hkern u1="&#x2018;" u2="j" k="40" />
+<hkern u1="&#x2018;" u2="g" k="10" />
+<hkern u1="&#x2018;" u2="c" k="10" />
+<hkern u1="&#x2018;" u2="a" k="60" />
+<hkern u1="&#x2018;" u2="Z" k="4" />
+<hkern u1="&#x2018;" u2="X" k="2" />
+<hkern u1="&#x2018;" u2="S" k="5" />
+<hkern u1="&#x2018;" u2="Q" k="10" />
+<hkern u1="&#x2018;" u2="O" k="10" />
+<hkern u1="&#x2018;" u2="J" k="40" />
+<hkern u1="&#x2018;" u2="G" k="10" />
+<hkern u1="&#x2018;" u2="C" k="10" />
+<hkern u1="&#x2018;" u2="A" k="60" />
+<hkern u1="&#x2019;" u2="&#x153;" k="10" />
+<hkern u1="&#x2019;" u2="&#x152;" k="10" />
+<hkern u1="&#x2019;" u2="&#xf8;" k="10" />
+<hkern u1="&#x2019;" u2="&#xf6;" k="10" />
+<hkern u1="&#x2019;" u2="&#xf5;" k="10" />
+<hkern u1="&#x2019;" u2="&#xf4;" k="10" />
+<hkern u1="&#x2019;" u2="&#xf3;" k="10" />
+<hkern u1="&#x2019;" u2="&#xf2;" k="10" />
+<hkern u1="&#x2019;" u2="&#xe7;" k="10" />
+<hkern u1="&#x2019;" u2="&#xe5;" k="60" />
+<hkern u1="&#x2019;" u2="&#xe4;" k="60" />
+<hkern u1="&#x2019;" u2="&#xe3;" k="60" />
+<hkern u1="&#x2019;" u2="&#xe2;" k="60" />
+<hkern u1="&#x2019;" u2="&#xe1;" k="60" />
+<hkern u1="&#x2019;" u2="&#xe0;" k="60" />
+<hkern u1="&#x2019;" u2="&#xdf;" k="5" />
+<hkern u1="&#x2019;" u2="&#xd8;" k="10" />
+<hkern u1="&#x2019;" u2="&#xd6;" k="10" />
+<hkern u1="&#x2019;" u2="&#xd5;" k="10" />
+<hkern u1="&#x2019;" u2="&#xd4;" k="10" />
+<hkern u1="&#x2019;" u2="&#xd3;" k="10" />
+<hkern u1="&#x2019;" u2="&#xd2;" k="10" />
+<hkern u1="&#x2019;" u2="&#xc7;" k="10" />
+<hkern u1="&#x2019;" u2="&#xc5;" k="60" />
+<hkern u1="&#x2019;" u2="&#xc4;" k="60" />
+<hkern u1="&#x2019;" u2="&#xc3;" k="60" />
+<hkern u1="&#x2019;" u2="&#xc2;" k="60" />
+<hkern u1="&#x2019;" u2="&#xc1;" k="60" />
+<hkern u1="&#x2019;" u2="&#xc0;" k="60" />
+<hkern u1="&#x2019;" u2="z" k="4" />
+<hkern u1="&#x2019;" u2="x" k="2" />
+<hkern u1="&#x2019;" u2="s" k="5" />
+<hkern u1="&#x2019;" u2="q" k="10" />
+<hkern u1="&#x2019;" u2="o" k="10" />
+<hkern u1="&#x2019;" u2="j" k="40" />
+<hkern u1="&#x2019;" u2="g" k="10" />
+<hkern u1="&#x2019;" u2="c" k="10" />
+<hkern u1="&#x2019;" u2="a" k="60" />
+<hkern u1="&#x2019;" u2="Z" k="4" />
+<hkern u1="&#x2019;" u2="X" k="2" />
+<hkern u1="&#x2019;" u2="S" k="5" />
+<hkern u1="&#x2019;" u2="Q" k="10" />
+<hkern u1="&#x2019;" u2="O" k="10" />
+<hkern u1="&#x2019;" u2="J" k="40" />
+<hkern u1="&#x2019;" u2="G" k="10" />
+<hkern u1="&#x2019;" u2="C" k="10" />
+<hkern u1="&#x2019;" u2="A" k="60" />
+<hkern u1="&#x201a;" u2="&#x178;" k="80" />
+<hkern u1="&#x201a;" u2="&#x153;" k="10" />
+<hkern u1="&#x201a;" u2="&#x152;" k="10" />
+<hkern u1="&#x201a;" u2="&#xff;" k="80" />
+<hkern u1="&#x201a;" u2="&#xfd;" k="80" />
+<hkern u1="&#x201a;" u2="&#xfc;" k="6" />
+<hkern u1="&#x201a;" u2="&#xfb;" k="6" />
+<hkern u1="&#x201a;" u2="&#xfa;" k="6" />
+<hkern u1="&#x201a;" u2="&#xf9;" k="6" />
+<hkern u1="&#x201a;" u2="&#xf8;" k="10" />
+<hkern u1="&#x201a;" u2="&#xf6;" k="10" />
+<hkern u1="&#x201a;" u2="&#xf5;" k="10" />
+<hkern u1="&#x201a;" u2="&#xf4;" k="10" />
+<hkern u1="&#x201a;" u2="&#xf3;" k="10" />
+<hkern u1="&#x201a;" u2="&#xf2;" k="10" />
+<hkern u1="&#x201a;" u2="&#xe7;" k="10" />
+<hkern u1="&#x201a;" u2="&#xdf;" k="5" />
+<hkern u1="&#x201a;" u2="&#xdd;" k="80" />
+<hkern u1="&#x201a;" u2="&#xdc;" k="6" />
+<hkern u1="&#x201a;" u2="&#xdb;" k="6" />
+<hkern u1="&#x201a;" u2="&#xda;" k="6" />
+<hkern u1="&#x201a;" u2="&#xd9;" k="6" />
+<hkern u1="&#x201a;" u2="&#xd8;" k="10" />
+<hkern u1="&#x201a;" u2="&#xd6;" k="10" />
+<hkern u1="&#x201a;" u2="&#xd5;" k="10" />
+<hkern u1="&#x201a;" u2="&#xd4;" k="10" />
+<hkern u1="&#x201a;" u2="&#xd3;" k="10" />
+<hkern u1="&#x201a;" u2="&#xd2;" k="10" />
+<hkern u1="&#x201a;" u2="&#xc7;" k="10" />
+<hkern u1="&#x201a;" u2="y" k="80" />
+<hkern u1="&#x201a;" u2="w" k="40" />
+<hkern u1="&#x201a;" u2="v" k="60" />
+<hkern u1="&#x201a;" u2="u" k="6" />
+<hkern u1="&#x201a;" u2="t" k="60" />
+<hkern u1="&#x201a;" u2="s" k="5" />
+<hkern u1="&#x201a;" u2="q" k="10" />
+<hkern u1="&#x201a;" u2="o" k="10" />
+<hkern u1="&#x201a;" u2="g" k="10" />
+<hkern u1="&#x201a;" u2="c" k="10" />
+<hkern u1="&#x201a;" u2="Y" k="80" />
+<hkern u1="&#x201a;" u2="W" k="40" />
+<hkern u1="&#x201a;" u2="V" k="60" />
+<hkern u1="&#x201a;" u2="U" k="6" />
+<hkern u1="&#x201a;" u2="T" k="60" />
+<hkern u1="&#x201a;" u2="S" k="5" />
+<hkern u1="&#x201a;" u2="Q" k="10" />
+<hkern u1="&#x201a;" u2="O" k="10" />
+<hkern u1="&#x201a;" u2="G" k="10" />
+<hkern u1="&#x201a;" u2="C" k="10" />
+<hkern u1="&#x201c;" u2="&#x153;" k="10" />
+<hkern u1="&#x201c;" u2="&#x152;" k="10" />
+<hkern u1="&#x201c;" u2="&#xf8;" k="10" />
+<hkern u1="&#x201c;" u2="&#xf6;" k="10" />
+<hkern u1="&#x201c;" u2="&#xf5;" k="10" />
+<hkern u1="&#x201c;" u2="&#xf4;" k="10" />
+<hkern u1="&#x201c;" u2="&#xf3;" k="10" />
+<hkern u1="&#x201c;" u2="&#xf2;" k="10" />
+<hkern u1="&#x201c;" u2="&#xe7;" k="10" />
+<hkern u1="&#x201c;" u2="&#xe5;" k="60" />
+<hkern u1="&#x201c;" u2="&#xe4;" k="60" />
+<hkern u1="&#x201c;" u2="&#xe3;" k="60" />
+<hkern u1="&#x201c;" u2="&#xe2;" k="60" />
+<hkern u1="&#x201c;" u2="&#xe1;" k="60" />
+<hkern u1="&#x201c;" u2="&#xe0;" k="60" />
+<hkern u1="&#x201c;" u2="&#xdf;" k="5" />
+<hkern u1="&#x201c;" u2="&#xd8;" k="10" />
+<hkern u1="&#x201c;" u2="&#xd6;" k="10" />
+<hkern u1="&#x201c;" u2="&#xd5;" k="10" />
+<hkern u1="&#x201c;" u2="&#xd4;" k="10" />
+<hkern u1="&#x201c;" u2="&#xd3;" k="10" />
+<hkern u1="&#x201c;" u2="&#xd2;" k="10" />
+<hkern u1="&#x201c;" u2="&#xc7;" k="10" />
+<hkern u1="&#x201c;" u2="&#xc5;" k="60" />
+<hkern u1="&#x201c;" u2="&#xc4;" k="60" />
+<hkern u1="&#x201c;" u2="&#xc3;" k="60" />
+<hkern u1="&#x201c;" u2="&#xc2;" k="60" />
+<hkern u1="&#x201c;" u2="&#xc1;" k="60" />
+<hkern u1="&#x201c;" u2="&#xc0;" k="60" />
+<hkern u1="&#x201c;" u2="z" k="4" />
+<hkern u1="&#x201c;" u2="x" k="2" />
+<hkern u1="&#x201c;" u2="s" k="5" />
+<hkern u1="&#x201c;" u2="q" k="10" />
+<hkern u1="&#x201c;" u2="o" k="10" />
+<hkern u1="&#x201c;" u2="j" k="40" />
+<hkern u1="&#x201c;" u2="g" k="10" />
+<hkern u1="&#x201c;" u2="c" k="10" />
+<hkern u1="&#x201c;" u2="a" k="60" />
+<hkern u1="&#x201c;" u2="Z" k="4" />
+<hkern u1="&#x201c;" u2="X" k="2" />
+<hkern u1="&#x201c;" u2="S" k="5" />
+<hkern u1="&#x201c;" u2="Q" k="10" />
+<hkern u1="&#x201c;" u2="O" k="10" />
+<hkern u1="&#x201c;" u2="J" k="40" />
+<hkern u1="&#x201c;" u2="G" k="10" />
+<hkern u1="&#x201c;" u2="C" k="10" />
+<hkern u1="&#x201c;" u2="A" k="60" />
+<hkern u1="&#x201d;" u2="&#x153;" k="10" />
+<hkern u1="&#x201d;" u2="&#x152;" k="10" />
+<hkern u1="&#x201d;" u2="&#xf8;" k="10" />
+<hkern u1="&#x201d;" u2="&#xf6;" k="10" />
+<hkern u1="&#x201d;" u2="&#xf5;" k="10" />
+<hkern u1="&#x201d;" u2="&#xf4;" k="10" />
+<hkern u1="&#x201d;" u2="&#xf3;" k="10" />
+<hkern u1="&#x201d;" u2="&#xf2;" k="10" />
+<hkern u1="&#x201d;" u2="&#xe7;" k="10" />
+<hkern u1="&#x201d;" u2="&#xe5;" k="60" />
+<hkern u1="&#x201d;" u2="&#xe4;" k="60" />
+<hkern u1="&#x201d;" u2="&#xe3;" k="60" />
+<hkern u1="&#x201d;" u2="&#xe2;" k="60" />
+<hkern u1="&#x201d;" u2="&#xe1;" k="60" />
+<hkern u1="&#x201d;" u2="&#xe0;" k="60" />
+<hkern u1="&#x201d;" u2="&#xdf;" k="5" />
+<hkern u1="&#x201d;" u2="&#xd8;" k="10" />
+<hkern u1="&#x201d;" u2="&#xd6;" k="10" />
+<hkern u1="&#x201d;" u2="&#xd5;" k="10" />
+<hkern u1="&#x201d;" u2="&#xd4;" k="10" />
+<hkern u1="&#x201d;" u2="&#xd3;" k="10" />
+<hkern u1="&#x201d;" u2="&#xd2;" k="10" />
+<hkern u1="&#x201d;" u2="&#xc7;" k="10" />
+<hkern u1="&#x201d;" u2="&#xc5;" k="60" />
+<hkern u1="&#x201d;" u2="&#xc4;" k="60" />
+<hkern u1="&#x201d;" u2="&#xc3;" k="60" />
+<hkern u1="&#x201d;" u2="&#xc2;" k="60" />
+<hkern u1="&#x201d;" u2="&#xc1;" k="60" />
+<hkern u1="&#x201d;" u2="&#xc0;" k="60" />
+<hkern u1="&#x201d;" u2="z" k="4" />
+<hkern u1="&#x201d;" u2="x" k="2" />
+<hkern u1="&#x201d;" u2="s" k="5" />
+<hkern u1="&#x201d;" u2="q" k="10" />
+<hkern u1="&#x201d;" u2="o" k="10" />
+<hkern u1="&#x201d;" u2="j" k="40" />
+<hkern u1="&#x201d;" u2="g" k="10" />
+<hkern u1="&#x201d;" u2="c" k="10" />
+<hkern u1="&#x201d;" u2="a" k="60" />
+<hkern u1="&#x201d;" u2="Z" k="4" />
+<hkern u1="&#x201d;" u2="X" k="2" />
+<hkern u1="&#x201d;" u2="S" k="5" />
+<hkern u1="&#x201d;" u2="Q" k="10" />
+<hkern u1="&#x201d;" u2="O" k="10" />
+<hkern u1="&#x201d;" u2="J" k="40" />
+<hkern u1="&#x201d;" u2="G" k="10" />
+<hkern u1="&#x201d;" u2="C" k="10" />
+<hkern u1="&#x201d;" u2="A" k="60" />
+<hkern u1="&#x201e;" u2="&#x178;" k="80" />
+<hkern u1="&#x201e;" u2="&#x153;" k="10" />
+<hkern u1="&#x201e;" u2="&#x152;" k="10" />
+<hkern u1="&#x201e;" u2="&#xff;" k="80" />
+<hkern u1="&#x201e;" u2="&#xfd;" k="80" />
+<hkern u1="&#x201e;" u2="&#xfc;" k="6" />
+<hkern u1="&#x201e;" u2="&#xfb;" k="6" />
+<hkern u1="&#x201e;" u2="&#xfa;" k="6" />
+<hkern u1="&#x201e;" u2="&#xf9;" k="6" />
+<hkern u1="&#x201e;" u2="&#xf8;" k="10" />
+<hkern u1="&#x201e;" u2="&#xf6;" k="10" />
+<hkern u1="&#x201e;" u2="&#xf5;" k="10" />
+<hkern u1="&#x201e;" u2="&#xf4;" k="10" />
+<hkern u1="&#x201e;" u2="&#xf3;" k="10" />
+<hkern u1="&#x201e;" u2="&#xf2;" k="10" />
+<hkern u1="&#x201e;" u2="&#xe7;" k="10" />
+<hkern u1="&#x201e;" u2="&#xdf;" k="5" />
+<hkern u1="&#x201e;" u2="&#xdd;" k="80" />
+<hkern u1="&#x201e;" u2="&#xdc;" k="6" />
+<hkern u1="&#x201e;" u2="&#xdb;" k="6" />
+<hkern u1="&#x201e;" u2="&#xda;" k="6" />
+<hkern u1="&#x201e;" u2="&#xd9;" k="6" />
+<hkern u1="&#x201e;" u2="&#xd8;" k="10" />
+<hkern u1="&#x201e;" u2="&#xd6;" k="10" />
+<hkern u1="&#x201e;" u2="&#xd5;" k="10" />
+<hkern u1="&#x201e;" u2="&#xd4;" k="10" />
+<hkern u1="&#x201e;" u2="&#xd3;" k="10" />
+<hkern u1="&#x201e;" u2="&#xd2;" k="10" />
+<hkern u1="&#x201e;" u2="&#xc7;" k="10" />
+<hkern u1="&#x201e;" u2="y" k="80" />
+<hkern u1="&#x201e;" u2="w" k="40" />
+<hkern u1="&#x201e;" u2="v" k="60" />
+<hkern u1="&#x201e;" u2="u" k="6" />
+<hkern u1="&#x201e;" u2="t" k="60" />
+<hkern u1="&#x201e;" u2="s" k="5" />
+<hkern u1="&#x201e;" u2="q" k="10" />
+<hkern u1="&#x201e;" u2="o" k="10" />
+<hkern u1="&#x201e;" u2="g" k="10" />
+<hkern u1="&#x201e;" u2="c" k="10" />
+<hkern u1="&#x201e;" u2="Y" k="80" />
+<hkern u1="&#x201e;" u2="W" k="40" />
+<hkern u1="&#x201e;" u2="V" k="60" />
+<hkern u1="&#x201e;" u2="U" k="6" />
+<hkern u1="&#x201e;" u2="T" k="60" />
+<hkern u1="&#x201e;" u2="S" k="5" />
+<hkern u1="&#x201e;" u2="Q" k="10" />
+<hkern u1="&#x201e;" u2="O" k="10" />
+<hkern u1="&#x201e;" u2="G" k="10" />
+<hkern u1="&#x201e;" u2="C" k="10" />
+<hkern u1="&#x2026;" u2="&#x178;" k="80" />
+<hkern u1="&#x2026;" u2="&#x153;" k="10" />
+<hkern u1="&#x2026;" u2="&#x152;" k="10" />
+<hkern u1="&#x2026;" u2="&#xff;" k="80" />
+<hkern u1="&#x2026;" u2="&#xfd;" k="80" />
+<hkern u1="&#x2026;" u2="&#xfc;" k="6" />
+<hkern u1="&#x2026;" u2="&#xfb;" k="6" />
+<hkern u1="&#x2026;" u2="&#xfa;" k="6" />
+<hkern u1="&#x2026;" u2="&#xf9;" k="6" />
+<hkern u1="&#x2026;" u2="&#xf8;" k="10" />
+<hkern u1="&#x2026;" u2="&#xf6;" k="10" />
+<hkern u1="&#x2026;" u2="&#xf5;" k="10" />
+<hkern u1="&#x2026;" u2="&#xf4;" k="10" />
+<hkern u1="&#x2026;" u2="&#xf3;" k="10" />
+<hkern u1="&#x2026;" u2="&#xf2;" k="10" />
+<hkern u1="&#x2026;" u2="&#xe7;" k="10" />
+<hkern u1="&#x2026;" u2="&#xdf;" k="5" />
+<hkern u1="&#x2026;" u2="&#xdd;" k="80" />
+<hkern u1="&#x2026;" u2="&#xdc;" k="6" />
+<hkern u1="&#x2026;" u2="&#xdb;" k="6" />
+<hkern u1="&#x2026;" u2="&#xda;" k="6" />
+<hkern u1="&#x2026;" u2="&#xd9;" k="6" />
+<hkern u1="&#x2026;" u2="&#xd8;" k="10" />
+<hkern u1="&#x2026;" u2="&#xd6;" k="10" />
+<hkern u1="&#x2026;" u2="&#xd5;" k="10" />
+<hkern u1="&#x2026;" u2="&#xd4;" k="10" />
+<hkern u1="&#x2026;" u2="&#xd3;" k="10" />
+<hkern u1="&#x2026;" u2="&#xd2;" k="10" />
+<hkern u1="&#x2026;" u2="&#xc7;" k="10" />
+<hkern u1="&#x2026;" u2="y" k="80" />
+<hkern u1="&#x2026;" u2="w" k="40" />
+<hkern u1="&#x2026;" u2="v" k="60" />
+<hkern u1="&#x2026;" u2="u" k="6" />
+<hkern u1="&#x2026;" u2="t" k="60" />
+<hkern u1="&#x2026;" u2="s" k="5" />
+<hkern u1="&#x2026;" u2="q" k="10" />
+<hkern u1="&#x2026;" u2="o" k="10" />
+<hkern u1="&#x2026;" u2="g" k="10" />
+<hkern u1="&#x2026;" u2="c" k="10" />
+<hkern u1="&#x2026;" u2="Y" k="80" />
+<hkern u1="&#x2026;" u2="W" k="40" />
+<hkern u1="&#x2026;" u2="V" k="60" />
+<hkern u1="&#x2026;" u2="U" k="6" />
+<hkern u1="&#x2026;" u2="T" k="60" />
+<hkern u1="&#x2026;" u2="S" k="5" />
+<hkern u1="&#x2026;" u2="Q" k="10" />
+<hkern u1="&#x2026;" u2="O" k="10" />
+<hkern u1="&#x2026;" u2="G" k="10" />
+<hkern u1="&#x2026;" u2="C" k="10" />
+<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="C,Ccedilla" 	k="1" />
+<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="G" 	k="1" />
+<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	k="1" />
+<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="T" 	k="38" />
+<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="W" 	k="15" />
+<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="Y,Yacute,Ydieresis" 	k="49" />
+<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="hyphen,uni00AD" 	k="10" />
+<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="c,ccedilla" 	k="1" />
+<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="g" 	k="1" />
+<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	k="1" />
+<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="t" 	k="38" />
+<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="w" 	k="15" />
+<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="y,yacute,ydieresis" 	k="49" />
+<hkern g1="B" 	g2="W" 	k="1" />
+<hkern g1="B" 	g2="Y,Yacute,Ydieresis" 	k="15" />
+<hkern g1="B" 	g2="w" 	k="1" />
+<hkern g1="B" 	g2="y,yacute,ydieresis" 	k="15" />
+<hkern g1="b" 	g2="W" 	k="1" />
+<hkern g1="b" 	g2="Y,Yacute,Ydieresis" 	k="15" />
+<hkern g1="b" 	g2="w" 	k="1" />
+<hkern g1="b" 	g2="y,yacute,ydieresis" 	k="15" />
+<hkern g1="C,Ccedilla" 	g2="Y,Yacute,Ydieresis" 	k="11" />
+<hkern g1="C,Ccedilla" 	g2="y,yacute,ydieresis" 	k="11" />
+<hkern g1="c,ccedilla" 	g2="Y,Yacute,Ydieresis" 	k="11" />
+<hkern g1="c,ccedilla" 	g2="y,yacute,ydieresis" 	k="11" />
+<hkern g1="D,Eth" 	g2="Y,Yacute,Ydieresis" 	k="15" />
+<hkern g1="D,Eth" 	g2="y,yacute,ydieresis" 	k="15" />
+<hkern g1="D,Eth" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="1" />
+<hkern g1="D,Eth" 	g2="AE" 	k="2" />
+<hkern g1="D,Eth" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="1" />
+<hkern g1="D,Eth" 	g2="ae" 	k="2" />
+<hkern g1="d,eth" 	g2="Y,Yacute,Ydieresis" 	k="15" />
+<hkern g1="d,eth" 	g2="y,yacute,ydieresis" 	k="15" />
+<hkern g1="d,eth" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="1" />
+<hkern g1="d,eth" 	g2="AE" 	k="2" />
+<hkern g1="d,eth" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="1" />
+<hkern g1="d,eth" 	g2="ae" 	k="2" />
+<hkern g1="F" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="13" />
+<hkern g1="F" 	g2="AE" 	k="40" />
+<hkern g1="F" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="13" />
+<hkern g1="F" 	g2="ae" 	k="40" />
+<hkern g1="F" 	g2="J" 	k="20" />
+<hkern g1="F" 	g2="Z" 	k="10" />
+<hkern g1="F" 	g2="j" 	k="20" />
+<hkern g1="F" 	g2="z" 	k="10" />
+<hkern g1="f" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="13" />
+<hkern g1="f" 	g2="AE" 	k="40" />
+<hkern g1="f" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="13" />
+<hkern g1="f" 	g2="ae" 	k="40" />
+<hkern g1="f" 	g2="J" 	k="20" />
+<hkern g1="f" 	g2="Z" 	k="10" />
+<hkern g1="f" 	g2="j" 	k="20" />
+<hkern g1="f" 	g2="z" 	k="10" />
+<hkern g1="G" 	g2="Y,Yacute,Ydieresis" 	k="15" />
+<hkern g1="G" 	g2="y,yacute,ydieresis" 	k="15" />
+<hkern g1="G" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="1" />
+<hkern g1="G" 	g2="AE" 	k="2" />
+<hkern g1="G" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="1" />
+<hkern g1="G" 	g2="ae" 	k="2" />
+<hkern g1="g" 	g2="Y,Yacute,Ydieresis" 	k="15" />
+<hkern g1="g" 	g2="y,yacute,ydieresis" 	k="15" />
+<hkern g1="g" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="1" />
+<hkern g1="g" 	g2="AE" 	k="2" />
+<hkern g1="g" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="1" />
+<hkern g1="g" 	g2="ae" 	k="2" />
+<hkern g1="J" 	g2="AE" 	k="4" />
+<hkern g1="J" 	g2="ae" 	k="4" />
+<hkern g1="j" 	g2="AE" 	k="4" />
+<hkern g1="j" 	g2="ae" 	k="4" />
+<hkern g1="K" 	g2="C,Ccedilla" 	k="7" />
+<hkern g1="K" 	g2="G" 	k="7" />
+<hkern g1="K" 	g2="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	k="7" />
+<hkern g1="K" 	g2="c,ccedilla" 	k="7" />
+<hkern g1="K" 	g2="g" 	k="7" />
+<hkern g1="K" 	g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	k="7" />
+<hkern g1="K" 	g2="S" 	k="5" />
+<hkern g1="K" 	g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" 	k="4" />
+<hkern g1="K" 	g2="s,germandbls" 	k="5" />
+<hkern g1="K" 	g2="u,ugrave,uacute,ucircumflex,udieresis" 	k="4" />
+<hkern g1="k" 	g2="C,Ccedilla" 	k="7" />
+<hkern g1="k" 	g2="G" 	k="7" />
+<hkern g1="k" 	g2="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	k="7" />
+<hkern g1="k" 	g2="c,ccedilla" 	k="7" />
+<hkern g1="k" 	g2="g" 	k="7" />
+<hkern g1="k" 	g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	k="7" />
+<hkern g1="k" 	g2="S" 	k="5" />
+<hkern g1="k" 	g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" 	k="4" />
+<hkern g1="k" 	g2="s,germandbls" 	k="5" />
+<hkern g1="k" 	g2="u,ugrave,uacute,ucircumflex,udieresis" 	k="4" />
+<hkern g1="L" 	g2="T" 	k="50" />
+<hkern g1="L" 	g2="W" 	k="17" />
+<hkern g1="L" 	g2="Y,Yacute,Ydieresis" 	k="62" />
+<hkern g1="L" 	g2="hyphen,uni00AD" 	k="40" />
+<hkern g1="L" 	g2="t" 	k="50" />
+<hkern g1="L" 	g2="w" 	k="17" />
+<hkern g1="L" 	g2="y,yacute,ydieresis" 	k="62" />
+<hkern g1="L" 	g2="J" 	k="-5" />
+<hkern g1="L" 	g2="j" 	k="-5" />
+<hkern g1="l" 	g2="T" 	k="50" />
+<hkern g1="l" 	g2="W" 	k="17" />
+<hkern g1="l" 	g2="Y,Yacute,Ydieresis" 	k="62" />
+<hkern g1="l" 	g2="hyphen,uni00AD" 	k="40" />
+<hkern g1="l" 	g2="t" 	k="50" />
+<hkern g1="l" 	g2="w" 	k="17" />
+<hkern g1="l" 	g2="y,yacute,ydieresis" 	k="62" />
+<hkern g1="l" 	g2="J" 	k="-5" />
+<hkern g1="l" 	g2="j" 	k="-5" />
+<hkern g1="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	g2="Y,Yacute,Ydieresis" 	k="15" />
+<hkern g1="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	g2="y,yacute,ydieresis" 	k="15" />
+<hkern g1="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="1" />
+<hkern g1="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	g2="AE" 	k="2" />
+<hkern g1="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="1" />
+<hkern g1="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	g2="ae" 	k="2" />
+<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	g2="Y,Yacute,Ydieresis" 	k="15" />
+<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	g2="y,yacute,ydieresis" 	k="15" />
+<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="1" />
+<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	g2="AE" 	k="2" />
+<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="1" />
+<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	g2="ae" 	k="2" />
+<hkern g1="P" 	g2="Y,Yacute,Ydieresis" 	k="2" />
+<hkern g1="P" 	g2="y,yacute,ydieresis" 	k="2" />
+<hkern g1="P" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="13" />
+<hkern g1="P" 	g2="AE" 	k="30" />
+<hkern g1="P" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="13" />
+<hkern g1="P" 	g2="ae" 	k="30" />
+<hkern g1="P" 	g2="J" 	k="18" />
+<hkern g1="P" 	g2="j" 	k="18" />
+<hkern g1="p" 	g2="Y,Yacute,Ydieresis" 	k="2" />
+<hkern g1="p" 	g2="y,yacute,ydieresis" 	k="2" />
+<hkern g1="p" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="13" />
+<hkern g1="p" 	g2="AE" 	k="30" />
+<hkern g1="p" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="13" />
+<hkern g1="p" 	g2="ae" 	k="30" />
+<hkern g1="p" 	g2="J" 	k="18" />
+<hkern g1="p" 	g2="j" 	k="18" />
+<hkern g1="R" 	g2="Y,Yacute,Ydieresis" 	k="10" />
+<hkern g1="R" 	g2="y,yacute,ydieresis" 	k="10" />
+<hkern g1="r" 	g2="Y,Yacute,Ydieresis" 	k="10" />
+<hkern g1="r" 	g2="y,yacute,ydieresis" 	k="10" />
+<hkern g1="S" 	g2="Y,Yacute,Ydieresis" 	k="7" />
+<hkern g1="S" 	g2="y,yacute,ydieresis" 	k="7" />
+<hkern g1="S" 	g2="AE" 	k="2" />
+<hkern g1="S" 	g2="ae" 	k="2" />
+<hkern g1="s,germandbls" 	g2="Y,Yacute,Ydieresis" 	k="7" />
+<hkern g1="s,germandbls" 	g2="y,yacute,ydieresis" 	k="7" />
+<hkern g1="s,germandbls" 	g2="AE" 	k="2" />
+<hkern g1="s,germandbls" 	g2="ae" 	k="2" />
+<hkern g1="T" 	g2="hyphen,uni00AD" 	k="32" />
+<hkern g1="T" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="38" />
+<hkern g1="T" 	g2="AE" 	k="50" />
+<hkern g1="T" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="38" />
+<hkern g1="T" 	g2="ae" 	k="50" />
+<hkern g1="T" 	g2="J" 	k="30" />
+<hkern g1="T" 	g2="j" 	k="30" />
+<hkern g1="t" 	g2="hyphen,uni00AD" 	k="32" />
+<hkern g1="t" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="38" />
+<hkern g1="t" 	g2="AE" 	k="50" />
+<hkern g1="t" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="38" />
+<hkern g1="t" 	g2="ae" 	k="50" />
+<hkern g1="t" 	g2="J" 	k="30" />
+<hkern g1="t" 	g2="j" 	k="30" />
+<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" 	g2="AE" 	k="4" />
+<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" 	g2="ae" 	k="4" />
+<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" 	g2="AE" 	k="4" />
+<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" 	g2="ae" 	k="4" />
+<hkern g1="W" 	g2="hyphen,uni00AD" 	k="4" />
+<hkern g1="W" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="15" />
+<hkern g1="W" 	g2="AE" 	k="25" />
+<hkern g1="W" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="15" />
+<hkern g1="W" 	g2="ae" 	k="25" />
+<hkern g1="W" 	g2="J" 	k="13" />
+<hkern g1="W" 	g2="j" 	k="13" />
+<hkern g1="w" 	g2="hyphen,uni00AD" 	k="4" />
+<hkern g1="w" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="15" />
+<hkern g1="w" 	g2="AE" 	k="25" />
+<hkern g1="w" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="15" />
+<hkern g1="w" 	g2="ae" 	k="25" />
+<hkern g1="w" 	g2="J" 	k="13" />
+<hkern g1="w" 	g2="j" 	k="13" />
+<hkern g1="Y,Yacute,Ydieresis" 	g2="C,Ccedilla" 	k="15" />
+<hkern g1="Y,Yacute,Ydieresis" 	g2="G" 	k="15" />
+<hkern g1="Y,Yacute,Ydieresis" 	g2="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	k="15" />
+<hkern g1="Y,Yacute,Ydieresis" 	g2="hyphen,uni00AD" 	k="18" />
+<hkern g1="Y,Yacute,Ydieresis" 	g2="c,ccedilla" 	k="15" />
+<hkern g1="Y,Yacute,Ydieresis" 	g2="g" 	k="15" />
+<hkern g1="Y,Yacute,Ydieresis" 	g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	k="15" />
+<hkern g1="Y,Yacute,Ydieresis" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="49" />
+<hkern g1="Y,Yacute,Ydieresis" 	g2="AE" 	k="63" />
+<hkern g1="Y,Yacute,Ydieresis" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="49" />
+<hkern g1="Y,Yacute,Ydieresis" 	g2="ae" 	k="63" />
+<hkern g1="Y,Yacute,Ydieresis" 	g2="J" 	k="35" />
+<hkern g1="Y,Yacute,Ydieresis" 	g2="j" 	k="35" />
+<hkern g1="Y,Yacute,Ydieresis" 	g2="S" 	k="7" />
+<hkern g1="Y,Yacute,Ydieresis" 	g2="s,germandbls" 	k="7" />
+<hkern g1="y,yacute,ydieresis" 	g2="C,Ccedilla" 	k="15" />
+<hkern g1="y,yacute,ydieresis" 	g2="G" 	k="15" />
+<hkern g1="y,yacute,ydieresis" 	g2="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	k="15" />
+<hkern g1="y,yacute,ydieresis" 	g2="hyphen,uni00AD" 	k="18" />
+<hkern g1="y,yacute,ydieresis" 	g2="c,ccedilla" 	k="15" />
+<hkern g1="y,yacute,ydieresis" 	g2="g" 	k="15" />
+<hkern g1="y,yacute,ydieresis" 	g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	k="15" />
+<hkern g1="y,yacute,ydieresis" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="49" />
+<hkern g1="y,yacute,ydieresis" 	g2="AE" 	k="63" />
+<hkern g1="y,yacute,ydieresis" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="49" />
+<hkern g1="y,yacute,ydieresis" 	g2="ae" 	k="63" />
+<hkern g1="y,yacute,ydieresis" 	g2="J" 	k="35" />
+<hkern g1="y,yacute,ydieresis" 	g2="j" 	k="35" />
+<hkern g1="y,yacute,ydieresis" 	g2="S" 	k="7" />
+<hkern g1="y,yacute,ydieresis" 	g2="s,germandbls" 	k="7" />
+<hkern g1="Z" 	g2="hyphen,uni00AD" 	k="15" />
+<hkern g1="z" 	g2="hyphen,uni00AD" 	k="15" />
+<hkern g1="hyphen,uni00AD" 	g2="T" 	k="32" />
+<hkern g1="hyphen,uni00AD" 	g2="W" 	k="4" />
+<hkern g1="hyphen,uni00AD" 	g2="Y,Yacute,Ydieresis" 	k="18" />
+<hkern g1="hyphen,uni00AD" 	g2="t" 	k="32" />
+<hkern g1="hyphen,uni00AD" 	g2="w" 	k="4" />
+<hkern g1="hyphen,uni00AD" 	g2="y,yacute,ydieresis" 	k="18" />
+<hkern g1="hyphen,uni00AD" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="10" />
+<hkern g1="hyphen,uni00AD" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="10" />
+<hkern g1="hyphen,uni00AD" 	g2="Z" 	k="10" />
+<hkern g1="hyphen,uni00AD" 	g2="z" 	k="10" />
+</font>
+</defs></svg> 
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.ttf b/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..7e0927722594fd4b98cb97ef8d845f8ed63c8099
GIT binary patch
literal 48968
zcmeHw37lL-wRhFMy-)Yd^fvosdYOHC_BF{Q>CE(GLYB#F2{V&OW|B!V36n_(37g2G
z2pUik5fM>YBH{wC6A7XsAo7$CH$*lOHKNal%HtWqsKIo9|5MesyJvC}0^j$(@B6(k
z({uXPty{~fQ>RXyI(6zc<BTykz6`8k*|Oo)lhzA9z!>jDY*BBdXBl_m3F9NU_x1L#
z8M^3^i*s;)31ijcy+doera!*-V~o|jNYB>{)i-Uw@yLC+|2yu-H}9O-z54jrb&Q3O
zpZ{_5MSFd&|1bv`tBc@y=hofZc3z)x*;3qJ#hCTu+a@mDjreTFIy|^qwoPBU^#jjb
zo`L%!#<sjRwPj*5c5CCgjD606=WSDnFfUeL!hIO`rBgfiUef=^oL6x_$(VZM^sdbl
zU-{c7<}r5Xo2dV(ofDVrHeRee&e+|LA-!*AV&|5Do9fWsyN@uISFn56g?o?PcF&g>
z`_?}hQx5Llvt{=ik-%$=JrYIw8!z6nY3uxR2kvL=(J<~!0HPlI;i9{KLf8NCx8MDe
zu0Q(OAD$OaGI5hfF-*ZdXTJr2nz)lWZLFGgFg`u8cZONeZe{hFRX&zIxMnrJ8H>k7
zDg68`d+52$LnTmtmD$brlpJE*Ont}LX7)5!_>+K__z@*ji70!NdjU@=N0h%Pd(<Lz
zfjX^Tq<&R-N`2mNui+_UKXROT$|sHc`H|E|l)ne%YoDi36F$a%<HPDjsdT7;FiHQU
zr9|p}Q<tfWEApEw%+A`;*7<1P0zfA-vU71iitrd<1MWWy_%`5Cz~g{MRvtgbssT-a
z7C>A4E!G}?f_21?v-!9#h`-1><59K@&sG2i0mFcGNOvxtk09MBu472I0qL&8vzq{)
z0Nf1tB;Xdnt$<G>?QMY10B#3-7U@5aa=wUXhX7v#JODThco6Uq;2TKyO~AJR4+Fl9
zJdXk%!?W)I9!J;!OpmdJ@uR@x7+a4kXRi1vmcat?SJ0|Bp8q?rj^p{iBWD~r<Lo(L
z{XF1Bz|R2=mIYj#fcf!%qO=o8{ZEv30x6Fn<uUdGp1p|c&jBwX{4yW|xsD^(apd?b
zQvVgHk0bSQq&|++$C3ItQXfa^<D!mZNPP@-#1k0D1;(j5j-}Oc47rY>5AEoytoS#P
z^P4P;@HpTFgkJ)@44|hH3#wJC&49N51MU6?+WZf+`5(-Nk}QHM^W(opN#G7#$8miw
zei&FEM%{;j@nL30iBZ%SO}6U=gkJ)@46qCQJL7L4e;ob(2Kw?1^vxUSn>WxWZzO4^
z(Mv&&7*fY((V1xQcTvWAT%Q9yp9e@fzXd$rLXDEn67wwdlM_%J|0SCTpcWAJFCgwE
zz{`LZV5b86Cs;OUN2yEE>*c_+8c>UH6RyM+VWf-Tei_0m0ILxm#FaQ@9M5Ku|0={?
z4R}A`1AuD)9|T+*e+IlB2d~G$>v8aU9K0R}ugAgbadrpN+zGe~a5vxp;0u6zknf9l
zehBb2zypB8fCm8&0W|JRZxQuBwdh5(=0$-uVfO;UF9BW#_|ev*XyZ||@hIAN6zw~T
zvHW+m?I_xI6zw{Sb{)mI{X5!q6u2J+?ni<9QQ&?QxE}@XM}hlMjLE+P$D_dUC~!Oq
z9FGFWqrmYfa6AeekAj<yqQ7G3uNZhHhQ5liOyEhJDEX#1{u=t|HGv87EY(hYtL2`}
zPwnyN!6C0e-n<5R^9p3k^WckDAXi=kf4u_!dIkLT3i#_4@YgG7u~tthYOV#w3q{Vq
zu|?>$2;x>FZoSC;H})RUlQHyU3_Te`PsY%bG4x~%J^30+{~LNNh8~Nd$71NQ7<w#*
z9*d#JUPH})L(P9f&3^;kQ{$i>y!Av<hSs7d(&gwv<X!|B5<wbGey&EEbQ!uHY2Jf0
zS0T;SfcFDF0JsM5LBQ$cDap<|kmgRnU4Xj*2LN9HoKB`{vQuICkYCUdSQc|ZW|p!F
z^iLILRx7Jz^?1^RStOG!#wVXeST8GJ=dcxQ9$U@UFdrMloDyW`;Zw(E@Tq54vJbKb
zb{#(L>_&V#*iGyf%t*JgFQAMs;<JiH@mb9du?JZndk8bp5N4vs*?RUIdkN*ejL#;<
zb6*lOb1v)PV|>i`rtwWvj=95Lz&f;RR!jD}>~-$l?%jM$e)BQ5T+Dzp3(f_a74?8-
zN<E<2Qx9lH)dQMk^?+txJ)qfG4`_zg1Ddt<fM#+%pxIpqc)8$Kn)T-bX#sjb9IXeW
zE$9Jh5PCpbg&vTmp$DXW=mBXYdO%u=9?;0s1JY*nfJUbt3?p6-NE6b7bAi7ekjA73
zq($igX;ykb+Lj)W#L$DA5U&TMsp-MZh}Q$s==6ZJJUt-IPY*~N)C1BG^?<ZSJs?d|
z4@kSz1CpA0KoV0A4k2C-NL$r|2N16ZhY_y_r0MFxLx|S{(unoon~2u~(wy~xv}rvc
z4O<UL>(&FBP4s}Yb3Gu9T@N6$q0x0>wmlcu4PsWNnfEo+`WkY)2I)>(vmTHpst2T<
z>H%r2dO%vN9*}0M2c+%l0cpT`@EmBO2hSs34_-vP9?%Lz2Y83j6iHj03#1S00qMwk
zKzg$tkS?tUq+ja+>D+oidbl2tZmtKUuj>Kn@OltI`FcRQz8;YNuLray(1Ssw*Mnii
z>j7!(dO&LoJ)m`m9?)7u4`_X&2ef9<gKH442eh`)16uFs0j+`b;3mZD0j-tv;AX_@
z0j;U@fYw=hKx;2Op!Jv@&>Bq-Xx*j<w3gF@1BllHTJz}vtpoLd)`og;2=RJAYe+qK
z0P%W2YfU|%^`{=tnp6*HovH_9S<!<RAW!swR_%H~D|tQmo>=M9YIiQs>Q@hFMXU$3
zO4frG#OndAruBeU*m^*#Zao-8ydKc{SPy8$t_QS=*8^JF>%mQk*8{Qu=)uj1*8{Q?
z=mA*|^nff1dO%hNJs``29vniv9*~7X4<10g9*`wN56HTq2W0Wk1F~c20a-@$fUG5Y
zKo%4|AghWVkflWru=a(`L=VWWq6cJa(F3x-=mFVe^nmO%dO)@tJs^9I9*~Vk56JGL
z2V@J<1F{e4!S{sCi0nplf$W@mK(-}4AbXP@kPS)?I$<}`1F}`=K?L>c0ok<lfb3j)
zumSbz0olX!;40Ls2V^(X1G1&*0om8|;2Om10omd7fNXPmK=wL4ARC?@kX=s?$kwL^
zWdGBH1BllHvJ>h7*$(x9?1_3nHby-lyQ3bEEm9B2POk?qBVGr1fv{teEpsl+wGwIf
zdX^%JBO9n5G~t;Zv>;v&^ejjeM>bVGAUmrbM9?NZ(6b0poSsF9;>d2R2ZMN~2g8Wh
z13gO-#gQFY56CvG2V^hS1F|9O0oj%HfNafra1G-1fNauwpl5NSxSLJ^dKM>&yZIFG
zNyO{HEr{2HTM@4ZdX^u}j!w4pxj?pcJs^9#9*_-Q4-Oz+56D)p2YQw$iaT@)(6dBQ
z+yke8!-&^|2NACa4<TL;^ejKx{(_$MhqGMTGi6RzjD3U_*yI;tXJ8n%^Yz$AxRQO2
zJ%XKp=h+MFMfP*-2)xV`>(jIsV7}S%JS)Qv1dGeRm*Pj`KZzepzr#+(DgM$^ooODe
zDC9k=g+=XYcd7W<p?8x9W&bt3l-YObPtwD)Q_a3hPnRA}Zx3oc3T$Hp>1pPM-%XyA
z%6KFGVw~VL^Z{V*bG>_!{%!KS8{FPao|Ex|bY=wa<nL5@;{TwJR?_S{EmmIRZ^i#f
zfV$sBo<tcxj{j%;am;GsFD~w67~jSOBqL-%rg~?2DCfJO^}EV5i-W<_Z^T~_@H%h+
z=>5&+`ZLTki*wJAkKaw6BsUP|#2bX|Y>el&DaAo&o(E+fNiQe<5_+286+8jx|Gk?$
zb4xnaSeTnG{r*hyP@2>qB;3CXcmwSL=>MH*9+ZTSEF=E<th=AYzk@mHJJ`Qq0;tDC
zAI?g3hI!Jl)apx*d%N&E%M(8WnUWkM@{TxLa(5~uYE@V(yzH{!F;Iq&!mz81Il2NL
z6Z{9Nut#2vj}2Y~wb+TM!zUBo0rkkygpZ3g<KsaYtt^MN;gg5``gY9i9rzSsKYjsp
zgHC*WY!N;I_#Q;ypU{Jk%9i0{gfBube3Z_?#|n>x70@YG<Kuu&K_9e>HTXE;pD@VW
z@Glr*UbYsWT(%CMeC*$!%L>^DKE>FZA7drhiQfQ^lK0>f6rK#F!iT{id>Bl^hrtCO
zhFgL8r`hem@U!^%*yr)dXLrE2feYUTqwsAo3*QDed>bA@?cZPzqn2;u<HtVzqxdFo
z2OnrwB`9bH4NE~Cq97MkQv}sqf>NrWPL80CK~N`GP=|aIIzelqj$2SCThPTKXkit!
z@QC)?M4R(On=?e4^F^EOqRkG`X0K?onOz0%jZAheK3SsuT(n#jEmuX$b4ANdqUCv_
z<=N~We4L{F7SVE>Xt_<aJYTfjAzJPbEjOW+YZ9DO4t^nTlUndcJ=)t0erQ8mJJ7~X
zv@C-DUWR@qpOe+-*EML-5c+W)S~G%HYykE%!1`+Te)a)&4Y0osJ$4iO1iP7i5`HJQ
z0_WS<XV7Dx1;%%<JK0_AZgv3u^+oj5A@())06Ppnl!t)pH`%w)Q{M)rj{`#n-Yo(T
zYW}6<B?`S$@IHJ{`8s|hc+jBiS1v=`QhDVYSrZRgj7o;dq$r9};dd~!i?Nl7d@Qnj
za5Z+T97mYyi+3=lUctVPXP=<w%EQXTxDaRHK>~^dE{y#SF@#kSM%k0N)*+n%eZ|1>
zSD;M~us9#$mnh#;UiR619$$fPo-g1l_tpCr_%`~!>JJ>zuy-IQaqNS9Fp-}5vVD2J
zqD1=nY3X_VukqhPNBB<svG`1U#fcLqUOn=!M;<%!?IRB#`Nok4kKBLc3rDU#()#Pi
zeB_<`4*xiOfVE8UT?GN=6o7}S!DupDthNlhBQq=8>2iC#Ik|cH1%*Y$^GbaFK(Mr|
zyrQzIx+YXxSKrXs)ZEhA*4{CH!NSf(i<g9#c6GxGyLb6HD^{*r-M6NHU~p)7?YeVE
zM#t7~c+Yto$0yh|AH43vAHU`HJMXybz};W?;+O9I@>lNr>iz$6@N0)2c<}Hyzwxby
z*#(nZrhakJ=XdRRW#4vo?X7GNV_PMf=U>L|dFaZ`JLzuvy)SRN>I0vA>^nbu_Qjt+
z_x#t{qmQ%S{OZ?ua`6i<vG?!4`uY!j<f9+E;S)Ern{NBer`dO(AXn{6DCfz4Gi(w(
zJxRQf;0SO@e7^ET{O`EOcl_^k&-}`zQ5K5&#<$i+dB`{Ei$2yLHI$D<4L$2e{6T-=
z{t;iazkkFZ4UZQ3q8$|K7#;ORGkPW_qm^`<(c_CYP@sWQJk~$r+v?lDf5I2F^^c4r
z#z)U=6l$YT+j!yl=;&x+l+}!m2BWNhWXtGiZBz;QP>!K&0w@@}`$wY2U{}->>?-v8
zN27eaHmZh#z{fXv(736~M^6rAaHZOhV7G6-Z$FAV*kCN%KQJ=hUpO&1Iuabkv+&Re
z9uyMxiK=R&hEUYpU2_PG(mmc)8#UrK*cJ3eS+Hv&detUW7By7YMol3fVWjkIj`E&O
z;}L;`Sw^y&;6aO_Y~0tgKR7`|6K!OLM2D!a5VdL5Mb)z4L_}t`gbo^wJyAXpsf}7g
zD9`7MTDw;e2@nW&jYe&BH;6kM?rNj9knbS_+eBZRQBgFbd)&8w9JB|%wb6{w%HffN
zW*!+WjXJgjFR6{%Ln{YHRu0L?LO<f&BHj@?$n4!~M-JNU-Kf4RYO5KIvhJu-)^*TI
zUp9P2c@Bu6mi3Pu<e&_?qH90sifXOZ{vfhx;X?VGvM6QZ=_s1f3*>vpLBABq4&qot
z5KZrnvc-ou=Yrgsz{S`zJi?;(V3%(k<sNo8IOg51uKnW&9mbmI&YHpi8lQ!PnKiZ1
z?9f3@S7+#;LRVMlph{PF=%9hF9#EC8-q1l4U2{SQ&2-HT9kkFjFLcmK*Zfe_QgeoN
z7ohHZ<S9hmbS*;NbS*~Rbe)H~=~{xi>FPt>boHZdx&}};U4y8buB9Pgr{JHm5Sr{5
z_jQAy<J18YxJFB>{k75ZP_(QjS_aOm0F(8CH#F7@PILr)``3=ljYJREMk|x_<T=rb
z>L~X%2=Y~>H+S}<>X5HhU{e!fQC0FcMu}D*1zFAmLZ(C(2RjZ{b1$$8p$))5OEnG#
zn&_yF)`seGJ8PqLI#1E_n~|a(#A7*SzB*qojWIO(oc;TIgS{9zBb(5MD92c?<J{{(
zEe#>m4c^1QND?*m)NI*b7xei$_oJ-F)MH<rEF)?lLD5s=i;mMc3J;8YP4TI|!mlai
zYQbn1jcf}f1nNVL!DV3VZg43^5v!46O6eY-3`W)NiAfAzrF)_f;qg(71SFe4#Sn+V
zWfL8RL6ox$*yAF~LJ_hk)Bu5i8_=XCYDAwJDKGL(AW4}h9p4asg+c#lszmf&6Sc>O
zI*jFs_5?f8%w`cCwP1w!e9MBMTMd|?HrgVZ56qMVb=dGoov#yOn(#_QqOdgbmErCj
zJOZQjYz|6_ONkatP!%}UMq3j#c57rEr#S(w&?w&)3i|4(`O6@mI!EgcmU9m{yFD2V
z;-{iJlF=fymUUK|`Jre-jrL?#p$kIM#+v=;a_ZatVE&UT2C?g+<*0w5pa}7cM!+a|
zAqZBj1LsN{J24s|&613zHSz5^r}v#P3sHy0YG<&c(4W?E{?P;`i>S#O=@wHf{X}0v
zB!O+RVN1|3uN*NrVT8fqu8W2+K*FbpUkW+EJ?>~N(sYHQ^|*8sZF)dG-!h1CjT#XM
z28@_)5U(e62xq_$ScU+nKyT;}7ct8b5HaUannifDg3?f6C8eRjDoR6v)s$vF0)3Q*
z0&6G@1^Ous1qLY1LIegW4F!fM4F!fN4F%Rxn#BmLqcjvam(oyRgwjx8l+r9fV2sjG
zU_GUwzy?Y~f%k->O-VAJM>o+nL~j(Kc7(<S*C4tBHxr>~b29ZNx)G^2ix8!r6d_8w
zB@}H*Cf!OmBIz~}qNGzIL`k=YqOHlKJLpCvJzs<<>9hz@(w(82sAWr3E$zRA#CI)8
zUYu3KIw1>6iXS)C%5Bix&8!YnZ++(>v!Uoenhu(bFLxeN6$IHqm7<LleaLJo{%7YQ
zPVvo7zq6v*8T51OtKa{=a@&cmer1F-<Vw_V3v@#xR=uTRKlqCcAj;m&6h$2{a8-4v
z5tGSeHCbIQr_oj8b~ZcBL33-fw{j+P(7uD;%1dJ}pZLs<9mt0A`0KnF<q?iKVYiCO
zo((9_yzM;VbUL#Q?izQqIoJ-U+>yQVa)9#ikAM7Q%A1AuU5~tlSU)cdcbg1~l4V9-
zg^y)g6qfDCP^~s*9W??gd$*n2Yz|w5v66YkMaWZFke`>EgVBL%5`TF$OL%iTDnoSw
zfH*2f^#JiG%hKp>vNSozoJ#@CmS#7=JLX*q*tFEW^vS-j_uYv<T%N>V-`A->0`Z^m
z9m*fDzFr(&=*(0MN?AZLa;1x@24+y%6cQO2--;#~RK>8Kaifv10cni`%*c&Bg)UEl
z%W3k~w1bMCrq-4^wY7!9ImJBK+7j@3=BZwf$?OfbmItQxgqDOud&e%CnxVj=1!ET<
zYG{u{Dwa02pWFWNf|i!NPvjK$^vL_=BlhOzJoIKD{+2SJd<WW;8&--St6}e58LjId
z30Go~Z&ggz4Zx0D6uzFRDjPDOhdkZPVlfVxZHm$8Fh&Z)4JRcv7{C~m9)0cUwxL}P
z%48m5X0z8E84Y_qp6aUdvVgy+(39)Qb-UeOcZR3N-P+RDgw}aXf%0}w(;|*Wx_L8i
z*NG3bO|{{F+4AM3+_N<HS~Pjj&;Nbff(32#)ffu>ITSkaW#!=$k-4#g53AyT=Qo3w
z{M7QWP31;q9yeK(u9eYZP@%@a6)QJd6eD_vi}r|?nTE{VWD<=^1Wh1B)u~bsutee%
z1sqisfgtf<slUROhc0euFGqV9a&IsI0^}^@=;&r|(Cf(!mRFd9fp$-GQ+sPLVDeV2
zT6N%x%RBu3hMD4G`)-R;e9mPv^V`(w^1!XV7X*B}9rsN}YAOSLeUrbRUzFot@}-_d
zcU3i@y_}Wt*V)I!xO0WGlA{=7E?aSm5mzQh8l@!*!k>`V&E|y*)0&SFKZM@JfcKaA
zgBYpp&XzWTxXJ4z%+ZAM`re^HVPRfgVPRmX_tSj;(6X_@(%40%g=5R8Y@C#3KNMw4
zX`&24kbtyUdV|SC;Rw5#3spdxG`BW4wY551%4<NDrW{mb3T7vZ?;S$fd_R>v6uW3>
z8Om39FW-;yGg(nMKht5)uvsl;6D%XJTP#7zb{28->>77_Zbh@XJ=dITt}s`$D@C6y
z7%TW>(Sd!-SFc{aPjReW`Gqg6TwAoS_2!#f_YvOt?0$ZsV#j!?!4Sc@UcMS-qF@YZ
zbreK03?R<XgDP;qNyry7@iiJCdNbIXe{J8j*Y@%DzU!{*`|yXU%*y!fupRBdDC#<_
z!Xm-Je0DIOi*ZGPZ3i-M0P%`L0gpKm$<I%Z8x7lVYhoss)8HgZc_FwecQn)%@7TC&
z66FVZi2aG*2w7Vk#x5rKcr`L`h+E7VgsI9@rwU>qYw$@Pnw&%&;e~I)OJ#XsFU3#}
z?%<H6S{ACUa)*%V9MS}5%mr`B^!DzP(_=6jxo2bSH5!o+EhQL#JC!Gd{2?w&3JtIW
z9|Epk9wFh7;4<0uLO6gM0^X8!cdf(!%$_~>^6B9X8-`;y<9l^a55KGjE#qt&U-iHV
zXHUZ=ICRZbMfQ`Jxj<30#lkF3IcK#twY6jRb5751$X+p{<n%#yM3fv!3%(n87O}M}
zqgHfIF(P3a8%KV@yO4^iY8WtbgTY}yKf#1Y&s7L{y#%9SJ029VqCB^&%H&43wJe5o
zFQ>r|*$ye_^<=8Kpl)qATw7c;e`@%S;l@Z;mFekq^EdYPoYzqs>{%IEyMF!J@CE(L
zdIO0*3xJ+GfM+%P>fs<)RN^H<w}u%FFlqr^>h*D;20AF~nZaNhf^Y)%oSTQGcrIKS
z%|Mn=S{5+n)amntYh`k3utH3H`t+mV+5)$$%wHC8T5{zKhanCLD2KQRrHBEEXim%v
zfvNdL#ewp&8oxh5mes34n|l{5?Fok38>%J)l@*{(Z8_1#wc8iCpdBF~MOI7xe(-_~
zGN373?;!T?0!Q<uM$So#z#tn%uLubb>4s1S65B9}U1mtRR(G?LByzA7DpKZ?m$bCZ
z?A&?fB>#D=V)9B{(cLTv`k#+F3fM)5oj4(%qCXf<k#jzWzkvxiCeYt#B!NNGWg7iK
z`c!I=a_ec6gOZ*AP;|SJloT^37|HGT2F-2FO>#yJPVLz<<>7%xttCq@lO&5oZtLms
z@>?dq*nG$Bf=r;3A8ptL9?D}rw(W2hHwi9sfF(*Hd{hNYuR`Rhru7)4i8-DcGK7YB
ziTBH7GO)tw(v60#Znvj2;0~B`XbOQ`7rc)tu9zp0*3<z1z5T;e^P$6?bD1{aw?2pt
z&hII2xN7koSJAMKM6RGwPvhQ?FX{&qX{%DGk_gq5R!xj)Qq$e)_o^TlUvbyWoyy4M
z_=y9g_o}P_wAce$cwv(-XZ7JwrV3HdyI=%|%BE5WY7|HpSngm!o>1K6tS*%rjf3S(
z4(ZjJP;m+(k<oib#n;T@Mf~#1FTb~ay1Z;Eha_6gw(|1nc7)Ddvu5d<H78cAsOaxU
z8x@>ICtlO~$;%B!;x^e&z)e-?(6d1?LbEiPG%Qt>4@<F1{e)x&1^slobkt8SbW^Dt
z{UkLs%)gl87jdYiV$cfpM5=4W=$%woK``^1sc(j3x21aPOFcbTL`d?=b;V8m-$7|J
zs|uGh=*JLEm`TxpSXPLBG8iDZ%?3>0NTxbX*<zAY6I0KQ9sGSX0ii6KM^TmugLcEL
znH1WKm`PO=6mHc(r7IBCi7B-}PN{kiN5d{N-qm5YnV~<RV9c@R<Qyw8z&u;MgJxQZ
z26%5Cdz4S|6O{aGCWTjmXk}h=u6G_^cH{^q{!7;M_pbrILH2vToj)(yUIz)CYC9y8
zoT5PiOwlJ3pdI{L1_<(Hv2XHazwhh2tFMpvz7loMB<jZ6q7qW8y`t6Vtwhbs9;J#e
zK{|!uT`hbBypxYT!f820l$kI&VtkKdRibbMmL<u-Z7>)I%%sJWx?i412MK?=gri}1
z0kn;R;)3F$Le!I=m+!V<U8qfNiqLE^?I~Ew6mue`XYh`}s)j1VCR2H+e8#$i|D=b6
z_@XWCYpQdcuKeb;t>-Q1=~)$PM29OZFaCt`dF6L_m&juF^OeyG2&l|_Zd0?cf(mgn
zSGx+e2qh6Qno#S(04B($_0R{H&8XVeL&?X)Xg2Z<%#4M~8q9>2A!adKdNCVP$)rA~
zvRILYS&iJfhMh8BxKSqy=0+=teY^rjr!LHjS)B`7n}emL0SvkF(u}+sHz-6ZuP0Lp
z1}aPy<xBWto|}`~-mIEPDJGr4<n`oWbzsIgEH5+V=Cm#0ZRNpolR2+`^kZW;zrTF(
z65pVyq-#fZhGlWfVvlKjo|;=xwQ0*W*YDeV@rY&k(z`#$UFN3TVuMZ1%gHM?@W6R@
zy|?#{YtQ{akFRTqs(xzAid70<v>^8D{Oix%biot%U;g39c*nQC5LS4Je`8S*pBF%D
z73gt{-vGI5#u$W#Y{PgH!V(Onj3I@++XyC;N+d><nVB)WnxNpjo87^Rpc$>o*nQ{j
zUGD4L{vEBPBwl&tulOe9R7oG@m!s@V%uIgP5pK0`Jy9$)J3eHR!h<n?Nnw6ojx!7S
z9DXx|hf~Zn356n9F<0%V;g$ES?du&}JGf*?ago0qCO3ZvP+2pWKkfHjG=E_2WJ&p=
zhB8t#mIEcB!*0V^%4HkmND4xrU<i$iWxbj{kW|$;j48uQ<A^3x8fa6eOE&s-Hzszs
zn<f*ivJz8d00J1|79$1=<q}NgG_%u;&ZlX>L{|3n#IB7*Cf_5cbo2|+?lRFYS*$!9
z)b#8GtrCJ3uVZl7s8dXSqoflFdJqV@HmGv{fdk>i9UY66hwqDh4ogfvO)^}p6ZkO7
z&R{}{LBNs#hvZ6Fh)8;vr1U`gv}F;jO;D#urGlQzLyvswQ;#SQPkwjuN0Z5NSE5`i
ztE8!FZn+6n8%eFqN-Hf=qqP#9l{|R(qaQ_aKbwrvhG<$p<+E|wPt*e#zG9kGjhGfv
z5>HiyUhJi1J*hKDW)#!pDbvw3NlKWTrpc50DoFAz)mu%so!nhlPyQ;=Uy`OD5HzLU
z!a7sshEZW3>!!sfExysFS+oRS;}gWEa^`)zcfU`0IQA^Z`h|yL&x-bg2ZRkzThHmO
z&rm|;j98m-W`n=iF9i-*JJCc0IxwXRJqxzMU>^p(u!0J>0xGT0A%R+v9h!m7Ua(~5
zbHPd8t>m2eOH|_#va@8cvT(p=HGxNj@=X!}#xGHjY>+e`Qd8W`synEfVL-fb=F^|P
z;QRnu^b_6~dop%8&ketzwTTmt7=?{O=<b{=gQV-p#hsBEonl>#0?8J67>&DE@>c~A
z`z!L=X+&gLpfDv-!eR+X$r9|$?!x*|a9497Claec)micBft8=0S~WEYtg`q~(D_)*
z#{V<s6nIhD*Pv`G3x<6bl$9(xt+m9rV&MtY+`x}Y-G9NR3qFh@-^1@lk#EJYs3y7k
zU%O70@&Wx0eBG=%TmflIi$_`?CX8MQZ3#9Rrya&sW)1pH(1ajMvAC$=`8+8`EAKjR
zprxe{e=U#{>+g&GgP%XIbbBdY=|=5%j$aK~>A~8!F<fVb!6cibx4>1jY&<tjpEekT
znaQid01)t(r$iuxl37}r$Sy{P!lW(0Ys$A}_2!jU4a~9$EUd`d)Zj?j1!Q}#Kznmw
zL&jRr0#Tftr;<v&z1x(WtV)XWbCEiytiW#ux2Mk`Fwn_$t40JlgDgMCzS|ZkFHcS%
z?bCshi>Bun&Fh$HsEYlTUmd9IS&nw+LXY1FngrQ(a^)R>sKbaK2M^I&(O}Rl3{Y&e
z=|d{|5ae1)Otf3|lVYY3sZs`Ky%I-9zh3Ba=bvP7PR%)<c}5|^a;2>q%G%USUU^+@
zc^=8KnkE>VdpZ`ar{(rqGBp>sR9DqDFRPM5jWY|{vjH?WGhetE!vKv-?jgvbCe;Dj
zJs{l{1I@yRFPy=8Z1Tjtv>v1N_20z0&cO=8xl$g2Na`>qG-4D84`C^S7?Q#W5;r&_
z=Eg57-V?uzM3kZve-a3h2La>P0UwhrD>X!=TywgzA=lhA<keutuHoS=(+40t{#98B
z%N5~*eF&u#`R&vm8%bpha<YApOp`WD2o6`a5e7giMHa+^S?4co-O)aOyzi#U%1@!h
z7nRBr&nhIT_r<Q4<?_#?Tq!HfFej!^OOqZD{w|k`jH7N<l<f{?@T~V<xMyhX)(hXe
zcWgbM;={2RS7Kj{-O9bOKM~Fbe0>OITgWa7kFhkFCtD4CldXoO!*Jp7@b>E=8Dihz
zOJbo{Uqu<YC}R|5SZTgDVOBr~C>X(r9*~nm+MW<%AuK=#Va0U^X`$Wh&Hd^3dB;zG
zx``i~+!V8sI7Yc-Z~ixw3(v%`pIAT19myRgq)74z#vpj4*<1hM^5x3IV<-MThB8t%
zNV0Dy<^z~46ZUN$G;W0XQA}{6&K!J`9a^hX82}l?^rl~DE2K0aXZi96#}vyLIDs<{
zzgE~iO~eN<C4mb-4_wGh3qv!$u@n@u5Lf_euGw>a-}NJ7W60MQd+M2IPzH<N!{3Cj
ztIBf2v^LWgfOy1v1oB?L*U#UK*=<<-a~4v5!+xXopC-M#IX4)(AhJg7-vzmQRxigI
z?yO#ZRxh8shB~X4i~Y~DdU@K+dR8w#tCwSrJ*$^%OW>r=byhEjuK53(UJl)n9Ywo+
ztTQ~{h;_P?8yPJ2Min|g40|ercT8gU3#v1=!D%NDyWq&@V?KYizsxC|Aevy8Ud*MZ
z2(}f?IVF6aye+Tibv&aaN3j?dHgsec=3&=r(ISIU$t%q6Xjo{lC^@`wEI)W{d&gKw
z<>Wcp+2>4FmW*|@UmMIvEu1|Qf0T!m6VQiG@8ggQGs`n$OV!2yd|c$q#`iI;Z5~)6
zEZm?LlfA7AWzl94IsS<Cw^$VzVOJLWAfjz0PA^)Aw!sgA8rRk?8X}!ksBz8SfGLY-
z@?f@Zn@SQbKB-Nzsc4sl=kROzJ+R8uhO2E>tSa0fwMzC9ETGo_3#{O<4JmQtO0U1n
zA0X$s#W2XgBG=ZQi`uaW4&XdXpnYEPd7kY2{FXpl2|~{NJie;AVo`3Ot*I2>SSM&U
zLh|#2{hnOtQcI%bjvTfV8M*pd%vf+4U9=<TY;VqW(k4!2=3wUZ4qkfVMC@f{P`HMm
z9i{Q3d|LSdD`YcaJFF@SE67!_6@U%PKw@Kgt}Q&V`h&?F?r?JJsRCB1S;?>h2S36$
z&1h8Dfb%G+YU~;Px(Ak6k4IX~(_Q8?ySZ?hE8RDCDOt`h9ozRbFM^L;bKcDj?XaCc
zABpsz^U2)imOSDu7_NZ(6U@(cOS^F;17{iy<0h_{u~Jj`C=e9JDo?isYdPzHja#h_
zD{RMAGO054wrNM<+QU$X-{thW+}Q4NV)Lh&JW`;d)?t$@-4Mg!84@&^o4xZY+xS4Y
zxhhv$W6DgI?lCuhdwfyrTKC|9u*CGN>gj1;+gGr*w<595#)c;UAb389_E3bcMwgA;
z+{kV}2L8uRpUGexMa#$)0-kH8NSeQ-E1Nc@guy{t?#UqnC=!@292nSs)zJF&>t_ID
z8T|oojSaQew(s4GFYs4toWeKto$Yzj&{f6o9UEK9H^)B9e?i|M8p;jEzs{%7N3}S^
z_u;U$tubFQU{@otA6_E)1{*SPQ#cPi3)wY-aU?gz;a0UWnguTOrIINI<5rz?Vb~=!
z4m9egfgLUAE)KeLz<h3O|ED?*gHXC`nn6w&ro;vgS<T_t+3v~7UCdisDll4mdWLTw
zo+>VACr3{FzDMe2d&#`Kd5iOk`GTQ}+O<p8tXN#?E%bNf_zO#Wn};fE)=^YbP>X6W
z3S=2-itFYXs)<G%HiLhtOCi_9UOQPRU}nGtb{nIL9R`>h42HRT?c^0kZeD!6V_f;o
zIR0oa&Vy57KLow;wtm<xzbzfsnwZgKF~P~mg56WtE#V|$fRl(Bj-+NdlIr<(f%4?A
z(45L?vY27VJd>>97MaU3g$mC&8}?Wo!2rYqc52*i7kn?<vfF$)*(RUj$!Th9DGy+a
z8b)pMu!U(`ZnFhE-{;le|9<TGD?j`CXFvP8^2+kQzU8lcm$&`k2eGGqz<+!E?z@lQ
z9lPT3%P%jjZfN*neSK%gW#CH{vg0N87x>r0lY|A>_rkUkZn5SjJWSnac@6FUsfKa%
zkJX}B*P|)i#4I2iv!Q$VT9Rr*kS`vU*pyszLo$mpbw+tWTTug&gGLsUIV~Hy#$wj1
z2}HuY>i5knD#*+6x}8~>b{m8}xnE>t3vaCo@HL!P6E0fKO<rd(<)v!!&U^OR6_KJq
z*S3ud4bHZ{Wu<;~`Aa=LKQnZ9D0O8ux$a%NVsACHo?lbir!GW0vRNM=QfMbmXjj-E
zg0G%1r=~F}yu`txFnW@am#nGop#08Wym`^0&6DDrZ{$1{kNqci$}7o-gx@CrAj<EN
zGCUW<K{!`J3XrdbaIs`cPhlADe!|0Y&I9RYsck0-MYuJekC7+m3vlB^9q-Q1(lBc*
zl|h273@;}R;axVfVl*k(@52@`xWho)fq_BHp*NPYvukTA%d^X}%gXWt#M>D;C-b)4
zuo13E$$bkiv={7P)bQC{Zryu9ON+J7oL5*-Qdd<vm)mXptGlhMa=n9f6&_c0U7+aR
z*PC6<po2~MH}+?>8QgMuU5q4)?f1&Rk>?7@r!0>56eeU!VK@&l=!kQZO{IMxw+lV*
zqN$JsXkxr(Ef`#|V9-)rSzKJHbWnJ~#S|tN%^>`Bx5HmIi?zTX10!t*e6-0%i%A=%
zYdH6;#)X*&EgXv+xF#cI7HuZu&x(CqIj@ljlsnb%&FTZ(-`C%_XAi!p->c!HdtCLy
zF1}t$Gan+c7eHegO~CtwRP1G~Mni;usA>R{`DGHgUY#n9^bpNuxj8OZ9yT8#mB>R>
z`iC}=I|y`u>Y}QuqUBvr*SA+0ui+cpN*C4EE($h<>T7oGY8-9pELehiO7Z&yZ>m1#
zXNM0L(Y79DMVjvF(i}WFd_ql_9!=19HQ!KfHjCp3<QK}#%OQPS$W@<~3q1s>@;2Gv
zIwO2f(N@~xJA*9b9GVCD>@O8Ajl?IyQ%<^uf>RSj(7ZwerCrOta5b+6B^n!_=1-MY
zg_;8;`AZt|n?pspyLV^wdc4bnyFrUW%z-};cJsI4O&kR&j7)D;ezR*A^>HTF7j!n-
z!N`voIw<xFr|8tmc1?}2D|B$h8KB*sR`~IYo%o<TP@Z|<P=8y$vN*yYSbyIMRk`oP
z5MOZ~%B<v7@K^i98I6<59lT1@r3>Oa*{|Wv;$feVT~baGo?{LHeW@dp9jKir!KNWM
zQU}(e11pmA!P_JcL(iqT3F1fVxKor2ou?E{4`f5<0awB)uocn--9~;(*rRPNSdo)o
zYHKJjZE7B0WAWq_^tO5n%JLRqyg@c&{CrX^glwz8RwWHh2xM%aVPQjVB((nE3i)-O
z?5LezT9Q$>OgYq8R1}NAUmSlb=Gm99rlUDG3u6*Ko3xHYQ!vrNDTt<2qfzdt8nHyp
z@w%Luj>O~!_aIs=(BwAv97^EXXWO^7;~ytZFq8fAGp!32w9;2&P0igk@ZOs>hhb0I
zMmu*W&0(6NC6-VbrVKbiC6-X_*v8ZTvoW15Uc5wn_h~bkb_H?RQgjKnu|N_#+E~Ee
z6CNuN?#7vLe8WRKS4|*a1~+Hg6pPVp83Uin^_$S?jRRJPJip^`Sgj1+d5&C%I2Pq{
zW@lOLR-Bkf&^wE^V-t??@-R-CA9U+d(F0ZD2+mDcuJZePdV7_jM1P#Pk9OMn!{mYz
z?(YvD5dA~AuT9`y%5IV}vyquG)tSfP)WTH@^*p9Js4F;sl)~F;H4ZpzcC7Y<Ct{P#
zL;QKBnMT8Y*<eShqcj*OBG)kQtmbCUX>PNg+?B1)5UqYZT?Wr-x}HD=4GgSQ^xt<N
zlgn5GYvvonStOd9(R)f)1<&A1rHo#hl(wV|ilJ>IzkN(y=-UlhJOc;I?A8qX7)&mv
zAq!3=!I$4=vko}26}bkLGNLQ3AX~ya|DBga>SuRKoZI-jEh^mmPD-&@z_h8O3hB+m
ziy^}P^725Ssj<AFyrI6XHdIqxRT(G?l)1Dy#DxXx+s+}m;+$DJYtNolt`(jAp#+Qb
z^G`9yyfv5OAs67^LH=>%YdfiVp22U_$iTUf*vffiQ%ao!(7YMQ^DLDN9%x(j(_ukV
zP(XgRP>=F*VU21RPPG-y!f8}YoznM=h>)Ffu$_X<;JrKUJ;}Y6oNjrXW*b%R8)LpS
zBb3S7!!4Ouod{1ExQrV|G5IUpl<@2{C!J;Fc`IZh?@l=VYTlhH_N3L6hi5Uirz<rt
zPwZ2lIKel~s?&x#VRKA)ks86>Sn-Ww_@vxPwMsK!rOe38z)`QHTd6fwG2BWkFr%lr
zmbTL5uDO@qiAg@at(nZpy2D`yHyWJK3l+HgTTSRMYB6rPIniP`b_ririv_=cnPthe
zWYR&iM7wRN>QxxWu<f7L^!m}wqvzFzGPTx|p3&Ye2q0vn*soVtpeT~={o&Qw7R7AL
z#Zj{Y4(ZsH#SLN5!E7>M{bocr7_lg@05wYjHEXgnAmMP>6`1KE)+Vfk?YZPg6%3f+
za;MQKl;4@#<|xi=&F{=<%Ph{!(@<5FNPck{AjZ*MKtkfW6u1(PxL9vEBDuuO4H*`j
zdNQYI$Yo^_<+5B^m~<R=ONJ#yJ$oAUz_uVAP0Si{{_%M`TK(g)1Ia2ul)IBm6G?oo
z06z5VVg=NbE{$s~W`l(+5=Lf*(K?-bHJsqGo{s~D*;$#G0VM~g^`y4;06yCCL&GVf
zE>c$)0h#ih1x{yy#7(tRWL=E$O>a@G6MBLHvcD4YfUsK{UhKju2O|pFj)nYYG3^;F
zU~-82gawrRXRTNY(xk_jGdpdGV#~qUN;%Q`TgijkY4{f3PR_KkXLtGLuS>Ypk{>k{
zNdC$@Ir%HsaQB1NIk3Xgf`AT*wPCda)pnfJK7$JTmuj`Znq#)YBc7%nt67yxP>X4f
z^^6t<?J{@DpZUzQlUj=3RMjkN$=X$;b?WV_56?eMR;wB2p;Mwxvj?5Tb(O;A3WE@x
z#MO1PHfySE;?RrGZ<DUq=ky58Rw%jqPjbTUTW|6SZP!McZ*wNPpH-qGh9Ot!jkJ((
zP<2c@h}-B~1KDBc_P<5jb;yE*LoRu=)QX)4&Ewe%6CI>X!jC%kXUNt>&yxqx+&aN`
zqE0I<d*7x~JB}*av+SrjS+Q+)#gK32M8!W9a#c8S%e7N_TU~5LxEB%?$KpioHVCy-
zSC2Cp#PXtgm)(UCnL+@E#b>o#3Rtc2zmn25(S9jgK?3lBr2A4qcQ;{!IR)yI3ZHi~
z{J(W+FV3$UBiY%6Nwzy12kqvN!!ZXNNUCOlhR%PG=~OzlYZg@W2Y#Q0vD?L3)GSt&
zU<s^_$qPN{KWH$}!6!&Zc+ZK+6ZY?X^laG-O_wDkW2jvUv`EIDOO!?DsIY!Y6-K)_
za2VII?V{hvq+W(j>zyGwrIi_f4rTrkWzu;n`07f}HquBG4(kSfa}aM=z=0~->6?8>
z%1MW$v^fvO*U0Y35H(<yOX97@e~UVPp-P){2H9w^VzL-<;xI`GoZ}(nEfzvwP7!H`
z!K~RewCO~Rplk7X;Y^`0Q_D(-+^9jwTyg#(1M_KHxS32pkhWMC($<YQXe=~Lu`Cq6
zsPYvNnPRL3{Z8l-(4JsCgY$6>cjhL}M0jBqGL+(A#QigLG9nVeE+ucI;}N{^M|42q
zM|9`~^;e*Cufcq7g%-Fx+~cxgHqXawE?mRaE~n0PjtKz!FO)z!qLU#uJJXRt{*>4q
zBJC#WHm=T@$E6#2=bR}#-K{)1ixYmT^e<1yqg*yD=K~*|SXIu$V|53}q#Yr|#!BL3
zb|Gvb*o>qj;-^SK=U1FA?=0tSSnkL<QBCvP#-YJFuyy(DbKJ^5cb#}lJIg&6$MYnP
zeu*Q_q@4<d!Z5W%*>RdAICf>XlOce{HBOtu!&^=R=xxH5hRJMfcVfhxGY8v`VE81_
zokdg9LZ)yY7&=*Es>NO_k=6`RPk6%`Am5dtaU+hslaY|{K3$s8FoaTmp4VfCfOG<L
zi+me{c1|9c3&nFb@<nny+E2zGgHvmPMsIq<X(0<T%orX!l!ZcUjw@Ymu7ttXMjS6C
zgQ46ghZIP(!er7|#O?M6{XrmxL*8O$O^|dB!@6f<=u0S_P(Fncnm-5C`x7eYi6=Dn
z01D!a1Y`-#sky*;VYmaku22AAET<V&kAw5_?Do7uSh%6{CA%N`-Yi^6z$EY^B{cEU
zftvB+J$u%Ur@weW`3N-81OdMX$-`MW&SP%DdCUx)1;u&6O1x>NqCGe9!in-7+go?+
z5dY`DiSTwArr}f){{`O(TcsE6@U!{hHmpAs=Fb5`c$|>GYL~^Vu&~>u@FkcqG`iz-
zZ(?W$E333ub2K+mh4Q5t0ea0vdApnTBHgt2=qy<`&{^pzD=1wzu(;e)mLHtiZEl#)
zEe-QU%L>{Zy)}LGT7~>J$FjQ5^VWu**aZze+y}Wq`>ycEhum;r#YA4)258n;B`HF7
zL5J1WvUD;^9xZ^RCR*Y<AqNuv`Q)oS+ecrCNxdb#4mz7+z%p33lFZCZXQmUYV4Tv$
zDtLBH7{iI0&d1oDQ`5)D$~(I~9tInp8!JFs?ZP&7$|^mX9$BY_&gji*og96MY76D4
zJGtiecB)%V&~mAurI)pan=rW&_v+W|a%E<^ye_=RDA{OeWpfY!w~``~z@Qp>$lU6&
zpF5tIA3ubCw7{Mi3Rh_-1F%ufX>4oG0Aeb#TFGDrDreKSgzyA_3jhhp#AyL8bU^LI
z0RM*|uG9nRj8O)-n)d$Tt#9BEA6U*q<%M+?(;bAgJlp1VC+A*y-o~3aY2?KuoOn+}
z<xET3QKNpGHTpU)OdK^ro8Z5v(0)=7@A17`o~)@PF9$4d;JQHztn*-5z~LI4{!u*L
zaOJ@9nhYqNbUag9C9BfY(+QhXX9!m((lYpZ$QL`EGBH*i&gH$G3+H#>$c;R8W2bij
z(LRTK%~QIwhdgytrad*LJPOF4;527)_(fBD^2%%L%JbgIS)H|Xk|*u#j?P)0bX&<;
zyO0>4SiGIJ3!SwKowW;T%82l)I%^lA9nZ6Np-(+>)-DA5TtXc?YZt;^2sGuhcA>L&
zA?>{;3A4aiyU<y?5X=&(4axtOb|Dp3;2ZHC(HgA!Y1ec~xRV*M#UnPD$w^6Czj5|r
zHH<qd-n|7ste#Vwz{wkxUbRdnaQLLYf;V!)Ew%59xX`Pz&f1g2J0H&4lg`?cGO(BP
z?(9iq<i@)*U|%L1SvL8?XjU@pufeaLc9Uis%E;5qk?p|7rDia*rWwp=u##~uVKiGR
zHVIQkGhvt$Hc5JMPMz=<$R*nxEL&oSnCw-;?kjiU#32D}m-+*K;fE>>?#*e=0eFQp
zxupiY^A7N7;U94GftilQi#zV)o9+`kw)aN(o3x>*(3z+I!*%}OqA!oXq5OthVEZ&N
zyqikf<pgczD;VXgJjnf2dx=M4XVa0`WEP$~V2$`O<(D`NxdOWn4dGh&;=nz)%gk9g
ziz{%$#@^2w6r!T{(vRx}{eHN#&)vVXVgI8&&G{y6w=Vsh0mGi8_R8jW9?y6qf0JL2
z+2QoQ&`!)QNZ2?g_A+7F=Z)&CXP6HOllkz@e|8i2*u?zdd6?rs9*_lBWgQ5UdQplC
zud#Nw!kmm9bb7lce;sev#4Lu2>30JXW$3;u8>J=Q@tS&9c6yvV#3A0}DJn_5D;q}@
z>22Afj{nm4al;Od-#(!C2AN>#Cr+V*D7*_B_GWB+6E$!Wi^w51)g5NxOedJnWl0jI
zIgLJPL`o29b{%UUgrg@k3T!>nYsGWOH2_CnL~Wp!sEx?wr3d`{Iq{=mPYMz3C8z=s
zK|GRR+WW?*=%wS5kdm0dBYrzC74J58uv6ec^(zCiR&2c|@t6~TDm)ShoP-BqkmyqI
z%|iAwKEVF~ZA*K<4h=@yEMvSEyJ*hjsgi{Qdj|&g@>2RHe<|rR@}PJRI_YZIxxlNU
zk#_)Y)v5{d0<RZ3wQ5FqX;8U?KJpJ0XR{vmfU+GsW_a^CwkXM09OY_)hfwQrIe}W@
zkW=T>!i7^f-eij%i~W99e(b#ASj(LJU@8=V7Lb2AUhgjb%d=5NXJ-#DNECx|-0)Am
z0Q)2r?9*~jy#snEoo{6sR+}v&?U*YLw`MvND_juLPQ1d~*gnkccCQ_Mw?JlvV=MAn
zGi+(+Uf(XWIC2IgDoTUClH#I*e7w^dE?Jn&vV{MxIAoeS1zU{6)$-+$saIhx;_jlN
zqJcXGrlxPh-}DrMJhQ#MeS+Re){J+@PT^)}B(kJ~BDR7!nConK6K*5MqZubEy2D|2
zb_PZv?-CAyYyex_v@wO_Z}f_A?Os8b!yUzA@wjj}&S6h_eP#$p5%Kaex3d{<X~p}Z
z%)tt;?ZtDJePg1fexj?st5vx?9FDzAKZwF7j~|cSe&WPiZxJpS2|$Q`kMT6`Xl%r9
zv``xH?kVKS|3%Z2-}P+F>ijD!QD3DJe)O|HJg;5j&&7ADuc}wz9#ay<;t%zR-|}PX
zt9bq_a*3MdL-GAPKF$18nkexzh<gNbs|Ro!&S~Ai0?LIfz(2>T@C%S->@B>z>n)az
zcm<G;-?Xgcnb>!u>-%u_<OWs(m<Ch=0)R|F5a3Th0j|ZAUgWuf%}YG5!~r9Za**Zm
zPr=9k7UX|F%DNTT-GC9mwYdKZ@)3Rvefc?DhghXj%qkFHfpSXtrHG^JO}Jjfa``0A
z)qfQA-^4PMX0+#i(Ix}m1HS>Zg>c3-2YEdFO|<<u3;my}AA>dnbv}bD(bK{-+TVb4
zT#_zk@f`F6UR*f>9CJXg%_4n1(VgP(%!Xg@q`nIBJe*O>!<mEQtPuB^g3ia`lkz0a
z-sGV_kQe>AGy$ccdA4XT(R>al5xAC79}xZ1fIR|#wnxAVkHBy2k@#=XM}{Q*W&aZo
zXizS~)CcKs1M;A+l-JNlbL!RZ|2Ng2f4chd%%H4b^9U%+j^nqRkH?SkM`_$(_-I!g
ztHwzzhTnXZKu!esu_?Tfno&O_0X!teQG&k(kFNs#G`N8+<i7$BQ{E>qFA$(y)a?ci
zHpm0|qhB_r&mh~)p1^w{Zc#FoQe{wizjD9wqH0k~)lPMtdae3pHD<WM@QBf8e82G?
z<C~^+rprx_nVvPp%r5g@%VNv4<sr!C4(p`#2J0&}yRFo=!gi7EX4~VoKV}qU^kv+X
z@uGc|ea3#X{Q>(CN2UXB&U9SixW)01<0Z#mGHsb1nb%}KpJm8u$QsGIKkLP;KWFD;
zcV&-fe>D5S?BB!1`8?+V9KBfJ8h2gg`l{<C*FW8r?#tY_xPR}NhtCSnz20nZpZBsH
zdrni%_j1Q__vb#G`(j==Z$sX-c@O1V@;{pY<@{&!|6DLqa8<#>1%D~*FMOux$>Q?j
z@#5QyUzyi2@2YuEmt>bb<Fosg`#$P>)_2@r>R;#I?|&*#5SR`;5iAW}9{gVLmD0A-
zsnXAtzFbyNwyNx!@}~0X@_Wl)uZUFKQ1NnQQRT0y@~VcbZmT*{ZK`gl-c)@{_4765
zHJ8*p9cl=DDD+INt@gay8*9H;XQ=C{+gtb5x>xH1^&9GMt$(=w&!_nOv%%8fX=rFz
z)iBd=N5j*NO5?J|{f+lFK8w$rO?mj-+Vra?{Ia!>w!gz~3mZkhD%{3%@!P9R^@?A6
zp-30|73Kh}*AbQ{$tjF?4dPD5)9+b)G!a(ulEK>(VLDrMBoQ{U0&?FF<(Qa@&r5{O
z>^$C(2;-MgFa~8BE5gx4*v2m7&m_WjR;{c`gdLt1<)TD5lU3(@IT6lgo}6bBVJFMX
zc{LG!lI7&kdkqQy|G^q^?W~*a0ta7;-?ZJ%w&A6udzlZszZr9h55L9SfYH-{&?cnt
zf!8lZ>g{+sg>N4lW*4%3pw$+3KAT_{1Lzltm*RI`rg2S`c%iu4g4A0Odl9}Tk+KWd
zO~^w}`w-p-7zAuXXd3Z*=G1p`Z3~c7uM~>caMycIElICu9q#r3kL_sP4DvPtJ8E}h
zTIm{w`sHmGt(ZXGy(nn{?c2h3iZ+~&xLx?U;4`D%+f(@MQ~clSQR1Gx;HCx8K<Yt*
zDM10E!(MRCZqTF-yt50G+4$e&<3PX4PpU;)j1O(p3scHeJf)JK*>UnNJ>}edltRm!
z{%m$0tyC?gc0W6}53678NqsUzGC+P(ajB3Gee7eGC)3D#nSO50`jgV7=R3I;8Iwvg
zw^sdHD7FGEsTH64#I+W9$`}esIuNc}oECd|GDa_zYyst(n=W;)m6%?(jMLJjKhbL0
zn1+jt)5?*3l4|?uLn-=ebW5ezVzfS!PqbJqopyh!{-Ai7M$17l>ETo5bb#*Z?bWzZ
zFD^ah<)Xh*sWzg1nODYXPv)l6Ql+QW>eQ~3M$1oe>0vERDoz_~sd1vU_5X#dULU+2
zUjJ{kq!K+ao0lSNIdq9ZSbmq{$uJvb{jkya*fPZRBtmPTIgno95T72lmaP)0E0Jz5
z=ASLN_Fzt*#C0vw(LC=%8q#65Af94KW7&rIE%@vdv7`f4i4uo}rb8OaB<8Kn&`eS(
zQgi+^a&5ybM_SK>PFb7qd@uAPs)6(i(xUd^s$od6gyFsfh9OaojEkhrqC^F49;M!O
zKtCb9jPh+q8QT!vC0a;#7ovQ^X*&5#zbqfL6ViM3Lhri}?WWo_3{$NkY<J-awS~T^
z1rkH48)|LYi|2blC8C+sd+3Rz)yZ@weUbW(G%g={Ski?w2CZFGTdD*NQ;9S6C1FC(
zeF@Ei`ezTq+mrnvv7AA=8Axxbf6PsFF`n*$7E4%@w&FutYAtEHq={}rsdd1!=^f)K
zskRwqY!M|>d$xl<L|M{^iAuy18vTe%HX(jHVkoWb&)vvReM)h}DN?7BwAM=4jWQ|S
z7SV&#$hi$bDXC?3$<IEd(t1<&GqtQ)w`D{Hq6Uo<snzTC#l-^KDWu&eQj?}fJV3p!
zY1LFm%W3N%%qK-2(xJD53RK#u`u|MpY&~tAJApIRxfT2-N8O~L;$Cqlb$J>|v>qW`
zC=KCBYZzKF5Oy?rx1kJL2T?4gA^l%++HO1{`5<G7BDCV6oIBA%?TPH=*<3<p5FIWO
zb<>q<OXpO%dXgNG;vzZLw2?w|Zxb{aPL4zE8Sy%`#;3Cil%@Vxtou$L=Ngx77Idc3
zAxE=ZmlAE|x^(u6l3GC$;AD=ZHn)p5M{wF;2(6=8;T+5)J(xR4;^@&r(v3#YF3@_r
z=tCN7as+D<ajT#h(M(FWxf0@3GL~8)dr(RiS}pIvXF`l>l6J&FlDj0gX{%9L|H-YC
z{3@lJhMk;2(rF^4nS4&v+64}h^-z0BE;wMXNUhXTa}4ns@$NKoX+0#RKg}o;3GPiv
zVrmJsgGP`h-)2*f>c0?aXl5e**IGciNM6yn&?Fv>9-<FPtG%dC^0%aUdQCLPX?ZS0
zs;x*ZX-i|yAxa@Wm$=Efg2vU!HO|GGXhO12qb;?GFeRJER(xbB(tbfW&`6?Z(;}C|
zl(Yt-H?@we0@TN;Svq~**6-ho(KDnw&^O^sv%>6}h+@Q(B<YC``$RgDMcYs-*>p%g
zk+!2zN%EN<MTl;f3XX6<_o5mpmmC+=LMo5?j!GhnhQyg#L|ABaqMjov(Ac5&Q!lR(
zG>}|QIkmJ@Bh6}(PZprRsu5m=dS<|zJ~8gk%%VUVaJm#FT2r}!Q*d`6QP(iqD0!T8
z0^)hC->C#@gNEzLV=E;`r7WVcM4x4lHUlCwAhg<U(MlgAkf!5lw3EFj@g@rEYbR1B
zO@gYM(WWIRd8sIO6c}G9=sPNCPWg$R{xhyyjw-5I>K#6eHmRBTgbb88$#EG*pHuq1
z(4w{?74g)&$Avg!2BpXuz7!aw%h@w2m+X{2tO<x`3F~Rtoum{cJPBJVM{5NqXqG2U
zv!{OQPPB*GvKJKnU-?jZ#I>^SNx?;=15pb#on7`Wr973yt$YU@Pb(B!1zeuIO8jYs
zBwMb@3k?G)tEJw)2Uwjdf4`6?yV1`R09x75EHiP+^vgj<k`0uG#<;dhp;iC?zR#Ik
z7xiqkgW%SbW%*p(ZA$X9wD>jvZ?ZxAuoplyBHFe98d)nis{x+{(2_e4BW=sg*bPYR
z;l{s$IK98$VS9mI&_MoF^kN{q;uUWUu)%Y|4r*q?J1HAybzOLmxCiGjbFkx?haKAj
zoHH)M4(vQug4+C$VL|L8l;Qkx1$e#+GO`Avz7~?YURbG{fL9B!Y=hR*!R7<cg{+e;
zVv8|8!;lqS;PeP|pJl8Ua{U~%ZzW{xYOI~tVEha~CmKTA*Rpl&TsDGL*cjfDxq-b0
zzjn5fjk5{tTHMX9VIO3-uvgi&*yp&OeU^QR9pFZ`A8+^j0Q&?taWne}`w;ss`xUpa
z&#^DFzp^*kF?JWb5Bm(?XZM5Jo7s)vkRO1;PqL@jPuLIHkJyjdAJ7XwV^6c6vVTGU
z{F!~6J<pzH&tV+=iTwxrFg!iBV<y-M{+eNTfX^<#SSQV!)&>_rYW<O2f?b$P*?Zah
zFcKbOcd{$l73?Z@HG7S{j=jAoJIKDpUSvP#R_yF#a63FiGI<uy#tZyh+|51sQTrV1
z^?i*!$i9xfz6aQ0_OI+Z_7&^`J%aP%c|4!pzza;<rZ3$+)o9)~vmKjC5qVwOkhmu9
zyPD*ES99VzpRP^FkhqHcxEJYg73pwoNjz^&T-y@Y_QbU#an;IOD(@Q;<u*3jwr=0H
zZ_k#=i3_LXqo!r@+Pcipvv1EXy6FKP;L(*2u_p&d4s!m{(Qn`#j%>3p%7c-p8r&Vt
z?eY2WICEfS)HF0U5^X7rR*sHu_3d9f5>?73qP%Bwa8pzXMh<0gQ}rRc311$3jUF;o
zT6+c~hwK(}^+6Ml94zG@8W@R&KQwaCq(%;w)7?V`Mz=hI*Zhn=#N!`~8a{H+2)^V4
K_s@sV+5ZGUad}k$

literal 0
HcmV?d00001

diff --git a/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.woff b/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.woff
new file mode 100644
index 0000000000000000000000000000000000000000..15b116f051c39b88e32b9ace8caeadb783896b35
GIT binary patch
literal 17824
zcmZ6yV{|S}&^CI<wr$(CcWm3)v27<iPIheDwr$(CcX;x=@3+=D-<j3dbk()Gda9>?
zOm$DSo4mL<00{7NiRA)N{;PW=|5yJ{{=YAAaTQqr0I2kb#r+Q^P!2&7qGIAd+~ALn
z{{uoGBmk&{g1qt%cL)GLV*miu2Cm(1=n~4R!T<ow$A4}9gLS-fth_P<GXMblUtgL(
zFtCi<tunSTwEyAUf9#`va4!3%6=v+}{9^+T`qPH~2fWBv5F}>y<~BbZD*yoc1^__C
zN5OasnHxI&*rG80w1NCTKs2}ZF#F*+0RXah0KoJzXx<yf!qm_N0O0zu1^fs0uT&;=
ziy!ibv-r^oen1Mr53+7y<NV_XSNM+~i2wjdoWeQ!skNQ)PdlC;pMko5FkbPJh;L))
z{_|Yk%^y3${{ZF&+;3}WWBSAWj2D~%0KmjnOrQ_4w{vm^07Phi?A8GQ;JWAZ;xc<j
z(;r*0|NM>n4-cZmmu{v;KR%14{^;QUflFPn`lkl^0br6Zf9Ah>?B#Ilzj|unY}tL?
z*uccVU>C#)3LMeE$N;o|L~s)LnCa*JzyP5G0PgEc>AKdcs_6bJT`dA1sBa~N(S(#n
z)`61-$>_6~%8EGDh0KItuq=rl*dnlLujQ!JW4yAj(w}FLNr4Ctg3x4Wr>NLQum}Zd
z!OfeCuxBs~aEUCEd0;nbc2~`_DNVSB+$?o8JACFl4a;l4uexrw-z)K@!bef5;+ds7
zA1Ze2lBJXg$I6!~j-`a2&Z+su_BB*!?mBjC7cQ7p5@@9yWu)}3<44lT;%U4|?s5K+
z$IEzwoedrxKAMO*YTrAx#&u?Xm^*5p&n?z3@|3+O`N`=?x|sQ7yAXN7p$q6eR9p&>
z((fc2uxZi5N<F7vvXs5}R+3kad2pQ^i8`LL#3%7;{;E70Y=KpiY_2Tn40ym^6>S4r
z&&A{3#i(bz{)?;uTy*R0EuAuaQbdcN<QOxtZ>xz!keIAf5p1Oab1|zu^VBlC(OU=J
zC3||czizt<;$=v18Rq#4xfQ#I@`{Q*`yKs`d!)sJ8-_9qOp%AyEqH^P8OkynD$A33
zw9a+9%L^m_Zt8)%C)Hzpm>QSwo-C6*a-f$V+2#vYV_dD@$2`oO66L-HwPg=gEXCiA
zD(vB%(cu&OY;*n0m;Pz-ERC_!&ZQT~dcwzuRv}agUe_A)?9vD^hcD`dcqR0|0^{Ob
ztgC>_-~j$e-$94VV{CZ=L51%dV{G?$th}MeFTH(l7-xs<Q2f#E1F@CT_4;rh|5k`_
z5C2q%*QG-T4x8lr*PG3VxjqM&kthe4rxpb_7?&1FdN<x-yx6UXil_(HM?t+?KQV8*
z*PaMtkVYXM=Uz!(k~-45(cCPoh3R#0j<Ahga`u+mHnz>_mf8-NlB_V^nUWl6L%ENt
zNw7bHT{rt3Kb=sem*r|AuD^BC=B{8UNkGx=dqYX!p)usC3we;8Br6Pguu0%iX}30`
zy(7HZ@+|hluR^)p8h&sLdroS^VqGv9^O;qSL_ek0;ZFcL!}k+e1P{!DO4Ra<KbdjD
zQ{;ll3DZPJPtPIAV#kzbShNSNoa<toSe^#_8^lI37L7)_6C1?1)9#kCMyeAVL_<;^
zym=;f5PQYn^9sH}>X!IFLeE&nE9RbYa4ZtP`2Q=E8ncV|nVwd_`XtAn4IDUIY)(eJ
zpB8lQM#N}V>5g25Kds(1vR<3;J~Hn-GF5w~X>(&?bWPIuMAzsIt1}!_{JmS6cs(cE
zkM~4Zcp&E0!>6?yg?ZEh+flvS8aD6|VGqlmoK3{?WEPP(I~{}NOUt8pZ+(aJq!o!Z
zJ*|V~OUWBye$)uXzbH7yS@aG{w~M~>Vrt6iVF{zprx2ehn5gp&;3@>pivQODoi*ol
zD(=i)@BqZUk%#WuD_0sskS_0X&Feoc#0mPx9y5J6?07N0jfJWqwWqiq_*fdr=@{4}
z^2;MV*`=PAxVfx8Sk<JxGkh`u+C$ZB;zEhaspyy51aFy{tcUQncy@f%sF8>M`Qb@D
zj3%|8=(tJCrMX!7U-D}QR86vxIBLt3#QV_3dgQLLUyDRINBM<q`Uv;Gr6y&<l0Ax(
z$gGgr)^<$&{<4s?(AqU8{lR^ZhFM0dr15Qe-4dOeHP08<gQ3X{sg6XSz;%9VoJCs_
zR@aQehS2>(hmE_AyN<_gjSMqj(M0K>v9EBROR^*EhKAn0P&>O77IG~~>-^U!uZK74
zSC~~;6Z{)Z^Xyi9$aN~MGlpp%4-L$gjpk{zVcmvd?0{aF5BxjcIi53z#a-P11$++o
z>Giy@xhzZ;6J0u93{R%Lg#+i=?0GJaQIs-#3Enj4Df~wM*52i9By+YCe7kXrLAIGh
zOW=|#--xWC>T+^Rtk&D?sj({qg4aK<xvbKm(Atw8jIBB?R?bGQMjmI*)9Tgyg}jZu
z1lfGrOH?{%0qZ<3lc@f^tY>#;2AjP1-%-dATVdL#+nf1|LT&@-?KLg4UEN|uLHsBh
zr%r)GT48hp9nW{CETJL%ZW`8Zr7o*`wF`OELOE`<k65EdEd%&rUGVR?&peAfrw^$^
zLSZ8Cf8fLL(s3WTW`%R${;y%#FYjdr@y}=#;(6kB!^*d#!{GhGP2o)9K3!-G;WyM)
z;a1_PbeW}ah4G1OSv{)#|GqNT34^>eh$yqL19%EtEnGS7M(#`(&Xe3V<S4l?+c0VP
znh@MbF^|!gt*B!yTGnr)JT5GlsRa#->tW#sE_66}8~7`DJb3-k%y_Z9pyL!;)*X{P
zE=rgwX-$jjap4Db^z?=LS>C@P$KAB71ZH_$%u!eHP4GOpuH1`U7PiyE4=(8G0}Y&~
z_M>@od$l5oLC5fPtT`5Q*Ry-MZIV%qBC)bYuA|0Un|95TPPynP$zt=F<srwKbgVB{
z4n3MgQyW?`D$SA)z3AyU&9mNhL#|<3VR-O7c;~pj)S46w?*$&tQ9<xwxY$1=E7ylg
zz2Zy8r_`v-XHFUFIBptEkrMsHk(ee8j!8i$-OWVKA%mkLcae1aQ9@ynL_%WE+&9?a
zb=D%4{J8b!j_<4Vh~kIKra(LC^-j=gbp4;sdC~P;w=D+QQd!pKU_UI=e4FdGk)~Fj
zSqXw((Y24B{l4pGL=;05gwoX_hxC^Hjq#v0*uUS{-z3)tU^uGn1(|%4uU@?VQ{VM|
z!+K)hTAMhnzs}A<*B{@>R$3tHurT$N?7n4jc>Up47-Ff4&a{jEK5R!c{<Hh?9lnUh
z;!_7+apwOgZ}ZBIjg@t`#8gys;1poT_3hgF1cARe{LS_;>e|kb@yh%#uvABeS0qC6
zbglU+J?^CBPir9Nn=mg-DxEFtcxY*okVL3#f|NipL%3kdq(mqkN9=*_5$?rH!E)$v
zh@=@gnZkUis2Mt$j5f;a0py`W9T(ggSZG3)KvzTDcF)bMNgZFN6e5$z5$CP>2lW@5
z60IFE!URKnT0MLk*+qQLnD!`cnGk-W?5OuzG%wP&i3Z}f;VASC<6*EHW@I5gRYL5c
zGOxAZ@tFB2Ef=BeYw-=cNthds<3I=8(0nB71cqa%)_UB(`It!rJD$mcscd+<RB2rp
z3p|@XQHv%Mi>CZprLtLW7U2t%kmWQiEef7SIXR20{aJ3XJYDjT=2YDE{XE3)B*X_2
zqT@26V@;ytPQ-^s#D@W*W1WA3=eLI<qymFEknttLhh>QWCJ{a4!aw2>JpyorphZ3s
zg%6egr!)v3F8oj7+H`rk9n~ClpKFmtXW~akxoU_GJBetFhEzw?1pDkt@LhJ3D?eRX
z8hjxCY>m;_CJvQ-?MAC<k*>Oo%X06D`dX*+GO4*7c<}W8(%|pA0sr75ggA<09XIUc
z|0TdS;lM>i=e`+PQ*y}q)x2ju(gQd&P5KE8|BEQ0e`0xj0Fbqzv+YmR{9lX>`2POy
z{$Jc^Y+wXyoY~tu-rK)8q%zdoy9=3zb$}I(>B6az*1EQunwqMShKa$*cnWgVg_YYo
zL^ArfFCgFr2&AFk4+b3km^<`9aBqx|tC&y5%RdPi1O-6#4eRrN`Zh2y^Ebc(7Y9dl
z2R>v9{6`B*;opcK1ROU6VRFa3$V6+l+JBqFlv)>fhPi+TMh}JrMg_(NMh3<P<^x6(
z;vT{l`3nK_>l-3t5N5H>-;ip6eVDM+6C4Z(3<?aZ)Ki-DDf+wT%kSfR_B-es;bZ3g
z=IP~T2LmC7pYzt>CWsHgm4EfwU@NEy0h=IoTOjuq^IQ%YK!O9JgF=E5XCSN&fCWZZ
zV|Rs@qqoJ^<M#y;A~Hl$WO9I#qO!!&<njO$BQr%)Wpja(rL)1)<?{g%Au&c#W^sa%
zrumJd&Eo|jL1B)e&f$h2&tONOFYxW(o4Xq~TYDQmT6&tg+WHzS8k(~FJRPxcOsi9C
zF}7bcp<b=g<aw3ua=~G{-DtY8tjpteV@N3@HPx!iE+BBBXh|-z0UJsT9?BYiQD1?X
za#bon4OZt=enZN}D$i$sd!LNMQKPppUHgqVFyQqPz<jh~$HeNw=IZwN{PZG|-Op&b
ze3=Ft7K;ifqV~rGm^w!E{m(oLf_T7E5l%LS1q4_kg#WB2s^9I#oDaVd2ni&=zJc~x
zD4A7(0aSB{KPw;i^(<9Ow*_(3<WAC<#91;JFc&Nqhupc*U^+}jOX?w4B3)d_Dp1`*
zTIVAkf_KfHW2(lJM-qXmmzcl7DcK9`6cRVn85J!$U06}ZqDAr`4u7~+?i~q}mqwJ%
z_#<%I_m1ik`Uq`D)%K|@QJNA($E-PclB9K}U6U(ODiiM<5i3flXIRLdgfjaJTGc7m
z3D+gNSf!BVaRsCrIfGs)rGTlhLO7GnLXpeo2vf@8O@D>y6~u>UfGe?MKa~#Tw-Zob
z<Ic1fHGvxxIwq6o)altAcQ|n0)<Z~DqFmbWMc3`sy(yLpQi~Upe6Lb*DPn^w4Jn0b
zMHCFk_-;usmsNr>o1)TCyC4i+U6*V$ho9vw+_@-LuqrQ2xronM$HqwDiF%B(%TXK^
zPdA4#tjH)<xeiS=gQPLpQ<1UE`5*&1r%Gm3Kxi!0K^NLC5}=vq#Db6}tWm0ZKwl}^
z5jL2aGtd`rU73g-$38v?9#2l&c0SmjK4RZ8Xnc24WwxCv>P$|FNfP|pk{^sHT!f9n
z;y-r}?|?-bpAyn(RRGT+p3I|}pRQzM)x$BiYn@U5C3_(?D^4)<qI~K`thvVtgIy)D
zZ;jtk{riYNNUMCSYc-w=uN>9EFDJ(>OOpcjp)s}Q?SArwKKCDoAnyUheKD2JdW(!=
zzRw1#={lIQiUmd<^;H5@vBh6mCRwj#RJL_D872|0Y00VYzil%lFI=4mL>yNgqq6V#
zjtkwfn~em7996=$>)?(HdV;oEe>NLw#9b~SS>fiVOQ-{LElr*VTB|DAfHm3XAB!T!
zI>L!ADp2rTmY1phP`{TV7;s06BC@aRb#zeNEVr6(_s(4Px3pN!L#u{4Vv@q{80QaW
zgQxH9;J=$WTskzI{wgF3A(R>@0l+DLLm;OvugMWstz7O;5coS_?Q>1YE-CqBGqL(G
z%)Gb9CZgPU@osTW(5>idiKe&&ZKm>lXh+Jpd=_*TC7&OLyBwKlH-$14_DAJk&`5d2
zG`k*Pkg2L|N6lOP^G3cmS+N(fm{{h6bq%JH^#~7JQK9;U(3Dhgi5S*`YKm_^9t5Km
zI@k*Df?)M~@GQ?069<MUG_SD>u~w2w7j36;-0cp(;`jQg`+nrDGYMBjxV%I1C#8FN
zMS-s~gpFQ<ZJFV(<nuHB1Lez$W*-$b?6QN)A-bhLwyAb;xuHjtf9V=qIPh98f(U2?
zva^z^Q%vnl<CuR;W&dUP(+`i^VOD8b_k_KdB{oK?x*;X{IPK$Sy0++>_M|vXjJAKT
z=eGROxpN{tZV?OcI}yB0sSNZqXGSyz;)1~*SnWTAA8>(XxVZI`k^Am}gNZuSyt2rg
zQYNU5kEU*$NEy+!t)B?RZ{jL<onMu(u(otJiowH=2}!}kjjQsz^^5lE)zyguaI!jL
zk>|7PmX>(7wvSj@<4h-u`s+Gfa^m^p`%BMqj8s2)0~_$YjJCnp=imn7IYRQ2h3&F9
z+5&mY!S`VtBEpUmt&*L<_kuV=;wOmIO2GG#II;tElZNfmI6@jZLLxibg7A`u?Lu*Z
z>L-fa{)w+ZN$WWhX7}%II3-uGDglpTM^B6Yjq=Qok>X>3v=)XQ?`d-Q7W|e3BmKEe
ztmIc4zDV$AGgZNFzhB9(Iebx{miQ^{uE>@2D7nvRd#*3%+OX=s-60?V(9ib~!F~P8
z$3sJB#pjgkq`HBb#ZAq?UlUW15EOPG7mnUS++a*tm~g|N1Sy0PbIjr{VNmg^P&SLx
zw?+!jye?y?E_u*L|8mCR_q$h(?PtQ<(!YJusr^FfW^T*P$0C<RegTe%fm`1mr|T@R
z+5PSs{cj+q0eh~O%$@G6oi^fVQph~*)lX4k?6WUkvJF?h>ajoHn=c-!|F)|~$iNB4
zPRKedcaKKc*uFA!W0gCzpC~?TH2tWB@C1CWxm>@;BS1T15XIM_hzQK&Q9?K+*JTiY
zjgjg&-VjAgB{C<I#;Pc&F6D6p1N9)EvVLgxq|7_6DZJOe)OtnuCKXHXX#Wc;BI`dX
zU|8Us3}XzH70Kr$Dqtj`d;Rpyv3ADRq)QG{e^0Rc_HeH&>3MFd+3Rxg-`TRa1F<Cc
zn&K;;)W`yVVdlPA!n*U&Nf?mAWq}qv+CC_jD;d!wENr9NhJ0aN9LbNjr?hyT(4U(&
zOrIJss>SsK+I{_Xv^VsvQu2cB<C){PEC5_nna#F~mJau)_u@62>AonUgq$Bt|Mo!o
zmhBGJUoxR$Ctv!KKq?eAjptL3ykVJCnG%OALB=G4wx2L<7R5h-mdPVVK`aj<pmCg3
zu~f+#67&MZmu)c(f*SnY@pDV5nm{1zfHnC-J~U8PiL%rxPlY~Fhj)d|+I5T9>tdhT
zceTs-xhnSM5GJHKzWbx;-%icVO{^~?E(7||&B01r!y2VMOWPZEhKW8Qy-^&bRJ`1M
z%xA0%LHo2d1+@d?k^`Thgp2q|IB7f;7ANYah_i0me5Q;d@2|YROHB@y6d^`?-o8D#
z-iaU%OJ&goVJ*X9Sg;^%Zsw{nQDYHC<Y>%LBxapHIg%BDS%_7zB@=Rj%MDo|sUR~;
z-=K@JfFYpQZ65yY;=cHK0Y0^_tZZ*fgOL~@?~AMRHxKodaX(}E8q{UIBgfUcH)&6X
zQ6*p|jx1zV4HQ)u_V({OPK7+>;z=R2EGj3;`=7{_Oe$->wA`_<GL{-K|G=n#B7&_|
z7)V}1n>mCzRj!e%pm+bv8~k=%N~DaG5PMrHU~Wx;8a29**~W@G4Z-aFzD-35&PB)P
zDP&^?fgG7{;;!{QdU{`dtGUxha6LiF*ZI=A{wVq+K1A5u%hAYaujuN}-ry|(x|_i2
zoQMLs_SwYYr_K$qnXYD((24it3|qCT1$N99xZfLAG@E4NnnDPo#RuvhbdH5=p`h}^
z*B20cEA~Cf;Vo5zjWzY!EaD$_R??E;>w=q%b)Jnl`mJ=^)U7C|cZ2ep+qMukLuE#~
zN!f5#Q%#gt>o@={&@ySp#53IC$7h-xp|n0`ilTD&{iCrmBZm*cG@oj_ixq>AHlz3s
z#DkYq0oH@(CVh#>iV9d|a2PBJcA<fSeo1_6qiK`3Xq1JGmUcFqZ>ewdm&hLsTPy*4
zgAep$uKMqVoNd3tyOhnYmt$L@R^vlOPZX!1Zs)*A1>yw|MhY2NYPu-^@ja<dVpMH#
zRBNltoI-U2I)`%GY8HyyHkZ%?%8kd&psw3q=2Zm&$x9sBZ2lYtDKs}|{|WdW4B|K@
zU#KHD)Jj@dK=i*oVm?hDn_=hv8frxl-?i8z=zu*d{qr?!eQsAzpkw(t`g@i)pk0s6
zN{Z1@5K0&WTdF+BGEvf=LlH`mGKRV85U_qzFdP1UviMT0`kP#Qt<ufFiY5k!47t8^
z#5Z<&ZKF=FnYX*#NoY8Hnokrf(o=nw)15z;nznul<KyBWg8_0tl|)*C2L@7U27DaA
zgm7aD4{Qi}AUhK$(|j`Wvig3X&S!e=0t&SA8<AqcXQ-VvAgRs?tQk<X;zoh;IxzvB
zwW)H>J-3=|-2uGr0^em<eBC}1w7fvg1-<=&=#Q|yYmzaSev?3x5d&fovmS?_<F<%s
zy4fnFv|c8=%89QXjjeb7SPO7|7Nma^NoMn~1xLS#YOk?WzEE3S^K#WA0WK}+$II>q
z&qHSr#a=K4c;_oMYrfW%?#}kV%UgTwO>D2jJ)UQ`>k5Y&NN1g(b~lCjUqmCBp-iFr
zu1F(k$DsYAbaEhO{o!Hhnz+G+q5KO}GSG+148M)(TZ<~r(Gkaoq<4&M(FTzAXfOpp
zl(g+YwNR?0dhn6(;Z<;Ha}^xE%7kHS!_!T_6Qee84#s4Dn-d$xAN2ycd%2HDGA$+F
zoM}ilw*c8Ro5isQu+WV)c)SKTZ^MAT*~EcStorjiWk3x1p^_%WP$n6n0ztDGZ&=&<
zZ_;C4g5tqj5c+YETwrj+5+%Gy+g;q~ci#>3pr7s}t)pN2=OCZ|>}8WyD$3jX^vkDd
z<q1IIqwwb>6y#RRC<U-b27-fZnX=J!l#8=OBhs_sQew#fhl}URNL>>JxQY`e&4btb
z1Ui-tIh~*fvHpuL@Hk`_su$k-GGY=H=)7IK1R*#u0p=zHge?$?D9#IS-;3g@wxN0e
zqFDV&m?HNJs1vv$jBF}s1lhsjLKL30hZrsI5)RB{!VEzdq)5s_6x$knh^v7(kV{N+
zZQOF)UuPfpUBmaP+o#lCQRIPxjE7`qc*5}ADaw8F?0KyC&Vhz|M<LKYqZrFA=&y2@
z*rl77SREtcKo9fZ@pZmXJ8TVokAR1}kjo&nGC{P0B~b<)HYVw7K#Q|ukQrZOQsPK(
zuxLqC3626XZqJ*LX?eMJlN#(R7*NglSq64e!dw>~PG$r$1(GdwVGG1yddL#FlEdUz
z@Oe2MZ+FMLeQd(u9r%aZD%ZTB6*bFlp$rmNc~ec&s1P;F%i)Sh=PZH9?x8}*U|*ff
z97an3wNy5M9MNEKaZH^LTPqqm1bI+;hh4c4)m{qE8=f}9?w<ZC0a|oB2GsB@^-YoQ
zfD<4*vrs{ASTm9Iy=!swYmt;b``^s1cGu!6d#<DtPqcJ%JHily!2}^~Dhlftzj-Z#
zj-<%YfNiC+_pX)ebgjDV%Wys&hG8wRiPDvWUWFv1)Sl~rfo~hMQ)U;S83muyM_HT$
zs&{V%l(1|d@|!{%B}*f&KRbFrM!uVa!r<{h-IWi?JV8EVMi+X8RqPo$EYdnopFl^0
zI-C1x#9mUqAhzD;2M2>tQ2NaUME+Ja5w%!^#s6#0M79b`e&G*->9GN}L<{a)3Ah}T
z%*;e4FINRSfsEuq(1a?ukDx9}HZ@f$P;1Sp8x9ERS?tAHC=IhH;MXItv-Wo}noG@t
zum*zm#EP}<yQ;%orzSPKy#)#5@#H={uqvi$xYWq^(-bA?exLdmq}~4|Nb5!F<}6X?
z?ox(9IVI`*r1>oM{8IQAHoj-=TLWiz_m5(U3Ivu4#!@Nkx`DpIatIbprNk1%1}nrJ
zz=1l!3BKReJ~~~vh5|eI45F{`Tv>GGu@0QcNq&kBzBPms^_)|Z-ZN*dqmOPE2hU<;
zEcC@+y>g?8<gaYef|Np=%sSc?tG}?OP@PJ>tjz@M0ueTp#J#4}P%h?HAvSbqU$I4Q
zSehCeGCpQ8NSccHQvQb7wt&}-oq1@eHhjfYfi(YL{zU;)m6MD@N$rt4j-K~xZCl?9
zm$%0af;Uh&3!nJb%cT503!UPz0)%ek%K)C5&n%;f(^^uW!>RXbGv}9>c?4rOeXozp
zhS=<$3PyofiX3(<8#&zH)`hZC)id;Q72m+F>L7T*kZTc8^w`pIDC`q9HNgEOl?)b1
z;;gsT)S$28%aTn+ti9td$I9k%I5$kl(p<2}H?0Q{kDRfDOyE2-#&49XFG4IO3x8zl
zv{Q|iV)#&|;OZ<^^&wt7kg+il{F=vcOV*b|@v<5}StQ7Z;R(2Sd2#JzOgxF^F+mmJ
z@nf=nHEy>1+>Z)7nYqc+fMXw&I$;iUgE><PS7W3n0S6HmWDGXyl`kVmDHQ`vBc3a2
zMJHe|uvs5df#7x+=Ca(u2=pua38ZV!V%k$o?T*hi6iAemC>TP&M-9zqh4lC11WRMM
zrfd)YQ<7i?<f55tHzwF<EqP>)qO#>da_8ki01H*Zsdzm0gE?8)+lTXgN}i#_8O<w$
z@yO>cFt$i*Fa^?^7MBYLiwmKN=dsg`zx4&)HA2EtUA;BLdLPcLF2MM8-!6sRcg95p
z&NmiRXz|pbNe!4oIP6Aaif^#IZCIX1?7Z`(UTeb?5k#i;9xF#r!tfJ8pdO;M3P=G>
z=uZLRH-xItWCj?H?~{$>Wjs3RMcA9c)hM-L+dggeWb58&y#@?11iatarxUjj&Loxc
z4qO;}F|IY<A7E=m`cb{Ebbn}@Pk*3$wLb!fe1y0r>rtLK5p>J=g0nO-JZwfIpIAkB
z=L`VaP`HU<#n(zDvjt0w#lVwcNy#Q>2Pi2tqhT|z-}a8=3(-&U(e?hVj97bLA2~Ip
zOO=R#>D}+*<N@wll$iu2lMs*)NocUBq+psD{0#nezfWh&0E_!cc}eS2XO$p5)L5B_
z?yVJ|ZPX2@S;1nU=D&LAMK1=FWdjcJ(eIbQ?Y=RtT}b}ua)Zj4#-YOIRAOxo;`x8X
zNvk&p5Jwax9olu+Iez;@sWae%m!6+8_)piQWIpQu`nun|Ij+xO)^<+)O=7KRYhzuf
z7unE#b9vX`)|X_Li_n);lZ=|z^IhjrUyCq-s~2R=w87{Ch7jA9VM>9TksrEqB|54M
zm8^_*@F<5}V9K)owHpHS`3ZNsgpgu%9Y0@lI#&D$cSasC(sI@Th$TGi?lNl$Qd*NB
ztBf$33f0v{lb>K_U<n}=q)i)Dks-`2j-W<a9<s8BEn_m@(qP?U(hRzoZf-x|%Witz
zhJOu}VmS`vPTjB1DZeMRTGM13F-F3~v#pZ12+$$`HjM7wBoDkLJWy|&;Y>`ES@SuR
zC(E$oYwD`Av~MdZcr<>iHt}-6y^R6b#RADH9r6)B$VCF*btcn{*Xs)U_YS)f5YNi1
zir@db4;AT~uA<_!W3@IrE(`TX(pI;xUad1o?3dLLT}&s^(AJ4DYi}{jx0v95hYo4p
z-@WFNX^Ax`<J#^iGXCvq7shCnbb9N`_aa1RrXxPC_KX-T9B%KgZqyqSlz-;@R%|*t
zg06-?><#;H;dkJX6}FgxWQYI+VY!Zs%80K6(hCb^9Bg^R{PHKqG%vY_0afE*e1=mn
zX@vS_kBc~`B0nD(->(<KbxJV#uTu5G!h#*Y3sCgPw-Jwe@J<DY&@ZQVpjXa0>H%0z
z1go}E!@xbr*QDH3F&R;17YeuIl>3bnifc=|Z^+5ll}eu@u+WsZl=&?qy|=OYsznn|
zC~Yjk3qwh7TM+UZuMydk;+V|VGdzx&={YfOU1~+OH=VNrR+Trbe%LfnABLJRwsa;u
z1HCAhT<8l0YKk3JKA(Xt1FT>AxdTPjIbWzpXve90&A=aB(0V|ay@EkZhIKT*kNAiT
zkNx30BYzh%&P|6B@3_an`ySwooK?V#NXu2YhCChT*#B!ig;#EhzBPjFZ06(QpU%$K
z{dZ(73x|BMk*u>*Znu!+7!4ll05P%xtL<XpCCjc^En?Sd24BhA*?({#Kh5lu@;*k`
zl~_}jk4xEE4*KX%Kp~c=xro(@0bDMeS^;*G-TL0XrrBzj`*>vMi*ig@k&{<b*$r(k
zF=?O*94^-~8h}714E6SF?20$o-mMN}ENVVaI+~+CUS(yiU+8T1Y^v3pg?=Y`g5%)+
z|1bLCIdI(ueE=WZ5OqvmL9c=cs7hx3iUf5M0T3aXPP4mt-z44KMj+;fG?F%xYKftU
z?f{mn#Y!acRGaKsZ1UAQAg_w6j~N$^viO3!Ln)OHw>nHi#BjWW_;^gSLM(5rX<f{H
z?VH<t_Na4i%0r%y*ZMxP$}q$3GAd?f>6;zb@WUV>cR0)?3iEcn<5ztsYt~!A`u5LM
zQua?*B=*oZ5z;Hp<P?jkk(6O9pTht=kN21b@CyOF5~8eSgpO;7M(0ITJE5Fx+L$#1
zQn``sQUi}$k1PhCE$P~s@UyfaZQ-t1s858%;6SNxB&Nm@%c95`C!xK^0Vf2b5(ZDC
z*GLwg%sZ$8*pEX-pJM@LuZOW>XG?3%Tk(g2`q<kmkN<?S{pp;OlS(^DO3HiP!_H^f
z9uI&v;~!2MkOX#+9`K*DweruBljmPn4ZF#}-3!(Igyic^q(C&;x2WH?-XMdLjGe!Y
zrD*oGah&AWweMEpDVnp_m*EHWK!9U}lu*xd*;JGwS>(Zp_F=$7ewW*(H5@o?v;OTi
zeZIoX>+yL`saY8Q*?5={zquL{nSIF;-kVh=h%|XGFcOFbT+RsFI*AXKT!FThjy_PE
zVvBuqf&d&#FgFW=rn$+p7WZyBYsq9_O{4ze@faHgClE&X3!pOgBl@@I6RP(LK`M4=
zR`r!2g%_#P;aFJ_<R*GG#)Q|tRh@6lSa$hw_wcw4a`KMR`QDuyG5ML~e~oHn6wP3F
ze$v0x#Z^GPpAQbRMIV?8eX*67)-xMx5^Qg%Eiqu-?iHi9h-lJCOCAA4y)8Lp<+g99
z%i7x7Ox+DZpLwT}i|@4`ICfy|2=&qUe73x@OWTpvch=UB-iqf(&fM;F2Mx=XN=}Jy
zEoiVv-O^$LwlNb8iGK@pwq?FjMS7!}pj)rF99akCtyBjY(j^<psL5F~!v6+s2Guix
zeZ5FRlE*Sc<S!7&DPx3BQfRccGQ6&7BQ$b`|KcTpl?b({?tyD;(#ZT;eKhLikKOjZ
z*)G?&wXlt3hZ8$+9#Pp?CK-Tufh!V$i|Dh@C*n)VvbyO6XLu^Ql>RqtlC_C-W1G-I
z_=nOf{^J*R-OGBNFc7PRxhw@56muHfSd6Y=>z?ch#K~IJ!)?egYwMfzGg>akaTV2l
ziBU#ZEM<8$^@HdNE8adyK6O1egfXs+lTMGJwe^tn+IUuZbyjP=_LQ%~-|kmW+l(|O
zzB1BOh*3y5lHF)m_*ZbPe*UHqumK;C&$Pn$iyM@5aG^p*jImuO=Lx5o<Zh>t5&f^%
z5q&cO?3`50@41|XfRh{spMM^22l@h!vo!?NTVF#DCkxu1p565}8`XUqtqYdKe$rpb
zK0rKDk_jInXV%5-Bt|Z&*xoc+!!ZdSyRjnXF<gQn<)RRz;V5W(kXlVtwOB$>5ld4z
z4X<?8cahgX>+1sn;_c<CTj0U-O@FR|i39Xy8(G<wB?gEF^iN!P`c?}hTfKQ<Z9v+l
zjT_)gP}NA4lId0179aaz-l6}D&9&feP`yKtKNq9SzwV$%?IgUw)?Y7AhdaDEpEYG~
zj!i!XH=+RU<Ds~RaMawL!6GQ*sSq~GgH`rZhzJ9vkTfIQc4jkNZ+sVk{YpkC>8et`
zLf(et4IkWh$Uk*cdnm2l2W_iCr}zw7l#$h}83)wDj?x9f*`;}GjsooI#m(yyA8M}m
ze}BBc(H>#zT7khd@8C*60aa8oiJ6uIS0)CSGMi(Kc5t`knY?>z^K7tmtLgv#O&d{v
z1zq#kCLVM7Sb_*r-Q81#<|rm(=J|z(ywO6$$H`5?v#OEj>|~m=Iwlz2tpyB3yFKv_
zLQf`~NgaQmudpw@X-zo%^xswaTBnegrv>DH&0=BTEaP<OUCq(d#~I=PP6ENGNbtq}
zGTV_oJRbOqyJz>#EV%s>JiDQp)%-Nz?w#IEM&q6}n7V{UQsrVu30R`~;&_nTAd4^;
zXsKyEjgpu}&FpC;ajBDTy5Fh;N+&ZpIsPjJC}HH&SwS3!@92mH`qEJ0Jtx6zzw5k2
zux@rhY=x%1du_jy4vAk#)VxlIhQs0KAR~f70!pn64q#owp?xj}ToJ>8nps_)Sz}^-
zeYCqpJUIB+<F>n8F0NJdSDL36O1#Y9+?EiGFU8EqXp~?E(dBvPES`e%J1+DVP|5@4
zm5H{S-r38F?+zeWEhL*9YWaa$e{ZZe&rWQaJy%}9c1_Z);$nlnXG%V#h!5CWqBa>+
zw8Z0B5{-^Mp1M<F+pGd7onC!%e>%1o&}3N0z`YFC>;8#nG1oEfn{_{joy`aG-hJq_
z^~GA7G;a#+FGIN;S}2Jh(F@l`clV9*8AJqPOrzf~OUAKYxiNFMAIedAWeUwoQvXmA
zXFlk<ea#CHu`U(-cE65Ci{Ptg7JI=P!p6EHe3?bii_dOkn1km@sn+j`|A=#!it|>e
zB@IH)9=}NUnmCavzT<^rwx@}<rFjpUfF0p%VXiMOa+^{J_n7zhoQGhN59R<nev4Np
zy3_`)iL2Pbh$+hAOLNwD{mR9UUXDEyeyW<o>t_%8@|Ls$Y%GUH04iN_+m&%15XK{M
z*sVt9r>d{JF7LL7hm`_|aR7s)ubV$1WfjQhTId(D6W3@0q4rUXoT6wJ*g~s4<?f3o
z?Mbm}=0^JiIYVchKz!Iu*TLyn_cufv9*^Ve^2XXf1@jYZf@O2t1GGRF{z>>ocjzM}
zUHC1zy!+6krXHW&(a_M)fA7IpW7PPv<RrZb#+`b*;J6oKIFoCh+qRcQ*m!*;cnQ#l
zPKr|(ChhrW4X2duU&F?prt^D9CvLp>VL@>kizs)u#)?2aHPd^pt-5ki+b*h)=wS}!
zZ@Eq+nIL!{kkfo_I$4saBg3mnL$S#cwI)8JgGwzPr*R$u4-kd|Mt#}jFOV5)(yaC_
z*rT;kzqlRob?|~|R@4Ws>?srROSJ3f`}iFY#!r&BS&hj-`?DJ<vVO7eqpOsH>)v2H
zH{h)41~f$(e-2sUbb>$qfn|RAXF1)&;4f=S#z!h0o91GX-q6d(zAmooEV_CcU*F`i
z-hO@vEy=oj_2ja6^upXSaFl&y^UQtZ^DI|lJbz$J41vaO)M!OqQZ!!UM-D6SqB8lf
z$B)|S@@X>v!n<RfUtEE20hTjLlsr-9`N_<anQx=L#nr|3%tF4ITpOer0ZO!{H%xRn
z!nI1hEs^EDD<ym(5#x@jrYhOJ7N(--@ZEm(cZb1^JyHl2sE9kGy+mEHisfZXMRDtZ
zDpoP0r_q5!-0b3taSmOu#9TP~<>W*0dUNHHnf7+PDDf*bTys<y0p~|dQP@h;iqQg{
zu9zK3gpcv<Uu^IDgwC~_5SbwLL$upH7I(&g@@4pXHTv<W2Q{@djhahh={3n;<(H%*
zGwATm8y#cwc?&c&kM2|Haz8&{+qTxL)CA)Q4>HQunwv3P`gG}QCN3QQVz@3^>$e0*
z)U5YU=Q*{s)Cqveb$jYE+$HiApXEhfhPB24b;Bn^MenJXYerox@3+f^*T}t`>xph^
zZEJ?O;Un5Dlq>A8KNP1GXm@n7KVzC7K4bz4g<pIa(X?Jfj)8KfS;>SWwB-9{|12x6
zfpS}vR~m9K&4VR^h`YeBN~B>K>;;Ar5N<%$0_l-WN~q|OEJi~I>(=SU1Ice@L|s86
zxF2j=q$yS+Mz!=;h$3mN1-c9-!~?KcV1$3MQg=9)H0mi?@1CE>Il2UJ+jHZ$T+h=i
zI;jIiY<+1$;W?!RJjhD74R*?Q{PQT>EU9Hx3_WqpmH_ql>>cx`YicLI&>&C<FP^l4
zL?L>rvxm&g#n9>J4qR)4=rt}OV3(=B7It$38by6rdH;MuuiJF5>kvJ?Te&SKKzI+l
zvV-vQpZ$|60yOFfU=Me7Cg)A9toZ$MhKJoSKJBZo8o3V(Vv;=dCJHaM#qbT)1;lYB
z&5&uk=KH6~B{q=X@~UNL^ksvm?CvmyQF%OU5PbPjf-*q_A~ui9SyyD`V3ssK@ccae
z9LqEHV}1WJc_+s3Y!|#mI@0*={v~6B!J$HA0fWJp!4rWu0!K2;JqnOLxK*1a(jcOF
zF$)uGH$jK5j^<%95w!VI_4_$BRax7;@nUe4<D%(>tE6wa)j!Q(kI+i-uflo?{d`H@
zMhCo$!QS{MSj@T}9JJc-`3mJHu64zb$0b0kgM1WEe?f?$rxXWS(Jc!{jh^AMQWx_w
z!;J0&&Q|?jJF#229*5v_nz4Z*k=#)QPhY97w}-^iJ&;?kI-LJ+xa0ob_0exZjTLIn
zdk>{+)pT&}5LQM+>{}{CV@d2@7AGXmOknsN1fn}Ee#rQhxPb<6><SaBpobX^?j}Pd
zG?m<mbAjIX5qJ9Xh=sC`+8x*(n>yDs6RfB@13aR$z3GLVrxE{#s)<wjj4OV2a79w0
zo#x|yCzUt>RdVIavE?P#06R`o8b%vytTPq1lk=9nPrrdo_w4eOOY|%o%y>rLb54=l
zGw5=Q=Q2LhqY)9M=9!=~9xxuAiIl%IHAGcknA<(SmkM<?3Id{~)K$uWJIVc5TtM|(
z!>LJeyXCI&?d<@*!zVZ?IPPg$w1GLCJ|-12<6vLTy^}^~5-ro#BGkXHbhI{Zym8cd
ziTfv9=#qOifb%KlJeH(Bkt$xGvFJ+(y6pGnOfP$>Q7vw0uZGxZ*WXpG2j9*scM)!Q
zfc&ogDeX6D!83QKjCZFzU?N%1cY3p;J~6sF>!L$6a#jxN*OhUXuBd*0wpysKH4TTT
zx6~wcwa&t9j~K0mLZ+dA<$}%R))z>g7Nvv7{etSo3au@QitXj+@*`APAPtPC9Cx%q
zkl_e-DQ-px{XBjg|8DdWS?+gN=}kpsEPq56Y_=z4U@{r5bn2)>^!Kz0hNV-0p(~f7
zYvc$V)@cG?|MqN$-o$oig4XozkJWBYsgQ-PWn<)kR5{u#BKw1T4I1{YWNaqG_^Zx>
zG8}v!A?{*WYqSk{8F+{CajpyBS3wR31n0{K;0Gd=Hv-vCq+yXOYE}SlN*>-se9%CD
z`Ny#q7(KXL%hLB(Au<(!RtaWxy|)3qA6?qWDFt+7+5fGStdnLY<%~}IHb&!qPS7<y
zh}skpAZZlkKr$^+VC&XMwC>NOpY}P;b}0d3+!rQP3TAxb{ju3b^3X&II$(@+%g}qT
zkU%su%dvpwFZD?hCcMEDW~t3@#Ai?3;4ETm8R3`X4aUDi$j{)g?)P_lRF9OXmqe&J
z10>FmF#$425cJc)uSikXc#su18h)jbZ#}$do##@*$>iN$=x#Qel>eAGk;9&0em5&%
zYDMPS3ZZ$qq$Uk_98}x5?1)8c#<l##`XqJfgwHq&C0y6Kx1r@dk#$9xHtULN9{u;u
z)6S_>oCAW1%&L&hQOE_ie=Ue|BjeH|AP=wh&A(Q?tr;UcS*}JK#B0|?GKfQG@Z#yM
z%NInwpSIPN%sVMg<Bat5Iz4$iHvZR@mQdv$RveJgcCO~yj<_^<mrz|XzE%&pRZf$2
z&}{n?%|=~>hF9<b7BN=?LMF|xn_(IVU_CoRQ~-mj_<9?>B@JR7;VQ7h==zZdC-KLD
z7m!`$m`fU-D+F>pssm+vJKES@Zy*-!>3|JX2MH9EwF{XdKFE5O)T4R{&D{y}OCM49
zi+rEA0wY1(wDjuM2+sTEbzz+1b60*1gNX}k=tpwQ@X=R!%CJc6B;P%%O|2HTVb|z6
z!&-~S_qOUG(Oln3j4u3Y>c~dHs3L_}PL1+q+XCfsgKlGcY)yeDZ}X|{2e?xdTMDh7
zE29bC*Ik`1PYVJ&DD2$UNsL}`N6pe#h2v0{-{bO-)7<3pwanwwBPf1fkJ@*4x4C@-
zeWNDEdL@j_atQl{aE43XRQs%%uEqaNtE*uo2yO@n+8Je~_~5X+A!%Z$!fh9lR%Vjc
zfqYEDuX2;4G1#8h;;1%cN1zup2=s^LA5oC=!w7f|@qd}|SvF)hYRbQTmr+Qe%aPzx
z5G?arR}#j|tIBGHVY;S!c;iDV*nr}xLjFQ$q9c`XXVeg?$3@uxN3uNi&<{C3A0u9u
zZ$c0jViDDHEy9^DN$yTi&RDrtPRf{uV5DuuyyzT|y$^KSg^>ag779*~H$t$dcsc;~
z_G?eTa_XD*ZGP!{K(CNH)?9n45N|4_!(pg^H&PYhu9jFMHd#hP6I9nH*(Zm37vn-Q
zwoMg+s8Hja&<xLX0E4gk?=RBc%IZH0nY$<Vsz_R@Dr!E{{wjE6?w>1AS4B0m9Sj?O
zmk>9=AYSI?V&6=g6rYdKH$eeM@9RIA1Ngqx9ER+Qid(%b$4R=%54lMI0sVlPJ%px%
z1-7$^5jh6hsx0FHb5r%~J1q}2*Qcg+b5k7EnQ^nQe+%{B2RS2jUpGOlBYgv8VCF>y
z%>3fWGffS@Nyo?f5-DPbqlyC=J<}N1sNYnO#)ws}uqCpcBO&l0S^HCgf$_cBa$)u1
z6ruJAPRH0*%qI=N5Z{SPJ=5HmUg^{zslvx{#(phireK7CtQaO5smi0_{;t-Cjky%t
zEfoyl-ID4Sqc{^V+FJC~gQq3|=Ln7wT0CILp<d(icsM+qV*PWIc(mS|_`!9W?w%4k
zc{@8?SZ$F|t`V{w6=J420Ube6bRcjyG=q;ZM$mvW$ihs@JEmpq{#xJ-?0ei2!~M^d
z?s~ILGFH+2Y-wJa?M0-JbfM|x?-J7c1X)MVCWO=Fx@zImGAm;&(A}NpGwosiO9ZLO
zEcebY9r%(3RhLQClEDi@cuBSjxjN*M1wPr$>o^?umI3~o$QN#%=^>h)Gy*OV!u9#G
zlw)^epUImM7SCPvbN6q0fpF!rzM(RokH-1k_6+PlfBqyQ$k1oE6Libb^-G*jojlkL
zj%&M0)U`tPY-&)#BJ78t^!IR|xm5lY_$CZzGaNYSPq--+;e`T<6N)`pWb+nn{p2}l
z^5H9m0P&^mO1@aA_UGIQ**f^L2HhBS(kiDr{J5xi{(9kfw(~kTZJxvBu}d$y+4Bn*
z#_;{Tm>*G7)AO3DuL8_2{PjhbsS(&4VWJ87hCoerKL4M5*`EwqgQQLy=lxnq-kvFS
zaF1gQL8Q=zzxsMXbKf;zGp4?MIuM7BjEn)IKyy%tNB`wg|8G_;6si74&)YZj0}OaB
zB(ys)pym}4@2AhML>_4oA;gfGN+c0rCWBGwgt)(L;6j7*zh=cRtuLEuAt|8)L(tLH
z`iOTyz`p$nDb<MU>T1!gRTXCYrwx#z+|4wF1?v{}jjyM#JEymkq3d;P`~yXl!YC3C
z0bNRB)0Ko25}1Qrk*|Y{Pz!dFz!<z3!rSXE&I^Bu(Dp59q2hVRxD!Z=PHbe*EL(2I
zfQgS$9o9q?T-&xys(seUn5COr`OPw)AwX9XDOhf0pvm5(o1fFC(&DkNsEwErdaPOe
z;DlJlJ>)KB_%+34%;&N#3m(M^`_?ir-)i27D;Ij{s?N{se(Q_%oy{A+lp(w$KaAoR
zJkG2=KrQL|Y{KlW9ZyN)nkwbi=r^@+bHoqA&5U>uL?8LY@IWu}TAzFZvGnn)29cEn
zfIKb3ywlEa$5U7x{+{{H0{X2QB&PymWx8EDu(K@xp{8GzCag7Q$EtmEC{q23&+gw$
z_h5@Z8e<%v8IN>*hriCc$>aFl@;Oq%Q)(o0eYUdtJD6@#+K<2sGF5sP#+ko3`G4lw
zU^cLyFcdhHB-$u?A@wy?B{eWLJ$0FB%i!2R&9K=J-q_YyZ|EboD9n_g0{Az|1@kh4
zwV^eeHN<Ll?WZw@5yM{X!RX#<-`J34Ut0g#z`yXQFzJwqsEX*{&?`jM>YGZNzMF}y
zcDJv$hj%i2YyA)Ye`8ntIYL`v+^}!px3xQSURz&jU$tJV?;37#ZY6GO4tn~&g#=}K
zr3i&`<qa}=S%j$iIQz(ik%iTSp@iXte+Sz_eIhL*RwHMVf5?c!Lw1R(g+qtGMW{vG
zg=0nFp~NEJAn%a)iu4N+i|5N4g^`At<Q!6u(IgNQ5*K0@K1=!}z{hoyIti=EvJ1J!
zT#|6Xw1Kz5+ymeLMRiBzMSVl9ru<M+QG`{#RN^fnElMhI7S$AM6aSZbPlCph44dph
z?WR(s;-jLy7`^DYs8-sg?5235*i%4M;2^Io%p&TPatuPpP6tv&T4kxV(zw(})5vg&
zdFp(sGk-MyXCW)sOD0xqMyf{C?$0)i57{T?C)S(Sqrk4eA1o)VC@d_jH|#wuI;IYz
z39~cHC9{s9I~ZgSrW9Zgw!lk#2T<%4vGS9u`9J3y4gtRaVE-uqU?6B941n#=NnSJ{
z{r?E}^(_r;yG<3uY@3OqQf(nsum}i~@?WH?^>UUllnk@%Wm+nyA*hQO#O7C|71qlY
zx^`-1A2_dIAHdnKShtbx;=K1T?q<gsT-{Y&QVhsw-1U6?=F^+go7Tkbf`0RsR#{xq
zqBE~btzsDeWcQSvvwc}#S*sT0!E^E^9{={)%|cYMfcHpYXc1t4pnuM4vAx=~FFHC;
zGk-+&-OM&D-+<>7(3D)`Y<9bUF6Q-}oQ?O-fcHpaV0<yY@^Savw)FMP_xB5ce~VY#
z<P>b6F2u!Hi1Mu$@%<Vt5Idho77)l&Z6E(Du@SvDXWTs!y<*yl-(xqQO3s=a{!Eoi
zrH_~0CFO&!7qE|Mha^Dai+|5&GO7KsdCXV;1~-7xjsMUzp^$STf#%z=x$JI^m)sP1
z>2jeLGUFEady?0v_~xz~{#lRi($(wY?CBQ&Hkq-=|0(Je(D>p(Uz~-ab>p6S!1UFD
zlAIjuQ4>Eya_Cm)ze;4tFEV`2Sdwbq{6$eP<vJTb;}O!v-5PzcbU9JiLhY_+YQ1!8
zbG$yNY33yR0jpJ>_5kw^CP#Dg#Pf;O=`8-2*`_A=ASXO3I#x3g4R$Bnbo4A^rftoc
zKE;ag#`2(B)7Q3;jmFpPv)uc-YRkgQuiA7zt*Oz-s|THd@0iyS_ZzeFTn9(%_-#5U
z(w@5^CB^;&yt5G%%h%?z_>a!Tac5e%UsmWhu$LZ#EIQrxeVR-AMDhuf&y-u4jQkmq
z4Wo0|2|KK3FPnyy8jf*L_N<QqLq76N9=n}AAI!ghgXPI1oJx1Z*#sa5<mzl?W=ajF
z>_WCkkr|~?N>{?w+Pc+$xWx4y-cQMa7e{kLm)S+2)E6LG@U5;32@Oq<<z)IzXXo0U
zgwfDwTDi+9++kF`1Gi0kGmBO*h1lol0%Sg|tFlu@wxnRCFg#|ETX~?IY(&>ro#VZt
z`H3dEp-QBI;ouE$uDlW^LmOPL1*6!x>0{+J+9JIr()c1#GYg^r$RKOJR5ow|zUdD-
z9u%k`R@>(N*}$57c;*Ig`5wiL>U38-r#=@R#?vtI=6L*F4xQl*)<!E?DOc?xzm%qx
z9aJZXJZpfCg%2`QtMEdIX5jkFvG}oA!Z<I4dDc=HQxc_TG+8^;D%JqYPq{hI{w~~d
zL|6FF<Z+@tg10*AbiCCwM@)gXe6Lj&9dK52()XQAe@}n}LQddktQJFRjRHBYj>r<;
zTwN!~Px5@2T2Hrz&O|jIe|^_vvmYjRU#VOHOHwk`W>uY1{p}(JZNh&@NW*te;ZyAq
zStM~}pw|9neM@Cst7$w0!0k%63oS+5sClNz`^VZ|+aMYy-tddGd5Z;sO34)~SMOw|
z*D~vRuB9?dCB#cdid_SvCTYb<`?Nz;VY2?&;JX%?D)8n$&#c8N^#2KP1dsb@%CWoI
z32J7U0!#fXffaf<!4V=&Pu!hpT&rcVN;v6eGm&O9UDsSOH9oSwKUd}{e79dXA<h1M
z<W2S7{2WA<BlvBQ<+rl+M#v;bh;Z@$<-#t>S7XbEBRhYw&jiuvY@s$Ua!Md`Y_w%P
zG22RHwJWm4mS;yb9IJBgm28)LtN8v7kH{#yE<in9{wXAxq@meccm;_6VwEn|?fUbb
zLfTyBUY02xr?L5DjHq!|9-t%XBVHswbqlpb{jAO+Q)t*hMZSx<sM6<Xb}m<Tk$+sU
zQy0%Z{8IE6Js!XY>g78H+^PA$`pFvey<+{@0Dn$S{zt*DWYN%Ub*aI-FBz}Rtg;=L
z&%1LEkpt$%R<#@HSRZ<av&|zwkI>cLhL#>@pe8CKvv7TPqB$w#y<Oh-1=GC=x=-N;
z%Y}^E1*eZr%sVz;aD9h%5gGx9;4d^aO1{kWU12DIPrbM-A!xZ;ce#=&PC{3^{D<(_
zAuP3K-Ys&9w3<g(;0ex8TxT!iw&@eVt}pv1s9oSa&r{oTGVbDYc>I!m!KK;LeW~6t
z&0W4oN}ay;?IWIR+W!##He|~MeC=A52^#V5GIk%)q8ZZZ(|)D@+D>kn<Nqvw4~#s1
z<@;lm<<`HsU%^JA<8`dvV4kZy*0@XlJo}4!?O!+ztQG)x+HKB9Op|dK$MNq2rG+xe
zUT)m`ecw`sf?A|??>!L(+A0DTtAZ#R!L7lVc+;qGQR1G_L=S4*D~>1!PafRypkB4u
zzc-)DC%-3o24VcI-|ZOuuik@%NjTw{h`@}6NTRS3O$@QbVI!Ud5=kPN6jDheoeVPR
zLRY%cogVb07g_YC4}IxJe+Dp+K@4UHLm9?!H1yzYJJ~qMA(uSz8No;jC}b3)8H1A|
z#!`$6H{%%31ST?x$xLA?)0oZ-W-^P}%waC`n9l+hvWUejVJRgnqf|_^(nK?d_`r7d
zvxmc+piLs!O$XaJC}y#+kDc7&okVhkll<fdzc|h*?sJ#ZEN2BRl<|;q?(u-9JmN7=
z_(%mWc*b+i;Nd$5c+E>*;pH=5*~LnHtYS5lRB@DQ)=-0=S^}(P9qakT2I{F}Bb#X8
zD#vJKGh5io7rt?gvz+5PZ+I(FVwGr#kywcno5V|kBubJbONyj&o(o*&3b(n)CGN0;
zc1hy~Hzi#%*ejW4Pi0+=SGNSJe43^ehjeO6m5U6eU76ph5gbtJN<(Q^W-A@a9A&OD
zPx)`3Go-He>bkYU=Lz`B%Svm#p_bte>2RA|0e^L8a0UPP0}`2%UjP70xB$pfSg`>C
zj#;?~00;nMAg}==M6d%RaIhCeARtS)01i=0um)3FSg<r3uqatzW*~}HSg-;mVXy&3
zV<Td)0wYAS3jqcyvJ3_WDzX#?1}a&y1SknbQbe*02nQ;$1_4B|Bmsy~Sg=5dSg{5J
qM6o6Th*4O$1OSLwu?7J|Sy@?GxB>r#ump{<1pq_<0a30wRsaCLz7hWb

literal 0
HcmV?d00001

diff --git a/style/themes/MyFeatherBB/img/closed.png b/style/themes/MyFeatherBB/img/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea86846740ef8bd1ef9eb6bc8c55e870369a7b0c
GIT binary patch
literal 1835
zcmZ{lXE+;b8^>eMv?xVY#fZ@;ky=HOnkli45L*zVC>gJ+RaGm58m(1ZjZ@<&)e1_5
zW46`QIt?{yl}4O$&^pG6^L~0iyw`L8pWk!c*Yp41&$owUXJY~6zrYUw0DuTfQwJ77
zr{d*i?S!bPzgXb*v9d4)oSd%m*R{E<4qv#X3xP$;e`P)#Y<Sv?2!{u-2>Mqk2gM~U
zt2)9I?uhQ&bPBf4b(SzxX1}TO7q!~i)h)}xmCl}&=TJWD%D>{EOirH;B^9R6oUPLE
zA7{+NKIb5Fu}_ThC?Pn)aGpn8AemsK>2E_(eqmM)T6n2yrH#Bu?c6`Ai|?2CJmFQk
zjGXyxEw*$m_I-3WK_XhaG$UY1)*`{~!16nqv;>9yvhpLnCk>o>?hpEef}mkC=t2xr
z@+gH6czgCl_y#E$+BLFE2G<O<iXtM?EM3Ep&Ww<(%k!IA0dcfyyVzHVUkxp28T0Ed
z4>Wf?icAP9DR@5LcU7q*L^kvxrQmra2493;Rm*)g_o;eVFWR*B@7;FUtyM(&`rftR
z-r3)CDu32j{~q4<f>Vv&u(Q^fM5yI|`|6<-P$x)j#ZC<)lxGt5rCCO|!AZ#%r-G9s
zJ?lc0><+_Y=YAAcCQz)jA%gjzK#t7#tWmy-jhnoa?I3sOBzxeZ>tRE007^{gnev13
zR#9cvv-(od3FNnU>Z&eN=NUa3oj@C?AJck`2hAHq4)~XVKg!lhCy!WR+CTEa<v_4I
zK=Q<NZyWdijmXclVNo{Jz&R*?g*z40aAZCXzzoW#jLyHV+|J)`9x+z`ZP2rO4UHJy
z;=mSI_R~PkASdLc2rba}I$2BS4LbeofLrX3PrOw~pz;8Re5tFA-v<<%iCAV*j38Bk
z;kjHF_-)Z8g5fE$p#P^6xsx(}XNV~w<qkJYe0kOavNrUj%aYESZ49v{9$;Epfr@&E
zLP24RoE|2)VqRi`yZk;g4a9i0nQ4ji?d<uskX>NLww)Q;wK-X8Ypc&_?Oj=ZlnUZB
zFRwCG*w?`&PIu~i-&!IF&}R5@J=hA2?N3wk<k2X~SE`3_z{Nd%byT$BC~wH(6_>04
zab`1JT~N<zOLlE)4wZ>?dUrpw;`7D3wo2Av%=?9*Qkd1BNN8)Dc#Y0~aB@Q=d-qHD
z;A#QU{^xzJQTHVoR4|(gzITc-TXxXE1x0s>I^Rt59>P2T?Y-fRI1H@fk&Ba|GgE>@
zHCicBw?p8vmWGqk@d%=K7guy|I*@ezDtXjmhS=O5F1&-s^&U<E4_d9uMOCABQm3b^
z9&g2#<sRAg81krDRH@tYaQJh$tF#yk?Z>pY2oBg;KBWPt-J~#jAK0%-H$o@p1asec
zrbY%YUbsC7MTI~TAW4c}$Hv_H<ry+reGt?o#rI$~oLrtlPRE%#tzIvtaFzf^4HsLV
z0-!{qkpO>Mai+<)+SFREhF+x0wp0uVL9Zpm_a@W<R1^PH!*o?lCH|BPx{`iwQ1uQV
zAKvm_#h!U=SAUeDxMwE)b<Bb-$)EGZm-M<v_2FIJ+=?-~#k_bQk?9zA4@tt3cH`v~
z5c8<suM;eDkP&qzg<qZlBjMHY;FiemX*$^euiQhjUvV=JD%oZwq+o?pVn-LmF6d)K
zUVxFOI&_7XIfcj93V5X2I@mV{LxTsMH9NEewQuyuircJfzwK`FG)m-R%ALvl7H6WG
zqmftqT+Lp2mpFt{nw!2Ac33z4&WnnbFn=S|Av9p4$V$7yv&+dRw=F!2$B0T&S2tS=
z78>A2_s~zYGI%EQ4JsxwmiaCYJ}_@E9+{g63_^UI_;ovz+hx__Z%ulc(TDZpAA0kV
z0%uF~{~JZ(lgE|yY2RyV58RV#U7xaleLTiNXN($BHtJxgxnwg^MH{*CyaD4o`8=)g
zxY7ZcsZb#yUwSK43^wU`uV%I1x#qBk8Uc~k-QfWy4+*$jTZ`8EG|%lwe+XIGh|O`N
z$PlaxMz>IP1=eJgz|)hX^QQR%`Ksr}ZpC$}d3@hki#nPYSFNE;w-62<2c_A(Gza<A
z=l)dH24`z{s$S}gWH%a^p?L`74h2`tlMa@j7Z*R#pQMk|HIu|oQddZ&3y(tz;}v3y
zeC`=Hb)Z%3FS#l`+W2}*&G}e1l0+0s21AhD*Ig6{3-s*<5wIIL%b-LGS47Ed6dV2`
z>2(1j`n2_r{^i;z`G<q$x#`-_IR{CXu>NLmQS&~LSo4#hN<tECR!Q*<*<J{^17rIp
z^D16R@0hEu*OoWYOWu$5hk%J@Xrdp6h}HAOV_5*epwMeqSfz2*QA0-$3e~%+3xUE|
zhane2-v1av!~BB$@BV)Sg>&>W%OH6=;g>Lf;vEbg3xNBD`CvhaP)q>U0gLgwiyOuo
Qur2`*W;UixH@p-60p!+4F#rGn

literal 0
HcmV?d00001

diff --git a/style/themes/MyFeatherBB/img/new.png b/style/themes/MyFeatherBB/img/new.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fb470cd49621d62b9a8a9b8fe47aff83d9f0186
GIT binary patch
literal 1897
zcmZ{ldpr~R8^<SN7>%7=YM64rosn{Fnp>NDwKF>An$cu*HVrd!Nz8FQgv4_DxnyoB
zRLX5(61C(~mb~0%i3lN=-#Y*O{`kF~=kt9(ujlpsJkOsG-Oc5^l*BO!001C`M%i8z
z5cW$zQNc^5Qr86#^>;jP3pn@{CC{sJ1Re3~sLNylQUA)GeGT!eNx6;;5)k&Ul6Q)V
z1y&;37K!ob`HGEl$_Y|9I9KB9SuZD|V=|!XPAF}On{4@wNdmqkr+ALob~=IYN-L#C
zPW9a``<|*vCi8K51)zK<Ze;@S(PV4r<-CwWt%2r+ZJyhF;7Ik&Z4K8Cu`&0jR(|X=
z7GgT`{XV5f%y1*S{6fF1UtFcqiBJUw8N6p)d0v4Aas(Z>@i@kKd$ZR#pX7ZRs7?ZR
zdjEsAG7Ge<ZIatm4%S`SvW)k5=B03EA-8yU@B8MoWNbyr3gw|$70;^BhOC`T5>NbY
z<Ugo)c(8z{w-fyG#y9N5PHn5HZoYeTu<r8CJccWYi(Evay59GdIyM~Xci{V3+FxDW
z5JFGC??XPxSKb<`d%Ex+Zgf6LD<2Mgh2K?U$sz7f`jkRPV8<YHuzRtQPQ9Cy)iQox
z=}Qyji!zxL4mZGmR3;ZZrlxo`B)3U9gFBk&duf-el6j=Fw)LYnTLbpM9_WBNNNnO!
z4^4AetNYA#ON$ZhONvJ#WQLuy@2=!{duw{(xULncN2P${00{Q<iFj%DdRF5T@!XGv
z$j9Y}F&3WVu5+V-sPPe&#NXcKiT#`|TsKUQ)jpRouDtBh&eC4&VK-M@E2zjdW|&6B
zUg&R!bg->n98SHH2#`?Av|THBY)*M>%lyQZU>_xxOe9~Jkj~j`L9PYWWu^FQl!0Z@
zCr%&;a9`s?ezGm5QOInngH9MFZ-*XNwhJx4mAiNhy;*<84$bxbM-`|>bw0@=jwF(z
zPpN$+B(YJ2)M{Z)2E}^ktpUn{Bd#rGaW2t%<e8{l76gJddAKY!t=cmCoU3GbjQHo`
zLtMG4(1S=t*HSMM2Kz1M;LU&(a<tDsMm$%2YHCO}h_Q5=`9QgUr%dcoRWxiSQocfY
zIY2N9lTol%g@c=_>M~<1-WZ&%OuMsoTO<X#-LkLk*svG9F<k&ns@41gX&Mr7seRAj
z-&XY5=w^~*;6G_9gS$_UR2DBLr9r%y5RA0W`-3Ootcx_FF-cln!H+fG#+via)2kCg
z|HXB?W$;Xj#1{%igu`UwPY3L=4c;)mCM`~_ccuLu;rk&8(Qo=rxQ1uF7Ef_o4vkj`
zhm|q2xs{wuhOa|vuqbYZRO_5RE*x^z1DJ4%5;=#X@p62G5m6=+-@GuwLXM454xx!4
zJKNA6{bYmcjPTBi2camlG07SfVlL!}T4^=CZKuH169$by^Z25`-osn+BMGkiFlE2!
zIoeM**w7@psE3k}^hO<9VKBBm>#ZXD*~IDGNnIG__YctuL<IM>Y)%T>rz{SlR-#n)
zqa@Cmniyw}ja#ugL<;NVRorlvvmT?P2*yrv+W8ioUf1U={h7`N<Lr@#(!Y%+L~av-
zx;>2Xv}CZX8ts!b|4K0vNIIeD-q78f))10dUHlq0RU%9voE0hEn32l?gddf+A0Lh7
z`=2t%{JA7E*cxb`=F7ZpovlTviyaip-_d@nB9zcb;kfdVFQi|^c^b+^$J=H>bV3}|
zH|=)!&rmjGJPSQqt+69Ez893XVmu^osXORhYgEj~oP!3^?j0bc&VPtD(ty6po=<p7
zx1K1{8LPPy(Jqfu25Pm(<2z>_JBdkH9zltiA?HdMDRozqu7<P&muTBm=7Ek<YQ0d$
zq>3o+oi6oj_k2+c*u2)hz-V5se|55}sU-+kxqM}?jTX&lHoXKc<1Q3E;s-U{6^m7A
z{WclHUaQTV{c<D3tXdQ0#2VF5@bR{Q=|AD9WZj(JA78S$+2&%<p`GheJDV=;WO8}|
z*sLt%|MB_f<1(+1E9(~^YyC1W6o<{TzVM0-fQ6VPFyh(3&FKj%{9GG{b5HnFGbOyO
zdaXXif1#M1Hi*yyjq1(NcR7PwEnOP(fq9#$Q6Tr(;p^Y@fAU*lwEL0?#!O_M@{D}c
z@Yy|gx3{jD+)D$&QA0w1(hT4@hw3LzBKyIEWLivXIZ`GgjczuE$87DcSOzI|XgX*;
zWkuv@$f%C~c<sezJk49(R$e>W-MHiva>)4JAhC!>`2G0t=f#pWhW5azKg_4PhxEHy
zMLo@%^ed*=?pE^27I|I8$wKJKhaZR14V4Jn*sxhBh)SlzE#dt;=hDES8dYo1Fwe@h
z2j^+Cd>jJn%~G)5%>`tR>3>eo=ny*GRE@pN$y*g%AoXxNkMID$aJ=~y5?%m+5gcx&
zFG#~v7()|tINaROL>F!(C}_qahyKSv3=1FxM*V+-6rufvz@YeR!=<pm@CZK=9)Ju8
g^T)%`M86>XMZ8}?)L(48rQj0)ZRcWJZ|$4#Us_0OEC2ui

literal 0
HcmV?d00001

diff --git a/style/themes/MyFeatherBB/img/old.png b/style/themes/MyFeatherBB/img/old.png
new file mode 100644
index 0000000000000000000000000000000000000000..48294fc51bbd2e3bfe5d92bd4c68b55bc5b5465b
GIT binary patch
literal 1551
zcmZ{kdpHw%7{}+*(8bhrV`;4tJIXdXV~VD^M~=%#%CJkNWo#i7lFQVRTkAq8xpcHC
zl2kJ?b7@A0L^>KtB%9WDT&J`8@BDF|_x=7p@AE#t@B9AuGQGWARxLML4gdgFxw+ze
z)P(+&E>Qi_<Kq=-0K+_7aDX2_qnKBor|#&{To2LJbp0jg_6Yl*%@`V%q9*j0GUf}5
z0Dxs+HyqY4uz3of;O*xRY1qSVl~%8Cl^Yn!Q&Kkwx_bq_-Z9MWLsionSWSJOiN{FW
z9QR{h`C2Wb1}qXQJk!&(bgyBcaSC=oNA^j@EjwODGtJ=@$)3dWk`Z5$lcLBCyja;@
zzHC7(D_pS4xQl=1e)u@3-{NGE$#M_)$z4I7_0)G+d|@083N=`hsWkX<d$<TW4;#y2
zLAx&*;Dn|hEwfQ|1JLMb_PkE|RCbn!xrcjKh1X!-k>_@HGeYUt7sgLpYbs{*Q3`B`
z0J;uB289dT-d)ZWluG)9P1JDQzH5r+)U*sExR?LZKgzikz78S0e<FQ-zl%7BInTsm
zFQa2r>YLrW(Orv<L;i1ruQ~pjBUyf>O}9=pGO~oVqao`K*Vvn3kW-?C9j|mIjSa2b
zOLL`CX<2O$M}x=Xt=Q)=qfm6amu5Lz*bw#ZQv|zAu#&zAQRLv=HD)VvtU`?Pf~UQ{
zeS7i@*un@1Sl_7$+$YMKQ7T`nRH~IUki>SVWb=H@qtnV&Jx(pH){-%1;q0A1zR{gc
zOiLVL;d2v~pF8+_5~LuObF+4}IoYLatqBA|L|9u3f^~qvmE>-aX`p^^lb%%ZAo$Ef
z>vWm11&;!SZ|^aK?efG2;gQ{aea^8HX#<2Sk46m6k55k{_M%W>fTd>L2+i~X3&b96
z$x`u)Ftf#$(Wku+61S#mP^u`iwpH!?XZQezzdJYD#wvoNbT6}5$PJq}Q@AB1B_evC
z;JwAe)Ga+xXqgh-#T^=L<+C;E4O0zTX`QtG`o{5r$2B8hFjz4<x=rhSv+e;X7}3$G
z$p#yBpEr%&m}wO)UwfkV#;M3iba6>Z_*FfF{Q$>cEx^h~2ujciz||MRYlGO=^F9<?
z64J@$EI0U%VR?a_5$gv2zTZlM?&VPJts3Ul0PuSYnhPlE5=6K<BW^kw^qyU{8234?
ze>A(;cGAPZ=4ragxtTb$IsBp#p{7ynfL47SUyn+Tk5=^Sai;a^rYg?V@SVUBm5tMF
zXt;x&$_@h?KL>;&Vz)%EhuX~`lJh@)*8%~7(q!84Eu@!qw?de4u(HKmefieyGUb(O
z42!S<uzG9_9W&!gY&xR)`f@*Hq{*N0_?{IlVHA7Jd)>%F!2X2wAbA9tM3uqZhOQr?
z|5<&)=gw2^{zD{t7c%n1suo@6ewcNmxnmF&#4#OP`!?y#*+sWcHUkyn?*W{qTZC_X
zA*|DHd|y$;0~lH}<Mhq5xoy&!i95|LJGY%pI{Lyd;pRz9Y<(JYt$*e2XF_4wgzN;L
zf8_N1MSfenkMoXu`1(@{)6;Cq!5(W8EKpgz@F+8Avc4dm6rzEGL3=)W#?;PAbPt6l
ze&ODTY~anJaRu-Ku7Wt{9di^L9zQnZ!L%eLn!uRnUcEj`hmg$AWf^W57K?cK-}8<d
zI>ijQ*e@HVt%ftn_^fhSP1UVR?p%54r!mo>i+eBE_=%*OQ0|aVh`OFjy*9$!#FjDy
z*Ps{1uJ&=CS4StoZg%u8X~`=m>t>xCuZU#wP3<<Vs1)`Gx)XCE;Z(XSu@oQX(lz%%
zF5l$J(o1a5q@RSm-FuLHUbgum3pF<Aa0~n>wM)O_FL7E1V-UkBJ;1q;t;Fevehn6D
zOSN5j=oHJ8+a?Y3l(^4#WD%9wM}F6`*FHEo+>Deo^a8Kes&x872E-koIU4Faxt-w@
z$RLI?NSN?wk{SRM0%5yTok%M`BpQQ2V30PyAyDcfE0Hnz9|JX#c$|FZ{|yUUL;-5U
u#-AH}Bgu@|&}b3>ON<O7LEWgK6p{}qlz1kpowP^&3E<}Bh2uIB&i@OwF42(y

literal 0
HcmV?d00001

diff --git a/style/themes/MyFeatherBB/img/sticky.png b/style/themes/MyFeatherBB/img/sticky.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d7d150bbf693bd2db022ae6e53fad3401b5bd95
GIT binary patch
literal 1816
zcmZ{lX*3&X7sr#SvBX+RCzc~hYpoKY8exb8q19N%5^9g7NDxU;HK|q&ZMBWoEB0Mf
zixKNss+Lh(8HuG@Z7rc_EET1p^~QXAKfLGO|MR=&p7Ve1{dUu^j<%8@MGyc0ki^)b
zoCSm&NmN+yk`fYl0tg2<*rEW3M^V&KnJMUqMcH|h1ho5CHUr@nM@>qURfvF)f0fG5
z%NJOcF(@lnj~;H8=SA0$6aD92LA&ZCAV#~nDQ~h<=&ejc10%hjQ)W0T#rx#n8PU}x
zR-!)<%4^WiwQ#%TZeDC$^^LG`k$pc_1BPW1He=Dy3A-|$-H_vPn?+ieFxBW~{8oq<
zpwrE^ZyX+O<ZZN(e$BXk{M<Ym5nu;>6Ubp1XBq0F`xc(Svlbr94!aJ+E_!OPPJO_H
zO588Ma9IKxoWpU7HdHRmhTtp8suHcArupX2&F_Zr_llpL`jJ4PzM!it630XM8A+vv
zu&kvq@9{Xj?Ax#cqdV<;n1X_5eq^u-$EOoVR^P=>Y}`Swnk{i!cO$~d>KQwHr)A+|
zSU8+l+C=6b9|CdBdjdvO6dg#R`e6^VW{4*nRTZ23v^#@OmuWW^=OITtBg5CvO-{wC
zcPE&)wB7$W8=BnxTw(LYBk7x56VdfL>!?cW#9boO%BfHuWRm-ml`Dcw1s?t8rZXh@
zh%y~W3yq+Uf_KWDFO4<*Jx1Hj9}8Bd?EdnSl_~PxM{du=v*;5UX2YDHmC~A3w+t<G
z8HNszCjry1UFe2*9S<t?%yUqbVk1Y0n70hwCnm7b+|bS-AL%J}yQL0H*i5B%>2T%!
zLrpieoIt(_{pE-MJeZjIXIhMNjKDxFraW!#FyPt&T~)p!IYlDK{aI`>L<lTtg)76%
zAYJO1(MyRdv{rLz0Q~LOKG*Z3bTz%$@1Iwslpf%LP5Hg3?G8tV>8G1vw&F!gL2B%L
z?c~3hNer_qLdKe);|$B&>Y}TtxnOb1IeY2Gl$6(A@<zCj9kOZ~SR|C;b7p6>2EL37
z2Y=-`3T@8i2xIS|bfw~o_>9Xi0z#EqQ4G2G!b9THhDh<;EP!1Avc_uma=L1qfC~u>
zE-s|?fzR?<b(VcU5SAEUL9SR9zuX*_93RI@sg~xF(&k+w7g8X@E#9CJ_n{(ADKz_=
zKREgEA2RH;L95ypThVu#6gB&k=CAG|`hoL-5>R}~y3zGEh0klMWu-16H9qPmc>X8(
z+r_b1>R={;(ed%t9q9vu@9^ZrdskW%sC)-B_Qq>*PQN!6`jJ|4#ch*dh$gVKW+`08
zQ|I5+4bNOwXq0?{0XrsHGVOlU63Ufhb-Sy4%c<>TiDyb|2ruj<vmby?9l<7^QAJu)
z811XK!=}8k(P(PDc$`;3L-GcM&@!7)M;!Rsp%Qd267i`Ywv~_AlwJeG+W;9YWf5-L
zwJrxmUKSUqw*Y)eY}~X^U*&U|1ZiN6X)#DmM_;`wUP;K&qw5-AD*oh85d}hkM$S%p
z;aIh>d0>fI*XgplMP6d(twx<6GHPx%fJtawY*lZ%w+9$3l;KshsFEw{WU<(_$_;Qo
zupRz*V@UM13cN0oO>I2}oJ0YznGOGxig!4_A|W*@p!x)mLq9NoI!)EsVX+7HNN8Ba
z-f67$lF0iG8!cs6nhaYEDpgRQd>Go2u$wFVr`IIGID6)apT~2mH=8!4(`n14e1X(r
z)U{Kiw`8;Q1_E~WqFQ@#Ctj>%eJN%CEZacr)BnuAD-&chWOcn{^Pw0>_)D+({JV^a
z!2PO(?=dEWxIJH|wGxfoiM~D~v3LYb*65f1W-Zgi98MYIO$0sn*9u0U@6{!pL#Uq1
zheitLy`~&a3d(~>{C1W%cdW|GEU(#~<lbgU&Lui0o!zcq(AJquN8_hvv(jcBoM4}V
zE!R85t=e5h>d4XJCw1gJ+$omiffnR;^TLjI9dSHkbt#OnWxP7dkzWmWad54~JL0cF
z1DV*K6cVfc0FgT79RS}~t%M{NgotW%X;!Ry<Wm0pqDpGJiuy)dRT9eYiB8wMh<L0O
zMbe%h=MGk0hb!LdN{4v@f5`3V9;n32@4G(5-xrlnZJuD7(a^v$d-B1VcUa%@x8IW5
zn_`sj(q)GVhHk<XSn3mXc#Mmu7zLRVoYYOeL3<TF6+_d*2k2F%Wd<!rZ4Io9?w|_(
zpbw-R{>96lPH^nv`6-~r<-TPk8KM3Twpp?;0-UcnPg~ald}j&ARcxu|y=fX_Dh(n8
z2jg@s+9Ni|KNb%UjKK>4fEpNFI4ej)BUi)oa03Ilp{cF`R8XWR#;*O3A(9vr799Wo
z4f|@t?g9h&Xo3qdIQE)<3?5(=L=3<~Fp>TtcxSwSP<-?N{%8#V2JMKdLHZ^C7mOrA
A!~g&Q

literal 0
HcmV?d00001

diff --git a/style/themes/MyFeatherBB/phone.min.js b/style/themes/MyFeatherBB/phone.min.js
new file mode 100644
index 00000000..4cbfc6e4
--- /dev/null
+++ b/style/themes/MyFeatherBB/phone.min.js
@@ -0,0 +1 @@
+"use strict";var getHeight=function(t){var e=window.getComputedStyle(t),i=e.display,l=e.position,s=e.visibility,o=e.maxHeight.replace("px","").replace("%",""),a=0;return"none"!==i&&"0"!==o?t.offsetHeight:(t.style.position="absolute",t.style.visibility="hidden",t.style.display="block",a=t.offsetHeight,t.style.display=i,t.style.position=l,t.style.visibility=s,a)},toggleSlide=function(t){var e=0;t.getAttribute("data-max-height")?t.style.maxHeight="0"===t.style.maxHeight.replace("px","").replace("%","")?t.getAttribute("data-max-height"):"0":(e=getHeight(t)+"px",t.style.transition="max-height 0.5s ease-in-out",t.style.overflowY="hidden",t.style.maxHeight="0",t.setAttribute("data-max-height",e),t.style.display="block",setTimeout(function(){t.style.maxHeight=e},10))};document.querySelector("#phone-button").addEventListener("click",function(){toggleSlide(document.querySelector("#phone"))},!1);
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/style.css b/style/themes/MyFeatherBB/style.css
new file mode 100644
index 00000000..3a3015e9
--- /dev/null
+++ b/style/themes/MyFeatherBB/style.css
@@ -0,0 +1,1841 @@
+/*
+ * FeatherBB default style
+ *
+ * Responsive, classy and modern!
+ *
+ * Based on awesome work from Magicalex and Jedediah (mondedie.fr)
+ *
+*/
+
+
+img,
+legend {
+    border: 0
+}
+legend,
+td,
+th {
+    padding: 0
+}
+#brdfooter .clearer,
+#brdstats .clearb,
+#brdstats .clearer,
+.blockpost .box .postfoot .clearc,
+.container-title-status .clear,
+.linksb .crumbs,
+.linkst .clearer {
+    clear: both
+}
+#announce,
+#msg,
+#posterror {
+    text-shadow: 0 1px 0 rgba(255, 255, 255, .5)
+}
+html {
+    font-family: sans-serif;
+    -ms-text-size-adjust: 100%;
+    -webkit-text-size-adjust: 100%
+}
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+    display: block
+}
+audio,
+canvas,
+progress,
+video {
+    display: inline-block;
+    vertical-align: baseline
+}
+audio:not([controls]) {
+    display: none;
+    height: 0
+}
+[hidden],
+template {
+    display: none
+}
+a {
+    background-color: transparent
+}
+a:active,
+a:hover {
+    outline: 0
+}
+abbr[title] {
+    border-bottom: 1px dotted
+}
+b,
+optgroup,
+strong {
+    font-weight: 700
+}
+dfn {
+    font-style: italic
+}
+h1 {
+    font-size: 2em;
+    margin: .67em 0
+}
+mark {
+    background: #ff0;
+    color: #000
+}
+small {
+    font-size: 80%
+}
+sub,
+sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline
+}
+sup {
+    top: -.5em
+}
+sub {
+    bottom: -.25em
+}
+svg:not(:root) {
+    overflow: hidden
+}
+figure {
+    margin: 1em 40px
+}
+hr {
+    box-sizing: content-box;
+    border: none;
+    border-top: 1px solid #d8d8d8;
+    height: 0;
+    width: 100%
+}
+pre,
+textarea {
+    overflow: auto
+}
+code,
+kbd,
+pre,
+samp {
+    font-family: monospace, monospace;
+    font-size: 1em
+}
+button,
+input,
+optgroup,
+select,
+textarea {
+    color: inherit;
+    font: inherit;
+    margin: 0
+}
+button {
+    overflow: visible
+}
+button,
+select {
+    text-transform: none
+}
+button,
+html input[type=button],
+input[type=reset],
+input[type=submit] {
+    -webkit-appearance: button;
+    cursor: pointer
+}
+button[disabled],
+html input[disabled] {
+    cursor: default
+}
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+    border: 0;
+    padding: 0
+}
+input {
+    line-height: normal
+}
+input[type=checkbox],
+input[type=radio] {
+    box-sizing: border-box;
+    padding: 0
+}
+input[type=number]::-webkit-inner-spin-button,
+input[type=number]::-webkit-outer-spin-button {
+    height: auto
+}
+input[type=search] {
+    -webkit-appearance: textfield;
+    box-sizing: content-box
+}
+input[type=search]::-webkit-search-cancel-button,
+input[type=search]::-webkit-search-decoration {
+    -webkit-appearance: none
+}
+fieldset {
+    border: 1px solid silver;
+    margin: 0 2px;
+    padding: .35em .625em .75em
+}
+body,
+li,
+nav ul,
+p,
+ul {
+    margin: 0
+}
+table {
+    border-collapse: collapse;
+    border-spacing: 0
+}
+* {
+    box-sizing: border-box
+}
+body {
+    font-size: 14px;
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    line-height: 1.25;
+    color: #333;
+    background-color: #f9f9f9;
+    padding-top: 60px
+}
+.container-title-status .title-site .site-name,
+nav ul li a {
+    font-weight: 400;
+    font-family: bebas_neueregular, Arial, Helvetica, sans-serif
+}
+a {
+    text-decoration: none;
+    color: red
+}
+a:hover {
+    text-decoration: underline;
+    color: #2a6496
+}
+nav {
+    position: fixed;
+    z-index: 10;
+    top: 0;
+    left: 0;
+    right: 0;
+    line-height: 50px;
+    height: 50px;
+    background-color: #03a9f4;
+    box-shadow: 0 0 3px #000
+}
+nav ul {
+    padding: 0;
+    float: left;
+    list-style-type: none
+}
+nav ul li {
+    display: inline-block;
+    padding: 0 5px;
+    margin: 0
+}
+nav ul li a {
+    display: block;
+    color: #fff;
+    font-size: 1.5em;
+    text-decoration: none
+}
+nav ul li a:hover {
+    color: rgba(255, 255, 255, .9);
+    text-decoration: none
+}
+nav ul .isactive {
+    background-color: rgba(255, 255, 255, .3)
+}
+nav ul .isactive a:hover {
+    color: #fff
+}
+.container-title-status .status-avatar .avatar,
+.container-title-status .status-avatar .inbox {
+    display: inline-block;
+    vertical-align: middle
+}
+nav .navbar-right {
+    float: right
+}
+nav .navbar-right input {
+    width: 100%;
+    height: 1.8rem;
+    padding: 7px 10px;
+    border-radius: 3px;
+    background-color: #fff;
+    border: none
+}
+nav .navbar-right input:focus {
+    outline: 0
+}
+.container-title-status {
+    margin: 0 0 15px
+}
+.container-title-status .title-site {
+    margin: 0;
+    float: left
+}
+.container-title-status .title-site .site-name {
+    color: #90a4ae;
+    font-size: 80px;
+    line-height: 1;
+    text-decoration: none
+}
+.container-title-status .title-site .site-name p:first-letter {
+    color: #03a9f4
+}
+.container-title-status .title-site #brddesc {
+    color: #999;
+    font-size: 14px;
+    font-weight: 400;
+    font-style: italic;
+    line-height: 1;
+    margin: 0;
+    padding: 0;
+    text-align: center
+}
+.container-title-status .status-avatar {
+    float: right
+}
+.container-title-status .status-avatar .inbox p,
+.container-title-status .status-avatar .inbox ul {
+    margin: 0 15px 0 0;
+    padding: 0;
+    color: #5a5a5a
+}
+.container-title-status .status-avatar .inbox p li,
+.container-title-status .status-avatar .inbox ul li {
+    list-style-type: none;
+    text-align: right
+}
+.container-title-status .status-avatar .avatar img {
+    height: 90px;
+    width: 90px;
+    border-radius: 50%;
+    border: 1px solid #d1d1d1
+}
+#announce {
+    margin: 0 0 15px;
+    padding: 8px 35px 8px 14px;
+    color: #3a87ad;
+    background-color: #d9edf7;
+    border: 1px solid #bce8f1;
+    border-radius: 4px
+}
+#announce h2 {
+    margin: 0 0 4px;
+    font-size: 18px
+}
+section .blocktable .box table thead th,
+section .blocktable h2 {
+    font-weight: 400;
+    font-size: 20px;
+    font-family: bebas_neueregular, Arial, Helvetica, sans-serif;
+    color: #fff
+}
+#announce p {
+    margin: 0 0 2px
+}
+section {
+    margin-top: 15px;
+    margin-bottom: 20px
+}
+section .blocktable {
+    position: relative;
+    margin-bottom: 24px
+}
+section .blocktable h2 {
+    position: absolute;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    width: 56%;
+    left: 0;
+    top: 0;
+    z-index: 1;
+    padding: 9px;
+    margin: 0
+}
+section .blocktable .box table {
+    table-layout: fixed;
+    text-align: left;
+    width: 100%
+}
+section .blocktable .box table thead th {
+    height: 40px;
+    background-color: #039be5;
+    border: 1px solid #039be5;
+    line-height: 40px
+}
+section .blocktable .box table thead th.tcl {
+    font-size: 0
+}
+section .blocktable .box table thead th.tcr {
+    width: 16%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    padding-left: 8px
+}
+section .blocktable .box table thead th.tc2,
+section .blocktable .box table thead th.tc3,
+section .blocktable .box table thead th.tcmod {
+    text-align: center;
+    width: 11%
+}
+section .blocktable .box table tbody tr {
+    background-color: #fff
+}
+section .blocktable .box table tbody tr td {
+    width: 100%;
+    border: 1px solid #d1d1d1;
+    color: #5a5a5a
+}
+section .blocktable .box table tbody tr .tc2,
+section .blocktable .box table tbody tr .tc3,
+section .blocktable .box table tbody tr .tcmod {
+    text-align: center;
+    width: 11%
+}
+section .blocktable .box table tbody tr .tcl {
+    padding: 7px 8px
+}
+section .blocktable .box table tbody tr .tcl .icon {
+    background-image: url(img/old.png);
+    height: 32px;
+    width: 32px;
+	margin-right: 5px;
+    float: left;
+}
+section .blocktable .box table tbody tr .tcl .icon .nosize {
+    display: none
+}
+section .blocktable .box table tbody tr .tcl .icon-new {
+    background-image: url(img/new.png);
+}
+section .blocktable .box table tbody tr .tcl .icon-sticky {
+    background-image: url(img/sticky.png);
+}
+section .blocktable .box table tbody tr .tcl .icon-closed {
+    background-image: url(img/closed.png);
+}
+section .blocktable .box table tbody tr .tcl .tclcon {
+    margin-left: 35px;
+    overflow: hidden
+}
+section .blocktable .box table tbody tr .tcl .tclcon h3 {
+    margin: 0 0 4px;
+    font-size: 16px
+}
+section .blocktable .box table tbody tr .tcl .tclcon h3 a {
+    text-decoration: none;
+    color: #03a9f4
+}
+section .blocktable .box table tbody tr .tcl .tclcon h3 a:hover {
+    text-decoration: underline
+}
+section .blocktable .box table tbody tr .tcl .tclcon h3 .newtext {
+    font-size: 14px;
+    font-weight: 400
+}
+section .blocktable .box table tbody tr .tcl .tclcon h3 .newtext a {
+    text-decoration: none;
+    color: #428bca
+}
+section .blocktable .box table tbody tr .tcl .tclcon h3 .newtext a:hover {
+    text-decoration: underline;
+    color: #2a6496
+}
+section .blocktable .box table tbody tr .tcl .tclcon .forumdesc {
+    font-size: 12px
+}
+section .blocktable .box table tbody tr .tcr {
+    width: 20%;
+    padding: 7px 8px
+}
+section .blocktable .box table tbody tr .tcr .byuser {
+    display: block
+}
+#vf {
+    margin-bottom: 0
+}
+#vf .tclcon {
+    color: #5a5a5a
+}
+#vf .tclcon .byuser {
+    display: inline-block
+}
+#vf .tclcon .newtext,
+#vf .tclcon .pagestext {
+    display: inline-block;
+    font-size: 14px
+}
+#vf .tclcon a {
+    text-decoration: none;
+    color: #428bca
+}
+#vf .tclcon a:hover {
+    text-decoration: underline;
+    color: #2a6496
+}
+#vf .roweven {
+    background-color: #fafafa
+}
+#vf .closedtext {
+    color: #a94442
+}
+#vf .stickytext {
+    color: #3c763d
+}
+#vf .isticky {
+    background-color: #dff0d8
+}
+.last-topic {
+    margin-bottom: 24px!important
+}
+.linksb .crumbs,
+.linkst .crumbs,
+.postlinksb .crumbs {
+    background-color: #fff;
+    padding: 10px;
+    border: 1px solid #d8d8d8;
+    border-radius: 4px
+}
+.linksb .crumbs li,
+.linkst .crumbs li,
+.postlinksb .crumbs li {
+    display: inline-block;
+    color: #428bca
+}
+.linksb .crumbs li span,
+.linkst .crumbs li span,
+.postlinksb .crumbs li span {
+    color: #ccc
+}
+.linksb .crumbs li strong,
+.linksb .crumbs li strong a,
+.linkst .crumbs li strong,
+.linkst .crumbs li strong a,
+.postlinksb .crumbs li strong,
+.postlinksb .crumbs li strong a {
+    color: #777
+}
+.linksb .crumbs li strong a:hover,
+.linkst .crumbs li strong a:hover,
+.postlinksb .crumbs li strong a:hover {
+    color: #777;
+    text-decoration: none
+}
+.linksb .pagepost .postlink.conr,
+.linkst .pagepost .postlink.conr,
+.postlinksb .pagepost .postlink.conr {
+    display: block;
+    margin-top: 15px;
+    text-align: center
+}
+.linksb .pagepost .pagelink.conl,
+.linkst .pagepost .pagelink.conl,
+.postlinksb .pagepost .pagelink.conl {
+    padding-left: 1px;
+    overflow: auto
+}
+@media only screen and (min-width: 768px) {
+    .linksb .pagepost .pagelink.conl,
+    .linkst .pagepost .pagelink.conl,
+    .postlinksb .pagepost .pagelink.conl {
+        float: left
+    }
+    .linksb .pagepost .postlink.conr,
+    .linkst .pagepost .postlink.conr,
+    .postlinksb .pagepost .postlink.conr {
+        float: right;
+        margin: 0
+    }
+    .linksb .pagepost .modbuttons,
+    .linkst .pagepost .modbuttons,
+    .postlinksb .pagepost .modbuttons {
+        text-align: right
+    }
+    .linksb .pagepost .pagepost:after,
+    .linkst .pagepost .pagepost:after,
+    .postlinksb .pagepost .pagepost:after {
+        content: "";
+        display: block;
+        height: 0;
+        font-size: 0;
+        clear: both;
+        visibility: hidden
+    }
+}
+.linksb .pagepost .modbuttons,
+.linkst .pagepost .modbuttons,
+.postlinksb .pagepost .modbuttons {
+    display: block;
+    text-align: right
+}
+.linksb .pagepost,
+.linkst .pagepost,
+.postlinksb .pagepost {
+    overflow: auto;
+    margin: 10px 0;
+    padding: 10px 0
+}
+.linksb .pagepost .pagelink.conl a,
+.linksb .pagepost .pagelink.conl span,
+.linksb .pagepost .pagelink.conl strong,
+.linkst .pagepost .pagelink.conl a,
+.linkst .pagepost .pagelink.conl span,
+.linkst .pagepost .pagelink.conl strong,
+.postlinksb .pagepost .pagelink.conl a,
+.postlinksb .pagepost .pagelink.conl span,
+.postlinksb .pagepost .pagelink.conl strong {
+    position: relative;
+    float: left;
+    margin: 0 0 0 -1px;
+    padding: 6px 12px;
+    border: 1px solid #ddd;
+    background-color: #fff
+}
+.linksb .pagepost .pagelink.conl a:hover,
+.linksb .pagepost .pagelink.conl span:hover,
+.linksb .pagepost .pagelink.conl strong:hover,
+.linkst .pagepost .pagelink.conl a:hover,
+.linkst .pagepost .pagelink.conl span:hover,
+.linkst .pagepost .pagelink.conl strong:hover,
+.postlinksb .pagepost .pagelink.conl a:hover,
+.postlinksb .pagepost .pagelink.conl span:hover,
+.postlinksb .pagepost .pagelink.conl strong:hover {
+    text-decoration: none;
+    background-color: #fafafa
+}
+.linksb .pagepost .pagelink.conl .spacer,
+.linkst .pagepost .pagelink.conl .spacer,
+.postlinksb .pagepost .pagelink.conl .spacer {
+    background-color: #fafafa;
+    cursor: default;
+    color: #d3d3d3
+}
+.linksb .pagepost .pagelink.conl .spacer:hover,
+.linkst .pagepost .pagelink.conl .spacer:hover,
+.postlinksb .pagepost .pagelink.conl .spacer:hover {
+    background-color: #fafafa
+}
+.linksb .pagepost .pagelink.conl strong,
+.linkst .pagepost .pagelink.conl strong,
+.postlinksb .pagepost .pagelink.conl strong {
+    font-weight: 400;
+    background-color: #fafafa;
+    cursor: default
+}
+.linksb .pagepost .pagelink.conl .pages-label,
+.linkst .pagepost .pagelink.conl .pages-label,
+.postlinksb .pagepost .pagelink.conl .pages-label {
+    display: none
+}
+.postlinksb {
+    margin-bottom: 5px
+}
+.linksb .subscribelink {
+    margin: 15px 0;
+    text-align: right
+}
+.blockpost {
+    background-color: #fff
+}
+.blockpost h2 {
+    margin: 0;
+    padding: 10px;
+    font-size: 14px;
+    font-weight: 400;
+    background-color: #039be5
+}
+.blockpost h2 span>.conr,
+.blockpost h2 span>a {
+    padding: 7px;
+    color: #fff
+}
+.blockpost .box {
+    border: 1px solid #d8d8d8;
+    border-top: none
+}
+#postpreview .postbody,
+.blockmenu ul li,
+footer .footer-link {
+    border-top: 1px solid #d8d8d8
+}
+.blockpost .box .postleft {
+    float: left;
+    width: 20%;
+    padding: 7px 15px
+}
+.blockpost .box .postleft dl {
+    margin: 0;
+    color: #333
+}
+.blockpost .box .postleft dl dt strong a,
+.blockpost .box .postleft dl dt strong span {
+    font-size: 1.3rem;
+    font-weight: 400
+}
+.blockpost .box .postleft dl dt strong a:hover,
+.blockpost .box .postleft dl dt strong span:hover {
+    text-decoration: none
+}
+.blockpost .box .postleft dl dd {
+    margin: 5px 0
+}
+.blockpost .box .postright {
+    float: right;
+    line-height: 1.4;
+    width: 80%;
+    padding: 15px;
+    color: #333;
+    word-wrap: break-word
+}
+.blockpost .box .postright h3 {
+    display: none;
+    text-align: center
+}
+.blockpost .box .postright .postedit {
+    font-size: 12px;
+    margin-top: 7px
+}
+.blockpost .box .postright .postsignature hr {
+    margin: 15px 0
+}
+.blockpost .box .postfoot {
+    clear: both;
+    overflow: auto
+}
+.blockpost .box .postfoot .postfootleft {
+    float: left;
+    width: 20%;
+    padding: 7px 15px;
+    color: #333
+}
+.blockpost .box .postfoot .postfootleft strong {
+    border: none;
+    font-size: 12px;
+    height: 17px;
+    line-height: 17px;
+    padding: 0 5px;
+    font-weight: 700;
+    text-transform: uppercase;
+    color: #fff;
+    background-color: #009688
+}
+.blockpost .box .postfoot .postfootright {
+    float: right;
+    width: 80%;
+    padding: 7px 15px;
+    text-align: right
+}
+.blockpost .box .postfoot .postfootright ul {
+    visibility: hidden;
+    padding: 7px;
+    list-style-type: none
+}
+.blockpost .box .postfoot .postfootright ul li {
+    display: inline-block
+}
+.blockpost .box:hover .postfoot .postfootright ul {
+    visibility: visible
+}
+.firstpost {
+    margin: 0 0 4px
+}
+.firstpost .box {
+    border: 1px solid #039be5
+}
+.firstpost .postbody .postright>h3 {
+    display: block;
+    margin: 0 0 15px;
+    color: #777;
+    font-weight: 400;
+    font-size: 1.3rem
+}
+#editform .box fieldset .bblinks,
+#postform .box fieldset .bblinks,
+#punsearch .linksb .pagepost .pagelink .pages-label,
+#punsearch .linkst .pagepost .pagelink .pages-label,
+#punsearch .postlinksb .pagepost .pagelink .pages-label,
+#quickpost .box fieldset .bblinks,
+#reportform .box fieldset .bblinks {
+    display: none
+}
+.pagepost .postlink.conr a,
+.postfootright a,
+.subscribelink a {
+    border-radius: 3px;
+    border: 2px solid #00acc1;
+    color: #00acc1;
+    background-color: transparent;
+    padding: 4px;
+    text-decoration: none
+}
+.pagepost .postlink.conr a:hover,
+.postfootright a:hover,
+.subscribelink a:hover {
+    border: 2px solid rgba(0, 172, 193, .6);
+    color: rgba(0, 172, 193, .6)
+}
+.pagepost .postlink.conr a:active,
+.postfootright a:active,
+.subscribelink a:active {
+    border: 2px solid #0097a7;
+    color: #0097a7;
+    box-shadow: inset 0 3px 4px rgba(0, 0, 0, .2)
+}
+.pagepost .postlink.conr a:focus,
+.postfootright a:focus,
+.subscribelink a:focus {
+    outline: 0
+}
+.subscribelink {
+    margin: 15px 0;
+    text-align: right
+}
+#editform h2,
+#postform h2,
+#quickpost h2,
+#reportform h2 {
+    border: 1px solid #d8d8d8;
+    border-bottom: none;
+    padding: 5px;
+    margin: 0;
+    text-indent: 10px;
+    font-weight: 400;
+    font-size: 18px;
+    background-color: #f5f5f5;
+    border-radius: 3px 3px 0 0
+}
+#editform .box,
+#postform .box,
+#quickpost .box,
+#reportform .box {
+    border: 1px solid #d8d8d8;
+    border-radius: 0 0 3px 3px;
+    background-color: #fff;
+    padding: 15px
+}
+#editform .box .inform,
+#postform .box .inform,
+#quickpost .box .inform,
+#reportform .box .inform {
+    border: none
+}
+#editform .box fieldset,
+#postform .box fieldset,
+#quickpost .box fieldset,
+#reportform .box fieldset {
+    border: none;
+    color: #666
+}
+#editform .box fieldset legend,
+#postform .box fieldset legend,
+#quickpost .box fieldset legend,
+#reportform .box fieldset legend {
+    font-size: 16px;
+    margin: 0 0 7px;
+    font-weight: 700;
+    color: #666
+}
+#editform .box fieldset textarea,
+#postform .box fieldset textarea,
+#quickpost .box fieldset textarea,
+#reportform .box fieldset textarea {
+    margin: 7px 0;
+    width: 100%;
+    box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075);
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    background-color: #fafafa;
+    padding: 7px 8px
+}
+#editform .box fieldset textarea:focus,
+#postform .box fieldset textarea:focus,
+#quickpost .box fieldset textarea:focus,
+#reportform .box fieldset textarea:focus {
+    border: 1px solid #51a7e8;
+    background-color: #fff;
+    box-shadow: 0 0 5px rgba(81, 167, 232, .5);
+    outline: 0
+}
+#postform {
+    margin: 15px 0 0
+}
+#postpreview,
+#postreview,
+.blockform {
+    margin-top: 15px
+}
+#postform .rbox input {
+    margin-right: 7px
+}
+#postreview {
+    overflow: auto
+}
+#postreview .blockpost {
+    overflow: auto;
+    border: 1px solid #d8d8d8;
+    background-color: #f9f9f9
+}
+#postreview .blockpost .box {
+    border: none
+}
+#postpreview {
+    overflow: auto
+}
+#postpreview h2 {
+    border: 1px solid #d8d8d8;
+    border-bottom: none;
+    padding: 5px;
+    margin: 0;
+    text-indent: 10px;
+    font-weight: 400;
+    font-size: 18px;
+    background-color: #f5f5f5;
+    border-radius: 3px 3px 0 0
+}
+#postpreview .postbody {
+    overflow: auto;
+    background-color: #fff
+}
+#postpreview .postbody .postright {
+    width: 100%;
+    float: none
+}
+#punsearch .blockpost h2 {
+    color: #fff
+}
+#punsearch .linksb .pagepost,
+#punsearch .linkst .pagepost,
+#punsearch .postlinksb .pagepost {
+    margin: 10px 0;
+    padding: 10px 1px
+}
+#punsearch .linksb .pagepost .pagelink a,
+#punsearch .linksb .pagepost .pagelink span,
+#punsearch .linksb .pagepost .pagelink strong,
+#punsearch .linkst .pagepost .pagelink a,
+#punsearch .linkst .pagepost .pagelink span,
+#punsearch .linkst .pagepost .pagelink strong,
+#punsearch .postlinksb .pagepost .pagelink a,
+#punsearch .postlinksb .pagepost .pagelink span,
+#punsearch .postlinksb .pagepost .pagelink strong {
+    position: relative;
+    float: left;
+    margin: 0 0 0 -1px;
+    padding: 6px 12px;
+    border: 1px solid #ddd;
+    background-color: #fff
+}
+#punsearch .linksb .pagepost .pagelink a:hover,
+#punsearch .linksb .pagepost .pagelink span:hover,
+#punsearch .linksb .pagepost .pagelink strong:hover,
+#punsearch .linkst .pagepost .pagelink a:hover,
+#punsearch .linkst .pagepost .pagelink span:hover,
+#punsearch .linkst .pagepost .pagelink strong:hover,
+#punsearch .postlinksb .pagepost .pagelink a:hover,
+#punsearch .postlinksb .pagepost .pagelink span:hover,
+#punsearch .postlinksb .pagepost .pagelink strong:hover {
+    text-decoration: none;
+    background-color: #fafafa
+}
+#punsearch .linksb .pagepost .pagelink .spacer,
+#punsearch .linkst .pagepost .pagelink .spacer,
+#punsearch .postlinksb .pagepost .pagelink .spacer {
+    background-color: #fafafa;
+    cursor: default;
+    color: #d3d3d3
+}
+#punsearch .linksb .pagepost .pagelink .spacer:hover,
+#punsearch .linkst .pagepost .pagelink .spacer:hover,
+#punsearch .postlinksb .pagepost .pagelink .spacer:hover {
+    background-color: #fafafa
+}
+#punsearch .linksb .pagepost .pagelink strong,
+#punsearch .linkst .pagepost .pagelink strong,
+#punsearch .postlinksb .pagepost .pagelink strong {
+    font-weight: 400;
+    background-color: #fafafa;
+    cursor: default
+}
+#brdfooter,
+#brdstats {
+    padding: 10px;
+    border: 1px solid #d8d8d8;
+    border-radius: 3px;
+    background-color: #fff
+}
+#searchform #search .checklist {
+    margin: 10px 0;
+    overflow: auto;
+    width: 20em;
+    max-height: 9em;
+    border: 1px solid #d8d8d8
+}
+#searchform #search .checklist legend {
+    font-size: 16px;
+    margin: 0
+}
+#searchform #search .checklist label {
+    text-indent: 10px;
+    display: block;
+    margin: 0
+}
+#brdstats .conl dt,
+#brdstats .conr dt,
+#brdstats h2 {
+    display: none
+}
+#brdstats .conl,
+#brdstats .conr {
+    margin: 0 0 10px;
+    color: #5a5a5a;
+    font-size: 12px
+}
+#brdstats .conl dd,
+#brdstats .conr dd {
+    margin: 0
+}
+#brdstats .conr {
+    text-align: right;
+    float: right
+}
+#brdstats .conl {
+    text-align: left;
+    float: left
+}
+#brdstats #onlinelist {
+    margin: 0;
+    font-size: 12px
+}
+#brdstats #onlinelist dd,
+#brdstats #onlinelist dt {
+    display: inline-block;
+    margin: 0
+}
+#brdfooter {
+    margin: 15px 0;
+    font-size: 12px
+}
+#brdfooter h2 {
+    display: none
+}
+#brdfooter .conr {
+    text-align: right;
+    float: right
+}
+#brdfooter .conl {
+    text-align: left;
+    float: left;
+	width: 20%;
+}
+#brdfooter select {
+    width: 80%
+}
+footer .footer-link {
+    position: relative;
+    font-size: 12px;
+    padding: 10px;
+    color: #5a5a5a
+}
+footer .footer-link #useful-links {
+    font-size: 14px;
+    font-weight: 700;
+    display: block;
+    margin-bottom: 7px
+}
+.blockform h2,
+.blockmenu h2 {
+    text-indent: 10px;
+    border: 1px solid #d8d8d8;
+    font-size: 18px
+}
+footer .footer-link #copyright {
+    position: absolute;
+    bottom: 10px;
+    right: 10px
+}
+footer .footer-link a {
+    display: block
+}
+.blockmenu h2 {
+    border-bottom-width: 0;
+    padding: 5px;
+    margin: 0;
+    font-weight: 400;
+    background-color: #f5f5f5;
+    border-radius: 3px 3px 0 0
+}
+.blockmenu ul {
+    margin: 0 0 15px;
+    padding: 0;
+    list-style-type: none;
+    border-radius: 0 0 3px 3px;
+    border: 1px solid #d8d8d8;
+    background-color: #fff
+}
+.blockmenu ul li:first-child {
+    border-top: none
+}
+.blockmenu ul li a {
+    text-decoration: none;
+    color: #555;
+    display: block;
+    padding: 10px
+}
+#punuserlist .pagelink .pages-label,
+.blockform .box .inform fieldset .bblinks {
+    display: none
+}
+.blockmenu ul li a:hover {
+    background-color: #edf7fa
+}
+.blockmenu ul .isactive a {
+    background-color: #edf7fa;
+    color: #0084B4;
+    font-weight: 700
+}
+.blockform h2 {
+    border-bottom: none;
+    padding: 5px;
+    margin: 0;
+    font-weight: 400;
+    background-color: #f5f5f5;
+    border-radius: 3px 3px 0 0
+}
+.blockform .box {
+    border: 1px solid #d8d8d8;
+    border-radius: 0 0 3px 3px;
+    background-color: #fff
+}
+.blockform .box .inform {
+    border-bottom: 1px solid #d8d8d8;
+    padding: 10px
+}
+.blockform .box .inform fieldset {
+    border: none;
+    color: #666;
+    padding: 5px 10px;
+    margin: 0
+}
+.blockform .box .inform fieldset legend {
+    font-size: 16px;
+    margin: 0 0 7px;
+    font-weight: 700;
+    color: #666
+}
+#viewprofile h2,
+.blockform .box .inform fieldset label strong {
+    font-weight: 400
+}
+.blockform .box .inform fieldset p {
+    margin: 4px 0
+}
+.blockform .box .inform fieldset label {
+    margin: 6px 0;
+	display: inline-block;
+	padding-right: 12px;
+}
+.blockform .box .inform fieldset input {
+    box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075);
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    background-color: #fafafa;
+    padding: 7px 8px;
+    margin: 7px 0
+}
+.blockform .box .inform fieldset input:focus {
+    border: 1px solid #51a7e8;
+    background-color: #fff;
+    box-shadow: 0 0 5px rgba(81, 167, 232, .5);
+    outline: 0
+}
+.blockform .box .inform fieldset label select {
+    margin: 6px 0
+}
+.blockform .box .inform fieldset .rbox input {
+    margin-right: 7px
+}
+.blockform .box .inform fieldset .rbox input:focus {
+    box-shadow: none
+}
+.blockform .box .inform fieldset textarea {
+    margin: 7px 0;
+    box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075);
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    background-color: #fafafa;
+    padding: 7px 8px
+}
+.blockform .box .inform fieldset textarea:focus {
+    border: 1px solid #51a7e8;
+    background-color: #fff;
+    box-shadow: 0 0 5px rgba(81, 167, 232, .5);
+    outline: 0
+}
+.blockform .box .buttons {
+    margin: 7px
+}
+#profile {
+    overflow: auto
+}
+#profile .blockform {
+    width: 70%;
+    margin: 0 0 0 30%
+}
+#profile .blockmenu {
+    float: left;
+    width: 27.5%
+}
+#viewprofile h2 {
+    border: 1px solid #d8d8d8;
+    border-bottom: none;
+    padding: 5px;
+    margin: 0;
+    text-indent: 10px;
+    font-size: 18px;
+    background-color: #f5f5f5;
+    border-radius: 3px 3px 0 0
+}
+#viewprofile .fakeform {
+    border: 1px solid #d8d8d8;
+    border-radius: 0 0 3px 3px;
+    background-color: #fff
+}
+#viewprofile .fakeform .inform {
+    border-bottom: 1px solid #d8d8d8;
+    padding: 10px
+}
+#viewprofile .fakeform .inform fieldset {
+    border: none;
+    color: #666
+}
+#viewprofile .fakeform .inform fieldset legend {
+    font-size: 18px;
+    font-weight: 700;
+    color: #666
+}
+#viewprofile .fakeform .inform fieldset dt {
+    font-size: 15px;
+    margin-bottom: 4px;
+    font-weight: 700
+}
+#viewprofile .fakeform .inform fieldset dd {
+    margin: 0 0 15px
+}
+#msg,
+#posterror {
+    margin: 15px 0;
+    padding: 8px 35px 8px 14px;
+    color: #c09853;
+    background-color: #fcf8e3;
+    border: 1px solid #fbeed5;
+    border-radius: 4px
+}
+#msg h2,
+#posterror h2 {
+    margin: 0 0 4px;
+    font-size: 18px
+}
+#msg p,
+#posterror p {
+    margin: 0 0 2px
+}
+#posterror {
+    background-color: #f2dede;
+    border: 1px solid #ebccd1;
+    color: #a94442
+}
+
+.error {
+    background-color: #f2dede !important;
+    border: 1px solid #ebccd1 !important;
+    color: #a94442 !important
+}
+
+
+.flashmsg {
+    position: fixed;
+    min-width: 220px;
+    max-width: 500px;
+    top: 5%;
+    right: 5%;
+    margin-left: -250px;
+    padding: 1em;
+    z-index: 100;
+    opacity: 0;
+    pointer-events: none;
+    box-shadow: 0 3px 6px rgba(0,0,0,0.25);
+    border: 1px solid #bbb;
+    -webkit-transform: translateY(-100%);
+       -moz-transform: translateY(-100%);
+        -ms-transform: translateY(-100%);
+         -o-transform: translateY(-100%);
+            transform: translateY(-100%);
+    -webkit-transition: all 0.75s ease-out;
+       -moz-transition: all 0.75s ease-out;
+        -ms-transition: all 0.75s ease-out;
+         -o-transition: all 0.75s ease-out;
+            transition: all 0.75s ease-out;
+}
+.flashmsg h2 {
+    margin: 0 0 4px;
+    font-size: 18px
+}
+.flashmsg.error {
+    background: #ebccd1;
+    background: -webkit-linear-gradient(top, #f2dede, #ebccd1);
+    background:    -moz-linear-gradient(top, #f2dede, #ebccd1);
+    background:         linear-gradient(top, #f2dede, #ebccd1);
+    color: #a94442 !important
+}
+.flashmsg.info {
+    background: #b3e1e4;
+    background: -webkit-linear-gradient(top, #d2ecea, #b3e1e4);
+    background:    -moz-linear-gradient(top, #d2ecea, #b3e1e4);
+    background:         linear-gradient(top, #d2ecea, #b3e1e4);
+    color: #147880 !important;
+}
+.flashmsg.warning {
+    background: #edc58c;
+    background: -webkit-linear-gradient(top, #e8d1af, #edc58c);
+    background:    -moz-linear-gradient(top, #f0ad4e, #f0ad4e);
+    background:         linear-gradient(top, #f0ad4e, #f0ad4e);
+    color: #8c5a13 !important;
+}
+.flashmsg.success {
+    background: #a1e9a1;
+    background: -webkit-linear-gradient(top, #cde9cd, #a1e9a1);
+    background:    -moz-linear-gradient(top, #cde9cd, #a1e9a1);
+    background:         linear-gradient(top, #cde9cd, #a1e9a1);
+    color: #2c752c !important;
+}
+.flashmsg.show {
+    opacity: 1;
+    pointer-events: auto;
+    -webkit-transform: translateY(0%);
+       -moz-transform: translateY(0%);
+        -ms-transform: translateY(0%);
+         -o-transform: translateY(0%);
+            transform: translateY(0%);
+}
+
+input[type=submit] {
+    border-radius: 3px;
+    border: 2px solid #00acc1;
+    color: #00acc1;
+    background-color: transparent;
+    padding: 4px;
+    margin-right: 4px
+}
+input[type=submit]:hover {
+    border: 2px solid rgba(0, 172, 193, .6);
+    color: rgba(0, 172, 193, .6)
+}
+input[type=submit]:active {
+    border: 2px solid #0097a7;
+    color: #0097a7;
+    box-shadow: inset 0 3px 4px rgba(0, 0, 0, .2)
+}
+input[type=submit]:focus {
+    outline: 0
+}
+#regform .forminfo {
+    padding: 5px 10px;
+    color: #666
+}
+#regform .forminfo h3 {
+    font-size: 18px;
+    margin: 0 0 7px;
+    font-weight: 700
+}
+#regform .forminfo p {
+    margin: 4px 0
+}
+#punuserlist .blocktable {
+    margin: 0
+}
+#punuserlist .blocktable table thead .tc2,
+#punuserlist .blocktable table thead .tc3,
+#punuserlist .blocktable table thead .tcl,
+#punuserlist .blocktable table thead .tcr {
+    width: 25%
+}
+#punuserlist .pagelink {
+    overflow: auto;
+    margin: 10px 0;
+    padding: 10px 0 10px 1px
+}
+#punuserlist .pagelink a,
+#punuserlist .pagelink span,
+#punuserlist .pagelink strong {
+    position: relative;
+    float: left;
+    margin: 0 0 0 -1px;
+    padding: 6px 12px;
+    border: 1px solid #ddd;
+    background-color: #fff
+}
+#punuserlist .pagelink a:hover,
+#punuserlist .pagelink span:hover,
+#punuserlist .pagelink strong:hover {
+    text-decoration: none;
+    background-color: #fafafa
+}
+#punuserlist .pagelink .spacer {
+    background-color: #fafafa;
+    cursor: default;
+    color: #d3d3d3
+}
+#punuserlist .pagelink .spacer:hover {
+    background-color: #fafafa
+}
+#punuserlist .pagelink strong {
+    font-weight: 400;
+    background-color: #fafafa;
+    cursor: default
+}
+@font-face {
+    font-family: bebas_neueregular;
+    src: url(fonts/BebasNeue-webfont.eot);
+    src: url(fonts/BebasNeue-webfont.eot?#iefix)format("embedded-opentype"), url(fonts/BebasNeue-webfont.woff)format("woff"), url(fonts/BebasNeue-webfont.ttf)format("truetype"), url(fonts/BebasNeue-webfont.svg#bebas_neueregular)format("svg");
+    font-weight: 400;
+    font-style: normal
+}
+code {
+    padding: 15px!important;
+}
+img {
+    max-width: 100%;
+    height: auto
+}
+.blockpost .box .postright p {
+    padding: 7px 0
+}
+.blockpost .box .postright pre {
+    margin: 0
+}
+.blockpost .box .postright code {
+    padding: 15px!important;
+    background-color: #272822
+}
+.blockpost .box .postright acronym {
+    cursor: help;
+    border-bottom: 1px dotted #777
+}
+.blockpost .box .postright .bbu {
+    text-decoration: underline
+}
+.blockpost .box .postright .bbs {
+    text-decoration: line-through
+}
+.blockpost .box .postright h5 {
+    font-size: 1.25rem;
+    margin: 15px 0;
+    color: #333
+}
+.blockpost .box .postright .codebox {
+    word-wrap: normal;
+    margin-bottom: 15px
+}
+.blockpost .box .postright .codebox .vscroll {
+    height: 32em;
+    overflow: auto
+}
+.blockpost .box .postright .quotebox {
+    border: 1px solid #00BCD4;
+    border-left: 3px solid #00BCD4;
+    background-color: #fafdff;
+    padding: 5px 10px;
+    margin: 10px 20px
+}
+.blockpost .box .postright .quotebox cite {
+    font-weight: 700;
+    color: #357082
+}
+.blockpost .box .postright .quotebox blockquote {
+    margin: 0
+}
+.container {
+    width: 100%
+}
+@media only screen and (min-width: 768px) {
+    .container {
+        margin: 0 auto;
+        padding: 0 15px
+    }
+}
+@media only screen and (min-width: 768px)and (max-width: 991px) {
+    .container {
+        width: 750px
+    }
+}
+@media only screen and (min-width: 992px)and (max-width: 1199px) {
+    .container {
+        width: 970px
+    }
+}
+@media only screen and (min-width: 1200px) {
+    .container {
+        width: 1075px
+    }
+}
+@media only screen and (max-width: 768px) {
+    body {
+        padding-top: 0
+    }
+    .phone-menu {
+        position: relative;
+        display: block;
+        width: 55px;
+        height: 55px;
+        cursor: pointer
+    }
+    .phone-menu .button-phone:after {
+        content: "";
+        display: block;
+        position: absolute;
+        top: 11px;
+        left: 16.25px;
+        width: 22.5px;
+        height: 0;
+        box-shadow: 0 10px 0 1px #fff, 0 16px 0 1px #fff, 0 22px 0 1px #fff
+    }
+    nav {
+        position: static;
+        line-height: normal;
+        height: 100%
+    }
+    #phone {
+        display: none;
+        border-top: 1px solid rgba(255, 255, 255, .3);
+        background-color: #29b6f6
+    }
+    #phone ul {
+        margin: 0;
+        float: none
+    }
+    #phone .navbar-right {
+        padding: 8px;
+        float: none
+    }
+    #phone .navbar-right input {
+        margin: auto;
+        display: block
+    }
+    #phone li {
+        display: block;
+        font-size: 14px;
+        padding: 0;
+        border-bottom: 1px solid rgba(255, 255, 255, .3)
+    }
+    #phone li a {
+        display: block;
+        text-align: center;
+        font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+        line-height: 40px
+    }
+    #phone .isactive {
+        border: none
+    }
+}
+@media only screen and (min-width: 768px) {
+    nav .navbar-right input {
+        width: 100px
+    }
+}
+@media only screen and (min-width: 992px) {
+    nav .navbar-right input {
+        width: 250px
+    }
+}
+@media only screen and (max-width: 992px) {
+    .status-avatar,
+    .title-site {
+        float: none!important;
+        text-align: center
+    }
+    .status-avatar {
+        margin-top: 10px
+    }
+    .status-avatar .conl li,
+    .status-avatar .conr li {
+        text-align: center!important
+    }
+}
+@media only screen and (max-width: 768px) {
+    .blocktable .box table .tc2,
+    .blocktable .box table .tc3 {
+        display: none
+    }
+    .blocktable .box table .tcr {
+        width: 35%!important
+    }
+    .blockpost .box .postfoot .postfootright,
+    .blockpost .box .postright {
+        float: none;
+        width: 100%
+    }
+    #punsearch .blockpost h2 span:nth-child(2),
+    #punsearch .blockpost h2 span:nth-child(3),
+    .blockpost .box .postleft dl dd {
+        display: none
+    }
+    .blockpost {
+        position: relative
+    }
+    .blockpost .box .postleft {
+        float: none
+    }
+    .blockpost .box .postleft dl dt {
+        position: absolute;
+        top: 4px;
+        right: 7px
+    }
+    .blockpost .box .postleft dl dt span {
+        color: #fff
+    }
+    .blockpost .box .postfoot .postfootleft {
+        float: none;
+        display: none
+    }
+    .blockpost .box .postfoot .postfootright ul {
+        visibility: visible
+    }
+    .blockmenu {
+        float: none!important;
+        width: 100%!important;
+        text-align: center
+    }
+    .blockform {
+        width: 100%!important;
+        margin: 0!important
+    }
+    .blockform label input {
+        width: 80%!important
+    }
+    .blockform label input[type=checkbox] {
+        width: 7%!important
+    }
+    .blockform textarea {
+        width: 100%
+    }
+    #brdstats .conl,
+    #brdstats .conr {
+        text-align: center;
+        display: block;
+        width: 100%
+    }
+    #brdstats .clearb,
+    #brdstats .clearer {
+        clear: none
+    }
+}
+#changelog h2 {
+    border: 1px solid #d8d8d8;
+    border-bottom: none;
+    padding: 5px;
+    margin: 0;
+    text-indent: 10px;
+    font-weight: 400;
+    font-size: 18px;
+    background-color: #f5f5f5;
+    border-radius: 3px 3px 0 0
+}
+#changelog .box {
+    border: 1px solid #d8d8d8;
+    border-radius: 0 0 3px 3px;
+    background-color: #fff
+}
+#changelog .box .change {
+    margin: 10px;
+    border-bottom: 2px solid #d8d8d8
+}
+#changelog .box .change:last-child {
+    border-bottom: none
+}
+#changelog .box .change h3 {
+    margin: 10px 10px 0;
+    font-size: 16px;
+    font-weight: 400
+}
+#changelog .box .change p {
+    font-size: 14px;
+    margin: 5px 10px 10px
+}
+#changelog .box .change li {
+    margin: 10px
+}
+
+#modcontrols.inbox {
+    font-size: 14px;
+    text-align: center;
+}
+#modcontrols.inbox dl dt {
+    margin-bottom: 5px;
+}
+
+#modcontrols.inbox dl dd {
+    display: inline;
+    margin-left: 0;
+    padding: 5px;
+}
+
+#debugtime {
+    margin-bottom: 10px;
+    text-align: center;
+}
+
+#debug.blocktable div.box div.inbox table {
+	table-layout: auto;
+}
+#debug.blocktable .box table tbody tr .tcl {
+    width: 20%;
+}
+#debug.blocktable .box table tbody tr .tcr {
+    width: 80%;
+}
+
+#searchform #search.multiselect {
+    float: left;
+    padding-bottom: 7px;
+}
+
+#profile.block2col div.blockform div.box form#profile1 div.inform fieldset div.infldset label,
+#profile.block2col div.blockform div.box form#profile2 div.inform fieldset div.infldset label,
+#profile.block2col div.blockform div.box form#profile3 div.inform fieldset div.infldset label,
+#profile.block2col div.blockform div.box form#profile5 div.inform fieldset div.infldset div.rbox label,
+#profile.block2col div.blockform div.box form#profile6 div.inform fieldset div.infldset div.rbox label,
+#profile.block2col div.blockform div.box form#profile7 div.inform fieldset div.infldset div.conl div.rbox label,
+#quickpost.blockform div.box form#quickpostform div.inform fieldset div.infldset.txtarea label,
+#postform.blockform div.box form#post div.inform fieldset div.infldset.txtarea label.required,
+#editform.blockform div.box form#edit div.inform fieldset div.infldset.txtarea label.required,
+#editform.blockform div.box form#edit div.inform fieldset div.infldset div.rbox label,
+#regform.blockform div.box form#register div.inform fieldset div.infldset div.rbox label{
+	display: block;
+}
+#redir {
+    text-align: center;
+}
+#vf.blocktable div.box div.inbox table tbody tr td.tcl div.tclcon {
+    margin-top: 7px;
+}
+#searchform.blockform div.box form#search div.inform fieldset div.infldset div.conl.multiselect {
+	display: inline-block;
+	float: left;
+}
+#searchform.blockform div.box form#search div.inform fieldset div.infldset label.conl {
+	padding: 5px;
+}
+#searchform.blockform div.box form#search div.inform fieldset div.infldset p.clearl {
+    margin-top: 100px;
+}
+#searchform.blockform div.box form#search div.inform fieldset div.infldset label.conl {
+    margin-top: -2px;
+}
+#searchform.blockform div.box form#search div.inform fieldset div.infldset label.conl select#search_in {
+    margin-top: 7px;
+}
+body #puninstall {
+    padding-bottom: 60px;
+}
+#puninstall .blockform .box .inform fieldset {
+	margin-top: 15px;
+}
+#puninstall h3 {
+	font-size: 22px;
+	text-align: center;
+}
+.forminfo p, #install p.buttons, html body div#puninstall.pun div.punwrap section.container div#brdheader.block div.box div#brdtitle.inbox {
+	text-align: center;
+}
+#install p.buttons {
+	font-size: 22px;
+}
+#puninstall .blockform .box .inform fieldset label {
+	display: block;
+}
+#puninstall .blockform .box .inform fieldset legend {
+	margin-bottom: 0;
+}
+#puninstall.pun div.punwrap section.container div#brdmain div.blockform div.box form#install div.inform fieldset div.infldset p{
+	margin-bottom: 12px;
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+td,
+th {
+  padding: 0;
+}
+table {
+  background-color: transparent;
+}
+caption {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  color: #777777;
+  text-align: left;
+}
+th {
+  text-align: left;
+}
+.table {
+  width: 100%;
+  max-width: 100%;
+  margin-bottom: 20px;
+}
+.table > thead > tr > th,
+.table > tbody > tr > th,
+.table > tfoot > tr > th,
+.table > thead > tr > td,
+.table > tbody > tr > td,
+.table > tfoot > tr > td {
+  padding: 8px;
+  line-height: 1.42857143;
+  vertical-align: top;
+  border-top: 1px solid #dddddd;
+}
+.table > thead > tr > th {
+  vertical-align: bottom;
+  border-bottom: 2px solid #dddddd;
+}
+.table > caption + thead > tr:first-child > th,
+.table > colgroup + thead > tr:first-child > th,
+.table > thead:first-child > tr:first-child > th,
+.table > caption + thead > tr:first-child > td,
+.table > colgroup + thead > tr:first-child > td,
+.table > thead:first-child > tr:first-child > td {
+  border-top: 0;
+}
+.table > thead > tr > td.active,
+.table > tbody > tr > td.active,
+.table > tfoot > tr > td.active,
+.table > thead > tr > th.active,
+.table > tbody > tr > th.active,
+.table > tfoot > tr > th.active,
+.table > thead > tr.active > td,
+.table > tbody > tr.active > td,
+.table > tfoot > tr.active > td,
+.table > thead > tr.active > th,
+.table > tbody > tr.active > th,
+.table > tfoot > tr.active > th {
+  background-color: #f5f5f5;
+}
diff --git a/style/themes/MyFeatherBB/view/admin/bans/add_ban.php b/style/themes/MyFeatherBB/view/admin/bans/add_ban.php
new file mode 100644
index 00000000..1bda2c69
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/bans/add_ban.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+	exit;
+}
+?>
+
+<div class="blockform">
+	<h2><span><?php _e('Ban advanced head') ?></span></h2>
+	<div class="box">
+		<form id="bans2" method="post" action="">
+			<div class="inform">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<input type="hidden" name="mode" value="<?php echo $ban['mode'] ?>" />
+				<?php if ($ban['mode'] == 'edit'): ?>				<input type="hidden" name="ban_id" value="<?php echo $ban['id'] ?>" />
+				<?php endif; ?>
+				<?php if ($ban['mode'] == 'add' && isset($ban['user_id'])): ?><input type="hidden" name="ban_user_id" value="<?php echo $ban['user_id'] ?>" />
+				<?php endif; ?><fieldset>
+					<legend><?php _e('Ban advanced subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Username label') ?></th>
+								<td>
+									<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
+										echo $feather->utils->escape($ban['ban_user']);
+									} ?>" tabindex="1" />
+									<span><?php _e('Username help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('IP label') ?></th>
+								<td>
+									<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
+										echo $feather->utils->escape($ban['ip']);
+									} ?>" tabindex="2" />
+										<span><?php _e('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
+												printf(' '.__('IP help link'), '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.__('here').'</a>');
+											} ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('E-mail label') ?></th>
+								<td>
+									<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
+										echo $feather->utils->escape($ban['email']);
+									} ?>" tabindex="3" />
+									<span><?php _e('E-mail help') ?></span>
+								</td>
+							</tr>
+						</table>
+						<p class="topspace"><strong class="warntext"><?php _e('Ban IP range info') ?></strong></p>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Message expiry subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Ban message label') ?></th>
+								<td>
+									<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
+										echo $feather->utils->escape($ban['message']);
+									} ?>" tabindex="4" />
+									<span><?php _e('Ban message help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Expire date label') ?></th>
+								<td>
+									<input type="text" name="ban_expire" size="17" maxlength="10" value="<?php if (isset($ban['expire'])) {
+										echo $ban['expire'];
+									} ?>" tabindex="5" />
+									<span><?php _e('Expire date help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php _e('Save') ?>" tabindex="6" /></p>
+		</form>
+	</div>
+</div>
+<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/bans/admin_bans.php b/style/themes/MyFeatherBB/view/admin/bans/admin_bans.php
new file mode 100644
index 00000000..14b13968
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/bans/admin_bans.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('New ban head') ?></span></h2>
+		<div class="box">
+			<form id="bans" method="post" action="<?php echo $feather->url->get('admin/bans/add/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Add ban subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Username label') ?><div><input type="submit" name="add_ban" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
+									<td>
+										<input type="text" name="new_ban_user" size="25" maxlength="25" tabindex="1" />
+										<span><?php _e('Username advanced help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+
+		<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
+		<div class="box">
+			<form id="find_bans" method="get" action="<?php echo $feather->url->get('admin/bans/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Ban search subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Ban search info') ?></p>
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Username label') ?></th>
+									<td><input type="text" name="username" size="30" maxlength="25" tabindex="4" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('IP label') ?></th>
+									<td><input type="text" name="ip" size="30" maxlength="255" tabindex="5" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('E-mail label') ?></th>
+									<td><input type="text" name="email" size="30" maxlength="80" tabindex="6" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Message label') ?></th>
+									<td><input type="text" name="message" size="30" maxlength="255" tabindex="7" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Expire after label') ?></th>
+									<td><input type="text" name="expire_after" size="10" maxlength="10" tabindex="8" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Expire before label') ?></th>
+									<td><input type="text" name="expire_before" size="10" maxlength="10" tabindex="9" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Order by label') ?></th>
+									<td>
+										<select name="order_by" tabindex="10">
+											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
+											<option value="ip"><?php _e('Order by ip') ?></option>
+											<option value="email"><?php _e('Order by e-mail') ?></option>
+											<option value="expire"><?php _e('Order by expire') ?></option>
+										</select>
+                                        &#160;&#160;&#160;
+                                        <select name="direction" tabindex="11">
+											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
+											<option value="DESC"><?php _e('Descending') ?></option>
+										</select>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="12" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/bans/search_ban.php b/style/themes/MyFeatherBB/view/admin/bans/search_ban.php
new file mode 100644
index 00000000..356a0baa
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/bans/search_ban.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+
+<div id="bans1" class="blocktable">
+	<h2><span><?php _e('Results head') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results IP address head') ?></th>
+					<th class="tc4" scope="col"><?php _e('Results expire head') ?></th>
+					<th class="tc5" scope="col"><?php _e('Results message head') ?></th>
+					<th class="tc6" scope="col"><?php _e('Results banned by head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+
+        foreach ($ban_data as $cur_ban) {
+            ?>
+				<tr>
+					<td class="tcl"><?php echo($cur_ban['username'] != '') ? $feather->utils->escape($cur_ban['username']) : '&#160;' ?></td>
+					<td class="tc2"><?php echo($cur_ban['email'] != '') ? $feather->utils->escape($cur_ban['email']) : '&#160;' ?></td>
+					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? $feather->utils->escape($cur_ban['ip']) : '&#160;' ?></td>
+					<td class="tc4"><?php echo $feather->utils->format_time($cur_ban['expire'], true) ?></td>
+					<td class="tc5"><?php echo($cur_ban['message'] != '') ? $feather->utils->escape($cur_ban['message']) : '&#160;' ?></td>
+					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.$feather->utils->escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
+				</tr>
+<?php
+
+        }
+        if (empty($ban_data)) {
+            echo "\t\t\t\t".'<tr><td class="tcl" colspan="7">'.__('No match').'</td></tr>'."\n";
+        }
+
+?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+        <ul class="crumbs">
+            <li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+            <li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+            <li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+        </ul>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/categories.php b/style/themes/MyFeatherBB/view/admin/categories.php
new file mode 100644
index 00000000..3a2057b7
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/categories.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+	<div class="blockform">
+		<h2><span><?php _e('Add categories head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/categories/add/') ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Add categories subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Add category label') ?><div><input type="submit" value="<?php _e('Add new submit') ?>" tabindex="2" /></div></th>
+									<td>
+										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
+										<span><?php printf(__('Add category help'), '<a href="'.$feather->url->get('admin/forums').'">'.__('Forums').'</a>') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+
+<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/categories/delete') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Delete categories subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Delete category label') ?><div><input type="submit" value="<?php _e('Delete') ?>" tabindex="4" /></div></th>
+									<td>
+										<select name="cat_to_delete" tabindex="3">
+<?php
+
+    foreach ($cat_list as $cur_cat) {
+        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.$feather->utils->escape($cur_cat['cat_name']).'</option>'."\n";
+    }
+
+?>
+										</select>
+										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php _e('Delete category disclaimer') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+<?php endif; ?>
+
+<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/categories/edit/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Edit categories subhead') ?></legend>
+						<div class="infldset">
+							<table id="categoryedit">
+							<thead>
+								<tr>
+									<th class="tcl" scope="col"><?php _e('Category name label') ?></th>
+									<th scope="col"><?php _e('Category position label') ?></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+
+    foreach ($cat_list as $cur_cat) {
+        ?>
+								<tr>
+									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo $feather->utils->escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
+									<td><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][order]" value="<?php echo $cur_cat['disp_position'] ?>" size="3" maxlength="3" /></td>
+								</tr>
+<?php
+
+    }
+
+?>
+							</tbody>
+							</table>
+							<div class="fsetsubmit"><input type="submit" value="<?php _e('Update') ?>" /></div>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+<?php endif; ?>	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/censoring.php b/style/themes/MyFeatherBB/view/admin/censoring.php
new file mode 100644
index 00000000..54a063a6
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/censoring.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Censoring head') ?></span></h2>
+		<div class="box">
+			<form id="censoring" method="post" action="<?php echo $feather->url->get('admin/censoring/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Add word subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
+							<table>
+							<thead>
+								<tr>
+									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
+									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
+									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
+								</tr>
+							</thead>
+							<tbody>
+								<tr>
+									<td class="tcl"><input type="text" name="new_search_for" size="24" maxlength="60" tabindex="1" /></td>
+									<td class="tc2"><input type="text" name="new_replace_with" size="24" maxlength="60" tabindex="2" /></td>
+									<td><input type="submit" name="add_word" value="<?php _e('Add') ?>" tabindex="3" /></td>
+								</tr>
+							</tbody>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Edit remove subhead') ?></legend>
+						<div class="infldset">
+<?php
+if (!empty($word_data)) {
+    ?>
+							<table>
+							<thead>
+								<tr>
+									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
+									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
+									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+
+    foreach ($word_data as $word) {
+        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.$feather->utils->escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.$feather->utils->escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
+    }
+
+    ?>
+							</tbody>
+							</table>
+<?php
+
+} else {
+    echo "\t\t\t\t\t\t\t".'<p>'.__('No words in list').'</p>'."\n";
+}
+
+?>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/forums/admin_forums.php b/style/themes/MyFeatherBB/view/admin/forums/admin_forums.php
new file mode 100644
index 00000000..abcd2bf7
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/forums/admin_forums.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Add forum head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/forums/add') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<?php
+if (!empty($cat_list)) {
+    ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Create new subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Add forum label') ?><div><input type="submit" value="<?php _e('Add forum') ?>" tabindex="2" /></div></th>
+									<td>
+										<select name="cat" tabindex="1">
+											<?php  foreach ($cat_list as $cat) {
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.$feather->utils->escape($cat['cat_name']).'</option>'."\n";
+											} ?>
+										</select>
+										<span><?php _e('Add forum help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+} else {
+    ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('None') ?></legend>
+						<div class="infldset">
+							<p><?php _e('No categories exist') ?></p>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+}
+
+?>
+			</form>
+		</div>
+<?php
+if (!empty($forum_data)) {
+    ?>
+		<h2 class="block2"><span><?php _e('Manage forums head') ?></span></h2>
+		<div class="box">
+			<form id="edforum" method="post" action="<?php echo $feather->url->get('admin/forums/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
+<?php
+    foreach ($forum_data as $cat_id => $cat_data) {
+            ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Category subhead') ?> <?php echo $feather->utils->escape($cat_data['cat_name']) ?></legend>
+						<div class="infldset">
+							<table>
+							<thead>
+								<tr>
+									<th class="tcl"><?php _e('Action') ?></th>
+									<th class="tc2"><?php _e('Position label') ?></th>
+									<th class="tcr"><?php _e('Forum label') ?></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+	foreach ($cat_data['cat_forums'] as $forum) {
+        ?>
+								<tr>
+									<td class="tcl"><a href="<?php echo $feather->url->get('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
+									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
+									<td class="tcr"><strong><?php echo $feather->utils->escape($forum['forum_name']) ?></strong></td>
+								</tr>
+<?php
+    }
+    ?>
+							</tbody>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
+	}
+?>
+				<p class="submitend"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
+<?php
+	}
+?>
diff --git a/style/themes/MyFeatherBB/view/admin/forums/delete_forum.php b/style/themes/MyFeatherBB/view/admin/forums/delete_forum.php
new file mode 100644
index 00000000..4a2df3f1
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/forums/delete_forum.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Confirm delete head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Confirm delete subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Confirm delete info'), $cur_forum['forum_name']) ?></p>
+							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="del_forum_comply" value="<?php _e('Delete') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/forums/permissions.php b/style/themes/MyFeatherBB/view/admin/forums/permissions.php
new file mode 100644
index 00000000..8368cfa9
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/forums/permissions.php
@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Edit forum head') ?></span></h2>
+		<div class="box">
+			<form id="edit_forum" method="post" action="<?php echo $feather->url->get('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Edit details subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Forum name label') ?></th>
+									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo $feather->utils->escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Forum description label') ?></th>
+									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo $feather->utils->escape($cur_forum['forum_desc']) ?></textarea></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Category label') ?></th>
+									<td>
+										<select name="cat_id" tabindex="3">
+											<?php  foreach ($forum_data as $cat_id => $cat_data) {
+												$selected = ($cat_id == $cur_forum['cat_id']) ? 'selected="selected"' : '';
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.$feather->utils->escape($cat_data['cat_name']).'</option>'."\n";
+											} ?>
+										</select>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Sort by label') ?></th>
+									<td>
+										<select name="sort_by" tabindex="4">
+											<option value="0"<?php if ($cur_forum['sort_by'] == '0') {
+    echo ' selected="selected"';
+} ?>><?php _e('Last post') ?></option>
+											<option value="1"<?php if ($cur_forum['sort_by'] == '1') {
+    echo ' selected="selected"';
+} ?>><?php _e('Topic start') ?></option>
+											<option value="2"<?php if ($cur_forum['sort_by'] == '2') {
+    echo ' selected="selected"';
+} ?>><?php _e('Subject') ?></option>
+										</select>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Redirect label') ?></th>
+									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.$feather->utils->escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Group permissions subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Group permissions info'), '<a href="admin_groups.php">'.__('User groups').'</a>') ?></p>
+							<table id="forumperms">
+							<thead>
+								<tr>
+									<th class="atcl">&#160;</th>
+									<th><?php _e('Read forum label') ?></th>
+									<th><?php _e('Post replies label') ?></th>
+									<th><?php _e('Post topics label') ?></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+    foreach ($perm_data as $perm) {
+        ?>
+								<tr>
+									<th class="atcl"><?php echo $feather->utils->escape($perm['g_title']) ?></th>
+									<td<?php if (!$perm['read_forum_def']) {
+    echo ' class="nodefault"';
+}
+        ?>>
+										<input type="hidden" name="read_forum_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['read_forum']) ? '1' : '0';
+        ?>" />
+										<input type="checkbox" name="read_forum_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['read_forum']) ? ' checked="checked"' : '';
+        ?><?php echo($perm['g_read_board'] == '0') ? ' disabled="disabled"' : '';
+        ?> tabindex="<?php echo $cur_index++ ?>" />
+									</td>
+									<td<?php if (!$perm['post_replies_def'] && $cur_forum['redirect_url'] == '') {
+    echo ' class="nodefault"';
+}
+        ?>>
+										<input type="hidden" name="post_replies_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['post_replies']) ? '1' : '0';
+        ?>" />
+										<input type="checkbox" name="post_replies_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['post_replies']) ? ' checked="checked"' : '';
+        ?><?php echo($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : '';
+        ?> tabindex="<?php echo $cur_index++ ?>" />
+									</td>
+									<td<?php if (!$perm['post_topics_def'] && $cur_forum['redirect_url'] == '') {
+    echo ' class="nodefault"';
+}
+        ?>>
+										<input type="hidden" name="post_topics_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['post_topics']) ? '1' : '0';
+        ?>" />
+										<input type="checkbox" name="post_topics_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['post_topics']) ? ' checked="checked"' : '';
+        ?><?php echo($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : '';
+        ?> tabindex="<?php echo $cur_index++ ?>" />
+									</td>
+								</tr>
+<?php
+
+    }
+
+?>
+							</tbody>
+							</table>
+							<div class="fsetsubmit"><input type="submit" name="revert_perms" value="<?php _e('Revert to default') ?>" tabindex="<?php echo $cur_index++ ?>" /></div>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/groups/add_edit_group.php b/style/themes/MyFeatherBB/view/admin/groups/add_edit_group.php
new file mode 100644
index 00000000..f09d4255
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/groups/add_edit_group.php
@@ -0,0 +1,311 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Group settings head') ?></span></h2>
+		<div class="box">
+			<form id="groups2" method="post" action="" onsubmit="return process_form(this)">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" /></p>
+				<div class="inform">
+					<input type="hidden" name="mode" value="<?php echo $group['mode'] ?>" />
+<?php if ($group['mode'] == 'edit'): ?>					<input type="hidden" name="group_id" value="<?php echo $id ?>" />
+<?php endif; ?><?php if ($group['mode'] == 'add'): ?>					<input type="hidden" name="base_group" value="<?php echo $group['base_group'] ?>" />
+<?php endif; ?>					<fieldset>
+						<legend><?php _e('Group settings subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Group settings info') ?></p>
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Group title label') ?></th>
+									<td>
+										<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
+    echo $feather->utils->escape($group['info']['g_title']);
+} ?>" tabindex="1" />
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('User title label') ?></th>
+									<td>
+										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo $feather->utils->escape($group['info']['g_user_title']) ?>" tabindex="2" />
+										<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('Promote users label') ?></th>
+									<td>
+										<select name="promote_next_group" tabindex="3">
+											<option value="0"><?php _e('Disable promotion') ?></option>
+											<?php echo $group_list ?>
+										</select>
+										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo $feather->utils->escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
+										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
+									</td>
+								</tr>
+<?php if ($group['mode'] != 'edit' || $feather->forum_settings['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
+									<th scope="row"> <?php _e('Mod privileges label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="5" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="moderator" value="0"<?php if ($group['info']['g_moderator'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="6" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Mod privileges help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Edit profile label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_edit_users" value="1"<?php if ($group['info']['g_mod_edit_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="7" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_edit_users" value="0"<?php if ($group['info']['g_mod_edit_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="8" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Edit profile help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Rename users label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_rename_users" value="1"<?php if ($group['info']['g_mod_rename_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="9" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_rename_users" value="0"<?php if ($group['info']['g_mod_rename_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="10" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Rename users help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Change passwords label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_change_passwords" value="1"<?php if ($group['info']['g_mod_change_passwords'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="11" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_change_passwords" value="0"<?php if ($group['info']['g_mod_change_passwords'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="12" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Change passwords help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Mod promote users label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_promote_users" value="1"<?php if ($group['info']['g_mod_promote_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="13" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_promote_users" value="0"<?php if ($group['info']['g_mod_promote_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="14" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Mod promote users help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Ban users label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_ban_users" value="1"<?php if ($group['info']['g_mod_ban_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="15" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_ban_users" value="0"<?php if ($group['info']['g_mod_ban_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="16" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Ban users help') ?></span>
+									</td>
+								</tr>
+<?php endif; endif; ?>								<tr>
+									<th scope="row"><?php _e('Read board label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="read_board" value="1"<?php if ($group['info']['g_read_board'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="17" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="read_board" value="0"<?php if ($group['info']['g_read_board'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="18" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Read board help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('View user info label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="view_users" value="1"<?php if ($group['info']['g_view_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="19" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="view_users" value="0"<?php if ($group['info']['g_view_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="20" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('View user info help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Post replies label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="post_replies" value="1"<?php if ($group['info']['g_post_replies'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="21" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="post_replies" value="0"<?php if ($group['info']['g_post_replies'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="22" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post replies help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Post topics label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="post_topics" value="1"<?php if ($group['info']['g_post_topics'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="23" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="post_topics" value="0"<?php if ($group['info']['g_post_topics'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="24" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post topics help') ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('Edit posts label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="edit_posts" value="1"<?php if ($group['info']['g_edit_posts'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="25" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="edit_posts" value="0"<?php if ($group['info']['g_edit_posts'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="26" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Edit posts help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Delete posts label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="delete_posts" value="1"<?php if ($group['info']['g_delete_posts'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="27" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="delete_posts" value="0"<?php if ($group['info']['g_delete_posts'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="28" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Delete posts help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Delete topics label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="delete_topics" value="1"<?php if ($group['info']['g_delete_topics'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="29" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="delete_topics" value="0"<?php if ($group['info']['g_delete_topics'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="30" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Delete topics help') ?></span>
+									</td>
+								</tr>
+<?php endif; ?>								<tr>
+									<th scope="row"><?php _e('Post links label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="post_links" value="1"<?php if ($group['info']['g_post_links'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="31" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="post_links" value="0"<?php if ($group['info']['g_post_links'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="32" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post links help') ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('Set own title label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="set_title" value="1"<?php if ($group['info']['g_set_title'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="33" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="set_title" value="0"<?php if ($group['info']['g_set_title'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="34" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Set own title help') ?></span>
+									</td>
+								</tr>
+<?php endif; ?>								<tr>
+									<th scope="row"><?php _e('User search label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="search" value="1"<?php if ($group['info']['g_search'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="35" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="search" value="0"<?php if ($group['info']['g_search'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="36" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('User search help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('User list search label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="search_users" value="1"<?php if ($group['info']['g_search_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="37" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="search_users" value="0"<?php if ($group['info']['g_search_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="38" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('User list search help') ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('Send e-mails label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="send_email" value="1"<?php if ($group['info']['g_send_email'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="39" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="send_email" value="0"<?php if ($group['info']['g_send_email'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="40" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Send e-mails help') ?></span>
+									</td>
+								</tr>
+<?php endif; ?>								<tr>
+									<th scope="row"><?php _e('Post flood label') ?></th>
+									<td>
+										<input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_post_flood'] ?>" tabindex="41" />
+										<span><?php _e('Post flood help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Search flood label') ?></th>
+									<td>
+										<input type="text" name="search_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_search_flood'] ?>" tabindex="42" />
+										<span><?php _e('Search flood help') ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('E-mail flood label') ?></th>
+									<td>
+										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_email_flood'] ?>" tabindex="43" />
+										<span><?php _e('E-mail flood help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Report flood label') ?></th>
+									<td>
+										<input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_report_flood'] ?>" tabindex="44" />
+										<span><?php _e('Report flood help') ?></span>
+									</td>
+								</tr>
+<?php endif; endif; ?>							</table>
+<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php _e('Moderator info') ?></p>
+<?php endif; ?>						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" tabindex="45" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/groups/admin_groups.php b/style/themes/MyFeatherBB/view/admin/groups/admin_groups.php
new file mode 100644
index 00000000..6d43231a
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/groups/admin_groups.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Add groups head') ?></span></h2>
+		<div class="box">
+				<div class="inform">
+					<fieldset>
+                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/add/') ?>">
+                        <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+						<legend><?php _e('Add group subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('New group label') ?><div><input type="submit" name="add_group" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
+									<td>
+										<select id="base_group" name="base_group" tabindex="1">
+<?php
+
+foreach ($groups as $cur_group) {
+    if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
+        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+        } else {
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+        }
+    }
+}
+
+?>
+										</select>
+										<span><?php _e('New group help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+                        </form>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/') ?>">
+                        	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+						<legend><?php _e('Default group subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Default group label') ?><div><input type="submit" name="set_default_group" value="<?php _e('Save') ?>" tabindex="4" /></div></th>
+									<td>
+										<select id="default_group" name="default_group" tabindex="3">
+<?php
+
+foreach ($groups as $cur_group) {
+    if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
+        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+        } else {
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+        }
+    }
+}
+
+?>
+										</select>
+										<span><?php _e('Default group help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+                        </form>
+					</fieldset>
+				</div>
+		</div>
+
+		<h2 class="block2"><span><?php _e('Existing groups head') ?></span></h2>
+		<div class="box">
+			<div class="fakeform">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Edit groups subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Edit groups info') ?></p>
+							<table>
+<?php
+foreach ($groups as $cur_group) {
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.$feather->utils->escape($cur_group['g_title']).'</td></tr>'."\n";
+}
+
+?>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/groups/confirm_delete.php b/style/themes/MyFeatherBB/view/admin/groups/confirm_delete.php
new file mode 100644
index 00000000..2ea97c75
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/groups/confirm_delete.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Group delete head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+				<input type="hidden" name="group_to_delete" value="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>" />
+					<fieldset>
+						<legend><?php _e('Confirm delete subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Confirm delete info'), $feather->utils->escape($group_title)) ?></p>
+							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="del_group_comply" value="<?php _e('Delete') ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/groups/delete_group.php b/style/themes/MyFeatherBB/view/admin/groups/delete_group.php
new file mode 100644
index 00000000..be55e2a4
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/groups/delete_group.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Delete group head') ?></span></h2>
+		<div class="box">
+			<form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Move users subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Move users info'), $feather->utils->escape($group_info['title']), $feather->utils->forum_number_format($group_info['members'])) ?></p>
+							<label><?php _e('Move users label') ?>
+							<select name="move_to_group">
+								<?= $group_list_delete; ?>
+							</select>
+							<br /></label>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="del_group" value="<?php _e('Delete group') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
diff --git a/style/themes/MyFeatherBB/view/admin/index.php b/style/themes/MyFeatherBB/view/admin/index.php
new file mode 100644
index 00000000..4dcbbbbb
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/index.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="block">
+		<h2><span><?php _e('Forum admin head') ?></span></h2>
+		<div id="adintro" class="box">
+			<div class="inbox">
+				<p><?php _e('Welcome to admin') ?></p>
+				<ul>
+					<li><span><?php _e('Welcome 1') ?></span></li>
+					<li><span><?php _e('Welcome 2') ?></span></li>
+					<li><span><?php _e('Welcome 3') ?></span></li>
+					<li><span><?php _e('Welcome 4') ?></span></li>
+					<li><span><?php _e('Welcome 5') ?></span></li>
+					<li><span><?php _e('Welcome 6') ?></span></li>
+					<li><span><?php _e('Welcome 7') ?></span></li>
+					<li><span><?php _e('Welcome 8') ?></span></li>
+					<li><span><?php _e('Welcome 9') ?></span></li>
+				</ul>
+			</div>
+		</div>
+
+<?php if ($install_file_exists) : ?>
+		<h2 class="block2"><span><?php _e('Alerts head') ?></span></h2>
+		<div id="adalerts" class="box">
+			<p><?php printf(__('Install file exists'), '<a href="'.$feather->url->get('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
+		</div>
+<?php endif; ?>
+
+		<h2 class="block2"><span><?php _e('About head') ?></span></h2>
+		<div id="adstats" class="box">
+			<div class="inbox">
+				<dl>
+					<dt><?php _e('FeatherBB version label') ?></dt>
+					<dd>
+						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.$feather->url->get('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
+					</dd>
+					<dt><?php _e('Server statistics label') ?></dt>
+					<dd>
+						<a href="<?php echo $feather->url->get('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
+					</dd>
+					<dt><?php _e('Support label') ?></dt>
+					<dd>
+						<a href="http://FeatherBB.org/forums/index.php"><?php _e('Forum label') ?></a> - <a href="http://gitter.im/featherbb/featherbb"><?php _e('IRC label') ?></a>
+					</dd>
+				</dl>
+			</div>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/loader.php b/style/themes/MyFeatherBB/view/admin/loader.php
new file mode 100644
index 00000000..6a61c22f
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/loader.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/maintenance/admin_maintenance.php b/style/themes/MyFeatherBB/view/admin/maintenance/admin_maintenance.php
new file mode 100644
index 00000000..0e70cca3
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/maintenance/admin_maintenance.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Maintenance head') ?></span></h2>
+		<div class="box">
+			<form method="get" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
+				<div class="inform">
+					<input type="hidden" name="action" value="rebuild" />
+					<fieldset>
+						<legend><?php _e('Rebuild index subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Rebuild index info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Posts per cycle label') ?></th>
+									<td>
+										<input type="text" name="i_per_page" size="7" maxlength="7" value="300" tabindex="1" />
+										<span><?php _e('Posts per cycle help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Starting post label') ?></th>
+									<td>
+										<input type="text" name="i_start_at" size="7" maxlength="7" value="<?php echo(isset($first_id)) ? $first_id : 0 ?>" tabindex="2" />
+										<span><?php _e('Starting post help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Empty index label') ?></th>
+									<td class="inputadmin">
+										<label><input type="checkbox" name="i_empty_index" value="1" tabindex="3" checked="checked" />&#160;&#160;<?php _e('Empty index help') ?></label>
+									</td>
+								</tr>
+							</table>
+							<p class="topspace"><?php _e('Rebuild completed info') ?></p>
+							<div class="fsetsubmit"><input type="submit" name="rebuild_index" value="<?php _e('Rebuild index') ?>" tabindex="4" /></div>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+
+			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>" onsubmit="return process_form(this)">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<input type="hidden" name="action" value="prune" />
+					<fieldset>
+						<legend><?php _e('Prune subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Days old label') ?></th>
+									<td>
+										<input type="text" name="req_prune_days" size="3" maxlength="3" tabindex="5" />
+										<span><?php _e('Days old help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Prune sticky label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="prune_sticky" value="1" tabindex="6" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="prune_sticky" value="0" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Prune sticky help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Prune from label') ?></th>
+									<td>
+										<select name="prune_from" tabindex="7">
+											<option value="all"><?php _e('All forums') ?></option>
+												<?php echo $categories; ?>
+											</optgroup>
+										</select>
+										<span><?php _e('Prune from help') ?></span>
+									</td>
+								</tr>
+							</table>
+							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php _e('Prune') ?>" tabindex="8" /></div>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/maintenance/prune.php b/style/themes/MyFeatherBB/view/admin/maintenance/prune.php
new file mode 100644
index 00000000..fa4aea34
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/maintenance/prune.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Prune head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<input type="hidden" name="action" value="prune" />
+					<input type="hidden" name="prune_days" value="<?php echo $prune['days'] ?>" />
+					<input type="hidden" name="prune_sticky" value="<?php echo $prune_sticky ?>" />
+					<input type="hidden" name="prune_from" value="<?php echo $prune_from ?>" />
+					<fieldset>
+						<legend><?php _e('Confirm prune subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], $feather->utils->forum_number_format($prune['num_topics'])) ?></p>
+							<p class="warntext"><?php _e('Confirm prune warn') ?></p>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="prune_comply" value="<?php _e('Prune') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/maintenance/rebuild.php b/style/themes/MyFeatherBB/view/admin/maintenance/rebuild.php
new file mode 100644
index 00000000..576d1ecf
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/maintenance/rebuild.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+<h1><?php _e('Rebuilding index info') ?></h1>
+<script type="text/javascript">window.location="<?= $feather->url->get('admin/maintenance/').$query_str ?>"</script>
+<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.$feather->url->get('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>
diff --git a/style/themes/MyFeatherBB/view/admin/menu.php b/style/themes/MyFeatherBB/view/admin/menu.php
new file mode 100644
index 00000000..da238ac6
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/menu.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="adminconsole" class="block2col">
+	<div id="adminmenu" class="blockmenu">
+		<h2><span><?php _e('Moderator menu') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<ul>
+					<li<?php if ($page == 'index') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Index') ?></a></li>
+					<li<?php if ($page == 'users') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+<?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+<?php endif;
+    if ($is_admin || $feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
+<?php endif;
+    ?>				</ul>
+			</div>
+		</div>
+<?php
+
+    if ($is_admin) {
+        ?>
+		<h2 class="block2"><span><?php _e('Admin menu') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<ul>
+					<li<?php if ($page == 'options') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/options/') ?>"><?php _e('Options') ?></a></li>
+					<li<?php if ($page == 'permissions') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
+					<li<?php if ($page == 'categories') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
+					<li<?php if ($page == 'forums') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
+					<li<?php if ($page == 'groups') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
+					<li<?php if ($page == 'plugins') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/plugins/') ?>"><?= 'Plugins'; ?></a></li>
+					<li<?php if ($page == 'censoring') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
+					<li<?php if ($page == 'parser') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
+					<li<?php if ($page == 'maintenance') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
+				</ul>
+			</div>
+		</div>
+<?php
+
+    }
+
+    // Did we find any plugins?
+    if (!empty($plugins)) {
+        ?>
+		<h2 class="block2"><span><?php _e('Plugins menu') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<ul>
+<?php
+
+        foreach ($plugins as $plugin_name => $plugin) {
+            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.$feather->url->get('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
+        }
+
+        ?>
+				</ul>
+			</div>
+		</div>
+<?php
+
+    }
+
+    ?>
+	</div>
diff --git a/style/themes/MyFeatherBB/view/admin/options.php b/style/themes/MyFeatherBB/view/admin/options.php
new file mode 100644
index 00000000..78ed0fa6
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/options.php
@@ -0,0 +1,840 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Options head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/options/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
+				<div class="inform">
+					<input type="hidden" name="form_sent" value="1" />
+					<fieldset>
+						<legend><?php _e('Essentials subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Board title label') ?></th>
+									<td>
+										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?>" />
+										<span><?php _e('Board title help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Board desc label') ?></th>
+									<td>
+										<textarea name="form_board_desc" cols="60" rows="3"><?php echo $feather->utils->escape($feather->forum_settings['o_board_desc']) ?></textarea>
+										<span><?php _e('Board desc help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Base URL label') ?></th>
+									<td>
+										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo $feather->utils->escape($feather->forum_settings['o_base_url']) ?>" />
+										<span><?php _e('Base URL help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Timezone label') ?></th>
+									<td>
+										<select name="form_default_timezone">
+											<option value="-12"<?php if ($feather->forum_settings['o_default_timezone'] == -12) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-12:00') ?></option>
+											<option value="-11"<?php if ($feather->forum_settings['o_default_timezone'] == -11) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-11:00') ?></option>
+											<option value="-10"<?php if ($feather->forum_settings['o_default_timezone'] == -10) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-10:00') ?></option>
+											<option value="-9.5"<?php if ($feather->forum_settings['o_default_timezone'] == -9.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-09:30') ?></option>
+											<option value="-9"<?php if ($feather->forum_settings['o_default_timezone'] == -9) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-09:00') ?></option>
+											<option value="-8.5"<?php if ($feather->forum_settings['o_default_timezone'] == -8.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-08:30') ?></option>
+											<option value="-8"<?php if ($feather->forum_settings['o_default_timezone'] == -8) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-08:00') ?></option>
+											<option value="-7"<?php if ($feather->forum_settings['o_default_timezone'] == -7) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-07:00') ?></option>
+											<option value="-6"<?php if ($feather->forum_settings['o_default_timezone'] == -6) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-06:00') ?></option>
+											<option value="-5"<?php if ($feather->forum_settings['o_default_timezone'] == -5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-05:00') ?></option>
+											<option value="-4"<?php if ($feather->forum_settings['o_default_timezone'] == -4) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-04:00') ?></option>
+											<option value="-3.5"<?php if ($feather->forum_settings['o_default_timezone'] == -3.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-03:30') ?></option>
+											<option value="-3"<?php if ($feather->forum_settings['o_default_timezone'] == -3) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-03:00') ?></option>
+											<option value="-2"<?php if ($feather->forum_settings['o_default_timezone'] == -2) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-02:00') ?></option>
+											<option value="-1"<?php if ($feather->forum_settings['o_default_timezone'] == -1) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-01:00') ?></option>
+											<option value="0"<?php if ($feather->forum_settings['o_default_timezone'] == 0) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC') ?></option>
+											<option value="1"<?php if ($feather->forum_settings['o_default_timezone'] == 1) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+01:00') ?></option>
+											<option value="2"<?php if ($feather->forum_settings['o_default_timezone'] == 2) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+02:00') ?></option>
+											<option value="3"<?php if ($feather->forum_settings['o_default_timezone'] == 3) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+03:00') ?></option>
+											<option value="3.5"<?php if ($feather->forum_settings['o_default_timezone'] == 3.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+03:30') ?></option>
+											<option value="4"<?php if ($feather->forum_settings['o_default_timezone'] == 4) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+04:00') ?></option>
+											<option value="4.5"<?php if ($feather->forum_settings['o_default_timezone'] == 4.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+04:30') ?></option>
+											<option value="5"<?php if ($feather->forum_settings['o_default_timezone'] == 5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+05:00') ?></option>
+											<option value="5.5"<?php if ($feather->forum_settings['o_default_timezone'] == 5.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+05:30') ?></option>
+											<option value="5.75"<?php if ($feather->forum_settings['o_default_timezone'] == 5.75) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+05:45') ?></option>
+											<option value="6"<?php if ($feather->forum_settings['o_default_timezone'] == 6) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+06:00') ?></option>
+											<option value="6.5"<?php if ($feather->forum_settings['o_default_timezone'] == 6.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+06:30') ?></option>
+											<option value="7"<?php if ($feather->forum_settings['o_default_timezone'] == 7) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+07:00') ?></option>
+											<option value="8"<?php if ($feather->forum_settings['o_default_timezone'] == 8) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+08:00') ?></option>
+											<option value="8.75"<?php if ($feather->forum_settings['o_default_timezone'] == 8.75) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+08:45') ?></option>
+											<option value="9"<?php if ($feather->forum_settings['o_default_timezone'] == 9) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+09:00') ?></option>
+											<option value="9.5"<?php if ($feather->forum_settings['o_default_timezone'] == 9.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+09:30') ?></option>
+											<option value="10"<?php if ($feather->forum_settings['o_default_timezone'] == 10) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+10:00') ?></option>
+											<option value="10.5"<?php if ($feather->forum_settings['o_default_timezone'] == 10.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+10:30') ?></option>
+											<option value="11"<?php if ($feather->forum_settings['o_default_timezone'] == 11) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+11:00') ?></option>
+											<option value="11.5"<?php if ($feather->forum_settings['o_default_timezone'] == 11.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+11:30') ?></option>
+											<option value="12"<?php if ($feather->forum_settings['o_default_timezone'] == 12) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+12:00') ?></option>
+											<option value="12.75"<?php if ($feather->forum_settings['o_default_timezone'] == 12.75) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+12:45') ?></option>
+											<option value="13"<?php if ($feather->forum_settings['o_default_timezone'] == 13) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+13:00') ?></option>
+											<option value="14"<?php if ($feather->forum_settings['o_default_timezone'] == 14) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+14:00') ?></option>
+										</select>
+										<span><?php _e('Timezone help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('DST label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather->forum_settings['o_default_dst'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather->forum_settings['o_default_dst'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('DST help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Language label') ?></th>
+									<td>
+										<select name="form_default_lang">
+                                            <?php echo $languages; ?>
+										</select>
+										<span><?php _e('Language help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Default style label') ?></th>
+									<td>
+										<select name="form_default_style">
+											<?php echo $styles; ?>
+										</select>
+										<span><?php _e('Default style help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+    $diff = ($feather->user->timezone + $feather->user->dst) * 3600;
+    $timestamp = time() + $diff;
+
+?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Timeouts subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Time format label') ?></th>
+									<td>
+										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo $feather->utils->escape($feather->forum_settings['o_time_format']) ?>" />
+										<span><?php printf(__('Time format help'), gmdate($feather->forum_settings['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Date format label') ?></th>
+									<td>
+										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo $feather->utils->escape($feather->forum_settings['o_date_format']) ?>" />
+										<span><?php printf(__('Date format help'), gmdate($feather->forum_settings['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Visit timeout label') ?></th>
+									<td>
+										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_visit'] ?>" />
+										<span><?php _e('Visit timeout help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Online timeout label') ?></th>
+									<td>
+										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_online'] ?>" />
+										<span><?php _e('Online timeout help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Redirect time label') ?></th>
+									<td>
+										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_redirect_delay'] ?>" />
+										<span><?php _e('Redirect time help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Display subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Version number label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather->forum_settings['o_show_version'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather->forum_settings['o_show_version'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Version number help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Info in posts label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather->forum_settings['o_show_user_info'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather->forum_settings['o_show_user_info'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Info in posts help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Post count label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather->forum_settings['o_show_post_count'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather->forum_settings['o_show_post_count'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post count help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Smilies label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather->forum_settings['o_smilies'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather->forum_settings['o_smilies'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Smilies help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Smilies sigs label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather->forum_settings['o_smilies_sig'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather->forum_settings['o_smilies_sig'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Smilies sigs help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Clickable links label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather->forum_settings['o_make_links'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather->forum_settings['o_make_links'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Clickable links help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Topic review label') ?></th>
+									<td>
+										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_topic_review'] ?>" />
+										<span><?php _e('Topic review help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Topics per page label') ?></th>
+									<td>
+										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_topics_default'] ?>" />
+										<span><?php _e('Topics per page help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Posts per page label') ?></th>
+									<td>
+										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_posts_default'] ?>" />
+										<span><?php _e('Posts per page help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Indent label') ?></th>
+									<td>
+										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_indent_num_spaces'] ?>" />
+										<span><?php _e('Indent help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Quote depth label') ?></th>
+									<td>
+										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_quote_depth'] ?>" />
+										<span><?php _e('Quote depth help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Features subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Quick post label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather->forum_settings['o_quickpost'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather->forum_settings['o_quickpost'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Quick post help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Users online label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather->forum_settings['o_users_online'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather->forum_settings['o_users_online'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Users online help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><a name="censoring"></a><?php _e('Censor words label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather->forum_settings['o_censoring'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.$feather->url->get('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><a name="signatures"></a><?php _e('Signatures label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather->forum_settings['o_signatures'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather->forum_settings['o_signatures'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Signatures help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('User has posted label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather->forum_settings['o_show_dot'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather->forum_settings['o_show_dot'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('User has posted help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Topic views label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather->forum_settings['o_topic_views'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather->forum_settings['o_topic_views'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Topic views help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Quick jump label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather->forum_settings['o_quickjump'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather->forum_settings['o_quickjump'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Quick jump help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('GZip label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather->forum_settings['o_gzip'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather->forum_settings['o_gzip'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('GZip help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Search all label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather->forum_settings['o_search_all_forums'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather->forum_settings['o_search_all_forums'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Search all help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Menu items label') ?></th>
+									<td>
+										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
+										<span><?php _e('Menu items help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Feed subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Default feed label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather->forum_settings['o_feed_type'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('None') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather->forum_settings['o_feed_type'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('RSS') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather->forum_settings['o_feed_type'] == '2') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Atom') ?></strong></label>
+										<span class="clearb"><?php _e('Default feed help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Feed TTL label') ?></th>
+									<td>
+										<select name="form_feed_ttl">
+											<option value="0"<?php if ($feather->forum_settings['o_feed_ttl'] == '0') {
+    echo ' selected="selected"';
+} ?>><?php _e('No cache') ?></option>
+											<?php echo $times ?>
+										</select>
+										<span><?php _e('Feed TTL help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Reports subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Reporting method label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather->forum_settings['o_report_method'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Internal') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather->forum_settings['o_report_method'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('By e-mail') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather->forum_settings['o_report_method'] == '2') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Both') ?></strong></label>
+										<span class="clearb"><?php _e('Reporting method help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Mailing list label') ?></th>
+									<td>
+										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_mailing_list']) ?></textarea>
+										<span><?php _e('Mailing list help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Avatars subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Use avatars label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather->forum_settings['o_avatars'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather->forum_settings['o_avatars'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Use avatars help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Upload directory label') ?></th>
+									<td>
+										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo $feather->utils->escape($feather->forum_settings['o_avatars_dir']) ?>" />
+										<span><?php _e('Upload directory help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Max width label') ?></th>
+									<td>
+										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_width'] ?>" />
+										<span><?php _e('Max width help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Max height label') ?></th>
+									<td>
+										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_height'] ?>" />
+										<span><?php _e('Max height help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Max size label') ?></th>
+									<td>
+										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
+										<span><?php _e('Max size help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('E-mail subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Admin e-mail label') ?></th>
+									<td>
+										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo $feather->utils->escape($feather->forum_settings['o_admin_email']) ?>" />
+										<span><?php _e('Admin e-mail help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
+									<td>
+										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo $feather->utils->escape($feather->forum_settings['o_webmaster_email']) ?>" />
+										<span><?php _e('Webmaster e-mail help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Forum subscriptions label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Forum subscriptions help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Topic subscriptions label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Topic subscriptions help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('SMTP address label') ?></th>
+									<td>
+										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo $feather->utils->escape($feather->forum_settings['o_smtp_host']) ?>" />
+										<span><?php _e('SMTP address help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('SMTP username label') ?></th>
+									<td>
+										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo $feather->utils->escape($feather->forum_settings['o_smtp_user']) ?>" />
+										<span><?php _e('SMTP username help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('SMTP password label') ?></th>
+									<td>
+										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
+<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key($feather->utils->strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
+										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
+										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
+										<span><?php _e('SMTP password help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('SMTP SSL label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather->forum_settings['o_smtp_ssl'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather->forum_settings['o_smtp_ssl'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('SMTP SSL help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Registration subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Allow new label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather->forum_settings['o_regs_allow'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather->forum_settings['o_regs_allow'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Allow new help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Verify label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather->forum_settings['o_regs_verify'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather->forum_settings['o_regs_verify'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Verify help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Report new label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather->forum_settings['o_regs_report'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather->forum_settings['o_regs_report'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Report new help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Use rules label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather->forum_settings['o_rules'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather->forum_settings['o_rules'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Use rules help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Rules label') ?></th>
+									<td>
+										<textarea name="form_rules_message" rows="10" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_rules_message']) ?></textarea>
+										<span><?php _e('Rules help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('E-mail default label') ?></th>
+									<td>
+										<span><?php _e('E-mail default help') ?></span>
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather->forum_settings['o_default_email_setting'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<?php _e('Display e-mail label') ?></label>
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather->forum_settings['o_default_email_setting'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<?php _e('Hide allow form label') ?></label>
+										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather->forum_settings['o_default_email_setting'] == '2') {
+    echo ' checked="checked"';
+} ?> />&#160;<?php _e('Hide both label') ?></label>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Announcement subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Display announcement label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather->forum_settings['o_announcement'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather->forum_settings['o_announcement'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Display announcement help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Announcement message label') ?></th>
+									<td>
+										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_announcement_message']) ?></textarea>
+										<span><?php _e('Announcement message help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Maintenance subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><a name="maintenance"></a><?php _e('Maintenance mode label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather->forum_settings['o_maintenance'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather->forum_settings['o_maintenance'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Maintenance mode help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Maintenance message label') ?></th>
+									<td>
+										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
+										<span><?php _e('Maintenance message help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
diff --git a/style/themes/MyFeatherBB/view/admin/parser.php b/style/themes/MyFeatherBB/view/admin/parser.php
new file mode 100644
index 00000000..35ee0cbe
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/parser.php
@@ -0,0 +1,299 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php echo $lang_admin_parser['Parser head'] ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/parser/') ?>" enctype="multipart/form-data">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop">
+					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
+					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
+				</p>
+				<div class="inform">
+					<input type="hidden" name="form_sent" value="1" />
+					<fieldset>
+						<legend><?php echo $lang_admin_parser['Config subhead'] ?></legend>
+						<div class="infldset">
+							<table class="aligntop" cellspacing="0">
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['textile'] ?></th>
+									<td colspan="2">
+										<input type="radio" name="config[textile]" value="1"<?php if ($config['textile']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[textile]" value="0"<?php if (!$config['textile']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['textile help'] ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['quote_links'] ?></th>
+									<td colspan="2">
+										<input type="radio" name="config[quote_links]" value="1"<?php if ($config['quote_links']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_links]" value="0"<?php if (!$config['quote_links']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['quote_links help'] ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['quote_imgs'] ?></th>
+									<td colspan="2">
+										<input type="radio" name="config[quote_imgs]" value="1"<?php if ($config['quote_imgs']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_imgs]" value="0"<?php if (!$config['quote_imgs']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['quote_imgs help'] ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['click_imgs'] ?></th>
+									<td colspan="2">
+										<input type="radio" name="config[click_imgs]" value="1"<?php if ($config['click_imgs']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[click_imgs]" value="0"<?php if (!$config['click_imgs']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['click_imgs help'] ?></span>
+									</td>
+								</tr>
+
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['valid_imgs'] ?></th>
+									<td colspan="2">
+										<input type="radio" name="config[valid_imgs]" value="1"<?php if ($config['valid_imgs']) {
+    echo ' checked="checked"';
+} if (!ini_get('allow_url_fopen')) {
+    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
+} ?> /> <strong><?php _e('Yes') ?></strong>
+										<input type="radio" name="config[valid_imgs]" value="0"<?php if (!$config['valid_imgs']) {
+    echo ' checked="checked"';
+} if (!ini_get('allow_url_fopen')) {
+    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
+} ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td><?php echo $lang_admin_parser['valid_imgs help'] ?></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['max_size'] ?></th>
+									<td colspan="2">
+										<input type="text" name="config[max_size]" size="10" maxlength="8" value="<?php echo($config['max_size'])?>"<?php if (!ini_get('allow_url_fopen')) {
+    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
+} ?> />
+									</td>
+									<td><span><?php echo $lang_admin_parser['max_size help'] ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['def_xy'] ?></th>
+									<td>
+										<input type="text" name="config[def_width]" size="5" maxlength="5" value="<?php echo $config['def_width'] ?>" /> X:Width
+									</td>
+									<td>
+										<input type="text" name="config[def_height]" size="5" maxlength="5" value="<?php echo $config['def_height'] ?>" /> Y:Height
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['def_xy help'] ?></span>
+									</td>
+								</tr>
+
+
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['max_xy'] ?></th>
+									<td>
+										<input type="text" name="config[max_width]" size="5" maxlength="5" value="<?php echo $config['max_width'] ?>" /> X:Width
+									</td>
+									<td>
+										<input type="text" name="config[max_height]" size="5" maxlength="5" value="<?php echo $config['max_height'] ?>" /> Y:Height
+									</td>
+									<td><?php echo $lang_admin_parser['max_xy help'] ?></td>
+								</tr>
+
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['smiley_size'] ?></th>
+									<td colspan=2>
+										<input type="text" name="config[smiley_size]" size="5" maxlength="5" value="<?php echo $config['smiley_size'] .'%' ?>" />
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['smiley_size help'] ?></span>
+									</td>
+								</tr>
+
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php echo $lang_admin_parser['Smilies subhead'] ?></legend>
+						<div class="infldset">
+							<table cellspacing="0">
+							<thead>
+								<tr>
+									<th scope="col"><?php echo $lang_admin_parser['smiley_text_label'] ?></th>
+									<th scope="col"><?php echo $lang_admin_parser['smiley_file_label'] ?></th>
+									<th scope="col">:)</th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+    foreach ($smilies as $key => $value) {
+        $i++;
+        $oldfile = $value['file'];
+        ?>
+								<tr>
+									<td><input type="text" name="smiley_text[<?php echo($i);
+        ?>]" value="<?php echo($feather->utils->escape($key));
+        ?>" size="20" maxlength="80" /></td>
+									<td>
+										<select name="smiley_file[<?php echo($i);
+        ?>]">
+<?php
+        foreach ($smiley_files as $file) {
+            if ($file === $oldfile) {
+                echo("\t\t\t\t\t\t\t\t\t\t\t<option selected=\"selected\">" . $file . "</option>\n");
+            } else {
+                echo("\t\t\t\t\t\t\t\t\t\t\t<option>" . $file . "</option>\n");
+            }
+        }
+        ?>
+										</select>
+									</td>
+									<td>
+										<?php echo($value['html']);
+        ?>
+									</td>
+								</tr>
+<?php
+
+    }
+?>
+								<tr>
+									<td><input type="text" name="smiley_text[<?php echo(++$i); ?>]" value="" size="20" maxlength="80" /><br />New smiley text</td>
+									<td>
+										<select name="smiley_file[<?php echo($i); ?>]">
+											<option selected="selected">select new file</option>
+<?php
+        foreach ($smiley_files as $file) {
+            echo("\t\t\t\t\t\t\t\t\t\t\t<option>" . $file . "</option>\n");
+        }
+?>
+										</select><br /><?php echo($lang_admin_parser['New smiley image']); ?>
+									</td>
+									<td></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo($lang_admin_parser['smiley_upload']); ?></th>
+ <?php if (ini_get('file_uploads')) {
+    ?>
+									<td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
+										<input type="file" name="new_smiley" id="upload_smiley" /></td>
+									<td><input type="submit" name="upload" value="<?php echo($lang_admin_parser['upload_button']);
+    ?>" /></td>
+<?php 
+} else {
+    ?>
+									<td colspan="2"><?php echo($lang_admin_parser['upload_off']);
+    ?></td>
+<?php 
+} ?>
+								</tr>
+							</tbody>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+
+
+
+				<div class="inform">
+					<fieldset>
+						<legend><?php echo $lang_admin_parser['BBCodes subhead'] ?></legend>
+						<div class="infldset">
+							<table cellspacing="0">
+							<thead>
+								<tr>
+									<th class="tcl" scope="col"><?php echo $lang_admin_parser['tagname_label'] ?></th>
+									<th class="tc3" scope="col"><?php echo $lang_admin_parser['in_post_label'] ?></th>
+									<th class="hidehead" scope="col"><?php echo $lang_admin_parser['in_sig_label'] ?></th>
+									<th class="tc2" scope="col"><?php echo $lang_admin_parser['depth_max'] ?></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+foreach ($bbcd as $tagname => $tagdata) {
+    if ($tagname == '_ROOT_') {
+        continue;
+    } // Skip last pseudo-tag
+    $title = isset($lang_admin_parser['tag_summary'][$tagname]) ?
+                $lang_admin_parser['tag_summary'][$tagname] : '';
+    ?>
+								<tr>
+									<th scope="row" title="<?php echo($title);
+    ?>"><?php echo('['. $tagname .']') ?></th>
+									<td>
+										<input type="radio" name="<?php echo($tagname) ?>_in_post" value="1"<?php if ($bbcd[$tagname]['in_post']) {
+    echo ' checked="checked"';
+}
+    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_post" value="0"<?php if (!$bbcd[$tagname]['in_post']) {
+    echo ' checked="checked"';
+}
+    ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<input type="radio" name="<?php echo($tagname) ?>_in_sig" value="1"<?php if ($bbcd[$tagname]['in_sig']) {
+    echo ' checked="checked"';
+}
+    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_sig" value="0"<?php if (!$bbcd[$tagname]['in_sig']) {
+    echo ' checked="checked"';
+}
+    ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<input type="text" size="10" name="<?php echo($tagname) ?>_depth_max" value="<?php echo($bbcd[$tagname]['depth_max']);
+    ?>" <?php if ($tagdata['html_type'] === 'inline' || $tagdata['tag_type'] === 'hidden') {
+    echo(' disabled="disabled" style="display: none;"');
+}
+    ?> />
+									</td>
+								</tr>
+<?php 
+} ?>
+							</tbody>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+
+
+				<p class="submitend">
+					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
+					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
+				</p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/permissions.php b/style/themes/MyFeatherBB/view/admin/permissions.php
new file mode 100644
index 00000000..1fe92218
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/permissions.php
@@ -0,0 +1,189 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Permissions head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/permissions/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
+				<div class="inform">
+					<input type="hidden" name="form_sent" value="1" />
+					<fieldset>
+						<legend><?php _e('Posting subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('BBCode label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather->forum_settings['p_message_bbcode'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather->forum_settings['p_message_bbcode'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('BBCode help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Image tag label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather->forum_settings['p_message_img_tag'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather->forum_settings['p_message_img_tag'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Image tag help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('All caps message label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather->forum_settings['p_message_all_caps'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather->forum_settings['p_message_all_caps'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('All caps message help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('All caps subject label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather->forum_settings['p_subject_all_caps'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather->forum_settings['p_subject_all_caps'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('All caps subject help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Require e-mail label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather->forum_settings['p_force_guest_email'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather->forum_settings['p_force_guest_email'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Require e-mail help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Signatures subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('BBCode sigs label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather->forum_settings['p_sig_bbcode'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather->forum_settings['p_sig_bbcode'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('BBCode sigs help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Image tag sigs label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather->forum_settings['p_sig_img_tag'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather->forum_settings['p_sig_img_tag'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Image tag sigs help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('All caps sigs label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather->forum_settings['p_sig_all_caps'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather->forum_settings['p_sig_all_caps'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('All caps sigs help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Max sig length label') ?></th>
+									<td>
+										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather->forum_settings['p_sig_length'] ?>" />
+										<span class="clearb"><?php _e('Max sig length help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Max sig lines label') ?></th>
+									<td>
+										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather->forum_settings['p_sig_lines'] ?>" />
+										<span class="clearb"><?php _e('Max sig lines help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Registration subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Banned e-mail label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather->forum_settings['p_allow_banned_email'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather->forum_settings['p_allow_banned_email'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Banned e-mail help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Duplicate e-mail label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Duplicate e-mail help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/plugins.php b/style/themes/MyFeatherBB/view/admin/plugins.php
new file mode 100644
index 00000000..c09245ed
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/plugins.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+<div class="block">
+    <h2>Plugins</h2>
+    <div class="box">
+        <div class="inbox">
+            <table class="table">
+                <caption>The following plugins are available</caption>
+                <thead>
+                    <tr>
+                        <th>Extension</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php foreach ($pluginsList as $plugin => $class) : ?>
+                        <tr>
+                            <td>
+                                <strong><?= $class::$name; ?></strong>
+                                <div class="plugin-actions">
+                                    <?php if (array_key_exists($class, $activePlugins)) { ?>
+                                        <a href="<?= $feather->url->get('/admin/plugins/deactivate?plugin='.$class) ?>">Deactivate</a>
+                                    <?php } else { ?>
+                                        <a href="<?= $feather->url->get('/admin/plugins/activate?plugin='.$class) ?>">Activate</a>
+                                    <?php } ?>
+                                </div>
+                            </td>
+                            <td>
+                                <?= $class::$description; ?>
+                                <div class="plugin-details">
+                                    Version <?= $class::$version; ?> |
+                                    By <?= $class::$author; ?>
+                                </div>
+                            </td>
+                        </tr>
+                    <?php endforeach; ?>
+                </tbody>
+            </table>
+            <p style="text-align:right"><?= count($pluginsList) ?> éléments</p>
+        </div>
+    </div>
+</div>
+
+	<div class="clearer"></div>
+</div>
diff --git a/style/themes/MyFeatherBB/view/admin/reports.php b/style/themes/MyFeatherBB/view/admin/reports.php
new file mode 100644
index 00000000..b364bfdc
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/reports.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('New reports head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?= $feather->url->get('admin/reports/') ?>">
+				<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
+<?php
+if (!empty($report_data)) {
+    foreach ($report_data as $report) {
+        ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php printf(__('Report subhead'), $feather->utils->format_time($report['created'])) ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?= $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
+									<td><?= str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+    }
+} else {
+    ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('None') ?></legend>
+						<div class="infldset">
+							<p><?php _e('No new reports') ?></p>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+}
+
+?>
+			</form>
+		</div>
+	</div>
+
+	<div class="blockform block2">
+		<h2><span><?php _e('Last 10 head') ?></span></h2>
+		<div class="box">
+			<div class="fakeform">
+<?php
+
+if (!empty($report_zapped_data)) {
+    foreach ($report_zapped_data as $report) {
+        ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.$feather->utils->escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Reason') ?></th>
+									<td><?= str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+    }
+} else {
+    ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('None') ?></legend>
+						<div class="infldset">
+							<p><?php _e('No zapped reports') ?></p>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+}
+
+?>
+			</div>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
diff --git a/style/themes/MyFeatherBB/view/admin/statistics.php b/style/themes/MyFeatherBB/view/admin/statistics.php
new file mode 100644
index 00000000..f2fd7a9a
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/statistics.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="block">
+		<h2><span><?php _e('Server statistics head') ?></span></h2>
+		<div id="adstats" class="box">
+			<div class="inbox">
+				<dl>
+					<dt><?php _e('Server load label') ?></dt>
+					<dd>
+						<?php printf(__('Server load data')."\n", $server_load, $num_online) ?>
+					</dd>
+<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
+					<dd>
+						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
+						<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->url->get('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
+						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
+					</dd>
+					<dt><?php _e('Database label') ?></dt>
+					<dd>
+<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", $feather->utils->forum_number_format($total_records)) ?>
+						<br /><?php printf(__('Database data size')."\n", $total_size) ?>
+<?php endif; ?>					</dd>
+<?php endif; ?>
+				</dl>
+			</div>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/users/admin_users.php b/style/themes/MyFeatherBB/view/admin/users/admin_users.php
new file mode 100644
index 00000000..74a05472
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/users/admin_users.php
@@ -0,0 +1,172 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('User search head') ?></span></h2>
+		<div class="box">
+			<form id="find_user" method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
+				<p class="submittop"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="1" /></p>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('User search subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('User search info') ?></p>
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Username label') ?></th>
+									<td><input type="text" name="form[username]" size="25" maxlength="25" tabindex="2" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('E-mail address label') ?></th>
+									<td><input type="text" name="form[email]" size="30" maxlength="80" tabindex="3" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Title label') ?></th>
+									<td><input type="text" name="form[title]" size="30" maxlength="50" tabindex="4" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Real name label') ?></th>
+									<td><input type="text" name="form[realname]" size="30" maxlength="40" tabindex="5" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Website label') ?></th>
+									<td><input type="text" name="form[url]" size="35" maxlength="100" tabindex="6" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Jabber label') ?></th>
+									<td><input type="text" name="form[jabber]" size="30" maxlength="75" tabindex="7" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('ICQ label') ?></th>
+									<td><input type="text" name="form[icq]" size="12" maxlength="12" tabindex="8" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('MSN label') ?></th>
+									<td><input type="text" name="form[msn]" size="30" maxlength="50" tabindex="9" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('AOL label') ?></th>
+									<td><input type="text" name="form[aim]" size="20" maxlength="20" tabindex="10" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Yahoo label') ?></th>
+									<td><input type="text" name="form[yahoo]" size="20" maxlength="20" tabindex="11" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Location label') ?></th>
+									<td><input type="text" name="form[location]" size="30" maxlength="30" tabindex="12" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Signature label') ?></th>
+									<td><input type="text" name="form[signature]" size="35" maxlength="512" tabindex="13" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Admin note label') ?></th>
+									<td><input type="text" name="form[admin_note]" size="30" maxlength="30" tabindex="14" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Posts more than label') ?></th>
+									<td><input type="text" name="posts_greater" size="5" maxlength="8" tabindex="15" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Posts less than label') ?></th>
+									<td><input type="text" name="posts_less" size="5" maxlength="8" tabindex="16" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Last post after label') ?></th>
+									<td><input type="text" name="last_post_after" size="24" maxlength="19" tabindex="17" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Last post before label') ?></th>
+									<td><input type="text" name="last_post_before" size="24" maxlength="19" tabindex="18" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Last visit after label') ?></th>
+									<td><input type="text" name="last_visit_after" size="24" maxlength="19" tabindex="17" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Last visit before label') ?></th>
+									<td><input type="text" name="last_visit_before" size="24" maxlength="19" tabindex="18" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Registered after label') ?></th>
+									<td><input type="text" name="registered_after" size="24" maxlength="19" tabindex="19" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Registered before label') ?></th>
+									<td><input type="text" name="registered_before" size="24" maxlength="19" tabindex="20" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Order by label') ?></th>
+									<td>
+										<select name="order_by" tabindex="21">
+											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
+											<option value="email"><?php _e('Order by e-mail') ?></option>
+											<option value="num_posts"><?php _e('Order by posts') ?></option>
+											<option value="last_post"><?php _e('Order by last post') ?></option>
+											<option value="last_visit"><?php _e('Order by last visit') ?></option>
+											<option value="registered"><?php _e('Order by registered') ?></option>
+										</select>&#160;&#160;&#160;<select name="direction" tabindex="22">
+											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
+											<option value="DESC"><?php _e('Descending') ?></option>
+										</select>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('User group label') ?></th>
+									<td>
+										<select name="user_group" tabindex="23">
+											<option value="-1" selected="selected"><?php _e('All groups') ?></option>
+											<option value="0"><?php _e('Unverified users') ?></option>
+											<?php echo $group_list; ?>
+										</select>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="25" /></p>
+			</form>
+		</div>
+
+		<h2 class="block2"><span><?php _e('IP search head') ?></span></h2>
+		<div class="box">
+			<form method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('IP search subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('IP address label') ?><div><input type="submit" value="<?php _e('Find IP address') ?>" tabindex="26" /></div></th>
+									<td><input type="text" name="show_users" size="18" maxlength="15" tabindex="24" />
+									<span><?php _e('IP address help') ?></span></td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/users/ban_users.php b/style/themes/MyFeatherBB/view/admin/users/ban_users.php
new file mode 100644
index 00000000..8e06caff
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/users/ban_users.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Ban users') ?></span></h2>
+		<div class="box">
+			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Message expiry subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Ban message label') ?></th>
+									<td>
+										<input type="text" name="ban_message" size="50" maxlength="255" tabindex="1" />
+										<span><?php _e('Ban message help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Expire date label') ?></th>
+									<td>
+										<input type="text" name="ban_expire" size="17" maxlength="10" tabindex="2" />
+										<span><?php _e('Expire date help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Ban IP label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="3" value="1" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="4" value="0" checked="checked" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Ban IP help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="ban_users_comply" value="<?php _e('Save') ?>" tabindex="3" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/users/delete_users.php b/style/themes/MyFeatherBB/view/admin/users/delete_users.php
new file mode 100644
index 00000000..1a4360c6
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/users/delete_users.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Delete users') ?></span></h2>
+		<div class="box">
+			<form name="confirm_del_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Confirm delete legend') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Confirm delete info') ?></p>
+							<div class="rbox">
+								<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
+							</div>
+							<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="delete_users_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/users/find_users.php b/style/themes/MyFeatherBB/view/admin/users/find_users.php
new file mode 100644
index 00000000..3ddd2324
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/users/find_users.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+
+<form id="search-users-form" action="<?php echo $feather->url->get('admin/users/') ?>" method="post">
+<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<div id="users2" class="blocktable">
+	<h2><span><?php _e('Results head') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
+					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
+					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
+<?php if ($can_action): ?>					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
+<?php endif;
+    ?>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+    if (!empty($user_data)) {
+        foreach ($user_data as $user) {
+            ?>
+				<tr>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.$feather->utils->escape($user['username']).'</a>' ?></td>
+					<td class="tc2"><a href="mailto:<?php echo $feather->utils->escape($user['email']) ?>"><?php echo $feather->utils->escape($user['email']) ?></a></td>
+					<td class="tc3"><?php echo $user['user_title'] ?></td>
+					<td class="tc4"><?php echo $feather->utils->forum_number_format($user['num_posts']) ?></td>
+					<td class="tc5"><?php echo($user['admin_note'] != '') ? $feather->utils->escape($user['admin_note']) : '&#160;' ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
+<?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
+<?php endif;
+            ?>
+				</tr>
+<?php
+
+        }
+    } else {
+        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('No match').'</td></tr>'."\n";
+    }
+
+    ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+<?php if ($can_action): ?>			<p class="conr modbuttons"><a href="#" onclick="return select_checkboxes('search-users-form', this, '<?php _e('Unselect all') ?>')"><?php _e('Select all') ?></a> <?php if ($can_ban) : ?><input type="submit" name="ban_users" value="<?php _e('Ban') ?>" /><?php endif;
+    if ($can_delete) : ?><input type="submit" name="delete_users" value="<?php _e('Delete') ?>" /><?php endif;
+    if ($can_move) : ?><input type="submit" name="move_users" value="<?php _e('Change group') ?>" /><?php endif;
+    ?></p>
+<?php endif;
+    ?>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="clearer"></div>
+	</div>
+</div>
+</form>
diff --git a/style/themes/MyFeatherBB/view/admin/users/move_users.php b/style/themes/MyFeatherBB/view/admin/users/move_users.php
new file mode 100644
index 00000000..a2f96b91
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/users/move_users.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Move users') ?></span></h2>
+		<div class="box">
+			<form name="confirm_move_users" method="post" action="<?php echo $feather->url->get('admin/users/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Move users subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('New group label') ?></th>
+									<td>
+										<select name="new_group" tabindex="1">
+<?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo $feather->utils->escape($group) ?></option>
+<?php endforeach;
+    ?>
+										</select>
+										<span><?php _e('New group help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="move_users_comply" value="<?php _e('Save') ?>" tabindex="2" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/users/search_ip.php b/style/themes/MyFeatherBB/view/admin/users/search_ip.php
new file mode 100644
index 00000000..a4db0174
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/users/search_ip.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<div id="users1" class="blocktable">
+	<h2><span><?php _e('Results head') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Results IP address head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results last used head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results times found head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results action head') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+        foreach ($ip_data as $ip) {
+            ?>
+				<tr>
+					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.$feather->utils->escape($ip['poster_ip']).'/') ?>"><?php echo $feather->utils->escape($ip['poster_ip']) ?></a></td>
+					<td class="tc2"><?php echo $feather->utils->format_time($ip['last_used']) ?></td>
+					<td class="tc3"><?php echo $ip['used_times'] ?></td>
+					<td class="tcr"><a href="<?php echo $feather->url->get('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
+				</tr>
+<?php
+
+        }
+        if (empty($ip_data)):
+            echo "\t\t\t\t".'<tr><td class="tcl" colspan="4">'.__('Results no posts found').'</td></tr>'."\n";
+        endif;
+
+    ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/users/show_users.php b/style/themes/MyFeatherBB/view/admin/users/show_users.php
new file mode 100644
index 00000000..99fccb06
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/admin/users/show_users.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<div id="users2" class="blocktable">
+	<h2><span><?php _e('Results head') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
+					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
+					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+    if ($info['num_posts']) {
+
+        // Loop through users and print out some info
+        foreach ($info['posters'] as $cur_poster) {
+            if (isset($info['user_data'][$cur_poster['poster_id']])) {
+                ?>
+				<tr>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.$feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
+					<td class="tc2"><a href="mailto:<?php echo $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
+					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
+					<td class="tc4"><?php echo $feather->utils->forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
+					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
+				</tr>
+<?php
+
+            } else {
+                ?>
+				<tr>
+					<td class="tcl"><?php echo $feather->utils->escape($cur_poster['poster']) ?></td>
+					<td class="tc2">&#160;</td>
+					<td class="tc3"><?php _e('Results guest') ?></td>
+					<td class="tc4">&#160;</td>
+					<td class="tc5">&#160;</td>
+					<td class="tcr">&#160;</td>
+				</tr>
+<?php
+
+            }
+        }
+    } else {
+        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('Results no IP found').'</td></tr>'."\n";
+    }
+
+    ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/delete.php b/style/themes/MyFeatherBB/view/delete.php
new file mode 100644
index 00000000..abfc0a7f
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/delete.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
+		</ul>
+	</div>
+</div>
+
+<div class="blockform">
+	<h2><span><?php _e('Delete post') ?></span></h2>
+	<div class="box">
+		<form method="post" action="<?php echo $feather->url->get('delete/'.$id.'/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<div class="forminfo">
+					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.$feather->utils->escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
+					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
+				</div>
+			</div>
+			<p class="buttons"><input type="submit" name="delete" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
+
+<div id="postreview">
+	<div class="blockpost">
+		<div class="box">
+			<div class="inbox">
+				<div class="postbody">
+					<div class="postleft">
+						<dl>
+							<dt><strong><?php echo $feather->utils->escape($cur_post['poster']) ?></strong></dt>
+							<dd><span><?php echo $feather->utils->format_time($cur_post['posted']) ?></span></dd>
+						</dl>
+					</div>
+					<div class="postright">
+						<div class="postmsg">
+							<?php echo $cur_post['message']."\n" ?>
+						</div>
+					</div>
+				</div>
+				<div class="clearer"></div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/edit.php b/style/themes/MyFeatherBB/view/edit.php
new file mode 100644
index 00000000..ea9c3abe
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/edit.php
@@ -0,0 +1,119 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+$cur_index = 1;
+
+?>
+
+<div class="linkst">
+	<div class="inbox">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
+		</ul>
+	</div>
+</div>
+
+<?php
+
+// If there are errors, we display them
+if (!empty($errors)) :
+?>
+<div id="posterror" class="block">
+	<h2><span><?php _e('Post errors') ?></span></h2>
+	<div class="box">
+		<div class="inbox error-info">
+			<p><?php _e('Post errors info') ?></p>
+			<ul class="error-list">
+<?php
+    foreach ($errors as $cur_error) {
+        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+    }
+?>
+			</ul>
+		</div>
+	</div>
+</div>
+<?php
+elseif ($feather->request->post('preview')):
+?>
+<div id="postpreview" class="blockpost">
+	<h2><span><?php _e('Post preview') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<div class="postbody">
+				<div class="postright">
+					<div class="postmsg">
+						<?php echo $preview_message."\n" ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<?php
+endif;
+?>
+<!-- Init BBcode editor toolbar -->
+<script>
+    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
+        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
+</script>
+<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
+<div id="editform" class="blockform">
+	<h2><span><?php _e('Edit post') ?></span></h2>
+	<div class="box">
+		<form id="edit" method="post" action="<?php echo $feather->url->get('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Edit post legend') ?></legend>
+					<input type="hidden" name="form_sent" value="1" />
+					<div class="infldset txtarea">
+<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo $feather->utils->escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
+<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
+						<script>postEditorToolbar('req_message');</script>
+                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo $feather->utils->escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
+						<ul class="bblinks">
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+						</ul>
+					</div>
+				</fieldset>
+			</div>
+<?php
+if (!empty($checkboxes)):
+?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Options') ?></legend>
+					<div class="infldset">
+						<div class="rbox">
+							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+<?php
+endif;
+?>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/error.php b/style/themes/MyFeatherBB/view/error.php
new file mode 100644
index 00000000..d638a206
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/error.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="msg" class="block error">
+    <h2><span><?= $msg_title ?></span></h2>
+    <div class="box">
+        <div class="inbox">
+            <p><?php echo $msg ?></p>
+            <?php if (!$no_back_link) {
+                echo "\t\t\t".'<p><a href="javascript: history.go(-1)">'.__('Go back').'</a></p>';
+            } ?>
+        </div>
+    </div>
+</div>
diff --git a/style/themes/MyFeatherBB/view/footer.new.php b/style/themes/MyFeatherBB/view/footer.new.php
new file mode 100644
index 00000000..b66f807c
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/footer.new.php
@@ -0,0 +1,160 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+?>
+</div>
+
+<div id="brdfooter" class="block">
+	<h2><span><?php _e('Board footer') ?></span></h2>
+	<div class="box">
+<?php
+
+if (isset($active_page) && ($active_page == 'viewforum' || $active_page == 'viewtopic') && $feather->user->is_admmod) {
+    echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
+
+    if ($active_page == 'viewforum') {
+        echo "\t\t\t".'<dl>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/forum/'.$fid.'/page/'.$page_number.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t".'</dl>'."\n";
+    } elseif ($active_page == 'viewtopic') {
+        if (isset($pid)) {
+            $parameter = 'param/'.$pid.'/';
+        } elseif (isset($page_number) && $page_number != 1) {
+            $parameter = 'param/'.$page_number.'/';
+        } else {
+            $parameter = '';
+        }
+
+
+        echo "\t\t\t".'<dl>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
+        // TODO: all
+        //echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/moderate/page/'.$page_number.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+
+        if ($cur_topic['closed'] == '1') {
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+        } else {
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+        }
+
+        if ($cur_topic['sticky'] == '1') {
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+        } else {
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+        }
+
+        echo "\t\t\t".'</dl>'."\n";
+    }
+
+    echo "\t\t\t".'<div class="clearer"></div>'."\n\t\t".'</div>'."\n";
+}
+
+?>
+		<div id="brdfooternav" class="inbox">
+
+<?php
+// Display the "Jump to" drop list
+if ($feather->forum_settings['o_quickjump'] == '1' && !empty($quickjump)) { ?>
+			<div class="conl">
+			<form id="qjump" method="get" action="">
+				<div><label><span><?php _e('Jump to') ?><br /></span></label>
+					<select name="id" onchange="window.location=('<?php echo $feather->url->get('forum/') ?>'+this.options[this.selectedIndex].value)">
+<?php
+		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
+			echo "\t\t\t\t\t\t\t".'<optgroup label="'.$feather->utils->escape($cat_data['cat_name']).'">'."\n";
+			foreach ($cat_data['cat_forums'] as $forum) {
+				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($fid == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
+			}
+			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
+		} ?>
+					</select>
+					<noscript><input type="submit" value="<?php _e('Go') ?>" accesskey="g" /></noscript>
+				</div>
+			</form>
+			</div>
+<?php } ?>
+
+			<div class="conr">
+<?php
+
+if ($active_page == 'index') {
+    if ($feather->forum_settings['o_feed_type'] == '1') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
+    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
+    }
+} elseif ($active_page == 'viewforum') {
+    if ($feather->forum_settings['o_feed_type'] == '1') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
+    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
+    }
+} elseif ($active_page == 'viewtopic') {
+    if ($feather->forum_settings['o_feed_type'] == '1') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
+    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
+    }
+}
+
+?>
+				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather->forum_settings['o_show_version'] == '1') ? ' '.$feather->forum_settings['o_cur_version'] : '')) ?></p>
+			</div>
+			<div class="clearer"></div>
+		</div>
+	</div>
+</div>
+<?php
+
+// Display debug info (if enabled/defined)
+if (!empty($exec_info)) { ?>
+	<p id="debugtime">[ <?= sprintf(__('Querytime'), round($exec_info['exec_time'], 6), $exec_info['nb_queries']).' - '.sprintf(__('Memory usage'), $exec_info['mem_usage']).' '.sprintf(__('Peak usage'), $exec_info['mem_peak_usage'])?>]</p>
+<? }
+if (!empty($queries_info)) { ?>
+	<div id="debug" class="blocktable">
+		<h2><span><?php _e('Debug table') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<table>
+					<thead>
+						<tr>
+							<th class="tcl" scope="col"><?php _e('Query times') ?></th>
+							<th class="tcr" scope="col"><?php _e('Query') ?></th>
+						</tr>
+					</thead>
+					<tbody>
+<?php foreach ($queries_info['raw'] as $time => $sql) {
+	echo "\t\t\t\t\t\t".'<tr>'."\n";
+	echo "\t\t\t\t\t\t\t".'<td class="tcl">'.$feather->utils->escape(round($time, 8)).'</td>'."\n";
+	echo "\t\t\t\t\t\t\t".'<td class="tcr">'.$feather->utils->escape($sql).'</td>'."\n";
+	echo "\t\t\t\t\t\t".'</tr>'."\n";
+} ?>
+						<tr>
+							<td class="tcl" colspan="2"><?= sprintf(__('Total query time'), round($queries_info['total_time'], 7)).' s' ?></td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
+<?php } ?>
+</section>
+</body>
+<!-- JS -->
+<?php foreach ($assets['js'] as $script) {
+    echo '<script ';
+    foreach ($script['params'] as $key => $value) {
+        echo $key.'="'.$value.'" ';
+    }
+    echo 'src="'.$feather->url->base().'/'.$script['file'].'"/></script>'."\n";
+} ?>
+</html>
diff --git a/style/themes/MyFeatherBB/view/footer.php b/style/themes/MyFeatherBB/view/footer.php
new file mode 100644
index 00000000..9e19de90
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/footer.php
@@ -0,0 +1,133 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+?>
+</div>
+
+<div id="brdfooter" class="block">
+	<h2><span><?php _e('Board footer') ?></span></h2>
+	<div class="box">
+<?php
+
+if (isset($footer_style) && ($footer_style == 'viewforum' || $footer_style == 'viewtopic') && $is_admmod) {
+    echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
+
+    if ($footer_style == 'viewforum') {
+        echo "\t\t\t".'<dl>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t".'</dl>'."\n";
+    } elseif ($footer_style == 'viewtopic') {
+        if (isset($pid)) {
+            $parameter = 'param/'.$pid.'/';
+        } elseif (isset($p) && $p != 1) {
+            $parameter = 'param/'.$p.'/';
+        } else {
+            $parameter = '';
+        }
+
+
+        echo "\t\t\t".'<dl>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
+        // TODO: all
+        //echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+
+        if ($cur_topic['closed'] == '1') {
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+        } else {
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+        }
+
+        if ($cur_topic['sticky'] == '1') {
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+        } else {
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+        }
+
+        echo "\t\t\t".'</dl>'."\n";
+    }
+
+    echo "\t\t\t".'<div class="clearer"></div>'."\n\t\t".'</div>'."\n";
+}
+
+?>
+		<div id="brdfooternav" class="inbox">
+
+<?php
+// Display the "Jump to" drop list
+if ($feather->forum_settings['o_quickjump'] == '1' && !empty($quickjump)) { ?>
+			<div class="conl">
+			<form id="qjump" method="get" action="">
+				<div><label><span><?php _e('Jump to') ?><br /></span></label>
+					<select name="id" onchange="window.location=('<?php echo $feather->url->get('forum/') ?>'+this.options[this.selectedIndex].value)">
+<?php
+		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
+			echo "\t\t\t\t\t\t\t".'<optgroup label="'.$feather->utils->escape($cat_data['cat_name']).'">'."\n";
+			foreach ($cat_data['cat_forums'] as $forum) {
+				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
+			}
+			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
+		} ?>
+					</select>
+					<noscript><input type="submit" value="<?php _e('Go') ?>" accesskey="g" /></noscript>
+				</div>
+			</form>
+			</div>
+<?php } ?>
+
+			<div class="conr">
+<?php
+
+if ($footer_style == 'index') {
+    if ($feather->forum_settings['o_feed_type'] == '1') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
+    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
+    }
+} elseif ($footer_style == 'viewforum') {
+    if ($feather->forum_settings['o_feed_type'] == '1') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
+    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
+    }
+} elseif ($footer_style == 'viewtopic') {
+    if ($feather->forum_settings['o_feed_type'] == '1') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
+    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
+    }
+}
+
+?>
+				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather->forum_settings['o_show_version'] == '1') ? ' '.$feather->forum_settings['o_cur_version'] : '')) ?></p>
+			</div>
+			<div class="clearer"></div>
+		</div>
+	</div>
+</div>
+<?php
+
+// Display debug info (if enabled/defined)
+if ($feather->forum_env['FEATHER_SHOW_INFO']) {
+    $feather->debug->info();
+}
+// Display executed queries (if enabled)
+if ($feather->forum_env['FEATHER_SHOW_QUERIES']) {
+    $feather->debug->queries();
+}
+?>
+
+</section>
+
+<script src="<?php echo $feather->url->base() ?>/style/themes/FeatherBB/phone.min.js"></script>
+
+</body>
+</html>
diff --git a/style/FeatherBB/view/header.new.php b/style/themes/MyFeatherBB/view/header.new.php
similarity index 98%
rename from style/FeatherBB/view/header.new.php
rename to style/themes/MyFeatherBB/view/header.new.php
index 0299b47d..0fb8af32 100644
--- a/style/FeatherBB/view/header.new.php
+++ b/style/themes/MyFeatherBB/view/header.new.php
@@ -34,8 +34,8 @@
     }
 }
 if ($admin_console) {
-    if (file_exists($feather->forum_env['FEATHER_ROOT'].'style/'.$feather->user->style.'/base_admin.css')) {
-        echo "\t".'<link rel="stylesheet" type="text/css" href="'.$feather->url->base().'/style/'.$feather->user->style.'/base_admin.css" />'."\n";
+    if (file_exists($feather->forum_env['FEATHER_ROOT'].'style/themes/'.$feather->user->style.'/base_admin.css')) {
+        echo "\t".'<link rel="stylesheet" type="text/css" href="'.$feather->url->base().'/style/themes/'.$feather->user->style.'/base_admin.css" />'."\n";
     } else {
         echo "\t".'<link rel="stylesheet" type="text/css" href="'.$feather->url->base().'/style/imports/base_admin.css" />'."\n";
     }
diff --git a/style/themes/MyFeatherBB/view/header.php b/style/themes/MyFeatherBB/view/header.php
new file mode 100644
index 00000000..b4dfdbdd
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/header.php
@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php _e('lang_identifier') ?>" lang="<?php _e('lang_identifier') ?>" dir="<?php _e('lang_direction') ?>">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
+<title><?php echo generate_page_title($page_title, $p) ?></title>
+<link rel="stylesheet" type="text/css" href="<?php echo $feather->url->base() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
+<?php
+
+echo $allow_index;
+echo $admin_console;
+
+if (isset($required_fields)) :
+    // Output JavaScript to validate form (make sure required fields are filled out)
+
+    ?>
+    <script type="text/javascript">
+        /* <![CDATA[ */
+        function process_form(the_form)
+        {
+            var required_fields = {
+                <?php
+                    // Output a JavaScript object with localised field names
+                    $tpl_temp = count($required_fields);
+                    foreach ($required_fields as $elem_orig => $elem_trans) {
+                        echo "\t\t\"".$elem_orig.'": "'.addslashes(str_replace('&#160;', ' ', $elem_trans));
+                        if (--$tpl_temp) {
+                            echo "\",\n";
+                        } else {
+                            echo "\"\n\t};\n";
+                        }
+                    }
+                    ?>
+                if (document.all || document.getElementById)
+            {
+                for (var i = 0; i < the_form.length; ++i)
+                {
+                    var elem = the_form.elements[i];
+                    if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
+                    {
+                        alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
+                        elem.focus();
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        /* ]]> */
+    </script>
+    <?php
+endif;
+if (!empty($page_head)) :
+    echo implode("\n", $page_head)."\n";
+endif;
+?>
+</head>
+
+<body id="pun<?= $active_page ?>"<?= $focus_element; ?>>
+
+<header>
+
+    <nav>
+        <div class="container">
+            <div class="phone-menu" id="phone-button">
+                <a class="button-phone"></a>
+            </div>
+            <div id="phone">
+                <?php echo $navlinks ?>
+                <div class="navbar-right">
+                    <form method="get" action="/search" class="nav-search">
+                        <input type="hidden" name="action" value="search">
+                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php _e('Search') ?>">
+                    </form>
+                </div>
+            </div>
+        </div>
+    </nav>
+
+    <div class="container">
+        <div class="container-title-status">
+            <h1 class="title-site">
+                <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
+                    <p><?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?></p>
+                </a>
+                <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
+            </h1>
+            <div class="status-avatar">
+                <?php echo $page_info ?>
+            </div>
+            <div class="clear"></div>
+        </div>
+        <?php if ($feather->user->g_read_board == '1' && $feather->forum_settings['o_announcement'] == '1') : ?>
+            <div id="announce" class="block">
+                <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
+                <div class="box">
+                    <div id="announce-block" class="inbox">
+                        <div class="usercontent"><?php echo $feather->forum_settings['o_announcement_message'] ?></div>
+                    </div>
+                </div>
+            </div>
+        <?php endif; ?>
+        <?php if (!empty($flash->getMessages())) : ?>
+        <script type="text/javascript">
+            window.onload = function() {
+                var flashMessage = document.getElementById('flashmsg');
+                flashMessage.className = 'flashmsg '+flashMessage.getAttribute('data-type')+' show';
+                setTimeout(function () {
+                    flashMessage.className = 'flashmsg '+flashMessage.getAttribute('data-type');
+                }, 10000);
+                return false;
+            }
+        </script>
+        <?php foreach ($flash->getMessages() as $type => $message) { ?>
+        <div class="flashmsg info" data-type="<?= $type; ?>" id="flashmsg">
+            <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
+            <p><?= $feather->utils->escape($message) ?></p>
+        </div>
+        <?php } ?>
+        <?php endif; ?>
+    </div>
+
+</header>
+
+<section class="container">
+    <div id="brdmain">
diff --git a/style/themes/MyFeatherBB/view/help.php b/style/themes/MyFeatherBB/view/help.php
new file mode 100644
index 00000000..00669948
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/help.php
@@ -0,0 +1,141 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<h2><span><?php _e('BBCode') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><a name="bbcode"></a><?php _e('BBCode info 1') ?></p>
+		<p><?php _e('BBCode info 2') ?></p>
+	</div>
+</div>
+<h2><span><?php _e('Text style') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><?php _e('Text style info') ?></p>
+		<p><code>[b]<?php _e('Bold text') ?>[/b]</code> <?php _e('produces') ?> <samp><strong><?php _e('Bold text') ?></strong></samp></p>
+		<p><code>[u]<?php _e('Underlined text') ?>[/u]</code> <?php _e('produces') ?> <samp><span class="bbu"><?php _e('Underlined text') ?></span></samp></p>
+		<p><code>[i]<?php _e('Italic text') ?>[/i]</code> <?php _e('produces') ?> <samp><em><?php _e('Italic text') ?></em></samp></p>
+		<p><code>[s]<?php _e('Strike-through text') ?>[/s]</code> <?php _e('produces') ?> <samp><span class="bbs"><?php _e('Strike-through text') ?></span></samp></p>
+		<p><code>[del]<?php _e('Deleted text') ?>[/del]</code> <?php _e('produces') ?> <samp><del><?php _e('Deleted text') ?></del></samp></p>
+		<p><code>[ins]<?php _e('Inserted text') ?>[/ins]</code> <?php _e('produces') ?> <samp><ins><?php _e('Inserted text') ?></ins></samp></p>
+		<p><code>[em]<?php _e('Emphasised text') ?>[/em]</code> <?php _e('produces') ?> <samp><em><?php _e('Emphasised text') ?></em></samp></p>
+		<p><code>[color=#FF0000]<?php _e('Red text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: #ff0000"><?php _e('Red text') ?></span></samp></p>
+		<p><code>[color=blue]<?php _e('Blue text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: blue"><?php _e('Blue text') ?></span></samp></p>
+		<p><code>[h]<?php _e('Heading text') ?>[/h]</code> <?php _e('produces') ?></p> <div class="postmsg"><h5><?php _e('Heading text') ?></h5></div>
+	</div>
+</div>
+<h2><span><?php _e('Links and images') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><?php _e('Links info') ?></p>
+		<p><a name="url"></a><code>[url=<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>]<?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>"><?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>"><?php echo $feather->utils->escape($feather->url->base(true).'/') ?></a></samp></p>
+		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
+		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
+		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
+		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php echo $feather->url->get('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php echo $feather->url->get('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('forum/1/') ?>"><?php echo $feather->url->get('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php echo $feather->url->get('user/2/') ?></a></samp></p>
+	</div>
+	<div class="inbox">
+		<p><a name="img"></a><?php _e('Images info') ?></p>
+		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo $feather->utils->escape($feather->url->base(true)) ?>/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo $feather->utils->escape($feather->url->base(true)) ?>/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
+	</div>
+</div>
+<h2><span><?php _e('Quotes') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><?php _e('Quotes info') ?></p>
+		<p><code>[quote=James]<?php _e('Quote text') ?>[/quote]</code></p>
+		<p><?php _e('produces quote box') ?></p>
+		<div class="postmsg">
+			<div class="quotebox"><cite>James <?php _e('wrote') ?></cite><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
+		</div>
+		<p><?php _e('Quotes info 2') ?></p>
+		<p><code>[quote]<?php _e('Quote text') ?>[/quote]</code></p>
+		<p><?php _e('produces quote box') ?></p>
+		<div class="postmsg">
+			<div class="quotebox"><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
+		</div>
+		<p><?php _e('quote note') ?></p>
+	</div>
+</div>
+<h2><span><?php _e('Code') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><?php _e('Code info') ?></p>
+		<p><code>[code]<?php _e('Code text') ?>[/code]</code></p>
+		<p><?php _e('produces code box') ?></p>
+		<div class="postmsg">
+			<div class="codebox"><pre><code><?php _e('Code text') ?></code></pre></div>
+		</div>
+	</div>
+</div>
+<h2><span><?php _e('Lists') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><a name="lists"></a><?php _e('List info') ?></p>
+		<p><code>[list][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php _e('produces list') ?></span></p>
+		<div class="postmsg">
+			<ul><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ul>
+		</div>
+		<p><code>[list=1][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php _e('produces decimal list') ?></span></p>
+		<div class="postmsg">
+			<ol class="decimal"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
+		</div>
+		<p><code>[list=a][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php _e('produces alpha list') ?></span></p>
+		<div class="postmsg">
+			<ol class="alpha"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
+		</div>
+	</div>
+</div>
+<h2><span><?php _e('Nested tags') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><?php _e('Nested tags info') ?></p>
+		<p><code>[b][u]<?php _e('Bold, underlined text') ?>[/u][/b]</code> <?php _e('produces') ?> <samp><strong><span class="bbu"><?php _e('Bold, underlined text') ?></span></strong></samp></p>
+	</div>
+</div>
+<h2><span><?php _e('Smilies') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><a name="smilies"></a><?php _e('Smilies info') ?></p>
+<?php
+
+// Display the smiley set
+require FEATHER_ROOT.'include/parser.php';
+
+$smiley_groups = array();
+
+foreach ($pd['smilies'] as $smiley_text => $smiley_data) {
+    $smiley_groups[$smiley_data['file']][] = $smiley_text;
+}
+
+foreach ($smiley_groups as $smiley_img => $smiley_texts) {
+    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
+}
+
+?>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/index.php b/style/themes/MyFeatherBB/view/index.php
new file mode 100644
index 00000000..826fa47e
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/index.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+if (empty($index_data)): ?>
+    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php _e('Empty board') ?></p></div></div></div>
+<?php endif;
+foreach ($index_data as $forum) {
+    if ($forum->cid != $cur_cat) :
+        if ($cur_cat != 0) :
+    ?>
+				</tbody>
+			</table>
+		</div>
+	</div>
+	</div>
+	<?php endif;
+    ?>
+	<div id="idx<?php echo $forum->cid ?>" class="blocktable">
+	<h2><span><?php echo $feather->utils->escape($forum->cat_name) ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Forum') ?></th>
+					<th class="tc2" scope="col"><?php _e('Topics') ?></th>
+					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
+					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+	<?php
+    $cur_cat = $forum->cid;
+    endif;
+    ?>
+				<tr class="<?php echo $forum->item_status ?>">
+					<td class="tcl">
+						<div class="<?php echo $forum->icon_type ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($forum->forum_count_formatted) ?></div></div>
+						<div class="tclcon">
+							<div>
+								<?php echo $forum->forum_field."\n".$forum->moderators_formatted ?>
+							</div>
+						</div>
+					</td>
+					<td class="tc2"><?php echo $feather->utils->forum_number_format($forum->num_topics_formatted) ?></td>
+					<td class="tc3"><?php echo $feather->utils->forum_number_format($forum->num_posts_formatted) ?></td>
+					<td class="tcr"><?php echo $forum->last_post_formatted ?></td>
+				</tr>
+	<?php
+
+}
+if ($cur_cat > 0) :
+    ?>
+					</tbody>
+			</table>
+		</div>
+	</div>
+	</div>
+<?php
+endif;
+if (!empty($forum_actions)) :
+?>
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<p class="subscribelink clearb"><?php echo implode(' - ', $forum_actions); ?></p>
+	</div>
+</div>
+<?php
+endif;
+?>
+<div id="brdstats" class="block">
+	<h2><span><?php _e('Board info') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<dl class="conr">
+				<dt><strong><?php _e('Board stats') ?></strong></dt>
+				<dd><span><?php printf(__('No of users'), '<strong>'.$feather->utils->forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of topics'), '<strong>'.$feather->utils->forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of posts'), '<strong>'.$feather->utils->forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
+			</dl>
+			<dl class="conl">
+				<dt><strong><?php _e('User info') ?></strong></dt>
+				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
+				<?php if ($feather->forum_settings['o_users_online'] == 1) : ?>
+				<dd><span><?php printf(__('Users online'), '<strong>'.$feather->utils->forum_number_format($online['num_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Guests online'), '<strong>'.$feather->utils->forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
+				<?php endif; ?>
+			</dl>
+			<?php
+            if ($feather->forum_settings['o_users_online'] == 1) :
+                if ($online['num_users'] > 0) {
+                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
+                } else {
+                    echo "\t\t\t".'<div class="clearer"></div>'."\n";
+                }
+            endif;
+            ?>
+		</div>
+	</div>
+</div>
diff --git a/style/themes/MyFeatherBB/view/install.php b/style/themes/MyFeatherBB/view/install.php
new file mode 100644
index 00000000..c146b1b7
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/install.php
@@ -0,0 +1,222 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title><?php _e('FeatherBB Installation') ?></title>
+    <link rel="stylesheet" type="text/css" href="style/<?php echo $feather->forum_env['FORUM_NAME'] ?>.css" />
+</head>
+
+<body>
+    <div id="puninstall" class="pun">
+        <div class="top-box"><div><!-- Top Corners --></div></div>
+        <div class="punwrap">
+
+            <section class="container">
+                <div id="brdheader" class="block">
+                    <div class="box">
+                        <div id="brdtitle" class="inbox">
+                            <h1><span><?php _e('FeatherBB Installation') ?></span></h1>
+                            <div id="brddesc"><p><?php _e('Welcome') ?></p></div>
+                        </div>
+                    </div>
+                </div>
+            </section>
+
+            <section class="container">
+                <div id="brdmain">
+                    <?php if (count($languages) > 1): ?>
+                        <div class="blockform">
+                            <h2><span><?php _e('Choose install language') ?></span></h2>
+                            <div class="box">
+                                <form id="install" method="post" action="">
+                                    <input type="hidden" name="choose_lang" value="1">
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Install language') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Choose install language info') ?></p>
+                                                <label><strong><?php _e('Install language') ?></strong>
+                                                    <br /><select name="install_lang">
+                                                        <?php
+
+                                                        foreach ($languages as $lang) {
+                                                            echo "\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').'>'.$lang.'</option>'."\n";
+                                                        }
+
+                                                        ?>
+                                                    </select>
+                                                    <br /></label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                        <p class="buttons"><input type="submit" value="<?php _e('Change language') ?>" /></p>
+                                    </form>
+                                </div>
+                            </div>
+                        <?php endif;
+                        ?>
+
+                        <div class="blockform">
+                            <h2><span><?php echo sprintf(__('Install'), FORUM_VERSION) ?></span></h2>
+                            <div class="box">
+                                <form id="install" method="post" action="">
+                                    <?php if (!empty($errors)): ?>
+                                        <div class="inform">
+                                            <div class="forminfo error-info">
+                                                <h3><?php _e('Errors') ?></h3>
+                                                <ul class="error-list">
+                                                    <?php
+                                                    $errors = (!is_array($errors)) ? array($errors) : $errors;
+                                                    foreach ($errors as $error) {
+                                                        echo "\t\t\t\t\t\t".'<li><strong>'.$error.'</strong></li>'."\n";
+                                                    }
+                                                    ?>
+                                                </ul>
+                                            </div>
+                                        </div>
+                                        <?php endif;?>
+
+                                    <div class="inform">
+                                        <div class="forminfo">
+                                            <h3><?php _e('Database setup') ?></h3>
+                                            <p><?php _e('Info 1') ?></p>
+                                        </div>
+                                        <fieldset>
+                                            <legend><?php _e('Select database') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 2') ?></p>
+                                                <label class="required"><strong><?php _e('Database type') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <select name="install[db_type]" required>
+                                                    <?php
+
+                                                    foreach ($supported_dbs as $id => $db_type) {
+                                                        echo "\t\t\t\t\t\t\t".'<option value="'.$id.'">'.$db_type.'</option>'."\n";
+                                                    }
+
+                                                    ?>
+                                                </select>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database hostname') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 3') ?></p>
+                                                <label class="required"><strong><?php _e('Database server hostname') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[db_host]" size="50" required />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database enter name') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 4') ?></p>
+                                                <label class="required"><strong><?php _e('Database name') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[db_name]" size="30" required />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database enter informations') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 5') ?></p>
+                                                <label class="conl"><?php _e('Database username') ?></label>
+                                                <input type="text" name="install[db_user]" size="30" />
+                                                <label class="conl"><?php _e('Database password') ?></label>
+                                                <input type="password" name="install[db_pass]" size="30" />
+                                                <div class="clearer"></div>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database enter prefix') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 6') ?></p>
+                                                <label><?php _e('Table prefix') ?></label>
+                                                <input type="text" name="install[db_prefix]" size="20" maxlength="30" />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <div class="forminfo">
+                                            <h3><?php _e('Administration setup') ?></h3>
+                                            <p><?php _e('Info 7') ?></p>
+                                        </div>
+                                        <fieldset>
+                                            <legend><?php _e('Administration setup') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 8') ?></p>
+                                                <label class="required"><strong><?php _e('Administrator username') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[username]" size="25" maxlength="25" required />
+                                                <label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="password" name="install[password]" size="16" required />
+                                                <label class="conl required"><strong><?php _e('Confirm password') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="password" name="install[password_conf]" size="16" required />
+                                                <!-- <div class="clearer"></div> -->
+                                                <label class="required"><strong><?php _e('Administrator email') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[email]" size="50" maxlength="80" required />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <div class="forminfo">
+                                            <h3><?php _e('Board setup') ?></h3>
+                                            <p><?php _e('Info 11') ?></p>
+                                        </div>
+                                        <fieldset>
+                                            <legend><?php _e('General information') ?></legend>
+                                            <div class="infldset">
+                                                <label class="required"><strong><?php _e('Board title') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[title]" value="<? echo $data['title'] ?>" size="60" maxlength="255" required />
+                                                <label><?php _e('Board description') ?></label>
+                                                <input type="text" name="install[description]" value="<? echo $data['description'] ?>" size="60" maxlength="255" required />
+                                                <label class="required"><strong><?php _e('Base URL') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[base_url]" value="<? echo $data['base_url'] ?>" size="60" maxlength="100" required />
+                                                <label class="required"><strong><?php _e('Default language') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <select name="install[default_lang]" required />
+                                                <?php
+                                                foreach ($languages as $lang) {
+                                                    echo "\t\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').' >'.$lang.'</option>'."\n";
+                                                }
+                                                ?>
+                                            </select>
+                                        </div>
+                                    </fieldset>
+                                </div>
+
+                                <p class="buttons"><input type="submit" value="<?php _e('Start install') ?>" /></p>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </div>
+        <div class="end-box"><div><!-- Bottom Corners --></div></div>
+    </div>
+</body>
+</html>
diff --git a/style/themes/MyFeatherBB/view/login/form.php b/style/themes/MyFeatherBB/view/login/form.php
new file mode 100644
index 00000000..59808e7f
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/login/form.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Login') ?></span></h2>
+	<div class="box">
+		<form id="login" method="post" action="<?php echo $feather->url->get('auth/login') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Login legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<label class="conl required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
+						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
+
+						<div class="rbox clearb">
+							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php _e('Remember me') ?><br /></label>
+						</div>
+
+						<p class="clearb"><?php _e('Login info') ?></p>
+						<p class="actions"><span><a href="<?php echo $feather->url->get('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo $feather->url->get('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="login" value="<?php _e('Login') ?>" tabindex="4" /></p>
+		</form>
+	</div>
+</div>
diff --git a/style/themes/MyFeatherBB/view/login/password_forgotten.php b/style/themes/MyFeatherBB/view/login/password_forgotten.php
new file mode 100644
index 00000000..432f9aee
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/login/password_forgotten.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+// If there are errors, we display them
+if (!empty($errors)) {
+    ?>
+<div id="posterror" class="block">
+	<h2><span><?php _e('New password errors') ?></span></h2>
+	<div class="box">
+		<div class="inbox error-info">
+			<p><?php _e('New passworderrors info') ?></p>
+			<ul class="error-list">
+<?php
+
+    foreach ($errors as $cur_error) {
+        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+    }
+    ?>
+			</ul>
+		</div>
+	</div>
+</div>
+
+<?php
+
+}
+?>
+<div class="blockform">
+	<h2><span><?php _e('Request pass') ?></span></h2>
+	<div class="box">
+		<form id="request_pass" method="post" action="<?php echo $feather->url->get('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Request pass legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
+						<p><?php _e('Request pass info') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="request_pass" value="<?php _e('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a><?php endif; ?></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/misc/email.php b/style/themes/MyFeatherBB/view/misc/email.php
new file mode 100644
index 00000000..867ac9ee
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/misc/email.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="emailform" class="blockform">
+	<h2><span><?php _e('Send email to') ?> <?php echo $feather->utils->escape($mail['recipient']) ?></span></h2>
+	<div class="box">
+		<form id="email" method="post" action="<?php echo $feather->url->get('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Write email') ?></legend>
+					<div class="infldset txtarea">
+						<input type="hidden" name="form_sent" value="1" />
+						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
+						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
+						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
+						<p><?php _e('Email disclosure note') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
diff --git a/style/themes/MyFeatherBB/view/misc/report.php b/style/themes/MyFeatherBB/view/misc/report.php
new file mode 100644
index 00000000..6eeead9c
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/misc/report.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
+		</ul>
+	</div>
+</div>
+
+<div id="reportform" class="blockform">
+	<h2><span><?php _e('Report post') ?></span></h2>
+	<div class="box">
+		<form id="report" method="post" action="<?php echo $feather->url->get('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Reason desc') ?></legend>
+					<div class="infldset txtarea">
+						<input type="hidden" name="form_sent" value="1" />
+						<label class="required"><strong><?php _e('Reason') ?> <span><?php _e('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/misc/rules.php b/style/themes/MyFeatherBB/view/misc/rules.php
new file mode 100644
index 00000000..feb662ad
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/misc/rules.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="rules" class="block">
+	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
+	<div class="box">
+		<div id="rules-block" class="inbox">
+			<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
+		</div>
+	</div>
+</div>
diff --git a/style/themes/MyFeatherBB/view/moderate/delete_posts.php b/style/themes/MyFeatherBB/view/moderate/delete_posts.php
new file mode 100644
index 00000000..00b80920
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/moderate/delete_posts.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Delete posts') ?></span></h2>
+	<div class="box">
+		<form method="post" action="">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Confirm delete legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
+						<p><?php _e('Delete posts comply') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/moderate/delete_topics.php b/style/themes/MyFeatherBB/view/moderate/delete_topics.php
new file mode 100644
index 00000000..d0ab1eed
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/moderate/delete_topics.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="blockform">
+	<h2><span><?php _e('Delete topics') ?></span></h2>
+	<div class="box">
+		<form method="post" action="">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Confirm delete legend') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Delete topics comply') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/moderate/merge_topics.php b/style/themes/MyFeatherBB/view/moderate/merge_topics.php
new file mode 100644
index 00000000..820cedee
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/moderate/merge_topics.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="blockform">
+	<h2><span><?php _e('Merge topics') ?></span></h2>
+	<div class="box">
+		<form method="post" action="">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Confirm merge legend') ?></legend>
+					<div class="infldset">
+						<div class="rbox">
+							<label><input type="checkbox" name="with_redirect" value="1" /><?php _e('Leave redirect') ?><br /></label>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php _e('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/moderate/moderator_forum.php b/style/themes/MyFeatherBB/view/moderate/moderator_forum.php
new file mode 100644
index 00000000..06c6987b
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/moderate/moderator_forum.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<form method="post" action="<?php echo $feather->url->get('moderate/forum/'.$id.'/') ?>">
+<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<input type="hidden" name="page" value="<?php echo $feather->utils->escape($p) ?>" />
+<div id="vf" class="blocktable">
+	<h2><span><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
+					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php endif; ?>					<th class="tcr"><?php _e('Last post') ?></th>
+					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+			
+			<?php
+            $topic_count = 0;
+            $button_status = '';
+            foreach ($topic_data as $topic) {
+                ++$topic_count;
+                ?>
+							<tr class="<?php echo $topic['item_status'] ?>">
+					<td class="tcl">
+						<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
+						<div class="tclcon">
+							<div>
+								<?php echo $topic['subject_disp']."\n" ?>
+							</div>
+						</div>
+					</td>
+					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? $feather->utils->forum_number_format($topic['num_replies']) : '-' ?></td>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? $feather->utils->forum_number_format($topic['num_views']) : '-' ?></td>
+<?php endif;
+                ?>					<td class="tcr"><?php echo $topic['last_post_disp'] ?></td>
+					<td class="tcmod"><input type="checkbox" name="topics[<?php echo $topic['id'] ?>]" value="1" /></td>
+				</tr>
+			<?php
+
+            }
+            if (empty($topic_data)):
+                $colspan = ($feather->forum_settings['o_topic_views'] == '1') ? 5 : 4;
+                $button_status = ' disabled="disabled"';
+                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
+            endif;
+            ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php _e('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php _e('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php _e('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php _e('Close') ?>"<?php echo $button_status ?> /></p>
+			<div class="clearer"></div>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
+		</ul>
+		<div class="clearer"></div>
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/moderate/move_topics.php b/style/themes/MyFeatherBB/view/moderate/move_topics.php
new file mode 100644
index 00000000..e72ae5cb
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/moderate/move_topics.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="blockform">
+	<h2><span><?php echo($action == 'single') ? __('Move topic') : __('Move topics') ?></span></h2>
+	<div class="box">
+		<form method="post" action="">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+			<input type="hidden" name="topics" value="<?php echo $topics ?>" />
+				<fieldset>
+					<legend><?php _e('Move legend') ?></legend>
+					<div class="infldset">
+						<label><?php _e('Move to') ?>
+						<br /><select name="move_to_forum">
+								<?php echo $list_forums ?>
+							</optgroup>
+						</select>
+						<br /></label>
+						<div class="rbox">
+							<label><input type="checkbox" name="with_redirect" value="1"<?php if ($action == 'single') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Leave redirect') ?><br /></label>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php _e('Move') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/moderate/posts_view.php b/style/themes/MyFeatherBB/view/moderate/posts_view.php
new file mode 100644
index 00000000..0338555a
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/moderate/posts_view.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<form method="post" action="">
+<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<?php
+$post_count = 0; // Keep track of post numbers
+foreach ($post_data as $post) {
+    $post_count++;
+    ?>
+	<div id="p<?php echo $post['id'] ?>" class="blockpost<?php if ($post['id'] == $cur_topic['first_post_id']) {
+    echo ' firstpost';
+}
+    ?><?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($post_count == 1) {
+    echo ' blockpost1';
+}
+    ?>">
+		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<div class="postbody">
+					<div class="postleft">
+						<dl>
+							<dt><strong><?php echo $post['poster_disp'] ?></strong></dt>
+							<dd class="usertitle"><strong><?php echo $post['user_title'] ?></strong></dd>
+						</dl>
+					</div>
+					<div class="postright">
+						<h3 class="nosize"><?php _e('Message') ?></h3>
+						<div class="postmsg">
+							<?php echo $post['message']."\n" ?>
+	<?php if ($post['edited'] != '') {
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.$feather->utils->escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
+}
+    ?>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="inbox">
+				<div class="postfoot clearb">
+					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.__('Select').'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.__('Cannot select first').'</p>' ?></div>
+				</div>
+			</div>
+		</div>
+	</div>
+<?php
+
+}
+?>
+
+<div class="postlinksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php _e('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /></p>
+			<div class="clearer"></div>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
+		</ul>
+		<div class="clearer"></div>
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/moderate/split_posts.php b/style/themes/MyFeatherBB/view/moderate/split_posts.php
new file mode 100644
index 00000000..7c59b0b9
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/moderate/split_posts.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Split posts') ?></span></h2>
+	<div class="box">
+		<form id="subject" method="post" action="">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Confirm split legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
+						<label class="required"><strong><?php _e('New subject') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
+						<label><?php _e('Move to') ?>
+						<br /><select name="move_to_forum">
+								<?php echo $list_forums ?>
+							</optgroup>
+						</select>
+						<br /></label>
+						<p><?php _e('Split posts comply') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php _e('Split') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/post.php b/style/themes/MyFeatherBB/view/post.php
new file mode 100644
index 00000000..d0b60d54
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/post.php
@@ -0,0 +1,213 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="linkst">
+	<div class="inbox">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_posting['forum_name']) ?></a></li>
+<?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo $feather->utils->escape($feather->request->post('req_subject')) ?></li>
+<?php endif; ?>
+<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_posting['subject']) ?></a></li>
+<?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
+		</ul>
+	</div>
+</div>
+
+<?php
+
+// If there are errors, we display them
+if (!empty($errors)) {
+    ?>
+<div id="posterror" class="block">
+	<h2><span><?php _e('Post errors') ?></span></h2>
+	<div class="box">
+		<div class="inbox error-info">
+			<p><?php _e('Post errors info') ?></p>
+			<ul class="error-list">
+<?php
+
+    foreach ($errors as $cur_error) {
+        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+    }
+    ?>
+			</ul>
+		</div>
+	</div>
+</div>
+
+<?php
+
+} elseif ($feather->request->post('preview')) {
+    require_once FEATHER_ROOT.'include/parser.php';
+    $preview_message = parse_message($post['message'], $post['hide_smilies']);
+
+    ?>
+<div id="postpreview" class="blockpost">
+	<h2><span><?php _e('Post preview') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<div class="postbody">
+				<div class="postright">
+					<div class="postmsg">
+						<?php echo $preview_message."\n" ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<?php
+
+}
+
+
+$cur_index = 1;
+
+?>
+<!-- Init BBcode editor toolbar -->
+<script>
+    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
+        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
+</script>
+<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
+
+<div id="postform" class="blockform">
+	<h2><span><?php echo $action ?></span></h2>
+	<div class="box">
+		<?php echo $form."\n" ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Write message legend') ?></legend>
+					<div class="infldset txtarea">
+						<input type="hidden" name="form_sent" value="1" />
+                                                <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<?php
+if ($feather->user->is_guest) {
+    $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+    $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
+    ?>
+						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
+    echo $feather->utils->escape($post['username']);
+}
+    ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
+    echo $feather->utils->escape($post['email']);
+}
+    ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<div class="clearer"></div>
+<?php
+
+}
+if ($fid): ?>
+						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
+    echo $feather->utils->escape($post['subject']);
+} ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
+                        <script>postEditorToolbar('req_message');</script>
+						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? $feather->utils->linebreaks($feather->utils->trim($feather->utils->escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
+						<ul class="bblinks">
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+						</ul>
+					</div>
+				</fieldset>
+<?php
+if (!empty($checkboxes)) {
+    ?>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Options') ?></legend>
+					<div class="infldset">
+						<div class="rbox">
+							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
+						</div>
+					</div>
+				</fieldset>
+<?php
+
+}
+
+?>
+			</div>
+			<?php if ($feather->user->is_guest) : ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Robot title') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Robot info')    ?></p>
+						<label class="required"><strong><?php
+                             $question = array_keys($lang_antispam_questions);
+                             $qencoded = md5($question[$index_questions]);
+                             echo sprintf(__('Robot question'), $question[$index_questions]);?>
+							 <span><?php _e('Required') ?></span></strong>
+							 <br />
+							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
+						</label>
+					</div>
+				</fieldset>
+			</div>
+			<?php endif; ?>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
+
+
+<?php
+if ($tid && $feather->forum_settings['o_topic_review'] != '0') :
+?>
+<div id="postreview">
+	<h2><span><?php _e('Topic review') ?></span></h2>
+
+	<?php
+    // Set background switching on
+    $post_count = 0;
+
+    foreach ($post_data as $post) {
+        ++$post_count;
+        ?>
+	<div class="blockpost">
+	<div class="box<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?>">
+		<div class="inbox">
+			<div class="postbody">
+				<div class="postleft">
+					<dl>
+						<dt><strong><?php echo $feather->utils->escape($post['poster']) ?></strong></dt>
+						<dd><span><?php echo $feather->utils->format_time($post['posted']) ?></span></dd>
+					</dl>
+				</div>
+				<div class="postright">
+					<div class="postmsg">
+						<?php echo $post['message']."\n" ?>
+					</div>
+				</div>
+			</div>
+			<div class="clearer"></div>
+		</div>
+	</div>
+</div>
+	<?php
+
+    }
+    ?>
+
+</div>
+<?php endif;?>
diff --git a/style/themes/MyFeatherBB/view/profile/change_mail.php b/style/themes/MyFeatherBB/view/profile/change_mail.php
new file mode 100644
index 00000000..1e59ab54
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/profile/change_mail.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Change email') ?></span></h2>
+	<div class="box">
+		<form id="change_email" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Email legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<label class="required"><strong><?php _e('New email') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
+						<label class="required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
+						<p><?php _e('Email instructions') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="new_email" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/profile/change_pass.php b/style/themes/MyFeatherBB/view/profile/change_pass.php
new file mode 100644
index 00000000..1bacb173
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/profile/change_pass.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Change pass') ?></span></h2>
+	<div class="box">
+		<form id="change_pass" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<input type="hidden" name="form_sent" value="1" />
+				<fieldset>
+					<legend><?php _e('Change pass legend') ?></legend>
+					<div class="infldset">
+<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php _e('Old pass') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input type="password" name="req_old_password" size="16" /><br /></label>
+<?php endif; ?>						<label class="conl required"><strong><?php _e('New pass') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input type="password" name="req_new_password1" size="16" /><br /></label>
+						<label class="conl required"><strong><?php _e('Confirm new pass') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input type="password" name="req_new_password2" size="16" /><br /></label>
+						<p class="clearb"><?php _e('Pass info') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/profile/delete_user.php b/style/themes/MyFeatherBB/view/profile/delete_user.php
new file mode 100644
index 00000000..84a3b58d
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/profile/delete_user.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Confirm delete user') ?></span></h2>
+	<div class="box">
+		<form id="confirm_del_user" method="post" action="<?php echo $feather->url->get('user/'.$id.'/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Confirm delete legend') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Confirmation info').' <strong>'.$feather->utils->escape($username).'</strong>.' ?></p>
+						<div class="rbox">
+							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
+						</div>
+						<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/profile/menu.php b/style/themes/MyFeatherBB/view/profile/menu.php
new file mode 100644
index 00000000..a46fef80
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/profile/menu.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="profile" class="block2col">
+	<div class="blockmenu">
+		<h2><span><?php _e('Profile menu') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<ul>
+					<li<?php if ($page == 'essentials') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
+					<li<?php if ($page == 'personal') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
+					<li<?php if ($page == 'messaging') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
+<?php if ($feather->forum_settings['o_avatars'] == '1' || $feather->forum_settings['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
+<?php endif;
+    ?>					<li<?php if ($page == 'display') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
+					<li<?php if ($page == 'privacy') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
+<?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
+<?php endif;
+    ?>				</ul>
+			</div>
+		</div>
+	</div>
diff --git a/style/themes/MyFeatherBB/view/profile/section_admin.php b/style/themes/MyFeatherBB/view/profile/section_admin.php
new file mode 100644
index 00000000..f06eb7d4
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/profile/section_admin.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+	<div class="blockform">
+		<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section admin') ?></span></h2>
+		<div class="box">
+			<form id="profile7" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+				<input type="hidden" name="form_sent" value="1" />
+					<fieldset>
+<?php
+
+        if ($feather->user->g_moderator == '1') {
+            ?>
+						<legend><?php _e('Delete ban legend') ?></legend>
+						<div class="infldset">
+							<p><input type="submit" name="ban" value="<?php _e('Ban user') ?>" /></p>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+        } else {
+            if ($feather->user->id != $id) {
+                ?>
+						<legend><?php _e('Group membership legend') ?></legend>
+						<div class="infldset">
+							<select id="group_id" name="group_id">
+                                                            <?php echo $group_list ?>
+							</select>
+							<input type="submit" name="update_group_membership" value="<?php _e('Save') ?>" />
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+<?php
+
+            }
+
+            ?>
+						<legend><?php _e('Delete ban legend') ?></legend>
+						<div class="infldset">
+							<input type="submit" name="delete_user" value="<?php _e('Delete user') ?>" /> <input type="submit" name="ban" value="<?php _e('Ban user') ?>" />
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+            if ($user['g_moderator'] == '1' || $user['g_id'] == FEATHER_ADMIN) {
+                ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Set mods legend') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Moderator in info') ?></p>
+                                                        <?php echo $forum_list ?>
+								</div>
+							</div>
+							<br class="clearb" /><input type="submit" name="update_forums" value="<?php _e('Update forums') ?>" />
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+            }
+        }
+
+?>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/profile/section_display.php b/style/themes/MyFeatherBB/view/profile/section_display.php
new file mode 100644
index 00000000..7cce9e3c
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/profile/section_display.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section display') ?></span></h2>
+	<div class="box">
+		<form id="profile5" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div><input type="hidden" name="form_sent" value="1" /></div>
+<?php
+
+    $styles = \FeatherBB\Lister::getStyles();
+
+    // Only display the style selection box if there's more than one style available
+    if (count($styles) == 1) {
+        echo "\t\t\t".'<div><input type="hidden" name="form_style" value="'.$styles[0].'" /></div>'."\n";
+    } elseif (count($styles) > 1) {
+        ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Style legend') ?></legend>
+					<div class="infldset">
+						<label><?php _e('Styles') ?><br />
+						<select name="form_style">
+<?php
+
+        foreach ($styles as $temp) {
+            if ($user['style'] == $temp) {
+                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.str_replace('_', ' ', $temp).'</option>'."\n";
+            } else {
+                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.str_replace('_', ' ', $temp).'</option>'."\n";
+            }
+        }
+
+        ?>
+						</select>
+						<br /></label>
+					</div>
+				</fieldset>
+			</div>
+<?php
+
+    }
+
+?>
+<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1' || $feather->forum_settings['o_signatures'] == '1' || $feather->forum_settings['o_avatars'] == '1' || ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1')): ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Post display legend') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Post display info') ?></p>
+						<div class="rbox">
+<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Show smilies') ?><br /></label>
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Show sigs') ?><br /></label>
+<?php endif; if ($feather->forum_settings['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Show avatars') ?><br /></label>
+<?php endif; if ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Show images') ?><br /></label>
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1' && $feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Show images sigs') ?><br /></label>
+<?php endif; ?>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Pagination legend') ?></legend>
+					<div class="infldset">
+						<label class="conl"><?php _e('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
+						<label class="conl"><?php _e('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
+						<p class="clearb"><?php _e('Paginate info') ?> <?php _e('Leave blank') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
diff --git a/style/themes/MyFeatherBB/view/profile/section_essentials.php b/style/themes/MyFeatherBB/view/profile/section_essentials.php
new file mode 100644
index 00000000..b45114f6
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/profile/section_essentials.php
@@ -0,0 +1,258 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section essentials') ?></span></h2>
+	<div class="box">
+		<form id="profile1" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Username and pass legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<?php echo $user_disp['username_field'] ?>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
+<?php endif; ?>						</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Email legend') ?></legend>
+					<div class="infldset">
+						<?php echo $user_disp['email_field'] ?>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Localisation legend') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Time zone info') ?></p>
+						<label><?php _e('Time zone')."\n" ?>
+						<br /><select name="form_timezone">
+							<option value="-12"<?php if ($user['timezone'] == -12) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-12:00') ?></option>
+							<option value="-11"<?php if ($user['timezone'] == -11) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-11:00') ?></option>
+							<option value="-10"<?php if ($user['timezone'] == -10) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-10:00') ?></option>
+							<option value="-9.5"<?php if ($user['timezone'] == -9.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-09:30') ?></option>
+							<option value="-9"<?php if ($user['timezone'] == -9) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-09:00') ?></option>
+							<option value="-8.5"<?php if ($user['timezone'] == -8.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-08:30') ?></option>
+							<option value="-8"<?php if ($user['timezone'] == -8) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-08:00') ?></option>
+							<option value="-7"<?php if ($user['timezone'] == -7) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-07:00') ?></option>
+							<option value="-6"<?php if ($user['timezone'] == -6) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-06:00') ?></option>
+							<option value="-5"<?php if ($user['timezone'] == -5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-05:00') ?></option>
+							<option value="-4"<?php if ($user['timezone'] == -4) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-04:00') ?></option>
+							<option value="-3.5"<?php if ($user['timezone'] == -3.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-03:30') ?></option>
+							<option value="-3"<?php if ($user['timezone'] == -3) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-03:00') ?></option>
+							<option value="-2"<?php if ($user['timezone'] == -2) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-02:00') ?></option>
+							<option value="-1"<?php if ($user['timezone'] == -1) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-01:00') ?></option>
+							<option value="0"<?php if ($user['timezone'] == 0) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC') ?></option>
+							<option value="1"<?php if ($user['timezone'] == 1) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+01:00') ?></option>
+							<option value="2"<?php if ($user['timezone'] == 2) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+02:00') ?></option>
+							<option value="3"<?php if ($user['timezone'] == 3) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+03:00') ?></option>
+							<option value="3.5"<?php if ($user['timezone'] == 3.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+03:30') ?></option>
+							<option value="4"<?php if ($user['timezone'] == 4) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+04:00') ?></option>
+							<option value="4.5"<?php if ($user['timezone'] == 4.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+04:30') ?></option>
+							<option value="5"<?php if ($user['timezone'] == 5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+05:00') ?></option>
+							<option value="5.5"<?php if ($user['timezone'] == 5.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+05:30') ?></option>
+							<option value="5.75"<?php if ($user['timezone'] == 5.75) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+05:45') ?></option>
+							<option value="6"<?php if ($user['timezone'] == 6) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+06:00') ?></option>
+							<option value="6.5"<?php if ($user['timezone'] == 6.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+06:30') ?></option>
+							<option value="7"<?php if ($user['timezone'] == 7) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+07:00') ?></option>
+							<option value="8"<?php if ($user['timezone'] == 8) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+08:00') ?></option>
+							<option value="8.75"<?php if ($user['timezone'] == 8.75) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+08:45') ?></option>
+							<option value="9"<?php if ($user['timezone'] == 9) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+09:00') ?></option>
+							<option value="9.5"<?php if ($user['timezone'] == 9.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+09:30') ?></option>
+							<option value="10"<?php if ($user['timezone'] == 10) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+10:00') ?></option>
+							<option value="10.5"<?php if ($user['timezone'] == 10.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+10:30') ?></option>
+							<option value="11"<?php if ($user['timezone'] == 11) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+11:00') ?></option>
+							<option value="11.5"<?php if ($user['timezone'] == 11.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+11:30') ?></option>
+							<option value="12"<?php if ($user['timezone'] == 12) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+12:00') ?></option>
+							<option value="12.75"<?php if ($user['timezone'] == 12.75) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+12:45') ?></option>
+							<option value="13"<?php if ($user['timezone'] == 13) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+13:00') ?></option>
+							<option value="14"<?php if ($user['timezone'] == 14) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+14:00') ?></option>
+						</select>
+						<br /></label>
+						<div class="rbox">
+							<label><input type="checkbox" name="form_dst" value="1"<?php if ($user['dst'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('DST') ?><br /></label>
+						</div>
+						<label><?php _e('Time format') ?>
+
+						<br /><select name="form_time_format">
+<?php
+                            foreach (array_unique($forum_time_formats) as $key => $time_format) {
+                                echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
+                                if ($user['time_format'] == $key) {
+                                    echo ' selected="selected"';
+                                }
+                                echo '>'. $feather->utils->format_time(time(), false, null, $time_format, true, true);
+                                if ($key == 0) {
+                                    echo ' ('.__('Default').')';
+                                }
+                                echo "</option>\n";
+                            }
+                            ?>
+						</select>
+						<br /></label>
+						<label><?php _e('Date format') ?>
+
+						<br /><select name="form_date_format">
+<?php
+                            foreach (array_unique($forum_date_formats) as $key => $date_format) {
+                                echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
+                                if ($user['date_format'] == $key) {
+                                    echo ' selected="selected"';
+                                }
+                                echo '>'. $feather->utils->format_time(time(), true, $date_format, null, false, true);
+                                if ($key == 0) {
+                                    echo ' ('.__('Default').')';
+                                }
+                                echo "</option>\n";
+                            }
+                            ?>
+						</select>
+						<br /></label>
+
+<?php
+
+    $languages = \FeatherBB\Lister::getLangs();
+
+    // Only display the language selection box if there's more than one language available
+    if (count($languages) > 1) {
+        ?>
+						<label><?php _e('Language') ?>
+						<br /><select name="form_language">
+<?php
+
+        foreach ($languages as $temp) {
+            if ($user['language'] == $temp) {
+                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
+            } else {
+                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
+            }
+        }
+
+        ?>
+						</select>
+						<br /></label>
+<?php
+
+    }
+
+?>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('User activity') ?></legend>
+					<div class="infldset">
+						<p><?php printf(__('Registered info'), $feather->utils->format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.$feather->utils->escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Last post info'), $feather->utils->format_time($user['last_post'])) ?></p>
+						<p><?php printf(__('Last visit info'), $feather->utils->format_time($user['last_visit'])) ?></p>
+						<?php echo $user_disp['posts_field'] ?>
+<?php if ($feather->user->is_admmod): ?>							<label><?php _e('Admin note') ?><br />
+						<input id="admin_note" type="text" name="admin_note" value="<?php echo $feather->utils->escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
+<?php endif; ?>						</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
diff --git a/style/themes/MyFeatherBB/view/profile/section_messaging.php b/style/themes/MyFeatherBB/view/profile/section_messaging.php
new file mode 100644
index 00000000..2d3268dd
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/profile/section_messaging.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section messaging') ?></span></h2>
+	<div class="box">
+		<form id="profile3" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Contact details legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo $feather->utils->escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
+						<label><?php _e('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
+						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo $feather->utils->escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
+						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo $feather->utils->escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo $feather->utils->escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/profile/section_personal.php b/style/themes/MyFeatherBB/view/profile/section_personal.php
new file mode 100644
index 00000000..5ae81801
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/profile/section_personal.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section personal') ?></span></h2>
+	<div class="box">
+		<form id="profile2" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Personal details legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo $feather->utils->escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
+<?php if (isset($title_field)): ?>							<?php echo $title_field ?>
+<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo $feather->utils->escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo $feather->utils->escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/profile/section_personality.php b/style/themes/MyFeatherBB/view/profile/section_personality.php
new file mode 100644
index 00000000..ae9f7b0f
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/profile/section_personality.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section personality') ?></span></h2>
+	<div class="box">
+		<form id="profile4" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div><input type="hidden" name="form_sent" value="1" /></div>
+<?php if ($feather->forum_settings['o_avatars'] == '1'): ?>				<div class="inform">
+				<fieldset id="profileavatar">
+					<legend><?php _e('Avatar legend') ?></legend>
+					<div class="infldset">
+<?php if ($user_avatar): ?>							<div class="useravatar"><?php echo $user_avatar ?></div>
+<?php endif; ?>							<p><?php _e('Avatar info') ?></p>
+						<p class="clearb actions"><?php echo $avatar_field ?></p>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>				<div class="inform">
+				<fieldset>
+					<legend><?php _e('Signature legend') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Signature info') ?></p>
+						<div class="txtarea">
+							<label><?php printf(__('Sig max size'), $feather->utils->forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
+							<textarea name="signature" rows="4" cols="65"><?php echo $feather->utils->escape($user['signature']) ?></textarea><br /></label>
+						</div>
+						<ul class="bblinks">
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+						</ul>
+						<?php echo $signature_preview ?>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
diff --git a/style/themes/MyFeatherBB/view/profile/section_privacy.php b/style/themes/MyFeatherBB/view/profile/section_privacy.php
new file mode 100644
index 00000000..48715858
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/profile/section_privacy.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section privacy') ?></span></h2>
+	<div class="box">
+		<form id="profile6" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Privacy options legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<p><?php _e('Email setting info') ?></p>
+						<div class="rbox">
+							<label><input type="radio" name="form_email_setting" value="0"<?php if ($user['email_setting'] == '0') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Email setting 1') ?><br /></label>
+							<label><input type="radio" name="form_email_setting" value="1"<?php if ($user['email_setting'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Email setting 2') ?><br /></label>
+							<label><input type="radio" name="form_email_setting" value="2"<?php if ($user['email_setting'] == '2') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Email setting 3') ?><br /></label>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1' || $feather->forum_settings['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
+				<fieldset>
+					<legend><?php _e('Subscription legend') ?></legend>
+					<div class="infldset">
+						<div class="rbox">
+							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Notify full') ?><br /></label>
+<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Auto notify full') ?><br /></label>
+<?php endif; ?>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/profile/upload_avatar.php b/style/themes/MyFeatherBB/view/profile/upload_avatar.php
new file mode 100644
index 00000000..15261a67
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/profile/upload_avatar.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Upload avatar') ?></span></h2>
+	<div class="box">
+		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo $feather->url->get('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Upload avatar legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
+						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
+						<p><?php _e('Avatar desc').' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="upload" value="<?php _e('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
diff --git a/style/themes/MyFeatherBB/view/profile/view_profile.php b/style/themes/MyFeatherBB/view/profile/view_profile.php
new file mode 100644
index 00000000..d30181fd
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/profile/view_profile.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="viewprofile" class="block">
+	<h2><span><?php _e('Profile') ?></span></h2>
+	<div class="box">
+		<div class="fakeform">
+			<div class="inform">
+				<fieldset>
+				<legend><?php _e('Section personal') ?></legend>
+					<div class="infldset">
+						<dl>
+							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personal'])."\n" ?>
+						</dl>
+						<div class="clearer"></div>
+					</div>
+				</fieldset>
+			</div>
+<?php if (!empty($user_info['messaging'])): ?>			<div class="inform">
+				<fieldset>
+				<legend><?php _e('Section messaging') ?></legend>
+					<div class="infldset">
+						<dl>
+							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['messaging'])."\n" ?>
+						</dl>
+						<div class="clearer"></div>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; if (!empty($user_info['personality'])): ?>			<div class="inform">
+				<fieldset>
+				<legend><?php _e('Section personality') ?></legend>
+					<div class="infldset">
+						<dl>
+							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personality'])."\n" ?>
+						</dl>
+						<div class="clearer"></div>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; ?>			<div class="inform">
+				<fieldset>
+				<legend><?php _e('User activity') ?></legend>
+					<div class="infldset">
+						<dl>
+							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['activity'])."\n" ?>
+						</dl>
+						<div class="clearer"></div>
+					</div>
+				</fieldset>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/register/email.php b/style/themes/MyFeatherBB/view/register/email.php
new file mode 100644
index 00000000..a93188f9
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/register/email.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div id="emailform" class="blockform">
+	<h2><span><?php _e('Send email to') ?> <?php echo $feather->utils->escape($recipient) ?></span></h2>
+	<div class="box">
+		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Write email') ?></legend>
+					<div class="infldset txtarea">
+						<input type="hidden" name="form_sent" value="1" />
+						<input type="hidden" name="redirect_url" value="<?php echo $feather->utils->escape($redirect_url) ?>" />
+						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
+						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
+						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
+						<p><?php _e('Email disclosure note') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/register/form.php b/style/themes/MyFeatherBB/view/register/form.php
new file mode 100644
index 00000000..d7deb65f
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/register/form.php
@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+// If there are errors, we display them
+if (!empty($errors)) {
+    ?>
+<div id="posterror" class="block">
+	<h2><span><?php _e('Registration errors') ?></span></h2>
+	<div class="box">
+		<div class="inbox error-info">
+			<p><?php _e('Registration errors info') ?></p>
+			<ul class="error-list">
+<?php
+
+    foreach ($errors as $cur_error) {
+        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+    }
+    ?>
+			</ul>
+		</div>
+	</div>
+</div>
+
+<?php
+
+}
+?>
+<div id="regform" class="blockform">
+	<h2><span><?php _e('Register') ?></span></h2>
+	<div class="box">
+		<form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
+		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<div class="forminfo">
+					<h3><?php _e('Important information') ?></h3>
+					<p><?php _e('Desc 1') ?></p>
+					<p><?php _e('Desc 2') ?></p>
+				</div>
+				<fieldset>
+					<legend><?php _e('Username legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<input type="hidden" name="username" value="" />
+						<input type="hidden" name="password" value="" />
+						<label class="required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
+    echo $feather->utils->escape($feather->request->post('req_user'));
+} ?>" size="25" maxlength="25" /><br /></label>
+					</div>
+				</fieldset>
+			</div>
+<?php if ($feather->forum_settings['o_regs_verify'] == '0'): ?>			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Pass legend') ?></legend>
+					<div class="infldset">
+						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
+    echo $feather->utils->escape($feather->request->post('req_password1'));
+} ?>" size="16" /><br /></label>
+						<label class="conl required"><strong><?php _e('Confirm pass') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
+    echo $feather->utils->escape($feather->request->post('req_password2'));
+} ?>" size="16" /><br /></label>
+						<p class="clearb"><?php _e('Pass info') ?></p>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; ?>			<div class="inform">
+				<fieldset>
+					<legend><?php echo($feather->forum_settings['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
+					<div class="infldset">
+<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
+<?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
+    echo $feather->utils->escape($feather->request->post('req_email1'));
+} ?>" size="50" maxlength="80" /><br /></label>
+<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
+    echo $feather->utils->escape($feather->request->post('req_email2'));
+} ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>					</div>
+				</fieldset>
+			</div>
+<?php
+        // Only display the language selection box if there's more than one language available
+        if (count($languages) > 1) {
+            ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Localisation legend') ?></legend>
+					<div class="infldset">
+							<label><?php _e('Language') ?>
+							<br /><select name="language">
+<?php
+
+            foreach ($languages as $temp) {
+                if ($feather->forum_settings['o_default_lang'] == $temp) {
+                    echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
+                } else {
+                    echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
+                }
+            }
+
+            ?>
+							</select>
+							<br /></label>
+					</div>
+				</fieldset>
+			</div>
+<?php
+
+        }
+?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Robot title') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Robot info')    ?></p>
+						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php _e('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="register" value="<?php _e('Register') ?>" /></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/register/rules.php b/style/themes/MyFeatherBB/view/register/rules.php
new file mode 100644
index 00000000..326c96ad
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/register/rules.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div id="rules" class="blockform">
+	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
+	<div class="box">
+		<form method="get" action="<?php echo $feather->url->get('register/') ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Rules legend') ?></legend>
+					<div class="infldset">
+						<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="agree" value="<?php _e('Agree') ?>" /> <input type="submit" name="cancel" value="<?php _e('Cancel') ?>" /></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/search/footer.php b/style/themes/MyFeatherBB/view/search/footer.php
new file mode 100644
index 00000000..0dd6fc5e
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/search/footer.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+if ($search['show_as'] == 'topics') :
+?>
+			</tbody>
+		</table>
+		</div>
+	</div>
+</div>
+
+<?php
+endif;
+?>
+
+<div class="postlinksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
+		</ul>
+<?php echo(!empty($search['forum_actions']) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $search['forum_actions']).'</p>'."\n" : '') ?>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/search/form.php b/style/themes/MyFeatherBB/view/search/form.php
new file mode 100644
index 00000000..16cd788a
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/search/form.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div id="searchform" class="blockform">
+	<h2><span><?php _e('Search') ?></span></h2>
+	<div class="box">
+		<form id="search" method="get" action="">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Search criteria legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="action" value="search" />
+						<label class="conl"><?php _e('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
+						<label class="conl"><?php _e('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
+						<p class="clearb"><?php _e('Search info') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Search in legend') ?></legend>
+					<div class="infldset">
+					<?php echo $forums ?>
+						<label class="conl"><?php _e('Search in')."\n" ?>
+						<br /><select id="search_in" name="search_in">
+							<option value="0"><?php _e('Message and subject') ?></option>
+							<option value="1"><?php _e('Message only') ?></option>
+							<option value="-1"><?php _e('Topic only') ?></option>
+						</select>
+						<br /></label>
+						<p class="clearl"><?php _e('Search in info') ?></p>
+<?php echo($feather->forum_settings['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Search results legend') ?></legend>
+					<div class="infldset">
+						<label class="conl"><?php _e('Sort by')."\n" ?>
+						<br /><select name="sort_by">
+							<option value="0"><?php _e('Sort by post time') ?></option>
+							<option value="1"><?php _e('Sort by author') ?></option>
+							<option value="2"><?php _e('Sort by subject') ?></option>
+							<option value="3"><?php _e('Sort by forum') ?></option>
+						</select>
+						<br /></label>
+						<label class="conl"><?php _e('Sort order')."\n" ?>
+						<br /><select name="sort_dir">
+							<option value="DESC"><?php _e('Descending') ?></option>
+							<option value="ASC"><?php _e('Ascending') ?></option>
+						</select>
+						<br /></label>
+						<label class="conl"><?php _e('Show as')."\n" ?>
+						<br /><select name="show_as">
+							<option value="topics"><?php _e('Show as topics') ?></option>
+							<option value="posts"><?php _e('Show as posts') ?></option>
+						</select>
+						<br /></label>
+						<p class="clearb"><?php _e('Search results info') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/search/header.php b/style/themes/MyFeatherBB/view/search/header.php
new file mode 100644
index 00000000..de5e1f0a
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/search/header.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<?php
+if ($search['show_as'] == 'topics') :
+?>
+<div id="vf" class="blocktable">
+	<h2><span><?php _e('Search results') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
+					<th class="tc2" scope="col"><?php _e('Forum') ?></th>
+					<th class="tc3" scope="col"><?php _e('Replies') ?></th>
+					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+endif;
diff --git a/style/themes/MyFeatherBB/view/search/posts.php b/style/themes/MyFeatherBB/view/search/posts.php
new file mode 100644
index 00000000..3a2be8ef
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/search/posts.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockpost<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($cur_search['pid'] == $cur_search['first_post_id']) {
+    echo ' firstpost';
+} ?><?php if ($post_count == 1) {
+    echo ' blockpost1';
+} ?><?php if ($cur_search['item_status'] != '') {
+    echo ' '.$cur_search['item_status'];
+} ?>">
+<h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
+    _e('Re').' ';
+} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
+<div class="box">
+	<div class="inbox">
+		<div class="postbody">
+			<div class="postleft">
+				<dl>
+					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
+<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.$feather->utils->forum_number_format($cur_search['num_replies']) ?></span></dd>
+<?php endif; ?>
+					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
+				</dl>
+			</div>
+			<div class="postright">
+				<div class="postmsg">
+					<?php echo $cur_search['message']."\n" ?>
+				</div>
+			</div>
+			<div class="clearer"></div>
+		</div>
+	</div>
+	<div class="inbox">
+		<div class="postfoot clearb">
+			<div class="postfootright">
+				<ul>
+					<li><span><a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
+					<li><span><a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/search/topics.php b/style/themes/MyFeatherBB/view/search/topics.php
new file mode 100644
index 00000000..265cbb27
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/search/topics.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<tr class="<?php echo $cur_search['item_status'] ?>">
+	<td class="tcl">
+		<div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
+		<div class="tclcon">
+			<div>
+				<?php echo $subject."\n" ?>
+			</div>
+		</div>
+	</td>
+	<td class="tc2"><?php echo $forum ?></td>
+	<td class="tc3"><?php echo $feather->utils->forum_number_format($cur_search['num_replies']) ?></td>
+	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.$feather->utils->format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.$feather->utils->escape($cur_search['last_poster']) ?></span></td>
+</tr>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/userlist.php b/style/themes/MyFeatherBB/view/userlist.php
new file mode 100644
index 00000000..3166d107
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/userlist.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="blockform">
+	<h2><span><?php _e('User search') ?></span></h2>
+	<div class="box">
+		<form id="userlist" method="get" action="">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('User find legend') ?></legend>
+					<div class="infldset">
+<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo $feather->utils->escape($username) ?>" size="25" maxlength="25" /><br /></label>
+<?php endif; ?>						<label class="conl"><?php _e('User group')."\n" ?>
+						<br /><select name="show_group">
+							<option value="-1"<?php if ($show_group == -1) {
+    echo ' selected="selected"';
+} ?>><?php _e('All users') ?></option>
+<?php echo $dropdown_menu ?>
+						</select>
+						<br /></label>
+						<label class="conl"><?php _e('Sort by')."\n" ?>
+						<br /><select name="sort_by">
+							<option value="username"<?php if ($sort_by == 'username') {
+    echo ' selected="selected"';
+} ?>><?php _e('Username') ?></option>
+							<option value="registered"<?php if ($sort_by == 'registered') {
+    echo ' selected="selected"';
+} ?>><?php _e('Registered') ?></option>
+<?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
+    echo ' selected="selected"';
+} ?>><?php _e('No of posts') ?></option>
+<?php endif; ?>						</select>
+						<br /></label>
+						<label class="conl"><?php _e('Sort order')."\n" ?>
+						<br /><select name="sort_dir">
+							<option value="ASC"<?php if ($sort_dir == 'ASC') {
+    echo ' selected="selected"';
+} ?>><?php _e('Ascending') ?></option>
+							<option value="DESC"<?php if ($sort_dir == 'DESC') {
+    echo ' selected="selected"';
+} ?>><?php _e('Descending') ?></option>
+						</select>
+						<br /></label>
+						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? __('User search info').' ' : '').__('User sort info'); ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
+		</form>
+	</div>
+</div>
+
+<div class="linkst">
+	<div class="inbox">
+		<p class="pagelink"><?php echo $paging_links ?></p>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<div id="users1" class="blocktable">
+	<h2><span><?php _e('User list') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Username') ?></th>
+					<th class="tc2" scope="col"><?php _e('Title') ?></th>
+<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Registered') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+			<?php
+            foreach ($userlist_data as $user) {
+                ?>
+					<tr>
+						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.$feather->utils->escape($user['username']).'</a>' ?></td>
+						<td class="tc2"><?php echo get_title($user) ?></td>
+	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo $feather->utils->forum_number_format($user['num_posts']) ?></td>
+	<?php endif;
+                ?>
+						<td class="tcr"><?php echo $feather->utils->format_time($user['registered'], true) ?></td>
+					</tr>
+			<?php
+
+            }
+            if (empty($userlist_data)) {
+                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.__('No hits').'</td></tr>'."\n";
+            }
+            ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox">
+		<p class="pagelink"><?php echo $paging_links ?></p>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/viewforum.php b/style/themes/MyFeatherBB/view/viewforum.php
new file mode 100644
index 00000000..dbf440af
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/viewforum.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+<?php echo $post_link ?>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<div id="vf" class="blocktable">
+	<h2><span><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
+					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+			<?php
+            $topic_count = 0;
+            foreach ($forum_data as $topic) {
+                ++$topic_count;
+                ?>
+					<tr class="<?php echo $topic['item_status'] ?>">
+						<td class="tcl">
+							<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
+							<div class="tclcon">
+								<div>
+									<?php echo $topic['subject_formatted']."\n" ?>
+								</div>
+							</div>
+						</td>
+						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? $feather->utils->forum_number_format($topic['num_replies']) : '-' ?></td>
+	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? $feather->utils->forum_number_format($topic['num_views']) : '-' ?></td>
+	<?php endif;
+                ?>					<td class="tcr"><?php echo $topic['last_post_formatted'] ?></td>
+					</tr>
+			<?php
+
+            }
+            if (empty($forum_data)):
+            ?>
+					<tr class="rowodd inone">
+						<td class="tcl" colspan="<?php echo($feather->forum_settings['o_topic_views'] == 1) ? 4 : 3 ?>">
+							<div class="icon inone"><div class="nosize"><!-- --></div></div>
+							<div class="tclcon">
+								<div>
+									<strong><?php _e('Empty forum') ?></strong>
+								</div>
+							</div>
+						</td>
+					</tr>
+			<?php
+            endif;
+            ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+<?php echo $post_link ?>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></strong></li>
+		</ul>
+<?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
+		<div class="clearer"></div>
+	</div>
+</div>
diff --git a/style/themes/MyFeatherBB/view/viewtopic.php b/style/themes/MyFeatherBB/view/viewtopic.php
new file mode 100644
index 00000000..d16a862c
--- /dev/null
+++ b/style/themes/MyFeatherBB/view/viewtopic.php
@@ -0,0 +1,204 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+<?php echo $post_link ?>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<?php
+$post_count = 1;
+foreach ($post_data as $post) {
+    ?>
+<div id="p<?php echo $post['id'] ?>" class="blockpost<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($post['id'] == $cur_topic['first_post_id']) {
+    echo ' firstpost';
+}
+    ?><?php if ($post_count == 1) {
+    echo ' blockpost1';
+}
+    ?>">
+	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<div class="postbody">
+				<div class="postleft">
+					<dl>
+						<dt><strong><?php echo $post['username_formatted'] ?></strong></dt>
+						<dd class="usertitle"><strong><?php echo $post['user_title_formatted'] ?></strong></dd>
+<?php if ($post['user_avatar'] != '') {
+    echo "\t\t\t\t\t\t".'<dd class="postavatar">'.$post['user_avatar'].'</dd>'."\n";
+}
+    ?>
+<?php if (count($post['user_info'])) {
+    echo "\t\t\t\t\t\t".implode("\n\t\t\t\t\t\t", $post['user_info'])."\n";
+}
+    ?>
+<?php if (count($post['user_contacts'])) {
+    echo "\t\t\t\t\t\t".'<dd class="usercontacts">'.implode(' ', $post['user_contacts']).'</dd>'."\n";
+}
+    ?>
+					</dl>
+				</div>
+				<div class="postright">
+					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
+    _e('Re').' ';
+}
+    ?><?php echo $feather->utils->escape($cur_topic['subject']) ?></h3>
+					<div class="postmsg">
+						<?php echo $post['message']."\n" ?>
+<?php if ($post['edited'] != '') {
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.$feather->utils->escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
+}
+    ?>
+					</div>
+<?php if ($post['signature_formatted'] != '') {
+    echo "\t\t\t\t\t".'<div class="postsignature postmsg"><hr />'.$post['signature_formatted'].'</div>'."\n";
+}
+    ?>
+				</div>
+			</div>
+		</div>
+		<div class="inbox">
+			<div class="postfoot clearb">
+				<div class="postfootleft"><?php if ($post['poster_id'] > 1) {
+    echo '<p>'.$post['is_online_formatted'].'</p>';
+}
+    ?></div>
+<?php if (count($post['post_actions'])) {
+    echo "\t\t\t\t".'<div class="postfootright">'."\n\t\t\t\t\t".'<ul>'."\n\t\t\t\t\t\t".implode("\n\t\t\t\t\t\t", $post['post_actions'])."\n\t\t\t\t\t".'</ul>'."\n\t\t\t\t".'</div>'."\n";
+}
+    ?>
+			</div>
+		</div>
+	</div>
+</div>
+<?php
+    ++$post_count;
+}
+?>
+
+<div class="postlinksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+<?php echo $post_link ?>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></strong></li>
+		</ul>
+<?php echo $subscraction ?>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<?php
+
+// Display quick post if enabled
+if ($quickpost) {
+    $cur_index = 1;
+
+    ?>
+<div id="quickpost" class="blockform">
+	<h2><span><?php _e('Quick post') ?></span></h2>
+	<div class="box">
+		<form id="quickpostform" method="post" action="<?php echo $feather->url->get('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Write message legend') ?></legend>
+					<div class="infldset txtarea">
+						<input type="hidden" name="form_sent" value="1" />
+						<input type="hidden" name="pid" value="<?php echo $feather->utils->escape($pid) ?>" />
+						<input type="hidden" name="page" value="<?php echo $feather->utils->escape($page_number) ?>" />
+<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
+<?php endif;
+
+    if ($feather->user->is_guest) {
+        $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+        $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
+        ?>
+						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<div class="clearer"></div>
+<?php
+
+    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.__('Message').' <span>'.__('Required').'</span></strong><br />';
+    } else {
+        echo "\t\t\t\t\t\t".'<label>';
+    }
+
+    ?>
+<!-- Init BBcode editor toolbar -->
+<script>
+    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
+        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
+</script>
+<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
+<script>postEditorToolbar('req_message');</script>
+
+<textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
+						<ul class="bblinks">
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
+    ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+    ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
+    ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
+    ?></span></li>
+						</ul>
+					</div>
+				</fieldset>
+			</div>
+			<?php if ($feather->user->is_guest) : ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Robot title') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Robot info')    ?></p>
+						<label class="required"><strong><?php
+                             $question = array_keys($lang_antispam_questions);
+    $qencoded = md5($question[$index_questions]);
+    echo sprintf(__('Robot question'), $question[$index_questions]);
+    ?>
+							 <span><?php _e('Required') ?></span></strong>
+							 <br />
+							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
+						</label>
+					</div>
+				</fieldset>
+			</div>
+			<?php endif;
+    ?>
+			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php _e('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
+		</form>
+	</div>
+</div>
+<?php
+
+}
diff --git a/view/footer.php b/view/footer.php
index 2cad803c..91b04b60 100644
--- a/view/footer.php
+++ b/view/footer.php
@@ -128,7 +128,7 @@
 
 </section>
 
-<script src="<?php echo $feather->url->base() ?>/style/FeatherBB/phone.min.js"></script>
+<script src="<?php echo $feather->url->base() ?>/style/themes/FeatherBB/phone.min.js"></script>
 
 </body>
 </html>
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
index 8fc83a15..7cce9e3c 100644
--- a/view/profile/section_display.php
+++ b/view/profile/section_display.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -21,7 +21,7 @@
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php
 
-    $styles = forum_list_styles();
+    $styles = \FeatherBB\Lister::getStyles();
 
     // Only display the style selection box if there's more than one style available
     if (count($styles) == 1) {
@@ -98,4 +98,4 @@
 	</div>
 </div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/profile/section_essentials.php b/view/profile/section_essentials.php
index 3d82ca0b..b45114f6 100644
--- a/view/profile/section_essentials.php
+++ b/view/profile/section_essentials.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -209,7 +209,7 @@
 
 <?php
 
-    $languages = forum_list_langs();
+    $languages = \FeatherBB\Lister::getLangs();
 
     // Only display the language selection box if there's more than one language available
     if (count($languages) > 1) {
@@ -255,4 +255,4 @@
 	</div>
 </div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>

From 33188913089dd99b4abf68a5dfc912fd11727970 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 30 Aug 2015 22:06:32 +0200
Subject: [PATCH 277/353] Enable changing themes support

---
 include/classes/view.class.php               | 4 ++--
 style/themes/FeatherBB/view/header.new.php   | 2 ++
 style/themes/MyFeatherBB/view/header.new.php | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index ecacd478..3605046c 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -208,7 +208,7 @@ public function getTemplatePathname($file)
 
     public function display($nested = true)
     {
-        // $this->setStyle($this->app->user->style);
+        $this->setStyle($this->app->user->style);
         echo $this->fetch($nested);
     }
 
@@ -254,7 +254,7 @@ public function setStyle($style)
         }
         $this->data->set('style', (string) $style);
         $this->setTemplatesDirectory($this->app->forum_env['FEATHER_ROOT'].'style/themes/'.$style.'/view');
-        $this->addAsset('css', 'style/themes/'.$style.'/style.css');
+        // $this->addAsset('css', 'style/themes/'.$style.'/style.css');
         return $this;
     }
 
diff --git a/style/themes/FeatherBB/view/header.new.php b/style/themes/FeatherBB/view/header.new.php
index cba067ee..99e56d2c 100644
--- a/style/themes/FeatherBB/view/header.new.php
+++ b/style/themes/FeatherBB/view/header.new.php
@@ -19,6 +19,8 @@
     echo "\t".'<meta name="robots" content="noindex, follow">'."\n";
 } ?>
     <title><?php echo generate_page_title($title, $page_number) ?></title>
+    <!-- Theme -->
+    <link rel="stylesheet" type="text/css" href="<?= $feather->url->base() ?>/style/themes/<?= $style ?>/style.css">
 <?php
 
 foreach($assets as $type => $items) {
diff --git a/style/themes/MyFeatherBB/view/header.new.php b/style/themes/MyFeatherBB/view/header.new.php
index 0fb8af32..4269d842 100644
--- a/style/themes/MyFeatherBB/view/header.new.php
+++ b/style/themes/MyFeatherBB/view/header.new.php
@@ -19,6 +19,8 @@
     echo "\t".'<meta name="robots" content="noindex, follow">'."\n";
 } ?>
     <title><?php echo generate_page_title($title, $page_number) ?></title>
+    <!-- Theme -->
+    <link rel="stylesheet" type="text/css" href="<?= $feather->url->base() ?>/style/themes/<?= $style ?>/style.css">
 <?php
 foreach($assets as $type => $items) {
     if ($type == 'js') {

From d032b24daf6a6ed026f5b9f462caf131a6fedf15 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 30 Aug 2015 22:36:21 +0200
Subject: [PATCH 278/353] Move /img into /style folder

---
 controller/admin/parser.php                   |   4 ++--
 controller/install.php                        |   6 +++---
 include/bbcd_compile.php                      |   4 ++--
 include/bbcd_source.php                       |   2 +-
 model/admin/parser.php                        |   4 ++--
 {img => style/img}/avatars/.gitkeep           |   0
 {img => style/img}/bbeditor/align-center.png  | Bin
 {img => style/img}/bbeditor/align-justify.png | Bin
 {img => style/img}/bbeditor/align-left.png    | Bin
 {img => style/img}/bbeditor/align-right.png   | Bin
 {img => style/img}/bbeditor/bold.png          | Bin
 {img => style/img}/bbeditor/code.png          | Bin
 {img => style/img}/bbeditor/eyedropper.png    | Bin
 {img => style/img}/bbeditor/file-image-o.png  | Bin
 {img => style/img}/bbeditor/italic.png        | Bin
 {img => style/img}/bbeditor/link.png          | Bin
 {img => style/img}/bbeditor/list-ol.png       | Bin
 {img => style/img}/bbeditor/list-ul.png       | Bin
 {img => style/img}/bbeditor/quote-left.png    | Bin
 {img => style/img}/bbeditor/underline.png     | Bin
 {img => style/img}/logo.png                   | Bin
 {img => style/img}/smilies/big_smile.png      | Bin
 {img => style/img}/smilies/cool.png           | Bin
 {img => style/img}/smilies/hmm.png            | Bin
 {img => style/img}/smilies/lol.png            | Bin
 {img => style/img}/smilies/mad.png            | Bin
 {img => style/img}/smilies/neutral.png        | Bin
 {img => style/img}/smilies/roll.png           | Bin
 {img => style/img}/smilies/sad.png            | Bin
 {img => style/img}/smilies/smile.png          | Bin
 {img => style/img}/smilies/tongue.png         | Bin
 {img => style/img}/smilies/wink.png           | Bin
 {img => style/img}/smilies/yikes.png          | Bin
 style/themes/FeatherBB/view/help.php          |   7 ++++---
 style/themes/MyFeatherBB/view/help.php        |   2 +-
 view/help.php                                 |   2 +-
 36 files changed, 16 insertions(+), 15 deletions(-)
 rename {img => style/img}/avatars/.gitkeep (100%)
 rename {img => style/img}/bbeditor/align-center.png (100%)
 rename {img => style/img}/bbeditor/align-justify.png (100%)
 rename {img => style/img}/bbeditor/align-left.png (100%)
 rename {img => style/img}/bbeditor/align-right.png (100%)
 rename {img => style/img}/bbeditor/bold.png (100%)
 rename {img => style/img}/bbeditor/code.png (100%)
 rename {img => style/img}/bbeditor/eyedropper.png (100%)
 rename {img => style/img}/bbeditor/file-image-o.png (100%)
 rename {img => style/img}/bbeditor/italic.png (100%)
 rename {img => style/img}/bbeditor/link.png (100%)
 rename {img => style/img}/bbeditor/list-ol.png (100%)
 rename {img => style/img}/bbeditor/list-ul.png (100%)
 rename {img => style/img}/bbeditor/quote-left.png (100%)
 rename {img => style/img}/bbeditor/underline.png (100%)
 rename {img => style/img}/logo.png (100%)
 rename {img => style/img}/smilies/big_smile.png (100%)
 rename {img => style/img}/smilies/cool.png (100%)
 rename {img => style/img}/smilies/hmm.png (100%)
 rename {img => style/img}/smilies/lol.png (100%)
 rename {img => style/img}/smilies/mad.png (100%)
 rename {img => style/img}/smilies/neutral.png (100%)
 rename {img => style/img}/smilies/roll.png (100%)
 rename {img => style/img}/smilies/sad.png (100%)
 rename {img => style/img}/smilies/smile.png (100%)
 rename {img => style/img}/smilies/tongue.png (100%)
 rename {img => style/img}/smilies/wink.png (100%)
 rename {img => style/img}/smilies/yikes.png (100%)

diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index fb3244b9..6ea82ff2 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -54,7 +54,7 @@ public function display()
         if ($this->request->post('form_sent')) {
 
 
-            // Upload new smiley image to img/smilies
+            // Upload new smiley image to style/img/smilies
             if ($this->request->post('upload') && isset($_FILES['new_smiley']) && isset($_FILES['new_smiley']['error'])) {
                 $f = $_FILES['new_smiley'];
                 switch ($f['error']) {
@@ -64,7 +64,7 @@ public function display()
                         if (preg_match('/^[\w\-.]++$/', $name)) {            // If we have a valid filename?
                             if (preg_match('%^image/%', $f['type'])) {        // If we have an image file type?
                                 if ($f['size'] > 0 && $f['size'] <= $this->config['o_avatars_size']) {
-                                    if (move_uploaded_file($f['tmp_name'], FEATHER_ROOT .'img/smilies/'. $name)) {
+                                    if (move_uploaded_file($f['tmp_name'], FEATHER_ROOT .'style/img/smilies/'. $name)) {
                                         redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['upload success']);
                                     } else { //  Error #1: 'Smiley upload failed. Unable to move to smiley folder.'.
                                         throw new \FeatherBB\Error($lang_admin_parser['upload_err_1'], 500);
diff --git a/controller/install.php b/controller/install.php
index b959a84d..c9a6bd32 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -102,8 +102,8 @@ public function run()
                 }
 
                 // Check if default avatar directory is writable
-                if (!is_writable($this->feather->forum_env['FEATHER_ROOT'].'img/avatars/')) {
-                    $this->errors[] = sprintf(__('Alert avatar'), $this->feather->forum_env['FEATHER_ROOT'].'img/avatars/');
+                if (!is_writable($this->feather->forum_env['FEATHER_ROOT'].'style/img/avatars/')) {
+                    $this->errors[] = sprintf(__('Alert avatar'), $this->feather->forum_env['FEATHER_ROOT'].'style/img/avatars/');
                 }
 
                 // Validate db_prefix if existing
@@ -257,7 +257,7 @@ public function load_default_config(array $data)
             'o_default_email_setting'    => 1,
             'o_mailing_list'            => $data['email'],
             'o_avatars'                    => $data['avatars'],
-            'o_avatars_dir'                => 'img/avatars',
+            'o_avatars_dir'                => 'style/img/avatars',
             'o_avatars_width'            => 60,
             'o_avatars_height'            => 60,
             'o_avatars_size'            => 10240,
diff --git a/include/bbcd_compile.php b/include/bbcd_compile.php
index 89f002c2..02b2c3b3 100644
--- a/include/bbcd_compile.php
+++ b/include/bbcd_compile.php
@@ -181,9 +181,9 @@
 $feather = \Slim\Slim::getInstance();
 // Validate and compute replacement texts for smilies array.
 $re_keys = array();                                    // Array of regex-safe smiley texts.
-$file_path = FEATHER_ROOT . 'img/smilies/';                // File system path to smilies.
+$file_path = FEATHER_ROOT . 'style/img/smilies/';                // File system path to smilies.
 $url_path = $feather->url->base(true);                        // Convert abs URL to relative URL.
-$url_path = preg_replace('%^https?://[^/]++(.*)$%i', '$1', $url_path) . '/img/smilies/';
+$url_path = preg_replace('%^https?://[^/]++(.*)$%i', '$1', $url_path) . '/style/img/smilies/';
 foreach ($smilies as $smiley_text => $smiley_img) {    // Loop through all smilieys in array.
     $file = $file_path . $smiley_img['file'];        // Local file system address of smiley.
     if (!file_exists($file)) {
diff --git a/include/bbcd_source.php b/include/bbcd_source.php
index 4b855205..145ab959 100644
--- a/include/bbcd_source.php
+++ b/include/bbcd_source.php
@@ -31,7 +31,7 @@
     'smiley_size'   => 100,            // Percent size adjust for display of smilies.
 ); // End $config array.
 
-// Array of smileys. These files are located in the img/smilies folder).
+// Array of smileys. These files are located in the style/img/smilies folder).
 $smilies = array(
     ':)'            => array('file'    => 'smile.png'),
     '=)'            => array('file'    => 'smile.png'),
diff --git a/model/admin/parser.php b/model/admin/parser.php
index 71c8b6d9..a2c25a20 100644
--- a/model/admin/parser.php
+++ b/model/admin/parser.php
@@ -25,11 +25,11 @@ public function __construct()
     }
 
     // Helper public function returns array of smiley image files
-    //   stored in the img/smilies directory.
+    //   stored in the style/img/smilies directory.
     public function get_smiley_files()
     {
         $imgfiles = array();
-        $filelist = scandir(FEATHER_ROOT.'img/smilies');
+        $filelist = scandir(FEATHER_ROOT.'style/img/smilies');
         $filelist = $this->hook->fire('parser.get_smiley_files.filelist', $filelist);
         foreach ($filelist as $file) {
             if (preg_match('/\.(?:png|gif|jpe?g)$/', $file)) {
diff --git a/img/avatars/.gitkeep b/style/img/avatars/.gitkeep
similarity index 100%
rename from img/avatars/.gitkeep
rename to style/img/avatars/.gitkeep
diff --git a/img/bbeditor/align-center.png b/style/img/bbeditor/align-center.png
similarity index 100%
rename from img/bbeditor/align-center.png
rename to style/img/bbeditor/align-center.png
diff --git a/img/bbeditor/align-justify.png b/style/img/bbeditor/align-justify.png
similarity index 100%
rename from img/bbeditor/align-justify.png
rename to style/img/bbeditor/align-justify.png
diff --git a/img/bbeditor/align-left.png b/style/img/bbeditor/align-left.png
similarity index 100%
rename from img/bbeditor/align-left.png
rename to style/img/bbeditor/align-left.png
diff --git a/img/bbeditor/align-right.png b/style/img/bbeditor/align-right.png
similarity index 100%
rename from img/bbeditor/align-right.png
rename to style/img/bbeditor/align-right.png
diff --git a/img/bbeditor/bold.png b/style/img/bbeditor/bold.png
similarity index 100%
rename from img/bbeditor/bold.png
rename to style/img/bbeditor/bold.png
diff --git a/img/bbeditor/code.png b/style/img/bbeditor/code.png
similarity index 100%
rename from img/bbeditor/code.png
rename to style/img/bbeditor/code.png
diff --git a/img/bbeditor/eyedropper.png b/style/img/bbeditor/eyedropper.png
similarity index 100%
rename from img/bbeditor/eyedropper.png
rename to style/img/bbeditor/eyedropper.png
diff --git a/img/bbeditor/file-image-o.png b/style/img/bbeditor/file-image-o.png
similarity index 100%
rename from img/bbeditor/file-image-o.png
rename to style/img/bbeditor/file-image-o.png
diff --git a/img/bbeditor/italic.png b/style/img/bbeditor/italic.png
similarity index 100%
rename from img/bbeditor/italic.png
rename to style/img/bbeditor/italic.png
diff --git a/img/bbeditor/link.png b/style/img/bbeditor/link.png
similarity index 100%
rename from img/bbeditor/link.png
rename to style/img/bbeditor/link.png
diff --git a/img/bbeditor/list-ol.png b/style/img/bbeditor/list-ol.png
similarity index 100%
rename from img/bbeditor/list-ol.png
rename to style/img/bbeditor/list-ol.png
diff --git a/img/bbeditor/list-ul.png b/style/img/bbeditor/list-ul.png
similarity index 100%
rename from img/bbeditor/list-ul.png
rename to style/img/bbeditor/list-ul.png
diff --git a/img/bbeditor/quote-left.png b/style/img/bbeditor/quote-left.png
similarity index 100%
rename from img/bbeditor/quote-left.png
rename to style/img/bbeditor/quote-left.png
diff --git a/img/bbeditor/underline.png b/style/img/bbeditor/underline.png
similarity index 100%
rename from img/bbeditor/underline.png
rename to style/img/bbeditor/underline.png
diff --git a/img/logo.png b/style/img/logo.png
similarity index 100%
rename from img/logo.png
rename to style/img/logo.png
diff --git a/img/smilies/big_smile.png b/style/img/smilies/big_smile.png
similarity index 100%
rename from img/smilies/big_smile.png
rename to style/img/smilies/big_smile.png
diff --git a/img/smilies/cool.png b/style/img/smilies/cool.png
similarity index 100%
rename from img/smilies/cool.png
rename to style/img/smilies/cool.png
diff --git a/img/smilies/hmm.png b/style/img/smilies/hmm.png
similarity index 100%
rename from img/smilies/hmm.png
rename to style/img/smilies/hmm.png
diff --git a/img/smilies/lol.png b/style/img/smilies/lol.png
similarity index 100%
rename from img/smilies/lol.png
rename to style/img/smilies/lol.png
diff --git a/img/smilies/mad.png b/style/img/smilies/mad.png
similarity index 100%
rename from img/smilies/mad.png
rename to style/img/smilies/mad.png
diff --git a/img/smilies/neutral.png b/style/img/smilies/neutral.png
similarity index 100%
rename from img/smilies/neutral.png
rename to style/img/smilies/neutral.png
diff --git a/img/smilies/roll.png b/style/img/smilies/roll.png
similarity index 100%
rename from img/smilies/roll.png
rename to style/img/smilies/roll.png
diff --git a/img/smilies/sad.png b/style/img/smilies/sad.png
similarity index 100%
rename from img/smilies/sad.png
rename to style/img/smilies/sad.png
diff --git a/img/smilies/smile.png b/style/img/smilies/smile.png
similarity index 100%
rename from img/smilies/smile.png
rename to style/img/smilies/smile.png
diff --git a/img/smilies/tongue.png b/style/img/smilies/tongue.png
similarity index 100%
rename from img/smilies/tongue.png
rename to style/img/smilies/tongue.png
diff --git a/img/smilies/wink.png b/style/img/smilies/wink.png
similarity index 100%
rename from img/smilies/wink.png
rename to style/img/smilies/wink.png
diff --git a/img/smilies/yikes.png b/style/img/smilies/yikes.png
similarity index 100%
rename from img/smilies/yikes.png
rename to style/img/smilies/yikes.png
diff --git a/style/themes/FeatherBB/view/help.php b/style/themes/FeatherBB/view/help.php
index 00669948..a6e83ae6 100644
--- a/style/themes/FeatherBB/view/help.php
+++ b/style/themes/FeatherBB/view/help.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -57,7 +57,8 @@
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
-		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo $feather->utils->escape($feather->url->base(true)) ?>/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo $feather->utils->escape($feather->url->base(true)) ?>/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
+        dede
+		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo $feather->utils->escape($feather->url->base(true)) ?>/style/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo $feather->utils->escape($feather->url->base(true)) ?>/style/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
 <h2><span><?php _e('Quotes') ?></span></h2>
@@ -138,4 +139,4 @@
 
 ?>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/MyFeatherBB/view/help.php b/style/themes/MyFeatherBB/view/help.php
index 00669948..1e7decf9 100644
--- a/style/themes/MyFeatherBB/view/help.php
+++ b/style/themes/MyFeatherBB/view/help.php
@@ -57,7 +57,7 @@
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
-		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo $feather->utils->escape($feather->url->base(true)) ?>/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo $feather->utils->escape($feather->url->base(true)) ?>/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
+		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo $feather->utils->escape($feather->url->base(true)) ?>/style/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo $feather->utils->escape($feather->url->base(true)) ?>/style/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
 <h2><span><?php _e('Quotes') ?></span></h2>
diff --git a/view/help.php b/view/help.php
index 00669948..1e7decf9 100644
--- a/view/help.php
+++ b/view/help.php
@@ -57,7 +57,7 @@
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
-		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo $feather->utils->escape($feather->url->base(true)) ?>/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo $feather->utils->escape($feather->url->base(true)) ?>/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
+		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo $feather->utils->escape($feather->url->base(true)) ?>/style/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo $feather->utils->escape($feather->url->base(true)) ?>/style/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
 <h2><span><?php _e('Quotes') ?></span></h2>

From f742a023e8ea04284260040d1ff124fe2f35be97 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 30 Aug 2015 22:41:31 +0200
Subject: [PATCH 279/353] Move /lang folder into /app

---
 app/lang/English/admin/bans.mo                | Bin 0 -> 4861 bytes
 app/lang/English/admin/bans.po                | 183 ++++++
 app/lang/English/admin/categories.mo          | Bin 0 -> 2167 bytes
 app/lang/English/admin/categories.po          |  84 +++
 app/lang/English/admin/censoring.mo           | Bin 0 -> 1551 bytes
 app/lang/English/admin/censoring.po           |  57 ++
 app/lang/English/admin/common.mo              | Bin 0 -> 1802 bytes
 app/lang/English/admin/common.po              | 117 ++++
 app/lang/English/admin/forums.mo              | Bin 0 -> 3548 bytes
 app/lang/English/admin/forums.po              | 147 +++++
 app/lang/English/admin/groups.mo              | Bin 0 -> 8477 bytes
 app/lang/English/admin/groups.po              | 261 ++++++++
 app/lang/English/admin/index.html             |   1 +
 app/lang/English/admin/index.mo               | Bin 0 -> 4052 bytes
 app/lang/English/admin/index.po               | 180 ++++++
 app/lang/English/admin/maintenance.mo         | Bin 0 -> 4083 bytes
 app/lang/English/admin/maintenance.po         | 114 ++++
 app/lang/English/admin/options.mo             | Bin 0 -> 18847 bytes
 app/lang/English/admin/options.po             | 603 ++++++++++++++++++
 app/lang/English/admin/parser.mo              | Bin 0 -> 5557 bytes
 app/lang/English/admin/parser.php             |  93 +++
 app/lang/English/admin/parser.po              | 168 +++++
 app/lang/English/admin/permissions.mo         | Bin 0 -> 2836 bytes
 app/lang/English/admin/permissions.po         | 102 +++
 app/lang/English/admin/plugin_example.mo      | Bin 0 -> 1137 bytes
 app/lang/English/admin/plugin_example.po      |  45 ++
 app/lang/English/admin/reports.mo             | Bin 0 -> 1083 bytes
 app/lang/English/admin/reports.po             |  57 ++
 app/lang/English/admin/users.mo               | Bin 0 -> 7114 bytes
 app/lang/English/admin/users.po               | 312 +++++++++
 app/lang/English/antispam.mo                  | Bin 0 -> 751 bytes
 app/lang/English/antispam.php                 |  23 +
 app/lang/English/antispam.po                  |  27 +
 app/lang/English/antispam_questions.mo        | Bin 0 -> 765 bytes
 app/lang/English/antispam_questions.po        |  43 ++
 app/lang/English/bbeditor.mo                  | Bin 0 -> 1082 bytes
 app/lang/English/bbeditor.po                  |  63 ++
 app/lang/English/common.mo                    | Bin 0 -> 9404 bytes
 app/lang/English/common.po                    | 473 ++++++++++++++
 app/lang/English/delete.mo                    | Bin 0 -> 1003 bytes
 app/lang/English/delete.po                    |  42 ++
 app/lang/English/forum.mo                     | Bin 0 -> 866 bytes
 app/lang/English/forum.po                     |  45 ++
 app/lang/English/help.mo                      | Bin 0 -> 4261 bytes
 app/lang/English/help.po                      | 165 +++++
 app/lang/English/index.mo                     | Bin 0 -> 1064 bytes
 app/lang/English/index.po                     |  54 ++
 app/lang/English/install.mo                   | Bin 0 -> 9441 bytes
 app/lang/English/install.po                   | 291 +++++++++
 app/lang/English/login.mo                     | Bin 0 -> 1877 bytes
 app/lang/English/login.po                     |  63 ++
 .../English/mail_templates/activate_email.tpl |  12 +
 .../mail_templates/activate_password.tpl      |  14 +
 .../mail_templates/banned_email_change.tpl    |   9 +
 .../mail_templates/banned_email_post.tpl      |   9 +
 .../mail_templates/banned_email_register.tpl  |   9 +
 .../mail_templates/dupe_email_change.tpl      |   9 +
 .../mail_templates/dupe_email_register.tpl    |   9 +
 .../English/mail_templates/form_email.tpl     |  13 +
 app/lang/English/mail_templates/new_reply.tpl |  11 +
 .../English/mail_templates/new_reply_full.tpl |  18 +
 .../English/mail_templates/new_report.tpl     |   9 +
 app/lang/English/mail_templates/new_topic.tpl |  11 +
 .../English/mail_templates/new_topic_full.tpl |  18 +
 app/lang/English/mail_templates/new_user.tpl  |  12 +
 app/lang/English/mail_templates/rename.tpl    |  12 +
 app/lang/English/mail_templates/welcome.tpl   |  12 +
 app/lang/English/misc.mo                      | Bin 0 -> 5068 bytes
 app/lang/English/misc.po                      | 225 +++++++
 app/lang/English/post.mo                      | Bin 0 -> 2395 bytes
 app/lang/English/post.po                      |  93 +++
 app/lang/English/prof_reg.mo                  | Bin 0 -> 5891 bytes
 app/lang/English/prof_reg.po                  | 225 +++++++
 app/lang/English/profile.mo                   | Bin 0 -> 9585 bytes
 app/lang/English/profile.po                   | 378 +++++++++++
 app/lang/English/register.mo                  | Bin 0 -> 3064 bytes
 app/lang/English/register.po                  |  84 +++
 app/lang/English/search.mo                    | Bin 0 -> 4068 bytes
 app/lang/English/search.po                    | 174 +++++
 app/lang/English/stopwords.txt                | 175 +++++
 app/lang/English/topic.mo                     | Bin 0 -> 1487 bytes
 app/lang/English/topic.po                     |  93 +++
 app/lang/English/update.mo                    | Bin 0 -> 7678 bytes
 app/lang/English/update.po                    | 195 ++++++
 app/lang/English/userlist.mo                  | Bin 0 -> 898 bytes
 app/lang/English/userlist.po                  |  33 +
 controller/admin/bans.php                     |   2 +-
 controller/admin/categories.php               |   2 +-
 controller/admin/censoring.php                |   2 +-
 controller/admin/forums.php                   |   2 +-
 controller/admin/groups.php                   |   2 +-
 controller/admin/index.php                    |   2 +-
 controller/admin/maintenance.php              |   2 +-
 controller/admin/options.php                  |   2 +-
 controller/admin/parser.php                   |   2 +-
 controller/admin/permissions.php              |   2 +-
 controller/admin/reports.php                  |   2 +-
 controller/admin/statistics.php               |   2 +-
 controller/admin/users.php                    |   2 +-
 controller/auth.php                           |   4 +-
 controller/delete.php                         |   4 +-
 controller/edit.php                           |   8 +-
 controller/help.php                           |   2 +-
 controller/index.php                          |   2 +-
 controller/install.php                        |   4 +-
 controller/login.php                          |   2 +-
 controller/misc.php                           |   4 +-
 controller/moderate.php                       |   8 +-
 controller/post.php                           |  12 +-
 controller/profile.php                        |   6 +-
 controller/register.php                       |   8 +-
 controller/search.php                         |   6 +-
 controller/userlist.php                       |   4 +-
 controller/viewforum.php                      |   2 +-
 controller/viewtopic.php                      |   8 +-
 extern.php                                    |   4 +-
 include/classes/auth.class.php                |   4 +-
 include/functions.php                         |   6 +-
 model/login.php                               |   2 +-
 model/misc.php                                |   4 +-
 model/post.php                                |  14 +-
 model/profile.php                             |   6 +-
 model/register.php                            |  12 +-
 123 files changed, 5756 insertions(+), 81 deletions(-)
 create mode 100644 app/lang/English/admin/bans.mo
 create mode 100644 app/lang/English/admin/bans.po
 create mode 100644 app/lang/English/admin/categories.mo
 create mode 100644 app/lang/English/admin/categories.po
 create mode 100644 app/lang/English/admin/censoring.mo
 create mode 100644 app/lang/English/admin/censoring.po
 create mode 100644 app/lang/English/admin/common.mo
 create mode 100644 app/lang/English/admin/common.po
 create mode 100644 app/lang/English/admin/forums.mo
 create mode 100644 app/lang/English/admin/forums.po
 create mode 100644 app/lang/English/admin/groups.mo
 create mode 100644 app/lang/English/admin/groups.po
 create mode 100644 app/lang/English/admin/index.html
 create mode 100644 app/lang/English/admin/index.mo
 create mode 100644 app/lang/English/admin/index.po
 create mode 100644 app/lang/English/admin/maintenance.mo
 create mode 100644 app/lang/English/admin/maintenance.po
 create mode 100644 app/lang/English/admin/options.mo
 create mode 100644 app/lang/English/admin/options.po
 create mode 100644 app/lang/English/admin/parser.mo
 create mode 100644 app/lang/English/admin/parser.php
 create mode 100644 app/lang/English/admin/parser.po
 create mode 100644 app/lang/English/admin/permissions.mo
 create mode 100644 app/lang/English/admin/permissions.po
 create mode 100644 app/lang/English/admin/plugin_example.mo
 create mode 100644 app/lang/English/admin/plugin_example.po
 create mode 100644 app/lang/English/admin/reports.mo
 create mode 100644 app/lang/English/admin/reports.po
 create mode 100644 app/lang/English/admin/users.mo
 create mode 100644 app/lang/English/admin/users.po
 create mode 100644 app/lang/English/antispam.mo
 create mode 100644 app/lang/English/antispam.php
 create mode 100644 app/lang/English/antispam.po
 create mode 100644 app/lang/English/antispam_questions.mo
 create mode 100644 app/lang/English/antispam_questions.po
 create mode 100644 app/lang/English/bbeditor.mo
 create mode 100644 app/lang/English/bbeditor.po
 create mode 100644 app/lang/English/common.mo
 create mode 100644 app/lang/English/common.po
 create mode 100644 app/lang/English/delete.mo
 create mode 100644 app/lang/English/delete.po
 create mode 100644 app/lang/English/forum.mo
 create mode 100644 app/lang/English/forum.po
 create mode 100644 app/lang/English/help.mo
 create mode 100644 app/lang/English/help.po
 create mode 100644 app/lang/English/index.mo
 create mode 100644 app/lang/English/index.po
 create mode 100644 app/lang/English/install.mo
 create mode 100644 app/lang/English/install.po
 create mode 100644 app/lang/English/login.mo
 create mode 100644 app/lang/English/login.po
 create mode 100644 app/lang/English/mail_templates/activate_email.tpl
 create mode 100644 app/lang/English/mail_templates/activate_password.tpl
 create mode 100644 app/lang/English/mail_templates/banned_email_change.tpl
 create mode 100644 app/lang/English/mail_templates/banned_email_post.tpl
 create mode 100644 app/lang/English/mail_templates/banned_email_register.tpl
 create mode 100644 app/lang/English/mail_templates/dupe_email_change.tpl
 create mode 100644 app/lang/English/mail_templates/dupe_email_register.tpl
 create mode 100644 app/lang/English/mail_templates/form_email.tpl
 create mode 100644 app/lang/English/mail_templates/new_reply.tpl
 create mode 100644 app/lang/English/mail_templates/new_reply_full.tpl
 create mode 100644 app/lang/English/mail_templates/new_report.tpl
 create mode 100644 app/lang/English/mail_templates/new_topic.tpl
 create mode 100644 app/lang/English/mail_templates/new_topic_full.tpl
 create mode 100644 app/lang/English/mail_templates/new_user.tpl
 create mode 100644 app/lang/English/mail_templates/rename.tpl
 create mode 100644 app/lang/English/mail_templates/welcome.tpl
 create mode 100644 app/lang/English/misc.mo
 create mode 100644 app/lang/English/misc.po
 create mode 100644 app/lang/English/post.mo
 create mode 100644 app/lang/English/post.po
 create mode 100644 app/lang/English/prof_reg.mo
 create mode 100644 app/lang/English/prof_reg.po
 create mode 100644 app/lang/English/profile.mo
 create mode 100644 app/lang/English/profile.po
 create mode 100644 app/lang/English/register.mo
 create mode 100644 app/lang/English/register.po
 create mode 100644 app/lang/English/search.mo
 create mode 100644 app/lang/English/search.po
 create mode 100644 app/lang/English/stopwords.txt
 create mode 100644 app/lang/English/topic.mo
 create mode 100644 app/lang/English/topic.po
 create mode 100644 app/lang/English/update.mo
 create mode 100644 app/lang/English/update.po
 create mode 100644 app/lang/English/userlist.mo
 create mode 100644 app/lang/English/userlist.po

diff --git a/app/lang/English/admin/bans.mo b/app/lang/English/admin/bans.mo
new file mode 100644
index 0000000000000000000000000000000000000000..3077c64b555429af441b4f7867c6d8ac40e68fea
GIT binary patch
literal 4861
zcma)<U5F(|6~{X!(ardkjV8vAWNTMrX5!wSolVxPvsttAwKB4k8FyyYJcYX5b?0`b
zZ}+9E@628>0bc}tQ9(iRIYcypfNv@&zDYz71>XcAki<7p)DR#1ovP}-_YMiBnY#b3
z)Ae!A|9n)<U+%i?`w`FQXrG|Ha!V9#gD>3556^42MbQVr*TFl$H^7tNt+z+fUEtlI
z^yk43gUjHDz-{nOFbUu5@ckR0toNgUKLur-Ux4?5zXxTXSHU^(@8EmE|AOxWPrN(q
z3(7w8pzQM)D0*yx?*X3zW&A#P0<1yV=NVA+{7%5<z<cQbJm4R|_tSq3l=1%pWt}@%
zRMxo%6!|Go>^L8AHQ;qn^zDKl01Hs`dItOm_-#=3e;$;5e+h~me+>94DEqw$%D5A3
zdN+6<D0)2%@+n#g@=Z|YKLyHq7L;+{0%iXnfIIl~c~Iv42Xcj9A@^AUP<Z|(KeEsF
zKn4B;6gyr9zXbj{^cN6{eiuMQ(JJ^NxCP4mH$erSWRQ$I&yS3I9Q+~pMG#j;uYmkT
zf8$5={Wq9{x6@&Xr~-ctJ`0`&AIBKsBL_bTem&rG;2!<of)#i_P7xly3yQrz2DibN
zLSKRfDxwqM{oqOPYv4Ih^m-AL{eK3&3;Y!*<9`$IWe`=PKY_CTUqRvXbx`L2Bgo$X
zQ7O6w=gYV|L0RWsQ0zS&<cr`<`j3JI_!9U6c#0r<5d0k|^Zp6qM)wF0@(8bw&=zQt
zzw(@-opEnbbP<%jMGw(U@=LgpM>rK8V;WmJ8$Jz6EXgCWdYX10?Nc<d`5{_|CeH<$
z@boZE(S%ER9`MlqN*R&5BDQ>#wn&2-_nZ&-DEQg%j+@$t)N{E;$#K5;So_7l2#@kC
zd2l>^CcJ+fJV%q5oEO<jnyRiYlpS^ZMyJt=O-zwy#eTGkbaO{ly4W`=D|)4q=rlE{
zs!W<yCaHtyP!|bOw}4F3X^=FlijXPw@u>r2t!DYY$%k&OMv&{S$(^J!gYxkBJZp57
z^d}pJeye5ZH`}l2q9|);=l;mpT7_+*bzO(e*G+5qMrWY2-0KwHy*e8=hghw2uQrvM
z5p_+k<jagKZPyO-oWKu(S7&lSm1o64L??VL4t1WT!hWOZW)QhG-cnc@ZOg(&%}C>|
zXvS^@rj6JzZr$C8{l;4(xG{y8*UWpu968>cZ=WdDK-Wn>;$>tRwYfeS7(~s)?J8wJ
zcdWc3(WLKKob<Ed<lU>$4wXF$JuuOAV@G*yg%JX<!WQrQMy``O!}wVtVO<b7sNj@u
z#s*?$W!|$hvYAe>YIdbYJulrIbq86keCS0tii4s&Dxw=gQ)W?nkQFUijdW0^GcqxD
zl07a&WT+F*_B>NN`KZ!)=W1CE?6N9`u4^x!zoh)@<@rLLzO0rOF3s&!<<n$rXEW`5
z*;E#~mep0G>%OU0SLb%N_d08YkkHtXtXNjaI@ir%CPN$1HErw89wou%x-KgQU86jV
zNa4<&(SxZK)nm@$D?PtOw;Pw${^#emHn%n=`!B`k=GIE$tzgyhkWFiIvtAtLIx8-z
zq^~P$>dQCwu68a?#>wtIQ*}0qq?AIntS)x5x>aPE0G|75=L@DVmDh2nl+vS?;*0Sk
zeDU4RZaJzFv*!0$R(_MF98Q(NC(Dtt{c@BONk$zSk|)uX>5X!A)Hj7BM}Zc~Rm+aA
zmR*x*f<u)(1;1)oTAOvVJgdhd8W76aFgGrRtj{P}L55lhfT6DHOy@*<JgK?OYg1WG
zT{Fo>yQ3j%4WQ8F=}}hqU78fBGE&Ff3cmKn(Ml6-Y^G~<l;yctm1Y*s$0SQ#IyFM-
zU_<4t?3+c4dJ+w!p=jDIb(MOhnv|C+AIi1=5OQJHS8Gb7sAxG%+zQk(-PP8_N;ppB
zh;XH+EMSfbBo&oXG+@6nq?KZgSbZhSQ+$xND<K^SvqYz<GJ9av{6h;0FDacQX2`J<
zt3B4}mq$vA$)ZJW^dST2_A-;Rm>CS~aU5+pCBg}kR2*7WrlUPf_GgD91#R7l0uQdr
z#L@hir!yFI(sUu3I!$DvbA;IBU(yoC6l#psN15%5d90%5O}rl~TMi5iToEL|DibFq
z##Qb^D_Drtt}*J&N}gkr*CDJP3Z$`Tgy<az%m_cJj^Y5vs+^M;>cV6CP>VvxA7{>H
zci^}{ultlS(Q}dwdQ@Xdoh7h1Zd|YC#T~j{R#S|`>YAgwo9p604EAwC@E0SQj5fXm
z%YJU-sZx*Hn>#+W?Ax%mbm3gQw8S4EWKH^xDKbh<<CYqDCr#{7C&tEVlgM#*9Sn3K
zNFwN*YM71{g#)Psd`@&JSJWlHTx#>hMZ@ucj@I%lIZzLT$Tc#-)(~ak%KO2wDU;)9
zV(DUQW+W-m>Qdmz=1S0xiQjIFJK{-dERG$O-XBwbdy=QKwbfZ)$8eG!>ztnla{f~f
zC=Fx>?~;nCh6SIoy-__PAl;%ql$+Do$FA6O#YeY9?SgosDQ2_dLkjq5(=#L~8oQx4
z*gaEcoX*b3akS;HHI53Wy_>5H?xl2T=N>sd&jt@S`l6WB8_9qsD%5;q_Cg$mYmZ!X
z2<53854Q<dI=T5&W*>)=p_IYqLezW~Cfun#HAv#j<-Dd=lLF|1hLTZIO6ts)Urkt=
zB<p2KtGs$z{Nn4C_^MspWz(@lb_uk()847v4MbES&f3_q(Tcw@$?4!PNi*euW5w6(
zaA|6Jz7g!=*m<kl&R)<?LLcv8n!5!+lRJx@=O~>Ix+wEi%cb8mEkelgiDw;g&cVH`
zf{c{^3gqgZ4Hj{<k4T}V*_b-V^;6FOcfRLj&O6@Dxwt9c31?X+E37FvB(p<9<q<v#
zt~6u;|K+&jHaE31#s{ia3BIMkOA%;}?3NPe_oEOlj+aSrOnGy1vP=aEg)4+d<COoS
I>?BbB2bWPZ3;+NC

literal 0
HcmV?d00001

diff --git a/app/lang/English/admin/bans.po b/app/lang/English/admin/bans.po
new file mode 100644
index 00000000..4a126619
--- /dev/null
+++ b/app/lang/English/admin/bans.po
@@ -0,0 +1,183 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "No user message"
+msgstr "No user by that username registered. If you want to add a ban not tied to a specific username just leave the username blank."
+
+msgid "No user ID message"
+msgstr "No user by that ID registered."
+
+msgid "User is admin message"
+msgstr "The user %s is an administrator and can't be banned. If you want to ban an administrator, you must first demote him/her."
+
+msgid "User is mod message"
+msgstr "The user %s is a moderator and can't be banned. If you want to ban a moderator, you must first demote him/her."
+
+msgid "Must enter message"
+msgstr "You must enter either a username, an IP address or an email address (at least)."
+
+msgid "Cannot ban guest message"
+msgstr "The guest user cannot be banned."
+
+msgid "Invalid IP message"
+msgstr "You entered an invalid IP/IP-range."
+
+msgid "Invalid e-mail message"
+msgstr "The email address (e.g. user@domain.com) or partial email address domain (e.g. domain.com) you entered is invalid."
+
+msgid "Invalid date message"
+msgstr "You entered an invalid expire date."
+
+msgid "Invalid date reasons"
+msgstr "The format should be YYYY-MM-DD and the date must be at least one day in the future."
+
+msgid "Ban added redirect"
+msgstr "Ban added."
+
+msgid "Ban edited redirect"
+msgstr "Ban edited."
+
+msgid "Ban removed redirect"
+msgstr "Ban removed."
+
+msgid "New ban head"
+msgstr "New ban"
+
+msgid "Add ban subhead"
+msgstr "Add ban"
+
+msgid "Username label"
+msgstr "Username"
+
+msgid "Username help"
+msgstr "The username to ban (case-insensitive)."
+
+msgid "Username advanced help"
+msgstr "The username to ban (case-insensitive). The next page will let you enter a custom IP and email. If you just want to ban a specific IP/IP-range or email just leave it blank."
+
+msgid "Ban search head"
+msgstr "Ban search"
+
+msgid "Ban search subhead"
+msgstr "Enter search criteria"
+
+msgid "Ban search info"
+msgstr "Search for bans in the database. You can enter one or more terms to search for. Wildcards in the form of asterisks (*) are accepted. To show all bans leave all fields empty."
+
+msgid "Date help"
+msgstr "(yyyy-mm-dd)"
+
+msgid "Message label"
+msgstr "Message"
+
+msgid "Expire after label"
+msgstr "Expire after"
+
+msgid "Expire before label"
+msgstr "Expire before"
+
+msgid "Order by label"
+msgstr "Order by"
+
+msgid "Order by username"
+msgstr "Username"
+
+msgid "Order by ip"
+msgstr "IP"
+
+msgid "Order by e-mail"
+msgstr "Email"
+
+msgid "Order by expire"
+msgstr "Expire date"
+
+msgid "Ascending"
+msgstr "Ascending"
+
+msgid "Descending"
+msgstr "Descending"
+
+msgid "Submit search"
+msgstr "Submit search"
+
+msgid "E-mail label"
+msgstr "Email"
+
+msgid "E-mail help"
+msgstr "The email or email domain you wish to ban (e.g. someone@somewhere.com or somewhere.com). See \"Allow banned email addresses\" in Permissions for more info."
+
+msgid "IP label"
+msgstr "IP address/IP-ranges"
+
+msgid "IP help"
+msgstr "The IP address or IP-ranges you wish to ban (e.g. 150.11.110.1 or 150.11.110). Separate addresses with spaces. If an IP is entered already it is the last known IP of this user in the database."
+
+msgid "IP help link"
+msgstr "Click %s to see IP statistics for this user."
+
+msgid "Ban advanced head"
+msgstr "Ban advanced settings"
+
+msgid "Ban advanced subhead"
+msgstr "Supplement ban with IP and email"
+
+msgid "Ban message label"
+msgstr "Ban message"
+
+msgid "Ban message help"
+msgstr "A message that will be displayed to the banned user when he/she visits the board."
+
+msgid "Message expiry subhead"
+msgstr "Ban message and expiry"
+
+msgid "Ban IP range info"
+msgstr "You should be very careful when banning an IP-range because of the possibility of multiple users matching the same partial IP."
+
+msgid "Expire date label"
+msgstr "Expire date"
+
+msgid "Expire date help"
+msgstr "The date when this ban should be automatically removed (format: yyyy-mm-dd). Leave blank to remove manually."
+
+msgid "Results head"
+msgstr "Search Results"
+
+msgid "Results username head"
+msgstr "Username"
+
+msgid "Results e-mail head"
+msgstr "Email"
+
+msgid "Results IP address head"
+msgstr "IP/IP-ranges"
+
+msgid "Results expire head"
+msgstr "Expires"
+
+msgid "Results message head"
+msgstr "Message"
+
+msgid "Results banned by head"
+msgstr "Banned by"
+
+msgid "Results actions head"
+msgstr "Actions"
+
+msgid "No match"
+msgstr "No match"
+
+msgid "Unknown"
+msgstr "Unknown"
diff --git a/app/lang/English/admin/categories.mo b/app/lang/English/admin/categories.mo
new file mode 100644
index 0000000000000000000000000000000000000000..73ca42af061e53155923b6c77b56d277bd521e43
GIT binary patch
literal 2167
zcmZ{kNsrt_6vqolSekuU!mi>lXeN@KG$PWdXC@?>O(V@f3pxl;E@ivA+r+MFRh6gH
z$6Pogp&$-$LpkNfg%7}q&w#=mi3=AbPW+!;?#10$a{u~0SG~1fJzP6?kKuU@?^}3(
z$GeXAhez;(=klYBy#%(wSHT1DMer851}gA5@Gkf!_zidgd;q=<{tD9mhhG1;ms^ij
z_TKTl0@C^u@C~pJz6{<4Uje@Z-v%Fe{cj-o`2(c&|9E-rTxI7X*hLQeAjNm@e8r!@
zZz2B-Qv64cGxh}dB}j2b;Pc=aNO^t@!UX#sd=mT-JOuB9<o_>_)}4nD;stOU+yt+I
z((CVoZOFfXWdBdkf5D58TQL3}cm<?<Zh^i9W!=d(#ewpb^#G<1^^R&qc43Y^i?@ZB
z@<w<Jsj?UFu6mw<lJcV5pPpMlwRy_RC~f&rzU+FE@K`uG&?c3Z52Z+&I$K0d^#lvE
z(fq;*&qO4%Ql;dWV^f|wwl_0fj1mY5H!?|$jHllwTqMa#eIhftdWRCZ^bWm;2_I>j
zx>T!LuT?)aIj@ZHRP{C6Th!Hw?U#O*%CM|ny<x(W)W(@eb7|P(CaMz(+EiAhYHF2s
z{7htNStfRnq;4ssrm_y`w6Km#<)lHPXeO9TYsEmaxld))YW+<mqD*q9>k9c(Fk#)S
zFd_>MwaIOVt5GT1-S@Y7^>=qe@ppH5dvm+hHTo;GGB{3x&!n-aeup1Q;fB)OxY6o<
z+za*$MCgNkG{3{43qFx&DJ`v4C&Id*XN0nuaN1zeiBN+A!3RAl@;QrqM<jWwuJtPy
zQ50%3xY{~BK0TQEZ-<v#XtYB)g5G2Vr%v8+mquui+UD_47%ScG&E8?KHCspC`_cpl
zD%MG=1|7Z?rEVHX2gPlD9vn#}O%-ET;}|>M4!6P&@TC%iPjz8pxmWq<@XE>jm|(`5
zVs9vU*%{sEC>*Ehse8dEy5M7>9Q6rf67nygh=t;%_i{Ong5NsbhC<>9Y*;BdhEk6=
zLw=;m#=7;Ecwd_$FD3Xe3tq!AM6sZ&2Ybathqca6@|>Jh6CARS5GCvS31!!fEHkqO
z{<xuV3wc(X%34el+Of`PHMqKNcP{zAA2!FiUfdWrD*585k>(haX=H?u<J(G)Gnov0
zC?d;d^~Wp<K2D*Eq#u;!ao%uxAnD9wr5kcG;HxWCLiduhoQ4^P5@*nE*5Qb$A4YA>
zX^63?ytb&dWg+NBLzwYU#<y`W%d$lJPV;_PlIvnuW)Z#cH{_X|-VwNM3K`CvS2qY6
RPiG1#EcAf=?~M_%{{T<hS-}7R

literal 0
HcmV?d00001

diff --git a/app/lang/English/admin/categories.po b/app/lang/English/admin/categories.po
new file mode 100644
index 00000000..fac4ce86
--- /dev/null
+++ b/app/lang/English/admin/categories.po
@@ -0,0 +1,84 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Must enter name message"
+msgstr "You must enter a name for the category"
+
+msgid "Category added redirect"
+msgstr "Category added."
+
+msgid "Category deleted redirect"
+msgstr "Category deleted."
+
+msgid "Unable to delete category"
+msgstr "Unable to delete category."
+
+msgid "Delete category head"
+msgstr "Delete category (together with all forums and posts it contains)"
+
+msgid "Confirm delete subhead"
+msgstr "Confirm delete category"
+
+msgid "Confirm delete info"
+msgstr "Are you sure that you want to delete the category <strong>%s</strong>?"
+
+msgid "Delete category not validated"
+msgstr "You must confirm the deletion by checking the box"
+
+msgid "Must enter integer message"
+msgstr "Position must be a positive integer value."
+
+msgid "Categories updated redirect"
+msgstr "Categories updated."
+
+msgid "Add categories head"
+msgstr "Add categories"
+
+msgid "Add categories subhead"
+msgstr "Add categories"
+
+msgid "Add category label"
+msgstr "Add a new category"
+
+msgid "Add new submit"
+msgstr "Add new"
+
+msgid "Add category help"
+msgstr "The name of the new category you want to add. You can edit the name of the category later (see below). Go to %s to add forums to your new category."
+
+msgid "Delete categories head"
+msgstr "Delete categories"
+
+msgid "Delete categories subhead"
+msgstr "Delete categories"
+
+msgid "Delete category label"
+msgstr "Delete a category"
+
+msgid "Delete category disclaimer"
+msgstr "I hereby acknowledge that all category data will be deleted"
+
+msgid "Edit categories head"
+msgstr "Edit categories"
+
+msgid "Edit categories subhead"
+msgstr "Edit categories"
+
+msgid "Category position label"
+msgstr "Position"
+
+msgid "Category name label"
+msgstr "Name"
diff --git a/app/lang/English/admin/censoring.mo b/app/lang/English/admin/censoring.mo
new file mode 100644
index 0000000000000000000000000000000000000000..2f0e456c224163bf2c73bf679de354e34c738d35
GIT binary patch
literal 1551
zcmZvcOHUL*5XVQw2kRR(8sninm;iAGF&@bB2#8=v05`gV9(!kMciYT#Z@POx?tBFK
z2p;?n>dCVQ?|SnC7;nad|DKs;S+$eqN7qzWRo7#`jg1@xSQoKxVZXt?j(zSJ{$O>%
zbD#vzgFE0Qa38z^9)M%uJMc329=rg4uD*W-y}cixzc+fk)Vm4#`**=>;9|usumRl^
zJO%lO6G0H+{0TgR^Uskoj^AL2bL}K-fHUAI$lz5_g9Pq_H^8@`_xBO>@qPil-uH^X
zK)5N^*@_-;8z7V-KmJ`%EBu@W{qiyT{M4|0e17>nA-v(W6g#OErJ}`Yu#_aUt4%^u
zwe{d+^H!Hd5-hW_+Hj>)UMXc#btsWmv{LS?c@e9>C54@pL^?8@=^duN?Ty?z=sPxL
z1Q}Z^Ivi~3;%pHTrP8|KDfdzla|Yci>TMsfND>5w;H2T$1%<41@wYVZCBhxmZKSyo
zX}GFQX6vMS#nH~+pQZBO`Ef<J=V^Lkw$?EE70icgNw~$vB6D?GW#PJP9zLu!o;1T{
zgCpeOBRHuOWZ_fZkzTbgS{K%ZO(T>|h0_K~>q2#Myf$pI$c|W~Igw;iEw)P+tyZK>
zXQ8&Swy`qsKONnxEo)>>!RlTQP948?Q^=B3vlMrQvFzrbH&?@%fu8r?W)rTcSSKh|
zon~6n9R^ZIDQYjm$E?_tF*Y<(>u5Tfi5}ofc?_TF+{C<G`lwUsBq)0-SShM0%6hu4
zaI~j$+7&3A(-arYL_#Hm^r3QtvikU`tqnd%TU?K5Tc$}YOkznGCK1Qn^F<t&5l1v>
zb;gs>%+rK2;o>fN$u7zQU3f^fVlSD9sBGA(sYGfuiFO+`rQEVn0(}?JChrzUIG1Tk
zN;_)75W3q(Zn%R+^o=TAcW{kj6ahK+jW5(*^}uRcV6=%>S{4Su;Z?D)jGng0f^>3+
zqr-6<9<yN1I-^x*VK8X8-Jdl-6?bejH&rS9U%MK^f0PeR2E{}o;nh(3-vArDM76TP
sSoRCqFJ0tkv#Mfop+BP0(2V*|<94EYRoM*1utr0oYF3AZ)u=|nA7$gXPXGV_

literal 0
HcmV?d00001

diff --git a/app/lang/English/admin/censoring.po b/app/lang/English/admin/censoring.po
new file mode 100644
index 00000000..665e0f88
--- /dev/null
+++ b/app/lang/English/admin/censoring.po
@@ -0,0 +1,57 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Must enter word message"
+msgstr "You must enter a word to censor."
+
+msgid "Word updated redirect"
+msgstr "Censor word updated."
+
+msgid "Word added redirect"
+msgstr "Censor word added."
+
+msgid "Word removed redirect"
+msgstr "Censor word removed."
+
+msgid "Censoring head"
+msgstr "Censoring"
+
+msgid "Add word subhead"
+msgstr "Add word"
+
+msgid "Add word info"
+msgstr "Enter a word that you want to censor and the replacement text for this word. Wildcards are accepted (i.e. *some* would match somewhere and lonesome). Censor words also affect usernames. New users will not be able to register with usernames containing any censored words. The search is case insensitive."
+
+msgid "Censoring enabled"
+msgstr "<strong>Censoring is enabled in %s.</strong>"
+
+msgid "Censoring disabled"
+msgstr "<strong>Censoring is disabled in %s.</strong>"
+
+msgid "Censored word label"
+msgstr "Censored word"
+
+msgid "Replacement label"
+msgstr "Replacement word(s)"
+
+msgid "Action label"
+msgstr "Action"
+
+msgid "Edit remove subhead"
+msgstr "Edit or remove words"
+
+msgid "No words in list"
+msgstr "No censor words in list."
diff --git a/app/lang/English/admin/common.mo b/app/lang/English/admin/common.mo
new file mode 100644
index 0000000000000000000000000000000000000000..80370172ebed1c83e490488693dfcd113d29b4e3
GIT binary patch
literal 1802
zcmchW&5ImG7>6sm(PZLBOk&h%v|?OPp=Yy_$TGW|nBDA##o1)s4>6wXovxj<&U6h`
zJxg-%KM?dH9z4Z^Cs91)mWv>Q2QMBBUIal<yoh)bL41DGlk6ghCoSr&r>gq>sCw(|
z?+%Q;YiP%j$B>h|jG2JVI~Ztt?lk5uxEIpReumxf5Ujx?a14%**3ZJdtWQDNof&;!
z9Iao3ceB3&<>ytn555NX!!EoJz6o`Nx8MWtZKyccpzJ?{^8YcE{dM>t{0!a$Z$kP1
z0ZQ*@D7#;w{QM53_a~J9eQZkaD3rgapzKdTRLt{`ZW;_Na&!ht{~eU{{XHoC_ZgIz
zYf$<hjn<z+<>dyH-4~<pUyasZL!IwiNH^az=o~*n<>fc1yo_P2yc~q5;9;mZO(^@9
zAl+PI80Hm9uM2hG51{;i0_o;DgY0fV`S~15?@Oq>d;{s`CkFZZ1<L*psC)0iSa!Q1
zX&Ksrp^bP5IiLwmc~O(y!-)K;9YOSVY6lVBQ)hY-QO*t{k04JVy8CfNF&{!6MRcB{
z$lsgtrnU#M$T37Uem|nSJ&xRq4BOdunft<=%`&8yYsP4Mt{9lPw1{RtEnUZl+%a`U
zWL9*{IoEZiGYeT>nnfQ5y=cyRyOFlvFiS<|u9)RCFG^RWMceJ1+n&$ZU<hgHLlx$N
zHy6C^cL$we;26`6W2bQDVqb@grj>^1f@!(X%VVszD)r4Y@45^>l~rrF8!Nx9Fu=!(
z>-jCA??V~QYRW=`ZC_4{4!2r$Vao*@%e2g6nYW`^?`K@vtP|6Af*<tRVjj&U)Gxc>
z3~@r*O}Kh5Hf+J!S;pDtrgaUbvriZH*sPs=X1dl2{&m+blcg+q86O<JVHaIm;%9EI
z*1EWs%m<e2C+CRTu<Ru(ZY!7St*vGn%VaI^9$n=Pr6z|Tkf>zMrM(><?M$i%d||T+
zv9VG2p>w*nytKTq9e=WZqBigKKzO~{Cur%eloS0fuQsj3knVDJeQhzB+SXI_O&5}d
zqU|$^pkb#r^78gU8rBuHSCaFtsNS|=Ti#J0cCtQIKgpMBnXLLjXuJ6;M#EM?%>Ph^
zz3r0xr!rjA<Jvsh;&wf@)2<3^JX(sAN4r(0Ssr**AFkH_wN#rvRlcm>-02{(GqDW5
Z=$sypGZUk!O>9-sb(I+Z!+&4Oe*v%hjEDdL

literal 0
HcmV?d00001

diff --git a/app/lang/English/admin/common.po b/app/lang/English/admin/common.po
new file mode 100644
index 00000000..7fd3c5b6
--- /dev/null
+++ b/app/lang/English/admin/common.po
@@ -0,0 +1,117 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Admin menu"
+msgstr "Admin menu"
+
+msgid "Plugins menu"
+msgstr "Plugins menu"
+
+msgid "Moderator menu"
+msgstr "Moderator menu"
+
+msgid "Index"
+msgstr "Index"
+
+msgid "Categories"
+msgstr "Categories"
+
+msgid "Forums"
+msgstr "Forums"
+
+msgid "Users"
+msgstr "Users"
+
+msgid "User groups"
+msgstr "User groups"
+
+msgid "Options"
+msgstr "Options"
+
+msgid "Permissions"
+msgstr "Permissions"
+
+msgid "Parser"
+msgstr "Parser"
+
+msgid "Censoring"
+msgstr "Censoring"
+
+msgid "Bans"
+msgstr "Bans"
+
+msgid "Prune"
+msgstr "Prune"
+
+msgid "Maintenance"
+msgstr "Maintenance"
+
+msgid "Reports"
+msgstr "Reports"
+
+msgid "Server statistics"
+msgstr "Server statistics"
+
+msgid "Admin"
+msgstr "Admin"
+
+msgid "Go back"
+msgstr "Go back"
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "Update"
+msgstr "Update"
+
+msgid "Add"
+msgstr "Add"
+
+msgid "Edit"
+msgstr "Edit"
+
+msgid "Remove"
+msgstr "Remove"
+
+msgid "Yes"
+msgstr "Yes"
+
+msgid "No"
+msgstr "No"
+
+msgid "Save changes"
+msgstr "Save changes"
+
+msgid "Save"
+msgstr "Save"
+
+msgid "here"
+msgstr "here"
+
+msgid "Action"
+msgstr "Action"
+
+msgid "None"
+msgstr "None"
+
+msgid "Maintenance mode"
+msgstr "maintenance mode"
+
+msgid "No plugin message"
+msgstr "There is no plugin called %s in the plugin directory."
+
+msgid "Plugin failed message"
+msgstr "Loading of the plugin - <strong>%s</strong> - failed."
diff --git a/app/lang/English/admin/forums.mo b/app/lang/English/admin/forums.mo
new file mode 100644
index 0000000000000000000000000000000000000000..03ddd80dc6c4a33dfe423faa626b936b95d41701
GIT binary patch
literal 3548
zcmbVOO>A5>5H`>s8h%?SP@u&rlqMzbl~f?LNz;<1ZHStrQL<^_=-ubtea-t>Y`-MS
zt%w7MN*n-j;J^VD2^Ar6p}m2`u^?3(Iq-8p2o(t=Bo18Q8{2Pplkg*9#rdAc<C*cy
zcxJ!ZvFR;_5nw)w`RXl<jRAkY75^~4yN$7J!0&-~18;i#19%VC+cr7+F5tab4*>52
z9`QH>d;n|V*Q>xCSYHC(0elyDKky2W<b4JteK$P)YapHf1^6Iv%Vu|O50La70Mh;_
zkoM>O`T}ql))#>!?;RlNy$mG2Yd|`8!>@k?65pRdvVYqa$G00u_kI>g=T8E+1J46V
ze+;|}_%e|AUi15Jd-?~!t)O28(tSS#lKksHI{z(j4nF@CNczWbcX$SP1nWiMPT=c6
z{ISdUM|>Xv$#2(y6TmNlj{&!1a}qcVBzxOHh-R1k`VC+o*6#!1QuZ<MPT(g%vj1}+
zo%;$1SFj&|#DCN8{|=-$Z3Zzwj_d^P!+HWju*G5^`9lK_051Z`t`C8fUta);?<XMn
z;WuDEa4Qbs3TzMv5<3JWe;o&s{xiTmz;k}T08$)Y0g~Ns0?E(s0qNWoAj!W9BtKsV
z!p+uJfE{$6d_eZlS-KYuvYUKs?EzB0Jc&u;AxyH5?nHJyg82j{#IuJn2QYVI_6~|4
z*+}-#2rxP3eoV5J;zNV{PQIYA7xQsU%F!Xra`<OybNeX}DMmE#9PK^HM>NRSc8o_6
zuji^rS?7y4rHIxnlUC0%5mlM631MU-S8cv-sf(&TK9OhjSfxCYi8RuQTt|zudd}9-
z{^9tFP#K$05=wa{S9r;G(n(L^Y>AzUVgq$X#EI@OSfah3Gr_Jc`)Rr~7f~c5u4EJ|
zSu@NLoy~tk)-@HkOq^%_){fnIz<p;Tm1{PORs^Hh%hG%UeNyE`i?^goW38b=bL*dt
z<nr#*LL1)7wP7<N6AkIYsNFqh3T##-WFSmZ@l<LJ9#+zqMG{B6=7Z?S61<Ar8<gy`
z@O9m0$8275$5L~-8bj|KjMZ@7vQ%rXIG5|V$4gimaJ3RT>6~RrCU3>Hk}{8+bE-Vc
zypIX)gY@gH-1&K{lbaj?uZtovY#~>;aG8z^MfC#3vqCDkHbNP;n2Bm4=?sGIZ?$Nn
zLteB7Yc`h@N+bb-nd%Xqwd_)l9UA5Cb8H~v{bPK1aI|ku<)kB+ih^@eQOHL4X=G?q
zsuL&r=FV0Eo3Nk<C*kK24q5=iV`42y6vUvSM5YsAas{Soku?g0DyT@2_DJMMMU=+b
zb9JYpS`Bm6IMz2aHFK(~e>i-)4=>6fltHE4f>I+_&B0b8;%t=HnnG!5#uh85gTq}u
z(q5M;IF;4%D9#!q{BSik9YaRA%=%skCS@j-vvDp*Yz!X`4~NfS$1Q_}yihec;dG2}
zr=(jqdcGF$YHNnWQ)N!IDJ(0^xYp$Dyx=RbZkB-(_QBgE47)ODx0AhPE$S4dk@aQ8
z<?y(YR=h6oVVc4?Wg>$ulu5QykyVzRAJs<XS>xC~ee|IJJkF-l7BUS-`ngTnssyui
zhv7SRetdp*YId@p+tLII7hc>-oFt_Zflnlz(R?7TbCI<N@lu^hR(F3{?0Rm`T(NU?
z&ROWIT@T5A`Z8u~Te!BSg^<#%Vgt`tW~K)nhv%c`?>~Ks@)9~FD`Zn-YOLvA>5%nd
zO=KLIWkc#r(=Azx>v(*<6%AXKC5r1vI3y`AG)hi`N}mq-RNV?|ie;JYH#`-QB;Qcp
zW)0L11gX?pr2Dly*Q;O%Ipm|Nr9}Np@)Zt4DW<+q@T$-#$0*^j*C0MrXZb#8AE)Pq
zvSyQ9bCIlwHmWI%;q`*z)l-^97I9&dsGwq4OA54+kW)c))w?U*=9#-Nud6&=V@$8i
z(m7q1SQV*IORj%}yn=h|?N-XYJvPBfvbI#sSMhjYEJ}YAYbtmVM~0CDte5GsFBMYz
z@?2YT&T&GkxlmEB(2$=-#LDjI@>mbSc?lluzt{qoQ-vV)p-WDueB*Up7U9>&KXfyO
zPT_h<>N}e7)f!<bn;V*00YxvOa#$|c$OK>4<TmWPOr?wu*?)JsvMqP|ovj(R`{=M^
zCw+9fom;p*hZa_LIChpCD3<X{#kM5GM5Zm%_6`Q8`#HiF=clot_UZ~$Ppk9Iv)X3=
HyVv~%37X56

literal 0
HcmV?d00001

diff --git a/app/lang/English/admin/forums.po b/app/lang/English/admin/forums.po
new file mode 100644
index 00000000..d3153c81
--- /dev/null
+++ b/app/lang/English/admin/forums.po
@@ -0,0 +1,147 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Forum added redirect"
+msgstr "Forum added."
+
+msgid "Unable to add forum"
+msgstr "Unable to add forum"
+
+msgid "Forum deleted redirect"
+msgstr "Forum deleted."
+
+msgid "Forums updated redirect"
+msgstr "Forums updated."
+
+msgid "Forum updated redirect"
+msgstr "Forum updated."
+
+msgid "Perms reverted redirect"
+msgstr "Permissions reverted to defaults."
+
+msgid "Must enter name message"
+msgstr "You must enter a forum name."
+
+msgid "Must be integer message"
+msgstr "Position must be a positive integer value."
+
+msgid "Must be valid category"
+msgstr "You must enter a valid category"
+
+msgid "New forum"
+msgstr "New forum"
+
+msgid "Add forum head"
+msgstr "Add forum"
+
+msgid "Create new subhead"
+msgstr "Create a new forum"
+
+msgid "Add forum label"
+msgstr "Add forum to category"
+
+msgid "Add forum help"
+msgstr "Select the category to which you wish to add a new forum."
+
+msgid "Add forum"
+msgstr "Add forum"
+
+msgid "No categories exist"
+msgstr "No categories exist"
+
+msgid "Manage forums head"
+msgstr "Manage forums"
+
+msgid "Category subhead"
+msgstr "Category:"
+
+msgid "Forum label"
+msgstr "Forum"
+
+msgid "Edit link"
+msgstr "Edit"
+
+msgid "Delete link"
+msgstr "Delete"
+
+msgid "Position label"
+msgstr "Position"
+
+msgid "Update positions"
+msgstr "Update positions"
+
+msgid "Confirm delete head"
+msgstr "Confirm delete forum"
+
+msgid "Confirm delete subhead"
+msgstr "Important! Read before deleting"
+
+msgid "Confirm delete info"
+msgstr "Are you sure that you want to delete the forum <strong>%s</strong>?"
+
+msgid "Confirm delete warn"
+msgstr "WARNING! Deleting a forum will delete all posts (if any) in that forum!"
+
+msgid "Edit forum head"
+msgstr "Edit forum"
+
+msgid "Edit details subhead"
+msgstr "Edit forum details"
+
+msgid "Forum name label"
+msgstr "Forum name"
+
+msgid "Forum description label"
+msgstr "Description (HTML)"
+
+msgid "Category label"
+msgstr "Category"
+
+msgid "Sort by label"
+msgstr "Sort topics by"
+
+msgid "Last post"
+msgstr "Last post"
+
+msgid "Topic start"
+msgstr "Topic start"
+
+msgid "Subject"
+msgstr "Subject"
+
+msgid "Redirect label"
+msgstr "Redirect URL"
+
+msgid "Redirect help"
+msgstr "Only available in empty forums"
+
+msgid "Group permissions subhead"
+msgstr "Edit group permissions for this forum"
+
+msgid "Group permissions info"
+msgstr "In this form, you can set the forum specific permissions for the different user groups. If you haven't made any changes to this forum's group permissions, what you see below is the default based on settings in %s. Administrators always have full permissions and are thus excluded. Permission settings that differ from the default permissions for the user group are marked red. The \"Read forum\" permission checkbox will be disabled if the group in question lacks the \"Read board\" permission. For redirect forums, only the \"Read forum\" permission is editable."
+
+msgid "Read forum label"
+msgstr "Read forum"
+
+msgid "Post replies label"
+msgstr "Post replies"
+
+msgid "Post topics label"
+msgstr "Post topics"
+
+msgid "Revert to default"
+msgstr "Revert to default"
diff --git a/app/lang/English/admin/groups.mo b/app/lang/English/admin/groups.mo
new file mode 100644
index 0000000000000000000000000000000000000000..c76b6c961767db43e55cbf7a7f06130c998d6971
GIT binary patch
literal 8477
zcmdU!U5q4E6~_w!(NR8CP!zqhfV->HJ^LjtvmY?KJG%_-%nmcN2mwv1yKi?FR9CfC
z)iVqU(TJLjnh>HJW5h(Gpz%dCCTcJ-MhqnKK-5GugkXX(`hpK=jF{-}+>h$&nc0nI
zd9kv0{(VoKd+)jDoO{l>wJ%(8!Rdf!iS{nq4_+4p9|MnH$RD1|E((In!OOu*!E3=w
zz}>EY2)u^=BKS724_*m=27C+nRoDNX>pu-%0sVQ`f7!i1{|$Eh)!>_XzXOzY4}fn1
zPq_YFpp5T1`~)cLe8Ii{mct*r_rC-$<NXVu@VyMa5j>wivY(4Vd4CNk>(xP-|7P&5
z;F80xd;b6^`+NwLeLf1xygzaHtfRjK%6zXn`o&{*zHv~--2h$%&Viy&4T?MkDDr#?
z6gf_VZwJ2(3g6E_;d|EMi=goT)%DLqS<=58l=ZiOGS41IKj!FnIQl)H$o~K+^F9p9
z_^*R9{`;Vef711T>-v9o{eQXsB^XWk$3fxW?eHil^WO=IfAv7o-)BM5!`DDr?}wm_
ze;O1ye(&gi0cHHFpxEQmi-Ta{ydby^<X<pADKh>+@HqHIQ2g-^;Qipg!8^eFne;mF
z*Wh9BAE3;)pTReRw}C$gKL^UZClE&V@exqu>hlK?f=@bp2z)*LN5DPcHyr&raE|^T
zL78ValkhW`2JZ%!Kw0;3@Jjaa3y^=o^K9}0@MUlp_zH+ggRL;11b2b&1y6yZpYMVq
z&rcmb1Il{81KD!$Cx?FrAEtjHO1~ET5{SuyC%`Abr$7Zhh%pwxZ-V3C-@s?Ut8miO
z;7g#)e?QJB`aR|FG4Rv$p9E!}x4t6??gH-y#cn?WKMy_w%6{&=+UlzXiu_*&Yv5y`
z$n_iW3H0(JDC<3f)BF?s4k+UvW$_c><DdeAcVi=99AqoO$H9++r(ORQ@J9M$@3HG0
z0dJsx8z_1|1?~sG0^R~X2jT+3xUzEY0%hF}xC~~l{}i}~{;xn;_ac;r*v2;E7t^$N
z(r%^6vyXP1b~Eh=O`ZuF!-Au<_tC14=tlHWeZ;PqC8#^1glO4|$T#I^9#CI!kS0Da
za*8dkr^zGwlLwU=pOXEH?`@-@F7xc*ujv0nG(uRglZGn=yJ<5t(dqd#|A_77Ty3F=
z|B5g92h#_WG|~4wZ97dKLb1^`t`i&(f_uatM5l*nn8U=$4}gm_(nat=nt$HU5Akbx
z#D4P3(YDe^Wx+9;JhK*po50&>xKFT`wnS63@|kY6R3}RZeU%RyT^+W9l9DUaKNKcv
zkn2pkaX%P#<FKLQ;Bc5EX`wRROINgN>2^4X3)Rzk9(HtaxEm%Nt@>e}uclec&9Q;%
zrb?4`l=YY-)`eD4(oTcJqckt%I`V3mCBYH5w%v{qc9djS8Kq^q6=k|vtQ+muIbuaI
zQ^I28^7ErBM~S24UjMtF=7rm)duu6vaWh4c_M_$~mm@j0C=VMkddt#YT106Q%+z{e
z6svZerY&oT5sDo)(~1gf&D?6QO7L4UG$XP3Rgt&Sugr%G?Fd<nLM@A<IHvoeyoi#H
zU)VU!G2>EUtEF4GhEuU6wyYK_Y`iZv@>!4CFg(|VtR~9C0CvifW?W_+&F|Zii>P2P
zR`NMi+0UXCcGuC)8tZ6PMlpr19tF!=C70|v3yU<fMwpX>VNZ~euhRGYC4(1sZjcvB
zCxy<GmDnGsdA;h+tFgzhYo}Vk`>IY-=~o!U`fk65!S*W*neNAtSBYWqlnPVTi4D()
z3ojVg^&2<Bj*{$5i&#-L(lB#gUFmy<B<zh$v#2W+&(u$|k&Q3v3dJ%l=`d?{tJ)c%
zc&4PKv^i`}Lrc0s@l1tER}*I%v$rK(C0Vv*<7;7@vBx!~<(%YYWIRboRWT%$Te-|M
z8>n_BL*BsW2o)CVE5n(p-hO+8>xdf~ue8T`9nH?P5D&62t{qLYUOuIgzUk%%cI{L4
z=YegB8b6?RZr?YCMeiYa)@EC^+sP0Fsws6;hecOshYpP`oLH_MX7dujYDdCCPbp}%
zMZFRUt0x@~^P;w#g-IUEp@Hc*Nn=3zs4eTTSD8`m4_mz`xw&nZXf*0+);TyfH#;{o
zTz_YM#~A6M;Plj%*ZM44==+MvejG;0KGp1o8R6o<$>pQ9y+b}(y{)s_OwvqSgqJC`
zw-FVkAXA*hu{&zVbYc(olv+q7YN?&|z4bl3vEABII>?%u^d@UeDZ7ZtsEI$f(wpQh
z8Mh-rG7o0ks+YE0#HhrhFw-n6d7w3+!Z=Q?`6RTfq8sHd4iu?s_!M0arVU>?U#_aJ
zgXQipMVr-C)28o+b{V`?SF?#CRZHYaeJUO<H=)+jf$B+kB3B#lm92!T6}3?yN_S#~
zEInMU{u=BO(@8C1T(~SKHs7&hExCeebSZ-81AY|UurR&V5OJ%!)K2*Qd6A__=iv4E
z{z>=qruC(W(O>Z4>Bafk`D5d1x-G$4*02e#g-)!Bh33?p=^PKIv?=P?0u%DDq9waG
zGipNVdZ%t)+F4}Vxe}kilbfVVykNDf#TE1##_JGDbXHd!TOvwxkVS=%!#qv$373A5
zVr!wW^>7LuF&<N6s?upNzcL4nDQzAzIyZ9Us<Gy)y!vR-G}=Q5Hn~Jt^fjRw@5`h!
zcAN*>?QZaNS3DqYl$j9RmvT!4F?E&c{f{%athFsln(;u+z6ul3oXLRO%c(6}aAdSH
zOFF^)pw~cyX<O8uCe*mbzc$-IHzd*HZ>u4pqoIpcjs3I~c6nWis(81<IHX;r9?Vp#
zzDUY}l`uA^xS#17ij5LH!5QY*0Pn)q(-I@S>F86Y*x-Wukjmz?$eVkYte*T^(p9~p
zvkB`{c#HUot<LIdA;y`sqS$vQ2;<}_so5?+VLNGGqP=z0K@zU8H&e-OE8Tg&?j1C-
z(->?2Bwf|lSue^ZDX2Ei*D*WUUSGErg5YYnMp_m%wg+)s8HW$d5RfOGgIJji>Fn-c
zB-!9jGL^E<bnemFEMZQNE2WWjvoO7pFPIsvtzEfm%Ido7*bTdmOrcx;m8+nAmjh`k
z=irc*TvA#JpBU=jT28`&Kep9(VjOulj0bhK+|{^6Ia|LUuc@ewpNJ_3J(c%$Gipc8
z4U6DEnw-(JVZ!Ib;Y_1)xgDB{CYbdpN(2h6I2&Sxag$+C3mZ`!6;!no)IO8B1U$)N
zcsQ5Ss3Ql7<LCI<P(sV-6LHN(IHEpex8&tY6b^M!376u;eTo-}2wqoPbGgdNHOiab
zhKHea!@U0*WJ=Z=-c|gH<yxjD7-0!EJKMGf_&-!I4teG@uE>m1rQoDpN|a3!Jr%kM
zkY&Wn$t}&IOy?56yAc-&jEmztZnYW_kE+fz=;H|Hbm9^9pmOUg(rRxg5FTvP;+?+4
zvNu3qNEqLjoa*Emo<h~e;zO}iS#4UeqJ$hzM2on843D#9XcG|38D`9V#5{3avla5G
zsb(a_)QSNPFQdyLd<T+b;Hz4W%Q+`Po60xOgA2oZZJ7pb47CSo!{N8toSVM6>YCS5
zGPpI&L3Vo~tK_K)iCc2x#kvv<!h%B4=1V!ltGbaBSt)sSY$`9a>Q;ZK3Ft;Zv)I}5
zjR@e23scCOFF|g+D?0v*8AS26B5^}qc_N-8d3)q|%cjDLt-?W(_PCWbxm1`~%@$3q
zh*O8Esk4Hsl1j?D#wpGD-InX~Eiz-v)hK7EIHl^9YE?cCvJRDniLd@JCF?3o<M;&T
zOq2D+Aj3MtzOp5KZt4ST^Ux#@rlle^7Zh($<G)3CFSUzdDNlLS>yaV3h{kJWU0+x8
zWkn;V4twc<TLHn_Y}=dxdkkHzUZh1BZ(xJp=Aj9*<IQI3g)PZ7@Y$GQ6NJCVVaICJ
zKD!UB$X#C6FkenwV)EOsxUy7pYph8MHd`u(m`YF_1xls~^43tqFFsafS;U7siodn>
zDZD)Xin7S)9PuHFKWv##xA=?3=y5dmNE3Wb;-h@mggs6>Q8LNjbby19>&q)lF#HDe
z8stKPefj-p^Hf;nIOib75#~$OnacT*uTo_oJJ%b8{SKthwCGaxyH~mBS)*rO{pN+S
zQgIV|iIn_<wcIDNv%9JBjPj~x(p8zm?B}u}O>Q-KA^zk)nEAA~$`#c(yZxHANy_$i
zwQ*t8`H;SyY5qTf?B+h0NljB>b>*yli<8ZnkAy}pp`3k#uo=nx#C(?`Z`6a6&@Ihe
z*7&+~Z*@g~=Iu=;EF|7iwyWb>ZZ?fr*pXXi_f@#v`!)%_+)0_=eHb2*k1=IrV6gkX
XD2L1RND5MdlC4I+`(=_0NZ|hgb0FhW

literal 0
HcmV?d00001

diff --git a/app/lang/English/admin/groups.po b/app/lang/English/admin/groups.po
new file mode 100644
index 00000000..cb17a229
--- /dev/null
+++ b/app/lang/English/admin/groups.po
@@ -0,0 +1,261 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Must enter title message"
+msgstr "You must enter a group title."
+
+msgid "Title already exists message"
+msgstr "There is already a group with the title <strong>%s</strong>."
+
+msgid "Default group redirect"
+msgstr "Default group set."
+
+msgid "Cannot remove default message"
+msgstr "The default group cannot be removed. In order to delete this group, you must first setup a different group as the default."
+
+msgid "Group removed redirect"
+msgstr "Group removed."
+
+msgid "Group added redirect"
+msgstr "Group added."
+
+msgid "Group edited redirect"
+msgstr "Group edited."
+
+msgid "Add groups head"
+msgstr "Add/setup groups"
+
+msgid "Add group subhead"
+msgstr "Add new group"
+
+msgid "New group label"
+msgstr "Base new group on"
+
+msgid "New group help"
+msgstr "Select a user group from which the new group will inherit its permission settings. The next page will let you fine-tune its settings."
+
+msgid "Default group subhead"
+msgstr "Set default group"
+
+msgid "Default group label"
+msgstr "Default group"
+
+msgid "Default group help"
+msgstr "This is the default user group, e.g. the group users are placed in when they register. For security reasons, users can't be placed in either the moderator or administrator user groups by default."
+
+msgid "Existing groups head"
+msgstr "Existing groups"
+
+msgid "Edit groups subhead"
+msgstr "Edit/delete groups"
+
+msgid "Edit groups info"
+msgstr "The pre-defined groups Guests, Administrators, Moderators and Members cannot be removed. However, they can be edited. Please note that in some groups, some options are unavailable (e.g. the <em>edit posts</em> permission for guests). Administrators always have full permissions."
+
+msgid "Edit link"
+msgstr "Edit"
+
+msgid "Delete link"
+msgstr "Delete"
+
+msgid "Group delete head"
+msgstr "Group delete"
+
+msgid "Confirm delete subhead"
+msgstr "Confirm delete group"
+
+msgid "Confirm delete info"
+msgstr "Are you sure that you want to delete the group <strong>%s</strong>?"
+
+msgid "Confirm delete warn"
+msgstr "WARNING! After you deleted a group you cannot restore it."
+
+msgid "Delete group head"
+msgstr "Delete group"
+
+msgid "Move users subhead"
+msgstr "Move users currently in group"
+
+msgid "Move users info"
+msgstr "The group <strong>%s</strong> currently has <strong>%s</strong> members. Please select a group to which these members will be assigned upon deletion."
+
+msgid "Move users label"
+msgstr "Move users to"
+
+msgid "Delete group"
+msgstr "Delete group"
+
+msgid "Group settings head"
+msgstr "Group settings"
+
+msgid "Group settings subhead"
+msgstr "Setup group options and permissions"
+
+msgid "Group settings info"
+msgstr "Below options and permissions are the default permissions for the user group. These options apply if no forum specific permissions are in effect."
+
+msgid "Group title label"
+msgstr "Group title"
+
+msgid "User title label"
+msgstr "User title"
+
+msgid "User title help"
+msgstr "The rank users in this group have attained. Leave blank to use default title (\"%s\")."
+
+msgid "Promote users label"
+msgstr "Promote users"
+
+msgid "Promote users help"
+msgstr "You can promote users to a new group automatically if they reach a certain number of posts. Select \"%s\" to disable. For security reasons, you are not allowed to select an administrator group here. Also note that group changes for users affected by this setting will take effect <strong>immediately</strong>. Note that the amount of posts you enter is the total amount of posts of a user, not the amount of posts made as a member of this group."
+
+msgid "Disable promotion"
+msgstr "Disable promoting"
+
+msgid "Mod privileges label"
+msgstr "Allow users moderator privileges"
+
+msgid "Mod privileges help"
+msgstr "In order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user's profile."
+
+msgid "Edit profile label"
+msgstr "Allow moderators to edit user profiles"
+
+msgid "Edit profile help"
+msgstr "If moderator privileges are enabled, allow users in this group to edit user profiles."
+
+msgid "Rename users label"
+msgstr "Allow moderators to rename users"
+
+msgid "Rename users help"
+msgstr "If moderator privileges are enabled, allow users in this group to rename users."
+
+msgid "Change passwords label"
+msgstr "Allow moderators to change passwords"
+
+msgid "Change passwords help"
+msgstr "If moderator privileges are enabled, allow users in this group to change user passwords."
+
+msgid "Mod promote users label"
+msgstr "Allow moderators to promote users"
+
+msgid "Mod promote users help"
+msgstr "If moderator privileges are enabled, allow users in this group to promote users."
+
+msgid "Ban users label"
+msgstr "Allow moderators to ban users"
+
+msgid "Ban users help"
+msgstr "If moderator privileges are enabled, allow users in this group to ban users."
+
+msgid "Read board label"
+msgstr "Read board"
+
+msgid "Read board help"
+msgstr "Allow users in this group to view the board. This setting applies to every aspect of the board and can therefore not be overridden by forum specific settings. If this is set to \"No\", users in this group will only be able to login/logout and register."
+
+msgid "View user info label"
+msgstr "View user information"
+
+msgid "View user info help"
+msgstr "Allow users to view the user list and user profiles."
+
+msgid "Post replies label"
+msgstr "Post replies"
+
+msgid "Post replies help"
+msgstr "Allow users in this group to post replies in topics."
+
+msgid "Post topics label"
+msgstr "Post topics"
+
+msgid "Post topics help"
+msgstr "Allow users in this group to post new topics."
+
+msgid "Edit posts label"
+msgstr "Edit posts"
+
+msgid "Edit posts help"
+msgstr "Allow users in this group to edit their own posts."
+
+msgid "Delete posts label"
+msgstr "Delete posts"
+
+msgid "Delete posts help"
+msgstr "Allow users in this group to delete their own posts."
+
+msgid "Delete topics label"
+msgstr "Delete topics"
+
+msgid "Delete topics help"
+msgstr "Allow users in this group to delete their own topics (including any replies)."
+
+msgid "Post links label"
+msgstr "Post links"
+
+msgid "Post links help"
+msgstr "Allow users in this group to include links in their posts. This setting also applies to signatures and the website field in users' profiles."
+
+msgid "Set own title label"
+msgstr "Set own user title"
+
+msgid "Set own title help"
+msgstr "Allow users in this group to set their own user title."
+
+msgid "User search label"
+msgstr "Use search"
+
+msgid "User search help"
+msgstr "Allow users in this group to use the search feature."
+
+msgid "User list search label"
+msgstr "Search user list"
+
+msgid "User list search help"
+msgstr "Allow users in this group to freetext search for users in the user list."
+
+msgid "Send e-mails label"
+msgstr "Send e-mails"
+
+msgid "Send e-mails help"
+msgstr "Allow users in this group to send e-mails to other users."
+
+msgid "Post flood label"
+msgstr "Post flood interval"
+
+msgid "Post flood help"
+msgstr "Number of seconds that users in this group have to wait between posts. Set to 0 to disable."
+
+msgid "Search flood label"
+msgstr "Search flood interval"
+
+msgid "Search flood help"
+msgstr "Number of seconds that users in this group have to wait between searches. Set to 0 to disable."
+
+msgid "E-mail flood label"
+msgstr "Email flood interval"
+
+msgid "E-mail flood help"
+msgstr "Number of seconds that users in this group have to wait between emails. Set to 0 to disable."
+
+msgid "Report flood label"
+msgstr "Report flood interval"
+
+msgid "Report flood help"
+msgstr "Number of seconds that users in this group have to wait between reports. Set to 0 to disable."
+
+msgid "Moderator info"
+msgstr "Please note that in order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user's profile."
diff --git a/app/lang/English/admin/index.html b/app/lang/English/admin/index.html
new file mode 100644
index 00000000..89337b2f
--- /dev/null
+++ b/app/lang/English/admin/index.html
@@ -0,0 +1 @@
+<html><head><title>.</title></head><body>.</body></html>
diff --git a/app/lang/English/admin/index.mo b/app/lang/English/admin/index.mo
new file mode 100644
index 0000000000000000000000000000000000000000..4a7addb19d2ddd3d3b13821c293300399d51aedd
GIT binary patch
literal 4052
zcmaKuO^h5z6~`;V5LiND5<&=pP=*BWCg~op?KsP93|`NAiKTdVvb#10Az3xuH8YKS
zs+y|m9j_6HBSMHnByLe8K8`>nF2IQoi4%eY2mu0xOC&%D2`NH|1Bm~ts_vcf+O($o
zS6x-}>V4I#e(ixHUt_pdaK8`tAMavp3w-%ac;Nco5ylq4--B-lUk4ur{{eFF-ZwM$
zPA~x<06!MF4c>=$2|frq@DcD!Ag%L_*#9H&U3mXB_#W^tAj!MyEsVVzd=PvXd=fkg
zo(D;f9q?`7HIU>N;N9To!S{n-1m6L^0+QTsgO7nf14+*7Ag%LHkk+~9p0LhiAjv%g
z(*MszZh~arr$N$RgY>_zfHeP`k>82@e&kOge;)ap$UjB?HS!IR^!g77mDqi64R$^R
zk{^$OWakO+UT_^G{a*x0j|?O~-2_R$m%u(^`6_rn-YJMA_b5p5dl;nkPJtw69mG_2
zCGuM27$o~X3!VZ$2YwKI6{NWR3MBb|21&1fffS!3c#yoKAjy9Or1?*Q2r)Yc;>R}d
zSOvF1O1ZCsSHYJ+^8eq!=fHo1C%`jUgzO!G=we?0N&c53Uj|9v?}Bh8`vFLDehgCl
ze+eew-$9b|C<Z?Oo&=AB+u#y-6Qn%)76_BrPeJ_HFYqAy{{WKz{tJ>__ajK(10M&;
z&%Xt!|1}Ul_68nLfp^1MSem8aL*Od71-=MU{Jsvp7yKcJ@Od8sUI%pf9H;l@T1JEH
zB_Ggr1~=JBKBhR+MS1ff+~kj^aX*gx817pyiZ5MH;Kug${(TlC|Ipqge~?Y&hvs@F
zHfV30jO|5`d_?ggACW)E=F_-4xXDhsk^o<OK8!Z`pJGD(e-bzOi+n`>OL0?P(?xm0
zag(2JchP=lYXe<7K9(Y9Yo#>KHf<-360X>jy#IWk_e3_9d~vPcTf)3Mj`6Zk*I92Y
zv+I1Q4X>+_5xHdR!ij;flILh}qo?+kE?eB3nN^B`EZMp&rIWl+)`_y@!=l8LxxTa-
zS9~ZikjIg{neK;-%nKtk$1bS7!e}*-$^{j+b`JN6EIZt}Cygz%ni~k}ZAjt9(wslf
z;~X!U9qx|PwW%ju<dZ@L7jO8EFnDph$75^8S}t!C)>*c>#x~`&T}JG|VlgNspGa%P
zNU}}sc-zYmuR;wq&kIYl@^;#GtyG~#SjkE2T6v9>9cf?*FSW>nDYG3xyV!$(IA~U6
zF<TCI$LV7|ML>p{?bKDJjf+O^)&>c3>5|VXHun}X=yJ##j-;bZ@)2&$xKh9wHYj_b
z3HyXBGd+=fxow?nTc_IA>9+Mu+d9*>o^4wzZR;a#%jpn5b~Pv-5H$XjR5{<OTroi=
z8#ezMrpUD{L;4!wv|+O^VR)!3sSXDX$=9m~VHeH{xI=%C)h}x!$^<Dkv0bhz|7y>k
zT;-v8c2V(TXZiBd>O$Y>&tQur7xUyw$n`F7b9kY@wVU(|G9Ak$*u}ET(U)w?y@Iwy
z)AfR|F4;9gS>%>BnDl~BqZ+xH>`F12k;tF(Tj1O<?4H3O)n@e3g-aJNT{u{OIX$t^
z)5>AHCcFC;7IpH5>r|yE)GCrf7%Sb`%ex!N%E3HZeJD+GL1j8ens@oipm41sT`twa
z)#T$+g$Q(cU!y!YzMQV4r!f*<lO2uZl)bP<mxo1SnQZ+MYvundg={*VQV~j(bRAJ;
zo!gYfZ4|;Tf5NgIB#m!0g|aPlj`eh1=3HTm8#&Ra$FU%K;k;i;UspA^nh*B*Sg1T@
zyC~LFFZonhZfoS7wZpnB_oEC<*{aA7R1WOEbrLax9y1B%-%(14JfXpvBFgrf&ekPO
zIbor$`6#1C&>AS8zLQazL-dqFbte_u(yq%Kl?N3Cbv_imr}+Tqk{x^Fk^aH<JcS}D
z+w82dHLhlAq8=V3Eqq}4Kw>i)Y&UoZ|N5k^c_y&E^i=r*hthp(9TYAIpDU)MCLMso
zT4iJjM@XrnEiN4_(-v9`yKw=J`{I-`T2&Y*9}Dko7M)c*Wznm=hJ;1C#I?eKDp{<r
zq<GVwDSUBsw&&KmJ6~g&qxzdnCK;XTsr4B@#6FZhSq~>_Q-Lvu*Xp{06X9E7wL&oN
zP>#3ENGPN=-0tK^n?hQS+@#NfdV;_0NEh14w8$mbD4h`Jr&LB_BTI#>O_Bb}8C`Ou
z>!h$$bZq#vfQ!QPQH|5AQRHGDY1E!hUSXP;vh#>Oxs^mpWnsxwn;dVXNL~3cJ~Fzl
z8YT2Zd!16&M*yKBwqd3HQqRK@>@IqPBj{v<pymL=F+qVo*ctPCfoF|H0{bB48%9s?
zMSwKfk4f50*emei!-cI-pDjnGkl2A11_`|`aavHBLyqw2SYpU{0hDhrb!JVNil5*U
zjZH@7xml>&9Aq~_B9z5w>|B+HESNvSd^x*`B~u)-oyzFEhEg5Wc$0UiKcNWv!>==U
zxcNUyd|Nd~Uyy!T`7apwDxUFBD}F6<TOjoOI6nIH^jdAoYyN0F&atx&Z#7@MQii;^
S?J*gva5AevrqlX*hy4%aFDIn{

literal 0
HcmV?d00001

diff --git a/app/lang/English/admin/index.po b/app/lang/English/admin/index.po
new file mode 100644
index 00000000..91dce679
--- /dev/null
+++ b/app/lang/English/admin/index.po
@@ -0,0 +1,180 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "fopen disabled message"
+msgstr "Unable to check for upgrade since 'allow_url_fopen' is disabled on this system."
+
+msgid "Upgrade check failed message"
+msgstr "Check for upgrade failed for unknown reasons."
+
+msgid "Running latest version message"
+msgstr "You are running the latest version of FeatherBB."
+
+msgid "New version available message"
+msgstr "A new version of FeatherBB has been released. You can download the latest version at %s."
+
+msgid "Deleted install.php redirect"
+msgstr "The file was successfully removed."
+
+msgid "Delete install.php failed"
+msgstr "Could not remove install.php. Please do so by hand."
+
+msgid "Not available"
+msgstr "Not available"
+
+msgid "Forum admin head"
+msgstr "Forum administration"
+
+msgid "NA"
+msgstr "N/A"
+
+msgid "Welcome to admin"
+msgstr "Welcome to the FeatherBB administration control panel. From here you can control vital aspects of the board. Depending on whether you are an administrator or a moderator you can:"
+
+msgid "Welcome 1"
+msgstr "Organize categories and forums."
+
+msgid "Welcome 2"
+msgstr "Set forum-wide options and preferences."
+
+msgid "Welcome 3"
+msgstr "Control permissions for users and guests."
+
+msgid "Welcome 4"
+msgstr "View IP statistics for users."
+
+msgid "Welcome 5"
+msgstr "Ban users."
+
+msgid "Welcome 6"
+msgstr "Censor words."
+
+msgid "Welcome 7"
+msgstr "Set up user groups and promotions."
+
+msgid "Welcome 8"
+msgstr "Prune old posts."
+
+msgid "Welcome 9"
+msgstr "Handle post reports."
+
+msgid "Alerts head"
+msgstr "Alerts"
+
+msgid "Install file exists"
+msgstr "The install folder still exists, but should be removed. %s."
+
+msgid "Delete install file"
+msgstr "Delete it"
+
+msgid "About head"
+msgstr "About FeatherBB"
+
+msgid "FeatherBB version label"
+msgstr "FeatherBB version"
+
+msgid "Check for upgrade"
+msgstr "Check for upgrade"
+
+msgid "FeatherBB version data"
+msgstr "v%s - %s"
+
+msgid "Server statistics label"
+msgstr "Server statistics"
+
+msgid "View server statistics"
+msgstr "View server statistics"
+
+msgid "Support label"
+msgstr "Support"
+
+msgid "Forum label"
+msgstr "Forum"
+
+msgid "IRC label"
+msgstr "IRC channel"
+
+msgid "PHPinfo disabled message"
+msgstr "The PHP function phpinfo() has been disabled on this server."
+
+msgid "Server statistics head"
+msgstr "Server statistics"
+
+msgid "Server load label"
+msgstr "Server load"
+
+msgid "Server load data"
+msgstr "%s - %s user(s) online"
+
+msgid "Environment label"
+msgstr "Environment"
+
+msgid "Environment data OS"
+msgstr "Operating system: %s"
+
+msgid "Show info"
+msgstr "Show info"
+
+msgid "Environment data version"
+msgstr "PHP: %s - %s"
+
+msgid "Environment data acc"
+msgstr "Accelerator: %s"
+
+msgid "Turck MMCache"
+msgstr "Turck MMCache"
+
+msgid "Turck MMCache link"
+msgstr "turck-mmcache.sourceforge.net/"
+
+msgid "ionCube PHP Accelerator"
+msgstr "ionCube PHP Accelerator"
+
+msgid "ionCube PHP Accelerator link"
+msgstr "www.php-accelerator.co.uk/"
+
+msgid "Alternative PHP Cache (APC)"
+msgstr "Alternative PHP Cache (APC)"
+
+msgid "Alternative PHP Cache (APC) link"
+msgstr "www.php.net/apc/"
+
+msgid "Zend Optimizer"
+msgstr "Zend Optimizer"
+
+msgid "Zend Optimizer link"
+msgstr "www.zend.com/products/guard/zend-optimizer/"
+
+msgid "eAccelerator"
+msgstr "eAccelerator"
+
+msgid "eAccelerator link"
+msgstr "www.eaccelerator.net/"
+
+msgid "XCache"
+msgstr "XCache"
+
+msgid "XCache link"
+msgstr "xcache.lighttpd.net/"
+
+msgid "Database label"
+msgstr "Database"
+
+msgid "Database data rows"
+msgstr "Rows: %s"
+
+msgid "Database data size"
+msgstr "Size: %s"
diff --git a/app/lang/English/admin/maintenance.mo b/app/lang/English/admin/maintenance.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d31d3736a25e05750fa3194d34023a5c9a20a5ee
GIT binary patch
literal 4083
zcmbuCOKc=Z8OIw~Aecu;cs~NQBO>n#Pw$$|!SX&}V|ydR?#A+ZH*lk-yJoscKStfv
zo(w01h=i0&E+FMd4hST~E#kt7oRK(iiUdN*1;L2}Qleb=eO1*n<4J;q7^(g5s;>Ip
z-@nR#ee~SVB7Os&FY|1@FN!XK*WS+`es6*s;9CLDeISY+W&AMs8E_EBJD}|U4)}2}
z13v+tf}aGR2Oj}{4t^2*RhWMj6ghte9|QjZej0q}oS%Oz;1%#;<_`mY4-~mMDE9p@
z;Pas9c@Y#lUk1gVSHRDLuZHn!;rrh~(f@Y9M?M%upJTiU%KmSHp8}7;BVscKMc?l}
z<na&S1IB*@W!=|497UJG9Z=$!gTDq}0v`hR_;Vk;4Sp1S8GHi#Ehu)s0e&C+H@FQx
z_(&A}1^g)}{*O^E{+xoF;7`CI_#05-@fwJU(LceLz<+^a&kHCM`+g6KoIioTz@NW?
zBJaoiIcEGKDDi)T<Q;%-f)bA#Y<dBF0E(X1L6%3jedZ@V$d5ESJLFyTeU(S@D>)z(
z(Z_gjG5QjZ$dlTUx{#VtJn|DeNK15{2RB^2favo)U*QqEq;4folEYB4ym_D83xB@Q
zzkr0%#UZ*`6lz>IUD-x^MV>sXGSir7udc><Q>tmxRYv92xL%uTyHRFzx;8u0O%?6y
zd8^8<wQ3|=t(llcm8Na=#Q2YOk)o!UE=PqPnIbwUr*_Vk)I8_EuTJ<S-`1zPO`3da
zRb$e;F^N@UofjsJ?r2d~=_)bo#<sh)5>2+A<_Q)B3y$j6zPEk;>lBNVc~XcV%v_)J
zri59EP`WTCI%?_!O?fp@Q#3J_2#%Y&46>HvAjVBNgZ)|;ZU5R@GBRJ?7-m+t_Nh2F
zqb|qaq%Nn0u^8nf_0uk_(V5Y^EKqCG#1Eg4RbevQ8r>wB{}|n~y0N{_-rloQ!Qi56
zbTPbDH)Xr4s;L{c*S~R9`Pb_gDs}$4+P-*ogE;<x<PHzh;RDmOd0p+QTSi;T^T{VS
zj-Eal?llaVAMR^wb`^8OV{@9z(thf;Ztd`-(N$Y$TQ@Aat*c2#Ar4QBE>|R~YdS6S
z>RV&4Vl;~DW^!ZW&f%SdrT*>s@&=tjks)<HMX5E<*-O)c%DbwPOgF8u*YBU)8tyFD
ziT1H+h6hzrr-W!%?Tm7}Fl1MmYU8`Zr%YuUZ{tx-VOzBw@5E2=#Se$~>aI!5p4YLf
zyps3m-kXh4^SUFKyx2@zH=60n(hQ-eHGLmCgC?QgSy!pYTa`-tx_V`Bfyb}97_arZ
zRCgOabMyG_;oYasD=FB%01#rN0@<4xNW?Uyt_WH&kA2H8tmtV%OS9xQKV34$sV+Jb
zM<<z4RacI%upWEk1{ge0+8efD8f3yZQ|YEORtNDUR{7XF4x@?VSb&r(m$#HTHO)Ni
zckxN{wA!?^PG!j@vc)^JNf#BgvyaY|%iaKCm08{K7meQ4G<e3R=pN2POE$~fg$XY9
zxU$+cViN)kte2x_WZ+=~lejjPSYBw2VY;YiM1O?~BVoaNYb@ARZI=l3jJqP1L?T`M
z$*az&*MIcOh_35ORW4alVv9n}Q`J5i&Qa^8kl;!Ik79LH7~P7m2~Ecfc~ve!l9YjC
ze4msGz9qDJf|~dp#QDFb+trvjGWDz~rKF~`?`dvk|2@fM*=7y#%epG%sBjr=muU+U
z`Jlz-%v8=P5grybX55%Ii`9usqzmY@p>(8;B$Yk^u2pOfc}!H@Q8Zm6ud*VfvbX*n
z@#y2@Yj*wUP}f@9)Yat1<L$Le;ngMb1kvuu_H8=La(Gz!{cMN3;Gxr<FV0H0$xlT0
zT^6ZOVLai9S#C3x=uRj#Ug&na``{%oL?yi=Wy{f9^GdTVt)s;FMCXtvl+pEx+45AB
zxqg`vAc>4OpH7o1^8u62C2(={jO2oIe8i!?rNV(1sA`r&Te@ghdp&q~W?`6<Ms;C`
zo|apIXznX1)9v!4^fo%-&NF|pke<}sh^Rl;%TgP$I<$(YW%(p4<}L_jX}GaS4F#gj
zG&Hu-qQMuAN(luKYU)`_5QF2Z4NqJYDX2?Mwgl<nhBK3p=>AHwYWYPB@+>E9%=Sbq
zsg)kpjSux&5pKZ%&(id?yfxCj5|n~-vX2b=9r+#ZyUy^W>3lof|N6E#F*tj)AMOv7
z7<j3t+i=b-$mhafg}Vlxu+c6>)H<p(Dg1UEt}p(c;+@(gkUAx}P&Q{GrV*dUloVcH
zlhjzpSti#;=L(#yM?z7o^agDb7*ZllN%E<xvJEuM)S2q+LnR?uCF)q+`acSLncrnw
z1!sGrSXD+3;)%~uLHjGXg(yH$u0HcBP%srFomkX5?JG&_?tKV#etyxMivX`G>nFt!
z7x=(-CFSiBq}8OZsVK2Qc$ogJE7jHvlX^UcUw4NWSEZbhej*JgCn?3m?pAJzy@jGu
zThS-y%2;=W4Mz&?C7$pP2s=6HaxRZt#gVa=<5=All9B8?`V)$gW4z}<Ze$g7F3lUS
KT~QDBqyGRB=+FZI

literal 0
HcmV?d00001

diff --git a/app/lang/English/admin/maintenance.po b/app/lang/English/admin/maintenance.po
new file mode 100644
index 00000000..ec5bc3b4
--- /dev/null
+++ b/app/lang/English/admin/maintenance.po
@@ -0,0 +1,114 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Maintenance head"
+msgstr "Forum maintenance"
+
+msgid "Rebuild index subhead"
+msgstr "Rebuild search index"
+
+msgid "Rebuild index info"
+msgstr "If you've added, edited or removed posts manually in the database or if you're having problems searching, you should rebuild the search index. For best performance, you should put the forum in %s during rebuilding. <strong>Rebuilding the search index can take a long time and will increase server load during the rebuild process!</strong>"
+
+msgid "Posts per cycle label"
+msgstr "Posts per cycle"
+
+msgid "Posts per cycle help"
+msgstr "The number of posts to process per pageview. E.g. if you were to enter 300, three hundred posts would be processed and then the page would refresh. This is to prevent the script from timing out during the rebuild process."
+
+msgid "Starting post label"
+msgstr "Starting post ID"
+
+msgid "Starting post help"
+msgstr "The post ID to start rebuilding at. The default value is the first available ID in the database. Normally you wouldn't want to change this."
+
+msgid "Empty index label"
+msgstr "Empty index"
+
+msgid "Empty index help"
+msgstr "Select this if you want the search index to be emptied before rebuilding (see below)."
+
+msgid "Rebuild completed info"
+msgstr "Once the process has completed, you will be redirected back to this page. It is highly recommended that you have JavaScript enabled in your browser during rebuilding (for automatic redirect when a cycle has completed). If you are forced to abort the rebuild process, make a note of the last processed post ID and enter that ID+1 in \"Starting post ID\" when/if you want to continue (\"Empty index\" must not be selected)."
+
+msgid "Rebuild index"
+msgstr "Rebuild index"
+
+msgid "Rebuilding search index"
+msgstr "Rebuilding search index"
+
+msgid "Rebuilding index info"
+msgstr "Rebuilding index. This might be a good time to put on some coffee :-)"
+
+msgid "Processing post"
+msgstr "Processing post <strong>%s</strong> …"
+
+msgid "Click here"
+msgstr "Click here"
+
+msgid "Javascript redirect failed"
+msgstr "JavaScript redirect unsuccessful. %s to continue …"
+
+msgid "Posts must be integer message"
+msgstr "Posts per cycle must be a positive integer value."
+
+msgid "Days must be integer message"
+msgstr "Days to prune must be a positive integer value."
+
+msgid "No old topics message"
+msgstr "There are no topics that are %s days old. Please decrease the value of \"Days old\" and try again."
+
+msgid "Posts pruned redirect"
+msgstr "Posts pruned."
+
+msgid "Prune head"
+msgstr "Prune"
+
+msgid "Prune subhead"
+msgstr "Prune old posts"
+
+msgid "Days old label"
+msgstr "Days old"
+
+msgid "Days old help"
+msgstr "The number of days \"old\" a topic must be to be pruned. E.g. if you were to enter 30, every topic that didn't contain a post dated less than 30 days old would be deleted."
+
+msgid "Prune sticky label"
+msgstr "Prune sticky topics"
+
+msgid "Prune sticky help"
+msgstr "When enabled, sticky topics will also be pruned."
+
+msgid "Prune from label"
+msgstr "Prune from forum"
+
+msgid "All forums"
+msgstr "All forums"
+
+msgid "Prune from help"
+msgstr "The forum from which you want to prune posts."
+
+msgid "Prune info"
+msgstr "Use this feature with caution. <strong>Pruned posts can never be recovered.</strong> For best performance, you should put the forum in %s during pruning."
+
+msgid "Confirm prune subhead"
+msgstr "Confirm prune posts"
+
+msgid "Confirm prune info"
+msgstr "Are you sure that you want to prune all topics older than %s days from %s (%s topics)."
+
+msgid "Confirm prune warn"
+msgstr "WARNING! Pruning posts deletes them permanently."
diff --git a/app/lang/English/admin/options.mo b/app/lang/English/admin/options.mo
new file mode 100644
index 0000000000000000000000000000000000000000..e650f058e17e820620ef23ad31d363620b23f641
GIT binary patch
literal 18847
zcmcJW3y@@2dEYMxAy^Osj3omCu2x2xv1WQ_^;}jGFuOaeU9`Izc6RkZNa9ZSo$0IX
z?mN1-duK<4U>OT+Fct)`tvI&9!Y^VT4p<Jxyo|x+#5TdNq)f#{aN;<j%1%g;!Y-1^
z@Bf|e-0q%T<VTUNJ@dc!-1Gd-cfQv-`)AL6%6k%ipC?^PI`Gsax!_4j(tD<IljMh<
zog~ize;9l&_><tXzz=~Jfu97Q5B?tb0`R|r&jX)KrKf<GfGT$>_&wkpcp<n1s+|>(
zD#<FSa<#v|$?@GF|B|2MkJ|e+@af=hc>Whajq5*v>i28lcZ14&8gMbF@-G3^&n!rh
zWUu29kblX&{COexfWN;T{4U<#3u=BJ12w<j2i4Di12x|N3##0+_@n%tpyqW0cnNqA
zRKNFv6irHh{{c{Rco(Sh?*m2hkAR}nCqec5C!ogvKfoQ}--4Ro`E;iKUkE+}yb4tP
z8$k7Q0HkPg2Pit60xt%KU<$qsRR6yWs{daHMVH?JRsYMN#_?C6#&H3is^81_qjqip
z)&4P1<5&eX&k9t#ZvxfsJ00H(s@#ViKMkt<7r_g_uYl_BFF}p>Npzz1-T|tgi$I2w
zTn=iUdq9<60!5d5LA76iYIh4%y|;p@_tXCUqyGJK{{Bb){+}Jc0g4V!W%14fzXudO
zE(O)zE>P|52i4!5p!(~A3_aNbX(D;VzyCa_@jVV|ojwbSKEDTwK3@ja-+u?y&$mF)
z`ywW%_gPT=-UMoYE_;68^S>X|INl9v9Pjt{U-kFTgQC};fa>?pLG|}PLA8G#ovGf%
zpz^N-HIJ8h{%xS@y$;lP2cXKm0aX1*K$=Q^7UW;@3I3?PKL%CqFF?`jo1oggkWD1I
zUJi<{uXNn)c%$Qz<86+2Ikp}9j+>4TIlj&DJ&r%)_)Cr-b^N5`Z##a;@ym|?#qqBl
z|Hkn=goMU@q2ncvmpNYLc%9=b91lCLINsy9?)ZS?>m46<e8lll$Hzd?@q?iF>~o;#
z{imSl{WVbQ^nXC{#WP_V(f?9V^>%|QcMGWXy9*Rw_CWE;8BqN8FsOQuf-3hR&;Kl_
zcK#St|6c=_(HBpCQIgE_zVhPG-b3K)cz-(xODBH?z6yNmOG3M^2E|uvp!WF?lpNRs
zpG$iWfnVqS-D!{qZ@DZ<zRLSMzyhpyhI#x)aLD^#gPKR@^3dJ}cs}nV@DTWVQ1kmO
zumgSx)cmgh-Xz%v-U^CtKMGz8{uHS8{s24;{uwB`oqQ>C1lPfPz)ygh$MdhCE$~WE
z?cNLWDXBrt>rwFK;QK()?<?T>;Qt08UGgnZ^nAgUL0;?zB?oT;Uj{CLqT?GujqAt3
zli*{Z*6VM;!_e)*nehFNS!4(KZT?&Zz8(BA@Z+HBFMnT>d;okcsP(;oLhA1Y;4biT
z@EULhd=K~*P<-~HxiIe*D0=<~_`BevpvJKV6Fh@)JP4}%n_E6!@Br_Rfjhvz^!NV-
zs^2|yx*uEwpAJ3@ZqUvnpy-wC4)rbuMX$@iXMnE&p90<r-VQE<&jNn|ya0S0)Hpr`
zs^2eyqT8Q>7l8{`C&_)_D?!zJFSr1H7*zSMfNuo92CBbP5M=;vf*RLffaihV@_aFm
z_@M+vpErPg@U5Wa<Tt@Dg3q}wjO#yv8t2!+i<s}<g5S;ijvJUen1bSqkAPnVe;fQR
z@B@2TZ}3y#XTYbyB<lBfz(e4_2j2yzdqe)mK+WSf!RLVcZZwi6CqT{f%^)n4yb~0?
zJ`Pee`8S}(bN)?XU%U_$9hSjm@U@`Y`=Gyn+TWjjbCR4Oe<vt9Y=Ro^4}u#1?}HoQ
zS3$M6!sd7#cps>B`3!g&`0v2)1HTT!Qpt;65$v>EL5*`AOu;kYCE%mr^T1yLF9p8<
zYJ7hVs{S`XL`8D>D+3+`HO~T6Kko<GLdh4w7lYq)yks%Z;d)SXIs(1`9D;1!<Pq?N
z;NzhB`2$evE#U&ICC>--ek&-s(DC=Tf*S8*py=|i9e>yJzvA!T05zYdvq^S>SAZ`9
z4}%)-I;i=-!{2`q{3pDB2^5`<vH9);?*m2ePlF!^|1GHR4=>R-_+y~jx$Ph_3|t4b
zeqR88;z>#JhoHvWgUK|Hhd|qJp!$0pyb!#G#Xbryf?Cf<K&m%C&E;oEKTrCnp36|1
z-{*OH6X~g>n)FuEuaGVy{WR$%q#q*bcP;4(lIWt}(@0vQ?<bWc{X{E<Zogk}JP*`Z
zB^UJ*pKI-IA>}0TgMRN0kYwO5`}5ntb<zd?E)bt}C*C_epC&=#<b$5iGMaq-QSjGD
zE1rLw<K5tg{8{j*KR*U)ee}DE^bXP|NJG*Mqzw{FXFT?cAY#Pm|Gi-R{gOYdf#L<N
z*S{pamL%SL1?lOecalC$`a#mCNc#0juOmH~G(-A1()&mw(!->mARQw8E7Bb4e3JO=
zhe?u`lfTP(X_G!ldMW9nq+cg}mK1+4j}MLyfgdC7A^md_Vk3E+bT6qOy@m7v5@Ij;
zXQcO&t|94nJL!IVN)p6b@;TDG{CzvTl8j~2n@NkLJ4nwZy@&K$q$4El`yC|x_L9W^
z+WY!Fk0gHAPy1+r^y4J$HOYbNN%41>hl~9M^^)8~TJ`ti;Co3QCcT*S1ElAZev>r$
zdkrtQdd5$JXGkYW73ni1{Z5eHK)OdS{5At5cY$vt{VM54NIlX|kscuFcZ@VkdbM8o
zrKDGp{sk%iT0Fd-^c2z~q>qrEP5N2VZ;<r6GeB|*e30}^f8PS%?$60$r(X=xe7>I*
zy|kP6Hl}lW*=pWP7JI#NGaclcUZQ#R&x1iZ8np9%J{YF`ysoqL+)JM8%Q-65qt$Mn
zb&|zl*-sWvXTz+j)0nw0>!gQHoLEke=WBVDSFwv^UsmVo$>T>tU(H)+zj@uL%GF-p
zPxh5r)k!;f-S+b1cdua?!(!O;(T5r#BNiEUlYLuGuVjBdsLLwdEUQi(8lB1sb@um)
z_Nj~^q`hKrDwf-p8HyfQIT4!CgJ)&KJY6fRem3+^6B%A4U&}_lVY-&*9WOJPGhK*v
z9t`tA#&R`uJmAIa;Z~gbbe1<!)Em8QE6pYs)mY}hxxP$Sat@o$j4Qkp*stT`ur{~l
zg^Hfp)MF~u_VHACvSj(ysF#b}%BX92v&ed5t~!`!!%;<n*w{gl@5Bk`rsgelY_Cnp
zvKsYOuWnbx#;_;{zN!b$@gdZ|<u%1dSQ~o^nTLu_o@Tb0w8FmPmb+RGyZ(N7(9ym!
zqWE*Det57}rflAgvL5;Xrn6!(h&0H0$>G82tXFj6X7`QSWN+rH{j3&2eXU}FBiUem
z)NJYIEwp|Vxls((;qBVTIF-{B+Rk)gK9oJ{!#S#y(8=aMRbIJg7mkZ`G&@6`V!hi8
zt9g%=&ZKqmVAHa{jX!P{9Tvg+J(Gr4|C|p-X)(<EPWPkZcP~&3M#H>Lj*cJ;%Li41
z9En6dR;KN&-OZC@<seUP8$iUIBK^D^`GB|Og?4Xi*bQkJUq%}pghD5+@=j6Z?P0Qf
zXgTd?gAt3q40EJy#Iv_L@g7=KMxAajz>Q{&x8;R`uO1=C()&k!XXJ_Z$pRbd(1;ca
z*n2EcBFsAZMkMR2N8^l8<oL=;a@?n3<OoeoXL-?l9iFQ)?Z0LdAI~?+YB*L^6YsH>
z3W#I-`LJ8MzzoGEawiLqMZ|HJC}_#>7>cbNMLDgkxa4TwCO&4J4x+}H#R|lni9+oz
z8!cxU>RK8l%-jk;QPxBQu~?mU*ye*0Wt<J$-Nf1$)sg~zXZPtWZzIpDc2@$)yB@!L
zfnt5&Lemy_W&G|1`UnG)xlm}uU#36R#d;)zf47`a=mh*frR*j%#znM6@~T4f#@(cH
z<c?QL84t3v!c3YsZ=>8O+U%CoMYL#6Oy*1$I){)CWv4$(R#B@y#ZWY4OcdF^-K^L|
zW+-~{#QubI)xz$*3k%`t>gMU1iKlD)>$OeZwR>aUbxq!N6M5HO7uvhN`Fefx^@b*I
z&%{%#@v<iGWwFNYg_y^a_q)3pGfy$E8U607_j-G~n|bVxqn~f)JHHTX%rC@pdJ65$
zFN|x%S<WxS8O<-mdCV`wdFUzDjq{jai1V0l<}u%lex8wv_8Ywt8#D;lvf2tvbylt~
z8#Za?7Od@(lM@-^BGEWuqo_c5Z9Z3NH-jM%rO~9L&{XEQXq}cpd&J%_ojoTMx;?Lo
zH6OG;Hy>&V&%vm_s@7%wQ(!XB3l?=ToYqdaPi2K-cWk#Hti`i(L*eD#sLFctm`we8
zZ#vkp*ZStGZ%o7E%`=1avYXT0vp4QouFCsSYx9RY^FF-2smwP_yM6n1EZ=rwet*R)
zQ<*=2BHWvjH-DV%t(nBEBiJ_cC#q~v_p)JGQ7Bq6^C$AGKha`(QzobAm207k)zwy6
zt-pN7(ZffV#{KVZE$rA|%6OsGtqnRI=4XbxFp!JEjVYqMs`KH^Cr=!l-!m?!-f>~(
zmj>;!gSOe5?pZB{%|P~IDeSm&{+4`@qt-OW<q};uOn0~Tw65h#c%5G<M^!uDANtsv
zhE9?b-8{|va^s?IDc4eHl&+dzV{-}$v#eUt%TxJ8^QcN}<IOHQQKm|_sAIKu8+~1y
zMy)0^Zrw_;`pvC@*|yRVR%(^j8+jWmJ8c(Ld(^Loax-c=YaGU@CKxjPh;A5HXdP*+
zRVhGd*TJGZ#lFbbN4*T&#H^HT&|z$&8ojoKQ8O4qY+S>mN9bbGDT!)fGP9m?F7X|M
zQ+eO<rGrbymyWm6!)xhQIb!3T#xp8UGXiMA*2FYtD(PBP_SsjMoMk)M9K#aV13R60
zql)Uy0$oe3P6<&5^_;afkW)dyV4~S_G>&Po(4ZZY&^lqnWvg;&XL@CMO8utgeag6R
zRP|yZX1!Ldr<CmFv-EGH9Hi|Y%Gz2nt1?~P!p`dDX6Q(vw>G*P=~^L&$a~ur3N}Km
zWen6V`x{gXZuJ!ZFukr6FBVs@_}NEwH=QY3c`NM>hZ}o$?b_VjZ1uMS0a`S*E6{GX
zmD)<*gt=A@)?ePoD86Zzzi7qVWhJ{+L&NZao|?OcZA@#k>|^cQrohd08w9dqC!K0m
zZap8SJGHJ=h!gA#Mgl8Q46j6*5(j{4BDeR~Y9a{9U2G{nz_C5VgM?zIgjV9ndbD9S
zWi}!>!MC<J@3f0aNF)yi%Sx4SuO4hTAeFVnHd(C22~}!Kt7wHYF2+jSE$rm1O)Jhc
z=cW?|9F&NnJ&ZwqMME_4<LMI1?_5M+hop5^wy`20?zX13!rJSjo-vDW`WZ@Y4pKr6
z;>%&Vp@KPc-ZCd4uIE~j_d4g;i{nU(_hYOT{GabskC8^K(3q8+vMv%P!Z!qe2;3~0
zv|AdO)G`?d$=V@?V{5U-;)Y<3ZxR!ot#l>N)0ZLwWO0^N4$0Tb)>QN-xucsCMzf|n
zbLqj}=*+%-L8>);18Zql4#nx&U`vrJ+l^z{*3S@mki5@+jzOa?%B8Z%Q7bvB@8eIF
zo9yrA_+`Z!@?)!K{%)O}M!C?oHJ`7osmGbDbK1nQ>2a2PE8U&4qpMjdgZt&DYJNnX
zlDqeh*pGOOWWe!znfpCcL<spNT*}~(wi0PxuaK-Ddg#)ahvAER>a9ViaKUMTDoEc6
zVWU=h3^#CZy1!eNwS2IF#B8GxC}j(#T5J&0HeE$dj8G=%EdIq1Cc|DsIySyzu#(>y
z>xRS5R?ezI3n32Ij3uo-BGyWmk)!OhA)KDAOS|wdL*#6xSOoIugP4qwst_?#E9;|N
zezXKK8x<35vs;=j8C;3~ZJu2x=nzpQ)(>n}px>%e(s?`wYnedS6t6nLjIhLIiOIUA
z(=gR;;MWArd{(5c$(*(kScag&Y}E80s=`$)hS9hg>_%0b&e~fkhK((~rmdK;YD!Tz
z-Z(^xOA$Kr8qEfj*fN>8EtFV6fF%o-*w<(yTXqw{OJd}X2RMQ-%D{ApqA8|pp$qMc
z9QfR3DltUGHef?zB8G?UX;NMSKo!G>WM#~yk@jIVDd!#^>WUX<su|Q)USKeUd15~i
ziYW0#Vc@oGQgldWL_&xbZMNFMvqOXlmd80I$NGZ=4K)w+?gpw?F-&#7T9upPF;}a$
zQ;7YH2<fiEfFV$2Q=UVz54AvyqE`$R*){>TfBB?Wc5Mo&9vBfk!W`=&_7y-vdLU0R
zHi(jT*p38k9_$sX>CF7RUgq_JCJ1}iji;=~q&xT;GNMET6Zd(#xM4&_iCY8(yw4`5
z?Z-3Q0j-;hv#^vjMcE-1G0{kZzH;S=Y8s(+qEs+3?vrRG7F-R~N-T~#&FmruQkZ?i
z`t?1|**aHA?PGN@QCP~OrM1#18RDKfh#Kuv?6DxRU=PR*y~GN%pnWKr=2kAl4LkL2
zJb?V3yLTC2&aJo7+gR#qv#?zU@i7nCYY>h_u_ca8({~YK!r~1z%&<a+;+e?`%G*?w
zgtttYY}E`m3Y$k+xv{R=;%<uyX;>BnQM5w55wu*>geei`#lWHgJm;I9&8GO{oVCu%
zDc0zQX|Q!r1*WRf8D9>Fi}GVPoRsL0HkAM~J;+SVoa&kE4))*lA|e_>L^X`22vO}I
zmnUM_TCT<udZIc}7WZP9TXO9?B+jE#QRVU|v<YJ;tm~;cHk%e&x>t)E!nkAM84F{&
zu^;*woQH1&spT9|M`|@3Lg2oeG+>4E5(A#S7uvRRrutY=gjKOoAVdfdtnntZ7Fm7N
z4SJO|sz;?_q9C%K^D=$Ie_|VR7bnz?n;XzQs#EQ4oCCH@FJEJd%!fH=jY5h2#4faP
zTr7QOoI++c9!ofv+-9h0517&nTg;3LmVy9IL6`zUGTAB5ISO4DLvc?QldiU$J_IR(
zn);Y*awae~Can+g*aW3oX|!kWSUi60@UdGiOAnOhee}w8iT@x^#-oL8*fA3=1X_<x
z;k(!+MpwBonvqY2_NZvKjjjBcKCG2kA!Y<l$j%gf&bmwvvh;qS0{6ram-cOOCMS3>
zbNzx?049T1bL3Hn4L&}FIcIxz{xaR#>Xww|%<hG&ul+XdnUIr!>TereP<+$P{au5z
zI(DSX#4AZ^#S_x8)eW6l$>1#@YFEoMurQL@gJ$#=&Vk$vA@&lsh}LR=A-*1DFccYW
zbEqJyxl_J#rIJv+;tU!wI~e0C2u|pFXL@sbMQ?axmUi)PZ{CRj-Fe0O@WvyDkKL;L
zU76m*Cm6bSY9%xRWNHy~fLN#?ysum}DsNDV6yCt^%_~WjnY@J_S`h1oyg1@jth>QL
zW0GLMda}TpjJcgA$R$8_ViK&ln39;TbRJ;FgDj9izKVfxN*)JsE%TT$VdGg^@>0A>
zKR6TrnqZ_2I>>yNniGkHEX}NzQ4tQ%j)f2=t5L&$1GZmgLaGt2MTgD2nnPWIW)fub
zgi-E6(;(Y4m)5p(xp?3faV)VX4%|%p+Tu4uatALANP*pchWj#;nNF3U&~b$HE-Ezm
z0gWGFf<7urwG;HKZKkNW#+(>BV)a~DkB{}V=R-%WRBIK?W<1N<qZWa~-B54YvElec
zBHF^57G`2R2Ar|OK)QpfqyB8#sfZK=!i^6Hw+Y-S&$!cJRG~q%5l)%*K*Mw8kbsL>
zkRnhNyqkpn!V+o68A(D6OVt&l(;&wrZ6#qS*8Y?X8gfJ=Ho5x&okHFt8_ax(bz^=x
zn87ic_>Kvxtxrjg*z#P5rszmlwNZ;f`!+XCP-T*SCO%^mcJ!I(jPq=Mg^ZgSv0gJA
zvAFFd7d|!p=_cpG96ABU4IfQ-G^XKLKhH?yPmAH>v5F?m0qfXT`?k&pjp)=MklM@%
z3EYXp{+XJn2&Uy};*d7z;OM9Vy{iYY8H}d|F%H4j2nVfaN0TQ*27WM075s=n2dRPi
zEEd>hs~zo@R3bt=&<?IDW1uHi<gB6-qRtvb(h)Y$u%zvDH-Z6MjIZ8e)cv{O&W+``
z2h?GgZ%YVs$7dA?*42$TQ4Kvz$7fzAha{h6k80>H+~BF;>ry>1oowQ0dz%@i(Hdz@
zDEir@gmGp8`p7nc?2&EMjeC~ffvuNyZ!Q{47lt6GRldnOD!#&$w^5icB9>He9z6kz
z$&C2U+GtBA-x(=fGjU;O(5|+0?x1-i&<Dhm<jOE$<=F8xj7CTjs%Y38zoU49N{dz;
z^ul4WuzodFrEzwdoM>phPlR;M=?r1t+FC{c+IT`MO^+r|oH-<@w4!I6qb7&QsPWyo
zd7}*!)M2Y(-w=5u-jud+1Q1}xi7wRLuAFR4foW;KYNTMWkt1pXt9kWx=<zd|;`n=Q
z#}bn7qB#_h-+Rq<dlt~pM{+snW{``d5X#z-XV<ejQbg-j)^CN&15Rq6Y7#<@W)lVS
zBDz9o!tXG^$9DV>nr(-0A_AKEDVPv1DxhcLWe4r{iCN+e>r^Q!|5!n*$(os&iQZ6K
zzLO{FrZash$}r}-v8+30P>(HSXM&XYEWSE%eKXV`j>iB)-^LnE_ruMCAPW?;$Ve5*
z6Tj;i0ofJ=N2uR$Yb=w7HdvwdkQwTGt!o)-)WU>JFgV8Mmp?IGBoTu9{{NpYffHhn
zL9IuLFbB1DdBkizghkwe(QiNtC>q3M<V>*XEC@Y5LS$K;#q6Y=_3aYLPCFx`OMZqJ
zNUbni=tbfUh0)wrv1U2nvtW$|XwFwQ9AY2R6&FmxwH22h3b(=_Xru837M+120N@(G
zm7*=%mxazQ*uZd33zl3}{JZ=fHS+hYC_Si=jR!N`Rx`%>9~XVs4HvVXvf#pV(+}Dq
zl6LBg9LQkZ?raQVo1N5UFktfZ>?%4yAMPZwqQ)gBWj)YVJ!O6>Gqt-m;?=VPCoBU|
zcMBLp(`XoItj7B>V(p>(rm@C$dIIa#tPZV$6u=CjXhQHDa#r=woDhrBnKR>T%1q4E
z4%#yswGG2Gu@vJIvpLfz3h>IL#Jj;d56w<p2}*9oKGb0;#xl#GZ9bk!xDn(AIYth)
z?EydKaCxebO@0OglW<Mj)Ux)&)E<#VzdEYTXdWSn!XT{asr4CmYnGAi4G3Zf1hQc5
z+8^x6F^9J2-_Jj=&L$j$8Ez`grgyLa2&8mrgeQ<^gSqsUD$fT9&2FL+;V#o`$}MRq
z)0-%#n(5+Ng%lomQC+>6O_%IS>SU9#@^ook5E_@>{_PsR9p?6hH?5mPv+2>YZkPC6
zw~TsgbLmRfC$`oUP>sd4bv6fvY*SGejb_v3?9_CoHP880Ml)5B9wE*ZTe^;`PP6GT
zJmQ|Wtt(2i={^F1J>0;$JD2Y3j_6`8y(>ROaE~Cw>Zn?8N~`hxWxK4?!yLKe+Rmj%
zx3U4F^&-0I#PkN8vW*4D7><>var;-<2&cS=u0YLdG1Pv#KNMTU++Y<7tQKFmx%Ad5
zs|V#4H!#LkH36=iz{0*3ahaP2ycb=nnoVDoZD=yLqUjk6eGP%b)hXmgY*TlxAn&+;
zU(?WzUBsID>`c&nR_!CYB6*0T9?#W{GmW!X_OXfrspit#p>Y8<hNbsy_t998vRW&9
zr@Wju5jgG`QJ2@`nMln+ZgGDBy@{7~A`{r{HI{^Pl5W<Ii{ecLHax*C2PVDTE%QNf
zCKiDvSsxugjLczo-k6E5{`%TlGvNvx6nGFCvfTSK&QNd9@hRt;{a_nQWAqwf>_>~v
z{Nj*o%o+a>Mzq+^5YaT{J8ye+-KrCtZmto&?@Y8Cw#v3P!#0>)m2mT}+1cKA;LM{s
z5g@SWnSmFVvv$F8dy}W`m$^Zc708ciVg$BY>}B;Sh<Z!bUoBwbP{!*AhB}&64{!`i
zfMu!y=chv%{&g|G*vm)!PXN(Ew`?Yxv3q||p%_7E<UtuWakvGj9cHGzhpp_q+m=q-
z!6fcz`#nJ^xfm!#lW@i*BL+1nb>NYZs>EAwZsExM)a7j*37ChrSrJ}T9H(Dk0_lGm
zSamF<rViHPwvM;OT!My+UR;a>`)JwyVTc|djKy3<V9SQ9T?`q+$>VP)b)pz9Ii9mG
z8-KQr@Yis4aABtv!NKzgN8_sEu9y#KG5_F4hXW`tF7Gqz5%=NJf^{21^WCZ(p%pE#
z$PI|#3r)ma?UGasC!zeLh{v~B{Pf9`UT{5GMCck%M4bQ%5p`H1nkT%3mm_T+j03Wy
zZiCv?1uHVzc71^59XmaQ+}9x^AI$=sxY<coaPG}4!Jx&SsQ%%$fX`&2VQ(s)=F>Mv
zZ0;=T?C?y``r%-3!eoo)nO5EG=<zJ<&{>v<c-O5q*Z^BQSeEDH12bdf^wJ=QrHCu}
zx6$V_MxZ&OA098Vb?0gyOiBKLqsDd7je5~JQtwRzMnAD-44Yy-S$hgit>H(dQ!C1U
z|B(f1j$`c;ggvqQ73tDdhN+WAoSE33hnOhrK3WrLlv^`31!k&nw|5OcDJWo(UhREF
zFJU0NrzK*BiTh=Q40A3R+FS(E*P5euT9?Db9tbO9QemgxVB?CLs2k5YHDaUOm?XFv
zXb#P9va32A61xb30F!rqX<`kb1ShKM#FukKEuSFD&R*I@Fp2YG%my}!t`O^rqrCU{
zKUQYAQ-UF*`#3Qgu4RY^gRrXH^0JbVJ$2(aY*ktkKg0-3Ln)85*nJ6)4@?~LNr;61
RkHK1LAzR7B9c9ro`F~JqR&M|R

literal 0
HcmV?d00001

diff --git a/app/lang/English/admin/options.po b/app/lang/English/admin/options.po
new file mode 100644
index 00000000..9df9a3d3
--- /dev/null
+++ b/app/lang/English/admin/options.po
@@ -0,0 +1,603 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Bad HTTP Referer message"
+msgstr "Bad HTTP_REFERER. If you have moved these forums from one location to another or switched domains, you need to update the Base URL manually in the database (look for o_base_url in the config table) and then clear the cache by deleting all .php files in the /cache directory."
+
+msgid "Must enter title message"
+msgstr "You must enter a board title."
+
+msgid "Invalid e-mail message"
+msgstr "The admin email address you entered is invalid."
+
+msgid "Invalid webmaster e-mail message"
+msgstr "The webmaster email address you entered is invalid."
+
+msgid "SMTP passwords did not match"
+msgstr "You need to enter the SMTP password twice exactly the same to change it."
+
+msgid "Enter announcement here"
+msgstr "Enter your announcement here."
+
+msgid "Enter rules here"
+msgstr "Enter your rules here."
+
+msgid "Default maintenance message"
+msgstr "The forums are temporarily down for maintenance. Please try again in a few minutes."
+
+msgid "Timeout error message"
+msgstr "The value of \"Timeout online\" must be smaller than the value of \"Timeout visit\"."
+
+msgid "Options updated redirect"
+msgstr "Options updated."
+
+msgid "Options head"
+msgstr "Options"
+
+msgid "Essentials subhead"
+msgstr "Essentials"
+
+msgid "Board title label"
+msgstr "Board title"
+
+msgid "Board title help"
+msgstr "The title of this bulletin board (shown at the top of every page). This field may <strong>not</strong> contain HTML."
+
+msgid "Board desc label"
+msgstr "Board description"
+
+msgid "Board desc help"
+msgstr "A short description of this bulletin board (shown at the top of every page). This field may contain HTML."
+
+msgid "Base URL label"
+msgstr "Base URL"
+
+msgid "Base URL help"
+msgstr "The complete URL of the board without trailing slash (i.e. http://www.mydomain.com/forums). This <strong>must</strong> be correct in order for all admin and moderator features to work. If you get \"Bad referer\" errors, it's probably incorrect."
+
+msgid "Base URL problem"
+msgstr "Your installation does not support automatic conversion of internationalized domain names. As your base URL contains special characters, you <strong>must</strong> use an online converter in order to avoid \"Bad referer\" errors."
+
+msgid "Timezone label"
+msgstr "Default time zone"
+
+msgid "Timezone help"
+msgstr "The default time zone for guests and users attempting to register for the board."
+
+msgid "DST label"
+msgstr "Adjust for DST"
+
+msgid "DST help"
+msgstr "Check if daylight savings is in effect (advances times by 1 hour)."
+
+msgid "Language label"
+msgstr "Default language"
+
+msgid "Language help"
+msgstr "The default language for guests and users who haven't changed from the default in their profile. If you remove a language pack, this must be updated."
+
+msgid "Default style label"
+msgstr "Default style"
+
+msgid "Default style help"
+msgstr "The default style for guests and users who haven't changed from the default in their profile."
+
+msgid "UTC-12:00"
+msgstr "(UTC-12:00) International Date Line West"
+
+msgid "UTC-11:00"
+msgstr "(UTC-11:00) Niue, Samoa"
+
+msgid "UTC-10:00"
+msgstr "(UTC-10:00) Hawaii-Aleutian, Cook Island"
+
+msgid "UTC-09:30"
+msgstr "(UTC-09:30) Marquesas Islands"
+
+msgid "UTC-09:00"
+msgstr "(UTC-09:00) Alaska, Gambier Island"
+
+msgid "UTC-08:30"
+msgstr "(UTC-08:30) Pitcairn Islands"
+
+msgid "UTC-08:00"
+msgstr "(UTC-08:00) Pacific"
+
+msgid "UTC-07:00"
+msgstr "(UTC-07:00) Mountain"
+
+msgid "UTC-06:00"
+msgstr "(UTC-06:00) Central"
+
+msgid "UTC-05:00"
+msgstr "(UTC-05:00) Eastern"
+
+msgid "UTC-04:00"
+msgstr "(UTC-04:00) Atlantic"
+
+msgid "UTC-03:30"
+msgstr "(UTC-03:30) Newfoundland"
+
+msgid "UTC-03:00"
+msgstr "(UTC-03:00) Amazon, Central Greenland"
+
+msgid "UTC-02:00"
+msgstr "(UTC-02:00) Mid-Atlantic"
+
+msgid "UTC-01:00"
+msgstr "(UTC-01:00) Azores, Cape Verde, Eastern Greenland"
+
+msgid "UTC"
+msgstr "(UTC) Western European, Greenwich"
+
+msgid "UTC+01:00"
+msgstr "(UTC+01:00) Central European, West African"
+
+msgid "UTC+02:00"
+msgstr "(UTC+02:00) Eastern European, Central African"
+
+msgid "UTC+03:00"
+msgstr "(UTC+03:00) Eastern African"
+
+msgid "UTC+03:30"
+msgstr "(UTC+03:30) Iran"
+
+msgid "UTC+04:00"
+msgstr "(UTC+04:00) Moscow, Gulf, Samara"
+
+msgid "UTC+04:30"
+msgstr "(UTC+04:30) Afghanistan"
+
+msgid "UTC+05:00"
+msgstr "(UTC+05:00) Pakistan"
+
+msgid "UTC+05:30"
+msgstr "(UTC+05:30) India, Sri Lanka"
+
+msgid "UTC+05:45"
+msgstr "(UTC+05:45) Nepal"
+
+msgid "UTC+06:00"
+msgstr "(UTC+06:00) Bangladesh, Bhutan, Yekaterinburg"
+
+msgid "UTC+06:30"
+msgstr "(UTC+06:30) Cocos Islands, Myanmar"
+
+msgid "UTC+07:00"
+msgstr "(UTC+07:00) Indochina, Novosibirsk"
+
+msgid "UTC+08:00"
+msgstr "(UTC+08:00) Greater China, Australian Western, Krasnoyarsk"
+
+msgid "UTC+08:45"
+msgstr "(UTC+08:45) Southeastern Western Australia"
+
+msgid "UTC+09:00"
+msgstr "(UTC+09:00) Japan, Korea, Chita, Irkutsk"
+
+msgid "UTC+09:30"
+msgstr "(UTC+09:30) Australian Central"
+
+msgid "UTC+10:00"
+msgstr "(UTC+10:00) Australian Eastern"
+
+msgid "UTC+10:30"
+msgstr "(UTC+10:30) Lord Howe"
+
+msgid "UTC+11:00"
+msgstr "(UTC+11:00) Solomon Island, Vladivostok"
+
+msgid "UTC+11:30"
+msgstr "(UTC+11:30) Norfolk Island"
+
+msgid "UTC+12:00"
+msgstr "(UTC+12:00) New Zealand, Fiji, Magadan"
+
+msgid "UTC+12:45"
+msgstr "(UTC+12:45) Chatham Islands"
+
+msgid "UTC+13:00"
+msgstr "(UTC+13:00) Tonga, Phoenix Islands, Kamchatka"
+
+msgid "UTC+14:00"
+msgstr "(UTC+14:00) Line Islands"
+
+msgid "Timeouts subhead"
+msgstr "Time and timeouts"
+
+msgid "Time format label"
+msgstr "Time format"
+
+msgid "PHP manual"
+msgstr "PHP manual"
+
+msgid "Time format help"
+msgstr "[Current format: %s]. See %s for formatting options."
+
+msgid "Date format label"
+msgstr "Date format"
+
+msgid "Date format help"
+msgstr "[Current format: %s]. See %s for formatting options."
+
+msgid "Visit timeout label"
+msgstr "Visit timeout"
+
+msgid "Visit timeout help"
+msgstr "Number of seconds a user must be idle before his/hers last visit data is updated (primarily affects new message indicators)."
+
+msgid "Online timeout label"
+msgstr "Online timeout"
+
+msgid "Online timeout help"
+msgstr "Number of seconds a user must be idle before being removed from the online users list."
+
+msgid "Redirect time label"
+msgstr "Redirect time"
+
+msgid "Redirect time help"
+msgstr "Number of seconds to wait when redirecting. If set to 0, no redirect page will be displayed (not recommended)."
+
+msgid "Display subhead"
+msgstr "Display"
+
+msgid "Version number label"
+msgstr "Version number"
+
+msgid "Version number help"
+msgstr "Show FluxBB version number in footer."
+
+msgid "Info in posts label"
+msgstr "User info in posts"
+
+msgid "Info in posts help"
+msgstr "Show information about the poster under the username in topic view. The information affected is location, register date, post count and the contact links (email and URL)."
+
+msgid "Post count label"
+msgstr "User post count"
+
+msgid "Post count help"
+msgstr "Show the number of posts a user has made (affects topic view, profile and user list)."
+
+msgid "Smilies label"
+msgstr "Smilies in posts"
+
+msgid "Smilies help"
+msgstr "Convert smilies to small graphic icons."
+
+msgid "Smilies sigs label"
+msgstr "Smilies in signatures"
+
+msgid "Smilies sigs help"
+msgstr "Convert smilies to small graphic icons in user signatures."
+
+msgid "Clickable links label"
+msgstr "Make clickable links"
+
+msgid "Clickable links help"
+msgstr "When enabled, FluxBB will automatically detect any URLs in posts and make them clickable hyperlinks."
+
+msgid "Topic review label"
+msgstr "Topic review"
+
+msgid "Topic review help"
+msgstr "Maximum number of posts to display when posting (newest first). Set to 0 to disable."
+
+msgid "Topics per page label"
+msgstr "Topics per page"
+
+msgid "Topics per page help"
+msgstr "The default number of topics to display per page in a forum. Users can personalize this setting."
+
+msgid "Posts per page label"
+msgstr "Posts per page"
+
+msgid "Posts per page help"
+msgstr "The default number of posts to display per page in a topic. Users can personalize this setting."
+
+msgid "Indent label"
+msgstr "Indent size"
+
+msgid "Indent help"
+msgstr "If set to 8, a regular tab will be used when displaying text within the [code][/code] tag. Otherwise this many spaces will be used to indent the text."
+
+msgid "Quote depth label"
+msgstr "Maximum [quote] depth"
+
+msgid "Quote depth help"
+msgstr "The maximum times a [quote] tag can go inside other [quote] tags, any tags deeper than this will be discarded."
+
+msgid "Features subhead"
+msgstr "Features"
+
+msgid "Quick post label"
+msgstr "Quick reply"
+
+msgid "Quick post help"
+msgstr "When enabled, FluxBB will add a quick reply form at the bottom of topics. This way users can post directly from the topic view."
+
+msgid "Users online label"
+msgstr "Users online"
+
+msgid "Users online help"
+msgstr "Display info on the index page about guests and registered users currently browsing the board."
+
+msgid "Censor words label"
+msgstr "Censor words"
+
+msgid "Censor words help"
+msgstr "Enable this to censor specific words in the board. See %s for more info."
+
+msgid "Signatures label"
+msgstr "Signatures"
+
+msgid "Signatures help"
+msgstr "Allow users to attach a signature to their posts."
+
+msgid "User has posted label"
+msgstr "User has posted earlier"
+
+msgid "User has posted help"
+msgstr "This feature displays a dot in front of topics in viewforum.php in case the currently logged in user has posted in that topic earlier. Disable if you are experiencing high server load."
+
+msgid "Topic views label"
+msgstr "Topic views"
+
+msgid "Topic views help"
+msgstr "Keep track of the number of views a topic has. Disable if you are experiencing high server load in a busy forum."
+
+msgid "Quick jump label"
+msgstr "Quick jump"
+
+msgid "Quick jump help"
+msgstr "Enable the quick jump (jump to forum) drop list."
+
+msgid "GZip label"
+msgstr "GZip output"
+
+msgid "GZip help"
+msgstr "If enabled, FluxBB will gzip the output sent to browsers. This will reduce bandwidth usage, but use a little more CPU. This feature requires that PHP is configured with zlib (--with-zlib). Note: If you already have one of the Apache modules mod_gzip or mod_deflate set up to compress PHP scripts, you should disable this feature."
+
+msgid "Search all label"
+msgstr "Search all forums"
+
+msgid "Search all help"
+msgstr "When disabled, searches will only be allowed in one forum at a time. Disable if server load is high due to excessive searching."
+
+msgid "Menu items label"
+msgstr "Additional menu items"
+
+msgid "Menu items help"
+msgstr "By entering HTML hyperlinks into this textbox, any number of items can be added to the navigation menu at the top of all pages. The format for adding new links is X = &lt;a href=\"URL\"&gt;LINK&lt;/a&gt; where X is the position at which the link should be inserted (e.g. 0 to insert at the beginning and 2 to insert after \"User list\"). Separate entries with a linebreak."
+
+msgid "Feed subhead"
+msgstr "Syndication"
+
+msgid "Default feed label"
+msgstr "Default feed type"
+
+msgid "Default feed help"
+msgstr "Select the type of syndication feed to display. Note: Choosing none will not disable feeds, only hide them by default."
+
+msgid "None"
+msgstr "None"
+
+msgid "RSS"
+msgstr "RSS"
+
+msgid "Atom"
+msgstr "Atom"
+
+msgid "Feed TTL label"
+msgstr "Duration to cache feeds"
+
+msgid "Feed TTL help"
+msgstr "Feeds can be cached to lower the resource usage of feeds."
+
+msgid "No cache"
+msgstr "Don't cache"
+
+msgid "Minutes"
+msgstr "%d minutes"
+
+msgid "Reports subhead"
+msgstr "Reports"
+
+msgid "Reporting method label"
+msgstr "Reporting method"
+
+msgid "Internal"
+msgstr "Internal"
+
+msgid "By e-mail"
+msgstr "Email"
+
+msgid "Both"
+msgstr "Both"
+
+msgid "Reporting method help"
+msgstr "Select the method for handling topic/post reports. You can choose whether topic/post reports should be handled by the internal report system, emailed to the addresses on the mailing list (see below) or both."
+
+msgid "Mailing list label"
+msgstr "Mailing list"
+
+msgid "Mailing list help"
+msgstr "A comma separated list of subscribers. The people on this list are the recipients of reports."
+
+msgid "Avatars subhead"
+msgstr "Avatars"
+
+msgid "Use avatars label"
+msgstr "Use avatars"
+
+msgid "Use avatars help"
+msgstr "When enabled, users will be able to upload an avatar which will be displayed under their title."
+
+msgid "Upload directory label"
+msgstr "Upload directory"
+
+msgid "Upload directory help"
+msgstr "The upload directory for avatars (relative to the FluxBB root directory). PHP must have write permissions to this directory."
+
+msgid "Max width label"
+msgstr "Max width"
+
+msgid "Max width help"
+msgstr "The maximum allowed width of avatars in pixels (60 is recommended)."
+
+msgid "Max height label"
+msgstr "Max height"
+
+msgid "Max height help"
+msgstr "The maximum allowed height of avatars in pixels (60 is recommended)."
+
+msgid "Max size label"
+msgstr "Max size"
+
+msgid "Max size help"
+msgstr "The maximum allowed size of avatars in bytes (10240 is recommended)."
+
+msgid "E-mail subhead"
+msgstr "Email"
+
+msgid "Admin e-mail label"
+msgstr "Admin email"
+
+msgid "Admin e-mail help"
+msgstr "The email address of the board administrator."
+
+msgid "Webmaster e-mail label"
+msgstr "Webmaster email"
+
+msgid "Webmaster e-mail help"
+msgstr "This is the address that all emails sent by the board will be addressed from."
+
+msgid "Forum subscriptions label"
+msgstr "Forum subscriptions"
+
+msgid "Forum subscriptions help"
+msgstr "Enable users to subscribe to forums (receive email when someone creates a new topic)."
+
+msgid "Topic subscriptions label"
+msgstr "Topic subscriptions"
+
+msgid "Topic subscriptions help"
+msgstr "Enable users to subscribe to topics (receive email when someone replies)."
+
+msgid "SMTP address label"
+msgstr "SMTP server address"
+
+msgid "SMTP address help"
+msgstr "The address of an external SMTP server to send emails with. You can specify a custom port number if the SMTP server doesn't run on the default port 25 (example: mail.myhost.com:3580). Leave blank to use the local mail program."
+
+msgid "SMTP username label"
+msgstr "SMTP username"
+
+msgid "SMTP username help"
+msgstr "Username for SMTP server. Only enter a username if it is required by the SMTP server (most servers <strong>do not</strong> require authentication)."
+
+msgid "SMTP password label"
+msgstr "SMTP password"
+
+msgid "SMTP change password help"
+msgstr "Check this if you want to change or delete the currently stored password."
+
+msgid "SMTP password help"
+msgstr "Password for SMTP server. Only enter a password if it is required by the SMTP server (most servers <strong>do not</strong> require authentication). Please enter your password twice to confirm."
+
+msgid "SMTP SSL label"
+msgstr "Encrypt SMTP using SSL"
+
+msgid "SMTP SSL help"
+msgstr "Encrypts the connection to the SMTP server using SSL. Should only be used if your SMTP server requires it and your version of PHP supports SSL."
+
+msgid "Registration subhead"
+msgstr "Registration"
+
+msgid "Allow new label"
+msgstr "Allow new registrations"
+
+msgid "Allow new help"
+msgstr "Controls whether this board accepts new registrations. Disable only under special circumstances."
+
+msgid "Verify label"
+msgstr "Verify registrations"
+
+msgid "Verify help"
+msgstr "When enabled, users are emailed a random password when they register. They can then log in and change the password in their profile if they see fit. This feature also requires users to verify new email addresses if they choose to change from the one they registered with. This is an effective way of avoiding registration abuse and making sure that all users have \"correct\" email addresses in their profiles."
+
+msgid "Report new label"
+msgstr "Report new registrations"
+
+msgid "Report new help"
+msgstr "If enabled, FluxBB will notify users on the mailing list (see above) when a new user registers in the forums."
+
+msgid "Use rules label"
+msgstr "User forum rules"
+
+msgid "Use rules help"
+msgstr "When enabled, users must agree to a set of rules when registering (enter text below). The rules will always be available through a link in the navigation table at the top of every page."
+
+msgid "Rules label"
+msgstr "Enter your rules here"
+
+msgid "Rules help"
+msgstr "Here you can enter any rules or other information that the user must review and accept when registering. If you enabled rules above you have to enter something here, otherwise it will be disabled. This text will not be parsed like regular posts and thus may contain HTML."
+
+msgid "E-mail default label"
+msgstr "Default email setting"
+
+msgid "E-mail default help"
+msgstr "Choose the default privacy setting for new user registrations."
+
+msgid "Display e-mail label"
+msgstr "Display email address to other users."
+
+msgid "Hide allow form label"
+msgstr "Hide email address but allow form e-mail."
+
+msgid "Hide both label"
+msgstr "Hide email address and disallow form email."
+
+msgid "Announcement subhead"
+msgstr "Announcements"
+
+msgid "Display announcement label"
+msgstr "Display announcement"
+
+msgid "Display announcement help"
+msgstr "Enable this to display the below message in the board."
+
+msgid "Announcement message label"
+msgstr "Announcement message"
+
+msgid "Announcement message help"
+msgstr "This text will not be parsed like regular posts and thus may contain HTML."
+
+msgid "Maintenance subhead"
+msgstr "Maintenance"
+
+msgid "Maintenance mode label"
+msgstr "Maintenance mode"
+
+msgid "Maintenance mode help"
+msgstr "When enabled, the board will only be available to administrators. This should be used if the board needs to be taken down temporarily for maintenance. <strong>WARNING! Do not log out when the board is in maintenance mode.</strong> You will not be able to login again."
+
+msgid "Maintenance message label"
+msgstr "Maintenance message"
+
+msgid "Maintenance message help"
+msgstr "The message that will be displayed to users when the board is in maintenance mode. If left blank, a default message will be used. This text will not be parsed like regular posts and thus may contain HTML."
diff --git a/app/lang/English/admin/parser.mo b/app/lang/English/admin/parser.mo
new file mode 100644
index 0000000000000000000000000000000000000000..b18ade305d28766faae4f1f67744c3d60cc02cf4
GIT binary patch
literal 5557
zcmbVPO^h5z6>cCTumJ*wgzyu19uquk&$PX^S<E;K_O5pwBkxbV>)^<;CpA4aGnMVG
zo>X=3?gSBWK#*LxpeTYvltX|M91w6ooKO%44j>VU8wv-+g%g&@35oAjRnN@YSs!R^
z@7J$>UcLW%^S49yy%OO$jrX&7fBBv$x&*xPKK#QoxG#zx0xIA~fFs~XfiD3c1pYA0
z|2W{UfHN5XeW3pgydU)2Kwke(;0J-Xfgc9`7x*FIgYS=`4*(wp^7vsO?>hnHee*!(
zy9i`?R>SyBAj_kGEZ+-2-v2U?`MwJL81M}s^Z7N9*Z(ez{{_hF{{iInx5GFe&f|vy
z67T`gF_72I1DW3vkk4HQ^7>n0J`Feu_}zd%2>5!yp9TC)z&`|h3&{HZJ>b89toJ*>
z4fyB*2*dJRhtc@_XMwC&4m<+<Ht>_cH-NnEx4=WdH-THgzXExE1I~B|{1$+ZfL_I+
zd`=hm31AWMW#C(&Ujy<!3*~PBzXN<2_%=|1&wqf-=UEto`R)QA1^qn;c@_9Num-#h
zWWPLu!#)nI1D^su0R)Ta`#_feM?hZp3*dF&n?U?Uk3k5i5H*3!e;)W#oVN~q4D>tL
z^f}<eP@4Ij0nP)@1HTB|1)c=H24s8v3CKBc8_4n<g;2+UUkCEK68Ht+Pk_Atk3jrI
z|Hi+c<J|jUEI@>CcIy#F?qMFh?>JtTvw;^Px*RwPjPdfrx;~Eg(@fy`yayL+oR=&U
zpUcl@JnZ{F2kKLJA-;<T)~R|BGA@=*08isRjF)Z55Br!O_Sr06j$yW69d8pamjR9+
zw&k4<>(9O?yzHat=e;0K;bq&ipQ6RZrMxRG*|IZ`q8lycx~KYMa!u}%%~UE!q%zT$
z(S|Tq8ggr|$}BIY_HJUKnxd0bCEIP4^=&ly#MX2eb!D%;HwsV<4U0iL6MK=;?O|?<
zb}BkDWy-34ATSN;1sPQzelJsC=fMv>UqUv2_~dhXDph*hMt;tH`$;3MEC}+6GA(T6
z$hIw$L|PkJu_GshvrD@N>jde%rM!Ss-=1+8DCAzHSr{pYX%5TVkuJm@*<zH+eT3g$
zh`ttCbrPszG#pdl2`M7x4fGpIEp~*04Kd-5fLFa5o@{r@qR4faY)fO>bJN7BY2x%W
zab}wM(ljwYO?-KpI6F;zr6TfPFWM2Q>UvL2KD`bbX=y~-T**ylTcn4Mv<s)sk^fw%
zYdX9@bF=4WHcbAUOp4~^Zu4nrtjcwZR-`Bf(kw2{Y^-lJmkdaZH!q4pwg_X*t8z#2
z(rW06utjsr2yIhQ<OYkb2;DCc_{}XTvMG-Agy?2UpYQo2I-NK-{jbifUS3_EoIe+z
zoIyerQiChp)gt!LiD4>~K1a!bbE#OkwzbkcJ6Xr4_oQhq>m=_g-EYy^jw;52v`Ffi
z>&;72OXFqS$Yoa*G#8(Z&tS%r&CR?tiCpq$w8$S)rF)ge`H&4_ql40X-Oo3uDicC?
zY15~9<kR2R1#+Hq=8dZPRk1DU^6DjW$?xLuqOwpv)Dla~O{6xbjF(E03<5VX*+ZP0
zROAFtQm;%?;{5MYZd6}sk;c(QpR1I?41%sdGaeYKJ(<$3>J|fc)Ih5KprBrENTaU7
z^`%I|w!Fj9W2x@SoNZvXD|1V-NM>XD#z1Nk#8rs~f(3VqAqyR27OnO)hcP0Hj4O-0
zphn)nq%0Ms(JZ!ZuqN866IOBsA*CT#<}Ap|Z6Z=Ehu%H-c2^Yx<@Q)fU6o1AQR@w8
zWPxyU{3@G}utR7=2oROW(JIOci>jq95Kt&?sI+l(Ax-mLoa@xGUz^Y<w^~46i9zgD
zS(!O?Sx#4ctHB_@Ga2Ocvn+E*!mr@&6lQ~i!w^|ygDDf2iV#IOPq1B`St{F2I67~$
zL6U(?w!u&Ip)K41gIJEb5=SA7j2z~s;CbgA6f<~P^$5me<L8hG*BY<%yeIL>^SO3b
za+;3AsM7L)FmeiVRR13V6;+AA=>ZQsb!~lXnZ~0&1}Q=5fU;03_}?#sD`CgWJ#T_Z
zgz>!v+t=3e8r3-@!zD(TV873X$P3&9PeJYqBw-}!95<g&Q5@PgVmMHU!*oQrD%=V-
zJ=%n+RcvoKDI3BNT-|7ZLT9Fv)*HOe=ea2LbG+0`+@jhyVTW(kkZ1>M^^CN&cU8cN
z4<R7`M0U-&#DdqId_fiRSw0&_S5Q<`ZxjrlsKS>nSF&6-Zy+Sm=j<AE5v>|kE4+%r
z7p0C!#+7NDdag!ri3xHI#17}&{&`(y9dOT(x+oa}A&{hH7d8)x><UX!7zMja?@Y(n
z?`zP|$VBq`&WJ>djvhJMa76=IuX+mOf)fNK74e>Ppdd-c>{5kdYjc?WhLdsO0^ekG
zWbWkL%{Y#4oN%Kz;SQ8|i)-+%NV3)aaj*NK>NdD$kC2}sJXg|kZ*lR?*tBuQ61Sp8
zq1eBh`>t;6ZkDPOb@iqi366KgBHEC+_%xym_XLUVbEPd%Fn!(kEf;n2z3DPquQFwB
z{^aAdut2BI?43G8F7YkQz&9Gs<?xQKxo*vst-#F1ceJ#Aahdk@aGNsaB8=?dmX7Q|
zB0*iP@0mRF*_$eqGI%H{je(3X6lWMB7e3r{4dIixvr@jd5HGI8#^DmDEtK>%w1g3V
za5oq&Ygdo9ASYibc7T$Yl;~o^gv~Rbq&&+pwk=1tFgeFVwYEiVnGJEt@h#hK&@o=1
z`^Oq|UTLJRL|N*}^9?u%d49_#Mh%NwOm<%M#ET7TcA-0}ann`Y<IqWRaX#)$7}H$>
zx)Rz!pztQDADeaie6;hxky&J%#r4ct?m7mX?hAgnQ8+y~&-{gwp;^au)1W#Mk-H-|
zrAh9Ai%Ul>Q4YJMVS>{G8Py!3A7h%e$6g+0mrt7#ahs}4!5Ll_l;|C&8dqLyP&n@S
zQsH*ti1S?&TiW7EL{X3cKEY+xINP}dbZ}%GZSkenD|Nzc8E5oV6F&|^7ef0xdgNGK
zMdk|Rts*w8>fv_)@`tYZ_<*Qcz60g*>bG4lPrK5LPq<?nbDX+G@41ZQkk|56f-cGB
z#z7kvagnex{JZ9$HSX+OBQfBeLb;mm#hWS!cgVZOP1C*EVo8B8&y6r61mC^1UlN*?
z*){OGPhZ##1!wypk+11(o$n&pxCc2L+`?XGp)4C`lI`HbDT~_nF70FF+RjO2hp0ve
z>aG;-9XPbmt5&TihpdZnsS{aM{=2(0zBUZvH1vZ$Zdp3~>JkV96rpi58q*SYUcNiO
zo0Y4vxMjLIt*viWH!yczRnJxDFhl)z`Q%%{9VK_AIf|q}L+1K(fAtF;ej4~Dds3p&
zi{N(_1S@bmP>mZ}w+#)p@uctVs}8~Cs5@}d68JU*!l0p!slJAbo!Ny>a?(asE^#`*
lo*PeYz`#bi(pp0R=DY3Er0rfll)A?5T)A*%b2*-k{s-{mb5#HU

literal 0
HcmV?d00001

diff --git a/app/lang/English/admin/parser.php b/app/lang/English/admin/parser.php
new file mode 100644
index 00000000..e15237e9
--- /dev/null
+++ b/app/lang/English/admin/parser.php
@@ -0,0 +1,93 @@
+<?php
+// Language definitions used by parser admin panel
+$lang_admin_parser = array(
+    'Parser head'            =>    'Parser Options, BBCodes and Smilies',
+    'reset_success'            =>    'Parser Options, BBCodes and Smilies successfully reset to FluxBB default settings.',
+    'save_success'            =>    'Parser changes successfully saved.',
+    'upload success'        =>    'Smiley file upload successful.',
+    'upload_button'            =>    'Upload Smiley Image',
+    'reset defaults'            =>    'Restore default settings',
+
+/* *********************************************************************** */
+    'Remotes subhead'        =>    'Remote image validation',
+    'unavailable'            =>    'This function is unavailable.',
+
+/* *********************************************************************** */
+    'Config subhead'        =>    'Parser options',
+
+    'syntax style'            =>    'CODE syntax style',
+    'syntax style help'        =>    'Select a style sheet file from this list of currently installed SyntaxHighlighter files.',
+
+    'textile'                =>    'Enable Textile shortcuts',
+    'textile help'            =>    'Enable some textile tag keystroke shortcuts: _emphasized_, *strong*, @inline code@, super^script^, sub~script~, -deleted- and +inserted+ text. Textile shortcuts for bulleted (*) and numbered (#) lists are also supported. When posting a new message, (or editing an existing one), during the pre-parsing phase, the textile shortcut delimiters are converted to their equivalent BBCode tags before being stored in the database.',
+
+    'quote_imgs'            =>    'Display IMG in QUOTE ',
+    'quote_imgs help'        =>    'Display images contained within QUOTE tags. If this option is set to "No" (the default setting), then images within a quote are not displayed graphically but are instead displayed as a simple text hyperlink to the image (with the link text set to: "{IMG}"). If this option is set to "Yes", then images within quotes are displayed normally (as a graphic object).',
+
+    'quote_links'            =>    'Linkify QUOTE citation',
+    'quote_links help'        =>    'Make the "Poster wrote:" citation text a link back to the original post for quotes having original post number metadata included in the tag attribute (the post number, preceded by a: \'#\', is specified at the end of the attribute like so: "[quote=Admin #101]...[/quote]").',
+
+    'click_imgs'            =>    'Make IMG clickable',
+    'click_imgs help'        =>    'Display images and also make each image a clickable link to the full sized original.',
+
+    'max_xy'                =>    'Maximum media XY',
+    'max_xy help'            =>    'Maximum pixel width and height allowable for new visual media objects (images, videos etc).',
+
+    'smiley_size'            =>    'Smiley display size',
+    'smiley_size help'        =>    'Percent size adjustment for smiley box dimensions (default 160% == 24x24 pixels).',
+
+/* *********************************************************************** */
+    'valid_imgs'            =>    'Validate remote IMG',
+    'valid_imgs help'        =>    'When posting a message having IMG tags, validate the existence of the remote image files by requesting their file header information. Check each remote image filesize and do NOT display if too big (to save the forum viewer\'s bandwidth). If any image has a dimension greater than "Max width" or "Max height", then limit the displayed image to fit. (Note that this option is disabled if the PHP variable "allow_url_fopen" is FALSE.)',
+
+    'max_size'                =>    'Maximum IMG filesize',
+    'max_size help'            =>    'Maximum remote image filesize to be allowed on forum pages. When creating a new post, the remote image file size is checked against this value and reported as an error if it is too big and image validation is on.',
+
+    'def_xy'                =>    'Default media XY',
+    'def_xy help'            =>    'Default pixel width and height for new visual media objects (images, videos etc). When a post has an IMG tag and the "Validate remote IMG" option is turned on, then the remote file information is scaled to fit within these dimensions and retain the original aspect ratio.',
+
+/* *********************************************************************** */
+    'Smilies subhead'        =>    'Smilies',
+    'smiley_text_label'        =>    'Smiley text',
+    'smiley_file_label'        =>    'Smiley image file',
+    'smiley_upload'            =>    'Upload new smiley image',
+    'New smiley image'        =>    'New smiley image',
+    'upload_err_1'            =>    'Smiley upload failed. Unable to move to smiley folder.',
+    'upload_err_2'            =>    'Smiley upload failed. File is too big.',
+    'upload_err_3'            =>    'Smiley upload failed. File type is not an image.',
+    'upload_err_4'            =>    'Smiley upload failed. Bad filename.',
+    'upload_err_5'            =>    'Smiley upload failed. File only partially uploaded.',
+    'upload_err_6'            =>    'Smiley upload failed. No filename.',
+    'upload_err_7'            =>    'Smiley upload failed. No temporary folder.',
+    'upload_err_8'            =>    'Smiley upload failed. Cannot write file to disk.',
+    'upload_err_9'            =>    'Smiley upload failed. Unknown error!',
+    'upload_off'            =>    'Uploading files is currently disabled.',
+    'upload_button'            =>    'Upload File',
+
+/* *********************************************************************** */
+    'BBCodes subhead'        =>    'BBCodes',
+    'tagname_label'            =>    'BBCode Tag Name',
+    'tagtype_label'            =>    'Tag type',
+    'in_post_label'            =>    'Allow in posts?',
+    'in_sig_label'            =>    'Allow in signatures?',
+    'depth_max'                =>    'Max tag nesting depth.',
+    'tag_summary'        =>    array(
+        'unknown'        =>    'Unrecognized tag - (need to update language file).',
+        'code'            =>    'Computer Code. [attrib=language].',
+        'quote'            =>    'Block Quotation. [attrib == citation].',
+        'list'            =>    'Ordered or Unordered list. (*=bulleted | a=alpha | 1=numeric).',
+        '*'                =>    'List Item.',
+        'h'                =>    'Header 5. [attrib=TITLE].',
+        'img'            =>    'Inline Image. [attrib=ALT=TITLE].',
+        'url'            =>    'Hypertext Link. [attrib=URL].',
+        'b'                =>    'Strong Emphasis. (Bold).',
+        'i'                =>    'Emphasis. (Italic).',
+        's'                =>    'Strike-through Text.',
+        'u'                =>    'Underlined Text.',
+        'color'            =>    'Color. attrib=[#FFF | #FFFFFF | red].',
+        'tt'            =>    'Teletype Text.',
+        'center'        =>    'Centered Block.',
+        'err'            =>    'Error codes generated by parser for invalid BBCode. [attrib=TITLE].',
+        'dbug'            =>    'Debug messages generated by parser. [attrib=TITLE].',
+    ),
+);
diff --git a/app/lang/English/admin/parser.po b/app/lang/English/admin/parser.po
new file mode 100644
index 00000000..b21ec9f5
--- /dev/null
+++ b/app/lang/English/admin/parser.po
@@ -0,0 +1,168 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Parser head"
+msgstr "Parser Options, BBCodes and Smilies"
+
+msgid "reset_success"
+msgstr "Parser Options, BBCodes and Smilies successfully reset to FluxBB default settings."
+
+msgid "save_success"
+msgstr "Parser changes successfully saved."
+
+msgid "upload success"
+msgstr "Smiley file upload successful."
+
+msgid "upload_button"
+msgstr "Upload File"
+
+msgid "reset defaults"
+msgstr "Restore default settings"
+
+msgid "Remotes subhead"
+msgstr "Remote image validation"
+
+msgid "unavailable"
+msgstr "This function is unavailable."
+
+msgid "Config subhead"
+msgstr "Parser options"
+
+msgid "syntax style"
+msgstr "CODE syntax style"
+
+msgid "syntax style help"
+msgstr "Select a style sheet file from this list of currently installed SyntaxHighlighter files."
+
+msgid "textile"
+msgstr "Enable Textile shortcuts"
+
+msgid "textile help"
+msgstr "Enable some textile tag keystroke shortcuts: _emphasized_, *strong*, @inline code@, super^script^, sub~script~, -deleted- and +inserted+ text. Textile shortcuts for bulleted (*) and numbered (#) lists are also supported. When posting a new message, (or editing an existing one), during the pre-parsing phase, the textile shortcut delimiters are converted to their equivalent BBCode tags before being stored in the database."
+
+msgid "quote_imgs"
+msgstr "Display IMG in QUOTE "
+
+msgid "quote_imgs help"
+msgstr "Display images contained within QUOTE tags. If this option is set to \"No\" (the default setting), then images within a quote are not displayed graphically but are instead displayed as a simple text hyperlink to the image (with the link text set to: \"{IMG}\"). If this option is set to \"Yes\", then images within quotes are displayed normally (as a graphic object)."
+
+msgid "quote_links"
+msgstr "Linkify QUOTE citation"
+
+msgid "quote_links help"
+msgstr "Make the \"Poster wrote:\" citation text a link back to the original post for quotes having original post number metadata included in the tag attribute (the post number, preceded by a: '#', is specified at the end of the attribute like so: \"[quote=Admin #101]...[/quote]\")."
+
+msgid "click_imgs"
+msgstr "Make IMG clickable"
+
+msgid "click_imgs help"
+msgstr "Display images and also make each image a clickable link to the full sized original."
+
+msgid "max_xy"
+msgstr "Maximum media XY"
+
+msgid "max_xy help"
+msgstr "Maximum pixel width and height allowable for new visual media objects (images, videos etc)."
+
+msgid "smiley_size"
+msgstr "Smiley display size"
+
+msgid "smiley_size help"
+msgstr "Percent size adjustment for smiley box dimensions (default 160% == 24x24 pixels)."
+
+msgid "valid_imgs"
+msgstr "Validate remote IMG"
+
+msgid "valid_imgs help"
+msgstr "When posting a message having IMG tags, validate the existence of the remote image files by requesting their file header information. Check each remote image filesize and do NOT display if too big (to save the forum viewer's bandwidth). If any image has a dimension greater than \"Max width\" or \"Max height\", then limit the displayed image to fit. (Note that this option is disabled if the PHP variable \"allow_url_fopen\" is FALSE.)"
+
+msgid "max_size"
+msgstr "Maximum IMG filesize"
+
+msgid "max_size help"
+msgstr "Maximum remote image filesize to be allowed on forum pages. When creating a new post, the remote image file size is checked against this value and reported as an error if it is too big and image validation is on."
+
+msgid "def_xy"
+msgstr "Default media XY"
+
+msgid "def_xy help"
+msgstr "Default pixel width and height for new visual media objects (images, videos etc). When a post has an IMG tag and the \"Validate remote IMG\" option is turned on, then the remote file information is scaled to fit within these dimensions and retain the original aspect ratio."
+
+msgid "Smilies subhead"
+msgstr "Smilies"
+
+msgid "smiley_text_label"
+msgstr "Smiley text"
+
+msgid "smiley_file_label"
+msgstr "Smiley image file"
+
+msgid "smiley_upload"
+msgstr "Upload new smiley image"
+
+msgid "New smiley image"
+msgstr "New smiley image"
+
+msgid "upload_err_1"
+msgstr "Smiley upload failed. Unable to move to smiley folder."
+
+msgid "upload_err_2"
+msgstr "Smiley upload failed. File is too big."
+
+msgid "upload_err_3"
+msgstr "Smiley upload failed. File type is not an image."
+
+msgid "upload_err_4"
+msgstr "Smiley upload failed. Bad filename."
+
+msgid "upload_err_5"
+msgstr "Smiley upload failed. File only partially uploaded."
+
+msgid "upload_err_6"
+msgstr "Smiley upload failed. No filename."
+
+msgid "upload_err_7"
+msgstr "Smiley upload failed. No temporary folder."
+
+msgid "upload_err_8"
+msgstr "Smiley upload failed. Cannot write file to disk."
+
+msgid "upload_err_9"
+msgstr "Smiley upload failed. Unknown error!"
+
+msgid "upload_off"
+msgstr "Uploading files is currently disabled."
+
+msgid "BBCodes subhead"
+msgstr "BBCodes"
+
+msgid "tagname_label"
+msgstr "BBCode Tag Name"
+
+msgid "tagtype_label"
+msgstr "Tag type"
+
+msgid "in_post_label"
+msgstr "Allow in posts?"
+
+msgid "in_sig_label"
+msgstr "Allow in signatures?"
+
+msgid "depth_max"
+msgstr "Max tag nesting depth."
+
+msgid "tag_summary"
+msgstr ""
diff --git a/app/lang/English/admin/permissions.mo b/app/lang/English/admin/permissions.mo
new file mode 100644
index 0000000000000000000000000000000000000000..b90e01493cdced77a818ba14c09c24312dcc9be4
GIT binary patch
literal 2836
zcmb7_&u<(x6vqveAKjJ$Ek8>E7kWrgXVO&s2%DyYqzy`yh*gpzqzEMMj(65*#-5Hn
zO>^OZg!lsxLWm38kl=v0a6*CuS0u!_NF2CwtB?=}zHjWE{gED;(M~?`^Yin2&+mEu
zIDY6;hUZzlr|=%Vi?LboKaid;?`G^V@GJ0f@CWcX_$zn<{4>no3iC(qVeAOx&x1$7
z7<?F91Rnv{L0bPFNb9eGWd9?O?0*3s1HT6!0)GZc?>F#K@UJlbH;j)R^7dW;N$(Yq
z_PYX-y&aJ3lpwAD5G1|N!uT7I{P_v&Am-n}a~Pkw&)c~Qp2xTklHTVa&3_x_Z-Qqq
z{u{)Pow%Q|)8I*v;<^C-18#zp-zyIwCNKq`17{C2_9D0j;>R5Rtb!kaPk_IG7r~q0
zli;ZqW3PcPgEVhI%J;`0#rFw_t=QKf<^MbIRq#iU;=Tpq#|~o=9WmT!9y%X-$WMxe
zo_p~=gO_qi=Ryzd^B~@*@RBWxlj?`;laFw<_6?|WhNEg8@(rcJp2m9;FP#<nPY?M!
zd~gi)xv@90jQ2!gc`mILspJEh75k-`=*ny)wkow#nzd+Jt?Irndv01YNWJp%@`_2q
zw&DMYiP2VJc5I_%p|wo7jB=qezssb^Te?&gnd%8ACp7m-z4BU4S#Tot_C~|$>5*e2
zoiX1w#0`!i&!kS>z#E&Ad5euuX&I6_De`I^S?0=GWi%;?gpt7Vsz?x6!b_Q`61ip_
zW1Z3|w^g@R+mxxYt`rU{$As4^s88f$Q%=bIu3IYA!c`?a8yf6nRVlJ))nNNJ*F`<F
zOXnB4|95Fd^V3Uwes;0dDGi-}w3b9~%aVL=^HnL_K$gqPt<GE9(MpLS<k2NW(dLjv
zoASCM)uCuzSQl-VLfcF@Q$lH7=(NHqMcY#3V;1=Zk>pCh-uGK{yRj+Li>-~djmx9`
z=i_s&6{DThu)0@ZQzvh@xgrxvFY?|%lvcW>tJ|y5!bp#H@5?f}ta~OwcH4ZRt6bwq
zn@in#CwfzAiA0l+9fR|5d_G=?U&4$ZMq8#Tdve9^(dK>=>MFC#Mbm-K@E#n5KiueS
zkJ?i?k)e{DLl)yv8-|{3ETG=}Y4JO^(X1I+3H^Bh8-7Kw5c(AE7pO(cXHb_W&!tXe
zG8;2LJ)vtklq)Ms>X=Y(L&bV-Bo6CH*;15cUEWx^tI%bpq!ZNCzy=xZhWnwu9z>F$
zjO|=vFw`+$>m#Fm$A#kxUM8|Hs?2eme%(Jad(zIH<!+!X7rnZBb`>tmuH=FaOeSY}
zx59Fbu`C^z^)5pli~1rbQ0tr~s3kKrBA>wm+3%w*)OE>s#U3|(Z0<+^og6->B9kF7
z-?tWN^Hp-Yh@@py(51;N-yKNmt~!}$*@3CDWX$FL86$7T(*uW*5TQ+D2H~MelRZ8V
zw$54;{y{@meVj?sT*gSOk6R|g@J5ppP9Z`cK4mkM*N)25cX#IKZ+%-2%PnTjb$myQ
zrpk`bAao>uykZ-JRHkF4xLu#^4V70p*Hzv{-f@<6g`i-lKE+f~qY}{0zPDqBTfSb}
zSPb6^c6+-hA>6_THc6}MZ$<ccjQ>CUdc?!81{?ocVBo(9X(g$TQO&k03fxHhiUwup
SyB#GQPp<Rj#kQKpX8!{#k0yoy

literal 0
HcmV?d00001

diff --git a/app/lang/English/admin/permissions.po b/app/lang/English/admin/permissions.po
new file mode 100644
index 00000000..0539ea39
--- /dev/null
+++ b/app/lang/English/admin/permissions.po
@@ -0,0 +1,102 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Perms updated redirect"
+msgstr "Permissions updated."
+
+msgid "Permissions head"
+msgstr "Permissions"
+
+msgid "Posting subhead"
+msgstr "Posting"
+
+msgid "BBCode label"
+msgstr "BBCode"
+
+msgid "BBCode help"
+msgstr "Allow BBCode in posts (recommended)."
+
+msgid "Image tag label"
+msgstr "Image tag"
+
+msgid "Image tag help"
+msgstr "Allow the BBCode [img][/img] tag in posts."
+
+msgid "All caps message label"
+msgstr "All caps message"
+
+msgid "All caps message help"
+msgstr "Allow a message to contain only capital letters."
+
+msgid "All caps subject label"
+msgstr "All caps subject"
+
+msgid "All caps subject help"
+msgstr "Allow a subject to contain only capital letters."
+
+msgid "Require e-mail label"
+msgstr "Require guest email"
+
+msgid "Require e-mail help"
+msgstr "Require guests to supply an email address when posting."
+
+msgid "Signatures subhead"
+msgstr "Signatures"
+
+msgid "BBCode sigs label"
+msgstr "BBCodes in signatures"
+
+msgid "BBCode sigs help"
+msgstr "Allow BBCodes in user signatures."
+
+msgid "Image tag sigs label"
+msgstr "Image tag in signatures"
+
+msgid "Image tag sigs help"
+msgstr "Allow the BBCode [img][/img] tag in user signatures (not recommended)."
+
+msgid "All caps sigs label"
+msgstr "All caps signature"
+
+msgid "All caps sigs help"
+msgstr "Allow a signature to contain only capital letters."
+
+msgid "Max sig length label"
+msgstr "Maximum signature length"
+
+msgid "Max sig length help"
+msgstr "The maximum number of characters a user signature may contain."
+
+msgid "Max sig lines label"
+msgstr "Maximum signature lines"
+
+msgid "Max sig lines help"
+msgstr "The maximum number of lines a user signature may contain."
+
+msgid "Registration subhead"
+msgstr "Registration"
+
+msgid "Banned e-mail label"
+msgstr "Allow banned email addresses"
+
+msgid "Banned e-mail help"
+msgstr "Allow users to register with or change to a banned email address/domain. If left at its default setting (yes), this action will be allowed, but an alert email will be sent to the mailing list (an effective way of detecting multiple registrations)."
+
+msgid "Duplicate e-mail label"
+msgstr "Allow duplicate email addresses"
+
+msgid "Duplicate e-mail help"
+msgstr "Controls whether users should be allowed to register with an email address that another user already has. If allowed, an alert email will be sent to the mailing list if a duplicate is detected."
diff --git a/app/lang/English/admin/plugin_example.mo b/app/lang/English/admin/plugin_example.mo
new file mode 100644
index 0000000000000000000000000000000000000000..e0a606bdc922c117379a06cbd1f0c098bc8199bb
GIT binary patch
literal 1137
zcmZva%We}f6ow6yTY%D5thh+00mMbjKq?j`B^AA-rBVwKO%W`enKOxDVn?>8Y2E-H
zpj)1ZCt$%Vuw@6oGwDSLOGlqCXMFxS{(sI*9SV#qh}#H{m_>X?gfVkQh&gZ;yaC<=
zuYoTn+?;R^40j~pMbLmV;1IkDegQ9mhhPiw4RIaoUuT7w2LFI7;Pg2mzJe|A4)_Cn
z4E_dhf_JBcxC}0X;ojHaEpQLSm7;<O1L<QOVU8nlK1?uz#_)X@K@ZA`3t@3Ing_B!
z$eA)@`{b3+SsZN*@}jHs@#Y|xT6$$P)sS+sS`b@$P<Tp=_N=|w<}T}$JRf-R#+2Oc
znc;Xwox*#gMH{E&4LKZ$kES3eRVrF}VPzg|K#QxBh5#&GV_}KPY2%@$`3BV<Emd09
zeB#7MTWR#3t%IyOZLst`wyUd^*4uWpX0gP6v@Si@3475y-d7>@Xlq+KAGNL2E|=a|
zByCIGEo7IYHp~908|kG?`%1sc$`YMUY;1SAva_|*JgHxcpH<e%E=29o07XL+o}yJs
zFHzEy*0FEwwKt;0le|zpV;ePfVp65Mbz1Bwe=MX<tScX)P1bBnjV;5e@>Gi#<L5Xj
zm(i{%Y{F}0jXIS@#EK?9^}zo;t!Vd@3#|>$oEmoefd@(Ik?%nY6^^qakLfk*gbBSR
zE&EK>i9@P!dBe~Yc}g87NnK-7asxAdTrcy_*vplNtw?qZTrz^rNy(Vj*(Fxt!(mT)
z!cPSeD4$aB3)Zm5<Z4JsV_IeESjE|s;3HBxxE7DR&p`<k23Mg14W%9{NR>nPN3m$a
zn-*FIit#5VD^tgnP^Nn9&+7cxjj2jQFJR~J)ubKs;yCU9{-x@DSB+^i7>}GUvMd&V
E0VRz$fB*mh

literal 0
HcmV?d00001

diff --git a/app/lang/English/admin/plugin_example.po b/app/lang/English/admin/plugin_example.po
new file mode 100644
index 00000000..491eca80
--- /dev/null
+++ b/app/lang/English/admin/plugin_example.po
@@ -0,0 +1,45 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "No text"
+msgstr "You didn't enter anything!"
+
+msgid "Example plugin title"
+msgstr "Example plugin"
+
+msgid "You said"
+msgstr "You said \"%s\". Great stuff."
+
+msgid "Explanation 1"
+msgstr "This plugin doesn't do anything useful. Hence the name \"Example\"."
+
+msgid "Explanation 2"
+msgstr "This would be a good spot to talk a little about your plugin. Describe what it does and how it should be used. Be brief, but informative."
+
+msgid "Example form title"
+msgstr "An example form"
+
+msgid "Legend text"
+msgstr "Enter a piece of text and hit \"Show text\"!"
+
+msgid "Text to show"
+msgstr "Text to show"
+
+msgid "Show text button"
+msgstr "Show text"
+
+msgid "Input content"
+msgstr "The text you want to display."
diff --git a/app/lang/English/admin/reports.mo b/app/lang/English/admin/reports.mo
new file mode 100644
index 0000000000000000000000000000000000000000..3fcf39da696a0648275f2b7020ce364a802430ef
GIT binary patch
literal 1083
zcmY+CJ8u&~5XUc&5IDk9Q4ok?QG^7=U1CIGoiT#gF|rgJD;N~ft$h>w;Jkb6oq?p_
z3m`!O)cFSVbd+>7w4~w#(9rXrd-$=^+|Tn~@67S##V;1l1;};CXUG-E$^t$(LvR@k
zz!mUS&UfGm=<mUc;0N$Lcm!Sozk;0i9Xtj8$o)UTHR#9SS@0it5?nwr&R+sMu&sie
zPjGVI5x5E-f*k)5AI|>-UImZ9Yv4EVH24eTzP~|^`vY>{zaaNnUd-yQf&72hL9|U{
zmq0!UO%KQOu_1gHu6qW;_v3ftcR+f2&gEqAJtn74AtmHnImI|8W9`T|5v5HrB<Wl2
zhgO^32t$!JNu1lXP*a=L*5Xh`5&1=w)zPTXtXsPzW32#A7V)^3mdw>jjvpB6CwUaA
z^bV}&GGgJHMOG&q8yPwcZAP&tRFtZ5^-e`(KdZNtxKS0Q+ZDTG^b1sUn!fXlOdM$C
zi3Z7JNM>ux?mX@~H3JoPr!Eun1Z>VOy$(3EF!3umT_aT-%0wFk?MO8k%K<rElB1c5
z;-2(JfqJl?wdnO+Z3g%4R<pG|?O$>??V45zDO5d(&@`d9$wm~)KvhJ4C{0XB^=Y@^
zl&5jreV>f8t@_#z)W8$vUXV;K;t5jrp7V$lne2`oO@4skxn=h*Jele|(PPu6TGqo8
zS(9Ss1+&>>>>-aI?=u}|dt+`1tS%msgoLQMO>pNuvo+joC)RJq^GksNr>1m4M$){5
ZLB?r&cXlH<ss(r9OqFRY+*lh9`VXT)2pj+a

literal 0
HcmV?d00001

diff --git a/app/lang/English/admin/reports.po b/app/lang/English/admin/reports.po
new file mode 100644
index 00000000..a37bac7b
--- /dev/null
+++ b/app/lang/English/admin/reports.po
@@ -0,0 +1,57 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Report zapped redirect"
+msgstr "Report marked as read."
+
+msgid "New reports head"
+msgstr "New reports"
+
+msgid "Deleted user"
+msgstr "Deleted user"
+
+msgid "Deleted"
+msgstr "Deleted"
+
+msgid "Post ID"
+msgstr "Post #%s"
+
+msgid "Report subhead"
+msgstr "Reported %s"
+
+msgid "Reported by"
+msgstr "Reported by %s"
+
+msgid "Reason"
+msgstr "Reason"
+
+msgid "Zap"
+msgstr "Mark as read"
+
+msgid "No new reports"
+msgstr "There are no new reports."
+
+msgid "Last 10 head"
+msgstr "10 last read reports"
+
+msgid "NA"
+msgstr "N/A"
+
+msgid "Zapped subhead"
+msgstr "Marked as read %s by %s"
+
+msgid "No zapped reports"
+msgstr "There are no read reports."
diff --git a/app/lang/English/admin/users.mo b/app/lang/English/admin/users.mo
new file mode 100644
index 0000000000000000000000000000000000000000..4ca0d53146c0d6a3443f8069beba1e47755dceed
GIT binary patch
literal 7114
zcmbW5Ym6L65yu;nkYET86UYn5B#^{Tyz4kG?6Vzm_MOeyKKtT3$2NJ+?#|u~o}F1{
zW_><D2rEDoMF=E9@_~mGMJVEt2qF|gJ`e;X5_~`rL<kTGNFap7BZv<Oz65^%?w;9Q
z`;Y>otNl;cbXQeZS65fxi)+vPoZ;y}Z-=&>Va$Et?XTg7=VRv>^IGsE_$Kgva1Hnc
z&wmtr1MP2u3^m^aUkCmWd_DLasBtfVZwCJgN}hi7eGT{)@O<#C;ME|1W|AM7uoqOn
zgC6e!r7r<x$A`i5z)ynG^LbEuz7D<-{4U6!`H64;0#v_0f|BzuQ2ozAnB-jKaU*yk
z?I}=p-3iK$(zj27Z=?N?$H&3*X+Hx>?h7EI&7b}Ee}Md%b8*gE@B&c%t_Ef21Smaw
zK>6ct@B**|ahdrPD18rtviC7i{hkJ8*Uv!7`7J29e*>lG-=O-frIYwqfNI|WO3n-@
zy|;P%ASgNaf_8qO=JmM8XF-jB5tP6F?)hh*>-d*|8h0JYpV`9?UCa^Bk3fz8h;M%e
zl%0=)((@FkdH>Y&{{+gumqF<}k4Y#l)`RlrHK6R>3ev^w1(~ur3QBJTYQ1xh_jr83
z<Cj6%^CZZh`7uAz_e+m2f%<+HN+kb6Q1Y(?=U&A;LD}<hl*pd@Jw6C({T~Le1HT4p
zfBXhq0)GecXZEoO2f#Z($$bpexbJ|n{|BJPKL=h8o{6($-&LUW-V9y~?grKWL*Q4z
zdqLTAEym04?O+P-1*PXH5Yx@GpzQiNC^^3ZHSS!TEjum%wVs!O?*g}g3*a5#rQj1F
zrkUqK+4Bbw)#fiCqO7sP^Dr8gSqCbfw}TqD3zYmLzMX;mnUnlH1U>}Hj*WCG!7X3{
zJ`SD$FD7Ut?*Z^h@Qa}IFAzjq!9`Ghc?3KQ{06B0PlA&BG^qLh2$Vmb_wC<<>h}_;
zJn&CY`Ee}`YY(XP+X8AHdqBy#9h4sy!Lz~C^N)kle-gYHyw|rM0SPhl6;N`&4a)BC
zgYN-f1~u-+i=6yzpw@3UsCmtUvh!|G>l}m9zYNNrkAjkWpa1?@Q1TuIHU3dh^Y|91
z{?CAt{~Y)U@YkT$qlMAZa{`o}lc4PWG^q9c5~%q;0m_e0fou=^+{W)l=mto0(lZHZ
z{3Vd$?k-4A6KdHvV>W{<vzdkzYkJ-fX??drb5QlXlNZf%KlEPDe7DC1@MdTybQHQC
z(z6@d2i>j)&sJy?v>n<49fI`S0m(-P)ZkeM-3Z;P#>ms=eHM~G<ck?-^pW4ShhFWO
z>p{ho)}eYDyl5TtTnFh~-T>iFyMJy0cR*T$Yap$)9>T-~df_<&h0qnyozSTdTg0x>
z9+0rEpLzeLb>0O{K@-qb&^w^ZAi`nnIg{3vp0gLc3DSPJ8&Vuy4IP9ILuWwmgY;Yu
zDXz@qfqg*|wxYyLc6xCdq*)nNj3fyb^K8&B%w*Ay(oUQ%njK*$n3)TDQBj185zSO2
z)>4%8t9K_+AAHB**NQRhGAN?FFgusRbTM)Y&CV?C#(6L3L`j4_aoWvJ<t5P~CYh;_
z?^gAc?Q0wa{j4a9s^K*FFUw(`Y9>=rJ*nwNFN~8Q>~wPG<)=S=q95l`(5V%SGMx3h
z;?#P>4>U77Z}EfiM<vY~H_~=PVH8oAx0f(J?3iJ*7_=NGJsu`;$LX)!Ju}M8qp--*
z!i+J?xEEDUufNz;thsx_Rx8TAq5Hz3w9X2`Zn+A#6?HSb;EcANkH<w^p5EKB$Gd0k
zu#B_RkDi_1U%k2L2_m_8C8(x6n;nk=w^qZ~`s@B^*+qw2?qSo}wm%D6#9OE+F6y~@
zZZGSM@qApJ-nkc+?Ipvgo@_b&yS0v$OQLoeb?C^B8T6t&ZjY!egX3_zF&z%%9h}-)
z2_hR}!?rWJ{+v|HFxrEav0feWTvXSi@@O$GShZ0_vM>#Mk(tvD2oeQ!$=>p=cif)V
zbcA~_3X?#ie6NGG;IV}sVUI2J!KfG{C>x1#8^aYpY}+tcg;%)nuR9KN&{${Zz45+X
zZ9Y4ZBu<Z+O2pzID$2SwCdE1#|8&L$rI`%xW&_emB?X@K^(kz}8xvYAWy`+rm>t@P
zg&RJuu8hk>DT`fSX{*+3oO?Vb;<3z%owp%p90XyKnE7}y4a-5jIp+th9vjnT6|-Qq
zxF|c6x`4IA4y9Fa`mJ_|fbkp4cNb$cIoTebVN>xaquRXUjYN=|g?40$y9rQIX}dIz
z>v!KNT)X3H-r=Z4nyKRPXt<PRRRkx4JWLw9vb<MJ1Zm$ki|yBL4czPYb!l+v_F&Wc
zt!w7;>;tH6%yb&JVh*WjBG?s$<x-UI*s*5rz(QjuNmQ}f&^a;@z-t_gwCRQ{CB4Q%
z9;QVSmRU}xeVkMSPQS)N6!u0W2HR}HxVh_8v|7z9U%Y9}?9A-+Q2(apHETHD$|yzZ
zN*|?VbfVnYPr^9e8nl<fyok!}hZc4<HV^wrdpF7((`h@?F+34$ZpCG7$V3pOYmPK_
zM`@Hh8|N}yUIv?*o1543#WfrA*&uI6oV3z05jZ8b1elo}IseV%YA64~QbaE9_Y?Bk
z=uVFd6%9c<%eBPG3NfFPMoEuNTOLd%g-gx2ePkS)BkPibqAExRHeyOrZ+I*sWL#=v
zvOyT6?1Zr0W{Z|?%Xi{#H*S-3q)k$KR@s<*Gg;+irMfa$j+s`A6Fn~Q_6oB=*=YtW
zFGZ=iD=zoC4q2GH*;Ep3p<^u`FI?sl4&?}ExcbHFUC9Q)a){-q^P!J?dfD+!Gt=v5
zc}a%}W=(nJQ>*Q&={q&+R(Kk{UZX?$TAJwfCW>OcFL0_lCrnp-DhkPsW!8_|O8&L3
zU@7EO>xG@DSq*W*54)P^(qPIKQ5~l<K*~nk>#|;(z05k}z?=-r0n%v(Gu=S5YqL9<
zk3Nsh(T|iuoq;2kY_NW<1qWG5;Am~U{$7|4NOCIy>lU){RhlTH%I;y=Hd?ir1wzRd
zYt;&35&5SG$k2mCZVkdgnGu?C+ltO3rJPQ%&IRm5F!b>HX0R`kuUbi%9@C^;XME@E
zYMPO1(5zAiT60FuLqzxts(_`?#u?T<vN>!KGz3CjH0sqS@@Y~<uDBkPV2<K;Qi#re
zmI;BbTC^3F^Fz~`;N~{sgQGl++1bX_l$O_;VZGKHP;SUaB{hSpkt~&*mCDxcKxa+!
zzbTfCjc$didel{&GgD3DDo$g|N3D54&ama?ILigT<GFHjykE_$I{Nz3%*O3JE3$4G
zOu8gtw`X<J&@^48S?yH?y}xPr162v;bgtIO%>w5yFU3^rV!6{4$J@<Q=M@`G&0rVn
zTSV<a9+xZH(5lfl1SDghC~-g$w<rOSY0tbKX)Nx;aN=M~i9JfF?rcJLRy0jr^tx<a
zeJ+CG=5$9cTQdzZTYMs~E{y8|8|=QdYtBWB6|t6}w<ohga%7kDh5#G!O4H0{RI@r@
zUWr0#Zr}O;Q#Pquur_#PhCWA(Pth^Qy@uPBo&MKZs`|IrfYn!0B15V!WjpdnwoD+L
zwv=P5M-IlP^r!CdD_LdE>RhPYPtF=2>ZZW*1|2d;#;#O!#JQ4ipYt~MSEit!XWf`;
zpCHM6Bvo;G%BIEgv{Bt!NE-uPu<fc>Oq-3{Su*IQ5;t<6nO4fJ?<2$QJF;ob{y|Uo
zOHOy2->GuzTgo9{B%a!5cuhI&%c3eY#ObzzD1T2G5$ZF^Pzza%tQU=@(@A>)F%I~5
zMt#jNZbCMJ+q;C@gN#QZ8#eBn-S$E;?=I`UVt3P}Z^tIt)yg7@6%HK*2}#vnE~-pA
zO!x}~1Pcz4F0|V?@amg~Juu0}vZxx0T>~neIs4Cz`TFKTwO?O0T;;!UzT|FD*n->M
z25<G3i2{D%uMw->Cd?}L2=hvB5LRDxa(S1@m(HvH)T`$o=nzwA+k?y=IP`UQ(}?O`
z+h%xZHiN@)(rHtPu`KTVM08Ja#&N}kyEs+^>#kaF{YkMH^=%0{ZO>0HrcF|&XE^lB
lAzO9&q&ap!q2SX;e*jRJ^Y1Bm{$gU>m1LIdb;O6<{0F^TYqJ0V

literal 0
HcmV?d00001

diff --git a/app/lang/English/admin/users.po b/app/lang/English/admin/users.po
new file mode 100644
index 00000000..41af5899
--- /dev/null
+++ b/app/lang/English/admin/users.po
@@ -0,0 +1,312 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Non numeric message"
+msgstr "You entered a non-numeric value into a numeric only column."
+
+msgid "Invalid date time message"
+msgstr "You entered an invalid date/time."
+
+msgid "Not verified"
+msgstr "Not verified"
+
+msgid "No users selected"
+msgstr "No users selected."
+
+msgid "No move admins message"
+msgstr "For security reasons, you are not allowed to move multiple administrators to another group. If you want to move these administrators, you can do so on their respective user profiles."
+
+msgid "No delete admins message"
+msgstr "Administrators cannot be deleted. In order to delete administrators, you must first move them to a different user group."
+
+msgid "No ban admins message"
+msgstr "Administrators cannot be banned. In order to ban administrators, you must first move them to a different user group."
+
+msgid "No ban mods message"
+msgstr "Moderators cannot be banned. In order to ban moderators, you must first move them to a different user group."
+
+msgid "Move users"
+msgstr "Change user group"
+
+msgid "Move users subhead"
+msgstr "Select new user group"
+
+msgid "New group label"
+msgstr "New group"
+
+msgid "New group help"
+msgstr "Select the group to which the selected users will be moved. For security reasons, it is not possible to move multiple users to the administrator group."
+
+msgid "Invalid group message"
+msgstr "Invalid group ID."
+
+msgid "Users move redirect"
+msgstr "User group changed."
+
+msgid "Delete users"
+msgstr "Delete users"
+
+msgid "Confirm delete legend"
+msgstr "Important: read before deleting users"
+
+msgid "Confirm delete info"
+msgstr "Please confirm that you want to delete these users."
+
+msgid "Delete posts"
+msgstr "Delete any posts and topics these users have made."
+
+msgid "Delete warning"
+msgstr "Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by these users, the posts can only be deleted manually at a later time."
+
+msgid "Users delete redirect"
+msgstr "Users deleted."
+
+msgid "Ban users"
+msgstr "Ban users"
+
+msgid "Message expiry subhead"
+msgstr "Ban message and expiry"
+
+msgid "Ban message label"
+msgstr "Ban message"
+
+msgid "Ban message help"
+msgstr "A message that will be displayed to the banned users when they visit the board."
+
+msgid "Expire date label"
+msgstr "Expire date"
+
+msgid "Expire date help"
+msgstr "The date when these bans should be automatically removed (format: yyyy-mm-dd). Leave blank to remove manually."
+
+msgid "Ban IP label"
+msgstr "Ban IP addresses"
+
+msgid "Ban IP help"
+msgstr "Also ban the IP addresses of the banned users to make registering a new account more difficult for them."
+
+msgid "Invalid date message"
+msgstr "You entered an invalid expire date."
+
+msgid "Invalid date reasons"
+msgstr "The format should be YYYY-MM-DD and the date must be at least one day in the future."
+
+msgid "Users banned redirect"
+msgstr "Users banned."
+
+msgid "User search head"
+msgstr "User search"
+
+msgid "User search subhead"
+msgstr "Enter search criteria"
+
+msgid "User search info"
+msgstr "Search for users in the database. You can enter one or more terms to search for. Wildcards in the form of asterisks (*) are accepted."
+
+msgid "Username label"
+msgstr "Username"
+
+msgid "E-mail address label"
+msgstr "Email address"
+
+msgid "Title label"
+msgstr "Title"
+
+msgid "Real name label"
+msgstr "Real name"
+
+msgid "Website label"
+msgstr "Website"
+
+msgid "Jabber label"
+msgstr "Jabber"
+
+msgid "ICQ label"
+msgstr "ICQ"
+
+msgid "MSN label"
+msgstr "Microsoft Account"
+
+msgid "AOL label"
+msgstr "AOL IM"
+
+msgid "Yahoo label"
+msgstr "Yahoo Messenger"
+
+msgid "Location label"
+msgstr "Location"
+
+msgid "Signature label"
+msgstr "Signature"
+
+msgid "Admin note label"
+msgstr "Admin note"
+
+msgid "Posts more than label"
+msgstr "Number of posts greater than"
+
+msgid "Posts less than label"
+msgstr "Number of posts less than"
+
+msgid "Last post after label"
+msgstr "Last post is after"
+
+msgid "Date help"
+msgstr "(yyyy-mm-dd hh:mm:ss)"
+
+msgid "Last post before label"
+msgstr "Last post is before"
+
+msgid "Last visit after label"
+msgstr "Last visit is after"
+
+msgid "Last visit before label"
+msgstr "Last visit is before"
+
+msgid "Registered after label"
+msgstr "Registered after"
+
+msgid "Registered before label"
+msgstr "Registered before"
+
+msgid "Order by label"
+msgstr "Order by"
+
+msgid "Order by username"
+msgstr "Username"
+
+msgid "Order by e-mail"
+msgstr "Email"
+
+msgid "Order by posts"
+msgstr "Number of posts"
+
+msgid "Order by last post"
+msgstr "Last post"
+
+msgid "Order by last visit"
+msgstr "Last visit"
+
+msgid "Order by registered"
+msgstr "Registered"
+
+msgid "Ascending"
+msgstr "Ascending"
+
+msgid "Descending"
+msgstr "Descending"
+
+msgid "User group label"
+msgstr "User group"
+
+msgid "All groups"
+msgstr "All groups"
+
+msgid "Unverified users"
+msgstr "Unverified users"
+
+msgid "Submit search"
+msgstr "Submit search"
+
+msgid "IP search head"
+msgstr "IP search"
+
+msgid "IP search subhead"
+msgstr "Enter IP to search for"
+
+msgid "IP address label"
+msgstr "IP address"
+
+msgid "IP address help"
+msgstr "The IP address to search for in the post database."
+
+msgid "Find IP address"
+msgstr "Find IP address"
+
+msgid "Results head"
+msgstr "Search Results"
+
+msgid "Results username head"
+msgstr "Username"
+
+msgid "Results e-mail head"
+msgstr "Email"
+
+msgid "Results title head"
+msgstr "Title/Status"
+
+msgid "Results posts head"
+msgstr "Posts"
+
+msgid "Results admin note head"
+msgstr "Admin note"
+
+msgid "Results actions head"
+msgstr "Actions"
+
+msgid "Results IP address head"
+msgstr "IP address"
+
+msgid "Results last used head"
+msgstr "Last used"
+
+msgid "Results times found head"
+msgstr "Times found"
+
+msgid "Results action head"
+msgstr "Action"
+
+msgid "Results find more link"
+msgstr "Find more users for this ip"
+
+msgid "Results no posts found"
+msgstr "There are currently no posts by that user in the forum."
+
+msgid "Select"
+msgstr "Select"
+
+msgid "Select all"
+msgstr "Select all"
+
+msgid "Unselect all"
+msgstr "Unselect all"
+
+msgid "Ban"
+msgstr "Ban"
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "Change group"
+msgstr "Change group"
+
+msgid "Bad IP message"
+msgstr "The supplied IP address is not correctly formatted."
+
+msgid "Results view IP link"
+msgstr "View IP stats"
+
+msgid "Results show posts link"
+msgstr "Show posts"
+
+msgid "Results guest"
+msgstr "Guest"
+
+msgid "Results no IP found"
+msgstr "The supplied IP address could not be found in the database."
+
+msgid "No match"
+msgstr "No match"
diff --git a/app/lang/English/antispam.mo b/app/lang/English/antispam.mo
new file mode 100644
index 0000000000000000000000000000000000000000..2d884422712f3935e89b7acbab004e1cdb67f9c4
GIT binary patch
literal 751
zcmYk4!EVz)5QYsDAsGn}7cLxzN=R^6mmm(2n*?auK&4bfB_KF(SjUrO!QM5qYf9b#
z?r`JABk%w`1~;CC-*MBj^5@yvotfX>*}pfpzDF3B!ELY)u7CnG;|qwvS8xq{1J}V%
za25OllM7Mw8+HtCT#TXt>^s;L_6O`O*gvoci!K37*LpDPvDLhfUFHHAJ9nqkk2U*X
zoIP~|Jeq4$Y<v?6jwVGdx=<r0rBBILYuEQ5?ovDL-?Mb5Po4X_@kHEvo&|N7tJf?Z
zl~WqA4ojB3y?F9ss)hm=>uO&IP6=!3m_L~&bh9+pKB%c^>kA#6AZV=ZqSgymQ`Y5w
z6{)B5(%2{SRwBz1CyPORba-@duHQ)>#6xETTU1?D5Dok}>{Nv|c9&*LEuKUF)pVq~
z=W&htoJAejnahn`q}0t!IQx*4*v4<vGqx=4H%=VqCQv8oCXcYwy6UB?WyZr+Bc)a(
z8ZLSE0Y%BoDJ+dAJi_Z<a8B8ZG+bR!g(Gy9w9Uz)ZyM7&xDp4KQzdR8x=hd=)}E2z
zD~G@n6PC#DWdmE68B1>`8&Gi2VcK*%ZMN_FW-EH@Y83V-EGTO5w<2g@vD)NpKd(y&
aJE8UE**+_hL{Eijh4kenLYnLKIQj?9tlQE6

literal 0
HcmV?d00001

diff --git a/app/lang/English/antispam.php b/app/lang/English/antispam.php
new file mode 100644
index 00000000..67a827fb
--- /dev/null
+++ b/app/lang/English/antispam.php
@@ -0,0 +1,23 @@
+<?php
+// Language definitions used in register.php and post.php
+// Based on work by Otomatic
+
+$lang_antispam = array(
+  'Robot title'      => 'Are you human or robot?',
+  'Robot question'   => 'Please respond with a <b>number</b> to the question: <b>%s</b>',
+  'Robot info'       => 'Checking if this is requested by a real person and not an automated program.',
+  'Robot test fail'  => 'You answered incorrectly to the "Human or Robot" question.',
+);
+
+$lang_antispam_questions = array(
+  'What is two plus two?'     => '4',
+  'What is four minus one?'   => '3',
+  'What is three plus two?'   => '5',
+  'What is two times four?'   => '8',
+  'What is five minus two?'   => '3',
+  'What is six plus three?'   => '9',
+  'What is seven minus one?'  => '6',
+  'What is eight times two?'  => '16',
+  'What is six times two?'    => '12',
+  'What is nine minus seven?' => '2'
+);
diff --git a/app/lang/English/antispam.po b/app/lang/English/antispam.po
new file mode 100644
index 00000000..75fa1d31
--- /dev/null
+++ b/app/lang/English/antispam.po
@@ -0,0 +1,27 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Robot title"
+msgstr "Are you human or robot?"
+
+msgid "Robot question"
+msgstr "Please respond with a <b>number</b> to the question: <b>%s</b>"
+
+msgid "Robot info"
+msgstr "Checking if this is requested by a real person and not an automated program."
+
+msgid "Robot test fail"
+msgstr "You answered incorrectly to the \"Human or Robot\" question."
diff --git a/app/lang/English/antispam_questions.mo b/app/lang/English/antispam_questions.mo
new file mode 100644
index 0000000000000000000000000000000000000000..f3ff0a71bb65c8f0a8a5a078d57338b2408dd0e7
GIT binary patch
literal 765
zcmZ{f&uUXa6vn5u{=06h;6LbM*1|+@ZOUy#3bsWGEd~iH?#ARKnUc(enUh!_!et+!
zZ{Z`jbnU88C?X<-BHj4i^rR_L=iV>B`+alf%*ppVb9)Nw7PJ5{G!K1+%5{52sR!UZ
zcprQud;va$e=qwi`DgGR@_q4Nz`O9@#2<kN@UycJc!(cF>PYxQ_*3{x_#4Elj>Vq{
z{|HZo*HANAH{_%IZ&#rVx-QvG@QQqwn1j$lskdFr+9ge{(`C)BPf7E~uzJ4Hb|cb#
z=ZF91VHhP3o~HHQ`AL1E5&7xP*j{!dxm`Wzl^1j)U1(M2mrOLSk^>hf#n}Hz&ziI`
z@v5rFutQBYn=SK(VsgRPbXI@WFl&)4!<u!=G|tRx8o9D!5^dSUrV*`AJ<B1YXv_M}
z(00f)$oAp4H@7#Yee=qbY%O>uk7J((=*qOqj|V;L{4?F`+L(x+yA(`OR98$sEiUh9
zQ#2dC8CuSFYP$H~`24z>CZD}CFUeCpo1`A7<yhyHqOz2!d|5rkv#6HUipm#NRV}GP
F{RM6Rwd?=@

literal 0
HcmV?d00001

diff --git a/app/lang/English/antispam_questions.po b/app/lang/English/antispam_questions.po
new file mode 100644
index 00000000..384893e1
--- /dev/null
+++ b/app/lang/English/antispam_questions.po
@@ -0,0 +1,43 @@
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+
+msgid "What is two plus two?"
+msgstr "4"
+
+msgid "What is four minus one?"
+msgstr "3"
+
+msgid "What is three plus two?"
+msgstr "5"
+
+msgid "What is two times four?"
+msgstr "8"
+
+msgid "What is five minus two?"
+msgstr "3"
+
+msgid "What is six plus three?"
+msgstr "9"
+
+msgid "What is seven minus one?"
+msgstr "6"
+
+msgid "What is eight times two?"
+msgstr "16"
+
+msgid "What is six times two?"
+msgstr "12"
+
+msgid "What is nine minus seven?"
+msgstr "2"
diff --git a/app/lang/English/bbeditor.mo b/app/lang/English/bbeditor.mo
new file mode 100644
index 0000000000000000000000000000000000000000..a176f079a551314464013f06d3593a9f9617a8a5
GIT binary patch
literal 1082
zcmYk4J!}&(6vq!*zQRWVAu+&U2BadmKr4poN)T#jQBW#ENf4`(dr3_%cJTQsDmE5i
zU_gQi76c;;3p0!i42Y=<3#_b&k^i$V1WUf3-+T6Z&;H-{qth=Uj3byQG2dby$2_+K
zAB@M~9`Fgc4}4bIFTuUA-<1A$U<LMvGXAOL=aOH`_%_JrewO?N9)SHD+z(Fe44eVE
z-U+aU*lBPY_U2R+?FJu!Y(E5dfsac6Q;_?8UdCU6Gq7KShrstB*ZT<axi2NZfn0AJ
zJO=&%=fOW9pF4|UXv3f3w}RW};TR9@g$KXEVZWMu_`ZBM?gQ8Gb%5v~CilwsiMmcN
znJi`2NjtKBWl{>vjCVAg%v6tE*Nfb#{uVEr)OVgrZv^JvZmFIttWR*WFwQU5)L`8Q
zJ31wsDNWJHn&HSbhH@}ohuy*7v02p03M;dC#n@q<2tD#<UYlPOVOg8i;#5t{oms53
zthq})7dO)QHrZSmoro2ZZk_DXQl)jH9oH>P_~Wb6Q6k`r*JxAm*0HN8a~HR*)OjYI
zvDnm<dQhOjxJ`2SUq*3BrbDH#^h1emw`%O*a%Hu#x;&{rSG`cF8@#DT)~ykWI=b)9
zk20zBqUfzlo0F?`+AHzGWFJ@WlZ}^k&!kEZ60y)#?q4H`AYHi=Un5O6^w=_#DktWu
z3)PE=1T(&63frT4sF8?JB=Sm^GS^w-x?zD!b;r_rT^l+l>qKX*DVnTrM;i;}D1`}`
z%WzOH=oTcN=)25+lYj!k@8VPmBqf;>E-{W3D5K?&#6A91QZZ|+z@AMK-Aw9@Gf6bb
H<1_pPbWa9S

literal 0
HcmV?d00001

diff --git a/app/lang/English/bbeditor.po b/app/lang/English/bbeditor.po
new file mode 100644
index 00000000..3deedec3
--- /dev/null
+++ b/app/lang/English/bbeditor.po
@@ -0,0 +1,63 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "btnBold"
+msgstr "Bold"
+
+msgid "btnItalic"
+msgstr "Italic"
+
+msgid "btnUnderline"
+msgstr "Underline"
+
+msgid "btnColor"
+msgstr "Color"
+
+msgid "btnLeft"
+msgstr "Left"
+
+msgid "btnRight"
+msgstr "Right"
+
+msgid "btnJustify"
+msgstr "Justify"
+
+msgid "btnCenter"
+msgstr "Center"
+
+msgid "btnLink"
+msgstr "Insert URL Link"
+
+msgid "btnPicture"
+msgstr "Insert Image"
+
+msgid "btnList"
+msgstr "Unordered List"
+
+msgid "btnQuote"
+msgstr "Quote"
+
+msgid "btnCode"
+msgstr "Code"
+
+msgid "promptImage"
+msgstr "Enter the Image URL:"
+
+msgid "promptUrl"
+msgstr "Enter the URL:"
+
+msgid "promptQuote"
+msgstr "Please enter the username quoted (or leave blank):"
diff --git a/app/lang/English/common.mo b/app/lang/English/common.mo
new file mode 100644
index 0000000000000000000000000000000000000000..fc08237e6da5b22b1f2d17b687732e820380b425
GIT binary patch
literal 9404
zcmcJUdypK*UB}yz@~{ZDF;46}-I8_DU7}lA@&j>}?CA8eY&|Y_Cp)%dl-b?hyODNh
z)-$uZJKMx@9!L-ygTW36Cq)G#!0?9+1;HdmVg)J`sS1>1C|3niR2dAFa!4s8#l!r;
z=iAe>w=2omq>8Qk&1br&AHV+1ue*Oe_pOUpK4SQtK;DVGw9=Swz%QQ9h2NWg)ENHE
z`CMKPFAeE;!4;(62j2`gz)Rs4cp;n(Y{EB?F5p|?J@Cij!|)yOB>XXW3ab8d;rUBY
z<;?{pFNJR*Sqt0&FCl$9RJ|0c{4sbj{4A6nPlfa|Q2jgySHTxU{%QDj(km&f@m~&A
zZwnXow-;)Bb@(GN4ZH`UqB$1$NZ@ZkjrS?2dVdV*!u&Z@{pSMz0m_~)1%3~{j`V-P
zH^P@g{)&rAeb0x|=Mt!T?}fZ7b0w4>*Fe?V4)yA8h8pKVC_O$5Rj&i3UmkcjlwSA4
z%ix2MKXZ}`DwxkhmH#SKJ70(D=bKRDdLi(8;rV$OS^ZxC)&FHs{az9B#~?+`RZ#VJ
zK=nTZHJ(FI^_x)RN}&3?H>5uS)$YR~|1(haeiN#nC*YgllThWJhHB@}!t-ZC{_{}f
zUVv)<B`EuTAM$5b;Y3Qm6RO=!P<n2L(r*WpzwL*zlY=VXgBsVTpvs*H>Bph!{{d9L
zUxL!_FQEGWM#%prRDb^nW%qAGl{*djGyly+?O(_wQu^IcdTfMh|3;|s&IZ;4yMZ4G
zd?4@yRR6yX)!&m)?R-Aue<kF94N9+Pp~m}sNdHUVze4HteW>@lg2^d6UIL}hd!X!b
zHPra8hy0n{A^$^A>q!f09vp_!s{=L89#s3sq5A)H$p0;<dVc~{?@yu1Jp)z$uc7pQ
z9!{NS%(tM%xdEf8+_g~p?SyJ)2FlNGg<4mdQ2pH-_yAP9k3pI;k3+3vPs6vtzky@$
zyYSucZ8WkGZiZLE!*DhHEW8qa8D0ZV!>w=~lW-k$Q0WKZ2>cq{08c~JTTN$5Ps7dd
zV^HmX0p0+=8}c`>xXJGGP|q`X19mtGw~&4j<u8X<u=u?TZihF)2>vAeJt%v<2xXV=
zz<KyzP=3;&lHPL)W#{_?k3r4L2chisaL7Lq`0G&f<zz^I5vu$tDEoaCs@`cR{r?l{
zeXYQ#(&J*N{w{~oZv?8`dMLfFg{WvIA*MBl0vDjlKLq7hk3#kHJ5cRE75HVSe*Oxo
z-M@pHhc80)dphL*JCxs?hY|JOUJo^{aj5ZZhmXM<q2AX&LA}4X*mB<Pf@=3pC_Ux_
zyHI*ALd}=^p!7KomH!Bo9*;r!@8_V(Jqgv$)9@Df415q?hSTkbC!y;70IK}UQ2MM~
zQ|faK#MEXll>H7v+2t72cpeSuUxTvq6Hx8^5!5)o1l9jvhV-*g{rx?Z-Y<mwZ$nIH
zegHK;F1e!g!(CAQwxIg^I8?pkfe!^f8u*#O#{+*CN}t~k=`TR(c?wFeuZR4<g<dbX
zg8Uak`kw>816BUtpyv6@P~*F3ZE5d!K>5WORDV}N*=<Y6za6e1-Gr}$^HBAV!1LhI
z@O&{mzc=LH7xM29`JaTmB6A$7{u5C4_(Q06egRoP?m|9<Smb^rMx@sgGLNtvnD-((
zk)z0AWC!xIh(mr6`7okiihLT;{J#y+Ph;5Y@5;+oFg}ph?XMv6CH?jwvb*NO4am<U
z`rTK;uNk^M9@59)&mfws*N41^VGX$lk*~0|_}?#c9YNlMtV385{n`f1c3t@4R%VyK
zGv)w{kPjfggvgF7k=4i)@&NJ(QvL4W=21lJ!=WlO@F(CbBA?ao-V$asum?9G^^nGG
z%+<(TNDDK_$B-s+5i*JFMjD8IEkwTARwDe~2X8{wBkxD9L$)EBD`)=3$T%PAAfE^i
z-xw&o0l69JB0q=dCm+{OK76geEB!p&nvYgD@Cd@T;eWr%burwpfcwJz#{&heJ10W=
z8hAJIX5_6QuY%U81YwCZKaE_7WXPRJj(ifi0NIR8AX-oLyB&E5DUh|ut;pMv8xj4c
zkz0^YDZ%d`@)6{N$QI<M5VNgO#7CVi(r(<y&9-JIPReVX7g<!Knc3EEn{7#w_L7F{
zxTG-KinL>+!FsmkT(it?rCF~tkoFCi>B-6MY15g>Ntb1IPjWPB$4z^1daq5Q&Y9Vb
zv`yE;MO`O~+cs)8GneP#Sv_jnc^5TZHk4BoT}!EMn&ef>D%o*GWSdbDRkiC4G_p}q
zWO2P$R7D#R!!2w#%?s&QwHybP8);I=4yATgZsPJHPUg<Y?MB&h(N3J_6gjKEP}QbK
zUDj%+3!#l9wXL}AY#!fTX_lmkjXTj?l}@wne3aNmJME7%WTjn~gm$`(tSX<oc58fC
z(_Z2hyRK2V=2?36lFT*IxrF|QA9nINTaV}ZswnN%%55{wqk0=}n8e<hYw@lfFVZLO
z>R}`96JA7~`%x_4+f9Q{>{UaltCdRBY8qut+e*`dR=2m~#t}Mc#^_m)#0sS+n;ov+
zo3n*fF+1fqW|th(>`wW!^{8>g?DpF1ku_~QPL7y8oo<>HQBv4A!Hqjn5vPgSlQi8T
z*H+4<^jYtS=B8e!OK)axgqz4$%Dba+9&?+{&0(}Su~DuBvx;llE6hHWL3bc8ikMV`
z_qHR4B;VU`Uz8oOQ5&bv8D`X^BpKxtE7Pu1S7WY|W=po`ZMrYmb{{P<gI!tP^pk!@
z_LEIpU#b$!xPACwFyVfOJDUA&!4EE9z6%p>AVc=@$;`=wD!W*i{i$uF>5<s!uIn=I
z{#caM(bz4(!nP|rnFBa%==nfbme0+UTtpY$=J`UJHO-WZj)Z|uVRLL8mM*0zmo7LQ
zLW7#h+|fAgk(Z^KM`o(W<VhOs9u_WL2BQt-;;h(UupHxXNiIM5K+jRyUu_ZNz~#Me
z&GgL7xfVoaH(lPyVm}~XY#<#*t5O52rjnSkz2u7zET7ZC&$Y-*yE)cpUQczy)R?AH
zj9Sy~t{xMDj9#1MjEl0yJV=_hbljQwbYWOs<Fk_ftM*B`^s;$<Ru6y8O9Kb1&#*Sw
zUJ@5}(k$Qaj0aP@hf+5WrS=V_riN0pN_ApCsF`lmV7N1dW_;<vGrjs@O?%j3#?8hB
z@7P~$?pSyI<~5r(qa`z|-L1UxO!mMqvuP2vEo%}p$G^pcXN~S)!kXUi@L=vTRthG%
z?);{8YZf!X!fIyQZVoG(+gRmXrhX$*cw*eqQZ#4UQ8IU^=^8AR?L*y^1t4Vk^-E6X
zOT<mKjJOpuUY{=J@nV|F4>2y2wpxagS$NBA5w6`dy{zrKSjboz%~ZRWMeT8xyiPu0
zldezZTQ^;2%iFD^iCw+bZXCOA6_Z0&9N*I%zlBW{B_`}H7Zvj^o19!VbzpXUJ1dRm
z<M<91lL<@S_%t(1MXM|=f#b6o&e4|DDYTcN_L#Zjvo7ikv}m_P3NhZ_D!ZuHYiTxj
z{i=O?_U&Bme`D>+Rolx=c6@fJOQ!|%a6`Avnt7dV%tu-7imeA{ca3jeE~nnvZN_&d
z?CH#r3A?!-7kx!0SX5ViaD2B*v?xl)sgwy-*p0Q#wX1njCdX&eUe<8i%RVM-*-40!
z1_L9#EgvoYf5k}?{q3d-ktXa&-p}*_((;Zy^lT_l@=tJWHWVg~-$uA}aFcS&w(|;>
zLJU=7pKaP3XJ@A<Q-)9B(S%(ylCLp?4G}c4MTAxqRoPZXWEdL9BYoG~s^H3Yq9wck
zz$}|WQt&3NLKK^3W%Od}Wh}-#$<1wP&qkTEio)3bSktx4mjRi!>OnL3SZuu=9m&V&
z+An>%&53B3K@Hy*v#DlAM>ejd!~#31`lZ2zxR^(a(UDC&SZ_(>mcM~M`?W$qSa+e)
zM5tA>1jp%uw{02eX%aH!My^_$_iNK=Kk}<o9Ehj-<)~__P_XH`#XRk7TFa`v*dV;l
zOH25^+A%Ah@1<EAcqL88y2I>p)jQ~ik2Q7$|H`#aG*ed&b3Wqr4NtT+K8#yaGY1AD
zOAU%4Z;*)x1``*hE%mrx!N1h9{5gvIK(#FIUs#A$)M}BYL<2;}c!cg7X{XzEi#0pd
zb`f!1K2K!f5?Sk<?-6YXZeQU&9y~{oE04w}*3|4M5lR0H(04fY<mxqJ<8wvARSWAY
zzbV7R!HSdpD7g$Y36ELEmb{lWdc?*_(O#<JJ%x+j4gCp&2&$Tlho*P#+Bv;*x@I*q
zv;p&meQ53Hg|E|99P1|_F*O@?k8LCKk$di!w3^-1qIGAxS;|__QAC!rc;)N~-oTyc
z2v+XVb}=6ncHN|`&f2q1qidw-+K{d+z0%XKeH%igX4##}T1#Q(`Y2du9raj7H+4oG
z9gXMMOq8FN73iR5_oehY5Og!TIpX}Peszps>38hL%tp&pY;hv>5w^P6)$T1$PU6~)
zp3bO#!zvdutqE+%H9Jc&Egn`nw$iYyFg9Ysa&&S%LUfig$GoZ*p}IeLl&1BT_QR<e
zwZ}82XP5n(=~?)}D$Yt<{;A*Us{KKYE4cT&PdWC`vh-=YR$0ANOd}6b#RR*#e?Mi&
zim8{-SnC|YUTMb4!o&SV{;2f|hbFdnEZ*|AXr|sB7j*LBwJb#Jit0tPk%(s$#mkbJ
zt!L?iqM-f~f}5o}C^cB7m-M0+bUtH5W9K-I4ZPu@Lz(4BcE+*HFGH_>BGWq<+U@*+
zZ~%V@@bA{o$=d&VTJ!tVE1%d#a{F2iZS)q-ZL7<3nhtJdm^^%bTXv%5{Ikz-D8=f;
z(XKox_m6Mh`>GRLbylmM{+~{BGP$3I_)na1h^-C)n%`bYuf6wlyv1+G91(`jcz%*}
zyTsIL%5NzBBOQxLqk;OZ9=@^Oa_Z2D(nc&MIu%m7+=l9oIDloPztor094E?@t>uE*
zrMcd+QI|tbL!03GVC~RaF6S$?UT}4e;I5p(!MVL=%V$t28+ql*Dq1{Wt-Q{xly<C&
z{vEKv`_W?>#SHynvlX8ED68<zpJtiT)p2%I=h^aAk8ya_iOXZ~B<t&)d6-=e#8}T|
zWe&v{w>sbAvwklq9J{DK0*vG}yThL|^re7Ld%TLA^ABD-5b+EI6R*8lCZQG+HKbQQ
zUw*a1hZ0AKg;HFI;DaLllQ+esuYWqEd%wgFrH#T=uK_+2UQGxg!x4U#6T2PF$4od2
z5DKD&CL7+y&fCn_EAGnu(NJrwTXYRR4sxJA_c5RGv$8XP*dbYZ`g6XJ(fvj+_*BPg
z?K%G8nP-2FIzQ~Of3!OHkG<l-e^;z++JEWwfo!F)SE**sdR(ms7zV#`T3a~)>vNai
z-iK@Ou$=$>?*_xq6>iHz^lbyH)(kE>sf#`q0DUC@`aA&iT>$8V02ufZFk!y(xl<oK
zb@J6e1=tOiGyWOJ|9s-CbH88xnNH!$22S^y4*lL3VUPB!Q(k_DIP3I(2gm<AeF)8e
qb=pN{_%OS^I>s|=B1}?#u_@2;<(%LFt4yb6?jU3j)&1dq!u$_5vOzQe

literal 0
HcmV?d00001

diff --git a/app/lang/English/common.po b/app/lang/English/common.po
new file mode 100644
index 00000000..8d5a40cd
--- /dev/null
+++ b/app/lang/English/common.po
@@ -0,0 +1,473 @@
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "lang_direction"
+msgstr "ltr"
+
+msgid "lang_identifier"
+msgstr "en"
+
+msgid "lang_decimal_point"
+msgstr "."
+
+msgid "lang_thousands_sep"
+msgstr ","
+
+msgid "Bad request"
+msgstr "Bad request. The link you followed is incorrect or outdated."
+
+msgid "No view"
+msgstr "You do not have permission to view these forums."
+
+msgid "No permission"
+msgstr "You do not have permission to access this page."
+
+msgid "Bad referrer"
+msgstr "Bad HTTP_REFERER. You were referred to this page from an unauthorized source. If the problem persists please make sure that 'Base URL' is correctly set in Admin/Options and that you are visiting the forum by navigating to that URL. More information regarding the referrer check can be found in the FluxBB documentation."
+
+msgid "No cookie"
+msgstr "You appear to have logged in successfully, however a cookie has not been set. Please check your settings and if applicable, enable cookies for this website."
+
+msgid "Pun include extension"
+msgstr "Unable to process user include %s from template %s. \"%s\" files are not allowed"
+
+msgid "Pun include directory"
+msgstr "Unable to process user include %s from template %s. Directory traversal is not allowed"
+
+msgid "Pun include error"
+msgstr "Unable to process user include %s from template %s. There is no such file in neither the template directory nor in the user include directory"
+
+msgid "Announcement"
+msgstr "Announcement"
+
+msgid "Options"
+msgstr "Options"
+
+msgid "Submit"
+msgstr "Submit"
+
+msgid "Ban message"
+msgstr "You are banned from this forum."
+
+msgid "Ban message 2"
+msgstr "The ban expires at the end of"
+
+msgid "Ban message 3"
+msgstr "The administrator or moderator that banned you left the following message:"
+
+msgid "Ban message 4"
+msgstr "Please direct any inquiries to the forum administrator at"
+
+msgid "Never"
+msgstr "Never"
+
+msgid "Today"
+msgstr "Today"
+
+msgid "Yesterday"
+msgstr "Yesterday"
+
+msgid "Info"
+msgstr "Info"
+
+msgid "Go back"
+msgstr "Go back"
+
+msgid "Maintenance"
+msgstr "Maintenance"
+
+msgid "Redirecting"
+msgstr "Redirecting"
+
+msgid "Click redirect"
+msgstr "Click here if you do not want to wait any longer (or if your browser does not automatically forward you)"
+
+msgid "on"
+msgstr "on"
+
+msgid "off"
+msgstr "off"
+
+msgid "Invalid email"
+msgstr "The email address you entered is invalid."
+
+msgid "Required"
+msgstr "(Required)"
+
+msgid "required field"
+msgstr "is a required field in this form."
+
+msgid "Last post"
+msgstr "Last post"
+
+msgid "by"
+msgstr "by"
+
+msgid "New posts"
+msgstr "New posts"
+
+msgid "New posts info"
+msgstr "Go to the first new post in this topic."
+
+msgid "Username"
+msgstr "Username"
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Email"
+msgstr "Email"
+
+msgid "Send email"
+msgstr "Send email"
+
+msgid "Moderated by"
+msgstr "Moderated by"
+
+msgid "Registered"
+msgstr "Registered"
+
+msgid "Subject"
+msgstr "Subject"
+
+msgid "Message"
+msgstr "Message"
+
+msgid "Topic"
+msgstr "Topic"
+
+msgid "Forum"
+msgstr "Forum"
+
+msgid "Posts"
+msgstr "Posts"
+
+msgid "Replies"
+msgstr "Replies"
+
+msgid "Pages"
+msgstr "Pages:"
+
+msgid "Page"
+msgstr "Page %s"
+
+msgid "BBCode"
+msgstr "BBCode:"
+
+msgid "url tag"
+msgstr "[url] tag:"
+
+msgid "img tag"
+msgstr "[img] tag:"
+
+msgid "Smilies"
+msgstr "Smilies:"
+
+msgid "and"
+msgstr "and"
+
+msgid "Image link"
+msgstr "image"
+
+msgid "wrote"
+msgstr "wrote:"
+
+msgid "Mailer"
+msgstr "%s Mailer"
+
+msgid "Important information"
+msgstr "Important information"
+
+msgid "Write message legend"
+msgstr "Write your message and submit"
+
+msgid "Previous"
+msgstr "Previous"
+
+msgid "Next"
+msgstr "Next"
+
+msgid "Spacer"
+msgstr "…"
+
+msgid "Title"
+msgstr "Title"
+
+msgid "Member"
+msgstr "Member"
+
+msgid "Moderator"
+msgstr "Moderator"
+
+msgid "Administrator"
+msgstr "Administrator"
+
+msgid "Banned"
+msgstr "Banned"
+
+msgid "Guest"
+msgstr "Guest"
+
+msgid "BBerr pcre"
+msgstr "(%s) Message is too long or too complex. Please shorten."
+
+msgid "BBerr unexpected attribute"
+msgstr "Unexpected attribute: \"%1$s\". (No attribute allowed for (%2$s)."
+
+msgid "BBerr unrecognized attribute"
+msgstr "Unrecognized attribute: \"%1$s\", is not valid for (%2$s)."
+
+msgid "BBerr bbcode attribute"
+msgstr "Attribute may NOT contain open or close bbcode tags"
+
+msgid "BBerr missing attribute"
+msgstr "(%1$s) is missing a required attribute."
+
+msgid "BBerr nesting overflow"
+msgstr "(%1$s) tag nesting depth: %2$d exceeds allowable limit: %3$d."
+
+msgid "BBerr self-nesting"
+msgstr "(%s) was opened within itself, this is not allowed."
+
+msgid "BBerr invalid nesting"
+msgstr "(%1$s) was opened within (%2$s), this is not allowed."
+
+msgid "BBerr invalid parent"
+msgstr "(%1$s) cannot be within: (%2$s). Allowable parent tags: %3$s."
+
+msgid "BBerr Invalid URL name"
+msgstr "Invalid URL name: %s"
+
+msgid "BBerr cannot post URLs"
+msgstr "You are not allowed to post links"
+
+msgid "BBerr Invalid email address"
+msgstr "Invalid email address: %s"
+
+msgid "BBerr Invalid color"
+msgstr "Invalid color attribute: %s"
+
+msgid "BBerr invalid content"
+msgstr "Invalid content, (%s) requires specific content."
+
+msgid "BBerr bad meta data"
+msgstr "Unable to retrieve image data from remote url: %s"
+
+msgid "BBerr no file size"
+msgstr "Unable to determine remote file size."
+
+msgid "BBerr non image"
+msgstr "Remote url does not have Content-Type: \"image\"."
+
+msgid "BBerr bad http response"
+msgstr "Bad HTTP response header: \"%s\""
+
+msgid "BBerr bad headers"
+msgstr "Unable to read remote image http headers."
+
+msgid "BBerr orphan close"
+msgstr "Orphan close tag: (/%s) is missing its open tag."
+
+msgid "BBerr orphan open"
+msgstr "Orphan open tag: (%s) is missing its close tag."
+
+msgid "BBmsg big image"
+msgstr "Big image"
+
+msgid "BBmsg images disabled"
+msgstr "Image display not currently enabled in this context"
+
+msgid "Index"
+msgstr "Index"
+
+msgid "User list"
+msgstr "User list"
+
+msgid "Rules"
+msgstr "Rules"
+
+msgid "Search"
+msgstr "Search"
+
+msgid "Register"
+msgstr "Register"
+
+msgid "Login"
+msgstr "Login"
+
+msgid "Not logged in"
+msgstr "You are not logged in."
+
+msgid "Profile"
+msgstr "Profile"
+
+msgid "Logout"
+msgstr "Logout"
+
+msgid "Logged in as"
+msgstr "Logged in as"
+
+msgid "Admin"
+msgstr "Administration"
+
+msgid "Last visit"
+msgstr "Last visit: %s"
+
+msgid "Topic searches"
+msgstr "Topics:"
+
+msgid "New posts header"
+msgstr "New"
+
+msgid "Active topics"
+msgstr "Active"
+
+msgid "Unanswered topics"
+msgstr "Unanswered"
+
+msgid "Posted topics"
+msgstr "Posted"
+
+msgid "Show new posts"
+msgstr "Find topics with new posts since your last visit."
+
+msgid "Show active topics"
+msgstr "Find topics with recent posts."
+
+msgid "Show unanswered topics"
+msgstr "Find topics with no replies."
+
+msgid "Show posted topics"
+msgstr "Find topics you have posted to."
+
+msgid "Mark all as read"
+msgstr "Mark all topics as read"
+
+msgid "Mark forum read"
+msgstr "Mark this forum as read"
+
+msgid "Title separator"
+msgstr " / "
+
+msgid "Board footer"
+msgstr "Board footer"
+
+msgid "Jump to"
+msgstr "Jump to"
+
+msgid "Go"
+msgstr " Go "
+
+msgid "Moderate topic"
+msgstr "Moderate topic"
+
+msgid "All"
+msgstr "All"
+
+msgid "Move topic"
+msgstr "Move topic"
+
+msgid "Open topic"
+msgstr "Open topic"
+
+msgid "Close topic"
+msgstr "Close topic"
+
+msgid "Unstick topic"
+msgstr "Unstick topic"
+
+msgid "Stick topic"
+msgstr "Stick topic"
+
+msgid "Moderate forum"
+msgstr "Moderate forum"
+
+msgid "Powered by"
+msgstr "Powered by %s"
+
+msgid "Debug table"
+msgstr "Debug information"
+
+msgid "Querytime"
+msgstr "Generated in %1$s seconds, %2$s queries executed"
+
+msgid "Memory usage"
+msgstr "Memory usage: %1$s"
+
+msgid "Peak usage"
+msgstr "(Peak: %1$s)"
+
+msgid "Query times"
+msgstr "Time (s)"
+
+msgid "Query"
+msgstr "Query"
+
+msgid "Total query time"
+msgstr "Total query time: %s"
+
+msgid "RSS description"
+msgstr "The most recent topics at %s."
+
+msgid "RSS description topic"
+msgstr "The most recent posts in %s."
+
+msgid "RSS reply"
+msgstr "Re: "
+
+msgid "RSS active topics feed"
+msgstr "RSS active topics feed"
+
+msgid "Atom active topics feed"
+msgstr "Atom active topics feed"
+
+msgid "RSS forum feed"
+msgstr "RSS forum feed"
+
+msgid "Atom forum feed"
+msgstr "Atom forum feed"
+
+msgid "RSS topic feed"
+msgstr "RSS topic feed"
+
+msgid "Atom topic feed"
+msgstr "Atom topic feed"
+
+msgid "New reports"
+msgstr "There are new reports"
+
+msgid "Maintenance mode enabled"
+msgstr "Maintenance mode is enabled!"
+
+msgid "Size unit B"
+msgstr "%s B"
+
+msgid "Size unit KiB"
+msgstr "%s KiB"
+
+msgid "Size unit MiB"
+msgstr "%s MiB"
+
+msgid "Size unit GiB"
+msgstr "%s GiB"
+
+msgid "Size unit TiB"
+msgstr "%s TiB"
+
+msgid "Size unit PiB"
+msgstr "%s PiB"
+
+msgid "Size unit EiB"
+msgstr "%s EiB"
diff --git a/app/lang/English/delete.mo b/app/lang/English/delete.mo
new file mode 100644
index 0000000000000000000000000000000000000000..6597bd8e9691f8fca8dfc14430312b9b6eff0bb9
GIT binary patch
literal 1003
zcmZuv&2AGh5H=A0f~ZPQ2yvJqAr*laf_exEL8xg{Rcb|4wos5bIGaggw6RxSry&o*
zYjES%XW<#(#*xq2O~Rj*Z@-!GWPUvJZKLv8;8cOTKnmOh&Vg{g16P0_zzyJM$(0L2
z+=9Fgz6QQm@<Z?j^lfm6vk$%sJ^^=u4?u|b<)RR$;IH5ickNQ)e+Rq{eG7aW{0zJX
zJ_f%BD{urp2P4${AcTM_E*I*&mmr3^LhcH19SC{FE~o6dB+_PJ7jkBEFS__ppHp(&
z*Nzh}jyX$b)SHReW;$63e>fF)Q{{{{L-DrcZaQ%)l^yHGd4o(gSM%1>CKY09%g|<v
zY7d&#uCpJJO&;{+8+N(2ra>K6e#CBPr`mlL%eI3GyWCZt8w8s?<})2!7p6m%dl@@r
z@>F^2;B=_WaH57RV^-teBGPl!A8Ye+P^9SfBI|}Psz(P$d#n7l=t;G0jc0?XvkXZ+
zfAWvBRB6+sWTafqzI76JWPRlqvJcqFJ(Jiz9-~3^p7zT^8pNi0D)-s2D{AaoytJoU
zRFAfCQ>gN_ow$VCMUDm)NfyJ4M@(T_G_w;LsWV0~HfKZLhS_1hq;o=XWG9|_oZ2Z3
zted;T#o^g_3Oj5F<ZQwy!3?ASZUUn9qvaOR{hTB|<u>GAIox9_{<<j2z#q$9*ra%b
zn()I&X`mgdpSPe<H7q_X*Q2>O9oe)r&{U@>3Z;zQSQ!igtGEpP4&5tspn9QAH1@9-
K0wQHd6p3HzG7?h&

literal 0
HcmV?d00001

diff --git a/app/lang/English/delete.po b/app/lang/English/delete.po
new file mode 100644
index 00000000..208f9bdc
--- /dev/null
+++ b/app/lang/English/delete.po
@@ -0,0 +1,42 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Delete post"
+msgstr "Delete post"
+
+msgid "Warning"
+msgstr "You are about to permanently delete this post."
+
+msgid "Topic warning"
+msgstr "Warning! This is the first post in the topic, the whole topic will be permanently deleted."
+
+msgid "Delete info"
+msgstr "The post you have chosen to delete is set out below for you to review before proceeding."
+
+msgid "Reply by"
+msgstr "Reply by %s - %s"
+
+msgid "Topic by"
+msgstr "Topic started by %s - %s"
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "Post del redirect"
+msgstr "Post deleted."
+
+msgid "Topic del redirect"
+msgstr "Topic deleted."
diff --git a/app/lang/English/forum.mo b/app/lang/English/forum.mo
new file mode 100644
index 0000000000000000000000000000000000000000..b0b3a1649e976c79f203ea4e3c0c3d235a87f124
GIT binary patch
literal 866
zcmZXR&u$Yj5XKD@3d`U20zw>Ii31=xG!=(vLjW}-C{iO<BrPEI;_OZmx4U*^dt34#
zyb;Gf0^(WtoK2fjMjHJ*<MGVwet$OCelply_%pbNZ@|ys!5&>>>=w8IhMFhfeegMW
z58MH7g73iy?0}&@0q=lc!SGIkp{@YKorA9<{&k(Phu|6b3j7Ujg6lV`K2O01h_}E{
zzYRVH8(`?0fT8aph?WdkSeU)GJcqq*FV6uOv9QoDSa=_H4*gg=H;yvaDQ14o$HtZg
z>pAYqkxQ)_;ihjgo*M0~$sK|dq!Qyi_hzP2Ht;Gvp0mMuJ=@n8Z`pyOQ^%6Lv@#c6
zV+$8^JzIpXwbSI)vGqdptroApY(|MSN0fTe%fta$r;Ltym!zMP-QA6n&qL9+2$2^b
zrKgx9C%({$3Z>_%J?Xp{TB%(wy|F0TlX_Ch35g-e;!;QcR%V6LAI8;)(WqwZ<XzP7
z^*gKi_1bpS#`lv(*ZB-XJ^k>nXSr0m$<wK{j(lr>*cFXcU6?*5D>^zgnbMP(H%7`|
zEE03l(KqplG}&s$#89R@uh$y2H@K-nF)*b~sa?&8c{OAyS<LW9%YrM%DTr5N-%ZJ-
qC7zbnV%vOvNk+)U{S>v8#1OTbd_~&0(pJ;yKl;Wifv+_BU+%xIH`nR_

literal 0
HcmV?d00001

diff --git a/app/lang/English/forum.po b/app/lang/English/forum.po
new file mode 100644
index 00000000..4a2b8880
--- /dev/null
+++ b/app/lang/English/forum.po
@@ -0,0 +1,45 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Post topic"
+msgstr "Post new topic"
+
+msgid "Views"
+msgstr "Views"
+
+msgid "Moved"
+msgstr "Moved:"
+
+msgid "Sticky"
+msgstr "Sticky:"
+
+msgid "Closed"
+msgstr "Closed:"
+
+msgid "Empty forum"
+msgstr "Forum is empty."
+
+msgid "Mod controls"
+msgstr "Moderator controls"
+
+msgid "Is subscribed"
+msgstr "You are currently subscribed to this forum"
+
+msgid "Unsubscribe"
+msgstr "Unsubscribe"
+
+msgid "Subscribe"
+msgstr "Subscribe to this forum"
diff --git a/app/lang/English/help.mo b/app/lang/English/help.mo
new file mode 100644
index 0000000000000000000000000000000000000000..0cc4462a25c7bd1f4e0b9612a952aefa7842a618
GIT binary patch
literal 4261
zcmb`JPmE+m9mk*RDl&=-2&kw~yP&%Z({I^XV>UgE;>^yn6J}s!XZaJNvAVmu`!VlT
zJ>Q?1Z4O@aL_C?OAzru{P9_8m#Dj^(#E=*->IsbpqX+e3;KV^czpCn<o@Ebi!b?|w
z>+i3Af4=pr`pfM{e~|E<qkNX~+6R*4QE>Bv{PB&CCdr4v47>#_BYqpanfCW0{t&#A
z_RAo@<ma*f7ZHC0evJO#gU7(PK$-uq*ni|hVcjwCqx9ba%6=-gQ}9;WU2p+>43zz!
zisRpmm`A({@=LzUpR9W^_WwAxe*%h}*FmxG*Kzz!Q1<;3_!01L;7#DaLDBym@Dtz>
z7Rma%K+)rPY(E&=UyAKVK(Y5R@Z;cfvHd(K@?QW&-gm&;z#oC)msdd1<Coy=;O{`$
z@2}uCG5ROSFL@Xt?}BUK&%m#sjOg=D#Q%aK?`9U`>f~PVr{Mjd$o&H-cKrhsJ>Ldp
z{!xM;{da@1?j-mIxCn|~e+T&`Z}TVqmB~*7w}IaPGw=@Zw-Nsw@joCgOm0Gmth)si
zIro6;-~-@sumr`v?}N+WOP~S&2#Vj9ai+xO0{AO%6BIul!w5`B?gPaSX>6a5?X}q6
z0?#u33@CAV5#*P=#GlB21w0MD3f=?01%4WQH{zWre=qGb;1%!*kg&`?IZtOOU!cgk
zPf<Qk5gqTNh;GyGp;!^W%Xb&$lN3ZI_fzB(pG?08sEBS$loJ%uS5ZDk5#KIS=0EYT
zd~&`|`C8Cjs)WOT!o3G${qBeYpP@(`Fgxi`#J49YM=0Wd@l8q*9}*fLb4eY-8R3`s
z*ng|5Yi?kY04lRXr_LT~EhVdYYgA*dHp!~X2M4u9)!Kon^30mp>qW_*7nJy#UwFaf
zrkT!KFUqm5vwGUTXmm3+)#|G1_4=~7F?Ew%GJ25NQP}R1$;)J;&?8d^(Hpil)lA|>
zqw}mErfz0-w^rH?ROaU=p+hXAS~p?6uZe0{dr)7RtDp1rI@y{iQ|K&LdN8O=T_=yD
zov5xyhw4G@*IL&^XZdQK1ehBQ7O17<$*BV_7g?T}I*AzOUT&&v*L0e3<=W9W*tWyg
zYUrxANPM+)ILg-=S7!ZCZSf2>OsktoZsw{%@Xk1^)fk7W5`QLFu8Cn;xk1}Un`uSq
zoOr1m-yQV%IQ87sgPwuu<M8~Nd52eh%X>$bg_^}#$#&jWI`3R`RZ(}9Eq$|ISz1=1
zx^l{@<16ay>E(s($~|xTO=n}!dCF9E=4@BZ*t4+x#7<|ef=u*xF6hQ|6@8s2&0Z!`
zr(K)6ZaO=awso!>S21Z*+fj=zIy*)ea}w3VdQfEckzpWcua~-N^yP)Ejji>A{m-Tk
zEvz})7>m?N$)-Z9Gi9zbyR7<SUDc*pxw3PybN*nS>^?MAXWimRSl(6Vds#D6q^pcw
zc&78Hv8D<-ZaXu`AZvO){URfw*}3f6s&Cf99$ghSiKlmVh&c?Z@A4eS;RWS}!k|Jo
zjXzzmST$qaC|wx^bs)AAt?dXJkB!Qm+m$u`tYnrx*yAafs%g@wRZq)Gq|1_87e<v;
zX8TzQA#}YMj$^I%Of^w;2HkbVK8xzo&ekS!Oz!p-as$g`JDulVmfqv&>0WN)X7Oa(
zx~W=kPc6HSS&rJMFN=ya`KrVX!g}w)cD)y@(LGLDGm**0da<rjgRGw0Ayv=1R`oTu
z7?j9{b7qD$7&==-y_J;WmCentQH8EXwD-pZ4|~-FX>v|6t{{CtGg<DV$xwwmMpid%
zWzri>v`@2zC=b;p63g1NfmoA5W!HM_TJm+FcZmrbpd)dXk?5!}l|+^*pD&^;BDtS6
zq#R-y^06M#gEM3uW;pBWQumoRg!n$VewgE|ddwIO;Tog8iE;=b)UYf~eBvR>wSylb
zI8EN4dtvB}+SlkpV51eN6>b1ODDj+HofX_F-e?T;yw+uDG=v?Ydn5WXaAM_zkIgi=
zt~55D7@;b{#QZQ<=XjwZVfR|HzuZ01_jrS2khcTz>68($q0XRmn%uxG_G~0&UlJV0
z(%*7e8yq}v{k9+jaT?@c9lo)+Guzs$j#)!8f!mLU)ZJu<(;h^|!zcWh_m*Vv;I3;_
zIHwxY9Xk$v&Y$08wkBD>s*94->wB`s6r`~0bS_=5^IZD>T){C3iOP7}#>;tTRpB7M
z9_(ow_&Uvesp7&>Ca8xSB(3q2$a_j`s41WPRh7njJlQx*ws4OLqn$O2^T%$=wlG8Z
zHeEY#_GEKdJe-*zK)6=ws>%8-88V2QkHt)uKcJF%>XK`B=#Rfvmc*OB_gN8D&UsF#
zQ~qHzRNN(48}r%eMQ^vy>OS^;XGvX>vUp4IGLab9;gKTj3J)t)nUV()tn)XnpX4))
z%rp~n%IvCOYTu1)_5z~B!v`dsN)@$`my=celp>^{uv0gA{~kk!c9*;~f7yjRAXJ%N
zd65}6^jxyx#ndyzk$Y^SxWKqdNC9#R(t{_H+{@%@-b0KK9JyP&^TW0+dZxPG!d{C&
z$+7Pd88~u{%*T0XbrnR=lDH}%3VRc|%!Y`_J4KVUt6DuLIppiJtZB$!j=V37u_{RC
Jj@u=n{|{6llYIaH

literal 0
HcmV?d00001

diff --git a/app/lang/English/help.po b/app/lang/English/help.po
new file mode 100644
index 00000000..2d7c7c52
--- /dev/null
+++ b/app/lang/English/help.po
@@ -0,0 +1,165 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Help"
+msgstr "Help"
+
+msgid "produces"
+msgstr "produces"
+
+msgid "BBCode"
+msgstr "BBCode"
+
+msgid "BBCode info 1"
+msgstr "BBCode is a collection of formatting tags that are used to change the look of text in this forum. BBCode is based on the same principal as, and is very similar to, HTML. Below is a list of all the available BBCodes and instructions on how to use them."
+
+msgid "BBCode info 2"
+msgstr "Administrators have the ability to enable or disable BBCode. You can tell if BBCode is enabled or disabled out in the left margin whenever you post a message or edit your signature."
+
+msgid "Text style"
+msgstr "Text style"
+
+msgid "Text style info"
+msgstr "The following tags change the appearance of text:"
+
+msgid "Bold text"
+msgstr "Bold text"
+
+msgid "Underlined text"
+msgstr "Underlined text"
+
+msgid "Italic text"
+msgstr "Italic text"
+
+msgid "Strike-through text"
+msgstr "Strike-through text"
+
+msgid "Red text"
+msgstr "Red text"
+
+msgid "Blue text"
+msgstr "Blue text"
+
+msgid "Heading text"
+msgstr "Heading text"
+
+msgid "Deleted text"
+msgstr "Deleted text"
+
+msgid "Inserted text"
+msgstr "Inserted text"
+
+msgid "Emphasised text"
+msgstr "Emphasised text"
+
+msgid "Links and images"
+msgstr "Links and images"
+
+msgid "Links info"
+msgstr "You can create links to other documents or to email addresses using the following tags:"
+
+msgid "This help page"
+msgstr "This help page"
+
+msgid "My email address"
+msgstr "My email address"
+
+msgid "Images info"
+msgstr "If you want to display an image you can use the img tag. The text appearing after the \"=\" sign in the opening tag is used for the alt attribute and should be included whenever possible."
+
+msgid "FeatherBB bbcode test"
+msgstr "FeatherBB bbcode test"
+
+msgid "Test topic"
+msgstr "Test topic"
+
+msgid "Test post"
+msgstr "Test post"
+
+msgid "Test forum"
+msgstr "Test forum"
+
+msgid "Test user"
+msgstr "Test user"
+
+msgid "Quotes"
+msgstr "Quotes"
+
+msgid "Quotes info"
+msgstr "If you want to quote someone, you should use the quote tag."
+
+msgid "Quotes info 2"
+msgstr "If you don't want to quote anyone in particular, you can use the quote tag without specifying a name."
+
+msgid "Quote text"
+msgstr "This is the text I want to quote."
+
+msgid "produces quote box"
+msgstr "produces a quote box like this:"
+
+msgid "quote note"
+msgstr "Note: If a username contains the characters [ or ] you can enclose it in quote marks."
+
+msgid "Code"
+msgstr "Code"
+
+msgid "Code info"
+msgstr "When displaying source code you should make sure that you use the code tag. Text displayed with the code tag will use a monospaced font and will not be affected by other tags."
+
+msgid "Code text"
+msgstr "This is some code."
+
+msgid "produces code box"
+msgstr "produces a code box like this:"
+
+msgid "Nested tags"
+msgstr "Nested tags"
+
+msgid "Nested tags info"
+msgstr "BBCode can be nested to create more advanced formatting. For example:"
+
+msgid "Bold, underlined text"
+msgstr "Bold, underlined text"
+
+msgid "Lists"
+msgstr "Lists"
+
+msgid "List info"
+msgstr "To create a list you can use the list tag. You can create 3 types of lists using the list tag."
+
+msgid "List text 1"
+msgstr "Example list item 1."
+
+msgid "List text 2"
+msgstr "Example list item 2."
+
+msgid "List text 3"
+msgstr "Example list item 3."
+
+msgid "produces list"
+msgstr "produces a bulleted list."
+
+msgid "produces decimal list"
+msgstr "produces a numbered list."
+
+msgid "produces alpha list"
+msgstr "produces an alphabetically labelled list."
+
+msgid "Smilies"
+msgstr "Smilies"
+
+msgid "Smilies info"
+msgstr "If you like (and if it is enabled), the forum can convert a series of smilies to images representations of that smiley. This forum recognizes the following smilies and replaces them with images:"
diff --git a/app/lang/English/index.mo b/app/lang/English/index.mo
new file mode 100644
index 0000000000000000000000000000000000000000..c8ab6fe21fdf82315b9166c34d7355ba818d7dc1
GIT binary patch
literal 1064
zcmZvaJC74F5XTK1ujP1GJPIR$#1#$%QA8VpP(pG<%H2iB9-_DcC+p-EcJ0XaavUW!
zqCleI3((Nf(NR(G1*rH0lyp$=_j>nUI!mLUXFQ%6d*;`Lxeo;E4CE^0E#xBPAH=Ok
zhX@J4K6na@N<ITmLr=lu;Oo-<rsO+t9`=u={s}w={Y%NO;7RD;K<D=Z9729V&O=`~
zLdZF=37!Q9ptG-oCqM~a1~<V=;QLbl3|@!+9dvd523_7ipo{kxyaLY85rS03yPcm~
zFcoh)T4;nE2H{@ZcR8!&>UMwO{>9Z^thVAhriq*=;<v_fYe+Yn*)2M9hh#Aq#u}<*
znn*zgiF`q=BFkbEW||wJ$+DtqLT3tY<=(1UGOiToW5|lXANi9t*nC>I+m1d=bInuM
zQ#vytm9s)MtvgNXx2>C!UTe|%LNgd@^<0cC>&NT~A|y(Nv?sXT5W3wChAR>4XsEEW
zhun&g!p2s`%fz`>rU5sWMVd>Ka;r3)23$^aJ{2qyJlhqK-s5qW$OjXjVl=8LJ-r_+
z^_RLk`RldYK}Sg|B%*H3kkpD-_SP)riEPsG2G>T|)>_nKjU7LieIhjL%CU+QISpxJ
zl-TV;LMmkNlr0J=w6AffM4VV!uQh6SapG0>Smk;wIzC58eUh@NuD?1fK4Vv#6JuSI
z$`LSBxTe?k_B*6EOx5$SYPuFv+!b2HMgI$*NLijznP($3wwi_mPyB2gc(gAtMgZCU
T;DluV<Wvt@-CIpHOU2#);DZp(

literal 0
HcmV?d00001

diff --git a/app/lang/English/index.po b/app/lang/English/index.po
new file mode 100644
index 00000000..1413e4ae
--- /dev/null
+++ b/app/lang/English/index.po
@@ -0,0 +1,54 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Topics"
+msgstr "Topics"
+
+msgid "Link to"
+msgstr "Link to:"
+
+msgid "Empty board"
+msgstr "Board is empty."
+
+msgid "Newest user"
+msgstr "Newest registered user: %s"
+
+msgid "Users online"
+msgstr "Registered users online: %s"
+
+msgid "Guests online"
+msgstr "Guests online: %s"
+
+msgid "No of users"
+msgstr "Total number of registered users: %s"
+
+msgid "No of topics"
+msgstr "Total number of topics: %s"
+
+msgid "No of posts"
+msgstr "Total number of posts: %s"
+
+msgid "Online"
+msgstr "Online:"
+
+msgid "Board info"
+msgstr "Board information"
+
+msgid "Board stats"
+msgstr "Board statistics"
+
+msgid "User info"
+msgstr "User information"
diff --git a/app/lang/English/install.mo b/app/lang/English/install.mo
new file mode 100644
index 0000000000000000000000000000000000000000..1052a5282505b5b50a975dbac3799dc91ed6dd13
GIT binary patch
literal 9441
zcmc(kS&SV=6^1(`0b&A#gq;9olVNO_xsG=;UdW7>WMC#9>~R)C2t9r4-rKlu_och9
z#}h#S<q5G!2$4iY3IYiM4+sGgFA)zQfgleE1QJ4Gd4nLaDDZ$lV)@Rg>SY!?@PN2-
z&EH#9ojT_~OO=0h<29cS_}x#tnRd<9LGVHF_t)}=-_y?vf|r87178UK6TAt${`o=h
za?pS;0uO=LgQvk4fam=E1K>-zPyGEu;5P0*3i2;_gg^5Bv!L|*n#XT}FXsLS;48qN
zgCgHE;0@r5u5<lf559)`J)p?72)+yq{rgo=<o<}ie-wNr_g@A@?(g{bKlbl`4a)e>
z_~*|-Sdr@nQ2N~r%DNALGT#FDT<|@h=&A4DzaM-R_n!hq?yrD1f=_|c@0Xyc_!&_8
z|JCC^K~x-E%cO!Y^!PH5uLb4%36E1A_j#Q0IP38ak7q!J4(<YF+z^y?#-Paapnv`e
zkB@+;Ab0|leqRDb{%?TN?|Y!=?`I$;34R00IDZ1gZdXGFd43Zp-`xz#dfyDn`#t{o
zEGYI_0{Iubn?Ewo1^@gZQ0D&_DDpfCie5kGpFipGdmex6@fRL{>+#Q^tot7zA_mto
zsqo|_;L=q=FbRtNE+MSQ^Knq#KMsoBzXtLzc#1zc-~Sx^3-=2s<4xS(28p}eUqJZR
zf<FR9?mvQOz`udp!FiM<^I!0|3W`1+26up;0xy8y1Vzs~5K8*(19ySv!PkQy1cmpX
z1>XQZ35wjm2F0KL0E*oI0!8juvKV<k3CjBepp1XJe|`@re%1q}-$USD@KJC#_!Rgi
z@bBP#takz@5I^`ZokH+2@ICS#WU0Y@3?lNTpxFH}P<Z<UI0t?K+y_1lo&;~ksNV)d
z@Dt!0UL6ESz^{Ynz(0aB;2ewI4}Ji=OWuQ1;B`3Jqu@dCqu>ugmL9wlW5_x)P{#QX
zC_MNn_(|{=pztbvowL^^P~?9Y{4V$i$S1+OP`dE>L69W|4}%tb927fWWt^R^2T@Vb
z0fnb0!D;Z_py>Z&AQTKf13nKuei4-CU)}D;`Ig7;gVO&ep!EL(DEfL0Bw@<n3@G-=
zz*FGo!Mnky!S92&L5f4*b+^C~a2C7@6xrk_91#1+@2msm$#eYmtsp8_+ljow0nxkY
z;vntKG=>b`LKC|z(T>rM(5|70?&WvdLC^t3|Lvcw?|A!xzZQMo=dZ;UV&?<2J881k
zx6{OiduWGgb2QP3{BEKhrM;1M4-K`ceF4=Yv``)|gKv|E{NCX}^>?1@MH*&TyW9(+
zQss~VPte{;6Wv0+V1g#RxS#e`+9XZ<S$=0|SJQ-_^1I!E@_pW4w?X_#ezOkrFYXa6
z&|W~>NfRHEpV(gb(EbT8@1VWQKfKK&RAA8VFizv5%)>IyQd8J+JZeA8^7VJd4#POv
z@N8VzJPn6-{o^8-O>AD8@M2ho45K$u7!CMNug9Y#3%lIpHtepMI4#OBNi0v&G#jUp
z9on=EW=A6%<{`JiTv%9h{_H|9mxX!PbZrsk@kj*sPn`JfZ5fw|4NeTgv~Nwq-*MQN
z`z&J+Ki9K9=fhqWoXFB%oDa<?EQ-}E?*=F5Ou06)Ce2E7F-&5fu*MY;50P!I-SVO8
zwAlDgHMQaUQEq$jrRK{)R+Q_%TYuL`Qq7AAE;8}vj!q}_d?I%<Pi?uAwik|*vQbF&
zpeWZ+<H?q)PiCvB7|ukZmVRe67@1zoN2l^U%dyIak=8$U<LR>^ICTl?#cAK5yae6J
z0KsV+mIIs5&6#<}2vuY2ac`U?ZMrla24P`VtW7KX!ll!38YX(5k0YT<5!`N5o9n|~
z=8Y8GKDI^a{uaSJMmKvrRCvJOAM$wE;a&&(9PD@Czdh*gd=Kf6W>6>V^|(~BSJ>!%
zF^pkQDttFXTNFatMLS%vc>((StjhvQbhTJr@p8>Hia4F+<6&@TW|+=iV!T3E&Vv<o
z9p@ZN6`!k%LKzKjqd~Bwlr*_jW_5$J_I=|xN2ApRMz;yK<HQ!hIh)w1G+j@};M^d?
z^=q1*BLb9_Rf1);w&#5N#xr0UTbL*;Z9mJ`0=>ghEJ!a$_(rfihzrBN_m25AG^O-#
z-<<cs2m{uadz;IB&E@{)@<4NWFu2<$QARYoJI|n|3wZZtV-x1q<l{6I!aAxhC1Z#*
zjkbryj7dj&TO8Ya#JJ02J5#g$nAx-I$hM_CdoLQAp6^cIg)K41Ok=NYOJ|m+PY?!$
zpwsxOoiRL{K5H+=@@e&GAuP)2WrAUmi23<w!3VbKWg8A#BbuY3ME2Wy&Y4zLI$7R7
zzHM=S@l-Sap3be?h;7h=QHcvP=<!mydz8SzBPJSzIl<%D`Q_8ohnw$Y_MXkBPo+`T
zMHMsV@Jd|Pg3J&Bx7{=Cd`x9r%4|0-&7RKT&VJsw+v#)JIFBshS>~8AZjyEaVcE}~
zjwXw(5)x1Az}8A|87_2`REJfMFAuCwOr{H~BP1oH6eb$yIqD$3NNiutV~tGPkM8#U
z%zV$R!G+Z@Ep?K@lsFZGNdV*0B{f3?i*rMytY(RacyghAhr-#y>gOn?9E9@6wgfq9
zhsP(1qq_kSsuIJjteK@dmO4h*7=<ZOLy}G8avGBt;l+Ace!>_D7`cbZSXXO~og#s1
zXZIP+p~bF_!DAS1m~~|-7)Ip^N25F&<uQ}B`j2crj0=q`9nlICb+hqGIn@ks>!Cx3
zI_p%f>Ay9|f28r$kaJll{@u8Y2-u@Y(6UA3vw5;Mbp<`D)-lv3W&SVMe44!IDNz{o
zNG0R>(v1s>oov;14MZ;`oVgVKKj0eaMA-?)BvC)$I11S{ffK@1iI`h+F@{u<oskqI
z-`5Km2)#7Fx)Hlm6}#&ZAtgHYuZ0sW|HGpzs_m9kH72)of_e3YVPTT^f^FFsg@hX`
zL&yALkd2eB>1PBvGayYJ+tKOlj?=EaB*n;%<5Um!=<X2TA<I%*c7jt{mEpL#30uXb
zkuN*#5>w&=6{gv_8kbCi1LV}Z67dPS#b6i7TYR`pL`^##qZz3pS(Fh*qO!BOQZ+k^
z@n}SHEX*CtiwnE{+sah}MOD4J^0%oSMEI)GmEhD>mr-u5?;_IT%Nr`Sb{Fidg+g2w
zHtA`w!LAY!RxGUTY_5qXCyGf4RuVTuR~6UgfL6<GBUE)l9j7r%w<#B#xn!wQ_SQPD
zdijy6TVFl;dZK0O`h&|B$N%4|dLix)B!H6vBue{S-3cyRVQ*<Q!hb=@+s$l|PC93j
z7-OZj?ocQ-hSu6!(#5lU-^(O2)nyJgwQz|sp@3($?al<VUh$Fc+6)Actm{}%xh_Uw
zGAaFBXs)&^!WQo{k$Uscq61BZO%=OU2p|`@&q9cX`<hW~iBq^`k@d<|snO`>>5kOG
zD;{J~G#;(VlCqSqb2H5Nl3qeGxBCz-6s-W1yMnjS>{jP|v{3odkPTBjB0feLLNG_K
z)!Q$)5dKy?oNCg)&)MzN?4<B4Zj>;;^(Ls^>TK8zZP(&p7)k-Ndbt2e=wuzTbPZmt
zh}bC+vlBEE*E7`0#9$;{*-*s~qBXkvS1y5|3fTcW_SCPdZC4dIw%CxhTvnqF^_y-`
z)Of93erNqQZ8njO9V>7fZL><a@I;NImZlVv6qgc+rI?h6?qYXkj}F@w&3T0eN{#C(
zKvQ8+1k3q>#?VBntxm8QlBe`rr#!iYBqv-I7B&%Bs23XNbbRXixbcH4DbmrTUP=;2
z7hH`%P#%{hOVJoCChS&waiWK0YVV58&fKj8Q>C?T>IxON&`zETc}C=Jis8+Pu5Ij2
zpyh$Mg;oV_Q2ec#daC6Ot1-4BdTb)=tgnAZ8QWg(A8_|FiTw(^^&3ze%7>VaxtoOL
za;-V{j)l0iQ)Y3EE2Y&EyU2cSx$Ok^vI<{RAY)a@_qF`hV8U@gFVBX~f~$5#k6ETn
z+%rjr%H_~S<FDH^WcdXbcdO(jo>GY=W4PS|YWEs#DJn}<oZL$)0aZt7r$@6h?x#L{
zxrObbjB4#m7@2*lspC`Q(`^$<loWmv6k$#!pOo)4<w^6-kz@rNFRekCTsGVhL7S)!
z6@~q-R`7z?A~zacvE{0q%IsCm?>!(><Y9z2QT4GKQ<4(N{c!|>Gly7$^C&_}X%24g
zahB6TITgV*`K;<n%}7{}2t(7Pogyydi_~}i+(j~^T8N#`(5EwBsdmhg3tmlJt};~;
zu2r+t11RPFsGed|l2m-5U7hoI?Ksl88l*n(X>2kf2Tpn#REG}D+8SNlf=WB2WDN6|
zeW|#-hN~gFbbnG*i(g`*u+Ix;+n!xDoC1tF9wBb|QzT)#E}$4k5hqF;e6k@URKPgw
z4#q@2B51MQ+(}MJvc8T^bQ@4yn@r9feGJh<hvqn${%p4s%#+$gzH!lk!r$>mmxyH5
zDOPi}<$0Et*z8Tv^Tn8Lyqpg=e&^Su#kDFZOxLOmU$L9SB6Mk#UlrqMkZ~pE>V|&P
zSeE3$GS!q*rU@Qmb?1YklgsQ=p|W>8%U(qEuM9_eh78+Ba-Cpl^O;;XQ`YLSoC_@N
zQo&3X?@I`74`}sW9oMM>a78&X5a;zW+O!|1wx&zN_WFRp*B?8pQ@&jR5isN!(4GDf
z066rMwQ5SlfWvjWt6WY4bz4;(32K0-^zSwT)f$Wc#M6T-ogK2W^}3Kvh_DV9AinXx
z34IQFTj2(Cv7R!^eBfDT1h-@}B=7jHs<MRIKq3^Ui<x<ltuAy*$9fX0aZJ=Yrf|v&
zYGQ&;71N}wwQFu^12*{L9<nLI#W@4jDkSs+>8DJ5DISi8#JaRkiGqClZ*7L7wAd7z
zHd;&1MK60`T2h`ygcM0-S2{7>!W?^BayX6E2c`aNSsDD+a$5H>TZDHFXLVla%Tc>X
zQgOA@9#acf9a1@_73xsjnC-#*k_o$Ax)IIJ`^<<KzDs30b|Y%P+8~9QoH9GqX7`D|
z-Y<zI<8<SSqcp)o4n@VEa6tc`75&2OoSQpA*xJQZj3!*rU?v+{q!S;POcbu@8NwEs
zo?S&1FQAtX4^3cdZxym3l{M9@pJb@pa2eNa#j7Jp%YiIOSwaf3%aLCk$qog7RMJUz
zKaYm<DGsT%VCMvdPCkNnvuG@FRX=gjrWMpB$B}oE$_`r1XdI*T6Mm)o-(igcs`K)R
zJ+~B6LCATbnb>;^tZstv#6DhD+pQ++YoCezyhAoAXsTmASJY|@9gj#*U7t?0Lwkv6
R2&?E@J;D%*kPb2YzX2gx-ueIl

literal 0
HcmV?d00001

diff --git a/app/lang/English/install.po b/app/lang/English/install.po
new file mode 100644
index 00000000..03f10123
--- /dev/null
+++ b/app/lang/English/install.po
@@ -0,0 +1,291 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Choose install language"
+msgstr "Choose the install script language"
+
+msgid "Choose install language info"
+msgstr "The language used for this install script. The default language used for the board itself can be set below."
+
+msgid "Install language"
+msgstr "Install language"
+
+msgid "Change language"
+msgstr "Change language"
+
+msgid "Already installed"
+msgstr "It seems like FeatherBB is already installed. You should go <a href=\"../index.php\">here</a> instead."
+
+msgid "You are running error"
+msgstr "You are running %1$s version %2$s. FeatherBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue."
+
+msgid "My FeatherBB Forum"
+msgstr "My FeatherBB Forum"
+
+msgid "Description"
+msgstr "Lighter than a feather."
+
+msgid "Username 1"
+msgstr "Usernames must be at least 2 characters long."
+
+msgid "Username 2"
+msgstr "Usernames must not be more than 25 characters long."
+
+msgid "Username 3"
+msgstr "The username guest is reserved."
+
+msgid "Username 4"
+msgstr "Usernames may not be in the form of an IP address."
+
+msgid "Username 5"
+msgstr "Usernames may not contain all the characters ', \" and [ or ] at once."
+
+msgid "Username 6"
+msgstr "Usernames may not contain any of the text formatting tags (BBCode) that the forum uses."
+
+msgid "Short password"
+msgstr "Passwords must be at least 6 characters long."
+
+msgid "Passwords not match"
+msgstr "Passwords do not match."
+
+msgid "Wrong email"
+msgstr "The administrator email address you entered is invalid."
+
+msgid "No board title"
+msgstr "You must enter a board title."
+
+msgid "Error default language"
+msgstr "The default language chosen doesn't seem to exist."
+
+msgid "Error default style"
+msgstr "The default style chosen doesn't seem to exist."
+
+msgid "No DB extensions"
+msgstr "This PHP environment does not have support for any of the databases that FeatherBB supports. PHP needs to have support for either MySQL, PostgreSQL or SQLite in order for FeatherBB to be installed."
+
+msgid "Administrator username"
+msgstr "Administrator's username"
+
+msgid "Administrator email"
+msgstr "Administrator's email"
+
+msgid "Board title"
+msgstr "Board title"
+
+msgid "Base URL"
+msgstr "The URL (without trailing slash) of your FeatherBB forum. This must be correct."
+
+msgid "Required field"
+msgstr "is a required field in this form."
+
+msgid "FeatherBB Installation"
+msgstr "FeatherBB Installation"
+
+msgid "Welcome"
+msgstr "You are about to install FeatherBB. In order to install FeatherBB, you must complete the form set out below. If you encounter any difficulties with the installation, please refer to the documentation."
+
+msgid "Install"
+msgstr "Install FeatherBB %s"
+
+msgid "Errors"
+msgstr "The following errors need to be corrected:"
+
+msgid "Database setup"
+msgstr "Database setup"
+
+msgid "Info 1"
+msgstr "All information we need to create a connection with your database."
+
+msgid "Select database"
+msgstr "Select your database type"
+
+msgid "Info 2"
+msgstr "Select a database. We support SQLite, MySQL and PostgreSQL."
+
+msgid "Database type"
+msgstr "Database type"
+
+msgid "Required"
+msgstr "(Required)"
+
+msgid "Database hostname"
+msgstr "Enter your database server hostname"
+
+msgid "Info 3"
+msgstr "You should be able to get this info from your web host, if localhost does not work."
+
+msgid "Database server hostname"
+msgstr "Database server hostname"
+
+msgid "Database enter name"
+msgstr "Enter the name of your database"
+
+msgid "Info 4"
+msgstr "The name of the database you want to install FeatherBB on."
+
+msgid "Database name"
+msgstr "Database name"
+
+msgid "Database enter informations"
+msgstr "Enter your database username and password"
+
+msgid "Database username"
+msgstr "Database username"
+
+msgid "Info 5"
+msgstr "Your MySQL username and password (ignore of SQLite)."
+
+msgid "Database password"
+msgstr "Database password"
+
+msgid "Database enter prefix"
+msgstr "Enter database table prefix"
+
+msgid "Info 6"
+msgstr "If you want to run multiple FeatherBB installations in a single database, change this."
+
+msgid "Table prefix"
+msgstr "Table prefix"
+
+msgid "Administration setup"
+msgstr "Administration setup"
+
+msgid "Info 7"
+msgstr "Create the very first account on your board."
+
+msgid "Info 8"
+msgstr "Your username should be between 2 and 25 characters long. Your password must be at least 6 characters long. Remember that passwords are case-sensitive."
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Confirm password"
+msgstr "Confirm password"
+
+msgid "Board setup"
+msgstr "Board setup"
+
+msgid "Info 11"
+msgstr "Settings for your board. You can change this later."
+
+msgid "General information"
+msgstr "Enter your board's title and description."
+
+msgid "Board description"
+msgstr "Board description (supports HTML)"
+
+msgid "Appearance"
+msgstr "Appearance"
+
+msgid "Info 15"
+msgstr "Make your forum yours. Choose a language and a style for your board."
+
+msgid "Default language"
+msgstr "Default language"
+
+msgid "Default style"
+msgstr "Default style"
+
+msgid "Start install"
+msgstr "Start install"
+
+msgid "DB type not valid"
+msgstr "'%s' is not a valid database type"
+
+msgid "Table prefix error"
+msgstr "The table prefix '%s' contains illegal characters or is too long. The prefix may contain the letters a to z, any numbers and the underscore character. They must however not start with a number. The maximum length is 40 characters. Please choose a different prefix"
+
+msgid "Prefix reserved"
+msgstr "The table prefix 'sqlite_' is reserved for use by the SQLite engine. Please choose a different prefix"
+
+msgid "Existing table error"
+msgstr "A table called '%susers' is already present in the database '%s'. This could mean that FeatherBB is already installed or that another piece of software is installed and is occupying one or more of the table names FeatherBB requires. If you want to install multiple copies of FeatherBB in the same database, you must choose a different table prefix"
+
+msgid "InnoDB off"
+msgstr "InnoDB does not seem to be enabled. Please choose a database layer that does not have InnoDB support, or enable InnoDB on your MySQL server"
+
+msgid "Administrators"
+msgstr "Administrators"
+
+msgid "Administrator"
+msgstr "Administrator"
+
+msgid "Moderators"
+msgstr "Moderators"
+
+msgid "Moderator"
+msgstr "Moderator"
+
+msgid "Guests"
+msgstr "Guests"
+
+msgid "Guest"
+msgstr "Guest"
+
+msgid "Members"
+msgstr "Members"
+
+msgid "Announcement"
+msgstr "Enter your announcement here."
+
+msgid "Rules"
+msgstr "Enter your rules here"
+
+msgid "Maintenance message"
+msgstr "The forums are temporarily down for maintenance. Please try again in a few minutes."
+
+msgid "Test post"
+msgstr "Test topic"
+
+msgid "Message"
+msgstr "You have successfully installed FeatherBB, congratulations! Now log in and head over to the administration control panel to configure your forum."
+
+msgid "Test category"
+msgstr "Test category"
+
+msgid "Test forum"
+msgstr "Test forum"
+
+msgid "This is just a test forum"
+msgstr "This is just a test forum"
+
+msgid "Alert cache"
+msgstr "<strong>The cache directory is currently not writable!</strong> In order for FeatherBB to function properly, the directory <em>%s</em> must be writable by PHP. Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777."
+
+msgid "Alert avatar"
+msgstr "<strong>The avatar directory is currently not writable!</strong> If you want users to be able to upload their own avatar images you must see to it that the directory <em>%s</em> is writable by PHP. You can later choose to save avatar images in a different directory (see Admin/Options). Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777."
+
+msgid "Alert upload"
+msgstr "<strong>File uploads appear to be disallowed on this server!</strong> If you want users to be able to upload their own avatar images you must enable the file_uploads configuration setting in PHP. Once file uploads have been enabled, avatar uploads can be enabled in Administration/Options/Features."
+
+msgid "FeatherBB has been installed"
+msgstr "FeatherBB has been installed. To finalize the installation please follow the instructions below."
+
+msgid "Final instructions"
+msgstr "Final instructions"
+
+msgid "Info 17"
+msgstr "To finalize the installation, you need to click on the button below to download a file called config.php. You then need to upload this file to the root directory of your FeatherBB installation."
+
+msgid "Info 18"
+msgstr "Once you have uploaded config.php, FeatherBB will be fully installed! At that point, you may <a href=\"../index.php\">go to the forum index</a>."
+
+msgid "Download config.php file"
+msgstr "Download config.php file"
+
+msgid "FeatherBB fully installed"
+msgstr "FeatherBB has been fully installed! You may now <a href=\"../index.php\">go to the forum index</a>."
diff --git a/app/lang/English/login.mo b/app/lang/English/login.mo
new file mode 100644
index 0000000000000000000000000000000000000000..cef79b30ccc81bc7fe3d011101c52b6cfabb7959
GIT binary patch
literal 1877
zcmZWp%Z?m16g4Egns*`r3nXrkK!B(kIs$3bLlcr=1`V1Ft<VG(2;{E1U2RfrH@0h<
z*|A^&Ym@~`P(A?Gh&@{*BzA212E>MQ%l!-`RUP}5eeSsr`>zY<Z!0`c;(ZqH9lTHD
zef1uE@O%S&82If1Zv!90{0CqM_!ICE;4cgNZ@|Yf{}Xr-_%~4a{$2dPcyHSOJWzPM
zK-u31iiY=qvhNe1@XUY%?EMP(HRivcQ|d?H&GSk<1N;a08Suh=O1%j5K=JoIQ22ia
zJ_Y<0cntglco}%<{^Vx}d<F9f@Co2|z)yj9fL-9Z2b6ja_y!O%6lAmy+_wB!rXEVB
z)%Q`1;HHg7as<h%M`8k1>r3+ZAYO@I9Za>UX<R#3szc{1jwF_L>|$g~GaZ6Dc9pSY
z?AR@aHCJrQ#l&-IJQq=>u8FjopYXihKX<+)_TKrRHf_n2cuyR0D`u)=F;OQ@cq$Vj
zgHGMxDNjf2Y04OX(Qt@K+2$k>ZCMsNKl092)CBfBZ9Idz@w(0s@ig?v&f00{U*4lM
z?7w8`QlGjn?{x;=eU8|&qcXe6J{V_vbjUhR*k8NW8N5Ht_C2PsXYc69J%TN}!KX%+
zE=|We#BAub4YiKWW6`m;Rii7;hODO>jP#~1r^dcLPA*2H994O%bN%T0!P<W}f336c
zEXo7cvl*O5{xa^&YHjQu6%*|P$Nq=I!)$lGPP~uVX9u=$rLk3yc1I?zg!G7Q=i}^M
zw(OI}fkRy*b@Sc)b^J-w>;u>Mg7=e;9wjGgI5B~AQMkrNnrMt`WTiYq4clUINqXH1
zo}mxbB4kml*aFs^1~u!zG}mzZLLlU!i5zIeW9NBE1?k|jo2{iQ1fHv_cF{s2V8m$N
zfDBP|t)DRC!i<e5DN85_G&gYq6(RbjkOBsB7E0!_14*<M(;0NFbmw$5CP*tCL|HVb
z_THSfi>T0+3Y0__aEPd&xS7HeVn7eK86_Pz&eaz46$NHkkUH=Q^}6@T`D6xVmCoeW
zUMgx++!E>HSI=hN&AdS?Qf=%l<e_%+TpgfWd<sX7fz?y2wdE?dv`$WNg$$uIp(zR^
zY24KHS-!O6bmwY-8=*bXi`u4>jTVroYj~3iwMQFO;xb4&M~v)vxg@~8sOMcplni2-
zl&mLYs5pAcy7t&^=A$i}#G3AlMK$lbG3bor6_Je_L&DKbbhueep%D+UE+!NWejSmV
zR7ACTZAf(L>UNJshszPFQrGB|TttR~n^VcQDB9}ExvA@AM5zfiS|;`0vLOEpBhk+%
Z1_Gra)_tJXm)Np;J7^8L&qQyo{sSF<EA0RP

literal 0
HcmV?d00001

diff --git a/app/lang/English/login.po b/app/lang/English/login.po
new file mode 100644
index 00000000..059c8920
--- /dev/null
+++ b/app/lang/English/login.po
@@ -0,0 +1,63 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Wrong user/pass"
+msgstr "Wrong username and/or password."
+
+msgid "Forgotten pass"
+msgstr "Forgotten your password?"
+
+msgid "Login redirect"
+msgstr "Logged in successfully."
+
+msgid "Logout redirect"
+msgstr "Logged out."
+
+msgid "No email match"
+msgstr "There is no user registered with the email address"
+
+msgid "Request pass"
+msgstr "Request password"
+
+msgid "Request pass legend"
+msgstr "Enter the email address with which you registered"
+
+msgid "Request pass info"
+msgstr "A new password together with a link to activate the new password will be sent to that address."
+
+msgid "Not registered"
+msgstr "Not registered yet?"
+
+msgid "Login legend"
+msgstr "Enter your username and password below"
+
+msgid "Remember me"
+msgstr "Log me in automatically each time I visit."
+
+msgid "Login info"
+msgstr "If you have not registered or have forgotten your password click on the appropriate link below."
+
+msgid "New password errors"
+msgstr "Password request error"
+
+msgid "New passworderrors info"
+msgstr "The following error needs to be corrected before a new password can be sent:"
+
+msgid "Forget mail"
+msgstr "An email has been sent to the specified address with instructions on how to change your password. If it does not arrive you can contact the forum administrator at"
+
+msgid "Email flood"
+msgstr "This account has already requested a password reset in the past hour. Please wait %s minutes before requesting a new password again."
diff --git a/app/lang/English/mail_templates/activate_email.tpl b/app/lang/English/mail_templates/activate_email.tpl
new file mode 100644
index 00000000..49095c01
--- /dev/null
+++ b/app/lang/English/mail_templates/activate_email.tpl
@@ -0,0 +1,12 @@
+Subject: Change email address requested
+
+Hello <username>,
+
+You have requested to have a new email address assigned to your account in the discussion forum at <base_url>. If you didn't request this or if you don't want to change your email address you should just ignore this message. Only if you visit the activation page below will your email address be changed. In order for the activation page to work, you must be logged in to the forum.
+
+To change your email address, please visit the following page:
+<activation_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
diff --git a/app/lang/English/mail_templates/activate_password.tpl b/app/lang/English/mail_templates/activate_password.tpl
new file mode 100644
index 00000000..b408927b
--- /dev/null
+++ b/app/lang/English/mail_templates/activate_password.tpl
@@ -0,0 +1,14 @@
+Subject: New password requested
+
+Hello <username>,
+
+You have requested to have a new password assigned to your account in the discussion forum at <base_url>. If you didn't request this or if you don't want to change your password you should just ignore this message. Only if you visit the activation page below will your password be changed.
+
+Your new password is: <new_password>
+
+To change your password, please visit the following page:
+<activation_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
diff --git a/app/lang/English/mail_templates/banned_email_change.tpl b/app/lang/English/mail_templates/banned_email_change.tpl
new file mode 100644
index 00000000..276662f3
--- /dev/null
+++ b/app/lang/English/mail_templates/banned_email_change.tpl
@@ -0,0 +1,9 @@
+Subject: Alert - Banned email detected
+
+User '<username>' changed to banned email address: <email>
+
+User profile: <profile_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
diff --git a/app/lang/English/mail_templates/banned_email_post.tpl b/app/lang/English/mail_templates/banned_email_post.tpl
new file mode 100644
index 00000000..f7e02433
--- /dev/null
+++ b/app/lang/English/mail_templates/banned_email_post.tpl
@@ -0,0 +1,9 @@
+Subject: Alert - Banned email detected
+
+User '<username>' posted with banned email address: <email>
+
+Post URL: <post_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
diff --git a/app/lang/English/mail_templates/banned_email_register.tpl b/app/lang/English/mail_templates/banned_email_register.tpl
new file mode 100644
index 00000000..f0085ec4
--- /dev/null
+++ b/app/lang/English/mail_templates/banned_email_register.tpl
@@ -0,0 +1,9 @@
+Subject: Alert - Banned email detected
+
+User '<username>' registered with banned email address: <email>
+
+User profile: <profile_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
diff --git a/app/lang/English/mail_templates/dupe_email_change.tpl b/app/lang/English/mail_templates/dupe_email_change.tpl
new file mode 100644
index 00000000..583fb246
--- /dev/null
+++ b/app/lang/English/mail_templates/dupe_email_change.tpl
@@ -0,0 +1,9 @@
+Subject: Alert - Duplicate email detected
+
+User '<username>' changed to an email address that also belongs to: <dupe_list>
+
+User profile: <profile_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
diff --git a/app/lang/English/mail_templates/dupe_email_register.tpl b/app/lang/English/mail_templates/dupe_email_register.tpl
new file mode 100644
index 00000000..b1cb3636
--- /dev/null
+++ b/app/lang/English/mail_templates/dupe_email_register.tpl
@@ -0,0 +1,9 @@
+Subject: Alert - Duplicate email detected
+
+User '<username>' registered with an email address that also belongs to: <dupe_list>
+
+User profile: <profile_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
diff --git a/app/lang/English/mail_templates/form_email.tpl b/app/lang/English/mail_templates/form_email.tpl
new file mode 100644
index 00000000..e3e0d5f7
--- /dev/null
+++ b/app/lang/English/mail_templates/form_email.tpl
@@ -0,0 +1,13 @@
+Subject: <mail_subject>
+
+<sender> from <board_title> has sent you a message. You can reply to <sender> by replying to this email.
+
+The message reads as follows:
+-----------------------------------------------------------------------
+
+<mail_message>
+
+-----------------------------------------------------------------------
+
+--
+<board_mailer> Mailer
diff --git a/app/lang/English/mail_templates/new_reply.tpl b/app/lang/English/mail_templates/new_reply.tpl
new file mode 100644
index 00000000..286914ec
--- /dev/null
+++ b/app/lang/English/mail_templates/new_reply.tpl
@@ -0,0 +1,11 @@
+Subject: Reply to topic: '<topic_subject>'
+
+<replier> has replied to the topic '<topic_subject>' to which you are subscribed. There may be more new replies, but this is the only notification you will receive until you visit the board again.
+
+The post is located at <post_url>
+
+You can unsubscribe by going to <unsubscribe_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
diff --git a/app/lang/English/mail_templates/new_reply_full.tpl b/app/lang/English/mail_templates/new_reply_full.tpl
new file mode 100644
index 00000000..4fbc777e
--- /dev/null
+++ b/app/lang/English/mail_templates/new_reply_full.tpl
@@ -0,0 +1,18 @@
+Subject: Reply to topic: '<topic_subject>'
+
+<replier> has replied to the topic '<topic_subject>' to which you are subscribed. There may be more new replies, but this is the only notification you will receive until you visit the board again.
+
+The post is located at <post_url>
+
+The message reads as follows:
+-----------------------------------------------------------------------
+
+<message>
+
+-----------------------------------------------------------------------
+
+You can unsubscribe by going to <unsubscribe_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
diff --git a/app/lang/English/mail_templates/new_report.tpl b/app/lang/English/mail_templates/new_report.tpl
new file mode 100644
index 00000000..dedb113b
--- /dev/null
+++ b/app/lang/English/mail_templates/new_report.tpl
@@ -0,0 +1,9 @@
+Subject: Report(<forum_id>) - '<topic_subject>'
+
+User '<username>' has reported the following message: <post_url>
+
+Reason: <reason>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
diff --git a/app/lang/English/mail_templates/new_topic.tpl b/app/lang/English/mail_templates/new_topic.tpl
new file mode 100644
index 00000000..2bc048b1
--- /dev/null
+++ b/app/lang/English/mail_templates/new_topic.tpl
@@ -0,0 +1,11 @@
+Subject: New topic in forum: '<forum_name>'
+
+<poster> has posted a new topic '<topic_subject>' in the forum '<forum_name>', to which you are subscribed.
+
+The topic is located at <topic_url>
+
+You can unsubscribe by going to <unsubscribe_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
diff --git a/app/lang/English/mail_templates/new_topic_full.tpl b/app/lang/English/mail_templates/new_topic_full.tpl
new file mode 100644
index 00000000..f70c7262
--- /dev/null
+++ b/app/lang/English/mail_templates/new_topic_full.tpl
@@ -0,0 +1,18 @@
+Subject: New topic in forum: '<forum_name>'
+
+<poster> has posted a new topic '<topic_subject>' in the forum '<forum_name>', to which you are subscribed.
+
+The topic is located at <topic_url>
+
+The message reads as follows:
+-----------------------------------------------------------------------
+
+<message>
+
+-----------------------------------------------------------------------
+
+You can unsubscribe by going to <unsubscribe_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
diff --git a/app/lang/English/mail_templates/new_user.tpl b/app/lang/English/mail_templates/new_user.tpl
new file mode 100644
index 00000000..30164e87
--- /dev/null
+++ b/app/lang/English/mail_templates/new_user.tpl
@@ -0,0 +1,12 @@
+Subject: Alert - New registration
+
+User '<username>' registered in the forums at <base_url>
+
+User profile: <profile_url>
+
+To administer this account, please visit the following page:
+<admin_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
diff --git a/app/lang/English/mail_templates/rename.tpl b/app/lang/English/mail_templates/rename.tpl
new file mode 100644
index 00000000..3cba50dd
--- /dev/null
+++ b/app/lang/English/mail_templates/rename.tpl
@@ -0,0 +1,12 @@
+Subject: User account renamed
+
+During an upgrade to the forums at <base_url> it was determined your username is too similar to an existing user. Your username has been changed accordingly.
+
+Old username: <old_username>
+New username: <new_username>
+
+We apologise for any inconvenience caused.
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
diff --git a/app/lang/English/mail_templates/welcome.tpl b/app/lang/English/mail_templates/welcome.tpl
new file mode 100644
index 00000000..779a5745
--- /dev/null
+++ b/app/lang/English/mail_templates/welcome.tpl
@@ -0,0 +1,12 @@
+Subject: Welcome to <board_title>!
+
+Thank you for registering in the forums at <base_url>. Your account details are:
+
+Username: <username>
+Password: <password>
+
+Login at <login_url> to activate the account.
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
diff --git a/app/lang/English/misc.mo b/app/lang/English/misc.mo
new file mode 100644
index 0000000000000000000000000000000000000000..9a3f7859ab142662a032fa3356390c5918b31c2d
GIT binary patch
literal 5068
zcmb7`O^h5z701gE3|Rt+O(5aB65`;EGqYZQ#q8Sg$J!e#y!I-)i9rFOo|)R+#xvbR
zcaJxVkU3xhhbRI>;1VIYAS8r@l0!}*7myGVAcRm3AS8qY95_Hu1cBi9ud1Gz-L*;F
zn(E(Fb$z^g@6~(thuyb4V|X5+ypOW{24fQV)GfSt?$~L}-Eddr1MnTx=ir;*C3q+N
z6nrNvBEJ&bza9BJ<Y#`y>o)i+sCj-5HSX{5ZE)wC!+dwbcTt~&`hF6=6+RBtuLU)}
zAM4j*{p(Quz8Co%d^`0YL+#@ia5wxjl>Dzk$@5>Rb#8l$G5pNEyrhDCQ1k7FbTP-^
z1Uv(^{>Avc4W)-X)~~@ksDCx`yKoov=isgICs1<y621ri5o-LuBX`m1cIx*-$#Dc~
zy;-P!7a=M$9Vq!OL-k*W+Rv9``!{0yccA+J2ugo1#P**;>EX9f^ZX7<uD?L7^RLL;
z*|gg4gR;v*kr$x)IjHfUgNr+i`4XI@{xXf?4uqP5`=Hi)0!oeq%04-~3tokq@0)NQ
z{s2nuS0F$0DzAfZCxbO^25O#jybi%jP<nU@J^`PFZTL?p`+br@lCuL<@53|jNhtfj
z2(|uipyc^0oQ0ZH@*jhezY8T#0qJ7C05P3;8p>YZg0kzgQ0u$^QHgm8YTVDE<aik(
zn)y?#{{z08`hOzt!ilusX(<17@L_lrHsOnK5Byu?Zk$a0k3z}Og_{4f(8~#>&!?gG
z^$eVXzlNWNJ20~3N}&4pp!$CvYMw8`_rkA1>EVY^{hx;i;7d^c@e0)VTXEWZ;N9>j
zoPmgHO86moE%N&ixA9}u?*WP)#iSDy*`|KHJ*e!Z5U#vmN+<F&J(5$pIj#!N`zibU
zzwo*rNQRRX$$W~U=U{+;AK`tLA|1Ywavw#HeB-qL7h<OVO8@dbJ@b?gP(DmKOp)#7
z7uu`*NjkF>)a~^nUuaNdgEJJ=U_L_8BfWF{%rVLwWrp$~Wk02Ua1--EihOJ9Gfl%o
zTN-5x`Q^P7*-btrf72tonp54vC7lgh4q9cqNL#LBSMp-eyWWQ?@271umt<L9+0u1g
zyRs{3QC4QIo0l%Ut?y+E*GUUHj5n5Jt$D`Cp6xJ8<!sljx~ya7Vr$P8tJ@mOemAY^
zo@e|x6JYy!S(TeAww?F--Hpv{Lz&_*FX?bxsBIY-8;2v$_L8(~J89Ww$AiLIRN+i$
zUFqg|C;sobvP@R%FQv<>(cVLE6#g0MXFf*_uAVk&bzR4Nl>OK=TgmP8*#86Oyi2aQ
z(L@VLaXDCvwxqM=!<Htg)GT<##(j@h#>VCyS0rp|A-@t{wa(Rmb^V86<*~ox6Zmep
zN;&p@%=Q=Dy4=n0{z4x2UMp<aFxJDHH#!{Jp$mH}^GyGufr2;skCk;<K3HA5?x$^T
zenGB0@_j!Y^RBNsj9cZlCoNp;yUf4BoTI(!L%q(>M;;Br1>oUj+r<A>p4)Doty1sj
z1&7CbOsr^^^@rhHOa7FZB~C|F6b4vY%hwSM0SBckO0%Ss5#I4A_?Ga$cIfe@(ezc?
zzPxo)OSL*i`&^EKZ!y+mS$Vw)Xx=`>r6T2^dq+2m-9eFb8*=?}#%6tAEsr0Vwc+pa
zy_vn|xSgJyomeb#IZESPr|~#@P4jHV&by?-KBrGlEM8o0%;5|b?Ts^d?Tn?Z@u<6!
zs%zbJJ}Illa*<?ZH>vW1PUn+sb-)2_EW4yPHlsb3bb4uaawRO$YBlp>_2G$ya|>rj
z>rXfLPY|jqPIY5>qtBw1d$OA9cat=mwe7W}C|z~@vE}*3(NRCGzT%3;*{q#+(rk6c
z9&M%7P>>nCcH-lWM_i`UCm9!WLTF{Dn@5|6_!6p(rF>Ad-CS5>#)d`AC-Q+!@P}l3
zG{=XlwX_UzqWOAy`ZLfp^NQ@=hip59{FWOYLQQ9VM4k#Eycu)AvT}q~bab7j@wIYT
zUF>o+93D9q{4o>$u&LdL|E-OFF`KW9L<nIa;bg>I#8Io#%sYcR>gYCO2H2Dc%qdj0
zfy#UY*Pr!-0F9=?UQpQBPW>_`%%XBk?7+@8r;wYP(CfE6Q7b2`$&^tG$|y*XRJOIj
z0moH_2JAg3v5R;LlTN1~&Diy{+qKvxW+gJXx49BUJME`<Y15oi=HwLEJtf-00G-mV
zDVfl<pD;<wRqKvm=2MkFrDfAbiPjVRaBQGdUKQLKh)NPKS;g_2B$ur@uW5)SKF%+r
zQ3Wfnc6ln}{mybfi%qg&ctbAqoR&Tn%FkkY#G9Dp+@h`bof13tl)iOM2{TK2&c?>g
znKDGUz2zjgnr^6+<kw*5K3ZBy>w8boN=vHfkzQ#=8X^q#85=7NAlaZ7wRqkBKEG~G
zx$!)B2WQ5GO}RG2dL@jlUR>wVn!1LCgC-yM6OD3iy+-&lo@^B*dIL0tOJIt`#-tmf
z!lo|-aM^9_OFUz^WpJcCb0Iivj|AJ+L4Ty{*O<&73m;dssTfwKax(0c4=4X;c(p#f
z2uK>Q-q2mH=5MQYLW+lDdqBKFFE5pMJ%v|4TW$F?<M6DnrR_EE)dWc&a-x4V!>u8h
zNxK+}hjlev3+jVkTcupn-5}_U`8S4Vrtr6hVL<Q~26U|r`;!-pOC%U%+~Mqz!-o$Z
zCWut7w0o}}Idr)-c@u#kEOygDVEi(pkjXxD)zRi(&t1mb-{-4yi`Ti=+%V3D>~Q0_
z?PHxkrM_p(Ox9mtB%4=bytVXooA6P{4<Ow5BNlW_G8-mCUFFa-u{w*&R_;&Q94<6|
n<dFT?X*3=@U=XfKud!C);(-pgC7;^{tsdcbV-)x6tMdN<ZOB62

literal 0
HcmV?d00001

diff --git a/app/lang/English/misc.po b/app/lang/English/misc.po
new file mode 100644
index 00000000..68516bb7
--- /dev/null
+++ b/app/lang/English/misc.po
@@ -0,0 +1,225 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Mark read redirect"
+msgstr "All topics and forums have been marked as read."
+
+msgid "Mark forum read redirect"
+msgstr "All topics in the specified forum have been marked as read."
+
+msgid "Form email disabled"
+msgstr "The user you are trying to send an email to has disabled form email."
+
+msgid "No email subject"
+msgstr "You must enter a subject."
+
+msgid "No email message"
+msgstr "You must enter a message."
+
+msgid "Too long email message"
+msgstr "Messages cannot be longer than 65535 characters (64 KB)."
+
+msgid "Email flood"
+msgstr "At least %s seconds have to pass between sent emails. Please wait %s seconds and try sending again."
+
+msgid "Email sent redirect"
+msgstr "Email sent."
+
+msgid "Send email to"
+msgstr "Send email to"
+
+msgid "Email subject"
+msgstr "Subject"
+
+msgid "Email message"
+msgstr "Message"
+
+msgid "Email disclosure note"
+msgstr "Please note that by using this form, your email address will be disclosed to the recipient."
+
+msgid "Write email"
+msgstr "Write and submit your email message"
+
+msgid "No reason"
+msgstr "You must enter a reason."
+
+msgid "Reason too long"
+msgstr "Your message must be under 65535 bytes (~64kb)."
+
+msgid "Report flood"
+msgstr "At least %s seconds have to pass between reports. Please wait %s seconds and try sending again."
+
+msgid "Report redirect"
+msgstr "Post reported."
+
+msgid "Report post"
+msgstr "Report post"
+
+msgid "Reason"
+msgstr "Reason"
+
+msgid "Reason desc"
+msgstr "Please enter a short reason why you are reporting this post"
+
+msgid "Already subscribed topic"
+msgstr "You are already subscribed to this topic."
+
+msgid "Already subscribed forum"
+msgstr "You are already subscribed to this forum."
+
+msgid "Subscribe redirect"
+msgstr "Your subscription has been added."
+
+msgid "Not subscribed topic"
+msgstr "You are not subscribed to this topic."
+
+msgid "Not subscribed forum"
+msgstr "You are not subscribed to this forum."
+
+msgid "Unsubscribe redirect"
+msgstr "Your subscription has been removed."
+
+msgid "Moderate"
+msgstr "Moderate"
+
+msgid "Select"
+msgstr "Select"
+
+msgid "Move"
+msgstr "Move"
+
+msgid "Split"
+msgstr "Split"
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "Merge"
+msgstr "Merge"
+
+msgid "Open"
+msgstr "Open"
+
+msgid "Close"
+msgstr "Close"
+
+msgid "Move topic"
+msgstr "Move topic"
+
+msgid "Move topics"
+msgstr "Move topics"
+
+msgid "Move legend"
+msgstr "Select destination of move"
+
+msgid "Move to"
+msgstr "Move to"
+
+msgid "Nowhere to move"
+msgstr "There are no forums into which you can move topics."
+
+msgid "Leave redirect"
+msgstr "Leave redirect topic(s)"
+
+msgid "Move topic redirect"
+msgstr "Topic moved."
+
+msgid "Move topics redirect"
+msgstr "Topics moved."
+
+msgid "Confirm delete legend"
+msgstr "Please confirm deletion"
+
+msgid "Delete topics"
+msgstr "Delete topics"
+
+msgid "Delete topics comply"
+msgstr "Are you sure you want to delete the selected topics?"
+
+msgid "Delete topics redirect"
+msgstr "Topics deleted."
+
+msgid "Open topic redirect"
+msgstr "Topic opened."
+
+msgid "Open topics redirect"
+msgstr "Topics opened."
+
+msgid "Close topic redirect"
+msgstr "Topic closed."
+
+msgid "Close topics redirect"
+msgstr "Topics closed."
+
+msgid "No topics selected"
+msgstr "You must select at least one topic for move/delete/open/close."
+
+msgid "Not enough topics selected"
+msgstr "You must select at least two topics for merge."
+
+msgid "Stick topic redirect"
+msgstr "Topic sticked."
+
+msgid "Unstick topic redirect"
+msgstr "Topic unsticked."
+
+msgid "Merge topics"
+msgstr "Merge topics"
+
+msgid "Merge topics redirect"
+msgstr "Topics merged."
+
+msgid "Confirm merge legend"
+msgstr "Please confirm merge"
+
+msgid "New subject"
+msgstr "New subject"
+
+msgid "Confirm split legend"
+msgstr "Please confirm split of selected posts and select destination of move."
+
+msgid "Split posts"
+msgstr "Split posts"
+
+msgid "Split posts comply"
+msgstr "Are you sure you want to split the selected posts?"
+
+msgid "Split posts redirect"
+msgstr "Posts have been split."
+
+msgid "Delete posts"
+msgstr "Delete posts"
+
+msgid "Cannot select first"
+msgstr "First post cannot be selected for split/delete."
+
+msgid "Delete posts comply"
+msgstr "Are you sure you want to delete the selected posts?"
+
+msgid "Delete posts redirect"
+msgstr "Posts deleted."
+
+msgid "No posts selected"
+msgstr "You must select at least one post for split/delete."
+
+msgid "Host info 1"
+msgstr "The IP address is: %s"
+
+msgid "Host info 2"
+msgstr "The host name is: %s"
+
+msgid "Show more users"
+msgstr "Show more users for this IP"
diff --git a/app/lang/English/post.mo b/app/lang/English/post.mo
new file mode 100644
index 0000000000000000000000000000000000000000..58fde8300077007e4b07e61d358b4877b2e39f52
GIT binary patch
literal 2395
zcma)-O=u)V6vta#bsax<*N^p+=fYwlcAJP`oESBUNeu4B!Hg0S!J6qeGbP<sy;aqj
z9lYsD#gpjKqbCs$dKL62g5bwhLA;3v!K>o`b<a$O7<C(Ze)Xze^?UW+t2aNMJoa9M
z=T5wL;r#>eS-f9gh95kyTpmR?foe<#UIY1!vHT8rJ>(C-6W~YSwczJq1N;iS4*X#(
z{|w#%`M0rr{EAvW1&Uq*%Kl|g>~4WKfP3ThJ}CAAcs2MsDEe=KH-hhj;@^j$?EhrU
zFF^VJw_por`w6@s^1_u-6oW5;vhPihz;{8h^C|c-_$Bx<c;TujItG3N&V%2Bw}XFy
zyWnX!bq|<<d*Iuk*!=|*KYs_G0sjQ$T-(R%^*vDRF^HwegO7r*fp>$SfwzI*foH*A
zLGk+poR-`@0gh7^orXMlWRJu}Vu2$^x8S`QFWjyCLK>=b1696+_;mG68H>-7FL~tL
zl4J2t&Ww;$X8<bSg}358h4-Wg@~mbVbyeXhXYW;?4<>xsd6l~%+DLVv!upvJW!z_z
z)=Q34?JC8*2qRLxz>a)yx`;M2Yg3Gs3(;1|K9Es4M^EdN$>%!L?4un!HGMD~f2GUD
zTc=H5v?l%>4F93kf|sPoagmLpN?_-#^Rr{prf2I3!$S(T(A`=r9Peu$*245ut?}%x
z&e#OPVMDYV)JXjCU8g&oM!S<?)V7u~Yx>hOO(!Pqx5Xe_tW9O5Q(3%eUGAG?ic0h=
z4=qzYT$wX;?+Pu>FE?7wN;=~0G=71d*VZ&?lT{e7TU%?io^8kL4kG5`r&Qo3VJ?0S
zW<+%|bx!#Zx1BORQ^7hYol~Y?BJXjVRX+1YdQ7FcHc$3y6P-?CUH|dM`R(%?2lf|}
zg~qxy0fC9zqXI?)UkncxnbKyNx&!4rhn45soAJ_to>=d(i#JTyrpRrRmO4629cdDq
z#$LR|hF$Gr%SzB`F<D9;#!4;5yS8*)UaxI5sWwvO&ZD4>v4Og94W5uS*+`092bH08
z0}9k9k~9hEC2AkK1qgd}CrB9-c-hI}AkJ(0sOYNj$|6M;(j?jr<e76%BRE{|fnQ#G
ztdi{!SGQ(uZQZ8qD_0Z39_>Zf>rTcL1}fkOQv+2L2uw;H?yAx=anet)#Heb-E0_Ae
zP};yWRGw1pyUL|A>aZuuxw@$HG9Rm^T!aDQvd>u(tp<!xC3M!qZ+M!D)qOZ&sZid-
zau_n3>Lfm)mS~GP1Yl;1geAC9rG*@m>LU?Jv?JGl2bRzw26i}U0t9EZM1^|R)hET_
zL-e98DKFs+3JhD+<W?pBzCx>2|3RFxkr<w~5bEhn68}J*h;h5C;#8#|!QI8pL?aY~
zlhRR>w)20>muh$124?M6^>S3#Y9m!Wn`L$=C#hQ*8Ad*lj1I#|CylqtF9Iipg51`9
zT<(DANE|tB)<yYW4X+BZ6zmZVkLFTq?h8^-xZ5K-Bey}!jwnfzGbp~gkCHUC`NQo|
zysfIY?zOmgb>BQRFJYKoMtCl56iG+%8>y_$DDV-t_K@Nu3su`uh>G0t*=9>~IKKP`
K^|bS0KKdIOKcS%j

literal 0
HcmV?d00001

diff --git a/app/lang/English/post.po b/app/lang/English/post.po
new file mode 100644
index 00000000..5472cbc5
--- /dev/null
+++ b/app/lang/English/post.po
@@ -0,0 +1,93 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "No subject"
+msgstr "Topics must contain a subject."
+
+msgid "No subject after censoring"
+msgstr "Topics must contain a subject. After applying censoring filters, your subject was empty."
+
+msgid "Too long subject"
+msgstr "Subjects cannot be longer than 70 characters."
+
+msgid "No message"
+msgstr "You must enter a message."
+
+msgid "No message after censoring"
+msgstr "You must enter a message. After applying censoring filters, your message was empty."
+
+msgid "Too long message"
+msgstr "Posts cannot be longer than %s bytes."
+
+msgid "All caps subject"
+msgstr "Subjects cannot contain only capital letters."
+
+msgid "All caps message"
+msgstr "Posts cannot contain only capital letters."
+
+msgid "Empty after strip"
+msgstr "It seems your post consisted of empty BBCodes only. It is possible that this happened because e.g. the innermost quote was discarded because of the maximum quote depth level."
+
+msgid "Post errors"
+msgstr "Post errors"
+
+msgid "Post errors info"
+msgstr "The following errors need to be corrected before the message can be posted:"
+
+msgid "Post preview"
+msgstr "Post preview"
+
+msgid "Guest name"
+msgstr "Name"
+
+msgid "Post redirect"
+msgstr "Post entered."
+
+msgid "Post a reply"
+msgstr "Post a reply"
+
+msgid "Post new topic"
+msgstr "Post new topic"
+
+msgid "Hide smilies"
+msgstr "Never show smilies as icons for this post"
+
+msgid "Subscribe"
+msgstr "Subscribe to this topic"
+
+msgid "Stay subscribed"
+msgstr "Stay subscribed to this topic"
+
+msgid "Topic review"
+msgstr "Topic review (newest first)"
+
+msgid "Flood start"
+msgstr "At least %s seconds have to pass between posts. Please wait %s seconds and try posting again."
+
+msgid "Preview"
+msgstr "Preview"
+
+msgid "Edit post legend"
+msgstr "Edit the post and submit changes"
+
+msgid "Silent edit"
+msgstr "Silent edit (don't display \"Edited by ...\" in topic view)"
+
+msgid "Edit post"
+msgstr "Edit post"
+
+msgid "Edit redirect"
+msgstr "Post updated."
diff --git a/app/lang/English/prof_reg.mo b/app/lang/English/prof_reg.mo
new file mode 100644
index 0000000000000000000000000000000000000000..c20bbbd19e3f9ba8d8b6e49836bffc40de556cb9
GIT binary patch
literal 5891
zcmbuCU5sQ!702%`iytEhiy$s47O)G`(zmyJc4t3kc9EIhnc0z@vDum31r`#j`&M_?
z&h1<6y>+{Hcrb?epa~C#L>`m`Vxlo>A~8H^^nsx92@_u21mpn|qY-0#;nDa%^>MqW
z89t0RQ}er3x9U{YIj8EJe(RQf-wW`ppnL&kb8irE@R@!1hv(*x1;NL`{ooDY0q`d9
zUROT`UWa-e{1mtXQvVHb3cL)`xHkA{Fav4)(~i$N{t&zc?Y{&+0sapB4EP#I<KA}s
zH~3l9X%doqJ4oXWf;9he@RML2q;YE?t?zNy{-om-NA36x$8S46>-fCmj~!of{FURY
zj;}dhb9~$J9mjVaX>+u`DaTtK?{u7YoN+wmxa`<)e9SR&OdPK|KJEC7<8zKLI{wu0
zWyjw-{=xBe$2UQ;*Iz->@4F!BbuTt?JGdX*50*f(!#vp769ntvJnApN2`+<gfDePm
zA>?N8JK!ns`yk2v6aGO(!C$~9!GD0C2hYLC_kmsT%iwpx5d1Y*1^*8I47}q;>o>m#
zzli!DL0aEG!HeMaSoG(>$H69;gCy@7h^d0>ut_XAxCwj(JOJJWz6nyl|9~M_!s2ON
zmq6M_hJOtF7D)5`2)q^i4M^wdb&&M)FObIXLFI1nu;Y1f4)q+Qd0qmi!8gD=!F^CF
z@gDFta1kVZJObVUeiOVG`~gVodIh9;-U4aAH{cM}z(XL_FM)@^zN<e6(t3XZ;xBmB
z@tSLY$JO_s6Yb|Vkk&r~lAbSswB8J){Xg&OFM~tW{|ug|epvihz@LBu{2TZLxQ@e2
z_W3yow=oZncu+#2eH=qMfii<a_MknSMmdV&pX>2bMj<^dqAa1*QRoUIolHJ3g?VVb
zq#Lq7J$q4L=HPymWt0_^BPgU_|Il4R`~MP31%+$}Q<;bM_W%l1Z){2aTt!(xIgWAw
z#Xo28a@beEd)zzel<W()4sJw&dzy!AcF?^;rREN#^D~QrBWZkh9z2Oc_Miu*Gd^M}
z6aSd2!wkWLC{rk8-(ZnPY_<L{m?R=%qQ_<ID|sf;g!e>HS4mr@J=W)07M$7G49;*Z
zSX-q%u7fk8&GQ({`@)T1A}K5u9g#%Ac!kZlY9_RnNr%-Y>XYA(OnjF~TLtHM(#d&8
z1m{$X$1>wus>Dy%z#3ViG{f3j-N00}QY`DLR0oYz4tQ&usXmR#{GbilVbm#BNhk1?
z9#6JeEEACho3dBz*StTa5@B2EjhSU#*sKRA_g8Ck)vA4)Dc+8Zy&Z91j}~o5=X~32
z(Kb8Qc68RtJ63!>R(w5Pw4E4x^CM0cZ72PRTGhAV&COdY){HmbR;<1@Gw0;hihb1l
z>ce8cVbzZatG*w-S$Sb~G{WyPtoj{=Rlkq0>i0o!eyra|SoQk|i+zN}>O-uQbnhIO
zEiTqoBu4es#^}A1i%gHIslcECjzFu+(`?jUxJ4m!%$wpo<#D)-gOJU!q;IO(>6v+E
zUr$db?5@+SR+^t`r0R-j>2Ng)FN!pS^Ubkk!F5-pi;Gi@uWg3)6jii`bhzdi+QRc<
zAgQZwI>$2|Zl*lRVy;z+PW~u_n}YYoB(hUH>dEB6ww<Ectf;i}z|`96+R|wLTBSOL
zqpd{(soQ-_s>M}(xF2(w%v(JOefq-Ya(H6Yk7jR+G+atrD#8(-V<(zY7YmtVBAI$5
zToH*#?HU_OL{hU_<wWHuzSwHGq4KmP>ZEI-=a`)&cvR&WuSE(w@C3(dfb(rGD0X3W
zy}}x?;F(|@#hSdeg)T6cN>eDd5^Q$e^}~1+!I~M{9+M_B3^7-nOqlMXit8)y6(U<*
zr68H(=734;J>~^j+5R^Cf5dtjl^s{=P^A&B)a_Vyx|(h90o0l?bI)L%Sg&Zeu|+n`
zqXAD^f@!*rn%k_#x=>@Ovg>`kp?ZSuCJ|#_ki%m*ShUSj(UF-|@lfh6l)?4He!ZSQ
zSSd?nD8`w!k%=5$V}bi->|<lc?)}cl4DPl~I-O8D?qg<cK}yRi!C4uJ-TF0ijlIQc
zXabVm$@}*vmx&NE-ZNlB#H8b4R~QE%-x=~m?=~Y=))Z_Y#gI2+SYyXRnMzIgp^0SM
zIE#@pwig-!0e*0XC~5jx6%HhaO-#7Sdu*Dbtld<}iLQ(S;D&GujK?FP3vMR%k#A)z
zQlpSq8Efz5nKnz&h=jOY*fDeLc?*_Ba6~kGzXLK&A4OU+IRQ;l35vz^cLrGss0r6O
z&LnH$3?epT_jWvaU&0R64&oE;0y}XrC$51U?rxkT^Fqk+56$cxu*(!(J`k*@QrO2#
zf$dNz$64Mrmg5c|(>e?UCo!H$XAO(9w@hq2l^L~V)?v)zjQZ`dq<o;lR@>|&9B6Vf
z<Ry8G+b+%&R3LDxk@2kwSwB?+xP1h-l&vls$~eXm8(jjp)ch?_38s;Jl-MOiHKc89
zDNj{j@TAOEQX!Hd#+x2CJt?s|?pXw{v3@j?Ewob!Be|{=O-pPEp0QJ;AH1_S#r#q4
z$!|ySZ57eOiKb+r#MV^SQbVjUkK1KjeLeU<(Sb%Rv^y{#F05i8<qjp*;9ENzjrb&z
z9AZ+*5E!?-q*-JyCAKd5Ja)1v>nJhgyq%awBI}mfVmHSWW%j7pLikN((#+FN(VK+V
zRZC@T6`?nYvNBuS<_T8ox=`|h?In?Fb!CDztgC^_WK*Wumg_=UO^J*_@>$(>TfhN?
z6(kOUGhCTHl=3W5+lY*#p|k;nOt^-#g*S5{z|BH=Qi*+)_h~Z^!Tqro%%y?VbSu||
zOiH7m-qHNdrdE#0t#*8NPEdTN(dTgP*;zFdu9cEVT4$_!NXV_K%IqR^ETIjp+<r`o
z34^G#t>P`$&xx=ew=Rb4F~LdIWwtD@Na&k)c;ubHB&0A2LRXjfyiuG8>xP@SpRnmh
zSBXSk^<AJ7-os6!y>pl}7CXV+;QJUcHmijOo`Mcx?mEY>8)R;gC>Q6!94uO+8)4VJ
zCZljcqgl(A`(RhJ(BrrqAj+M*$>EeJlba6PDo>&@x%Q|`$h5~`+$uJiE>5<a+j{02
zL~5jUuF?8pgSTY6SS01zI9F1)xWxV89Ni7DZnY5eYzs<V;k~AW6WcyT7aG6D)2}13
z=EX^|U!6al<wGuIxDbn6!{?z3rFJ-gP355lnM2XI50pK`HnFD@MmLeklW}*MpP|Nd
zbR3GDJ;QImZ4>ZX$ZoM~q;>eo*ETmRrMT{=tN8`0IdZLO`$M5bu|ki<0i+&T5sfCY
zp;0b(!TsDA&5QVE(oFlKk*3B0Uv2pG=)*;BA_n*gnE9nbDV+a}^5Ns(yQD%Dacnj?
z3b*XOGP~R4(w8a2c!EI%3Tfv5Gz%pXF0zk;?#%31RR7>~!u&j^e8TU#GH%YvG-c)^
L%k^o>NbG+B>1OB{

literal 0
HcmV?d00001

diff --git a/app/lang/English/prof_reg.po b/app/lang/English/prof_reg.po
new file mode 100644
index 00000000..9409aa33
--- /dev/null
+++ b/app/lang/English/prof_reg.po
@@ -0,0 +1,225 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Email legend"
+msgstr "Enter a valid email address"
+
+msgid "Email legend 2"
+msgstr "Enter and confirm a valid email address"
+
+msgid "Localisation legend"
+msgstr "Set your localisation options"
+
+msgid "Time zone"
+msgstr "Time zone"
+
+msgid "Time zone info"
+msgstr "For the forum to display times correctly you must select your local time zone. If Daylight Savings Time is in effect you should also check the option provided which will advance times by 1 hour."
+
+msgid "DST"
+msgstr "Daylight Savings Time is in effect (advance time by 1 hour)."
+
+msgid "Time format"
+msgstr "Time format"
+
+msgid "Date format"
+msgstr "Date format"
+
+msgid "Default"
+msgstr "Default"
+
+msgid "Language"
+msgstr "Language"
+
+msgid "Email setting info"
+msgstr "Select whether you want your email address to be viewable to other users or not and if you want other users to be able to send you email via the forum (form email) or not."
+
+msgid "Email setting 1"
+msgstr "Display your email address to other users."
+
+msgid "Email setting 2"
+msgstr "Hide your email address but allow form email."
+
+msgid "Email setting 3"
+msgstr "Hide your email address and disallow form email."
+
+msgid "Privacy options legend"
+msgstr "Set your privacy options"
+
+msgid "Confirm pass"
+msgstr "Confirm password"
+
+msgid "Username too short"
+msgstr "Usernames must be at least 2 characters long. Please choose another (longer) username."
+
+msgid "Username too long"
+msgstr "Usernames must not be more than 25 characters long. Please choose another (shorter) username."
+
+msgid "Username guest"
+msgstr "The username guest is reserved. Please choose another username."
+
+msgid "Username IP"
+msgstr "Usernames may not be in the form of an IP address. Please choose another username."
+
+msgid "Username reserved chars"
+msgstr "Usernames may not contain all the characters ', \" and [ or ] at once. Please choose another username."
+
+msgid "Username BBCode"
+msgstr "Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username."
+
+msgid "Banned username"
+msgstr "The username you entered is banned in this forum. Please choose another username."
+
+msgid "Pass too short"
+msgstr "Passwords must be at least 6 characters long. Please choose another (longer) password."
+
+msgid "Pass not match"
+msgstr "Passwords do not match."
+
+msgid "Banned email"
+msgstr "The email address you entered is banned in this forum. Please choose another email address."
+
+msgid "Dupe email"
+msgstr "Someone else is already registered with that email address. Please choose another email address."
+
+msgid "Sig too long"
+msgstr "Signatures cannot be longer than %1$s characters. Please reduce your signature by %2$s characters."
+
+msgid "Sig too many lines"
+msgstr "Signatures cannot have more than %s lines."
+
+msgid "Bad ICQ"
+msgstr "You entered an invalid ICQ UIN. Please go back and correct."
+
+msgid "UTC-12:00"
+msgstr "(UTC-12:00) International Date Line West"
+
+msgid "UTC-11:00"
+msgstr "(UTC-11:00) Niue, Samoa"
+
+msgid "UTC-10:00"
+msgstr "(UTC-10:00) Hawaii-Aleutian, Cook Island"
+
+msgid "UTC-09:30"
+msgstr "(UTC-09:30) Marquesas Islands"
+
+msgid "UTC-09:00"
+msgstr "(UTC-09:00) Alaska, Gambier Island"
+
+msgid "UTC-08:30"
+msgstr "(UTC-08:30) Pitcairn Islands"
+
+msgid "UTC-08:00"
+msgstr "(UTC-08:00) Pacific"
+
+msgid "UTC-07:00"
+msgstr "(UTC-07:00) Mountain"
+
+msgid "UTC-06:00"
+msgstr "(UTC-06:00) Central"
+
+msgid "UTC-05:00"
+msgstr "(UTC-05:00) Eastern"
+
+msgid "UTC-04:00"
+msgstr "(UTC-04:00) Atlantic"
+
+msgid "UTC-03:30"
+msgstr "(UTC-03:30) Newfoundland"
+
+msgid "UTC-03:00"
+msgstr "(UTC-03:00) Amazon, Central Greenland"
+
+msgid "UTC-02:00"
+msgstr "(UTC-02:00) Mid-Atlantic"
+
+msgid "UTC-01:00"
+msgstr "(UTC-01:00) Azores, Cape Verde, Eastern Greenland"
+
+msgid "UTC"
+msgstr "(UTC) Western European, Greenwich"
+
+msgid "UTC+01:00"
+msgstr "(UTC+01:00) Central European, West African"
+
+msgid "UTC+02:00"
+msgstr "(UTC+02:00) Eastern European, Central African"
+
+msgid "UTC+03:00"
+msgstr "(UTC+03:00) Eastern African"
+
+msgid "UTC+03:30"
+msgstr "(UTC+03:30) Iran"
+
+msgid "UTC+04:00"
+msgstr "(UTC+04:00) Moscow, Gulf, Samara"
+
+msgid "UTC+04:30"
+msgstr "(UTC+04:30) Afghanistan"
+
+msgid "UTC+05:00"
+msgstr "(UTC+05:00) Pakistan"
+
+msgid "UTC+05:30"
+msgstr "(UTC+05:30) India, Sri Lanka"
+
+msgid "UTC+05:45"
+msgstr "(UTC+05:45) Nepal"
+
+msgid "UTC+06:00"
+msgstr "(UTC+06:00) Bangladesh, Bhutan, Yekaterinburg"
+
+msgid "UTC+06:30"
+msgstr "(UTC+06:30) Cocos Islands, Myanmar"
+
+msgid "UTC+07:00"
+msgstr "(UTC+07:00) Indochina, Novosibirsk"
+
+msgid "UTC+08:00"
+msgstr "(UTC+08:00) Greater China, Australian Western, Krasnoyarsk"
+
+msgid "UTC+08:45"
+msgstr "(UTC+08:45) Southeastern Western Australia"
+
+msgid "UTC+09:00"
+msgstr "(UTC+09:00) Japan, Korea, Chita, Irkutsk"
+
+msgid "UTC+09:30"
+msgstr "(UTC+09:30) Australian Central"
+
+msgid "UTC+10:00"
+msgstr "(UTC+10:00) Australian Eastern"
+
+msgid "UTC+10:30"
+msgstr "(UTC+10:30) Lord Howe"
+
+msgid "UTC+11:00"
+msgstr "(UTC+11:00) Solomon Island, Vladivostok"
+
+msgid "UTC+11:30"
+msgstr "(UTC+11:30) Norfolk Island"
+
+msgid "UTC+12:00"
+msgstr "(UTC+12:00) New Zealand, Fiji, Magadan"
+
+msgid "UTC+12:45"
+msgstr "(UTC+12:45) Chatham Islands"
+
+msgid "UTC+13:00"
+msgstr "(UTC+13:00) Tonga, Phoenix Islands, Kamchatka"
+
+msgid "UTC+14:00"
+msgstr "(UTC+14:00) Line Islands"
diff --git a/app/lang/English/profile.mo b/app/lang/English/profile.mo
new file mode 100644
index 0000000000000000000000000000000000000000..59c8f7e636ece29c768e9fb9322345b6a5d0afad
GIT binary patch
literal 9585
zcmbW6dyFK<UB^3q;P{9k*yQ0PKwXmK?!xYD{77u?*~#tgy*AvQ*LS<VTrecPGc_}P
zH`6`t?zz1^_`?wq5f~6CLbeD=5D`yD3XzdOktL*vC{hGbhy(&DSP)*416KZuf*=x~
z@2{%oaqC2uTU+z(s;<Yce($P%{`Q-GE8)3Dc?;#gZcLI-gU{W<56|g+N%8~W8h8h|
z0rHo0_<1c@fcpLf_y+K!;17bIiueq88}&a2Uk`o})VQyMuLl1cd=2>RSih0M>i-&0
z?Qa4#-$8zE2k!x22c85)&tstG8-YIpei+m`9|J|#pMaY0bMgCMf|~blLH?5G`S~I6
z1rQRF{{gkmO?1+@H-PGYAlB~&Z=!w_{9*6}sC{pNcY;F@7A7AB`AeSUM|3_7ik{Da
zTJKp<<G%okj<12@$Mc}Z|0k&Zd^3LkE_f^TTOmsQ?f|v!TR@5GUQqKt2#O!8pyu5K
z)&D~ve@VuV=G_5B$1j7L_i2zNlHZH?Sx|g_4%9kd12ygiQ2Y5mQ2cr=lW3kd^P}<a
z0JZ*opw>MNYM+mQ;#&$bH0j3n8Wg`j0&4!JK#l)nQ0sgi)cCJNd>+&~FM`_N|AOj&
z3!OyI8$s>oZJ_!sf|`FBRR8tZelga&p!$~}QzgFuYQ87IH-o<eYM#FU#osT2qU*0g
zjr(U%`*{J>xbJ}cCAU%$-U;gaVNiN`AE<fG#`Z1nN2#}C{c5cL5-9$E9DF1Ax%mCd
z5&r>{-2Vd<JuiaV{|zwlX7IL%cYs>&PH^K@N#bJtahUQ9?N>pKdpncd11^E;-v&kh
zC9ndofj<wv2>yiHA(|zVUjbX-$HB+IFM}F)5aK2O`#|mgD9ESeEU52o@NHlPz8!oD
zWa{KOQ2o9NE`k3J$}hbR=83MmLCyC7cnCZNs^18de18}GBk(hz<g<nH{s#C#@Dt#-
zK+X5-Fjeb514=Ky3Z4i54unO?VT@UNe*~00o(E5X7r=wyr$Ev3B~bKy1(g1L9o!Fo
z6V(21dsCS2_24I|9|AuBehCzPZ$-(ZUkl(B@B#1u_^04u@bAGDP(+^vj)Cg`o8T(=
zN$|(OZ-7TZRel;+0iObY4O{~c{CJ?F0GTrRF!&_+3Gl7pVT3Ar&VbUNM?tOg7$`Ys
z@%uGU`}_zfzI`m#p9ZCme+WvSJ_~BT&x7K_UxAX(-+=1(kD%oIFQDl8Hi)Q`+g;GF
zL!j0<4XXVD2&u^sM6}7Tg3_Z;gNMOqL0Fpn6R35+13rPi-+(aG{}<Wh8u;6w*84Y5
z@{<yZf46||1rLDYvj@+Be+H`Gt5B8&@YSH?{VoualT}dP+p+x;C_1mk`cn~qAJl%H
z1s(VWQ2hPZh~EOmm+yiPfH$KAvWNGA;{SP2a_N9t?-I!NtS^w<Mfq9EaaDMvOZQPu
zQ|_m{gQDjViuNm;d6c3@@)B*@xAr8x7f&H&?)jNmYk@t=yC|q#a)ct=d7L61>5&d%
zO3At^@p(7cr#wdaNlHp-o_l$DI94#7<Oa%7iuV3NO7pyjm#a+$ly5&r*`%~7&9lgh
z^kX+RY=M_3;<27pisUFB>+u0hr}Zjbk)BAG4pQDp8B-i(hw>1mdAhvFXXug6AR6-l
zsyB~xy{7zJY`6>#C<O%-OD<4urfg6SQSPQlZ-0uiLeY~`9;95OpuUqwdbCZE{#KNd
zau4MM<^7cRQ8J3`<3@_?@fc-Dk!|Ve1V~2Ua(owjfFga<b1Hz@v2^?-<wKN<lw{@M
zGj44?S!vhVm9+NG57TVmDxcTMN@tkmE-z}Itc>eIZ&`QOb;pB2vO?#yjNm$c;A`J;
zrSD{=Z!^?B(_Xck_bl%g&HKRjeBNnl<I$i<_YAIFC#%x!f$t>8_*(CdJTLil4OPaK
zFO$`Nn)kd*14*%F`)EFm(yE$$caebABJXD9Fw*}$TEiN#XYO}gm@PD<bynog_Qqs&
z+OC<bhJ{r#+i~Mf5}+Y6*0$L~Bqg?timI-f&bD&=u#=W~miLkqCLdd{d9CVljQEPY
zieE4LUALWfVl6HZdXGmPq})kPW&@v`EXwVy)A6~hvzq#;vKWut&=0qLS@p9~L))JA
ziJaF~A4%5o83NYwE9oHXxE;S;WvJ8ExiiW8(rqS8&ZJfCw7<YEt6s_I73)5|;@$Qj
z%`YcsincK}SwDX^SuZ-iOzWbgU+B7C(6bAZ*~nQ05@fA66V2J85ol@}JoHtS_IyHn
zSK9`wtS6|4BeYB!Ta>#rO!fQWK_^VMk@m7&hG8s^HOV}(bt5h7EFHL@#K{Jl)^z2q
zk%Tojyq~R1)p-M+7dbOsr#~Cw7^W~9q`PtE*_MV3>CN<W<wm|_1MGUEEVOIHnvW-y
zi2%>}bdaY*pPci(tg1a9!Yt>JMsgm`Xs^b{Ni7mHsl#5}1x%<WO@Zao*JcXnvF+_?
z$m-o`TZt2Dt6sZd(V5uL`F^nzO@}p9$%gE0?p-pC4Z(=4-?XtBW`nF5QjNE(cA1TW
z)mYEE7-elH$a-#=US+mx?4Qc0^j9*!qj&URTv}^*i=1jcG%7La=^h{BJeS%i@X`S8
zF7=c1^)9lALbD1>&Jfdl+AIn;NK525d1JNAYCBoSJItY<_4+i3?5Vi7^2>R#lbd;n
z*ex@7*DcENu$r$;b#Kc&Fkj6PM@KqWYv|g-;X1rrc13ctTE`sR%w*~^DvKd|pKq0-
zxik-!H9MnyFay(!>?Y`Jav^w;1{Hx^Iv5l?82*K_$dQgb`^B_h6v_5(jd(}dRgWTW
z48~<TSj58(t7VsutXe&E_YoIfA3Bt~{SUdj4j<Wvfm}k*7uPzAkFq%WzU)r=wC?-z
z*s*;Z4{t86mQ-n9JdPt+cC;;?Ln+j?X_7Zv+$__)8pu`A=?p<>jFK*H`gAxmqkGV-
z>1a1BvAx|Y%HDhSt*@=0n67_U>z(@)Pq3@SO(Ng2tNqn_2_KN<M_jv~mX)s`+S)w1
zc>lDYR`2?9@kEZsVSCH&{_U)u5VGuizVH2ur+gmV>9X4>h}X5dt95_tUcQ9t;`w4+
zwmo4~Yb?94$Rtn5V}{UAE4S?l9kP8#b^yOzHS+DOo8d#!PN&2#xSg!-qqx%u;czE1
zU`Ci4$+c>z0;~D)W@yW;bsf}o3SZ?1k$Z`A@NTylyEb979iy$rnsNsxg_VU^k?zS~
zhRCpu_UyW7{oAZuIDf^LyS!jVHhGLtt(cuONlMW24$Zj3klkdJOI<Z&%HWRJM_RLE
z>P#KIB)k~s1Tf8ATD}sMJv5lBVypPOF@9bO&e$|3fM>lP!<aLF1#24LMVT!dSGgE@
z7h)BwG&|Yeb?rgczKqhCFa}wE89Feumic0vB<{KiMMZR;D}fndP7i}Nk%+1IL>AH&
zhFLP#ELn|5qoS-scMDJ~;_6b$gH$4kuvjc9x<+iUd`kseZe^y1AWH9gS$Dx*8u?!E
zF?p{=R14u<8~er+e_#ouWmVrhXKeIuHecK+O0p@;5#NXVLia3fG`2Juq4ilCYEx;B
z-QY7i@DSZZ7vv&ELs)x0>zr$wn{8v@)5=elGxZXec3416ik?>{V3Pz2jjBliZqkXE
zQ#Pq(^zp}o?>;mquL>I->>gH#QG#ky$Bt4=Qzqj>2$^UMVp1<BK@Zc8Z#B!<*b5<b
z-S5IA7=$@_IJv|UVLD7Y>OO7*2Z|!e{<YgS&K)l3^ZcH}NUi5k;0YBAroxkHZ8K(&
zw$}~>=3{dM7;8$9l~n6&2+@`zFS`Sk3@$jM#+n;1Hxc=qgOeqN1C+8QSx?JdgmklM
zv#hCEk;F=1VS4S4^wZ0;vAI1SF|HD<Wa?d`qns|OJaY%;XSn`S`K;v!H2A9{@>`f0
zb*c1=rGI=3j}=99Y{ItUbirjC-%Zt&VOI+;$J5Rz-X1@mz=(2w3DXk`9x)|uh4Y9!
zhn+-B?!*;KN6pg{LJ$_l6b~%2wpktr9Z7LBT|yv3!$d8t*tEygv#0aT-cwFRs*B&!
zS>{5Yh$f)~!lL&K*~o%@XcPjb+Q9*LwVk#vOM0e(%DIEMW{yB}`@vYUa7t?JIU1Sr
zO;1LlIz1R^6?PH>UdMOS@c<V(JuYSKvZ#t~?N-|DV$2ynZhxnrwfiv%40IYps(vx%
zpreS>c+*0Ow-N;3a%ailmffbzTOPrsqmfc*Q4u>8WrZi!DXVezh-t8s?pDZHhcxaA
zl$#E-O4*WjuB9R+QLTMR2sZT{=ZX=UUotT}Y2u0<-6m@MGNS+4CZVt+qVh!Z(AN<=
z^*h0t%I)MBk0Lf?gvKeyf)1Ej69F)yp^l>cY`8?Wr~$JYIMun9i~!y2m=~*XL|7>5
ztaBMU9iv?<o=oH6qCLiv^IG|eIYjX;CdRE~<MhVM;#i=m_KHg>dCnl7tWo#8Js9IU
zQ!-+*N=q;uf{>i#6f6?OQ)QDeS;*HONb<r7Js5V?N}2=nOsJHb%g4G*(0nmiSo&|%
z%FK4MsxK0C!cu1FQ`9t=(2P%^L1%CyEM^^Y6@iZ!pz%@e&$M(DPUP^d(VdCf)Nml}
zv0E4z6@q}J#7ibnb0pCn#k(!R#uw`-GT@ZK_(^Xi8f`^oA_8|8IPUA6bE9gFHy7Ej
z#6PD&1aak8;+D<xPRN;L?2Xg45T#t210(x{$01!uFy;K(6K+Mnh_{>-4}6-vxkzH*
z7OU7hIWmc)!bl#j6Bc4J7_&`y8FR@6M9*zXd(6pKYR@@AeZpDa)ZY|GDpWOxZUU6K
z<Y9W*o90MlWL{k)>C2h)HLhXyCUw)ymLwz_n$=vby-hAj=59<Hrjb%|M|0hki4C?J
zlNtAd+>_(s-X=LQy&_q++bC8~nj4?Vi;mPA^H(78<|}Qt85XWS%&mm{&HSltf{jkE
zMJBA;(;B?~gm>|~JaS-#P4d#6;{A!k%z9-yBA~bonPU1jNOQczt%{n1<tOXhstkPI
ztNUWttc@)>`<CTCh+#E&zNwI#OPJ-ETbPxZ&jhIEBsR)Or_A4QV8(G{)%sd<HQNtI
z3sdjFH2M0h4o+Q$fV;(6U6Mmcw~H~q`7Ti%O_8%2WS0qwNUfias*ns=_*A=`SQu^7
zchf5vkuE^(3P{<QwO3r48{L?5eUPkqq=9_eFH%C6Mmn~Fs6rm@*s)c@vdip9tPRC@
zEyu0+JT;sUTSIQ7(UlK@RQC;B2ob%-6WL~*W64|8?XW*gM%jSOb%#tyM`NSHt_kL;
zBeN<9Dv&ncZpS~{v@*wzU$AKx?7YzDNF-*4&9DiGP+C8;nW<f)S0PT?{M^Ek*O7D)
z47ouI_h=Xd7lmQ{**mo6XsRIb{f?G)!4{6#aD^+<^lCO74;y-HD|>@X-CWH{bRopF
zNRkv0ERiA1+kJ&3WYfkzHr@9lNB4Smz|^rwmwVI@RyZ&0p)FijuAm<A#t-%|u4r4{
zFwOX9V&2x=UEoPw2~HC^SF$2^$P-7m^-`CD!R<p+ybZAZO!yEk1nm@a-Sr?5V@oH*
zcrQ2~K;&@d?glN1P=B?Wb3IUDE!STQUc@M`*CA-((1bf^((hnjwsK&;Cu0tmhef>P
Wx5GrZMcnV?pYc-s!(#42@&5r|czkyN

literal 0
HcmV?d00001

diff --git a/app/lang/English/profile.po b/app/lang/English/profile.po
new file mode 100644
index 00000000..bbd7f00b
--- /dev/null
+++ b/app/lang/English/profile.po
@@ -0,0 +1,378 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Profile menu"
+msgstr "Profile menu"
+
+msgid "Section essentials"
+msgstr "Essentials"
+
+msgid "Section personal"
+msgstr "Personal"
+
+msgid "Section messaging"
+msgstr "Messaging"
+
+msgid "Section personality"
+msgstr "Personality"
+
+msgid "Section display"
+msgstr "Display"
+
+msgid "Section privacy"
+msgstr "Privacy"
+
+msgid "Section admin"
+msgstr "Administration"
+
+msgid "Username and pass legend"
+msgstr "Enter your username and password"
+
+msgid "Personal details legend"
+msgstr "Enter your personal details"
+
+msgid "Contact details legend"
+msgstr "Enter your messaging details"
+
+msgid "User activity"
+msgstr "User activity"
+
+msgid "Paginate info"
+msgstr "Enter the number of topics and posts you wish to view on each page."
+
+msgid "Pass key bad"
+msgstr "The specified password activation key was incorrect or has expired. Please re-request a new password. If that fails, contact the forum administrator at"
+
+msgid "Pass updated"
+msgstr "Your password has been updated. You can now login with your new password."
+
+msgid "Pass updated redirect"
+msgstr "Password updated."
+
+msgid "Wrong pass"
+msgstr "Wrong old password."
+
+msgid "Change pass"
+msgstr "Change password"
+
+msgid "Change pass legend"
+msgstr "Enter and confirm your new password"
+
+msgid "Old pass"
+msgstr "Old password"
+
+msgid "New pass"
+msgstr "New password"
+
+msgid "Confirm new pass"
+msgstr "Confirm new password"
+
+msgid "Pass info"
+msgstr "Passwords must be at least 6 characters long. Passwords are case sensitive."
+
+msgid "Email key bad"
+msgstr "The specified email activation key was incorrect or has expired. Please re-request change of email address. If that fails, contact the forum administrator at"
+
+msgid "Email updated"
+msgstr "Your email address has been updated."
+
+msgid "Activate email sent"
+msgstr "An email has been sent to the specified address with instructions on how to activate the new email address. If it doesn't arrive you can contact the forum administrator at"
+
+msgid "Email legend"
+msgstr "Enter your new email address"
+
+msgid "Email instructions"
+msgstr "An email will be sent to your new address with an activation link. You must click the link in the email you receive to activate the new address."
+
+msgid "Change email"
+msgstr "Change email address"
+
+msgid "New email"
+msgstr "New email"
+
+msgid "Avatars disabled"
+msgstr "The administrator has disabled avatar support."
+
+msgid "Too large ini"
+msgstr "The selected file was too large to upload. The server didn't allow the upload."
+
+msgid "Partial upload"
+msgstr "The selected file was only partially uploaded. Please try again."
+
+msgid "No tmp directory"
+msgstr "PHP was unable to save the uploaded file to a temporary location."
+
+msgid "No file"
+msgstr "You did not select a file for upload."
+
+msgid "Bad type"
+msgstr "The file you tried to upload is not of an allowed type. Allowed types are gif, jpeg and png."
+
+msgid "Too wide or high"
+msgstr "The file you tried to upload is wider and/or higher than the maximum allowed"
+
+msgid "Too large"
+msgstr "The file you tried to upload is larger than the maximum allowed"
+
+msgid "pixels"
+msgstr "pixels"
+
+msgid "bytes"
+msgstr "bytes"
+
+msgid "Move failed"
+msgstr "The server was unable to save the uploaded file. Please contact the forum administrator at"
+
+msgid "Unknown failure"
+msgstr "An unknown error occurred. Please try again."
+
+msgid "Avatar upload redirect"
+msgstr "Avatar uploaded."
+
+msgid "Avatar deleted redirect"
+msgstr "Avatar deleted."
+
+msgid "Avatar desc"
+msgstr "An avatar is a small image that will be displayed under your username in your posts. It must not be any bigger than"
+
+msgid "Upload avatar"
+msgstr "Upload avatar"
+
+msgid "Upload avatar legend"
+msgstr "Enter an avatar file to upload"
+
+msgid "Delete avatar"
+msgstr "Delete avatar"
+
+msgid "File"
+msgstr "File"
+
+msgid "Upload"
+msgstr "Upload"
+
+msgid "Forbidden title"
+msgstr "The title you entered contains a forbidden word. You must choose a different title."
+
+msgid "Profile redirect"
+msgstr "Profile updated."
+
+msgid "Users profile"
+msgstr "%s's profile"
+
+msgid "Username info"
+msgstr "Username: %s"
+
+msgid "Email info"
+msgstr "Email: %s"
+
+msgid "Posts info"
+msgstr "Posts: %s"
+
+msgid "Registered info"
+msgstr "Registered: %s"
+
+msgid "Last post info"
+msgstr "Last post: %s"
+
+msgid "Last visit info"
+msgstr "Last visit: %s"
+
+msgid "Show posts"
+msgstr "Show all posts"
+
+msgid "Show topics"
+msgstr "Show all topics"
+
+msgid "Show subscriptions"
+msgstr "Show all subscriptions"
+
+msgid "Realname"
+msgstr "Real name"
+
+msgid "Location"
+msgstr "Location"
+
+msgid "Website"
+msgstr "Website"
+
+msgid "Invalid website URL"
+msgstr "The website URL you entered is invalid."
+
+msgid "Website not allowed"
+msgstr "You are not allowed to add a website to your profile yet."
+
+msgid "Jabber"
+msgstr "Jabber"
+
+msgid "ICQ"
+msgstr "ICQ"
+
+msgid "MSN"
+msgstr "Microsoft Account"
+
+msgid "AOL IM"
+msgstr "AOL IM"
+
+msgid "Yahoo"
+msgstr "Yahoo! Messenger"
+
+msgid "Avatar"
+msgstr "Avatar"
+
+msgid "Signature"
+msgstr "Signature"
+
+msgid "Sig max size"
+msgstr "Max length: %s characters / Max lines: %s"
+
+msgid "Avatar legend"
+msgstr "Set your avatar display options"
+
+msgid "Avatar info"
+msgstr "An avatar is a small image that will be displayed with all your posts. You can upload an avatar by clicking the link below."
+
+msgid "Change avatar"
+msgstr "Change avatar"
+
+msgid "Signature legend"
+msgstr "Compose your signature"
+
+msgid "Signature info"
+msgstr "A signature is a small piece of text that is attached to your posts. In it, you can enter just about anything you like. Perhaps you would like to enter your favourite quote or your star sign. It's up to you! In your signature you can use BBCode if it is allowed in this particular forum. You can see the features that are allowed/enabled listed below whenever you edit your signature."
+
+msgid "Sig preview"
+msgstr "Current signature preview:"
+
+msgid "No sig"
+msgstr "No signature currently stored in profile."
+
+msgid "Signature quote/code/list/h"
+msgstr "The quote, code, list, and heading BBCodes are not allowed in signatures."
+
+msgid "Topics per page"
+msgstr "Topics"
+
+msgid "Posts per page"
+msgstr "Posts"
+
+msgid "Leave blank"
+msgstr "Leave blank to use forum default."
+
+msgid "Subscription legend"
+msgstr "Set your subscription options"
+
+msgid "Notify full"
+msgstr "Include a plain text version of new posts in subscription notification emails."
+
+msgid "Auto notify full"
+msgstr "Automatically subscribe to every topic you post in."
+
+msgid "Show smilies"
+msgstr "Show smilies as graphic icons."
+
+msgid "Show images"
+msgstr "Show images in posts."
+
+msgid "Show images sigs"
+msgstr "Show images in user signatures."
+
+msgid "Show avatars"
+msgstr "Show user avatars in posts."
+
+msgid "Show sigs"
+msgstr "Show user signatures."
+
+msgid "Style legend"
+msgstr "Select your preferred style"
+
+msgid "Styles"
+msgstr "Styles"
+
+msgid "Admin note"
+msgstr "Admin note"
+
+msgid "Pagination legend"
+msgstr "Enter your pagination options"
+
+msgid "Post display legend"
+msgstr "Set your options for viewing posts"
+
+msgid "Post display info"
+msgstr "If you are on a slow connection, disabling these options, particularly showing images in posts and signatures, will make pages load faster."
+
+msgid "Instructions"
+msgstr "When you update your profile, you will be redirected back to this page."
+
+msgid "Group membership legend"
+msgstr "Choose user group"
+
+msgid "Save"
+msgstr "Save"
+
+msgid "Set mods legend"
+msgstr "Set moderator access"
+
+msgid "Moderator in info"
+msgstr "Choose which forums this user should be allowed to moderate. Note: This only applies to moderators. Administrators always have full permissions in all forums."
+
+msgid "Update forums"
+msgstr "Update forums"
+
+msgid "Delete ban legend"
+msgstr "Delete (administrators only) or ban user"
+
+msgid "Delete user"
+msgstr "Delete user"
+
+msgid "Ban user"
+msgstr "Ban user"
+
+msgid "Confirm delete legend"
+msgstr "Important: read before deleting user"
+
+msgid "Confirm delete user"
+msgstr "Confirm delete user"
+
+msgid "Confirmation info"
+msgstr "Please confirm that you want to delete the user"
+
+msgid "Delete warning"
+msgstr "Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by this user, the posts can only be deleted manually at a later time."
+
+msgid "Delete posts"
+msgstr "Delete any posts and topics this user has made."
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "User delete redirect"
+msgstr "User deleted."
+
+msgid "User promote redirect"
+msgstr "User promoted."
+
+msgid "Group membership redirect"
+msgstr "Group membership saved."
+
+msgid "Update forums redirect"
+msgstr "Forum moderator rights updated."
+
+msgid "Ban redirect"
+msgstr "Redirecting …"
+
+msgid "No delete admin message"
+msgstr "Administrators cannot be deleted. In order to delete this user, you must first move him/her to a different user group."
diff --git a/app/lang/English/register.mo b/app/lang/English/register.mo
new file mode 100644
index 0000000000000000000000000000000000000000..f076b7ec197bfa69d341ed5f2390572d16f257ad
GIT binary patch
literal 3064
zcma)8O>Z1U5FH?VnGhg+BnKiD5+8|_nZ#BCW`iSQCq@<tG4Tcg2c+Ja+SwsJ-Anh3
zmqp^hg%e0{KwRL2#6LhBI3OX8hzkceAkIkq1|(i}&wB0PAVwL#?Vj$gS5>d7^T*)>
zpCx#X;(Z+N?|7fW`^9begXi?^NpdG}5qKByIpF=k^WFGzhg-k}%)beI0LZ}mfNh5#
z0Pn^4<8J&p@L`O<0v-f@+kO8Lcn`)uci(>n3b((2hk*y~i0h94#m<u*p6T#nhkf8C
zd?<jz|C<Am|98MgG5!H~7T<pZ{*Cb=I5z|yygNyb0X<Ooe+tZiUjknS{sc^cM?vxk
za2+V)w}77jKLX-katzLje@_Effj!_a!1sY?fUhE03iu)L6!1^r*TADNx(xgtC@FXZ
z?}K>d5r089_#?T1Yrz&E#7OueOgj&#247`DxJcd}lEEz=P)iQ&`X+gioJ!mu!z=zK
z7fQ#RtSOVTPS&g$R<0(lRi%@Q>~mU-u#{YqIjYRic0Y}6s8&rrO4hAwYjUk-pS)tp
z@Pr(fKG{^>#~tC9=8{d3T;r1RU=OQ`%5mPrIa`l4Hyj3$0hU(2VJB1g;Z##uL+qS&
ze!sbBY|rAMwiY&p8+8P(dv-?EOgS5GU9vMS+A+i7z2l|%xZA&}Tc>miuWR2UGY&()
zvUHB(&z0kbo>-y96XzB-oqZerr5i>18aog6Jz8hgjM%NNE^J=yr)v&F%%>Ms!#%=W
zdX2X$Svs4#tbCL9oibjl#yTvztW4RelG8q`de@2cf-36Dyf};|27}DH^8CV;jVqVt
z_7}6$3rKXs2B%KPFxv3D&8e|gl{rWGNIB2V%Ju$wx;$Se)`#rUOD4BPWy&5c52|K|
zNRQYoyq><qhLI%UxM`8wh8DBs><qrdVY+2om-AY*(W7YOKQu_HC>;Bnl0B)krV^AI
zn%b6Bo?{6$mK2$`9<U=jB#A+by`)S5y^YnN(p6Jo!b<ojm1k;=+J>stKyya@5o2oD
znq2ZB!p(JCFkv;t%~P=v+>$d37PZpY`o^Ec$XBHiKCnJ9B%?q8`&A<xA#Y{GepnN>
z1#WelkEpf|6gGyzp^@5#Ni(H)TK18Q<5D>ZJdUe84MW9=^L}JoU6ArOumj;j`eUV7
zmnEyL?S!yi$&NZ4UbnuXp+wNO4V)zF3PcQ^!A7XIjIN>^gvHA7&NLTcsxv4O4dHh*
zb{6Le;{uDfE0n*)tf+=i3{*zYQv>S3b18ihnJHt)L4|eUX%MJdqo-&pH;|e!Nc&oW
z=UBN$GAh62;C~&bG<t-%5+fVwWXT%{Pw*BT@Lkci(p3?g+e}ypT-*gU6}E<T^eE9V
zyd9%`O%NRldK-vgID<gNj7DW<T{rB6iu4xffV0+^?dgsEdFqf8StQaOOKfIMbEnJs
zEVNIt@1qwW03m5cH=t)jovIvup{-d{W+W{(u9l?b3R(tVB&phFoF)4hRT?58716c&
z5VCw^v3AGdy{$F&YRyG<(|p&jGm=1yQ3J7QTb77jWwNA?EZ+#4f%tZ01ZTqz=w=q*
z5t1-q5SRxT<j0&>5C^o~MOw-Onky`O^9*9=99#?M2Th@+As|5^u{`z^17g?F=l!n}
zls}3@qhKT*@s2@OU>_Mr>~rhns=|1{IDc+<RyMulLdar^>xCw8Y4!nICRH<v+Le1}
zV{_(HC%^C=`W1C+$uEl9p(9z;7H^B{;#u7V816K%JUJHxic0p7gc5uuwBXrHB&xgj
zqIEc1@1~N`7Cf6ug9y`Td)B~a#b^S%ib%<S6r%cf2Wr0tg3P0UXSXaA7IlX>;OGX|
z40^C(G@j7*x@%aXBw~k>qgEkGs1jv6ZzQubvt-NGEN4h>)3`#5>AvBfZMZcf9MD*c
zc3tBhkeKhL9=b;~KZ_ema4?<6T{tK`hSJ-bU6m_6uS`0w()Yy6)9Ldk{-0ZW%XA*Y
RSt^%8lU+JHHxkP~`3D%zqaXkP

literal 0
HcmV?d00001

diff --git a/app/lang/English/register.po b/app/lang/English/register.po
new file mode 100644
index 00000000..7cde2e42
--- /dev/null
+++ b/app/lang/English/register.po
@@ -0,0 +1,84 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "No new regs"
+msgstr "This forum is not accepting new registrations."
+
+msgid "Reg cancel redirect"
+msgstr "Registration cancelled."
+
+msgid "Forum rules"
+msgstr "Forum rules"
+
+msgid "Rules legend"
+msgstr "You must agree to the following in order to register"
+
+msgid "Registration flood"
+msgstr "A new user was registered with the same IP address as you within the last hour. To prevent registration flooding, at least an hour has to pass between registrations from the same IP. Sorry for the inconvenience."
+
+msgid "Agree"
+msgstr "Agree"
+
+msgid "Cancel"
+msgstr "Cancel"
+
+msgid "Register"
+msgstr "Register"
+
+msgid "Registration errors"
+msgstr "Registration errors"
+
+msgid "Registration errors info"
+msgstr "The following errors need to be corrected before you can register:"
+
+msgid "Username censor"
+msgstr "The username you entered contains one or more censored words. Please choose a different username."
+
+msgid "Username dupe 1"
+msgstr "Someone is already registered with the username"
+
+msgid "Username dupe 2"
+msgstr "The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username."
+
+msgid "Email not match"
+msgstr "Email addresses do not match."
+
+msgid "Reg email"
+msgstr "Thank you for registering. Your password has been sent to the specified address. If it doesn't arrive you can contact the forum administrator at"
+
+msgid "Reg complete"
+msgstr "Registration complete. You are now logged in."
+
+msgid "Desc 1"
+msgstr "Registration will grant you access to a number of features and capabilities otherwise unavailable. These functions include the ability to edit and delete posts, design your own signature that accompanies your posts and much more. If you have any questions regarding this forum you should ask an administrator."
+
+msgid "Desc 2"
+msgstr "Below is a form you must fill out in order to register. Once you are registered you should visit your profile and review the different settings you can change. The fields below only make up a small part of all the settings you can alter in your profile."
+
+msgid "Username legend"
+msgstr "Please enter a username between 2 and 25 characters long"
+
+msgid "Pass legend"
+msgstr "Please enter and confirm your chosen password"
+
+msgid "Pass info"
+msgstr "Passwords must be at least 6 characters long. Passwords are case sensitive."
+
+msgid "Email info"
+msgstr "You must enter a valid email address as your randomly generated password will be sent to that address."
+
+msgid "Confirm email"
+msgstr "Confirm email address"
diff --git a/app/lang/English/search.mo b/app/lang/English/search.mo
new file mode 100644
index 0000000000000000000000000000000000000000..1f68f853019433a51326c94ee5a3f1f980c6b99e
GIT binary patch
literal 4068
zcma);Pi$009LGlmh2r0eB7!ie<?rs6B34|ep%e;@P%7OTxrnpx&2}Gs``$V;+jSGp
zc)@s3qtR&8Xf)BpfEP8KOgvynO!T52NW93+7!M}Ki{IbOyxnfMRVO>|v-AHqzxn-s
zGuQf8yvC4*kvAe=y@9a_@Z3%KAicYSvDM&v;BDY1;631%;Jx5?;Ck>^@P3f3bnP2J
zY99joz+>R8;IuD42d+VR4!j*~f_H=GLF)G=cnkQEFMkH!f%0W=EqE2Y6Z{2S1^xk&
ze1ChczS+&Y4kUTEg7<+3K$3R`+zh55?fYfVPr(OJz5?RMuH!@d_zfhvRzfJ!M?Xk%
zZv;t>T_Ek}0Js4>=G#M%_N76R<3$iZ_BK8w?}s4G^SQ78+Lyoe?LUEcq5V2Y`~M3h
zeXho)iEBYxcQZJJv)cudeCP0?`Oky2zgNNS;6;$+_!-;+{tnXkeoVFw+yv6R!}vgz
zY}A*Jg4FL6Nb)`lZUSo{$#(%Hy}biI4qgTy1^@KSVenp*%iuWpI+z2mfdz04lsgC(
zK{CCwAn8BxY=ETab0DT<FM$}!-T?7qAK*j%FM?!;Uw~!s2M}9i!%)Wa;6aei^AflU
z`nm!>hVu8=6z!`IN-l!yLDEkN#E;G6L;5%m(mEGF90hyDm*4X3?}N17$G-g%Nb-IK
z_JiMmB=?UXmbZ1JcS@wMJ;<cj8<8oIF38@=riPJ8CQ4*ev_2(FWfRFyiR_!wpo9IA
zOmzNGhqZ?x5L>r<B7IPL1bHVi$xG>B<gLg9$Ye8=wjt9w>_Fzo*5^Um6WIaj=0Rlg
zEjriT$a!S)J+hA+GNoM()+P`-x)My-ribV|ssovXQ8LR$8>X5nuBA{xl^tsFa%!qv
zSJNgJn%7fpbWg2G>rr5<=VYsys!;b1=xON;YG{cC7q8G&>pLHoZ8^tN)u?4+9!<GP
zt#Hi!wf)(XPMWOO38}T1m0Tnt*NyU785ow;rAgdklPRx8*dLh4rr#_IN<urPQ+CSX
zb*XBR)=`?!2+XJh71a&Ob_#=L`=^nJL^q|9A@#HSa(c{4es@nbqF~MoYxQvkQn21y
zC(e=$^*EAxiI#5RdZ%0<;u4KGpEFM4Wg7hkrk&9^a3}*Rhy;)2ER2i!>PnoZ?Lw4f
z)ltHuq>?Tub`M+FSZl;4s>hO7$Ov@TKqWO=bvBPLF4d(im$N)J-DQDUDcf4A3@^9X
zv?CYRP1;2(NV`P3;wGxec1>n(b~qeFDpn$=;nwbEtOGdZO~nl*;ylc|ri(nO+oB%X
zv!A=aBij?cWrPpy*xxs$QnKOvM3{eCDzd{OAD6;Zr8;z|Z|Y<zKc-Mbeg3d8vdB@F
zKPBfQ>Y7y@7uw`Y3Kkj*lPYvNE|S>>{3KtJqPAd0en5n^C^=YhOO(rnRLwrocVgni
zk<R)<h24E)X=30n`BJNnMU8yH4Ax^2CHr|$6-rApGE*AQ@9XrV)hklvk0e1#L8!?0
zl_S#@q{wB`_e}n%Or&x$PNg!83?C}&E9^y!E9R%uh6?1ETcgO`BFl!hDGFsgfUFP=
zi}Gy)dRq=>%m=hP9L<{%VxP7A<vK1o%YP4NZrpN<x%$P?&c`;A=l_H`QoN0I)`WW^
zo^7_~cN%)j!j6)rp%NML#Kpn_E5V!)Gm%l{yus<E9U{4ol0fnnO%ubMI9Zq}bcIn~
z74wpprA&BDgwoCcmxryoA$#`nD#q&qgETxu08Wh?(}}Va;}JdWARmIs78^>El#zC!
z6$~0m!2siyoyEt#GB$+?MAGuRa7$UaP>=q&g@i#=pe>|{<o?Pc9S-736p8nGnkHL6
zRf{y#iKO0e>@Fdc4H1hvJJZ5xn~wOTlx4bm?f+Z<N!%Etfr;j&H8ET{)9zlP?K`uY
z>0C!kSfT6VVl_Krm0}OpZ#WC;Y&6r<04{q8H^QZ#>9Q`g##x&t9k&}Ob%9TjYH{=e
zuDf6qUB^bXd`I#`F$<S0WFZ`P#8@>=F%qh5R->TmbV&xsn`t8sc^u8bEZV0+Ge#BH
zE^u*oTIeur-1Pxj=XlM(3Y<SE``)3oV}w>LN5<bC568|<9(wZjk;`lcp-$B}EXCgZ
zolzuifltf2K={IJ^e%8Nr0XIe&ENvyqmzeo{NyR?v6ClDG+fC_1Up=y{{rulz}-TA
zeexxGTqL3<d0Me<;yW~}q&{bDR%?;2E|!mEXhv}u2o>5uEduh0og_Vn=q3^|eAfh3
zNX#ZG6b`ISYa1N2RhSHOT*PtKfcat=LS_SD`%JT2`ZSI(fMW&jfawPAl8<g%`&{!a
z3Ocd(d;5f_0jiph@L=;cnoVx6@azE~w2QeuHfJ}pfA6w!dP&$G{^IuU!=4M<8&2=V
F{STjGN0I;l

literal 0
HcmV?d00001

diff --git a/app/lang/English/search.po b/app/lang/English/search.po
new file mode 100644
index 00000000..0f2f643b
--- /dev/null
+++ b/app/lang/English/search.po
@@ -0,0 +1,174 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "User search"
+msgstr "User search"
+
+msgid "No search permission"
+msgstr "You do not have permission to use the search feature."
+
+msgid "Search flood"
+msgstr "At least %s seconds have to pass between searches. Please wait %s seconds and try searching again."
+
+msgid "Search"
+msgstr "Search"
+
+msgid "Search criteria legend"
+msgstr "Enter your search criteria"
+
+msgid "Search info"
+msgstr "To search by keyword, enter a term or terms to search for. Separate terms with spaces. Use AND, OR and NOT to refine your search. To search by author enter the username of the author whose posts you wish to search for. Use wildcard character * for partial matches."
+
+msgid "Keyword search"
+msgstr "Keyword search"
+
+msgid "Author search"
+msgstr "Author search"
+
+msgid "Search in legend"
+msgstr "Select where to search"
+
+msgid "Search in info"
+msgstr "Choose in which forum you would like to search and if you want to search in topic subjects, message text or both."
+
+msgid "Search multiple forums info"
+msgstr "If no forums are selected, all forums will be searched."
+
+msgid "Forum search"
+msgstr "Forum"
+
+msgid "Search in"
+msgstr "Search in"
+
+msgid "Message and subject"
+msgstr "Message text and topic subject"
+
+msgid "Message only"
+msgstr "Message text only"
+
+msgid "Topic only"
+msgstr "Topic subject only"
+
+msgid "Sort by"
+msgstr "Sort by"
+
+msgid "Sort order"
+msgstr "Sort order"
+
+msgid "Search results legend"
+msgstr "Select how to view search results"
+
+msgid "Search results info"
+msgstr "You can choose how you wish to sort and show your results."
+
+msgid "Sort by post time"
+msgstr "Post time"
+
+msgid "Sort by author"
+msgstr "Author"
+
+msgid "Sort by subject"
+msgstr "Subject"
+
+msgid "Sort by forum"
+msgstr "Forum"
+
+msgid "Ascending"
+msgstr "Ascending"
+
+msgid "Descending"
+msgstr "Descending"
+
+msgid "Show as"
+msgstr "Show results as"
+
+msgid "Show as topics"
+msgstr "Topics"
+
+msgid "Show as posts"
+msgstr "Posts"
+
+msgid "Search results"
+msgstr "Search results"
+
+msgid "Quick search show_new"
+msgstr "New"
+
+msgid "Quick search show_recent"
+msgstr "Active"
+
+msgid "Quick search show_unanswered"
+msgstr "Unanswered"
+
+msgid "Quick search show_replies"
+msgstr "Posted"
+
+msgid "Quick search show_user_topics"
+msgstr "Topics by %s"
+
+msgid "Quick search show_user_posts"
+msgstr "Posts by %s"
+
+msgid "Quick search show_subscriptions"
+msgstr "Subscribed by %s"
+
+msgid "By keywords show as topics"
+msgstr "Topics with posts containing '%s'"
+
+msgid "By keywords show as posts"
+msgstr "Posts containing '%s'"
+
+msgid "By user show as topics"
+msgstr "Topics with posts by %s"
+
+msgid "By user show as posts"
+msgstr "Posts by %s"
+
+msgid "By both show as topics"
+msgstr "Topics with posts containing '%s', by %s"
+
+msgid "By both show as posts"
+msgstr "Posts containing '%s', by %s"
+
+msgid "No terms"
+msgstr "You have to enter at least one keyword and/or an author to search for."
+
+msgid "No hits"
+msgstr "Your search returned no hits."
+
+msgid "No user posts"
+msgstr "There are no posts by this user in this forum."
+
+msgid "No user topics"
+msgstr "There are no topics by this user in this forum."
+
+msgid "No subscriptions"
+msgstr "This user is currently not subscribed to any topics."
+
+msgid "No new posts"
+msgstr "There are no topics with new posts since your last visit."
+
+msgid "No recent posts"
+msgstr "No new posts have been made within the last 24 hours."
+
+msgid "No unanswered"
+msgstr "There are no unanswered posts in this forum."
+
+msgid "Go to post"
+msgstr "Go to post"
+
+msgid "Go to topic"
+msgstr "Go to topic"
diff --git a/app/lang/English/stopwords.txt b/app/lang/English/stopwords.txt
new file mode 100644
index 00000000..907a2600
--- /dev/null
+++ b/app/lang/English/stopwords.txt
@@ -0,0 +1,175 @@
+about
+after
+ago
+all
+almost
+along
+also
+any
+anybody
+anywhere
+are
+arent
+aren't
+around
+ask
+been
+before
+being
+between
+but
+came
+can
+cant
+can't
+come
+could
+couldnt
+couldn't
+did
+didnt
+didn't
+does
+doesnt
+doesn't
+dont
+don't
+each
+either
+else
+even
+every
+everybody
+everyone
+find
+for
+from
+get
+going
+gone
+got
+had
+has
+have
+havent
+haven't
+having
+her
+here
+hers
+him
+his
+how
+ill
+i'll
+i'm
+into
+isnt
+isn't
+itll
+it'll
+its
+it's
+ive
+i've
+just
+know
+less
+like
+make
+many
+may
+more
+most
+much
+must
+near
+never
+none
+nothing
+now
+off
+often
+once
+one
+only
+other
+our
+ours
+our's
+out
+over
+please
+rather
+really
+said
+see
+she
+should
+small
+some
+something
+sometime
+somewhere
+take
+than
+thank
+thanks
+that
+thats
+that's
+the
+their
+theirs
+them
+then
+there
+these
+they
+thing
+think
+this
+those
+though
+through
+thus
+too
+true
+two
+under
+until
+upon
+use
+very
+want
+was
+way
+well
+were
+what
+when
+where
+which
+who
+whom
+whose
+why
+will
+with
+within
+without
+would
+yes
+yet
+you
+your
+youre
+you're
+yours
+http
+https
+ftp
+www
+com
+net
+org
diff --git a/app/lang/English/topic.mo b/app/lang/English/topic.mo
new file mode 100644
index 0000000000000000000000000000000000000000..b5dbc93c8358f0e216f8001e84e2d1a83cfc13cb
GIT binary patch
literal 1487
zcmaiyyKfUg5XKi09x>q+-Y>BfkpkijK`4qY7@;_Eu$06maR_vr@7DIg`PSOqOJe>2
z3K}X9H5C<UC=dvV2GOLVp`)RsrJzCLo4a%3M1rht?zgX*`F3}{5A;4~XlGz&VZUI5
zu(cidp*`5i*ly4Pd%;G^Cb$b@1s(=h!2RG;un&9*_Jgm$z2GWH{_ns&;75?+eg-q(
z8n_SqmahK*$^U1%{u`uxJw1$}%lg1WU_VIl&Vdwf5TyK<LGm8~DQ+I5eI>Arvn_(O
z|20IBu2uXf{@axAK|0qb@DlhHJOKUy2f%)8rgNPK$!`chik}53?g&Wd%BADm>3Rty
zU5g;;@<4p7g&!obrF8x=Nb#S56z>^$0(=3I{~M6}KY*0?3rJ5!IZwil!KjgDEXA=7
zf^=u}PTh^}i{78&(%DYKI_*f>p}Xib%6l9}x=z99JxCkr!1cuEI10vXLIlDHHtG3>
z6_jkUsYqzUie>J2o)TK~K-TNRV@1t%RMoEXs~Al?+HgTmGt%R(42_b3X0u|M`xvoV
ziJ+xgE$~Ayj8T^GQKA*J8Fe)`vgNz1ti+NpmO<Hs7mu`1>`vsnk9Z5)(4|;&^woWB
zgc4rrIfq!j&{$|mW!QX29;;Ab?gmmr>O#1#n=Oi}_7SZdM9K-Qf>cdy^RN{Ub?(|2
zPrA9GkYC90;frG#$a*MTV--E?u29;Sq0I}zF%6-{$1~+p#mXxTF>g&cM%Wy4)*OyR
zTRT&9T~<Xop$;4)6*f&fVLfu{!m0?T*%guBaJ;4;-l`=js@1Gi^_!WQ;>_em{^9J^
zOdfYGLPTx1kkp73bEOqHemKV6hNHAFxrIu>8r|4O*=s^slc6g;Kdjq)wCbC6AvPCb
z=AJbrLZK3kWl0arhqI&E>sU#K*1U|AEAmMWn<q)w)-tmHSx5I}#2qEL8z}|-LA$H0
z@UGl6{7z-87a3l>+NMfNq;0OZxJanp?ClE9{$H&nh1n@KyQ|u$9~WBO*;Hv;1aDh+
Fe*tICQ3C(~

literal 0
HcmV?d00001

diff --git a/app/lang/English/topic.po b/app/lang/English/topic.po
new file mode 100644
index 00000000..bca23a6f
--- /dev/null
+++ b/app/lang/English/topic.po
@@ -0,0 +1,93 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Post reply"
+msgstr "Post reply"
+
+msgid "Topic closed"
+msgstr "Topic closed"
+
+msgid "From"
+msgstr "From:"
+
+msgid "Promote user"
+msgstr "Promote user"
+
+msgid "IP address logged"
+msgstr "IP address logged"
+
+msgid "Note"
+msgstr "Note:"
+
+msgid "Posts topic"
+msgstr "Posts:"
+
+msgid "Registered topic"
+msgstr "Registered:"
+
+msgid "Replies"
+msgstr "Replies:"
+
+msgid "Website"
+msgstr "Website"
+
+msgid "Guest"
+msgstr "Guest"
+
+msgid "Online"
+msgstr "Online"
+
+msgid "Offline"
+msgstr "Offline"
+
+msgid "Last edit"
+msgstr "Last edited by"
+
+msgid "Report"
+msgstr "Report"
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "Edit"
+msgstr "Edit"
+
+msgid "Quote"
+msgstr "Quote"
+
+msgid "Is subscribed"
+msgstr "You are currently subscribed to this topic"
+
+msgid "Unsubscribe"
+msgstr "Unsubscribe"
+
+msgid "Subscribe"
+msgstr "Subscribe to this topic"
+
+msgid "Quick post"
+msgstr "Quick reply"
+
+msgid "Mod controls"
+msgstr "Moderator controls"
+
+msgid "New icon"
+msgstr "New post"
+
+msgid "Re"
+msgstr "Re:"
+
+msgid "Preview"
+msgstr "Preview"
diff --git a/app/lang/English/update.mo b/app/lang/English/update.mo
new file mode 100644
index 0000000000000000000000000000000000000000..18d61df2ff3d7f864483f458fe703aa3bbddb701
GIT binary patch
literal 7678
zcmbW5TZ|-C8OIO0URXpF<f3>vyRys-PWSFC7k6hbz}{fuUdG*7kPu?3yH0l(R9E%Z
zshZi@CyDWaXwU?CFc>e1nivve)L@VYP0*O&i-`$F6L=sRg^*~}7<^FtednC2>6spM
zwKLWKIj5`6`L6%(JN4p~TOL<@4sgAnYs;IIIs?A?X1@6Bd5cn4f_noV2e&f*BzOh*
zAox!30(dp}2>3qmtKjwEkHB|>&x6;1e+>9~n7`(&N?ptRG$_B{0lovgH((6Djq$mF
ztDwm9Fevwb5xfk161)ohA$T453sB_y9VqMl4HWq<VKI^CT2OwU0k?pA!}uU5_nidg
zxfpyqcn*~3E`<5df$w4brGVc7*+M-FiankKWu4!E9{~RZid>hon2c`(Wqbq_{T~S9
z3KYE_1?Bl~g5rv2K(YIeL6Pe@@N)3ipzQm5Q0(w(7{3OJUayDomP?i5PhG|rrdL;k
z^85AR;w4IHu+8`!n}~hC28zDl2Sv`Gfj5CKf)8{5rEGRT<If_D$oU6Q?*AwF4e$zt
zdj|XgcpdkTFv<esM=-kR_bc!z@D=cT;Md=!)Zf7+7C8le3?Wv)C%_843g?P`kAULm
z$N72;{5JR*@Bq#byF3d%$9}&A#m-N#*+KAWQ1pHc6n*{$eh|DC<I8imfvBbqgO7qI
z!~6@N<i;!D7r<#A7P~(Uei!^XxB{MkuTr;ze+Ey3yGQ~9ej5BO_%iqa_*0VN9&kI!
zb{<>>zYP8b6hD6+p+%0zK#}V!pzQY~D1Lq#6np<9jGqU^k1vGrOCYXPFN31*U&HVJ
z05OaE$hy;9a^GGqR8u!|-NyAHE==xhydRw9n&G;EOYB7$yExea%BSVQeedQQbEutM
zH*yhrj#B`IS=2tRU0k?YX)f_6Zg6@7YMu)*Cq5q@n-QHp8pdJ=%;`RobMnE=?lToo
zY$Ns*8$xX^Mz?|T`3TodTzj}~;UW~>N9;To{;%Nx|7_>Fm5b0)>dttWWQi?{sLTtU
zXX&asJctTwO5M$~WmDKB&(vY}Z<%EMv43?^njzz&Fx^s{qR0!Y4p$5_9%hlKTbe?%
z)aJ7~$$I%4{FFu=ld2<88FeCS^eD1+B`@O18NbNHjXKLqqmE`#CpF`WOw4G%(@~K=
z+$d`5%A&gR(;}yy8z1ae3t3snq(>PqM`;r4Uc!dX7R^*Ge3(8FC0S{*DC-(E_P-t)
zYoq?Ab6&|4X4pZf=Ejp|#fh0kL!(aS&g2{X#_WdOnW;u`RMtYC6gw>zW`xg0Z|Bp~
zrc)(p?8aGa&eyZDQ?SfwbFNAX6RR`bA{mvss4^QAJX1zR8Fo=;s%{s>dR3aPhPhas
z^?oUHo#x$#!eeKhSjt1A<XQaSwmo#{a30rEH?wzD#<IELu4NO~E7i{|Eb3lf45JX8
zs(Gvv#cL5-%ia7MSEDrPuGy&hq0B{MtmGZMZr%=ZwDv#T<I_eD6U*k^L72WTuXI!x
zu~jCv^*48-Ovz^byhw~yU6WZtQKFqep7oM`MRH0OqDwWjs-J5tmxyCjzsReRRioUN
z3MV3hvPnOS%BnD`%tuLARaiqUrYw@Sj$sWuud|UG+5@}yY5(tm=}d1spyy`xZCxz#
z2TADGLfi^^%<E$&DhH-GbZG11sioH8f*}I6NINsHnQNUk%ZV^WJ#{>?WoxO3GMfsq
zaMST9>sQ2gYso~zu@&|HNGRxzp5LO=Y3D`%;MNlhCyuV|KiA&16%Hb8Sao&8rlmPw
z?i{7$(!M(I51d^(*4ndnpX}Z<MeAtR%_WxS^`1^rHiFD+lWqM(>n@WSM}G5qF*k8i
z>bdrw_AUJ4hpjVtRdh`t#d+;FQA>lwYFnC-262qWKDv`fMXa4Z>nL^Gf96!Z!|Inl
z^{sJg-7$BA)jM|cB|j{&b}vuUe5DB+t20Bu69^q4ILE;zo>%*!aw7ELraU~qe`okv
zFZ7(mqaqnb#VRc5y+c^(RTLJLs-ft1H0!5{9n8wK?naqTO|)!ynBPb&Q9Cxhs7gx>
z16HQ3@6J~Yg=1DHy$x$+1jxGeNSZ1oZSkzP;JUJ*^EVK36u}zAbu8kF1Wwwv-fxBn
z?=qz$a3|o3*uqIICaT~mryTs}>x#{FoM%&|ez1Z@`jCm;wtpw9XyL_q?YxYlMPNIP
zVwvbAo90N~ti(+&GTQ1+2#<|wqeyH7oxPY==R94kB-Axo=HgXuZ(b}Xi=tYB_f5gp
zL+_wk-$4B%e8}!=W^dGJs>MoD4)n?(fxM2T)%in*^h#tgw=JVIHE~-4C`1IM76T1k
zb(&>AOu?Te?Y)DX$)`M(wMT=|lq-^L6;>E$#4{g1P65)>Q5Nfgp+f3`1Y3riY87e;
zXJ9U;1#z%mNmqhh%@A=-gs{$!L-DaWPgg=I^1LkeZ&qG=uAewJhg4Wc!a?>r%_jPZ
zu@t)(4Y0AaAS9}oC79p(lDU$k>8y@=68q530Q(LjN}LGQ1RVKVbz$=;l|ae*#!AkQ
z%RO7SEgH`_UaYfXO|v5RfzaKoJCg-{?0P$)Z|M8PkBuZgo2RH>)u>-Yt~=<-!u8E_
z?cME$e<lpGMm^JYXg2am3asy3X4;|M^1_U@WJ~0Zalr@|xe8kAFWhMJx<d(07skrF
z=uI%=j<MyO>>;+7kzLYy2#qDgm2Yx<@D-*HnX_rET~eU#s<z26Nu$EuC!uC%CAlTK
zhVuCKPTtwBC5pFqo_(sby{!%z*jwxwY3Q^RYLmij5i8fdh_2C*d62KI7kzMd2YF6>
zN3i``v*)*pNKILyt<N?Kxm+UThE7<*A*#xpP^X)b{)<v!r8yVN4cU{3F-2fYGpy;>
z$61@IBWb)At9AIge0Gf6<c=6y;sTG-tQUFL#55rEKm7qEB6<i7vQ<(54>_|($bqU(
zWl8{Mh|S1kE~au%>2@UbEmQy$#O%(X68bi|0R4Iv-YCcs$LGxUIl>UxL$|x`P%^4f
z{ZJEm9mAdOgn$_;<ZG)Vbn(J$G&z#Cjaot`l8baXLWDjC^KLc7qOKjfT{sakoQ3<O
z1LoPnKy%?_(CpdpOj|pOs9fV6s82SWypzBrW^kXQZ0u6gm~b-w9E}VaBvN^@-C?ID
z_pO-|XUQQza@f@5E(&{obfws>(uh$%crm+<ooF^a-7KMBIO$*@8VF%Q(JW3Z?cAzQ
z1D_hikVH)50~xsBvNmM5bb)>aDMG9w#~7AK6GD!}tt3aKIVSHU+6I+y?5fZ}N$aTZ
zUOI6+1bSFlQk0O`td*m1b3AS;pX6GEE^;XIzLsZ^!-YAKM+*;AM4h}Ub<1htVwIE+
zDoadicWy{mx2bi<xw^hAoLD?{dg;!SOSC0*>lQdm>P2iyT6M9Rn9|jl#k&`YlI4WX
zM<SE{hLR!Hah23oBRM2E6~(U9Sl1h)hon8{l`+Oghd7jmK%COz`wSM!ZqE0ir4cDI
zy>RAKYtNor_qOIFzH70DhHhL8<Rpb^W%td?k+<U5I<s|@uDIOB&F)x_c!4f`)I000
zB@aKls^&Z|@$Jm+tl$+RafVS=2{Yo<@$8lWh;s=ye?xu37`K8H79{EA6@eA#AQ0d<
zQ?%t|KAA~G+j0_fe7<j8vmK?vIs}dM3av74@g&-c)v!w7V%gcTT2it&ZR+^>ef_~<
z;vg@YHMgkKu2lF!q^9d5{ft^zqm(B3U|nAd5Tq8fW5h<Bvvh}&Na@WpLMpW!0-!=C
zb8x2fHa+KT-L=)0Cxlai*oA{5#wobVC#xh+pDb1DUMP$itTC&!rgoDT4Q<WcF5xqZ
z?+)7@d-JeTNT(S*Ca)oyn(J(9rG7~+Nt*e4BljkwX}@^;(WS>-)s4hi-l`2CkshL(
zx?3OkCya?ezGnKI_R$dXyU~uNppaJH3(-Kl)#V_txC=mD7zh!$q>y6fogjfPOeI@y
zay)JP;g6T@w(;;K#HDX>t4e1RJQemud@8f+e}a|WTSG^!6#Tl{I+iB#XheLo5%sN}
z_Ahj1*fJa=ef~oIu=|GgM_3i*q%6p8LfO7YlaV{Om16PwJ<xxDeo}67Ib^X&DxwRQ
zEpnQVS@t4Cnq0E3GOjNdx~n<U>Zw`n`@{P+8To*mq;rlt|6TAiA<NLV&cclis*AE<
zDG7Sto7EE%5Oo*9BJxTrG_xCSbTJkuJzk-B%6E<;(UDb}Q;`^MN=J}BO;8~{=9-F}
z;aV3&w_UBhGZSi2?PXo5PisCMGoW-kQnPT%Q2H}hSa#pKw!C%k;U?A%aWd_SswrmP
zcy%cvwH~`KdR=+>w|?1sHoWTdMr?A|af6g#dC6c6O*W~--Zdjcb!ls!u-yT@IdtX<
zHKiSkJ0=ZO<yp8bRI%=5qGR>?C?;=?+V#>qZss*oIK~k*wbs52+`?~&ggnw(aWa!)
u=vY&HP<M$0O{g0}4#cx-cu|C0G4*=@*Ht;<QUB*VO^IC30{`3F&3^;$i$!<<

literal 0
HcmV?d00001

diff --git a/app/lang/English/update.po b/app/lang/English/update.po
new file mode 100644
index 00000000..6611a073
--- /dev/null
+++ b/app/lang/English/update.po
@@ -0,0 +1,195 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Update"
+msgstr "Update FluxBB"
+
+msgid "Update message"
+msgstr "Your FluxBB database is out-of-date and must be upgraded in order to continue. If you are the board administrator, please follow the instructions below to complete the upgrade."
+
+msgid "Note"
+msgstr "Note:"
+
+msgid "Members message"
+msgstr "This process is for board administrators only. If you are a member there is nothing to worry about - the forums will be back shortly!"
+
+msgid "Administrator only"
+msgstr "This step is for the board administrator only!"
+
+msgid "Database password info"
+msgstr "To perform the database update please enter the database password with which FluxBB was installed. If you cannot remember, this is stored in your 'config.php' file."
+
+msgid "Database password note"
+msgstr "If you are running SQLite (and hence have no database password) please use the database file name instead. This must exactly match the database file name given in your configuration file."
+
+msgid "Database password"
+msgstr "Database password"
+
+msgid "Maintenance"
+msgstr "Maintenance"
+
+msgid "Maintenance message info"
+msgstr "The message that will be displayed to users during the updating process. This text will not be parsed like regular posts and thus may contain HTML."
+
+msgid "Maintenance message"
+msgstr "Maintenance message"
+
+msgid "You are running error"
+msgstr "You are running %1$s version %2$s. FluxBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue."
+
+msgid "Version mismatch error"
+msgstr "Version mismatch. The database '%s' doesn't seem to be running a FluxBB database schema supported by this update script."
+
+msgid "Invalid file error"
+msgstr "Invalid database file name. When using SQLite the database file name must be entered exactly as it appears in your '%s'"
+
+msgid "Invalid password error"
+msgstr "Invalid database password. To upgrade FluxBB you must enter your database password exactly as it appears in your '%s'"
+
+msgid "No password error"
+msgstr "No database password provided"
+
+msgid "Script runs error"
+msgstr "It appears the update script is already being ran by someone else. If this is not the case, please manually delete the file '%s' and try again"
+
+msgid "No update error"
+msgstr "Your forum is already as up-to-date as this script can make it"
+
+msgid "Intro 1"
+msgstr "This script will update your forum database. The update procedure might take anything from a second to hours depending on the speed of the server and the size of the forum database. Don't forget to make a backup of the database before continuing."
+
+msgid "Intro 2"
+msgstr "Did you read the update instructions in the documentation? If not, start there."
+
+msgid "No charset conversion"
+msgstr "<strong>IMPORTANT!</strong> FluxBB has detected that this PHP environment does not have support for the encoding mechanisms required to do UTF-8 conversion from character sets other than ISO-8859-1. What this means is that if the current character set is not ISO-8859-1, FluxBB won't be able to convert your forum database to UTF-8 and you will have to do it manually. Instructions for doing manual charset conversion can be found in the update instructions."
+
+msgid "Enable conversion"
+msgstr "<strong>Enable conversion:</strong> When enabled this update script will, after it has made the required structural changes to the database, convert all text in the database from the current character set to UTF-8. This conversion is required if you're upgrading from version 1.2."
+
+msgid "Current character set"
+msgstr "<strong>Current character set:</strong> If the primary language in your forum is English, you can leave this at the default value. However, if your forum is non-English, you should enter the character set of the primary language pack used in the forum. <em>Getting this wrong can corrupt your database so don't just guess!</em> Note: This is required even if the old database is UTF-8."
+
+msgid "Charset conversion"
+msgstr "Charset conversion"
+
+msgid "Enable conversion label"
+msgstr "<strong>Enable conversion</strong> (perform database charset conversion)."
+
+msgid "Current character set label"
+msgstr "Current character set"
+
+msgid "Current character set info"
+msgstr "Accept default for English forums otherwise the character set of the primary language pack."
+
+msgid "Start update"
+msgstr "Start update"
+
+msgid "Error converting users"
+msgstr "Error converting users"
+
+msgid "Error info 1"
+msgstr "There was an error converting some users. This can occur when converting from FluxBB v1.2 if multiple users have registered with very similar usernames, for example \"bob\" and \"böb\"."
+
+msgid "Error info 2"
+msgstr "Below is a list of users who failed to convert. Please choose a new username for each user. Users who are renamed will automatically be sent an email alerting them of the change."
+
+msgid "New username"
+msgstr "New username"
+
+msgid "Required"
+msgstr "(Required)"
+
+msgid "Correct errors"
+msgstr "The following errors need to be corrected:"
+
+msgid "Rename users"
+msgstr "Rename users"
+
+msgid "Successfully updated"
+msgstr "Your forum database was successfully updated. You may now %s."
+
+msgid "go to index"
+msgstr "go to the forum index"
+
+msgid "Unable to lock error"
+msgstr "Unable to write update lock. Please make sure PHP has write access to the directory '%s' and no-one else is currently running the update script."
+
+msgid "Converting"
+msgstr "Converting %s …"
+
+msgid "Converting item"
+msgstr "Converting %1$s %2$s …"
+
+msgid "Preparsing item"
+msgstr "Preparsing %1$s %2$s …"
+
+msgid "Rebuilding index item"
+msgstr "Rebuilding index for %1$s %2$s"
+
+msgid "ban"
+msgstr "ban"
+
+msgid "categories"
+msgstr "categories"
+
+msgid "censor words"
+msgstr "censor words"
+
+msgid "configuration"
+msgstr "configuration"
+
+msgid "forums"
+msgstr "forums"
+
+msgid "groups"
+msgstr "groups"
+
+msgid "post"
+msgstr "post"
+
+msgid "report"
+msgstr "report"
+
+msgid "topic"
+msgstr "topic"
+
+msgid "user"
+msgstr "user"
+
+msgid "signature"
+msgstr "signature"
+
+msgid "Username too short error"
+msgstr "Usernames must be at least 2 characters long. Please choose another (longer) username."
+
+msgid "Username too long error"
+msgstr "Usernames must not be more than 25 characters long. Please choose another (shorter) username."
+
+msgid "Username Guest reserved error"
+msgstr "The username guest is reserved. Please choose another username."
+
+msgid "Username IP format error"
+msgstr "Usernames may not be in the form of an IP address. Please choose another username."
+
+msgid "Username bad characters error"
+msgstr "Usernames may not contain all the characters ', \" and [ or ] at once. Please choose another username."
+
+msgid "Username BBCode error"
+msgstr "Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username."
+
+msgid "Username duplicate error"
+msgstr "Someone is already registered with the username %s. The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username."
diff --git a/app/lang/English/userlist.mo b/app/lang/English/userlist.mo
new file mode 100644
index 0000000000000000000000000000000000000000..74d6b6eaf7013ca1abd4270b4dcbf6b1c58fd784
GIT binary patch
literal 898
zcmY+C!H&}~5QYORAc6!4t{jHjf=EgchbpBAwzO!a-KAo?2qX?T@gy~*c4WK2-Z>(1
zLgG>2%meTSh&!*qf#1z;yIA@(p7D%llHb3sZhVQb&V%b<3NC_AAgpiT0{9L>{0F!K
zeu5bM2EqRWE`h&batgWN4EC>1N6}^2*Ra=M8`x0y5%w$WXV{mpn@C1UbQXlQ0m4k@
zf^%YpJ5drvkLsEhj;)LK44IM|<GhOw5TR0ONi|ojWgDohSv2j|v9QIAlrGItz*yh9
zlX_uAos5m0yNq<Rblu=?pW5wUQ`3zBb#M0Li8XJy@X5AJo?`@MbVg$qe#UldE1o=^
zCPNDs@#L}aoDpKlGk&K+>TzgCIG;?d(5@EVSS0NTT`fe#$&|(X#Eo=c$hp!F%eF<H
zr^Z$f;@$1t(Yk*(y%P_O_N;O1VS}cgKln~l3#I#1%!GC92M5z}(p%?+?j_q~qzfaJ
zt}^Q7%C82=h;{rTdBU1)JLAN#RGzwNFTID8)=l=!!WKMidt}r$2@*wni+K)7RsxNK
zHUhZt-&+BfqO}^0Fux_SJkVm!<P9B3RvH{=*$HNOPRo*zQK~wW<%cOvXS^;h71xpq
zp($rPh|*JD3;i}FbR>vH?^P`eVUdH;MG-E!MWIn6tXHC@x$wn|T^jAL#zh+nqunM6
kX~}Y>912+y>h%AgyZln6Nw@-!5&yR%`FM+T$u^Dt0lG5+eE<Le

literal 0
HcmV?d00001

diff --git a/app/lang/English/userlist.po b/app/lang/English/userlist.po
new file mode 100644
index 00000000..4f7d81df
--- /dev/null
+++ b/app/lang/English/userlist.po
@@ -0,0 +1,33 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "User find legend"
+msgstr "Find and sort users"
+
+msgid "User search info"
+msgstr "Enter a username to search for and/or a user group to filter by. The username field can be left blank. Use the wildcard character * for partial matches."
+
+msgid "User sort info"
+msgstr "Sort users by name, date registered or number of posts and in ascending/descending order."
+
+msgid "User group"
+msgstr "User group"
+
+msgid "No of posts"
+msgstr "Number of posts"
+
+msgid "All users"
+msgstr "All"
diff --git a/controller/admin/bans.php b/controller/admin/bans.php
index 66fc80c5..6423631f 100644
--- a/controller/admin/bans.php
+++ b/controller/admin/bans.php
@@ -19,7 +19,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\bans();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/bans.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/bans.mo');
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
             throw new \FeatherBB\Error(__('No permission'), '403');
diff --git a/controller/admin/categories.php b/controller/admin/categories.php
index a14c6467..affa990b 100644
--- a/controller/admin/categories.php
+++ b/controller/admin/categories.php
@@ -19,7 +19,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\categories();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/categories.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/categories.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/admin/censoring.php b/controller/admin/censoring.php
index 634e2401..396c4089 100644
--- a/controller/admin/censoring.php
+++ b/controller/admin/censoring.php
@@ -19,7 +19,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\censoring();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/censoring.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/censoring.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/admin/forums.php b/controller/admin/forums.php
index a23f3fad..425a857f 100644
--- a/controller/admin/forums.php
+++ b/controller/admin/forums.php
@@ -19,7 +19,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\forums();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/forums.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/forums.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/admin/groups.php b/controller/admin/groups.php
index f02b6be7..bd5e75f8 100644
--- a/controller/admin/groups.php
+++ b/controller/admin/groups.php
@@ -19,7 +19,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\groups();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/groups.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/groups.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/admin/index.php b/controller/admin/index.php
index ce49946f..74dbfa95 100644
--- a/controller/admin/index.php
+++ b/controller/admin/index.php
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/index.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/index.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/admin/maintenance.php b/controller/admin/maintenance.php
index 6b6fbe1a..21762614 100644
--- a/controller/admin/maintenance.php
+++ b/controller/admin/maintenance.php
@@ -15,7 +15,7 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \model\admin\maintenance();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/admin/maintenance.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/admin/maintenance.mo');
     }
 
     public function display()
diff --git a/controller/admin/options.php b/controller/admin/options.php
index ae47aec5..bc9091dd 100644
--- a/controller/admin/options.php
+++ b/controller/admin/options.php
@@ -19,7 +19,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\options();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/options.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/options.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/admin/parser.php b/controller/admin/parser.php
index 6ea82ff2..c086b3e7 100644
--- a/controller/admin/parser.php
+++ b/controller/admin/parser.php
@@ -19,7 +19,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\parser();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/parser.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/parser.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/admin/permissions.php b/controller/admin/permissions.php
index a728b9cd..e54c86ab 100644
--- a/controller/admin/permissions.php
+++ b/controller/admin/permissions.php
@@ -19,7 +19,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\permissions();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/permissions.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/permissions.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/admin/reports.php b/controller/admin/reports.php
index 4aba65e8..d1d95586 100644
--- a/controller/admin/reports.php
+++ b/controller/admin/reports.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\reports();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/reports.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/reports.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/admin/statistics.php b/controller/admin/statistics.php
index e8349a0d..382ec3cc 100644
--- a/controller/admin/statistics.php
+++ b/controller/admin/statistics.php
@@ -19,7 +19,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\statistics();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/index.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/index.mo');
     }
 
     public function display()
diff --git a/controller/admin/users.php b/controller/admin/users.php
index b0130364..ce6be2ec 100644
--- a/controller/admin/users.php
+++ b/controller/admin/users.php
@@ -19,7 +19,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\admin\users();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->user->language.'/admin/users.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/users.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/auth.php b/controller/auth.php
index e7c16cb5..cde81fbc 100644
--- a/controller/auth.php
+++ b/controller/auth.php
@@ -14,7 +14,7 @@ class auth
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->feather->user->language.'/login.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->feather->user->language.'/login.mo');
     }
 
     public function login()
@@ -101,7 +101,7 @@ public function forget()
 
             if ($user) {
                 // Load the "activate password" template
-                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->feather->user->language.'/mail_templates/activate_password.tpl'));
+                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->feather->user->language.'/mail_templates/activate_password.tpl'));
                 $mail_tpl = $this->feather->hooks->fire('mail_tpl_password_forgotten', $mail_tpl);
 
                 // The first row contains the subject
diff --git a/controller/delete.php b/controller/delete.php
index f939068d..c7b5b111 100644
--- a/controller/delete.php
+++ b/controller/delete.php
@@ -15,8 +15,8 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \model\delete();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/delete.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/post.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/delete.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/post.mo');
     }
 
     public function deletepost($id)
diff --git a/controller/edit.php b/controller/edit.php
index e1a0e504..71d671e9 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -19,10 +19,10 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\edit();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/bbeditor.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/register.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/post.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/bbeditor.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/help.php b/controller/help.php
index e96f2c33..ade00b45 100644
--- a/controller/help.php
+++ b/controller/help.php
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/help.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/help.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/index.php b/controller/index.php
index 862c0d16..4bf1b867 100644
--- a/controller/index.php
+++ b/controller/index.php
@@ -15,7 +15,7 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \model\index();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->feather->user->language.'/index.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->feather->user->language.'/index.mo');
     }
 
     public function display()
diff --git a/controller/install.php b/controller/install.php
index c9a6bd32..0df7f051 100644
--- a/controller/install.php
+++ b/controller/install.php
@@ -38,7 +38,7 @@ public function run()
                 $this->install_lang = $this->feather->request->post('install_lang');
             }
         }
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->install_lang.'/install.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->install_lang.'/install.mo');
 
         if ($this->feather->request->isPost() && empty($this->feather->request->post('choose_lang'))) {
             $missing_fields = array();
@@ -164,7 +164,7 @@ public function create_db(array $data)
         \FeatherBB\Core::init_db($data);
 
         // Load appropriate language
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$data['default_lang'].'/install.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$data['default_lang'].'/install.mo');
 
         // Handle db prefix
         $data['db_prefix'] = (!empty($data['db_prefix'])) ? $data['db_prefix'] : '';
diff --git a/controller/login.php b/controller/login.php
index bd41c6a1..0c101c1d 100644
--- a/controller/login.php
+++ b/controller/login.php
@@ -21,7 +21,7 @@ public function __construct()
 
 
         $this->model = new \model\login();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/login.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/login.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/misc.php b/controller/misc.php
index 0a6440d2..eb598ba1 100644
--- a/controller/misc.php
+++ b/controller/misc.php
@@ -15,8 +15,8 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \model\misc();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/register.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/misc.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/register.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/misc.mo');
     }
 
     public function rules()
diff --git a/controller/moderate.php b/controller/moderate.php
index e2614b7d..a090451d 100644
--- a/controller/moderate.php
+++ b/controller/moderate.php
@@ -19,10 +19,10 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\moderate();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/topic.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/misc.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/post.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/topic.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/forum.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/misc.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/post.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/post.php b/controller/post.php
index 9ab0b212..99ec3dae 100644
--- a/controller/post.php
+++ b/controller/post.php
@@ -15,11 +15,11 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \model\post();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/prof_reg.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/post.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/register.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/antispam.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/bbeditor.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/post.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/register.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/antispam.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/bbeditor.mo');
     }
 
     public function newreply($fid = null, $tid = null, $qid = null)
@@ -30,7 +30,7 @@ public function newreply($fid = null, $tid = null, $qid = null)
     public function newpost($fid = null, $tid = null, $qid = null)
     {
         // Antispam feature
-        require $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/antispam.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
         // If $_POST['username'] is filled, we are facing a bot
diff --git a/controller/profile.php b/controller/profile.php
index 8664f4bd..8cd36d60 100644
--- a/controller/profile.php
+++ b/controller/profile.php
@@ -19,9 +19,9 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\profile();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/profile.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/profile.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/register.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/prof_reg.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/register.php b/controller/register.php
index cb1a8541..f6bf8415 100644
--- a/controller/register.php
+++ b/controller/register.php
@@ -19,9 +19,9 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\register();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/prof_reg.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/register.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/antispam.mo');
     }
 
     public function __autoload($class_name)
@@ -37,7 +37,7 @@ public function display()
         }
 
         // Antispam feature
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
+        require FEATHER_ROOT.'app/lang/'.$this->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
         // Display an error message if new registrations are disabled
diff --git a/controller/search.php b/controller/search.php
index afa8d659..42c6cec6 100644
--- a/controller/search.php
+++ b/controller/search.php
@@ -19,9 +19,9 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \model\search();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/userlist.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/search.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->user->language.'/forum.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/userlist.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/search.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/forum.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/userlist.php b/controller/userlist.php
index 27008155..63869bba 100644
--- a/controller/userlist.php
+++ b/controller/userlist.php
@@ -15,8 +15,8 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \model\userlist();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/userlist.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/search.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/userlist.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/search.mo');
     }
 
     public function display()
diff --git a/controller/viewforum.php b/controller/viewforum.php
index f4820c65..4be4857f 100644
--- a/controller/viewforum.php
+++ b/controller/viewforum.php
@@ -15,7 +15,7 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \model\viewforum();
-        load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$this->feather->user->language.'/forum.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->feather->user->language.'/forum.mo');
     }
 
     public function __autoload($class_name)
diff --git a/controller/viewtopic.php b/controller/viewtopic.php
index d3afe74c..2725e422 100644
--- a/controller/viewtopic.php
+++ b/controller/viewtopic.php
@@ -15,9 +15,9 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \model\viewtopic();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/topic.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/post.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/bbeditor.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/topic.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/post.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/bbeditor.mo');
     }
 
     public function display($id = null, $name = null, $page = null, $pid = null)
@@ -29,7 +29,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         }
 
         // Antispam feature
-        require $this->feather->forum_env['FEATHER_ROOT'].'lang/'.$this->feather->user->language.'/antispam.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
         // Fetch some informations about the topic
diff --git a/extern.php b/extern.php
index 1f85454a..e35e5335 100644
--- a/extern.php
+++ b/extern.php
@@ -75,8 +75,8 @@
 $feather->add(new \FeatherBB\Auth());
 $feather->add(new \FeatherBB\Core($feather_settings));
 
-load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/common.mo');
-load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/index.mo');
+load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$feather->user->language.'/common.mo');
+load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$feather->user->language.'/index.mo');
 
 // The length at which topic subjects will be truncated (for HTML output)
 if (!defined('FORUM_EXTERN_MAX_SUBJECT_LENGTH')) {
diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index 608e0c36..207d826a 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -220,7 +220,7 @@ public function call()
             if (!$this->app->user->disp_posts) {
                 $this->app->user->disp_posts = $this->app->forum_settings['o_disp_posts_default'];
             }
-            if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language)) {
+            if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'app/lang/'.$this->app->user->language)) {
                 $this->app->user->language = $this->app->forum_settings['o_default_lang'];
             }
             if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'style/themes/'.$this->app->user->style.'/style.css')) {
@@ -267,7 +267,7 @@ public function call()
             $this->model->feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), $this->app->now + 31536000);
         }
 
-        load_textdomain('featherbb', $this->app->forum_env['FEATHER_ROOT'].'lang/'.$this->app->user->language.'/common.mo');
+        load_textdomain('featherbb', $this->app->forum_env['FEATHER_ROOT'].'app/lang/'.$this->app->user->language.'/common.mo');
 
         // Load bans from cache
         if (!$this->app->cache->isCached('bans')) {
diff --git a/include/functions.php b/include/functions.php
index 11f0609f..11c02b28 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -33,8 +33,8 @@ function check_username($username, $errors, $exclude_id = null)
     // Include UTF-8 function
     require_once FEATHER_ROOT.'include/utf8/strcasecmp.php';
 
-    load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/register.mo');
-    load_textdomain('featherbb', FEATHER_ROOT.'lang/'.$feather->user->language.'/prof_reg.mo');
+    load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$feather->user->language.'/register.mo');
+    load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$feather->user->language.'/prof_reg.mo');
 
     // Convert multiple whitespace characters into one (to prevent people from registering with indistinguishable usernames)
     $username = preg_replace('%\s+%s', ' ', $username);
@@ -518,7 +518,7 @@ function file_size($size)
 //
 function generate_stopwords_cache_id()
 {
-    $files = glob(FEATHER_ROOT.'lang/*/stopwords.txt');
+    $files = glob(FEATHER_ROOT.'app/lang/*/stopwords.txt');
     if ($files === false) {
         return 'cache_id_error';
     }
diff --git a/model/login.php b/model/login.php
index ff28e584..a7ae06ec 100644
--- a/model/login.php
+++ b/model/login.php
@@ -147,7 +147,7 @@ public function password_forgotten()
 
                 if ($result) {
                     // Load the "activate password" template
-                    $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/activate_password.tpl'));
+                    $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/activate_password.tpl'));
                     $mail_tpl = $this->hook->fire('mail_tpl_password_forgotten', $mail_tpl);
 
                     // The first row contains the subject
diff --git a/model/misc.php b/model/misc.php
index 2a89e805..f3f4f716 100644
--- a/model/misc.php
+++ b/model/misc.php
@@ -82,7 +82,7 @@ public function send_email($mail)
         }
 
         // Load the "form email" template
-        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/form_email.tpl'));
+        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/form_email.tpl'));
         $mail_tpl = $this->hook->fire('send_email_mail_tpl', $mail_tpl);
 
         // The first row contains the subject
@@ -194,7 +194,7 @@ public function insert_report($post_id)
             // We send it to the complete mailing-list in one swoop
             if ($this->config['o_mailing_list'] != '') {
                 // Load the "new report" template
-                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/new_report.tpl'));
+                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/new_report.tpl'));
                 $mail_tpl = $this->hook->fire('insert_report_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
diff --git a/model/post.php b/model/post.php
index 7f7f6530..b7d3e9ff 100644
--- a/model/post.php
+++ b/model/post.php
@@ -386,13 +386,13 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
             foreach($result as $cur_subscriber) {
                 // Is the subscription email for $cur_subscriber['language'] cached or not?
                 if (!isset($notification_emails[$cur_subscriber['language']])) {
-                    if (file_exists(FEATHER_ROOT.'lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl')) {
+                    if (file_exists(FEATHER_ROOT.'app/lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl')) {
                         // Load the "new reply" template
-                        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl'));
+                        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl'));
                         $mail_tpl = $this->hook->fire('send_notifications_reply_mail_tpl', $mail_tpl);
 
                         // Load the "new reply full" template (with post included)
-                        $mail_tpl_full = trim(file_get_contents(FEATHER_ROOT.'lang/'.$cur_subscriber['language'].'/mail_templates/new_reply_full.tpl'));
+                        $mail_tpl_full = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$cur_subscriber['language'].'/mail_templates/new_reply_full.tpl'));
                         $mail_tpl_full = $this->hook->fire('send_notifications_reply_mail_tpl_full', $mail_tpl_full);
 
                         // The first row contains the subject (it also starts with "Subject:")
@@ -595,13 +595,13 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
             foreach($result as $cur_subscriber) {
                 // Is the subscription email for $cur_subscriber['language'] cached or not?
                 if (!isset($notification_emails[$cur_subscriber['language']])) {
-                    if (file_exists(FEATHER_ROOT.'lang/'.$cur_subscriber['language'].'/mail_templates/new_topic.tpl')) {
+                    if (file_exists(FEATHER_ROOT.'app/lang/'.$cur_subscriber['language'].'/mail_templates/new_topic.tpl')) {
                         // Load the "new topic" template
-                        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$cur_subscriber['language'].'/mail_templates/new_topic.tpl'));
+                        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$cur_subscriber['language'].'/mail_templates/new_topic.tpl'));
                         $mail_tpl = $this->hook->fire('send_notifications_new_topic_mail_tpl', $mail_tpl);
 
                         // Load the "new topic full" template (with post included)
-                        $mail_tpl_full = trim(file_get_contents(FEATHER_ROOT.'lang/'.$cur_subscriber['language'].'/mail_templates/new_topic_full.tpl'));
+                        $mail_tpl_full = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$cur_subscriber['language'].'/mail_templates/new_topic_full.tpl'));
 
                         // The first row contains the subject (it also starts with "Subject:")
                         $first_crlf = strpos($mail_tpl, "\n");
@@ -660,7 +660,7 @@ public function warn_banned_user($post, $new_pid)
         $this->hook->fire('warn_banned_user_start', $post, $new_pid);
 
         // Load the "banned email post" template
-        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/banned_email_post.tpl'));
+        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/banned_email_post.tpl'));
         $mail_tpl = $this->hook->fire('warn_banned_user_mail_tpl', $mail_tpl);
 
         // The first row contains the subject
diff --git a/model/profile.php b/model/profile.php
index c5daeeb2..754ecc72 100644
--- a/model/profile.php
+++ b/model/profile.php
@@ -215,7 +215,7 @@ public function change_email($id)
                     throw new \FeatherBB\Error(__('Banned email'), 403);
                 } elseif ($this->config['o_mailing_list'] != '') {
                     // Load the "banned email change" template
-                    $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/banned_email_change.tpl'));
+                    $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/banned_email_change.tpl'));
                     $mail_tpl = $this->hook->fire('change_email_mail_tpl', $mail_tpl);
 
                     // The first row contains the subject
@@ -252,7 +252,7 @@ public function change_email($id)
                     }
 
                     // Load the "dupe email change" template
-                    $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/dupe_email_change.tpl'));
+                    $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/dupe_email_change.tpl'));
                     $mail_tpl = $this->hook->fire('change_email_mail_dupe_tpl', $mail_tpl);
 
                     // The first row contains the subject
@@ -289,7 +289,7 @@ public function change_email($id)
             $user = $user->save();
 
             // Load the "activate email" template
-            $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/activate_email.tpl'));
+            $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/activate_email.tpl'));
             $mail_tpl = $this->hook->fire('change_email_mail_activate_tpl', $mail_tpl);
 
             // The first row contains the subject
diff --git a/model/register.php b/model/register.php
index 9a609e96..e2fdef8d 100644
--- a/model/register.php
+++ b/model/register.php
@@ -69,7 +69,7 @@ public function check_for_errors()
         }
 
         // Antispam feature
-        require FEATHER_ROOT.'lang/'.$this->user->language.'/antispam.php';
+        require FEATHER_ROOT.'app/lang/'.$this->user->language.'/antispam.php';
         $question = $this->request->post('captcha_q') ? trim($this->request->post('captcha_q')) : '';
         $answer = $this->request->post('captcha') ? strtoupper(trim($this->request->post('captcha'))) : '';
         $lang_antispam_questions_array = array();
@@ -118,7 +118,7 @@ public function check_for_errors()
         // Make sure we got a valid language string
         if ($this->request->post('language')) {
             $user['language'] = preg_replace('%[\.\\\/]%', '', $this->request->post('language'));
-            if (!file_exists(FEATHER_ROOT.'lang/'.$user['language'].'/common.po')) {
+            if (!file_exists(FEATHER_ROOT.'app/lang/'.$user['language'].'/common.po')) {
                 throw new \FeatherBB\Error(__('Bad request'), 500);
             }
         } else {
@@ -179,7 +179,7 @@ public function insert_user($user)
             // If we previously found out that the email was banned
             if (isset($user['banned_email'])) {
                 // Load the "banned email register" template
-                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/banned_email_register.tpl'));
+                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/banned_email_register.tpl'));
                 $mail_tpl = $this->hook->fire('insert_user_banned_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
@@ -200,7 +200,7 @@ public function insert_user($user)
             // If we previously found out that the email was a dupe
             if (!empty($dupe_list)) {
                 // Load the "dupe email register" template
-                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/dupe_email_register.tpl'));
+                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/dupe_email_register.tpl'));
                 $mail_tpl = $this->hook->fire('insert_user_dupe_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
@@ -221,7 +221,7 @@ public function insert_user($user)
             // Should we alert people on the admin mailing list that a new user has registered?
             if ($this->config['o_regs_report'] == '1') {
                 // Load the "new user" template
-                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/new_user.tpl'));
+                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/new_user.tpl'));
                 $mail_tpl = $this->hook->fire('insert_user_new_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
@@ -244,7 +244,7 @@ public function insert_user($user)
         // Must the user verify the registration or do we log him/her in right now?
         if ($this->config['o_regs_verify'] == '1') {
             // Load the "welcome" template
-            $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'lang/'.$this->user->language.'/mail_templates/welcome.tpl'));
+            $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/welcome.tpl'));
             $mail_tpl = $this->hook->fire('insert_user_welcome_mail_tpl', $mail_tpl);
 
             // The first row contains the subject

From afcfb4aacbf6c45f9ae9df6e4431743aaa345274 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 31 Aug 2015 00:38:48 +0200
Subject: [PATCH 280/353] PSR-0 loader and require slim via Composer

---
 composer.json                                 |    8 +-
 include/classes/auth.class.php                |    1 +
 include/classes/view.class.php                |    1 -
 index.php                                     |    9 +-
 lang/English/admin/bans.mo                    |  Bin 4861 -> 0 bytes
 lang/English/admin/bans.po                    |  183 --
 lang/English/admin/categories.mo              |  Bin 2167 -> 0 bytes
 lang/English/admin/categories.po              |   84 -
 lang/English/admin/censoring.mo               |  Bin 1551 -> 0 bytes
 lang/English/admin/censoring.po               |   57 -
 lang/English/admin/common.mo                  |  Bin 1802 -> 0 bytes
 lang/English/admin/common.po                  |  117 --
 lang/English/admin/forums.mo                  |  Bin 3548 -> 0 bytes
 lang/English/admin/forums.po                  |  147 --
 lang/English/admin/groups.mo                  |  Bin 8477 -> 0 bytes
 lang/English/admin/groups.po                  |  261 ---
 lang/English/admin/index.html                 |    1 -
 lang/English/admin/index.mo                   |  Bin 4052 -> 0 bytes
 lang/English/admin/index.po                   |  180 --
 lang/English/admin/maintenance.mo             |  Bin 4083 -> 0 bytes
 lang/English/admin/maintenance.po             |  114 --
 lang/English/admin/options.mo                 |  Bin 18847 -> 0 bytes
 lang/English/admin/options.po                 |  603 ------
 lang/English/admin/parser.mo                  |  Bin 5557 -> 0 bytes
 lang/English/admin/parser.php                 |   93 -
 lang/English/admin/parser.po                  |  168 --
 lang/English/admin/permissions.mo             |  Bin 2836 -> 0 bytes
 lang/English/admin/permissions.po             |  102 -
 lang/English/admin/plugin_example.mo          |  Bin 1137 -> 0 bytes
 lang/English/admin/plugin_example.po          |   45 -
 lang/English/admin/reports.mo                 |  Bin 1083 -> 0 bytes
 lang/English/admin/reports.po                 |   57 -
 lang/English/admin/users.mo                   |  Bin 7114 -> 0 bytes
 lang/English/admin/users.po                   |  312 ----
 lang/English/antispam.mo                      |  Bin 751 -> 0 bytes
 lang/English/antispam.php                     |   23 -
 lang/English/antispam.po                      |   27 -
 lang/English/antispam_questions.mo            |  Bin 765 -> 0 bytes
 lang/English/antispam_questions.po            |   43 -
 lang/English/bbeditor.mo                      |  Bin 1082 -> 0 bytes
 lang/English/bbeditor.po                      |   63 -
 lang/English/common.mo                        |  Bin 9404 -> 0 bytes
 lang/English/common.po                        |  473 -----
 lang/English/delete.mo                        |  Bin 1003 -> 0 bytes
 lang/English/delete.po                        |   42 -
 lang/English/forum.mo                         |  Bin 866 -> 0 bytes
 lang/English/forum.po                         |   45 -
 lang/English/help.mo                          |  Bin 4261 -> 0 bytes
 lang/English/help.po                          |  165 --
 lang/English/index.mo                         |  Bin 1064 -> 0 bytes
 lang/English/index.po                         |   54 -
 lang/English/install.mo                       |  Bin 9441 -> 0 bytes
 lang/English/install.po                       |  291 ---
 lang/English/login.mo                         |  Bin 1877 -> 0 bytes
 lang/English/login.po                         |   63 -
 .../English/mail_templates/activate_email.tpl |   12 -
 .../mail_templates/activate_password.tpl      |   14 -
 .../mail_templates/banned_email_change.tpl    |    9 -
 .../mail_templates/banned_email_post.tpl      |    9 -
 .../mail_templates/banned_email_register.tpl  |    9 -
 .../mail_templates/dupe_email_change.tpl      |    9 -
 .../mail_templates/dupe_email_register.tpl    |    9 -
 lang/English/mail_templates/form_email.tpl    |   13 -
 lang/English/mail_templates/new_reply.tpl     |   11 -
 .../English/mail_templates/new_reply_full.tpl |   18 -
 lang/English/mail_templates/new_report.tpl    |    9 -
 lang/English/mail_templates/new_topic.tpl     |   11 -
 .../English/mail_templates/new_topic_full.tpl |   18 -
 lang/English/mail_templates/new_user.tpl      |   12 -
 lang/English/mail_templates/rename.tpl        |   12 -
 lang/English/mail_templates/welcome.tpl       |   12 -
 lang/English/misc.mo                          |  Bin 5068 -> 0 bytes
 lang/English/misc.po                          |  225 ---
 lang/English/post.mo                          |  Bin 2395 -> 0 bytes
 lang/English/post.po                          |   93 -
 lang/English/prof_reg.mo                      |  Bin 5891 -> 0 bytes
 lang/English/prof_reg.po                      |  225 ---
 lang/English/profile.mo                       |  Bin 9585 -> 0 bytes
 lang/English/profile.po                       |  378 ----
 lang/English/register.mo                      |  Bin 3064 -> 0 bytes
 lang/English/register.po                      |   84 -
 lang/English/search.mo                        |  Bin 4068 -> 0 bytes
 lang/English/search.po                        |  174 --
 lang/English/stopwords.txt                    |  175 --
 lang/English/topic.mo                         |  Bin 1487 -> 0 bytes
 lang/English/topic.po                         |   93 -
 lang/English/update.mo                        |  Bin 7678 -> 0 bytes
 lang/English/update.po                        |  195 --
 lang/English/userlist.mo                      |  Bin 898 -> 0 bytes
 lang/English/userlist.po                      |   33 -
 vendor/akrabat/rka-slim-controller/LICENSE    |   26 +
 vendor/akrabat/rka-slim-controller/README.md  |   96 +
 .../akrabat/rka-slim-controller/RKA/Slim.php  |   84 +
 .../akrabat/rka-slim-controller/composer.json |   26 +
 vendor/composer/autoload_classmap.php         |    1 +
 vendor/composer/autoload_namespaces.php       |    2 +
 vendor/composer/autoload_psr4.php             |    1 +
 vendor/composer/installed.json                |   96 +-
 vendor/slim/slim/.gitignore                   |    1 +
 vendor/slim/slim/.travis.yml                  |   11 +
 vendor/slim/slim/CONTRIBUTING.md              |   20 +
 vendor/slim/slim/LICENSE                      |   19 +
 vendor/slim/slim/README.markdown              |  208 +++
 .../slim/slim/Slim}/Environment.php           |    0
 .../slim/slim/Slim}/Exception/Pass.php        |    0
 .../slim/slim/Slim}/Exception/Stop.php        |    0
 .../slim/slim/Slim}/Helper/Set.php            |    0
 .../slim/slim/Slim}/Http/Cookies.php          |    0
 .../slim/slim/Slim}/Http/Headers.php          |    2 +-
 .../slim/slim/Slim}/Http/Request.php          |    0
 .../slim/slim/Slim}/Http/Response.php         |    2 +-
 {Slim => vendor/slim/slim/Slim}/Http/Util.php |    0
 {Slim => vendor/slim/slim/Slim}/Log.php       |    2 +-
 {Slim => vendor/slim/slim/Slim}/LogWriter.php |    0
 .../slim/slim/Slim}/Middleware.php            |    0
 .../slim/Slim}/Middleware/ContentTypes.php    |    6 +-
 .../slim/slim/Slim}/Middleware/Flash.php      |    5 +-
 .../slim/Slim}/Middleware/MethodOverride.php  |    2 +-
 .../Slim}/Middleware/PrettyExceptions.php     |    6 +-
 .../slim/Slim}/Middleware/SessionCookie.php   |    0
 {Slim => vendor/slim/slim/Slim}/Route.php     |    6 +-
 {Slim => vendor/slim/slim/Slim}/Router.php    |    0
 {Slim => vendor/slim/slim/Slim}/Slim.php      |   69 +-
 {Slim => vendor/slim/slim/Slim}/View.php      |    0
 vendor/slim/slim/composer.json                |   24 +
 vendor/slim/slim/index.php                    |  169 ++
 vendor/slim/slim/phpunit.xml.dist             |   25 +
 vendor/slim/slim/tests/EnvironmentTest.php    |  376 ++++
 vendor/slim/slim/tests/Foo.php                |    7 +
 vendor/slim/slim/tests/Helper/SetTest.php     |  241 +++
 vendor/slim/slim/tests/Http/CookiesTest.php   |   92 +
 vendor/slim/slim/tests/Http/HeadersTest.php   |   59 +
 vendor/slim/slim/tests/Http/RequestTest.php   |  949 ++++++++++
 vendor/slim/slim/tests/Http/ResponseTest.php  |  271 +++
 vendor/slim/slim/tests/Http/UtilTest.php      |  445 +++++
 vendor/slim/slim/tests/LogTest.php            |  208 +++
 vendor/slim/slim/tests/LogWriterTest.php      |   48 +
 .../tests/Middleware/ContentTypesTest.php     |  162 ++
 .../slim/slim/tests/Middleware/FlashTest.php  |  141 ++
 .../tests/Middleware/MethodOverrideTest.php   |  149 ++
 .../tests/Middleware/PrettyExceptionsTest.php |  153 ++
 .../tests/Middleware/SessionCookieTest.php    |  463 +++++
 vendor/slim/slim/tests/MiddlewareTest.php     |   79 +
 vendor/slim/slim/tests/README                 |   18 +
 vendor/slim/slim/tests/RouteTest.php          |  617 ++++++
 vendor/slim/slim/tests/RouterTest.php         |  250 +++
 vendor/slim/slim/tests/SlimTest.php           | 1657 +++++++++++++++++
 vendor/slim/slim/tests/ViewTest.php           |  199 ++
 vendor/slim/slim/tests/bootstrap.php          |   22 +
 vendor/slim/slim/tests/templates/test.php     |    1 +
 150 files changed, 7475 insertions(+), 5735 deletions(-)
 delete mode 100644 lang/English/admin/bans.mo
 delete mode 100644 lang/English/admin/bans.po
 delete mode 100644 lang/English/admin/categories.mo
 delete mode 100644 lang/English/admin/categories.po
 delete mode 100644 lang/English/admin/censoring.mo
 delete mode 100644 lang/English/admin/censoring.po
 delete mode 100644 lang/English/admin/common.mo
 delete mode 100644 lang/English/admin/common.po
 delete mode 100644 lang/English/admin/forums.mo
 delete mode 100644 lang/English/admin/forums.po
 delete mode 100644 lang/English/admin/groups.mo
 delete mode 100644 lang/English/admin/groups.po
 delete mode 100644 lang/English/admin/index.html
 delete mode 100644 lang/English/admin/index.mo
 delete mode 100644 lang/English/admin/index.po
 delete mode 100644 lang/English/admin/maintenance.mo
 delete mode 100644 lang/English/admin/maintenance.po
 delete mode 100644 lang/English/admin/options.mo
 delete mode 100644 lang/English/admin/options.po
 delete mode 100644 lang/English/admin/parser.mo
 delete mode 100644 lang/English/admin/parser.php
 delete mode 100644 lang/English/admin/parser.po
 delete mode 100644 lang/English/admin/permissions.mo
 delete mode 100644 lang/English/admin/permissions.po
 delete mode 100644 lang/English/admin/plugin_example.mo
 delete mode 100644 lang/English/admin/plugin_example.po
 delete mode 100644 lang/English/admin/reports.mo
 delete mode 100644 lang/English/admin/reports.po
 delete mode 100644 lang/English/admin/users.mo
 delete mode 100644 lang/English/admin/users.po
 delete mode 100644 lang/English/antispam.mo
 delete mode 100644 lang/English/antispam.php
 delete mode 100644 lang/English/antispam.po
 delete mode 100644 lang/English/antispam_questions.mo
 delete mode 100644 lang/English/antispam_questions.po
 delete mode 100644 lang/English/bbeditor.mo
 delete mode 100644 lang/English/bbeditor.po
 delete mode 100644 lang/English/common.mo
 delete mode 100644 lang/English/common.po
 delete mode 100644 lang/English/delete.mo
 delete mode 100644 lang/English/delete.po
 delete mode 100644 lang/English/forum.mo
 delete mode 100644 lang/English/forum.po
 delete mode 100644 lang/English/help.mo
 delete mode 100644 lang/English/help.po
 delete mode 100644 lang/English/index.mo
 delete mode 100644 lang/English/index.po
 delete mode 100644 lang/English/install.mo
 delete mode 100644 lang/English/install.po
 delete mode 100644 lang/English/login.mo
 delete mode 100644 lang/English/login.po
 delete mode 100644 lang/English/mail_templates/activate_email.tpl
 delete mode 100644 lang/English/mail_templates/activate_password.tpl
 delete mode 100644 lang/English/mail_templates/banned_email_change.tpl
 delete mode 100644 lang/English/mail_templates/banned_email_post.tpl
 delete mode 100644 lang/English/mail_templates/banned_email_register.tpl
 delete mode 100644 lang/English/mail_templates/dupe_email_change.tpl
 delete mode 100644 lang/English/mail_templates/dupe_email_register.tpl
 delete mode 100644 lang/English/mail_templates/form_email.tpl
 delete mode 100644 lang/English/mail_templates/new_reply.tpl
 delete mode 100644 lang/English/mail_templates/new_reply_full.tpl
 delete mode 100644 lang/English/mail_templates/new_report.tpl
 delete mode 100644 lang/English/mail_templates/new_topic.tpl
 delete mode 100644 lang/English/mail_templates/new_topic_full.tpl
 delete mode 100644 lang/English/mail_templates/new_user.tpl
 delete mode 100644 lang/English/mail_templates/rename.tpl
 delete mode 100644 lang/English/mail_templates/welcome.tpl
 delete mode 100644 lang/English/misc.mo
 delete mode 100644 lang/English/misc.po
 delete mode 100644 lang/English/post.mo
 delete mode 100644 lang/English/post.po
 delete mode 100644 lang/English/prof_reg.mo
 delete mode 100644 lang/English/prof_reg.po
 delete mode 100644 lang/English/profile.mo
 delete mode 100644 lang/English/profile.po
 delete mode 100644 lang/English/register.mo
 delete mode 100644 lang/English/register.po
 delete mode 100644 lang/English/search.mo
 delete mode 100644 lang/English/search.po
 delete mode 100644 lang/English/stopwords.txt
 delete mode 100644 lang/English/topic.mo
 delete mode 100644 lang/English/topic.po
 delete mode 100644 lang/English/update.mo
 delete mode 100644 lang/English/update.po
 delete mode 100644 lang/English/userlist.mo
 delete mode 100644 lang/English/userlist.po
 create mode 100644 vendor/akrabat/rka-slim-controller/LICENSE
 create mode 100644 vendor/akrabat/rka-slim-controller/README.md
 create mode 100644 vendor/akrabat/rka-slim-controller/RKA/Slim.php
 create mode 100644 vendor/akrabat/rka-slim-controller/composer.json
 create mode 100644 vendor/slim/slim/.gitignore
 create mode 100644 vendor/slim/slim/.travis.yml
 create mode 100644 vendor/slim/slim/CONTRIBUTING.md
 create mode 100644 vendor/slim/slim/LICENSE
 create mode 100644 vendor/slim/slim/README.markdown
 rename {Slim => vendor/slim/slim/Slim}/Environment.php (100%)
 rename {Slim => vendor/slim/slim/Slim}/Exception/Pass.php (100%)
 rename {Slim => vendor/slim/slim/Slim}/Exception/Stop.php (100%)
 rename {Slim => vendor/slim/slim/Slim}/Helper/Set.php (100%)
 rename {Slim => vendor/slim/slim/Slim}/Http/Cookies.php (100%)
 rename {Slim => vendor/slim/slim/Slim}/Http/Headers.php (99%)
 rename {Slim => vendor/slim/slim/Slim}/Http/Request.php (100%)
 rename {Slim => vendor/slim/slim/Slim}/Http/Response.php (99%)
 rename {Slim => vendor/slim/slim/Slim}/Http/Util.php (100%)
 rename {Slim => vendor/slim/slim/Slim}/Log.php (99%)
 rename {Slim => vendor/slim/slim/Slim}/LogWriter.php (100%)
 rename {Slim => vendor/slim/slim/Slim}/Middleware.php (100%)
 rename {Slim => vendor/slim/slim/Slim}/Middleware/ContentTypes.php (97%)
 rename {Slim => vendor/slim/slim/Slim}/Middleware/Flash.php (99%)
 rename {Slim => vendor/slim/slim/Slim}/Middleware/MethodOverride.php (99%)
 rename {Slim => vendor/slim/slim/Slim}/Middleware/PrettyExceptions.php (96%)
 rename {Slim => vendor/slim/slim/Slim}/Middleware/SessionCookie.php (100%)
 rename {Slim => vendor/slim/slim/Slim}/Route.php (98%)
 rename {Slim => vendor/slim/slim/Slim}/Router.php (100%)
 rename {Slim => vendor/slim/slim/Slim}/Slim.php (96%)
 rename {Slim => vendor/slim/slim/Slim}/View.php (100%)
 create mode 100644 vendor/slim/slim/composer.json
 create mode 100644 vendor/slim/slim/index.php
 create mode 100644 vendor/slim/slim/phpunit.xml.dist
 create mode 100644 vendor/slim/slim/tests/EnvironmentTest.php
 create mode 100644 vendor/slim/slim/tests/Foo.php
 create mode 100644 vendor/slim/slim/tests/Helper/SetTest.php
 create mode 100644 vendor/slim/slim/tests/Http/CookiesTest.php
 create mode 100644 vendor/slim/slim/tests/Http/HeadersTest.php
 create mode 100644 vendor/slim/slim/tests/Http/RequestTest.php
 create mode 100644 vendor/slim/slim/tests/Http/ResponseTest.php
 create mode 100644 vendor/slim/slim/tests/Http/UtilTest.php
 create mode 100644 vendor/slim/slim/tests/LogTest.php
 create mode 100644 vendor/slim/slim/tests/LogWriterTest.php
 create mode 100644 vendor/slim/slim/tests/Middleware/ContentTypesTest.php
 create mode 100644 vendor/slim/slim/tests/Middleware/FlashTest.php
 create mode 100644 vendor/slim/slim/tests/Middleware/MethodOverrideTest.php
 create mode 100644 vendor/slim/slim/tests/Middleware/PrettyExceptionsTest.php
 create mode 100644 vendor/slim/slim/tests/Middleware/SessionCookieTest.php
 create mode 100644 vendor/slim/slim/tests/MiddlewareTest.php
 create mode 100644 vendor/slim/slim/tests/README
 create mode 100644 vendor/slim/slim/tests/RouteTest.php
 create mode 100644 vendor/slim/slim/tests/RouterTest.php
 create mode 100644 vendor/slim/slim/tests/SlimTest.php
 create mode 100644 vendor/slim/slim/tests/ViewTest.php
 create mode 100644 vendor/slim/slim/tests/bootstrap.php
 create mode 100644 vendor/slim/slim/tests/templates/test.php

diff --git a/composer.json b/composer.json
index 938feef8..3bf3df86 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,12 @@
         "classmap": ["include/classes/"],
         "psr-4" : {
             "Plugins\\" : "/plugins"
-        }
+        },
+        "psr-0": { "": "" }
+    },
+    "require": {
+        "php": ">=5.3",
+        "slim/slim": "^2.6",
+        "akrabat/rka-slim-controller": "^2.0"
     }
 }
diff --git a/include/classes/auth.class.php b/include/classes/auth.class.php
index 207d826a..a35309f1 100644
--- a/include/classes/auth.class.php
+++ b/include/classes/auth.class.php
@@ -13,6 +13,7 @@
 
 namespace FeatherBB;
 use DB;
+// use model\auth;
 
 class Auth extends \Slim\Middleware
 {
diff --git a/include/classes/view.class.php b/include/classes/view.class.php
index 3605046c..6cc73e71 100644
--- a/include/classes/view.class.php
+++ b/include/classes/view.class.php
@@ -254,7 +254,6 @@ public function setStyle($style)
         }
         $this->data->set('style', (string) $style);
         $this->setTemplatesDirectory($this->app->forum_env['FEATHER_ROOT'].'style/themes/'.$style.'/view');
-        // $this->addAsset('css', 'style/themes/'.$style.'/style.css');
         return $this;
     }
 
diff --git a/index.php b/index.php
index 15b38fb4..29a82294 100644
--- a/index.php
+++ b/index.php
@@ -14,15 +14,8 @@
 ini_set('display_errors', 1);
 
 // Load Slim Framework
-require 'Slim/Slim.php';
-\Slim\Slim::registerAutoloader();
-
-// Load dependencies
 require 'vendor/autoload.php';
-
-// Load FeatherBB
-require 'include/classes/autoload.class.php';
-\FeatherBB\Loader::registerAutoloader();
+// \Slim\Slim::registerAutoloader();
 
 // Instantiate Slim and add CSRF
 $feather = new \Slim\Slim();
diff --git a/lang/English/admin/bans.mo b/lang/English/admin/bans.mo
deleted file mode 100644
index 3077c64b555429af441b4f7867c6d8ac40e68fea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4861
zcma)<U5F(|6~{X!(ardkjV8vAWNTMrX5!wSolVxPvsttAwKB4k8FyyYJcYX5b?0`b
zZ}+9E@628>0bc}tQ9(iRIYcypfNv@&zDYz71>XcAki<7p)DR#1ovP}-_YMiBnY#b3
z)Ae!A|9n)<U+%i?`w`FQXrG|Ha!V9#gD>3556^42MbQVr*TFl$H^7tNt+z+fUEtlI
z^yk43gUjHDz-{nOFbUu5@ckR0toNgUKLur-Ux4?5zXxTXSHU^(@8EmE|AOxWPrN(q
z3(7w8pzQM)D0*yx?*X3zW&A#P0<1yV=NVA+{7%5<z<cQbJm4R|_tSq3l=1%pWt}@%
zRMxo%6!|Go>^L8AHQ;qn^zDKl01Hs`dItOm_-#=3e;$;5e+h~me+>94DEqw$%D5A3
zdN+6<D0)2%@+n#g@=Z|YKLyHq7L;+{0%iXnfIIl~c~Iv42Xcj9A@^AUP<Z|(KeEsF
zKn4B;6gyr9zXbj{^cN6{eiuMQ(JJ^NxCP4mH$erSWRQ$I&yS3I9Q+~pMG#j;uYmkT
zf8$5={Wq9{x6@&Xr~-ctJ`0`&AIBKsBL_bTem&rG;2!<of)#i_P7xly3yQrz2DibN
zLSKRfDxwqM{oqOPYv4Ih^m-AL{eK3&3;Y!*<9`$IWe`=PKY_CTUqRvXbx`L2Bgo$X
zQ7O6w=gYV|L0RWsQ0zS&<cr`<`j3JI_!9U6c#0r<5d0k|^Zp6qM)wF0@(8bw&=zQt
zzw(@-opEnbbP<%jMGw(U@=LgpM>rK8V;WmJ8$Jz6EXgCWdYX10?Nc<d`5{_|CeH<$
z@boZE(S%ER9`MlqN*R&5BDQ>#wn&2-_nZ&-DEQg%j+@$t)N{E;$#K5;So_7l2#@kC
zd2l>^CcJ+fJV%q5oEO<jnyRiYlpS^ZMyJt=O-zwy#eTGkbaO{ly4W`=D|)4q=rlE{
zs!W<yCaHtyP!|bOw}4F3X^=FlijXPw@u>r2t!DYY$%k&OMv&{S$(^J!gYxkBJZp57
z^d}pJeye5ZH`}l2q9|);=l;mpT7_+*bzO(e*G+5qMrWY2-0KwHy*e8=hghw2uQrvM
z5p_+k<jagKZPyO-oWKu(S7&lSm1o64L??VL4t1WT!hWOZW)QhG-cnc@ZOg(&%}C>|
zXvS^@rj6JzZr$C8{l;4(xG{y8*UWpu968>cZ=WdDK-Wn>;$>tRwYfeS7(~s)?J8wJ
zcdWc3(WLKKob<Ed<lU>$4wXF$JuuOAV@G*yg%JX<!WQrQMy``O!}wVtVO<b7sNj@u
z#s*?$W!|$hvYAe>YIdbYJulrIbq86keCS0tii4s&Dxw=gQ)W?nkQFUijdW0^GcqxD
zl07a&WT+F*_B>NN`KZ!)=W1CE?6N9`u4^x!zoh)@<@rLLzO0rOF3s&!<<n$rXEW`5
z*;E#~mep0G>%OU0SLb%N_d08YkkHtXtXNjaI@ir%CPN$1HErw89wou%x-KgQU86jV
zNa4<&(SxZK)nm@$D?PtOw;Pw${^#emHn%n=`!B`k=GIE$tzgyhkWFiIvtAtLIx8-z
zq^~P$>dQCwu68a?#>wtIQ*}0qq?AIntS)x5x>aPE0G|75=L@DVmDh2nl+vS?;*0Sk
zeDU4RZaJzFv*!0$R(_MF98Q(NC(Dtt{c@BONk$zSk|)uX>5X!A)Hj7BM}Zc~Rm+aA
zmR*x*f<u)(1;1)oTAOvVJgdhd8W76aFgGrRtj{P}L55lhfT6DHOy@*<JgK?OYg1WG
zT{Fo>yQ3j%4WQ8F=}}hqU78fBGE&Ff3cmKn(Ml6-Y^G~<l;yctm1Y*s$0SQ#IyFM-
zU_<4t?3+c4dJ+w!p=jDIb(MOhnv|C+AIi1=5OQJHS8Gb7sAxG%+zQk(-PP8_N;ppB
zh;XH+EMSfbBo&oXG+@6nq?KZgSbZhSQ+$xND<K^SvqYz<GJ9av{6h;0FDacQX2`J<
zt3B4}mq$vA$)ZJW^dST2_A-;Rm>CS~aU5+pCBg}kR2*7WrlUPf_GgD91#R7l0uQdr
z#L@hir!yFI(sUu3I!$DvbA;IBU(yoC6l#psN15%5d90%5O}rl~TMi5iToEL|DibFq
z##Qb^D_Drtt}*J&N}gkr*CDJP3Z$`Tgy<az%m_cJj^Y5vs+^M;>cV6CP>VvxA7{>H
zci^}{ultlS(Q}dwdQ@Xdoh7h1Zd|YC#T~j{R#S|`>YAgwo9p604EAwC@E0SQj5fXm
z%YJU-sZx*Hn>#+W?Ax%mbm3gQw8S4EWKH^xDKbh<<CYqDCr#{7C&tEVlgM#*9Sn3K
zNFwN*YM71{g#)Psd`@&JSJWlHTx#>hMZ@ucj@I%lIZzLT$Tc#-)(~ak%KO2wDU;)9
zV(DUQW+W-m>Qdmz=1S0xiQjIFJK{-dERG$O-XBwbdy=QKwbfZ)$8eG!>ztnla{f~f
zC=Fx>?~;nCh6SIoy-__PAl;%ql$+Do$FA6O#YeY9?SgosDQ2_dLkjq5(=#L~8oQx4
z*gaEcoX*b3akS;HHI53Wy_>5H?xl2T=N>sd&jt@S`l6WB8_9qsD%5;q_Cg$mYmZ!X
z2<53854Q<dI=T5&W*>)=p_IYqLezW~Cfun#HAv#j<-Dd=lLF|1hLTZIO6ts)Urkt=
zB<p2KtGs$z{Nn4C_^MspWz(@lb_uk()847v4MbES&f3_q(Tcw@$?4!PNi*euW5w6(
zaA|6Jz7g!=*m<kl&R)<?LLcv8n!5!+lRJx@=O~>Ix+wEi%cb8mEkelgiDw;g&cVH`
zf{c{^3gqgZ4Hj{<k4T}V*_b-V^;6FOcfRLj&O6@Dxwt9c31?X+E37FvB(p<9<q<v#
zt~6u;|K+&jHaE31#s{ia3BIMkOA%;}?3NPe_oEOlj+aSrOnGy1vP=aEg)4+d<COoS
I>?BbB2bWPZ3;+NC

diff --git a/lang/English/admin/bans.po b/lang/English/admin/bans.po
deleted file mode 100644
index 4a126619..00000000
--- a/lang/English/admin/bans.po
+++ /dev/null
@@ -1,183 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "No user message"
-msgstr "No user by that username registered. If you want to add a ban not tied to a specific username just leave the username blank."
-
-msgid "No user ID message"
-msgstr "No user by that ID registered."
-
-msgid "User is admin message"
-msgstr "The user %s is an administrator and can't be banned. If you want to ban an administrator, you must first demote him/her."
-
-msgid "User is mod message"
-msgstr "The user %s is a moderator and can't be banned. If you want to ban a moderator, you must first demote him/her."
-
-msgid "Must enter message"
-msgstr "You must enter either a username, an IP address or an email address (at least)."
-
-msgid "Cannot ban guest message"
-msgstr "The guest user cannot be banned."
-
-msgid "Invalid IP message"
-msgstr "You entered an invalid IP/IP-range."
-
-msgid "Invalid e-mail message"
-msgstr "The email address (e.g. user@domain.com) or partial email address domain (e.g. domain.com) you entered is invalid."
-
-msgid "Invalid date message"
-msgstr "You entered an invalid expire date."
-
-msgid "Invalid date reasons"
-msgstr "The format should be YYYY-MM-DD and the date must be at least one day in the future."
-
-msgid "Ban added redirect"
-msgstr "Ban added."
-
-msgid "Ban edited redirect"
-msgstr "Ban edited."
-
-msgid "Ban removed redirect"
-msgstr "Ban removed."
-
-msgid "New ban head"
-msgstr "New ban"
-
-msgid "Add ban subhead"
-msgstr "Add ban"
-
-msgid "Username label"
-msgstr "Username"
-
-msgid "Username help"
-msgstr "The username to ban (case-insensitive)."
-
-msgid "Username advanced help"
-msgstr "The username to ban (case-insensitive). The next page will let you enter a custom IP and email. If you just want to ban a specific IP/IP-range or email just leave it blank."
-
-msgid "Ban search head"
-msgstr "Ban search"
-
-msgid "Ban search subhead"
-msgstr "Enter search criteria"
-
-msgid "Ban search info"
-msgstr "Search for bans in the database. You can enter one or more terms to search for. Wildcards in the form of asterisks (*) are accepted. To show all bans leave all fields empty."
-
-msgid "Date help"
-msgstr "(yyyy-mm-dd)"
-
-msgid "Message label"
-msgstr "Message"
-
-msgid "Expire after label"
-msgstr "Expire after"
-
-msgid "Expire before label"
-msgstr "Expire before"
-
-msgid "Order by label"
-msgstr "Order by"
-
-msgid "Order by username"
-msgstr "Username"
-
-msgid "Order by ip"
-msgstr "IP"
-
-msgid "Order by e-mail"
-msgstr "Email"
-
-msgid "Order by expire"
-msgstr "Expire date"
-
-msgid "Ascending"
-msgstr "Ascending"
-
-msgid "Descending"
-msgstr "Descending"
-
-msgid "Submit search"
-msgstr "Submit search"
-
-msgid "E-mail label"
-msgstr "Email"
-
-msgid "E-mail help"
-msgstr "The email or email domain you wish to ban (e.g. someone@somewhere.com or somewhere.com). See \"Allow banned email addresses\" in Permissions for more info."
-
-msgid "IP label"
-msgstr "IP address/IP-ranges"
-
-msgid "IP help"
-msgstr "The IP address or IP-ranges you wish to ban (e.g. 150.11.110.1 or 150.11.110). Separate addresses with spaces. If an IP is entered already it is the last known IP of this user in the database."
-
-msgid "IP help link"
-msgstr "Click %s to see IP statistics for this user."
-
-msgid "Ban advanced head"
-msgstr "Ban advanced settings"
-
-msgid "Ban advanced subhead"
-msgstr "Supplement ban with IP and email"
-
-msgid "Ban message label"
-msgstr "Ban message"
-
-msgid "Ban message help"
-msgstr "A message that will be displayed to the banned user when he/she visits the board."
-
-msgid "Message expiry subhead"
-msgstr "Ban message and expiry"
-
-msgid "Ban IP range info"
-msgstr "You should be very careful when banning an IP-range because of the possibility of multiple users matching the same partial IP."
-
-msgid "Expire date label"
-msgstr "Expire date"
-
-msgid "Expire date help"
-msgstr "The date when this ban should be automatically removed (format: yyyy-mm-dd). Leave blank to remove manually."
-
-msgid "Results head"
-msgstr "Search Results"
-
-msgid "Results username head"
-msgstr "Username"
-
-msgid "Results e-mail head"
-msgstr "Email"
-
-msgid "Results IP address head"
-msgstr "IP/IP-ranges"
-
-msgid "Results expire head"
-msgstr "Expires"
-
-msgid "Results message head"
-msgstr "Message"
-
-msgid "Results banned by head"
-msgstr "Banned by"
-
-msgid "Results actions head"
-msgstr "Actions"
-
-msgid "No match"
-msgstr "No match"
-
-msgid "Unknown"
-msgstr "Unknown"
diff --git a/lang/English/admin/categories.mo b/lang/English/admin/categories.mo
deleted file mode 100644
index 73ca42af061e53155923b6c77b56d277bd521e43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2167
zcmZ{kNsrt_6vqolSekuU!mi>lXeN@KG$PWdXC@?>O(V@f3pxl;E@ivA+r+MFRh6gH
z$6Pogp&$-$LpkNfg%7}q&w#=mi3=AbPW+!;?#10$a{u~0SG~1fJzP6?kKuU@?^}3(
z$GeXAhez;(=klYBy#%(wSHT1DMer851}gA5@Gkf!_zidgd;q=<{tD9mhhG1;ms^ij
z_TKTl0@C^u@C~pJz6{<4Uje@Z-v%Fe{cj-o`2(c&|9E-rTxI7X*hLQeAjNm@e8r!@
zZz2B-Qv64cGxh}dB}j2b;Pc=aNO^t@!UX#sd=mT-JOuB9<o_>_)}4nD;stOU+yt+I
z((CVoZOFfXWdBdkf5D58TQL3}cm<?<Zh^i9W!=d(#ewpb^#G<1^^R&qc43Y^i?@ZB
z@<w<Jsj?UFu6mw<lJcV5pPpMlwRy_RC~f&rzU+FE@K`uG&?c3Z52Z+&I$K0d^#lvE
z(fq;*&qO4%Ql;dWV^f|wwl_0fj1mY5H!?|$jHllwTqMa#eIhftdWRCZ^bWm;2_I>j
zx>T!LuT?)aIj@ZHRP{C6Th!Hw?U#O*%CM|ny<x(W)W(@eb7|P(CaMz(+EiAhYHF2s
z{7htNStfRnq;4ssrm_y`w6Km#<)lHPXeO9TYsEmaxld))YW+<mqD*q9>k9c(Fk#)S
zFd_>MwaIOVt5GT1-S@Y7^>=qe@ppH5dvm+hHTo;GGB{3x&!n-aeup1Q;fB)OxY6o<
z+za*$MCgNkG{3{43qFx&DJ`v4C&Id*XN0nuaN1zeiBN+A!3RAl@;QrqM<jWwuJtPy
zQ50%3xY{~BK0TQEZ-<v#XtYB)g5G2Vr%v8+mquui+UD_47%ScG&E8?KHCspC`_cpl
zD%MG=1|7Z?rEVHX2gPlD9vn#}O%-ET;}|>M4!6P&@TC%iPjz8pxmWq<@XE>jm|(`5
zVs9vU*%{sEC>*Ehse8dEy5M7>9Q6rf67nygh=t;%_i{Ong5NsbhC<>9Y*;BdhEk6=
zLw=;m#=7;Ecwd_$FD3Xe3tq!AM6sZ&2Ybathqca6@|>Jh6CARS5GCvS31!!fEHkqO
z{<xuV3wc(X%34el+Of`PHMqKNcP{zAA2!FiUfdWrD*585k>(haX=H?u<J(G)Gnov0
zC?d;d^~Wp<K2D*Eq#u;!ao%uxAnD9wr5kcG;HxWCLiduhoQ4^P5@*nE*5Qb$A4YA>
zX^63?ytb&dWg+NBLzwYU#<y`W%d$lJPV;_PlIvnuW)Z#cH{_X|-VwNM3K`CvS2qY6
RPiG1#EcAf=?~M_%{{T<hS-}7R

diff --git a/lang/English/admin/categories.po b/lang/English/admin/categories.po
deleted file mode 100644
index fac4ce86..00000000
--- a/lang/English/admin/categories.po
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Must enter name message"
-msgstr "You must enter a name for the category"
-
-msgid "Category added redirect"
-msgstr "Category added."
-
-msgid "Category deleted redirect"
-msgstr "Category deleted."
-
-msgid "Unable to delete category"
-msgstr "Unable to delete category."
-
-msgid "Delete category head"
-msgstr "Delete category (together with all forums and posts it contains)"
-
-msgid "Confirm delete subhead"
-msgstr "Confirm delete category"
-
-msgid "Confirm delete info"
-msgstr "Are you sure that you want to delete the category <strong>%s</strong>?"
-
-msgid "Delete category not validated"
-msgstr "You must confirm the deletion by checking the box"
-
-msgid "Must enter integer message"
-msgstr "Position must be a positive integer value."
-
-msgid "Categories updated redirect"
-msgstr "Categories updated."
-
-msgid "Add categories head"
-msgstr "Add categories"
-
-msgid "Add categories subhead"
-msgstr "Add categories"
-
-msgid "Add category label"
-msgstr "Add a new category"
-
-msgid "Add new submit"
-msgstr "Add new"
-
-msgid "Add category help"
-msgstr "The name of the new category you want to add. You can edit the name of the category later (see below). Go to %s to add forums to your new category."
-
-msgid "Delete categories head"
-msgstr "Delete categories"
-
-msgid "Delete categories subhead"
-msgstr "Delete categories"
-
-msgid "Delete category label"
-msgstr "Delete a category"
-
-msgid "Delete category disclaimer"
-msgstr "I hereby acknowledge that all category data will be deleted"
-
-msgid "Edit categories head"
-msgstr "Edit categories"
-
-msgid "Edit categories subhead"
-msgstr "Edit categories"
-
-msgid "Category position label"
-msgstr "Position"
-
-msgid "Category name label"
-msgstr "Name"
diff --git a/lang/English/admin/censoring.mo b/lang/English/admin/censoring.mo
deleted file mode 100644
index 2f0e456c224163bf2c73bf679de354e34c738d35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1551
zcmZvcOHUL*5XVQw2kRR(8sninm;iAGF&@bB2#8=v05`gV9(!kMciYT#Z@POx?tBFK
z2p;?n>dCVQ?|SnC7;nad|DKs;S+$eqN7qzWRo7#`jg1@xSQoKxVZXt?j(zSJ{$O>%
zbD#vzgFE0Qa38z^9)M%uJMc329=rg4uD*W-y}cixzc+fk)Vm4#`**=>;9|usumRl^
zJO%lO6G0H+{0TgR^Uskoj^AL2bL}K-fHUAI$lz5_g9Pq_H^8@`_xBO>@qPil-uH^X
zK)5N^*@_-;8z7V-KmJ`%EBu@W{qiyT{M4|0e17>nA-v(W6g#OErJ}`Yu#_aUt4%^u
zwe{d+^H!Hd5-hW_+Hj>)UMXc#btsWmv{LS?c@e9>C54@pL^?8@=^duN?Ty?z=sPxL
z1Q}Z^Ivi~3;%pHTrP8|KDfdzla|Yci>TMsfND>5w;H2T$1%<41@wYVZCBhxmZKSyo
zX}GFQX6vMS#nH~+pQZBO`Ef<J=V^Lkw$?EE70icgNw~$vB6D?GW#PJP9zLu!o;1T{
zgCpeOBRHuOWZ_fZkzTbgS{K%ZO(T>|h0_K~>q2#Myf$pI$c|W~Igw;iEw)P+tyZK>
zXQ8&Swy`qsKONnxEo)>>!RlTQP948?Q^=B3vlMrQvFzrbH&?@%fu8r?W)rTcSSKh|
zon~6n9R^ZIDQYjm$E?_tF*Y<(>u5Tfi5}ofc?_TF+{C<G`lwUsBq)0-SShM0%6hu4
zaI~j$+7&3A(-arYL_#Hm^r3QtvikU`tqnd%TU?K5Tc$}YOkznGCK1Qn^F<t&5l1v>
zb;gs>%+rK2;o>fN$u7zQU3f^fVlSD9sBGA(sYGfuiFO+`rQEVn0(}?JChrzUIG1Tk
zN;_)75W3q(Zn%R+^o=TAcW{kj6ahK+jW5(*^}uRcV6=%>S{4Su;Z?D)jGng0f^>3+
zqr-6<9<yN1I-^x*VK8X8-Jdl-6?bejH&rS9U%MK^f0PeR2E{}o;nh(3-vArDM76TP
sSoRCqFJ0tkv#Mfop+BP0(2V*|<94EYRoM*1utr0oYF3AZ)u=|nA7$gXPXGV_

diff --git a/lang/English/admin/censoring.po b/lang/English/admin/censoring.po
deleted file mode 100644
index 665e0f88..00000000
--- a/lang/English/admin/censoring.po
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Must enter word message"
-msgstr "You must enter a word to censor."
-
-msgid "Word updated redirect"
-msgstr "Censor word updated."
-
-msgid "Word added redirect"
-msgstr "Censor word added."
-
-msgid "Word removed redirect"
-msgstr "Censor word removed."
-
-msgid "Censoring head"
-msgstr "Censoring"
-
-msgid "Add word subhead"
-msgstr "Add word"
-
-msgid "Add word info"
-msgstr "Enter a word that you want to censor and the replacement text for this word. Wildcards are accepted (i.e. *some* would match somewhere and lonesome). Censor words also affect usernames. New users will not be able to register with usernames containing any censored words. The search is case insensitive."
-
-msgid "Censoring enabled"
-msgstr "<strong>Censoring is enabled in %s.</strong>"
-
-msgid "Censoring disabled"
-msgstr "<strong>Censoring is disabled in %s.</strong>"
-
-msgid "Censored word label"
-msgstr "Censored word"
-
-msgid "Replacement label"
-msgstr "Replacement word(s)"
-
-msgid "Action label"
-msgstr "Action"
-
-msgid "Edit remove subhead"
-msgstr "Edit or remove words"
-
-msgid "No words in list"
-msgstr "No censor words in list."
diff --git a/lang/English/admin/common.mo b/lang/English/admin/common.mo
deleted file mode 100644
index 80370172ebed1c83e490488693dfcd113d29b4e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1802
zcmchW&5ImG7>6sm(PZLBOk&h%v|?OPp=Yy_$TGW|nBDA##o1)s4>6wXovxj<&U6h`
zJxg-%KM?dH9z4Z^Cs91)mWv>Q2QMBBUIal<yoh)bL41DGlk6ghCoSr&r>gq>sCw(|
z?+%Q;YiP%j$B>h|jG2JVI~Ztt?lk5uxEIpReumxf5Ujx?a14%**3ZJdtWQDNof&;!
z9Iao3ceB3&<>ytn555NX!!EoJz6o`Nx8MWtZKyccpzJ?{^8YcE{dM>t{0!a$Z$kP1
z0ZQ*@D7#;w{QM53_a~J9eQZkaD3rgapzKdTRLt{`ZW;_Na&!ht{~eU{{XHoC_ZgIz
zYf$<hjn<z+<>dyH-4~<pUyasZL!IwiNH^az=o~*n<>fc1yo_P2yc~q5;9;mZO(^@9
zAl+PI80Hm9uM2hG51{;i0_o;DgY0fV`S~15?@Oq>d;{s`CkFZZ1<L*psC)0iSa!Q1
zX&Ksrp^bP5IiLwmc~O(y!-)K;9YOSVY6lVBQ)hY-QO*t{k04JVy8CfNF&{!6MRcB{
z$lsgtrnU#M$T37Uem|nSJ&xRq4BOdunft<=%`&8yYsP4Mt{9lPw1{RtEnUZl+%a`U
zWL9*{IoEZiGYeT>nnfQ5y=cyRyOFlvFiS<|u9)RCFG^RWMceJ1+n&$ZU<hgHLlx$N
zHy6C^cL$we;26`6W2bQDVqb@grj>^1f@!(X%VVszD)r4Y@45^>l~rrF8!Nx9Fu=!(
z>-jCA??V~QYRW=`ZC_4{4!2r$Vao*@%e2g6nYW`^?`K@vtP|6Af*<tRVjj&U)Gxc>
z3~@r*O}Kh5Hf+J!S;pDtrgaUbvriZH*sPs=X1dl2{&m+blcg+q86O<JVHaIm;%9EI
z*1EWs%m<e2C+CRTu<Ru(ZY!7St*vGn%VaI^9$n=Pr6z|Tkf>zMrM(><?M$i%d||T+
zv9VG2p>w*nytKTq9e=WZqBigKKzO~{Cur%eloS0fuQsj3knVDJeQhzB+SXI_O&5}d
zqU|$^pkb#r^78gU8rBuHSCaFtsNS|=Ti#J0cCtQIKgpMBnXLLjXuJ6;M#EM?%>Ph^
zz3r0xr!rjA<Jvsh;&wf@)2<3^JX(sAN4r(0Ssr**AFkH_wN#rvRlcm>-02{(GqDW5
Z=$sypGZUk!O>9-sb(I+Z!+&4Oe*v%hjEDdL

diff --git a/lang/English/admin/common.po b/lang/English/admin/common.po
deleted file mode 100644
index 7fd3c5b6..00000000
--- a/lang/English/admin/common.po
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Admin menu"
-msgstr "Admin menu"
-
-msgid "Plugins menu"
-msgstr "Plugins menu"
-
-msgid "Moderator menu"
-msgstr "Moderator menu"
-
-msgid "Index"
-msgstr "Index"
-
-msgid "Categories"
-msgstr "Categories"
-
-msgid "Forums"
-msgstr "Forums"
-
-msgid "Users"
-msgstr "Users"
-
-msgid "User groups"
-msgstr "User groups"
-
-msgid "Options"
-msgstr "Options"
-
-msgid "Permissions"
-msgstr "Permissions"
-
-msgid "Parser"
-msgstr "Parser"
-
-msgid "Censoring"
-msgstr "Censoring"
-
-msgid "Bans"
-msgstr "Bans"
-
-msgid "Prune"
-msgstr "Prune"
-
-msgid "Maintenance"
-msgstr "Maintenance"
-
-msgid "Reports"
-msgstr "Reports"
-
-msgid "Server statistics"
-msgstr "Server statistics"
-
-msgid "Admin"
-msgstr "Admin"
-
-msgid "Go back"
-msgstr "Go back"
-
-msgid "Delete"
-msgstr "Delete"
-
-msgid "Update"
-msgstr "Update"
-
-msgid "Add"
-msgstr "Add"
-
-msgid "Edit"
-msgstr "Edit"
-
-msgid "Remove"
-msgstr "Remove"
-
-msgid "Yes"
-msgstr "Yes"
-
-msgid "No"
-msgstr "No"
-
-msgid "Save changes"
-msgstr "Save changes"
-
-msgid "Save"
-msgstr "Save"
-
-msgid "here"
-msgstr "here"
-
-msgid "Action"
-msgstr "Action"
-
-msgid "None"
-msgstr "None"
-
-msgid "Maintenance mode"
-msgstr "maintenance mode"
-
-msgid "No plugin message"
-msgstr "There is no plugin called %s in the plugin directory."
-
-msgid "Plugin failed message"
-msgstr "Loading of the plugin - <strong>%s</strong> - failed."
diff --git a/lang/English/admin/forums.mo b/lang/English/admin/forums.mo
deleted file mode 100644
index 03ddd80dc6c4a33dfe423faa626b936b95d41701..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3548
zcmbVOO>A5>5H`>s8h%?SP@u&rlqMzbl~f?LNz;<1ZHStrQL<^_=-ubtea-t>Y`-MS
zt%w7MN*n-j;J^VD2^Ar6p}m2`u^?3(Iq-8p2o(t=Bo18Q8{2Pplkg*9#rdAc<C*cy
zcxJ!ZvFR;_5nw)w`RXl<jRAkY75^~4yN$7J!0&-~18;i#19%VC+cr7+F5tab4*>52
z9`QH>d;n|V*Q>xCSYHC(0elyDKky2W<b4JteK$P)YapHf1^6Iv%Vu|O50La70Mh;_
zkoM>O`T}ql))#>!?;RlNy$mG2Yd|`8!>@k?65pRdvVYqa$G00u_kI>g=T8E+1J46V
ze+;|}_%e|AUi15Jd-?~!t)O28(tSS#lKksHI{z(j4nF@CNczWbcX$SP1nWiMPT=c6
z{ISdUM|>Xv$#2(y6TmNlj{&!1a}qcVBzxOHh-R1k`VC+o*6#!1QuZ<MPT(g%vj1}+
zo%;$1SFj&|#DCN8{|=-$Z3Zzwj_d^P!+HWju*G5^`9lK_051Z`t`C8fUta);?<XMn
z;WuDEa4Qbs3TzMv5<3JWe;o&s{xiTmz;k}T08$)Y0g~Ns0?E(s0qNWoAj!W9BtKsV
z!p+uJfE{$6d_eZlS-KYuvYUKs?EzB0Jc&u;AxyH5?nHJyg82j{#IuJn2QYVI_6~|4
z*+}-#2rxP3eoV5J;zNV{PQIYA7xQsU%F!Xra`<OybNeX}DMmE#9PK^HM>NRSc8o_6
zuji^rS?7y4rHIxnlUC0%5mlM631MU-S8cv-sf(&TK9OhjSfxCYi8RuQTt|zudd}9-
z{^9tFP#K$05=wa{S9r;G(n(L^Y>AzUVgq$X#EI@OSfah3Gr_Jc`)Rr~7f~c5u4EJ|
zSu@NLoy~tk)-@HkOq^%_){fnIz<p;Tm1{PORs^Hh%hG%UeNyE`i?^goW38b=bL*dt
z<nr#*LL1)7wP7<N6AkIYsNFqh3T##-WFSmZ@l<LJ9#+zqMG{B6=7Z?S61<Ar8<gy`
z@O9m0$8275$5L~-8bj|KjMZ@7vQ%rXIG5|V$4gimaJ3RT>6~RrCU3>Hk}{8+bE-Vc
zypIX)gY@gH-1&K{lbaj?uZtovY#~>;aG8z^MfC#3vqCDkHbNP;n2Bm4=?sGIZ?$Nn
zLteB7Yc`h@N+bb-nd%Xqwd_)l9UA5Cb8H~v{bPK1aI|ku<)kB+ih^@eQOHL4X=G?q
zsuL&r=FV0Eo3Nk<C*kK24q5=iV`42y6vUvSM5YsAas{Soku?g0DyT@2_DJMMMU=+b
zb9JYpS`Bm6IMz2aHFK(~e>i-)4=>6fltHE4f>I+_&B0b8;%t=HnnG!5#uh85gTq}u
z(q5M;IF;4%D9#!q{BSik9YaRA%=%skCS@j-vvDp*Yz!X`4~NfS$1Q_}yihec;dG2}
zr=(jqdcGF$YHNnWQ)N!IDJ(0^xYp$Dyx=RbZkB-(_QBgE47)ODx0AhPE$S4dk@aQ8
z<?y(YR=h6oVVc4?Wg>$ulu5QykyVzRAJs<XS>xC~ee|IJJkF-l7BUS-`ngTnssyui
zhv7SRetdp*YId@p+tLII7hc>-oFt_Zflnlz(R?7TbCI<N@lu^hR(F3{?0Rm`T(NU?
z&ROWIT@T5A`Z8u~Te!BSg^<#%Vgt`tW~K)nhv%c`?>~Ks@)9~FD`Zn-YOLvA>5%nd
zO=KLIWkc#r(=Azx>v(*<6%AXKC5r1vI3y`AG)hi`N}mq-RNV?|ie;JYH#`-QB;Qcp
zW)0L11gX?pr2Dly*Q;O%Ipm|Nr9}Np@)Zt4DW<+q@T$-#$0*^j*C0MrXZb#8AE)Pq
zvSyQ9bCIlwHmWI%;q`*z)l-^97I9&dsGwq4OA54+kW)c))w?U*=9#-Nud6&=V@$8i
z(m7q1SQV*IORj%}yn=h|?N-XYJvPBfvbI#sSMhjYEJ}YAYbtmVM~0CDte5GsFBMYz
z@?2YT&T&GkxlmEB(2$=-#LDjI@>mbSc?lluzt{qoQ-vV)p-WDueB*Up7U9>&KXfyO
zPT_h<>N}e7)f!<bn;V*00YxvOa#$|c$OK>4<TmWPOr?wu*?)JsvMqP|ovj(R`{=M^
zCw+9fom;p*hZa_LIChpCD3<X{#kM5GM5Zm%_6`Q8`#HiF=clot_UZ~$Ppk9Iv)X3=
HyVv~%37X56

diff --git a/lang/English/admin/forums.po b/lang/English/admin/forums.po
deleted file mode 100644
index d3153c81..00000000
--- a/lang/English/admin/forums.po
+++ /dev/null
@@ -1,147 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Forum added redirect"
-msgstr "Forum added."
-
-msgid "Unable to add forum"
-msgstr "Unable to add forum"
-
-msgid "Forum deleted redirect"
-msgstr "Forum deleted."
-
-msgid "Forums updated redirect"
-msgstr "Forums updated."
-
-msgid "Forum updated redirect"
-msgstr "Forum updated."
-
-msgid "Perms reverted redirect"
-msgstr "Permissions reverted to defaults."
-
-msgid "Must enter name message"
-msgstr "You must enter a forum name."
-
-msgid "Must be integer message"
-msgstr "Position must be a positive integer value."
-
-msgid "Must be valid category"
-msgstr "You must enter a valid category"
-
-msgid "New forum"
-msgstr "New forum"
-
-msgid "Add forum head"
-msgstr "Add forum"
-
-msgid "Create new subhead"
-msgstr "Create a new forum"
-
-msgid "Add forum label"
-msgstr "Add forum to category"
-
-msgid "Add forum help"
-msgstr "Select the category to which you wish to add a new forum."
-
-msgid "Add forum"
-msgstr "Add forum"
-
-msgid "No categories exist"
-msgstr "No categories exist"
-
-msgid "Manage forums head"
-msgstr "Manage forums"
-
-msgid "Category subhead"
-msgstr "Category:"
-
-msgid "Forum label"
-msgstr "Forum"
-
-msgid "Edit link"
-msgstr "Edit"
-
-msgid "Delete link"
-msgstr "Delete"
-
-msgid "Position label"
-msgstr "Position"
-
-msgid "Update positions"
-msgstr "Update positions"
-
-msgid "Confirm delete head"
-msgstr "Confirm delete forum"
-
-msgid "Confirm delete subhead"
-msgstr "Important! Read before deleting"
-
-msgid "Confirm delete info"
-msgstr "Are you sure that you want to delete the forum <strong>%s</strong>?"
-
-msgid "Confirm delete warn"
-msgstr "WARNING! Deleting a forum will delete all posts (if any) in that forum!"
-
-msgid "Edit forum head"
-msgstr "Edit forum"
-
-msgid "Edit details subhead"
-msgstr "Edit forum details"
-
-msgid "Forum name label"
-msgstr "Forum name"
-
-msgid "Forum description label"
-msgstr "Description (HTML)"
-
-msgid "Category label"
-msgstr "Category"
-
-msgid "Sort by label"
-msgstr "Sort topics by"
-
-msgid "Last post"
-msgstr "Last post"
-
-msgid "Topic start"
-msgstr "Topic start"
-
-msgid "Subject"
-msgstr "Subject"
-
-msgid "Redirect label"
-msgstr "Redirect URL"
-
-msgid "Redirect help"
-msgstr "Only available in empty forums"
-
-msgid "Group permissions subhead"
-msgstr "Edit group permissions for this forum"
-
-msgid "Group permissions info"
-msgstr "In this form, you can set the forum specific permissions for the different user groups. If you haven't made any changes to this forum's group permissions, what you see below is the default based on settings in %s. Administrators always have full permissions and are thus excluded. Permission settings that differ from the default permissions for the user group are marked red. The \"Read forum\" permission checkbox will be disabled if the group in question lacks the \"Read board\" permission. For redirect forums, only the \"Read forum\" permission is editable."
-
-msgid "Read forum label"
-msgstr "Read forum"
-
-msgid "Post replies label"
-msgstr "Post replies"
-
-msgid "Post topics label"
-msgstr "Post topics"
-
-msgid "Revert to default"
-msgstr "Revert to default"
diff --git a/lang/English/admin/groups.mo b/lang/English/admin/groups.mo
deleted file mode 100644
index c76b6c961767db43e55cbf7a7f06130c998d6971..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8477
zcmdU!U5q4E6~_w!(NR8CP!zqhfV->HJ^LjtvmY?KJG%_-%nmcN2mwv1yKi?FR9CfC
z)iVqU(TJLjnh>HJW5h(Gpz%dCCTcJ-MhqnKK-5GugkXX(`hpK=jF{-}+>h$&nc0nI
zd9kv0{(VoKd+)jDoO{l>wJ%(8!Rdf!iS{nq4_+4p9|MnH$RD1|E((In!OOu*!E3=w
zz}>EY2)u^=BKS724_*m=27C+nRoDNX>pu-%0sVQ`f7!i1{|$Eh)!>_XzXOzY4}fn1
zPq_YFpp5T1`~)cLe8Ii{mct*r_rC-$<NXVu@VyMa5j>wivY(4Vd4CNk>(xP-|7P&5
z;F80xd;b6^`+NwLeLf1xygzaHtfRjK%6zXn`o&{*zHv~--2h$%&Viy&4T?MkDDr#?
z6gf_VZwJ2(3g6E_;d|EMi=goT)%DLqS<=58l=ZiOGS41IKj!FnIQl)H$o~K+^F9p9
z_^*R9{`;Vef711T>-v9o{eQXsB^XWk$3fxW?eHil^WO=IfAv7o-)BM5!`DDr?}wm_
ze;O1ye(&gi0cHHFpxEQmi-Ta{ydby^<X<pADKh>+@HqHIQ2g-^;Qipg!8^eFne;mF
z*Wh9BAE3;)pTReRw}C$gKL^UZClE&V@exqu>hlK?f=@bp2z)*LN5DPcHyr&raE|^T
zL78ValkhW`2JZ%!Kw0;3@Jjaa3y^=o^K9}0@MUlp_zH+ggRL;11b2b&1y6yZpYMVq
z&rcmb1Il{81KD!$Cx?FrAEtjHO1~ET5{SuyC%`Abr$7Zhh%pwxZ-V3C-@s?Ut8miO
z;7g#)e?QJB`aR|FG4Rv$p9E!}x4t6??gH-y#cn?WKMy_w%6{&=+UlzXiu_*&Yv5y`
z$n_iW3H0(JDC<3f)BF?s4k+UvW$_c><DdeAcVi=99AqoO$H9++r(ORQ@J9M$@3HG0
z0dJsx8z_1|1?~sG0^R~X2jT+3xUzEY0%hF}xC~~l{}i}~{;xn;_ac;r*v2;E7t^$N
z(r%^6vyXP1b~Eh=O`ZuF!-Au<_tC14=tlHWeZ;PqC8#^1glO4|$T#I^9#CI!kS0Da
za*8dkr^zGwlLwU=pOXEH?`@-@F7xc*ujv0nG(uRglZGn=yJ<5t(dqd#|A_77Ty3F=
z|B5g92h#_WG|~4wZ97dKLb1^`t`i&(f_uatM5l*nn8U=$4}gm_(nat=nt$HU5Akbx
z#D4P3(YDe^Wx+9;JhK*po50&>xKFT`wnS63@|kY6R3}RZeU%RyT^+W9l9DUaKNKcv
zkn2pkaX%P#<FKLQ;Bc5EX`wRROINgN>2^4X3)Rzk9(HtaxEm%Nt@>e}uclec&9Q;%
zrb?4`l=YY-)`eD4(oTcJqckt%I`V3mCBYH5w%v{qc9djS8Kq^q6=k|vtQ+muIbuaI
zQ^I28^7ErBM~S24UjMtF=7rm)duu6vaWh4c_M_$~mm@j0C=VMkddt#YT106Q%+z{e
z6svZerY&oT5sDo)(~1gf&D?6QO7L4UG$XP3Rgt&Sugr%G?Fd<nLM@A<IHvoeyoi#H
zU)VU!G2>EUtEF4GhEuU6wyYK_Y`iZv@>!4CFg(|VtR~9C0CvifW?W_+&F|Zii>P2P
zR`NMi+0UXCcGuC)8tZ6PMlpr19tF!=C70|v3yU<fMwpX>VNZ~euhRGYC4(1sZjcvB
zCxy<GmDnGsdA;h+tFgzhYo}Vk`>IY-=~o!U`fk65!S*W*neNAtSBYWqlnPVTi4D()
z3ojVg^&2<Bj*{$5i&#-L(lB#gUFmy<B<zh$v#2W+&(u$|k&Q3v3dJ%l=`d?{tJ)c%
zc&4PKv^i`}Lrc0s@l1tER}*I%v$rK(C0Vv*<7;7@vBx!~<(%YYWIRboRWT%$Te-|M
z8>n_BL*BsW2o)CVE5n(p-hO+8>xdf~ue8T`9nH?P5D&62t{qLYUOuIgzUk%%cI{L4
z=YegB8b6?RZr?YCMeiYa)@EC^+sP0Fsws6;hecOshYpP`oLH_MX7dujYDdCCPbp}%
zMZFRUt0x@~^P;w#g-IUEp@Hc*Nn=3zs4eTTSD8`m4_mz`xw&nZXf*0+);TyfH#;{o
zTz_YM#~A6M;Plj%*ZM44==+MvejG;0KGp1o8R6o<$>pQ9y+b}(y{)s_OwvqSgqJC`
zw-FVkAXA*hu{&zVbYc(olv+q7YN?&|z4bl3vEABII>?%u^d@UeDZ7ZtsEI$f(wpQh
z8Mh-rG7o0ks+YE0#HhrhFw-n6d7w3+!Z=Q?`6RTfq8sHd4iu?s_!M0arVU>?U#_aJ
zgXQipMVr-C)28o+b{V`?SF?#CRZHYaeJUO<H=)+jf$B+kB3B#lm92!T6}3?yN_S#~
zEInMU{u=BO(@8C1T(~SKHs7&hExCeebSZ-81AY|UurR&V5OJ%!)K2*Qd6A__=iv4E
z{z>=qruC(W(O>Z4>Bafk`D5d1x-G$4*02e#g-)!Bh33?p=^PKIv?=P?0u%DDq9waG
zGipNVdZ%t)+F4}Vxe}kilbfVVykNDf#TE1##_JGDbXHd!TOvwxkVS=%!#qv$373A5
zVr!wW^>7LuF&<N6s?upNzcL4nDQzAzIyZ9Us<Gy)y!vR-G}=Q5Hn~Jt^fjRw@5`h!
zcAN*>?QZaNS3DqYl$j9RmvT!4F?E&c{f{%athFsln(;u+z6ul3oXLRO%c(6}aAdSH
zOFF^)pw~cyX<O8uCe*mbzc$-IHzd*HZ>u4pqoIpcjs3I~c6nWis(81<IHX;r9?Vp#
zzDUY}l`uA^xS#17ij5LH!5QY*0Pn)q(-I@S>F86Y*x-Wukjmz?$eVkYte*T^(p9~p
zvkB`{c#HUot<LIdA;y`sqS$vQ2;<}_so5?+VLNGGqP=z0K@zU8H&e-OE8Tg&?j1C-
z(->?2Bwf|lSue^ZDX2Ei*D*WUUSGErg5YYnMp_m%wg+)s8HW$d5RfOGgIJji>Fn-c
zB-!9jGL^E<bnemFEMZQNE2WWjvoO7pFPIsvtzEfm%Ido7*bTdmOrcx;m8+nAmjh`k
z=irc*TvA#JpBU=jT28`&Kep9(VjOulj0bhK+|{^6Ia|LUuc@ewpNJ_3J(c%$Gipc8
z4U6DEnw-(JVZ!Ib;Y_1)xgDB{CYbdpN(2h6I2&Sxag$+C3mZ`!6;!no)IO8B1U$)N
zcsQ5Ss3Ql7<LCI<P(sV-6LHN(IHEpex8&tY6b^M!376u;eTo-}2wqoPbGgdNHOiab
zhKHea!@U0*WJ=Z=-c|gH<yxjD7-0!EJKMGf_&-!I4teG@uE>m1rQoDpN|a3!Jr%kM
zkY&Wn$t}&IOy?56yAc-&jEmztZnYW_kE+fz=;H|Hbm9^9pmOUg(rRxg5FTvP;+?+4
zvNu3qNEqLjoa*Emo<h~e;zO}iS#4UeqJ$hzM2on843D#9XcG|38D`9V#5{3avla5G
zsb(a_)QSNPFQdyLd<T+b;Hz4W%Q+`Po60xOgA2oZZJ7pb47CSo!{N8toSVM6>YCS5
zGPpI&L3Vo~tK_K)iCc2x#kvv<!h%B4=1V!ltGbaBSt)sSY$`9a>Q;ZK3Ft;Zv)I}5
zjR@e23scCOFF|g+D?0v*8AS26B5^}qc_N-8d3)q|%cjDLt-?W(_PCWbxm1`~%@$3q
zh*O8Esk4Hsl1j?D#wpGD-InX~Eiz-v)hK7EIHl^9YE?cCvJRDniLd@JCF?3o<M;&T
zOq2D+Aj3MtzOp5KZt4ST^Ux#@rlle^7Zh($<G)3CFSUzdDNlLS>yaV3h{kJWU0+x8
zWkn;V4twc<TLHn_Y}=dxdkkHzUZh1BZ(xJp=Aj9*<IQI3g)PZ7@Y$GQ6NJCVVaICJ
zKD!UB$X#C6FkenwV)EOsxUy7pYph8MHd`u(m`YF_1xls~^43tqFFsafS;U7siodn>
zDZD)Xin7S)9PuHFKWv##xA=?3=y5dmNE3Wb;-h@mggs6>Q8LNjbby19>&q)lF#HDe
z8stKPefj-p^Hf;nIOib75#~$OnacT*uTo_oJJ%b8{SKthwCGaxyH~mBS)*rO{pN+S
zQgIV|iIn_<wcIDNv%9JBjPj~x(p8zm?B}u}O>Q-KA^zk)nEAA~$`#c(yZxHANy_$i
zwQ*t8`H;SyY5qTf?B+h0NljB>b>*yli<8ZnkAy}pp`3k#uo=nx#C(?`Z`6a6&@Ihe
z*7&+~Z*@g~=Iu=;EF|7iwyWb>ZZ?fr*pXXi_f@#v`!)%_+)0_=eHb2*k1=IrV6gkX
XD2L1RND5MdlC4I+`(=_0NZ|hgb0FhW

diff --git a/lang/English/admin/groups.po b/lang/English/admin/groups.po
deleted file mode 100644
index cb17a229..00000000
--- a/lang/English/admin/groups.po
+++ /dev/null
@@ -1,261 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Must enter title message"
-msgstr "You must enter a group title."
-
-msgid "Title already exists message"
-msgstr "There is already a group with the title <strong>%s</strong>."
-
-msgid "Default group redirect"
-msgstr "Default group set."
-
-msgid "Cannot remove default message"
-msgstr "The default group cannot be removed. In order to delete this group, you must first setup a different group as the default."
-
-msgid "Group removed redirect"
-msgstr "Group removed."
-
-msgid "Group added redirect"
-msgstr "Group added."
-
-msgid "Group edited redirect"
-msgstr "Group edited."
-
-msgid "Add groups head"
-msgstr "Add/setup groups"
-
-msgid "Add group subhead"
-msgstr "Add new group"
-
-msgid "New group label"
-msgstr "Base new group on"
-
-msgid "New group help"
-msgstr "Select a user group from which the new group will inherit its permission settings. The next page will let you fine-tune its settings."
-
-msgid "Default group subhead"
-msgstr "Set default group"
-
-msgid "Default group label"
-msgstr "Default group"
-
-msgid "Default group help"
-msgstr "This is the default user group, e.g. the group users are placed in when they register. For security reasons, users can't be placed in either the moderator or administrator user groups by default."
-
-msgid "Existing groups head"
-msgstr "Existing groups"
-
-msgid "Edit groups subhead"
-msgstr "Edit/delete groups"
-
-msgid "Edit groups info"
-msgstr "The pre-defined groups Guests, Administrators, Moderators and Members cannot be removed. However, they can be edited. Please note that in some groups, some options are unavailable (e.g. the <em>edit posts</em> permission for guests). Administrators always have full permissions."
-
-msgid "Edit link"
-msgstr "Edit"
-
-msgid "Delete link"
-msgstr "Delete"
-
-msgid "Group delete head"
-msgstr "Group delete"
-
-msgid "Confirm delete subhead"
-msgstr "Confirm delete group"
-
-msgid "Confirm delete info"
-msgstr "Are you sure that you want to delete the group <strong>%s</strong>?"
-
-msgid "Confirm delete warn"
-msgstr "WARNING! After you deleted a group you cannot restore it."
-
-msgid "Delete group head"
-msgstr "Delete group"
-
-msgid "Move users subhead"
-msgstr "Move users currently in group"
-
-msgid "Move users info"
-msgstr "The group <strong>%s</strong> currently has <strong>%s</strong> members. Please select a group to which these members will be assigned upon deletion."
-
-msgid "Move users label"
-msgstr "Move users to"
-
-msgid "Delete group"
-msgstr "Delete group"
-
-msgid "Group settings head"
-msgstr "Group settings"
-
-msgid "Group settings subhead"
-msgstr "Setup group options and permissions"
-
-msgid "Group settings info"
-msgstr "Below options and permissions are the default permissions for the user group. These options apply if no forum specific permissions are in effect."
-
-msgid "Group title label"
-msgstr "Group title"
-
-msgid "User title label"
-msgstr "User title"
-
-msgid "User title help"
-msgstr "The rank users in this group have attained. Leave blank to use default title (\"%s\")."
-
-msgid "Promote users label"
-msgstr "Promote users"
-
-msgid "Promote users help"
-msgstr "You can promote users to a new group automatically if they reach a certain number of posts. Select \"%s\" to disable. For security reasons, you are not allowed to select an administrator group here. Also note that group changes for users affected by this setting will take effect <strong>immediately</strong>. Note that the amount of posts you enter is the total amount of posts of a user, not the amount of posts made as a member of this group."
-
-msgid "Disable promotion"
-msgstr "Disable promoting"
-
-msgid "Mod privileges label"
-msgstr "Allow users moderator privileges"
-
-msgid "Mod privileges help"
-msgstr "In order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user's profile."
-
-msgid "Edit profile label"
-msgstr "Allow moderators to edit user profiles"
-
-msgid "Edit profile help"
-msgstr "If moderator privileges are enabled, allow users in this group to edit user profiles."
-
-msgid "Rename users label"
-msgstr "Allow moderators to rename users"
-
-msgid "Rename users help"
-msgstr "If moderator privileges are enabled, allow users in this group to rename users."
-
-msgid "Change passwords label"
-msgstr "Allow moderators to change passwords"
-
-msgid "Change passwords help"
-msgstr "If moderator privileges are enabled, allow users in this group to change user passwords."
-
-msgid "Mod promote users label"
-msgstr "Allow moderators to promote users"
-
-msgid "Mod promote users help"
-msgstr "If moderator privileges are enabled, allow users in this group to promote users."
-
-msgid "Ban users label"
-msgstr "Allow moderators to ban users"
-
-msgid "Ban users help"
-msgstr "If moderator privileges are enabled, allow users in this group to ban users."
-
-msgid "Read board label"
-msgstr "Read board"
-
-msgid "Read board help"
-msgstr "Allow users in this group to view the board. This setting applies to every aspect of the board and can therefore not be overridden by forum specific settings. If this is set to \"No\", users in this group will only be able to login/logout and register."
-
-msgid "View user info label"
-msgstr "View user information"
-
-msgid "View user info help"
-msgstr "Allow users to view the user list and user profiles."
-
-msgid "Post replies label"
-msgstr "Post replies"
-
-msgid "Post replies help"
-msgstr "Allow users in this group to post replies in topics."
-
-msgid "Post topics label"
-msgstr "Post topics"
-
-msgid "Post topics help"
-msgstr "Allow users in this group to post new topics."
-
-msgid "Edit posts label"
-msgstr "Edit posts"
-
-msgid "Edit posts help"
-msgstr "Allow users in this group to edit their own posts."
-
-msgid "Delete posts label"
-msgstr "Delete posts"
-
-msgid "Delete posts help"
-msgstr "Allow users in this group to delete their own posts."
-
-msgid "Delete topics label"
-msgstr "Delete topics"
-
-msgid "Delete topics help"
-msgstr "Allow users in this group to delete their own topics (including any replies)."
-
-msgid "Post links label"
-msgstr "Post links"
-
-msgid "Post links help"
-msgstr "Allow users in this group to include links in their posts. This setting also applies to signatures and the website field in users' profiles."
-
-msgid "Set own title label"
-msgstr "Set own user title"
-
-msgid "Set own title help"
-msgstr "Allow users in this group to set their own user title."
-
-msgid "User search label"
-msgstr "Use search"
-
-msgid "User search help"
-msgstr "Allow users in this group to use the search feature."
-
-msgid "User list search label"
-msgstr "Search user list"
-
-msgid "User list search help"
-msgstr "Allow users in this group to freetext search for users in the user list."
-
-msgid "Send e-mails label"
-msgstr "Send e-mails"
-
-msgid "Send e-mails help"
-msgstr "Allow users in this group to send e-mails to other users."
-
-msgid "Post flood label"
-msgstr "Post flood interval"
-
-msgid "Post flood help"
-msgstr "Number of seconds that users in this group have to wait between posts. Set to 0 to disable."
-
-msgid "Search flood label"
-msgstr "Search flood interval"
-
-msgid "Search flood help"
-msgstr "Number of seconds that users in this group have to wait between searches. Set to 0 to disable."
-
-msgid "E-mail flood label"
-msgstr "Email flood interval"
-
-msgid "E-mail flood help"
-msgstr "Number of seconds that users in this group have to wait between emails. Set to 0 to disable."
-
-msgid "Report flood label"
-msgstr "Report flood interval"
-
-msgid "Report flood help"
-msgstr "Number of seconds that users in this group have to wait between reports. Set to 0 to disable."
-
-msgid "Moderator info"
-msgstr "Please note that in order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user's profile."
diff --git a/lang/English/admin/index.html b/lang/English/admin/index.html
deleted file mode 100644
index 89337b2f..00000000
--- a/lang/English/admin/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><title>.</title></head><body>.</body></html>
diff --git a/lang/English/admin/index.mo b/lang/English/admin/index.mo
deleted file mode 100644
index 4a7addb19d2ddd3d3b13821c293300399d51aedd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4052
zcmaKuO^h5z6~`;V5LiND5<&=pP=*BWCg~op?KsP93|`NAiKTdVvb#10Az3xuH8YKS
zs+y|m9j_6HBSMHnByLe8K8`>nF2IQoi4%eY2mu0xOC&%D2`NH|1Bm~ts_vcf+O($o
zS6x-}>V4I#e(ixHUt_pdaK8`tAMavp3w-%ac;Nco5ylq4--B-lUk4ur{{eFF-ZwM$
zPA~x<06!MF4c>=$2|frq@DcD!Ag%L_*#9H&U3mXB_#W^tAj!MyEsVVzd=PvXd=fkg
zo(D;f9q?`7HIU>N;N9To!S{n-1m6L^0+QTsgO7nf14+*7Ag%LHkk+~9p0LhiAjv%g
z(*MszZh~arr$N$RgY>_zfHeP`k>82@e&kOge;)ap$UjB?HS!IR^!g77mDqi64R$^R
zk{^$OWakO+UT_^G{a*x0j|?O~-2_R$m%u(^`6_rn-YJMA_b5p5dl;nkPJtw69mG_2
zCGuM27$o~X3!VZ$2YwKI6{NWR3MBb|21&1fffS!3c#yoKAjy9Or1?*Q2r)Yc;>R}d
zSOvF1O1ZCsSHYJ+^8eq!=fHo1C%`jUgzO!G=we?0N&c53Uj|9v?}Bh8`vFLDehgCl
ze+eew-$9b|C<Z?Oo&=AB+u#y-6Qn%)76_BrPeJ_HFYqAy{{WKz{tJ>__ajK(10M&;
z&%Xt!|1}Ul_68nLfp^1MSem8aL*Od71-=MU{Jsvp7yKcJ@Od8sUI%pf9H;l@T1JEH
zB_Ggr1~=JBKBhR+MS1ff+~kj^aX*gx817pyiZ5MH;Kug${(TlC|Ipqge~?Y&hvs@F
zHfV30jO|5`d_?ggACW)E=F_-4xXDhsk^o<OK8!Z`pJGD(e-bzOi+n`>OL0?P(?xm0
zag(2JchP=lYXe<7K9(Y9Yo#>KHf<-360X>jy#IWk_e3_9d~vPcTf)3Mj`6Zk*I92Y
zv+I1Q4X>+_5xHdR!ij;flILh}qo?+kE?eB3nN^B`EZMp&rIWl+)`_y@!=l8LxxTa-
zS9~ZikjIg{neK;-%nKtk$1bS7!e}*-$^{j+b`JN6EIZt}Cygz%ni~k}ZAjt9(wslf
z;~X!U9qx|PwW%ju<dZ@L7jO8EFnDph$75^8S}t!C)>*c>#x~`&T}JG|VlgNspGa%P
zNU}}sc-zYmuR;wq&kIYl@^;#GtyG~#SjkE2T6v9>9cf?*FSW>nDYG3xyV!$(IA~U6
zF<TCI$LV7|ML>p{?bKDJjf+O^)&>c3>5|VXHun}X=yJ##j-;bZ@)2&$xKh9wHYj_b
z3HyXBGd+=fxow?nTc_IA>9+Mu+d9*>o^4wzZR;a#%jpn5b~Pv-5H$XjR5{<OTroi=
z8#ezMrpUD{L;4!wv|+O^VR)!3sSXDX$=9m~VHeH{xI=%C)h}x!$^<Dkv0bhz|7y>k
zT;-v8c2V(TXZiBd>O$Y>&tQur7xUyw$n`F7b9kY@wVU(|G9Ak$*u}ET(U)w?y@Iwy
z)AfR|F4;9gS>%>BnDl~BqZ+xH>`F12k;tF(Tj1O<?4H3O)n@e3g-aJNT{u{OIX$t^
z)5>AHCcFC;7IpH5>r|yE)GCrf7%Sb`%ex!N%E3HZeJD+GL1j8ens@oipm41sT`twa
z)#T$+g$Q(cU!y!YzMQV4r!f*<lO2uZl)bP<mxo1SnQZ+MYvundg={*VQV~j(bRAJ;
zo!gYfZ4|;Tf5NgIB#m!0g|aPlj`eh1=3HTm8#&Ra$FU%K;k;i;UspA^nh*B*Sg1T@
zyC~LFFZonhZfoS7wZpnB_oEC<*{aA7R1WOEbrLax9y1B%-%(14JfXpvBFgrf&ekPO
zIbor$`6#1C&>AS8zLQazL-dqFbte_u(yq%Kl?N3Cbv_imr}+Tqk{x^Fk^aH<JcS}D
z+w82dHLhlAq8=V3Eqq}4Kw>i)Y&UoZ|N5k^c_y&E^i=r*hthp(9TYAIpDU)MCLMso
zT4iJjM@XrnEiN4_(-v9`yKw=J`{I-`T2&Y*9}Dko7M)c*Wznm=hJ;1C#I?eKDp{<r
zq<GVwDSUBsw&&KmJ6~g&qxzdnCK;XTsr4B@#6FZhSq~>_Q-Lvu*Xp{06X9E7wL&oN
zP>#3ENGPN=-0tK^n?hQS+@#NfdV;_0NEh14w8$mbD4h`Jr&LB_BTI#>O_Bb}8C`Ou
z>!h$$bZq#vfQ!QPQH|5AQRHGDY1E!hUSXP;vh#>Oxs^mpWnsxwn;dVXNL~3cJ~Fzl
z8YT2Zd!16&M*yKBwqd3HQqRK@>@IqPBj{v<pymL=F+qVo*ctPCfoF|H0{bB48%9s?
zMSwKfk4f50*emei!-cI-pDjnGkl2A11_`|`aavHBLyqw2SYpU{0hDhrb!JVNil5*U
zjZH@7xml>&9Aq~_B9z5w>|B+HESNvSd^x*`B~u)-oyzFEhEg5Wc$0UiKcNWv!>==U
zxcNUyd|Nd~Uyy!T`7apwDxUFBD}F6<TOjoOI6nIH^jdAoYyN0F&atx&Z#7@MQii;^
S?J*gva5AevrqlX*hy4%aFDIn{

diff --git a/lang/English/admin/index.po b/lang/English/admin/index.po
deleted file mode 100644
index 91dce679..00000000
--- a/lang/English/admin/index.po
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "fopen disabled message"
-msgstr "Unable to check for upgrade since 'allow_url_fopen' is disabled on this system."
-
-msgid "Upgrade check failed message"
-msgstr "Check for upgrade failed for unknown reasons."
-
-msgid "Running latest version message"
-msgstr "You are running the latest version of FeatherBB."
-
-msgid "New version available message"
-msgstr "A new version of FeatherBB has been released. You can download the latest version at %s."
-
-msgid "Deleted install.php redirect"
-msgstr "The file was successfully removed."
-
-msgid "Delete install.php failed"
-msgstr "Could not remove install.php. Please do so by hand."
-
-msgid "Not available"
-msgstr "Not available"
-
-msgid "Forum admin head"
-msgstr "Forum administration"
-
-msgid "NA"
-msgstr "N/A"
-
-msgid "Welcome to admin"
-msgstr "Welcome to the FeatherBB administration control panel. From here you can control vital aspects of the board. Depending on whether you are an administrator or a moderator you can:"
-
-msgid "Welcome 1"
-msgstr "Organize categories and forums."
-
-msgid "Welcome 2"
-msgstr "Set forum-wide options and preferences."
-
-msgid "Welcome 3"
-msgstr "Control permissions for users and guests."
-
-msgid "Welcome 4"
-msgstr "View IP statistics for users."
-
-msgid "Welcome 5"
-msgstr "Ban users."
-
-msgid "Welcome 6"
-msgstr "Censor words."
-
-msgid "Welcome 7"
-msgstr "Set up user groups and promotions."
-
-msgid "Welcome 8"
-msgstr "Prune old posts."
-
-msgid "Welcome 9"
-msgstr "Handle post reports."
-
-msgid "Alerts head"
-msgstr "Alerts"
-
-msgid "Install file exists"
-msgstr "The install folder still exists, but should be removed. %s."
-
-msgid "Delete install file"
-msgstr "Delete it"
-
-msgid "About head"
-msgstr "About FeatherBB"
-
-msgid "FeatherBB version label"
-msgstr "FeatherBB version"
-
-msgid "Check for upgrade"
-msgstr "Check for upgrade"
-
-msgid "FeatherBB version data"
-msgstr "v%s - %s"
-
-msgid "Server statistics label"
-msgstr "Server statistics"
-
-msgid "View server statistics"
-msgstr "View server statistics"
-
-msgid "Support label"
-msgstr "Support"
-
-msgid "Forum label"
-msgstr "Forum"
-
-msgid "IRC label"
-msgstr "IRC channel"
-
-msgid "PHPinfo disabled message"
-msgstr "The PHP function phpinfo() has been disabled on this server."
-
-msgid "Server statistics head"
-msgstr "Server statistics"
-
-msgid "Server load label"
-msgstr "Server load"
-
-msgid "Server load data"
-msgstr "%s - %s user(s) online"
-
-msgid "Environment label"
-msgstr "Environment"
-
-msgid "Environment data OS"
-msgstr "Operating system: %s"
-
-msgid "Show info"
-msgstr "Show info"
-
-msgid "Environment data version"
-msgstr "PHP: %s - %s"
-
-msgid "Environment data acc"
-msgstr "Accelerator: %s"
-
-msgid "Turck MMCache"
-msgstr "Turck MMCache"
-
-msgid "Turck MMCache link"
-msgstr "turck-mmcache.sourceforge.net/"
-
-msgid "ionCube PHP Accelerator"
-msgstr "ionCube PHP Accelerator"
-
-msgid "ionCube PHP Accelerator link"
-msgstr "www.php-accelerator.co.uk/"
-
-msgid "Alternative PHP Cache (APC)"
-msgstr "Alternative PHP Cache (APC)"
-
-msgid "Alternative PHP Cache (APC) link"
-msgstr "www.php.net/apc/"
-
-msgid "Zend Optimizer"
-msgstr "Zend Optimizer"
-
-msgid "Zend Optimizer link"
-msgstr "www.zend.com/products/guard/zend-optimizer/"
-
-msgid "eAccelerator"
-msgstr "eAccelerator"
-
-msgid "eAccelerator link"
-msgstr "www.eaccelerator.net/"
-
-msgid "XCache"
-msgstr "XCache"
-
-msgid "XCache link"
-msgstr "xcache.lighttpd.net/"
-
-msgid "Database label"
-msgstr "Database"
-
-msgid "Database data rows"
-msgstr "Rows: %s"
-
-msgid "Database data size"
-msgstr "Size: %s"
diff --git a/lang/English/admin/maintenance.mo b/lang/English/admin/maintenance.mo
deleted file mode 100644
index d31d3736a25e05750fa3194d34023a5c9a20a5ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4083
zcmbuCOKc=Z8OIw~Aecu;cs~NQBO>n#Pw$$|!SX&}V|ydR?#A+ZH*lk-yJoscKStfv
zo(w01h=i0&E+FMd4hST~E#kt7oRK(iiUdN*1;L2}Qleb=eO1*n<4J;q7^(g5s;>Ip
z-@nR#ee~SVB7Os&FY|1@FN!XK*WS+`es6*s;9CLDeISY+W&AMs8E_EBJD}|U4)}2}
z13v+tf}aGR2Oj}{4t^2*RhWMj6ghte9|QjZej0q}oS%Oz;1%#;<_`mY4-~mMDE9p@
z;Pas9c@Y#lUk1gVSHRDLuZHn!;rrh~(f@Y9M?M%upJTiU%KmSHp8}7;BVscKMc?l}
z<na&S1IB*@W!=|497UJG9Z=$!gTDq}0v`hR_;Vk;4Sp1S8GHi#Ehu)s0e&C+H@FQx
z_(&A}1^g)}{*O^E{+xoF;7`CI_#05-@fwJU(LceLz<+^a&kHCM`+g6KoIioTz@NW?
zBJaoiIcEGKDDi)T<Q;%-f)bA#Y<dBF0E(X1L6%3jedZ@V$d5ESJLFyTeU(S@D>)z(
z(Z_gjG5QjZ$dlTUx{#VtJn|DeNK15{2RB^2favo)U*QqEq;4folEYB4ym_D83xB@Q
zzkr0%#UZ*`6lz>IUD-x^MV>sXGSir7udc><Q>tmxRYv92xL%uTyHRFzx;8u0O%?6y
zd8^8<wQ3|=t(llcm8Na=#Q2YOk)o!UE=PqPnIbwUr*_Vk)I8_EuTJ<S-`1zPO`3da
zRb$e;F^N@UofjsJ?r2d~=_)bo#<sh)5>2+A<_Q)B3y$j6zPEk;>lBNVc~XcV%v_)J
zri59EP`WTCI%?_!O?fp@Q#3J_2#%Y&46>HvAjVBNgZ)|;ZU5R@GBRJ?7-m+t_Nh2F
zqb|qaq%Nn0u^8nf_0uk_(V5Y^EKqCG#1Eg4RbevQ8r>wB{}|n~y0N{_-rloQ!Qi56
zbTPbDH)Xr4s;L{c*S~R9`Pb_gDs}$4+P-*ogE;<x<PHzh;RDmOd0p+QTSi;T^T{VS
zj-Eal?llaVAMR^wb`^8OV{@9z(thf;Ztd`-(N$Y$TQ@Aat*c2#Ar4QBE>|R~YdS6S
z>RV&4Vl;~DW^!ZW&f%SdrT*>s@&=tjks)<HMX5E<*-O)c%DbwPOgF8u*YBU)8tyFD
ziT1H+h6hzrr-W!%?Tm7}Fl1MmYU8`Zr%YuUZ{tx-VOzBw@5E2=#Se$~>aI!5p4YLf
zyps3m-kXh4^SUFKyx2@zH=60n(hQ-eHGLmCgC?QgSy!pYTa`-tx_V`Bfyb}97_arZ
zRCgOabMyG_;oYasD=FB%01#rN0@<4xNW?Uyt_WH&kA2H8tmtV%OS9xQKV34$sV+Jb
zM<<z4RacI%upWEk1{ge0+8efD8f3yZQ|YEORtNDUR{7XF4x@?VSb&r(m$#HTHO)Ni
zckxN{wA!?^PG!j@vc)^JNf#BgvyaY|%iaKCm08{K7meQ4G<e3R=pN2POE$~fg$XY9
zxU$+cViN)kte2x_WZ+=~lejjPSYBw2VY;YiM1O?~BVoaNYb@ARZI=l3jJqP1L?T`M
z$*az&*MIcOh_35ORW4alVv9n}Q`J5i&Qa^8kl;!Ik79LH7~P7m2~Ecfc~ve!l9YjC
ze4msGz9qDJf|~dp#QDFb+trvjGWDz~rKF~`?`dvk|2@fM*=7y#%epG%sBjr=muU+U
z`Jlz-%v8=P5grybX55%Ii`9usqzmY@p>(8;B$Yk^u2pOfc}!H@Q8Zm6ud*VfvbX*n
z@#y2@Yj*wUP}f@9)Yat1<L$Le;ngMb1kvuu_H8=La(Gz!{cMN3;Gxr<FV0H0$xlT0
zT^6ZOVLai9S#C3x=uRj#Ug&na``{%oL?yi=Wy{f9^GdTVt)s;FMCXtvl+pEx+45AB
zxqg`vAc>4OpH7o1^8u62C2(={jO2oIe8i!?rNV(1sA`r&Te@ghdp&q~W?`6<Ms;C`
zo|apIXznX1)9v!4^fo%-&NF|pke<}sh^Rl;%TgP$I<$(YW%(p4<}L_jX}GaS4F#gj
zG&Hu-qQMuAN(luKYU)`_5QF2Z4NqJYDX2?Mwgl<nhBK3p=>AHwYWYPB@+>E9%=Sbq
zsg)kpjSux&5pKZ%&(id?yfxCj5|n~-vX2b=9r+#ZyUy^W>3lof|N6E#F*tj)AMOv7
z7<j3t+i=b-$mhafg}Vlxu+c6>)H<p(Dg1UEt}p(c;+@(gkUAx}P&Q{GrV*dUloVcH
zlhjzpSti#;=L(#yM?z7o^agDb7*ZllN%E<xvJEuM)S2q+LnR?uCF)q+`acSLncrnw
z1!sGrSXD+3;)%~uLHjGXg(yH$u0HcBP%srFomkX5?JG&_?tKV#etyxMivX`G>nFt!
z7x=(-CFSiBq}8OZsVK2Qc$ogJE7jHvlX^UcUw4NWSEZbhej*JgCn?3m?pAJzy@jGu
zThS-y%2;=W4Mz&?C7$pP2s=6HaxRZt#gVa=<5=All9B8?`V)$gW4z}<Ze$g7F3lUS
KT~QDBqyGRB=+FZI

diff --git a/lang/English/admin/maintenance.po b/lang/English/admin/maintenance.po
deleted file mode 100644
index ec5bc3b4..00000000
--- a/lang/English/admin/maintenance.po
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Maintenance head"
-msgstr "Forum maintenance"
-
-msgid "Rebuild index subhead"
-msgstr "Rebuild search index"
-
-msgid "Rebuild index info"
-msgstr "If you've added, edited or removed posts manually in the database or if you're having problems searching, you should rebuild the search index. For best performance, you should put the forum in %s during rebuilding. <strong>Rebuilding the search index can take a long time and will increase server load during the rebuild process!</strong>"
-
-msgid "Posts per cycle label"
-msgstr "Posts per cycle"
-
-msgid "Posts per cycle help"
-msgstr "The number of posts to process per pageview. E.g. if you were to enter 300, three hundred posts would be processed and then the page would refresh. This is to prevent the script from timing out during the rebuild process."
-
-msgid "Starting post label"
-msgstr "Starting post ID"
-
-msgid "Starting post help"
-msgstr "The post ID to start rebuilding at. The default value is the first available ID in the database. Normally you wouldn't want to change this."
-
-msgid "Empty index label"
-msgstr "Empty index"
-
-msgid "Empty index help"
-msgstr "Select this if you want the search index to be emptied before rebuilding (see below)."
-
-msgid "Rebuild completed info"
-msgstr "Once the process has completed, you will be redirected back to this page. It is highly recommended that you have JavaScript enabled in your browser during rebuilding (for automatic redirect when a cycle has completed). If you are forced to abort the rebuild process, make a note of the last processed post ID and enter that ID+1 in \"Starting post ID\" when/if you want to continue (\"Empty index\" must not be selected)."
-
-msgid "Rebuild index"
-msgstr "Rebuild index"
-
-msgid "Rebuilding search index"
-msgstr "Rebuilding search index"
-
-msgid "Rebuilding index info"
-msgstr "Rebuilding index. This might be a good time to put on some coffee :-)"
-
-msgid "Processing post"
-msgstr "Processing post <strong>%s</strong> …"
-
-msgid "Click here"
-msgstr "Click here"
-
-msgid "Javascript redirect failed"
-msgstr "JavaScript redirect unsuccessful. %s to continue …"
-
-msgid "Posts must be integer message"
-msgstr "Posts per cycle must be a positive integer value."
-
-msgid "Days must be integer message"
-msgstr "Days to prune must be a positive integer value."
-
-msgid "No old topics message"
-msgstr "There are no topics that are %s days old. Please decrease the value of \"Days old\" and try again."
-
-msgid "Posts pruned redirect"
-msgstr "Posts pruned."
-
-msgid "Prune head"
-msgstr "Prune"
-
-msgid "Prune subhead"
-msgstr "Prune old posts"
-
-msgid "Days old label"
-msgstr "Days old"
-
-msgid "Days old help"
-msgstr "The number of days \"old\" a topic must be to be pruned. E.g. if you were to enter 30, every topic that didn't contain a post dated less than 30 days old would be deleted."
-
-msgid "Prune sticky label"
-msgstr "Prune sticky topics"
-
-msgid "Prune sticky help"
-msgstr "When enabled, sticky topics will also be pruned."
-
-msgid "Prune from label"
-msgstr "Prune from forum"
-
-msgid "All forums"
-msgstr "All forums"
-
-msgid "Prune from help"
-msgstr "The forum from which you want to prune posts."
-
-msgid "Prune info"
-msgstr "Use this feature with caution. <strong>Pruned posts can never be recovered.</strong> For best performance, you should put the forum in %s during pruning."
-
-msgid "Confirm prune subhead"
-msgstr "Confirm prune posts"
-
-msgid "Confirm prune info"
-msgstr "Are you sure that you want to prune all topics older than %s days from %s (%s topics)."
-
-msgid "Confirm prune warn"
-msgstr "WARNING! Pruning posts deletes them permanently."
diff --git a/lang/English/admin/options.mo b/lang/English/admin/options.mo
deleted file mode 100644
index e650f058e17e820620ef23ad31d363620b23f641..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18847
zcmcJW3y@@2dEYMxAy^Osj3omCu2x2xv1WQ_^;}jGFuOaeU9`Izc6RkZNa9ZSo$0IX
z?mN1-duK<4U>OT+Fct)`tvI&9!Y^VT4p<Jxyo|x+#5TdNq)f#{aN;<j%1%g;!Y-1^
z@Bf|e-0q%T<VTUNJ@dc!-1Gd-cfQv-`)AL6%6k%ipC?^PI`Gsax!_4j(tD<IljMh<
zog~ize;9l&_><tXzz=~Jfu97Q5B?tb0`R|r&jX)KrKf<GfGT$>_&wkpcp<n1s+|>(
zD#<FSa<#v|$?@GF|B|2MkJ|e+@af=hc>Whajq5*v>i28lcZ14&8gMbF@-G3^&n!rh
zWUu29kblX&{COexfWN;T{4U<#3u=BJ12w<j2i4Di12x|N3##0+_@n%tpyqW0cnNqA
zRKNFv6irHh{{c{Rco(Sh?*m2hkAR}nCqec5C!ogvKfoQ}--4Ro`E;iKUkE+}yb4tP
z8$k7Q0HkPg2Pit60xt%KU<$qsRR6yWs{daHMVH?JRsYMN#_?C6#&H3is^81_qjqip
z)&4P1<5&eX&k9t#ZvxfsJ00H(s@#ViKMkt<7r_g_uYl_BFF}p>Npzz1-T|tgi$I2w
zTn=iUdq9<60!5d5LA76iYIh4%y|;p@_tXCUqyGJK{{Bb){+}Jc0g4V!W%14fzXudO
zE(O)zE>P|52i4!5p!(~A3_aNbX(D;VzyCa_@jVV|ojwbSKEDTwK3@ja-+u?y&$mF)
z`ywW%_gPT=-UMoYE_;68^S>X|INl9v9Pjt{U-kFTgQC};fa>?pLG|}PLA8G#ovGf%
zpz^N-HIJ8h{%xS@y$;lP2cXKm0aX1*K$=Q^7UW;@3I3?PKL%CqFF?`jo1oggkWD1I
zUJi<{uXNn)c%$Qz<86+2Ikp}9j+>4TIlj&DJ&r%)_)Cr-b^N5`Z##a;@ym|?#qqBl
z|Hkn=goMU@q2ncvmpNYLc%9=b91lCLINsy9?)ZS?>m46<e8lll$Hzd?@q?iF>~o;#
z{imSl{WVbQ^nXC{#WP_V(f?9V^>%|QcMGWXy9*Rw_CWE;8BqN8FsOQuf-3hR&;Kl_
zcK#St|6c=_(HBpCQIgE_zVhPG-b3K)cz-(xODBH?z6yNmOG3M^2E|uvp!WF?lpNRs
zpG$iWfnVqS-D!{qZ@DZ<zRLSMzyhpyhI#x)aLD^#gPKR@^3dJ}cs}nV@DTWVQ1kmO
zumgSx)cmgh-Xz%v-U^CtKMGz8{uHS8{s24;{uwB`oqQ>C1lPfPz)ygh$MdhCE$~WE
z?cNLWDXBrt>rwFK;QK()?<?T>;Qt08UGgnZ^nAgUL0;?zB?oT;Uj{CLqT?GujqAt3
zli*{Z*6VM;!_e)*nehFNS!4(KZT?&Zz8(BA@Z+HBFMnT>d;okcsP(;oLhA1Y;4biT
z@EULhd=K~*P<-~HxiIe*D0=<~_`BevpvJKV6Fh@)JP4}%n_E6!@Br_Rfjhvz^!NV-
zs^2|yx*uEwpAJ3@ZqUvnpy-wC4)rbuMX$@iXMnE&p90<r-VQE<&jNn|ya0S0)Hpr`
zs^2eyqT8Q>7l8{`C&_)_D?!zJFSr1H7*zSMfNuo92CBbP5M=;vf*RLffaihV@_aFm
z_@M+vpErPg@U5Wa<Tt@Dg3q}wjO#yv8t2!+i<s}<g5S;ijvJUen1bSqkAPnVe;fQR
z@B@2TZ}3y#XTYbyB<lBfz(e4_2j2yzdqe)mK+WSf!RLVcZZwi6CqT{f%^)n4yb~0?
zJ`Pee`8S}(bN)?XU%U_$9hSjm@U@`Y`=Gyn+TWjjbCR4Oe<vt9Y=Ro^4}u#1?}HoQ
zS3$M6!sd7#cps>B`3!g&`0v2)1HTT!Qpt;65$v>EL5*`AOu;kYCE%mr^T1yLF9p8<
zYJ7hVs{S`XL`8D>D+3+`HO~T6Kko<GLdh4w7lYq)yks%Z;d)SXIs(1`9D;1!<Pq?N
z;NzhB`2$evE#U&ICC>--ek&-s(DC=Tf*S8*py=|i9e>yJzvA!T05zYdvq^S>SAZ`9
z4}%)-I;i=-!{2`q{3pDB2^5`<vH9);?*m2ePlF!^|1GHR4=>R-_+y~jx$Ph_3|t4b
zeqR88;z>#JhoHvWgUK|Hhd|qJp!$0pyb!#G#Xbryf?Cf<K&m%C&E;oEKTrCnp36|1
z-{*OH6X~g>n)FuEuaGVy{WR$%q#q*bcP;4(lIWt}(@0vQ?<bWc{X{E<Zogk}JP*`Z
zB^UJ*pKI-IA>}0TgMRN0kYwO5`}5ntb<zd?E)bt}C*C_epC&=#<b$5iGMaq-QSjGD
zE1rLw<K5tg{8{j*KR*U)ee}DE^bXP|NJG*Mqzw{FXFT?cAY#Pm|Gi-R{gOYdf#L<N
z*S{pamL%SL1?lOecalC$`a#mCNc#0juOmH~G(-A1()&mw(!->mARQw8E7Bb4e3JO=
zhe?u`lfTP(X_G!ldMW9nq+cg}mK1+4j}MLyfgdC7A^md_Vk3E+bT6qOy@m7v5@Ij;
zXQcO&t|94nJL!IVN)p6b@;TDG{CzvTl8j~2n@NkLJ4nwZy@&K$q$4El`yC|x_L9W^
z+WY!Fk0gHAPy1+r^y4J$HOYbNN%41>hl~9M^^)8~TJ`ti;Co3QCcT*S1ElAZev>r$
zdkrtQdd5$JXGkYW73ni1{Z5eHK)OdS{5At5cY$vt{VM54NIlX|kscuFcZ@VkdbM8o
zrKDGp{sk%iT0Fd-^c2z~q>qrEP5N2VZ;<r6GeB|*e30}^f8PS%?$60$r(X=xe7>I*
zy|kP6Hl}lW*=pWP7JI#NGaclcUZQ#R&x1iZ8np9%J{YF`ysoqL+)JM8%Q-65qt$Mn
zb&|zl*-sWvXTz+j)0nw0>!gQHoLEke=WBVDSFwv^UsmVo$>T>tU(H)+zj@uL%GF-p
zPxh5r)k!;f-S+b1cdua?!(!O;(T5r#BNiEUlYLuGuVjBdsLLwdEUQi(8lB1sb@um)
z_Nj~^q`hKrDwf-p8HyfQIT4!CgJ)&KJY6fRem3+^6B%A4U&}_lVY-&*9WOJPGhK*v
z9t`tA#&R`uJmAIa;Z~gbbe1<!)Em8QE6pYs)mY}hxxP$Sat@o$j4Qkp*stT`ur{~l
zg^Hfp)MF~u_VHACvSj(ysF#b}%BX92v&ed5t~!`!!%;<n*w{gl@5Bk`rsgelY_Cnp
zvKsYOuWnbx#;_;{zN!b$@gdZ|<u%1dSQ~o^nTLu_o@Tb0w8FmPmb+RGyZ(N7(9ym!
zqWE*Det57}rflAgvL5;Xrn6!(h&0H0$>G82tXFj6X7`QSWN+rH{j3&2eXU}FBiUem
z)NJYIEwp|Vxls((;qBVTIF-{B+Rk)gK9oJ{!#S#y(8=aMRbIJg7mkZ`G&@6`V!hi8
zt9g%=&ZKqmVAHa{jX!P{9Tvg+J(Gr4|C|p-X)(<EPWPkZcP~&3M#H>Lj*cJ;%Li41
z9En6dR;KN&-OZC@<seUP8$iUIBK^D^`GB|Og?4Xi*bQkJUq%}pghD5+@=j6Z?P0Qf
zXgTd?gAt3q40EJy#Iv_L@g7=KMxAajz>Q{&x8;R`uO1=C()&k!XXJ_Z$pRbd(1;ca
z*n2EcBFsAZMkMR2N8^l8<oL=;a@?n3<OoeoXL-?l9iFQ)?Z0LdAI~?+YB*L^6YsH>
z3W#I-`LJ8MzzoGEawiLqMZ|HJC}_#>7>cbNMLDgkxa4TwCO&4J4x+}H#R|lni9+oz
z8!cxU>RK8l%-jk;QPxBQu~?mU*ye*0Wt<J$-Nf1$)sg~zXZPtWZzIpDc2@$)yB@!L
zfnt5&Lemy_W&G|1`UnG)xlm}uU#36R#d;)zf47`a=mh*frR*j%#znM6@~T4f#@(cH
z<c?QL84t3v!c3YsZ=>8O+U%CoMYL#6Oy*1$I){)CWv4$(R#B@y#ZWY4OcdF^-K^L|
zW+-~{#QubI)xz$*3k%`t>gMU1iKlD)>$OeZwR>aUbxq!N6M5HO7uvhN`Fefx^@b*I
z&%{%#@v<iGWwFNYg_y^a_q)3pGfy$E8U607_j-G~n|bVxqn~f)JHHTX%rC@pdJ65$
zFN|x%S<WxS8O<-mdCV`wdFUzDjq{jai1V0l<}u%lex8wv_8Ywt8#D;lvf2tvbylt~
z8#Za?7Od@(lM@-^BGEWuqo_c5Z9Z3NH-jM%rO~9L&{XEQXq}cpd&J%_ojoTMx;?Lo
zH6OG;Hy>&V&%vm_s@7%wQ(!XB3l?=ToYqdaPi2K-cWk#Hti`i(L*eD#sLFctm`we8
zZ#vkp*ZStGZ%o7E%`=1avYXT0vp4QouFCsSYx9RY^FF-2smwP_yM6n1EZ=rwet*R)
zQ<*=2BHWvjH-DV%t(nBEBiJ_cC#q~v_p)JGQ7Bq6^C$AGKha`(QzobAm207k)zwy6
zt-pN7(ZffV#{KVZE$rA|%6OsGtqnRI=4XbxFp!JEjVYqMs`KH^Cr=!l-!m?!-f>~(
zmj>;!gSOe5?pZB{%|P~IDeSm&{+4`@qt-OW<q};uOn0~Tw65h#c%5G<M^!uDANtsv
zhE9?b-8{|va^s?IDc4eHl&+dzV{-}$v#eUt%TxJ8^QcN}<IOHQQKm|_sAIKu8+~1y
zMy)0^Zrw_;`pvC@*|yRVR%(^j8+jWmJ8c(Ld(^Loax-c=YaGU@CKxjPh;A5HXdP*+
zRVhGd*TJGZ#lFbbN4*T&#H^HT&|z$&8ojoKQ8O4qY+S>mN9bbGDT!)fGP9m?F7X|M
zQ+eO<rGrbymyWm6!)xhQIb!3T#xp8UGXiMA*2FYtD(PBP_SsjMoMk)M9K#aV13R60
zql)Uy0$oe3P6<&5^_;afkW)dyV4~S_G>&Po(4ZZY&^lqnWvg;&XL@CMO8utgeag6R
zRP|yZX1!Ldr<CmFv-EGH9Hi|Y%Gz2nt1?~P!p`dDX6Q(vw>G*P=~^L&$a~ur3N}Km
zWen6V`x{gXZuJ!ZFukr6FBVs@_}NEwH=QY3c`NM>hZ}o$?b_VjZ1uMS0a`S*E6{GX
zmD)<*gt=A@)?ePoD86Zzzi7qVWhJ{+L&NZao|?OcZA@#k>|^cQrohd08w9dqC!K0m
zZap8SJGHJ=h!gA#Mgl8Q46j6*5(j{4BDeR~Y9a{9U2G{nz_C5VgM?zIgjV9ndbD9S
zWi}!>!MC<J@3f0aNF)yi%Sx4SuO4hTAeFVnHd(C22~}!Kt7wHYF2+jSE$rm1O)Jhc
z=cW?|9F&NnJ&ZwqMME_4<LMI1?_5M+hop5^wy`20?zX13!rJSjo-vDW`WZ@Y4pKr6
z;>%&Vp@KPc-ZCd4uIE~j_d4g;i{nU(_hYOT{GabskC8^K(3q8+vMv%P!Z!qe2;3~0
zv|AdO)G`?d$=V@?V{5U-;)Y<3ZxR!ot#l>N)0ZLwWO0^N4$0Tb)>QN-xucsCMzf|n
zbLqj}=*+%-L8>);18Zql4#nx&U`vrJ+l^z{*3S@mki5@+jzOa?%B8Z%Q7bvB@8eIF
zo9yrA_+`Z!@?)!K{%)O}M!C?oHJ`7osmGbDbK1nQ>2a2PE8U&4qpMjdgZt&DYJNnX
zlDqeh*pGOOWWe!znfpCcL<spNT*}~(wi0PxuaK-Ddg#)ahvAER>a9ViaKUMTDoEc6
zVWU=h3^#CZy1!eNwS2IF#B8GxC}j(#T5J&0HeE$dj8G=%EdIq1Cc|DsIySyzu#(>y
z>xRS5R?ezI3n32Ij3uo-BGyWmk)!OhA)KDAOS|wdL*#6xSOoIugP4qwst_?#E9;|N
zezXKK8x<35vs;=j8C;3~ZJu2x=nzpQ)(>n}px>%e(s?`wYnedS6t6nLjIhLIiOIUA
z(=gR;;MWArd{(5c$(*(kScag&Y}E80s=`$)hS9hg>_%0b&e~fkhK((~rmdK;YD!Tz
z-Z(^xOA$Kr8qEfj*fN>8EtFV6fF%o-*w<(yTXqw{OJd}X2RMQ-%D{ApqA8|pp$qMc
z9QfR3DltUGHef?zB8G?UX;NMSKo!G>WM#~yk@jIVDd!#^>WUX<su|Q)USKeUd15~i
ziYW0#Vc@oGQgldWL_&xbZMNFMvqOXlmd80I$NGZ=4K)w+?gpw?F-&#7T9upPF;}a$
zQ;7YH2<fiEfFV$2Q=UVz54AvyqE`$R*){>TfBB?Wc5Mo&9vBfk!W`=&_7y-vdLU0R
zHi(jT*p38k9_$sX>CF7RUgq_JCJ1}iji;=~q&xT;GNMET6Zd(#xM4&_iCY8(yw4`5
z?Z-3Q0j-;hv#^vjMcE-1G0{kZzH;S=Y8s(+qEs+3?vrRG7F-R~N-T~#&FmruQkZ?i
z`t?1|**aHA?PGN@QCP~OrM1#18RDKfh#Kuv?6DxRU=PR*y~GN%pnWKr=2kAl4LkL2
zJb?V3yLTC2&aJo7+gR#qv#?zU@i7nCYY>h_u_ca8({~YK!r~1z%&<a+;+e?`%G*?w
zgtttYY}E`m3Y$k+xv{R=;%<uyX;>BnQM5w55wu*>geei`#lWHgJm;I9&8GO{oVCu%
zDc0zQX|Q!r1*WRf8D9>Fi}GVPoRsL0HkAM~J;+SVoa&kE4))*lA|e_>L^X`22vO}I
zmnUM_TCT<udZIc}7WZP9TXO9?B+jE#QRVU|v<YJ;tm~;cHk%e&x>t)E!nkAM84F{&
zu^;*woQH1&spT9|M`|@3Lg2oeG+>4E5(A#S7uvRRrutY=gjKOoAVdfdtnntZ7Fm7N
z4SJO|sz;?_q9C%K^D=$Ie_|VR7bnz?n;XzQs#EQ4oCCH@FJEJd%!fH=jY5h2#4faP
zTr7QOoI++c9!ofv+-9h0517&nTg;3LmVy9IL6`zUGTAB5ISO4DLvc?QldiU$J_IR(
zn);Y*awae~Can+g*aW3oX|!kWSUi60@UdGiOAnOhee}w8iT@x^#-oL8*fA3=1X_<x
z;k(!+MpwBonvqY2_NZvKjjjBcKCG2kA!Y<l$j%gf&bmwvvh;qS0{6ram-cOOCMS3>
zbNzx?049T1bL3Hn4L&}FIcIxz{xaR#>Xww|%<hG&ul+XdnUIr!>TereP<+$P{au5z
zI(DSX#4AZ^#S_x8)eW6l$>1#@YFEoMurQL@gJ$#=&Vk$vA@&lsh}LR=A-*1DFccYW
zbEqJyxl_J#rIJv+;tU!wI~e0C2u|pFXL@sbMQ?axmUi)PZ{CRj-Fe0O@WvyDkKL;L
zU76m*Cm6bSY9%xRWNHy~fLN#?ysum}DsNDV6yCt^%_~WjnY@J_S`h1oyg1@jth>QL
zW0GLMda}TpjJcgA$R$8_ViK&ln39;TbRJ;FgDj9izKVfxN*)JsE%TT$VdGg^@>0A>
zKR6TrnqZ_2I>>yNniGkHEX}NzQ4tQ%j)f2=t5L&$1GZmgLaGt2MTgD2nnPWIW)fub
zgi-E6(;(Y4m)5p(xp?3faV)VX4%|%p+Tu4uatALANP*pchWj#;nNF3U&~b$HE-Ezm
z0gWGFf<7urwG;HKZKkNW#+(>BV)a~DkB{}V=R-%WRBIK?W<1N<qZWa~-B54YvElec
zBHF^57G`2R2Ar|OK)QpfqyB8#sfZK=!i^6Hw+Y-S&$!cJRG~q%5l)%*K*Mw8kbsL>
zkRnhNyqkpn!V+o68A(D6OVt&l(;&wrZ6#qS*8Y?X8gfJ=Ho5x&okHFt8_ax(bz^=x
zn87ic_>Kvxtxrjg*z#P5rszmlwNZ;f`!+XCP-T*SCO%^mcJ!I(jPq=Mg^ZgSv0gJA
zvAFFd7d|!p=_cpG96ABU4IfQ-G^XKLKhH?yPmAH>v5F?m0qfXT`?k&pjp)=MklM@%
z3EYXp{+XJn2&Uy};*d7z;OM9Vy{iYY8H}d|F%H4j2nVfaN0TQ*27WM075s=n2dRPi
zEEd>hs~zo@R3bt=&<?IDW1uHi<gB6-qRtvb(h)Y$u%zvDH-Z6MjIZ8e)cv{O&W+``
z2h?GgZ%YVs$7dA?*42$TQ4Kvz$7fzAha{h6k80>H+~BF;>ry>1oowQ0dz%@i(Hdz@
zDEir@gmGp8`p7nc?2&EMjeC~ffvuNyZ!Q{47lt6GRldnOD!#&$w^5icB9>He9z6kz
z$&C2U+GtBA-x(=fGjU;O(5|+0?x1-i&<Dhm<jOE$<=F8xj7CTjs%Y38zoU49N{dz;
z^ul4WuzodFrEzwdoM>phPlR;M=?r1t+FC{c+IT`MO^+r|oH-<@w4!I6qb7&QsPWyo
zd7}*!)M2Y(-w=5u-jud+1Q1}xi7wRLuAFR4foW;KYNTMWkt1pXt9kWx=<zd|;`n=Q
z#}bn7qB#_h-+Rq<dlt~pM{+snW{``d5X#z-XV<ejQbg-j)^CN&15Rq6Y7#<@W)lVS
zBDz9o!tXG^$9DV>nr(-0A_AKEDVPv1DxhcLWe4r{iCN+e>r^Q!|5!n*$(os&iQZ6K
zzLO{FrZash$}r}-v8+30P>(HSXM&XYEWSE%eKXV`j>iB)-^LnE_ruMCAPW?;$Ve5*
z6Tj;i0ofJ=N2uR$Yb=w7HdvwdkQwTGt!o)-)WU>JFgV8Mmp?IGBoTu9{{NpYffHhn
zL9IuLFbB1DdBkizghkwe(QiNtC>q3M<V>*XEC@Y5LS$K;#q6Y=_3aYLPCFx`OMZqJ
zNUbni=tbfUh0)wrv1U2nvtW$|XwFwQ9AY2R6&FmxwH22h3b(=_Xru837M+120N@(G
zm7*=%mxazQ*uZd33zl3}{JZ=fHS+hYC_Si=jR!N`Rx`%>9~XVs4HvVXvf#pV(+}Dq
zl6LBg9LQkZ?raQVo1N5UFktfZ>?%4yAMPZwqQ)gBWj)YVJ!O6>Gqt-m;?=VPCoBU|
zcMBLp(`XoItj7B>V(p>(rm@C$dIIa#tPZV$6u=CjXhQHDa#r=woDhrBnKR>T%1q4E
z4%#yswGG2Gu@vJIvpLfz3h>IL#Jj;d56w<p2}*9oKGb0;#xl#GZ9bk!xDn(AIYth)
z?EydKaCxebO@0OglW<Mj)Ux)&)E<#VzdEYTXdWSn!XT{asr4CmYnGAi4G3Zf1hQc5
z+8^x6F^9J2-_Jj=&L$j$8Ez`grgyLa2&8mrgeQ<^gSqsUD$fT9&2FL+;V#o`$}MRq
z)0-%#n(5+Ng%lomQC+>6O_%IS>SU9#@^ook5E_@>{_PsR9p?6hH?5mPv+2>YZkPC6
zw~TsgbLmRfC$`oUP>sd4bv6fvY*SGejb_v3?9_CoHP880Ml)5B9wE*ZTe^;`PP6GT
zJmQ|Wtt(2i={^F1J>0;$JD2Y3j_6`8y(>ROaE~Cw>Zn?8N~`hxWxK4?!yLKe+Rmj%
zx3U4F^&-0I#PkN8vW*4D7><>var;-<2&cS=u0YLdG1Pv#KNMTU++Y<7tQKFmx%Ad5
zs|V#4H!#LkH36=iz{0*3ahaP2ycb=nnoVDoZD=yLqUjk6eGP%b)hXmgY*TlxAn&+;
zU(?WzUBsID>`c&nR_!CYB6*0T9?#W{GmW!X_OXfrspit#p>Y8<hNbsy_t998vRW&9
zr@Wju5jgG`QJ2@`nMln+ZgGDBy@{7~A`{r{HI{^Pl5W<Ii{ecLHax*C2PVDTE%QNf
zCKiDvSsxugjLczo-k6E5{`%TlGvNvx6nGFCvfTSK&QNd9@hRt;{a_nQWAqwf>_>~v
z{Nj*o%o+a>Mzq+^5YaT{J8ye+-KrCtZmto&?@Y8Cw#v3P!#0>)m2mT}+1cKA;LM{s
z5g@SWnSmFVvv$F8dy}W`m$^Zc708ciVg$BY>}B;Sh<Z!bUoBwbP{!*AhB}&64{!`i
zfMu!y=chv%{&g|G*vm)!PXN(Ew`?Yxv3q||p%_7E<UtuWakvGj9cHGzhpp_q+m=q-
z!6fcz`#nJ^xfm!#lW@i*BL+1nb>NYZs>EAwZsExM)a7j*37ChrSrJ}T9H(Dk0_lGm
zSamF<rViHPwvM;OT!My+UR;a>`)JwyVTc|djKy3<V9SQ9T?`q+$>VP)b)pz9Ii9mG
z8-KQr@Yis4aABtv!NKzgN8_sEu9y#KG5_F4hXW`tF7Gqz5%=NJf^{21^WCZ(p%pE#
z$PI|#3r)ma?UGasC!zeLh{v~B{Pf9`UT{5GMCck%M4bQ%5p`H1nkT%3mm_T+j03Wy
zZiCv?1uHVzc71^59XmaQ+}9x^AI$=sxY<coaPG}4!Jx&SsQ%%$fX`&2VQ(s)=F>Mv
zZ0;=T?C?y``r%-3!eoo)nO5EG=<zJ<&{>v<c-O5q*Z^BQSeEDH12bdf^wJ=QrHCu}
zx6$V_MxZ&OA098Vb?0gyOiBKLqsDd7je5~JQtwRzMnAD-44Yy-S$hgit>H(dQ!C1U
z|B(f1j$`c;ggvqQ73tDdhN+WAoSE33hnOhrK3WrLlv^`31!k&nw|5OcDJWo(UhREF
zFJU0NrzK*BiTh=Q40A3R+FS(E*P5euT9?Db9tbO9QemgxVB?CLs2k5YHDaUOm?XFv
zXb#P9va32A61xb30F!rqX<`kb1ShKM#FukKEuSFD&R*I@Fp2YG%my}!t`O^rqrCU{
zKUQYAQ-UF*`#3Qgu4RY^gRrXH^0JbVJ$2(aY*ktkKg0-3Ln)85*nJ6)4@?~LNr;61
RkHK1LAzR7B9c9ro`F~JqR&M|R

diff --git a/lang/English/admin/options.po b/lang/English/admin/options.po
deleted file mode 100644
index 9df9a3d3..00000000
--- a/lang/English/admin/options.po
+++ /dev/null
@@ -1,603 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Bad HTTP Referer message"
-msgstr "Bad HTTP_REFERER. If you have moved these forums from one location to another or switched domains, you need to update the Base URL manually in the database (look for o_base_url in the config table) and then clear the cache by deleting all .php files in the /cache directory."
-
-msgid "Must enter title message"
-msgstr "You must enter a board title."
-
-msgid "Invalid e-mail message"
-msgstr "The admin email address you entered is invalid."
-
-msgid "Invalid webmaster e-mail message"
-msgstr "The webmaster email address you entered is invalid."
-
-msgid "SMTP passwords did not match"
-msgstr "You need to enter the SMTP password twice exactly the same to change it."
-
-msgid "Enter announcement here"
-msgstr "Enter your announcement here."
-
-msgid "Enter rules here"
-msgstr "Enter your rules here."
-
-msgid "Default maintenance message"
-msgstr "The forums are temporarily down for maintenance. Please try again in a few minutes."
-
-msgid "Timeout error message"
-msgstr "The value of \"Timeout online\" must be smaller than the value of \"Timeout visit\"."
-
-msgid "Options updated redirect"
-msgstr "Options updated."
-
-msgid "Options head"
-msgstr "Options"
-
-msgid "Essentials subhead"
-msgstr "Essentials"
-
-msgid "Board title label"
-msgstr "Board title"
-
-msgid "Board title help"
-msgstr "The title of this bulletin board (shown at the top of every page). This field may <strong>not</strong> contain HTML."
-
-msgid "Board desc label"
-msgstr "Board description"
-
-msgid "Board desc help"
-msgstr "A short description of this bulletin board (shown at the top of every page). This field may contain HTML."
-
-msgid "Base URL label"
-msgstr "Base URL"
-
-msgid "Base URL help"
-msgstr "The complete URL of the board without trailing slash (i.e. http://www.mydomain.com/forums). This <strong>must</strong> be correct in order for all admin and moderator features to work. If you get \"Bad referer\" errors, it's probably incorrect."
-
-msgid "Base URL problem"
-msgstr "Your installation does not support automatic conversion of internationalized domain names. As your base URL contains special characters, you <strong>must</strong> use an online converter in order to avoid \"Bad referer\" errors."
-
-msgid "Timezone label"
-msgstr "Default time zone"
-
-msgid "Timezone help"
-msgstr "The default time zone for guests and users attempting to register for the board."
-
-msgid "DST label"
-msgstr "Adjust for DST"
-
-msgid "DST help"
-msgstr "Check if daylight savings is in effect (advances times by 1 hour)."
-
-msgid "Language label"
-msgstr "Default language"
-
-msgid "Language help"
-msgstr "The default language for guests and users who haven't changed from the default in their profile. If you remove a language pack, this must be updated."
-
-msgid "Default style label"
-msgstr "Default style"
-
-msgid "Default style help"
-msgstr "The default style for guests and users who haven't changed from the default in their profile."
-
-msgid "UTC-12:00"
-msgstr "(UTC-12:00) International Date Line West"
-
-msgid "UTC-11:00"
-msgstr "(UTC-11:00) Niue, Samoa"
-
-msgid "UTC-10:00"
-msgstr "(UTC-10:00) Hawaii-Aleutian, Cook Island"
-
-msgid "UTC-09:30"
-msgstr "(UTC-09:30) Marquesas Islands"
-
-msgid "UTC-09:00"
-msgstr "(UTC-09:00) Alaska, Gambier Island"
-
-msgid "UTC-08:30"
-msgstr "(UTC-08:30) Pitcairn Islands"
-
-msgid "UTC-08:00"
-msgstr "(UTC-08:00) Pacific"
-
-msgid "UTC-07:00"
-msgstr "(UTC-07:00) Mountain"
-
-msgid "UTC-06:00"
-msgstr "(UTC-06:00) Central"
-
-msgid "UTC-05:00"
-msgstr "(UTC-05:00) Eastern"
-
-msgid "UTC-04:00"
-msgstr "(UTC-04:00) Atlantic"
-
-msgid "UTC-03:30"
-msgstr "(UTC-03:30) Newfoundland"
-
-msgid "UTC-03:00"
-msgstr "(UTC-03:00) Amazon, Central Greenland"
-
-msgid "UTC-02:00"
-msgstr "(UTC-02:00) Mid-Atlantic"
-
-msgid "UTC-01:00"
-msgstr "(UTC-01:00) Azores, Cape Verde, Eastern Greenland"
-
-msgid "UTC"
-msgstr "(UTC) Western European, Greenwich"
-
-msgid "UTC+01:00"
-msgstr "(UTC+01:00) Central European, West African"
-
-msgid "UTC+02:00"
-msgstr "(UTC+02:00) Eastern European, Central African"
-
-msgid "UTC+03:00"
-msgstr "(UTC+03:00) Eastern African"
-
-msgid "UTC+03:30"
-msgstr "(UTC+03:30) Iran"
-
-msgid "UTC+04:00"
-msgstr "(UTC+04:00) Moscow, Gulf, Samara"
-
-msgid "UTC+04:30"
-msgstr "(UTC+04:30) Afghanistan"
-
-msgid "UTC+05:00"
-msgstr "(UTC+05:00) Pakistan"
-
-msgid "UTC+05:30"
-msgstr "(UTC+05:30) India, Sri Lanka"
-
-msgid "UTC+05:45"
-msgstr "(UTC+05:45) Nepal"
-
-msgid "UTC+06:00"
-msgstr "(UTC+06:00) Bangladesh, Bhutan, Yekaterinburg"
-
-msgid "UTC+06:30"
-msgstr "(UTC+06:30) Cocos Islands, Myanmar"
-
-msgid "UTC+07:00"
-msgstr "(UTC+07:00) Indochina, Novosibirsk"
-
-msgid "UTC+08:00"
-msgstr "(UTC+08:00) Greater China, Australian Western, Krasnoyarsk"
-
-msgid "UTC+08:45"
-msgstr "(UTC+08:45) Southeastern Western Australia"
-
-msgid "UTC+09:00"
-msgstr "(UTC+09:00) Japan, Korea, Chita, Irkutsk"
-
-msgid "UTC+09:30"
-msgstr "(UTC+09:30) Australian Central"
-
-msgid "UTC+10:00"
-msgstr "(UTC+10:00) Australian Eastern"
-
-msgid "UTC+10:30"
-msgstr "(UTC+10:30) Lord Howe"
-
-msgid "UTC+11:00"
-msgstr "(UTC+11:00) Solomon Island, Vladivostok"
-
-msgid "UTC+11:30"
-msgstr "(UTC+11:30) Norfolk Island"
-
-msgid "UTC+12:00"
-msgstr "(UTC+12:00) New Zealand, Fiji, Magadan"
-
-msgid "UTC+12:45"
-msgstr "(UTC+12:45) Chatham Islands"
-
-msgid "UTC+13:00"
-msgstr "(UTC+13:00) Tonga, Phoenix Islands, Kamchatka"
-
-msgid "UTC+14:00"
-msgstr "(UTC+14:00) Line Islands"
-
-msgid "Timeouts subhead"
-msgstr "Time and timeouts"
-
-msgid "Time format label"
-msgstr "Time format"
-
-msgid "PHP manual"
-msgstr "PHP manual"
-
-msgid "Time format help"
-msgstr "[Current format: %s]. See %s for formatting options."
-
-msgid "Date format label"
-msgstr "Date format"
-
-msgid "Date format help"
-msgstr "[Current format: %s]. See %s for formatting options."
-
-msgid "Visit timeout label"
-msgstr "Visit timeout"
-
-msgid "Visit timeout help"
-msgstr "Number of seconds a user must be idle before his/hers last visit data is updated (primarily affects new message indicators)."
-
-msgid "Online timeout label"
-msgstr "Online timeout"
-
-msgid "Online timeout help"
-msgstr "Number of seconds a user must be idle before being removed from the online users list."
-
-msgid "Redirect time label"
-msgstr "Redirect time"
-
-msgid "Redirect time help"
-msgstr "Number of seconds to wait when redirecting. If set to 0, no redirect page will be displayed (not recommended)."
-
-msgid "Display subhead"
-msgstr "Display"
-
-msgid "Version number label"
-msgstr "Version number"
-
-msgid "Version number help"
-msgstr "Show FluxBB version number in footer."
-
-msgid "Info in posts label"
-msgstr "User info in posts"
-
-msgid "Info in posts help"
-msgstr "Show information about the poster under the username in topic view. The information affected is location, register date, post count and the contact links (email and URL)."
-
-msgid "Post count label"
-msgstr "User post count"
-
-msgid "Post count help"
-msgstr "Show the number of posts a user has made (affects topic view, profile and user list)."
-
-msgid "Smilies label"
-msgstr "Smilies in posts"
-
-msgid "Smilies help"
-msgstr "Convert smilies to small graphic icons."
-
-msgid "Smilies sigs label"
-msgstr "Smilies in signatures"
-
-msgid "Smilies sigs help"
-msgstr "Convert smilies to small graphic icons in user signatures."
-
-msgid "Clickable links label"
-msgstr "Make clickable links"
-
-msgid "Clickable links help"
-msgstr "When enabled, FluxBB will automatically detect any URLs in posts and make them clickable hyperlinks."
-
-msgid "Topic review label"
-msgstr "Topic review"
-
-msgid "Topic review help"
-msgstr "Maximum number of posts to display when posting (newest first). Set to 0 to disable."
-
-msgid "Topics per page label"
-msgstr "Topics per page"
-
-msgid "Topics per page help"
-msgstr "The default number of topics to display per page in a forum. Users can personalize this setting."
-
-msgid "Posts per page label"
-msgstr "Posts per page"
-
-msgid "Posts per page help"
-msgstr "The default number of posts to display per page in a topic. Users can personalize this setting."
-
-msgid "Indent label"
-msgstr "Indent size"
-
-msgid "Indent help"
-msgstr "If set to 8, a regular tab will be used when displaying text within the [code][/code] tag. Otherwise this many spaces will be used to indent the text."
-
-msgid "Quote depth label"
-msgstr "Maximum [quote] depth"
-
-msgid "Quote depth help"
-msgstr "The maximum times a [quote] tag can go inside other [quote] tags, any tags deeper than this will be discarded."
-
-msgid "Features subhead"
-msgstr "Features"
-
-msgid "Quick post label"
-msgstr "Quick reply"
-
-msgid "Quick post help"
-msgstr "When enabled, FluxBB will add a quick reply form at the bottom of topics. This way users can post directly from the topic view."
-
-msgid "Users online label"
-msgstr "Users online"
-
-msgid "Users online help"
-msgstr "Display info on the index page about guests and registered users currently browsing the board."
-
-msgid "Censor words label"
-msgstr "Censor words"
-
-msgid "Censor words help"
-msgstr "Enable this to censor specific words in the board. See %s for more info."
-
-msgid "Signatures label"
-msgstr "Signatures"
-
-msgid "Signatures help"
-msgstr "Allow users to attach a signature to their posts."
-
-msgid "User has posted label"
-msgstr "User has posted earlier"
-
-msgid "User has posted help"
-msgstr "This feature displays a dot in front of topics in viewforum.php in case the currently logged in user has posted in that topic earlier. Disable if you are experiencing high server load."
-
-msgid "Topic views label"
-msgstr "Topic views"
-
-msgid "Topic views help"
-msgstr "Keep track of the number of views a topic has. Disable if you are experiencing high server load in a busy forum."
-
-msgid "Quick jump label"
-msgstr "Quick jump"
-
-msgid "Quick jump help"
-msgstr "Enable the quick jump (jump to forum) drop list."
-
-msgid "GZip label"
-msgstr "GZip output"
-
-msgid "GZip help"
-msgstr "If enabled, FluxBB will gzip the output sent to browsers. This will reduce bandwidth usage, but use a little more CPU. This feature requires that PHP is configured with zlib (--with-zlib). Note: If you already have one of the Apache modules mod_gzip or mod_deflate set up to compress PHP scripts, you should disable this feature."
-
-msgid "Search all label"
-msgstr "Search all forums"
-
-msgid "Search all help"
-msgstr "When disabled, searches will only be allowed in one forum at a time. Disable if server load is high due to excessive searching."
-
-msgid "Menu items label"
-msgstr "Additional menu items"
-
-msgid "Menu items help"
-msgstr "By entering HTML hyperlinks into this textbox, any number of items can be added to the navigation menu at the top of all pages. The format for adding new links is X = &lt;a href=\"URL\"&gt;LINK&lt;/a&gt; where X is the position at which the link should be inserted (e.g. 0 to insert at the beginning and 2 to insert after \"User list\"). Separate entries with a linebreak."
-
-msgid "Feed subhead"
-msgstr "Syndication"
-
-msgid "Default feed label"
-msgstr "Default feed type"
-
-msgid "Default feed help"
-msgstr "Select the type of syndication feed to display. Note: Choosing none will not disable feeds, only hide them by default."
-
-msgid "None"
-msgstr "None"
-
-msgid "RSS"
-msgstr "RSS"
-
-msgid "Atom"
-msgstr "Atom"
-
-msgid "Feed TTL label"
-msgstr "Duration to cache feeds"
-
-msgid "Feed TTL help"
-msgstr "Feeds can be cached to lower the resource usage of feeds."
-
-msgid "No cache"
-msgstr "Don't cache"
-
-msgid "Minutes"
-msgstr "%d minutes"
-
-msgid "Reports subhead"
-msgstr "Reports"
-
-msgid "Reporting method label"
-msgstr "Reporting method"
-
-msgid "Internal"
-msgstr "Internal"
-
-msgid "By e-mail"
-msgstr "Email"
-
-msgid "Both"
-msgstr "Both"
-
-msgid "Reporting method help"
-msgstr "Select the method for handling topic/post reports. You can choose whether topic/post reports should be handled by the internal report system, emailed to the addresses on the mailing list (see below) or both."
-
-msgid "Mailing list label"
-msgstr "Mailing list"
-
-msgid "Mailing list help"
-msgstr "A comma separated list of subscribers. The people on this list are the recipients of reports."
-
-msgid "Avatars subhead"
-msgstr "Avatars"
-
-msgid "Use avatars label"
-msgstr "Use avatars"
-
-msgid "Use avatars help"
-msgstr "When enabled, users will be able to upload an avatar which will be displayed under their title."
-
-msgid "Upload directory label"
-msgstr "Upload directory"
-
-msgid "Upload directory help"
-msgstr "The upload directory for avatars (relative to the FluxBB root directory). PHP must have write permissions to this directory."
-
-msgid "Max width label"
-msgstr "Max width"
-
-msgid "Max width help"
-msgstr "The maximum allowed width of avatars in pixels (60 is recommended)."
-
-msgid "Max height label"
-msgstr "Max height"
-
-msgid "Max height help"
-msgstr "The maximum allowed height of avatars in pixels (60 is recommended)."
-
-msgid "Max size label"
-msgstr "Max size"
-
-msgid "Max size help"
-msgstr "The maximum allowed size of avatars in bytes (10240 is recommended)."
-
-msgid "E-mail subhead"
-msgstr "Email"
-
-msgid "Admin e-mail label"
-msgstr "Admin email"
-
-msgid "Admin e-mail help"
-msgstr "The email address of the board administrator."
-
-msgid "Webmaster e-mail label"
-msgstr "Webmaster email"
-
-msgid "Webmaster e-mail help"
-msgstr "This is the address that all emails sent by the board will be addressed from."
-
-msgid "Forum subscriptions label"
-msgstr "Forum subscriptions"
-
-msgid "Forum subscriptions help"
-msgstr "Enable users to subscribe to forums (receive email when someone creates a new topic)."
-
-msgid "Topic subscriptions label"
-msgstr "Topic subscriptions"
-
-msgid "Topic subscriptions help"
-msgstr "Enable users to subscribe to topics (receive email when someone replies)."
-
-msgid "SMTP address label"
-msgstr "SMTP server address"
-
-msgid "SMTP address help"
-msgstr "The address of an external SMTP server to send emails with. You can specify a custom port number if the SMTP server doesn't run on the default port 25 (example: mail.myhost.com:3580). Leave blank to use the local mail program."
-
-msgid "SMTP username label"
-msgstr "SMTP username"
-
-msgid "SMTP username help"
-msgstr "Username for SMTP server. Only enter a username if it is required by the SMTP server (most servers <strong>do not</strong> require authentication)."
-
-msgid "SMTP password label"
-msgstr "SMTP password"
-
-msgid "SMTP change password help"
-msgstr "Check this if you want to change or delete the currently stored password."
-
-msgid "SMTP password help"
-msgstr "Password for SMTP server. Only enter a password if it is required by the SMTP server (most servers <strong>do not</strong> require authentication). Please enter your password twice to confirm."
-
-msgid "SMTP SSL label"
-msgstr "Encrypt SMTP using SSL"
-
-msgid "SMTP SSL help"
-msgstr "Encrypts the connection to the SMTP server using SSL. Should only be used if your SMTP server requires it and your version of PHP supports SSL."
-
-msgid "Registration subhead"
-msgstr "Registration"
-
-msgid "Allow new label"
-msgstr "Allow new registrations"
-
-msgid "Allow new help"
-msgstr "Controls whether this board accepts new registrations. Disable only under special circumstances."
-
-msgid "Verify label"
-msgstr "Verify registrations"
-
-msgid "Verify help"
-msgstr "When enabled, users are emailed a random password when they register. They can then log in and change the password in their profile if they see fit. This feature also requires users to verify new email addresses if they choose to change from the one they registered with. This is an effective way of avoiding registration abuse and making sure that all users have \"correct\" email addresses in their profiles."
-
-msgid "Report new label"
-msgstr "Report new registrations"
-
-msgid "Report new help"
-msgstr "If enabled, FluxBB will notify users on the mailing list (see above) when a new user registers in the forums."
-
-msgid "Use rules label"
-msgstr "User forum rules"
-
-msgid "Use rules help"
-msgstr "When enabled, users must agree to a set of rules when registering (enter text below). The rules will always be available through a link in the navigation table at the top of every page."
-
-msgid "Rules label"
-msgstr "Enter your rules here"
-
-msgid "Rules help"
-msgstr "Here you can enter any rules or other information that the user must review and accept when registering. If you enabled rules above you have to enter something here, otherwise it will be disabled. This text will not be parsed like regular posts and thus may contain HTML."
-
-msgid "E-mail default label"
-msgstr "Default email setting"
-
-msgid "E-mail default help"
-msgstr "Choose the default privacy setting for new user registrations."
-
-msgid "Display e-mail label"
-msgstr "Display email address to other users."
-
-msgid "Hide allow form label"
-msgstr "Hide email address but allow form e-mail."
-
-msgid "Hide both label"
-msgstr "Hide email address and disallow form email."
-
-msgid "Announcement subhead"
-msgstr "Announcements"
-
-msgid "Display announcement label"
-msgstr "Display announcement"
-
-msgid "Display announcement help"
-msgstr "Enable this to display the below message in the board."
-
-msgid "Announcement message label"
-msgstr "Announcement message"
-
-msgid "Announcement message help"
-msgstr "This text will not be parsed like regular posts and thus may contain HTML."
-
-msgid "Maintenance subhead"
-msgstr "Maintenance"
-
-msgid "Maintenance mode label"
-msgstr "Maintenance mode"
-
-msgid "Maintenance mode help"
-msgstr "When enabled, the board will only be available to administrators. This should be used if the board needs to be taken down temporarily for maintenance. <strong>WARNING! Do not log out when the board is in maintenance mode.</strong> You will not be able to login again."
-
-msgid "Maintenance message label"
-msgstr "Maintenance message"
-
-msgid "Maintenance message help"
-msgstr "The message that will be displayed to users when the board is in maintenance mode. If left blank, a default message will be used. This text will not be parsed like regular posts and thus may contain HTML."
diff --git a/lang/English/admin/parser.mo b/lang/English/admin/parser.mo
deleted file mode 100644
index b18ade305d28766faae4f1f67744c3d60cc02cf4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5557
zcmbVPO^h5z6>cCTumJ*wgzyu19uquk&$PX^S<E;K_O5pwBkxbV>)^<;CpA4aGnMVG
zo>X=3?gSBWK#*LxpeTYvltX|M91w6ooKO%44j>VU8wv-+g%g&@35oAjRnN@YSs!R^
z@7J$>UcLW%^S49yy%OO$jrX&7fBBv$x&*xPKK#QoxG#zx0xIA~fFs~XfiD3c1pYA0
z|2W{UfHN5XeW3pgydU)2Kwke(;0J-Xfgc9`7x*FIgYS=`4*(wp^7vsO?>hnHee*!(
zy9i`?R>SyBAj_kGEZ+-2-v2U?`MwJL81M}s^Z7N9*Z(ez{{_hF{{iInx5GFe&f|vy
z67T`gF_72I1DW3vkk4HQ^7>n0J`Feu_}zd%2>5!yp9TC)z&`|h3&{HZJ>b89toJ*>
z4fyB*2*dJRhtc@_XMwC&4m<+<Ht>_cH-NnEx4=WdH-THgzXExE1I~B|{1$+ZfL_I+
zd`=hm31AWMW#C(&Ujy<!3*~PBzXN<2_%=|1&wqf-=UEto`R)QA1^qn;c@_9Num-#h
zWWPLu!#)nI1D^su0R)Ta`#_feM?hZp3*dF&n?U?Uk3k5i5H*3!e;)W#oVN~q4D>tL
z^f}<eP@4Ij0nP)@1HTB|1)c=H24s8v3CKBc8_4n<g;2+UUkCEK68Ht+Pk_Atk3jrI
z|Hi+c<J|jUEI@>CcIy#F?qMFh?>JtTvw;^Px*RwPjPdfrx;~Eg(@fy`yayL+oR=&U
zpUcl@JnZ{F2kKLJA-;<T)~R|BGA@=*08isRjF)Z55Br!O_Sr06j$yW69d8pamjR9+
zw&k4<>(9O?yzHat=e;0K;bq&ipQ6RZrMxRG*|IZ`q8lycx~KYMa!u}%%~UE!q%zT$
z(S|Tq8ggr|$}BIY_HJUKnxd0bCEIP4^=&ly#MX2eb!D%;HwsV<4U0iL6MK=;?O|?<
zb}BkDWy-34ATSN;1sPQzelJsC=fMv>UqUv2_~dhXDph*hMt;tH`$;3MEC}+6GA(T6
z$hIw$L|PkJu_GshvrD@N>jde%rM!Ss-=1+8DCAzHSr{pYX%5TVkuJm@*<zH+eT3g$
zh`ttCbrPszG#pdl2`M7x4fGpIEp~*04Kd-5fLFa5o@{r@qR4faY)fO>bJN7BY2x%W
zab}wM(ljwYO?-KpI6F;zr6TfPFWM2Q>UvL2KD`bbX=y~-T**ylTcn4Mv<s)sk^fw%
zYdX9@bF=4WHcbAUOp4~^Zu4nrtjcwZR-`Bf(kw2{Y^-lJmkdaZH!q4pwg_X*t8z#2
z(rW06utjsr2yIhQ<OYkb2;DCc_{}XTvMG-Agy?2UpYQo2I-NK-{jbifUS3_EoIe+z
zoIyerQiChp)gt!LiD4>~K1a!bbE#OkwzbkcJ6Xr4_oQhq>m=_g-EYy^jw;52v`Ffi
z>&;72OXFqS$Yoa*G#8(Z&tS%r&CR?tiCpq$w8$S)rF)ge`H&4_ql40X-Oo3uDicC?
zY15~9<kR2R1#+Hq=8dZPRk1DU^6DjW$?xLuqOwpv)Dla~O{6xbjF(E03<5VX*+ZP0
zROAFtQm;%?;{5MYZd6}sk;c(QpR1I?41%sdGaeYKJ(<$3>J|fc)Ih5KprBrENTaU7
z^`%I|w!Fj9W2x@SoNZvXD|1V-NM>XD#z1Nk#8rs~f(3VqAqyR27OnO)hcP0Hj4O-0
zphn)nq%0Ms(JZ!ZuqN866IOBsA*CT#<}Ap|Z6Z=Ehu%H-c2^Yx<@Q)fU6o1AQR@w8
zWPxyU{3@G}utR7=2oROW(JIOci>jq95Kt&?sI+l(Ax-mLoa@xGUz^Y<w^~46i9zgD
zS(!O?Sx#4ctHB_@Ga2Ocvn+E*!mr@&6lQ~i!w^|ygDDf2iV#IOPq1B`St{F2I67~$
zL6U(?w!u&Ip)K41gIJEb5=SA7j2z~s;CbgA6f<~P^$5me<L8hG*BY<%yeIL>^SO3b
za+;3AsM7L)FmeiVRR13V6;+AA=>ZQsb!~lXnZ~0&1}Q=5fU;03_}?#sD`CgWJ#T_Z
zgz>!v+t=3e8r3-@!zD(TV873X$P3&9PeJYqBw-}!95<g&Q5@PgVmMHU!*oQrD%=V-
zJ=%n+RcvoKDI3BNT-|7ZLT9Fv)*HOe=ea2LbG+0`+@jhyVTW(kkZ1>M^^CN&cU8cN
z4<R7`M0U-&#DdqId_fiRSw0&_S5Q<`ZxjrlsKS>nSF&6-Zy+Sm=j<AE5v>|kE4+%r
z7p0C!#+7NDdag!ri3xHI#17}&{&`(y9dOT(x+oa}A&{hH7d8)x><UX!7zMja?@Y(n
z?`zP|$VBq`&WJ>djvhJMa76=IuX+mOf)fNK74e>Ppdd-c>{5kdYjc?WhLdsO0^ekG
zWbWkL%{Y#4oN%Kz;SQ8|i)-+%NV3)aaj*NK>NdD$kC2}sJXg|kZ*lR?*tBuQ61Sp8
zq1eBh`>t;6ZkDPOb@iqi366KgBHEC+_%xym_XLUVbEPd%Fn!(kEf;n2z3DPquQFwB
z{^aAdut2BI?43G8F7YkQz&9Gs<?xQKxo*vst-#F1ceJ#Aahdk@aGNsaB8=?dmX7Q|
zB0*iP@0mRF*_$eqGI%H{je(3X6lWMB7e3r{4dIixvr@jd5HGI8#^DmDEtK>%w1g3V
za5oq&Ygdo9ASYibc7T$Yl;~o^gv~Rbq&&+pwk=1tFgeFVwYEiVnGJEt@h#hK&@o=1
z`^Oq|UTLJRL|N*}^9?u%d49_#Mh%NwOm<%M#ET7TcA-0}ann`Y<IqWRaX#)$7}H$>
zx)Rz!pztQDADeaie6;hxky&J%#r4ct?m7mX?hAgnQ8+y~&-{gwp;^au)1W#Mk-H-|
zrAh9Ai%Ul>Q4YJMVS>{G8Py!3A7h%e$6g+0mrt7#ahs}4!5Ll_l;|C&8dqLyP&n@S
zQsH*ti1S?&TiW7EL{X3cKEY+xINP}dbZ}%GZSkenD|Nzc8E5oV6F&|^7ef0xdgNGK
zMdk|Rts*w8>fv_)@`tYZ_<*Qcz60g*>bG4lPrK5LPq<?nbDX+G@41ZQkk|56f-cGB
z#z7kvagnex{JZ9$HSX+OBQfBeLb;mm#hWS!cgVZOP1C*EVo8B8&y6r61mC^1UlN*?
z*){OGPhZ##1!wypk+11(o$n&pxCc2L+`?XGp)4C`lI`HbDT~_nF70FF+RjO2hp0ve
z>aG;-9XPbmt5&TihpdZnsS{aM{=2(0zBUZvH1vZ$Zdp3~>JkV96rpi58q*SYUcNiO
zo0Y4vxMjLIt*viWH!yczRnJxDFhl)z`Q%%{9VK_AIf|q}L+1K(fAtF;ej4~Dds3p&
zi{N(_1S@bmP>mZ}w+#)p@uctVs}8~Cs5@}d68JU*!l0p!slJAbo!Ny>a?(asE^#`*
lo*PeYz`#bi(pp0R=DY3Er0rfll)A?5T)A*%b2*-k{s-{mb5#HU

diff --git a/lang/English/admin/parser.php b/lang/English/admin/parser.php
deleted file mode 100644
index e15237e9..00000000
--- a/lang/English/admin/parser.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-// Language definitions used by parser admin panel
-$lang_admin_parser = array(
-    'Parser head'            =>    'Parser Options, BBCodes and Smilies',
-    'reset_success'            =>    'Parser Options, BBCodes and Smilies successfully reset to FluxBB default settings.',
-    'save_success'            =>    'Parser changes successfully saved.',
-    'upload success'        =>    'Smiley file upload successful.',
-    'upload_button'            =>    'Upload Smiley Image',
-    'reset defaults'            =>    'Restore default settings',
-
-/* *********************************************************************** */
-    'Remotes subhead'        =>    'Remote image validation',
-    'unavailable'            =>    'This function is unavailable.',
-
-/* *********************************************************************** */
-    'Config subhead'        =>    'Parser options',
-
-    'syntax style'            =>    'CODE syntax style',
-    'syntax style help'        =>    'Select a style sheet file from this list of currently installed SyntaxHighlighter files.',
-
-    'textile'                =>    'Enable Textile shortcuts',
-    'textile help'            =>    'Enable some textile tag keystroke shortcuts: _emphasized_, *strong*, @inline code@, super^script^, sub~script~, -deleted- and +inserted+ text. Textile shortcuts for bulleted (*) and numbered (#) lists are also supported. When posting a new message, (or editing an existing one), during the pre-parsing phase, the textile shortcut delimiters are converted to their equivalent BBCode tags before being stored in the database.',
-
-    'quote_imgs'            =>    'Display IMG in QUOTE ',
-    'quote_imgs help'        =>    'Display images contained within QUOTE tags. If this option is set to "No" (the default setting), then images within a quote are not displayed graphically but are instead displayed as a simple text hyperlink to the image (with the link text set to: "{IMG}"). If this option is set to "Yes", then images within quotes are displayed normally (as a graphic object).',
-
-    'quote_links'            =>    'Linkify QUOTE citation',
-    'quote_links help'        =>    'Make the "Poster wrote:" citation text a link back to the original post for quotes having original post number metadata included in the tag attribute (the post number, preceded by a: \'#\', is specified at the end of the attribute like so: "[quote=Admin #101]...[/quote]").',
-
-    'click_imgs'            =>    'Make IMG clickable',
-    'click_imgs help'        =>    'Display images and also make each image a clickable link to the full sized original.',
-
-    'max_xy'                =>    'Maximum media XY',
-    'max_xy help'            =>    'Maximum pixel width and height allowable for new visual media objects (images, videos etc).',
-
-    'smiley_size'            =>    'Smiley display size',
-    'smiley_size help'        =>    'Percent size adjustment for smiley box dimensions (default 160% == 24x24 pixels).',
-
-/* *********************************************************************** */
-    'valid_imgs'            =>    'Validate remote IMG',
-    'valid_imgs help'        =>    'When posting a message having IMG tags, validate the existence of the remote image files by requesting their file header information. Check each remote image filesize and do NOT display if too big (to save the forum viewer\'s bandwidth). If any image has a dimension greater than "Max width" or "Max height", then limit the displayed image to fit. (Note that this option is disabled if the PHP variable "allow_url_fopen" is FALSE.)',
-
-    'max_size'                =>    'Maximum IMG filesize',
-    'max_size help'            =>    'Maximum remote image filesize to be allowed on forum pages. When creating a new post, the remote image file size is checked against this value and reported as an error if it is too big and image validation is on.',
-
-    'def_xy'                =>    'Default media XY',
-    'def_xy help'            =>    'Default pixel width and height for new visual media objects (images, videos etc). When a post has an IMG tag and the "Validate remote IMG" option is turned on, then the remote file information is scaled to fit within these dimensions and retain the original aspect ratio.',
-
-/* *********************************************************************** */
-    'Smilies subhead'        =>    'Smilies',
-    'smiley_text_label'        =>    'Smiley text',
-    'smiley_file_label'        =>    'Smiley image file',
-    'smiley_upload'            =>    'Upload new smiley image',
-    'New smiley image'        =>    'New smiley image',
-    'upload_err_1'            =>    'Smiley upload failed. Unable to move to smiley folder.',
-    'upload_err_2'            =>    'Smiley upload failed. File is too big.',
-    'upload_err_3'            =>    'Smiley upload failed. File type is not an image.',
-    'upload_err_4'            =>    'Smiley upload failed. Bad filename.',
-    'upload_err_5'            =>    'Smiley upload failed. File only partially uploaded.',
-    'upload_err_6'            =>    'Smiley upload failed. No filename.',
-    'upload_err_7'            =>    'Smiley upload failed. No temporary folder.',
-    'upload_err_8'            =>    'Smiley upload failed. Cannot write file to disk.',
-    'upload_err_9'            =>    'Smiley upload failed. Unknown error!',
-    'upload_off'            =>    'Uploading files is currently disabled.',
-    'upload_button'            =>    'Upload File',
-
-/* *********************************************************************** */
-    'BBCodes subhead'        =>    'BBCodes',
-    'tagname_label'            =>    'BBCode Tag Name',
-    'tagtype_label'            =>    'Tag type',
-    'in_post_label'            =>    'Allow in posts?',
-    'in_sig_label'            =>    'Allow in signatures?',
-    'depth_max'                =>    'Max tag nesting depth.',
-    'tag_summary'        =>    array(
-        'unknown'        =>    'Unrecognized tag - (need to update language file).',
-        'code'            =>    'Computer Code. [attrib=language].',
-        'quote'            =>    'Block Quotation. [attrib == citation].',
-        'list'            =>    'Ordered or Unordered list. (*=bulleted | a=alpha | 1=numeric).',
-        '*'                =>    'List Item.',
-        'h'                =>    'Header 5. [attrib=TITLE].',
-        'img'            =>    'Inline Image. [attrib=ALT=TITLE].',
-        'url'            =>    'Hypertext Link. [attrib=URL].',
-        'b'                =>    'Strong Emphasis. (Bold).',
-        'i'                =>    'Emphasis. (Italic).',
-        's'                =>    'Strike-through Text.',
-        'u'                =>    'Underlined Text.',
-        'color'            =>    'Color. attrib=[#FFF | #FFFFFF | red].',
-        'tt'            =>    'Teletype Text.',
-        'center'        =>    'Centered Block.',
-        'err'            =>    'Error codes generated by parser for invalid BBCode. [attrib=TITLE].',
-        'dbug'            =>    'Debug messages generated by parser. [attrib=TITLE].',
-    ),
-);
diff --git a/lang/English/admin/parser.po b/lang/English/admin/parser.po
deleted file mode 100644
index b21ec9f5..00000000
--- a/lang/English/admin/parser.po
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Parser head"
-msgstr "Parser Options, BBCodes and Smilies"
-
-msgid "reset_success"
-msgstr "Parser Options, BBCodes and Smilies successfully reset to FluxBB default settings."
-
-msgid "save_success"
-msgstr "Parser changes successfully saved."
-
-msgid "upload success"
-msgstr "Smiley file upload successful."
-
-msgid "upload_button"
-msgstr "Upload File"
-
-msgid "reset defaults"
-msgstr "Restore default settings"
-
-msgid "Remotes subhead"
-msgstr "Remote image validation"
-
-msgid "unavailable"
-msgstr "This function is unavailable."
-
-msgid "Config subhead"
-msgstr "Parser options"
-
-msgid "syntax style"
-msgstr "CODE syntax style"
-
-msgid "syntax style help"
-msgstr "Select a style sheet file from this list of currently installed SyntaxHighlighter files."
-
-msgid "textile"
-msgstr "Enable Textile shortcuts"
-
-msgid "textile help"
-msgstr "Enable some textile tag keystroke shortcuts: _emphasized_, *strong*, @inline code@, super^script^, sub~script~, -deleted- and +inserted+ text. Textile shortcuts for bulleted (*) and numbered (#) lists are also supported. When posting a new message, (or editing an existing one), during the pre-parsing phase, the textile shortcut delimiters are converted to their equivalent BBCode tags before being stored in the database."
-
-msgid "quote_imgs"
-msgstr "Display IMG in QUOTE "
-
-msgid "quote_imgs help"
-msgstr "Display images contained within QUOTE tags. If this option is set to \"No\" (the default setting), then images within a quote are not displayed graphically but are instead displayed as a simple text hyperlink to the image (with the link text set to: \"{IMG}\"). If this option is set to \"Yes\", then images within quotes are displayed normally (as a graphic object)."
-
-msgid "quote_links"
-msgstr "Linkify QUOTE citation"
-
-msgid "quote_links help"
-msgstr "Make the \"Poster wrote:\" citation text a link back to the original post for quotes having original post number metadata included in the tag attribute (the post number, preceded by a: '#', is specified at the end of the attribute like so: \"[quote=Admin #101]...[/quote]\")."
-
-msgid "click_imgs"
-msgstr "Make IMG clickable"
-
-msgid "click_imgs help"
-msgstr "Display images and also make each image a clickable link to the full sized original."
-
-msgid "max_xy"
-msgstr "Maximum media XY"
-
-msgid "max_xy help"
-msgstr "Maximum pixel width and height allowable for new visual media objects (images, videos etc)."
-
-msgid "smiley_size"
-msgstr "Smiley display size"
-
-msgid "smiley_size help"
-msgstr "Percent size adjustment for smiley box dimensions (default 160% == 24x24 pixels)."
-
-msgid "valid_imgs"
-msgstr "Validate remote IMG"
-
-msgid "valid_imgs help"
-msgstr "When posting a message having IMG tags, validate the existence of the remote image files by requesting their file header information. Check each remote image filesize and do NOT display if too big (to save the forum viewer's bandwidth). If any image has a dimension greater than \"Max width\" or \"Max height\", then limit the displayed image to fit. (Note that this option is disabled if the PHP variable \"allow_url_fopen\" is FALSE.)"
-
-msgid "max_size"
-msgstr "Maximum IMG filesize"
-
-msgid "max_size help"
-msgstr "Maximum remote image filesize to be allowed on forum pages. When creating a new post, the remote image file size is checked against this value and reported as an error if it is too big and image validation is on."
-
-msgid "def_xy"
-msgstr "Default media XY"
-
-msgid "def_xy help"
-msgstr "Default pixel width and height for new visual media objects (images, videos etc). When a post has an IMG tag and the \"Validate remote IMG\" option is turned on, then the remote file information is scaled to fit within these dimensions and retain the original aspect ratio."
-
-msgid "Smilies subhead"
-msgstr "Smilies"
-
-msgid "smiley_text_label"
-msgstr "Smiley text"
-
-msgid "smiley_file_label"
-msgstr "Smiley image file"
-
-msgid "smiley_upload"
-msgstr "Upload new smiley image"
-
-msgid "New smiley image"
-msgstr "New smiley image"
-
-msgid "upload_err_1"
-msgstr "Smiley upload failed. Unable to move to smiley folder."
-
-msgid "upload_err_2"
-msgstr "Smiley upload failed. File is too big."
-
-msgid "upload_err_3"
-msgstr "Smiley upload failed. File type is not an image."
-
-msgid "upload_err_4"
-msgstr "Smiley upload failed. Bad filename."
-
-msgid "upload_err_5"
-msgstr "Smiley upload failed. File only partially uploaded."
-
-msgid "upload_err_6"
-msgstr "Smiley upload failed. No filename."
-
-msgid "upload_err_7"
-msgstr "Smiley upload failed. No temporary folder."
-
-msgid "upload_err_8"
-msgstr "Smiley upload failed. Cannot write file to disk."
-
-msgid "upload_err_9"
-msgstr "Smiley upload failed. Unknown error!"
-
-msgid "upload_off"
-msgstr "Uploading files is currently disabled."
-
-msgid "BBCodes subhead"
-msgstr "BBCodes"
-
-msgid "tagname_label"
-msgstr "BBCode Tag Name"
-
-msgid "tagtype_label"
-msgstr "Tag type"
-
-msgid "in_post_label"
-msgstr "Allow in posts?"
-
-msgid "in_sig_label"
-msgstr "Allow in signatures?"
-
-msgid "depth_max"
-msgstr "Max tag nesting depth."
-
-msgid "tag_summary"
-msgstr ""
diff --git a/lang/English/admin/permissions.mo b/lang/English/admin/permissions.mo
deleted file mode 100644
index b90e01493cdced77a818ba14c09c24312dcc9be4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2836
zcmb7_&u<(x6vqveAKjJ$Ek8>E7kWrgXVO&s2%DyYqzy`yh*gpzqzEMMj(65*#-5Hn
zO>^OZg!lsxLWm38kl=v0a6*CuS0u!_NF2CwtB?=}zHjWE{gED;(M~?`^Yin2&+mEu
zIDY6;hUZzlr|=%Vi?LboKaid;?`G^V@GJ0f@CWcX_$zn<{4>no3iC(qVeAOx&x1$7
z7<?F91Rnv{L0bPFNb9eGWd9?O?0*3s1HT6!0)GZc?>F#K@UJlbH;j)R^7dW;N$(Yq
z_PYX-y&aJ3lpwAD5G1|N!uT7I{P_v&Am-n}a~Pkw&)c~Qp2xTklHTVa&3_x_Z-Qqq
z{u{)Pow%Q|)8I*v;<^C-18#zp-zyIwCNKq`17{C2_9D0j;>R5Rtb!kaPk_IG7r~q0
zli;ZqW3PcPgEVhI%J;`0#rFw_t=QKf<^MbIRq#iU;=Tpq#|~o=9WmT!9y%X-$WMxe
zo_p~=gO_qi=Ryzd^B~@*@RBWxlj?`;laFw<_6?|WhNEg8@(rcJp2m9;FP#<nPY?M!
zd~gi)xv@90jQ2!gc`mILspJEh75k-`=*ny)wkow#nzd+Jt?Irndv01YNWJp%@`_2q
zw&DMYiP2VJc5I_%p|wo7jB=qezssb^Te?&gnd%8ACp7m-z4BU4S#Tot_C~|$>5*e2
zoiX1w#0`!i&!kS>z#E&Ad5euuX&I6_De`I^S?0=GWi%;?gpt7Vsz?x6!b_Q`61ip_
zW1Z3|w^g@R+mxxYt`rU{$As4^s88f$Q%=bIu3IYA!c`?a8yf6nRVlJ))nNNJ*F`<F
zOXnB4|95Fd^V3Uwes;0dDGi-}w3b9~%aVL=^HnL_K$gqPt<GE9(MpLS<k2NW(dLjv
zoASCM)uCuzSQl-VLfcF@Q$lH7=(NHqMcY#3V;1=Zk>pCh-uGK{yRj+Li>-~djmx9`
z=i_s&6{DThu)0@ZQzvh@xgrxvFY?|%lvcW>tJ|y5!bp#H@5?f}ta~OwcH4ZRt6bwq
zn@in#CwfzAiA0l+9fR|5d_G=?U&4$ZMq8#Tdve9^(dK>=>MFC#Mbm-K@E#n5KiueS
zkJ?i?k)e{DLl)yv8-|{3ETG=}Y4JO^(X1I+3H^Bh8-7Kw5c(AE7pO(cXHb_W&!tXe
zG8;2LJ)vtklq)Ms>X=Y(L&bV-Bo6CH*;15cUEWx^tI%bpq!ZNCzy=xZhWnwu9z>F$
zjO|=vFw`+$>m#Fm$A#kxUM8|Hs?2eme%(Jad(zIH<!+!X7rnZBb`>tmuH=FaOeSY}
zx59Fbu`C^z^)5pli~1rbQ0tr~s3kKrBA>wm+3%w*)OE>s#U3|(Z0<+^og6->B9kF7
z-?tWN^Hp-Yh@@py(51;N-yKNmt~!}$*@3CDWX$FL86$7T(*uW*5TQ+D2H~MelRZ8V
zw$54;{y{@meVj?sT*gSOk6R|g@J5ppP9Z`cK4mkM*N)25cX#IKZ+%-2%PnTjb$myQ
zrpk`bAao>uykZ-JRHkF4xLu#^4V70p*Hzv{-f@<6g`i-lKE+f~qY}{0zPDqBTfSb}
zSPb6^c6+-hA>6_THc6}MZ$<ccjQ>CUdc?!81{?ocVBo(9X(g$TQO&k03fxHhiUwup
SyB#GQPp<Rj#kQKpX8!{#k0yoy

diff --git a/lang/English/admin/permissions.po b/lang/English/admin/permissions.po
deleted file mode 100644
index 0539ea39..00000000
--- a/lang/English/admin/permissions.po
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Perms updated redirect"
-msgstr "Permissions updated."
-
-msgid "Permissions head"
-msgstr "Permissions"
-
-msgid "Posting subhead"
-msgstr "Posting"
-
-msgid "BBCode label"
-msgstr "BBCode"
-
-msgid "BBCode help"
-msgstr "Allow BBCode in posts (recommended)."
-
-msgid "Image tag label"
-msgstr "Image tag"
-
-msgid "Image tag help"
-msgstr "Allow the BBCode [img][/img] tag in posts."
-
-msgid "All caps message label"
-msgstr "All caps message"
-
-msgid "All caps message help"
-msgstr "Allow a message to contain only capital letters."
-
-msgid "All caps subject label"
-msgstr "All caps subject"
-
-msgid "All caps subject help"
-msgstr "Allow a subject to contain only capital letters."
-
-msgid "Require e-mail label"
-msgstr "Require guest email"
-
-msgid "Require e-mail help"
-msgstr "Require guests to supply an email address when posting."
-
-msgid "Signatures subhead"
-msgstr "Signatures"
-
-msgid "BBCode sigs label"
-msgstr "BBCodes in signatures"
-
-msgid "BBCode sigs help"
-msgstr "Allow BBCodes in user signatures."
-
-msgid "Image tag sigs label"
-msgstr "Image tag in signatures"
-
-msgid "Image tag sigs help"
-msgstr "Allow the BBCode [img][/img] tag in user signatures (not recommended)."
-
-msgid "All caps sigs label"
-msgstr "All caps signature"
-
-msgid "All caps sigs help"
-msgstr "Allow a signature to contain only capital letters."
-
-msgid "Max sig length label"
-msgstr "Maximum signature length"
-
-msgid "Max sig length help"
-msgstr "The maximum number of characters a user signature may contain."
-
-msgid "Max sig lines label"
-msgstr "Maximum signature lines"
-
-msgid "Max sig lines help"
-msgstr "The maximum number of lines a user signature may contain."
-
-msgid "Registration subhead"
-msgstr "Registration"
-
-msgid "Banned e-mail label"
-msgstr "Allow banned email addresses"
-
-msgid "Banned e-mail help"
-msgstr "Allow users to register with or change to a banned email address/domain. If left at its default setting (yes), this action will be allowed, but an alert email will be sent to the mailing list (an effective way of detecting multiple registrations)."
-
-msgid "Duplicate e-mail label"
-msgstr "Allow duplicate email addresses"
-
-msgid "Duplicate e-mail help"
-msgstr "Controls whether users should be allowed to register with an email address that another user already has. If allowed, an alert email will be sent to the mailing list if a duplicate is detected."
diff --git a/lang/English/admin/plugin_example.mo b/lang/English/admin/plugin_example.mo
deleted file mode 100644
index e0a606bdc922c117379a06cbd1f0c098bc8199bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1137
zcmZva%We}f6ow6yTY%D5thh+00mMbjKq?j`B^AA-rBVwKO%W`enKOxDVn?>8Y2E-H
zpj)1ZCt$%Vuw@6oGwDSLOGlqCXMFxS{(sI*9SV#qh}#H{m_>X?gfVkQh&gZ;yaC<=
zuYoTn+?;R^40j~pMbLmV;1IkDegQ9mhhPiw4RIaoUuT7w2LFI7;Pg2mzJe|A4)_Cn
z4E_dhf_JBcxC}0X;ojHaEpQLSm7;<O1L<QOVU8nlK1?uz#_)X@K@ZA`3t@3Ing_B!
z$eA)@`{b3+SsZN*@}jHs@#Y|xT6$$P)sS+sS`b@$P<Tp=_N=|w<}T}$JRf-R#+2Oc
znc;Xwox*#gMH{E&4LKZ$kES3eRVrF}VPzg|K#QxBh5#&GV_}KPY2%@$`3BV<Emd09
zeB#7MTWR#3t%IyOZLst`wyUd^*4uWpX0gP6v@Si@3475y-d7>@Xlq+KAGNL2E|=a|
zByCIGEo7IYHp~908|kG?`%1sc$`YMUY;1SAva_|*JgHxcpH<e%E=29o07XL+o}yJs
zFHzEy*0FEwwKt;0le|zpV;ePfVp65Mbz1Bwe=MX<tScX)P1bBnjV;5e@>Gi#<L5Xj
zm(i{%Y{F}0jXIS@#EK?9^}zo;t!Vd@3#|>$oEmoefd@(Ik?%nY6^^qakLfk*gbBSR
zE&EK>i9@P!dBe~Yc}g87NnK-7asxAdTrcy_*vplNtw?qZTrz^rNy(Vj*(Fxt!(mT)
z!cPSeD4$aB3)Zm5<Z4JsV_IeESjE|s;3HBxxE7DR&p`<k23Mg14W%9{NR>nPN3m$a
zn-*FIit#5VD^tgnP^Nn9&+7cxjj2jQFJR~J)ubKs;yCU9{-x@DSB+^i7>}GUvMd&V
E0VRz$fB*mh

diff --git a/lang/English/admin/plugin_example.po b/lang/English/admin/plugin_example.po
deleted file mode 100644
index 491eca80..00000000
--- a/lang/English/admin/plugin_example.po
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "No text"
-msgstr "You didn't enter anything!"
-
-msgid "Example plugin title"
-msgstr "Example plugin"
-
-msgid "You said"
-msgstr "You said \"%s\". Great stuff."
-
-msgid "Explanation 1"
-msgstr "This plugin doesn't do anything useful. Hence the name \"Example\"."
-
-msgid "Explanation 2"
-msgstr "This would be a good spot to talk a little about your plugin. Describe what it does and how it should be used. Be brief, but informative."
-
-msgid "Example form title"
-msgstr "An example form"
-
-msgid "Legend text"
-msgstr "Enter a piece of text and hit \"Show text\"!"
-
-msgid "Text to show"
-msgstr "Text to show"
-
-msgid "Show text button"
-msgstr "Show text"
-
-msgid "Input content"
-msgstr "The text you want to display."
diff --git a/lang/English/admin/reports.mo b/lang/English/admin/reports.mo
deleted file mode 100644
index 3fcf39da696a0648275f2b7020ce364a802430ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1083
zcmY+CJ8u&~5XUc&5IDk9Q4ok?QG^7=U1CIGoiT#gF|rgJD;N~ft$h>w;Jkb6oq?p_
z3m`!O)cFSVbd+>7w4~w#(9rXrd-$=^+|Tn~@67S##V;1l1;};CXUG-E$^t$(LvR@k
zz!mUS&UfGm=<mUc;0N$Lcm!Sozk;0i9Xtj8$o)UTHR#9SS@0it5?nwr&R+sMu&sie
zPjGVI5x5E-f*k)5AI|>-UImZ9Yv4EVH24eTzP~|^`vY>{zaaNnUd-yQf&72hL9|U{
zmq0!UO%KQOu_1gHu6qW;_v3ftcR+f2&gEqAJtn74AtmHnImI|8W9`T|5v5HrB<Wl2
zhgO^32t$!JNu1lXP*a=L*5Xh`5&1=w)zPTXtXsPzW32#A7V)^3mdw>jjvpB6CwUaA
z^bV}&GGgJHMOG&q8yPwcZAP&tRFtZ5^-e`(KdZNtxKS0Q+ZDTG^b1sUn!fXlOdM$C
zi3Z7JNM>ux?mX@~H3JoPr!Eun1Z>VOy$(3EF!3umT_aT-%0wFk?MO8k%K<rElB1c5
z;-2(JfqJl?wdnO+Z3g%4R<pG|?O$>??V45zDO5d(&@`d9$wm~)KvhJ4C{0XB^=Y@^
zl&5jreV>f8t@_#z)W8$vUXV;K;t5jrp7V$lne2`oO@4skxn=h*Jele|(PPu6TGqo8
zS(9Ss1+&>>>>-aI?=u}|dt+`1tS%msgoLQMO>pNuvo+joC)RJq^GksNr>1m4M$){5
ZLB?r&cXlH<ss(r9OqFRY+*lh9`VXT)2pj+a

diff --git a/lang/English/admin/reports.po b/lang/English/admin/reports.po
deleted file mode 100644
index a37bac7b..00000000
--- a/lang/English/admin/reports.po
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Report zapped redirect"
-msgstr "Report marked as read."
-
-msgid "New reports head"
-msgstr "New reports"
-
-msgid "Deleted user"
-msgstr "Deleted user"
-
-msgid "Deleted"
-msgstr "Deleted"
-
-msgid "Post ID"
-msgstr "Post #%s"
-
-msgid "Report subhead"
-msgstr "Reported %s"
-
-msgid "Reported by"
-msgstr "Reported by %s"
-
-msgid "Reason"
-msgstr "Reason"
-
-msgid "Zap"
-msgstr "Mark as read"
-
-msgid "No new reports"
-msgstr "There are no new reports."
-
-msgid "Last 10 head"
-msgstr "10 last read reports"
-
-msgid "NA"
-msgstr "N/A"
-
-msgid "Zapped subhead"
-msgstr "Marked as read %s by %s"
-
-msgid "No zapped reports"
-msgstr "There are no read reports."
diff --git a/lang/English/admin/users.mo b/lang/English/admin/users.mo
deleted file mode 100644
index 4ca0d53146c0d6a3443f8069beba1e47755dceed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7114
zcmbW5Ym6L65yu;nkYET86UYn5B#^{Tyz4kG?6Vzm_MOeyKKtT3$2NJ+?#|u~o}F1{
zW_><D2rEDoMF=E9@_~mGMJVEt2qF|gJ`e;X5_~`rL<kTGNFap7BZv<Oz65^%?w;9Q
z`;Y>otNl;cbXQeZS65fxi)+vPoZ;y}Z-=&>Va$Et?XTg7=VRv>^IGsE_$Kgva1Hnc
z&wmtr1MP2u3^m^aUkCmWd_DLasBtfVZwCJgN}hi7eGT{)@O<#C;ME|1W|AM7uoqOn
zgC6e!r7r<x$A`i5z)ynG^LbEuz7D<-{4U6!`H64;0#v_0f|BzuQ2ozAnB-jKaU*yk
z?I}=p-3iK$(zj27Z=?N?$H&3*X+Hx>?h7EI&7b}Ee}Md%b8*gE@B&c%t_Ef21Smaw
zK>6ct@B**|ahdrPD18rtviC7i{hkJ8*Uv!7`7J29e*>lG-=O-frIYwqfNI|WO3n-@
zy|;P%ASgNaf_8qO=JmM8XF-jB5tP6F?)hh*>-d*|8h0JYpV`9?UCa^Bk3fz8h;M%e
zl%0=)((@FkdH>Y&{{+gumqF<}k4Y#l)`RlrHK6R>3ev^w1(~ur3QBJTYQ1xh_jr83
z<Cj6%^CZZh`7uAz_e+m2f%<+HN+kb6Q1Y(?=U&A;LD}<hl*pd@Jw6C({T~Le1HT4p
zfBXhq0)GecXZEoO2f#Z($$bpexbJ|n{|BJPKL=h8o{6($-&LUW-V9y~?grKWL*Q4z
zdqLTAEym04?O+P-1*PXH5Yx@GpzQiNC^^3ZHSS!TEjum%wVs!O?*g}g3*a5#rQj1F
zrkUqK+4Bbw)#fiCqO7sP^Dr8gSqCbfw}TqD3zYmLzMX;mnUnlH1U>}Hj*WCG!7X3{
zJ`SD$FD7Ut?*Z^h@Qa}IFAzjq!9`Ghc?3KQ{06B0PlA&BG^qLh2$Vmb_wC<<>h}_;
zJn&CY`Ee}`YY(XP+X8AHdqBy#9h4sy!Lz~C^N)kle-gYHyw|rM0SPhl6;N`&4a)BC
zgYN-f1~u-+i=6yzpw@3UsCmtUvh!|G>l}m9zYNNrkAjkWpa1?@Q1TuIHU3dh^Y|91
z{?CAt{~Y)U@YkT$qlMAZa{`o}lc4PWG^q9c5~%q;0m_e0fou=^+{W)l=mto0(lZHZ
z{3Vd$?k-4A6KdHvV>W{<vzdkzYkJ-fX??drb5QlXlNZf%KlEPDe7DC1@MdTybQHQC
z(z6@d2i>j)&sJy?v>n<49fI`S0m(-P)ZkeM-3Z;P#>ms=eHM~G<ck?-^pW4ShhFWO
z>p{ho)}eYDyl5TtTnFh~-T>iFyMJy0cR*T$Yap$)9>T-~df_<&h0qnyozSTdTg0x>
z9+0rEpLzeLb>0O{K@-qb&^w^ZAi`nnIg{3vp0gLc3DSPJ8&Vuy4IP9ILuWwmgY;Yu
zDXz@qfqg*|wxYyLc6xCdq*)nNj3fyb^K8&B%w*Ay(oUQ%njK*$n3)TDQBj185zSO2
z)>4%8t9K_+AAHB**NQRhGAN?FFgusRbTM)Y&CV?C#(6L3L`j4_aoWvJ<t5P~CYh;_
z?^gAc?Q0wa{j4a9s^K*FFUw(`Y9>=rJ*nwNFN~8Q>~wPG<)=S=q95l`(5V%SGMx3h
z;?#P>4>U77Z}EfiM<vY~H_~=PVH8oAx0f(J?3iJ*7_=NGJsu`;$LX)!Ju}M8qp--*
z!i+J?xEEDUufNz;thsx_Rx8TAq5Hz3w9X2`Zn+A#6?HSb;EcANkH<w^p5EKB$Gd0k
zu#B_RkDi_1U%k2L2_m_8C8(x6n;nk=w^qZ~`s@B^*+qw2?qSo}wm%D6#9OE+F6y~@
zZZGSM@qApJ-nkc+?Ipvgo@_b&yS0v$OQLoeb?C^B8T6t&ZjY!egX3_zF&z%%9h}-)
z2_hR}!?rWJ{+v|HFxrEav0feWTvXSi@@O$GShZ0_vM>#Mk(tvD2oeQ!$=>p=cif)V
zbcA~_3X?#ie6NGG;IV}sVUI2J!KfG{C>x1#8^aYpY}+tcg;%)nuR9KN&{${Zz45+X
zZ9Y4ZBu<Z+O2pzID$2SwCdE1#|8&L$rI`%xW&_emB?X@K^(kz}8xvYAWy`+rm>t@P
zg&RJuu8hk>DT`fSX{*+3oO?Vb;<3z%owp%p90XyKnE7}y4a-5jIp+th9vjnT6|-Qq
zxF|c6x`4IA4y9Fa`mJ_|fbkp4cNb$cIoTebVN>xaquRXUjYN=|g?40$y9rQIX}dIz
z>v!KNT)X3H-r=Z4nyKRPXt<PRRRkx4JWLw9vb<MJ1Zm$ki|yBL4czPYb!l+v_F&Wc
zt!w7;>;tH6%yb&JVh*WjBG?s$<x-UI*s*5rz(QjuNmQ}f&^a;@z-t_gwCRQ{CB4Q%
z9;QVSmRU}xeVkMSPQS)N6!u0W2HR}HxVh_8v|7z9U%Y9}?9A-+Q2(apHETHD$|yzZ
zN*|?VbfVnYPr^9e8nl<fyok!}hZc4<HV^wrdpF7((`h@?F+34$ZpCG7$V3pOYmPK_
zM`@Hh8|N}yUIv?*o1543#WfrA*&uI6oV3z05jZ8b1elo}IseV%YA64~QbaE9_Y?Bk
z=uVFd6%9c<%eBPG3NfFPMoEuNTOLd%g-gx2ePkS)BkPibqAExRHeyOrZ+I*sWL#=v
zvOyT6?1Zr0W{Z|?%Xi{#H*S-3q)k$KR@s<*Gg;+irMfa$j+s`A6Fn~Q_6oB=*=YtW
zFGZ=iD=zoC4q2GH*;Ep3p<^u`FI?sl4&?}ExcbHFUC9Q)a){-q^P!J?dfD+!Gt=v5
zc}a%}W=(nJQ>*Q&={q&+R(Kk{UZX?$TAJwfCW>OcFL0_lCrnp-DhkPsW!8_|O8&L3
zU@7EO>xG@DSq*W*54)P^(qPIKQ5~l<K*~nk>#|;(z05k}z?=-r0n%v(Gu=S5YqL9<
zk3Nsh(T|iuoq;2kY_NW<1qWG5;Am~U{$7|4NOCIy>lU){RhlTH%I;y=Hd?ir1wzRd
zYt;&35&5SG$k2mCZVkdgnGu?C+ltO3rJPQ%&IRm5F!b>HX0R`kuUbi%9@C^;XME@E
zYMPO1(5zAiT60FuLqzxts(_`?#u?T<vN>!KGz3CjH0sqS@@Y~<uDBkPV2<K;Qi#re
zmI;BbTC^3F^Fz~`;N~{sgQGl++1bX_l$O_;VZGKHP;SUaB{hSpkt~&*mCDxcKxa+!
zzbTfCjc$didel{&GgD3DDo$g|N3D54&ama?ILigT<GFHjykE_$I{Nz3%*O3JE3$4G
zOu8gtw`X<J&@^48S?yH?y}xPr162v;bgtIO%>w5yFU3^rV!6{4$J@<Q=M@`G&0rVn
zTSV<a9+xZH(5lfl1SDghC~-g$w<rOSY0tbKX)Nx;aN=M~i9JfF?rcJLRy0jr^tx<a
zeJ+CG=5$9cTQdzZTYMs~E{y8|8|=QdYtBWB6|t6}w<ohga%7kDh5#G!O4H0{RI@r@
zUWr0#Zr}O;Q#Pquur_#PhCWA(Pth^Qy@uPBo&MKZs`|IrfYn!0B15V!WjpdnwoD+L
zwv=P5M-IlP^r!CdD_LdE>RhPYPtF=2>ZZW*1|2d;#;#O!#JQ4ipYt~MSEit!XWf`;
zpCHM6Bvo;G%BIEgv{Bt!NE-uPu<fc>Oq-3{Su*IQ5;t<6nO4fJ?<2$QJF;ob{y|Uo
zOHOy2->GuzTgo9{B%a!5cuhI&%c3eY#ObzzD1T2G5$ZF^Pzza%tQU=@(@A>)F%I~5
zMt#jNZbCMJ+q;C@gN#QZ8#eBn-S$E;?=I`UVt3P}Z^tIt)yg7@6%HK*2}#vnE~-pA
zO!x}~1Pcz4F0|V?@amg~Juu0}vZxx0T>~neIs4Cz`TFKTwO?O0T;;!UzT|FD*n->M
z25<G3i2{D%uMw->Cd?}L2=hvB5LRDxa(S1@m(HvH)T`$o=nzwA+k?y=IP`UQ(}?O`
z+h%xZHiN@)(rHtPu`KTVM08Ja#&N}kyEs+^>#kaF{YkMH^=%0{ZO>0HrcF|&XE^lB
lAzO9&q&ap!q2SX;e*jRJ^Y1Bm{$gU>m1LIdb;O6<{0F^TYqJ0V

diff --git a/lang/English/admin/users.po b/lang/English/admin/users.po
deleted file mode 100644
index 41af5899..00000000
--- a/lang/English/admin/users.po
+++ /dev/null
@@ -1,312 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Non numeric message"
-msgstr "You entered a non-numeric value into a numeric only column."
-
-msgid "Invalid date time message"
-msgstr "You entered an invalid date/time."
-
-msgid "Not verified"
-msgstr "Not verified"
-
-msgid "No users selected"
-msgstr "No users selected."
-
-msgid "No move admins message"
-msgstr "For security reasons, you are not allowed to move multiple administrators to another group. If you want to move these administrators, you can do so on their respective user profiles."
-
-msgid "No delete admins message"
-msgstr "Administrators cannot be deleted. In order to delete administrators, you must first move them to a different user group."
-
-msgid "No ban admins message"
-msgstr "Administrators cannot be banned. In order to ban administrators, you must first move them to a different user group."
-
-msgid "No ban mods message"
-msgstr "Moderators cannot be banned. In order to ban moderators, you must first move them to a different user group."
-
-msgid "Move users"
-msgstr "Change user group"
-
-msgid "Move users subhead"
-msgstr "Select new user group"
-
-msgid "New group label"
-msgstr "New group"
-
-msgid "New group help"
-msgstr "Select the group to which the selected users will be moved. For security reasons, it is not possible to move multiple users to the administrator group."
-
-msgid "Invalid group message"
-msgstr "Invalid group ID."
-
-msgid "Users move redirect"
-msgstr "User group changed."
-
-msgid "Delete users"
-msgstr "Delete users"
-
-msgid "Confirm delete legend"
-msgstr "Important: read before deleting users"
-
-msgid "Confirm delete info"
-msgstr "Please confirm that you want to delete these users."
-
-msgid "Delete posts"
-msgstr "Delete any posts and topics these users have made."
-
-msgid "Delete warning"
-msgstr "Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by these users, the posts can only be deleted manually at a later time."
-
-msgid "Users delete redirect"
-msgstr "Users deleted."
-
-msgid "Ban users"
-msgstr "Ban users"
-
-msgid "Message expiry subhead"
-msgstr "Ban message and expiry"
-
-msgid "Ban message label"
-msgstr "Ban message"
-
-msgid "Ban message help"
-msgstr "A message that will be displayed to the banned users when they visit the board."
-
-msgid "Expire date label"
-msgstr "Expire date"
-
-msgid "Expire date help"
-msgstr "The date when these bans should be automatically removed (format: yyyy-mm-dd). Leave blank to remove manually."
-
-msgid "Ban IP label"
-msgstr "Ban IP addresses"
-
-msgid "Ban IP help"
-msgstr "Also ban the IP addresses of the banned users to make registering a new account more difficult for them."
-
-msgid "Invalid date message"
-msgstr "You entered an invalid expire date."
-
-msgid "Invalid date reasons"
-msgstr "The format should be YYYY-MM-DD and the date must be at least one day in the future."
-
-msgid "Users banned redirect"
-msgstr "Users banned."
-
-msgid "User search head"
-msgstr "User search"
-
-msgid "User search subhead"
-msgstr "Enter search criteria"
-
-msgid "User search info"
-msgstr "Search for users in the database. You can enter one or more terms to search for. Wildcards in the form of asterisks (*) are accepted."
-
-msgid "Username label"
-msgstr "Username"
-
-msgid "E-mail address label"
-msgstr "Email address"
-
-msgid "Title label"
-msgstr "Title"
-
-msgid "Real name label"
-msgstr "Real name"
-
-msgid "Website label"
-msgstr "Website"
-
-msgid "Jabber label"
-msgstr "Jabber"
-
-msgid "ICQ label"
-msgstr "ICQ"
-
-msgid "MSN label"
-msgstr "Microsoft Account"
-
-msgid "AOL label"
-msgstr "AOL IM"
-
-msgid "Yahoo label"
-msgstr "Yahoo Messenger"
-
-msgid "Location label"
-msgstr "Location"
-
-msgid "Signature label"
-msgstr "Signature"
-
-msgid "Admin note label"
-msgstr "Admin note"
-
-msgid "Posts more than label"
-msgstr "Number of posts greater than"
-
-msgid "Posts less than label"
-msgstr "Number of posts less than"
-
-msgid "Last post after label"
-msgstr "Last post is after"
-
-msgid "Date help"
-msgstr "(yyyy-mm-dd hh:mm:ss)"
-
-msgid "Last post before label"
-msgstr "Last post is before"
-
-msgid "Last visit after label"
-msgstr "Last visit is after"
-
-msgid "Last visit before label"
-msgstr "Last visit is before"
-
-msgid "Registered after label"
-msgstr "Registered after"
-
-msgid "Registered before label"
-msgstr "Registered before"
-
-msgid "Order by label"
-msgstr "Order by"
-
-msgid "Order by username"
-msgstr "Username"
-
-msgid "Order by e-mail"
-msgstr "Email"
-
-msgid "Order by posts"
-msgstr "Number of posts"
-
-msgid "Order by last post"
-msgstr "Last post"
-
-msgid "Order by last visit"
-msgstr "Last visit"
-
-msgid "Order by registered"
-msgstr "Registered"
-
-msgid "Ascending"
-msgstr "Ascending"
-
-msgid "Descending"
-msgstr "Descending"
-
-msgid "User group label"
-msgstr "User group"
-
-msgid "All groups"
-msgstr "All groups"
-
-msgid "Unverified users"
-msgstr "Unverified users"
-
-msgid "Submit search"
-msgstr "Submit search"
-
-msgid "IP search head"
-msgstr "IP search"
-
-msgid "IP search subhead"
-msgstr "Enter IP to search for"
-
-msgid "IP address label"
-msgstr "IP address"
-
-msgid "IP address help"
-msgstr "The IP address to search for in the post database."
-
-msgid "Find IP address"
-msgstr "Find IP address"
-
-msgid "Results head"
-msgstr "Search Results"
-
-msgid "Results username head"
-msgstr "Username"
-
-msgid "Results e-mail head"
-msgstr "Email"
-
-msgid "Results title head"
-msgstr "Title/Status"
-
-msgid "Results posts head"
-msgstr "Posts"
-
-msgid "Results admin note head"
-msgstr "Admin note"
-
-msgid "Results actions head"
-msgstr "Actions"
-
-msgid "Results IP address head"
-msgstr "IP address"
-
-msgid "Results last used head"
-msgstr "Last used"
-
-msgid "Results times found head"
-msgstr "Times found"
-
-msgid "Results action head"
-msgstr "Action"
-
-msgid "Results find more link"
-msgstr "Find more users for this ip"
-
-msgid "Results no posts found"
-msgstr "There are currently no posts by that user in the forum."
-
-msgid "Select"
-msgstr "Select"
-
-msgid "Select all"
-msgstr "Select all"
-
-msgid "Unselect all"
-msgstr "Unselect all"
-
-msgid "Ban"
-msgstr "Ban"
-
-msgid "Delete"
-msgstr "Delete"
-
-msgid "Change group"
-msgstr "Change group"
-
-msgid "Bad IP message"
-msgstr "The supplied IP address is not correctly formatted."
-
-msgid "Results view IP link"
-msgstr "View IP stats"
-
-msgid "Results show posts link"
-msgstr "Show posts"
-
-msgid "Results guest"
-msgstr "Guest"
-
-msgid "Results no IP found"
-msgstr "The supplied IP address could not be found in the database."
-
-msgid "No match"
-msgstr "No match"
diff --git a/lang/English/antispam.mo b/lang/English/antispam.mo
deleted file mode 100644
index 2d884422712f3935e89b7acbab004e1cdb67f9c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 751
zcmYk4!EVz)5QYsDAsGn}7cLxzN=R^6mmm(2n*?auK&4bfB_KF(SjUrO!QM5qYf9b#
z?r`JABk%w`1~;CC-*MBj^5@yvotfX>*}pfpzDF3B!ELY)u7CnG;|qwvS8xq{1J}V%
za25OllM7Mw8+HtCT#TXt>^s;L_6O`O*gvoci!K37*LpDPvDLhfUFHHAJ9nqkk2U*X
zoIP~|Jeq4$Y<v?6jwVGdx=<r0rBBILYuEQ5?ovDL-?Mb5Po4X_@kHEvo&|N7tJf?Z
zl~WqA4ojB3y?F9ss)hm=>uO&IP6=!3m_L~&bh9+pKB%c^>kA#6AZV=ZqSgymQ`Y5w
z6{)B5(%2{SRwBz1CyPORba-@duHQ)>#6xETTU1?D5Dok}>{Nv|c9&*LEuKUF)pVq~
z=W&htoJAejnahn`q}0t!IQx*4*v4<vGqx=4H%=VqCQv8oCXcYwy6UB?WyZr+Bc)a(
z8ZLSE0Y%BoDJ+dAJi_Z<a8B8ZG+bR!g(Gy9w9Uz)ZyM7&xDp4KQzdR8x=hd=)}E2z
zD~G@n6PC#DWdmE68B1>`8&Gi2VcK*%ZMN_FW-EH@Y83V-EGTO5w<2g@vD)NpKd(y&
aJE8UE**+_hL{Eijh4kenLYnLKIQj?9tlQE6

diff --git a/lang/English/antispam.php b/lang/English/antispam.php
deleted file mode 100644
index 67a827fb..00000000
--- a/lang/English/antispam.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-// Language definitions used in register.php and post.php
-// Based on work by Otomatic
-
-$lang_antispam = array(
-  'Robot title'      => 'Are you human or robot?',
-  'Robot question'   => 'Please respond with a <b>number</b> to the question: <b>%s</b>',
-  'Robot info'       => 'Checking if this is requested by a real person and not an automated program.',
-  'Robot test fail'  => 'You answered incorrectly to the "Human or Robot" question.',
-);
-
-$lang_antispam_questions = array(
-  'What is two plus two?'     => '4',
-  'What is four minus one?'   => '3',
-  'What is three plus two?'   => '5',
-  'What is two times four?'   => '8',
-  'What is five minus two?'   => '3',
-  'What is six plus three?'   => '9',
-  'What is seven minus one?'  => '6',
-  'What is eight times two?'  => '16',
-  'What is six times two?'    => '12',
-  'What is nine minus seven?' => '2'
-);
diff --git a/lang/English/antispam.po b/lang/English/antispam.po
deleted file mode 100644
index 75fa1d31..00000000
--- a/lang/English/antispam.po
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Robot title"
-msgstr "Are you human or robot?"
-
-msgid "Robot question"
-msgstr "Please respond with a <b>number</b> to the question: <b>%s</b>"
-
-msgid "Robot info"
-msgstr "Checking if this is requested by a real person and not an automated program."
-
-msgid "Robot test fail"
-msgstr "You answered incorrectly to the \"Human or Robot\" question."
diff --git a/lang/English/antispam_questions.mo b/lang/English/antispam_questions.mo
deleted file mode 100644
index f3ff0a71bb65c8f0a8a5a078d57338b2408dd0e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 765
zcmZ{f&uUXa6vn5u{=06h;6LbM*1|+@ZOUy#3bsWGEd~iH?#ARKnUc(enUh!_!et+!
zZ{Z`jbnU88C?X<-BHj4i^rR_L=iV>B`+alf%*ppVb9)Nw7PJ5{G!K1+%5{52sR!UZ
zcprQud;va$e=qwi`DgGR@_q4Nz`O9@#2<kN@UycJc!(cF>PYxQ_*3{x_#4Elj>Vq{
z{|HZo*HANAH{_%IZ&#rVx-QvG@QQqwn1j$lskdFr+9ge{(`C)BPf7E~uzJ4Hb|cb#
z=ZF91VHhP3o~HHQ`AL1E5&7xP*j{!dxm`Wzl^1j)U1(M2mrOLSk^>hf#n}Hz&ziI`
z@v5rFutQBYn=SK(VsgRPbXI@WFl&)4!<u!=G|tRx8o9D!5^dSUrV*`AJ<B1YXv_M}
z(00f)$oAp4H@7#Yee=qbY%O>uk7J((=*qOqj|V;L{4?F`+L(x+yA(`OR98$sEiUh9
zQ#2dC8CuSFYP$H~`24z>CZD}CFUeCpo1`A7<yhyHqOz2!d|5rkv#6HUipm#NRV}GP
F{RM6Rwd?=@

diff --git a/lang/English/antispam_questions.po b/lang/English/antispam_questions.po
deleted file mode 100644
index 384893e1..00000000
--- a/lang/English/antispam_questions.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-
-msgid "What is two plus two?"
-msgstr "4"
-
-msgid "What is four minus one?"
-msgstr "3"
-
-msgid "What is three plus two?"
-msgstr "5"
-
-msgid "What is two times four?"
-msgstr "8"
-
-msgid "What is five minus two?"
-msgstr "3"
-
-msgid "What is six plus three?"
-msgstr "9"
-
-msgid "What is seven minus one?"
-msgstr "6"
-
-msgid "What is eight times two?"
-msgstr "16"
-
-msgid "What is six times two?"
-msgstr "12"
-
-msgid "What is nine minus seven?"
-msgstr "2"
diff --git a/lang/English/bbeditor.mo b/lang/English/bbeditor.mo
deleted file mode 100644
index a176f079a551314464013f06d3593a9f9617a8a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1082
zcmYk4J!}&(6vq!*zQRWVAu+&U2BadmKr4poN)T#jQBW#ENf4`(dr3_%cJTQsDmE5i
zU_gQi76c;;3p0!i42Y=<3#_b&k^i$V1WUf3-+T6Z&;H-{qth=Uj3byQG2dby$2_+K
zAB@M~9`Fgc4}4bIFTuUA-<1A$U<LMvGXAOL=aOH`_%_JrewO?N9)SHD+z(Fe44eVE
z-U+aU*lBPY_U2R+?FJu!Y(E5dfsac6Q;_?8UdCU6Gq7KShrstB*ZT<axi2NZfn0AJ
zJO=&%=fOW9pF4|UXv3f3w}RW};TR9@g$KXEVZWMu_`ZBM?gQ8Gb%5v~CilwsiMmcN
znJi`2NjtKBWl{>vjCVAg%v6tE*Nfb#{uVEr)OVgrZv^JvZmFIttWR*WFwQU5)L`8Q
zJ31wsDNWJHn&HSbhH@}ohuy*7v02p03M;dC#n@q<2tD#<UYlPOVOg8i;#5t{oms53
zthq})7dO)QHrZSmoro2ZZk_DXQl)jH9oH>P_~Wb6Q6k`r*JxAm*0HN8a~HR*)OjYI
zvDnm<dQhOjxJ`2SUq*3BrbDH#^h1emw`%O*a%Hu#x;&{rSG`cF8@#DT)~ykWI=b)9
zk20zBqUfzlo0F?`+AHzGWFJ@WlZ}^k&!kEZ60y)#?q4H`AYHi=Un5O6^w=_#DktWu
z3)PE=1T(&63frT4sF8?JB=Sm^GS^w-x?zD!b;r_rT^l+l>qKX*DVnTrM;i;}D1`}`
z%WzOH=oTcN=)25+lYj!k@8VPmBqf;>E-{W3D5K?&#6A91QZZ|+z@AMK-Aw9@Gf6bb
H<1_pPbWa9S

diff --git a/lang/English/bbeditor.po b/lang/English/bbeditor.po
deleted file mode 100644
index 3deedec3..00000000
--- a/lang/English/bbeditor.po
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "btnBold"
-msgstr "Bold"
-
-msgid "btnItalic"
-msgstr "Italic"
-
-msgid "btnUnderline"
-msgstr "Underline"
-
-msgid "btnColor"
-msgstr "Color"
-
-msgid "btnLeft"
-msgstr "Left"
-
-msgid "btnRight"
-msgstr "Right"
-
-msgid "btnJustify"
-msgstr "Justify"
-
-msgid "btnCenter"
-msgstr "Center"
-
-msgid "btnLink"
-msgstr "Insert URL Link"
-
-msgid "btnPicture"
-msgstr "Insert Image"
-
-msgid "btnList"
-msgstr "Unordered List"
-
-msgid "btnQuote"
-msgstr "Quote"
-
-msgid "btnCode"
-msgstr "Code"
-
-msgid "promptImage"
-msgstr "Enter the Image URL:"
-
-msgid "promptUrl"
-msgstr "Enter the URL:"
-
-msgid "promptQuote"
-msgstr "Please enter the username quoted (or leave blank):"
diff --git a/lang/English/common.mo b/lang/English/common.mo
deleted file mode 100644
index fc08237e6da5b22b1f2d17b687732e820380b425..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9404
zcmcJUdypK*UB}yz@~{ZDF;46}-I8_DU7}lA@&j>}?CA8eY&|Y_Cp)%dl-b?hyODNh
z)-$uZJKMx@9!L-ygTW36Cq)G#!0?9+1;HdmVg)J`sS1>1C|3niR2dAFa!4s8#l!r;
z=iAe>w=2omq>8Qk&1br&AHV+1ue*Oe_pOUpK4SQtK;DVGw9=Swz%QQ9h2NWg)ENHE
z`CMKPFAeE;!4;(62j2`gz)Rs4cp;n(Y{EB?F5p|?J@Cij!|)yOB>XXW3ab8d;rUBY
z<;?{pFNJR*Sqt0&FCl$9RJ|0c{4sbj{4A6nPlfa|Q2jgySHTxU{%QDj(km&f@m~&A
zZwnXow-;)Bb@(GN4ZH`UqB$1$NZ@ZkjrS?2dVdV*!u&Z@{pSMz0m_~)1%3~{j`V-P
zH^P@g{)&rAeb0x|=Mt!T?}fZ7b0w4>*Fe?V4)yA8h8pKVC_O$5Rj&i3UmkcjlwSA4
z%ix2MKXZ}`DwxkhmH#SKJ70(D=bKRDdLi(8;rV$OS^ZxC)&FHs{az9B#~?+`RZ#VJ
zK=nTZHJ(FI^_x)RN}&3?H>5uS)$YR~|1(haeiN#nC*YgllThWJhHB@}!t-ZC{_{}f
zUVv)<B`EuTAM$5b;Y3Qm6RO=!P<n2L(r*WpzwL*zlY=VXgBsVTpvs*H>Bph!{{d9L
zUxL!_FQEGWM#%prRDb^nW%qAGl{*djGyly+?O(_wQu^IcdTfMh|3;|s&IZ;4yMZ4G
zd?4@yRR6yX)!&m)?R-Aue<kF94N9+Pp~m}sNdHUVze4HteW>@lg2^d6UIL}hd!X!b
zHPra8hy0n{A^$^A>q!f09vp_!s{=L89#s3sq5A)H$p0;<dVc~{?@yu1Jp)z$uc7pQ
z9!{NS%(tM%xdEf8+_g~p?SyJ)2FlNGg<4mdQ2pH-_yAP9k3pI;k3+3vPs6vtzky@$
zyYSucZ8WkGZiZLE!*DhHEW8qa8D0ZV!>w=~lW-k$Q0WKZ2>cq{08c~JTTN$5Ps7dd
zV^HmX0p0+=8}c`>xXJGGP|q`X19mtGw~&4j<u8X<u=u?TZihF)2>vAeJt%v<2xXV=
zz<KyzP=3;&lHPL)W#{_?k3r4L2chisaL7Lq`0G&f<zz^I5vu$tDEoaCs@`cR{r?l{
zeXYQ#(&J*N{w{~oZv?8`dMLfFg{WvIA*MBl0vDjlKLq7hk3#kHJ5cRE75HVSe*Oxo
z-M@pHhc80)dphL*JCxs?hY|JOUJo^{aj5ZZhmXM<q2AX&LA}4X*mB<Pf@=3pC_Ux_
zyHI*ALd}=^p!7KomH!Bo9*;r!@8_V(Jqgv$)9@Df415q?hSTkbC!y;70IK}UQ2MM~
zQ|faK#MEXll>H7v+2t72cpeSuUxTvq6Hx8^5!5)o1l9jvhV-*g{rx?Z-Y<mwZ$nIH
zegHK;F1e!g!(CAQwxIg^I8?pkfe!^f8u*#O#{+*CN}t~k=`TR(c?wFeuZR4<g<dbX
zg8Uak`kw>816BUtpyv6@P~*F3ZE5d!K>5WORDV}N*=<Y6za6e1-Gr}$^HBAV!1LhI
z@O&{mzc=LH7xM29`JaTmB6A$7{u5C4_(Q06egRoP?m|9<Smb^rMx@sgGLNtvnD-((
zk)z0AWC!xIh(mr6`7okiihLT;{J#y+Ph;5Y@5;+oFg}ph?XMv6CH?jwvb*NO4am<U
z`rTK;uNk^M9@59)&mfws*N41^VGX$lk*~0|_}?#c9YNlMtV385{n`f1c3t@4R%VyK
zGv)w{kPjfggvgF7k=4i)@&NJ(QvL4W=21lJ!=WlO@F(CbBA?ao-V$asum?9G^^nGG
z%+<(TNDDK_$B-s+5i*JFMjD8IEkwTARwDe~2X8{wBkxD9L$)EBD`)=3$T%PAAfE^i
z-xw&o0l69JB0q=dCm+{OK76geEB!p&nvYgD@Cd@T;eWr%burwpfcwJz#{&heJ10W=
z8hAJIX5_6QuY%U81YwCZKaE_7WXPRJj(ifi0NIR8AX-oLyB&E5DUh|ut;pMv8xj4c
zkz0^YDZ%d`@)6{N$QI<M5VNgO#7CVi(r(<y&9-JIPReVX7g<!Knc3EEn{7#w_L7F{
zxTG-KinL>+!FsmkT(it?rCF~tkoFCi>B-6MY15g>Ntb1IPjWPB$4z^1daq5Q&Y9Vb
zv`yE;MO`O~+cs)8GneP#Sv_jnc^5TZHk4BoT}!EMn&ef>D%o*GWSdbDRkiC4G_p}q
zWO2P$R7D#R!!2w#%?s&QwHybP8);I=4yATgZsPJHPUg<Y?MB&h(N3J_6gjKEP}QbK
zUDj%+3!#l9wXL}AY#!fTX_lmkjXTj?l}@wne3aNmJME7%WTjn~gm$`(tSX<oc58fC
z(_Z2hyRK2V=2?36lFT*IxrF|QA9nINTaV}ZswnN%%55{wqk0=}n8e<hYw@lfFVZLO
z>R}`96JA7~`%x_4+f9Q{>{UaltCdRBY8qut+e*`dR=2m~#t}Mc#^_m)#0sS+n;ov+
zo3n*fF+1fqW|th(>`wW!^{8>g?DpF1ku_~QPL7y8oo<>HQBv4A!Hqjn5vPgSlQi8T
z*H+4<^jYtS=B8e!OK)axgqz4$%Dba+9&?+{&0(}Su~DuBvx;llE6hHWL3bc8ikMV`
z_qHR4B;VU`Uz8oOQ5&bv8D`X^BpKxtE7Pu1S7WY|W=po`ZMrYmb{{P<gI!tP^pk!@
z_LEIpU#b$!xPACwFyVfOJDUA&!4EE9z6%p>AVc=@$;`=wD!W*i{i$uF>5<s!uIn=I
z{#caM(bz4(!nP|rnFBa%==nfbme0+UTtpY$=J`UJHO-WZj)Z|uVRLL8mM*0zmo7LQ
zLW7#h+|fAgk(Z^KM`o(W<VhOs9u_WL2BQt-;;h(UupHxXNiIM5K+jRyUu_ZNz~#Me
z&GgL7xfVoaH(lPyVm}~XY#<#*t5O52rjnSkz2u7zET7ZC&$Y-*yE)cpUQczy)R?AH
zj9Sy~t{xMDj9#1MjEl0yJV=_hbljQwbYWOs<Fk_ftM*B`^s;$<Ru6y8O9Kb1&#*Sw
zUJ@5}(k$Qaj0aP@hf+5WrS=V_riN0pN_ApCsF`lmV7N1dW_;<vGrjs@O?%j3#?8hB
z@7P~$?pSyI<~5r(qa`z|-L1UxO!mMqvuP2vEo%}p$G^pcXN~S)!kXUi@L=vTRthG%
z?);{8YZf!X!fIyQZVoG(+gRmXrhX$*cw*eqQZ#4UQ8IU^=^8AR?L*y^1t4Vk^-E6X
zOT<mKjJOpuUY{=J@nV|F4>2y2wpxagS$NBA5w6`dy{zrKSjboz%~ZRWMeT8xyiPu0
zldezZTQ^;2%iFD^iCw+bZXCOA6_Z0&9N*I%zlBW{B_`}H7Zvj^o19!VbzpXUJ1dRm
z<M<91lL<@S_%t(1MXM|=f#b6o&e4|DDYTcN_L#Zjvo7ikv}m_P3NhZ_D!ZuHYiTxj
z{i=O?_U&Bme`D>+Rolx=c6@fJOQ!|%a6`Avnt7dV%tu-7imeA{ca3jeE~nnvZN_&d
z?CH#r3A?!-7kx!0SX5ViaD2B*v?xl)sgwy-*p0Q#wX1njCdX&eUe<8i%RVM-*-40!
z1_L9#EgvoYf5k}?{q3d-ktXa&-p}*_((;Zy^lT_l@=tJWHWVg~-$uA}aFcS&w(|;>
zLJU=7pKaP3XJ@A<Q-)9B(S%(ylCLp?4G}c4MTAxqRoPZXWEdL9BYoG~s^H3Yq9wck
zz$}|WQt&3NLKK^3W%Od}Wh}-#$<1wP&qkTEio)3bSktx4mjRi!>OnL3SZuu=9m&V&
z+An>%&53B3K@Hy*v#DlAM>ejd!~#31`lZ2zxR^(a(UDC&SZ_(>mcM~M`?W$qSa+e)
zM5tA>1jp%uw{02eX%aH!My^_$_iNK=Kk}<o9Ehj-<)~__P_XH`#XRk7TFa`v*dV;l
zOH25^+A%Ah@1<EAcqL88y2I>p)jQ~ik2Q7$|H`#aG*ed&b3Wqr4NtT+K8#yaGY1AD
zOAU%4Z;*)x1``*hE%mrx!N1h9{5gvIK(#FIUs#A$)M}BYL<2;}c!cg7X{XzEi#0pd
zb`f!1K2K!f5?Sk<?-6YXZeQU&9y~{oE04w}*3|4M5lR0H(04fY<mxqJ<8wvARSWAY
zzbV7R!HSdpD7g$Y36ELEmb{lWdc?*_(O#<JJ%x+j4gCp&2&$Tlho*P#+Bv;*x@I*q
zv;p&meQ53Hg|E|99P1|_F*O@?k8LCKk$di!w3^-1qIGAxS;|__QAC!rc;)N~-oTyc
z2v+XVb}=6ncHN|`&f2q1qidw-+K{d+z0%XKeH%igX4##}T1#Q(`Y2du9raj7H+4oG
z9gXMMOq8FN73iR5_oehY5Og!TIpX}Peszps>38hL%tp&pY;hv>5w^P6)$T1$PU6~)
zp3bO#!zvdutqE+%H9Jc&Egn`nw$iYyFg9Ysa&&S%LUfig$GoZ*p}IeLl&1BT_QR<e
zwZ}82XP5n(=~?)}D$Yt<{;A*Us{KKYE4cT&PdWC`vh-=YR$0ANOd}6b#RR*#e?Mi&
zim8{-SnC|YUTMb4!o&SV{;2f|hbFdnEZ*|AXr|sB7j*LBwJb#Jit0tPk%(s$#mkbJ
zt!L?iqM-f~f}5o}C^cB7m-M0+bUtH5W9K-I4ZPu@Lz(4BcE+*HFGH_>BGWq<+U@*+
zZ~%V@@bA{o$=d&VTJ!tVE1%d#a{F2iZS)q-ZL7<3nhtJdm^^%bTXv%5{Ikz-D8=f;
z(XKox_m6Mh`>GRLbylmM{+~{BGP$3I_)na1h^-C)n%`bYuf6wlyv1+G91(`jcz%*}
zyTsIL%5NzBBOQxLqk;OZ9=@^Oa_Z2D(nc&MIu%m7+=l9oIDloPztor094E?@t>uE*
zrMcd+QI|tbL!03GVC~RaF6S$?UT}4e;I5p(!MVL=%V$t28+ql*Dq1{Wt-Q{xly<C&
z{vEKv`_W?>#SHynvlX8ED68<zpJtiT)p2%I=h^aAk8ya_iOXZ~B<t&)d6-=e#8}T|
zWe&v{w>sbAvwklq9J{DK0*vG}yThL|^re7Ld%TLA^ABD-5b+EI6R*8lCZQG+HKbQQ
zUw*a1hZ0AKg;HFI;DaLllQ+esuYWqEd%wgFrH#T=uK_+2UQGxg!x4U#6T2PF$4od2
z5DKD&CL7+y&fCn_EAGnu(NJrwTXYRR4sxJA_c5RGv$8XP*dbYZ`g6XJ(fvj+_*BPg
z?K%G8nP-2FIzQ~Of3!OHkG<l-e^;z++JEWwfo!F)SE**sdR(ms7zV#`T3a~)>vNai
z-iK@Ou$=$>?*_xq6>iHz^lbyH)(kE>sf#`q0DUC@`aA&iT>$8V02ufZFk!y(xl<oK
zb@J6e1=tOiGyWOJ|9s-CbH88xnNH!$22S^y4*lL3VUPB!Q(k_DIP3I(2gm<AeF)8e
qb=pN{_%OS^I>s|=B1}?#u_@2;<(%LFt4yb6?jU3j)&1dq!u$_5vOzQe

diff --git a/lang/English/common.po b/lang/English/common.po
deleted file mode 100644
index 8d5a40cd..00000000
--- a/lang/English/common.po
+++ /dev/null
@@ -1,473 +0,0 @@
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "lang_direction"
-msgstr "ltr"
-
-msgid "lang_identifier"
-msgstr "en"
-
-msgid "lang_decimal_point"
-msgstr "."
-
-msgid "lang_thousands_sep"
-msgstr ","
-
-msgid "Bad request"
-msgstr "Bad request. The link you followed is incorrect or outdated."
-
-msgid "No view"
-msgstr "You do not have permission to view these forums."
-
-msgid "No permission"
-msgstr "You do not have permission to access this page."
-
-msgid "Bad referrer"
-msgstr "Bad HTTP_REFERER. You were referred to this page from an unauthorized source. If the problem persists please make sure that 'Base URL' is correctly set in Admin/Options and that you are visiting the forum by navigating to that URL. More information regarding the referrer check can be found in the FluxBB documentation."
-
-msgid "No cookie"
-msgstr "You appear to have logged in successfully, however a cookie has not been set. Please check your settings and if applicable, enable cookies for this website."
-
-msgid "Pun include extension"
-msgstr "Unable to process user include %s from template %s. \"%s\" files are not allowed"
-
-msgid "Pun include directory"
-msgstr "Unable to process user include %s from template %s. Directory traversal is not allowed"
-
-msgid "Pun include error"
-msgstr "Unable to process user include %s from template %s. There is no such file in neither the template directory nor in the user include directory"
-
-msgid "Announcement"
-msgstr "Announcement"
-
-msgid "Options"
-msgstr "Options"
-
-msgid "Submit"
-msgstr "Submit"
-
-msgid "Ban message"
-msgstr "You are banned from this forum."
-
-msgid "Ban message 2"
-msgstr "The ban expires at the end of"
-
-msgid "Ban message 3"
-msgstr "The administrator or moderator that banned you left the following message:"
-
-msgid "Ban message 4"
-msgstr "Please direct any inquiries to the forum administrator at"
-
-msgid "Never"
-msgstr "Never"
-
-msgid "Today"
-msgstr "Today"
-
-msgid "Yesterday"
-msgstr "Yesterday"
-
-msgid "Info"
-msgstr "Info"
-
-msgid "Go back"
-msgstr "Go back"
-
-msgid "Maintenance"
-msgstr "Maintenance"
-
-msgid "Redirecting"
-msgstr "Redirecting"
-
-msgid "Click redirect"
-msgstr "Click here if you do not want to wait any longer (or if your browser does not automatically forward you)"
-
-msgid "on"
-msgstr "on"
-
-msgid "off"
-msgstr "off"
-
-msgid "Invalid email"
-msgstr "The email address you entered is invalid."
-
-msgid "Required"
-msgstr "(Required)"
-
-msgid "required field"
-msgstr "is a required field in this form."
-
-msgid "Last post"
-msgstr "Last post"
-
-msgid "by"
-msgstr "by"
-
-msgid "New posts"
-msgstr "New posts"
-
-msgid "New posts info"
-msgstr "Go to the first new post in this topic."
-
-msgid "Username"
-msgstr "Username"
-
-msgid "Password"
-msgstr "Password"
-
-msgid "Email"
-msgstr "Email"
-
-msgid "Send email"
-msgstr "Send email"
-
-msgid "Moderated by"
-msgstr "Moderated by"
-
-msgid "Registered"
-msgstr "Registered"
-
-msgid "Subject"
-msgstr "Subject"
-
-msgid "Message"
-msgstr "Message"
-
-msgid "Topic"
-msgstr "Topic"
-
-msgid "Forum"
-msgstr "Forum"
-
-msgid "Posts"
-msgstr "Posts"
-
-msgid "Replies"
-msgstr "Replies"
-
-msgid "Pages"
-msgstr "Pages:"
-
-msgid "Page"
-msgstr "Page %s"
-
-msgid "BBCode"
-msgstr "BBCode:"
-
-msgid "url tag"
-msgstr "[url] tag:"
-
-msgid "img tag"
-msgstr "[img] tag:"
-
-msgid "Smilies"
-msgstr "Smilies:"
-
-msgid "and"
-msgstr "and"
-
-msgid "Image link"
-msgstr "image"
-
-msgid "wrote"
-msgstr "wrote:"
-
-msgid "Mailer"
-msgstr "%s Mailer"
-
-msgid "Important information"
-msgstr "Important information"
-
-msgid "Write message legend"
-msgstr "Write your message and submit"
-
-msgid "Previous"
-msgstr "Previous"
-
-msgid "Next"
-msgstr "Next"
-
-msgid "Spacer"
-msgstr "…"
-
-msgid "Title"
-msgstr "Title"
-
-msgid "Member"
-msgstr "Member"
-
-msgid "Moderator"
-msgstr "Moderator"
-
-msgid "Administrator"
-msgstr "Administrator"
-
-msgid "Banned"
-msgstr "Banned"
-
-msgid "Guest"
-msgstr "Guest"
-
-msgid "BBerr pcre"
-msgstr "(%s) Message is too long or too complex. Please shorten."
-
-msgid "BBerr unexpected attribute"
-msgstr "Unexpected attribute: \"%1$s\". (No attribute allowed for (%2$s)."
-
-msgid "BBerr unrecognized attribute"
-msgstr "Unrecognized attribute: \"%1$s\", is not valid for (%2$s)."
-
-msgid "BBerr bbcode attribute"
-msgstr "Attribute may NOT contain open or close bbcode tags"
-
-msgid "BBerr missing attribute"
-msgstr "(%1$s) is missing a required attribute."
-
-msgid "BBerr nesting overflow"
-msgstr "(%1$s) tag nesting depth: %2$d exceeds allowable limit: %3$d."
-
-msgid "BBerr self-nesting"
-msgstr "(%s) was opened within itself, this is not allowed."
-
-msgid "BBerr invalid nesting"
-msgstr "(%1$s) was opened within (%2$s), this is not allowed."
-
-msgid "BBerr invalid parent"
-msgstr "(%1$s) cannot be within: (%2$s). Allowable parent tags: %3$s."
-
-msgid "BBerr Invalid URL name"
-msgstr "Invalid URL name: %s"
-
-msgid "BBerr cannot post URLs"
-msgstr "You are not allowed to post links"
-
-msgid "BBerr Invalid email address"
-msgstr "Invalid email address: %s"
-
-msgid "BBerr Invalid color"
-msgstr "Invalid color attribute: %s"
-
-msgid "BBerr invalid content"
-msgstr "Invalid content, (%s) requires specific content."
-
-msgid "BBerr bad meta data"
-msgstr "Unable to retrieve image data from remote url: %s"
-
-msgid "BBerr no file size"
-msgstr "Unable to determine remote file size."
-
-msgid "BBerr non image"
-msgstr "Remote url does not have Content-Type: \"image\"."
-
-msgid "BBerr bad http response"
-msgstr "Bad HTTP response header: \"%s\""
-
-msgid "BBerr bad headers"
-msgstr "Unable to read remote image http headers."
-
-msgid "BBerr orphan close"
-msgstr "Orphan close tag: (/%s) is missing its open tag."
-
-msgid "BBerr orphan open"
-msgstr "Orphan open tag: (%s) is missing its close tag."
-
-msgid "BBmsg big image"
-msgstr "Big image"
-
-msgid "BBmsg images disabled"
-msgstr "Image display not currently enabled in this context"
-
-msgid "Index"
-msgstr "Index"
-
-msgid "User list"
-msgstr "User list"
-
-msgid "Rules"
-msgstr "Rules"
-
-msgid "Search"
-msgstr "Search"
-
-msgid "Register"
-msgstr "Register"
-
-msgid "Login"
-msgstr "Login"
-
-msgid "Not logged in"
-msgstr "You are not logged in."
-
-msgid "Profile"
-msgstr "Profile"
-
-msgid "Logout"
-msgstr "Logout"
-
-msgid "Logged in as"
-msgstr "Logged in as"
-
-msgid "Admin"
-msgstr "Administration"
-
-msgid "Last visit"
-msgstr "Last visit: %s"
-
-msgid "Topic searches"
-msgstr "Topics:"
-
-msgid "New posts header"
-msgstr "New"
-
-msgid "Active topics"
-msgstr "Active"
-
-msgid "Unanswered topics"
-msgstr "Unanswered"
-
-msgid "Posted topics"
-msgstr "Posted"
-
-msgid "Show new posts"
-msgstr "Find topics with new posts since your last visit."
-
-msgid "Show active topics"
-msgstr "Find topics with recent posts."
-
-msgid "Show unanswered topics"
-msgstr "Find topics with no replies."
-
-msgid "Show posted topics"
-msgstr "Find topics you have posted to."
-
-msgid "Mark all as read"
-msgstr "Mark all topics as read"
-
-msgid "Mark forum read"
-msgstr "Mark this forum as read"
-
-msgid "Title separator"
-msgstr " / "
-
-msgid "Board footer"
-msgstr "Board footer"
-
-msgid "Jump to"
-msgstr "Jump to"
-
-msgid "Go"
-msgstr " Go "
-
-msgid "Moderate topic"
-msgstr "Moderate topic"
-
-msgid "All"
-msgstr "All"
-
-msgid "Move topic"
-msgstr "Move topic"
-
-msgid "Open topic"
-msgstr "Open topic"
-
-msgid "Close topic"
-msgstr "Close topic"
-
-msgid "Unstick topic"
-msgstr "Unstick topic"
-
-msgid "Stick topic"
-msgstr "Stick topic"
-
-msgid "Moderate forum"
-msgstr "Moderate forum"
-
-msgid "Powered by"
-msgstr "Powered by %s"
-
-msgid "Debug table"
-msgstr "Debug information"
-
-msgid "Querytime"
-msgstr "Generated in %1$s seconds, %2$s queries executed"
-
-msgid "Memory usage"
-msgstr "Memory usage: %1$s"
-
-msgid "Peak usage"
-msgstr "(Peak: %1$s)"
-
-msgid "Query times"
-msgstr "Time (s)"
-
-msgid "Query"
-msgstr "Query"
-
-msgid "Total query time"
-msgstr "Total query time: %s"
-
-msgid "RSS description"
-msgstr "The most recent topics at %s."
-
-msgid "RSS description topic"
-msgstr "The most recent posts in %s."
-
-msgid "RSS reply"
-msgstr "Re: "
-
-msgid "RSS active topics feed"
-msgstr "RSS active topics feed"
-
-msgid "Atom active topics feed"
-msgstr "Atom active topics feed"
-
-msgid "RSS forum feed"
-msgstr "RSS forum feed"
-
-msgid "Atom forum feed"
-msgstr "Atom forum feed"
-
-msgid "RSS topic feed"
-msgstr "RSS topic feed"
-
-msgid "Atom topic feed"
-msgstr "Atom topic feed"
-
-msgid "New reports"
-msgstr "There are new reports"
-
-msgid "Maintenance mode enabled"
-msgstr "Maintenance mode is enabled!"
-
-msgid "Size unit B"
-msgstr "%s B"
-
-msgid "Size unit KiB"
-msgstr "%s KiB"
-
-msgid "Size unit MiB"
-msgstr "%s MiB"
-
-msgid "Size unit GiB"
-msgstr "%s GiB"
-
-msgid "Size unit TiB"
-msgstr "%s TiB"
-
-msgid "Size unit PiB"
-msgstr "%s PiB"
-
-msgid "Size unit EiB"
-msgstr "%s EiB"
diff --git a/lang/English/delete.mo b/lang/English/delete.mo
deleted file mode 100644
index 6597bd8e9691f8fca8dfc14430312b9b6eff0bb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1003
zcmZuv&2AGh5H=A0f~ZPQ2yvJqAr*laf_exEL8xg{Rcb|4wos5bIGaggw6RxSry&o*
zYjES%XW<#(#*xq2O~Rj*Z@-!GWPUvJZKLv8;8cOTKnmOh&Vg{g16P0_zzyJM$(0L2
z+=9Fgz6QQm@<Z?j^lfm6vk$%sJ^^=u4?u|b<)RR$;IH5ickNQ)e+Rq{eG7aW{0zJX
zJ_f%BD{urp2P4${AcTM_E*I*&mmr3^LhcH19SC{FE~o6dB+_PJ7jkBEFS__ppHp(&
z*Nzh}jyX$b)SHReW;$63e>fF)Q{{{{L-DrcZaQ%)l^yHGd4o(gSM%1>CKY09%g|<v
zY7d&#uCpJJO&;{+8+N(2ra>K6e#CBPr`mlL%eI3GyWCZt8w8s?<})2!7p6m%dl@@r
z@>F^2;B=_WaH57RV^-teBGPl!A8Ye+P^9SfBI|}Psz(P$d#n7l=t;G0jc0?XvkXZ+
zfAWvBRB6+sWTafqzI76JWPRlqvJcqFJ(Jiz9-~3^p7zT^8pNi0D)-s2D{AaoytJoU
zRFAfCQ>gN_ow$VCMUDm)NfyJ4M@(T_G_w;LsWV0~HfKZLhS_1hq;o=XWG9|_oZ2Z3
zted;T#o^g_3Oj5F<ZQwy!3?ASZUUn9qvaOR{hTB|<u>GAIox9_{<<j2z#q$9*ra%b
zn()I&X`mgdpSPe<H7q_X*Q2>O9oe)r&{U@>3Z;zQSQ!igtGEpP4&5tspn9QAH1@9-
K0wQHd6p3HzG7?h&

diff --git a/lang/English/delete.po b/lang/English/delete.po
deleted file mode 100644
index 208f9bdc..00000000
--- a/lang/English/delete.po
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Delete post"
-msgstr "Delete post"
-
-msgid "Warning"
-msgstr "You are about to permanently delete this post."
-
-msgid "Topic warning"
-msgstr "Warning! This is the first post in the topic, the whole topic will be permanently deleted."
-
-msgid "Delete info"
-msgstr "The post you have chosen to delete is set out below for you to review before proceeding."
-
-msgid "Reply by"
-msgstr "Reply by %s - %s"
-
-msgid "Topic by"
-msgstr "Topic started by %s - %s"
-
-msgid "Delete"
-msgstr "Delete"
-
-msgid "Post del redirect"
-msgstr "Post deleted."
-
-msgid "Topic del redirect"
-msgstr "Topic deleted."
diff --git a/lang/English/forum.mo b/lang/English/forum.mo
deleted file mode 100644
index b0b3a1649e976c79f203ea4e3c0c3d235a87f124..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 866
zcmZXR&u$Yj5XKD@3d`U20zw>Ii31=xG!=(vLjW}-C{iO<BrPEI;_OZmx4U*^dt34#
zyb;Gf0^(WtoK2fjMjHJ*<MGVwet$OCelply_%pbNZ@|ys!5&>>>=w8IhMFhfeegMW
z58MH7g73iy?0}&@0q=lc!SGIkp{@YKorA9<{&k(Phu|6b3j7Ujg6lV`K2O01h_}E{
zzYRVH8(`?0fT8aph?WdkSeU)GJcqq*FV6uOv9QoDSa=_H4*gg=H;yvaDQ14o$HtZg
z>pAYqkxQ)_;ihjgo*M0~$sK|dq!Qyi_hzP2Ht;Gvp0mMuJ=@n8Z`pyOQ^%6Lv@#c6
zV+$8^JzIpXwbSI)vGqdptroApY(|MSN0fTe%fta$r;Ltym!zMP-QA6n&qL9+2$2^b
zrKgx9C%({$3Z>_%J?Xp{TB%(wy|F0TlX_Ch35g-e;!;QcR%V6LAI8;)(WqwZ<XzP7
z^*gKi_1bpS#`lv(*ZB-XJ^k>nXSr0m$<wK{j(lr>*cFXcU6?*5D>^zgnbMP(H%7`|
zEE03l(KqplG}&s$#89R@uh$y2H@K-nF)*b~sa?&8c{OAyS<LW9%YrM%DTr5N-%ZJ-
qC7zbnV%vOvNk+)U{S>v8#1OTbd_~&0(pJ;yKl;Wifv+_BU+%xIH`nR_

diff --git a/lang/English/forum.po b/lang/English/forum.po
deleted file mode 100644
index 4a2b8880..00000000
--- a/lang/English/forum.po
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Post topic"
-msgstr "Post new topic"
-
-msgid "Views"
-msgstr "Views"
-
-msgid "Moved"
-msgstr "Moved:"
-
-msgid "Sticky"
-msgstr "Sticky:"
-
-msgid "Closed"
-msgstr "Closed:"
-
-msgid "Empty forum"
-msgstr "Forum is empty."
-
-msgid "Mod controls"
-msgstr "Moderator controls"
-
-msgid "Is subscribed"
-msgstr "You are currently subscribed to this forum"
-
-msgid "Unsubscribe"
-msgstr "Unsubscribe"
-
-msgid "Subscribe"
-msgstr "Subscribe to this forum"
diff --git a/lang/English/help.mo b/lang/English/help.mo
deleted file mode 100644
index 0cc4462a25c7bd1f4e0b9612a952aefa7842a618..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4261
zcmb`JPmE+m9mk*RDl&=-2&kw~yP&%Z({I^XV>UgE;>^yn6J}s!XZaJNvAVmu`!VlT
zJ>Q?1Z4O@aL_C?OAzru{P9_8m#Dj^(#E=*->IsbpqX+e3;KV^czpCn<o@Ebi!b?|w
z>+i3Af4=pr`pfM{e~|E<qkNX~+6R*4QE>Bv{PB&CCdr4v47>#_BYqpanfCW0{t&#A
z_RAo@<ma*f7ZHC0evJO#gU7(PK$-uq*ni|hVcjwCqx9ba%6=-gQ}9;WU2p+>43zz!
zisRpmm`A({@=LzUpR9W^_WwAxe*%h}*FmxG*Kzz!Q1<;3_!01L;7#DaLDBym@Dtz>
z7Rma%K+)rPY(E&=UyAKVK(Y5R@Z;cfvHd(K@?QW&-gm&;z#oC)msdd1<Coy=;O{`$
z@2}uCG5ROSFL@Xt?}BUK&%m#sjOg=D#Q%aK?`9U`>f~PVr{Mjd$o&H-cKrhsJ>Ldp
z{!xM;{da@1?j-mIxCn|~e+T&`Z}TVqmB~*7w}IaPGw=@Zw-Nsw@joCgOm0Gmth)si
zIro6;-~-@sumr`v?}N+WOP~S&2#Vj9ai+xO0{AO%6BIul!w5`B?gPaSX>6a5?X}q6
z0?#u33@CAV5#*P=#GlB21w0MD3f=?01%4WQH{zWre=qGb;1%!*kg&`?IZtOOU!cgk
zPf<Qk5gqTNh;GyGp;!^W%Xb&$lN3ZI_fzB(pG?08sEBS$loJ%uS5ZDk5#KIS=0EYT
zd~&`|`C8Cjs)WOT!o3G${qBeYpP@(`Fgxi`#J49YM=0Wd@l8q*9}*fLb4eY-8R3`s
z*ng|5Yi?kY04lRXr_LT~EhVdYYgA*dHp!~X2M4u9)!Kon^30mp>qW_*7nJy#UwFaf
zrkT!KFUqm5vwGUTXmm3+)#|G1_4=~7F?Ew%GJ25NQP}R1$;)J;&?8d^(Hpil)lA|>
zqw}mErfz0-w^rH?ROaU=p+hXAS~p?6uZe0{dr)7RtDp1rI@y{iQ|K&LdN8O=T_=yD
zov5xyhw4G@*IL&^XZdQK1ehBQ7O17<$*BV_7g?T}I*AzOUT&&v*L0e3<=W9W*tWyg
zYUrxANPM+)ILg-=S7!ZCZSf2>OsktoZsw{%@Xk1^)fk7W5`QLFu8Cn;xk1}Un`uSq
zoOr1m-yQV%IQ87sgPwuu<M8~Nd52eh%X>$bg_^}#$#&jWI`3R`RZ(}9Eq$|ISz1=1
zx^l{@<16ay>E(s($~|xTO=n}!dCF9E=4@BZ*t4+x#7<|ef=u*xF6hQ|6@8s2&0Z!`
zr(K)6ZaO=awso!>S21Z*+fj=zIy*)ea}w3VdQfEckzpWcua~-N^yP)Ejji>A{m-Tk
zEvz})7>m?N$)-Z9Gi9zbyR7<SUDc*pxw3PybN*nS>^?MAXWimRSl(6Vds#D6q^pcw
zc&78Hv8D<-ZaXu`AZvO){URfw*}3f6s&Cf99$ghSiKlmVh&c?Z@A4eS;RWS}!k|Jo
zjXzzmST$qaC|wx^bs)AAt?dXJkB!Qm+m$u`tYnrx*yAafs%g@wRZq)Gq|1_87e<v;
zX8TzQA#}YMj$^I%Of^w;2HkbVK8xzo&ekS!Oz!p-as$g`JDulVmfqv&>0WN)X7Oa(
zx~W=kPc6HSS&rJMFN=ya`KrVX!g}w)cD)y@(LGLDGm**0da<rjgRGw0Ayv=1R`oTu
z7?j9{b7qD$7&==-y_J;WmCentQH8EXwD-pZ4|~-FX>v|6t{{CtGg<DV$xwwmMpid%
zWzri>v`@2zC=b;p63g1NfmoA5W!HM_TJm+FcZmrbpd)dXk?5!}l|+^*pD&^;BDtS6
zq#R-y^06M#gEM3uW;pBWQumoRg!n$VewgE|ddwIO;Tog8iE;=b)UYf~eBvR>wSylb
zI8EN4dtvB}+SlkpV51eN6>b1ODDj+HofX_F-e?T;yw+uDG=v?Ydn5WXaAM_zkIgi=
zt~55D7@;b{#QZQ<=XjwZVfR|HzuZ01_jrS2khcTz>68($q0XRmn%uxG_G~0&UlJV0
z(%*7e8yq}v{k9+jaT?@c9lo)+Guzs$j#)!8f!mLU)ZJu<(;h^|!zcWh_m*Vv;I3;_
zIHwxY9Xk$v&Y$08wkBD>s*94->wB`s6r`~0bS_=5^IZD>T){C3iOP7}#>;tTRpB7M
z9_(ow_&Uvesp7&>Ca8xSB(3q2$a_j`s41WPRh7njJlQx*ws4OLqn$O2^T%$=wlG8Z
zHeEY#_GEKdJe-*zK)6=ws>%8-88V2QkHt)uKcJF%>XK`B=#Rfvmc*OB_gN8D&UsF#
zQ~qHzRNN(48}r%eMQ^vy>OS^;XGvX>vUp4IGLab9;gKTj3J)t)nUV()tn)XnpX4))
z%rp~n%IvCOYTu1)_5z~B!v`dsN)@$`my=celp>^{uv0gA{~kk!c9*;~f7yjRAXJ%N
zd65}6^jxyx#ndyzk$Y^SxWKqdNC9#R(t{_H+{@%@-b0KK9JyP&^TW0+dZxPG!d{C&
z$+7Pd88~u{%*T0XbrnR=lDH}%3VRc|%!Y`_J4KVUt6DuLIppiJtZB$!j=V37u_{RC
Jj@u=n{|{6llYIaH

diff --git a/lang/English/help.po b/lang/English/help.po
deleted file mode 100644
index 2d7c7c52..00000000
--- a/lang/English/help.po
+++ /dev/null
@@ -1,165 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Help"
-msgstr "Help"
-
-msgid "produces"
-msgstr "produces"
-
-msgid "BBCode"
-msgstr "BBCode"
-
-msgid "BBCode info 1"
-msgstr "BBCode is a collection of formatting tags that are used to change the look of text in this forum. BBCode is based on the same principal as, and is very similar to, HTML. Below is a list of all the available BBCodes and instructions on how to use them."
-
-msgid "BBCode info 2"
-msgstr "Administrators have the ability to enable or disable BBCode. You can tell if BBCode is enabled or disabled out in the left margin whenever you post a message or edit your signature."
-
-msgid "Text style"
-msgstr "Text style"
-
-msgid "Text style info"
-msgstr "The following tags change the appearance of text:"
-
-msgid "Bold text"
-msgstr "Bold text"
-
-msgid "Underlined text"
-msgstr "Underlined text"
-
-msgid "Italic text"
-msgstr "Italic text"
-
-msgid "Strike-through text"
-msgstr "Strike-through text"
-
-msgid "Red text"
-msgstr "Red text"
-
-msgid "Blue text"
-msgstr "Blue text"
-
-msgid "Heading text"
-msgstr "Heading text"
-
-msgid "Deleted text"
-msgstr "Deleted text"
-
-msgid "Inserted text"
-msgstr "Inserted text"
-
-msgid "Emphasised text"
-msgstr "Emphasised text"
-
-msgid "Links and images"
-msgstr "Links and images"
-
-msgid "Links info"
-msgstr "You can create links to other documents or to email addresses using the following tags:"
-
-msgid "This help page"
-msgstr "This help page"
-
-msgid "My email address"
-msgstr "My email address"
-
-msgid "Images info"
-msgstr "If you want to display an image you can use the img tag. The text appearing after the \"=\" sign in the opening tag is used for the alt attribute and should be included whenever possible."
-
-msgid "FeatherBB bbcode test"
-msgstr "FeatherBB bbcode test"
-
-msgid "Test topic"
-msgstr "Test topic"
-
-msgid "Test post"
-msgstr "Test post"
-
-msgid "Test forum"
-msgstr "Test forum"
-
-msgid "Test user"
-msgstr "Test user"
-
-msgid "Quotes"
-msgstr "Quotes"
-
-msgid "Quotes info"
-msgstr "If you want to quote someone, you should use the quote tag."
-
-msgid "Quotes info 2"
-msgstr "If you don't want to quote anyone in particular, you can use the quote tag without specifying a name."
-
-msgid "Quote text"
-msgstr "This is the text I want to quote."
-
-msgid "produces quote box"
-msgstr "produces a quote box like this:"
-
-msgid "quote note"
-msgstr "Note: If a username contains the characters [ or ] you can enclose it in quote marks."
-
-msgid "Code"
-msgstr "Code"
-
-msgid "Code info"
-msgstr "When displaying source code you should make sure that you use the code tag. Text displayed with the code tag will use a monospaced font and will not be affected by other tags."
-
-msgid "Code text"
-msgstr "This is some code."
-
-msgid "produces code box"
-msgstr "produces a code box like this:"
-
-msgid "Nested tags"
-msgstr "Nested tags"
-
-msgid "Nested tags info"
-msgstr "BBCode can be nested to create more advanced formatting. For example:"
-
-msgid "Bold, underlined text"
-msgstr "Bold, underlined text"
-
-msgid "Lists"
-msgstr "Lists"
-
-msgid "List info"
-msgstr "To create a list you can use the list tag. You can create 3 types of lists using the list tag."
-
-msgid "List text 1"
-msgstr "Example list item 1."
-
-msgid "List text 2"
-msgstr "Example list item 2."
-
-msgid "List text 3"
-msgstr "Example list item 3."
-
-msgid "produces list"
-msgstr "produces a bulleted list."
-
-msgid "produces decimal list"
-msgstr "produces a numbered list."
-
-msgid "produces alpha list"
-msgstr "produces an alphabetically labelled list."
-
-msgid "Smilies"
-msgstr "Smilies"
-
-msgid "Smilies info"
-msgstr "If you like (and if it is enabled), the forum can convert a series of smilies to images representations of that smiley. This forum recognizes the following smilies and replaces them with images:"
diff --git a/lang/English/index.mo b/lang/English/index.mo
deleted file mode 100644
index c8ab6fe21fdf82315b9166c34d7355ba818d7dc1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1064
zcmZvaJC74F5XTK1ujP1GJPIR$#1#$%QA8VpP(pG<%H2iB9-_DcC+p-EcJ0XaavUW!
zqCleI3((Nf(NR(G1*rH0lyp$=_j>nUI!mLUXFQ%6d*;`Lxeo;E4CE^0E#xBPAH=Ok
zhX@J4K6na@N<ITmLr=lu;Oo-<rsO+t9`=u={s}w={Y%NO;7RD;K<D=Z9729V&O=`~
zLdZF=37!Q9ptG-oCqM~a1~<V=;QLbl3|@!+9dvd523_7ipo{kxyaLY85rS03yPcm~
zFcoh)T4;nE2H{@ZcR8!&>UMwO{>9Z^thVAhriq*=;<v_fYe+Yn*)2M9hh#Aq#u}<*
znn*zgiF`q=BFkbEW||wJ$+DtqLT3tY<=(1UGOiToW5|lXANi9t*nC>I+m1d=bInuM
zQ#vytm9s)MtvgNXx2>C!UTe|%LNgd@^<0cC>&NT~A|y(Nv?sXT5W3wChAR>4XsEEW
zhun&g!p2s`%fz`>rU5sWMVd>Ka;r3)23$^aJ{2qyJlhqK-s5qW$OjXjVl=8LJ-r_+
z^_RLk`RldYK}Sg|B%*H3kkpD-_SP)riEPsG2G>T|)>_nKjU7LieIhjL%CU+QISpxJ
zl-TV;LMmkNlr0J=w6AffM4VV!uQh6SapG0>Smk;wIzC58eUh@NuD?1fK4Vv#6JuSI
z$`LSBxTe?k_B*6EOx5$SYPuFv+!b2HMgI$*NLijznP($3wwi_mPyB2gc(gAtMgZCU
T;DluV<Wvt@-CIpHOU2#);DZp(

diff --git a/lang/English/index.po b/lang/English/index.po
deleted file mode 100644
index 1413e4ae..00000000
--- a/lang/English/index.po
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Topics"
-msgstr "Topics"
-
-msgid "Link to"
-msgstr "Link to:"
-
-msgid "Empty board"
-msgstr "Board is empty."
-
-msgid "Newest user"
-msgstr "Newest registered user: %s"
-
-msgid "Users online"
-msgstr "Registered users online: %s"
-
-msgid "Guests online"
-msgstr "Guests online: %s"
-
-msgid "No of users"
-msgstr "Total number of registered users: %s"
-
-msgid "No of topics"
-msgstr "Total number of topics: %s"
-
-msgid "No of posts"
-msgstr "Total number of posts: %s"
-
-msgid "Online"
-msgstr "Online:"
-
-msgid "Board info"
-msgstr "Board information"
-
-msgid "Board stats"
-msgstr "Board statistics"
-
-msgid "User info"
-msgstr "User information"
diff --git a/lang/English/install.mo b/lang/English/install.mo
deleted file mode 100644
index 1052a5282505b5b50a975dbac3799dc91ed6dd13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9441
zcmc(kS&SV=6^1(`0b&A#gq;9olVNO_xsG=;UdW7>WMC#9>~R)C2t9r4-rKlu_och9
z#}h#S<q5G!2$4iY3IYiM4+sGgFA)zQfgleE1QJ4Gd4nLaDDZ$lV)@Rg>SY!?@PN2-
z&EH#9ojT_~OO=0h<29cS_}x#tnRd<9LGVHF_t)}=-_y?vf|r87178UK6TAt${`o=h
za?pS;0uO=LgQvk4fam=E1K>-zPyGEu;5P0*3i2;_gg^5Bv!L|*n#XT}FXsLS;48qN
zgCgHE;0@r5u5<lf559)`J)p?72)+yq{rgo=<o<}ie-wNr_g@A@?(g{bKlbl`4a)e>
z_~*|-Sdr@nQ2N~r%DNALGT#FDT<|@h=&A4DzaM-R_n!hq?yrD1f=_|c@0Xyc_!&_8
z|JCC^K~x-E%cO!Y^!PH5uLb4%36E1A_j#Q0IP38ak7q!J4(<YF+z^y?#-Paapnv`e
zkB@+;Ab0|leqRDb{%?TN?|Y!=?`I$;34R00IDZ1gZdXGFd43Zp-`xz#dfyDn`#t{o
zEGYI_0{Iubn?Ewo1^@gZQ0D&_DDpfCie5kGpFipGdmex6@fRL{>+#Q^tot7zA_mto
zsqo|_;L=q=FbRtNE+MSQ^Knq#KMsoBzXtLzc#1zc-~Sx^3-=2s<4xS(28p}eUqJZR
zf<FR9?mvQOz`udp!FiM<^I!0|3W`1+26up;0xy8y1Vzs~5K8*(19ySv!PkQy1cmpX
z1>XQZ35wjm2F0KL0E*oI0!8juvKV<k3CjBepp1XJe|`@re%1q}-$USD@KJC#_!Rgi
z@bBP#takz@5I^`ZokH+2@ICS#WU0Y@3?lNTpxFH}P<Z<UI0t?K+y_1lo&;~ksNV)d
z@Dt!0UL6ESz^{Ynz(0aB;2ewI4}Ji=OWuQ1;B`3Jqu@dCqu>ugmL9wlW5_x)P{#QX
zC_MNn_(|{=pztbvowL^^P~?9Y{4V$i$S1+OP`dE>L69W|4}%tb927fWWt^R^2T@Vb
z0fnb0!D;Z_py>Z&AQTKf13nKuei4-CU)}D;`Ig7;gVO&ep!EL(DEfL0Bw@<n3@G-=
zz*FGo!Mnky!S92&L5f4*b+^C~a2C7@6xrk_91#1+@2msm$#eYmtsp8_+ljow0nxkY
z;vntKG=>b`LKC|z(T>rM(5|70?&WvdLC^t3|Lvcw?|A!xzZQMo=dZ;UV&?<2J881k
zx6{OiduWGgb2QP3{BEKhrM;1M4-K`ceF4=Yv``)|gKv|E{NCX}^>?1@MH*&TyW9(+
zQss~VPte{;6Wv0+V1g#RxS#e`+9XZ<S$=0|SJQ-_^1I!E@_pW4w?X_#ezOkrFYXa6
z&|W~>NfRHEpV(gb(EbT8@1VWQKfKK&RAA8VFizv5%)>IyQd8J+JZeA8^7VJd4#POv
z@N8VzJPn6-{o^8-O>AD8@M2ho45K$u7!CMNug9Y#3%lIpHtepMI4#OBNi0v&G#jUp
z9on=EW=A6%<{`JiTv%9h{_H|9mxX!PbZrsk@kj*sPn`JfZ5fw|4NeTgv~Nwq-*MQN
z`z&J+Ki9K9=fhqWoXFB%oDa<?EQ-}E?*=F5Ou06)Ce2E7F-&5fu*MY;50P!I-SVO8
zwAlDgHMQaUQEq$jrRK{)R+Q_%TYuL`Qq7AAE;8}vj!q}_d?I%<Pi?uAwik|*vQbF&
zpeWZ+<H?q)PiCvB7|ukZmVRe67@1zoN2l^U%dyIak=8$U<LR>^ICTl?#cAK5yae6J
z0KsV+mIIs5&6#<}2vuY2ac`U?ZMrla24P`VtW7KX!ll!38YX(5k0YT<5!`N5o9n|~
z=8Y8GKDI^a{uaSJMmKvrRCvJOAM$wE;a&&(9PD@Czdh*gd=Kf6W>6>V^|(~BSJ>!%
zF^pkQDttFXTNFatMLS%vc>((StjhvQbhTJr@p8>Hia4F+<6&@TW|+=iV!T3E&Vv<o
z9p@ZN6`!k%LKzKjqd~Bwlr*_jW_5$J_I=|xN2ApRMz;yK<HQ!hIh)w1G+j@};M^d?
z^=q1*BLb9_Rf1);w&#5N#xr0UTbL*;Z9mJ`0=>ghEJ!a$_(rfihzrBN_m25AG^O-#
z-<<cs2m{uadz;IB&E@{)@<4NWFu2<$QARYoJI|n|3wZZtV-x1q<l{6I!aAxhC1Z#*
zjkbryj7dj&TO8Ya#JJ02J5#g$nAx-I$hM_CdoLQAp6^cIg)K41Ok=NYOJ|m+PY?!$
zpwsxOoiRL{K5H+=@@e&GAuP)2WrAUmi23<w!3VbKWg8A#BbuY3ME2Wy&Y4zLI$7R7
zzHM=S@l-Sap3be?h;7h=QHcvP=<!mydz8SzBPJSzIl<%D`Q_8ohnw$Y_MXkBPo+`T
zMHMsV@Jd|Pg3J&Bx7{=Cd`x9r%4|0-&7RKT&VJsw+v#)JIFBshS>~8AZjyEaVcE}~
zjwXw(5)x1Az}8A|87_2`REJfMFAuCwOr{H~BP1oH6eb$yIqD$3NNiutV~tGPkM8#U
z%zV$R!G+Z@Ep?K@lsFZGNdV*0B{f3?i*rMytY(RacyghAhr-#y>gOn?9E9@6wgfq9
zhsP(1qq_kSsuIJjteK@dmO4h*7=<ZOLy}G8avGBt;l+Ace!>_D7`cbZSXXO~og#s1
zXZIP+p~bF_!DAS1m~~|-7)Ip^N25F&<uQ}B`j2crj0=q`9nlICb+hqGIn@ks>!Cx3
zI_p%f>Ay9|f28r$kaJll{@u8Y2-u@Y(6UA3vw5;Mbp<`D)-lv3W&SVMe44!IDNz{o
zNG0R>(v1s>oov;14MZ;`oVgVKKj0eaMA-?)BvC)$I11S{ffK@1iI`h+F@{u<oskqI
z-`5Km2)#7Fx)Hlm6}#&ZAtgHYuZ0sW|HGpzs_m9kH72)of_e3YVPTT^f^FFsg@hX`
zL&yALkd2eB>1PBvGayYJ+tKOlj?=EaB*n;%<5Um!=<X2TA<I%*c7jt{mEpL#30uXb
zkuN*#5>w&=6{gv_8kbCi1LV}Z67dPS#b6i7TYR`pL`^##qZz3pS(Fh*qO!BOQZ+k^
z@n}SHEX*CtiwnE{+sah}MOD4J^0%oSMEI)GmEhD>mr-u5?;_IT%Nr`Sb{Fidg+g2w
zHtA`w!LAY!RxGUTY_5qXCyGf4RuVTuR~6UgfL6<GBUE)l9j7r%w<#B#xn!wQ_SQPD
zdijy6TVFl;dZK0O`h&|B$N%4|dLix)B!H6vBue{S-3cyRVQ*<Q!hb=@+s$l|PC93j
z7-OZj?ocQ-hSu6!(#5lU-^(O2)nyJgwQz|sp@3($?al<VUh$Fc+6)Actm{}%xh_Uw
zGAaFBXs)&^!WQo{k$Uscq61BZO%=OU2p|`@&q9cX`<hW~iBq^`k@d<|snO`>>5kOG
zD;{J~G#;(VlCqSqb2H5Nl3qeGxBCz-6s-W1yMnjS>{jP|v{3odkPTBjB0feLLNG_K
z)!Q$)5dKy?oNCg)&)MzN?4<B4Zj>;;^(Ls^>TK8zZP(&p7)k-Ndbt2e=wuzTbPZmt
zh}bC+vlBEE*E7`0#9$;{*-*s~qBXkvS1y5|3fTcW_SCPdZC4dIw%CxhTvnqF^_y-`
z)Of93erNqQZ8njO9V>7fZL><a@I;NImZlVv6qgc+rI?h6?qYXkj}F@w&3T0eN{#C(
zKvQ8+1k3q>#?VBntxm8QlBe`rr#!iYBqv-I7B&%Bs23XNbbRXixbcH4DbmrTUP=;2
z7hH`%P#%{hOVJoCChS&waiWK0YVV58&fKj8Q>C?T>IxON&`zETc}C=Jis8+Pu5Ij2
zpyh$Mg;oV_Q2ec#daC6Ot1-4BdTb)=tgnAZ8QWg(A8_|FiTw(^^&3ze%7>VaxtoOL
za;-V{j)l0iQ)Y3EE2Y&EyU2cSx$Ok^vI<{RAY)a@_qF`hV8U@gFVBX~f~$5#k6ETn
z+%rjr%H_~S<FDH^WcdXbcdO(jo>GY=W4PS|YWEs#DJn}<oZL$)0aZt7r$@6h?x#L{
zxrObbjB4#m7@2*lspC`Q(`^$<loWmv6k$#!pOo)4<w^6-kz@rNFRekCTsGVhL7S)!
z6@~q-R`7z?A~zacvE{0q%IsCm?>!(><Y9z2QT4GKQ<4(N{c!|>Gly7$^C&_}X%24g
zahB6TITgV*`K;<n%}7{}2t(7Pogyydi_~}i+(j~^T8N#`(5EwBsdmhg3tmlJt};~;
zu2r+t11RPFsGed|l2m-5U7hoI?Ksl88l*n(X>2kf2Tpn#REG}D+8SNlf=WB2WDN6|
zeW|#-hN~gFbbnG*i(g`*u+Ix;+n!xDoC1tF9wBb|QzT)#E}$4k5hqF;e6k@URKPgw
z4#q@2B51MQ+(}MJvc8T^bQ@4yn@r9feGJh<hvqn${%p4s%#+$gzH!lk!r$>mmxyH5
zDOPi}<$0Et*z8Tv^Tn8Lyqpg=e&^Su#kDFZOxLOmU$L9SB6Mk#UlrqMkZ~pE>V|&P
zSeE3$GS!q*rU@Qmb?1YklgsQ=p|W>8%U(qEuM9_eh78+Ba-Cpl^O;;XQ`YLSoC_@N
zQo&3X?@I`74`}sW9oMM>a78&X5a;zW+O!|1wx&zN_WFRp*B?8pQ@&jR5isN!(4GDf
z066rMwQ5SlfWvjWt6WY4bz4;(32K0-^zSwT)f$Wc#M6T-ogK2W^}3Kvh_DV9AinXx
z34IQFTj2(Cv7R!^eBfDT1h-@}B=7jHs<MRIKq3^Ui<x<ltuAy*$9fX0aZJ=Yrf|v&
zYGQ&;71N}wwQFu^12*{L9<nLI#W@4jDkSs+>8DJ5DISi8#JaRkiGqClZ*7L7wAd7z
zHd;&1MK60`T2h`ygcM0-S2{7>!W?^BayX6E2c`aNSsDD+a$5H>TZDHFXLVla%Tc>X
zQgOA@9#acf9a1@_73xsjnC-#*k_o$Ax)IIJ`^<<KzDs30b|Y%P+8~9QoH9GqX7`D|
z-Y<zI<8<SSqcp)o4n@VEa6tc`75&2OoSQpA*xJQZj3!*rU?v+{q!S;POcbu@8NwEs
zo?S&1FQAtX4^3cdZxym3l{M9@pJb@pa2eNa#j7Jp%YiIOSwaf3%aLCk$qog7RMJUz
zKaYm<DGsT%VCMvdPCkNnvuG@FRX=gjrWMpB$B}oE$_`r1XdI*T6Mm)o-(igcs`K)R
zJ+~B6LCATbnb>;^tZstv#6DhD+pQ++YoCezyhAoAXsTmASJY|@9gj#*U7t?0Lwkv6
R2&?E@J;D%*kPb2YzX2gx-ueIl

diff --git a/lang/English/install.po b/lang/English/install.po
deleted file mode 100644
index 03f10123..00000000
--- a/lang/English/install.po
+++ /dev/null
@@ -1,291 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Choose install language"
-msgstr "Choose the install script language"
-
-msgid "Choose install language info"
-msgstr "The language used for this install script. The default language used for the board itself can be set below."
-
-msgid "Install language"
-msgstr "Install language"
-
-msgid "Change language"
-msgstr "Change language"
-
-msgid "Already installed"
-msgstr "It seems like FeatherBB is already installed. You should go <a href=\"../index.php\">here</a> instead."
-
-msgid "You are running error"
-msgstr "You are running %1$s version %2$s. FeatherBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue."
-
-msgid "My FeatherBB Forum"
-msgstr "My FeatherBB Forum"
-
-msgid "Description"
-msgstr "Lighter than a feather."
-
-msgid "Username 1"
-msgstr "Usernames must be at least 2 characters long."
-
-msgid "Username 2"
-msgstr "Usernames must not be more than 25 characters long."
-
-msgid "Username 3"
-msgstr "The username guest is reserved."
-
-msgid "Username 4"
-msgstr "Usernames may not be in the form of an IP address."
-
-msgid "Username 5"
-msgstr "Usernames may not contain all the characters ', \" and [ or ] at once."
-
-msgid "Username 6"
-msgstr "Usernames may not contain any of the text formatting tags (BBCode) that the forum uses."
-
-msgid "Short password"
-msgstr "Passwords must be at least 6 characters long."
-
-msgid "Passwords not match"
-msgstr "Passwords do not match."
-
-msgid "Wrong email"
-msgstr "The administrator email address you entered is invalid."
-
-msgid "No board title"
-msgstr "You must enter a board title."
-
-msgid "Error default language"
-msgstr "The default language chosen doesn't seem to exist."
-
-msgid "Error default style"
-msgstr "The default style chosen doesn't seem to exist."
-
-msgid "No DB extensions"
-msgstr "This PHP environment does not have support for any of the databases that FeatherBB supports. PHP needs to have support for either MySQL, PostgreSQL or SQLite in order for FeatherBB to be installed."
-
-msgid "Administrator username"
-msgstr "Administrator's username"
-
-msgid "Administrator email"
-msgstr "Administrator's email"
-
-msgid "Board title"
-msgstr "Board title"
-
-msgid "Base URL"
-msgstr "The URL (without trailing slash) of your FeatherBB forum. This must be correct."
-
-msgid "Required field"
-msgstr "is a required field in this form."
-
-msgid "FeatherBB Installation"
-msgstr "FeatherBB Installation"
-
-msgid "Welcome"
-msgstr "You are about to install FeatherBB. In order to install FeatherBB, you must complete the form set out below. If you encounter any difficulties with the installation, please refer to the documentation."
-
-msgid "Install"
-msgstr "Install FeatherBB %s"
-
-msgid "Errors"
-msgstr "The following errors need to be corrected:"
-
-msgid "Database setup"
-msgstr "Database setup"
-
-msgid "Info 1"
-msgstr "All information we need to create a connection with your database."
-
-msgid "Select database"
-msgstr "Select your database type"
-
-msgid "Info 2"
-msgstr "Select a database. We support SQLite, MySQL and PostgreSQL."
-
-msgid "Database type"
-msgstr "Database type"
-
-msgid "Required"
-msgstr "(Required)"
-
-msgid "Database hostname"
-msgstr "Enter your database server hostname"
-
-msgid "Info 3"
-msgstr "You should be able to get this info from your web host, if localhost does not work."
-
-msgid "Database server hostname"
-msgstr "Database server hostname"
-
-msgid "Database enter name"
-msgstr "Enter the name of your database"
-
-msgid "Info 4"
-msgstr "The name of the database you want to install FeatherBB on."
-
-msgid "Database name"
-msgstr "Database name"
-
-msgid "Database enter informations"
-msgstr "Enter your database username and password"
-
-msgid "Database username"
-msgstr "Database username"
-
-msgid "Info 5"
-msgstr "Your MySQL username and password (ignore of SQLite)."
-
-msgid "Database password"
-msgstr "Database password"
-
-msgid "Database enter prefix"
-msgstr "Enter database table prefix"
-
-msgid "Info 6"
-msgstr "If you want to run multiple FeatherBB installations in a single database, change this."
-
-msgid "Table prefix"
-msgstr "Table prefix"
-
-msgid "Administration setup"
-msgstr "Administration setup"
-
-msgid "Info 7"
-msgstr "Create the very first account on your board."
-
-msgid "Info 8"
-msgstr "Your username should be between 2 and 25 characters long. Your password must be at least 6 characters long. Remember that passwords are case-sensitive."
-
-msgid "Password"
-msgstr "Password"
-
-msgid "Confirm password"
-msgstr "Confirm password"
-
-msgid "Board setup"
-msgstr "Board setup"
-
-msgid "Info 11"
-msgstr "Settings for your board. You can change this later."
-
-msgid "General information"
-msgstr "Enter your board's title and description."
-
-msgid "Board description"
-msgstr "Board description (supports HTML)"
-
-msgid "Appearance"
-msgstr "Appearance"
-
-msgid "Info 15"
-msgstr "Make your forum yours. Choose a language and a style for your board."
-
-msgid "Default language"
-msgstr "Default language"
-
-msgid "Default style"
-msgstr "Default style"
-
-msgid "Start install"
-msgstr "Start install"
-
-msgid "DB type not valid"
-msgstr "'%s' is not a valid database type"
-
-msgid "Table prefix error"
-msgstr "The table prefix '%s' contains illegal characters or is too long. The prefix may contain the letters a to z, any numbers and the underscore character. They must however not start with a number. The maximum length is 40 characters. Please choose a different prefix"
-
-msgid "Prefix reserved"
-msgstr "The table prefix 'sqlite_' is reserved for use by the SQLite engine. Please choose a different prefix"
-
-msgid "Existing table error"
-msgstr "A table called '%susers' is already present in the database '%s'. This could mean that FeatherBB is already installed or that another piece of software is installed and is occupying one or more of the table names FeatherBB requires. If you want to install multiple copies of FeatherBB in the same database, you must choose a different table prefix"
-
-msgid "InnoDB off"
-msgstr "InnoDB does not seem to be enabled. Please choose a database layer that does not have InnoDB support, or enable InnoDB on your MySQL server"
-
-msgid "Administrators"
-msgstr "Administrators"
-
-msgid "Administrator"
-msgstr "Administrator"
-
-msgid "Moderators"
-msgstr "Moderators"
-
-msgid "Moderator"
-msgstr "Moderator"
-
-msgid "Guests"
-msgstr "Guests"
-
-msgid "Guest"
-msgstr "Guest"
-
-msgid "Members"
-msgstr "Members"
-
-msgid "Announcement"
-msgstr "Enter your announcement here."
-
-msgid "Rules"
-msgstr "Enter your rules here"
-
-msgid "Maintenance message"
-msgstr "The forums are temporarily down for maintenance. Please try again in a few minutes."
-
-msgid "Test post"
-msgstr "Test topic"
-
-msgid "Message"
-msgstr "You have successfully installed FeatherBB, congratulations! Now log in and head over to the administration control panel to configure your forum."
-
-msgid "Test category"
-msgstr "Test category"
-
-msgid "Test forum"
-msgstr "Test forum"
-
-msgid "This is just a test forum"
-msgstr "This is just a test forum"
-
-msgid "Alert cache"
-msgstr "<strong>The cache directory is currently not writable!</strong> In order for FeatherBB to function properly, the directory <em>%s</em> must be writable by PHP. Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777."
-
-msgid "Alert avatar"
-msgstr "<strong>The avatar directory is currently not writable!</strong> If you want users to be able to upload their own avatar images you must see to it that the directory <em>%s</em> is writable by PHP. You can later choose to save avatar images in a different directory (see Admin/Options). Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777."
-
-msgid "Alert upload"
-msgstr "<strong>File uploads appear to be disallowed on this server!</strong> If you want users to be able to upload their own avatar images you must enable the file_uploads configuration setting in PHP. Once file uploads have been enabled, avatar uploads can be enabled in Administration/Options/Features."
-
-msgid "FeatherBB has been installed"
-msgstr "FeatherBB has been installed. To finalize the installation please follow the instructions below."
-
-msgid "Final instructions"
-msgstr "Final instructions"
-
-msgid "Info 17"
-msgstr "To finalize the installation, you need to click on the button below to download a file called config.php. You then need to upload this file to the root directory of your FeatherBB installation."
-
-msgid "Info 18"
-msgstr "Once you have uploaded config.php, FeatherBB will be fully installed! At that point, you may <a href=\"../index.php\">go to the forum index</a>."
-
-msgid "Download config.php file"
-msgstr "Download config.php file"
-
-msgid "FeatherBB fully installed"
-msgstr "FeatherBB has been fully installed! You may now <a href=\"../index.php\">go to the forum index</a>."
diff --git a/lang/English/login.mo b/lang/English/login.mo
deleted file mode 100644
index cef79b30ccc81bc7fe3d011101c52b6cfabb7959..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1877
zcmZWp%Z?m16g4Egns*`r3nXrkK!B(kIs$3bLlcr=1`V1Ft<VG(2;{E1U2RfrH@0h<
z*|A^&Ym@~`P(A?Gh&@{*BzA212E>MQ%l!-`RUP}5eeSsr`>zY<Z!0`c;(ZqH9lTHD
zef1uE@O%S&82If1Zv!90{0CqM_!ICE;4cgNZ@|Yf{}Xr-_%~4a{$2dPcyHSOJWzPM
zK-u31iiY=qvhNe1@XUY%?EMP(HRivcQ|d?H&GSk<1N;a08Suh=O1%j5K=JoIQ22ia
zJ_Y<0cntglco}%<{^Vx}d<F9f@Co2|z)yj9fL-9Z2b6ja_y!O%6lAmy+_wB!rXEVB
z)%Q`1;HHg7as<h%M`8k1>r3+ZAYO@I9Za>UX<R#3szc{1jwF_L>|$g~GaZ6Dc9pSY
z?AR@aHCJrQ#l&-IJQq=>u8FjopYXihKX<+)_TKrRHf_n2cuyR0D`u)=F;OQ@cq$Vj
zgHGMxDNjf2Y04OX(Qt@K+2$k>ZCMsNKl092)CBfBZ9Idz@w(0s@ig?v&f00{U*4lM
z?7w8`QlGjn?{x;=eU8|&qcXe6J{V_vbjUhR*k8NW8N5Ht_C2PsXYc69J%TN}!KX%+
zE=|We#BAub4YiKWW6`m;Rii7;hODO>jP#~1r^dcLPA*2H994O%bN%T0!P<W}f336c
zEXo7cvl*O5{xa^&YHjQu6%*|P$Nq=I!)$lGPP~uVX9u=$rLk3yc1I?zg!G7Q=i}^M
zw(OI}fkRy*b@Sc)b^J-w>;u>Mg7=e;9wjGgI5B~AQMkrNnrMt`WTiYq4clUINqXH1
zo}mxbB4kml*aFs^1~u!zG}mzZLLlU!i5zIeW9NBE1?k|jo2{iQ1fHv_cF{s2V8m$N
zfDBP|t)DRC!i<e5DN85_G&gYq6(RbjkOBsB7E0!_14*<M(;0NFbmw$5CP*tCL|HVb
z_THSfi>T0+3Y0__aEPd&xS7HeVn7eK86_Pz&eaz46$NHkkUH=Q^}6@T`D6xVmCoeW
zUMgx++!E>HSI=hN&AdS?Qf=%l<e_%+TpgfWd<sX7fz?y2wdE?dv`$WNg$$uIp(zR^
zY24KHS-!O6bmwY-8=*bXi`u4>jTVroYj~3iwMQFO;xb4&M~v)vxg@~8sOMcplni2-
zl&mLYs5pAcy7t&^=A$i}#G3AlMK$lbG3bor6_Je_L&DKbbhueep%D+UE+!NWejSmV
zR7ACTZAf(L>UNJshszPFQrGB|TttR~n^VcQDB9}ExvA@AM5zfiS|;`0vLOEpBhk+%
Z1_Gra)_tJXm)Np;J7^8L&qQyo{sSF<EA0RP

diff --git a/lang/English/login.po b/lang/English/login.po
deleted file mode 100644
index 059c8920..00000000
--- a/lang/English/login.po
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Wrong user/pass"
-msgstr "Wrong username and/or password."
-
-msgid "Forgotten pass"
-msgstr "Forgotten your password?"
-
-msgid "Login redirect"
-msgstr "Logged in successfully."
-
-msgid "Logout redirect"
-msgstr "Logged out."
-
-msgid "No email match"
-msgstr "There is no user registered with the email address"
-
-msgid "Request pass"
-msgstr "Request password"
-
-msgid "Request pass legend"
-msgstr "Enter the email address with which you registered"
-
-msgid "Request pass info"
-msgstr "A new password together with a link to activate the new password will be sent to that address."
-
-msgid "Not registered"
-msgstr "Not registered yet?"
-
-msgid "Login legend"
-msgstr "Enter your username and password below"
-
-msgid "Remember me"
-msgstr "Log me in automatically each time I visit."
-
-msgid "Login info"
-msgstr "If you have not registered or have forgotten your password click on the appropriate link below."
-
-msgid "New password errors"
-msgstr "Password request error"
-
-msgid "New passworderrors info"
-msgstr "The following error needs to be corrected before a new password can be sent:"
-
-msgid "Forget mail"
-msgstr "An email has been sent to the specified address with instructions on how to change your password. If it does not arrive you can contact the forum administrator at"
-
-msgid "Email flood"
-msgstr "This account has already requested a password reset in the past hour. Please wait %s minutes before requesting a new password again."
diff --git a/lang/English/mail_templates/activate_email.tpl b/lang/English/mail_templates/activate_email.tpl
deleted file mode 100644
index 49095c01..00000000
--- a/lang/English/mail_templates/activate_email.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-Subject: Change email address requested
-
-Hello <username>,
-
-You have requested to have a new email address assigned to your account in the discussion forum at <base_url>. If you didn't request this or if you don't want to change your email address you should just ignore this message. Only if you visit the activation page below will your email address be changed. In order for the activation page to work, you must be logged in to the forum.
-
-To change your email address, please visit the following page:
-<activation_url>
-
---
-<board_mailer> Mailer
-(Do not reply to this message)
diff --git a/lang/English/mail_templates/activate_password.tpl b/lang/English/mail_templates/activate_password.tpl
deleted file mode 100644
index b408927b..00000000
--- a/lang/English/mail_templates/activate_password.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-Subject: New password requested
-
-Hello <username>,
-
-You have requested to have a new password assigned to your account in the discussion forum at <base_url>. If you didn't request this or if you don't want to change your password you should just ignore this message. Only if you visit the activation page below will your password be changed.
-
-Your new password is: <new_password>
-
-To change your password, please visit the following page:
-<activation_url>
-
---
-<board_mailer> Mailer
-(Do not reply to this message)
diff --git a/lang/English/mail_templates/banned_email_change.tpl b/lang/English/mail_templates/banned_email_change.tpl
deleted file mode 100644
index 276662f3..00000000
--- a/lang/English/mail_templates/banned_email_change.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-Subject: Alert - Banned email detected
-
-User '<username>' changed to banned email address: <email>
-
-User profile: <profile_url>
-
---
-<board_mailer> Mailer
-(Do not reply to this message)
diff --git a/lang/English/mail_templates/banned_email_post.tpl b/lang/English/mail_templates/banned_email_post.tpl
deleted file mode 100644
index f7e02433..00000000
--- a/lang/English/mail_templates/banned_email_post.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-Subject: Alert - Banned email detected
-
-User '<username>' posted with banned email address: <email>
-
-Post URL: <post_url>
-
---
-<board_mailer> Mailer
-(Do not reply to this message)
diff --git a/lang/English/mail_templates/banned_email_register.tpl b/lang/English/mail_templates/banned_email_register.tpl
deleted file mode 100644
index f0085ec4..00000000
--- a/lang/English/mail_templates/banned_email_register.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-Subject: Alert - Banned email detected
-
-User '<username>' registered with banned email address: <email>
-
-User profile: <profile_url>
-
---
-<board_mailer> Mailer
-(Do not reply to this message)
diff --git a/lang/English/mail_templates/dupe_email_change.tpl b/lang/English/mail_templates/dupe_email_change.tpl
deleted file mode 100644
index 583fb246..00000000
--- a/lang/English/mail_templates/dupe_email_change.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-Subject: Alert - Duplicate email detected
-
-User '<username>' changed to an email address that also belongs to: <dupe_list>
-
-User profile: <profile_url>
-
---
-<board_mailer> Mailer
-(Do not reply to this message)
diff --git a/lang/English/mail_templates/dupe_email_register.tpl b/lang/English/mail_templates/dupe_email_register.tpl
deleted file mode 100644
index b1cb3636..00000000
--- a/lang/English/mail_templates/dupe_email_register.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-Subject: Alert - Duplicate email detected
-
-User '<username>' registered with an email address that also belongs to: <dupe_list>
-
-User profile: <profile_url>
-
---
-<board_mailer> Mailer
-(Do not reply to this message)
diff --git a/lang/English/mail_templates/form_email.tpl b/lang/English/mail_templates/form_email.tpl
deleted file mode 100644
index e3e0d5f7..00000000
--- a/lang/English/mail_templates/form_email.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-Subject: <mail_subject>
-
-<sender> from <board_title> has sent you a message. You can reply to <sender> by replying to this email.
-
-The message reads as follows:
------------------------------------------------------------------------
-
-<mail_message>
-
------------------------------------------------------------------------
-
---
-<board_mailer> Mailer
diff --git a/lang/English/mail_templates/new_reply.tpl b/lang/English/mail_templates/new_reply.tpl
deleted file mode 100644
index 286914ec..00000000
--- a/lang/English/mail_templates/new_reply.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Subject: Reply to topic: '<topic_subject>'
-
-<replier> has replied to the topic '<topic_subject>' to which you are subscribed. There may be more new replies, but this is the only notification you will receive until you visit the board again.
-
-The post is located at <post_url>
-
-You can unsubscribe by going to <unsubscribe_url>
-
---
-<board_mailer> Mailer
-(Do not reply to this message)
diff --git a/lang/English/mail_templates/new_reply_full.tpl b/lang/English/mail_templates/new_reply_full.tpl
deleted file mode 100644
index 4fbc777e..00000000
--- a/lang/English/mail_templates/new_reply_full.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-Subject: Reply to topic: '<topic_subject>'
-
-<replier> has replied to the topic '<topic_subject>' to which you are subscribed. There may be more new replies, but this is the only notification you will receive until you visit the board again.
-
-The post is located at <post_url>
-
-The message reads as follows:
------------------------------------------------------------------------
-
-<message>
-
------------------------------------------------------------------------
-
-You can unsubscribe by going to <unsubscribe_url>
-
---
-<board_mailer> Mailer
-(Do not reply to this message)
diff --git a/lang/English/mail_templates/new_report.tpl b/lang/English/mail_templates/new_report.tpl
deleted file mode 100644
index dedb113b..00000000
--- a/lang/English/mail_templates/new_report.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-Subject: Report(<forum_id>) - '<topic_subject>'
-
-User '<username>' has reported the following message: <post_url>
-
-Reason: <reason>
-
---
-<board_mailer> Mailer
-(Do not reply to this message)
diff --git a/lang/English/mail_templates/new_topic.tpl b/lang/English/mail_templates/new_topic.tpl
deleted file mode 100644
index 2bc048b1..00000000
--- a/lang/English/mail_templates/new_topic.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Subject: New topic in forum: '<forum_name>'
-
-<poster> has posted a new topic '<topic_subject>' in the forum '<forum_name>', to which you are subscribed.
-
-The topic is located at <topic_url>
-
-You can unsubscribe by going to <unsubscribe_url>
-
---
-<board_mailer> Mailer
-(Do not reply to this message)
diff --git a/lang/English/mail_templates/new_topic_full.tpl b/lang/English/mail_templates/new_topic_full.tpl
deleted file mode 100644
index f70c7262..00000000
--- a/lang/English/mail_templates/new_topic_full.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-Subject: New topic in forum: '<forum_name>'
-
-<poster> has posted a new topic '<topic_subject>' in the forum '<forum_name>', to which you are subscribed.
-
-The topic is located at <topic_url>
-
-The message reads as follows:
------------------------------------------------------------------------
-
-<message>
-
------------------------------------------------------------------------
-
-You can unsubscribe by going to <unsubscribe_url>
-
---
-<board_mailer> Mailer
-(Do not reply to this message)
diff --git a/lang/English/mail_templates/new_user.tpl b/lang/English/mail_templates/new_user.tpl
deleted file mode 100644
index 30164e87..00000000
--- a/lang/English/mail_templates/new_user.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-Subject: Alert - New registration
-
-User '<username>' registered in the forums at <base_url>
-
-User profile: <profile_url>
-
-To administer this account, please visit the following page:
-<admin_url>
-
---
-<board_mailer> Mailer
-(Do not reply to this message)
diff --git a/lang/English/mail_templates/rename.tpl b/lang/English/mail_templates/rename.tpl
deleted file mode 100644
index 3cba50dd..00000000
--- a/lang/English/mail_templates/rename.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-Subject: User account renamed
-
-During an upgrade to the forums at <base_url> it was determined your username is too similar to an existing user. Your username has been changed accordingly.
-
-Old username: <old_username>
-New username: <new_username>
-
-We apologise for any inconvenience caused.
-
---
-<board_mailer> Mailer
-(Do not reply to this message)
diff --git a/lang/English/mail_templates/welcome.tpl b/lang/English/mail_templates/welcome.tpl
deleted file mode 100644
index 779a5745..00000000
--- a/lang/English/mail_templates/welcome.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-Subject: Welcome to <board_title>!
-
-Thank you for registering in the forums at <base_url>. Your account details are:
-
-Username: <username>
-Password: <password>
-
-Login at <login_url> to activate the account.
-
---
-<board_mailer> Mailer
-(Do not reply to this message)
diff --git a/lang/English/misc.mo b/lang/English/misc.mo
deleted file mode 100644
index 9a3f7859ab142662a032fa3356390c5918b31c2d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5068
zcmb7`O^h5z701gE3|Rt+O(5aB65`;EGqYZQ#q8Sg$J!e#y!I-)i9rFOo|)R+#xvbR
zcaJxVkU3xhhbRI>;1VIYAS8r@l0!}*7myGVAcRm3AS8qY95_Hu1cBi9ud1Gz-L*;F
zn(E(Fb$z^g@6~(thuyb4V|X5+ypOW{24fQV)GfSt?$~L}-Eddr1MnTx=ir;*C3q+N
z6nrNvBEJ&bza9BJ<Y#`y>o)i+sCj-5HSX{5ZE)wC!+dwbcTt~&`hF6=6+RBtuLU)}
zAM4j*{p(Quz8Co%d^`0YL+#@ia5wxjl>Dzk$@5>Rb#8l$G5pNEyrhDCQ1k7FbTP-^
z1Uv(^{>Avc4W)-X)~~@ksDCx`yKoov=isgICs1<y621ri5o-LuBX`m1cIx*-$#Dc~
zy;-P!7a=M$9Vq!OL-k*W+Rv9``!{0yccA+J2ugo1#P**;>EX9f^ZX7<uD?L7^RLL;
z*|gg4gR;v*kr$x)IjHfUgNr+i`4XI@{xXf?4uqP5`=Hi)0!oeq%04-~3tokq@0)NQ
z{s2nuS0F$0DzAfZCxbO^25O#jybi%jP<nU@J^`PFZTL?p`+br@lCuL<@53|jNhtfj
z2(|uipyc^0oQ0ZH@*jhezY8T#0qJ7C05P3;8p>YZg0kzgQ0u$^QHgm8YTVDE<aik(
zn)y?#{{z08`hOzt!ilusX(<17@L_lrHsOnK5Byu?Zk$a0k3z}Og_{4f(8~#>&!?gG
z^$eVXzlNWNJ20~3N}&4pp!$CvYMw8`_rkA1>EVY^{hx;i;7d^c@e0)VTXEWZ;N9>j
zoPmgHO86moE%N&ixA9}u?*WP)#iSDy*`|KHJ*e!Z5U#vmN+<F&J(5$pIj#!N`zibU
zzwo*rNQRRX$$W~U=U{+;AK`tLA|1Ywavw#HeB-qL7h<OVO8@dbJ@b?gP(DmKOp)#7
z7uu`*NjkF>)a~^nUuaNdgEJJ=U_L_8BfWF{%rVLwWrp$~Wk02Ua1--EihOJ9Gfl%o
zTN-5x`Q^P7*-btrf72tonp54vC7lgh4q9cqNL#LBSMp-eyWWQ?@271umt<L9+0u1g
zyRs{3QC4QIo0l%Ut?y+E*GUUHj5n5Jt$D`Cp6xJ8<!sljx~ya7Vr$P8tJ@mOemAY^
zo@e|x6JYy!S(TeAww?F--Hpv{Lz&_*FX?bxsBIY-8;2v$_L8(~J89Ww$AiLIRN+i$
zUFqg|C;sobvP@R%FQv<>(cVLE6#g0MXFf*_uAVk&bzR4Nl>OK=TgmP8*#86Oyi2aQ
z(L@VLaXDCvwxqM=!<Htg)GT<##(j@h#>VCyS0rp|A-@t{wa(Rmb^V86<*~ox6Zmep
zN;&p@%=Q=Dy4=n0{z4x2UMp<aFxJDHH#!{Jp$mH}^GyGufr2;skCk;<K3HA5?x$^T
zenGB0@_j!Y^RBNsj9cZlCoNp;yUf4BoTI(!L%q(>M;;Br1>oUj+r<A>p4)Doty1sj
z1&7CbOsr^^^@rhHOa7FZB~C|F6b4vY%hwSM0SBckO0%Ss5#I4A_?Ga$cIfe@(ezc?
zzPxo)OSL*i`&^EKZ!y+mS$Vw)Xx=`>r6T2^dq+2m-9eFb8*=?}#%6tAEsr0Vwc+pa
zy_vn|xSgJyomeb#IZESPr|~#@P4jHV&by?-KBrGlEM8o0%;5|b?Ts^d?Tn?Z@u<6!
zs%zbJJ}Illa*<?ZH>vW1PUn+sb-)2_EW4yPHlsb3bb4uaawRO$YBlp>_2G$ya|>rj
z>rXfLPY|jqPIY5>qtBw1d$OA9cat=mwe7W}C|z~@vE}*3(NRCGzT%3;*{q#+(rk6c
z9&M%7P>>nCcH-lWM_i`UCm9!WLTF{Dn@5|6_!6p(rF>Ad-CS5>#)d`AC-Q+!@P}l3
zG{=XlwX_UzqWOAy`ZLfp^NQ@=hip59{FWOYLQQ9VM4k#Eycu)AvT}q~bab7j@wIYT
zUF>o+93D9q{4o>$u&LdL|E-OFF`KW9L<nIa;bg>I#8Io#%sYcR>gYCO2H2Dc%qdj0
zfy#UY*Pr!-0F9=?UQpQBPW>_`%%XBk?7+@8r;wYP(CfE6Q7b2`$&^tG$|y*XRJOIj
z0moH_2JAg3v5R;LlTN1~&Diy{+qKvxW+gJXx49BUJME`<Y15oi=HwLEJtf-00G-mV
zDVfl<pD;<wRqKvm=2MkFrDfAbiPjVRaBQGdUKQLKh)NPKS;g_2B$ur@uW5)SKF%+r
zQ3Wfnc6ln}{mybfi%qg&ctbAqoR&Tn%FkkY#G9Dp+@h`bof13tl)iOM2{TK2&c?>g
znKDGUz2zjgnr^6+<kw*5K3ZBy>w8boN=vHfkzQ#=8X^q#85=7NAlaZ7wRqkBKEG~G
zx$!)B2WQ5GO}RG2dL@jlUR>wVn!1LCgC-yM6OD3iy+-&lo@^B*dIL0tOJIt`#-tmf
z!lo|-aM^9_OFUz^WpJcCb0Iivj|AJ+L4Ty{*O<&73m;dssTfwKax(0c4=4X;c(p#f
z2uK>Q-q2mH=5MQYLW+lDdqBKFFE5pMJ%v|4TW$F?<M6DnrR_EE)dWc&a-x4V!>u8h
zNxK+}hjlev3+jVkTcupn-5}_U`8S4Vrtr6hVL<Q~26U|r`;!-pOC%U%+~Mqz!-o$Z
zCWut7w0o}}Idr)-c@u#kEOygDVEi(pkjXxD)zRi(&t1mb-{-4yi`Ti=+%V3D>~Q0_
z?PHxkrM_p(Ox9mtB%4=bytVXooA6P{4<Ow5BNlW_G8-mCUFFa-u{w*&R_;&Q94<6|
n<dFT?X*3=@U=XfKud!C);(-pgC7;^{tsdcbV-)x6tMdN<ZOB62

diff --git a/lang/English/misc.po b/lang/English/misc.po
deleted file mode 100644
index 68516bb7..00000000
--- a/lang/English/misc.po
+++ /dev/null
@@ -1,225 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Mark read redirect"
-msgstr "All topics and forums have been marked as read."
-
-msgid "Mark forum read redirect"
-msgstr "All topics in the specified forum have been marked as read."
-
-msgid "Form email disabled"
-msgstr "The user you are trying to send an email to has disabled form email."
-
-msgid "No email subject"
-msgstr "You must enter a subject."
-
-msgid "No email message"
-msgstr "You must enter a message."
-
-msgid "Too long email message"
-msgstr "Messages cannot be longer than 65535 characters (64 KB)."
-
-msgid "Email flood"
-msgstr "At least %s seconds have to pass between sent emails. Please wait %s seconds and try sending again."
-
-msgid "Email sent redirect"
-msgstr "Email sent."
-
-msgid "Send email to"
-msgstr "Send email to"
-
-msgid "Email subject"
-msgstr "Subject"
-
-msgid "Email message"
-msgstr "Message"
-
-msgid "Email disclosure note"
-msgstr "Please note that by using this form, your email address will be disclosed to the recipient."
-
-msgid "Write email"
-msgstr "Write and submit your email message"
-
-msgid "No reason"
-msgstr "You must enter a reason."
-
-msgid "Reason too long"
-msgstr "Your message must be under 65535 bytes (~64kb)."
-
-msgid "Report flood"
-msgstr "At least %s seconds have to pass between reports. Please wait %s seconds and try sending again."
-
-msgid "Report redirect"
-msgstr "Post reported."
-
-msgid "Report post"
-msgstr "Report post"
-
-msgid "Reason"
-msgstr "Reason"
-
-msgid "Reason desc"
-msgstr "Please enter a short reason why you are reporting this post"
-
-msgid "Already subscribed topic"
-msgstr "You are already subscribed to this topic."
-
-msgid "Already subscribed forum"
-msgstr "You are already subscribed to this forum."
-
-msgid "Subscribe redirect"
-msgstr "Your subscription has been added."
-
-msgid "Not subscribed topic"
-msgstr "You are not subscribed to this topic."
-
-msgid "Not subscribed forum"
-msgstr "You are not subscribed to this forum."
-
-msgid "Unsubscribe redirect"
-msgstr "Your subscription has been removed."
-
-msgid "Moderate"
-msgstr "Moderate"
-
-msgid "Select"
-msgstr "Select"
-
-msgid "Move"
-msgstr "Move"
-
-msgid "Split"
-msgstr "Split"
-
-msgid "Delete"
-msgstr "Delete"
-
-msgid "Merge"
-msgstr "Merge"
-
-msgid "Open"
-msgstr "Open"
-
-msgid "Close"
-msgstr "Close"
-
-msgid "Move topic"
-msgstr "Move topic"
-
-msgid "Move topics"
-msgstr "Move topics"
-
-msgid "Move legend"
-msgstr "Select destination of move"
-
-msgid "Move to"
-msgstr "Move to"
-
-msgid "Nowhere to move"
-msgstr "There are no forums into which you can move topics."
-
-msgid "Leave redirect"
-msgstr "Leave redirect topic(s)"
-
-msgid "Move topic redirect"
-msgstr "Topic moved."
-
-msgid "Move topics redirect"
-msgstr "Topics moved."
-
-msgid "Confirm delete legend"
-msgstr "Please confirm deletion"
-
-msgid "Delete topics"
-msgstr "Delete topics"
-
-msgid "Delete topics comply"
-msgstr "Are you sure you want to delete the selected topics?"
-
-msgid "Delete topics redirect"
-msgstr "Topics deleted."
-
-msgid "Open topic redirect"
-msgstr "Topic opened."
-
-msgid "Open topics redirect"
-msgstr "Topics opened."
-
-msgid "Close topic redirect"
-msgstr "Topic closed."
-
-msgid "Close topics redirect"
-msgstr "Topics closed."
-
-msgid "No topics selected"
-msgstr "You must select at least one topic for move/delete/open/close."
-
-msgid "Not enough topics selected"
-msgstr "You must select at least two topics for merge."
-
-msgid "Stick topic redirect"
-msgstr "Topic sticked."
-
-msgid "Unstick topic redirect"
-msgstr "Topic unsticked."
-
-msgid "Merge topics"
-msgstr "Merge topics"
-
-msgid "Merge topics redirect"
-msgstr "Topics merged."
-
-msgid "Confirm merge legend"
-msgstr "Please confirm merge"
-
-msgid "New subject"
-msgstr "New subject"
-
-msgid "Confirm split legend"
-msgstr "Please confirm split of selected posts and select destination of move."
-
-msgid "Split posts"
-msgstr "Split posts"
-
-msgid "Split posts comply"
-msgstr "Are you sure you want to split the selected posts?"
-
-msgid "Split posts redirect"
-msgstr "Posts have been split."
-
-msgid "Delete posts"
-msgstr "Delete posts"
-
-msgid "Cannot select first"
-msgstr "First post cannot be selected for split/delete."
-
-msgid "Delete posts comply"
-msgstr "Are you sure you want to delete the selected posts?"
-
-msgid "Delete posts redirect"
-msgstr "Posts deleted."
-
-msgid "No posts selected"
-msgstr "You must select at least one post for split/delete."
-
-msgid "Host info 1"
-msgstr "The IP address is: %s"
-
-msgid "Host info 2"
-msgstr "The host name is: %s"
-
-msgid "Show more users"
-msgstr "Show more users for this IP"
diff --git a/lang/English/post.mo b/lang/English/post.mo
deleted file mode 100644
index 58fde8300077007e4b07e61d358b4877b2e39f52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2395
zcma)-O=u)V6vta#bsax<*N^p+=fYwlcAJP`oESBUNeu4B!Hg0S!J6qeGbP<sy;aqj
z9lYsD#gpjKqbCs$dKL62g5bwhLA;3v!K>o`b<a$O7<C(Ze)Xze^?UW+t2aNMJoa9M
z=T5wL;r#>eS-f9gh95kyTpmR?foe<#UIY1!vHT8rJ>(C-6W~YSwczJq1N;iS4*X#(
z{|w#%`M0rr{EAvW1&Uq*%Kl|g>~4WKfP3ThJ}CAAcs2MsDEe=KH-hhj;@^j$?EhrU
zFF^VJw_por`w6@s^1_u-6oW5;vhPihz;{8h^C|c-_$Bx<c;TujItG3N&V%2Bw}XFy
zyWnX!bq|<<d*Iuk*!=|*KYs_G0sjQ$T-(R%^*vDRF^HwegO7r*fp>$SfwzI*foH*A
zLGk+poR-`@0gh7^orXMlWRJu}Vu2$^x8S`QFWjyCLK>=b1696+_;mG68H>-7FL~tL
zl4J2t&Ww;$X8<bSg}358h4-Wg@~mbVbyeXhXYW;?4<>xsd6l~%+DLVv!upvJW!z_z
z)=Q34?JC8*2qRLxz>a)yx`;M2Yg3Gs3(;1|K9Es4M^EdN$>%!L?4un!HGMD~f2GUD
zTc=H5v?l%>4F93kf|sPoagmLpN?_-#^Rr{prf2I3!$S(T(A`=r9Peu$*245ut?}%x
z&e#OPVMDYV)JXjCU8g&oM!S<?)V7u~Yx>hOO(!Pqx5Xe_tW9O5Q(3%eUGAG?ic0h=
z4=qzYT$wX;?+Pu>FE?7wN;=~0G=71d*VZ&?lT{e7TU%?io^8kL4kG5`r&Qo3VJ?0S
zW<+%|bx!#Zx1BORQ^7hYol~Y?BJXjVRX+1YdQ7FcHc$3y6P-?CUH|dM`R(%?2lf|}
zg~qxy0fC9zqXI?)UkncxnbKyNx&!4rhn45soAJ_to>=d(i#JTyrpRrRmO4629cdDq
z#$LR|hF$Gr%SzB`F<D9;#!4;5yS8*)UaxI5sWwvO&ZD4>v4Og94W5uS*+`092bH08
z0}9k9k~9hEC2AkK1qgd}CrB9-c-hI}AkJ(0sOYNj$|6M;(j?jr<e76%BRE{|fnQ#G
ztdi{!SGQ(uZQZ8qD_0Z39_>Zf>rTcL1}fkOQv+2L2uw;H?yAx=anet)#Heb-E0_Ae
zP};yWRGw1pyUL|A>aZuuxw@$HG9Rm^T!aDQvd>u(tp<!xC3M!qZ+M!D)qOZ&sZid-
zau_n3>Lfm)mS~GP1Yl;1geAC9rG*@m>LU?Jv?JGl2bRzw26i}U0t9EZM1^|R)hET_
zL-e98DKFs+3JhD+<W?pBzCx>2|3RFxkr<w~5bEhn68}J*h;h5C;#8#|!QI8pL?aY~
zlhRR>w)20>muh$124?M6^>S3#Y9m!Wn`L$=C#hQ*8Ad*lj1I#|CylqtF9Iipg51`9
zT<(DANE|tB)<yYW4X+BZ6zmZVkLFTq?h8^-xZ5K-Bey}!jwnfzGbp~gkCHUC`NQo|
zysfIY?zOmgb>BQRFJYKoMtCl56iG+%8>y_$DDV-t_K@Nu3su`uh>G0t*=9>~IKKP`
K^|bS0KKdIOKcS%j

diff --git a/lang/English/post.po b/lang/English/post.po
deleted file mode 100644
index 5472cbc5..00000000
--- a/lang/English/post.po
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "No subject"
-msgstr "Topics must contain a subject."
-
-msgid "No subject after censoring"
-msgstr "Topics must contain a subject. After applying censoring filters, your subject was empty."
-
-msgid "Too long subject"
-msgstr "Subjects cannot be longer than 70 characters."
-
-msgid "No message"
-msgstr "You must enter a message."
-
-msgid "No message after censoring"
-msgstr "You must enter a message. After applying censoring filters, your message was empty."
-
-msgid "Too long message"
-msgstr "Posts cannot be longer than %s bytes."
-
-msgid "All caps subject"
-msgstr "Subjects cannot contain only capital letters."
-
-msgid "All caps message"
-msgstr "Posts cannot contain only capital letters."
-
-msgid "Empty after strip"
-msgstr "It seems your post consisted of empty BBCodes only. It is possible that this happened because e.g. the innermost quote was discarded because of the maximum quote depth level."
-
-msgid "Post errors"
-msgstr "Post errors"
-
-msgid "Post errors info"
-msgstr "The following errors need to be corrected before the message can be posted:"
-
-msgid "Post preview"
-msgstr "Post preview"
-
-msgid "Guest name"
-msgstr "Name"
-
-msgid "Post redirect"
-msgstr "Post entered."
-
-msgid "Post a reply"
-msgstr "Post a reply"
-
-msgid "Post new topic"
-msgstr "Post new topic"
-
-msgid "Hide smilies"
-msgstr "Never show smilies as icons for this post"
-
-msgid "Subscribe"
-msgstr "Subscribe to this topic"
-
-msgid "Stay subscribed"
-msgstr "Stay subscribed to this topic"
-
-msgid "Topic review"
-msgstr "Topic review (newest first)"
-
-msgid "Flood start"
-msgstr "At least %s seconds have to pass between posts. Please wait %s seconds and try posting again."
-
-msgid "Preview"
-msgstr "Preview"
-
-msgid "Edit post legend"
-msgstr "Edit the post and submit changes"
-
-msgid "Silent edit"
-msgstr "Silent edit (don't display \"Edited by ...\" in topic view)"
-
-msgid "Edit post"
-msgstr "Edit post"
-
-msgid "Edit redirect"
-msgstr "Post updated."
diff --git a/lang/English/prof_reg.mo b/lang/English/prof_reg.mo
deleted file mode 100644
index c20bbbd19e3f9ba8d8b6e49836bffc40de556cb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5891
zcmbuCU5sQ!702%`iytEhiy$s47O)G`(zmyJc4t3kc9EIhnc0z@vDum31r`#j`&M_?
z&h1<6y>+{Hcrb?epa~C#L>`m`Vxlo>A~8H^^nsx92@_u21mpn|qY-0#;nDa%^>MqW
z89t0RQ}er3x9U{YIj8EJe(RQf-wW`ppnL&kb8irE@R@!1hv(*x1;NL`{ooDY0q`d9
zUROT`UWa-e{1mtXQvVHb3cL)`xHkA{Fav4)(~i$N{t&zc?Y{&+0sapB4EP#I<KA}s
zH~3l9X%doqJ4oXWf;9he@RML2q;YE?t?zNy{-om-NA36x$8S46>-fCmj~!of{FURY
zj;}dhb9~$J9mjVaX>+u`DaTtK?{u7YoN+wmxa`<)e9SR&OdPK|KJEC7<8zKLI{wu0
zWyjw-{=xBe$2UQ;*Iz->@4F!BbuTt?JGdX*50*f(!#vp769ntvJnApN2`+<gfDePm
zA>?N8JK!ns`yk2v6aGO(!C$~9!GD0C2hYLC_kmsT%iwpx5d1Y*1^*8I47}q;>o>m#
zzli!DL0aEG!HeMaSoG(>$H69;gCy@7h^d0>ut_XAxCwj(JOJJWz6nyl|9~M_!s2ON
zmq6M_hJOtF7D)5`2)q^i4M^wdb&&M)FObIXLFI1nu;Y1f4)q+Qd0qmi!8gD=!F^CF
z@gDFta1kVZJObVUeiOVG`~gVodIh9;-U4aAH{cM}z(XL_FM)@^zN<e6(t3XZ;xBmB
z@tSLY$JO_s6Yb|Vkk&r~lAbSswB8J){Xg&OFM~tW{|ug|epvihz@LBu{2TZLxQ@e2
z_W3yow=oZncu+#2eH=qMfii<a_MknSMmdV&pX>2bMj<^dqAa1*QRoUIolHJ3g?VVb
zq#Lq7J$q4L=HPymWt0_^BPgU_|Il4R`~MP31%+$}Q<;bM_W%l1Z){2aTt!(xIgWAw
z#Xo28a@beEd)zzel<W()4sJw&dzy!AcF?^;rREN#^D~QrBWZkh9z2Oc_Miu*Gd^M}
z6aSd2!wkWLC{rk8-(ZnPY_<L{m?R=%qQ_<ID|sf;g!e>HS4mr@J=W)07M$7G49;*Z
zSX-q%u7fk8&GQ({`@)T1A}K5u9g#%Ac!kZlY9_RnNr%-Y>XYA(OnjF~TLtHM(#d&8
z1m{$X$1>wus>Dy%z#3ViG{f3j-N00}QY`DLR0oYz4tQ&usXmR#{GbilVbm#BNhk1?
z9#6JeEEACho3dBz*StTa5@B2EjhSU#*sKRA_g8Ck)vA4)Dc+8Zy&Z91j}~o5=X~32
z(Kb8Qc68RtJ63!>R(w5Pw4E4x^CM0cZ72PRTGhAV&COdY){HmbR;<1@Gw0;hihb1l
z>ce8cVbzZatG*w-S$Sb~G{WyPtoj{=Rlkq0>i0o!eyra|SoQk|i+zN}>O-uQbnhIO
zEiTqoBu4es#^}A1i%gHIslcECjzFu+(`?jUxJ4m!%$wpo<#D)-gOJU!q;IO(>6v+E
zUr$db?5@+SR+^t`r0R-j>2Ng)FN!pS^Ubkk!F5-pi;Gi@uWg3)6jii`bhzdi+QRc<
zAgQZwI>$2|Zl*lRVy;z+PW~u_n}YYoB(hUH>dEB6ww<Ectf;i}z|`96+R|wLTBSOL
zqpd{(soQ-_s>M}(xF2(w%v(JOefq-Ya(H6Yk7jR+G+atrD#8(-V<(zY7YmtVBAI$5
zToH*#?HU_OL{hU_<wWHuzSwHGq4KmP>ZEI-=a`)&cvR&WuSE(w@C3(dfb(rGD0X3W
zy}}x?;F(|@#hSdeg)T6cN>eDd5^Q$e^}~1+!I~M{9+M_B3^7-nOqlMXit8)y6(U<*
zr68H(=734;J>~^j+5R^Cf5dtjl^s{=P^A&B)a_Vyx|(h90o0l?bI)L%Sg&Zeu|+n`
zqXAD^f@!*rn%k_#x=>@Ovg>`kp?ZSuCJ|#_ki%m*ShUSj(UF-|@lfh6l)?4He!ZSQ
zSSd?nD8`w!k%=5$V}bi->|<lc?)}cl4DPl~I-O8D?qg<cK}yRi!C4uJ-TF0ijlIQc
zXabVm$@}*vmx&NE-ZNlB#H8b4R~QE%-x=~m?=~Y=))Z_Y#gI2+SYyXRnMzIgp^0SM
zIE#@pwig-!0e*0XC~5jx6%HhaO-#7Sdu*Dbtld<}iLQ(S;D&GujK?FP3vMR%k#A)z
zQlpSq8Efz5nKnz&h=jOY*fDeLc?*_Ba6~kGzXLK&A4OU+IRQ;l35vz^cLrGss0r6O
z&LnH$3?epT_jWvaU&0R64&oE;0y}XrC$51U?rxkT^Fqk+56$cxu*(!(J`k*@QrO2#
zf$dNz$64Mrmg5c|(>e?UCo!H$XAO(9w@hq2l^L~V)?v)zjQZ`dq<o;lR@>|&9B6Vf
z<Ry8G+b+%&R3LDxk@2kwSwB?+xP1h-l&vls$~eXm8(jjp)ch?_38s;Jl-MOiHKc89
zDNj{j@TAOEQX!Hd#+x2CJt?s|?pXw{v3@j?Ewob!Be|{=O-pPEp0QJ;AH1_S#r#q4
z$!|ySZ57eOiKb+r#MV^SQbVjUkK1KjeLeU<(Sb%Rv^y{#F05i8<qjp*;9ENzjrb&z
z9AZ+*5E!?-q*-JyCAKd5Ja)1v>nJhgyq%awBI}mfVmHSWW%j7pLikN((#+FN(VK+V
zRZC@T6`?nYvNBuS<_T8ox=`|h?In?Fb!CDztgC^_WK*Wumg_=UO^J*_@>$(>TfhN?
z6(kOUGhCTHl=3W5+lY*#p|k;nOt^-#g*S5{z|BH=Qi*+)_h~Z^!Tqro%%y?VbSu||
zOiH7m-qHNdrdE#0t#*8NPEdTN(dTgP*;zFdu9cEVT4$_!NXV_K%IqR^ETIjp+<r`o
z34^G#t>P`$&xx=ew=Rb4F~LdIWwtD@Na&k)c;ubHB&0A2LRXjfyiuG8>xP@SpRnmh
zSBXSk^<AJ7-os6!y>pl}7CXV+;QJUcHmijOo`Mcx?mEY>8)R;gC>Q6!94uO+8)4VJ
zCZljcqgl(A`(RhJ(BrrqAj+M*$>EeJlba6PDo>&@x%Q|`$h5~`+$uJiE>5<a+j{02
zL~5jUuF?8pgSTY6SS01zI9F1)xWxV89Ni7DZnY5eYzs<V;k~AW6WcyT7aG6D)2}13
z=EX^|U!6al<wGuIxDbn6!{?z3rFJ-gP355lnM2XI50pK`HnFD@MmLeklW}*MpP|Nd
zbR3GDJ;QImZ4>ZX$ZoM~q;>eo*ETmRrMT{=tN8`0IdZLO`$M5bu|ki<0i+&T5sfCY
zp;0b(!TsDA&5QVE(oFlKk*3B0Uv2pG=)*;BA_n*gnE9nbDV+a}^5Ns(yQD%Dacnj?
z3b*XOGP~R4(w8a2c!EI%3Tfv5Gz%pXF0zk;?#%31RR7>~!u&j^e8TU#GH%YvG-c)^
L%k^o>NbG+B>1OB{

diff --git a/lang/English/prof_reg.po b/lang/English/prof_reg.po
deleted file mode 100644
index 9409aa33..00000000
--- a/lang/English/prof_reg.po
+++ /dev/null
@@ -1,225 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Email legend"
-msgstr "Enter a valid email address"
-
-msgid "Email legend 2"
-msgstr "Enter and confirm a valid email address"
-
-msgid "Localisation legend"
-msgstr "Set your localisation options"
-
-msgid "Time zone"
-msgstr "Time zone"
-
-msgid "Time zone info"
-msgstr "For the forum to display times correctly you must select your local time zone. If Daylight Savings Time is in effect you should also check the option provided which will advance times by 1 hour."
-
-msgid "DST"
-msgstr "Daylight Savings Time is in effect (advance time by 1 hour)."
-
-msgid "Time format"
-msgstr "Time format"
-
-msgid "Date format"
-msgstr "Date format"
-
-msgid "Default"
-msgstr "Default"
-
-msgid "Language"
-msgstr "Language"
-
-msgid "Email setting info"
-msgstr "Select whether you want your email address to be viewable to other users or not and if you want other users to be able to send you email via the forum (form email) or not."
-
-msgid "Email setting 1"
-msgstr "Display your email address to other users."
-
-msgid "Email setting 2"
-msgstr "Hide your email address but allow form email."
-
-msgid "Email setting 3"
-msgstr "Hide your email address and disallow form email."
-
-msgid "Privacy options legend"
-msgstr "Set your privacy options"
-
-msgid "Confirm pass"
-msgstr "Confirm password"
-
-msgid "Username too short"
-msgstr "Usernames must be at least 2 characters long. Please choose another (longer) username."
-
-msgid "Username too long"
-msgstr "Usernames must not be more than 25 characters long. Please choose another (shorter) username."
-
-msgid "Username guest"
-msgstr "The username guest is reserved. Please choose another username."
-
-msgid "Username IP"
-msgstr "Usernames may not be in the form of an IP address. Please choose another username."
-
-msgid "Username reserved chars"
-msgstr "Usernames may not contain all the characters ', \" and [ or ] at once. Please choose another username."
-
-msgid "Username BBCode"
-msgstr "Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username."
-
-msgid "Banned username"
-msgstr "The username you entered is banned in this forum. Please choose another username."
-
-msgid "Pass too short"
-msgstr "Passwords must be at least 6 characters long. Please choose another (longer) password."
-
-msgid "Pass not match"
-msgstr "Passwords do not match."
-
-msgid "Banned email"
-msgstr "The email address you entered is banned in this forum. Please choose another email address."
-
-msgid "Dupe email"
-msgstr "Someone else is already registered with that email address. Please choose another email address."
-
-msgid "Sig too long"
-msgstr "Signatures cannot be longer than %1$s characters. Please reduce your signature by %2$s characters."
-
-msgid "Sig too many lines"
-msgstr "Signatures cannot have more than %s lines."
-
-msgid "Bad ICQ"
-msgstr "You entered an invalid ICQ UIN. Please go back and correct."
-
-msgid "UTC-12:00"
-msgstr "(UTC-12:00) International Date Line West"
-
-msgid "UTC-11:00"
-msgstr "(UTC-11:00) Niue, Samoa"
-
-msgid "UTC-10:00"
-msgstr "(UTC-10:00) Hawaii-Aleutian, Cook Island"
-
-msgid "UTC-09:30"
-msgstr "(UTC-09:30) Marquesas Islands"
-
-msgid "UTC-09:00"
-msgstr "(UTC-09:00) Alaska, Gambier Island"
-
-msgid "UTC-08:30"
-msgstr "(UTC-08:30) Pitcairn Islands"
-
-msgid "UTC-08:00"
-msgstr "(UTC-08:00) Pacific"
-
-msgid "UTC-07:00"
-msgstr "(UTC-07:00) Mountain"
-
-msgid "UTC-06:00"
-msgstr "(UTC-06:00) Central"
-
-msgid "UTC-05:00"
-msgstr "(UTC-05:00) Eastern"
-
-msgid "UTC-04:00"
-msgstr "(UTC-04:00) Atlantic"
-
-msgid "UTC-03:30"
-msgstr "(UTC-03:30) Newfoundland"
-
-msgid "UTC-03:00"
-msgstr "(UTC-03:00) Amazon, Central Greenland"
-
-msgid "UTC-02:00"
-msgstr "(UTC-02:00) Mid-Atlantic"
-
-msgid "UTC-01:00"
-msgstr "(UTC-01:00) Azores, Cape Verde, Eastern Greenland"
-
-msgid "UTC"
-msgstr "(UTC) Western European, Greenwich"
-
-msgid "UTC+01:00"
-msgstr "(UTC+01:00) Central European, West African"
-
-msgid "UTC+02:00"
-msgstr "(UTC+02:00) Eastern European, Central African"
-
-msgid "UTC+03:00"
-msgstr "(UTC+03:00) Eastern African"
-
-msgid "UTC+03:30"
-msgstr "(UTC+03:30) Iran"
-
-msgid "UTC+04:00"
-msgstr "(UTC+04:00) Moscow, Gulf, Samara"
-
-msgid "UTC+04:30"
-msgstr "(UTC+04:30) Afghanistan"
-
-msgid "UTC+05:00"
-msgstr "(UTC+05:00) Pakistan"
-
-msgid "UTC+05:30"
-msgstr "(UTC+05:30) India, Sri Lanka"
-
-msgid "UTC+05:45"
-msgstr "(UTC+05:45) Nepal"
-
-msgid "UTC+06:00"
-msgstr "(UTC+06:00) Bangladesh, Bhutan, Yekaterinburg"
-
-msgid "UTC+06:30"
-msgstr "(UTC+06:30) Cocos Islands, Myanmar"
-
-msgid "UTC+07:00"
-msgstr "(UTC+07:00) Indochina, Novosibirsk"
-
-msgid "UTC+08:00"
-msgstr "(UTC+08:00) Greater China, Australian Western, Krasnoyarsk"
-
-msgid "UTC+08:45"
-msgstr "(UTC+08:45) Southeastern Western Australia"
-
-msgid "UTC+09:00"
-msgstr "(UTC+09:00) Japan, Korea, Chita, Irkutsk"
-
-msgid "UTC+09:30"
-msgstr "(UTC+09:30) Australian Central"
-
-msgid "UTC+10:00"
-msgstr "(UTC+10:00) Australian Eastern"
-
-msgid "UTC+10:30"
-msgstr "(UTC+10:30) Lord Howe"
-
-msgid "UTC+11:00"
-msgstr "(UTC+11:00) Solomon Island, Vladivostok"
-
-msgid "UTC+11:30"
-msgstr "(UTC+11:30) Norfolk Island"
-
-msgid "UTC+12:00"
-msgstr "(UTC+12:00) New Zealand, Fiji, Magadan"
-
-msgid "UTC+12:45"
-msgstr "(UTC+12:45) Chatham Islands"
-
-msgid "UTC+13:00"
-msgstr "(UTC+13:00) Tonga, Phoenix Islands, Kamchatka"
-
-msgid "UTC+14:00"
-msgstr "(UTC+14:00) Line Islands"
diff --git a/lang/English/profile.mo b/lang/English/profile.mo
deleted file mode 100644
index 59c8f7e636ece29c768e9fb9322345b6a5d0afad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9585
zcmbW6dyFK<UB^3q;P{9k*yQ0PKwXmK?!xYD{77u?*~#tgy*AvQ*LS<VTrecPGc_}P
zH`6`t?zz1^_`?wq5f~6CLbeD=5D`yD3XzdOktL*vC{hGbhy(&DSP)*416KZuf*=x~
z@2{%oaqC2uTU+z(s;<Yce($P%{`Q-GE8)3Dc?;#gZcLI-gU{W<56|g+N%8~W8h8h|
z0rHo0_<1c@fcpLf_y+K!;17bIiueq88}&a2Uk`o})VQyMuLl1cd=2>RSih0M>i-&0
z?Qa4#-$8zE2k!x22c85)&tstG8-YIpei+m`9|J|#pMaY0bMgCMf|~blLH?5G`S~I6
z1rQRF{{gkmO?1+@H-PGYAlB~&Z=!w_{9*6}sC{pNcY;F@7A7AB`AeSUM|3_7ik{Da
zTJKp<<G%okj<12@$Mc}Z|0k&Zd^3LkE_f^TTOmsQ?f|v!TR@5GUQqKt2#O!8pyu5K
z)&D~ve@VuV=G_5B$1j7L_i2zNlHZH?Sx|g_4%9kd12ygiQ2Y5mQ2cr=lW3kd^P}<a
z0JZ*opw>MNYM+mQ;#&$bH0j3n8Wg`j0&4!JK#l)nQ0sgi)cCJNd>+&~FM`_N|AOj&
z3!OyI8$s>oZJ_!sf|`FBRR8tZelga&p!$~}QzgFuYQ87IH-o<eYM#FU#osT2qU*0g
zjr(U%`*{J>xbJ}cCAU%$-U;gaVNiN`AE<fG#`Z1nN2#}C{c5cL5-9$E9DF1Ax%mCd
z5&r>{-2Vd<JuiaV{|zwlX7IL%cYs>&PH^K@N#bJtahUQ9?N>pKdpncd11^E;-v&kh
zC9ndofj<wv2>yiHA(|zVUjbX-$HB+IFM}F)5aK2O`#|mgD9ESeEU52o@NHlPz8!oD
zWa{KOQ2o9NE`k3J$}hbR=83MmLCyC7cnCZNs^18de18}GBk(hz<g<nH{s#C#@Dt#-
zK+X5-Fjeb514=Ky3Z4i54unO?VT@UNe*~00o(E5X7r=wyr$Ev3B~bKy1(g1L9o!Fo
z6V(21dsCS2_24I|9|AuBehCzPZ$-(ZUkl(B@B#1u_^04u@bAGDP(+^vj)Cg`o8T(=
zN$|(OZ-7TZRel;+0iObY4O{~c{CJ?F0GTrRF!&_+3Gl7pVT3Ar&VbUNM?tOg7$`Ys
z@%uGU`}_zfzI`m#p9ZCme+WvSJ_~BT&x7K_UxAX(-+=1(kD%oIFQDl8Hi)Q`+g;GF
zL!j0<4XXVD2&u^sM6}7Tg3_Z;gNMOqL0Fpn6R35+13rPi-+(aG{}<Wh8u;6w*84Y5
z@{<yZf46||1rLDYvj@+Be+H`Gt5B8&@YSH?{VoualT}dP+p+x;C_1mk`cn~qAJl%H
z1s(VWQ2hPZh~EOmm+yiPfH$KAvWNGA;{SP2a_N9t?-I!NtS^w<Mfq9EaaDMvOZQPu
zQ|_m{gQDjViuNm;d6c3@@)B*@xAr8x7f&H&?)jNmYk@t=yC|q#a)ct=d7L61>5&d%
zO3At^@p(7cr#wdaNlHp-o_l$DI94#7<Oa%7iuV3NO7pyjm#a+$ly5&r*`%~7&9lgh
z^kX+RY=M_3;<27pisUFB>+u0hr}Zjbk)BAG4pQDp8B-i(hw>1mdAhvFXXug6AR6-l
zsyB~xy{7zJY`6>#C<O%-OD<4urfg6SQSPQlZ-0uiLeY~`9;95OpuUqwdbCZE{#KNd
zau4MM<^7cRQ8J3`<3@_?@fc-Dk!|Ve1V~2Ua(owjfFga<b1Hz@v2^?-<wKN<lw{@M
zGj44?S!vhVm9+NG57TVmDxcTMN@tkmE-z}Itc>eIZ&`QOb;pB2vO?#yjNm$c;A`J;
zrSD{=Z!^?B(_Xck_bl%g&HKRjeBNnl<I$i<_YAIFC#%x!f$t>8_*(CdJTLil4OPaK
zFO$`Nn)kd*14*%F`)EFm(yE$$caebABJXD9Fw*}$TEiN#XYO}gm@PD<bynog_Qqs&
z+OC<bhJ{r#+i~Mf5}+Y6*0$L~Bqg?timI-f&bD&=u#=W~miLkqCLdd{d9CVljQEPY
zieE4LUALWfVl6HZdXGmPq})kPW&@v`EXwVy)A6~hvzq#;vKWut&=0qLS@p9~L))JA
ziJaF~A4%5o83NYwE9oHXxE;S;WvJ8ExiiW8(rqS8&ZJfCw7<YEt6s_I73)5|;@$Qj
z%`YcsincK}SwDX^SuZ-iOzWbgU+B7C(6bAZ*~nQ05@fA66V2J85ol@}JoHtS_IyHn
zSK9`wtS6|4BeYB!Ta>#rO!fQWK_^VMk@m7&hG8s^HOV}(bt5h7EFHL@#K{Jl)^z2q
zk%Tojyq~R1)p-M+7dbOsr#~Cw7^W~9q`PtE*_MV3>CN<W<wm|_1MGUEEVOIHnvW-y
zi2%>}bdaY*pPci(tg1a9!Yt>JMsgm`Xs^b{Ni7mHsl#5}1x%<WO@Zao*JcXnvF+_?
z$m-o`TZt2Dt6sZd(V5uL`F^nzO@}p9$%gE0?p-pC4Z(=4-?XtBW`nF5QjNE(cA1TW
z)mYEE7-elH$a-#=US+mx?4Qc0^j9*!qj&URTv}^*i=1jcG%7La=^h{BJeS%i@X`S8
zF7=c1^)9lALbD1>&Jfdl+AIn;NK525d1JNAYCBoSJItY<_4+i3?5Vi7^2>R#lbd;n
z*ex@7*DcENu$r$;b#Kc&Fkj6PM@KqWYv|g-;X1rrc13ctTE`sR%w*~^DvKd|pKq0-
zxik-!H9MnyFay(!>?Y`Jav^w;1{Hx^Iv5l?82*K_$dQgb`^B_h6v_5(jd(}dRgWTW
z48~<TSj58(t7VsutXe&E_YoIfA3Bt~{SUdj4j<Wvfm}k*7uPzAkFq%WzU)r=wC?-z
z*s*;Z4{t86mQ-n9JdPt+cC;;?Ln+j?X_7Zv+$__)8pu`A=?p<>jFK*H`gAxmqkGV-
z>1a1BvAx|Y%HDhSt*@=0n67_U>z(@)Pq3@SO(Ng2tNqn_2_KN<M_jv~mX)s`+S)w1
zc>lDYR`2?9@kEZsVSCH&{_U)u5VGuizVH2ur+gmV>9X4>h}X5dt95_tUcQ9t;`w4+
zwmo4~Yb?94$Rtn5V}{UAE4S?l9kP8#b^yOzHS+DOo8d#!PN&2#xSg!-qqx%u;czE1
zU`Ci4$+c>z0;~D)W@yW;bsf}o3SZ?1k$Z`A@NTylyEb979iy$rnsNsxg_VU^k?zS~
zhRCpu_UyW7{oAZuIDf^LyS!jVHhGLtt(cuONlMW24$Zj3klkdJOI<Z&%HWRJM_RLE
z>P#KIB)k~s1Tf8ATD}sMJv5lBVypPOF@9bO&e$|3fM>lP!<aLF1#24LMVT!dSGgE@
z7h)BwG&|Yeb?rgczKqhCFa}wE89Feumic0vB<{KiMMZR;D}fndP7i}Nk%+1IL>AH&
zhFLP#ELn|5qoS-scMDJ~;_6b$gH$4kuvjc9x<+iUd`kseZe^y1AWH9gS$Dx*8u?!E
zF?p{=R14u<8~er+e_#ouWmVrhXKeIuHecK+O0p@;5#NXVLia3fG`2Juq4ilCYEx;B
z-QY7i@DSZZ7vv&ELs)x0>zr$wn{8v@)5=elGxZXec3416ik?>{V3Pz2jjBliZqkXE
zQ#Pq(^zp}o?>;mquL>I->>gH#QG#ky$Bt4=Qzqj>2$^UMVp1<BK@Zc8Z#B!<*b5<b
z-S5IA7=$@_IJv|UVLD7Y>OO7*2Z|!e{<YgS&K)l3^ZcH}NUi5k;0YBAroxkHZ8K(&
zw$}~>=3{dM7;8$9l~n6&2+@`zFS`Sk3@$jM#+n;1Hxc=qgOeqN1C+8QSx?JdgmklM
zv#hCEk;F=1VS4S4^wZ0;vAI1SF|HD<Wa?d`qns|OJaY%;XSn`S`K;v!H2A9{@>`f0
zb*c1=rGI=3j}=99Y{ItUbirjC-%Zt&VOI+;$J5Rz-X1@mz=(2w3DXk`9x)|uh4Y9!
zhn+-B?!*;KN6pg{LJ$_l6b~%2wpktr9Z7LBT|yv3!$d8t*tEygv#0aT-cwFRs*B&!
zS>{5Yh$f)~!lL&K*~o%@XcPjb+Q9*LwVk#vOM0e(%DIEMW{yB}`@vYUa7t?JIU1Sr
zO;1LlIz1R^6?PH>UdMOS@c<V(JuYSKvZ#t~?N-|DV$2ynZhxnrwfiv%40IYps(vx%
zpreS>c+*0Ow-N;3a%ailmffbzTOPrsqmfc*Q4u>8WrZi!DXVezh-t8s?pDZHhcxaA
zl$#E-O4*WjuB9R+QLTMR2sZT{=ZX=UUotT}Y2u0<-6m@MGNS+4CZVt+qVh!Z(AN<=
z^*h0t%I)MBk0Lf?gvKeyf)1Ej69F)yp^l>cY`8?Wr~$JYIMun9i~!y2m=~*XL|7>5
ztaBMU9iv?<o=oH6qCLiv^IG|eIYjX;CdRE~<MhVM;#i=m_KHg>dCnl7tWo#8Js9IU
zQ!-+*N=q;uf{>i#6f6?OQ)QDeS;*HONb<r7Js5V?N}2=nOsJHb%g4G*(0nmiSo&|%
z%FK4MsxK0C!cu1FQ`9t=(2P%^L1%CyEM^^Y6@iZ!pz%@e&$M(DPUP^d(VdCf)Nml}
zv0E4z6@q}J#7ibnb0pCn#k(!R#uw`-GT@ZK_(^Xi8f`^oA_8|8IPUA6bE9gFHy7Ej
z#6PD&1aak8;+D<xPRN;L?2Xg45T#t210(x{$01!uFy;K(6K+Mnh_{>-4}6-vxkzH*
z7OU7hIWmc)!bl#j6Bc4J7_&`y8FR@6M9*zXd(6pKYR@@AeZpDa)ZY|GDpWOxZUU6K
z<Y9W*o90MlWL{k)>C2h)HLhXyCUw)ymLwz_n$=vby-hAj=59<Hrjb%|M|0hki4C?J
zlNtAd+>_(s-X=LQy&_q++bC8~nj4?Vi;mPA^H(78<|}Qt85XWS%&mm{&HSltf{jkE
zMJBA;(;B?~gm>|~JaS-#P4d#6;{A!k%z9-yBA~bonPU1jNOQczt%{n1<tOXhstkPI
ztNUWttc@)>`<CTCh+#E&zNwI#OPJ-ETbPxZ&jhIEBsR)Or_A4QV8(G{)%sd<HQNtI
z3sdjFH2M0h4o+Q$fV;(6U6Mmcw~H~q`7Ti%O_8%2WS0qwNUfias*ns=_*A=`SQu^7
zchf5vkuE^(3P{<QwO3r48{L?5eUPkqq=9_eFH%C6Mmn~Fs6rm@*s)c@vdip9tPRC@
zEyu0+JT;sUTSIQ7(UlK@RQC;B2ob%-6WL~*W64|8?XW*gM%jSOb%#tyM`NSHt_kL;
zBeN<9Dv&ncZpS~{v@*wzU$AKx?7YzDNF-*4&9DiGP+C8;nW<f)S0PT?{M^Ek*O7D)
z47ouI_h=Xd7lmQ{**mo6XsRIb{f?G)!4{6#aD^+<^lCO74;y-HD|>@X-CWH{bRopF
zNRkv0ERiA1+kJ&3WYfkzHr@9lNB4Smz|^rwmwVI@RyZ&0p)FijuAm<A#t-%|u4r4{
zFwOX9V&2x=UEoPw2~HC^SF$2^$P-7m^-`CD!R<p+ybZAZO!yEk1nm@a-Sr?5V@oH*
zcrQ2~K;&@d?glN1P=B?Wb3IUDE!STQUc@M`*CA-((1bf^((hnjwsK&;Cu0tmhef>P
Wx5GrZMcnV?pYc-s!(#42@&5r|czkyN

diff --git a/lang/English/profile.po b/lang/English/profile.po
deleted file mode 100644
index bbd7f00b..00000000
--- a/lang/English/profile.po
+++ /dev/null
@@ -1,378 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Profile menu"
-msgstr "Profile menu"
-
-msgid "Section essentials"
-msgstr "Essentials"
-
-msgid "Section personal"
-msgstr "Personal"
-
-msgid "Section messaging"
-msgstr "Messaging"
-
-msgid "Section personality"
-msgstr "Personality"
-
-msgid "Section display"
-msgstr "Display"
-
-msgid "Section privacy"
-msgstr "Privacy"
-
-msgid "Section admin"
-msgstr "Administration"
-
-msgid "Username and pass legend"
-msgstr "Enter your username and password"
-
-msgid "Personal details legend"
-msgstr "Enter your personal details"
-
-msgid "Contact details legend"
-msgstr "Enter your messaging details"
-
-msgid "User activity"
-msgstr "User activity"
-
-msgid "Paginate info"
-msgstr "Enter the number of topics and posts you wish to view on each page."
-
-msgid "Pass key bad"
-msgstr "The specified password activation key was incorrect or has expired. Please re-request a new password. If that fails, contact the forum administrator at"
-
-msgid "Pass updated"
-msgstr "Your password has been updated. You can now login with your new password."
-
-msgid "Pass updated redirect"
-msgstr "Password updated."
-
-msgid "Wrong pass"
-msgstr "Wrong old password."
-
-msgid "Change pass"
-msgstr "Change password"
-
-msgid "Change pass legend"
-msgstr "Enter and confirm your new password"
-
-msgid "Old pass"
-msgstr "Old password"
-
-msgid "New pass"
-msgstr "New password"
-
-msgid "Confirm new pass"
-msgstr "Confirm new password"
-
-msgid "Pass info"
-msgstr "Passwords must be at least 6 characters long. Passwords are case sensitive."
-
-msgid "Email key bad"
-msgstr "The specified email activation key was incorrect or has expired. Please re-request change of email address. If that fails, contact the forum administrator at"
-
-msgid "Email updated"
-msgstr "Your email address has been updated."
-
-msgid "Activate email sent"
-msgstr "An email has been sent to the specified address with instructions on how to activate the new email address. If it doesn't arrive you can contact the forum administrator at"
-
-msgid "Email legend"
-msgstr "Enter your new email address"
-
-msgid "Email instructions"
-msgstr "An email will be sent to your new address with an activation link. You must click the link in the email you receive to activate the new address."
-
-msgid "Change email"
-msgstr "Change email address"
-
-msgid "New email"
-msgstr "New email"
-
-msgid "Avatars disabled"
-msgstr "The administrator has disabled avatar support."
-
-msgid "Too large ini"
-msgstr "The selected file was too large to upload. The server didn't allow the upload."
-
-msgid "Partial upload"
-msgstr "The selected file was only partially uploaded. Please try again."
-
-msgid "No tmp directory"
-msgstr "PHP was unable to save the uploaded file to a temporary location."
-
-msgid "No file"
-msgstr "You did not select a file for upload."
-
-msgid "Bad type"
-msgstr "The file you tried to upload is not of an allowed type. Allowed types are gif, jpeg and png."
-
-msgid "Too wide or high"
-msgstr "The file you tried to upload is wider and/or higher than the maximum allowed"
-
-msgid "Too large"
-msgstr "The file you tried to upload is larger than the maximum allowed"
-
-msgid "pixels"
-msgstr "pixels"
-
-msgid "bytes"
-msgstr "bytes"
-
-msgid "Move failed"
-msgstr "The server was unable to save the uploaded file. Please contact the forum administrator at"
-
-msgid "Unknown failure"
-msgstr "An unknown error occurred. Please try again."
-
-msgid "Avatar upload redirect"
-msgstr "Avatar uploaded."
-
-msgid "Avatar deleted redirect"
-msgstr "Avatar deleted."
-
-msgid "Avatar desc"
-msgstr "An avatar is a small image that will be displayed under your username in your posts. It must not be any bigger than"
-
-msgid "Upload avatar"
-msgstr "Upload avatar"
-
-msgid "Upload avatar legend"
-msgstr "Enter an avatar file to upload"
-
-msgid "Delete avatar"
-msgstr "Delete avatar"
-
-msgid "File"
-msgstr "File"
-
-msgid "Upload"
-msgstr "Upload"
-
-msgid "Forbidden title"
-msgstr "The title you entered contains a forbidden word. You must choose a different title."
-
-msgid "Profile redirect"
-msgstr "Profile updated."
-
-msgid "Users profile"
-msgstr "%s's profile"
-
-msgid "Username info"
-msgstr "Username: %s"
-
-msgid "Email info"
-msgstr "Email: %s"
-
-msgid "Posts info"
-msgstr "Posts: %s"
-
-msgid "Registered info"
-msgstr "Registered: %s"
-
-msgid "Last post info"
-msgstr "Last post: %s"
-
-msgid "Last visit info"
-msgstr "Last visit: %s"
-
-msgid "Show posts"
-msgstr "Show all posts"
-
-msgid "Show topics"
-msgstr "Show all topics"
-
-msgid "Show subscriptions"
-msgstr "Show all subscriptions"
-
-msgid "Realname"
-msgstr "Real name"
-
-msgid "Location"
-msgstr "Location"
-
-msgid "Website"
-msgstr "Website"
-
-msgid "Invalid website URL"
-msgstr "The website URL you entered is invalid."
-
-msgid "Website not allowed"
-msgstr "You are not allowed to add a website to your profile yet."
-
-msgid "Jabber"
-msgstr "Jabber"
-
-msgid "ICQ"
-msgstr "ICQ"
-
-msgid "MSN"
-msgstr "Microsoft Account"
-
-msgid "AOL IM"
-msgstr "AOL IM"
-
-msgid "Yahoo"
-msgstr "Yahoo! Messenger"
-
-msgid "Avatar"
-msgstr "Avatar"
-
-msgid "Signature"
-msgstr "Signature"
-
-msgid "Sig max size"
-msgstr "Max length: %s characters / Max lines: %s"
-
-msgid "Avatar legend"
-msgstr "Set your avatar display options"
-
-msgid "Avatar info"
-msgstr "An avatar is a small image that will be displayed with all your posts. You can upload an avatar by clicking the link below."
-
-msgid "Change avatar"
-msgstr "Change avatar"
-
-msgid "Signature legend"
-msgstr "Compose your signature"
-
-msgid "Signature info"
-msgstr "A signature is a small piece of text that is attached to your posts. In it, you can enter just about anything you like. Perhaps you would like to enter your favourite quote or your star sign. It's up to you! In your signature you can use BBCode if it is allowed in this particular forum. You can see the features that are allowed/enabled listed below whenever you edit your signature."
-
-msgid "Sig preview"
-msgstr "Current signature preview:"
-
-msgid "No sig"
-msgstr "No signature currently stored in profile."
-
-msgid "Signature quote/code/list/h"
-msgstr "The quote, code, list, and heading BBCodes are not allowed in signatures."
-
-msgid "Topics per page"
-msgstr "Topics"
-
-msgid "Posts per page"
-msgstr "Posts"
-
-msgid "Leave blank"
-msgstr "Leave blank to use forum default."
-
-msgid "Subscription legend"
-msgstr "Set your subscription options"
-
-msgid "Notify full"
-msgstr "Include a plain text version of new posts in subscription notification emails."
-
-msgid "Auto notify full"
-msgstr "Automatically subscribe to every topic you post in."
-
-msgid "Show smilies"
-msgstr "Show smilies as graphic icons."
-
-msgid "Show images"
-msgstr "Show images in posts."
-
-msgid "Show images sigs"
-msgstr "Show images in user signatures."
-
-msgid "Show avatars"
-msgstr "Show user avatars in posts."
-
-msgid "Show sigs"
-msgstr "Show user signatures."
-
-msgid "Style legend"
-msgstr "Select your preferred style"
-
-msgid "Styles"
-msgstr "Styles"
-
-msgid "Admin note"
-msgstr "Admin note"
-
-msgid "Pagination legend"
-msgstr "Enter your pagination options"
-
-msgid "Post display legend"
-msgstr "Set your options for viewing posts"
-
-msgid "Post display info"
-msgstr "If you are on a slow connection, disabling these options, particularly showing images in posts and signatures, will make pages load faster."
-
-msgid "Instructions"
-msgstr "When you update your profile, you will be redirected back to this page."
-
-msgid "Group membership legend"
-msgstr "Choose user group"
-
-msgid "Save"
-msgstr "Save"
-
-msgid "Set mods legend"
-msgstr "Set moderator access"
-
-msgid "Moderator in info"
-msgstr "Choose which forums this user should be allowed to moderate. Note: This only applies to moderators. Administrators always have full permissions in all forums."
-
-msgid "Update forums"
-msgstr "Update forums"
-
-msgid "Delete ban legend"
-msgstr "Delete (administrators only) or ban user"
-
-msgid "Delete user"
-msgstr "Delete user"
-
-msgid "Ban user"
-msgstr "Ban user"
-
-msgid "Confirm delete legend"
-msgstr "Important: read before deleting user"
-
-msgid "Confirm delete user"
-msgstr "Confirm delete user"
-
-msgid "Confirmation info"
-msgstr "Please confirm that you want to delete the user"
-
-msgid "Delete warning"
-msgstr "Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by this user, the posts can only be deleted manually at a later time."
-
-msgid "Delete posts"
-msgstr "Delete any posts and topics this user has made."
-
-msgid "Delete"
-msgstr "Delete"
-
-msgid "User delete redirect"
-msgstr "User deleted."
-
-msgid "User promote redirect"
-msgstr "User promoted."
-
-msgid "Group membership redirect"
-msgstr "Group membership saved."
-
-msgid "Update forums redirect"
-msgstr "Forum moderator rights updated."
-
-msgid "Ban redirect"
-msgstr "Redirecting …"
-
-msgid "No delete admin message"
-msgstr "Administrators cannot be deleted. In order to delete this user, you must first move him/her to a different user group."
diff --git a/lang/English/register.mo b/lang/English/register.mo
deleted file mode 100644
index f076b7ec197bfa69d341ed5f2390572d16f257ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3064
zcma)8O>Z1U5FH?VnGhg+BnKiD5+8|_nZ#BCW`iSQCq@<tG4Tcg2c+Ja+SwsJ-Anh3
zmqp^hg%e0{KwRL2#6LhBI3OX8hzkceAkIkq1|(i}&wB0PAVwL#?Vj$gS5>d7^T*)>
zpCx#X;(Z+N?|7fW`^9begXi?^NpdG}5qKByIpF=k^WFGzhg-k}%)beI0LZ}mfNh5#
z0Pn^4<8J&p@L`O<0v-f@+kO8Lcn`)uci(>n3b((2hk*y~i0h94#m<u*p6T#nhkf8C
zd?<jz|C<Am|98MgG5!H~7T<pZ{*Cb=I5z|yygNyb0X<Ooe+tZiUjknS{sc^cM?vxk
za2+V)w}77jKLX-katzLje@_Effj!_a!1sY?fUhE03iu)L6!1^r*TADNx(xgtC@FXZ
z?}K>d5r089_#?T1Yrz&E#7OueOgj&#247`DxJcd}lEEz=P)iQ&`X+gioJ!mu!z=zK
z7fQ#RtSOVTPS&g$R<0(lRi%@Q>~mU-u#{YqIjYRic0Y}6s8&rrO4hAwYjUk-pS)tp
z@Pr(fKG{^>#~tC9=8{d3T;r1RU=OQ`%5mPrIa`l4Hyj3$0hU(2VJB1g;Z##uL+qS&
ze!sbBY|rAMwiY&p8+8P(dv-?EOgS5GU9vMS+A+i7z2l|%xZA&}Tc>miuWR2UGY&()
zvUHB(&z0kbo>-y96XzB-oqZerr5i>18aog6Jz8hgjM%NNE^J=yr)v&F%%>Ms!#%=W
zdX2X$Svs4#tbCL9oibjl#yTvztW4RelG8q`de@2cf-36Dyf};|27}DH^8CV;jVqVt
z_7}6$3rKXs2B%KPFxv3D&8e|gl{rWGNIB2V%Ju$wx;$Se)`#rUOD4BPWy&5c52|K|
zNRQYoyq><qhLI%UxM`8wh8DBs><qrdVY+2om-AY*(W7YOKQu_HC>;Bnl0B)krV^AI
zn%b6Bo?{6$mK2$`9<U=jB#A+by`)S5y^YnN(p6Jo!b<ojm1k;=+J>stKyya@5o2oD
znq2ZB!p(JCFkv;t%~P=v+>$d37PZpY`o^Ec$XBHiKCnJ9B%?q8`&A<xA#Y{GepnN>
z1#WelkEpf|6gGyzp^@5#Ni(H)TK18Q<5D>ZJdUe84MW9=^L}JoU6ArOumj;j`eUV7
zmnEyL?S!yi$&NZ4UbnuXp+wNO4V)zF3PcQ^!A7XIjIN>^gvHA7&NLTcsxv4O4dHh*
zb{6Le;{uDfE0n*)tf+=i3{*zYQv>S3b18ihnJHt)L4|eUX%MJdqo-&pH;|e!Nc&oW
z=UBN$GAh62;C~&bG<t-%5+fVwWXT%{Pw*BT@Lkci(p3?g+e}ypT-*gU6}E<T^eE9V
zyd9%`O%NRldK-vgID<gNj7DW<T{rB6iu4xffV0+^?dgsEdFqf8StQaOOKfIMbEnJs
zEVNIt@1qwW03m5cH=t)jovIvup{-d{W+W{(u9l?b3R(tVB&phFoF)4hRT?58716c&
z5VCw^v3AGdy{$F&YRyG<(|p&jGm=1yQ3J7QTb77jWwNA?EZ+#4f%tZ01ZTqz=w=q*
z5t1-q5SRxT<j0&>5C^o~MOw-Onky`O^9*9=99#?M2Th@+As|5^u{`z^17g?F=l!n}
zls}3@qhKT*@s2@OU>_Mr>~rhns=|1{IDc+<RyMulLdar^>xCw8Y4!nICRH<v+Le1}
zV{_(HC%^C=`W1C+$uEl9p(9z;7H^B{;#u7V816K%JUJHxic0p7gc5uuwBXrHB&xgj
zqIEc1@1~N`7Cf6ug9y`Td)B~a#b^S%ib%<S6r%cf2Wr0tg3P0UXSXaA7IlX>;OGX|
z40^C(G@j7*x@%aXBw~k>qgEkGs1jv6ZzQubvt-NGEN4h>)3`#5>AvBfZMZcf9MD*c
zc3tBhkeKhL9=b;~KZ_ema4?<6T{tK`hSJ-bU6m_6uS`0w()Yy6)9Ldk{-0ZW%XA*Y
RSt^%8lU+JHHxkP~`3D%zqaXkP

diff --git a/lang/English/register.po b/lang/English/register.po
deleted file mode 100644
index 7cde2e42..00000000
--- a/lang/English/register.po
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "No new regs"
-msgstr "This forum is not accepting new registrations."
-
-msgid "Reg cancel redirect"
-msgstr "Registration cancelled."
-
-msgid "Forum rules"
-msgstr "Forum rules"
-
-msgid "Rules legend"
-msgstr "You must agree to the following in order to register"
-
-msgid "Registration flood"
-msgstr "A new user was registered with the same IP address as you within the last hour. To prevent registration flooding, at least an hour has to pass between registrations from the same IP. Sorry for the inconvenience."
-
-msgid "Agree"
-msgstr "Agree"
-
-msgid "Cancel"
-msgstr "Cancel"
-
-msgid "Register"
-msgstr "Register"
-
-msgid "Registration errors"
-msgstr "Registration errors"
-
-msgid "Registration errors info"
-msgstr "The following errors need to be corrected before you can register:"
-
-msgid "Username censor"
-msgstr "The username you entered contains one or more censored words. Please choose a different username."
-
-msgid "Username dupe 1"
-msgstr "Someone is already registered with the username"
-
-msgid "Username dupe 2"
-msgstr "The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username."
-
-msgid "Email not match"
-msgstr "Email addresses do not match."
-
-msgid "Reg email"
-msgstr "Thank you for registering. Your password has been sent to the specified address. If it doesn't arrive you can contact the forum administrator at"
-
-msgid "Reg complete"
-msgstr "Registration complete. You are now logged in."
-
-msgid "Desc 1"
-msgstr "Registration will grant you access to a number of features and capabilities otherwise unavailable. These functions include the ability to edit and delete posts, design your own signature that accompanies your posts and much more. If you have any questions regarding this forum you should ask an administrator."
-
-msgid "Desc 2"
-msgstr "Below is a form you must fill out in order to register. Once you are registered you should visit your profile and review the different settings you can change. The fields below only make up a small part of all the settings you can alter in your profile."
-
-msgid "Username legend"
-msgstr "Please enter a username between 2 and 25 characters long"
-
-msgid "Pass legend"
-msgstr "Please enter and confirm your chosen password"
-
-msgid "Pass info"
-msgstr "Passwords must be at least 6 characters long. Passwords are case sensitive."
-
-msgid "Email info"
-msgstr "You must enter a valid email address as your randomly generated password will be sent to that address."
-
-msgid "Confirm email"
-msgstr "Confirm email address"
diff --git a/lang/English/search.mo b/lang/English/search.mo
deleted file mode 100644
index 1f68f853019433a51326c94ee5a3f1f980c6b99e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4068
zcma);Pi$009LGlmh2r0eB7!ie<?rs6B34|ep%e;@P%7OTxrnpx&2}Gs``$V;+jSGp
zc)@s3qtR&8Xf)BpfEP8KOgvynO!T52NW93+7!M}Ki{IbOyxnfMRVO>|v-AHqzxn-s
zGuQf8yvC4*kvAe=y@9a_@Z3%KAicYSvDM&v;BDY1;631%;Jx5?;Ck>^@P3f3bnP2J
zY99joz+>R8;IuD42d+VR4!j*~f_H=GLF)G=cnkQEFMkH!f%0W=EqE2Y6Z{2S1^xk&
ze1ChczS+&Y4kUTEg7<+3K$3R`+zh55?fYfVPr(OJz5?RMuH!@d_zfhvRzfJ!M?Xk%
zZv;t>T_Ek}0Js4>=G#M%_N76R<3$iZ_BK8w?}s4G^SQ78+Lyoe?LUEcq5V2Y`~M3h
zeXho)iEBYxcQZJJv)cudeCP0?`Oky2zgNNS;6;$+_!-;+{tnXkeoVFw+yv6R!}vgz
zY}A*Jg4FL6Nb)`lZUSo{$#(%Hy}biI4qgTy1^@KSVenp*%iuWpI+z2mfdz04lsgC(
zK{CCwAn8BxY=ETab0DT<FM$}!-T?7qAK*j%FM?!;Uw~!s2M}9i!%)Wa;6aei^AflU
z`nm!>hVu8=6z!`IN-l!yLDEkN#E;G6L;5%m(mEGF90hyDm*4X3?}N17$G-g%Nb-IK
z_JiMmB=?UXmbZ1JcS@wMJ;<cj8<8oIF38@=riPJ8CQ4*ev_2(FWfRFyiR_!wpo9IA
zOmzNGhqZ?x5L>r<B7IPL1bHVi$xG>B<gLg9$Ye8=wjt9w>_Fzo*5^Um6WIaj=0Rlg
zEjriT$a!S)J+hA+GNoM()+P`-x)My-ribV|ssovXQ8LR$8>X5nuBA{xl^tsFa%!qv
zSJNgJn%7fpbWg2G>rr5<=VYsys!;b1=xON;YG{cC7q8G&>pLHoZ8^tN)u?4+9!<GP
zt#Hi!wf)(XPMWOO38}T1m0Tnt*NyU785ow;rAgdklPRx8*dLh4rr#_IN<urPQ+CSX
zb*XBR)=`?!2+XJh71a&Ob_#=L`=^nJL^q|9A@#HSa(c{4es@nbqF~MoYxQvkQn21y
zC(e=$^*EAxiI#5RdZ%0<;u4KGpEFM4Wg7hkrk&9^a3}*Rhy;)2ER2i!>PnoZ?Lw4f
z)ltHuq>?Tub`M+FSZl;4s>hO7$Ov@TKqWO=bvBPLF4d(im$N)J-DQDUDcf4A3@^9X
zv?CYRP1;2(NV`P3;wGxec1>n(b~qeFDpn$=;nwbEtOGdZO~nl*;ylc|ri(nO+oB%X
zv!A=aBij?cWrPpy*xxs$QnKOvM3{eCDzd{OAD6;Zr8;z|Z|Y<zKc-Mbeg3d8vdB@F
zKPBfQ>Y7y@7uw`Y3Kkj*lPYvNE|S>>{3KtJqPAd0en5n^C^=YhOO(rnRLwrocVgni
zk<R)<h24E)X=30n`BJNnMU8yH4Ax^2CHr|$6-rApGE*AQ@9XrV)hklvk0e1#L8!?0
zl_S#@q{wB`_e}n%Or&x$PNg!83?C}&E9^y!E9R%uh6?1ETcgO`BFl!hDGFsgfUFP=
zi}Gy)dRq=>%m=hP9L<{%VxP7A<vK1o%YP4NZrpN<x%$P?&c`;A=l_H`QoN0I)`WW^
zo^7_~cN%)j!j6)rp%NML#Kpn_E5V!)Gm%l{yus<E9U{4ol0fnnO%ubMI9Zq}bcIn~
z74wpprA&BDgwoCcmxryoA$#`nD#q&qgETxu08Wh?(}}Va;}JdWARmIs78^>El#zC!
z6$~0m!2siyoyEt#GB$+?MAGuRa7$UaP>=q&g@i#=pe>|{<o?Pc9S-736p8nGnkHL6
zRf{y#iKO0e>@Fdc4H1hvJJZ5xn~wOTlx4bm?f+Z<N!%Etfr;j&H8ET{)9zlP?K`uY
z>0C!kSfT6VVl_Krm0}OpZ#WC;Y&6r<04{q8H^QZ#>9Q`g##x&t9k&}Ob%9TjYH{=e
zuDf6qUB^bXd`I#`F$<S0WFZ`P#8@>=F%qh5R->TmbV&xsn`t8sc^u8bEZV0+Ge#BH
zE^u*oTIeur-1Pxj=XlM(3Y<SE``)3oV}w>LN5<bC568|<9(wZjk;`lcp-$B}EXCgZ
zolzuifltf2K={IJ^e%8Nr0XIe&ENvyqmzeo{NyR?v6ClDG+fC_1Up=y{{rulz}-TA
zeexxGTqL3<d0Me<;yW~}q&{bDR%?;2E|!mEXhv}u2o>5uEduh0og_Vn=q3^|eAfh3
zNX#ZG6b`ISYa1N2RhSHOT*PtKfcat=LS_SD`%JT2`ZSI(fMW&jfawPAl8<g%`&{!a
z3Ocd(d;5f_0jiph@L=;cnoVx6@azE~w2QeuHfJ}pfA6w!dP&$G{^IuU!=4M<8&2=V
F{STjGN0I;l

diff --git a/lang/English/search.po b/lang/English/search.po
deleted file mode 100644
index 0f2f643b..00000000
--- a/lang/English/search.po
+++ /dev/null
@@ -1,174 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "User search"
-msgstr "User search"
-
-msgid "No search permission"
-msgstr "You do not have permission to use the search feature."
-
-msgid "Search flood"
-msgstr "At least %s seconds have to pass between searches. Please wait %s seconds and try searching again."
-
-msgid "Search"
-msgstr "Search"
-
-msgid "Search criteria legend"
-msgstr "Enter your search criteria"
-
-msgid "Search info"
-msgstr "To search by keyword, enter a term or terms to search for. Separate terms with spaces. Use AND, OR and NOT to refine your search. To search by author enter the username of the author whose posts you wish to search for. Use wildcard character * for partial matches."
-
-msgid "Keyword search"
-msgstr "Keyword search"
-
-msgid "Author search"
-msgstr "Author search"
-
-msgid "Search in legend"
-msgstr "Select where to search"
-
-msgid "Search in info"
-msgstr "Choose in which forum you would like to search and if you want to search in topic subjects, message text or both."
-
-msgid "Search multiple forums info"
-msgstr "If no forums are selected, all forums will be searched."
-
-msgid "Forum search"
-msgstr "Forum"
-
-msgid "Search in"
-msgstr "Search in"
-
-msgid "Message and subject"
-msgstr "Message text and topic subject"
-
-msgid "Message only"
-msgstr "Message text only"
-
-msgid "Topic only"
-msgstr "Topic subject only"
-
-msgid "Sort by"
-msgstr "Sort by"
-
-msgid "Sort order"
-msgstr "Sort order"
-
-msgid "Search results legend"
-msgstr "Select how to view search results"
-
-msgid "Search results info"
-msgstr "You can choose how you wish to sort and show your results."
-
-msgid "Sort by post time"
-msgstr "Post time"
-
-msgid "Sort by author"
-msgstr "Author"
-
-msgid "Sort by subject"
-msgstr "Subject"
-
-msgid "Sort by forum"
-msgstr "Forum"
-
-msgid "Ascending"
-msgstr "Ascending"
-
-msgid "Descending"
-msgstr "Descending"
-
-msgid "Show as"
-msgstr "Show results as"
-
-msgid "Show as topics"
-msgstr "Topics"
-
-msgid "Show as posts"
-msgstr "Posts"
-
-msgid "Search results"
-msgstr "Search results"
-
-msgid "Quick search show_new"
-msgstr "New"
-
-msgid "Quick search show_recent"
-msgstr "Active"
-
-msgid "Quick search show_unanswered"
-msgstr "Unanswered"
-
-msgid "Quick search show_replies"
-msgstr "Posted"
-
-msgid "Quick search show_user_topics"
-msgstr "Topics by %s"
-
-msgid "Quick search show_user_posts"
-msgstr "Posts by %s"
-
-msgid "Quick search show_subscriptions"
-msgstr "Subscribed by %s"
-
-msgid "By keywords show as topics"
-msgstr "Topics with posts containing '%s'"
-
-msgid "By keywords show as posts"
-msgstr "Posts containing '%s'"
-
-msgid "By user show as topics"
-msgstr "Topics with posts by %s"
-
-msgid "By user show as posts"
-msgstr "Posts by %s"
-
-msgid "By both show as topics"
-msgstr "Topics with posts containing '%s', by %s"
-
-msgid "By both show as posts"
-msgstr "Posts containing '%s', by %s"
-
-msgid "No terms"
-msgstr "You have to enter at least one keyword and/or an author to search for."
-
-msgid "No hits"
-msgstr "Your search returned no hits."
-
-msgid "No user posts"
-msgstr "There are no posts by this user in this forum."
-
-msgid "No user topics"
-msgstr "There are no topics by this user in this forum."
-
-msgid "No subscriptions"
-msgstr "This user is currently not subscribed to any topics."
-
-msgid "No new posts"
-msgstr "There are no topics with new posts since your last visit."
-
-msgid "No recent posts"
-msgstr "No new posts have been made within the last 24 hours."
-
-msgid "No unanswered"
-msgstr "There are no unanswered posts in this forum."
-
-msgid "Go to post"
-msgstr "Go to post"
-
-msgid "Go to topic"
-msgstr "Go to topic"
diff --git a/lang/English/stopwords.txt b/lang/English/stopwords.txt
deleted file mode 100644
index 907a2600..00000000
--- a/lang/English/stopwords.txt
+++ /dev/null
@@ -1,175 +0,0 @@
-about
-after
-ago
-all
-almost
-along
-also
-any
-anybody
-anywhere
-are
-arent
-aren't
-around
-ask
-been
-before
-being
-between
-but
-came
-can
-cant
-can't
-come
-could
-couldnt
-couldn't
-did
-didnt
-didn't
-does
-doesnt
-doesn't
-dont
-don't
-each
-either
-else
-even
-every
-everybody
-everyone
-find
-for
-from
-get
-going
-gone
-got
-had
-has
-have
-havent
-haven't
-having
-her
-here
-hers
-him
-his
-how
-ill
-i'll
-i'm
-into
-isnt
-isn't
-itll
-it'll
-its
-it's
-ive
-i've
-just
-know
-less
-like
-make
-many
-may
-more
-most
-much
-must
-near
-never
-none
-nothing
-now
-off
-often
-once
-one
-only
-other
-our
-ours
-our's
-out
-over
-please
-rather
-really
-said
-see
-she
-should
-small
-some
-something
-sometime
-somewhere
-take
-than
-thank
-thanks
-that
-thats
-that's
-the
-their
-theirs
-them
-then
-there
-these
-they
-thing
-think
-this
-those
-though
-through
-thus
-too
-true
-two
-under
-until
-upon
-use
-very
-want
-was
-way
-well
-were
-what
-when
-where
-which
-who
-whom
-whose
-why
-will
-with
-within
-without
-would
-yes
-yet
-you
-your
-youre
-you're
-yours
-http
-https
-ftp
-www
-com
-net
-org
diff --git a/lang/English/topic.mo b/lang/English/topic.mo
deleted file mode 100644
index b5dbc93c8358f0e216f8001e84e2d1a83cfc13cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1487
zcmaiyyKfUg5XKi09x>q+-Y>BfkpkijK`4qY7@;_Eu$06maR_vr@7DIg`PSOqOJe>2
z3K}X9H5C<UC=dvV2GOLVp`)RsrJzCLo4a%3M1rht?zgX*`F3}{5A;4~XlGz&VZUI5
zu(cidp*`5i*ly4Pd%;G^Cb$b@1s(=h!2RG;un&9*_Jgm$z2GWH{_ns&;75?+eg-q(
z8n_SqmahK*$^U1%{u`uxJw1$}%lg1WU_VIl&Vdwf5TyK<LGm8~DQ+I5eI>Arvn_(O
z|20IBu2uXf{@axAK|0qb@DlhHJOKUy2f%)8rgNPK$!`chik}53?g&Wd%BADm>3Rty
zU5g;;@<4p7g&!obrF8x=Nb#S56z>^$0(=3I{~M6}KY*0?3rJ5!IZwil!KjgDEXA=7
zf^=u}PTh^}i{78&(%DYKI_*f>p}Xib%6l9}x=z99JxCkr!1cuEI10vXLIlDHHtG3>
z6_jkUsYqzUie>J2o)TK~K-TNRV@1t%RMoEXs~Al?+HgTmGt%R(42_b3X0u|M`xvoV
ziJ+xgE$~Ayj8T^GQKA*J8Fe)`vgNz1ti+NpmO<Hs7mu`1>`vsnk9Z5)(4|;&^woWB
zgc4rrIfq!j&{$|mW!QX29;;Ab?gmmr>O#1#n=Oi}_7SZdM9K-Qf>cdy^RN{Ub?(|2
zPrA9GkYC90;frG#$a*MTV--E?u29;Sq0I}zF%6-{$1~+p#mXxTF>g&cM%Wy4)*OyR
zTRT&9T~<Xop$;4)6*f&fVLfu{!m0?T*%guBaJ;4;-l`=js@1Gi^_!WQ;>_em{^9J^
zOdfYGLPTx1kkp73bEOqHemKV6hNHAFxrIu>8r|4O*=s^slc6g;Kdjq)wCbC6AvPCb
z=AJbrLZK3kWl0arhqI&E>sU#K*1U|AEAmMWn<q)w)-tmHSx5I}#2qEL8z}|-LA$H0
z@UGl6{7z-87a3l>+NMfNq;0OZxJanp?ClE9{$H&nh1n@KyQ|u$9~WBO*;Hv;1aDh+
Fe*tICQ3C(~

diff --git a/lang/English/topic.po b/lang/English/topic.po
deleted file mode 100644
index bca23a6f..00000000
--- a/lang/English/topic.po
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Post reply"
-msgstr "Post reply"
-
-msgid "Topic closed"
-msgstr "Topic closed"
-
-msgid "From"
-msgstr "From:"
-
-msgid "Promote user"
-msgstr "Promote user"
-
-msgid "IP address logged"
-msgstr "IP address logged"
-
-msgid "Note"
-msgstr "Note:"
-
-msgid "Posts topic"
-msgstr "Posts:"
-
-msgid "Registered topic"
-msgstr "Registered:"
-
-msgid "Replies"
-msgstr "Replies:"
-
-msgid "Website"
-msgstr "Website"
-
-msgid "Guest"
-msgstr "Guest"
-
-msgid "Online"
-msgstr "Online"
-
-msgid "Offline"
-msgstr "Offline"
-
-msgid "Last edit"
-msgstr "Last edited by"
-
-msgid "Report"
-msgstr "Report"
-
-msgid "Delete"
-msgstr "Delete"
-
-msgid "Edit"
-msgstr "Edit"
-
-msgid "Quote"
-msgstr "Quote"
-
-msgid "Is subscribed"
-msgstr "You are currently subscribed to this topic"
-
-msgid "Unsubscribe"
-msgstr "Unsubscribe"
-
-msgid "Subscribe"
-msgstr "Subscribe to this topic"
-
-msgid "Quick post"
-msgstr "Quick reply"
-
-msgid "Mod controls"
-msgstr "Moderator controls"
-
-msgid "New icon"
-msgstr "New post"
-
-msgid "Re"
-msgstr "Re:"
-
-msgid "Preview"
-msgstr "Preview"
diff --git a/lang/English/update.mo b/lang/English/update.mo
deleted file mode 100644
index 18d61df2ff3d7f864483f458fe703aa3bbddb701..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7678
zcmbW5TZ|-C8OIO0URXpF<f3>vyRys-PWSFC7k6hbz}{fuUdG*7kPu?3yH0l(R9E%Z
zshZi@CyDWaXwU?CFc>e1nivve)L@VYP0*O&i-`$F6L=sRg^*~}7<^FtednC2>6spM
zwKLWKIj5`6`L6%(JN4p~TOL<@4sgAnYs;IIIs?A?X1@6Bd5cn4f_noV2e&f*BzOh*
zAox!30(dp}2>3qmtKjwEkHB|>&x6;1e+>9~n7`(&N?ptRG$_B{0lovgH((6Djq$mF
ztDwm9Fevwb5xfk161)ohA$T453sB_y9VqMl4HWq<VKI^CT2OwU0k?pA!}uU5_nidg
zxfpyqcn*~3E`<5df$w4brGVc7*+M-FiankKWu4!E9{~RZid>hon2c`(Wqbq_{T~S9
z3KYE_1?Bl~g5rv2K(YIeL6Pe@@N)3ipzQm5Q0(w(7{3OJUayDomP?i5PhG|rrdL;k
z^85AR;w4IHu+8`!n}~hC28zDl2Sv`Gfj5CKf)8{5rEGRT<If_D$oU6Q?*AwF4e$zt
zdj|XgcpdkTFv<esM=-kR_bc!z@D=cT;Md=!)Zf7+7C8le3?Wv)C%_843g?P`kAULm
z$N72;{5JR*@Bq#byF3d%$9}&A#m-N#*+KAWQ1pHc6n*{$eh|DC<I8imfvBbqgO7qI
z!~6@N<i;!D7r<#A7P~(Uei!^XxB{MkuTr;ze+Ey3yGQ~9ej5BO_%iqa_*0VN9&kI!
zb{<>>zYP8b6hD6+p+%0zK#}V!pzQY~D1Lq#6np<9jGqU^k1vGrOCYXPFN31*U&HVJ
z05OaE$hy;9a^GGqR8u!|-NyAHE==xhydRw9n&G;EOYB7$yExea%BSVQeedQQbEutM
zH*yhrj#B`IS=2tRU0k?YX)f_6Zg6@7YMu)*Cq5q@n-QHp8pdJ=%;`RobMnE=?lToo
zY$Ns*8$xX^Mz?|T`3TodTzj}~;UW~>N9;To{;%Nx|7_>Fm5b0)>dttWWQi?{sLTtU
zXX&asJctTwO5M$~WmDKB&(vY}Z<%EMv43?^njzz&Fx^s{qR0!Y4p$5_9%hlKTbe?%
z)aJ7~$$I%4{FFu=ld2<88FeCS^eD1+B`@O18NbNHjXKLqqmE`#CpF`WOw4G%(@~K=
z+$d`5%A&gR(;}yy8z1ae3t3snq(>PqM`;r4Uc!dX7R^*Ge3(8FC0S{*DC-(E_P-t)
zYoq?Ab6&|4X4pZf=Ejp|#fh0kL!(aS&g2{X#_WdOnW;u`RMtYC6gw>zW`xg0Z|Bp~
zrc)(p?8aGa&eyZDQ?SfwbFNAX6RR`bA{mvss4^QAJX1zR8Fo=;s%{s>dR3aPhPhas
z^?oUHo#x$#!eeKhSjt1A<XQaSwmo#{a30rEH?wzD#<IELu4NO~E7i{|Eb3lf45JX8
zs(Gvv#cL5-%ia7MSEDrPuGy&hq0B{MtmGZMZr%=ZwDv#T<I_eD6U*k^L72WTuXI!x
zu~jCv^*48-Ovz^byhw~yU6WZtQKFqep7oM`MRH0OqDwWjs-J5tmxyCjzsReRRioUN
z3MV3hvPnOS%BnD`%tuLARaiqUrYw@Sj$sWuud|UG+5@}yY5(tm=}d1spyy`xZCxz#
z2TADGLfi^^%<E$&DhH-GbZG11sioH8f*}I6NINsHnQNUk%ZV^WJ#{>?WoxO3GMfsq
zaMST9>sQ2gYso~zu@&|HNGRxzp5LO=Y3D`%;MNlhCyuV|KiA&16%Hb8Sao&8rlmPw
z?i{7$(!M(I51d^(*4ndnpX}Z<MeAtR%_WxS^`1^rHiFD+lWqM(>n@WSM}G5qF*k8i
z>bdrw_AUJ4hpjVtRdh`t#d+;FQA>lwYFnC-262qWKDv`fMXa4Z>nL^Gf96!Z!|Inl
z^{sJg-7$BA)jM|cB|j{&b}vuUe5DB+t20Bu69^q4ILE;zo>%*!aw7ELraU~qe`okv
zFZ7(mqaqnb#VRc5y+c^(RTLJLs-ft1H0!5{9n8wK?naqTO|)!ynBPb&Q9Cxhs7gx>
z16HQ3@6J~Yg=1DHy$x$+1jxGeNSZ1oZSkzP;JUJ*^EVK36u}zAbu8kF1Wwwv-fxBn
z?=qz$a3|o3*uqIICaT~mryTs}>x#{FoM%&|ez1Z@`jCm;wtpw9XyL_q?YxYlMPNIP
zVwvbAo90N~ti(+&GTQ1+2#<|wqeyH7oxPY==R94kB-Axo=HgXuZ(b}Xi=tYB_f5gp
zL+_wk-$4B%e8}!=W^dGJs>MoD4)n?(fxM2T)%in*^h#tgw=JVIHE~-4C`1IM76T1k
zb(&>AOu?Te?Y)DX$)`M(wMT=|lq-^L6;>E$#4{g1P65)>Q5Nfgp+f3`1Y3riY87e;
zXJ9U;1#z%mNmqhh%@A=-gs{$!L-DaWPgg=I^1LkeZ&qG=uAewJhg4Wc!a?>r%_jPZ
zu@t)(4Y0AaAS9}oC79p(lDU$k>8y@=68q530Q(LjN}LGQ1RVKVbz$=;l|ae*#!AkQ
z%RO7SEgH`_UaYfXO|v5RfzaKoJCg-{?0P$)Z|M8PkBuZgo2RH>)u>-Yt~=<-!u8E_
z?cME$e<lpGMm^JYXg2am3asy3X4;|M^1_U@WJ~0Zalr@|xe8kAFWhMJx<d(07skrF
z=uI%=j<MyO>>;+7kzLYy2#qDgm2Yx<@D-*HnX_rET~eU#s<z26Nu$EuC!uC%CAlTK
zhVuCKPTtwBC5pFqo_(sby{!%z*jwxwY3Q^RYLmij5i8fdh_2C*d62KI7kzMd2YF6>
zN3i``v*)*pNKILyt<N?Kxm+UThE7<*A*#xpP^X)b{)<v!r8yVN4cU{3F-2fYGpy;>
z$61@IBWb)At9AIge0Gf6<c=6y;sTG-tQUFL#55rEKm7qEB6<i7vQ<(54>_|($bqU(
zWl8{Mh|S1kE~au%>2@UbEmQy$#O%(X68bi|0R4Iv-YCcs$LGxUIl>UxL$|x`P%^4f
z{ZJEm9mAdOgn$_;<ZG)Vbn(J$G&z#Cjaot`l8baXLWDjC^KLc7qOKjfT{sakoQ3<O
z1LoPnKy%?_(CpdpOj|pOs9fV6s82SWypzBrW^kXQZ0u6gm~b-w9E}VaBvN^@-C?ID
z_pO-|XUQQza@f@5E(&{obfws>(uh$%crm+<ooF^a-7KMBIO$*@8VF%Q(JW3Z?cAzQ
z1D_hikVH)50~xsBvNmM5bb)>aDMG9w#~7AK6GD!}tt3aKIVSHU+6I+y?5fZ}N$aTZ
zUOI6+1bSFlQk0O`td*m1b3AS;pX6GEE^;XIzLsZ^!-YAKM+*;AM4h}Ub<1htVwIE+
zDoadicWy{mx2bi<xw^hAoLD?{dg;!SOSC0*>lQdm>P2iyT6M9Rn9|jl#k&`YlI4WX
zM<SE{hLR!Hah23oBRM2E6~(U9Sl1h)hon8{l`+Oghd7jmK%COz`wSM!ZqE0ir4cDI
zy>RAKYtNor_qOIFzH70DhHhL8<Rpb^W%td?k+<U5I<s|@uDIOB&F)x_c!4f`)I000
zB@aKls^&Z|@$Jm+tl$+RafVS=2{Yo<@$8lWh;s=ye?xu37`K8H79{EA6@eA#AQ0d<
zQ?%t|KAA~G+j0_fe7<j8vmK?vIs}dM3av74@g&-c)v!w7V%gcTT2it&ZR+^>ef_~<
z;vg@YHMgkKu2lF!q^9d5{ft^zqm(B3U|nAd5Tq8fW5h<Bvvh}&Na@WpLMpW!0-!=C
zb8x2fHa+KT-L=)0Cxlai*oA{5#wobVC#xh+pDb1DUMP$itTC&!rgoDT4Q<WcF5xqZ
z?+)7@d-JeTNT(S*Ca)oyn(J(9rG7~+Nt*e4BljkwX}@^;(WS>-)s4hi-l`2CkshL(
zx?3OkCya?ezGnKI_R$dXyU~uNppaJH3(-Kl)#V_txC=mD7zh!$q>y6fogjfPOeI@y
zay)JP;g6T@w(;;K#HDX>t4e1RJQemud@8f+e}a|WTSG^!6#Tl{I+iB#XheLo5%sN}
z_Ahj1*fJa=ef~oIu=|GgM_3i*q%6p8LfO7YlaV{Om16PwJ<xxDeo}67Ib^X&DxwRQ
zEpnQVS@t4Cnq0E3GOjNdx~n<U>Zw`n`@{P+8To*mq;rlt|6TAiA<NLV&cclis*AE<
zDG7Sto7EE%5Oo*9BJxTrG_xCSbTJkuJzk-B%6E<;(UDb}Q;`^MN=J}BO;8~{=9-F}
z;aV3&w_UBhGZSi2?PXo5PisCMGoW-kQnPT%Q2H}hSa#pKw!C%k;U?A%aWd_SswrmP
zcy%cvwH~`KdR=+>w|?1sHoWTdMr?A|af6g#dC6c6O*W~--Zdjcb!ls!u-yT@IdtX<
zHKiSkJ0=ZO<yp8bRI%=5qGR>?C?;=?+V#>qZss*oIK~k*wbs52+`?~&ggnw(aWa!)
u=vY&HP<M$0O{g0}4#cx-cu|C0G4*=@*Ht;<QUB*VO^IC30{`3F&3^;$i$!<<

diff --git a/lang/English/update.po b/lang/English/update.po
deleted file mode 100644
index 6611a073..00000000
--- a/lang/English/update.po
+++ /dev/null
@@ -1,195 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "Update"
-msgstr "Update FluxBB"
-
-msgid "Update message"
-msgstr "Your FluxBB database is out-of-date and must be upgraded in order to continue. If you are the board administrator, please follow the instructions below to complete the upgrade."
-
-msgid "Note"
-msgstr "Note:"
-
-msgid "Members message"
-msgstr "This process is for board administrators only. If you are a member there is nothing to worry about - the forums will be back shortly!"
-
-msgid "Administrator only"
-msgstr "This step is for the board administrator only!"
-
-msgid "Database password info"
-msgstr "To perform the database update please enter the database password with which FluxBB was installed. If you cannot remember, this is stored in your 'config.php' file."
-
-msgid "Database password note"
-msgstr "If you are running SQLite (and hence have no database password) please use the database file name instead. This must exactly match the database file name given in your configuration file."
-
-msgid "Database password"
-msgstr "Database password"
-
-msgid "Maintenance"
-msgstr "Maintenance"
-
-msgid "Maintenance message info"
-msgstr "The message that will be displayed to users during the updating process. This text will not be parsed like regular posts and thus may contain HTML."
-
-msgid "Maintenance message"
-msgstr "Maintenance message"
-
-msgid "You are running error"
-msgstr "You are running %1$s version %2$s. FluxBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue."
-
-msgid "Version mismatch error"
-msgstr "Version mismatch. The database '%s' doesn't seem to be running a FluxBB database schema supported by this update script."
-
-msgid "Invalid file error"
-msgstr "Invalid database file name. When using SQLite the database file name must be entered exactly as it appears in your '%s'"
-
-msgid "Invalid password error"
-msgstr "Invalid database password. To upgrade FluxBB you must enter your database password exactly as it appears in your '%s'"
-
-msgid "No password error"
-msgstr "No database password provided"
-
-msgid "Script runs error"
-msgstr "It appears the update script is already being ran by someone else. If this is not the case, please manually delete the file '%s' and try again"
-
-msgid "No update error"
-msgstr "Your forum is already as up-to-date as this script can make it"
-
-msgid "Intro 1"
-msgstr "This script will update your forum database. The update procedure might take anything from a second to hours depending on the speed of the server and the size of the forum database. Don't forget to make a backup of the database before continuing."
-
-msgid "Intro 2"
-msgstr "Did you read the update instructions in the documentation? If not, start there."
-
-msgid "No charset conversion"
-msgstr "<strong>IMPORTANT!</strong> FluxBB has detected that this PHP environment does not have support for the encoding mechanisms required to do UTF-8 conversion from character sets other than ISO-8859-1. What this means is that if the current character set is not ISO-8859-1, FluxBB won't be able to convert your forum database to UTF-8 and you will have to do it manually. Instructions for doing manual charset conversion can be found in the update instructions."
-
-msgid "Enable conversion"
-msgstr "<strong>Enable conversion:</strong> When enabled this update script will, after it has made the required structural changes to the database, convert all text in the database from the current character set to UTF-8. This conversion is required if you're upgrading from version 1.2."
-
-msgid "Current character set"
-msgstr "<strong>Current character set:</strong> If the primary language in your forum is English, you can leave this at the default value. However, if your forum is non-English, you should enter the character set of the primary language pack used in the forum. <em>Getting this wrong can corrupt your database so don't just guess!</em> Note: This is required even if the old database is UTF-8."
-
-msgid "Charset conversion"
-msgstr "Charset conversion"
-
-msgid "Enable conversion label"
-msgstr "<strong>Enable conversion</strong> (perform database charset conversion)."
-
-msgid "Current character set label"
-msgstr "Current character set"
-
-msgid "Current character set info"
-msgstr "Accept default for English forums otherwise the character set of the primary language pack."
-
-msgid "Start update"
-msgstr "Start update"
-
-msgid "Error converting users"
-msgstr "Error converting users"
-
-msgid "Error info 1"
-msgstr "There was an error converting some users. This can occur when converting from FluxBB v1.2 if multiple users have registered with very similar usernames, for example \"bob\" and \"böb\"."
-
-msgid "Error info 2"
-msgstr "Below is a list of users who failed to convert. Please choose a new username for each user. Users who are renamed will automatically be sent an email alerting them of the change."
-
-msgid "New username"
-msgstr "New username"
-
-msgid "Required"
-msgstr "(Required)"
-
-msgid "Correct errors"
-msgstr "The following errors need to be corrected:"
-
-msgid "Rename users"
-msgstr "Rename users"
-
-msgid "Successfully updated"
-msgstr "Your forum database was successfully updated. You may now %s."
-
-msgid "go to index"
-msgstr "go to the forum index"
-
-msgid "Unable to lock error"
-msgstr "Unable to write update lock. Please make sure PHP has write access to the directory '%s' and no-one else is currently running the update script."
-
-msgid "Converting"
-msgstr "Converting %s …"
-
-msgid "Converting item"
-msgstr "Converting %1$s %2$s …"
-
-msgid "Preparsing item"
-msgstr "Preparsing %1$s %2$s …"
-
-msgid "Rebuilding index item"
-msgstr "Rebuilding index for %1$s %2$s"
-
-msgid "ban"
-msgstr "ban"
-
-msgid "categories"
-msgstr "categories"
-
-msgid "censor words"
-msgstr "censor words"
-
-msgid "configuration"
-msgstr "configuration"
-
-msgid "forums"
-msgstr "forums"
-
-msgid "groups"
-msgstr "groups"
-
-msgid "post"
-msgstr "post"
-
-msgid "report"
-msgstr "report"
-
-msgid "topic"
-msgstr "topic"
-
-msgid "user"
-msgstr "user"
-
-msgid "signature"
-msgstr "signature"
-
-msgid "Username too short error"
-msgstr "Usernames must be at least 2 characters long. Please choose another (longer) username."
-
-msgid "Username too long error"
-msgstr "Usernames must not be more than 25 characters long. Please choose another (shorter) username."
-
-msgid "Username Guest reserved error"
-msgstr "The username guest is reserved. Please choose another username."
-
-msgid "Username IP format error"
-msgstr "Usernames may not be in the form of an IP address. Please choose another username."
-
-msgid "Username bad characters error"
-msgstr "Usernames may not contain all the characters ', \" and [ or ] at once. Please choose another username."
-
-msgid "Username BBCode error"
-msgstr "Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username."
-
-msgid "Username duplicate error"
-msgstr "Someone is already registered with the username %s. The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username."
diff --git a/lang/English/userlist.mo b/lang/English/userlist.mo
deleted file mode 100644
index 74d6b6eaf7013ca1abd4270b4dcbf6b1c58fd784..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 898
zcmY+C!H&}~5QYORAc6!4t{jHjf=EgchbpBAwzO!a-KAo?2qX?T@gy~*c4WK2-Z>(1
zLgG>2%meTSh&!*qf#1z;yIA@(p7D%llHb3sZhVQb&V%b<3NC_AAgpiT0{9L>{0F!K
zeu5bM2EqRWE`h&batgWN4EC>1N6}^2*Ra=M8`x0y5%w$WXV{mpn@C1UbQXlQ0m4k@
zf^%YpJ5drvkLsEhj;)LK44IM|<GhOw5TR0ONi|ojWgDohSv2j|v9QIAlrGItz*yh9
zlX_uAos5m0yNq<Rblu=?pW5wUQ`3zBb#M0Li8XJy@X5AJo?`@MbVg$qe#UldE1o=^
zCPNDs@#L}aoDpKlGk&K+>TzgCIG;?d(5@EVSS0NTT`fe#$&|(X#Eo=c$hp!F%eF<H
zr^Z$f;@$1t(Yk*(y%P_O_N;O1VS}cgKln~l3#I#1%!GC92M5z}(p%?+?j_q~qzfaJ
zt}^Q7%C82=h;{rTdBU1)JLAN#RGzwNFTID8)=l=!!WKMidt}r$2@*wni+K)7RsxNK
zHUhZt-&+BfqO}^0Fux_SJkVm!<P9B3RvH{=*$HNOPRo*zQK~wW<%cOvXS^;h71xpq
zp($rPh|*JD3;i}FbR>vH?^P`eVUdH;MG-E!MWIn6tXHC@x$wn|T^jAL#zh+nqunM6
kX~}Y>912+y>h%AgyZln6Nw@-!5&yR%`FM+T$u^Dt0lG5+eE<Le

diff --git a/lang/English/userlist.po b/lang/English/userlist.po
deleted file mode 100644
index 4f7d81df..00000000
--- a/lang/English/userlist.po
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Project-Id-Version: FeatherBB\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: FeatherBB <admin@featherbb.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.8.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid "User find legend"
-msgstr "Find and sort users"
-
-msgid "User search info"
-msgstr "Enter a username to search for and/or a user group to filter by. The username field can be left blank. Use the wildcard character * for partial matches."
-
-msgid "User sort info"
-msgstr "Sort users by name, date registered or number of posts and in ascending/descending order."
-
-msgid "User group"
-msgstr "User group"
-
-msgid "No of posts"
-msgstr "Number of posts"
-
-msgid "All users"
-msgstr "All"
diff --git a/vendor/akrabat/rka-slim-controller/LICENSE b/vendor/akrabat/rka-slim-controller/LICENSE
new file mode 100644
index 00000000..8ac2d43e
--- /dev/null
+++ b/vendor/akrabat/rka-slim-controller/LICENSE
@@ -0,0 +1,26 @@
+Copyright (c) 2014, Rob Allen (rob@akrabat.com)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    * The name of Rob Allen may not be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/akrabat/rka-slim-controller/README.md b/vendor/akrabat/rka-slim-controller/README.md
new file mode 100644
index 00000000..dfc37eb5
--- /dev/null
+++ b/vendor/akrabat/rka-slim-controller/README.md
@@ -0,0 +1,96 @@
+# RKA Slim Controller
+
+An extension to [Slim Framework][1] that allows you use to dynamically
+instantiated controllers with action methods wherever you would use a
+closure when routing.
+
+The controller can optionally be loaded from Slim's DI container,
+allowing you to inject dependencies as required.
+
+[1]: http://www.slimframework.com/
+
+## Installation
+
+    composer require akrabat/rka-slim-controller
+
+
+## Usage
+
+Use the string format `{controller class name}:{action method name}`
+wherever you would usually use a closure:
+
+e.g.
+
+    $app = new \RKA\Slim();
+    $app->get('/hello:name', 'App\IndexController:home');
+
+
+You can also register the controller with Slim's DI container:
+
+    $app = new \RKA\Slim();
+
+    $app->container->singleton('App\IndexController', function ($container) {
+        // Retrieve any required dependencies from the container and
+        // inject into the constructor of the controller
+
+        return new \App\IndexController();
+    });
+
+    $app->get('/', 'App\IndexController:index');
+
+
+## Controller class methods
+
+*RKA Slim Controller* will call the controller's `setApp()`, `setRequest()`
+and `setResponse()` methods if they exist and populate appropriately. It will
+then call the controller's `init()`` method.
+
+Hence, a typical controller may look like:
+
+    <?php
+    namespace App;
+
+    class IndexController
+    {
+        // Optional properties
+        protected $app;
+        protected $request;
+        protected $response;
+
+        public function index()
+        {
+            echo "This is the home page";
+        }
+
+        public function hello($name)
+        {
+            echo "Hello, $name";
+        }
+
+        // Optional setters
+        public function setApp($app)
+        {
+            $this->app = $app;
+        }
+
+        public function setRequest($request)
+        {
+            $this->request = $request;
+        }
+
+        public function setResponse($response)
+        {
+            $this->response = $response;
+        }
+
+        // Init
+        public function init()
+        {
+            // do things now that app, request and response are set.
+        }
+    }
+
+
+## Example project
+
+Look at [slim-di](https://github.com/akrabat/slim-di).
diff --git a/vendor/akrabat/rka-slim-controller/RKA/Slim.php b/vendor/akrabat/rka-slim-controller/RKA/Slim.php
new file mode 100644
index 00000000..100c5e42
--- /dev/null
+++ b/vendor/akrabat/rka-slim-controller/RKA/Slim.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Override of \Slim\Slim to add the ability to dynamically create a controller
+ * and call an action method on it.
+ *
+ * Copyright 2014-2015 Rob Allen (rob@akrabat.com).
+ * License: New-BSD
+ */
+namespace RKA;
+
+class Slim extends \Slim\Slim
+{
+    /**
+     * Add a route as per the parent method, additionally supporting the syntax
+     * "{controller class name}:{action method name}" as the last argument which
+     * will be converted to a closure that instantiates the controller (or gets
+     * from container) and then calls the method on it.
+     *
+     * @inheritdoc
+     *
+     * @param   array (See notes above)
+     * @return  \Slim\Route
+     */
+    public function mapRoute($args)
+    {
+        $callable = array_pop($args);
+        if (is_string($callable) && substr_count($callable, ':', 1) == 1) {
+            $callable = $this->createControllerClosure($callable);
+        }
+        $args[] = $callable;
+
+        return parent::mapRoute($args);
+    }
+
+    /**
+     * Create a closure that instantiates (or gets from container) and then calls
+     * the action method.
+     *
+     * Also if the methods exist on the controller class, call setApp(), setRequest()
+     * and setResponse() passing in the appropriate object.
+     *
+     * @param  string $name controller class name and action method name separated by a colon
+     * @return closure
+     */
+    protected function createControllerClosure($name)
+    {
+        list($controllerName, $actionName) = explode(':', $name);
+
+        // Create a callable that will find or create the controller instance
+        // and then execute the action
+        $app = $this;
+        $callable = function () use ($app, $controllerName, $actionName) {
+
+            // Try to fetch the controller instance from Slim's container
+            if ($app->container->has($controllerName)) {
+                $controller = $app->container->get($controllerName);
+            } else {
+                // not in container, assume it can be directly instantiated
+                $controller = new $controllerName($app);
+            }
+
+            // Set the app, request and response into the controller if we can
+            if (method_exists($controller, 'setApp')) {
+                $controller->setApp($app);
+            }
+            if (method_exists($controller, 'setRequest')) {
+                $controller->setRequest($app->request);
+            }
+            if (method_exists($controller, 'setResponse')) {
+                $controller->setResponse($app->response);
+            }
+
+            // Call init in case the controller wants to do something now that
+            // it has an app, request and response.
+            if (method_exists($controller, 'init')) {
+                $controller->init();
+            }
+
+            return call_user_func_array(array($controller, $actionName), func_get_args());
+        };
+
+        return $callable;
+    }
+}
diff --git a/vendor/akrabat/rka-slim-controller/composer.json b/vendor/akrabat/rka-slim-controller/composer.json
new file mode 100644
index 00000000..ce454395
--- /dev/null
+++ b/vendor/akrabat/rka-slim-controller/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "akrabat/rka-slim-controller",
+    "description": "Dynamically instantiated controller classes for Slim Framework",
+    "keywords": [
+        "slim", "controller"
+    ],
+    "homepage": "http://github.com/akrabat/rka-slim-controller",
+    "type": "library",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Rob Allen",
+            "email": "rob@akrabat.com",
+            "homepage": "http://akrabat.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.4",
+        "slim/slim": "~2.4"
+    },
+    "autoload": {
+        "psr-4": {
+            "RKA\\": "RKA"
+        }
+    }
+}
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 958ecee3..5c77336e 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -18,6 +18,7 @@
     'FeatherBB\\Email' => $baseDir . '/include/classes/email.class.php',
     'FeatherBB\\Error' => $baseDir . '/include/classes/error.class.php',
     'FeatherBB\\Hooks' => $baseDir . '/include/classes/hooks.class.php',
+    'FeatherBB\\Lister' => $baseDir . '/include/classes/lister.class.php',
     'FeatherBB\\Loader' => $baseDir . '/include/classes/autoload.class.php',
     'FeatherBB\\Plugin' => $baseDir . '/include/classes/plugin.class.php',
     'FeatherBB\\Search' => $baseDir . '/include/classes/search.class.php',
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index b7fc0125..b00084d3 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -6,4 +6,6 @@
 $baseDir = dirname($vendorDir);
 
 return array(
+    'Slim' => array($vendorDir . '/slim/slim'),
+    '' => array($baseDir . '/'),
 );
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 4f5d91ac..c5f4765d 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -6,5 +6,6 @@
 $baseDir = dirname($vendorDir);
 
 return array(
+    'RKA\\' => array($vendorDir . '/akrabat/rka-slim-controller/RKA'),
     'Plugins\\' => array('/plugins'),
 );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index fe51488c..e09b84fe 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1 +1,95 @@
-[]
+[
+    {
+        "name": "slim/slim",
+        "version": "2.6.2",
+        "version_normalized": "2.6.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/slimphp/Slim.git",
+            "reference": "20a02782f76830b67ae56a5c08eb1f563c351a37"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/slimphp/Slim/zipball/20a02782f76830b67ae56a5c08eb1f563c351a37",
+            "reference": "20a02782f76830b67ae56a5c08eb1f563c351a37",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0"
+        },
+        "suggest": {
+            "ext-mcrypt": "Required for HTTP cookie encryption"
+        },
+        "time": "2015-03-08 18:41:17",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Slim": "."
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Josh Lockhart",
+                "email": "info@joshlockhart.com",
+                "homepage": "http://www.joshlockhart.com/"
+            }
+        ],
+        "description": "Slim Framework, a PHP micro framework",
+        "homepage": "http://github.com/codeguy/Slim",
+        "keywords": [
+            "microframework",
+            "rest",
+            "router"
+        ]
+    },
+    {
+        "name": "akrabat/rka-slim-controller",
+        "version": "2.0.1",
+        "version_normalized": "2.0.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/akrabat/rka-slim-controller.git",
+            "reference": "7115f082a91af83fd22755e8d2d27e9fcffc636b"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/akrabat/rka-slim-controller/zipball/7115f082a91af83fd22755e8d2d27e9fcffc636b",
+            "reference": "7115f082a91af83fd22755e8d2d27e9fcffc636b",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.4",
+            "slim/slim": "~2.4"
+        },
+        "time": "2015-01-07 09:54:54",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "RKA\\": "RKA"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Rob Allen",
+                "email": "rob@akrabat.com",
+                "homepage": "http://akrabat.com"
+            }
+        ],
+        "description": "Dynamically instantiated controller classes for Slim Framework",
+        "homepage": "http://github.com/akrabat/rka-slim-controller",
+        "keywords": [
+            "controller",
+            "slim"
+        ]
+    }
+]
diff --git a/vendor/slim/slim/.gitignore b/vendor/slim/slim/.gitignore
new file mode 100644
index 00000000..485dee64
--- /dev/null
+++ b/vendor/slim/slim/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/vendor/slim/slim/.travis.yml b/vendor/slim/slim/.travis.yml
new file mode 100644
index 00000000..c70c36a9
--- /dev/null
+++ b/vendor/slim/slim/.travis.yml
@@ -0,0 +1,11 @@
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+
+script: phpunit --coverage-text
diff --git a/vendor/slim/slim/CONTRIBUTING.md b/vendor/slim/slim/CONTRIBUTING.md
new file mode 100644
index 00000000..9bbb6b17
--- /dev/null
+++ b/vendor/slim/slim/CONTRIBUTING.md
@@ -0,0 +1,20 @@
+# How to Contribute
+
+## Pull Requests
+
+1. Fork the Slim Framework repository
+2. Create a new branch for each feature or improvement
+3. Send a pull request from each feature branch to the **develop** branch
+
+It is very important to separate new features or improvements into separate feature branches, and to send a
+pull request for each branch. This allows me to review and pull in new features or improvements individually.
+
+## Style Guide
+
+All pull requests must adhere to the [PSR-2 standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md).
+
+## Unit Testing
+
+All pull requests must be accompanied by passing unit tests and complete code coverage. The Slim Framework uses phpunit for testing.
+
+[Learn about PHPUnit](https://github.com/sebastianbergmann/phpunit/)
diff --git a/vendor/slim/slim/LICENSE b/vendor/slim/slim/LICENSE
new file mode 100644
index 00000000..ec361cbc
--- /dev/null
+++ b/vendor/slim/slim/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2012 Josh Lockhart
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vendor/slim/slim/README.markdown b/vendor/slim/slim/README.markdown
new file mode 100644
index 00000000..2bbe264d
--- /dev/null
+++ b/vendor/slim/slim/README.markdown
@@ -0,0 +1,208 @@
+# Slim Framework
+
+[![Build Status](https://travis-ci.org/slimphp/Slim.svg?branch=master)](https://travis-ci.org/slimphp/Slim)
+
+Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs.
+Slim is easy to use for both beginners and professionals. Slim favors cleanliness over terseness and common cases
+over edge cases. Its interface is simple, intuitive, and extensively documented — both online and in the code itself.
+Thank you for choosing the Slim Framework for your next project. I think you're going to love it.
+
+## Features
+
+* Powerful router
+    * Standard and custom HTTP methods
+    * Route parameters with wildcards and conditions
+    * Route redirect, halt, and pass
+    * Route middleware
+* Resource Locator and DI container
+* Template rendering with custom views
+* Flash messages
+* Encrypt cookie data
+* HTTP caching
+* Logging with custom log writers
+* Error handling and debugging
+* Middleware and hook architecture
+* Simple configuration
+
+## Getting Started
+
+### Install
+
+You may install the Slim Framework with Composer (recommended) or manually.
+
+[Read how to install Slim](http://docs.slimframework.com/#Installation)
+
+### System Requirements
+
+You need **PHP >= 5.3.0**. If you use encrypted cookies, you'll also need the `mcrypt` extension.
+
+### Hello World Tutorial
+
+Instantiate a Slim application:
+
+    $app = new \Slim\Slim();
+
+Define a HTTP GET route:
+
+    $app->get('/hello/:name', function ($name) {
+        echo "Hello, $name";
+    });
+
+Run the Slim application:
+
+    $app->run();
+
+### Setup your web server
+
+#### Apache
+
+Ensure the `.htaccess` and `index.php` files are in the same public-accessible directory. The `.htaccess` file
+should contain this code:
+
+    RewriteEngine On
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^ index.php [QSA,L]
+
+Additionally, make sure your virtual host is configured with the AllowOverride option so that the .htaccess rewrite rules can be used:
+
+   AllowOverride All
+
+#### Nginx
+
+The nginx configuration file should contain this code (along with other settings you may need) in your `location` block:
+
+    try_files $uri $uri/ /index.php?$args;
+
+This assumes that Slim's `index.php` is in the root folder of your project (www root).
+
+#### HipHop Virtual Machine for PHP
+
+Your HipHop Virtual Machine configuration file should contain this code (along with other settings you may need).
+Be sure you change the `ServerRoot` setting to point to your Slim app's document root directory.
+
+    Server {
+        SourceRoot = /path/to/public/directory
+    }
+
+    ServerVariables {
+        SCRIPT_NAME = /index.php
+    }
+
+    VirtualHost {
+        * {
+            Pattern = .*
+            RewriteRules {
+                    * {
+                            pattern = ^(.*)$
+                            to = index.php/$1
+                            qsa = true
+                    }
+            }
+        }
+    }
+
+#### lighttpd ####
+
+Your lighttpd configuration file should contain this code (along with other settings you may need). This code requires
+lighttpd >= 1.4.24.
+
+    url.rewrite-if-not-file = ("(.*)" => "/index.php/$0")
+
+This assumes that Slim's `index.php` is in the root folder of your project (www root).
+
+#### IIS
+
+Ensure the `Web.config` and `index.php` files are in the same public-accessible directory. The `Web.config` file should contain this code:
+
+    <?xml version="1.0" encoding="UTF-8"?>
+    <configuration>
+        <system.webServer>
+            <rewrite>
+                <rules>
+                    <rule name="slim" patternSyntax="Wildcard">
+                        <match url="*" />
+                        <conditions>
+                            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+                            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+                        </conditions>
+                        <action type="Rewrite" url="index.php" />
+                    </rule>
+                </rules>
+            </rewrite>
+        </system.webServer>
+    </configuration>
+
+#### Google App Engine
+
+Two steps are required to successfully run your Slim application on Google App Engine. First, ensure the `app.yaml` file includes a default handler to `index.php`:
+
+    application: your-app-name
+    version: 1
+    runtime: php
+    api_version: 1
+    
+    handlers:
+    # ...
+    - url: /.*
+      script: public_html/index.php
+
+Next, edit your `index.php` file so Slim knows about the incoming URI:
+
+    $app = new Slim();
+    
+    // Google App Engine doesn't set $_SERVER['PATH_INFO']
+    $app->environment['PATH_INFO'] = $_SERVER['REQUEST_URI'];
+    
+    // ...
+    $app->run();
+
+   
+## Documentation
+
+<http://docs.slimframework.com/>
+
+## How to Contribute
+
+### Pull Requests
+
+1. Fork the Slim Framework repository
+2. Create a new branch for each feature or improvement
+3. Send a pull request from each feature branch to the **develop** branch
+
+It is very important to separate new features or improvements into separate feature branches, and to send a pull
+request for each branch. This allows me to review and pull in new features or improvements individually.
+
+### Style Guide
+
+All pull requests must adhere to the [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md) standard.
+
+### Unit Testing
+
+All pull requests must be accompanied by passing unit tests and complete code coverage. The Slim Framework uses
+`phpunit` for testing.
+
+[Learn about PHPUnit](https://github.com/sebastianbergmann/phpunit/)
+
+## Community
+
+### Forum and Knowledgebase
+
+Visit Slim's official forum and knowledge base at <http://help.slimframework.com> where you can find announcements,
+chat with fellow Slim users, ask questions, help others, or show off your cool Slim Framework apps.
+
+### Twitter
+
+Follow [@slimphp](http://www.twitter.com/slimphp) on Twitter to receive news and updates about the framework.
+
+## Author
+
+The Slim Framework is created and maintained by [Josh Lockhart](http://www.joshlockhart.com). Josh is a senior
+web developer at [New Media Campaigns](http://www.newmediacampaigns.com/). Josh also created and maintains
+[PHP: The Right Way](http://www.phptherightway.com/), a popular movement in the PHP community to introduce new
+PHP programmers to best practices and good information.
+
+## License
+
+The Slim Framework is released under the MIT public license.
+
+<http://www.slimframework.com/license>
diff --git a/Slim/Environment.php b/vendor/slim/slim/Slim/Environment.php
similarity index 100%
rename from Slim/Environment.php
rename to vendor/slim/slim/Slim/Environment.php
diff --git a/Slim/Exception/Pass.php b/vendor/slim/slim/Slim/Exception/Pass.php
similarity index 100%
rename from Slim/Exception/Pass.php
rename to vendor/slim/slim/Slim/Exception/Pass.php
diff --git a/Slim/Exception/Stop.php b/vendor/slim/slim/Slim/Exception/Stop.php
similarity index 100%
rename from Slim/Exception/Stop.php
rename to vendor/slim/slim/Slim/Exception/Stop.php
diff --git a/Slim/Helper/Set.php b/vendor/slim/slim/Slim/Helper/Set.php
similarity index 100%
rename from Slim/Helper/Set.php
rename to vendor/slim/slim/Slim/Helper/Set.php
diff --git a/Slim/Http/Cookies.php b/vendor/slim/slim/Slim/Http/Cookies.php
similarity index 100%
rename from Slim/Http/Cookies.php
rename to vendor/slim/slim/Slim/Http/Cookies.php
diff --git a/Slim/Http/Headers.php b/vendor/slim/slim/Slim/Http/Headers.php
similarity index 99%
rename from Slim/Http/Headers.php
rename to vendor/slim/slim/Slim/Http/Headers.php
index 06fd71d9..c5e08f23 100644
--- a/Slim/Http/Headers.php
+++ b/vendor/slim/slim/Slim/Http/Headers.php
@@ -32,7 +32,7 @@
  */
 namespace Slim\Http;
 
-/**
+ /**
   * HTTP Headers
   *
   * @package Slim
diff --git a/Slim/Http/Request.php b/vendor/slim/slim/Slim/Http/Request.php
similarity index 100%
rename from Slim/Http/Request.php
rename to vendor/slim/slim/Slim/Http/Request.php
diff --git a/Slim/Http/Response.php b/vendor/slim/slim/Slim/Http/Response.php
similarity index 99%
rename from Slim/Http/Response.php
rename to vendor/slim/slim/Slim/Http/Response.php
index 245305be..48c76d8c 100644
--- a/Slim/Http/Response.php
+++ b/vendor/slim/slim/Slim/Http/Response.php
@@ -344,7 +344,7 @@ public function deleteCookie($name, $settings = array())
      * @param string $url    The redirect destination
      * @param int    $status The redirect HTTP status code
      */
-    public function redirect($url, $status = 302)
+    public function redirect ($url, $status = 302)
     {
         $this->setStatus($status);
         $this->headers->set('Location', $url);
diff --git a/Slim/Http/Util.php b/vendor/slim/slim/Slim/Http/Util.php
similarity index 100%
rename from Slim/Http/Util.php
rename to vendor/slim/slim/Slim/Http/Util.php
diff --git a/Slim/Log.php b/vendor/slim/slim/Slim/Log.php
similarity index 99%
rename from Slim/Log.php
rename to vendor/slim/slim/Slim/Log.php
index 51a92178..13cb8259 100644
--- a/Slim/Log.php
+++ b/vendor/slim/slim/Slim/Log.php
@@ -305,7 +305,7 @@ public function log($level, $object, $context = array())
     {
         if (!isset(self::$levels[$level])) {
             throw new \InvalidArgumentException('Invalid log level supplied to function');
-        } elseif ($this->enabled && $this->writer && $level <= $this->level) {
+        } else if ($this->enabled && $this->writer && $level <= $this->level) {
             if (is_array($object) || (is_object($object) && !method_exists($object, "__toString"))) {
                 $message = print_r($object, true);
             } else {
diff --git a/Slim/LogWriter.php b/vendor/slim/slim/Slim/LogWriter.php
similarity index 100%
rename from Slim/LogWriter.php
rename to vendor/slim/slim/Slim/LogWriter.php
diff --git a/Slim/Middleware.php b/vendor/slim/slim/Slim/Middleware.php
similarity index 100%
rename from Slim/Middleware.php
rename to vendor/slim/slim/Slim/Middleware.php
diff --git a/Slim/Middleware/ContentTypes.php b/vendor/slim/slim/Slim/Middleware/ContentTypes.php
similarity index 97%
rename from Slim/Middleware/ContentTypes.php
rename to vendor/slim/slim/Slim/Middleware/ContentTypes.php
index 02d9c5c6..fcc22421 100644
--- a/Slim/Middleware/ContentTypes.php
+++ b/vendor/slim/slim/Slim/Middleware/ContentTypes.php
@@ -32,7 +32,7 @@
  */
 namespace Slim\Middleware;
 
-/**
+ /**
   * Content Types
   *
   * This is middleware for a Slim application that intercepts
@@ -91,7 +91,7 @@ public function call()
      * @param  string $contentType
      * @return mixed
      */
-    protected function parse($input, $contentType)
+    protected function parse ($input, $contentType)
     {
         if (isset($this->contentTypes[$contentType]) && is_callable($this->contentTypes[$contentType])) {
             $result = call_user_func($this->contentTypes[$contentType], $input);
@@ -116,7 +116,7 @@ protected function parseJson($input)
     {
         if (function_exists('json_decode')) {
             $result = json_decode($input, true);
-            if (json_last_error() === JSON_ERROR_NONE) {
+            if(json_last_error() === JSON_ERROR_NONE) {
                 return $result;
             }
         }
diff --git a/Slim/Middleware/Flash.php b/vendor/slim/slim/Slim/Middleware/Flash.php
similarity index 99%
rename from Slim/Middleware/Flash.php
rename to vendor/slim/slim/Slim/Middleware/Flash.php
index 62176cf3..593082f8 100644
--- a/Slim/Middleware/Flash.php
+++ b/vendor/slim/slim/Slim/Middleware/Flash.php
@@ -32,7 +32,7 @@
  */
 namespace Slim\Middleware;
 
-/**
+ /**
   * Flash
   *
   * This is middleware for a Slim application that enables
@@ -206,4 +206,7 @@ public function count()
     {
         return count($this->getMessages());
     }
+
+
+
 }
diff --git a/Slim/Middleware/MethodOverride.php b/vendor/slim/slim/Slim/Middleware/MethodOverride.php
similarity index 99%
rename from Slim/Middleware/MethodOverride.php
rename to vendor/slim/slim/Slim/Middleware/MethodOverride.php
index 788e09a5..1298767c 100644
--- a/Slim/Middleware/MethodOverride.php
+++ b/vendor/slim/slim/Slim/Middleware/MethodOverride.php
@@ -32,7 +32,7 @@
  */
 namespace Slim\Middleware;
 
-/**
+ /**
   * HTTP Method Override
   *
   * This is middleware for a Slim application that allows traditional
diff --git a/Slim/Middleware/PrettyExceptions.php b/vendor/slim/slim/Slim/Middleware/PrettyExceptions.php
similarity index 96%
rename from Slim/Middleware/PrettyExceptions.php
rename to vendor/slim/slim/Slim/Middleware/PrettyExceptions.php
index 8bed30d7..aafda0f9 100644
--- a/Slim/Middleware/PrettyExceptions.php
+++ b/vendor/slim/slim/Slim/Middleware/PrettyExceptions.php
@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.6.3
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE
@@ -86,10 +86,10 @@ protected function renderBody(&$env, $exception)
     {
         $title = 'Slim Application Error';
         $code = $exception->getCode();
-        $message = htmlspecialchars($exception->getMessage());
+        $message = $exception->getMessage();
         $file = $exception->getFile();
         $line = $exception->getLine();
-        $trace = str_replace(array('#', "\n"), array('<div>#', '</div>'), htmlspecialchars($exception->getTraceAsString()));
+        $trace = str_replace(array('#', "\n"), array('<div>#', '</div>'), $exception->getTraceAsString());
         $html = sprintf('<h1>%s</h1>', $title);
         $html .= '<p>The application could not run because of the following error:</p>';
         $html .= '<h2>Details</h2>';
diff --git a/Slim/Middleware/SessionCookie.php b/vendor/slim/slim/Slim/Middleware/SessionCookie.php
similarity index 100%
rename from Slim/Middleware/SessionCookie.php
rename to vendor/slim/slim/Slim/Middleware/SessionCookie.php
diff --git a/Slim/Route.php b/vendor/slim/slim/Slim/Route.php
similarity index 98%
rename from Slim/Route.php
rename to vendor/slim/slim/Slim/Route.php
index 6c6fa778..2127e626 100644
--- a/Slim/Route.php
+++ b/vendor/slim/slim/Slim/Route.php
@@ -165,7 +165,7 @@ public function setCallable($callable)
         if (is_string($callable) && preg_match('!^([^\:]+)\:([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)$!', $callable, $matches)) {
             $class = $matches[1];
             $method = $matches[2];
-            $callable = function () use ($class, $method) {
+            $callable = function() use ($class, $method) {
                 static $obj = null;
                 if ($obj === null) {
                     $obj = new $class;
@@ -288,7 +288,7 @@ public function getHttpMethods()
     public function appendHttpMethods()
     {
         $args = func_get_args();
-        if (count($args) && is_array($args[0])) {
+        if(count($args) && is_array($args[0])){
             $args = $args[0];
         }
         $this->methods = array_merge($this->methods, $args);
@@ -301,7 +301,7 @@ public function appendHttpMethods()
     public function via()
     {
         $args = func_get_args();
-        if (count($args) && is_array($args[0])) {
+        if(count($args) && is_array($args[0])){
             $args = $args[0];
         }
         $this->methods = array_merge($this->methods, $args);
diff --git a/Slim/Router.php b/vendor/slim/slim/Slim/Router.php
similarity index 100%
rename from Slim/Router.php
rename to vendor/slim/slim/Slim/Router.php
diff --git a/Slim/Slim.php b/vendor/slim/slim/Slim/Slim.php
similarity index 96%
rename from Slim/Slim.php
rename to vendor/slim/slim/Slim/Slim.php
index d0918792..4a835956 100644
--- a/Slim/Slim.php
+++ b/vendor/slim/slim/Slim/Slim.php
@@ -6,7 +6,7 @@
  * @copyright   2011 Josh Lockhart
  * @link        http://www.slimframework.com
  * @license     http://www.slimframework.com/license
- * @version     2.6.3
+ * @version     2.6.1
  * @package     Slim
  *
  * MIT LICENSE
@@ -54,7 +54,7 @@ class Slim
     /**
      * @const string
      */
-    const VERSION = '2.6.3';
+    const VERSION = '2.6.1';
 
     /**
      * @var \Slim\Helper\Set
@@ -99,10 +99,10 @@ class Slim
     );
 
     /********************************************************************************
-     * PSR-0 Autoloader
-     *
-     * Do not use if you are using Composer to autoload dependencies.
-     *******************************************************************************/
+    * PSR-0 Autoloader
+    *
+    * Do not use if you are using Composer to autoload dependencies.
+    *******************************************************************************/
 
     /**
      * Slim PSR-0 autoloader
@@ -141,8 +141,8 @@ public static function registerAutoloader()
     }
 
     /********************************************************************************
-     * Instantiation and Configuration
-     *******************************************************************************/
+    * Instantiation and Configuration
+    *******************************************************************************/
 
     /**
      * Constructor
@@ -353,8 +353,8 @@ public function config($name, $value = null)
     }
 
     /********************************************************************************
-     * Application Modes
-     *******************************************************************************/
+    * Application Modes
+    *******************************************************************************/
 
     /**
      * Get application mode
@@ -390,8 +390,8 @@ public function configureMode($mode, $callable)
     }
 
     /********************************************************************************
-     * Logging
-     *******************************************************************************/
+    * Logging
+    *******************************************************************************/
 
     /**
      * Get application log
@@ -403,8 +403,8 @@ public function getLog()
     }
 
     /********************************************************************************
-     * Routing
-     *******************************************************************************/
+    * Routing
+    *******************************************************************************/
 
     /**
      * Add GET|POST|PUT|PATCH|DELETE route
@@ -662,8 +662,8 @@ protected function callErrorHandler($argument = null)
     }
 
     /********************************************************************************
-     * Application Accessors
-     *******************************************************************************/
+    * Application Accessors
+    *******************************************************************************/
 
     /**
      * Get a reference to the Environment object
@@ -733,8 +733,8 @@ public function view($viewClass = null)
     }
 
     /********************************************************************************
-     * Rendering
-     *******************************************************************************/
+    * Rendering
+    *******************************************************************************/
 
     /**
      * Render a template
@@ -758,8 +758,8 @@ public function render($template, $data = array(), $status = null)
     }
 
     /********************************************************************************
-     * HTTP Caching
-     *******************************************************************************/
+    * HTTP Caching
+    *******************************************************************************/
 
     /**
      * Set Last-Modified HTTP Response Header
@@ -847,8 +847,8 @@ public function expires($time)
     }
 
     /********************************************************************************
-     * HTTP Cookies
-     *******************************************************************************/
+    * HTTP Cookies
+    *******************************************************************************/
 
     /**
      * Set HTTP cookie to be sent with the HTTP response
@@ -981,8 +981,8 @@ public function deleteCookie($name, $path = null, $domain = null, $secure = null
     }
 
     /********************************************************************************
-     * Helper Methods
-     *******************************************************************************/
+    * Helper Methods
+    *******************************************************************************/
 
     /**
      * Get the absolute path to this Slim application's root directory
@@ -1118,8 +1118,8 @@ public function redirectTo($route, $params = array(), $status = 302){
     }
 
     /********************************************************************************
-     * Flash Messages
-     *******************************************************************************/
+    * Flash Messages
+    *******************************************************************************/
 
     /**
      * Set flash message for subsequent request
@@ -1166,8 +1166,8 @@ public function flashData()
     }
 
     /********************************************************************************
-     * Hooks
-     *******************************************************************************/
+    * Hooks
+    *******************************************************************************/
 
     /**
      * Assign hook
@@ -1255,8 +1255,8 @@ public function clearHooks($name = null)
     }
 
     /********************************************************************************
-     * Middleware
-     *******************************************************************************/
+    * Middleware
+    *******************************************************************************/
 
     /**
      * Add middleware
@@ -1278,8 +1278,8 @@ public function add(\Slim\Middleware $newMiddleware)
     }
 
     /********************************************************************************
-     * Runner
-     *******************************************************************************/
+    * Runner
+    *******************************************************************************/
 
     /**
      * Run
@@ -1372,7 +1372,6 @@ public function call()
             $this->response()->write(ob_get_clean());
         } catch (\Exception $e) {
             if ($this->config('debug')) {
-                ob_end_clean();
                 throw $e;
             } else {
                 try {
@@ -1386,8 +1385,8 @@ public function call()
     }
 
     /********************************************************************************
-     * Error Handling and Debugging
-     *******************************************************************************/
+    * Error Handling and Debugging
+    *******************************************************************************/
 
     /**
      * Convert errors into ErrorException objects
diff --git a/Slim/View.php b/vendor/slim/slim/Slim/View.php
similarity index 100%
rename from Slim/View.php
rename to vendor/slim/slim/Slim/View.php
diff --git a/vendor/slim/slim/composer.json b/vendor/slim/slim/composer.json
new file mode 100644
index 00000000..0becfe68
--- /dev/null
+++ b/vendor/slim/slim/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "slim/slim",
+    "type": "library",
+    "description": "Slim Framework, a PHP micro framework",
+    "keywords": ["microframework","rest","router"],
+    "homepage": "http://github.com/codeguy/Slim",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Josh Lockhart",
+            "email": "info@joshlockhart.com",
+            "homepage": "http://www.joshlockhart.com/"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0"
+    },
+    "suggest": {
+        "ext-mcrypt": "Required for HTTP cookie encryption"
+    },
+    "autoload": {
+        "psr-0": { "Slim": "." }
+    }
+}
diff --git a/vendor/slim/slim/index.php b/vendor/slim/slim/index.php
new file mode 100644
index 00000000..355a8f57
--- /dev/null
+++ b/vendor/slim/slim/index.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Step 1: Require the Slim Framework
+ *
+ * If you are not using Composer, you need to require the
+ * Slim Framework and register its PSR-0 autoloader.
+ *
+ * If you are using Composer, you can skip this step.
+ */
+require 'Slim/Slim.php';
+
+\Slim\Slim::registerAutoloader();
+
+/**
+ * Step 2: Instantiate a Slim application
+ *
+ * This example instantiates a Slim application using
+ * its default settings. However, you will usually configure
+ * your Slim application now by passing an associative array
+ * of setting names and values into the application constructor.
+ */
+$app = new \Slim\Slim();
+
+/**
+ * Step 3: Define the Slim application routes
+ *
+ * Here we define several Slim application routes that respond
+ * to appropriate HTTP request methods. In this example, the second
+ * argument for `Slim::get`, `Slim::post`, `Slim::put`, `Slim::patch`, and `Slim::delete`
+ * is an anonymous function.
+ */
+
+// GET route
+$app->get(
+    '/',
+    function () {
+        $template = <<<EOT
+<!DOCTYPE html>
+    <html>
+        <head>
+            <meta charset="utf-8"/>
+            <title>Slim Framework for PHP 5</title>
+            <style>
+                html,body,div,span,object,iframe,
+                h1,h2,h3,h4,h5,h6,p,blockquote,pre,
+                abbr,address,cite,code,
+                del,dfn,em,img,ins,kbd,q,samp,
+                small,strong,sub,sup,var,
+                b,i,
+                dl,dt,dd,ol,ul,li,
+                fieldset,form,label,legend,
+                table,caption,tbody,tfoot,thead,tr,th,td,
+                article,aside,canvas,details,figcaption,figure,
+                footer,header,hgroup,menu,nav,section,summary,
+                time,mark,audio,video{margin:0;padding:0;border:0;outline:0;font-size:100%;vertical-align:baseline;background:transparent;}
+                body{line-height:1;}
+                article,aside,details,figcaption,figure,
+                footer,header,hgroup,menu,nav,section{display:block;}
+                nav ul{list-style:none;}
+                blockquote,q{quotes:none;}
+                blockquote:before,blockquote:after,
+                q:before,q:after{content:'';content:none;}
+                a{margin:0;padding:0;font-size:100%;vertical-align:baseline;background:transparent;}
+                ins{background-color:#ff9;color:#000;text-decoration:none;}
+                mark{background-color:#ff9;color:#000;font-style:italic;font-weight:bold;}
+                del{text-decoration:line-through;}
+                abbr[title],dfn[title]{border-bottom:1px dotted;cursor:help;}
+                table{border-collapse:collapse;border-spacing:0;}
+                hr{display:block;height:1px;border:0;border-top:1px solid #cccccc;margin:1em 0;padding:0;}
+                input,select{vertical-align:middle;}
+                html{ background: #EDEDED; height: 100%; }
+                body{background:#FFF;margin:0 auto;min-height:100%;padding:0 30px;width:440px;color:#666;font:14px/23px Arial,Verdana,sans-serif;}
+                h1,h2,h3,p,ul,ol,form,section{margin:0 0 20px 0;}
+                h1{color:#333;font-size:20px;}
+                h2,h3{color:#333;font-size:14px;}
+                h3{margin:0;font-size:12px;font-weight:bold;}
+                ul,ol{list-style-position:inside;color:#999;}
+                ul{list-style-type:square;}
+                code,kbd{background:#EEE;border:1px solid #DDD;border:1px solid #DDD;border-radius:4px;-moz-border-radius:4px;-webkit-border-radius:4px;padding:0 4px;color:#666;font-size:12px;}
+                pre{background:#EEE;border:1px solid #DDD;border-radius:4px;-moz-border-radius:4px;-webkit-border-radius:4px;padding:5px 10px;color:#666;font-size:12px;}
+                pre code{background:transparent;border:none;padding:0;}
+                a{color:#70a23e;}
+                header{padding: 30px 0;text-align:center;}
+            </style>
+        </head>
+        <body>
+            <header>
+                <a href="http://www.slimframework.com"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHIAAAA6CAYAAABs1g18AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABRhJREFUeNrsXY+VsjAMR98twAo6Ao4gI+gIOIKOgCPICDoCjCAjXFdgha+5C3dcv/QfFB5i8h5PD21Bfk3yS9L2VpGnlGW5kS9wJMTHNRxpmjYRy6SycgRvL18OeMQOTYQ8HvIoJKiiz43hgHkq1zvK/h6e/TyJQXeV/VyWBOSHA4C5RvtMAiCc4ZB9FPjgRI8+YuKcrySO515a1hoAY3nc4G2AH52BZsn+MjaAEwIJICKAIR889HljMCcyrR0QE4v/q/BVBQva7Q1tAczG18+x+PvIswHEAslLbfGrMZKiXEOMAMy6LwlisQCJLPFMfKdBtli5dIihRyH7A627Iaiq5sJ1ThP9xoIgSdWSNVIHYmrTQgOgRyRNqm/M5PnrFFopr3F6B41cd8whRUSufUBU5EL4U93AYRnIWimCIiSI1wAaAZpJ9bPnxx8eyI3Gt4QybwWa6T/BvbQECUMQFkhd3jSkPFgrxwcynuBaNT/u6eJIlbGOBWSNIUDFEIwPZFAtBfYrfeIOSRSXuUYCsprCXwUIZWYnmEhJFMIocMDWjn206c2EsGLCJd42aWSyBNMnHxLEq7niMrY2qyDbQUbqrrTbwUPtxN1ZZCitQV4ZSd6DyoxhmRD6OFjuRUS/KdLGRHYowJZaqYgjt9Lchmi3QYA/cXBsHK6VfWNR5jgA1DLhwfFe4HqfODBpINEECCLO47LT/+HSvSd/OCOgQ8qE0DbHQUBqpC4BkKMPYPkFY4iAJXhGAYr1qmaqQDbECCg5A2NMchzR567aA4xcRKclI405Bmt46vYD7/Gcjqfk6GP/kh1wovIDSHDfiAs/8bOCQ4cf4qMt7eH5Cucr3S0aWGFfjdLHD8EhCFvXQlSqRrY5UV2O9cfZtk77jUFMXeqzCEZqSK4ICkSin2tE12/3rbVcE41OBjBjBPSdJ1N5lfYQpIuhr8axnyIy5KvXmkYnw8VbcwtTNj7fDNCmT2kPQXA+bxpEXkB21HlnSQq0gD67jnfh5KavVJa/XQYEFSaagWwbgjNA+ywstLpEWTKgc5gwVpsyO1bTII+tA6B7BPS+0PiznuM9gPKsPVXbFdADMtwbJxSmkXWfRh6AZhyyzBjIHoDmnCGaMZAKjd5hyNJYCBGDOVcg28AXQ5atAVDO3c4dSALQnYblfa3M4kc/cyA7gMIUBQCTyl4kugIpy8yA7ACqK8Uwk30lIFGOEV3rPDAELwQkr/9YjkaCPDQhCcsrAYlF1v8W8jAEYeQDY7qn6tNGWudfq+YUEr6uq6FZzBpJMUfWFDatLHMCciw2mRC+k81qCCA1DzK4aUVfrJpxnloZWCPVnOgYy8L3GvKjE96HpweQoy7iwVQclVutLOEKJxA8gaRCjSzgNI2zhh3bQhzBCQQPIHGaHaUd96GJbZz3Smmjy16u6j3FuKyNxcBarxqWWfYFE0tVVO1Rl3t1Mb05V00MQCJ71YHpNaMcsjWAfkQvPPkaNC7LqTG7JAhGXTKYf+VDeXAX9IvURoAwtTFHvyYIxtnd5tPkywrPafcwbeSuGVwFau3b76NO7SHQrvqhfFE8kM0Wvpv8gVYiYBlxL+fW/34bgP6bIC7JR7YPDubcHCPzIp4+cum7U6NlhZgK7lua3KGLeFwE2m+HblDYWSHG2SAfINuwBBfxbJEIuWZbBH4fAExD7cvaGVyXyH0dhiAYc92z3ZDfUVv+jgb8HrHy7WVO/8BFcy9vuTz+nwADAGnOR39Yg/QkAAAAAElFTkSuQmCC" alt="Slim"/></a>
+            </header>
+            <h1>Welcome to Slim!</h1>
+            <p>
+                Congratulations! Your Slim application is running. If this is
+                your first time using Slim, start with this <a href="http://docs.slimframework.com/#Hello-World" target="_blank">"Hello World" Tutorial</a>.
+            </p>
+            <section>
+                <h2>Get Started</h2>
+                <ol>
+                    <li>The application code is in <code>index.php</code></li>
+                    <li>Read the <a href="http://docs.slimframework.com/" target="_blank">online documentation</a></li>
+                    <li>Follow <a href="http://www.twitter.com/slimphp" target="_blank">@slimphp</a> on Twitter</li>
+                </ol>
+            </section>
+            <section>
+                <h2>Slim Framework Community</h2>
+
+                <h3>Support Forum and Knowledge Base</h3>
+                <p>
+                    Visit the <a href="http://help.slimframework.com" target="_blank">Slim support forum and knowledge base</a>
+                    to read announcements, chat with fellow Slim users, ask questions, help others, or show off your cool
+                    Slim Framework apps.
+                </p>
+
+                <h3>Twitter</h3>
+                <p>
+                    Follow <a href="http://www.twitter.com/slimphp" target="_blank">@slimphp</a> on Twitter to receive the very latest news
+                    and updates about the framework.
+                </p>
+            </section>
+            <section style="padding-bottom: 20px">
+                <h2>Slim Framework Extras</h2>
+                <p>
+                    Custom View classes for Smarty, Twig, Mustache, and other template
+                    frameworks are available online in a separate repository.
+                </p>
+                <p><a href="https://github.com/codeguy/Slim-Extras" target="_blank">Browse the Extras Repository</a></p>
+            </section>
+        </body>
+    </html>
+EOT;
+        echo $template;
+    }
+);
+
+// POST route
+$app->post(
+    '/post',
+    function () {
+        echo 'This is a POST route';
+    }
+);
+
+// PUT route
+$app->put(
+    '/put',
+    function () {
+        echo 'This is a PUT route';
+    }
+);
+
+// PATCH route
+$app->patch('/patch', function () {
+    echo 'This is a PATCH route';
+});
+
+// DELETE route
+$app->delete(
+    '/delete',
+    function () {
+        echo 'This is a DELETE route';
+    }
+);
+
+/**
+ * Step 4: Run the Slim application
+ *
+ * This method should be called last. This executes the Slim application
+ * and returns the HTTP response to the HTTP client.
+ */
+$app->run();
diff --git a/vendor/slim/slim/phpunit.xml.dist b/vendor/slim/slim/phpunit.xml.dist
new file mode 100644
index 00000000..c4da1720
--- /dev/null
+++ b/vendor/slim/slim/phpunit.xml.dist
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="tests/bootstrap.php"
+>
+    <testsuites>
+        <testsuite name="Slim Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./Slim/</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/vendor/slim/slim/tests/EnvironmentTest.php b/vendor/slim/slim/tests/EnvironmentTest.php
new file mode 100644
index 00000000..db54a51e
--- /dev/null
+++ b/vendor/slim/slim/tests/EnvironmentTest.php
@@ -0,0 +1,376 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class EnvironmentTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Default server settings assume the Slim app is installed
+     * in a subdirectory `foo/` directly beneath the public document
+     * root directory; URL rewrite is disabled; requested app
+     * resource is GET `/bar/xyz` with three query params.
+     *
+     * These only provide a common baseline for the following
+     * tests; tests are free to override these values.
+     */
+    public function setUp()
+    {
+        $_SERVER['DOCUMENT_ROOT'] = '/var/www';
+        $_SERVER['SCRIPT_FILENAME'] = '/var/www/foo/index.php';
+        $_SERVER['SERVER_NAME'] = 'slim';
+        $_SERVER['SERVER_PORT'] = '80';
+        $_SERVER['SCRIPT_NAME'] = '/foo/index.php';
+        $_SERVER['REQUEST_URI'] = '/foo/index.php/bar/xyz';
+        $_SERVER['PATH_INFO'] = '/bar/xyz';
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        $_SERVER['QUERY_STRING'] = 'one=1&two=2&three=3';
+        $_SERVER['HTTPS'] = '';
+        $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+        unset($_SERVER['CONTENT_TYPE'], $_SERVER['CONTENT_LENGTH']);
+    }
+
+    /**
+     * Test mock environment
+     *
+     * This should return the custom values where specified
+     * and the default values otherwise.
+     */
+    public function testMockEnvironment()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'PUT'
+        ));
+        $env2 = \Slim\Environment::getInstance();
+        $this->assertSame($env, $env2);
+        $this->assertInstanceOf('\Slim\Environment', $env);
+        $this->assertEquals('PUT', $env['REQUEST_METHOD']);
+        $this->assertEquals(80, $env['SERVER_PORT']);
+        $this->assertNull($env['foo']);
+    }
+
+    /**
+     * Test sets HTTP method
+     */
+    public function testSetsHttpMethod()
+    {
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('GET', $env['REQUEST_METHOD']);
+    }
+
+    /**
+     * Test parses script name and path info
+     *
+     * Pre-conditions:
+     * URL Rewrite is disabled;
+     * App installed in subdirectory;
+     */
+    public function testParsesPathsWithoutUrlRewriteInSubdirectory()
+    {
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('/bar/xyz', $env['PATH_INFO']);
+        $this->assertEquals('/foo/index.php', $env['SCRIPT_NAME']);
+    }
+
+    /**
+     * Test parses script name and path info
+     *
+     * Pre-conditions:
+     * URL Rewrite is disabled;
+     * App installed in root directory;
+     */
+    public function testParsesPathsWithoutUrlRewriteInRootDirectory()
+    {
+        $_SERVER['SCRIPT_FILENAME'] = '/var/www/index.php';
+        $_SERVER['REQUEST_URI'] = '/index.php/bar/xyz';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('/bar/xyz', $env['PATH_INFO']);
+        $this->assertEquals('/index.php', $env['SCRIPT_NAME']);
+    }
+
+    /**
+     * Test parses script name and path info
+     *
+     * Pre-conditions:
+     * URL Rewrite disabled;
+     * App installed in root directory;
+     * Requested resource is "/";
+     */
+    public function testParsesPathsWithoutUrlRewriteInRootDirectoryForAppRootUri()
+    {
+        $_SERVER['SCRIPT_FILENAME'] = '/var/www/index.php';
+        $_SERVER['REQUEST_URI'] = '/index.php';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        unset($_SERVER['PATH_INFO']);
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('/', $env['PATH_INFO']);
+        $this->assertEquals('/index.php', $env['SCRIPT_NAME']);
+    }
+
+    /**
+     * Test parses script name and path info
+     *
+     * Pre-conditions:
+     * URL Rewrite enabled;
+     * App installed in subdirectory;
+     */
+    public function testParsesPathsWithUrlRewriteInSubdirectory()
+    {
+        $_SERVER['SCRIPT_NAME'] = '/foo/index.php';
+        $_SERVER['REQUEST_URI'] = '/foo/bar/xyz';
+        unset($_SERVER['PATH_INFO']);
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('/bar/xyz', $env['PATH_INFO']);
+        $this->assertEquals('/foo', $env['SCRIPT_NAME']);
+    }
+
+    /**
+     * Test parses script name and path info
+     *
+     * Pre-conditions:
+     * URL Rewrite enabled;
+     * App installed in root directory;
+     */
+    public function testParsesPathsWithUrlRewriteInRootDirectory()
+    {
+        $_SERVER['SCRIPT_FILENAME'] = '/var/www/index.php';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['REQUEST_URI'] = '/bar/xyz';
+        unset($_SERVER['PATH_INFO']);
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('/bar/xyz', $env['PATH_INFO']);
+        $this->assertEquals('', $env['SCRIPT_NAME']);
+    }
+
+    /**
+     * Test parses script name and path info
+     *
+     * Pre-conditions:
+     * URL Rewrite enabled;
+     * App installed in root directory;
+     * Requested resource is "/"
+     */
+    public function testParsesPathsWithUrlRewriteInRootDirectoryForAppRootUri()
+    {
+        $_SERVER['SCRIPT_FILENAME'] = '/var/www/index.php';
+        $_SERVER['REQUEST_URI'] = '/';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        unset($_SERVER['PATH_INFO']);
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('/', $env['PATH_INFO']);
+        $this->assertEquals('', $env['SCRIPT_NAME']);
+    }
+
+    /**
+     * Test parses query string
+     *
+     * Pre-conditions:
+     * $_SERVER['QUERY_STRING'] exists and is not empty;
+     */
+    public function testParsesQueryString()
+    {
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('one=1&two=2&three=3', $env['QUERY_STRING']);
+    }
+
+    /**
+     * Test removes query string from PATH_INFO when using URL Rewrite
+     *
+     * Pre-conditions:
+     * $_SERVER['QUERY_STRING'] exists and is not empty;
+     * URL Rewrite enabled;
+     */
+    public function testRemovesQueryStringFromPathInfo()
+    {
+        $_SERVER['SCRIPT_NAME'] = '/foo/index.php';
+        $_SERVER['REQUEST_URI'] = '/foo/bar/xyz?one=1&two=2&three=3';
+        unset($_SERVER['PATH_INFO']);
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('/bar/xyz', $env['PATH_INFO']);
+    }
+
+    /**
+     * Test environment's PATH_INFO retains URL encoded characters (e.g. #)
+     *
+     * In earlier version, \Slim\Environment would use PATH_INFO instead
+     * of REQUEST_URI to determine the root URI and resource URI.
+     * Unfortunately, the server would URL decode the PATH_INFO string
+     * before it was handed to PHP. This prevented certain URL-encoded
+     * characters like the octothorpe from being delivered correctly to
+     * the Slim application environment. This test ensures the
+     * REQUEST_URI is used instead and parsed as expected.
+     */
+    public function testPathInfoRetainsUrlEncodedCharacters()
+    {
+        $_SERVER['SCRIPT_FILENAME'] = '/var/www/index.php';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['REQUEST_URI'] = '/foo/%23bar'; //<-- URL-encoded "#bar"
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('/foo/%23bar', $env['PATH_INFO']);
+    }
+
+    /**
+     * Test parses query string
+     *
+     * Pre-conditions:
+     * $_SERVER['QUERY_STRING'] does not exist;
+     */
+    public function testParsesQueryStringThatDoesNotExist()
+    {
+        unset($_SERVER['QUERY_STRING']);
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('', $env['QUERY_STRING']);
+    }
+
+    /**
+     * Test SERVER_NAME is not empty
+     */
+    public function testServerNameIsNotEmpty()
+    {
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertFalse(empty($env['SERVER_NAME']));
+    }
+
+    /**
+     * Test SERVER_PORT is not empty
+     */
+    public function testServerPortIsNotEmpty()
+    {
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertFalse(empty($env['SERVER_PORT']));
+    }
+
+    /**
+     * Test unsets HTTP_CONTENT_TYPE and HTTP_CONTENT_LENGTH
+     *
+     * Pre-conditions:
+     * HTTP_CONTENT_TYPE is sent with HTTP request;
+     * HTTP_CONTENT_LENGTH is sent with HTTP request;
+     */
+    public function testUnsetsContentTypeAndContentLength()
+    {
+        $_SERVER['HTTP_CONTENT_LENGTH'] = 150;
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertFalse(isset($env['HTTP_CONTENT_LENGTH']));
+    }
+
+    /**
+     * Test sets special request headers if not empty
+     *
+     * Pre-conditions:
+     * CONTENT_TYPE, CONTENT_LENGTH, X_REQUESTED_WITH are sent in client HTTP request;
+     * CONTENT_TYPE, CONTENT_LENGTH, X_REQUESTED_WITH are not empty;
+     */
+    public function testSetsSpecialHeaders()
+    {
+        $_SERVER['CONTENT_TYPE'] = 'text/csv';
+        $_SERVER['CONTENT_LENGTH'] = '100';
+        $_SERVER['HTTP_X_REQUESTED_WITH'] = 'XmlHttpRequest';
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('text/csv', $env['CONTENT_TYPE']);
+        $this->assertEquals('100', $env['CONTENT_LENGTH']);
+        $this->assertEquals('XmlHttpRequest', $env['HTTP_X_REQUESTED_WITH']);
+    }
+
+    /**
+     * Tests X-HTTP-Method-Override is allowed through unmolested.
+     *
+     * Pre-conditions:
+     * X_HTTP_METHOD_OVERRIDE is sent in client HTTP request;
+     * X_HTTP_METHOD_OVERRIDE is not empty;
+     */
+    public function testSetsHttpMethodOverrideHeader() {
+        $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] = 'DELETE';
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('DELETE', $env['HTTP_X_HTTP_METHOD_OVERRIDE']);
+    }
+
+    /**
+     * Test detects HTTPS
+     *
+     * Pre-conditions:
+     * $_SERVER['HTTPS'] is set to a non-empty value;
+     */
+    public function testHttps()
+    {
+        $_SERVER['HTTPS'] = 1;
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('https', $env['slim.url_scheme']);
+    }
+
+    /**
+     * Test detects not HTTPS
+     *
+     * Pre-conditions:
+     * $_SERVER['HTTPS'] is set to an empty value;
+     */
+    public function testNotHttps()
+    {
+        $_SERVER['HTTPS'] = '';
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('http', $env['slim.url_scheme']);
+    }
+
+    /**
+     * Test detects not HTTPS on IIS
+     *
+     * Pre-conditions:
+     * $_SERVER['HTTPS'] is set to "off";
+     */
+    public function testNotHttpsIIS()
+    {
+        $_SERVER['HTTPS'] = 'off';
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('http', $env['slim.url_scheme']);
+    }
+
+    /**
+     * Test input is an empty string (and not false)
+     *
+     * Pre-conditions:
+     * Input at php://input may only be read once; subsequent attempts
+     * will return `false`; in which case, use an empty string.
+     */
+    public function testInputIsEmptyString()
+    {
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertEquals('', $env['slim.input']);
+    }
+
+    /**
+     * Test valid resource handle to php://stdErr
+     */
+    public function testErrorResource()
+    {
+        $env = \Slim\Environment::getInstance(true);
+        $this->assertTrue(is_resource($env['slim.errors']));
+    }
+}
diff --git a/vendor/slim/slim/tests/Foo.php b/vendor/slim/slim/tests/Foo.php
new file mode 100644
index 00000000..d772d02e
--- /dev/null
+++ b/vendor/slim/slim/tests/Foo.php
@@ -0,0 +1,7 @@
+<?php
+class Foo
+{
+    public function __construct()
+    {
+    }
+}
diff --git a/vendor/slim/slim/tests/Helper/SetTest.php b/vendor/slim/slim/tests/Helper/SetTest.php
new file mode 100644
index 00000000..035c23a3
--- /dev/null
+++ b/vendor/slim/slim/tests/Helper/SetTest.php
@@ -0,0 +1,241 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class SetTest extends PHPUnit_Framework_TestCase
+{
+    protected $bag;
+    protected $property;
+
+    public function setUp()
+    {
+        $this->bag = new \Slim\Helper\Set();
+        $this->property = new \ReflectionProperty($this->bag, 'data');
+        $this->property->setAccessible(true);
+    }
+
+    public function testSet()
+    {
+        $this->bag->set('foo', 'bar');
+        $this->assertArrayHasKey('foo', $this->property->getValue($this->bag));
+        $bag =  $this->property->getValue($this->bag);
+        $this->assertEquals('bar', $bag['foo']);
+    }
+
+    public function testGet()
+    {
+        $this->property->setValue($this->bag, array('foo' => 'bar'));
+        $this->assertEquals('bar', $this->bag->get('foo'));
+    }
+
+    public function testGetNotExists()
+    {
+        $this->property->setValue($this->bag, array('foo' => 'bar'));
+        $this->assertEquals('default', $this->bag->get('abc', 'default'));
+    }
+
+    public function testAdd()
+    {
+        $this->bag->replace(array(
+            'abc' => '123',
+            'foo' => 'bar'
+        ));
+        $this->assertArrayHasKey('abc', $this->property->getValue($this->bag));
+        $this->assertArrayHasKey('foo', $this->property->getValue($this->bag));
+        $bag = $this->property->getValue($this->bag);
+        $this->assertEquals('123', $bag['abc']);
+        $this->assertEquals('bar', $bag['foo']);
+    }
+
+    public function testAll()
+    {
+        $data = array(
+            'abc' => '123',
+            'foo' => 'bar'
+        );
+        $this->property->setValue($this->bag, $data);
+        $this->assertEquals($data, $this->bag->all());
+    }
+
+    public function testKeys()
+    {
+        $data = array(
+            'abc' => '123',
+            'foo' => 'bar'
+        );
+        $this->property->setValue($this->bag, $data);
+        $this->assertEquals(array('abc', 'foo'), $this->bag->keys());
+    }
+
+    public function testRemove()
+    {
+        $data = array(
+            'abc' => '123',
+            'foo' => 'bar'
+        );
+        $this->property->setValue($this->bag, $data);
+        $this->bag->remove('foo');
+        $this->assertEquals(array('abc' => '123'), $this->property->getValue($this->bag));
+    }
+
+    public function testClear()
+    {
+        $data = array(
+            'abc' => '123',
+            'foo' => 'bar'
+        );
+        $this->property->setValue($this->bag, $data);
+        $this->bag->clear();
+        $this->assertEquals(array(), $this->property->getValue($this->bag));
+    }
+
+    public function testArrayAccessGet()
+    {
+        $data = array(
+            'abc' => '123',
+            'foo' => 'bar'
+        );
+        $this->property->setValue($this->bag, $data);
+        $this->assertEquals('bar', $this->bag['foo']);
+    }
+
+    public function testArrayAccessSet()
+    {
+        $data = array(
+            'abc' => '123',
+            'foo' => 'bar'
+        );
+        $this->property->setValue($this->bag, $data);
+        $this->bag['foo'] = 'changed';
+        $bag = $this->property->getValue($this->bag);
+        $this->assertEquals('changed', $bag['foo']);
+    }
+
+    public function testArrayAccessExists()
+    {
+        $data = array(
+            'abc' => '123',
+            'foo' => 'bar'
+        );
+        $this->property->setValue($this->bag, $data);
+        $this->assertTrue(isset($this->bag['foo']));
+        $this->assertFalse(isset($this->bag['bar']));
+    }
+
+    public function testArrayAccessUnset()
+    {
+        $data = array(
+            'abc' => '123',
+            'foo' => 'bar'
+        );
+        $this->property->setValue($this->bag, $data);
+        unset($this->bag['foo']);
+        $this->assertEquals(array('abc' => '123'), $this->property->getValue($this->bag));
+    }
+
+    public function testCount()
+    {
+        $data = array(
+            'abc' => '123',
+            'foo' => 'bar'
+        );
+        $this->property->setValue($this->bag, $data);
+        $this->assertEquals(2, count($this->bag));
+    }
+
+    public function testGetIterator()
+    {
+        $data = array(
+            'abc' => '123',
+            'foo' => 'bar'
+        );
+        $this->property->setValue($this->bag, $data);
+        $this->assertInstanceOf('\ArrayIterator', $this->bag->getIterator());
+    }
+
+    public function testPropertyOverloadGet()
+    {
+        $data = array(
+            'abc' => '123',
+            'foo' => 'bar'
+        );
+        $this->property->setValue($this->bag, $data);
+
+        $this->assertEquals('123', $this->bag->abc);
+        $this->assertEquals('bar', $this->bag->foo);
+    }
+
+    public function testPropertyOverloadSet()
+    {
+        $this->bag->foo = 'bar';
+        $this->assertArrayHasKey('foo', $this->property->getValue($this->bag));
+        $this->assertEquals('bar', $this->bag->foo);
+    }
+
+    public function testPropertyOverloadingIsset()
+    {
+        $data = array(
+            'abc' => '123',
+            'foo' => 'bar'
+        );
+        $this->property->setValue($this->bag, $data);
+
+        $this->assertTrue(isset($this->bag->abc));
+        $this->assertTrue(isset($this->bag->foo));
+        $this->assertFalse(isset($this->bag->foobar));
+    }
+
+    public function testPropertyOverloadingUnset()
+    {
+        $data = array(
+            'abc' => '123',
+            'foo' => 'bar'
+        );
+        $this->property->setValue($this->bag, $data);
+
+        $this->assertTrue(isset($this->bag->abc));
+        unset($this->bag->abc);
+        $this->assertFalse(isset($this->bag->abc));
+        $this->assertArrayNotHasKey('abc', $this->property->getValue($this->bag));
+        $this->assertArrayHasKey('foo', $this->property->getValue($this->bag));
+    }
+
+    public function testProtect()
+    {
+        $callable = function () {
+            return 'foo';
+        };
+        $result = $this->bag->protect($callable);
+
+        $this->assertInstanceOf('\Closure', $result);
+        $this->assertSame($callable, $result());
+    }
+}
diff --git a/vendor/slim/slim/tests/Http/CookiesTest.php b/vendor/slim/slim/tests/Http/CookiesTest.php
new file mode 100644
index 00000000..5ad18548
--- /dev/null
+++ b/vendor/slim/slim/tests/Http/CookiesTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+class CookiesTest extends PHPUnit_Framework_TestCase
+{
+    public function testSetWithStringValue()
+    {
+        $c = new \Slim\Http\Cookies();
+        $c->set('foo', 'bar');
+        $this->assertAttributeEquals(
+            array(
+                'foo' => array(
+                    'value' => 'bar',
+                    'expires' => null,
+                    'domain' => null,
+                    'path' => null,
+                    'secure' => false,
+                    'httponly' => false
+                )
+            ),
+            'data',
+            $c
+        );
+    }
+
+    public function testSetWithArrayValue()
+    {
+        $now = time();
+        $c = new \Slim\Http\Cookies();
+        $c->set('foo', array(
+            'value' => 'bar',
+            'expires' => $now + 86400,
+            'domain' => '.example.com',
+            'path' => '/',
+            'secure' => true,
+            'httponly' => true
+        ));
+        $this->assertAttributeEquals(
+            array(
+                'foo' => array(
+                    'value' => 'bar',
+                    'expires' => $now + 86400,
+                    'domain' => '.example.com',
+                    'path' => '/',
+                    'secure' => true,
+                    'httponly' => true
+                )
+            ),
+            'data',
+            $c
+        );
+    }
+
+    public function testRemove()
+    {
+        $c = new \Slim\Http\Cookies();
+        $c->remove('foo');
+        $prop = new \ReflectionProperty($c, 'data');
+        $prop->setAccessible(true);
+        $cValue = $prop->getValue($c);
+        $this->assertEquals('', $cValue['foo']['value']);
+        $this->assertLessThan(time(), $cValue['foo']['expires']);
+    }
+}
diff --git a/vendor/slim/slim/tests/Http/HeadersTest.php b/vendor/slim/slim/tests/Http/HeadersTest.php
new file mode 100644
index 00000000..c0466eff
--- /dev/null
+++ b/vendor/slim/slim/tests/Http/HeadersTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class HeadersTest extends PHPUnit_Framework_TestCase
+{
+    public function testNormalizesKey()
+    {
+        $h = new \Slim\Http\Headers();
+        $h->set('Http_Content_Type', 'text/html');
+        $prop = new \ReflectionProperty($h, 'data');
+        $prop->setAccessible(true);
+        $this->assertArrayHasKey('Content-Type', $prop->getValue($h));
+    }
+
+    public function testExtractHeaders()
+    {
+        $test = array(
+            'HTTP_HOST' => 'foo.com',
+            'SERVER_NAME' => 'foo',
+            'CONTENT_TYPE' => 'text/html',
+            'X_FORWARDED_FOR' => '127.0.0.1'
+        );
+        $results = \Slim\Http\Headers::extract($test);
+        $this->assertEquals(array(
+            'HTTP_HOST' => 'foo.com',
+            'CONTENT_TYPE' => 'text/html',
+            'X_FORWARDED_FOR' => '127.0.0.1'
+        ), $results);
+    }
+}
diff --git a/vendor/slim/slim/tests/Http/RequestTest.php b/vendor/slim/slim/tests/Http/RequestTest.php
new file mode 100644
index 00000000..117b72c9
--- /dev/null
+++ b/vendor/slim/slim/tests/Http/RequestTest.php
@@ -0,0 +1,949 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class RequestTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Test sets HTTP method
+     */
+    public function testGetMethod()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'GET'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('GET', $req->getMethod());
+    }
+
+    /**
+     * Test HTTP GET method detection
+     */
+    public function testIsGet()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'GET'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertTrue($req->isGet());
+    }
+
+    /**
+     * Test HTTP POST method detection
+     */
+    public function testIsPost()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertTrue($req->isPost());
+    }
+
+    /**
+     * Test HTTP PUT method detection
+     */
+    public function testIsPut()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'PUT',
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertTrue($req->isPut());
+    }
+
+    /**
+     * Test HTTP DELETE method detection
+     */
+    public function testIsDelete()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'DELETE',
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertTrue($req->isDelete());
+    }
+
+    /**
+     * Test HTTP OPTIONS method detection
+     */
+    public function testIsOptions()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'OPTIONS',
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertTrue($req->isOptions());
+    }
+
+    /**
+     * Test HTTP HEAD method detection
+     */
+    public function testIsHead()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'HEAD',
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertTrue($req->isHead());
+    }
+
+    /**
+     * Test HTTP PATCH method detection
+     */
+    public function testIsPatch()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'PATCH',
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertTrue($req->isPatch());
+    }
+
+    /**
+     * Test AJAX method detection w/ header
+     */
+    public function testIsAjaxWithHeader()
+    {
+        $env = \Slim\Environment::mock(array(
+            'X_REQUESTED_WITH' => 'XMLHttpRequest'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertTrue($req->isAjax());
+        $this->assertTrue($req->isXhr());
+    }
+
+    /**
+     * Test AJAX method detection w/ query parameter
+     */
+    public function testIsAjaxWithQueryParameter()
+    {
+        $env = \Slim\Environment::mock(array(
+            'QUERY_STRING' => 'isajax=1',
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertTrue($req->isAjax());
+        $this->assertTrue($req->isXhr());
+    }
+
+    /**
+     * Test AJAX method detection without header or query parameter
+     */
+    public function testIsAjaxWithoutHeaderOrQueryParameter()
+    {
+        $env = \Slim\Environment::mock();
+        $req = new \Slim\Http\Request($env);
+        $this->assertFalse($req->isAjax());
+        $this->assertFalse($req->isXhr());
+    }
+
+    /**
+     * Test AJAX method detection with misspelled header
+     */
+    public function testIsAjaxWithMisspelledHeader()
+    {
+        $env = \Slim\Environment::mock(array(
+            'X_REQUESTED_WITH' => 'foo'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertFalse($req->isAjax());
+        $this->assertFalse($req->isXhr());
+    }
+
+    /**
+     * Test params from query string
+     */
+    public function testParamsFromQueryString()
+    {
+        $env = \Slim\Environment::mock(array(
+            'QUERY_STRING' => 'one=1&two=2&three=3'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals(3, count($req->params()));
+        $this->assertEquals('1', $req->params('one'));
+        $this->assertNull($req->params('foo'));
+        $this->assertEquals(1, $req->params('foo', 1));
+    }
+
+    /**
+     * Test params from request body
+     */
+    public function testParamsFromRequestBody()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+            'QUERY_STRING' => 'one=1&two=2&three=3',
+            'slim.input' => 'foo=bar&abc=123',
+            'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
+            'CONTENT_LENGTH' => 15
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals(5, count($req->params())); //Union of GET and POST
+        $this->assertEquals('bar', $req->params('foo'));
+    }
+
+    /**
+     * Test fetch GET params
+     */
+    public function testGet()
+    {
+        $env = \Slim\Environment::mock(array(
+            'QUERY_STRING' => 'one=1&two=2&three=3'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals(3, count($req->get()));
+        $this->assertEquals('1', $req->get('one'));
+        $this->assertNull($req->get('foo'));
+        $this->assertFalse($req->get('foo', false));
+    }
+
+    /**
+     * Test fetch GET params without multibyte
+     */
+    public function testGetWithoutMultibyte()
+    {
+        $env = \Slim\Environment::mock(array(
+            'QUERY_STRING' => 'one=1&two=2&three=3',
+            'slim.tests.ignore_multibyte' => true
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals(3, count($req->get()));
+        $this->assertEquals('1', $req->get('one'));
+        $this->assertNull($req->get('foo'));
+        $this->assertFalse($req->get('foo', false));
+    }
+
+    /**
+     * Test fetch POST params
+     */
+    public function testPost()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+            'slim.input' => 'foo=bar&abc=123',
+            'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
+            'CONTENT_LENGTH' => 15
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals(2, count($req->post()));
+        $this->assertEquals('bar', $req->post('foo'));
+        $this->assertNull($req->post('xyz'));
+        $this->assertFalse($req->post('xyz', false));
+    }
+
+    /**
+     * Test fetch POST params without multibyte
+     */
+    public function testPostWithoutMultibyte()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+            'slim.input' => 'foo=bar&abc=123',
+            'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
+            'CONTENT_LENGTH' => 15,
+            'slim.tests.ignore_multibyte' => true
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals(2, count($req->post()));
+        $this->assertEquals('bar', $req->post('foo'));
+        $this->assertNull($req->post('xyz'));
+        $this->assertFalse($req->post('xyz', false));
+    }
+
+    /**
+     * Test fetch POST without slim.input
+     */
+    public function testPostWithoutInput()
+    {
+        $this->setExpectedException('RuntimeException');
+        $env = \Slim\Environment::mock();
+        unset($env['slim.input']);
+        $req = new \Slim\Http\Request($env);
+        $req->post('foo');
+    }
+
+    /**
+     * Test fetch POST params even if multipart/form-data request
+     */
+    public function testPostWithMultipartRequest()
+    {
+        $_POST = array('foo' => 'bar'); //<-- Set by PHP
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+            'slim.input' => '', //<-- "php://input" is empty for multipart/form-data requests
+            'CONTENT_TYPE' => 'multipart/form-data',
+            'CONTENT_LENGTH' => 0
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals(1, count($req->post()));
+        $this->assertEquals('bar', $req->post('foo'));
+        $this->assertNull($req->post('xyz'));
+    }
+
+    /**
+     * Test fetch PUT params
+     */
+    public function testPut()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'PUT',
+            'slim.input' => 'foo=bar&abc=123',
+            'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
+            'CONTENT_LENGTH' => 15
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals(2, count($req->put()));
+        $this->assertEquals('bar', $req->put('foo'));
+        $this->assertEquals('bar', $req->params('foo'));
+        $this->assertNull($req->put('xyz'));
+        $this->assertFalse($req->put('xyz', false));
+    }
+
+    /**
+     * Test fetch PATCH params
+     */
+    public function testPatch()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'PATCH',
+            'slim.input' => 'foo=bar&abc=123',
+            'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
+            'CONTENT_LENGTH' => 15
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals(2, count($req->patch()));
+        $this->assertEquals('bar', $req->patch('foo'));
+        $this->assertEquals('bar', $req->params('foo'));
+        $this->assertNull($req->patch('xyz'));
+        $this->assertFalse($req->patch('xyz', false));
+    }
+
+    /**
+     * Test fetch DELETE params
+     */
+    public function testDelete()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'DELETE',
+            'slim.input' => 'foo=bar&abc=123',
+            'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
+            'CONTENT_LENGTH' => 15
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals(2, count($req->delete()));
+        $this->assertEquals('bar', $req->delete('foo'));
+        $this->assertEquals('bar', $req->params('foo'));
+        $this->assertNull($req->delete('xyz'));
+        $this->assertFalse($req->delete('xyz', false));
+    }
+
+    /**
+     * Test fetch COOKIE params
+     */
+    public function testCookies()
+    {
+        $env = \Slim\Environment::mock(array(
+            'HTTP_COOKIE' => 'foo=bar; abc=123'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals(2, count($req->cookies()));
+        $this->assertEquals('bar', $req->cookies('foo'));
+        $this->assertNull($req->cookies('xyz'));
+    }
+
+    /**
+     * Test is form data
+     */
+    public function testIsFormDataContentFormUrlencoded()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'PUT',
+            'slim.input' => '',
+            'CONTENT_TYPE' => 'application/x-www-form-urlencoded'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertTrue($req->isFormData());
+    }
+
+    /**
+     * Test is form data
+     */
+    public function testIsFormDataPostContentUnknown()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+            'slim.input' => '',
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertTrue($req->isFormData());
+    }
+
+    /**
+     * Test is form data
+     */
+    public function testIsFormDataPostContentUnknownWithMethodOverride()
+    {
+        $env = \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'PUT',
+        ));
+        $env['slim.method_override.original_method'] = 'POST';
+        $req = new \Slim\Http\Request($env);
+        $this->assertTrue($req->isPut());
+        $this->assertTrue($req->isFormData());
+    }
+
+    /**
+     * Test is not form data
+     */
+    public function testIsNotFormData()
+    {
+        $env = \Slim\Environment::mock(array(
+            'slim.input' => '',
+            'CONTENT_TYPE' => 'application/json'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertFalse($req->isFormData());
+    }
+
+    /**
+     * Test headers
+     */
+    public function testHeaders()
+    {
+        $env = \Slim\Environment::mock(array(
+            'HTTP_ACCEPT_ENCODING' => 'gzip'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $headers = $req->headers();
+        $this->assertInstanceOf('\Slim\Http\Headers', $headers);
+        $this->assertEquals('gzip', $req->headers('HTTP_ACCEPT_ENCODING'));
+        $this->assertEquals('gzip', $req->headers('HTTP-ACCEPT-ENCODING'));
+        $this->assertEquals('gzip', $req->headers('http_accept_encoding'));
+        $this->assertEquals('gzip', $req->headers('http-accept-encoding'));
+        $this->assertEquals('gzip', $req->headers('ACCEPT_ENCODING'));
+        $this->assertEquals('gzip', $req->headers('ACCEPT-ENCODING'));
+        $this->assertEquals('gzip', $req->headers('accept_encoding'));
+        $this->assertEquals('gzip', $req->headers('accept-encoding'));
+        $this->assertNull($req->headers('foo'));
+    }
+
+    /**
+     * Test accurately removes HTTP_ prefix from input header name
+     */
+    public function testHeaderRemovesHttpPrefix()
+    {
+        $env = \Slim\Environment::mock(array(
+            'X_HTTP_METHOD_OVERRIDE' => 'PUT',
+            'CONTENT_TYPE' => 'application/json'
+        ));
+        //fwrite(fopen('php://stdout', 'w'), print_r($env, true));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('PUT', $req->headers('X_HTTP_METHOD_OVERRIDE'));
+        $this->assertNull($req->headers('X_METHOD_OVERRIDE')); //<-- Ensures `HTTP_` is not removed if not prefix
+        $this->assertEquals('application/json', $req->headers('HTTP_CONTENT_TYPE')); //<-- Ensures `HTTP_` is removed if prefix
+    }
+
+    /**
+     * Test get body
+     */
+    public function testGetBodyWhenExists()
+    {
+        $env = \Slim\Environment::mock(array(
+            'slim.input' => 'foo=bar&abc=123',
+            'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
+            'CONTENT_LENGTH' => 15
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('foo=bar&abc=123', $req->getBody());
+    }
+
+    /**
+     * Test get body
+     */
+    public function testGetBodyWhenNotExists()
+    {
+        $env = \Slim\Environment::mock();
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('', $req->getBody());
+    }
+
+    /**
+     * Test get content type
+     */
+    public function testGetContentTypeWhenExists()
+    {
+        $env = \Slim\Environment::mock(array(
+            'slim.input' => '',
+            'CONTENT_TYPE' => 'application/json; charset=ISO-8859-4'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('application/json; charset=ISO-8859-4', $req->getContentType());
+    }
+
+    /**
+     * Test get content type for built-in PHP server
+     */
+    public function testGetContentTypeForBuiltInServer()
+    {
+        $env = \Slim\Environment::mock(array(
+            'slim.input' => '',
+            'HTTP_CONTENT_TYPE' => 'application/json; charset=ISO-8859-4'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('application/json; charset=ISO-8859-4', $req->getContentType());
+    }
+
+    /**
+     * Test get content type
+     */
+    public function testGetContentTypeWhenNotExists()
+    {
+        $env = \Slim\Environment::mock();
+        $req = new \Slim\Http\Request($env);
+        $this->assertNull($req->getContentType());
+    }
+
+    /**
+     * Test get content type with built-in server
+     */
+    public function testGetContentTypeWithBuiltInServer()
+    {
+        $env = \Slim\Environment::mock(array(
+            'slim.input' => '',
+            'HTTP_CONTENT_TYPE' => 'application/json; charset=ISO-8859-4'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('application/json; charset=ISO-8859-4', $req->getContentType());
+    }
+
+    /**
+     * Test get media type
+     */
+    public function testGetMediaTypeWhenExists()
+    {
+        $env = \Slim\Environment::mock(array(
+            'CONTENT_TYPE' => 'application/json;charset=utf-8'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('application/json', $req->getMediaType());
+    }
+
+    /**
+     * Test get media type
+     */
+    public function testGetMediaTypeWhenNotExists()
+    {
+        $env = \Slim\Environment::mock();
+        $req = new \Slim\Http\Request($env);
+        $this->assertNull($req->getMediaType());
+    }
+
+    /**
+     * Test get media type
+     */
+    public function testGetMediaTypeWhenNoParamsExist()
+    {
+        $env = \Slim\Environment::mock(array(
+            'slim.input' => '',
+            'CONTENT_TYPE' => 'application/json'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('application/json', $req->getMediaType());
+    }
+
+    /**
+     * Test get media type params
+     */
+    public function testGetMediaTypeParams()
+    {
+        $env = \Slim\Environment::mock(array(
+            'CONTENT_TYPE' => 'application/json; charset=ISO-8859-4'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $params = $req->getMediaTypeParams();
+        $this->assertEquals(1, count($params));
+        $this->assertArrayHasKey('charset', $params);
+        $this->assertEquals('ISO-8859-4', $params['charset']);
+    }
+
+    /**
+     * Test get media type params
+     */
+    public function testGetMediaTypeParamsWhenNotExists()
+    {
+        $env = \Slim\Environment::mock();
+        $req = new \Slim\Http\Request($env);
+        $params = $req->getMediaTypeParams();
+        $this->assertTrue(is_array($params));
+        $this->assertEquals(0, count($params));
+    }
+
+    /**
+     * Test get content charset
+     */
+    public function testGetContentCharset()
+    {
+        $env = \Slim\Environment::mock(array(
+            'slim.input' => '',
+            'CONTENT_TYPE' => 'application/json; charset=ISO-8859-4'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('ISO-8859-4', $req->getContentCharset());
+    }
+
+    /**
+     * Test get content charset
+     */
+    public function testGetContentCharsetWhenNotExists()
+    {
+        $env = \Slim\Environment::mock(array(
+            'slim.input' => '',
+            'CONTENT_TYPE' => 'application/json'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertNull($req->getContentCharset());
+    }
+
+    /**
+     * Test get content length
+     */
+    public function testGetContentLength()
+    {
+        $env = \Slim\Environment::mock(array(
+            'slim.input' => 'foo=bar&abc=123',
+            'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
+            'CONTENT_LENGTH' => 15
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals(15, $req->getContentLength());
+    }
+
+    /**
+     * Test get content length
+     */
+    public function testGetContentLengthWhenNotExists()
+    {
+        $env = \Slim\Environment::mock(array(
+            'slim.input' => '',
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals(0, $req->getContentLength());
+    }
+
+    /**
+     * Test get host
+     */
+    public function testGetHost()
+    {
+        $env = \Slim\Environment::mock(array(
+            'SERVER_NAME' => 'slim',
+            'HTTP_HOST' => 'slimframework.com'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('slimframework.com', $req->getHost()); //Uses HTTP_HOST if available
+    }
+
+    /**
+     * Test get host when it has a port number
+     */
+    public function testGetHostAndStripPort()
+    {
+        $env = \Slim\Environment::mock(array(
+            'SERVER_NAME' => 'slim',
+            'HTTP_HOST' => 'slimframework.com:80'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('slimframework.com', $req->getHost()); //Uses HTTP_HOST if available
+    }
+
+    /**
+     * Test get host
+     */
+    public function testGetHostWhenNotExists()
+    {
+        $env = \Slim\Environment::mock(array(
+            'SERVER_NAME' => 'slim',
+            'HTTP_HOST' => 'slimframework.com'
+        ));
+        unset($env['HTTP_HOST']);
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('slim', $req->getHost()); //Uses SERVER_NAME as backup
+    }
+
+    /**
+     * Test get host with port
+     */
+    public function testGetHostWithPort()
+    {
+        $env = \Slim\Environment::mock(array(
+            'HTTP_HOST' => 'slimframework.com',
+            'SERVER_NAME' => 'slim',
+            'SERVER_PORT' => 80,
+            'slim.url_scheme' => 'http'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('slimframework.com:80', $req->getHostWithPort());
+    }
+
+    /**
+     * Test get host with port doesn't duplicate port numbers
+     */
+    public function testGetHostDoesntDuplicatePort()
+    {
+        $env = \Slim\Environment::mock(array(
+            'HTTP_HOST' => 'slimframework.com:80',
+            'SERVER_NAME' => 'slim',
+            'SERVER_PORT' => 80,
+            'slim.url_scheme' => 'http'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('slimframework.com:80', $req->getHostWithPort());
+    }
+
+    /**
+     * Test get port
+     */
+    public function testGetPort()
+    {
+        $env = \Slim\Environment::mock(array(
+            'SERVER_PORT' => 80
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertTrue(is_integer($req->getPort()));
+        $this->assertEquals(80, $req->getPort());
+    }
+
+    /**
+     * Test get scheme
+     */
+    public function testGetSchemeIfHttp()
+    {
+        $env = \Slim\Environment::mock(array(
+            'slim.url_scheme' => 'http'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('http', $req->getScheme());
+    }
+
+    /**
+     * Test get scheme
+     */
+    public function testGetSchemeIfHttps()
+    {
+        $env = \Slim\Environment::mock(array(
+            'slim.url_scheme' => 'https',
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('https', $req->getScheme());
+    }
+
+    /**
+     * Test get [script name, root uri, path, path info, resource uri] in subdirectory without htaccess
+     */
+    public function testAppPathsInSubdirectoryWithoutHtaccess()
+    {
+        $env = \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo/index.php', //<-- Physical
+            'PATH_INFO' => '/bar/xyz', //<-- Virtual
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('/foo/index.php', $req->getScriptName());
+        $this->assertEquals('/foo/index.php', $req->getRootUri());
+        $this->assertEquals('/foo/index.php/bar/xyz', $req->getPath());
+        $this->assertEquals('/bar/xyz', $req->getPathInfo());
+        $this->assertEquals('/bar/xyz', $req->getResourceUri());
+    }
+
+    /**
+     * Test get [script name, root uri, path, path info, resource uri] in subdirectory with htaccess
+     */
+    public function testAppPathsInSubdirectoryWithHtaccess()
+    {
+        $env = \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar/xyz', //<-- Virtual
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('/foo', $req->getScriptName());
+        $this->assertEquals('/foo', $req->getRootUri());
+        $this->assertEquals('/foo/bar/xyz', $req->getPath());
+        $this->assertEquals('/bar/xyz', $req->getPathInfo());
+        $this->assertEquals('/bar/xyz', $req->getResourceUri());
+    }
+
+    /**
+     * Test get [script name, root uri, path, path info, resource uri] in root directory without htaccess
+     */
+    public function testAppPathsInRootDirectoryWithoutHtaccess()
+    {
+        $env = \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/index.php', //<-- Physical
+            'PATH_INFO' => '/bar/xyz', //<-- Virtual
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('/index.php', $req->getScriptName());
+        $this->assertEquals('/index.php', $req->getRootUri());
+        $this->assertEquals('/index.php/bar/xyz', $req->getPath());
+        $this->assertEquals('/bar/xyz', $req->getPathInfo());
+        $this->assertEquals('/bar/xyz', $req->getResourceUri());
+    }
+
+    /**
+     * Test get [script name, root uri, path, path info, resource uri] in root directory with htaccess
+     */
+    public function testAppPathsInRootDirectoryWithHtaccess()
+    {
+        $env = \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '', //<-- Physical
+            'PATH_INFO' => '/bar/xyz', //<-- Virtual
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('', $req->getScriptName());
+        $this->assertEquals('', $req->getRootUri());
+        $this->assertEquals('/bar/xyz', $req->getPath());
+        $this->assertEquals('/bar/xyz', $req->getPathInfo());
+        $this->assertEquals('/bar/xyz', $req->getResourceUri());
+    }
+
+    /**
+     * Test get URL
+     */
+    public function testGetUrl()
+    {
+        $env = \Slim\Environment::mock(array(
+            'HTTP_HOST' => 'slimframework.com',
+            'SERVER_NAME' => 'slim',
+            'SERVER_PORT' => 80,
+            'slim.url_scheme' => 'http'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('http://slimframework.com', $req->getUrl());
+    }
+
+    /**
+     * Test get URL
+     */
+    public function testGetUrlWithCustomPort()
+    {
+        $env = \Slim\Environment::mock(array(
+            'HTTP_HOST' => 'slimframework.com',
+            'SERVER_NAME' => 'slim',
+            'SERVER_PORT' => 8080,
+            'slim.url_scheme' => 'http'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('http://slimframework.com:8080', $req->getUrl());
+    }
+
+    /**
+     * Test get URL
+     */
+    public function testGetUrlWithHttps()
+    {
+        $env = \Slim\Environment::mock(array(
+            'HTTP_HOST' => 'slimframework.com',
+            'SERVER_NAME' => 'slim',
+            'SERVER_PORT' => 443,
+            'slim.url_scheme' => 'https'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('https://slimframework.com', $req->getUrl());
+    }
+
+    /**
+     * Test get IP
+     *  @dataProvider dataTestIp
+     */
+    public function testGetIp(array $server, $expected)
+    {
+        $env = \Slim\Environment::mock($server);
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals($expected, $req->getIp());
+    }
+
+    public function dataTestIp()
+    {
+        return array(
+                array(array('REMOTE_ADDR' => '127.0.0.1'), '127.0.0.1'),
+                array(array('REMOTE_ADDR' => '127.0.0.1', 'CLIENT_IP' => '127.0.0.2'), '127.0.0.2'),
+                array(array('REMOTE_ADDR' => '127.0.0.1', 'CLIENT_IP' => '127.0.0.2', 'X_FORWARDED_FOR' => '127.0.0.3'), '127.0.0.3'),
+                array(array('REMOTE_ADDR' => '127.0.0.1', 'CLIENT_IP' => '127.0.0.2', 'HTTP_X_FORWARDED_FOR' => '127.0.0.4'), '127.0.0.4'),
+                array(array('REMOTE_ADDR' => '127.0.0.1', 'CLIENT_IP' => '127.0.0.2', 'X_FORWARDED_FOR' => '127.0.0.3', 'HTTP_X_FORWARDED_FOR' => '127.0.0.4'), '127.0.0.3'),
+        );
+    }
+
+    /**
+     * Test get referer
+     */
+    public function testGetReferrer()
+    {
+        $env = \Slim\Environment::mock(array(
+            'HTTP_REFERER' => 'http://foo.com'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('http://foo.com', $req->getReferrer());
+        $this->assertEquals('http://foo.com', $req->getReferer());
+    }
+
+    /**
+     * Test get referer
+     */
+    public function testGetReferrerWhenNotExists()
+    {
+        $env = \Slim\Environment::mock();
+        $req = new \Slim\Http\Request($env);
+        $this->assertNull($req->getReferrer());
+        $this->assertNull($req->getReferer());
+    }
+
+    /**
+     * Test get user agent string
+     */
+    public function testGetUserAgent()
+    {
+        $env = \Slim\Environment::mock(array(
+            'HTTP_USER_AGENT' => 'user-agent-string'
+        ));
+        $req = new \Slim\Http\Request($env);
+        $this->assertEquals('user-agent-string', $req->getUserAgent());
+    }
+
+    /**
+     * Test get user agent string when not set
+     */
+    public function testGetUserAgentWhenNotExists()
+    {
+        $env = \Slim\Environment::mock();
+        unset($env['HTTP_USER_AGENT']);
+        $req = new \Slim\Http\Request($env);
+        $this->assertNull($req->getUserAgent());
+    }
+}
diff --git a/vendor/slim/slim/tests/Http/ResponseTest.php b/vendor/slim/slim/tests/Http/ResponseTest.php
new file mode 100644
index 00000000..c251fa10
--- /dev/null
+++ b/vendor/slim/slim/tests/Http/ResponseTest.php
@@ -0,0 +1,271 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class ResponseTest extends PHPUnit_Framework_TestCase
+{
+    public function testConstructWithoutArgs()
+    {
+        $res = new \Slim\Http\Response();
+
+        $this->assertAttributeEquals(200, 'status', $res);
+        $this->assertAttributeEquals('', 'body', $res);
+    }
+
+    public function testConstructWithArgs()
+    {
+        $res = new \Slim\Http\Response('Foo', 201);
+
+        $this->assertAttributeEquals(201, 'status', $res);
+        $this->assertAttributeEquals('Foo', 'body', $res);
+    }
+
+    public function testGetStatus()
+    {
+        $res = new \Slim\Http\Response();
+
+        $this->assertEquals(200, $res->getStatus());
+    }
+
+    public function testSetStatus()
+    {
+        $res = new \Slim\Http\Response();
+        $res->setStatus(301);
+
+        $this->assertAttributeEquals(301, 'status', $res);
+    }
+
+    /**
+     * DEPRECATION WARNING!
+     */
+    public function testStatusGetOld()
+    {
+        $res = new \Slim\Http\Response('', 201);
+        $this->assertEquals(201, $res->status());
+    }
+
+    /**
+     * DEPRECATION WARNING!
+     */
+    public function testStatusSetOld()
+    {
+        $res = new \Slim\Http\Response();
+        $prop = new \ReflectionProperty($res, 'status');
+        $prop->setAccessible(true);
+        $res->status(301);
+
+        $this->assertEquals(301, $prop->getValue($res));
+    }
+
+    public function testGetBody()
+    {
+        $res = new \Slim\Http\Response();
+        $property = new \ReflectionProperty($res, 'body');
+        $property->setAccessible(true);
+        $property->setValue($res, 'foo');
+
+        $this->assertEquals('foo', $res->getBody());
+    }
+
+    public function testSetBody()
+    {
+        $res = new \Slim\Http\Response('bar');
+        $res->setBody('foo'); // <-- Should replace body
+
+        $this->assertAttributeEquals('foo', 'body', $res);
+    }
+
+    public function testWrite()
+    {
+        $res = new \Slim\Http\Response();
+        $property = new \ReflectionProperty($res, 'body');
+        $property->setAccessible(true);
+        $property->setValue($res, 'foo');
+        $res->write('bar'); // <-- Should append to body
+
+        $this->assertAttributeEquals('foobar', 'body', $res);
+    }
+
+    public function testLength()
+    {
+        $res = new \Slim\Http\Response('foo'); // <-- Sets body and length
+
+        $this->assertEquals(3, $res->getLength());
+    }
+
+    public function testFinalize()
+    {
+        $res = new \Slim\Http\Response();
+        $resFinal = $res->finalize();
+
+        $this->assertTrue(is_array($resFinal));
+        $this->assertEquals(3, count($resFinal));
+        $this->assertEquals(200, $resFinal[0]);
+        $this->assertInstanceOf('\Slim\Http\Headers', $resFinal[1]);
+        $this->assertEquals('', $resFinal[2]);
+    }
+
+    public function testFinalizeWithEmptyBody()
+    {
+        $res = new \Slim\Http\Response('Foo', 304);
+        $resFinal = $res->finalize();
+
+        $this->assertEquals('', $resFinal[2]);
+    }
+
+    public function testRedirect()
+    {
+        $res = new \Slim\Http\Response();
+        $res->redirect('/foo');
+
+        $pStatus = new \ReflectionProperty($res, 'status');
+        $pStatus->setAccessible(true);
+
+        $this->assertEquals(302, $pStatus->getValue($res));
+        $this->assertEquals('/foo', $res->headers['Location']);
+    }
+
+    public function testIsEmpty()
+    {
+        $r1 = new \Slim\Http\Response();
+        $r2 = new \Slim\Http\Response();
+        $r1->setStatus(404);
+        $r2->setStatus(201);
+        $this->assertFalse($r1->isEmpty());
+        $this->assertTrue($r2->isEmpty());
+    }
+
+    public function testIsClientError()
+    {
+        $r1 = new \Slim\Http\Response();
+        $r2 = new \Slim\Http\Response();
+        $r1->setStatus(404);
+        $r2->setStatus(500);
+        $this->assertTrue($r1->isClientError());
+        $this->assertFalse($r2->isClientError());
+    }
+
+    public function testIsForbidden()
+    {
+        $r1 = new \Slim\Http\Response();
+        $r2 = new \Slim\Http\Response();
+        $r1->setStatus(403);
+        $r2->setStatus(500);
+        $this->assertTrue($r1->isForbidden());
+        $this->assertFalse($r2->isForbidden());
+    }
+
+    public function testIsInformational()
+    {
+        $r1 = new \Slim\Http\Response();
+        $r2 = new \Slim\Http\Response();
+        $r1->setStatus(100);
+        $r2->setStatus(200);
+        $this->assertTrue($r1->isInformational());
+        $this->assertFalse($r2->isInformational());
+    }
+
+    public function testIsNotFound()
+    {
+        $r1 = new \Slim\Http\Response();
+        $r2 = new \Slim\Http\Response();
+        $r1->setStatus(404);
+        $r2->setStatus(200);
+        $this->assertTrue($r1->isNotFound());
+        $this->assertFalse($r2->isNotFound());
+    }
+
+    public function testIsOk()
+    {
+        $r1 = new \Slim\Http\Response();
+        $r2 = new \Slim\Http\Response();
+        $r1->setStatus(200);
+        $r2->setStatus(201);
+        $this->assertTrue($r1->isOk());
+        $this->assertFalse($r2->isOk());
+    }
+
+    public function testIsSuccessful()
+    {
+        $r1 = new \Slim\Http\Response();
+        $r2 = new \Slim\Http\Response();
+        $r3 = new \Slim\Http\Response();
+        $r1->setStatus(200);
+        $r2->setStatus(201);
+        $r3->setStatus(302);
+        $this->assertTrue($r1->isSuccessful());
+        $this->assertTrue($r2->isSuccessful());
+        $this->assertFalse($r3->isSuccessful());
+    }
+
+    public function testIsRedirect()
+    {
+        $r1 = new \Slim\Http\Response();
+        $r2 = new \Slim\Http\Response();
+        $r1->setStatus(307);
+        $r2->setStatus(304);
+        $this->assertTrue($r1->isRedirect());
+        $this->assertFalse($r2->isRedirect());
+    }
+
+    public function testIsRedirection()
+    {
+        $r1 = new \Slim\Http\Response();
+        $r2 = new \Slim\Http\Response();
+        $r3 = new \Slim\Http\Response();
+        $r1->setStatus(307);
+        $r2->setStatus(304);
+        $r3->setStatus(200);
+        $this->assertTrue($r1->isRedirection());
+        $this->assertTrue($r2->isRedirection());
+        $this->assertFalse($r3->isRedirection());
+    }
+
+    public function testIsServerError()
+    {
+        $r1 = new \Slim\Http\Response();
+        $r2 = new \Slim\Http\Response();
+        $r1->setStatus(500);
+        $r2->setStatus(400);
+        $this->assertTrue($r1->isServerError());
+        $this->assertFalse($r2->isServerError());
+    }
+
+    public function testMessageForCode()
+    {
+        $this->assertEquals('200 OK', \Slim\Http\Response::getMessageForCode(200));
+    }
+
+    public function testMessageForCodeWithInvalidCode()
+    {
+        $this->assertNull(\Slim\Http\Response::getMessageForCode(600));
+    }
+}
diff --git a/vendor/slim/slim/tests/Http/UtilTest.php b/vendor/slim/slim/tests/Http/UtilTest.php
new file mode 100644
index 00000000..9abcfaba
--- /dev/null
+++ b/vendor/slim/slim/tests/Http/UtilTest.php
@@ -0,0 +1,445 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class SlimHttpUtilTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Test strip slashes when magic quotes disabled
+     */
+    public function testStripSlashesWithoutMagicQuotes()
+    {
+        $data = "This should have \"quotes\" in it";
+        $stripped = \Slim\Http\Util::stripSlashesIfMagicQuotes($data, false);
+        $this->assertEquals($data, $stripped);
+    }
+
+    /**
+     * Test strip slashes from array when magic quotes disabled
+     */
+    public function testStripSlashesFromArrayWithoutMagicQuotes()
+    {
+        $data = array("This should have \"quotes\" in it", "And this \"too\" has quotes");
+        $stripped = \Slim\Http\Util::stripSlashesIfMagicQuotes($data, false);
+        $this->assertEquals($data, $stripped);
+    }
+
+    /**
+     * Test strip slashes when magic quotes enabled
+     */
+    public function testStripSlashesWithMagicQuotes()
+    {
+        $data = "This should have \"quotes\" in it";
+        $stripped = \Slim\Http\Util::stripSlashesIfMagicQuotes($data, true);
+        $this->assertEquals('This should have "quotes" in it', $stripped);
+    }
+
+    /**
+     * Test strip slashes from array when magic quotes enabled
+     */
+    public function testStripSlashesFromArrayWithMagicQuotes()
+    {
+        $data = array("This should have \"quotes\" in it", "And this \"too\" has quotes");
+        $stripped = \Slim\Http\Util::stripSlashesIfMagicQuotes($data, true);
+        $this->assertEquals($data = array('This should have "quotes" in it', 'And this "too" has quotes'), $stripped);
+    }
+
+    /**
+     * Test encrypt and decrypt with valid data
+     */
+    public function testEncryptAndDecryptWithValidData()
+    {
+        $data = 'foo';
+        $key = 'secret';
+        $iv = md5('initializationVector');
+        $encrypted = \Slim\Http\Util::encrypt($data, $key, $iv);
+        $decrypted = \Slim\Http\Util::decrypt($encrypted, $key, $iv);
+        $this->assertEquals($data, $decrypted);
+        $this->assertTrue($data !== $encrypted);
+    }
+
+    /**
+     * Test encrypt when data is empty string
+     */
+    public function testEncryptWhenDataIsEmptyString()
+    {
+        $data = '';
+        $key = 'secret';
+        $iv = md5('initializationVector');
+        $encrypted = \Slim\Http\Util::encrypt($data, $key, $iv);
+        $this->assertEquals('', $encrypted);
+    }
+
+    /**
+     * Test decrypt when data is empty string
+     */
+    public function testDecryptWhenDataIsEmptyString()
+    {
+        $data = '';
+        $key = 'secret';
+        $iv = md5('initializationVector');
+        $decrypted = \Slim\Http\Util::decrypt($data, $key, $iv);
+        $this->assertEquals('', $decrypted);
+    }
+
+    /**
+     * Test encrypt when IV and key sizes are too long
+     */
+    public function testEncryptAndDecryptWhenKeyAndIvAreTooLong()
+    {
+        $data = 'foo';
+        $key = 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz';
+        $iv = 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz';
+        $encrypted = \Slim\Http\Util::encrypt($data, $key, $iv);
+        $decrypted = \Slim\Http\Util::decrypt($encrypted, $key, $iv);
+        $this->assertEquals($data, $decrypted);
+        $this->assertTrue($data !== $encrypted);
+    }
+
+    public function testEncodeAndDecodeSecureCookieWithValidData()
+    {
+        //Prepare cookie value
+        $value = 'foo';
+        $expires = time() + 86400;
+        $secret = 'password';
+        $algorithm = MCRYPT_RIJNDAEL_256;
+        $mode = MCRYPT_MODE_CBC;
+        $encodedValue = \Slim\Http\Util::encodeSecureCookie($value, $expires, $secret, $algorithm, $mode);
+        $decodedValue = \Slim\Http\Util::decodeSecureCookie($encodedValue, $secret, $algorithm, $mode);
+
+        //Test secure cookie value
+        $parts = explode('|', $encodedValue);
+        $this->assertEquals(3, count($parts));
+        $this->assertEquals($expires, $parts[0]);
+        $this->assertEquals($value, $decodedValue);
+    }
+
+    /**
+     * Test encode/decode secure cookie with old expiration
+     *
+     * In this test, the expiration date is purposefully set to a time before now.
+     * When decoding the encoded cookie value, FALSE is returned since the cookie
+     * will have expired before it is decoded.
+     */
+    public function testEncodeAndDecodeSecureCookieWithOldExpiration()
+    {
+        $value = 'foo';
+        $expires = time() - 100;
+        $secret = 'password';
+        $algorithm = MCRYPT_RIJNDAEL_256;
+        $mode = MCRYPT_MODE_CBC;
+        $encodedValue = \Slim\Http\Util::encodeSecureCookie($value, $expires, $secret, $algorithm, $mode);
+        $decodedValue = \Slim\Http\Util::decodeSecureCookie($encodedValue, $secret, $algorithm, $mode);
+        $this->assertFalse($decodedValue);
+    }
+
+    /**
+     * Test encode/decode secure cookie with tampered data
+     *
+     * In this test, the encoded data is purposefully changed to simulate someone
+     * tampering with the client-side cookie data. When decoding the encoded cookie value,
+     * FALSE is returned since the verification key will not match.
+     */
+    public function testEncodeAndDecodeSecureCookieWithTamperedData()
+    {
+        $value = 'foo';
+        $expires = time() + 86400;
+        $secret = 'password';
+        $algorithm = MCRYPT_RIJNDAEL_256;
+        $mode = MCRYPT_MODE_CBC;
+        $encodedValue = \Slim\Http\Util::encodeSecureCookie($value, $expires, $secret, $algorithm, $mode);
+        $encodedValueParts = explode('|', $encodedValue);
+        $encodedValueParts[1] = $encodedValueParts[1] . 'changed';
+        $encodedValue = implode('|', $encodedValueParts);
+        $decodedValue = \Slim\Http\Util::decodeSecureCookie($encodedValue, $secret, $algorithm, $mode);
+        $this->assertFalse($decodedValue);
+    }
+
+    public function testSetCookieHeaderWithNameAndValue()
+    {
+        $name = 'foo';
+        $value = 'bar';
+        $header = array();
+        \Slim\Http\Util::setCookieHeader($header, $name, $value);
+        $this->assertEquals('foo=bar', $header['Set-Cookie']);
+    }
+
+    public function testSetCookieHeaderWithNameAndValueWhenCookieAlreadySet()
+    {
+        $name = 'foo';
+        $value = 'bar';
+        $header = array('Set-Cookie' => 'one=two');
+        \Slim\Http\Util::setCookieHeader($header, $name, $value);
+        $this->assertEquals("one=two\nfoo=bar", $header['Set-Cookie']);
+    }
+
+    public function testSetCookieHeaderWithNameAndValueAndDomain()
+    {
+        $name = 'foo';
+        $value = 'bar';
+        $domain = 'foo.com';
+        $header = array();
+        \Slim\Http\Util::setCookieHeader($header, $name, array(
+            'value' => $value,
+            'domain' => $domain
+        ));
+        $this->assertEquals('foo=bar; domain=foo.com', $header['Set-Cookie']);
+    }
+
+    public function testSetCookieHeaderWithNameAndValueAndDomainAndPath()
+    {
+        $name = 'foo';
+        $value = 'bar';
+        $domain = 'foo.com';
+        $path = '/foo';
+        $header = array();
+        \Slim\Http\Util::setCookieHeader($header, $name, array(
+            'value' => $value,
+            'domain' => $domain,
+            'path' => $path
+        ));
+        $this->assertEquals('foo=bar; domain=foo.com; path=/foo', $header['Set-Cookie']);
+    }
+
+    public function testSetCookieHeaderWithNameAndValueAndDomainAndPathAndExpiresAsString()
+    {
+        $name = 'foo';
+        $value = 'bar';
+        $domain = 'foo.com';
+        $path = '/foo';
+        $expires = '2 days';
+        $expiresFormat = gmdate('D, d-M-Y H:i:s e', strtotime($expires));
+        $header = array();
+        \Slim\Http\Util::setCookieHeader($header, $name, array(
+            'value' => $value,
+            'domain' => $domain,
+            'path' => '/foo',
+            'expires' => $expires
+        ));
+        $this->assertEquals('foo=bar; domain=foo.com; path=/foo; expires=' . $expiresFormat, $header['Set-Cookie']);
+    }
+
+    public function testSetCookieHeaderWithNameAndValueAndDomainAndPathAndExpiresAsInteger()
+    {
+        $name = 'foo';
+        $value = 'bar';
+        $domain = 'foo.com';
+        $path = '/foo';
+        $expires = strtotime('2 days');
+        $expiresFormat = gmdate('D, d-M-Y H:i:s e', $expires);
+        $header = array();
+        \Slim\Http\Util::setCookieHeader($header, $name, array(
+            'value' => $value,
+            'domain' => $domain,
+            'path' => '/foo',
+            'expires' => $expires
+        ));
+        $this->assertEquals('foo=bar; domain=foo.com; path=/foo; expires=' . $expiresFormat, $header['Set-Cookie']);
+    }
+
+    public function testSetCookieHeaderWithNameAndValueAndDomainAndPathAndExpiresAsZero()
+    {
+        $name = 'foo';
+        $value = 'bar';
+        $domain = 'foo.com';
+        $path = '/foo';
+        $expires = 0;
+        $header = array();
+        \Slim\Http\Util::setCookieHeader($header, $name, array(
+            'value' => $value,
+            'domain' => $domain,
+            'path' => '/foo',
+            'expires' => $expires
+        ));
+        $this->assertEquals('foo=bar; domain=foo.com; path=/foo', $header['Set-Cookie']);
+    }
+
+    public function testSetCookieHeaderWithNameAndValueAndDomainAndPathAndExpiresAndSecure()
+    {
+        $name = 'foo';
+        $value = 'bar';
+        $domain = 'foo.com';
+        $path = '/foo';
+        $expires = strtotime('2 days');
+        $expiresFormat = gmdate('D, d-M-Y H:i:s e', $expires);
+        $secure = true;
+        $header = array();
+        \Slim\Http\Util::setCookieHeader($header, $name, array(
+            'value' => $value,
+            'domain' => $domain,
+            'path' => '/foo',
+            'expires' => $expires,
+            'secure' => $secure
+        ));
+        $this->assertEquals('foo=bar; domain=foo.com; path=/foo; expires=' . $expiresFormat . '; secure', $header['Set-Cookie']);
+    }
+
+    public function testSetCookieHeaderWithNameAndValueAndDomainAndPathAndExpiresAndSecureAndHttpOnly()
+    {
+        $name = 'foo';
+        $value = 'bar';
+        $domain = 'foo.com';
+        $path = '/foo';
+        $expires = strtotime('2 days');
+        $expiresFormat = gmdate('D, d-M-Y H:i:s e', $expires);
+        $secure = true;
+        $httpOnly = true;
+        $header = array();
+        \Slim\Http\Util::setCookieHeader($header, $name, array(
+            'value' => $value,
+            'domain' => $domain,
+            'path' => '/foo',
+            'expires' => $expires,
+            'secure' => $secure,
+            'httponly' => $httpOnly
+        ));
+        $this->assertEquals('foo=bar; domain=foo.com; path=/foo; expires=' . $expiresFormat . '; secure; HttpOnly', $header['Set-Cookie']);
+    }
+
+    /**
+     * Test serializeCookies and decrypt with string expires
+     *
+     * In this test a cookie with a string typed value for 'expires' is set,
+     * which should be parsed by `strtotime` to a timestamp when it's added to
+     * the headers; this timestamp should then be correctly parsed, and the
+     * value correctly decrypted, by `decodeSecureCookie`.
+     */
+    public function testSerializeCookiesAndDecryptWithStringExpires()
+    {
+        $value = 'bar';
+
+        $headers = new \Slim\Http\Headers();
+
+        $settings = array(
+            'cookies.encrypt' => true,
+            'cookies.secret_key' => 'secret',
+            'cookies.cipher' => MCRYPT_RIJNDAEL_256,
+            'cookies.cipher_mode' => MCRYPT_MODE_CBC
+        );
+
+        $cookies = new \Slim\Http\Cookies();
+        $cookies->set('foo',  array(
+            'value' => $value,
+            'expires' => '1 hour'
+        ));
+
+        \Slim\Http\Util::serializeCookies($headers, $cookies, $settings);
+
+        $encrypted = $headers->get('Set-Cookie');
+        $encrypted = strstr($encrypted, ';', true);
+        $encrypted = urldecode(substr(strstr($encrypted, '='), 1));
+
+        $decrypted = \Slim\Http\Util::decodeSecureCookie(
+            $encrypted,
+            $settings['cookies.secret_key'],
+            $settings['cookies.cipher'],
+            $settings['cookies.cipher_mode']
+        );
+
+        $this->assertEquals($value, $decrypted);
+        $this->assertTrue($value !== $encrypted);
+    }
+
+    public function testDeleteCookieHeaderWithSurvivingCookie()
+    {
+        $header = array('Set-Cookie' => "foo=bar\none=two");
+        \Slim\Http\Util::deleteCookieHeader($header, 'foo');
+        $this->assertEquals(1, preg_match("@^one=two\nfoo=; expires=@", $header['Set-Cookie']));
+    }
+
+    public function testDeleteCookieHeaderWithoutSurvivingCookie()
+    {
+        $header = array('Set-Cookie' => "foo=bar");
+        \Slim\Http\Util::deleteCookieHeader($header, 'foo');
+        $this->assertEquals(1, preg_match("@foo=; expires=@", $header['Set-Cookie']));
+    }
+
+    public function testDeleteCookieHeaderWithMatchingDomain()
+    {
+        $header = array('Set-Cookie' => "foo=bar; domain=foo.com");
+        \Slim\Http\Util::deleteCookieHeader($header, 'foo', array(
+            'domain' => 'foo.com'
+        ));
+        $this->assertEquals(1, preg_match("@foo=; domain=foo.com; expires=@", $header['Set-Cookie']));
+    }
+
+    public function testDeleteCookieHeaderWithoutMatchingDomain()
+    {
+        $header = array('Set-Cookie' => "foo=bar; domain=foo.com");
+        \Slim\Http\Util::deleteCookieHeader($header, 'foo', array(
+            'domain' => 'bar.com'
+        ));
+        $this->assertEquals(1, preg_match("@foo=bar; domain=foo\.com\nfoo=; domain=bar\.com@", $header['Set-Cookie']));
+    }
+
+    /**
+     * Test parses Cookie: HTTP header
+     */
+    public function testParsesCookieHeader()
+    {
+        $header = 'foo=bar; one=two; colors=blue';
+        $result = \Slim\Http\Util::parseCookieHeader($header);
+        $this->assertEquals(3, count($result));
+        $this->assertEquals('bar', $result['foo']);
+        $this->assertEquals('two', $result['one']);
+        $this->assertEquals('blue', $result['colors']);
+    }
+
+    /**
+     * Test parses Cookie: HTTP header with `=` in the cookie value
+     */
+    public function testParsesCookieHeaderWithEqualSignInValue()
+    {
+        $header = 'foo=bar; one=two=; colors=blue';
+        $result = \Slim\Http\Util::parseCookieHeader($header);
+        $this->assertEquals(3, count($result));
+        $this->assertEquals('bar', $result['foo']);
+        $this->assertEquals('two=', $result['one']);
+        $this->assertEquals('blue', $result['colors']);
+    }
+
+    public function testParsesCookieHeaderWithCommaSeparator()
+    {
+        $header = 'foo=bar, one=two, colors=blue';
+        $result = \Slim\Http\Util::parseCookieHeader($header);
+        $this->assertEquals(3, count($result));
+        $this->assertEquals('bar', $result['foo']);
+        $this->assertEquals('two', $result['one']);
+        $this->assertEquals('blue', $result['colors']);
+    }
+
+    public function testPrefersLeftmostCookieWhenManyCookiesWithSameName()
+    {
+        $header = 'foo=bar; foo=beer';
+        $result = \Slim\Http\Util::parseCookieHeader($header);
+        $this->assertEquals('bar', $result['foo']);
+    }
+}
diff --git a/vendor/slim/slim/tests/LogTest.php b/vendor/slim/slim/tests/LogTest.php
new file mode 100644
index 00000000..28f99e8a
--- /dev/null
+++ b/vendor/slim/slim/tests/LogTest.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class MyWriter
+{
+    public function write( $object, $level )
+    {
+        echo (string) $object;
+
+        return true;
+    }
+}
+
+class LogTest extends PHPUnit_Framework_TestCase
+{
+    public function testEnabled()
+    {
+        $log = new \Slim\Log(new MyWriter());
+        $this->assertTrue($log->isEnabled()); //<-- Default case
+        $log->setEnabled(true);
+        $this->assertTrue($log->isEnabled());
+        $log->setEnabled(false);
+        $this->assertFalse($log->isEnabled());
+    }
+
+    public function testGetLevel()
+    {
+        $log = new \Slim\Log(new MyWriter());
+        $this->assertEquals(\Slim\Log::DEBUG, $log->getLevel());
+    }
+
+    public function testSetLevel()
+    {
+        $log = new \Slim\Log(new MyWriter());
+        $log->setLevel(\Slim\Log::WARN);
+        $this->assertEquals(\Slim\Log::WARN, $log->getLevel());
+    }
+
+    public function testSetInvalidLevel()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+        $log = new \Slim\Log(new MyWriter());
+        $log->setLevel(\Slim\Log::DEBUG + 1);
+    }
+
+    public function testLogDebug()
+    {
+        $this->expectOutputString('Debug');
+        $log = new \Slim\Log(new MyWriter());
+        $result = $log->debug('Debug');
+        $this->assertTrue($result);
+    }
+
+    public function testLogDebugExcludedByLevel()
+    {
+        $log = new \Slim\Log(new MyWriter());
+        $log->setLevel(\Slim\Log::INFO);
+        $this->assertFalse($log->debug('Debug'));
+    }
+
+    public function testLogInfo()
+    {
+        $this->expectOutputString('Info');
+        $log = new \Slim\Log(new MyWriter());
+        $result = $log->info('Info');
+        $this->assertTrue($result);
+    }
+
+    public function testLogInfoExcludedByLevel()
+    {
+        $log = new \Slim\Log(new MyWriter());
+        $log->setLevel(\Slim\Log::NOTICE);
+        $this->assertFalse($log->info('Info'));
+    }
+
+    public function testLogNotice()
+    {
+        $this->expectOutputString('Notice');
+        $log = new \Slim\Log(new MyWriter());
+        $result = $log->notice('Notice');
+        $this->assertTrue($result);
+    }
+
+    public function testLogNoticeExcludedByLevel()
+    {
+        $log = new \Slim\Log(new MyWriter());
+        $log->setLevel(\Slim\Log::WARN);
+        $this->assertFalse($log->info('Info'));
+    }
+
+    public function testLogWarn()
+    {
+        $this->expectOutputString('Warn');
+        $log = new \Slim\Log(new MyWriter());
+        $result = $log->warning('Warn');
+        $this->assertTrue($result);
+    }
+
+    public function testLogWarnExcludedByLevel()
+    {
+        $log = new \Slim\Log(new MyWriter());
+        $log->setLevel(\Slim\Log::ERROR);
+        $this->assertFalse($log->warning('Warn'));
+    }
+
+    public function testLogError()
+    {
+        $this->expectOutputString('Error');
+        $log = new \Slim\Log(new MyWriter());
+        $result = $log->error('Error');
+        $this->assertTrue($result);
+    }
+
+    public function testLogErrorExcludedByLevel()
+    {
+        $log = new \Slim\Log(new MyWriter());
+        $log->setLevel(\Slim\Log::CRITICAL);
+        $this->assertFalse($log->error('Error'));
+    }
+
+    public function testLogCritical()
+    {
+        $this->expectOutputString('Critical');
+        $log = new \Slim\Log(new MyWriter());
+        $result = $log->critical('Critical');
+        $this->assertTrue($result);
+    }
+
+    public function testLogCriticalExcludedByLevel()
+    {
+        $log = new \Slim\Log(new MyWriter());
+        $log->setLevel(\Slim\Log::ALERT);
+        $this->assertFalse($log->critical('Critical'));
+    }
+
+    public function testLogAlert()
+    {
+        $this->expectOutputString('Alert');
+        $log = new \Slim\Log(new MyWriter());
+        $result = $log->alert('Alert');
+        $this->assertTrue($result);
+    }
+
+    public function testLogAlertExcludedByLevel()
+    {
+        $log = new \Slim\Log(new MyWriter());
+        $log->setLevel(\Slim\Log::EMERGENCY);
+        $this->assertFalse($log->alert('Alert'));
+    }
+
+    public function testLogEmergency()
+    {
+        $this->expectOutputString('Emergency');
+        $log = new \Slim\Log(new MyWriter());
+        $result = $log->emergency('Emergency');
+        $this->assertTrue($result);
+    }
+
+    public function testInterpolateMessage()
+    {
+        $this->expectOutputString('Hello Slim !');
+        $log = new \Slim\Log(new MyWriter());
+        $result = $log->debug(
+            'Hello {framework} !',
+            array('framework' => "Slim")
+        );
+        $this->assertTrue($result);
+    }
+
+    public function testGetAndSetWriter()
+    {
+        $writer1 = new MyWriter();
+        $writer2 = new MyWriter();
+        $log = new \Slim\Log($writer1);
+        $this->assertSame($writer1, $log->getWriter());
+        $log->setWriter($writer2);
+        $this->assertSame($writer2, $log->getWriter());
+    }
+}
diff --git a/vendor/slim/slim/tests/LogWriterTest.php b/vendor/slim/slim/tests/LogWriterTest.php
new file mode 100644
index 00000000..f36009d2
--- /dev/null
+++ b/vendor/slim/slim/tests/LogWriterTest.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class LogWriterTest extends PHPUnit_Framework_TestCase
+{
+    public function testInstantiation()
+    {
+        $this->expectOutputString('Hello!' . PHP_EOL);
+        $handle = fopen('php://output', 'w');
+        $fw = new \Slim\LogWriter($handle);
+        $this->assertTrue($fw->write('Hello!') > 0); //<-- Returns number of bytes written if successful
+    }
+
+    public function testInstantiationWithNonResource()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+        $fw = new \Slim\LogWriter(@fopen('/foo/bar.txt', 'w'));
+    }
+}
diff --git a/vendor/slim/slim/tests/Middleware/ContentTypesTest.php b/vendor/slim/slim/tests/Middleware/ContentTypesTest.php
new file mode 100644
index 00000000..4729a417
--- /dev/null
+++ b/vendor/slim/slim/tests/Middleware/ContentTypesTest.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class ContentTypesTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        ob_start();
+    }
+
+    public function tearDown()
+    {
+        ob_end_clean();
+    }
+
+    /**
+     * Test parses JSON
+     */
+    public function testParsesJson()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+            'CONTENT_TYPE' => 'application/json',
+            'CONENT_LENGTH' => 13,
+            'slim.input' => '{"foo":"bar"}'
+        ));
+        $s = new \Slim\Slim();
+        $s->add(new \Slim\Middleware\ContentTypes());
+        $s->run();
+        $body = $s->request()->getBody();
+        $this->assertTrue(is_array($body));
+        $this->assertEquals('bar', $body['foo']);
+    }
+
+    /**
+     * Test ignores JSON with errors
+     */
+    public function testParsesJsonWithError()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+            'CONTENT_TYPE' => 'application/json',
+            'CONENT_LENGTH' => 12,
+            'slim.input' => '{"foo":"bar"' //<-- This should be incorrect!
+        ));
+        $s = new \Slim\Slim();
+        $s->add(new \Slim\Middleware\ContentTypes());
+        $s->run();
+        $body = $s->request()->getBody();
+        $this->assertTrue(is_string($body));
+        $this->assertEquals('{"foo":"bar"', $body);
+    }
+
+    /**
+     * Test parses XML
+     */
+    public function testParsesXml()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+            'CONTENT_TYPE' => 'application/xml',
+            'CONENT_LENGTH' => 68,
+            'slim.input' => '<books><book><id>1</id><author>Clive Cussler</author></book></books>'
+        ));
+        $s = new \Slim\Slim();
+        $s->add(new \Slim\Middleware\ContentTypes());
+        $s->run();
+        $body = $s->request()->getBody();
+        $this->assertInstanceOf('SimpleXMLElement', $body);
+        $this->assertEquals('Clive Cussler', (string) $body->book->author);
+    }
+
+    /**
+     * Test ignores XML with errors
+     */
+    public function testParsesXmlWithError()
+    {
+	libxml_use_internal_errors(true);
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+            'CONTENT_TYPE' => 'application/xml',
+            'CONTENT_LENGTH' => 68,
+            'slim.input' => '<books><book><id>1</id><author>Clive Cussler</book></books>' //<-- This should be incorrect!
+        ));
+        $s = new \Slim\Slim();
+        $s->add(new \Slim\Middleware\ContentTypes());
+        $s->run();
+        $body = $s->request()->getBody();
+        $this->assertTrue(is_string($body));
+        $this->assertEquals('<books><book><id>1</id><author>Clive Cussler</book></books>', $body);
+    }
+
+    /**
+     * Test parses CSV
+     */
+    public function testParsesCsv()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+            'CONTENT_TYPE' => 'text/csv',
+            'CONTENT_LENGTH' => 44,
+            'slim.input' => "John,Doe,000-111-2222\nJane,Doe,111-222-3333"
+        ));
+        $s = new \Slim\Slim();
+        $s->add(new \Slim\Middleware\ContentTypes());
+        $s->run();
+        $body = $s->request()->getBody();
+        $this->assertTrue(is_array($body));
+        $this->assertEquals(2, count($body));
+        $this->assertEquals('000-111-2222', $body[0][2]);
+        $this->assertEquals('Doe', $body[1][1]);
+    }
+
+    /**
+     * Test parses request body based on media-type only, disregarding
+     * any extra content-type header parameters
+     */
+    public function testParsesRequestBodyWithMediaType()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+            'CONTENT_TYPE' => 'application/json; charset=ISO-8859-4',
+            'CONTENT_LENGTH' => 13,
+            'slim.input' => '{"foo":"bar"}'
+        ));
+        $s = new \Slim\Slim();
+        $s->add(new \Slim\Middleware\ContentTypes());
+        $s->run();
+        $body = $s->request()->getBody();
+        $this->assertTrue(is_array($body));
+        $this->assertEquals('bar', $body['foo']);
+    }
+}
diff --git a/vendor/slim/slim/tests/Middleware/FlashTest.php b/vendor/slim/slim/tests/Middleware/FlashTest.php
new file mode 100644
index 00000000..2faf2c17
--- /dev/null
+++ b/vendor/slim/slim/tests/Middleware/FlashTest.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class SlimFlashTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Setup
+     */
+    public function setUp()
+    {
+        $_SESSION = array();
+    }
+
+    /**
+     * Test set flash message for next request
+     */
+    public function testSetFlashForNextRequest()
+    {
+        $f = new \Slim\Middleware\Flash();
+        $f->set('foo', 'bar');
+        $f->save();
+        $this->assertEquals('bar', $_SESSION['slim.flash']['foo']);
+    }
+
+    /**
+     * Test set flash message for current request
+     */
+    public function testSetFlashForCurrentRequest()
+    {
+        $f = new \Slim\Middleware\Flash();
+        $f->now('foo', 'bar');
+        $this->assertEquals('bar', $f['foo']);
+    }
+
+    /**
+     * Test loads flash from previous request
+     */
+    public function testLoadsFlashFromPreviousRequest()
+    {
+        $_SESSION['slim.flash'] = array('info' => 'foo');
+        $f = new \Slim\Middleware\Flash();
+        $f->loadMessages();
+        $this->assertEquals('foo', $f['info']);
+    }
+
+    /**
+     * Test keep flash message for next request
+     */
+    public function testKeepFlashFromPreviousRequest()
+    {
+        $_SESSION['slim.flash'] = array('info' => 'foo');
+        $f = new \Slim\Middleware\Flash();
+        $f->loadMessages();
+        $f->keep();
+        $f->save();
+        $this->assertEquals('foo', $_SESSION['slim.flash']['info']);
+    }
+
+    /**
+     * Test flash messages from previous request do not persist to next request
+     */
+    public function testFlashMessagesFromPreviousRequestDoNotPersist()
+    {
+        $_SESSION['slim.flash'] = array('info' => 'foo');
+        $f = new \Slim\Middleware\Flash();
+        $f->save();
+        $this->assertEmpty($_SESSION['slim.flash']);
+    }
+
+    /**
+     * Test set Flash using array access
+     */
+    public function testFlashArrayAccess()
+    {
+        $_SESSION['slim.flash'] = array('info' => 'foo');
+        $f = new \Slim\Middleware\Flash();
+        $f['info'] = 'bar';
+        $f->save();
+        $this->assertTrue(isset($f['info']));
+        $this->assertEquals('bar', $f['info']);
+        unset($f['info']);
+        $this->assertFalse(isset($f['info']));
+    }
+
+    /**
+     * Test iteration
+     */
+    public function testIteration()
+    {
+        $_SESSION['slim.flash'] = array('info' => 'foo', 'error' => 'bar');
+        $f = new \Slim\Middleware\Flash();
+        $f->loadMessages();
+        $output = '';
+        foreach ($f as $key => $value) {
+            $output .= $key . $value;
+        }
+        $this->assertEquals('infofooerrorbar', $output);
+    }
+
+    /**
+     * Test countable
+     */
+    public function testCountable()
+    {
+        $_SESSION['slim.flash'] = array('info' => 'foo', 'error' => 'bar');
+        $f = new \Slim\MiddleWare\Flash();
+        $f->loadMessages();
+        $this->assertEquals(2, count($f));
+    }
+
+
+}
diff --git a/vendor/slim/slim/tests/Middleware/MethodOverrideTest.php b/vendor/slim/slim/tests/Middleware/MethodOverrideTest.php
new file mode 100644
index 00000000..c07e3974
--- /dev/null
+++ b/vendor/slim/slim/tests/Middleware/MethodOverrideTest.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * We use a mock application, instead of a Slim application.
+ * so that we may easily test the Method Override middleware
+ * in isolation.
+ */
+class CustomAppMethod
+{
+    protected $environment;
+
+    public function __construct()
+    {
+        $this->environment = \Slim\Environment::getInstance();
+    }
+
+    public function &environment() {
+        return $this->environment;
+    }
+
+    public function call()
+    {
+        //Do nothing
+    }
+}
+
+class MethodOverrideTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Test overrides method as POST
+     */
+    public function testOverrideMethodAsPost()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+            'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
+            'CONTENT_LENGTH' => 11,
+            'slim.input' => '_METHOD=PUT'
+        ));
+        $app = new CustomAppMethod();
+        $mw = new \Slim\Middleware\MethodOverride();
+        $mw->setApplication($app);
+        $mw->setNextMiddleware($app);
+        $mw->call();
+        $env =& $app->environment();
+        $this->assertEquals('PUT', $env['REQUEST_METHOD']);
+        $this->assertTrue(isset($env['slim.method_override.original_method']));
+        $this->assertEquals('POST', $env['slim.method_override.original_method']);
+    }
+
+    /**
+     * Test does not override method if not POST
+     */
+    public function testDoesNotOverrideMethodIfNotPost()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'GET',
+            'slim.input' => ''
+        ));
+        $app = new CustomAppMethod();
+        $mw = new \Slim\Middleware\MethodOverride();
+        $mw->setApplication($app);
+        $mw->setNextMiddleware($app);
+        $mw->call();
+        $env =& $app->environment();
+        $this->assertEquals('GET', $env['REQUEST_METHOD']);
+        $this->assertFalse(isset($env['slim.method_override.original_method']));
+    }
+
+    /**
+     * Test does not override method if no method override parameter
+     */
+    public function testDoesNotOverrideMethodAsPostWithoutParameter()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+            'REMOTE_ADDR' => '127.0.0.1',
+            'SCRIPT_NAME' => '/foo/index.php', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+            'QUERY_STRING' => 'foo=bar',
+            'SERVER_NAME' => 'slim',
+            'SERVER_PORT' => 80,
+            'slim.url_scheme' => 'http',
+            'slim.input' => '',
+            'slim.errors' => fopen('php://stderr', 'w')
+        ));
+        $app = new CustomAppMethod();
+        $mw = new \Slim\Middleware\MethodOverride();
+        $mw->setApplication($app);
+        $mw->setNextMiddleware($app);
+        $mw->call();
+        $env =& $app->environment();
+        $this->assertEquals('POST', $env['REQUEST_METHOD']);
+        $this->assertFalse(isset($env['slim.method_override.original_method']));
+    }
+
+    /**
+     * Test overrides method with X-Http-Method-Override header
+     */
+    public function testOverrideMethodAsHeader()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+            'CONTENT_TYPE' => 'application/json',
+            'CONTENT_LENGTH' => 0,
+            'slim.input' => '',
+            'HTTP_X_HTTP_METHOD_OVERRIDE' => 'DELETE'
+        ));
+        $app = new CustomAppMethod();
+        $mw = new \Slim\Middleware\MethodOverride();
+        $mw->setApplication($app);
+        $mw->setNextMiddleware($app);
+        $mw->call();
+        $env =& $app->environment();
+        $this->assertEquals('DELETE', $env['REQUEST_METHOD']);
+        $this->assertTrue(isset($env['slim.method_override.original_method']));
+        $this->assertEquals('POST', $env['slim.method_override.original_method']);
+    }
+}
diff --git a/vendor/slim/slim/tests/Middleware/PrettyExceptionsTest.php b/vendor/slim/slim/tests/Middleware/PrettyExceptionsTest.php
new file mode 100644
index 00000000..0ba88835
--- /dev/null
+++ b/vendor/slim/slim/tests/Middleware/PrettyExceptionsTest.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class PrettyExceptionsTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Test middleware returns successful response unchanged
+     */
+    public function testReturnsUnchangedSuccessResponse()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/index.php',
+            'PATH_INFO' => '/foo'
+        ));
+        $app = new \Slim\Slim();
+        $app->get('/foo', function () {
+            echo "Success";
+        });
+        $mw = new \Slim\Middleware\PrettyExceptions();
+        $mw->setApplication($app);
+        $mw->setNextMiddleware($app);
+        $mw->call();
+        $this->assertEquals(200, $app->response()->status());
+        $this->assertEquals('Success', $app->response()->body());
+    }
+
+    /**
+     * Test middleware returns diagnostic screen for error response
+     */
+    public function testReturnsDiagnosticsForErrorResponse()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/index.php',
+            'PATH_INFO' => '/foo'
+        ));
+        $app = new \Slim\Slim(array(
+            'log.enabled' => false
+        ));
+        $app->get('/foo', function () {
+            throw new \Exception('Test Message', 100);
+        });
+        $mw = new \Slim\Middleware\PrettyExceptions();
+        $mw->setApplication($app);
+        $mw->setNextMiddleware($app);
+        $mw->call();
+        $this->assertEquals(1, preg_match('@Slim Application Error@', $app->response()->body()));
+        $this->assertEquals(500, $app->response()->status());
+    }
+
+    /**
+     * Test middleware overrides response content type to html
+     */
+    public function testResponseContentTypeIsOverriddenToHtml()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/index.php',
+            'PATH_INFO' => '/foo'
+        ));
+        $app = new \Slim\Slim(array(
+            'log.enabled' => false
+        ));
+        $app->get('/foo', function () use ($app) {
+            $app->contentType('application/json;charset=utf-8'); //<-- set content type to something else
+            throw new \Exception('Test Message', 100);
+        });
+        $mw = new \Slim\Middleware\PrettyExceptions();
+        $mw->setApplication($app);
+        $mw->setNextMiddleware($app);
+        $mw->call();
+        $response = $app->response();
+        $this->assertEquals('text/html', $response['Content-Type']);
+    }
+
+    /**
+     * Test exception type is in response body
+     */
+    public function testExceptionTypeIsInResponseBody()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/index.php',
+            'PATH_INFO' => '/foo'
+        ));
+        $app = new \Slim\Slim(array(
+            'log.enabled' => false
+        ));
+        $app->get('/foo', function () use ($app) {
+            throw new \LogicException('Test Message', 100);
+        });
+        $mw = new \Slim\Middleware\PrettyExceptions();
+        $mw->setApplication($app);
+        $mw->setNextMiddleware($app);
+        $mw->call();
+
+        $this->assertContains('LogicException', $app->response()->body());
+    }
+
+    /**
+     * Test with custom log
+     */
+    public function testWithCustomLogWriter()
+    {
+        $this->setExpectedException('\LogicException');
+
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/index.php',
+            'PATH_INFO' => '/foo'
+        ));
+        $app = new \Slim\Slim(array(
+            'log.enabled' => false
+        ));
+        $app->container->singleton('log', function () use ($app) {
+            return new \Slim\Log(new \Slim\LogWriter('php://temp'));
+        });
+        $app->get('/foo', function () use ($app) {
+            throw new \LogicException('Test Message', 100);
+        });
+        $mw = new \Slim\Middleware\PrettyExceptions();
+        $mw->setApplication($app);
+        $mw->setNextMiddleware($app);
+        $mw->call();
+
+        $this->assertContains('LogicException', $app->response()->body());
+    }
+}
diff --git a/vendor/slim/slim/tests/Middleware/SessionCookieTest.php b/vendor/slim/slim/tests/Middleware/SessionCookieTest.php
new file mode 100644
index 00000000..39de500d
--- /dev/null
+++ b/vendor/slim/slim/tests/Middleware/SessionCookieTest.php
@@ -0,0 +1,463 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class SessionCookieTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        $_SESSION = array();
+    }
+
+    /**
+     * Test session cookie is set and constructed correctly
+     *
+     * We test for two things:
+     *
+     * 1) That the HTTP cookie exists with the correct name;
+     * 2) That the HTTP cookie's value is the expected value;
+     */
+    public function testSessionCookieIsCreated()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/index.php',
+            'PATH_INFO' => '/foo'
+        ));
+        $app = new \Slim\Slim();
+        $app->get('/foo', function () {
+            $_SESSION['foo'] = 'bar';
+            echo "Success";
+        });
+        $mw = new \Slim\Middleware\SessionCookie(array('expires' => '10 years'));
+        $mw->setApplication($app);
+        $mw->setNextMiddleware($app);
+        $mw->call();
+        list($status, $header, $body) = $app->response()->finalize();
+        $this->assertTrue($app->response->cookies->has('slim_session'));
+        $cookie = $app->response->cookies->get('slim_session');
+        $this->assertEquals('{"foo":"bar"}', $cookie['value']);
+    }
+
+    /**
+     * Test $_SESSION is populated from an encrypted HTTP cookie
+     *
+     * The encrypted cookie contains the serialized array ['foo' => 'bar']. The
+     * global secret, cipher, and cipher mode are assumed to be the default
+     * values.
+     */
+    // public function testSessionIsPopulatedFromEncryptedCookie()
+    // {
+    //     \Slim\Environment::mock(array(
+    //         'SCRIPT_NAME' => '/index.php',
+    //         'PATH_INFO' => '/foo',
+    //         'HTTP_COOKIE' => 'slim_session=1644004961%7CLKkYPwqKIMvBK7MWl6D%2BxeuhLuMaW4quN%2F512ZAaVIY%3D%7Ce0f007fa852c7101e8224bb529e26be4d0dfbd63',
+    //     ));
+    //     $app = new \Slim\Slim();
+    //     // The cookie value in the test is encrypted, so cookies.encrypt must
+    //     // be set to true
+    //     $app->config('cookies.encrypt', true);
+    //     $app->get('/foo', function () {
+    //         echo "Success";
+    //     });
+    //     $mw = new \Slim\Middleware\SessionCookie(array('expires' => '10 years'));
+    //     $mw->setApplication($app);
+    //     $mw->setNextMiddleware($app);
+    //     $mw->call();
+    //     $this->assertEquals(array('foo' => 'bar'), $_SESSION);
+    // }
+
+    /**
+     * Test $_SESSION is populated from an unencrypted HTTP cookie
+     *
+     * The unencrypted cookie contains the serialized array ['foo' => 'bar'].
+     * The global cookies.encrypt setting is set to false
+     */
+    public function testSessionIsPopulatedFromUnencryptedCookie()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/index.php',
+            'PATH_INFO' => '/foo',
+            'HTTP_COOKIE' => 'slim_session={"foo":"bar"}',
+        ));
+        $app = new \Slim\Slim();
+        // The cookie value in the test is unencrypted, so cookies.encrypt must
+        // be set to false
+        $app->config('cookies.encrypt', false);
+        $app->get('/foo', function () {
+            echo "Success";
+        });
+        $mw = new \Slim\Middleware\SessionCookie(array('expires' => '10 years'));
+        $mw->setApplication($app);
+        $mw->setNextMiddleware($app);
+        $mw->call();
+        $this->assertEquals(array('foo' => 'bar'), $_SESSION);
+    }
+
+    /**
+     * Test $_SESSION is populated from an unencrypted HTTP cookie
+     *
+     * The unencrypted cookie contains the serialized array ['foo' => 'bar'].
+     * The global cookies.encrypt setting is set to false
+     */
+    public function testSessionIsPopulatedFromMalformedCookieData()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/index.php',
+            'PATH_INFO' => '/foo',
+            'HTTP_COOKIE' => 'slim_session={"foo":"bar"sdkhguy5y}',
+        ));
+        $app = new \Slim\Slim();
+        // The cookie value in the test is unencrypted, so cookies.encrypt must
+        // be set to false
+        $app->config('cookies.encrypt', false);
+        $app->get('/foo', function () {
+            echo "Success";
+        });
+        $mw = new \Slim\Middleware\SessionCookie(array('expires' => '10 years'));
+        $mw->setApplication($app);
+        $mw->setNextMiddleware($app);
+        $mw->call();
+        $this->assertEquals(array(), $_SESSION);
+    }
+
+    /**
+     * Test $_SESSION is populated as empty array if no HTTP cookie
+     */
+    public function testSessionIsPopulatedAsEmptyIfNoCookie()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/index.php',
+            'PATH_INFO' => '/foo'
+        ));
+        $app = new \Slim\Slim();
+        $app->get('/foo', function () {
+            echo "Success";
+        });
+        $mw = new \Slim\Middleware\SessionCookie(array('expires' => '10 years'));
+        $mw->setApplication($app);
+        $mw->setNextMiddleware($app);
+        $mw->call();
+        $this->assertEquals(array(), $_SESSION);
+    }
+
+    public function testSerializingTooLongValueWritesLogAndDoesntCreateCookie()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/index.php',
+            'PATH_INFO' => '/foo'
+        ));
+
+        $logWriter = $this->getMockBuilder('Slim\LogWriter')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $logWriter->expects($this->once())
+            ->method('write')
+            ->with('WARNING! Slim\Middleware\SessionCookie data size is larger than 4KB. Content save failed.', \Slim\Log::ERROR);
+
+        $app = new \Slim\Slim(array(
+            'log.writer' => $logWriter
+        ));
+
+        $tooLongValue = $this->getTooLongValue();
+
+        $app->get('/foo', function () use ($tooLongValue) {
+            $_SESSION['test'] = $tooLongValue;
+            echo "Success";
+        });
+
+        $mw = new \Slim\Middleware\SessionCookie(array('expires' => '10 years'));
+        $mw->setApplication($app);
+        $mw->setNextMiddleware($app);
+        $mw->call();
+        list($status, $header, $body) = $app->response()->finalize();
+        $this->assertFalse($app->response->cookies->has('slim_session'));
+    }
+
+    /**
+     * Generated by http://www.random.org/strings/
+     */
+    protected function getTooLongValue()
+    {
+        return <<<EOF
+8Y7WpaR3Fiyv0wF0QhKn
+hwgh0SYA5cNOh85lSY3E
+POUv7tHdFAKK0rmJnNUT
+dxVjXuDUlStKTiC6B2rE
+BMnchGCK2IIC83agjZ8t
+K5U9tmPok3z7n7qFJPp4
+YfMPI07qRBgZnYW3vvrj
+mY1082KeqiegFNwGiUSs
+HYE16N7PChio33DZWjsD
+urQLFxD1I0FsxPO7rora
+Nmas8nhLl1SiwnlL8eZX
+y2xe18BWfXcNHDGkfaih
+zXT7MxHXmnq0s4lowjcc
+5n8lrXmjYtIdHxl2QcMb
+emFTXQpPX9bw8WjulQCB
+Peq12lgmurt988RZiquy
+lQ5Dw86wMIcIm3uULhr7
+T8Obj45ubR8poc1l5sIs
+EG6kvcDIHVeQjUdrJuiw
+sBLmZnLll23QGK8hMFO1
+Pii0BXpzL9wpUt3hQnfe
+prkTuA8zuxU8vMOu5uSi
+Zynrx9BniMwYGPTOJVSd
+ygUsr1GQ1KGJu6ukLvgo
+7zrkBV0QM9jNqqvkzZwm
+ZnoKRJI1SbaSCqsAduCt
+q5RPtNVpHmtizY3QwiJs
+8tjGt9MG37zgKx8KhfYE
+ByoILEa2ceHjdrP6yd1G
+UMHeFx2kOCx2DVeVJIkt
+aiFdKMTE9rIbpObSp1fy
+Aei9bjwcWwHT2S22rYnj
+QHG7FEHSPdkw8acO393N
+Ip4rgim3NKanJXpfdthy
+yMh4EnoYBBoqSScfW4g5
+bVrXYt8JkyCuR5Og0JBN
+npKpr7obY4ZYVOnIF9Pe
+soEmhC8uCw73bXzMy4ui
+2oi4eFSXOoNDXZiAkz3c
+zshSls22jy5QBvEJDDtY
+C50qtymWnisOM1TIochg
+OOnMEtkUHJw21kuw6m91
+aqxRK1thCfPGBGytOmzG
+kyqvZE1oEzCONj7q4I3p
+rvbnRzZhXv21UXRJnR51
+QJyXbtzDGpSljtSt4Fxi
+SGiklrhWQCdRrnXuBExW
+mQFykwpVF07NRPet9LdT
+zOaOhwMfCeYQr2xqkKq7
+Ru2dsZdhHzhBDvV5nv1q
+qB7kVD0YDKB6RJyPcpX9
+MxvPmISfMJMFiAFD82Qf
+0idAAQxmd6fK9TkJPihp
+wp2mvp3yAHWKmdsgLcss
+OUqFt0BJoM7Iz4jJpF2d
+hiWTsF1jrgEhV07TInLp
+u7htseWgTDRY9UYp9wy6
+vnF0vsaFikqpjGkLy5oH
+ncvaoRPa5MDBNvXZoiG9
+gCMvsGG8eLW3u8UWvRrk
+bKgFBuy4zLhBF4RBuTVt
+Dz1QmbyQPqmmfjchF6u3
+myRkxQtSnHQZr0kUqSJS
+Ati7CBQq6LOPSVlAek5a
+7EOVTREQ52qOjKAibvAr
+etvEUy3CbsDiaeSPGlJH
+XyFey6LugF2UZfHDFjgV
+ByBaUrDz0yuvLOvECQuS
+5CoA6FBz8D71FwwebEYl
+5xQyEV5h7lNAsgbjBY6o
+N92xlCGjyNGWp1Y9HoNL
+mMhirp7mufNYVqIy8jBl
+nYSK8Rk6KybpAPspHXPd
+oemmqqxjF9g4ZjNk2pyL
+dqetI1RYqszZPZeH7WNW
+B1x1GSPdGXnefeNmxFxr
+vFTVOHqgOgZR0xHHUl8P
+RwFio0Cd8ZkaRIpcs7jh
+Ps0tGJgPyo1gRdm9wtlB
+j4hmInyIpAz1MjHYAQc1
+YIjnSirWsrItgqidgS3W
+LNT7DriU7wPyN6zV9G6d
+YFD19x1DDBwz57DegTsy
+rz72EblrUsP6wtN69GRo
+irhM6N9eNu8Bq9Qo5Tlc
+Cpb3Zl3FDttiW63KXQpL
+4ZQ7VGbfVjwBwhcGoOe7
+RgXxZ9OU0HJFQRpjvJDW
+lk3PpNhcHT4vVkgF9Q3V
+URiazjSe8G4zHrBBMaxM
+Gh7Xp4hqf9GTnIYyMe5E
+palqUjJhSGm7EZAR1b4i
+HN8qrHznKAyhlywYBw3N
+nV9Kla5KFWaRG4r3cCT1
+qHT7nPIbVjxNYdujh5WK
+CKg7BfQjwZtHk2oM1cyO
+RBPMpZxNpM3ZhiXNz5D2
+xZJM9ETPwABBqHirjTXA
+faI4irlrshHra2hg6mHE
+N0OLyZjmKpyzHRlAcC44
+oEMe1Mq85Kynyla7S3Lo
+Us9auTpKq33jAI51MUvC
+Vbu2qKSsmCrXu1WMDFfL
+WCCzzLqz2kfMy3IV0ngc
+ya4k4AoSjb2nd43VGRvt
+1FrWocIRfoyFj3igs8lF
+dQlTXv3jttgGmHVJtuJK
+zCHcfzABc5pNch7cEW4B
+r8jB0mL9ESrMHhvqGxbf
+qLUYdNrXNJNujy43WNLt
+GaQ6adUTFHErjRYFj7ws
+btv28UZlttBqlVAEpu7G
+1Se9HT2tp45a5iwbAHpA
+tXaOwMjaI3S1uxngaVVL
+saFZXdx4kExE3Y3SEMTA
+my9rhAEFcw4N1uBqa2Ts
+IRupwTKFoRIpPSBwnPPw
+qpxq4VIrOdESR4UZiOcw
+1n12beyYTUN0zNzV0nRf
+dkgrmnaeWbrxA2QQaHDq
+o1f6VCap62NxJI2Wd0F7
+eyYYL6mY0XUmuCdV2v9e
+SPBqa552akcetnRViZD9
+cqLrX89ouNlDcjC7hmYk
+3vAcrwlseFDYDYzrCXXx
+tkyJUeJjORVXoFKaoEmi
+o1JoqBFpSPyRT6RwFTXC
+IMW657539XCcn0Tvx3iJ
+rW9ZUNBSHNHjR0wfbr1R
+x7Ez1Br1T9VG4wEetwfY
+Xj9s0ipdQDEeYG3eCkBG
+xQCp4J0a7BEqEEVPJvYY
+S46aXD70Ur3BiokRfeJK
+kEQcqPCP9kmWxXboESOB
+VjADYs7ZwJUvWNAk0Msc
+5cSrhWsbizSwo31NsPKj
+PHKG7ui9gU0F5fXKXtWz
+8FxjchkHJ3jQQSWKfkSu
+pN8e9d71IVYA1vLyQGqV
+Hh3QE3o9tmNsJMEBoRK8
+QBLTFWWfkGSOI3Vp3y6c
+5gwll5qdcgnaF4tDvdRd
+NDYpacWX4hnFsrO73OOo
+GaenbdbDOUp0iClZKlTU
+79UJvctLD86KC2mwxSqc
+jbwmzM4oZZ7zuYo769YY
+B7Ssx6qbITbIqaJJboMK
+7tLwsE3FhBphBJBKP4Bk
+aumHnttxOXpiX3b5ivlk
+gsvWRKCd1KLYkucRdW1j
+j0TSXNoMGXlIK9X6YjX1
+4zvHH7QEPlgK4AaRWw6r
+eXSVfE2X2nbn1wzA3bdw
+exrWkKQ8v87kzzxpzdF7
+wL9B42yeyA6SgfnZ0SnW
+hyO53wkaJNQnK2rzndcA
+8jSesmehxaHL39QUdlEo
+oAQMANsGVewC4cYhdjpk
+tBVMFz1LMIg8nj5acoKx
+4IxsrP4UrdaHa2QlFZ38
+OMg0erS6Mg2nVY9PBLGu
+WLybJJlrNJ3ZKgftRyOb
+s392j4FVZuxnLc8Euq2g
+2AB9ceeOXHrw6dJeqImY
+q8Gqy9rzsKyp9vEg13h3
+UhWoiMQuE8i38vd5HZuO
+CjLfC9MtQY7wou4YGl1f
+bQGFeV3I1YVsyh1zjdYX
+E4yS7PXLT2pTvq9aTuPc
+41Vm8F6tc6mnYCc0gfCY
+nmKOUzThbGpqnSkJzmr5
+E5izT37qIM1PJ1IotRnw
+X0rD7K2rUN47XeLXW3x2
+3taWQ4GMNGQgjuD7MPwX
+u7AyGdUWFG25ZaeZSyrt
+mLPs4NU5ayAgrj9L089E
+5mWnKfJ8OoAbhjb9XpY5
+cBv75uTcpezbnWe5C7YC
+DWikoIaaJQebFW2tddw2
+qMyIzbkUJxyTheONxBjJ
+WyWqJmTW5uniw9ofX84U
+JaFGtu4y24UGSmPrIjVj
+SDFz3iRvf2FG65m8brV9
+0mpT6dWL4p59cdTs0n1c
+jw7rIgu3VFnkuOp8mZR3
+F1PPQYZfZkqbyiu7Tvl6
+tXT8EPpH39oB9Qe3SI6C
+DwL6cklHbnOyEOO5jNOo
+vEORF3tEYRngOowzuOEY
+6XY27pGEG9L9MvwvHinw
+rEMyl7S9eFk554yHvCa3
+pLToqRXBWIPK51roFlKs
+AXfdbVdGkGqwlKn68k01
+ecFbbnvrpmcLF2gL3GbC
+aWJf90PECBF0qqZ1jVC3
+WjMuah0gZjryj7zsZKMB
+1J9koTowUYguyp4MBGmp
+rnjhybC8RQSEvmYpqkGR
+Qdj2QlGYXN1H8A1315QJ
+amycQeWwXnrdI3duyqTa
+H2YwgIStIGQlWNigfiIZ
+btR0CdDnkwGt0hlCtQF0
+O37vtIvVgCKVbcXbBexH
+xhkbsShz4onN4CeGf7Ox
+1vJfx422pUnxtjG5Laag
+3IV5ib20qSYZW3Wr2LiH
+zmvoTLblxTX3EpYPlHxC
+U0Ceix4L3dMomXzn7OAC
+JyzkRGfIi8j4EnKfoWPG
+gMUXWXZZgJzLBfZ4y9FV
+7ClYOAd9EoWspOWQ1MmO
+1CIKB3Ei846C1rmXS8Zc
+ARLDXFpaHp1VlbEMF8fk
+KrQa28U3gbHs9B5oGhxS
+WHc9LmQiINcUglo8cKPs
+3WMYJ8TAtvlMswUPOd6t
+s81Cy4B2oLrc4E5XSa5p
+QA6pDUiKipuWFXZ4BMUF
+E03CQbBiZ27GpJekftsF
+pqGkJifdjVLuuIu0xBej
+V27rk0vIwp1Q8p4DvJ1F
+TPhvHNooyU6Rrmcx8GIK
+81nRsYYsvVo3LCmuOnX5
+uY6xGTes3UOMXkXwEfGj
+T5LfaSyWP5y4L7vvLBjS
+dHO7dVB1bmIA40fEgk3i
+KHJxU6C0rUVtPtIR1slm
+YdhTz1mwWi2z2GDzzRJB
+TIzFqPkKrgCgkiv2RzCg
+Z0qY4Wjpfug51zXzU51H
+nWm3mJnVLAKv9RNkdThl
+xk28IMKOGOPdQuXjGDB6
+eEG3ndIRXnmmLilygHop
+jE6u88nWi30Yos79canx
+b0VuROFF04rZuOTo5Fue
+yt4fSpHN7v4uZ7uNPMA9
+0sENIYeLlIbBWhqTjXCp
+m7qMMX3acdRtTTVNp7Qt
+s8XKOJmCQr7YGk47jGMn
+6o1kxMmoUgWCW8rEtnWA
+kxXj1hKRFBJmX8ErM6Zp
+FZBIPSbNt5hmXoC1M92l
+UxeirI2PCJnQcAJVmNVJ
+FaJ9L5K0u1J9JKGl2Aew
+bHGX5QLvkGXSFY5OCezp
+5cnbOjU1j8Fuvtuuk9d0
+7Oz2IIi69WB5J14n9iWQ
+XgCpDLURX3urpiYDFf3P
+7xeWOS4yTMUQ0EbLkZOU
+AzKM3Dp7nGr9SYPI4xmi
+EOF;
+    }
+}
diff --git a/vendor/slim/slim/tests/MiddlewareTest.php b/vendor/slim/slim/tests/MiddlewareTest.php
new file mode 100644
index 00000000..09163b27
--- /dev/null
+++ b/vendor/slim/slim/tests/MiddlewareTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class MyMiddleware extends \Slim\Middleware
+{
+    public function call() {}
+}
+
+class MiddlewareTest extends PHPUnit_Framework_TestCase
+{
+    public function testSetApplication()
+    {
+        $app = new stdClass();
+        $mw = new MyMiddleware();
+        $mw->setApplication($app);
+
+        $this->assertAttributeSame($app, 'app', $mw);
+    }
+
+    public function testGetApplication()
+    {
+        $app = new stdClass();
+        $mw = new MyMiddleware();
+        $property = new \ReflectionProperty($mw, 'app');
+        $property->setAccessible(true);
+        $property->setValue($mw, $app);
+
+        $this->assertSame($app, $mw->getApplication());
+    }
+
+    public function testSetNextMiddleware()
+    {
+        $mw1 = new MyMiddleware();
+        $mw2 = new MyMiddleware();
+        $mw1->setNextMiddleware($mw2);
+
+        $this->assertAttributeSame($mw2, 'next', $mw1);
+    }
+
+    public function testGetNextMiddleware()
+    {
+        $mw1 = new MyMiddleware();
+        $mw2 = new MyMiddleware();
+        $property = new \ReflectionProperty($mw1, 'next');
+        $property->setAccessible(true);
+        $property->setValue($mw1, $mw2);
+
+        $this->assertSame($mw2, $mw1->getNextMiddleware());
+    }
+}
diff --git a/vendor/slim/slim/tests/README b/vendor/slim/slim/tests/README
new file mode 100644
index 00000000..7bc611c3
--- /dev/null
+++ b/vendor/slim/slim/tests/README
@@ -0,0 +1,18 @@
+Slim Framework Unit Tests
+
+Follow the directions below to run the Slim Framework unit tests. You'll need the latest version of PHPUnit. To save development time, these unit tests require PHP >= 5.3. However, the Slim Framework itself requires only PHP >= 5.2.
+
+1. Install the latest version of PHPUnit
+Visit http://www.phpunit.de/ for installation instructions.
+
+2. Run PHPUnit
+From the filesystem directory that contains the `tests` directory, you may run all unit tests or specific unit tests. Here are several examples. The '$>' in the examples below is your command prompt.
+
+To run all tests:
+$> phpunit tests
+
+To run all HTTP-related tests:
+$> phpunit tests/Http
+
+To run only the HTTP Request tests:
+$> phpunit tests/Http/RequestTest
\ No newline at end of file
diff --git a/vendor/slim/slim/tests/RouteTest.php b/vendor/slim/slim/tests/RouteTest.php
new file mode 100644
index 00000000..6817641b
--- /dev/null
+++ b/vendor/slim/slim/tests/RouteTest.php
@@ -0,0 +1,617 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class LazyInitializeTestClass {
+    public static $initialized = false;
+
+    public function __construct() {
+        self::$initialized = true;
+    }
+
+    public function foo() {
+    }
+}
+
+class FooTestClass {
+    public static $foo_invoked = false;
+    public static $foo_invoked_args = array();
+
+    public function foo() {
+        self::$foo_invoked = true;
+        self::$foo_invoked_args = func_get_args();
+    }
+}
+
+class RouteTest extends PHPUnit_Framework_TestCase
+{
+    public function testGetPattern()
+    {
+        $route = new \Slim\Route('/foo', function () {});
+
+        $this->assertEquals('/foo', $route->getPattern());
+    }
+
+    public function testGetName()
+    {
+        $route = new \Slim\Route('/foo', function () {});
+
+        $property = new \ReflectionProperty($route, 'name');
+        $property->setAccessible(true);
+        $property->setValue($route, 'foo');
+
+        $this->assertEquals('foo', $route->getName());
+    }
+
+    public function testSetName()
+    {
+        $route = new \Slim\Route('/foo', function () {});
+        $route->name('foo'); // <-- Alias for `setName()`
+
+        $this->assertAttributeEquals('foo', 'name', $route);
+    }
+
+    public function testGetCallable()
+    {
+        $callable = function () {
+            echo 'Foo';
+        };
+        $route = new \Slim\Route('/foo', $callable);
+
+        $this->assertSame($callable, $route->getCallable());
+    }
+
+    public function testGetCallableAsClass()
+    {
+        FooTestClass::$foo_invoked = false;
+        FooTestClass::$foo_invoked_args = array();
+        $route = new \Slim\Route('/foo', '\FooTestClass:foo');
+        $route->setParams(array('bar' => '1234'));
+
+        $this->assertFalse(FooTestClass::$foo_invoked);
+        $this->assertTrue($route->dispatch());
+        $this->assertTrue(FooTestClass::$foo_invoked);
+        $this->assertEquals(array('1234'), FooTestClass::$foo_invoked_args);
+    }
+
+    public function testGetCallableAsClassLazyInitialize()
+    {
+        LazyInitializeTestClass::$initialized = false;
+
+        $route = new \Slim\Route('/foo', '\LazyInitializeTestClass:foo');
+        $this->assertFalse(LazyInitializeTestClass::$initialized);
+
+        $route->dispatch();
+        $this->assertTrue(LazyInitializeTestClass::$initialized);
+    }
+
+    public function testGetCallableAsStaticMethod()
+    {
+        $route = new \Slim\Route('/bar', '\Slim\Slim::getInstance');
+
+        $callable = $route->getCallable();
+        $this->assertEquals('\Slim\Slim::getInstance', $callable);
+    }
+
+    public function example_càllâble_wïth_wéird_chars()
+    {
+        return 'test';
+    }
+
+    public function testGetCallableWithOddCharsAsClass()
+    {
+        $route = new \Slim\Route('/foo', '\RouteTest:example_càllâble_wïth_wéird_chars');
+        $callable = $route->getCallable();
+
+        $this->assertEquals('test', $callable());
+    }
+
+    public function testSetCallable()
+    {
+        $callable = function () {
+            echo 'Foo';
+        };
+        $route = new \Slim\Route('/foo', $callable); // <-- Called inside __construct()
+
+        $this->assertAttributeSame($callable, 'callable', $route);
+    }
+
+    public function testSetCallableWithInvalidArgument()
+    {
+        $this->setExpectedException('\InvalidArgumentException');
+        $route = new \Slim\Route('/foo', 'doesNotExist'); // <-- Called inside __construct()
+    }
+
+    public function testGetParams()
+    {
+        $route = new \Slim\Route('/hello/:first/:last', function () {});
+        $route->matches('/hello/mr/anderson'); // <-- Parses params from argument
+
+        $this->assertEquals(array(
+            'first' => 'mr',
+            'last' => 'anderson'
+        ), $route->getParams());
+    }
+
+    public function testSetParams()
+    {
+        $route = new \Slim\Route('/hello/:first/:last', function () {});
+        $route->matches('/hello/mr/anderson'); // <-- Parses params from argument
+        $route->setParams(array(
+            'first' => 'agent',
+            'last' => 'smith'
+        ));
+
+        $this->assertAttributeEquals(array(
+            'first' => 'agent',
+            'last' => 'smith'
+        ), 'params', $route);
+    }
+
+    public function testGetParam()
+    {
+        $route = new \Slim\Route('/hello/:first/:last', function () {});
+
+        $property = new \ReflectionProperty($route, 'params');
+        $property->setAccessible(true);
+        $property->setValue($route, array(
+            'first' => 'foo',
+            'last' => 'bar'
+        ));
+
+        $this->assertEquals('foo', $route->getParam('first'));
+    }
+
+    public function testGetParamThatDoesNotExist()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+
+        $route = new \Slim\Route('/hello/:first/:last', function () {});
+
+        $property = new \ReflectionProperty($route, 'params');
+        $property->setAccessible(true);
+        $property->setValue($route, array(
+            'first' => 'foo',
+            'last' => 'bar'
+        ));
+
+        $route->getParam('middle');
+    }
+
+    public function testSetParam()
+    {
+        $route = new \Slim\Route('/hello/:first/:last', function () {});
+        $route->matches('/hello/mr/anderson'); // <-- Parses params from argument
+        $route->setParam('last', 'smith');
+
+        $this->assertAttributeEquals(array(
+            'first' => 'mr',
+            'last' => 'smith'
+        ), 'params', $route);
+    }
+
+    public function testSetParamThatDoesNotExist()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+
+        $route = new \Slim\Route('/hello/:first/:last', function () {});
+        $route->matches('/hello/mr/anderson'); // <-- Parses params from argument
+        $route->setParam('middle', 'smith'); // <-- Should trigger InvalidArgumentException
+    }
+
+    public function testMatches()
+    {
+        $route = new \Slim\Route('/hello/:name', function () {});
+
+        $this->assertTrue($route->matches('/hello/josh'));
+    }
+
+    public function testMatchesIsFalse()
+    {
+        $route = new \Slim\Route('/foo', function () {});
+
+        $this->assertFalse($route->matches('/bar'));
+    }
+
+    public function testMatchesPatternWithTrailingSlash()
+    {
+        $route = new \Slim\Route('/foo/', function () {});
+
+        $this->assertTrue($route->matches('/foo/'));
+        $this->assertTrue($route->matches('/foo'));
+    }
+
+    public function testMatchesPatternWithoutTrailingSlash()
+    {
+        $route = new \Slim\Route('/foo', function () {});
+
+        $this->assertFalse($route->matches('/foo/'));
+        $this->assertTrue($route->matches('/foo'));
+    }
+
+    public function testMatchesWithConditions()
+    {
+        $route = new \Slim\Route('/hello/:first/and/:second', function () {});
+        $route->conditions(array(
+            'first' => '[a-zA-Z]{3,}'
+        ));
+
+        $this->assertTrue($route->matches('/hello/Josh/and/John'));
+    }
+
+    public function testMatchesWithConditionsIsFalse()
+    {
+        $route = new \Slim\Route('/hello/:first/and/:second', function () {});
+        $route->conditions(array(
+            'first' => '[a-z]{3,}'
+        ));
+
+        $this->assertFalse($route->matches('/hello/Josh/and/John'));
+    }
+
+    /*
+     * Route should match URI with valid path component according to rfc2396
+     *
+     * "Uniform Resource Identifiers (URI): Generic Syntax" http://www.ietf.org/rfc/rfc2396.txt
+     *
+     * Excludes "+" which is valid but decodes into a space character
+     */
+    public function testMatchesWithValidRfc2396PathComponent()
+    {
+        $symbols = ':@&=$,';
+        $route = new \Slim\Route('/rfc2386/:symbols', function () {});
+
+        $this->assertTrue($route->matches('/rfc2386/' . $symbols));
+    }
+
+    /*
+     * Route should match URI including unreserved punctuation marks from rfc2396
+     *
+     * "Uniform Resource Identifiers (URI): Generic Syntax" http://www.ietf.org/rfc/rfc2396.txt
+     */
+    public function testMatchesWithUnreservedMarks()
+    {
+        $marks = "-_.!~*'()";
+        $route = new \Slim\Route('/marks/:marks', function () {});
+
+        $this->assertTrue($route->matches('/marks/' . $marks));
+    }
+
+    public function testMatchesOptionalParameters()
+    {
+        $pattern = '/archive/:year(/:month(/:day))';
+
+        $route1 = new \Slim\Route($pattern, function () {});
+        $this->assertTrue($route1->matches('/archive/2010'));
+        $this->assertEquals(array('year' => '2010'), $route1->getParams());
+
+        $route2 = new \Slim\Route($pattern, function () {});
+        $this->assertTrue($route2->matches('/archive/2010/05'));
+        $this->assertEquals(array('year' => '2010', 'month' => '05'), $route2->getParams());
+
+        $route3 = new \Slim\Route($pattern, function () {});
+        $this->assertTrue($route3->matches('/archive/2010/05/13'));
+        $this->assertEquals(array('year' => '2010', 'month' => '05', 'day' => '13'), $route3->getParams());
+    }
+
+    public function testMatchesIsCaseSensitiveByDefault()
+    {
+        $route = new \Slim\Route('/case/sensitive', function () {});
+        $this->assertTrue($route->matches('/case/sensitive'));
+        $this->assertFalse($route->matches('/CaSe/SensItiVe'));
+    }
+
+    public function testMatchesCanBeCaseInsensitive()
+    {
+        $route = new \Slim\Route('/Case/Insensitive', function () {}, false);
+        $this->assertTrue($route->matches('/Case/Insensitive'));
+        $this->assertTrue($route->matches('/CaSe/iNSensItiVe'));
+    }
+
+    public function testGetConditions()
+    {
+        $route = new \Slim\Route('/foo', function () {});
+
+        $property = new \ReflectionProperty($route, 'conditions');
+        $property->setAccessible(true);
+        $property->setValue($route, array('foo' => '\d{3}'));
+
+        $this->assertEquals(array('foo' => '\d{3}'), $route->getConditions());
+    }
+
+    public function testSetDefaultConditions()
+    {
+        \Slim\Route::setDefaultConditions(array(
+            'id' => '\d+'
+        ));
+
+        $property = new \ReflectionProperty('\Slim\Route', 'defaultConditions');
+        $property->setAccessible(true);
+
+        $this->assertEquals(array(
+            'id' => '\d+'
+        ), $property->getValue());
+    }
+
+    public function testGetDefaultConditions()
+    {
+        $property = new \ReflectionProperty('\Slim\Route', 'defaultConditions');
+        $property->setAccessible(true);
+        $property->setValue(array(
+            'id' => '\d+'
+        ));
+
+        $this->assertEquals(array(
+            'id' => '\d+'
+        ), \Slim\Route::getDefaultConditions());
+    }
+
+    public function testDefaultConditionsAssignedToInstance()
+    {
+        $staticProperty = new \ReflectionProperty('\Slim\Route', 'defaultConditions');
+        $staticProperty->setAccessible(true);
+        $staticProperty->setValue(array(
+            'id' => '\d+'
+        ));
+        $route = new \Slim\Route('/foo', function () {});
+
+        $this->assertAttributeEquals(array(
+            'id' => '\d+'
+        ), 'conditions', $route);
+    }
+
+    public function testMatchesWildcard()
+    {
+        $route = new \Slim\Route('/hello/:path+/world', function () {});
+
+        $this->assertTrue($route->matches('/hello/foo/bar/world'));
+        $this->assertAttributeEquals(array(
+            'path' => array('foo', 'bar')
+        ), 'params', $route);
+    }
+
+    public function testMatchesMultipleWildcards()
+    {
+        $route = new \Slim\Route('/hello/:path+/world/:date+', function () {});
+
+        $this->assertTrue($route->matches('/hello/foo/bar/world/2012/03/10'));
+        $this->assertAttributeEquals(array(
+            'path' => array('foo', 'bar'),
+            'date' => array('2012', '03', '10')
+        ), 'params', $route);
+    }
+
+    public function testMatchesParamsAndWildcards()
+    {
+        $route = new \Slim\Route('/hello/:path+/world/:year/:month/:day/:path2+', function () {});
+
+        $this->assertTrue($route->matches('/hello/foo/bar/world/2012/03/10/first/second'));
+        $this->assertAttributeEquals(array(
+            'path' => array('foo', 'bar'),
+            'year' => '2012',
+            'month' => '03',
+            'day' => '10',
+            'path2' => array('first', 'second')
+        ), 'params', $route);
+    }
+
+    public function testMatchesParamsWithOptionalWildcard()
+    {
+        $route = new \Slim\Route('/hello(/:foo(/:bar+))', function () {});
+
+        $this->assertTrue($route->matches('/hello'));
+        $this->assertTrue($route->matches('/hello/world'));
+        $this->assertTrue($route->matches('/hello/world/foo'));
+        $this->assertTrue($route->matches('/hello/world/foo/bar'));
+    }
+
+    public function testSetMiddleware()
+    {
+        $route = new \Slim\Route('/foo', function () {});
+        $mw = function () {
+            echo 'Foo';
+        };
+        $route->setMiddleware($mw);
+
+        $this->assertAttributeContains($mw, 'middleware', $route);
+    }
+
+    public function testSetMiddlewareMultipleTimes()
+    {
+        $route = new \Slim\Route('/foo', function () {});
+        $mw1 = function () {
+            echo 'Foo';
+        };
+        $mw2 = function () {
+            echo 'Bar';
+        };
+        $route->setMiddleware($mw1);
+        $route->setMiddleware($mw2);
+
+        $this->assertAttributeContains($mw1, 'middleware', $route);
+        $this->assertAttributeContains($mw2, 'middleware', $route);
+    }
+
+    public function testSetMiddlewareWithArray()
+    {
+        $route = new \Slim\Route('/foo', function () {});
+        $mw1 = function () {
+            echo 'Foo';
+        };
+        $mw2 = function () {
+            echo 'Bar';
+        };
+        $route->setMiddleware(array($mw1, $mw2));
+
+        $this->assertAttributeContains($mw1, 'middleware', $route);
+        $this->assertAttributeContains($mw2, 'middleware', $route);
+    }
+
+    public function testSetMiddlewareWithInvalidArgument()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+
+        $route = new \Slim\Route('/foo', function () {});
+        $route->setMiddleware('doesNotExist'); // <-- Should throw InvalidArgumentException
+    }
+
+    public function testSetMiddlewareWithArrayWithInvalidArgument()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+
+        $route = new \Slim\Route('/foo', function () {});
+        $route->setMiddleware(array('doesNotExist'));
+    }
+
+    public function testGetMiddleware()
+    {
+        $route = new \Slim\Route('/foo', function () {});
+
+        $property = new \ReflectionProperty($route, 'middleware');
+        $property->setAccessible(true);
+        $property->setValue($route, array('foo' => 'bar'));
+
+        $this->assertEquals(array('foo' => 'bar'), $route->getMiddleware());
+    }
+
+    public function testSetHttpMethods()
+    {
+        $route = new \Slim\Route('/foo', function () {});
+        $route->setHttpMethods('GET', 'POST');
+
+        $this->assertAttributeEquals(array('GET', 'POST'), 'methods', $route);
+    }
+
+    public function testGetHttpMethods()
+    {
+        $route = new \Slim\Route('/foo', function () {});
+
+        $property = new \ReflectionProperty($route, 'methods');
+        $property->setAccessible(true);
+        $property->setValue($route, array('GET', 'POST'));
+
+        $this->assertEquals(array('GET', 'POST'), $route->getHttpMethods());
+    }
+
+    public function testAppendHttpMethods()
+    {
+        $route = new \Slim\Route('/foo', function () {});
+
+        $property = new \ReflectionProperty($route, 'methods');
+        $property->setAccessible(true);
+        $property->setValue($route, array('GET', 'POST'));
+
+        $route->appendHttpMethods('PUT');
+
+        $this->assertAttributeEquals(array('GET', 'POST', 'PUT'), 'methods', $route);
+    }
+
+    public function testAppendArrayOfHttpMethods()
+    {
+        $arrayOfMethods = array('GET','POST','PUT');
+        $route = new \Slim\Route('/foo', function () {});
+        $route->appendHttpMethods($arrayOfMethods);
+
+        $this->assertAttributeEquals($arrayOfMethods,'methods',$route);
+    }
+
+    public function testAppendHttpMethodsWithVia()
+    {
+        $route = new \Slim\Route('/foo', function () {});
+        $route->via('PUT');
+
+        $this->assertAttributeContains('PUT', 'methods', $route);
+    }
+
+    public function testAppendArrayOfHttpMethodsWithVia()
+    {
+        $arrayOfMethods = array('GET','POST','PUT');
+        $route = new \Slim\Route('/foo', function () {});
+        $route->via($arrayOfMethods);
+
+        $this->assertAttributeEquals($arrayOfMethods,'methods',$route);
+    }
+
+    public function testSupportsHttpMethod()
+    {
+        $route = new \Slim\Route('/foo', function () {});
+
+        $property = new \ReflectionProperty($route, 'methods');
+        $property->setAccessible(true);
+        $property->setValue($route, array('POST'));
+
+        $this->assertTrue($route->supportsHttpMethod('POST'));
+        $this->assertFalse($route->supportsHttpMethod('PUT'));
+    }
+
+    /**
+     * Test dispatch with params
+     */
+    public function testDispatch()
+    {
+        $this->expectOutputString('Hello josh');
+        $route = new \Slim\Route('/hello/:name', function ($name) { echo "Hello $name"; });
+        $route->matches('/hello/josh'); //<-- Extracts params from resource URI
+        $route->dispatch();
+    }
+
+    /**
+     * Test dispatch with middleware
+     */
+    public function testDispatchWithMiddleware()
+    {
+        $this->expectOutputString('First! Second! Hello josh');
+        $route = new \Slim\Route('/hello/:name', function ($name) { echo "Hello $name"; });
+        $route->setMiddleware(function () {
+            echo "First! ";
+        });
+        $route->setMiddleware(function () {
+            echo "Second! ";
+        });
+        $route->matches('/hello/josh'); //<-- Extracts params from resource URI
+        $route->dispatch();
+    }
+
+    /**
+     * Test middleware with arguments
+     */
+    public function testRouteMiddlwareArguments()
+    {
+        $this->expectOutputString('foobar');
+        $route = new \Slim\Route('/foo', function () { echo "bar"; });
+        $route->setName('foo');
+        $route->setMiddleware(function ($route) {
+            echo $route->getName();
+        });
+        $route->matches('/foo'); //<-- Extracts params from resource URI
+        $route->dispatch();
+    }
+}
diff --git a/vendor/slim/slim/tests/RouterTest.php b/vendor/slim/slim/tests/RouterTest.php
new file mode 100644
index 00000000..edbb6d42
--- /dev/null
+++ b/vendor/slim/slim/tests/RouterTest.php
@@ -0,0 +1,250 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class RouterTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Constructor should initialize routes as empty array
+     */
+    public function testConstruct()
+    {
+        $router = new \Slim\Router();
+
+        $this->assertAttributeEquals(array(), 'routes', $router);
+    }
+
+    /**
+     * Map should set and return instance of \Slim\Route
+     */
+    public function testMap()
+    {
+        $router = new \Slim\Router();
+        $route = new \Slim\Route('/foo', function() {});
+        $router->map($route);
+
+        $this->assertAttributeContains($route, 'routes', $router);
+    }
+
+    /**
+     * Named route should be added and indexed by name
+     */
+    public function testAddNamedRoute()
+    {
+        $router = new \Slim\Router();
+        $route = new \Slim\Route('/foo', function () {});
+        $router->addNamedRoute('foo', $route);
+
+        $property = new \ReflectionProperty($router, 'namedRoutes');
+        $property->setAccessible(true);
+
+		$rV = $property->getValue($router);
+        $this->assertSame($route, $rV['foo']);
+    }
+
+    /**
+     * Named route should have unique name
+     */
+    public function testAddNamedRouteWithDuplicateKey()
+    {
+        $this->setExpectedException('RuntimeException');
+
+        $router = new \Slim\Router();
+        $route = new \Slim\Route('/foo', function () {});
+        $router->addNamedRoute('foo', $route);
+        $router->addNamedRoute('foo', $route);
+    }
+
+    /**
+     * Router should return named route by name, or null if not found
+     */
+    public function testGetNamedRoute()
+    {
+        $router = new \Slim\Router();
+        $route = new \Slim\Route('/foo', function () {});
+
+        $property = new \ReflectionProperty($router, 'namedRoutes');
+        $property->setAccessible(true);
+        $property->setValue($router, array('foo' => $route));
+
+        $this->assertSame($route, $router->getNamedRoute('foo'));
+        $this->assertNull($router->getNamedRoute('bar'));
+    }
+
+    /**
+     * Router should determine named routes and cache results
+     */
+    public function testGetNamedRoutes()
+    {
+        $router = new \Slim\Router();
+        $route1 = new \Slim\Route('/foo', function () {});
+        $route2 = new \Slim\Route('/bar', function () {});
+
+        // Init router routes to array
+        $propertyRouterRoutes = new \ReflectionProperty($router, 'routes');
+        $propertyRouterRoutes->setAccessible(true);
+        $propertyRouterRoutes->setValue($router, array($route1, $route2));
+
+        // Init router named routes to null
+        $propertyRouterNamedRoutes = new \ReflectionProperty($router, 'namedRoutes');
+        $propertyRouterNamedRoutes->setAccessible(true);
+        $propertyRouterNamedRoutes->setValue($router, null);
+
+        // Init route name
+        $propertyRouteName = new \ReflectionProperty($route2, 'name');
+        $propertyRouteName->setAccessible(true);
+        $propertyRouteName->setValue($route2, 'bar');
+
+        $namedRoutes = $router->getNamedRoutes();
+        $this->assertCount(1, $namedRoutes);
+        $this->assertSame($route2, $namedRoutes['bar']);
+    }
+
+    /**
+     * Router should detect presence of a named route by name
+     */
+    public function testHasNamedRoute()
+    {
+        $router = new \Slim\Router();
+        $route = new \Slim\Route('/foo', function () {});
+
+        $property = new \ReflectionProperty($router, 'namedRoutes');
+        $property->setAccessible(true);
+        $property->setValue($router, array('foo' => $route));
+
+        $this->assertTrue($router->hasNamedRoute('foo'));
+        $this->assertFalse($router->hasNamedRoute('bar'));
+    }
+
+    /**
+     * Router should return current route if set during iteration
+     */
+    public function testGetCurrentRoute()
+    {
+        $router = new \Slim\Router();
+        $route = new \Slim\Route('/foo', function () {});
+
+        $property = new \ReflectionProperty($router, 'currentRoute');
+        $property->setAccessible(true);
+        $property->setValue($router, $route);
+
+        $this->assertSame($route, $router->getCurrentRoute());
+    }
+
+    /**
+     * Router should return first matching route if current route not set yet by iteration
+     */
+    public function testGetCurrentRouteIfMatchedRoutes()
+    {
+        $router = new \Slim\Router();
+        $route = new \Slim\Route('/foo', function () {});
+
+        $propertyMatchedRoutes = new \ReflectionProperty($router, 'matchedRoutes');
+        $propertyMatchedRoutes->setAccessible(true);
+        $propertyMatchedRoutes->setValue($router, array($route));
+
+        $propertyCurrentRoute = new \ReflectionProperty($router, 'currentRoute');
+        $propertyCurrentRoute->setAccessible(true);
+        $propertyCurrentRoute->setValue($router, null);
+
+        $this->assertSame($route, $router->getCurrentRoute());
+    }
+
+    /**
+     * Router should return `null` if current route not set yet and there are no matching routes
+     */
+    public function testGetCurrentRouteIfNoMatchedRoutes()
+    {
+        $router = new \Slim\Router();
+
+        $propertyMatchedRoutes = new \ReflectionProperty($router, 'matchedRoutes');
+        $propertyMatchedRoutes->setAccessible(true);
+        $propertyMatchedRoutes->setValue($router, array());
+
+        $propertyCurrentRoute = new \ReflectionProperty($router, 'currentRoute');
+        $propertyCurrentRoute->setAccessible(true);
+        $propertyCurrentRoute->setValue($router, null);
+
+        $this->assertNull($router->getCurrentRoute());
+    }
+
+    public function testGetMatchedRoutes()
+    {
+        $router = new \Slim\Router();
+
+        $route1 = new \Slim\Route('/foo', function () {});
+		$route1 = $route1->via('GET');
+
+        $route2 = new \Slim\Route('/foo', function () {});
+		$route2 = $route2->via('POST');
+
+        $route3 = new \Slim\Route('/bar', function () {});
+		$route3 = $route3->via('PUT');
+
+        $routes = new \ReflectionProperty($router, 'routes');
+        $routes->setAccessible(true);
+        $routes->setValue($router, array($route1, $route2, $route3));
+
+        $matchedRoutes = $router->getMatchedRoutes('GET', '/foo');
+        $this->assertSame($route1, $matchedRoutes[0]);
+    }
+
+    // Test url for named route
+
+    public function testUrlFor()
+    {
+        $router = new \Slim\Router();
+
+        $route1 = new \Slim\Route('/hello/:first/:last', function () {});
+        $route1 = $route1->via('GET')->name('hello');
+
+        $route2 = new \Slim\Route('/path/(:foo\.:bar)', function () {});
+        $route2 = $route2->via('GET')->name('regexRoute');
+
+        $routes = new \ReflectionProperty($router, 'namedRoutes');
+        $routes->setAccessible(true);
+        $routes->setValue($router, array(
+            'hello' => $route1,
+            'regexRoute' => $route2
+        ));
+
+        $this->assertEquals('/hello/Josh/Lockhart', $router->urlFor('hello', array('first' => 'Josh', 'last' => 'Lockhart')));
+        $this->assertEquals('/path/Hello.Josh', $router->urlFor('regexRoute', array('foo' => 'Hello', 'bar' => 'Josh')));
+    }
+
+    public function testUrlForIfNoSuchRoute()
+    {
+        $this->setExpectedException('RuntimeException');
+
+        $router = new \Slim\Router();
+        $router->urlFor('foo', array('abc' => '123'));
+    }
+}
diff --git a/vendor/slim/slim/tests/SlimTest.php b/vendor/slim/slim/tests/SlimTest.php
new file mode 100644
index 00000000..d661b4da
--- /dev/null
+++ b/vendor/slim/slim/tests/SlimTest.php
@@ -0,0 +1,1657 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@joshlockhart.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+//Mock custom view
+class CustomView extends \Slim\View
+{
+    public function render($template, $data = null) { echo "Custom view"; }
+}
+
+//Echo Logger
+class EchoErrorLogger
+{
+   public function error($object) { echo get_class($object) .':'.$object->getMessage(); }
+}
+
+//Mock extending class
+class Derived extends \Slim\Slim
+{
+	public static function getDefaultSettings()
+	{
+        return array_merge(
+            array("late-static-binding" => true)
+        , parent::getDefaultSettings());
+	}
+}
+
+//Mock middleware
+class CustomMiddleware extends \Slim\Middleware
+{
+    public function call()
+    {
+        $env = $this->app->environment();
+        $res = $this->app->response();
+        $env['slim.test'] = 'Hello';
+        $this->next->call();
+        $res->header('X-Slim-Test', 'Hello');
+        $res->write('Hello');
+    }
+}
+
+class SlimTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        //Remove environment mode if set
+        unset($_ENV['SLIM_MODE']);
+
+        //Reset session
+        $_SESSION = array();
+
+        //Prepare default environment variables
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+            'QUERY_STRING' => 'one=foo&two=bar',
+            'SERVER_NAME' => 'slimframework.com',
+        ));
+    }
+
+    /************************************************
+     * INSTANTIATION
+     ************************************************/
+
+    /**
+     * Test version constant is string
+     */
+    public function testHasVersionConstant()
+    {
+        $this->assertTrue(is_string(\Slim\Slim::VERSION));
+    }
+
+    /**
+     * Test default instance properties
+     */
+    public function testDefaultInstanceProperties()
+    {
+        $s = new \Slim\Slim();
+        $this->assertInstanceOf('\Slim\Http\Request', $s->request());
+        $this->assertInstanceOf('\Slim\Http\Response', $s->response());
+        $this->assertInstanceOf('\Slim\Router', $s->router());
+        $this->assertInstanceOf('\Slim\View', $s->view());
+        $this->assertInstanceOf('\Slim\Log', $s->getLog());
+        $this->assertEquals(\Slim\Log::DEBUG, $s->getLog()->getLevel());
+        $this->assertTrue($s->getLog()->getEnabled());
+        $this->assertInstanceOf('\Slim\Environment', $s->environment());
+    }
+
+    /**
+     * Test get default instance
+     */
+    public function testGetDefaultInstance()
+    {
+        $s = new \Slim\Slim();
+        $s->setName('default'); //We must do this manually since a default app is already set in prev tests
+        $this->assertEquals('default', $s->getName());
+        $this->assertInstanceOf('\Slim\Slim', \Slim\Slim::getInstance());
+        $this->assertSame($s, \Slim\Slim::getInstance());
+    }
+
+    /**
+     * Test get named instance
+     */
+    public function testGetNamedInstance()
+    {
+        $s = new \Slim\Slim();
+        $s->setName('foo');
+        $this->assertSame($s, \Slim\Slim::getInstance('foo'));
+    }
+
+    /**
+     * Test Slim autoloader ignores non-Slim classes
+     *
+     * Pre-conditions:
+     * Instantiate a non-Slim class;
+     *
+     * Post-conditions:
+     * Slim autoloader returns without requiring a class file;
+     */
+    public function testSlimAutoloaderIgnoresNonSlimClass()
+    {
+        $foo = new Foo();
+    }
+
+    /************************************************
+     * SETTINGS
+     ************************************************/
+
+    /**
+     * Test get setting that exists
+     */
+    public function testGetSettingThatExists()
+    {
+        $s = new \Slim\Slim();
+        $this->assertEquals('./templates', $s->config('templates.path'));
+    }
+
+    /**
+     * Test get setting that does not exist
+     */
+    public function testGetSettingThatDoesNotExist()
+    {
+        $s = new \Slim\Slim();
+        $this->assertNull($s->config('foo'));
+    }
+
+    /**
+     * Test set setting
+     */
+    public function testSetSetting()
+    {
+        $s = new \Slim\Slim();
+        $this->assertEquals('./templates', $s->config('templates.path'));
+        $s->config('templates.path', './tmpl');
+        $this->assertEquals('./tmpl', $s->config('templates.path'));
+    }
+
+    /**
+     * Test batch set settings
+     */
+    public function testBatchSetSettings()
+    {
+        $s = new \Slim\Slim();
+        $this->assertEquals('./templates', $s->config('templates.path'));
+        $this->assertTrue($s->config('debug'));
+        $s->config(array(
+            'templates.path' => './tmpl',
+            'debug' => false
+        ));
+        $this->assertEquals('./tmpl', $s->config('templates.path'));
+        $this->assertFalse($s->config('debug'));
+    }
+
+    /**
+     * Test set settings recursively
+     */
+    public function testSetSettingsRecursively()
+    {
+        $config = array(
+            'my_module' => array(
+                'paths'  => array(
+                    './my_module/path/1',
+                ),
+            )
+        );
+
+        $s = new \Slim\Slim($config);
+
+        $override = array(
+            'my_module' => array(
+                'paths'  => array(
+                    './my_module/path/2',
+                    './my_module/path/3',
+                ),
+            )
+        );
+
+        // Test recursive batch behaviour
+        $s->config($override, true);
+
+        $expected =  array(
+            'paths'  => array(
+                './my_module/path/1',
+                './my_module/path/2',
+                './my_module/path/3',
+            ),
+        );
+
+        $this->assertEquals($expected, $s->config('my_module'));
+
+        // Test default batch behaviour
+        $s = new \Slim\Slim($config);
+        $s->config($override);
+
+        $this->assertNotEquals($expected, $s->config('my_module'));
+    }
+
+    /************************************************
+     * MODES
+     ************************************************/
+
+    /**
+     * Test default mode
+     */
+    public function testGetDefaultMode()
+    {
+        $s = new \Slim\Slim();
+        $this->assertEquals('development', $s->getMode());
+    }
+
+    /**
+     * Test custom mode from environment
+     */
+    public function testGetModeFromEnvironment()
+    {
+        $_ENV['SLIM_MODE'] = 'production';
+        $s = new \Slim\Slim();
+        $this->assertEquals('production', $s->getMode());
+    }
+
+    /**
+     * Test custom mode from app settings
+     */
+    public function testGetModeFromSettings()
+    {
+        $s = new \Slim\Slim(array(
+            'mode' => 'test'
+        ));
+        $this->assertEquals('test', $s->getMode());
+        }
+
+    /**
+     * Test mode configuration
+     */
+    public function testModeConfiguration()
+    {
+        $flag = 0;
+        $configureTest = function () use (&$flag) {
+            $flag = 'test';
+        };
+        $configureProduction = function () use (&$flag) {
+            $flag = 'production';
+        };
+        $s = new \Slim\Slim(array('mode' => 'test'));
+        $s->configureMode('test', $configureTest);
+        $s->configureMode('production', $configureProduction);
+        $this->assertEquals('test', $flag);
+    }
+
+    /**
+     * Test mode configuration when mode does not match
+     */
+    public function testModeConfigurationWhenModeDoesNotMatch()
+    {
+        $flag = 0;
+        $configureTest = function () use (&$flag) {
+            $flag = 'test';
+        };
+        $s = new \Slim\Slim(array('mode' => 'production'));
+        $s->configureMode('test', $configureTest);
+        $this->assertEquals(0, $flag);
+    }
+
+    /**
+     * Test mode configuration when not callable
+     */
+    public function testModeConfigurationWhenNotCallable()
+    {
+        $flag = 0;
+        $s = new \Slim\Slim(array('mode' => 'production'));
+        $s->configureMode('production', 'foo');
+        $this->assertEquals(0, $flag);
+    }
+
+    /**
+     * Test custom mode from getenv()
+     */
+    public function testGetModeFromGetEnv()
+    {
+        putenv('SLIM_MODE=production');
+        $s = new \Slim\Slim();
+        $this->assertEquals('production', $s->getMode());
+    }
+
+    /************************************************
+     * ROUTING
+     ************************************************/
+
+    /**
+     * Test GENERIC route
+     */
+    public function testGenericRoute()
+    {
+        $s = new \Slim\Slim();
+        $callable = function () { echo "foo"; };
+        $route = $s->map('/bar', $callable);
+        $this->assertInstanceOf('\Slim\Route', $route);
+        $this->assertEmpty($route->getHttpMethods());
+    }
+
+    /**
+     * Test GET routes also get mapped as a HEAD route
+     */
+    public function testGetRouteIsAlsoMappedAsHead()
+    {
+        $s = new \Slim\Slim();
+        $route = $s->get('/foo', function () {});
+        $this->assertTrue($route->supportsHttpMethod(\Slim\Http\Request::METHOD_GET));
+        $this->assertTrue($route->supportsHttpMethod(\Slim\Http\Request::METHOD_HEAD));
+    }
+
+    /**
+     * Test GET route
+     */
+    public function testGetRoute()
+    {
+        $s = new \Slim\Slim();
+        $mw1 = function () { echo "foo"; };
+        $mw2 = function () { echo "bar"; };
+        $callable = function () { echo "xyz"; };
+        $route = $s->get('/bar', $mw1, $mw2, $callable);
+        $s->call();
+        $this->assertEquals('foobarxyz', $s->response()->body());
+        $this->assertEquals('/bar', $route->getPattern());
+        $this->assertSame($callable, $route->getCallable());
+    }
+
+    /**
+     * Test POST route
+     */
+    public function testPostRoute()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'POST',
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+        ));
+        $s = new \Slim\Slim();
+        $mw1 = function () { echo "foo"; };
+        $mw2 = function () { echo "bar"; };
+        $callable = function () { echo "xyz"; };
+        $route = $s->post('/bar', $mw1, $mw2, $callable);
+        $s->call();
+        $this->assertEquals('foobarxyz', $s->response()->body());
+        $this->assertEquals('/bar', $route->getPattern());
+        $this->assertSame($callable, $route->getCallable());
+    }
+
+    /**
+     * Test PUT route
+     */
+    public function testPutRoute()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'PUT',
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+        ));
+        $s = new \Slim\Slim();
+        $mw1 = function () { echo "foo"; };
+        $mw2 = function () { echo "bar"; };
+        $callable = function () { echo "xyz"; };
+        $route = $s->put('/bar', $mw1, $mw2, $callable);
+        $s->call();
+        $this->assertEquals('foobarxyz', $s->response()->body());
+        $this->assertEquals('/bar', $route->getPattern());
+        $this->assertSame($callable, $route->getCallable());
+    }
+
+    /**
+     * Test PATCH route
+     */
+    public function testPatchRoute()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'PATCH',
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+        ));
+        $s = new \Slim\Slim();
+        $mw1 = function () { echo "foo"; };
+        $mw2 = function () { echo "bar"; };
+        $callable = function () { echo "xyz"; };
+        $route = $s->patch('/bar', $mw1, $mw2, $callable);
+        $s->call();
+        $this->assertEquals('foobarxyz', $s->response()->body());
+        $this->assertEquals('/bar', $route->getPattern());
+        $this->assertSame($callable, $route->getCallable());
+    }
+
+    /**
+     * Test DELETE route
+     */
+    public function testDeleteRoute()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'DELETE',
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+        ));
+        $s = new \Slim\Slim();
+        $mw1 = function () { echo "foo"; };
+        $mw2 = function () { echo "bar"; };
+        $callable = function () { echo "xyz"; };
+        $route = $s->delete('/bar', $mw1, $mw2, $callable);
+        $s->call();
+        $this->assertEquals('foobarxyz', $s->response()->body());
+        $this->assertEquals('/bar', $route->getPattern());
+        $this->assertSame($callable, $route->getCallable());
+    }
+
+    /**
+     * Test OPTIONS route
+     */
+    public function testOptionsRoute()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'OPTIONS',
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+        ));
+        $s = new \Slim\Slim();
+        $mw1 = function () { echo "foo"; };
+        $mw2 = function () { echo "bar"; };
+        $callable = function () { echo "xyz"; };
+        $route = $s->options('/bar', $mw1, $mw2, $callable);
+        $s->call();
+        $this->assertEquals('foobarxyz', $s->response()->body());
+        $this->assertEquals('/bar', $route->getPattern());
+        $this->assertSame($callable, $route->getCallable());
+    }
+
+    /**
+    * Test route groups
+    */
+    public function testRouteGroups()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'GET',
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar/baz', //<-- Virtual'
+        ));
+        $s = new \Slim\Slim();
+        $mw1 = function () { echo "foo"; };
+        $mw2 = function () { echo "bar"; };
+        $callable = function () { echo "xyz"; };
+        $s->group('/bar', $mw1, function () use ($s, $mw2, $callable) {
+            $s->get('/baz', $mw2, $callable);
+        });
+        $s->call();
+        $this->assertEquals('foobarxyz', $s->response()->body());
+    }
+
+    /*
+     * Test ANY route
+     */
+    public function testAnyRoute()
+    {
+        $mw1 = function () { echo "foo"; };
+        $mw2 = function () { echo "bar"; };
+        $callable = function () { echo "xyz"; };
+        $methods = array('GET', 'POST', 'PUT', 'DELETE', 'OPTIONS');
+        foreach ($methods as $i => $method) {
+            \Slim\Environment::mock(array(
+                'REQUEST_METHOD' => $method,
+                'SCRIPT_NAME' => '/foo', //<-- Physical
+                'PATH_INFO' => '/bar', //<-- Virtual
+            ));
+            $s = new \Slim\Slim();
+            $route = $s->any('/bar', $mw1, $mw2, $callable);
+            $s->call();
+            $this->assertEquals('foobarxyz', $s->response()->body());
+            $this->assertEquals('/bar', $route->getPattern());
+            $this->assertSame($callable, $route->getCallable());
+        }
+    }
+
+    /**
+     * Test if route does NOT expect trailing slash and URL has one
+     */
+    public function testRouteWithoutSlashAndUrlWithOne()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar/', //<-- Virtual
+        ));
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () { echo "xyz"; });
+        $s->call();
+        $this->assertEquals(404, $s->response()->status());
+    }
+
+    /**
+     * Tests if route will match in case-insensitive manner if configured to do so
+     */
+    public function testRouteMatchesInCaseInsensitiveMannerIfConfigured()
+    {
+        \Slim\Environment::mock(array(
+            'PATH_INFO' => '/BaR', // Does not match route case
+        ));
+        $s = new \Slim\Slim(array('routes.case_sensitive' => false));
+        $route = $s->get('/bar', function () { echo "xyz"; });
+        $s->call();
+        $this->assertEquals(200, $s->response()->status());
+        $this->assertEquals('xyz', $s->response()->body());
+        $this->assertEquals('/bar', $route->getPattern());
+    }
+
+    /**
+     * Test if route contains URL encoded characters
+     */
+    public function testRouteWithUrlEncodedCharacters()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar/jo%20hn/smi%20th', //<-- Virtual
+        ));
+        $s = new \Slim\Slim();
+        $s->get('/bar/:one/:two', function ($one, $two) { echo $one . $two; });
+        $s->call();
+        $this->assertEquals('jo hnsmi th', $s->response()->body());
+    }
+
+    /************************************************
+     * VIEW
+     ************************************************/
+
+    /**
+     * Test set view with string class name
+     */
+    public function testSetSlimViewFromString()
+    {
+        $s = new \Slim\Slim();
+        $this->assertInstanceOf('\Slim\View', $s->view());
+        $s->view('CustomView');
+        $this->assertInstanceOf('CustomView', $s->view());
+    }
+
+    /**
+     * Test set view with object instance
+     */
+    public function testSetSlimViewFromInstance()
+    {
+        $s = new \Slim\Slim();
+        $this->assertInstanceOf('\Slim\View', $s->view());
+        $s->view(new CustomView());
+        $this->assertInstanceOf('CustomView', $s->view());
+    }
+
+    /**
+     * Test view data is transferred to newer view
+     */
+    public function testViewDataTransfer()
+    {
+        $data = array('foo' => 'bar');
+        $s = new \Slim\Slim();
+        $s->view()->setData($data);
+        $s->view('CustomView');
+        $this->assertSame($data, $s->view()->getData());
+    }
+
+    /************************************************
+     * RENDERING
+     ************************************************/
+
+    /**
+     * Test template path is passed to view
+     */
+    public function testViewGetsTemplatesPath()
+    {
+        $path = dirname(__FILE__) . '/templates';
+        $s = new \Slim\Slim(array('templates.path' => $path));
+        $this->assertEquals($s->view->getTemplatesDirectory(), $path);
+    }
+
+    /**
+     * Test render with template and data
+     */
+    public function testRenderTemplateWithData()
+    {
+        $s = new \Slim\Slim(array('templates.path' => dirname(__FILE__) . '/templates'));
+        $s->get('/bar', function () use ($s) {
+            $s->render('test.php', array('foo' => 'bar'));
+        });
+        $s->call();
+        list($status, $header, $body) = $s->response()->finalize();
+        $this->assertEquals(200, $status);
+        $this->assertEquals('test output bar', $body);
+    }
+
+    /**
+     * Test render with template and data and status
+     */
+    public function testRenderTemplateWithDataAndStatus()
+    {
+        $s = new \Slim\Slim(array('templates.path' => dirname(__FILE__) . '/templates'));
+        $s->get('/bar', function () use ($s) {
+            $s->render('test.php', array('foo' => 'bar'), 500);
+        });
+        $s->call();
+        list($status, $header, $body) = $s->response()->finalize();
+        $this->assertEquals(500, $status);
+        $this->assertEquals('test output bar', $body);
+    }
+
+    /************************************************
+     * LOG
+     ************************************************/
+
+    /**
+     * Test get log
+     *
+     * This asserts that a Slim app has a default Log
+     * upon instantiation. The Log itself is tested
+     * separately in another file.
+     */
+    public function testGetLog()
+    {
+        $s = new \Slim\Slim();
+        $this->assertInstanceOf('\Slim\Log', $s->getLog());
+    }
+
+    /************************************************
+     * HTTP CACHING
+     ************************************************/
+
+    /**
+     * Test Last-Modified match
+     */
+    public function testLastModifiedMatch()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'GET',
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+            'HTTP_IF_MODIFIED_SINCE' => 'Sun, 03 Oct 2010 21:00:52 GMT',
+        ));
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->lastModified(1286139652);
+        });
+        $s->call();
+        $this->assertEquals(304, $s->response()->status());
+    }
+
+    /**
+     * Test Last-Modified match
+     */
+    public function testLastModifiedDoesNotMatch()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+            'IF_MODIFIED_SINCE' => 'Sun, 03 Oct 2010 21:00:52 GMT',
+        ));
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->lastModified(1286139250);
+        });
+        $s->call();
+        $this->assertEquals(200, $s->response()->status());
+    }
+
+    public function testLastModifiedOnlyAcceptsIntegers()
+    {
+        $this->setExpectedException('\InvalidArgumentException');
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+        ));
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->lastModified('Test');
+        });
+        $s->call();
+    }
+
+    /**
+     * Test Last Modified header format
+     */
+    public function testLastModifiedHeaderFormat()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+        ));
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->lastModified(1286139652);
+        });
+        $s->call();
+        list($status, $header, $body) = $s->response()->finalize();
+        $this->assertTrue(isset($header['Last-Modified']));
+        $this->assertEquals('Sun, 03 Oct 2010 21:00:52 GMT', $header['Last-Modified']);
+    }
+
+    /**
+     * Test ETag matches
+     */
+    public function testEtagMatches()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+            'HTTP_IF_NONE_MATCH' => '"abc123"',
+        ));
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->etag('abc123');
+        });
+        $s->call();
+        $this->assertEquals(304, $s->response()->status());
+    }
+
+    /**
+     * Test ETag does not match
+     */
+    public function testEtagDoesNotMatch()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+            'IF_NONE_MATCH' => '"abc1234"',
+        ));
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->etag('abc123');
+        });
+        $s->call();
+        $this->assertEquals(200, $s->response()->status());
+    }
+
+    /**
+     * Test ETag with invalid type
+     */
+    public function testETagWithInvalidType()
+    {
+        $this->setExpectedException('\InvalidArgumentException');
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+            'IF_NONE_MATCH' => '"abc1234"',
+        ));
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->etag('123','foo');
+        });
+        $s->call();
+    }
+
+    /**
+     * Test Expires
+     */
+    public function testExpiresAsString()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+        ));
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->expires('5 days');
+        });
+        $s->call();
+        list($status, $header, $body) = $s->response()->finalize();
+        $this->assertTrue(isset($header['Expires']));
+
+        $this->assertEquals(
+          strtotime('5 days'),
+          strtotime($header['Expires']),
+          1 // delta
+        );
+    }
+
+    /**
+     * Test Expires
+     */
+    public function testExpiresAsInteger()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+        ));
+        $fiveDaysFromNow = time() + (60 * 60 * 24 * 5);
+        $expectedDate = gmdate('D, d M Y H:i:s T', $fiveDaysFromNow);
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s, $fiveDaysFromNow) {
+            $s->expires($fiveDaysFromNow);
+        });
+        $s->call();
+        list($status, $header, $body) = $s->response()->finalize();
+        $this->assertTrue(isset($header['Expires']));
+        $this->assertEquals($header['Expires'], $expectedDate);
+    }
+
+    /************************************************
+     * COOKIES
+     ************************************************/
+
+    /**
+     * Set cookie
+     *
+     * This tests that the Slim application instance sets
+     * a cookie in the HTTP response header. This does NOT
+     * test the implementation of setting the cookie; that is
+     * tested in a separate file.
+     */
+    public function testSetCookie()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+        ));
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->setCookie('foo', 'bar', '2 days');
+            $s->setCookie('foo1', 'bar1', '2 days');
+        });
+        $s->call();
+        $cookie1 = $s->response->cookies->get('foo');
+        $cookie2 = $s->response->cookies->get('foo1');
+        $this->assertEquals(2, count($s->response->cookies));
+        $this->assertEquals('bar', $cookie1['value']);
+        $this->assertEquals('bar1', $cookie2['value']);
+    }
+
+    /**
+     * Test get cookie
+     *
+     * This method ensures that the `Cookie:` HTTP request
+     * header is parsed if present, and made accessible via the
+     * Request object.
+     */
+    public function testGetCookie()
+    {
+        \Slim\Environment::mock(array(
+            'REQUEST_METHOD' => 'GET',
+            'REMOTE_ADDR' => '127.0.0.1',
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+            'QUERY_STRING' => 'one=foo&two=bar',
+            'SERVER_NAME' => 'slimframework.com',
+            'SERVER_PORT' => 80,
+            'HTTP_COOKIE' => 'foo=bar; foo2=bar2',
+            'slim.url_scheme' => 'http',
+            'slim.input' => '',
+            'slim.errors' => @fopen('php://stderr', 'w')
+        ));
+        $s = new \Slim\Slim();
+        $this->assertEquals('bar', $s->getCookie('foo'));
+        $this->assertEquals('bar2', $s->getCookie('foo2'));
+    }
+
+    /**
+     * Test get cookie when cookie does not exist
+     */
+    public function testGetCookieThatDoesNotExist()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+        ));
+        $s = new \Slim\Slim();
+        $this->assertNull($s->getCookie('foo'));
+    }
+
+    /**
+     * Test delete cookie
+     *
+     * This method ensures that the `Set-Cookie:` HTTP response
+     * header is set. The implementation of setting the response
+     * cookie is tested separately in another file.
+     */
+    public function testDeleteCookie()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/bar', //<-- Virtual
+            'COOKIE' => 'foo=bar; foo2=bar2',
+        ));
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->setCookie('foo', 'bar');
+            $s->deleteCookie('foo');
+        });
+        $s->call();
+        $cookie = $s->response->cookies->get('foo');
+        $this->assertEquals(1, count($s->response->cookies));
+        $this->assertEquals('', $cookie['value']);
+        $this->assertLessThan(time(), $cookie['expires']);
+    }
+
+    /************************************************
+     * HELPERS
+     ************************************************/
+
+    /**
+     * Test get filesystem path to Slim app root directory
+     */
+    public function testGetRoot()
+    {
+        $_SERVER['DOCUMENT_ROOT'] = dirname(__FILE__); //<-- No trailing slash
+        $s = new \Slim\Slim();
+        $this->assertEquals($_SERVER['DOCUMENT_ROOT'] . '/foo/', $s->root()); //<-- Appends physical app path with trailing slash
+    }
+
+    /**
+     * Test stop
+     */
+    public function testStop()
+    {
+        $this->setExpectedException('\Slim\Exception\Stop');
+        $s = new \Slim\Slim();
+        $s->stop();
+    }
+
+    /**
+     * Test stop with subsequent output
+     */
+    public function testStopWithSubsequentOutput()
+    {
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            echo "Foo"; //<-- Should be in response body!
+            $s->stop();
+            echo "Bar"; //<-- Should not be in response body!
+        });
+        $s->call();
+        $this->assertEquals('Foo', $s->response()->body());
+    }
+
+    /**
+     * Test stop with output buffer on and pre content
+     */
+    public function testStopOutputWithOutputBufferingOnAndPreContent()
+    {
+        $this->expectOutputString('1.2.Foo.3'); //<-- PHP unit uses OB here
+        echo "1.";
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            echo "Foo";
+            $s->stop();
+        });
+        echo "2.";
+        $s->run();      //<-- Needs to be run to actually echo body
+        echo ".3";
+    }
+
+    /**
+     * Test stop does not leave output buffers open
+     */
+    public function testStopDoesNotLeaveOutputBuffersOpen()
+    {
+        $level_start = ob_get_level();
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->stop();
+        });
+        $s->run();
+        $this->assertEquals($level_start, ob_get_level());
+    }
+
+    /**
+     * Test halt
+     */
+    public function testHalt()
+    {
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            echo "Foo!"; //<-- Should not be in response body!
+            $s->halt(500, 'Something broke');
+        });
+        $s->call();
+        list($status, $header, $body) = $s->response()->finalize();
+        $this->assertEquals(500, $status);
+        $this->assertEquals('Something broke', $body);
+    }
+
+    /**
+     * Test halt with output buffering and pre content
+     */
+    public function testHaltOutputWithOutputBufferingOnAndPreContent()
+    {
+        $this->expectOutputString('1.2.Something broke.3'); //<-- PHP unit uses OB here
+        echo "1.";
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            echo "Foo!"; //<-- Should not be in response body!
+            $s->halt(500, 'Something broke');
+        });
+        echo "2.";
+        $s->run();
+        echo ".3";
+    }
+
+    /**
+     * Test halt does not leave output buffers open
+     */
+    public function testHaltDoesNotLeaveOutputBuffersOpen()
+    {
+        $level_start = ob_get_level();
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->halt(500, '');
+        });
+        $s->run();
+        $this->assertEquals($level_start, ob_get_level());
+    }
+
+    /**
+     * Test pass cleans buffer and throws exception
+     */
+    public function testPass()
+    {
+        ob_start();
+        $s = new \Slim\Slim();
+        echo "Foo";
+        try {
+            $s->pass();
+            $this->fail('Did not catch Slim_Exception_Pass');
+        } catch ( \Slim\Exception\Pass $e ) {}
+        $output = ob_get_clean();
+        $this->assertEquals('', $output);
+    }
+
+    /**
+     * Test pass when there is a subsequent fallback route
+     */
+    public function testPassWithSubsequentRoute()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/name/Frank', //<-- Virtual
+        ));
+        $s = new \Slim\Slim();
+        $s->get('/name/Frank', function () use ($s) {
+            echo "Fail"; //<-- Should not be in response body!
+            $s->pass();
+        });
+        $s->get('/name/:name', function ($name) {
+            echo $name; //<-- Should be in response body!
+        });
+        $s->call();
+        $this->assertEquals('Frank', $s->response()->body());
+    }
+
+    /**
+     * Test pass when there is not a subsequent fallback route
+     */
+    public function testPassWithoutSubsequentRoute()
+    {
+        \Slim\Environment::mock(array(
+            'SCRIPT_NAME' => '/foo', //<-- Physical
+            'PATH_INFO' => '/name/Frank', //<-- Virtual
+        ));
+        $s = new \Slim\Slim();
+        $s->get('/name/Frank', function () use ($s) {
+            echo "Fail"; //<-- Should not be in response body!
+            $s->pass();
+        });
+        $s->call();
+        $this->assertEquals(404, $s->response()->status());
+    }
+
+    /**
+     * Test content type
+     */
+    public function testContentType()
+    {
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->contentType('application/json');
+        });
+        $s->call();
+        list($status, $header, $body) = $s->response()->finalize();
+        $this->assertEquals('application/json', $header['Content-Type']);
+    }
+
+    /**
+     * Test status
+     */
+    public function testStatus()
+    {
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->status(403);
+        });
+        $s->call();
+        $this->assertEquals(403, $s->response()->status());
+    }
+
+    /**
+     * Test URL for
+     */
+    public function testSlimUrlFor()
+    {
+        $s = new \Slim\Slim();
+        $s->get('/hello/:name', function () {})->name('hello');
+        $this->assertEquals('/foo/hello/Josh', $s->urlFor('hello', array('name' => 'Josh'))); //<-- Prepends physical path!
+    }
+
+    /**
+     * Test redirect sets status and header
+     */
+    public function testRedirect()
+    {
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            echo "Foo"; //<-- Should not be in response body!
+            $s->redirect('/somewhere/else', 303);
+        });
+        $s->call();
+        list($status, $header, $body) = $s->response()->finalize();
+        $this->assertEquals(303, $status);
+        $this->assertEquals('/somewhere/else', $header['Location']);
+        $this->assertEquals('', $body);
+    }
+
+    /************************************************
+     * RUNNER
+     ************************************************/
+
+    /**
+     * Test that runner sends headers and body
+     */
+    public function testRun()
+    {
+        $this->expectOutputString('Foo');
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            echo "Foo";
+        });
+        $s->run();
+    }
+
+    /**
+     * Test runner output with output buffering on and pre content
+     */
+    public function testRunOutputWithOutputBufferingOnAndPreContent()
+    {
+      $this->expectOutputString('1.2.Foo.3');  //<-- PHP unit uses OB here
+      $s = new \Slim\Slim();
+      echo "1.";
+      $s->get('/bar', function () use ($s) {
+          echo "Foo";
+      });
+      echo "2.";
+      $s->run();
+      echo ".3";
+    }
+
+    /**
+     * Test that runner does not leave output buffers open
+     */
+    public function testRunDoesNotLeaveAnyOutputBuffersOpen()
+    {
+      $level_start = ob_get_level();
+      $s = new \Slim\Slim();
+      $s->get('/bar', function () use ($s) {});
+      $s->run();
+      $this->assertEquals($level_start, ob_get_level());
+    }
+
+    /************************************************
+     * MIDDLEWARE
+     ************************************************/
+
+    /**
+     * Test add middleware
+     *
+     * This asserts that middleware are queued and called
+     * in sequence. This also asserts that the environment
+     * variables are passed by reference.
+     */
+    public function testAddMiddleware()
+    {
+        $this->expectOutputString('FooHello');
+        $s = new \Slim\Slim();
+        $s->add(new CustomMiddleware()); //<-- See top of this file for class definition
+        $s->get('/bar', function () {
+            echo 'Foo';
+        });
+        $s->run();
+        $this->assertEquals('Hello', $s->response()->header('X-Slim-Test'));
+    }
+
+    /**
+     * Test exception when adding circular middleware queues
+     *
+     * This asserts that the same middleware can NOT be queued twice (usually by accident).
+     * Circular middleware stack causes a troublesome to debug PHP Fatal error:
+     *
+     * > Fatal error: Maximum function nesting level of '100' reached. aborting!
+     */
+    public function testFailureWhenAddingCircularMiddleware()
+    {
+        $this->setExpectedException('\RuntimeException');
+        $middleware = new CustomMiddleware;
+        $s = new \Slim\Slim;
+        $s->add($middleware);
+        $s->add(new CustomMiddleware);
+        $s->add($middleware);
+        $s->run();
+    }
+
+    /************************************************
+     * FLASH MESSAGING
+     ************************************************/
+
+    public function testSetFlashForNextRequest()
+    {
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->flash('info', 'bar');
+        });
+        $this->assertFalse(isset($_SESSION['slim.flash']));
+        $s->run();
+        $this->assertEquals('bar', $_SESSION['slim.flash']['info']);
+    }
+
+    public function testSetFlashForCurrentRequest()
+    {
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->flashNow('info', 'bar');
+        });
+        $s->run();
+        $env = $s->environment();
+        $this->assertEquals('bar', $env['slim.flash']['info']);
+    }
+
+    public function testKeepFlashForNextRequest()
+    {
+        $_SESSION['slim.flash'] = array('info' => 'Foo');
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->flashKeep();
+        });
+        $s->run();
+        $this->assertEquals('Foo', $_SESSION['slim.flash']['info']);
+    }
+
+    public function testFlashData()
+    {
+        $s = new \Slim\Slim();
+        $s->get('/bar', function () use ($s) {
+            $s->flashNow('info', 'bar');
+        });
+        $s->run();
+        $this->assertEquals(array('info' => 'bar'), $s->flashData());
+    }
+
+    /************************************************
+     * NOT FOUND HANDLING
+     ************************************************/
+
+    /**
+     * Test custom Not Found handler
+     */
+    public function testNotFound()
+    {
+        $s = new \Slim\Slim();
+        $s->notFound(function () {
+            echo "Not Found";
+        });
+        $s->get('/foo', function () {});
+        $s->call();
+        list($status, $header, $body) = $s->response()->finalize();
+        $this->assertEquals(404, $status);
+        $this->assertEquals('Not Found', $body);
+    }
+
+    /************************************************
+     * ERROR HANDLING
+     ************************************************/
+
+    /**
+     * Test default and custom error handlers
+     *
+     * Pre-conditions:
+     * Invoked app route calls default error handler;
+     *
+     * Post-conditions:
+     * Response status code is 500;
+     */
+    public function testSlimError()
+    {
+        $s = new \Slim\Slim(array(
+            "log.enabled" => false
+        ));
+        $s->get('/bar', function () use ($s) {
+            $s->error();
+        });
+        $s->call();
+        $this->assertEquals(500, $s->response()->status());
+    }
+
+    /**
+     * Test default error handler logs the error when debug is false.
+     *
+     * Pre-conditions:
+     * Invoked app route calls default error handler;
+     *
+     * Post-conditions:
+     * Error log is called
+     */
+    public function testDefaultHandlerLogsTheErrorWhenDebugIsFalse()
+    {
+        $s = new \Slim\Slim(array('debug' => false));
+        $s->container->singleton('log', function ($c) {
+            return new EchoErrorLogger();
+        });
+        $s->get('/bar', function () use ($s) {
+            throw new \InvalidArgumentException('my specific error message');
+        });
+
+        ob_start();
+        $s->run();
+        $output = ob_get_clean();
+        $this->assertTrue(strpos($output, 'InvalidArgumentException:my specific error message') !== false);
+    }
+
+    /**
+     * Test triggered errors are converted to ErrorExceptions
+     *
+     * Pre-conditions:
+     * Custom error handler defined;
+     * Invoked app route triggers error;
+     *
+     * Post-conditions:
+     * Response status is 500;
+     * Response body is equal to triggered error message;
+     * Error handler's argument is ErrorException instance;
+     */
+    public function DISABLEDtestTriggeredErrorsAreConvertedToErrorExceptions()
+    {
+        $s = new \Slim\Slim(array(
+            'debug' => false
+        ));
+        $s->error(function ( $e ) {
+            if ($e instanceof \ErrorException) {
+                echo $e->getMessage();
+            }
+        });
+        $s->get('/bar', function () {
+            trigger_error('Foo I say!');
+        });
+        $s->call();
+        list($status, $header, $body) = $s->response()->finalize();
+        $this->assertEquals(500, $status);
+        $this->assertEquals('Foo I say!', $body);
+    }
+
+    /**
+     * Test error triggered with multiple applications
+     *
+     * Pre-conditions:
+     * Multiple Slim apps are instantiated;
+     * Both apps are run;
+     * One app returns 200 OK;
+     * One app triggers an error;
+     *
+     * Post-conditions:
+     * One app returns 200 OK with no Exceptions;
+     * One app returns 500 Error;
+     * Error triggered does not affect other app;
+     */
+    public function testErrorWithMultipleApps()
+    {
+        $s1 = new \Slim\Slim(array(
+            'debug' => false,
+            'log.enabled' => false
+        ));
+        $s2 = new \Slim\Slim();
+        $s1->get('/bar', function () use ($s1) {
+            $s1->error();
+        });
+        $s2->get('/bar', function () {
+            echo 'success';
+        });
+        $s1->call();
+        $s2->call();
+        $this->assertEquals(500, $s1->response()->status());
+        $this->assertEquals(200, $s2->response()->status());
+    }
+
+    /**
+     * Test custom error handler uses existing Response object
+     */
+    public function testErrorHandlerUsesCurrentResponseObject()
+    {
+        $s = new \Slim\Slim(array(
+            'debug' => false
+        ));
+        $s->error(function ( \Exception $e ) use ($s) {
+            $r = $s->response();
+            $r->status(503);
+            $r->write('Foo');
+            $r['X-Powered-By'] = 'Slim';
+            echo 'Bar';
+        });
+        $s->get('/bar', function () {
+            throw new \Exception('Foo');
+        });
+        $s->call();
+        list($status, $header, $body) = $s->response()->finalize();
+        $this->assertEquals(503, $status);
+        $this->assertEquals('FooBar', $body);
+        $this->assertEquals('Slim', $header['X-Powered-By']);
+    }
+
+    /**
+     * Test custom global error handler
+     */
+    public function testHandleErrors()
+    {
+        $defaultErrorReporting = error_reporting();
+
+        // Test 1
+        error_reporting(E_ALL ^ E_NOTICE); // <-- Report all errors EXCEPT notices
+        try {
+            \Slim\Slim::handleErrors(E_NOTICE, 'test error', 'Slim.php', 119);
+        } catch (\ErrorException $e) {
+            $this->fail('Slim::handleErrors reported a disabled error level.');
+        }
+
+        // Test 2
+        error_reporting(E_ALL | E_STRICT); // <-- Report all errors, including E_STRICT
+        try {
+            \Slim\Slim::handleErrors(E_STRICT, 'test error', 'Slim.php', 119);
+            $this->fail('Slim::handleErrors didn\'t report a enabled error level');
+        } catch (\ErrorException $e) {}
+
+        error_reporting($defaultErrorReporting);
+    }
+
+    /**
+     * Slim should keep reference to a callable error callback
+     */
+    public function testErrorHandler() {
+        $s = new \Slim\Slim();
+        $errCallback = function () { echo "404"; };
+        $s->error($errCallback);
+        $this->assertSame($errCallback, PHPUnit_Framework_Assert::readAttribute($s, 'error'));
+    }
+
+    /**
+     * Slim should throw a Slim_Exception_Stop if error callback is not callable
+     */
+    public function testErrorHandlerIfNotCallable() {
+        $this->setExpectedException('\Slim\Exception\Stop');
+        $s = new \Slim\Slim(array("log.enabled" => false));
+        $errCallback = 'foo';
+        $s->error($errCallback);
+    }
+
+    /**
+     * Slim should keep reference to a callable NotFound callback
+     */
+    public function testNotFoundHandler() {
+        $s = new \Slim\Slim();
+        $notFoundCallback = function () { echo "404"; };
+        $s->notFound($notFoundCallback);
+        $this->assertSame($notFoundCallback, PHPUnit_Framework_Assert::readAttribute($s, 'notFound'));
+    }
+
+    /**
+     * Slim should throw a Slim_Exception_Stop if NotFound callback is not callable
+     */
+    public function testNotFoundHandlerIfNotCallable() {
+        $this->setExpectedException('\Slim\Exception\Stop');
+        $s = new \Slim\Slim();
+        $notFoundCallback = 'foo';
+        $s->notFound($notFoundCallback);
+    }
+
+    /************************************************
+     * HOOKS
+     ************************************************/
+
+    /**
+     * Test hook listener
+     *
+     * Pre-conditions:
+     * Slim app instantiated;
+     * Hook name does not exist;
+     * Listeners are callable objects;
+     *
+     * Post-conditions:
+     * Callables are invoked in expected order;
+     */
+    public function testRegistersAndCallsHooksByPriority()
+    {
+        $this->expectOutputString('barfoo');
+        $app = new \Slim\Slim();
+        $callable1 = function () { echo "foo"; };
+        $callable2 = function () { echo "bar"; };
+        $app->hook('test.hook.one', $callable1); //default is 10
+        $app->hook('test.hook.one', $callable2, 8);
+        $hooks = $app->getHooks();
+        $this->assertEquals(7, count($hooks)); //6 default, 1 custom
+        $app->applyHook('test.hook.one');
+    }
+
+    /**
+     * Test hook listener if listener is not callable
+     *
+     * Pre-conditions:
+     * Slim app instantiated;
+     * Hook name does not exist;
+     * Listener is NOT a callable object;
+     *
+     * Post-conditions:
+     * Hook is created;
+     * Callable is NOT assigned to hook;
+     */
+    public function testHookInvalidCallable()
+    {
+        $app = new \Slim\Slim();
+        $callable = 'test'; //NOT callable
+        $app->hook('test.hook.one', $callable);
+        $this->assertEquals(array(array()), $app->getHooks('test.hook.one'));
+    }
+
+    /**
+     * Test hook invocation if hook does not exist
+     *
+     * Pre-conditions:
+     * Slim app instantiated;
+     * Hook name does not exist;
+     *
+     * Post-conditions:
+     * Hook is created;
+     * Hook initialized with empty array;
+     */
+    public function testHookInvocationIfNotExists()
+    {
+        $app = new \Slim\Slim();
+        $app->applyHook('test.hook.one');
+        $this->assertEquals(array(array()), $app->getHooks('test.hook.one'));
+    }
+
+    /**
+     * Test clear hooks
+     *
+     * Pre-conditions:
+     * Slim app instantiated;
+     * Two hooks exist, each with one listener;
+     *
+     * Post-conditions:
+     * Case A: Listeners for 'test.hook.one' are cleared;
+     * Case B: Listeners for all hooks are cleared;
+     */
+    public function testHookClear()
+    {
+        $app = new \Slim\Slim();
+        $app->hook('test.hook.one', function () {});
+        $app->hook('test.hook.two', function () {});
+        $app->clearHooks('test.hook.two');
+        $this->assertEquals(array(array()), $app->getHooks('test.hook.two'));
+        $hookOne = $app->getHooks('test.hook.one');
+        $this->assertTrue(count($hookOne[10]) === 1);
+        $app->clearHooks();
+        $this->assertEquals(array(array()), $app->getHooks('test.hook.one'));
+    }
+
+    /**
+     * Test hooks accept multiple arguments
+     *
+     * Pre-conditions:
+     * Slim app instantiated;
+     * Hook name does not exist;
+     * Listener is a callable object;
+     *
+     * Post-conditions:
+     * Callable invoked with 2 arguments
+     */
+    public function testHooksMultipleArguments()
+    {
+        $testArgA = 'argumentA';
+        $testArgB = 'argumentB';
+
+        $this->expectOutputString($testArgA . $testArgB);
+
+	$app = new \Slim\Slim();
+
+        $app->hook('test.hook.one', function ($argA, $argB) {
+                echo $argA . $argB;
+        });
+        $app->applyHook('test.hook.one', $testArgA, $testArgB);
+    }
+
+    /**
+     * Test late static binding
+     *
+     * Pre-conditions:
+     * Slim app is extended by Derived class and instantiated;
+     * Derived class overrides the 'getDefaultSettings' function and adds an extra default config value
+     * Test that the new config value exists
+     *
+     * Post-conditions:
+     * Config value exists and is equal to expected value
+     */
+    public function testDerivedClassCanOverrideStaticFunction()
+    {
+        $app = new Derived();
+        $this->assertEquals($app->config("late-static-binding"), true);
+    }
+}
diff --git a/vendor/slim/slim/tests/ViewTest.php b/vendor/slim/slim/tests/ViewTest.php
new file mode 100644
index 00000000..5d84b8bd
--- /dev/null
+++ b/vendor/slim/slim/tests/ViewTest.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Slim - a micro PHP 5 framework
+ *
+ * @author      Josh Lockhart <info@slimframework.com>
+ * @copyright   2011 Josh Lockhart
+ * @link        http://www.slimframework.com
+ * @license     http://www.slimframework.com/license
+ * @version     2.6.1
+ *
+ * MIT LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+class ViewTest extends PHPUnit_Framework_TestCase
+{
+    public function testGetDataAll()
+    {
+        $view = new \Slim\View();
+        $prop = new \ReflectionProperty($view, 'data');
+        $prop->setAccessible(true);
+        $prop->setValue($view, new \Slim\Helper\Set(array('foo' => 'bar')));
+
+        $this->assertSame(array('foo' => 'bar'), $view->getData());
+    }
+
+    public function testGetDataKeyExists()
+    {
+        $view = new \Slim\View();
+        $prop = new \ReflectionProperty($view, 'data');
+        $prop->setAccessible(true);
+        $prop->setValue($view, new \Slim\Helper\Set(array('foo' => 'bar')));
+
+        $this->assertEquals('bar', $view->getData('foo'));
+    }
+
+    public function testGetDataKeyNotExists()
+    {
+        $view = new \Slim\View();
+        $prop = new \ReflectionProperty($view, 'data');
+        $prop->setAccessible(true);
+        $prop->setValue($view, new \Slim\Helper\Set(array('foo' => 'bar')));
+
+        $this->assertNull($view->getData('abc'));
+    }
+
+    public function testSetDataKeyValue()
+    {
+        $view = new \Slim\View();
+        $prop = new \ReflectionProperty($view, 'data');
+        $prop->setAccessible(true);
+        $view->setData('foo', 'bar');
+
+        $this->assertEquals(array('foo' => 'bar'), $prop->getValue($view)->all());
+    }
+
+    public function testSetDataKeyValueAsClosure()
+    {
+        $view = new \Slim\View();
+        $prop = new \ReflectionProperty($view, 'data');
+        $prop->setAccessible(true);
+
+        $view->setData('fooClosure', function () {
+            return 'foo';
+        });
+
+        $value = $prop->getValue($view)->get('fooClosure');
+        $this->assertInstanceOf('Closure', $value);
+        $this->assertEquals('foo', $value());
+    }
+
+    public function testSetDataArray()
+    {
+        $view = new \Slim\View();
+        $prop = new \ReflectionProperty($view, 'data');
+        $prop->setAccessible(true);
+        $view->setData(array('foo' => 'bar'));
+
+        $this->assertEquals(array('foo' => 'bar'), $prop->getValue($view)->all());
+    }
+
+    public function testSetDataInvalidArgument()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+
+        $view = new \Slim\View();
+        $view->setData('foo');
+    }
+
+    public function testAppendData()
+    {
+        $view = new \Slim\View();
+        $prop = new \ReflectionProperty($view, 'data');
+        $prop->setAccessible(true);
+        $view->appendData(array('foo' => 'bar'));
+
+        $this->assertEquals(array('foo' => 'bar'), $prop->getValue($view)->all());
+    }
+
+    public function testLocalData()
+    {
+        $view = new \Slim\View();
+        $prop1 = new \ReflectionProperty($view, 'data');
+        $prop1->setAccessible(true);
+        $prop1->setValue($view, new \Slim\Helper\Set(array('foo' => 'bar')));
+
+        $prop2 = new \ReflectionProperty($view, 'templatesDirectory');
+        $prop2->setAccessible(true);
+        $prop2->setValue($view, dirname(__FILE__) . '/templates');
+
+        $output = $view->fetch('test.php', array('foo' => 'baz'));
+        $this->assertEquals('test output baz', $output);
+    }
+
+    public function testAppendDataOverwrite()
+    {
+        $view = new \Slim\View();
+        $prop = new \ReflectionProperty($view, 'data');
+        $prop->setAccessible(true);
+        $prop->setValue($view, new \Slim\Helper\Set(array('foo' => 'bar')));
+        $view->appendData(array('foo' => '123'));
+
+        $this->assertEquals(array('foo' => '123'), $prop->getValue($view)->all());
+    }
+
+    public function testAppendDataInvalidArgument()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+
+        $view = new \Slim\View();
+        $view->appendData('foo');
+    }
+
+    public function testGetTemplatesDirectory()
+    {
+        $view = new \Slim\View();
+        $property = new \ReflectionProperty($view, 'templatesDirectory');
+        $property->setAccessible(true);
+        $property->setValue($view, 'templates');
+
+        $this->assertEquals('templates', $view->getTemplatesDirectory());
+    }
+
+    public function testSetTemplatesDirectory()
+    {
+        $view = new \Slim\View();
+        $directory = 'templates' . DIRECTORY_SEPARATOR;
+        $view->setTemplatesDirectory($directory); // <-- Should strip trailing slash
+
+        $this->assertAttributeEquals('templates', 'templatesDirectory', $view);
+    }
+
+    public function testDisplay()
+    {
+        $this->expectOutputString('test output bar');
+
+        $view = new \Slim\View();
+        $prop1 = new \ReflectionProperty($view, 'data');
+        $prop1->setAccessible(true);
+        $prop1->setValue($view, new \Slim\Helper\Set(array('foo' => 'bar')));
+
+        $prop2 = new \ReflectionProperty($view, 'templatesDirectory');
+        $prop2->setAccessible(true);
+        $prop2->setValue($view, dirname(__FILE__) . '/templates');
+
+        $view->display('test.php');
+    }
+
+    public function testDisplayTemplateThatDoesNotExist()
+    {
+        $this->setExpectedException('\RuntimeException');
+
+        $view = new \Slim\View();
+
+        $prop2 = new \ReflectionProperty($view, 'templatesDirectory');
+        $prop2->setAccessible(true);
+        $prop2->setValue($view, dirname(__FILE__) . '/templates');
+
+        $view->display('foo.php');
+    }
+}
diff --git a/vendor/slim/slim/tests/bootstrap.php b/vendor/slim/slim/tests/bootstrap.php
new file mode 100644
index 00000000..c2533500
--- /dev/null
+++ b/vendor/slim/slim/tests/bootstrap.php
@@ -0,0 +1,22 @@
+<?php
+set_include_path(dirname(__FILE__) . '/../' . PATH_SEPARATOR . get_include_path());
+
+// Set default timezone
+date_default_timezone_set('America/New_York');
+
+require_once 'Slim/Slim.php';
+
+// Register Slim's autoloader
+\Slim\Slim::registerAutoloader();
+
+//Register non-Slim autoloader
+function customAutoLoader( $class )
+{
+    $file = rtrim(dirname(__FILE__), '/') . '/' . $class . '.php';
+    if ( file_exists($file) ) {
+        require $file;
+    } else {
+        return;
+    }
+}
+spl_autoload_register('customAutoLoader');
diff --git a/vendor/slim/slim/tests/templates/test.php b/vendor/slim/slim/tests/templates/test.php
new file mode 100644
index 00000000..b4c77549
--- /dev/null
+++ b/vendor/slim/slim/tests/templates/test.php
@@ -0,0 +1 @@
+test output <?php echo $foo; ?>

From 7352db45b755ee0361abe4f2732603fc39786d11 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 31 Aug 2015 01:06:14 +0200
Subject: [PATCH 281/353] Controller and model folders into /app

---
 {controller => app/controller}/admin/bans.php |   4 +-
 .../controller}/admin/categories.php          |   4 +-
 .../controller}/admin/censoring.php           |   4 +-
 .../controller}/admin/forums.php              |   6 +-
 .../controller}/admin/groups.php              |   4 +-
 .../controller}/admin/index.php               |   2 +-
 .../controller}/admin/maintenance.php         |   4 +-
 .../controller}/admin/options.php             |   4 +-
 .../controller}/admin/parser.php              |   4 +-
 .../controller}/admin/permissions.php         |   4 +-
 .../controller}/admin/plugins.php             |   2 +-
 .../controller}/admin/reports.php             |   4 +-
 .../controller}/admin/statistics.php          |   4 +-
 .../controller}/admin/users.php               |   4 +-
 {controller => app/controller}/auth.php       |   2 +-
 {controller => app/controller}/delete.php     |   4 +-
 {controller => app/controller}/edit.php       |   4 +-
 {controller => app/controller}/help.php       |   2 +-
 {controller => app/controller}/index.php      |   4 +-
 {controller => app/controller}/install.php    |   4 +-
 {controller => app/controller}/login.php      |   4 +-
 {controller => app/controller}/misc.php       |   4 +-
 {controller => app/controller}/moderate.php   |   4 +-
 {controller => app/controller}/post.php       |   4 +-
 {controller => app/controller}/profile.php    |   4 +-
 {controller => app/controller}/register.php   |   4 +-
 {controller => app/controller}/search.php     |   4 +-
 {controller => app/controller}/userlist.php   |   4 +-
 {controller => app/controller}/viewforum.php  |   4 +-
 {controller => app/controller}/viewtopic.php  |   4 +-
 {model => app/model}/admin/bans.php           |   2 +-
 {model => app/model}/admin/categories.php     |   4 +-
 {model => app/model}/admin/censoring.php      |   2 +-
 {model => app/model}/admin/forums.php         |   4 +-
 {model => app/model}/admin/groups.php         |   2 +-
 {model => app/model}/admin/maintenance.php    |   2 +-
 {model => app/model}/admin/options.php        |   2 +-
 {model => app/model}/admin/parser.php         |   2 +-
 {model => app/model}/admin/permissions.php    |   2 +-
 {model => app/model}/admin/reports.php        |   2 +-
 {model => app/model}/admin/statistics.php     |   2 +-
 {model => app/model}/admin/users.php          |   2 +-
 {model => app/model}/auth.php                 |   2 +-
 {model => app/model}/cache.php                |   2 +-
 {model => app/model}/debug.php                |   2 +-
 {model => app/model}/delete.php               |   2 +-
 {model => app/model}/edit.php                 |   2 +-
 {model => app/model}/header.php               |   2 +-
 {model => app/model}/index.php                |   4 +-
 {model => app/model}/install.php              |   2 +-
 {model => app/model}/login.php                |   4 +-
 {model => app/model}/misc.php                 |   2 +-
 {model => app/model}/moderate.php             |   2 +-
 {model => app/model}/post.php                 |   2 +-
 {model => app/model}/profile.php              |   4 +-
 {model => app/model}/register.php             |   4 +-
 {model => app/model}/search.php               |   2 +-
 {model => app/model}/userlist.php             |   2 +-
 {model => app/model}/viewforum.php            |   2 +-
 {model => app/model}/viewtopic.php            |   2 +-
 include/routes.php                            | 138 +++++++++---------
 index.php                                     |   1 -
 62 files changed, 162 insertions(+), 163 deletions(-)
 rename {controller => app/controller}/admin/bans.php (97%)
 rename {controller => app/controller}/admin/categories.php (97%)
 rename {controller => app/controller}/admin/censoring.php (95%)
 rename {controller => app/controller}/admin/forums.php (98%)
 rename {controller => app/controller}/admin/groups.php (98%)
 rename {controller => app/controller}/admin/index.php (98%)
 rename {controller => app/controller}/admin/maintenance.php (96%)
 rename {controller => app/controller}/admin/options.php (94%)
 rename {controller => app/controller}/admin/parser.php (99%)
 rename {controller => app/controller}/admin/permissions.php (93%)
 rename {controller => app/controller}/admin/plugins.php (99%)
 rename {controller => app/controller}/admin/reports.php (94%)
 rename {controller => app/controller}/admin/statistics.php (95%)
 rename {controller => app/controller}/admin/users.php (99%)
 rename {controller => app/controller}/auth.php (99%)
 rename {controller => app/controller}/delete.php (97%)
 rename {controller => app/controller}/edit.php (98%)
 rename {controller => app/controller}/help.php (97%)
 rename {controller => app/controller}/index.php (94%)
 rename {controller => app/controller}/install.php (99%)
 rename {controller => app/controller}/login.php (97%)
 rename {controller => app/controller}/misc.php (98%)
 rename {controller => app/controller}/moderate.php (99%)
 rename {controller => app/controller}/post.php (99%)
 rename {controller => app/controller}/profile.php (99%)
 rename {controller => app/controller}/register.php (98%)
 rename {controller => app/controller}/search.php (97%)
 rename {controller => app/controller}/userlist.php (97%)
 rename {controller => app/controller}/viewforum.php (98%)
 rename {controller => app/controller}/viewtopic.php (98%)
 rename {model => app/model}/admin/bans.php (99%)
 rename {model => app/model}/admin/categories.php (97%)
 rename {model => app/model}/admin/censoring.php (99%)
 rename {model => app/model}/admin/forums.php (98%)
 rename {model => app/model}/admin/groups.php (99%)
 rename {model => app/model}/admin/maintenance.php (99%)
 rename {model => app/model}/admin/options.php (99%)
 rename {model => app/model}/admin/parser.php (97%)
 rename {model => app/model}/admin/permissions.php (98%)
 rename {model => app/model}/admin/reports.php (99%)
 rename {model => app/model}/admin/statistics.php (99%)
 rename {model => app/model}/admin/users.php (99%)
 rename {model => app/model}/auth.php (99%)
 rename {model => app/model}/cache.php (99%)
 rename {model => app/model}/debug.php (98%)
 rename {model => app/model}/delete.php (99%)
 rename {model => app/model}/edit.php (99%)
 rename {model => app/model}/header.php (96%)
 rename {model => app/model}/index.php (99%)
 rename {model => app/model}/install.php (99%)
 rename {model => app/model}/login.php (99%)
 rename {model => app/model}/misc.php (99%)
 rename {model => app/model}/moderate.php (99%)
 rename {model => app/model}/post.php (99%)
 rename {model => app/model}/profile.php (99%)
 rename {model => app/model}/register.php (99%)
 rename {model => app/model}/search.php (99%)
 rename {model => app/model}/userlist.php (99%)
 rename {model => app/model}/viewforum.php (99%)
 rename {model => app/model}/viewtopic.php (99%)

diff --git a/controller/admin/bans.php b/app/controller/admin/bans.php
similarity index 97%
rename from controller/admin/bans.php
rename to app/controller/admin/bans.php
index 6423631f..75985312 100644
--- a/controller/admin/bans.php
+++ b/app/controller/admin/bans.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller\admin;
+namespace app\controller\admin;
 
 class bans
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\admin\bans();
+        $this->model = new \app\model\admin\bans();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/bans.mo');
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
diff --git a/controller/admin/categories.php b/app/controller/admin/categories.php
similarity index 97%
rename from controller/admin/categories.php
rename to app/controller/admin/categories.php
index affa990b..d1d4b3ba 100644
--- a/controller/admin/categories.php
+++ b/app/controller/admin/categories.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher.
  */
 
-namespace controller\admin;
+namespace app\controller\admin;
 
 class categories
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\admin\categories();
+        $this->model = new \app\model\admin\categories();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/categories.mo');
     }
 
diff --git a/controller/admin/censoring.php b/app/controller/admin/censoring.php
similarity index 95%
rename from controller/admin/censoring.php
rename to app/controller/admin/censoring.php
index 396c4089..8bc50123 100644
--- a/controller/admin/censoring.php
+++ b/app/controller/admin/censoring.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller\admin;
+namespace app\controller\admin;
 
 class censoring
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\admin\censoring();
+        $this->model = new \app\model\admin\censoring();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/censoring.mo');
     }
 
diff --git a/controller/admin/forums.php b/app/controller/admin/forums.php
similarity index 98%
rename from controller/admin/forums.php
rename to app/controller/admin/forums.php
index 425a857f..2a60d5b6 100644
--- a/controller/admin/forums.php
+++ b/app/controller/admin/forums.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller\admin;
+namespace app\controller\admin;
 
 class forums
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\admin\forums();
+        $this->model = new \app\model\admin\forums();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/forums.mo');
     }
 
@@ -173,7 +173,7 @@ public function display()
 
         \FeatherBB\AdminUtils::generateAdminMenu('forums');
 
-        $categories_model = new \model\admin\categories();
+        $categories_model = new \app\model\admin\categories();
         $this->feather->view2->setPageInfo(array(
                 'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Forums')),
                 'active_page' => 'admin',
diff --git a/controller/admin/groups.php b/app/controller/admin/groups.php
similarity index 98%
rename from controller/admin/groups.php
rename to app/controller/admin/groups.php
index bd5e75f8..8e4bf3c8 100644
--- a/controller/admin/groups.php
+++ b/app/controller/admin/groups.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller\admin;
+namespace app\controller\admin;
 
 class groups
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\admin\groups();
+        $this->model = new \app\model\admin\groups();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/groups.mo');
     }
 
diff --git a/controller/admin/index.php b/app/controller/admin/index.php
similarity index 98%
rename from controller/admin/index.php
rename to app/controller/admin/index.php
index 74dbfa95..86f10359 100644
--- a/controller/admin/index.php
+++ b/app/controller/admin/index.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller\admin;
+namespace app\controller\admin;
 
 class index
 {
diff --git a/controller/admin/maintenance.php b/app/controller/admin/maintenance.php
similarity index 96%
rename from controller/admin/maintenance.php
rename to app/controller/admin/maintenance.php
index 21762614..e818ccc7 100644
--- a/controller/admin/maintenance.php
+++ b/app/controller/admin/maintenance.php
@@ -7,14 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller\admin;
+namespace app\controller\admin;
 
 class maintenance
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \model\admin\maintenance();
+        $this->model = new \app\model\admin\maintenance();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/admin/maintenance.mo');
     }
 
diff --git a/controller/admin/options.php b/app/controller/admin/options.php
similarity index 94%
rename from controller/admin/options.php
rename to app/controller/admin/options.php
index bc9091dd..968261dc 100644
--- a/controller/admin/options.php
+++ b/app/controller/admin/options.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller\admin;
+namespace app\controller\admin;
 
 class options
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\admin\options();
+        $this->model = new \app\model\admin\options();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/options.mo');
     }
 
diff --git a/controller/admin/parser.php b/app/controller/admin/parser.php
similarity index 99%
rename from controller/admin/parser.php
rename to app/controller/admin/parser.php
index c086b3e7..b58a7fc5 100644
--- a/controller/admin/parser.php
+++ b/app/controller/admin/parser.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller\admin;
+namespace app\controller\admin;
 
 class parser
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\admin\parser();
+        $this->model = new \app\model\admin\parser();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/parser.mo');
     }
 
diff --git a/controller/admin/permissions.php b/app/controller/admin/permissions.php
similarity index 93%
rename from controller/admin/permissions.php
rename to app/controller/admin/permissions.php
index e54c86ab..523c0f80 100644
--- a/controller/admin/permissions.php
+++ b/app/controller/admin/permissions.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller\admin;
+namespace app\controller\admin;
 
 class permissions
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\admin\permissions();
+        $this->model = new \app\model\admin\permissions();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/permissions.mo');
     }
 
diff --git a/controller/admin/plugins.php b/app/controller/admin/plugins.php
similarity index 99%
rename from controller/admin/plugins.php
rename to app/controller/admin/plugins.php
index c38a1ef2..bb44a4b3 100644
--- a/controller/admin/plugins.php
+++ b/app/controller/admin/plugins.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller\admin;
+namespace app\controller\admin;
 
 class plugins
 {
diff --git a/controller/admin/reports.php b/app/controller/admin/reports.php
similarity index 94%
rename from controller/admin/reports.php
rename to app/controller/admin/reports.php
index d1d95586..8e8fd555 100644
--- a/controller/admin/reports.php
+++ b/app/controller/admin/reports.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller\admin;
+namespace app\controller\admin;
 
 use FeatherBB\AdminUtils;
 
@@ -20,7 +20,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\admin\reports();
+        $this->model = new \app\model\admin\reports();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/reports.mo');
     }
 
diff --git a/controller/admin/statistics.php b/app/controller/admin/statistics.php
similarity index 95%
rename from controller/admin/statistics.php
rename to app/controller/admin/statistics.php
index 382ec3cc..6ac24ca5 100644
--- a/controller/admin/statistics.php
+++ b/app/controller/admin/statistics.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller\admin;
+namespace app\controller\admin;
 
 class statistics
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\admin\statistics();
+        $this->model = new \app\model\admin\statistics();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/index.mo');
     }
 
diff --git a/controller/admin/users.php b/app/controller/admin/users.php
similarity index 99%
rename from controller/admin/users.php
rename to app/controller/admin/users.php
index ce6be2ec..870949bc 100644
--- a/controller/admin/users.php
+++ b/app/controller/admin/users.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller\admin;
+namespace app\controller\admin;
 
 class users
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\admin\users();
+        $this->model = new \app\model\admin\users();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/users.mo');
     }
 
diff --git a/controller/auth.php b/app/controller/auth.php
similarity index 99%
rename from controller/auth.php
rename to app/controller/auth.php
index cde81fbc..6fc9d9ce 100644
--- a/controller/auth.php
+++ b/app/controller/auth.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller;
+namespace app\controller;
 use DB;
 class auth
 {
diff --git a/controller/delete.php b/app/controller/delete.php
similarity index 97%
rename from controller/delete.php
rename to app/controller/delete.php
index c7b5b111..14319516 100644
--- a/controller/delete.php
+++ b/app/controller/delete.php
@@ -7,14 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller;
+namespace app\controller;
 
 class delete
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \model\delete();
+        $this->model = new \app\model\delete();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/delete.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/post.mo');
     }
diff --git a/controller/edit.php b/app/controller/edit.php
similarity index 98%
rename from controller/edit.php
rename to app/controller/edit.php
index 71d671e9..91dc6662 100644
--- a/controller/edit.php
+++ b/app/controller/edit.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller;
+namespace app\controller;
 
 class edit
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\edit();
+        $this->model = new \app\model\edit();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/register.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/prof_reg.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/post.mo');
diff --git a/controller/help.php b/app/controller/help.php
similarity index 97%
rename from controller/help.php
rename to app/controller/help.php
index ade00b45..ab6d423a 100644
--- a/controller/help.php
+++ b/app/controller/help.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller;
+namespace app\controller;
 
 class help
 {
diff --git a/controller/index.php b/app/controller/index.php
similarity index 94%
rename from controller/index.php
rename to app/controller/index.php
index 4bf1b867..e3f4cf5d 100644
--- a/controller/index.php
+++ b/app/controller/index.php
@@ -7,14 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller;
+namespace app\controller;
 
 class index
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \model\index();
+        $this->model = new \app\model\index();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->feather->user->language.'/index.mo');
     }
 
diff --git a/controller/install.php b/app/controller/install.php
similarity index 99%
rename from controller/install.php
rename to app/controller/install.php
index 0df7f051..d3c0b347 100644
--- a/controller/install.php
+++ b/app/controller/install.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller;
+namespace app\controller;
 
 class install
 {
@@ -26,7 +26,7 @@ class install
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \model\install();
+        $this->model = new \app\model\install();
         $this->available_langs = \FeatherBB\Lister::getLangs();
         $this->feather->view2->setStyle('FeatherBB');
     }
diff --git a/controller/login.php b/app/controller/login.php
similarity index 97%
rename from controller/login.php
rename to app/controller/login.php
index 0c101c1d..68641f7c 100644
--- a/controller/login.php
+++ b/app/controller/login.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller;
+namespace app\controller;
 
 class login
 {
@@ -20,7 +20,7 @@ public function __construct()
         $this->request = $this->feather->request;
 
 
-        $this->model = new \model\login();
+        $this->model = new \app\model\login();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/login.mo');
     }
 
diff --git a/controller/misc.php b/app/controller/misc.php
similarity index 98%
rename from controller/misc.php
rename to app/controller/misc.php
index eb598ba1..d6c71a97 100644
--- a/controller/misc.php
+++ b/app/controller/misc.php
@@ -7,14 +7,14 @@
 * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
 */
 
-namespace controller;
+namespace app\controller;
 
 class misc
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \model\misc();
+        $this->model = new \app\model\misc();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/register.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/misc.mo');
     }
diff --git a/controller/moderate.php b/app/controller/moderate.php
similarity index 99%
rename from controller/moderate.php
rename to app/controller/moderate.php
index a090451d..43d84b61 100644
--- a/controller/moderate.php
+++ b/app/controller/moderate.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller;
+namespace app\controller;
 
 class moderate
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\moderate();
+        $this->model = new \app\model\moderate();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/topic.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/forum.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/misc.mo');
diff --git a/controller/post.php b/app/controller/post.php
similarity index 99%
rename from controller/post.php
rename to app/controller/post.php
index 99ec3dae..75ba6187 100644
--- a/controller/post.php
+++ b/app/controller/post.php
@@ -7,14 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller;
+namespace app\controller;
 
 class post
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \model\post();
+        $this->model = new \app\model\post();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/prof_reg.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/post.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/register.mo');
diff --git a/controller/profile.php b/app/controller/profile.php
similarity index 99%
rename from controller/profile.php
rename to app/controller/profile.php
index 8cd36d60..187f33cb 100644
--- a/controller/profile.php
+++ b/app/controller/profile.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller;
+namespace app\controller;
 
 class profile
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\profile();
+        $this->model = new \app\model\profile();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/profile.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/register.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/prof_reg.mo');
diff --git a/controller/register.php b/app/controller/register.php
similarity index 98%
rename from controller/register.php
rename to app/controller/register.php
index f6bf8415..7a670f99 100644
--- a/controller/register.php
+++ b/app/controller/register.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller;
+namespace app\controller;
 
 class register
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\register();
+        $this->model = new \app\model\register();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/register.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/prof_reg.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/antispam.mo');
diff --git a/controller/search.php b/app/controller/search.php
similarity index 97%
rename from controller/search.php
rename to app/controller/search.php
index 42c6cec6..3866dd19 100644
--- a/controller/search.php
+++ b/app/controller/search.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller;
+namespace app\controller;
 
 class search
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \model\search();
+        $this->model = new \app\model\search();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/userlist.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/search.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/forum.mo');
diff --git a/controller/userlist.php b/app/controller/userlist.php
similarity index 97%
rename from controller/userlist.php
rename to app/controller/userlist.php
index 63869bba..fef46842 100644
--- a/controller/userlist.php
+++ b/app/controller/userlist.php
@@ -7,14 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller;
+namespace app\controller;
 
 class userlist
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \model\userlist();
+        $this->model = new \app\model\userlist();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/userlist.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/search.mo');
     }
diff --git a/controller/viewforum.php b/app/controller/viewforum.php
similarity index 98%
rename from controller/viewforum.php
rename to app/controller/viewforum.php
index 4be4857f..a2457107 100644
--- a/controller/viewforum.php
+++ b/app/controller/viewforum.php
@@ -7,14 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller;
+namespace app\controller;
 
 class viewforum
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \model\viewforum();
+        $this->model = new \app\model\viewforum();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->feather->user->language.'/forum.mo');
     }
 
diff --git a/controller/viewtopic.php b/app/controller/viewtopic.php
similarity index 98%
rename from controller/viewtopic.php
rename to app/controller/viewtopic.php
index 2725e422..abf5180c 100644
--- a/controller/viewtopic.php
+++ b/app/controller/viewtopic.php
@@ -7,14 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace controller;
+namespace app\controller;
 
 class viewtopic
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \model\viewtopic();
+        $this->model = new \app\model\viewtopic();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/topic.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/post.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/bbeditor.mo');
diff --git a/model/admin/bans.php b/app/model/admin/bans.php
similarity index 99%
rename from model/admin/bans.php
rename to app/model/admin/bans.php
index 1671ab10..9e8b0426 100644
--- a/model/admin/bans.php
+++ b/app/model/admin/bans.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model\admin;
+namespace app\model\admin;
 
 use DB;
 
diff --git a/model/admin/categories.php b/app/model/admin/categories.php
similarity index 97%
rename from model/admin/categories.php
rename to app/model/admin/categories.php
index d2ac4352..fb6bb823 100644
--- a/model/admin/categories.php
+++ b/app/model/admin/categories.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher.
  */
 
-namespace model\admin;
+namespace app\model\admin;
 
 use DB;
 
@@ -60,7 +60,7 @@ public function delete_category($cat_to_delete)
 
         foreach ($forums_in_cat as $forum) {
             // Prune all posts and topics
-            $this->maintenance = new \model\admin\maintenance();
+            $this->maintenance = new \app\model\admin\maintenance();
             $this->maintenance->prune($forum->id, 1, -1);
 
             // Delete forum
diff --git a/model/admin/censoring.php b/app/model/admin/censoring.php
similarity index 99%
rename from model/admin/censoring.php
rename to app/model/admin/censoring.php
index 80d17127..4aa81719 100644
--- a/model/admin/censoring.php
+++ b/app/model/admin/censoring.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model\admin;
+namespace app\model\admin;
 
 use DB;
 
diff --git a/model/admin/forums.php b/app/model/admin/forums.php
similarity index 98%
rename from model/admin/forums.php
rename to app/model/admin/forums.php
index 67bfeb69..6fed815e 100644
--- a/model/admin/forums.php
+++ b/app/model/admin/forums.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model\admin;
+namespace app\model\admin;
 
 use DB;
 
@@ -61,7 +61,7 @@ public function delete_forum($forum_id)
         $forum_id = $this->hook->fire('delete_forum_start', $forum_id);
 
         // Prune all posts and topics
-        $this->maintenance = new \model\admin\maintenance();
+        $this->maintenance = new \app\model\admin\maintenance();
         $this->maintenance->prune($forum_id, 1, -1);
 
         // Delete the forum
diff --git a/model/admin/groups.php b/app/model/admin/groups.php
similarity index 99%
rename from model/admin/groups.php
rename to app/model/admin/groups.php
index aae8939e..ec37cacc 100644
--- a/model/admin/groups.php
+++ b/app/model/admin/groups.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model\admin;
+namespace app\model\admin;
 
 use DB;
 
diff --git a/model/admin/maintenance.php b/app/model/admin/maintenance.php
similarity index 99%
rename from model/admin/maintenance.php
rename to app/model/admin/maintenance.php
index e637d8b2..d6681e02 100644
--- a/model/admin/maintenance.php
+++ b/app/model/admin/maintenance.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model\admin;
+namespace app\model\admin;
 
 use DB;
 
diff --git a/model/admin/options.php b/app/model/admin/options.php
similarity index 99%
rename from model/admin/options.php
rename to app/model/admin/options.php
index dc2be5e5..f4b0de7a 100644
--- a/model/admin/options.php
+++ b/app/model/admin/options.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model\admin;
+namespace app\model\admin;
 
 use DB;
 
diff --git a/model/admin/parser.php b/app/model/admin/parser.php
similarity index 97%
rename from model/admin/parser.php
rename to app/model/admin/parser.php
index a2c25a20..efe93725 100644
--- a/model/admin/parser.php
+++ b/app/model/admin/parser.php
@@ -8,7 +8,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model\admin;
+namespace app\model\admin;
 
 use DB;
 
diff --git a/model/admin/permissions.php b/app/model/admin/permissions.php
similarity index 98%
rename from model/admin/permissions.php
rename to app/model/admin/permissions.php
index 5267b64b..3616297a 100644
--- a/model/admin/permissions.php
+++ b/app/model/admin/permissions.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model\admin;
+namespace app\model\admin;
 
 use DB;
 
diff --git a/model/admin/reports.php b/app/model/admin/reports.php
similarity index 99%
rename from model/admin/reports.php
rename to app/model/admin/reports.php
index 23c768dc..aaa2a90c 100644
--- a/model/admin/reports.php
+++ b/app/model/admin/reports.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model\admin;
+namespace app\model\admin;
 
 use DB;
 
diff --git a/model/admin/statistics.php b/app/model/admin/statistics.php
similarity index 99%
rename from model/admin/statistics.php
rename to app/model/admin/statistics.php
index 64417069..8e6e730d 100644
--- a/model/admin/statistics.php
+++ b/app/model/admin/statistics.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model\admin;
+namespace app\model\admin;
 
 use DB;
 
diff --git a/model/admin/users.php b/app/model/admin/users.php
similarity index 99%
rename from model/admin/users.php
rename to app/model/admin/users.php
index 7af9db8e..9c367a8c 100644
--- a/model/admin/users.php
+++ b/app/model/admin/users.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model\admin;
+namespace app\model\admin;
 
 use DB;
 
diff --git a/model/auth.php b/app/model/auth.php
similarity index 99%
rename from model/auth.php
rename to app/model/auth.php
index 8266e574..55c32ddd 100644
--- a/model/auth.php
+++ b/app/model/auth.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 use DB;
 
 class auth
diff --git a/model/cache.php b/app/model/cache.php
similarity index 99%
rename from model/cache.php
rename to app/model/cache.php
index 92d596b3..05d9e424 100644
--- a/model/cache.php
+++ b/app/model/cache.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 use DB;
 
 class cache
diff --git a/model/debug.php b/app/model/debug.php
similarity index 98%
rename from model/debug.php
rename to app/model/debug.php
index c1049c44..a5486687 100644
--- a/model/debug.php
+++ b/app/model/debug.php
@@ -7,7 +7,7 @@
 * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
 */
 
-namespace model;
+namespace app\model;
 use DB;
 
 class debug
diff --git a/model/delete.php b/app/model/delete.php
similarity index 99%
rename from model/delete.php
rename to app/model/delete.php
index 4ad61140..0f33e614 100644
--- a/model/delete.php
+++ b/app/model/delete.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 
 use DB;
 
diff --git a/model/edit.php b/app/model/edit.php
similarity index 99%
rename from model/edit.php
rename to app/model/edit.php
index e83c09a4..e896c531 100644
--- a/model/edit.php
+++ b/app/model/edit.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 
 use DB;
 
diff --git a/model/header.php b/app/model/header.php
similarity index 96%
rename from model/header.php
rename to app/model/header.php
index 56192f72..b09481a3 100644
--- a/model/header.php
+++ b/app/model/header.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 
 use DB;
 
diff --git a/model/index.php b/app/model/index.php
similarity index 99%
rename from model/index.php
rename to app/model/index.php
index c67ec5dc..1e4d1bde 100644
--- a/model/index.php
+++ b/app/model/index.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 
 use DB;
 
@@ -310,4 +310,4 @@ public function fetch_users_online()
 
         return $online;
     }
-}
\ No newline at end of file
+}
diff --git a/model/install.php b/app/model/install.php
similarity index 99%
rename from model/install.php
rename to app/model/install.php
index dde9faac..82c9ffbb 100644
--- a/model/install.php
+++ b/app/model/install.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 
 use DB;
 
diff --git a/model/login.php b/app/model/login.php
similarity index 99%
rename from model/login.php
rename to app/model/login.php
index a7ae06ec..fee16d59 100644
--- a/model/login.php
+++ b/app/model/login.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 
 use DB;
 
@@ -22,7 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
         $this->email = $this->feather->email;
-        $this->auth = new \model\auth();
+        $this->auth = new \app\model\auth();
     }
 
     public function login()
diff --git a/model/misc.php b/app/model/misc.php
similarity index 99%
rename from model/misc.php
rename to app/model/misc.php
index f3f4f716..e5c53f63 100644
--- a/model/misc.php
+++ b/app/model/misc.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 
 use DB;
 
diff --git a/model/moderate.php b/app/model/moderate.php
similarity index 99%
rename from model/moderate.php
rename to app/model/moderate.php
index 9fec90aa..7644c249 100644
--- a/model/moderate.php
+++ b/app/model/moderate.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 
 use DB;
 
diff --git a/model/post.php b/app/model/post.php
similarity index 99%
rename from model/post.php
rename to app/model/post.php
index b7d3e9ff..9f94f158 100644
--- a/model/post.php
+++ b/app/model/post.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 
 use DB;
 
diff --git a/model/profile.php b/app/model/profile.php
similarity index 99%
rename from model/profile.php
rename to app/model/profile.php
index 754ecc72..0c0ca688 100644
--- a/model/profile.php
+++ b/app/model/profile.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 
 use DB;
 
@@ -22,7 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
         $this->email = $this->feather->email;
-        $this->auth = new \model\auth();
+        $this->auth = new \app\model\auth();
     }
 
     public function change_pass($id)
diff --git a/model/register.php b/app/model/register.php
similarity index 99%
rename from model/register.php
rename to app/model/register.php
index e2fdef8d..c7261775 100644
--- a/model/register.php
+++ b/app/model/register.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 
 use DB;
 
@@ -22,7 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
         $this->email = $this->feather->email;
-        $this->auth = new \model\auth();
+        $this->auth = new \app\model\auth();
     }
 
     public function check_for_errors()
diff --git a/model/search.php b/app/model/search.php
similarity index 99%
rename from model/search.php
rename to app/model/search.php
index c253794b..95c9143e 100644
--- a/model/search.php
+++ b/app/model/search.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 
 use DB;
 
diff --git a/model/userlist.php b/app/model/userlist.php
similarity index 99%
rename from model/userlist.php
rename to app/model/userlist.php
index 9fd8b1c3..65c41121 100644
--- a/model/userlist.php
+++ b/app/model/userlist.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 
 use DB;
 
diff --git a/model/viewforum.php b/app/model/viewforum.php
similarity index 99%
rename from model/viewforum.php
rename to app/model/viewforum.php
index 0dad4af8..27248135 100644
--- a/model/viewforum.php
+++ b/app/model/viewforum.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 
 use DB;
 
diff --git a/model/viewtopic.php b/app/model/viewtopic.php
similarity index 99%
rename from model/viewtopic.php
rename to app/model/viewtopic.php
index ccb78697..c6003e5d 100644
--- a/model/viewtopic.php
+++ b/app/model/viewtopic.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace model;
+namespace app\model;
 
 use DB;
 
diff --git a/include/routes.php b/include/routes.php
index a30a097a..a530ed7b 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -8,20 +8,20 @@
  */
 
 // Index
-$feather->get('/', '\controller\index:display');
+$feather->get('/', '\app\controller\index:display');
 
 // Viewforum
-$feather->get('/forum/:id(/:name)(/page/:page)(/)', '\controller\viewforum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
+$feather->get('/forum/:id(/:name)(/page/:page)(/)', '\app\controller\viewforum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
 
 // Viewtopic
 $feather->group('/topic', function() use ($feather) {
-    $feather->get('/:id(/:name)(/page/:page)(/)', '\controller\viewtopic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
-    $feather->get('/:id/action/:action(/)', '\controller\viewtopic:action')->conditions(array('id' => '[0-9]+'));
+    $feather->get('/:id(/:name)(/page/:page)(/)', '\app\controller\viewtopic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
+    $feather->get('/:id/action/:action(/)', '\app\controller\viewtopic:action')->conditions(array('id' => '[0-9]+'));
 });
-$feather->get('/post/:pid(/)', '\controller\viewtopic:viewpost')->conditions(array('pid' => '[0-9]+'));
+$feather->get('/post/:pid(/)', '\app\controller\viewtopic:viewpost')->conditions(array('pid' => '[0-9]+'));
 
 // Userlist
-$feather->get('/userlist(/)', '\controller\userlist:display');
+$feather->get('/userlist(/)', '\app\controller\userlist:display');
 
 // Auth routes
 $feather->group('/auth', function() use ($feather) {
@@ -32,54 +32,54 @@
             $this->feather->url->redirect($this->feather->url->get('/auth/login'));
         }
     });
-    $feather->map('/login(/)', '\controller\auth:login')->via('GET', 'POST');
-    $feather->map('/forget(/)', '\controller\auth:forget')->via('GET', 'POST');
-    $feather->get('/logout/token/:token(/)', '\controller\auth:logout');
+    $feather->map('/login(/)', '\app\controller\auth:login')->via('GET', 'POST');
+    $feather->map('/forget(/)', '\app\controller\auth:forget')->via('GET', 'POST');
+    $feather->get('/logout/token/:token(/)', '\app\controller\auth:logout');
 });
 
 // Register routes
 $feather->group('/register', function() use ($feather) {
-    $feather->get('(/)', '\controller\register:rules');
-    $feather->map('/agree(/)', '\controller\register:display')->via('GET', 'POST');
-    $feather->get('/cancel(/)', '\controller\register:cancel');
+    $feather->get('(/)', '\app\controller\register:rules');
+    $feather->map('/agree(/)', '\app\controller\register:display')->via('GET', 'POST');
+    $feather->get('/cancel(/)', '\app\controller\register:cancel');
 });
 
 // Post routes
 $feather->group('/post', function() use ($feather) {
-    $feather->map('/new-topic/:fid(/)', '\controller\post:newpost')->conditions(array('fid' => '[0-9]+'))->via('GET', 'POST');
-    $feather->map('/reply/:tid(/)(/quote/:qid)(/)', '\controller\post:newreply')->conditions(array('tid' => '[0-9]+', 'qid' => '[0-9]+'))->via('GET', 'POST');
+    $feather->map('/new-topic/:fid(/)', '\app\controller\post:newpost')->conditions(array('fid' => '[0-9]+'))->via('GET', 'POST');
+    $feather->map('/reply/:tid(/)(/quote/:qid)(/)', '\app\controller\post:newreply')->conditions(array('tid' => '[0-9]+', 'qid' => '[0-9]+'))->via('GET', 'POST');
 });
 
 // Edit
-$feather->map('/edit/:id(/)', '\controller\edit:editpost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+$feather->map('/edit/:id(/)', '\app\controller\edit:editpost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
 
 // Delete
-$feather->map('/delete/:id(/)', '\controller\delete:deletepost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+$feather->map('/delete/:id(/)', '\app\controller\delete:deletepost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
 
 // Search routes
 $feather->group('/search', function() use ($feather) {
-    $feather->get('(/)', '\controller\search:display');
-    $feather->get('/show/:show(/)', '\controller\search:quicksearches');
+    $feather->get('(/)', '\app\controller\search:display');
+    $feather->get('/show/:show(/)', '\app\controller\search:quicksearches');
 });
 
 // Help
-$feather->get('/help(/)', '\controller\help:display');
+$feather->get('/help(/)', '\app\controller\help:display');
 
 // Misc
-$feather->get('/rules(/)', '\controller\misc:rules');
-$feather->get('/mark-read(/)', '\controller\misc:markread');
-$feather->get('/mark-forum-read/:id(/)', '\controller\misc:markforumread')->conditions(array('id' => '[0-9]+'));
-$feather->map('/email/:id(/)', '\controller\misc:email')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-$feather->map('/report/:id(/)', '\controller\misc:report')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-$feather->get('/subscribe/forum/:id(/)', '\controller\misc:subscribeforum')->conditions(array('id' => '[0-9]+'));
-$feather->get('/unsubscribe/forum/:id(/)', '\controller\misc:unsubscribeforum')->conditions(array('id' => '[0-9]+'));
-$feather->get('/subscribe/topic/:id(/)', '\controller\misc:subscribetopic')->conditions(array('id' => '[0-9]+'));
-$feather->get('/unsubscribe/topic/:id(/)', '\controller\misc:unsubscribetopic')->conditions(array('id' => '[0-9]+'));
+$feather->get('/rules(/)', '\app\controller\misc:rules');
+$feather->get('/mark-read(/)', '\app\controller\misc:markread');
+$feather->get('/mark-forum-read/:id(/)', '\app\controller\misc:markforumread')->conditions(array('id' => '[0-9]+'));
+$feather->map('/email/:id(/)', '\app\controller\misc:email')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+$feather->map('/report/:id(/)', '\app\controller\misc:report')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+$feather->get('/subscribe/forum/:id(/)', '\app\controller\misc:subscribeforum')->conditions(array('id' => '[0-9]+'));
+$feather->get('/unsubscribe/forum/:id(/)', '\app\controller\misc:unsubscribeforum')->conditions(array('id' => '[0-9]+'));
+$feather->get('/subscribe/topic/:id(/)', '\app\controller\misc:subscribetopic')->conditions(array('id' => '[0-9]+'));
+$feather->get('/unsubscribe/topic/:id(/)', '\app\controller\misc:unsubscribetopic')->conditions(array('id' => '[0-9]+'));
 
 // Profile routes
 $feather->group('/user', function() use ($feather) {
-    $feather->map('/:id(/section/:section)(/)', '\controller\profile:display')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-    $feather->map('/:id(/action/:action)(/)', '\controller\profile:action')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+    $feather->map('/:id(/section/:section)(/)', '\app\controller\profile:display')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+    $feather->map('/:id(/action/:action)(/)', '\app\controller\profile:action')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
 });
 
 /**
@@ -93,12 +93,12 @@
 
 // Moderate routes
 $feather->group('/moderate', $isAdmmod, function() use ($feather) {
-    $feather->get('/forum/:id(/:name)(/page/:page)(/)', '\controller\moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
-    $feather->get('/get-host/post/:pid(/)', '\controller\moderate:gethostpost')->conditions(array('pid' => '[0-9]+'));
-    $feather->get('/get-host/ip/:ip(/)', '\controller\moderate:gethostip');
-    $feather->map('/topic/:id/forum/:fid/action/:action(/param/:param)(/)', '\controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST');
-    $feather->map('/topic/:id/forum/:fid/action/:action(/page/:param)(/)', '\controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST');
-    $feather->post('/forum/:fid(/page/:page)(/)', '\controller\moderate:dealposts')->conditions(array('fid' => '[0-9]+', 'page' => '[0-9]+'));
+    $feather->get('/forum/:id(/:name)(/page/:page)(/)', '\app\controller\moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
+    $feather->get('/get-host/post/:pid(/)', '\app\controller\moderate:gethostpost')->conditions(array('pid' => '[0-9]+'));
+    $feather->get('/get-host/ip/:ip(/)', '\app\controller\moderate:gethostip');
+    $feather->map('/topic/:id/forum/:fid/action/:action(/param/:param)(/)', '\app\controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST');
+    $feather->map('/topic/:id/forum/:fid/action/:action(/page/:param)(/)', '\app\controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST');
+    $feather->post('/forum/:fid(/page/:page)(/)', '\app\controller\moderate:dealposts')->conditions(array('fid' => '[0-9]+', 'page' => '[0-9]+'));
 });
 
 // Admin routes
@@ -114,76 +114,76 @@
     };
 
     // Admin index
-    $feather->get('(/action/:action)(/)', '\controller\admin\index:display');
-    $feather->get('/index(/)', '\controller\admin\index:display');
+    $feather->get('(/action/:action)(/)', '\app\controller\admin\index:display');
+    $feather->get('/index(/)', '\app\controller\admin\index:display');
 
     // Admin bans
     $feather->group('/bans', function() use ($feather) {
-        $feather->get('(/)', '\controller\admin\bans:display');
-        $feather->get('/delete/:id(/)', '\controller\admin\bans:delete')->conditions(array('id' => '[0-9]+'));
-        $feather->map('/edit/:id(/)', '\controller\admin\bans:edit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-        $feather->map('/add(/:id)(/)', '\controller\admin\bans:add')->via('GET', 'POST');
+        $feather->get('(/)', '\app\controller\admin\bans:display');
+        $feather->get('/delete/:id(/)', '\app\controller\admin\bans:delete')->conditions(array('id' => '[0-9]+'));
+        $feather->map('/edit/:id(/)', '\app\controller\admin\bans:edit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+        $feather->map('/add(/:id)(/)', '\app\controller\admin\bans:add')->via('GET', 'POST');
     });
 
     // Admin options
-    $feather->map('/options(/)', $isAdmin, '\controller\admin\options:display')->via('GET', 'POST');
+    $feather->map('/options(/)', $isAdmin, '\app\controller\admin\options:display')->via('GET', 'POST');
 
     // Admin categories
     $feather->group('/categories', $isAdmin, function() use ($feather) {
-        $feather->get('(/)', '\controller\admin\categories:display');
-        $feather->post('/add(/)', '\controller\admin\categories:add_category');
-        $feather->post('/edit(/)', '\controller\admin\categories:edit_categories');
-        $feather->post('/delete(/)', '\controller\admin\categories:delete_category');
+        $feather->get('(/)', '\app\controller\admin\categories:display');
+        $feather->post('/add(/)', '\app\controller\admin\categories:add_category');
+        $feather->post('/edit(/)', '\app\controller\admin\categories:edit_categories');
+        $feather->post('/delete(/)', '\app\controller\admin\categories:delete_category');
     });
 
     // Admin censoring
-    $feather->map('/censoring(/)', $isAdmin, '\controller\admin\censoring:display')->via('GET', 'POST');
+    $feather->map('/censoring(/)', $isAdmin, '\app\controller\admin\censoring:display')->via('GET', 'POST');
 
     // Admin reports
-    $feather->map('/reports(/)', '\controller\admin\reports:display')->via('GET', 'POST');
+    $feather->map('/reports(/)', '\app\controller\admin\reports:display')->via('GET', 'POST');
 
     // Admin permissions
-    $feather->map('/permissions(/)', $isAdmin, '\controller\admin\permissions:display')->via('GET', 'POST');
+    $feather->map('/permissions(/)', $isAdmin, '\app\controller\admin\permissions:display')->via('GET', 'POST');
 
     // Admin statistics
-    $feather->get('/statistics(/)', '\controller\admin\statistics:display');
-    $feather->get('/phpinfo(/)', '\controller\admin\statistics:phpinfo');
+    $feather->get('/statistics(/)', '\app\controller\admin\statistics:display');
+    $feather->get('/phpinfo(/)', '\app\controller\admin\statistics:phpinfo');
 
     // Admin forums
     $feather->group('/forums', $isAdmin, function() use ($feather) {
-        $feather->map('(/)', '\controller\admin\forums:display')->via('GET', 'POST');
-        $feather->post('/add(/)', '\controller\admin\forums:add_forum');
-        $feather->map('/edit/:id(/)', '\controller\admin\forums:edit_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-        $feather->map('/delete/:id(/)', '\controller\admin\forums:delete_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+        $feather->map('(/)', '\app\controller\admin\forums:display')->via('GET', 'POST');
+        $feather->post('/add(/)', '\app\controller\admin\forums:add_forum');
+        $feather->map('/edit/:id(/)', '\app\controller\admin\forums:edit_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+        $feather->map('/delete/:id(/)', '\app\controller\admin\forums:delete_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
     });
 
     // Admin groups
     $feather->group('/groups', $isAdmin, function() use ($feather) {
-        $feather->map('(/)', '\controller\admin\groups:display')->via('GET', 'POST');
-        $feather->map('/add(/)', '\controller\admin\groups:addedit')->via('GET', 'POST');
-        $feather->map('/edit/:id(/)', '\controller\admin\groups:addedit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-        $feather->map('/delete/:id(/)', '\controller\admin\groups:delete')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+        $feather->map('(/)', '\app\controller\admin\groups:display')->via('GET', 'POST');
+        $feather->map('/add(/)', '\app\controller\admin\groups:addedit')->via('GET', 'POST');
+        $feather->map('/edit/:id(/)', '\app\controller\admin\groups:addedit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+        $feather->map('/delete/:id(/)', '\app\controller\admin\groups:delete')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
     });
 
     // Admin plugins
     $feather->group('/plugins', function() use ($feather) {
-        $feather->map('/(/)', '\controller\admin\plugins:index')->via('GET', 'POST');
-        $feather->map('/activate(/)', '\controller\admin\plugins:activate')->via('GET');
-        $feather->map('/deactivate(/)', '\controller\admin\plugins:deactivate')->via('GET');
-        // $feather->map('/loader(/)', '\controller\admin\plugins:display')->via('GET', 'POST');
+        $feather->map('/(/)', '\app\controller\admin\plugins:index')->via('GET', 'POST');
+        $feather->map('/activate(/)', '\app\controller\admin\plugins:activate')->via('GET');
+        $feather->map('/deactivate(/)', '\app\controller\admin\plugins:deactivate')->via('GET');
+        // $feather->map('/loader(/)', '\app\controller\admin\plugins:display')->via('GET', 'POST');
     });
 
     // Admin maintenance
-    $feather->map('/maintenance(/)', $isAdmin, '\controller\admin\maintenance:display')->via('GET', 'POST');
+    $feather->map('/maintenance(/)', $isAdmin, '\app\controller\admin\maintenance:display')->via('GET', 'POST');
 
     // Admin parser
-    $feather->map('/parser(/)', $isAdmin, '\controller\admin\parser:display')->via('GET', 'POST');
+    $feather->map('/parser(/)', $isAdmin, '\app\controller\admin\parser:display')->via('GET', 'POST');
 
     // Admin users
     $feather->group('/users', function() use ($feather) {
-        $feather->map('(/)', '\controller\admin\users:display')->via('GET', 'POST');
-        $feather->get('/ip-stats/id/:id(/)', '\controller\admin\users:ipstats')->conditions(array('id' => '[0-9]+'));
-        $feather->get('/show-users/ip/:ip(/)', '\controller\admin\users:showusers');
+        $feather->map('(/)', '\app\controller\admin\users:display')->via('GET', 'POST');
+        $feather->get('/ip-stats/id/:id(/)', '\app\controller\admin\users:ipstats')->conditions(array('id' => '[0-9]+'));
+        $feather->get('/show-users/ip/:ip(/)', '\app\controller\admin\users:showusers');
     });
 
 });
diff --git a/index.php b/index.php
index 29a82294..73cc5305 100644
--- a/index.php
+++ b/index.php
@@ -15,7 +15,6 @@
 
 // Load Slim Framework
 require 'vendor/autoload.php';
-// \Slim\Slim::registerAutoloader();
 
 // Instantiate Slim and add CSRF
 $feather = new \Slim\Slim();

From 07c905a4171b2e919c7a21e3cd90efceb60f985b Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 31 Aug 2015 12:03:07 +0200
Subject: [PATCH 282/353] Move classes into Core

---
 .../Core/AdminUtils.php                       |  2 +-
 .../auth.class.php => app/Core/Auth.php       |  6 +-
 .../cache.class.php => app/Core/Cache.php     |  0
 .../core.class.php => app/Core/Core.php       |  5 +-
 .../csrf.class.php => app/Core/Csrf.php       |  0
 .../Core/Database.php                         |  0
 .../email.class.php => app/Core/Email.php     |  0
 .../error.class.php => app/Core/Error.php     |  0
 .../hooks.class.php => app/Core/Hooks.php     |  0
 .../lister.class.php => app/Core/Lister.php   |  0
 .../plugin.class.php => app/Core/Plugin.php   |  0
 .../search.class.php => app/Core/Search.php   |  2 +-
 .../classes/url.class.php => app/Core/Url.php |  0
 .../utils.class.php => app/Core/Utils.php     |  2 +-
 .../view.class.php => app/Core/View.php       |  8 +-
 .../classes => app/Core}/pomo/.editorconfig   |  0
 {include/classes => app/Core}/pomo/MO.php     |  0
 {include/classes => app/Core}/pomo/PO.php     |  0
 .../Core}/pomo/Streams/CachedFileReader.php   |  0
 .../pomo/Streams/CachedIntFileReader.php      |  0
 .../Core}/pomo/Streams/FileReader.php         |  0
 .../Core}/pomo/Streams/Reader.php             |  0
 .../Core}/pomo/Streams/StringReader.php       |  0
 .../pomo/Translations/EntryTranslations.php   |  0
 .../pomo/Translations/GettextTranslations.php |  0
 .../pomo/Translations/NOOPTranslations.php    |  0
 .../Core}/pomo/Translations/Translations.php  |  0
 .../Translations/TranslationsInterface.php    |  0
 app/model/moderate.php                        |  6 --
 composer.json                                 | 57 ++++++-----
 include/classes/autoload.class.php            | 30 ------
 include/functions.php                         |  6 +-
 index.php                                     |  2 +
 vendor/akrabat/rka-slim-controller/LICENSE    | 26 -----
 vendor/akrabat/rka-slim-controller/README.md  | 96 -------------------
 .../akrabat/rka-slim-controller/RKA/Slim.php  | 84 ----------------
 .../akrabat/rka-slim-controller/composer.json | 26 -----
 vendor/composer/autoload_classmap.php         | 38 ++------
 vendor/composer/autoload_psr4.php             |  2 +-
 vendor/composer/installed.json                | 45 ---------
 40 files changed, 57 insertions(+), 386 deletions(-)
 rename include/classes/adminutils.class.php => app/Core/AdminUtils.php (94%)
 rename include/classes/auth.class.php => app/Core/Auth.php (98%)
 rename include/classes/cache.class.php => app/Core/Cache.php (100%)
 mode change 100755 => 100644
 rename include/classes/core.class.php => app/Core/Core.php (96%)
 rename include/classes/csrf.class.php => app/Core/Csrf.php (100%)
 rename include/classes/database.class.php => app/Core/Database.php (100%)
 rename include/classes/email.class.php => app/Core/Email.php (100%)
 rename include/classes/error.class.php => app/Core/Error.php (100%)
 rename include/classes/hooks.class.php => app/Core/Hooks.php (100%)
 rename include/classes/lister.class.php => app/Core/Lister.php (100%)
 rename include/classes/plugin.class.php => app/Core/Plugin.php (100%)
 rename include/classes/search.class.php => app/Core/Search.php (99%)
 rename include/classes/url.class.php => app/Core/Url.php (100%)
 rename include/classes/utils.class.php => app/Core/Utils.php (99%)
 rename include/classes/view.class.php => app/Core/View.php (97%)
 rename {include/classes => app/Core}/pomo/.editorconfig (100%)
 rename {include/classes => app/Core}/pomo/MO.php (100%)
 rename {include/classes => app/Core}/pomo/PO.php (100%)
 rename {include/classes => app/Core}/pomo/Streams/CachedFileReader.php (100%)
 rename {include/classes => app/Core}/pomo/Streams/CachedIntFileReader.php (100%)
 rename {include/classes => app/Core}/pomo/Streams/FileReader.php (100%)
 rename {include/classes => app/Core}/pomo/Streams/Reader.php (100%)
 rename {include/classes => app/Core}/pomo/Streams/StringReader.php (100%)
 rename {include/classes => app/Core}/pomo/Translations/EntryTranslations.php (100%)
 rename {include/classes => app/Core}/pomo/Translations/GettextTranslations.php (100%)
 rename {include/classes => app/Core}/pomo/Translations/NOOPTranslations.php (100%)
 rename {include/classes => app/Core}/pomo/Translations/Translations.php (100%)
 rename {include/classes => app/Core}/pomo/Translations/TranslationsInterface.php (100%)
 delete mode 100644 include/classes/autoload.class.php
 delete mode 100644 vendor/akrabat/rka-slim-controller/LICENSE
 delete mode 100644 vendor/akrabat/rka-slim-controller/README.md
 delete mode 100644 vendor/akrabat/rka-slim-controller/RKA/Slim.php
 delete mode 100644 vendor/akrabat/rka-slim-controller/composer.json

diff --git a/include/classes/adminutils.class.php b/app/Core/AdminUtils.php
similarity index 94%
rename from include/classes/adminutils.class.php
rename to app/Core/AdminUtils.php
index 4f60e514..1a276f74 100644
--- a/include/classes/adminutils.class.php
+++ b/app/Core/AdminUtils.php
@@ -53,7 +53,7 @@ public static function breadcrumbs_admin(array $links)
     public static function get_admin_ids()
     {
         if (!$this->feather->cache->isCached('admin_ids')) {
-            $this->feather->cache->store('admin_ids', \model\cache::get_admin_ids());
+            $this->feather->cache->store('admin_ids', \app\model\cache::get_admin_ids());
         }
 
         return $this->feather->cache->retrieve('admin_ids');
diff --git a/include/classes/auth.class.php b/app/Core/Auth.php
similarity index 98%
rename from include/classes/auth.class.php
rename to app/Core/Auth.php
index a35309f1..553dbab4 100644
--- a/include/classes/auth.class.php
+++ b/app/Core/Auth.php
@@ -21,7 +21,7 @@ class Auth extends \Slim\Middleware
 
     public function __construct()
 	{
-        $this->model = new \model\auth();
+        $this->model = new \app\model\auth();
     }
 
     public function get_cookie_data($cookie_name, $cookie_seed)
@@ -184,7 +184,7 @@ public function check_bans()
 
         // If we removed any expired bans during our run-through, we need to regenerate the bans cache
         if ($bans_altered) {
-            $this->app->cache->store('bans', \model\cache::get_bans());
+            $this->app->cache->store('bans', \app\model\cache::get_bans());
         }
     }
 
@@ -272,7 +272,7 @@ public function call()
 
         // Load bans from cache
         if (!$this->app->cache->isCached('bans')) {
-            $this->app->cache->store('bans', \model\cache::get_bans());
+            $this->app->cache->store('bans', \app\model\cache::get_bans());
         }
         $feather_bans = $this->app->cache->retrieve('bans');
 
diff --git a/include/classes/cache.class.php b/app/Core/Cache.php
old mode 100755
new mode 100644
similarity index 100%
rename from include/classes/cache.class.php
rename to app/Core/Cache.php
diff --git a/include/classes/core.class.php b/app/Core/Core.php
similarity index 96%
rename from include/classes/core.class.php
rename to app/Core/Core.php
index b6da52c6..ce1d9cc5 100644
--- a/include/classes/core.class.php
+++ b/app/Core/Core.php
@@ -43,10 +43,7 @@ public function __construct(array $data)
         // Load files
         require $this->forum_env['FEATHER_ROOT'].'include/utf8/utf8.php';
         require $this->forum_env['FEATHER_ROOT'].'include/functions.php';
-        require $this->forum_env['FEATHER_ROOT'].'include/classes/pomo/MO.php';
         require $this->forum_env['FEATHER_ROOT'].'include/l10n.php';
-        require $this->forum_env['FEATHER_ROOT'].'include/classes/database.class.php';
-        // require $this->forum_env['FEATHER_ROOT'].'plugins/test/plugintest.php';
 
         // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
         setlocale(LC_CTYPE, 'C');
@@ -238,7 +235,7 @@ public function call()
                                  'cookies.secret_key' => $this->forum_settings['cookie_seed']));
 
         if (!$this->app->cache->isCached('config')) {
-            $this->app->cache->store('config', \model\cache::get_config());
+            $this->app->cache->store('config', \app\model\cache::get_config());
         }
 
         // Finalize forum_settings array
diff --git a/include/classes/csrf.class.php b/app/Core/Csrf.php
similarity index 100%
rename from include/classes/csrf.class.php
rename to app/Core/Csrf.php
diff --git a/include/classes/database.class.php b/app/Core/Database.php
similarity index 100%
rename from include/classes/database.class.php
rename to app/Core/Database.php
diff --git a/include/classes/email.class.php b/app/Core/Email.php
similarity index 100%
rename from include/classes/email.class.php
rename to app/Core/Email.php
diff --git a/include/classes/error.class.php b/app/Core/Error.php
similarity index 100%
rename from include/classes/error.class.php
rename to app/Core/Error.php
diff --git a/include/classes/hooks.class.php b/app/Core/Hooks.php
similarity index 100%
rename from include/classes/hooks.class.php
rename to app/Core/Hooks.php
diff --git a/include/classes/lister.class.php b/app/Core/Lister.php
similarity index 100%
rename from include/classes/lister.class.php
rename to app/Core/Lister.php
diff --git a/include/classes/plugin.class.php b/app/Core/Plugin.php
similarity index 100%
rename from include/classes/plugin.class.php
rename to app/Core/Plugin.php
diff --git a/include/classes/search.class.php b/app/Core/Search.php
similarity index 99%
rename from include/classes/search.class.php
rename to app/Core/Search.php
index 4d1ab048..f513f3f4 100644
--- a/include/classes/search.class.php
+++ b/app/Core/Search.php
@@ -93,7 +93,7 @@ public function validate_search_word($word, $idx)
 
         if (!isset($stopwords)) {
             if (!$this->feather->cache->isCached('stopwords')) {
-                $this->feather->cache->store('stopwords', \model\cache::get_config(), '+1 week');
+                $this->feather->cache->store('stopwords', \app\model\cache::get_config(), '+1 week');
             }
             $stopwords = $this->feather->cache->retrieve('stopwords');
         }
diff --git a/include/classes/url.class.php b/app/Core/Url.php
similarity index 100%
rename from include/classes/url.class.php
rename to app/Core/Url.php
diff --git a/include/classes/utils.class.php b/app/Core/Utils.php
similarity index 99%
rename from include/classes/utils.class.php
rename to app/Core/Utils.php
index 195bde27..e76ba680 100644
--- a/include/classes/utils.class.php
+++ b/app/Core/Utils.php
@@ -19,7 +19,7 @@ public function __construct()
     //
     // Return current timestamp (with microseconds) as a float
     //
-    function get_microtime()
+    public static function get_microtime()
     {
         list($usec, $sec) = explode(' ', microtime());
         return ((float)$usec + (float)$sec);
diff --git a/include/classes/view.class.php b/app/Core/View.php
similarity index 97%
rename from include/classes/view.class.php
rename to app/Core/View.php
index 6cc73e71..510c6e46 100644
--- a/include/classes/view.class.php
+++ b/app/Core/View.php
@@ -362,7 +362,7 @@ protected function getDefaultPageInfo()
     {
         // Check if config file exists to avoid error when installing forum
         if (!$this->app->cache->isCached('quickjump') && is_file($this->app->forum_env['FORUM_CONFIG_FILE'])) {
-            $this->app->cache->store('quickjump', \model\cache::get_quickjump());
+            $this->app->cache->store('quickjump', \app\model\cache::get_quickjump());
         }
 
         $data = array(
@@ -383,13 +383,13 @@ protected function getDefaultPageInfo()
         );
 
         if (is_object($this->app->user) && $this->app->user->is_admmod) {
-            $data['has_reports'] = \model\header::get_reports();
+            $data['has_reports'] = \app\model\header::get_reports();
         }
 
         if ($this->app->forum_env['FEATHER_SHOW_INFO']) {
-            $data['exec_info'] = \model\debug::get_info();
+            $data['exec_info'] = \app\model\debug::get_info();
             if ($this->app->forum_env['FEATHER_SHOW_QUERIES']) {
-                $data['queries_info'] = \model\debug::get_queries();
+                $data['queries_info'] = \app\model\debug::get_queries();
             }
         }
 
diff --git a/include/classes/pomo/.editorconfig b/app/Core/pomo/.editorconfig
similarity index 100%
rename from include/classes/pomo/.editorconfig
rename to app/Core/pomo/.editorconfig
diff --git a/include/classes/pomo/MO.php b/app/Core/pomo/MO.php
similarity index 100%
rename from include/classes/pomo/MO.php
rename to app/Core/pomo/MO.php
diff --git a/include/classes/pomo/PO.php b/app/Core/pomo/PO.php
similarity index 100%
rename from include/classes/pomo/PO.php
rename to app/Core/pomo/PO.php
diff --git a/include/classes/pomo/Streams/CachedFileReader.php b/app/Core/pomo/Streams/CachedFileReader.php
similarity index 100%
rename from include/classes/pomo/Streams/CachedFileReader.php
rename to app/Core/pomo/Streams/CachedFileReader.php
diff --git a/include/classes/pomo/Streams/CachedIntFileReader.php b/app/Core/pomo/Streams/CachedIntFileReader.php
similarity index 100%
rename from include/classes/pomo/Streams/CachedIntFileReader.php
rename to app/Core/pomo/Streams/CachedIntFileReader.php
diff --git a/include/classes/pomo/Streams/FileReader.php b/app/Core/pomo/Streams/FileReader.php
similarity index 100%
rename from include/classes/pomo/Streams/FileReader.php
rename to app/Core/pomo/Streams/FileReader.php
diff --git a/include/classes/pomo/Streams/Reader.php b/app/Core/pomo/Streams/Reader.php
similarity index 100%
rename from include/classes/pomo/Streams/Reader.php
rename to app/Core/pomo/Streams/Reader.php
diff --git a/include/classes/pomo/Streams/StringReader.php b/app/Core/pomo/Streams/StringReader.php
similarity index 100%
rename from include/classes/pomo/Streams/StringReader.php
rename to app/Core/pomo/Streams/StringReader.php
diff --git a/include/classes/pomo/Translations/EntryTranslations.php b/app/Core/pomo/Translations/EntryTranslations.php
similarity index 100%
rename from include/classes/pomo/Translations/EntryTranslations.php
rename to app/Core/pomo/Translations/EntryTranslations.php
diff --git a/include/classes/pomo/Translations/GettextTranslations.php b/app/Core/pomo/Translations/GettextTranslations.php
similarity index 100%
rename from include/classes/pomo/Translations/GettextTranslations.php
rename to app/Core/pomo/Translations/GettextTranslations.php
diff --git a/include/classes/pomo/Translations/NOOPTranslations.php b/app/Core/pomo/Translations/NOOPTranslations.php
similarity index 100%
rename from include/classes/pomo/Translations/NOOPTranslations.php
rename to app/Core/pomo/Translations/NOOPTranslations.php
diff --git a/include/classes/pomo/Translations/Translations.php b/app/Core/pomo/Translations/Translations.php
similarity index 100%
rename from include/classes/pomo/Translations/Translations.php
rename to app/Core/pomo/Translations/Translations.php
diff --git a/include/classes/pomo/Translations/TranslationsInterface.php b/app/Core/pomo/Translations/TranslationsInterface.php
similarity index 100%
rename from include/classes/pomo/Translations/TranslationsInterface.php
rename to app/Core/pomo/Translations/TranslationsInterface.php
diff --git a/app/model/moderate.php b/app/model/moderate.php
index 7644c249..0ae0a7be 100644
--- a/app/model/moderate.php
+++ b/app/model/moderate.php
@@ -222,15 +222,9 @@ public function split_posts($tid, $fid, $p = null)
             $new_subject = $this->request->post('new_subject') ? $this->feather->utils->trim($this->request->post('new_subject')) : '';
 
             if ($new_subject == '') {
-<<<<<<< HEAD
                 throw new \FeatherBB\Error(__('No subject'), 400);
             } elseif (feather_strlen($new_subject) > 70) {
                 throw new \FeatherBB\Error(__('Too long subject'), 400);
-=======
-                message(__('No subject'));
-            } elseif ($this->feather->utils->strlen($new_subject) > 70) {
-                message(__('Too long subject'));
->>>>>>> origin/development
             }
 
             // Get data from the new first post
diff --git a/composer.json b/composer.json
index 3bf3df86..d3258f91 100644
--- a/composer.json
+++ b/composer.json
@@ -1,25 +1,36 @@
 {
-    "name": "featherbb/featherbb",
-    "type": "project",
-    "license": "GNU General Public Licence",
-    "description": "A multi-framework Composer library installer",
-    "keywords": ["forum", "lightweight", "featherbb"],
-    "homepage": "http://featherbb.github.com/installers/",
-    "authors": [
-        {"name": "adaur"},
-        {"name": "capkokoon"},
-        {"name": "beaver"}
-    ],
-    "autoload": {
-        "classmap": ["include/classes/"],
-        "psr-4" : {
-            "Plugins\\" : "/plugins"
-        },
-        "psr-0": { "": "" }
-    },
-    "require": {
-        "php": ">=5.3",
-        "slim/slim": "^2.6",
-        "akrabat/rka-slim-controller": "^2.0"
-    }
+	"name": "featherbb/featherbb",
+	"type": "project",
+	"license": "GNU General Public Licence",
+	"description": "Lighter than a feather.",
+	"keywords": ["forum", "lightweight", "featherbb"],
+	"homepage": "http://featherbb.org/",
+	"authors": [{
+		"name": "adaur",
+		"role": "Project Leader"
+	}, {
+		"name": "capkokoon",
+		"role": "Contributor"
+	}, {
+		"name": "beaver",
+		"role": "Contributor"
+	}],
+	"autoload": {
+        "classmap": ["app/Core/Database.php", "app/Core/pomo/MO.php"],
+		"psr-4": {
+			"Plugins\\": "/plugins",
+			"FeatherBB\\": "app/Core"
+		},
+		"psr-0": {
+			"": ""
+		}
+	},
+	"require": {
+		"php": ">=5.3",
+		"slim/slim": "^2.6"
+	},
+	"support": {
+		"email": "admin@featherbb.org",
+		"issues": "https://github.com/featherbb/featherbb/issues"
+	}
 }
diff --git a/include/classes/autoload.class.php b/include/classes/autoload.class.php
deleted file mode 100644
index 9349d336..00000000
--- a/include/classes/autoload.class.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-namespace FeatherBB;
-
-class Loader
-{
-    protected static $paths = array('include/classes/');
-
-    public static function autoload($class)
-    {
-        foreach (self::$paths as $path) {
-            $class_file = $path.strtolower(str_replace(__NAMESPACE__.'\\', '', $class)).'.class.php';
-            if (is_file($class_file)) {
-                require $class_file;
-            }
-        }
-    }
-
-    public static function registerAutoloader()
-    {
-        spl_autoload_register(__NAMESPACE__ . '\Loader::autoload');
-    }
-}
diff --git a/include/functions.php b/include/functions.php
index 11c02b28..91e5784c 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -16,7 +16,7 @@ function get_admin_ids()
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
     if (!$feather->cache->isCached('admin_ids')) {
-        $feather->cache->store('admin_ids', \model\cache::get_admin_ids());
+        $feather->cache->store('admin_ids', \app\model\cache::get_admin_ids());
     }
 
     return $feather->cache->retrieve('admin_ids');
@@ -350,12 +350,12 @@ function censor_words($text)
     $feather = \Slim\Slim::getInstance();
 
     if (!$feather->cache->isCached('search_for')) {
-        $feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
+        $feather->cache->store('search_for', \app\model\cache::get_censoring('search_for'));
         $search_for = $feather->cache->retrieve('search_for');
     }
 
     if (!$feather->cache->isCached('replace_with')) {
-        $feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
+        $feather->cache->store('replace_with', \app\model\cache::get_censoring('replace_with'));
         $replace_with = $feather->cache->retrieve('replace_with');
     }
 
diff --git a/index.php b/index.php
index 73cc5305..a68f2527 100644
--- a/index.php
+++ b/index.php
@@ -26,6 +26,8 @@
 $feather->add(new \FeatherBB\Auth());
 $feather->add(new \FeatherBB\Core($feather_settings));
 
+
+
 // Load the routes
 require 'include/routes.php';
 
diff --git a/vendor/akrabat/rka-slim-controller/LICENSE b/vendor/akrabat/rka-slim-controller/LICENSE
deleted file mode 100644
index 8ac2d43e..00000000
--- a/vendor/akrabat/rka-slim-controller/LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2014, Rob Allen (rob@akrabat.com)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-
-    * The name of Rob Allen may not be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/akrabat/rka-slim-controller/README.md b/vendor/akrabat/rka-slim-controller/README.md
deleted file mode 100644
index dfc37eb5..00000000
--- a/vendor/akrabat/rka-slim-controller/README.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# RKA Slim Controller
-
-An extension to [Slim Framework][1] that allows you use to dynamically
-instantiated controllers with action methods wherever you would use a
-closure when routing.
-
-The controller can optionally be loaded from Slim's DI container,
-allowing you to inject dependencies as required.
-
-[1]: http://www.slimframework.com/
-
-## Installation
-
-    composer require akrabat/rka-slim-controller
-
-
-## Usage
-
-Use the string format `{controller class name}:{action method name}`
-wherever you would usually use a closure:
-
-e.g.
-
-    $app = new \RKA\Slim();
-    $app->get('/hello:name', 'App\IndexController:home');
-
-
-You can also register the controller with Slim's DI container:
-
-    $app = new \RKA\Slim();
-
-    $app->container->singleton('App\IndexController', function ($container) {
-        // Retrieve any required dependencies from the container and
-        // inject into the constructor of the controller
-
-        return new \App\IndexController();
-    });
-
-    $app->get('/', 'App\IndexController:index');
-
-
-## Controller class methods
-
-*RKA Slim Controller* will call the controller's `setApp()`, `setRequest()`
-and `setResponse()` methods if they exist and populate appropriately. It will
-then call the controller's `init()`` method.
-
-Hence, a typical controller may look like:
-
-    <?php
-    namespace App;
-
-    class IndexController
-    {
-        // Optional properties
-        protected $app;
-        protected $request;
-        protected $response;
-
-        public function index()
-        {
-            echo "This is the home page";
-        }
-
-        public function hello($name)
-        {
-            echo "Hello, $name";
-        }
-
-        // Optional setters
-        public function setApp($app)
-        {
-            $this->app = $app;
-        }
-
-        public function setRequest($request)
-        {
-            $this->request = $request;
-        }
-
-        public function setResponse($response)
-        {
-            $this->response = $response;
-        }
-
-        // Init
-        public function init()
-        {
-            // do things now that app, request and response are set.
-        }
-    }
-
-
-## Example project
-
-Look at [slim-di](https://github.com/akrabat/slim-di).
diff --git a/vendor/akrabat/rka-slim-controller/RKA/Slim.php b/vendor/akrabat/rka-slim-controller/RKA/Slim.php
deleted file mode 100644
index 100c5e42..00000000
--- a/vendor/akrabat/rka-slim-controller/RKA/Slim.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Override of \Slim\Slim to add the ability to dynamically create a controller
- * and call an action method on it.
- *
- * Copyright 2014-2015 Rob Allen (rob@akrabat.com).
- * License: New-BSD
- */
-namespace RKA;
-
-class Slim extends \Slim\Slim
-{
-    /**
-     * Add a route as per the parent method, additionally supporting the syntax
-     * "{controller class name}:{action method name}" as the last argument which
-     * will be converted to a closure that instantiates the controller (or gets
-     * from container) and then calls the method on it.
-     *
-     * @inheritdoc
-     *
-     * @param   array (See notes above)
-     * @return  \Slim\Route
-     */
-    public function mapRoute($args)
-    {
-        $callable = array_pop($args);
-        if (is_string($callable) && substr_count($callable, ':', 1) == 1) {
-            $callable = $this->createControllerClosure($callable);
-        }
-        $args[] = $callable;
-
-        return parent::mapRoute($args);
-    }
-
-    /**
-     * Create a closure that instantiates (or gets from container) and then calls
-     * the action method.
-     *
-     * Also if the methods exist on the controller class, call setApp(), setRequest()
-     * and setResponse() passing in the appropriate object.
-     *
-     * @param  string $name controller class name and action method name separated by a colon
-     * @return closure
-     */
-    protected function createControllerClosure($name)
-    {
-        list($controllerName, $actionName) = explode(':', $name);
-
-        // Create a callable that will find or create the controller instance
-        // and then execute the action
-        $app = $this;
-        $callable = function () use ($app, $controllerName, $actionName) {
-
-            // Try to fetch the controller instance from Slim's container
-            if ($app->container->has($controllerName)) {
-                $controller = $app->container->get($controllerName);
-            } else {
-                // not in container, assume it can be directly instantiated
-                $controller = new $controllerName($app);
-            }
-
-            // Set the app, request and response into the controller if we can
-            if (method_exists($controller, 'setApp')) {
-                $controller->setApp($app);
-            }
-            if (method_exists($controller, 'setRequest')) {
-                $controller->setRequest($app->request);
-            }
-            if (method_exists($controller, 'setResponse')) {
-                $controller->setResponse($app->response);
-            }
-
-            // Call init in case the controller wants to do something now that
-            // it has an app, request and response.
-            if (method_exists($controller, 'init')) {
-                $controller->init();
-            }
-
-            return call_user_func_array(array($controller, $actionName), func_get_args());
-        };
-
-        return $callable;
-    }
-}
diff --git a/vendor/akrabat/rka-slim-controller/composer.json b/vendor/akrabat/rka-slim-controller/composer.json
deleted file mode 100644
index ce454395..00000000
--- a/vendor/akrabat/rka-slim-controller/composer.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "name": "akrabat/rka-slim-controller",
-    "description": "Dynamically instantiated controller classes for Slim Framework",
-    "keywords": [
-        "slim", "controller"
-    ],
-    "homepage": "http://github.com/akrabat/rka-slim-controller",
-    "type": "library",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Rob Allen",
-            "email": "rob@akrabat.com",
-            "homepage": "http://akrabat.com"
-        }
-    ],
-    "require": {
-        "php": ">=5.4",
-        "slim/slim": "~2.4"
-    },
-    "autoload": {
-        "psr-4": {
-            "RKA\\": "RKA"
-        }
-    }
-}
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 5c77336e..7b42861a 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -6,36 +6,10 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    'CachedFileReader' => $baseDir . '/include/classes/pomo/Streams/CachedFileReader.php',
-    'CachedIntFileReader' => $baseDir . '/include/classes/pomo/Streams/CachedIntFileReader.php',
-    'DB' => $baseDir . '/include/classes/database.class.php',
-    'EntryTranslations' => $baseDir . '/include/classes/pomo/Translations/EntryTranslations.php',
-    'FeatherBB\\AdminUtils' => $baseDir . '/include/classes/adminutils.class.php',
-    'FeatherBB\\Auth' => $baseDir . '/include/classes/auth.class.php',
-    'FeatherBB\\Cache' => $baseDir . '/include/classes/cache.class.php',
-    'FeatherBB\\Core' => $baseDir . '/include/classes/core.class.php',
-    'FeatherBB\\Csrf' => $baseDir . '/include/classes/csrf.class.php',
-    'FeatherBB\\Email' => $baseDir . '/include/classes/email.class.php',
-    'FeatherBB\\Error' => $baseDir . '/include/classes/error.class.php',
-    'FeatherBB\\Hooks' => $baseDir . '/include/classes/hooks.class.php',
-    'FeatherBB\\Lister' => $baseDir . '/include/classes/lister.class.php',
-    'FeatherBB\\Loader' => $baseDir . '/include/classes/autoload.class.php',
-    'FeatherBB\\Plugin' => $baseDir . '/include/classes/plugin.class.php',
-    'FeatherBB\\Search' => $baseDir . '/include/classes/search.class.php',
-    'FeatherBB\\Url' => $baseDir . '/include/classes/url.class.php',
-    'FeatherBB\\Utils' => $baseDir . '/include/classes/utils.class.php',
-    'FeatherBB\\View' => $baseDir . '/include/classes/view.class.php',
-    'FileReader' => $baseDir . '/include/classes/pomo/Streams/FileReader.php',
-    'GettextTranslations' => $baseDir . '/include/classes/pomo/Translations/GettextTranslations.php',
-    'IdiormMethodMissingException' => $baseDir . '/include/classes/database.class.php',
-    'IdiormResultSet' => $baseDir . '/include/classes/database.class.php',
-    'IdiormString' => $baseDir . '/include/classes/database.class.php',
-    'IdiormStringException' => $baseDir . '/include/classes/database.class.php',
-    'MO' => $baseDir . '/include/classes/pomo/MO.php',
-    'NOOPTranslations' => $baseDir . '/include/classes/pomo/Translations/NOOPTranslations.php',
-    'PO' => $baseDir . '/include/classes/pomo/PO.php',
-    'Reader' => $baseDir . '/include/classes/pomo/Streams/Reader.php',
-    'StringReader' => $baseDir . '/include/classes/pomo/Streams/StringReader.php',
-    'Translations' => $baseDir . '/include/classes/pomo/Translations/Translations.php',
-    'TranslationsInterface' => $baseDir . '/include/classes/pomo/Translations/TranslationsInterface.php',
+    'DB' => $baseDir . '/app/Core/Database.php',
+    'IdiormMethodMissingException' => $baseDir . '/app/Core/Database.php',
+    'IdiormResultSet' => $baseDir . '/app/Core/Database.php',
+    'IdiormString' => $baseDir . '/app/Core/Database.php',
+    'IdiormStringException' => $baseDir . '/app/Core/Database.php',
+    'MO' => $baseDir . '/app/Core/pomo/MO.php',
 );
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index c5f4765d..cfbc382d 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -6,6 +6,6 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    'RKA\\' => array($vendorDir . '/akrabat/rka-slim-controller/RKA'),
     'Plugins\\' => array('/plugins'),
+    'FeatherBB\\' => array($baseDir . '/app/Core'),
 );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index e09b84fe..ea58c1a1 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -46,50 +46,5 @@
             "rest",
             "router"
         ]
-    },
-    {
-        "name": "akrabat/rka-slim-controller",
-        "version": "2.0.1",
-        "version_normalized": "2.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/akrabat/rka-slim-controller.git",
-            "reference": "7115f082a91af83fd22755e8d2d27e9fcffc636b"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/akrabat/rka-slim-controller/zipball/7115f082a91af83fd22755e8d2d27e9fcffc636b",
-            "reference": "7115f082a91af83fd22755e8d2d27e9fcffc636b",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4",
-            "slim/slim": "~2.4"
-        },
-        "time": "2015-01-07 09:54:54",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "RKA\\": "RKA"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Rob Allen",
-                "email": "rob@akrabat.com",
-                "homepage": "http://akrabat.com"
-            }
-        ],
-        "description": "Dynamically instantiated controller classes for Slim Framework",
-        "homepage": "http://github.com/akrabat/rka-slim-controller",
-        "keywords": [
-            "controller",
-            "slim"
-        ]
     }
 ]

From 8cc34c08a24384e3fdddec6c142d0637530fed15 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 31 Aug 2015 13:41:00 +0200
Subject: [PATCH 283/353] Namespace convention fixes

---
 app/Core/Lister.php                     |  1 +
 app/controller/admin/categories.php     |  2 +-
 app/controller/admin/forums.php         | 10 +++++-----
 app/controller/auth.php                 | 20 ++++++++++----------
 composer.json                           |  4 +---
 vendor/composer/autoload_namespaces.php |  1 -
 vendor/composer/autoload_psr4.php       |  1 +
 7 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/app/Core/Lister.php b/app/Core/Lister.php
index 414c7bf7..2a2d120c 100644
--- a/app/Core/Lister.php
+++ b/app/Core/Lister.php
@@ -47,6 +47,7 @@ public static function getValidPlugins($folder = '')
             $relative_path = DIRECTORY_SEPARATOR.preg_replace("/" . preg_quote($feather_root, "/") . "/", '', $file_path);
             preg_match('/^(.+)\.php$/i', $relative_path, $class_name);
             $parts = explode(DIRECTORY_SEPARATOR, $class_name[1]);
+            $parts[1] = ucfirst($parts[1]); // Replace \plugins to \Plugins for convention
             $name_space = join($parts, "\\");
             // Check if plugin follows PSR-4 conventions and extends base forum plugin
             if (class_exists($name_space) && property_exists($name_space, 'isValidFBPlugin')) {
diff --git a/app/controller/admin/categories.php b/app/controller/admin/categories.php
index d1d4b3ba..940ec4ec 100644
--- a/app/controller/admin/categories.php
+++ b/app/controller/admin/categories.php
@@ -58,7 +58,7 @@ public function edit_categories()
         }
 
         // Regenerate the quick jump cache
-        $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
+        $this->feather->cache->store('quickjump', \app\model\cache::get_quickjump());
 
         redirect($this->feather->url->get('admin/categories/'), __('Categories updated redirect'));
     }
diff --git a/app/controller/admin/forums.php b/app/controller/admin/forums.php
index 2a60d5b6..dbb68602 100644
--- a/app/controller/admin/forums.php
+++ b/app/controller/admin/forums.php
@@ -41,7 +41,7 @@ public function add_forum()
 
         if ($fid = $this->model->add_forum($cat_id, __('New forum'))) {
             // Regenerate the quick jump cache
-            $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
+            $this->feather->cache->store('quickjump', \app\model\cache::get_quickjump());
             redirect($this->feather->url->get('admin/forums/edit/'.$fid.'/'), __('Forum added redirect'));
         } else {
             redirect($this->feather->url->get('admin/forums/'), __('Unable to add forum'));
@@ -98,7 +98,7 @@ public function edit_forum($forum_id)
                 }
 
                 // Regenerate the quick jump cache
-                $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
+                $this->feather->cache->store('quickjump', \app\model\cache::get_quickjump());
 
                 redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Forum updated redirect'));
 
@@ -106,7 +106,7 @@ public function edit_forum($forum_id)
                 $this->model->delete_permissions($forum_id);
 
                 // Regenerate the quick jump cache
-                $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
+                $this->feather->cache->store('quickjump', \app\model\cache::get_quickjump());
 
                 redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Perms reverted redirect'));
             }
@@ -132,7 +132,7 @@ public function delete_forum($forum_id)
         if($this->request->isPost()) {
             $this->model->delete_forum($forum_id);
             // Regenerate the quick jump cache
-            $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
+            $this->feather->cache->store('quickjump', \app\model\cache::get_quickjump());
 
             redirect($this->feather->url->get('admin/forums/'), __('Forum deleted redirect'));
 
@@ -160,7 +160,7 @@ public function edit_positions()
         }
 
         // Regenerate the quick jump cache
-        $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
+        $this->feather->cache->store('quickjump', \app\model\cache::get_quickjump());
 
         redirect($this->feather->url->get('admin/forums/'), __('Forums updated redirect'));
     }
diff --git a/app/controller/auth.php b/app/controller/auth.php
index 6fc9d9ce..dbdfd42a 100644
--- a/app/controller/auth.php
+++ b/app/controller/auth.php
@@ -29,25 +29,25 @@ public function login()
             $form_password = $this->feather->utils->trim($this->feather->request->post('req_password'));
             $save_pass = (bool) $this->feather->request->post('save_pass');
 
-            $user = \model\auth::get_user_from_name($form_username);
+            $user = \app\model\auth::get_user_from_name($form_username);
 
             if (!empty($user->password)) {
                 $form_password_hash = \FeatherBB\Utils::feather_hash($form_password); // Will result in a SHA-1 hash
                 if ($user->password == $form_password_hash) {
                     if ($user->group_id == FEATHER_UNVERIFIED) {
-                        \model\auth::update_group($user->id, $this->feather->forum_settings['o_default_user_group']);
+                        \app\model\auth::update_group($user->id, $this->feather->forum_settings['o_default_user_group']);
                         if (!$this->feather->cache->isCached('users_info')) {
-                            $this->feather->cache->store('users_info', \model\cache::get_users_info());
+                            $this->feather->cache->store('users_info', \app\model\cache::get_users_info());
                         }
                     }
 
-                    \model\auth::delete_online_by_ip($this->feather->request->getIp());
+                    \app\model\auth::delete_online_by_ip($this->feather->request->getIp());
                     // Reset tracked topics
                     set_tracked_topics(null);
 
                     $expire = ($save_pass) ? $this->feather->now + 1209600 : $this->feather->now + $this->feather->forum_settings['o_timeout_visit'];
                     $expire = $this->feather->hooks->fire('expire_login', $expire);
-                    \model\auth::feather_setcookie($user->id, $form_password_hash, $expire);
+                    \app\model\auth::feather_setcookie($user->id, $form_password_hash, $expire);
 
                     $this->feather->url->redirect($this->feather->url->base(), __('Login redirect'));
                 }
@@ -72,14 +72,14 @@ public function logout($token)
             $this->feather->url->redirect($this->feather->url->get('/'), 'Not logged in');
         }
 
-        \model\auth::delete_online_by_id($this->feather->user->id);
+        \app\model\auth::delete_online_by_id($this->feather->user->id);
 
         // Update last_visit (make sure there's something to update it with)
         if (isset($this->feather->user->logged)) {
-            \model\auth::set_last_visit($this->feather->user->id, $this->feather->user->logged);
+            \app\model\auth::set_last_visit($this->feather->user->id, $this->feather->user->logged);
         }
 
-        \model\auth::feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), time() + 31536000);
+        \app\model\auth::feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), time() + 31536000);
         $this->feather->hooks->fire('logout_end');
 
         redirect($this->feather->url->base(), __('Logout redirect'));
@@ -97,7 +97,7 @@ public function forget()
             if (!$this->feather->email->is_valid_email($email)) {
                 throw new \FeatherBB\Error(__('Invalid email'), 400);
             }
-            $user = \model\auth::get_user_from_email($email);
+            $user = \app\model\auth::get_user_from_email($email);
 
             if ($user) {
                 // Load the "activate password" template
@@ -123,7 +123,7 @@ public function forget()
                 $new_password = random_pass(12);
                 $new_password_key = random_pass(8);
 
-                \model\auth::set_new_password($new_password, $new_password_key, $user->id);
+                \app\model\auth::set_new_password($new_password, $new_password_key, $user->id);
 
                 // Do the user specific replacements to the template
                 $cur_mail_message = str_replace('<username>', $user->username, $mail_message);
diff --git a/composer.json b/composer.json
index d3258f91..74b29ce1 100644
--- a/composer.json
+++ b/composer.json
@@ -19,9 +19,7 @@
         "classmap": ["app/Core/Database.php", "app/Core/pomo/MO.php"],
 		"psr-4": {
 			"Plugins\\": "/plugins",
-			"FeatherBB\\": "app/Core"
-		},
-		"psr-0": {
+			"FeatherBB\\": "app/Core",
 			"": ""
 		}
 	},
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index b00084d3..58e60b16 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -7,5 +7,4 @@
 
 return array(
     'Slim' => array($vendorDir . '/slim/slim'),
-    '' => array($baseDir . '/'),
 );
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index cfbc382d..5efbc9f2 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -8,4 +8,5 @@
 return array(
     'Plugins\\' => array('/plugins'),
     'FeatherBB\\' => array($baseDir . '/app/Core'),
+    '' => array($baseDir . '/'),
 );

From edeb9f70d5fe52ea28baba948c78df9145eacf9a Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 31 Aug 2015 14:39:07 +0200
Subject: [PATCH 284/353] Follow PSR-1 naming

---
 .../bans.php => Controller/Admin/Bans.php}    |   6 +-
 .../Admin/Categories.php}                     |   8 +-
 .../Admin/Censoring.php}                      |   6 +-
 .../Admin/Forums.php}                         |  18 +--
 .../Admin/Groups.php}                         |   6 +-
 .../index.php => Controller/Admin/Index.php}  |   4 +-
 .../Admin/Maintenance.php}                    |   6 +-
 .../Admin/Options.php}                        |   6 +-
 .../Admin/Parser.php}                         |   8 +-
 .../Admin/Permissions.php}                    |   6 +-
 .../Admin/Plugins.php}                        |   4 +-
 .../Admin/Reports.php}                        |   6 +-
 .../Admin/Statistics.php}                     |   6 +-
 .../users.php => Controller/Admin/Users.php}  |   6 +-
 .../auth.php => Controller/Auth.php}          |  25 ++--
 app/Core/AdminUtils.php                       |   2 +-
 app/Core/Auth.php                             |   6 +-
 app/Core/Core.php                             |   2 +-
 app/Core/Search.php                           |   2 +-
 app/Core/View.php                             |   8 +-
 .../admin/bans.php => Model/Admin/Bans.php}   |   2 +-
 .../Admin/Categories.php}                     |   4 +-
 .../Admin/Censoring.php}                      |   2 +-
 .../forums.php => Model/Admin/Forums.php}     |   4 +-
 .../groups.php => Model/Admin/Groups.php}     |   2 +-
 .../Admin/Maintenance.php}                    |   2 +-
 .../options.php => Model/Admin/Options.php}   |   2 +-
 .../parser.php => Model/Admin/Parser.php}     |   2 +-
 .../Admin/Permissions.php}                    |   2 +-
 .../reports.php => Model/Admin/Reports.php}   |   2 +-
 .../Admin/Statistics.php}                     |   2 +-
 .../admin/users.php => Model/Admin/Users.php} |   2 +-
 app/{model/auth.php => Model/Auth.php}        |   2 +-
 app/{model/cache.php => Model/Cache.php}      |   2 +-
 app/{model/debug.php => Model/Debug.php}      |   2 +-
 app/{model/delete.php => Model/Delete.php}    |   2 +-
 app/{model/edit.php => Model/Edit.php}        |   2 +-
 app/{model/header.php => Model/Header.php}    |   2 +-
 app/{model/index.php => Model/Index.php}      |   2 +-
 app/{model/install.php => Model/Install.php}  |   2 +-
 app/{model/login.php => Model/Login.php}      |   4 +-
 app/{model/misc.php => Model/Misc.php}        |   2 +-
 .../moderate.php => Model/Moderate.php}       |   2 +-
 app/{model/post.php => Model/Post.php}        |   2 +-
 app/{model/profile.php => Model/Profile.php}  |   4 +-
 .../register.php => Model/Register.php}       |   4 +-
 app/{model/search.php => Model/Search.php}    |   2 +-
 .../userlist.php => Model/Userlist.php}       |   2 +-
 .../viewforum.php => Model/Viewforum.php}     |   2 +-
 .../viewtopic.php => Model/Viextopic.php}     |   2 +-
 app/controller/delete.php                     |   6 +-
 app/controller/edit.php                       |   6 +-
 app/controller/help.php                       |   4 +-
 app/controller/index.php                      |   6 +-
 app/controller/install.php                    |   6 +-
 app/controller/login.php                      |   6 +-
 app/controller/misc.php                       |   6 +-
 app/controller/moderate.php                   |   6 +-
 app/controller/post.php                       |   6 +-
 app/controller/profile.php                    |   6 +-
 app/controller/register.php                   |   6 +-
 app/controller/search.php                     |   6 +-
 app/controller/userlist.php                   |   6 +-
 app/controller/viewforum.php                  |   6 +-
 app/controller/viewtopic.php                  |   6 +-
 include/functions.php                         |   6 +-
 include/routes.php                            | 138 +++++++++---------
 67 files changed, 222 insertions(+), 221 deletions(-)
 rename app/{controller/admin/bans.php => Controller/Admin/Bans.php} (97%)
 rename app/{controller/admin/categories.php => Controller/Admin/Categories.php} (95%)
 rename app/{controller/admin/censoring.php => Controller/Admin/Censoring.php} (94%)
 rename app/{controller/admin/forums.php => Controller/Admin/Forums.php} (93%)
 rename app/{controller/admin/groups.php => Controller/Admin/Groups.php} (97%)
 rename app/{controller/admin/index.php => Controller/Admin/Index.php} (98%)
 rename app/{controller/admin/maintenance.php => Controller/Admin/Maintenance.php} (96%)
 rename app/{controller/admin/options.php => Controller/Admin/Options.php} (93%)
 rename app/{controller/admin/parser.php => Controller/Admin/Parser.php} (98%)
 rename app/{controller/admin/permissions.php => Controller/Admin/Permissions.php} (92%)
 rename app/{controller/admin/plugins.php => Controller/Admin/Plugins.php} (99%)
 rename app/{controller/admin/reports.php => Controller/Admin/Reports.php} (93%)
 rename app/{controller/admin/statistics.php => Controller/Admin/Statistics.php} (94%)
 rename app/{controller/admin/users.php => Controller/Admin/Users.php} (98%)
 rename app/{controller/auth.php => Controller/Auth.php} (91%)
 rename app/{model/admin/bans.php => Model/Admin/Bans.php} (99%)
 rename app/{model/admin/categories.php => Model/Admin/Categories.php} (97%)
 rename app/{model/admin/censoring.php => Model/Admin/Censoring.php} (99%)
 rename app/{model/admin/forums.php => Model/Admin/Forums.php} (99%)
 rename app/{model/admin/groups.php => Model/Admin/Groups.php} (99%)
 rename app/{model/admin/maintenance.php => Model/Admin/Maintenance.php} (99%)
 rename app/{model/admin/options.php => Model/Admin/Options.php} (99%)
 rename app/{model/admin/parser.php => Model/Admin/Parser.php} (97%)
 rename app/{model/admin/permissions.php => Model/Admin/Permissions.php} (98%)
 rename app/{model/admin/reports.php => Model/Admin/Reports.php} (99%)
 rename app/{model/admin/statistics.php => Model/Admin/Statistics.php} (99%)
 rename app/{model/admin/users.php => Model/Admin/Users.php} (99%)
 rename app/{model/auth.php => Model/Auth.php} (99%)
 rename app/{model/cache.php => Model/Cache.php} (99%)
 rename app/{model/debug.php => Model/Debug.php} (98%)
 rename app/{model/delete.php => Model/Delete.php} (99%)
 rename app/{model/edit.php => Model/Edit.php} (99%)
 rename app/{model/header.php => Model/Header.php} (96%)
 rename app/{model/index.php => Model/Index.php} (99%)
 rename app/{model/install.php => Model/Install.php} (99%)
 rename app/{model/login.php => Model/Login.php} (99%)
 rename app/{model/misc.php => Model/Misc.php} (99%)
 rename app/{model/moderate.php => Model/Moderate.php} (99%)
 rename app/{model/post.php => Model/Post.php} (99%)
 rename app/{model/profile.php => Model/Profile.php} (99%)
 rename app/{model/register.php => Model/Register.php} (99%)
 rename app/{model/search.php => Model/Search.php} (99%)
 rename app/{model/userlist.php => Model/Userlist.php} (99%)
 rename app/{model/viewforum.php => Model/Viewforum.php} (99%)
 rename app/{model/viewtopic.php => Model/Viextopic.php} (99%)

diff --git a/app/controller/admin/bans.php b/app/Controller/Admin/Bans.php
similarity index 97%
rename from app/controller/admin/bans.php
rename to app/Controller/Admin/Bans.php
index 75985312..ed472f75 100644
--- a/app/controller/admin/bans.php
+++ b/app/Controller/Admin/Bans.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller\admin;
+namespace App\Controller\Admin;
 
-class bans
+class Bans
 {
     public function __construct()
     {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\admin\bans();
+        $this->model = new \App\Model\Admin\Bans();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/bans.mo');
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
diff --git a/app/controller/admin/categories.php b/app/Controller/Admin/Categories.php
similarity index 95%
rename from app/controller/admin/categories.php
rename to app/Controller/Admin/Categories.php
index 940ec4ec..610e5724 100644
--- a/app/controller/admin/categories.php
+++ b/app/Controller/Admin/Categories.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher.
  */
 
-namespace app\controller\admin;
+namespace App\Controller\Admin;
 
-class categories
+class Categories
 {
     public function __construct()
     {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\admin\categories();
+        $this->model = new \App\Model\Admin\Categories();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/categories.mo');
     }
 
@@ -58,7 +58,7 @@ public function edit_categories()
         }
 
         // Regenerate the quick jump cache
-        $this->feather->cache->store('quickjump', \app\model\cache::get_quickjump());
+        $this->feather->cache->store('quickjump', \App\Model\Cache::get_quickjump());
 
         redirect($this->feather->url->get('admin/categories/'), __('Categories updated redirect'));
     }
diff --git a/app/controller/admin/censoring.php b/app/Controller/Admin/Censoring.php
similarity index 94%
rename from app/controller/admin/censoring.php
rename to app/Controller/Admin/Censoring.php
index 8bc50123..8e641352 100644
--- a/app/controller/admin/censoring.php
+++ b/app/Controller/Admin/Censoring.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller\admin;
+namespace App\Controller\Admin;
 
-class censoring
+class Censoring
 {
     public function __construct()
     {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\admin\censoring();
+        $this->model = new \App\Model\Admin\Censoring();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/censoring.mo');
     }
 
diff --git a/app/controller/admin/forums.php b/app/Controller/Admin/Forums.php
similarity index 93%
rename from app/controller/admin/forums.php
rename to app/Controller/Admin/Forums.php
index dbb68602..98a73bea 100644
--- a/app/controller/admin/forums.php
+++ b/app/Controller/Admin/Forums.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller\admin;
+namespace App\Controller\Admin;
 
-class forums
+class Forums
 {
     public function __construct()
     {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\admin\forums();
+        $this->model = new \App\Model\Admin\forums();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/forums.mo');
     }
 
@@ -41,7 +41,7 @@ public function add_forum()
 
         if ($fid = $this->model->add_forum($cat_id, __('New forum'))) {
             // Regenerate the quick jump cache
-            $this->feather->cache->store('quickjump', \app\model\cache::get_quickjump());
+            $this->feather->cache->store('quickjump', \App\Model\Cache::get_quickjump());
             redirect($this->feather->url->get('admin/forums/edit/'.$fid.'/'), __('Forum added redirect'));
         } else {
             redirect($this->feather->url->get('admin/forums/'), __('Unable to add forum'));
@@ -98,7 +98,7 @@ public function edit_forum($forum_id)
                 }
 
                 // Regenerate the quick jump cache
-                $this->feather->cache->store('quickjump', \app\model\cache::get_quickjump());
+                $this->feather->cache->store('quickjump', \App\Model\Cache::get_quickjump());
 
                 redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Forum updated redirect'));
 
@@ -106,7 +106,7 @@ public function edit_forum($forum_id)
                 $this->model->delete_permissions($forum_id);
 
                 // Regenerate the quick jump cache
-                $this->feather->cache->store('quickjump', \app\model\cache::get_quickjump());
+                $this->feather->cache->store('quickjump', \App\Model\Cache::get_quickjump());
 
                 redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Perms reverted redirect'));
             }
@@ -132,7 +132,7 @@ public function delete_forum($forum_id)
         if($this->request->isPost()) {
             $this->model->delete_forum($forum_id);
             // Regenerate the quick jump cache
-            $this->feather->cache->store('quickjump', \app\model\cache::get_quickjump());
+            $this->feather->cache->store('quickjump', \App\Model\Cache::get_quickjump());
 
             redirect($this->feather->url->get('admin/forums/'), __('Forum deleted redirect'));
 
@@ -160,7 +160,7 @@ public function edit_positions()
         }
 
         // Regenerate the quick jump cache
-        $this->feather->cache->store('quickjump', \app\model\cache::get_quickjump());
+        $this->feather->cache->store('quickjump', \App\Model\Cache::get_quickjump());
 
         redirect($this->feather->url->get('admin/forums/'), __('Forums updated redirect'));
     }
@@ -173,7 +173,7 @@ public function display()
 
         \FeatherBB\AdminUtils::generateAdminMenu('forums');
 
-        $categories_model = new \app\model\admin\categories();
+        $categories_model = new \App\Model\Admin\Categories();
         $this->feather->view2->setPageInfo(array(
                 'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Forums')),
                 'active_page' => 'admin',
diff --git a/app/controller/admin/groups.php b/app/Controller/Admin/Groups.php
similarity index 97%
rename from app/controller/admin/groups.php
rename to app/Controller/Admin/Groups.php
index 8e4bf3c8..0208c6d2 100644
--- a/app/controller/admin/groups.php
+++ b/app/Controller/Admin/Groups.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller\admin;
+namespace App\Controller\Admin;
 
-class groups
+class Groups
 {
     public function __construct()
     {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\admin\groups();
+        $this->model = new \App\Model\Admin\groups();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/groups.mo');
     }
 
diff --git a/app/controller/admin/index.php b/app/Controller/Admin/Index.php
similarity index 98%
rename from app/controller/admin/index.php
rename to app/Controller/Admin/Index.php
index 86f10359..36b5ec88 100644
--- a/app/controller/admin/index.php
+++ b/app/Controller/Admin/Index.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller\admin;
+namespace App\Controller\Admin;
 
-class index
+class Index
 {
     public function __construct()
     {
diff --git a/app/controller/admin/maintenance.php b/app/Controller/Admin/Maintenance.php
similarity index 96%
rename from app/controller/admin/maintenance.php
rename to app/Controller/Admin/Maintenance.php
index e818ccc7..2fcb24dd 100644
--- a/app/controller/admin/maintenance.php
+++ b/app/Controller/Admin/Maintenance.php
@@ -7,14 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller\admin;
+namespace App\Controller\Admin;
 
-class maintenance
+class Maintenance
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \app\model\admin\maintenance();
+        $this->model = new \App\Model\Admin\maintenance();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/admin/maintenance.mo');
     }
 
diff --git a/app/controller/admin/options.php b/app/Controller/Admin/Options.php
similarity index 93%
rename from app/controller/admin/options.php
rename to app/Controller/Admin/Options.php
index 968261dc..e7095fd2 100644
--- a/app/controller/admin/options.php
+++ b/app/Controller/Admin/Options.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller\admin;
+namespace App\Controller\Admin;
 
-class options
+class Options
 {
     public function __construct()
     {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\admin\options();
+        $this->model = new \App\Model\Admin\options();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/options.mo');
     }
 
diff --git a/app/controller/admin/parser.php b/app/Controller/Admin/Parser.php
similarity index 98%
rename from app/controller/admin/parser.php
rename to app/Controller/Admin/Parser.php
index b58a7fc5..1ceea1e9 100644
--- a/app/controller/admin/parser.php
+++ b/app/Controller/Admin/Parser.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller\admin;
+namespace App\Controller\Admin;
 
-class parser
+class Parser
 {
     public function __construct()
     {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\admin\parser();
+        $this->model = new \App\Model\Admin\parser();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/parser.mo');
     }
 
@@ -32,7 +32,7 @@ public function display()
         global $lang_admin_parser;
 
         // Legacy
-        require FEATHER_ROOT . 'lang/' . $this->user->language . '/admin/parser.php';
+        require FEATHER_ROOT . 'app/lang/' . $this->user->language . '/admin/parser.php';
 
         // This is where the parser data lives and breathes.
         $cache_file = FEATHER_ROOT.'cache/cache_parser_data.php';
diff --git a/app/controller/admin/permissions.php b/app/Controller/Admin/Permissions.php
similarity index 92%
rename from app/controller/admin/permissions.php
rename to app/Controller/Admin/Permissions.php
index 523c0f80..975aa386 100644
--- a/app/controller/admin/permissions.php
+++ b/app/Controller/Admin/Permissions.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller\admin;
+namespace App\Controller\Admin;
 
-class permissions
+class Permissions
 {
     public function __construct()
     {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\admin\permissions();
+        $this->model = new \App\Model\Admin\permissions();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/permissions.mo');
     }
 
diff --git a/app/controller/admin/plugins.php b/app/Controller/Admin/Plugins.php
similarity index 99%
rename from app/controller/admin/plugins.php
rename to app/Controller/Admin/Plugins.php
index bb44a4b3..41446601 100644
--- a/app/controller/admin/plugins.php
+++ b/app/Controller/Admin/Plugins.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller\admin;
+namespace App\Controller\Admin;
 
-class plugins
+class Plugins
 {
     public function __construct()
     {
diff --git a/app/controller/admin/reports.php b/app/Controller/Admin/Reports.php
similarity index 93%
rename from app/controller/admin/reports.php
rename to app/Controller/Admin/Reports.php
index 8e8fd555..85b996cb 100644
--- a/app/controller/admin/reports.php
+++ b/app/Controller/Admin/Reports.php
@@ -7,11 +7,11 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller\admin;
+namespace App\Controller\Admin;
 
 use FeatherBB\AdminUtils;
 
-class reports
+class Reports
 {
     public function __construct()
     {
@@ -20,7 +20,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\admin\reports();
+        $this->model = new \App\Model\Admin\reports();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/reports.mo');
     }
 
diff --git a/app/controller/admin/statistics.php b/app/Controller/Admin/Statistics.php
similarity index 94%
rename from app/controller/admin/statistics.php
rename to app/Controller/Admin/Statistics.php
index 6ac24ca5..4e00bf94 100644
--- a/app/controller/admin/statistics.php
+++ b/app/Controller/Admin/Statistics.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller\admin;
+namespace App\Controller\Admin;
 
-class statistics
+class Statistics
 {
     public function __construct()
     {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\admin\statistics();
+        $this->model = new \App\Model\Admin\statistics();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/index.mo');
     }
 
diff --git a/app/controller/admin/users.php b/app/Controller/Admin/Users.php
similarity index 98%
rename from app/controller/admin/users.php
rename to app/Controller/Admin/Users.php
index 870949bc..398ccb96 100644
--- a/app/controller/admin/users.php
+++ b/app/Controller/Admin/Users.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller\admin;
+namespace App\Controller\Admin;
 
-class users
+class Users
 {
     public function __construct()
     {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\admin\users();
+        $this->model = new \App\Model\Admin\users();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/users.mo');
     }
 
diff --git a/app/controller/auth.php b/app/Controller/Auth.php
similarity index 91%
rename from app/controller/auth.php
rename to app/Controller/Auth.php
index dbdfd42a..72a0352c 100644
--- a/app/controller/auth.php
+++ b/app/Controller/Auth.php
@@ -7,9 +7,10 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller;
+namespace App\Controller;
 use DB;
-class auth
+
+class Auth
 {
     public function __construct()
     {
@@ -29,25 +30,25 @@ public function login()
             $form_password = $this->feather->utils->trim($this->feather->request->post('req_password'));
             $save_pass = (bool) $this->feather->request->post('save_pass');
 
-            $user = \app\model\auth::get_user_from_name($form_username);
+            $user = \App\Model\Auth::get_user_from_name($form_username);
 
             if (!empty($user->password)) {
                 $form_password_hash = \FeatherBB\Utils::feather_hash($form_password); // Will result in a SHA-1 hash
                 if ($user->password == $form_password_hash) {
                     if ($user->group_id == FEATHER_UNVERIFIED) {
-                        \app\model\auth::update_group($user->id, $this->feather->forum_settings['o_default_user_group']);
+                        \App\Model\Auth::update_group($user->id, $this->feather->forum_settings['o_default_user_group']);
                         if (!$this->feather->cache->isCached('users_info')) {
-                            $this->feather->cache->store('users_info', \app\model\cache::get_users_info());
+                            $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
                         }
                     }
 
-                    \app\model\auth::delete_online_by_ip($this->feather->request->getIp());
+                    \App\Model\Auth::delete_online_by_ip($this->feather->request->getIp());
                     // Reset tracked topics
                     set_tracked_topics(null);
 
                     $expire = ($save_pass) ? $this->feather->now + 1209600 : $this->feather->now + $this->feather->forum_settings['o_timeout_visit'];
                     $expire = $this->feather->hooks->fire('expire_login', $expire);
-                    \app\model\auth::feather_setcookie($user->id, $form_password_hash, $expire);
+                    \App\Model\Auth::feather_setcookie($user->id, $form_password_hash, $expire);
 
                     $this->feather->url->redirect($this->feather->url->base(), __('Login redirect'));
                 }
@@ -72,14 +73,14 @@ public function logout($token)
             $this->feather->url->redirect($this->feather->url->get('/'), 'Not logged in');
         }
 
-        \app\model\auth::delete_online_by_id($this->feather->user->id);
+        \App\Model\Auth::delete_online_by_id($this->feather->user->id);
 
         // Update last_visit (make sure there's something to update it with)
         if (isset($this->feather->user->logged)) {
-            \app\model\auth::set_last_visit($this->feather->user->id, $this->feather->user->logged);
+            \App\Model\Auth::set_last_visit($this->feather->user->id, $this->feather->user->logged);
         }
 
-        \app\model\auth::feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), time() + 31536000);
+        \App\Model\Auth::feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), time() + 31536000);
         $this->feather->hooks->fire('logout_end');
 
         redirect($this->feather->url->base(), __('Logout redirect'));
@@ -97,7 +98,7 @@ public function forget()
             if (!$this->feather->email->is_valid_email($email)) {
                 throw new \FeatherBB\Error(__('Invalid email'), 400);
             }
-            $user = \app\model\auth::get_user_from_email($email);
+            $user = \App\Model\Auth::get_user_from_email($email);
 
             if ($user) {
                 // Load the "activate password" template
@@ -123,7 +124,7 @@ public function forget()
                 $new_password = random_pass(12);
                 $new_password_key = random_pass(8);
 
-                \app\model\auth::set_new_password($new_password, $new_password_key, $user->id);
+                \App\Model\Auth::set_new_password($new_password, $new_password_key, $user->id);
 
                 // Do the user specific replacements to the template
                 $cur_mail_message = str_replace('<username>', $user->username, $mail_message);
diff --git a/app/Core/AdminUtils.php b/app/Core/AdminUtils.php
index 1a276f74..a27eaa58 100644
--- a/app/Core/AdminUtils.php
+++ b/app/Core/AdminUtils.php
@@ -53,7 +53,7 @@ public static function breadcrumbs_admin(array $links)
     public static function get_admin_ids()
     {
         if (!$this->feather->cache->isCached('admin_ids')) {
-            $this->feather->cache->store('admin_ids', \app\model\cache::get_admin_ids());
+            $this->feather->cache->store('admin_ids', \App\Model\Cache::get_admin_ids());
         }
 
         return $this->feather->cache->retrieve('admin_ids');
diff --git a/app/Core/Auth.php b/app/Core/Auth.php
index 553dbab4..873eee5a 100644
--- a/app/Core/Auth.php
+++ b/app/Core/Auth.php
@@ -21,7 +21,7 @@ class Auth extends \Slim\Middleware
 
     public function __construct()
 	{
-        $this->model = new \app\model\auth();
+        $this->model = new \App\Model\Auth();
     }
 
     public function get_cookie_data($cookie_name, $cookie_seed)
@@ -184,7 +184,7 @@ public function check_bans()
 
         // If we removed any expired bans during our run-through, we need to regenerate the bans cache
         if ($bans_altered) {
-            $this->app->cache->store('bans', \app\model\cache::get_bans());
+            $this->app->cache->store('bans', \App\Model\Cache::get_bans());
         }
     }
 
@@ -272,7 +272,7 @@ public function call()
 
         // Load bans from cache
         if (!$this->app->cache->isCached('bans')) {
-            $this->app->cache->store('bans', \app\model\cache::get_bans());
+            $this->app->cache->store('bans', \App\Model\Cache::get_bans());
         }
         $feather_bans = $this->app->cache->retrieve('bans');
 
diff --git a/app/Core/Core.php b/app/Core/Core.php
index ce1d9cc5..ab78dc95 100644
--- a/app/Core/Core.php
+++ b/app/Core/Core.php
@@ -235,7 +235,7 @@ public function call()
                                  'cookies.secret_key' => $this->forum_settings['cookie_seed']));
 
         if (!$this->app->cache->isCached('config')) {
-            $this->app->cache->store('config', \app\model\cache::get_config());
+            $this->app->cache->store('config', \App\Model\Cache::get_config());
         }
 
         // Finalize forum_settings array
diff --git a/app/Core/Search.php b/app/Core/Search.php
index f513f3f4..9405b421 100644
--- a/app/Core/Search.php
+++ b/app/Core/Search.php
@@ -93,7 +93,7 @@ public function validate_search_word($word, $idx)
 
         if (!isset($stopwords)) {
             if (!$this->feather->cache->isCached('stopwords')) {
-                $this->feather->cache->store('stopwords', \app\model\cache::get_config(), '+1 week');
+                $this->feather->cache->store('stopwords', \App\Model\Cache::get_config(), '+1 week');
             }
             $stopwords = $this->feather->cache->retrieve('stopwords');
         }
diff --git a/app/Core/View.php b/app/Core/View.php
index 510c6e46..fc845332 100644
--- a/app/Core/View.php
+++ b/app/Core/View.php
@@ -362,7 +362,7 @@ protected function getDefaultPageInfo()
     {
         // Check if config file exists to avoid error when installing forum
         if (!$this->app->cache->isCached('quickjump') && is_file($this->app->forum_env['FORUM_CONFIG_FILE'])) {
-            $this->app->cache->store('quickjump', \app\model\cache::get_quickjump());
+            $this->app->cache->store('quickjump', \App\Model\Cache::get_quickjump());
         }
 
         $data = array(
@@ -383,13 +383,13 @@ protected function getDefaultPageInfo()
         );
 
         if (is_object($this->app->user) && $this->app->user->is_admmod) {
-            $data['has_reports'] = \app\model\header::get_reports();
+            $data['has_reports'] = \App\Model\Header::get_reports();
         }
 
         if ($this->app->forum_env['FEATHER_SHOW_INFO']) {
-            $data['exec_info'] = \app\model\debug::get_info();
+            $data['exec_info'] = \App\Model\Debug::get_info();
             if ($this->app->forum_env['FEATHER_SHOW_QUERIES']) {
-                $data['queries_info'] = \app\model\debug::get_queries();
+                $data['queries_info'] = \App\Model\Debug::get_queries();
             }
         }
 
diff --git a/app/model/admin/bans.php b/app/Model/Admin/Bans.php
similarity index 99%
rename from app/model/admin/bans.php
rename to app/Model/Admin/Bans.php
index 9e8b0426..33e47e6c 100644
--- a/app/model/admin/bans.php
+++ b/app/Model/Admin/Bans.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model\admin;
+namespace App\Model\Admin;
 
 use DB;
 
diff --git a/app/model/admin/categories.php b/app/Model/Admin/Categories.php
similarity index 97%
rename from app/model/admin/categories.php
rename to app/Model/Admin/Categories.php
index fb6bb823..2eb4fde7 100644
--- a/app/model/admin/categories.php
+++ b/app/Model/Admin/Categories.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher.
  */
 
-namespace app\model\admin;
+namespace App\Model\Admin;
 
 use DB;
 
@@ -60,7 +60,7 @@ public function delete_category($cat_to_delete)
 
         foreach ($forums_in_cat as $forum) {
             // Prune all posts and topics
-            $this->maintenance = new \app\model\admin\maintenance();
+            $this->maintenance = new \App\Model\Admin\maintenance();
             $this->maintenance->prune($forum->id, 1, -1);
 
             // Delete forum
diff --git a/app/model/admin/censoring.php b/app/Model/Admin/Censoring.php
similarity index 99%
rename from app/model/admin/censoring.php
rename to app/Model/Admin/Censoring.php
index 4aa81719..74581ad4 100644
--- a/app/model/admin/censoring.php
+++ b/app/Model/Admin/Censoring.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model\admin;
+namespace App\Model\Admin;
 
 use DB;
 
diff --git a/app/model/admin/forums.php b/app/Model/Admin/Forums.php
similarity index 99%
rename from app/model/admin/forums.php
rename to app/Model/Admin/Forums.php
index 6fed815e..823a0f73 100644
--- a/app/model/admin/forums.php
+++ b/app/Model/Admin/Forums.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model\admin;
+namespace App\Model\Admin;
 
 use DB;
 
@@ -61,7 +61,7 @@ public function delete_forum($forum_id)
         $forum_id = $this->hook->fire('delete_forum_start', $forum_id);
 
         // Prune all posts and topics
-        $this->maintenance = new \app\model\admin\maintenance();
+        $this->maintenance = new \App\Model\Admin\maintenance();
         $this->maintenance->prune($forum_id, 1, -1);
 
         // Delete the forum
diff --git a/app/model/admin/groups.php b/app/Model/Admin/Groups.php
similarity index 99%
rename from app/model/admin/groups.php
rename to app/Model/Admin/Groups.php
index ec37cacc..04faffcb 100644
--- a/app/model/admin/groups.php
+++ b/app/Model/Admin/Groups.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model\admin;
+namespace App\Model\Admin;
 
 use DB;
 
diff --git a/app/model/admin/maintenance.php b/app/Model/Admin/Maintenance.php
similarity index 99%
rename from app/model/admin/maintenance.php
rename to app/Model/Admin/Maintenance.php
index d6681e02..2b283169 100644
--- a/app/model/admin/maintenance.php
+++ b/app/Model/Admin/Maintenance.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model\admin;
+namespace App\Model\Admin;
 
 use DB;
 
diff --git a/app/model/admin/options.php b/app/Model/Admin/Options.php
similarity index 99%
rename from app/model/admin/options.php
rename to app/Model/Admin/Options.php
index f4b0de7a..e6e780dd 100644
--- a/app/model/admin/options.php
+++ b/app/Model/Admin/Options.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model\admin;
+namespace App\Model\Admin;
 
 use DB;
 
diff --git a/app/model/admin/parser.php b/app/Model/Admin/Parser.php
similarity index 97%
rename from app/model/admin/parser.php
rename to app/Model/Admin/Parser.php
index efe93725..2472abfd 100644
--- a/app/model/admin/parser.php
+++ b/app/Model/Admin/Parser.php
@@ -8,7 +8,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model\admin;
+namespace App\Model\Admin;
 
 use DB;
 
diff --git a/app/model/admin/permissions.php b/app/Model/Admin/Permissions.php
similarity index 98%
rename from app/model/admin/permissions.php
rename to app/Model/Admin/Permissions.php
index 3616297a..e9143582 100644
--- a/app/model/admin/permissions.php
+++ b/app/Model/Admin/Permissions.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model\admin;
+namespace App\Model\Admin;
 
 use DB;
 
diff --git a/app/model/admin/reports.php b/app/Model/Admin/Reports.php
similarity index 99%
rename from app/model/admin/reports.php
rename to app/Model/Admin/Reports.php
index aaa2a90c..faf582ba 100644
--- a/app/model/admin/reports.php
+++ b/app/Model/Admin/Reports.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model\admin;
+namespace App\Model\Admin;
 
 use DB;
 
diff --git a/app/model/admin/statistics.php b/app/Model/Admin/Statistics.php
similarity index 99%
rename from app/model/admin/statistics.php
rename to app/Model/Admin/Statistics.php
index 8e6e730d..e165b873 100644
--- a/app/model/admin/statistics.php
+++ b/app/Model/Admin/Statistics.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model\admin;
+namespace App\Model\Admin;
 
 use DB;
 
diff --git a/app/model/admin/users.php b/app/Model/Admin/Users.php
similarity index 99%
rename from app/model/admin/users.php
rename to app/Model/Admin/Users.php
index 9c367a8c..b2ad7561 100644
--- a/app/model/admin/users.php
+++ b/app/Model/Admin/Users.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model\admin;
+namespace App\Model\Admin;
 
 use DB;
 
diff --git a/app/model/auth.php b/app/Model/Auth.php
similarity index 99%
rename from app/model/auth.php
rename to app/Model/Auth.php
index 55c32ddd..0b4068ea 100644
--- a/app/model/auth.php
+++ b/app/Model/Auth.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 use DB;
 
 class auth
diff --git a/app/model/cache.php b/app/Model/Cache.php
similarity index 99%
rename from app/model/cache.php
rename to app/Model/Cache.php
index 05d9e424..c5c60849 100644
--- a/app/model/cache.php
+++ b/app/Model/Cache.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 use DB;
 
 class cache
diff --git a/app/model/debug.php b/app/Model/Debug.php
similarity index 98%
rename from app/model/debug.php
rename to app/Model/Debug.php
index a5486687..327dbbb5 100644
--- a/app/model/debug.php
+++ b/app/Model/Debug.php
@@ -7,7 +7,7 @@
 * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
 */
 
-namespace app\model;
+namespace App\Model;
 use DB;
 
 class debug
diff --git a/app/model/delete.php b/app/Model/Delete.php
similarity index 99%
rename from app/model/delete.php
rename to app/Model/Delete.php
index 0f33e614..4723e754 100644
--- a/app/model/delete.php
+++ b/app/Model/Delete.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 
 use DB;
 
diff --git a/app/model/edit.php b/app/Model/Edit.php
similarity index 99%
rename from app/model/edit.php
rename to app/Model/Edit.php
index e896c531..5afdf1ce 100644
--- a/app/model/edit.php
+++ b/app/Model/Edit.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 
 use DB;
 
diff --git a/app/model/header.php b/app/Model/Header.php
similarity index 96%
rename from app/model/header.php
rename to app/Model/Header.php
index b09481a3..6601f41b 100644
--- a/app/model/header.php
+++ b/app/Model/Header.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 
 use DB;
 
diff --git a/app/model/index.php b/app/Model/Index.php
similarity index 99%
rename from app/model/index.php
rename to app/Model/Index.php
index 1e4d1bde..1fed1f45 100644
--- a/app/model/index.php
+++ b/app/Model/Index.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 
 use DB;
 
diff --git a/app/model/install.php b/app/Model/Install.php
similarity index 99%
rename from app/model/install.php
rename to app/Model/Install.php
index 82c9ffbb..3c955d2c 100644
--- a/app/model/install.php
+++ b/app/Model/Install.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 
 use DB;
 
diff --git a/app/model/login.php b/app/Model/Login.php
similarity index 99%
rename from app/model/login.php
rename to app/Model/Login.php
index fee16d59..a8d8abbb 100644
--- a/app/model/login.php
+++ b/app/Model/Login.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 
 use DB;
 
@@ -22,7 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
         $this->email = $this->feather->email;
-        $this->auth = new \app\model\auth();
+        $this->auth = new \App\Model\Auth();
     }
 
     public function login()
diff --git a/app/model/misc.php b/app/Model/Misc.php
similarity index 99%
rename from app/model/misc.php
rename to app/Model/Misc.php
index e5c53f63..7d13731c 100644
--- a/app/model/misc.php
+++ b/app/Model/Misc.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 
 use DB;
 
diff --git a/app/model/moderate.php b/app/Model/Moderate.php
similarity index 99%
rename from app/model/moderate.php
rename to app/Model/Moderate.php
index 0ae0a7be..551321db 100644
--- a/app/model/moderate.php
+++ b/app/Model/Moderate.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 
 use DB;
 
diff --git a/app/model/post.php b/app/Model/Post.php
similarity index 99%
rename from app/model/post.php
rename to app/Model/Post.php
index 9f94f158..90e80845 100644
--- a/app/model/post.php
+++ b/app/Model/Post.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 
 use DB;
 
diff --git a/app/model/profile.php b/app/Model/Profile.php
similarity index 99%
rename from app/model/profile.php
rename to app/Model/Profile.php
index 0c0ca688..9d9b5c0e 100644
--- a/app/model/profile.php
+++ b/app/Model/Profile.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 
 use DB;
 
@@ -22,7 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
         $this->email = $this->feather->email;
-        $this->auth = new \app\model\auth();
+        $this->auth = new \App\Model\Auth();
     }
 
     public function change_pass($id)
diff --git a/app/model/register.php b/app/Model/Register.php
similarity index 99%
rename from app/model/register.php
rename to app/Model/Register.php
index c7261775..01e7a8ae 100644
--- a/app/model/register.php
+++ b/app/Model/Register.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 
 use DB;
 
@@ -22,7 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
         $this->email = $this->feather->email;
-        $this->auth = new \app\model\auth();
+        $this->auth = new \App\Model\Auth();
     }
 
     public function check_for_errors()
diff --git a/app/model/search.php b/app/Model/Search.php
similarity index 99%
rename from app/model/search.php
rename to app/Model/Search.php
index 95c9143e..643002e9 100644
--- a/app/model/search.php
+++ b/app/Model/Search.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 
 use DB;
 
diff --git a/app/model/userlist.php b/app/Model/Userlist.php
similarity index 99%
rename from app/model/userlist.php
rename to app/Model/Userlist.php
index 65c41121..0c21409e 100644
--- a/app/model/userlist.php
+++ b/app/Model/Userlist.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 
 use DB;
 
diff --git a/app/model/viewforum.php b/app/Model/Viewforum.php
similarity index 99%
rename from app/model/viewforum.php
rename to app/Model/Viewforum.php
index 27248135..f4c67fa7 100644
--- a/app/model/viewforum.php
+++ b/app/Model/Viewforum.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 
 use DB;
 
diff --git a/app/model/viewtopic.php b/app/Model/Viextopic.php
similarity index 99%
rename from app/model/viewtopic.php
rename to app/Model/Viextopic.php
index c6003e5d..b756b3bd 100644
--- a/app/model/viewtopic.php
+++ b/app/Model/Viextopic.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\model;
+namespace App\Model;
 
 use DB;
 
diff --git a/app/controller/delete.php b/app/controller/delete.php
index 14319516..6a00ff4a 100644
--- a/app/controller/delete.php
+++ b/app/controller/delete.php
@@ -7,14 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller;
+namespace App\Controller;
 
-class delete
+class Delete
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \app\model\delete();
+        $this->model = new \App\Model\Delete();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/delete.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/post.mo');
     }
diff --git a/app/controller/edit.php b/app/controller/edit.php
index 91dc6662..466b19b9 100644
--- a/app/controller/edit.php
+++ b/app/controller/edit.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller;
+namespace App\Controller;
 
-class edit
+class Edit
 {
     public function __construct()
     {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\edit();
+        $this->model = new \App\Model\edit();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/register.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/prof_reg.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/post.mo');
diff --git a/app/controller/help.php b/app/controller/help.php
index ab6d423a..25b5ff4a 100644
--- a/app/controller/help.php
+++ b/app/controller/help.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller;
+namespace App\Controller;
 
-class help
+class Help
 {
     public function __construct()
     {
diff --git a/app/controller/index.php b/app/controller/index.php
index e3f4cf5d..219f6b72 100644
--- a/app/controller/index.php
+++ b/app/controller/index.php
@@ -7,14 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller;
+namespace App\Controller;
 
-class index
+class Index
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \app\model\index();
+        $this->model = new \App\Model\Index();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->feather->user->language.'/index.mo');
     }
 
diff --git a/app/controller/install.php b/app/controller/install.php
index d3c0b347..177d57b2 100644
--- a/app/controller/install.php
+++ b/app/controller/install.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller;
+namespace App\Controller;
 
-class install
+class Install
 {
     protected $supported_dbs = array('mysql' => 'MySQL',
                                      'pgsql' => 'PostgreSQL',
@@ -26,7 +26,7 @@ class install
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \app\model\install();
+        $this->model = new \App\Model\install();
         $this->available_langs = \FeatherBB\Lister::getLangs();
         $this->feather->view2->setStyle('FeatherBB');
     }
diff --git a/app/controller/login.php b/app/controller/login.php
index 68641f7c..a409a330 100644
--- a/app/controller/login.php
+++ b/app/controller/login.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller;
+namespace App\Controller;
 
-class login
+class Login
 {
     public function __construct()
     {
@@ -20,7 +20,7 @@ public function __construct()
         $this->request = $this->feather->request;
 
 
-        $this->model = new \app\model\login();
+        $this->model = new \App\Model\Login();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/login.mo');
     }
 
diff --git a/app/controller/misc.php b/app/controller/misc.php
index d6c71a97..1916080a 100644
--- a/app/controller/misc.php
+++ b/app/controller/misc.php
@@ -7,14 +7,14 @@
 * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
 */
 
-namespace app\controller;
+namespace App\Controller;
 
-class misc
+class Misc
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \app\model\misc();
+        $this->model = new \App\Model\Misc();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/register.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/misc.mo');
     }
diff --git a/app/controller/moderate.php b/app/controller/moderate.php
index 43d84b61..0993e8be 100644
--- a/app/controller/moderate.php
+++ b/app/controller/moderate.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller;
+namespace App\Controller;
 
-class moderate
+class Moderate
 {
     public function __construct()
     {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\moderate();
+        $this->model = new \App\Model\Moderate();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/topic.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/forum.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/misc.mo');
diff --git a/app/controller/post.php b/app/controller/post.php
index 75ba6187..88190020 100644
--- a/app/controller/post.php
+++ b/app/controller/post.php
@@ -7,14 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller;
+namespace App\Controller;
 
-class post
+class Post
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \app\model\post();
+        $this->model = new \App\Model\Post();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/prof_reg.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/post.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/register.mo');
diff --git a/app/controller/profile.php b/app/controller/profile.php
index 187f33cb..30381a8f 100644
--- a/app/controller/profile.php
+++ b/app/controller/profile.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller;
+namespace App\Controller;
 
-class profile
+class Profile
 {
     public function __construct()
     {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\profile();
+        $this->model = new \App\Model\Profile();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/profile.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/register.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/prof_reg.mo');
diff --git a/app/controller/register.php b/app/controller/register.php
index 7a670f99..a1fc750c 100644
--- a/app/controller/register.php
+++ b/app/controller/register.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller;
+namespace App\Controller;
 
-class register
+class Register
 {
     public function __construct()
     {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\register();
+        $this->model = new \App\Model\Register();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/register.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/prof_reg.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/antispam.mo');
diff --git a/app/controller/search.php b/app/controller/search.php
index 3866dd19..e833f3b0 100644
--- a/app/controller/search.php
+++ b/app/controller/search.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller;
+namespace App\Controller;
 
-class search
+class Search
 {
     public function __construct()
     {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \app\model\search();
+        $this->model = new \App\Model\search();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/userlist.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/search.mo');
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/forum.mo');
diff --git a/app/controller/userlist.php b/app/controller/userlist.php
index fef46842..3954c01c 100644
--- a/app/controller/userlist.php
+++ b/app/controller/userlist.php
@@ -7,14 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller;
+namespace App\Controller;
 
-class userlist
+class Userlist
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \app\model\userlist();
+        $this->model = new \App\Model\Userlist();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/userlist.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/search.mo');
     }
diff --git a/app/controller/viewforum.php b/app/controller/viewforum.php
index a2457107..523b4a83 100644
--- a/app/controller/viewforum.php
+++ b/app/controller/viewforum.php
@@ -7,14 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller;
+namespace App\Controller;
 
-class viewforum
+class Viewforum
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \app\model\viewforum();
+        $this->model = new \App\Model\Viewforum();
         load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->feather->user->language.'/forum.mo');
     }
 
diff --git a/app/controller/viewtopic.php b/app/controller/viewtopic.php
index abf5180c..4ba812cd 100644
--- a/app/controller/viewtopic.php
+++ b/app/controller/viewtopic.php
@@ -7,14 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace app\controller;
+namespace App\Controller;
 
-class viewtopic
+class Viewtopic
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \app\model\viewtopic();
+        $this->model = new \App\Model\Viewtopic();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/topic.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/post.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/bbeditor.mo');
diff --git a/include/functions.php b/include/functions.php
index 91e5784c..3cd0fd7c 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -16,7 +16,7 @@ function get_admin_ids()
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
     if (!$feather->cache->isCached('admin_ids')) {
-        $feather->cache->store('admin_ids', \app\model\cache::get_admin_ids());
+        $feather->cache->store('admin_ids', \App\Model\Cache::get_admin_ids());
     }
 
     return $feather->cache->retrieve('admin_ids');
@@ -350,12 +350,12 @@ function censor_words($text)
     $feather = \Slim\Slim::getInstance();
 
     if (!$feather->cache->isCached('search_for')) {
-        $feather->cache->store('search_for', \app\model\cache::get_censoring('search_for'));
+        $feather->cache->store('search_for', \App\Model\Cache::get_censoring('search_for'));
         $search_for = $feather->cache->retrieve('search_for');
     }
 
     if (!$feather->cache->isCached('replace_with')) {
-        $feather->cache->store('replace_with', \app\model\cache::get_censoring('replace_with'));
+        $feather->cache->store('replace_with', \App\Model\Cache::get_censoring('replace_with'));
         $replace_with = $feather->cache->retrieve('replace_with');
     }
 
diff --git a/include/routes.php b/include/routes.php
index a530ed7b..617db5b9 100644
--- a/include/routes.php
+++ b/include/routes.php
@@ -8,20 +8,20 @@
  */
 
 // Index
-$feather->get('/', '\app\controller\index:display');
+$feather->get('/', '\App\Controller\index:display');
 
 // Viewforum
-$feather->get('/forum/:id(/:name)(/page/:page)(/)', '\app\controller\viewforum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
+$feather->get('/forum/:id(/:name)(/page/:page)(/)', '\App\Controller\viewforum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
 
 // Viewtopic
 $feather->group('/topic', function() use ($feather) {
-    $feather->get('/:id(/:name)(/page/:page)(/)', '\app\controller\viewtopic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
-    $feather->get('/:id/action/:action(/)', '\app\controller\viewtopic:action')->conditions(array('id' => '[0-9]+'));
+    $feather->get('/:id(/:name)(/page/:page)(/)', '\App\Controller\viewtopic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
+    $feather->get('/:id/action/:action(/)', '\App\Controller\viewtopic:action')->conditions(array('id' => '[0-9]+'));
 });
-$feather->get('/post/:pid(/)', '\app\controller\viewtopic:viewpost')->conditions(array('pid' => '[0-9]+'));
+$feather->get('/post/:pid(/)', '\App\Controller\viewtopic:viewpost')->conditions(array('pid' => '[0-9]+'));
 
 // Userlist
-$feather->get('/userlist(/)', '\app\controller\userlist:display');
+$feather->get('/userlist(/)', '\App\Controller\userlist:display');
 
 // Auth routes
 $feather->group('/auth', function() use ($feather) {
@@ -32,54 +32,54 @@
             $this->feather->url->redirect($this->feather->url->get('/auth/login'));
         }
     });
-    $feather->map('/login(/)', '\app\controller\auth:login')->via('GET', 'POST');
-    $feather->map('/forget(/)', '\app\controller\auth:forget')->via('GET', 'POST');
-    $feather->get('/logout/token/:token(/)', '\app\controller\auth:logout');
+    $feather->map('/login(/)', '\App\Controller\auth:login')->via('GET', 'POST');
+    $feather->map('/forget(/)', '\App\Controller\auth:forget')->via('GET', 'POST');
+    $feather->get('/logout/token/:token(/)', '\App\Controller\auth:logout');
 });
 
 // Register routes
 $feather->group('/register', function() use ($feather) {
-    $feather->get('(/)', '\app\controller\register:rules');
-    $feather->map('/agree(/)', '\app\controller\register:display')->via('GET', 'POST');
-    $feather->get('/cancel(/)', '\app\controller\register:cancel');
+    $feather->get('(/)', '\App\Controller\register:rules');
+    $feather->map('/agree(/)', '\App\Controller\register:display')->via('GET', 'POST');
+    $feather->get('/cancel(/)', '\App\Controller\register:cancel');
 });
 
 // Post routes
 $feather->group('/post', function() use ($feather) {
-    $feather->map('/new-topic/:fid(/)', '\app\controller\post:newpost')->conditions(array('fid' => '[0-9]+'))->via('GET', 'POST');
-    $feather->map('/reply/:tid(/)(/quote/:qid)(/)', '\app\controller\post:newreply')->conditions(array('tid' => '[0-9]+', 'qid' => '[0-9]+'))->via('GET', 'POST');
+    $feather->map('/new-topic/:fid(/)', '\App\Controller\post:newpost')->conditions(array('fid' => '[0-9]+'))->via('GET', 'POST');
+    $feather->map('/reply/:tid(/)(/quote/:qid)(/)', '\App\Controller\post:newreply')->conditions(array('tid' => '[0-9]+', 'qid' => '[0-9]+'))->via('GET', 'POST');
 });
 
 // Edit
-$feather->map('/edit/:id(/)', '\app\controller\edit:editpost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+$feather->map('/edit/:id(/)', '\App\Controller\edit:editpost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
 
 // Delete
-$feather->map('/delete/:id(/)', '\app\controller\delete:deletepost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+$feather->map('/delete/:id(/)', '\App\Controller\delete:deletepost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
 
 // Search routes
 $feather->group('/search', function() use ($feather) {
-    $feather->get('(/)', '\app\controller\search:display');
-    $feather->get('/show/:show(/)', '\app\controller\search:quicksearches');
+    $feather->get('(/)', '\App\Controller\search:display');
+    $feather->get('/show/:show(/)', '\App\Controller\search:quicksearches');
 });
 
 // Help
-$feather->get('/help(/)', '\app\controller\help:display');
+$feather->get('/help(/)', '\App\Controller\help:display');
 
 // Misc
-$feather->get('/rules(/)', '\app\controller\misc:rules');
-$feather->get('/mark-read(/)', '\app\controller\misc:markread');
-$feather->get('/mark-forum-read/:id(/)', '\app\controller\misc:markforumread')->conditions(array('id' => '[0-9]+'));
-$feather->map('/email/:id(/)', '\app\controller\misc:email')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-$feather->map('/report/:id(/)', '\app\controller\misc:report')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-$feather->get('/subscribe/forum/:id(/)', '\app\controller\misc:subscribeforum')->conditions(array('id' => '[0-9]+'));
-$feather->get('/unsubscribe/forum/:id(/)', '\app\controller\misc:unsubscribeforum')->conditions(array('id' => '[0-9]+'));
-$feather->get('/subscribe/topic/:id(/)', '\app\controller\misc:subscribetopic')->conditions(array('id' => '[0-9]+'));
-$feather->get('/unsubscribe/topic/:id(/)', '\app\controller\misc:unsubscribetopic')->conditions(array('id' => '[0-9]+'));
+$feather->get('/rules(/)', '\App\Controller\misc:rules');
+$feather->get('/mark-read(/)', '\App\Controller\misc:markread');
+$feather->get('/mark-forum-read/:id(/)', '\App\Controller\misc:markforumread')->conditions(array('id' => '[0-9]+'));
+$feather->map('/email/:id(/)', '\App\Controller\misc:email')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+$feather->map('/report/:id(/)', '\App\Controller\misc:report')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+$feather->get('/subscribe/forum/:id(/)', '\App\Controller\misc:subscribeforum')->conditions(array('id' => '[0-9]+'));
+$feather->get('/unsubscribe/forum/:id(/)', '\App\Controller\misc:unsubscribeforum')->conditions(array('id' => '[0-9]+'));
+$feather->get('/subscribe/topic/:id(/)', '\App\Controller\misc:subscribetopic')->conditions(array('id' => '[0-9]+'));
+$feather->get('/unsubscribe/topic/:id(/)', '\App\Controller\misc:unsubscribetopic')->conditions(array('id' => '[0-9]+'));
 
 // Profile routes
 $feather->group('/user', function() use ($feather) {
-    $feather->map('/:id(/section/:section)(/)', '\app\controller\profile:display')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-    $feather->map('/:id(/action/:action)(/)', '\app\controller\profile:action')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+    $feather->map('/:id(/section/:section)(/)', '\App\Controller\profile:display')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+    $feather->map('/:id(/action/:action)(/)', '\App\Controller\profile:action')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
 });
 
 /**
@@ -93,12 +93,12 @@
 
 // Moderate routes
 $feather->group('/moderate', $isAdmmod, function() use ($feather) {
-    $feather->get('/forum/:id(/:name)(/page/:page)(/)', '\app\controller\moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
-    $feather->get('/get-host/post/:pid(/)', '\app\controller\moderate:gethostpost')->conditions(array('pid' => '[0-9]+'));
-    $feather->get('/get-host/ip/:ip(/)', '\app\controller\moderate:gethostip');
-    $feather->map('/topic/:id/forum/:fid/action/:action(/param/:param)(/)', '\app\controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST');
-    $feather->map('/topic/:id/forum/:fid/action/:action(/page/:param)(/)', '\app\controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST');
-    $feather->post('/forum/:fid(/page/:page)(/)', '\app\controller\moderate:dealposts')->conditions(array('fid' => '[0-9]+', 'page' => '[0-9]+'));
+    $feather->get('/forum/:id(/:name)(/page/:page)(/)', '\App\Controller\moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
+    $feather->get('/get-host/post/:pid(/)', '\App\Controller\moderate:gethostpost')->conditions(array('pid' => '[0-9]+'));
+    $feather->get('/get-host/ip/:ip(/)', '\App\Controller\moderate:gethostip');
+    $feather->map('/topic/:id/forum/:fid/action/:action(/param/:param)(/)', '\App\Controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST');
+    $feather->map('/topic/:id/forum/:fid/action/:action(/page/:param)(/)', '\App\Controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST');
+    $feather->post('/forum/:fid(/page/:page)(/)', '\App\Controller\moderate:dealposts')->conditions(array('fid' => '[0-9]+', 'page' => '[0-9]+'));
 });
 
 // Admin routes
@@ -114,76 +114,76 @@
     };
 
     // Admin index
-    $feather->get('(/action/:action)(/)', '\app\controller\admin\index:display');
-    $feather->get('/index(/)', '\app\controller\admin\index:display');
+    $feather->get('(/action/:action)(/)', '\App\Controller\Admin\index:display');
+    $feather->get('/index(/)', '\App\Controller\Admin\index:display');
 
     // Admin bans
     $feather->group('/bans', function() use ($feather) {
-        $feather->get('(/)', '\app\controller\admin\bans:display');
-        $feather->get('/delete/:id(/)', '\app\controller\admin\bans:delete')->conditions(array('id' => '[0-9]+'));
-        $feather->map('/edit/:id(/)', '\app\controller\admin\bans:edit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-        $feather->map('/add(/:id)(/)', '\app\controller\admin\bans:add')->via('GET', 'POST');
+        $feather->get('(/)', '\App\Controller\Admin\Bans:display');
+        $feather->get('/delete/:id(/)', '\App\Controller\Admin\Bans:delete')->conditions(array('id' => '[0-9]+'));
+        $feather->map('/edit/:id(/)', '\App\Controller\Admin\Bans:edit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+        $feather->map('/add(/:id)(/)', '\App\Controller\Admin\Bans:add')->via('GET', 'POST');
     });
 
     // Admin options
-    $feather->map('/options(/)', $isAdmin, '\app\controller\admin\options:display')->via('GET', 'POST');
+    $feather->map('/options(/)', $isAdmin, '\App\Controller\Admin\options:display')->via('GET', 'POST');
 
     // Admin categories
     $feather->group('/categories', $isAdmin, function() use ($feather) {
-        $feather->get('(/)', '\app\controller\admin\categories:display');
-        $feather->post('/add(/)', '\app\controller\admin\categories:add_category');
-        $feather->post('/edit(/)', '\app\controller\admin\categories:edit_categories');
-        $feather->post('/delete(/)', '\app\controller\admin\categories:delete_category');
+        $feather->get('(/)', '\App\Controller\Admin\categories:display');
+        $feather->post('/add(/)', '\App\Controller\Admin\categories:add_category');
+        $feather->post('/edit(/)', '\App\Controller\Admin\categories:edit_categories');
+        $feather->post('/delete(/)', '\App\Controller\Admin\categories:delete_category');
     });
 
     // Admin censoring
-    $feather->map('/censoring(/)', $isAdmin, '\app\controller\admin\censoring:display')->via('GET', 'POST');
+    $feather->map('/censoring(/)', $isAdmin, '\App\Controller\Admin\censoring:display')->via('GET', 'POST');
 
     // Admin reports
-    $feather->map('/reports(/)', '\app\controller\admin\reports:display')->via('GET', 'POST');
+    $feather->map('/reports(/)', '\App\Controller\Admin\reports:display')->via('GET', 'POST');
 
     // Admin permissions
-    $feather->map('/permissions(/)', $isAdmin, '\app\controller\admin\permissions:display')->via('GET', 'POST');
+    $feather->map('/permissions(/)', $isAdmin, '\App\Controller\Admin\permissions:display')->via('GET', 'POST');
 
     // Admin statistics
-    $feather->get('/statistics(/)', '\app\controller\admin\statistics:display');
-    $feather->get('/phpinfo(/)', '\app\controller\admin\statistics:phpinfo');
+    $feather->get('/statistics(/)', '\App\Controller\Admin\statistics:display');
+    $feather->get('/phpinfo(/)', '\App\Controller\Admin\statistics:phpinfo');
 
     // Admin forums
     $feather->group('/forums', $isAdmin, function() use ($feather) {
-        $feather->map('(/)', '\app\controller\admin\forums:display')->via('GET', 'POST');
-        $feather->post('/add(/)', '\app\controller\admin\forums:add_forum');
-        $feather->map('/edit/:id(/)', '\app\controller\admin\forums:edit_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-        $feather->map('/delete/:id(/)', '\app\controller\admin\forums:delete_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+        $feather->map('(/)', '\App\Controller\Admin\forums:display')->via('GET', 'POST');
+        $feather->post('/add(/)', '\App\Controller\Admin\forums:add_forum');
+        $feather->map('/edit/:id(/)', '\App\Controller\Admin\forums:edit_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+        $feather->map('/delete/:id(/)', '\App\Controller\Admin\forums:delete_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
     });
 
     // Admin groups
     $feather->group('/groups', $isAdmin, function() use ($feather) {
-        $feather->map('(/)', '\app\controller\admin\groups:display')->via('GET', 'POST');
-        $feather->map('/add(/)', '\app\controller\admin\groups:addedit')->via('GET', 'POST');
-        $feather->map('/edit/:id(/)', '\app\controller\admin\groups:addedit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-        $feather->map('/delete/:id(/)', '\app\controller\admin\groups:delete')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+        $feather->map('(/)', '\App\Controller\Admin\groups:display')->via('GET', 'POST');
+        $feather->map('/add(/)', '\App\Controller\Admin\groups:addedit')->via('GET', 'POST');
+        $feather->map('/edit/:id(/)', '\App\Controller\Admin\groups:addedit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+        $feather->map('/delete/:id(/)', '\App\Controller\Admin\groups:delete')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
     });
 
     // Admin plugins
     $feather->group('/plugins', function() use ($feather) {
-        $feather->map('/(/)', '\app\controller\admin\plugins:index')->via('GET', 'POST');
-        $feather->map('/activate(/)', '\app\controller\admin\plugins:activate')->via('GET');
-        $feather->map('/deactivate(/)', '\app\controller\admin\plugins:deactivate')->via('GET');
-        // $feather->map('/loader(/)', '\app\controller\admin\plugins:display')->via('GET', 'POST');
+        $feather->map('/(/)', '\App\Controller\Admin\plugins:index')->via('GET', 'POST');
+        $feather->map('/activate(/)', '\App\Controller\Admin\plugins:activate')->via('GET');
+        $feather->map('/deactivate(/)', '\App\Controller\Admin\plugins:deactivate')->via('GET');
+        // $feather->map('/loader(/)', '\App\Controller\Admin\plugins:display')->via('GET', 'POST');
     });
 
     // Admin maintenance
-    $feather->map('/maintenance(/)', $isAdmin, '\app\controller\admin\maintenance:display')->via('GET', 'POST');
+    $feather->map('/maintenance(/)', $isAdmin, '\App\Controller\Admin\maintenance:display')->via('GET', 'POST');
 
     // Admin parser
-    $feather->map('/parser(/)', $isAdmin, '\app\controller\admin\parser:display')->via('GET', 'POST');
+    $feather->map('/parser(/)', $isAdmin, '\App\Controller\Admin\parser:display')->via('GET', 'POST');
 
     // Admin users
     $feather->group('/users', function() use ($feather) {
-        $feather->map('(/)', '\app\controller\admin\users:display')->via('GET', 'POST');
-        $feather->get('/ip-stats/id/:id(/)', '\app\controller\admin\users:ipstats')->conditions(array('id' => '[0-9]+'));
-        $feather->get('/show-users/ip/:ip(/)', '\app\controller\admin\users:showusers');
+        $feather->map('(/)', '\App\Controller\Admin\users:display')->via('GET', 'POST');
+        $feather->get('/ip-stats/id/:id(/)', '\App\Controller\Admin\users:ipstats')->conditions(array('id' => '[0-9]+'));
+        $feather->get('/show-users/ip/:ip(/)', '\App\Controller\Admin\users:showusers');
     });
 
 });

From 0847cee497967382722f9777b44220323fed047f Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 31 Aug 2015 15:48:42 +0200
Subject: [PATCH 285/353] Fixes & move more files into /app folder

---
 .gitignore                                    |   4 +-
 app/Controller/Admin/Parser.php               |  10 +-
 .../delete.php => Controller/Delete.php}      |   2 +-
 .../edit.php => Controller/Edit.php}          |   2 +-
 .../help.php => Controller/Help.php}          |   0
 .../index.php => Controller/Index.php}        |   0
 .../install.php => Controller/Install.php}    |   0
 .../login.php => Controller/Login.php}        |   0
 .../misc.php => Controller/Misc.php}          |   0
 .../moderate.php => Controller/Moderate.php}  |   0
 .../post.php => Controller/Post.php}          |   0
 .../profile.php => Controller/Profile.php}    |  14 +-
 .../register.php => Controller/Register.php}  |   0
 .../search.php => Controller/Search.php}      |   2 +-
 .../userlist.php => Controller/Userlist.php}  |   0
 .../Viewforum.php}                            |   0
 app/Controller/Viewtopic.php                  | 149 ++++++++++++++++++
 .../Viextopic.php}                            |   0
 app/Core/Cache.php                            |   2 +-
 app/Core/Core.php                             |  14 +-
 app/Core/Email.php                            |   2 +-
 app/Core/Lister.php                           |   4 +-
 {include => app/Helpers}/bbcd_compile.php     |   4 +-
 {include => app/Helpers}/bbcd_source.php      |   0
 {include => app/Helpers}/functions.php        |   4 +-
 {include => app/Helpers}/l10n.php             |   0
 {include => app/Helpers}/parser.php           |   8 +-
 {include => app/Helpers}/srand.php            |   0
 .../Helpers}/utf8/mbstring/core.php           |   0
 {include => app/Helpers}/utf8/native/core.php |   0
 {include => app/Helpers}/utf8/ord.php         |   0
 .../Helpers}/utf8/str_ireplace.php            |   0
 {include => app/Helpers}/utf8/str_pad.php     |   0
 {include => app/Helpers}/utf8/str_split.php   |   0
 {include => app/Helpers}/utf8/strcasecmp.php  |   0
 {include => app/Helpers}/utf8/strcspn.php     |   0
 {include => app/Helpers}/utf8/stristr.php     |   0
 {include => app/Helpers}/utf8/strrev.php      |   0
 {include => app/Helpers}/utf8/strspn.php      |   0
 .../Helpers}/utf8/substr_replace.php          |   0
 {include => app/Helpers}/utf8/trim.php        |   0
 {include => app/Helpers}/utf8/ucfirst.php     |   0
 {include => app/Helpers}/utf8/ucwords.php     |   0
 {include => app/Helpers}/utf8/utf8.php        |   0
 {include => app/Helpers}/utf8/utils/ascii.php |   0
 {include => app/Helpers}/utf8/utils/bad.php   |   0
 .../Helpers}/utf8/utils/patterns.php          |   0
 .../Helpers}/utf8/utils/position.php          |   0
 .../Helpers}/utf8/utils/specials.php          |   0
 .../Helpers}/utf8/utils/unicode.php           |   0
 .../Helpers}/utf8/utils/validation.php        |   0
 app/Model/Admin/Permissions.php               |   2 +-
 app/Model/Edit.php                            |   4 +-
 app/Model/Moderate.php                        |   2 +-
 app/Model/Post.php                            |   6 +-
 app/Model/Profile.php                         |   2 +-
 app/Model/{Viextopic.php => Viewtopic.php}    |   0
 {include => app}/routes.php                   |   0
 cache/.htaccess                               |   3 -
 extern.php                                    |  10 +-
 index.php                                     |   8 +-
 style/themes/FeatherBB/view/help.php          |   2 +-
 style/themes/FeatherBB/view/post.php          |   2 +-
 style/themes/MyFeatherBB/view/help.php        |   2 +-
 style/themes/MyFeatherBB/view/post.php        |   2 +-
 view/help.php                                 |   2 +-
 view/post.php                                 |   2 +-
 67 files changed, 207 insertions(+), 63 deletions(-)
 rename app/{controller/delete.php => Controller/Delete.php} (97%)
 rename app/{controller/edit.php => Controller/Edit.php} (98%)
 rename app/{controller/help.php => Controller/Help.php} (100%)
 rename app/{controller/index.php => Controller/Index.php} (100%)
 rename app/{controller/install.php => Controller/Install.php} (100%)
 rename app/{controller/login.php => Controller/Login.php} (100%)
 rename app/{controller/misc.php => Controller/Misc.php} (100%)
 rename app/{controller/moderate.php => Controller/Moderate.php} (100%)
 rename app/{controller/post.php => Controller/Post.php} (100%)
 rename app/{controller/profile.php => Controller/Profile.php} (96%)
 rename app/{controller/register.php => Controller/Register.php} (100%)
 rename app/{controller/search.php => Controller/Search.php} (97%)
 rename app/{controller/userlist.php => Controller/Userlist.php} (100%)
 rename app/{controller/viewforum.php => Controller/Viewforum.php} (100%)
 create mode 100644 app/Controller/Viewtopic.php
 rename app/{controller/viewtopic.php => Controller/Viextopic.php} (100%)
 rename {include => app/Helpers}/bbcd_compile.php (99%)
 rename {include => app/Helpers}/bbcd_source.php (100%)
 rename {include => app/Helpers}/functions.php (99%)
 rename {include => app/Helpers}/l10n.php (100%)
 rename {include => app/Helpers}/parser.php (99%)
 rename {include => app/Helpers}/srand.php (100%)
 rename {include => app/Helpers}/utf8/mbstring/core.php (100%)
 rename {include => app/Helpers}/utf8/native/core.php (100%)
 rename {include => app/Helpers}/utf8/ord.php (100%)
 rename {include => app/Helpers}/utf8/str_ireplace.php (100%)
 rename {include => app/Helpers}/utf8/str_pad.php (100%)
 rename {include => app/Helpers}/utf8/str_split.php (100%)
 rename {include => app/Helpers}/utf8/strcasecmp.php (100%)
 rename {include => app/Helpers}/utf8/strcspn.php (100%)
 rename {include => app/Helpers}/utf8/stristr.php (100%)
 rename {include => app/Helpers}/utf8/strrev.php (100%)
 rename {include => app/Helpers}/utf8/strspn.php (100%)
 rename {include => app/Helpers}/utf8/substr_replace.php (100%)
 rename {include => app/Helpers}/utf8/trim.php (100%)
 rename {include => app/Helpers}/utf8/ucfirst.php (100%)
 rename {include => app/Helpers}/utf8/ucwords.php (100%)
 rename {include => app/Helpers}/utf8/utf8.php (100%)
 rename {include => app/Helpers}/utf8/utils/ascii.php (100%)
 rename {include => app/Helpers}/utf8/utils/bad.php (100%)
 rename {include => app/Helpers}/utf8/utils/patterns.php (100%)
 rename {include => app/Helpers}/utf8/utils/position.php (100%)
 rename {include => app/Helpers}/utf8/utils/specials.php (100%)
 rename {include => app/Helpers}/utf8/utils/unicode.php (100%)
 rename {include => app/Helpers}/utf8/utils/validation.php (100%)
 rename app/Model/{Viextopic.php => Viewtopic.php} (100%)
 rename {include => app}/routes.php (100%)
 delete mode 100644 cache/.htaccess

diff --git a/.gitignore b/.gitignore
index 40221181..4728b64b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-cache/
-include/config.php
+app/cache/
+app/config.php
 .idea/
 nbproject/
 lang/French
diff --git a/app/Controller/Admin/Parser.php b/app/Controller/Admin/Parser.php
index 1ceea1e9..aafe88da 100644
--- a/app/Controller/Admin/Parser.php
+++ b/app/Controller/Admin/Parser.php
@@ -35,16 +35,16 @@ public function display()
         require FEATHER_ROOT . 'app/lang/' . $this->user->language . '/admin/parser.php';
 
         // This is where the parser data lives and breathes.
-        $cache_file = FEATHER_ROOT.'cache/cache_parser_data.php';
+        $cache_file = FEATHER_ROOT.'app/cache/cache_parser_data.php';
 
         // If RESET button pushed, or no cache file, re-compile master bbcode source file.
         if ($this->request->post('reset') || !file_exists($cache_file)) {
-            require_once(FEATHER_ROOT.'include/bbcd_source.php');
-            require_once(FEATHER_ROOT.'include/bbcd_compile.php');
+            require_once(FEATHER_ROOT.'app/Helpers/bbcd_source.php');
+            require_once(FEATHER_ROOT.'app/Helpers/bbcd_compile.php');
             redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['reset_success']);
         }
 
-        // Load the current BBCode $pd array from include/parser_data.inc.php.
+        // Load the current BBCode $pd array from app/Helpers/parser_data.inc.php.
         require_once($cache_file);            // Fetch $pd compiled global regex data.
         $bbcd = $pd['bbcd'];                // Local scratch copy of $bbcd.
         $smilies = $pd['smilies'];            // Local scratch copy of $smilies.
@@ -198,7 +198,7 @@ public function display()
                 }
             }
 
-            require_once('include/bbcd_compile.php'); // Compile $bbcd and save into $pd['bbcd']
+            require_once('app/Helpers/bbcd_compile.php'); // Compile $bbcd and save into $pd['bbcd']
             redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['save_success']);
         }
 
diff --git a/app/controller/delete.php b/app/Controller/Delete.php
similarity index 97%
rename from app/controller/delete.php
rename to app/Controller/Delete.php
index 6a00ff4a..643dd871 100644
--- a/app/controller/delete.php
+++ b/app/Controller/Delete.php
@@ -57,7 +57,7 @@ public function deletepost($id)
             $this->model->handle_deletion($is_topic_post, $id, $cur_post['tid'], $cur_post['fid']);
         }
 
-        require $this->feather->forum_env['FEATHER_ROOT'].'include/parser.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'app/Helpers/parser.php';
         $cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
 
         $this->feather->view2->setPageInfo(array(
diff --git a/app/controller/edit.php b/app/Controller/Edit.php
similarity index 98%
rename from app/controller/edit.php
rename to app/Controller/Edit.php
index 466b19b9..59c38a50 100644
--- a/app/controller/edit.php
+++ b/app/Controller/Edit.php
@@ -81,7 +81,7 @@ public function editpost($id)
         }
 
         if ($this->request->post('preview')) {
-            require_once FEATHER_ROOT.'include/parser.php';
+            require_once FEATHER_ROOT.'app/Helpers/parser.php';
             $preview_message = parse_message($post['message'], $post['hide_smilies']);
         } else {
             $preview_message = '';
diff --git a/app/controller/help.php b/app/Controller/Help.php
similarity index 100%
rename from app/controller/help.php
rename to app/Controller/Help.php
diff --git a/app/controller/index.php b/app/Controller/Index.php
similarity index 100%
rename from app/controller/index.php
rename to app/Controller/Index.php
diff --git a/app/controller/install.php b/app/Controller/Install.php
similarity index 100%
rename from app/controller/install.php
rename to app/Controller/Install.php
diff --git a/app/controller/login.php b/app/Controller/Login.php
similarity index 100%
rename from app/controller/login.php
rename to app/Controller/Login.php
diff --git a/app/controller/misc.php b/app/Controller/Misc.php
similarity index 100%
rename from app/controller/misc.php
rename to app/Controller/Misc.php
diff --git a/app/controller/moderate.php b/app/Controller/Moderate.php
similarity index 100%
rename from app/controller/moderate.php
rename to app/Controller/Moderate.php
diff --git a/app/controller/post.php b/app/Controller/Post.php
similarity index 100%
rename from app/controller/post.php
rename to app/Controller/Post.php
diff --git a/app/controller/profile.php b/app/Controller/Profile.php
similarity index 96%
rename from app/controller/profile.php
rename to app/Controller/Profile.php
index 30381a8f..11dca00d 100644
--- a/app/controller/profile.php
+++ b/app/Controller/Profile.php
@@ -34,9 +34,9 @@ public function display($id, $section = null)
         global $pd, $forum_time_formats, $forum_date_formats;
 
         // Include UTF-8 function
-        require FEATHER_ROOT.'include/utf8/substr_replace.php';
-        require FEATHER_ROOT.'include/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
-        require FEATHER_ROOT.'include/utf8/strcasecmp.php';
+        require FEATHER_ROOT.'app/Helpers/utf8/substr_replace.php';
+        require FEATHER_ROOT.'app/Helpers/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
+        require FEATHER_ROOT.'app/Helpers/utf8/strcasecmp.php';
 
         if ($this->request->post('update_group_membership')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
@@ -93,7 +93,7 @@ public function display($id, $section = null)
         $user = $this->model->get_user_info($id);
 
         if ($user['signature'] != '') {
-            require FEATHER_ROOT.'include/parser.php';
+            require FEATHER_ROOT.'app/Helpers/parser.php';
             $parsed_signature = parse_signature($user['signature']);
         }
 
@@ -244,9 +244,9 @@ public function display($id, $section = null)
     public function action($id, $action)
     {
         // Include UTF-8 function
-        require FEATHER_ROOT.'include/utf8/substr_replace.php';
-        require FEATHER_ROOT.'include/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
-        require FEATHER_ROOT.'include/utf8/strcasecmp.php';
+        require FEATHER_ROOT.'app/Helpers/utf8/substr_replace.php';
+        require FEATHER_ROOT.'app/Helpers/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
+        require FEATHER_ROOT.'app/Helpers/utf8/strcasecmp.php';
 
         if ($action != 'change_pass' || !$this->request->get('key')) {
             if ($this->user->g_read_board == '0') {
diff --git a/app/controller/register.php b/app/Controller/Register.php
similarity index 100%
rename from app/controller/register.php
rename to app/Controller/Register.php
diff --git a/app/controller/search.php b/app/Controller/Search.php
similarity index 97%
rename from app/controller/search.php
rename to app/Controller/Search.php
index e833f3b0..64bf41fd 100644
--- a/app/controller/search.php
+++ b/app/Controller/Search.php
@@ -47,7 +47,7 @@ public function display()
                 if (isset($search['is_result'])) {
 
                     if ($search['show_as'] == 'posts') {
-                        require FEATHER_ROOT.'include/parser.php';
+                        require FEATHER_ROOT.'app/Helpers/parser.php';
                     }
 
                     $this->feather->view2->setPageInfo(array(
diff --git a/app/controller/userlist.php b/app/Controller/Userlist.php
similarity index 100%
rename from app/controller/userlist.php
rename to app/Controller/Userlist.php
diff --git a/app/controller/viewforum.php b/app/Controller/Viewforum.php
similarity index 100%
rename from app/controller/viewforum.php
rename to app/Controller/Viewforum.php
diff --git a/app/Controller/Viewtopic.php b/app/Controller/Viewtopic.php
new file mode 100644
index 00000000..dca95c9b
--- /dev/null
+++ b/app/Controller/Viewtopic.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace App\Controller;
+
+class Viewtopic
+{
+    public function __construct()
+    {
+        $this->feather = \Slim\Slim::getInstance();
+        $this->model = new \App\Model\Viewtopic();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/topic.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/post.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/bbeditor.mo');
+    }
+
+    public function display($id = null, $name = null, $page = null, $pid = null)
+    {
+        global $pd;
+
+        if ($this->feather->user->g_read_board == '0') {
+            throw new \FeatherBB\Error(__('No view'), 403);
+        }
+
+        // Antispam feature
+        require $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/antispam.php';
+        $index_questions = rand(0, count($lang_antispam_questions)-1);
+
+        // Fetch some informations about the topic
+        $cur_topic = $this->model->get_info_topic($id);
+
+        // Sort out who the moderators are and if we are currently a moderator (or an admin)
+        $mods_array = ($cur_topic['moderators'] != '') ? unserialize($cur_topic['moderators']) : array();
+        $is_admmod = ($this->feather->user->g_id == FEATHER_ADMIN || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
+        if ($is_admmod) {
+            $admin_ids = get_admin_ids();
+        }
+
+        // Can we or can we not post replies?
+        $post_link = $this->model->get_post_link($id, $cur_topic['closed'], $cur_topic['post_replies'], $is_admmod);
+
+        // Add/update this topic in our list of tracked topics
+        if (!$this->feather->user->is_guest) {
+            $tracked_topics = get_tracked_topics();
+            $tracked_topics['topics'][$id] = time();
+            set_tracked_topics($tracked_topics);
+        }
+
+        // Determine the post offset (based on $_GET['p'])
+        $num_pages = ceil(($cur_topic['num_replies'] + 1) / $this->feather->user->disp_posts);
+
+        $p = (!isset($page) || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
+        $start_from = $this->feather->user->disp_posts * ($p - 1);
+
+        $url_topic = $this->feather->url->url_friendly($cur_topic['subject']);
+        $url_forum = $this->feather->url->url_friendly($cur_topic['forum_name']);
+
+        // Generate paging links
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate($num_pages, $p, 'topic/'.$id.'/'.$url_topic.'/#');
+
+        if ($this->feather->forum_settings['o_censoring'] == '1') {
+            $cur_topic['subject'] = censor_words($cur_topic['subject']);
+        }
+
+        $quickpost = $this->model->is_quickpost($cur_topic['post_replies'], $cur_topic['closed'], $is_admmod);
+        $subscraction = $this->model->get_subscraction($cur_topic['is_subscribed'], $id);
+
+        require $this->feather->forum_env['FEATHER_ROOT'].'app/Helpers/parser.php';
+        $lang_bbeditor = array(
+            'btnBold' => __('btnBold'),
+            'btnItalic' => __('btnItalic'),
+            'btnUnderline' => __('btnUnderline'),
+            'btnColor' => __('btnColor'),
+            'btnLeft' => __('btnLeft'),
+            'btnRight' => __('btnRight'),
+            'btnJustify' => __('btnJustify'),
+            'btnCenter' => __('btnCenter'),
+            'btnLink' => __('btnLink'),
+            'btnPicture' => __('btnPicture'),
+            'btnList' => __('btnList'),
+            'btnQuote' => __('btnQuote'),
+            'btnCode' => __('btnCode'),
+            'promptImage' => __('promptImage'),
+            'promptUrl' => __('promptUrl'),
+            'promptQuote' => __('promptQuote')
+        );
+
+        $this->feather->view2->addAsset('canonical', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/'));
+        if ($num_pages > 1) {
+            if ($p > 1) {
+                $this->feather->view2->addAsset('prev', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
+            }
+            if ($p < $num_pages) {
+                $this->feather->view2->addAsset('next', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
+            }
+        }
+
+        if ($this->feather->forum_settings['o_feed_type'] == '1') {
+            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=rss', array('title' => __('RSS forum feed')));
+        } elseif ($this->feather->forum_settings['o_feed_type'] == '2') {
+            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=atom', array('title' => __('Atom forum feed')));
+        }
+
+        $this->feather->view2->setPageInfo(array(
+            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), $this->feather->utils->escape($cur_topic['forum_name']), $this->feather->utils->escape($cur_topic['subject'])),
+            'active_page' => 'viewtopic',
+            'page_number'  =>  $p,
+            'paging_links'  =>  $paging_links,
+            'is_indexed' => true,
+            'id' => $id,
+            'pid' => $pid,
+            'tid' => $id,
+            'fid' => $cur_topic['forum_id'],
+            'post_data' => $this->model->print_posts($id, $start_from, $cur_topic, $is_admmod),
+            'cur_topic'    =>    $cur_topic,
+            'subscraction'    =>    $subscraction,
+            'post_link' => $post_link,
+            'start_from' => $start_from,
+            'lang_antispam' => $lang_antispam,
+            'quickpost'        =>    $quickpost,
+            'index_questions'        =>    $index_questions,
+            'lang_antispam_questions'        =>    $lang_antispam_questions,
+            'lang_bbeditor'    =>    $lang_bbeditor,
+            'url_forum'        =>    $url_forum,
+            'url_topic'        =>    $url_topic,
+        ))->addTemplate('viewtopic.php')->display();
+
+        // Increment "num_views" for topic
+        $this->model->increment_views($id);
+    }
+
+    public function viewpost($pid)
+    {
+        $post = $this->model->redirect_to_post($pid);
+
+        return $this->display($post['topic_id'], null, $post['get_p'], $pid);
+    }
+
+    public function action($id, $action)
+    {
+        $this->model->handle_actions($id, $action);
+    }
+}
diff --git a/app/controller/viewtopic.php b/app/Controller/Viextopic.php
similarity index 100%
rename from app/controller/viewtopic.php
rename to app/Controller/Viextopic.php
diff --git a/app/Core/Cache.php b/app/Core/Cache.php
index 98647dc7..3843e430 100644
--- a/app/Core/Cache.php
+++ b/app/Core/Cache.php
@@ -54,7 +54,7 @@ public function __construct($config = array())
     protected static function getDefaultSettings()
     {
         return array('name' => 'default',
-        'path' => 'cache/',
+        'path' => 'app/cache/',
         'extension' => '.cache');
     }
 
diff --git a/app/Core/Core.php b/app/Core/Core.php
index ab78dc95..fc198e7e 100644
--- a/app/Core/Core.php
+++ b/app/Core/Core.php
@@ -27,8 +27,8 @@ class Core extends \Slim\Middleware
 	public function __construct(array $data)
 	{
         // Handle empty values in data
-        $data = array_merge(array('config_file' => 'include/config.php',
-                                  'cache_dir' => 'cache/',
+        $data = array_merge(array('config_file' => 'app/config.php',
+                                  'cache_dir' => 'app/cache/',
                                   'debug'   => false), $data);
         // Define some core variables
         $this->forum_env['FEATHER_ROOT'] = realpath(dirname(__FILE__).'/../../').'/';
@@ -41,9 +41,9 @@ public function __construct(array $data)
         $this->env_to_globals($this->forum_env); // Legacy
 
         // Load files
-        require $this->forum_env['FEATHER_ROOT'].'include/utf8/utf8.php';
-        require $this->forum_env['FEATHER_ROOT'].'include/functions.php';
-        require $this->forum_env['FEATHER_ROOT'].'include/l10n.php';
+        require $this->forum_env['FEATHER_ROOT'].'app/Helpers/utf8/utf8.php';
+        require $this->forum_env['FEATHER_ROOT'].'app/Helpers/functions.php';
+        require $this->forum_env['FEATHER_ROOT'].'app/Helpers/l10n.php';
 
         // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
         setlocale(LC_CTYPE, 'C');
@@ -54,8 +54,8 @@ public static function load_default_forum_env()
         return array(
                 'FEATHER' => true, // Legacy
                 'FEATHER_ROOT' => '',
-                'FORUM_CONFIG_FILE' => 'include/config.php',
-                'FORUM_CACHE_DIR' => 'cache/',
+                'FORUM_CONFIG_FILE' => 'app/config.php',
+                'FORUM_CACHE_DIR' => 'app/cache/',
                 'FORUM_VERSION' => '1.0.0',
                 'FORUM_NAME' => 'FeatherBB',
                 'FORUM_DB_REVISION' => 21,
diff --git a/app/Core/Email.php b/app/Core/Email.php
index 9088a3bf..59a64c85 100644
--- a/app/Core/Email.php
+++ b/app/Core/Email.php
@@ -15,7 +15,7 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->config = $this->feather->config;
-        require FEATHER_ROOT . 'include/utf8/utils/ascii.php';
+        require FEATHER_ROOT . 'app/Helpers/utf8/utils/ascii.php';
     }
 
     //
diff --git a/app/Core/Lister.php b/app/Core/Lister.php
index 2a2d120c..8d572d9d 100644
--- a/app/Core/Lister.php
+++ b/app/Core/Lister.php
@@ -68,7 +68,7 @@ public static function getStyles()
         $feather = \Slim\Slim::getInstance();
         $styles = array();
 
-        $iterator = new \DirectoryIterator($feather->forum_env['FEATHER_ROOT'].'style/themes');
+        $iterator = new \DirectoryIterator($feather->forum_env['FEATHER_ROOT'].'style/themes/');
         foreach ($iterator as $child) {
             if(!$child->isDot() && $child->isDir() && file_exists($child->getPathname().DIRECTORY_SEPARATOR.'style.css')) {
                 // If the theme is well formed, add it to the list
@@ -88,7 +88,7 @@ public static function getLangs($folder = '')
         $feather = \Slim\Slim::getInstance();
         $langs = array();
 
-        $iterator = new \DirectoryIterator($feather->forum_env['FEATHER_ROOT'].'lang');
+        $iterator = new \DirectoryIterator($feather->forum_env['FEATHER_ROOT'].'app/lang/');
         foreach ($iterator as $child) {
             if(!$child->isDot() && $child->isDir() && file_exists($child->getPathname().DIRECTORY_SEPARATOR.'common.po')) {
                 // If the lang pack is well formed, add it to the list
diff --git a/include/bbcd_compile.php b/app/Helpers/bbcd_compile.php
similarity index 99%
rename from include/bbcd_compile.php
rename to app/Helpers/bbcd_compile.php
index 02b2c3b3..4aadb11c 100644
--- a/include/bbcd_compile.php
+++ b/app/Helpers/bbcd_compile.php
@@ -9,7 +9,7 @@
  */
 
 // This script compiles the $options, $smilies and $bbcd arrays (from bbcd_source.php script
-// or from an admin page web form) into the cache/cache_parser_data.php.
+// or from an admin page web form) into the app/cache/cache_parser_data.php.
 
 // Initialize a new global parser data array $pd:
 $pd = array(
@@ -419,7 +419,7 @@ function file2title($file)
 $s .= ";\n";
 
 $s .= "?>";
-file_put_contents(FEATHER_ROOT.'cache/cache_parser_data.php', $s);
+file_put_contents(FEATHER_ROOT.'app/cache/cache_parser_data.php', $s);
 
 // Clean up our global variables.
 unset($all_tags); unset($all_block_tags);
diff --git a/include/bbcd_source.php b/app/Helpers/bbcd_source.php
similarity index 100%
rename from include/bbcd_source.php
rename to app/Helpers/bbcd_source.php
diff --git a/include/functions.php b/app/Helpers/functions.php
similarity index 99%
rename from include/functions.php
rename to app/Helpers/functions.php
index 3cd0fd7c..715dded2 100644
--- a/include/functions.php
+++ b/app/Helpers/functions.php
@@ -31,7 +31,7 @@ function check_username($username, $errors, $exclude_id = null)
     global $feather, $errors, $feather_bans;
 
     // Include UTF-8 function
-    require_once FEATHER_ROOT.'include/utf8/strcasecmp.php';
+    require_once FEATHER_ROOT.'app/Helpers/utf8/strcasecmp.php';
 
     load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$feather->user->language.'/register.mo');
     load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$feather->user->language.'/prof_reg.mo');
@@ -454,7 +454,7 @@ function message($msg, $http_status = null, $no_back_link = false)
 function random_key($len, $readable = false, $hash = false)
 {
     if (!function_exists('secure_random_bytes')) {
-        include FEATHER_ROOT.'include/srand.php';
+        include FEATHER_ROOT.'app/Helpers/srand.php';
     }
 
     $key = secure_random_bytes($len);
diff --git a/include/l10n.php b/app/Helpers/l10n.php
similarity index 100%
rename from include/l10n.php
rename to app/Helpers/l10n.php
diff --git a/include/parser.php b/app/Helpers/parser.php
similarity index 99%
rename from include/parser.php
rename to app/Helpers/parser.php
index fa9f2215..a6fcb7da 100644
--- a/include/parser.php
+++ b/app/Helpers/parser.php
@@ -16,11 +16,11 @@
 define('FEATHER_PARSER', '11-Feb-2011 13:33');
 
 // globals. we share one array: $pd
-if (file_exists(FEATHER_ROOT.'cache/cache_parser_data.php')) { // If file already exists
-    require_once(FEATHER_ROOT.'cache/cache_parser_data.php');
+if (file_exists(FEATHER_ROOT.'app/cache/cache_parser_data.php')) { // If file already exists
+    require_once(FEATHER_ROOT.'app/cache/cache_parser_data.php');
 } else { // It needs to be re-generated.
-    require_once(FEATHER_ROOT.'include/bbcd_source.php');
-    require_once(FEATHER_ROOT.'include/bbcd_compile.php');
+    require_once(FEATHER_ROOT.'app/Helpers/bbcd_source.php');
+    require_once(FEATHER_ROOT.'app/Helpers/bbcd_compile.php');
 }
 // !!!! AVOIDING PCRE STACK OVERFLOWS WHICH SEG-FAULT CRASH APACHE/PHP !!!!
 // By default, PHP sets up pcre.recursion_limit way too high (100000). According
diff --git a/include/srand.php b/app/Helpers/srand.php
similarity index 100%
rename from include/srand.php
rename to app/Helpers/srand.php
diff --git a/include/utf8/mbstring/core.php b/app/Helpers/utf8/mbstring/core.php
similarity index 100%
rename from include/utf8/mbstring/core.php
rename to app/Helpers/utf8/mbstring/core.php
diff --git a/include/utf8/native/core.php b/app/Helpers/utf8/native/core.php
similarity index 100%
rename from include/utf8/native/core.php
rename to app/Helpers/utf8/native/core.php
diff --git a/include/utf8/ord.php b/app/Helpers/utf8/ord.php
similarity index 100%
rename from include/utf8/ord.php
rename to app/Helpers/utf8/ord.php
diff --git a/include/utf8/str_ireplace.php b/app/Helpers/utf8/str_ireplace.php
similarity index 100%
rename from include/utf8/str_ireplace.php
rename to app/Helpers/utf8/str_ireplace.php
diff --git a/include/utf8/str_pad.php b/app/Helpers/utf8/str_pad.php
similarity index 100%
rename from include/utf8/str_pad.php
rename to app/Helpers/utf8/str_pad.php
diff --git a/include/utf8/str_split.php b/app/Helpers/utf8/str_split.php
similarity index 100%
rename from include/utf8/str_split.php
rename to app/Helpers/utf8/str_split.php
diff --git a/include/utf8/strcasecmp.php b/app/Helpers/utf8/strcasecmp.php
similarity index 100%
rename from include/utf8/strcasecmp.php
rename to app/Helpers/utf8/strcasecmp.php
diff --git a/include/utf8/strcspn.php b/app/Helpers/utf8/strcspn.php
similarity index 100%
rename from include/utf8/strcspn.php
rename to app/Helpers/utf8/strcspn.php
diff --git a/include/utf8/stristr.php b/app/Helpers/utf8/stristr.php
similarity index 100%
rename from include/utf8/stristr.php
rename to app/Helpers/utf8/stristr.php
diff --git a/include/utf8/strrev.php b/app/Helpers/utf8/strrev.php
similarity index 100%
rename from include/utf8/strrev.php
rename to app/Helpers/utf8/strrev.php
diff --git a/include/utf8/strspn.php b/app/Helpers/utf8/strspn.php
similarity index 100%
rename from include/utf8/strspn.php
rename to app/Helpers/utf8/strspn.php
diff --git a/include/utf8/substr_replace.php b/app/Helpers/utf8/substr_replace.php
similarity index 100%
rename from include/utf8/substr_replace.php
rename to app/Helpers/utf8/substr_replace.php
diff --git a/include/utf8/trim.php b/app/Helpers/utf8/trim.php
similarity index 100%
rename from include/utf8/trim.php
rename to app/Helpers/utf8/trim.php
diff --git a/include/utf8/ucfirst.php b/app/Helpers/utf8/ucfirst.php
similarity index 100%
rename from include/utf8/ucfirst.php
rename to app/Helpers/utf8/ucfirst.php
diff --git a/include/utf8/ucwords.php b/app/Helpers/utf8/ucwords.php
similarity index 100%
rename from include/utf8/ucwords.php
rename to app/Helpers/utf8/ucwords.php
diff --git a/include/utf8/utf8.php b/app/Helpers/utf8/utf8.php
similarity index 100%
rename from include/utf8/utf8.php
rename to app/Helpers/utf8/utf8.php
diff --git a/include/utf8/utils/ascii.php b/app/Helpers/utf8/utils/ascii.php
similarity index 100%
rename from include/utf8/utils/ascii.php
rename to app/Helpers/utf8/utils/ascii.php
diff --git a/include/utf8/utils/bad.php b/app/Helpers/utf8/utils/bad.php
similarity index 100%
rename from include/utf8/utils/bad.php
rename to app/Helpers/utf8/utils/bad.php
diff --git a/include/utf8/utils/patterns.php b/app/Helpers/utf8/utils/patterns.php
similarity index 100%
rename from include/utf8/utils/patterns.php
rename to app/Helpers/utf8/utils/patterns.php
diff --git a/include/utf8/utils/position.php b/app/Helpers/utf8/utils/position.php
similarity index 100%
rename from include/utf8/utils/position.php
rename to app/Helpers/utf8/utils/position.php
diff --git a/include/utf8/utils/specials.php b/app/Helpers/utf8/utils/specials.php
similarity index 100%
rename from include/utf8/utils/specials.php
rename to app/Helpers/utf8/utils/specials.php
diff --git a/include/utf8/utils/unicode.php b/app/Helpers/utf8/utils/unicode.php
similarity index 100%
rename from include/utf8/utils/unicode.php
rename to app/Helpers/utf8/utils/unicode.php
diff --git a/include/utf8/utils/validation.php b/app/Helpers/utf8/utils/validation.php
similarity index 100%
rename from include/utf8/utils/validation.php
rename to app/Helpers/utf8/utils/validation.php
diff --git a/app/Model/Admin/Permissions.php b/app/Model/Admin/Permissions.php
index e9143582..56584c81 100644
--- a/app/Model/Admin/Permissions.php
+++ b/app/Model/Admin/Permissions.php
@@ -43,7 +43,7 @@ public function update_permissions()
 
         // Regenerate the config cache
         if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'include/cache.php';
+            require FEATHER_ROOT.'app/Helpers/cache.php';
         }
 
         generate_config_cache();
diff --git a/app/Model/Edit.php b/app/Model/Edit.php
index 5afdf1ce..3923bba2 100644
--- a/app/Model/Edit.php
+++ b/app/Model/Edit.php
@@ -93,7 +93,7 @@ public function check_errors_before_edit($can_edit_subject, $errors)
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
-            require FEATHER_ROOT.'include/parser.php';
+            require FEATHER_ROOT.'app/Helpers/parser.php';
             $message = preparse_bbcode($message, $errors);
         }
 
@@ -135,7 +135,7 @@ public function setup_variables($cur_post, $is_admmod, $can_edit_subject, $error
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
-            require_once FEATHER_ROOT.'include/parser.php';
+            require_once FEATHER_ROOT.'app/Helpers/parser.php';
             $post['message'] = preparse_bbcode($post['message'], $errors);
         }
 
diff --git a/app/Model/Moderate.php b/app/Model/Moderate.php
index 551321db..a12e49f6 100644
--- a/app/Model/Moderate.php
+++ b/app/Model/Moderate.php
@@ -424,7 +424,7 @@ public function display_posts_view($tid, $start_from)
 
         $post_data = array();
 
-        require FEATHER_ROOT.'include/parser.php';
+        require FEATHER_ROOT.'app/Helpers/parser.php';
 
         $post_count = 0; // Keep track of post numbers
 
diff --git a/app/Model/Post.php b/app/Model/Post.php
index 90e80845..ffa41188 100644
--- a/app/Model/Post.php
+++ b/app/Model/Post.php
@@ -164,7 +164,7 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
-            require FEATHER_ROOT.'include/parser.php';
+            require FEATHER_ROOT.'app/Helpers/parser.php';
             $message = preparse_bbcode($message, $errors);
             $message = $this->hook->fire('check_errors_before_post_bbcode', $message);
         }
@@ -217,7 +217,7 @@ public function setup_variables($errors, $is_admmod)
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
-            require_once FEATHER_ROOT.'include/parser.php';
+            require_once FEATHER_ROOT.'app/Helpers/parser.php';
             $post['message']  = preparse_bbcode($post['message'], $errors);
         }
 
@@ -877,7 +877,7 @@ public function topic_review($tid)
 
         $post_data = $this->hook->fire('topic_review_start', $post_data, $tid);
 
-        require_once FEATHER_ROOT.'include/parser.php';
+        require_once FEATHER_ROOT.'app/Helpers/parser.php';
 
         $select_topic_review = array('poster', 'message', 'hide_smilies', 'posted');
 
diff --git a/app/Model/Profile.php b/app/Model/Profile.php
index 9d9b5c0e..6ef4e073 100644
--- a/app/Model/Profile.php
+++ b/app/Model/Profile.php
@@ -905,7 +905,7 @@ public function update_profile($id, $info, $section)
 
                     // Validate BBCode syntax
                     if ($this->config['p_sig_bbcode'] == '1') {
-                        require FEATHER_ROOT.'include/parser.php';
+                        require FEATHER_ROOT.'app/Helpers/parser.php';
 
                         $errors = array();
 
diff --git a/app/Model/Viextopic.php b/app/Model/Viewtopic.php
similarity index 100%
rename from app/Model/Viextopic.php
rename to app/Model/Viewtopic.php
diff --git a/include/routes.php b/app/routes.php
similarity index 100%
rename from include/routes.php
rename to app/routes.php
diff --git a/cache/.htaccess b/cache/.htaccess
deleted file mode 100644
index 5f727798..00000000
--- a/cache/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-<Limit GET POST PUT>
-Deny from All
-</Limit>
diff --git a/extern.php b/extern.php
index e35e5335..dede103d 100644
--- a/extern.php
+++ b/extern.php
@@ -62,15 +62,15 @@
 \Slim\Slim::registerAutoloader();
 
 // Load FeatherBB
-require 'include/classes/autoload.class.php';
+require 'app/Helpers/classes/autoload.class.php';
 \FeatherBB\Loader::registerAutoloader();
 
 // Instantiate Slim and add CSRF
 $feather = new \Slim\Slim();
 $feather->add(new \FeatherBB\Csrf());
 
-$feather_settings = array('config_file' => 'include/config.php',
-    'cache_dir' => 'cache/',
+$feather_settings = array('config_file' => 'app/config.php',
+    'cache_dir' => 'app/cache/',
     'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
 $feather->add(new \FeatherBB\Auth());
 $feather->add(new \FeatherBB\Core($feather_settings));
@@ -439,7 +439,7 @@ function output_html($feed)
 
 // Show recent discussions
 if ($action == 'feed') {
-    require FEATHER_ROOT.'include/parser.php';
+    require FEATHER_ROOT.'app/Helpers/parser.php';
 
     // Determine what type of feed to output
     $type = isset($_GET['type']) ? strtolower($_GET['type']) : 'html';
@@ -650,7 +650,7 @@ function output_html($feed)
             // Output feed as PHP code
             if (isset($cache_id)) {
                 if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                    require FEATHER_ROOT.'include/cache.php';
+                    require FEATHER_ROOT.'app/Helpers/cache.php';
                 }
 
                 $content = '<?php'."\n\n".'$feed = '.var_export($feed, true).';'."\n\n".'$cache_expire = '.($now + ($feather->forum_settings['o_feed_ttl'] * 60)).';'."\n\n".'?>';
diff --git a/index.php b/index.php
index a68f2527..e77f054d 100644
--- a/index.php
+++ b/index.php
@@ -20,16 +20,14 @@
 $feather = new \Slim\Slim();
 $feather->add(new \FeatherBB\Csrf());
 
-$feather_settings = array('config_file' => 'include/config.php',
-                          'cache_dir' => 'cache/',
+$feather_settings = array('config_file' => 'app/config.php',
+                          'cache_dir' => 'app/cache/',
                           'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
 $feather->add(new \FeatherBB\Auth());
 $feather->add(new \FeatherBB\Core($feather_settings));
 
-
-
 // Load the routes
-require 'include/routes.php';
+require 'app/routes.php';
 
 // Run it, baby!
 $feather->run();
diff --git a/style/themes/FeatherBB/view/help.php b/style/themes/FeatherBB/view/help.php
index a6e83ae6..34632d06 100644
--- a/style/themes/FeatherBB/view/help.php
+++ b/style/themes/FeatherBB/view/help.php
@@ -125,7 +125,7 @@
 <?php
 
 // Display the smiley set
-require FEATHER_ROOT.'include/parser.php';
+require FEATHER_ROOT.'app/Helpers/parser.php';
 
 $smiley_groups = array();
 
diff --git a/style/themes/FeatherBB/view/post.php b/style/themes/FeatherBB/view/post.php
index d0b60d54..e6159e4e 100644
--- a/style/themes/FeatherBB/view/post.php
+++ b/style/themes/FeatherBB/view/post.php
@@ -52,7 +52,7 @@
 <?php
 
 } elseif ($feather->request->post('preview')) {
-    require_once FEATHER_ROOT.'include/parser.php';
+    require_once FEATHER_ROOT.'app/Helpers/parser.php';
     $preview_message = parse_message($post['message'], $post['hide_smilies']);
 
     ?>
diff --git a/style/themes/MyFeatherBB/view/help.php b/style/themes/MyFeatherBB/view/help.php
index 1e7decf9..dd449bc4 100644
--- a/style/themes/MyFeatherBB/view/help.php
+++ b/style/themes/MyFeatherBB/view/help.php
@@ -124,7 +124,7 @@
 <?php
 
 // Display the smiley set
-require FEATHER_ROOT.'include/parser.php';
+require FEATHER_ROOT.'app/Helpers/parser.php';
 
 $smiley_groups = array();
 
diff --git a/style/themes/MyFeatherBB/view/post.php b/style/themes/MyFeatherBB/view/post.php
index d0b60d54..e6159e4e 100644
--- a/style/themes/MyFeatherBB/view/post.php
+++ b/style/themes/MyFeatherBB/view/post.php
@@ -52,7 +52,7 @@
 <?php
 
 } elseif ($feather->request->post('preview')) {
-    require_once FEATHER_ROOT.'include/parser.php';
+    require_once FEATHER_ROOT.'app/Helpers/parser.php';
     $preview_message = parse_message($post['message'], $post['hide_smilies']);
 
     ?>
diff --git a/view/help.php b/view/help.php
index 1e7decf9..dd449bc4 100644
--- a/view/help.php
+++ b/view/help.php
@@ -124,7 +124,7 @@
 <?php
 
 // Display the smiley set
-require FEATHER_ROOT.'include/parser.php';
+require FEATHER_ROOT.'app/Helpers/parser.php';
 
 $smiley_groups = array();
 
diff --git a/view/post.php b/view/post.php
index d0b60d54..e6159e4e 100644
--- a/view/post.php
+++ b/view/post.php
@@ -52,7 +52,7 @@
 <?php
 
 } elseif ($feather->request->post('preview')) {
-    require_once FEATHER_ROOT.'include/parser.php';
+    require_once FEATHER_ROOT.'app/Helpers/parser.php';
     $preview_message = parse_message($post['message'], $post['hide_smilies']);
 
     ?>

From 3037098ec7cf40aedccc28124dd5c798b180f316 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 31 Aug 2015 15:50:10 +0200
Subject: [PATCH 286/353] Fix typo

---
 app/Controller/Viextopic.php | 149 -----------------------------------
 1 file changed, 149 deletions(-)
 delete mode 100644 app/Controller/Viextopic.php

diff --git a/app/Controller/Viextopic.php b/app/Controller/Viextopic.php
deleted file mode 100644
index 4ba812cd..00000000
--- a/app/Controller/Viextopic.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-namespace App\Controller;
-
-class Viewtopic
-{
-    public function __construct()
-    {
-        $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \App\Model\Viewtopic();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/topic.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/post.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/bbeditor.mo');
-    }
-
-    public function display($id = null, $name = null, $page = null, $pid = null)
-    {
-        global $pd;
-
-        if ($this->feather->user->g_read_board == '0') {
-            throw new \FeatherBB\Error(__('No view'), 403);
-        }
-
-        // Antispam feature
-        require $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/antispam.php';
-        $index_questions = rand(0, count($lang_antispam_questions)-1);
-
-        // Fetch some informations about the topic
-        $cur_topic = $this->model->get_info_topic($id);
-
-        // Sort out who the moderators are and if we are currently a moderator (or an admin)
-        $mods_array = ($cur_topic['moderators'] != '') ? unserialize($cur_topic['moderators']) : array();
-        $is_admmod = ($this->feather->user->g_id == FEATHER_ADMIN || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
-        if ($is_admmod) {
-            $admin_ids = get_admin_ids();
-        }
-
-        // Can we or can we not post replies?
-        $post_link = $this->model->get_post_link($id, $cur_topic['closed'], $cur_topic['post_replies'], $is_admmod);
-
-        // Add/update this topic in our list of tracked topics
-        if (!$this->feather->user->is_guest) {
-            $tracked_topics = get_tracked_topics();
-            $tracked_topics['topics'][$id] = time();
-            set_tracked_topics($tracked_topics);
-        }
-
-        // Determine the post offset (based on $_GET['p'])
-        $num_pages = ceil(($cur_topic['num_replies'] + 1) / $this->feather->user->disp_posts);
-
-        $p = (!isset($page) || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
-        $start_from = $this->feather->user->disp_posts * ($p - 1);
-
-        $url_topic = $this->feather->url->url_friendly($cur_topic['subject']);
-        $url_forum = $this->feather->url->url_friendly($cur_topic['forum_name']);
-
-        // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate($num_pages, $p, 'topic/'.$id.'/'.$url_topic.'/#');
-
-        if ($this->feather->forum_settings['o_censoring'] == '1') {
-            $cur_topic['subject'] = censor_words($cur_topic['subject']);
-        }
-
-        $quickpost = $this->model->is_quickpost($cur_topic['post_replies'], $cur_topic['closed'], $is_admmod);
-        $subscraction = $this->model->get_subscraction($cur_topic['is_subscribed'], $id);
-
-        require $this->feather->forum_env['FEATHER_ROOT'].'include/parser.php';
-        $lang_bbeditor = array(
-            'btnBold' => __('btnBold'),
-            'btnItalic' => __('btnItalic'),
-            'btnUnderline' => __('btnUnderline'),
-            'btnColor' => __('btnColor'),
-            'btnLeft' => __('btnLeft'),
-            'btnRight' => __('btnRight'),
-            'btnJustify' => __('btnJustify'),
-            'btnCenter' => __('btnCenter'),
-            'btnLink' => __('btnLink'),
-            'btnPicture' => __('btnPicture'),
-            'btnList' => __('btnList'),
-            'btnQuote' => __('btnQuote'),
-            'btnCode' => __('btnCode'),
-            'promptImage' => __('promptImage'),
-            'promptUrl' => __('promptUrl'),
-            'promptQuote' => __('promptQuote')
-        );
-
-        $this->feather->view2->addAsset('canonical', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/'));
-        if ($num_pages > 1) {
-            if ($p > 1) {
-                $this->feather->view2->addAsset('prev', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
-            }
-            if ($p < $num_pages) {
-                $this->feather->view2->addAsset('next', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
-            }
-        }
-
-        if ($this->feather->forum_settings['o_feed_type'] == '1') {
-            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=rss', array('title' => __('RSS forum feed')));
-        } elseif ($this->feather->forum_settings['o_feed_type'] == '2') {
-            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=atom', array('title' => __('Atom forum feed')));
-        }
-
-        $this->feather->view2->setPageInfo(array(
-            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), $this->feather->utils->escape($cur_topic['forum_name']), $this->feather->utils->escape($cur_topic['subject'])),
-            'active_page' => 'viewtopic',
-            'page_number'  =>  $p,
-            'paging_links'  =>  $paging_links,
-            'is_indexed' => true,
-            'id' => $id,
-            'pid' => $pid,
-            'tid' => $id,
-            'fid' => $cur_topic['forum_id'],
-            'post_data' => $this->model->print_posts($id, $start_from, $cur_topic, $is_admmod),
-            'cur_topic'    =>    $cur_topic,
-            'subscraction'    =>    $subscraction,
-            'post_link' => $post_link,
-            'start_from' => $start_from,
-            'lang_antispam' => $lang_antispam,
-            'quickpost'        =>    $quickpost,
-            'index_questions'        =>    $index_questions,
-            'lang_antispam_questions'        =>    $lang_antispam_questions,
-            'lang_bbeditor'    =>    $lang_bbeditor,
-            'url_forum'        =>    $url_forum,
-            'url_topic'        =>    $url_topic,
-        ))->addTemplate('viewtopic.php')->display();
-
-        // Increment "num_views" for topic
-        $this->model->increment_views($id);
-    }
-
-    public function viewpost($pid)
-    {
-        $post = $this->model->redirect_to_post($pid);
-
-        return $this->display($post['topic_id'], null, $post['get_p'], $pid);
-    }
-
-    public function action($id, $action)
-    {
-        $this->model->handle_actions($id, $action);
-    }
-}

From 522f2834c19e052414e8880ca4215bf2078bc3da Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 31 Aug 2015 16:09:46 +0200
Subject: [PATCH 287/353] Fixes.

---
 app/Core/Auth.php                       |  2 +-
 app/Core/Core.php                       |  2 +-
 app/Core/View.php                       |  4 +++-
 app/Model/Admin/Bans.php                |  4 ++--
 app/Model/Admin/Censoring.php           | 12 ++++++------
 app/Model/Admin/Groups.php              |  4 ++--
 app/Model/Admin/Options.php             |  2 +-
 app/Model/Admin/Users.php               |  4 ++--
 app/Model/Index.php                     |  2 +-
 app/Model/Login.php                     |  2 +-
 app/Model/Profile.php                   | 12 ++++++------
 app/Model/Register.php                  |  2 +-
 extern.php                              |  2 +-
 style/themes/FeatherBB/view/header.php  |  2 +-
 style/themes/FeatherBB/view/install.php |  2 +-
 view/header.php                         |  2 +-
 view/install.php                        |  2 +-
 17 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/app/Core/Auth.php b/app/Core/Auth.php
index 873eee5a..13b1a53a 100644
--- a/app/Core/Auth.php
+++ b/app/Core/Auth.php
@@ -12,8 +12,8 @@
  */
 
 namespace FeatherBB;
+
 use DB;
-// use model\auth;
 
 class Auth extends \Slim\Middleware
 {
diff --git a/app/Core/Core.php b/app/Core/Core.php
index fc198e7e..7044ba22 100644
--- a/app/Core/Core.php
+++ b/app/Core/Core.php
@@ -214,7 +214,7 @@ public function call()
         $this->app->hooks->fire('core.start');
 
         if (!is_file($this->forum_env['FORUM_CONFIG_FILE'])) {
-            $installer = new \controller\install;
+            $installer = new \App\Controller\Install;
             $installer->run();
             return;
         }
diff --git a/app/Core/View.php b/app/Core/View.php
index fc845332..dc44590c 100644
--- a/app/Core/View.php
+++ b/app/Core/View.php
@@ -208,7 +208,9 @@ public function getTemplatePathname($file)
 
     public function display($nested = true)
     {
-        $this->setStyle($this->app->user->style);
+        if ($this->app->user) {
+            $this->setStyle($this->app->user->style);
+        }
         echo $this->fetch($nested);
     }
 
diff --git a/app/Model/Admin/Bans.php b/app/Model/Admin/Bans.php
index 33e47e6c..4dcec087 100644
--- a/app/Model/Admin/Bans.php
+++ b/app/Model/Admin/Bans.php
@@ -274,7 +274,7 @@ public function insert_ban()
         }
 
         // Regenerate the bans cache
-        $this->feather->cache->store('bans', \model\cache::get_bans());
+        $this->feather->cache->store('bans', \App\Model\Cache::get_bans());
 
         redirect($this->feather->url->get('admin/bans/'), __('Ban edited redirect'));
     }
@@ -289,7 +289,7 @@ public function remove_ban($ban_id)
         $result = $result->delete();
 
         // Regenerate the bans cache
-        $this->feather->cache->store('bans', \model\cache::get_bans());
+        $this->feather->cache->store('bans', \App\Model\Cache::get_bans());
 
         redirect($this->feather->url->get('admin/bans/'), __('Ban removed redirect'));
     }
diff --git a/app/Model/Admin/Censoring.php b/app/Model/Admin/Censoring.php
index 74581ad4..93019394 100644
--- a/app/Model/Admin/Censoring.php
+++ b/app/Model/Admin/Censoring.php
@@ -43,8 +43,8 @@ public function add_word()
             ->save();
 
         // Regenerate the censoring cache
-        $this->feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
-        $this->feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
+        $this->feather->cache->store('search_for', \App\Model\Cache::get_censoring('search_for'));
+        $this->feather->cache->store('replace_with', \App\Model\Cache::get_censoring('replace_with'));
 
         redirect($this->feather->url->get('admin/censoring/'), __('Word added redirect'));
     }
@@ -71,8 +71,8 @@ public function update_word()
             ->save();
 
         // Regenerate the censoring cache
-        $this->feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
-        $this->feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
+        $this->feather->cache->store('search_for', \App\Model\Cache::get_censoring('search_for'));
+        $this->feather->cache->store('replace_with', \App\Model\Cache::get_censoring('replace_with'));
 
         redirect($this->feather->url->get('admin/censoring/'), __('Word updated redirect'));
     }
@@ -87,8 +87,8 @@ public function remove_word()
         $result = $result->delete();
 
         // Regenerate the censoring cache
-        $this->feather->cache->store('search_for', \model\cache::get_censoring('search_for'));
-        $this->feather->cache->store('replace_with', \model\cache::get_censoring('replace_with'));
+        $this->feather->cache->store('search_for', \App\Model\Cache::get_censoring('search_for'));
+        $this->feather->cache->store('replace_with', \App\Model\Cache::get_censoring('replace_with'));
 
         redirect($this->feather->url->get('admin/censoring/'),  __('Word removed redirect'));
     }
diff --git a/app/Model/Admin/Groups.php b/app/Model/Admin/Groups.php
index 04faffcb..7128b8de 100644
--- a/app/Model/Admin/Groups.php
+++ b/app/Model/Admin/Groups.php
@@ -255,7 +255,7 @@ public function add_edit_group($groups)
         $group_id = $this->hook->fire('add_edit_group.group_id', $group_id);
 
         // Regenerate the quick jump cache
-        $this->feather->cache->store('quickjump', \model\cache::get_quickjump());
+        $this->feather->cache->store('quickjump', \App\Model\Cache::get_quickjump());
 
         if ($this->request->post('mode') == 'edit') {
             redirect($this->feather->url->get('admin/groups/'), __('Group edited redirect'));
@@ -283,7 +283,7 @@ public function set_default_group($groups)
                                                    ->update_many('conf_value', $group_id);
 
         // Regenerate the config cache
-        $this->feather->cache->store('config', \model\cache::get_config());
+        $this->feather->cache->store('config', \App\Model\Cache::get_config());
 
         redirect($this->feather->url->get('admin/groups/'), __('Default group redirect'));
     }
diff --git a/app/Model/Admin/Options.php b/app/Model/Admin/Options.php
index e6e780dd..4de0901a 100644
--- a/app/Model/Admin/Options.php
+++ b/app/Model/Admin/Options.php
@@ -227,7 +227,7 @@ public function update_options()
         }
 
         // Regenerate the config cache
-        $this->feather->cache->store('config', \model\cache::get_config());
+        $this->feather->cache->store('config', \App\Model\Cache::get_config());
         $this->clear_feed_cache();
 
         redirect($this->feather->url->get('admin/options/'), __('Options updated redirect'));
diff --git a/app/Model/Admin/Users.php b/app/Model/Admin/Users.php
index b2ad7561..2f8e600a 100644
--- a/app/Model/Admin/Users.php
+++ b/app/Model/Admin/Users.php
@@ -401,7 +401,7 @@ public function delete_users()
 
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
-                $this->feather->cache->store('users_info', \model\cache::get_users_info());
+                $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
             }
 
             $stats = $this->feather->cache->retrieve('users_info');
@@ -523,7 +523,7 @@ public function ban_users()
                 }
 
                 // Regenerate the bans cache
-                $this->feather->cache->store('bans', \model\cache::get_bans());
+                $this->feather->cache->store('bans', \App\Model\Cache::get_bans());
 
                 redirect($this->feather->url->get('admin/users/'), __('Users banned redirect'));
             }
diff --git a/app/Model/Index.php b/app/Model/Index.php
index 1fed1f45..158491e6 100644
--- a/app/Model/Index.php
+++ b/app/Model/Index.php
@@ -239,7 +239,7 @@ public function collect_stats()
 
         // Collect some statistics from the database
         if (!$this->feather->cache->isCached('users_info')) {
-            $this->feather->cache->store('users_info', \model\cache::get_users_info());
+            $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
         }
 
         $stats = $this->feather->cache->retrieve('users_info');
diff --git a/app/Model/Login.php b/app/Model/Login.php
index a8d8abbb..e5f2434c 100644
--- a/app/Model/Login.php
+++ b/app/Model/Login.php
@@ -62,7 +62,7 @@ public function login()
 
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
-                $this->feather->cache->store('users_info', \model\cache::get_users_info());
+                $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
             }
 
             $stats = $this->feather->cache->retrieve('users_info');
diff --git a/app/Model/Profile.php b/app/Model/Profile.php
index 6ef4e073..526bceac 100644
--- a/app/Model/Profile.php
+++ b/app/Model/Profile.php
@@ -425,13 +425,13 @@ public function update_group_membership($id)
 
         // Regenerate the users info cache
         if (!$this->feather->cache->isCached('users_info')) {
-            $this->feather->cache->store('users_info', \model\cache::get_users_info());
+            $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
         }
 
         $stats = $this->feather->cache->retrieve('users_info');
 
         if ($old_group_id == FEATHER_ADMIN || $new_group_id == FEATHER_ADMIN) {
-            $this->feather->cache->store('admin_ids', \model\cache::get_admin_ids());
+            $this->feather->cache->store('admin_ids', \App\Model\Cache::get_admin_ids());
         }
 
         $new_group_mod = DB::for_table('groups')
@@ -721,13 +721,13 @@ public function delete_user($id)
 
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
-                $this->feather->cache->store('users_info', \model\cache::get_users_info());
+                $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
             }
 
             $stats = $this->feather->cache->retrieve('users_info');
 
             if ($group_id == FEATHER_ADMIN) {
-                $this->feather->cache->store('admin_ids', \model\cache::get_admin_ids());
+                $this->feather->cache->store('admin_ids', \App\Model\Cache::get_admin_ids());
             }
 
             $this->hook->fire('delete_user');
@@ -1073,14 +1073,14 @@ public function update_profile($id, $info, $section)
 
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
-                $this->feather->cache->store('users_info', \model\cache::get_users_info());
+                $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
             }
 
             $stats = $this->feather->cache->retrieve('users_info');
 
             // Check if the bans table was updated and regenerate the bans cache when needed
             if ($bans_updated) {
-                $this->feather->cache->store('bans', \model\cache::get_bans());
+                $this->feather->cache->store('bans', \App\Model\Cache::get_bans());
             }
         }
 
diff --git a/app/Model/Register.php b/app/Model/Register.php
index 01e7a8ae..c920e592 100644
--- a/app/Model/Register.php
+++ b/app/Model/Register.php
@@ -168,7 +168,7 @@ public function insert_user($user)
         if ($this->config['o_regs_verify'] == '0') {
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
-                $this->feather->cache->store('users_info', \model\cache::get_users_info());
+                $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
             }
 
             $stats = $this->feather->cache->retrieve('users_info');
diff --git a/extern.php b/extern.php
index dede103d..9e8ea810 100644
--- a/extern.php
+++ b/extern.php
@@ -728,7 +728,7 @@ function output_html($feed)
 elseif ($action == 'stats') {
 
     if (!$feather->cache->isCached('users_info')) {
-        $feather->cache->store('users_info', \model\cache::get_users_info());
+        $feather->cache->store('users_info', \App\Model\Cache::get_users_info());
     }
 
     $stats = $feather->cache->retrieve('users_info');
diff --git a/style/themes/FeatherBB/view/header.php b/style/themes/FeatherBB/view/header.php
index b4dfdbdd..a2cee85b 100644
--- a/style/themes/FeatherBB/view/header.php
+++ b/style/themes/FeatherBB/view/header.php
@@ -15,7 +15,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
 <title><?php echo generate_page_title($page_title, $p) ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo $feather->url->base() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $feather->url->base() ?>/style/themes/<?php echo $feather->user->style.'/style.css' ?>" />
 <?php
 
 echo $allow_index;
diff --git a/style/themes/FeatherBB/view/install.php b/style/themes/FeatherBB/view/install.php
index c146b1b7..0aed4825 100644
--- a/style/themes/FeatherBB/view/install.php
+++ b/style/themes/FeatherBB/view/install.php
@@ -18,7 +18,7 @@
 <head>
     <meta charset="utf-8">
     <title><?php _e('FeatherBB Installation') ?></title>
-    <link rel="stylesheet" type="text/css" href="style/<?php echo $feather->forum_env['FORUM_NAME'] ?>.css" />
+    <link rel="stylesheet" type="text/css" href="style/themes/<?php echo $feather->forum_env['FORUM_NAME'] ?>/style.css" />
 </head>
 
 <body>
diff --git a/view/header.php b/view/header.php
index 7d751f35..e5de922f 100644
--- a/view/header.php
+++ b/view/header.php
@@ -15,7 +15,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
 <title><?php echo generate_page_title($page_title, $p) ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo $feather->url->base() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $feather->url->base() ?>/style/themes/<?php echo $feather->user->style.'.css' ?>" />
 <?php
 
 echo $allow_index;
diff --git a/view/install.php b/view/install.php
index c146b1b7..91f02ba6 100644
--- a/view/install.php
+++ b/view/install.php
@@ -18,7 +18,7 @@
 <head>
     <meta charset="utf-8">
     <title><?php _e('FeatherBB Installation') ?></title>
-    <link rel="stylesheet" type="text/css" href="style/<?php echo $feather->forum_env['FORUM_NAME'] ?>.css" />
+    <link rel="stylesheet" type="text/css" href="style/themes/<?php echo $feather->forum_env['FORUM_NAME'] ?>.css" />
 </head>
 
 <body>

From b18ec6677bab080a53b284b003e3cdd919369ac1 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 31 Aug 2015 16:33:58 +0200
Subject: [PATCH 288/353] Set a default empty cache dir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

So that users don’t have to create it themselves before installation
---
 .gitignore         | 2 +-
 app/cache/.gitkeep | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 app/cache/.gitkeep

diff --git a/.gitignore b/.gitignore
index 4728b64b..3d9140a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-app/cache/
+
 app/config.php
 .idea/
 nbproject/
diff --git a/app/cache/.gitkeep b/app/cache/.gitkeep
new file mode 100644
index 00000000..e69de29b

From 712976ddee50275decd1125331b340b55204350a Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 31 Aug 2015 16:35:20 +0200
Subject: [PATCH 289/353] Restore gitignore for cache folder

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3d9140a6..4728b64b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-
+app/cache/
 app/config.php
 .idea/
 nbproject/

From 0926be0978cf6a6b088da6ebc659ba3ca44aeb59 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 31 Aug 2015 16:44:08 +0200
Subject: [PATCH 290/353] Uppercase model classes first letter

---
 app/Model/Admin/Bans.php        | 2 +-
 app/Model/Admin/Categories.php  | 2 +-
 app/Model/Admin/Censoring.php   | 2 +-
 app/Model/Admin/Forums.php      | 2 +-
 app/Model/Admin/Groups.php      | 2 +-
 app/Model/Admin/Maintenance.php | 2 +-
 app/Model/Admin/Options.php     | 2 +-
 app/Model/Admin/Parser.php      | 2 +-
 app/Model/Admin/Permissions.php | 2 +-
 app/Model/Admin/Reports.php     | 2 +-
 app/Model/Admin/Statistics.php  | 2 +-
 app/Model/Admin/Users.php       | 2 +-
 app/Model/Auth.php              | 3 ++-
 app/Model/Cache.php             | 3 ++-
 app/Model/Debug.php             | 3 ++-
 app/Model/Delete.php            | 2 +-
 app/Model/Edit.php              | 2 +-
 app/Model/Header.php            | 2 +-
 app/Model/Index.php             | 2 +-
 app/Model/Install.php           | 2 +-
 app/Model/Login.php             | 2 +-
 app/Model/Misc.php              | 2 +-
 app/Model/Moderate.php          | 2 +-
 app/Model/Post.php              | 4 ++--
 app/Model/Profile.php           | 2 +-
 app/Model/Register.php          | 2 +-
 app/Model/Search.php            | 2 +-
 app/Model/Userlist.php          | 8 ++++----
 app/Model/Viewforum.php         | 2 +-
 app/Model/Viewtopic.php         | 2 +-
 30 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/app/Model/Admin/Bans.php b/app/Model/Admin/Bans.php
index 4dcec087..569fffbe 100644
--- a/app/Model/Admin/Bans.php
+++ b/app/Model/Admin/Bans.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class bans
+class Bans
 {
     public function __construct()
     {
diff --git a/app/Model/Admin/Categories.php b/app/Model/Admin/Categories.php
index 2eb4fde7..0d53fabb 100644
--- a/app/Model/Admin/Categories.php
+++ b/app/Model/Admin/Categories.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class categories
+class Categories
 {
     public function __construct()
     {
diff --git a/app/Model/Admin/Censoring.php b/app/Model/Admin/Censoring.php
index 93019394..a6456c33 100644
--- a/app/Model/Admin/Censoring.php
+++ b/app/Model/Admin/Censoring.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class censoring
+class Censoring
 {
     public function __construct()
     {
diff --git a/app/Model/Admin/Forums.php b/app/Model/Admin/Forums.php
index 823a0f73..c443cc1f 100644
--- a/app/Model/Admin/Forums.php
+++ b/app/Model/Admin/Forums.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class forums
+class Forums
 {
     public function __construct()
     {
diff --git a/app/Model/Admin/Groups.php b/app/Model/Admin/Groups.php
index 7128b8de..c921a2c9 100644
--- a/app/Model/Admin/Groups.php
+++ b/app/Model/Admin/Groups.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class groups
+class Groups
 {
     public function __construct()
     {
diff --git a/app/Model/Admin/Maintenance.php b/app/Model/Admin/Maintenance.php
index 2b283169..79db3e4c 100644
--- a/app/Model/Admin/Maintenance.php
+++ b/app/Model/Admin/Maintenance.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class maintenance
+class Maintenance
 {
     public function __construct()
     {
diff --git a/app/Model/Admin/Options.php b/app/Model/Admin/Options.php
index 4de0901a..d255870b 100644
--- a/app/Model/Admin/Options.php
+++ b/app/Model/Admin/Options.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class options
+class Options
 {
     public function __construct()
     {
diff --git a/app/Model/Admin/Parser.php b/app/Model/Admin/Parser.php
index 2472abfd..5c6f1bb4 100644
--- a/app/Model/Admin/Parser.php
+++ b/app/Model/Admin/Parser.php
@@ -12,7 +12,7 @@
 
 use DB;
 
-class parser
+class Parser
 {
     public function __construct()
     {
diff --git a/app/Model/Admin/Permissions.php b/app/Model/Admin/Permissions.php
index 56584c81..79fb1769 100644
--- a/app/Model/Admin/Permissions.php
+++ b/app/Model/Admin/Permissions.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class permissions
+class Permissions
 {
     public function __construct()
     {
diff --git a/app/Model/Admin/Reports.php b/app/Model/Admin/Reports.php
index faf582ba..45462560 100644
--- a/app/Model/Admin/Reports.php
+++ b/app/Model/Admin/Reports.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class reports
+class Reports
 {
     public function __construct()
     {
diff --git a/app/Model/Admin/Statistics.php b/app/Model/Admin/Statistics.php
index e165b873..f2da2089 100644
--- a/app/Model/Admin/Statistics.php
+++ b/app/Model/Admin/Statistics.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class statistics
+class Statistics
 {
     public function __construct()
     {
diff --git a/app/Model/Admin/Users.php b/app/Model/Admin/Users.php
index 2f8e600a..cd3255a0 100644
--- a/app/Model/Admin/Users.php
+++ b/app/Model/Admin/Users.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class users
+class Users
 {
     public function __construct()
     {
diff --git a/app/Model/Auth.php b/app/Model/Auth.php
index 0b4068ea..a8e53a55 100644
--- a/app/Model/Auth.php
+++ b/app/Model/Auth.php
@@ -8,9 +8,10 @@
  */
 
 namespace App\Model;
+
 use DB;
 
-class auth
+class Auth
 {
     public function __construct()
     {
diff --git a/app/Model/Cache.php b/app/Model/Cache.php
index c5c60849..7ec8d732 100644
--- a/app/Model/Cache.php
+++ b/app/Model/Cache.php
@@ -8,9 +8,10 @@
  */
 
 namespace App\Model;
+
 use DB;
 
-class cache
+class Cache
 {
     public function __construct()
     {
diff --git a/app/Model/Debug.php b/app/Model/Debug.php
index 327dbbb5..5edc87e6 100644
--- a/app/Model/Debug.php
+++ b/app/Model/Debug.php
@@ -8,9 +8,10 @@
 */
 
 namespace App\Model;
+
 use DB;
 
-class debug
+class Debug
 {
     protected static $feather;
 
diff --git a/app/Model/Delete.php b/app/Model/Delete.php
index 4723e754..2653a27a 100644
--- a/app/Model/Delete.php
+++ b/app/Model/Delete.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class delete
+class Delete
 {
     public function __construct()
     {
diff --git a/app/Model/Edit.php b/app/Model/Edit.php
index 3923bba2..a5c1b7c0 100644
--- a/app/Model/Edit.php
+++ b/app/Model/Edit.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class edit
+class Edit
 {
     public function __construct()
     {
diff --git a/app/Model/Header.php b/app/Model/Header.php
index 6601f41b..adb8b959 100644
--- a/app/Model/Header.php
+++ b/app/Model/Header.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class header
+class Header
 {
     protected static $app;
 
diff --git a/app/Model/Index.php b/app/Model/Index.php
index 158491e6..921d8737 100644
--- a/app/Model/Index.php
+++ b/app/Model/Index.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class index
+class Index
 {
 
     public function __construct()
diff --git a/app/Model/Install.php b/app/Model/Install.php
index 3c955d2c..8be79340 100644
--- a/app/Model/Install.php
+++ b/app/Model/Install.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class install
+class Install
 {
     protected $database_scheme = array(
         'bans' => "CREATE TABLE IF NOT EXISTS %t% (
diff --git a/app/Model/Login.php b/app/Model/Login.php
index e5f2434c..473153c9 100644
--- a/app/Model/Login.php
+++ b/app/Model/Login.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class login
+class Login
 {
     public function __construct()
     {
diff --git a/app/Model/Misc.php b/app/Model/Misc.php
index 7d13731c..7ca0829c 100644
--- a/app/Model/Misc.php
+++ b/app/Model/Misc.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class misc
+class Misc
 {
     public function __construct()
     {
diff --git a/app/Model/Moderate.php b/app/Model/Moderate.php
index a12e49f6..c48126f1 100644
--- a/app/Model/Moderate.php
+++ b/app/Model/Moderate.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class moderate
+class Moderate
 {
     public function __construct()
     {
diff --git a/app/Model/Post.php b/app/Model/Post.php
index ffa41188..933b93b0 100644
--- a/app/Model/Post.php
+++ b/app/Model/Post.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class post
+class Post
 {
     public function __construct()
     {
@@ -24,7 +24,7 @@ public function __construct()
         $this->email = $this->feather->email;
         $this->search = new \FeatherBB\Search();
     }
- 
+
     //  Get some info about the post
     public function get_info_post($tid, $fid)
     {
diff --git a/app/Model/Profile.php b/app/Model/Profile.php
index 526bceac..c7ffa4e5 100644
--- a/app/Model/Profile.php
+++ b/app/Model/Profile.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class profile
+class Profile
 {
     public function __construct()
     {
diff --git a/app/Model/Register.php b/app/Model/Register.php
index c920e592..d6e13142 100644
--- a/app/Model/Register.php
+++ b/app/Model/Register.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class register
+class Register
 {
     public function __construct()
     {
diff --git a/app/Model/Search.php b/app/Model/Search.php
index 643002e9..372dc7ff 100644
--- a/app/Model/Search.php
+++ b/app/Model/Search.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class search
+class Search
 {
     public function __construct()
     {
diff --git a/app/Model/Userlist.php b/app/Model/Userlist.php
index 0c21409e..062d525d 100644
--- a/app/Model/Userlist.php
+++ b/app/Model/Userlist.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class userlist
+class Userlist
 {
 
     public function __construct()
@@ -23,7 +23,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
     }
- 
+
     // Counts the numeber of user for a specific query
     public function fetch_user_count($username, $show_group)
     {
@@ -71,7 +71,7 @@ public function generate_dropdown_menu($show_group)
         }
 
         $dropdown_menu = $this->hook->fire('generate_dropdown_menu', $dropdown_menu);
-        
+
         return $dropdown_menu;
     }
 
@@ -132,4 +132,4 @@ public function print_users($username, $start_from, $sort_by, $sort_dir, $show_g
 
         return $userlist_data;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Model/Viewforum.php b/app/Model/Viewforum.php
index f4c67fa7..2a53778d 100644
--- a/app/Model/Viewforum.php
+++ b/app/Model/Viewforum.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class viewforum
+class Viewforum
 {
     public function __construct()
     {
diff --git a/app/Model/Viewtopic.php b/app/Model/Viewtopic.php
index b756b3bd..49a59945 100644
--- a/app/Model/Viewtopic.php
+++ b/app/Model/Viewtopic.php
@@ -11,7 +11,7 @@
 
 use DB;
 
-class viewtopic
+class Viewtopic
 {
     public function __construct()
     {

From 96f00d8c42d752c9af5ea2dad575000aa2064c6c Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 31 Aug 2015 19:53:55 +0200
Subject: [PATCH 291/353] Permissions cache fix

---
 app/Controller/Install.php      |  2 +-
 app/Helpers/parser.php          | 12 ++++++------
 app/Model/Admin/Permissions.php |  7 ++-----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/Controller/Install.php b/app/Controller/Install.php
index 177d57b2..2b747a51 100644
--- a/app/Controller/Install.php
+++ b/app/Controller/Install.php
@@ -196,7 +196,7 @@ public function create_db(array $data)
 
         // Install success flash message
         $flash = new \Slim\Middleware\Flash();
-        $flash->set('message', __('Message'));
+        $flash->set('success', __('Message'));
         $flash->save();
 
         // Redirect to homepage
diff --git a/app/Helpers/parser.php b/app/Helpers/parser.php
index a6fcb7da..3ae6ecfa 100644
--- a/app/Helpers/parser.php
+++ b/app/Helpers/parser.php
@@ -120,7 +120,7 @@ function matches one BBCode open/close pair. The BBCode tag components are
 function _preparse_bbcode_callback($matches)
 {
     global $errors, $pd;
-    
+
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
 
@@ -971,7 +971,7 @@ function _parse_bbcode_callback($matches)
 function parse_bbcode(&$text, $hide_smilies = 0)
 {
     global $feather_config, $pd;
-    
+
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
 
@@ -1031,10 +1031,10 @@ function _do_smilies_callback($matches)
 function parse_message($text, $hide_smilies)
 {
     global $pd, $feather_config;
-    
+
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
-    
+
     $pd['in_signature'] = false;
     // Disable images via the $bbcd['in_post'] flag if globally disabled.
     if ($feather_config['p_message_img_tag'] !== '1' || $feather->user->show_img !== '1') {
@@ -1050,10 +1050,10 @@ function parse_message($text, $hide_smilies)
 function parse_signature($text)
 {
     global $pd, $feather_config;
-    
+
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
-    
+
     $pd['in_signature'] = true;
     // Disable images via the $bbcd['in_sig'] flag if globally disabled.
     if ($feather_config['p_sig_img_tag'] !== '1' || $feather->user->show_img_sig !== '1') {
diff --git a/app/Model/Admin/Permissions.php b/app/Model/Admin/Permissions.php
index 79fb1769..7da201e7 100644
--- a/app/Model/Admin/Permissions.php
+++ b/app/Model/Admin/Permissions.php
@@ -42,11 +42,8 @@ public function update_permissions()
         }
 
         // Regenerate the config cache
-        if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-            require FEATHER_ROOT.'app/Helpers/cache.php';
-        }
-
-        generate_config_cache();
+        $this->feather->cache->store('config', \App\Model\Cache::get_config());
+        // $this->clear_feed_cache();
 
         redirect($this->feather->url->get('admin/permissions/'), __('Perms updated redirect'));
     }

From 5e6d1df16095edcda1ae0087befd0336e282a371 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Tue, 1 Sep 2015 18:28:07 +0200
Subject: [PATCH 292/353] namespace FeatherBB;

---
 .gitignore                                    |    4 +-
 app/cache/.gitkeep                            |    0
 app/routes.php                                |  205 -
 ...5bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache |    1 +
 cache/cache_parser_data.php                   | 1433 ++++++
 composer.json                                 |    4 +-
 extern.php                                    |   16 +-
 {app => featherbb}/Controller/Admin/Bans.php  |    6 +-
 .../Controller/Admin/Categories.php           |    8 +-
 .../Controller/Admin/Censoring.php            |    6 +-
 .../Controller/Admin/Forums.php               |   18 +-
 .../Controller/Admin/Groups.php               |    6 +-
 {app => featherbb}/Controller/Admin/Index.php |    4 +-
 .../Controller/Admin/Maintenance.php          |    6 +-
 .../Controller/Admin/Options.php              |    6 +-
 .../Controller/Admin/Parser.php               |   18 +-
 .../Controller/Admin/Permissions.php          |    6 +-
 .../Controller/Admin/Plugins.php              |    2 +-
 .../Controller/Admin/Reports.php              |    6 +-
 .../Controller/Admin/Statistics.php           |    6 +-
 {app => featherbb}/Controller/Admin/Users.php |    6 +-
 {app => featherbb}/Controller/Auth.php        |   26 +-
 {app => featherbb}/Controller/Delete.php      |   10 +-
 {app => featherbb}/Controller/Edit.php        |   14 +-
 {app => featherbb}/Controller/Help.php        |    4 +-
 {app => featherbb}/Controller/Index.php       |    6 +-
 {app => featherbb}/Controller/Install.php     |    8 +-
 {app => featherbb}/Controller/Login.php       |    6 +-
 {app => featherbb}/Controller/Misc.php        |    8 +-
 {app => featherbb}/Controller/Moderate.php    |   12 +-
 {app => featherbb}/Controller/Post.php        |   16 +-
 {app => featherbb}/Controller/Profile.php     |   24 +-
 {app => featherbb}/Controller/Register.php    |   12 +-
 {app => featherbb}/Controller/Search.php      |   12 +-
 {app => featherbb}/Controller/Userlist.php    |    8 +-
 {app => featherbb}/Controller/Viewforum.php   |    6 +-
 {app => featherbb}/Controller/Viewtopic.php   |   14 +-
 {app => featherbb}/Core/AdminUtils.php        |    2 +-
 {app => featherbb}/Core/Auth.php              |   10 +-
 {app => featherbb}/Core/Cache.php             |    2 +-
 {app => featherbb}/Core/Core.php              |   18 +-
 {app => featherbb}/Core/Csrf.php              |    0
 {app => featherbb}/Core/Database.php          |    0
 {app => featherbb}/Core/Email.php             |    2 +-
 {app => featherbb}/Core/Error.php             |    0
 {app => featherbb}/Core/Hooks.php             |    0
 {app => featherbb}/Core/Lister.php            |    2 +-
 {app => featherbb}/Core/Plugin.php            |    0
 {app => featherbb}/Core/Search.php            |    2 +-
 {app => featherbb}/Core/Url.php               |    0
 {app => featherbb}/Core/Utils.php             |    0
 {app => featherbb}/Core/View.php              |    8 +-
 {app => featherbb}/Core/pomo/.editorconfig    |    0
 {app => featherbb}/Core/pomo/MO.php           |    0
 {app => featherbb}/Core/pomo/PO.php           |    0
 .../Core/pomo/Streams/CachedFileReader.php    |    0
 .../Core/pomo/Streams/CachedIntFileReader.php |    0
 .../Core/pomo/Streams/FileReader.php          |    0
 .../Core/pomo/Streams/Reader.php              |    0
 .../Core/pomo/Streams/StringReader.php        |    0
 .../pomo/Translations/EntryTranslations.php   |    0
 .../pomo/Translations/GettextTranslations.php |    0
 .../pomo/Translations/NOOPTranslations.php    |    0
 .../Core/pomo/Translations/Translations.php   |    0
 .../Translations/TranslationsInterface.php    |    0
 {app => featherbb}/Helpers/bbcd_compile.php   |    4 +-
 {app => featherbb}/Helpers/bbcd_source.php    |    0
 {app => featherbb}/Helpers/functions.php      |   16 +-
 {app => featherbb}/Helpers/l10n.php           |    0
 {app => featherbb}/Helpers/parser.php         |    8 +-
 {app => featherbb}/Helpers/srand.php          |    0
 .../Helpers/utf8/mbstring/core.php            |    0
 .../Helpers/utf8/native/core.php              |    0
 {app => featherbb}/Helpers/utf8/ord.php       |    0
 .../Helpers/utf8/str_ireplace.php             |    0
 {app => featherbb}/Helpers/utf8/str_pad.php   |    0
 {app => featherbb}/Helpers/utf8/str_split.php |    0
 .../Helpers/utf8/strcasecmp.php               |    0
 {app => featherbb}/Helpers/utf8/strcspn.php   |    0
 {app => featherbb}/Helpers/utf8/stristr.php   |    0
 {app => featherbb}/Helpers/utf8/strrev.php    |    0
 {app => featherbb}/Helpers/utf8/strspn.php    |    0
 .../Helpers/utf8/substr_replace.php           |    0
 {app => featherbb}/Helpers/utf8/trim.php      |    0
 {app => featherbb}/Helpers/utf8/ucfirst.php   |    0
 {app => featherbb}/Helpers/utf8/ucwords.php   |    0
 {app => featherbb}/Helpers/utf8/utf8.php      |    0
 .../Helpers/utf8/utils/ascii.php              |    0
 {app => featherbb}/Helpers/utf8/utils/bad.php |    0
 .../Helpers/utf8/utils/patterns.php           |    0
 .../Helpers/utf8/utils/position.php           |    0
 .../Helpers/utf8/utils/specials.php           |    0
 .../Helpers/utf8/utils/unicode.php            |    0
 .../Helpers/utf8/utils/validation.php         |    0
 {app => featherbb}/Model/Admin/Bans.php       |    6 +-
 {app => featherbb}/Model/Admin/Categories.php |    4 +-
 {app => featherbb}/Model/Admin/Censoring.php  |   14 +-
 {app => featherbb}/Model/Admin/Forums.php     |    4 +-
 {app => featherbb}/Model/Admin/Groups.php     |    6 +-
 .../Model/Admin/Maintenance.php               |    2 +-
 {app => featherbb}/Model/Admin/Options.php    |    4 +-
 {app => featherbb}/Model/Admin/Parser.php     |    2 +-
 .../Model/Admin/Permissions.php               |    4 +-
 {app => featherbb}/Model/Admin/Reports.php    |    2 +-
 {app => featherbb}/Model/Admin/Statistics.php |    2 +-
 {app => featherbb}/Model/Admin/Users.php      |    6 +-
 {app => featherbb}/Model/Auth.php             |    2 +-
 {app => featherbb}/Model/Cache.php            |    2 +-
 {app => featherbb}/Model/Debug.php            |    2 +-
 {app => featherbb}/Model/Delete.php           |    2 +-
 {app => featherbb}/Model/Edit.php             |    6 +-
 {app => featherbb}/Model/Header.php           |    2 +-
 {app => featherbb}/Model/Index.php            |    4 +-
 {app => featherbb}/Model/Install.php          |    2 +-
 {app => featherbb}/Model/Login.php            |    8 +-
 {app => featherbb}/Model/Misc.php             |    6 +-
 {app => featherbb}/Model/Moderate.php         |    4 +-
 {app => featherbb}/Model/Post.php             |   22 +-
 {app => featherbb}/Model/Profile.php          |   24 +-
 {app => featherbb}/Model/Register.php         |   18 +-
 {app => featherbb}/Model/Search.php           |    2 +-
 {app => featherbb}/Model/Userlist.php         |    2 +-
 {app => featherbb}/Model/Viewforum.php        |    2 +-
 {app => featherbb}/Model/Viewtopic.php        |    2 +-
 {app => featherbb}/lang/English/admin/bans.mo |  Bin
 {app => featherbb}/lang/English/admin/bans.po |    0
 .../lang/English/admin/categories.mo          |  Bin
 .../lang/English/admin/categories.po          |    0
 .../lang/English/admin/censoring.mo           |  Bin
 .../lang/English/admin/censoring.po           |    0
 .../lang/English/admin/common.mo              |  Bin
 .../lang/English/admin/common.po              |    0
 .../lang/English/admin/forums.mo              |  Bin
 .../lang/English/admin/forums.po              |    0
 .../lang/English/admin/groups.mo              |  Bin
 .../lang/English/admin/groups.po              |    0
 .../lang/English/admin/index.html             |    0
 .../lang/English/admin/index.mo               |  Bin
 .../lang/English/admin/index.po               |    0
 .../lang/English/admin/maintenance.mo         |  Bin
 .../lang/English/admin/maintenance.po         |    0
 .../lang/English/admin/options.mo             |  Bin
 .../lang/English/admin/options.po             |    0
 .../lang/English/admin/parser.mo              |  Bin
 .../lang/English/admin/parser.php             |    0
 .../lang/English/admin/parser.po              |    0
 .../lang/English/admin/permissions.mo         |  Bin
 .../lang/English/admin/permissions.po         |    0
 .../lang/English/admin/plugin_example.mo      |  Bin
 .../lang/English/admin/plugin_example.po      |    0
 .../lang/English/admin/reports.mo             |  Bin
 .../lang/English/admin/reports.po             |    0
 .../lang/English/admin/users.mo               |  Bin
 .../lang/English/admin/users.po               |    0
 {app => featherbb}/lang/English/antispam.mo   |  Bin
 {app => featherbb}/lang/English/antispam.php  |    0
 {app => featherbb}/lang/English/antispam.po   |    0
 .../lang/English/antispam_questions.mo        |  Bin
 .../lang/English/antispam_questions.po        |    0
 {app => featherbb}/lang/English/bbeditor.mo   |  Bin
 {app => featherbb}/lang/English/bbeditor.po   |    0
 {app => featherbb}/lang/English/common.mo     |  Bin
 {app => featherbb}/lang/English/common.po     |    0
 {app => featherbb}/lang/English/delete.mo     |  Bin
 {app => featherbb}/lang/English/delete.po     |    0
 {app => featherbb}/lang/English/forum.mo      |  Bin
 {app => featherbb}/lang/English/forum.po      |    0
 {app => featherbb}/lang/English/help.mo       |  Bin
 {app => featherbb}/lang/English/help.po       |    0
 {app => featherbb}/lang/English/index.mo      |  Bin
 {app => featherbb}/lang/English/index.po      |    0
 {app => featherbb}/lang/English/install.mo    |  Bin
 {app => featherbb}/lang/English/install.po    |    0
 {app => featherbb}/lang/English/login.mo      |  Bin
 {app => featherbb}/lang/English/login.po      |    0
 .../English/mail_templates/activate_email.tpl |    0
 .../mail_templates/activate_password.tpl      |    0
 .../mail_templates/banned_email_change.tpl    |    0
 .../mail_templates/banned_email_post.tpl      |    0
 .../mail_templates/banned_email_register.tpl  |    0
 .../mail_templates/dupe_email_change.tpl      |    0
 .../mail_templates/dupe_email_register.tpl    |    0
 .../English/mail_templates/form_email.tpl     |    0
 .../lang/English/mail_templates/new_reply.tpl |    0
 .../English/mail_templates/new_reply_full.tpl |    0
 .../English/mail_templates/new_report.tpl     |    0
 .../lang/English/mail_templates/new_topic.tpl |    0
 .../English/mail_templates/new_topic_full.tpl |    0
 .../lang/English/mail_templates/new_user.tpl  |    0
 .../lang/English/mail_templates/rename.tpl    |    0
 .../lang/English/mail_templates/welcome.tpl   |    0
 {app => featherbb}/lang/English/misc.mo       |  Bin
 {app => featherbb}/lang/English/misc.po       |    0
 {app => featherbb}/lang/English/post.mo       |  Bin
 {app => featherbb}/lang/English/post.po       |    0
 {app => featherbb}/lang/English/prof_reg.mo   |  Bin
 {app => featherbb}/lang/English/prof_reg.po   |    0
 {app => featherbb}/lang/English/profile.mo    |  Bin
 {app => featherbb}/lang/English/profile.po    |    0
 {app => featherbb}/lang/English/register.mo   |  Bin
 {app => featherbb}/lang/English/register.po   |    0
 {app => featherbb}/lang/English/search.mo     |  Bin
 {app => featherbb}/lang/English/search.po     |    0
 {app => featherbb}/lang/English/stopwords.txt |    0
 {app => featherbb}/lang/English/topic.mo      |  Bin
 {app => featherbb}/lang/English/topic.po      |    0
 {app => featherbb}/lang/English/update.mo     |  Bin
 {app => featherbb}/lang/English/update.po     |    0
 {app => featherbb}/lang/English/userlist.mo   |  Bin
 {app => featherbb}/lang/English/userlist.po   |    0
 featherbb/routes.php                          |  205 +
 index.php                                     |    6 +-
 style/themes/FeatherBB/view/help.php          |    2 +-
 style/themes/FeatherBB/view/post.php          |    2 +-
 style/themes/MyFeatherBB/view/help.php        |    2 +-
 style/themes/MyFeatherBB/view/post.php        |    2 +-
 vendor/bin/phpunit                            |    1 +
 vendor/composer/autoload_classmap.php         |   12 +-
 vendor/composer/autoload_psr4.php             |    2 +-
 vendor/composer/include_paths.php             |   13 +
 .../phpunit/php-code-coverage/.gitattributes  |    1 +
 vendor/phpunit/php-code-coverage/.gitignore   |   11 +
 vendor/phpunit/php-code-coverage/.travis.yml  |   20 +
 .../phpunit/php-code-coverage/CONTRIBUTING.md |    5 +
 .../php-code-coverage/ChangeLog-2.2.md        |   39 +
 vendor/phpunit/php-code-coverage/LICENSE      |   33 +
 vendor/phpunit/php-code-coverage/README.md    |   40 +
 vendor/phpunit/php-code-coverage/build.xml    |   41 +
 .../php-code-coverage/build/travis-ci.xml     |   21 +
 .../phpunit/php-code-coverage/composer.json   |   50 +
 .../php-code-coverage/phpunit.xml.dist        |   23 +
 .../php-code-coverage/scripts/auto_append.php |    5 +
 .../scripts/auto_prepend.php                  |   10 +
 .../php-code-coverage/src/CodeCoverage.php    |  919 ++++
 .../src/CodeCoverage/Driver.php               |   47 +
 .../src/CodeCoverage/Driver/HHVM.php          |   26 +
 .../src/CodeCoverage/Driver/PHPDBG.php        |  105 +
 .../src/CodeCoverage/Driver/Xdebug.php        |   97 +
 .../src/CodeCoverage/Exception.php            |   18 +
 .../Exception/UnintentionallyCoveredCode.php  |   18 +
 .../src/CodeCoverage/Filter.php               |  292 ++
 .../src/CodeCoverage/Report/Clover.php        |  284 ++
 .../src/CodeCoverage/Report/Crap4j.php        |  164 +
 .../src/CodeCoverage/Report/Factory.php       |  242 +
 .../src/CodeCoverage/Report/HTML.php          |  182 +
 .../src/CodeCoverage/Report/HTML/Renderer.php |  268 ++
 .../Report/HTML/Renderer/Dashboard.php        |  295 ++
 .../Report/HTML/Renderer/Directory.php        |   97 +
 .../Report/HTML/Renderer/File.php             |  556 +++
 .../Renderer/Template/coverage_bar.html.dist  |    5 +
 .../Renderer/Template/css/bootstrap.min.css   |    5 +
 .../HTML/Renderer/Template/css/nv.d3.min.css  |    1 +
 .../HTML/Renderer/Template/css/style.css      |  122 +
 .../Renderer/Template/dashboard.html.dist     |  284 ++
 .../Renderer/Template/directory.html.dist     |   61 +
 .../Template/directory_item.html.dist         |   13 +
 .../HTML/Renderer/Template/file.html.dist     |   90 +
 .../Renderer/Template/file_item.html.dist     |   14 +
 .../fonts/glyphicons-halflings-regular.eot    |  Bin 0 -> 20127 bytes
 .../fonts/glyphicons-halflings-regular.svg    |  288 ++
 .../fonts/glyphicons-halflings-regular.ttf    |  Bin 0 -> 45404 bytes
 .../fonts/glyphicons-halflings-regular.woff   |  Bin 0 -> 23424 bytes
 .../fonts/glyphicons-halflings-regular.woff2  |  Bin 0 -> 18028 bytes
 .../Renderer/Template/js/bootstrap.min.js     |    7 +
 .../HTML/Renderer/Template/js/d3.min.js       |    5 +
 .../HTML/Renderer/Template/js/holder.min.js   |   12 +
 .../Renderer/Template/js/html5shiv.min.js     |    4 +
 .../HTML/Renderer/Template/js/jquery.min.js   |    5 +
 .../HTML/Renderer/Template/js/nv.d3.min.js    |    8 +
 .../HTML/Renderer/Template/js/respond.min.js  |    5 +
 .../Renderer/Template/method_item.html.dist   |   11 +
 .../src/CodeCoverage/Report/Node.php          |  339 ++
 .../CodeCoverage/Report/Node/Directory.php    |  478 ++
 .../src/CodeCoverage/Report/Node/File.php     |  656 +++
 .../src/CodeCoverage/Report/Node/Iterator.php |  105 +
 .../src/CodeCoverage/Report/PHP.php           |   50 +
 .../src/CodeCoverage/Report/Text.php          |  246 +
 .../src/CodeCoverage/Report/XML.php           |  234 +
 .../src/CodeCoverage/Report/XML/Directory.php |   16 +
 .../src/CodeCoverage/Report/XML/File.php      |   73 +
 .../CodeCoverage/Report/XML/File/Coverage.php |   66 +
 .../CodeCoverage/Report/XML/File/Method.php   |   58 +
 .../CodeCoverage/Report/XML/File/Report.php   |   72 +
 .../src/CodeCoverage/Report/XML/File/Unit.php |   97 +
 .../src/CodeCoverage/Report/XML/Node.php      |   89 +
 .../src/CodeCoverage/Report/XML/Project.php   |   63 +
 .../src/CodeCoverage/Report/XML/Tests.php     |   45 +
 .../src/CodeCoverage/Report/XML/Totals.php    |  140 +
 .../src/CodeCoverage/Util.php                 |   45 +
 .../Util/InvalidArgumentHelper.php            |   39 +
 .../tests/PHP/CodeCoverage/FilterTest.php     |  281 ++
 .../PHP/CodeCoverage/Report/CloverTest.php    |   66 +
 .../PHP/CodeCoverage/Report/FactoryTest.php   |  222 +
 .../tests/PHP/CodeCoverage/UtilTest.php       |   30 +
 .../tests/PHP/CodeCoverageTest.php            |  487 ++
 .../php-code-coverage/tests/TestCase.php      |  311 ++
 .../tests/_files/BankAccount-clover.xml       |   26 +
 .../tests/_files/BankAccount.php              |   33 +
 .../tests/_files/BankAccountTest.php          |   66 +
 .../_files/CoverageClassExtendedTest.php      |   12 +
 .../tests/_files/CoverageClassTest.php        |   12 +
 .../CoverageFunctionParenthesesTest.php       |   11 +
 ...erageFunctionParenthesesWhitespaceTest.php |   11 +
 .../tests/_files/CoverageFunctionTest.php     |   11 +
 .../CoverageMethodOneLineAnnotationTest.php   |   11 +
 .../_files/CoverageMethodParenthesesTest.php  |   12 +
 ...overageMethodParenthesesWhitespaceTest.php |   12 +
 .../tests/_files/CoverageMethodTest.php       |   12 +
 .../tests/_files/CoverageNoneTest.php         |    9 +
 .../tests/_files/CoverageNotPrivateTest.php   |   12 +
 .../tests/_files/CoverageNotProtectedTest.php |   12 +
 .../tests/_files/CoverageNotPublicTest.php    |   12 +
 .../tests/_files/CoverageNothingTest.php      |   13 +
 .../tests/_files/CoveragePrivateTest.php      |   12 +
 .../tests/_files/CoverageProtectedTest.php    |   12 +
 .../tests/_files/CoveragePublicTest.php       |   12 +
 .../CoverageTwoDefaultClassAnnotations.php    |   19 +
 .../tests/_files/CoveredClass.php             |   36 +
 .../tests/_files/CoveredFunction.php          |    4 +
 .../NamespaceCoverageClassExtendedTest.php    |   12 +
 .../_files/NamespaceCoverageClassTest.php     |   12 +
 ...NamespaceCoverageCoversClassPublicTest.php |   15 +
 .../NamespaceCoverageCoversClassTest.php      |   20 +
 .../_files/NamespaceCoverageMethodTest.php    |   12 +
 .../NamespaceCoverageNotPrivateTest.php       |   12 +
 .../NamespaceCoverageNotProtectedTest.php     |   12 +
 .../_files/NamespaceCoverageNotPublicTest.php |   12 +
 .../_files/NamespaceCoveragePrivateTest.php   |   12 +
 .../_files/NamespaceCoverageProtectedTest.php |   12 +
 .../_files/NamespaceCoveragePublicTest.php    |   12 +
 .../tests/_files/NamespaceCoveredClass.php    |   38 +
 .../_files/NotExistingCoveredElementTest.php  |   24 +
 .../class-with-anonymous-function-clover.xml  |   22 +
 .../tests/_files/ignored-lines-clover.xml     |   17 +
 ...urce_with_class_and_anonymous_function.php |   19 +
 .../tests/_files/source_with_ignore.php       |   37 +
 .../tests/_files/source_with_namespace.php    |   20 +
 .../source_with_oneline_annotations.php       |   36 +
 .../tests/_files/source_without_ignore.php    |    4 +
 .../tests/_files/source_without_namespace.php |   18 +
 .../phpunit/php-file-iterator/.gitattributes  |    1 +
 vendor/phpunit/php-file-iterator/.gitignore   |    7 +
 .../php-file-iterator/ChangeLog.markdown      |   31 +
 .../php-file-iterator/File/Iterator.php       |  196 +
 .../File/Iterator/Autoload.php                |   66 +
 .../File/Iterator/Autoload.php.in             |   64 +
 .../File/Iterator/Facade.php                  |  161 +
 .../File/Iterator/Factory.php                 |  120 +
 vendor/phpunit/php-file-iterator/LICENSE      |   33 +
 .../phpunit/php-file-iterator/README.markdown |   23 +
 vendor/phpunit/php-file-iterator/build.xml    |  161 +
 .../ControlSignatureSniff.php                 |   22 +
 .../Whitespace/ConcatenationSpacingSniff.php  |   22 +
 .../php-file-iterator/build/PHPCS/ruleset.xml |   35 +
 .../phpunit/php-file-iterator/build/phpmd.xml |   27 +
 .../phpunit/php-file-iterator/composer.json   |   33 +
 vendor/phpunit/php-file-iterator/package.xml  |   65 +
 .../phpunit/php-text-template/.gitattributes  |    1 +
 vendor/phpunit/php-text-template/.gitignore   |    5 +
 vendor/phpunit/php-text-template/LICENSE      |   33 +
 vendor/phpunit/php-text-template/README.md    |   14 +
 .../phpunit/php-text-template/composer.json   |   29 +
 .../php-text-template/src/Template.php        |  135 +
 vendor/phpunit/php-timer/.gitattributes       |    1 +
 vendor/phpunit/php-timer/.gitignore           |    7 +
 vendor/phpunit/php-timer/.travis.yml          |   22 +
 vendor/phpunit/php-timer/LICENSE              |   33 +
 vendor/phpunit/php-timer/README.md            |   47 +
 vendor/phpunit/php-timer/composer.json        |   29 +
 vendor/phpunit/php-timer/src/Timer.php        |  107 +
 vendor/phpunit/php-timer/tests/TimerTest.php  |  101 +
 .../phpunit/php-token-stream/.gitattributes   |    1 +
 vendor/phpunit/php-token-stream/.gitignore    |    4 +
 vendor/phpunit/php-token-stream/.travis.yml   |   30 +
 vendor/phpunit/php-token-stream/LICENSE       |   33 +
 vendor/phpunit/php-token-stream/README.md     |   13 +
 vendor/phpunit/php-token-stream/build.xml     |   33 +
 .../php-token-stream/build/phpunit.xml        |   17 +
 vendor/phpunit/php-token-stream/composer.json |   34 +
 vendor/phpunit/php-token-stream/src/Token.php |  846 ++++
 .../php-token-stream/src/Token/Stream.php     |  606 +++
 .../src/Token/Stream/CachingFactory.php       |   51 +
 .../tests/Token/ClassTest.php                 |   96 +
 .../tests/Token/ClosureTest.php               |   85 +
 .../tests/Token/FunctionTest.php              |  146 +
 .../tests/Token/IncludeTest.php               |   73 +
 .../tests/Token/InterfaceTest.php             |  191 +
 .../tests/Token/NamespaceTest.php             |   80 +
 .../php-token-stream/tests/TokenTest.php      |   42 +
 .../_fixture/classExtendsNamespacedClass.php  |   10 +
 .../tests/_fixture/classInNamespace.php       |    6 +
 .../tests/_fixture/classInScopedNamespace.php |    9 +
 ...h_method_that_declares_anonymous_class.php |   15 +
 .../tests/_fixture/closure.php                |    7 +
 .../tests/_fixture/issue19.php                |    3 +
 .../tests/_fixture/issue30.php                |    8 +
 ...tipleNamespacesWithOneClassUsingBraces.php |   12 +
 ...espacesWithOneClassUsingNonBraceSyntax.php |   14 +
 .../tests/_fixture/source.php                 |   36 +
 .../tests/_fixture/source2.php                |    6 +
 .../tests/_fixture/source3.php                |   14 +
 .../tests/_fixture/source4.php                |   30 +
 .../tests/_fixture/source5.php                |    5 +
 .../php-token-stream/tests/bootstrap.php      |    7 +
 .../phpunit-mock-objects/.gitattributes       |    1 +
 .../phpunit/phpunit-mock-objects/.gitignore   |    8 +
 .../phpunit/phpunit-mock-objects/.travis.yml  |   29 +
 .../phpunit-mock-objects/CONTRIBUTING.md      |    5 +
 vendor/phpunit/phpunit-mock-objects/LICENSE   |   33 +
 vendor/phpunit/phpunit-mock-objects/README.md |   21 +
 vendor/phpunit/phpunit-mock-objects/build.xml |   50 +
 .../phpunit-mock-objects/build/travis-ci.xml  |   12 +
 .../phpunit-mock-objects/composer.json        |   46 +
 .../phpunit-mock-objects/phpunit.xml.dist     |   22 +
 .../Framework/MockObject/Builder/Identity.php |   70 +
 .../MockObject/Builder/InvocationMocker.php   |  294 ++
 .../Framework/MockObject/Builder/Match.php    |   66 +
 .../MockObject/Builder/MethodNameMatch.php    |   68 +
 .../MockObject/Builder/Namespace.php          |   79 +
 .../MockObject/Builder/ParametersMatch.php    |   89 +
 .../src/Framework/MockObject/Builder/Stub.php |   66 +
 .../Exception/BadMethodCallException.php      |   55 +
 .../MockObject/Exception/Exception.php        |   57 +
 .../MockObject/Exception/RuntimeException.php |   55 +
 .../src/Framework/MockObject/Generator.php    | 1098 +++++
 .../Generator/mocked_class.tpl.dist           |   36 +
 .../Generator/mocked_class_method.tpl.dist    |    7 +
 .../Generator/mocked_clone.tpl.dist           |    4 +
 .../Generator/mocked_method.tpl.dist          |   22 +
 .../Generator/mocked_static_method.tpl.dist   |    5 +
 .../Generator/proxied_method.tpl.dist         |   22 +
 .../MockObject/Generator/trait_class.tpl.dist |    4 +
 .../Generator/unmocked_clone.tpl.dist         |    5 +
 .../MockObject/Generator/wsdl_class.tpl.dist  |    7 +
 .../MockObject/Generator/wsdl_method.tpl.dist |    4 +
 .../src/Framework/MockObject/Invocation.php   |   58 +
 .../MockObject/Invocation/Object.php          |   75 +
 .../MockObject/Invocation/Static.php          |  193 +
 .../Framework/MockObject/InvocationMocker.php |  195 +
 .../src/Framework/MockObject/Invokable.php    |   79 +
 .../src/Framework/MockObject/Matcher.php      |  316 ++
 .../MockObject/Matcher/AnyInvokedCount.php    |   72 +
 .../MockObject/Matcher/AnyParameters.php      |   74 +
 .../Matcher/ConsecutiveParameters.php         |  162 +
 .../MockObject/Matcher/Invocation.php         |   88 +
 .../MockObject/Matcher/InvokedAtIndex.php     |  127 +
 .../MockObject/Matcher/InvokedAtLeastOnce.php |   85 +
 .../MockObject/Matcher/InvokedCount.php       |  151 +
 .../MockObject/Matcher/InvokedRecorder.php    |  107 +
 .../MockObject/Matcher/MethodName.php         |  102 +
 .../MockObject/Matcher/Parameters.php         |  160 +
 .../Matcher/StatelessInvocation.php           |   96 +
 .../src/Framework/MockObject/MockBuilder.php  |  363 ++
 .../src/Framework/MockObject/MockObject.php   |   86 +
 .../src/Framework/MockObject/Stub.php         |   71 +
 .../MockObject/Stub/ConsecutiveCalls.php      |   87 +
 .../Framework/MockObject/Stub/Exception.php   |   80 +
 .../MockObject/Stub/MatcherCollection.php     |   66 +
 .../src/Framework/MockObject/Stub/Return.php  |   78 +
 .../MockObject/Stub/ReturnArgument.php        |   78 +
 .../MockObject/Stub/ReturnCallback.php        |   94 +
 .../Framework/MockObject/Stub/ReturnSelf.php  |   76 +
 .../MockObject/Stub/ReturnValueMap.php        |   87 +
 .../src/Framework/MockObject/Verifiable.php   |   65 +
 .../tests/GeneratorTest.php                   |  142 +
 .../tests/MockBuilderTest.php                 |  148 +
 .../MockObject/Invocation/ObjectTest.php      |   81 +
 .../MockObject/Invocation/StaticTest.php      |   52 +
 .../Matcher/ConsecutiveParametersTest.php     |   32 +
 .../tests/MockObject/class.phpt               |  121 +
 .../MockObject/class_call_parent_clone.phpt   |   73 +
 .../class_call_parent_constructor.phpt        |   72 +
 .../class_dont_call_parent_clone.phpt         |   72 +
 .../class_dont_call_parent_constructor.phpt   |   72 +
 ...ing_interface_call_parent_constructor.phpt |   77 +
 ...nterface_dont_call_parent_constructor.phpt |   77 +
 .../tests/MockObject/class_partial.phpt       |   99 +
 .../class_with_method_named_method.phpt       |   88 +
 .../tests/MockObject/interface.phpt           |   93 +
 .../invocation_object_clone_object.phpt       |  122 +
 .../tests/MockObject/namespaced_class.phpt    |  123 +
 .../namespaced_class_call_parent_clone.phpt   |   75 +
 ...espaced_class_call_parent_constructor.phpt |   74 +
 ...mespaced_class_dont_call_parent_clone.phpt |   74 +
 ...ed_class_dont_call_parent_constructor.phpt |   74 +
 ...ing_interface_call_parent_constructor.phpt |   79 +
 ...nterface_dont_call_parent_constructor.phpt |   79 +
 .../MockObject/namespaced_class_partial.phpt  |  101 +
 .../MockObject/namespaced_interface.phpt      |   95 +
 .../tests/MockObject/nonexistent_class.phpt   |   70 +
 .../nonexistent_class_with_namespace.phpt     |   78 +
 ...ith_namespace_starting_with_separator.phpt |   78 +
 .../tests/MockObject/proxy.phpt               |  117 +
 .../tests/MockObject/wsdl_class.phpt          |   37 +
 .../MockObject/wsdl_class_namespace.phpt      |   39 +
 .../tests/MockObject/wsdl_class_partial.phpt  |   30 +
 .../tests/MockObjectTest.php                  |  804 ++++
 .../tests/ProxyObjectTest.php                 |   80 +
 .../ClassThatImplementsSerializable.php       |   15 +
 .../tests/_files/ClassWithStaticMethod.php    |    7 +
 .../tests/_fixture/AbstractMockTestClass.php  |   10 +
 .../tests/_fixture/AbstractTrait.php          |   15 +
 .../tests/_fixture/AnInterface.php            |    5 +
 .../tests/_fixture/AnotherInterface.php       |    5 +
 .../tests/_fixture/Bar.php                    |    8 +
 .../tests/_fixture/Foo.php                    |    8 +
 .../tests/_fixture/FunctionCallback.php       |    9 +
 .../tests/_fixture/GoogleSearch.wsdl          |  198 +
 .../_fixture/InterfaceWithStaticMethod.php    |    6 +
 .../tests/_fixture/MethodCallback.php         |   21 +
 .../_fixture/MethodCallbackByReference.php    |   13 +
 .../tests/_fixture/Mockable.php               |   28 +
 .../tests/_fixture/PartialMockTestClass.php   |   18 +
 .../tests/_fixture/SomeClass.php              |   13 +
 .../tests/_fixture/StaticMockTestClass.php    |   12 +
 .../_fixture/TraversableMockTestInterface.php |    4 +
 .../phpunit-mock-objects/tests/autoload.php   |   41 +
 .../phpunit-mock-objects/tests/bootstrap.php  |    5 +
 vendor/phpunit/phpunit/.gitattributes         |    3 +
 vendor/phpunit/phpunit/.gitignore             |   22 +
 vendor/phpunit/phpunit/.travis.yml            |   27 +
 vendor/phpunit/phpunit/CONTRIBUTING.md        |   23 +
 vendor/phpunit/phpunit/LICENSE                |   33 +
 vendor/phpunit/phpunit/README.md              |   41 +
 vendor/phpunit/phpunit/build.xml              |  358 ++
 vendor/phpunit/phpunit/build/ca.pem           |   44 +
 .../phpunit/build/phar-autoload.php.in        |   43 +
 .../phpunit/phpunit/build/phar-manifest.php   |   28 +
 vendor/phpunit/phpunit/build/phar-version.php |   22 +
 vendor/phpunit/phpunit/build/phpmd.xml        |   27 +
 vendor/phpunit/phpunit/build/travis-ci.xml    |   25 +
 vendor/phpunit/phpunit/composer.json          |   74 +
 vendor/phpunit/phpunit/phpdox.xml.dist        |   23 +
 vendor/phpunit/phpunit/phpunit                |   55 +
 vendor/phpunit/phpunit/phpunit.xml.dist       |   38 +
 vendor/phpunit/phpunit/phpunit.xsd            |  254 +
 vendor/phpunit/phpunit/src/Exception.php      |   59 +
 .../phpunit/src/Extensions/GroupTestSuite.php |   99 +
 .../phpunit/src/Extensions/PhptTestCase.php   |  256 +
 .../phpunit/src/Extensions/PhptTestSuite.php  |   82 +
 .../phpunit/src/Extensions/RepeatedTest.php   |  145 +
 .../phpunit/src/Extensions/TestDecorator.php  |  149 +
 .../phpunit/src/Extensions/TicketListener.php |  232 +
 .../phpunit/phpunit/src/Framework/Assert.php  | 2993 ++++++++++++
 .../src/Framework/Assert/Functions.php        | 2461 ++++++++++
 .../src/Framework/AssertionFailedError.php    |   68 +
 .../src/Framework/BaseTestListener.php        |   78 +
 .../src/Framework/CodeCoverageException.php   |   57 +
 .../phpunit/src/Framework/Constraint.php      |  189 +
 .../phpunit/src/Framework/Constraint/And.php  |  164 +
 .../src/Framework/Constraint/ArrayHasKey.php  |  123 +
 .../src/Framework/Constraint/Attribute.php    |  129 +
 .../src/Framework/Constraint/Callback.php     |  116 +
 .../Constraint/ClassHasAttribute.php          |  125 +
 .../Constraint/ClassHasStaticAttribute.php    |   98 +
 .../src/Framework/Constraint/Composite.php    |  113 +
 .../src/Framework/Constraint/Count.php        |  146 +
 .../src/Framework/Constraint/Exception.php    |  132 +
 .../Framework/Constraint/ExceptionCode.php    |  110 +
 .../Framework/Constraint/ExceptionMessage.php |  110 +
 .../src/Framework/Constraint/FileExists.php   |  102 +
 .../src/Framework/Constraint/GreaterThan.php  |   97 +
 .../src/Framework/Constraint/IsAnything.php   |  102 +
 .../src/Framework/Constraint/IsEmpty.php      |  108 +
 .../src/Framework/Constraint/IsEqual.php      |  216 +
 .../src/Framework/Constraint/IsFalse.php      |   82 +
 .../src/Framework/Constraint/IsIdentical.php  |  172 +
 .../src/Framework/Constraint/IsInstanceOf.php |  135 +
 .../src/Framework/Constraint/IsJson.php       |  109 +
 .../src/Framework/Constraint/IsNull.php       |   82 +
 .../src/Framework/Constraint/IsTrue.php       |   82 +
 .../src/Framework/Constraint/IsType.php       |  192 +
 .../src/Framework/Constraint/JsonMatches.php  |  111 +
 .../JsonMatches/ErrorMessageProvider.php      |  107 +
 .../src/Framework/Constraint/LessThan.php     |   97 +
 .../phpunit/src/Framework/Constraint/Not.php  |  205 +
 .../Constraint/ObjectHasAttribute.php         |   77 +
 .../phpunit/src/Framework/Constraint/Or.php   |  157 +
 .../src/Framework/Constraint/PCREMatch.php    |  106 +
 .../src/Framework/Constraint/SameSize.php     |   73 +
 .../Framework/Constraint/StringContains.php   |  124 +
 .../Framework/Constraint/StringEndsWith.php   |   97 +
 .../Framework/Constraint/StringMatches.php    |  145 +
 .../Framework/Constraint/StringStartsWith.php |   97 +
 .../Constraint/TraversableContains.php        |  168 +
 .../Constraint/TraversableContainsOnly.php    |  136 +
 .../phpunit/src/Framework/Constraint/Xor.php  |  162 +
 .../phpunit/phpunit/src/Framework/Error.php   |   75 +
 .../src/Framework/Error/Deprecated.php        |   65 +
 .../phpunit/src/Framework/Error/Notice.php    |   65 +
 .../phpunit/src/Framework/Error/Warning.php   |   65 +
 .../phpunit/src/Framework/Exception.php       |   57 +
 .../Framework/ExpectationFailedException.php  |   82 +
 .../phpunit/src/Framework/IncompleteTest.php  |   60 +
 .../src/Framework/IncompleteTestError.php     |   60 +
 .../Framework/InvalidCoversTargetError.php    |   60 +
 .../InvalidCoversTargetException.php          |   57 +
 .../phpunit/src/Framework/OutputError.php     |   60 +
 .../phpunit/src/Framework/RiskyTest.php       |   60 +
 .../phpunit/src/Framework/RiskyTestError.php  |   60 +
 .../phpunit/src/Framework/SelfDescribing.php  |   65 +
 .../phpunit/src/Framework/SkippedTest.php     |   59 +
 .../src/Framework/SkippedTestError.php        |   60 +
 .../src/Framework/SkippedTestSuiteError.php   |   60 +
 .../phpunit/src/Framework/SyntheticError.php  |  121 +
 vendor/phpunit/phpunit/src/Framework/Test.php |   66 +
 .../phpunit/src/Framework/TestCase.php        | 1925 ++++++++
 .../phpunit/src/Framework/TestFailure.php     |  175 +
 .../phpunit/src/Framework/TestListener.php    |  136 +
 .../phpunit/src/Framework/TestResult.php      | 1124 +++++
 .../phpunit/src/Framework/TestSuite.php       |  935 ++++
 .../src/Framework/TestSuite/DataProvider.php  |   70 +
 .../UnintentionallyCoveredCodeError.php       |   60 +
 .../phpunit/phpunit/src/Framework/Warning.php |  120 +
 .../phpunit/src/Runner/BaseTestRunner.php     |  183 +
 .../phpunit/phpunit/src/Runner/Exception.php  |   57 +
 .../phpunit/src/Runner/Filter/Factory.php     |   92 +
 .../phpunit/src/Runner/Filter/Group.php       |   98 +
 .../src/Runner/Filter/Group/Exclude.php       |   61 +
 .../src/Runner/Filter/Group/Include.php       |   61 +
 .../phpunit/src/Runner/Filter/Test.php        |  159 +
 .../src/Runner/StandardTestSuiteLoader.php    |  157 +
 .../phpunit/src/Runner/TestSuiteLoader.php    |   71 +
 vendor/phpunit/phpunit/src/Runner/Version.php |  105 +
 vendor/phpunit/phpunit/src/TextUI/Command.php |  977 ++++
 .../phpunit/src/TextUI/ResultPrinter.php      |  732 +++
 .../phpunit/phpunit/src/TextUI/TestRunner.php |  983 ++++
 vendor/phpunit/phpunit/src/Util/Blacklist.php |  150 +
 .../phpunit/src/Util/Configuration.php        | 1102 +++++
 .../phpunit/src/Util/DeprecatedFeature.php    |  108 +
 .../src/Util/DeprecatedFeature/Logger.php     |  212 +
 .../phpunit/phpunit/src/Util/ErrorHandler.php |  126 +
 .../phpunit/phpunit/src/Util/Fileloader.php   |  108 +
 .../phpunit/phpunit/src/Util/Filesystem.php   |   81 +
 vendor/phpunit/phpunit/src/Util/Filter.php    |  142 +
 vendor/phpunit/phpunit/src/Util/Getopt.php    |  199 +
 .../phpunit/phpunit/src/Util/GlobalState.php  |  388 ++
 .../src/Util/InvalidArgumentHelper.php        |   81 +
 vendor/phpunit/phpunit/src/Util/Log/JSON.php  |  282 ++
 vendor/phpunit/phpunit/src/Util/Log/JUnit.php |  483 ++
 vendor/phpunit/phpunit/src/Util/Log/TAP.php   |  272 ++
 vendor/phpunit/phpunit/src/Util/PHP.php       |  243 +
 .../phpunit/phpunit/src/Util/PHP/Default.php  |  121 +
 .../Util/PHP/Template/TestCaseMethod.tpl.dist |   64 +
 .../phpunit/phpunit/src/Util/PHP/Windows.php  |  145 +
 vendor/phpunit/phpunit/src/Util/Printer.php   |  208 +
 vendor/phpunit/phpunit/src/Util/String.php    |  110 +
 vendor/phpunit/phpunit/src/Util/Test.php      |  957 ++++
 .../src/Util/TestDox/NamePrettifier.php       |  181 +
 .../src/Util/TestDox/ResultPrinter.php        |  368 ++
 .../src/Util/TestDox/ResultPrinter/HTML.php   |  123 +
 .../src/Util/TestDox/ResultPrinter/Text.php   |   95 +
 .../phpunit/src/Util/TestSuiteIterator.php    |  148 +
 vendor/phpunit/phpunit/src/Util/Type.php      |   79 +
 vendor/phpunit/phpunit/src/Util/XML.php       |  978 ++++
 .../tests/Extensions/RepeatedTestTest.php     |  107 +
 .../phpunit/tests/Framework/AssertTest.php    | 4127 +++++++++++++++++
 .../tests/Framework/BaseTestListenerTest.php  |   75 +
 .../tests/Framework/Constraint/CountTest.php  |  106 +
 .../JsonMatches/ErrorMessageProviderTest.php  |  122 +
 .../Framework/Constraint/JsonMatchesTest.php  |   89 +
 .../tests/Framework/ConstraintTest.php        | 3664 +++++++++++++++
 .../Framework/SelectorAssertionsTest.php      |  998 ++++
 .../phpunit/tests/Framework/SuiteTest.php     |  232 +
 .../phpunit/tests/Framework/TestCaseTest.php  |  463 ++
 .../tests/Framework/TestFailureTest.php       |   68 +
 .../tests/Framework/TestImplementorTest.php   |   71 +
 .../tests/Framework/TestListenerTest.php      |  149 +
 .../phpunit/tests/Regression/1021.phpt        |   19 +
 .../tests/Regression/1021/Issue1021Test.php   |   23 +
 .../phpunit/phpunit/tests/Regression/523.phpt |   19 +
 .../tests/Regression/523/Issue523Test.php     |   13 +
 .../phpunit/phpunit/tests/Regression/578.phpt |   37 +
 .../tests/Regression/578/Issue578Test.php     |   20 +
 .../phpunit/phpunit/tests/Regression/684.phpt |   25 +
 .../tests/Regression/684/Issue684Test.php     |    4 +
 .../phpunit/phpunit/tests/Regression/783.phpt |   21 +
 .../tests/Regression/783/ChildSuite.php       |   15 +
 .../phpunit/tests/Regression/783/OneTest.php  |   10 +
 .../tests/Regression/783/ParentSuite.php      |   13 +
 .../phpunit/tests/Regression/783/TwoTest.php  |   10 +
 .../phpunit/tests/Regression/GitHub/1149.phpt |   20 +
 .../Regression/GitHub/1149/Issue1149Test.php  |   18 +
 .../phpunit/tests/Regression/GitHub/1265.phpt |   23 +
 .../Regression/GitHub/1265/Issue1265Test.php  |    8 +
 .../Regression/GitHub/1265/phpunit1265.xml    |    2 +
 .../phpunit/tests/Regression/GitHub/1330.phpt |   26 +
 .../Regression/GitHub/1330/Issue1330Test.php  |    8 +
 .../Regression/GitHub/1330/phpunit1330.xml    |    5 +
 .../phpunit/tests/Regression/GitHub/1335.phpt |   21 +
 .../Regression/GitHub/1335/Issue1335Test.php  |   67 +
 .../Regression/GitHub/1335/bootstrap1335.php  |   13 +
 .../phpunit/tests/Regression/GitHub/1337.phpt |   21 +
 .../Regression/GitHub/1337/Issue1337Test.php  |   19 +
 .../phpunit/tests/Regression/GitHub/1340.phpt |   34 +
 .../Regression/GitHub/1340/Issue1340Test.php  |   69 +
 .../phpunit/tests/Regression/GitHub/1374.phpt |   21 +
 .../Regression/GitHub/1374/Issue1374Test.php  |   21 +
 .../phpunit/tests/Regression/GitHub/244.phpt  |   32 +
 .../Regression/GitHub/244/Issue244Test.php    |   55 +
 .../phpunit/tests/Regression/GitHub/322.phpt  |   28 +
 .../Regression/GitHub/322/Issue322Test.php    |   17 +
 .../Regression/GitHub/322/phpunit322.xml      |   11 +
 .../phpunit/tests/Regression/GitHub/433.phpt  |   31 +
 .../Regression/GitHub/433/Issue433Test.php    |   21 +
 .../phpunit/tests/Regression/GitHub/445.phpt  |   32 +
 .../Regression/GitHub/445/Issue445Test.php    |   21 +
 .../phpunit/tests/Regression/GitHub/498.phpt  |   29 +
 .../Regression/GitHub/498/Issue498Test.php    |   46 +
 .../phpunit/tests/Regression/GitHub/503.phpt  |   33 +
 .../Regression/GitHub/503/Issue503Test.php    |   11 +
 .../phpunit/tests/Regression/GitHub/581.phpt  |   42 +
 .../Regression/GitHub/581/Issue581Test.php    |   10 +
 .../phpunit/tests/Regression/GitHub/74.phpt   |   28 +
 .../Regression/GitHub/74/Issue74Test.php      |    9 +
 .../Regression/GitHub/74/NewException.php     |    4 +
 .../phpunit/tests/Regression/GitHub/765.phpt  |   26 +
 .../Regression/GitHub/765/Issue765Test.php    |   22 +
 .../phpunit/tests/Regression/GitHub/863.phpt  |   24 +
 .../phpunit/tests/Regression/GitHub/873.phpt  |   16 +
 .../Regression/GitHub/873/Issue873Test.php    |    9 +
 .../tests/Runner/BaseTestRunnerTest.php       |   63 +
 .../tests/TextUI/abstract-test-class.phpt     |   25 +
 .../tests/TextUI/concrete-test-class.phpt     |   19 +
 .../tests/TextUI/custom-printer-debug.phpt    |   29 +
 .../tests/TextUI/custom-printer-verbose.phpt  |   31 +
 .../dataprovider-log-xml-isolation.phpt       |   47 +
 .../tests/TextUI/dataprovider-log-xml.phpt    |   46 +
 .../tests/TextUI/dataprovider-testdox.phpt    |   17 +
 .../phpunit/phpunit/tests/TextUI/debug.phpt   |   26 +
 .../tests/TextUI/default-isolation.phpt       |   20 +
 .../phpunit/phpunit/tests/TextUI/default.phpt |   19 +
 .../tests/TextUI/dependencies-isolation.phpt  |   38 +
 .../phpunit/tests/TextUI/dependencies.phpt    |   37 +
 .../tests/TextUI/dependencies2-isolation.phpt |   20 +
 .../phpunit/tests/TextUI/dependencies2.phpt   |   19 +
 .../tests/TextUI/dependencies3-isolation.phpt |   20 +
 .../phpunit/tests/TextUI/dependencies3.phpt   |   19 +
 .../phpunit/tests/TextUI/empty-testcase.phpt  |   25 +
 .../phpunit/tests/TextUI/exception-stack.phpt |   66 +
 .../tests/TextUI/exclude-group-isolation.phpt |   22 +
 .../phpunit/tests/TextUI/exclude-group.phpt   |   21 +
 .../tests/TextUI/failure-isolation.phpt       |  142 +
 .../phpunit/phpunit/tests/TextUI/failure.phpt |  141 +
 .../phpunit/tests/TextUI/fatal-isolation.phpt |   26 +
 .../phpunit/phpunit/tests/TextUI/fatal.phpt   |   16 +
 .../tests/TextUI/filter-class-isolation.phpt  |   22 +
 .../phpunit/tests/TextUI/filter-class.phpt    |   21 +
 ...ider-by-classname-and-range-isolation.phpt |   22 +
 ...r-dataprovider-by-classname-and-range.phpt |   21 +
 ...lter-dataprovider-by-number-isolation.phpt |   22 +
 .../TextUI/filter-dataprovider-by-number.phpt |   21 +
 ...-dataprovider-by-only-range-isolation.phpt |   22 +
 .../filter-dataprovider-by-only-range.phpt    |   21 +
 ...dataprovider-by-only-regexp-isolation.phpt |   22 +
 .../filter-dataprovider-by-only-regexp.phpt   |   21 +
 ...dataprovider-by-only-string-isolation.phpt |   22 +
 .../filter-dataprovider-by-only-string.phpt   |   21 +
 ...ilter-dataprovider-by-range-isolation.phpt |   22 +
 .../TextUI/filter-dataprovider-by-range.phpt  |   21 +
 ...lter-dataprovider-by-regexp-isolation.phpt |   22 +
 .../TextUI/filter-dataprovider-by-regexp.phpt |   21 +
 ...lter-dataprovider-by-string-isolation.phpt |   22 +
 .../TextUI/filter-dataprovider-by-string.phpt |   21 +
 .../tests/TextUI/filter-method-isolation.phpt |   22 +
 .../phpunit/tests/TextUI/filter-method.phpt   |   21 +
 .../tests/TextUI/filter-no-results.phpt       |   21 +
 .../phpunit/tests/TextUI/group-isolation.phpt |   22 +
 .../phpunit/phpunit/tests/TextUI/group.phpt   |   21 +
 vendor/phpunit/phpunit/tests/TextUI/help.phpt |   83 +
 .../phpunit/phpunit/tests/TextUI/help2.phpt   |   84 +
 .../phpunit/tests/TextUI/ini-isolation.phpt   |   22 +
 .../phpunit/tests/TextUI/list-groups.phpt     |   20 +
 .../phpunit/tests/TextUI/log-json-5.3.phpt    |   25 +
 .../tests/TextUI/log-json-post-66021.phpt     |   72 +
 .../tests/TextUI/log-json-pre-66021.phpt      |   78 +
 .../phpunit/phpunit/tests/TextUI/log-tap.phpt |   26 +
 .../phpunit/phpunit/tests/TextUI/log-xml.phpt |   29 +
 .../phpunit/phpunit/tests/TextUI/repeat.phpt  |   21 +
 .../tests/TextUI/strict-incomplete.phpt       |   21 +
 .../tests/TextUI/strict-isolation.phpt        |   22 +
 .../phpunit/phpunit/tests/TextUI/strict.phpt  |   21 +
 vendor/phpunit/phpunit/tests/TextUI/tap.phpt  |   18 +
 .../tests/TextUI/test-suffix-multiple.phpt    |   20 +
 .../tests/TextUI/test-suffix-single.phpt      |   20 +
 .../phpunit/tests/TextUI/testdox-html.phpt    |   21 +
 .../phpunit/tests/TextUI/testdox-text.phpt    |   25 +
 .../phpunit/phpunit/tests/TextUI/testdox.phpt |   19 +
 .../phpunit/tests/Util/ConfigurationTest.php  |  491 ++
 .../tests/Util/TestDox/NamePrettifierTest.php |  122 +
 .../phpunit/phpunit/tests/Util/TestTest.php   |  538 +++
 vendor/phpunit/phpunit/tests/Util/XMLTest.php |  369 ++
 .../phpunit/tests/_files/AbstractTest.php     |    7 +
 .../phpunit/phpunit/tests/_files/Author.php   |   66 +
 .../phpunit/tests/_files/BankAccount.php      |  116 +
 .../phpunit/tests/_files/BankAccountTest.php  |  130 +
 .../tests/_files/BankAccountTest.test.php     |  130 +
 .../tests/_files/BaseTestListenerSample.php   |   11 +
 .../tests/_files/BeforeAndAfterTest.php       |   31 +
 .../_files/BeforeClassAndAfterClassTest.php   |   31 +
 vendor/phpunit/phpunit/tests/_files/Book.php  |   59 +
 .../phpunit/tests/_files/Calculator.php       |   14 +
 .../ChangeCurrentWorkingDirectoryTest.php     |   10 +
 .../_files/ClassWithNonPublicAttributes.php   |   29 +
 .../tests/_files/ClassWithToString.php        |   61 +
 .../phpunit/tests/_files/ConcreteTest.my.php  |    7 +
 .../phpunit/tests/_files/ConcreteTest.php     |    7 +
 .../_files/CoverageClassExtendedTest.php      |   12 +
 .../tests/_files/CoverageClassTest.php        |   12 +
 .../CoverageFunctionParenthesesTest.php       |   11 +
 ...erageFunctionParenthesesWhitespaceTest.php |   11 +
 .../tests/_files/CoverageFunctionTest.php     |   11 +
 .../CoverageMethodOneLineAnnotationTest.php   |   12 +
 .../_files/CoverageMethodParenthesesTest.php  |   12 +
 ...overageMethodParenthesesWhitespaceTest.php |   12 +
 .../tests/_files/CoverageMethodTest.php       |   12 +
 .../phpunit/tests/_files/CoverageNoneTest.php |    9 +
 .../tests/_files/CoverageNotPrivateTest.php   |   12 +
 .../tests/_files/CoverageNotProtectedTest.php |   12 +
 .../tests/_files/CoverageNotPublicTest.php    |   12 +
 .../tests/_files/CoverageNothingTest.php      |   13 +
 .../tests/_files/CoveragePrivateTest.php      |   12 +
 .../tests/_files/CoverageProtectedTest.php    |   12 +
 .../tests/_files/CoveragePublicTest.php       |   12 +
 .../CoverageTwoDefaultClassAnnotations.php    |   19 +
 .../phpunit/tests/_files/CoveredClass.php     |   36 +
 .../phpunit/tests/_files/CoveredFunction.php  |    4 +
 .../phpunit/tests/_files/CustomPrinter.php    |    4 +
 .../tests/_files/DataProviderFilterTest.php   |   39 +
 .../phpunit/tests/_files/DataProviderTest.php |   21 +
 .../tests/_files/DependencyFailureTest.php    |   22 +
 .../tests/_files/DependencySuccessTest.php    |   21 +
 .../tests/_files/DependencyTestSuite.php      |   13 +
 .../phpunit/tests/_files/DoubleTestCase.php   |   25 +
 .../phpunit/tests/_files/DummyException.php   |    5 +
 .../tests/_files/EmptyTestCaseTest.php        |    4 +
 vendor/phpunit/phpunit/tests/_files/Error.php |    8 +
 .../ExceptionInAssertPostConditionsTest.php   |   35 +
 .../ExceptionInAssertPreConditionsTest.php    |   35 +
 .../tests/_files/ExceptionInSetUpTest.php     |   35 +
 .../tests/_files/ExceptionInTearDownTest.php  |   35 +
 .../phpunit/tests/_files/ExceptionInTest.php  |   35 +
 .../tests/_files/ExceptionNamespaceTest.php   |   38 +
 .../tests/_files/ExceptionStackTest.php       |   23 +
 .../phpunit/tests/_files/ExceptionTest.php    |  102 +
 .../phpunit/phpunit/tests/_files/Failure.php  |    8 +
 .../phpunit/tests/_files/FailureTest.php      |   76 +
 .../phpunit/tests/_files/FatalTest.php        |   14 +
 .../phpunit/tests/_files/IncompleteTest.php   |    8 +
 .../tests/_files/Inheritance/InheritanceA.php |    8 +
 .../tests/_files/Inheritance/InheritanceB.php |    9 +
 .../tests/_files/InheritedTestCase.php        |    7 +
 .../phpunit/phpunit/tests/_files/IniTest.php  |    8 +
 .../tests/_files/JsonData/arrayObject.js      |    1 +
 .../tests/_files/JsonData/simpleObject.js     |    1 +
 .../tests/_files/JsonData/simpleObject2.js    |    1 +
 .../phpunit/tests/_files/MockRunner.php       |    7 +
 .../tests/_files/MultiDependencyTest.php      |   23 +
 .../NamespaceCoverageClassExtendedTest.php    |   12 +
 .../_files/NamespaceCoverageClassTest.php     |   12 +
 ...NamespaceCoverageCoversClassPublicTest.php |   16 +
 .../NamespaceCoverageCoversClassTest.php      |   21 +
 .../_files/NamespaceCoverageMethodTest.php    |   12 +
 .../NamespaceCoverageNotPrivateTest.php       |   12 +
 .../NamespaceCoverageNotProtectedTest.php     |   12 +
 .../_files/NamespaceCoverageNotPublicTest.php |   12 +
 .../_files/NamespaceCoveragePrivateTest.php   |   12 +
 .../_files/NamespaceCoverageProtectedTest.php |   12 +
 .../_files/NamespaceCoveragePublicTest.php    |   12 +
 .../tests/_files/NamespaceCoveredClass.php    |   38 +
 .../tests/_files/NoArgTestCaseTest.php        |    7 +
 .../phpunit/tests/_files/NoTestCaseClass.php  |    4 +
 .../phpunit/tests/_files/NoTestCases.php      |    7 +
 .../phpunit/tests/_files/NonStatic.php        |    8 +
 .../_files/NotExistingCoveredElementTest.php  |   24 +
 .../tests/_files/NotPublicTestCase.php        |   11 +
 .../phpunit/tests/_files/NotVoidTestCase.php  |    4 +
 .../phpunit/tests/_files/NothingTest.php      |    7 +
 .../phpunit/tests/_files/OneTestCase.php      |   11 +
 .../phpunit/tests/_files/OutputTestCase.php   |   27 +
 .../phpunit/tests/_files/OverrideTestCase.php |    7 +
 .../_files/RequirementsClassDocBlockTest.php  |   25 +
 .../phpunit/tests/_files/RequirementsTest.php |  149 +
 .../tests/_files/SampleArrayAccess.php        |   32 +
 .../phpunit/tests/_files/SampleClass.php      |   14 +
 .../_files/SelectorAssertionsFixture.html     |   44 +
 .../phpunit/tests/_files/Singleton.php        |   22 +
 .../phpunit/tests/_files/StackTest.php        |   24 +
 .../phpunit/phpunit/tests/_files/Struct.php   |   10 +
 .../phpunit/phpunit/tests/_files/Success.php  |    7 +
 .../tests/_files/TemplateMethodsTest.php      |   51 +
 .../phpunit/tests/_files/TestIterator.php     |   36 +
 .../phpunit/tests/_files/TestIterator2.php    |   35 +
 .../tests/_files/ThrowExceptionTestCase.php   |    8 +
 .../tests/_files/ThrowNoExceptionTestCase.php |    7 +
 .../phpunit/phpunit/tests/_files/WasRun.php   |   10 +
 vendor/phpunit/phpunit/tests/_files/bar.xml   |    1 +
 .../_files/configuration.custom-printer.xml   |    2 +
 .../phpunit/tests/_files/configuration.xml    |  117 +
 .../tests/_files/configuration_empty.xml      |   57 +
 .../tests/_files/configuration_xinclude.xml   |   69 +
 .../tests/_files/expectedFileFormat.txt       |    1 +
 vendor/phpunit/phpunit/tests/_files/foo.xml   |    1 +
 ...uctureAttributesAreSameButValuesAreNot.xml |   10 +
 .../tests/_files/structureExpected.xml        |   10 +
 .../tests/_files/structureIgnoreTextNodes.xml |   13 +
 .../_files/structureIsSameButDataIsNot.xml    |   10 +
 .../structureWrongNumberOfAttributes.xml      |   10 +
 .../_files/structureWrongNumberOfNodes.xml    |    9 +
 .../phpunit/tests/bootstrap-travis.php        |    4 +
 vendor/phpunit/phpunit/tests/bootstrap.php    |   10 +
 vendor/sebastian/comparator/.gitignore        |    6 +
 vendor/sebastian/comparator/.travis.yml       |   25 +
 vendor/sebastian/comparator/LICENSE           |   33 +
 vendor/sebastian/comparator/README.md         |   41 +
 vendor/sebastian/comparator/build.xml         |   34 +
 .../sebastian/comparator/build/travis-ci.xml  |   11 +
 vendor/sebastian/comparator/composer.json     |   44 +
 vendor/sebastian/comparator/phpunit.xml.dist  |   21 +
 .../comparator/src/ArrayComparator.php        |  136 +
 .../sebastian/comparator/src/Comparator.php   |   68 +
 .../comparator/src/ComparisonFailure.php      |  129 +
 .../comparator/src/DOMNodeComparator.php      |  110 +
 .../comparator/src/DateTimeComparator.php     |   80 +
 .../comparator/src/DoubleComparator.php       |   60 +
 .../comparator/src/ExceptionComparator.php    |   51 +
 vendor/sebastian/comparator/src/Factory.php   |  107 +
 .../comparator/src/MockObjectComparator.php   |   45 +
 .../comparator/src/NumericComparator.php      |   72 +
 .../comparator/src/ObjectComparator.php       |  109 +
 .../comparator/src/ResourceComparator.php     |   56 +
 .../comparator/src/ScalarComparator.php       |   94 +
 .../src/SplObjectStorageComparator.php        |   73 +
 .../comparator/src/TypeComparator.php         |   63 +
 .../comparator/tests/ArrayComparatorTest.php  |  163 +
 .../tests/DOMNodeComparatorTest.php           |  162 +
 .../tests/DateTimeComparatorTest.php          |  216 +
 .../comparator/tests/DoubleComparatorTest.php |  134 +
 .../tests/ExceptionComparatorTest.php         |  136 +
 .../comparator/tests/FactoryTest.php          |  115 +
 .../tests/MockObjectComparatorTest.php        |  166 +
 .../tests/NumericComparatorTest.php           |  122 +
 .../comparator/tests/ObjectComparatorTest.php |  150 +
 .../tests/ResourceComparatorTest.php          |  120 +
 .../comparator/tests/ScalarComparatorTest.php |  158 +
 .../tests/SplObjectStorageComparatorTest.php  |  137 +
 .../comparator/tests/TypeComparatorTest.php   |  104 +
 .../comparator/tests/_files/Author.php        |   28 +
 .../comparator/tests/_files/Book.php          |   21 +
 .../tests/_files/ClassWithToString.php        |   19 +
 .../comparator/tests/_files/SampleClass.php   |   29 +
 .../comparator/tests/_files/Struct.php        |   25 +
 .../comparator/tests/_files/TestClass.php     |   14 +
 .../tests/_files/TestClassComparator.php      |   14 +
 .../sebastian/comparator/tests/autoload.php   |   38 +
 .../sebastian/comparator/tests/bootstrap.php  |    7 +
 vendor/sebastian/diff/.gitignore              |   10 +
 vendor/sebastian/diff/.travis.yml             |   16 +
 vendor/sebastian/diff/LICENSE                 |   33 +
 vendor/sebastian/diff/README.md               |  126 +
 vendor/sebastian/diff/build.xml               |   26 +
 vendor/sebastian/diff/composer.json           |   33 +
 vendor/sebastian/diff/phpunit.xml.dist        |   17 +
 vendor/sebastian/diff/src/Chunk.php           |  110 +
 vendor/sebastian/diff/src/Diff.php            |   81 +
 vendor/sebastian/diff/src/Differ.php          |  256 +
 .../diff/src/LCS/LongestCommonSubsequence.php |   33 +
 ...LongestCommonSubsequenceImplementation.php |   98 +
 ...LongestCommonSubsequenceImplementation.php |   79 +
 vendor/sebastian/diff/src/Line.php            |   62 +
 vendor/sebastian/diff/src/Parser.php          |  105 +
 vendor/sebastian/diff/tests/DifferTest.php    |  Bin 0 -> 11371 bytes
 .../LCS/TimeEfficientImplementationTest.php   |  175 +
 vendor/sebastian/diff/tests/ParserTest.php    |   62 +
 .../sebastian/diff/tests/fixtures/patch.txt   |    9 +
 .../sebastian/diff/tests/fixtures/patch2.txt  |   21 +
 vendor/sebastian/environment/.gitignore       |    5 +
 vendor/sebastian/environment/.travis.yml      |   16 +
 vendor/sebastian/environment/LICENSE          |   33 +
 vendor/sebastian/environment/README.md        |   72 +
 vendor/sebastian/environment/build.xml        |   26 +
 vendor/sebastian/environment/composer.json    |   29 +
 vendor/sebastian/environment/phpunit.xml.dist |   20 +
 vendor/sebastian/environment/src/Console.php  |   81 +
 vendor/sebastian/environment/src/Runtime.php  |  192 +
 .../environment/tests/ConsoleTest.php         |   60 +
 .../environment/tests/RuntimeTest.php         |  112 +
 vendor/sebastian/exporter/.gitignore          |    9 +
 vendor/sebastian/exporter/.travis.yml         |   23 +
 vendor/sebastian/exporter/LICENSE             |   33 +
 vendor/sebastian/exporter/README.md           |  171 +
 vendor/sebastian/exporter/build.xml           |   27 +
 vendor/sebastian/exporter/composer.json       |   47 +
 vendor/sebastian/exporter/phpunit.xml.dist    |   21 +
 vendor/sebastian/exporter/src/Exporter.php    |  296 ++
 .../sebastian/exporter/tests/ExporterTest.php |  333 ++
 vendor/sebastian/recursion-context/.gitignore |    9 +
 .../sebastian/recursion-context/.travis.yml   |   21 +
 vendor/sebastian/recursion-context/LICENSE    |   33 +
 vendor/sebastian/recursion-context/README.md  |   13 +
 vendor/sebastian/recursion-context/build.xml  |   27 +
 .../sebastian/recursion-context/composer.json |   36 +
 .../recursion-context/phpunit.xml.dist        |   20 +
 .../recursion-context/src/Context.php         |  153 +
 .../recursion-context/src/Exception.php       |   17 +
 .../src/InvalidArgumentException.php          |   17 +
 .../recursion-context/tests/ContextTest.php   |  144 +
 vendor/sebastian/version/.gitattributes       |    1 +
 vendor/sebastian/version/.gitignore           |    1 +
 vendor/sebastian/version/LICENSE              |   33 +
 vendor/sebastian/version/README.md            |   37 +
 vendor/sebastian/version/composer.json        |   21 +
 vendor/sebastian/version/src/Version.php      |   82 +
 vendor/symfony/yaml/.gitignore                |    3 +
 vendor/symfony/yaml/CHANGELOG.md              |    8 +
 vendor/symfony/yaml/Dumper.php                |   73 +
 vendor/symfony/yaml/Escaper.php               |   97 +
 .../symfony/yaml/Exception/DumpException.php  |   23 +
 .../yaml/Exception/ExceptionInterface.php     |   23 +
 .../symfony/yaml/Exception/ParseException.php |  148 +
 .../yaml/Exception/RuntimeException.php       |   23 +
 vendor/symfony/yaml/Inline.php                |  546 +++
 vendor/symfony/yaml/LICENSE                   |   19 +
 vendor/symfony/yaml/Parser.php                |  697 +++
 vendor/symfony/yaml/README.md                 |   21 +
 vendor/symfony/yaml/Tests/DumperTest.php      |  236 +
 .../yaml/Tests/Fixtures/YtsAnchorAlias.yml    |   31 +
 .../yaml/Tests/Fixtures/YtsBasicTests.yml     |  202 +
 .../yaml/Tests/Fixtures/YtsBlockMapping.yml   |   51 +
 .../Tests/Fixtures/YtsDocumentSeparator.yml   |   85 +
 .../yaml/Tests/Fixtures/YtsErrorTests.yml     |   25 +
 .../Tests/Fixtures/YtsFlowCollections.yml     |   60 +
 .../yaml/Tests/Fixtures/YtsFoldedScalars.yml  |  176 +
 .../Tests/Fixtures/YtsNullsAndEmpties.yml     |   45 +
 .../Fixtures/YtsSpecificationExamples.yml     | 1697 +++++++
 .../yaml/Tests/Fixtures/YtsTypeTransfers.yml  |  244 +
 .../yaml/Tests/Fixtures/embededPhp.yml        |    1 +
 .../yaml/Tests/Fixtures/escapedCharacters.yml |  147 +
 vendor/symfony/yaml/Tests/Fixtures/index.yml  |   18 +
 .../yaml/Tests/Fixtures/sfComments.yml        |   73 +
 .../symfony/yaml/Tests/Fixtures/sfCompact.yml |  159 +
 .../yaml/Tests/Fixtures/sfMergeKey.yml        |   45 +
 .../symfony/yaml/Tests/Fixtures/sfObjects.yml |   11 +
 .../symfony/yaml/Tests/Fixtures/sfQuotes.yml  |   33 +
 .../symfony/yaml/Tests/Fixtures/sfTests.yml   |  135 +
 .../Tests/Fixtures/unindentedCollections.yml  |   82 +
 vendor/symfony/yaml/Tests/InlineTest.php      |  384 ++
 .../symfony/yaml/Tests/ParseExceptionTest.php |   41 +
 vendor/symfony/yaml/Tests/ParserTest.php      |  755 +++
 vendor/symfony/yaml/Tests/YamlTest.php        |   37 +
 vendor/symfony/yaml/Unescaper.php             |  146 +
 vendor/symfony/yaml/Yaml.php                  |  105 +
 vendor/symfony/yaml/composer.json             |   33 +
 vendor/symfony/yaml/phpunit.xml.dist          |   28 +
 view/admin/plugins.php                        |   57 +
 view/help.php                                 |    2 +-
 view/post.php                                 |    2 +-
 1057 files changed, 87341 insertions(+), 499 deletions(-)
 delete mode 100644 app/cache/.gitkeep
 delete mode 100644 app/routes.php
 create mode 100644 cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
 create mode 100644 cache/cache_parser_data.php
 rename {app => featherbb}/Controller/Admin/Bans.php (95%)
 rename {app => featherbb}/Controller/Admin/Categories.php (92%)
 rename {app => featherbb}/Controller/Admin/Censoring.php (90%)
 rename {app => featherbb}/Controller/Admin/Forums.php (91%)
 rename {app => featherbb}/Controller/Admin/Groups.php (96%)
 rename {app => featherbb}/Controller/Admin/Index.php (96%)
 rename {app => featherbb}/Controller/Admin/Maintenance.php (93%)
 rename {app => featherbb}/Controller/Admin/Options.php (88%)
 rename {app => featherbb}/Controller/Admin/Parser.php (93%)
 rename {app => featherbb}/Controller/Admin/Permissions.php (87%)
 rename {app => featherbb}/Controller/Admin/Plugins.php (99%)
 rename {app => featherbb}/Controller/Admin/Reports.php (89%)
 rename {app => featherbb}/Controller/Admin/Statistics.php (91%)
 rename {app => featherbb}/Controller/Admin/Users.php (98%)
 rename {app => featherbb}/Controller/Auth.php (85%)
 rename {app => featherbb}/Controller/Delete.php (88%)
 rename {app => featherbb}/Controller/Edit.php (89%)
 rename {app => featherbb}/Controller/Help.php (88%)
 rename {app => featherbb}/Controller/Index.php (84%)
 rename {app => featherbb}/Controller/Install.php (98%)
 rename {app => featherbb}/Controller/Login.php (92%)
 rename {app => featherbb}/Controller/Misc.php (95%)
 rename {app => featherbb}/Controller/Moderate.php (96%)
 rename {app => featherbb}/Controller/Post.php (94%)
 rename {app => featherbb}/Controller/Profile.php (93%)
 rename {app => featherbb}/Controller/Register.php (89%)
 rename {app => featherbb}/Controller/Search.php (86%)
 rename {app => featherbb}/Controller/Userlist.php (93%)
 rename {app => featherbb}/Controller/Viewforum.php (95%)
 rename {app => featherbb}/Controller/Viewtopic.php (92%)
 rename {app => featherbb}/Core/AdminUtils.php (94%)
 rename {app => featherbb}/Core/Auth.php (97%)
 rename {app => featherbb}/Core/Cache.php (99%)
 rename {app => featherbb}/Core/Core.php (93%)
 rename {app => featherbb}/Core/Csrf.php (100%)
 rename {app => featherbb}/Core/Database.php (100%)
 rename {app => featherbb}/Core/Email.php (99%)
 rename {app => featherbb}/Core/Error.php (100%)
 rename {app => featherbb}/Core/Hooks.php (100%)
 rename {app => featherbb}/Core/Lister.php (98%)
 rename {app => featherbb}/Core/Plugin.php (100%)
 rename {app => featherbb}/Core/Search.php (99%)
 rename {app => featherbb}/Core/Url.php (100%)
 rename {app => featherbb}/Core/Utils.php (100%)
 rename {app => featherbb}/Core/View.php (97%)
 rename {app => featherbb}/Core/pomo/.editorconfig (100%)
 rename {app => featherbb}/Core/pomo/MO.php (100%)
 rename {app => featherbb}/Core/pomo/PO.php (100%)
 rename {app => featherbb}/Core/pomo/Streams/CachedFileReader.php (100%)
 rename {app => featherbb}/Core/pomo/Streams/CachedIntFileReader.php (100%)
 rename {app => featherbb}/Core/pomo/Streams/FileReader.php (100%)
 rename {app => featherbb}/Core/pomo/Streams/Reader.php (100%)
 rename {app => featherbb}/Core/pomo/Streams/StringReader.php (100%)
 rename {app => featherbb}/Core/pomo/Translations/EntryTranslations.php (100%)
 rename {app => featherbb}/Core/pomo/Translations/GettextTranslations.php (100%)
 rename {app => featherbb}/Core/pomo/Translations/NOOPTranslations.php (100%)
 rename {app => featherbb}/Core/pomo/Translations/Translations.php (100%)
 rename {app => featherbb}/Core/pomo/Translations/TranslationsInterface.php (100%)
 rename {app => featherbb}/Helpers/bbcd_compile.php (99%)
 rename {app => featherbb}/Helpers/bbcd_source.php (100%)
 rename {app => featherbb}/Helpers/functions.php (95%)
 rename {app => featherbb}/Helpers/l10n.php (100%)
 rename {app => featherbb}/Helpers/parser.php (99%)
 rename {app => featherbb}/Helpers/srand.php (100%)
 rename {app => featherbb}/Helpers/utf8/mbstring/core.php (100%)
 rename {app => featherbb}/Helpers/utf8/native/core.php (100%)
 rename {app => featherbb}/Helpers/utf8/ord.php (100%)
 rename {app => featherbb}/Helpers/utf8/str_ireplace.php (100%)
 rename {app => featherbb}/Helpers/utf8/str_pad.php (100%)
 rename {app => featherbb}/Helpers/utf8/str_split.php (100%)
 rename {app => featherbb}/Helpers/utf8/strcasecmp.php (100%)
 rename {app => featherbb}/Helpers/utf8/strcspn.php (100%)
 rename {app => featherbb}/Helpers/utf8/stristr.php (100%)
 rename {app => featherbb}/Helpers/utf8/strrev.php (100%)
 rename {app => featherbb}/Helpers/utf8/strspn.php (100%)
 rename {app => featherbb}/Helpers/utf8/substr_replace.php (100%)
 rename {app => featherbb}/Helpers/utf8/trim.php (100%)
 rename {app => featherbb}/Helpers/utf8/ucfirst.php (100%)
 rename {app => featherbb}/Helpers/utf8/ucwords.php (100%)
 rename {app => featherbb}/Helpers/utf8/utf8.php (100%)
 rename {app => featherbb}/Helpers/utf8/utils/ascii.php (100%)
 rename {app => featherbb}/Helpers/utf8/utils/bad.php (100%)
 rename {app => featherbb}/Helpers/utf8/utils/patterns.php (100%)
 rename {app => featherbb}/Helpers/utf8/utils/position.php (100%)
 rename {app => featherbb}/Helpers/utf8/utils/specials.php (100%)
 rename {app => featherbb}/Helpers/utf8/utils/unicode.php (100%)
 rename {app => featherbb}/Helpers/utf8/utils/validation.php (100%)
 rename {app => featherbb}/Model/Admin/Bans.php (98%)
 rename {app => featherbb}/Model/Admin/Categories.php (96%)
 rename {app => featherbb}/Model/Admin/Censoring.php (82%)
 rename {app => featherbb}/Model/Admin/Forums.php (98%)
 rename {app => featherbb}/Model/Admin/Groups.php (98%)
 rename {app => featherbb}/Model/Admin/Maintenance.php (99%)
 rename {app => featherbb}/Model/Admin/Options.php (99%)
 rename {app => featherbb}/Model/Admin/Parser.php (97%)
 rename {app => featherbb}/Model/Admin/Permissions.php (92%)
 rename {app => featherbb}/Model/Admin/Reports.php (99%)
 rename {app => featherbb}/Model/Admin/Statistics.php (99%)
 rename {app => featherbb}/Model/Admin/Users.php (99%)
 rename {app => featherbb}/Model/Auth.php (99%)
 rename {app => featherbb}/Model/Cache.php (99%)
 rename {app => featherbb}/Model/Debug.php (97%)
 rename {app => featherbb}/Model/Delete.php (99%)
 rename {app => featherbb}/Model/Edit.php (98%)
 rename {app => featherbb}/Model/Header.php (95%)
 rename {app => featherbb}/Model/Index.php (99%)
 rename {app => featherbb}/Model/Install.php (99%)
 rename {app => featherbb}/Model/Login.php (97%)
 rename {app => featherbb}/Model/Misc.php (98%)
 rename {app => featherbb}/Model/Moderate.php (99%)
 rename {app => featherbb}/Model/Post.php (97%)
 rename {app => featherbb}/Model/Profile.php (98%)
 rename {app => featherbb}/Model/Register.php (94%)
 rename {app => featherbb}/Model/Search.php (99%)
 rename {app => featherbb}/Model/Userlist.php (99%)
 rename {app => featherbb}/Model/Viewforum.php (99%)
 rename {app => featherbb}/Model/Viewtopic.php (99%)
 rename {app => featherbb}/lang/English/admin/bans.mo (100%)
 rename {app => featherbb}/lang/English/admin/bans.po (100%)
 rename {app => featherbb}/lang/English/admin/categories.mo (100%)
 rename {app => featherbb}/lang/English/admin/categories.po (100%)
 rename {app => featherbb}/lang/English/admin/censoring.mo (100%)
 rename {app => featherbb}/lang/English/admin/censoring.po (100%)
 rename {app => featherbb}/lang/English/admin/common.mo (100%)
 rename {app => featherbb}/lang/English/admin/common.po (100%)
 rename {app => featherbb}/lang/English/admin/forums.mo (100%)
 rename {app => featherbb}/lang/English/admin/forums.po (100%)
 rename {app => featherbb}/lang/English/admin/groups.mo (100%)
 rename {app => featherbb}/lang/English/admin/groups.po (100%)
 rename {app => featherbb}/lang/English/admin/index.html (100%)
 rename {app => featherbb}/lang/English/admin/index.mo (100%)
 rename {app => featherbb}/lang/English/admin/index.po (100%)
 rename {app => featherbb}/lang/English/admin/maintenance.mo (100%)
 rename {app => featherbb}/lang/English/admin/maintenance.po (100%)
 rename {app => featherbb}/lang/English/admin/options.mo (100%)
 rename {app => featherbb}/lang/English/admin/options.po (100%)
 rename {app => featherbb}/lang/English/admin/parser.mo (100%)
 rename {app => featherbb}/lang/English/admin/parser.php (100%)
 rename {app => featherbb}/lang/English/admin/parser.po (100%)
 rename {app => featherbb}/lang/English/admin/permissions.mo (100%)
 rename {app => featherbb}/lang/English/admin/permissions.po (100%)
 rename {app => featherbb}/lang/English/admin/plugin_example.mo (100%)
 rename {app => featherbb}/lang/English/admin/plugin_example.po (100%)
 rename {app => featherbb}/lang/English/admin/reports.mo (100%)
 rename {app => featherbb}/lang/English/admin/reports.po (100%)
 rename {app => featherbb}/lang/English/admin/users.mo (100%)
 rename {app => featherbb}/lang/English/admin/users.po (100%)
 rename {app => featherbb}/lang/English/antispam.mo (100%)
 rename {app => featherbb}/lang/English/antispam.php (100%)
 rename {app => featherbb}/lang/English/antispam.po (100%)
 rename {app => featherbb}/lang/English/antispam_questions.mo (100%)
 rename {app => featherbb}/lang/English/antispam_questions.po (100%)
 rename {app => featherbb}/lang/English/bbeditor.mo (100%)
 rename {app => featherbb}/lang/English/bbeditor.po (100%)
 rename {app => featherbb}/lang/English/common.mo (100%)
 rename {app => featherbb}/lang/English/common.po (100%)
 rename {app => featherbb}/lang/English/delete.mo (100%)
 rename {app => featherbb}/lang/English/delete.po (100%)
 rename {app => featherbb}/lang/English/forum.mo (100%)
 rename {app => featherbb}/lang/English/forum.po (100%)
 rename {app => featherbb}/lang/English/help.mo (100%)
 rename {app => featherbb}/lang/English/help.po (100%)
 rename {app => featherbb}/lang/English/index.mo (100%)
 rename {app => featherbb}/lang/English/index.po (100%)
 rename {app => featherbb}/lang/English/install.mo (100%)
 rename {app => featherbb}/lang/English/install.po (100%)
 rename {app => featherbb}/lang/English/login.mo (100%)
 rename {app => featherbb}/lang/English/login.po (100%)
 rename {app => featherbb}/lang/English/mail_templates/activate_email.tpl (100%)
 rename {app => featherbb}/lang/English/mail_templates/activate_password.tpl (100%)
 rename {app => featherbb}/lang/English/mail_templates/banned_email_change.tpl (100%)
 rename {app => featherbb}/lang/English/mail_templates/banned_email_post.tpl (100%)
 rename {app => featherbb}/lang/English/mail_templates/banned_email_register.tpl (100%)
 rename {app => featherbb}/lang/English/mail_templates/dupe_email_change.tpl (100%)
 rename {app => featherbb}/lang/English/mail_templates/dupe_email_register.tpl (100%)
 rename {app => featherbb}/lang/English/mail_templates/form_email.tpl (100%)
 rename {app => featherbb}/lang/English/mail_templates/new_reply.tpl (100%)
 rename {app => featherbb}/lang/English/mail_templates/new_reply_full.tpl (100%)
 rename {app => featherbb}/lang/English/mail_templates/new_report.tpl (100%)
 rename {app => featherbb}/lang/English/mail_templates/new_topic.tpl (100%)
 rename {app => featherbb}/lang/English/mail_templates/new_topic_full.tpl (100%)
 rename {app => featherbb}/lang/English/mail_templates/new_user.tpl (100%)
 rename {app => featherbb}/lang/English/mail_templates/rename.tpl (100%)
 rename {app => featherbb}/lang/English/mail_templates/welcome.tpl (100%)
 rename {app => featherbb}/lang/English/misc.mo (100%)
 rename {app => featherbb}/lang/English/misc.po (100%)
 rename {app => featherbb}/lang/English/post.mo (100%)
 rename {app => featherbb}/lang/English/post.po (100%)
 rename {app => featherbb}/lang/English/prof_reg.mo (100%)
 rename {app => featherbb}/lang/English/prof_reg.po (100%)
 rename {app => featherbb}/lang/English/profile.mo (100%)
 rename {app => featherbb}/lang/English/profile.po (100%)
 rename {app => featherbb}/lang/English/register.mo (100%)
 rename {app => featherbb}/lang/English/register.po (100%)
 rename {app => featherbb}/lang/English/search.mo (100%)
 rename {app => featherbb}/lang/English/search.po (100%)
 rename {app => featherbb}/lang/English/stopwords.txt (100%)
 rename {app => featherbb}/lang/English/topic.mo (100%)
 rename {app => featherbb}/lang/English/topic.po (100%)
 rename {app => featherbb}/lang/English/update.mo (100%)
 rename {app => featherbb}/lang/English/update.po (100%)
 rename {app => featherbb}/lang/English/userlist.mo (100%)
 rename {app => featherbb}/lang/English/userlist.po (100%)
 create mode 100644 featherbb/routes.php
 create mode 100644 vendor/bin/phpunit
 create mode 100644 vendor/composer/include_paths.php
 create mode 100644 vendor/phpunit/php-code-coverage/.gitattributes
 create mode 100644 vendor/phpunit/php-code-coverage/.gitignore
 create mode 100644 vendor/phpunit/php-code-coverage/.travis.yml
 create mode 100644 vendor/phpunit/php-code-coverage/CONTRIBUTING.md
 create mode 100644 vendor/phpunit/php-code-coverage/ChangeLog-2.2.md
 create mode 100644 vendor/phpunit/php-code-coverage/LICENSE
 create mode 100644 vendor/phpunit/php-code-coverage/README.md
 create mode 100644 vendor/phpunit/php-code-coverage/build.xml
 create mode 100644 vendor/phpunit/php-code-coverage/build/travis-ci.xml
 create mode 100644 vendor/phpunit/php-code-coverage/composer.json
 create mode 100644 vendor/phpunit/php-code-coverage/phpunit.xml.dist
 create mode 100644 vendor/phpunit/php-code-coverage/scripts/auto_append.php
 create mode 100644 vendor/phpunit/php-code-coverage/scripts/auto_prepend.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/HHVM.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/PHPDBG.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/Xdebug.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception/UnintentionallyCoveredCode.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Filter.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Clover.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Crap4j.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Factory.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Directory.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/File.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap.min.css
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/nv.d3.min.css
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/style.css
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.eot
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.svg
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.ttf
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.woff
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.woff2
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/bootstrap.min.js
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/d3.min.js
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/holder.min.js
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/html5shiv.min.js
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/jquery.min.js
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/nv.d3.min.js
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/respond.min.js
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Directory.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/File.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Iterator.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/PHP.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Text.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Directory.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Coverage.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Method.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Report.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Unit.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Node.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Project.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Tests.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Totals.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Util.php
 create mode 100644 vendor/phpunit/php-code-coverage/src/CodeCoverage/Util/InvalidArgumentHelper.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/FilterTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/Report/CloverTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/Report/FactoryTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/UtilTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverageTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/TestCase.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/BankAccount-clover.xml
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/BankAccount.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/BankAccountTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageClassExtendedTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageClassTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodOneLineAnnotationTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesWhitespaceTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageNoneTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageNotPrivateTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageNotProtectedTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageNotPublicTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageNothingTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoveragePrivateTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageProtectedTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoveragePublicTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoverageTwoDefaultClassAnnotations.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoveredClass.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/CoveredFunction.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageClassExtendedTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageClassTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassPublicTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageMethodTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotPrivateTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotProtectedTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotPublicTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveragePrivateTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageProtectedTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveragePublicTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveredClass.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/NotExistingCoveredElementTest.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/class-with-anonymous-function-clover.xml
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/ignored-lines-clover.xml
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/source_with_class_and_anonymous_function.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/source_with_ignore.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/source_with_namespace.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/source_with_oneline_annotations.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/source_without_ignore.php
 create mode 100644 vendor/phpunit/php-code-coverage/tests/_files/source_without_namespace.php
 create mode 100644 vendor/phpunit/php-file-iterator/.gitattributes
 create mode 100644 vendor/phpunit/php-file-iterator/.gitignore
 create mode 100644 vendor/phpunit/php-file-iterator/ChangeLog.markdown
 create mode 100644 vendor/phpunit/php-file-iterator/File/Iterator.php
 create mode 100644 vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php
 create mode 100644 vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php.in
 create mode 100644 vendor/phpunit/php-file-iterator/File/Iterator/Facade.php
 create mode 100644 vendor/phpunit/php-file-iterator/File/Iterator/Factory.php
 create mode 100644 vendor/phpunit/php-file-iterator/LICENSE
 create mode 100644 vendor/phpunit/php-file-iterator/README.markdown
 create mode 100644 vendor/phpunit/php-file-iterator/build.xml
 create mode 100644 vendor/phpunit/php-file-iterator/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php
 create mode 100644 vendor/phpunit/php-file-iterator/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php
 create mode 100644 vendor/phpunit/php-file-iterator/build/PHPCS/ruleset.xml
 create mode 100644 vendor/phpunit/php-file-iterator/build/phpmd.xml
 create mode 100644 vendor/phpunit/php-file-iterator/composer.json
 create mode 100644 vendor/phpunit/php-file-iterator/package.xml
 create mode 100644 vendor/phpunit/php-text-template/.gitattributes
 create mode 100644 vendor/phpunit/php-text-template/.gitignore
 create mode 100644 vendor/phpunit/php-text-template/LICENSE
 create mode 100644 vendor/phpunit/php-text-template/README.md
 create mode 100644 vendor/phpunit/php-text-template/composer.json
 create mode 100644 vendor/phpunit/php-text-template/src/Template.php
 create mode 100644 vendor/phpunit/php-timer/.gitattributes
 create mode 100644 vendor/phpunit/php-timer/.gitignore
 create mode 100644 vendor/phpunit/php-timer/.travis.yml
 create mode 100644 vendor/phpunit/php-timer/LICENSE
 create mode 100644 vendor/phpunit/php-timer/README.md
 create mode 100644 vendor/phpunit/php-timer/composer.json
 create mode 100644 vendor/phpunit/php-timer/src/Timer.php
 create mode 100644 vendor/phpunit/php-timer/tests/TimerTest.php
 create mode 100644 vendor/phpunit/php-token-stream/.gitattributes
 create mode 100644 vendor/phpunit/php-token-stream/.gitignore
 create mode 100644 vendor/phpunit/php-token-stream/.travis.yml
 create mode 100644 vendor/phpunit/php-token-stream/LICENSE
 create mode 100644 vendor/phpunit/php-token-stream/README.md
 create mode 100644 vendor/phpunit/php-token-stream/build.xml
 create mode 100644 vendor/phpunit/php-token-stream/build/phpunit.xml
 create mode 100644 vendor/phpunit/php-token-stream/composer.json
 create mode 100644 vendor/phpunit/php-token-stream/src/Token.php
 create mode 100644 vendor/phpunit/php-token-stream/src/Token/Stream.php
 create mode 100644 vendor/phpunit/php-token-stream/src/Token/Stream/CachingFactory.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/Token/ClassTest.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/Token/ClosureTest.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/Token/FunctionTest.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/Token/IncludeTest.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/Token/InterfaceTest.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/Token/NamespaceTest.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/TokenTest.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/_fixture/classExtendsNamespacedClass.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/_fixture/classInNamespace.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/_fixture/classInScopedNamespace.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/_fixture/class_with_method_that_declares_anonymous_class.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/_fixture/closure.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/_fixture/issue19.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/_fixture/issue30.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/_fixture/multipleNamespacesWithOneClassUsingBraces.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/_fixture/multipleNamespacesWithOneClassUsingNonBraceSyntax.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/_fixture/source.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/_fixture/source2.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/_fixture/source3.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/_fixture/source4.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/_fixture/source5.php
 create mode 100644 vendor/phpunit/php-token-stream/tests/bootstrap.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/.gitattributes
 create mode 100644 vendor/phpunit/phpunit-mock-objects/.gitignore
 create mode 100644 vendor/phpunit/phpunit-mock-objects/.travis.yml
 create mode 100644 vendor/phpunit/phpunit-mock-objects/CONTRIBUTING.md
 create mode 100644 vendor/phpunit/phpunit-mock-objects/LICENSE
 create mode 100644 vendor/phpunit/phpunit-mock-objects/README.md
 create mode 100644 vendor/phpunit/phpunit-mock-objects/build.xml
 create mode 100644 vendor/phpunit/phpunit-mock-objects/build/travis-ci.xml
 create mode 100644 vendor/phpunit/phpunit-mock-objects/composer.json
 create mode 100644 vendor/phpunit/phpunit-mock-objects/phpunit.xml.dist
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Identity.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/InvocationMocker.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Match.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/MethodNameMatch.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Namespace.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/ParametersMatch.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Stub.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class.tpl.dist
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class_method.tpl.dist
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_clone.tpl.dist
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_method.tpl.dist
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_static_method.tpl.dist
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/proxied_method.tpl.dist
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/trait_class.tpl.dist
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/unmocked_clone.tpl.dist
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_class.tpl.dist
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_method.tpl.dist
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Object.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Static.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/InvocationMocker.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invokable.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyInvokedCount.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyParameters.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/ConsecutiveParameters.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Invocation.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtIndex.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedCount.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedRecorder.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/MethodName.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Parameters.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/StatelessInvocation.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockBuilder.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockObject.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ConsecutiveCalls.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Exception.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/MatcherCollection.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Return.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnArgument.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnCallback.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnSelf.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnValueMap.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Verifiable.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/GeneratorTest.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockBuilderTest.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/ObjectTest.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/StaticTest.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/Matcher/ConsecutiveParametersTest.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/class.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_clone.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_constructor.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_clone.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_constructor.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_call_parent_constructor.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_partial.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_with_method_named_method.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/interface.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/invocation_object_clone_object.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_clone.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_constructor.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_clone.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_partial.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_interface.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/proxy.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_namespace.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_partial.phpt
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/ProxyObjectTest.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_files/ClassThatImplementsSerializable.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_files/ClassWithStaticMethod.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractMockTestClass.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractTrait.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnInterface.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnotherInterface.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/Bar.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/Foo.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/FunctionCallback.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/GoogleSearch.wsdl
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/InterfaceWithStaticMethod.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallback.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallbackByReference.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/Mockable.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/PartialMockTestClass.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/SomeClass.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/StaticMockTestClass.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/_fixture/TraversableMockTestInterface.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/autoload.php
 create mode 100644 vendor/phpunit/phpunit-mock-objects/tests/bootstrap.php
 create mode 100644 vendor/phpunit/phpunit/.gitattributes
 create mode 100644 vendor/phpunit/phpunit/.gitignore
 create mode 100644 vendor/phpunit/phpunit/.travis.yml
 create mode 100644 vendor/phpunit/phpunit/CONTRIBUTING.md
 create mode 100644 vendor/phpunit/phpunit/LICENSE
 create mode 100644 vendor/phpunit/phpunit/README.md
 create mode 100644 vendor/phpunit/phpunit/build.xml
 create mode 100644 vendor/phpunit/phpunit/build/ca.pem
 create mode 100644 vendor/phpunit/phpunit/build/phar-autoload.php.in
 create mode 100644 vendor/phpunit/phpunit/build/phar-manifest.php
 create mode 100644 vendor/phpunit/phpunit/build/phar-version.php
 create mode 100644 vendor/phpunit/phpunit/build/phpmd.xml
 create mode 100644 vendor/phpunit/phpunit/build/travis-ci.xml
 create mode 100644 vendor/phpunit/phpunit/composer.json
 create mode 100644 vendor/phpunit/phpunit/phpdox.xml.dist
 create mode 100644 vendor/phpunit/phpunit/phpunit
 create mode 100644 vendor/phpunit/phpunit/phpunit.xml.dist
 create mode 100644 vendor/phpunit/phpunit/phpunit.xsd
 create mode 100644 vendor/phpunit/phpunit/src/Exception.php
 create mode 100644 vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php
 create mode 100644 vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php
 create mode 100644 vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php
 create mode 100644 vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php
 create mode 100644 vendor/phpunit/phpunit/src/Extensions/TestDecorator.php
 create mode 100644 vendor/phpunit/phpunit/src/Extensions/TicketListener.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Assert.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Assert/Functions.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/AssertionFailedError.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/BaseTestListener.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/CodeCoverageException.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/And.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/Count.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/Not.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/Or.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/SameSize.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Error.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Error/Deprecated.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Error/Notice.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Error/Warning.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Exception.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/ExpectationFailedException.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/IncompleteTest.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/IncompleteTestError.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/OutputError.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/RiskyTest.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/RiskyTestError.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/SelfDescribing.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/SkippedTest.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/SkippedTestError.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/SyntheticError.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Test.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/TestCase.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/TestFailure.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/TestListener.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/TestResult.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/TestSuite.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php
 create mode 100644 vendor/phpunit/phpunit/src/Framework/Warning.php
 create mode 100644 vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php
 create mode 100644 vendor/phpunit/phpunit/src/Runner/Exception.php
 create mode 100644 vendor/phpunit/phpunit/src/Runner/Filter/Factory.php
 create mode 100644 vendor/phpunit/phpunit/src/Runner/Filter/Group.php
 create mode 100644 vendor/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php
 create mode 100644 vendor/phpunit/phpunit/src/Runner/Filter/Group/Include.php
 create mode 100644 vendor/phpunit/phpunit/src/Runner/Filter/Test.php
 create mode 100644 vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php
 create mode 100644 vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php
 create mode 100644 vendor/phpunit/phpunit/src/Runner/Version.php
 create mode 100644 vendor/phpunit/phpunit/src/TextUI/Command.php
 create mode 100644 vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php
 create mode 100644 vendor/phpunit/phpunit/src/TextUI/TestRunner.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/Blacklist.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/Configuration.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/DeprecatedFeature.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/DeprecatedFeature/Logger.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/ErrorHandler.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/Fileloader.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/Filesystem.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/Filter.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/Getopt.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/GlobalState.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/Log/JSON.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/Log/JUnit.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/Log/TAP.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/PHP.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/PHP/Default.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseMethod.tpl.dist
 create mode 100644 vendor/phpunit/phpunit/src/Util/PHP/Windows.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/Printer.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/String.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/Test.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/Type.php
 create mode 100644 vendor/phpunit/phpunit/src/Util/XML.php
 create mode 100644 vendor/phpunit/phpunit/tests/Extensions/RepeatedTestTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Framework/AssertTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Framework/BaseTestListenerTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Framework/Constraint/CountTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatchesTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Framework/ConstraintTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Framework/SelectorAssertionsTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Framework/SuiteTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Framework/TestFailureTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Framework/TestImplementorTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Framework/TestListenerTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/1021.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/1021/Issue1021Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/523.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/523/Issue523Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/578.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/578/Issue578Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/684.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/684/Issue684Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/783.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/783/ChildSuite.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/783/OneTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/783/ParentSuite.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/783/TwoTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1149.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1149/Issue1149Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1265.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1265/Issue1265Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1265/phpunit1265.xml
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1330.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1330/Issue1330Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1330/phpunit1330.xml
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1335.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1335/Issue1335Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1335/bootstrap1335.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1337.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1337/Issue1337Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1340.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1340/Issue1340Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1374.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/1374/Issue1374Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/244.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/244/Issue244Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/322.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/322/Issue322Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/322/phpunit322.xml
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/433.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/433/Issue433Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/445.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/445/Issue445Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/498.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/498/Issue498Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/503.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/503/Issue503Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/581.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/581/Issue581Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/74.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/74/Issue74Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/74/NewException.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/765.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/765/Issue765Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/863.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/873.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Regression/GitHub/873/Issue873Test.php
 create mode 100644 vendor/phpunit/phpunit/tests/Runner/BaseTestRunnerTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/abstract-test-class.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/concrete-test-class.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/custom-printer-debug.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/custom-printer-verbose.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/dataprovider-testdox.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/debug.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/default-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/default.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/dependencies-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/dependencies.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/dependencies2-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/dependencies2.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/dependencies3-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/dependencies3.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/empty-testcase.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/exception-stack.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/exclude-group-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/exclude-group.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/failure-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/failure.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/fatal-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/fatal.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-class-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-class.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-method-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-method.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/filter-no-results.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/group-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/group.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/help.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/help2.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/ini-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/list-groups.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/log-json-5.3.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/log-json-post-66021.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/log-json-pre-66021.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/log-tap.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/log-xml.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/repeat.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/strict-incomplete.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/strict-isolation.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/strict.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/tap.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/test-suffix-multiple.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/test-suffix-single.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/testdox-html.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/testdox-text.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/TextUI/testdox.phpt
 create mode 100644 vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Util/TestDox/NamePrettifierTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Util/TestTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/Util/XMLTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/AbstractTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/Author.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/BankAccount.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/BankAccountTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/BankAccountTest.test.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/BaseTestListenerSample.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/BeforeAndAfterTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/BeforeClassAndAfterClassTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/Book.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/Calculator.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/ChangeCurrentWorkingDirectoryTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/ClassWithNonPublicAttributes.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/ClassWithToString.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/ConcreteTest.my.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/ConcreteTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageClassExtendedTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageClassTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageFunctionTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageMethodOneLineAnnotationTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesWhitespaceTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageMethodTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageNoneTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageNotPrivateTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageNotProtectedTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageNotPublicTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageNothingTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoveragePrivateTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageProtectedTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoveragePublicTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoverageTwoDefaultClassAnnotations.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoveredClass.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CoveredFunction.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/CustomPrinter.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/DataProviderFilterTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/DataProviderTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/DependencyFailureTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/DependencySuccessTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/DependencyTestSuite.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/DoubleTestCase.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/DummyException.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/EmptyTestCaseTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/Error.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/ExceptionInAssertPostConditionsTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/ExceptionInAssertPreConditionsTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/ExceptionInSetUpTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/ExceptionInTearDownTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/ExceptionInTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/ExceptionNamespaceTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/ExceptionStackTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/ExceptionTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/Failure.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/FailureTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/FatalTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/IncompleteTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/Inheritance/InheritanceA.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/Inheritance/InheritanceB.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/InheritedTestCase.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/IniTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/JsonData/arrayObject.js
 create mode 100644 vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject.js
 create mode 100644 vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject2.js
 create mode 100644 vendor/phpunit/phpunit/tests/_files/MockRunner.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/MultiDependencyTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NamespaceCoverageClassExtendedTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NamespaceCoverageClassTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassPublicTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NamespaceCoverageMethodTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotPrivateTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotProtectedTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotPublicTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NamespaceCoveragePrivateTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NamespaceCoverageProtectedTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NamespaceCoveragePublicTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NamespaceCoveredClass.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NoArgTestCaseTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NoTestCaseClass.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NoTestCases.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NonStatic.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NotExistingCoveredElementTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NotPublicTestCase.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NotVoidTestCase.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/NothingTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/OneTestCase.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/OutputTestCase.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/OverrideTestCase.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/RequirementsTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/SampleArrayAccess.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/SampleClass.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/SelectorAssertionsFixture.html
 create mode 100644 vendor/phpunit/phpunit/tests/_files/Singleton.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/StackTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/Struct.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/Success.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/TemplateMethodsTest.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/TestIterator.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/TestIterator2.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/ThrowExceptionTestCase.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/ThrowNoExceptionTestCase.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/WasRun.php
 create mode 100644 vendor/phpunit/phpunit/tests/_files/bar.xml
 create mode 100644 vendor/phpunit/phpunit/tests/_files/configuration.custom-printer.xml
 create mode 100644 vendor/phpunit/phpunit/tests/_files/configuration.xml
 create mode 100644 vendor/phpunit/phpunit/tests/_files/configuration_empty.xml
 create mode 100644 vendor/phpunit/phpunit/tests/_files/configuration_xinclude.xml
 create mode 100644 vendor/phpunit/phpunit/tests/_files/expectedFileFormat.txt
 create mode 100644 vendor/phpunit/phpunit/tests/_files/foo.xml
 create mode 100644 vendor/phpunit/phpunit/tests/_files/structureAttributesAreSameButValuesAreNot.xml
 create mode 100644 vendor/phpunit/phpunit/tests/_files/structureExpected.xml
 create mode 100644 vendor/phpunit/phpunit/tests/_files/structureIgnoreTextNodes.xml
 create mode 100644 vendor/phpunit/phpunit/tests/_files/structureIsSameButDataIsNot.xml
 create mode 100644 vendor/phpunit/phpunit/tests/_files/structureWrongNumberOfAttributes.xml
 create mode 100644 vendor/phpunit/phpunit/tests/_files/structureWrongNumberOfNodes.xml
 create mode 100644 vendor/phpunit/phpunit/tests/bootstrap-travis.php
 create mode 100644 vendor/phpunit/phpunit/tests/bootstrap.php
 create mode 100644 vendor/sebastian/comparator/.gitignore
 create mode 100644 vendor/sebastian/comparator/.travis.yml
 create mode 100644 vendor/sebastian/comparator/LICENSE
 create mode 100644 vendor/sebastian/comparator/README.md
 create mode 100644 vendor/sebastian/comparator/build.xml
 create mode 100644 vendor/sebastian/comparator/build/travis-ci.xml
 create mode 100644 vendor/sebastian/comparator/composer.json
 create mode 100644 vendor/sebastian/comparator/phpunit.xml.dist
 create mode 100644 vendor/sebastian/comparator/src/ArrayComparator.php
 create mode 100644 vendor/sebastian/comparator/src/Comparator.php
 create mode 100644 vendor/sebastian/comparator/src/ComparisonFailure.php
 create mode 100644 vendor/sebastian/comparator/src/DOMNodeComparator.php
 create mode 100644 vendor/sebastian/comparator/src/DateTimeComparator.php
 create mode 100644 vendor/sebastian/comparator/src/DoubleComparator.php
 create mode 100644 vendor/sebastian/comparator/src/ExceptionComparator.php
 create mode 100644 vendor/sebastian/comparator/src/Factory.php
 create mode 100644 vendor/sebastian/comparator/src/MockObjectComparator.php
 create mode 100644 vendor/sebastian/comparator/src/NumericComparator.php
 create mode 100644 vendor/sebastian/comparator/src/ObjectComparator.php
 create mode 100644 vendor/sebastian/comparator/src/ResourceComparator.php
 create mode 100644 vendor/sebastian/comparator/src/ScalarComparator.php
 create mode 100644 vendor/sebastian/comparator/src/SplObjectStorageComparator.php
 create mode 100644 vendor/sebastian/comparator/src/TypeComparator.php
 create mode 100644 vendor/sebastian/comparator/tests/ArrayComparatorTest.php
 create mode 100644 vendor/sebastian/comparator/tests/DOMNodeComparatorTest.php
 create mode 100644 vendor/sebastian/comparator/tests/DateTimeComparatorTest.php
 create mode 100644 vendor/sebastian/comparator/tests/DoubleComparatorTest.php
 create mode 100644 vendor/sebastian/comparator/tests/ExceptionComparatorTest.php
 create mode 100644 vendor/sebastian/comparator/tests/FactoryTest.php
 create mode 100644 vendor/sebastian/comparator/tests/MockObjectComparatorTest.php
 create mode 100644 vendor/sebastian/comparator/tests/NumericComparatorTest.php
 create mode 100644 vendor/sebastian/comparator/tests/ObjectComparatorTest.php
 create mode 100644 vendor/sebastian/comparator/tests/ResourceComparatorTest.php
 create mode 100644 vendor/sebastian/comparator/tests/ScalarComparatorTest.php
 create mode 100644 vendor/sebastian/comparator/tests/SplObjectStorageComparatorTest.php
 create mode 100644 vendor/sebastian/comparator/tests/TypeComparatorTest.php
 create mode 100644 vendor/sebastian/comparator/tests/_files/Author.php
 create mode 100644 vendor/sebastian/comparator/tests/_files/Book.php
 create mode 100644 vendor/sebastian/comparator/tests/_files/ClassWithToString.php
 create mode 100644 vendor/sebastian/comparator/tests/_files/SampleClass.php
 create mode 100644 vendor/sebastian/comparator/tests/_files/Struct.php
 create mode 100644 vendor/sebastian/comparator/tests/_files/TestClass.php
 create mode 100644 vendor/sebastian/comparator/tests/_files/TestClassComparator.php
 create mode 100644 vendor/sebastian/comparator/tests/autoload.php
 create mode 100644 vendor/sebastian/comparator/tests/bootstrap.php
 create mode 100644 vendor/sebastian/diff/.gitignore
 create mode 100644 vendor/sebastian/diff/.travis.yml
 create mode 100644 vendor/sebastian/diff/LICENSE
 create mode 100644 vendor/sebastian/diff/README.md
 create mode 100644 vendor/sebastian/diff/build.xml
 create mode 100644 vendor/sebastian/diff/composer.json
 create mode 100644 vendor/sebastian/diff/phpunit.xml.dist
 create mode 100644 vendor/sebastian/diff/src/Chunk.php
 create mode 100644 vendor/sebastian/diff/src/Diff.php
 create mode 100644 vendor/sebastian/diff/src/Differ.php
 create mode 100644 vendor/sebastian/diff/src/LCS/LongestCommonSubsequence.php
 create mode 100644 vendor/sebastian/diff/src/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php
 create mode 100644 vendor/sebastian/diff/src/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php
 create mode 100644 vendor/sebastian/diff/src/Line.php
 create mode 100644 vendor/sebastian/diff/src/Parser.php
 create mode 100644 vendor/sebastian/diff/tests/DifferTest.php
 create mode 100644 vendor/sebastian/diff/tests/LCS/TimeEfficientImplementationTest.php
 create mode 100644 vendor/sebastian/diff/tests/ParserTest.php
 create mode 100644 vendor/sebastian/diff/tests/fixtures/patch.txt
 create mode 100644 vendor/sebastian/diff/tests/fixtures/patch2.txt
 create mode 100644 vendor/sebastian/environment/.gitignore
 create mode 100644 vendor/sebastian/environment/.travis.yml
 create mode 100644 vendor/sebastian/environment/LICENSE
 create mode 100644 vendor/sebastian/environment/README.md
 create mode 100644 vendor/sebastian/environment/build.xml
 create mode 100644 vendor/sebastian/environment/composer.json
 create mode 100644 vendor/sebastian/environment/phpunit.xml.dist
 create mode 100644 vendor/sebastian/environment/src/Console.php
 create mode 100644 vendor/sebastian/environment/src/Runtime.php
 create mode 100644 vendor/sebastian/environment/tests/ConsoleTest.php
 create mode 100644 vendor/sebastian/environment/tests/RuntimeTest.php
 create mode 100644 vendor/sebastian/exporter/.gitignore
 create mode 100644 vendor/sebastian/exporter/.travis.yml
 create mode 100644 vendor/sebastian/exporter/LICENSE
 create mode 100644 vendor/sebastian/exporter/README.md
 create mode 100644 vendor/sebastian/exporter/build.xml
 create mode 100644 vendor/sebastian/exporter/composer.json
 create mode 100644 vendor/sebastian/exporter/phpunit.xml.dist
 create mode 100644 vendor/sebastian/exporter/src/Exporter.php
 create mode 100644 vendor/sebastian/exporter/tests/ExporterTest.php
 create mode 100644 vendor/sebastian/recursion-context/.gitignore
 create mode 100644 vendor/sebastian/recursion-context/.travis.yml
 create mode 100644 vendor/sebastian/recursion-context/LICENSE
 create mode 100644 vendor/sebastian/recursion-context/README.md
 create mode 100644 vendor/sebastian/recursion-context/build.xml
 create mode 100644 vendor/sebastian/recursion-context/composer.json
 create mode 100644 vendor/sebastian/recursion-context/phpunit.xml.dist
 create mode 100644 vendor/sebastian/recursion-context/src/Context.php
 create mode 100644 vendor/sebastian/recursion-context/src/Exception.php
 create mode 100644 vendor/sebastian/recursion-context/src/InvalidArgumentException.php
 create mode 100644 vendor/sebastian/recursion-context/tests/ContextTest.php
 create mode 100644 vendor/sebastian/version/.gitattributes
 create mode 100644 vendor/sebastian/version/.gitignore
 create mode 100644 vendor/sebastian/version/LICENSE
 create mode 100644 vendor/sebastian/version/README.md
 create mode 100644 vendor/sebastian/version/composer.json
 create mode 100644 vendor/sebastian/version/src/Version.php
 create mode 100644 vendor/symfony/yaml/.gitignore
 create mode 100644 vendor/symfony/yaml/CHANGELOG.md
 create mode 100644 vendor/symfony/yaml/Dumper.php
 create mode 100644 vendor/symfony/yaml/Escaper.php
 create mode 100644 vendor/symfony/yaml/Exception/DumpException.php
 create mode 100644 vendor/symfony/yaml/Exception/ExceptionInterface.php
 create mode 100644 vendor/symfony/yaml/Exception/ParseException.php
 create mode 100644 vendor/symfony/yaml/Exception/RuntimeException.php
 create mode 100644 vendor/symfony/yaml/Inline.php
 create mode 100644 vendor/symfony/yaml/LICENSE
 create mode 100644 vendor/symfony/yaml/Parser.php
 create mode 100644 vendor/symfony/yaml/README.md
 create mode 100644 vendor/symfony/yaml/Tests/DumperTest.php
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsBlockMapping.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsErrorTests.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsFlowCollections.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsFoldedScalars.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsNullsAndEmpties.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsTypeTransfers.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/embededPhp.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/escapedCharacters.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/index.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/sfComments.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/sfCompact.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/sfMergeKey.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/sfObjects.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/sfQuotes.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/sfTests.yml
 create mode 100644 vendor/symfony/yaml/Tests/Fixtures/unindentedCollections.yml
 create mode 100644 vendor/symfony/yaml/Tests/InlineTest.php
 create mode 100644 vendor/symfony/yaml/Tests/ParseExceptionTest.php
 create mode 100644 vendor/symfony/yaml/Tests/ParserTest.php
 create mode 100644 vendor/symfony/yaml/Tests/YamlTest.php
 create mode 100644 vendor/symfony/yaml/Unescaper.php
 create mode 100644 vendor/symfony/yaml/Yaml.php
 create mode 100644 vendor/symfony/yaml/composer.json
 create mode 100644 vendor/symfony/yaml/phpunit.xml.dist
 create mode 100644 view/admin/plugins.php

diff --git a/.gitignore b/.gitignore
index 4728b64b..81898019 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-app/cache/
-app/config.php
+featherbb/cache/
+featherbb/config.php
 .idea/
 nbproject/
 lang/French
diff --git a/app/cache/.gitkeep b/app/cache/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/routes.php b/app/routes.php
deleted file mode 100644
index 617db5b9..00000000
--- a/app/routes.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Index
-$feather->get('/', '\App\Controller\index:display');
-
-// Viewforum
-$feather->get('/forum/:id(/:name)(/page/:page)(/)', '\App\Controller\viewforum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
-
-// Viewtopic
-$feather->group('/topic', function() use ($feather) {
-    $feather->get('/:id(/:name)(/page/:page)(/)', '\App\Controller\viewtopic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
-    $feather->get('/:id/action/:action(/)', '\App\Controller\viewtopic:action')->conditions(array('id' => '[0-9]+'));
-});
-$feather->get('/post/:pid(/)', '\App\Controller\viewtopic:viewpost')->conditions(array('pid' => '[0-9]+'));
-
-// Userlist
-$feather->get('/userlist(/)', '\App\Controller\userlist:display');
-
-// Auth routes
-$feather->group('/auth', function() use ($feather) {
-    $feather->get('(/)', function () use ($feather) {
-        if (!$feather->user->is_guest) {
-            $this->feather->url->redirect($this->feather->url->get('/'));
-        } else {
-            $this->feather->url->redirect($this->feather->url->get('/auth/login'));
-        }
-    });
-    $feather->map('/login(/)', '\App\Controller\auth:login')->via('GET', 'POST');
-    $feather->map('/forget(/)', '\App\Controller\auth:forget')->via('GET', 'POST');
-    $feather->get('/logout/token/:token(/)', '\App\Controller\auth:logout');
-});
-
-// Register routes
-$feather->group('/register', function() use ($feather) {
-    $feather->get('(/)', '\App\Controller\register:rules');
-    $feather->map('/agree(/)', '\App\Controller\register:display')->via('GET', 'POST');
-    $feather->get('/cancel(/)', '\App\Controller\register:cancel');
-});
-
-// Post routes
-$feather->group('/post', function() use ($feather) {
-    $feather->map('/new-topic/:fid(/)', '\App\Controller\post:newpost')->conditions(array('fid' => '[0-9]+'))->via('GET', 'POST');
-    $feather->map('/reply/:tid(/)(/quote/:qid)(/)', '\App\Controller\post:newreply')->conditions(array('tid' => '[0-9]+', 'qid' => '[0-9]+'))->via('GET', 'POST');
-});
-
-// Edit
-$feather->map('/edit/:id(/)', '\App\Controller\edit:editpost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-
-// Delete
-$feather->map('/delete/:id(/)', '\App\Controller\delete:deletepost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-
-// Search routes
-$feather->group('/search', function() use ($feather) {
-    $feather->get('(/)', '\App\Controller\search:display');
-    $feather->get('/show/:show(/)', '\App\Controller\search:quicksearches');
-});
-
-// Help
-$feather->get('/help(/)', '\App\Controller\help:display');
-
-// Misc
-$feather->get('/rules(/)', '\App\Controller\misc:rules');
-$feather->get('/mark-read(/)', '\App\Controller\misc:markread');
-$feather->get('/mark-forum-read/:id(/)', '\App\Controller\misc:markforumread')->conditions(array('id' => '[0-9]+'));
-$feather->map('/email/:id(/)', '\App\Controller\misc:email')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-$feather->map('/report/:id(/)', '\App\Controller\misc:report')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-$feather->get('/subscribe/forum/:id(/)', '\App\Controller\misc:subscribeforum')->conditions(array('id' => '[0-9]+'));
-$feather->get('/unsubscribe/forum/:id(/)', '\App\Controller\misc:unsubscribeforum')->conditions(array('id' => '[0-9]+'));
-$feather->get('/subscribe/topic/:id(/)', '\App\Controller\misc:subscribetopic')->conditions(array('id' => '[0-9]+'));
-$feather->get('/unsubscribe/topic/:id(/)', '\App\Controller\misc:unsubscribetopic')->conditions(array('id' => '[0-9]+'));
-
-// Profile routes
-$feather->group('/user', function() use ($feather) {
-    $feather->map('/:id(/section/:section)(/)', '\App\Controller\profile:display')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-    $feather->map('/:id(/action/:action)(/)', '\App\Controller\profile:action')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-});
-
-/**
- * Middleware to check if user is allowed to moderate, if he's not redirect to homepage.
- */
-$isAdmmod = function() use ($feather) {
-    if(!$feather->user->is_admmod) {
-        redirect($feather->url->base(), __('No permission'));
-    }
-};
-
-// Moderate routes
-$feather->group('/moderate', $isAdmmod, function() use ($feather) {
-    $feather->get('/forum/:id(/:name)(/page/:page)(/)', '\App\Controller\moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
-    $feather->get('/get-host/post/:pid(/)', '\App\Controller\moderate:gethostpost')->conditions(array('pid' => '[0-9]+'));
-    $feather->get('/get-host/ip/:ip(/)', '\App\Controller\moderate:gethostip');
-    $feather->map('/topic/:id/forum/:fid/action/:action(/param/:param)(/)', '\App\Controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST');
-    $feather->map('/topic/:id/forum/:fid/action/:action(/page/:param)(/)', '\App\Controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST');
-    $feather->post('/forum/:fid(/page/:page)(/)', '\App\Controller\moderate:dealposts')->conditions(array('fid' => '[0-9]+', 'page' => '[0-9]+'));
-});
-
-// Admin routes
-$feather->group('/admin', $isAdmmod, function() use ($feather) {
-
-    /**
-     * Middleware to check if user is admin.
-     */
-    $isAdmin = function() use ($feather) {
-        if($feather->user->g_id != FEATHER_ADMIN) {
-            redirect($feather->url->base(), __('No permission'));
-        }
-    };
-
-    // Admin index
-    $feather->get('(/action/:action)(/)', '\App\Controller\Admin\index:display');
-    $feather->get('/index(/)', '\App\Controller\Admin\index:display');
-
-    // Admin bans
-    $feather->group('/bans', function() use ($feather) {
-        $feather->get('(/)', '\App\Controller\Admin\Bans:display');
-        $feather->get('/delete/:id(/)', '\App\Controller\Admin\Bans:delete')->conditions(array('id' => '[0-9]+'));
-        $feather->map('/edit/:id(/)', '\App\Controller\Admin\Bans:edit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-        $feather->map('/add(/:id)(/)', '\App\Controller\Admin\Bans:add')->via('GET', 'POST');
-    });
-
-    // Admin options
-    $feather->map('/options(/)', $isAdmin, '\App\Controller\Admin\options:display')->via('GET', 'POST');
-
-    // Admin categories
-    $feather->group('/categories', $isAdmin, function() use ($feather) {
-        $feather->get('(/)', '\App\Controller\Admin\categories:display');
-        $feather->post('/add(/)', '\App\Controller\Admin\categories:add_category');
-        $feather->post('/edit(/)', '\App\Controller\Admin\categories:edit_categories');
-        $feather->post('/delete(/)', '\App\Controller\Admin\categories:delete_category');
-    });
-
-    // Admin censoring
-    $feather->map('/censoring(/)', $isAdmin, '\App\Controller\Admin\censoring:display')->via('GET', 'POST');
-
-    // Admin reports
-    $feather->map('/reports(/)', '\App\Controller\Admin\reports:display')->via('GET', 'POST');
-
-    // Admin permissions
-    $feather->map('/permissions(/)', $isAdmin, '\App\Controller\Admin\permissions:display')->via('GET', 'POST');
-
-    // Admin statistics
-    $feather->get('/statistics(/)', '\App\Controller\Admin\statistics:display');
-    $feather->get('/phpinfo(/)', '\App\Controller\Admin\statistics:phpinfo');
-
-    // Admin forums
-    $feather->group('/forums', $isAdmin, function() use ($feather) {
-        $feather->map('(/)', '\App\Controller\Admin\forums:display')->via('GET', 'POST');
-        $feather->post('/add(/)', '\App\Controller\Admin\forums:add_forum');
-        $feather->map('/edit/:id(/)', '\App\Controller\Admin\forums:edit_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-        $feather->map('/delete/:id(/)', '\App\Controller\Admin\forums:delete_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-    });
-
-    // Admin groups
-    $feather->group('/groups', $isAdmin, function() use ($feather) {
-        $feather->map('(/)', '\App\Controller\Admin\groups:display')->via('GET', 'POST');
-        $feather->map('/add(/)', '\App\Controller\Admin\groups:addedit')->via('GET', 'POST');
-        $feather->map('/edit/:id(/)', '\App\Controller\Admin\groups:addedit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-        $feather->map('/delete/:id(/)', '\App\Controller\Admin\groups:delete')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-    });
-
-    // Admin plugins
-    $feather->group('/plugins', function() use ($feather) {
-        $feather->map('/(/)', '\App\Controller\Admin\plugins:index')->via('GET', 'POST');
-        $feather->map('/activate(/)', '\App\Controller\Admin\plugins:activate')->via('GET');
-        $feather->map('/deactivate(/)', '\App\Controller\Admin\plugins:deactivate')->via('GET');
-        // $feather->map('/loader(/)', '\App\Controller\Admin\plugins:display')->via('GET', 'POST');
-    });
-
-    // Admin maintenance
-    $feather->map('/maintenance(/)', $isAdmin, '\App\Controller\Admin\maintenance:display')->via('GET', 'POST');
-
-    // Admin parser
-    $feather->map('/parser(/)', $isAdmin, '\App\Controller\Admin\parser:display')->via('GET', 'POST');
-
-    // Admin users
-    $feather->group('/users', function() use ($feather) {
-        $feather->map('(/)', '\App\Controller\Admin\users:display')->via('GET', 'POST');
-        $feather->get('/ip-stats/id/:id(/)', '\App\Controller\Admin\users:ipstats')->conditions(array('id' => '[0-9]+'));
-        $feather->get('/show-users/ip/:ip(/)', '\App\Controller\Admin\users:showusers');
-    });
-
-});
-
-// 404 not found
-$feather->notFound(function () use ($feather){
-    throw new \FeatherBB\Error('Page not found', 404);
-});
-
-$feather->error(function (\Exception $e) use ($feather) {
-    $feather->response->setStatus($e->getCode());
-    $feather->view2->setPageInfo(array(
-        'title' => array($feather->utils->escape($feather->config['o_board_title']), __('Error')),
-        'msg_title' => __('Error'),
-        'msg'    =>   $e->getMessage(),
-        'no_back_link'    => false,
-        ))->addTemplate('error.php')->display();
-    $feather->stop();
-});
diff --git a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
new file mode 100644
index 00000000..2f1d9ca6
--- /dev/null
+++ b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
@@ -0,0 +1 @@
+{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1440702252,"expire":0,"data":"a:4:{i:1;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:2;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:3;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:4;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1440867139,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1440768048,"expire":0,"data":"a:2:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;}"}}
\ No newline at end of file
diff --git a/cache/cache_parser_data.php b/cache/cache_parser_data.php
new file mode 100644
index 00000000..a3ea0f5b
--- /dev/null
+++ b/cache/cache_parser_data.php
@@ -0,0 +1,1433 @@
+<?php // File: cache_parser_data.php. Automatically generated: 2015-08-23 06:16:14. DO NOT EDIT!!!
+$pd = array (
+  'newer_php_version' => true,
+  'in_signature' => false,
+  'ipass' => 0,
+  'tag_stack' => 
+  array (
+    0 => '_ROOT_',
+  ),
+  'config' => 
+  array (
+    'textile' => true,
+    'quote_links' => true,
+    'quote_imgs' => false,
+    'valid_imgs' => true,
+    'click_imgs' => true,
+    'max_size' => 100000,
+    'max_width' => 800,
+    'max_height' => 600,
+    'def_width' => 240,
+    'def_height' => 180,
+    'smiley_size' => 100,
+  ),
+  're_smilies' => '/ # re_smilies Rev:20110220_1200
+# Match special smiley character sequences within BBCode content.
+(?<=^|[>\\s])                    # Only if preceeded by ">" or whitespace.
+(?:\\:\\)|\\=\\)|\\:\\||\\=\\||\\:\\(|\\=\\(|\\:D|\\=D|\\:o|\\:O|;\\)|\\:\\/|\\:P|\\:p|\\:lol\\:|\\:mad\\:|\\:rolleyes\\:|\\:cool\\:)
+(?=$|[\\[<\\s])                   # Only if followed by "<", "[" or whitespace.
+                                /Sx',
+  're_color' => '% # re_color Rev:20110220_1200
+# Match a valid CSS color value. #123, #123456, or "red", "blue", etc.
+^                               # Anchor to start of string.
+(                               # $1: Foreground color (required).
+  \\#(?:[0-9A-Fa-f]{3}){1,2}     # Either a "#" and a 3 or 6 digit hex number,
+| (?: maroon|red|orange|yellow| # or a recognized CSS color word.
+      olive|purple|fuchsia|white|
+      lime|green|navy|blue|aqua|
+      teal|black|silver|gray
+  )                             # End group of recognized color words.
+)                               # End $1. Foreground color.
+# Match optional CSS background color value. ;#123, ;#123456, or ;"red", "blue", etc.
+(?:                             # Begin group for optional background color
+  ;?+                           # foreground;background delimiter: e.g. "#123;#456".
+  ((?1))                        # $2: Background color. (Same regex as the first.)
+)?+                             # Background color spec is optional.
+$                               # Anchor to end of string.
+                                %ix',
+  're_textile' => '/ # re_textile Rev:20110220_1200
+# Match textile inline phrase: _em_ *strong* @tt@ ^super^ ~sub~ -del- +ins+
+([+\\-@*_\\^~])                   # $1: literal exposed start of phrase char, but
+(?<=                            # only if preceded by...
+  ^          [+\\-@*_]           # start of string (for _em_ *strong* -del- +ins+ @code)
+| \\s         [+\\-@*_]           # or whitespace   (for _em_ *strong* -del- +ins+ @code)
+| [A-Za-z0-9)}\\]>][\\^~]         # or alphanum or bracket (for ^superscript^ ~subscript~).
+)                               # only if preceded by whitespace or start of string.
+(                               # $2: Textile phrase contents.
+  [A-Za-z0-9({\\[<]              # First char following delim must be alphanum or bracket.
+  [^+\\-@*_\\^~\\n]*+              # "normal*" == Zero or more non-delim, non-newline.
+  (?>                           # Begin unrolling-the-loop. "(special normal*)*"
+    (?!                         # One of two conditions must be true for inside delim:
+      (?:(?<=[A-Za-z0-9)}\\]>][.,;:!?])(?=\\1(?:\\s|$)))
+    | (?:(?<=[A-Za-z0-9)}\\]>])(?=\\1(?:[\\s.,;:!?]|$)))
+    )[+\\-@*_\\^~]                # If so then not yet at phrase end. Match delim and
+    [^+\\-@*_\\^~\\n]*+            # more "normal*" non-delim, non-linefeeds.
+  )*+                           # Continue unrolling. "(special normal*)*"
+)                               # End $2: Textile phrase contents.
+(?>
+  (?:(?<=[A-Za-z0-9)}\\]>][.,;:!?])(?=\\1(?:\\s|$)))
+| (?:(?<=[A-Za-z0-9)}\\]>])(?=\\1(?:[\\s.,;:!?]|$)))
+)
+\\1                              # Match delim end of phrase, but only if
+                                /Smx',
+  're_bbcode' => '% # re_bbcode Rev:20110220_1200
+# First, match opening tag of syntax: "[TAGNAME (= ("\')ATTRIBUTE("\') )]";
+\\[                              # Match opening bracket of outermost opening TAGNAME tag.
+(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err|dbug)\\s*+) # $1:
+(?>                             # Atomically group remainder of opening tag.
+  (?:                           # Optional attribute.
+    (=)\\s*+                     # $2: = Optional attribute\'s equals sign delimiter, ws.
+    (?:                         # Group for 1-line attribute value alternatives.
+      \'([^\'\\r\\n\\\\]*+(?:\\\\.[^\'\\r\\n\\\\]*+)*+)\'  # Either $3: == single quoted,
+    | "([^"\\r\\n\\\\]*+(?:\\\\.[^"\\r\\n\\\\]*+)*+)"      # or     $4: == double quoted,
+    | ( [^[\\]\\r\\n]*+            # or $5: == un-or-any-quoted. "normal*" == non-"[]"
+        (?:                     # Begin "(special normal*)*" "Unrolling-the-loop" construct.
+          \\[[^[\\]\\r\\n]*+\\]      # Allow matching [square brackets] 1 level deep. "special".
+            [^[\\]\\r\\n]*+        # More "normal*" any non-"[]", non-newline characters.
+        )*+                     # End "(special normal*)*" "Unrolling-the-loop" construct.
+      )                         # End $5: Un-or-any-quoted attribute value.
+    )                           # End group of attribute values alternatives.
+    \\s*+                        # Optional whitespace following quoted values.
+  )?                            # End optional attribute group.
+  \\]                            # Match closing bracket of outermost opening TAGNAME tag.
+)                               # End atomic group with opening tag remainder.
+# Second, match the contents of the tag.
+(                               # $6: Non-trimmed contents of TAGNAME tag.
+  (?>                           # Atomic group for contents alternatives.
+    [^\\[]++                     # Option 1: Match non-tag chars (starting with non-"[").
+    (?:                         # Begin "(special normal*)*" "Unrolling-the-loop" construct.
+      (?!\\[/?+\\1[\\]=\\s])\\[      # "special" = "[" if not start of [TAGNAME*] or [/TAGNAME].
+      [^\\[]*+                   # More "normal*".
+    )*+                         # Zero or more "special normal*"s allowed for option 1.
+  | (?:                         # or Option 2: Match non-tag chars (starting with "[").
+      (?!\\[/?+\\1[\\]=\\s])\\[      # "special" = "[" if not start of [TAGNAME*] or [/TAGNAME].
+      [^\\[]*+                   # More "normal*".
+    )++                         # One or more "special normal*"s required for option 2.
+  | (?R)                        # Or option 3: recursively match nested [TAGNAME]..[/TAGNAME].
+  )*+                           # One of these three options as many times as necessary.
+)                               # End $6: Non-trimmed contents of TAGNAME tag.
+# Finally, match the closing tag.
+\\[/\\1\\s*+\\]                     # Match outermost closing [/  TAGNAME  ]
+                                %ix',
+  're_bbtag' => '%# re_bbtag Rev:20110220_1200
+# Match open or close BBtag.
+\\[/?+                           # Match opening bracket of outermost opening TAGNAME tag.
+(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err|dbug)\\s*+) #$1:
+(?:                             # Optional attribute.
+  (=)\\s*+                       # $2: = Optional attribute\'s equals sign delimiter, ws.
+  (?:                           # Group for 1-line attribute value alternatives.
+    \'([^\'\\r\\n\\\\]*+(?:\\\\.[^\'\\r\\n\\\\]*+)*+)\'  # Either $3: == single quoted,
+  | "([^"\\r\\n\\\\]*+(?:\\\\.[^"\\r\\n\\\\]*+)*+)"      # or     $4: == double quoted,
+  | ( [^[\\]\\r\\n]*+              # or $5: == un-or-any-quoted. "normal*" == non-"[]"
+      (?:                       # Begin "(special normal*)*" "Unrolling-the-loop" construct.
+        \\[[^[\\]\\r\\n]*+\\]        # Allow matching [square brackets] 1 level deep. "special".
+          [^[\\]\\r\\n]*+          # More "normal*" any non-"[]", non-newline characters.
+      )*+                       # End loop construct. See: "Mastering Regular Expressions".
+    )                           # End $5: Un-or-any-quoted attribute value.
+  )                             # End group of attribute values alternatives.
+  \\s*+                          # Optional whitespace following quoted values.
+)?                              # End optional attribute.
+\\]                              # Match closing bracket of outermost opening TAGNAME tag.
+                                %ix',
+  're_fixlist_1' => '%# re_fixlist_1 Rev:20110220_1200
+# Match and repair invalid characters at start of LIST tag (before first [*]).
+^                               # Anchor to start of subject text.
+(                               # $1: Substring with invalid chars to be enclosed.
+  \\s*+                          # Optional whitespace before first invalid char.
+  (?!\\[(?:\\*|/list)\\])          # Assert invalid char(s). (i.e. valid if [*] or [/list]).
+  [^[]*                         # (Normal*) Zero or more non-[.
+  (?:                           # Begin (special normal*)* "Unroll-the-loop- construct.
+    (?!\\[(?:\\*|/list)\\])        # If this [ is not the start of [*] or [/list], then
+    \\[                          # go ahead and match non-[*], non-[/list] left bracket.
+    [^[]*                       # More (normal*).
+  )*                            # End (special normal*)* "unroll-the-loop- construct.
+)                               # End $1: non-whitespace before first [*] (or [/list]).
+(?<!\\s)                         # Backtrack to exclude any trailing whitespace.
+(?=\\s*\\[(?:\\*|/list)\\])         # Done once we reach a [*] or [/list].
+								%ix',
+  're_fixlist_2' => '%# re_fixlist_2 Rev:20110220_1200
+# Match and repair invalid characters between [/*] and next [*] (or [/list]].
+\\[/\\*\\]                         # Match [/*] close tag.
+(                               # $1: Substring with invalid chars to be enclosed.
+  \\s*+                          # Optional whitespace before first invalid char.
+  (?!\\[(?:\\*|/list)\\])          # Assert invalid char(s). (i.e. valid if [*] or [/list]).
+  [^[]*                         # (Normal*) Zero or more non-[.
+  (?:                           # Begin (special normal*)* "Unroll-the-loop- construct.
+    (?!\\[(?:\\*|/list)\\])        # If this [ is not the start of [*] or [/list], then
+    \\[                          # go ahead and match non-[*], non-[/list] left bracket.
+    [^[]*                       # More (normal*).
+  )*                            # End (special normal*)* "unroll-the-loop- construct.
+)                               # End $1: non-whitespace before first [*] (or [/list]).
+(?<!\\s)                         # Backtrack to exclude any trailing whitespace.
+(?=\\s*\\[(?:\\*|/list)\\])         # Done once we reach a [*] or [/list].
+								%ix',
+  'smilies' => 
+  array (
+    ':)' => 
+    array (
+      'file' => 'smile.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/smile.png" alt="Smile" title="Smile" />',
+    ),
+    '=)' => 
+    array (
+      'file' => 'smile.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/smile.png" alt="Smile" title="Smile" />',
+    ),
+    ':|' => 
+    array (
+      'file' => 'neutral.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/neutral.png" alt="Neutral" title="Neutral" />',
+    ),
+    '=|' => 
+    array (
+      'file' => 'neutral.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/neutral.png" alt="Neutral" title="Neutral" />',
+    ),
+    ':(' => 
+    array (
+      'file' => 'sad.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/sad.png" alt="Sad" title="Sad" />',
+    ),
+    '=(' => 
+    array (
+      'file' => 'sad.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/sad.png" alt="Sad" title="Sad" />',
+    ),
+    ':D' => 
+    array (
+      'file' => 'big_smile.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/big_smile.png" alt="Big Smile" title="Big Smile" />',
+    ),
+    '=D' => 
+    array (
+      'file' => 'big_smile.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/big_smile.png" alt="Big Smile" title="Big Smile" />',
+    ),
+    ':o' => 
+    array (
+      'file' => 'yikes.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/yikes.png" alt="Yikes" title="Yikes" />',
+    ),
+    ':O' => 
+    array (
+      'file' => 'yikes.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/yikes.png" alt="Yikes" title="Yikes" />',
+    ),
+    ';)' => 
+    array (
+      'file' => 'wink.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/wink.png" alt="Wink" title="Wink" />',
+    ),
+    ':/' => 
+    array (
+      'file' => 'hmm.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/hmm.png" alt="Hmm" title="Hmm" />',
+    ),
+    ':P' => 
+    array (
+      'file' => 'tongue.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/tongue.png" alt="Tongue" title="Tongue" />',
+    ),
+    ':p' => 
+    array (
+      'file' => 'tongue.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/tongue.png" alt="Tongue" title="Tongue" />',
+    ),
+    ':lol:' => 
+    array (
+      'file' => 'lol.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/lol.png" alt="Lol" title="Lol" />',
+    ),
+    ':mad:' => 
+    array (
+      'file' => 'mad.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/mad.png" alt="Mad" title="Mad" />',
+    ),
+    ':rolleyes:' => 
+    array (
+      'file' => 'roll.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/roll.png" alt="Roll" title="Roll" />',
+    ),
+    ':cool:' => 
+    array (
+      'file' => 'cool.png',
+      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/cool.png" alt="Cool" title="Cool" />',
+    ),
+  ),
+  'bbcd' => 
+  array (
+    'b' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<strong>
%c_str%
</strong>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'code' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'ATTRIB' => 
+        array (
+          'a_type' => 'text',
+          'c_type' => 'text',
+          'format' => '
</p><div class="codebox"><h4>Code: "%a_str%"</h4><pre>%c_str%</pre></div><p>
',
+        ),
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
</p><div class="codebox"><pre>%c_str%</pre></div><p>
',
+        ),
+      ),
+      'html_type' => 'block',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'err',
+      'tag_type' => 'hidden',
+      'tags_excluded' => 
+      array (
+      ),
+    ),
+    'color' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'ATTRIB' => 
+        array (
+          'a_type' => 'color',
+          'c_type' => 'text',
+          'format' => '
<span style="color: %a_str%;">
%c_str%
</span>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'err',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'colour' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'ATTRIB' => 
+        array (
+          'a_type' => 'color',
+          'c_type' => 'text',
+          'format' => '
<span style="color: %a_str%;">
%c_str%
</span>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'err',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'del' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<del>
%c_str%
</del>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'email' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'ATTRIB' => 
+        array (
+          'a_type' => 'email',
+          'c_type' => 'text',
+          'format' => '
<a href="mailto:%a_str%" rel="nofollow">
%c_str%
</a>
',
+        ),
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'email',
+          'format' => '
<a href="mailto:%c_str%" rel="nofollow">
%c_str%
</a>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'err',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'email' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'url' => true,
+        'dbug' => true,
+      ),
+    ),
+    'em' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<em>
%c_str%
</em>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'h' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
</p><h5>
%c_str%
</h5><p>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'img' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'ATTRIB' => 
+        array (
+          'a_type' => 'width_height',
+          'c_type' => 'url',
+          'format' => '
<img src="%c_str%" alt="%a_str%" title="%a_str%" width="%w_str%" height="%h_str%" />
',
+        ),
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'url',
+          'format' => '
<img src="%c_str%" alt="%c_str%" />
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'atomic',
+      'tags_excluded' => 
+      array (
+        'b' => true,
+        'code' => true,
+        'color' => true,
+        'colour' => true,
+        'del' => true,
+        'email' => true,
+        'em' => true,
+        'h' => true,
+        'ins' => true,
+        'i' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'sub' => true,
+        'sup' => true,
+        's' => true,
+        'tt' => true,
+        'url' => true,
+        'u' => true,
+        'center' => true,
+        'right' => true,
+        'left' => true,
+        'justify' => true,
+        'youtube' => true,
+        'large' => true,
+        'small' => true,
+        'err' => true,
+        'dbug' => true,
+      ),
+    ),
+    'ins' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<ins>
%c_str%
</ins>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'i' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<em>
%c_str%
</em>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'table' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 5,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
</p><table>
%c_str%
</table><p>
',
+        ),
+      ),
+      'html_type' => 'block',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'err',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'b' => true,
+        'code' => true,
+        'color' => true,
+        'colour' => true,
+        'del' => true,
+        'email' => true,
+        'em' => true,
+        'h' => true,
+        'img' => true,
+        'ins' => true,
+        'i' => true,
+        'table' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'sub' => true,
+        'sup' => true,
+        's' => true,
+        'tt' => true,
+        'url' => true,
+        'u' => true,
+        'center' => true,
+        'right' => true,
+        'left' => true,
+        'justify' => true,
+        'youtube' => true,
+        'large' => true,
+        'small' => true,
+        'dbug' => true,
+      ),
+      'tags_only' => true,
+    ),
+    'tr' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 5,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<tr>
%c_str%
</tr>
',
+        ),
+      ),
+      'html_type' => 'block',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'err',
+      'parents' => 
+      array (
+        'table' => true,
+      ),
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'b' => true,
+        'code' => true,
+        'color' => true,
+        'colour' => true,
+        'del' => true,
+        'email' => true,
+        'em' => true,
+        'h' => true,
+        'img' => true,
+        'ins' => true,
+        'i' => true,
+        'table' => true,
+        'tr' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'sub' => true,
+        'sup' => true,
+        's' => true,
+        'tt' => true,
+        'url' => true,
+        'u' => true,
+        'center' => true,
+        'right' => true,
+        'left' => true,
+        'justify' => true,
+        'youtube' => true,
+        'large' => true,
+        'small' => true,
+        'dbug' => true,
+      ),
+      'tags_only' => true,
+    ),
+    'th' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 5,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<th><p>
%c_str%
</p></th>
',
+        ),
+      ),
+      'html_type' => 'block',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'err',
+      'parents' => 
+      array (
+        'tr' => true,
+      ),
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+      ),
+    ),
+    'td' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 5,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<td><p>
%c_str%
</p></td>
',
+        ),
+      ),
+      'html_type' => 'block',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'err',
+      'parents' => 
+      array (
+        'tr' => true,
+      ),
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+      ),
+    ),
+    'list' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 5,
+      'handlers' => 
+      array (
+        1 => 
+        array (
+          'a_type' => 'text',
+          'c_type' => 'text',
+          'format' => '
</p><ol class="decimal">
%c_str%
</ol><p>
',
+        ),
+        'a' => 
+        array (
+          'a_type' => 'text',
+          'c_type' => 'text',
+          'format' => '
</p><ol class="alpha">
%c_str%
</ol><p>
',
+        ),
+        '*' => 
+        array (
+          'a_type' => 'text',
+          'c_type' => 'text',
+          'format' => '
</p><ul>
%c_str%
</ul><p>
',
+        ),
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
</p><ul>
%c_str%
</ul><p>
',
+        ),
+      ),
+      'html_type' => 'block',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'err',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'b' => true,
+        'code' => true,
+        'color' => true,
+        'colour' => true,
+        'del' => true,
+        'email' => true,
+        'em' => true,
+        'h' => true,
+        'img' => true,
+        'ins' => true,
+        'i' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'quote' => true,
+        'sub' => true,
+        'sup' => true,
+        's' => true,
+        'tt' => true,
+        'url' => true,
+        'u' => true,
+        'center' => true,
+        'right' => true,
+        'left' => true,
+        'justify' => true,
+        'youtube' => true,
+        'large' => true,
+        'small' => true,
+        'err' => true,
+        'dbug' => true,
+      ),
+      'tags_only' => true,
+    ),
+    '*' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 5,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<li><p>
%c_str%
</p></li>
',
+        ),
+      ),
+      'html_type' => 'block',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'err',
+      'parents' => 
+      array (
+        'list' => true,
+      ),
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+      ),
+    ),
+    'quote' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 5,
+      'handlers' => 
+      array (
+        'ATTRIB' => 
+        array (
+          'a_type' => 'text',
+          'c_type' => 'text',
+          'format' => '
</p><div class="quotebox"><cite>%a_str%</cite><blockquote><div><p>
%c_str%
</p></div></blockquote></div><p>
',
+        ),
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
</p><div class="quotebox"><blockquote><div><p>
%c_str%
</p></div></blockquote></div><p>
',
+        ),
+      ),
+      'html_type' => 'block',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'clip',
+      'tag_type' => 'zombie',
+      'tags_excluded' => 
+      array (
+      ),
+    ),
+    'sub' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<sub>
%c_str%
</sub>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'sup' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<sup>
%c_str%
</sup>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    's' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<span class="bbs">
%c_str%
</span>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'tt' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<tt>%c_str%</tt>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'hidden',
+      'tags_excluded' => 
+      array (
+      ),
+    ),
+    'url' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'ATTRIB' => 
+        array (
+          'a_type' => 'url',
+          'c_type' => 'text',
+          'format' => '
<a href="%a_str%" rel="nofollow">
%c_str%
</a>
',
+        ),
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'url',
+          'format' => '
<a href="%c_str%" rel="nofollow">%c_str%</a>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'email' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'url' => true,
+        'dbug' => true,
+      ),
+    ),
+    'u' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<span class="bbu">
%c_str%
</span>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'center' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
</p><div align="center"><p>
%c_str%
</p></div><p>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'right' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
</p><div align="right"><p>
%c_str%
</p></div><p>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'left' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
</p><div align="left"><p>
%c_str%
</p></div><p>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'justify' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
</p><div align="justify"><p>
%c_str%
</p></div><p>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'youtube' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'ATTRIB' => 
+        array (
+          'a_type' => 'width_height',
+          'c_regex' => '%(?:^|\\bv[=/])(\\w{10,12})\\b%S',
+          'c_type' => 'text',
+          'format' => '
<object type="application/x-shockwave-flash" width="%w_str%" height="%h_str%" data="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1&amp;rel=0"><param name="movie" value="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1" /><param name="allowFullScreen" value="true" /></object>
',
+        ),
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'width_height',
+          'c_regex' => '%(?:^|\\bv[=/])(\\w{10,12})\\b%S',
+          'c_type' => 'width_height',
+          'format' => '
<object type="application/x-shockwave-flash" width="%w_str%" height="%h_str%" data="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1&amp;rel=0"><param name="movie" value="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1" /><param name="allowFullScreen" value="true" /></object>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => false,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'b' => true,
+        'code' => true,
+        'color' => true,
+        'colour' => true,
+        'del' => true,
+        'email' => true,
+        'em' => true,
+        'h' => true,
+        'img' => true,
+        'ins' => true,
+        'i' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'sub' => true,
+        'sup' => true,
+        's' => true,
+        'tt' => true,
+        'url' => true,
+        'u' => true,
+        'center' => true,
+        'right' => true,
+        'left' => true,
+        'justify' => true,
+        'youtube' => true,
+        'large' => true,
+        'small' => true,
+        'err' => true,
+        'dbug' => true,
+      ),
+      'x_padding' => 20,
+      'y_padding' => 45,
+    ),
+    'large' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<span style="font-size: larger;">
%c_str%
</span>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'small' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<span style="font-size: smaller;">
%c_str%
</span>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+        'code' => true,
+        'table' => true,
+        'tr' => true,
+        'th' => true,
+        'td' => true,
+        'list' => true,
+        '*' => true,
+        'quote' => true,
+        'dbug' => true,
+      ),
+    ),
+    'err' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'ATTRIB' => 
+        array (
+          'a_type' => 'text',
+          'c_type' => 'text',
+          'format' => '
<span class="err" title="%a_str%">%c_str%</span>
',
+        ),
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'none',
+          'c_type' => 'text',
+          'format' => '
<span class="err">%c_str%</span>
',
+        ),
+      ),
+      'html_type' => 'inline',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'fix',
+      'tag_type' => 'hidden',
+      'tags_excluded' => 
+      array (
+      ),
+    ),
+    'dbug' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 5,
+      'handlers' => 
+      array (
+        'ATTRIB' => 
+        array (
+          'a_type' => 'text',
+          'c_type' => 'text',
+          'format' => '
</p><p class="debug" title="%a_str%">
%c_str%
</p><p>
',
+        ),
+      ),
+      'html_type' => 'block',
+      'in_post' => true,
+      'in_sig' => true,
+      'nest_type' => 'err',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+      ),
+    ),
+    '_ROOT_' => 
+    array (
+      'depth' => 0,
+      'depth_max' => 1,
+      'handlers' => 
+      array (
+        'NO_ATTRIB' => 
+        array (
+          'a_type' => 'text',
+          'c_type' => 'text',
+          'format' => '
<span class="err" title="_ROOT_">%c_str%</span>
',
+        ),
+      ),
+      'html_type' => 'block',
+      'in_post' => false,
+      'in_sig' => false,
+      'nest_type' => 'err',
+      'tag_type' => 'normal',
+      'tags_excluded' => 
+      array (
+      ),
+    ),
+  ),
+);
+?>
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 74b29ce1..51c50373 100644
--- a/composer.json
+++ b/composer.json
@@ -16,10 +16,10 @@
 		"role": "Contributor"
 	}],
 	"autoload": {
-        "classmap": ["app/Core/Database.php", "app/Core/pomo/MO.php"],
+        "classmap": ["featherbb/Core/Database.php", "featherbb/Core/pomo/MO.php"],
 		"psr-4": {
 			"Plugins\\": "/plugins",
-			"FeatherBB\\": "app/Core",
+			"FeatherBB\\": "featherbb/Core",
 			"": ""
 		}
 	},
diff --git a/extern.php b/extern.php
index 9e8ea810..22457700 100644
--- a/extern.php
+++ b/extern.php
@@ -62,21 +62,21 @@
 \Slim\Slim::registerAutoloader();
 
 // Load FeatherBB
-require 'app/Helpers/classes/autoload.class.php';
+require 'featherbb/Helpers/classes/autoload.class.php';
 \FeatherBB\Loader::registerAutoloader();
 
 // Instantiate Slim and add CSRF
 $feather = new \Slim\Slim();
 $feather->add(new \FeatherBB\Csrf());
 
-$feather_settings = array('config_file' => 'app/config.php',
-    'cache_dir' => 'app/cache/',
+$feather_settings = array('config_file' => 'featherbb/config.php',
+    'cache_dir' => 'featherbb/cache/',
     'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
 $feather->add(new \FeatherBB\Auth());
 $feather->add(new \FeatherBB\Core($feather_settings));
 
-load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$feather->user->language.'/common.mo');
-load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$feather->user->language.'/index.mo');
+load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$feather->user->language.'/common.mo');
+load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$feather->user->language.'/index.mo');
 
 // The length at which topic subjects will be truncated (for HTML output)
 if (!defined('FORUM_EXTERN_MAX_SUBJECT_LENGTH')) {
@@ -439,7 +439,7 @@ function output_html($feed)
 
 // Show recent discussions
 if ($action == 'feed') {
-    require FEATHER_ROOT.'app/Helpers/parser.php';
+    require FEATHER_ROOT.'featherbb/Helpers/parser.php';
 
     // Determine what type of feed to output
     $type = isset($_GET['type']) ? strtolower($_GET['type']) : 'html';
@@ -650,7 +650,7 @@ function output_html($feed)
             // Output feed as PHP code
             if (isset($cache_id)) {
                 if (!defined('FORUM_CACHE_FUNCTIONS_LOADED')) {
-                    require FEATHER_ROOT.'app/Helpers/cache.php';
+                    require FEATHER_ROOT.'featherbb/Helpers/cache.php';
                 }
 
                 $content = '<?php'."\n\n".'$feed = '.var_export($feed, true).';'."\n\n".'$cache_expire = '.($now + ($feather->forum_settings['o_feed_ttl'] * 60)).';'."\n\n".'?>';
@@ -728,7 +728,7 @@ function output_html($feed)
 elseif ($action == 'stats') {
 
     if (!$feather->cache->isCached('users_info')) {
-        $feather->cache->store('users_info', \App\Model\Cache::get_users_info());
+        $feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
     }
 
     $stats = $feather->cache->retrieve('users_info');
diff --git a/app/Controller/Admin/Bans.php b/featherbb/Controller/Admin/Bans.php
similarity index 95%
rename from app/Controller/Admin/Bans.php
rename to featherbb/Controller/Admin/Bans.php
index ed472f75..65ddb814 100644
--- a/app/Controller/Admin/Bans.php
+++ b/featherbb/Controller/Admin/Bans.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller\Admin;
+namespace FeatherBB\Controller\Admin;
 
 class Bans
 {
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\Admin\Bans();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/bans.mo');
+        $this->model = new \FeatherBB\Model\Admin\Bans();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/bans.mo');
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
             throw new \FeatherBB\Error(__('No permission'), '403');
diff --git a/app/Controller/Admin/Categories.php b/featherbb/Controller/Admin/Categories.php
similarity index 92%
rename from app/Controller/Admin/Categories.php
rename to featherbb/Controller/Admin/Categories.php
index 610e5724..10869aae 100644
--- a/app/Controller/Admin/Categories.php
+++ b/featherbb/Controller/Admin/Categories.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher.
  */
 
-namespace App\Controller\Admin;
+namespace FeatherBB\Controller\Admin;
 
 class Categories
 {
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\Admin\Categories();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/categories.mo');
+        $this->model = new \FeatherBB\Model\Admin\Categories();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/categories.mo');
     }
 
     public function __autoload($class_name)
@@ -58,7 +58,7 @@ public function edit_categories()
         }
 
         // Regenerate the quick jump cache
-        $this->feather->cache->store('quickjump', \App\Model\Cache::get_quickjump());
+        $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
         redirect($this->feather->url->get('admin/categories/'), __('Categories updated redirect'));
     }
diff --git a/app/Controller/Admin/Censoring.php b/featherbb/Controller/Admin/Censoring.php
similarity index 90%
rename from app/Controller/Admin/Censoring.php
rename to featherbb/Controller/Admin/Censoring.php
index 8e641352..45fc28c7 100644
--- a/app/Controller/Admin/Censoring.php
+++ b/featherbb/Controller/Admin/Censoring.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller\Admin;
+namespace FeatherBB\Controller\Admin;
 
 class Censoring
 {
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\Admin\Censoring();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/censoring.mo');
+        $this->model = new \FeatherBB\Model\Admin\Censoring();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/censoring.mo');
     }
 
     public function __autoload($class_name)
diff --git a/app/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
similarity index 91%
rename from app/Controller/Admin/Forums.php
rename to featherbb/Controller/Admin/Forums.php
index 98a73bea..e9106cd0 100644
--- a/app/Controller/Admin/Forums.php
+++ b/featherbb/Controller/Admin/Forums.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller\Admin;
+namespace FeatherBB\Controller\Admin;
 
 class Forums
 {
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\Admin\forums();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/forums.mo');
+        $this->model = new \FeatherBB\Model\Admin\forums();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/forums.mo');
     }
 
     public function __autoload($class_name)
@@ -41,7 +41,7 @@ public function add_forum()
 
         if ($fid = $this->model->add_forum($cat_id, __('New forum'))) {
             // Regenerate the quick jump cache
-            $this->feather->cache->store('quickjump', \App\Model\Cache::get_quickjump());
+            $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
             redirect($this->feather->url->get('admin/forums/edit/'.$fid.'/'), __('Forum added redirect'));
         } else {
             redirect($this->feather->url->get('admin/forums/'), __('Unable to add forum'));
@@ -98,7 +98,7 @@ public function edit_forum($forum_id)
                 }
 
                 // Regenerate the quick jump cache
-                $this->feather->cache->store('quickjump', \App\Model\Cache::get_quickjump());
+                $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
                 redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Forum updated redirect'));
 
@@ -106,7 +106,7 @@ public function edit_forum($forum_id)
                 $this->model->delete_permissions($forum_id);
 
                 // Regenerate the quick jump cache
-                $this->feather->cache->store('quickjump', \App\Model\Cache::get_quickjump());
+                $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
                 redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Perms reverted redirect'));
             }
@@ -132,7 +132,7 @@ public function delete_forum($forum_id)
         if($this->request->isPost()) {
             $this->model->delete_forum($forum_id);
             // Regenerate the quick jump cache
-            $this->feather->cache->store('quickjump', \App\Model\Cache::get_quickjump());
+            $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
             redirect($this->feather->url->get('admin/forums/'), __('Forum deleted redirect'));
 
@@ -160,7 +160,7 @@ public function edit_positions()
         }
 
         // Regenerate the quick jump cache
-        $this->feather->cache->store('quickjump', \App\Model\Cache::get_quickjump());
+        $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
         redirect($this->feather->url->get('admin/forums/'), __('Forums updated redirect'));
     }
@@ -173,7 +173,7 @@ public function display()
 
         \FeatherBB\AdminUtils::generateAdminMenu('forums');
 
-        $categories_model = new \App\Model\Admin\Categories();
+        $categories_model = new \FeatherBB\Model\Admin\Categories();
         $this->feather->view2->setPageInfo(array(
                 'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Forums')),
                 'active_page' => 'admin',
diff --git a/app/Controller/Admin/Groups.php b/featherbb/Controller/Admin/Groups.php
similarity index 96%
rename from app/Controller/Admin/Groups.php
rename to featherbb/Controller/Admin/Groups.php
index 0208c6d2..ee785212 100644
--- a/app/Controller/Admin/Groups.php
+++ b/featherbb/Controller/Admin/Groups.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller\Admin;
+namespace FeatherBB\Controller\Admin;
 
 class Groups
 {
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\Admin\groups();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/groups.mo');
+        $this->model = new \FeatherBB\Model\Admin\groups();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/groups.mo');
     }
 
     public function __autoload($class_name)
diff --git a/app/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
similarity index 96%
rename from app/Controller/Admin/Index.php
rename to featherbb/Controller/Admin/Index.php
index 36b5ec88..e0420931 100644
--- a/app/Controller/Admin/Index.php
+++ b/featherbb/Controller/Admin/Index.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller\Admin;
+namespace FeatherBB\Controller\Admin;
 
 class Index
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/index.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/index.mo');
     }
 
     public function __autoload($class_name)
diff --git a/app/Controller/Admin/Maintenance.php b/featherbb/Controller/Admin/Maintenance.php
similarity index 93%
rename from app/Controller/Admin/Maintenance.php
rename to featherbb/Controller/Admin/Maintenance.php
index 2fcb24dd..1d16356d 100644
--- a/app/Controller/Admin/Maintenance.php
+++ b/featherbb/Controller/Admin/Maintenance.php
@@ -7,15 +7,15 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller\Admin;
+namespace FeatherBB\Controller\Admin;
 
 class Maintenance
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \App\Model\Admin\maintenance();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/admin/maintenance.mo');
+        $this->model = new \FeatherBB\Model\Admin\maintenance();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/admin/maintenance.mo');
     }
 
     public function display()
diff --git a/app/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
similarity index 88%
rename from app/Controller/Admin/Options.php
rename to featherbb/Controller/Admin/Options.php
index e7095fd2..c48ca619 100644
--- a/app/Controller/Admin/Options.php
+++ b/featherbb/Controller/Admin/Options.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller\Admin;
+namespace FeatherBB\Controller\Admin;
 
 class Options
 {
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\Admin\options();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/options.mo');
+        $this->model = new \FeatherBB\Model\Admin\options();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/options.mo');
     }
 
     public function __autoload($class_name)
diff --git a/app/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
similarity index 93%
rename from app/Controller/Admin/Parser.php
rename to featherbb/Controller/Admin/Parser.php
index aafe88da..b550fe72 100644
--- a/app/Controller/Admin/Parser.php
+++ b/featherbb/Controller/Admin/Parser.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller\Admin;
+namespace FeatherBB\Controller\Admin;
 
 class Parser
 {
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\Admin\parser();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/parser.mo');
+        $this->model = new \FeatherBB\Model\Admin\parser();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/parser.mo');
     }
 
     public function __autoload($class_name)
@@ -32,19 +32,19 @@ public function display()
         global $lang_admin_parser;
 
         // Legacy
-        require FEATHER_ROOT . 'app/lang/' . $this->user->language . '/admin/parser.php';
+        require FEATHER_ROOT . 'featherbb/lang/' . $this->user->language . '/admin/parser.php';
 
         // This is where the parser data lives and breathes.
-        $cache_file = FEATHER_ROOT.'app/cache/cache_parser_data.php';
+        $cache_file = FEATHER_ROOT.'featherbb/cache/cache_parser_data.php';
 
         // If RESET button pushed, or no cache file, re-compile master bbcode source file.
         if ($this->request->post('reset') || !file_exists($cache_file)) {
-            require_once(FEATHER_ROOT.'app/Helpers/bbcd_source.php');
-            require_once(FEATHER_ROOT.'app/Helpers/bbcd_compile.php');
+            require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_source.php');
+            require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_compile.php');
             redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['reset_success']);
         }
 
-        // Load the current BBCode $pd array from app/Helpers/parser_data.inc.php.
+        // Load the current BBCode $pd array from featherbb/Helpers/parser_data.inc.php.
         require_once($cache_file);            // Fetch $pd compiled global regex data.
         $bbcd = $pd['bbcd'];                // Local scratch copy of $bbcd.
         $smilies = $pd['smilies'];            // Local scratch copy of $smilies.
@@ -198,7 +198,7 @@ public function display()
                 }
             }
 
-            require_once('app/Helpers/bbcd_compile.php'); // Compile $bbcd and save into $pd['bbcd']
+            require_once('featherbb/Helpers/bbcd_compile.php'); // Compile $bbcd and save into $pd['bbcd']
             redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['save_success']);
         }
 
diff --git a/app/Controller/Admin/Permissions.php b/featherbb/Controller/Admin/Permissions.php
similarity index 87%
rename from app/Controller/Admin/Permissions.php
rename to featherbb/Controller/Admin/Permissions.php
index 975aa386..1b4d236e 100644
--- a/app/Controller/Admin/Permissions.php
+++ b/featherbb/Controller/Admin/Permissions.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller\Admin;
+namespace FeatherBB\Controller\Admin;
 
 class Permissions
 {
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\Admin\permissions();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/permissions.mo');
+        $this->model = new \FeatherBB\Model\Admin\permissions();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/permissions.mo');
     }
 
     public function __autoload($class_name)
diff --git a/app/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
similarity index 99%
rename from app/Controller/Admin/Plugins.php
rename to featherbb/Controller/Admin/Plugins.php
index 41446601..1765a9a0 100644
--- a/app/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller\Admin;
+namespace FeatherBB\Controller\Admin;
 
 class Plugins
 {
diff --git a/app/Controller/Admin/Reports.php b/featherbb/Controller/Admin/Reports.php
similarity index 89%
rename from app/Controller/Admin/Reports.php
rename to featherbb/Controller/Admin/Reports.php
index 85b996cb..10e3e4df 100644
--- a/app/Controller/Admin/Reports.php
+++ b/featherbb/Controller/Admin/Reports.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller\Admin;
+namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\AdminUtils;
 
@@ -20,8 +20,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\Admin\reports();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/reports.mo');
+        $this->model = new \FeatherBB\Model\Admin\reports();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/reports.mo');
     }
 
     public function __autoload($class_name)
diff --git a/app/Controller/Admin/Statistics.php b/featherbb/Controller/Admin/Statistics.php
similarity index 91%
rename from app/Controller/Admin/Statistics.php
rename to featherbb/Controller/Admin/Statistics.php
index 4e00bf94..efff22c6 100644
--- a/app/Controller/Admin/Statistics.php
+++ b/featherbb/Controller/Admin/Statistics.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller\Admin;
+namespace FeatherBB\Controller\Admin;
 
 class Statistics
 {
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\Admin\statistics();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/index.mo');
+        $this->model = new \FeatherBB\Model\Admin\statistics();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/index.mo');
     }
 
     public function display()
diff --git a/app/Controller/Admin/Users.php b/featherbb/Controller/Admin/Users.php
similarity index 98%
rename from app/Controller/Admin/Users.php
rename to featherbb/Controller/Admin/Users.php
index 398ccb96..7350eb25 100644
--- a/app/Controller/Admin/Users.php
+++ b/featherbb/Controller/Admin/Users.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller\Admin;
+namespace FeatherBB\Controller\Admin;
 
 class Users
 {
@@ -18,8 +18,8 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\Admin\users();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->user->language.'/admin/users.mo');
+        $this->model = new \FeatherBB\Model\Admin\users();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/users.mo');
     }
 
     public function __autoload($class_name)
diff --git a/app/Controller/Auth.php b/featherbb/Controller/Auth.php
similarity index 85%
rename from app/Controller/Auth.php
rename to featherbb/Controller/Auth.php
index 72a0352c..4df72e8c 100644
--- a/app/Controller/Auth.php
+++ b/featherbb/Controller/Auth.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 use DB;
 
 class Auth
@@ -15,7 +15,7 @@ class Auth
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->feather->user->language.'/login.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->feather->user->language.'/login.mo');
     }
 
     public function login()
@@ -30,25 +30,25 @@ public function login()
             $form_password = $this->feather->utils->trim($this->feather->request->post('req_password'));
             $save_pass = (bool) $this->feather->request->post('save_pass');
 
-            $user = \App\Model\Auth::get_user_from_name($form_username);
+            $user = \FeatherBB\Model\Auth::get_user_from_name($form_username);
 
             if (!empty($user->password)) {
                 $form_password_hash = \FeatherBB\Utils::feather_hash($form_password); // Will result in a SHA-1 hash
                 if ($user->password == $form_password_hash) {
                     if ($user->group_id == FEATHER_UNVERIFIED) {
-                        \App\Model\Auth::update_group($user->id, $this->feather->forum_settings['o_default_user_group']);
+                        \FeatherBB\Model\Auth::update_group($user->id, $this->feather->forum_settings['o_default_user_group']);
                         if (!$this->feather->cache->isCached('users_info')) {
-                            $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
+                            $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
                         }
                     }
 
-                    \App\Model\Auth::delete_online_by_ip($this->feather->request->getIp());
+                    \FeatherBB\Model\Auth::delete_online_by_ip($this->feather->request->getIp());
                     // Reset tracked topics
                     set_tracked_topics(null);
 
                     $expire = ($save_pass) ? $this->feather->now + 1209600 : $this->feather->now + $this->feather->forum_settings['o_timeout_visit'];
                     $expire = $this->feather->hooks->fire('expire_login', $expire);
-                    \App\Model\Auth::feather_setcookie($user->id, $form_password_hash, $expire);
+                    \FeatherBB\Model\Auth::feather_setcookie($user->id, $form_password_hash, $expire);
 
                     $this->feather->url->redirect($this->feather->url->base(), __('Login redirect'));
                 }
@@ -73,14 +73,14 @@ public function logout($token)
             $this->feather->url->redirect($this->feather->url->get('/'), 'Not logged in');
         }
 
-        \App\Model\Auth::delete_online_by_id($this->feather->user->id);
+        \FeatherBB\Model\Auth::delete_online_by_id($this->feather->user->id);
 
         // Update last_visit (make sure there's something to update it with)
         if (isset($this->feather->user->logged)) {
-            \App\Model\Auth::set_last_visit($this->feather->user->id, $this->feather->user->logged);
+            \FeatherBB\Model\Auth::set_last_visit($this->feather->user->id, $this->feather->user->logged);
         }
 
-        \App\Model\Auth::feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), time() + 31536000);
+        \FeatherBB\Model\Auth::feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), time() + 31536000);
         $this->feather->hooks->fire('logout_end');
 
         redirect($this->feather->url->base(), __('Logout redirect'));
@@ -98,11 +98,11 @@ public function forget()
             if (!$this->feather->email->is_valid_email($email)) {
                 throw new \FeatherBB\Error(__('Invalid email'), 400);
             }
-            $user = \App\Model\Auth::get_user_from_email($email);
+            $user = \FeatherBB\Model\Auth::get_user_from_email($email);
 
             if ($user) {
                 // Load the "activate password" template
-                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->feather->user->language.'/mail_templates/activate_password.tpl'));
+                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->feather->user->language.'/mail_templates/activate_password.tpl'));
                 $mail_tpl = $this->feather->hooks->fire('mail_tpl_password_forgotten', $mail_tpl);
 
                 // The first row contains the subject
@@ -124,7 +124,7 @@ public function forget()
                 $new_password = random_pass(12);
                 $new_password_key = random_pass(8);
 
-                \App\Model\Auth::set_new_password($new_password, $new_password_key, $user->id);
+                \FeatherBB\Model\Auth::set_new_password($new_password, $new_password_key, $user->id);
 
                 // Do the user specific replacements to the template
                 $cur_mail_message = str_replace('<username>', $user->username, $mail_message);
diff --git a/app/Controller/Delete.php b/featherbb/Controller/Delete.php
similarity index 88%
rename from app/Controller/Delete.php
rename to featherbb/Controller/Delete.php
index 643dd871..c9e92bde 100644
--- a/app/Controller/Delete.php
+++ b/featherbb/Controller/Delete.php
@@ -7,16 +7,16 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 
 class Delete
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \App\Model\Delete();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/delete.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/post.mo');
+        $this->model = new \FeatherBB\Model\Delete();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/delete.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/post.mo');
     }
 
     public function deletepost($id)
@@ -57,7 +57,7 @@ public function deletepost($id)
             $this->model->handle_deletion($is_topic_post, $id, $cur_post['tid'], $cur_post['fid']);
         }
 
-        require $this->feather->forum_env['FEATHER_ROOT'].'app/Helpers/parser.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/parser.php';
         $cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
 
         $this->feather->view2->setPageInfo(array(
diff --git a/app/Controller/Edit.php b/featherbb/Controller/Edit.php
similarity index 89%
rename from app/Controller/Edit.php
rename to featherbb/Controller/Edit.php
index 59c38a50..2204191e 100644
--- a/app/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 
 class Edit
 {
@@ -18,11 +18,11 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\edit();
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/prof_reg.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/post.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/bbeditor.mo');
+        $this->model = new \FeatherBB\Model\edit();
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/register.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/post.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/bbeditor.mo');
     }
 
     public function __autoload($class_name)
@@ -81,7 +81,7 @@ public function editpost($id)
         }
 
         if ($this->request->post('preview')) {
-            require_once FEATHER_ROOT.'app/Helpers/parser.php';
+            require_once FEATHER_ROOT.'featherbb/Helpers/parser.php';
             $preview_message = parse_message($post['message'], $post['hide_smilies']);
         } else {
             $preview_message = '';
diff --git a/app/Controller/Help.php b/featherbb/Controller/Help.php
similarity index 88%
rename from app/Controller/Help.php
rename to featherbb/Controller/Help.php
index 25b5ff4a..89e519b1 100644
--- a/app/Controller/Help.php
+++ b/featherbb/Controller/Help.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 
 class Help
 {
@@ -18,7 +18,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/help.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/help.mo');
     }
 
     public function __autoload($class_name)
diff --git a/app/Controller/Index.php b/featherbb/Controller/Index.php
similarity index 84%
rename from app/Controller/Index.php
rename to featherbb/Controller/Index.php
index 219f6b72..df39c39e 100644
--- a/app/Controller/Index.php
+++ b/featherbb/Controller/Index.php
@@ -7,15 +7,15 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 
 class Index
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \App\Model\Index();
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->feather->user->language.'/index.mo');
+        $this->model = new \FeatherBB\Model\Index();
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->feather->user->language.'/index.mo');
     }
 
     public function display()
diff --git a/app/Controller/Install.php b/featherbb/Controller/Install.php
similarity index 98%
rename from app/Controller/Install.php
rename to featherbb/Controller/Install.php
index 2b747a51..39275112 100644
--- a/app/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 
 class Install
 {
@@ -26,7 +26,7 @@ class Install
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \App\Model\install();
+        $this->model = new \FeatherBB\Model\install();
         $this->available_langs = \FeatherBB\Lister::getLangs();
         $this->feather->view2->setStyle('FeatherBB');
     }
@@ -38,7 +38,7 @@ public function run()
                 $this->install_lang = $this->feather->request->post('install_lang');
             }
         }
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->install_lang.'/install.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->install_lang.'/install.mo');
 
         if ($this->feather->request->isPost() && empty($this->feather->request->post('choose_lang'))) {
             $missing_fields = array();
@@ -164,7 +164,7 @@ public function create_db(array $data)
         \FeatherBB\Core::init_db($data);
 
         // Load appropriate language
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$data['default_lang'].'/install.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$data['default_lang'].'/install.mo');
 
         // Handle db prefix
         $data['db_prefix'] = (!empty($data['db_prefix'])) ? $data['db_prefix'] : '';
diff --git a/app/Controller/Login.php b/featherbb/Controller/Login.php
similarity index 92%
rename from app/Controller/Login.php
rename to featherbb/Controller/Login.php
index a409a330..e73cf0b4 100644
--- a/app/Controller/Login.php
+++ b/featherbb/Controller/Login.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 
 class Login
 {
@@ -20,8 +20,8 @@ public function __construct()
         $this->request = $this->feather->request;
 
 
-        $this->model = new \App\Model\Login();
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/login.mo');
+        $this->model = new \FeatherBB\Model\Login();
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/login.mo');
     }
 
     public function __autoload($class_name)
diff --git a/app/Controller/Misc.php b/featherbb/Controller/Misc.php
similarity index 95%
rename from app/Controller/Misc.php
rename to featherbb/Controller/Misc.php
index 1916080a..479d48e0 100644
--- a/app/Controller/Misc.php
+++ b/featherbb/Controller/Misc.php
@@ -7,16 +7,16 @@
 * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
 */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 
 class Misc
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \App\Model\Misc();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/register.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/misc.mo');
+        $this->model = new \FeatherBB\Model\Misc();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/register.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/misc.mo');
     }
 
     public function rules()
diff --git a/app/Controller/Moderate.php b/featherbb/Controller/Moderate.php
similarity index 96%
rename from app/Controller/Moderate.php
rename to featherbb/Controller/Moderate.php
index 0993e8be..91d96636 100644
--- a/app/Controller/Moderate.php
+++ b/featherbb/Controller/Moderate.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 
 class Moderate
 {
@@ -18,11 +18,11 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\Moderate();
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/topic.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/forum.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/misc.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/post.mo');
+        $this->model = new \FeatherBB\Model\Moderate();
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/topic.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/forum.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/misc.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/post.mo');
     }
 
     public function __autoload($class_name)
diff --git a/app/Controller/Post.php b/featherbb/Controller/Post.php
similarity index 94%
rename from app/Controller/Post.php
rename to featherbb/Controller/Post.php
index 88190020..75c70641 100644
--- a/app/Controller/Post.php
+++ b/featherbb/Controller/Post.php
@@ -7,19 +7,19 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 
 class Post
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \App\Model\Post();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/prof_reg.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/post.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/register.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/antispam.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/bbeditor.mo');
+        $this->model = new \FeatherBB\Model\Post();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/post.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/register.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/antispam.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/bbeditor.mo');
     }
 
     public function newreply($fid = null, $tid = null, $qid = null)
@@ -30,7 +30,7 @@ public function newreply($fid = null, $tid = null, $qid = null)
     public function newpost($fid = null, $tid = null, $qid = null)
     {
         // Antispam feature
-        require $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/antispam.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
         // If $_POST['username'] is filled, we are facing a bot
diff --git a/app/Controller/Profile.php b/featherbb/Controller/Profile.php
similarity index 93%
rename from app/Controller/Profile.php
rename to featherbb/Controller/Profile.php
index 11dca00d..52e22cbd 100644
--- a/app/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 
 class Profile
 {
@@ -18,10 +18,10 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\Profile();
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/profile.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/prof_reg.mo');
+        $this->model = new \FeatherBB\Model\Profile();
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/profile.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/register.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/prof_reg.mo');
     }
 
     public function __autoload($class_name)
@@ -34,9 +34,9 @@ public function display($id, $section = null)
         global $pd, $forum_time_formats, $forum_date_formats;
 
         // Include UTF-8 function
-        require FEATHER_ROOT.'app/Helpers/utf8/substr_replace.php';
-        require FEATHER_ROOT.'app/Helpers/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
-        require FEATHER_ROOT.'app/Helpers/utf8/strcasecmp.php';
+        require FEATHER_ROOT.'featherbb/Helpers/utf8/substr_replace.php';
+        require FEATHER_ROOT.'featherbb/Helpers/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
+        require FEATHER_ROOT.'featherbb/Helpers/utf8/strcasecmp.php';
 
         if ($this->request->post('update_group_membership')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
@@ -93,7 +93,7 @@ public function display($id, $section = null)
         $user = $this->model->get_user_info($id);
 
         if ($user['signature'] != '') {
-            require FEATHER_ROOT.'app/Helpers/parser.php';
+            require FEATHER_ROOT.'featherbb/Helpers/parser.php';
             $parsed_signature = parse_signature($user['signature']);
         }
 
@@ -244,9 +244,9 @@ public function display($id, $section = null)
     public function action($id, $action)
     {
         // Include UTF-8 function
-        require FEATHER_ROOT.'app/Helpers/utf8/substr_replace.php';
-        require FEATHER_ROOT.'app/Helpers/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
-        require FEATHER_ROOT.'app/Helpers/utf8/strcasecmp.php';
+        require FEATHER_ROOT.'featherbb/Helpers/utf8/substr_replace.php';
+        require FEATHER_ROOT.'featherbb/Helpers/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
+        require FEATHER_ROOT.'featherbb/Helpers/utf8/strcasecmp.php';
 
         if ($action != 'change_pass' || !$this->request->get('key')) {
             if ($this->user->g_read_board == '0') {
diff --git a/app/Controller/Register.php b/featherbb/Controller/Register.php
similarity index 89%
rename from app/Controller/Register.php
rename to featherbb/Controller/Register.php
index a1fc750c..810955e8 100644
--- a/app/Controller/Register.php
+++ b/featherbb/Controller/Register.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 
 class Register
 {
@@ -18,10 +18,10 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\Register();
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/prof_reg.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/antispam.mo');
+        $this->model = new \FeatherBB\Model\Register();
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/register.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/antispam.mo');
     }
 
     public function __autoload($class_name)
@@ -37,7 +37,7 @@ public function display()
         }
 
         // Antispam feature
-        require FEATHER_ROOT.'app/lang/'.$this->user->language.'/antispam.php';
+        require FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
         // Display an error message if new registrations are disabled
diff --git a/app/Controller/Search.php b/featherbb/Controller/Search.php
similarity index 86%
rename from app/Controller/Search.php
rename to featherbb/Controller/Search.php
index 64bf41fd..159c4741 100644
--- a/app/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 
 class Search
 {
@@ -18,10 +18,10 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \App\Model\search();
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/userlist.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/search.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->user->language.'/forum.mo');
+        $this->model = new \FeatherBB\Model\search();
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/userlist.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/search.mo');
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/forum.mo');
     }
 
     public function __autoload($class_name)
@@ -47,7 +47,7 @@ public function display()
                 if (isset($search['is_result'])) {
 
                     if ($search['show_as'] == 'posts') {
-                        require FEATHER_ROOT.'app/Helpers/parser.php';
+                        require FEATHER_ROOT.'featherbb/Helpers/parser.php';
                     }
 
                     $this->feather->view2->setPageInfo(array(
diff --git a/app/Controller/Userlist.php b/featherbb/Controller/Userlist.php
similarity index 93%
rename from app/Controller/Userlist.php
rename to featherbb/Controller/Userlist.php
index 3954c01c..417a47c4 100644
--- a/app/Controller/Userlist.php
+++ b/featherbb/Controller/Userlist.php
@@ -7,16 +7,16 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 
 class Userlist
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \App\Model\Userlist();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/userlist.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/search.mo');
+        $this->model = new \FeatherBB\Model\Userlist();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/userlist.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/search.mo');
     }
 
     public function display()
diff --git a/app/Controller/Viewforum.php b/featherbb/Controller/Viewforum.php
similarity index 95%
rename from app/Controller/Viewforum.php
rename to featherbb/Controller/Viewforum.php
index 523b4a83..e054924e 100644
--- a/app/Controller/Viewforum.php
+++ b/featherbb/Controller/Viewforum.php
@@ -7,15 +7,15 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 
 class Viewforum
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \App\Model\Viewforum();
-        load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$this->feather->user->language.'/forum.mo');
+        $this->model = new \FeatherBB\Model\Viewforum();
+        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->feather->user->language.'/forum.mo');
     }
 
     public function __autoload($class_name)
diff --git a/app/Controller/Viewtopic.php b/featherbb/Controller/Viewtopic.php
similarity index 92%
rename from app/Controller/Viewtopic.php
rename to featherbb/Controller/Viewtopic.php
index dca95c9b..36263045 100644
--- a/app/Controller/Viewtopic.php
+++ b/featherbb/Controller/Viewtopic.php
@@ -7,17 +7,17 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Controller;
+namespace FeatherBB\Controller;
 
 class Viewtopic
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \App\Model\Viewtopic();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/topic.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/post.mo');
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/bbeditor.mo');
+        $this->model = new \FeatherBB\Model\Viewtopic();
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/topic.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/post.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/bbeditor.mo');
     }
 
     public function display($id = null, $name = null, $page = null, $pid = null)
@@ -29,7 +29,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         }
 
         // Antispam feature
-        require $this->feather->forum_env['FEATHER_ROOT'].'app/lang/'.$this->feather->user->language.'/antispam.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
         // Fetch some informations about the topic
@@ -71,7 +71,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         $quickpost = $this->model->is_quickpost($cur_topic['post_replies'], $cur_topic['closed'], $is_admmod);
         $subscraction = $this->model->get_subscraction($cur_topic['is_subscribed'], $id);
 
-        require $this->feather->forum_env['FEATHER_ROOT'].'app/Helpers/parser.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/parser.php';
         $lang_bbeditor = array(
             'btnBold' => __('btnBold'),
             'btnItalic' => __('btnItalic'),
diff --git a/app/Core/AdminUtils.php b/featherbb/Core/AdminUtils.php
similarity index 94%
rename from app/Core/AdminUtils.php
rename to featherbb/Core/AdminUtils.php
index a27eaa58..06117f74 100644
--- a/app/Core/AdminUtils.php
+++ b/featherbb/Core/AdminUtils.php
@@ -53,7 +53,7 @@ public static function breadcrumbs_admin(array $links)
     public static function get_admin_ids()
     {
         if (!$this->feather->cache->isCached('admin_ids')) {
-            $this->feather->cache->store('admin_ids', \App\Model\Cache::get_admin_ids());
+            $this->feather->cache->store('admin_ids', \FeatherBB\Model\Cache::get_admin_ids());
         }
 
         return $this->feather->cache->retrieve('admin_ids');
diff --git a/app/Core/Auth.php b/featherbb/Core/Auth.php
similarity index 97%
rename from app/Core/Auth.php
rename to featherbb/Core/Auth.php
index 13b1a53a..a9723a8a 100644
--- a/app/Core/Auth.php
+++ b/featherbb/Core/Auth.php
@@ -21,7 +21,7 @@ class Auth extends \Slim\Middleware
 
     public function __construct()
 	{
-        $this->model = new \App\Model\Auth();
+        $this->model = new \FeatherBB\Model\Auth();
     }
 
     public function get_cookie_data($cookie_name, $cookie_seed)
@@ -184,7 +184,7 @@ public function check_bans()
 
         // If we removed any expired bans during our run-through, we need to regenerate the bans cache
         if ($bans_altered) {
-            $this->app->cache->store('bans', \App\Model\Cache::get_bans());
+            $this->app->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
         }
     }
 
@@ -221,7 +221,7 @@ public function call()
             if (!$this->app->user->disp_posts) {
                 $this->app->user->disp_posts = $this->app->forum_settings['o_disp_posts_default'];
             }
-            if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'app/lang/'.$this->app->user->language)) {
+            if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->app->user->language)) {
                 $this->app->user->language = $this->app->forum_settings['o_default_lang'];
             }
             if (!file_exists($this->app->forum_env['FEATHER_ROOT'].'style/themes/'.$this->app->user->style.'/style.css')) {
@@ -268,11 +268,11 @@ public function call()
             $this->model->feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), $this->app->now + 31536000);
         }
 
-        load_textdomain('featherbb', $this->app->forum_env['FEATHER_ROOT'].'app/lang/'.$this->app->user->language.'/common.mo');
+        load_textdomain('featherbb', $this->app->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->app->user->language.'/common.mo');
 
         // Load bans from cache
         if (!$this->app->cache->isCached('bans')) {
-            $this->app->cache->store('bans', \App\Model\Cache::get_bans());
+            $this->app->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
         }
         $feather_bans = $this->app->cache->retrieve('bans');
 
diff --git a/app/Core/Cache.php b/featherbb/Core/Cache.php
similarity index 99%
rename from app/Core/Cache.php
rename to featherbb/Core/Cache.php
index 3843e430..0bcb0588 100644
--- a/app/Core/Cache.php
+++ b/featherbb/Core/Cache.php
@@ -54,7 +54,7 @@ public function __construct($config = array())
     protected static function getDefaultSettings()
     {
         return array('name' => 'default',
-        'path' => 'app/cache/',
+        'path' => 'featherbb/cache/',
         'extension' => '.cache');
     }
 
diff --git a/app/Core/Core.php b/featherbb/Core/Core.php
similarity index 93%
rename from app/Core/Core.php
rename to featherbb/Core/Core.php
index 7044ba22..4cdef204 100644
--- a/app/Core/Core.php
+++ b/featherbb/Core/Core.php
@@ -27,8 +27,8 @@ class Core extends \Slim\Middleware
 	public function __construct(array $data)
 	{
         // Handle empty values in data
-        $data = array_merge(array('config_file' => 'app/config.php',
-                                  'cache_dir' => 'app/cache/',
+        $data = array_merge(array('config_file' => 'featherbb/config.php',
+                                  'cache_dir' => 'featherbb/cache/',
                                   'debug'   => false), $data);
         // Define some core variables
         $this->forum_env['FEATHER_ROOT'] = realpath(dirname(__FILE__).'/../../').'/';
@@ -41,9 +41,9 @@ public function __construct(array $data)
         $this->env_to_globals($this->forum_env); // Legacy
 
         // Load files
-        require $this->forum_env['FEATHER_ROOT'].'app/Helpers/utf8/utf8.php';
-        require $this->forum_env['FEATHER_ROOT'].'app/Helpers/functions.php';
-        require $this->forum_env['FEATHER_ROOT'].'app/Helpers/l10n.php';
+        require $this->forum_env['FEATHER_ROOT'].'featherbb/Helpers/utf8/utf8.php';
+        require $this->forum_env['FEATHER_ROOT'].'featherbb/Helpers/functions.php';
+        require $this->forum_env['FEATHER_ROOT'].'featherbb/Helpers/l10n.php';
 
         // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
         setlocale(LC_CTYPE, 'C');
@@ -54,8 +54,8 @@ public static function load_default_forum_env()
         return array(
                 'FEATHER' => true, // Legacy
                 'FEATHER_ROOT' => '',
-                'FORUM_CONFIG_FILE' => 'app/config.php',
-                'FORUM_CACHE_DIR' => 'app/cache/',
+                'FORUM_CONFIG_FILE' => 'featherbb/config.php',
+                'FORUM_CACHE_DIR' => 'featherbb/cache/',
                 'FORUM_VERSION' => '1.0.0',
                 'FORUM_NAME' => 'FeatherBB',
                 'FORUM_DB_REVISION' => 21,
@@ -214,7 +214,7 @@ public function call()
         $this->app->hooks->fire('core.start');
 
         if (!is_file($this->forum_env['FORUM_CONFIG_FILE'])) {
-            $installer = new \App\Controller\Install;
+            $installer = new \FeatherBB\Controller\Install;
             $installer->run();
             return;
         }
@@ -235,7 +235,7 @@ public function call()
                                  'cookies.secret_key' => $this->forum_settings['cookie_seed']));
 
         if (!$this->app->cache->isCached('config')) {
-            $this->app->cache->store('config', \App\Model\Cache::get_config());
+            $this->app->cache->store('config', \FeatherBB\Model\Cache::get_config());
         }
 
         // Finalize forum_settings array
diff --git a/app/Core/Csrf.php b/featherbb/Core/Csrf.php
similarity index 100%
rename from app/Core/Csrf.php
rename to featherbb/Core/Csrf.php
diff --git a/app/Core/Database.php b/featherbb/Core/Database.php
similarity index 100%
rename from app/Core/Database.php
rename to featherbb/Core/Database.php
diff --git a/app/Core/Email.php b/featherbb/Core/Email.php
similarity index 99%
rename from app/Core/Email.php
rename to featherbb/Core/Email.php
index 59a64c85..7b51f38e 100644
--- a/app/Core/Email.php
+++ b/featherbb/Core/Email.php
@@ -15,7 +15,7 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->config = $this->feather->config;
-        require FEATHER_ROOT . 'app/Helpers/utf8/utils/ascii.php';
+        require FEATHER_ROOT . 'featherbb/Helpers/utf8/utils/ascii.php';
     }
 
     //
diff --git a/app/Core/Error.php b/featherbb/Core/Error.php
similarity index 100%
rename from app/Core/Error.php
rename to featherbb/Core/Error.php
diff --git a/app/Core/Hooks.php b/featherbb/Core/Hooks.php
similarity index 100%
rename from app/Core/Hooks.php
rename to featherbb/Core/Hooks.php
diff --git a/app/Core/Lister.php b/featherbb/Core/Lister.php
similarity index 98%
rename from app/Core/Lister.php
rename to featherbb/Core/Lister.php
index 8d572d9d..2e879a7b 100644
--- a/app/Core/Lister.php
+++ b/featherbb/Core/Lister.php
@@ -88,7 +88,7 @@ public static function getLangs($folder = '')
         $feather = \Slim\Slim::getInstance();
         $langs = array();
 
-        $iterator = new \DirectoryIterator($feather->forum_env['FEATHER_ROOT'].'app/lang/');
+        $iterator = new \DirectoryIterator($feather->forum_env['FEATHER_ROOT'].'featherbb/lang/');
         foreach ($iterator as $child) {
             if(!$child->isDot() && $child->isDir() && file_exists($child->getPathname().DIRECTORY_SEPARATOR.'common.po')) {
                 // If the lang pack is well formed, add it to the list
diff --git a/app/Core/Plugin.php b/featherbb/Core/Plugin.php
similarity index 100%
rename from app/Core/Plugin.php
rename to featherbb/Core/Plugin.php
diff --git a/app/Core/Search.php b/featherbb/Core/Search.php
similarity index 99%
rename from app/Core/Search.php
rename to featherbb/Core/Search.php
index 9405b421..64c114e3 100644
--- a/app/Core/Search.php
+++ b/featherbb/Core/Search.php
@@ -93,7 +93,7 @@ public function validate_search_word($word, $idx)
 
         if (!isset($stopwords)) {
             if (!$this->feather->cache->isCached('stopwords')) {
-                $this->feather->cache->store('stopwords', \App\Model\Cache::get_config(), '+1 week');
+                $this->feather->cache->store('stopwords', \FeatherBB\Model\Cache::get_config(), '+1 week');
             }
             $stopwords = $this->feather->cache->retrieve('stopwords');
         }
diff --git a/app/Core/Url.php b/featherbb/Core/Url.php
similarity index 100%
rename from app/Core/Url.php
rename to featherbb/Core/Url.php
diff --git a/app/Core/Utils.php b/featherbb/Core/Utils.php
similarity index 100%
rename from app/Core/Utils.php
rename to featherbb/Core/Utils.php
diff --git a/app/Core/View.php b/featherbb/Core/View.php
similarity index 97%
rename from app/Core/View.php
rename to featherbb/Core/View.php
index dc44590c..0a0efc1e 100644
--- a/app/Core/View.php
+++ b/featherbb/Core/View.php
@@ -364,7 +364,7 @@ protected function getDefaultPageInfo()
     {
         // Check if config file exists to avoid error when installing forum
         if (!$this->app->cache->isCached('quickjump') && is_file($this->app->forum_env['FORUM_CONFIG_FILE'])) {
-            $this->app->cache->store('quickjump', \App\Model\Cache::get_quickjump());
+            $this->app->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
         }
 
         $data = array(
@@ -385,13 +385,13 @@ protected function getDefaultPageInfo()
         );
 
         if (is_object($this->app->user) && $this->app->user->is_admmod) {
-            $data['has_reports'] = \App\Model\Header::get_reports();
+            $data['has_reports'] = \FeatherBB\Model\Header::get_reports();
         }
 
         if ($this->app->forum_env['FEATHER_SHOW_INFO']) {
-            $data['exec_info'] = \App\Model\Debug::get_info();
+            $data['exec_info'] = \FeatherBB\Model\Debug::get_info();
             if ($this->app->forum_env['FEATHER_SHOW_QUERIES']) {
-                $data['queries_info'] = \App\Model\Debug::get_queries();
+                $data['queries_info'] = \FeatherBB\Model\Debug::get_queries();
             }
         }
 
diff --git a/app/Core/pomo/.editorconfig b/featherbb/Core/pomo/.editorconfig
similarity index 100%
rename from app/Core/pomo/.editorconfig
rename to featherbb/Core/pomo/.editorconfig
diff --git a/app/Core/pomo/MO.php b/featherbb/Core/pomo/MO.php
similarity index 100%
rename from app/Core/pomo/MO.php
rename to featherbb/Core/pomo/MO.php
diff --git a/app/Core/pomo/PO.php b/featherbb/Core/pomo/PO.php
similarity index 100%
rename from app/Core/pomo/PO.php
rename to featherbb/Core/pomo/PO.php
diff --git a/app/Core/pomo/Streams/CachedFileReader.php b/featherbb/Core/pomo/Streams/CachedFileReader.php
similarity index 100%
rename from app/Core/pomo/Streams/CachedFileReader.php
rename to featherbb/Core/pomo/Streams/CachedFileReader.php
diff --git a/app/Core/pomo/Streams/CachedIntFileReader.php b/featherbb/Core/pomo/Streams/CachedIntFileReader.php
similarity index 100%
rename from app/Core/pomo/Streams/CachedIntFileReader.php
rename to featherbb/Core/pomo/Streams/CachedIntFileReader.php
diff --git a/app/Core/pomo/Streams/FileReader.php b/featherbb/Core/pomo/Streams/FileReader.php
similarity index 100%
rename from app/Core/pomo/Streams/FileReader.php
rename to featherbb/Core/pomo/Streams/FileReader.php
diff --git a/app/Core/pomo/Streams/Reader.php b/featherbb/Core/pomo/Streams/Reader.php
similarity index 100%
rename from app/Core/pomo/Streams/Reader.php
rename to featherbb/Core/pomo/Streams/Reader.php
diff --git a/app/Core/pomo/Streams/StringReader.php b/featherbb/Core/pomo/Streams/StringReader.php
similarity index 100%
rename from app/Core/pomo/Streams/StringReader.php
rename to featherbb/Core/pomo/Streams/StringReader.php
diff --git a/app/Core/pomo/Translations/EntryTranslations.php b/featherbb/Core/pomo/Translations/EntryTranslations.php
similarity index 100%
rename from app/Core/pomo/Translations/EntryTranslations.php
rename to featherbb/Core/pomo/Translations/EntryTranslations.php
diff --git a/app/Core/pomo/Translations/GettextTranslations.php b/featherbb/Core/pomo/Translations/GettextTranslations.php
similarity index 100%
rename from app/Core/pomo/Translations/GettextTranslations.php
rename to featherbb/Core/pomo/Translations/GettextTranslations.php
diff --git a/app/Core/pomo/Translations/NOOPTranslations.php b/featherbb/Core/pomo/Translations/NOOPTranslations.php
similarity index 100%
rename from app/Core/pomo/Translations/NOOPTranslations.php
rename to featherbb/Core/pomo/Translations/NOOPTranslations.php
diff --git a/app/Core/pomo/Translations/Translations.php b/featherbb/Core/pomo/Translations/Translations.php
similarity index 100%
rename from app/Core/pomo/Translations/Translations.php
rename to featherbb/Core/pomo/Translations/Translations.php
diff --git a/app/Core/pomo/Translations/TranslationsInterface.php b/featherbb/Core/pomo/Translations/TranslationsInterface.php
similarity index 100%
rename from app/Core/pomo/Translations/TranslationsInterface.php
rename to featherbb/Core/pomo/Translations/TranslationsInterface.php
diff --git a/app/Helpers/bbcd_compile.php b/featherbb/Helpers/bbcd_compile.php
similarity index 99%
rename from app/Helpers/bbcd_compile.php
rename to featherbb/Helpers/bbcd_compile.php
index 4aadb11c..565fac62 100644
--- a/app/Helpers/bbcd_compile.php
+++ b/featherbb/Helpers/bbcd_compile.php
@@ -9,7 +9,7 @@
  */
 
 // This script compiles the $options, $smilies and $bbcd arrays (from bbcd_source.php script
-// or from an admin page web form) into the app/cache/cache_parser_data.php.
+// or from an admin page web form) into the featherbb/cache/cache_parser_data.php.
 
 // Initialize a new global parser data array $pd:
 $pd = array(
@@ -419,7 +419,7 @@ function file2title($file)
 $s .= ";\n";
 
 $s .= "?>";
-file_put_contents(FEATHER_ROOT.'app/cache/cache_parser_data.php', $s);
+file_put_contents(FEATHER_ROOT.'featherbb/cache/cache_parser_data.php', $s);
 
 // Clean up our global variables.
 unset($all_tags); unset($all_block_tags);
diff --git a/app/Helpers/bbcd_source.php b/featherbb/Helpers/bbcd_source.php
similarity index 100%
rename from app/Helpers/bbcd_source.php
rename to featherbb/Helpers/bbcd_source.php
diff --git a/app/Helpers/functions.php b/featherbb/Helpers/functions.php
similarity index 95%
rename from app/Helpers/functions.php
rename to featherbb/Helpers/functions.php
index 715dded2..45752f2b 100644
--- a/app/Helpers/functions.php
+++ b/featherbb/Helpers/functions.php
@@ -16,7 +16,7 @@ function get_admin_ids()
     // Get Slim current session
     $feather = \Slim\Slim::getInstance();
     if (!$feather->cache->isCached('admin_ids')) {
-        $feather->cache->store('admin_ids', \App\Model\Cache::get_admin_ids());
+        $feather->cache->store('admin_ids', \FeatherBB\Model\Cache::get_admin_ids());
     }
 
     return $feather->cache->retrieve('admin_ids');
@@ -31,10 +31,10 @@ function check_username($username, $errors, $exclude_id = null)
     global $feather, $errors, $feather_bans;
 
     // Include UTF-8 function
-    require_once FEATHER_ROOT.'app/Helpers/utf8/strcasecmp.php';
+    require_once FEATHER_ROOT.'featherbb/Helpers/utf8/strcasecmp.php';
 
-    load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$feather->user->language.'/register.mo');
-    load_textdomain('featherbb', FEATHER_ROOT.'app/lang/'.$feather->user->language.'/prof_reg.mo');
+    load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$feather->user->language.'/register.mo');
+    load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$feather->user->language.'/prof_reg.mo');
 
     // Convert multiple whitespace characters into one (to prevent people from registering with indistinguishable usernames)
     $username = preg_replace('%\s+%s', ' ', $username);
@@ -350,12 +350,12 @@ function censor_words($text)
     $feather = \Slim\Slim::getInstance();
 
     if (!$feather->cache->isCached('search_for')) {
-        $feather->cache->store('search_for', \App\Model\Cache::get_censoring('search_for'));
+        $feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
         $search_for = $feather->cache->retrieve('search_for');
     }
 
     if (!$feather->cache->isCached('replace_with')) {
-        $feather->cache->store('replace_with', \App\Model\Cache::get_censoring('replace_with'));
+        $feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
         $replace_with = $feather->cache->retrieve('replace_with');
     }
 
@@ -454,7 +454,7 @@ function message($msg, $http_status = null, $no_back_link = false)
 function random_key($len, $readable = false, $hash = false)
 {
     if (!function_exists('secure_random_bytes')) {
-        include FEATHER_ROOT.'app/Helpers/srand.php';
+        include FEATHER_ROOT.'featherbb/Helpers/srand.php';
     }
 
     $key = secure_random_bytes($len);
@@ -518,7 +518,7 @@ function file_size($size)
 //
 function generate_stopwords_cache_id()
 {
-    $files = glob(FEATHER_ROOT.'app/lang/*/stopwords.txt');
+    $files = glob(FEATHER_ROOT.'featherbb/lang/*/stopwords.txt');
     if ($files === false) {
         return 'cache_id_error';
     }
diff --git a/app/Helpers/l10n.php b/featherbb/Helpers/l10n.php
similarity index 100%
rename from app/Helpers/l10n.php
rename to featherbb/Helpers/l10n.php
diff --git a/app/Helpers/parser.php b/featherbb/Helpers/parser.php
similarity index 99%
rename from app/Helpers/parser.php
rename to featherbb/Helpers/parser.php
index 3ae6ecfa..be8a9746 100644
--- a/app/Helpers/parser.php
+++ b/featherbb/Helpers/parser.php
@@ -16,11 +16,11 @@
 define('FEATHER_PARSER', '11-Feb-2011 13:33');
 
 // globals. we share one array: $pd
-if (file_exists(FEATHER_ROOT.'app/cache/cache_parser_data.php')) { // If file already exists
-    require_once(FEATHER_ROOT.'app/cache/cache_parser_data.php');
+if (file_exists(FEATHER_ROOT.'featherbb/cache/cache_parser_data.php')) { // If file already exists
+    require_once(FEATHER_ROOT.'featherbb/cache/cache_parser_data.php');
 } else { // It needs to be re-generated.
-    require_once(FEATHER_ROOT.'app/Helpers/bbcd_source.php');
-    require_once(FEATHER_ROOT.'app/Helpers/bbcd_compile.php');
+    require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_source.php');
+    require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_compile.php');
 }
 // !!!! AVOIDING PCRE STACK OVERFLOWS WHICH SEG-FAULT CRASH APACHE/PHP !!!!
 // By default, PHP sets up pcre.recursion_limit way too high (100000). According
diff --git a/app/Helpers/srand.php b/featherbb/Helpers/srand.php
similarity index 100%
rename from app/Helpers/srand.php
rename to featherbb/Helpers/srand.php
diff --git a/app/Helpers/utf8/mbstring/core.php b/featherbb/Helpers/utf8/mbstring/core.php
similarity index 100%
rename from app/Helpers/utf8/mbstring/core.php
rename to featherbb/Helpers/utf8/mbstring/core.php
diff --git a/app/Helpers/utf8/native/core.php b/featherbb/Helpers/utf8/native/core.php
similarity index 100%
rename from app/Helpers/utf8/native/core.php
rename to featherbb/Helpers/utf8/native/core.php
diff --git a/app/Helpers/utf8/ord.php b/featherbb/Helpers/utf8/ord.php
similarity index 100%
rename from app/Helpers/utf8/ord.php
rename to featherbb/Helpers/utf8/ord.php
diff --git a/app/Helpers/utf8/str_ireplace.php b/featherbb/Helpers/utf8/str_ireplace.php
similarity index 100%
rename from app/Helpers/utf8/str_ireplace.php
rename to featherbb/Helpers/utf8/str_ireplace.php
diff --git a/app/Helpers/utf8/str_pad.php b/featherbb/Helpers/utf8/str_pad.php
similarity index 100%
rename from app/Helpers/utf8/str_pad.php
rename to featherbb/Helpers/utf8/str_pad.php
diff --git a/app/Helpers/utf8/str_split.php b/featherbb/Helpers/utf8/str_split.php
similarity index 100%
rename from app/Helpers/utf8/str_split.php
rename to featherbb/Helpers/utf8/str_split.php
diff --git a/app/Helpers/utf8/strcasecmp.php b/featherbb/Helpers/utf8/strcasecmp.php
similarity index 100%
rename from app/Helpers/utf8/strcasecmp.php
rename to featherbb/Helpers/utf8/strcasecmp.php
diff --git a/app/Helpers/utf8/strcspn.php b/featherbb/Helpers/utf8/strcspn.php
similarity index 100%
rename from app/Helpers/utf8/strcspn.php
rename to featherbb/Helpers/utf8/strcspn.php
diff --git a/app/Helpers/utf8/stristr.php b/featherbb/Helpers/utf8/stristr.php
similarity index 100%
rename from app/Helpers/utf8/stristr.php
rename to featherbb/Helpers/utf8/stristr.php
diff --git a/app/Helpers/utf8/strrev.php b/featherbb/Helpers/utf8/strrev.php
similarity index 100%
rename from app/Helpers/utf8/strrev.php
rename to featherbb/Helpers/utf8/strrev.php
diff --git a/app/Helpers/utf8/strspn.php b/featherbb/Helpers/utf8/strspn.php
similarity index 100%
rename from app/Helpers/utf8/strspn.php
rename to featherbb/Helpers/utf8/strspn.php
diff --git a/app/Helpers/utf8/substr_replace.php b/featherbb/Helpers/utf8/substr_replace.php
similarity index 100%
rename from app/Helpers/utf8/substr_replace.php
rename to featherbb/Helpers/utf8/substr_replace.php
diff --git a/app/Helpers/utf8/trim.php b/featherbb/Helpers/utf8/trim.php
similarity index 100%
rename from app/Helpers/utf8/trim.php
rename to featherbb/Helpers/utf8/trim.php
diff --git a/app/Helpers/utf8/ucfirst.php b/featherbb/Helpers/utf8/ucfirst.php
similarity index 100%
rename from app/Helpers/utf8/ucfirst.php
rename to featherbb/Helpers/utf8/ucfirst.php
diff --git a/app/Helpers/utf8/ucwords.php b/featherbb/Helpers/utf8/ucwords.php
similarity index 100%
rename from app/Helpers/utf8/ucwords.php
rename to featherbb/Helpers/utf8/ucwords.php
diff --git a/app/Helpers/utf8/utf8.php b/featherbb/Helpers/utf8/utf8.php
similarity index 100%
rename from app/Helpers/utf8/utf8.php
rename to featherbb/Helpers/utf8/utf8.php
diff --git a/app/Helpers/utf8/utils/ascii.php b/featherbb/Helpers/utf8/utils/ascii.php
similarity index 100%
rename from app/Helpers/utf8/utils/ascii.php
rename to featherbb/Helpers/utf8/utils/ascii.php
diff --git a/app/Helpers/utf8/utils/bad.php b/featherbb/Helpers/utf8/utils/bad.php
similarity index 100%
rename from app/Helpers/utf8/utils/bad.php
rename to featherbb/Helpers/utf8/utils/bad.php
diff --git a/app/Helpers/utf8/utils/patterns.php b/featherbb/Helpers/utf8/utils/patterns.php
similarity index 100%
rename from app/Helpers/utf8/utils/patterns.php
rename to featherbb/Helpers/utf8/utils/patterns.php
diff --git a/app/Helpers/utf8/utils/position.php b/featherbb/Helpers/utf8/utils/position.php
similarity index 100%
rename from app/Helpers/utf8/utils/position.php
rename to featherbb/Helpers/utf8/utils/position.php
diff --git a/app/Helpers/utf8/utils/specials.php b/featherbb/Helpers/utf8/utils/specials.php
similarity index 100%
rename from app/Helpers/utf8/utils/specials.php
rename to featherbb/Helpers/utf8/utils/specials.php
diff --git a/app/Helpers/utf8/utils/unicode.php b/featherbb/Helpers/utf8/utils/unicode.php
similarity index 100%
rename from app/Helpers/utf8/utils/unicode.php
rename to featherbb/Helpers/utf8/utils/unicode.php
diff --git a/app/Helpers/utf8/utils/validation.php b/featherbb/Helpers/utf8/utils/validation.php
similarity index 100%
rename from app/Helpers/utf8/utils/validation.php
rename to featherbb/Helpers/utf8/utils/validation.php
diff --git a/app/Model/Admin/Bans.php b/featherbb/Model/Admin/Bans.php
similarity index 98%
rename from app/Model/Admin/Bans.php
rename to featherbb/Model/Admin/Bans.php
index 569fffbe..f74d25ea 100644
--- a/app/Model/Admin/Bans.php
+++ b/featherbb/Model/Admin/Bans.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model\Admin;
+namespace FeatherBB\Model\Admin;
 
 use DB;
 
@@ -274,7 +274,7 @@ public function insert_ban()
         }
 
         // Regenerate the bans cache
-        $this->feather->cache->store('bans', \App\Model\Cache::get_bans());
+        $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
 
         redirect($this->feather->url->get('admin/bans/'), __('Ban edited redirect'));
     }
@@ -289,7 +289,7 @@ public function remove_ban($ban_id)
         $result = $result->delete();
 
         // Regenerate the bans cache
-        $this->feather->cache->store('bans', \App\Model\Cache::get_bans());
+        $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
 
         redirect($this->feather->url->get('admin/bans/'), __('Ban removed redirect'));
     }
diff --git a/app/Model/Admin/Categories.php b/featherbb/Model/Admin/Categories.php
similarity index 96%
rename from app/Model/Admin/Categories.php
rename to featherbb/Model/Admin/Categories.php
index 0d53fabb..9d75b638 100644
--- a/app/Model/Admin/Categories.php
+++ b/featherbb/Model/Admin/Categories.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher.
  */
 
-namespace App\Model\Admin;
+namespace FeatherBB\Model\Admin;
 
 use DB;
 
@@ -60,7 +60,7 @@ public function delete_category($cat_to_delete)
 
         foreach ($forums_in_cat as $forum) {
             // Prune all posts and topics
-            $this->maintenance = new \App\Model\Admin\maintenance();
+            $this->maintenance = new \FeatherBB\Model\Admin\maintenance();
             $this->maintenance->prune($forum->id, 1, -1);
 
             // Delete forum
diff --git a/app/Model/Admin/Censoring.php b/featherbb/Model/Admin/Censoring.php
similarity index 82%
rename from app/Model/Admin/Censoring.php
rename to featherbb/Model/Admin/Censoring.php
index a6456c33..34aeced3 100644
--- a/app/Model/Admin/Censoring.php
+++ b/featherbb/Model/Admin/Censoring.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model\Admin;
+namespace FeatherBB\Model\Admin;
 
 use DB;
 
@@ -43,8 +43,8 @@ public function add_word()
             ->save();
 
         // Regenerate the censoring cache
-        $this->feather->cache->store('search_for', \App\Model\Cache::get_censoring('search_for'));
-        $this->feather->cache->store('replace_with', \App\Model\Cache::get_censoring('replace_with'));
+        $this->feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
+        $this->feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
 
         redirect($this->feather->url->get('admin/censoring/'), __('Word added redirect'));
     }
@@ -71,8 +71,8 @@ public function update_word()
             ->save();
 
         // Regenerate the censoring cache
-        $this->feather->cache->store('search_for', \App\Model\Cache::get_censoring('search_for'));
-        $this->feather->cache->store('replace_with', \App\Model\Cache::get_censoring('replace_with'));
+        $this->feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
+        $this->feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
 
         redirect($this->feather->url->get('admin/censoring/'), __('Word updated redirect'));
     }
@@ -87,8 +87,8 @@ public function remove_word()
         $result = $result->delete();
 
         // Regenerate the censoring cache
-        $this->feather->cache->store('search_for', \App\Model\Cache::get_censoring('search_for'));
-        $this->feather->cache->store('replace_with', \App\Model\Cache::get_censoring('replace_with'));
+        $this->feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
+        $this->feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
 
         redirect($this->feather->url->get('admin/censoring/'),  __('Word removed redirect'));
     }
diff --git a/app/Model/Admin/Forums.php b/featherbb/Model/Admin/Forums.php
similarity index 98%
rename from app/Model/Admin/Forums.php
rename to featherbb/Model/Admin/Forums.php
index c443cc1f..006d1cb8 100644
--- a/app/Model/Admin/Forums.php
+++ b/featherbb/Model/Admin/Forums.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model\Admin;
+namespace FeatherBB\Model\Admin;
 
 use DB;
 
@@ -61,7 +61,7 @@ public function delete_forum($forum_id)
         $forum_id = $this->hook->fire('delete_forum_start', $forum_id);
 
         // Prune all posts and topics
-        $this->maintenance = new \App\Model\Admin\maintenance();
+        $this->maintenance = new \FeatherBB\Model\Admin\maintenance();
         $this->maintenance->prune($forum_id, 1, -1);
 
         // Delete the forum
diff --git a/app/Model/Admin/Groups.php b/featherbb/Model/Admin/Groups.php
similarity index 98%
rename from app/Model/Admin/Groups.php
rename to featherbb/Model/Admin/Groups.php
index c921a2c9..d47f310e 100644
--- a/app/Model/Admin/Groups.php
+++ b/featherbb/Model/Admin/Groups.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model\Admin;
+namespace FeatherBB\Model\Admin;
 
 use DB;
 
@@ -255,7 +255,7 @@ public function add_edit_group($groups)
         $group_id = $this->hook->fire('add_edit_group.group_id', $group_id);
 
         // Regenerate the quick jump cache
-        $this->feather->cache->store('quickjump', \App\Model\Cache::get_quickjump());
+        $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
         if ($this->request->post('mode') == 'edit') {
             redirect($this->feather->url->get('admin/groups/'), __('Group edited redirect'));
@@ -283,7 +283,7 @@ public function set_default_group($groups)
                                                    ->update_many('conf_value', $group_id);
 
         // Regenerate the config cache
-        $this->feather->cache->store('config', \App\Model\Cache::get_config());
+        $this->feather->cache->store('config', \FeatherBB\Model\Cache::get_config());
 
         redirect($this->feather->url->get('admin/groups/'), __('Default group redirect'));
     }
diff --git a/app/Model/Admin/Maintenance.php b/featherbb/Model/Admin/Maintenance.php
similarity index 99%
rename from app/Model/Admin/Maintenance.php
rename to featherbb/Model/Admin/Maintenance.php
index 79db3e4c..c4c51306 100644
--- a/app/Model/Admin/Maintenance.php
+++ b/featherbb/Model/Admin/Maintenance.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model\Admin;
+namespace FeatherBB\Model\Admin;
 
 use DB;
 
diff --git a/app/Model/Admin/Options.php b/featherbb/Model/Admin/Options.php
similarity index 99%
rename from app/Model/Admin/Options.php
rename to featherbb/Model/Admin/Options.php
index d255870b..6ef7f8ad 100644
--- a/app/Model/Admin/Options.php
+++ b/featherbb/Model/Admin/Options.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model\Admin;
+namespace FeatherBB\Model\Admin;
 
 use DB;
 
@@ -227,7 +227,7 @@ public function update_options()
         }
 
         // Regenerate the config cache
-        $this->feather->cache->store('config', \App\Model\Cache::get_config());
+        $this->feather->cache->store('config', \FeatherBB\Model\Cache::get_config());
         $this->clear_feed_cache();
 
         redirect($this->feather->url->get('admin/options/'), __('Options updated redirect'));
diff --git a/app/Model/Admin/Parser.php b/featherbb/Model/Admin/Parser.php
similarity index 97%
rename from app/Model/Admin/Parser.php
rename to featherbb/Model/Admin/Parser.php
index 5c6f1bb4..97e8d5a3 100644
--- a/app/Model/Admin/Parser.php
+++ b/featherbb/Model/Admin/Parser.php
@@ -8,7 +8,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model\Admin;
+namespace FeatherBB\Model\Admin;
 
 use DB;
 
diff --git a/app/Model/Admin/Permissions.php b/featherbb/Model/Admin/Permissions.php
similarity index 92%
rename from app/Model/Admin/Permissions.php
rename to featherbb/Model/Admin/Permissions.php
index 7da201e7..4a635d4b 100644
--- a/app/Model/Admin/Permissions.php
+++ b/featherbb/Model/Admin/Permissions.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model\Admin;
+namespace FeatherBB\Model\Admin;
 
 use DB;
 
@@ -42,7 +42,7 @@ public function update_permissions()
         }
 
         // Regenerate the config cache
-        $this->feather->cache->store('config', \App\Model\Cache::get_config());
+        $this->feather->cache->store('config', \FeatherBB\Model\Cache::get_config());
         // $this->clear_feed_cache();
 
         redirect($this->feather->url->get('admin/permissions/'), __('Perms updated redirect'));
diff --git a/app/Model/Admin/Reports.php b/featherbb/Model/Admin/Reports.php
similarity index 99%
rename from app/Model/Admin/Reports.php
rename to featherbb/Model/Admin/Reports.php
index 45462560..34ef7a76 100644
--- a/app/Model/Admin/Reports.php
+++ b/featherbb/Model/Admin/Reports.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model\Admin;
+namespace FeatherBB\Model\Admin;
 
 use DB;
 
diff --git a/app/Model/Admin/Statistics.php b/featherbb/Model/Admin/Statistics.php
similarity index 99%
rename from app/Model/Admin/Statistics.php
rename to featherbb/Model/Admin/Statistics.php
index f2da2089..f869f1a8 100644
--- a/app/Model/Admin/Statistics.php
+++ b/featherbb/Model/Admin/Statistics.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model\Admin;
+namespace FeatherBB\Model\Admin;
 
 use DB;
 
diff --git a/app/Model/Admin/Users.php b/featherbb/Model/Admin/Users.php
similarity index 99%
rename from app/Model/Admin/Users.php
rename to featherbb/Model/Admin/Users.php
index cd3255a0..cce23d65 100644
--- a/app/Model/Admin/Users.php
+++ b/featherbb/Model/Admin/Users.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model\Admin;
+namespace FeatherBB\Model\Admin;
 
 use DB;
 
@@ -401,7 +401,7 @@ public function delete_users()
 
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
-                $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
+                $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
             }
 
             $stats = $this->feather->cache->retrieve('users_info');
@@ -523,7 +523,7 @@ public function ban_users()
                 }
 
                 // Regenerate the bans cache
-                $this->feather->cache->store('bans', \App\Model\Cache::get_bans());
+                $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
 
                 redirect($this->feather->url->get('admin/users/'), __('Users banned redirect'));
             }
diff --git a/app/Model/Auth.php b/featherbb/Model/Auth.php
similarity index 99%
rename from app/Model/Auth.php
rename to featherbb/Model/Auth.php
index a8e53a55..d2667858 100644
--- a/app/Model/Auth.php
+++ b/featherbb/Model/Auth.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
diff --git a/app/Model/Cache.php b/featherbb/Model/Cache.php
similarity index 99%
rename from app/Model/Cache.php
rename to featherbb/Model/Cache.php
index 7ec8d732..0675030b 100644
--- a/app/Model/Cache.php
+++ b/featherbb/Model/Cache.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
diff --git a/app/Model/Debug.php b/featherbb/Model/Debug.php
similarity index 97%
rename from app/Model/Debug.php
rename to featherbb/Model/Debug.php
index 5edc87e6..d7a041be 100644
--- a/app/Model/Debug.php
+++ b/featherbb/Model/Debug.php
@@ -7,7 +7,7 @@
 * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
 */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
diff --git a/app/Model/Delete.php b/featherbb/Model/Delete.php
similarity index 99%
rename from app/Model/Delete.php
rename to featherbb/Model/Delete.php
index 2653a27a..eb1673db 100644
--- a/app/Model/Delete.php
+++ b/featherbb/Model/Delete.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
diff --git a/app/Model/Edit.php b/featherbb/Model/Edit.php
similarity index 98%
rename from app/Model/Edit.php
rename to featherbb/Model/Edit.php
index a5c1b7c0..6513121c 100644
--- a/app/Model/Edit.php
+++ b/featherbb/Model/Edit.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
@@ -93,7 +93,7 @@ public function check_errors_before_edit($can_edit_subject, $errors)
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
-            require FEATHER_ROOT.'app/Helpers/parser.php';
+            require FEATHER_ROOT.'featherbb/Helpers/parser.php';
             $message = preparse_bbcode($message, $errors);
         }
 
@@ -135,7 +135,7 @@ public function setup_variables($cur_post, $is_admmod, $can_edit_subject, $error
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
-            require_once FEATHER_ROOT.'app/Helpers/parser.php';
+            require_once FEATHER_ROOT.'featherbb/Helpers/parser.php';
             $post['message'] = preparse_bbcode($post['message'], $errors);
         }
 
diff --git a/app/Model/Header.php b/featherbb/Model/Header.php
similarity index 95%
rename from app/Model/Header.php
rename to featherbb/Model/Header.php
index adb8b959..835c46fb 100644
--- a/app/Model/Header.php
+++ b/featherbb/Model/Header.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
diff --git a/app/Model/Index.php b/featherbb/Model/Index.php
similarity index 99%
rename from app/Model/Index.php
rename to featherbb/Model/Index.php
index 921d8737..0ed34f9f 100644
--- a/app/Model/Index.php
+++ b/featherbb/Model/Index.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
@@ -239,7 +239,7 @@ public function collect_stats()
 
         // Collect some statistics from the database
         if (!$this->feather->cache->isCached('users_info')) {
-            $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
+            $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
         }
 
         $stats = $this->feather->cache->retrieve('users_info');
diff --git a/app/Model/Install.php b/featherbb/Model/Install.php
similarity index 99%
rename from app/Model/Install.php
rename to featherbb/Model/Install.php
index 8be79340..c976050f 100644
--- a/app/Model/Install.php
+++ b/featherbb/Model/Install.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
diff --git a/app/Model/Login.php b/featherbb/Model/Login.php
similarity index 97%
rename from app/Model/Login.php
rename to featherbb/Model/Login.php
index 473153c9..1964332f 100644
--- a/app/Model/Login.php
+++ b/featherbb/Model/Login.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
@@ -22,7 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
         $this->email = $this->feather->email;
-        $this->auth = new \App\Model\Auth();
+        $this->auth = new \FeatherBB\Model\Auth();
     }
 
     public function login()
@@ -62,7 +62,7 @@ public function login()
 
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
-                $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
+                $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
             }
 
             $stats = $this->feather->cache->retrieve('users_info');
@@ -147,7 +147,7 @@ public function password_forgotten()
 
                 if ($result) {
                     // Load the "activate password" template
-                    $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/activate_password.tpl'));
+                    $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/activate_password.tpl'));
                     $mail_tpl = $this->hook->fire('mail_tpl_password_forgotten', $mail_tpl);
 
                     // The first row contains the subject
diff --git a/app/Model/Misc.php b/featherbb/Model/Misc.php
similarity index 98%
rename from app/Model/Misc.php
rename to featherbb/Model/Misc.php
index 7ca0829c..b6d35f7f 100644
--- a/app/Model/Misc.php
+++ b/featherbb/Model/Misc.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
@@ -82,7 +82,7 @@ public function send_email($mail)
         }
 
         // Load the "form email" template
-        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/form_email.tpl'));
+        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/form_email.tpl'));
         $mail_tpl = $this->hook->fire('send_email_mail_tpl', $mail_tpl);
 
         // The first row contains the subject
@@ -194,7 +194,7 @@ public function insert_report($post_id)
             // We send it to the complete mailing-list in one swoop
             if ($this->config['o_mailing_list'] != '') {
                 // Load the "new report" template
-                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/new_report.tpl'));
+                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/new_report.tpl'));
                 $mail_tpl = $this->hook->fire('insert_report_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
diff --git a/app/Model/Moderate.php b/featherbb/Model/Moderate.php
similarity index 99%
rename from app/Model/Moderate.php
rename to featherbb/Model/Moderate.php
index c48126f1..70a6506d 100644
--- a/app/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
@@ -424,7 +424,7 @@ public function display_posts_view($tid, $start_from)
 
         $post_data = array();
 
-        require FEATHER_ROOT.'app/Helpers/parser.php';
+        require FEATHER_ROOT.'featherbb/Helpers/parser.php';
 
         $post_count = 0; // Keep track of post numbers
 
diff --git a/app/Model/Post.php b/featherbb/Model/Post.php
similarity index 97%
rename from app/Model/Post.php
rename to featherbb/Model/Post.php
index 933b93b0..a6ad59ff 100644
--- a/app/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
@@ -164,7 +164,7 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
-            require FEATHER_ROOT.'app/Helpers/parser.php';
+            require FEATHER_ROOT.'featherbb/Helpers/parser.php';
             $message = preparse_bbcode($message, $errors);
             $message = $this->hook->fire('check_errors_before_post_bbcode', $message);
         }
@@ -217,7 +217,7 @@ public function setup_variables($errors, $is_admmod)
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
-            require_once FEATHER_ROOT.'app/Helpers/parser.php';
+            require_once FEATHER_ROOT.'featherbb/Helpers/parser.php';
             $post['message']  = preparse_bbcode($post['message'], $errors);
         }
 
@@ -386,13 +386,13 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
             foreach($result as $cur_subscriber) {
                 // Is the subscription email for $cur_subscriber['language'] cached or not?
                 if (!isset($notification_emails[$cur_subscriber['language']])) {
-                    if (file_exists(FEATHER_ROOT.'app/lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl')) {
+                    if (file_exists(FEATHER_ROOT.'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl')) {
                         // Load the "new reply" template
-                        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl'));
+                        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl'));
                         $mail_tpl = $this->hook->fire('send_notifications_reply_mail_tpl', $mail_tpl);
 
                         // Load the "new reply full" template (with post included)
-                        $mail_tpl_full = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$cur_subscriber['language'].'/mail_templates/new_reply_full.tpl'));
+                        $mail_tpl_full = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_reply_full.tpl'));
                         $mail_tpl_full = $this->hook->fire('send_notifications_reply_mail_tpl_full', $mail_tpl_full);
 
                         // The first row contains the subject (it also starts with "Subject:")
@@ -595,13 +595,13 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
             foreach($result as $cur_subscriber) {
                 // Is the subscription email for $cur_subscriber['language'] cached or not?
                 if (!isset($notification_emails[$cur_subscriber['language']])) {
-                    if (file_exists(FEATHER_ROOT.'app/lang/'.$cur_subscriber['language'].'/mail_templates/new_topic.tpl')) {
+                    if (file_exists(FEATHER_ROOT.'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_topic.tpl')) {
                         // Load the "new topic" template
-                        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$cur_subscriber['language'].'/mail_templates/new_topic.tpl'));
+                        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_topic.tpl'));
                         $mail_tpl = $this->hook->fire('send_notifications_new_topic_mail_tpl', $mail_tpl);
 
                         // Load the "new topic full" template (with post included)
-                        $mail_tpl_full = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$cur_subscriber['language'].'/mail_templates/new_topic_full.tpl'));
+                        $mail_tpl_full = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_topic_full.tpl'));
 
                         // The first row contains the subject (it also starts with "Subject:")
                         $first_crlf = strpos($mail_tpl, "\n");
@@ -660,7 +660,7 @@ public function warn_banned_user($post, $new_pid)
         $this->hook->fire('warn_banned_user_start', $post, $new_pid);
 
         // Load the "banned email post" template
-        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/banned_email_post.tpl'));
+        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/banned_email_post.tpl'));
         $mail_tpl = $this->hook->fire('warn_banned_user_mail_tpl', $mail_tpl);
 
         // The first row contains the subject
@@ -877,7 +877,7 @@ public function topic_review($tid)
 
         $post_data = $this->hook->fire('topic_review_start', $post_data, $tid);
 
-        require_once FEATHER_ROOT.'app/Helpers/parser.php';
+        require_once FEATHER_ROOT.'featherbb/Helpers/parser.php';
 
         $select_topic_review = array('poster', 'message', 'hide_smilies', 'posted');
 
diff --git a/app/Model/Profile.php b/featherbb/Model/Profile.php
similarity index 98%
rename from app/Model/Profile.php
rename to featherbb/Model/Profile.php
index c7ffa4e5..4b785929 100644
--- a/app/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
@@ -22,7 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
         $this->email = $this->feather->email;
-        $this->auth = new \App\Model\Auth();
+        $this->auth = new \FeatherBB\Model\Auth();
     }
 
     public function change_pass($id)
@@ -215,7 +215,7 @@ public function change_email($id)
                     throw new \FeatherBB\Error(__('Banned email'), 403);
                 } elseif ($this->config['o_mailing_list'] != '') {
                     // Load the "banned email change" template
-                    $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/banned_email_change.tpl'));
+                    $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/banned_email_change.tpl'));
                     $mail_tpl = $this->hook->fire('change_email_mail_tpl', $mail_tpl);
 
                     // The first row contains the subject
@@ -252,7 +252,7 @@ public function change_email($id)
                     }
 
                     // Load the "dupe email change" template
-                    $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/dupe_email_change.tpl'));
+                    $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/dupe_email_change.tpl'));
                     $mail_tpl = $this->hook->fire('change_email_mail_dupe_tpl', $mail_tpl);
 
                     // The first row contains the subject
@@ -289,7 +289,7 @@ public function change_email($id)
             $user = $user->save();
 
             // Load the "activate email" template
-            $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/activate_email.tpl'));
+            $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/activate_email.tpl'));
             $mail_tpl = $this->hook->fire('change_email_mail_activate_tpl', $mail_tpl);
 
             // The first row contains the subject
@@ -425,13 +425,13 @@ public function update_group_membership($id)
 
         // Regenerate the users info cache
         if (!$this->feather->cache->isCached('users_info')) {
-            $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
+            $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
         }
 
         $stats = $this->feather->cache->retrieve('users_info');
 
         if ($old_group_id == FEATHER_ADMIN || $new_group_id == FEATHER_ADMIN) {
-            $this->feather->cache->store('admin_ids', \App\Model\Cache::get_admin_ids());
+            $this->feather->cache->store('admin_ids', \FeatherBB\Model\Cache::get_admin_ids());
         }
 
         $new_group_mod = DB::for_table('groups')
@@ -721,13 +721,13 @@ public function delete_user($id)
 
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
-                $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
+                $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
             }
 
             $stats = $this->feather->cache->retrieve('users_info');
 
             if ($group_id == FEATHER_ADMIN) {
-                $this->feather->cache->store('admin_ids', \App\Model\Cache::get_admin_ids());
+                $this->feather->cache->store('admin_ids', \FeatherBB\Model\Cache::get_admin_ids());
             }
 
             $this->hook->fire('delete_user');
@@ -905,7 +905,7 @@ public function update_profile($id, $info, $section)
 
                     // Validate BBCode syntax
                     if ($this->config['p_sig_bbcode'] == '1') {
-                        require FEATHER_ROOT.'app/Helpers/parser.php';
+                        require FEATHER_ROOT.'featherbb/Helpers/parser.php';
 
                         $errors = array();
 
@@ -1073,14 +1073,14 @@ public function update_profile($id, $info, $section)
 
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
-                $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
+                $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
             }
 
             $stats = $this->feather->cache->retrieve('users_info');
 
             // Check if the bans table was updated and regenerate the bans cache when needed
             if ($bans_updated) {
-                $this->feather->cache->store('bans', \App\Model\Cache::get_bans());
+                $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
             }
         }
 
diff --git a/app/Model/Register.php b/featherbb/Model/Register.php
similarity index 94%
rename from app/Model/Register.php
rename to featherbb/Model/Register.php
index d6e13142..6444a7fc 100644
--- a/app/Model/Register.php
+++ b/featherbb/Model/Register.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
@@ -22,7 +22,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
         $this->email = $this->feather->email;
-        $this->auth = new \App\Model\Auth();
+        $this->auth = new \FeatherBB\Model\Auth();
     }
 
     public function check_for_errors()
@@ -69,7 +69,7 @@ public function check_for_errors()
         }
 
         // Antispam feature
-        require FEATHER_ROOT.'app/lang/'.$this->user->language.'/antispam.php';
+        require FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/antispam.php';
         $question = $this->request->post('captcha_q') ? trim($this->request->post('captcha_q')) : '';
         $answer = $this->request->post('captcha') ? strtoupper(trim($this->request->post('captcha'))) : '';
         $lang_antispam_questions_array = array();
@@ -118,7 +118,7 @@ public function check_for_errors()
         // Make sure we got a valid language string
         if ($this->request->post('language')) {
             $user['language'] = preg_replace('%[\.\\\/]%', '', $this->request->post('language'));
-            if (!file_exists(FEATHER_ROOT.'app/lang/'.$user['language'].'/common.po')) {
+            if (!file_exists(FEATHER_ROOT.'featherbb/lang/'.$user['language'].'/common.po')) {
                 throw new \FeatherBB\Error(__('Bad request'), 500);
             }
         } else {
@@ -168,7 +168,7 @@ public function insert_user($user)
         if ($this->config['o_regs_verify'] == '0') {
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
-                $this->feather->cache->store('users_info', \App\Model\Cache::get_users_info());
+                $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
             }
 
             $stats = $this->feather->cache->retrieve('users_info');
@@ -179,7 +179,7 @@ public function insert_user($user)
             // If we previously found out that the email was banned
             if (isset($user['banned_email'])) {
                 // Load the "banned email register" template
-                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/banned_email_register.tpl'));
+                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/banned_email_register.tpl'));
                 $mail_tpl = $this->hook->fire('insert_user_banned_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
@@ -200,7 +200,7 @@ public function insert_user($user)
             // If we previously found out that the email was a dupe
             if (!empty($dupe_list)) {
                 // Load the "dupe email register" template
-                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/dupe_email_register.tpl'));
+                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/dupe_email_register.tpl'));
                 $mail_tpl = $this->hook->fire('insert_user_dupe_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
@@ -221,7 +221,7 @@ public function insert_user($user)
             // Should we alert people on the admin mailing list that a new user has registered?
             if ($this->config['o_regs_report'] == '1') {
                 // Load the "new user" template
-                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/new_user.tpl'));
+                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/new_user.tpl'));
                 $mail_tpl = $this->hook->fire('insert_user_new_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
@@ -244,7 +244,7 @@ public function insert_user($user)
         // Must the user verify the registration or do we log him/her in right now?
         if ($this->config['o_regs_verify'] == '1') {
             // Load the "welcome" template
-            $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'app/lang/'.$this->user->language.'/mail_templates/welcome.tpl'));
+            $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/welcome.tpl'));
             $mail_tpl = $this->hook->fire('insert_user_welcome_mail_tpl', $mail_tpl);
 
             // The first row contains the subject
diff --git a/app/Model/Search.php b/featherbb/Model/Search.php
similarity index 99%
rename from app/Model/Search.php
rename to featherbb/Model/Search.php
index 372dc7ff..3253ca00 100644
--- a/app/Model/Search.php
+++ b/featherbb/Model/Search.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
diff --git a/app/Model/Userlist.php b/featherbb/Model/Userlist.php
similarity index 99%
rename from app/Model/Userlist.php
rename to featherbb/Model/Userlist.php
index 062d525d..0dfc32b1 100644
--- a/app/Model/Userlist.php
+++ b/featherbb/Model/Userlist.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
diff --git a/app/Model/Viewforum.php b/featherbb/Model/Viewforum.php
similarity index 99%
rename from app/Model/Viewforum.php
rename to featherbb/Model/Viewforum.php
index 2a53778d..153eb58e 100644
--- a/app/Model/Viewforum.php
+++ b/featherbb/Model/Viewforum.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
diff --git a/app/Model/Viewtopic.php b/featherbb/Model/Viewtopic.php
similarity index 99%
rename from app/Model/Viewtopic.php
rename to featherbb/Model/Viewtopic.php
index 49a59945..60649dfc 100644
--- a/app/Model/Viewtopic.php
+++ b/featherbb/Model/Viewtopic.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace App\Model;
+namespace FeatherBB\Model;
 
 use DB;
 
diff --git a/app/lang/English/admin/bans.mo b/featherbb/lang/English/admin/bans.mo
similarity index 100%
rename from app/lang/English/admin/bans.mo
rename to featherbb/lang/English/admin/bans.mo
diff --git a/app/lang/English/admin/bans.po b/featherbb/lang/English/admin/bans.po
similarity index 100%
rename from app/lang/English/admin/bans.po
rename to featherbb/lang/English/admin/bans.po
diff --git a/app/lang/English/admin/categories.mo b/featherbb/lang/English/admin/categories.mo
similarity index 100%
rename from app/lang/English/admin/categories.mo
rename to featherbb/lang/English/admin/categories.mo
diff --git a/app/lang/English/admin/categories.po b/featherbb/lang/English/admin/categories.po
similarity index 100%
rename from app/lang/English/admin/categories.po
rename to featherbb/lang/English/admin/categories.po
diff --git a/app/lang/English/admin/censoring.mo b/featherbb/lang/English/admin/censoring.mo
similarity index 100%
rename from app/lang/English/admin/censoring.mo
rename to featherbb/lang/English/admin/censoring.mo
diff --git a/app/lang/English/admin/censoring.po b/featherbb/lang/English/admin/censoring.po
similarity index 100%
rename from app/lang/English/admin/censoring.po
rename to featherbb/lang/English/admin/censoring.po
diff --git a/app/lang/English/admin/common.mo b/featherbb/lang/English/admin/common.mo
similarity index 100%
rename from app/lang/English/admin/common.mo
rename to featherbb/lang/English/admin/common.mo
diff --git a/app/lang/English/admin/common.po b/featherbb/lang/English/admin/common.po
similarity index 100%
rename from app/lang/English/admin/common.po
rename to featherbb/lang/English/admin/common.po
diff --git a/app/lang/English/admin/forums.mo b/featherbb/lang/English/admin/forums.mo
similarity index 100%
rename from app/lang/English/admin/forums.mo
rename to featherbb/lang/English/admin/forums.mo
diff --git a/app/lang/English/admin/forums.po b/featherbb/lang/English/admin/forums.po
similarity index 100%
rename from app/lang/English/admin/forums.po
rename to featherbb/lang/English/admin/forums.po
diff --git a/app/lang/English/admin/groups.mo b/featherbb/lang/English/admin/groups.mo
similarity index 100%
rename from app/lang/English/admin/groups.mo
rename to featherbb/lang/English/admin/groups.mo
diff --git a/app/lang/English/admin/groups.po b/featherbb/lang/English/admin/groups.po
similarity index 100%
rename from app/lang/English/admin/groups.po
rename to featherbb/lang/English/admin/groups.po
diff --git a/app/lang/English/admin/index.html b/featherbb/lang/English/admin/index.html
similarity index 100%
rename from app/lang/English/admin/index.html
rename to featherbb/lang/English/admin/index.html
diff --git a/app/lang/English/admin/index.mo b/featherbb/lang/English/admin/index.mo
similarity index 100%
rename from app/lang/English/admin/index.mo
rename to featherbb/lang/English/admin/index.mo
diff --git a/app/lang/English/admin/index.po b/featherbb/lang/English/admin/index.po
similarity index 100%
rename from app/lang/English/admin/index.po
rename to featherbb/lang/English/admin/index.po
diff --git a/app/lang/English/admin/maintenance.mo b/featherbb/lang/English/admin/maintenance.mo
similarity index 100%
rename from app/lang/English/admin/maintenance.mo
rename to featherbb/lang/English/admin/maintenance.mo
diff --git a/app/lang/English/admin/maintenance.po b/featherbb/lang/English/admin/maintenance.po
similarity index 100%
rename from app/lang/English/admin/maintenance.po
rename to featherbb/lang/English/admin/maintenance.po
diff --git a/app/lang/English/admin/options.mo b/featherbb/lang/English/admin/options.mo
similarity index 100%
rename from app/lang/English/admin/options.mo
rename to featherbb/lang/English/admin/options.mo
diff --git a/app/lang/English/admin/options.po b/featherbb/lang/English/admin/options.po
similarity index 100%
rename from app/lang/English/admin/options.po
rename to featherbb/lang/English/admin/options.po
diff --git a/app/lang/English/admin/parser.mo b/featherbb/lang/English/admin/parser.mo
similarity index 100%
rename from app/lang/English/admin/parser.mo
rename to featherbb/lang/English/admin/parser.mo
diff --git a/app/lang/English/admin/parser.php b/featherbb/lang/English/admin/parser.php
similarity index 100%
rename from app/lang/English/admin/parser.php
rename to featherbb/lang/English/admin/parser.php
diff --git a/app/lang/English/admin/parser.po b/featherbb/lang/English/admin/parser.po
similarity index 100%
rename from app/lang/English/admin/parser.po
rename to featherbb/lang/English/admin/parser.po
diff --git a/app/lang/English/admin/permissions.mo b/featherbb/lang/English/admin/permissions.mo
similarity index 100%
rename from app/lang/English/admin/permissions.mo
rename to featherbb/lang/English/admin/permissions.mo
diff --git a/app/lang/English/admin/permissions.po b/featherbb/lang/English/admin/permissions.po
similarity index 100%
rename from app/lang/English/admin/permissions.po
rename to featherbb/lang/English/admin/permissions.po
diff --git a/app/lang/English/admin/plugin_example.mo b/featherbb/lang/English/admin/plugin_example.mo
similarity index 100%
rename from app/lang/English/admin/plugin_example.mo
rename to featherbb/lang/English/admin/plugin_example.mo
diff --git a/app/lang/English/admin/plugin_example.po b/featherbb/lang/English/admin/plugin_example.po
similarity index 100%
rename from app/lang/English/admin/plugin_example.po
rename to featherbb/lang/English/admin/plugin_example.po
diff --git a/app/lang/English/admin/reports.mo b/featherbb/lang/English/admin/reports.mo
similarity index 100%
rename from app/lang/English/admin/reports.mo
rename to featherbb/lang/English/admin/reports.mo
diff --git a/app/lang/English/admin/reports.po b/featherbb/lang/English/admin/reports.po
similarity index 100%
rename from app/lang/English/admin/reports.po
rename to featherbb/lang/English/admin/reports.po
diff --git a/app/lang/English/admin/users.mo b/featherbb/lang/English/admin/users.mo
similarity index 100%
rename from app/lang/English/admin/users.mo
rename to featherbb/lang/English/admin/users.mo
diff --git a/app/lang/English/admin/users.po b/featherbb/lang/English/admin/users.po
similarity index 100%
rename from app/lang/English/admin/users.po
rename to featherbb/lang/English/admin/users.po
diff --git a/app/lang/English/antispam.mo b/featherbb/lang/English/antispam.mo
similarity index 100%
rename from app/lang/English/antispam.mo
rename to featherbb/lang/English/antispam.mo
diff --git a/app/lang/English/antispam.php b/featherbb/lang/English/antispam.php
similarity index 100%
rename from app/lang/English/antispam.php
rename to featherbb/lang/English/antispam.php
diff --git a/app/lang/English/antispam.po b/featherbb/lang/English/antispam.po
similarity index 100%
rename from app/lang/English/antispam.po
rename to featherbb/lang/English/antispam.po
diff --git a/app/lang/English/antispam_questions.mo b/featherbb/lang/English/antispam_questions.mo
similarity index 100%
rename from app/lang/English/antispam_questions.mo
rename to featherbb/lang/English/antispam_questions.mo
diff --git a/app/lang/English/antispam_questions.po b/featherbb/lang/English/antispam_questions.po
similarity index 100%
rename from app/lang/English/antispam_questions.po
rename to featherbb/lang/English/antispam_questions.po
diff --git a/app/lang/English/bbeditor.mo b/featherbb/lang/English/bbeditor.mo
similarity index 100%
rename from app/lang/English/bbeditor.mo
rename to featherbb/lang/English/bbeditor.mo
diff --git a/app/lang/English/bbeditor.po b/featherbb/lang/English/bbeditor.po
similarity index 100%
rename from app/lang/English/bbeditor.po
rename to featherbb/lang/English/bbeditor.po
diff --git a/app/lang/English/common.mo b/featherbb/lang/English/common.mo
similarity index 100%
rename from app/lang/English/common.mo
rename to featherbb/lang/English/common.mo
diff --git a/app/lang/English/common.po b/featherbb/lang/English/common.po
similarity index 100%
rename from app/lang/English/common.po
rename to featherbb/lang/English/common.po
diff --git a/app/lang/English/delete.mo b/featherbb/lang/English/delete.mo
similarity index 100%
rename from app/lang/English/delete.mo
rename to featherbb/lang/English/delete.mo
diff --git a/app/lang/English/delete.po b/featherbb/lang/English/delete.po
similarity index 100%
rename from app/lang/English/delete.po
rename to featherbb/lang/English/delete.po
diff --git a/app/lang/English/forum.mo b/featherbb/lang/English/forum.mo
similarity index 100%
rename from app/lang/English/forum.mo
rename to featherbb/lang/English/forum.mo
diff --git a/app/lang/English/forum.po b/featherbb/lang/English/forum.po
similarity index 100%
rename from app/lang/English/forum.po
rename to featherbb/lang/English/forum.po
diff --git a/app/lang/English/help.mo b/featherbb/lang/English/help.mo
similarity index 100%
rename from app/lang/English/help.mo
rename to featherbb/lang/English/help.mo
diff --git a/app/lang/English/help.po b/featherbb/lang/English/help.po
similarity index 100%
rename from app/lang/English/help.po
rename to featherbb/lang/English/help.po
diff --git a/app/lang/English/index.mo b/featherbb/lang/English/index.mo
similarity index 100%
rename from app/lang/English/index.mo
rename to featherbb/lang/English/index.mo
diff --git a/app/lang/English/index.po b/featherbb/lang/English/index.po
similarity index 100%
rename from app/lang/English/index.po
rename to featherbb/lang/English/index.po
diff --git a/app/lang/English/install.mo b/featherbb/lang/English/install.mo
similarity index 100%
rename from app/lang/English/install.mo
rename to featherbb/lang/English/install.mo
diff --git a/app/lang/English/install.po b/featherbb/lang/English/install.po
similarity index 100%
rename from app/lang/English/install.po
rename to featherbb/lang/English/install.po
diff --git a/app/lang/English/login.mo b/featherbb/lang/English/login.mo
similarity index 100%
rename from app/lang/English/login.mo
rename to featherbb/lang/English/login.mo
diff --git a/app/lang/English/login.po b/featherbb/lang/English/login.po
similarity index 100%
rename from app/lang/English/login.po
rename to featherbb/lang/English/login.po
diff --git a/app/lang/English/mail_templates/activate_email.tpl b/featherbb/lang/English/mail_templates/activate_email.tpl
similarity index 100%
rename from app/lang/English/mail_templates/activate_email.tpl
rename to featherbb/lang/English/mail_templates/activate_email.tpl
diff --git a/app/lang/English/mail_templates/activate_password.tpl b/featherbb/lang/English/mail_templates/activate_password.tpl
similarity index 100%
rename from app/lang/English/mail_templates/activate_password.tpl
rename to featherbb/lang/English/mail_templates/activate_password.tpl
diff --git a/app/lang/English/mail_templates/banned_email_change.tpl b/featherbb/lang/English/mail_templates/banned_email_change.tpl
similarity index 100%
rename from app/lang/English/mail_templates/banned_email_change.tpl
rename to featherbb/lang/English/mail_templates/banned_email_change.tpl
diff --git a/app/lang/English/mail_templates/banned_email_post.tpl b/featherbb/lang/English/mail_templates/banned_email_post.tpl
similarity index 100%
rename from app/lang/English/mail_templates/banned_email_post.tpl
rename to featherbb/lang/English/mail_templates/banned_email_post.tpl
diff --git a/app/lang/English/mail_templates/banned_email_register.tpl b/featherbb/lang/English/mail_templates/banned_email_register.tpl
similarity index 100%
rename from app/lang/English/mail_templates/banned_email_register.tpl
rename to featherbb/lang/English/mail_templates/banned_email_register.tpl
diff --git a/app/lang/English/mail_templates/dupe_email_change.tpl b/featherbb/lang/English/mail_templates/dupe_email_change.tpl
similarity index 100%
rename from app/lang/English/mail_templates/dupe_email_change.tpl
rename to featherbb/lang/English/mail_templates/dupe_email_change.tpl
diff --git a/app/lang/English/mail_templates/dupe_email_register.tpl b/featherbb/lang/English/mail_templates/dupe_email_register.tpl
similarity index 100%
rename from app/lang/English/mail_templates/dupe_email_register.tpl
rename to featherbb/lang/English/mail_templates/dupe_email_register.tpl
diff --git a/app/lang/English/mail_templates/form_email.tpl b/featherbb/lang/English/mail_templates/form_email.tpl
similarity index 100%
rename from app/lang/English/mail_templates/form_email.tpl
rename to featherbb/lang/English/mail_templates/form_email.tpl
diff --git a/app/lang/English/mail_templates/new_reply.tpl b/featherbb/lang/English/mail_templates/new_reply.tpl
similarity index 100%
rename from app/lang/English/mail_templates/new_reply.tpl
rename to featherbb/lang/English/mail_templates/new_reply.tpl
diff --git a/app/lang/English/mail_templates/new_reply_full.tpl b/featherbb/lang/English/mail_templates/new_reply_full.tpl
similarity index 100%
rename from app/lang/English/mail_templates/new_reply_full.tpl
rename to featherbb/lang/English/mail_templates/new_reply_full.tpl
diff --git a/app/lang/English/mail_templates/new_report.tpl b/featherbb/lang/English/mail_templates/new_report.tpl
similarity index 100%
rename from app/lang/English/mail_templates/new_report.tpl
rename to featherbb/lang/English/mail_templates/new_report.tpl
diff --git a/app/lang/English/mail_templates/new_topic.tpl b/featherbb/lang/English/mail_templates/new_topic.tpl
similarity index 100%
rename from app/lang/English/mail_templates/new_topic.tpl
rename to featherbb/lang/English/mail_templates/new_topic.tpl
diff --git a/app/lang/English/mail_templates/new_topic_full.tpl b/featherbb/lang/English/mail_templates/new_topic_full.tpl
similarity index 100%
rename from app/lang/English/mail_templates/new_topic_full.tpl
rename to featherbb/lang/English/mail_templates/new_topic_full.tpl
diff --git a/app/lang/English/mail_templates/new_user.tpl b/featherbb/lang/English/mail_templates/new_user.tpl
similarity index 100%
rename from app/lang/English/mail_templates/new_user.tpl
rename to featherbb/lang/English/mail_templates/new_user.tpl
diff --git a/app/lang/English/mail_templates/rename.tpl b/featherbb/lang/English/mail_templates/rename.tpl
similarity index 100%
rename from app/lang/English/mail_templates/rename.tpl
rename to featherbb/lang/English/mail_templates/rename.tpl
diff --git a/app/lang/English/mail_templates/welcome.tpl b/featherbb/lang/English/mail_templates/welcome.tpl
similarity index 100%
rename from app/lang/English/mail_templates/welcome.tpl
rename to featherbb/lang/English/mail_templates/welcome.tpl
diff --git a/app/lang/English/misc.mo b/featherbb/lang/English/misc.mo
similarity index 100%
rename from app/lang/English/misc.mo
rename to featherbb/lang/English/misc.mo
diff --git a/app/lang/English/misc.po b/featherbb/lang/English/misc.po
similarity index 100%
rename from app/lang/English/misc.po
rename to featherbb/lang/English/misc.po
diff --git a/app/lang/English/post.mo b/featherbb/lang/English/post.mo
similarity index 100%
rename from app/lang/English/post.mo
rename to featherbb/lang/English/post.mo
diff --git a/app/lang/English/post.po b/featherbb/lang/English/post.po
similarity index 100%
rename from app/lang/English/post.po
rename to featherbb/lang/English/post.po
diff --git a/app/lang/English/prof_reg.mo b/featherbb/lang/English/prof_reg.mo
similarity index 100%
rename from app/lang/English/prof_reg.mo
rename to featherbb/lang/English/prof_reg.mo
diff --git a/app/lang/English/prof_reg.po b/featherbb/lang/English/prof_reg.po
similarity index 100%
rename from app/lang/English/prof_reg.po
rename to featherbb/lang/English/prof_reg.po
diff --git a/app/lang/English/profile.mo b/featherbb/lang/English/profile.mo
similarity index 100%
rename from app/lang/English/profile.mo
rename to featherbb/lang/English/profile.mo
diff --git a/app/lang/English/profile.po b/featherbb/lang/English/profile.po
similarity index 100%
rename from app/lang/English/profile.po
rename to featherbb/lang/English/profile.po
diff --git a/app/lang/English/register.mo b/featherbb/lang/English/register.mo
similarity index 100%
rename from app/lang/English/register.mo
rename to featherbb/lang/English/register.mo
diff --git a/app/lang/English/register.po b/featherbb/lang/English/register.po
similarity index 100%
rename from app/lang/English/register.po
rename to featherbb/lang/English/register.po
diff --git a/app/lang/English/search.mo b/featherbb/lang/English/search.mo
similarity index 100%
rename from app/lang/English/search.mo
rename to featherbb/lang/English/search.mo
diff --git a/app/lang/English/search.po b/featherbb/lang/English/search.po
similarity index 100%
rename from app/lang/English/search.po
rename to featherbb/lang/English/search.po
diff --git a/app/lang/English/stopwords.txt b/featherbb/lang/English/stopwords.txt
similarity index 100%
rename from app/lang/English/stopwords.txt
rename to featherbb/lang/English/stopwords.txt
diff --git a/app/lang/English/topic.mo b/featherbb/lang/English/topic.mo
similarity index 100%
rename from app/lang/English/topic.mo
rename to featherbb/lang/English/topic.mo
diff --git a/app/lang/English/topic.po b/featherbb/lang/English/topic.po
similarity index 100%
rename from app/lang/English/topic.po
rename to featherbb/lang/English/topic.po
diff --git a/app/lang/English/update.mo b/featherbb/lang/English/update.mo
similarity index 100%
rename from app/lang/English/update.mo
rename to featherbb/lang/English/update.mo
diff --git a/app/lang/English/update.po b/featherbb/lang/English/update.po
similarity index 100%
rename from app/lang/English/update.po
rename to featherbb/lang/English/update.po
diff --git a/app/lang/English/userlist.mo b/featherbb/lang/English/userlist.mo
similarity index 100%
rename from app/lang/English/userlist.mo
rename to featherbb/lang/English/userlist.mo
diff --git a/app/lang/English/userlist.po b/featherbb/lang/English/userlist.po
similarity index 100%
rename from app/lang/English/userlist.po
rename to featherbb/lang/English/userlist.po
diff --git a/featherbb/routes.php b/featherbb/routes.php
new file mode 100644
index 00000000..975a5945
--- /dev/null
+++ b/featherbb/routes.php
@@ -0,0 +1,205 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Index
+$feather->get('/', '\FeatherBB\Controller\index:display');
+
+// Viewforum
+$feather->get('/forum/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\viewforum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
+
+// Viewtopic
+$feather->group('/topic', function() use ($feather) {
+    $feather->get('/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\viewtopic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
+    $feather->get('/:id/action/:action(/)', '\FeatherBB\Controller\viewtopic:action')->conditions(array('id' => '[0-9]+'));
+});
+$feather->get('/post/:pid(/)', '\FeatherBB\Controller\viewtopic:viewpost')->conditions(array('pid' => '[0-9]+'));
+
+// Userlist
+$feather->get('/userlist(/)', '\FeatherBB\Controller\userlist:display');
+
+// Auth routes
+$feather->group('/auth', function() use ($feather) {
+    $feather->get('(/)', function () use ($feather) {
+        if (!$feather->user->is_guest) {
+            $this->feather->url->redirect($this->feather->url->get('/'));
+        } else {
+            $this->feather->url->redirect($this->feather->url->get('/auth/login'));
+        }
+    });
+    $feather->map('/login(/)', '\FeatherBB\Controller\auth:login')->via('GET', 'POST');
+    $feather->map('/forget(/)', '\FeatherBB\Controller\auth:forget')->via('GET', 'POST');
+    $feather->get('/logout/token/:token(/)', '\FeatherBB\Controller\auth:logout');
+});
+
+// Register routes
+$feather->group('/register', function() use ($feather) {
+    $feather->get('(/)', '\FeatherBB\Controller\register:rules');
+    $feather->map('/agree(/)', '\FeatherBB\Controller\register:display')->via('GET', 'POST');
+    $feather->get('/cancel(/)', '\FeatherBB\Controller\register:cancel');
+});
+
+// Post routes
+$feather->group('/post', function() use ($feather) {
+    $feather->map('/new-topic/:fid(/)', '\FeatherBB\Controller\post:newpost')->conditions(array('fid' => '[0-9]+'))->via('GET', 'POST');
+    $feather->map('/reply/:tid(/)(/quote/:qid)(/)', '\FeatherBB\Controller\post:newreply')->conditions(array('tid' => '[0-9]+', 'qid' => '[0-9]+'))->via('GET', 'POST');
+});
+
+// Edit
+$feather->map('/edit/:id(/)', '\FeatherBB\Controller\edit:editpost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+
+// Delete
+$feather->map('/delete/:id(/)', '\FeatherBB\Controller\delete:deletepost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+
+// Search routes
+$feather->group('/search', function() use ($feather) {
+    $feather->get('(/)', '\FeatherBB\Controller\search:display');
+    $feather->get('/show/:show(/)', '\FeatherBB\Controller\search:quicksearches');
+});
+
+// Help
+$feather->get('/help(/)', '\FeatherBB\Controller\help:display');
+
+// Misc
+$feather->get('/rules(/)', '\FeatherBB\Controller\misc:rules');
+$feather->get('/mark-read(/)', '\FeatherBB\Controller\misc:markread');
+$feather->get('/mark-forum-read/:id(/)', '\FeatherBB\Controller\misc:markforumread')->conditions(array('id' => '[0-9]+'));
+$feather->map('/email/:id(/)', '\FeatherBB\Controller\misc:email')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+$feather->map('/report/:id(/)', '\FeatherBB\Controller\misc:report')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+$feather->get('/subscribe/forum/:id(/)', '\FeatherBB\Controller\misc:subscribeforum')->conditions(array('id' => '[0-9]+'));
+$feather->get('/unsubscribe/forum/:id(/)', '\FeatherBB\Controller\misc:unsubscribeforum')->conditions(array('id' => '[0-9]+'));
+$feather->get('/subscribe/topic/:id(/)', '\FeatherBB\Controller\misc:subscribetopic')->conditions(array('id' => '[0-9]+'));
+$feather->get('/unsubscribe/topic/:id(/)', '\FeatherBB\Controller\misc:unsubscribetopic')->conditions(array('id' => '[0-9]+'));
+
+// Profile routes
+$feather->group('/user', function() use ($feather) {
+    $feather->map('/:id(/section/:section)(/)', '\FeatherBB\Controller\profile:display')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+    $feather->map('/:id(/action/:action)(/)', '\FeatherBB\Controller\profile:action')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+});
+
+/**
+ * Middleware to check if user is allowed to moderate, if he's not redirect to homepage.
+ */
+$isAdmmod = function() use ($feather) {
+    if(!$feather->user->is_admmod) {
+        redirect($feather->url->base(), __('No permission'));
+    }
+};
+
+// Moderate routes
+$feather->group('/moderate', $isAdmmod, function() use ($feather) {
+    $feather->get('/forum/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
+    $feather->get('/get-host/post/:pid(/)', '\FeatherBB\Controller\moderate:gethostpost')->conditions(array('pid' => '[0-9]+'));
+    $feather->get('/get-host/ip/:ip(/)', '\FeatherBB\Controller\moderate:gethostip');
+    $feather->map('/topic/:id/forum/:fid/action/:action(/param/:param)(/)', '\FeatherBB\Controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST');
+    $feather->map('/topic/:id/forum/:fid/action/:action(/page/:param)(/)', '\FeatherBB\Controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST');
+    $feather->post('/forum/:fid(/page/:page)(/)', '\FeatherBB\Controller\moderate:dealposts')->conditions(array('fid' => '[0-9]+', 'page' => '[0-9]+'));
+});
+
+// Admin routes
+$feather->group('/admin', $isAdmmod, function() use ($feather) {
+
+    /**
+     * Middleware to check if user is admin.
+     */
+    $isAdmin = function() use ($feather) {
+        if($feather->user->g_id != FEATHER_ADMIN) {
+            redirect($feather->url->base(), __('No permission'));
+        }
+    };
+
+    // Admin index
+    $feather->get('(/action/:action)(/)', '\FeatherBB\Controller\Admin\index:display');
+    $feather->get('/index(/)', '\FeatherBB\Controller\Admin\index:display');
+
+    // Admin bans
+    $feather->group('/bans', function() use ($feather) {
+        $feather->get('(/)', '\FeatherBB\Controller\Admin\Bans:display');
+        $feather->get('/delete/:id(/)', '\FeatherBB\Controller\Admin\Bans:delete')->conditions(array('id' => '[0-9]+'));
+        $feather->map('/edit/:id(/)', '\FeatherBB\Controller\Admin\Bans:edit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+        $feather->map('/add(/:id)(/)', '\FeatherBB\Controller\Admin\Bans:add')->via('GET', 'POST');
+    });
+
+    // Admin options
+    $feather->map('/options(/)', $isAdmin, '\FeatherBB\Controller\Admin\options:display')->via('GET', 'POST');
+
+    // Admin categories
+    $feather->group('/categories', $isAdmin, function() use ($feather) {
+        $feather->get('(/)', '\FeatherBB\Controller\Admin\categories:display');
+        $feather->post('/add(/)', '\FeatherBB\Controller\Admin\categories:add_category');
+        $feather->post('/edit(/)', '\FeatherBB\Controller\Admin\categories:edit_categories');
+        $feather->post('/delete(/)', '\FeatherBB\Controller\Admin\categories:delete_category');
+    });
+
+    // Admin censoring
+    $feather->map('/censoring(/)', $isAdmin, '\FeatherBB\Controller\Admin\censoring:display')->via('GET', 'POST');
+
+    // Admin reports
+    $feather->map('/reports(/)', '\FeatherBB\Controller\Admin\reports:display')->via('GET', 'POST');
+
+    // Admin permissions
+    $feather->map('/permissions(/)', $isAdmin, '\FeatherBB\Controller\Admin\permissions:display')->via('GET', 'POST');
+
+    // Admin statistics
+    $feather->get('/statistics(/)', '\FeatherBB\Controller\Admin\statistics:display');
+    $feather->get('/phpinfo(/)', '\FeatherBB\Controller\Admin\statistics:phpinfo');
+
+    // Admin forums
+    $feather->group('/forums', $isAdmin, function() use ($feather) {
+        $feather->map('(/)', '\FeatherBB\Controller\Admin\forums:display')->via('GET', 'POST');
+        $feather->post('/add(/)', '\FeatherBB\Controller\Admin\forums:add_forum');
+        $feather->map('/edit/:id(/)', '\FeatherBB\Controller\Admin\forums:edit_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+        $feather->map('/delete/:id(/)', '\FeatherBB\Controller\Admin\forums:delete_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+    });
+
+    // Admin groups
+    $feather->group('/groups', $isAdmin, function() use ($feather) {
+        $feather->map('(/)', '\FeatherBB\Controller\Admin\groups:display')->via('GET', 'POST');
+        $feather->map('/add(/)', '\FeatherBB\Controller\Admin\groups:addedit')->via('GET', 'POST');
+        $feather->map('/edit/:id(/)', '\FeatherBB\Controller\Admin\groups:addedit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+        $feather->map('/delete/:id(/)', '\FeatherBB\Controller\Admin\groups:delete')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+    });
+
+    // Admin plugins
+    $feather->group('/plugins', function() use ($feather) {
+        $feather->map('/(/)', '\FeatherBB\Controller\Admin\plugins:index')->via('GET', 'POST');
+        $feather->map('/activate(/)', '\FeatherBB\Controller\Admin\plugins:activate')->via('GET');
+        $feather->map('/deactivate(/)', '\FeatherBB\Controller\Admin\plugins:deactivate')->via('GET');
+        // $feather->map('/loader(/)', '\FeatherBB\Controller\Admin\plugins:display')->via('GET', 'POST');
+    });
+
+    // Admin maintenance
+    $feather->map('/maintenance(/)', $isAdmin, '\FeatherBB\Controller\Admin\maintenance:display')->via('GET', 'POST');
+
+    // Admin parser
+    $feather->map('/parser(/)', $isAdmin, '\FeatherBB\Controller\Admin\parser:display')->via('GET', 'POST');
+
+    // Admin users
+    $feather->group('/users', function() use ($feather) {
+        $feather->map('(/)', '\FeatherBB\Controller\Admin\users:display')->via('GET', 'POST');
+        $feather->get('/ip-stats/id/:id(/)', '\FeatherBB\Controller\Admin\users:ipstats')->conditions(array('id' => '[0-9]+'));
+        $feather->get('/show-users/ip/:ip(/)', '\FeatherBB\Controller\Admin\users:showusers');
+    });
+
+});
+
+// 404 not found
+$feather->notFound(function () use ($feather){
+    throw new \FeatherBB\Error('Page not found', 404);
+});
+
+$feather->error(function (\Exception $e) use ($feather) {
+    $feather->response->setStatus($e->getCode());
+    $feather->view2->setPageInfo(array(
+        'title' => array($feather->utils->escape($feather->config['o_board_title']), __('Error')),
+        'msg_title' => __('Error'),
+        'msg'    =>   $e->getMessage(),
+        'no_back_link'    => false,
+        ))->addTemplate('error.php')->display();
+    $feather->stop();
+});
diff --git a/index.php b/index.php
index e77f054d..955ec623 100644
--- a/index.php
+++ b/index.php
@@ -20,14 +20,14 @@
 $feather = new \Slim\Slim();
 $feather->add(new \FeatherBB\Csrf());
 
-$feather_settings = array('config_file' => 'app/config.php',
-                          'cache_dir' => 'app/cache/',
+$feather_settings = array('config_file' => 'featherbb/config.php',
+                          'cache_dir' => 'featherbb/cache/',
                           'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
 $feather->add(new \FeatherBB\Auth());
 $feather->add(new \FeatherBB\Core($feather_settings));
 
 // Load the routes
-require 'app/routes.php';
+require 'featherbb/routes.php';
 
 // Run it, baby!
 $feather->run();
diff --git a/style/themes/FeatherBB/view/help.php b/style/themes/FeatherBB/view/help.php
index 34632d06..51627b21 100644
--- a/style/themes/FeatherBB/view/help.php
+++ b/style/themes/FeatherBB/view/help.php
@@ -125,7 +125,7 @@
 <?php
 
 // Display the smiley set
-require FEATHER_ROOT.'app/Helpers/parser.php';
+require FEATHER_ROOT.'featherbb/Helpers/parser.php';
 
 $smiley_groups = array();
 
diff --git a/style/themes/FeatherBB/view/post.php b/style/themes/FeatherBB/view/post.php
index e6159e4e..248d7ff3 100644
--- a/style/themes/FeatherBB/view/post.php
+++ b/style/themes/FeatherBB/view/post.php
@@ -52,7 +52,7 @@
 <?php
 
 } elseif ($feather->request->post('preview')) {
-    require_once FEATHER_ROOT.'app/Helpers/parser.php';
+    require_once FEATHER_ROOT.'featherbb/Helpers/parser.php';
     $preview_message = parse_message($post['message'], $post['hide_smilies']);
 
     ?>
diff --git a/style/themes/MyFeatherBB/view/help.php b/style/themes/MyFeatherBB/view/help.php
index dd449bc4..9644da0d 100644
--- a/style/themes/MyFeatherBB/view/help.php
+++ b/style/themes/MyFeatherBB/view/help.php
@@ -124,7 +124,7 @@
 <?php
 
 // Display the smiley set
-require FEATHER_ROOT.'app/Helpers/parser.php';
+require FEATHER_ROOT.'featherbb/Helpers/parser.php';
 
 $smiley_groups = array();
 
diff --git a/style/themes/MyFeatherBB/view/post.php b/style/themes/MyFeatherBB/view/post.php
index e6159e4e..248d7ff3 100644
--- a/style/themes/MyFeatherBB/view/post.php
+++ b/style/themes/MyFeatherBB/view/post.php
@@ -52,7 +52,7 @@
 <?php
 
 } elseif ($feather->request->post('preview')) {
-    require_once FEATHER_ROOT.'app/Helpers/parser.php';
+    require_once FEATHER_ROOT.'featherbb/Helpers/parser.php';
     $preview_message = parse_message($post['message'], $post['hide_smilies']);
 
     ?>
diff --git a/vendor/bin/phpunit b/vendor/bin/phpunit
new file mode 100644
index 00000000..2c489303
--- /dev/null
+++ b/vendor/bin/phpunit
@@ -0,0 +1 @@
+../phpunit/phpunit/phpunit
\ No newline at end of file
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 7b42861a..14c66014 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -6,10 +6,10 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    'DB' => $baseDir . '/app/Core/Database.php',
-    'IdiormMethodMissingException' => $baseDir . '/app/Core/Database.php',
-    'IdiormResultSet' => $baseDir . '/app/Core/Database.php',
-    'IdiormString' => $baseDir . '/app/Core/Database.php',
-    'IdiormStringException' => $baseDir . '/app/Core/Database.php',
-    'MO' => $baseDir . '/app/Core/pomo/MO.php',
+    'DB' => $baseDir . '/featherbb/Core/Database.php',
+    'IdiormMethodMissingException' => $baseDir . '/featherbb/Core/Database.php',
+    'IdiormResultSet' => $baseDir . '/featherbb/Core/Database.php',
+    'IdiormString' => $baseDir . '/featherbb/Core/Database.php',
+    'IdiormStringException' => $baseDir . '/featherbb/Core/Database.php',
+    'MO' => $baseDir . '/featherbb/Core/pomo/MO.php',
 );
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 5efbc9f2..16175d8d 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -7,6 +7,6 @@
 
 return array(
     'Plugins\\' => array('/plugins'),
-    'FeatherBB\\' => array($baseDir . '/app/Core'),
+    'FeatherBB\\' => array($baseDir . '/featherbb/Core'),
     '' => array($baseDir . '/'),
 );
diff --git a/vendor/composer/include_paths.php b/vendor/composer/include_paths.php
new file mode 100644
index 00000000..4fd23321
--- /dev/null
+++ b/vendor/composer/include_paths.php
@@ -0,0 +1,13 @@
+<?php
+
+// include_paths.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+    $vendorDir . '/phpunit/phpunit-mock-objects',
+    $vendorDir . '/phpunit/php-file-iterator',
+    $vendorDir . '/phpunit/phpunit',
+    $vendorDir . '/symfony/yaml',
+);
diff --git a/vendor/phpunit/php-code-coverage/.gitattributes b/vendor/phpunit/php-code-coverage/.gitattributes
new file mode 100644
index 00000000..461090b7
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/.gitattributes
@@ -0,0 +1 @@
+*.php diff=php
diff --git a/vendor/phpunit/php-code-coverage/.gitignore b/vendor/phpunit/php-code-coverage/.gitignore
new file mode 100644
index 00000000..b386531f
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/.gitignore
@@ -0,0 +1,11 @@
+build/api
+build/code-browser
+build/coverage
+build/logs
+build/pdepend
+cache.properties
+phpunit.xml
+/vendor
+/composer.lock
+/composer.phar
+/.idea
diff --git a/vendor/phpunit/php-code-coverage/.travis.yml b/vendor/phpunit/php-code-coverage/.travis.yml
new file mode 100644
index 00000000..ad88a08d
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/.travis.yml
@@ -0,0 +1,20 @@
+language: php
+
+php:
+    - 5.3.3
+    - 5.3
+    - 5.4
+    - 5.5
+    - 5.6
+
+before_script:
+    - COMPOSER_ROOT_VERSION=dev-master composer install --prefer-source
+
+script: vendor/bin/phpunit --configuration ./build/travis-ci.xml
+
+notifications:
+  email: false
+  irc:
+    channels:
+      - "irc.freenode.org#phpunit"
+    use_notice: true
diff --git a/vendor/phpunit/php-code-coverage/CONTRIBUTING.md b/vendor/phpunit/php-code-coverage/CONTRIBUTING.md
new file mode 100644
index 00000000..40dbc25e
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/CONTRIBUTING.md
@@ -0,0 +1,5 @@
+Pull Requests for bug fixes should be made against the current release branch (2.0).
+
+Pull Requests for new features should be made against master.
+
+For further notes please refer to [https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md](https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md)
diff --git a/vendor/phpunit/php-code-coverage/ChangeLog-2.2.md b/vendor/phpunit/php-code-coverage/ChangeLog-2.2.md
new file mode 100644
index 00000000..a50b7729
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/ChangeLog-2.2.md
@@ -0,0 +1,39 @@
+# Changes in PHP_CodeCoverage 2.2
+
+All notable changes of the PHP_CodeCoverage 2.2 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
+
+## [2.2.2] - 2015-08-04
+
+### Added
+
+* Reintroduced the `PHP_CodeCoverage_Driver_HHVM` driver as an extension of `PHP_CodeCoverage_Driver_Xdebug` that does not use `xdebug_start_code_coverage()` with options not supported by HHVM
+
+### Changed
+
+* Bumped required version of `sebastian/environment` to 1.3.2 for [#365](https://github.com/sebastianbergmann/php-code-coverage/issues/365)
+
+## [2.2.1] - 2015-08-02
+
+### Changed
+
+* Bumped required version of `sebastian/environment` to 1.3.1 for [#365](https://github.com/sebastianbergmann/php-code-coverage/issues/365)
+
+## [2.2.0] - 2015-08-01
+
+### Added
+
+* Added a driver for PHPDBG (requires PHP 7)
+* Added `PHP_CodeCoverage::setDisableIgnoredLines()` to disable the ignoring of lines using annotations such as `@codeCoverageIgnore`
+
+### Changed
+
+* Annotating a method with `@deprecated` now has the same effect as annotating it with `@codeCoverageIgnore`
+
+### Removed
+
+* The dedicated driver for HHVM, `PHP_CodeCoverage_Driver_HHVM` has been removed
+
+[2.2.2]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.1...2.2.2
+[2.2.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.0...2.2.1
+[2.2.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.1...2.2.0
+
diff --git a/vendor/phpunit/php-code-coverage/LICENSE b/vendor/phpunit/php-code-coverage/LICENSE
new file mode 100644
index 00000000..fcfa37e8
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/LICENSE
@@ -0,0 +1,33 @@
+PHP_CodeCoverage
+
+Copyright (c) 2009-2015, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/phpunit/php-code-coverage/README.md b/vendor/phpunit/php-code-coverage/README.md
new file mode 100644
index 00000000..6ca608a4
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/README.md
@@ -0,0 +1,40 @@
+[![Latest Stable Version](https://poser.pugx.org/phpunit/php-code-coverage/v/stable.png)](https://packagist.org/packages/phpunit/php-code-coverage)
+[![Build Status](https://travis-ci.org/sebastianbergmann/php-code-coverage.svg?branch=master)](https://travis-ci.org/sebastianbergmann/php-code-coverage)
+
+# PHP_CodeCoverage
+
+**PHP_CodeCoverage** is a library that provides collection, processing, and rendering functionality for PHP code coverage information.
+
+## Requirements
+
+* PHP 5.3.3 is required but using the latest version of PHP is highly recommended
+* [Xdebug](http://xdebug.org/) 2.1.3 is required but using the latest version of Xdebug is highly recommended
+
+## Installation
+
+To add PHP_CodeCoverage as a local, per-project dependency to your project, simply add a dependency on `phpunit/php-code-coverage` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on PHP_CodeCoverage 2.0:
+
+    {
+        "require": {
+            "phpunit/php-code-coverage": "~2.0"
+        }
+    }
+
+## Using the PHP_CodeCoverage API
+
+```php
+<?php
+$coverage = new PHP_CodeCoverage;
+$coverage->start('<name of test>');
+
+// ...
+
+$coverage->stop();
+
+$writer = new PHP_CodeCoverage_Report_Clover;
+$writer->process($coverage, '/tmp/clover.xml');
+
+$writer = new PHP_CodeCoverage_Report_HTML;
+$writer->process($coverage, '/tmp/code-coverage-report');
+```
+
diff --git a/vendor/phpunit/php-code-coverage/build.xml b/vendor/phpunit/php-code-coverage/build.xml
new file mode 100644
index 00000000..c335d158
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/build.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="PHP_CodeCoverage">
+ <target name="clean" description="Cleanup build artifacts">
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
+
+  <delete>
+   <fileset dir="${basedir}/build">
+    <include name="**/*.phar" />
+   </fileset>
+  </delete>
+ </target>
+
+ <target name="composer" depends="clean" description="Install dependencies with Composer">
+  <tstamp>
+   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
+  </tstamp>
+  <delete>
+   <fileset dir="${basedir}">
+    <include name="composer.phar" />
+    <date datetime="${thirty.days.ago}" when="before"/>
+   </fileset>
+  </delete>
+
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
+
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
+  </exec>
+ </target>
+
+ <target name="phpcs" description="Find coding standard violations using PHP_CodeSniffer">
+  <exec executable="phpcs">
+   <arg value="--standard=PSR2" />
+   <arg value="--extensions=php" />
+   <arg path="${basedir}/src" />
+   <arg path="${basedir}/tests" />
+  </exec>
+ </target>
+</project>
diff --git a/vendor/phpunit/php-code-coverage/build/travis-ci.xml b/vendor/phpunit/php-code-coverage/build/travis-ci.xml
new file mode 100644
index 00000000..15e879fa
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/build/travis-ci.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true">
+  <testsuites>
+    <testsuite name="PHP_CodeCoverage">
+      <directory suffix="Test.php">../tests/PHP</directory>
+    </testsuite>
+  </testsuites>
+
+  <logging>
+    <log type="coverage-text" target="php://stdout"/>
+  </logging>
+
+  <filter>
+    <whitelist addUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">../src</directory>
+    </whitelist>
+  </filter>
+</phpunit>
diff --git a/vendor/phpunit/php-code-coverage/composer.json b/vendor/phpunit/php-code-coverage/composer.json
new file mode 100644
index 00000000..55f9fd07
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/composer.json
@@ -0,0 +1,50 @@
+{
+    "name": "phpunit/php-code-coverage",
+    "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+    "type": "library",
+    "keywords": [
+        "coverage",
+        "testing",
+        "xunit"
+    ],
+    "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sb@sebastian-bergmann.de",
+            "role": "lead"
+        }
+    ],
+    "support": {
+        "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+        "irc": "irc://irc.freenode.net/phpunit"
+    },
+    "require": {
+        "php": ">=5.3.3",
+        "phpunit/php-file-iterator": "~1.3",
+        "phpunit/php-token-stream": "~1.3",
+        "phpunit/php-text-template": "~1.2",
+        "sebastian/environment": "^1.3.2",
+        "sebastian/version": "~1.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4",
+        "ext-xdebug": ">=2.1.4"
+    },
+    "suggest": {
+        "ext-dom": "*",
+        "ext-xdebug": ">=2.2.1",
+        "ext-xmlwriter": "*"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.2.x-dev"
+        }
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/phpunit.xml.dist b/vendor/phpunit/php-code-coverage/phpunit.xml.dist
new file mode 100644
index 00000000..f5fa606e
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/phpunit.xml.dist
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php">
+  <testsuites>
+    <testsuite name="PHP_CodeCoverage">
+      <directory suffix="Test.php">tests/PHP</directory>
+    </testsuite>
+  </testsuites>
+
+  <logging>
+    <log type="coverage-html" target="build/coverage"/>
+    <log type="coverage-clover" target="build/logs/clover.xml"/>
+    <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
+  </logging>
+
+  <filter>
+    <whitelist addUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">src</directory>
+    </whitelist>
+  </filter>
+</phpunit>
+
diff --git a/vendor/phpunit/php-code-coverage/scripts/auto_append.php b/vendor/phpunit/php-code-coverage/scripts/auto_append.php
new file mode 100644
index 00000000..6cd768d3
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/scripts/auto_append.php
@@ -0,0 +1,5 @@
+<?php
+$coverage->stop();
+
+$writer = new PHP_CodeCoverage_Report_HTML;
+$writer->process($coverage, '/tmp/coverage');
diff --git a/vendor/phpunit/php-code-coverage/scripts/auto_prepend.php b/vendor/phpunit/php-code-coverage/scripts/auto_prepend.php
new file mode 100644
index 00000000..7a8887a5
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/scripts/auto_prepend.php
@@ -0,0 +1,10 @@
+<?php
+require_once 'PHP/CodeCoverage/Autoload.php';
+
+$coverage = new PHP_CodeCoverage;
+$filter   = $coverage->filter();
+
+$filter->addFileToBlacklist(__FILE__);
+$filter->addFileToBlacklist(dirname(__FILE__) . '/auto_append.php');
+
+$coverage->start($_SERVER['SCRIPT_FILENAME']);
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage.php
new file mode 100644
index 00000000..0bb582e5
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage.php
@@ -0,0 +1,919 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use SebastianBergmann\Environment\Runtime;
+
+/**
+ * Provides collection functionality for PHP code coverage information.
+ *
+ * @since Class available since Release 1.0.0
+ */
+class PHP_CodeCoverage
+{
+    /**
+     * @var PHP_CodeCoverage_Driver
+     */
+    private $driver;
+
+    /**
+     * @var PHP_CodeCoverage_Filter
+     */
+    private $filter;
+
+    /**
+     * @var bool
+     */
+    private $cacheTokens = false;
+
+    /**
+     * @var bool
+     */
+    private $checkForUnintentionallyCoveredCode = false;
+
+    /**
+     * @var bool
+     */
+    private $forceCoversAnnotation = false;
+
+    /**
+     * @var bool
+     */
+    private $mapTestClassNameToCoveredClassName = false;
+
+    /**
+     * @var bool
+     */
+    private $addUncoveredFilesFromWhitelist = true;
+
+    /**
+     * @var bool
+     */
+    private $processUncoveredFilesFromWhitelist = false;
+
+    /**
+     * @var mixed
+     */
+    private $currentId;
+
+    /**
+     * Code coverage data.
+     *
+     * @var array
+     */
+    private $data = array();
+
+    /**
+     * @var array
+     */
+    private $ignoredLines = array();
+
+    /**
+     * @var bool
+     */
+    private $disableIgnoredLines = false;
+
+    /**
+     * Test data.
+     *
+     * @var array
+     */
+    private $tests = array();
+
+    /**
+     * Constructor.
+     *
+     * @param  PHP_CodeCoverage_Driver    $driver
+     * @param  PHP_CodeCoverage_Filter    $filter
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function __construct(PHP_CodeCoverage_Driver $driver = null, PHP_CodeCoverage_Filter $filter = null)
+    {
+        if ($driver === null) {
+            $driver = $this->selectDriver();
+        }
+
+        if ($filter === null) {
+            $filter = new PHP_CodeCoverage_Filter;
+        }
+
+        $this->driver = $driver;
+        $this->filter = $filter;
+    }
+
+    /**
+     * Returns the PHP_CodeCoverage_Report_Node_* object graph
+     * for this PHP_CodeCoverage object.
+     *
+     * @return PHP_CodeCoverage_Report_Node_Directory
+     * @since  Method available since Release 1.1.0
+     */
+    public function getReport()
+    {
+        $factory = new PHP_CodeCoverage_Report_Factory;
+
+        return $factory->create($this);
+    }
+
+    /**
+     * Clears collected code coverage data.
+     */
+    public function clear()
+    {
+        $this->currentId = null;
+        $this->data      = array();
+        $this->tests     = array();
+    }
+
+    /**
+     * Returns the PHP_CodeCoverage_Filter used.
+     *
+     * @return PHP_CodeCoverage_Filter
+     */
+    public function filter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * Returns the collected code coverage data.
+     * Set $raw = true to bypass all filters.
+     *
+     * @param  bool  $raw
+     * @return array
+     * @since  Method available since Release 1.1.0
+     */
+    public function getData($raw = false)
+    {
+        if (!$raw && $this->addUncoveredFilesFromWhitelist) {
+            $this->addUncoveredFilesFromWhitelist();
+        }
+
+        // We need to apply the blacklist filter a second time
+        // when no whitelist is used.
+        if (!$raw && !$this->filter->hasWhitelist()) {
+            $this->applyListsFilter($this->data);
+        }
+
+        return $this->data;
+    }
+
+    /**
+     * Sets the coverage data.
+     *
+     * @param array $data
+     * @since Method available since Release 2.0.0
+     */
+    public function setData(array $data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Returns the test data.
+     *
+     * @return array
+     * @since  Method available since Release 1.1.0
+     */
+    public function getTests()
+    {
+        return $this->tests;
+    }
+
+    /**
+     * Sets the test data.
+     *
+     * @param array $tests
+     * @since Method available since Release 2.0.0
+     */
+    public function setTests(array $tests)
+    {
+        $this->tests = $tests;
+    }
+
+    /**
+     * Start collection of code coverage information.
+     *
+     * @param  mixed                      $id
+     * @param  bool                       $clear
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function start($id, $clear = false)
+    {
+        if (!is_bool($clear)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        if ($clear) {
+            $this->clear();
+        }
+
+        $this->currentId = $id;
+
+        $this->driver->start();
+    }
+
+    /**
+     * Stop collection of code coverage information.
+     *
+     * @param  bool                       $append
+     * @param  mixed                      $linesToBeCovered
+     * @param  array                      $linesToBeUsed
+     * @return array
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function stop($append = true, $linesToBeCovered = array(), array $linesToBeUsed = array())
+    {
+        if (!is_bool($append)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        if (!is_array($linesToBeCovered) && $linesToBeCovered !== false) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                2,
+                'array or false'
+            );
+        }
+
+        $data = $this->driver->stop();
+        $this->append($data, null, $append, $linesToBeCovered, $linesToBeUsed);
+
+        $this->currentId = null;
+
+        return $data;
+    }
+
+    /**
+     * Appends code coverage data.
+     *
+     * @param  array                      $data
+     * @param  mixed                      $id
+     * @param  bool                       $append
+     * @param  mixed                      $linesToBeCovered
+     * @param  array                      $linesToBeUsed
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function append(array $data, $id = null, $append = true, $linesToBeCovered = array(), array $linesToBeUsed = array())
+    {
+        if ($id === null) {
+            $id = $this->currentId;
+        }
+
+        if ($id === null) {
+            throw new PHP_CodeCoverage_Exception;
+        }
+
+        $this->applyListsFilter($data);
+        $this->applyIgnoredLinesFilter($data);
+        $this->initializeFilesThatAreSeenTheFirstTime($data);
+
+        if (!$append) {
+            return;
+        }
+
+        if ($id != 'UNCOVERED_FILES_FROM_WHITELIST') {
+            $this->applyCoversAnnotationFilter(
+                $data,
+                $linesToBeCovered,
+                $linesToBeUsed
+            );
+        }
+
+        if (empty($data)) {
+            return;
+        }
+
+        $size   = 'unknown';
+        $status = null;
+
+        if ($id instanceof PHPUnit_Framework_TestCase) {
+            $_size = $id->getSize();
+
+            if ($_size == PHPUnit_Util_Test::SMALL) {
+                $size = 'small';
+            } elseif ($_size == PHPUnit_Util_Test::MEDIUM) {
+                $size = 'medium';
+            } elseif ($_size == PHPUnit_Util_Test::LARGE) {
+                $size = 'large';
+            }
+
+            $status = $id->getStatus();
+            $id     = get_class($id) . '::' . $id->getName();
+        } elseif ($id instanceof PHPUnit_Extensions_PhptTestCase) {
+            $size = 'large';
+            $id   = $id->getName();
+        }
+
+        $this->tests[$id] = array('size' => $size, 'status' => $status);
+
+        foreach ($data as $file => $lines) {
+            if (!$this->filter->isFile($file)) {
+                continue;
+            }
+
+            foreach ($lines as $k => $v) {
+                if ($v == PHP_CodeCoverage_Driver::LINE_EXECUTED) {
+                    if (empty($this->data[$file][$k]) || !in_array($id, $this->data[$file][$k])) {
+                        $this->data[$file][$k][] = $id;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Merges the data from another instance of PHP_CodeCoverage.
+     *
+     * @param PHP_CodeCoverage $that
+     */
+    public function merge(PHP_CodeCoverage $that)
+    {
+        foreach ($that->data as $file => $lines) {
+            if (!isset($this->data[$file])) {
+                if (!$this->filter->isFiltered($file)) {
+                    $this->data[$file] = $lines;
+                }
+
+                continue;
+            }
+
+            foreach ($lines as $line => $data) {
+                if ($data !== null) {
+                    if (!isset($this->data[$file][$line])) {
+                        $this->data[$file][$line] = $data;
+                    } else {
+                        $this->data[$file][$line] = array_unique(
+                            array_merge($this->data[$file][$line], $data)
+                        );
+                    }
+                }
+            }
+        }
+
+        $this->tests = array_merge($this->tests, $that->getTests());
+
+        $this->filter->setBlacklistedFiles(
+            array_merge($this->filter->getBlacklistedFiles(), $that->filter()->getBlacklistedFiles())
+        );
+
+        $this->filter->setWhitelistedFiles(
+            array_merge($this->filter->getWhitelistedFiles(), $that->filter()->getWhitelistedFiles())
+        );
+    }
+
+    /**
+     * @param  bool                       $flag
+     * @throws PHP_CodeCoverage_Exception
+     * @since  Method available since Release 1.1.0
+     */
+    public function setCacheTokens($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        $this->cacheTokens = $flag;
+    }
+
+    /**
+     * @since Method available since Release 1.1.0
+     */
+    public function getCacheTokens()
+    {
+        return $this->cacheTokens;
+    }
+
+    /**
+     * @param  bool                       $flag
+     * @throws PHP_CodeCoverage_Exception
+     * @since  Method available since Release 2.0.0
+     */
+    public function setCheckForUnintentionallyCoveredCode($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        $this->checkForUnintentionallyCoveredCode = $flag;
+    }
+
+    /**
+     * @param  bool                       $flag
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function setForceCoversAnnotation($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        $this->forceCoversAnnotation = $flag;
+    }
+
+    /**
+     * @param  bool                       $flag
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function setMapTestClassNameToCoveredClassName($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        $this->mapTestClassNameToCoveredClassName = $flag;
+    }
+
+    /**
+     * @param  bool                       $flag
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function setAddUncoveredFilesFromWhitelist($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        $this->addUncoveredFilesFromWhitelist = $flag;
+    }
+
+    /**
+     * @param  bool                       $flag
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function setProcessUncoveredFilesFromWhitelist($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        $this->processUncoveredFilesFromWhitelist = $flag;
+    }
+
+    /**
+     * @param  bool                       $flag
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function setDisableIgnoredLines($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        $this->disableIgnoredLines = $flag;
+    }
+
+    /**
+     * Applies the @covers annotation filtering.
+     *
+     * @param  array                                                 $data
+     * @param  mixed                                                 $linesToBeCovered
+     * @param  array                                                 $linesToBeUsed
+     * @throws PHP_CodeCoverage_Exception_UnintentionallyCoveredCode
+     */
+    private function applyCoversAnnotationFilter(array &$data, $linesToBeCovered, array $linesToBeUsed)
+    {
+        if ($linesToBeCovered === false ||
+            ($this->forceCoversAnnotation && empty($linesToBeCovered))) {
+            $data = array();
+
+            return;
+        }
+
+        if (empty($linesToBeCovered)) {
+            return;
+        }
+
+        if ($this->checkForUnintentionallyCoveredCode) {
+            $this->performUnintentionallyCoveredCodeCheck(
+                $data,
+                $linesToBeCovered,
+                $linesToBeUsed
+            );
+        }
+
+        $data = array_intersect_key($data, $linesToBeCovered);
+
+        foreach (array_keys($data) as $filename) {
+            $_linesToBeCovered = array_flip($linesToBeCovered[$filename]);
+
+            $data[$filename] = array_intersect_key(
+                $data[$filename],
+                $_linesToBeCovered
+            );
+        }
+    }
+
+    /**
+     * Applies the blacklist/whitelist filtering.
+     *
+     * @param array $data
+     */
+    private function applyListsFilter(array &$data)
+    {
+        foreach (array_keys($data) as $filename) {
+            if ($this->filter->isFiltered($filename)) {
+                unset($data[$filename]);
+            }
+        }
+    }
+
+    /**
+     * Applies the "ignored lines" filtering.
+     *
+     * @param array $data
+     */
+    private function applyIgnoredLinesFilter(array &$data)
+    {
+        foreach (array_keys($data) as $filename) {
+            if (!$this->filter->isFile($filename)) {
+                continue;
+            }
+
+            foreach ($this->getLinesToBeIgnored($filename) as $line) {
+                unset($data[$filename][$line]);
+            }
+        }
+    }
+
+    /**
+     * @param array $data
+     * @since Method available since Release 1.1.0
+     */
+    private function initializeFilesThatAreSeenTheFirstTime(array $data)
+    {
+        foreach ($data as $file => $lines) {
+            if ($this->filter->isFile($file) && !isset($this->data[$file])) {
+                $this->data[$file] = array();
+
+                foreach ($lines as $k => $v) {
+                    $this->data[$file][$k] = $v == -2 ? null : array();
+                }
+            }
+        }
+    }
+
+    /**
+     * Processes whitelisted files that are not covered.
+     */
+    private function addUncoveredFilesFromWhitelist()
+    {
+        $data           = array();
+        $uncoveredFiles = array_diff(
+            $this->filter->getWhitelist(),
+            array_keys($this->data)
+        );
+
+        foreach ($uncoveredFiles as $uncoveredFile) {
+            if (!file_exists($uncoveredFile)) {
+                continue;
+            }
+
+            if ($this->processUncoveredFilesFromWhitelist) {
+                $this->processUncoveredFileFromWhitelist(
+                    $uncoveredFile,
+                    $data,
+                    $uncoveredFiles
+                );
+            } else {
+                $data[$uncoveredFile] = array();
+
+                $lines = count(file($uncoveredFile));
+
+                for ($i = 1; $i <= $lines; $i++) {
+                    $data[$uncoveredFile][$i] = PHP_CodeCoverage_Driver::LINE_NOT_EXECUTED;
+                }
+            }
+        }
+
+        $this->append($data, 'UNCOVERED_FILES_FROM_WHITELIST');
+    }
+
+    /**
+     * @param string $uncoveredFile
+     * @param array  $data
+     * @param array  $uncoveredFiles
+     */
+    private function processUncoveredFileFromWhitelist($uncoveredFile, array &$data, array $uncoveredFiles)
+    {
+        $this->driver->start();
+        include_once $uncoveredFile;
+        $coverage = $this->driver->stop();
+
+        foreach ($coverage as $file => $fileCoverage) {
+            if (!isset($data[$file]) &&
+                in_array($file, $uncoveredFiles)) {
+                foreach (array_keys($fileCoverage) as $key) {
+                    if ($fileCoverage[$key] == PHP_CodeCoverage_Driver::LINE_EXECUTED) {
+                        $fileCoverage[$key] = PHP_CodeCoverage_Driver::LINE_NOT_EXECUTED;
+                    }
+                }
+
+                $data[$file] = $fileCoverage;
+            }
+        }
+    }
+
+    /**
+     * Returns the lines of a source file that should be ignored.
+     *
+     * @param  string                     $filename
+     * @return array
+     * @throws PHP_CodeCoverage_Exception
+     * @since  Method available since Release 2.0.0
+     */
+    private function getLinesToBeIgnored($filename)
+    {
+        if (!is_string($filename)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'string'
+            );
+        }
+
+        if (!isset($this->ignoredLines[$filename])) {
+            $this->ignoredLines[$filename] = array();
+
+            if ($this->disableIgnoredLines) {
+                return $this->ignoredLines[$filename];
+            }
+
+            $ignore   = false;
+            $stop     = false;
+            $lines    = file($filename);
+            $numLines = count($lines);
+
+            foreach ($lines as $index => $line) {
+                if (!trim($line)) {
+                    $this->ignoredLines[$filename][] = $index + 1;
+                }
+            }
+
+            if ($this->cacheTokens) {
+                $tokens = PHP_Token_Stream_CachingFactory::get($filename);
+            } else {
+                $tokens = new PHP_Token_Stream($filename);
+            }
+
+            $classes = array_merge($tokens->getClasses(), $tokens->getTraits());
+            $tokens  = $tokens->tokens();
+
+            foreach ($tokens as $token) {
+                switch (get_class($token)) {
+                    case 'PHP_Token_COMMENT':
+                    case 'PHP_Token_DOC_COMMENT':
+                        $_token = trim($token);
+                        $_line  = trim($lines[$token->getLine() - 1]);
+
+                        if ($_token == '// @codeCoverageIgnore' ||
+                            $_token == '//@codeCoverageIgnore') {
+                            $ignore = true;
+                            $stop   = true;
+                        } elseif ($_token == '// @codeCoverageIgnoreStart' ||
+                            $_token == '//@codeCoverageIgnoreStart') {
+                            $ignore = true;
+                        } elseif ($_token == '// @codeCoverageIgnoreEnd' ||
+                            $_token == '//@codeCoverageIgnoreEnd') {
+                            $stop = true;
+                        }
+
+                        if (!$ignore) {
+                            $start = $token->getLine();
+                            $end   = $start + substr_count($token, "\n");
+
+                            // Do not ignore the first line when there is a token
+                            // before the comment
+                            if (0 !== strpos($_token, $_line)) {
+                                $start++;
+                            }
+
+                            for ($i = $start; $i < $end; $i++) {
+                                $this->ignoredLines[$filename][] = $i;
+                            }
+
+                            // A DOC_COMMENT token or a COMMENT token starting with "/*"
+                            // does not contain the final \n character in its text
+                            if (isset($lines[$i-1]) && 0 === strpos($_token, '/*') && '*/' === substr(trim($lines[$i-1]), -2)) {
+                                $this->ignoredLines[$filename][] = $i;
+                            }
+                        }
+                        break;
+
+                    case 'PHP_Token_INTERFACE':
+                    case 'PHP_Token_TRAIT':
+                    case 'PHP_Token_CLASS':
+                    case 'PHP_Token_FUNCTION':
+                        $docblock = $token->getDocblock();
+
+                        $this->ignoredLines[$filename][] = $token->getLine();
+
+                        if (strpos($docblock, '@codeCoverageIgnore') || strpos($docblock, '@deprecated')) {
+                            $endLine = $token->getEndLine();
+
+                            for ($i = $token->getLine(); $i <= $endLine; $i++) {
+                                $this->ignoredLines[$filename][] = $i;
+                            }
+                        } elseif ($token instanceof PHP_Token_INTERFACE ||
+                            $token instanceof PHP_Token_TRAIT ||
+                            $token instanceof PHP_Token_CLASS) {
+                            if (empty($classes[$token->getName()]['methods'])) {
+                                for ($i = $token->getLine();
+                                     $i <= $token->getEndLine();
+                                     $i++) {
+                                    $this->ignoredLines[$filename][] = $i;
+                                }
+                            } else {
+                                $firstMethod = array_shift(
+                                    $classes[$token->getName()]['methods']
+                                );
+
+                                do {
+                                    $lastMethod = array_pop(
+                                        $classes[$token->getName()]['methods']
+                                    );
+                                } while ($lastMethod !== null &&
+                                    substr($lastMethod['signature'], 0, 18) == 'anonymous function');
+
+                                if ($lastMethod === null) {
+                                    $lastMethod = $firstMethod;
+                                }
+
+                                for ($i = $token->getLine();
+                                     $i < $firstMethod['startLine'];
+                                     $i++) {
+                                    $this->ignoredLines[$filename][] = $i;
+                                }
+
+                                for ($i = $token->getEndLine();
+                                     $i > $lastMethod['endLine'];
+                                     $i--) {
+                                    $this->ignoredLines[$filename][] = $i;
+                                }
+                            }
+                        }
+                        break;
+
+                    case 'PHP_Token_NAMESPACE':
+                        $this->ignoredLines[$filename][] = $token->getEndLine();
+
+                    // Intentional fallthrough
+                    case 'PHP_Token_OPEN_TAG':
+                    case 'PHP_Token_CLOSE_TAG':
+                    case 'PHP_Token_USE':
+                        $this->ignoredLines[$filename][] = $token->getLine();
+                        break;
+                }
+
+                if ($ignore) {
+                    $this->ignoredLines[$filename][] = $token->getLine();
+
+                    if ($stop) {
+                        $ignore = false;
+                        $stop   = false;
+                    }
+                }
+            }
+
+            $this->ignoredLines[$filename][] = $numLines + 1;
+
+            $this->ignoredLines[$filename] = array_unique(
+                $this->ignoredLines[$filename]
+            );
+
+            sort($this->ignoredLines[$filename]);
+        }
+
+        return $this->ignoredLines[$filename];
+    }
+
+    /**
+     * @param  array                                                 $data
+     * @param  array                                                 $linesToBeCovered
+     * @param  array                                                 $linesToBeUsed
+     * @throws PHP_CodeCoverage_Exception_UnintentionallyCoveredCode
+     * @since Method available since Release 2.0.0
+     */
+    private function performUnintentionallyCoveredCodeCheck(array &$data, array $linesToBeCovered, array $linesToBeUsed)
+    {
+        $allowedLines = $this->getAllowedLines(
+            $linesToBeCovered,
+            $linesToBeUsed
+        );
+
+        $message = '';
+
+        foreach ($data as $file => $_data) {
+            foreach ($_data as $line => $flag) {
+                if ($flag == 1 &&
+                    (!isset($allowedLines[$file]) ||
+                        !isset($allowedLines[$file][$line]))) {
+                    $message .= sprintf(
+                        '- %s:%d' . PHP_EOL,
+                        $file,
+                        $line
+                    );
+                }
+            }
+        }
+
+        if (!empty($message)) {
+            throw new PHP_CodeCoverage_Exception_UnintentionallyCoveredCode(
+                $message
+            );
+        }
+    }
+
+    /**
+     * @param  array $linesToBeCovered
+     * @param  array $linesToBeUsed
+     * @return array
+     * @since Method available since Release 2.0.0
+     */
+    private function getAllowedLines(array $linesToBeCovered, array $linesToBeUsed)
+    {
+        $allowedLines = array();
+
+        foreach (array_keys($linesToBeCovered) as $file) {
+            if (!isset($allowedLines[$file])) {
+                $allowedLines[$file] = array();
+            }
+
+            $allowedLines[$file] = array_merge(
+                $allowedLines[$file],
+                $linesToBeCovered[$file]
+            );
+        }
+
+        foreach (array_keys($linesToBeUsed) as $file) {
+            if (!isset($allowedLines[$file])) {
+                $allowedLines[$file] = array();
+            }
+
+            $allowedLines[$file] = array_merge(
+                $allowedLines[$file],
+                $linesToBeUsed[$file]
+            );
+        }
+
+        foreach (array_keys($allowedLines) as $file) {
+            $allowedLines[$file] = array_flip(
+                array_unique($allowedLines[$file])
+            );
+        }
+
+        return $allowedLines;
+    }
+
+    /**
+     * @return PHP_CodeCoverage_Driver
+     * @throws PHP_CodeCoverage_Exception
+     */
+    private function selectDriver()
+    {
+        $runtime = new Runtime;
+
+        if (!$runtime->canCollectCodeCoverage()) {
+            throw new PHP_CodeCoverage_Exception('No code coverage driver available');
+        }
+
+        if ($runtime->isHHVM()) {
+            return new PHP_CodeCoverage_Driver_HHVM;
+        } elseif ($runtime->isPHPDBG()) {
+            return new PHP_CodeCoverage_Driver_PHPDBG;
+        } else {
+            return new PHP_CodeCoverage_Driver_Xdebug;
+        }
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver.php
new file mode 100644
index 00000000..8635acef
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver.php
@@ -0,0 +1,47 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Interface for code coverage drivers.
+ *
+ * @since Class available since Release 1.0.0
+ */
+interface PHP_CodeCoverage_Driver
+{
+    /**
+     * @var int
+     * @see http://xdebug.org/docs/code_coverage
+     */
+    const LINE_EXECUTED = 1;
+
+    /**
+     * @var int
+     * @see http://xdebug.org/docs/code_coverage
+     */
+    const LINE_NOT_EXECUTED = -1;
+
+    /**
+     * @var int
+     * @see http://xdebug.org/docs/code_coverage
+     */
+    const LINE_NOT_EXECUTABLE = -2;
+
+    /**
+     * Start collection of code coverage information.
+     */
+    public function start();
+
+    /**
+     * Stop collection of code coverage information.
+     *
+     * @return array
+     */
+    public function stop();
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/HHVM.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/HHVM.php
new file mode 100644
index 00000000..a9d8f0ce
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/HHVM.php
@@ -0,0 +1,26 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Driver for HHVM's code coverage functionality.
+ *
+ * @since Class available since Release 2.2.2
+ * @codeCoverageIgnore
+ */
+class PHP_CodeCoverage_Driver_HHVM extends PHP_CodeCoverage_Driver_Xdebug
+{
+    /**
+     * Start collection of code coverage information.
+     */
+    public function start()
+    {
+        xdebug_start_code_coverage();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/PHPDBG.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/PHPDBG.php
new file mode 100644
index 00000000..f3eb6214
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/PHPDBG.php
@@ -0,0 +1,105 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Driver for PHPDBG's code coverage functionality.
+ *
+ * @since Class available since Release 2.2.0
+ * @codeCoverageIgnore
+ */
+class PHP_CodeCoverage_Driver_PHPDBG implements PHP_CodeCoverage_Driver
+{
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        if (PHP_SAPI !== 'phpdbg') {
+            throw new PHP_CodeCoverage_Exception(
+                'This driver requires the PHPDBG SAPI'
+            );
+        }
+
+        if (!function_exists('phpdbg_start_oplog')) {
+            throw new PHP_CodeCoverage_Exception(
+                'This build of PHPDBG does not support code coverage'
+            );
+        }
+    }
+
+    /**
+     * Start collection of code coverage information.
+     */
+    public function start()
+    {
+        phpdbg_start_oplog();
+    }
+
+    /**
+     * Stop collection of code coverage information.
+     *
+     * @return array
+     */
+    public function stop()
+    {
+        static $fetchedLines = array();
+
+        $dbgData = phpdbg_end_oplog();
+
+        if ($fetchedLines == array()) {
+            $sourceLines = phpdbg_get_executable();
+        } else {
+            $newFiles = array_diff(
+                get_included_files(),
+                array_keys($fetchedLines)
+            );
+
+            if ($newFiles) {
+                $sourceLines = phpdbg_get_executable(
+                    array('files' => $newFiles)
+                );
+            } else {
+                $sourceLines = array();
+            }
+        }
+
+        foreach ($sourceLines as $file => $lines) {
+            foreach ($lines as $lineNo => $numExecuted) {
+                $sourceLines[$file][$lineNo] = self::LINE_NOT_EXECUTED;
+            }
+        }
+
+        $fetchedLines = array_merge($fetchedLines, $sourceLines);
+
+        return $this->detectExecutedLines($fetchedLines, $dbgData);
+    }
+
+    /**
+     * Convert phpdbg based data into the format CodeCoverage expects
+     *
+     * @param  array $sourceLines
+     * @param  array $dbgData
+     * @return array
+     */
+    private function detectExecutedLines(array $sourceLines, array $dbgData)
+    {
+        foreach ($dbgData as $file => $coveredLines) {
+            foreach ($coveredLines as $lineNo => $numExecuted) {
+                // phpdbg also reports $lineNo=0 when e.g. exceptions get thrown.
+                // make sure we only mark lines executed which are actually executable.
+                if (isset($sourceLines[$file][$lineNo])) {
+                    $sourceLines[$file][$lineNo] = self::LINE_EXECUTED;
+                }
+            }
+        }
+
+        return $sourceLines;
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/Xdebug.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/Xdebug.php
new file mode 100644
index 00000000..0cd7b9ad
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/Xdebug.php
@@ -0,0 +1,97 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Driver for Xdebug's code coverage functionality.
+ *
+ * @since Class available since Release 1.0.0
+ * @codeCoverageIgnore
+ */
+class PHP_CodeCoverage_Driver_Xdebug implements PHP_CodeCoverage_Driver
+{
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        if (!extension_loaded('xdebug')) {
+            throw new PHP_CodeCoverage_Exception('This driver requires Xdebug');
+        }
+
+        if (version_compare(phpversion('xdebug'), '2.2.0-dev', '>=') &&
+            !ini_get('xdebug.coverage_enable')) {
+            throw new PHP_CodeCoverage_Exception(
+                'xdebug.coverage_enable=On has to be set in php.ini'
+            );
+        }
+    }
+
+    /**
+     * Start collection of code coverage information.
+     */
+    public function start()
+    {
+        xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
+    }
+
+    /**
+     * Stop collection of code coverage information.
+     *
+     * @return array
+     */
+    public function stop()
+    {
+        $data = xdebug_get_code_coverage();
+        xdebug_stop_code_coverage();
+
+        return $this->cleanup($data);
+    }
+
+    /**
+     * @param  array $data
+     * @return array
+     * @since Method available since Release 2.0.0
+     */
+    private function cleanup(array $data)
+    {
+        foreach (array_keys($data) as $file) {
+            unset($data[$file][0]);
+
+            if ($file != 'xdebug://debug-eval' && file_exists($file)) {
+                $numLines = $this->getNumberOfLinesInFile($file);
+
+                foreach (array_keys($data[$file]) as $line) {
+                    if (isset($data[$file][$line]) && $line > $numLines) {
+                        unset($data[$file][$line]);
+                    }
+                }
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param  string $file
+     * @return int
+     * @since Method available since Release 2.0.0
+     */
+    private function getNumberOfLinesInFile($file)
+    {
+        $buffer = file_get_contents($file);
+        $lines  = substr_count($buffer, "\n");
+
+        if (substr($buffer, -1) !== "\n") {
+            $lines++;
+        }
+
+        return $lines;
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception.php
new file mode 100644
index 00000000..bded3c09
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception.php
@@ -0,0 +1,18 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Exception class for PHP_CodeCoverage component.
+ *
+ * @since Class available since Release 1.1.0
+ */
+class PHP_CodeCoverage_Exception extends RuntimeException
+{
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception/UnintentionallyCoveredCode.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception/UnintentionallyCoveredCode.php
new file mode 100644
index 00000000..463785ef
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception/UnintentionallyCoveredCode.php
@@ -0,0 +1,18 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Exception that is raised when code is unintentionally covered.
+ *
+ * @since Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Exception_UnintentionallyCoveredCode extends PHP_CodeCoverage_Exception
+{
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Filter.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Filter.php
new file mode 100644
index 00000000..fd5b6aa2
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Filter.php
@@ -0,0 +1,292 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Filter for blacklisting and whitelisting of code coverage information.
+ *
+ * @since Class available since Release 1.0.0
+ */
+class PHP_CodeCoverage_Filter
+{
+    /**
+     * Source files that are blacklisted.
+     *
+     * @var array
+     */
+    private $blacklistedFiles = array();
+
+    /**
+     * Source files that are whitelisted.
+     *
+     * @var array
+     */
+    private $whitelistedFiles = array();
+
+    /**
+     * Adds a directory to the blacklist (recursively).
+     *
+     * @param string $directory
+     * @param string $suffix
+     * @param string $prefix
+     */
+    public function addDirectoryToBlacklist($directory, $suffix = '.php', $prefix = '')
+    {
+        $facade = new File_Iterator_Facade;
+        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
+
+        foreach ($files as $file) {
+            $this->addFileToBlacklist($file);
+        }
+    }
+
+    /**
+     * Adds a file to the blacklist.
+     *
+     * @param string $filename
+     */
+    public function addFileToBlacklist($filename)
+    {
+        $this->blacklistedFiles[realpath($filename)] = true;
+    }
+
+    /**
+     * Adds files to the blacklist.
+     *
+     * @param array $files
+     */
+    public function addFilesToBlacklist(array $files)
+    {
+        foreach ($files as $file) {
+            $this->addFileToBlacklist($file);
+        }
+    }
+
+    /**
+     * Removes a directory from the blacklist (recursively).
+     *
+     * @param string $directory
+     * @param string $suffix
+     * @param string $prefix
+     */
+    public function removeDirectoryFromBlacklist($directory, $suffix = '.php', $prefix = '')
+    {
+        $facade = new File_Iterator_Facade;
+        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
+
+        foreach ($files as $file) {
+            $this->removeFileFromBlacklist($file);
+        }
+    }
+
+    /**
+     * Removes a file from the blacklist.
+     *
+     * @param string $filename
+     */
+    public function removeFileFromBlacklist($filename)
+    {
+        $filename = realpath($filename);
+
+        if (isset($this->blacklistedFiles[$filename])) {
+            unset($this->blacklistedFiles[$filename]);
+        }
+    }
+
+    /**
+     * Adds a directory to the whitelist (recursively).
+     *
+     * @param string $directory
+     * @param string $suffix
+     * @param string $prefix
+     */
+    public function addDirectoryToWhitelist($directory, $suffix = '.php', $prefix = '')
+    {
+        $facade = new File_Iterator_Facade;
+        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
+
+        foreach ($files as $file) {
+            $this->addFileToWhitelist($file);
+        }
+    }
+
+    /**
+     * Adds a file to the whitelist.
+     *
+     * @param string $filename
+     */
+    public function addFileToWhitelist($filename)
+    {
+        $this->whitelistedFiles[realpath($filename)] = true;
+    }
+
+    /**
+     * Adds files to the whitelist.
+     *
+     * @param array $files
+     */
+    public function addFilesToWhitelist(array $files)
+    {
+        foreach ($files as $file) {
+            $this->addFileToWhitelist($file);
+        }
+    }
+
+    /**
+     * Removes a directory from the whitelist (recursively).
+     *
+     * @param string $directory
+     * @param string $suffix
+     * @param string $prefix
+     */
+    public function removeDirectoryFromWhitelist($directory, $suffix = '.php', $prefix = '')
+    {
+        $facade = new File_Iterator_Facade;
+        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
+
+        foreach ($files as $file) {
+            $this->removeFileFromWhitelist($file);
+        }
+    }
+
+    /**
+     * Removes a file from the whitelist.
+     *
+     * @param string $filename
+     */
+    public function removeFileFromWhitelist($filename)
+    {
+        $filename = realpath($filename);
+
+        if (isset($this->whitelistedFiles[$filename])) {
+            unset($this->whitelistedFiles[$filename]);
+        }
+    }
+
+    /**
+     * Checks whether a filename is a real filename.
+     *
+     * @param string $filename
+     */
+    public function isFile($filename)
+    {
+        if ($filename == '-' ||
+            strpos($filename, 'vfs://') === 0 ||
+            strpos($filename, 'xdebug://debug-eval') !== false ||
+            strpos($filename, 'eval()\'d code') !== false ||
+            strpos($filename, 'runtime-created function') !== false ||
+            strpos($filename, 'runkit created function') !== false ||
+            strpos($filename, 'assert code') !== false ||
+            strpos($filename, 'regexp code') !== false) {
+            return false;
+        }
+
+        return file_exists($filename);
+    }
+
+    /**
+     * Checks whether or not a file is filtered.
+     *
+     * When the whitelist is empty (default), blacklisting is used.
+     * When the whitelist is not empty, whitelisting is used.
+     *
+     * @param  string                     $filename
+     * @return bool
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function isFiltered($filename)
+    {
+        if (!$this->isFile($filename)) {
+            return true;
+        }
+
+        $filename = realpath($filename);
+
+        if (!empty($this->whitelistedFiles)) {
+            return !isset($this->whitelistedFiles[$filename]);
+        }
+
+        return isset($this->blacklistedFiles[$filename]);
+    }
+
+    /**
+     * Returns the list of blacklisted files.
+     *
+     * @return array
+     */
+    public function getBlacklist()
+    {
+        return array_keys($this->blacklistedFiles);
+    }
+
+    /**
+     * Returns the list of whitelisted files.
+     *
+     * @return array
+     */
+    public function getWhitelist()
+    {
+        return array_keys($this->whitelistedFiles);
+    }
+
+    /**
+     * Returns whether this filter has a whitelist.
+     *
+     * @return bool
+     * @since  Method available since Release 1.1.0
+     */
+    public function hasWhitelist()
+    {
+        return !empty($this->whitelistedFiles);
+    }
+
+    /**
+     * Returns the blacklisted files.
+     *
+     * @return array
+     * @since Method available since Release 2.0.0
+     */
+    public function getBlacklistedFiles()
+    {
+        return $this->blacklistedFiles;
+    }
+
+    /**
+     * Sets the blacklisted files.
+     *
+     * @param array $blacklistedFiles
+     * @since Method available since Release 2.0.0
+     */
+    public function setBlacklistedFiles($blacklistedFiles)
+    {
+        $this->blacklistedFiles = $blacklistedFiles;
+    }
+
+    /**
+     * Returns the whitelisted files.
+     *
+     * @return array
+     * @since Method available since Release 2.0.0
+     */
+    public function getWhitelistedFiles()
+    {
+        return $this->whitelistedFiles;
+    }
+
+    /**
+     * Sets the whitelisted files.
+     *
+     * @param array $whitelistedFiles
+     * @since Method available since Release 2.0.0
+     */
+    public function setWhitelistedFiles($whitelistedFiles)
+    {
+        $this->whitelistedFiles = $whitelistedFiles;
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Clover.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Clover.php
new file mode 100644
index 00000000..c0ea8d82
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Clover.php
@@ -0,0 +1,284 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Generates a Clover XML logfile from an PHP_CodeCoverage object.
+ *
+ * @since Class available since Release 1.0.0
+ */
+class PHP_CodeCoverage_Report_Clover
+{
+    /**
+     * @param  PHP_CodeCoverage $coverage
+     * @param  string           $target
+     * @param  string           $name
+     * @return string
+     */
+    public function process(PHP_CodeCoverage $coverage, $target = null, $name = null)
+    {
+        $xmlDocument               = new DOMDocument('1.0', 'UTF-8');
+        $xmlDocument->formatOutput = true;
+
+        $xmlCoverage = $xmlDocument->createElement('coverage');
+        $xmlCoverage->setAttribute('generated', (int) $_SERVER['REQUEST_TIME']);
+        $xmlDocument->appendChild($xmlCoverage);
+
+        $xmlProject = $xmlDocument->createElement('project');
+        $xmlProject->setAttribute('timestamp', (int) $_SERVER['REQUEST_TIME']);
+
+        if (is_string($name)) {
+            $xmlProject->setAttribute('name', $name);
+        }
+
+        $xmlCoverage->appendChild($xmlProject);
+
+        $packages = array();
+        $report   = $coverage->getReport();
+        unset($coverage);
+
+        foreach ($report as $item) {
+            $namespace = 'global';
+
+            if (!$item instanceof PHP_CodeCoverage_Report_Node_File) {
+                continue;
+            }
+
+            $xmlFile = $xmlDocument->createElement('file');
+            $xmlFile->setAttribute('name', $item->getPath());
+
+            $classes  = $item->getClassesAndTraits();
+            $coverage = $item->getCoverageData();
+            $lines    = array();
+
+            foreach ($classes as $className => $class) {
+                $classStatements        = 0;
+                $coveredClassStatements = 0;
+                $coveredMethods         = 0;
+                $classMethods           = 0;
+
+                foreach ($class['methods'] as $methodName => $method) {
+                    if ($method['executableLines']  == 0) {
+                        continue;
+                    }
+
+                    $classMethods++;
+                    $classStatements        += $method['executableLines'];
+                    $coveredClassStatements += $method['executedLines'];
+                    if ($method['coverage'] == 100) {
+                        $coveredMethods++;
+                    }
+
+                    $methodCount = 0;
+                    for ($i  = $method['startLine'];
+                         $i <= $method['endLine'];
+                         $i++) {
+                        if (isset($coverage[$i]) && ($coverage[$i] !== null)) {
+                            $methodCount = max($methodCount, count($coverage[$i]));
+                        }
+                    }
+
+                    $lines[$method['startLine']] = array(
+                        'count' => $methodCount,
+                        'crap'  => $method['crap'],
+                        'type'  => 'method',
+                        'name'  => $methodName
+                    );
+                }
+
+                if (!empty($class['package']['namespace'])) {
+                    $namespace = $class['package']['namespace'];
+                }
+
+                $xmlClass = $xmlDocument->createElement('class');
+                $xmlClass->setAttribute('name', $className);
+                $xmlClass->setAttribute('namespace', $namespace);
+
+                if (!empty($class['package']['fullPackage'])) {
+                    $xmlClass->setAttribute(
+                        'fullPackage',
+                        $class['package']['fullPackage']
+                    );
+                }
+
+                if (!empty($class['package']['category'])) {
+                    $xmlClass->setAttribute(
+                        'category',
+                        $class['package']['category']
+                    );
+                }
+
+                if (!empty($class['package']['package'])) {
+                    $xmlClass->setAttribute(
+                        'package',
+                        $class['package']['package']
+                    );
+                }
+
+                if (!empty($class['package']['subpackage'])) {
+                    $xmlClass->setAttribute(
+                        'subpackage',
+                        $class['package']['subpackage']
+                    );
+                }
+
+                $xmlFile->appendChild($xmlClass);
+
+                $xmlMetrics = $xmlDocument->createElement('metrics');
+                $xmlMetrics->setAttribute('methods', $classMethods);
+                $xmlMetrics->setAttribute('coveredmethods', $coveredMethods);
+                $xmlMetrics->setAttribute('conditionals', 0);
+                $xmlMetrics->setAttribute('coveredconditionals', 0);
+                $xmlMetrics->setAttribute('statements', $classStatements);
+                $xmlMetrics->setAttribute(
+                    'coveredstatements',
+                    $coveredClassStatements
+                );
+                $xmlMetrics->setAttribute(
+                    'elements',
+                    $classMethods +
+                    $classStatements
+                    /* + conditionals */
+                );
+                $xmlMetrics->setAttribute(
+                    'coveredelements',
+                    $coveredMethods +
+                    $coveredClassStatements
+                    /* + coveredconditionals */
+                );
+                $xmlClass->appendChild($xmlMetrics);
+            }
+
+            foreach ($coverage as $line => $data) {
+                if ($data === null || isset($lines[$line])) {
+                    continue;
+                }
+
+                $lines[$line] = array(
+                    'count' => count($data), 'type' => 'stmt'
+                );
+            }
+
+            ksort($lines);
+
+            foreach ($lines as $line => $data) {
+                $xmlLine = $xmlDocument->createElement('line');
+                $xmlLine->setAttribute('num', $line);
+                $xmlLine->setAttribute('type', $data['type']);
+
+                if (isset($data['name'])) {
+                    $xmlLine->setAttribute('name', $data['name']);
+                }
+
+                if (isset($data['crap'])) {
+                    $xmlLine->setAttribute('crap', $data['crap']);
+                }
+
+                $xmlLine->setAttribute('count', $data['count']);
+                $xmlFile->appendChild($xmlLine);
+            }
+
+            $linesOfCode = $item->getLinesOfCode();
+
+            $xmlMetrics = $xmlDocument->createElement('metrics');
+            $xmlMetrics->setAttribute('loc', $linesOfCode['loc']);
+            $xmlMetrics->setAttribute('ncloc', $linesOfCode['ncloc']);
+            $xmlMetrics->setAttribute('classes', $item->getNumClassesAndTraits());
+            $xmlMetrics->setAttribute('methods', $item->getNumMethods());
+            $xmlMetrics->setAttribute(
+                'coveredmethods',
+                $item->getNumTestedMethods()
+            );
+            $xmlMetrics->setAttribute('conditionals', 0);
+            $xmlMetrics->setAttribute('coveredconditionals', 0);
+            $xmlMetrics->setAttribute(
+                'statements',
+                $item->getNumExecutableLines()
+            );
+            $xmlMetrics->setAttribute(
+                'coveredstatements',
+                $item->getNumExecutedLines()
+            );
+            $xmlMetrics->setAttribute(
+                'elements',
+                $item->getNumMethods() + $item->getNumExecutableLines()
+                /* + conditionals */
+            );
+            $xmlMetrics->setAttribute(
+                'coveredelements',
+                $item->getNumTestedMethods() + $item->getNumExecutedLines()
+                /* + coveredconditionals */
+            );
+            $xmlFile->appendChild($xmlMetrics);
+
+            if ($namespace == 'global') {
+                $xmlProject->appendChild($xmlFile);
+            } else {
+                if (!isset($packages[$namespace])) {
+                    $packages[$namespace] = $xmlDocument->createElement(
+                        'package'
+                    );
+
+                    $packages[$namespace]->setAttribute('name', $namespace);
+                    $xmlProject->appendChild($packages[$namespace]);
+                }
+
+                $packages[$namespace]->appendChild($xmlFile);
+            }
+        }
+
+        $linesOfCode = $report->getLinesOfCode();
+
+        $xmlMetrics = $xmlDocument->createElement('metrics');
+        $xmlMetrics->setAttribute('files', count($report));
+        $xmlMetrics->setAttribute('loc', $linesOfCode['loc']);
+        $xmlMetrics->setAttribute('ncloc', $linesOfCode['ncloc']);
+        $xmlMetrics->setAttribute(
+            'classes',
+            $report->getNumClassesAndTraits()
+        );
+        $xmlMetrics->setAttribute('methods', $report->getNumMethods());
+        $xmlMetrics->setAttribute(
+            'coveredmethods',
+            $report->getNumTestedMethods()
+        );
+        $xmlMetrics->setAttribute('conditionals', 0);
+        $xmlMetrics->setAttribute('coveredconditionals', 0);
+        $xmlMetrics->setAttribute(
+            'statements',
+            $report->getNumExecutableLines()
+        );
+        $xmlMetrics->setAttribute(
+            'coveredstatements',
+            $report->getNumExecutedLines()
+        );
+        $xmlMetrics->setAttribute(
+            'elements',
+            $report->getNumMethods() + $report->getNumExecutableLines()
+            /* + conditionals */
+        );
+        $xmlMetrics->setAttribute(
+            'coveredelements',
+            $report->getNumTestedMethods() + $report->getNumExecutedLines()
+            /* + coveredconditionals */
+        );
+
+        $xmlProject->appendChild($xmlMetrics);
+
+        if ($target !== null) {
+            if (!is_dir(dirname($target))) {
+                mkdir(dirname($target), 0777, true);
+            }
+
+            return $xmlDocument->save($target);
+        } else {
+            return $xmlDocument->saveXML();
+        }
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Crap4j.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Crap4j.php
new file mode 100644
index 00000000..2deced2c
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Crap4j.php
@@ -0,0 +1,164 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * @since Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_Crap4j
+{
+    /**
+     * @var int
+     */
+    private $threshold;
+
+    /**
+     * @param int $threshold
+     */
+    public function __construct($threshold = 30)
+    {
+        if (!is_int($threshold)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'integer'
+            );
+        }
+
+        $this->threshold = $threshold;
+    }
+
+    /**
+     * @param  PHP_CodeCoverage $coverage
+     * @param  string           $target
+     * @param  string           $name
+     * @return string
+     */
+    public function process(PHP_CodeCoverage $coverage, $target = null, $name = null)
+    {
+        $document               = new DOMDocument('1.0', 'UTF-8');
+        $document->formatOutput = true;
+
+        $root = $document->createElement('crap_result');
+        $document->appendChild($root);
+
+        $project = $document->createElement('project', is_string($name) ? $name : '');
+        $root->appendChild($project);
+        $root->appendChild($document->createElement('timestamp', date('Y-m-d H:i:s', (int) $_SERVER['REQUEST_TIME'])));
+
+        $stats       = $document->createElement('stats');
+        $methodsNode = $document->createElement('methods');
+
+        $report = $coverage->getReport();
+        unset($coverage);
+
+        $fullMethodCount     = 0;
+        $fullCrapMethodCount = 0;
+        $fullCrapLoad        = 0;
+        $fullCrap            = 0;
+
+        foreach ($report as $item) {
+            $namespace = 'global';
+
+            if (!$item instanceof PHP_CodeCoverage_Report_Node_File) {
+                continue;
+            }
+
+            $file = $document->createElement('file');
+            $file->setAttribute('name', $item->getPath());
+
+            $classes = $item->getClassesAndTraits();
+
+            foreach ($classes as $className => $class) {
+                foreach ($class['methods'] as $methodName => $method) {
+                    $crapLoad = $this->getCrapLoad($method['crap'], $method['ccn'], $method['coverage']);
+
+                    $fullCrap     += $method['crap'];
+                    $fullCrapLoad += $crapLoad;
+                    $fullMethodCount++;
+
+                    if ($method['crap'] >= $this->threshold) {
+                        $fullCrapMethodCount++;
+                    }
+
+                    $methodNode = $document->createElement('method');
+
+                    if (!empty($class['package']['namespace'])) {
+                        $namespace = $class['package']['namespace'];
+                    }
+
+                    $methodNode->appendChild($document->createElement('package', $namespace));
+                    $methodNode->appendChild($document->createElement('className', $className));
+                    $methodNode->appendChild($document->createElement('methodName', $methodName));
+                    $methodNode->appendChild($document->createElement('methodSignature', htmlspecialchars($method['signature'])));
+                    $methodNode->appendChild($document->createElement('fullMethod', htmlspecialchars($method['signature'])));
+                    $methodNode->appendChild($document->createElement('crap', $this->roundValue($method['crap'])));
+                    $methodNode->appendChild($document->createElement('complexity', $method['ccn']));
+                    $methodNode->appendChild($document->createElement('coverage', $this->roundValue($method['coverage'])));
+                    $methodNode->appendChild($document->createElement('crapLoad', round($crapLoad)));
+
+                    $methodsNode->appendChild($methodNode);
+                }
+            }
+        }
+
+        $stats->appendChild($document->createElement('name', 'Method Crap Stats'));
+        $stats->appendChild($document->createElement('methodCount', $fullMethodCount));
+        $stats->appendChild($document->createElement('crapMethodCount', $fullCrapMethodCount));
+        $stats->appendChild($document->createElement('crapLoad', round($fullCrapLoad)));
+        $stats->appendChild($document->createElement('totalCrap', $fullCrap));
+
+        if ($fullMethodCount > 0) {
+            $crapMethodPercent = $this->roundValue((100 * $fullCrapMethodCount) / $fullMethodCount);
+        } else {
+            $crapMethodPercent = '';
+        }
+
+        $stats->appendChild($document->createElement('crapMethodPercent', $crapMethodPercent));
+
+        $root->appendChild($stats);
+        $root->appendChild($methodsNode);
+
+        if ($target !== null) {
+            if (!is_dir(dirname($target))) {
+                mkdir(dirname($target), 0777, true);
+            }
+
+            return $document->save($target);
+        } else {
+            return $document->saveXML();
+        }
+    }
+
+    /**
+     * @param  float $crapValue
+     * @param  int   $cyclomaticComplexity
+     * @param  float $coveragePercent
+     * @return float
+     */
+    private function getCrapLoad($crapValue, $cyclomaticComplexity, $coveragePercent)
+    {
+        $crapLoad = 0;
+
+        if ($crapValue >= $this->threshold) {
+            $crapLoad += $cyclomaticComplexity * (1.0 - $coveragePercent / 100);
+            $crapLoad += $cyclomaticComplexity / $this->threshold;
+        }
+
+        return $crapLoad;
+    }
+
+    /**
+     * @param  float $value
+     * @return float
+     */
+    private function roundValue($value)
+    {
+        return round($value, 2);
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Factory.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Factory.php
new file mode 100644
index 00000000..b28964e8
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Factory.php
@@ -0,0 +1,242 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Factory for PHP_CodeCoverage_Report_Node_* object graphs.
+ *
+ * @since Class available since Release 1.1.0
+ */
+class PHP_CodeCoverage_Report_Factory
+{
+    /**
+     * @param  PHP_CodeCoverage                       $coverage
+     * @return PHP_CodeCoverage_Report_Node_Directory
+     */
+    public function create(PHP_CodeCoverage $coverage)
+    {
+        $files      = $coverage->getData();
+        $commonPath = $this->reducePaths($files);
+        $root       = new PHP_CodeCoverage_Report_Node_Directory(
+            $commonPath,
+            null
+        );
+
+        $this->addItems(
+            $root,
+            $this->buildDirectoryStructure($files),
+            $coverage->getTests(),
+            $coverage->getCacheTokens()
+        );
+
+        return $root;
+    }
+
+    /**
+     * @param PHP_CodeCoverage_Report_Node_Directory $root
+     * @param array                                  $items
+     * @param array                                  $tests
+     * @param bool                                   $cacheTokens
+     */
+    private function addItems(PHP_CodeCoverage_Report_Node_Directory $root, array $items, array $tests, $cacheTokens)
+    {
+        foreach ($items as $key => $value) {
+            if (substr($key, -2) == '/f') {
+                $key = substr($key, 0, -2);
+
+                if (file_exists($root->getPath() . DIRECTORY_SEPARATOR . $key)) {
+                    $root->addFile($key, $value, $tests, $cacheTokens);
+                }
+            } else {
+                $child = $root->addDirectory($key);
+                $this->addItems($child, $value, $tests, $cacheTokens);
+            }
+        }
+    }
+
+    /**
+     * Builds an array representation of the directory structure.
+     *
+     * For instance,
+     *
+     * <code>
+     * Array
+     * (
+     *     [Money.php] => Array
+     *         (
+     *             ...
+     *         )
+     *
+     *     [MoneyBag.php] => Array
+     *         (
+     *             ...
+     *         )
+     * )
+     * </code>
+     *
+     * is transformed into
+     *
+     * <code>
+     * Array
+     * (
+     *     [.] => Array
+     *         (
+     *             [Money.php] => Array
+     *                 (
+     *                     ...
+     *                 )
+     *
+     *             [MoneyBag.php] => Array
+     *                 (
+     *                     ...
+     *                 )
+     *         )
+     * )
+     * </code>
+     *
+     * @param  array $files
+     * @return array
+     */
+    private function buildDirectoryStructure($files)
+    {
+        $result = array();
+
+        foreach ($files as $path => $file) {
+            $path    = explode('/', $path);
+            $pointer = &$result;
+            $max     = count($path);
+
+            for ($i = 0; $i < $max; $i++) {
+                if ($i == ($max - 1)) {
+                    $type = '/f';
+                } else {
+                    $type = '';
+                }
+
+                $pointer = &$pointer[$path[$i] . $type];
+            }
+
+            $pointer = $file;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Reduces the paths by cutting the longest common start path.
+     *
+     * For instance,
+     *
+     * <code>
+     * Array
+     * (
+     *     [/home/sb/Money/Money.php] => Array
+     *         (
+     *             ...
+     *         )
+     *
+     *     [/home/sb/Money/MoneyBag.php] => Array
+     *         (
+     *             ...
+     *         )
+     * )
+     * </code>
+     *
+     * is reduced to
+     *
+     * <code>
+     * Array
+     * (
+     *     [Money.php] => Array
+     *         (
+     *             ...
+     *         )
+     *
+     *     [MoneyBag.php] => Array
+     *         (
+     *             ...
+     *         )
+     * )
+     * </code>
+     *
+     * @param  array  $files
+     * @return string
+     */
+    private function reducePaths(&$files)
+    {
+        if (empty($files)) {
+            return '.';
+        }
+
+        $commonPath = '';
+        $paths      = array_keys($files);
+
+        if (count($files) == 1) {
+            $commonPath                 = dirname($paths[0]) . '/';
+            $files[basename($paths[0])] = $files[$paths[0]];
+
+            unset($files[$paths[0]]);
+
+            return $commonPath;
+        }
+
+        $max = count($paths);
+
+        for ($i = 0; $i < $max; $i++) {
+            // strip phar:// prefixes
+            if (strpos($paths[$i], 'phar://') === 0) {
+                $paths[$i] = substr($paths[$i], 7);
+                $paths[$i] = strtr($paths[$i], '/', DIRECTORY_SEPARATOR);
+            }
+            $paths[$i] = explode(DIRECTORY_SEPARATOR, $paths[$i]);
+
+            if (empty($paths[$i][0])) {
+                $paths[$i][0] = DIRECTORY_SEPARATOR;
+            }
+        }
+
+        $done = false;
+        $max  = count($paths);
+
+        while (!$done) {
+            for ($i = 0; $i < $max - 1; $i++) {
+                if (!isset($paths[$i][0]) ||
+                    !isset($paths[$i+1][0]) ||
+                    $paths[$i][0] != $paths[$i+1][0]) {
+                    $done = true;
+                    break;
+                }
+            }
+
+            if (!$done) {
+                $commonPath .= $paths[0][0];
+
+                if ($paths[0][0] != DIRECTORY_SEPARATOR) {
+                    $commonPath .= DIRECTORY_SEPARATOR;
+                }
+
+                for ($i = 0; $i < $max; $i++) {
+                    array_shift($paths[$i]);
+                }
+            }
+        }
+
+        $original = array_keys($files);
+        $max      = count($original);
+
+        for ($i = 0; $i < $max; $i++) {
+            $files[implode('/', $paths[$i])] = $files[$original[$i]];
+            unset($files[$original[$i]]);
+        }
+
+        ksort($files);
+
+        return substr($commonPath, 0, -1);
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML.php
new file mode 100644
index 00000000..80916ef3
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML.php
@@ -0,0 +1,182 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Generates an HTML report from an PHP_CodeCoverage object.
+ *
+ * @since Class available since Release 1.0.0
+ */
+class PHP_CodeCoverage_Report_HTML
+{
+    /**
+     * @var string
+     */
+    private $templatePath;
+
+    /**
+     * @var string
+     */
+    private $generator;
+
+    /**
+     * @var int
+     */
+    private $lowUpperBound;
+
+    /**
+     * @var int
+     */
+    private $highLowerBound;
+
+    /**
+     * Constructor.
+     *
+     * @param int    $lowUpperBound
+     * @param int    $highLowerBound
+     * @param string $generator
+     */
+    public function __construct($lowUpperBound = 50, $highLowerBound = 90, $generator = '')
+    {
+        $this->generator      = $generator;
+        $this->highLowerBound = $highLowerBound;
+        $this->lowUpperBound  = $lowUpperBound;
+
+        $this->templatePath = sprintf(
+            '%s%sHTML%sRenderer%sTemplate%s',
+            dirname(__FILE__),
+            DIRECTORY_SEPARATOR,
+            DIRECTORY_SEPARATOR,
+            DIRECTORY_SEPARATOR,
+            DIRECTORY_SEPARATOR
+        );
+    }
+
+    /**
+     * @param PHP_CodeCoverage $coverage
+     * @param string           $target
+     */
+    public function process(PHP_CodeCoverage $coverage, $target)
+    {
+        $target = $this->getDirectory($target);
+        $report = $coverage->getReport();
+        unset($coverage);
+
+        if (!isset($_SERVER['REQUEST_TIME'])) {
+            $_SERVER['REQUEST_TIME'] = time();
+        }
+
+        $date = date('D M j G:i:s T Y', $_SERVER['REQUEST_TIME']);
+
+        $dashboard = new PHP_CodeCoverage_Report_HTML_Renderer_Dashboard(
+            $this->templatePath,
+            $this->generator,
+            $date,
+            $this->lowUpperBound,
+            $this->highLowerBound
+        );
+
+        $directory = new PHP_CodeCoverage_Report_HTML_Renderer_Directory(
+            $this->templatePath,
+            $this->generator,
+            $date,
+            $this->lowUpperBound,
+            $this->highLowerBound
+        );
+
+        $file = new PHP_CodeCoverage_Report_HTML_Renderer_File(
+            $this->templatePath,
+            $this->generator,
+            $date,
+            $this->lowUpperBound,
+            $this->highLowerBound
+        );
+
+        $directory->render($report, $target . 'index.html');
+        $dashboard->render($report, $target . 'dashboard.html');
+
+        foreach ($report as $node) {
+            $id = $node->getId();
+
+            if ($node instanceof PHP_CodeCoverage_Report_Node_Directory) {
+                if (!file_exists($target . $id)) {
+                    mkdir($target . $id, 0777, true);
+                }
+
+                $directory->render($node, $target . $id . '/index.html');
+                $dashboard->render($node, $target . $id . '/dashboard.html');
+            } else {
+                $dir = dirname($target . $id);
+
+                if (!file_exists($dir)) {
+                    mkdir($dir, 0777, true);
+                }
+
+                $file->render($node, $target . $id . '.html');
+            }
+        }
+
+        $this->copyFiles($target);
+    }
+
+    /**
+     * @param string $target
+     */
+    private function copyFiles($target)
+    {
+        $dir = $this->getDirectory($target . 'css');
+        copy($this->templatePath . 'css/bootstrap.min.css', $dir . 'bootstrap.min.css');
+        copy($this->templatePath . 'css/nv.d3.min.css', $dir . 'nv.d3.min.css');
+        copy($this->templatePath . 'css/style.css', $dir . 'style.css');
+
+        $dir = $this->getDirectory($target . 'fonts');
+        copy($this->templatePath . 'fonts/glyphicons-halflings-regular.eot', $dir . 'glyphicons-halflings-regular.eot');
+        copy($this->templatePath . 'fonts/glyphicons-halflings-regular.svg', $dir . 'glyphicons-halflings-regular.svg');
+        copy($this->templatePath . 'fonts/glyphicons-halflings-regular.ttf', $dir . 'glyphicons-halflings-regular.ttf');
+        copy($this->templatePath . 'fonts/glyphicons-halflings-regular.woff', $dir . 'glyphicons-halflings-regular.woff');
+        copy($this->templatePath . 'fonts/glyphicons-halflings-regular.woff2', $dir . 'glyphicons-halflings-regular.woff2');
+
+        $dir = $this->getDirectory($target . 'js');
+        copy($this->templatePath . 'js/bootstrap.min.js', $dir . 'bootstrap.min.js');
+        copy($this->templatePath . 'js/d3.min.js', $dir . 'd3.min.js');
+        copy($this->templatePath . 'js/holder.min.js', $dir . 'holder.min.js');
+        copy($this->templatePath . 'js/html5shiv.min.js', $dir . 'html5shiv.min.js');
+        copy($this->templatePath . 'js/jquery.min.js', $dir . 'jquery.min.js');
+        copy($this->templatePath . 'js/nv.d3.min.js', $dir . 'nv.d3.min.js');
+        copy($this->templatePath . 'js/respond.min.js', $dir . 'respond.min.js');
+    }
+
+    /**
+     * @param  string                     $directory
+     * @return string
+     * @throws PHP_CodeCoverage_Exception
+     * @since  Method available since Release 1.2.0
+     */
+    private function getDirectory($directory)
+    {
+        if (substr($directory, -1, 1) != DIRECTORY_SEPARATOR) {
+            $directory .= DIRECTORY_SEPARATOR;
+        }
+
+        if (is_dir($directory)) {
+            return $directory;
+        }
+
+        if (@mkdir($directory, 0777, true)) {
+            return $directory;
+        }
+
+        throw new PHP_CodeCoverage_Exception(
+            sprintf(
+                'Directory "%s" does not exist.',
+                $directory
+            )
+        );
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer.php
new file mode 100644
index 00000000..f5cabffc
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer.php
@@ -0,0 +1,268 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use SebastianBergmann\Environment\Runtime;
+
+/**
+ * Base class for PHP_CodeCoverage_Report_Node renderers.
+ *
+ * @since Class available since Release 1.1.0
+ */
+abstract class PHP_CodeCoverage_Report_HTML_Renderer
+{
+    /**
+     * @var string
+     */
+    protected $templatePath;
+
+    /**
+     * @var string
+     */
+    protected $generator;
+
+    /**
+     * @var string
+     */
+    protected $date;
+
+    /**
+     * @var int
+     */
+    protected $lowUpperBound;
+
+    /**
+     * @var int
+     */
+    protected $highLowerBound;
+
+    /**
+     * @var string
+     */
+    protected $version;
+
+    /**
+     * Constructor.
+     *
+     * @param string $templatePath
+     * @param string $generator
+     * @param string $date
+     * @param int    $lowUpperBound
+     * @param int    $highLowerBound
+     */
+    public function __construct($templatePath, $generator, $date, $lowUpperBound, $highLowerBound)
+    {
+        $version = new SebastianBergmann\Version('2.2.2', dirname(dirname(dirname(dirname(__DIR__)))));
+
+        $this->templatePath   = $templatePath;
+        $this->generator      = $generator;
+        $this->date           = $date;
+        $this->lowUpperBound  = $lowUpperBound;
+        $this->highLowerBound = $highLowerBound;
+        $this->version        = $version->getVersion();
+    }
+
+    /**
+     * @param  Text_Template $template
+     * @param  array         $data
+     * @return string
+     */
+    protected function renderItemTemplate(Text_Template $template, array $data)
+    {
+        $numSeparator  = '&nbsp;/&nbsp;';
+        $classesBar    = '&nbsp;';
+        $classesLevel  = 'None';
+        $classesNumber = '&nbsp;';
+
+        if (isset($data['numClasses']) && $data['numClasses'] > 0) {
+            $classesLevel = $this->getColorLevel($data['testedClassesPercent']);
+
+            $classesNumber = $data['numTestedClasses'] . $numSeparator .
+                $data['numClasses'];
+
+            $classesBar = $this->getCoverageBar(
+                $data['testedClassesPercent']
+            );
+        }
+
+        $methodsBar    = '&nbsp;';
+        $methodsLevel  = 'None';
+        $methodsNumber = '&nbsp;';
+
+        if ($data['numMethods'] > 0) {
+            $methodsLevel = $this->getColorLevel($data['testedMethodsPercent']);
+
+            $methodsNumber = $data['numTestedMethods'] . $numSeparator .
+                $data['numMethods'];
+
+            $methodsBar = $this->getCoverageBar(
+                $data['testedMethodsPercent']
+            );
+        }
+
+        $linesBar    = '&nbsp;';
+        $linesLevel  = 'None';
+        $linesNumber = '&nbsp;';
+
+        if ($data['numExecutableLines'] > 0) {
+            $linesLevel = $this->getColorLevel($data['linesExecutedPercent']);
+
+            $linesNumber = $data['numExecutedLines'] . $numSeparator .
+                $data['numExecutableLines'];
+
+            $linesBar = $this->getCoverageBar(
+                $data['linesExecutedPercent']
+            );
+        }
+
+        $template->setVar(
+            array(
+                'icon'                   => isset($data['icon']) ? $data['icon'] : '',
+                'crap'                   => isset($data['crap']) ? $data['crap'] : '',
+                'name'                   => $data['name'],
+                'lines_bar'              => $linesBar,
+                'lines_executed_percent' => $data['linesExecutedPercentAsString'],
+                'lines_level'            => $linesLevel,
+                'lines_number'           => $linesNumber,
+                'methods_bar'            => $methodsBar,
+                'methods_tested_percent' => $data['testedMethodsPercentAsString'],
+                'methods_level'          => $methodsLevel,
+                'methods_number'         => $methodsNumber,
+                'classes_bar'            => $classesBar,
+                'classes_tested_percent' => isset($data['testedClassesPercentAsString']) ? $data['testedClassesPercentAsString'] : '',
+                'classes_level'          => $classesLevel,
+                'classes_number'         => $classesNumber
+            )
+        );
+
+        return $template->render();
+    }
+
+    /**
+     * @param Text_Template                $template
+     * @param PHP_CodeCoverage_Report_Node $node
+     */
+    protected function setCommonTemplateVariables(Text_Template $template, PHP_CodeCoverage_Report_Node $node)
+    {
+        $runtime = new Runtime;
+
+        $template->setVar(
+            array(
+                'id'               => $node->getId(),
+                'full_path'        => $node->getPath(),
+                'path_to_root'     => $this->getPathToRoot($node),
+                'breadcrumbs'      => $this->getBreadcrumbs($node),
+                'date'             => $this->date,
+                'version'          => $this->version,
+                'runtime_name'     => $runtime->getName(),
+                'runtime_version'  => $runtime->getVersion(),
+                'runtime_link'     => $runtime->getVendorUrl(),
+                'generator'        => $this->generator,
+                'low_upper_bound'  => $this->lowUpperBound,
+                'high_lower_bound' => $this->highLowerBound
+            )
+        );
+    }
+
+    protected function getBreadcrumbs(PHP_CodeCoverage_Report_Node $node)
+    {
+        $breadcrumbs = '';
+        $path        = $node->getPathAsArray();
+        $pathToRoot  = array();
+        $max         = count($path);
+
+        if ($node instanceof PHP_CodeCoverage_Report_Node_File) {
+            $max--;
+        }
+
+        for ($i = 0; $i < $max; $i++) {
+            $pathToRoot[] = str_repeat('../', $i);
+        }
+
+        foreach ($path as $step) {
+            if ($step !== $node) {
+                $breadcrumbs .= $this->getInactiveBreadcrumb(
+                    $step,
+                    array_pop($pathToRoot)
+                );
+            } else {
+                $breadcrumbs .= $this->getActiveBreadcrumb($step);
+            }
+        }
+
+        return $breadcrumbs;
+    }
+
+    protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node)
+    {
+        $buffer = sprintf(
+            '        <li class="active">%s</li>' . "\n",
+            $node->getName()
+        );
+
+        if ($node instanceof PHP_CodeCoverage_Report_Node_Directory) {
+            $buffer .= '        <li>(<a href="dashboard.html">Dashboard</a>)</li>' . "\n";
+        }
+
+        return $buffer;
+    }
+
+    protected function getInactiveBreadcrumb(PHP_CodeCoverage_Report_Node $node, $pathToRoot)
+    {
+        return sprintf(
+            '        <li><a href="%sindex.html">%s</a></li>' . "\n",
+            $pathToRoot,
+            $node->getName()
+        );
+    }
+
+    protected function getPathToRoot(PHP_CodeCoverage_Report_Node $node)
+    {
+        $id    = $node->getId();
+        $depth = substr_count($id, '/');
+
+        if ($id != 'index' &&
+            $node instanceof PHP_CodeCoverage_Report_Node_Directory) {
+            $depth++;
+        }
+
+        return str_repeat('../', $depth);
+    }
+
+    protected function getCoverageBar($percent)
+    {
+        $level = $this->getColorLevel($percent);
+
+        $template = new Text_Template(
+            $this->templatePath . 'coverage_bar.html',
+            '{{',
+            '}}'
+        );
+
+        $template->setVar(array('level' => $level, 'percent' => sprintf('%.2F', $percent)));
+
+        return $template->render();
+    }
+
+    /**
+     * @param  int    $percent
+     * @return string
+     */
+    protected function getColorLevel($percent)
+    {
+        if ($percent <= $this->lowUpperBound) {
+            return 'danger';
+        } elseif ($percent > $this->lowUpperBound &&
+            $percent <  $this->highLowerBound) {
+            return 'warning';
+        } else {
+            return 'success';
+        }
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php
new file mode 100644
index 00000000..a29b7f3d
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php
@@ -0,0 +1,295 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Renders the dashboard for a PHP_CodeCoverage_Report_Node_Directory node.
+ *
+ * @since Class available since Release 1.1.0
+ */
+class PHP_CodeCoverage_Report_HTML_Renderer_Dashboard extends PHP_CodeCoverage_Report_HTML_Renderer
+{
+    /**
+     * @param PHP_CodeCoverage_Report_Node_Directory $node
+     * @param string                                 $file
+     */
+    public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
+    {
+        $classes  = $node->getClassesAndTraits();
+        $template = new Text_Template(
+            $this->templatePath . 'dashboard.html',
+            '{{',
+            '}}'
+        );
+
+        $this->setCommonTemplateVariables($template, $node);
+
+        $baseLink             = $node->getId() . '/';
+        $complexity           = $this->complexity($classes, $baseLink);
+        $coverageDistribution = $this->coverageDistribution($classes);
+        $insufficientCoverage = $this->insufficientCoverage($classes, $baseLink);
+        $projectRisks         = $this->projectRisks($classes, $baseLink);
+
+        $template->setVar(
+            array(
+                'insufficient_coverage_classes' => $insufficientCoverage['class'],
+                'insufficient_coverage_methods' => $insufficientCoverage['method'],
+                'project_risks_classes'         => $projectRisks['class'],
+                'project_risks_methods'         => $projectRisks['method'],
+                'complexity_class'              => $complexity['class'],
+                'complexity_method'             => $complexity['method'],
+                'class_coverage_distribution'   => $coverageDistribution['class'],
+                'method_coverage_distribution'  => $coverageDistribution['method']
+            )
+        );
+
+        $template->renderTo($file);
+    }
+
+    /**
+     * Returns the data for the Class/Method Complexity charts.
+     *
+     * @param  array  $classes
+     * @param  string $baseLink
+     * @return array
+     */
+    protected function complexity(array $classes, $baseLink)
+    {
+        $result = array('class' => array(), 'method' => array());
+
+        foreach ($classes as $className => $class) {
+            foreach ($class['methods'] as $methodName => $method) {
+                if ($className != '*') {
+                    $methodName = $className . '::' . $methodName;
+                }
+
+                $result['method'][] = array(
+                    $method['coverage'],
+                    $method['ccn'],
+                    sprintf(
+                        '<a href="%s">%s</a>',
+                        str_replace($baseLink, '', $method['link']),
+                        $methodName
+                    )
+                );
+            }
+
+            $result['class'][] = array(
+                $class['coverage'],
+                $class['ccn'],
+                sprintf(
+                    '<a href="%s">%s</a>',
+                    str_replace($baseLink, '', $class['link']),
+                    $className
+                )
+            );
+        }
+
+        return array(
+            'class'  => json_encode($result['class']),
+            'method' => json_encode($result['method'])
+        );
+    }
+
+    /**
+     * Returns the data for the Class / Method Coverage Distribution chart.
+     *
+     * @param  array $classes
+     * @return array
+     */
+    protected function coverageDistribution(array $classes)
+    {
+        $result = array(
+            'class' => array(
+                '0%'      => 0,
+                '0-10%'   => 0,
+                '10-20%'  => 0,
+                '20-30%'  => 0,
+                '30-40%'  => 0,
+                '40-50%'  => 0,
+                '50-60%'  => 0,
+                '60-70%'  => 0,
+                '70-80%'  => 0,
+                '80-90%'  => 0,
+                '90-100%' => 0,
+                '100%'    => 0
+            ),
+            'method' => array(
+                '0%'      => 0,
+                '0-10%'   => 0,
+                '10-20%'  => 0,
+                '20-30%'  => 0,
+                '30-40%'  => 0,
+                '40-50%'  => 0,
+                '50-60%'  => 0,
+                '60-70%'  => 0,
+                '70-80%'  => 0,
+                '80-90%'  => 0,
+                '90-100%' => 0,
+                '100%'    => 0
+            )
+        );
+
+        foreach ($classes as $class) {
+            foreach ($class['methods'] as $methodName => $method) {
+                if ($method['coverage'] == 0) {
+                    $result['method']['0%']++;
+                } elseif ($method['coverage'] == 100) {
+                    $result['method']['100%']++;
+                } else {
+                    $key = floor($method['coverage'] / 10) * 10;
+                    $key = $key . '-' . ($key + 10) . '%';
+                    $result['method'][$key]++;
+                }
+            }
+
+            if ($class['coverage'] == 0) {
+                $result['class']['0%']++;
+            } elseif ($class['coverage'] == 100) {
+                $result['class']['100%']++;
+            } else {
+                $key = floor($class['coverage'] / 10) * 10;
+                $key = $key . '-' . ($key + 10) . '%';
+                $result['class'][$key]++;
+            }
+        }
+
+        return array(
+            'class'  => json_encode(array_values($result['class'])),
+            'method' => json_encode(array_values($result['method']))
+        );
+    }
+
+    /**
+     * Returns the classes / methods with insufficient coverage.
+     *
+     * @param  array  $classes
+     * @param  string $baseLink
+     * @return array
+     */
+    protected function insufficientCoverage(array $classes, $baseLink)
+    {
+        $leastTestedClasses = array();
+        $leastTestedMethods = array();
+        $result             = array('class' => '', 'method' => '');
+
+        foreach ($classes as $className => $class) {
+            foreach ($class['methods'] as $methodName => $method) {
+                if ($method['coverage'] < $this->highLowerBound) {
+                    if ($className != '*') {
+                        $key = $className . '::' . $methodName;
+                    } else {
+                        $key = $methodName;
+                    }
+
+                    $leastTestedMethods[$key] = $method['coverage'];
+                }
+            }
+
+            if ($class['coverage'] < $this->highLowerBound) {
+                $leastTestedClasses[$className] = $class['coverage'];
+            }
+        }
+
+        asort($leastTestedClasses);
+        asort($leastTestedMethods);
+
+        foreach ($leastTestedClasses as $className => $coverage) {
+            $result['class'] .= sprintf(
+                '       <tr><td><a href="%s">%s</a></td><td class="text-right">%d%%</td></tr>' . "\n",
+                str_replace($baseLink, '', $classes[$className]['link']),
+                $className,
+                $coverage
+            );
+        }
+
+        foreach ($leastTestedMethods as $methodName => $coverage) {
+            list($class, $method) = explode('::', $methodName);
+
+            $result['method'] .= sprintf(
+                '       <tr><td><a href="%s"><abbr title="%s">%s</a></a></td><td class="text-right">%d%%</td></tr>' . "\n",
+                str_replace($baseLink, '', $classes[$class]['methods'][$method]['link']),
+                $methodName,
+                $method,
+                $coverage
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the project risks according to the CRAP index.
+     *
+     * @param  array  $classes
+     * @param  string $baseLink
+     * @return array
+     */
+    protected function projectRisks(array $classes, $baseLink)
+    {
+        $classRisks  = array();
+        $methodRisks = array();
+        $result      = array('class' => '', 'method' => '');
+
+        foreach ($classes as $className => $class) {
+            foreach ($class['methods'] as $methodName => $method) {
+                if ($method['coverage'] < $this->highLowerBound &&
+                    $method['ccn'] > 1) {
+                    if ($className != '*') {
+                        $key = $className . '::' . $methodName;
+                    } else {
+                        $key = $methodName;
+                    }
+
+                    $methodRisks[$key] = $method['crap'];
+                }
+            }
+
+            if ($class['coverage'] < $this->highLowerBound &&
+                $class['ccn'] > count($class['methods'])) {
+                $classRisks[$className] = $class['crap'];
+            }
+        }
+
+        arsort($classRisks);
+        arsort($methodRisks);
+
+        foreach ($classRisks as $className => $crap) {
+            $result['class'] .= sprintf(
+                '       <tr><td><a href="%s">%s</a></td><td class="text-right">%d</td></tr>' . "\n",
+                str_replace($baseLink, '', $classes[$className]['link']),
+                $className,
+                $crap
+            );
+        }
+
+        foreach ($methodRisks as $methodName => $crap) {
+            list($class, $method) = explode('::', $methodName);
+
+            $result['method'] .= sprintf(
+                '       <tr><td><a href="%s"><abbr title="%s">%s</abbr></a></td><td class="text-right">%d</td></tr>' . "\n",
+                str_replace($baseLink, '', $classes[$class]['methods'][$method]['link']),
+                $methodName,
+                $method,
+                $crap
+            );
+        }
+
+        return $result;
+    }
+
+    protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node)
+    {
+        return sprintf(
+            '        <li><a href="index.html">%s</a></li>' . "\n" .
+            '        <li class="active">(Dashboard)</li>' . "\n",
+            $node->getName()
+        );
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Directory.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Directory.php
new file mode 100644
index 00000000..4415c520
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Directory.php
@@ -0,0 +1,97 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Renders a PHP_CodeCoverage_Report_Node_Directory node.
+ *
+ * @since Class available since Release 1.1.0
+ */
+class PHP_CodeCoverage_Report_HTML_Renderer_Directory extends PHP_CodeCoverage_Report_HTML_Renderer
+{
+    /**
+     * @param PHP_CodeCoverage_Report_Node_Directory $node
+     * @param string                                 $file
+     */
+    public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
+    {
+        $template = new Text_Template($this->templatePath . 'directory.html', '{{', '}}');
+
+        $this->setCommonTemplateVariables($template, $node);
+
+        $items = $this->renderItem($node, true);
+
+        foreach ($node->getDirectories() as $item) {
+            $items .= $this->renderItem($item);
+        }
+
+        foreach ($node->getFiles() as $item) {
+            $items .= $this->renderItem($item);
+        }
+
+        $template->setVar(
+            array(
+                'id'    => $node->getId(),
+                'items' => $items
+            )
+        );
+
+        $template->renderTo($file);
+    }
+
+    /**
+     * @param  PHP_CodeCoverage_Report_Node $item
+     * @param  bool                         $total
+     * @return string
+     */
+    protected function renderItem(PHP_CodeCoverage_Report_Node $item, $total = false)
+    {
+        $data = array(
+            'numClasses'                   => $item->getNumClassesAndTraits(),
+            'numTestedClasses'             => $item->getNumTestedClassesAndTraits(),
+            'numMethods'                   => $item->getNumMethods(),
+            'numTestedMethods'             => $item->getNumTestedMethods(),
+            'linesExecutedPercent'         => $item->getLineExecutedPercent(false),
+            'linesExecutedPercentAsString' => $item->getLineExecutedPercent(),
+            'numExecutedLines'             => $item->getNumExecutedLines(),
+            'numExecutableLines'           => $item->getNumExecutableLines(),
+            'testedMethodsPercent'         => $item->getTestedMethodsPercent(false),
+            'testedMethodsPercentAsString' => $item->getTestedMethodsPercent(),
+            'testedClassesPercent'         => $item->getTestedClassesAndTraitsPercent(false),
+            'testedClassesPercentAsString' => $item->getTestedClassesAndTraitsPercent()
+        );
+
+        if ($total) {
+            $data['name'] = 'Total';
+        } else {
+            if ($item instanceof PHP_CodeCoverage_Report_Node_Directory) {
+                $data['name'] = sprintf(
+                    '<a href="%s/index.html">%s</a>',
+                    $item->getName(),
+                    $item->getName()
+                );
+
+                $data['icon'] = '<span class="glyphicon glyphicon-folder-open"></span> ';
+            } else {
+                $data['name'] = sprintf(
+                    '<a href="%s.html">%s</a>',
+                    $item->getName(),
+                    $item->getName()
+                );
+
+                $data['icon'] = '<span class="glyphicon glyphicon-file"></span> ';
+            }
+        }
+
+        return $this->renderItemTemplate(
+            new Text_Template($this->templatePath . 'directory_item.html', '{{', '}}'),
+            $data
+        );
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/File.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/File.php
new file mode 100644
index 00000000..d52345d5
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/File.php
@@ -0,0 +1,556 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// @codeCoverageIgnoreStart
+if (!defined('T_TRAIT')) {
+    define('T_TRAIT', 1001);
+}
+
+if (!defined('T_INSTEADOF')) {
+    define('T_INSTEADOF', 1002);
+}
+
+if (!defined('T_CALLABLE')) {
+    define('T_CALLABLE', 1003);
+}
+
+if (!defined('T_FINALLY')) {
+    define('T_FINALLY', 1004);
+}
+
+if (!defined('T_YIELD')) {
+    define('T_YIELD', 1005);
+}
+// @codeCoverageIgnoreEnd
+
+/**
+ * Renders a PHP_CodeCoverage_Report_Node_File node.
+ *
+ * @since Class available since Release 1.1.0
+ */
+class PHP_CodeCoverage_Report_HTML_Renderer_File extends PHP_CodeCoverage_Report_HTML_Renderer
+{
+    /**
+     * @var int
+     */
+    private $htmlspecialcharsFlags;
+
+    /**
+     * Constructor.
+     *
+     * @param string $templatePath
+     * @param string $generator
+     * @param string $date
+     * @param int    $lowUpperBound
+     * @param int    $highLowerBound
+     */
+    public function __construct($templatePath, $generator, $date, $lowUpperBound, $highLowerBound)
+    {
+        parent::__construct(
+            $templatePath,
+            $generator,
+            $date,
+            $lowUpperBound,
+            $highLowerBound
+        );
+
+        $this->htmlspecialcharsFlags = ENT_COMPAT;
+
+        if (PHP_VERSION_ID >= 50400 && defined('ENT_SUBSTITUTE')) {
+            $this->htmlspecialcharsFlags = $this->htmlspecialcharsFlags | ENT_HTML401 | ENT_SUBSTITUTE;
+        }
+    }
+
+    /**
+     * @param PHP_CodeCoverage_Report_Node_File $node
+     * @param string                            $file
+     */
+    public function render(PHP_CodeCoverage_Report_Node_File $node, $file)
+    {
+        $template = new Text_Template($this->templatePath . 'file.html', '{{', '}}');
+
+        $template->setVar(
+            array(
+                'items' => $this->renderItems($node),
+                'lines' => $this->renderSource($node)
+            )
+        );
+
+        $this->setCommonTemplateVariables($template, $node);
+
+        $template->renderTo($file);
+    }
+
+    /**
+     * @param  PHP_CodeCoverage_Report_Node_File $node
+     * @return string
+     */
+    protected function renderItems(PHP_CodeCoverage_Report_Node_File $node)
+    {
+        $template = new Text_Template($this->templatePath . 'file_item.html', '{{', '}}');
+
+        $methodItemTemplate = new Text_Template(
+            $this->templatePath . 'method_item.html',
+            '{{',
+            '}}'
+        );
+
+        $items = $this->renderItemTemplate(
+            $template,
+            array(
+                'name'                         => 'Total',
+                'numClasses'                   => $node->getNumClassesAndTraits(),
+                'numTestedClasses'             => $node->getNumTestedClassesAndTraits(),
+                'numMethods'                   => $node->getNumMethods(),
+                'numTestedMethods'             => $node->getNumTestedMethods(),
+                'linesExecutedPercent'         => $node->getLineExecutedPercent(false),
+                'linesExecutedPercentAsString' => $node->getLineExecutedPercent(),
+                'numExecutedLines'             => $node->getNumExecutedLines(),
+                'numExecutableLines'           => $node->getNumExecutableLines(),
+                'testedMethodsPercent'         => $node->getTestedMethodsPercent(false),
+                'testedMethodsPercentAsString' => $node->getTestedMethodsPercent(),
+                'testedClassesPercent'         => $node->getTestedClassesAndTraitsPercent(false),
+                'testedClassesPercentAsString' => $node->getTestedClassesAndTraitsPercent(),
+                'crap'                         => '<abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr>'
+            )
+        );
+
+        $items .= $this->renderFunctionItems(
+            $node->getFunctions(),
+            $methodItemTemplate
+        );
+
+        $items .= $this->renderTraitOrClassItems(
+            $node->getTraits(),
+            $template,
+            $methodItemTemplate
+        );
+
+        $items .= $this->renderTraitOrClassItems(
+            $node->getClasses(),
+            $template,
+            $methodItemTemplate
+        );
+
+        return $items;
+    }
+
+    /**
+     * @param  array         $items
+     * @param  Text_Template $template
+     * @param  Text_Template $methodItemTemplate
+     * @return string
+     */
+    protected function renderTraitOrClassItems(array $items, Text_Template $template, Text_Template $methodItemTemplate)
+    {
+        if (empty($items)) {
+            return '';
+        }
+
+        $buffer = '';
+
+        foreach ($items as $name => $item) {
+            $numMethods       = count($item['methods']);
+            $numTestedMethods = 0;
+
+            foreach ($item['methods'] as $method) {
+                if ($method['executedLines'] == $method['executableLines']) {
+                    $numTestedMethods++;
+                }
+            }
+
+            $buffer .= $this->renderItemTemplate(
+                $template,
+                array(
+                    'name'                         => $name,
+                    'numClasses'                   => 1,
+                    'numTestedClasses'             => $numTestedMethods == $numMethods ? 1 : 0,
+                    'numMethods'                   => $numMethods,
+                    'numTestedMethods'             => $numTestedMethods,
+                    'linesExecutedPercent'         => PHP_CodeCoverage_Util::percent(
+                        $item['executedLines'],
+                        $item['executableLines'],
+                        false
+                    ),
+                    'linesExecutedPercentAsString' => PHP_CodeCoverage_Util::percent(
+                        $item['executedLines'],
+                        $item['executableLines'],
+                        true
+                    ),
+                    'numExecutedLines'             => $item['executedLines'],
+                    'numExecutableLines'           => $item['executableLines'],
+                    'testedMethodsPercent'         => PHP_CodeCoverage_Util::percent(
+                        $numTestedMethods,
+                        $numMethods,
+                        false
+                    ),
+                    'testedMethodsPercentAsString' => PHP_CodeCoverage_Util::percent(
+                        $numTestedMethods,
+                        $numMethods,
+                        true
+                    ),
+                    'testedClassesPercent'         => PHP_CodeCoverage_Util::percent(
+                        $numTestedMethods == $numMethods ? 1 : 0,
+                        1,
+                        false
+                    ),
+                    'testedClassesPercentAsString' => PHP_CodeCoverage_Util::percent(
+                        $numTestedMethods == $numMethods ? 1 : 0,
+                        1,
+                        true
+                    ),
+                    'crap'                         => $item['crap']
+                )
+            );
+
+            foreach ($item['methods'] as $method) {
+                $buffer .= $this->renderFunctionOrMethodItem(
+                    $methodItemTemplate,
+                    $method,
+                    '&nbsp;'
+                );
+            }
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * @param  array         $functions
+     * @param  Text_Template $template
+     * @return string
+     */
+    protected function renderFunctionItems(array $functions, Text_Template $template)
+    {
+        if (empty($functions)) {
+            return '';
+        }
+
+        $buffer = '';
+
+        foreach ($functions as $function) {
+            $buffer .= $this->renderFunctionOrMethodItem(
+                $template,
+                $function
+            );
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * @param  Text_Template $template
+     * @return string
+     */
+    protected function renderFunctionOrMethodItem(Text_Template $template, array $item, $indent = '')
+    {
+        $numTestedItems = $item['executedLines'] == $item['executableLines'] ? 1 : 0;
+
+        return $this->renderItemTemplate(
+            $template,
+            array(
+                'name'                         => sprintf(
+                    '%s<a href="#%d"><abbr title="%s">%s</abbr></a>',
+                    $indent,
+                    $item['startLine'],
+                    htmlspecialchars($item['signature']),
+                    isset($item['functionName']) ? $item['functionName'] : $item['methodName']
+                ),
+                'numMethods'                   => 1,
+                'numTestedMethods'             => $numTestedItems,
+                'linesExecutedPercent'         => PHP_CodeCoverage_Util::percent(
+                    $item['executedLines'],
+                    $item['executableLines'],
+                    false
+                ),
+                'linesExecutedPercentAsString' => PHP_CodeCoverage_Util::percent(
+                    $item['executedLines'],
+                    $item['executableLines'],
+                    true
+                ),
+                'numExecutedLines'             => $item['executedLines'],
+                'numExecutableLines'           => $item['executableLines'],
+                'testedMethodsPercent'         => PHP_CodeCoverage_Util::percent(
+                    $numTestedItems,
+                    1,
+                    false
+                ),
+                'testedMethodsPercentAsString' => PHP_CodeCoverage_Util::percent(
+                    $numTestedItems,
+                    1,
+                    true
+                ),
+                'crap'                         => $item['crap']
+            )
+        );
+    }
+
+    /**
+     * @param  PHP_CodeCoverage_Report_Node_File $node
+     * @return string
+     */
+    protected function renderSource(PHP_CodeCoverage_Report_Node_File $node)
+    {
+        $coverageData = $node->getCoverageData();
+        $testData     = $node->getTestData();
+        $codeLines    = $this->loadFile($node->getPath());
+        $lines        = '';
+        $i            = 1;
+
+        foreach ($codeLines as $line) {
+            $trClass        = '';
+            $popoverContent = '';
+            $popoverTitle   = '';
+
+            if (array_key_exists($i, $coverageData)) {
+                $numTests = count($coverageData[$i]);
+
+                if ($coverageData[$i] === null) {
+                    $trClass = ' class="warning"';
+                } elseif ($numTests == 0) {
+                    $trClass = ' class="danger"';
+                } else {
+                    $lineCss        = 'covered-by-large-tests';
+                    $popoverContent = '<ul>';
+
+                    if ($numTests > 1) {
+                        $popoverTitle = $numTests . ' tests cover line ' . $i;
+                    } else {
+                        $popoverTitle = '1 test covers line ' . $i;
+                    }
+
+                    foreach ($coverageData[$i] as $test) {
+                        if ($lineCss == 'covered-by-large-tests' && $testData[$test]['size'] == 'medium') {
+                            $lineCss = 'covered-by-medium-tests';
+                        } elseif ($testData[$test]['size'] == 'small') {
+                            $lineCss = 'covered-by-small-tests';
+                        }
+
+                        switch ($testData[$test]['status']) {
+                            case 0:
+                                switch ($testData[$test]['size']) {
+                                    case 'small':
+                                        $testCSS = ' class="covered-by-small-tests"';
+                                        break;
+
+                                    case 'medium':
+                                        $testCSS = ' class="covered-by-medium-tests"';
+                                        break;
+
+                                    default:
+                                        $testCSS = ' class="covered-by-large-tests"';
+                                        break;
+                                }
+                                break;
+
+                            case 1:
+                            case 2:
+                                $testCSS = ' class="warning"';
+                                break;
+
+                            case 3:
+                                $testCSS = ' class="danger"';
+                                break;
+
+                            case 4:
+                                $testCSS = ' class="danger"';
+                                break;
+
+                            default:
+                                $testCSS = '';
+                        }
+
+                        $popoverContent .= sprintf(
+                            '<li%s>%s</li>',
+                            $testCSS,
+                            htmlspecialchars($test)
+                        );
+                    }
+
+                    $popoverContent .= '</ul>';
+                    $trClass         = ' class="' . $lineCss . ' popin"';
+                }
+            }
+
+            if (!empty($popoverTitle)) {
+                $popover = sprintf(
+                    ' data-title="%s" data-content="%s" data-placement="bottom" data-html="true"',
+                    $popoverTitle,
+                    htmlspecialchars($popoverContent)
+                );
+            } else {
+                $popover = '';
+            }
+
+            $lines .= sprintf(
+                '     <tr%s%s><td><div align="right"><a name="%d"></a><a href="#%d">%d</a></div></td><td class="codeLine">%s</td></tr>' . "\n",
+                $trClass,
+                $popover,
+                $i,
+                $i,
+                $i,
+                $line
+            );
+
+            $i++;
+        }
+
+        return $lines;
+    }
+
+    /**
+     * @param  string $file
+     * @return array
+     */
+    protected function loadFile($file)
+    {
+        $buffer              = file_get_contents($file);
+        $tokens              = token_get_all($buffer);
+        $result              = array('');
+        $i                   = 0;
+        $stringFlag          = false;
+        $fileEndsWithNewLine = substr($buffer, -1) == "\n";
+
+        unset($buffer);
+
+        foreach ($tokens as $j => $token) {
+            if (is_string($token)) {
+                if ($token === '"' && $tokens[$j - 1] !== '\\') {
+                    $result[$i] .= sprintf(
+                        '<span class="string">%s</span>',
+                        htmlspecialchars($token)
+                    );
+
+                    $stringFlag = !$stringFlag;
+                } else {
+                    $result[$i] .= sprintf(
+                        '<span class="keyword">%s</span>',
+                        htmlspecialchars($token)
+                    );
+                }
+
+                continue;
+            }
+
+            list($token, $value) = $token;
+
+            $value = str_replace(
+                array("\t", ' '),
+                array('&nbsp;&nbsp;&nbsp;&nbsp;', '&nbsp;'),
+                htmlspecialchars($value, $this->htmlspecialcharsFlags)
+            );
+
+            if ($value === "\n") {
+                $result[++$i] = '';
+            } else {
+                $lines = explode("\n", $value);
+
+                foreach ($lines as $jj => $line) {
+                    $line = trim($line);
+
+                    if ($line !== '') {
+                        if ($stringFlag) {
+                            $colour = 'string';
+                        } else {
+                            switch ($token) {
+                                case T_INLINE_HTML:
+                                    $colour = 'html';
+                                    break;
+
+                                case T_COMMENT:
+                                case T_DOC_COMMENT:
+                                    $colour = 'comment';
+                                    break;
+
+                                case T_ABSTRACT:
+                                case T_ARRAY:
+                                case T_AS:
+                                case T_BREAK:
+                                case T_CALLABLE:
+                                case T_CASE:
+                                case T_CATCH:
+                                case T_CLASS:
+                                case T_CLONE:
+                                case T_CONTINUE:
+                                case T_DEFAULT:
+                                case T_ECHO:
+                                case T_ELSE:
+                                case T_ELSEIF:
+                                case T_EMPTY:
+                                case T_ENDDECLARE:
+                                case T_ENDFOR:
+                                case T_ENDFOREACH:
+                                case T_ENDIF:
+                                case T_ENDSWITCH:
+                                case T_ENDWHILE:
+                                case T_EXIT:
+                                case T_EXTENDS:
+                                case T_FINAL:
+                                case T_FINALLY:
+                                case T_FOREACH:
+                                case T_FUNCTION:
+                                case T_GLOBAL:
+                                case T_IF:
+                                case T_IMPLEMENTS:
+                                case T_INCLUDE:
+                                case T_INCLUDE_ONCE:
+                                case T_INSTANCEOF:
+                                case T_INSTEADOF:
+                                case T_INTERFACE:
+                                case T_ISSET:
+                                case T_LOGICAL_AND:
+                                case T_LOGICAL_OR:
+                                case T_LOGICAL_XOR:
+                                case T_NAMESPACE:
+                                case T_NEW:
+                                case T_PRIVATE:
+                                case T_PROTECTED:
+                                case T_PUBLIC:
+                                case T_REQUIRE:
+                                case T_REQUIRE_ONCE:
+                                case T_RETURN:
+                                case T_STATIC:
+                                case T_THROW:
+                                case T_TRAIT:
+                                case T_TRY:
+                                case T_UNSET:
+                                case T_USE:
+                                case T_VAR:
+                                case T_WHILE:
+                                case T_YIELD:
+                                    $colour = 'keyword';
+                                    break;
+
+                                default:
+                                    $colour = 'default';
+                            }
+                        }
+
+                        $result[$i] .= sprintf(
+                            '<span class="%s">%s</span>',
+                            $colour,
+                            $line
+                        );
+                    }
+
+                    if (isset($lines[$jj + 1])) {
+                        $result[++$i] = '';
+                    }
+                }
+            }
+        }
+
+        if ($fileEndsWithNewLine) {
+            unset($result[count($result)-1]);
+        }
+
+        return $result;
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist
new file mode 100644
index 00000000..5a09c354
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist
@@ -0,0 +1,5 @@
+       <div class="progress">
+         <div class="progress-bar progress-bar-{{level}}" role="progressbar" aria-valuenow="{{percent}}" aria-valuemin="0" aria-valuemax="100" style="width: {{percent}}%">
+           <span class="sr-only">{{percent}}% covered ({{level}})</span>
+         </div>
+       </div>
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap.min.css b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap.min.css
new file mode 100644
index 00000000..cd1c616a
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap.min.css
@@ -0,0 +1,5 @@
+/*!
+ * Bootstrap v3.3.4 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ *//*! normalize.css v3.0.2 | MIT License | git.io/normalize */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px \9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.form-group-sm .form-control{height:30px;line-height:30px}select[multiple].form-group-sm .form-control,textarea.form-group-sm .form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:5px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.form-group-lg .form-control{height:46px;line-height:46px}select[multiple].form-group-lg .form-control,textarea.form-group-lg .form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:10px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.33px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.active,.btn-default.focus,.btn-default:active,.btn-default:focus,.btn-default:hover,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.active,.btn-primary.focus,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.active,.btn-success.focus,.btn-success:active,.btn-success:focus,.btn-success:hover,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.active,.btn-info.focus,.btn-info:active,.btn-info:focus,.btn-info:hover,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.active,.btn-warning.focus,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.active,.btn-danger.focus,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px solid}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px)and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px 15px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding:48px 0}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-weight:400;line-height:1.4;filter:alpha(opacity=0);opacity:0}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-weight:400;line-height:1.42857143;text-align:left;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000;perspective:1000}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;margin-top:-10px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px)and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px)and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px)and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px)and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px)and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px)and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px)and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px)and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px)and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px)and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/nv.d3.min.css b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/nv.d3.min.css
new file mode 100644
index 00000000..7a6f7fe9
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/nv.d3.min.css
@@ -0,0 +1 @@
+.nvd3 .nv-axis{pointer-events:none;opacity:1}.nvd3 .nv-axis path{fill:none;stroke:#000;stroke-opacity:.75;shape-rendering:crispEdges}.nvd3 .nv-axis path.domain{stroke-opacity:.75}.nvd3 .nv-axis.nv-x path.domain{stroke-opacity:0}.nvd3 .nv-axis line{fill:none;stroke:#e5e5e5;shape-rendering:crispEdges}.nvd3 .nv-axis .zero line,.nvd3 .nv-axis line.zero{stroke-opacity:.75}.nvd3 .nv-axis .nv-axisMaxMin text{font-weight:700}.nvd3 .x .nv-axis .nv-axisMaxMin text,.nvd3 .x2 .nv-axis .nv-axisMaxMin text,.nvd3 .x3 .nv-axis .nv-axisMaxMin text{text-anchor:middle}.nvd3 .nv-axis.nv-disabled{opacity:0}.nvd3 .nv-bars rect{fill-opacity:.75;transition:fill-opacity 250ms linear;-moz-transition:fill-opacity 250ms linear;-webkit-transition:fill-opacity 250ms linear}.nvd3 .nv-bars rect.hover{fill-opacity:1}.nvd3 .nv-bars .hover rect{fill:#add8e6}.nvd3 .nv-bars text{fill:rgba(0,0,0,0)}.nvd3 .nv-bars .hover text{fill:rgba(0,0,0,1)}.nvd3 .nv-multibar .nv-groups rect,.nvd3 .nv-multibarHorizontal .nv-groups rect,.nvd3 .nv-discretebar .nv-groups rect{stroke-opacity:0;transition:fill-opacity 250ms linear;-moz-transition:fill-opacity 250ms linear;-webkit-transition:fill-opacity 250ms linear}.nvd3 .nv-multibar .nv-groups rect:hover,.nvd3 .nv-multibarHorizontal .nv-groups rect:hover,.nvd3 .nv-candlestickBar .nv-ticks rect:hover,.nvd3 .nv-discretebar .nv-groups rect:hover{fill-opacity:1}.nvd3 .nv-discretebar .nv-groups text,.nvd3 .nv-multibarHorizontal .nv-groups text{font-weight:700;fill:rgba(0,0,0,1);stroke:rgba(0,0,0,0)}.nvd3 .nv-boxplot circle{fill-opacity:.5}.nvd3 .nv-boxplot circle:hover{fill-opacity:1}.nvd3 .nv-boxplot rect:hover{fill-opacity:1}.nvd3 line.nv-boxplot-median{stroke:#000}.nv-boxplot-tick:hover{stroke-width:2.5px}.nvd3.nv-bullet{font:10px sans-serif}.nvd3.nv-bullet .nv-measure{fill-opacity:.8}.nvd3.nv-bullet .nv-measure:hover{fill-opacity:1}.nvd3.nv-bullet .nv-marker{stroke:#000;stroke-width:2px}.nvd3.nv-bullet .nv-markerTriangle{stroke:#000;fill:#fff;stroke-width:1.5px}.nvd3.nv-bullet .nv-tick line{stroke:#666;stroke-width:.5px}.nvd3.nv-bullet .nv-range.nv-s0{fill:#eee}.nvd3.nv-bullet .nv-range.nv-s1{fill:#ddd}.nvd3.nv-bullet .nv-range.nv-s2{fill:#ccc}.nvd3.nv-bullet .nv-title{font-size:14px;font-weight:700}.nvd3.nv-bullet .nv-subtitle{fill:#999}.nvd3.nv-bullet .nv-range{fill:#bababa;fill-opacity:.4}.nvd3.nv-bullet .nv-range:hover{fill-opacity:.7}.nvd3.nv-candlestickBar .nv-ticks .nv-tick{stroke-width:1px}.nvd3.nv-candlestickBar .nv-ticks .nv-tick.hover{stroke-width:2px}.nvd3.nv-candlestickBar .nv-ticks .nv-tick.positive rect{stroke:#2ca02c;fill:#2ca02c}.nvd3.nv-candlestickBar .nv-ticks .nv-tick.negative rect{stroke:#d62728;fill:#d62728}.with-transitions .nv-candlestickBar .nv-ticks .nv-tick{transition:stroke-width 250ms linear,stroke-opacity 250ms linear;-moz-transition:stroke-width 250ms linear,stroke-opacity 250ms linear;-webkit-transition:stroke-width 250ms linear,stroke-opacity 250ms linear}.nvd3.nv-candlestickBar .nv-ticks line{stroke:#333}.nvd3 .nv-legend .nv-disabled rect{}.nvd3 .nv-check-box .nv-box{fill-opacity:0;stroke-width:2}.nvd3 .nv-check-box .nv-check{fill-opacity:0;stroke-width:4}.nvd3 .nv-series.nv-disabled .nv-check-box .nv-check{fill-opacity:0;stroke-opacity:0}.nvd3 .nv-controlsWrap .nv-legend .nv-check-box .nv-check{opacity:0}.nvd3.nv-linePlusBar .nv-bar rect{fill-opacity:.75}.nvd3.nv-linePlusBar .nv-bar rect:hover{fill-opacity:1}.nvd3 .nv-groups path.nv-line{fill:none}.nvd3 .nv-groups path.nv-area{stroke:none}.nvd3.nv-line .nvd3.nv-scatter .nv-groups .nv-point{fill-opacity:0;stroke-opacity:0}.nvd3.nv-scatter.nv-single-point .nv-groups .nv-point{fill-opacity:.5!important;stroke-opacity:.5!important}.with-transitions .nvd3 .nv-groups .nv-point{transition:stroke-width 250ms linear,stroke-opacity 250ms linear;-moz-transition:stroke-width 250ms linear,stroke-opacity 250ms linear;-webkit-transition:stroke-width 250ms linear,stroke-opacity 250ms linear}.nvd3.nv-scatter .nv-groups .nv-point.hover,.nvd3 .nv-groups .nv-point.hover{stroke-width:7px;fill-opacity:.95!important;stroke-opacity:.95!important}.nvd3 .nv-point-paths path{stroke:#aaa;stroke-opacity:0;fill:#eee;fill-opacity:0}.nvd3 .nv-indexLine{cursor:ew-resize}svg.nvd3-svg{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-ms-user-select:none;-moz-user-select:none;user-select:none;display:block;width:100%;height:100%}.nvtooltip.with-3d-shadow,.with-3d-shadow .nvtooltip{-moz-box-shadow:0 5px 10px rgba(0,0,0,.2);-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nvd3 text{font:400 12px Arial}.nvd3 .title{font:700 14px Arial}.nvd3 .nv-background{fill:#fff;fill-opacity:0}.nvd3.nv-noData{font-size:18px;font-weight:700}.nv-brush .extent{fill-opacity:.125;shape-rendering:crispEdges}.nv-brush .resize path{fill:#eee;stroke:#666}.nvd3 .nv-legend .nv-series{cursor:pointer}.nvd3 .nv-legend .nv-disabled circle{fill-opacity:0}.nvd3 .nv-brush .extent{fill-opacity:0!important}.nvd3 .nv-brushBackground rect{stroke:#000;stroke-width:.4;fill:#fff;fill-opacity:.7}.nvd3.nv-ohlcBar .nv-ticks .nv-tick{stroke-width:1px}.nvd3.nv-ohlcBar .nv-ticks .nv-tick.hover{stroke-width:2px}.nvd3.nv-ohlcBar .nv-ticks .nv-tick.positive{stroke:#2ca02c}.nvd3.nv-ohlcBar .nv-ticks .nv-tick.negative{stroke:#d62728}.nvd3 .background path{fill:none;stroke:#EEE;stroke-opacity:.4;shape-rendering:crispEdges}.nvd3 .foreground path{fill:none;stroke-opacity:.7}.nvd3 .nv-parallelCoordinates-brush .extent{fill:#fff;fill-opacity:.6;stroke:gray;shape-rendering:crispEdges}.nvd3 .nv-parallelCoordinates .hover{fill-opacity:1;stroke-width:3px}.nvd3 .missingValuesline line{fill:none;stroke:#000;stroke-width:1;stroke-opacity:1;stroke-dasharray:5,5}.nvd3.nv-pie path{stroke-opacity:0;transition:fill-opacity 250ms linear,stroke-width 250ms linear,stroke-opacity 250ms linear;-moz-transition:fill-opacity 250ms linear,stroke-width 250ms linear,stroke-opacity 250ms linear;-webkit-transition:fill-opacity 250ms linear,stroke-width 250ms linear,stroke-opacity 250ms linear}.nvd3.nv-pie .nv-pie-title{font-size:24px;fill:rgba(19,196,249,.59)}.nvd3.nv-pie .nv-slice text{stroke:#000;stroke-width:0}.nvd3.nv-pie path{stroke:#fff;stroke-width:1px;stroke-opacity:1}.nvd3.nv-pie .hover path{fill-opacity:.7}.nvd3.nv-pie .nv-label{pointer-events:none}.nvd3.nv-pie .nv-label rect{fill-opacity:0;stroke-opacity:0}.nvd3 .nv-groups .nv-point.hover{stroke-width:20px;stroke-opacity:.5}.nvd3 .nv-scatter .nv-point.hover{fill-opacity:1}.nv-noninteractive{pointer-events:none}.nv-distx,.nv-disty{pointer-events:none}.nvd3.nv-sparkline path{fill:none}.nvd3.nv-sparklineplus g.nv-hoverValue{pointer-events:none}.nvd3.nv-sparklineplus .nv-hoverValue line{stroke:#333;stroke-width:1.5px}.nvd3.nv-sparklineplus,.nvd3.nv-sparklineplus g{pointer-events:all}.nvd3 .nv-hoverArea{fill-opacity:0;stroke-opacity:0}.nvd3.nv-sparklineplus .nv-xValue,.nvd3.nv-sparklineplus .nv-yValue{stroke-width:0;font-size:.9em;font-weight:400}.nvd3.nv-sparklineplus .nv-yValue{stroke:#f66}.nvd3.nv-sparklineplus .nv-maxValue{stroke:#2ca02c;fill:#2ca02c}.nvd3.nv-sparklineplus .nv-minValue{stroke:#d62728;fill:#d62728}.nvd3.nv-sparklineplus .nv-currentValue{font-weight:700;font-size:1.1em}.nvd3.nv-stackedarea path.nv-area{fill-opacity:.7;stroke-opacity:0;transition:fill-opacity 250ms linear,stroke-opacity 250ms linear;-moz-transition:fill-opacity 250ms linear,stroke-opacity 250ms linear;-webkit-transition:fill-opacity 250ms linear,stroke-opacity 250ms linear}.nvd3.nv-stackedarea path.nv-area.hover{fill-opacity:.9}.nvd3.nv-stackedarea .nv-groups .nv-point{stroke-opacity:0;fill-opacity:0}.nvtooltip{position:absolute;background-color:rgba(255,255,255,1);color:rgba(0,0,0,1);padding:1px;border:1px solid rgba(0,0,0,.2);z-index:10000;display:block;font-family:Arial;font-size:13px;text-align:left;pointer-events:none;white-space:nowrap;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.nvtooltip{background:rgba(255,255,255,.8);border:1px solid rgba(0,0,0,.5);border-radius:4px}.nvtooltip.with-transitions,.with-transitions .nvtooltip{transition:opacity 50ms linear;-moz-transition:opacity 50ms linear;-webkit-transition:opacity 50ms linear;transition-delay:200ms;-moz-transition-delay:200ms;-webkit-transition-delay:200ms}.nvtooltip.x-nvtooltip,.nvtooltip.y-nvtooltip{padding:8px}.nvtooltip h3{margin:0;padding:4px 14px;line-height:18px;font-weight:400;background-color:rgba(247,247,247,.75);color:rgba(0,0,0,1);text-align:center;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.nvtooltip p{margin:0;padding:5px 14px;text-align:center}.nvtooltip span{display:inline-block;margin:2px 0}.nvtooltip table{margin:6px;border-spacing:0}.nvtooltip table td{padding:2px 9px 2px 0;vertical-align:middle}.nvtooltip table td.key{font-weight:400}.nvtooltip table td.value{text-align:right;font-weight:700}.nvtooltip table tr.highlight td{padding:1px 9px 1px 0;border-bottom-style:solid;border-bottom-width:1px;border-top-style:solid;border-top-width:1px}.nvtooltip table td.legend-color-guide div{width:8px;height:8px;vertical-align:middle}.nvtooltip table td.legend-color-guide div{width:12px;height:12px;border:1px solid #999}.nvtooltip .footer{padding:3px;text-align:center}.nvtooltip-pending-removal{pointer-events:none;display:none}.nvd3 .nv-interactiveGuideLine{pointer-events:none}.nvd3 line.nv-guideline{stroke:#ccc}
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/style.css b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/style.css
new file mode 100644
index 00000000..824fb317
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/style.css
@@ -0,0 +1,122 @@
+body {
+ padding-top: 10px;
+}
+
+.popover {
+ max-width: none;
+}
+
+.glyphicon {
+ margin-right:.25em;
+}
+
+.table-bordered>thead>tr>td {
+ border-bottom-width: 1px;
+}
+
+.table tbody>tr>td, .table thead>tr>td {
+ padding-top: 3px;
+ padding-bottom: 3px;
+}
+
+.table-condensed tbody>tr>td {
+ padding-top: 0;
+ padding-bottom: 0;
+}
+
+.table .progress {
+ margin-bottom: inherit;
+}
+
+.table-borderless th, .table-borderless td {
+ border: 0 !important;
+}
+
+.table tbody tr.covered-by-large-tests, li.covered-by-large-tests, tr.success, td.success, li.success, span.success {
+ background-color: #dff0d8;
+}
+
+.table tbody tr.covered-by-medium-tests, li.covered-by-medium-tests {
+ background-color: #c3e3b5;
+}
+
+.table tbody tr.covered-by-small-tests, li.covered-by-small-tests {
+ background-color: #99cb84;
+}
+
+.table tbody tr.danger, .table tbody td.danger, li.danger, span.danger {
+ background-color: #f2dede;
+}
+
+.table tbody td.warning, li.warning, span.warning {
+ background-color: #fcf8e3;
+}
+
+.table tbody td.info {
+ background-color: #d9edf7;
+}
+
+td.big {
+ width: 117px;
+}
+
+td.small {
+}
+
+td.codeLine {
+ font-family: monospace;
+ white-space: pre;
+}
+
+td span.comment {
+ color: #888a85;
+}
+
+td span.default {
+ color: #2e3436;
+}
+
+td span.html {
+ color: #888a85;
+}
+
+td span.keyword {
+ color: #2e3436;
+ font-weight: bold;
+}
+
+pre span.string {
+ color: #2e3436;
+}
+
+span.success, span.warning, span.danger {
+ margin-right: 2px;
+ padding-left: 10px;
+ padding-right: 10px;
+ text-align: center;
+}
+
+#classCoverageDistribution, #classComplexity {
+ height: 200px;
+ width: 475px;
+}
+
+#toplink {
+ position: fixed;
+ left: 5px;
+ bottom: 5px;
+ outline: 0;
+}
+
+svg text {
+ font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #666;
+ fill: #666;
+}
+
+.scrollbox {
+ height:245px;
+ overflow-x:hidden;
+ overflow-y:scroll;
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist
new file mode 100644
index 00000000..ed189886
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist
@@ -0,0 +1,284 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+  <meta charset="UTF-8">
+  <title>Dashboard for {{full_path}}</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link href="{{path_to_root}}css/bootstrap.min.css" rel="stylesheet">
+  <link href="{{path_to_root}}css/nv.d3.min.css" rel="stylesheet">
+  <link href="{{path_to_root}}css/style.css" rel="stylesheet">
+  <!--[if lt IE 9]>
+  <script src="{{path_to_root}}js/html5shiv.min.js"></script>
+  <script src="{{path_to_root}}js/respond.min.js"></script>
+  <![endif]-->
+ </head>
+ <body>
+  <header>
+   <div class="container">
+    <div class="row">
+     <div class="col-md-12">
+      <ol class="breadcrumb">
+{{breadcrumbs}}
+      </ol>
+     </div>
+    </div>
+   </div>
+  </header>
+  <div class="container">
+   <div class="row">
+    <div class="col-md-12">
+     <h2>Classes</h2>
+    </div>
+   </div>
+   <div class="row">
+    <div class="col-md-6">
+     <h3>Coverage Distribution</h3>
+     <div id="classCoverageDistribution" style="height: 300px;">
+       <svg></svg>
+     </div>
+    </div>
+    <div class="col-md-6">
+     <h3>Complexity</h3>
+     <div id="classComplexity" style="height: 300px;">
+       <svg></svg>
+     </div>
+    </div>
+   </div>
+   <div class="row">
+    <div class="col-md-6">
+     <h3>Insufficient Coverage</h3>
+     <div class="scrollbox">
+      <table class="table">
+       <thead>
+        <tr>
+         <th>Class</th>
+         <th class="text-right">Coverage</th>
+        </tr>
+       </thead>
+       <tbody>
+{{insufficient_coverage_classes}}
+       </tbody>
+      </table>
+     </div>
+    </div>
+    <div class="col-md-6">
+     <h3>Project Risks</h3>
+     <div class="scrollbox">
+      <table class="table">
+       <thead>
+        <tr>
+         <th>Class</th>
+         <th class="text-right"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></th>
+        </tr>
+       </thead>
+       <tbody>
+{{project_risks_classes}}
+       </tbody>
+      </table>
+     </div>
+    </div>
+   </div>
+   <div class="row">
+    <div class="col-md-12">
+     <h2>Methods</h2>
+    </div>
+   </div>
+   <div class="row">
+    <div class="col-md-6">
+     <h3>Coverage Distribution</h3>
+     <div id="methodCoverageDistribution" style="height: 300px;">
+       <svg></svg>
+     </div>
+    </div>
+    <div class="col-md-6">
+     <h3>Complexity</h3>
+     <div id="methodComplexity" style="height: 300px;">
+       <svg></svg>
+     </div>
+    </div>
+   </div>
+   <div class="row">
+    <div class="col-md-6">
+     <h3>Insufficient Coverage</h3>
+     <div class="scrollbox">
+      <table class="table">
+       <thead>
+        <tr>
+         <th>Method</th>
+         <th class="text-right">Coverage</th>
+        </tr>
+       </thead>
+       <tbody>
+{{insufficient_coverage_methods}}
+       </tbody>
+      </table>
+     </div>
+    </div>
+    <div class="col-md-6">
+     <h3>Project Risks</h3>
+     <div class="scrollbox">
+      <table class="table">
+       <thead>
+        <tr>
+         <th>Method</th>
+         <th class="text-right"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></th>
+        </tr>
+       </thead>
+       <tbody>
+{{project_risks_methods}}
+       </tbody>
+      </table>
+     </div>
+    </div>
+   </div>
+   <footer>
+    <hr/>
+    <p>
+     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {{version}}</a> using <a href="{{runtime_link}}" target="_top">{{runtime_name}} {{runtime_version}}</a>{{generator}} at {{date}}.</small>
+    </p>
+   </footer>
+  </div>
+  <script src="{{path_to_root}}js/jquery.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/bootstrap.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/holder.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/d3.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/nv.d3.min.js" type="text/javascript"></script>
+  <script type="text/javascript">
+$(document).ready(function() {
+  nv.addGraph(function() {
+    var chart = nv.models.multiBarChart();
+    chart.tooltips(false)
+      .showControls(false)
+      .showLegend(false)
+      .reduceXTicks(false)
+      .staggerLabels(true)
+      .yAxis.tickFormat(d3.format('d'));
+
+    d3.select('#classCoverageDistribution svg')
+      .datum(getCoverageDistributionData({{class_coverage_distribution}}, "Class Coverage"))
+      .transition().duration(500).call(chart);
+
+    nv.utils.windowResize(chart.update);
+
+    return chart;
+  });
+
+  nv.addGraph(function() {
+    var chart = nv.models.multiBarChart();
+    chart.tooltips(false)
+      .showControls(false)
+      .showLegend(false)
+      .reduceXTicks(false)
+      .staggerLabels(true)
+      .yAxis.tickFormat(d3.format('d'));
+
+    d3.select('#methodCoverageDistribution svg')
+      .datum(getCoverageDistributionData({{method_coverage_distribution}}, "Method Coverage"))
+      .transition().duration(500).call(chart);
+
+    nv.utils.windowResize(chart.update);
+
+    return chart;
+  });
+
+  function getCoverageDistributionData(data, label) {
+    var labels = [
+      '0%',
+      '0-10%',
+      '10-20%',
+      '20-30%',
+      '30-40%',
+      '40-50%',
+      '50-60%',
+      '60-70%',
+      '70-80%',
+      '80-90%',
+      '90-100%',
+      '100%'
+    ];
+    var values = [];
+    $.each(labels, function(key) {
+      values.push({x: labels[key], y: data[key]});
+    });
+
+    return [
+      {
+        key: label,
+        values: values,
+        color: "#4572A7"
+      }
+    ];
+  }
+  nv.addGraph(function() {
+    var chart = nv.models.scatterChart()
+      .showDistX(true)
+      .showDistY(true)
+      .showLegend(false)
+      .forceX([0, 100]);
+    chart.tooltipContent(function(key, y, e, graph) {
+      return '<p>' + graph.point.class + '</p>';
+    });
+
+    chart.xAxis.axisLabel('Code Coverage (in percent)');
+    chart.yAxis.axisLabel('Cyclomatic Complexity');
+
+    d3.select('#classComplexity svg')
+      .datum(getComplexityData({{complexity_class}}, 'Class Complexity'))
+      .transition()
+      .duration(500)
+      .call(chart);
+
+    nv.utils.windowResize(chart.update);
+
+    return chart;
+  });
+
+  nv.addGraph(function() {
+    var chart = nv.models.scatterChart()
+      .showDistX(true)
+      .showDistY(true)
+      .showLegend(false)
+      .forceX([0, 100]);
+    chart.tooltipContent(function(key, y, e, graph) {
+      return '<p>' + graph.point.class + '</p>';
+    });
+
+    chart.xAxis.axisLabel('Code Coverage (in percent)');
+    chart.yAxis.axisLabel('Method Complexity');
+
+    d3.select('#methodComplexity svg')
+      .datum(getComplexityData({{complexity_method}}, 'Method Complexity'))
+      .transition()
+      .duration(500)
+      .call(chart);
+
+    nv.utils.windowResize(chart.update);
+
+    return chart;
+  });
+
+  function getComplexityData(data, label) {
+    var values = [];
+    $.each(data, function(key) {
+      var value = Math.round(data[key][0]*100) / 100;
+      values.push({
+        x: value,
+        y: data[key][1],
+        class: data[key][2],
+        size: 0.05,
+        shape: 'diamond'
+      });
+    });
+
+    return [
+      {
+        key: label,
+        values: values,
+        color: "#4572A7"
+      }
+    ];
+  }
+});
+  </script>
+ </body>
+</html>
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist
new file mode 100644
index 00000000..efe743f5
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+  <meta charset="UTF-8">
+  <title>Code Coverage for {{full_path}}</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link href="{{path_to_root}}css/bootstrap.min.css" rel="stylesheet">
+  <link href="{{path_to_root}}css/style.css" rel="stylesheet">
+  <!--[if lt IE 9]>
+  <script src="{{path_to_root}}js/html5shiv.min.js"></script>
+  <script src="{{path_to_root}}js/respond.min.js"></script>
+  <![endif]-->
+ </head>
+ <body>
+  <header>
+   <div class="container">
+    <div class="row">
+     <div class="col-md-12">
+      <ol class="breadcrumb">
+{{breadcrumbs}}
+      </ol>
+     </div>
+    </div>
+   </div>
+  </header>
+  <div class="container">
+   <table class="table table-bordered">
+    <thead>
+     <tr>
+      <td>&nbsp;</td>
+      <td colspan="9"><div align="center"><strong>Code Coverage</strong></div></td>
+     </tr>
+     <tr>
+      <td>&nbsp;</td>
+      <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+      <td colspan="3"><div align="center"><strong>Functions and Methods</strong></div></td>
+      <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
+     </tr>
+    </thead>
+    <tbody>
+{{items}}
+    </tbody>
+   </table>
+   <footer>
+    <hr/>
+    <h4>Legend</h4>
+    <p>
+     <span class="danger"><strong>Low</strong>: 0% to {{low_upper_bound}}%</span>
+     <span class="warning"><strong>Medium</strong>: {{low_upper_bound}}% to {{high_lower_bound}}%</span>
+     <span class="success"><strong>High</strong>: {{high_lower_bound}}% to 100%</span>
+    </p>
+    <p>
+     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {{version}}</a> using <a href="{{runtime_link}}" target="_top">{{runtime_name}} {{runtime_version}}</a>{{generator}} at {{date}}.</small>
+    </p>
+   </footer>
+  </div>
+  <script src="{{path_to_root}}js/jquery.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/bootstrap.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/holder.min.js" type="text/javascript"></script>
+ </body>
+</html>
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist
new file mode 100644
index 00000000..78dbb356
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist
@@ -0,0 +1,13 @@
+     <tr>
+      <td class="{{lines_level}}">{{icon}}{{name}}</td>
+      <td class="{{lines_level}} big">{{lines_bar}}</td>
+      <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
+      <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
+      <td class="{{methods_level}} big">{{methods_bar}}</td>
+      <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
+      <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
+      <td class="{{classes_level}} big">{{classes_bar}}</td>
+      <td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
+      <td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
+     </tr>
+
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist
new file mode 100644
index 00000000..59a06843
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+  <meta charset="UTF-8">
+  <title>Code Coverage for {{full_path}}</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link href="{{path_to_root}}css/bootstrap.min.css" rel="stylesheet">
+  <link href="{{path_to_root}}css/style.css" rel="stylesheet">
+  <!--[if lt IE 9]>
+  <script src="{{path_to_root}}js/html5shiv.min.js"></script>
+  <script src="{{path_to_root}}js/respond.min.js"></script>
+  <![endif]-->
+ </head>
+ <body>
+  <header>
+   <div class="container">
+    <div class="row">
+     <div class="col-md-12">
+      <ol class="breadcrumb">
+{{breadcrumbs}}
+      </ol>
+     </div>
+    </div>
+   </div>
+  </header>
+  <div class="container">
+   <table class="table table-bordered">
+    <thead>
+     <tr>
+      <td>&nbsp;</td>
+      <td colspan="10"><div align="center"><strong>Code Coverage</strong></div></td>
+     </tr>
+     <tr>
+      <td>&nbsp;</td>
+      <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
+      <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+      <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+     </tr>
+    </thead>
+    <tbody>
+{{items}}
+    </tbody>
+   </table>
+   <table id="code" class="table table-borderless table-condensed">
+    <tbody>
+{{lines}}
+    </tbody>
+   </table>
+   <footer>
+    <hr/>
+    <h4>Legend</h4>
+    <p>
+     <span class="success"><strong>Executed</strong></span>
+     <span class="danger"><strong>Not Executed</strong></span>
+     <span class="warning"><strong>Dead Code</strong></span>
+    </p>
+    <p>
+     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {{version}}</a> using <a href="{{runtime_link}}" target="_top">{{runtime_name}} {{runtime_version}}</a>{{generator}} at {{date}}.</small>
+    </p>
+    <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
+   </footer>
+  </div>
+  <script src="{{path_to_root}}js/jquery.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/bootstrap.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/holder.min.js" type="text/javascript"></script>
+  <script type="text/javascript">
+  $(function() {
+   var $window   = $(window)
+     , $top_link = $('#toplink')
+     , $body     = $('body, html')
+     , offset    = $('#code').offset().top;
+
+   $top_link.hide().click(function(event) {
+    event.preventDefault();
+    $body.animate({scrollTop:0}, 800);
+   });
+
+   $window.scroll(function() {
+    if($window.scrollTop() > offset) {
+     $top_link.fadeIn();
+    } else {
+     $top_link.fadeOut();
+    }
+   }).scroll();
+
+   $('.popin').popover({trigger: 'hover'});
+  });
+  </script>
+ </body>
+</html>
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist
new file mode 100644
index 00000000..756fdd69
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist
@@ -0,0 +1,14 @@
+     <tr>
+      <td class="{{classes_level}}">{{name}}</td>
+      <td class="{{classes_level}} big">{{classes_bar}}</td>
+      <td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
+      <td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
+      <td class="{{methods_level}} big">{{methods_bar}}</td>
+      <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
+      <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
+      <td class="{{methods_level}} small">{{crap}}</td>
+      <td class="{{lines_level}} big">{{lines_bar}}</td>
+      <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
+      <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
+     </tr>
+
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.eot b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.eot
new file mode 100644
index 0000000000000000000000000000000000000000..b93a4953fff68df523aa7656497ee339d6026d64
GIT binary patch
literal 20127
zcma%hV{j!vx9y2-`@~L8?1^pLwlPU2wr$&<*tR|KBoo`2;LUg6eW-eW-tKDb)vH%`
z^`A!Vd<6hNSRMcX|Cb;E|1qflDggj6Kmr)xA10^t-vIc3*Z+F{r%|K(GyE^?|I{=9
zNq`(c8=wS`0!RZy0g3<xfGPm^&oc(t0WAJyYk&j565#r82r@tgVE(V|{tq<<xco!B
z02==gmw&z10LOnkAb<tH1OWX@JOI9bn*UMykN1D0R{xl80Mq~Cd;ISaOaQKbJU)Q^
zKV{p0n*ZTg{L}i+{3Za_e=Uyx%G?09e;&`jxw-$pR}TDt)(rrNs7n5?o%-LK0RgDo
z0?1<k<naI!SC})WF>{M(8^tv41d}oRU?8#IBFtJy*9zAN5dcxqGlMZGL>GG%R#)4J
zDJ2;)4*E1pyHia%>lMv3X7Q`UoFyoB@|xvh^)kOE3)IL&0(G&i;g08s>c%~pHkN&6
z($7!kyv|A2DsV2mq-5Ku)D#$Kn$CzqD-wm5Q*OtEOEZe^&T$<q%?GPI*ug?*jFCZ7
zl1X3>xIb0NUL<TDAlC~xMcGnHsPe)Gh+nESIamgk2)5Ql^6QPK&XkQ+!qk}`TYc#I
zf~KwkK>}$)W)Ck`6oter6KcQG9Zcy>lXip)%e&!lQgtQ*N`#abOlytt!&i3fo)cKV
zP0BWmLxS1gQv(r_r|?9>rR0ZeEJPx;Vi|h1!Eo*dohr<W65y|5+tpvz!HDS=Q}DgN
z;O&E^rmV416<Hj_N10HwLk^Lwyhx2j;kDE@F*S-tuqy|n(-6~PPF09Xvxq56At8OG
z4-2Gj5=K^(f;q@WOp+9uP|<!09J~a(Y%m)hsl;TbWEvvuQ7(qWx_eKYE@rH9B(V+`
zF8+p6+N8}}{zS_o7#)%b=2DFYa}JT{_i@;_#xxEDZ)+D4Lz{Pv;LE}#`N2bQP*W;6
z(wPX2S3Zb<sNz$mW_!uE^K&d`O<hkRPv<3DnX$`Y*)_qR>&^lJgqJZns>&vexP@fs
zkPv93Nyw$-kM5Mw^{@wPU47Y1dSkiHyl3dtHLwV&6Tm1iv{ve;sYA}Z&kmH802s9Z
zyJEn+cfl7yFu#1^#DbtP7k&aR06|n{LnYFYEphKd@dJEq@)s#S)UA&8VJY@S2+{~>
z(4?M();zvayyd^j`@4>xCqH|Au>Sfzb$mEOcD7e4z8pPVRTiMUWiw;|gXHw7LS#U<
zsT(}Z5SJ)CRMXloh$qPnK77w_)ctHmgh}QAe<2S{DU^`!uwptCoq!Owz$u6bF)vnb
zL`bM$%>baN7l#)vtS3y6h*2?xC<XQJNpZVS!tVtuR(<D$%K=CTVlwa)G)}qDJup|w
z!YRUAk-}+0)MFG#RuE2vlb~4*bP&)ex6`$^%6ySxf}MiQja9&+C4)UgIK)TIHVp>k
z>w+s)@`O4(4_<t2L?B1i*y6fuRi+P?QZCG2j9(btWTetUT@0Q|8XO(SqEH6LSB!2L
z<;M1lya0G`cm9UEex~so>I{L-!+b%)NZcQ&ND=2lyP+xI#9OzsiY8$c)ys-MI?TG6
zEP6f=vuLo!G>J7F4v|s#lJ+7A`^nEQScH3e?B_jC&{<S@1dd<&?JtuP@v(wA>sj>m
zYD?!1z4nDG_Afi$!J(<{>z{~Q)$SaXWjj~%ZvF152Hd^VoG14rFykR=_TO)mCn&K$
z-TfZ!vMBvnToyBoKRkD{3=&=qD|L!vb#jf1f}2338z)e)g>7#NPe!FoaY*jY{f)<G
z+9IWTnFJO0p&^rK`xODpSZARax-jN9(N|ZWyg~(MGSuQYzXBQR*+_`oO>Bf>ohk-K
z4{>fVS}ZCicCqgLuYR_fYx2;*-4k>kffuywghn?15s1dIOOYfl+XLf5w?wtU2Og*f
z%X5x`H55F6g1>m~%F`655-W1wFJtY>>qNSdVT`M`1Mlh!5Q6#3j={n5#za;!X&^OJ
zgq;d4UJV-F>gg?c3Y?d=kvn3e<VW2IarGgIy4I@#ozBH$Q(a($^uvXS?@=l>V)Jb^
zO5vg0G0yN0%}xy#(6oTDSVw8l=_*2k;zTP?+N=*18H5wp`s90K-C67q{W3d8vQGmr
zhpW^>1HEQV2TG#8_P_0q91h8QgHT~8=-Ij5snJ3cj?Jn5_66uV=*pq(j}yHn<uy|J
zh=_`9%JG63kQPJ-Et!mF@={HFp+sB-S+XTFvdzD^x19Lbj{TXx=?FGKvX;|1-3-zU
zl2DyEls20Izb)isO0?xrx(b1`<I3ZDSNBd*<5l=jC`?Re`XCFaI(ny#9KlP!NYbU=
z^;IWB5he_V3}{Xdl1>f$<x%N5|7+dpJoB>Ft;5VVC?bz%9X31asJeQF2jEa47H#j`
zk<KNJ>&uxf3t?g!tltVP|B#G_UfDD}`<#B#iY^i>oDd-LGF}A@Fno~dR72c&hs6bR
z2F}9(i8+PR%R|~FV$;Ke^Q_E_B<teU&M|M>c;$)xN4Ti>Lgg4vaip!%M<tZtx+eW>
z06oxAF_*)LH57w|gCW3SwoEHwjO{}}U=pKhjKSZ{u!K<P`9nrZXY)DCi*vvJQDx`q
za_kyA2Qus4JQ%8kM3_Gd%I1O+cF3~V6=ZM1u9*Ea+iXPId}M`kd7I1T0d7Zx)Wa&?
z{PLQlHM^=&Y!og~I(XQ;5lJScjK~IrV<F7J6v`iM&M1#EkRsHYX8V%Dip>?1zm1q?
zXyA6y@)}_sONiJopF}_}(~}d4FDyp|(@w}Vb;Fl5bZL%{1`}gdw#i{KMjp2@Fb9pg
ziO|u7qP{$kxH$qh8%L+)AvwZNgUT6^zsZq-MRyZid{D?t`f|KzSAD~C?WT3d0rO`0
z=qQ6{)&UXXuHY{9g|P7l_nd-%eh}4%VVaK#Nik*tOu9lBM$<%FS@`NwGEbP0&;Xbo
zObCq=y%a`jSJmx_uTLa{@2@}^&F<l?4N8$IoqA~y`|!rgD24&AtvbWWlPF%K!I`Fp
zMCDiMrV(MWM2!hiB6=^)Er#O8q+%t)I4l3iuF$d;cBXqGAn?Z0Z*?MZRuh=zmPo~-
z_rOvv7sERj79T<uPMWCHIto@agn)X&#=QQyY*6wt){yHQ7~yFoEezd#C<dQF+u)2-
zEIMy-5P*TYpqPxY25dY9J+f-E^3<^@G(=jU{U&hQ3#o`a)dOUR&JT?mTRlBfHE<p|
zO&J|*26{JJ28qC1saVtkQ1WW^G58Smr^%f>4c%z6oe-TN&idjv+8E|$FHOvBqg5hT
zMB=7SHq`_-E?5g=()*!V>rIa&LcX(RU}aLm*38U_V$C_g4)7GrW5$GnvTwJZdBmy6
z*X)wi3=R8L=esOhY0a&eH`^fSpUHV8h$J1|o^3fKO<edeL`~4AS}?bGhbI@wd%7ob
z;HUsAzX8f<5Tcj`x1L`~p_%qxb{Gobu+`2Hh*bfnN@EZ$w1F5i32YXO9vreTkznl=
zRv&F3;kE3d@_Cys2UVvUxUU=oDO~U>|9QzaiKu>yZ9wmRkW?HTkc<*v7i*ylJ#u#j
zD1-n&{B`04oG>0Jn{5PKP*4Qsz{~`VVA3578gA+JUkiPc$Iq!^K|}*p_z3(-c&5z@
zKxmdNpp2&wg&%xL<cX5MdFnpzW;X?cI|~qZbhDWm)F_t}i=(x><xZ|=$k6lbFWo~R
z1yEA-t+BaHz`?1Zi{N`F<t?_rS*zpAEN-Lg7L9qKTVj|Ih7gOmTvLqTlA1e51SXNm
zeA`1UhC`&)%k?V^ii%`|O+coBH9$HjP#Fy1CjYhyW0DPZC>3xZNzG-5Xt7jnI@{?c
z25=M>-VF|;an2Os$Nn%HgQz7m(ujC}Ii0Oesa(y#8>D+P*_m^X##E|h$M6tJr%#=P
zWP*)Px>7z`E~U^2LNCNiy%Z7!!6RI%6fF@#ZY3z`CK91}^J<kz;gXvl4j_QvxfXmA
ze1j4n*Hru_ge<*I;p<wHXN`XVFAk2bTG~Vl5{?nXF6K!!HeqOu6_U-movw7Gx`O<C
zM~<jbZlSC}oXeAQr_Y8Tq)(9YogPgPY{6ELohD$98O2Fj5_M2=J84FuR#dyoS!A-|
z*c)!)9^dk4^<2$Ks79AAMW;%o-!%g7j{1(Pnwwy1tca#dUTE1+4y#<A6VSeCR)wQ`
zCEFu?oS$y=05cpTr}VLe+YU$GFp$#&tfXaK<ia*q3-&+6KDQP!)!Ru(yh0c}7za6=
ziFP^Nq3))g21c{b{ESQRdZN3Xnpa8jUP0DA2r&uofBU7TtM^7^s}7#&aUnGsvE`fu
z>$F!EB0YF1je9<lP78|=Z6bmMhpLsL)Tz)Cn&pP#eF?{kB>hJKU7!S5MnXV{+#K;y
zF~s*H%p@vj&-ru7#(F2L+_;IH46X(z{~HTfcThqD%b{>~u@lSc<+f5#xgt9L7$gSK
ziDJ6D*R%4&YeUB@yu@4+&70MBNTnjRyqMRd+@&lU#rV%0t3OmouhC`mkN}pL>tXin
zY*p)mt=}$EGT2E<4Q>E2`6)gZ`QJhGDNpI}bZL9}m+R>q?l`OzFjW?)Y)P`fUH(_4
zCb?sm1=DD0+Q5v}BW#0n5;Nm(@RTEa3(Y17H2H67La+>ptQHJ@WMy2xRQT$|7l`8c
zYHCxYw2o-rI?(fR2-%}pbs$I%w_&LPYE{4bo}vRoAW>3!SY_zH3`ofx3F1PsQ?&iq
z*BRG>?<6%z=x#`NhlEq{K~&rU7Kc7Y-90aRnoj~rVoKae)L$3^z*Utppk?I`)CX&&
zZ^@Go<Q-E-9qdDk;`1UZ+I6D_?B@62xgSC03f%4S8VtH3(P3D_6<1>9fm&fN`b`XY
zt0xE5aw4t@qTg_k=!-5LXU+_~DlW?53!afv6W(k@FPPX-`nA!FBMp7b!ODbL1zh58
z*69I}P_-?qSLKj}JW7gP!la}K@M}L>v?rDD!DY-tu+onu9kLoJz20M4urX_xf2dfZ
zORd9Zp&28_ff=wdMpXi%IiTTNegC}~RLkdYjA39kWqlA?jO~o1`*B&85Hd%VPkYZT
z48MPe62;TOq#c%H(`wX5(Bu>nlh4Fbd*Npasdhh?oRy8a;NB2(eb}6DgwXtx=n}fE
zx67rYw=(s0r?EsPjaya}^Qc-_UT5|*@|$Q}*|>V3O~USkIe6a0_>vd~6kHuP8=m}_
zo2IGKbv;yA+TBtlCpnw)8hDn&eq?26gN$Bh;SdxaS04Fsaih_Cfb98s39xbv)=mS0
z6M<@pM2#pe32w*lYSWG>DYqB95XhgAA)*9dOxHr{t)er0Xugoy)!Vz#2C3FaUMzYl
zCxy{igFB901*<tiyD63(hW(uERHv;@J~7F`;-e`O5Ld!(Fl>R2*F4>grPF}+G`;Yh
zGi@nRjWyG3mR(BVOeBPOF=_&}2IWT%)pqdNAcL{eP`L*^FDv#Rzq<iCP<KO7gjv}{
z^5ElYuo)cUV9?9{6e*c7eWVK@LCOKKaBR<2_;6r+GhH1i-~$};rNpE_D*2ZJ=O+cz
zyj}kfz8;}sw88^SYgzvxpkB>l5U&Suq_X%JfR_lC!S|y|xd5mQ0{0!G#9hV46S~A`
z0B!{yI-4FZEtol5)mNWXcX(`x&Pc*&gh4k{w%0S#EI>rqqlH2xv7mR=9XNCI$V#NG
z4wb-@u{PfQP;tTbzK>(DF(~bKp3;L1-A*HS!VB)Ae>Acnvde15Anb`h;I&0)aZBS6
z55ZS7mL5Wp!LCt45^{2_70<L`Ib`SKM1Oi<HkO)Y>YiI_Py=X{I3>$Px5Ez0ahLQ+
z9EWUWSyzA|+g-Axp*Lx-M{!ReQO07EG7r4^)K(xbj@%ZU=0tBC5shl)1a!ifM5OkF
z0<aV&1|hwix;hV`l{C+KeqEjnn@aQGS~k&rcJ^K626yC8@~#qf$xT7;xJLzv3M&rA
z)MirFFpng+&}hRJHKQ6_3l{ABCJLmIrj8g#cem2@!i;W7Q+}Wr^IrTp((?iq1h?Cq
z7Z^k%ps^N^e})9!YkyNa0;x`m&~<4yTQHl1+dFNY1CE<&_PZ=1v!ch(qU_a1lHd~T
zC&a1>w2xQ-<+r-h1fi7B6waX15|*GGqfva)S)dVcgea`lQ~SQ$KXPR+(3Tn2I2R<0
z9tK`L*pa^+*n%>tZPiqt{_`%v?Bb7CR-!GhMON_Fbs0$#|H}G?rW|{q5fQhvw!FxI
zs-5ZK>hAbnCS#ZQVi5K0X3PjL1JRdQO+&)*!oRCqB{wen60P6!7bGiWn@vD|+E@Xq
zb!!_WiU^I|@1M}Hz6fN-m04x=><rLlCfwyIrOU}U)<7QivZH0Rm_-}Sg~$eCMDR*Z
zx`cVPn__}6Q+CU!>Exm{b@>UCW|c8<K+|Vc^j#>vC`aNbt<B+h3ox;kC6?34Wa#|Y
zXq?n@d6k6MUBqn%SYLX5^>A@KCHujh^2RWZC}iYhL^<*Z93chIBJYU&w>$CGZDR<q
ztx<5t>cHuIgF&oyesDZ#&mA;?wxx4Cm#c0V$xYG?9OL(Smh}#fFuX(K;otJmvRP{h
ze^f-qv;)HKC7geB92_@3a9@M<H_?qNxE&=>GijS(hNNVd%-rZ;%@F_f7?Fjinbe1(
zn#jQ*jKZTqE+AUTEd3y6t>*=;AO##cmdwU4gc2&rT8l`rtKW2JF<`_M#p>cj+)yCG
zgKF)y8jrfxTjGO&ccm8RU>qn|HxQ7Z#sUo$q)P5H%8iBF$({0Ya51-rA@!I<SEC1_
zHUdTwrTB3a?*}j?j1(f*^9G0kG<5JX4@l|rR&H;`Qa2VcYZ3UxZL+D>t#NHN8MxqK
zrYyl_&=}WVfQ?+ykV4*@F6)=u_~3BebR2G2>>mKaEBPm<p!ix>SW3(qYGGXj??m3L
zHec{@jWCsSD8`xUy0pqT?Sw0oD?AUK*WxZn#D>-$`eI+IT)6ki>ic}W)t$V32^ITD
zR497@LO}S|re%A+#vdv-?fXsQGVnP?QB_d0cGE+U84Q=aM=XrOwGFN3`Lpl@P0fL$
zKN1PqOwojH*($uaQFh8_)H#>Acl&UBSZ>!2W1Dinei`R4dJGX$;~60X=|SG6#jci}
z&t4*dVDR*;+6Y(G{KGj1B2!qjvDYOyPC}%hnPbJ@g(4yBJrViG1#$$X75y+Ul1{%x
zBAuD}Q@w?MFNqF-m39FGpq7RGI?%Bvyyig&oGv)lR>d<`Bqh=p>urib5DE;u$c|$J
zwim~nPb19t?LJZsm{<(Iyyt@~H!a4yywmHKW&=1r5+oj*Fx6c89heW@(2R`i!Uiy*
zp)=`Vr8sR!)KChE-6SEIy<Vn-l!RzPhNVxOkQU85Nng*5JUtkAg)b6wP&$wmih=Au
zKs;dHW6q)pI2VT$E`W=7aAbKSJnb;$l%#?edH=)1)avHvVH)345mJ;(*l$Ed1MA<a
z72%vbZD4`I;B-RS=m{iM`7(#1x>i(dvG3<1KoVt>kGV=zZiG<Y+hj@$zd#Q#=4iVE
z)x-IdMbP%iC;0pg$QUoVt(A;lO{-jJjH=;buR+E#0Eulb^`hidN&<0Z-tju^RGPcG
z(C4$AS6l7m-h>7LGonH1+~yOK-`g0)r#+O|Q>)a`I2FVW%wr3lhO(P{ksNQuR!G_d
zeTx(M!%brW_vS9?IF>bzZ2A3mWX-MEaOk^V|4d38{1D|KOlZSjBKrj7Fgf^>JyL0k
zLoI$adZJ0T+8i_Idsuj}C;6jgx9LY#Ukh;!8eJ^B1N}q=Gn4onF*a2vY7~`x$r@rJ
z`*hi&Z2lazgu{&nz>gjd>#eq*IFlXed(%$s5!HR<!{AgXHWD~USVRvxKdGTp>XKNm
zDZld+DwDI`O6hyn2uJ)F^{^;ESf9sjJ)wMSKD~R=DqPBHyP!?cGAvL<1|7K-(=?VO
zGcKcF1spUa+ki<qEk7@%dE~%eGpEl!oK*hA!YE+isq^GFdJ#{KfWIULzmRCaF}4(*
z-$*W)k94bSp|#5~htGbQ<~v1feWKv$%wM~TX}E><`6K#@QxOTsd847N8WSWztG~?~
z!gUJn>z0O=_)VCE|56hkT~n5xXTp}Ucx$Ii%bQ{5;-a4~I2e|{l9ur#*ghd*hSqO=
z)GD@ev^w&5%k}YYB~!A%3*XbPPU-N6&3Lp1LxyP@|C<{qcn&?l54+zyMk&I3YDT|E
z{lXH-e?C{huu<@~li+73lMOk&k)3s7Asn$t6!PtXJV!RkA`qdo4|OC_a?vR!kE_}k
zK5R9KB%V@R7gt@9=TGL{=#r2gl!@3G;k-6sXp&E4u20DgvbY$iE**Xqj3TyxK>3AU
z!b9}NXuINqt>Htt6fXIy5mj7oZ{A&$XJ&thR5ySE{mkxq_YooME#VCHm2+3D!f`{)
zvR^WSjy_h4v^|!RJV-RaIT2Ctv=)UMMn@fAgjQV$2G+4?&dGA8vK35c-8r<daDqE-
zlIJCF%-7v?-xOAOA*Z$Wv;j3$ldn=}pR52aU>)z9Qqa=%k(FU)?iec14<^olkOU3p
zF-6`zHiDKPafKK<gsO-HjX!gIc-J@mlI}lqM!qAHMA?>^USUU+D01>C&Wh{{q?>5m
zGQp|z*+#>IIo=|ae8CtrN@@t~uLFOeT{}vX(IY*;>wAU=u1Qo4c+a&R);$^VCr>;!
zv4L{`lHgc9$BeM)pQ#XA_(Q#=_i<x#Kw|T_b{oltLKCCP2b6F_+)lx3b*Vc?@JD8p
z>SZL4>L~8Hx}NmOC$&*Q*bq|9Aq}rWgFnMDl~d*;7c44GipcpH9PWaBy-G$*MI^F0
z?Tdxir1D<2ui+Q#^c4?uKvq=p>)lq56<F6-{L-8bs~8_dC8J3p4CdV*Iq;6IOvBJh
z^E(Ti1wkp{O6qebTnBYm)da^xs3^-TV5tGhoGrFBA^b?UK`APfD~Y+F8!rz@iSNu3
zFO1o9o^S3!%nw&2bpBxHF!V{IaC(n}+(HqYMb(3!l`YX-ru;2?$oSZD;K6*RvAS8r
zf1jgZer>=Eb|N^qz~w7rsZu)@E4$;~snz+wIxi+980O6M#RmtgLYh@|2}9BiHSpTs
zacjGKvwkUwR3lwTSsCHlwb&*(onU;)$yvdhikonn|B44JMgs*&Lo!jn`6AE>XvBiO
z*LKNX3FVz9yLcsnmL!cRVO_qv=yIM#X|u&}#f%_?Tj0>8)8P_0r0!AjWNw;S44tst
zv+NXY1{zRLf9OYMr6H-z?4CF$Y%MdbpFIN@a-LEnmkcOF>h16cH_;A|e)pJTuCJ4O
zY7!4FxT4>4aFT8a92}84>q0&?46h>&0Vv0p>u~k&qd5$C1A6Q$I4V(5X~6{15;PD@
ze6!s9xh#^QI`J+%8*=^(-!P!@9%~buBmN2VSAp@TOo6}C?az+ALP8~&a0FWZk*F5N
z^8P8IREnN`N0i@>O0?{i-FoFShYbUB`D7O4HB`Im2{yzXmyrg$k>cY6A@>bf7i3n0
z5y&cf2#`zctT>dz+hNF&+d3g;2)U!#vsb-%LC+pqKRTiiSn#FH#e!bVwR1nAf*TG^
z!RKcCy$P>?Sfq6n<%M{T0I8?p@HlgwC!<R%oqdMv88ghhaN5z;w29c{kLz0?InueY
zuDv#J^DHLyGoyzt8(sCID)#E6<WCYlz7uC1Xvs8QhV{45h-M4rLYe7xw;{g462-zX
zIV>HoWO>~mT+X<{Ylm+$Vtj9};H3$EB}P2wR$3y!TO#$iY8eO-!}+F&jMu4%E6S>m
zB(N4w9O@2=<`WNJay5PwP8javDp~o~xkSbd4t4t8)<Wt_Xc73S;VOmD#Fsb|nTsJs
z59;v?-{=r}I{BDxTN)Iz2&5m`sG^%wjY0*@1I`W29gtM7#wwIQTHvQhS2gB?6J62R
zJXy=)7L1!%o4(?3j6J3Pc%v5LFvsR9gKoej%77dCetZylr9&mT=u=p$Kn1Z^C3ySy
z3|Tg>9jqu@bHmJHq=MV~Pt|(TghCA}fhMS?s-{klV>~=VrT$nsp7mf{?cze~KKOD4
z_1Y!F)*7^W+BBTt1R2h4f1X4Oy2%?=IMhZU8c{qk3xI1=!na*Sg<=A$?K=Y=GUR9@
zQ(ylIm4Lgm>pt#%p`zHxok%vx_=8Fap1|?OM02|N%X-g5_#S~sT@A!x&8k#wVI2lo
z1Uyj{tDQRpb*>c}mjU^gYA9{7mNhFAlM=wZkXcA#MHXWMEs^3>p9X)Oa?dx7b%N*y
zLz@K^%1JaArjgri;8ptNHwz1<0y8tcURSbHsm=26^@CYJ3hwMaE<khA9_uuFNLm1L
zw+Fp#304~-S;vdG5Nug~K2qs}yD1rrg&9Fcvifn@KphT~L22BKMX?U^9@?Ph`>vC7
z3Wi-@AaXIQ)%F6#i@%M>?Mw7$6(kW@?et@wbk-APcvMCC{>iew#vkZej8%9h0JSc?
zCb~K|!9cBU+))^q*co(E^9jRl7gR4Jihyqa(Z(P&ID#TPyysVNL7(^;?Gan!OU>au
zN}miBc&XX-M$mSv%3xs)bh>Jq9#aD_l|zO?I+p4_5qI0Ms*OZyyxA`sXcyiy>-{YN
zA70%HmibZYcHW&YOHk6S&PQ+$rJ3(utuUra3V0~@=_~QZy&nc~)AS>v&<6$gErZC3
zcbC=eVkV4Vu0#}E*r=&{X)<H<fOshUJUO>Kgq|8MGCh(wsH4geLj@#8EGYa})K2;n
z{1~=ghoz=9TSCxgzr5x3@sQZZ0FZ+t{?klSI_IZa16pSx6*;=O%n!uXVZ@1IL;JEV
zfOS&yyfE9dtS*^jmgt6>jQDOIJM5Gx#Y2eAcC3l^lmoJ{o0T>IHpEC<k{}Rs{I@x*
zb<od>TbfYgPI4#LZq0<d#zAXFmb<Y9lgw&{$vCxBQ~RnTL=zZ7D-RwUE3~Z#wraN%
z_E{llZ?GrX#>PKqnPC<SBsRloBYG4ZO7Eeh-Bv2C$rMVb@bcKn3t2`<&0ke8{h|+|
z29&HD`tAtGV2ZA(;c{wT$(NWY+fHTL0b7Km+3IMcIX(?D)PQ;HB*^`ex$kl}K>D}_
zyKxz;(`fE0z~nA1s?d{X2!#ZP8wUHzFSOoTWQrk%;wCnBV_3D%3@EC|u$Ao)tO|AO
z$4&aa!wbf}rbNc<V}`mLC?8U0y^+E9xuE>P{6=ajgg(`p5kTeu$ji20`zw)X1SH*x
zN?T36{d9TY*S896Ijc^!35LLUByY4QO=ARCQ#MMCjudFc7s!z%P$6DESz%zZ#>H|i
zw3Mc@v4~{Eke;FWs`5i@ifeYPh-Sb#vCa#qJPL|&quSKF%sp8*n#t?vIE7kFWjNFh
zJC@u^bRQ^?ra|%39Ux^Dn4I}QICyDKF0mpe+Bk}!lFlqS^WpYm&xwIYxUoS-rJ)N9
z1Tz*6Rl9;x`4lwS1cgW^H_M*)Dt*DX*W?ArBf?-t|1~ge&S}xM0K;U9Ibf{okZHf~
z#4v4qc6s6Zgm8iKch5VMbQc~_V-ZviirnKCi*ouN^c_2lo&-M;YSA>W>>^5tlXObg
zacX$k0=9Tf$Eg+#9k6yV(R5-&F{=DHP8!yvSQ`Y~XRnUx@{O$-bGCksk~3&qH^dqX
zkf+ZZ?Nv5u>LBM@2?k%k&_aUb5Xjqf#!&7%zN#VZwmv65ezo^Y4S#(ed0yUn4tFOB
zh1f1SJ6_s?a{)u6VdwUC!Hv=8`%T9(^c`2hc9nt$(q{Dm2X)dK49ba+KEheQ;7^0)
ziFKw$%EHy_B1)M>=yK^=Z$U-LT36yX<F=`VawpD(xy$9hZLKdS9NJ`Zn_|f^uS`)c
z-Rl}C$-9t=SeW=txVx%`NS&LLwx4tQT@F-lQnBqQ-sOH}Jc&bP@MTU&SQLci>>EKT
zvD8IAom2&2?bTmX@_PBR4W|p?6?LQ+&UMzXxqHC5VHzf@Eb1u)kwyfy+NOM8Wa2y@
zNNDL0PE$F;yFyf^jy&RGwDXQwYw6yz>OMWvJt98X@;yr<mIFkh{a&op3>!*RQDBE-
zE*l*u=($Zi1}0-Y4lGaK?J$yQjgb<Bq)i+tJ7(x$;ieC4!=clV5G5IPlSyhAR$E4=
z$1c&+)JfppzZ*VSL$xH3n1^iI1K%)!-^sJU%xwj7WT8t7w6499b3QQ%J+gW)4)JMb
z8GVT`4`(VvLA^xbTV6K2V_8Mv*?gDDUBYV!P-qg?Dq*YIhGKXu$p#?E9&(-}opTbz
zZ#J#VgX+|T3gSW)eF}>+*ljUvNQ!;QYAoCq@>70=sJ{o{^21^?zT@r~hhf&O;Qiq+
ziGQQLG*D@5;LZ%09mwMiE4Q{IPUx-emo*;a6#DrmWr(zY27d@ezre)Z1BGZdo&pXn
z+);gOFelKDmnjq#8dL7CTiVH)dHOqWi~uE|NM^QI3EqxE6+_n>IW67~UB#J==QOGF
zp_S)c8TJ}uiaEiaER}MyB(grNn=2m&0yztA=!%3xUREyuG_jmadN*D&1nxvjZ6^+2
zORi7iX1iPi$tKasppaR9$a3IUmrrX)m*)fg1>H+$KpqeB*G>AQV((-G{}h=qItj|d
zz~{5@{?&Dab6;0c7!!%Se>w($RmlG7Jlv_zV3Ru8b2rugY0MVPOOYGlokI7%nhIy&
z-B&wE=lh2dtD!F?noD{z^O1~Tq4MhxvchzuT_oF3-t4YyA*MJ*n&+1X3<j>~6quEN
z@m~aEp=b2~mP+}TUP^FmkRS_PDMA{B<dV*k52^3iWFIaXBr1MC#nA4rRMbI6g1e0>
zaSy(P=$T~R!yc^Ye0*pl5xcpm_JWI;@-di+nruhqZ4gy7cq-)I&s&Bt3BkgT(Zdjf
zTvvv0)8xzntEtp4iXm}~cT+pi5k{w{(Z@l2XU9lHr4Vy~3ycA_T?V(QS{qwt?v|}k
z_ST!s;C4!jyV5)^6xC#v!o<DVtBeh%T7qnQl{H-3DV=+H*Qr*Tk6W^hU(ZD0kJnpt
z6l*<^aakgBhlA+xpS}v`t7iyV?zu_V<U{&GBzBLYIuzDQe~f#6w^zD>*uS%a-jQ6<
z)>o?z7=+zNNtIz1*F_HJ(w@=`E+T|9TqhC(g7kKDc8z~?RbKQ)LRMn7A1p*PcX2YR
zUAr{);~c7I#3Ssv<0i-Woj0&Z4a!u|@Xt2J1>N-|ED<3$o2V?OwL4oQ%$@!zLamVz
zB)K&Ik^~GOmDAa143{I4?XUk1<3-k{<%?&OID&>Ud%z*Rkt*)mko0RwC2=qFf-^OV
z=d@47?tY=A;=2VAh0mF(3x;!#X!%{|vn;U2XW{(nu5b&8kOr)Kop3-5_xnK5oO_3y
z!EaIb{r%D{7zwtGgFVri4_!yUIGwR(xEV3YWSI_+E}Gdl>TINWsIrfj+7DE?xp+5^
zlr3pM-Cbse*WGKOd3+*Qen^*uHk)+EpH-{u@i%y}Z!YSid<}~kA*IRSk|nf+I1N=2
zIKi+&ej%Al-M5`cP^XU>9A(m7G>58>o|}j0ZWbMg&x`*$B9j#Rnyo0#=BMLdo%=ks
zLa3(2EinQLXQ(3zDe7Bce%Oszu%?8PO648TNst4SMFvj=+{b%)ELyB!0`B?9R6<HO
z0ZCx8TWpL$G_aCzv{2o6N{#z3g%x>aO{i-63|s@|raSQGL~s)9R#J#duFaTSZ2M{X
z1?YuM*a!!|jP^QJ(hAisJuPOM`8Y-Hzl~%d@latwj}t&0{DNNC+zJARnuQfiN`HQ#
z?boY_2?*q;Qk)LUB)s8(Lz5elaW56p&fDH*AWAq7Zrbeq1!?FBGYHCnFgRu5y1jwD
zc|yBz+UW|X`zDsc{W~8m<GsO<mO_1`^L`RbrG?Z6Us2*=^_x$`JV{a_LYEsuJtJYL
ziPBF7dm}M2=6vrP;RB?Z6!7)Zvt4B!$rUPf{RA&_8%VD|7)NrR9*=&gO*sOzLhB*~
z^{cR)lY*pt9GGm(POd`WZo!H=s$8fLl_}-xnV5A+4*BbLUMGLAzH|i9_k(p_(`_J-
zjFFqtuzWuLa;BGl;mNUQM^&@rL--@GcC@@A*GDUdTjOrweNe5I+671K_l#WVI|@LM
z6mSs@4|l^kTD;Gvy}KaDi)#o4AD~D*LX@4{{bfG+FoqQ?-6%VkN)4{7vy<hZ9gNX|
zQxtE>$sh@VVnZD$lLnKlq@Hg^;ky!}ZuPdKNi2BI70;hrpvaA4+Q_+K)I@|)q1N-H
zrycZU`*YUW``Qi^`bDX-j7j^&bO+-Xg$cz2#i##($uyW{Nl&{DK{=lLWV<rkzZltE
zVX#Q@q!0kD+4jwZ#haJNHLSu>3|=<&si||2)l=8^8_z+Vho-#5LB0EqQ3v5U#*DF7
zxT)1j^`m+lW}p$>WSIG1eZ>L|YR-@Feu!YNWiw*IZYh03mq+2QVtQ}1ezRJM?0PA<
z;mK(J5@N8>u@<6Y$QAHWNE};rR|)U_&bv8dsnsza7{=zD1VBcxrALqnOf-qW(zzTn
zTAp|pEo#FsQ$~*$j|~Q;$Zy&Liu9OM;VF@#_&*nL!N2hH!Q6l*OeTxq!l>dEc{;Hw
zCQni{iN%jHU*C;?M-VUaXxf0FEJ_G=C8)C-wD!DvhY+qQ#FT3}Th8;GgV&AV94F`D
ztT6=w_Xm8)*)dBnDkZd~UWL|W=Gl<gto;(*wC9U9tZbpA!j<N3*HCbtKUlby_Vyr4
z!?d@=(#f`*(ud3VsGC{9IRi#5(w*FK!J}~s9(p0ap?ykZJBp1cTUR*jPbbAP&K)BP
zDUly$`B#Sn(aWroZGbyL&=Dg67A>u!$hc|1w7_7l!3MAt95oIp4Xp{M%clu&TXehO
z+L-1#{mjkpTF@?|w1P98OCky~S%@OR&o75P<Wn%&Jm$EVDF7;}E<;f25{W=vmcPFf
zmJVk81ZR1bRmlb|#0}DPdayCjq(27hQh>&ZHvC}Y=(2_{ib(-Al_7aZ^U?s34#H}=
zGfFi5%KnFVCKtdO^>Htpb07#BeCXMDO8U}crpe1Gm`>Q=6qB4i=nLoLZ%p$TY=OcP
z)r}Et-Ed??u~f09d3Nx3bS@ja!fV(Dfa5lXxRs#;8?Y8G+Qvz+iv7fiRkL3liip})
z&G0u8RdEC9c$$rdU53=<QkS9aMArWJ!P8{(D~hr9YfM2Q0nl|;=ukHlQj%<P$wYfa
z?$=heR#}yGJkpA2LI#>MH`p!Jn|DHjhOxHK$tW_pw9wCTf0Eo<){HoN=zG!!Gq4z4
z7PwGh)V<N7ESN6`*^`^Q73fj(wcMs7=5Iu(yJo@Q_F?W?yk3)SdLai+cM6GrKPrjs
za_NJm=uOAmRL5F_{*Yjb_BZNY?)kCB%$WE8;A{ZK>NPXW-cE#MtofE`-$9~nmmj}m
zlzZscQ2+Jq%gaB9rMgVJkbhup0Ggpb)&L01T=%>n7-?v@I8!Q(p&+!fd+Y^Pu9l+u
zek(_$^HYFVRRIFt@0Fp52g5Q#I`tC3li`;UtDLP*rA{-#Yoa5qp{cD)QYhldihWe+
zG~zuaqLY~$-1sjh2lkbXCX;lq+p~!2Z=76cvuQe*Fl>IFwpUBP+d^<W!tp~MwxCaj
zHBQw{tTF&?2^15<bHvmlCS|A$khwaGVZw*2lw&_pOQz;LcFj@Ysq%CZ)?t&74A|dB
z4WL~cZpG-0G^KuK)}aNOTySm-Lt#QyW&mN^>&E4BGc<j4bbw_-4Ttv5`+q&kCfaBq
z#Rl}~m+g*DG5=zM=t?z8cf%Vr>{m#l%Kuo6#{XGoRyFc%Hqhf|%nYd<;yiC>tyEyk
z4I+a<QbTvlzlVm5v2!^bF)s*0Cw+t*kzz%N#&QZ42CimT6ySz~?+nd>`(%%Ie=-*n
z-{mg=j&t12)LH3R?@-B1tEb7FLMePI1HK0`Ae@#)KcS%!Qt9p4_fmBl5zhO10n401
zBSfnfJ;?_r{%R)hh}BBNSl=$BiAKbuWrNGQUZ)+0=Mt&5!X*D@yGCSaMNY&@`;^a4
z;v=%D_!K!WXV1!3%4P-M*s%V2b#2jF2bk!)#2GLVuGKd#vNpRMyg`kstw0GQ8@^k^
zuqK5uR<>FeRZ#3{%!|4X!hh7hgirQ@Mwg%%ez8pF!N$xhMNQN((yS(F2-OfduxxKE
zxY#7O(VGfNuLv-ImAw5+h@gwn%!ER;*Q+001;W7W^waWT%@(T+5k!c3A-j)a8y11t
zx4~rSN0s$M8HEOzkcWW4YbKK9GQez2XJ|Nq?TFy;jmGbg;`m&%U4hIiarKmdTHt#l
zL=H;ZHE?fYxKQQXKnC+K!TAU}r086{4m}r()-QaFmU(qWhJlc$eas&y<Oz%^3FaFm
z1?*33BSANpZbOjV<(WE=T(DuY)_XOR{Jho+f)Z}g61HjnqKKN*8E0S?ATVoi0{#On
zGn@2R)R+{|FLX_EYm8{*=&UqzSkXCnZ)vWGS!9t02v^*;nhYk{U}PXVkPhlRc3UH{
zA-5Xc>?=H9EYQy8N$8^bni9TpD<bzO7YS=tCt}zYcl)|7!PRQIoif~D7yjeqW#(B3
zmpkmPyyRt85TQV!liLz!S@Olwr9!I#6DL45xU1kD`j8+MN!ST75vIA5J=~k_se^q#
zaC@(uVW_ra*o|Fs!(sX4Ik6k-(M%QP2;-Z@Rf=+&=pE`Dv8K9?k1Fg2pF%vW*HO>p
zkA^WRs?KgYgjxX4T6?`SMs$`s3vlut(YU~f2F+id(Rf_)$BIMibk9lACI~LA+i7xn
z%-+=DHV*0TCTJp~-|$VZ@g2vmd*|2QXV;HeTzt530KyK>v&253N1l}bP_J#UjLy4)
zBJili9#-ey8Kj(dxmW^ctorxd;te|xo)%46l%5qE-YhAjP`Cc03vT)vV&GAV%#Cgb
zX~2}uWNvh`2<*AuxuJpq>SyNtZwzuU)r@@dqC@v=Ocd(HnnzytN+M&|Qi#f4Q8D=h
ziE<3ziFW%+!yy(q{il8H44g^5{_+pH60Mx5Z*FgC_3hKxmeJ+wVuX?T#ZfOOD3E4C
zRJsj#wA@3uvwZwHKKGN{{Ag+8^cs?S4N@6(Wkd$CkoCst(Z&hp+l=ffZ?2m%%ffI3
zdV7coR`R+*dPbNx=*ivWeNJK=Iy_vKd`-_Hng{l?hmp=|T3U&epbmgXXWs9ySE|=G
zeQ|^ioL}tve<e`!rDYCFUej_ysJ2z(4AIN3g4xGaB0&Y<^`&A^@AOml<{gmBP!-y6
z!IsbSiZ8eH@;)gbXcV?N4*>N{s72_&h+F+W;G}?;?_s@h5>DX(rp#eaZ!E=NivgLI
zWykLKev+}sHH41NCRm7W>K+_qdoJ8x9o5Cf!)|qLtF7Izxk*p|fX8UqEY)_sI_45O
zL2u>x=r5xLE%s|d%MO>zU%KV6QKFiEeo12g#bhei4!Hm+`~Fo~4h|BJ)%ENxy9)Up
zOxupSf1QZWun=)gF{L0YWJ<(r0?$bPFANrmphJ>kG`&7E+RgrWQi}ZS#-CQJ*i#8j
zM_A0?w@4Mq@xvk^>QSvEU|VYQoVI=TaOrsLTa`RZfe8{9F~mM{L+C`9YP9?Okn<Y+
zQ`?h`EW57j4Qxm_DjacY`kEKG93n7#6{CBssPbH&1L2KSo|Htm*KD+0p<wD8e>Lw|
zmkvz>cS6`pF0FYeLdY%>u&XpPj5$*iYkj=m7wMzHqzZ5SG~$i_^f@QEPEC+<2nf-{
zE7W+n%)q$!5@2pBuXMxhUSi*%F>e_g!$T-_`ovjBh(3jK9Q^~OR{)}!0}vdTE^M+m
z9QWsA?xG>EW;U~5gEuKR)Ubfi&YWnXV;3H6Zt^NE725*`;lpSK4HS1sN?{~9a4JkD
z%}23oAovytUKfRN87XTH2c=kq1)O<qRzRUy={bH%*8V=pA##jg=-EE6(Lotu<IYEm
zZ71>5(fH_M3M-o{{@&~KD`~TRot-gqg7Q2U2o-iiF}K>m?CokhmO<lc^{s0_OssMw
zc*3nzZ5WN~$;I6TzaKlN9W+6*SX5vHzSUyIfdtNx5K}gB*a}Ei-T%?Pusx0i{k6zW
zVCCXrjNT1#YIkZ%s$(OfAJ`FBR*66B?{y$nkK6iXlBVVr@2#yGM6%0i_(U5#>DaLB
z1p6(6JYGntNOg(s!(>ZU&lzDf+Ur)^Lirm%*}Z>T)9)fAZ9>k(kvnM;ab$ptA=hoh
zVgsVaveXbMpm{|4*d<0>?l_JUFOO8A3xNLQOh%nVXjYI6X8h?a@6kDe5-m&;M0xqx
z+1U$s>(P9P)f0!{z%M@E7|9nn#IWgEx6A6JNJ(7dk`%6$3@!C!l;JK-p2?gg+W|d-
ziEzgk$w7k48NMqg$CM*4O~Abj3+_yUKTyK1p6GDsGEs;}=E_q>^LI-~pym$qhXPJf
z2`!PJDp4l(TTm#|n@bN!j;-FFOM__eLl!6{*}z=)UAcGYloj?bv!-XY1TA6Xz;82J
zLRaF{8ayzGa|}c--}|^xh)xgX>6R(sZD|Z|qX50gu=d`gEwHqC@WYU7{%<5VOnf9+
zB<I4+b1=sZ53G|-kvYcPViY)E5R#f6q2$x?f020VY)3|@p~2oGrySSwa~uPN4nC&g
zX!I>@FX?|UL%`8EIAe!*UdYl|6wRz6Y>(#8x92$#y}wMeE|ZM2X*c}dKJ^4NIf;Fm
zNwzq%QcO?$NR-7`su!*$dlIKo2y(N;qgH@1|8QNo$0wbyyJ2^}$iZ>M{BhBjTdMjK
z>gPEzgX4;g3$rU?jvDeOq`X=>)zdt|jk1Lv3u~bjHI=EGLfIR&+K3ldcc4D&Um&04
z3^F*}WaxR(ZyaB>DlmF_UP@+Q*h$&nsOB#gwLt{1#F4i-{A5J@`>B9@{^i?g_Ce&O
z<<}_We-RUFU&&MHa1#t56u<quT+%|#XvIpRJ?co{{tU0{tvlHG=;UJAM%ZgS1Wk*<
zbzK}T;?L5YLE4NLu9J0u#X!J<y<O?uV#gKBNVOZ@7SW<kFyslWRX@_C90;+zxGfEz
zb5V;-W-;gzJ|=>_oM(Ljn7djja!T|gcxSoR=)@?owC*NkDarpBj=W4}=i1@)@L|C)
zQKA+o<(pMVp*Su(`zBC0l1yTa$MRfQ#uby|$mlOM<xEsq_18&vqMDMD7Zoz%Fkm7A
z3)Py9=vTp8h$K)n9Uvzc$sVOT&zol^a%bZk8R4Y8^rZSJmY_uRt<`DC1F!?x#33tZ
ze&XW>s=G`4J|?apMzKei%jZql#gP@IkOaOjB7MJM=@1j(&!jNnyVkn5;4lvro1!vq
ztXiV8HYj5%)r1PPpIOj)f!><jg)vV+x8*ZL<Q!-CP7F3VXp#~OA}`YkX&1&s!htsT
z^$c2`mPAtTVX<qUk`r6!8Vb=Uc23%M)2;P#-xg0%R+ozayS`Bp$+go_wMt83+CODc
z2B}|cG;*tiKwHPYIq{X<`rJQAk*7&QC@O%H3Z553ow$9gREC4~b(*v-N%(bN;Y@mL
zsmAcMVly_+3OO{6?K&3Aei;$vMv!82h}`Bdn#~L=J)xK(4o*51?I7`(&5m9X))pa;
zLPfmH5<-xa-W%$*L{V<;N$-)VdNT!&jA&vHrEgBjjo5UU0If7Vhz3vkcHNAY5aT+C
zc5euR<}4<-qaBP_Zef)X2|HW=07DGXb>pc^3#LvfZ(hz}C@-3R(Cx7R427*Fwd!XO
z4~j&IkPHcBm0h_|iG;ZNrYdJ4HI!$rSyo&sibmwIgm1|J#g6%>=ML1r!kcEhm(XY&
zD@mIJt;!O%WP7CE&wwE3?1-dt;RTHdm~LvP7K`ccWXkZ0kfFa2S;wGtx_a}S2lslw
z$<4^Jg-n#Ypc(3t2N67Juasu=h)j&UNTPNDil4MQMTlnI81kY46uMH5B^U{~nmc6+
z9>(lGhhvRK9ITfpAD!XQ&BPphL3p8B4PVBN0NF6U49;ZA0Tr75AgGw7(S=Yio+xg_
zepZ*?V#KD;sHH+15ix&yCs0eSB-Z%D%uujlXvT#V$Rz@$+w!u#3GIo*AwMI#Bm^oO
zLr1e}k5W~G0xaO!C%Mb{sarxWZ4%Dn9vG`KHmPC9GWZwOOm11XJp#o0-P-${3m4g(
z6~)X9FXw%Xm~&99tj>a-ri})ZcnsfJtc10F@t9xF5vq6E)X!iUXHq-ohlO`gQdS&k
zZl})3k||u)!_=nNlvMbz%AuIr89l#I$;rG}qvDGiK?xTd5HzMQkw*p$YvFLGyQM!J
zNC^gD!kP{A84nGosi~@MLKqWQNacfs7O$dkZtm4-BZ~iA8xWZPkTK!Hp<LTap+x4*
zUK;Ha0;Jc=$HCCwcHw+aadnOZR281fO)q}D^z9=|qH9;-;e${xK|?9elJ8=LaM<65
zE6;>A5zr!9Z&+icfAJ1)NWkTd!-9`NWU>9uXXUr;`Js#NbKFgrNhTcY4GNv*71}}T
zFJh?>=EcbUd2<|fiL+H=wMw8hbX6?+_cl4XnCB#ddwdG><R|vBc*yG=?!<`t>bki*
zt*&6Dy&EIPluL@A3_;R%)shA-tDQA1!Tw4ffBRyy;2n)vm_JV06(4O<t|JggQ(KZT
zsYO62-6u^^mX>r&QAOKNZB5f(MVC}&_!B>098R{Simr!UG}?CW1Ah+X+0#~0`X)od
zLYablwmFxN21L))!_zc`IfzWi<Gu||u|EiUx`=l}NMzvxMP68pmmwjICH*y4{3)P@
z%y44Q*AVc4<$z9@nMeRAeVJ+>`5>MxPe(Dm<mb5oz44!o-XIzF2v`EK`q7j%sCMv2
zL>jjO1}HHt7TJtAW+VXHt!aKZk>y6PoMsbDXRJnov;D~Ur~2R_7(Xr)aa%wJwZh<i
zvMmaF%EvU)a6S{Gh%whrx@S36i|iv5oL=QhR4YK<CK74@mwN~dH00RX{_e6r+#l%j
z7OK<7e3kn;@H(@8>S3gr7IGgt%@;`jpL@gyc6bGCVx!9CE7NgIbUNZ!Ur1RHror0~
zr(j$^yM4j`#c2KxSP61;(Tk^pe7b~}LWj~SZC=MEpdKf;B@on9=?_n|R|0q;Y*1_@
z>nGq>)&q!;u-8H)WCwtL<LrD$x{Fa((5#4K!l=^|krt6e2?!PZN=Rmwt*1$d&$Q{J
zCgeI0rGg+wn3iR*eck$cFmbQ~E3GYxr&dJb(4{lgPt?n#^<GT#&j{om5`|wE6bW}}
ze{Pav1oDZnak%Fz$PD1ZH8xBo#FnqUG6u>&7F4vbnnfSAlK1mwnRq2&gZrEr!b1MA
z(3%vAbh3aU-IX`d7b@q`-WiT6eitu}ZH9x#d&qx}?CtDuAXak%5<-P!{a`V=$|XmJ
zUn@4lX6#ulB@a=&-9HG)a>KkH=jE7>&S&N~0X0zD=Q=t|7w;kuh#cU=NN7gBGbQTT
z;?<kJaO{>bdSt8V&IIi}<ThZP?O{MP;s77svl-cIdCj)d-BZGJap1Ull?cz;BdUt4
zMAS0={#2iyI>sDTzA0dkU}Z-Qvg;RDe8v>468p3*&hbG<I%;HTx8<Z&Ih@Xrl%AO4
zEZ252P#-|8MJE+L5IXho^0!PtBR61%3tAJ8RP$~a8%~<+5(4Lyh@;kvSLVbDc4PRn
z?4(9&{Rpo>T1I3hi9hh~Z(!H}{+>eUyF)H&gdrX=k$aB%J6I<Mis<6rrEG;E4zw&M
zYsQ6$FFc_^cwkYGT9ds?4^G_w2+$2L@}W#bXUf0JW}7J?EgbIp`jFFailmTZXuEyM
z?LcqfTM!s>;6+^^kn1mL+E+?A!A}@xV(Qa@M%HD5C@+-4Mb4lI=Xp=@9+^x+jhtOc
zYgF2aVa(uSR*n(O)e6tf3JEg2xs#dJfhEmi1iOmDYWk|wXNHU?g23^IGKB&yHnsm7
zm_+;p?YpA#N*7vXCkeN2LTNG`{QDa#U3fcFz7SB)83=<8rF)|udrEbrZL$o6W?oDR
zQx!178Ih9B#D9Ko$H(jD{4MME&<|6%MPu|TfOc#E0B}!j^MMpV69D#h2`vsEQ{(?c
zJ3Lh!3&=yS5fWL~;1wCZ?)%nmK`Eqgcu)O6rD^3%ijcxL50^z?OI(LaVDvfL0#zjZ
z2?cPvC$QCzpxpt5jMFp05OxhK0F!Q<m=7hVYzR||ecS~Bi9y8}>`rPhDi5)y=-0C}
zIM~ku&S@pl1&0=jl+rlS<4`riV~LC-#pqNde@44MB(j%)On$0Ko(@q?4`1?4149Z_
zZi!5aU@2vM$dHR6WSZpj+VboK+>u-CbNi7*lw4K^ZxxM#24_Yc`<w`lM<_9<AjZra
zPf9|W$q@ib+eT6)aN(T>jvb9NPVi75L+MlM^U~`;a7`4H0L|TYK>%hfEfXLsu1JGM
zbh|8{wuc7ucV+`Ys1kqxsj`dajwyM;^X^`)#<+a~$WFy8b2t_RS{8yNYKKlnv+>vB
zX(QTf$kqrJ;%I@EwEs{cIcH@Z3|#^S@M+5jsP<^`@8^I4_8MlBb`~cE^n+{{;qW2q
z=p1=&+fUo%T{GhVX@;56kH8K_%?X=;$OTYqW1L*)hzelm^$*?_K;9JyIWhsn4SK(|
zSmXLTUE8VQX{se#8#Rj*lz`xHtT<61V~fb;WZUpu(M)f#<N`ZtP}(nwt@v*JXMv*g
zTjkPmLef!CJNB3?7*>;I+2_zR+)y5Jv?l`CxAinx|EY!`IJ*x9_gf_k&Gx2alL!hK
zUWj1T_pk|?iv}4EP#PZvYD_-LpzU!NfcL<ZIyO_4myXe0OU}<Cprr_|XIrM73FXg`
zNRt~K9+=_-Laa5&Rt6kJaobEvjFnh>L%fK&r$W8O1KH9c2&GV~N#T$kaXGvAOl)|T
zuF9%6(i=Y3q?X%VK-D2YIY<MPA*$`<$Z)_O$(a?^Bnjd_-qk6atAX5(s0D1W1}`G9
zl)%h^mai+5Kwy1+I$Zaauh0oNm3mQUQ=`8aEAo=0zrm72grj|c8&W!-^+^6zMgm-+
zSpJe{_P`h~;t1=21VLIQ5n~@Q5Y=~VMN|L<mJfGW44?>FPH3f|g$TrXW->&^Ab`WT
z7>Oo!u1u40?jAJ8H<j_H`^tLy@LZ5-N)dU$=t?bXuTI1>y`bv}qb<AzbCJ<X7c~}%
z50@S(*;X)_P8TrUWZGQQn`AI#Eve&0+FNaAqg<m^ZNYdEveME+t5Q5DV5-rT<{g7@
zG+rSFooLii=nDW~qWOU#YzUJee#V*XI!cGhpz&<{SF!$pIm@`rT3A99J?qG9DPU@z
z9jawkO0(cqfU^RIM<K3r*yl0SKgPT>gs8)cF0&qeVjD?e+3Ggn1Im>K77ZSpbU*08
zfZkIFcv?y)!*B{|>nx@cE{KoutP+seQU?bCGE`tS0GKUO3PN~t=2u7q_6$l;uw^4c
zVu^f{uaqsZ{*a-N?2B8ngrLS8<WR!m{e>E&s6}Xtv9rR9C^b`@q8*iH)pFz<!x=AK
zf6E-O(MiUN4a^nRWR%`TBl@CGu2cFmmpRkBUAPvyvw&qDg1_6Y)ycUoITv4yV(Mk5
z=Dtmg6tsakVjdG2BV~=LD3YcTEr=j6ou|^*Qem;+#vOz?`MQ>f1|kCfiLw6u{Z%aC
z!X^5CzF6qofFJgkl<Rtc72CagCpKF^gmhb1CH>JV3oc|Qc2XdFl+y5M9*P8}A>Kh{
zWRgRwMSZ(?Jw;m%0etU5BsWT-Dj-5F;Q$OQJrQd+lv`i6>MhVo^p*^w6{~=fhe|bN
z*37oV0kji)4an^%3ABbg5RC;CS50@PV5_hKfXjYx+(DqQdKC^JIEMo6X66$qDdLRc
z!YJPSKnbY`#Ht6`g@xGzJmKzz<St<)P9XB^ZWQT2VtTE^8HdQx8o;%`J{lUpkn0!&
z^d*IdfCW?sDnD#zV!vee5Xd}&#I@u4z;`)LVXVayyf`~NUMeM>n|abYbP+_Q(v?~~
z96%cd{E0BCsH^0HaWt{y(Cuto4VE7jhB1Z??#UaU(*R&Eo+J`UN+8mcb51F|I|n*J
zJCZ3R*OdyeS9hWkc_mA7-br>3Tw=CX2bl(=TpVt#WP8Bg^vE_9bP&6ccAf3lFMgr`
z{3=h@?Ftb$RTe&@IQtiJf<Z$(x)W;Yibdk0Eou)O=h)|ox2XJhbM7gDjm$)%o0c)W
z!;CM_%5jr$Dk{vl7{DX~*^!MCEDILf;SGbcLK^kRyl}+&4r>V;O&4fzh)e1>7seG;
z=%mA4@c7{aXeJnhEg2J@Bm;=)j=O=cl#^NNkQ<{r;Bm|8Hg}bJ-S^g4`|itx)~!LN
zXtL}?f1Hs6UQ+f0-X6&TBCW=A4>bU0{rv8C4T!(wD-h>VCK4YJk`6C9$by!fxOYw-
zV#n+0{E(0ttq<e;u-JNg<=7mR)Baf(#XbsMPDR?mv12UXo+AuGM*TW4&Dbw3MHmyv
zzQ)3g$Jc}F5k_3<jP&G5r+akl<UzYyi9?xB4hK@h8+B`?3~Bn5^eKgTbZcatPPir(
zn|7xaL9v;L3{V1l&DQSp%TOnp^O8OS$m-yD0^r7mU@qJQ<RvUSI@G_}IuDMi8mq0p
z?O{gor*9fmQL7Mrb|ducn%AQOk@nhAYv{%&-E+j$)7Bpd*!L2Cg%7pf&3ZLxA5Fwj
z%8~}*Sw2G<h3E&$jhO(1=)P&U%mN)4Rk5JcPDUdUN*FM8j0Mg^@Z|6~Ym*2e3TCV6
z?5B1NxqE*aMe#2m&+Fz%OG!n`J`B2Ww|QiS6U=1^3d+6`ls$U%hB`nu)=J>_#16B}
ze8$E#X9o{B!0vbq#WUwmv5Xz6{(!^~+}sBW{xctdNHL4^vDk!0E}(g|W_q;jR|ZK<
z8w>H-8G{%R#%f!E7cO_^B?yFRKLOH)RT9GJsb+kAKq~}WIF)NRLwKZ^Q;>!2MNa|}
z-mh?=B;*&D{Nd-mQRcfVnHkChI=DRHU4ga%xJ%+QkBd|-d9uRI76@BT(bjsjwS+r)
zvx=lGNLv1?SzZ;P)Gnn>04fO7Culg*?LmbEF0fATG8S@)oJ>NT3pYAXa*vX!eUTDF
ziBrp(QyDqr0ZMTr?4uG_Nqs6f%S0g?h`1vO5fo=5S&u#wI2d4+3hWiolEU!=3_oFo
zfie<EEFWI+<HRR}kMBRY{{xT?Ubu+n1E+3-XyZ@DlC1|CziB+t8LH;pSr1_{$txb2
z{LD6Cutu@sVLZ$sgxfHzi88%ifnz%FWxPwItQ=UFSeRQ?XX#H8uXPtSY1Da8V^-Nz
zx}G&3QUOW&pFuYAPt>?+4W#`;1dd#X@g9Yj<53S<6OB!TM8w8})7k-$&q5(smc%;r
z(BlXkTp`C47+%4JA{2X}MIaPbVF!35P#p;u7+fR*46{T+LR8+<Ms(<(ewo92Plp}^
z0K5%%0PpyoHDM$82Vjt^Jp>j25oduCfDzDv6R-hU{TVVo9fz?^N3ShMt!t0NsH)pB
zRK8-S{Dn*y3b|k^*?_B70<2gHt==l7c&cT>r`C#{S}J2;s#d{M)ncW(#Y$C*lByLQ
z&?+{dR7*gpdT~(1;<m}fXp@S^XBCFbD&Le<rzooSQB^d8r#S^ok_xS36-~w}kc?Ej
z7^zYrQY=EF$c06)iin^U556ixd{lb)^l<R>M(FfF==3z`^eW)=5a9RqvF-)2?S-(G
zhS;p(u~_qBum*q}On@$#08}ynd0+spzyVco0%G6;<-i5&016cV5UKzhQ~)fX03|>L
z8ej+HzzgVr6_5ZUpa4HW0Ca!=r1%*}Oo;2no&Zz8DfR)L!@r<<lmB!F&$32&71xdc
zAQ}KMGyqI!0F2N8;eY{y00CwIf0+QV$OUD<C@ujha0p9)KwJUh;0%`lShxaZKm`>5
z2viSZpmvo5XqXyAz{Ms7`7kX>fnr1gi4X~7KpznRT0{Xc5Cfz@43PjBMBoH@z_{~(
z(Wd}IPJ9hH+%)Fc)0!hrV+(A;76rhtI|YHbEDeERV~Ya>SQg^IvlazFkSK(KG9&{q
zkPIR~EeQaaBmwA<20}m<i2yt#0ML*D!NB+q2RLvyLxH9o41nNb1p??O7J)#e3I!NY
z1wlX)g#bnj0Jty$0KoMI0Cb7`0i50h9gE~g7Om;jPg0kO>BO?)N$(z1@p)5?%}rM|
zGF()~Z&Kx@OIDRI$d0T8;JX@vj3^2%pd_+@l9~a4lntZ;AvUIjqIZbuNTR6@hNJoV
zk4F;ut)LN4ARuyn2M6F~eg-e#UH%2P;8uPGFW^vq1vj8mdIayFOZo(tphk8C7hpT~
z1Fv8?b_LNR3QD9J+!v=p%}#<WkmT3SAH~zHvL~<r009F5U;qFWp(o;x5Q1O?TufB{
c@Yw=E7;q9obAc&xg(1}n;wTCO(gbOOU|30r`2YX_

literal 0
HcmV?d00001

diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.svg b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.svg
new file mode 100644
index 00000000..94fb5490
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.svg
@@ -0,0 +1,288 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
+<font-face units-per-em="1200" ascent="960" descent="-240" />
+<missing-glyph horiz-adv-x="500" />
+<glyph horiz-adv-x="0" />
+<glyph horiz-adv-x="400" />
+<glyph unicode=" " />
+<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
+<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xa0;" />
+<glyph unicode="&#xa5;" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
+<glyph unicode="&#x2000;" horiz-adv-x="650" />
+<glyph unicode="&#x2001;" horiz-adv-x="1300" />
+<glyph unicode="&#x2002;" horiz-adv-x="650" />
+<glyph unicode="&#x2003;" horiz-adv-x="1300" />
+<glyph unicode="&#x2004;" horiz-adv-x="433" />
+<glyph unicode="&#x2005;" horiz-adv-x="325" />
+<glyph unicode="&#x2006;" horiz-adv-x="216" />
+<glyph unicode="&#x2007;" horiz-adv-x="216" />
+<glyph unicode="&#x2008;" horiz-adv-x="162" />
+<glyph unicode="&#x2009;" horiz-adv-x="260" />
+<glyph unicode="&#x200a;" horiz-adv-x="72" />
+<glyph unicode="&#x202f;" horiz-adv-x="260" />
+<glyph unicode="&#x205f;" horiz-adv-x="325" />
+<glyph unicode="&#x20ac;" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
+<glyph unicode="&#x20bd;" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
+<glyph unicode="&#x2212;" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#x231b;" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
+<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="&#x2601;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
+<glyph unicode="&#x26fa;" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
+<glyph unicode="&#x2709;" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
+<glyph unicode="&#x270f;" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
+<glyph unicode="&#xe001;" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
+<glyph unicode="&#xe002;" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
+<glyph unicode="&#xe003;" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
+<glyph unicode="&#xe005;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
+<glyph unicode="&#xe006;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
+<glyph unicode="&#xe007;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
+<glyph unicode="&#xe008;" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
+<glyph unicode="&#xe009;" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
+<glyph unicode="&#xe010;" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe011;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
+<glyph unicode="&#xe012;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe013;" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
+<glyph unicode="&#xe014;" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
+<glyph unicode="&#xe015;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe016;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe017;" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
+<glyph unicode="&#xe018;" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe019;" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
+<glyph unicode="&#xe020;" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
+<glyph unicode="&#xe021;" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
+<glyph unicode="&#xe022;" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
+<glyph unicode="&#xe023;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe024;" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
+<glyph unicode="&#xe025;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe026;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
+<glyph unicode="&#xe027;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
+<glyph unicode="&#xe028;" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
+<glyph unicode="&#xe029;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
+<glyph unicode="&#xe030;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
+<glyph unicode="&#xe031;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
+<glyph unicode="&#xe032;" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe033;" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
+<glyph unicode="&#xe034;" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
+<glyph unicode="&#xe035;" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
+<glyph unicode="&#xe036;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
+<glyph unicode="&#xe037;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
+<glyph unicode="&#xe038;" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
+<glyph unicode="&#xe039;" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
+<glyph unicode="&#xe040;" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
+<glyph unicode="&#xe041;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
+<glyph unicode="&#xe042;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
+<glyph unicode="&#xe043;" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
+<glyph unicode="&#xe044;" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe045;" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
+<glyph unicode="&#xe046;" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
+<glyph unicode="&#xe047;" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
+<glyph unicode="&#xe048;" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
+<glyph unicode="&#xe049;" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
+<glyph unicode="&#xe050;" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
+<glyph unicode="&#xe051;" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
+<glyph unicode="&#xe052;" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe053;" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe054;" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe055;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe056;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe057;" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe058;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe059;" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
+<glyph unicode="&#xe060;" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
+<glyph unicode="&#xe062;" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
+<glyph unicode="&#xe063;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
+<glyph unicode="&#xe064;" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
+<glyph unicode="&#xe065;" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
+<glyph unicode="&#xe066;" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
+<glyph unicode="&#xe067;" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
+<glyph unicode="&#xe068;" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
+<glyph unicode="&#xe069;" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe070;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe071;" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
+<glyph unicode="&#xe072;" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
+<glyph unicode="&#xe073;" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe074;" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
+<glyph unicode="&#xe075;" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
+<glyph unicode="&#xe076;" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe077;" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe078;" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe079;" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
+<glyph unicode="&#xe080;" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
+<glyph unicode="&#xe081;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
+<glyph unicode="&#xe082;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
+<glyph unicode="&#xe083;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
+<glyph unicode="&#xe084;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
+<glyph unicode="&#xe085;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="&#xe086;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="&#xe087;" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
+<glyph unicode="&#xe088;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="&#xe089;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="&#xe090;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
+<glyph unicode="&#xe091;" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
+<glyph unicode="&#xe092;" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
+<glyph unicode="&#xe093;" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
+<glyph unicode="&#xe094;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe095;" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
+<glyph unicode="&#xe096;" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
+<glyph unicode="&#xe097;" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
+<glyph unicode="&#xe101;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="&#xe102;" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
+<glyph unicode="&#xe103;" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
+<glyph unicode="&#xe104;" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
+<glyph unicode="&#xe105;" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
+<glyph unicode="&#xe106;" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
+<glyph unicode="&#xe107;" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
+<glyph unicode="&#xe108;" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
+<glyph unicode="&#xe109;" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
+<glyph unicode="&#xe110;" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
+<glyph unicode="&#xe111;" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
+<glyph unicode="&#xe112;" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
+<glyph unicode="&#xe113;" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
+<glyph unicode="&#xe114;" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
+<glyph unicode="&#xe115;" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="&#xe116;" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
+<glyph unicode="&#xe117;" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
+<glyph unicode="&#xe118;" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
+<glyph unicode="&#xe119;" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="&#xe120;" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
+<glyph unicode="&#xe121;" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
+<glyph unicode="&#xe122;" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
+<glyph unicode="&#xe123;" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
+<glyph unicode="&#xe124;" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
+<glyph unicode="&#xe125;" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe126;" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
+<glyph unicode="&#xe127;" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe128;" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe129;" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe130;" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
+<glyph unicode="&#xe131;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
+<glyph unicode="&#xe132;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
+<glyph unicode="&#xe133;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
+<glyph unicode="&#xe134;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="&#xe135;" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
+<glyph unicode="&#xe136;" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
+<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
+<glyph unicode="&#xe138;" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
+<glyph unicode="&#xe139;" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
+<glyph unicode="&#xe140;" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
+<glyph unicode="&#xe141;" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
+<glyph unicode="&#xe142;" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
+<glyph unicode="&#xe143;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
+<glyph unicode="&#xe144;" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
+<glyph unicode="&#xe145;" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
+<glyph unicode="&#xe146;" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
+<glyph unicode="&#xe148;" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
+<glyph unicode="&#xe149;" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
+<glyph unicode="&#xe150;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="&#xe151;" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
+<glyph unicode="&#xe152;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
+<glyph unicode="&#xe153;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
+<glyph unicode="&#xe154;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
+<glyph unicode="&#xe155;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
+<glyph unicode="&#xe156;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
+<glyph unicode="&#xe157;" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
+<glyph unicode="&#xe158;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
+<glyph unicode="&#xe159;" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
+<glyph unicode="&#xe160;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
+<glyph unicode="&#xe161;" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
+<glyph unicode="&#xe162;" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
+<glyph unicode="&#xe163;" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
+<glyph unicode="&#xe164;" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
+<glyph unicode="&#xe165;" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
+<glyph unicode="&#xe166;" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
+<glyph unicode="&#xe167;" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
+<glyph unicode="&#xe168;" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
+<glyph unicode="&#xe169;" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
+<glyph unicode="&#xe170;" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
+<glyph unicode="&#xe171;" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
+<glyph unicode="&#xe172;" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
+<glyph unicode="&#xe173;" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="&#xe174;" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
+<glyph unicode="&#xe175;" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe176;" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
+<glyph unicode="&#xe177;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
+<glyph unicode="&#xe178;" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
+<glyph unicode="&#xe179;" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
+<glyph unicode="&#xe180;" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
+<glyph unicode="&#xe181;" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
+<glyph unicode="&#xe182;" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
+<glyph unicode="&#xe183;" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
+<glyph unicode="&#xe184;" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe185;" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
+<glyph unicode="&#xe186;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
+<glyph unicode="&#xe187;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
+<glyph unicode="&#xe188;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
+<glyph unicode="&#xe189;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
+<glyph unicode="&#xe190;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
+<glyph unicode="&#xe191;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
+<glyph unicode="&#xe192;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
+<glyph unicode="&#xe193;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
+<glyph unicode="&#xe194;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
+<glyph unicode="&#xe195;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
+<glyph unicode="&#xe197;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe198;" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
+<glyph unicode="&#xe199;" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
+<glyph unicode="&#xe200;" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
+<glyph unicode="&#xe201;" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
+<glyph unicode="&#xe202;" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
+<glyph unicode="&#xe203;" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
+<glyph unicode="&#xe204;" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
+<glyph unicode="&#xe205;" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
+<glyph unicode="&#xe206;" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
+<glyph unicode="&#xe209;" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
+<glyph unicode="&#xe210;" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe211;" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe212;" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe213;" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe214;" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe215;" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe216;" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
+<glyph unicode="&#xe218;" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
+<glyph unicode="&#xe219;" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
+<glyph unicode="&#xe221;" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe223;" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
+<glyph unicode="&#xe224;" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
+<glyph unicode="&#xe225;" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="&#xe226;" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
+<glyph unicode="&#xe227;" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
+<glyph unicode="&#xe230;" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
+<glyph unicode="&#xe231;" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
+<glyph unicode="&#xe232;" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
+<glyph unicode="&#xe233;" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
+<glyph unicode="&#xe234;" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
+<glyph unicode="&#xe235;" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
+<glyph unicode="&#xe236;" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe237;" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
+<glyph unicode="&#xe238;" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe239;" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
+<glyph unicode="&#xe240;" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
+<glyph unicode="&#xe241;" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
+<glyph unicode="&#xe242;" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
+<glyph unicode="&#xe243;" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
+<glyph unicode="&#xe244;" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
+<glyph unicode="&#xe245;" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
+<glyph unicode="&#xe246;" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
+<glyph unicode="&#xe247;" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe248;" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
+<glyph unicode="&#xe249;" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe250;" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
+<glyph unicode="&#xe251;" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
+<glyph unicode="&#xe252;" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
+<glyph unicode="&#xe253;" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
+<glyph unicode="&#xe254;" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
+<glyph unicode="&#xe255;" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
+<glyph unicode="&#xe256;" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
+<glyph unicode="&#xe257;" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
+<glyph unicode="&#xe258;" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
+<glyph unicode="&#xe259;" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
+<glyph unicode="&#xe260;" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
+<glyph unicode="&#xf8ff;" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
+<glyph unicode="&#x1f511;" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
+<glyph unicode="&#x1f6aa;" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
+</font>
+</defs></svg> 
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.ttf b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..1413fc609ab6f21774de0cb7e01360095584f65b
GIT binary patch
literal 45404
zcmd?Sd0-pWwLh*qi$?oCk~i6sWlOeWJC3|4juU5JNSu9hSVACzERcmjLV&P^utNzg
zIE4Kr1=5g!SxTX#Ern9_%4<u(w1q<J@CsjEOL>&01rlrW`<y$HCCf?Z+y45=o|!u{
zcjlhEoqP5%FoVJ1G+bj44I8ITTQqxJ-LCg=WdK{*^eI!Pu_*@0U|>Z!56xXTGQR4C
z3vR~wXq>NDx$c~e?;ia3YjJ*$!C>69a?2$lLyhpI!C<oCzO?F`i#HxWjyD@jE}WZI
zU3l5~SDy9q1|;#myS}~pymONB?2*4U816rW`)#Xn!7@d1<NOHDt5&bOWb2!+g;p30
z4<NsI$%PwMp0nZD-M=sx9=^?B5SrGVvvng|Yryk+==sq4bJm^rO#Q?6;T&}k_iWs7
z@g?8i`(dlW@aQ!LgXLG3o_Fr~uM{nsXD~dq2>FfJsP=|`8@K0|bbMpWwVU<h#k=?&
z2hLD3ege)J^J9<Jz!_dI-O6?vWP>Eygg0=0x_)HeHpGSJagJNLA3c!$EuOV>j$wi!
zbo{vZ(s8tl>@!?}dmNHXo)ABy7ohD7_1G-P@SdJWT8*oeyB<gVy2N^Mz8Y_p4K;?4
zVT9pf!y_R}Xk_T@(1FkoDm{_X>VYVW9*vn}&VI4q++W;Z+uz=QTK}^C75!`aFYCX#
zf7fC2;o`%!huaTNJAB&VWrx=szU=VLhwnbT`vc<#<`4WI6n_x@AofA~2d90o?1L3w
z9!I|#P*NQ)$#9aASijuw>JRld^-t)Zhmy|i-`Iam|IWkgu<LN>aMR%lhi4p~cX-9&
zjfbx}yz}s`4-6>D^+6FzihR)Y!GsUy=_MWi_v7y#KmYi-{iZ+s@ekkq!<s)V`@Q^L
z`rY8W#qWgQ@xJ2-1w&;af5?RzOBGthmla=B{I%lG6(3e?tJqSpv0`mSvSMY$Srtnw
z=2y(Bm|8KV{P*SWmH)c@?ebrg|GfOw@*kDIQ2vZb)ms;}`oI6t>@Wxz!~BQwiI&ti
z>hC&iBe2m(dpNVvSbZe3DVgl(dxHt-k@{xv;&`^c8GJY%&^LpM;}7)B;5Qg5J^E${
z7z~k8eWOucjX6)7q1a%EVtmnND8cclz8R1=X4W@D8IDeUGXxEWe&p>Z*voO0u_2!!
zj3dT(Ki+4E;uykKi*yr?w6!BW2FD55PD6SMj`OfBLwXL5EA-9KjpMo4*5Eqs^>4&>
z8PezAcn!9jk-h-Oo!E9EjX8W6@EkTHeI<@AY{f|5fMW<-Ez-z)xCvW3()Z#x0oydB
zzm4MzY^NdpIF9qMp-jU;99LjlgY@@s+=z`}_%V*xV7nRV*Kwrx-i`FzI0BZ#yOI8#
z!SDeNA5b6u9!Imj89v0(g$;dT_y|Yz!3V`i{{_dez8U@##|X9<u78GO6Sj7w|BmAX
zYy>A};s^7vEd!3AcdyVlhVk$v?$O442KIM1-wX^R{U7`JW&lPr3N(%kXfXT_`7w^?
z=#ntx`tTF|N$UT?pELvw7T*2;=Q-x@KmDUIbLyXZ>f5=y7z1DT<7>Bp0k;eItHF?1
zErzhlD2B$Tm|^7DrxnTYm-tgg`Mt4Eivp5{r$o9e)8(fXBO4g|G^6Xy?y$SM*&V52
z6SR*%`%DZC^w(gOWQL?6DRoI*hBNT)xW9sxvmi@!vI^!mI$3kvAMmR_q#SGn3zRb_
zGe$=;Tv3dXN~9XuIHow*NEU4y&u}FcZEZoSlXb9IBOA}!@J3uov<cnLsMTt5KB)Lj
zYZXCxu;1bqjH18<x269<Tv%)JD-Sv?wUz&5KB?<}@bC!>p}yerhPMaiI8|SDhvWVr
z^BE&yx6e3&RYqIg;mYVZ*3#A-cDJ;#ms4txEmwm<RofF(aiZ;^6Sh1kbq&8p87Q}2
z)<!HT6VUck^|BOZR8X4U*lI4NmphK3T)k;q2UF1)TE2tD(Oq%0w%C5uBAc|kj54!X
zjK;0TBFmM`n@u^bcUhg<U$UozsV%ZmyUQe7juv~qZStAE?UA}H^b(uR^svd6<ohSA
zPN(&WybCrXyU=981ISP9mNdxHZPF8l4xGdT{y?OqQH)eNL?x_*jVgBKQggghY;ER4
z2ZJLPNi?@5u<K+P9v^?cajfyXk(LSV0q=;>@g^s`BB}KmSr7K+ruIoKs=s|gOXP|2
zb1!)87h9?(+1^QRWb(Vo8+@G=o24gyuzF3ytfsKjTHZJ}o{YznGcTDm!s)DRnmOX}
z3pPL4wExoN$kyc2>#J`k+<67sy-VsfbQ-1u+HkyFR?9G`9r6g4*8!(!c65Be-5hUg
zZHY$M0k(Yd+DT1*8)G(q)1<YNpB7js)5y12Eq7a-+TSy$n{z4WbFWWmXqX`NmQ;<8
z&#kMnTCG)e^Wqb#OY{bR(&}(pp3G}-_B)F+rS(l(vS<RecZ%(lx`adE6b#<MA*v6|
zqhg4L;6Ok2!XZ8=`3{3lFr+}jevG<T8z$m4n8_pfbf#&K;T~jROxF%RXK8L@N{?d!
z)#u0D$E0^47cxZAeVEjp$RK_kRO2h>&tDl=g9H7!bZTOvEEFnBOk_K=DXF(d4JOaH
zI}*A3jGmy{gR>s}EQzyJa_q_?TYPNXR<v?#Pfy-SGCMD6($H@d06+dYtCwDuCKCO`
zfTh}KuF@>U1O;fcV_&TQZhd{@*8Tgpraf~nT0BYktu*n{a~ub^UUqQPyr~yBY{k2O
zgV)honv{B_CqY|*S~3up%Wn%7i*_>Lu|%5~j)}rQLT1ZN?5%QN`LTJ}vA!EE=1`So
z!$$Mv?6T)xk)H8JTrZ~m)oNXxS}pwPd#);<*>zWsYoL6iK!gRSBB{JCgB28C#E{T?
z5VOCMW^;h~eMke(w6vLlKvm!!TyIf;k*RtK)|Q>_@nY#J%=h%aVb)?Ni_By)X<wQw
z7V$PDEtth$n$E;Ll`Y4%BO_9n-ugy!JpHdGlaMf3-bFSa<&`Z$)FNx2;bGa5ewQ9G
znS9p(JK$Y-8V}<ibr6q#cKkEx`_lIfW`o_}!WDwa=VY;jm&MFX_KN*c$8NiQ<*(1K
zOz-}+aK2WdJ+of=zJ0eN>NxY)E3`|}_u}fn+Kp^3p4RbhFUBRtGsDyx9Eolg77iWN
z2iH-}CiM!pfYDIn7;i#Ui1KG01{3D<{e}uWTdlX4Vr*nsb^>l0%{O?0L9tP|KGw8w
z+T5F}md>3qDZQ_IVkQ|BzuN08uN?SsVt$~wcHO4pB9~ykFTJO3g<4X({-Tm1w{Ufo
zI03<6KK`ZjqVyQ(>{_aMxu7Zm^ck&~)Q84MOsQ-XS~{6j>0lTl@lMtfWjj;PT{nlZ
zIn0YL?kK7CYJa)(8?unZ)j8L(O}%$5S#lTcq{rr5_gqqtZ@*0Yw4}OdjL*kBv+>+@
z&*24U=y{Nl<J@lPNofl42dq;77(U?JMya(0Crr4x>58qJyW1vTwqsvs=VRAzojm&V
zEn6=WzdL1y+^}%Vg!ap>x%%nFi=V#wn#<ZJY+2YKgUZIdddsj}x<a~(_z&i7iw6j~
zD6-dYj8)6VXu?|^ZEI$`u2WRyTK0%)bZh&!D^9oe9c{ncschFCaT|SNh@Ip0Y7e<>
zUuheBR@*<muvvX<=P{exAmqKj@)RY=k${p2#1fI%*ObNn_Svg5fBeeKm;N;8<i#ex
z@xiUPeR$hjC=hitVD9x2{{y_iS9U^gG9f@6f6&^Vs3zp5qf?=KTW@F7W@hJ`ZBCj<
zPCXs%#Cv+T9c^4a%MvhtBnK>KS)5Mn0`f=3fMwR|#-rPMQJg(fW*5e`7xO&^UUH<N
z8S{R+VU}U8VWDBEjsa+<a|A}qi`v{;%PNhy=5G#TrE#}Jn{iFX7S1~=;h}j7?-Paq
zPz1GeaZ=ceNsUv?a;Nj+<UmnU3}yC*^X?4%XYRVxg{MEFholmVGnq^}E!rMBWy|R_
zg)925;70bcj_+u_rTSN(=HrLgwiaEHUwf>{L(U8D$JtI!ac!g(Ze89<`UiO@L+)^D
zjPk2_Ie0p~4|LiI?-+pHXuRaZKG$%zVT0jn!yTvvM^jlcp`|VSHRt-G@_&~<4&qW@
z?b#zIN)G(}L|60jer*P7#KCu*Af;{mpWWvYK$@Squ|n-Vtfgr@<WJYami@2Z&u=;5
z5Vc}@3ijIdgOz2E{1ewt+&m|4loMa2;l_ZQ>ZOmR5Xpl;0q~VILmjk$$mgp+`<2jP
z@+nW5Oap%fF4nFwnVwR7rpFaOdmnfB$-rkO6T3#w^|*rft~acgCP|ZkgA6PHD#Of|
zY%E!3tXtsWS`udLsE7cSE8g@p$ceu*tI71V31uA7jwmXUCT7+Cu3uv|W>ZwD<C#<5
zr)TgUn*z=?aQx5GtI}?)S=9!TmC))*YbR(2eeE2+a>{&O4Nfjjvl43N#A$|FWxId!
z%=X!HSiQ-#4nS&smww~iXRn<-`&zc)nR~js?|Ei-cei$^$KsqtxNDZvl1oavXK#Pz
zT&%Wln^Y5M95w=vJxj0a-ko_iQt(LTX_5x#*QfQLtPil;kkR|kz}`*xHiLWr35ajx
zHRL-QQv$|PK-$ges|NHw8k6v?&d;{A$*q15hz9{}-`e6ys1EQ1oNNKDFGQ0xA!x^(
zkG*-ueZT(GukSnK&Bs=4+w|(kuWs5V_2#3`!;f}q?>xU5IgoMl^DNf+Xd<=sl2<ov
zdi9d6DbT*4=K1<NxE2(`@^$C>XvkqviJ>d?+G@Z5nxxd5Sqd$*ENUB_mb8Z+7CyyU
zA6mDQ&e+S~w49csl*UePzY;^K)Fbs^%?7;+hFc(xz#mWoek4_&QvmT7Fe)*{h-9R4
zqyXuN5{)HdQ6yVi#tRUO#M%;pL>rQxN~6yoZ)*{{!?jU)RD*oOxDoTjVh6iNmhWNC
zB5_{R=o{qvxEvi(k<Br-9y#p7E~9amU@sQujU02m+%O6`wmyB;RZm|f_25ZIu`sWx
z9Z!xjMn{xa)<lh?>hbRS`FOXmOO|&Dj$&~><!ER!M(aXh<Y=PO>*oo)bZz%lPhEA@
zQ;;w5eu5^%i;)w?T&*=UaK?*|U3~{0tC`rvfEsRPgR~16;~{_S2&=E{fE2=c>{+y}
zx1*NTv-*zO^px5TA|B```#NetKg`19O!BK*-#~wDM@KEllk^nfQ2quy25G%)l72<>
zzL$^{DDM#jKt?<>m;!?E2p0l12`j+QJjr{Lx*47Nq(v6i3M&*P{jkZB{xR?NOSPN%
zU>I+~d_ny=pX??qjF*E78>}Mgts@_yn`)C`wN-He_!OyE+gRI?-a>Om>Vh~3OX5+&
z6MX*d1`SkdXwvb7KH&=31RCC|&H!aA1g_=ZY0hP)-Wm6?A7SG0*|$mC7N^SSBh@MG
z9?V0tv_sE>X==yV{)^LsygK2=$Mo_0N!JCOU?r}rmWdHD%$h~~G3;bt`lH&<YttXG
zCx4~x@x7rvSlVC8c4`|@!#-B8ZKS<EH?nhD1$CFfEvQA7q3vKKC(B@*EPV@^RffeA
zqF7{q<g?nf7wl2mS$#hW3X3?XI^l_=xWmcuOlQEQZFITVPFH}vOiW=uH41qNTB4w>
zAuOOZ=G1Mih**0>lB5x+r)X^8mz!0K{SScj4|a=s^VhUEp#2M=^#WRqe?T&H9GnWa
zYOq{+gBn9Q0e0*Zu>C(BAX=I-Af9wIFhCW6_>TsIH$d>|{fIrs&BX?2G>GvFc=<8`
zVJ`#^knMU~65dWGgXcht`Kb>{V2oo%<{NK|iH+<q(5YAazG9MX#mAntl?z6uydZjo
zUFklHM_4M@0HYVoyB8BtKlWH`xbBg99hUSZMa9}uddMW%i`jRIi-g-Oj+Dcyby^(`
z%RQFN&dOf4Ittp8bTTLHYY;pny(Y2BDO&N?wA-C_6&0Pd?aun4t;+U8o0V7xD{xVE
zT_xFkLYF;IV~uA~NIx^oe`|Ag_zBH%@tGSHD~4^4RZ^~BcP(EUF`avIGk5b#Qq_%$
zWYy4>R^|Gx%q+env#Js*(EBT3V0=w4F@W+oLFsA)l7Qy8mx_;6Vrk;F2RjKFvmeq}
zro&>@b^(?f))OoQ#^#s)tRL>b0gzhRYRG}EU%wr9GjQ#~Rpo|RSkeik^p9x2<p!Ww
zwwmq`!~oDTY^~4nP7mqhE1&11QI*f_7OwLIc0Sdl0He@3A$?sO|G#_xO5%4jys!Au
zz!P*LF2Fu*;<$-+ZxX4HAsc@9KfXGYIspZeD-?_4;Ohrd$nih9sE;A+xh%Yxa|I;O
zMn43xybbA$h%OeU78ZAGUa0jg*n))`>+=rUr}vfnQoeFAlv=oX%YqbLpvyvcZ3l$B
z5bo;hDd(fjT;9o7g9xUg3|#?wU2#BJ0G&W1#wn?mfNR{O7bq74<ru+<wkuK7q*HuJ
zl3ikW@`O=kCFAR2we{1>7tc~mM%m%t+7YN}^tMa24O4@w<|$lk@pGx!;%pKiq&mZB
z?3h<&w>un8r?Xua6(@Txu~Za9tI@|C4#!dmHMzDF_-_~Jolztm=e)@vG11b<LZFLt
z=a@d3MJ-E4hYQZxA3y&6-j%$UZvUfp^pCgm<jTEuP^)mszD-y$n3Q&{-23}Wv_2Y8
ztp4g>ZQAs!tFvd9{C;oxC7VfWq377Y(LR^X_TyX9bn$)I765l=rJ%9uXcjggX*r?u
zk|0!db_*1$&i8>d&G3C}A`{Fun_1J;Vx0gk7P_}8KBZDowr*8$@X?W<UwWy2E;b%8
zDnv;u#sg4V5Tml=Bw6)GO(a6bm@pXL5;t*}iEhY9Zim8L-OM$RpsE=-)J6=6)|MD4
z8{19*DSK107+0Kbw2EdWh!twa9HVGLVmN$BX1?}c?!DT~m@%MuO{=cju@-!?UnaO{
z9Q;H&SNsH&+9*iqK+))0P{pW#u+IR2<&dC||BFzIuVKjDIAwxj0gQDf!MLF#VHC`D
zN_zXShCf+#K4Io(-dXedBI4SOK2y)rryrPZ_8G(S4~O-`iR!5u^?GLIlD&{}so=+h
zoX&5625-D!az-|Zx~ma2tVY~n7Eznkush<8w1#D9lj%>6v^LYmNWI)lN92yQ;tDpN
zOUdS-W4JZUjwF-X#w0r;97;i(l}ZZT$DRd4u#?pf^e2<Tp(F_Ylx9mIONs=GDOR7J
z!s@{!h&%A8Er}aMdD0mk#s%bH^(p8HL6l-6iKJ%JY$!?VLmDqZL7D4xf%;gN>yaFo
zbm>I@5}#8FjsmigM8w_f#m4fEP<w>~r~_?OWB%SGWcn$ThnJ@Y`ZI-O&Qs#Y14To(
zWAl>9Gw7#}eT(!c%D0m>5D8**a@h;sLW=6_AsT5v1Sd_T-C4pgu_kvc?7+X&n_fct
znkHy(_LExh=N%o3I-q#f$F4<wlfSnZ{aNtlaHgD*%*;+!if9}xbu`<To}#^Vl2QkO
z7|r$zhjK8GE;uJ+566KrGlUndEl83;o70s<D1jcM$y_hC&+<$#S-_D`DMkXCs6&Ja
zX$kb)3d(TSz&8E5_#CeAoC7l{hxp54WI)}a6Fq*MuVt{GA?j6in~9$1>QJpy>jZBW
zRF7?EhqTGk)w&Koi}QQY3sVh?@e-Z3C9)P!(hMhxmX<?O%M-wa0Dx5a@<^0#9_>LC
zF_+ZSTQU`Gqx@o<HpS{<a}-BAGy@<S0>(~<vXHshk{*j+nj`s1+omT#^krl>B$dbr
zHlEUKoK&`2gl>zKXlEi8w6}`X3kh3as1~sX5@^`X_nYl}hlbpeeVlj#2sv)CIMe%b
zBs7f|37f8qq}gA~Is9gj&=te^wN8ma?;vF)7gce;&sZ64!7LqpR!fy)?4cEZposQ8
zf;rZF7Q>YM<qvPX@rO5R|G8xB*d=47F5FbX>F1~eQ|Z*!5j0DuA=`~VG$Gg6B?Om1
z6fM@`Ck-K*k(eJ)Kvysb8sccsFf@7~3vfnC=<$q+VNv)FyVh6ZsWw}*vs>%k3$)9|
zR9ek-@pA23qswe1io)(Vz!vS1o*XEN*LhVYOq#T`;rDkgt86T@O`23xW~;W_#ZS|x
zvwx-XMb7_!hIte-#JNpFxskMMpo2OYhHRr0Yn8d^(jh3-+!CNs0K2B!1dL$9UuAD=
zQ%7Ae(Y@}%Cd~!`h|wAdm$2WoZ(iA1(a_-1?znZ%8h72o&Mm*4x8Ta<4++;Yr6|}u
zW<lfR&2thZ%arCCv7^XWW_6jB>8$p&izhdqF=m8$)HyS2J6cKyo;Yvb>DTfx4`4R{
zPSODe9E|uflE<`xTO=r>u~u=NuyB&H!(2a8vwh!jP!yfE3N>IiO1<sg)|!DAM%5V4
zImfj?oZv3;y3AIvb^=HU^uh7(X5<6aoUeyP2Mi=23DNrjwj6G-I5MpbGBBkQgLzRx
z_Qg%sVsEslI2A80hOod<S>jI>7e&3rR#RO3_}G23W?gwDHgSg<QXM9d4Lsp5W&)6?
zY*roO0w$UqxC4|r(Er$DV(2l9h4At3N_U`+Ukis<fpRRCK>ekzQ^PU&G5z&}V5GO?
zfg#*72*$DP1T8i`S7=P;bQ8lYF9_@8^C(|;9v8ZaK2GnWz4$Th2a0$)XTiaxNWfdq
z;yNi9veH<s@9We549w!!z+8C$Xr3bE8Io{iV0-^0*Z((QCVLd1<H5EqJokRheRd?M
z=9-#Ba=FG%;bgG2sZn!v5}(U9c2N6|uSx2-^nZJN<Y38%>!j)ba$9pke8`y2^63BP
zIyYKj^7;2don3se!P&%I2jzFf|LA&tQ=NDs{r9fIi-F{-yiG-}@2`VR^-LIFN8BC4
z&?*<A2U+2yvz#~5iMlAv#&#x?J%g>IvLiGHH5>NY(Z^CL_A;yISNdq58}=u~9!Ia7
zm7MkDiK~lsfLpvmPMo!0$keA$`%Tm`>Fx9JpG^EfEb(;}%5}B4Dw!O3BCkf$$W-dF
z$BupUPgLpHvr<<+QcNX*w@+Rz&VQz)Uh!j4|DYeKm5IC05T$KqVV3Y|MSXom+Jn8c
zgUEaFW1McGi^44xoG*b0JWE4T`vka7qTo#dcS4RauUpE{O!ZQ?r=-MlY#;VBzhHGU
zS@kCaZ*H73XX6~HtHd*4qr2h}Pf0Re@!WOyvres_9l2!AhPiV$@O2sX>$21)-3i+_
z*sHO4Ika^!&2utZ@5%VbpH(m2wE3qOPn-I5Tbnt&yn9{k*eMr3^u6zG-~PSr(w$p>
zw)x^a*8Ru$PE+{&)%VQUvAKKiWiwvc{`|GqK2K|ZMy^Tv3g|zENL86z7i<<vQD<>c
zW`W>zV1u}X%P;Ajn+>A)2iXZbJ5YB_r>K-h5g^N=LkN^h0Y6dPFfSBh(L`G$D%7c`
z&0RXDv$}c7#w*7!x^LUes_|V*=bd&aP+KFi((tG<uj&`TKbvJwt*s;^z;4Ys<BrXj
zUcC9nsnf4nJ}oNAV^;23Huc6W7jNCNGp&VZZ68xTF&1%{6q~EkQlv<(iM7j~voh3C
z@5k4r3!z`C;}lPV?5N1<S*Q-j1No*l<5(hps4yh~OUMfaqfZSw{1(}GVOnN8<B1ow
zokS3`Befl=7x!u#A9>*gakSR+FA26%{QJdB5G1F=UuU&koU*^zQA=cEN9}Vd?OEh|
zgzbFf1?@LlPkcXH$;YZe`WEJ3si6&R2MRb}LYK&zK9WRD=kY-JMPUurX-t4(Wy{%`
zZ@0WM2+IqPa9D(^*+MXw2NWwSX-_WdF0nMWpEhAyotIgqu5Y$wA=<qv3s0%`78x7-
z!YG+vXM)||6z({8VoMOb>zfuXJ0Y2lL3#ji26-P3Z?-&0^KBc*`T$+8+cqp`%g0WB
zTH9L)FZ&t073H4?t=(U6{8B+uRW_J_n*vW|p`DugT^3xe8Tomh^d}0k^G7$3wLgP&
zn)vTWiMA&=bR8lX9H=uh4G04R6>C&Zjnx_f@MMY!6HK5v$T%vaFm;E8q=`w2Y}ucJ
zkz~dKGqv9$E80NTtnx|Rf_)|3wxpnY6nh3U9<)fv2-vhQ6v=WhKO@~@X57N-`7Ppc
zF;I7)eL?RN23FmGh0s<krvL@Zi`9X>;Z#+p)}-TgTJE%&>{W+}C`^-sy{gTm<$>rR
z-X7F%MB9Sf%6o7A%ZHReD4R;imU6<9h81{%avv}hqugeaf=~^3A=x(Om6Lku-Pn9i
zC;LP%Q7Xw*0`Kg1)X~nAsUfdV%HWrpr8dZRpd-#%)c#Fu^mqo|^b{9Mam`^Zw_@j@
zR&ZdBr3?@<@%4Z-%LT&RLgDUFs4a(CTah_5x4X`xDRugi#vI-cw*^{ncwMtA4N<n#
zKe-3R=W^+cuK>KjByYBza)Y$hozZCpuxL{IP&=tw6ZO52WY3|iwGf&IJCn+u(>icK
zZB1~bWXCmwAUz|^<&ysd#*!DSp8}DLNbl5lRFat4NkvItxy;9tpp9~<f);nGGD>|@
z;JctShv^Iq4(z+y7^j&I?GCdKMVg&jCwtCkc4*@O7HY*veGDBtAIn*JgD$QftP}8=
zxFAdF=(S>Ra6(4slk#h%b?EOU-96TIX$Jbfl*<nInof4ph4hK=1pB+w>_7IY-|R%H
zF8u|~hYS-YwWt5+^!uGcnKL~jM;)ObZ#q68ZkA?}CzV-%6_vPIdzh_wHT_$mM%<x2
zq&@Ugp@y3#qmCWN2c()zUb2i%NHytqe#*|FOc9=9=lm37FJ~XnjPaYV#gu{Rxk3h%
z6(mfsR@KE$kTrlhgn%DPo5HpDO0=1-df|X)k_Bt?_o11|zfG(qa-#Sl@L(<sfroJg
zk#3es02GuhOy#7gPL>vws9lxUj;E@#1UX?WO2R^41(X!nk$+2oJGr!sgcbn1f^yl1
z#pbPB&Bf;1&2+?};Jg5qgD1{4_|%X#s48rOLE!vx3@ktstyBsDQWwDz4GYlcgu$UJ
zp|z_32yN72T*oT$SF8<}>e;FN^X&vWNCz>b2W0rwK#<1#kbV)Cf`vN-F$&knLo5T&
z8!sO-*^x4=kJ$L&*h%rQ@49l?7_9IG99~xJDDil00<${~D&;kiqRQqeW5*22A`8I2
z(^@`qZoF7_`CO_e;8#qF!&g>UY;wD5MxWU>az<ULIsNY$DJI@Av_2K^yD6wo0kqHs
zV#M>oo=E{kW(GU#pbOi%XAn%?W{b>-bTt&2?G=E&BnK9m0zs{qr$*&g8afR_x`B~o
zd#dxPpaap;I=>1j8=9Oj)i}s@V}oXhP*{R|@DAQXzQJekJnmuQ;vL90_)H_nD1g6e
zS1H#dzg)U&6$fz0g%|jxDdz|FQN{KJ&Yx0vfuzAFewJjv`pdMRpY-wU`-Y6WQnJ(@
zGVb!-8DRJZvHnRFiR3PG3Tu^nCn(CcZHh7hQvyd7i6Q3&ot86XI{jo%WZqCPcTR0<
zMRg$ZE=PQx66ovJDvI_JChN~k@L^Pyxv#?X^<)-TS5gk`M~d<~j%!UOWG;ZMi1af<
z+86U0=sm!qAVJAIqqU`Qs1uJhQJA&n@9F1PUrYuW!-~IT>l$I!#5dB<cfvg5VibV&
zDqvU$KKCo4v0yI;auEcF&ZcvUE7}qhEUthMrKK<ZZorlPhfA2o9*2RG_C6<ZwD)23
zgbU<ugZCNmzTNu!GMX!>aiAK}RUufjg{$#GdQBkxF1=KU2E@N=i^;xgG2Y4|{H>s`
z$<vvU|F(3Nv^%2-!)gt%bV2|xrF9!>t`k8c-8`fS7Yfb1FM#)vPKVE4Uf(Pk&%HLe
z%^4L>@Z^9Z{ZOX<^e)~adVRkKJDanJ6VBC_m@6qUq_WF<AGx+lu0P|(*RBdki}PPC
zR884Dd(Bf1Tr>@Epw>AYqf%r6qDzQ~AEJ<N!$QjqcKBS<-KzqABShp7@2HODUtuI-
zM1Hm0Vba1HggryAaeKKwP<qS1QZN90CS+8P%>!jtUvLp^CcqZ^G-;Kz3T;O4WG45Z
zFhrluCxlY`M+OKr2SeI697btH7Kj`O>A!+2DTEQ=48cR>Gg2^5uqp(+y5Sl09MRl*
zp|28!v*wvMd_~e2DdKDMMQ|({HMn3D%%ATEecGG8V9>`JeL)T0KG}=}6K8NiSN5W<
z79-ZdYWRUb`T}(b{RjN8>?M~opnSRl$$^gT`B27kMym5LNHu-k;A;VF8R(HtDYJHS
zU7;L{a@`>jd0svOYKbwzq+pWSC(C~SPgG~nWR3pBA8@OICK$Cy#U`kS$I;?|^-SBC
zBFkoO8Z^%8Fc-@X!KebF2Ob3%`8zlVHj6H;^(m7J35(_bS;cZPd}TY~qixY{MhykQ
zV&7u7s%E=?i`}Ax-7dB0ih47w*7!@GBt<*7ImM|_mYS|9_K7CH+i}?*#o~a&tF-?C
zlynEu1DmiAbGurEX2Flfy$wEVk7AU;`k#=IQE*6DMWafTL|9-vT0qs{A3mmZGzOyN
zcM9#Rgo7WgB_ujU+?Q@Ql?V-!E<ESfbH6cV^f<TVZZ6$j;;%C;F7k#%v)~#tDz@O9
zGjF`&rD{{KBD!Z>=jbypS+*ch<nT0vi*LE;jA`dwa7L|Pk{%Vkrl+;{Q+Icda+|DH
zxbX_5rMru~l@p?-nW}qiMdIwMuOHt$v$Z->I&zA+C_3_@aJal}!Q54?qsL0In({Ly
zjH;e+_SK8yi0NQB%TO+Dl77jp#2pMGtwsgaC>K!)NimXG3;m7y`W+&<(ZaV>N*K$j
zLL~I+6ouPk6_(iO>61cIsinx`5}DcKSaHjYkkMuDoVl>mKO<4$F<R}h5tU~DoQW2-
zb@mx6M$TIWS(5Azchs1S!C1Vg!dX-qRh*Tlox4o><>YJ5J9A2Vl}#BP7+u~L8C6~D
zsk`pZ$9Bz3teQS1Wb|8&c2SZ;qo<#F&gS;j`!~!ADr(jJXMtcDJ9cVi>&p3~{bqaP
zgo%s8i+8V{UrYTc9)HiUR_c?cfx{Yan2#%PqJ{%?Wux4J;T$#cumM0{Es3@$>}DJg
zqe*c8##t;X(<vs5F6*OK5RBh`;EMHg+sn$v%w2!Q1AFLXOj%hwP6VgZXe#dgvNr%C
zbK2>4$?A`ve)e@YU3d2Balcivot{1(ahlE5qg@S-h(mPNH&`pBX$_~HdG48~)$x5p
z{>ghzqqn_t8~pY<5?-To>cy^6o~mifr;KWvx_oMtXOw$$d6jddXG)V@a#lL4o%N@A
zNJlQAz6R8{7jax-kQsH6JU_u*En%k^NHlvBB!$JAK!cYmS)HkLAkm0*9G3!vwMIWv
zo#)+EamIJHEUV|$d|<)2iJ`lqBQLx;HgD}c3mRu{iK23C>G{0Mp1K)bt6OU?xC4!_
zZLqpFzeu&+>O1F>%g-%U^~yRg(-wSp@vmD-PT#bCWy!%&H;qT7rfuRCEgw67V!Qob
z&tvPU@*4*$YF#2_>M0(75QxqrJr3Tvh~iDeFhxl=MzV@(psx%G8|I{~9;tv#BBE`l
z3)_98eZqFNwEF1h)uqhBmT~mSmT8k$7vSHdR97K~kM)P9PuZdS;|Op4A?O<*%!?h`
zn`}r_j%xvffs46x2hCWuo0BfIQWCw9aKkH==#B(TJ%p}p-RuIVzsRlaPL_Co{&R0h
zQrqn=g1PGjQg3&sc2IlKG0Io#v%@p>tFwF)RG0ahYs@Zng6}M*d}Xua)+h&?$`%rb
z;>M=iMh5eIHuJ5c$aC`y@CYjbFsJnSPH&}LQz4}za9YjDuao>Z^EdL@%s<cic@|#d
zk`VYkAA1)5&zzBlUXwX>aRm&LGQWXs*;FzwN#p<?>H&j~SLhDZ+QzhplV_ij(NyMl
z;v|}a<m1KirP40Q9;?ZUGeiBO`6EQCP%m`AbDrv}WVxc|a9*xhB0zVg4PQB(Updr=
z()&PI0+wG1-G5cn-?{zrU(p$hh$VW4zkc`j%O6su+dqN;>mvxRddO81LJFa~2QFUs
z+<rMf(`FCeM}FJ^oJ6DQ^2{Nc9R`a9PEsYsk4d<kKA^opcC1pDZk0kh9^Gygk8>Lk
zZck)}9uK^buJNMo4G(rSdX{57(7&n=Q6$QZ@lIO9#<3pA2ceD<ex)Co(^yo~b^iS?
z-G6>pO_340B*pHlh_y{>i&c1?vdpN1j>3UN-;;Yq?P+V5oY`4Z(|P8SwWq<)<fz%B
zj)+x<OZ_gB*%c@YSI6p9w+Ydpc!Zcf$QEBFDuqEL6=PD@Pe~N@st{xMy+-n;*Mt~v
zmrteH;(NO63jTi5?DV@CF_fsL-w|T3X%De;sQHBB^9@P)Y{)Bp<max_sHiv=Y2ujB
z*Y0pN2vXRDgae#VLF1APpWP+=i6luTbXun4wCl7o-h=Gg-_V%L+$3>n`W@AwcQ?E9
zd5j8>FT^m=MHEWfN9jS}UHHsU`&SScib$qd0i=ky0>4dz5ADy70AeIuSzw#gHhQ_c
zOp1!v6qU<Kxjvk}u}KI}1IL4P)HQX%3Qy1||7)ACyj<$_yY^HUY1Qh86mASo5oGq6
zE#i-HjkgKyfR`wC1AzxilV;sCL6u<;DfJ$k2lHogcuG&96Y=9Dx08l3i%#>)@8MY+
zMNIID?(CysRc2uZQ$l*QZVY)$X?@4$VT^>djbugLQJdm^P>?51#lXBkdXglYm|4{L
zL%Sr?2f`J+xrcN@=0tiJt(<-=+v>tHy{XaGj7^cA6felUn_KPa?V4ebfq7~4i~GKE
zpm)e@1=E;PP%?`vK6KVPKXjUXyLS1^NbnQ&?z>epHCd+J$ktT1G&L~T)nQeExe;0Z
zlei}<<dHMjP`dMgT;)rz@KwnNqz2u#jL%!`ao{S@tM3IGYSeTv3Fk3tBkVZxLRlho
z@Yxs}5wdFIYX}Vx7;lNy5jfXGDv1)02|!y=K!RAWW@=@lh*MCQ(we#;x;&XaD>_ni
ztFo}j7nBl$)s_<W4is^tCJZEK$$)&HpdlqLPzQFWv`<{7GL_AD92F#&(|%OzJIbuy
z+Ol{_jn76nNgzuA>3odmdafVieFxc)m!wM+U`2u%yhJ90giFcU1`dR6BBTKc2cQ*d
zm-{?M&%(={<F~lIWhEX{d2;PTbK5UDb8+WLo7GcN=5=ow@4S4W$LOt!x3rG3C8mvr
z0>xYHy?VCx!ogr|4g5;V{2q(L?QzJGsirn~kWHU`l`rHiIrc-Nan!hR7zaLsPr4uR
zG{En&gaRK&B@lyWV@yfFpD_^&z>84~_0Rd!v(Nr%PJhFF_ci3D#ixf|(r@$igZiWw
za*qbXIJ_Hm4)TaQ=zW^g)FC6uvyO~Hg-#Z5Vsr<Zy{+LyD`h4YS(ghy#BfWzW^5Uo
zQ8PC9sjEJ4RGC&$F|HxuyK{woR4L3OZu<36tuvn9l2snS_;Y@J&z1A*lMO*_Ur`v=
zX;m?{v#RtbKP{_C_Pwp$oMe|?dH6}PAjk=@Y1ry|VVd(HV4<-(-0+OjB`EyB0T=kn
z(gB<B0#L(B#0`VW)>ybz6uOTF>Rq1($JS`imyNB7myWWpxYL(t7`H8*voI3Qz6mvm
z$JxtArLJ(1wlCO_te?L{>8YPzQ})xJlvc5wv8p7Z=HviPYB#^#_vGO#*`<0r%MR#u
zN_mV4vaBb2RwtoOYCw)X^>r{2a0kK|WyEYoBjGxcObFl&P*??)WEWKU*V~zG5o=s@
z;rc~uuQQf9wf)MYWsWgPR!wKGt6q;^8!cD_vxrG8GMoFGOVV=(J3w6Xk;}i)9(7*U
zwR4VkP_5Zx7wqn8%M8uDj4f1aP+vh1Wue&ry@h|wuN(D2W<Jk_Ub)RM4SgV&OId4;
zn2zn6!@5a6q<V@&t`j1NlR++Q;e@+-SbcuS)(a+|%YH!7_B%_B*R5T=?m|>;v6b1^
z`)7XBZ385zg;}&Pt@?dunQ=RduGRJn^9HLU&HaeUE_cA1{+oSIjmj3z+1YiOGiu-H
zf8u-oVnG%KfhB8H?cg%@#V5n+L$MO2F4>XoBjBeX>css^h}Omu#)ExTfUE^07KOQS
znMfQY2wz?!7!{*C^)aZ^UhMZf=TJNDv8VrrW;JJ9`=|L0`w9DE8MS>+o{f#{7}B4P
z{I34>342vLsP}o=ny1eZkEabr@niT5J2AhByUz&i3Ck0H*H`LRHz;>3C_ru!X+EhJ
z6(+(lI#4c`2{`q0o9aZhI|jRjBZOV~IA_km7ItNtUa(Wsr*Hmb;b4=;<J1?+^3A&j
zK3cnIJ@xJ)8})7lyFf5`owi5yu4lj04lY55Grhwxe6`Vjk5_%2h6Srm0%!Z7OTJgS
z7xk*fSj^YWvFa#^cCzaibaRR7wifomC%U_?eh_XL=5Hz83qQMDCary#^CqnoCok6y
z#aKY5h8k>R(gF@GmsRI`pF+0tmq0<eALkrdNz?_uQPl5L<ziG;l8G^BKV7-hN+!<*
z<qETgy|$oSZ328w$u~CVg?j38Ne8Nec!$^z3O9)SK=%x<?=HO#`R=(x+xbP_2n9~L
zA~@Y5=^p7G^ly*h(SjbX22XE{f_H~{EwlIe71&(CF%AC-KZ!PkfDiovb({chpQJjK
zFbjvUr>zy~wnoJD(<MLjh**JGO%zg$#8^?N-Q#VEMllAeBN{8Gkcp5385M+IP?10`
zKNJCQBzyb5Gta#5ZT-NK&Jkr}EY5LG-*{2<GI5k_E;Cjl{9Li(svK!m$F~O+U$JQS
zMZAi<dUJWWO0+lGoKxMN#+rIpvr}TmT8W9)5>LSEwHjT<no^?z{l8Hbtg<ND1Cr6K
z6#0!VQ^*}KTk66St&+e*u_9r$$-(;3c2C&lF^#Wti6x@NV{uFO48lerx@~U7EQm%~
zi8-wSrE-(Ma!Z+cdXdE^nH(<3+*mF-qjhezv`kVwaQ)pBtm+Jzn4-9>Ot4xb0XB-+
z&4RO{Snw4G%gS9w#uSUK$Zbb#=jxEl;}6&!b-rSY$0M4pftat-$Q)*y!bpx)R%P>8
zrB&`YEX2%+s#lFCIV;cUFUTIR$Gn2%F(3yLeiG8eG8&)+cpBlzx4)sK?>uIlH+$?2
z9q9wk5zY-xr_fzFSGxYp^KSY0s%1BhsI>ai2VAc8&JiwQ>3RRk?ITx!t~r45qsMnj
zkX4bl06ojFCMq<9l*4NHMAtIxDJOX)H=K*$NkkNG<^nl46<z}8DjmoX!f<;!=?S0X
zNm_qEi&;s|L9ptUk0h&55Ob{uhVekW1KY3{I#Svm7#;P3BE~;lg8EY6Q79rf(MCE=
zN8VGwjyg@p(Rvv6Qeo&vGBF~WTM7Tu+BS~CYXlw<;F93zrP+w<0f)nm=oOTD0XeL>
zHWH1GXb?Og1f0S+8-((5yaeegCT62&4N*pNQY;%asz9r9Lfr;@Bl${1@a4QA<GQZo
zHC=)78Wbo&u{ERGcuiNo;G#(z2^9z>vMLbV6JDp>8SO^q1)#(o%k!QiRSd0eTmzC<
zNIFWY5?)+JTl1Roi=nS4%@5iF+%XztpR^BSuM~DX9q`;Mv=+$M+GgE$_>o+~$#?*y
zAcD4nd~L~EsAjXV-+li6Lua4;(EFdi|M2qV53`^4|7gR8AJI;0Xb6QGLaYl1zr&eu
zH_vFUt+<?-wHx^jA;=HXzQKp_j)#`&591BSP(wIOS;Ce(17%gs%~hdM@>Ouf4SXA~
z&Hh8K@ms^`(hJfdicecj>J^Aqd00^ccqN!-f-!=N7C1?`4J+`_f^nV!B3Q^|fuU)7
z1NDNT04hd4QqE+qBP+>ZE7{v;n3OGN`->|lHjNL5w40pe<qclDY+ja_*(_95xs;%%
zq{v>PJ?^Y6bFk@^k%^5CXZ<+4qbOplxpe)l7c6m%o-l1oWmCx%c6@rx85hi(F=v(2
zJ$jN>?yPgU#DnbDXPkHLeQwED5)W5sH#<v%tu={Y=OlW2%;gK%O0*}OtgP0-W>-eS
z%#^4dxiVs{+q(Yd^ShMN3GH)!h!@W&N`$L!SbElXCuvnqh{U7lcCvHI#{ZjwnKvu~
zAeo7Pqot+Ohm{8|RJsTr3J4GjCy5UTo_u_~p)MS&Z5UrUc|+;Mc(YS+ju|m3Y_Dvt
zonVtpBWlM718YwaN3a3wUNqX;7TqvAFnVUoD5v5WTh~}r)KoLUDw%8Rrqso~bJqd>
z_T!&Rmr6ebpV^4|knJZ%qmzL;OvG3~A*loGY7?YS%hS{2R0%NQ@fRoEK52Aiu%gj(
z_7~a}eQUh8PnyI^J!>pxB(x7FeINHHC4zLDT`&C*XUpp@s0_B^!k5Uu)^j_uuu^T>
z8WW!QK0SgwFHTA%M!L`bl3h<zOXT*J6fe~c%_xb0$mxr#<2VD=$rO0L8nX7*#{Ksu
z$LONOvFCTfJN5XIapRVZlX}Y=<Lbb4!eHVHYIDPW9?-^*TjQ2+nH<TKdTCuE{W6Ky
z7>HjPp)|wL5Var_*A1-H8LV?uY5&ou{hRjj>#X@rxV>5<xG4RL_K~wL=!|H8*ZSVn
ze*QWuVl90vQ035NRw9cT+>%-9hbP+v?$4}3EfoRH;l_wSiz{&1<+`Y5%o%q~4<MOn
zEoNk8R4!uRxI3kmMnO0fow{Ibz3`A^4>rdpRF0jOsCoLnWY5x?V)0ga>CDo`NpqS)
z@x`mh1QGkx;f)p-n^*g5M^zRTHz%b2IkLBY{F+HsjrFC9_H(=9Z5W&Eymh~A_FUJ}
znhTc9KG((OnjFO=+q>JQZJbeOoUM77M{)$)qQMcxK9f;=L;IOv_J>*~w^YOW744QZ
zoG;!b9VD3ww}OX<8sZ0F##8hvfDP{hpa3HjaLsKbLJ8<m2C(MCx~x+Mo`}Jf7gdL>
z0WpY2E!w?&cWi7&N%bOMZD~o7QT*$xCRJ@{t31~qx~+0yYrLXubXh2{_L699Nl_pn
z6)9eu+uUTUdjHXYs#pX^L)AIb!FjjNsTp7C399w&B{Q4q%yKfmy}T2uQdU|1EpNcY
zDk~(h#AdxybjfzB+mg6rdU9mDZ^V>|U13Dl$Gj+pAL}lR2a1u!SJXU_YqP9N{ose4
zk+$v}BIHX60WSGVWv;S%zvHOWdDP(-ceo(<8`y@Goy%4wDu>57QZNJc)f>Ls+}9h7
z^N=#3q3|l?aG8K#HwiW2^PJu{v|x5;awYfahC?>_af3$LmMc4%N~JwVlRZa4c+eW2
zE!zosAjOv&UeCeu;Bn5OQUC=jtZjF;NDk9$fGbxf3d29SUBekX1<Pr@Tu%2mF`vob
zdsw;fW5J;CqD*)A#3k~8m#E~>!a$Vmq_VK*MHQ4)eB!dQrHH)LVYNF%-t8!d`@!cb
z2CsKs3|!}T^7fSZm?0dJ^JE`ZGxA&a!jC<>6_y67On0M)hd$m*RAzo_qM?aeqkm`*
zXpDYcc_>TFZYaC3JV>{>mp(5H^efu!Waa7hGTAts29jjuVd1vI*fEeB?A&uG<8dLZ
z(j6<v3j>;-%vJ7R0U9}XkH)1g>&uptXPHBEA*7PSO2TZ+dbhVxspNW~ZQT3fApz}2
z_@0-lZODcd>dLrYp!mHn4k>>7kibI!Em+Vh*;z}l?0qro=aJt68joCr5Jo(Vk<@i)
z5BCKb4p6Gdr9=JSf(2Mgr=_6}%4?SwhV+JZj3Ox^_^OrQk$B^v?e<VR4r!cUQcNa*
zLw&@@0{2I&$oQBHjs;Rdk`@6y1!<-(7NgjbFuEcwrG9}&Hy03(S??>Nz}d^xRaz&~
zKVnlLnK<O~>#8^y=If2f1zmb~^5lPLe?%l}>?~wN4IN((2~U{e9fKhLMtYFj)I$(y
zgnKv?R+ZpxA$f)Q2l=aqE6EPTK=i0sY&MDFJp!vQayyvzh4wee<}kybNthRlX>SHh
z7S}9he^EBOqzBCww^duHu!u+dnf9veG{HjW!}aT7aJqzze9K6-Z~8pZAgdm1n~aDs
z8_s7?WXMPJ3EPJHi}NL&d;lZP8hDhAXf5Hd!x|^kEHu`6QukXrVdLnq5zbI~oPo?7
z2Cbu8U?$K!Z4_yNM1a(bL!GRe!@{Qom+DxjrJ!B99qu5b*Ma%^&-=6UEbC+S2zX&=
zQ!%bgJTvmv^2}hhvNQg!l=kbapAgM^hruE3k@jTxsG(B6d=4thBC*4tzVpCYXFc$a
zeqgVB^zua)y-YjpiibCCdU%txXYeNFnXcbNj*D?~)5AGjL+!!ij_4{5EWKG<MLirH
z+DX^Dk(~hl-o)R17Ke7NBWBmGx0}_Yh*L{$3or|S`y{XU9=}stg7(?(^wZZS2Da%+
zWvCP|MzT2WK(<`aoEV!R1WAp-r%3{)SA=78<qFf;<rwNmD*Y*6(NUk(!LD}1(qHA3
z`=B=489M4KM^RxXd(tHgT%9X5Tjnh2mdXv4MCT5VYa7rd+N5ISRlSW}1lw5{(5L@K
zwzTh&rM#;2<;oP^LJod0{WsXpN5C{w?l*Jg>av0^={~M^q}baAFOPzxfUM>`KPf|G
z&hsaR*7(M6KzTj8Z?;45zX@L#xU{4n$9Q_<-ac(y4g~S|Hyp^-<*d8+P4NHe?~vfm
z@y309=`lGdvN8*jw-CL<;o#DKc-%lb0i9a3%{v&2X($|Qxv(_*()&=xD=5oBg=$B0
zU?41h9)JKvP0yR{KsHoC>&`(Uz>?_`tlLjw1&5tPH3FoB%}j;yffm$$s$C=<NH+_Q
zuVOy!BKDYAHt^L);tLou9Iw!KVrZ;__9lB4Qu}AkDaaH65g@R}lia;0J%u}*93`p?
zaeF={6)8oIBzH4kIggVAVvNSbROx-Z(+`hO*myDp7yv#WCwMIxk<hHjD5AkCV*KFy
z7uwrr!(roY4b(1>RHi`I3*m@%CPqWnP@B~%DEe;7ZT{9!IMTo1hT3Q347HJ&!)BM2
z3~aClf>aFh0_9||4G}(Npu`9xYY1*SD|M~9!CCFn{-J$u2&Dg*=5$_nozpoD2nxqq
zB!--eA8UWZlcEDp4r#vhZ6|vq^9sFvRnA9HpHch5Mq4*T)oGbruj!U8Lx_G%Lby}o
zTQ-_4A7b)5A42vA0U}hUJq6&wQ0J%$`w#ph!EGmW96)@{AUx>q6E>-r^Emk!iCR+X
zdIaNH`$}7%57D1FyTccs3}Aq0<0Ei{`=S7*>pyg=Kv3nrqblqZcpsCWSQl^uMSsdj
zYzh73?6th$c~CI0>%5@!Ej`o)Xm38u0fp9=HE@Sa6l2<mw_Yh7ly>oX9^^4|Aq%GA
z3(AbFR9gA_2T2i%Ck5V<FfGDt5jFr`inQh;1&EJ*>2Q2WW-(a&(j#@l6wE4Z`xg#S
za#-UWUpU2U!TmIo`CN0JwG^>{+V#9;z<j+vge|-bMmFe5eQtw=$jBe&1J+DLGhNXR
zVF0LJkT6h0B8nsw@>vx;ztc$}@NlcyJr?q(Y`UdW6qhq!aWyB5xV1#Jb{I-ghFNO0
z<gP-h@3s4i1u==>FU~+QgPs{FY1AbiU&S$QSix>*rqYVma<-~s%ALhFyVhAYepId1
zs!gOB&weC18yhE-v6ltKZMV|>JwTX+X)Y_EI(Ff^3$WTD|Ea-1HlP;6L~&40Q&5{0
z$e$2KhUgH8ucMJxJV#M%cs!d~#hR^nRwk|uuCSf6irJCkSyI<%CR==tftx6d%;?ef
zYIcjZrP@APzbtOeUe>m-TW}c-ugh+U*RbL1eIY{?>@8aW9bb1NGRy@MTse@>=<ra>
za%;5=U}X%K2tKTYe9gjMcBvX%qrC&uZ`d(t)g)X8snf?vBe3H%d<Ke$F$Z0AGpq$L
zh*N9G{;KEPa}gmeOBNBk0zORp;`+VU|1_04|4V$bCz(R~xePApA?YFdZU$CR63IbQ
z2Pq2(THUz7SlMWdHOdM19(SYTR)^7j>G=b<Uy4X-FL@RBUeVq-s%!3f=Wp$pdFiyc
z*UH5I+~YQSU-pf1Z~4Z+d0X6)<0i*Q_Z}vh)KKf>l^rv8Z@YN$gd9yveHY0@Wt0$s
zh^7jCp(q+6XDoekb;=%y=Wr8%<!i<hjG`j2f#)CHoE%?oHV1t_^966$UcQ|tMEj_Y
z^Dp_?#syJ7V{9Es?J3v}f}pPx{87yPa7|66#gbBs#7ePJ{bo_oH&rCWA~hx1V^t$U
z+8@1TWfn_Z`;{~9gC9mv?eoQ*Y-C)rhp|}dc#r5_J0yspKw$C`a}OGKQh(E&3WUik
z4AxbHbeGhXO7DYJ7=8m!=+Sj-HxJCb*@hx`<Q?E73ZqASI|ZO4gQX;PgpcX_I2dEP
z4PzF^;fhXQ)40w{k(P#>6;z0ANH5dDR_VudDG|&_lYykJaiR+(y{zpR=qL3|2e${8
z2V<U){GkH!99$-?(vZQ6`9xYUH;m>;?jgHj7}Kl(d8C9xWRjhpf_)KOXl+@c4wrHy
zL3#9U(`=N59og2KqVh>nK~g9>fX*PI0`>i;;b6K<iTA=O-~d|1@8nQW|764_gHT9A
z+Jdw)Cus?cfv_Gsi;gF31B#4DZ2^Yn1Wk~wI*LZ!hnDLnI_*R~z#5pH4R3KO1Ir1F
zNQX5wC;<FU(7pj+t&{Y#h#K(_6=WtrHj4aPX$5uUHjT;c(e}35?V4?SZCg90+pyx(
z`_R8jCQe*LR*{P)PNV>F|8zg+k2hViCt}4dfMdvb1NJ-Rfa7vL2;lPK{Lq*u`JT>S
zoM_bZ_?UY6oV6Ja14X^;LqJPl+w?vf*C!nGK;uU^0GRN|UeFF@;H(Hgp8x^|;ygh?
zIZx3DuO(lD01ksanR@Mn#lti=p28RTNYY6yK={RMFiVd~k8!@a&^jicZ&rxD3CCI!
zVb=fI?;c#f{K4Pp2lnb8iF2mig)|6JEmU86Y%l}m>(VnI*Bj`a6qk8QL&~PFDxI8b
z2mcsQBe9$q`Q$LfG2wdvK`M1}7?SwLAV&)nO;kAk`SAz%x9CDVHVbUd$O(*aI@D|s
zLxJW7W(QeGpQY<$dSD6U$ja(;Hb3{Zx@)*fIQaW{8<$KJ&fS0caI2Py^clOq9@Irt
z7th7F?7W`j{&UmM==Lo~T&^R7A?G=K_e-zfTX|)i`pLitlNE(~tq*}sS1x2}Jlul6
z5+r#4SpQu8h{ntIv#qCVH`uG~+I8l+7ZG&d`Dm!+(rZQDV*1LS^WfH%-!5aTAxry~
z4xl&rot5ct{xQ$w$MtVTUi6tBFSJWq2Rj@?HAX1H$eL*fk{Hq;E`x|hghRkipYNyt
zKCO=*KSziiVk|+)qQCGrTYH9X!Z0$k{Nde~0Wl`P{}ca%nv<6fnYw^<s*I^w2}g4)
zDT(2xL%uqsByOSZ61tavt7O>~9dYxTnTZB&&962jX0DM&wy&8fdxX8xeHSe=UU&Mq
zRTaUKnQO|A>E#|PUo+F=Q@dMdt`P*6e92za(TH{5C*2I2S~p?~O@hYiT>1(n^Lqqn
zqewq3ctA<T{c@#lWCZ$(!d{cN7=2we77Yx!0ew~Gx<3;vHo@;Z=)<i6dXzL;AY|z|
zQh^P>A%0E)r53*P-a8Ak32mGtUG`L^WVcm`QovX`ecB4E9X60wrA(6NZ7z~*_DV_e
z8$I*eZ8m=WtChE{#QzeyHpZ%7GwFHlwo2*tAuloI-j2exx3#x7EL^&D;Re|Kj-XT-
zt9<G*I5j~YwPM=zQc<-<5T)`?p=k3wJ6%=B%=d_@HDXhwqg3ij6<6Gneq}IMRsO?+
zZ$ux+&=>08^soV2`7s+Hha!d^#J+B)0-`{qIF_x=B811SZlbUe%kvPce^xu7?LY|C
z@f1gRPha1j<g?ml{#gpkD^O$XNTr0o(I;d;h4uA8LjteITT`#--;T+ZYX+t7g{&jY
z%jLmo;U5!e_41&}2`Y3PtJNiOtyHYGC;e`w)XqI9cfa-k)QH;zlhbma7)pQ1mZ#s9
zrt1Z7OQrg>q|=f}Se)}v-7MWH9)YAs*FJ&v3ZT9TSi?e#jarin0tjPNmxZNU_JFJG
z+tZi!q)JP|4pQ)?l8$hRaPeoKf!3>MM-bp06RodLa*wD=g3)@pYJ^*YrwSIO!SaZo
zDTb!G9d!hb%Y0QdYxqNSCT5o0I!GDD$Z@N!8J3eI@@0AiJmD7brkvF!pJGg_AiJ1I
zO^^cKe`w$DsO|1#^_|`6XTfw6E3SJ(agG*G9qj?JiqFSL|6tSD6vUwK?Cwr~gg)Do
zp@$D~7~66-=p4`!!UzJDKAymb!!R(}%O?Uel|rMH>OpRGINALtg%gpg`=}M^Q#V5(
zMgJY&gF)+;`e38QHI*c%B}m94o&tOfae;<xSoo%JWgt|4OsWqBge(0MrWCl{^{1qR
z$9kiQL{yp=)4GQGI_Jm5&g#GDTYcGhkauMJQ(qfM)1pg_a_8YpGwNbwNKp#T3-1@6
z|CjTBM~_fXe$Rs`cJE+v;7^0eysLT1ugyST5y-lLQ?!t5I+r@})qno};JoRD-E=Xi
zX_8OynCqNAP{M@6q0{1lA$fd7YVYB^B3HOC?;KS&skUZdpr&?G*{Dvo9Hf%gnd2O9
zvFCA)Qg13bH?d=3bMwL-iMgPupd}c_KuUy2B!UeZUr<=BIK|YBv?yV$q58*?!w_CK
zhp}K1=StAQ6{?zIqvi9mLesqVm&dX(9+AzcRVtrMpZ;{ErIyVQpVYzYVcvn6%u9m3
zENe?2g{r;1I%;x<{deB!54%lK?QVcb%q|Y(3&@xG42;qPh~(~r6ouOokrhp}g_Byo
zKp4yiKG~E3?*xr!?^(OHXYKbID@Vk%L$MJN?dLjF_FD?rZRr8zTic`kxqVF61s8OU
zY1cLlYqVUOIkCpn>og&!J2;6ENW}QeL7<PXg{yny8O<B+-%z=8!`{k@uZK?dU2tpL
zoDCc1bk4tH!`>3jatbI1*9X~y=$Dm%6FwDcnCyMRL<PZ=`4kP-O>}zo`0=y7=}*Uw
zo3!qZncAL{HCgY!+}eKr{P8o27ye+;qJP;kOB%RpSesGoHLT6tcYp*6v~Z9NCyb6m
zP#qds0jyqXX46qMNhXDn3pyIxw2f_z;L_X9EIB}<BZV)NY+Sf`GmW4*C1<w9<G3@Y
zR-2Ao^uw)%Z0Eww)CNf&GoE61(l=R$@lLulhRTBom-G)|sA)*B&(~_KWRT_L+saB5
zo*q>AhyC`FYI}G3$WnW>#NMy{0aw}nB%1=Z4&*(FaCn5QG(zvdG^pQRU25;{wwG4h
z@kuLO0F->{@g2!;NNd!<zny}%07Jn8Nf<E`qd>PfqM-;@F0;&wK}0fT9UrH}(8A5I
zt33(<pT6JhCadCO^EwcP0}B}m196bLHZSD1wzS~lgDzyBOMDp_>+&U;CLN|8+71@g
z(s!f-kZZZILUG$QXm9iYiE*>2w;gpM>lgM{R9vT3q>qI{ELO2hJHVi`)*jzOk$r)9
zq}$VrE0$GUCm6A3H5J-=Z9i*biw8<GlN{|J&^K2l_*g<#Pt^RN|DX}11Ly}*7(>ng
zi<1nM0lo^KqRY@Asucc#DMmWsnCS;5uPR)GL3pL=-IqSd>4&D&NKSGHH?pG;=Xo`w
zw~VV9ddkwbp~m>9G0*b?j7-0fOwR?*U#BE#n7A=_fDS>`fwatxQ+`F<!Rj$KZl*<p
zT?$eX^b9WOf%^Fc5Ow$#oiLZxFXB|4X4Ah-N23bVC3rdbHNy5`I((oY2SI(gVJE_3
zv~k-4(EcFxN5Hx@>zhBGQUAyIRZ??eJt46vHBlR>9m!vfb6I)8!v6TmtZ%G6&E|1e
zOtx5xy%yOSu+<9Ul5w5N=&~4Oph?I=ZKLX5DXO(*&Po>5KjbY7s@tp$8(fO|`Xy}Y
z;NmMypLoG7r#Xz4aHz7n)MYZ7Z1v;DFHLNV{)to;(;TJ=bbMgud96xRMME#0d$z-S
z-r1ROBbW^&YdQWA>U|Y>{whex#~K!ZgEEk=LYG8Wqo28NFv)!t!~}quaAt}I^y-m|
z8~E{9H2VnyVxb_wCZ7v%y(B@VrM6lzk~|ywCi3HeiSV`TF>j+I<PcrA4vbhkc}Ds9
zVnPj;dD9hvN^{*9tq;`Y3-i35x*J^9kk!Mknb6QMp+R%r;|Y~}U1bd=<D2Z^=6NHx
z)o!mbv)c13!qxVmdz@Dme2Ud2?)buFbw!<Z_N}SPHX2@PRM{c<oRhmdQ=Q!h%GA-#
zE|+zRyX;@_)`kh%@3wm_ZjUz-66I&coi<`>jd|p*kyn;=mqtf8&DK^|*f+y$<HJ*z
z{kCJi%r~syv1<5SAj?Qn<RD-N0#-mimPHVGsjQ(4>38+9!sis9N=S)nINm9=CJ<;Y
z!t&C>MIeyou4XLM*ywT_JuOXR>VkpFwuT9j5>66<JwXm0Iz|uD_GISrZ<tb63#|b6
zmesyu7v#<;wAs4wx|xl$8!C)O(dny+&uQp5Yiylr74+Z{`kuduLfD{$!RweaKvq@@
zSKvT=l{+EaFCqSAuk-})NiD5^S-DyEOCPWcr6mSZED8GEaH3HbBi=sIw&e0Ek0*HT
zg7i-oY%env)m$!wZo6{H^btX$@qVG{e!&!~J#BILfmfs_E?=UpX#O6)G;!&c?y}Qg
zZDtQIxqNpZ+R#vKv;FOFva`NsR7883$-r&2{_WuFALO<~3Fk}Bb(WC&g8i;%)qzDY
zRjOTdfX!%Ad(<}BcYy4>7A=CU*{TBrMTgb4HuW&!%Yt`;#md7-`R`ouOi$rEd!ErI
zo#>qggAcx?C7`rQ2;)~PYCw%CkS(@EJHZ|!!lhi@Dp$*n^mgrrImsS~(ioGak>3)w
zvop0lq@II<?zr~h{;~Z%uibTbs^_R=H(HEh%|uq3KKIc_zxBu?d|hToq+T%unvO@H
z_7G`_g*WS&kUbvS*4>SuA0Ou*#1JkG{U>xSQV1e}c)!d$L1plFX5XDXX5N<n2C0jm
zX{r1Jy%RD8vWp=4fyb$$F_f=*`nvNgb$TK5DH~vUeDX&BtW7RGgbP7rCk$}DqbN_=
zG+@cCNjfaVNpOlFw+a>7Ns{kT{y5|6MfhBD+esT)e7&CgSW8FxsXTAY=}?0A!j_V9
zJ;IJ~d%av<@=fNPJ9)T3qE78kaz64E>dJaYab5u<efW`3H($g#7XgvMkYf+oz36no
z(7hfLHbbB2R0{1uae-^d+wzih8L%N9he3ud^j?e&dq$dH2awC*y4Q%$6QP+9{{{^S
zS|%?I`*;k>aU`n~Zdp2h{8DV%SKE5G^$LfuOTRRjB;TnT(Jk$r{Pfe4CO!SM_7d)I
zquW~FVCpSycJ~c*B*V8?Qqo=GwU8CkmmLFugfHQ7;A{yCy1OL-+X=twLYg9|H=~8H
znnN@|tCs^ZLlCBl5wHvYF}2vo>a6%mUWpTds_mt*@wMN4-r`%NTA%+$(`m6{MNpi@
zMx)8f>U<?#KGhQOH9sd_@m#$xV)2XXy+)7rj<v$+@Y;iI(?-Y3Sg0r<Nksvzzi#Zp
z$q~EP;jFN*8js?YBQ<`b?Z-d1$^IIsy$A>4hd!row@gM&PVo&Hx+lV@$j9yWTjTue
zG9n0DP<*HUmJ7ZZWwI2x+{t3QEfr6?T}2iXl=6e0b~)J>X3`!fXd9+2wc1%cj&F@Z
zgYR|r5Xd5jy9;YW&=4{-0rJ*L5CgDPj9^3%bp-`HkyBs`j1iTUGD4?WilZ6RO8mIE
z+~Joc?GID6K96dyuv(dWREK9Os~%?$$FxswxQsoOi8M?RnL%B~Lyk&(-09D0M?^Jy
zWjP)n(b)TF<-|C<kuA~or~e()IVaJB8ThDOo%m84{2#Jw7lA;F7HB%yOOfao*a-Bo
z9vF{4tjJ*|r>G%!Vz?8Fu&6iU<>oG#kGcrcrrBlfZMVl0wOJvsq%RL9To%iCW@)#&
zZAJWhgzYAq)#NTNb~3GBcD%ZZOc43!YWSyA7TD6xkk<oWhdAZNF5oEMySt*u%}=mX
zY^=DnO8CU4$;_0G$Mo-Kkj5NlGljS+>)n^FaRAz73b}%9d&YisBic(?mv=Iq^r%Ug
zzHq-rRrhfOOF+yR=AN!a9*Rd#sM9ONt5h~w)yMP7Dl9lfpi$H0%GPW^lS4~~?vI8Z
z%^ToK#NOe0ExmUsb`lLO$W*}yXNOxPe@zD*90uTDULnH6C?InP3J=jYEO2d)&e|mP
z1DSd0QOZeuLW<s88&Dqv$ZDY(qEHICGi1F$d4+8O&b2468PMe9JW2)dic7s&U~)}9
zv>o*NqZzopA+LXy9)fJC00NSX=_4Mi1Z)YyZVC>C!g}cY(Amaj%QN+bev|Xxd2OPD
zk!dfkY6k!(sDBvsFC2r^?}hb81(WG5Lt9|riT`2?P;B%jaf5UX<~OJ;uAL$=Ien+V
zC!V8u0v?CU<?sa9rw*YNr=`U}IHdv2<G`|o3Bx8D;^GeQOIB`c%X^K&>a)4*Q+Q_u
zkx{q;NjLcvyMuU*{+uDsCQ4U{JLowYby-tn@<?{mQ!v2u1l{5e{t5@ZjF*S!>hatL
zy}X>9y08#}oytdn^qfFesF)Tt(2!XGw#r%?7&zzFFh2U;#U9XBO8W--#gOpfbJ`Ey
z|M8FCKlWQrOJwE;@Sm02l9OBr7N}go4V8ur)}M@m2uWjggb)DC4s`I4d7_8O&E(j;
z?3$9~R$QDxNM^rNh9Y;6P7w+bo2q}NEd6f&_raor-v`UCaTM3TT8HK2-$|n{N@U>_
zL-`P7EXoEU5JRMa)?tNUEe8XFis+w8g9k(QQ)%?&Oac}S`2V$b?%`DwXBgja&&fR@
zH_XidF$p1wA)J|Wk1;?lCl?fgc)=TB3>Y8;BoMqHwJqhL)Tgydv9(?(TBX)fq%=~C
zmLj!iX-kn7QA(9snzk0LRf<%SzO&~IhLor6A3f*U^UcoAygRe!H#@UCv$JUP&vPxs
zeDj$1%#<2T1!e|!7xI+~_VXLl5|jHqvOhU7ZDUGee;HnkcPP=_k_FFxPjXg*9KyI+
zIh0@+s)1JDSuKMeaDZ3|<_*J8{TUFDLl|mXmY8B>Wj_?4mC#=XjsCKPEO=p0c&t&Z
zd1%kHxR#o9S*C?du*}tEHfAC7WetnvS}`<%j=o7YVna)6pw(xzkUi7f#$|^y4WQ{7
zu@@lu=j6xr*11VEIY+`B{tgd(<i-P<xW8QmX{Uu}CW{$k=4G`<yQ5DK7nY#9L<7KO
zZl2V*aS4sKmaEUS-mY%P1^cv^q{7lxZ)5qzsWF(QH6y#+dwE4lRddpa#$Z}_cCaKa
zE;TlFY<W#EqQ=~xoZ>c3zO8%nGk0U^%ec6h)G_`ki|XQXr!?NsQkxzV6Bn1ea9L+@
z(Zr7CU_oXaW>VOdfzENm+FlFQ7Se0ROrNdw(QLvb6{f}HRQ{$Je>(c&rws#{dFI^r
zZ4^(`J*G0~Pu_+p5AAh>RRpkcbaS2a?Fe&JqxDTp`dIW9;<O_d1fh3g+@%<JHS<h;
z`xr?<<utwG<Lj5Zdhfz~Sd#5Kb7T9+cKkOui1y`+Uv$r&om%~&H3ligXMa!k1A}&8
z`oKdmM{uQUq3k>DL%0wxX5;`KxyA4F{(~_`93>NF@bj4LF!NC&D6Zm+Di$Q-tb2*Q
z&csGmXyqA%Z9s(AxNO3@Ij=WGt=UG6J7F;r*uqdQ<A<k`&*~1mNB0QW1T5I+z^l>a
z?7j!nV{8eQE-cwY7L(3AEXF3&V*9{DpSYdyCjRhv#&2johwf{r+k`QB81%!aRVN<&
z@b*N^xiw_lU>H~@4MWzgHxSOGVfnD|iC7=hf0%CPm_@@4^t-nj#GHMug&S|FJtr?i
z^JVrobltd(-?Ll>)6>jwgX=dUy+^n_ifzM>3)an3iOzpG9Tu;+96TP<0Jm_PIqof3
zMn=~M!#Ky{CTN_2f7Y-i#|gW~32RCWKA4-J9sS&>kYpTOx#xVNLCo)A$LUme^fVNH
z@^S7VU^UJ0YR8?<bG~Mj6Gj-lk3HOub{MXq84f%T`QY6$SQB%P+{DM48!0oDB|1i&
zZKxv58$HkYAPzeA(N@4W-r2I(ob~ZN%-H1^uVTL2tUjwxrv8WT<9HEQp}oppV?S-b
z?TWa%T=%&4xZ~a0-G(Qtj>Oy$^IYuG*bm|g;@aX~i60%`7XLy*AYpYvZ^F^U(!|RW
z*C!rJ@+7TGdL=nNd1gv^%B+;Fcr$y)i0!GRsZXRHPs>QVGVR{9r_#&Qd(wL|5;H;>
zD>HUw=4CF++&{7$<8G@j*nGjhEO%BQYfjeItp4mPvY*JYb1HKd<ZQ^<n)7B(e{N}R
zNACLEJ-M&vp2!R2b>!{HJ9*)(3%BR%{Pp?AM&*yHAJsW({ivOzj*qS!-7|XEn6@zo
z3L*tBT%<4RxoAh>q{0n_JBmgW6&8hx?kL(_^k%VL>?xjAyrKBmSl`$=V|SK}ELl}@
zd|d0eo#RfG`bw9SK3%r4Y+rdvc}w}~ixV%tqawbdqvE-WcgE+BUpxMT%F@btm76MG
zn=oQRWWuTm+a{dy)Oc2V4yX(@M{QAkx>(QB59*`dLT`<?!`ti2@y+pV_8st7_#g52
z1!@8-14n{+!KuOff(Jusq1w=z(B5!jxFx(cyss+1s<Z0Bs-u@|yyQrAPIYVbrs`9d
z>Pz3Lsj9iB=HSHAiCq()ns|Cr)1<p6y)@aLys9>*c605Cx}3V&x}Lg?b+6Q?)z7Kl
zQh&1Hx`y6JY-Cwvd*ozeps}a1xAA0CR+Da;+O(i)P1C;SjOI}Dtmf6tPqo-Bl`U78
zv$kYgPntPp@G)n1an9tEoL*Vumu9`>_@I(;+5+fBa-*?fEx=mTEjZ7wq}#@Gd5_cW
z!mP{N=yqEntDo)|>oy6{9cu+-3*GTnmb^`O0^FzRPO^&aG`f@F_R*aQ_e{F+_9%NW
z4KG_B`@X3EVV9L>?_RNDMddA>w=e0KfAiw5?#i1NFT%Zz#nuv(&!yIU>lVxmzYKQ`
zzJ*0w9<&L4aJ6A;0j|_<vbtcWAbbzpCj3Gin*xk%@5HxYh(fosHrML5=EAoJzwHRw
zh@)_=)rwlI8GD^(O|@nqTobf9QEEG(*M$^xqkm*B>~i>+y(q-=;2Xxhx2v%CYY^{}
z^J@LO()eLo|7!{ghQ+(u$wxO*xY#)cL(|mi<iezIsIQq}e;H<1HsO1a%jmXB^n!Yj
z`bEguLTH*W^N>H2_ck2yN{mu4O9=hBW*pM_()-_YdH#Ru{JtwJ^R2}3?!>>m1pohh
zrn(!xCjE<?5dV)b*C5Aj$gepjhO+1}F~03sn})p^Uz6_w9HjtSwO;4fgQNBdkCC(S
zXIQs_lKEg{DKt7!64@q0U7<~Z9sWW2MiWn5C=n^v2(+j+NQ}hd(YScLR6bFX1e5GJ
z{f}vqE*X+(y(=SeU6&=<n3p71@^G&#A3gi#b>0Q&EH1<ywPMV@T7r4FN~KK7(R*2e
zG3w@Kn+NlNX^aE);gT>QK?zA%sxVh&H99cObJUY$veZhQ)MLu-h%`!*G)s$2k;~+A
z)Kk->Ri?`oGDEJEtI*wijm(s5<vO`uZjc+%3o%>f$W78FH{+qBxiU{~kq((J3uK{m
z$|C8K#j-?hm8H@x%VfFqpnvu@xn1s%J7uNZC9C99a<_b1J|mx%)$%!6gPU|~<@2&m
zz99GDp`|a%m*iggvfL;4%X;~WY>)@!tMWB@P`)k?$;0x9JSrRI8?s3rlgH(o@`OAo
zn{f*gZ#t2u<vX%PzAIbh8QCV^lkM_->6K??hx|aElOM`Xd0t+SAIUEHvFw%?Wsm$s
zUXq{6UU?a>Nc@@Xlb_2k<d?Yk`js4zSLLAmT7Dyk<TW`guge>9M1Ctr<#+O?yd}rv
z_wu&<L5|BGrBD7Of0n<<JMvdKA@9n2@;7;3{*GxNK9rO44>=_t$!Yngd@N_AUj}T;
z#*Ce|%XZr_sQcsWcsl{pCnnj+c8ZNIMmx<;w=-g$Q>BU;9k;w|zQ;4!W32Xg2Cd?{
zvmO3kuKQ^Hv;o>6ZHP8ZJ2`4~Bx?N;cf<0fi=!*G^^WzbTF3e$b&d^qqB{>nqLG81
zs94bBh%|Vj+hLu=!8(b9brJ>ZBns9^6s(gdSVyP9qnu2_I{Sg8j-rloG6{d`De5We
zDe5WeY3ga}Y3ga}Y3ga}Y3ga}Y3ga}d8y~6o|k%F>UpW>rJk31Ug~+N=cS&HdOqs;
zsOO`ek9t1p`Kafko{xGy>iMbXr=FjBxZMYc8a#gL`Kjlpo}YSt>iMY`pk9DF0qO*(
z6QE9jIsxhgs1u-0kUBx8D@eT{^@7w3QZGooAoYUO3sNscy%6<6)C*BBM7<F8LevXU
zFGRf%^}^H(Q!h-tF!jRJ3sWyly>L`dk$Xk%6}eZQXgo#!75P`>Uy*-B{uTLG<X@40
zMgA4}SL9!je?|Tk`B&s$k$*-075P`>Uy*-B{uTLG<X@40MgA4}SL9!je?|Tk`B&s$
zk$*-075P`>Uy*-B{uTLG<X@40MgA4}SL9xidqwUQxmV;~k$Xk%6}eaBUXgo6?iIOL
z<X#1$JSg(7$iE{0iu^0`ugJe5|BC!8@~_ChBL9l~EAp?%zasyN{44UW$iE{0iu^0`
zugJe5|BC!8@~_ChBL9l~EAp?%zasyN{44UW$iEuoJ{&DaDjY3GsEwTSjAnVzEDxIH
zL9;w)mIux9pvk``|C;=3@~_FiCjXlJYx1wjy(agXylZl<$+;%y7~~jDCpp*TT9a!{
zt~I&V<XV$!O|CV$*5q1~YfY{-xz^-blWR?`G3|Ub9pqZ`yspW&Cf}NTYx1qhw<h13
qd~5Qp$+srontW^Wt)qNLLXk-9aux9_WlUi5WYd6^D_dVgyY*ioe@L+a

literal 0
HcmV?d00001

diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.woff b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.woff
new file mode 100644
index 0000000000000000000000000000000000000000..9e612858f802245ddcbf59788a0db942224bab35
GIT binary patch
literal 23424
zcmY&eV{m0%u#Iioo_J#0nb?@vwry)-+qNe*Z>))v8{5gt_uj9!t5)^yb-JtjRGrhi
zYInOUNJxNyf_yKX01)K=WP|Si>HqEj|B{eUl?MR<)%<1&{(~)D+NPwKxWqT-@~snp
zg9KCz1VTZDiS?UH`PRk1VPM{29cgT9=<v;Lf`EYagMdIet=H@a8oRlWfPg?`f7?L(
zFKED?%?+Ku?I7~Mb(sI~^#uZMZsTe8&6R_I$YX<mq!jz=4cJ?l8k&HBDD{8auziCA
zQl4qm;+y>D?!Wc_@}qzggFv;gb@2cJQAYWWtpEZ7?y@jSVqjx${B5UV@SO|wH<<0;
z{><1KdVI%Ki}>~<`46C0AggwUwx-|QcU;iiZ{NZu`ur>hd*|<W)sXtmhXDixZoaeV
zklo$X=sQ21?>Hb(|6veERq<PbegkBRzi{?HIp-GW`hU_n&12ozz{J4dAGi@L6pDe-
z_ud2pJc-_b2pj}b3Pc9vzvpJBX4(Dy6a52IgD!!AfuwLEKN$^~jn+XAz)Mg9U?T~E
zgqNfL`tz^91n&aBz=T}M5SD}tB`7H25Mn@BQsEK4gL$l9qzGE52osF@rxjbO42^t7
z#@g=mu(37N%+Vt`PAJL-lQ=FQENF`3={3?oV6ei1hBKA`DuVTzgGk7b#0j#++TdzR
zI(97e!~g}_G7m33x=^Ssom?;fl4q}a+^;UP-1|ZzG9$*2kpk7p8YI9lAxj<90CjKp
zE8u&KGi5Zv=157hgKP@$c2&H4zuKcOmHoZD%?+qY(Kf~v8|7crq{Nr<WvZ$ts)Fb$
z8!IcdkQ`H>xu=b@5Bab=rqptGxd{QJg!4*-i_$sES~)AB46}Fjg|ea#e@?J}z%CUJ
zOsLWRQR1#<tB|QIEY)&I*ZbudHp)E;$><nb=BbXZ4tHi(jj=+TGtb?X^faOKFyozE
zS@PKF)~8;5xRSNpTm4ugp<(oc@Q3%7K-)@eyP?m1z&l;rf%%J4?;rfzsBU`M+aNyb
z*@?y5Vm{LN@ggUHmiuxx_Dtj5rsol#BM~=pjyHqe<HcvPas11*o_#i9ZJ%`X+7&6Y
z4F}#7CrnT%)O76bs<&03Bs~CBL9-lPzgZEx+oS+S$-gV~5q;R39w5(FZ(Km5B%*l&
z(rrr`BO68!fN#?(kC!s6W?du1@vWLl$02}9k4Iw`sS*azt|mzMLd*ov1C_X-Z_DEc
zA>ng^sD)A4FDuY!iUhzlgfJh(J@BRqd&P#v2B`+saBx>m+M&q7vk-75$NH%T5pi%m
z5FX?`2-5l53=a&GkC9^NZCLpN5(DMKMwwab$FDIs?q>4!!xBS}75gX_5;(luk;3Vl
zLCLd5a_8`Iyz}K}+#RMwu6DVk3O_-}n>aE!4NaD*sQn`GxY?cHe!Bl9n?u&g6?aKm
z-P8z&;Q3gr;h`YIxX%z^o&GZZg1=>_+hP2$$-DnL_?7?3^!WAsY4I7|@K;aL<>OTK
zByfjl2PA$T83*LM9(;espx-qB%wv7H2i6CFsfAg<9V>Pj*OpwX)l?^mQfr$*OPPS$
z=`mzTYs{*(UW^ij1U8UfXjNoY7GK*+YHht(2oKE&tfZuvAyoN(;_OF>-J6AMmS5fB
z<XKU7YH10@@&WJhj71Cj$=TP(r@q<cW{2}t$FbdUw)ad2!elcuLPw0X5toDsPadV*
zO3EPF>^sY6wea&&${+!}@R1f$5oC-2J>J-A${@r(dRzc`wnK>a7~8{Y-scc|ETOI8
zjtNY%Y2!PI;8-@a=O}+{ap1Ewk0@T`C`q!|=KceX9gK8wtOtIC96}-^7)v23Mu;MH
zhKyLGOQMujfRG$p(s`(2*nP4EH7*J57^=|%t(#PwCcW7U%e=8Jb>p6~<TTQ9e?y3C
zdb|J>>RAlY4a*t<yx)M!`#-^(n~+nSXHt)XXPCd>s=pl}_J{->@kKzxH|8XQ5{t=E
zV&o`$D#ZHdv&iZWFa)(~o<E{GN9+27JE4iktONzQ1b)q{Sex30G?of$HMKN~8KD%g
zA+E{L7XRV>Bh-Osl{~CS0hfM7?PyWUWsr5oYlsyC1cwULoQ4|Y5RHA2*rN+EnFPnu
z`Y_&Yz*#550YJwDy@brZU>0pWV^RxRjL221@2ABq)AtA%Cz?+FG(}Yh?^v)1Lnh%D
zeM{{3&-4#F9rZhS@DT0E(WRkrG!jC<!Dwf@j`RqVrLtHFoIyn_L9bxbWrgS*Z9wMu
z#p1&N;H{ZGv&zD_N*zbkas>#5?OFjZv*xQjUP~XsaxL2rqRKvPW$zHqHr8Urp2Z)L
z+)EvQeoeJ8c6A#Iy9>3lxiH3=@86uiTbnnJJJoypZ7gco_*Hv<E!$|Yb^#x+eGvv(
zIp;Wt3|Xgi12|CZQBu5wnkbr4Z_o<}@wU&ThE&G4r6LGOs?2M%<}Vu1j2>KOH97B?
zWiwp>+r}*Zf9b3ImxwvjL~h~j<<3shN8$k-$V1p|96I!=N6VBqmb==Bec|*;HUg?)
z4!5#R*(#Fe)w%+RH#y{8&%%!|<UeDoR>fQ5JcFzUE;-yVYR^&Ek55AXb{^w|@j|&G
z|6C-+*On%j;W|f8mj?;679?!qY86c{(s1-PI2Wahoclf%1*8%JAvRh1(0)5Vu37Iz
z`JY?RW@qKr+FMmBC{TC7k@}fv-k8t6iO}4K-i3WkF!Lc=D`<I4n3h#nG>nuD)v#Na
zA|R*no51fkUN3^rmI;tty#IK284*2Zu!kG13<C=xWI7mp_-$=}wb|<b)!OZRv-HEP
z{%b~I$E(4`VZ#-glOe-5)a2pflY1Bz-1#4je?)~T9!X4-E;pkTTM{XAe2I!K$wY&{
zHEYHdnV_WuXSOaFHmg_J8USFkT|e)_-*FkL@p7z7`X=kCplNBVHgHbdYiIA4b&ia%
zF^b30NW{}~a)`)^H3EMpr)@2a^C3(yt-t3eigT2)odQdx2zf*pafN9pF#;@+u4LZa
z7x<*Yxq9&rRf5M3B$p^s`skXsITAn=Zo(y=33sGRSGWuaK?&Ne`Pj#q{feF+D~&z+
zEyT)MiaBL7L|^V76c6eAiTxZof6@zS20aGf%dzLc3HH8OA(-=u{w4pJ6%*OO;uayC
zzR4O{sz+f(78K2km*}=(W9{c=$lUj4eqLf#^t$Qwnbo?bEXMO?j$N^G)CbdGe8!P9
zJnZQX@k)7bzDG0I8w{~ZPTf4?D$;UGe$M~$TSzciU_@dS=0n{mhB=qm5O0^X+E9+o
z1x?ef8>!$OlxJAt@zLU`kvsazO25TpJLbK&;M8kw*0)*14kpf*)3<d6yUQxMZe%8t
zXy(eYN2(&WrmwSg<nK0tWy!~|3-Ib)_FW|=FVb)tUsL?PQ@qp22p>;GiDh;C(F}$-
z1;!=OBkW#ctacN=je*Pr)lnGzX=OwgNZjTpVbFxqb;8kTc@X&L2XR0A7oc!Mf2?u9
zcctQLCCr+tYip<jrMK$>a_k=;1ETIpHt!Jeo;iy^xqBES^Ct6-+wHi%2g&)?7N^Yy
zUrMIu){Jk)luDa@7We5U!$$3XFNbyRT!YPIbMKj5$IEpTX1IOtVP~(UPO2-+9ZFi6
z-$3<|{Xb#@tABt0M0s1TVCWKwveDy^S!!@4$s|DAqhsEv--Z}Dl)t%0G>U#ycJ7cy
z^8%;|pg32=7~MJmqlC-x07Sd!2YX^|2D`?y;-$a!rZ3R5ia{v1QI_^>gi(HSS_e%2
zUbdg^zjMBBiLr8eSI^BqXM6HKKg#@-w`a**w(}RMe%XWl3MipvBODo*hi?+ykYq)z
ziqy4goZw0@VIUY65+L7DaM5q=KWFd$;W3S!Zi>sOzpEF#(*3V-27N;^pDRoMh~(ZD
zJLZXIam0lM7U#)119Hm947W)p3$%V`0Tv+*n=&ybF&}h~FA}7hEpA&1Y!BiYIb~~D
z$TSo9#3ee02e^%*@4|*+=Nq6&JG5>zX4k5f?)z*#pI-G(+j|jye%13CUdcSP;rNlY
z#Q!X%zHf|V)GWIcEz-=fW6AahfxI~y7w7i|PK6H@@twdgH>D_R@>&OtKl}%MuAQ7I
zcpFmV^~w~8$4@zzh~P~+?B~%L@EM3x(^KXJSg<wVEvJN(*DSLK{@lLZ^>c6I=;)B6
zpRco2LKIlURPE*XUmZ^|1vb?w*ZfF}EXvY13I4af+()bAI5V?BRbFp`Sb{8GRJHd*
z4S2s%4A)<beb5!5W2AL1ws>6Uc=PK%4@PbJ<{1R6+2THMk0c+kif**#ZGE)w6WsqH
z`r^DL&r8|OEAumm^qyrryd(HQ9olv$ltnVGB{aY?_76Uk%6p;e)2DTvF(;t=Q+|8b
zqfT(u5@BP);6;jmRAEV057E*2d^wx@*aL1GqWU|$6h5%O@cQtVtC^isd%gD7PZ_Io
z_BDP5w(2*)Mu&JxS@X%%ByH_@+l>y07jIc~!@;Raw)q_;9oy@*U#mCnc7%t85qa4?
z%_Vr5tkN^}(^>`EFhag;!MpRh!&bKnveQZAJ4)gEJo1@wHtT$Gs6IpznN$Lk-$NcM
z3ReVC&qcXvfGX$I0nfkS$a|Pm%x+lq{WweNc;K>a1M@EAVWs2IBcQPi<R5t!qadV8
z`@w2vB^p<`Z$u8twt230^FDUXk@KFGRjk|Wy)IU*vs&-S4^@ur^QOw}{f&PX2ZUtx
z2^VHiFLv0j^tM_qTCdnm{?$%kSnzz+Rz#c}<%d@@&Y%vBngG@bQjNu*$QIzHiMtlr
z%<!I8J_+!}g1P;40riIDVp#J58>EJNt}+Ea8~WiapASoMvo(&PdUO}AfC~>ZGzq<X
zA{wc(2{B`w8<FdY#fUA=!$2hWfZJFFh^biG^FRul&;5HGQt3HYB*8-U;tAm`ZDrW?
zLGzSCAtG}^Y%BI&AQbV|jc8`aQkJs}$KZGr4&D`BKH5)pk?++zISItrK-zIx+|7D6
zd{(|~knMc?H%TN~Ttm8w#&X{*x_x0Tx_urTbWQT(rM-zoT(XUHVI3m?V@uQP4J|db
z_OkbMEz8a;6}80;ZBwYhBLn3A0_Q%9Xo7*<Qa^td-Q$KXkb<^$rXNS+J!!v~e_27-
z?B(DtKu5zrraAfXQ`1kqTCnO1=JFF~4jJA+&eXD+hsTX=d50Jrj6yJ)U-=XHF8z-o
z1o@Y7@sl2x7U<!Ygv?%s5eyX!wKt`l=(%|REJ0yS<TOH?s9B)is6Iv13lr}2%hiI}
zPUW^d?_dD#I&an8I8t^fY)SnDOhO39OTDNje$JA5dr5!UH92rZ)87wX;yQSp&mZg<
zmgmz=w6D&%v&B;c-vM3DEvl$Gev##x*ndtU#f^N2I}99-3HZpRE^$`D%!0A_ujaQb
zI5z(Mh2X@IN1#BF?<;^jK#~(MAEc`h<3P$Nghud=)(&&|-qnC?^x{5VK>Wjd)4no(
ziLi#e3lOU~sI*XPH&n&J0cWfoh*}eWEEZW%vX?YK!$?w}htY|GALx3;YZoo=JCF4@
zdiaA-uq!*L5;Yg)z-_`MciiIwDAAR3-snC4V+<n|J*V*n#h?&wg+C8sg$z312~u%3
zz$RVnQhlm*2c)>KA>&V%Ak;p{1u>{Lw$NFj)Yn0Ms2*kxUZ)OTddbiJM}PK!DM}Ot
zczn?EZXhx3wyu6i{QMz_Ht%b?K&-@5r;8b076YDir`KXF0&2i9NQ~#JYaq*}Ylb}^
z<{{6xy&;dQ;|@k_(31PDr!}}W$zF7Jv@f%um0M$#=8ygpu%j(VU-d5JtQwT714#<!
z&vm@KPB=l<TMpuv%DS+RW~~WnEOz5WiaSxW4<ph#&0;zqiCMt1ekX<hrb8#^mBYaW
zJA2vi7UWJVhfbeu%Rejgz>f0z+Cm$F9J<FFP&8OfSp_OMl7>jGr_G!~NS@L9P;C1?
z;Ij2YVYuv}tzU+HugU=f9b1Wbx3418+xj$RKD;$gf$0j_A&c;-OhoF*z@DhEW@d9o
zbQBjqEQnn2aG?N9{bmD^A#Um6SDKsm0g{g_<4^dJjg_l_HXdDMk!p`oFv8+@_v_9>
zq;#WkQ!GNGfLT7f8m60H@$tu?p;o_It#TApmE`xnZr|_|cb3XXE)N^buLE`9R=Qbg
zXJu}6r07me2HU<)S7m?@GzrQDTE3UH?FXM7V+-lT#l}P(U>Fvnyw8T7RTeP`R579m
zj=Y>qDw1h-;|mX-)cSXCc$?hr;43LQt)7z$1QG^pyclQ1Bd!jbzsVEgIg~u9b38;>
zfsRa%U`l%did6HzPRd;TK{_EW;n^Ivp-%pu0%9G-z@Au{Ry+EqEcqW=z-#6;-!{WA
z;l+xC6Zke>dl+(R1q7B^Hu~HmrG~Kt575mzve>x*cL-shl+zqp6yuGX)DDGm`cid!
znlnZY=+a5*xQ=$qM}5$N+o!^(TqTFHDdyCcL8NM4VY@2gnNXF|D?5a558Lb*Yfm4)
z_;0%2EF7k{)i(tTvS`l5he^KvW%l&-suPwpIlWB_Za1Hfa$@J!emrcyPpTKKM@NqL
z?X_SqHt#DucWm<3Lp}W|&YyQE27zbGP55=HtZmB(k*WZA79f##?TweCt{%5yuc+Kx
zgfSrIZI*Y57FOD9l@H0nzq<E4Q@_YK<1;`>Ou|Bhrm&^m_RK6^Z<^N($=DDxyyPLA
z+J)E(gs9AfaO`5qk$IGGY+_*tEk0n_wrM}n4G#So>8Dw6#K7tx@g;U`8hN_R<bPv^
zP6}0b!dly7dCc=KnICM>;^Uw9JLRUgOQ?PTMr<oQ9o~>4YD5H7=ryv)bPtl=<&4&%
z*w6k|D-%Tg*F~sh0Ns(h&mOQ_Qf{`#_XU44(VDY8b})RFpLykg10uxUztD>gswTH}
z&&xgt>zc(+=GdM2gIQ%3V4AGxPFW0*l0YsbA|nFZpN~ih4u-P!{39d@_MN)DC%d1w
z7>SaUs-g@Hp7xqZ3Tn)e<dV~D-0@M0u`KSW@qBLlIFNKze0?;|tm!<F9_5{TDKnUY
zJB8#(%G(di5;`|v12#{)=^Bhy!6zu5lq~#Rj8QgnK?%W-bqS8Lq9_xGRU?MD1Z_M>
z7x^sC`xJ{V<3YrmbB{h9i5rdancCEyL=9ZOJXoVHo@$$-%Za<Y<=Dws@<HVOn84kp
zy7czzAj#&D?|uHYH^U!oq7C#CS4C-HKPWUJ-r}5;#IkR`+-?7IMg|O#r^#PS@coAT
z<xl(XMO(JUH%Fc8@Q;tlw>Nm-75Z-Ry9Z%!^+STWyv~To>{^T&MW0-;$3yc9L2mhq
z;ZbQ5LGNM+aN628)Cs16>p55^T^*8$Dw&ss_~4G5Go63gW^CY+0+Z07f2WB4Dh0^q
z-|6QgV8__5>~&z1gq0FxDWr`OzmR}3aJmCA^d_eufde7;d|OCrKdnaM>4(M%4<dMy
z`?Qi<9Ebh#nVT{&VVFv66RU??kcC8}u+l^~F(m>V`PxpCJc~UhEuddx9)@)9qe_|i
z)0EA%&P@_&9&o#9eqZCUCbh?`j!zgih5sJ%c4(7_#|Xt#r7MVL&Q+^PQEg3MBW;4T
zG^4-*<N;_j_KF=#ltp<I^9_IU8#T_ulQ_w;P&0IS=TATWkvf^^ks|nDnb@T^ShFUW
ztuyr~q)6&!?68RQ-V8G+#+EoOhWE-6A7rk5HfHxAG?Sknf`kY=i0}11&e`cz`MCO{
zQd*rofIJ{OtoMr$=gf?H!$EPT16>8L%s|A}R%*eGdx&i}B1He(mLygTmIAc^G(9Si
zK7e{Ngoq>r-r-zhyyg<ieAPsqNv@SQwQ@xsNn5Vw2I}E18CcU&C?((>K)*9cj8_%g
z)`>ANlipCdzw(raeqP-+ldhy<kGNs8`S#*G-e>Uv_VOht+!w*>Sh+Z7(7(l=9~_Vk
ztsM|g1xW`?)?|@m2jyAgC_IB`Mtz(O`mwgP15`lPb2V+VihV#29>y=H6ujE#rdnK`
zH`EaHzABs~teIrh`ScxMz}FC**_Ii?^EbL(n90b(F0r0PMQ70UkL}tv;*4~bKCiYm
zqngRuGy`^c_*M6{*_~%7FmOMquOEZXAg1^kM`)0ZrFqgC>C%R<qRBgHG)$UB@XBA@
zshx3_1QSr};A7TJ_s8FNBrzB>JvQSo_OAA(WF3{euE}GaeA?tu5kF@#62mM$a051I
zNhE>u>!gFE8g#Jj95BqHQS%|>DOj71MZ?EYfM+MiJcX?>*}vKfGaBfQFZ3f^Q-R1#
znhyK1*RvO@nHb|^i4Ep_0s{lZwCNa;Ix<{E5cUReguJf+72QRZIc%`9-Vy)D<o;c>
zWKhb?FbluyDTgT^naN%l2|rm}oO6D0=3kfXO2L{tqj(kDqjbl(pYz9DykeZlk4iW5
zER`)vqJxx(NOa;so@buE!389-YLbEi@6rZG0#GBsC+Z0fzT6+d7deYVU;dy!rPXiE
zmu73@Jr&~K{-9MVQD}&`)e>yLNWr>Yh8CXae9XqfvVQ&eC_;#zpoaMxZ0GpZz7xjx
z`t_Q-F?u=vr<JfY4KbWG<xAz}usjoo`>RPaj3r<9&t6K=+egimiJ8D4gh-rUYvaVy
zG($v+3zk5sMuOhjxkH7bQ}(5{PD3Mg?!@8PkK&w>n7tO8FmAmoF30_#^B~c(Q_`4L
zYWOoDVSnK|1=p{+@`Fk^Qb81Xf89_S`RSTzv(a4ID%71nll%{Wad$!CKfeTKkyC?n
zCkMKHU#*nz_(tO$M)UP&Zf<GNy8?Xs8hUzIu0nqFC9@Ka{&R$vXnbN*?hR?iwv-x*
zPrH;>J#*q(0Gr!E(l5(ce<3xut+_i8XrK8?Xr7_oeHz(bZ?~8q5q~$Rah{5@@7SMN
zx9PnJ-5?^xeW2m?yC_7A#<rjP_en{9P5bFL68vgKu`Lv^loBE5&?9+BtYGMUT06bd
zXEt*_Sdl_o?{!kSnxeJB_xVtFwR-bF`2MlsSO1bZtN)M(j%)mHVUj4b&G~L_`|PNv
zb05EL`!%-lV_>WK*B@oIy*Y@iC1n7lYKj&m7vV;KP4TVll=II)$39dOJ^czLRU>L>
z68P*PFMN+WXxdAu=Hyt3g$l(GTeTVOZYw3KY|W0Fk-$S_`@9`K=60)bEy?Z%tT+Iq
z7f>%M9P)FGg3EY$ood+v<G?d-tNS5y+I=S1dlJZvs-NC{^w-&Jr{gfwR>$pdsXvG?
zd2q3abeu-}LfAQWY@=*+#`CX8RChoA`=1!hS1x5dOF)rGjX4KFg!iPHZE2E=rv|A}
zro(8h38LLFljl^>?nJkc+wdY&MOOlVa@6>vBki#gKhNVv+%Add{g6#-@Z$k*ps}0Y
zQ=8$)+Nm||)mVz^aa4b-Vpg=1daRaOU)8@BY4j<Xy)*mrZf+Eqj^RX06GbC^vLKT|
zpteFBLq#626+?=M@k2|V@k{2aN?cRlCum?`TP_u}%3Y{AVZHbKwm{q2d`D~XsJSyD
zl=xk@5@i0e1=0fu$jfj1+lTA1h#%78*$MuUCU^B9>S>=5n#6abG@(F2`=k-eQ9@u#
zxfNFHv=z2w@{p1dzSOgHokX1AUGT0DY4jQI@YMw)EWQ~q5wmR$KQ}Y;(HPMSQCwzu
zdli|G?bj(>++CP)yQ4s6YfpDc3KqPmquQSxg%*EnTWumWugbDW5ef%8j-rT#3rJu?
z)5n;4b2c*;2LIW%LmvUu6t1~di~}0&Svy}QX#ER|hDFZwl!~zUP&}B1o<!gKVHBj1
z!0%hK_{Iy`*BgY<Qck8#<-rH4Lg1;Qj-hq2OvPXM$(Gkmg`0T7B6Gm*>KAxIzt~so
zb!GaJYOb#&qRUjEI1xe_`@<o~iP+Rf(GIMHq*yg6%vf7Mu<-aQ)$}%3o$R+x;;~W%
zCQ~RFyB5g)F1k-t!#^TN>7qv_-LggQ$JE8+{ryT4%ldwC5ete+{G3C#g@^oxfY3#F
zcLlj(l2G8>tC<5XWV|6_DZQZ7ow?MD8EZ9mM2oV~WoV-uoExmbwpzc6eMV}%J_{3l
zW(4t2a-o}XRlU|NSiYn!*nR(Sc>*@TuU*(S77gfCi7+WR%2b;4#RiyxWR3(u5BIdf
zo@#g4wQjtG3T$PqdX$2z8Zi|QP~I^*9iC+(!;?qkyk&Q7v>DLJGjS44q|%yBz}}>i
z&Ve%^6>xY<=Pi9WlwpWB%K10Iz`*#gS^YqMeV9$4qFchMFO}(%y}xs2Hn_E}s4=*3
z+lAeCKtS}9E{l(P=PBI;rsYVG-gw}-_x;KwUefIB@V%RLA&}WU2XCL_?hZHoR<7ED
zY}4#P_MmX(_G_lqfp=+iX|!*)RdLCr-1w`4rB_@bI&<E#m-6fJX?!@HMojcz?@FV(
zEwb`K9p)6DH8Vt-HX;X2^%28zP(BOT@+<+Oy5Uv8eD=4p<t0n4?tw(5<&#sr?h6zV
z!&Zb?gM&8<%??jXTdmMb1(#@6)m(rk*#aUo^iqOs4-#{`NA;|yExPzdS?_q~O>Uz#
z!>9C3&LdoB$r+O#n);WTPi;V52OhNeKfW6_NLn<EDp2Lr=qOaId}Ifx9lEG?H#PEN
zbI74Vx*PNK+cvB53_AWmzs=zCb5!9-mCcW#<QbIdOJM|=ASw5QpF+P}oobETGwNf<
z0{kapJo<fgf(@=YJA0C%pNqB2CMVFcToi3AV3#1!n@Z&vX@98&`Sz6*SUYY~uWq>w
zpFTuLC^@aPy~ZGUPZr;)=-p|b$-R8htO)JXy{ecE5a|b{{&0O%H2rN&9(VHxmvNly
zbY?sVk}@^{aw)%#J}|UW=ucLWs%%j)^n7S%8D1Woi$UT}VuU6@Sd6zc2+t_2IMBxd
zb4R#ykMr8s5gKy=v+opw6;4R&&46$V+OOpDZwp3iR0Osqpjx))joB*iX+diVl?E~Q
zc|$qmb#T#7Kcal042LUNAoPTPUxF-iGFw>ZFnUqU@y$&s8%h-HGD`EoNBbe#S>Y-4
zlkeAP>6<Z7QQ9XL^<-l?vhbA^VVM{w_AGyBxGo2D4xc6Tl~BnC{PHYDLP{4>2k~-N
zHQqXXyN6<L3Gg$i2mMBKaSbx<i~TEhvQ{`W#&P&}*M*bY-+RuxoiU+jyjZtu*2#d`
z4;V{mY|5$$TfD^8s7AA{v{=Q~S8RRnPkT2vB+qp-b$~mY>7hGD6CxQIq_zoepU&j0
zYO&}<4cS^2sp!;5))(aAD!KmUED#QGr48DVlwbyft31WlS2yU<1>#VMp?>D1BCFfB
z_JJ-kxTB{OLI}5XcPHXUo}x~->VP%of!G_N-(3Snvq`*gX3u0GR&}*fFwHo3-vIw0
zeiWskq3ZT9hTg^je{sC^@+z<IC+@jyb5}hL&*c9&Uv=C+8r5MFr<BeiUxikY7v-2j
z#^Wp1Woo#;-OnJd6+u?>3FAd}KNhbpE5RO+lsLgv$;1igG7pRwI|;BO7o($2>mS(E
z$CO@qYf5i=Zh6-xB=U8@mR7Yjk%OUp;_MMBfe_v1A(Hqk6!D})x%JNl838^ZA13Xu
zz}LyD@X2;5o1P61Rc$%jcUnJ>`;6r{h5yrEbnbM$$ntA@P2IS1PyW^RyG0$S2tUlh
z8?E(McS?7}X3n<sX7)_F=$tGzECOdx`5F$56$H6$2HeHDocU>AAJs2u_n{^05)*D7
zW{Y>o99!I9&KQdzgtG(k@BT|J*;{Pt*b|?A_})e98pXCbMWbhBZ$t&YbNQOwN^=F)
z_yIb_az2Pyya2530n@Y@<KMNVgC+@Hh^eD5>s>s>n?L79;U-O9oPY$==~f1gXro5Y
z*3~JaenSl_I}1*&dpYD?i8s<7w%~sEojqq~iFnaYyLgM#so%_ZZ^WTV0`R*H@{m2+
zja4MX^|#>xS9YQo{@F1I)!%<Q9x6E+JCnjAm>RhM{4ZUapHTKgLZLcn$ehRq(emb8
z9<w{<)uy~=x}G;ZX+CDl#T7`~iRBx5XO`@><&Nx*RLcS#)SdTxcURrJhxPM2IBP%I
zf1bWu&uRf{60-?Gclb5(IFI*!%tU*7d`i!l@>TaHzYQqH4_Y*6!Wy0d-B#Lz7Rg3l
zqKsvXUk9@6iKV6#!bDy5n&j9MYpcKm!vG7z*2&4G*Yl}iccl*@WqKZWQSJCgQSj+d
ze&}E1mAs^hP}>`{BJ6lv<q%AGiq()8hz}1^1ex;^<jj#cc=g{s#0iIU-+2jVmxWDS
zd7qq)5u4+Paaui>*>0-ft<;P@`u&VFI~P3qRtufE11+|#Y6|RJccqo27Wzr}Tp|DH
z`G4^v)_8}R24X3}=6X&@Uqu;hKEQV^-)VKnBzI*|Iskecw~l?+R|WKO*~(1LrpdJ?
z0!JKnCe<|m*WR>m+Qm+NKNH<_ye<gDWD0Fl@Ho4<!fm=u&SGgDO!cbo+8PUwfWk+V
z)@b~#GtD0d4#K=39kiev5hj=8h(Nljd<HunOw<O@9z?#m(rb)ZnCBDPu~!uM>fIml
z+x32qzkNRrhR^IhT#yCiYU{3oq196nC3ePkB)f%7X1G^Ibog$ZnYu4(HyHUiFB`6x
zo$ty-8pknmO|B9|(5TzoHG|%><C<pr4&IxzPg{!KcQqRSE~Tvrur~GxUa*ce)ipeE
zWgS=NE-mtVKb)JH#~V9~Hf<heFWK%N<`blD%sTD$A|XGR=J%4vWJQ9B3q;($v$3~e
zpgG#}?8+2jU@b$OcWYMF>s#7)CM(i=M7Nl=@GyDi-*ng6ahK(&-_4h(lyUN-oOa$`
zo+P;<GhFDlQ-b}GJ)A97b8DT!@21D?+G`33xflj&^Ajw)WxefL*Yy?uny35myNvN;
zJu2^EIk(I5BXd2N-yKn?<jAHF(>C4d@m^p9J4c~rbi$rq9nhGxayFjhg+Rqa{l#`Y
z!(P6K7fK3T;y!VZhGiC#)|pl$QX?a)a9$(4l(usVSH>2&5pIu5ALn*CqBt)9$yAl;
z-{fOmgu><7Y<XFolPQk)mb~-4Wz2OqAihGXbfUWv<O@$JoEd1wcAoD{S1ZgFTS^!t
z+_d^VD?_*`AXb~e&yM8k-n#rSNZe`F1hkVx1o46tWKB^*u4Iztzf9jS`;huL0efN_
zw(C5^O4iFb>J5k>*0Q~>lq72!XFX6P5Z{vW&zLsraKq5H%Z26}$OKDMv=sim;K<Yz
zr-(K#w$yhGyI)R05r<FcNBPUs!f8{%L|!+M;WNfIk0#<kNVlmop1dan3IH7GPG0zR
zbu5#oKma)07cl(sMbhFbgIx|mM?)DnP$;1oA~OW0kph!a5>?vsoVs(JNbgTU8-M%+
zN(+7Xl}`BDl=KDkUHM9fLlV)gN&PqbyX)$86!Wv!y+r*~kAyjFUKPDWL3A)m$@ir9
zjJ;uQV9#3$*`Dqo1Cy5*;^8DQcid^Td=CivAP+D;gl4b7*xa9IQ-R|lY5tIpiM~9-
z%Hm9*vDV@_1FfiR|Kqh_5Ml0sm?abD>@peo(cnhiSWs$uy&$RYcd+m`6%X9<SS+iH
zB{MTIilfs+m}FIm`WFe<b<`1NL(_5%pWxy`61V?hXOmI!N62_Zv-n^jPyCieqxTv3
zu0_=zb8f!dMp?R&UxGJe1qNBBRLXVmj-(R6+9rkXoo6CT-@FKe>FN%?<F{pFRdeJu
z{9WJNuwr(Se^zX7t-vqF<$J*yv&MnYO_uaKBS^eIab7YX1r1^(=OyZJp!PzX%0e7b
zeEpxGl+qFvtIR-KD}KZT9sfArU;dGM3-23I#q69NU-%A?w~!T{F+*-_Lil`8wsSSR
zeW-s?xK)R5p&SHb*TI!J314$wOF*NT7qT*&*Og`^+jXq)LaOJ8#&*`Gy)1X0+KiH$
zU-5JNg0Goq-9^C#_ZqHXSIP}b7@(P=L?LSJk~7{IhyH9xAy{$zEDuPUgJ_RJae#PE
zOqO-BK*KnjogIL_)Jz3RACJUY?ZEW~+1H$~{2k_o%Y(uIH3R6z`K|NdGL!=5lV$Vc
z*(&fGI7OherXM4x!s0w3{b4Ax#6<l}lTU2>w}s~Q=3!pJzbN~iJ}bbM*PPi@!E0eN
zhKcuT=kAsz8TQo76CMO+FW#hr6da({mqpGK2K4T|xv9SNIXZ}a=4_K5pbz1HE6T}9
zbApW~m0C`q)S^F}B9Kw5!eT)Bj_h9vlCX8%VRvMOg8PJ*>PU>%yt-hyGOhjg<ke2;
z7Th2%k_wZpW!A{?Dn2nLFJ4=lqYa4jV<d3;8-+Dg@?%0IvOWsDfrv_`J~>!2pZR4{
z=VR_*?Hw|aai##~+^H>3p$W@6Zi`o4^iO2Iy=FPdEAI58Ebc~*%1#sh8KzUKOVHs(
z<3$LMSCFP|!>fmF^oESZR|c|2JI3|gucuLq4R(||_!8L@gHU8hUQZKn2S#z@EVf3?
zTroZd&}JK(mJLe>#x8xL)jfx$6`okcHP?8i%dW?F%nZh=VJ)32CmY;^y5C1^?V0;M
z<3!e8GZcPej-h&-Osc>6PU2f4x=XhA*<_K*D6U6R)4xbEx~{3*ldB#N+7QEXD^v=I
z+i^L+V7_2ld}O2b-(#bmv*PyZI4|U#<t4E{c3+Oa>Q5|22a(-VLOTZc3!9ns1RI-?
zA<~h|tPH0y*bO1#EMrsWN>4yJM7vq<?d%8sAQUGrndP7J-=xw$nCMSpe7!xoUBNp3
zGTsNoHNSmE+wi-t?Vjri@)nrwy)cL`f%zSrKknks+ReH>FZr?uw$H8*P<CaW^*(*P
zrk<ZDEOj-RoW=I>hiHRQg1U9YoscX-G|gck+SSRX<zu*#%uOZJ$&`iwbI4f^EJ9pa
z@T8p1=V0x-K77AYupaOqRJ8Y8`CFqe-OG4O?Pk+3)K=lIg7Aj+5B{LP8{|uD9bb*L
z=JkjZ*a>!(e7@~eeUEw+POsT;=W9J&=EV`cUc{PIg_#TQVGnZsQbCs7#Q-)<h~+VJ
z%O_$A%X$-T2gv^1iV6X%A*e(F(fO?hnMA3<=C!;L;mUog>v#BicxLw#Fb?#)8TYbu
zN)5R=MI1i7FHhF|X}xEl=sW~`-kf;fOR^h1yjthSw?%#F{HqrY2$q>7!nbw~nZ8q9
z<TlAz0DCai`eopoTgUXKr$&x3a%Yszt2{+eo;=r&?LuF;Zj%RNLHAg=LM|in10Rm2
zxd6;k(nHtRPkOmYqHW7fNcCybHEd(KrX46#z77Z9Q1dkPl|2ZTAjBY-ol(B)e&98T
zgr-$?X`Ytyy13^aY2fa`@Y1*X*i2)xR`@;KF^;++G5hoP)3auvu~w3;5+L|E0eJ^s
zgZRj(m;s_<P67c5tRN5r2qBB}z`g`y!oX~V8oXD2oDd8#khWZ&toq|9@%NQ>h{vY!
z<QL?e6`jG`+hK%nypIRco?pA%s6+zYx(b~=Fi(E95-40VeV5w!L2#*>%i=H!!P&wh
z7_E%pB7l5)*VU>_O-S~d5Z!+;f{pQ4e86*&);?G<9*Q$J<tS(vm9lEGpTY@s(2ek+
z8c`{)@2$sFJY{r$73(<V2UKiNm)(n(&DNp1&6b1{q_xZVGIdKSwV*O`Z3q;#cCe`U
zk~C47tS5LEB&@mN%p)_=XY@OEf&MPgH{St5oHz7A*3o-mSC#2S@XC^m@?vD0WoA3+
z%jkw-8_?@Gk~M`p*@7Cp@q?r=ifcr#f5J(+ee*SCy-59!ceTk_CH8c7hwjNA;pzKD
zr8zf+A(f>EJ!ZxY;Oj5&@^eg0Zs!iLCAR`2K?MSFzjX;kHD6)^`&=EZOIdW>L#O`J
z<!j^{WZ{m%sbn?E@W3)ou>f~$M4}JiV}v6B-e{NUBGF<D@nTna4Fj(s(L&KkX*F3!
zglkC}q4NM*a2HP+ijp5<SToUO6J4Q%w}VEJFwp|MQ|{cP2x=Zt1r&nh4>gj-*H%NG
zfY0X(@|S8?V)drF;2OQcpDl2LV=~=%gGx?_$fbSsi@%J~taHcMTLLpjNF8FkjnjyM
zW;4sSf6RHaa~LijL#EJ0W2m!BmQP(f=%Km_N@hsBFw%q#7{Er?y1V~UEPEih87B`~
zv$jE%>Ug9&=o+sZVZL7^+sp)PSrS;ZIJac4S-M>#V;T--4FXZ*>CI7w%583<{>tb6
zOZ8gZ#B0jplyTbzto2VOs)s9U%trre`m=RlKf{I_Nwdxn(xNG%zaVNurEYiMV3*g|
z``3;{j7`UyfFrjlEbIJN{0db|r>|LA@=vX9CHFZYiexnkn$b%8Rvw0TZOQIXa;oTI
zv@j;ZP+#~|!J(aBz9S{wL7W%Dr1H)G-XUNt9-lP?ijJ-XEj1e*CI~-Xz@4(Xg;UoG
z{uzBf-U+(SHe}6oG%;A*93Zb=oE>uTb^%qsL>|bQf?7_6=KIiPU`I|r;YcZ!YG7y~
zQu@UldAwz$^|uoz3mz1;An-WVBtefSh-pv<`n&TU3oM!hrEI?l@v8A4#^$4t&~T32
zl*J=1q~h+60sNc43>0aVvhzyfjshgPYZoQ(<inR$cERK&%N~SSiy;WaiBTgdl;Bz@
zMx7h{4w6)@f3=XUfD<5b*Di$-gK~XeKu8qdfa(KL$OL~#uI0n&gFVreVt1RX*+{5+
z#8$4WWjNT2me=PpYKo4u#73>OOh>LbUIoblb@1z~zp?))n?^)q6WGuDh}gMUaA9|X
z3qq-XlcNl<s-dSKro}45AbD<^IA@6tvSaLv-;sRc5uLj-i(AB^*}0)lznJ6A48b01
zt^mDP9!TqxILrO*cRjO@t^fSYOWb`|vQ*V4*6V-Ii_hT$&15AhsiGo@jvJCCnY0);
z)Gbzh<7K3LRm`L**mLt1MLc+MqqaWkz{2JV0hUf-(7U6vlP$%@`2fR-Dt+r$66q)X
zh2sR=$#8zbejz`}<A~Y#k!TUpiD??3amyj(E}M)o)o#H-j|LmgBHBXsF9$ok?Wh84
zoxjF*=Hw;;!?a%bcJVG|FBP7@_uu_xpir_`+UDHcZX;}|^THjvjdPRUJ+HO3O$%_*
zsal`RIk@07Cuvh)iE1gNnn7n}$9q`Da-o@9CupmsX{@4y;aIQ1WV^7X(Rcx&McA%o
zqa*mh{MZ+m6i(RP#X)4DdX;+iKAzev_!HbYetk>dy5==T4rq*~g@XVY!9sYZjo#R7
zr{n)r5^S{9+$+8l7IVB*3_k5%-TBY@C%`P@&tZf>82sm#nfw7L%92>nN$663yW!yt
zhS>EfLcE_Z)gv-Y^<SaxB6gHmR|E)iyYeg|g|R}ujv8tMcq*gC>h1;xj(<<JyurkO
zku;yk5>4nD4GY{C-nWUgQc9cMmH{qpa!uEznrGF^?bbJHApScQ$j>$JZHAX80DdXu
z--AMgrA0$Otdd#N9#!cg2Z~N8&lj1d+wDh+^ZObWJ$J)_h(&2#msu>q0B$DEERy{1
zCJN{7M@%#E@8pda`@u!v@{gcT3bA*>g*xYLXlbb&o@1vX*x+l}Voys6o~^_7>#GB|
z*r!R%kA9k%J`?m>1tMHB9x$ZRe0$r~ui<kO`4q0h1q9yWTy1Vw;6%l{l&HBbZk8-0
z4ijBu+y@{d)|{@F;ZFKw{xPkg5F+CDU-3fF>}X}jOC)9LH=Po*2SLdtf3^4?VKn<h
zHzQbKiZ9a#y^bZOa6n&Wk$r`rPcR^1TWQZWl`R8PvM?r?^F}g*>u2ox&mV~0oDgi`
z;9d}P$g~9%ThTK8s}5o<m&w0gVXSc39p)SfaC_U5P2<JPm~s|o1ZFngBTt(DrBI%x
z4kDX}YqUJKdxxsso$;8{1MQ;f+HD&9TGSGCQS)Y9GN_l)t8XY5-si=Gs(k<5;!fvW
zxE8*OW}N`jlcqPjb~+szeAOl~e_-nyQAfun)m7Qku$%99s}G7SNoRK-D2Tt?3bf7l
z_f&iauzO~DnLmd4z7qW{*#v(VPN`62cvfV3MGioX->w2V4?(-lU*ed8ro|}mU}pk%
z;bqB0bx3AOk<0Joeh}Vl@_7Po&C`Cg>>gff>e<EyzTH_%h@VP9GTpHG^0d?A+RMpT
z+TYf8aiHmG?aSY>7fu41U3Ic{JQu1W%+!Gvz3GDO2ixKd;KF6UEw8F_cDAh08gB>@
zaRH2Q96sBJ>`4aXvrF0xPtI<C%^cGg^K!B-fX;2xnF2UCh5PH@z5cKKOHR==RLnzf
zSmET?(5QuFJxq~ag0rPdFM7)-DQc6Kkb_;fb-^S9@$f%6aPJ=U;g7Zr?Ox#q(-JyY
zKvu&Cw@3?z3?xc$8o*T2<9qK!(D=t1JD`+Ta(zAy-y-Frq_L?(ciWSU*N3cXEeC5N
zwIavKBghMD()mO&Qc6^H#jRYCBJ}jZ#?v?4($m6CK2G!{)QNVBe9)sd3#Jc(VH2H^
z=FWxE%(d%&VjzHKBh>WoA1pPsRQtU~xDtnEfTJnl{A9u5pR^K8=UdNq%T8F$)FbN>
zgK+_(BF#D>R>kK!M#OT~=@@}3yAYqm33?{Bv?2iBr|-aRK0@uapzuXI)wE0=R@m^7
zQ`wLBn(M*wg!mgmQT1d!@3<2z>~rmDW)KG0*B4>_R6LjiI0^9QT8gtDDT|Lclxppm
z+OeL6H3QpearJAB%1ellZ6d*)wBQ(hPbE=%?y6i^uf%`RXm*JW*WQ%>&J+=V(=qf{
zri~yItvTZbII+7S0>4Q0U9@>HnMP$X>8TqAfD(vAh};2P{QK)ik`a6$W$n<S7xQ?o
z_{n4xoeaH~jS^3HDy+veci7_+aLh^-n?E!YG6S#O$LPEC_>G<{bR2U<qLrkRpb!v0
z%U*eD$^H(<WG-@VF0k%r-g68(2_6$K`r1T6sUwW?8=<u8q_-5ITGbK36tV>fd!^iE
z#1K58$gW!xpeYHeehuhQCXZ9p%N8m<Fx1W4{1&odf~Dg9N*_P3FP{`cbE*_n{Eco>
zB+l~T_u-Ycr!U><XH<{<R0eR`Jn1$qaE<CV>!?xu!!*6rNxq37{`DhMMfY6NpD3Jw
zkYQDstvt30Hc_SaZuuMP2YrdW@HsPMbf^Y9lI<9$bnMil2X7`Ba-DGLbzgqP>mxwe
zf1&JkDH54D3nLar2KjJ3z`*R+rUABq4;>>4Kjc2i<Dy@)!kC&Aw;NA8e)mD}M7}y*
zi5fe;hrp`ef1|wy(>QEj7pVLcZYZ~pteAG4rm1{><Ecc%k1Tki@ADmF<}mEh$<1ax
zS8dQ&w8<!Cd38+}XJ1#f6|D`7AJ6+Fsr$rBs%wDxJx&tw*&5k&wN_-uj!ur;28wi0
zO+Qvl)mUZbXZm|~oa;LAHy_>PQy<rI@3u-En9*i_l~-?$0z#b@Vco$oFcZc}d3oKO
zD*z%H@Hm`{0l9tDx7KHebXBjGPA%mTPf<pnOy#m~KL9BjL-WcR=L#f{u~T2e78Ilg
z(JT)-B~I|YWyGa#aWq+mx~dt<5RI9)@9nr`in)T{m4a6g9DZqFJ{0ZDQ&w4XPvcfW
z)Zgnax(EnBgW0T@l}fNuwENi8sV_h5iwfdBoer10OP+L`!QRkj>=!QiV5G|tVk)53
zP?Azw+N)Yq3zZ`dW7Q9Bq@Y*jSK0<1f`HM;_>GH57pf_S%Ounz_yhTY8lplQSM`xx
zU{r-Deqs+*I~sLI$Oq`>i`J1kJ(+yNOYy$<j89}LeB{DsRRYsqux%gkK#X#@e^U8%
z#M!7}cTMHu<FLh@jarvDc8P_@QfzNdoQi_n+%?2AM>_>R3Jfi680<|^u#J@aY%Q>O
zqfI~sCbk#3--^zMkV&Yj0D(R^rK}+_npgPr_4^kYuG=pO%$C_7v{s@<a9Q#wuB)t?
z#;9BrH!k(Q*;IUj?T<*@HX2{0em!6debb4D8+OTu+|0s%`KdJcokszE{b|_{ztw|2
zP8WR(1+AaeXov%C!=7CsT*LuDx^}pAS;||)2N$TDO}r&-q#K7;nWjNxk~onpjleeK
zUPThfcj0^+;uf%68trL0i1;=y3B3G^4+!l>-{M-P@RL3^<`kO@b=YdKMuccfO1ZW#
zeRYE%D~CMAgPlo?T!O6?b|pOZv{iMWb;sN=jF%=?$Iz_5zH?K;aFGU^8l7u%zHgiy
z%)~y|k;Es-7YX69AMj^epGX#&^c@pp+lc}kKc`5CjPN4Z$$e58$Yn*J?81%`0~A)D
zPg-db*pj-t4-G9>ImW4IMi*v#9z^9V<wSEy0;H<_ip{R`3n$&`z?qY&+x1%E`|f!X
zF^6qcbMj~^Y|&mU__An*YVWv%D)nfhgB<CJl`_02TU%zkuVLq-ifv^5t4@48WjUK6
z<1pI%d1Hq!eHx}*)cFId$Vc5Z{|e7mEOmtuWJf&C8D27?iS2&%o3DCSW(Dy{q!vBU
z<@J%bdvlGuCbxSa3MmV6=PD4kiAVQdnmr=bOicK#q7Xa-!xi^j8Y6rBUZPWqHJ^kK
zO^AmTc89bc5I+T$XZ64^_c1Pnu-4Kq8TW>D9h@9t;3jMAUVxt=oor+16yHf{lT|G4
zya6{4#BxFw!!~UTRwXXawKU4iz$$GMY6=Z8VM{2@0{=5A0+A#p6$aT3ubRyWMWPq9
zCEH5(Il0v4e4=Yxg(tDglfYAy!UpC>&^4=x7#6_S&Ktds)a8^`^tp6RnRd{KImB^o
z2n=t#>iKx<*evmvoE{+fH#@WXGWs$)Uxr<sPjul^54Bff9y%ZVHz+5}qAbDf+|fnm
zNd{_kS$6bt11Qz5?-m)?lU>tf?r>AaxV0?kf0o@oDboJ6z0cgP@A$;k>SK1UqC?Q_
zk_I?j74;}uNXhOf_5ZxQSgB4otDEb9JJrX1kq`-o%T>g%M5~xXf!2_4P~K64tKgXq
z&KHZ0@!cPvUJG<f9>4kw-0;tPo$zJrU-Nop>Uo65Pm|yaNvKjhi7V1g98;^N1~V3%
zTR>yWa+X2FJ_wpPwz3i^6AGwOa_VMS-&`*KoKgF2&oR10Jn6{!pvVG@n=Jk@vjNuY
zL~P7aDGhg~O9G^!bHi$8?G9v9Gp0cmekYkK;(q=47;~gI>h-kx-c<vM%*#w&fX{!h
zF%L>eM{ml$#8KI$4ltyja<rI2qq{$AR1|U_tFD)9Y-d_jShjldAw-)(k${x89fc)V
z^uj$O=9MXT2cL+;^v%uZ%TIiT&+A8q@<LEWivxLuc7cEhkMJup7#M4iRHWn;gs)|%
z*`|SUEl(kbPZ=F^TZ)n%ySX6erWcgVc`2wiVw2VTP%;PP;UMWPi0k}AaIl!DD+>qP
zki^cyDERloAb)dcDBU4na9C(pfD{P@eBGA}0|Rb)p{ISqi60=^FUEdF!ok{Gs;vb)
zfj9(#1QA64w*ud^Y<WE?99td@r;1MVEDo>sN5&PeiI>c`VioE8h)e}W%S9NMA55Gs
zrWL6l+@3CKd@8(UQLTwe12SGWMqRn+j)QZRj*g)Xua)%ayzpqs{pD(WWESJYL3{M$
z%qkpM`jFoqLYVv6{IbCkL?fEiJj$VG=$taup&RL9e{s(Sgse2xVJlw0h74EXJKt<N
zv_^nt|CWo1^pEn7x}Dzrxu#9#iylF>2<mjN(C1_G037wJ*c!9$6Ya%e(y$WXL!EqA
z8HVt{2cY#I$^(s5lIv2_V)0(hY4lKgWN5U}$n%K8Jg_QsDR2~!MLCfAxETJK@puD+
zRpJ+#PBP2wu|C*%vKJ>eX|dx<CQ&quy2)IJEnV9z;^O>z{->0)3W`JN7Bv!rLvRZc
z0tAOZ2yVe4g9iq826qXAg`f!*+}(o1;1FDb>kKexumFS40KvK0yH1_@Z=LgWZ+}(Y
zwYsa;OLz6tTA%gS=>8$=Z7pLh>|K2QElL)E=Q*(n*H`8R`8={-@4mTD-SWBOYRxV?
zmF(-rJB8^Wlp?319rTrh^?QEP?|Msxrv?WbJ-+id+V#F2Y4(JPJ6U9bv+U1cIIH^W
z)lg$_=g^Ma>2~Pyd_YOAv29Cb-U6DJO?NxnW7~QP*SmYi*vdUVuW#LWQ_u0`hymZi
zaQS3Nb^4`ro$>0G%zbXmr5|D|iq0R<;S@?kr0j5Ruq87-Z1>crx%EzVZ9#U;{?}ti
zW2W%*9MQg3Nbh%Ti6LhDd|-aFSgXoPG`mHlUU1iCHr>ru>DX?W_#13(`u*!Plu2OP
z6jk=2>BC0l)aw<WV`x+C!_sw{a5i*Q67F^#P-aA<I@z6VbJW-5&rwZfvvRk3_cA8b
z-o}<6m7#V@uDa<CVdlJ4d|5@tUf!yN<DjY-Ylj}w8VTHcITO{giPiM2=!{`C)-kgy
z4M#`;s$Hx(F&Ry_6@hE&#+WZxZsYohII;=<B$l#U>;HCmxoYD1i4b%m$1`DYC_^L~
zIEAnFcHvad=-aO3(_MI=9#`z6-9*_!&$?<%meb5;jG<wc(D1r`!k7AFaq^l6-TVCr
zn@T;NWtk;qx(I~IDg2;{VNza#Y9hnvC&&D^iJtYTc_&lLexMB!uC87mR>d5Qp=MGf
z6BD{%`L#TAOq%z%@*ib95Ey7NbUF=BlszVk3Iu3imD&*91N-ij%hW?W@~2TtdHTfP
z#n0@Xd7X8Dyu36n{k#PwQ~T~X7mAO^cNV+z<<Rr{6qP*fL{*O`It}aSc#<7ICz`zH
zfdvuUP1@TR@FL!bPH1@um7aB~aO<rmJ%*b)*b*mqm<2+)la8vi-b#-P?L4aM?FRQw
z!SL2{$6_lC;MwX~JFGU~u@(2B?<Z2dhI@qhN$Or_U*}$DGND-zz*x~AawYee{HE;I
zGAb(xm0Nq$##BQLFEgd@aqT*NJhB}}du8b8cj%ob49sgx?Oi-i5sJpioR>HO@3X-#
z_@rAn$k~(l@kciCC;&Qd*fWRI>=;fL{UPlciNDWyj$bX<#r^(r;EE8wwUVQm&7~QY
zCXRj!**r^xybAEPq>h3W$uvI1j=yNIyzkE_D7fpGw)OV{U*Uwm{xB;mEg2(|y|ICd
zMdQVqzMb-=XM6|E-a9kNh)^9lY`-DjhhHD1w5lufRcy+QLgJ47!fFn<KQi>e86#F;
zX{ufroVBEZJOY?rDo!;Te6aOZ^1SO!dYRxQ*2njyA~dCWawn)>!*k7~>8Ikt<J9hI
zLTxVl%^kbxFjaJKz4UwX+jy29ohPH6;RO0%T`A|oSHWhqWuNJ8tYd1Xp}S%w!~<wT
zHSeF;1&d?WDhsdZgTM&TfZ@=Pp`{?gU%*=Eo2o<UfasbP*Vgmv1Y;j}@b2Fxb@=4D
zWq$ckb3BOYn%N0MW}!64?YGvuPD`}=WgRB1BPo(kSV>&e*0>>V5ZbO|*1+2LFOqVe
zXHb!aMk03^h%&9L8GMy7UDI2Kev>V@(R}*Iu6x+!Hn4~D@wj`P%#Hdbf(lK{+DD7f
zJ&(v*mhn_e(R$^5L#bM^^Q@-!*b!l|+Xrb(q*MRFJYnrE7*xko!SJOy9LngR2|q5k
zY`Ioiu+YBfzF{Labszk-E#*BYQk>$()=xWEGZRKwY)*UxP}0dGuPLZOk<u~1pRF`m
zxYnI*6_BmyuVfiETJ#r=!}C__TJ(hS&_}hqJq6T(xXbQJ?{M?GH1d;1)n-8$1pDWw
zJw5OAAMQDHK*ksFYeeo`fz$TbpGy<)Wsk%<#FfYFVTT9*sy=H-wkS^x;7&PL{erf!
zzf{M*8sv9&hkoBZuv}-Nb}O!f7}9<9ZL1vRNUZ5T^4kV6WRoRqMQo_+AH>NJDI9Hy
zFjfwiK6RjhH#rHW#B0(MW}i%V`943<6@Z*Nd^JEP5uZonXm=u%AM>{H^U@&Jy*i0s
za_Da^xI6pMtXzHc{e~_ZcnKP*;=YL2Z^RmzDl{dJTk7*}E_h*NvgnhnxVKB59Duh~
zqouS_WoOR*{UvUw_K#OWz;gMracr%8>QQ&V*jv!8)ho;U8}9~8EU{N<=Z_gR%IpMT
zbkePUG_a<Uo93~%MM1nso9|UdE|j>fm=#|iIfFmdqkpLMGxY5D$`?I}&T7>TexU@v
zkBx09kG)O;09ckj#(_Uov6vv{{HOcr-%H#DUQ@*GzF8Zh{iSM13%fuB%>wjdU@3Nf
zlnYE!GTyNrqes|;nLFXfWU*Wg-9wmr=NBd$nCk+H?iwNvcd0Wab^3CT9a`>3V~oWI
z9=<ivyrYLX+hLVmYbCVC7nx>_H+N-Q=M<NIna#%7G#cG5P!5#|H6`sbgz{jBdvfcF
z%F@i>Q(io4u4mpdQ;k&5FXnKV5M7R`@WJ9h(GrAirO#XXOU{qQpk^B^Vd=Dt{wiqT
zg-#j9J~@o%H2;W9mg)o6@*Vo;BSs2*4HAHpDk02mndAsov08R_48zJZ@J)s7+hyCo
zy*0L#y)?AqZt-wX%+_Vx`8*A95OLHvs1$k~{h-_N<KA7r(+uvizi3XCB3#4TpjNrJ
zvai45nQG0Co%wk~tYgN!u~~y2n6k!jjXBHc$+Gq4hqTzEj>_vov_gHJE=`X>L?5K+
zD?u59=mjtImMvd1GsDytuYp{Iy<NXRrLZ4s+5CA`p}CBZMPL-T31R=B$JFH(h7Qq$
zc5;cO7Li&TJM=S4-dTKdpeXu!TD{GoUj}7yzx4mPG(VBO;Kq@rcXv?}P$X>UkW&?h
zF>$#`n$~bZ)KN0B$<p$VcVWI@lvp&2*7))!ZYjjYh^fBV(ceia`pW>XGeMYh&`;g8
zo_2-koaO6+8O!+L>SpIQbG(i;QW9UJi{Ecewlo?s&D!^>i$|#jaW}#HJuxt|W48=?
zb^Y&O$a1s5ddr8DIt!sD!t=y1g(d4GR(s;s-HfV$GXl&m;+sAAxB^rk(3_NjE$p#L
z*t4em?tA0d+XwRxN^OQwzbDZMuSE0J1)Ky{mq)^t4bnSl*)s>zNM@mMdtd78&ebHN
z`!(|lE5q-p+TsRaNnMXwALaN5QIZ2IUi^Z22tsN5>nvIO+YU}Q*xh6}ee6@rR~<&1
z(PB4z>9ZBUMXZwSMmd9-aKKsmJeJq^G|#JclOh*xf0?^e0(`40nsg1z)(48;4}B_(
zGwPI)yo|{oX{dVDL-5-aMGr;~vU1cPtJP5JM(sswz&Q`e<@0?y{YhsO9YK8EYJA;L
z>7oG_Mts+(wCBC*Md82#XdKw&J*IizR?9k^rf1r{Ot-&>V^ke{9nI9zavlcNkIJtN
z7T>?o|4rENk-?|lewZ(EfdR;%BUrzKJ^UkCpsM)EA9QHBVV8trT&*O(9?FO{MLTFL
z=5P0H+T6C^jAuX0k4U;~GM!x`!X2N~3_n?qXY$HI>x@(DHEy&Q3ucT1R6fj28wX!I
zC=&d$@bJ_v^%?W2Ngl}e8ww`b%BrN-PzGH;$@B2Ky1?%GMkm#~Okj(-Admyy;qya|
zOi7<TIqKLJIjsT6%xMurCppK$`tFA>3kr_pwt?5Nj<kh;AkqM0FqJNvpLG2%nBiEz
zf%ifK$Kw|EzR5(&`uXcro~^V8i}*)jhx5-t$rA$`c)ZqIf9DQr!qkCRbJWjUI$JZJ
zm$fJ9L9f6?UO=_r2e^Rac$+nqbYU6z^YgMBa7iN^LoJ4qw_S?6p!J<$X}7t17(?2t
zcE?oZJ$Jvt+q&PyLJYNC4pJ6B2Qde+jOF0Lu$QB|%Hl8GeqMD>3p=&H>81!w#>Agj
z(QXx{j0r=pTl>micAI_5vUw<3`Sht?Z}-j2Wx~<RLz32QGv22&J{94fr~V)YDG95g
zjef+~vo?CO%A&z(jqgjVppWOfXF_a0rF&LK$Mau_gV9Ob!+u&!{<c^Y1J5Po?`a)A
zQzS-wDNMkxF(uva11Qd*)ipedF7L8cQx?g7Pl*j{fhk~H=G{iXJB{lDwggu}3W3aA
zqf(*0b}y=rmt<QkiQ35c+=PEj9}{Iru7J~e%e$QIlUdUy@-hWEOf@ncen^;YeTZ*X
zH+U;(?Wy8Xl+h@nkoL^sjJj(5zUISeV;JWYIiaB7RDchD*VdjmbXj9)pN{CA%vsJg
zciJ6y-i)!8uXW&CN8ViTMaOYPM$w1*SL53`0@H8hO>F8DKCUQrsXl2?W8hur42(F_
zsSJ)_36&x6A|YkY6c<2a94SXbv~d>4CC4nkDPvf9Z5Fys^6^5r0j5=E>Cgy_Dk@tS
z%?c}9!qB?t6t8(XMH%le8UeNWp@Nsma~Ql+^3Bo%_npMryeQJz4V=BAqE~T?dejng
z3ge<X@Z7g2fW4F?C!aagtvam=!RFFVpJA`q1dy-E%du?YwT%+fTkMY4<03TZ)j<Oe
zuSu|TMbn$JCNKw9K<+@tJ({pU#md3G(`)NO28!Z^`B|&xuS!YWO}}^8(&l&<H`8f(
zO-EXMeXU|crFs+^NzF_IZ*xCTMAZi{Y<c;sK84v<>{fjCHoNAfYBvsfq;G%VL|j7t
z`X0sy1EEgpyD;)tS1x+fnv-?C@glP0{RCW}Ma?3qpoq_&IJAYOy3G#s`rsh5=3>`K
zkj``<PxYPrnJ%66XZ%$jT_UO;S&LzWfo&581S_54ry#ectge+aWQh>=;|*x5HSjZC
zXNvPLh372q;=+6ja|SC!R-`JcL}}wwskajjTUGTpL(1zkN-p?BA2lmf<wk(A{@fWd
zR@`1h3RtSO<YT(S4xL@1hiEAxTBBzva~C*l--DU9m2vX&A2fTNg49@_4&`2Bzy8!U
z)6qtF$FpZMEKdNYC;O-#lGOq92InNM@``qD2YvzcS>+J3WsB7!k`0Brx8^cLTF9<g
z@nKD{&MQpkhV&mNuFe;7?=GL>h)r+LZ$vsZo}`OpOs)?c6$hclR!R#MAeh|_DY|9r
zy+_3c%IO9h9X?ksp?an&>Lw;QeQ`T-Ku6HaK~H?E9-Z5$cZu{YU;1+-6B$|JD;%!^
zt(4l>F8}a-UkC4YtOxFHckhl4VK<o_&-lD0mk1#hZYAraLBA)XZd9SwQ&Pgn$a!)D
z;&eLCGu8&`Ky;&{YdGM4YZMiZi$_@v^1aVdy+K+*Qo!QYDDtW4@Os*LbJ00k{m)5`
zoRKnSu)novfL2Ts{!-4+5Y{b=o+LpM;89G7S{vXl;M_l=ND-Rc5qgt=ci7TpEo=mH
zL6*Xt9up_3hU63OR>r6P$P_O*U!)IDory%}Wz`YeFx6TO{y2Y${SBm?H9cTWV=WWJ
z`_*CGso!ZN>l@~_jkeXtV}<eU5O#LliK7g)klc(Z=e{4*h!dp)V6v<*N!NnT1w~8K
za~UIar=<m6R+`}h>fczfA{TUkyeD>)i3|NFGcCsBmK3HXp&ol_@GVs7PIpfULy!hi
zs+%KYgS%(n7_z_}6<X(k(VFudPeVYWZh9|epL*7btD&ckkCMALmGw(owKL=w(~r63
zOyHtRRzRvkW>)hblk~W#LZ@&2)fwm6xkFP%&Ju|MFWbNiTwy{{g-pV1RK`L&=RE2D
z4|g;~vd<LODHcrO&uLo^tGtrbwh8*iCTXkJcd4-eXXU0I?k1m)6`j}QSOp%!d{k#o
zIrMoZ12w1s%;qprCkWS}WH>8x<?cZds#+JB{z{||9jq*<HT!M-cBcH=;7~J2uQ_26
zvZro;_+w%PUpNkSI<TD8&2%vNAnp4avGA`e@UKhI+!{F{Jx<Cv<%&v?&9%YQ4BL2T
zaOOpQFMay>d|teYS%w!IlT4W$&FTrk-hcTADX!P?*f1YWEIRwq$Ys%^(Z9w&HT$>}
zsMD#6Df=uJrX!JHP7<>Or;e_Cf=}`!`qR=i8fBj)$6Lxx{HRzd8Tnzd0p>kSps{OG
zKJkml>bUj8$u|F=``l(-aMxWBC@CGZ#FXClQZ<4|&%jN}Tkg#q8z)=>Ly{$i0`rjU
zv<vjl^OND_&nt8%K_DY<c$hBE?ht3o;zMF?PraCx<3H?R+3c+lcVP-`!*=iR^+4=@
zjAXY+K30oPt-hFFYy6`C$csm;r=3u|c~FmFo6B7|^>t|QddO&i=91e?h3>s~i;+6{
z8X4i6a1wDLrSuE#W(zhan+U*Zq+8p3a))JFVF4ffaV51K^YgTs<ELvmzH15OGhhY8
zrA_+PnYK;aeddV!Pi3^WYTGZ2*J)4~@C%)8#kRVzSG2!MszRFau_EOo^?}G1$p^yr
zk#PoR%ZY0-+cfohw#0i(2hnkZfA7b9`g0$EfREag|7IgZEqyUPIUSL{ls?ZdY2jlv
zX?1Mzw~@8iav*U46179*NN~X0%-qa(h<B)RSSGS9k|=WNp6TA~=CbwUXG!l)zfkxA
zNej9!)gKN9qFfwPo;8s*!hnDPngF9Kp{ukrX|iXeI3(#zb*h?bb?@D>o~3;Y*NmM;
zx8T?y-N0uyWY(8=me-HUC9xtABvX5~%yg+Cp&XF$Bq=OcK6T*D7eZ2EmIoCFWm{$S
z1PNw8HDpe5hHeCusN8kdeb&f2#=3M^A~7YwJ7FRrhq*)PG9x?JIAaC<n&nyz&js(6
zJeGWn+?QRH9iX#RFkV(w>{MV}5}<q?f|v9)L^XT#O^Q+lTLo@~KU5xyfaaECe?QTB
zEU+ll%CA@S4EasNBgDg3P3g>g#7R$-Ly%)4=IUkRCGOR|XTMjn&okRmFjaO^YF5^*
z@)#MCBOBezD)*xQNxydlUyN?dW{fS(s-T`gv*0BEnk}<MqB*2*JFz@&Ut*5R*2h-J
z)_1&Q{C@mZhFSfyIyZ=2gNVh5&AtuX!f!}*i1VjIDopYKYu?w1#R<cS5`I@F1PQbP
z*(_N34x08$O$DXg^I;Q5K8>`BdmrbmPO8q8y(X$AA}*RH%I7Av!~84pudHb&%Q5-j
zt?=6x(iR?<^_7X0v6Ys#VAL}dKk^hcjI=|EY;kPcZ_w<*H`_*|N7SacaM1ERD@6ab
zg`!iTm7$URV+lpW_{V$ruR&A>jrX68k4x2wo$45}&wf7o<|o(@B!u-L@bKyQBAGwy
z4#}UrRAu>^>Vb6k2-th^>WjvP;Nl|i3WrjWv3ISkj{m{eAcQIW^_ndxSX@|8T(ASJ
z?_<Q%GX;J*nopDj?vlGTW3<2Bi-14h9Ft?$MJo-;vYeHFBv>$fcP2u*6uOBk-{d>^
z0vWlfGQMvysI%R=iE|A+!!Nw?C917EU*_$`;;)px?s83CRd3i_jBN)k#nR5t$dJ(+
z_sP;wG@Ad)^(3LRj7q}0b2O(b`|i0~5SYb%Sjk^*5ISZ-Ab+}DGu$-X1n^TF1Ndw_
zF|e*1)cI2%`TR&AW~XpqpFb!=3cHbS>np9hYD_Mr5}y5Y<hjKC>`SY^r7isA2Q4(z
zazRQEqWDKT2zIEbjSYdCPi1ZOGz80Nsl}gxO^<!<`)h}k*WrLKhVC9A^uqPrAX2rJ
zk_X_<UKVZj#SZ`e5i&Jvd|AuDABtCTp9RP@piFO@ZU#$^j4fEyi5WR4tQO|sRzdLJ
z86FxwO1hlidA6EQ5OI;XPTXTa$K&JwxgTfPhh!ZPwc^HMC{@|JRTI?xh^Ptzlf~Qj
z4+amGs<?A`M~9~Ge+{a1r{l~f$XZHt1Ik1~ki({=W}#a+O?yAslpyDBa!(JThcKg+
z`7_G`o=!47FD0IvP768*p<&Vtm`CtC?;Dj`fo;v%1qH|i1@RjM=o$pEJq4&d1&L7t
zjHm`Qe8@BW2ApUJb#%iMo6qv$oT6Alh&RB*5@4ncFm(r*OBC@so8*msJq8zql&b-+
z5<*+q@YE4P>DWMY0AV<2K&OL{&^6#@L1?lXu#6xSMh%3^5c*}oM6DQGY#(a^@z<&D
zF(43I9e&5`h|A$5!+UFuOH0>F3$shBV4`0#M4RSB8=6F0ZgIbq<2LQ$Hh^(kAJu=!
zt8ZGXTacD{(3W{V1$j_{Jc)Ka7<N6;sXR!iJaN-JXwp2f^gSr_JqZ^)=odUOg+0iG
zJ@H#S=vq9neLbjrJ&FH#F#bWI5hI@wqj2Jp)bXe%8c1>t6u}ho`4kF+4@t_0!mCBn
z)}o%eA}L)_L?=jw6BIfll7tb3n}?*yLt&XADa=rW>qz=_6s9ziOd5sXjil>FVFx3r
zf>Feewk0v#W9>Gp4GacTRr>Sd2T6dWi-{YX`v!D)kCWzG5xQB=?es5ON(%nkwUhNl
zV>@xkWWWv*N+{e$(SrExvN6BXzU(Hxlx27{VYHf+LpIbTO+Yu(ltMk<<mdQtfilQ%
z#zERxP>;)3A(LU@ytVYFkYvTa79idMtUFhfxx?P!)2F`prNWW#Fub#l>N2s@nh&n_
zA4{#}|AIs9|A4P0ZF%fy=hDN!t#ifH<)4u2kirK~JUpjQ-J+~cXOZI&dI<edX<Pe$
z<5K%Sv8eq|W{$&;<^B}h+C6HiudVR>ts;P}UeXslP6zKvpEKSN-$y>kJ^nw2tC9bv
zo(|lT@?vZ!{_l|d^8Yh)eEBh*5ABh<!=o}_%`M5uz0&2FvS#W)djCI>+Lzjw+?V)o
z#P<J#52aEke-8d*<DbLpV99;)|DC457DTn))TG@GiB9R>-W7361>E(Y4;@`sv;VKn
G`u_lkUM?>H

literal 0
HcmV?d00001

diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.woff2 b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..64539b54c3751a6d9adb44c8e3a45ba5a73b77f0
GIT binary patch
literal 18028
zcmV(~K+nH-Pew8T0RR9107h&84*&oF0I^&E07eM_0Rl|`00000000000000000000
z0000#Mn+Uk92y`7U;vDA2m}!b3WBL5f#qcZHUcCAhI9*rFaQJ~1&1OBl~F%;WnyLq
z8)b|&?3j;$^FW}&KmNW53flIFARDZ7_Wz%hpoWaWlgHTHEHf()GI0&dMi#DFPaEt6
zCO)z0v0~C~q&0zBj^;=tv8q{$8JxX)>_`b}WQGgXi46R*CHJ}6r+;}OrvwA{_SY+o
zK)H-vy{l!P`+NG*`*x6^PGgHH4!dsolgU4RKj@I8Xz~F6o?quCX&=VQ$Q{w01;M0?
zKe|5r<z7o5`*yS~8)MszG41q#5{WWPpy7G9^(-fD<g4HS2Pp6}MR#f7LIoFspeCvR
z3+c{Ov}|bDFijfL*xJ&DWaU}da`Er7tg~)(Y2IDkd3AD?w7jnSneG!-SaWI)p`xDU
zXH9Mys?(WBfmfBO!_){Max(NjX;ffVH@MAGD6y!?&l=$WE1+*S^Cx4)$U?A><_7CD
z=eO3*x!r$<gNx(8nyyp{U13{MWIQu>aX2iFh3;}xNfx0v;SwB<Fg``NKlv&}sOOia
zl_SskHz$qk-Tj7B2@DHwWBbat?O%&GCL=1*D=EFRpwKHcVF9o~HnwAo=XtT&qlRWE
zVi`v1=H&nBv?M!wAX!1fF?LWbbVvCAjN!ns70n|1u$9{ZL&9b)AXkF-t^%6Wna*`f
z*04(m<0Gx@4&<!XDochu+x!F|DAC{R)c4o_TK-_!s|@9}TbCv3Sp`&zta~M|$%-V1
ztq`DddvEXU8JrjLh=Ul_yYF^%B5>fGG+@Z;->Hhvq<wD;VB@ph6#6G_6lL5#3gkx~
zHFE%Z^IuN$3X)Ju)24Q9Ro)B9zI%GT-16@8|DPH7fB1}tA~RrY4U!xKmRBRxkiA|Q
zKr4+b2V=R(Yj3HIK~EcS6>fF4r__4$mU>Dl_1w;-9`~5rF~@!3;r~xP-hZvOfOx)A
z#>8O3N{L{naf215f>m=bzbp7_(ssu&cx)Qo-{)!)Yz3A@Z0uZaM2yJ8#<s6khOy@V
z&}wI!ds<}Wi3oZ(j|&tv|KA}5cx}QpZ^By#9KFAF@B1dVuQA$!NDxA6LE`KPadPU;
zQjo+AqqndYk0@McX!H;i$Tx}X(u#SHJ%&iNTJu#<Xz9=-I1o~2(*?vBfO^7b&8^8!
zI*Z@{F?FmY+=Z{Cp`Jcc{axky6qgRBtRkQEW;eW-3-wE{UVkT;s_VTolPg6pyu@CK
zSyeS%s7^u`F5b$ErP4Ux#VgLuk2sI{EPRQ3O?-?&iV@{?VSLbGh?0Noj@91Fh1H!U
z01AI>OGlzm?JO5gbrj~@)NB4@?>KE(K-$w}{};@dKY#K3+Vi64S<@!Z{(I{7l=!p9
z&kjG^P~0f46i13(w!hED<gesU<d5XH<k#ev<OXsrxsqH=M#%^{mn<fylX>Jga;*Eb
z`!n|++@H8VaKG<9>VDh(y89J#=;Z$ei=GnD5TesW#|Wf)^D+9NKN4J3H5PF_t=V+Z
zdeo8*h9+8&Zfc?>>1|E4B7MAx)^uy$L>szyXre7W|81fjy+RZ1>Gd}@@${~PCOXo)
z$#HZd3)V3@lNGG%(3PyIbvyJTOJAWcN@Uh!FqUkx^&BuAvc)G}0~SKI`8ZZXw$*xP
zum-ZdtPciTAUn$XWb6vrS=JX~f5?M%9S(=QsdYP?K%Odn0S0-Ad<-tBtS3W06I^FK
z8}d2eR_n!(uK~APZ-#tl@SycxkRJ@5wmypdWV{MFt<T5%<QMMP#rTv8Dn)!jr4End
z8!An$TjN_QZBN_|-%;s$96wO$ZrvL{QYl%F!EaP1Th9SiDvOmh5WrK}3{64{{_F&y
zrSMy`6AG<_-)~t&XssC4d+gCHeK9;{jV1y%Xrvg1Cy#-D2g;>YBUY#g-Vv?5AEBj1
z`$T^tRKca*sn7<ZK}0!&|7AkCI;jT+6~rYE0#BU5AkxqT6Y+wF*hUg{if$klH$Np(
z14lF>gt%s@XUD-t>bij-4q-ilku9^;QJ3Mpc`HJ_EX4TGGQ-Og)`c~qm51<|gp7D@
zp#>Grssv^#A)&M8>ulnDM_5t#Al`#jaFpZ<#YJ@>!a$w@kEZ1<@PGs#L~kxOSz7jj
zEhb?;W)eS}0IQQuk4~JT30>4rFJ3!b+77}>$_>v#2FFEnN^%(ls*o80pv0Q>#t#%H
z@`Yy-FXQ9ULKh{Up&oA_A4B!(x^9&>i`+T|eD!&QOLVd(_avv-bFX~4^><K+`NUjl
zUA`n*5<n{f%?!4-)qpuLcwM`4xUD6=$ki+M2U1n6MQw*G7TmC^qdRw?b*#WSFG;)w
z)HldC)uy>o{%mzzrg_i~SBnr%DeE|i+^}|8?kaV(Z32{`vA^l!sp15>Z72z52FgXf
z^8ZITvJ9eXBT1~iQjW|Q`Fac^ak$^N-vI^*geh5|*CdMz;n16gV_zk|Z7q8tFfCvU
zJK^Pptnn0Rc~<r0!CgppAqmePbR1#5Tubl85FQ4lTg)+g8UrHdY9Ka1?3OcBFeRlE
zzYpoom?Fp2nZ{a4hDYQEn^Tkbje;(-5yZ};a0h|L)2vg*F=grd*^|WBo1OU#S-~Fv
zcDpzl2xPHbu|lC2Y@t*8{!%Fh(i78$=lQReu7C@B0!fO~hV;@Uos_RW`!LXs+NQHy
z@F$dGXT35dG@wzAM4<{W&5|=hvLeY%j@6DPfZK{_NfpP!+NaV|XArkdMWmsrp|+Y0
zNxjY}2dUoGHC2{GT?~El9hnDW?KmWthwM10KJ(#NAOW%mXq6&t9<|PZ;%Xe7E+vTD
zfEY+f$1Mv<nx@^jBQcU4Ljg4P-dWxOH-zo(t`hB8-Ik$N3~vY;K2XYCp*Fv_2blJm
zPc;8GW*QB>egGIAK}uv<M%BWA$}X1PZ}r3ec_|6TIBdoXwlXq~Ws001rqVG;8=+eP
zbcwJ)A;^UcGF*T_xCk`{#MzU|C0f_+{M&2Zk_ZN2^_{NVK>99VZm2WLPezQQ5K<`f
zg{8Ll|GioPYfNheMj-7-S87=w4N0WxHP`1V6Y)0M&SkYzVrwp>yfsEF7wj&T0!}dB
z)R~gGfP9pOR;GY_e0~K^^oJ-3AT+m~?Al!{>>5gNe17?OWz)$)sMH*xuQiB>FT2{i
zQ>6U_<n)x#cJkNUc|V)^vL|15d~)i9%UIk7`0hyQQOX6dwG{=#lR`i}3*A_(-}<aV
z6Bs$mG_#ni!&Ir*LWx4DW1y|U7^_H;P@~Q(g7S%hUz3y7SxDI<tR$+-%3z@EM);%g
zLObKN!YkVml!Zc2Qm{14ydZQ0tvYlF^&(mmMY>8}Ay~r4li;jzG+$&?S12{)+<*k9
z<^SX#xY|jvlvTxt(m~C7{y<eW|86c<M_B#9!3F3@>{3g>7TX#o2q$xQO|fc<%8r<e
zu{@uYv6wTaDS(!pU?WCA5)2p&Mj+Ip;0XTMc8zb%VkCGB2k$Gg;JkJFCbWHte9BlD
zCR^F6kT^z*ExAP|FFuMd7tu$>E@A3=UW(o?gVg?gDV!0q6O!{MlX$6-Bu_m&0ms66
znWS&zr{O_4O&{2uCLQvA?xC5vGZ}KV1v6)#oTewgIMSnBur0PtM0&{R5t#UEy3I9)
z`LVP?3f;o}sz*7g<a{wL*dZXtI5+zcTbzINq%3Vx?sa^oH8-vb96eb6k)$k`VM?dj
z8y1_mUUalhn>5qdTxJl^gk3>;8%SOPH@B)rmFOJ)m6?PlYa$y=RX%;}KId{m<ya`&
zf~xC+0#uqMzpD#MstCV?tz>9R#2=LNwosF@OTivgMqxpRGe}5=LtAn?VVl6VWCFLD
z7l#^^H8jY~42hR)OoVF#YDW(md!g(&pJ;yMj|UBAQa}UH?ED@%ci=*(q~Opn>kE2Q
z_4Kgf|0kEA6ary41A;)^Ku(*nirvP!Y>{FZYBLXLP6QL~vRL+uMlZ?jWukMV*(dsn
zL~~KA@jU)(UeoOz^4Gkw{fJsYQ%|UA7i79qO5=DOPBcWlv%pK!A+)*F`3WJ}t9FU3
zXhC4xMV7Z%5RjDs0=&vC4WdvD?Zi5tg4@xg8-GLUI>N$N&3aS4bHrp%3_1u9wqL)i
z)XQLsI&{Hd&bQE!3m&D0vd!4D`l1$rt_{3NS?~lj#|$GN5RmvP(j3hzJOk=+0B*2v
z)Bw133RMUM%wu<VkMnpWWVN&K8^*s5oqf-N`_{oZG|c^)?fe5daI7j+I{GC?6;bAe
zUSXe$6^9Vy1KrCfsOM#a9`s`Ns00)gifk>_+$vbzOy?yk#kvR?xGsg-ipX4wKyXqd
zROKp5))>tNy$HByaEHK%$mqd>-{Yoj`oSBK;w>+eZ&TVcj^DyXjo{DDbZ>vS2cCWB
z(6&~GZ}kUdN(*2-nI!hvbnVy@z2E#F394OZD&Jb04}`Tgaj?MoY?1`{ejE2iud51%
zQ~J0sijw(hqr_Ckbj@pm$FAVASKY(D4BS0GYPkSMqSDONRaFH+O2+jL{hI<DV209S
z)XR~VgGa)M^-;}1&#S3{@xzwR6~@}^V}twZy;sZcsTJr0S5s{W-N3D9v%1<w%kip_
zCaGQ)_4?SD)S-wrJ3}!#J==&-iR8Kz)nLlnoRC&l|C1fmMV-bqBD82vt61QE6dSAF
z*iJKFHPeAzx_T}Ct>ltJSJT~e)TNDr(}=Xt7|UhcU9eoXl&QZRR<9WomW%&m)FT~j
zTgGd3-j}Uk%CRD;$@X)NNV9+RJbifYu>yr{Fk<C+0Z7wvVjq!VGjwL>O;p>_&njI>
zyBHh_72bW<C>;8}oGeY0gpHOxiV597j7mY<#?WMmkf5x~Kf<RrP*$<_TMcAZ<977s
zG-{sG-<y$aNL=Fg)E11z=zEyh@&Zlt<-N$5T)Lf&<pEj#+<|}`9f4puO~YVB6Jm!v
z!37dKVIz9-hLJpqcp?V#EU09HXG3YfV3A{zn-)630R_n7NwnfVYInEHeM$w$$$F=a
zUOHAT9sN4j{@RNZd%w-R1}Mm~Ligs&9Lc5wlF9RUjyxD1L}DW%Q=_4K^pa5dNOiqV
zfiDy5dvZ1fJ9kyK6XwwJ5_8s27to%QJf!DXz~EWpbJWE5-c5LQu!j^}nqmNv+H<%h
z5ssJ<c#g^_qKPkFd;?x87%*ynZQ!gsBex|=gx*awoyTyPQBBvZ@H#pgVq8NqXJ!Gg
zuwA`+(oi^5nIKiFlTl*U=ybY+9YY+wRG&TyaG*FVHfLWlmTb<UHm6AP5eOjK&H%@T
z4@jLl_YGv5Jmy2q={B>k*re(&tG_mX<3&2cON*2u%V29tsXUv{#-ijs2>EuNH-x3)
zPBpi+V6gI=wn}u164_j8xi-y(B?Au2o;UO=r6&)i5S3Mx*)*{_;u}~i4dh$`VgUS-
zMG6t*?DXDYX0D2Oj31MI!HF>|aG8rjrOPnxHu4wZl;!=NGjjDoBpXf?ntrwt^dqxm
zs(lE@*QB3NH)!`rH)5kks-D89g@UX&@DU9jvrs<xLUb7(M^4Zb6^^3tZR7!hc=SMz
zY6*prxO{uSb2$<j;JZB!{&!N@FRiO@L`rit7J5FDJBlZG-SI^R&~X)B26E|MJx3Zp
zy@feJ>Y)aI=9b4n<X@Mg2JK5FwM5CTI(2DlYHRLE7-h-ky&9}X`qiByDxrocwQ6k!
zk>Py3bfdX_U;#?zsan{G>DKob2LnhCJv8o}duQK)qP{7iaaf2=K`a-VNcfC582d4a
z>sBJA*%S|NEazDxXcGPW_uZ&d7xG`~JB!U>U(}acUSn=FqOA~(pn^!aMXRnqiL0;?
zebEZYouRv}-0r;Dq&<B?o>z9>s#Rt1<!G80gW3Q`9g34ikcEkn<~yB0GE=440i1w9
z%Vr=2{=&=rZq4E{&?AkG<{r866K366I$gg?dF2R5T^g;GEw`9Q*Nk^(b|;|+1mb*%
z#4u&?3d3JFi15;ot8Oc19^cux;^0|4tLG@q3aUT$?2-_vk$Lj@p(S^1tSf2`gC-^+
z=%QnjUZHg-onrhZ@o1lIHV_2Dq?*qAxhgUYKOD3{$4MNkw#KqGMg~{D*qK}6#+(MI
zLiJU8?@7)@l#?NnZ90q6`<!@a)Mc05$F6R?dVF0a42_U&5!rIVRk%it+OLoWl=%^V
zt}(_79f^HAArEdKM!qJXXY$(d|4@mB-2tz!8yh<&*Y>HL`0p4bB)A&sMyn|rE_9nh
z?NO*RrjET8D4s(-`nS{MrdYtv*kyCnJKbsftG2D#ia@;42!8xd?a3P(&Y?vCf9na<
zQ&Ni*1Qel&Xq{Z?=%f0<LS^x97`leNoS?M1&H-Xn(H4XTZqAYsYIOp+zQ7v^2WLR!
z_a_8#QR|eBZg?(rHeyy)Ce#d@UAa5k@2V9cLthMp76uClo{creD&Bgz9m%@;ZGciy
zb&;xZf|B4Crm;}`+FCG!wta2!yrIkn%Jpu&re1E<PjbmrrsBbowaz-9RpTeuXu#&D
zFm4Z8p>SRqQt5m|Myg+8T=GDc)@^};=tM>9IDr7hdvE9-M@@<0pqv45xZTeNecbL-
zWFQt4t`9>j8~X%lz}%We>Kzh_=`XO}!;4!OWH?=p*DOs#Nt({k^IvtBEL~Qafn)I^
zm*k{y7_bIs9YE}0B6%r`EIUH8US+MGY!KQA1fi-jCx9*}oz2k1nBsXp;4K<_&S<R|
z+!NEpcbfYC>N}}w<)!EylI_)v7}3&c)V;Cfuj*eJ2yc8LK=vugqTL><#65r6%#2e|
zdYzZ)9Uq7)A$ol&ynM!|RDHc_7?FlWqjW>8TIHc`jExt)f5W|;D%GC#$u!%B*S%Z0
zsj&;bIU2jrt_7%$=!h4Q29n*A^^AI8R|stsW%O@?i+pN0YOU`z;TVuPy!N#~F8Z29
zzZh1`FU(q31wa>kmw{$q=MY>XBprL<1)Py~5TW4mgY%rg$S=4C^0qr+*A^T)Q)Q-U
zGgRb9%MdE-&i#X3xW=I`%xDzAG95!RG9<s#0S@%P{4ssMj6|f(PFTtK{&eg=M$et?
zer_yKYB>)s?v_5+qx`7NdkQ)If5}BoEp~h}XoeK>kweAMxJ8tehagx~;Nr_WP?jXa
zJ&j7%Ef3w*XWf<k`Dtf*esPy5LFqg?XcIB9IkPk2PVCIR^-+n7<HvnNOxS;rSNY$k
z!q<-6euEMl;SCbnVwt5PhJlC8e8)6(eeUqB*8$mMnR$Q&;ETvMu%R;lTOg&_)?8$`
zEVa^()w5!O5o`IR%tYnnz9leJ+<2|7dp$e$)VGU<0VsrN2!{)e*i2Km_!HkTy_op@
zsnIk4PS0pBq&7e1Cq-WNe*ebQP_BP_b6V^hnOf6Jl*FDBLVJ=#%yjrBiM`Z%lGFDo
zwHH-yVfi&trZbO`$d`z6e!q^9z6z!R^x64FT@j!px;*Fv`gCn5ntcrW!_Q4ZK!=`N
zoJV-<2+l^+1!xdB0GlIyi1aL@Bfyw-3;j%CdMMseXt6XU(|7@G1YlJY;FZ<6E=3Wj
z<90D&lAbgUUnehHsAREwMtG=6$~8Hjj0}TB^$|Sk>?V*nR)|IOMrX;$*$e23m?QN`
zk>sC^GE=h6?*Cr~596s_QE@>Nnr?{EU+_^G=LZr#V&0fEXQ3IWtrM{=t^qJ62Sp=e
zrrc>bzX^6yFV!^v7;>J9>j;`qH<hDH19MMT1+`8y)sG%_MO<QWhJX7}-!&K#jas?d
zy;gZO2VIR5z1H^NXfFwADaHGprj9Kyw6No$Yqd_S(T={z#2gbNW$Y;;P#5j-{0Iqq
z{Yz6(ka&r*xSggxVdEyX?Y53QVJz#Wj2B2nNYC=~i46iAU6ds(WkjB{Reo2yZ2cFH
z1KOLbJ7d1#n3MMhVE&yyAfdi+kxdP<3vBD^E`m_9S2y(rq1mIzE*dZNSDYg|SM_8n
zmO6SnMKXq{pYHbK`f8yE_&F1K$=pH5Q;<_Q=ykx1w&1KgW?4A9Z6Hh0ujuU5gw(c)
z&7nRlgcqO=4PWSIrL^%aZQ)})*BEYH(5EdFt~HS|W2m{IuJL*etT$vJP@H=66XgN5
z8Q}8pvQ~ulll!Gl9Z+^=yi)!QQl!(y;INZ9hFT3RpTQp9WD<t=u9}FyLz|lM^T%K;
z_F;6vJrfj%Yd?0P?KC4$4d|po%oYftn%JedFIyM&26HYvVHGfC#(R&nCXS+Z{t)t^
zVSWJ}WdR7#^Eiv>DQ4uc92eVe6nO@c>H=ouLQot``E~KLNqMqJ7(G+?GWO9Ol+q$w
z!^kMv!n{vF?RqLnxVk{a_Ar;^sw0@=+~6!4&;SCh^u<XeQK8Ry4Gm-T(Vj*P>tT=I
zo&$CwvhNOjQpenw2`5*a6Gos6cs~*TD`8H9P4=#jOU_`%L<QahFX*>!W;$57NjN%4
z39(61ZC#s7^tv`_4j}wMRT9rgDo*XtZwN-L;Qc$6v8kKkhmRrxSDkUAzGPgJ?}~_t
zk<g7QLp>woGS4=6lsD`=RL|8L3O9L()N)lmEn-M15fRC{dhZ}7eYV%O-R^gsAp{q4
z!C1}_T8gy^v@SZ5R&Li5JMJy+K8iZw3LOGA0pN1~y@w7RRl#F()ii6Y5mr~Mdy@Kz
z@FT4cm^I&#Fu_9I<Lt*^+@1e0b(+y4E>X(HAFP{XLbRALqm&)>m_we>a`hfv?eE|t
z?YdDp2yAhj-~vuw^wzVDuj%w?exOcOT(ls(F*ceCe(C5HlN{lcQ;}|mRPqFDqLEzw
zR7ldY+M6xe$$qLwekmk{Z&5cME$gpC?-8)f0m$rqaS|mj9ATNJvvyCgs(f2<G?s#j
zlCyq7V=W|3+#5GMRv3jyMSve^Et#Ab=u*f=lMF{rP2hXbA~Thc4Er=Whg%hdYCNEj
z;kX^FSJSNv%HwF&_?QB}Y>{r;2E!oy$k<WRsM?7~2V-%l??892FJ&Nc|D((m<^gBU
z9InVbh@;KM5Dz*apz7ga>5{jik#(;S>do<#m0wVcU<}>)VtYmF9O0%(C>GDzPgh6X
z9OkQLMR~y7=|MtaU!LDPPY7O)L{X#SC+M|v^X2CZ?$GS>U_|aC(VA(mIvCNk+biD|
zSpj>gd(v>_Cbq>~-x^Y3o|?eHmuC?E&z>;<!5?S(?^O9r&S^X+pEvdora!<1(g^2R
zF}c9cL+{oKVWq$6?rtz|xpFbl44EDmFIBCjiJb-Y3(jwkFAqQImExJNVfoWvtZ)_T
zk4V<B4M+9tw4kQKIG^34KQl&&Fz^SMfZ1Rr!}rgT#M3;D3P+k<)V-V;IAUzgk0mWE
z!YO?vo&!phIu^NE0<F?&&>Ij`%{$Pm$hI}bl0Kd`9KD~AchY+goL1?igDxf$qxL9<
z4sW@sD)nwWr`T>e2B8MQN|p*DVTT8)3(%AZ&D|@Zh6`cJFT4G^y6`(UdPLY-&bJYJ
z*L06f2~BX9qX}u)nrpmHP<M#fk<GgBNMKYA_9QYh8<vJ<9@F-~(AqGXdLPEfJFTIn
zp64R)U5xUof+~(#vZUz{EaXw4SAp0Y;12Y-Y*XpA#>G#La#tiZ23<>`R@u8k;ueM6
znuSTY7>XEc+I-(VvL?Y>)adHo(cZ;1I7QP^q%hu#M{BEd8&mG_!EWR7ZV_&E<NEPM
zcuS4Ye{%Gqtc-n!er+G|*<cWkM>GO;d(hGGJzX|tqyYEg2-m0zLT}a{COi$9!?9yK
zGN7&yP$a|0gL`dPUt=4d^}?zrLN?HfKP0_gdRvb}1D73Hx!tXq>7{DWPV;^X{-)cm
zFa^H5oBDL3uLk<C+v0>aFDWgFF@HL6Bt+_^g~*o*t`Hgy3M?nHhWvTp^|AQDc9_H<
zg>IaSMzd7c(Sey;1SespO=8YUUArZaCc~}}tZZX80w%)fNpMExki-qB+;8xVX@dr;
z#L52S6*aM-_$P9x<jdu9ktlJz@92>FuIui;dN#qZ_MYy^C^hrY;YAMg;K`!ZpKKFc
z9feHsool)`tFSS}Su|cL0%F;h!lpR+ym|P>kE-O`3QnHbJ%gJ$dQ_HPTT~>6WNX41
zoDEUpX-g&Hh&GP3ko<AA>F4##?q*MX1K`@=W6(Gxm1=2Tb{hn8{sJyhQBoq}S>bZT
zisRz-xDBYoYxt6--g2M1yh{#<qP09xNr@s6w?MS->QWFCISux}4==r|7+fYdS$%DZ
zXVQu{yPO<)Hn=TK`E@;l!09aY{!TMbT)H-l!(l{0j=SEj@JwW0a_h-2F0MZNpyucb
zPPb+4&j?a!6Z<r#zSSW!Qu(5~6_6s0G^U8i@%ox>nPTB>$t`(XSf-}`&+#rI#`GB>
zl=$3HORwccTnA2%>$Nmz)u7j%_ywoGri1UXVNRxSf(<@vDLKKxFo;5pTI$R~a|-sQ
zd5Rfwj+$k1t0{J`qOL^q>vZUHc7a^`cKKVa{66z?wMuQAfdZBaVVv@-wamPmes$d!
z>gv^xx<0jXO<J6=m}BiiJow`eU@2UA*K~Z_jqm?*Cp?B28V2;3;6C}+*8byL=EIJc
z@2%))H|zSX{#wNl1dKR;V_`{wA-N5-aN?q$&CIR<EVd6v!|e;ZYX_h;K*-tj_Xr#R
zVD!mpcMXWrZqS|`IB=hKzaZzy6X`0CowC9wPYMg&9n}1avJ{}*L0iZ!p`>z;7HIQS
z4RBIFD?7{o^IQ=sNQ-k!ao*<ZRhqeGmf|{bY%Roxqzv&YHX(&*=PS#s1OR(zw~6*G
zAZll^YspPb$=6UL<F@2FynT_exO*?%>+V*|-^I2=UF?{d>bE9avsWbAs{sRE-y`7r
zxVAKA9amvo4T}ZAHSF-{y1GqUHlDp4DO9I3mz5h8n|}P-9nKD|$r9AS3gbF1AX=2B
zyaK3TbKYqv%~JHKQH8v+%zQ8UVEGDZY|mb>Oe3JD_Z{+Pq%HB+J1s*y6JOlk`6~H)
zKt)YMZ*RkbU!<JI!}T{8zEt+(a&daxMztju*ROn;npHenq}*@86I)b4J&uF~&?iJt
zN?o)&ELAxfueHiio3Ybyik@o*@icyb9qQo*!QuvA1&u?hUYT)4qQ$O|oMH`uQ%7^!
z_}}e+S%sZ4PL@FquF`ewt{)}v@KZ#Df*{vuY6%Mec{@2I-?T|VsMToX1VvAe%n^j)
zvdeu6s1|35v#f;_moF<I`PGAy?=_uDS;`<l<OfIk_>GPHzJltmW-=6zqO=5;S)jz{
zFSx?ryqSMxgx|Nhv3z#kFBTuTBHsViaOHs5e&vXZ@l@mVI37<+^KvTE51!pB4Tggq
zz!NlRY2ZLno0&6bA|KHPYO<dkI`ky_l{+0el>MY;;LZG&_lzuLy{@i$&B(}_*~Zk2
z>bkQ7u&Ww%CFh{aqkT{HCbPbRX&EvPRp=}WKmyHc>S_-qbwAr0<20vEoJ(!?-ucjE
zKQ+nSlRL^VnOX0h+WcjGb6WI(8;7bsMaHXDb6ynPoOXMlf9nLKre;w*#E_whR#5!!
z!^%_+X3eJVKc$fMZP;+xP$~e(CIP1R&{2m+iTQhDoC8Yl@kLM=Wily_cu>7C1wjVU
z-^~I0P06ZSNVaN~A`#cSBH2L&tk6R%dU1(u1XdAx;g+5S^Hn9-L$v@p7C<o$=Hu{J
zxrz+#TM>CF&PqV{Z?R$}4EJi36+u2JP7l(@fYfP!=e#76LGy^f>~vs0%s*x@X8`|5
zGd6JOHsQ=feES4Vo8%1P_7F5qjiIm#oRT0kO1(<jgC4I6wQ2{Xo|wjm0krd64efBC
zGt(LP9FC(njlia=(c_lTukVx-yR9~Gt`YfGKRT==f^$Uqz)t!SwGPI)kuvX+Zjvmv
zgh<^_T!LG;_|>?Z_Dk6<DV?iVez|GsZJ9q9|E_~n&^oZp@ZP#r)@50Y)8mRQBV<Zt
zDX+2G&swV0HIzU2B)jGgp<HCCR~bCFxw$OKhJS{dJFnQcxWhHg&GJ*Y)wr*`8kbb7
zRF?6Y&IrteW+;JBSq`vvJy8vQL|A_+2fW`8-8lH@zNvF93Bm{k%c!o-fCV)*0t~GU
zSfWy;Y#>oX&j=Xd8Klk(;gk3S(ZFnc^8Gc=d;8O-R9tlGyp=2I@1teAZpGWUi;}`n
zbJOS_Z2L16nVtDnPpMn{+wR9&yU9~C<-ncppPee`>@1k7hTl5Fn_3_KzQ)u{iJPp3
z)df?Xo%9ta%(dp@DhKuQj4D8=_!*ra#Ib&OXKrsYvAG%H7Kq|43WbayvsbeeimSa=
z8~{7ya9ZUAIgLLPeuNmSB&#-`Je0Lja)M$}I41KHb7dQq$wgwX+EElNxBgyyLbA2*
z=c1VJR%EPJEw(7!UE?4w@94{pI3E%(acEYd8*Wmr^R7|IM2RZ-RVXSkXy-8$!(iB*
zQA`qh2Ze!EY6}Zs7vRz&nr|L60NlIgnO3L*Yz2k2Ivfen?drnVzzu3)1V&-t5S~S?
zw#=Sdh>K@2vA25su*@>npw&7A%|Uh9T1jR$mV*H@)pU0&2#Se`7iJlOr$mp79`DKM
z5vr*XLrg7w6lc4&S{So1KGKBqcuJ!E|HVFB?vTOjQHi)g+FwJqX@Y3q(qa#6T@3{q
zhc@2T-W}XD9x4u+LCdce$*}x!Sc#+rH-sCz6j}0EE`Tk*irUq<m0`(;!&c&G7p#_P
zOJ|kT&v8z(QpAQ%C~^@e!Ck!ICE1vSkA<!Djfg-q)Xjj-!hve17Fw+LN`@{UJN)Br
zZQc5>)y^za`}^1gFnF)C!yf_l_}I<6qfbT$Gc&Eyr?!QwJR~RE4!gKVmqjbI+I^*^
z&hz^7r-dgm@Mbfc#{JTH&^6sJCZt-NTpChB^fzQ}?etydyf~+)!d%V$0faN(f`rJb
zm_YaJZ@>Fg>Ay2&bzTx3w^u-lsulc{mX4-nH*A(32O&b^EWmSu<mNHl&EF)N<Qwv@
z+ghjNCfO8{=RX6l;$%bV;UJwTS<t3aZ9alZA|`Nj-rR_)P~(S$140`CMywS0w4K@n
zvEbSGG>k{#HJk}_ULC}SB(L7`YAs>opp9o5UcnB^kVB*rmW6{s0&~_>J!_#<Q!IQA
zfO6pF51Khiw-3ES&zJ|$tcLa{0mAHdM*u;#&JjS6&2$71z|3e-)lO=LCK!MP<y1Y+
z19)^hGF`6{P@#NOEe8oq!=8hZ$>+cEWib@v-Ms`?!&=3fDot`oH9v&$f<52>{n2l*
z1FRzJ#yQbTHO}}wt0!y8Eh-0<gy=!05)T$dd<p&_-XL+(loOF(KU||XB_8&Ud`&j6
zW~wWblPi)_Dt+fy0AJi)GpeZiwq|YIuGrGcv(nscAa@~_m+trFF56NgiRrAWJI3uF
z`lhjQpmFmzF^U1!<RrqC-I>*|Um3vjX-nWH>`JN5tWB<ptoGg-$7O92<yOQsP=C)b
zJ`}#bAW@wa=e0GehF6uTNUcd|*Ba&dCiyhdjY(|NMK^uobI9q$ZChi=zU%>_gnW%;
zUJ0V?_a#+!=>ahhrbGvmvObe8=v1uI8#gNHJ#>RwxL>E^pT05Br8+$@a9aDC1~$@*
zicSQCbQcr=DCHM*?G7Hsovk|{$3oIwvymi#YoXeVfWj{Gd#XmnDgzQPRUKNAAI44y
z{1WG&rhIR4ipmvBmq$BZ*5tmPIZmhhWgq|TcuR{6lA)+vhj(cH`0;+B^72{&a7ff*
zkrIo|<cYW*47-TiTWhvB;>pd-Yxm+VVptC@QNCDk0=Re%Sz%ta7y{5Dn9(EapBS0r
zLbDKeZepar5%cAcb<^;m>1{QhMzRmRem=+0I3ERot-)gb`i|sII^A#^Gz+x>TW5A&
z3PQcpM$lDy`zb%1yf!e8&_>D02RN950KzW>GN6n@2so&Wu09x@PB=&IkIf|zZ1W}P
zAKf*&Mo5@@G=w&290aG1@3=IMCB^|G4L7*xn;r3v&HBrD4D)Zg+)f~Ls$7*P-^i#B
z4X7ac=0&58j^@2EBZCs}YPe3rqgL<Jxn$r!S8QWfkb&3miwnf<3dO#?*0r^D`z@0O
zyL}HbgfghMrA1DVzkMTz<h8XjNM2zx@b$YHrE<H$adW4nu!w{$k5e-y$OIJc^n_-#
z?T4cd%<Il(cWf@2Jy-ZR<%BHt;L>AA1L3Y}o?}$%u~)7Rk=LLFbAdSy@-Uw6lv?0K
z&P@@M`o2Rll3GoYjotf@WNNjHbe|R?IKVn*?Rzf9v9QoFMq)ODF~>L}26@z`KA82t
z43e!^z&WGqAk$Ww8j6bc3$I|;5^BHwt`?e)zf|&+l#!8uJV_Cwy-n1yS0^Q{W*a8B
zTzTYL>tt&I&9vzGQUrO?YIm6C1r>eyh|qw~-&;7s7u1achP$K3VnXd8sV8J7ZTxTh
z5+^*J5%_#X)XL2@>h(Gmv$@)fZ@ikR$v(2Rax89xscFEi!3_;ORI0dBxw)S{r50qf
zg&_a*>2Xe{s@)7OX9O!C?^6fD8tc3bQTq9}fxhbx2@QeaO9Ej+2m!u~+u%Q6?Tgz{
zjYS}bleKcVhW~1$?t*AO^p!=Xkkgwx6OTik*R3~yg^L`wUU9Dq#$Z*iW%?s6pO_f8
zJ8w#u#Eaw7=8n{zJ}C>w{enA6XYHfUf7h)!Qaev)?V=yW{b@-z`hAz;I7^|DoFChP
z1aYQnkGauh*ps6x*_S77@z1wwGmF8ky9fMbM$dr*`vsot4uvqWn)0vTRwJqH#&D%g
zL3(0dP>%Oj&vm5Re%>*4x|h<Em3JO)$O&GXE=ft3p^9G|#?0DwWLK`p_K)+<TTv{{
z-sme#4+Oqqf)?$*$pWS2gvP{&alHNwIjdG2eeVgB&W~2ncQkQT<TEB}+r+U*Sz^2(
z{JDq=6~A;9bd6M;^@ummf%1~8*<luPLU&L(KPlUFmFbIAFWF(Em5xC%IhGNzYpP8O
zT+`%G-QRPYJlIrWo{iAsK!Q9!P2vkE5P#|jye^?ECnY~D$0dPb9DZfa1?v)yz@3g&
z;g&G9%`bXU)%GaSxc!s&q+yw?s&G0kHmhpF|71o$Tvo0$rpbSM(^6^d{uv91%{b|=
z$*Kl!b^WeJ@0d+rhNnHIz4cl+;iLmd<L-)VhjV!~YbEu}d>1J2X*mK5BH1?Nx_#7(
zepgF`+n)rHXj!RiipusEq!X81;QQBXlTvLDj=Qub(ha&D=BDx3@-V*d!D9PeXUY?l
zwZ0<4=iY!sUj4G>zTS+eYX7knN-8Oynl=NdwHS*nSz_5}*5LQ@=?Yr?uj$`C1m2OR
zK`f5SD2|;=BhU#Ama<P~$VvhmI_^8ZNrt}1AvOV7X(sz*+2GbCZLT;rBdYe9QGvD6
z)XZ03krf;EL7R4cKP%`*;hM_&31edpDiHr|`}C4$VA4K?4)t-d*ee|SqdnPMHN?%7
zx3<>TKe9QaSHQ_DUj1*cUPa*JICFt1<&S3P3zsrs^yUE;tx=x^cmW!Jq!+hohv_B>
zPDMT<UQS`;VV^r@irLILT~0+N33M1<u)sr18hR(<Wra9eQt=0KCN|yzvNvA<AN<3k
zV|hxRkue$##Qs23TChJ;07NqT3L1xe)KK-*%TLpc>0D&08dC4x@cTD<NY(g*?y)&(
z$O8b2Q6sg#wt{+cv-4vv@-+5_NBvTr6Ex1qad@WizC1F1SdwV9_ihN`8RHq?sk5jC
z#WILtbwaI9L(u>$o1$x%So1Ir(G3_AVQMvQ13un~sP(cEWi$2%5q93E7t{3VJf%K?
zuwSyDke~<K40T94pahUuQl0-LemUU;AvE^<Z_y9Yyr$?J0su3Gy5f{LKemD(&L1%W
zWEvyy)Y1GLmYP8(i-d%GK_O{23yX~H+%H&Rou8u`;RWM|q&*T>7KuB2?*#DV8YzJw
z&}SCDexnUPD!%4|y~7}VzvJ4ch)WT4%sw@ItwoNt(C*RP)h?&~^g##vnhR0!HvIYx
z0td2yz9=>t3JNySl*TszmfH6`Ir;ft@RdWs3}!J88UE|gj_GMQ6$ZYphUL2~4OY7}
zB*33_bjkRf_@l;Y!7MIdb~bVe;-m78Pz|pdy=O*3kjak63UnLt!{^!!Ljg0rJD3a~
z1Q;y5Z^MF<=Hr}rd<hCKOY==|sWDSuzL8iiX7^T&s)i%HRX)g)$n}ULLiX`pwGBZP
z9gmSoR&T(}(1y>oz>yRczx+p3RxxgJE2GX&Si)14B@2t21j4hnnP#U?T3g#+{W+Zb
z5s^@>->~-}4|_*!5pIzMCEp|3+i1XKcfUxW`8|ezAh>y{WiRcjSG*asw6;Ef(k#>V
ztguN?EGkV_mGFdq!n#W)<7E}1#EZN8O$O|}qdoE|7K?F4zo1jL-v}E8v?9qz(d$&2
zMwyK&xlC9rXo_2xw7Qe0caC?o?Pc*-QAOE!+UvRuKjG+;dk|jQhDDBe?`XT7Y5lte
zqSu0t5`;>Wv%|nhj|ZiE^IqA_lZu7OWh!2Y(627zb=r7Ends}wVk7Q5o09a@ojhH7
zU0m&h*8+j4e|OqWyJ&B`V`y=>MVO;K9=hk^6EsmVAGkLT{oUtR{JqSRY{Qi{kKw1k
z6s;0SMPJOLp!som|A`*q3t0wIj-=bG8a#MC)MHcMSQU98Juv$?$CvYX)(n`P^!`5|
zv3q@@|G@6wMqh;d;m4qvdibx2Yjml}vG9mDv&!0ne02M#D`Bo}xIB0VWh8>>WtNZQ
z$&ISlJX;*ORQIO;k62qA{^6P%3!Z=Y1EbmY02{w^yB$`;%!{kur&XTGDiO2cjA)lr
zsY^XZWy^DSAaz;kZ_VG?uWnJR7qdN18$~)>(kOoybY0~QYu9||K#|$Mby{3GduV~N
zk9H7$7=RSo+?CUYF502`b76ytBy}sFak&|HIwRvB=0D|S`c#QCJ<t@a2hh9FA+>Pq
zP)uOWI)#(n&{6|C4A^G~%B~BY21aOMoz9RuuM`Ip%oBz+NoAlb7?#`E^}7xXo!4S?
zFg8I~G%!@nXi8&aJSGFcZAxQf;0m}942=i#p-&teLvE{AKm7Sl2f}Io?!IqbC|J;h
z`=5LFOnU5?^w~SV@YwNZx$k_(kLNxZ<T-w9G;`)wdHJoGV2amO-<vG?pZ@XJ#Uo$J
zb+q{_L}lvg?U~@|P1*dSegkN;ajNUGhmyA=S^CQ6@p}9uJKGF3&96BmwaXxSvK>DE
z3cf08^-rIT_>A$}B%IJBPcN^)4;90BQtiEi!gT#+EqyAUZ|}*b_}R>SGloq&6?opL
zuT_+lwQMgg6!Cso$BwUA;k-1NcrzyE>(_X$B0HocjY~=Pk~Q08+N}(|%HjO_i+*=o
z%G6C6A30Ch<0UlG;Zdj@ed!rfUY_i9mYwK8(aYuzcUzlTJ1yPz|Bb-9b33A9zRh<?
zEh+^J@0OOsX>Gl>Ny-Q<wjX~nWiOR}_^4D)POdKUaI)X<DM%#y>#JAq-+qtI@B@&w
z$;PJbyiW=!py@g2hAi0)U1v=;avka`gd@8LC4=BEbNqL&K^UAQ5%r95#x%<j2Twi<
zWI28Jof9kY(Ikv>^qRB%KLaqMnG|6xKAm}sx!Q<xJn;TKhAi-lV_zy<;)6u(yxe`r
zG8s+nu+7X=I2SJx?KI|R<|o>wo}J=2C;NROi$mfADui4)y(3wVA3k~{j^_5%H)C6K
zlYAm1eY**HZOj($)xfKIQFtIVw<YDEZ~5huBx;6h(9UoYDe-u{#QQBex`xo0d_SF-
zZ{zr8r-x@oa=@P7G8Gz%Q<2A7_lyD&aeZ-!inR%aZ-5;iEO&XuPoZbZ6OcnjG1hFD
z=btAA?MyXPGxhQ_`_b@us-{heIodKJbCj6!H57FlM3sv+z|<{D?1@zfhGGSCy3ZI2
zt4}F|%ocaJQVlIK<}Wp7+&rp6QOq<JYmAuckgc6Zxd{^=DJ9>$4&yvz9>(Crs>Gh{
zya6-FG7Dgi92#K)64=9Csj5?Zqe~_9TwSI!2quAwa1w-*uC5!}xY`?tltb0Hq740<
zsq2QelPveZ4chr$=~U3!+c&>xyfvA1`)owOqj=i4wjY=A1577Gwg&Ko7;?il9r|_*
z8P&IDV_g2D{in5OLFxsO!kx3AhO$5aKeoM|!q|VokqMlYM@HtsRuMtBY%I35#5$+G
zpp|JOeoj^U=95HLemB04Yqv{a8X<^K9G2`&ShM_6&Bi1n?o?@MXsDj9Z*A3>#XK%J
zRc*&SlFl>l)9DyRQ{*%Z+^e1XpH?0@vhpXrnPPU*d%vOhKkimm-u<I9o!2{*RVUW0
zkpjTAF;dx9>3c%Q^v3RKp9kx@A2dS?QfS=iigGr7m><)YkV=%LA5h@Uj@9=~ABPMJ
z1UE;F&;Ttg5Kc^Qy!1SuvbNEqdgu3*l`=>s5_}dUv$B%BJbMiWrrMm7OXOdi=GOmh
zZBvXXK7VqO&zojI2Om9};zCB5i|<210I{iwiGznGCx=FT89=Ef)5!lB1cZ6lbz<Vs
z!O6)(KPRgm>gDn07*he}G&w7m!;|E(L-?+<?McI~@TA!vj4RjYnCoT*FH)-pRq74Q
z67E9_umMJOIut_@Dx-Z2hEzHqy0(3L!ra}x0phZ^)OD)P*BAJetYupvu9iOfKMRY*
z59R&ZxVR$6O$s<?dV};ZTu5t!)CO9!I>cz@0<9Z<nFBx*sw*AzBdboG>I~LqYQE<f
zdA084i)nAbA%sHr3I6f)x0A6_C#f|)+7km{+VWc=8p6a>7>HnPA436}oeN2Y(VfG6
zxNZuMK3Crm^Z_AFeHc~CVRrSl0W^?+Gbteu1g8NGYa3(8f*P{(ZT>%!jtSl6WbYVv
zmE(37t0C8vJ6O-5+o*lL9XRcFbd~GSBGbGh3~R!67g&l)7n!kJlWd)~TUy<jO~Zhv
z@xvBaLkBZ#>Xus#!&G6sR%(l(h1$xyrR5j_jM1zj#giA&@(Xl26@n<9>folx!92bQ
z24h<Dc4e3SQJcr^RE3|QaY*5jX?vj3>570+<)4!$!IQ(5yOU|4_E6aN@4v0+{Kx~Z
z;q7fp%0cHziuI%!kB~w}g9@V+1wDz0wFlzX2UOvOy|&;e;t!lAR8tV2KQHgtfk8Uf
zw;rs!(4JPODERk4ckd5I2Vq|0rd@@Mwd8MID%0^fITjYIQom^q;qhP8@|eJx{?5xX
zc1@Fj*kDknlk{c-rnCloQ3hGh7OU+@e<M~mcEvZ$(y*X$K0x5}s~CQD$(YxML3psk
zFM|TBc-aWBLjK@0qr{-u^ogBxgUZ2q9fo2sjGh*5M_>fO3>fkRMcM>J?AeVP<Ux|u
zIt<28*boJGNgvZU&+HIxSJU@0MMOMk7(|dJT9}B#3C^H5%`@R9`pq2cDNIDmG&|fk
z=;qP1KP0X0%WFW{10wdnB1|TJr}_3V9m=|9t1&c+%CUUz+SxZxbB`X)efq{sF+1tq
zKf-%4B#;+_1Fv@}nSe1EebC@A=zceZ+9L=HMG!TLs$d<`aVBpK$8UGu%?r!ZUz3ID
zw2G?KI8ia%8jnZwySwx2`P0dY`Re&F893$F0%*A8SHESTm@B%nT<YZ$)QN^ti`2>&
zlfzX%cdp=N+4S#E*%^=BQ+N`A7C}|k%$|QUn0yI6S3$MS-NjO!4hm55uyju)Q6e!}
z*OVO@A#-mfC9Pha6ng((Xl^V7{d+&u+yx)_B1{~t7d5e8L^i4J>;x<7@5;+l7-Gge
zf#9diXJ$&v^rbN5V(ee%q0xBMEgS6%qZm7hNUP%G;^J44I!BmI@M*+FWz0!+s;+iQ
zU4CuI+27bvNK8v>?7PZnVxB=heJ&_ymE0nN^W#-rqB%+JXkYGDuRw>JM_LdtLkiq*
z6%%3&^BX$jnM@2bjiGc-DymKly)wVkA-pq;jSWL#7_*moZZ4I|-N}o8SK?sIv)p|c
zu~9-B%tMc=!)YMFp*SiC0>kfnH8+X5>;+FFVN{~a9YVdIg1uGkZ~kegFy{^PU(4{(
z`CbY`XmVA3esai686Yw8djCEyF7`bfB^F1)nwv+AqYLZ&Zy=eFhYT2uMd@{sP_qS4
zbJ&>PxajjZt?&c<1^!T|pLHfX=E^FJ>-l_XCZzvRV%x}@u(FtF(mS+Umw<d2c`9Rr
zR+?yr(!A0r|CD~t7GFV?aaA(6z5nz_Nm0i$V6I-ucK$u?K&%hkODCkY(1+;DS|bQF
zb4mg|54xl}b6Ewc=m`{a+NEN`d1?%=>$e+IA74e>gCdTqi;6&=euAIpxd=Y3I5xWR
zBhGoT+T`V1@91OlQ}2YO*~P4ukd*TBBdt?Plt)_ou6Y@Db`ss+Q~A-48s>?eaJYA2
zRGOa8^~Em}EFTmKIVVbMb|ob)hJJ7ITg>yHAn2i|{2ZJU!cwt9YNDT0=*WO7Bq#Xj
zg@FjEaKoolrF8%c;49|`IT&25?O$dq<?{UbIQ0;9Tr9TA6pzz%=H>8kp3#la9&6aH
z6G|{>^C(>yP7#Dr$aeFyS0Ai_$ILhL43#*mgEl(c*4?Ae;tRL&S7Vc}Szl>B`mBuI
zB9Y%xp%CZwlH!3V(`6W4-ZuETssvI&B~_O;CbULfl)X1V%(H7VSPf`_Ka9ak@8A=z
z1l|B1QKT}NLI`WVTRd;2En5u{0CRqy9PTi$ja^inu){LJ&E&6W%JJPw#&PaTxpt?k
zpC~gjN*22Q8tpGHR|tg~ye#9a8N<%odhZJnk7Oh=(PKfhYfzLAxdE36r<6<oD}e5;
zMPsE4+rk0d2jE*#p84SO^!fW~`j-|(WExf+!}WMlI2oGcLeMqZ%ofC97d<+nflE=C
zww(j#(;Qr&ut3IEyIwm>a?A;rO&ELp_Y?8Pdw(PT^Fxn!eG_|LEbSYoBrsBA|6Fgr
zt5LntyusI{Q2fdy=>ditS;}^B;I2MD4=(>7fWt0Jp~y=?VvfvzHvQhj6dyIef46J$
zl4Xu7U9v_NJV?uBBC0!kcTS0UcrV7+<p(Ba=Bk7*SXvlcpQJatnzmyl-^GA6y=0YH
zU!Qp*(5v5`qcU7GH`fZ53mR)&#Os~1d`1FKAc~R?v^F@3sPXWHk(`{v@BF<NgpL1h
zOYj$ZQX-EI8H4?Ypq8IMFE`LLGMYNju;D(Aux0jFNCc@>@~is?Fi+jrr@l3XwD|uG
zr26jUWiv>Ju48Y<K5Q0UFt#$Wh-3Y^huuiZIhuP~4SRD>^#qn7r9mwIH-<mOw=)2D
z<iCzV917q@YTEy}IJiO<?It)?BnA;jg`vU#wb|e4BpbC^HJE}Jh7S%#;t@=RHEzf3
zve@!5mXtmM3~}?iGNYp|t2UDZWtZs+?hWj`+Vz*5E0~r*FRY^QnYC-}Vte5CD38TA
z2heFf8>Pv6Y|V|V-GZ&+&gQ?S?-`&ts{@5GXPqbmyZjUACC&oVXfNwUX0}ba(v978
zp8z!v9~8Zx8qB<QXT5I&+92wF0pO{dS4(N<h_+P+tKZn8-IlF)tWr~gMeIiH-&7y0
zvL&hwU_I>@7>oFPDm^iR@+yw`79YF)w^OHB_N;&&x7c3l^3!)IY#)}x)@D(iNaOm9
zC=^*!{`7<aJO;!0Q_GA?kGJMA-q_;pS6#JcnV+|?H`ki8UM3IyaP&Y_Cob&3B{Pk)
zm4w3$nw_t--`?`O5&1RGdSO&%Hqq;;K{ebNOqKIk%%SGD!F=%uOt^n7pXHX$w+HIP
z8dL)o*Jpb{DXQ+Ru13)nl`bL_X#5zH`D&t|K|2sG@Zx^L{-A|#-X*Z;4E;wV8qs|w
zT>={3*S=%iU=KsPXh=DDZcc``Ss>057i{pdW8M@4q+Ba@Tt%OytH!4>rbIbQw^-pR
zGGYNPzw@n=PV@)b7yVbFr;glF*Qq3>F9oBN5PUXt!?2mdGcpv^o1?Thp`jP10G2Yi
z(c93td3F3SW!Le5DUwdub!aDKoVLU6g!O?Ret21l$qOC;kdd@L#M&baVu&JZGt&<6
z!VCkvgRaav6QDW2x}tUy4~Y5(B+#Ej-8vM?DM-1?J_*&PntI3E96M!`WL#<&Z5n2u
z<QPxSVI}f8nvsYEV@sQO)6fswrNtp@sU=8(-b8Mb5P$r8S==I%7kh4B)_n@!DLI2Z
z4PP(&9*0`aDCzk=7Hs;qt@l};2A|ee_lp|_XHg@k->o`P!~vBT$YOT~gU9#PB)%JZ
zcd_u<u8SkTyW@XV6qrAJ#qjS(2-MC6glNGYe|r3T`ER-;ck$QHoSn3~1RN=RR%nUZ
zKf8<#6k1k~H@+pG{73t5FQeCnhxF-1&my@?)3Sx2>=m^LYzC!pH#W`yA1!(fA;D~b
zG#73@l)NNd;n#XrKXZEfab;@kQRnOFU2Th-1m<4mJzlj9<frYer6HiQx@?8?NJ2Do
zObcl_ecl~1qF&eiOVBk0#ZN-|Dd_D_4Xx*PUVf?)>b3pv-GF$elX7ib9!uILM_$ke
zHIGB*&=5=;ynQA{y7H93%i^d)T}y@(p>8vVhJ4L)M{0Q*@D^+SPp`EW+G6E%+`Z;u
zS3goV@Dic7vc5`?!pCN4<JvL_48+Q8LQ@>4Ts@*{)zwy)9?B||AM{zKlN4T}qQRL2
zgv+{K8bv7w)#xge16;kI1fU87!W4pX)N&|cq8&i^1r`W|Hg4366r(?-ecEJ9u&Eaw
zrhyikXQB>C9d>cpPGiu=VU3Z-u4|0V_iap!_J3o+K_R5EXk@sfu~zHwwYkpncVh!R
zqNe7Cmf_|Wmeq4#(mIO&(wCK@b4(x0?W1Qtk(`$?+$uCJCGZm_%k?l32vuShgDFMa
ztc`{$8DhB9)&?~(m&EUc=LzI1=qo#zjy#2{hLT_*aj<618qQ7mD#k2ZFGou&69;=2
z1j7=Su8k}{L*h&mfs7jg^PN&9C1Z@U!p6gXk&-7xM~{X<iLOVw!aav*!V=`4l#Z}C
z96Cuv>`nqH#aGO`;Xy_zbz^rYacIq0AH%4!Oh93TzJ820%ur)8OyeS@K?sF1V(iFO
z37Nnqj1z#1{|v7=_CX`lQA|$<1gtuNMHGNJYp1D_k;WQk-b+T6VmUK(x=bWviOZ~T
z|4e%SpuaWLWD?qN2%`S*`P;BQBw(B__wTD6epvGdJ+>DBq2oV<pcqb&6wR<4FA$2v
z5~)nCP^#1#txj(+n#>lf&F*lz+#avb4<LeKI6+c0!*aYJO0uGAzkT?h&<)eF9oO@N
zFp85j%ZswAo3`tRahjKP+mG|QpZEJg2u4s0CrFBBSdJG&Nmf)%H%!ZRT+a`}C{EHW
zFUqQJ+O8kQX<pWCKhEoZ-tYH^5fsA-lA;-w;{{QY6;;y>)3P1c^Mf#olQheVvZ|Z5
z>xXfgmv!5Z^SYn+_x}K5B%G^sRwiez&z9|f!E!#oJlT2k<v)*-8Izce`)2-oo#(W-
zoudGWwGo@1CGNHF$IO1;TKoQC#d=r1zr6R{_1!X`9kp|Iknh0E@*R+w*=1K9s{o0$
zk>COV0000$L_|bHBqAarB4TD{W@grX1CUr72@caw0faEd7-K|4L_|cawbojjHdpd6
zI6~Iv5J?-Q4*&oF000000FV;^004t70Z6Qk1Xl<E0000001Beth!e-qIiLWEb%ZLV
zlu{~6UVVTb6vR4Bl(ZyCk|ase4n~5DnVFfHdC{Mq``+`wUsuh>{X9oJ{sRC2(cs?-

literal 0
HcmV?d00001

diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/bootstrap.min.js b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/bootstrap.min.js
new file mode 100644
index 00000000..c8f82e59
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/bootstrap.min.js
@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v3.3.4 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.4",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.4",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active"));a&&this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.4",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.4",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){b&&3===b.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=c(d),f={relatedTarget:this};e.hasClass("open")&&(e.trigger(b=a.Event("hide.bs.dropdown",f)),b.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f)))}))}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.4",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('<div class="dropdown-backdrop"/>').insertAfter(a(this)).on("click",b);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(b){if(/(38|40|27|32)/.test(b.which)&&!/input|textarea/i.test(b.target.tagName)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var e=c(d),g=e.hasClass("open");if(!g&&27!=b.which||g&&27==b.which)return 27==b.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find('[role="menu"]'+h+', [role="listbox"]'+h);if(i.length){var j=i.index(b.target);38==b.which&&j>0&&j--,40==b.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",b).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",f,g.prototype.toggle).on("keydown.bs.dropdown.data-api",f,g.prototype.keydown).on("keydown.bs.dropdown.data-api",'[role="menu"]',g.prototype.keydown).on("keydown.bs.dropdown.data-api",'[role="listbox"]',g.prototype.keydown)}(jQuery),+function(a){"use strict";function b(b,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},c.DEFAULTS,e.data(),"object"==typeof b&&b);f||e.data("bs.modal",f=new c(this,g)),"string"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.body),this.$element=a(b),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};c.VERSION="3.3.4",c.TRANSITION_DURATION=300,c.BACKDROP_TRANSITION_DURATION=150,c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var d=this,e=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){d.$element.one("mouseup.dismiss.bs.modal",function(b){a(b.target).is(d.$element)&&(d.ignoreBackdropClick=!0)})}),this.backdrop(function(){var e=a.support.transition&&d.$element.hasClass("fade");d.$element.parent().length||d.$element.appendTo(d.$body),d.$element.show().scrollTop(0),d.adjustDialog(),e&&d.$element[0].offsetWidth,d.$element.addClass("in").attr("aria-hidden",!1),d.enforceFocus();var f=a.Event("shown.bs.modal",{relatedTarget:b});e?d.$dialog.one("bsTransitionEnd",function(){d.$element.trigger("focus").trigger(f)}).emulateTransitionEnd(c.TRANSITION_DURATION):d.$element.trigger("focus").trigger(f)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(c.TRANSITION_DURATION):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger("focus")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},c.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$body.removeClass("modal-open"),a.resetAdjustments(),a.resetScrollbar(),a.$element.trigger("hidden.bs.modal")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.prototype.backdrop=function(b){var d=this,e=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var f=a.support.transition&&e;if(this.$backdrop=a('<div class="modal-backdrop '+e+'" />').appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDialog()},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth<a,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.init("tooltip",a,b)};c.VERSION="3.3.4",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(this.options.viewport.selector||this.options.viewport),this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c&&c.$tip&&c.$tip.is(":visible")?void(c.hoverState="in"):(c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.options.container?a(this.options.container):this.$element.parent(),p=this.getPosition(o);h="bottom"==h&&k.bottom+m>p.bottom?"top":"top"==h&&k.top-m<p.top?"bottom":"right"==h&&k.right+l>p.width?"left":"left"==h&&k.left-l<p.left?"right":h,f.removeClass(n).addClass(h)}var q=this.getCalculatedOffset(h,k,l,m);this.applyPlacement(q,h);var r=function(){var a=e.hoverState;e.$element.trigger("shown.bs."+e.type),e.hoverState=null,"out"==a&&e.leave(e)};a.support.transition&&this.$tip.hasClass("fade")?f.one("bsTransitionEnd",r).emulateTransitionEnd(c.TRANSITION_DURATION):r()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top=b.top+g,b.left=b.left+h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;"top"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=/top|bottom/.test(c),m=l?2*k.left-e+i:2*k.top-f+j,n=l?"offsetWidth":"offsetHeight";d.offset(b),this.replaceArrow(m,d[0][n],l)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c?"left":"top",50*(1-a/b)+"%").css(c?"top":"left","")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},c.prototype.hide=function(b){function d(){"in"!=e.hoverState&&f.detach(),e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),b&&b()}var e=this,f=a(this.$tip),g=a.Event("hide.bs."+this.type);return this.$element.trigger(g),g.isDefaultPrevented()?void 0:(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",d).emulateTransitionEnd(c.TRANSITION_DURATION):d(),this.hoverState=null,this)},c.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},c.prototype.hasContent=function(){return this.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d="BODY"==c.tagName,e=c.getBoundingClientRect();null==e.width&&(e=a.extend({},e,{width:e.right-e.left,height:e.bottom-e.top}));var f=d?{top:0,left:0}:b.offset(),g={scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop()},h=d?{width:a(window).width(),height:a(window).height()}:null;return a.extend({},e,g,h,f)},c.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.scroll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.width&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){return this.$tip=this.$tip||a(this.options.template)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type)})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.4",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.4",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<e[0])return this.activeTarget=null,this.clear();for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(void 0===e[a+1]||b<e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.4",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){
+var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.4",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=a(document.body).height();"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/d3.min.js b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/d3.min.js
new file mode 100644
index 00000000..34d5513e
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/d3.min.js
@@ -0,0 +1,5 @@
+!function(){function n(n){return n&&(n.ownerDocument||n.document||n).documentElement}function t(n){return n&&(n.ownerDocument&&n.ownerDocument.defaultView||n.document&&n||n.defaultView)}function e(n,t){return t>n?-1:n>t?1:n>=t?0:0/0}function r(n){return null===n?0/0:+n}function u(n){return!isNaN(n)}function i(n){return{left:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var i=r+u>>>1;n(t[i],e)<0?r=i+1:u=i}return r},right:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var i=r+u>>>1;n(t[i],e)>0?u=i:r=i+1}return r}}}function o(n){return n.length}function a(n){for(var t=1;n*t%1;)t*=10;return t}function c(n,t){for(var e in t)Object.defineProperty(n.prototype,e,{value:t[e],enumerable:!1})}function l(){this._=Object.create(null)}function s(n){return(n+="")===pa||n[0]===va?va+n:n}function f(n){return(n+="")[0]===va?n.slice(1):n}function h(n){return s(n)in this._}function g(n){return(n=s(n))in this._&&delete this._[n]}function p(){var n=[];for(var t in this._)n.push(f(t));return n}function v(){var n=0;for(var t in this._)++n;return n}function d(){for(var n in this._)return!1;return!0}function m(){this._=Object.create(null)}function y(n){return n}function M(n,t,e){return function(){var r=e.apply(t,arguments);return r===t?n:r}}function x(n,t){if(t in n)return t;t=t.charAt(0).toUpperCase()+t.slice(1);for(var e=0,r=da.length;r>e;++e){var u=da[e]+t;if(u in n)return u}}function b(){}function _(){}function w(n){function t(){for(var t,r=e,u=-1,i=r.length;++u<i;)(t=r[u].on)&&t.apply(this,arguments);return n}var e=[],r=new l;return t.on=function(t,u){var i,o=r.get(t);return arguments.length<2?o&&o.on:(o&&(o.on=null,e=e.slice(0,i=e.indexOf(o)).concat(e.slice(i+1)),r.remove(t)),u&&e.push(r.set(t,{on:u})),n)},t}function S(){ta.event.preventDefault()}function k(){for(var n,t=ta.event;n=t.sourceEvent;)t=n;return t}function E(n){for(var t=new _,e=0,r=arguments.length;++e<r;)t[arguments[e]]=w(t);return t.of=function(e,r){return function(u){try{var i=u.sourceEvent=ta.event;u.target=n,ta.event=u,t[u.type].apply(e,r)}finally{ta.event=i}}},t}function A(n){return ya(n,_a),n}function N(n){return"function"==typeof n?n:function(){return Ma(n,this)}}function C(n){return"function"==typeof n?n:function(){return xa(n,this)}}function z(n,t){function e(){this.removeAttribute(n)}function r(){this.removeAttributeNS(n.space,n.local)}function u(){this.setAttribute(n,t)}function i(){this.setAttributeNS(n.space,n.local,t)}function o(){var e=t.apply(this,arguments);null==e?this.removeAttribute(n):this.setAttribute(n,e)}function a(){var e=t.apply(this,arguments);null==e?this.removeAttributeNS(n.space,n.local):this.setAttributeNS(n.space,n.local,e)}return n=ta.ns.qualify(n),null==t?n.local?r:e:"function"==typeof t?n.local?a:o:n.local?i:u}function q(n){return n.trim().replace(/\s+/g," ")}function L(n){return new RegExp("(?:^|\\s+)"+ta.requote(n)+"(?:\\s+|$)","g")}function T(n){return(n+"").trim().split(/^|\s+/)}function R(n,t){function e(){for(var e=-1;++e<u;)n[e](this,t)}function r(){for(var e=-1,r=t.apply(this,arguments);++e<u;)n[e](this,r)}n=T(n).map(D);var u=n.length;return"function"==typeof t?r:e}function D(n){var t=L(n);return function(e,r){if(u=e.classList)return r?u.add(n):u.remove(n);var u=e.getAttribute("class")||"";r?(t.lastIndex=0,t.test(u)||e.setAttribute("class",q(u+" "+n))):e.setAttribute("class",q(u.replace(t," ")))}}function P(n,t,e){function r(){this.style.removeProperty(n)}function u(){this.style.setProperty(n,t,e)}function i(){var r=t.apply(this,arguments);null==r?this.style.removeProperty(n):this.style.setProperty(n,r,e)}return null==t?r:"function"==typeof t?i:u}function U(n,t){function e(){delete this[n]}function r(){this[n]=t}function u(){var e=t.apply(this,arguments);null==e?delete this[n]:this[n]=e}return null==t?e:"function"==typeof t?u:r}function j(n){function t(){var t=this.ownerDocument,e=this.namespaceURI;return e?t.createElementNS(e,n):t.createElement(n)}function e(){return this.ownerDocument.createElementNS(n.space,n.local)}return"function"==typeof n?n:(n=ta.ns.qualify(n)).local?e:t}function F(){var n=this.parentNode;n&&n.removeChild(this)}function H(n){return{__data__:n}}function O(n){return function(){return ba(this,n)}}function I(n){return arguments.length||(n=e),function(t,e){return t&&e?n(t.__data__,e.__data__):!t-!e}}function Y(n,t){for(var e=0,r=n.length;r>e;e++)for(var u,i=n[e],o=0,a=i.length;a>o;o++)(u=i[o])&&t(u,o,e);return n}function Z(n){return ya(n,Sa),n}function V(n){var t,e;return function(r,u,i){var o,a=n[i].update,c=a.length;for(i!=e&&(e=i,t=0),u>=t&&(t=u+1);!(o=a[t])&&++t<c;);return o}}function X(n,t,e){function r(){var t=this[o];t&&(this.removeEventListener(n,t,t.$),delete this[o])}function u(){var u=c(t,ra(arguments));r.call(this),this.addEventListener(n,this[o]=u,u.$=e),u._=t}function i(){var t,e=new RegExp("^__on([^.]+)"+ta.requote(n)+"$");for(var r in this)if(t=r.match(e)){var u=this[r];this.removeEventListener(t[1],u,u.$),delete this[r]}}var o="__on"+n,a=n.indexOf("."),c=$;a>0&&(n=n.slice(0,a));var l=ka.get(n);return l&&(n=l,c=B),a?t?u:r:t?b:i}function $(n,t){return function(e){var r=ta.event;ta.event=e,t[0]=this.__data__;try{n.apply(this,t)}finally{ta.event=r}}}function B(n,t){var e=$(n,t);return function(n){var t=this,r=n.relatedTarget;r&&(r===t||8&r.compareDocumentPosition(t))||e.call(t,n)}}function W(e){var r=".dragsuppress-"+ ++Aa,u="click"+r,i=ta.select(t(e)).on("touchmove"+r,S).on("dragstart"+r,S).on("selectstart"+r,S);if(null==Ea&&(Ea="onselectstart"in e?!1:x(e.style,"userSelect")),Ea){var o=n(e).style,a=o[Ea];o[Ea]="none"}return function(n){if(i.on(r,null),Ea&&(o[Ea]=a),n){var t=function(){i.on(u,null)};i.on(u,function(){S(),t()},!0),setTimeout(t,0)}}}function J(n,e){e.changedTouches&&(e=e.changedTouches[0]);var r=n.ownerSVGElement||n;if(r.createSVGPoint){var u=r.createSVGPoint();if(0>Na){var i=t(n);if(i.scrollX||i.scrollY){r=ta.select("body").append("svg").style({position:"absolute",top:0,left:0,margin:0,padding:0,border:"none"},"important");var o=r[0][0].getScreenCTM();Na=!(o.f||o.e),r.remove()}}return Na?(u.x=e.pageX,u.y=e.pageY):(u.x=e.clientX,u.y=e.clientY),u=u.matrixTransform(n.getScreenCTM().inverse()),[u.x,u.y]}var a=n.getBoundingClientRect();return[e.clientX-a.left-n.clientLeft,e.clientY-a.top-n.clientTop]}function G(){return ta.event.changedTouches[0].identifier}function K(n){return n>0?1:0>n?-1:0}function Q(n,t,e){return(t[0]-n[0])*(e[1]-n[1])-(t[1]-n[1])*(e[0]-n[0])}function nt(n){return n>1?0:-1>n?qa:Math.acos(n)}function tt(n){return n>1?Ra:-1>n?-Ra:Math.asin(n)}function et(n){return((n=Math.exp(n))-1/n)/2}function rt(n){return((n=Math.exp(n))+1/n)/2}function ut(n){return((n=Math.exp(2*n))-1)/(n+1)}function it(n){return(n=Math.sin(n/2))*n}function ot(){}function at(n,t,e){return this instanceof at?(this.h=+n,this.s=+t,void(this.l=+e)):arguments.length<2?n instanceof at?new at(n.h,n.s,n.l):bt(""+n,_t,at):new at(n,t,e)}function ct(n,t,e){function r(n){return n>360?n-=360:0>n&&(n+=360),60>n?i+(o-i)*n/60:180>n?o:240>n?i+(o-i)*(240-n)/60:i}function u(n){return Math.round(255*r(n))}var i,o;return n=isNaN(n)?0:(n%=360)<0?n+360:n,t=isNaN(t)?0:0>t?0:t>1?1:t,e=0>e?0:e>1?1:e,o=.5>=e?e*(1+t):e+t-e*t,i=2*e-o,new mt(u(n+120),u(n),u(n-120))}function lt(n,t,e){return this instanceof lt?(this.h=+n,this.c=+t,void(this.l=+e)):arguments.length<2?n instanceof lt?new lt(n.h,n.c,n.l):n instanceof ft?gt(n.l,n.a,n.b):gt((n=wt((n=ta.rgb(n)).r,n.g,n.b)).l,n.a,n.b):new lt(n,t,e)}function st(n,t,e){return isNaN(n)&&(n=0),isNaN(t)&&(t=0),new ft(e,Math.cos(n*=Da)*t,Math.sin(n)*t)}function ft(n,t,e){return this instanceof ft?(this.l=+n,this.a=+t,void(this.b=+e)):arguments.length<2?n instanceof ft?new ft(n.l,n.a,n.b):n instanceof lt?st(n.h,n.c,n.l):wt((n=mt(n)).r,n.g,n.b):new ft(n,t,e)}function ht(n,t,e){var r=(n+16)/116,u=r+t/500,i=r-e/200;return u=pt(u)*Xa,r=pt(r)*$a,i=pt(i)*Ba,new mt(dt(3.2404542*u-1.5371385*r-.4985314*i),dt(-.969266*u+1.8760108*r+.041556*i),dt(.0556434*u-.2040259*r+1.0572252*i))}function gt(n,t,e){return n>0?new lt(Math.atan2(e,t)*Pa,Math.sqrt(t*t+e*e),n):new lt(0/0,0/0,n)}function pt(n){return n>.206893034?n*n*n:(n-4/29)/7.787037}function vt(n){return n>.008856?Math.pow(n,1/3):7.787037*n+4/29}function dt(n){return Math.round(255*(.00304>=n?12.92*n:1.055*Math.pow(n,1/2.4)-.055))}function mt(n,t,e){return this instanceof mt?(this.r=~~n,this.g=~~t,void(this.b=~~e)):arguments.length<2?n instanceof mt?new mt(n.r,n.g,n.b):bt(""+n,mt,ct):new mt(n,t,e)}function yt(n){return new mt(n>>16,n>>8&255,255&n)}function Mt(n){return yt(n)+""}function xt(n){return 16>n?"0"+Math.max(0,n).toString(16):Math.min(255,n).toString(16)}function bt(n,t,e){var r,u,i,o=0,a=0,c=0;if(r=/([a-z]+)\((.*)\)/i.exec(n))switch(u=r[2].split(","),r[1]){case"hsl":return e(parseFloat(u[0]),parseFloat(u[1])/100,parseFloat(u[2])/100);case"rgb":return t(kt(u[0]),kt(u[1]),kt(u[2]))}return(i=Ga.get(n.toLowerCase()))?t(i.r,i.g,i.b):(null==n||"#"!==n.charAt(0)||isNaN(i=parseInt(n.slice(1),16))||(4===n.length?(o=(3840&i)>>4,o=o>>4|o,a=240&i,a=a>>4|a,c=15&i,c=c<<4|c):7===n.length&&(o=(16711680&i)>>16,a=(65280&i)>>8,c=255&i)),t(o,a,c))}function _t(n,t,e){var r,u,i=Math.min(n/=255,t/=255,e/=255),o=Math.max(n,t,e),a=o-i,c=(o+i)/2;return a?(u=.5>c?a/(o+i):a/(2-o-i),r=n==o?(t-e)/a+(e>t?6:0):t==o?(e-n)/a+2:(n-t)/a+4,r*=60):(r=0/0,u=c>0&&1>c?0:r),new at(r,u,c)}function wt(n,t,e){n=St(n),t=St(t),e=St(e);var r=vt((.4124564*n+.3575761*t+.1804375*e)/Xa),u=vt((.2126729*n+.7151522*t+.072175*e)/$a),i=vt((.0193339*n+.119192*t+.9503041*e)/Ba);return ft(116*u-16,500*(r-u),200*(u-i))}function St(n){return(n/=255)<=.04045?n/12.92:Math.pow((n+.055)/1.055,2.4)}function kt(n){var t=parseFloat(n);return"%"===n.charAt(n.length-1)?Math.round(2.55*t):t}function Et(n){return"function"==typeof n?n:function(){return n}}function At(n){return function(t,e,r){return 2===arguments.length&&"function"==typeof e&&(r=e,e=null),Nt(t,e,n,r)}}function Nt(n,t,e,r){function u(){var n,t=c.status;if(!t&&zt(c)||t>=200&&300>t||304===t){try{n=e.call(i,c)}catch(r){return void o.error.call(i,r)}o.load.call(i,n)}else o.error.call(i,c)}var i={},o=ta.dispatch("beforesend","progress","load","error"),a={},c=new XMLHttpRequest,l=null;return!this.XDomainRequest||"withCredentials"in c||!/^(http(s)?:)?\/\//.test(n)||(c=new XDomainRequest),"onload"in c?c.onload=c.onerror=u:c.onreadystatechange=function(){c.readyState>3&&u()},c.onprogress=function(n){var t=ta.event;ta.event=n;try{o.progress.call(i,c)}finally{ta.event=t}},i.header=function(n,t){return n=(n+"").toLowerCase(),arguments.length<2?a[n]:(null==t?delete a[n]:a[n]=t+"",i)},i.mimeType=function(n){return arguments.length?(t=null==n?null:n+"",i):t},i.responseType=function(n){return arguments.length?(l=n,i):l},i.response=function(n){return e=n,i},["get","post"].forEach(function(n){i[n]=function(){return i.send.apply(i,[n].concat(ra(arguments)))}}),i.send=function(e,r,u){if(2===arguments.length&&"function"==typeof r&&(u=r,r=null),c.open(e,n,!0),null==t||"accept"in a||(a.accept=t+",*/*"),c.setRequestHeader)for(var s in a)c.setRequestHeader(s,a[s]);return null!=t&&c.overrideMimeType&&c.overrideMimeType(t),null!=l&&(c.responseType=l),null!=u&&i.on("error",u).on("load",function(n){u(null,n)}),o.beforesend.call(i,c),c.send(null==r?null:r),i},i.abort=function(){return c.abort(),i},ta.rebind(i,o,"on"),null==r?i:i.get(Ct(r))}function Ct(n){return 1===n.length?function(t,e){n(null==t?e:null)}:n}function zt(n){var t=n.responseType;return t&&"text"!==t?n.response:n.responseText}function qt(){var n=Lt(),t=Tt()-n;t>24?(isFinite(t)&&(clearTimeout(tc),tc=setTimeout(qt,t)),nc=0):(nc=1,rc(qt))}function Lt(){var n=Date.now();for(ec=Ka;ec;)n>=ec.t&&(ec.f=ec.c(n-ec.t)),ec=ec.n;return n}function Tt(){for(var n,t=Ka,e=1/0;t;)t.f?t=n?n.n=t.n:Ka=t.n:(t.t<e&&(e=t.t),t=(n=t).n);return Qa=n,e}function Rt(n,t){return t-(n?Math.ceil(Math.log(n)/Math.LN10):1)}function Dt(n,t){var e=Math.pow(10,3*ga(8-t));return{scale:t>8?function(n){return n/e}:function(n){return n*e},symbol:n}}function Pt(n){var t=n.decimal,e=n.thousands,r=n.grouping,u=n.currency,i=r&&e?function(n,t){for(var u=n.length,i=[],o=0,a=r[0],c=0;u>0&&a>0&&(c+a+1>t&&(a=Math.max(1,t-c)),i.push(n.substring(u-=a,u+a)),!((c+=a+1)>t));)a=r[o=(o+1)%r.length];return i.reverse().join(e)}:y;return function(n){var e=ic.exec(n),r=e[1]||" ",o=e[2]||">",a=e[3]||"-",c=e[4]||"",l=e[5],s=+e[6],f=e[7],h=e[8],g=e[9],p=1,v="",d="",m=!1,y=!0;switch(h&&(h=+h.substring(1)),(l||"0"===r&&"="===o)&&(l=r="0",o="="),g){case"n":f=!0,g="g";break;case"%":p=100,d="%",g="f";break;case"p":p=100,d="%",g="r";break;case"b":case"o":case"x":case"X":"#"===c&&(v="0"+g.toLowerCase());case"c":y=!1;case"d":m=!0,h=0;break;case"s":p=-1,g="r"}"$"===c&&(v=u[0],d=u[1]),"r"!=g||h||(g="g"),null!=h&&("g"==g?h=Math.max(1,Math.min(21,h)):("e"==g||"f"==g)&&(h=Math.max(0,Math.min(20,h)))),g=oc.get(g)||Ut;var M=l&&f;return function(n){var e=d;if(m&&n%1)return"";var u=0>n||0===n&&0>1/n?(n=-n,"-"):"-"===a?"":a;if(0>p){var c=ta.formatPrefix(n,h);n=c.scale(n),e=c.symbol+d}else n*=p;n=g(n,h);var x,b,_=n.lastIndexOf(".");if(0>_){var w=y?n.lastIndexOf("e"):-1;0>w?(x=n,b=""):(x=n.substring(0,w),b=n.substring(w))}else x=n.substring(0,_),b=t+n.substring(_+1);!l&&f&&(x=i(x,1/0));var S=v.length+x.length+b.length+(M?0:u.length),k=s>S?new Array(S=s-S+1).join(r):"";return M&&(x=i(k+x,k.length?s-b.length:1/0)),u+=v,n=x+b,("<"===o?u+n+k:">"===o?k+u+n:"^"===o?k.substring(0,S>>=1)+u+n+k.substring(S):u+(M?n:k+n))+e}}}function Ut(n){return n+""}function jt(){this._=new Date(arguments.length>1?Date.UTC.apply(this,arguments):arguments[0])}function Ft(n,t,e){function r(t){var e=n(t),r=i(e,1);return r-t>t-e?e:r}function u(e){return t(e=n(new cc(e-1)),1),e}function i(n,e){return t(n=new cc(+n),e),n}function o(n,r,i){var o=u(n),a=[];if(i>1)for(;r>o;)e(o)%i||a.push(new Date(+o)),t(o,1);else for(;r>o;)a.push(new Date(+o)),t(o,1);return a}function a(n,t,e){try{cc=jt;var r=new jt;return r._=n,o(r,t,e)}finally{cc=Date}}n.floor=n,n.round=r,n.ceil=u,n.offset=i,n.range=o;var c=n.utc=Ht(n);return c.floor=c,c.round=Ht(r),c.ceil=Ht(u),c.offset=Ht(i),c.range=a,n}function Ht(n){return function(t,e){try{cc=jt;var r=new jt;return r._=t,n(r,e)._}finally{cc=Date}}}function Ot(n){function t(n){function t(t){for(var e,u,i,o=[],a=-1,c=0;++a<r;)37===n.charCodeAt(a)&&(o.push(n.slice(c,a)),null!=(u=sc[e=n.charAt(++a)])&&(e=n.charAt(++a)),(i=N[e])&&(e=i(t,null==u?"e"===e?" ":"0":u)),o.push(e),c=a+1);return o.push(n.slice(c,a)),o.join("")}var r=n.length;return t.parse=function(t){var r={y:1900,m:0,d:1,H:0,M:0,S:0,L:0,Z:null},u=e(r,n,t,0);if(u!=t.length)return null;"p"in r&&(r.H=r.H%12+12*r.p);var i=null!=r.Z&&cc!==jt,o=new(i?jt:cc);return"j"in r?o.setFullYear(r.y,0,r.j):"w"in r&&("W"in r||"U"in r)?(o.setFullYear(r.y,0,1),o.setFullYear(r.y,0,"W"in r?(r.w+6)%7+7*r.W-(o.getDay()+5)%7:r.w+7*r.U-(o.getDay()+6)%7)):o.setFullYear(r.y,r.m,r.d),o.setHours(r.H+(r.Z/100|0),r.M+r.Z%100,r.S,r.L),i?o._:o},t.toString=function(){return n},t}function e(n,t,e,r){for(var u,i,o,a=0,c=t.length,l=e.length;c>a;){if(r>=l)return-1;if(u=t.charCodeAt(a++),37===u){if(o=t.charAt(a++),i=C[o in sc?t.charAt(a++):o],!i||(r=i(n,e,r))<0)return-1}else if(u!=e.charCodeAt(r++))return-1}return r}function r(n,t,e){_.lastIndex=0;var r=_.exec(t.slice(e));return r?(n.w=w.get(r[0].toLowerCase()),e+r[0].length):-1}function u(n,t,e){x.lastIndex=0;var r=x.exec(t.slice(e));return r?(n.w=b.get(r[0].toLowerCase()),e+r[0].length):-1}function i(n,t,e){E.lastIndex=0;var r=E.exec(t.slice(e));return r?(n.m=A.get(r[0].toLowerCase()),e+r[0].length):-1}function o(n,t,e){S.lastIndex=0;var r=S.exec(t.slice(e));return r?(n.m=k.get(r[0].toLowerCase()),e+r[0].length):-1}function a(n,t,r){return e(n,N.c.toString(),t,r)}function c(n,t,r){return e(n,N.x.toString(),t,r)}function l(n,t,r){return e(n,N.X.toString(),t,r)}function s(n,t,e){var r=M.get(t.slice(e,e+=2).toLowerCase());return null==r?-1:(n.p=r,e)}var f=n.dateTime,h=n.date,g=n.time,p=n.periods,v=n.days,d=n.shortDays,m=n.months,y=n.shortMonths;t.utc=function(n){function e(n){try{cc=jt;var t=new cc;return t._=n,r(t)}finally{cc=Date}}var r=t(n);return e.parse=function(n){try{cc=jt;var t=r.parse(n);return t&&t._}finally{cc=Date}},e.toString=r.toString,e},t.multi=t.utc.multi=ae;var M=ta.map(),x=Yt(v),b=Zt(v),_=Yt(d),w=Zt(d),S=Yt(m),k=Zt(m),E=Yt(y),A=Zt(y);p.forEach(function(n,t){M.set(n.toLowerCase(),t)});var N={a:function(n){return d[n.getDay()]},A:function(n){return v[n.getDay()]},b:function(n){return y[n.getMonth()]},B:function(n){return m[n.getMonth()]},c:t(f),d:function(n,t){return It(n.getDate(),t,2)},e:function(n,t){return It(n.getDate(),t,2)},H:function(n,t){return It(n.getHours(),t,2)},I:function(n,t){return It(n.getHours()%12||12,t,2)},j:function(n,t){return It(1+ac.dayOfYear(n),t,3)},L:function(n,t){return It(n.getMilliseconds(),t,3)},m:function(n,t){return It(n.getMonth()+1,t,2)},M:function(n,t){return It(n.getMinutes(),t,2)},p:function(n){return p[+(n.getHours()>=12)]},S:function(n,t){return It(n.getSeconds(),t,2)},U:function(n,t){return It(ac.sundayOfYear(n),t,2)},w:function(n){return n.getDay()},W:function(n,t){return It(ac.mondayOfYear(n),t,2)},x:t(h),X:t(g),y:function(n,t){return It(n.getFullYear()%100,t,2)},Y:function(n,t){return It(n.getFullYear()%1e4,t,4)},Z:ie,"%":function(){return"%"}},C={a:r,A:u,b:i,B:o,c:a,d:Qt,e:Qt,H:te,I:te,j:ne,L:ue,m:Kt,M:ee,p:s,S:re,U:Xt,w:Vt,W:$t,x:c,X:l,y:Wt,Y:Bt,Z:Jt,"%":oe};return t}function It(n,t,e){var r=0>n?"-":"",u=(r?-n:n)+"",i=u.length;return r+(e>i?new Array(e-i+1).join(t)+u:u)}function Yt(n){return new RegExp("^(?:"+n.map(ta.requote).join("|")+")","i")}function Zt(n){for(var t=new l,e=-1,r=n.length;++e<r;)t.set(n[e].toLowerCase(),e);return t}function Vt(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+1));return r?(n.w=+r[0],e+r[0].length):-1}function Xt(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e));return r?(n.U=+r[0],e+r[0].length):-1}function $t(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e));return r?(n.W=+r[0],e+r[0].length):-1}function Bt(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+4));return r?(n.y=+r[0],e+r[0].length):-1}function Wt(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+2));return r?(n.y=Gt(+r[0]),e+r[0].length):-1}function Jt(n,t,e){return/^[+-]\d{4}$/.test(t=t.slice(e,e+5))?(n.Z=-t,e+5):-1}function Gt(n){return n+(n>68?1900:2e3)}function Kt(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+2));return r?(n.m=r[0]-1,e+r[0].length):-1}function Qt(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+2));return r?(n.d=+r[0],e+r[0].length):-1}function ne(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+3));return r?(n.j=+r[0],e+r[0].length):-1}function te(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+2));return r?(n.H=+r[0],e+r[0].length):-1}function ee(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+2));return r?(n.M=+r[0],e+r[0].length):-1}function re(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+2));return r?(n.S=+r[0],e+r[0].length):-1}function ue(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+3));return r?(n.L=+r[0],e+r[0].length):-1}function ie(n){var t=n.getTimezoneOffset(),e=t>0?"-":"+",r=ga(t)/60|0,u=ga(t)%60;return e+It(r,"0",2)+It(u,"0",2)}function oe(n,t,e){hc.lastIndex=0;var r=hc.exec(t.slice(e,e+1));return r?e+r[0].length:-1}function ae(n){for(var t=n.length,e=-1;++e<t;)n[e][0]=this(n[e][0]);return function(t){for(var e=0,r=n[e];!r[1](t);)r=n[++e];return r[0](t)}}function ce(){}function le(n,t,e){var r=e.s=n+t,u=r-n,i=r-u;e.t=n-i+(t-u)}function se(n,t){n&&dc.hasOwnProperty(n.type)&&dc[n.type](n,t)}function fe(n,t,e){var r,u=-1,i=n.length-e;for(t.lineStart();++u<i;)r=n[u],t.point(r[0],r[1],r[2]);t.lineEnd()}function he(n,t){var e=-1,r=n.length;for(t.polygonStart();++e<r;)fe(n[e],t,1);t.polygonEnd()}function ge(){function n(n,t){n*=Da,t=t*Da/2+qa/4;var e=n-r,o=e>=0?1:-1,a=o*e,c=Math.cos(t),l=Math.sin(t),s=i*l,f=u*c+s*Math.cos(a),h=s*o*Math.sin(a);yc.add(Math.atan2(h,f)),r=n,u=c,i=l}var t,e,r,u,i;Mc.point=function(o,a){Mc.point=n,r=(t=o)*Da,u=Math.cos(a=(e=a)*Da/2+qa/4),i=Math.sin(a)},Mc.lineEnd=function(){n(t,e)}}function pe(n){var t=n[0],e=n[1],r=Math.cos(e);return[r*Math.cos(t),r*Math.sin(t),Math.sin(e)]}function ve(n,t){return n[0]*t[0]+n[1]*t[1]+n[2]*t[2]}function de(n,t){return[n[1]*t[2]-n[2]*t[1],n[2]*t[0]-n[0]*t[2],n[0]*t[1]-n[1]*t[0]]}function me(n,t){n[0]+=t[0],n[1]+=t[1],n[2]+=t[2]}function ye(n,t){return[n[0]*t,n[1]*t,n[2]*t]}function Me(n){var t=Math.sqrt(n[0]*n[0]+n[1]*n[1]+n[2]*n[2]);n[0]/=t,n[1]/=t,n[2]/=t}function xe(n){return[Math.atan2(n[1],n[0]),tt(n[2])]}function be(n,t){return ga(n[0]-t[0])<Ca&&ga(n[1]-t[1])<Ca}function _e(n,t){n*=Da;var e=Math.cos(t*=Da);we(e*Math.cos(n),e*Math.sin(n),Math.sin(t))}function we(n,t,e){++xc,_c+=(n-_c)/xc,wc+=(t-wc)/xc,Sc+=(e-Sc)/xc}function Se(){function n(n,u){n*=Da;var i=Math.cos(u*=Da),o=i*Math.cos(n),a=i*Math.sin(n),c=Math.sin(u),l=Math.atan2(Math.sqrt((l=e*c-r*a)*l+(l=r*o-t*c)*l+(l=t*a-e*o)*l),t*o+e*a+r*c);bc+=l,kc+=l*(t+(t=o)),Ec+=l*(e+(e=a)),Ac+=l*(r+(r=c)),we(t,e,r)}var t,e,r;qc.point=function(u,i){u*=Da;var o=Math.cos(i*=Da);t=o*Math.cos(u),e=o*Math.sin(u),r=Math.sin(i),qc.point=n,we(t,e,r)}}function ke(){qc.point=_e}function Ee(){function n(n,t){n*=Da;var e=Math.cos(t*=Da),o=e*Math.cos(n),a=e*Math.sin(n),c=Math.sin(t),l=u*c-i*a,s=i*o-r*c,f=r*a-u*o,h=Math.sqrt(l*l+s*s+f*f),g=r*o+u*a+i*c,p=h&&-nt(g)/h,v=Math.atan2(h,g);Nc+=p*l,Cc+=p*s,zc+=p*f,bc+=v,kc+=v*(r+(r=o)),Ec+=v*(u+(u=a)),Ac+=v*(i+(i=c)),we(r,u,i)}var t,e,r,u,i;qc.point=function(o,a){t=o,e=a,qc.point=n,o*=Da;var c=Math.cos(a*=Da);r=c*Math.cos(o),u=c*Math.sin(o),i=Math.sin(a),we(r,u,i)},qc.lineEnd=function(){n(t,e),qc.lineEnd=ke,qc.point=_e}}function Ae(n,t){function e(e,r){return e=n(e,r),t(e[0],e[1])}return n.invert&&t.invert&&(e.invert=function(e,r){return e=t.invert(e,r),e&&n.invert(e[0],e[1])}),e}function Ne(){return!0}function Ce(n,t,e,r,u){var i=[],o=[];if(n.forEach(function(n){if(!((t=n.length-1)<=0)){var t,e=n[0],r=n[t];if(be(e,r)){u.lineStart();for(var a=0;t>a;++a)u.point((e=n[a])[0],e[1]);return void u.lineEnd()}var c=new qe(e,n,null,!0),l=new qe(e,null,c,!1);c.o=l,i.push(c),o.push(l),c=new qe(r,n,null,!1),l=new qe(r,null,c,!0),c.o=l,i.push(c),o.push(l)}}),o.sort(t),ze(i),ze(o),i.length){for(var a=0,c=e,l=o.length;l>a;++a)o[a].e=c=!c;for(var s,f,h=i[0];;){for(var g=h,p=!0;g.v;)if((g=g.n)===h)return;s=g.z,u.lineStart();do{if(g.v=g.o.v=!0,g.e){if(p)for(var a=0,l=s.length;l>a;++a)u.point((f=s[a])[0],f[1]);else r(g.x,g.n.x,1,u);g=g.n}else{if(p){s=g.p.z;for(var a=s.length-1;a>=0;--a)u.point((f=s[a])[0],f[1])}else r(g.x,g.p.x,-1,u);g=g.p}g=g.o,s=g.z,p=!p}while(!g.v);u.lineEnd()}}}function ze(n){if(t=n.length){for(var t,e,r=0,u=n[0];++r<t;)u.n=e=n[r],e.p=u,u=e;u.n=e=n[0],e.p=u}}function qe(n,t,e,r){this.x=n,this.z=t,this.o=e,this.e=r,this.v=!1,this.n=this.p=null}function Le(n,t,e,r){return function(u,i){function o(t,e){var r=u(t,e);n(t=r[0],e=r[1])&&i.point(t,e)}function a(n,t){var e=u(n,t);d.point(e[0],e[1])}function c(){y.point=a,d.lineStart()}function l(){y.point=o,d.lineEnd()}function s(n,t){v.push([n,t]);var e=u(n,t);x.point(e[0],e[1])}function f(){x.lineStart(),v=[]}function h(){s(v[0][0],v[0][1]),x.lineEnd();var n,t=x.clean(),e=M.buffer(),r=e.length;if(v.pop(),p.push(v),v=null,r)if(1&t){n=e[0];var u,r=n.length-1,o=-1;if(r>0){for(b||(i.polygonStart(),b=!0),i.lineStart();++o<r;)i.point((u=n[o])[0],u[1]);i.lineEnd()}}else r>1&&2&t&&e.push(e.pop().concat(e.shift())),g.push(e.filter(Te))}var g,p,v,d=t(i),m=u.invert(r[0],r[1]),y={point:o,lineStart:c,lineEnd:l,polygonStart:function(){y.point=s,y.lineStart=f,y.lineEnd=h,g=[],p=[]},polygonEnd:function(){y.point=o,y.lineStart=c,y.lineEnd=l,g=ta.merge(g);var n=Fe(m,p);g.length?(b||(i.polygonStart(),b=!0),Ce(g,De,n,e,i)):n&&(b||(i.polygonStart(),b=!0),i.lineStart(),e(null,null,1,i),i.lineEnd()),b&&(i.polygonEnd(),b=!1),g=p=null},sphere:function(){i.polygonStart(),i.lineStart(),e(null,null,1,i),i.lineEnd(),i.polygonEnd()}},M=Re(),x=t(M),b=!1;return y}}function Te(n){return n.length>1}function Re(){var n,t=[];return{lineStart:function(){t.push(n=[])},point:function(t,e){n.push([t,e])},lineEnd:b,buffer:function(){var e=t;return t=[],n=null,e},rejoin:function(){t.length>1&&t.push(t.pop().concat(t.shift()))}}}function De(n,t){return((n=n.x)[0]<0?n[1]-Ra-Ca:Ra-n[1])-((t=t.x)[0]<0?t[1]-Ra-Ca:Ra-t[1])}function Pe(n){var t,e=0/0,r=0/0,u=0/0;return{lineStart:function(){n.lineStart(),t=1},point:function(i,o){var a=i>0?qa:-qa,c=ga(i-e);ga(c-qa)<Ca?(n.point(e,r=(r+o)/2>0?Ra:-Ra),n.point(u,r),n.lineEnd(),n.lineStart(),n.point(a,r),n.point(i,r),t=0):u!==a&&c>=qa&&(ga(e-u)<Ca&&(e-=u*Ca),ga(i-a)<Ca&&(i-=a*Ca),r=Ue(e,r,i,o),n.point(u,r),n.lineEnd(),n.lineStart(),n.point(a,r),t=0),n.point(e=i,r=o),u=a},lineEnd:function(){n.lineEnd(),e=r=0/0},clean:function(){return 2-t}}}function Ue(n,t,e,r){var u,i,o=Math.sin(n-e);return ga(o)>Ca?Math.atan((Math.sin(t)*(i=Math.cos(r))*Math.sin(e)-Math.sin(r)*(u=Math.cos(t))*Math.sin(n))/(u*i*o)):(t+r)/2}function je(n,t,e,r){var u;if(null==n)u=e*Ra,r.point(-qa,u),r.point(0,u),r.point(qa,u),r.point(qa,0),r.point(qa,-u),r.point(0,-u),r.point(-qa,-u),r.point(-qa,0),r.point(-qa,u);else if(ga(n[0]-t[0])>Ca){var i=n[0]<t[0]?qa:-qa;u=e*i/2,r.point(-i,u),r.point(0,u),r.point(i,u)}else r.point(t[0],t[1])}function Fe(n,t){var e=n[0],r=n[1],u=[Math.sin(e),-Math.cos(e),0],i=0,o=0;yc.reset();for(var a=0,c=t.length;c>a;++a){var l=t[a],s=l.length;if(s)for(var f=l[0],h=f[0],g=f[1]/2+qa/4,p=Math.sin(g),v=Math.cos(g),d=1;;){d===s&&(d=0),n=l[d];var m=n[0],y=n[1]/2+qa/4,M=Math.sin(y),x=Math.cos(y),b=m-h,_=b>=0?1:-1,w=_*b,S=w>qa,k=p*M;if(yc.add(Math.atan2(k*_*Math.sin(w),v*x+k*Math.cos(w))),i+=S?b+_*La:b,S^h>=e^m>=e){var E=de(pe(f),pe(n));Me(E);var A=de(u,E);Me(A);var N=(S^b>=0?-1:1)*tt(A[2]);(r>N||r===N&&(E[0]||E[1]))&&(o+=S^b>=0?1:-1)}if(!d++)break;h=m,p=M,v=x,f=n}}return(-Ca>i||Ca>i&&0>yc)^1&o}function He(n){function t(n,t){return Math.cos(n)*Math.cos(t)>i}function e(n){var e,i,c,l,s;return{lineStart:function(){l=c=!1,s=1},point:function(f,h){var g,p=[f,h],v=t(f,h),d=o?v?0:u(f,h):v?u(f+(0>f?qa:-qa),h):0;if(!e&&(l=c=v)&&n.lineStart(),v!==c&&(g=r(e,p),(be(e,g)||be(p,g))&&(p[0]+=Ca,p[1]+=Ca,v=t(p[0],p[1]))),v!==c)s=0,v?(n.lineStart(),g=r(p,e),n.point(g[0],g[1])):(g=r(e,p),n.point(g[0],g[1]),n.lineEnd()),e=g;else if(a&&e&&o^v){var m;d&i||!(m=r(p,e,!0))||(s=0,o?(n.lineStart(),n.point(m[0][0],m[0][1]),n.point(m[1][0],m[1][1]),n.lineEnd()):(n.point(m[1][0],m[1][1]),n.lineEnd(),n.lineStart(),n.point(m[0][0],m[0][1])))}!v||e&&be(e,p)||n.point(p[0],p[1]),e=p,c=v,i=d},lineEnd:function(){c&&n.lineEnd(),e=null},clean:function(){return s|(l&&c)<<1}}}function r(n,t,e){var r=pe(n),u=pe(t),o=[1,0,0],a=de(r,u),c=ve(a,a),l=a[0],s=c-l*l;if(!s)return!e&&n;var f=i*c/s,h=-i*l/s,g=de(o,a),p=ye(o,f),v=ye(a,h);me(p,v);var d=g,m=ve(p,d),y=ve(d,d),M=m*m-y*(ve(p,p)-1);if(!(0>M)){var x=Math.sqrt(M),b=ye(d,(-m-x)/y);if(me(b,p),b=xe(b),!e)return b;var _,w=n[0],S=t[0],k=n[1],E=t[1];w>S&&(_=w,w=S,S=_);var A=S-w,N=ga(A-qa)<Ca,C=N||Ca>A;if(!N&&k>E&&(_=k,k=E,E=_),C?N?k+E>0^b[1]<(ga(b[0]-w)<Ca?k:E):k<=b[1]&&b[1]<=E:A>qa^(w<=b[0]&&b[0]<=S)){var z=ye(d,(-m+x)/y);return me(z,p),[b,xe(z)]}}}function u(t,e){var r=o?n:qa-n,u=0;return-r>t?u|=1:t>r&&(u|=2),-r>e?u|=4:e>r&&(u|=8),u}var i=Math.cos(n),o=i>0,a=ga(i)>Ca,c=gr(n,6*Da);return Le(t,e,c,o?[0,-n]:[-qa,n-qa])}function Oe(n,t,e,r){return function(u){var i,o=u.a,a=u.b,c=o.x,l=o.y,s=a.x,f=a.y,h=0,g=1,p=s-c,v=f-l;if(i=n-c,p||!(i>0)){if(i/=p,0>p){if(h>i)return;g>i&&(g=i)}else if(p>0){if(i>g)return;i>h&&(h=i)}if(i=e-c,p||!(0>i)){if(i/=p,0>p){if(i>g)return;i>h&&(h=i)}else if(p>0){if(h>i)return;g>i&&(g=i)}if(i=t-l,v||!(i>0)){if(i/=v,0>v){if(h>i)return;g>i&&(g=i)}else if(v>0){if(i>g)return;i>h&&(h=i)}if(i=r-l,v||!(0>i)){if(i/=v,0>v){if(i>g)return;i>h&&(h=i)}else if(v>0){if(h>i)return;g>i&&(g=i)}return h>0&&(u.a={x:c+h*p,y:l+h*v}),1>g&&(u.b={x:c+g*p,y:l+g*v}),u}}}}}}function Ie(n,t,e,r){function u(r,u){return ga(r[0]-n)<Ca?u>0?0:3:ga(r[0]-e)<Ca?u>0?2:1:ga(r[1]-t)<Ca?u>0?1:0:u>0?3:2}function i(n,t){return o(n.x,t.x)}function o(n,t){var e=u(n,1),r=u(t,1);return e!==r?e-r:0===e?t[1]-n[1]:1===e?n[0]-t[0]:2===e?n[1]-t[1]:t[0]-n[0]}return function(a){function c(n){for(var t=0,e=d.length,r=n[1],u=0;e>u;++u)for(var i,o=1,a=d[u],c=a.length,l=a[0];c>o;++o)i=a[o],l[1]<=r?i[1]>r&&Q(l,i,n)>0&&++t:i[1]<=r&&Q(l,i,n)<0&&--t,l=i;return 0!==t}function l(i,a,c,l){var s=0,f=0;if(null==i||(s=u(i,c))!==(f=u(a,c))||o(i,a)<0^c>0){do l.point(0===s||3===s?n:e,s>1?r:t);while((s=(s+c+4)%4)!==f)}else l.point(a[0],a[1])}function s(u,i){return u>=n&&e>=u&&i>=t&&r>=i}function f(n,t){s(n,t)&&a.point(n,t)}function h(){C.point=p,d&&d.push(m=[]),S=!0,w=!1,b=_=0/0}function g(){v&&(p(y,M),x&&w&&A.rejoin(),v.push(A.buffer())),C.point=f,w&&a.lineEnd()}function p(n,t){n=Math.max(-Tc,Math.min(Tc,n)),t=Math.max(-Tc,Math.min(Tc,t));var e=s(n,t);if(d&&m.push([n,t]),S)y=n,M=t,x=e,S=!1,e&&(a.lineStart(),a.point(n,t));else if(e&&w)a.point(n,t);else{var r={a:{x:b,y:_},b:{x:n,y:t}};N(r)?(w||(a.lineStart(),a.point(r.a.x,r.a.y)),a.point(r.b.x,r.b.y),e||a.lineEnd(),k=!1):e&&(a.lineStart(),a.point(n,t),k=!1)}b=n,_=t,w=e}var v,d,m,y,M,x,b,_,w,S,k,E=a,A=Re(),N=Oe(n,t,e,r),C={point:f,lineStart:h,lineEnd:g,polygonStart:function(){a=A,v=[],d=[],k=!0},polygonEnd:function(){a=E,v=ta.merge(v);var t=c([n,r]),e=k&&t,u=v.length;(e||u)&&(a.polygonStart(),e&&(a.lineStart(),l(null,null,1,a),a.lineEnd()),u&&Ce(v,i,t,l,a),a.polygonEnd()),v=d=m=null}};return C}}function Ye(n){var t=0,e=qa/3,r=ir(n),u=r(t,e);return u.parallels=function(n){return arguments.length?r(t=n[0]*qa/180,e=n[1]*qa/180):[t/qa*180,e/qa*180]},u}function Ze(n,t){function e(n,t){var e=Math.sqrt(i-2*u*Math.sin(t))/u;return[e*Math.sin(n*=u),o-e*Math.cos(n)]}var r=Math.sin(n),u=(r+Math.sin(t))/2,i=1+r*(2*u-r),o=Math.sqrt(i)/u;return e.invert=function(n,t){var e=o-t;return[Math.atan2(n,e)/u,tt((i-(n*n+e*e)*u*u)/(2*u))]},e}function Ve(){function n(n,t){Dc+=u*n-r*t,r=n,u=t}var t,e,r,u;Hc.point=function(i,o){Hc.point=n,t=r=i,e=u=o},Hc.lineEnd=function(){n(t,e)}}function Xe(n,t){Pc>n&&(Pc=n),n>jc&&(jc=n),Uc>t&&(Uc=t),t>Fc&&(Fc=t)}function $e(){function n(n,t){o.push("M",n,",",t,i)}function t(n,t){o.push("M",n,",",t),a.point=e}function e(n,t){o.push("L",n,",",t)}function r(){a.point=n}function u(){o.push("Z")}var i=Be(4.5),o=[],a={point:n,lineStart:function(){a.point=t},lineEnd:r,polygonStart:function(){a.lineEnd=u},polygonEnd:function(){a.lineEnd=r,a.point=n},pointRadius:function(n){return i=Be(n),a},result:function(){if(o.length){var n=o.join("");return o=[],n}}};return a}function Be(n){return"m0,"+n+"a"+n+","+n+" 0 1,1 0,"+-2*n+"a"+n+","+n+" 0 1,1 0,"+2*n+"z"}function We(n,t){_c+=n,wc+=t,++Sc}function Je(){function n(n,r){var u=n-t,i=r-e,o=Math.sqrt(u*u+i*i);kc+=o*(t+n)/2,Ec+=o*(e+r)/2,Ac+=o,We(t=n,e=r)}var t,e;Ic.point=function(r,u){Ic.point=n,We(t=r,e=u)}}function Ge(){Ic.point=We}function Ke(){function n(n,t){var e=n-r,i=t-u,o=Math.sqrt(e*e+i*i);kc+=o*(r+n)/2,Ec+=o*(u+t)/2,Ac+=o,o=u*n-r*t,Nc+=o*(r+n),Cc+=o*(u+t),zc+=3*o,We(r=n,u=t)}var t,e,r,u;Ic.point=function(i,o){Ic.point=n,We(t=r=i,e=u=o)},Ic.lineEnd=function(){n(t,e)}}function Qe(n){function t(t,e){n.moveTo(t+o,e),n.arc(t,e,o,0,La)}function e(t,e){n.moveTo(t,e),a.point=r}function r(t,e){n.lineTo(t,e)}function u(){a.point=t}function i(){n.closePath()}var o=4.5,a={point:t,lineStart:function(){a.point=e},lineEnd:u,polygonStart:function(){a.lineEnd=i},polygonEnd:function(){a.lineEnd=u,a.point=t},pointRadius:function(n){return o=n,a},result:b};return a}function nr(n){function t(n){return(a?r:e)(n)}function e(t){return rr(t,function(e,r){e=n(e,r),t.point(e[0],e[1])})}function r(t){function e(e,r){e=n(e,r),t.point(e[0],e[1])}function r(){M=0/0,S.point=i,t.lineStart()}function i(e,r){var i=pe([e,r]),o=n(e,r);u(M,x,y,b,_,w,M=o[0],x=o[1],y=e,b=i[0],_=i[1],w=i[2],a,t),t.point(M,x)}function o(){S.point=e,t.lineEnd()}function c(){r(),S.point=l,S.lineEnd=s}function l(n,t){i(f=n,h=t),g=M,p=x,v=b,d=_,m=w,S.point=i}function s(){u(M,x,y,b,_,w,g,p,f,v,d,m,a,t),S.lineEnd=o,o()}var f,h,g,p,v,d,m,y,M,x,b,_,w,S={point:e,lineStart:r,lineEnd:o,polygonStart:function(){t.polygonStart(),S.lineStart=c
+},polygonEnd:function(){t.polygonEnd(),S.lineStart=r}};return S}function u(t,e,r,a,c,l,s,f,h,g,p,v,d,m){var y=s-t,M=f-e,x=y*y+M*M;if(x>4*i&&d--){var b=a+g,_=c+p,w=l+v,S=Math.sqrt(b*b+_*_+w*w),k=Math.asin(w/=S),E=ga(ga(w)-1)<Ca||ga(r-h)<Ca?(r+h)/2:Math.atan2(_,b),A=n(E,k),N=A[0],C=A[1],z=N-t,q=C-e,L=M*z-y*q;(L*L/x>i||ga((y*z+M*q)/x-.5)>.3||o>a*g+c*p+l*v)&&(u(t,e,r,a,c,l,N,C,E,b/=S,_/=S,w,d,m),m.point(N,C),u(N,C,E,b,_,w,s,f,h,g,p,v,d,m))}}var i=.5,o=Math.cos(30*Da),a=16;return t.precision=function(n){return arguments.length?(a=(i=n*n)>0&&16,t):Math.sqrt(i)},t}function tr(n){var t=nr(function(t,e){return n([t*Pa,e*Pa])});return function(n){return or(t(n))}}function er(n){this.stream=n}function rr(n,t){return{point:t,sphere:function(){n.sphere()},lineStart:function(){n.lineStart()},lineEnd:function(){n.lineEnd()},polygonStart:function(){n.polygonStart()},polygonEnd:function(){n.polygonEnd()}}}function ur(n){return ir(function(){return n})()}function ir(n){function t(n){return n=a(n[0]*Da,n[1]*Da),[n[0]*h+c,l-n[1]*h]}function e(n){return n=a.invert((n[0]-c)/h,(l-n[1])/h),n&&[n[0]*Pa,n[1]*Pa]}function r(){a=Ae(o=lr(m,M,x),i);var n=i(v,d);return c=g-n[0]*h,l=p+n[1]*h,u()}function u(){return s&&(s.valid=!1,s=null),t}var i,o,a,c,l,s,f=nr(function(n,t){return n=i(n,t),[n[0]*h+c,l-n[1]*h]}),h=150,g=480,p=250,v=0,d=0,m=0,M=0,x=0,b=Lc,_=y,w=null,S=null;return t.stream=function(n){return s&&(s.valid=!1),s=or(b(o,f(_(n)))),s.valid=!0,s},t.clipAngle=function(n){return arguments.length?(b=null==n?(w=n,Lc):He((w=+n)*Da),u()):w},t.clipExtent=function(n){return arguments.length?(S=n,_=n?Ie(n[0][0],n[0][1],n[1][0],n[1][1]):y,u()):S},t.scale=function(n){return arguments.length?(h=+n,r()):h},t.translate=function(n){return arguments.length?(g=+n[0],p=+n[1],r()):[g,p]},t.center=function(n){return arguments.length?(v=n[0]%360*Da,d=n[1]%360*Da,r()):[v*Pa,d*Pa]},t.rotate=function(n){return arguments.length?(m=n[0]%360*Da,M=n[1]%360*Da,x=n.length>2?n[2]%360*Da:0,r()):[m*Pa,M*Pa,x*Pa]},ta.rebind(t,f,"precision"),function(){return i=n.apply(this,arguments),t.invert=i.invert&&e,r()}}function or(n){return rr(n,function(t,e){n.point(t*Da,e*Da)})}function ar(n,t){return[n,t]}function cr(n,t){return[n>qa?n-La:-qa>n?n+La:n,t]}function lr(n,t,e){return n?t||e?Ae(fr(n),hr(t,e)):fr(n):t||e?hr(t,e):cr}function sr(n){return function(t,e){return t+=n,[t>qa?t-La:-qa>t?t+La:t,e]}}function fr(n){var t=sr(n);return t.invert=sr(-n),t}function hr(n,t){function e(n,t){var e=Math.cos(t),a=Math.cos(n)*e,c=Math.sin(n)*e,l=Math.sin(t),s=l*r+a*u;return[Math.atan2(c*i-s*o,a*r-l*u),tt(s*i+c*o)]}var r=Math.cos(n),u=Math.sin(n),i=Math.cos(t),o=Math.sin(t);return e.invert=function(n,t){var e=Math.cos(t),a=Math.cos(n)*e,c=Math.sin(n)*e,l=Math.sin(t),s=l*i-c*o;return[Math.atan2(c*i+l*o,a*r+s*u),tt(s*r-a*u)]},e}function gr(n,t){var e=Math.cos(n),r=Math.sin(n);return function(u,i,o,a){var c=o*t;null!=u?(u=pr(e,u),i=pr(e,i),(o>0?i>u:u>i)&&(u+=o*La)):(u=n+o*La,i=n-.5*c);for(var l,s=u;o>0?s>i:i>s;s-=c)a.point((l=xe([e,-r*Math.cos(s),-r*Math.sin(s)]))[0],l[1])}}function pr(n,t){var e=pe(t);e[0]-=n,Me(e);var r=nt(-e[1]);return((-e[2]<0?-r:r)+2*Math.PI-Ca)%(2*Math.PI)}function vr(n,t,e){var r=ta.range(n,t-Ca,e).concat(t);return function(n){return r.map(function(t){return[n,t]})}}function dr(n,t,e){var r=ta.range(n,t-Ca,e).concat(t);return function(n){return r.map(function(t){return[t,n]})}}function mr(n){return n.source}function yr(n){return n.target}function Mr(n,t,e,r){var u=Math.cos(t),i=Math.sin(t),o=Math.cos(r),a=Math.sin(r),c=u*Math.cos(n),l=u*Math.sin(n),s=o*Math.cos(e),f=o*Math.sin(e),h=2*Math.asin(Math.sqrt(it(r-t)+u*o*it(e-n))),g=1/Math.sin(h),p=h?function(n){var t=Math.sin(n*=h)*g,e=Math.sin(h-n)*g,r=e*c+t*s,u=e*l+t*f,o=e*i+t*a;return[Math.atan2(u,r)*Pa,Math.atan2(o,Math.sqrt(r*r+u*u))*Pa]}:function(){return[n*Pa,t*Pa]};return p.distance=h,p}function xr(){function n(n,u){var i=Math.sin(u*=Da),o=Math.cos(u),a=ga((n*=Da)-t),c=Math.cos(a);Yc+=Math.atan2(Math.sqrt((a=o*Math.sin(a))*a+(a=r*i-e*o*c)*a),e*i+r*o*c),t=n,e=i,r=o}var t,e,r;Zc.point=function(u,i){t=u*Da,e=Math.sin(i*=Da),r=Math.cos(i),Zc.point=n},Zc.lineEnd=function(){Zc.point=Zc.lineEnd=b}}function br(n,t){function e(t,e){var r=Math.cos(t),u=Math.cos(e),i=n(r*u);return[i*u*Math.sin(t),i*Math.sin(e)]}return e.invert=function(n,e){var r=Math.sqrt(n*n+e*e),u=t(r),i=Math.sin(u),o=Math.cos(u);return[Math.atan2(n*i,r*o),Math.asin(r&&e*i/r)]},e}function _r(n,t){function e(n,t){o>0?-Ra+Ca>t&&(t=-Ra+Ca):t>Ra-Ca&&(t=Ra-Ca);var e=o/Math.pow(u(t),i);return[e*Math.sin(i*n),o-e*Math.cos(i*n)]}var r=Math.cos(n),u=function(n){return Math.tan(qa/4+n/2)},i=n===t?Math.sin(n):Math.log(r/Math.cos(t))/Math.log(u(t)/u(n)),o=r*Math.pow(u(n),i)/i;return i?(e.invert=function(n,t){var e=o-t,r=K(i)*Math.sqrt(n*n+e*e);return[Math.atan2(n,e)/i,2*Math.atan(Math.pow(o/r,1/i))-Ra]},e):Sr}function wr(n,t){function e(n,t){var e=i-t;return[e*Math.sin(u*n),i-e*Math.cos(u*n)]}var r=Math.cos(n),u=n===t?Math.sin(n):(r-Math.cos(t))/(t-n),i=r/u+n;return ga(u)<Ca?ar:(e.invert=function(n,t){var e=i-t;return[Math.atan2(n,e)/u,i-K(u)*Math.sqrt(n*n+e*e)]},e)}function Sr(n,t){return[n,Math.log(Math.tan(qa/4+t/2))]}function kr(n){var t,e=ur(n),r=e.scale,u=e.translate,i=e.clipExtent;return e.scale=function(){var n=r.apply(e,arguments);return n===e?t?e.clipExtent(null):e:n},e.translate=function(){var n=u.apply(e,arguments);return n===e?t?e.clipExtent(null):e:n},e.clipExtent=function(n){var o=i.apply(e,arguments);if(o===e){if(t=null==n){var a=qa*r(),c=u();i([[c[0]-a,c[1]-a],[c[0]+a,c[1]+a]])}}else t&&(o=null);return o},e.clipExtent(null)}function Er(n,t){return[Math.log(Math.tan(qa/4+t/2)),-n]}function Ar(n){return n[0]}function Nr(n){return n[1]}function Cr(n){for(var t=n.length,e=[0,1],r=2,u=2;t>u;u++){for(;r>1&&Q(n[e[r-2]],n[e[r-1]],n[u])<=0;)--r;e[r++]=u}return e.slice(0,r)}function zr(n,t){return n[0]-t[0]||n[1]-t[1]}function qr(n,t,e){return(e[0]-t[0])*(n[1]-t[1])<(e[1]-t[1])*(n[0]-t[0])}function Lr(n,t,e,r){var u=n[0],i=e[0],o=t[0]-u,a=r[0]-i,c=n[1],l=e[1],s=t[1]-c,f=r[1]-l,h=(a*(c-l)-f*(u-i))/(f*o-a*s);return[u+h*o,c+h*s]}function Tr(n){var t=n[0],e=n[n.length-1];return!(t[0]-e[0]||t[1]-e[1])}function Rr(){tu(this),this.edge=this.site=this.circle=null}function Dr(n){var t=el.pop()||new Rr;return t.site=n,t}function Pr(n){Xr(n),Qc.remove(n),el.push(n),tu(n)}function Ur(n){var t=n.circle,e=t.x,r=t.cy,u={x:e,y:r},i=n.P,o=n.N,a=[n];Pr(n);for(var c=i;c.circle&&ga(e-c.circle.x)<Ca&&ga(r-c.circle.cy)<Ca;)i=c.P,a.unshift(c),Pr(c),c=i;a.unshift(c),Xr(c);for(var l=o;l.circle&&ga(e-l.circle.x)<Ca&&ga(r-l.circle.cy)<Ca;)o=l.N,a.push(l),Pr(l),l=o;a.push(l),Xr(l);var s,f=a.length;for(s=1;f>s;++s)l=a[s],c=a[s-1],Kr(l.edge,c.site,l.site,u);c=a[0],l=a[f-1],l.edge=Jr(c.site,l.site,null,u),Vr(c),Vr(l)}function jr(n){for(var t,e,r,u,i=n.x,o=n.y,a=Qc._;a;)if(r=Fr(a,o)-i,r>Ca)a=a.L;else{if(u=i-Hr(a,o),!(u>Ca)){r>-Ca?(t=a.P,e=a):u>-Ca?(t=a,e=a.N):t=e=a;break}if(!a.R){t=a;break}a=a.R}var c=Dr(n);if(Qc.insert(t,c),t||e){if(t===e)return Xr(t),e=Dr(t.site),Qc.insert(c,e),c.edge=e.edge=Jr(t.site,c.site),Vr(t),void Vr(e);if(!e)return void(c.edge=Jr(t.site,c.site));Xr(t),Xr(e);var l=t.site,s=l.x,f=l.y,h=n.x-s,g=n.y-f,p=e.site,v=p.x-s,d=p.y-f,m=2*(h*d-g*v),y=h*h+g*g,M=v*v+d*d,x={x:(d*y-g*M)/m+s,y:(h*M-v*y)/m+f};Kr(e.edge,l,p,x),c.edge=Jr(l,n,null,x),e.edge=Jr(n,p,null,x),Vr(t),Vr(e)}}function Fr(n,t){var e=n.site,r=e.x,u=e.y,i=u-t;if(!i)return r;var o=n.P;if(!o)return-1/0;e=o.site;var a=e.x,c=e.y,l=c-t;if(!l)return a;var s=a-r,f=1/i-1/l,h=s/l;return f?(-h+Math.sqrt(h*h-2*f*(s*s/(-2*l)-c+l/2+u-i/2)))/f+r:(r+a)/2}function Hr(n,t){var e=n.N;if(e)return Fr(e,t);var r=n.site;return r.y===t?r.x:1/0}function Or(n){this.site=n,this.edges=[]}function Ir(n){for(var t,e,r,u,i,o,a,c,l,s,f=n[0][0],h=n[1][0],g=n[0][1],p=n[1][1],v=Kc,d=v.length;d--;)if(i=v[d],i&&i.prepare())for(a=i.edges,c=a.length,o=0;c>o;)s=a[o].end(),r=s.x,u=s.y,l=a[++o%c].start(),t=l.x,e=l.y,(ga(r-t)>Ca||ga(u-e)>Ca)&&(a.splice(o,0,new Qr(Gr(i.site,s,ga(r-f)<Ca&&p-u>Ca?{x:f,y:ga(t-f)<Ca?e:p}:ga(u-p)<Ca&&h-r>Ca?{x:ga(e-p)<Ca?t:h,y:p}:ga(r-h)<Ca&&u-g>Ca?{x:h,y:ga(t-h)<Ca?e:g}:ga(u-g)<Ca&&r-f>Ca?{x:ga(e-g)<Ca?t:f,y:g}:null),i.site,null)),++c)}function Yr(n,t){return t.angle-n.angle}function Zr(){tu(this),this.x=this.y=this.arc=this.site=this.cy=null}function Vr(n){var t=n.P,e=n.N;if(t&&e){var r=t.site,u=n.site,i=e.site;if(r!==i){var o=u.x,a=u.y,c=r.x-o,l=r.y-a,s=i.x-o,f=i.y-a,h=2*(c*f-l*s);if(!(h>=-za)){var g=c*c+l*l,p=s*s+f*f,v=(f*g-l*p)/h,d=(c*p-s*g)/h,f=d+a,m=rl.pop()||new Zr;m.arc=n,m.site=u,m.x=v+o,m.y=f+Math.sqrt(v*v+d*d),m.cy=f,n.circle=m;for(var y=null,M=tl._;M;)if(m.y<M.y||m.y===M.y&&m.x<=M.x){if(!M.L){y=M.P;break}M=M.L}else{if(!M.R){y=M;break}M=M.R}tl.insert(y,m),y||(nl=m)}}}}function Xr(n){var t=n.circle;t&&(t.P||(nl=t.N),tl.remove(t),rl.push(t),tu(t),n.circle=null)}function $r(n){for(var t,e=Gc,r=Oe(n[0][0],n[0][1],n[1][0],n[1][1]),u=e.length;u--;)t=e[u],(!Br(t,n)||!r(t)||ga(t.a.x-t.b.x)<Ca&&ga(t.a.y-t.b.y)<Ca)&&(t.a=t.b=null,e.splice(u,1))}function Br(n,t){var e=n.b;if(e)return!0;var r,u,i=n.a,o=t[0][0],a=t[1][0],c=t[0][1],l=t[1][1],s=n.l,f=n.r,h=s.x,g=s.y,p=f.x,v=f.y,d=(h+p)/2,m=(g+v)/2;if(v===g){if(o>d||d>=a)return;if(h>p){if(i){if(i.y>=l)return}else i={x:d,y:c};e={x:d,y:l}}else{if(i){if(i.y<c)return}else i={x:d,y:l};e={x:d,y:c}}}else if(r=(h-p)/(v-g),u=m-r*d,-1>r||r>1)if(h>p){if(i){if(i.y>=l)return}else i={x:(c-u)/r,y:c};e={x:(l-u)/r,y:l}}else{if(i){if(i.y<c)return}else i={x:(l-u)/r,y:l};e={x:(c-u)/r,y:c}}else if(v>g){if(i){if(i.x>=a)return}else i={x:o,y:r*o+u};e={x:a,y:r*a+u}}else{if(i){if(i.x<o)return}else i={x:a,y:r*a+u};e={x:o,y:r*o+u}}return n.a=i,n.b=e,!0}function Wr(n,t){this.l=n,this.r=t,this.a=this.b=null}function Jr(n,t,e,r){var u=new Wr(n,t);return Gc.push(u),e&&Kr(u,n,t,e),r&&Kr(u,t,n,r),Kc[n.i].edges.push(new Qr(u,n,t)),Kc[t.i].edges.push(new Qr(u,t,n)),u}function Gr(n,t,e){var r=new Wr(n,null);return r.a=t,r.b=e,Gc.push(r),r}function Kr(n,t,e,r){n.a||n.b?n.l===e?n.b=r:n.a=r:(n.a=r,n.l=t,n.r=e)}function Qr(n,t,e){var r=n.a,u=n.b;this.edge=n,this.site=t,this.angle=e?Math.atan2(e.y-t.y,e.x-t.x):n.l===t?Math.atan2(u.x-r.x,r.y-u.y):Math.atan2(r.x-u.x,u.y-r.y)}function nu(){this._=null}function tu(n){n.U=n.C=n.L=n.R=n.P=n.N=null}function eu(n,t){var e=t,r=t.R,u=e.U;u?u.L===e?u.L=r:u.R=r:n._=r,r.U=u,e.U=r,e.R=r.L,e.R&&(e.R.U=e),r.L=e}function ru(n,t){var e=t,r=t.L,u=e.U;u?u.L===e?u.L=r:u.R=r:n._=r,r.U=u,e.U=r,e.L=r.R,e.L&&(e.L.U=e),r.R=e}function uu(n){for(;n.L;)n=n.L;return n}function iu(n,t){var e,r,u,i=n.sort(ou).pop();for(Gc=[],Kc=new Array(n.length),Qc=new nu,tl=new nu;;)if(u=nl,i&&(!u||i.y<u.y||i.y===u.y&&i.x<u.x))(i.x!==e||i.y!==r)&&(Kc[i.i]=new Or(i),jr(i),e=i.x,r=i.y),i=n.pop();else{if(!u)break;Ur(u.arc)}t&&($r(t),Ir(t));var o={cells:Kc,edges:Gc};return Qc=tl=Gc=Kc=null,o}function ou(n,t){return t.y-n.y||t.x-n.x}function au(n,t,e){return(n.x-e.x)*(t.y-n.y)-(n.x-t.x)*(e.y-n.y)}function cu(n){return n.x}function lu(n){return n.y}function su(){return{leaf:!0,nodes:[],point:null,x:null,y:null}}function fu(n,t,e,r,u,i){if(!n(t,e,r,u,i)){var o=.5*(e+u),a=.5*(r+i),c=t.nodes;c[0]&&fu(n,c[0],e,r,o,a),c[1]&&fu(n,c[1],o,r,u,a),c[2]&&fu(n,c[2],e,a,o,i),c[3]&&fu(n,c[3],o,a,u,i)}}function hu(n,t,e,r,u,i,o){var a,c=1/0;return function l(n,s,f,h,g){if(!(s>i||f>o||r>h||u>g)){if(p=n.point){var p,v=t-n.x,d=e-n.y,m=v*v+d*d;if(c>m){var y=Math.sqrt(c=m);r=t-y,u=e-y,i=t+y,o=e+y,a=p}}for(var M=n.nodes,x=.5*(s+h),b=.5*(f+g),_=t>=x,w=e>=b,S=w<<1|_,k=S+4;k>S;++S)if(n=M[3&S])switch(3&S){case 0:l(n,s,f,x,b);break;case 1:l(n,x,f,h,b);break;case 2:l(n,s,b,x,g);break;case 3:l(n,x,b,h,g)}}}(n,r,u,i,o),a}function gu(n,t){n=ta.rgb(n),t=ta.rgb(t);var e=n.r,r=n.g,u=n.b,i=t.r-e,o=t.g-r,a=t.b-u;return function(n){return"#"+xt(Math.round(e+i*n))+xt(Math.round(r+o*n))+xt(Math.round(u+a*n))}}function pu(n,t){var e,r={},u={};for(e in n)e in t?r[e]=mu(n[e],t[e]):u[e]=n[e];for(e in t)e in n||(u[e]=t[e]);return function(n){for(e in r)u[e]=r[e](n);return u}}function vu(n,t){return n=+n,t=+t,function(e){return n*(1-e)+t*e}}function du(n,t){var e,r,u,i=il.lastIndex=ol.lastIndex=0,o=-1,a=[],c=[];for(n+="",t+="";(e=il.exec(n))&&(r=ol.exec(t));)(u=r.index)>i&&(u=t.slice(i,u),a[o]?a[o]+=u:a[++o]=u),(e=e[0])===(r=r[0])?a[o]?a[o]+=r:a[++o]=r:(a[++o]=null,c.push({i:o,x:vu(e,r)})),i=ol.lastIndex;return i<t.length&&(u=t.slice(i),a[o]?a[o]+=u:a[++o]=u),a.length<2?c[0]?(t=c[0].x,function(n){return t(n)+""}):function(){return t}:(t=c.length,function(n){for(var e,r=0;t>r;++r)a[(e=c[r]).i]=e.x(n);return a.join("")})}function mu(n,t){for(var e,r=ta.interpolators.length;--r>=0&&!(e=ta.interpolators[r](n,t)););return e}function yu(n,t){var e,r=[],u=[],i=n.length,o=t.length,a=Math.min(n.length,t.length);for(e=0;a>e;++e)r.push(mu(n[e],t[e]));for(;i>e;++e)u[e]=n[e];for(;o>e;++e)u[e]=t[e];return function(n){for(e=0;a>e;++e)u[e]=r[e](n);return u}}function Mu(n){return function(t){return 0>=t?0:t>=1?1:n(t)}}function xu(n){return function(t){return 1-n(1-t)}}function bu(n){return function(t){return.5*(.5>t?n(2*t):2-n(2-2*t))}}function _u(n){return n*n}function wu(n){return n*n*n}function Su(n){if(0>=n)return 0;if(n>=1)return 1;var t=n*n,e=t*n;return 4*(.5>n?e:3*(n-t)+e-.75)}function ku(n){return function(t){return Math.pow(t,n)}}function Eu(n){return 1-Math.cos(n*Ra)}function Au(n){return Math.pow(2,10*(n-1))}function Nu(n){return 1-Math.sqrt(1-n*n)}function Cu(n,t){var e;return arguments.length<2&&(t=.45),arguments.length?e=t/La*Math.asin(1/n):(n=1,e=t/4),function(r){return 1+n*Math.pow(2,-10*r)*Math.sin((r-e)*La/t)}}function zu(n){return n||(n=1.70158),function(t){return t*t*((n+1)*t-n)}}function qu(n){return 1/2.75>n?7.5625*n*n:2/2.75>n?7.5625*(n-=1.5/2.75)*n+.75:2.5/2.75>n?7.5625*(n-=2.25/2.75)*n+.9375:7.5625*(n-=2.625/2.75)*n+.984375}function Lu(n,t){n=ta.hcl(n),t=ta.hcl(t);var e=n.h,r=n.c,u=n.l,i=t.h-e,o=t.c-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.c:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return st(e+i*n,r+o*n,u+a*n)+""}}function Tu(n,t){n=ta.hsl(n),t=ta.hsl(t);var e=n.h,r=n.s,u=n.l,i=t.h-e,o=t.s-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.s:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return ct(e+i*n,r+o*n,u+a*n)+""}}function Ru(n,t){n=ta.lab(n),t=ta.lab(t);var e=n.l,r=n.a,u=n.b,i=t.l-e,o=t.a-r,a=t.b-u;return function(n){return ht(e+i*n,r+o*n,u+a*n)+""}}function Du(n,t){return t-=n,function(e){return Math.round(n+t*e)}}function Pu(n){var t=[n.a,n.b],e=[n.c,n.d],r=ju(t),u=Uu(t,e),i=ju(Fu(e,t,-u))||0;t[0]*e[1]<e[0]*t[1]&&(t[0]*=-1,t[1]*=-1,r*=-1,u*=-1),this.rotate=(r?Math.atan2(t[1],t[0]):Math.atan2(-e[0],e[1]))*Pa,this.translate=[n.e,n.f],this.scale=[r,i],this.skew=i?Math.atan2(u,i)*Pa:0}function Uu(n,t){return n[0]*t[0]+n[1]*t[1]}function ju(n){var t=Math.sqrt(Uu(n,n));return t&&(n[0]/=t,n[1]/=t),t}function Fu(n,t,e){return n[0]+=e*t[0],n[1]+=e*t[1],n}function Hu(n,t){var e,r=[],u=[],i=ta.transform(n),o=ta.transform(t),a=i.translate,c=o.translate,l=i.rotate,s=o.rotate,f=i.skew,h=o.skew,g=i.scale,p=o.scale;return a[0]!=c[0]||a[1]!=c[1]?(r.push("translate(",null,",",null,")"),u.push({i:1,x:vu(a[0],c[0])},{i:3,x:vu(a[1],c[1])})):r.push(c[0]||c[1]?"translate("+c+")":""),l!=s?(l-s>180?s+=360:s-l>180&&(l+=360),u.push({i:r.push(r.pop()+"rotate(",null,")")-2,x:vu(l,s)})):s&&r.push(r.pop()+"rotate("+s+")"),f!=h?u.push({i:r.push(r.pop()+"skewX(",null,")")-2,x:vu(f,h)}):h&&r.push(r.pop()+"skewX("+h+")"),g[0]!=p[0]||g[1]!=p[1]?(e=r.push(r.pop()+"scale(",null,",",null,")"),u.push({i:e-4,x:vu(g[0],p[0])},{i:e-2,x:vu(g[1],p[1])})):(1!=p[0]||1!=p[1])&&r.push(r.pop()+"scale("+p+")"),e=u.length,function(n){for(var t,i=-1;++i<e;)r[(t=u[i]).i]=t.x(n);return r.join("")}}function Ou(n,t){return t=(t-=n=+n)||1/t,function(e){return(e-n)/t}}function Iu(n,t){return t=(t-=n=+n)||1/t,function(e){return Math.max(0,Math.min(1,(e-n)/t))}}function Yu(n){for(var t=n.source,e=n.target,r=Vu(t,e),u=[t];t!==r;)t=t.parent,u.push(t);for(var i=u.length;e!==r;)u.splice(i,0,e),e=e.parent;return u}function Zu(n){for(var t=[],e=n.parent;null!=e;)t.push(n),n=e,e=e.parent;return t.push(n),t}function Vu(n,t){if(n===t)return n;for(var e=Zu(n),r=Zu(t),u=e.pop(),i=r.pop(),o=null;u===i;)o=u,u=e.pop(),i=r.pop();return o}function Xu(n){n.fixed|=2}function $u(n){n.fixed&=-7}function Bu(n){n.fixed|=4,n.px=n.x,n.py=n.y}function Wu(n){n.fixed&=-5}function Ju(n,t,e){var r=0,u=0;if(n.charge=0,!n.leaf)for(var i,o=n.nodes,a=o.length,c=-1;++c<a;)i=o[c],null!=i&&(Ju(i,t,e),n.charge+=i.charge,r+=i.charge*i.cx,u+=i.charge*i.cy);if(n.point){n.leaf||(n.point.x+=Math.random()-.5,n.point.y+=Math.random()-.5);var l=t*e[n.point.index];n.charge+=n.pointCharge=l,r+=l*n.point.x,u+=l*n.point.y}n.cx=r/n.charge,n.cy=u/n.charge}function Gu(n,t){return ta.rebind(n,t,"sort","children","value"),n.nodes=n,n.links=ri,n}function Ku(n,t){for(var e=[n];null!=(n=e.pop());)if(t(n),(u=n.children)&&(r=u.length))for(var r,u;--r>=0;)e.push(u[r])}function Qu(n,t){for(var e=[n],r=[];null!=(n=e.pop());)if(r.push(n),(i=n.children)&&(u=i.length))for(var u,i,o=-1;++o<u;)e.push(i[o]);for(;null!=(n=r.pop());)t(n)}function ni(n){return n.children}function ti(n){return n.value}function ei(n,t){return t.value-n.value}function ri(n){return ta.merge(n.map(function(n){return(n.children||[]).map(function(t){return{source:n,target:t}})}))}function ui(n){return n.x}function ii(n){return n.y}function oi(n,t,e){n.y0=t,n.y=e}function ai(n){return ta.range(n.length)}function ci(n){for(var t=-1,e=n[0].length,r=[];++t<e;)r[t]=0;return r}function li(n){for(var t,e=1,r=0,u=n[0][1],i=n.length;i>e;++e)(t=n[e][1])>u&&(r=e,u=t);return r}function si(n){return n.reduce(fi,0)}function fi(n,t){return n+t[1]}function hi(n,t){return gi(n,Math.ceil(Math.log(t.length)/Math.LN2+1))}function gi(n,t){for(var e=-1,r=+n[0],u=(n[1]-r)/t,i=[];++e<=t;)i[e]=u*e+r;return i}function pi(n){return[ta.min(n),ta.max(n)]}function vi(n,t){return n.value-t.value}function di(n,t){var e=n._pack_next;n._pack_next=t,t._pack_prev=n,t._pack_next=e,e._pack_prev=t}function mi(n,t){n._pack_next=t,t._pack_prev=n}function yi(n,t){var e=t.x-n.x,r=t.y-n.y,u=n.r+t.r;return.999*u*u>e*e+r*r}function Mi(n){function t(n){s=Math.min(n.x-n.r,s),f=Math.max(n.x+n.r,f),h=Math.min(n.y-n.r,h),g=Math.max(n.y+n.r,g)}if((e=n.children)&&(l=e.length)){var e,r,u,i,o,a,c,l,s=1/0,f=-1/0,h=1/0,g=-1/0;if(e.forEach(xi),r=e[0],r.x=-r.r,r.y=0,t(r),l>1&&(u=e[1],u.x=u.r,u.y=0,t(u),l>2))for(i=e[2],wi(r,u,i),t(i),di(r,i),r._pack_prev=i,di(i,u),u=r._pack_next,o=3;l>o;o++){wi(r,u,i=e[o]);var p=0,v=1,d=1;for(a=u._pack_next;a!==u;a=a._pack_next,v++)if(yi(a,i)){p=1;break}if(1==p)for(c=r._pack_prev;c!==a._pack_prev&&!yi(c,i);c=c._pack_prev,d++);p?(d>v||v==d&&u.r<r.r?mi(r,u=a):mi(r=c,u),o--):(di(r,i),u=i,t(i))}var m=(s+f)/2,y=(h+g)/2,M=0;for(o=0;l>o;o++)i=e[o],i.x-=m,i.y-=y,M=Math.max(M,i.r+Math.sqrt(i.x*i.x+i.y*i.y));n.r=M,e.forEach(bi)}}function xi(n){n._pack_next=n._pack_prev=n}function bi(n){delete n._pack_next,delete n._pack_prev}function _i(n,t,e,r){var u=n.children;if(n.x=t+=r*n.x,n.y=e+=r*n.y,n.r*=r,u)for(var i=-1,o=u.length;++i<o;)_i(u[i],t,e,r)}function wi(n,t,e){var r=n.r+e.r,u=t.x-n.x,i=t.y-n.y;if(r&&(u||i)){var o=t.r+e.r,a=u*u+i*i;o*=o,r*=r;var c=.5+(r-o)/(2*a),l=Math.sqrt(Math.max(0,2*o*(r+a)-(r-=a)*r-o*o))/(2*a);e.x=n.x+c*u+l*i,e.y=n.y+c*i-l*u}else e.x=n.x+r,e.y=n.y}function Si(n,t){return n.parent==t.parent?1:2}function ki(n){var t=n.children;return t.length?t[0]:n.t}function Ei(n){var t,e=n.children;return(t=e.length)?e[t-1]:n.t}function Ai(n,t,e){var r=e/(t.i-n.i);t.c-=r,t.s+=e,n.c+=r,t.z+=e,t.m+=e}function Ni(n){for(var t,e=0,r=0,u=n.children,i=u.length;--i>=0;)t=u[i],t.z+=e,t.m+=e,e+=t.s+(r+=t.c)}function Ci(n,t,e){return n.a.parent===t.parent?n.a:e}function zi(n){return 1+ta.max(n,function(n){return n.y})}function qi(n){return n.reduce(function(n,t){return n+t.x},0)/n.length}function Li(n){var t=n.children;return t&&t.length?Li(t[0]):n}function Ti(n){var t,e=n.children;return e&&(t=e.length)?Ti(e[t-1]):n}function Ri(n){return{x:n.x,y:n.y,dx:n.dx,dy:n.dy}}function Di(n,t){var e=n.x+t[3],r=n.y+t[0],u=n.dx-t[1]-t[3],i=n.dy-t[0]-t[2];return 0>u&&(e+=u/2,u=0),0>i&&(r+=i/2,i=0),{x:e,y:r,dx:u,dy:i}}function Pi(n){var t=n[0],e=n[n.length-1];return e>t?[t,e]:[e,t]}function Ui(n){return n.rangeExtent?n.rangeExtent():Pi(n.range())}function ji(n,t,e,r){var u=e(n[0],n[1]),i=r(t[0],t[1]);return function(n){return i(u(n))}}function Fi(n,t){var e,r=0,u=n.length-1,i=n[r],o=n[u];return i>o&&(e=r,r=u,u=e,e=i,i=o,o=e),n[r]=t.floor(i),n[u]=t.ceil(o),n}function Hi(n){return n?{floor:function(t){return Math.floor(t/n)*n},ceil:function(t){return Math.ceil(t/n)*n}}:ml}function Oi(n,t,e,r){var u=[],i=[],o=0,a=Math.min(n.length,t.length)-1;for(n[a]<n[0]&&(n=n.slice().reverse(),t=t.slice().reverse());++o<=a;)u.push(e(n[o-1],n[o])),i.push(r(t[o-1],t[o]));return function(t){var e=ta.bisect(n,t,1,a)-1;return i[e](u[e](t))}}function Ii(n,t,e,r){function u(){var u=Math.min(n.length,t.length)>2?Oi:ji,c=r?Iu:Ou;return o=u(n,t,c,e),a=u(t,n,c,mu),i}function i(n){return o(n)}var o,a;return i.invert=function(n){return a(n)},i.domain=function(t){return arguments.length?(n=t.map(Number),u()):n},i.range=function(n){return arguments.length?(t=n,u()):t},i.rangeRound=function(n){return i.range(n).interpolate(Du)},i.clamp=function(n){return arguments.length?(r=n,u()):r},i.interpolate=function(n){return arguments.length?(e=n,u()):e},i.ticks=function(t){return Xi(n,t)},i.tickFormat=function(t,e){return $i(n,t,e)},i.nice=function(t){return Zi(n,t),u()},i.copy=function(){return Ii(n,t,e,r)},u()}function Yi(n,t){return ta.rebind(n,t,"range","rangeRound","interpolate","clamp")}function Zi(n,t){return Fi(n,Hi(Vi(n,t)[2]))}function Vi(n,t){null==t&&(t=10);var e=Pi(n),r=e[1]-e[0],u=Math.pow(10,Math.floor(Math.log(r/t)/Math.LN10)),i=t/r*u;return.15>=i?u*=10:.35>=i?u*=5:.75>=i&&(u*=2),e[0]=Math.ceil(e[0]/u)*u,e[1]=Math.floor(e[1]/u)*u+.5*u,e[2]=u,e}function Xi(n,t){return ta.range.apply(ta,Vi(n,t))}function $i(n,t,e){var r=Vi(n,t);if(e){var u=ic.exec(e);if(u.shift(),"s"===u[8]){var i=ta.formatPrefix(Math.max(ga(r[0]),ga(r[1])));return u[7]||(u[7]="."+Bi(i.scale(r[2]))),u[8]="f",e=ta.format(u.join("")),function(n){return e(i.scale(n))+i.symbol}}u[7]||(u[7]="."+Wi(u[8],r)),e=u.join("")}else e=",."+Bi(r[2])+"f";return ta.format(e)}function Bi(n){return-Math.floor(Math.log(n)/Math.LN10+.01)}function Wi(n,t){var e=Bi(t[2]);return n in yl?Math.abs(e-Bi(Math.max(ga(t[0]),ga(t[1]))))+ +("e"!==n):e-2*("%"===n)}function Ji(n,t,e,r){function u(n){return(e?Math.log(0>n?0:n):-Math.log(n>0?0:-n))/Math.log(t)}function i(n){return e?Math.pow(t,n):-Math.pow(t,-n)}function o(t){return n(u(t))}return o.invert=function(t){return i(n.invert(t))},o.domain=function(t){return arguments.length?(e=t[0]>=0,n.domain((r=t.map(Number)).map(u)),o):r},o.base=function(e){return arguments.length?(t=+e,n.domain(r.map(u)),o):t},o.nice=function(){var t=Fi(r.map(u),e?Math:xl);return n.domain(t),r=t.map(i),o},o.ticks=function(){var n=Pi(r),o=[],a=n[0],c=n[1],l=Math.floor(u(a)),s=Math.ceil(u(c)),f=t%1?2:t;if(isFinite(s-l)){if(e){for(;s>l;l++)for(var h=1;f>h;h++)o.push(i(l)*h);o.push(i(l))}else for(o.push(i(l));l++<s;)for(var h=f-1;h>0;h--)o.push(i(l)*h);for(l=0;o[l]<a;l++);for(s=o.length;o[s-1]>c;s--);o=o.slice(l,s)}return o},o.tickFormat=function(n,t){if(!arguments.length)return Ml;arguments.length<2?t=Ml:"function"!=typeof t&&(t=ta.format(t));var r,a=Math.max(.1,n/o.ticks().length),c=e?(r=1e-12,Math.ceil):(r=-1e-12,Math.floor);return function(n){return n/i(c(u(n)+r))<=a?t(n):""}},o.copy=function(){return Ji(n.copy(),t,e,r)},Yi(o,n)}function Gi(n,t,e){function r(t){return n(u(t))}var u=Ki(t),i=Ki(1/t);return r.invert=function(t){return i(n.invert(t))},r.domain=function(t){return arguments.length?(n.domain((e=t.map(Number)).map(u)),r):e},r.ticks=function(n){return Xi(e,n)},r.tickFormat=function(n,t){return $i(e,n,t)},r.nice=function(n){return r.domain(Zi(e,n))},r.exponent=function(o){return arguments.length?(u=Ki(t=o),i=Ki(1/t),n.domain(e.map(u)),r):t},r.copy=function(){return Gi(n.copy(),t,e)},Yi(r,n)}function Ki(n){return function(t){return 0>t?-Math.pow(-t,n):Math.pow(t,n)}}function Qi(n,t){function e(e){return i[((u.get(e)||("range"===t.t?u.set(e,n.push(e)):0/0))-1)%i.length]}function r(t,e){return ta.range(n.length).map(function(n){return t+e*n})}var u,i,o;return e.domain=function(r){if(!arguments.length)return n;n=[],u=new l;for(var i,o=-1,a=r.length;++o<a;)u.has(i=r[o])||u.set(i,n.push(i));return e[t.t].apply(e,t.a)},e.range=function(n){return arguments.length?(i=n,o=0,t={t:"range",a:arguments},e):i},e.rangePoints=function(u,a){arguments.length<2&&(a=0);var c=u[0],l=u[1],s=n.length<2?(c=(c+l)/2,0):(l-c)/(n.length-1+a);return i=r(c+s*a/2,s),o=0,t={t:"rangePoints",a:arguments},e},e.rangeRoundPoints=function(u,a){arguments.length<2&&(a=0);var c=u[0],l=u[1],s=n.length<2?(c=l=Math.round((c+l)/2),0):(l-c)/(n.length-1+a)|0;return i=r(c+Math.round(s*a/2+(l-c-(n.length-1+a)*s)/2),s),o=0,t={t:"rangeRoundPoints",a:arguments},e},e.rangeBands=function(u,a,c){arguments.length<2&&(a=0),arguments.length<3&&(c=a);var l=u[1]<u[0],s=u[l-0],f=u[1-l],h=(f-s)/(n.length-a+2*c);return i=r(s+h*c,h),l&&i.reverse(),o=h*(1-a),t={t:"rangeBands",a:arguments},e},e.rangeRoundBands=function(u,a,c){arguments.length<2&&(a=0),arguments.length<3&&(c=a);var l=u[1]<u[0],s=u[l-0],f=u[1-l],h=Math.floor((f-s)/(n.length-a+2*c));return i=r(s+Math.round((f-s-(n.length-a)*h)/2),h),l&&i.reverse(),o=Math.round(h*(1-a)),t={t:"rangeRoundBands",a:arguments},e},e.rangeBand=function(){return o},e.rangeExtent=function(){return Pi(t.a[0])},e.copy=function(){return Qi(n,t)},e.domain(n)}function no(n,t){function i(){var e=0,r=t.length;for(a=[];++e<r;)a[e-1]=ta.quantile(n,e/r);return o}function o(n){return isNaN(n=+n)?void 0:t[ta.bisect(a,n)]}var a;return o.domain=function(t){return arguments.length?(n=t.map(r).filter(u).sort(e),i()):n},o.range=function(n){return arguments.length?(t=n,i()):t},o.quantiles=function(){return a},o.invertExtent=function(e){return e=t.indexOf(e),0>e?[0/0,0/0]:[e>0?a[e-1]:n[0],e<a.length?a[e]:n[n.length-1]]},o.copy=function(){return no(n,t)},i()}function to(n,t,e){function r(t){return e[Math.max(0,Math.min(o,Math.floor(i*(t-n))))]}function u(){return i=e.length/(t-n),o=e.length-1,r}var i,o;return r.domain=function(e){return arguments.length?(n=+e[0],t=+e[e.length-1],u()):[n,t]},r.range=function(n){return arguments.length?(e=n,u()):e},r.invertExtent=function(t){return t=e.indexOf(t),t=0>t?0/0:t/i+n,[t,t+1/i]},r.copy=function(){return to(n,t,e)},u()}function eo(n,t){function e(e){return e>=e?t[ta.bisect(n,e)]:void 0}return e.domain=function(t){return arguments.length?(n=t,e):n},e.range=function(n){return arguments.length?(t=n,e):t},e.invertExtent=function(e){return e=t.indexOf(e),[n[e-1],n[e]]},e.copy=function(){return eo(n,t)},e}function ro(n){function t(n){return+n}return t.invert=t,t.domain=t.range=function(e){return arguments.length?(n=e.map(t),t):n},t.ticks=function(t){return Xi(n,t)},t.tickFormat=function(t,e){return $i(n,t,e)},t.copy=function(){return ro(n)},t}function uo(){return 0}function io(n){return n.innerRadius}function oo(n){return n.outerRadius}function ao(n){return n.startAngle}function co(n){return n.endAngle}function lo(n){return n&&n.padAngle}function so(n,t,e,r){return(n-e)*t-(t-r)*n>0?0:1}function fo(n,t,e,r,u){var i=n[0]-t[0],o=n[1]-t[1],a=(u?r:-r)/Math.sqrt(i*i+o*o),c=a*o,l=-a*i,s=n[0]+c,f=n[1]+l,h=t[0]+c,g=t[1]+l,p=(s+h)/2,v=(f+g)/2,d=h-s,m=g-f,y=d*d+m*m,M=e-r,x=s*g-h*f,b=(0>m?-1:1)*Math.sqrt(M*M*y-x*x),_=(x*m-d*b)/y,w=(-x*d-m*b)/y,S=(x*m+d*b)/y,k=(-x*d+m*b)/y,E=_-p,A=w-v,N=S-p,C=k-v;return E*E+A*A>N*N+C*C&&(_=S,w=k),[[_-c,w-l],[_*e/M,w*e/M]]}function ho(n){function t(t){function o(){l.push("M",i(n(s),a))}for(var c,l=[],s=[],f=-1,h=t.length,g=Et(e),p=Et(r);++f<h;)u.call(this,c=t[f],f)?s.push([+g.call(this,c,f),+p.call(this,c,f)]):s.length&&(o(),s=[]);return s.length&&o(),l.length?l.join(""):null}var e=Ar,r=Nr,u=Ne,i=go,o=i.key,a=.7;return t.x=function(n){return arguments.length?(e=n,t):e},t.y=function(n){return arguments.length?(r=n,t):r},t.defined=function(n){return arguments.length?(u=n,t):u},t.interpolate=function(n){return arguments.length?(o="function"==typeof n?i=n:(i=El.get(n)||go).key,t):o},t.tension=function(n){return arguments.length?(a=n,t):a},t}function go(n){return n.join("L")}function po(n){return go(n)+"Z"}function vo(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("H",(r[0]+(r=n[t])[0])/2,"V",r[1]);return e>1&&u.push("H",r[0]),u.join("")}function mo(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("V",(r=n[t])[1],"H",r[0]);return u.join("")}function yo(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("H",(r=n[t])[0],"V",r[1]);return u.join("")}function Mo(n,t){return n.length<4?go(n):n[1]+_o(n.slice(1,-1),wo(n,t))}function xo(n,t){return n.length<3?go(n):n[0]+_o((n.push(n[0]),n),wo([n[n.length-2]].concat(n,[n[1]]),t))}function bo(n,t){return n.length<3?go(n):n[0]+_o(n,wo(n,t))}function _o(n,t){if(t.length<1||n.length!=t.length&&n.length!=t.length+2)return go(n);var e=n.length!=t.length,r="",u=n[0],i=n[1],o=t[0],a=o,c=1;if(e&&(r+="Q"+(i[0]-2*o[0]/3)+","+(i[1]-2*o[1]/3)+","+i[0]+","+i[1],u=n[1],c=2),t.length>1){a=t[1],i=n[c],c++,r+="C"+(u[0]+o[0])+","+(u[1]+o[1])+","+(i[0]-a[0])+","+(i[1]-a[1])+","+i[0]+","+i[1];for(var l=2;l<t.length;l++,c++)i=n[c],a=t[l],r+="S"+(i[0]-a[0])+","+(i[1]-a[1])+","+i[0]+","+i[1]}if(e){var s=n[c];r+="Q"+(i[0]+2*a[0]/3)+","+(i[1]+2*a[1]/3)+","+s[0]+","+s[1]}return r}function wo(n,t){for(var e,r=[],u=(1-t)/2,i=n[0],o=n[1],a=1,c=n.length;++a<c;)e=i,i=o,o=n[a],r.push([u*(o[0]-e[0]),u*(o[1]-e[1])]);return r}function So(n){if(n.length<3)return go(n);var t=1,e=n.length,r=n[0],u=r[0],i=r[1],o=[u,u,u,(r=n[1])[0]],a=[i,i,i,r[1]],c=[u,",",i,"L",No(Cl,o),",",No(Cl,a)];for(n.push(n[e-1]);++t<=e;)r=n[t],o.shift(),o.push(r[0]),a.shift(),a.push(r[1]),Co(c,o,a);return n.pop(),c.push("L",r),c.join("")}function ko(n){if(n.length<4)return go(n);for(var t,e=[],r=-1,u=n.length,i=[0],o=[0];++r<3;)t=n[r],i.push(t[0]),o.push(t[1]);for(e.push(No(Cl,i)+","+No(Cl,o)),--r;++r<u;)t=n[r],i.shift(),i.push(t[0]),o.shift(),o.push(t[1]),Co(e,i,o);return e.join("")}function Eo(n){for(var t,e,r=-1,u=n.length,i=u+4,o=[],a=[];++r<4;)e=n[r%u],o.push(e[0]),a.push(e[1]);for(t=[No(Cl,o),",",No(Cl,a)],--r;++r<i;)e=n[r%u],o.shift(),o.push(e[0]),a.shift(),a.push(e[1]),Co(t,o,a);return t.join("")}function Ao(n,t){var e=n.length-1;if(e)for(var r,u,i=n[0][0],o=n[0][1],a=n[e][0]-i,c=n[e][1]-o,l=-1;++l<=e;)r=n[l],u=l/e,r[0]=t*r[0]+(1-t)*(i+u*a),r[1]=t*r[1]+(1-t)*(o+u*c);return So(n)}function No(n,t){return n[0]*t[0]+n[1]*t[1]+n[2]*t[2]+n[3]*t[3]}function Co(n,t,e){n.push("C",No(Al,t),",",No(Al,e),",",No(Nl,t),",",No(Nl,e),",",No(Cl,t),",",No(Cl,e))}function zo(n,t){return(t[1]-n[1])/(t[0]-n[0])}function qo(n){for(var t=0,e=n.length-1,r=[],u=n[0],i=n[1],o=r[0]=zo(u,i);++t<e;)r[t]=(o+(o=zo(u=i,i=n[t+1])))/2;return r[t]=o,r}function Lo(n){for(var t,e,r,u,i=[],o=qo(n),a=-1,c=n.length-1;++a<c;)t=zo(n[a],n[a+1]),ga(t)<Ca?o[a]=o[a+1]=0:(e=o[a]/t,r=o[a+1]/t,u=e*e+r*r,u>9&&(u=3*t/Math.sqrt(u),o[a]=u*e,o[a+1]=u*r));for(a=-1;++a<=c;)u=(n[Math.min(c,a+1)][0]-n[Math.max(0,a-1)][0])/(6*(1+o[a]*o[a])),i.push([u||0,o[a]*u||0]);return i}function To(n){return n.length<3?go(n):n[0]+_o(n,Lo(n))}function Ro(n){for(var t,e,r,u=-1,i=n.length;++u<i;)t=n[u],e=t[0],r=t[1]-Ra,t[0]=e*Math.cos(r),t[1]=e*Math.sin(r);return n}function Do(n){function t(t){function c(){v.push("M",a(n(m),f),s,l(n(d.reverse()),f),"Z")}for(var h,g,p,v=[],d=[],m=[],y=-1,M=t.length,x=Et(e),b=Et(u),_=e===r?function(){return g}:Et(r),w=u===i?function(){return p}:Et(i);++y<M;)o.call(this,h=t[y],y)?(d.push([g=+x.call(this,h,y),p=+b.call(this,h,y)]),m.push([+_.call(this,h,y),+w.call(this,h,y)])):d.length&&(c(),d=[],m=[]);return d.length&&c(),v.length?v.join(""):null}var e=Ar,r=Ar,u=0,i=Nr,o=Ne,a=go,c=a.key,l=a,s="L",f=.7;return t.x=function(n){return arguments.length?(e=r=n,t):r},t.x0=function(n){return arguments.length?(e=n,t):e},t.x1=function(n){return arguments.length?(r=n,t):r
+},t.y=function(n){return arguments.length?(u=i=n,t):i},t.y0=function(n){return arguments.length?(u=n,t):u},t.y1=function(n){return arguments.length?(i=n,t):i},t.defined=function(n){return arguments.length?(o=n,t):o},t.interpolate=function(n){return arguments.length?(c="function"==typeof n?a=n:(a=El.get(n)||go).key,l=a.reverse||a,s=a.closed?"M":"L",t):c},t.tension=function(n){return arguments.length?(f=n,t):f},t}function Po(n){return n.radius}function Uo(n){return[n.x,n.y]}function jo(n){return function(){var t=n.apply(this,arguments),e=t[0],r=t[1]-Ra;return[e*Math.cos(r),e*Math.sin(r)]}}function Fo(){return 64}function Ho(){return"circle"}function Oo(n){var t=Math.sqrt(n/qa);return"M0,"+t+"A"+t+","+t+" 0 1,1 0,"+-t+"A"+t+","+t+" 0 1,1 0,"+t+"Z"}function Io(n){return function(){var t,e;(t=this[n])&&(e=t[t.active])&&(--t.count?delete t[t.active]:delete this[n],t.active+=.5,e.event&&e.event.interrupt.call(this,this.__data__,e.index))}}function Yo(n,t,e){return ya(n,Pl),n.namespace=t,n.id=e,n}function Zo(n,t,e,r){var u=n.id,i=n.namespace;return Y(n,"function"==typeof e?function(n,o,a){n[i][u].tween.set(t,r(e.call(n,n.__data__,o,a)))}:(e=r(e),function(n){n[i][u].tween.set(t,e)}))}function Vo(n){return null==n&&(n=""),function(){this.textContent=n}}function Xo(n){return null==n?"__transition__":"__transition_"+n+"__"}function $o(n,t,e,r,u){var i=n[e]||(n[e]={active:0,count:0}),o=i[r];if(!o){var a=u.time;o=i[r]={tween:new l,time:a,delay:u.delay,duration:u.duration,ease:u.ease,index:t},u=null,++i.count,ta.timer(function(u){function c(e){if(i.active>r)return s();var u=i[i.active];u&&(--i.count,delete i[i.active],u.event&&u.event.interrupt.call(n,n.__data__,u.index)),i.active=r,o.event&&o.event.start.call(n,n.__data__,t),o.tween.forEach(function(e,r){(r=r.call(n,n.__data__,t))&&v.push(r)}),h=o.ease,f=o.duration,ta.timer(function(){return p.c=l(e||1)?Ne:l,1},0,a)}function l(e){if(i.active!==r)return 1;for(var u=e/f,a=h(u),c=v.length;c>0;)v[--c].call(n,a);return u>=1?(o.event&&o.event.end.call(n,n.__data__,t),s()):void 0}function s(){return--i.count?delete i[r]:delete n[e],1}var f,h,g=o.delay,p=ec,v=[];return p.t=g+a,u>=g?c(u-g):void(p.c=c)},0,a)}}function Bo(n,t,e){n.attr("transform",function(n){var r=t(n);return"translate("+(isFinite(r)?r:e(n))+",0)"})}function Wo(n,t,e){n.attr("transform",function(n){var r=t(n);return"translate(0,"+(isFinite(r)?r:e(n))+")"})}function Jo(n){return n.toISOString()}function Go(n,t,e){function r(t){return n(t)}function u(n,e){var r=n[1]-n[0],u=r/e,i=ta.bisect(Vl,u);return i==Vl.length?[t.year,Vi(n.map(function(n){return n/31536e6}),e)[2]]:i?t[u/Vl[i-1]<Vl[i]/u?i-1:i]:[Bl,Vi(n,e)[2]]}return r.invert=function(t){return Ko(n.invert(t))},r.domain=function(t){return arguments.length?(n.domain(t),r):n.domain().map(Ko)},r.nice=function(n,t){function e(e){return!isNaN(e)&&!n.range(e,Ko(+e+1),t).length}var i=r.domain(),o=Pi(i),a=null==n?u(o,10):"number"==typeof n&&u(o,n);return a&&(n=a[0],t=a[1]),r.domain(Fi(i,t>1?{floor:function(t){for(;e(t=n.floor(t));)t=Ko(t-1);return t},ceil:function(t){for(;e(t=n.ceil(t));)t=Ko(+t+1);return t}}:n))},r.ticks=function(n,t){var e=Pi(r.domain()),i=null==n?u(e,10):"number"==typeof n?u(e,n):!n.range&&[{range:n},t];return i&&(n=i[0],t=i[1]),n.range(e[0],Ko(+e[1]+1),1>t?1:t)},r.tickFormat=function(){return e},r.copy=function(){return Go(n.copy(),t,e)},Yi(r,n)}function Ko(n){return new Date(n)}function Qo(n){return JSON.parse(n.responseText)}function na(n){var t=ua.createRange();return t.selectNode(ua.body),t.createContextualFragment(n.responseText)}var ta={version:"3.5.5"},ea=[].slice,ra=function(n){return ea.call(n)},ua=this.document;if(ua)try{ra(ua.documentElement.childNodes)[0].nodeType}catch(ia){ra=function(n){for(var t=n.length,e=new Array(t);t--;)e[t]=n[t];return e}}if(Date.now||(Date.now=function(){return+new Date}),ua)try{ua.createElement("DIV").style.setProperty("opacity",0,"")}catch(oa){var aa=this.Element.prototype,ca=aa.setAttribute,la=aa.setAttributeNS,sa=this.CSSStyleDeclaration.prototype,fa=sa.setProperty;aa.setAttribute=function(n,t){ca.call(this,n,t+"")},aa.setAttributeNS=function(n,t,e){la.call(this,n,t,e+"")},sa.setProperty=function(n,t,e){fa.call(this,n,t+"",e)}}ta.ascending=e,ta.descending=function(n,t){return n>t?-1:t>n?1:t>=n?0:0/0},ta.min=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u<i;)if(null!=(r=n[u])&&r>=r){e=r;break}for(;++u<i;)null!=(r=n[u])&&e>r&&(e=r)}else{for(;++u<i;)if(null!=(r=t.call(n,n[u],u))&&r>=r){e=r;break}for(;++u<i;)null!=(r=t.call(n,n[u],u))&&e>r&&(e=r)}return e},ta.max=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u<i;)if(null!=(r=n[u])&&r>=r){e=r;break}for(;++u<i;)null!=(r=n[u])&&r>e&&(e=r)}else{for(;++u<i;)if(null!=(r=t.call(n,n[u],u))&&r>=r){e=r;break}for(;++u<i;)null!=(r=t.call(n,n[u],u))&&r>e&&(e=r)}return e},ta.extent=function(n,t){var e,r,u,i=-1,o=n.length;if(1===arguments.length){for(;++i<o;)if(null!=(r=n[i])&&r>=r){e=u=r;break}for(;++i<o;)null!=(r=n[i])&&(e>r&&(e=r),r>u&&(u=r))}else{for(;++i<o;)if(null!=(r=t.call(n,n[i],i))&&r>=r){e=u=r;break}for(;++i<o;)null!=(r=t.call(n,n[i],i))&&(e>r&&(e=r),r>u&&(u=r))}return[e,u]},ta.sum=function(n,t){var e,r=0,i=n.length,o=-1;if(1===arguments.length)for(;++o<i;)u(e=+n[o])&&(r+=e);else for(;++o<i;)u(e=+t.call(n,n[o],o))&&(r+=e);return r},ta.mean=function(n,t){var e,i=0,o=n.length,a=-1,c=o;if(1===arguments.length)for(;++a<o;)u(e=r(n[a]))?i+=e:--c;else for(;++a<o;)u(e=r(t.call(n,n[a],a)))?i+=e:--c;return c?i/c:void 0},ta.quantile=function(n,t){var e=(n.length-1)*t+1,r=Math.floor(e),u=+n[r-1],i=e-r;return i?u+i*(n[r]-u):u},ta.median=function(n,t){var i,o=[],a=n.length,c=-1;if(1===arguments.length)for(;++c<a;)u(i=r(n[c]))&&o.push(i);else for(;++c<a;)u(i=r(t.call(n,n[c],c)))&&o.push(i);return o.length?ta.quantile(o.sort(e),.5):void 0},ta.variance=function(n,t){var e,i,o=n.length,a=0,c=0,l=-1,s=0;if(1===arguments.length)for(;++l<o;)u(e=r(n[l]))&&(i=e-a,a+=i/++s,c+=i*(e-a));else for(;++l<o;)u(e=r(t.call(n,n[l],l)))&&(i=e-a,a+=i/++s,c+=i*(e-a));return s>1?c/(s-1):void 0},ta.deviation=function(){var n=ta.variance.apply(this,arguments);return n?Math.sqrt(n):n};var ha=i(e);ta.bisectLeft=ha.left,ta.bisect=ta.bisectRight=ha.right,ta.bisector=function(n){return i(1===n.length?function(t,r){return e(n(t),r)}:n)},ta.shuffle=function(n,t,e){(i=arguments.length)<3&&(e=n.length,2>i&&(t=0));for(var r,u,i=e-t;i;)u=Math.random()*i--|0,r=n[i+t],n[i+t]=n[u+t],n[u+t]=r;return n},ta.permute=function(n,t){for(var e=t.length,r=new Array(e);e--;)r[e]=n[t[e]];return r},ta.pairs=function(n){for(var t,e=0,r=n.length-1,u=n[0],i=new Array(0>r?0:r);r>e;)i[e]=[t=u,u=n[++e]];return i},ta.zip=function(){if(!(r=arguments.length))return[];for(var n=-1,t=ta.min(arguments,o),e=new Array(t);++n<t;)for(var r,u=-1,i=e[n]=new Array(r);++u<r;)i[u]=arguments[u][n];return e},ta.transpose=function(n){return ta.zip.apply(ta,n)},ta.keys=function(n){var t=[];for(var e in n)t.push(e);return t},ta.values=function(n){var t=[];for(var e in n)t.push(n[e]);return t},ta.entries=function(n){var t=[];for(var e in n)t.push({key:e,value:n[e]});return t},ta.merge=function(n){for(var t,e,r,u=n.length,i=-1,o=0;++i<u;)o+=n[i].length;for(e=new Array(o);--u>=0;)for(r=n[u],t=r.length;--t>=0;)e[--o]=r[t];return e};var ga=Math.abs;ta.range=function(n,t,e){if(arguments.length<3&&(e=1,arguments.length<2&&(t=n,n=0)),(t-n)/e===1/0)throw new Error("infinite range");var r,u=[],i=a(ga(e)),o=-1;if(n*=i,t*=i,e*=i,0>e)for(;(r=n+e*++o)>t;)u.push(r/i);else for(;(r=n+e*++o)<t;)u.push(r/i);return u},ta.map=function(n,t){var e=new l;if(n instanceof l)n.forEach(function(n,t){e.set(n,t)});else if(Array.isArray(n)){var r,u=-1,i=n.length;if(1===arguments.length)for(;++u<i;)e.set(u,n[u]);else for(;++u<i;)e.set(t.call(n,r=n[u],u),r)}else for(var o in n)e.set(o,n[o]);return e};var pa="__proto__",va="\x00";c(l,{has:h,get:function(n){return this._[s(n)]},set:function(n,t){return this._[s(n)]=t},remove:g,keys:p,values:function(){var n=[];for(var t in this._)n.push(this._[t]);return n},entries:function(){var n=[];for(var t in this._)n.push({key:f(t),value:this._[t]});return n},size:v,empty:d,forEach:function(n){for(var t in this._)n.call(this,f(t),this._[t])}}),ta.nest=function(){function n(t,o,a){if(a>=i.length)return r?r.call(u,o):e?o.sort(e):o;for(var c,s,f,h,g=-1,p=o.length,v=i[a++],d=new l;++g<p;)(h=d.get(c=v(s=o[g])))?h.push(s):d.set(c,[s]);return t?(s=t(),f=function(e,r){s.set(e,n(t,r,a))}):(s={},f=function(e,r){s[e]=n(t,r,a)}),d.forEach(f),s}function t(n,e){if(e>=i.length)return n;var r=[],u=o[e++];return n.forEach(function(n,u){r.push({key:n,values:t(u,e)})}),u?r.sort(function(n,t){return u(n.key,t.key)}):r}var e,r,u={},i=[],o=[];return u.map=function(t,e){return n(e,t,0)},u.entries=function(e){return t(n(ta.map,e,0),0)},u.key=function(n){return i.push(n),u},u.sortKeys=function(n){return o[i.length-1]=n,u},u.sortValues=function(n){return e=n,u},u.rollup=function(n){return r=n,u},u},ta.set=function(n){var t=new m;if(n)for(var e=0,r=n.length;r>e;++e)t.add(n[e]);return t},c(m,{has:h,add:function(n){return this._[s(n+="")]=!0,n},remove:g,values:p,size:v,empty:d,forEach:function(n){for(var t in this._)n.call(this,f(t))}}),ta.behavior={},ta.rebind=function(n,t){for(var e,r=1,u=arguments.length;++r<u;)n[e=arguments[r]]=M(n,t,t[e]);return n};var da=["webkit","ms","moz","Moz","o","O"];ta.dispatch=function(){for(var n=new _,t=-1,e=arguments.length;++t<e;)n[arguments[t]]=w(n);return n},_.prototype.on=function(n,t){var e=n.indexOf("."),r="";if(e>=0&&(r=n.slice(e+1),n=n.slice(0,e)),n)return arguments.length<2?this[n].on(r):this[n].on(r,t);if(2===arguments.length){if(null==t)for(n in this)this.hasOwnProperty(n)&&this[n].on(r,null);return this}},ta.event=null,ta.requote=function(n){return n.replace(ma,"\\$&")};var ma=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g,ya={}.__proto__?function(n,t){n.__proto__=t}:function(n,t){for(var e in t)n[e]=t[e]},Ma=function(n,t){return t.querySelector(n)},xa=function(n,t){return t.querySelectorAll(n)},ba=function(n,t){var e=n.matches||n[x(n,"matchesSelector")];return(ba=function(n,t){return e.call(n,t)})(n,t)};"function"==typeof Sizzle&&(Ma=function(n,t){return Sizzle(n,t)[0]||null},xa=Sizzle,ba=Sizzle.matchesSelector),ta.selection=function(){return ta.select(ua.documentElement)};var _a=ta.selection.prototype=[];_a.select=function(n){var t,e,r,u,i=[];n=N(n);for(var o=-1,a=this.length;++o<a;){i.push(t=[]),t.parentNode=(r=this[o]).parentNode;for(var c=-1,l=r.length;++c<l;)(u=r[c])?(t.push(e=n.call(u,u.__data__,c,o)),e&&"__data__"in u&&(e.__data__=u.__data__)):t.push(null)}return A(i)},_a.selectAll=function(n){var t,e,r=[];n=C(n);for(var u=-1,i=this.length;++u<i;)for(var o=this[u],a=-1,c=o.length;++a<c;)(e=o[a])&&(r.push(t=ra(n.call(e,e.__data__,a,u))),t.parentNode=e);return A(r)};var wa={svg:"http://www.w3.org/2000/svg",xhtml:"http://www.w3.org/1999/xhtml",xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"};ta.ns={prefix:wa,qualify:function(n){var t=n.indexOf(":"),e=n;return t>=0&&(e=n.slice(0,t),n=n.slice(t+1)),wa.hasOwnProperty(e)?{space:wa[e],local:n}:n}},_a.attr=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node();return n=ta.ns.qualify(n),n.local?e.getAttributeNS(n.space,n.local):e.getAttribute(n)}for(t in n)this.each(z(t,n[t]));return this}return this.each(z(n,t))},_a.classed=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node(),r=(n=T(n)).length,u=-1;if(t=e.classList){for(;++u<r;)if(!t.contains(n[u]))return!1}else for(t=e.getAttribute("class");++u<r;)if(!L(n[u]).test(t))return!1;return!0}for(t in n)this.each(R(t,n[t]));return this}return this.each(R(n,t))},_a.style=function(n,e,r){var u=arguments.length;if(3>u){if("string"!=typeof n){2>u&&(e="");for(r in n)this.each(P(r,n[r],e));return this}if(2>u){var i=this.node();return t(i).getComputedStyle(i,null).getPropertyValue(n)}r=""}return this.each(P(n,e,r))},_a.property=function(n,t){if(arguments.length<2){if("string"==typeof n)return this.node()[n];for(t in n)this.each(U(t,n[t]));return this}return this.each(U(n,t))},_a.text=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.textContent=null==t?"":t}:null==n?function(){this.textContent=""}:function(){this.textContent=n}):this.node().textContent},_a.html=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.innerHTML=null==t?"":t}:null==n?function(){this.innerHTML=""}:function(){this.innerHTML=n}):this.node().innerHTML},_a.append=function(n){return n=j(n),this.select(function(){return this.appendChild(n.apply(this,arguments))})},_a.insert=function(n,t){return n=j(n),t=N(t),this.select(function(){return this.insertBefore(n.apply(this,arguments),t.apply(this,arguments)||null)})},_a.remove=function(){return this.each(F)},_a.data=function(n,t){function e(n,e){var r,u,i,o=n.length,f=e.length,h=Math.min(o,f),g=new Array(f),p=new Array(f),v=new Array(o);if(t){var d,m=new l,y=new Array(o);for(r=-1;++r<o;)m.has(d=t.call(u=n[r],u.__data__,r))?v[r]=u:m.set(d,u),y[r]=d;for(r=-1;++r<f;)(u=m.get(d=t.call(e,i=e[r],r)))?u!==!0&&(g[r]=u,u.__data__=i):p[r]=H(i),m.set(d,!0);for(r=-1;++r<o;)m.get(y[r])!==!0&&(v[r]=n[r])}else{for(r=-1;++r<h;)u=n[r],i=e[r],u?(u.__data__=i,g[r]=u):p[r]=H(i);for(;f>r;++r)p[r]=H(e[r]);for(;o>r;++r)v[r]=n[r]}p.update=g,p.parentNode=g.parentNode=v.parentNode=n.parentNode,a.push(p),c.push(g),s.push(v)}var r,u,i=-1,o=this.length;if(!arguments.length){for(n=new Array(o=(r=this[0]).length);++i<o;)(u=r[i])&&(n[i]=u.__data__);return n}var a=Z([]),c=A([]),s=A([]);if("function"==typeof n)for(;++i<o;)e(r=this[i],n.call(r,r.parentNode.__data__,i));else for(;++i<o;)e(r=this[i],n);return c.enter=function(){return a},c.exit=function(){return s},c},_a.datum=function(n){return arguments.length?this.property("__data__",n):this.property("__data__")},_a.filter=function(n){var t,e,r,u=[];"function"!=typeof n&&(n=O(n));for(var i=0,o=this.length;o>i;i++){u.push(t=[]),t.parentNode=(e=this[i]).parentNode;for(var a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return A(u)},_a.order=function(){for(var n=-1,t=this.length;++n<t;)for(var e,r=this[n],u=r.length-1,i=r[u];--u>=0;)(e=r[u])&&(i&&i!==e.nextSibling&&i.parentNode.insertBefore(e,i),i=e);return this},_a.sort=function(n){n=I.apply(this,arguments);for(var t=-1,e=this.length;++t<e;)this[t].sort(n);return this.order()},_a.each=function(n){return Y(this,function(t,e,r){n.call(t,t.__data__,e,r)})},_a.call=function(n){var t=ra(arguments);return n.apply(t[0]=this,t),this},_a.empty=function(){return!this.node()},_a.node=function(){for(var n=0,t=this.length;t>n;n++)for(var e=this[n],r=0,u=e.length;u>r;r++){var i=e[r];if(i)return i}return null},_a.size=function(){var n=0;return Y(this,function(){++n}),n};var Sa=[];ta.selection.enter=Z,ta.selection.enter.prototype=Sa,Sa.append=_a.append,Sa.empty=_a.empty,Sa.node=_a.node,Sa.call=_a.call,Sa.size=_a.size,Sa.select=function(n){for(var t,e,r,u,i,o=[],a=-1,c=this.length;++a<c;){r=(u=this[a]).update,o.push(t=[]),t.parentNode=u.parentNode;for(var l=-1,s=u.length;++l<s;)(i=u[l])?(t.push(r[l]=e=n.call(u.parentNode,i.__data__,l,a)),e.__data__=i.__data__):t.push(null)}return A(o)},Sa.insert=function(n,t){return arguments.length<2&&(t=V(this)),_a.insert.call(this,n,t)},ta.select=function(t){var e;return"string"==typeof t?(e=[Ma(t,ua)],e.parentNode=ua.documentElement):(e=[t],e.parentNode=n(t)),A([e])},ta.selectAll=function(n){var t;return"string"==typeof n?(t=ra(xa(n,ua)),t.parentNode=ua.documentElement):(t=n,t.parentNode=null),A([t])},_a.on=function(n,t,e){var r=arguments.length;if(3>r){if("string"!=typeof n){2>r&&(t=!1);for(e in n)this.each(X(e,n[e],t));return this}if(2>r)return(r=this.node()["__on"+n])&&r._;e=!1}return this.each(X(n,t,e))};var ka=ta.map({mouseenter:"mouseover",mouseleave:"mouseout"});ua&&ka.forEach(function(n){"on"+n in ua&&ka.remove(n)});var Ea,Aa=0;ta.mouse=function(n){return J(n,k())};var Na=this.navigator&&/WebKit/.test(this.navigator.userAgent)?-1:0;ta.touch=function(n,t,e){if(arguments.length<3&&(e=t,t=k().changedTouches),t)for(var r,u=0,i=t.length;i>u;++u)if((r=t[u]).identifier===e)return J(n,r)},ta.behavior.drag=function(){function n(){this.on("mousedown.drag",i).on("touchstart.drag",o)}function e(n,t,e,i,o){return function(){function a(){var n,e,r=t(h,v);r&&(n=r[0]-M[0],e=r[1]-M[1],p|=n|e,M=r,g({type:"drag",x:r[0]+l[0],y:r[1]+l[1],dx:n,dy:e}))}function c(){t(h,v)&&(m.on(i+d,null).on(o+d,null),y(p&&ta.event.target===f),g({type:"dragend"}))}var l,s=this,f=ta.event.target,h=s.parentNode,g=r.of(s,arguments),p=0,v=n(),d=".drag"+(null==v?"":"-"+v),m=ta.select(e(f)).on(i+d,a).on(o+d,c),y=W(f),M=t(h,v);u?(l=u.apply(s,arguments),l=[l.x-M[0],l.y-M[1]]):l=[0,0],g({type:"dragstart"})}}var r=E(n,"drag","dragstart","dragend"),u=null,i=e(b,ta.mouse,t,"mousemove","mouseup"),o=e(G,ta.touch,y,"touchmove","touchend");return n.origin=function(t){return arguments.length?(u=t,n):u},ta.rebind(n,r,"on")},ta.touches=function(n,t){return arguments.length<2&&(t=k().touches),t?ra(t).map(function(t){var e=J(n,t);return e.identifier=t.identifier,e}):[]};var Ca=1e-6,za=Ca*Ca,qa=Math.PI,La=2*qa,Ta=La-Ca,Ra=qa/2,Da=qa/180,Pa=180/qa,Ua=Math.SQRT2,ja=2,Fa=4;ta.interpolateZoom=function(n,t){function e(n){var t=n*y;if(m){var e=rt(v),o=i/(ja*h)*(e*ut(Ua*t+v)-et(v));return[r+o*l,u+o*s,i*e/rt(Ua*t+v)]}return[r+n*l,u+n*s,i*Math.exp(Ua*t)]}var r=n[0],u=n[1],i=n[2],o=t[0],a=t[1],c=t[2],l=o-r,s=a-u,f=l*l+s*s,h=Math.sqrt(f),g=(c*c-i*i+Fa*f)/(2*i*ja*h),p=(c*c-i*i-Fa*f)/(2*c*ja*h),v=Math.log(Math.sqrt(g*g+1)-g),d=Math.log(Math.sqrt(p*p+1)-p),m=d-v,y=(m||Math.log(c/i))/Ua;return e.duration=1e3*y,e},ta.behavior.zoom=function(){function n(n){n.on(q,f).on(Oa+".zoom",g).on("dblclick.zoom",p).on(R,h)}function e(n){return[(n[0]-k.x)/k.k,(n[1]-k.y)/k.k]}function r(n){return[n[0]*k.k+k.x,n[1]*k.k+k.y]}function u(n){k.k=Math.max(N[0],Math.min(N[1],n))}function i(n,t){t=r(t),k.x+=n[0]-t[0],k.y+=n[1]-t[1]}function o(t,e,r,o){t.__chart__={x:k.x,y:k.y,k:k.k},u(Math.pow(2,o)),i(d=e,r),t=ta.select(t),C>0&&(t=t.transition().duration(C)),t.call(n.event)}function a(){b&&b.domain(x.range().map(function(n){return(n-k.x)/k.k}).map(x.invert)),w&&w.domain(_.range().map(function(n){return(n-k.y)/k.k}).map(_.invert))}function c(n){z++||n({type:"zoomstart"})}function l(n){a(),n({type:"zoom",scale:k.k,translate:[k.x,k.y]})}function s(n){--z||n({type:"zoomend"}),d=null}function f(){function n(){f=1,i(ta.mouse(u),g),l(a)}function r(){h.on(L,null).on(T,null),p(f&&ta.event.target===o),s(a)}var u=this,o=ta.event.target,a=D.of(u,arguments),f=0,h=ta.select(t(u)).on(L,n).on(T,r),g=e(ta.mouse(u)),p=W(u);Dl.call(u),c(a)}function h(){function n(){var n=ta.touches(p);return g=k.k,n.forEach(function(n){n.identifier in d&&(d[n.identifier]=e(n))}),n}function t(){var t=ta.event.target;ta.select(t).on(x,r).on(b,a),_.push(t);for(var e=ta.event.changedTouches,u=0,i=e.length;i>u;++u)d[e[u].identifier]=null;var c=n(),l=Date.now();if(1===c.length){if(500>l-M){var s=c[0];o(p,s,d[s.identifier],Math.floor(Math.log(k.k)/Math.LN2)+1),S()}M=l}else if(c.length>1){var s=c[0],f=c[1],h=s[0]-f[0],g=s[1]-f[1];m=h*h+g*g}}function r(){var n,t,e,r,o=ta.touches(p);Dl.call(p);for(var a=0,c=o.length;c>a;++a,r=null)if(e=o[a],r=d[e.identifier]){if(t)break;n=e,t=r}if(r){var s=(s=e[0]-n[0])*s+(s=e[1]-n[1])*s,f=m&&Math.sqrt(s/m);n=[(n[0]+e[0])/2,(n[1]+e[1])/2],t=[(t[0]+r[0])/2,(t[1]+r[1])/2],u(f*g)}M=null,i(n,t),l(v)}function a(){if(ta.event.touches.length){for(var t=ta.event.changedTouches,e=0,r=t.length;r>e;++e)delete d[t[e].identifier];for(var u in d)return void n()}ta.selectAll(_).on(y,null),w.on(q,f).on(R,h),E(),s(v)}var g,p=this,v=D.of(p,arguments),d={},m=0,y=".zoom-"+ta.event.changedTouches[0].identifier,x="touchmove"+y,b="touchend"+y,_=[],w=ta.select(p),E=W(p);t(),c(v),w.on(q,null).on(R,t)}function g(){var n=D.of(this,arguments);y?clearTimeout(y):(v=e(d=m||ta.mouse(this)),Dl.call(this),c(n)),y=setTimeout(function(){y=null,s(n)},50),S(),u(Math.pow(2,.002*Ha())*k.k),i(d,v),l(n)}function p(){var n=ta.mouse(this),t=Math.log(k.k)/Math.LN2;o(this,n,e(n),ta.event.shiftKey?Math.ceil(t)-1:Math.floor(t)+1)}var v,d,m,y,M,x,b,_,w,k={x:0,y:0,k:1},A=[960,500],N=Ia,C=250,z=0,q="mousedown.zoom",L="mousemove.zoom",T="mouseup.zoom",R="touchstart.zoom",D=E(n,"zoomstart","zoom","zoomend");return Oa||(Oa="onwheel"in ua?(Ha=function(){return-ta.event.deltaY*(ta.event.deltaMode?120:1)},"wheel"):"onmousewheel"in ua?(Ha=function(){return ta.event.wheelDelta},"mousewheel"):(Ha=function(){return-ta.event.detail},"MozMousePixelScroll")),n.event=function(n){n.each(function(){var n=D.of(this,arguments),t=k;Tl?ta.select(this).transition().each("start.zoom",function(){k=this.__chart__||{x:0,y:0,k:1},c(n)}).tween("zoom:zoom",function(){var e=A[0],r=A[1],u=d?d[0]:e/2,i=d?d[1]:r/2,o=ta.interpolateZoom([(u-k.x)/k.k,(i-k.y)/k.k,e/k.k],[(u-t.x)/t.k,(i-t.y)/t.k,e/t.k]);return function(t){var r=o(t),a=e/r[2];this.__chart__=k={x:u-r[0]*a,y:i-r[1]*a,k:a},l(n)}}).each("interrupt.zoom",function(){s(n)}).each("end.zoom",function(){s(n)}):(this.__chart__=k,c(n),l(n),s(n))})},n.translate=function(t){return arguments.length?(k={x:+t[0],y:+t[1],k:k.k},a(),n):[k.x,k.y]},n.scale=function(t){return arguments.length?(k={x:k.x,y:k.y,k:+t},a(),n):k.k},n.scaleExtent=function(t){return arguments.length?(N=null==t?Ia:[+t[0],+t[1]],n):N},n.center=function(t){return arguments.length?(m=t&&[+t[0],+t[1]],n):m},n.size=function(t){return arguments.length?(A=t&&[+t[0],+t[1]],n):A},n.duration=function(t){return arguments.length?(C=+t,n):C},n.x=function(t){return arguments.length?(b=t,x=t.copy(),k={x:0,y:0,k:1},n):b},n.y=function(t){return arguments.length?(w=t,_=t.copy(),k={x:0,y:0,k:1},n):w},ta.rebind(n,D,"on")};var Ha,Oa,Ia=[0,1/0];ta.color=ot,ot.prototype.toString=function(){return this.rgb()+""},ta.hsl=at;var Ya=at.prototype=new ot;Ya.brighter=function(n){return n=Math.pow(.7,arguments.length?n:1),new at(this.h,this.s,this.l/n)},Ya.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),new at(this.h,this.s,n*this.l)},Ya.rgb=function(){return ct(this.h,this.s,this.l)},ta.hcl=lt;var Za=lt.prototype=new ot;Za.brighter=function(n){return new lt(this.h,this.c,Math.min(100,this.l+Va*(arguments.length?n:1)))},Za.darker=function(n){return new lt(this.h,this.c,Math.max(0,this.l-Va*(arguments.length?n:1)))},Za.rgb=function(){return st(this.h,this.c,this.l).rgb()},ta.lab=ft;var Va=18,Xa=.95047,$a=1,Ba=1.08883,Wa=ft.prototype=new ot;Wa.brighter=function(n){return new ft(Math.min(100,this.l+Va*(arguments.length?n:1)),this.a,this.b)},Wa.darker=function(n){return new ft(Math.max(0,this.l-Va*(arguments.length?n:1)),this.a,this.b)},Wa.rgb=function(){return ht(this.l,this.a,this.b)},ta.rgb=mt;var Ja=mt.prototype=new ot;Ja.brighter=function(n){n=Math.pow(.7,arguments.length?n:1);var t=this.r,e=this.g,r=this.b,u=30;return t||e||r?(t&&u>t&&(t=u),e&&u>e&&(e=u),r&&u>r&&(r=u),new mt(Math.min(255,t/n),Math.min(255,e/n),Math.min(255,r/n))):new mt(u,u,u)},Ja.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),new mt(n*this.r,n*this.g,n*this.b)},Ja.hsl=function(){return _t(this.r,this.g,this.b)},Ja.toString=function(){return"#"+xt(this.r)+xt(this.g)+xt(this.b)};var Ga=ta.map({aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074});Ga.forEach(function(n,t){Ga.set(n,yt(t))}),ta.functor=Et,ta.xhr=At(y),ta.dsv=function(n,t){function e(n,e,i){arguments.length<3&&(i=e,e=null);var o=Nt(n,t,null==e?r:u(e),i);return o.row=function(n){return arguments.length?o.response(null==(e=n)?r:u(n)):e},o}function r(n){return e.parse(n.responseText)}function u(n){return function(t){return e.parse(t.responseText,n)}}function i(t){return t.map(o).join(n)}function o(n){return a.test(n)?'"'+n.replace(/\"/g,'""')+'"':n}var a=new RegExp('["'+n+"\n]"),c=n.charCodeAt(0);return e.parse=function(n,t){var r;return e.parseRows(n,function(n,e){if(r)return r(n,e-1);var u=new Function("d","return {"+n.map(function(n,t){return JSON.stringify(n)+": d["+t+"]"}).join(",")+"}");r=t?function(n,e){return t(u(n),e)}:u})},e.parseRows=function(n,t){function e(){if(s>=l)return o;if(u)return u=!1,i;var t=s;if(34===n.charCodeAt(t)){for(var e=t;e++<l;)if(34===n.charCodeAt(e)){if(34!==n.charCodeAt(e+1))break;++e}s=e+2;var r=n.charCodeAt(e+1);return 13===r?(u=!0,10===n.charCodeAt(e+2)&&++s):10===r&&(u=!0),n.slice(t+1,e).replace(/""/g,'"')}for(;l>s;){var r=n.charCodeAt(s++),a=1;if(10===r)u=!0;else if(13===r)u=!0,10===n.charCodeAt(s)&&(++s,++a);else if(r!==c)continue;return n.slice(t,s-a)}return n.slice(t)}for(var r,u,i={},o={},a=[],l=n.length,s=0,f=0;(r=e())!==o;){for(var h=[];r!==i&&r!==o;)h.push(r),r=e();t&&null==(h=t(h,f++))||a.push(h)}return a},e.format=function(t){if(Array.isArray(t[0]))return e.formatRows(t);var r=new m,u=[];return t.forEach(function(n){for(var t in n)r.has(t)||u.push(r.add(t))}),[u.map(o).join(n)].concat(t.map(function(t){return u.map(function(n){return o(t[n])}).join(n)})).join("\n")},e.formatRows=function(n){return n.map(i).join("\n")},e},ta.csv=ta.dsv(",","text/csv"),ta.tsv=ta.dsv("	","text/tab-separated-values");var Ka,Qa,nc,tc,ec,rc=this[x(this,"requestAnimationFrame")]||function(n){setTimeout(n,17)};ta.timer=function(n,t,e){var r=arguments.length;2>r&&(t=0),3>r&&(e=Date.now());var u=e+t,i={c:n,t:u,f:!1,n:null};Qa?Qa.n=i:Ka=i,Qa=i,nc||(tc=clearTimeout(tc),nc=1,rc(qt))},ta.timer.flush=function(){Lt(),Tt()},ta.round=function(n,t){return t?Math.round(n*(t=Math.pow(10,t)))/t:Math.round(n)};var uc=["y","z","a","f","p","n","\xb5","m","","k","M","G","T","P","E","Z","Y"].map(Dt);ta.formatPrefix=function(n,t){var e=0;return n&&(0>n&&(n*=-1),t&&(n=ta.round(n,Rt(n,t))),e=1+Math.floor(1e-12+Math.log(n)/Math.LN10),e=Math.max(-24,Math.min(24,3*Math.floor((e-1)/3)))),uc[8+e/3]};var ic=/(?:([^{])?([<>=^]))?([+\- ])?([$#])?(0)?(\d+)?(,)?(\.-?\d+)?([a-z%])?/i,oc=ta.map({b:function(n){return n.toString(2)},c:function(n){return String.fromCharCode(n)},o:function(n){return n.toString(8)},x:function(n){return n.toString(16)},X:function(n){return n.toString(16).toUpperCase()},g:function(n,t){return n.toPrecision(t)},e:function(n,t){return n.toExponential(t)},f:function(n,t){return n.toFixed(t)},r:function(n,t){return(n=ta.round(n,Rt(n,t))).toFixed(Math.max(0,Math.min(20,Rt(n*(1+1e-15),t))))}}),ac=ta.time={},cc=Date;jt.prototype={getDate:function(){return this._.getUTCDate()},getDay:function(){return this._.getUTCDay()},getFullYear:function(){return this._.getUTCFullYear()},getHours:function(){return this._.getUTCHours()},getMilliseconds:function(){return this._.getUTCMilliseconds()},getMinutes:function(){return this._.getUTCMinutes()},getMonth:function(){return this._.getUTCMonth()},getSeconds:function(){return this._.getUTCSeconds()},getTime:function(){return this._.getTime()},getTimezoneOffset:function(){return 0},valueOf:function(){return this._.valueOf()},setDate:function(){lc.setUTCDate.apply(this._,arguments)},setDay:function(){lc.setUTCDay.apply(this._,arguments)},setFullYear:function(){lc.setUTCFullYear.apply(this._,arguments)},setHours:function(){lc.setUTCHours.apply(this._,arguments)},setMilliseconds:function(){lc.setUTCMilliseconds.apply(this._,arguments)},setMinutes:function(){lc.setUTCMinutes.apply(this._,arguments)},setMonth:function(){lc.setUTCMonth.apply(this._,arguments)},setSeconds:function(){lc.setUTCSeconds.apply(this._,arguments)},setTime:function(){lc.setTime.apply(this._,arguments)}};var lc=Date.prototype;ac.year=Ft(function(n){return n=ac.day(n),n.setMonth(0,1),n},function(n,t){n.setFullYear(n.getFullYear()+t)},function(n){return n.getFullYear()}),ac.years=ac.year.range,ac.years.utc=ac.year.utc.range,ac.day=Ft(function(n){var t=new cc(2e3,0);return t.setFullYear(n.getFullYear(),n.getMonth(),n.getDate()),t},function(n,t){n.setDate(n.getDate()+t)},function(n){return n.getDate()-1}),ac.days=ac.day.range,ac.days.utc=ac.day.utc.range,ac.dayOfYear=function(n){var t=ac.year(n);return Math.floor((n-t-6e4*(n.getTimezoneOffset()-t.getTimezoneOffset()))/864e5)},["sunday","monday","tuesday","wednesday","thursday","friday","saturday"].forEach(function(n,t){t=7-t;var e=ac[n]=Ft(function(n){return(n=ac.day(n)).setDate(n.getDate()-(n.getDay()+t)%7),n},function(n,t){n.setDate(n.getDate()+7*Math.floor(t))},function(n){var e=ac.year(n).getDay();return Math.floor((ac.dayOfYear(n)+(e+t)%7)/7)-(e!==t)});ac[n+"s"]=e.range,ac[n+"s"].utc=e.utc.range,ac[n+"OfYear"]=function(n){var e=ac.year(n).getDay();return Math.floor((ac.dayOfYear(n)+(e+t)%7)/7)}}),ac.week=ac.sunday,ac.weeks=ac.sunday.range,ac.weeks.utc=ac.sunday.utc.range,ac.weekOfYear=ac.sundayOfYear;var sc={"-":"",_:" ",0:"0"},fc=/^\s*\d+/,hc=/^%/;ta.locale=function(n){return{numberFormat:Pt(n),timeFormat:Ot(n)}};var gc=ta.locale({decimal:".",thousands:",",grouping:[3],currency:["$",""],dateTime:"%a %b %e %X %Y",date:"%m/%d/%Y",time:"%H:%M:%S",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});ta.format=gc.numberFormat,ta.geo={},ce.prototype={s:0,t:0,add:function(n){le(n,this.t,pc),le(pc.s,this.s,this),this.s?this.t+=pc.t:this.s=pc.t
+},reset:function(){this.s=this.t=0},valueOf:function(){return this.s}};var pc=new ce;ta.geo.stream=function(n,t){n&&vc.hasOwnProperty(n.type)?vc[n.type](n,t):se(n,t)};var vc={Feature:function(n,t){se(n.geometry,t)},FeatureCollection:function(n,t){for(var e=n.features,r=-1,u=e.length;++r<u;)se(e[r].geometry,t)}},dc={Sphere:function(n,t){t.sphere()},Point:function(n,t){n=n.coordinates,t.point(n[0],n[1],n[2])},MultiPoint:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)n=e[r],t.point(n[0],n[1],n[2])},LineString:function(n,t){fe(n.coordinates,t,0)},MultiLineString:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)fe(e[r],t,0)},Polygon:function(n,t){he(n.coordinates,t)},MultiPolygon:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)he(e[r],t)},GeometryCollection:function(n,t){for(var e=n.geometries,r=-1,u=e.length;++r<u;)se(e[r],t)}};ta.geo.area=function(n){return mc=0,ta.geo.stream(n,Mc),mc};var mc,yc=new ce,Mc={sphere:function(){mc+=4*qa},point:b,lineStart:b,lineEnd:b,polygonStart:function(){yc.reset(),Mc.lineStart=ge},polygonEnd:function(){var n=2*yc;mc+=0>n?4*qa+n:n,Mc.lineStart=Mc.lineEnd=Mc.point=b}};ta.geo.bounds=function(){function n(n,t){M.push(x=[s=n,h=n]),f>t&&(f=t),t>g&&(g=t)}function t(t,e){var r=pe([t*Da,e*Da]);if(m){var u=de(m,r),i=[u[1],-u[0],0],o=de(i,u);Me(o),o=xe(o);var c=t-p,l=c>0?1:-1,v=o[0]*Pa*l,d=ga(c)>180;if(d^(v>l*p&&l*t>v)){var y=o[1]*Pa;y>g&&(g=y)}else if(v=(v+360)%360-180,d^(v>l*p&&l*t>v)){var y=-o[1]*Pa;f>y&&(f=y)}else f>e&&(f=e),e>g&&(g=e);d?p>t?a(s,t)>a(s,h)&&(h=t):a(t,h)>a(s,h)&&(s=t):h>=s?(s>t&&(s=t),t>h&&(h=t)):t>p?a(s,t)>a(s,h)&&(h=t):a(t,h)>a(s,h)&&(s=t)}else n(t,e);m=r,p=t}function e(){b.point=t}function r(){x[0]=s,x[1]=h,b.point=n,m=null}function u(n,e){if(m){var r=n-p;y+=ga(r)>180?r+(r>0?360:-360):r}else v=n,d=e;Mc.point(n,e),t(n,e)}function i(){Mc.lineStart()}function o(){u(v,d),Mc.lineEnd(),ga(y)>Ca&&(s=-(h=180)),x[0]=s,x[1]=h,m=null}function a(n,t){return(t-=n)<0?t+360:t}function c(n,t){return n[0]-t[0]}function l(n,t){return t[0]<=t[1]?t[0]<=n&&n<=t[1]:n<t[0]||t[1]<n}var s,f,h,g,p,v,d,m,y,M,x,b={point:n,lineStart:e,lineEnd:r,polygonStart:function(){b.point=u,b.lineStart=i,b.lineEnd=o,y=0,Mc.polygonStart()},polygonEnd:function(){Mc.polygonEnd(),b.point=n,b.lineStart=e,b.lineEnd=r,0>yc?(s=-(h=180),f=-(g=90)):y>Ca?g=90:-Ca>y&&(f=-90),x[0]=s,x[1]=h}};return function(n){g=h=-(s=f=1/0),M=[],ta.geo.stream(n,b);var t=M.length;if(t){M.sort(c);for(var e,r=1,u=M[0],i=[u];t>r;++r)e=M[r],l(e[0],u)||l(e[1],u)?(a(u[0],e[1])>a(u[0],u[1])&&(u[1]=e[1]),a(e[0],u[1])>a(u[0],u[1])&&(u[0]=e[0])):i.push(u=e);for(var o,e,p=-1/0,t=i.length-1,r=0,u=i[t];t>=r;u=e,++r)e=i[r],(o=a(u[1],e[0]))>p&&(p=o,s=e[0],h=u[1])}return M=x=null,1/0===s||1/0===f?[[0/0,0/0],[0/0,0/0]]:[[s,f],[h,g]]}}(),ta.geo.centroid=function(n){xc=bc=_c=wc=Sc=kc=Ec=Ac=Nc=Cc=zc=0,ta.geo.stream(n,qc);var t=Nc,e=Cc,r=zc,u=t*t+e*e+r*r;return za>u&&(t=kc,e=Ec,r=Ac,Ca>bc&&(t=_c,e=wc,r=Sc),u=t*t+e*e+r*r,za>u)?[0/0,0/0]:[Math.atan2(e,t)*Pa,tt(r/Math.sqrt(u))*Pa]};var xc,bc,_c,wc,Sc,kc,Ec,Ac,Nc,Cc,zc,qc={sphere:b,point:_e,lineStart:Se,lineEnd:ke,polygonStart:function(){qc.lineStart=Ee},polygonEnd:function(){qc.lineStart=Se}},Lc=Le(Ne,Pe,je,[-qa,-qa/2]),Tc=1e9;ta.geo.clipExtent=function(){var n,t,e,r,u,i,o={stream:function(n){return u&&(u.valid=!1),u=i(n),u.valid=!0,u},extent:function(a){return arguments.length?(i=Ie(n=+a[0][0],t=+a[0][1],e=+a[1][0],r=+a[1][1]),u&&(u.valid=!1,u=null),o):[[n,t],[e,r]]}};return o.extent([[0,0],[960,500]])},(ta.geo.conicEqualArea=function(){return Ye(Ze)}).raw=Ze,ta.geo.albers=function(){return ta.geo.conicEqualArea().rotate([96,0]).center([-.6,38.7]).parallels([29.5,45.5]).scale(1070)},ta.geo.albersUsa=function(){function n(n){var i=n[0],o=n[1];return t=null,e(i,o),t||(r(i,o),t)||u(i,o),t}var t,e,r,u,i=ta.geo.albers(),o=ta.geo.conicEqualArea().rotate([154,0]).center([-2,58.5]).parallels([55,65]),a=ta.geo.conicEqualArea().rotate([157,0]).center([-3,19.9]).parallels([8,18]),c={point:function(n,e){t=[n,e]}};return n.invert=function(n){var t=i.scale(),e=i.translate(),r=(n[0]-e[0])/t,u=(n[1]-e[1])/t;return(u>=.12&&.234>u&&r>=-.425&&-.214>r?o:u>=.166&&.234>u&&r>=-.214&&-.115>r?a:i).invert(n)},n.stream=function(n){var t=i.stream(n),e=o.stream(n),r=a.stream(n);return{point:function(n,u){t.point(n,u),e.point(n,u),r.point(n,u)},sphere:function(){t.sphere(),e.sphere(),r.sphere()},lineStart:function(){t.lineStart(),e.lineStart(),r.lineStart()},lineEnd:function(){t.lineEnd(),e.lineEnd(),r.lineEnd()},polygonStart:function(){t.polygonStart(),e.polygonStart(),r.polygonStart()},polygonEnd:function(){t.polygonEnd(),e.polygonEnd(),r.polygonEnd()}}},n.precision=function(t){return arguments.length?(i.precision(t),o.precision(t),a.precision(t),n):i.precision()},n.scale=function(t){return arguments.length?(i.scale(t),o.scale(.35*t),a.scale(t),n.translate(i.translate())):i.scale()},n.translate=function(t){if(!arguments.length)return i.translate();var l=i.scale(),s=+t[0],f=+t[1];return e=i.translate(t).clipExtent([[s-.455*l,f-.238*l],[s+.455*l,f+.238*l]]).stream(c).point,r=o.translate([s-.307*l,f+.201*l]).clipExtent([[s-.425*l+Ca,f+.12*l+Ca],[s-.214*l-Ca,f+.234*l-Ca]]).stream(c).point,u=a.translate([s-.205*l,f+.212*l]).clipExtent([[s-.214*l+Ca,f+.166*l+Ca],[s-.115*l-Ca,f+.234*l-Ca]]).stream(c).point,n},n.scale(1070)};var Rc,Dc,Pc,Uc,jc,Fc,Hc={point:b,lineStart:b,lineEnd:b,polygonStart:function(){Dc=0,Hc.lineStart=Ve},polygonEnd:function(){Hc.lineStart=Hc.lineEnd=Hc.point=b,Rc+=ga(Dc/2)}},Oc={point:Xe,lineStart:b,lineEnd:b,polygonStart:b,polygonEnd:b},Ic={point:We,lineStart:Je,lineEnd:Ge,polygonStart:function(){Ic.lineStart=Ke},polygonEnd:function(){Ic.point=We,Ic.lineStart=Je,Ic.lineEnd=Ge}};ta.geo.path=function(){function n(n){return n&&("function"==typeof a&&i.pointRadius(+a.apply(this,arguments)),o&&o.valid||(o=u(i)),ta.geo.stream(n,o)),i.result()}function t(){return o=null,n}var e,r,u,i,o,a=4.5;return n.area=function(n){return Rc=0,ta.geo.stream(n,u(Hc)),Rc},n.centroid=function(n){return _c=wc=Sc=kc=Ec=Ac=Nc=Cc=zc=0,ta.geo.stream(n,u(Ic)),zc?[Nc/zc,Cc/zc]:Ac?[kc/Ac,Ec/Ac]:Sc?[_c/Sc,wc/Sc]:[0/0,0/0]},n.bounds=function(n){return jc=Fc=-(Pc=Uc=1/0),ta.geo.stream(n,u(Oc)),[[Pc,Uc],[jc,Fc]]},n.projection=function(n){return arguments.length?(u=(e=n)?n.stream||tr(n):y,t()):e},n.context=function(n){return arguments.length?(i=null==(r=n)?new $e:new Qe(n),"function"!=typeof a&&i.pointRadius(a),t()):r},n.pointRadius=function(t){return arguments.length?(a="function"==typeof t?t:(i.pointRadius(+t),+t),n):a},n.projection(ta.geo.albersUsa()).context(null)},ta.geo.transform=function(n){return{stream:function(t){var e=new er(t);for(var r in n)e[r]=n[r];return e}}},er.prototype={point:function(n,t){this.stream.point(n,t)},sphere:function(){this.stream.sphere()},lineStart:function(){this.stream.lineStart()},lineEnd:function(){this.stream.lineEnd()},polygonStart:function(){this.stream.polygonStart()},polygonEnd:function(){this.stream.polygonEnd()}},ta.geo.projection=ur,ta.geo.projectionMutator=ir,(ta.geo.equirectangular=function(){return ur(ar)}).raw=ar.invert=ar,ta.geo.rotation=function(n){function t(t){return t=n(t[0]*Da,t[1]*Da),t[0]*=Pa,t[1]*=Pa,t}return n=lr(n[0]%360*Da,n[1]*Da,n.length>2?n[2]*Da:0),t.invert=function(t){return t=n.invert(t[0]*Da,t[1]*Da),t[0]*=Pa,t[1]*=Pa,t},t},cr.invert=ar,ta.geo.circle=function(){function n(){var n="function"==typeof r?r.apply(this,arguments):r,t=lr(-n[0]*Da,-n[1]*Da,0).invert,u=[];return e(null,null,1,{point:function(n,e){u.push(n=t(n,e)),n[0]*=Pa,n[1]*=Pa}}),{type:"Polygon",coordinates:[u]}}var t,e,r=[0,0],u=6;return n.origin=function(t){return arguments.length?(r=t,n):r},n.angle=function(r){return arguments.length?(e=gr((t=+r)*Da,u*Da),n):t},n.precision=function(r){return arguments.length?(e=gr(t*Da,(u=+r)*Da),n):u},n.angle(90)},ta.geo.distance=function(n,t){var e,r=(t[0]-n[0])*Da,u=n[1]*Da,i=t[1]*Da,o=Math.sin(r),a=Math.cos(r),c=Math.sin(u),l=Math.cos(u),s=Math.sin(i),f=Math.cos(i);return Math.atan2(Math.sqrt((e=f*o)*e+(e=l*s-c*f*a)*e),c*s+l*f*a)},ta.geo.graticule=function(){function n(){return{type:"MultiLineString",coordinates:t()}}function t(){return ta.range(Math.ceil(i/d)*d,u,d).map(h).concat(ta.range(Math.ceil(l/m)*m,c,m).map(g)).concat(ta.range(Math.ceil(r/p)*p,e,p).filter(function(n){return ga(n%d)>Ca}).map(s)).concat(ta.range(Math.ceil(a/v)*v,o,v).filter(function(n){return ga(n%m)>Ca}).map(f))}var e,r,u,i,o,a,c,l,s,f,h,g,p=10,v=p,d=90,m=360,y=2.5;return n.lines=function(){return t().map(function(n){return{type:"LineString",coordinates:n}})},n.outline=function(){return{type:"Polygon",coordinates:[h(i).concat(g(c).slice(1),h(u).reverse().slice(1),g(l).reverse().slice(1))]}},n.extent=function(t){return arguments.length?n.majorExtent(t).minorExtent(t):n.minorExtent()},n.majorExtent=function(t){return arguments.length?(i=+t[0][0],u=+t[1][0],l=+t[0][1],c=+t[1][1],i>u&&(t=i,i=u,u=t),l>c&&(t=l,l=c,c=t),n.precision(y)):[[i,l],[u,c]]},n.minorExtent=function(t){return arguments.length?(r=+t[0][0],e=+t[1][0],a=+t[0][1],o=+t[1][1],r>e&&(t=r,r=e,e=t),a>o&&(t=a,a=o,o=t),n.precision(y)):[[r,a],[e,o]]},n.step=function(t){return arguments.length?n.majorStep(t).minorStep(t):n.minorStep()},n.majorStep=function(t){return arguments.length?(d=+t[0],m=+t[1],n):[d,m]},n.minorStep=function(t){return arguments.length?(p=+t[0],v=+t[1],n):[p,v]},n.precision=function(t){return arguments.length?(y=+t,s=vr(a,o,90),f=dr(r,e,y),h=vr(l,c,90),g=dr(i,u,y),n):y},n.majorExtent([[-180,-90+Ca],[180,90-Ca]]).minorExtent([[-180,-80-Ca],[180,80+Ca]])},ta.geo.greatArc=function(){function n(){return{type:"LineString",coordinates:[t||r.apply(this,arguments),e||u.apply(this,arguments)]}}var t,e,r=mr,u=yr;return n.distance=function(){return ta.geo.distance(t||r.apply(this,arguments),e||u.apply(this,arguments))},n.source=function(e){return arguments.length?(r=e,t="function"==typeof e?null:e,n):r},n.target=function(t){return arguments.length?(u=t,e="function"==typeof t?null:t,n):u},n.precision=function(){return arguments.length?n:0},n},ta.geo.interpolate=function(n,t){return Mr(n[0]*Da,n[1]*Da,t[0]*Da,t[1]*Da)},ta.geo.length=function(n){return Yc=0,ta.geo.stream(n,Zc),Yc};var Yc,Zc={sphere:b,point:b,lineStart:xr,lineEnd:b,polygonStart:b,polygonEnd:b},Vc=br(function(n){return Math.sqrt(2/(1+n))},function(n){return 2*Math.asin(n/2)});(ta.geo.azimuthalEqualArea=function(){return ur(Vc)}).raw=Vc;var Xc=br(function(n){var t=Math.acos(n);return t&&t/Math.sin(t)},y);(ta.geo.azimuthalEquidistant=function(){return ur(Xc)}).raw=Xc,(ta.geo.conicConformal=function(){return Ye(_r)}).raw=_r,(ta.geo.conicEquidistant=function(){return Ye(wr)}).raw=wr;var $c=br(function(n){return 1/n},Math.atan);(ta.geo.gnomonic=function(){return ur($c)}).raw=$c,Sr.invert=function(n,t){return[n,2*Math.atan(Math.exp(t))-Ra]},(ta.geo.mercator=function(){return kr(Sr)}).raw=Sr;var Bc=br(function(){return 1},Math.asin);(ta.geo.orthographic=function(){return ur(Bc)}).raw=Bc;var Wc=br(function(n){return 1/(1+n)},function(n){return 2*Math.atan(n)});(ta.geo.stereographic=function(){return ur(Wc)}).raw=Wc,Er.invert=function(n,t){return[-t,2*Math.atan(Math.exp(n))-Ra]},(ta.geo.transverseMercator=function(){var n=kr(Er),t=n.center,e=n.rotate;return n.center=function(n){return n?t([-n[1],n[0]]):(n=t(),[n[1],-n[0]])},n.rotate=function(n){return n?e([n[0],n[1],n.length>2?n[2]+90:90]):(n=e(),[n[0],n[1],n[2]-90])},e([0,0,90])}).raw=Er,ta.geom={},ta.geom.hull=function(n){function t(n){if(n.length<3)return[];var t,u=Et(e),i=Et(r),o=n.length,a=[],c=[];for(t=0;o>t;t++)a.push([+u.call(this,n[t],t),+i.call(this,n[t],t),t]);for(a.sort(zr),t=0;o>t;t++)c.push([a[t][0],-a[t][1]]);var l=Cr(a),s=Cr(c),f=s[0]===l[0],h=s[s.length-1]===l[l.length-1],g=[];for(t=l.length-1;t>=0;--t)g.push(n[a[l[t]][2]]);for(t=+f;t<s.length-h;++t)g.push(n[a[s[t]][2]]);return g}var e=Ar,r=Nr;return arguments.length?t(n):(t.x=function(n){return arguments.length?(e=n,t):e},t.y=function(n){return arguments.length?(r=n,t):r},t)},ta.geom.polygon=function(n){return ya(n,Jc),n};var Jc=ta.geom.polygon.prototype=[];Jc.area=function(){for(var n,t=-1,e=this.length,r=this[e-1],u=0;++t<e;)n=r,r=this[t],u+=n[1]*r[0]-n[0]*r[1];return.5*u},Jc.centroid=function(n){var t,e,r=-1,u=this.length,i=0,o=0,a=this[u-1];for(arguments.length||(n=-1/(6*this.area()));++r<u;)t=a,a=this[r],e=t[0]*a[1]-a[0]*t[1],i+=(t[0]+a[0])*e,o+=(t[1]+a[1])*e;return[i*n,o*n]},Jc.clip=function(n){for(var t,e,r,u,i,o,a=Tr(n),c=-1,l=this.length-Tr(this),s=this[l-1];++c<l;){for(t=n.slice(),n.length=0,u=this[c],i=t[(r=t.length-a)-1],e=-1;++e<r;)o=t[e],qr(o,s,u)?(qr(i,s,u)||n.push(Lr(i,o,s,u)),n.push(o)):qr(i,s,u)&&n.push(Lr(i,o,s,u)),i=o;a&&n.push(n[0]),s=u}return n};var Gc,Kc,Qc,nl,tl,el=[],rl=[];Or.prototype.prepare=function(){for(var n,t=this.edges,e=t.length;e--;)n=t[e].edge,n.b&&n.a||t.splice(e,1);return t.sort(Yr),t.length},Qr.prototype={start:function(){return this.edge.l===this.site?this.edge.a:this.edge.b},end:function(){return this.edge.l===this.site?this.edge.b:this.edge.a}},nu.prototype={insert:function(n,t){var e,r,u;if(n){if(t.P=n,t.N=n.N,n.N&&(n.N.P=t),n.N=t,n.R){for(n=n.R;n.L;)n=n.L;n.L=t}else n.R=t;e=n}else this._?(n=uu(this._),t.P=null,t.N=n,n.P=n.L=t,e=n):(t.P=t.N=null,this._=t,e=null);for(t.L=t.R=null,t.U=e,t.C=!0,n=t;e&&e.C;)r=e.U,e===r.L?(u=r.R,u&&u.C?(e.C=u.C=!1,r.C=!0,n=r):(n===e.R&&(eu(this,e),n=e,e=n.U),e.C=!1,r.C=!0,ru(this,r))):(u=r.L,u&&u.C?(e.C=u.C=!1,r.C=!0,n=r):(n===e.L&&(ru(this,e),n=e,e=n.U),e.C=!1,r.C=!0,eu(this,r))),e=n.U;this._.C=!1},remove:function(n){n.N&&(n.N.P=n.P),n.P&&(n.P.N=n.N),n.N=n.P=null;var t,e,r,u=n.U,i=n.L,o=n.R;if(e=i?o?uu(o):i:o,u?u.L===n?u.L=e:u.R=e:this._=e,i&&o?(r=e.C,e.C=n.C,e.L=i,i.U=e,e!==o?(u=e.U,e.U=n.U,n=e.R,u.L=n,e.R=o,o.U=e):(e.U=u,u=e,n=e.R)):(r=n.C,n=e),n&&(n.U=u),!r){if(n&&n.C)return void(n.C=!1);do{if(n===this._)break;if(n===u.L){if(t=u.R,t.C&&(t.C=!1,u.C=!0,eu(this,u),t=u.R),t.L&&t.L.C||t.R&&t.R.C){t.R&&t.R.C||(t.L.C=!1,t.C=!0,ru(this,t),t=u.R),t.C=u.C,u.C=t.R.C=!1,eu(this,u),n=this._;break}}else if(t=u.L,t.C&&(t.C=!1,u.C=!0,ru(this,u),t=u.L),t.L&&t.L.C||t.R&&t.R.C){t.L&&t.L.C||(t.R.C=!1,t.C=!0,eu(this,t),t=u.L),t.C=u.C,u.C=t.L.C=!1,ru(this,u),n=this._;break}t.C=!0,n=u,u=u.U}while(!n.C);n&&(n.C=!1)}}},ta.geom.voronoi=function(n){function t(n){var t=new Array(n.length),r=a[0][0],u=a[0][1],i=a[1][0],o=a[1][1];return iu(e(n),a).cells.forEach(function(e,a){var c=e.edges,l=e.site,s=t[a]=c.length?c.map(function(n){var t=n.start();return[t.x,t.y]}):l.x>=r&&l.x<=i&&l.y>=u&&l.y<=o?[[r,o],[i,o],[i,u],[r,u]]:[];s.point=n[a]}),t}function e(n){return n.map(function(n,t){return{x:Math.round(i(n,t)/Ca)*Ca,y:Math.round(o(n,t)/Ca)*Ca,i:t}})}var r=Ar,u=Nr,i=r,o=u,a=ul;return n?t(n):(t.links=function(n){return iu(e(n)).edges.filter(function(n){return n.l&&n.r}).map(function(t){return{source:n[t.l.i],target:n[t.r.i]}})},t.triangles=function(n){var t=[];return iu(e(n)).cells.forEach(function(e,r){for(var u,i,o=e.site,a=e.edges.sort(Yr),c=-1,l=a.length,s=a[l-1].edge,f=s.l===o?s.r:s.l;++c<l;)u=s,i=f,s=a[c].edge,f=s.l===o?s.r:s.l,r<i.i&&r<f.i&&au(o,i,f)<0&&t.push([n[r],n[i.i],n[f.i]])}),t},t.x=function(n){return arguments.length?(i=Et(r=n),t):r},t.y=function(n){return arguments.length?(o=Et(u=n),t):u},t.clipExtent=function(n){return arguments.length?(a=null==n?ul:n,t):a===ul?null:a},t.size=function(n){return arguments.length?t.clipExtent(n&&[[0,0],n]):a===ul?null:a&&a[1]},t)};var ul=[[-1e6,-1e6],[1e6,1e6]];ta.geom.delaunay=function(n){return ta.geom.voronoi().triangles(n)},ta.geom.quadtree=function(n,t,e,r,u){function i(n){function i(n,t,e,r,u,i,o,a){if(!isNaN(e)&&!isNaN(r))if(n.leaf){var c=n.x,s=n.y;if(null!=c)if(ga(c-e)+ga(s-r)<.01)l(n,t,e,r,u,i,o,a);else{var f=n.point;n.x=n.y=n.point=null,l(n,f,c,s,u,i,o,a),l(n,t,e,r,u,i,o,a)}else n.x=e,n.y=r,n.point=t}else l(n,t,e,r,u,i,o,a)}function l(n,t,e,r,u,o,a,c){var l=.5*(u+a),s=.5*(o+c),f=e>=l,h=r>=s,g=h<<1|f;n.leaf=!1,n=n.nodes[g]||(n.nodes[g]=su()),f?u=l:a=l,h?o=s:c=s,i(n,t,e,r,u,o,a,c)}var s,f,h,g,p,v,d,m,y,M=Et(a),x=Et(c);if(null!=t)v=t,d=e,m=r,y=u;else if(m=y=-(v=d=1/0),f=[],h=[],p=n.length,o)for(g=0;p>g;++g)s=n[g],s.x<v&&(v=s.x),s.y<d&&(d=s.y),s.x>m&&(m=s.x),s.y>y&&(y=s.y),f.push(s.x),h.push(s.y);else for(g=0;p>g;++g){var b=+M(s=n[g],g),_=+x(s,g);v>b&&(v=b),d>_&&(d=_),b>m&&(m=b),_>y&&(y=_),f.push(b),h.push(_)}var w=m-v,S=y-d;w>S?y=d+w:m=v+S;var k=su();if(k.add=function(n){i(k,n,+M(n,++g),+x(n,g),v,d,m,y)},k.visit=function(n){fu(n,k,v,d,m,y)},k.find=function(n){return hu(k,n[0],n[1],v,d,m,y)},g=-1,null==t){for(;++g<p;)i(k,n[g],f[g],h[g],v,d,m,y);--g}else n.forEach(k.add);return f=h=n=s=null,k}var o,a=Ar,c=Nr;return(o=arguments.length)?(a=cu,c=lu,3===o&&(u=e,r=t,e=t=0),i(n)):(i.x=function(n){return arguments.length?(a=n,i):a},i.y=function(n){return arguments.length?(c=n,i):c},i.extent=function(n){return arguments.length?(null==n?t=e=r=u=null:(t=+n[0][0],e=+n[0][1],r=+n[1][0],u=+n[1][1]),i):null==t?null:[[t,e],[r,u]]},i.size=function(n){return arguments.length?(null==n?t=e=r=u=null:(t=e=0,r=+n[0],u=+n[1]),i):null==t?null:[r-t,u-e]},i)},ta.interpolateRgb=gu,ta.interpolateObject=pu,ta.interpolateNumber=vu,ta.interpolateString=du;var il=/[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,ol=new RegExp(il.source,"g");ta.interpolate=mu,ta.interpolators=[function(n,t){var e=typeof t;return("string"===e?Ga.has(t)||/^(#|rgb\(|hsl\()/.test(t)?gu:du:t instanceof ot?gu:Array.isArray(t)?yu:"object"===e&&isNaN(t)?pu:vu)(n,t)}],ta.interpolateArray=yu;var al=function(){return y},cl=ta.map({linear:al,poly:ku,quad:function(){return _u},cubic:function(){return wu},sin:function(){return Eu},exp:function(){return Au},circle:function(){return Nu},elastic:Cu,back:zu,bounce:function(){return qu}}),ll=ta.map({"in":y,out:xu,"in-out":bu,"out-in":function(n){return bu(xu(n))}});ta.ease=function(n){var t=n.indexOf("-"),e=t>=0?n.slice(0,t):n,r=t>=0?n.slice(t+1):"in";return e=cl.get(e)||al,r=ll.get(r)||y,Mu(r(e.apply(null,ea.call(arguments,1))))},ta.interpolateHcl=Lu,ta.interpolateHsl=Tu,ta.interpolateLab=Ru,ta.interpolateRound=Du,ta.transform=function(n){var t=ua.createElementNS(ta.ns.prefix.svg,"g");return(ta.transform=function(n){if(null!=n){t.setAttribute("transform",n);var e=t.transform.baseVal.consolidate()}return new Pu(e?e.matrix:sl)})(n)},Pu.prototype.toString=function(){return"translate("+this.translate+")rotate("+this.rotate+")skewX("+this.skew+")scale("+this.scale+")"};var sl={a:1,b:0,c:0,d:1,e:0,f:0};ta.interpolateTransform=Hu,ta.layout={},ta.layout.bundle=function(){return function(n){for(var t=[],e=-1,r=n.length;++e<r;)t.push(Yu(n[e]));return t}},ta.layout.chord=function(){function n(){var n,l,f,h,g,p={},v=[],d=ta.range(i),m=[];for(e=[],r=[],n=0,h=-1;++h<i;){for(l=0,g=-1;++g<i;)l+=u[h][g];v.push(l),m.push(ta.range(i)),n+=l}for(o&&d.sort(function(n,t){return o(v[n],v[t])}),a&&m.forEach(function(n,t){n.sort(function(n,e){return a(u[t][n],u[t][e])})}),n=(La-s*i)/n,l=0,h=-1;++h<i;){for(f=l,g=-1;++g<i;){var y=d[h],M=m[y][g],x=u[y][M],b=l,_=l+=x*n;p[y+"-"+M]={index:y,subindex:M,startAngle:b,endAngle:_,value:x}}r[y]={index:y,startAngle:f,endAngle:l,value:(l-f)/n},l+=s}for(h=-1;++h<i;)for(g=h-1;++g<i;){var w=p[h+"-"+g],S=p[g+"-"+h];(w.value||S.value)&&e.push(w.value<S.value?{source:S,target:w}:{source:w,target:S})}c&&t()}function t(){e.sort(function(n,t){return c((n.source.value+n.target.value)/2,(t.source.value+t.target.value)/2)})}var e,r,u,i,o,a,c,l={},s=0;return l.matrix=function(n){return arguments.length?(i=(u=n)&&u.length,e=r=null,l):u},l.padding=function(n){return arguments.length?(s=n,e=r=null,l):s},l.sortGroups=function(n){return arguments.length?(o=n,e=r=null,l):o},l.sortSubgroups=function(n){return arguments.length?(a=n,e=null,l):a},l.sortChords=function(n){return arguments.length?(c=n,e&&t(),l):c},l.chords=function(){return e||n(),e},l.groups=function(){return r||n(),r},l},ta.layout.force=function(){function n(n){return function(t,e,r,u){if(t.point!==n){var i=t.cx-n.x,o=t.cy-n.y,a=u-e,c=i*i+o*o;if(c>a*a/d){if(p>c){var l=t.charge/c;n.px-=i*l,n.py-=o*l}return!0}if(t.point&&c&&p>c){var l=t.pointCharge/c;n.px-=i*l,n.py-=o*l}}return!t.charge}}function t(n){n.px=ta.event.x,n.py=ta.event.y,a.resume()}var e,r,u,i,o,a={},c=ta.dispatch("start","tick","end"),l=[1,1],s=.9,f=fl,h=hl,g=-30,p=gl,v=.1,d=.64,m=[],M=[];return a.tick=function(){if((r*=.99)<.005)return c.end({type:"end",alpha:r=0}),!0;var t,e,a,f,h,p,d,y,x,b=m.length,_=M.length;for(e=0;_>e;++e)a=M[e],f=a.source,h=a.target,y=h.x-f.x,x=h.y-f.y,(p=y*y+x*x)&&(p=r*i[e]*((p=Math.sqrt(p))-u[e])/p,y*=p,x*=p,h.x-=y*(d=f.weight/(h.weight+f.weight)),h.y-=x*d,f.x+=y*(d=1-d),f.y+=x*d);if((d=r*v)&&(y=l[0]/2,x=l[1]/2,e=-1,d))for(;++e<b;)a=m[e],a.x+=(y-a.x)*d,a.y+=(x-a.y)*d;if(g)for(Ju(t=ta.geom.quadtree(m),r,o),e=-1;++e<b;)(a=m[e]).fixed||t.visit(n(a));for(e=-1;++e<b;)a=m[e],a.fixed?(a.x=a.px,a.y=a.py):(a.x-=(a.px-(a.px=a.x))*s,a.y-=(a.py-(a.py=a.y))*s);c.tick({type:"tick",alpha:r})},a.nodes=function(n){return arguments.length?(m=n,a):m},a.links=function(n){return arguments.length?(M=n,a):M},a.size=function(n){return arguments.length?(l=n,a):l},a.linkDistance=function(n){return arguments.length?(f="function"==typeof n?n:+n,a):f},a.distance=a.linkDistance,a.linkStrength=function(n){return arguments.length?(h="function"==typeof n?n:+n,a):h},a.friction=function(n){return arguments.length?(s=+n,a):s},a.charge=function(n){return arguments.length?(g="function"==typeof n?n:+n,a):g},a.chargeDistance=function(n){return arguments.length?(p=n*n,a):Math.sqrt(p)},a.gravity=function(n){return arguments.length?(v=+n,a):v},a.theta=function(n){return arguments.length?(d=n*n,a):Math.sqrt(d)},a.alpha=function(n){return arguments.length?(n=+n,r?r=n>0?n:0:n>0&&(c.start({type:"start",alpha:r=n}),ta.timer(a.tick)),a):r},a.start=function(){function n(n,r){if(!e){for(e=new Array(c),a=0;c>a;++a)e[a]=[];for(a=0;s>a;++a){var u=M[a];e[u.source.index].push(u.target),e[u.target.index].push(u.source)}}for(var i,o=e[t],a=-1,l=o.length;++a<l;)if(!isNaN(i=o[a][n]))return i;return Math.random()*r}var t,e,r,c=m.length,s=M.length,p=l[0],v=l[1];for(t=0;c>t;++t)(r=m[t]).index=t,r.weight=0;for(t=0;s>t;++t)r=M[t],"number"==typeof r.source&&(r.source=m[r.source]),"number"==typeof r.target&&(r.target=m[r.target]),++r.source.weight,++r.target.weight;for(t=0;c>t;++t)r=m[t],isNaN(r.x)&&(r.x=n("x",p)),isNaN(r.y)&&(r.y=n("y",v)),isNaN(r.px)&&(r.px=r.x),isNaN(r.py)&&(r.py=r.y);if(u=[],"function"==typeof f)for(t=0;s>t;++t)u[t]=+f.call(this,M[t],t);else for(t=0;s>t;++t)u[t]=f;if(i=[],"function"==typeof h)for(t=0;s>t;++t)i[t]=+h.call(this,M[t],t);else for(t=0;s>t;++t)i[t]=h;if(o=[],"function"==typeof g)for(t=0;c>t;++t)o[t]=+g.call(this,m[t],t);else for(t=0;c>t;++t)o[t]=g;return a.resume()},a.resume=function(){return a.alpha(.1)},a.stop=function(){return a.alpha(0)},a.drag=function(){return e||(e=ta.behavior.drag().origin(y).on("dragstart.force",Xu).on("drag.force",t).on("dragend.force",$u)),arguments.length?void this.on("mouseover.force",Bu).on("mouseout.force",Wu).call(e):e},ta.rebind(a,c,"on")};var fl=20,hl=1,gl=1/0;ta.layout.hierarchy=function(){function n(u){var i,o=[u],a=[];for(u.depth=0;null!=(i=o.pop());)if(a.push(i),(l=e.call(n,i,i.depth))&&(c=l.length)){for(var c,l,s;--c>=0;)o.push(s=l[c]),s.parent=i,s.depth=i.depth+1;r&&(i.value=0),i.children=l}else r&&(i.value=+r.call(n,i,i.depth)||0),delete i.children;return Qu(u,function(n){var e,u;t&&(e=n.children)&&e.sort(t),r&&(u=n.parent)&&(u.value+=n.value)}),a}var t=ei,e=ni,r=ti;return n.sort=function(e){return arguments.length?(t=e,n):t},n.children=function(t){return arguments.length?(e=t,n):e},n.value=function(t){return arguments.length?(r=t,n):r},n.revalue=function(t){return r&&(Ku(t,function(n){n.children&&(n.value=0)}),Qu(t,function(t){var e;t.children||(t.value=+r.call(n,t,t.depth)||0),(e=t.parent)&&(e.value+=t.value)})),t},n},ta.layout.partition=function(){function n(t,e,r,u){var i=t.children;if(t.x=e,t.y=t.depth*u,t.dx=r,t.dy=u,i&&(o=i.length)){var o,a,c,l=-1;for(r=t.value?r/t.value:0;++l<o;)n(a=i[l],e,c=a.value*r,u),e+=c}}function t(n){var e=n.children,r=0;if(e&&(u=e.length))for(var u,i=-1;++i<u;)r=Math.max(r,t(e[i]));return 1+r}function e(e,i){var o=r.call(this,e,i);return n(o[0],0,u[0],u[1]/t(o[0])),o}var r=ta.layout.hierarchy(),u=[1,1];return e.size=function(n){return arguments.length?(u=n,e):u},Gu(e,r)},ta.layout.pie=function(){function n(o){var a,c=o.length,l=o.map(function(e,r){return+t.call(n,e,r)}),s=+("function"==typeof r?r.apply(this,arguments):r),f=("function"==typeof u?u.apply(this,arguments):u)-s,h=Math.min(Math.abs(f)/c,+("function"==typeof i?i.apply(this,arguments):i)),g=h*(0>f?-1:1),p=(f-c*g)/ta.sum(l),v=ta.range(c),d=[];return null!=e&&v.sort(e===pl?function(n,t){return l[t]-l[n]}:function(n,t){return e(o[n],o[t])}),v.forEach(function(n){d[n]={data:o[n],value:a=l[n],startAngle:s,endAngle:s+=a*p+g,padAngle:h}}),d}var t=Number,e=pl,r=0,u=La,i=0;return n.value=function(e){return arguments.length?(t=e,n):t},n.sort=function(t){return arguments.length?(e=t,n):e},n.startAngle=function(t){return arguments.length?(r=t,n):r},n.endAngle=function(t){return arguments.length?(u=t,n):u},n.padAngle=function(t){return arguments.length?(i=t,n):i},n};var pl={};ta.layout.stack=function(){function n(a,c){if(!(h=a.length))return a;var l=a.map(function(e,r){return t.call(n,e,r)}),s=l.map(function(t){return t.map(function(t,e){return[i.call(n,t,e),o.call(n,t,e)]})}),f=e.call(n,s,c);l=ta.permute(l,f),s=ta.permute(s,f);var h,g,p,v,d=r.call(n,s,c),m=l[0].length;for(p=0;m>p;++p)for(u.call(n,l[0][p],v=d[p],s[0][p][1]),g=1;h>g;++g)u.call(n,l[g][p],v+=s[g-1][p][1],s[g][p][1]);return a}var t=y,e=ai,r=ci,u=oi,i=ui,o=ii;return n.values=function(e){return arguments.length?(t=e,n):t},n.order=function(t){return arguments.length?(e="function"==typeof t?t:vl.get(t)||ai,n):e},n.offset=function(t){return arguments.length?(r="function"==typeof t?t:dl.get(t)||ci,n):r},n.x=function(t){return arguments.length?(i=t,n):i},n.y=function(t){return arguments.length?(o=t,n):o},n.out=function(t){return arguments.length?(u=t,n):u},n};var vl=ta.map({"inside-out":function(n){var t,e,r=n.length,u=n.map(li),i=n.map(si),o=ta.range(r).sort(function(n,t){return u[n]-u[t]}),a=0,c=0,l=[],s=[];for(t=0;r>t;++t)e=o[t],c>a?(a+=i[e],l.push(e)):(c+=i[e],s.push(e));return s.reverse().concat(l)},reverse:function(n){return ta.range(n.length).reverse()},"default":ai}),dl=ta.map({silhouette:function(n){var t,e,r,u=n.length,i=n[0].length,o=[],a=0,c=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];r>a&&(a=r),o.push(r)}for(e=0;i>e;++e)c[e]=(a-o[e])/2;return c},wiggle:function(n){var t,e,r,u,i,o,a,c,l,s=n.length,f=n[0],h=f.length,g=[];for(g[0]=c=l=0,e=1;h>e;++e){for(t=0,u=0;s>t;++t)u+=n[t][e][1];for(t=0,i=0,a=f[e][0]-f[e-1][0];s>t;++t){for(r=0,o=(n[t][e][1]-n[t][e-1][1])/(2*a);t>r;++r)o+=(n[r][e][1]-n[r][e-1][1])/a;i+=o*n[t][e][1]}g[e]=c-=u?i/u*a:0,l>c&&(l=c)}for(e=0;h>e;++e)g[e]-=l;return g},expand:function(n){var t,e,r,u=n.length,i=n[0].length,o=1/u,a=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];if(r)for(t=0;u>t;t++)n[t][e][1]/=r;else for(t=0;u>t;t++)n[t][e][1]=o}for(e=0;i>e;++e)a[e]=0;return a},zero:ci});ta.layout.histogram=function(){function n(n,i){for(var o,a,c=[],l=n.map(e,this),s=r.call(this,l,i),f=u.call(this,s,l,i),i=-1,h=l.length,g=f.length-1,p=t?1:1/h;++i<g;)o=c[i]=[],o.dx=f[i+1]-(o.x=f[i]),o.y=0;if(g>0)for(i=-1;++i<h;)a=l[i],a>=s[0]&&a<=s[1]&&(o=c[ta.bisect(f,a,1,g)-1],o.y+=p,o.push(n[i]));return c}var t=!0,e=Number,r=pi,u=hi;return n.value=function(t){return arguments.length?(e=t,n):e},n.range=function(t){return arguments.length?(r=Et(t),n):r},n.bins=function(t){return arguments.length?(u="number"==typeof t?function(n){return gi(n,t)}:Et(t),n):u},n.frequency=function(e){return arguments.length?(t=!!e,n):t},n},ta.layout.pack=function(){function n(n,i){var o=e.call(this,n,i),a=o[0],c=u[0],l=u[1],s=null==t?Math.sqrt:"function"==typeof t?t:function(){return t};if(a.x=a.y=0,Qu(a,function(n){n.r=+s(n.value)}),Qu(a,Mi),r){var f=r*(t?1:Math.max(2*a.r/c,2*a.r/l))/2;Qu(a,function(n){n.r+=f}),Qu(a,Mi),Qu(a,function(n){n.r-=f})}return _i(a,c/2,l/2,t?1:1/Math.max(2*a.r/c,2*a.r/l)),o}var t,e=ta.layout.hierarchy().sort(vi),r=0,u=[1,1];return n.size=function(t){return arguments.length?(u=t,n):u},n.radius=function(e){return arguments.length?(t=null==e||"function"==typeof e?e:+e,n):t},n.padding=function(t){return arguments.length?(r=+t,n):r},Gu(n,e)},ta.layout.tree=function(){function n(n,u){var s=o.call(this,n,u),f=s[0],h=t(f);if(Qu(h,e),h.parent.m=-h.z,Ku(h,r),l)Ku(f,i);else{var g=f,p=f,v=f;Ku(f,function(n){n.x<g.x&&(g=n),n.x>p.x&&(p=n),n.depth>v.depth&&(v=n)});var d=a(g,p)/2-g.x,m=c[0]/(p.x+a(p,g)/2+d),y=c[1]/(v.depth||1);Ku(f,function(n){n.x=(n.x+d)*m,n.y=n.depth*y})}return s}function t(n){for(var t,e={A:null,children:[n]},r=[e];null!=(t=r.pop());)for(var u,i=t.children,o=0,a=i.length;a>o;++o)r.push((i[o]=u={_:i[o],parent:t,children:(u=i[o].children)&&u.slice()||[],A:null,a:null,z:0,m:0,c:0,s:0,t:null,i:o}).a=u);return e.children[0]}function e(n){var t=n.children,e=n.parent.children,r=n.i?e[n.i-1]:null;if(t.length){Ni(n);var i=(t[0].z+t[t.length-1].z)/2;r?(n.z=r.z+a(n._,r._),n.m=n.z-i):n.z=i}else r&&(n.z=r.z+a(n._,r._));n.parent.A=u(n,r,n.parent.A||e[0])}function r(n){n._.x=n.z+n.parent.m,n.m+=n.parent.m}function u(n,t,e){if(t){for(var r,u=n,i=n,o=t,c=u.parent.children[0],l=u.m,s=i.m,f=o.m,h=c.m;o=Ei(o),u=ki(u),o&&u;)c=ki(c),i=Ei(i),i.a=n,r=o.z+f-u.z-l+a(o._,u._),r>0&&(Ai(Ci(o,n,e),n,r),l+=r,s+=r),f+=o.m,l+=u.m,h+=c.m,s+=i.m;o&&!Ei(i)&&(i.t=o,i.m+=f-s),u&&!ki(c)&&(c.t=u,c.m+=l-h,e=n)}return e}function i(n){n.x*=c[0],n.y=n.depth*c[1]}var o=ta.layout.hierarchy().sort(null).value(null),a=Si,c=[1,1],l=null;return n.separation=function(t){return arguments.length?(a=t,n):a},n.size=function(t){return arguments.length?(l=null==(c=t)?i:null,n):l?null:c},n.nodeSize=function(t){return arguments.length?(l=null==(c=t)?null:i,n):l?c:null},Gu(n,o)},ta.layout.cluster=function(){function n(n,i){var o,a=t.call(this,n,i),c=a[0],l=0;Qu(c,function(n){var t=n.children;t&&t.length?(n.x=qi(t),n.y=zi(t)):(n.x=o?l+=e(n,o):0,n.y=0,o=n)});var s=Li(c),f=Ti(c),h=s.x-e(s,f)/2,g=f.x+e(f,s)/2;return Qu(c,u?function(n){n.x=(n.x-c.x)*r[0],n.y=(c.y-n.y)*r[1]}:function(n){n.x=(n.x-h)/(g-h)*r[0],n.y=(1-(c.y?n.y/c.y:1))*r[1]}),a}var t=ta.layout.hierarchy().sort(null).value(null),e=Si,r=[1,1],u=!1;return n.separation=function(t){return arguments.length?(e=t,n):e},n.size=function(t){return arguments.length?(u=null==(r=t),n):u?null:r},n.nodeSize=function(t){return arguments.length?(u=null!=(r=t),n):u?r:null},Gu(n,t)},ta.layout.treemap=function(){function n(n,t){for(var e,r,u=-1,i=n.length;++u<i;)r=(e=n[u]).value*(0>t?0:t),e.area=isNaN(r)||0>=r?0:r}function t(e){var i=e.children;if(i&&i.length){var o,a,c,l=f(e),s=[],h=i.slice(),p=1/0,v="slice"===g?l.dx:"dice"===g?l.dy:"slice-dice"===g?1&e.depth?l.dy:l.dx:Math.min(l.dx,l.dy);for(n(h,l.dx*l.dy/e.value),s.area=0;(c=h.length)>0;)s.push(o=h[c-1]),s.area+=o.area,"squarify"!==g||(a=r(s,v))<=p?(h.pop(),p=a):(s.area-=s.pop().area,u(s,v,l,!1),v=Math.min(l.dx,l.dy),s.length=s.area=0,p=1/0);s.length&&(u(s,v,l,!0),s.length=s.area=0),i.forEach(t)}}function e(t){var r=t.children;if(r&&r.length){var i,o=f(t),a=r.slice(),c=[];for(n(a,o.dx*o.dy/t.value),c.area=0;i=a.pop();)c.push(i),c.area+=i.area,null!=i.z&&(u(c,i.z?o.dx:o.dy,o,!a.length),c.length=c.area=0);r.forEach(e)}}function r(n,t){for(var e,r=n.area,u=0,i=1/0,o=-1,a=n.length;++o<a;)(e=n[o].area)&&(i>e&&(i=e),e>u&&(u=e));return r*=r,t*=t,r?Math.max(t*u*p/r,r/(t*i*p)):1/0}function u(n,t,e,r){var u,i=-1,o=n.length,a=e.x,l=e.y,s=t?c(n.area/t):0;if(t==e.dx){for((r||s>e.dy)&&(s=e.dy);++i<o;)u=n[i],u.x=a,u.y=l,u.dy=s,a+=u.dx=Math.min(e.x+e.dx-a,s?c(u.area/s):0);u.z=!0,u.dx+=e.x+e.dx-a,e.y+=s,e.dy-=s}else{for((r||s>e.dx)&&(s=e.dx);++i<o;)u=n[i],u.x=a,u.y=l,u.dx=s,l+=u.dy=Math.min(e.y+e.dy-l,s?c(u.area/s):0);u.z=!1,u.dy+=e.y+e.dy-l,e.x+=s,e.dx-=s}}function i(r){var u=o||a(r),i=u[0];return i.x=0,i.y=0,i.dx=l[0],i.dy=l[1],o&&a.revalue(i),n([i],i.dx*i.dy/i.value),(o?e:t)(i),h&&(o=u),u}var o,a=ta.layout.hierarchy(),c=Math.round,l=[1,1],s=null,f=Ri,h=!1,g="squarify",p=.5*(1+Math.sqrt(5));
+return i.size=function(n){return arguments.length?(l=n,i):l},i.padding=function(n){function t(t){var e=n.call(i,t,t.depth);return null==e?Ri(t):Di(t,"number"==typeof e?[e,e,e,e]:e)}function e(t){return Di(t,n)}if(!arguments.length)return s;var r;return f=null==(s=n)?Ri:"function"==(r=typeof n)?t:"number"===r?(n=[n,n,n,n],e):e,i},i.round=function(n){return arguments.length?(c=n?Math.round:Number,i):c!=Number},i.sticky=function(n){return arguments.length?(h=n,o=null,i):h},i.ratio=function(n){return arguments.length?(p=n,i):p},i.mode=function(n){return arguments.length?(g=n+"",i):g},Gu(i,a)},ta.random={normal:function(n,t){var e=arguments.length;return 2>e&&(t=1),1>e&&(n=0),function(){var e,r,u;do e=2*Math.random()-1,r=2*Math.random()-1,u=e*e+r*r;while(!u||u>1);return n+t*e*Math.sqrt(-2*Math.log(u)/u)}},logNormal:function(){var n=ta.random.normal.apply(ta,arguments);return function(){return Math.exp(n())}},bates:function(n){var t=ta.random.irwinHall(n);return function(){return t()/n}},irwinHall:function(n){return function(){for(var t=0,e=0;n>e;e++)t+=Math.random();return t}}},ta.scale={};var ml={floor:y,ceil:y};ta.scale.linear=function(){return Ii([0,1],[0,1],mu,!1)};var yl={s:1,g:1,p:1,r:1,e:1};ta.scale.log=function(){return Ji(ta.scale.linear().domain([0,1]),10,!0,[1,10])};var Ml=ta.format(".0e"),xl={floor:function(n){return-Math.ceil(-n)},ceil:function(n){return-Math.floor(-n)}};ta.scale.pow=function(){return Gi(ta.scale.linear(),1,[0,1])},ta.scale.sqrt=function(){return ta.scale.pow().exponent(.5)},ta.scale.ordinal=function(){return Qi([],{t:"range",a:[[]]})},ta.scale.category10=function(){return ta.scale.ordinal().range(bl)},ta.scale.category20=function(){return ta.scale.ordinal().range(_l)},ta.scale.category20b=function(){return ta.scale.ordinal().range(wl)},ta.scale.category20c=function(){return ta.scale.ordinal().range(Sl)};var bl=[2062260,16744206,2924588,14034728,9725885,9197131,14907330,8355711,12369186,1556175].map(Mt),_l=[2062260,11454440,16744206,16759672,2924588,10018698,14034728,16750742,9725885,12955861,9197131,12885140,14907330,16234194,8355711,13092807,12369186,14408589,1556175,10410725].map(Mt),wl=[3750777,5395619,7040719,10264286,6519097,9216594,11915115,13556636,9202993,12426809,15186514,15190932,8666169,11356490,14049643,15177372,8077683,10834324,13528509,14589654].map(Mt),Sl=[3244733,7057110,10406625,13032431,15095053,16616764,16625259,16634018,3253076,7652470,10607003,13101504,7695281,10394312,12369372,14342891,6513507,9868950,12434877,14277081].map(Mt);ta.scale.quantile=function(){return no([],[])},ta.scale.quantize=function(){return to(0,1,[0,1])},ta.scale.threshold=function(){return eo([.5],[0,1])},ta.scale.identity=function(){return ro([0,1])},ta.svg={},ta.svg.arc=function(){function n(){var n=Math.max(0,+e.apply(this,arguments)),l=Math.max(0,+r.apply(this,arguments)),s=o.apply(this,arguments)-Ra,f=a.apply(this,arguments)-Ra,h=Math.abs(f-s),g=s>f?0:1;if(n>l&&(p=l,l=n,n=p),h>=Ta)return t(l,g)+(n?t(n,1-g):"")+"Z";var p,v,d,m,y,M,x,b,_,w,S,k,E=0,A=0,N=[];if((m=(+c.apply(this,arguments)||0)/2)&&(d=i===kl?Math.sqrt(n*n+l*l):+i.apply(this,arguments),g||(A*=-1),l&&(A=tt(d/l*Math.sin(m))),n&&(E=tt(d/n*Math.sin(m)))),l){y=l*Math.cos(s+A),M=l*Math.sin(s+A),x=l*Math.cos(f-A),b=l*Math.sin(f-A);var C=Math.abs(f-s-2*A)<=qa?0:1;if(A&&so(y,M,x,b)===g^C){var z=(s+f)/2;y=l*Math.cos(z),M=l*Math.sin(z),x=b=null}}else y=M=0;if(n){_=n*Math.cos(f-E),w=n*Math.sin(f-E),S=n*Math.cos(s+E),k=n*Math.sin(s+E);var q=Math.abs(s-f+2*E)<=qa?0:1;if(E&&so(_,w,S,k)===1-g^q){var L=(s+f)/2;_=n*Math.cos(L),w=n*Math.sin(L),S=k=null}}else _=w=0;if((p=Math.min(Math.abs(l-n)/2,+u.apply(this,arguments)))>.001){v=l>n^g?0:1;var T=null==S?[_,w]:null==x?[y,M]:Lr([y,M],[S,k],[x,b],[_,w]),R=y-T[0],D=M-T[1],P=x-T[0],U=b-T[1],j=1/Math.sin(Math.acos((R*P+D*U)/(Math.sqrt(R*R+D*D)*Math.sqrt(P*P+U*U)))/2),F=Math.sqrt(T[0]*T[0]+T[1]*T[1]);if(null!=x){var H=Math.min(p,(l-F)/(j+1)),O=fo(null==S?[_,w]:[S,k],[y,M],l,H,g),I=fo([x,b],[_,w],l,H,g);p===H?N.push("M",O[0],"A",H,",",H," 0 0,",v," ",O[1],"A",l,",",l," 0 ",1-g^so(O[1][0],O[1][1],I[1][0],I[1][1]),",",g," ",I[1],"A",H,",",H," 0 0,",v," ",I[0]):N.push("M",O[0],"A",H,",",H," 0 1,",v," ",I[0])}else N.push("M",y,",",M);if(null!=S){var Y=Math.min(p,(n-F)/(j-1)),Z=fo([y,M],[S,k],n,-Y,g),V=fo([_,w],null==x?[y,M]:[x,b],n,-Y,g);p===Y?N.push("L",V[0],"A",Y,",",Y," 0 0,",v," ",V[1],"A",n,",",n," 0 ",g^so(V[1][0],V[1][1],Z[1][0],Z[1][1]),",",1-g," ",Z[1],"A",Y,",",Y," 0 0,",v," ",Z[0]):N.push("L",V[0],"A",Y,",",Y," 0 0,",v," ",Z[0])}else N.push("L",_,",",w)}else N.push("M",y,",",M),null!=x&&N.push("A",l,",",l," 0 ",C,",",g," ",x,",",b),N.push("L",_,",",w),null!=S&&N.push("A",n,",",n," 0 ",q,",",1-g," ",S,",",k);return N.push("Z"),N.join("")}function t(n,t){return"M0,"+n+"A"+n+","+n+" 0 1,"+t+" 0,"+-n+"A"+n+","+n+" 0 1,"+t+" 0,"+n}var e=io,r=oo,u=uo,i=kl,o=ao,a=co,c=lo;return n.innerRadius=function(t){return arguments.length?(e=Et(t),n):e},n.outerRadius=function(t){return arguments.length?(r=Et(t),n):r},n.cornerRadius=function(t){return arguments.length?(u=Et(t),n):u},n.padRadius=function(t){return arguments.length?(i=t==kl?kl:Et(t),n):i},n.startAngle=function(t){return arguments.length?(o=Et(t),n):o},n.endAngle=function(t){return arguments.length?(a=Et(t),n):a},n.padAngle=function(t){return arguments.length?(c=Et(t),n):c},n.centroid=function(){var n=(+e.apply(this,arguments)+ +r.apply(this,arguments))/2,t=(+o.apply(this,arguments)+ +a.apply(this,arguments))/2-Ra;return[Math.cos(t)*n,Math.sin(t)*n]},n};var kl="auto";ta.svg.line=function(){return ho(y)};var El=ta.map({linear:go,"linear-closed":po,step:vo,"step-before":mo,"step-after":yo,basis:So,"basis-open":ko,"basis-closed":Eo,bundle:Ao,cardinal:bo,"cardinal-open":Mo,"cardinal-closed":xo,monotone:To});El.forEach(function(n,t){t.key=n,t.closed=/-closed$/.test(n)});var Al=[0,2/3,1/3,0],Nl=[0,1/3,2/3,0],Cl=[0,1/6,2/3,1/6];ta.svg.line.radial=function(){var n=ho(Ro);return n.radius=n.x,delete n.x,n.angle=n.y,delete n.y,n},mo.reverse=yo,yo.reverse=mo,ta.svg.area=function(){return Do(y)},ta.svg.area.radial=function(){var n=Do(Ro);return n.radius=n.x,delete n.x,n.innerRadius=n.x0,delete n.x0,n.outerRadius=n.x1,delete n.x1,n.angle=n.y,delete n.y,n.startAngle=n.y0,delete n.y0,n.endAngle=n.y1,delete n.y1,n},ta.svg.chord=function(){function n(n,a){var c=t(this,i,n,a),l=t(this,o,n,a);return"M"+c.p0+r(c.r,c.p1,c.a1-c.a0)+(e(c,l)?u(c.r,c.p1,c.r,c.p0):u(c.r,c.p1,l.r,l.p0)+r(l.r,l.p1,l.a1-l.a0)+u(l.r,l.p1,c.r,c.p0))+"Z"}function t(n,t,e,r){var u=t.call(n,e,r),i=a.call(n,u,r),o=c.call(n,u,r)-Ra,s=l.call(n,u,r)-Ra;return{r:i,a0:o,a1:s,p0:[i*Math.cos(o),i*Math.sin(o)],p1:[i*Math.cos(s),i*Math.sin(s)]}}function e(n,t){return n.a0==t.a0&&n.a1==t.a1}function r(n,t,e){return"A"+n+","+n+" 0 "+ +(e>qa)+",1 "+t}function u(n,t,e,r){return"Q 0,0 "+r}var i=mr,o=yr,a=Po,c=ao,l=co;return n.radius=function(t){return arguments.length?(a=Et(t),n):a},n.source=function(t){return arguments.length?(i=Et(t),n):i},n.target=function(t){return arguments.length?(o=Et(t),n):o},n.startAngle=function(t){return arguments.length?(c=Et(t),n):c},n.endAngle=function(t){return arguments.length?(l=Et(t),n):l},n},ta.svg.diagonal=function(){function n(n,u){var i=t.call(this,n,u),o=e.call(this,n,u),a=(i.y+o.y)/2,c=[i,{x:i.x,y:a},{x:o.x,y:a},o];return c=c.map(r),"M"+c[0]+"C"+c[1]+" "+c[2]+" "+c[3]}var t=mr,e=yr,r=Uo;return n.source=function(e){return arguments.length?(t=Et(e),n):t},n.target=function(t){return arguments.length?(e=Et(t),n):e},n.projection=function(t){return arguments.length?(r=t,n):r},n},ta.svg.diagonal.radial=function(){var n=ta.svg.diagonal(),t=Uo,e=n.projection;return n.projection=function(n){return arguments.length?e(jo(t=n)):t},n},ta.svg.symbol=function(){function n(n,r){return(zl.get(t.call(this,n,r))||Oo)(e.call(this,n,r))}var t=Ho,e=Fo;return n.type=function(e){return arguments.length?(t=Et(e),n):t},n.size=function(t){return arguments.length?(e=Et(t),n):e},n};var zl=ta.map({circle:Oo,cross:function(n){var t=Math.sqrt(n/5)/2;return"M"+-3*t+","+-t+"H"+-t+"V"+-3*t+"H"+t+"V"+-t+"H"+3*t+"V"+t+"H"+t+"V"+3*t+"H"+-t+"V"+t+"H"+-3*t+"Z"},diamond:function(n){var t=Math.sqrt(n/(2*Ll)),e=t*Ll;return"M0,"+-t+"L"+e+",0 0,"+t+" "+-e+",0Z"},square:function(n){var t=Math.sqrt(n)/2;return"M"+-t+","+-t+"L"+t+","+-t+" "+t+","+t+" "+-t+","+t+"Z"},"triangle-down":function(n){var t=Math.sqrt(n/ql),e=t*ql/2;return"M0,"+e+"L"+t+","+-e+" "+-t+","+-e+"Z"},"triangle-up":function(n){var t=Math.sqrt(n/ql),e=t*ql/2;return"M0,"+-e+"L"+t+","+e+" "+-t+","+e+"Z"}});ta.svg.symbolTypes=zl.keys();var ql=Math.sqrt(3),Ll=Math.tan(30*Da);_a.transition=function(n){for(var t,e,r=Tl||++Ul,u=Xo(n),i=[],o=Rl||{time:Date.now(),ease:Su,delay:0,duration:250},a=-1,c=this.length;++a<c;){i.push(t=[]);for(var l=this[a],s=-1,f=l.length;++s<f;)(e=l[s])&&$o(e,s,u,r,o),t.push(e)}return Yo(i,u,r)},_a.interrupt=function(n){return this.each(null==n?Dl:Io(Xo(n)))};var Tl,Rl,Dl=Io(Xo()),Pl=[],Ul=0;Pl.call=_a.call,Pl.empty=_a.empty,Pl.node=_a.node,Pl.size=_a.size,ta.transition=function(n,t){return n&&n.transition?Tl?n.transition(t):n:ta.selection().transition(n)},ta.transition.prototype=Pl,Pl.select=function(n){var t,e,r,u=this.id,i=this.namespace,o=[];n=N(n);for(var a=-1,c=this.length;++a<c;){o.push(t=[]);for(var l=this[a],s=-1,f=l.length;++s<f;)(r=l[s])&&(e=n.call(r,r.__data__,s,a))?("__data__"in r&&(e.__data__=r.__data__),$o(e,s,i,u,r[i][u]),t.push(e)):t.push(null)}return Yo(o,i,u)},Pl.selectAll=function(n){var t,e,r,u,i,o=this.id,a=this.namespace,c=[];n=C(n);for(var l=-1,s=this.length;++l<s;)for(var f=this[l],h=-1,g=f.length;++h<g;)if(r=f[h]){i=r[a][o],e=n.call(r,r.__data__,h,l),c.push(t=[]);for(var p=-1,v=e.length;++p<v;)(u=e[p])&&$o(u,p,a,o,i),t.push(u)}return Yo(c,a,o)},Pl.filter=function(n){var t,e,r,u=[];"function"!=typeof n&&(n=O(n));for(var i=0,o=this.length;o>i;i++){u.push(t=[]);for(var e=this[i],a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return Yo(u,this.namespace,this.id)},Pl.tween=function(n,t){var e=this.id,r=this.namespace;return arguments.length<2?this.node()[r][e].tween.get(n):Y(this,null==t?function(t){t[r][e].tween.remove(n)}:function(u){u[r][e].tween.set(n,t)})},Pl.attr=function(n,t){function e(){this.removeAttribute(a)}function r(){this.removeAttributeNS(a.space,a.local)}function u(n){return null==n?e:(n+="",function(){var t,e=this.getAttribute(a);return e!==n&&(t=o(e,n),function(n){this.setAttribute(a,t(n))})})}function i(n){return null==n?r:(n+="",function(){var t,e=this.getAttributeNS(a.space,a.local);return e!==n&&(t=o(e,n),function(n){this.setAttributeNS(a.space,a.local,t(n))})})}if(arguments.length<2){for(t in n)this.attr(t,n[t]);return this}var o="transform"==n?Hu:mu,a=ta.ns.qualify(n);return Zo(this,"attr."+n,t,a.local?i:u)},Pl.attrTween=function(n,t){function e(n,e){var r=t.call(this,n,e,this.getAttribute(u));return r&&function(n){this.setAttribute(u,r(n))}}function r(n,e){var r=t.call(this,n,e,this.getAttributeNS(u.space,u.local));return r&&function(n){this.setAttributeNS(u.space,u.local,r(n))}}var u=ta.ns.qualify(n);return this.tween("attr."+n,u.local?r:e)},Pl.style=function(n,e,r){function u(){this.style.removeProperty(n)}function i(e){return null==e?u:(e+="",function(){var u,i=t(this).getComputedStyle(this,null).getPropertyValue(n);return i!==e&&(u=mu(i,e),function(t){this.style.setProperty(n,u(t),r)})})}var o=arguments.length;if(3>o){if("string"!=typeof n){2>o&&(e="");for(r in n)this.style(r,n[r],e);return this}r=""}return Zo(this,"style."+n,e,i)},Pl.styleTween=function(n,e,r){function u(u,i){var o=e.call(this,u,i,t(this).getComputedStyle(this,null).getPropertyValue(n));return o&&function(t){this.style.setProperty(n,o(t),r)}}return arguments.length<3&&(r=""),this.tween("style."+n,u)},Pl.text=function(n){return Zo(this,"text",n,Vo)},Pl.remove=function(){var n=this.namespace;return this.each("end.transition",function(){var t;this[n].count<2&&(t=this.parentNode)&&t.removeChild(this)})},Pl.ease=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].ease:("function"!=typeof n&&(n=ta.ease.apply(ta,arguments)),Y(this,function(r){r[e][t].ease=n}))},Pl.delay=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].delay:Y(this,"function"==typeof n?function(r,u,i){r[e][t].delay=+n.call(r,r.__data__,u,i)}:(n=+n,function(r){r[e][t].delay=n}))},Pl.duration=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].duration:Y(this,"function"==typeof n?function(r,u,i){r[e][t].duration=Math.max(1,n.call(r,r.__data__,u,i))}:(n=Math.max(1,n),function(r){r[e][t].duration=n}))},Pl.each=function(n,t){var e=this.id,r=this.namespace;if(arguments.length<2){var u=Rl,i=Tl;try{Tl=e,Y(this,function(t,u,i){Rl=t[r][e],n.call(t,t.__data__,u,i)})}finally{Rl=u,Tl=i}}else Y(this,function(u){var i=u[r][e];(i.event||(i.event=ta.dispatch("start","end","interrupt"))).on(n,t)});return this},Pl.transition=function(){for(var n,t,e,r,u=this.id,i=++Ul,o=this.namespace,a=[],c=0,l=this.length;l>c;c++){a.push(n=[]);for(var t=this[c],s=0,f=t.length;f>s;s++)(e=t[s])&&(r=e[o][u],$o(e,s,o,i,{time:r.time,ease:r.ease,delay:r.delay+r.duration,duration:r.duration})),n.push(e)}return Yo(a,o,i)},ta.svg.axis=function(){function n(n){n.each(function(){var n,l=ta.select(this),s=this.__chart__||e,f=this.__chart__=e.copy(),h=null==c?f.ticks?f.ticks.apply(f,a):f.domain():c,g=null==t?f.tickFormat?f.tickFormat.apply(f,a):y:t,p=l.selectAll(".tick").data(h,f),v=p.enter().insert("g",".domain").attr("class","tick").style("opacity",Ca),d=ta.transition(p.exit()).style("opacity",Ca).remove(),m=ta.transition(p.order()).style("opacity",1),M=Math.max(u,0)+o,x=Ui(f),b=l.selectAll(".domain").data([0]),_=(b.enter().append("path").attr("class","domain"),ta.transition(b));v.append("line"),v.append("text");var w,S,k,E,A=v.select("line"),N=m.select("line"),C=p.select("text").text(g),z=v.select("text"),q=m.select("text"),L="top"===r||"left"===r?-1:1;if("bottom"===r||"top"===r?(n=Bo,w="x",k="y",S="x2",E="y2",C.attr("dy",0>L?"0em":".71em").style("text-anchor","middle"),_.attr("d","M"+x[0]+","+L*i+"V0H"+x[1]+"V"+L*i)):(n=Wo,w="y",k="x",S="y2",E="x2",C.attr("dy",".32em").style("text-anchor",0>L?"end":"start"),_.attr("d","M"+L*i+","+x[0]+"H0V"+x[1]+"H"+L*i)),A.attr(E,L*u),z.attr(k,L*M),N.attr(S,0).attr(E,L*u),q.attr(w,0).attr(k,L*M),f.rangeBand){var T=f,R=T.rangeBand()/2;s=f=function(n){return T(n)+R}}else s.rangeBand?s=f:d.call(n,f,s);v.call(n,s,f),m.call(n,f,f)})}var t,e=ta.scale.linear(),r=jl,u=6,i=6,o=3,a=[10],c=null;return n.scale=function(t){return arguments.length?(e=t,n):e},n.orient=function(t){return arguments.length?(r=t in Fl?t+"":jl,n):r},n.ticks=function(){return arguments.length?(a=arguments,n):a},n.tickValues=function(t){return arguments.length?(c=t,n):c},n.tickFormat=function(e){return arguments.length?(t=e,n):t},n.tickSize=function(t){var e=arguments.length;return e?(u=+t,i=+arguments[e-1],n):u},n.innerTickSize=function(t){return arguments.length?(u=+t,n):u},n.outerTickSize=function(t){return arguments.length?(i=+t,n):i},n.tickPadding=function(t){return arguments.length?(o=+t,n):o},n.tickSubdivide=function(){return arguments.length&&n},n};var jl="bottom",Fl={top:1,right:1,bottom:1,left:1};ta.svg.brush=function(){function n(t){t.each(function(){var t=ta.select(this).style("pointer-events","all").style("-webkit-tap-highlight-color","rgba(0,0,0,0)").on("mousedown.brush",i).on("touchstart.brush",i),o=t.selectAll(".background").data([0]);o.enter().append("rect").attr("class","background").style("visibility","hidden").style("cursor","crosshair"),t.selectAll(".extent").data([0]).enter().append("rect").attr("class","extent").style("cursor","move");var a=t.selectAll(".resize").data(v,y);a.exit().remove(),a.enter().append("g").attr("class",function(n){return"resize "+n}).style("cursor",function(n){return Hl[n]}).append("rect").attr("x",function(n){return/[ew]$/.test(n)?-3:null}).attr("y",function(n){return/^[ns]/.test(n)?-3:null}).attr("width",6).attr("height",6).style("visibility","hidden"),a.style("display",n.empty()?"none":null);var c,f=ta.transition(t),h=ta.transition(o);l&&(c=Ui(l),h.attr("x",c[0]).attr("width",c[1]-c[0]),r(f)),s&&(c=Ui(s),h.attr("y",c[0]).attr("height",c[1]-c[0]),u(f)),e(f)})}function e(n){n.selectAll(".resize").attr("transform",function(n){return"translate("+f[+/e$/.test(n)]+","+h[+/^s/.test(n)]+")"})}function r(n){n.select(".extent").attr("x",f[0]),n.selectAll(".extent,.n>rect,.s>rect").attr("width",f[1]-f[0])}function u(n){n.select(".extent").attr("y",h[0]),n.selectAll(".extent,.e>rect,.w>rect").attr("height",h[1]-h[0])}function i(){function i(){32==ta.event.keyCode&&(C||(M=null,q[0]-=f[1],q[1]-=h[1],C=2),S())}function v(){32==ta.event.keyCode&&2==C&&(q[0]+=f[1],q[1]+=h[1],C=0,S())}function d(){var n=ta.mouse(b),t=!1;x&&(n[0]+=x[0],n[1]+=x[1]),C||(ta.event.altKey?(M||(M=[(f[0]+f[1])/2,(h[0]+h[1])/2]),q[0]=f[+(n[0]<M[0])],q[1]=h[+(n[1]<M[1])]):M=null),A&&m(n,l,0)&&(r(k),t=!0),N&&m(n,s,1)&&(u(k),t=!0),t&&(e(k),w({type:"brush",mode:C?"move":"resize"}))}function m(n,t,e){var r,u,i=Ui(t),c=i[0],l=i[1],s=q[e],v=e?h:f,d=v[1]-v[0];return C&&(c-=s,l-=d+s),r=(e?p:g)?Math.max(c,Math.min(l,n[e])):n[e],C?u=(r+=s)+d:(M&&(s=Math.max(c,Math.min(l,2*M[e]-r))),r>s?(u=r,r=s):u=s),v[0]!=r||v[1]!=u?(e?a=null:o=null,v[0]=r,v[1]=u,!0):void 0}function y(){d(),k.style("pointer-events","all").selectAll(".resize").style("display",n.empty()?"none":null),ta.select("body").style("cursor",null),L.on("mousemove.brush",null).on("mouseup.brush",null).on("touchmove.brush",null).on("touchend.brush",null).on("keydown.brush",null).on("keyup.brush",null),z(),w({type:"brushend"})}var M,x,b=this,_=ta.select(ta.event.target),w=c.of(b,arguments),k=ta.select(b),E=_.datum(),A=!/^(n|s)$/.test(E)&&l,N=!/^(e|w)$/.test(E)&&s,C=_.classed("extent"),z=W(b),q=ta.mouse(b),L=ta.select(t(b)).on("keydown.brush",i).on("keyup.brush",v);if(ta.event.changedTouches?L.on("touchmove.brush",d).on("touchend.brush",y):L.on("mousemove.brush",d).on("mouseup.brush",y),k.interrupt().selectAll("*").interrupt(),C)q[0]=f[0]-q[0],q[1]=h[0]-q[1];else if(E){var T=+/w$/.test(E),R=+/^n/.test(E);x=[f[1-T]-q[0],h[1-R]-q[1]],q[0]=f[T],q[1]=h[R]}else ta.event.altKey&&(M=q.slice());k.style("pointer-events","none").selectAll(".resize").style("display",null),ta.select("body").style("cursor",_.style("cursor")),w({type:"brushstart"}),d()}var o,a,c=E(n,"brushstart","brush","brushend"),l=null,s=null,f=[0,0],h=[0,0],g=!0,p=!0,v=Ol[0];return n.event=function(n){n.each(function(){var n=c.of(this,arguments),t={x:f,y:h,i:o,j:a},e=this.__chart__||t;this.__chart__=t,Tl?ta.select(this).transition().each("start.brush",function(){o=e.i,a=e.j,f=e.x,h=e.y,n({type:"brushstart"})}).tween("brush:brush",function(){var e=yu(f,t.x),r=yu(h,t.y);return o=a=null,function(u){f=t.x=e(u),h=t.y=r(u),n({type:"brush",mode:"resize"})}}).each("end.brush",function(){o=t.i,a=t.j,n({type:"brush",mode:"resize"}),n({type:"brushend"})}):(n({type:"brushstart"}),n({type:"brush",mode:"resize"}),n({type:"brushend"}))})},n.x=function(t){return arguments.length?(l=t,v=Ol[!l<<1|!s],n):l},n.y=function(t){return arguments.length?(s=t,v=Ol[!l<<1|!s],n):s},n.clamp=function(t){return arguments.length?(l&&s?(g=!!t[0],p=!!t[1]):l?g=!!t:s&&(p=!!t),n):l&&s?[g,p]:l?g:s?p:null},n.extent=function(t){var e,r,u,i,c;return arguments.length?(l&&(e=t[0],r=t[1],s&&(e=e[0],r=r[0]),o=[e,r],l.invert&&(e=l(e),r=l(r)),e>r&&(c=e,e=r,r=c),(e!=f[0]||r!=f[1])&&(f=[e,r])),s&&(u=t[0],i=t[1],l&&(u=u[1],i=i[1]),a=[u,i],s.invert&&(u=s(u),i=s(i)),u>i&&(c=u,u=i,i=c),(u!=h[0]||i!=h[1])&&(h=[u,i])),n):(l&&(o?(e=o[0],r=o[1]):(e=f[0],r=f[1],l.invert&&(e=l.invert(e),r=l.invert(r)),e>r&&(c=e,e=r,r=c))),s&&(a?(u=a[0],i=a[1]):(u=h[0],i=h[1],s.invert&&(u=s.invert(u),i=s.invert(i)),u>i&&(c=u,u=i,i=c))),l&&s?[[e,u],[r,i]]:l?[e,r]:s&&[u,i])},n.clear=function(){return n.empty()||(f=[0,0],h=[0,0],o=a=null),n},n.empty=function(){return!!l&&f[0]==f[1]||!!s&&h[0]==h[1]},ta.rebind(n,c,"on")};var Hl={n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"},Ol=[["n","e","s","w","nw","ne","se","sw"],["e","w"],["n","s"],[]],Il=ac.format=gc.timeFormat,Yl=Il.utc,Zl=Yl("%Y-%m-%dT%H:%M:%S.%LZ");Il.iso=Date.prototype.toISOString&&+new Date("2000-01-01T00:00:00.000Z")?Jo:Zl,Jo.parse=function(n){var t=new Date(n);return isNaN(t)?null:t},Jo.toString=Zl.toString,ac.second=Ft(function(n){return new cc(1e3*Math.floor(n/1e3))},function(n,t){n.setTime(n.getTime()+1e3*Math.floor(t))},function(n){return n.getSeconds()}),ac.seconds=ac.second.range,ac.seconds.utc=ac.second.utc.range,ac.minute=Ft(function(n){return new cc(6e4*Math.floor(n/6e4))},function(n,t){n.setTime(n.getTime()+6e4*Math.floor(t))},function(n){return n.getMinutes()}),ac.minutes=ac.minute.range,ac.minutes.utc=ac.minute.utc.range,ac.hour=Ft(function(n){var t=n.getTimezoneOffset()/60;return new cc(36e5*(Math.floor(n/36e5-t)+t))},function(n,t){n.setTime(n.getTime()+36e5*Math.floor(t))},function(n){return n.getHours()}),ac.hours=ac.hour.range,ac.hours.utc=ac.hour.utc.range,ac.month=Ft(function(n){return n=ac.day(n),n.setDate(1),n},function(n,t){n.setMonth(n.getMonth()+t)},function(n){return n.getMonth()}),ac.months=ac.month.range,ac.months.utc=ac.month.utc.range;var Vl=[1e3,5e3,15e3,3e4,6e4,3e5,9e5,18e5,36e5,108e5,216e5,432e5,864e5,1728e5,6048e5,2592e6,7776e6,31536e6],Xl=[[ac.second,1],[ac.second,5],[ac.second,15],[ac.second,30],[ac.minute,1],[ac.minute,5],[ac.minute,15],[ac.minute,30],[ac.hour,1],[ac.hour,3],[ac.hour,6],[ac.hour,12],[ac.day,1],[ac.day,2],[ac.week,1],[ac.month,1],[ac.month,3],[ac.year,1]],$l=Il.multi([[".%L",function(n){return n.getMilliseconds()}],[":%S",function(n){return n.getSeconds()}],["%I:%M",function(n){return n.getMinutes()}],["%I %p",function(n){return n.getHours()}],["%a %d",function(n){return n.getDay()&&1!=n.getDate()}],["%b %d",function(n){return 1!=n.getDate()}],["%B",function(n){return n.getMonth()}],["%Y",Ne]]),Bl={range:function(n,t,e){return ta.range(Math.ceil(n/e)*e,+t,e).map(Ko)},floor:y,ceil:y};Xl.year=ac.year,ac.scale=function(){return Go(ta.scale.linear(),Xl,$l)};var Wl=Xl.map(function(n){return[n[0].utc,n[1]]}),Jl=Yl.multi([[".%L",function(n){return n.getUTCMilliseconds()}],[":%S",function(n){return n.getUTCSeconds()}],["%I:%M",function(n){return n.getUTCMinutes()}],["%I %p",function(n){return n.getUTCHours()}],["%a %d",function(n){return n.getUTCDay()&&1!=n.getUTCDate()}],["%b %d",function(n){return 1!=n.getUTCDate()}],["%B",function(n){return n.getUTCMonth()}],["%Y",Ne]]);Wl.year=ac.year.utc,ac.scale.utc=function(){return Go(ta.scale.linear(),Wl,Jl)},ta.text=At(function(n){return n.responseText}),ta.json=function(n,t){return Nt(n,"application/json",Qo,t)},ta.html=function(n,t){return Nt(n,"text/html",na,t)},ta.xml=At(function(n){return n.responseXML}),"function"==typeof define&&define.amd?define(ta):"object"==typeof module&&module.exports&&(module.exports=ta),this.d3=ta}();
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/holder.min.js b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/holder.min.js
new file mode 100644
index 00000000..6bfc844b
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/holder.min.js
@@ -0,0 +1,12 @@
+/*!
+
+Holder - client side image placeholders
+Version 2.7.1+6hydf
+© 2015 Ivan Malopinsky - http://imsky.co
+
+Site:     http://holderjs.com
+Issues:   https://github.com/imsky/holder/issues
+License:  http://opensource.org/licenses/MIT
+
+*/
+!function(a){if(a.document){var b=a.document;b.querySelectorAll||(b.querySelectorAll=function(c){var d,e=b.createElement("style"),f=[];for(b.documentElement.firstChild.appendChild(e),b._qsa=[],e.styleSheet.cssText=c+"{x-qsa:expression(document._qsa && document._qsa.push(this))}",a.scrollBy(0,0),e.parentNode.removeChild(e);b._qsa.length;)d=b._qsa.shift(),d.style.removeAttribute("x-qsa"),f.push(d);return b._qsa=null,f}),b.querySelector||(b.querySelector=function(a){var c=b.querySelectorAll(a);return c.length?c[0]:null}),b.getElementsByClassName||(b.getElementsByClassName=function(a){return a=String(a).replace(/^|\s+/g,"."),b.querySelectorAll(a)}),Object.keys||(Object.keys=function(a){if(a!==Object(a))throw TypeError("Object.keys called on non-object");var b,c=[];for(b in a)Object.prototype.hasOwnProperty.call(a,b)&&c.push(b);return c}),function(a){var b="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";a.atob=a.atob||function(a){a=String(a);var c,d=0,e=[],f=0,g=0;if(a=a.replace(/\s/g,""),a.length%4===0&&(a=a.replace(/=+$/,"")),a.length%4===1)throw Error("InvalidCharacterError");if(/[^+/0-9A-Za-z]/.test(a))throw Error("InvalidCharacterError");for(;d<a.length;)c=b.indexOf(a.charAt(d)),f=f<<6|c,g+=6,24===g&&(e.push(String.fromCharCode(f>>16&255)),e.push(String.fromCharCode(f>>8&255)),e.push(String.fromCharCode(255&f)),g=0,f=0),d+=1;return 12===g?(f>>=4,e.push(String.fromCharCode(255&f))):18===g&&(f>>=2,e.push(String.fromCharCode(f>>8&255)),e.push(String.fromCharCode(255&f))),e.join("")},a.btoa=a.btoa||function(a){a=String(a);var c,d,e,f,g,h,i,j=0,k=[];if(/[^\x00-\xFF]/.test(a))throw Error("InvalidCharacterError");for(;j<a.length;)c=a.charCodeAt(j++),d=a.charCodeAt(j++),e=a.charCodeAt(j++),f=c>>2,g=(3&c)<<4|d>>4,h=(15&d)<<2|e>>6,i=63&e,j===a.length+2?(h=64,i=64):j===a.length+1&&(i=64),k.push(b.charAt(f),b.charAt(g),b.charAt(h),b.charAt(i));return k.join("")}}(a),Object.prototype.hasOwnProperty||(Object.prototype.hasOwnProperty=function(a){var b=this.__proto__||this.constructor.prototype;return a in this&&(!(a in b)||b[a]!==this[a])}),function(){if("performance"in a==!1&&(a.performance={}),Date.now=Date.now||function(){return(new Date).getTime()},"now"in a.performance==!1){var b=Date.now();performance.timing&&performance.timing.navigationStart&&(b=performance.timing.navigationStart),a.performance.now=function(){return Date.now()-b}}}(),a.requestAnimationFrame||(a.webkitRequestAnimationFrame?!function(a){a.requestAnimationFrame=function(b){return webkitRequestAnimationFrame(function(){b(a.performance.now())})},a.cancelAnimationFrame=webkitCancelAnimationFrame}(a):a.mozRequestAnimationFrame?!function(a){a.requestAnimationFrame=function(b){return mozRequestAnimationFrame(function(){b(a.performance.now())})},a.cancelAnimationFrame=mozCancelAnimationFrame}(a):!function(a){a.requestAnimationFrame=function(b){return a.setTimeout(b,1e3/60)},a.cancelAnimationFrame=a.clearTimeout}(a))}}(this),function(a,b){"object"==typeof exports&&"object"==typeof module?module.exports=b():"function"==typeof define&&define.amd?define(b):"object"==typeof exports?exports.Holder=b():a.Holder=b()}(this,function(){return function(a){function b(d){if(c[d])return c[d].exports;var e=c[d]={exports:{},id:d,loaded:!1};return a[d].call(e.exports,e,e.exports,b),e.loaded=!0,e.exports}var c={};return b.m=a,b.c=c,b.p="",b(0)}([function(a,b,c){(function(b){function d(a,b,c,d){var f=e(c.substr(c.lastIndexOf(a.domain)),a);f&&h({mode:null,el:d,flags:f,engineSettings:b})}function e(a,b){var c={theme:B(J.settings.themes.gray,null),stylesheets:b.stylesheets,instanceOptions:b};return a.match(/([\d]+p?)x([\d]+p?)(?:\?|$)/)?f(a,c):g(a,c)}function f(a,b){var c=a.split("?"),d=c[0].split("/");b.holderURL=a;var e=d[1],f=e.match(/([\d]+p?)x([\d]+p?)/);if(!f)return!1;if(b.fluid=-1!==e.indexOf("p"),b.dimensions={width:f[1].replace("p","%"),height:f[2].replace("p","%")},2===c.length){var g=A.parse(c[1]);if(g.bg&&(b.theme.background=(-1===g.bg.indexOf("#")?"#":"")+g.bg),g.fg&&(b.theme.foreground=(-1===g.fg.indexOf("#")?"#":"")+g.fg),g.theme&&b.instanceOptions.themes.hasOwnProperty(g.theme)&&(b.theme=B(b.instanceOptions.themes[g.theme],null)),g.text&&(b.text=g.text),g.textmode&&(b.textmode=g.textmode),g.size&&(b.size=g.size),g.font&&(b.font=g.font),g.align&&(b.align=g.align),b.nowrap=z.truthy(g.nowrap),b.auto=z.truthy(g.auto),z.truthy(g.random)){J.vars.cache.themeKeys=J.vars.cache.themeKeys||Object.keys(b.instanceOptions.themes);var h=J.vars.cache.themeKeys[0|Math.random()*J.vars.cache.themeKeys.length];b.theme=B(b.instanceOptions.themes[h],null)}}return b}function g(a,b){var c=!1,d=String.fromCharCode(11),e=a.replace(/([^\\])\//g,"$1"+d).split(d),f=/%[0-9a-f]{2}/gi,g=b.instanceOptions;b.holderURL=[];for(var h=e.length,i=0;h>i;i++){var j=e[i];if(j.match(f))try{j=decodeURIComponent(j)}catch(k){j=e[i]}var l=!1;if(J.flags.dimensions.match(j))c=!0,b.dimensions=J.flags.dimensions.output(j),l=!0;else if(J.flags.fluid.match(j))c=!0,b.dimensions=J.flags.fluid.output(j),b.fluid=!0,l=!0;else if(J.flags.textmode.match(j))b.textmode=J.flags.textmode.output(j),l=!0;else if(J.flags.colors.match(j)){var m=J.flags.colors.output(j);b.theme=B(b.theme,m),l=!0}else if(g.themes[j])g.themes.hasOwnProperty(j)&&(b.theme=B(g.themes[j],null)),l=!0;else if(J.flags.font.match(j))b.font=J.flags.font.output(j),l=!0;else if(J.flags.auto.match(j))b.auto=!0,l=!0;else if(J.flags.text.match(j))b.text=J.flags.text.output(j),l=!0;else if(J.flags.size.match(j))b.size=J.flags.size.output(j),l=!0;else if(J.flags.random.match(j)){null==J.vars.cache.themeKeys&&(J.vars.cache.themeKeys=Object.keys(g.themes));var n=J.vars.cache.themeKeys[0|Math.random()*J.vars.cache.themeKeys.length];b.theme=B(g.themes[n],null),l=!0}l&&b.holderURL.push(j)}return b.holderURL.unshift(g.domain),b.holderURL=b.holderURL.join("/"),c?b:!1}function h(a){var b=a.mode,c=a.el,d=a.flags,e=a.engineSettings,f=d.dimensions,g=d.theme,h=f.width+"x"+f.height;if(b=null==b?d.fluid?"fluid":"image":b,null!=d.text&&(g.text=d.text,"object"===c.nodeName.toLowerCase())){for(var j=g.text.split("\\n"),k=0;k<j.length;k++)j[k]=z.encodeHtmlEntity(j[k]);g.text=j.join("\\n")}var n=d.holderURL,o=B(e,null);if(d.font&&(g.font=d.font,!o.noFontFallback&&"img"===c.nodeName.toLowerCase()&&J.setup.supportsCanvas&&"svg"===o.renderer&&(o=B(o,{renderer:"canvas"}))),d.font&&"canvas"==o.renderer&&(o.reRender=!0),"background"==b)null==c.getAttribute("data-background-src")&&r(c,{"data-background-src":n});else{var p={};p[J.vars.dataAttr]=n,r(c,p)}d.theme=g,c.holderData={flags:d,engineSettings:o},("image"==b||"fluid"==b)&&r(c,{alt:g.text?g.text+" ["+h+"]":h});var q={mode:b,el:c,holderSettings:{dimensions:f,theme:g,flags:d},engineSettings:o};"image"==b?("html"!=o.renderer&&d.auto||(c.style.width=f.width+"px",c.style.height=f.height+"px"),"html"==o.renderer?c.style.backgroundColor=g.background:(i(q),"exact"==d.textmode&&(c.holderData.resizeUpdate=!0,J.vars.resizableImages.push(c),l(c)))):"background"==b&&"html"!=o.renderer?i(q):"fluid"==b&&(c.holderData.resizeUpdate=!0,"%"==f.height.slice(-1)?c.style.height=f.height:null!=d.auto&&d.auto||(c.style.height=f.height+"px"),"%"==f.width.slice(-1)?c.style.width=f.width:null!=d.auto&&d.auto||(c.style.width=f.width+"px"),("inline"==c.style.display||""===c.style.display||"none"==c.style.display)&&(c.style.display="block"),m(c),"html"==o.renderer?c.style.backgroundColor=g.background:(J.vars.resizableImages.push(c),l(c)))}function i(a){function c(){var b=null;switch(h.renderer){case"canvas":b=L(k,a);break;case"svg":b=M(k,a);break;default:throw"Holder: invalid renderer: "+h.renderer}return b}var d=null,e=a.mode,f=a.holderSettings,g=a.el,h=a.engineSettings;switch(h.renderer){case"svg":if(!J.setup.supportsSVG)return;break;case"canvas":if(!J.setup.supportsCanvas)return;break;default:return}var i={width:f.dimensions.width,height:f.dimensions.height,theme:f.theme,flags:f.flags},k=j(i);if(d=c(),null==d)throw"Holder: couldn't render placeholder";"background"==e?(g.style.backgroundImage="url("+d+")",g.style.backgroundSize=i.width+"px "+i.height+"px"):("img"===g.nodeName.toLowerCase()?r(g,{src:d}):"object"===g.nodeName.toLowerCase()&&(r(g,{data:d}),r(g,{type:"image/svg+xml"})),h.reRender&&b.setTimeout(function(){var a=c();if(null==a)throw"Holder: couldn't render placeholder";"img"===g.nodeName.toLowerCase()?r(g,{src:a}):"object"===g.nodeName.toLowerCase()&&(r(g,{data:a}),r(g,{type:"image/svg+xml"}))},100)),r(g,{"data-holder-rendered":!0})}function j(a){function b(a,b,c,d){b.width=c,b.height=d,a.width=Math.max(a.width,b.width),a.height+=b.height}var c=J.defaults.size;switch(parseFloat(a.theme.size)?c=a.theme.size:parseFloat(a.flags.size)&&(c=a.flags.size),a.font={family:a.theme.font?a.theme.font:"Arial, Helvetica, Open Sans, sans-serif",size:k(a.width,a.height,c),units:a.theme.units?a.theme.units:J.defaults.units,weight:a.theme.fontweight?a.theme.fontweight:"bold"},a.text=a.theme.text||Math.floor(a.width)+"x"+Math.floor(a.height),a.noWrap=a.theme.nowrap||a.flags.nowrap,a.align=a.theme.align||a.flags.align||"center",a.flags.textmode){case"literal":a.text=a.flags.dimensions.width+"x"+a.flags.dimensions.height;break;case"exact":if(!a.flags.exactDimensions)break;a.text=Math.floor(a.flags.exactDimensions.width)+"x"+Math.floor(a.flags.exactDimensions.height)}var d=new y({width:a.width,height:a.height}),e=d.Shape,f=new e.Rect("holderBg",{fill:a.theme.background});f.resize(a.width,a.height),d.root.add(f);var g=new e.Group("holderTextGroup",{text:a.text,align:a.align,font:a.font,fill:a.theme.foreground});g.moveTo(null,null,1),d.root.add(g);var h=g.textPositionData=K(d);if(!h)throw"Holder: staging fallback not supported yet.";g.properties.leading=h.boundingBox.height;var i=null,j=null,l=a.width*J.setup.lineWrapRatio,m=l;if(h.lineCount>1){var n,o=0,p=0,q=0;j=new e.Group("line"+q),("left"===a.align||"right"===a.align)&&(m=a.width*(1-2*(1-J.setup.lineWrapRatio)));for(var r=0;r<h.words.length;r++){var s=h.words[r];i=new e.Text(s.text);var t="\\n"==s.text;!a.noWrap&&(o+s.width>=m||t===!0)&&(b(g,j,o,g.properties.leading),g.add(j),o=0,p+=g.properties.leading,q+=1,j=new e.Group("line"+q),j.y=p),t!==!0&&(i.moveTo(o,0),o+=h.spaceWidth+s.width,j.add(i))}if(b(g,j,o,g.properties.leading),g.add(j),"left"===a.align)g.moveTo(a.width-l,null,null);else if("right"===a.align){for(n in g.children)j=g.children[n],j.moveTo(a.width-j.width,null,null);g.moveTo(0-(a.width-l),null,null)}else{for(n in g.children)j=g.children[n],j.moveTo((g.width-j.width)/2,null,null);g.moveTo((a.width-g.width)/2,null,null)}g.moveTo(null,(a.height-g.height)/2,null),(a.height-g.height)/2<0&&g.moveTo(null,0,null)}else i=new e.Text(a.text),j=new e.Group("line0"),j.add(i),g.add(j),"left"===a.align?g.moveTo(a.width-l,null,null):"right"===a.align?g.moveTo(0-(a.width-l),null,null):g.moveTo((a.width-h.boundingBox.width)/2,null,null),g.moveTo(null,(a.height-h.boundingBox.height)/2,null);return d}function k(a,b,c){var d=parseInt(a,10),e=parseInt(b,10),f=Math.max(d,e),g=Math.min(d,e),h=.8*Math.min(g,f*J.defaults.scale);return Math.round(Math.max(c,h))}function l(a){var b;b=null==a||null==a.nodeType?J.vars.resizableImages:[a];for(var c=0,d=b.length;d>c;c++){var e=b[c];if(e.holderData){var f=e.holderData.flags,g=D(e);if(g){if(!e.holderData.resizeUpdate)continue;if(f.fluid&&f.auto){var h=e.holderData.fluidConfig;switch(h.mode){case"width":g.height=g.width/h.ratio;break;case"height":g.width=g.height*h.ratio}}var j={mode:"image",holderSettings:{dimensions:g,theme:f.theme,flags:f},el:e,engineSettings:e.holderData.engineSettings};"exact"==f.textmode&&(f.exactDimensions=g,j.holderSettings.dimensions=f.dimensions),i(j)}else p(e)}}}function m(a){if(a.holderData){var b=D(a);if(b){var c=a.holderData.flags,d={fluidHeight:"%"==c.dimensions.height.slice(-1),fluidWidth:"%"==c.dimensions.width.slice(-1),mode:null,initialDimensions:b};d.fluidWidth&&!d.fluidHeight?(d.mode="width",d.ratio=d.initialDimensions.width/parseFloat(c.dimensions.height)):!d.fluidWidth&&d.fluidHeight&&(d.mode="height",d.ratio=parseFloat(c.dimensions.width)/d.initialDimensions.height),a.holderData.fluidConfig=d}else p(a)}}function n(){for(var a,c=[],d=Object.keys(J.vars.invisibleImages),e=0,f=d.length;f>e;e++)a=J.vars.invisibleImages[d[e]],D(a)&&"img"==a.nodeName.toLowerCase()&&(c.push(a),delete J.vars.invisibleImages[d[e]]);c.length&&I.run({images:c}),b.requestAnimationFrame(n)}function o(){J.vars.visibilityCheckStarted||(b.requestAnimationFrame(n),J.vars.visibilityCheckStarted=!0)}function p(a){a.holderData.invisibleId||(J.vars.invisibleId+=1,J.vars.invisibleImages["i"+J.vars.invisibleId]=a,a.holderData.invisibleId=J.vars.invisibleId)}function q(a,b){return null==b?document.createElement(a):document.createElementNS(b,a)}function r(a,b){for(var c in b)a.setAttribute(c,b[c])}function s(a,b,c){var d,e;null==a?(a=q("svg",E),d=q("defs",E),e=q("style",E),r(e,{type:"text/css"}),d.appendChild(e),a.appendChild(d)):e=a.querySelector("style"),a.webkitMatchesSelector&&a.setAttribute("xmlns",E);for(var f=0;f<a.childNodes.length;f++)a.childNodes[f].nodeType===F&&a.removeChild(a.childNodes[f]);for(;e.childNodes.length;)e.removeChild(e.childNodes[0]);return r(a,{width:b,height:c,viewBox:"0 0 "+b+" "+c,preserveAspectRatio:"none"}),a}function t(a,c){if(b.XMLSerializer){var d=new XMLSerializer,e="",f=c.stylesheets;if(c.svgXMLStylesheet){for(var g=u(),h=f.length-1;h>=0;h--){var i=g.createProcessingInstruction("xml-stylesheet",'href="'+f[h]+'" rel="stylesheet"');g.insertBefore(i,g.firstChild)}g.removeChild(g.documentElement),e=d.serializeToString(g)}var j=d.serializeToString(a);return j=j.replace(/\&amp;(\#[0-9]{2,}\;)/g,"&$1"),e+j}}function u(){return b.DOMParser?(new DOMParser).parseFromString("<xml />","application/xml"):void 0}function v(a){J.vars.debounceTimer||a.call(this),J.vars.debounceTimer&&b.clearTimeout(J.vars.debounceTimer),J.vars.debounceTimer=b.setTimeout(function(){J.vars.debounceTimer=null,a.call(this)},J.setup.debounce)}function w(){v(function(){l(null)})}var x=c(1),y=c(2),z=c(3),A=c(4),B=z.extend,C=z.getNodeArray,D=z.dimensionCheck,E="http://www.w3.org/2000/svg",F=8,G="2.7.1",H="\nCreated with Holder.js "+G+".\nLearn more at http://holderjs.com\n(c) 2012-2015 Ivan Malopinsky - http://imsky.co\n",I={version:G,addTheme:function(a,b){return null!=a&&null!=b&&(J.settings.themes[a]=b),delete J.vars.cache.themeKeys,this},addImage:function(a,b){var c=document.querySelectorAll(b);if(c.length)for(var d=0,e=c.length;e>d;d++){var f=q("img"),g={};g[J.vars.dataAttr]=a,r(f,g),c[d].appendChild(f)}return this},setResizeUpdate:function(a,b){a.holderData&&(a.holderData.resizeUpdate=!!b,a.holderData.resizeUpdate&&l(a))},run:function(a){a=a||{};var c={},f=B(J.settings,a);J.vars.preempted=!0,J.vars.dataAttr=f.dataAttr||J.vars.dataAttr,c.renderer=f.renderer?f.renderer:J.setup.renderer,-1===J.setup.renderers.join(",").indexOf(c.renderer)&&(c.renderer=J.setup.supportsSVG?"svg":J.setup.supportsCanvas?"canvas":"html");var g=C(f.images),i=C(f.bgnodes),j=C(f.stylenodes),k=C(f.objects);c.stylesheets=[],c.svgXMLStylesheet=!0,c.noFontFallback=f.noFontFallback?f.noFontFallback:!1;for(var l=0;l<j.length;l++){var m=j[l];if(m.attributes.rel&&m.attributes.href&&"stylesheet"==m.attributes.rel.value){var n=m.attributes.href.value,o=q("a");o.href=n;var p=o.protocol+"//"+o.host+o.pathname+o.search;c.stylesheets.push(p)}}for(l=0;l<i.length;l++)if(b.getComputedStyle){var r=b.getComputedStyle(i[l],null).getPropertyValue("background-image"),s=i[l].getAttribute("data-background-src"),t=null;t=null==s?r:s;var u=null,v="?"+f.domain+"/";if(0===t.indexOf(v))u=t.slice(1);else if(-1!=t.indexOf(v)){var w=t.substr(t.indexOf(v)).slice(1),x=w.match(/([^\"]*)"?\)/);null!=x&&(u=x[1])}if(null!=u){var y=e(u,f);y&&h({mode:"background",el:i[l],flags:y,engineSettings:c})}}for(l=0;l<k.length;l++){var A=k[l],D={};try{D.data=A.getAttribute("data"),D.dataSrc=A.getAttribute(J.vars.dataAttr)}catch(E){}var F=null!=D.data&&0===D.data.indexOf(f.domain),G=null!=D.dataSrc&&0===D.dataSrc.indexOf(f.domain);F?d(f,c,D.data,A):G&&d(f,c,D.dataSrc,A)}for(l=0;l<g.length;l++){var H=g[l],I={};try{I.src=H.getAttribute("src"),I.dataSrc=H.getAttribute(J.vars.dataAttr),I.rendered=H.getAttribute("data-holder-rendered")}catch(E){}var K=null!=I.src,L=null!=I.dataSrc&&0===I.dataSrc.indexOf(f.domain),M=null!=I.rendered&&"true"==I.rendered;K?0===I.src.indexOf(f.domain)?d(f,c,I.src,H):L&&(M?d(f,c,I.dataSrc,H):!function(a,b,c,e,f){z.imageExists(a,function(a){a||d(b,c,e,f)})}(I.src,f,c,I.dataSrc,H)):L&&d(f,c,I.dataSrc,H)}return this}},J={settings:{domain:"holder.js",images:"img",objects:"object",bgnodes:"body .holderjs",stylenodes:"head link.holderjs",stylesheets:[],themes:{gray:{background:"#EEEEEE",foreground:"#AAAAAA"},social:{background:"#3a5a97",foreground:"#FFFFFF"},industrial:{background:"#434A52",foreground:"#C2F200"},sky:{background:"#0D8FDB",foreground:"#FFFFFF"},vine:{background:"#39DBAC",foreground:"#1E292C"},lava:{background:"#F8591A",foreground:"#1C2846"}}},defaults:{size:10,units:"pt",scale:1/16},flags:{dimensions:{regex:/^(\d+)x(\d+)$/,output:function(a){var b=this.regex.exec(a);return{width:+b[1],height:+b[2]}}},fluid:{regex:/^([0-9]+%?)x([0-9]+%?)$/,output:function(a){var b=this.regex.exec(a);return{width:b[1],height:b[2]}}},colors:{regex:/(?:#|\^)([0-9a-f]{3,})\:(?:#|\^)([0-9a-f]{3,})/i,output:function(a){var b=this.regex.exec(a);return{foreground:"#"+b[2],background:"#"+b[1]}}},text:{regex:/text\:(.*)/,output:function(a){return this.regex.exec(a)[1].replace("\\/","/")}},font:{regex:/font\:(.*)/,output:function(a){return this.regex.exec(a)[1]}},auto:{regex:/^auto$/},textmode:{regex:/textmode\:(.*)/,output:function(a){return this.regex.exec(a)[1]}},random:{regex:/^random$/},size:{regex:/size\:(\d+)/,output:function(a){return this.regex.exec(a)[1]}}}},K=function(){var a=null,b=null,c=null;return function(d){var e=d.root;if(J.setup.supportsSVG){var f=!1,g=function(a){return document.createTextNode(a)};(null==a||a.parentNode!==document.body)&&(f=!0),a=s(a,e.properties.width,e.properties.height),a.style.display="block",f&&(b=q("text",E),c=g(null),r(b,{x:0}),b.appendChild(c),a.appendChild(b),document.body.appendChild(a),a.style.visibility="hidden",a.style.position="absolute",a.style.top="-100%",a.style.left="-100%");var h=e.children.holderTextGroup,i=h.properties;r(b,{y:i.font.size,style:z.cssProps({"font-weight":i.font.weight,"font-size":i.font.size+i.font.units,"font-family":i.font.family})}),c.nodeValue=i.text;var j=b.getBBox(),k=Math.ceil(j.width/(e.properties.width*J.setup.lineWrapRatio)),l=i.text.split(" "),m=i.text.match(/\\n/g);k+=null==m?0:m.length,c.nodeValue=i.text.replace(/[ ]+/g,"");var n=b.getComputedTextLength(),o=j.width-n,p=Math.round(o/Math.max(1,l.length-1)),t=[];if(k>1){c.nodeValue="";for(var u=0;u<l.length;u++)if(0!==l[u].length){c.nodeValue=z.decodeHtmlEntity(l[u]);var v=b.getBBox();t.push({text:l[u],width:v.width})}}return a.style.display="none",{spaceWidth:p,lineCount:k,boundingBox:j,words:t}}return!1}}(),L=function(){var a=q("canvas"),b=null;return function(c){null==b&&(b=a.getContext("2d"));var d=c.root;a.width=J.dpr(d.properties.width),a.height=J.dpr(d.properties.height),b.textBaseline="middle",b.fillStyle=d.children.holderBg.properties.fill,b.fillRect(0,0,J.dpr(d.children.holderBg.width),J.dpr(d.children.holderBg.height));{var e=d.children.holderTextGroup;e.properties}b.font=e.properties.font.weight+" "+J.dpr(e.properties.font.size)+e.properties.font.units+" "+e.properties.font.family+", monospace",b.fillStyle=e.properties.fill;for(var f in e.children){var g=e.children[f];for(var h in g.children){var i=g.children[h],j=J.dpr(e.x+g.x+i.x),k=J.dpr(e.y+g.y+i.y+e.properties.leading/2);b.fillText(i.properties.text,j,k)}}return a.toDataURL("image/png")}}(),M=function(){if(b.XMLSerializer){var a=u(),c=s(null,0,0),d=q("rect",E);return c.appendChild(d),function(b,e){var f=b.root;s(c,f.properties.width,f.properties.height);for(var g=c.querySelectorAll("g"),h=0;h<g.length;h++)g[h].parentNode.removeChild(g[h]);var i=e.holderSettings.flags.holderURL,j="holder_"+(Number(new Date)+32768+(0|32768*Math.random())).toString(16),k=q("g",E),l=f.children.holderTextGroup,m=l.properties,n=q("g",E),o=l.textPositionData,p="#"+j+" text { "+z.cssProps({fill:m.fill,"font-weight":m.font.weight,"font-family":m.font.family+", monospace","font-size":m.font.size+m.font.units})+" } ",u=a.createComment("\nSource URL: "+i+H),v=a.createCDATASection(p),w=c.querySelector("style");r(k,{id:j}),c.insertBefore(u,c.firstChild),w.appendChild(v),k.appendChild(d),k.appendChild(n),c.appendChild(k),r(d,{width:f.children.holderBg.width,height:f.children.holderBg.height,fill:f.children.holderBg.properties.fill}),l.y+=.8*o.boundingBox.height;for(var x in l.children){var y=l.children[x];for(var A in y.children){var B=y.children[A],C=l.x+y.x+B.x,D=l.y+y.y+B.y,F=q("text",E),G=document.createTextNode(null);r(F,{x:C,y:D}),G.nodeValue=B.properties.text,F.appendChild(G),n.appendChild(F)}}var I=N(t(c,e.engineSettings),"background"===e.mode);return I}}}(),N=function(){var a="data:image/svg+xml;charset=UTF-8,",b="data:image/svg+xml;charset=UTF-8;base64,";return function(c,d){return d?b+btoa(unescape(encodeURIComponent(c))):a+encodeURIComponent(c)}}();for(var O in J.flags)J.flags.hasOwnProperty(O)&&(J.flags[O].match=function(a){return a.match(this.regex)});J.setup={renderer:"html",debounce:100,ratio:1,supportsCanvas:!1,supportsSVG:!1,lineWrapRatio:.9,renderers:["html","canvas","svg"]},J.dpr=function(a){return a*J.setup.ratio},J.vars={preempted:!1,resizableImages:[],invisibleImages:{},invisibleId:0,visibilityCheckStarted:!1,debounceTimer:null,cache:{},dataAttr:"data-src"},function(){var a=1,c=1,d=q("canvas"),e=null;d.getContext&&-1!=d.toDataURL("image/png").indexOf("data:image/png")&&(J.setup.renderer="canvas",e=d.getContext("2d"),J.setup.supportsCanvas=!0),J.setup.supportsCanvas&&(a=b.devicePixelRatio||1,c=e.webkitBackingStorePixelRatio||e.mozBackingStorePixelRatio||e.msBackingStorePixelRatio||e.oBackingStorePixelRatio||e.backingStorePixelRatio||1),J.setup.ratio=a/c,document.createElementNS&&document.createElementNS(E,"svg").createSVGRect&&(J.setup.renderer="svg",J.setup.supportsSVG=!0)}(),o(),x&&x(function(){J.vars.preempted||I.run(),b.addEventListener?(b.addEventListener("resize",w,!1),b.addEventListener("orientationchange",w,!1)):b.attachEvent("onresize",w),"object"==typeof b.Turbolinks&&b.document.addEventListener("page:change",function(){I.run()})}),a.exports=I}).call(b,function(){return this}())},function(a){function b(a){function b(a){if(!v){if(!g.body)return e(b);for(v=!0;a=w.shift();)e(a)}}function c(a){(t||a.type===i||g[m]===l)&&(d(),b())}function d(){t?(g[s](q,c,j),a[s](i,c,j)):(g[o](r,c),a[o](k,c))}function e(a,b){setTimeout(a,+b>=0?b:1)}function f(a){v?e(a):w.push(a)}null==document.readyState&&document.addEventListener&&(document.addEventListener("DOMContentLoaded",function y(){document.removeEventListener("DOMContentLoaded",y,!1),document.readyState="complete"},!1),document.readyState="loading");var g=a.document,h=g.documentElement,i="load",j=!1,k="on"+i,l="complete",m="readyState",n="attachEvent",o="detachEvent",p="addEventListener",q="DOMContentLoaded",r="onreadystatechange",s="removeEventListener",t=p in g,u=j,v=j,w=[];if(g[m]===l)e(b);else if(t)g[p](q,c,j),a[p](i,c,j);else{g[n](r,c),a[n](k,c);try{u=null==a.frameElement&&h}catch(x){}u&&u.doScroll&&!function z(){if(!v){try{u.doScroll("left")}catch(a){return e(z,50)}d(),b()}}()}return f.version="1.4.0",f.isReady=function(){return v},f}a.exports="undefined"!=typeof window&&b(window)},function(a,b,c){var d=c(5),e=function(a){function b(a,b){for(var c in b)a[c]=b[c];return a}var c=1,e=d.defclass({constructor:function(a){c++,this.parent=null,this.children={},this.id=c,this.name="n"+c,null!=a&&(this.name=a),this.x=0,this.y=0,this.z=0,this.width=0,this.height=0},resize:function(a,b){null!=a&&(this.width=a),null!=b&&(this.height=b)},moveTo:function(a,b,c){this.x=null!=a?a:this.x,this.y=null!=b?b:this.y,this.z=null!=c?c:this.z},add:function(a){var b=a.name;if(null!=this.children[b])throw"SceneGraph: child with that name already exists: "+b;this.children[b]=a,a.parent=this}}),f=d(e,function(b){this.constructor=function(){b.constructor.call(this,"root"),this.properties=a}}),g=d(e,function(a){function c(c,d){if(a.constructor.call(this,c),this.properties={fill:"#000"},null!=d)b(this.properties,d);else if(null!=c&&"string"!=typeof c)throw"SceneGraph: invalid node name"}this.Group=d.extend(this,{constructor:c,type:"group"}),this.Rect=d.extend(this,{constructor:c,type:"rect"}),this.Text=d.extend(this,{constructor:function(a){c.call(this),this.properties.text=a},type:"text"})}),h=new f;return this.Shape=g,this.root=h,this};a.exports=e},function(a,b){(function(a){b.extend=function(a,b){var c={};for(var d in a)a.hasOwnProperty(d)&&(c[d]=a[d]);if(null!=b)for(var e in b)b.hasOwnProperty(e)&&(c[e]=b[e]);return c},b.cssProps=function(a){var b=[];for(var c in a)a.hasOwnProperty(c)&&b.push(c+":"+a[c]);return b.join(";")},b.encodeHtmlEntity=function(a){for(var b=[],c=0,d=a.length-1;d>=0;d--)c=a.charCodeAt(d),b.unshift(c>128?["&#",c,";"].join(""):a[d]);return b.join("")},b.getNodeArray=function(b){var c=null;return"string"==typeof b?c=document.querySelectorAll(b):a.NodeList&&b instanceof a.NodeList?c=b:a.Node&&b instanceof a.Node?c=[b]:a.HTMLCollection&&b instanceof a.HTMLCollection?c=b:b instanceof Array?c=b:null===b&&(c=[]),c},b.imageExists=function(a,b){var c=new Image;c.onerror=function(){b.call(this,!1)},c.onload=function(){b.call(this,!0)},c.src=a},b.decodeHtmlEntity=function(a){return a.replace(/&#(\d+);/g,function(a,b){return String.fromCharCode(b)})},b.dimensionCheck=function(a){var b={height:a.clientHeight,width:a.clientWidth};return b.height&&b.width?b:!1},b.truthy=function(a){return"string"==typeof a?"true"===a||"yes"===a||"1"===a||"on"===a||"✓"===a:!!a}}).call(b,function(){return this}())},function(a,b,c){var d=encodeURIComponent,e=decodeURIComponent,f=c(6),g=c(7),h=/(\w+)\[(\d+)\]/,i=/\w+\.\w+/;b.parse=function(a){if("string"!=typeof a)return{};if(a=f(a),""===a)return{};"?"===a.charAt(0)&&(a=a.slice(1));for(var b={},c=a.split("&"),d=0;d<c.length;d++){var g,j,k,l=c[d].split("="),m=e(l[0]);if(g=h.exec(m))b[g[1]]=b[g[1]]||[],b[g[1]][g[2]]=e(l[1]);else if(g=i.test(m)){for(g=m.split("."),j=b;g.length;)if(k=g.shift(),k.length){if(j[k]){if(j[k]&&"object"!=typeof j[k])break}else j[k]={};g.length||(j[k]=e(l[1])),j=j[k]}}else b[l[0]]=null==l[1]?"":e(l[1])}return b},b.stringify=function(a){if(!a)return"";var b=[];for(var c in a){var e=a[c];if("array"!=g(e))b.push(d(c)+"="+d(a[c]));else for(var f=0;f<e.length;++f)b.push(d(c+"["+f+"]")+"="+d(e[f]))}return b.join("&")}},function(a){var b=function(){},c=Array.prototype.slice,d=function(a,d){var e=b.prototype="function"==typeof a?a.prototype:a,f=new b,g=d.apply(f,c.call(arguments,2).concat(e));if("object"==typeof g)for(var h in g)f[h]=g[h];if(!f.hasOwnProperty("constructor"))return f;var i=f.constructor;return i.prototype=f,i};d.defclass=function(a){var b=a.constructor;return b.prototype=a,b},d.extend=function(a,b){return d(a,function(a){return this.uber=a,b})},a.exports=d},function(a,b){function c(a){return a.replace(/^\s*|\s*$/g,"")}b=a.exports=c,b.left=function(a){return a.replace(/^\s*/,"")},b.right=function(a){return a.replace(/\s*$/,"")}},function(a){var b=Object.prototype.toString;a.exports=function(a){switch(b.call(a)){case"[object Date]":return"date";case"[object RegExp]":return"regexp";case"[object Arguments]":return"arguments";case"[object Array]":return"array";case"[object Error]":return"error"}return null===a?"null":void 0===a?"undefined":a!==a?"nan":a&&1===a.nodeType?"element":(a=a.valueOf?a.valueOf():Object.prototype.valueOf.apply(a),typeof a)}}])}),function(a,b){b&&(Holder=a.Holder)}(this,"undefined"!=typeof Meteor&&"undefined"!=typeof Package);
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/html5shiv.min.js b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/html5shiv.min.js
new file mode 100644
index 00000000..d4c731ad
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/html5shiv.min.js
@@ -0,0 +1,4 @@
+/**
+* @preserve HTML5 Shiv 3.7.2 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+*/
+!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():p.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||o.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),l)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return t.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(t,b.frag)}function j(a){a||(a=b);var d=f(a);return!t.shivCSS||k||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),l||i(a,d),a}var k,l,m="3.7.2",n=a.html5||{},o=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,p=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,q="_html5shiv",r=0,s={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",k="hidden"in a,l=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){k=!0,l=!0}}();var t={elements:n.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:m,shivCSS:n.shivCSS!==!1,supportsUnknownElements:l,shivMethods:n.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=t,j(b)}(this,document);
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/jquery.min.js b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/jquery.min.js
new file mode 100644
index 00000000..0f60b7bd
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/jquery.min.js
@@ -0,0 +1,5 @@
+/*! jQuery v1.11.3 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.3",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b="length"in a&&a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ca,da).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function qa(){}qa.prototype=d.filters=d.pseudos,d.setFilters=new qa,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function ra(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sa(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function ta(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ca,da),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;
+
+return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?m.queue(this[0],a):void 0===b?this:this.each(function(){var c=m.queue(this,a,b);m._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&m.dequeue(this,a)})},dequeue:function(a){return this.each(function(){m.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=m.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=m._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=["Top","Right","Bottom","Left"],U=function(a,b){return a=b||a,"none"===m.css(a,"display")||!m.contains(a.ownerDocument,a)},V=m.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===m.type(c)){e=!0;for(h in c)m.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,m.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(m(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav></:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function aa(){return!0}function ba(){return!1}function ca(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[m.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=Z.test(e)?this.mouseHooks:Y.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new m.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||y),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||y,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==ca()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===ca()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return m.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return m.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=m.extend(new m.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?m.event.trigger(e,null,b):m.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},m.removeEvent=y.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===K&&(a[d]=null),a.detachEvent(d,c))},m.Event=function(a,b){return this instanceof m.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?aa:ba):this.type=a,b&&m.extend(this,b),this.timeStamp=a&&a.timeStamp||m.now(),void(this[m.expando]=!0)):new m.Event(a,b)},m.Event.prototype={isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=aa,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=aa,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=aa,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},m.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){m.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!m.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.submitBubbles||(m.event.special.submit={setup:function(){return m.nodeName(this,"form")?!1:void m.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=m.nodeName(b,"input")||m.nodeName(b,"button")?b.form:void 0;c&&!m._data(c,"submitBubbles")&&(m.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),m._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&m.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return m.nodeName(this,"form")?!1:void m.event.remove(this,"._submit")}}),k.changeBubbles||(m.event.special.change={setup:function(){return X.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(m.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),m.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),m.event.simulate("change",this,a,!0)})),!1):void m.event.add(this,"beforeactivate._change",function(a){var b=a.target;X.test(b.nodeName)&&!m._data(b,"changeBubbles")&&(m.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||m.event.simulate("change",this.parentNode,a,!0)}),m._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return m.event.remove(this,"._change"),!X.test(this.nodeName)}}),k.focusinBubbles||m.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){m.event.simulate(b,a.target,m.event.fix(a),!0)};m.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=m._data(d,b);e||d.addEventListener(a,c,!0),m._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=m._data(d,b)-1;e?m._data(d,b,e):(d.removeEventListener(a,c,!0),m._removeData(d,b))}}}),m.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=ba;else if(!d)return this;return 1===e&&(g=d,d=function(a){return m().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=m.guid++)),this.each(function(){m.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,m(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=ba),this.each(function(){m.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){m.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?m.event.trigger(a,b,c,!0):void 0}});function da(a){var b=ea.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var ea="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",fa=/ jQuery\d+="(?:null|\d+)"/g,ga=new RegExp("<(?:"+ea+")[\\s/>]","i"),ha=/^\s+/,ia=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ja=/<([\w:]+)/,ka=/<tbody/i,la=/<|&#?\w+;/,ma=/<(?:script|style|link)/i,na=/checked\s*(?:[^=]|=\s*.checked.)/i,oa=/^$|\/(?:java|ecma)script/i,pa=/^true\/(.*)/,qa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ra={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:k.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},sa=da(y),ta=sa.appendChild(y.createElement("div"));ra.optgroup=ra.option,ra.tbody=ra.tfoot=ra.colgroup=ra.caption=ra.thead,ra.th=ra.td;function ua(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ua(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function va(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wa(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xa(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function ya(a){var b=pa.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function za(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Aa(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Ba(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xa(b).text=a.text,ya(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!ga.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ta.innerHTML=a.outerHTML,ta.removeChild(f=ta.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ua(f),h=ua(a),g=0;null!=(e=h[g]);++g)d[g]&&Ba(e,d[g]);if(b)if(c)for(h=h||ua(a),d=d||ua(f),g=0;null!=(e=h[g]);g++)Aa(e,d[g]);else Aa(a,f);return d=ua(f,"script"),d.length>0&&za(d,!i&&ua(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=da(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(la.test(f)){h=h||o.appendChild(b.createElement("div")),i=(ja.exec(f)||["",""])[1].toLowerCase(),l=ra[i]||ra._default,h.innerHTML=l[1]+f.replace(ia,"<$1></$2>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&ha.test(f)&&p.push(b.createTextNode(ha.exec(f)[0])),!k.tbody){f="table"!==i||ka.test(f)?"<table>"!==l[1]||ka.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ua(p,"input"),va),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ua(o.appendChild(f),"script"),g&&za(h),c)){e=0;while(f=h[e++])oa.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ua(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&za(ua(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ua(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fa,""):void 0;if(!("string"!=typeof a||ma.test(a)||!k.htmlSerialize&&ga.test(a)||!k.leadingWhitespace&&ha.test(a)||ra[(ja.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ia,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ua(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ua(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&na.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ua(i,"script"),xa),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ua(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,ya),j=0;f>j;j++)d=g[j],oa.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qa,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Ca,Da={};function Ea(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fa(a){var b=y,c=Da[a];return c||(c=Ea(a,b),"none"!==c&&c||(Ca=(Ca||m("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Ca[0].contentWindow||Ca[0].contentDocument).document,b.write(),b.close(),c=Ea(a,b),Ca.detach()),Da[a]=c),c}!function(){var a;k.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,d;return c=y.getElementsByTagName("body")[0],c&&c.style?(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(y.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(d),a):void 0}}();var Ga=/^margin/,Ha=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ia,Ja,Ka=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ia=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)},Ja=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ia(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||m.contains(a.ownerDocument,a)||(g=m.style(a,b)),Ha.test(g)&&Ga.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):y.documentElement.currentStyle&&(Ia=function(a){return a.currentStyle},Ja=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ia(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ha.test(g)&&!Ka.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function La(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h;if(b=y.createElement("div"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=d&&d.style){c.cssText="float:left;opacity:.5",k.opacity="0.5"===c.opacity,k.cssFloat=!!c.cssFloat,b.style.backgroundClip="content-box",b.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===b.style.backgroundClip,k.boxSizing=""===c.boxSizing||""===c.MozBoxSizing||""===c.WebkitBoxSizing,m.extend(k,{reliableHiddenOffsets:function(){return null==g&&i(),g},boxSizingReliable:function(){return null==f&&i(),f},pixelPosition:function(){return null==e&&i(),e},reliableMarginRight:function(){return null==h&&i(),h}});function i(){var b,c,d,i;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),b.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",e=f=!1,h=!0,a.getComputedStyle&&(e="1%"!==(a.getComputedStyle(b,null)||{}).top,f="4px"===(a.getComputedStyle(b,null)||{width:"4px"}).width,i=b.appendChild(y.createElement("div")),i.style.cssText=b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",i.style.marginRight=i.style.width="0",b.style.width="1px",h=!parseFloat((a.getComputedStyle(i,null)||{}).marginRight),b.removeChild(i)),b.innerHTML="<table><tr><td></td><td>t</td></tr></table>",i=b.getElementsByTagName("td"),i[0].style.cssText="margin:0;border:0;padding:0;display:none",g=0===i[0].offsetHeight,g&&(i[0].style.display="",i[1].style.display="none",g=0===i[0].offsetHeight),c.removeChild(d))}}}(),m.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Ma=/alpha\([^)]*\)/i,Na=/opacity\s*=\s*([^)]*)/,Oa=/^(none|table(?!-c[ea]).+)/,Pa=new RegExp("^("+S+")(.*)$","i"),Qa=new RegExp("^([+-])=("+S+")","i"),Ra={position:"absolute",visibility:"hidden",display:"block"},Sa={letterSpacing:"0",fontWeight:"400"},Ta=["Webkit","O","Moz","ms"];function Ua(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ta.length;while(e--)if(b=Ta[e]+c,b in a)return b;return d}function Va(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=m._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&U(d)&&(f[g]=m._data(d,"olddisplay",Fa(d.nodeName)))):(e=U(d),(c&&"none"!==c||!e)&&m._data(d,"olddisplay",e?c:m.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Wa(a,b,c){var d=Pa.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Xa(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=m.css(a,c+T[f],!0,e)),d?("content"===c&&(g-=m.css(a,"padding"+T[f],!0,e)),"margin"!==c&&(g-=m.css(a,"border"+T[f]+"Width",!0,e))):(g+=m.css(a,"padding"+T[f],!0,e),"padding"!==c&&(g+=m.css(a,"border"+T[f]+"Width",!0,e)));return g}function Ya(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ia(a),g=k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Ja(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ha.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Xa(a,b,c||(g?"border":"content"),d,f)+"px"}m.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Ja(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":k.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=m.camelCase(b),i=a.style;if(b=m.cssProps[h]||(m.cssProps[h]=Ua(i,h)),g=m.cssHooks[b]||m.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Qa.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(m.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||m.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=m.camelCase(b);return b=m.cssProps[h]||(m.cssProps[h]=Ua(a.style,h)),g=m.cssHooks[b]||m.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Ja(a,b,d)),"normal"===f&&b in Sa&&(f=Sa[b]),""===c||c?(e=parseFloat(f),c===!0||m.isNumeric(e)?e||0:f):f}}),m.each(["height","width"],function(a,b){m.cssHooks[b]={get:function(a,c,d){return c?Oa.test(m.css(a,"display"))&&0===a.offsetWidth?m.swap(a,Ra,function(){return Ya(a,b,d)}):Ya(a,b,d):void 0},set:function(a,c,d){var e=d&&Ia(a);return Wa(a,c,d?Xa(a,b,d,k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,e),e):0)}}}),k.opacity||(m.cssHooks.opacity={get:function(a,b){return Na.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=m.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===m.trim(f.replace(Ma,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Ma.test(f)?f.replace(Ma,e):f+" "+e)}}),m.cssHooks.marginRight=La(k.reliableMarginRight,function(a,b){return b?m.swap(a,{display:"inline-block"},Ja,[a,"marginRight"]):void 0}),m.each({margin:"",padding:"",border:"Width"},function(a,b){m.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+T[d]+b]=f[d]||f[d-2]||f[0];return e}},Ga.test(a)||(m.cssHooks[a+b].set=Wa)}),m.fn.extend({css:function(a,b){return V(this,function(a,b,c){var d,e,f={},g=0;if(m.isArray(b)){for(d=Ia(a),e=b.length;e>g;g++)f[b[g]]=m.css(a,b[g],!1,d);return f}return void 0!==c?m.style(a,b,c):m.css(a,b)},a,b,arguments.length>1)},show:function(){return Va(this,!0)},hide:function(){return Va(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){U(this)?m(this).show():m(this).hide()})}});function Za(a,b,c,d,e){
+return new Za.prototype.init(a,b,c,d,e)}m.Tween=Za,Za.prototype={constructor:Za,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")},cur:function(){var a=Za.propHooks[this.prop];return a&&a.get?a.get(this):Za.propHooks._default.get(this)},run:function(a){var b,c=Za.propHooks[this.prop];return this.options.duration?this.pos=b=m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Za.propHooks._default.set(this),this}},Za.prototype.init.prototype=Za.prototype,Za.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=m.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){m.fx.step[a.prop]?m.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[m.cssProps[a.prop]]||m.cssHooks[a.prop])?m.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Za.propHooks.scrollTop=Za.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},m.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},m.fx=Za.prototype.init,m.fx.step={};var $a,_a,ab=/^(?:toggle|show|hide)$/,bb=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),cb=/queueHooks$/,db=[ib],eb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=bb.exec(b),f=e&&e[3]||(m.cssNumber[a]?"":"px"),g=(m.cssNumber[a]||"px"!==f&&+d)&&bb.exec(m.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,m.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function fb(){return setTimeout(function(){$a=void 0}),$a=m.now()}function gb(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=T[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function hb(a,b,c){for(var d,e=(eb[b]||[]).concat(eb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ib(a,b,c){var d,e,f,g,h,i,j,l,n=this,o={},p=a.style,q=a.nodeType&&U(a),r=m._data(a,"fxshow");c.queue||(h=m._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,n.always(function(){n.always(function(){h.unqueued--,m.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=m.css(a,"display"),l="none"===j?m._data(a,"olddisplay")||Fa(a.nodeName):j,"inline"===l&&"none"===m.css(a,"float")&&(k.inlineBlockNeedsLayout&&"inline"!==Fa(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",k.shrinkWrapBlocks()||n.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],ab.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||m.style(a,d)}else j=void 0;if(m.isEmptyObject(o))"inline"===("none"===j?Fa(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=m._data(a,"fxshow",{}),f&&(r.hidden=!q),q?m(a).show():n.done(function(){m(a).hide()}),n.done(function(){var b;m._removeData(a,"fxshow");for(b in o)m.style(a,b,o[b])});for(d in o)g=hb(q?r[d]:0,d,n),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function jb(a,b){var c,d,e,f,g;for(c in a)if(d=m.camelCase(c),e=b[d],f=a[c],m.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=m.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kb(a,b,c){var d,e,f=0,g=db.length,h=m.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=$a||fb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:m.extend({},b),opts:m.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:$a||fb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=m.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jb(k,j.opts.specialEasing);g>f;f++)if(d=db[f].call(j,a,k,j.opts))return d;return m.map(k,hb,j),m.isFunction(j.opts.start)&&j.opts.start.call(a,j),m.fx.timer(m.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}m.Animation=m.extend(kb,{tweener:function(a,b){m.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],eb[c]=eb[c]||[],eb[c].unshift(b)},prefilter:function(a,b){b?db.unshift(a):db.push(a)}}),m.speed=function(a,b,c){var d=a&&"object"==typeof a?m.extend({},a):{complete:c||!c&&b||m.isFunction(a)&&a,duration:a,easing:c&&b||b&&!m.isFunction(b)&&b};return d.duration=m.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in m.fx.speeds?m.fx.speeds[d.duration]:m.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){m.isFunction(d.old)&&d.old.call(this),d.queue&&m.dequeue(this,d.queue)},d},m.fn.extend({fadeTo:function(a,b,c,d){return this.filter(U).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=m.isEmptyObject(a),f=m.speed(b,c,d),g=function(){var b=kb(this,m.extend({},a),f);(e||m._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=m.timers,g=m._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&cb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&m.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=m._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=m.timers,g=d?d.length:0;for(c.finish=!0,m.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),m.each(["toggle","show","hide"],function(a,b){var c=m.fn[b];m.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gb(b,!0),a,d,e)}}),m.each({slideDown:gb("show"),slideUp:gb("hide"),slideToggle:gb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){m.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),m.timers=[],m.fx.tick=function(){var a,b=m.timers,c=0;for($a=m.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||m.fx.stop(),$a=void 0},m.fx.timer=function(a){m.timers.push(a),a()?m.fx.start():m.timers.pop()},m.fx.interval=13,m.fx.start=function(){_a||(_a=setInterval(m.fx.tick,m.fx.interval))},m.fx.stop=function(){clearInterval(_a),_a=null},m.fx.speeds={slow:600,fast:200,_default:400},m.fn.delay=function(a,b){return a=m.fx?m.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e;b=y.createElement("div"),b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=y.createElement("select"),e=c.appendChild(y.createElement("option")),a=b.getElementsByTagName("input")[0],d.style.cssText="top:1px",k.getSetAttribute="t"!==b.className,k.style=/top/.test(d.getAttribute("style")),k.hrefNormalized="/a"===d.getAttribute("href"),k.checkOn=!!a.value,k.optSelected=e.selected,k.enctype=!!y.createElement("form").enctype,c.disabled=!0,k.optDisabled=!e.disabled,a=y.createElement("input"),a.setAttribute("value",""),k.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),k.radioValue="t"===a.value}();var lb=/\r/g;m.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=m.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,m(this).val()):a,null==e?e="":"number"==typeof e?e+="":m.isArray(e)&&(e=m.map(e,function(a){return null==a?"":a+""})),b=m.valHooks[this.type]||m.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=m.valHooks[e.type]||m.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(lb,""):null==c?"":c)}}}),m.extend({valHooks:{option:{get:function(a){var b=m.find.attr(a,"value");return null!=b?b:m.trim(m.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&m.nodeName(c.parentNode,"optgroup"))){if(b=m(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=m.makeArray(b),g=e.length;while(g--)if(d=e[g],m.inArray(m.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),m.each(["radio","checkbox"],function(){m.valHooks[this]={set:function(a,b){return m.isArray(b)?a.checked=m.inArray(m(a).val(),b)>=0:void 0}},k.checkOn||(m.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var mb,nb,ob=m.expr.attrHandle,pb=/^(?:checked|selected)$/i,qb=k.getSetAttribute,rb=k.input;m.fn.extend({attr:function(a,b){return V(this,m.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){m.removeAttr(this,a)})}}),m.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===K?m.prop(a,b,c):(1===f&&m.isXMLDoc(a)||(b=b.toLowerCase(),d=m.attrHooks[b]||(m.expr.match.bool.test(b)?nb:mb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=m.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void m.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=m.propFix[c]||c,m.expr.match.bool.test(c)?rb&&qb||!pb.test(c)?a[d]=!1:a[m.camelCase("default-"+c)]=a[d]=!1:m.attr(a,c,""),a.removeAttribute(qb?c:d)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&m.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),nb={set:function(a,b,c){return b===!1?m.removeAttr(a,c):rb&&qb||!pb.test(c)?a.setAttribute(!qb&&m.propFix[c]||c,c):a[m.camelCase("default-"+c)]=a[c]=!0,c}},m.each(m.expr.match.bool.source.match(/\w+/g),function(a,b){var c=ob[b]||m.find.attr;ob[b]=rb&&qb||!pb.test(b)?function(a,b,d){var e,f;return d||(f=ob[b],ob[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,ob[b]=f),e}:function(a,b,c){return c?void 0:a[m.camelCase("default-"+b)]?b.toLowerCase():null}}),rb&&qb||(m.attrHooks.value={set:function(a,b,c){return m.nodeName(a,"input")?void(a.defaultValue=b):mb&&mb.set(a,b,c)}}),qb||(mb={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},ob.id=ob.name=ob.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},m.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:mb.set},m.attrHooks.contenteditable={set:function(a,b,c){mb.set(a,""===b?!1:b,c)}},m.each(["width","height"],function(a,b){m.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),k.style||(m.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var sb=/^(?:input|select|textarea|button|object)$/i,tb=/^(?:a|area)$/i;m.fn.extend({prop:function(a,b){return V(this,m.prop,a,b,arguments.length>1)},removeProp:function(a){return a=m.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),m.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!m.isXMLDoc(a),f&&(b=m.propFix[b]||b,e=m.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=m.find.attr(a,"tabindex");return b?parseInt(b,10):sb.test(a.nodeName)||tb.test(a.nodeName)&&a.href?0:-1}}}}),k.hrefNormalized||m.each(["href","src"],function(a,b){m.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),k.optSelected||(m.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),m.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){m.propFix[this.toLowerCase()]=this}),k.enctype||(m.propFix.enctype="encoding");var ub=/[\t\r\n\f]/g;m.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ub," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=m.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ub," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?m.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(m.isFunction(a)?function(c){m(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=m(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===K||"boolean"===c)&&(this.className&&m._data(this,"__className__",this.className),this.className=this.className||a===!1?"":m._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ub," ").indexOf(b)>=0)return!0;return!1}}),m.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){m.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),m.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var vb=m.now(),wb=/\?/,xb=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;m.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=m.trim(b+"");return e&&!m.trim(e.replace(xb,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():m.error("Invalid JSON: "+b)},m.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||m.error("Invalid XML: "+b),c};var yb,zb,Ab=/#.*$/,Bb=/([?&])_=[^&]*/,Cb=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Db=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Eb=/^(?:GET|HEAD)$/,Fb=/^\/\//,Gb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hb={},Ib={},Jb="*/".concat("*");try{zb=location.href}catch(Kb){zb=y.createElement("a"),zb.href="",zb=zb.href}yb=Gb.exec(zb.toLowerCase())||[];function Lb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(m.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Mb(a,b,c,d){var e={},f=a===Ib;function g(h){var i;return e[h]=!0,m.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Nb(a,b){var c,d,e=m.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&m.extend(!0,a,c),a}function Ob(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Pb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}m.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:zb,type:"GET",isLocal:Db.test(yb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Jb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":m.parseJSON,"text xml":m.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Nb(Nb(a,m.ajaxSettings),b):Nb(m.ajaxSettings,a)},ajaxPrefilter:Lb(Hb),ajaxTransport:Lb(Ib),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=m.ajaxSetup({},b),l=k.context||k,n=k.context&&(l.nodeType||l.jquery)?m(l):m.event,o=m.Deferred(),p=m.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Cb.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||zb)+"").replace(Ab,"").replace(Fb,yb[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=m.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(c=Gb.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===yb[1]&&c[2]===yb[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(yb[3]||("http:"===yb[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=m.param(k.data,k.traditional)),Mb(Hb,k,b,v),2===t)return v;h=m.event&&k.global,h&&0===m.active++&&m.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Eb.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(wb.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Bb.test(e)?e.replace(Bb,"$1_="+vb++):e+(wb.test(e)?"&":"?")+"_="+vb++)),k.ifModified&&(m.lastModified[e]&&v.setRequestHeader("If-Modified-Since",m.lastModified[e]),m.etag[e]&&v.setRequestHeader("If-None-Match",m.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Jb+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Mb(Ib,k,b,v)){v.readyState=1,h&&n.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Ob(k,v,c)),u=Pb(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(m.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(m.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&n.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(n.trigger("ajaxComplete",[v,k]),--m.active||m.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return m.get(a,b,c,"json")},getScript:function(a,b){return m.get(a,void 0,b,"script")}}),m.each(["get","post"],function(a,b){m[b]=function(a,c,d,e){return m.isFunction(c)&&(e=e||d,d=c,c=void 0),m.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),m._evalUrl=function(a){return m.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},m.fn.extend({wrapAll:function(a){if(m.isFunction(a))return this.each(function(b){m(this).wrapAll(a.call(this,b))});if(this[0]){var b=m(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(m.isFunction(a)?function(b){m(this).wrapInner(a.call(this,b))}:function(){var b=m(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=m.isFunction(a);return this.each(function(c){m(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){m.nodeName(this,"body")||m(this).replaceWith(this.childNodes)}).end()}}),m.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!k.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||m.css(a,"display"))},m.expr.filters.visible=function(a){return!m.expr.filters.hidden(a)};var Qb=/%20/g,Rb=/\[\]$/,Sb=/\r?\n/g,Tb=/^(?:submit|button|image|reset|file)$/i,Ub=/^(?:input|select|textarea|keygen)/i;function Vb(a,b,c,d){var e;if(m.isArray(b))m.each(b,function(b,e){c||Rb.test(a)?d(a,e):Vb(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==m.type(b))d(a,b);else for(e in b)Vb(a+"["+e+"]",b[e],c,d)}m.param=function(a,b){var c,d=[],e=function(a,b){b=m.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=m.ajaxSettings&&m.ajaxSettings.traditional),m.isArray(a)||a.jquery&&!m.isPlainObject(a))m.each(a,function(){e(this.name,this.value)});else for(c in a)Vb(c,a[c],b,e);return d.join("&").replace(Qb,"+")},m.fn.extend({serialize:function(){return m.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=m.prop(this,"elements");return a?m.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!m(this).is(":disabled")&&Ub.test(this.nodeName)&&!Tb.test(a)&&(this.checked||!W.test(a))}).map(function(a,b){var c=m(this).val();return null==c?null:m.isArray(c)?m.map(c,function(a){return{name:b.name,value:a.replace(Sb,"\r\n")}}):{name:b.name,value:c.replace(Sb,"\r\n")}}).get()}}),m.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&Zb()||$b()}:Zb;var Wb=0,Xb={},Yb=m.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Xb)Xb[a](void 0,!0)}),k.cors=!!Yb&&"withCredentials"in Yb,Yb=k.ajax=!!Yb,Yb&&m.ajaxTransport(function(a){if(!a.crossDomain||k.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Wb;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Xb[g],b=void 0,f.onreadystatechange=m.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Xb[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function Zb(){try{return new a.XMLHttpRequest}catch(b){}}function $b(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}m.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return m.globalEval(a),a}}}),m.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),m.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=y.head||m("head")[0]||y.documentElement;return{send:function(d,e){b=y.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var _b=[],ac=/(=)\?(?=&|$)|\?\?/;m.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=_b.pop()||m.expando+"_"+vb++;return this[a]=!0,a}}),m.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(ac.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&ac.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=m.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(ac,"$1"+e):b.jsonp!==!1&&(b.url+=(wb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||m.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,_b.push(e)),g&&m.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),m.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||y;var d=u.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=m.buildFragment([a],b,e),e&&e.length&&m(e).remove(),m.merge([],d.childNodes))};var bc=m.fn.load;m.fn.load=function(a,b,c){if("string"!=typeof a&&bc)return bc.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=m.trim(a.slice(h,a.length)),a=a.slice(0,h)),m.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&m.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?m("<div>").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cc=a.document.documentElement;function dc(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cc;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cc})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=La(k.pixelPosition,function(a,c){return c?(c=Ja(a,b),Ha.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ec=a.jQuery,fc=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fc),b&&a.jQuery===m&&(a.jQuery=ec),m},typeof b===K&&(a.jQuery=a.$=m),m});
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/nv.d3.min.js b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/nv.d3.min.js
new file mode 100644
index 00000000..61d35d34
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/nv.d3.min.js
@@ -0,0 +1,8 @@
+/* nvd3 version 1.8.1 (https://github.com/novus/nvd3) 2015-06-17 */
+!function(){var a={};a.dev=!1,a.tooltip=a.tooltip||{},a.utils=a.utils||{},a.models=a.models||{},a.charts={},a.logs={},a.dom={},a.dispatch=d3.dispatch("render_start","render_end"),Function.prototype.bind||(Function.prototype.bind=function(a){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var b=Array.prototype.slice.call(arguments,1),c=this,d=function(){},e=function(){return c.apply(this instanceof d&&a?this:a,b.concat(Array.prototype.slice.call(arguments)))};return d.prototype=this.prototype,e.prototype=new d,e}),a.dev&&(a.dispatch.on("render_start",function(){a.logs.startTime=+new Date}),a.dispatch.on("render_end",function(){a.logs.endTime=+new Date,a.logs.totalTime=a.logs.endTime-a.logs.startTime,a.log("total",a.logs.totalTime)})),a.log=function(){if(a.dev&&window.console&&console.log&&console.log.apply)console.log.apply(console,arguments);else if(a.dev&&window.console&&"function"==typeof console.log&&Function.prototype.bind){var b=Function.prototype.bind.call(console.log,console);b.apply(console,arguments)}return arguments[arguments.length-1]},a.deprecated=function(a,b){console&&console.warn&&console.warn("nvd3 warning: `"+a+"` has been deprecated. ",b||"")},a.render=function(b){b=b||1,a.render.active=!0,a.dispatch.render_start();var c=function(){for(var d,e,f=0;b>f&&(e=a.render.queue[f]);f++)d=e.generate(),typeof e.callback==typeof Function&&e.callback(d);a.render.queue.splice(0,f),a.render.queue.length?setTimeout(c):(a.dispatch.render_end(),a.render.active=!1)};setTimeout(c)},a.render.active=!1,a.render.queue=[],a.addGraph=function(b){typeof arguments[0]==typeof Function&&(b={generate:arguments[0],callback:arguments[1]}),a.render.queue.push(b),a.render.active||a.render()},"undefined"!=typeof module&&"undefined"!=typeof exports&&(module.exports=a),"undefined"!=typeof window&&(window.nv=a),a.dom.write=function(a){return void 0!==window.fastdom?fastdom.write(a):a()},a.dom.read=function(a){return void 0!==window.fastdom?fastdom.read(a):a()},a.interactiveGuideline=function(){"use strict";function b(l){l.each(function(l){function m(){var a=d3.mouse(this),d=a[0],e=a[1],i=!0,j=!1;if(k&&(d=d3.event.offsetX,e=d3.event.offsetY,"svg"!==d3.event.target.tagName&&(i=!1),d3.event.target.className.baseVal.match("nv-legend")&&(j=!0)),i&&(d-=f.left,e-=f.top),0>d||0>e||d>o||e>p||d3.event.relatedTarget&&void 0===d3.event.relatedTarget.ownerSVGElement||j){if(k&&d3.event.relatedTarget&&void 0===d3.event.relatedTarget.ownerSVGElement&&(void 0===d3.event.relatedTarget.className||d3.event.relatedTarget.className.match(c.nvPointerEventsClass)))return;return h.elementMouseout({mouseX:d,mouseY:e}),b.renderGuideLine(null),void c.hidden(!0)}c.hidden(!1);var l=g.invert(d);h.elementMousemove({mouseX:d,mouseY:e,pointXValue:l}),"dblclick"===d3.event.type&&h.elementDblclick({mouseX:d,mouseY:e,pointXValue:l}),"click"===d3.event.type&&h.elementClick({mouseX:d,mouseY:e,pointXValue:l})}var n=d3.select(this),o=d||960,p=e||400,q=n.selectAll("g.nv-wrap.nv-interactiveLineLayer").data([l]),r=q.enter().append("g").attr("class"," nv-wrap nv-interactiveLineLayer");r.append("g").attr("class","nv-interactiveGuideLine"),j&&(j.on("touchmove",m).on("mousemove",m,!0).on("mouseout",m,!0).on("dblclick",m).on("click",m),b.guideLine=null,b.renderGuideLine=function(c){i&&(b.guideLine&&b.guideLine.attr("x1")===c||a.dom.write(function(){var b=q.select(".nv-interactiveGuideLine").selectAll("line").data(null!=c?[a.utils.NaNtoZero(c)]:[],String);b.enter().append("line").attr("class","nv-guideline").attr("x1",function(a){return a}).attr("x2",function(a){return a}).attr("y1",p).attr("y2",0),b.exit().remove()}))})})}var c=a.models.tooltip();c.duration(0).hideDelay(0)._isInteractiveLayer(!0).hidden(!1);var d=null,e=null,f={left:0,top:0},g=d3.scale.linear(),h=d3.dispatch("elementMousemove","elementMouseout","elementClick","elementDblclick"),i=!0,j=null,k="ActiveXObject"in window;return b.dispatch=h,b.tooltip=c,b.margin=function(a){return arguments.length?(f.top="undefined"!=typeof a.top?a.top:f.top,f.left="undefined"!=typeof a.left?a.left:f.left,b):f},b.width=function(a){return arguments.length?(d=a,b):d},b.height=function(a){return arguments.length?(e=a,b):e},b.xScale=function(a){return arguments.length?(g=a,b):g},b.showGuideLine=function(a){return arguments.length?(i=a,b):i},b.svgContainer=function(a){return arguments.length?(j=a,b):j},b},a.interactiveBisect=function(a,b,c){"use strict";if(!(a instanceof Array))return null;var d;d="function"!=typeof c?function(a){return a.x}:c;var e=function(a,b){return d(a)-b},f=d3.bisector(e).left,g=d3.max([0,f(a,b)-1]),h=d(a[g]);if("undefined"==typeof h&&(h=g),h===b)return g;var i=d3.min([g+1,a.length-1]),j=d(a[i]);return"undefined"==typeof j&&(j=i),Math.abs(j-b)>=Math.abs(h-b)?g:i},a.nearestValueIndex=function(a,b,c){"use strict";var d=1/0,e=null;return a.forEach(function(a,f){var g=Math.abs(b-a);null!=a&&d>=g&&c>g&&(d=g,e=f)}),e},function(){"use strict";a.models.tooltip=function(){function b(){if(k){var a=d3.select(k);"svg"!==a.node().tagName&&(a=a.select("svg"));var b=a.node()?a.attr("viewBox"):null;if(b){b=b.split(" ");var c=parseInt(a.style("width"),10)/b[2];p.left=p.left*c,p.top=p.top*c}}}function c(){if(!n){var a;a=k?k:document.body,n=d3.select(a).append("div").attr("class","nvtooltip "+(j?j:"xy-tooltip")).attr("id",v),n.style("top",0).style("left",0),n.style("opacity",0),n.selectAll("div, table, td, tr").classed(w,!0),n.classed(w,!0),o=n.node()}}function d(){if(r&&B(e)){b();var f=p.left,g=null!==i?i:p.top;return a.dom.write(function(){c();var b=A(e);b&&(o.innerHTML=b),k&&u?a.dom.read(function(){var a=k.getElementsByTagName("svg")[0],b={left:0,top:0};if(a){var c=a.getBoundingClientRect(),d=k.getBoundingClientRect(),e=c.top;if(0>e){var i=k.getBoundingClientRect();e=Math.abs(e)>i.height?0:e}b.top=Math.abs(e-d.top),b.left=Math.abs(c.left-d.left)}f+=k.offsetLeft+b.left-2*k.scrollLeft,g+=k.offsetTop+b.top-2*k.scrollTop,h&&h>0&&(g=Math.floor(g/h)*h),C([f,g])}):C([f,g])}),d}}var e=null,f="w",g=25,h=0,i=null,j=null,k=null,l=!0,m=400,n=null,o=null,p={left:null,top:null},q={left:0,top:0},r=!0,s=100,t=!0,u=!1,v="nvtooltip-"+Math.floor(1e5*Math.random()),w="nv-pointer-events-none",x=function(a){return a},y=function(a){return a},z=function(a){return a},A=function(a){if(null===a)return"";var b=d3.select(document.createElement("table"));if(t){var c=b.selectAll("thead").data([a]).enter().append("thead");c.append("tr").append("td").attr("colspan",3).append("strong").classed("x-value",!0).html(y(a.value))}var d=b.selectAll("tbody").data([a]).enter().append("tbody"),e=d.selectAll("tr").data(function(a){return a.series}).enter().append("tr").classed("highlight",function(a){return a.highlight});e.append("td").classed("legend-color-guide",!0).append("div").style("background-color",function(a){return a.color}),e.append("td").classed("key",!0).html(function(a,b){return z(a.key,b)}),e.append("td").classed("value",!0).html(function(a,b){return x(a.value,b)}),e.selectAll("td").each(function(a){if(a.highlight){var b=d3.scale.linear().domain([0,1]).range(["#fff",a.color]),c=.6;d3.select(this).style("border-bottom-color",b(c)).style("border-top-color",b(c))}});var f=b.node().outerHTML;return void 0!==a.footer&&(f+="<div class='footer'>"+a.footer+"</div>"),f},B=function(a){if(a&&a.series){if(a.series instanceof Array)return!!a.series.length;if(a.series instanceof Object)return a.series=[a.series],!0}return!1},C=function(b){o&&a.dom.read(function(){var c,d,e=parseInt(o.offsetHeight,10),h=parseInt(o.offsetWidth,10),i=a.utils.windowSize().width,j=a.utils.windowSize().height,k=window.pageYOffset,p=window.pageXOffset;j=window.innerWidth>=document.body.scrollWidth?j:j-16,i=window.innerHeight>=document.body.scrollHeight?i:i-16;var r,t,u=function(a){var b=d;do isNaN(a.offsetTop)||(b+=a.offsetTop),a=a.offsetParent;while(a);return b},v=function(a){var b=c;do isNaN(a.offsetLeft)||(b+=a.offsetLeft),a=a.offsetParent;while(a);return b};switch(f){case"e":c=b[0]-h-g,d=b[1]-e/2,r=v(o),t=u(o),p>r&&(c=b[0]+g>p?b[0]+g:p-r+c),k>t&&(d=k-t+d),t+e>k+j&&(d=k+j-t+d-e);break;case"w":c=b[0]+g,d=b[1]-e/2,r=v(o),t=u(o),r+h>i&&(c=b[0]-h-g),k>t&&(d=k+5),t+e>k+j&&(d=k+j-t+d-e);break;case"n":c=b[0]-h/2-5,d=b[1]+g,r=v(o),t=u(o),p>r&&(c=p+5),r+h>i&&(c=c-h/2+5),t+e>k+j&&(d=k+j-t+d-e);break;case"s":c=b[0]-h/2,d=b[1]-e-g,r=v(o),t=u(o),p>r&&(c=p+5),r+h>i&&(c=c-h/2+5),k>t&&(d=k);break;case"none":c=b[0],d=b[1]-g,r=v(o),t=u(o)}c-=q.left,d-=q.top;var w=o.getBoundingClientRect(),k=window.pageYOffset||document.documentElement.scrollTop,p=window.pageXOffset||document.documentElement.scrollLeft,x="translate("+(w.left+p)+"px, "+(w.top+k)+"px)",y="translate("+c+"px, "+d+"px)",z=d3.interpolateString(x,y),A=n.style("opacity")<.1;l?n.transition().delay(m).duration(0).style("opacity",0):n.interrupt().transition().duration(A?0:s).styleTween("transform",function(){return z},"important").style("-webkit-transform",y).style("opacity",1)})};return d.nvPointerEventsClass=w,d.options=a.utils.optionsFunc.bind(d),d._options=Object.create({},{duration:{get:function(){return s},set:function(a){s=a}},gravity:{get:function(){return f},set:function(a){f=a}},distance:{get:function(){return g},set:function(a){g=a}},snapDistance:{get:function(){return h},set:function(a){h=a}},classes:{get:function(){return j},set:function(a){j=a}},chartContainer:{get:function(){return k},set:function(a){k=a}},fixedTop:{get:function(){return i},set:function(a){i=a}},enabled:{get:function(){return r},set:function(a){r=a}},hideDelay:{get:function(){return m},set:function(a){m=a}},contentGenerator:{get:function(){return A},set:function(a){A=a}},valueFormatter:{get:function(){return x},set:function(a){x=a}},headerFormatter:{get:function(){return y},set:function(a){y=a}},keyFormatter:{get:function(){return z},set:function(a){z=a}},headerEnabled:{get:function(){return t},set:function(a){t=a}},_isInteractiveLayer:{get:function(){return u},set:function(a){u=!!a}},position:{get:function(){return p},set:function(a){p.left=void 0!==a.left?a.left:p.left,p.top=void 0!==a.top?a.top:p.top}},offset:{get:function(){return q},set:function(a){q.left=void 0!==a.left?a.left:q.left,q.top=void 0!==a.top?a.top:q.top}},hidden:{get:function(){return l},set:function(a){l!=a&&(l=!!a,d())}},data:{get:function(){return e},set:function(a){a.point&&(a.value=a.point.x,a.series=a.series||{},a.series.value=a.point.y,a.series.color=a.point.color||a.series.color),e=a}},tooltipElem:{get:function(){return o},set:function(){}},id:{get:function(){return v},set:function(){}}}),a.utils.initOptions(d),d}}(),a.utils.windowSize=function(){var a={width:640,height:480};return window.innerWidth&&window.innerHeight?(a.width=window.innerWidth,a.height=window.innerHeight,a):"CSS1Compat"==document.compatMode&&document.documentElement&&document.documentElement.offsetWidth?(a.width=document.documentElement.offsetWidth,a.height=document.documentElement.offsetHeight,a):document.body&&document.body.offsetWidth?(a.width=document.body.offsetWidth,a.height=document.body.offsetHeight,a):a},a.utils.windowResize=function(b){return window.addEventListener?window.addEventListener("resize",b):a.log("ERROR: Failed to bind to window.resize with: ",b),{callback:b,clear:function(){window.removeEventListener("resize",b)}}},a.utils.getColor=function(b){if(void 0===b)return a.utils.defaultColor();if(Array.isArray(b)){var c=d3.scale.ordinal().range(b);return function(a,b){var d=void 0===b?a:b;return a.color||c(d)}}return b},a.utils.defaultColor=function(){return a.utils.getColor(d3.scale.category20().range())},a.utils.customTheme=function(a,b,c){b=b||function(a){return a.key},c=c||d3.scale.category20().range();var d=c.length;return function(e){var f=b(e);return"function"==typeof a[f]?a[f]():void 0!==a[f]?a[f]:(d||(d=c.length),d-=1,c[d])}},a.utils.pjax=function(b,c){var d=function(d){d3.html(d,function(d){var e=d3.select(c).node();e.parentNode.replaceChild(d3.select(d).select(c).node(),e),a.utils.pjax(b,c)})};d3.selectAll(b).on("click",function(){history.pushState(this.href,this.textContent,this.href),d(this.href),d3.event.preventDefault()}),d3.select(window).on("popstate",function(){d3.event.state&&d(d3.event.state)})},a.utils.calcApproxTextWidth=function(a){if("function"==typeof a.style&&"function"==typeof a.text){var b=parseInt(a.style("font-size").replace("px",""),10),c=a.text().length;return c*b*.5}return 0},a.utils.NaNtoZero=function(a){return"number"!=typeof a||isNaN(a)||null===a||1/0===a||a===-1/0?0:a},d3.selection.prototype.watchTransition=function(a){var b=[this].concat([].slice.call(arguments,1));return a.transition.apply(a,b)},a.utils.renderWatch=function(b,c){if(!(this instanceof a.utils.renderWatch))return new a.utils.renderWatch(b,c);var d=void 0!==c?c:250,e=[],f=this;this.models=function(a){return a=[].slice.call(arguments,0),a.forEach(function(a){a.__rendered=!1,function(a){a.dispatch.on("renderEnd",function(){a.__rendered=!0,f.renderEnd("model")})}(a),e.indexOf(a)<0&&e.push(a)}),this},this.reset=function(a){void 0!==a&&(d=a),e=[]},this.transition=function(a,b,c){if(b=arguments.length>1?[].slice.call(arguments,1):[],c=b.length>1?b.pop():void 0!==d?d:250,a.__rendered=!1,e.indexOf(a)<0&&e.push(a),0===c)return a.__rendered=!0,a.delay=function(){return this},a.duration=function(){return this},a;a.__rendered=0===a.length?!0:a.every(function(a){return!a.length})?!0:!1;var g=0;return a.transition().duration(c).each(function(){++g}).each("end",function(){0===--g&&(a.__rendered=!0,f.renderEnd.apply(this,b))})},this.renderEnd=function(){e.every(function(a){return a.__rendered})&&(e.forEach(function(a){a.__rendered=!1}),b.renderEnd.apply(this,arguments))}},a.utils.deepExtend=function(b){var c=arguments.length>1?[].slice.call(arguments,1):[];c.forEach(function(c){for(var d in c){var e=b[d]instanceof Array,f="object"==typeof b[d],g="object"==typeof c[d];f&&!e&&g?a.utils.deepExtend(b[d],c[d]):b[d]=c[d]}})},a.utils.state=function(){if(!(this instanceof a.utils.state))return new a.utils.state;var b={},c=function(){},d=function(){return{}},e=null,f=null;this.dispatch=d3.dispatch("change","set"),this.dispatch.on("set",function(a){c(a,!0)}),this.getter=function(a){return d=a,this},this.setter=function(a,b){return b||(b=function(){}),c=function(c,d){a(c),d&&b()},this},this.init=function(b){e=e||{},a.utils.deepExtend(e,b)};var g=function(){var a=d();if(JSON.stringify(a)===JSON.stringify(b))return!1;for(var c in a)void 0===b[c]&&(b[c]={}),b[c]=a[c],f=!0;return!0};this.update=function(){e&&(c(e,!1),e=null),g.call(this)&&this.dispatch.change(b)}},a.utils.optionsFunc=function(a){return a&&d3.map(a).forEach(function(a,b){"function"==typeof this[a]&&this[a](b)}.bind(this)),this},a.utils.calcTicksX=function(b,c){var d=1,e=0;for(e;e<c.length;e+=1){var f=c[e]&&c[e].values?c[e].values.length:0;d=f>d?f:d}return a.log("Requested number of ticks: ",b),a.log("Calculated max values to be: ",d),b=b>d?b=d-1:b,b=1>b?1:b,b=Math.floor(b),a.log("Calculating tick count as: ",b),b},a.utils.calcTicksY=function(b,c){return a.utils.calcTicksX(b,c)},a.utils.initOption=function(a,b){a._calls&&a._calls[b]?a[b]=a._calls[b]:(a[b]=function(c){return arguments.length?(a._overrides[b]=!0,a._options[b]=c,a):a._options[b]},a["_"+b]=function(c){return arguments.length?(a._overrides[b]||(a._options[b]=c),a):a._options[b]})},a.utils.initOptions=function(b){b._overrides=b._overrides||{};var c=Object.getOwnPropertyNames(b._options||{}),d=Object.getOwnPropertyNames(b._calls||{});c=c.concat(d);for(var e in c)a.utils.initOption(b,c[e])},a.utils.inheritOptionsD3=function(a,b,c){a._d3options=c.concat(a._d3options||[]),c.unshift(b),c.unshift(a),d3.rebind.apply(this,c)},a.utils.arrayUnique=function(a){return a.sort().filter(function(b,c){return!c||b!=a[c-1]})},a.utils.symbolMap=d3.map(),a.utils.symbol=function(){function b(b,e){var f=c.call(this,b,e),g=d.call(this,b,e);return-1!==d3.svg.symbolTypes.indexOf(f)?d3.svg.symbol().type(f).size(g)():a.utils.symbolMap.get(f)(g)}var c,d=64;return b.type=function(a){return arguments.length?(c=d3.functor(a),b):c},b.size=function(a){return arguments.length?(d=d3.functor(a),b):d},b},a.utils.inheritOptions=function(b,c){var d=Object.getOwnPropertyNames(c._options||{}),e=Object.getOwnPropertyNames(c._calls||{}),f=c._inherited||[],g=c._d3options||[],h=d.concat(e).concat(f).concat(g);h.unshift(c),h.unshift(b),d3.rebind.apply(this,h),b._inherited=a.utils.arrayUnique(d.concat(e).concat(f).concat(d).concat(b._inherited||[])),b._d3options=a.utils.arrayUnique(g.concat(b._d3options||[]))},a.utils.initSVG=function(a){a.classed({"nvd3-svg":!0})},a.utils.sanitizeHeight=function(a,b){return a||parseInt(b.style("height"),10)||400},a.utils.sanitizeWidth=function(a,b){return a||parseInt(b.style("width"),10)||960},a.utils.availableHeight=function(b,c,d){return a.utils.sanitizeHeight(b,c)-d.top-d.bottom},a.utils.availableWidth=function(b,c,d){return a.utils.sanitizeWidth(b,c)-d.left-d.right},a.utils.noData=function(b,c){var d=b.options(),e=d.margin(),f=d.noData(),g=null==f?["No Data Available."]:[f],h=a.utils.availableHeight(d.height(),c,e),i=a.utils.availableWidth(d.width(),c,e),j=e.left+i/2,k=e.top+h/2;c.selectAll("g").remove();var l=c.selectAll(".nv-noData").data(g);l.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),l.attr("x",j).attr("y",k).text(function(a){return a})},a.models.axis=function(){"use strict";function b(g){return s.reset(),g.each(function(b){var g=d3.select(this);a.utils.initSVG(g);var p=g.selectAll("g.nv-wrap.nv-axis").data([b]),q=p.enter().append("g").attr("class","nvd3 nv-wrap nv-axis"),t=(q.append("g"),p.select("g"));null!==n?c.ticks(n):("top"==c.orient()||"bottom"==c.orient())&&c.ticks(Math.abs(d.range()[1]-d.range()[0])/100),t.watchTransition(s,"axis").call(c),r=r||c.scale();var u=c.tickFormat();null==u&&(u=r.tickFormat());var v=t.selectAll("text.nv-axislabel").data([h||null]);v.exit().remove();var w,x,y;switch(c.orient()){case"top":v.enter().append("text").attr("class","nv-axislabel"),y=d.range().length<2?0:2===d.range().length?d.range()[1]:d.range()[d.range().length-1]+(d.range()[1]-d.range()[0]),v.attr("text-anchor","middle").attr("y",0).attr("x",y/2),i&&(x=p.selectAll("g.nv-axisMaxMin").data(d.domain()),x.enter().append("g").attr("class",function(a,b){return["nv-axisMaxMin","nv-axisMaxMin-x",0==b?"nv-axisMin-x":"nv-axisMax-x"].join(" ")}).append("text"),x.exit().remove(),x.attr("transform",function(b){return"translate("+a.utils.NaNtoZero(d(b))+",0)"}).select("text").attr("dy","-0.5em").attr("y",-c.tickPadding()).attr("text-anchor","middle").text(function(a){var b=u(a);return(""+b).match("NaN")?"":b}),x.watchTransition(s,"min-max top").attr("transform",function(b,c){return"translate("+a.utils.NaNtoZero(d.range()[c])+",0)"}));break;case"bottom":w=o+36;var z=30,A=0,B=t.selectAll("g").select("text"),C="";if(j%360){B.each(function(){var a=this.getBoundingClientRect(),b=a.width;A=a.height,b>z&&(z=b)}),C="rotate("+j+" 0,"+(A/2+c.tickPadding())+")";var D=Math.abs(Math.sin(j*Math.PI/180));w=(D?D*z:z)+30,B.attr("transform",C).style("text-anchor",j%360>0?"start":"end")}v.enter().append("text").attr("class","nv-axislabel"),y=d.range().length<2?0:2===d.range().length?d.range()[1]:d.range()[d.range().length-1]+(d.range()[1]-d.range()[0]),v.attr("text-anchor","middle").attr("y",w).attr("x",y/2),i&&(x=p.selectAll("g.nv-axisMaxMin").data([d.domain()[0],d.domain()[d.domain().length-1]]),x.enter().append("g").attr("class",function(a,b){return["nv-axisMaxMin","nv-axisMaxMin-x",0==b?"nv-axisMin-x":"nv-axisMax-x"].join(" ")}).append("text"),x.exit().remove(),x.attr("transform",function(b){return"translate("+a.utils.NaNtoZero(d(b)+(m?d.rangeBand()/2:0))+",0)"}).select("text").attr("dy",".71em").attr("y",c.tickPadding()).attr("transform",C).style("text-anchor",j?j%360>0?"start":"end":"middle").text(function(a){var b=u(a);return(""+b).match("NaN")?"":b}),x.watchTransition(s,"min-max bottom").attr("transform",function(b){return"translate("+a.utils.NaNtoZero(d(b)+(m?d.rangeBand()/2:0))+",0)"})),l&&B.attr("transform",function(a,b){return"translate(0,"+(b%2==0?"0":"12")+")"});break;case"right":v.enter().append("text").attr("class","nv-axislabel"),v.style("text-anchor",k?"middle":"begin").attr("transform",k?"rotate(90)":"").attr("y",k?-Math.max(e.right,f)+12:-10).attr("x",k?d3.max(d.range())/2:c.tickPadding()),i&&(x=p.selectAll("g.nv-axisMaxMin").data(d.domain()),x.enter().append("g").attr("class",function(a,b){return["nv-axisMaxMin","nv-axisMaxMin-y",0==b?"nv-axisMin-y":"nv-axisMax-y"].join(" ")}).append("text").style("opacity",0),x.exit().remove(),x.attr("transform",function(b){return"translate(0,"+a.utils.NaNtoZero(d(b))+")"}).select("text").attr("dy",".32em").attr("y",0).attr("x",c.tickPadding()).style("text-anchor","start").text(function(a){var b=u(a);return(""+b).match("NaN")?"":b}),x.watchTransition(s,"min-max right").attr("transform",function(b,c){return"translate(0,"+a.utils.NaNtoZero(d.range()[c])+")"}).select("text").style("opacity",1));break;case"left":v.enter().append("text").attr("class","nv-axislabel"),v.style("text-anchor",k?"middle":"end").attr("transform",k?"rotate(-90)":"").attr("y",k?-Math.max(e.left,f)+25-(o||0):-10).attr("x",k?-d3.max(d.range())/2:-c.tickPadding()),i&&(x=p.selectAll("g.nv-axisMaxMin").data(d.domain()),x.enter().append("g").attr("class",function(a,b){return["nv-axisMaxMin","nv-axisMaxMin-y",0==b?"nv-axisMin-y":"nv-axisMax-y"].join(" ")}).append("text").style("opacity",0),x.exit().remove(),x.attr("transform",function(b){return"translate(0,"+a.utils.NaNtoZero(r(b))+")"}).select("text").attr("dy",".32em").attr("y",0).attr("x",-c.tickPadding()).attr("text-anchor","end").text(function(a){var b=u(a);return(""+b).match("NaN")?"":b}),x.watchTransition(s,"min-max right").attr("transform",function(b,c){return"translate(0,"+a.utils.NaNtoZero(d.range()[c])+")"}).select("text").style("opacity",1))}if(v.text(function(a){return a}),!i||"left"!==c.orient()&&"right"!==c.orient()||(t.selectAll("g").each(function(a){d3.select(this).select("text").attr("opacity",1),(d(a)<d.range()[1]+10||d(a)>d.range()[0]-10)&&((a>1e-10||-1e-10>a)&&d3.select(this).attr("opacity",0),d3.select(this).select("text").attr("opacity",0))}),d.domain()[0]==d.domain()[1]&&0==d.domain()[0]&&p.selectAll("g.nv-axisMaxMin").style("opacity",function(a,b){return b?0:1})),i&&("top"===c.orient()||"bottom"===c.orient())){var E=[];p.selectAll("g.nv-axisMaxMin").each(function(a,b){try{E.push(b?d(a)-this.getBoundingClientRect().width-4:d(a)+this.getBoundingClientRect().width+4)}catch(c){E.push(b?d(a)-4:d(a)+4)}}),t.selectAll("g").each(function(a){(d(a)<E[0]||d(a)>E[1])&&(a>1e-10||-1e-10>a?d3.select(this).remove():d3.select(this).select("text").remove())})}t.selectAll(".tick").filter(function(a){return!parseFloat(Math.round(1e5*a)/1e6)&&void 0!==a}).classed("zero",!0),r=d.copy()}),s.renderEnd("axis immediate"),b}var c=d3.svg.axis(),d=d3.scale.linear(),e={top:0,right:0,bottom:0,left:0},f=75,g=60,h=null,i=!0,j=0,k=!0,l=!1,m=!1,n=null,o=0,p=250,q=d3.dispatch("renderEnd");c.scale(d).orient("bottom").tickFormat(function(a){return a});var r,s=a.utils.renderWatch(q,p);return b.axis=c,b.dispatch=q,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{axisLabelDistance:{get:function(){return o},set:function(a){o=a}},staggerLabels:{get:function(){return l},set:function(a){l=a}},rotateLabels:{get:function(){return j},set:function(a){j=a}},rotateYLabel:{get:function(){return k},set:function(a){k=a}},showMaxMin:{get:function(){return i},set:function(a){i=a}},axisLabel:{get:function(){return h},set:function(a){h=a}},height:{get:function(){return g},set:function(a){g=a}},ticks:{get:function(){return n},set:function(a){n=a}},width:{get:function(){return f},set:function(a){f=a}},margin:{get:function(){return e},set:function(a){e.top=void 0!==a.top?a.top:e.top,e.right=void 0!==a.right?a.right:e.right,e.bottom=void 0!==a.bottom?a.bottom:e.bottom,e.left=void 0!==a.left?a.left:e.left}},duration:{get:function(){return p},set:function(a){p=a,s.reset(p)}},scale:{get:function(){return d},set:function(e){d=e,c.scale(d),m="function"==typeof d.rangeBands,a.utils.inheritOptionsD3(b,d,["domain","range","rangeBand","rangeBands"])}}}),a.utils.initOptions(b),a.utils.inheritOptionsD3(b,c,["orient","tickValues","tickSubdivide","tickSize","tickPadding","tickFormat"]),a.utils.inheritOptionsD3(b,d,["domain","range","rangeBand","rangeBands"]),b},a.models.boxPlot=function(){"use strict";function b(l){return v.reset(),l.each(function(b){var l=j-i.left-i.right,p=k-i.top-i.bottom;r=d3.select(this),a.utils.initSVG(r),m.domain(c||b.map(function(a,b){return o(a,b)})).rangeBands(e||[0,l],.1);var w=[];if(!d){var x=d3.min(b.map(function(a){var b=[];return b.push(a.values.Q1),a.values.hasOwnProperty("whisker_low")&&null!==a.values.whisker_low&&b.push(a.values.whisker_low),a.values.hasOwnProperty("outliers")&&null!==a.values.outliers&&(b=b.concat(a.values.outliers)),d3.min(b)})),y=d3.max(b.map(function(a){var b=[];return b.push(a.values.Q3),a.values.hasOwnProperty("whisker_high")&&null!==a.values.whisker_high&&b.push(a.values.whisker_high),a.values.hasOwnProperty("outliers")&&null!==a.values.outliers&&(b=b.concat(a.values.outliers)),d3.max(b)}));w=[x,y]}n.domain(d||w),n.range(f||[p,0]),g=g||m,h=h||n.copy().range([n(0),n(0)]);{var z=r.selectAll("g.nv-wrap").data([b]);z.enter().append("g").attr("class","nvd3 nv-wrap")}z.attr("transform","translate("+i.left+","+i.top+")");var A=z.selectAll(".nv-boxplot").data(function(a){return a}),B=A.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6);A.attr("class","nv-boxplot").attr("transform",function(a,b){return"translate("+(m(o(a,b))+.05*m.rangeBand())+", 0)"}).classed("hover",function(a){return a.hover}),A.watchTransition(v,"nv-boxplot: boxplots").style("stroke-opacity",1).style("fill-opacity",.75).delay(function(a,c){return c*t/b.length}).attr("transform",function(a,b){return"translate("+(m(o(a,b))+.05*m.rangeBand())+", 0)"}),A.exit().remove(),B.each(function(a,b){var c=d3.select(this);["low","high"].forEach(function(d){a.values.hasOwnProperty("whisker_"+d)&&null!==a.values["whisker_"+d]&&(c.append("line").style("stroke",a.color?a.color:q(a,b)).attr("class","nv-boxplot-whisker nv-boxplot-"+d),c.append("line").style("stroke",a.color?a.color:q(a,b)).attr("class","nv-boxplot-tick nv-boxplot-"+d))})});var C=A.selectAll(".nv-boxplot-outlier").data(function(a){return a.values.hasOwnProperty("outliers")&&null!==a.values.outliers?a.values.outliers:[]});C.enter().append("circle").style("fill",function(a,b,c){return q(a,c)}).style("stroke",function(a,b,c){return q(a,c)}).on("mouseover",function(a,b,c){d3.select(this).classed("hover",!0),s.elementMouseover({series:{key:a,color:q(a,c)},e:d3.event})}).on("mouseout",function(a,b,c){d3.select(this).classed("hover",!1),s.elementMouseout({series:{key:a,color:q(a,c)},e:d3.event})}).on("mousemove",function(){s.elementMousemove({e:d3.event})}),C.attr("class","nv-boxplot-outlier"),C.watchTransition(v,"nv-boxplot: nv-boxplot-outlier").attr("cx",.45*m.rangeBand()).attr("cy",function(a){return n(a)}).attr("r","3"),C.exit().remove();var D=function(){return null===u?.9*m.rangeBand():Math.min(75,.9*m.rangeBand())},E=function(){return.45*m.rangeBand()-D()/2},F=function(){return.45*m.rangeBand()+D()/2};["low","high"].forEach(function(a){var b="low"===a?"Q1":"Q3";A.select("line.nv-boxplot-whisker.nv-boxplot-"+a).watchTransition(v,"nv-boxplot: boxplots").attr("x1",.45*m.rangeBand()).attr("y1",function(b){return n(b.values["whisker_"+a])}).attr("x2",.45*m.rangeBand()).attr("y2",function(a){return n(a.values[b])}),A.select("line.nv-boxplot-tick.nv-boxplot-"+a).watchTransition(v,"nv-boxplot: boxplots").attr("x1",E).attr("y1",function(b){return n(b.values["whisker_"+a])}).attr("x2",F).attr("y2",function(b){return n(b.values["whisker_"+a])})}),["low","high"].forEach(function(a){B.selectAll(".nv-boxplot-"+a).on("mouseover",function(b,c,d){d3.select(this).classed("hover",!0),s.elementMouseover({series:{key:b.values["whisker_"+a],color:q(b,d)},e:d3.event})}).on("mouseout",function(b,c,d){d3.select(this).classed("hover",!1),s.elementMouseout({series:{key:b.values["whisker_"+a],color:q(b,d)},e:d3.event})}).on("mousemove",function(){s.elementMousemove({e:d3.event})})}),B.append("rect").attr("class","nv-boxplot-box").on("mouseover",function(a,b){d3.select(this).classed("hover",!0),s.elementMouseover({key:a.label,value:a.label,series:[{key:"Q3",value:a.values.Q3,color:a.color||q(a,b)},{key:"Q2",value:a.values.Q2,color:a.color||q(a,b)},{key:"Q1",value:a.values.Q1,color:a.color||q(a,b)}],data:a,index:b,e:d3.event})}).on("mouseout",function(a,b){d3.select(this).classed("hover",!1),s.elementMouseout({key:a.label,value:a.label,series:[{key:"Q3",value:a.values.Q3,color:a.color||q(a,b)},{key:"Q2",value:a.values.Q2,color:a.color||q(a,b)},{key:"Q1",value:a.values.Q1,color:a.color||q(a,b)}],data:a,index:b,e:d3.event})}).on("mousemove",function(){s.elementMousemove({e:d3.event})}),A.select("rect.nv-boxplot-box").watchTransition(v,"nv-boxplot: boxes").attr("y",function(a){return n(a.values.Q3)}).attr("width",D).attr("x",E).attr("height",function(a){return Math.abs(n(a.values.Q3)-n(a.values.Q1))||1}).style("fill",function(a,b){return a.color||q(a,b)}).style("stroke",function(a,b){return a.color||q(a,b)}),B.append("line").attr("class","nv-boxplot-median"),A.select("line.nv-boxplot-median").watchTransition(v,"nv-boxplot: boxplots line").attr("x1",E).attr("y1",function(a){return n(a.values.Q2)}).attr("x2",F).attr("y2",function(a){return n(a.values.Q2)}),g=m.copy(),h=n.copy()}),v.renderEnd("nv-boxplot immediate"),b}var c,d,e,f,g,h,i={top:0,right:0,bottom:0,left:0},j=960,k=500,l=Math.floor(1e4*Math.random()),m=d3.scale.ordinal(),n=d3.scale.linear(),o=function(a){return a.x},p=function(a){return a.y},q=a.utils.defaultColor(),r=null,s=d3.dispatch("elementMouseover","elementMouseout","elementMousemove","renderEnd"),t=250,u=null,v=a.utils.renderWatch(s,t);return b.dispatch=s,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return j},set:function(a){j=a}},height:{get:function(){return k},set:function(a){k=a}},maxBoxWidth:{get:function(){return u},set:function(a){u=a}},x:{get:function(){return o},set:function(a){o=a}},y:{get:function(){return p},set:function(a){p=a}},xScale:{get:function(){return m},set:function(a){m=a}},yScale:{get:function(){return n},set:function(a){n=a}},xDomain:{get:function(){return c},set:function(a){c=a}},yDomain:{get:function(){return d},set:function(a){d=a}},xRange:{get:function(){return e},set:function(a){e=a}},yRange:{get:function(){return f},set:function(a){f=a}},id:{get:function(){return l},set:function(a){l=a}},margin:{get:function(){return i},set:function(a){i.top=void 0!==a.top?a.top:i.top,i.right=void 0!==a.right?a.right:i.right,i.bottom=void 0!==a.bottom?a.bottom:i.bottom,i.left=void 0!==a.left?a.left:i.left}},color:{get:function(){return q},set:function(b){q=a.utils.getColor(b)}},duration:{get:function(){return t},set:function(a){t=a,v.reset(t)}}}),a.utils.initOptions(b),b},a.models.boxPlotChart=function(){"use strict";function b(k){return t.reset(),t.models(e),l&&t.models(f),m&&t.models(g),k.each(function(k){var p=d3.select(this);a.utils.initSVG(p);var t=(i||parseInt(p.style("width"))||960)-h.left-h.right,u=(j||parseInt(p.style("height"))||400)-h.top-h.bottom;if(b.update=function(){r.beforeUpdate(),p.transition().duration(s).call(b)},b.container=this,!(k&&k.length&&k.filter(function(a){return a.values.hasOwnProperty("Q1")&&a.values.hasOwnProperty("Q2")&&a.values.hasOwnProperty("Q3")}).length)){var v=p.selectAll(".nv-noData").data([q]);return v.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),v.attr("x",h.left+t/2).attr("y",h.top+u/2).text(function(a){return a}),b}p.selectAll(".nv-noData").remove(),c=e.xScale(),d=e.yScale().clamp(!0);var w=p.selectAll("g.nv-wrap.nv-boxPlotWithAxes").data([k]),x=w.enter().append("g").attr("class","nvd3 nv-wrap nv-boxPlotWithAxes").append("g"),y=x.append("defs"),z=w.select("g");
+x.append("g").attr("class","nv-x nv-axis"),x.append("g").attr("class","nv-y nv-axis").append("g").attr("class","nv-zeroLine").append("line"),x.append("g").attr("class","nv-barsWrap"),z.attr("transform","translate("+h.left+","+h.top+")"),n&&z.select(".nv-y.nv-axis").attr("transform","translate("+t+",0)"),e.width(t).height(u);var A=z.select(".nv-barsWrap").datum(k.filter(function(a){return!a.disabled}));if(A.transition().call(e),y.append("clipPath").attr("id","nv-x-label-clip-"+e.id()).append("rect"),z.select("#nv-x-label-clip-"+e.id()+" rect").attr("width",c.rangeBand()*(o?2:1)).attr("height",16).attr("x",-c.rangeBand()/(o?1:2)),l){f.scale(c).ticks(a.utils.calcTicksX(t/100,k)).tickSize(-u,0),z.select(".nv-x.nv-axis").attr("transform","translate(0,"+d.range()[0]+")"),z.select(".nv-x.nv-axis").call(f);var B=z.select(".nv-x.nv-axis").selectAll("g");o&&B.selectAll("text").attr("transform",function(a,b,c){return"translate(0,"+(c%2==0?"5":"17")+")"})}m&&(g.scale(d).ticks(Math.floor(u/36)).tickSize(-t,0),z.select(".nv-y.nv-axis").call(g)),z.select(".nv-zeroLine line").attr("x1",0).attr("x2",t).attr("y1",d(0)).attr("y2",d(0))}),t.renderEnd("nv-boxplot chart immediate"),b}var c,d,e=a.models.boxPlot(),f=a.models.axis(),g=a.models.axis(),h={top:15,right:10,bottom:50,left:60},i=null,j=null,k=a.utils.getColor(),l=!0,m=!0,n=!1,o=!1,p=a.models.tooltip(),q="No Data Available.",r=d3.dispatch("tooltipShow","tooltipHide","beforeUpdate","renderEnd"),s=250;f.orient("bottom").showMaxMin(!1).tickFormat(function(a){return a}),g.orient(n?"right":"left").tickFormat(d3.format(",.1f")),p.duration(0);var t=a.utils.renderWatch(r,s);return e.dispatch.on("elementMouseover.tooltip",function(a){p.data(a).hidden(!1)}),e.dispatch.on("elementMouseout.tooltip",function(a){p.data(a).hidden(!0)}),e.dispatch.on("elementMousemove.tooltip",function(){p.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.dispatch=r,b.boxplot=e,b.xAxis=f,b.yAxis=g,b.tooltip=p,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return i},set:function(a){i=a}},height:{get:function(){return j},set:function(a){j=a}},staggerLabels:{get:function(){return o},set:function(a){o=a}},showXAxis:{get:function(){return l},set:function(a){l=a}},showYAxis:{get:function(){return m},set:function(a){m=a}},tooltips:{get:function(){return tooltips},set:function(a){tooltips=a}},tooltipContent:{get:function(){return p},set:function(a){p=a}},noData:{get:function(){return q},set:function(a){q=a}},margin:{get:function(){return h},set:function(a){h.top=void 0!==a.top?a.top:h.top,h.right=void 0!==a.right?a.right:h.right,h.bottom=void 0!==a.bottom?a.bottom:h.bottom,h.left=void 0!==a.left?a.left:h.left}},duration:{get:function(){return s},set:function(a){s=a,t.reset(s),e.duration(s),f.duration(s),g.duration(s)}},color:{get:function(){return k},set:function(b){k=a.utils.getColor(b),e.color(k)}},rightAlignYAxis:{get:function(){return n},set:function(a){n=a,g.orient(a?"right":"left")}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.bullet=function(){"use strict";function b(d){return d.each(function(b,d){var p=m-c.left-c.right,s=n-c.top-c.bottom;o=d3.select(this),a.utils.initSVG(o);{var t=f.call(this,b,d).slice().sort(d3.descending),u=g.call(this,b,d).slice().sort(d3.descending),v=h.call(this,b,d).slice().sort(d3.descending),w=i.call(this,b,d).slice(),x=j.call(this,b,d).slice(),y=k.call(this,b,d).slice(),z=d3.scale.linear().domain(d3.extent(d3.merge([l,t]))).range(e?[p,0]:[0,p]);this.__chart__||d3.scale.linear().domain([0,1/0]).range(z.range())}this.__chart__=z;var A=d3.min(t),B=d3.max(t),C=t[1],D=o.selectAll("g.nv-wrap.nv-bullet").data([b]),E=D.enter().append("g").attr("class","nvd3 nv-wrap nv-bullet"),F=E.append("g"),G=D.select("g");F.append("rect").attr("class","nv-range nv-rangeMax"),F.append("rect").attr("class","nv-range nv-rangeAvg"),F.append("rect").attr("class","nv-range nv-rangeMin"),F.append("rect").attr("class","nv-measure"),D.attr("transform","translate("+c.left+","+c.top+")");var H=function(a){return Math.abs(z(a)-z(0))},I=function(a){return z(0>a?a:0)};G.select("rect.nv-rangeMax").attr("height",s).attr("width",H(B>0?B:A)).attr("x",I(B>0?B:A)).datum(B>0?B:A),G.select("rect.nv-rangeAvg").attr("height",s).attr("width",H(C)).attr("x",I(C)).datum(C),G.select("rect.nv-rangeMin").attr("height",s).attr("width",H(B)).attr("x",I(B)).attr("width",H(B>0?A:B)).attr("x",I(B>0?A:B)).datum(B>0?A:B),G.select("rect.nv-measure").style("fill",q).attr("height",s/3).attr("y",s/3).attr("width",0>v?z(0)-z(v[0]):z(v[0])-z(0)).attr("x",I(v)).on("mouseover",function(){r.elementMouseover({value:v[0],label:y[0]||"Current",color:d3.select(this).style("fill")})}).on("mousemove",function(){r.elementMousemove({value:v[0],label:y[0]||"Current",color:d3.select(this).style("fill")})}).on("mouseout",function(){r.elementMouseout({value:v[0],label:y[0]||"Current",color:d3.select(this).style("fill")})});var J=s/6,K=u.map(function(a,b){return{value:a,label:x[b]}});F.selectAll("path.nv-markerTriangle").data(K).enter().append("path").attr("class","nv-markerTriangle").attr("transform",function(a){return"translate("+z(a.value)+","+s/2+")"}).attr("d","M0,"+J+"L"+J+","+-J+" "+-J+","+-J+"Z").on("mouseover",function(a){r.elementMouseover({value:a.value,label:a.label||"Previous",color:d3.select(this).style("fill"),pos:[z(a.value),s/2]})}).on("mousemove",function(a){r.elementMousemove({value:a.value,label:a.label||"Previous",color:d3.select(this).style("fill")})}).on("mouseout",function(a){r.elementMouseout({value:a.value,label:a.label||"Previous",color:d3.select(this).style("fill")})}),D.selectAll(".nv-range").on("mouseover",function(a,b){var c=w[b]||(b?1==b?"Mean":"Minimum":"Maximum");r.elementMouseover({value:a,label:c,color:d3.select(this).style("fill")})}).on("mousemove",function(){r.elementMousemove({value:v[0],label:y[0]||"Previous",color:d3.select(this).style("fill")})}).on("mouseout",function(a,b){var c=w[b]||(b?1==b?"Mean":"Minimum":"Maximum");r.elementMouseout({value:a,label:c,color:d3.select(this).style("fill")})})}),b}var c={top:0,right:0,bottom:0,left:0},d="left",e=!1,f=function(a){return a.ranges},g=function(a){return a.markers?a.markers:[0]},h=function(a){return a.measures},i=function(a){return a.rangeLabels?a.rangeLabels:[]},j=function(a){return a.markerLabels?a.markerLabels:[]},k=function(a){return a.measureLabels?a.measureLabels:[]},l=[0],m=380,n=30,o=null,p=null,q=a.utils.getColor(["#1f77b4"]),r=d3.dispatch("elementMouseover","elementMouseout","elementMousemove");return b.dispatch=r,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{ranges:{get:function(){return f},set:function(a){f=a}},markers:{get:function(){return g},set:function(a){g=a}},measures:{get:function(){return h},set:function(a){h=a}},forceX:{get:function(){return l},set:function(a){l=a}},width:{get:function(){return m},set:function(a){m=a}},height:{get:function(){return n},set:function(a){n=a}},tickFormat:{get:function(){return p},set:function(a){p=a}},margin:{get:function(){return c},set:function(a){c.top=void 0!==a.top?a.top:c.top,c.right=void 0!==a.right?a.right:c.right,c.bottom=void 0!==a.bottom?a.bottom:c.bottom,c.left=void 0!==a.left?a.left:c.left}},orient:{get:function(){return d},set:function(a){d=a,e="right"==d||"bottom"==d}},color:{get:function(){return q},set:function(b){q=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.bulletChart=function(){"use strict";function b(d){return d.each(function(e,o){var p=d3.select(this);a.utils.initSVG(p);var q=a.utils.availableWidth(k,p,g),r=l-g.top-g.bottom;if(b.update=function(){b(d)},b.container=this,!e||!h.call(this,e,o))return a.utils.noData(b,p),b;p.selectAll(".nv-noData").remove();var s=h.call(this,e,o).slice().sort(d3.descending),t=i.call(this,e,o).slice().sort(d3.descending),u=j.call(this,e,o).slice().sort(d3.descending),v=p.selectAll("g.nv-wrap.nv-bulletChart").data([e]),w=v.enter().append("g").attr("class","nvd3 nv-wrap nv-bulletChart"),x=w.append("g"),y=v.select("g");x.append("g").attr("class","nv-bulletWrap"),x.append("g").attr("class","nv-titles"),v.attr("transform","translate("+g.left+","+g.top+")");var z=d3.scale.linear().domain([0,Math.max(s[0],t[0],u[0])]).range(f?[q,0]:[0,q]),A=this.__chart__||d3.scale.linear().domain([0,1/0]).range(z.range());this.__chart__=z;var B=x.select(".nv-titles").append("g").attr("text-anchor","end").attr("transform","translate(-6,"+(l-g.top-g.bottom)/2+")");B.append("text").attr("class","nv-title").text(function(a){return a.title}),B.append("text").attr("class","nv-subtitle").attr("dy","1em").text(function(a){return a.subtitle}),c.width(q).height(r);var C=y.select(".nv-bulletWrap");d3.transition(C).call(c);var D=m||z.tickFormat(q/100),E=y.selectAll("g.nv-tick").data(z.ticks(n?n:q/50),function(a){return this.textContent||D(a)}),F=E.enter().append("g").attr("class","nv-tick").attr("transform",function(a){return"translate("+A(a)+",0)"}).style("opacity",1e-6);F.append("line").attr("y1",r).attr("y2",7*r/6),F.append("text").attr("text-anchor","middle").attr("dy","1em").attr("y",7*r/6).text(D);var G=d3.transition(E).attr("transform",function(a){return"translate("+z(a)+",0)"}).style("opacity",1);G.select("line").attr("y1",r).attr("y2",7*r/6),G.select("text").attr("y",7*r/6),d3.transition(E.exit()).attr("transform",function(a){return"translate("+z(a)+",0)"}).style("opacity",1e-6).remove()}),d3.timer.flush(),b}var c=a.models.bullet(),d=a.models.tooltip(),e="left",f=!1,g={top:5,right:40,bottom:20,left:120},h=function(a){return a.ranges},i=function(a){return a.markers?a.markers:[0]},j=function(a){return a.measures},k=null,l=55,m=null,n=null,o=null,p=d3.dispatch("tooltipShow","tooltipHide");return d.duration(0).headerEnabled(!1),c.dispatch.on("elementMouseover.tooltip",function(a){a.series={key:a.label,value:a.value,color:a.color},d.data(a).hidden(!1)}),c.dispatch.on("elementMouseout.tooltip",function(){d.hidden(!0)}),c.dispatch.on("elementMousemove.tooltip",function(){d.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.bullet=c,b.dispatch=p,b.tooltip=d,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{ranges:{get:function(){return h},set:function(a){h=a}},markers:{get:function(){return i},set:function(a){i=a}},measures:{get:function(){return j},set:function(a){j=a}},width:{get:function(){return k},set:function(a){k=a}},height:{get:function(){return l},set:function(a){l=a}},tickFormat:{get:function(){return m},set:function(a){m=a}},ticks:{get:function(){return n},set:function(a){n=a}},noData:{get:function(){return o},set:function(a){o=a}},tooltips:{get:function(){return d.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),d.enabled(!!b)}},tooltipContent:{get:function(){return d.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),d.contentGenerator(b)}},margin:{get:function(){return g},set:function(a){g.top=void 0!==a.top?a.top:g.top,g.right=void 0!==a.right?a.right:g.right,g.bottom=void 0!==a.bottom?a.bottom:g.bottom,g.left=void 0!==a.left?a.left:g.left}},orient:{get:function(){return e},set:function(a){e=a,f="right"==e||"bottom"==e}}}),a.utils.inheritOptions(b,c),a.utils.initOptions(b),b},a.models.candlestickBar=function(){"use strict";function b(x){return x.each(function(b){c=d3.select(this);var x=a.utils.availableWidth(i,c,h),y=a.utils.availableHeight(j,c,h);a.utils.initSVG(c);var A=x/b[0].values.length*.45;l.domain(d||d3.extent(b[0].values.map(n).concat(t))),l.range(v?f||[.5*x/b[0].values.length,x*(b[0].values.length-.5)/b[0].values.length]:f||[5+A/2,x-A/2-5]),m.domain(e||[d3.min(b[0].values.map(s).concat(u)),d3.max(b[0].values.map(r).concat(u))]).range(g||[y,0]),l.domain()[0]===l.domain()[1]&&l.domain(l.domain()[0]?[l.domain()[0]-.01*l.domain()[0],l.domain()[1]+.01*l.domain()[1]]:[-1,1]),m.domain()[0]===m.domain()[1]&&m.domain(m.domain()[0]?[m.domain()[0]+.01*m.domain()[0],m.domain()[1]-.01*m.domain()[1]]:[-1,1]);var B=d3.select(this).selectAll("g.nv-wrap.nv-candlestickBar").data([b[0].values]),C=B.enter().append("g").attr("class","nvd3 nv-wrap nv-candlestickBar"),D=C.append("defs"),E=C.append("g"),F=B.select("g");E.append("g").attr("class","nv-ticks"),B.attr("transform","translate("+h.left+","+h.top+")"),c.on("click",function(a,b){z.chartClick({data:a,index:b,pos:d3.event,id:k})}),D.append("clipPath").attr("id","nv-chart-clip-path-"+k).append("rect"),B.select("#nv-chart-clip-path-"+k+" rect").attr("width",x).attr("height",y),F.attr("clip-path",w?"url(#nv-chart-clip-path-"+k+")":"");var G=B.select(".nv-ticks").selectAll(".nv-tick").data(function(a){return a});G.exit().remove();{var H=G.enter().append("g").attr("class",function(a,b,c){return(p(a,b)>q(a,b)?"nv-tick negative":"nv-tick positive")+" nv-tick-"+c+"-"+b});H.append("line").attr("class","nv-candlestick-lines").attr("transform",function(a,b){return"translate("+l(n(a,b))+",0)"}).attr("x1",0).attr("y1",function(a,b){return m(r(a,b))}).attr("x2",0).attr("y2",function(a,b){return m(s(a,b))}),H.append("rect").attr("class","nv-candlestick-rects nv-bars").attr("transform",function(a,b){return"translate("+(l(n(a,b))-A/2)+","+(m(o(a,b))-(p(a,b)>q(a,b)?m(q(a,b))-m(p(a,b)):0))+")"}).attr("x",0).attr("y",0).attr("width",A).attr("height",function(a,b){var c=p(a,b),d=q(a,b);return c>d?m(d)-m(c):m(c)-m(d)})}c.selectAll(".nv-candlestick-lines").transition().attr("transform",function(a,b){return"translate("+l(n(a,b))+",0)"}).attr("x1",0).attr("y1",function(a,b){return m(r(a,b))}).attr("x2",0).attr("y2",function(a,b){return m(s(a,b))}),c.selectAll(".nv-candlestick-rects").transition().attr("transform",function(a,b){return"translate("+(l(n(a,b))-A/2)+","+(m(o(a,b))-(p(a,b)>q(a,b)?m(q(a,b))-m(p(a,b)):0))+")"}).attr("x",0).attr("y",0).attr("width",A).attr("height",function(a,b){var c=p(a,b),d=q(a,b);return c>d?m(d)-m(c):m(c)-m(d)})}),b}var c,d,e,f,g,h={top:0,right:0,bottom:0,left:0},i=null,j=null,k=Math.floor(1e4*Math.random()),l=d3.scale.linear(),m=d3.scale.linear(),n=function(a){return a.x},o=function(a){return a.y},p=function(a){return a.open},q=function(a){return a.close},r=function(a){return a.high},s=function(a){return a.low},t=[],u=[],v=!1,w=!0,x=a.utils.defaultColor(),y=!1,z=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState","renderEnd","chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout","elementMousemove");return b.highlightPoint=function(a,d){b.clearHighlights(),c.select(".nv-candlestickBar .nv-tick-0-"+a).classed("hover",d)},b.clearHighlights=function(){c.select(".nv-candlestickBar .nv-tick.hover").classed("hover",!1)},b.dispatch=z,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return i},set:function(a){i=a}},height:{get:function(){return j},set:function(a){j=a}},xScale:{get:function(){return l},set:function(a){l=a}},yScale:{get:function(){return m},set:function(a){m=a}},xDomain:{get:function(){return d},set:function(a){d=a}},yDomain:{get:function(){return e},set:function(a){e=a}},xRange:{get:function(){return f},set:function(a){f=a}},yRange:{get:function(){return g},set:function(a){g=a}},forceX:{get:function(){return t},set:function(a){t=a}},forceY:{get:function(){return u},set:function(a){u=a}},padData:{get:function(){return v},set:function(a){v=a}},clipEdge:{get:function(){return w},set:function(a){w=a}},id:{get:function(){return k},set:function(a){k=a}},interactive:{get:function(){return y},set:function(a){y=a}},x:{get:function(){return n},set:function(a){n=a}},y:{get:function(){return o},set:function(a){o=a}},open:{get:function(){return p()},set:function(a){p=a}},close:{get:function(){return q()},set:function(a){q=a}},high:{get:function(){return r},set:function(a){r=a}},low:{get:function(){return s},set:function(a){s=a}},margin:{get:function(){return h},set:function(a){h.top=void 0!=a.top?a.top:h.top,h.right=void 0!=a.right?a.right:h.right,h.bottom=void 0!=a.bottom?a.bottom:h.bottom,h.left=void 0!=a.left?a.left:h.left}},color:{get:function(){return x},set:function(b){x=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.cumulativeLineChart=function(){"use strict";function b(l){return H.reset(),H.models(f),r&&H.models(g),s&&H.models(h),l.each(function(l){function A(){d3.select(b.container).style("cursor","ew-resize")}function E(){G.x=d3.event.x,G.i=Math.round(F.invert(G.x)),K()}function H(){d3.select(b.container).style("cursor","auto"),y.index=G.i,C.stateChange(y)}function K(){bb.data([G]);var a=b.duration();b.duration(0),b.update(),b.duration(a)}var L=d3.select(this);a.utils.initSVG(L),L.classed("nv-chart-"+x,!0);var M=this,N=a.utils.availableWidth(o,L,m),O=a.utils.availableHeight(p,L,m);if(b.update=function(){0===D?L.call(b):L.transition().duration(D).call(b)},b.container=this,y.setter(J(l),b.update).getter(I(l)).update(),y.disabled=l.map(function(a){return!!a.disabled}),!z){var P;z={};for(P in y)z[P]=y[P]instanceof Array?y[P].slice(0):y[P]}var Q=d3.behavior.drag().on("dragstart",A).on("drag",E).on("dragend",H);if(!(l&&l.length&&l.filter(function(a){return a.values.length}).length))return a.utils.noData(b,L),b;if(L.selectAll(".nv-noData").remove(),d=f.xScale(),e=f.yScale(),w)f.yDomain(null);else{var R=l.filter(function(a){return!a.disabled}).map(function(a){var b=d3.extent(a.values,f.y());return b[0]<-.95&&(b[0]=-.95),[(b[0]-b[1])/(1+b[1]),(b[1]-b[0])/(1+b[0])]}),S=[d3.min(R,function(a){return a[0]}),d3.max(R,function(a){return a[1]})];f.yDomain(S)}F.domain([0,l[0].values.length-1]).range([0,N]).clamp(!0);var l=c(G.i,l),T=v?"none":"all",U=L.selectAll("g.nv-wrap.nv-cumulativeLine").data([l]),V=U.enter().append("g").attr("class","nvd3 nv-wrap nv-cumulativeLine").append("g"),W=U.select("g");if(V.append("g").attr("class","nv-interactive"),V.append("g").attr("class","nv-x nv-axis").style("pointer-events","none"),V.append("g").attr("class","nv-y nv-axis"),V.append("g").attr("class","nv-background"),V.append("g").attr("class","nv-linesWrap").style("pointer-events",T),V.append("g").attr("class","nv-avgLinesWrap").style("pointer-events","none"),V.append("g").attr("class","nv-legendWrap"),V.append("g").attr("class","nv-controlsWrap"),q&&(i.width(N),W.select(".nv-legendWrap").datum(l).call(i),m.top!=i.height()&&(m.top=i.height(),O=a.utils.availableHeight(p,L,m)),W.select(".nv-legendWrap").attr("transform","translate(0,"+-m.top+")")),u){var X=[{key:"Re-scale y-axis",disabled:!w}];j.width(140).color(["#444","#444","#444"]).rightAlign(!1).margin({top:5,right:0,bottom:5,left:20}),W.select(".nv-controlsWrap").datum(X).attr("transform","translate(0,"+-m.top+")").call(j)}U.attr("transform","translate("+m.left+","+m.top+")"),t&&W.select(".nv-y.nv-axis").attr("transform","translate("+N+",0)");var Y=l.filter(function(a){return a.tempDisabled});U.select(".tempDisabled").remove(),Y.length&&U.append("text").attr("class","tempDisabled").attr("x",N/2).attr("y","-.71em").style("text-anchor","end").text(Y.map(function(a){return a.key}).join(", ")+" values cannot be calculated for this time period."),v&&(k.width(N).height(O).margin({left:m.left,top:m.top}).svgContainer(L).xScale(d),U.select(".nv-interactive").call(k)),V.select(".nv-background").append("rect"),W.select(".nv-background rect").attr("width",N).attr("height",O),f.y(function(a){return a.display.y}).width(N).height(O).color(l.map(function(a,b){return a.color||n(a,b)}).filter(function(a,b){return!l[b].disabled&&!l[b].tempDisabled}));var Z=W.select(".nv-linesWrap").datum(l.filter(function(a){return!a.disabled&&!a.tempDisabled}));Z.call(f),l.forEach(function(a,b){a.seriesIndex=b});var $=l.filter(function(a){return!a.disabled&&!!B(a)}),_=W.select(".nv-avgLinesWrap").selectAll("line").data($,function(a){return a.key}),ab=function(a){var b=e(B(a));return 0>b?0:b>O?O:b};_.enter().append("line").style("stroke-width",2).style("stroke-dasharray","10,10").style("stroke",function(a){return f.color()(a,a.seriesIndex)}).attr("x1",0).attr("x2",N).attr("y1",ab).attr("y2",ab),_.style("stroke-opacity",function(a){var b=e(B(a));return 0>b||b>O?0:1}).attr("x1",0).attr("x2",N).attr("y1",ab).attr("y2",ab),_.exit().remove();var bb=Z.selectAll(".nv-indexLine").data([G]);bb.enter().append("rect").attr("class","nv-indexLine").attr("width",3).attr("x",-2).attr("fill","red").attr("fill-opacity",.5).style("pointer-events","all").call(Q),bb.attr("transform",function(a){return"translate("+F(a.i)+",0)"}).attr("height",O),r&&(g.scale(d)._ticks(a.utils.calcTicksX(N/70,l)).tickSize(-O,0),W.select(".nv-x.nv-axis").attr("transform","translate(0,"+e.range()[0]+")"),W.select(".nv-x.nv-axis").call(g)),s&&(h.scale(e)._ticks(a.utils.calcTicksY(O/36,l)).tickSize(-N,0),W.select(".nv-y.nv-axis").call(h)),W.select(".nv-background rect").on("click",function(){G.x=d3.mouse(this)[0],G.i=Math.round(F.invert(G.x)),y.index=G.i,C.stateChange(y),K()}),f.dispatch.on("elementClick",function(a){G.i=a.pointIndex,G.x=F(G.i),y.index=G.i,C.stateChange(y),K()}),j.dispatch.on("legendClick",function(a){a.disabled=!a.disabled,w=!a.disabled,y.rescaleY=w,C.stateChange(y),b.update()}),i.dispatch.on("stateChange",function(a){for(var c in a)y[c]=a[c];C.stateChange(y),b.update()}),k.dispatch.on("elementMousemove",function(c){f.clearHighlights();var d,e,i,j=[];if(l.filter(function(a,b){return a.seriesIndex=b,!a.disabled}).forEach(function(g,h){e=a.interactiveBisect(g.values,c.pointXValue,b.x()),f.highlightPoint(h,e,!0);var k=g.values[e];"undefined"!=typeof k&&("undefined"==typeof d&&(d=k),"undefined"==typeof i&&(i=b.xScale()(b.x()(k,e))),j.push({key:g.key,value:b.y()(k,e),color:n(g,g.seriesIndex)}))}),j.length>2){var o=b.yScale().invert(c.mouseY),p=Math.abs(b.yScale().domain()[0]-b.yScale().domain()[1]),q=.03*p,r=a.nearestValueIndex(j.map(function(a){return a.value}),o,q);null!==r&&(j[r].highlight=!0)}var s=g.tickFormat()(b.x()(d,e),e);k.tooltip.position({left:i+m.left,top:c.mouseY+m.top}).chartContainer(M.parentNode).valueFormatter(function(a){return h.tickFormat()(a)}).data({value:s,series:j})(),k.renderGuideLine(i)}),k.dispatch.on("elementMouseout",function(){f.clearHighlights()}),C.on("changeState",function(a){"undefined"!=typeof a.disabled&&(l.forEach(function(b,c){b.disabled=a.disabled[c]}),y.disabled=a.disabled),"undefined"!=typeof a.index&&(G.i=a.index,G.x=F(G.i),y.index=a.index,bb.data([G])),"undefined"!=typeof a.rescaleY&&(w=a.rescaleY),b.update()})}),H.renderEnd("cumulativeLineChart immediate"),b}function c(a,b){return K||(K=f.y()),b.map(function(b){if(!b.values)return b;var c=b.values[a];if(null==c)return b;var d=K(c,a);return-.95>d&&!E?(b.tempDisabled=!0,b):(b.tempDisabled=!1,b.values=b.values.map(function(a,b){return a.display={y:(K(a,b)-d)/(1+d)},a}),b)})}var d,e,f=a.models.line(),g=a.models.axis(),h=a.models.axis(),i=a.models.legend(),j=a.models.legend(),k=a.interactiveGuideline(),l=a.models.tooltip(),m={top:30,right:30,bottom:50,left:60},n=a.utils.defaultColor(),o=null,p=null,q=!0,r=!0,s=!0,t=!1,u=!0,v=!1,w=!0,x=f.id(),y=a.utils.state(),z=null,A=null,B=function(a){return a.average},C=d3.dispatch("stateChange","changeState","renderEnd"),D=250,E=!1;y.index=0,y.rescaleY=w,g.orient("bottom").tickPadding(7),h.orient(t?"right":"left"),l.valueFormatter(function(a,b){return h.tickFormat()(a,b)}).headerFormatter(function(a,b){return g.tickFormat()(a,b)}),j.updateState(!1);var F=d3.scale.linear(),G={i:0,x:0},H=a.utils.renderWatch(C,D),I=function(a){return function(){return{active:a.map(function(a){return!a.disabled}),index:G.i,rescaleY:w}}},J=function(a){return function(b){void 0!==b.index&&(G.i=b.index),void 0!==b.rescaleY&&(w=b.rescaleY),void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}};f.dispatch.on("elementMouseover.tooltip",function(a){var c={x:b.x()(a.point),y:b.y()(a.point),color:a.point.color};a.point=c,l.data(a).position(a.pos).hidden(!1)}),f.dispatch.on("elementMouseout.tooltip",function(){l.hidden(!0)});var K=null;return b.dispatch=C,b.lines=f,b.legend=i,b.controls=j,b.xAxis=g,b.yAxis=h,b.interactiveLayer=k,b.state=y,b.tooltip=l,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return o},set:function(a){o=a}},height:{get:function(){return p},set:function(a){p=a}},rescaleY:{get:function(){return w},set:function(a){w=a}},showControls:{get:function(){return u},set:function(a){u=a}},showLegend:{get:function(){return q},set:function(a){q=a}},average:{get:function(){return B},set:function(a){B=a}},defaultState:{get:function(){return z},set:function(a){z=a}},noData:{get:function(){return A},set:function(a){A=a}},showXAxis:{get:function(){return r},set:function(a){r=a}},showYAxis:{get:function(){return s},set:function(a){s=a}},noErrorCheck:{get:function(){return E},set:function(a){E=a}},tooltips:{get:function(){return l.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),l.enabled(!!b)}},tooltipContent:{get:function(){return l.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),l.contentGenerator(b)}},margin:{get:function(){return m},set:function(a){m.top=void 0!==a.top?a.top:m.top,m.right=void 0!==a.right?a.right:m.right,m.bottom=void 0!==a.bottom?a.bottom:m.bottom,m.left=void 0!==a.left?a.left:m.left}},color:{get:function(){return n},set:function(b){n=a.utils.getColor(b),i.color(n)}},useInteractiveGuideline:{get:function(){return v},set:function(a){v=a,a===!0&&(b.interactive(!1),b.useVoronoi(!1))}},rightAlignYAxis:{get:function(){return t},set:function(a){t=a,h.orient(a?"right":"left")}},duration:{get:function(){return D},set:function(a){D=a,f.duration(D),g.duration(D),h.duration(D),H.reset(D)}}}),a.utils.inheritOptions(b,f),a.utils.initOptions(b),b},a.models.discreteBar=function(){"use strict";function b(m){return y.reset(),m.each(function(b){var m=k-j.left-j.right,x=l-j.top-j.bottom;c=d3.select(this),a.utils.initSVG(c),b.forEach(function(a,b){a.values.forEach(function(a){a.series=b})});var z=d&&e?[]:b.map(function(a){return a.values.map(function(a,b){return{x:p(a,b),y:q(a,b),y0:a.y0}})});n.domain(d||d3.merge(z).map(function(a){return a.x})).rangeBands(f||[0,m],.1),o.domain(e||d3.extent(d3.merge(z).map(function(a){return a.y}).concat(r))),o.range(t?g||[x-(o.domain()[0]<0?12:0),o.domain()[1]>0?12:0]:g||[x,0]),h=h||n,i=i||o.copy().range([o(0),o(0)]);{var A=c.selectAll("g.nv-wrap.nv-discretebar").data([b]),B=A.enter().append("g").attr("class","nvd3 nv-wrap nv-discretebar"),C=B.append("g");A.select("g")}C.append("g").attr("class","nv-groups"),A.attr("transform","translate("+j.left+","+j.top+")");var D=A.select(".nv-groups").selectAll(".nv-group").data(function(a){return a},function(a){return a.key});D.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),D.exit().watchTransition(y,"discreteBar: exit groups").style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),D.attr("class",function(a,b){return"nv-group nv-series-"+b}).classed("hover",function(a){return a.hover}),D.watchTransition(y,"discreteBar: groups").style("stroke-opacity",1).style("fill-opacity",.75);var E=D.selectAll("g.nv-bar").data(function(a){return a.values});E.exit().remove();var F=E.enter().append("g").attr("transform",function(a,b){return"translate("+(n(p(a,b))+.05*n.rangeBand())+", "+o(0)+")"}).on("mouseover",function(a,b){d3.select(this).classed("hover",!0),v.elementMouseover({data:a,index:b,color:d3.select(this).style("fill")})}).on("mouseout",function(a,b){d3.select(this).classed("hover",!1),v.elementMouseout({data:a,index:b,color:d3.select(this).style("fill")})}).on("mousemove",function(a,b){v.elementMousemove({data:a,index:b,color:d3.select(this).style("fill")})}).on("click",function(a,b){v.elementClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation()}).on("dblclick",function(a,b){v.elementDblClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation()});F.append("rect").attr("height",0).attr("width",.9*n.rangeBand()/b.length),t?(F.append("text").attr("text-anchor","middle"),E.select("text").text(function(a,b){return u(q(a,b))}).watchTransition(y,"discreteBar: bars text").attr("x",.9*n.rangeBand()/2).attr("y",function(a,b){return q(a,b)<0?o(q(a,b))-o(0)+12:-4})):E.selectAll("text").remove(),E.attr("class",function(a,b){return q(a,b)<0?"nv-bar negative":"nv-bar positive"}).style("fill",function(a,b){return a.color||s(a,b)}).style("stroke",function(a,b){return a.color||s(a,b)}).select("rect").attr("class",w).watchTransition(y,"discreteBar: bars rect").attr("width",.9*n.rangeBand()/b.length),E.watchTransition(y,"discreteBar: bars").attr("transform",function(a,b){var c=n(p(a,b))+.05*n.rangeBand(),d=q(a,b)<0?o(0):o(0)-o(q(a,b))<1?o(0)-1:o(q(a,b));return"translate("+c+", "+d+")"}).select("rect").attr("height",function(a,b){return Math.max(Math.abs(o(q(a,b))-o(e&&e[0]||0))||1)}),h=n.copy(),i=o.copy()}),y.renderEnd("discreteBar immediate"),b}var c,d,e,f,g,h,i,j={top:0,right:0,bottom:0,left:0},k=960,l=500,m=Math.floor(1e4*Math.random()),n=d3.scale.ordinal(),o=d3.scale.linear(),p=function(a){return a.x},q=function(a){return a.y},r=[0],s=a.utils.defaultColor(),t=!1,u=d3.format(",.2f"),v=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout","elementMousemove","renderEnd"),w="discreteBar",x=250,y=a.utils.renderWatch(v,x);return b.dispatch=v,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return k},set:function(a){k=a}},height:{get:function(){return l},set:function(a){l=a}},forceY:{get:function(){return r},set:function(a){r=a}},showValues:{get:function(){return t},set:function(a){t=a}},x:{get:function(){return p},set:function(a){p=a}},y:{get:function(){return q},set:function(a){q=a}},xScale:{get:function(){return n},set:function(a){n=a}},yScale:{get:function(){return o},set:function(a){o=a}},xDomain:{get:function(){return d},set:function(a){d=a}},yDomain:{get:function(){return e},set:function(a){e=a}},xRange:{get:function(){return f},set:function(a){f=a}},yRange:{get:function(){return g},set:function(a){g=a}},valueFormat:{get:function(){return u},set:function(a){u=a}},id:{get:function(){return m},set:function(a){m=a}},rectClass:{get:function(){return w},set:function(a){w=a}},margin:{get:function(){return j},set:function(a){j.top=void 0!==a.top?a.top:j.top,j.right=void 0!==a.right?a.right:j.right,j.bottom=void 0!==a.bottom?a.bottom:j.bottom,j.left=void 0!==a.left?a.left:j.left}},color:{get:function(){return s},set:function(b){s=a.utils.getColor(b)}},duration:{get:function(){return x},set:function(a){x=a,y.reset(x)}}}),a.utils.initOptions(b),b},a.models.discreteBarChart=function(){"use strict";function b(h){return t.reset(),t.models(e),m&&t.models(f),n&&t.models(g),h.each(function(h){var l=d3.select(this);a.utils.initSVG(l);var q=a.utils.availableWidth(j,l,i),t=a.utils.availableHeight(k,l,i);if(b.update=function(){r.beforeUpdate(),l.transition().duration(s).call(b)},b.container=this,!(h&&h.length&&h.filter(function(a){return a.values.length}).length))return a.utils.noData(b,l),b;l.selectAll(".nv-noData").remove(),c=e.xScale(),d=e.yScale().clamp(!0);var u=l.selectAll("g.nv-wrap.nv-discreteBarWithAxes").data([h]),v=u.enter().append("g").attr("class","nvd3 nv-wrap nv-discreteBarWithAxes").append("g"),w=v.append("defs"),x=u.select("g");v.append("g").attr("class","nv-x nv-axis"),v.append("g").attr("class","nv-y nv-axis").append("g").attr("class","nv-zeroLine").append("line"),v.append("g").attr("class","nv-barsWrap"),x.attr("transform","translate("+i.left+","+i.top+")"),o&&x.select(".nv-y.nv-axis").attr("transform","translate("+q+",0)"),e.width(q).height(t);var y=x.select(".nv-barsWrap").datum(h.filter(function(a){return!a.disabled}));if(y.transition().call(e),w.append("clipPath").attr("id","nv-x-label-clip-"+e.id()).append("rect"),x.select("#nv-x-label-clip-"+e.id()+" rect").attr("width",c.rangeBand()*(p?2:1)).attr("height",16).attr("x",-c.rangeBand()/(p?1:2)),m){f.scale(c)._ticks(a.utils.calcTicksX(q/100,h)).tickSize(-t,0),x.select(".nv-x.nv-axis").attr("transform","translate(0,"+(d.range()[0]+(e.showValues()&&d.domain()[0]<0?16:0))+")"),x.select(".nv-x.nv-axis").call(f);
+var z=x.select(".nv-x.nv-axis").selectAll("g");p&&z.selectAll("text").attr("transform",function(a,b,c){return"translate(0,"+(c%2==0?"5":"17")+")"})}n&&(g.scale(d)._ticks(a.utils.calcTicksY(t/36,h)).tickSize(-q,0),x.select(".nv-y.nv-axis").call(g)),x.select(".nv-zeroLine line").attr("x1",0).attr("x2",q).attr("y1",d(0)).attr("y2",d(0))}),t.renderEnd("discreteBar chart immediate"),b}var c,d,e=a.models.discreteBar(),f=a.models.axis(),g=a.models.axis(),h=a.models.tooltip(),i={top:15,right:10,bottom:50,left:60},j=null,k=null,l=a.utils.getColor(),m=!0,n=!0,o=!1,p=!1,q=null,r=d3.dispatch("beforeUpdate","renderEnd"),s=250;f.orient("bottom").showMaxMin(!1).tickFormat(function(a){return a}),g.orient(o?"right":"left").tickFormat(d3.format(",.1f")),h.duration(0).headerEnabled(!1).valueFormatter(function(a,b){return g.tickFormat()(a,b)}).keyFormatter(function(a,b){return f.tickFormat()(a,b)});var t=a.utils.renderWatch(r,s);return e.dispatch.on("elementMouseover.tooltip",function(a){a.series={key:b.x()(a.data),value:b.y()(a.data),color:a.color},h.data(a).hidden(!1)}),e.dispatch.on("elementMouseout.tooltip",function(){h.hidden(!0)}),e.dispatch.on("elementMousemove.tooltip",function(){h.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.dispatch=r,b.discretebar=e,b.xAxis=f,b.yAxis=g,b.tooltip=h,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return j},set:function(a){j=a}},height:{get:function(){return k},set:function(a){k=a}},staggerLabels:{get:function(){return p},set:function(a){p=a}},showXAxis:{get:function(){return m},set:function(a){m=a}},showYAxis:{get:function(){return n},set:function(a){n=a}},noData:{get:function(){return q},set:function(a){q=a}},tooltips:{get:function(){return h.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),h.enabled(!!b)}},tooltipContent:{get:function(){return h.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),h.contentGenerator(b)}},margin:{get:function(){return i},set:function(a){i.top=void 0!==a.top?a.top:i.top,i.right=void 0!==a.right?a.right:i.right,i.bottom=void 0!==a.bottom?a.bottom:i.bottom,i.left=void 0!==a.left?a.left:i.left}},duration:{get:function(){return s},set:function(a){s=a,t.reset(s),e.duration(s),f.duration(s),g.duration(s)}},color:{get:function(){return l},set:function(b){l=a.utils.getColor(b),e.color(l)}},rightAlignYAxis:{get:function(){return o},set:function(a){o=a,g.orient(a?"right":"left")}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.distribution=function(){"use strict";function b(k){return m.reset(),k.each(function(b){var k=(e-("x"===g?d.left+d.right:d.top+d.bottom),"x"==g?"y":"x"),l=d3.select(this);a.utils.initSVG(l),c=c||j;var n=l.selectAll("g.nv-distribution").data([b]),o=n.enter().append("g").attr("class","nvd3 nv-distribution"),p=(o.append("g"),n.select("g"));n.attr("transform","translate("+d.left+","+d.top+")");var q=p.selectAll("g.nv-dist").data(function(a){return a},function(a){return a.key});q.enter().append("g"),q.attr("class",function(a,b){return"nv-dist nv-series-"+b}).style("stroke",function(a,b){return i(a,b)});var r=q.selectAll("line.nv-dist"+g).data(function(a){return a.values});r.enter().append("line").attr(g+"1",function(a,b){return c(h(a,b))}).attr(g+"2",function(a,b){return c(h(a,b))}),m.transition(q.exit().selectAll("line.nv-dist"+g),"dist exit").attr(g+"1",function(a,b){return j(h(a,b))}).attr(g+"2",function(a,b){return j(h(a,b))}).style("stroke-opacity",0).remove(),r.attr("class",function(a,b){return"nv-dist"+g+" nv-dist"+g+"-"+b}).attr(k+"1",0).attr(k+"2",f),m.transition(r,"dist").attr(g+"1",function(a,b){return j(h(a,b))}).attr(g+"2",function(a,b){return j(h(a,b))}),c=j.copy()}),m.renderEnd("distribution immediate"),b}var c,d={top:0,right:0,bottom:0,left:0},e=400,f=8,g="x",h=function(a){return a[g]},i=a.utils.defaultColor(),j=d3.scale.linear(),k=250,l=d3.dispatch("renderEnd"),m=a.utils.renderWatch(l,k);return b.options=a.utils.optionsFunc.bind(b),b.dispatch=l,b.margin=function(a){return arguments.length?(d.top="undefined"!=typeof a.top?a.top:d.top,d.right="undefined"!=typeof a.right?a.right:d.right,d.bottom="undefined"!=typeof a.bottom?a.bottom:d.bottom,d.left="undefined"!=typeof a.left?a.left:d.left,b):d},b.width=function(a){return arguments.length?(e=a,b):e},b.axis=function(a){return arguments.length?(g=a,b):g},b.size=function(a){return arguments.length?(f=a,b):f},b.getData=function(a){return arguments.length?(h=d3.functor(a),b):h},b.scale=function(a){return arguments.length?(j=a,b):j},b.color=function(c){return arguments.length?(i=a.utils.getColor(c),b):i},b.duration=function(a){return arguments.length?(k=a,m.reset(k),b):k},b},a.models.furiousLegend=function(){"use strict";function b(p){function q(a,b){return"furious"!=o?"#000":m?a.disengaged?g(a,b):"#fff":m?void 0:a.disabled?g(a,b):"#fff"}function r(a,b){return m&&"furious"==o?a.disengaged?"#fff":g(a,b):a.disabled?"#fff":g(a,b)}return p.each(function(b){var p=d-c.left-c.right,s=d3.select(this);a.utils.initSVG(s);var t=s.selectAll("g.nv-legend").data([b]),u=(t.enter().append("g").attr("class","nvd3 nv-legend").append("g"),t.select("g"));t.attr("transform","translate("+c.left+","+c.top+")");var v,w=u.selectAll(".nv-series").data(function(a){return"furious"!=o?a:a.filter(function(a){return m?!0:!a.disengaged})}),x=w.enter().append("g").attr("class","nv-series");if("classic"==o)x.append("circle").style("stroke-width",2).attr("class","nv-legend-symbol").attr("r",5),v=w.select("circle");else if("furious"==o){x.append("rect").style("stroke-width",2).attr("class","nv-legend-symbol").attr("rx",3).attr("ry",3),v=w.select("rect"),x.append("g").attr("class","nv-check-box").property("innerHTML",'<path d="M0.5,5 L22.5,5 L22.5,26.5 L0.5,26.5 L0.5,5 Z" class="nv-box"></path><path d="M5.5,12.8618467 L11.9185089,19.2803556 L31,0.198864511" class="nv-check"></path>').attr("transform","translate(-10,-8)scale(0.5)");var y=w.select(".nv-check-box");y.each(function(a,b){d3.select(this).selectAll("path").attr("stroke",q(a,b))})}x.append("text").attr("text-anchor","start").attr("class","nv-legend-text").attr("dy",".32em").attr("dx","8");var z=w.select("text.nv-legend-text");w.on("mouseover",function(a,b){n.legendMouseover(a,b)}).on("mouseout",function(a,b){n.legendMouseout(a,b)}).on("click",function(a,b){n.legendClick(a,b);var c=w.data();if(k){if("classic"==o)l?(c.forEach(function(a){a.disabled=!0}),a.disabled=!1):(a.disabled=!a.disabled,c.every(function(a){return a.disabled})&&c.forEach(function(a){a.disabled=!1}));else if("furious"==o)if(m)a.disengaged=!a.disengaged,a.userDisabled=void 0==a.userDisabled?!!a.disabled:a.userDisabled,a.disabled=a.disengaged||a.userDisabled;else if(!m){a.disabled=!a.disabled,a.userDisabled=a.disabled;var d=c.filter(function(a){return!a.disengaged});d.every(function(a){return a.userDisabled})&&c.forEach(function(a){a.disabled=a.userDisabled=!1})}n.stateChange({disabled:c.map(function(a){return!!a.disabled}),disengaged:c.map(function(a){return!!a.disengaged})})}}).on("dblclick",function(a,b){if(("furious"!=o||!m)&&(n.legendDblclick(a,b),k)){var c=w.data();c.forEach(function(a){a.disabled=!0,"furious"==o&&(a.userDisabled=a.disabled)}),a.disabled=!1,"furious"==o&&(a.userDisabled=a.disabled),n.stateChange({disabled:c.map(function(a){return!!a.disabled})})}}),w.classed("nv-disabled",function(a){return a.userDisabled}),w.exit().remove(),z.attr("fill",q).text(f);var A;switch(o){case"furious":A=23;break;case"classic":A=20}if(h){var B=[];w.each(function(){var b,c=d3.select(this).select("text");try{if(b=c.node().getComputedTextLength(),0>=b)throw Error()}catch(d){b=a.utils.calcApproxTextWidth(c)}B.push(b+i)});for(var C=0,D=0,E=[];p>D&&C<B.length;)E[C]=B[C],D+=B[C++];for(0===C&&(C=1);D>p&&C>1;){E=[],C--;for(var F=0;F<B.length;F++)B[F]>(E[F%C]||0)&&(E[F%C]=B[F]);D=E.reduce(function(a,b){return a+b})}for(var G=[],H=0,I=0;C>H;H++)G[H]=I,I+=E[H];w.attr("transform",function(a,b){return"translate("+G[b%C]+","+(5+Math.floor(b/C)*A)+")"}),j?u.attr("transform","translate("+(d-c.right-D)+","+c.top+")"):u.attr("transform","translate(0,"+c.top+")"),e=c.top+c.bottom+Math.ceil(B.length/C)*A}else{var J,K=5,L=5,M=0;w.attr("transform",function(){var a=d3.select(this).select("text").node().getComputedTextLength()+i;return J=L,d<c.left+c.right+J+a&&(L=J=5,K+=A),L+=a,L>M&&(M=L),"translate("+J+","+K+")"}),u.attr("transform","translate("+(d-c.right-M)+","+c.top+")"),e=c.top+c.bottom+K+15}"furious"==o&&v.attr("width",function(a,b){return z[0][b].getComputedTextLength()+27}).attr("height",18).attr("y",-9).attr("x",-15),v.style("fill",r).style("stroke",function(a,b){return a.color||g(a,b)})}),b}var c={top:5,right:0,bottom:5,left:0},d=400,e=20,f=function(a){return a.key},g=a.utils.getColor(),h=!0,i=28,j=!0,k=!0,l=!1,m=!1,n=d3.dispatch("legendClick","legendDblclick","legendMouseover","legendMouseout","stateChange"),o="classic";return b.dispatch=n,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return d},set:function(a){d=a}},height:{get:function(){return e},set:function(a){e=a}},key:{get:function(){return f},set:function(a){f=a}},align:{get:function(){return h},set:function(a){h=a}},rightAlign:{get:function(){return j},set:function(a){j=a}},padding:{get:function(){return i},set:function(a){i=a}},updateState:{get:function(){return k},set:function(a){k=a}},radioButtonMode:{get:function(){return l},set:function(a){l=a}},expanded:{get:function(){return m},set:function(a){m=a}},vers:{get:function(){return o},set:function(a){o=a}},margin:{get:function(){return c},set:function(a){c.top=void 0!==a.top?a.top:c.top,c.right=void 0!==a.right?a.right:c.right,c.bottom=void 0!==a.bottom?a.bottom:c.bottom,c.left=void 0!==a.left?a.left:c.left}},color:{get:function(){return g},set:function(b){g=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.historicalBar=function(){"use strict";function b(x){return x.each(function(b){w.reset(),k=d3.select(this);var x=a.utils.availableWidth(h,k,g),y=a.utils.availableHeight(i,k,g);a.utils.initSVG(k),l.domain(c||d3.extent(b[0].values.map(n).concat(p))),l.range(r?e||[.5*x/b[0].values.length,x*(b[0].values.length-.5)/b[0].values.length]:e||[0,x]),m.domain(d||d3.extent(b[0].values.map(o).concat(q))).range(f||[y,0]),l.domain()[0]===l.domain()[1]&&l.domain(l.domain()[0]?[l.domain()[0]-.01*l.domain()[0],l.domain()[1]+.01*l.domain()[1]]:[-1,1]),m.domain()[0]===m.domain()[1]&&m.domain(m.domain()[0]?[m.domain()[0]+.01*m.domain()[0],m.domain()[1]-.01*m.domain()[1]]:[-1,1]);var z=k.selectAll("g.nv-wrap.nv-historicalBar-"+j).data([b[0].values]),A=z.enter().append("g").attr("class","nvd3 nv-wrap nv-historicalBar-"+j),B=A.append("defs"),C=A.append("g"),D=z.select("g");C.append("g").attr("class","nv-bars"),z.attr("transform","translate("+g.left+","+g.top+")"),k.on("click",function(a,b){u.chartClick({data:a,index:b,pos:d3.event,id:j})}),B.append("clipPath").attr("id","nv-chart-clip-path-"+j).append("rect"),z.select("#nv-chart-clip-path-"+j+" rect").attr("width",x).attr("height",y),D.attr("clip-path",s?"url(#nv-chart-clip-path-"+j+")":"");var E=z.select(".nv-bars").selectAll(".nv-bar").data(function(a){return a},function(a,b){return n(a,b)});E.exit().remove(),E.enter().append("rect").attr("x",0).attr("y",function(b,c){return a.utils.NaNtoZero(m(Math.max(0,o(b,c))))}).attr("height",function(b,c){return a.utils.NaNtoZero(Math.abs(m(o(b,c))-m(0)))}).attr("transform",function(a,c){return"translate("+(l(n(a,c))-x/b[0].values.length*.45)+",0)"}).on("mouseover",function(a,b){v&&(d3.select(this).classed("hover",!0),u.elementMouseover({data:a,index:b,color:d3.select(this).style("fill")}))}).on("mouseout",function(a,b){v&&(d3.select(this).classed("hover",!1),u.elementMouseout({data:a,index:b,color:d3.select(this).style("fill")}))}).on("mousemove",function(a,b){v&&u.elementMousemove({data:a,index:b,color:d3.select(this).style("fill")})}).on("click",function(a,b){v&&(u.elementClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation())}).on("dblclick",function(a,b){v&&(u.elementDblClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation())}),E.attr("fill",function(a,b){return t(a,b)}).attr("class",function(a,b,c){return(o(a,b)<0?"nv-bar negative":"nv-bar positive")+" nv-bar-"+c+"-"+b}).watchTransition(w,"bars").attr("transform",function(a,c){return"translate("+(l(n(a,c))-x/b[0].values.length*.45)+",0)"}).attr("width",x/b[0].values.length*.9),E.watchTransition(w,"bars").attr("y",function(b,c){var d=o(b,c)<0?m(0):m(0)-m(o(b,c))<1?m(0)-1:m(o(b,c));return a.utils.NaNtoZero(d)}).attr("height",function(b,c){return a.utils.NaNtoZero(Math.max(Math.abs(m(o(b,c))-m(0)),1))})}),w.renderEnd("historicalBar immediate"),b}var c,d,e,f,g={top:0,right:0,bottom:0,left:0},h=null,i=null,j=Math.floor(1e4*Math.random()),k=null,l=d3.scale.linear(),m=d3.scale.linear(),n=function(a){return a.x},o=function(a){return a.y},p=[],q=[0],r=!1,s=!0,t=a.utils.defaultColor(),u=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout","elementMousemove","renderEnd"),v=!0,w=a.utils.renderWatch(u,0);return b.highlightPoint=function(a,b){k.select(".nv-bars .nv-bar-0-"+a).classed("hover",b)},b.clearHighlights=function(){k.select(".nv-bars .nv-bar.hover").classed("hover",!1)},b.dispatch=u,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return h},set:function(a){h=a}},height:{get:function(){return i},set:function(a){i=a}},forceX:{get:function(){return p},set:function(a){p=a}},forceY:{get:function(){return q},set:function(a){q=a}},padData:{get:function(){return r},set:function(a){r=a}},x:{get:function(){return n},set:function(a){n=a}},y:{get:function(){return o},set:function(a){o=a}},xScale:{get:function(){return l},set:function(a){l=a}},yScale:{get:function(){return m},set:function(a){m=a}},xDomain:{get:function(){return c},set:function(a){c=a}},yDomain:{get:function(){return d},set:function(a){d=a}},xRange:{get:function(){return e},set:function(a){e=a}},yRange:{get:function(){return f},set:function(a){f=a}},clipEdge:{get:function(){return s},set:function(a){s=a}},id:{get:function(){return j},set:function(a){j=a}},interactive:{get:function(){return v},set:function(a){v=a}},margin:{get:function(){return g},set:function(a){g.top=void 0!==a.top?a.top:g.top,g.right=void 0!==a.right?a.right:g.right,g.bottom=void 0!==a.bottom?a.bottom:g.bottom,g.left=void 0!==a.left?a.left:g.left}},color:{get:function(){return t},set:function(b){t=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.historicalBarChart=function(b){"use strict";function c(b){return b.each(function(k){z.reset(),z.models(f),q&&z.models(g),r&&z.models(h);var w=d3.select(this),A=this;a.utils.initSVG(w);var B=a.utils.availableWidth(n,w,l),C=a.utils.availableHeight(o,w,l);if(c.update=function(){w.transition().duration(y).call(c)},c.container=this,u.disabled=k.map(function(a){return!!a.disabled}),!v){var D;v={};for(D in u)v[D]=u[D]instanceof Array?u[D].slice(0):u[D]}if(!(k&&k.length&&k.filter(function(a){return a.values.length}).length))return a.utils.noData(c,w),c;w.selectAll(".nv-noData").remove(),d=f.xScale(),e=f.yScale();var E=w.selectAll("g.nv-wrap.nv-historicalBarChart").data([k]),F=E.enter().append("g").attr("class","nvd3 nv-wrap nv-historicalBarChart").append("g"),G=E.select("g");F.append("g").attr("class","nv-x nv-axis"),F.append("g").attr("class","nv-y nv-axis"),F.append("g").attr("class","nv-barsWrap"),F.append("g").attr("class","nv-legendWrap"),F.append("g").attr("class","nv-interactive"),p&&(i.width(B),G.select(".nv-legendWrap").datum(k).call(i),l.top!=i.height()&&(l.top=i.height(),C=a.utils.availableHeight(o,w,l)),E.select(".nv-legendWrap").attr("transform","translate(0,"+-l.top+")")),E.attr("transform","translate("+l.left+","+l.top+")"),s&&G.select(".nv-y.nv-axis").attr("transform","translate("+B+",0)"),t&&(j.width(B).height(C).margin({left:l.left,top:l.top}).svgContainer(w).xScale(d),E.select(".nv-interactive").call(j)),f.width(B).height(C).color(k.map(function(a,b){return a.color||m(a,b)}).filter(function(a,b){return!k[b].disabled}));var H=G.select(".nv-barsWrap").datum(k.filter(function(a){return!a.disabled}));H.transition().call(f),q&&(g.scale(d)._ticks(a.utils.calcTicksX(B/100,k)).tickSize(-C,0),G.select(".nv-x.nv-axis").attr("transform","translate(0,"+e.range()[0]+")"),G.select(".nv-x.nv-axis").transition().call(g)),r&&(h.scale(e)._ticks(a.utils.calcTicksY(C/36,k)).tickSize(-B,0),G.select(".nv-y.nv-axis").transition().call(h)),j.dispatch.on("elementMousemove",function(b){f.clearHighlights();var d,e,i,n=[];k.filter(function(a,b){return a.seriesIndex=b,!a.disabled}).forEach(function(g){e=a.interactiveBisect(g.values,b.pointXValue,c.x()),f.highlightPoint(e,!0);var h=g.values[e];void 0!==h&&(void 0===d&&(d=h),void 0===i&&(i=c.xScale()(c.x()(h,e))),n.push({key:g.key,value:c.y()(h,e),color:m(g,g.seriesIndex),data:g.values[e]}))});var o=g.tickFormat()(c.x()(d,e));j.tooltip.position({left:i+l.left,top:b.mouseY+l.top}).chartContainer(A.parentNode).valueFormatter(function(a){return h.tickFormat()(a)}).data({value:o,index:e,series:n})(),j.renderGuideLine(i)}),j.dispatch.on("elementMouseout",function(){x.tooltipHide(),f.clearHighlights()}),i.dispatch.on("legendClick",function(a){a.disabled=!a.disabled,k.filter(function(a){return!a.disabled}).length||k.map(function(a){return a.disabled=!1,E.selectAll(".nv-series").classed("disabled",!1),a}),u.disabled=k.map(function(a){return!!a.disabled}),x.stateChange(u),b.transition().call(c)}),i.dispatch.on("legendDblclick",function(a){k.forEach(function(a){a.disabled=!0}),a.disabled=!1,u.disabled=k.map(function(a){return!!a.disabled}),x.stateChange(u),c.update()}),x.on("changeState",function(a){"undefined"!=typeof a.disabled&&(k.forEach(function(b,c){b.disabled=a.disabled[c]}),u.disabled=a.disabled),c.update()})}),z.renderEnd("historicalBarChart immediate"),c}var d,e,f=b||a.models.historicalBar(),g=a.models.axis(),h=a.models.axis(),i=a.models.legend(),j=a.interactiveGuideline(),k=a.models.tooltip(),l={top:30,right:90,bottom:50,left:90},m=a.utils.defaultColor(),n=null,o=null,p=!1,q=!0,r=!0,s=!1,t=!1,u={},v=null,w=null,x=d3.dispatch("tooltipHide","stateChange","changeState","renderEnd"),y=250;g.orient("bottom").tickPadding(7),h.orient(s?"right":"left"),k.duration(0).headerEnabled(!1).valueFormatter(function(a,b){return h.tickFormat()(a,b)}).headerFormatter(function(a,b){return g.tickFormat()(a,b)});var z=a.utils.renderWatch(x,0);return f.dispatch.on("elementMouseover.tooltip",function(a){a.series={key:c.x()(a.data),value:c.y()(a.data),color:a.color},k.data(a).hidden(!1)}),f.dispatch.on("elementMouseout.tooltip",function(){k.hidden(!0)}),f.dispatch.on("elementMousemove.tooltip",function(){k.position({top:d3.event.pageY,left:d3.event.pageX})()}),c.dispatch=x,c.bars=f,c.legend=i,c.xAxis=g,c.yAxis=h,c.interactiveLayer=j,c.tooltip=k,c.options=a.utils.optionsFunc.bind(c),c._options=Object.create({},{width:{get:function(){return n},set:function(a){n=a}},height:{get:function(){return o},set:function(a){o=a}},showLegend:{get:function(){return p},set:function(a){p=a}},showXAxis:{get:function(){return q},set:function(a){q=a}},showYAxis:{get:function(){return r},set:function(a){r=a}},defaultState:{get:function(){return v},set:function(a){v=a}},noData:{get:function(){return w},set:function(a){w=a}},tooltips:{get:function(){return k.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),k.enabled(!!b)}},tooltipContent:{get:function(){return k.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),k.contentGenerator(b)}},margin:{get:function(){return l},set:function(a){l.top=void 0!==a.top?a.top:l.top,l.right=void 0!==a.right?a.right:l.right,l.bottom=void 0!==a.bottom?a.bottom:l.bottom,l.left=void 0!==a.left?a.left:l.left}},color:{get:function(){return m},set:function(b){m=a.utils.getColor(b),i.color(m),f.color(m)}},duration:{get:function(){return y},set:function(a){y=a,z.reset(y),h.duration(y),g.duration(y)}},rightAlignYAxis:{get:function(){return s},set:function(a){s=a,h.orient(a?"right":"left")}},useInteractiveGuideline:{get:function(){return t},set:function(a){t=a,a===!0&&c.interactive(!1)}}}),a.utils.inheritOptions(c,f),a.utils.initOptions(c),c},a.models.ohlcBarChart=function(){var b=a.models.historicalBarChart(a.models.ohlcBar());return b.useInteractiveGuideline(!0),b.interactiveLayer.tooltip.contentGenerator(function(a){var c=a.series[0].data,d=c.open<c.close?"2ca02c":"d62728";return'<h3 style="color: #'+d+'">'+a.value+"</h3><table><tr><td>open:</td><td>"+b.yAxis.tickFormat()(c.open)+"</td></tr><tr><td>close:</td><td>"+b.yAxis.tickFormat()(c.close)+"</td></tr><tr><td>high</td><td>"+b.yAxis.tickFormat()(c.high)+"</td></tr><tr><td>low:</td><td>"+b.yAxis.tickFormat()(c.low)+"</td></tr></table>"}),b},a.models.candlestickBarChart=function(){var b=a.models.historicalBarChart(a.models.candlestickBar());return b.useInteractiveGuideline(!0),b.interactiveLayer.tooltip.contentGenerator(function(a){var c=a.series[0].data,d=c.open<c.close?"2ca02c":"d62728";return'<h3 style="color: #'+d+'">'+a.value+"</h3><table><tr><td>open:</td><td>"+b.yAxis.tickFormat()(c.open)+"</td></tr><tr><td>close:</td><td>"+b.yAxis.tickFormat()(c.close)+"</td></tr><tr><td>high</td><td>"+b.yAxis.tickFormat()(c.high)+"</td></tr><tr><td>low:</td><td>"+b.yAxis.tickFormat()(c.low)+"</td></tr></table>"}),b},a.models.legend=function(){"use strict";function b(p){function q(a,b){return"furious"!=o?"#000":m?a.disengaged?"#000":"#fff":m?void 0:(a.color||(a.color=g(a,b)),a.disabled?a.color:"#fff")}function r(a,b){return m&&"furious"==o&&a.disengaged?"#eee":a.color||g(a,b)}function s(a){return m&&"furious"==o?1:a.disabled?0:1}return p.each(function(b){var g=d-c.left-c.right,p=d3.select(this);a.utils.initSVG(p);var t=p.selectAll("g.nv-legend").data([b]),u=t.enter().append("g").attr("class","nvd3 nv-legend").append("g"),v=t.select("g");t.attr("transform","translate("+c.left+","+c.top+")");var w,x,y=v.selectAll(".nv-series").data(function(a){return"furious"!=o?a:a.filter(function(a){return m?!0:!a.disengaged})}),z=y.enter().append("g").attr("class","nv-series");switch(o){case"furious":x=23;break;case"classic":x=20}if("classic"==o)z.append("circle").style("stroke-width",2).attr("class","nv-legend-symbol").attr("r",5),w=y.select("circle");else if("furious"==o){z.append("rect").style("stroke-width",2).attr("class","nv-legend-symbol").attr("rx",3).attr("ry",3),w=y.select(".nv-legend-symbol"),z.append("g").attr("class","nv-check-box").property("innerHTML",'<path d="M0.5,5 L22.5,5 L22.5,26.5 L0.5,26.5 L0.5,5 Z" class="nv-box"></path><path d="M5.5,12.8618467 L11.9185089,19.2803556 L31,0.198864511" class="nv-check"></path>').attr("transform","translate(-10,-8)scale(0.5)");var A=y.select(".nv-check-box");A.each(function(a,b){d3.select(this).selectAll("path").attr("stroke",q(a,b))})}z.append("text").attr("text-anchor","start").attr("class","nv-legend-text").attr("dy",".32em").attr("dx","8");var B=y.select("text.nv-legend-text");y.on("mouseover",function(a,b){n.legendMouseover(a,b)}).on("mouseout",function(a,b){n.legendMouseout(a,b)}).on("click",function(a,b){n.legendClick(a,b);var c=y.data();if(k){if("classic"==o)l?(c.forEach(function(a){a.disabled=!0}),a.disabled=!1):(a.disabled=!a.disabled,c.every(function(a){return a.disabled})&&c.forEach(function(a){a.disabled=!1}));else if("furious"==o)if(m)a.disengaged=!a.disengaged,a.userDisabled=void 0==a.userDisabled?!!a.disabled:a.userDisabled,a.disabled=a.disengaged||a.userDisabled;else if(!m){a.disabled=!a.disabled,a.userDisabled=a.disabled;var d=c.filter(function(a){return!a.disengaged});d.every(function(a){return a.userDisabled})&&c.forEach(function(a){a.disabled=a.userDisabled=!1})}n.stateChange({disabled:c.map(function(a){return!!a.disabled}),disengaged:c.map(function(a){return!!a.disengaged})})}}).on("dblclick",function(a,b){if(("furious"!=o||!m)&&(n.legendDblclick(a,b),k)){var c=y.data();c.forEach(function(a){a.disabled=!0,"furious"==o&&(a.userDisabled=a.disabled)}),a.disabled=!1,"furious"==o&&(a.userDisabled=a.disabled),n.stateChange({disabled:c.map(function(a){return!!a.disabled})})}}),y.classed("nv-disabled",function(a){return a.userDisabled}),y.exit().remove(),B.attr("fill",q).text(f);var C=0;if(h){var D=[];y.each(function(){var b,c=d3.select(this).select("text");try{if(b=c.node().getComputedTextLength(),0>=b)throw Error()}catch(d){b=a.utils.calcApproxTextWidth(c)}D.push(b+i)});var E=0,F=[];for(C=0;g>C&&E<D.length;)F[E]=D[E],C+=D[E++];for(0===E&&(E=1);C>g&&E>1;){F=[],E--;for(var G=0;G<D.length;G++)D[G]>(F[G%E]||0)&&(F[G%E]=D[G]);C=F.reduce(function(a,b){return a+b})}for(var H=[],I=0,J=0;E>I;I++)H[I]=J,J+=F[I];y.attr("transform",function(a,b){return"translate("+H[b%E]+","+(5+Math.floor(b/E)*x)+")"}),j?v.attr("transform","translate("+(d-c.right-C)+","+c.top+")"):v.attr("transform","translate(0,"+c.top+")"),e=c.top+c.bottom+Math.ceil(D.length/E)*x}else{var K,L=5,M=5,N=0;y.attr("transform",function(){var a=d3.select(this).select("text").node().getComputedTextLength()+i;return K=M,d<c.left+c.right+K+a&&(M=K=5,L+=x),M+=a,M>N&&(N=M),K+N>C&&(C=K+N),"translate("+K+","+L+")"}),v.attr("transform","translate("+(d-c.right-N)+","+c.top+")"),e=c.top+c.bottom+L+15}if("furious"==o){w.attr("width",function(a,b){return B[0][b].getComputedTextLength()+27}).attr("height",18).attr("y",-9).attr("x",-15),u.insert("rect",":first-child").attr("class","nv-legend-bg").attr("fill","#eee").attr("opacity",0);var O=v.select(".nv-legend-bg");O.transition().duration(300).attr("x",-x).attr("width",C+x-12).attr("height",e+10).attr("y",-c.top-10).attr("opacity",m?1:0)}w.style("fill",r).style("fill-opacity",s).style("stroke",r)}),b}var c={top:5,right:0,bottom:5,left:0},d=400,e=20,f=function(a){return a.key},g=a.utils.getColor(),h=!0,i=32,j=!0,k=!0,l=!1,m=!1,n=d3.dispatch("legendClick","legendDblclick","legendMouseover","legendMouseout","stateChange"),o="classic";return b.dispatch=n,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return d},set:function(a){d=a}},height:{get:function(){return e},set:function(a){e=a}},key:{get:function(){return f},set:function(a){f=a}},align:{get:function(){return h},set:function(a){h=a}},rightAlign:{get:function(){return j},set:function(a){j=a}},padding:{get:function(){return i},set:function(a){i=a}},updateState:{get:function(){return k},set:function(a){k=a}},radioButtonMode:{get:function(){return l},set:function(a){l=a}},expanded:{get:function(){return m},set:function(a){m=a}},vers:{get:function(){return o},set:function(a){o=a}},margin:{get:function(){return c},set:function(a){c.top=void 0!==a.top?a.top:c.top,c.right=void 0!==a.right?a.right:c.right,c.bottom=void 0!==a.bottom?a.bottom:c.bottom,c.left=void 0!==a.left?a.left:c.left}},color:{get:function(){return g},set:function(b){g=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.line=function(){"use strict";function b(r){return v.reset(),v.models(e),r.each(function(b){i=d3.select(this);var r=a.utils.availableWidth(g,i,f),s=a.utils.availableHeight(h,i,f);a.utils.initSVG(i),c=e.xScale(),d=e.yScale(),t=t||c,u=u||d;var w=i.selectAll("g.nv-wrap.nv-line").data([b]),x=w.enter().append("g").attr("class","nvd3 nv-wrap nv-line"),y=x.append("defs"),z=x.append("g"),A=w.select("g");z.append("g").attr("class","nv-groups"),z.append("g").attr("class","nv-scatterWrap"),w.attr("transform","translate("+f.left+","+f.top+")"),e.width(r).height(s);var B=w.select(".nv-scatterWrap");B.call(e),y.append("clipPath").attr("id","nv-edge-clip-"+e.id()).append("rect"),w.select("#nv-edge-clip-"+e.id()+" rect").attr("width",r).attr("height",s>0?s:0),A.attr("clip-path",p?"url(#nv-edge-clip-"+e.id()+")":""),B.attr("clip-path",p?"url(#nv-edge-clip-"+e.id()+")":"");var C=w.select(".nv-groups").selectAll(".nv-group").data(function(a){return a},function(a){return a.key});C.enter().append("g").style("stroke-opacity",1e-6).style("stroke-width",function(a){return a.strokeWidth||j}).style("fill-opacity",1e-6),C.exit().remove(),C.attr("class",function(a,b){return(a.classed||"")+" nv-group nv-series-"+b}).classed("hover",function(a){return a.hover}).style("fill",function(a,b){return k(a,b)}).style("stroke",function(a,b){return k(a,b)}),C.watchTransition(v,"line: groups").style("stroke-opacity",1).style("fill-opacity",function(a){return a.fillOpacity||.5});var D=C.selectAll("path.nv-area").data(function(a){return o(a)?[a]:[]});D.enter().append("path").attr("class","nv-area").attr("d",function(b){return d3.svg.area().interpolate(q).defined(n).x(function(b,c){return a.utils.NaNtoZero(t(l(b,c)))}).y0(function(b,c){return a.utils.NaNtoZero(u(m(b,c)))}).y1(function(){return u(d.domain()[0]<=0?d.domain()[1]>=0?0:d.domain()[1]:d.domain()[0])}).apply(this,[b.values])}),C.exit().selectAll("path.nv-area").remove(),D.watchTransition(v,"line: areaPaths").attr("d",function(b){return d3.svg.area().interpolate(q).defined(n).x(function(b,d){return a.utils.NaNtoZero(c(l(b,d)))}).y0(function(b,c){return a.utils.NaNtoZero(d(m(b,c)))}).y1(function(){return d(d.domain()[0]<=0?d.domain()[1]>=0?0:d.domain()[1]:d.domain()[0])}).apply(this,[b.values])});var E=C.selectAll("path.nv-line").data(function(a){return[a.values]});E.enter().append("path").attr("class","nv-line").attr("d",d3.svg.line().interpolate(q).defined(n).x(function(b,c){return a.utils.NaNtoZero(t(l(b,c)))}).y(function(b,c){return a.utils.NaNtoZero(u(m(b,c)))})),E.watchTransition(v,"line: linePaths").attr("d",d3.svg.line().interpolate(q).defined(n).x(function(b,d){return a.utils.NaNtoZero(c(l(b,d)))}).y(function(b,c){return a.utils.NaNtoZero(d(m(b,c)))})),t=c.copy(),u=d.copy()}),v.renderEnd("line immediate"),b}var c,d,e=a.models.scatter(),f={top:0,right:0,bottom:0,left:0},g=960,h=500,i=null,j=1.5,k=a.utils.defaultColor(),l=function(a){return a.x},m=function(a){return a.y},n=function(a,b){return!isNaN(m(a,b))&&null!==m(a,b)},o=function(a){return a.area},p=!1,q="linear",r=250,s=d3.dispatch("elementClick","elementMouseover","elementMouseout","renderEnd");e.pointSize(16).pointDomain([16,256]);var t,u,v=a.utils.renderWatch(s,r);return b.dispatch=s,b.scatter=e,e.dispatch.on("elementClick",function(){s.elementClick.apply(this,arguments)}),e.dispatch.on("elementMouseover",function(){s.elementMouseover.apply(this,arguments)}),e.dispatch.on("elementMouseout",function(){s.elementMouseout.apply(this,arguments)}),b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return g},set:function(a){g=a}},height:{get:function(){return h},set:function(a){h=a}},defined:{get:function(){return n},set:function(a){n=a}},interpolate:{get:function(){return q},set:function(a){q=a}},clipEdge:{get:function(){return p},set:function(a){p=a}},margin:{get:function(){return f},set:function(a){f.top=void 0!==a.top?a.top:f.top,f.right=void 0!==a.right?a.right:f.right,f.bottom=void 0!==a.bottom?a.bottom:f.bottom,f.left=void 0!==a.left?a.left:f.left}},duration:{get:function(){return r},set:function(a){r=a,v.reset(r),e.duration(r)}},isArea:{get:function(){return o},set:function(a){o=d3.functor(a)}},x:{get:function(){return l},set:function(a){l=a,e.x(a)}},y:{get:function(){return m},set:function(a){m=a,e.y(a)}},color:{get:function(){return k},set:function(b){k=a.utils.getColor(b),e.color(k)}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.lineChart=function(){"use strict";function b(j){return y.reset(),y.models(e),p&&y.models(f),q&&y.models(g),j.each(function(j){var v=d3.select(this),y=this;a.utils.initSVG(v);var B=a.utils.availableWidth(m,v,k),C=a.utils.availableHeight(n,v,k);if(b.update=function(){0===x?v.call(b):v.transition().duration(x).call(b)},b.container=this,t.setter(A(j),b.update).getter(z(j)).update(),t.disabled=j.map(function(a){return!!a.disabled}),!u){var D;u={};for(D in t)u[D]=t[D]instanceof Array?t[D].slice(0):t[D]
+}if(!(j&&j.length&&j.filter(function(a){return a.values.length}).length))return a.utils.noData(b,v),b;v.selectAll(".nv-noData").remove(),c=e.xScale(),d=e.yScale();var E=v.selectAll("g.nv-wrap.nv-lineChart").data([j]),F=E.enter().append("g").attr("class","nvd3 nv-wrap nv-lineChart").append("g"),G=E.select("g");F.append("rect").style("opacity",0),F.append("g").attr("class","nv-x nv-axis"),F.append("g").attr("class","nv-y nv-axis"),F.append("g").attr("class","nv-linesWrap"),F.append("g").attr("class","nv-legendWrap"),F.append("g").attr("class","nv-interactive"),G.select("rect").attr("width",B).attr("height",C>0?C:0),o&&(h.width(B),G.select(".nv-legendWrap").datum(j).call(h),k.top!=h.height()&&(k.top=h.height(),C=a.utils.availableHeight(n,v,k)),E.select(".nv-legendWrap").attr("transform","translate(0,"+-k.top+")")),E.attr("transform","translate("+k.left+","+k.top+")"),r&&G.select(".nv-y.nv-axis").attr("transform","translate("+B+",0)"),s&&(i.width(B).height(C).margin({left:k.left,top:k.top}).svgContainer(v).xScale(c),E.select(".nv-interactive").call(i)),e.width(B).height(C).color(j.map(function(a,b){return a.color||l(a,b)}).filter(function(a,b){return!j[b].disabled}));var H=G.select(".nv-linesWrap").datum(j.filter(function(a){return!a.disabled}));H.call(e),p&&(f.scale(c)._ticks(a.utils.calcTicksX(B/100,j)).tickSize(-C,0),G.select(".nv-x.nv-axis").attr("transform","translate(0,"+d.range()[0]+")"),G.select(".nv-x.nv-axis").call(f)),q&&(g.scale(d)._ticks(a.utils.calcTicksY(C/36,j)).tickSize(-B,0),G.select(".nv-y.nv-axis").call(g)),h.dispatch.on("stateChange",function(a){for(var c in a)t[c]=a[c];w.stateChange(t),b.update()}),i.dispatch.on("elementMousemove",function(c){e.clearHighlights();var d,h,m,n=[];if(j.filter(function(a,b){return a.seriesIndex=b,!a.disabled}).forEach(function(f,g){h=a.interactiveBisect(f.values,c.pointXValue,b.x());var i=f.values[h],j=b.y()(i,h);null!=j&&e.highlightPoint(g,h,!0),void 0!==i&&(void 0===d&&(d=i),void 0===m&&(m=b.xScale()(b.x()(i,h))),n.push({key:f.key,value:j,color:l(f,f.seriesIndex)}))}),n.length>2){var o=b.yScale().invert(c.mouseY),p=Math.abs(b.yScale().domain()[0]-b.yScale().domain()[1]),q=.03*p,r=a.nearestValueIndex(n.map(function(a){return a.value}),o,q);null!==r&&(n[r].highlight=!0)}var s=f.tickFormat()(b.x()(d,h));i.tooltip.position({left:c.mouseX+k.left,top:c.mouseY+k.top}).chartContainer(y.parentNode).valueFormatter(function(a){return null==a?"N/A":g.tickFormat()(a)}).data({value:s,index:h,series:n})(),i.renderGuideLine(m)}),i.dispatch.on("elementClick",function(c){var d,f=[];j.filter(function(a,b){return a.seriesIndex=b,!a.disabled}).forEach(function(e){var g=a.interactiveBisect(e.values,c.pointXValue,b.x()),h=e.values[g];if("undefined"!=typeof h){"undefined"==typeof d&&(d=b.xScale()(b.x()(h,g)));var i=b.yScale()(b.y()(h,g));f.push({point:h,pointIndex:g,pos:[d,i],seriesIndex:e.seriesIndex,series:e})}}),e.dispatch.elementClick(f)}),i.dispatch.on("elementMouseout",function(){e.clearHighlights()}),w.on("changeState",function(a){"undefined"!=typeof a.disabled&&j.length===a.disabled.length&&(j.forEach(function(b,c){b.disabled=a.disabled[c]}),t.disabled=a.disabled),b.update()})}),y.renderEnd("lineChart immediate"),b}var c,d,e=a.models.line(),f=a.models.axis(),g=a.models.axis(),h=a.models.legend(),i=a.interactiveGuideline(),j=a.models.tooltip(),k={top:30,right:20,bottom:50,left:60},l=a.utils.defaultColor(),m=null,n=null,o=!0,p=!0,q=!0,r=!1,s=!1,t=a.utils.state(),u=null,v=null,w=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState","renderEnd"),x=250;f.orient("bottom").tickPadding(7),g.orient(r?"right":"left"),j.valueFormatter(function(a,b){return g.tickFormat()(a,b)}).headerFormatter(function(a,b){return f.tickFormat()(a,b)});var y=a.utils.renderWatch(w,x),z=function(a){return function(){return{active:a.map(function(a){return!a.disabled})}}},A=function(a){return function(b){void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}};return e.dispatch.on("elementMouseover.tooltip",function(a){j.data(a).position(a.pos).hidden(!1)}),e.dispatch.on("elementMouseout.tooltip",function(){j.hidden(!0)}),b.dispatch=w,b.lines=e,b.legend=h,b.xAxis=f,b.yAxis=g,b.interactiveLayer=i,b.tooltip=j,b.dispatch=w,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return m},set:function(a){m=a}},height:{get:function(){return n},set:function(a){n=a}},showLegend:{get:function(){return o},set:function(a){o=a}},showXAxis:{get:function(){return p},set:function(a){p=a}},showYAxis:{get:function(){return q},set:function(a){q=a}},defaultState:{get:function(){return u},set:function(a){u=a}},noData:{get:function(){return v},set:function(a){v=a}},tooltips:{get:function(){return j.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),j.enabled(!!b)}},tooltipContent:{get:function(){return j.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),j.contentGenerator(b)}},margin:{get:function(){return k},set:function(a){k.top=void 0!==a.top?a.top:k.top,k.right=void 0!==a.right?a.right:k.right,k.bottom=void 0!==a.bottom?a.bottom:k.bottom,k.left=void 0!==a.left?a.left:k.left}},duration:{get:function(){return x},set:function(a){x=a,y.reset(x),e.duration(x),f.duration(x),g.duration(x)}},color:{get:function(){return l},set:function(b){l=a.utils.getColor(b),h.color(l),e.color(l)}},rightAlignYAxis:{get:function(){return r},set:function(a){r=a,g.orient(r?"right":"left")}},useInteractiveGuideline:{get:function(){return s},set:function(a){s=a,s&&(e.interactive(!1),e.useVoronoi(!1))}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.linePlusBarChart=function(){"use strict";function b(v){return v.each(function(v){function J(a){var b=+("e"==a),c=b?1:-1,d=X/3;return"M"+.5*c+","+d+"A6,6 0 0 "+b+" "+6.5*c+","+(d+6)+"V"+(2*d-6)+"A6,6 0 0 "+b+" "+.5*c+","+2*d+"ZM"+2.5*c+","+(d+8)+"V"+(2*d-8)+"M"+4.5*c+","+(d+8)+"V"+(2*d-8)}function S(){u.empty()||u.extent(I),kb.data([u.empty()?e.domain():I]).each(function(a){var b=e(a[0])-e.range()[0],c=e.range()[1]-e(a[1]);d3.select(this).select(".left").attr("width",0>b?0:b),d3.select(this).select(".right").attr("x",e(a[1])).attr("width",0>c?0:c)})}function T(){I=u.empty()?null:u.extent(),c=u.empty()?e.domain():u.extent(),K.brush({extent:c,brush:u}),S(),l.width(V).height(W).color(v.map(function(a,b){return a.color||C(a,b)}).filter(function(a,b){return!v[b].disabled&&v[b].bar})),j.width(V).height(W).color(v.map(function(a,b){return a.color||C(a,b)}).filter(function(a,b){return!v[b].disabled&&!v[b].bar}));var b=db.select(".nv-focus .nv-barsWrap").datum(Z.length?Z.map(function(a){return{key:a.key,values:a.values.filter(function(a,b){return l.x()(a,b)>=c[0]&&l.x()(a,b)<=c[1]})}}):[{values:[]}]),h=db.select(".nv-focus .nv-linesWrap").datum($[0].disabled?[{values:[]}]:$.map(function(a){return{area:a.area,fillOpacity:a.fillOpacity,key:a.key,values:a.values.filter(function(a,b){return j.x()(a,b)>=c[0]&&j.x()(a,b)<=c[1]})}}));d=Z.length?l.xScale():j.xScale(),n.scale(d)._ticks(a.utils.calcTicksX(V/100,v)).tickSize(-W,0),n.domain([Math.ceil(c[0]),Math.floor(c[1])]),db.select(".nv-x.nv-axis").transition().duration(L).call(n),b.transition().duration(L).call(l),h.transition().duration(L).call(j),db.select(".nv-focus .nv-x.nv-axis").attr("transform","translate(0,"+f.range()[0]+")"),p.scale(f)._ticks(a.utils.calcTicksY(W/36,v)).tickSize(-V,0),q.scale(g)._ticks(a.utils.calcTicksY(W/36,v)).tickSize(Z.length?0:-V,0),db.select(".nv-focus .nv-y1.nv-axis").style("opacity",Z.length?1:0),db.select(".nv-focus .nv-y2.nv-axis").style("opacity",$.length&&!$[0].disabled?1:0).attr("transform","translate("+d.range()[1]+",0)"),db.select(".nv-focus .nv-y1.nv-axis").transition().duration(L).call(p),db.select(".nv-focus .nv-y2.nv-axis").transition().duration(L).call(q)}var U=d3.select(this);a.utils.initSVG(U);var V=a.utils.availableWidth(y,U,w),W=a.utils.availableHeight(z,U,w)-(E?H:0),X=H-x.top-x.bottom;if(b.update=function(){U.transition().duration(L).call(b)},b.container=this,M.setter(R(v),b.update).getter(Q(v)).update(),M.disabled=v.map(function(a){return!!a.disabled}),!N){var Y;N={};for(Y in M)N[Y]=M[Y]instanceof Array?M[Y].slice(0):M[Y]}if(!(v&&v.length&&v.filter(function(a){return a.values.length}).length))return a.utils.noData(b,U),b;U.selectAll(".nv-noData").remove();var Z=v.filter(function(a){return!a.disabled&&a.bar}),$=v.filter(function(a){return!a.bar});d=l.xScale(),e=o.scale(),f=l.yScale(),g=j.yScale(),h=m.yScale(),i=k.yScale();var _=v.filter(function(a){return!a.disabled&&a.bar}).map(function(a){return a.values.map(function(a,b){return{x:A(a,b),y:B(a,b)}})}),ab=v.filter(function(a){return!a.disabled&&!a.bar}).map(function(a){return a.values.map(function(a,b){return{x:A(a,b),y:B(a,b)}})});d.range([0,V]),e.domain(d3.extent(d3.merge(_.concat(ab)),function(a){return a.x})).range([0,V]);var bb=U.selectAll("g.nv-wrap.nv-linePlusBar").data([v]),cb=bb.enter().append("g").attr("class","nvd3 nv-wrap nv-linePlusBar").append("g"),db=bb.select("g");cb.append("g").attr("class","nv-legendWrap");var eb=cb.append("g").attr("class","nv-focus");eb.append("g").attr("class","nv-x nv-axis"),eb.append("g").attr("class","nv-y1 nv-axis"),eb.append("g").attr("class","nv-y2 nv-axis"),eb.append("g").attr("class","nv-barsWrap"),eb.append("g").attr("class","nv-linesWrap");var fb=cb.append("g").attr("class","nv-context");if(fb.append("g").attr("class","nv-x nv-axis"),fb.append("g").attr("class","nv-y1 nv-axis"),fb.append("g").attr("class","nv-y2 nv-axis"),fb.append("g").attr("class","nv-barsWrap"),fb.append("g").attr("class","nv-linesWrap"),fb.append("g").attr("class","nv-brushBackground"),fb.append("g").attr("class","nv-x nv-brush"),D){var gb=t.align()?V/2:V,hb=t.align()?gb:0;t.width(gb),db.select(".nv-legendWrap").datum(v.map(function(a){return a.originalKey=void 0===a.originalKey?a.key:a.originalKey,a.key=a.originalKey+(a.bar?O:P),a})).call(t),w.top!=t.height()&&(w.top=t.height(),W=a.utils.availableHeight(z,U,w)-H),db.select(".nv-legendWrap").attr("transform","translate("+hb+","+-w.top+")")}bb.attr("transform","translate("+w.left+","+w.top+")"),db.select(".nv-context").style("display",E?"initial":"none"),m.width(V).height(X).color(v.map(function(a,b){return a.color||C(a,b)}).filter(function(a,b){return!v[b].disabled&&v[b].bar})),k.width(V).height(X).color(v.map(function(a,b){return a.color||C(a,b)}).filter(function(a,b){return!v[b].disabled&&!v[b].bar}));var ib=db.select(".nv-context .nv-barsWrap").datum(Z.length?Z:[{values:[]}]),jb=db.select(".nv-context .nv-linesWrap").datum($[0].disabled?[{values:[]}]:$);db.select(".nv-context").attr("transform","translate(0,"+(W+w.bottom+x.top)+")"),ib.transition().call(m),jb.transition().call(k),G&&(o._ticks(a.utils.calcTicksX(V/100,v)).tickSize(-X,0),db.select(".nv-context .nv-x.nv-axis").attr("transform","translate(0,"+h.range()[0]+")"),db.select(".nv-context .nv-x.nv-axis").transition().call(o)),F&&(r.scale(h)._ticks(X/36).tickSize(-V,0),s.scale(i)._ticks(X/36).tickSize(Z.length?0:-V,0),db.select(".nv-context .nv-y3.nv-axis").style("opacity",Z.length?1:0).attr("transform","translate(0,"+e.range()[0]+")"),db.select(".nv-context .nv-y2.nv-axis").style("opacity",$.length?1:0).attr("transform","translate("+e.range()[1]+",0)"),db.select(".nv-context .nv-y1.nv-axis").transition().call(r),db.select(".nv-context .nv-y2.nv-axis").transition().call(s)),u.x(e).on("brush",T),I&&u.extent(I);var kb=db.select(".nv-brushBackground").selectAll("g").data([I||u.extent()]),lb=kb.enter().append("g");lb.append("rect").attr("class","left").attr("x",0).attr("y",0).attr("height",X),lb.append("rect").attr("class","right").attr("x",0).attr("y",0).attr("height",X);var mb=db.select(".nv-x.nv-brush").call(u);mb.selectAll("rect").attr("height",X),mb.selectAll(".resize").append("path").attr("d",J),t.dispatch.on("stateChange",function(a){for(var c in a)M[c]=a[c];K.stateChange(M),b.update()}),K.on("changeState",function(a){"undefined"!=typeof a.disabled&&(v.forEach(function(b,c){b.disabled=a.disabled[c]}),M.disabled=a.disabled),b.update()}),T()}),b}var c,d,e,f,g,h,i,j=a.models.line(),k=a.models.line(),l=a.models.historicalBar(),m=a.models.historicalBar(),n=a.models.axis(),o=a.models.axis(),p=a.models.axis(),q=a.models.axis(),r=a.models.axis(),s=a.models.axis(),t=a.models.legend(),u=d3.svg.brush(),v=a.models.tooltip(),w={top:30,right:30,bottom:30,left:60},x={top:0,right:30,bottom:20,left:60},y=null,z=null,A=function(a){return a.x},B=function(a){return a.y},C=a.utils.defaultColor(),D=!0,E=!0,F=!1,G=!0,H=50,I=null,J=null,K=d3.dispatch("brush","stateChange","changeState"),L=0,M=a.utils.state(),N=null,O=" (left axis)",P=" (right axis)";j.clipEdge(!0),k.interactive(!1),k.pointActive(function(){return!1}),n.orient("bottom").tickPadding(5),p.orient("left"),q.orient("right"),o.orient("bottom").tickPadding(5),r.orient("left"),s.orient("right"),v.headerEnabled(!0).headerFormatter(function(a,b){return n.tickFormat()(a,b)});var Q=function(a){return function(){return{active:a.map(function(a){return!a.disabled})}}},R=function(a){return function(b){void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}};return j.dispatch.on("elementMouseover.tooltip",function(a){v.duration(100).valueFormatter(function(a,b){return q.tickFormat()(a,b)}).data(a).position(a.pos).hidden(!1)}),j.dispatch.on("elementMouseout.tooltip",function(){v.hidden(!0)}),l.dispatch.on("elementMouseover.tooltip",function(a){a.value=b.x()(a.data),a.series={value:b.y()(a.data),color:a.color},v.duration(0).valueFormatter(function(a,b){return p.tickFormat()(a,b)}).data(a).hidden(!1)}),l.dispatch.on("elementMouseout.tooltip",function(){v.hidden(!0)}),l.dispatch.on("elementMousemove.tooltip",function(){v.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.dispatch=K,b.legend=t,b.lines=j,b.lines2=k,b.bars=l,b.bars2=m,b.xAxis=n,b.x2Axis=o,b.y1Axis=p,b.y2Axis=q,b.y3Axis=r,b.y4Axis=s,b.tooltip=v,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return y},set:function(a){y=a}},height:{get:function(){return z},set:function(a){z=a}},showLegend:{get:function(){return D},set:function(a){D=a}},brushExtent:{get:function(){return I},set:function(a){I=a}},noData:{get:function(){return J},set:function(a){J=a}},focusEnable:{get:function(){return E},set:function(a){E=a}},focusHeight:{get:function(){return H},set:function(a){H=a}},focusShowAxisX:{get:function(){return G},set:function(a){G=a}},focusShowAxisY:{get:function(){return F},set:function(a){F=a}},legendLeftAxisHint:{get:function(){return O},set:function(a){O=a}},legendRightAxisHint:{get:function(){return P},set:function(a){P=a}},tooltips:{get:function(){return v.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),v.enabled(!!b)}},tooltipContent:{get:function(){return v.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),v.contentGenerator(b)}},margin:{get:function(){return w},set:function(a){w.top=void 0!==a.top?a.top:w.top,w.right=void 0!==a.right?a.right:w.right,w.bottom=void 0!==a.bottom?a.bottom:w.bottom,w.left=void 0!==a.left?a.left:w.left}},focusMargin:{get:function(){return x},set:function(a){x.top=void 0!==a.top?a.top:x.top,x.right=void 0!==a.right?a.right:x.right,x.bottom=void 0!==a.bottom?a.bottom:x.bottom,x.left=void 0!==a.left?a.left:x.left}},duration:{get:function(){return L},set:function(a){L=a}},color:{get:function(){return C},set:function(b){C=a.utils.getColor(b),t.color(C)}},x:{get:function(){return A},set:function(a){A=a,j.x(a),k.x(a),l.x(a),m.x(a)}},y:{get:function(){return B},set:function(a){B=a,j.y(a),k.y(a),l.y(a),m.y(a)}}}),a.utils.inheritOptions(b,j),a.utils.initOptions(b),b},a.models.lineWithFocusChart=function(){"use strict";function b(o){return o.each(function(o){function z(a){var b=+("e"==a),c=b?1:-1,d=M/3;return"M"+.5*c+","+d+"A6,6 0 0 "+b+" "+6.5*c+","+(d+6)+"V"+(2*d-6)+"A6,6 0 0 "+b+" "+.5*c+","+2*d+"ZM"+2.5*c+","+(d+8)+"V"+(2*d-8)+"M"+4.5*c+","+(d+8)+"V"+(2*d-8)}function G(){n.empty()||n.extent(y),U.data([n.empty()?e.domain():y]).each(function(a){var b=e(a[0])-c.range()[0],d=K-e(a[1]);d3.select(this).select(".left").attr("width",0>b?0:b),d3.select(this).select(".right").attr("x",e(a[1])).attr("width",0>d?0:d)})}function H(){y=n.empty()?null:n.extent();var a=n.empty()?e.domain():n.extent();if(!(Math.abs(a[0]-a[1])<=1)){A.brush({extent:a,brush:n}),G();var b=Q.select(".nv-focus .nv-linesWrap").datum(o.filter(function(a){return!a.disabled}).map(function(b){return{key:b.key,area:b.area,values:b.values.filter(function(b,c){return g.x()(b,c)>=a[0]&&g.x()(b,c)<=a[1]})}}));b.transition().duration(B).call(g),Q.select(".nv-focus .nv-x.nv-axis").transition().duration(B).call(i),Q.select(".nv-focus .nv-y.nv-axis").transition().duration(B).call(j)}}var I=d3.select(this),J=this;a.utils.initSVG(I);var K=a.utils.availableWidth(t,I,q),L=a.utils.availableHeight(u,I,q)-v,M=v-r.top-r.bottom;if(b.update=function(){I.transition().duration(B).call(b)},b.container=this,C.setter(F(o),b.update).getter(E(o)).update(),C.disabled=o.map(function(a){return!!a.disabled}),!D){var N;D={};for(N in C)D[N]=C[N]instanceof Array?C[N].slice(0):C[N]}if(!(o&&o.length&&o.filter(function(a){return a.values.length}).length))return a.utils.noData(b,I),b;I.selectAll(".nv-noData").remove(),c=g.xScale(),d=g.yScale(),e=h.xScale(),f=h.yScale();var O=I.selectAll("g.nv-wrap.nv-lineWithFocusChart").data([o]),P=O.enter().append("g").attr("class","nvd3 nv-wrap nv-lineWithFocusChart").append("g"),Q=O.select("g");P.append("g").attr("class","nv-legendWrap");var R=P.append("g").attr("class","nv-focus");R.append("g").attr("class","nv-x nv-axis"),R.append("g").attr("class","nv-y nv-axis"),R.append("g").attr("class","nv-linesWrap"),R.append("g").attr("class","nv-interactive");var S=P.append("g").attr("class","nv-context");S.append("g").attr("class","nv-x nv-axis"),S.append("g").attr("class","nv-y nv-axis"),S.append("g").attr("class","nv-linesWrap"),S.append("g").attr("class","nv-brushBackground"),S.append("g").attr("class","nv-x nv-brush"),x&&(m.width(K),Q.select(".nv-legendWrap").datum(o).call(m),q.top!=m.height()&&(q.top=m.height(),L=a.utils.availableHeight(u,I,q)-v),Q.select(".nv-legendWrap").attr("transform","translate(0,"+-q.top+")")),O.attr("transform","translate("+q.left+","+q.top+")"),w&&(p.width(K).height(L).margin({left:q.left,top:q.top}).svgContainer(I).xScale(c),O.select(".nv-interactive").call(p)),g.width(K).height(L).color(o.map(function(a,b){return a.color||s(a,b)}).filter(function(a,b){return!o[b].disabled})),h.defined(g.defined()).width(K).height(M).color(o.map(function(a,b){return a.color||s(a,b)}).filter(function(a,b){return!o[b].disabled})),Q.select(".nv-context").attr("transform","translate(0,"+(L+q.bottom+r.top)+")");var T=Q.select(".nv-context .nv-linesWrap").datum(o.filter(function(a){return!a.disabled}));d3.transition(T).call(h),i.scale(c)._ticks(a.utils.calcTicksX(K/100,o)).tickSize(-L,0),j.scale(d)._ticks(a.utils.calcTicksY(L/36,o)).tickSize(-K,0),Q.select(".nv-focus .nv-x.nv-axis").attr("transform","translate(0,"+L+")"),n.x(e).on("brush",function(){H()}),y&&n.extent(y);var U=Q.select(".nv-brushBackground").selectAll("g").data([y||n.extent()]),V=U.enter().append("g");V.append("rect").attr("class","left").attr("x",0).attr("y",0).attr("height",M),V.append("rect").attr("class","right").attr("x",0).attr("y",0).attr("height",M);var W=Q.select(".nv-x.nv-brush").call(n);W.selectAll("rect").attr("height",M),W.selectAll(".resize").append("path").attr("d",z),H(),k.scale(e)._ticks(a.utils.calcTicksX(K/100,o)).tickSize(-M,0),Q.select(".nv-context .nv-x.nv-axis").attr("transform","translate(0,"+f.range()[0]+")"),d3.transition(Q.select(".nv-context .nv-x.nv-axis")).call(k),l.scale(f)._ticks(a.utils.calcTicksY(M/36,o)).tickSize(-K,0),d3.transition(Q.select(".nv-context .nv-y.nv-axis")).call(l),Q.select(".nv-context .nv-x.nv-axis").attr("transform","translate(0,"+f.range()[0]+")"),m.dispatch.on("stateChange",function(a){for(var c in a)C[c]=a[c];A.stateChange(C),b.update()}),p.dispatch.on("elementMousemove",function(c){g.clearHighlights();var d,f,h,k=[];if(o.filter(function(a,b){return a.seriesIndex=b,!a.disabled}).forEach(function(i,j){var l=n.empty()?e.domain():n.extent(),m=i.values.filter(function(a,b){return g.x()(a,b)>=l[0]&&g.x()(a,b)<=l[1]});f=a.interactiveBisect(m,c.pointXValue,g.x());var o=m[f],p=b.y()(o,f);null!=p&&g.highlightPoint(j,f,!0),void 0!==o&&(void 0===d&&(d=o),void 0===h&&(h=b.xScale()(b.x()(o,f))),k.push({key:i.key,value:b.y()(o,f),color:s(i,i.seriesIndex)}))}),k.length>2){var l=b.yScale().invert(c.mouseY),m=Math.abs(b.yScale().domain()[0]-b.yScale().domain()[1]),r=.03*m,t=a.nearestValueIndex(k.map(function(a){return a.value}),l,r);null!==t&&(k[t].highlight=!0)}var u=i.tickFormat()(b.x()(d,f));p.tooltip.position({left:c.mouseX+q.left,top:c.mouseY+q.top}).chartContainer(J.parentNode).valueFormatter(function(a){return null==a?"N/A":j.tickFormat()(a)}).data({value:u,index:f,series:k})(),p.renderGuideLine(h)}),p.dispatch.on("elementMouseout",function(){g.clearHighlights()}),A.on("changeState",function(a){"undefined"!=typeof a.disabled&&o.forEach(function(b,c){b.disabled=a.disabled[c]}),b.update()})}),b}var c,d,e,f,g=a.models.line(),h=a.models.line(),i=a.models.axis(),j=a.models.axis(),k=a.models.axis(),l=a.models.axis(),m=a.models.legend(),n=d3.svg.brush(),o=a.models.tooltip(),p=a.interactiveGuideline(),q={top:30,right:30,bottom:30,left:60},r={top:0,right:30,bottom:20,left:60},s=a.utils.defaultColor(),t=null,u=null,v=50,w=!1,x=!0,y=null,z=null,A=d3.dispatch("brush","stateChange","changeState"),B=250,C=a.utils.state(),D=null;g.clipEdge(!0).duration(0),h.interactive(!1),h.pointActive(function(){return!1}),i.orient("bottom").tickPadding(5),j.orient("left"),k.orient("bottom").tickPadding(5),l.orient("left"),o.valueFormatter(function(a,b){return j.tickFormat()(a,b)}).headerFormatter(function(a,b){return i.tickFormat()(a,b)});var E=function(a){return function(){return{active:a.map(function(a){return!a.disabled})}}},F=function(a){return function(b){void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}};return g.dispatch.on("elementMouseover.tooltip",function(a){o.data(a).position(a.pos).hidden(!1)}),g.dispatch.on("elementMouseout.tooltip",function(){o.hidden(!0)}),b.dispatch=A,b.legend=m,b.lines=g,b.lines2=h,b.xAxis=i,b.yAxis=j,b.x2Axis=k,b.y2Axis=l,b.interactiveLayer=p,b.tooltip=o,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return t},set:function(a){t=a}},height:{get:function(){return u},set:function(a){u=a}},focusHeight:{get:function(){return v},set:function(a){v=a}},showLegend:{get:function(){return x},set:function(a){x=a}},brushExtent:{get:function(){return y},set:function(a){y=a}},defaultState:{get:function(){return D},set:function(a){D=a}},noData:{get:function(){return z},set:function(a){z=a}},tooltips:{get:function(){return o.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),o.enabled(!!b)}},tooltipContent:{get:function(){return o.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),o.contentGenerator(b)}},margin:{get:function(){return q},set:function(a){q.top=void 0!==a.top?a.top:q.top,q.right=void 0!==a.right?a.right:q.right,q.bottom=void 0!==a.bottom?a.bottom:q.bottom,q.left=void 0!==a.left?a.left:q.left}},focusMargin:{get:function(){return r},set:function(a){r.top=void 0!==a.top?a.top:r.top,r.right=void 0!==a.right?a.right:r.right,r.bottom=void 0!==a.bottom?a.bottom:r.bottom,r.left=void 0!==a.left?a.left:r.left}},color:{get:function(){return s},set:function(b){s=a.utils.getColor(b),m.color(s)}},interpolate:{get:function(){return g.interpolate()},set:function(a){g.interpolate(a),h.interpolate(a)}},xTickFormat:{get:function(){return i.tickFormat()},set:function(a){i.tickFormat(a),k.tickFormat(a)}},yTickFormat:{get:function(){return j.tickFormat()},set:function(a){j.tickFormat(a),l.tickFormat(a)}},duration:{get:function(){return B},set:function(a){B=a,j.duration(B),l.duration(B),i.duration(B),k.duration(B)}},x:{get:function(){return g.x()},set:function(a){g.x(a),h.x(a)}},y:{get:function(){return g.y()},set:function(a){g.y(a),h.y(a)}},useInteractiveGuideline:{get:function(){return w},set:function(a){w=a,w&&(g.interactive(!1),g.useVoronoi(!1))}}}),a.utils.inheritOptions(b,g),a.utils.initOptions(b),b},a.models.multiBar=function(){"use strict";function b(G){return E.reset(),G.each(function(b){var G=k-j.left-j.right,H=l-j.top-j.bottom;p=d3.select(this),a.utils.initSVG(p);var I=0;if(z&&b.length&&(z=[{values:b[0].values.map(function(a){return{x:a.x,y:0,series:a.series,size:.01}})}]),v){var J=d3.layout.stack().offset(w).values(function(a){return a.values}).y(r)(!b.length&&z?z:b);J.forEach(function(a,c){a.nonStackable?(b[c].nonStackableSeries=I++,J[c]=b[c]):c>0&&J[c-1].nonStackable&&J[c].values.map(function(a,b){a.y0-=J[c-1].values[b].y,a.y1=a.y0+a.y})}),b=J}b.forEach(function(a,b){a.values.forEach(function(c){c.series=b,c.key=a.key})}),v&&b[0].values.map(function(a,c){var d=0,e=0;b.map(function(a,f){if(!b[f].nonStackable){var g=a.values[c];g.size=Math.abs(g.y),g.y<0?(g.y1=e,e-=g.size):(g.y1=g.size+d,d+=g.size)}})});var K=d&&e?[]:b.map(function(a,b){return a.values.map(function(a,c){return{x:q(a,c),y:r(a,c),y0:a.y0,y1:a.y1,idx:b,yErr:s(a,c)}})});m.domain(d||d3.merge(K).map(function(a){return a.x})).rangeBands(f||[0,G],C),n.domain(e||d3.extent(d3.merge(d3.merge(K).map(function(a){var c=a.y;v&&!b[a.idx].nonStackable&&(c=a.y>0?a.y1:a.y1+a.y);var d=a.yErr;return d?d.length?[c+d[0],c+d[1]]:(d=Math.abs(d),[c-d,c+d]):[c]})).concat(t))).range(g||[H,0]),m.domain()[0]===m.domain()[1]&&m.domain(m.domain()[0]?[m.domain()[0]-.01*m.domain()[0],m.domain()[1]+.01*m.domain()[1]]:[-1,1]),n.domain()[0]===n.domain()[1]&&n.domain(n.domain()[0]?[n.domain()[0]+.01*n.domain()[0],n.domain()[1]-.01*n.domain()[1]]:[-1,1]),h=h||m,i=i||n;var L=p.selectAll("g.nv-wrap.nv-multibar").data([b]),M=L.enter().append("g").attr("class","nvd3 nv-wrap nv-multibar"),N=M.append("defs"),O=M.append("g"),P=L.select("g");O.append("g").attr("class","nv-groups"),L.attr("transform","translate("+j.left+","+j.top+")"),N.append("clipPath").attr("id","nv-edge-clip-"+o).append("rect"),L.select("#nv-edge-clip-"+o+" rect").attr("width",G).attr("height",H),P.attr("clip-path",u?"url(#nv-edge-clip-"+o+")":"");var Q=L.select(".nv-groups").selectAll(".nv-group").data(function(a){return a},function(a,b){return b});Q.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6);var R=E.transition(Q.exit().selectAll("g.nv-bar"),"multibarExit",Math.min(100,B)).attr("y",function(a){var c=i(0)||0;return v&&b[a.series]&&!b[a.series].nonStackable&&(c=i(a.y0)),c}).attr("height",0).remove();R.delay&&R.delay(function(a,b){var c=b*(B/(F+1))-b;return c}),Q.attr("class",function(a,b){return"nv-group nv-series-"+b}).classed("hover",function(a){return a.hover}).style("fill",function(a,b){return x(a,b)}).style("stroke",function(a,b){return x(a,b)}),Q.style("stroke-opacity",1).style("fill-opacity",.75);var S=Q.selectAll("g.nv-bar").data(function(a){return z&&!b.length?z.values:a.values});S.exit().remove();var T=S.enter().append("g").attr("class",function(a,b){return r(a,b)<0?"nv-bar negative":"nv-bar positive"}).attr("transform",function(a,c,d){var e=v&&!b[d].nonStackable?0:d*m.rangeBand()/b.length,f=i(v&&!b[d].nonStackable?a.y0:0)||0;return"translate("+e+","+f+")"});T.append("rect").attr("height",0).attr("width",function(a,c,d){return m.rangeBand()/(v&&!b[d].nonStackable?1:b.length)}).style("fill",function(a,b,c){return x(a,c,b)}).style("stroke",function(a,b,c){return x(a,c,b)}),S.on("mouseover",function(a,b){d3.select(this).classed("hover",!0),D.elementMouseover({data:a,index:b,color:d3.select(this).style("fill")})}).on("mouseout",function(a,b){d3.select(this).classed("hover",!1),D.elementMouseout({data:a,index:b,color:d3.select(this).style("fill")})}).on("mousemove",function(a,b){D.elementMousemove({data:a,index:b,color:d3.select(this).style("fill")})}).on("click",function(a,b){D.elementClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation()}).on("dblclick",function(a,b){D.elementDblClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation()}),s(b[0].values[0],0)&&(T.append("polyline"),S.select("polyline").attr("fill","none").attr("stroke",function(a,b,c){return y(a,c,b)}).attr("points",function(a,c){var d=s(a,c),e=.8*m.rangeBand()/(2*(v?1:b.length));d=d.length?d:[-Math.abs(d),Math.abs(d)],d=d.map(function(a){return n(a)-n(0)});var f=[[-e,d[0]],[e,d[0]],[0,d[0]],[0,d[1]],[-e,d[1]],[e,d[1]]];return f.map(function(a){return a.join(",")}).join(" ")}).attr("transform",function(a,c){var d=m.rangeBand()/(2*(v?1:b.length)),e=r(a,c)<0?n(r(a,c))-n(0):0;return"translate("+d+", "+e+")"})),S.attr("class",function(a,b){return r(a,b)<0?"nv-bar negative":"nv-bar positive"}),A&&(c||(c=b.map(function(){return!0})),S.select("rect").style("fill",function(a,b,d){return d3.rgb(A(a,b)).darker(c.map(function(a,b){return b}).filter(function(a,b){return!c[b]})[d]).toString()}).style("stroke",function(a,b,d){return d3.rgb(A(a,b)).darker(c.map(function(a,b){return b}).filter(function(a,b){return!c[b]})[d]).toString()}));var U=S.watchTransition(E,"multibar",Math.min(250,B)).delay(function(a,c){return c*B/b[0].values.length});v?U.attr("transform",function(a,c,d){var e=0;e=b[d].nonStackable?r(a,c)<0?n(0):n(0)-n(r(a,c))<-1?n(0)-1:n(r(a,c))||0:n(a.y1);var f=0;b[d].nonStackable&&(f=a.series*m.rangeBand()/b.length,b.length!==I&&(f=b[d].nonStackableSeries*m.rangeBand()/(2*I)));var g=f+m(q(a,c));return"translate("+g+","+e+")"}).select("rect").attr("height",function(a,c,d){return b[d].nonStackable?Math.max(Math.abs(n(r(a,c))-n(0)),1)||0:Math.max(Math.abs(n(a.y+a.y0)-n(a.y0)),1)}).attr("width",function(a,c,d){if(b[d].nonStackable){var e=m.rangeBand()/I;return b.length!==I&&(e=m.rangeBand()/(2*I)),e}return m.rangeBand()}):U.attr("transform",function(a,c){var d=a.series*m.rangeBand()/b.length+m(q(a,c)),e=r(a,c)<0?n(0):n(0)-n(r(a,c))<1?n(0)-1:n(r(a,c))||0;return"translate("+d+","+e+")"}).select("rect").attr("width",m.rangeBand()/b.length).attr("height",function(a,b){return Math.max(Math.abs(n(r(a,b))-n(0)),1)||0}),h=m.copy(),i=n.copy(),b[0]&&b[0].values&&(F=b[0].values.length)}),E.renderEnd("multibar immediate"),b}var c,d,e,f,g,h,i,j={top:0,right:0,bottom:0,left:0},k=960,l=500,m=d3.scale.ordinal(),n=d3.scale.linear(),o=Math.floor(1e4*Math.random()),p=null,q=function(a){return a.x},r=function(a){return a.y},s=function(a){return a.yErr},t=[0],u=!0,v=!1,w="zero",x=a.utils.defaultColor(),y=a.utils.defaultColor(),z=!1,A=null,B=500,C=.1,D=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout","elementMousemove","renderEnd"),E=a.utils.renderWatch(D,B),F=0;return b.dispatch=D,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return k},set:function(a){k=a}},height:{get:function(){return l},set:function(a){l=a}},x:{get:function(){return q},set:function(a){q=a}},y:{get:function(){return r},set:function(a){r=a}},yErr:{get:function(){return s},set:function(a){s=a}},xScale:{get:function(){return m},set:function(a){m=a}},yScale:{get:function(){return n},set:function(a){n=a}},xDomain:{get:function(){return d},set:function(a){d=a}},yDomain:{get:function(){return e},set:function(a){e=a}},xRange:{get:function(){return f},set:function(a){f=a}},yRange:{get:function(){return g},set:function(a){g=a}},forceY:{get:function(){return t},set:function(a){t=a}},stacked:{get:function(){return v},set:function(a){v=a}},stackOffset:{get:function(){return w},set:function(a){w=a}},clipEdge:{get:function(){return u},set:function(a){u=a}},disabled:{get:function(){return c},set:function(a){c=a}},id:{get:function(){return o},set:function(a){o=a}},hideable:{get:function(){return z
+},set:function(a){z=a}},groupSpacing:{get:function(){return C},set:function(a){C=a}},margin:{get:function(){return j},set:function(a){j.top=void 0!==a.top?a.top:j.top,j.right=void 0!==a.right?a.right:j.right,j.bottom=void 0!==a.bottom?a.bottom:j.bottom,j.left=void 0!==a.left?a.left:j.left}},duration:{get:function(){return B},set:function(a){B=a,E.reset(B)}},color:{get:function(){return x},set:function(b){x=a.utils.getColor(b)}},barColor:{get:function(){return A},set:function(b){A=b?a.utils.getColor(b):null}},errorBarColor:{get:function(){return y},set:function(b){y=b?a.utils.getColor(b):null}}}),a.utils.initOptions(b),b},a.models.multiBarChart=function(){"use strict";function b(j){return D.reset(),D.models(e),r&&D.models(f),s&&D.models(g),j.each(function(j){var z=d3.select(this);a.utils.initSVG(z);var D=a.utils.availableWidth(l,z,k),H=a.utils.availableHeight(m,z,k);if(b.update=function(){0===C?z.call(b):z.transition().duration(C).call(b)},b.container=this,x.setter(G(j),b.update).getter(F(j)).update(),x.disabled=j.map(function(a){return!!a.disabled}),!y){var I;y={};for(I in x)y[I]=x[I]instanceof Array?x[I].slice(0):x[I]}if(!(j&&j.length&&j.filter(function(a){return a.values.length}).length))return a.utils.noData(b,z),b;z.selectAll(".nv-noData").remove(),c=e.xScale(),d=e.yScale();var J=z.selectAll("g.nv-wrap.nv-multiBarWithLegend").data([j]),K=J.enter().append("g").attr("class","nvd3 nv-wrap nv-multiBarWithLegend").append("g"),L=J.select("g");if(K.append("g").attr("class","nv-x nv-axis"),K.append("g").attr("class","nv-y nv-axis"),K.append("g").attr("class","nv-barsWrap"),K.append("g").attr("class","nv-legendWrap"),K.append("g").attr("class","nv-controlsWrap"),q&&(h.width(D-B()),L.select(".nv-legendWrap").datum(j).call(h),k.top!=h.height()&&(k.top=h.height(),H=a.utils.availableHeight(m,z,k)),L.select(".nv-legendWrap").attr("transform","translate("+B()+","+-k.top+")")),o){var M=[{key:p.grouped||"Grouped",disabled:e.stacked()},{key:p.stacked||"Stacked",disabled:!e.stacked()}];i.width(B()).color(["#444","#444","#444"]),L.select(".nv-controlsWrap").datum(M).attr("transform","translate(0,"+-k.top+")").call(i)}J.attr("transform","translate("+k.left+","+k.top+")"),t&&L.select(".nv-y.nv-axis").attr("transform","translate("+D+",0)"),e.disabled(j.map(function(a){return a.disabled})).width(D).height(H).color(j.map(function(a,b){return a.color||n(a,b)}).filter(function(a,b){return!j[b].disabled}));var N=L.select(".nv-barsWrap").datum(j.filter(function(a){return!a.disabled}));if(N.call(e),r){f.scale(c)._ticks(a.utils.calcTicksX(D/100,j)).tickSize(-H,0),L.select(".nv-x.nv-axis").attr("transform","translate(0,"+d.range()[0]+")"),L.select(".nv-x.nv-axis").call(f);var O=L.select(".nv-x.nv-axis > g").selectAll("g");if(O.selectAll("line, text").style("opacity",1),v){var P=function(a,b){return"translate("+a+","+b+")"},Q=5,R=17;O.selectAll("text").attr("transform",function(a,b,c){return P(0,c%2==0?Q:R)});var S=d3.selectAll(".nv-x.nv-axis .nv-wrap g g text")[0].length;L.selectAll(".nv-x.nv-axis .nv-axisMaxMin text").attr("transform",function(a,b){return P(0,0===b||S%2!==0?R:Q)})}u&&O.filter(function(a,b){return b%Math.ceil(j[0].values.length/(D/100))!==0}).selectAll("text, line").style("opacity",0),w&&O.selectAll(".tick text").attr("transform","rotate("+w+" 0,0)").style("text-anchor",w>0?"start":"end"),L.select(".nv-x.nv-axis").selectAll("g.nv-axisMaxMin text").style("opacity",1)}s&&(g.scale(d)._ticks(a.utils.calcTicksY(H/36,j)).tickSize(-D,0),L.select(".nv-y.nv-axis").call(g)),h.dispatch.on("stateChange",function(a){for(var c in a)x[c]=a[c];A.stateChange(x),b.update()}),i.dispatch.on("legendClick",function(a){if(a.disabled){switch(M=M.map(function(a){return a.disabled=!0,a}),a.disabled=!1,a.key){case"Grouped":case p.grouped:e.stacked(!1);break;case"Stacked":case p.stacked:e.stacked(!0)}x.stacked=e.stacked(),A.stateChange(x),b.update()}}),A.on("changeState",function(a){"undefined"!=typeof a.disabled&&(j.forEach(function(b,c){b.disabled=a.disabled[c]}),x.disabled=a.disabled),"undefined"!=typeof a.stacked&&(e.stacked(a.stacked),x.stacked=a.stacked,E=a.stacked),b.update()})}),D.renderEnd("multibarchart immediate"),b}var c,d,e=a.models.multiBar(),f=a.models.axis(),g=a.models.axis(),h=a.models.legend(),i=a.models.legend(),j=a.models.tooltip(),k={top:30,right:20,bottom:50,left:60},l=null,m=null,n=a.utils.defaultColor(),o=!0,p={},q=!0,r=!0,s=!0,t=!1,u=!0,v=!1,w=0,x=a.utils.state(),y=null,z=null,A=d3.dispatch("stateChange","changeState","renderEnd"),B=function(){return o?180:0},C=250;x.stacked=!1,e.stacked(!1),f.orient("bottom").tickPadding(7).showMaxMin(!1).tickFormat(function(a){return a}),g.orient(t?"right":"left").tickFormat(d3.format(",.1f")),j.duration(0).valueFormatter(function(a,b){return g.tickFormat()(a,b)}).headerFormatter(function(a,b){return f.tickFormat()(a,b)}),i.updateState(!1);var D=a.utils.renderWatch(A),E=!1,F=function(a){return function(){return{active:a.map(function(a){return!a.disabled}),stacked:E}}},G=function(a){return function(b){void 0!==b.stacked&&(E=b.stacked),void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}};return e.dispatch.on("elementMouseover.tooltip",function(a){a.value=b.x()(a.data),a.series={key:a.data.key,value:b.y()(a.data),color:a.color},j.data(a).hidden(!1)}),e.dispatch.on("elementMouseout.tooltip",function(){j.hidden(!0)}),e.dispatch.on("elementMousemove.tooltip",function(){j.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.dispatch=A,b.multibar=e,b.legend=h,b.controls=i,b.xAxis=f,b.yAxis=g,b.state=x,b.tooltip=j,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return l},set:function(a){l=a}},height:{get:function(){return m},set:function(a){m=a}},showLegend:{get:function(){return q},set:function(a){q=a}},showControls:{get:function(){return o},set:function(a){o=a}},controlLabels:{get:function(){return p},set:function(a){p=a}},showXAxis:{get:function(){return r},set:function(a){r=a}},showYAxis:{get:function(){return s},set:function(a){s=a}},defaultState:{get:function(){return y},set:function(a){y=a}},noData:{get:function(){return z},set:function(a){z=a}},reduceXTicks:{get:function(){return u},set:function(a){u=a}},rotateLabels:{get:function(){return w},set:function(a){w=a}},staggerLabels:{get:function(){return v},set:function(a){v=a}},tooltips:{get:function(){return j.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),j.enabled(!!b)}},tooltipContent:{get:function(){return j.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),j.contentGenerator(b)}},margin:{get:function(){return k},set:function(a){k.top=void 0!==a.top?a.top:k.top,k.right=void 0!==a.right?a.right:k.right,k.bottom=void 0!==a.bottom?a.bottom:k.bottom,k.left=void 0!==a.left?a.left:k.left}},duration:{get:function(){return C},set:function(a){C=a,e.duration(C),f.duration(C),g.duration(C),D.reset(C)}},color:{get:function(){return n},set:function(b){n=a.utils.getColor(b),h.color(n)}},rightAlignYAxis:{get:function(){return t},set:function(a){t=a,g.orient(t?"right":"left")}},barColor:{get:function(){return e.barColor},set:function(a){e.barColor(a),h.color(function(a,b){return d3.rgb("#ccc").darker(1.5*b).toString()})}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.multiBarHorizontal=function(){"use strict";function b(m){return F.reset(),m.each(function(b){var m=k-j.left-j.right,D=l-j.top-j.bottom;n=d3.select(this),a.utils.initSVG(n),x&&(b=d3.layout.stack().offset("zero").values(function(a){return a.values}).y(r)(b)),b.forEach(function(a,b){a.values.forEach(function(c){c.series=b,c.key=a.key})}),x&&b[0].values.map(function(a,c){var d=0,e=0;b.map(function(a){var b=a.values[c];b.size=Math.abs(b.y),b.y<0?(b.y1=e-b.size,e-=b.size):(b.y1=d,d+=b.size)})});var G=d&&e?[]:b.map(function(a){return a.values.map(function(a,b){return{x:q(a,b),y:r(a,b),y0:a.y0,y1:a.y1,yErr:s(a,b)}})});o.domain(d||d3.merge(G).map(function(a){return a.x})).rangeBands(f||[0,D],B),p.domain(e||d3.extent(d3.merge(d3.merge(G).map(function(a){var b=a.y;x&&(b=a.y>0?a.y1+a.y:a.y1);var c=a.yErr;return c?c.length?[b+c[0],b+c[1]]:(c=Math.abs(c),[b-c,b+c]):[b]})).concat(t))),p.range(y&&!x?g||[p.domain()[0]<0?A:0,m-(p.domain()[1]>0?A:0)]:g||[0,m]),h=h||o,i=i||d3.scale.linear().domain(p.domain()).range([p(0),p(0)]);{var H=d3.select(this).selectAll("g.nv-wrap.nv-multibarHorizontal").data([b]),I=H.enter().append("g").attr("class","nvd3 nv-wrap nv-multibarHorizontal"),J=(I.append("defs"),I.append("g"));H.select("g")}J.append("g").attr("class","nv-groups"),H.attr("transform","translate("+j.left+","+j.top+")");var K=H.select(".nv-groups").selectAll(".nv-group").data(function(a){return a},function(a,b){return b});K.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),K.exit().watchTransition(F,"multibarhorizontal: exit groups").style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),K.attr("class",function(a,b){return"nv-group nv-series-"+b}).classed("hover",function(a){return a.hover}).style("fill",function(a,b){return u(a,b)}).style("stroke",function(a,b){return u(a,b)}),K.watchTransition(F,"multibarhorizontal: groups").style("stroke-opacity",1).style("fill-opacity",.75);var L=K.selectAll("g.nv-bar").data(function(a){return a.values});L.exit().remove();var M=L.enter().append("g").attr("transform",function(a,c,d){return"translate("+i(x?a.y0:0)+","+(x?0:d*o.rangeBand()/b.length+o(q(a,c)))+")"});M.append("rect").attr("width",0).attr("height",o.rangeBand()/(x?1:b.length)),L.on("mouseover",function(a,b){d3.select(this).classed("hover",!0),E.elementMouseover({data:a,index:b,color:d3.select(this).style("fill")})}).on("mouseout",function(a,b){d3.select(this).classed("hover",!1),E.elementMouseout({data:a,index:b,color:d3.select(this).style("fill")})}).on("mouseout",function(a,b){E.elementMouseout({data:a,index:b,color:d3.select(this).style("fill")})}).on("mousemove",function(a,b){E.elementMousemove({data:a,index:b,color:d3.select(this).style("fill")})}).on("click",function(a,b){E.elementClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation()}).on("dblclick",function(a,b){E.elementDblClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation()}),s(b[0].values[0],0)&&(M.append("polyline"),L.select("polyline").attr("fill","none").attr("stroke",function(a,b,c){return w(a,c,b)}).attr("points",function(a,c){var d=s(a,c),e=.8*o.rangeBand()/(2*(x?1:b.length));d=d.length?d:[-Math.abs(d),Math.abs(d)],d=d.map(function(a){return p(a)-p(0)});var f=[[d[0],-e],[d[0],e],[d[0],0],[d[1],0],[d[1],-e],[d[1],e]];return f.map(function(a){return a.join(",")}).join(" ")}).attr("transform",function(a,c){var d=o.rangeBand()/(2*(x?1:b.length));return"translate("+(r(a,c)<0?0:p(r(a,c))-p(0))+", "+d+")"})),M.append("text"),y&&!x?(L.select("text").attr("text-anchor",function(a,b){return r(a,b)<0?"end":"start"}).attr("y",o.rangeBand()/(2*b.length)).attr("dy",".32em").text(function(a,b){var c=C(r(a,b)),d=s(a,b);return void 0===d?c:d.length?c+"+"+C(Math.abs(d[1]))+"-"+C(Math.abs(d[0])):c+"±"+C(Math.abs(d))}),L.watchTransition(F,"multibarhorizontal: bars").select("text").attr("x",function(a,b){return r(a,b)<0?-4:p(r(a,b))-p(0)+4})):L.selectAll("text").text(""),z&&!x?(M.append("text").classed("nv-bar-label",!0),L.select("text.nv-bar-label").attr("text-anchor",function(a,b){return r(a,b)<0?"start":"end"}).attr("y",o.rangeBand()/(2*b.length)).attr("dy",".32em").text(function(a,b){return q(a,b)}),L.watchTransition(F,"multibarhorizontal: bars").select("text.nv-bar-label").attr("x",function(a,b){return r(a,b)<0?p(0)-p(r(a,b))+4:-4})):L.selectAll("text.nv-bar-label").text(""),L.attr("class",function(a,b){return r(a,b)<0?"nv-bar negative":"nv-bar positive"}),v&&(c||(c=b.map(function(){return!0})),L.style("fill",function(a,b,d){return d3.rgb(v(a,b)).darker(c.map(function(a,b){return b}).filter(function(a,b){return!c[b]})[d]).toString()}).style("stroke",function(a,b,d){return d3.rgb(v(a,b)).darker(c.map(function(a,b){return b}).filter(function(a,b){return!c[b]})[d]).toString()})),x?L.watchTransition(F,"multibarhorizontal: bars").attr("transform",function(a,b){return"translate("+p(a.y1)+","+o(q(a,b))+")"}).select("rect").attr("width",function(a,b){return Math.abs(p(r(a,b)+a.y0)-p(a.y0))}).attr("height",o.rangeBand()):L.watchTransition(F,"multibarhorizontal: bars").attr("transform",function(a,c){return"translate("+p(r(a,c)<0?r(a,c):0)+","+(a.series*o.rangeBand()/b.length+o(q(a,c)))+")"}).select("rect").attr("height",o.rangeBand()/b.length).attr("width",function(a,b){return Math.max(Math.abs(p(r(a,b))-p(0)),1)}),h=o.copy(),i=p.copy()}),F.renderEnd("multibarHorizontal immediate"),b}var c,d,e,f,g,h,i,j={top:0,right:0,bottom:0,left:0},k=960,l=500,m=Math.floor(1e4*Math.random()),n=null,o=d3.scale.ordinal(),p=d3.scale.linear(),q=function(a){return a.x},r=function(a){return a.y},s=function(a){return a.yErr},t=[0],u=a.utils.defaultColor(),v=null,w=a.utils.defaultColor(),x=!1,y=!1,z=!1,A=60,B=.1,C=d3.format(",.2f"),D=250,E=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout","elementMousemove","renderEnd"),F=a.utils.renderWatch(E,D);return b.dispatch=E,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return k},set:function(a){k=a}},height:{get:function(){return l},set:function(a){l=a}},x:{get:function(){return q},set:function(a){q=a}},y:{get:function(){return r},set:function(a){r=a}},yErr:{get:function(){return s},set:function(a){s=a}},xScale:{get:function(){return o},set:function(a){o=a}},yScale:{get:function(){return p},set:function(a){p=a}},xDomain:{get:function(){return d},set:function(a){d=a}},yDomain:{get:function(){return e},set:function(a){e=a}},xRange:{get:function(){return f},set:function(a){f=a}},yRange:{get:function(){return g},set:function(a){g=a}},forceY:{get:function(){return t},set:function(a){t=a}},stacked:{get:function(){return x},set:function(a){x=a}},showValues:{get:function(){return y},set:function(a){y=a}},disabled:{get:function(){return c},set:function(a){c=a}},id:{get:function(){return m},set:function(a){m=a}},valueFormat:{get:function(){return C},set:function(a){C=a}},valuePadding:{get:function(){return A},set:function(a){A=a}},groupSpacing:{get:function(){return B},set:function(a){B=a}},margin:{get:function(){return j},set:function(a){j.top=void 0!==a.top?a.top:j.top,j.right=void 0!==a.right?a.right:j.right,j.bottom=void 0!==a.bottom?a.bottom:j.bottom,j.left=void 0!==a.left?a.left:j.left}},duration:{get:function(){return D},set:function(a){D=a,F.reset(D)}},color:{get:function(){return u},set:function(b){u=a.utils.getColor(b)}},barColor:{get:function(){return v},set:function(b){v=b?a.utils.getColor(b):null}},errorBarColor:{get:function(){return w},set:function(b){w=b?a.utils.getColor(b):null}}}),a.utils.initOptions(b),b},a.models.multiBarHorizontalChart=function(){"use strict";function b(j){return C.reset(),C.models(e),r&&C.models(f),s&&C.models(g),j.each(function(j){var w=d3.select(this);a.utils.initSVG(w);var C=a.utils.availableWidth(l,w,k),D=a.utils.availableHeight(m,w,k);if(b.update=function(){w.transition().duration(z).call(b)},b.container=this,t=e.stacked(),u.setter(B(j),b.update).getter(A(j)).update(),u.disabled=j.map(function(a){return!!a.disabled}),!v){var E;v={};for(E in u)v[E]=u[E]instanceof Array?u[E].slice(0):u[E]}if(!(j&&j.length&&j.filter(function(a){return a.values.length}).length))return a.utils.noData(b,w),b;w.selectAll(".nv-noData").remove(),c=e.xScale(),d=e.yScale();var F=w.selectAll("g.nv-wrap.nv-multiBarHorizontalChart").data([j]),G=F.enter().append("g").attr("class","nvd3 nv-wrap nv-multiBarHorizontalChart").append("g"),H=F.select("g");if(G.append("g").attr("class","nv-x nv-axis"),G.append("g").attr("class","nv-y nv-axis").append("g").attr("class","nv-zeroLine").append("line"),G.append("g").attr("class","nv-barsWrap"),G.append("g").attr("class","nv-legendWrap"),G.append("g").attr("class","nv-controlsWrap"),q&&(h.width(C-y()),H.select(".nv-legendWrap").datum(j).call(h),k.top!=h.height()&&(k.top=h.height(),D=a.utils.availableHeight(m,w,k)),H.select(".nv-legendWrap").attr("transform","translate("+y()+","+-k.top+")")),o){var I=[{key:p.grouped||"Grouped",disabled:e.stacked()},{key:p.stacked||"Stacked",disabled:!e.stacked()}];i.width(y()).color(["#444","#444","#444"]),H.select(".nv-controlsWrap").datum(I).attr("transform","translate(0,"+-k.top+")").call(i)}F.attr("transform","translate("+k.left+","+k.top+")"),e.disabled(j.map(function(a){return a.disabled})).width(C).height(D).color(j.map(function(a,b){return a.color||n(a,b)}).filter(function(a,b){return!j[b].disabled}));var J=H.select(".nv-barsWrap").datum(j.filter(function(a){return!a.disabled}));if(J.transition().call(e),r){f.scale(c)._ticks(a.utils.calcTicksY(D/24,j)).tickSize(-C,0),H.select(".nv-x.nv-axis").call(f);var K=H.select(".nv-x.nv-axis").selectAll("g");K.selectAll("line, text")}s&&(g.scale(d)._ticks(a.utils.calcTicksX(C/100,j)).tickSize(-D,0),H.select(".nv-y.nv-axis").attr("transform","translate(0,"+D+")"),H.select(".nv-y.nv-axis").call(g)),H.select(".nv-zeroLine line").attr("x1",d(0)).attr("x2",d(0)).attr("y1",0).attr("y2",-D),h.dispatch.on("stateChange",function(a){for(var c in a)u[c]=a[c];x.stateChange(u),b.update()}),i.dispatch.on("legendClick",function(a){if(a.disabled){switch(I=I.map(function(a){return a.disabled=!0,a}),a.disabled=!1,a.key){case"Grouped":e.stacked(!1);break;case"Stacked":e.stacked(!0)}u.stacked=e.stacked(),x.stateChange(u),t=e.stacked(),b.update()}}),x.on("changeState",function(a){"undefined"!=typeof a.disabled&&(j.forEach(function(b,c){b.disabled=a.disabled[c]}),u.disabled=a.disabled),"undefined"!=typeof a.stacked&&(e.stacked(a.stacked),u.stacked=a.stacked,t=a.stacked),b.update()})}),C.renderEnd("multibar horizontal chart immediate"),b}var c,d,e=a.models.multiBarHorizontal(),f=a.models.axis(),g=a.models.axis(),h=a.models.legend().height(30),i=a.models.legend().height(30),j=a.models.tooltip(),k={top:30,right:20,bottom:50,left:60},l=null,m=null,n=a.utils.defaultColor(),o=!0,p={},q=!0,r=!0,s=!0,t=!1,u=a.utils.state(),v=null,w=null,x=d3.dispatch("stateChange","changeState","renderEnd"),y=function(){return o?180:0},z=250;u.stacked=!1,e.stacked(t),f.orient("left").tickPadding(5).showMaxMin(!1).tickFormat(function(a){return a}),g.orient("bottom").tickFormat(d3.format(",.1f")),j.duration(0).valueFormatter(function(a,b){return g.tickFormat()(a,b)}).headerFormatter(function(a,b){return f.tickFormat()(a,b)}),i.updateState(!1);var A=function(a){return function(){return{active:a.map(function(a){return!a.disabled}),stacked:t}}},B=function(a){return function(b){void 0!==b.stacked&&(t=b.stacked),void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}},C=a.utils.renderWatch(x,z);return e.dispatch.on("elementMouseover.tooltip",function(a){a.value=b.x()(a.data),a.series={key:a.data.key,value:b.y()(a.data),color:a.color},j.data(a).hidden(!1)}),e.dispatch.on("elementMouseout.tooltip",function(){j.hidden(!0)}),e.dispatch.on("elementMousemove.tooltip",function(){j.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.dispatch=x,b.multibar=e,b.legend=h,b.controls=i,b.xAxis=f,b.yAxis=g,b.state=u,b.tooltip=j,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return l},set:function(a){l=a}},height:{get:function(){return m},set:function(a){m=a}},showLegend:{get:function(){return q},set:function(a){q=a}},showControls:{get:function(){return o},set:function(a){o=a}},controlLabels:{get:function(){return p},set:function(a){p=a}},showXAxis:{get:function(){return r},set:function(a){r=a}},showYAxis:{get:function(){return s},set:function(a){s=a}},defaultState:{get:function(){return v},set:function(a){v=a}},noData:{get:function(){return w},set:function(a){w=a}},tooltips:{get:function(){return j.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),j.enabled(!!b)}},tooltipContent:{get:function(){return j.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),j.contentGenerator(b)}},margin:{get:function(){return k},set:function(a){k.top=void 0!==a.top?a.top:k.top,k.right=void 0!==a.right?a.right:k.right,k.bottom=void 0!==a.bottom?a.bottom:k.bottom,k.left=void 0!==a.left?a.left:k.left}},duration:{get:function(){return z},set:function(a){z=a,C.reset(z),e.duration(z),f.duration(z),g.duration(z)}},color:{get:function(){return n},set:function(b){n=a.utils.getColor(b),h.color(n)}},barColor:{get:function(){return e.barColor},set:function(a){e.barColor(a),h.color(function(a,b){return d3.rgb("#ccc").darker(1.5*b).toString()})}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.multiChart=function(){"use strict";function b(j){return j.each(function(j){function k(a){var b=2===j[a.seriesIndex].yAxis?B:A;a.value=a.point.x,a.series={value:a.point.y,color:a.point.color},D.duration(100).valueFormatter(function(a,c){return b.tickFormat()(a,c)}).data(a).position(a.pos).hidden(!1)}function l(a){var b=2===j[a.seriesIndex].yAxis?B:A;a.value=a.point.x,a.series={value:a.point.y,color:a.point.color},D.duration(100).valueFormatter(function(a,c){return b.tickFormat()(a,c)}).data(a).position(a.pos).hidden(!1)}function n(a){var b=2===j[a.seriesIndex].yAxis?B:A;a.point.x=x.x()(a.point),a.point.y=x.y()(a.point),D.duration(100).valueFormatter(function(a,c){return b.tickFormat()(a,c)}).data(a).position(a.pos).hidden(!1)}function E(a){var b=2===j[a.data.series].yAxis?B:A;a.value=v.x()(a.data),a.series={value:v.y()(a.data),color:a.color},D.duration(0).valueFormatter(function(a,c){return b.tickFormat()(a,c)}).data(a).hidden(!1)}var F=d3.select(this);a.utils.initSVG(F),b.update=function(){F.transition().call(b)},b.container=this;var G=a.utils.availableWidth(g,F,e),H=a.utils.availableHeight(h,F,e),I=j.filter(function(a){return"line"==a.type&&1==a.yAxis}),J=j.filter(function(a){return"line"==a.type&&2==a.yAxis}),K=j.filter(function(a){return"scatter"==a.type&&1==a.yAxis}),L=j.filter(function(a){return"scatter"==a.type&&2==a.yAxis}),M=j.filter(function(a){return"bar"==a.type&&1==a.yAxis}),N=j.filter(function(a){return"bar"==a.type&&2==a.yAxis}),O=j.filter(function(a){return"area"==a.type&&1==a.yAxis}),P=j.filter(function(a){return"area"==a.type&&2==a.yAxis});if(!(j&&j.length&&j.filter(function(a){return a.values.length}).length))return a.utils.noData(b,F),b;F.selectAll(".nv-noData").remove();var Q=j.filter(function(a){return!a.disabled&&1==a.yAxis}).map(function(a){return a.values.map(function(a){return{x:a.x,y:a.y}})}),R=j.filter(function(a){return!a.disabled&&2==a.yAxis}).map(function(a){return a.values.map(function(a){return{x:a.x,y:a.y}})});o.domain(d3.extent(d3.merge(Q.concat(R)),function(a){return a.x})).range([0,G]);var S=F.selectAll("g.wrap.multiChart").data([j]),T=S.enter().append("g").attr("class","wrap nvd3 multiChart").append("g");T.append("g").attr("class","nv-x nv-axis"),T.append("g").attr("class","nv-y1 nv-axis"),T.append("g").attr("class","nv-y2 nv-axis"),T.append("g").attr("class","lines1Wrap"),T.append("g").attr("class","lines2Wrap"),T.append("g").attr("class","scatters1Wrap"),T.append("g").attr("class","scatters2Wrap"),T.append("g").attr("class","bars1Wrap"),T.append("g").attr("class","bars2Wrap"),T.append("g").attr("class","stack1Wrap"),T.append("g").attr("class","stack2Wrap"),T.append("g").attr("class","legendWrap");var U=S.select("g"),V=j.map(function(a,b){return j[b].color||f(a,b)});if(i){var W=C.align()?G/2:G,X=C.align()?W:0;C.width(W),C.color(V),U.select(".legendWrap").datum(j.map(function(a){return a.originalKey=void 0===a.originalKey?a.key:a.originalKey,a.key=a.originalKey+(1==a.yAxis?"":" (right axis)"),a})).call(C),e.top!=C.height()&&(e.top=C.height(),H=a.utils.availableHeight(h,F,e)),U.select(".legendWrap").attr("transform","translate("+X+","+-e.top+")")}r.width(G).height(H).interpolate(m).color(V.filter(function(a,b){return!j[b].disabled&&1==j[b].yAxis&&"line"==j[b].type})),s.width(G).height(H).interpolate(m).color(V.filter(function(a,b){return!j[b].disabled&&2==j[b].yAxis&&"line"==j[b].type})),t.width(G).height(H).color(V.filter(function(a,b){return!j[b].disabled&&1==j[b].yAxis&&"scatter"==j[b].type})),u.width(G).height(H).color(V.filter(function(a,b){return!j[b].disabled&&2==j[b].yAxis&&"scatter"==j[b].type})),v.width(G).height(H).color(V.filter(function(a,b){return!j[b].disabled&&1==j[b].yAxis&&"bar"==j[b].type})),w.width(G).height(H).color(V.filter(function(a,b){return!j[b].disabled&&2==j[b].yAxis&&"bar"==j[b].type})),x.width(G).height(H).color(V.filter(function(a,b){return!j[b].disabled&&1==j[b].yAxis&&"area"==j[b].type})),y.width(G).height(H).color(V.filter(function(a,b){return!j[b].disabled&&2==j[b].yAxis&&"area"==j[b].type})),U.attr("transform","translate("+e.left+","+e.top+")");var Y=U.select(".lines1Wrap").datum(I.filter(function(a){return!a.disabled})),Z=U.select(".scatters1Wrap").datum(K.filter(function(a){return!a.disabled})),$=U.select(".bars1Wrap").datum(M.filter(function(a){return!a.disabled})),_=U.select(".stack1Wrap").datum(O.filter(function(a){return!a.disabled})),ab=U.select(".lines2Wrap").datum(J.filter(function(a){return!a.disabled})),bb=U.select(".scatters2Wrap").datum(L.filter(function(a){return!a.disabled})),cb=U.select(".bars2Wrap").datum(N.filter(function(a){return!a.disabled})),db=U.select(".stack2Wrap").datum(P.filter(function(a){return!a.disabled})),eb=O.length?O.map(function(a){return a.values}).reduce(function(a,b){return a.map(function(a,c){return{x:a.x,y:a.y+b[c].y}})}).concat([{x:0,y:0}]):[],fb=P.length?P.map(function(a){return a.values}).reduce(function(a,b){return a.map(function(a,c){return{x:a.x,y:a.y+b[c].y}})}).concat([{x:0,y:0}]):[];p.domain(c||d3.extent(d3.merge(Q).concat(eb),function(a){return a.y})).range([0,H]),q.domain(d||d3.extent(d3.merge(R).concat(fb),function(a){return a.y})).range([0,H]),r.yDomain(p.domain()),t.yDomain(p.domain()),v.yDomain(p.domain()),x.yDomain(p.domain()),s.yDomain(q.domain()),u.yDomain(q.domain()),w.yDomain(q.domain()),y.yDomain(q.domain()),O.length&&d3.transition(_).call(x),P.length&&d3.transition(db).call(y),M.length&&d3.transition($).call(v),N.length&&d3.transition(cb).call(w),I.length&&d3.transition(Y).call(r),J.length&&d3.transition(ab).call(s),K.length&&d3.transition(Z).call(t),L.length&&d3.transition(bb).call(u),z._ticks(a.utils.calcTicksX(G/100,j)).tickSize(-H,0),U.select(".nv-x.nv-axis").attr("transform","translate(0,"+H+")"),d3.transition(U.select(".nv-x.nv-axis")).call(z),A._ticks(a.utils.calcTicksY(H/36,j)).tickSize(-G,0),d3.transition(U.select(".nv-y1.nv-axis")).call(A),B._ticks(a.utils.calcTicksY(H/36,j)).tickSize(-G,0),d3.transition(U.select(".nv-y2.nv-axis")).call(B),U.select(".nv-y1.nv-axis").classed("nv-disabled",Q.length?!1:!0).attr("transform","translate("+o.range()[0]+",0)"),U.select(".nv-y2.nv-axis").classed("nv-disabled",R.length?!1:!0).attr("transform","translate("+o.range()[1]+",0)"),C.dispatch.on("stateChange",function(){b.update()}),r.dispatch.on("elementMouseover.tooltip",k),s.dispatch.on("elementMouseover.tooltip",k),r.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),s.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),t.dispatch.on("elementMouseover.tooltip",l),u.dispatch.on("elementMouseover.tooltip",l),t.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),u.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),x.dispatch.on("elementMouseover.tooltip",n),y.dispatch.on("elementMouseover.tooltip",n),x.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),y.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),v.dispatch.on("elementMouseover.tooltip",E),w.dispatch.on("elementMouseover.tooltip",E),v.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),w.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),v.dispatch.on("elementMousemove.tooltip",function(){D.position({top:d3.event.pageY,left:d3.event.pageX})()}),w.dispatch.on("elementMousemove.tooltip",function(){D.position({top:d3.event.pageY,left:d3.event.pageX})()})}),b}var c,d,e={top:30,right:20,bottom:50,left:60},f=a.utils.defaultColor(),g=null,h=null,i=!0,j=null,k=function(a){return a.x},l=function(a){return a.y},m="monotone",n=!0,o=d3.scale.linear(),p=d3.scale.linear(),q=d3.scale.linear(),r=a.models.line().yScale(p),s=a.models.line().yScale(q),t=a.models.scatter().yScale(p),u=a.models.scatter().yScale(q),v=a.models.multiBar().stacked(!1).yScale(p),w=a.models.multiBar().stacked(!1).yScale(q),x=a.models.stackedArea().yScale(p),y=a.models.stackedArea().yScale(q),z=a.models.axis().scale(o).orient("bottom").tickPadding(5),A=a.models.axis().scale(p).orient("left"),B=a.models.axis().scale(q).orient("right"),C=a.models.legend().height(30),D=a.models.tooltip(),E=d3.dispatch();return b.dispatch=E,b.lines1=r,b.lines2=s,b.scatters1=t,b.scatters2=u,b.bars1=v,b.bars2=w,b.stack1=x,b.stack2=y,b.xAxis=z,b.yAxis1=A,b.yAxis2=B,b.tooltip=D,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return g},set:function(a){g=a}},height:{get:function(){return h},set:function(a){h=a}},showLegend:{get:function(){return i},set:function(a){i=a}},yDomain1:{get:function(){return c},set:function(a){c=a}},yDomain2:{get:function(){return d},set:function(a){d=a}},noData:{get:function(){return j},set:function(a){j=a}},interpolate:{get:function(){return m},set:function(a){m=a}},tooltips:{get:function(){return D.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),D.enabled(!!b)}},tooltipContent:{get:function(){return D.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),D.contentGenerator(b)}},margin:{get:function(){return e},set:function(a){e.top=void 0!==a.top?a.top:e.top,e.right=void 0!==a.right?a.right:e.right,e.bottom=void 0!==a.bottom?a.bottom:e.bottom,e.left=void 0!==a.left?a.left:e.left}},color:{get:function(){return f},set:function(b){f=a.utils.getColor(b)}},x:{get:function(){return k},set:function(a){k=a,r.x(a),s.x(a),t.x(a),u.x(a),v.x(a),w.x(a),x.x(a),y.x(a)}},y:{get:function(){return l},set:function(a){l=a,r.y(a),s.y(a),t.y(a),u.y(a),x.y(a),y.y(a),v.y(a),w.y(a)}},useVoronoi:{get:function(){return n},set:function(a){n=a,r.useVoronoi(a),s.useVoronoi(a),x.useVoronoi(a),y.useVoronoi(a)}}}),a.utils.initOptions(b),b},a.models.ohlcBar=function(){"use strict";function b(y){return y.each(function(b){k=d3.select(this);var y=a.utils.availableWidth(h,k,g),A=a.utils.availableHeight(i,k,g);a.utils.initSVG(k);var B=y/b[0].values.length*.9;l.domain(c||d3.extent(b[0].values.map(n).concat(t))),l.range(v?e||[.5*y/b[0].values.length,y*(b[0].values.length-.5)/b[0].values.length]:e||[5+B/2,y-B/2-5]),m.domain(d||[d3.min(b[0].values.map(s).concat(u)),d3.max(b[0].values.map(r).concat(u))]).range(f||[A,0]),l.domain()[0]===l.domain()[1]&&l.domain(l.domain()[0]?[l.domain()[0]-.01*l.domain()[0],l.domain()[1]+.01*l.domain()[1]]:[-1,1]),m.domain()[0]===m.domain()[1]&&m.domain(m.domain()[0]?[m.domain()[0]+.01*m.domain()[0],m.domain()[1]-.01*m.domain()[1]]:[-1,1]);var C=d3.select(this).selectAll("g.nv-wrap.nv-ohlcBar").data([b[0].values]),D=C.enter().append("g").attr("class","nvd3 nv-wrap nv-ohlcBar"),E=D.append("defs"),F=D.append("g"),G=C.select("g");F.append("g").attr("class","nv-ticks"),C.attr("transform","translate("+g.left+","+g.top+")"),k.on("click",function(a,b){z.chartClick({data:a,index:b,pos:d3.event,id:j})}),E.append("clipPath").attr("id","nv-chart-clip-path-"+j).append("rect"),C.select("#nv-chart-clip-path-"+j+" rect").attr("width",y).attr("height",A),G.attr("clip-path",w?"url(#nv-chart-clip-path-"+j+")":"");var H=C.select(".nv-ticks").selectAll(".nv-tick").data(function(a){return a});H.exit().remove(),H.enter().append("path").attr("class",function(a,b,c){return(p(a,b)>q(a,b)?"nv-tick negative":"nv-tick positive")+" nv-tick-"+c+"-"+b
+}).attr("d",function(a,b){return"m0,0l0,"+(m(p(a,b))-m(r(a,b)))+"l"+-B/2+",0l"+B/2+",0l0,"+(m(s(a,b))-m(p(a,b)))+"l0,"+(m(q(a,b))-m(s(a,b)))+"l"+B/2+",0l"+-B/2+",0z"}).attr("transform",function(a,b){return"translate("+l(n(a,b))+","+m(r(a,b))+")"}).attr("fill",function(){return x[0]}).attr("stroke",function(){return x[0]}).attr("x",0).attr("y",function(a,b){return m(Math.max(0,o(a,b)))}).attr("height",function(a,b){return Math.abs(m(o(a,b))-m(0))}),H.attr("class",function(a,b,c){return(p(a,b)>q(a,b)?"nv-tick negative":"nv-tick positive")+" nv-tick-"+c+"-"+b}),d3.transition(H).attr("transform",function(a,b){return"translate("+l(n(a,b))+","+m(r(a,b))+")"}).attr("d",function(a,c){var d=y/b[0].values.length*.9;return"m0,0l0,"+(m(p(a,c))-m(r(a,c)))+"l"+-d/2+",0l"+d/2+",0l0,"+(m(s(a,c))-m(p(a,c)))+"l0,"+(m(q(a,c))-m(s(a,c)))+"l"+d/2+",0l"+-d/2+",0z"})}),b}var c,d,e,f,g={top:0,right:0,bottom:0,left:0},h=null,i=null,j=Math.floor(1e4*Math.random()),k=null,l=d3.scale.linear(),m=d3.scale.linear(),n=function(a){return a.x},o=function(a){return a.y},p=function(a){return a.open},q=function(a){return a.close},r=function(a){return a.high},s=function(a){return a.low},t=[],u=[],v=!1,w=!0,x=a.utils.defaultColor(),y=!1,z=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState","renderEnd","chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout","elementMousemove");return b.highlightPoint=function(a,c){b.clearHighlights(),k.select(".nv-ohlcBar .nv-tick-0-"+a).classed("hover",c)},b.clearHighlights=function(){k.select(".nv-ohlcBar .nv-tick.hover").classed("hover",!1)},b.dispatch=z,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return h},set:function(a){h=a}},height:{get:function(){return i},set:function(a){i=a}},xScale:{get:function(){return l},set:function(a){l=a}},yScale:{get:function(){return m},set:function(a){m=a}},xDomain:{get:function(){return c},set:function(a){c=a}},yDomain:{get:function(){return d},set:function(a){d=a}},xRange:{get:function(){return e},set:function(a){e=a}},yRange:{get:function(){return f},set:function(a){f=a}},forceX:{get:function(){return t},set:function(a){t=a}},forceY:{get:function(){return u},set:function(a){u=a}},padData:{get:function(){return v},set:function(a){v=a}},clipEdge:{get:function(){return w},set:function(a){w=a}},id:{get:function(){return j},set:function(a){j=a}},interactive:{get:function(){return y},set:function(a){y=a}},x:{get:function(){return n},set:function(a){n=a}},y:{get:function(){return o},set:function(a){o=a}},open:{get:function(){return p()},set:function(a){p=a}},close:{get:function(){return q()},set:function(a){q=a}},high:{get:function(){return r},set:function(a){r=a}},low:{get:function(){return s},set:function(a){s=a}},margin:{get:function(){return g},set:function(a){g.top=void 0!=a.top?a.top:g.top,g.right=void 0!=a.right?a.right:g.right,g.bottom=void 0!=a.bottom?a.bottom:g.bottom,g.left=void 0!=a.left?a.left:g.left}},color:{get:function(){return x},set:function(b){x=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.parallelCoordinates=function(){"use strict";function b(p){return p.each(function(b){function p(a){return F(h.map(function(b){if(isNaN(a[b])||isNaN(parseFloat(a[b]))){var c=g[b].domain(),d=g[b].range(),e=c[0]-(c[1]-c[0])/9;if(J.indexOf(b)<0){var h=d3.scale.linear().domain([e,c[1]]).range([x-12,d[1]]);g[b].brush.y(h),J.push(b)}return[f(b),g[b](e)]}return J.length>0?(D.style("display","inline"),E.style("display","inline")):(D.style("display","none"),E.style("display","none")),[f(b),g[b](a[b])]}))}function q(){var a=h.filter(function(a){return!g[a].brush.empty()}),b=a.map(function(a){return g[a].brush.extent()});k=[],a.forEach(function(a,c){k[c]={dimension:a,extent:b[c]}}),l=[],M.style("display",function(c){var d=a.every(function(a,d){return isNaN(c[a])&&b[d][0]==g[a].brush.y().domain()[0]?!0:b[d][0]<=c[a]&&c[a]<=b[d][1]});return d&&l.push(c),d?null:"none"}),o.brush({filters:k,active:l})}function r(a){m[a]=this.parentNode.__origin__=f(a),L.attr("visibility","hidden")}function s(a){m[a]=Math.min(w,Math.max(0,this.parentNode.__origin__+=d3.event.x)),M.attr("d",p),h.sort(function(a,b){return u(a)-u(b)}),f.domain(h),N.attr("transform",function(a){return"translate("+u(a)+")"})}function t(a){delete this.parentNode.__origin__,delete m[a],d3.select(this.parentNode).attr("transform","translate("+f(a)+")"),M.attr("d",p),L.attr("d",p).attr("visibility",null)}function u(a){var b=m[a];return null==b?f(a):b}var v=d3.select(this),w=a.utils.availableWidth(d,v,c),x=a.utils.availableHeight(e,v,c);a.utils.initSVG(v),l=b,f.rangePoints([0,w],1).domain(h);var y={};h.forEach(function(a){var c=d3.extent(b,function(b){return+b[a]});return y[a]=!1,void 0===c[0]&&(y[a]=!0,c[0]=0,c[1]=0),c[0]===c[1]&&(c[0]=c[0]-1,c[1]=c[1]+1),g[a]=d3.scale.linear().domain(c).range([.9*(x-12),0]),g[a].brush=d3.svg.brush().y(g[a]).on("brush",q),"name"!=a});var z=v.selectAll("g.nv-wrap.nv-parallelCoordinates").data([b]),A=z.enter().append("g").attr("class","nvd3 nv-wrap nv-parallelCoordinates"),B=A.append("g"),C=z.select("g");B.append("g").attr("class","nv-parallelCoordinates background"),B.append("g").attr("class","nv-parallelCoordinates foreground"),B.append("g").attr("class","nv-parallelCoordinates missingValuesline"),z.attr("transform","translate("+c.left+","+c.top+")");var D,E,F=d3.svg.line().interpolate("cardinal").tension(n),G=d3.svg.axis().orient("left"),H=d3.behavior.drag().on("dragstart",r).on("drag",s).on("dragend",t),I=f.range()[1]-f.range()[0],J=[],K=[0+I/2,x-12,w-I/2,x-12];D=z.select(".missingValuesline").selectAll("line").data([K]),D.enter().append("line"),D.exit().remove(),D.attr("x1",function(a){return a[0]}).attr("y1",function(a){return a[1]}).attr("x2",function(a){return a[2]}).attr("y2",function(a){return a[3]}),E=z.select(".missingValuesline").selectAll("text").data(["undefined values"]),E.append("text").data(["undefined values"]),E.enter().append("text"),E.exit().remove(),E.attr("y",x).attr("x",w-92-I/2).text(function(a){return a});var L=z.select(".background").selectAll("path").data(b);L.enter().append("path"),L.exit().remove(),L.attr("d",p);var M=z.select(".foreground").selectAll("path").data(b);M.enter().append("path"),M.exit().remove(),M.attr("d",p).attr("stroke",j),M.on("mouseover",function(a,b){d3.select(this).classed("hover",!0),o.elementMouseover({label:a.name,data:a.data,index:b,pos:[d3.mouse(this.parentNode)[0],d3.mouse(this.parentNode)[1]]})}),M.on("mouseout",function(a,b){d3.select(this).classed("hover",!1),o.elementMouseout({label:a.name,data:a.data,index:b})});var N=C.selectAll(".dimension").data(h),O=N.enter().append("g").attr("class","nv-parallelCoordinates dimension");O.append("g").attr("class","nv-parallelCoordinates nv-axis"),O.append("g").attr("class","nv-parallelCoordinates-brush"),O.append("text").attr("class","nv-parallelCoordinates nv-label"),N.attr("transform",function(a){return"translate("+f(a)+",0)"}),N.exit().remove(),N.select(".nv-label").style("cursor","move").attr("dy","-1em").attr("text-anchor","middle").text(String).on("mouseover",function(a){o.elementMouseover({dim:a,pos:[d3.mouse(this.parentNode.parentNode)[0],d3.mouse(this.parentNode.parentNode)[1]]})}).on("mouseout",function(a){o.elementMouseout({dim:a})}).call(H),N.select(".nv-axis").each(function(a,b){d3.select(this).call(G.scale(g[a]).tickFormat(d3.format(i[b])))}),N.select(".nv-parallelCoordinates-brush").each(function(a){d3.select(this).call(g[a].brush)}).selectAll("rect").attr("x",-8).attr("width",16)}),b}var c={top:30,right:0,bottom:10,left:0},d=null,e=null,f=d3.scale.ordinal(),g={},h=[],i=[],j=a.utils.defaultColor(),k=[],l=[],m=[],n=1,o=d3.dispatch("brush","elementMouseover","elementMouseout");return b.dispatch=o,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return d},set:function(a){d=a}},height:{get:function(){return e},set:function(a){e=a}},dimensionNames:{get:function(){return h},set:function(a){h=a}},dimensionFormats:{get:function(){return i},set:function(a){i=a}},lineTension:{get:function(){return n},set:function(a){n=a}},dimensions:{get:function(){return h},set:function(b){a.deprecated("dimensions","use dimensionNames instead"),h=b}},margin:{get:function(){return c},set:function(a){c.top=void 0!==a.top?a.top:c.top,c.right=void 0!==a.right?a.right:c.right,c.bottom=void 0!==a.bottom?a.bottom:c.bottom,c.left=void 0!==a.left?a.left:c.left}},color:{get:function(){return j},set:function(b){j=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.pie=function(){"use strict";function b(E){return D.reset(),E.each(function(b){function E(a,b){a.endAngle=isNaN(a.endAngle)?0:a.endAngle,a.startAngle=isNaN(a.startAngle)?0:a.startAngle,p||(a.innerRadius=0);var c=d3.interpolate(this._current,a);return this._current=c(0),function(a){return B[b](c(a))}}var F=d-c.left-c.right,G=e-c.top-c.bottom,H=Math.min(F,G)/2,I=[],J=[];if(i=d3.select(this),0===z.length)for(var K=H-H/5,L=y*H,M=0;M<b[0].length;M++)I.push(K),J.push(L);else I=z.map(function(a){return(a.outer-a.outer/5)*H}),J=z.map(function(a){return(a.inner-a.inner/5)*H}),y=d3.min(z.map(function(a){return a.inner-a.inner/5}));a.utils.initSVG(i);var N=i.selectAll(".nv-wrap.nv-pie").data(b),O=N.enter().append("g").attr("class","nvd3 nv-wrap nv-pie nv-chart-"+h),P=O.append("g"),Q=N.select("g"),R=P.append("g").attr("class","nv-pie");P.append("g").attr("class","nv-pieLabels"),N.attr("transform","translate("+c.left+","+c.top+")"),Q.select(".nv-pie").attr("transform","translate("+F/2+","+G/2+")"),Q.select(".nv-pieLabels").attr("transform","translate("+F/2+","+G/2+")"),i.on("click",function(a,b){A.chartClick({data:a,index:b,pos:d3.event,id:h})}),B=[],C=[];for(var M=0;M<b[0].length;M++){var S=d3.svg.arc().outerRadius(I[M]),T=d3.svg.arc().outerRadius(I[M]+5);u!==!1&&(S.startAngle(u),T.startAngle(u)),w!==!1&&(S.endAngle(w),T.endAngle(w)),p&&(S.innerRadius(J[M]),T.innerRadius(J[M])),S.cornerRadius&&x&&(S.cornerRadius(x),T.cornerRadius(x)),B.push(S),C.push(T)}var U=d3.layout.pie().sort(null).value(function(a){return a.disabled?0:g(a)});U.padAngle&&v&&U.padAngle(v),p&&q&&(R.append("text").attr("class","nv-pie-title"),N.select(".nv-pie-title").style("text-anchor","middle").text(function(){return q}).style("font-size",Math.min(F,G)*y*2/(q.length+2)+"px").attr("dy","0.35em").attr("transform",function(){return"translate(0, "+s+")"}));var V=N.select(".nv-pie").selectAll(".nv-slice").data(U),W=N.select(".nv-pieLabels").selectAll(".nv-label").data(U);V.exit().remove(),W.exit().remove();var X=V.enter().append("g");X.attr("class","nv-slice"),X.on("mouseover",function(a,b){d3.select(this).classed("hover",!0),r&&d3.select(this).select("path").transition().duration(70).attr("d",C[b]),A.elementMouseover({data:a.data,index:b,color:d3.select(this).style("fill")})}),X.on("mouseout",function(a,b){d3.select(this).classed("hover",!1),r&&d3.select(this).select("path").transition().duration(50).attr("d",B[b]),A.elementMouseout({data:a.data,index:b})}),X.on("mousemove",function(a,b){A.elementMousemove({data:a.data,index:b})}),X.on("click",function(a,b){A.elementClick({data:a.data,index:b,color:d3.select(this).style("fill")})}),X.on("dblclick",function(a,b){A.elementDblClick({data:a.data,index:b,color:d3.select(this).style("fill")})}),V.attr("fill",function(a,b){return j(a.data,b)}),V.attr("stroke",function(a,b){return j(a.data,b)});X.append("path").each(function(a){this._current=a});if(V.select("path").transition().attr("d",function(a,b){return B[b](a)}).attrTween("d",E),l){for(var Y=[],M=0;M<b[0].length;M++)Y.push(B[M]),m?p&&(Y[M]=d3.svg.arc().outerRadius(B[M].outerRadius()),u!==!1&&Y[M].startAngle(u),w!==!1&&Y[M].endAngle(w)):p||Y[M].innerRadius(0);W.enter().append("g").classed("nv-label",!0).each(function(a){var b=d3.select(this);b.attr("transform",function(a,b){if(t){a.outerRadius=I[b]+10,a.innerRadius=I[b]+15;var c=(a.startAngle+a.endAngle)/2*(180/Math.PI);return(a.startAngle+a.endAngle)/2<Math.PI?c-=90:c+=90,"translate("+Y[b].centroid(a)+") rotate("+c+")"}return a.outerRadius=H+10,a.innerRadius=H+15,"translate("+Y[b].centroid(a)+")"}),b.append("rect").style("stroke","#fff").style("fill","#fff").attr("rx",3).attr("ry",3),b.append("text").style("text-anchor",t?(a.startAngle+a.endAngle)/2<Math.PI?"start":"end":"middle").style("fill","#000")});var Z={},$=14,_=140,ab=function(a){return Math.floor(a[0]/_)*_+","+Math.floor(a[1]/$)*$};W.watchTransition(D,"pie labels").attr("transform",function(a,b){if(t){a.outerRadius=I[b]+10,a.innerRadius=I[b]+15;var c=(a.startAngle+a.endAngle)/2*(180/Math.PI);return(a.startAngle+a.endAngle)/2<Math.PI?c-=90:c+=90,"translate("+Y[b].centroid(a)+") rotate("+c+")"}a.outerRadius=H+10,a.innerRadius=H+15;var d=Y[b].centroid(a);if(a.value){var e=ab(d);Z[e]&&(d[1]-=$),Z[ab(d)]=!0}return"translate("+d+")"}),W.select(".nv-label text").style("text-anchor",function(a){return t?(a.startAngle+a.endAngle)/2<Math.PI?"start":"end":"middle"}).text(function(a,b){var c=(a.endAngle-a.startAngle)/(2*Math.PI),d="";if(!a.value||o>c)return"";if("function"==typeof n)d=n(a,b,{key:f(a.data),value:g(a.data),percent:k(c)});else switch(n){case"key":d=f(a.data);break;case"value":d=k(g(a.data));break;case"percent":d=d3.format("%")(c)}return d})}}),D.renderEnd("pie immediate"),b}var c={top:0,right:0,bottom:0,left:0},d=500,e=500,f=function(a){return a.x},g=function(a){return a.y},h=Math.floor(1e4*Math.random()),i=null,j=a.utils.defaultColor(),k=d3.format(",.2f"),l=!0,m=!1,n="key",o=.02,p=!1,q=!1,r=!0,s=0,t=!1,u=!1,v=!1,w=!1,x=0,y=.5,z=[],A=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout","elementMousemove","renderEnd"),B=[],C=[],D=a.utils.renderWatch(A);return b.dispatch=A,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{arcsRadius:{get:function(){return z},set:function(a){z=a}},width:{get:function(){return d},set:function(a){d=a}},height:{get:function(){return e},set:function(a){e=a}},showLabels:{get:function(){return l},set:function(a){l=a}},title:{get:function(){return q},set:function(a){q=a}},titleOffset:{get:function(){return s},set:function(a){s=a}},labelThreshold:{get:function(){return o},set:function(a){o=a}},valueFormat:{get:function(){return k},set:function(a){k=a}},x:{get:function(){return f},set:function(a){f=a}},id:{get:function(){return h},set:function(a){h=a}},endAngle:{get:function(){return w},set:function(a){w=a}},startAngle:{get:function(){return u},set:function(a){u=a}},padAngle:{get:function(){return v},set:function(a){v=a}},cornerRadius:{get:function(){return x},set:function(a){x=a}},donutRatio:{get:function(){return y},set:function(a){y=a}},labelsOutside:{get:function(){return m},set:function(a){m=a}},labelSunbeamLayout:{get:function(){return t},set:function(a){t=a}},donut:{get:function(){return p},set:function(a){p=a}},growOnHover:{get:function(){return r},set:function(a){r=a}},pieLabelsOutside:{get:function(){return m},set:function(b){m=b,a.deprecated("pieLabelsOutside","use labelsOutside instead")}},donutLabelsOutside:{get:function(){return m},set:function(b){m=b,a.deprecated("donutLabelsOutside","use labelsOutside instead")}},labelFormat:{get:function(){return k},set:function(b){k=b,a.deprecated("labelFormat","use valueFormat instead")}},margin:{get:function(){return c},set:function(a){c.top="undefined"!=typeof a.top?a.top:c.top,c.right="undefined"!=typeof a.right?a.right:c.right,c.bottom="undefined"!=typeof a.bottom?a.bottom:c.bottom,c.left="undefined"!=typeof a.left?a.left:c.left}},y:{get:function(){return g},set:function(a){g=d3.functor(a)}},color:{get:function(){return j},set:function(b){j=a.utils.getColor(b)}},labelType:{get:function(){return n},set:function(a){n=a||"key"}}}),a.utils.initOptions(b),b},a.models.pieChart=function(){"use strict";function b(e){return q.reset(),q.models(c),e.each(function(e){var k=d3.select(this);a.utils.initSVG(k);var n=a.utils.availableWidth(g,k,f),o=a.utils.availableHeight(h,k,f);if(b.update=function(){k.transition().call(b)},b.container=this,l.setter(s(e),b.update).getter(r(e)).update(),l.disabled=e.map(function(a){return!!a.disabled}),!m){var q;m={};for(q in l)m[q]=l[q]instanceof Array?l[q].slice(0):l[q]}if(!e||!e.length)return a.utils.noData(b,k),b;k.selectAll(".nv-noData").remove();var t=k.selectAll("g.nv-wrap.nv-pieChart").data([e]),u=t.enter().append("g").attr("class","nvd3 nv-wrap nv-pieChart").append("g"),v=t.select("g");if(u.append("g").attr("class","nv-pieWrap"),u.append("g").attr("class","nv-legendWrap"),i)if("top"===j)d.width(n).key(c.x()),t.select(".nv-legendWrap").datum(e).call(d),f.top!=d.height()&&(f.top=d.height(),o=a.utils.availableHeight(h,k,f)),t.select(".nv-legendWrap").attr("transform","translate(0,"+-f.top+")");else if("right"===j){var w=a.models.legend().width();w>n/2&&(w=n/2),d.height(o).key(c.x()),d.width(w),n-=d.width(),t.select(".nv-legendWrap").datum(e).call(d).attr("transform","translate("+n+",0)")}t.attr("transform","translate("+f.left+","+f.top+")"),c.width(n).height(o);var x=v.select(".nv-pieWrap").datum([e]);d3.transition(x).call(c),d.dispatch.on("stateChange",function(a){for(var c in a)l[c]=a[c];p.stateChange(l),b.update()}),p.on("changeState",function(a){"undefined"!=typeof a.disabled&&(e.forEach(function(b,c){b.disabled=a.disabled[c]}),l.disabled=a.disabled),b.update()})}),q.renderEnd("pieChart immediate"),b}var c=a.models.pie(),d=a.models.legend(),e=a.models.tooltip(),f={top:30,right:20,bottom:20,left:20},g=null,h=null,i=!0,j="top",k=a.utils.defaultColor(),l=a.utils.state(),m=null,n=null,o=250,p=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState","renderEnd");e.headerEnabled(!1).duration(0).valueFormatter(function(a,b){return c.valueFormat()(a,b)});var q=a.utils.renderWatch(p),r=function(a){return function(){return{active:a.map(function(a){return!a.disabled})}}},s=function(a){return function(b){void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}};return c.dispatch.on("elementMouseover.tooltip",function(a){a.series={key:b.x()(a.data),value:b.y()(a.data),color:a.color},e.data(a).hidden(!1)}),c.dispatch.on("elementMouseout.tooltip",function(){e.hidden(!0)}),c.dispatch.on("elementMousemove.tooltip",function(){e.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.legend=d,b.dispatch=p,b.pie=c,b.tooltip=e,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{noData:{get:function(){return n},set:function(a){n=a}},showLegend:{get:function(){return i},set:function(a){i=a}},legendPosition:{get:function(){return j},set:function(a){j=a}},defaultState:{get:function(){return m},set:function(a){m=a}},tooltips:{get:function(){return e.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),e.enabled(!!b)}},tooltipContent:{get:function(){return e.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),e.contentGenerator(b)}},color:{get:function(){return k},set:function(a){k=a,d.color(k),c.color(k)}},duration:{get:function(){return o},set:function(a){o=a,q.reset(o)}},margin:{get:function(){return f},set:function(a){f.top=void 0!==a.top?a.top:f.top,f.right=void 0!==a.right?a.right:f.right,f.bottom=void 0!==a.bottom?a.bottom:f.bottom,f.left=void 0!==a.left?a.left:f.left}}}),a.utils.inheritOptions(b,c),a.utils.initOptions(b),b},a.models.scatter=function(){"use strict";function b(N){return P.reset(),N.each(function(b){function N(){if(O=!1,!w)return!1;if(M===!0){var a=d3.merge(b.map(function(a,b){return a.values.map(function(a,c){var d=p(a,c),e=q(a,c);return[m(d)+1e-4*Math.random(),n(e)+1e-4*Math.random(),b,c,a]}).filter(function(a,b){return x(a[4],b)})}));if(0==a.length)return!1;a.length<3&&(a.push([m.range()[0]-20,n.range()[0]-20,null,null]),a.push([m.range()[1]+20,n.range()[1]+20,null,null]),a.push([m.range()[0]-20,n.range()[0]+20,null,null]),a.push([m.range()[1]+20,n.range()[1]-20,null,null]));var c=d3.geom.polygon([[-10,-10],[-10,i+10],[h+10,i+10],[h+10,-10]]),d=d3.geom.voronoi(a).map(function(b,d){return{data:c.clip(b),series:a[d][2],point:a[d][3]}});U.select(".nv-point-paths").selectAll("path").remove();var e=U.select(".nv-point-paths").selectAll("path").data(d),f=e.enter().append("svg:path").attr("d",function(a){return a&&a.data&&0!==a.data.length?"M"+a.data.join(",")+"Z":"M 0 0"}).attr("id",function(a,b){return"nv-path-"+b}).attr("clip-path",function(a,b){return"url(#nv-clip-"+k+"-"+b+")"});C&&f.style("fill",d3.rgb(230,230,230)).style("fill-opacity",.4).style("stroke-opacity",1).style("stroke",d3.rgb(200,200,200)),B&&(U.select(".nv-point-clips").selectAll("clipPath").remove(),U.select(".nv-point-clips").selectAll("clipPath").data(a).enter().append("svg:clipPath").attr("id",function(a,b){return"nv-clip-"+k+"-"+b}).append("svg:circle").attr("cx",function(a){return a[0]}).attr("cy",function(a){return a[1]}).attr("r",D));var o=function(a,c){if(O)return 0;var d=b[a.series];if(void 0!==d){var e=d.values[a.point];e.color=j(d,a.series),e.x=p(e),e.y=q(e);var f=l.node().getBoundingClientRect(),h=window.pageYOffset||document.documentElement.scrollTop,i=window.pageXOffset||document.documentElement.scrollLeft,k={left:m(p(e,a.point))+f.left+i+g.left+10,top:n(q(e,a.point))+f.top+h+g.top+10};c({point:e,series:d,pos:k,seriesIndex:a.series,pointIndex:a.point})}};e.on("click",function(a){o(a,L.elementClick)}).on("dblclick",function(a){o(a,L.elementDblClick)}).on("mouseover",function(a){o(a,L.elementMouseover)}).on("mouseout",function(a){o(a,L.elementMouseout)})}else U.select(".nv-groups").selectAll(".nv-group").selectAll(".nv-point").on("click",function(a,c){if(O||!b[a.series])return 0;var d=b[a.series],e=d.values[c];L.elementClick({point:e,series:d,pos:[m(p(e,c))+g.left,n(q(e,c))+g.top],seriesIndex:a.series,pointIndex:c})}).on("dblclick",function(a,c){if(O||!b[a.series])return 0;var d=b[a.series],e=d.values[c];L.elementDblClick({point:e,series:d,pos:[m(p(e,c))+g.left,n(q(e,c))+g.top],seriesIndex:a.series,pointIndex:c})}).on("mouseover",function(a,c){if(O||!b[a.series])return 0;var d=b[a.series],e=d.values[c];L.elementMouseover({point:e,series:d,pos:[m(p(e,c))+g.left,n(q(e,c))+g.top],seriesIndex:a.series,pointIndex:c,color:j(a,c)})}).on("mouseout",function(a,c){if(O||!b[a.series])return 0;var d=b[a.series],e=d.values[c];L.elementMouseout({point:e,series:d,seriesIndex:a.series,pointIndex:c,color:j(a,c)})})}l=d3.select(this);var R=a.utils.availableWidth(h,l,g),S=a.utils.availableHeight(i,l,g);a.utils.initSVG(l),b.forEach(function(a,b){a.values.forEach(function(a){a.series=b})});var T=E&&F&&I?[]:d3.merge(b.map(function(a){return a.values.map(function(a,b){return{x:p(a,b),y:q(a,b),size:r(a,b)}})}));m.domain(E||d3.extent(T.map(function(a){return a.x}).concat(t))),m.range(y&&b[0]?G||[(R*z+R)/(2*b[0].values.length),R-R*(1+z)/(2*b[0].values.length)]:G||[0,R]),n.domain(F||d3.extent(T.map(function(a){return a.y}).concat(u))).range(H||[S,0]),o.domain(I||d3.extent(T.map(function(a){return a.size}).concat(v))).range(J||Q),K=m.domain()[0]===m.domain()[1]||n.domain()[0]===n.domain()[1],m.domain()[0]===m.domain()[1]&&m.domain(m.domain()[0]?[m.domain()[0]-.01*m.domain()[0],m.domain()[1]+.01*m.domain()[1]]:[-1,1]),n.domain()[0]===n.domain()[1]&&n.domain(n.domain()[0]?[n.domain()[0]-.01*n.domain()[0],n.domain()[1]+.01*n.domain()[1]]:[-1,1]),isNaN(m.domain()[0])&&m.domain([-1,1]),isNaN(n.domain()[0])&&n.domain([-1,1]),c=c||m,d=d||n,e=e||o;var U=l.selectAll("g.nv-wrap.nv-scatter").data([b]),V=U.enter().append("g").attr("class","nvd3 nv-wrap nv-scatter nv-chart-"+k),W=V.append("defs"),X=V.append("g"),Y=U.select("g");U.classed("nv-single-point",K),X.append("g").attr("class","nv-groups"),X.append("g").attr("class","nv-point-paths"),V.append("g").attr("class","nv-point-clips"),U.attr("transform","translate("+g.left+","+g.top+")"),W.append("clipPath").attr("id","nv-edge-clip-"+k).append("rect"),U.select("#nv-edge-clip-"+k+" rect").attr("width",R).attr("height",S>0?S:0),Y.attr("clip-path",A?"url(#nv-edge-clip-"+k+")":""),O=!0;var Z=U.select(".nv-groups").selectAll(".nv-group").data(function(a){return a},function(a){return a.key});Z.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),Z.exit().remove(),Z.attr("class",function(a,b){return"nv-group nv-series-"+b}).classed("hover",function(a){return a.hover}),Z.watchTransition(P,"scatter: groups").style("fill",function(a,b){return j(a,b)}).style("stroke",function(a,b){return j(a,b)}).style("stroke-opacity",1).style("fill-opacity",.5);var $=Z.selectAll("path.nv-point").data(function(a){return a.values.map(function(a,b){return[a,b]}).filter(function(a,b){return x(a[0],b)})});$.enter().append("path").style("fill",function(a){return a.color}).style("stroke",function(a){return a.color}).attr("transform",function(a){return"translate("+c(p(a[0],a[1]))+","+d(q(a[0],a[1]))+")"}).attr("d",a.utils.symbol().type(function(a){return s(a[0])}).size(function(a){return o(r(a[0],a[1]))})),$.exit().remove(),Z.exit().selectAll("path.nv-point").watchTransition(P,"scatter exit").attr("transform",function(a){return"translate("+m(p(a[0],a[1]))+","+n(q(a[0],a[1]))+")"}).remove(),$.each(function(a){d3.select(this).classed("nv-point",!0).classed("nv-point-"+a[1],!0).classed("nv-noninteractive",!w).classed("hover",!1)}),$.watchTransition(P,"scatter points").attr("transform",function(a){return"translate("+m(p(a[0],a[1]))+","+n(q(a[0],a[1]))+")"}).attr("d",a.utils.symbol().type(function(a){return s(a[0])}).size(function(a){return o(r(a[0],a[1]))})),clearTimeout(f),f=setTimeout(N,300),c=m.copy(),d=n.copy(),e=o.copy()}),P.renderEnd("scatter immediate"),b}var c,d,e,f,g={top:0,right:0,bottom:0,left:0},h=null,i=null,j=a.utils.defaultColor(),k=Math.floor(1e5*Math.random()),l=null,m=d3.scale.linear(),n=d3.scale.linear(),o=d3.scale.linear(),p=function(a){return a.x},q=function(a){return a.y},r=function(a){return a.size||1},s=function(a){return a.shape||"circle"},t=[],u=[],v=[],w=!0,x=function(a){return!a.notActive},y=!1,z=.1,A=!1,B=!0,C=!1,D=function(){return 25},E=null,F=null,G=null,H=null,I=null,J=null,K=!1,L=d3.dispatch("elementClick","elementDblClick","elementMouseover","elementMouseout","renderEnd"),M=!0,N=250,O=!1,P=a.utils.renderWatch(L,N),Q=[16,256];return b.dispatch=L,b.options=a.utils.optionsFunc.bind(b),b._calls=new function(){this.clearHighlights=function(){return a.dom.write(function(){l.selectAll(".nv-point.hover").classed("hover",!1)}),null},this.highlightPoint=function(b,c,d){a.dom.write(function(){l.select(" .nv-series-"+b+" .nv-point-"+c).classed("hover",d)})}},L.on("elementMouseover.point",function(a){w&&b._calls.highlightPoint(a.seriesIndex,a.pointIndex,!0)}),L.on("elementMouseout.point",function(a){w&&b._calls.highlightPoint(a.seriesIndex,a.pointIndex,!1)}),b._options=Object.create({},{width:{get:function(){return h},set:function(a){h=a}},height:{get:function(){return i},set:function(a){i=a}},xScale:{get:function(){return m},set:function(a){m=a}},yScale:{get:function(){return n},set:function(a){n=a}},pointScale:{get:function(){return o},set:function(a){o=a}},xDomain:{get:function(){return E},set:function(a){E=a}},yDomain:{get:function(){return F},set:function(a){F=a}},pointDomain:{get:function(){return I},set:function(a){I=a}},xRange:{get:function(){return G},set:function(a){G=a}},yRange:{get:function(){return H},set:function(a){H=a}},pointRange:{get:function(){return J},set:function(a){J=a}},forceX:{get:function(){return t},set:function(a){t=a}},forceY:{get:function(){return u},set:function(a){u=a}},forcePoint:{get:function(){return v},set:function(a){v=a}},interactive:{get:function(){return w},set:function(a){w=a}},pointActive:{get:function(){return x},set:function(a){x=a}},padDataOuter:{get:function(){return z},set:function(a){z=a}},padData:{get:function(){return y},set:function(a){y=a}},clipEdge:{get:function(){return A},set:function(a){A=a}},clipVoronoi:{get:function(){return B},set:function(a){B=a}},clipRadius:{get:function(){return D},set:function(a){D=a}},showVoronoi:{get:function(){return C},set:function(a){C=a}},id:{get:function(){return k},set:function(a){k=a}},x:{get:function(){return p},set:function(a){p=d3.functor(a)}},y:{get:function(){return q},set:function(a){q=d3.functor(a)}},pointSize:{get:function(){return r},set:function(a){r=d3.functor(a)}},pointShape:{get:function(){return s},set:function(a){s=d3.functor(a)}},margin:{get:function(){return g},set:function(a){g.top=void 0!==a.top?a.top:g.top,g.right=void 0!==a.right?a.right:g.right,g.bottom=void 0!==a.bottom?a.bottom:g.bottom,g.left=void 0!==a.left?a.left:g.left}},duration:{get:function(){return N},set:function(a){N=a,P.reset(N)}},color:{get:function(){return j},set:function(b){j=a.utils.getColor(b)}},useVoronoi:{get:function(){return M},set:function(a){M=a,M===!1&&(B=!1)}}}),a.utils.initOptions(b),b},a.models.scatterChart=function(){"use strict";function b(z){return D.reset(),D.models(c),t&&D.models(d),u&&D.models(e),q&&D.models(g),r&&D.models(h),z.each(function(z){m=d3.select(this),a.utils.initSVG(m);var G=a.utils.availableWidth(k,m,j),H=a.utils.availableHeight(l,m,j);if(b.update=function(){0===A?m.call(b):m.transition().duration(A).call(b)},b.container=this,w.setter(F(z),b.update).getter(E(z)).update(),w.disabled=z.map(function(a){return!!a.disabled}),!x){var I;x={};for(I in w)x[I]=w[I]instanceof Array?w[I].slice(0):w[I]}if(!(z&&z.length&&z.filter(function(a){return a.values.length}).length))return a.utils.noData(b,m),D.renderEnd("scatter immediate"),b;m.selectAll(".nv-noData").remove(),o=c.xScale(),p=c.yScale();var J=m.selectAll("g.nv-wrap.nv-scatterChart").data([z]),K=J.enter().append("g").attr("class","nvd3 nv-wrap nv-scatterChart nv-chart-"+c.id()),L=K.append("g"),M=J.select("g");if(L.append("rect").attr("class","nvd3 nv-background").style("pointer-events","none"),L.append("g").attr("class","nv-x nv-axis"),L.append("g").attr("class","nv-y nv-axis"),L.append("g").attr("class","nv-scatterWrap"),L.append("g").attr("class","nv-regressionLinesWrap"),L.append("g").attr("class","nv-distWrap"),L.append("g").attr("class","nv-legendWrap"),v&&M.select(".nv-y.nv-axis").attr("transform","translate("+G+",0)"),s){var N=G;f.width(N),J.select(".nv-legendWrap").datum(z).call(f),j.top!=f.height()&&(j.top=f.height(),H=a.utils.availableHeight(l,m,j)),J.select(".nv-legendWrap").attr("transform","translate(0,"+-j.top+")")}J.attr("transform","translate("+j.left+","+j.top+")"),c.width(G).height(H).color(z.map(function(a,b){return a.color=a.color||n(a,b),a.color}).filter(function(a,b){return!z[b].disabled})),J.select(".nv-scatterWrap").datum(z.filter(function(a){return!a.disabled})).call(c),J.select(".nv-regressionLinesWrap").attr("clip-path","url(#nv-edge-clip-"+c.id()+")");var O=J.select(".nv-regressionLinesWrap").selectAll(".nv-regLines").data(function(a){return a});O.enter().append("g").attr("class","nv-regLines");var P=O.selectAll(".nv-regLine").data(function(a){return[a]});P.enter().append("line").attr("class","nv-regLine").style("stroke-opacity",0),P.filter(function(a){return a.intercept&&a.slope}).watchTransition(D,"scatterPlusLineChart: regline").attr("x1",o.range()[0]).attr("x2",o.range()[1]).attr("y1",function(a){return p(o.domain()[0]*a.slope+a.intercept)}).attr("y2",function(a){return p(o.domain()[1]*a.slope+a.intercept)}).style("stroke",function(a,b,c){return n(a,c)}).style("stroke-opacity",function(a){return a.disabled||"undefined"==typeof a.slope||"undefined"==typeof a.intercept?0:1}),t&&(d.scale(o)._ticks(a.utils.calcTicksX(G/100,z)).tickSize(-H,0),M.select(".nv-x.nv-axis").attr("transform","translate(0,"+p.range()[0]+")").call(d)),u&&(e.scale(p)._ticks(a.utils.calcTicksY(H/36,z)).tickSize(-G,0),M.select(".nv-y.nv-axis").call(e)),q&&(g.getData(c.x()).scale(o).width(G).color(z.map(function(a,b){return a.color||n(a,b)}).filter(function(a,b){return!z[b].disabled})),L.select(".nv-distWrap").append("g").attr("class","nv-distributionX"),M.select(".nv-distributionX").attr("transform","translate(0,"+p.range()[0]+")").datum(z.filter(function(a){return!a.disabled})).call(g)),r&&(h.getData(c.y()).scale(p).width(H).color(z.map(function(a,b){return a.color||n(a,b)
+}).filter(function(a,b){return!z[b].disabled})),L.select(".nv-distWrap").append("g").attr("class","nv-distributionY"),M.select(".nv-distributionY").attr("transform","translate("+(v?G:-h.size())+",0)").datum(z.filter(function(a){return!a.disabled})).call(h)),f.dispatch.on("stateChange",function(a){for(var c in a)w[c]=a[c];y.stateChange(w),b.update()}),y.on("changeState",function(a){"undefined"!=typeof a.disabled&&(z.forEach(function(b,c){b.disabled=a.disabled[c]}),w.disabled=a.disabled),b.update()}),c.dispatch.on("elementMouseout.tooltip",function(a){i.hidden(!0),m.select(".nv-chart-"+c.id()+" .nv-series-"+a.seriesIndex+" .nv-distx-"+a.pointIndex).attr("y1",0),m.select(".nv-chart-"+c.id()+" .nv-series-"+a.seriesIndex+" .nv-disty-"+a.pointIndex).attr("x2",h.size())}),c.dispatch.on("elementMouseover.tooltip",function(a){m.select(".nv-series-"+a.seriesIndex+" .nv-distx-"+a.pointIndex).attr("y1",a.pos.top-H-j.top),m.select(".nv-series-"+a.seriesIndex+" .nv-disty-"+a.pointIndex).attr("x2",a.pos.left+g.size()-j.left),i.position(a.pos).data(a).hidden(!1)}),B=o.copy(),C=p.copy()}),D.renderEnd("scatter with line immediate"),b}var c=a.models.scatter(),d=a.models.axis(),e=a.models.axis(),f=a.models.legend(),g=a.models.distribution(),h=a.models.distribution(),i=a.models.tooltip(),j={top:30,right:20,bottom:50,left:75},k=null,l=null,m=null,n=a.utils.defaultColor(),o=c.xScale(),p=c.yScale(),q=!1,r=!1,s=!0,t=!0,u=!0,v=!1,w=a.utils.state(),x=null,y=d3.dispatch("stateChange","changeState","renderEnd"),z=null,A=250;c.xScale(o).yScale(p),d.orient("bottom").tickPadding(10),e.orient(v?"right":"left").tickPadding(10),g.axis("x"),h.axis("y"),i.headerFormatter(function(a,b){return d.tickFormat()(a,b)}).valueFormatter(function(a,b){return e.tickFormat()(a,b)});var B,C,D=a.utils.renderWatch(y,A),E=function(a){return function(){return{active:a.map(function(a){return!a.disabled})}}},F=function(a){return function(b){void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}};return b.dispatch=y,b.scatter=c,b.legend=f,b.xAxis=d,b.yAxis=e,b.distX=g,b.distY=h,b.tooltip=i,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return k},set:function(a){k=a}},height:{get:function(){return l},set:function(a){l=a}},container:{get:function(){return m},set:function(a){m=a}},showDistX:{get:function(){return q},set:function(a){q=a}},showDistY:{get:function(){return r},set:function(a){r=a}},showLegend:{get:function(){return s},set:function(a){s=a}},showXAxis:{get:function(){return t},set:function(a){t=a}},showYAxis:{get:function(){return u},set:function(a){u=a}},defaultState:{get:function(){return x},set:function(a){x=a}},noData:{get:function(){return z},set:function(a){z=a}},duration:{get:function(){return A},set:function(a){A=a}},tooltips:{get:function(){return i.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),i.enabled(!!b)}},tooltipContent:{get:function(){return i.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),i.contentGenerator(b)}},tooltipXContent:{get:function(){return i.contentGenerator()},set:function(){a.deprecated("tooltipContent","This option is removed, put values into main tooltip.")}},tooltipYContent:{get:function(){return i.contentGenerator()},set:function(){a.deprecated("tooltipContent","This option is removed, put values into main tooltip.")}},margin:{get:function(){return j},set:function(a){j.top=void 0!==a.top?a.top:j.top,j.right=void 0!==a.right?a.right:j.right,j.bottom=void 0!==a.bottom?a.bottom:j.bottom,j.left=void 0!==a.left?a.left:j.left}},rightAlignYAxis:{get:function(){return v},set:function(a){v=a,e.orient(a?"right":"left")}},color:{get:function(){return n},set:function(b){n=a.utils.getColor(b),f.color(n),g.color(n),h.color(n)}}}),a.utils.inheritOptions(b,c),a.utils.initOptions(b),b},a.models.sparkline=function(){"use strict";function b(k){return k.each(function(b){var k=h-g.left-g.right,q=i-g.top-g.bottom;j=d3.select(this),a.utils.initSVG(j),l.domain(c||d3.extent(b,n)).range(e||[0,k]),m.domain(d||d3.extent(b,o)).range(f||[q,0]);{var r=j.selectAll("g.nv-wrap.nv-sparkline").data([b]),s=r.enter().append("g").attr("class","nvd3 nv-wrap nv-sparkline");s.append("g"),r.select("g")}r.attr("transform","translate("+g.left+","+g.top+")");var t=r.selectAll("path").data(function(a){return[a]});t.enter().append("path"),t.exit().remove(),t.style("stroke",function(a,b){return a.color||p(a,b)}).attr("d",d3.svg.line().x(function(a,b){return l(n(a,b))}).y(function(a,b){return m(o(a,b))}));var u=r.selectAll("circle.nv-point").data(function(a){function b(b){if(-1!=b){var c=a[b];return c.pointIndex=b,c}return null}var c=a.map(function(a,b){return o(a,b)}),d=b(c.lastIndexOf(m.domain()[1])),e=b(c.indexOf(m.domain()[0])),f=b(c.length-1);return[e,d,f].filter(function(a){return null!=a})});u.enter().append("circle"),u.exit().remove(),u.attr("cx",function(a){return l(n(a,a.pointIndex))}).attr("cy",function(a){return m(o(a,a.pointIndex))}).attr("r",2).attr("class",function(a){return n(a,a.pointIndex)==l.domain()[1]?"nv-point nv-currentValue":o(a,a.pointIndex)==m.domain()[0]?"nv-point nv-minValue":"nv-point nv-maxValue"})}),b}var c,d,e,f,g={top:2,right:0,bottom:2,left:0},h=400,i=32,j=null,k=!0,l=d3.scale.linear(),m=d3.scale.linear(),n=function(a){return a.x},o=function(a){return a.y},p=a.utils.getColor(["#000"]);return b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return h},set:function(a){h=a}},height:{get:function(){return i},set:function(a){i=a}},xDomain:{get:function(){return c},set:function(a){c=a}},yDomain:{get:function(){return d},set:function(a){d=a}},xRange:{get:function(){return e},set:function(a){e=a}},yRange:{get:function(){return f},set:function(a){f=a}},xScale:{get:function(){return l},set:function(a){l=a}},yScale:{get:function(){return m},set:function(a){m=a}},animate:{get:function(){return k},set:function(a){k=a}},x:{get:function(){return n},set:function(a){n=d3.functor(a)}},y:{get:function(){return o},set:function(a){o=d3.functor(a)}},margin:{get:function(){return g},set:function(a){g.top=void 0!==a.top?a.top:g.top,g.right=void 0!==a.right?a.right:g.right,g.bottom=void 0!==a.bottom?a.bottom:g.bottom,g.left=void 0!==a.left?a.left:g.left}},color:{get:function(){return p},set:function(b){p=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.sparklinePlus=function(){"use strict";function b(p){return p.each(function(p){function q(){if(!j){var a=z.selectAll(".nv-hoverValue").data(i),b=a.enter().append("g").attr("class","nv-hoverValue").style("stroke-opacity",0).style("fill-opacity",0);a.exit().transition().duration(250).style("stroke-opacity",0).style("fill-opacity",0).remove(),a.attr("transform",function(a){return"translate("+c(e.x()(p[a],a))+",0)"}).transition().duration(250).style("stroke-opacity",1).style("fill-opacity",1),i.length&&(b.append("line").attr("x1",0).attr("y1",-f.top).attr("x2",0).attr("y2",u),b.append("text").attr("class","nv-xValue").attr("x",-6).attr("y",-f.top).attr("text-anchor","end").attr("dy",".9em"),z.select(".nv-hoverValue .nv-xValue").text(k(e.x()(p[i[0]],i[0]))),b.append("text").attr("class","nv-yValue").attr("x",6).attr("y",-f.top).attr("text-anchor","start").attr("dy",".9em"),z.select(".nv-hoverValue .nv-yValue").text(l(e.y()(p[i[0]],i[0]))))}}function r(){function a(a,b){for(var c=Math.abs(e.x()(a[0],0)-b),d=0,f=0;f<a.length;f++)Math.abs(e.x()(a[f],f)-b)<c&&(c=Math.abs(e.x()(a[f],f)-b),d=f);return d}if(!j){var b=d3.mouse(this)[0]-f.left;i=[a(p,Math.round(c.invert(b)))],q()}}var s=d3.select(this);a.utils.initSVG(s);var t=a.utils.availableWidth(g,s,f),u=a.utils.availableHeight(h,s,f);if(b.update=function(){s.call(b)},b.container=this,!p||!p.length)return a.utils.noData(b,s),b;s.selectAll(".nv-noData").remove();var v=e.y()(p[p.length-1],p.length-1);c=e.xScale(),d=e.yScale();var w=s.selectAll("g.nv-wrap.nv-sparklineplus").data([p]),x=w.enter().append("g").attr("class","nvd3 nv-wrap nv-sparklineplus"),y=x.append("g"),z=w.select("g");y.append("g").attr("class","nv-sparklineWrap"),y.append("g").attr("class","nv-valueWrap"),y.append("g").attr("class","nv-hoverArea"),w.attr("transform","translate("+f.left+","+f.top+")");var A=z.select(".nv-sparklineWrap");if(e.width(t).height(u),A.call(e),m){var B=z.select(".nv-valueWrap"),C=B.selectAll(".nv-currentValue").data([v]);C.enter().append("text").attr("class","nv-currentValue").attr("dx",o?-8:8).attr("dy",".9em").style("text-anchor",o?"end":"start"),C.attr("x",t+(o?f.right:0)).attr("y",n?function(a){return d(a)}:0).style("fill",e.color()(p[p.length-1],p.length-1)).text(l(v))}y.select(".nv-hoverArea").append("rect").on("mousemove",r).on("click",function(){j=!j}).on("mouseout",function(){i=[],q()}),z.select(".nv-hoverArea rect").attr("transform",function(){return"translate("+-f.left+","+-f.top+")"}).attr("width",t+f.left+f.right).attr("height",u+f.top)}),b}var c,d,e=a.models.sparkline(),f={top:15,right:100,bottom:10,left:50},g=null,h=null,i=[],j=!1,k=d3.format(",r"),l=d3.format(",.2f"),m=!0,n=!0,o=!1,p=null;return b.sparkline=e,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return g},set:function(a){g=a}},height:{get:function(){return h},set:function(a){h=a}},xTickFormat:{get:function(){return k},set:function(a){k=a}},yTickFormat:{get:function(){return l},set:function(a){l=a}},showLastValue:{get:function(){return m},set:function(a){m=a}},alignValue:{get:function(){return n},set:function(a){n=a}},rightAlignValue:{get:function(){return o},set:function(a){o=a}},noData:{get:function(){return p},set:function(a){p=a}},margin:{get:function(){return f},set:function(a){f.top=void 0!==a.top?a.top:f.top,f.right=void 0!==a.right?a.right:f.right,f.bottom=void 0!==a.bottom?a.bottom:f.bottom,f.left=void 0!==a.left?a.left:f.left}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.stackedArea=function(){"use strict";function b(m){return u.reset(),u.models(r),m.each(function(m){var s=f-e.left-e.right,v=g-e.top-e.bottom;j=d3.select(this),a.utils.initSVG(j),c=r.xScale(),d=r.yScale();var w=m;m.forEach(function(a,b){a.seriesIndex=b,a.values=a.values.map(function(a,c){return a.index=c,a.seriesIndex=b,a})});var x=m.filter(function(a){return!a.disabled});m=d3.layout.stack().order(o).offset(n).values(function(a){return a.values}).x(k).y(l).out(function(a,b,c){a.display={y:c,y0:b}})(x);var y=j.selectAll("g.nv-wrap.nv-stackedarea").data([m]),z=y.enter().append("g").attr("class","nvd3 nv-wrap nv-stackedarea"),A=z.append("defs"),B=z.append("g"),C=y.select("g");B.append("g").attr("class","nv-areaWrap"),B.append("g").attr("class","nv-scatterWrap"),y.attr("transform","translate("+e.left+","+e.top+")"),0==r.forceY().length&&r.forceY().push(0),r.width(s).height(v).x(k).y(function(a){return a.display.y+a.display.y0}).forceY([0]).color(m.map(function(a){return a.color||h(a,a.seriesIndex)}));var D=C.select(".nv-scatterWrap").datum(m);D.call(r),A.append("clipPath").attr("id","nv-edge-clip-"+i).append("rect"),y.select("#nv-edge-clip-"+i+" rect").attr("width",s).attr("height",v),C.attr("clip-path",q?"url(#nv-edge-clip-"+i+")":"");var E=d3.svg.area().x(function(a,b){return c(k(a,b))}).y0(function(a){return d(a.display.y0)}).y1(function(a){return d(a.display.y+a.display.y0)}).interpolate(p),F=d3.svg.area().x(function(a,b){return c(k(a,b))}).y0(function(a){return d(a.display.y0)}).y1(function(a){return d(a.display.y0)}),G=C.select(".nv-areaWrap").selectAll("path.nv-area").data(function(a){return a});G.enter().append("path").attr("class",function(a,b){return"nv-area nv-area-"+b}).attr("d",function(a){return F(a.values,a.seriesIndex)}).on("mouseover",function(a){d3.select(this).classed("hover",!0),t.areaMouseover({point:a,series:a.key,pos:[d3.event.pageX,d3.event.pageY],seriesIndex:a.seriesIndex})}).on("mouseout",function(a){d3.select(this).classed("hover",!1),t.areaMouseout({point:a,series:a.key,pos:[d3.event.pageX,d3.event.pageY],seriesIndex:a.seriesIndex})}).on("click",function(a){d3.select(this).classed("hover",!1),t.areaClick({point:a,series:a.key,pos:[d3.event.pageX,d3.event.pageY],seriesIndex:a.seriesIndex})}),G.exit().remove(),G.style("fill",function(a){return a.color||h(a,a.seriesIndex)}).style("stroke",function(a){return a.color||h(a,a.seriesIndex)}),G.watchTransition(u,"stackedArea path").attr("d",function(a,b){return E(a.values,b)}),r.dispatch.on("elementMouseover.area",function(a){C.select(".nv-chart-"+i+" .nv-area-"+a.seriesIndex).classed("hover",!0)}),r.dispatch.on("elementMouseout.area",function(a){C.select(".nv-chart-"+i+" .nv-area-"+a.seriesIndex).classed("hover",!1)}),b.d3_stackedOffset_stackPercent=function(a){var b,c,d,e=a.length,f=a[0].length,g=[];for(c=0;f>c;++c){for(b=0,d=0;b<w.length;b++)d+=l(w[b].values[c]);if(d)for(b=0;e>b;b++)a[b][c][1]/=d;else for(b=0;e>b;b++)a[b][c][1]=0}for(c=0;f>c;++c)g[c]=0;return g}}),u.renderEnd("stackedArea immediate"),b}var c,d,e={top:0,right:0,bottom:0,left:0},f=960,g=500,h=a.utils.defaultColor(),i=Math.floor(1e5*Math.random()),j=null,k=function(a){return a.x},l=function(a){return a.y},m="stack",n="zero",o="default",p="linear",q=!1,r=a.models.scatter(),s=250,t=d3.dispatch("areaClick","areaMouseover","areaMouseout","renderEnd","elementClick","elementMouseover","elementMouseout");r.pointSize(2.2).pointDomain([2.2,2.2]);var u=a.utils.renderWatch(t,s);return b.dispatch=t,b.scatter=r,r.dispatch.on("elementClick",function(){t.elementClick.apply(this,arguments)}),r.dispatch.on("elementMouseover",function(){t.elementMouseover.apply(this,arguments)}),r.dispatch.on("elementMouseout",function(){t.elementMouseout.apply(this,arguments)}),b.interpolate=function(a){return arguments.length?(p=a,b):p},b.duration=function(a){return arguments.length?(s=a,u.reset(s),r.duration(s),b):s},b.dispatch=t,b.scatter=r,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return f},set:function(a){f=a}},height:{get:function(){return g},set:function(a){g=a}},clipEdge:{get:function(){return q},set:function(a){q=a}},offset:{get:function(){return n},set:function(a){n=a}},order:{get:function(){return o},set:function(a){o=a}},interpolate:{get:function(){return p},set:function(a){p=a}},x:{get:function(){return k},set:function(a){k=d3.functor(a)}},y:{get:function(){return l},set:function(a){l=d3.functor(a)}},margin:{get:function(){return e},set:function(a){e.top=void 0!==a.top?a.top:e.top,e.right=void 0!==a.right?a.right:e.right,e.bottom=void 0!==a.bottom?a.bottom:e.bottom,e.left=void 0!==a.left?a.left:e.left}},color:{get:function(){return h},set:function(b){h=a.utils.getColor(b)}},style:{get:function(){return m},set:function(a){switch(m=a){case"stack":b.offset("zero"),b.order("default");break;case"stream":b.offset("wiggle"),b.order("inside-out");break;case"stream-center":b.offset("silhouette"),b.order("inside-out");break;case"expand":b.offset("expand"),b.order("default");break;case"stack_percent":b.offset(b.d3_stackedOffset_stackPercent),b.order("default")}}},duration:{get:function(){return s},set:function(a){s=a,u.reset(s),r.duration(s)}}}),a.utils.inheritOptions(b,r),a.utils.initOptions(b),b},a.models.stackedAreaChart=function(){"use strict";function b(k){return F.reset(),F.models(e),r&&F.models(f),s&&F.models(g),k.each(function(k){var x=d3.select(this),F=this;a.utils.initSVG(x);var K=a.utils.availableWidth(m,x,l),L=a.utils.availableHeight(n,x,l);if(b.update=function(){x.transition().duration(C).call(b)},b.container=this,v.setter(I(k),b.update).getter(H(k)).update(),v.disabled=k.map(function(a){return!!a.disabled}),!w){var M;w={};for(M in v)w[M]=v[M]instanceof Array?v[M].slice(0):v[M]}if(!(k&&k.length&&k.filter(function(a){return a.values.length}).length))return a.utils.noData(b,x),b;x.selectAll(".nv-noData").remove(),c=e.xScale(),d=e.yScale();var N=x.selectAll("g.nv-wrap.nv-stackedAreaChart").data([k]),O=N.enter().append("g").attr("class","nvd3 nv-wrap nv-stackedAreaChart").append("g"),P=N.select("g");if(O.append("rect").style("opacity",0),O.append("g").attr("class","nv-x nv-axis"),O.append("g").attr("class","nv-y nv-axis"),O.append("g").attr("class","nv-stackedWrap"),O.append("g").attr("class","nv-legendWrap"),O.append("g").attr("class","nv-controlsWrap"),O.append("g").attr("class","nv-interactive"),P.select("rect").attr("width",K).attr("height",L),q){var Q=p?K-z:K;h.width(Q),P.select(".nv-legendWrap").datum(k).call(h),l.top!=h.height()&&(l.top=h.height(),L=a.utils.availableHeight(n,x,l)),P.select(".nv-legendWrap").attr("transform","translate("+(K-Q)+","+-l.top+")")}if(p){var R=[{key:B.stacked||"Stacked",metaKey:"Stacked",disabled:"stack"!=e.style(),style:"stack"},{key:B.stream||"Stream",metaKey:"Stream",disabled:"stream"!=e.style(),style:"stream"},{key:B.expanded||"Expanded",metaKey:"Expanded",disabled:"expand"!=e.style(),style:"expand"},{key:B.stack_percent||"Stack %",metaKey:"Stack_Percent",disabled:"stack_percent"!=e.style(),style:"stack_percent"}];z=A.length/3*260,R=R.filter(function(a){return-1!==A.indexOf(a.metaKey)}),i.width(z).color(["#444","#444","#444"]),P.select(".nv-controlsWrap").datum(R).call(i),l.top!=Math.max(i.height(),h.height())&&(l.top=Math.max(i.height(),h.height()),L=a.utils.availableHeight(n,x,l)),P.select(".nv-controlsWrap").attr("transform","translate(0,"+-l.top+")")}N.attr("transform","translate("+l.left+","+l.top+")"),t&&P.select(".nv-y.nv-axis").attr("transform","translate("+K+",0)"),u&&(j.width(K).height(L).margin({left:l.left,top:l.top}).svgContainer(x).xScale(c),N.select(".nv-interactive").call(j)),e.width(K).height(L);var S=P.select(".nv-stackedWrap").datum(k);if(S.transition().call(e),r&&(f.scale(c)._ticks(a.utils.calcTicksX(K/100,k)).tickSize(-L,0),P.select(".nv-x.nv-axis").attr("transform","translate(0,"+L+")"),P.select(".nv-x.nv-axis").transition().duration(0).call(f)),s){var T;if(T="wiggle"===e.offset()?0:a.utils.calcTicksY(L/36,k),g.scale(d)._ticks(T).tickSize(-K,0),"expand"===e.style()||"stack_percent"===e.style()){var U=g.tickFormat();D&&U===J||(D=U),g.tickFormat(J)}else D&&(g.tickFormat(D),D=null);P.select(".nv-y.nv-axis").transition().duration(0).call(g)}e.dispatch.on("areaClick.toggle",function(a){k.forEach(1===k.filter(function(a){return!a.disabled}).length?function(a){a.disabled=!1}:function(b,c){b.disabled=c!=a.seriesIndex}),v.disabled=k.map(function(a){return!!a.disabled}),y.stateChange(v),b.update()}),h.dispatch.on("stateChange",function(a){for(var c in a)v[c]=a[c];y.stateChange(v),b.update()}),i.dispatch.on("legendClick",function(a){a.disabled&&(R=R.map(function(a){return a.disabled=!0,a}),a.disabled=!1,e.style(a.style),v.style=e.style(),y.stateChange(v),b.update())}),j.dispatch.on("elementMousemove",function(c){e.clearHighlights();var d,g,h,i=[];if(k.filter(function(a,b){return a.seriesIndex=b,!a.disabled}).forEach(function(f,j){g=a.interactiveBisect(f.values,c.pointXValue,b.x());var k=f.values[g],l=b.y()(k,g);if(null!=l&&e.highlightPoint(j,g,!0),"undefined"!=typeof k){"undefined"==typeof d&&(d=k),"undefined"==typeof h&&(h=b.xScale()(b.x()(k,g)));var m="expand"==e.style()?k.display.y:b.y()(k,g);i.push({key:f.key,value:m,color:o(f,f.seriesIndex),stackedValue:k.display})}}),i.reverse(),i.length>2){var m=b.yScale().invert(c.mouseY),n=null;i.forEach(function(a,b){m=Math.abs(m);var c=Math.abs(a.stackedValue.y0),d=Math.abs(a.stackedValue.y);return m>=c&&d+c>=m?void(n=b):void 0}),null!=n&&(i[n].highlight=!0)}var p=f.tickFormat()(b.x()(d,g)),q=j.tooltip.valueFormatter();"expand"===e.style()||"stack_percent"===e.style()?(E||(E=q),q=d3.format(".1%")):E&&(q=E,E=null),j.tooltip.position({left:h+l.left,top:c.mouseY+l.top}).chartContainer(F.parentNode).valueFormatter(q).data({value:p,series:i})(),j.renderGuideLine(h)}),j.dispatch.on("elementMouseout",function(){e.clearHighlights()}),y.on("changeState",function(a){"undefined"!=typeof a.disabled&&k.length===a.disabled.length&&(k.forEach(function(b,c){b.disabled=a.disabled[c]}),v.disabled=a.disabled),"undefined"!=typeof a.style&&(e.style(a.style),G=a.style),b.update()})}),F.renderEnd("stacked Area chart immediate"),b}var c,d,e=a.models.stackedArea(),f=a.models.axis(),g=a.models.axis(),h=a.models.legend(),i=a.models.legend(),j=a.interactiveGuideline(),k=a.models.tooltip(),l={top:30,right:25,bottom:50,left:60},m=null,n=null,o=a.utils.defaultColor(),p=!0,q=!0,r=!0,s=!0,t=!1,u=!1,v=a.utils.state(),w=null,x=null,y=d3.dispatch("stateChange","changeState","renderEnd"),z=250,A=["Stacked","Stream","Expanded"],B={},C=250;v.style=e.style(),f.orient("bottom").tickPadding(7),g.orient(t?"right":"left"),k.headerFormatter(function(a,b){return f.tickFormat()(a,b)}).valueFormatter(function(a,b){return g.tickFormat()(a,b)}),j.tooltip.headerFormatter(function(a,b){return f.tickFormat()(a,b)}).valueFormatter(function(a,b){return g.tickFormat()(a,b)});var D=null,E=null;i.updateState(!1);var F=a.utils.renderWatch(y),G=e.style(),H=function(a){return function(){return{active:a.map(function(a){return!a.disabled}),style:e.style()}}},I=function(a){return function(b){void 0!==b.style&&(G=b.style),void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}},J=d3.format("%");return e.dispatch.on("elementMouseover.tooltip",function(a){a.point.x=e.x()(a.point),a.point.y=e.y()(a.point),k.data(a).position(a.pos).hidden(!1)}),e.dispatch.on("elementMouseout.tooltip",function(){k.hidden(!0)}),b.dispatch=y,b.stacked=e,b.legend=h,b.controls=i,b.xAxis=f,b.yAxis=g,b.interactiveLayer=j,b.tooltip=k,b.dispatch=y,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return m},set:function(a){m=a}},height:{get:function(){return n},set:function(a){n=a}},showLegend:{get:function(){return q},set:function(a){q=a}},showXAxis:{get:function(){return r},set:function(a){r=a}},showYAxis:{get:function(){return s},set:function(a){s=a}},defaultState:{get:function(){return w},set:function(a){w=a}},noData:{get:function(){return x},set:function(a){x=a}},showControls:{get:function(){return p},set:function(a){p=a}},controlLabels:{get:function(){return B},set:function(a){B=a}},controlOptions:{get:function(){return A},set:function(a){A=a}},tooltips:{get:function(){return k.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),k.enabled(!!b)}},tooltipContent:{get:function(){return k.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),k.contentGenerator(b)}},margin:{get:function(){return l},set:function(a){l.top=void 0!==a.top?a.top:l.top,l.right=void 0!==a.right?a.right:l.right,l.bottom=void 0!==a.bottom?a.bottom:l.bottom,l.left=void 0!==a.left?a.left:l.left}},duration:{get:function(){return C},set:function(a){C=a,F.reset(C),e.duration(C),f.duration(C),g.duration(C)}},color:{get:function(){return o},set:function(b){o=a.utils.getColor(b),h.color(o),e.color(o)}},rightAlignYAxis:{get:function(){return t},set:function(a){t=a,g.orient(t?"right":"left")}},useInteractiveGuideline:{get:function(){return u},set:function(a){u=!!a,b.interactive(!a),b.useVoronoi(!a),e.scatter.interactive(!a)}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.sunburst=function(){"use strict";function b(u){return t.reset(),u.each(function(b){function t(a){a.x0=a.x,a.dx0=a.dx}function u(a){var b=d3.interpolate(p.domain(),[a.x,a.x+a.dx]),c=d3.interpolate(q.domain(),[a.y,1]),d=d3.interpolate(q.range(),[a.y?20:0,y]);return function(a,e){return e?function(){return s(a)}:function(e){return p.domain(b(e)),q.domain(c(e)).range(d(e)),s(a)}}}l=d3.select(this);var v,w=a.utils.availableWidth(g,l,f),x=a.utils.availableHeight(h,l,f),y=Math.min(w,x)/2;a.utils.initSVG(l);var z=l.selectAll(".nv-wrap.nv-sunburst").data(b),A=z.enter().append("g").attr("class","nvd3 nv-wrap nv-sunburst nv-chart-"+k),B=A.selectAll("nv-sunburst");z.attr("transform","translate("+w/2+","+x/2+")"),l.on("click",function(a,b){o.chartClick({data:a,index:b,pos:d3.event,id:k})}),q.range([0,y]),c=c||b,e=b[0],r.value(j[i]||j.count),v=B.data(r.nodes).enter().append("path").attr("d",s).style("fill",function(a){return m((a.children?a:a.parent).name)}).style("stroke","#FFF").on("click",function(a){d!==c&&c!==a&&(d=c),c=a,v.transition().duration(n).attrTween("d",u(a))}).each(t).on("dblclick",function(a){d.parent==a&&v.transition().duration(n).attrTween("d",u(e))}).each(t).on("mouseover",function(a){d3.select(this).classed("hover",!0).style("opacity",.8),o.elementMouseover({data:a,color:d3.select(this).style("fill")})}).on("mouseout",function(a){d3.select(this).classed("hover",!1).style("opacity",1),o.elementMouseout({data:a})}).on("mousemove",function(a){o.elementMousemove({data:a})})}),t.renderEnd("sunburst immediate"),b}var c,d,e,f={top:0,right:0,bottom:0,left:0},g=null,h=null,i="count",j={count:function(){return 1},size:function(a){return a.size}},k=Math.floor(1e4*Math.random()),l=null,m=a.utils.defaultColor(),n=500,o=d3.dispatch("chartClick","elementClick","elementDblClick","elementMousemove","elementMouseover","elementMouseout","renderEnd"),p=d3.scale.linear().range([0,2*Math.PI]),q=d3.scale.sqrt(),r=d3.layout.partition().sort(null).value(function(){return 1}),s=d3.svg.arc().startAngle(function(a){return Math.max(0,Math.min(2*Math.PI,p(a.x)))}).endAngle(function(a){return Math.max(0,Math.min(2*Math.PI,p(a.x+a.dx)))}).innerRadius(function(a){return Math.max(0,q(a.y))}).outerRadius(function(a){return Math.max(0,q(a.y+a.dy))}),t=a.utils.renderWatch(o);return b.dispatch=o,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return g},set:function(a){g=a}},height:{get:function(){return h},set:function(a){h=a}},mode:{get:function(){return i},set:function(a){i=a}},id:{get:function(){return k},set:function(a){k=a}},duration:{get:function(){return n},set:function(a){n=a}},margin:{get:function(){return f},set:function(a){f.top=void 0!=a.top?a.top:f.top,f.right=void 0!=a.right?a.right:f.right,f.bottom=void 0!=a.bottom?a.bottom:f.bottom,f.left=void 0!=a.left?a.left:f.left}},color:{get:function(){return m},set:function(b){m=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.sunburstChart=function(){"use strict";function b(d){return m.reset(),m.models(c),d.each(function(d){var h=d3.select(this);a.utils.initSVG(h);var i=a.utils.availableWidth(f,h,e),j=a.utils.availableHeight(g,h,e);if(b.update=function(){0===k?h.call(b):h.transition().duration(k).call(b)},b.container=this,!d||!d.length)return a.utils.noData(b,h),b;h.selectAll(".nv-noData").remove();var l=h.selectAll("g.nv-wrap.nv-sunburstChart").data(d),m=l.enter().append("g").attr("class","nvd3 nv-wrap nv-sunburstChart").append("g"),n=l.select("g");m.append("g").attr("class","nv-sunburstWrap"),l.attr("transform","translate("+e.left+","+e.top+")"),c.width(i).height(j);var o=n.select(".nv-sunburstWrap").datum(d);d3.transition(o).call(c)}),m.renderEnd("sunburstChart immediate"),b}var c=a.models.sunburst(),d=a.models.tooltip(),e={top:30,right:20,bottom:20,left:20},f=null,g=null,h=a.utils.defaultColor(),i=(Math.round(1e5*Math.random()),null),j=null,k=250,l=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState","renderEnd"),m=a.utils.renderWatch(l);return d.headerEnabled(!1).duration(0).valueFormatter(function(a){return a}),c.dispatch.on("elementMouseover.tooltip",function(a){a.series={key:a.data.name,value:a.data.size,color:a.color},d.data(a).hidden(!1)}),c.dispatch.on("elementMouseout.tooltip",function(){d.hidden(!0)}),c.dispatch.on("elementMousemove.tooltip",function(){d.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.dispatch=l,b.sunburst=c,b.tooltip=d,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{noData:{get:function(){return j},set:function(a){j=a}},defaultState:{get:function(){return i},set:function(a){i=a}},color:{get:function(){return h},set:function(a){h=a,c.color(h)}},duration:{get:function(){return k},set:function(a){k=a,m.reset(k),c.duration(k)}},margin:{get:function(){return e},set:function(a){e.top=void 0!==a.top?a.top:e.top,e.right=void 0!==a.right?a.right:e.right,e.bottom=void 0!==a.bottom?a.bottom:e.bottom,e.left=void 0!==a.left?a.left:e.left}}}),a.utils.inheritOptions(b,c),a.utils.initOptions(b),b},a.version="1.8.1"}();
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/respond.min.js b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/respond.min.js
new file mode 100644
index 00000000..80a7b69d
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/respond.min.js
@@ -0,0 +1,5 @@
+/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl
+ * Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
+ *  */
+
+!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),h=a.setTimeout(u,p),void 0;g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);n.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;b<s.length;b++){var c=s[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!o[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(v(c.styleSheet.rawCssText,e,f),o[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!r||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}w()};x(),c.update=x,c.getEmValue=t,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this);
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist
new file mode 100644
index 00000000..4bb0e42c
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist
@@ -0,0 +1,11 @@
+     <tr>
+      <td class="{{methods_level}}" colspan="4">{{name}}</td>
+      <td class="{{methods_level}} big">{{methods_bar}}</td>
+      <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
+      <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
+      <td class="{{methods_level}} small">{{crap}}</td>
+      <td class="{{lines_level}} big">{{lines_bar}}</td>
+      <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
+      <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
+     </tr>
+
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node.php
new file mode 100644
index 00000000..c57f7442
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node.php
@@ -0,0 +1,339 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Base class for nodes in the code coverage information tree.
+ *
+ * @since Class available since Release 1.1.0
+ */
+abstract class PHP_CodeCoverage_Report_Node implements Countable
+{
+    /**
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * @var array
+     */
+    protected $pathArray;
+
+    /**
+     * @var PHP_CodeCoverage_Report_Node
+     */
+    protected $parent;
+
+    /**
+     * @var string
+     */
+    protected $id;
+
+    /**
+     * Constructor.
+     *
+     * @param string                       $name
+     * @param PHP_CodeCoverage_Report_Node $parent
+     */
+    public function __construct($name, PHP_CodeCoverage_Report_Node $parent = null)
+    {
+        if (substr($name, -1) == '/') {
+            $name = substr($name, 0, -1);
+        }
+
+        $this->name   = $name;
+        $this->parent = $parent;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getId()
+    {
+        if ($this->id === null) {
+            $parent = $this->getParent();
+
+            if ($parent === null) {
+                $this->id = 'index';
+            } else {
+                $parentId = $parent->getId();
+
+                if ($parentId == 'index') {
+                    $this->id = str_replace(':', '_', $this->name);
+                } else {
+                    $this->id = $parentId . '/' . $this->name;
+                }
+            }
+        }
+
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath()
+    {
+        if ($this->path === null) {
+            if ($this->parent === null || $this->parent->getPath() === null || $this->parent->getPath() === false) {
+                $this->path = $this->name;
+            } else {
+                $this->path = $this->parent->getPath() . '/' . $this->name;
+            }
+        }
+
+        return $this->path;
+    }
+
+    /**
+     * @return array
+     */
+    public function getPathAsArray()
+    {
+        if ($this->pathArray === null) {
+            if ($this->parent === null) {
+                $this->pathArray = array();
+            } else {
+                $this->pathArray = $this->parent->getPathAsArray();
+            }
+
+            $this->pathArray[] = $this;
+        }
+
+        return $this->pathArray;
+    }
+
+    /**
+     * @return PHP_CodeCoverage_Report_Node
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Returns the percentage of classes that has been tested.
+     *
+     * @param  bool $asString
+     * @return int
+     */
+    public function getTestedClassesPercent($asString = true)
+    {
+        return PHP_CodeCoverage_Util::percent(
+            $this->getNumTestedClasses(),
+            $this->getNumClasses(),
+            $asString
+        );
+    }
+
+    /**
+     * Returns the percentage of traits that has been tested.
+     *
+     * @param  bool $asString
+     * @return int
+     */
+    public function getTestedTraitsPercent($asString = true)
+    {
+        return PHP_CodeCoverage_Util::percent(
+            $this->getNumTestedTraits(),
+            $this->getNumTraits(),
+            $asString
+        );
+    }
+
+    /**
+     * Returns the percentage of traits that has been tested.
+     *
+     * @param  bool $asString
+     * @return int
+     * @since  Method available since Release 1.2.0
+     */
+    public function getTestedClassesAndTraitsPercent($asString = true)
+    {
+        return PHP_CodeCoverage_Util::percent(
+            $this->getNumTestedClassesAndTraits(),
+            $this->getNumClassesAndTraits(),
+            $asString
+        );
+    }
+
+    /**
+     * Returns the percentage of methods that has been tested.
+     *
+     * @param  bool $asString
+     * @return int
+     */
+    public function getTestedMethodsPercent($asString = true)
+    {
+        return PHP_CodeCoverage_Util::percent(
+            $this->getNumTestedMethods(),
+            $this->getNumMethods(),
+            $asString
+        );
+    }
+
+    /**
+     * Returns the percentage of executed lines.
+     *
+     * @param  bool $asString
+     * @return int
+     */
+    public function getLineExecutedPercent($asString = true)
+    {
+        return PHP_CodeCoverage_Util::percent(
+            $this->getNumExecutedLines(),
+            $this->getNumExecutableLines(),
+            $asString
+        );
+    }
+
+    /**
+     * Returns the number of classes and traits.
+     *
+     * @return int
+     * @since  Method available since Release 1.2.0
+     */
+    public function getNumClassesAndTraits()
+    {
+        return $this->getNumClasses() + $this->getNumTraits();
+    }
+
+    /**
+     * Returns the number of tested classes and traits.
+     *
+     * @return int
+     * @since  Method available since Release 1.2.0
+     */
+    public function getNumTestedClassesAndTraits()
+    {
+        return $this->getNumTestedClasses() + $this->getNumTestedTraits();
+    }
+
+    /**
+     * Returns the classes and traits of this node.
+     *
+     * @return array
+     * @since  Method available since Release 1.2.0
+     */
+    public function getClassesAndTraits()
+    {
+        return array_merge($this->getClasses(), $this->getTraits());
+    }
+
+    /**
+     * Returns the classes of this node.
+     *
+     * @return array
+     */
+    abstract public function getClasses();
+
+    /**
+     * Returns the traits of this node.
+     *
+     * @return array
+     */
+    abstract public function getTraits();
+
+    /**
+     * Returns the functions of this node.
+     *
+     * @return array
+     */
+    abstract public function getFunctions();
+
+    /**
+     * Returns the LOC/CLOC/NCLOC of this node.
+     *
+     * @return array
+     */
+    abstract public function getLinesOfCode();
+
+    /**
+     * Returns the number of executable lines.
+     *
+     * @return int
+     */
+    abstract public function getNumExecutableLines();
+
+    /**
+     * Returns the number of executed lines.
+     *
+     * @return int
+     */
+    abstract public function getNumExecutedLines();
+
+    /**
+     * Returns the number of classes.
+     *
+     * @return int
+     */
+    abstract public function getNumClasses();
+
+    /**
+     * Returns the number of tested classes.
+     *
+     * @return int
+     */
+    abstract public function getNumTestedClasses();
+
+    /**
+     * Returns the number of traits.
+     *
+     * @return int
+     */
+    abstract public function getNumTraits();
+
+    /**
+     * Returns the number of tested traits.
+     *
+     * @return int
+     */
+    abstract public function getNumTestedTraits();
+
+    /**
+     * Returns the number of methods.
+     *
+     * @return int
+     */
+    abstract public function getNumMethods();
+
+    /**
+     * Returns the number of tested methods.
+     *
+     * @return int
+     */
+    abstract public function getNumTestedMethods();
+
+    /**
+     * Returns the number of functions.
+     *
+     * @return int
+     */
+    abstract public function getNumFunctions();
+
+    /**
+     * Returns the number of tested functions.
+     *
+     * @return int
+     */
+    abstract public function getNumTestedFunctions();
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Directory.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Directory.php
new file mode 100644
index 00000000..dd71ecb5
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Directory.php
@@ -0,0 +1,478 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a directory in the code coverage information tree.
+ *
+ * @since Class available since Release 1.1.0
+ */
+class PHP_CodeCoverage_Report_Node_Directory extends PHP_CodeCoverage_Report_Node implements IteratorAggregate
+{
+    /**
+     * @var PHP_CodeCoverage_Report_Node[]
+     */
+    protected $children = array();
+
+    /**
+     * @var PHP_CodeCoverage_Report_Node_Directory[]
+     */
+    protected $directories = array();
+
+    /**
+     * @var PHP_CodeCoverage_Report_Node_File[]
+     */
+    protected $files = array();
+
+    /**
+     * @var array
+     */
+    protected $classes;
+
+    /**
+     * @var array
+     */
+    protected $traits;
+
+    /**
+     * @var array
+     */
+    protected $functions;
+
+    /**
+     * @var array
+     */
+    protected $linesOfCode = null;
+
+    /**
+     * @var int
+     */
+    protected $numFiles = -1;
+
+    /**
+     * @var int
+     */
+    protected $numExecutableLines = -1;
+
+    /**
+     * @var int
+     */
+    protected $numExecutedLines = -1;
+
+    /**
+     * @var int
+     */
+    protected $numClasses = -1;
+
+    /**
+     * @var int
+     */
+    protected $numTestedClasses = -1;
+
+    /**
+     * @var int
+     */
+    protected $numTraits = -1;
+
+    /**
+     * @var int
+     */
+    protected $numTestedTraits = -1;
+
+    /**
+     * @var int
+     */
+    protected $numMethods = -1;
+
+    /**
+     * @var int
+     */
+    protected $numTestedMethods = -1;
+
+    /**
+     * @var int
+     */
+    protected $numFunctions = -1;
+
+    /**
+     * @var int
+     */
+    protected $numTestedFunctions = -1;
+
+    /**
+     * Returns the number of files in/under this node.
+     *
+     * @return int
+     */
+    public function count()
+    {
+        if ($this->numFiles == -1) {
+            $this->numFiles = 0;
+
+            foreach ($this->children as $child) {
+                $this->numFiles += count($child);
+            }
+        }
+
+        return $this->numFiles;
+    }
+
+    /**
+     * Returns an iterator for this node.
+     *
+     * @return RecursiveIteratorIterator
+     */
+    public function getIterator()
+    {
+        return new RecursiveIteratorIterator(
+            new PHP_CodeCoverage_Report_Node_Iterator($this),
+            RecursiveIteratorIterator::SELF_FIRST
+        );
+    }
+
+    /**
+     * Adds a new directory.
+     *
+     * @param  string                                 $name
+     * @return PHP_CodeCoverage_Report_Node_Directory
+     */
+    public function addDirectory($name)
+    {
+        $directory = new self($name, $this);
+
+        $this->children[]    = $directory;
+        $this->directories[] = &$this->children[count($this->children) - 1];
+
+        return $directory;
+    }
+
+    /**
+     * Adds a new file.
+     *
+     * @param  string                            $name
+     * @param  array                             $coverageData
+     * @param  array                             $testData
+     * @param  bool                              $cacheTokens
+     * @return PHP_CodeCoverage_Report_Node_File
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function addFile($name, array $coverageData, array $testData, $cacheTokens)
+    {
+        $file = new PHP_CodeCoverage_Report_Node_File(
+            $name,
+            $this,
+            $coverageData,
+            $testData,
+            $cacheTokens
+        );
+
+        $this->children[] = $file;
+        $this->files[]    = &$this->children[count($this->children) - 1];
+
+        $this->numExecutableLines = -1;
+        $this->numExecutedLines   = -1;
+
+        return $file;
+    }
+
+    /**
+     * Returns the directories in this directory.
+     *
+     * @return array
+     */
+    public function getDirectories()
+    {
+        return $this->directories;
+    }
+
+    /**
+     * Returns the files in this directory.
+     *
+     * @return array
+     */
+    public function getFiles()
+    {
+        return $this->files;
+    }
+
+    /**
+     * Returns the child nodes of this node.
+     *
+     * @return array
+     */
+    public function getChildNodes()
+    {
+        return $this->children;
+    }
+
+    /**
+     * Returns the classes of this node.
+     *
+     * @return array
+     */
+    public function getClasses()
+    {
+        if ($this->classes === null) {
+            $this->classes = array();
+
+            foreach ($this->children as $child) {
+                $this->classes = array_merge(
+                    $this->classes,
+                    $child->getClasses()
+                );
+            }
+        }
+
+        return $this->classes;
+    }
+
+    /**
+     * Returns the traits of this node.
+     *
+     * @return array
+     */
+    public function getTraits()
+    {
+        if ($this->traits === null) {
+            $this->traits = array();
+
+            foreach ($this->children as $child) {
+                $this->traits = array_merge(
+                    $this->traits,
+                    $child->getTraits()
+                );
+            }
+        }
+
+        return $this->traits;
+    }
+
+    /**
+     * Returns the functions of this node.
+     *
+     * @return array
+     */
+    public function getFunctions()
+    {
+        if ($this->functions === null) {
+            $this->functions = array();
+
+            foreach ($this->children as $child) {
+                $this->functions = array_merge(
+                    $this->functions,
+                    $child->getFunctions()
+                );
+            }
+        }
+
+        return $this->functions;
+    }
+
+    /**
+     * Returns the LOC/CLOC/NCLOC of this node.
+     *
+     * @return array
+     */
+    public function getLinesOfCode()
+    {
+        if ($this->linesOfCode === null) {
+            $this->linesOfCode = array('loc' => 0, 'cloc' => 0, 'ncloc' => 0);
+
+            foreach ($this->children as $child) {
+                $linesOfCode = $child->getLinesOfCode();
+
+                $this->linesOfCode['loc']   += $linesOfCode['loc'];
+                $this->linesOfCode['cloc']  += $linesOfCode['cloc'];
+                $this->linesOfCode['ncloc'] += $linesOfCode['ncloc'];
+            }
+        }
+
+        return $this->linesOfCode;
+    }
+
+    /**
+     * Returns the number of executable lines.
+     *
+     * @return int
+     */
+    public function getNumExecutableLines()
+    {
+        if ($this->numExecutableLines == -1) {
+            $this->numExecutableLines = 0;
+
+            foreach ($this->children as $child) {
+                $this->numExecutableLines += $child->getNumExecutableLines();
+            }
+        }
+
+        return $this->numExecutableLines;
+    }
+
+    /**
+     * Returns the number of executed lines.
+     *
+     * @return int
+     */
+    public function getNumExecutedLines()
+    {
+        if ($this->numExecutedLines == -1) {
+            $this->numExecutedLines = 0;
+
+            foreach ($this->children as $child) {
+                $this->numExecutedLines += $child->getNumExecutedLines();
+            }
+        }
+
+        return $this->numExecutedLines;
+    }
+
+    /**
+     * Returns the number of classes.
+     *
+     * @return int
+     */
+    public function getNumClasses()
+    {
+        if ($this->numClasses == -1) {
+            $this->numClasses = 0;
+
+            foreach ($this->children as $child) {
+                $this->numClasses += $child->getNumClasses();
+            }
+        }
+
+        return $this->numClasses;
+    }
+
+    /**
+     * Returns the number of tested classes.
+     *
+     * @return int
+     */
+    public function getNumTestedClasses()
+    {
+        if ($this->numTestedClasses == -1) {
+            $this->numTestedClasses = 0;
+
+            foreach ($this->children as $child) {
+                $this->numTestedClasses += $child->getNumTestedClasses();
+            }
+        }
+
+        return $this->numTestedClasses;
+    }
+
+    /**
+     * Returns the number of traits.
+     *
+     * @return int
+     */
+    public function getNumTraits()
+    {
+        if ($this->numTraits == -1) {
+            $this->numTraits = 0;
+
+            foreach ($this->children as $child) {
+                $this->numTraits += $child->getNumTraits();
+            }
+        }
+
+        return $this->numTraits;
+    }
+
+    /**
+     * Returns the number of tested traits.
+     *
+     * @return int
+     */
+    public function getNumTestedTraits()
+    {
+        if ($this->numTestedTraits == -1) {
+            $this->numTestedTraits = 0;
+
+            foreach ($this->children as $child) {
+                $this->numTestedTraits += $child->getNumTestedTraits();
+            }
+        }
+
+        return $this->numTestedTraits;
+    }
+
+    /**
+     * Returns the number of methods.
+     *
+     * @return int
+     */
+    public function getNumMethods()
+    {
+        if ($this->numMethods == -1) {
+            $this->numMethods = 0;
+
+            foreach ($this->children as $child) {
+                $this->numMethods += $child->getNumMethods();
+            }
+        }
+
+        return $this->numMethods;
+    }
+
+    /**
+     * Returns the number of tested methods.
+     *
+     * @return int
+     */
+    public function getNumTestedMethods()
+    {
+        if ($this->numTestedMethods == -1) {
+            $this->numTestedMethods = 0;
+
+            foreach ($this->children as $child) {
+                $this->numTestedMethods += $child->getNumTestedMethods();
+            }
+        }
+
+        return $this->numTestedMethods;
+    }
+
+    /**
+     * Returns the number of functions.
+     *
+     * @return int
+     */
+    public function getNumFunctions()
+    {
+        if ($this->numFunctions == -1) {
+            $this->numFunctions = 0;
+
+            foreach ($this->children as $child) {
+                $this->numFunctions += $child->getNumFunctions();
+            }
+        }
+
+        return $this->numFunctions;
+    }
+
+    /**
+     * Returns the number of tested functions.
+     *
+     * @return int
+     */
+    public function getNumTestedFunctions()
+    {
+        if ($this->numTestedFunctions == -1) {
+            $this->numTestedFunctions = 0;
+
+            foreach ($this->children as $child) {
+                $this->numTestedFunctions += $child->getNumTestedFunctions();
+            }
+        }
+
+        return $this->numTestedFunctions;
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/File.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/File.php
new file mode 100644
index 00000000..03b3d8cf
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/File.php
@@ -0,0 +1,656 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a file in the code coverage information tree.
+ *
+ * @since Class available since Release 1.1.0
+ */
+class PHP_CodeCoverage_Report_Node_File extends PHP_CodeCoverage_Report_Node
+{
+    /**
+     * @var array
+     */
+    protected $coverageData;
+
+    /**
+     * @var array
+     */
+    protected $testData;
+
+    /**
+     * @var int
+     */
+    protected $numExecutableLines = 0;
+
+    /**
+     * @var int
+     */
+    protected $numExecutedLines = 0;
+
+    /**
+     * @var array
+     */
+    protected $classes = array();
+
+    /**
+     * @var array
+     */
+    protected $traits = array();
+
+    /**
+     * @var array
+     */
+    protected $functions = array();
+
+    /**
+     * @var array
+     */
+    protected $linesOfCode = array();
+
+    /**
+     * @var int
+     */
+    protected $numTestedTraits = 0;
+
+    /**
+     * @var int
+     */
+    protected $numTestedClasses = 0;
+
+    /**
+     * @var int
+     */
+    protected $numMethods = null;
+
+    /**
+     * @var int
+     */
+    protected $numTestedMethods = null;
+
+    /**
+     * @var int
+     */
+    protected $numTestedFunctions = null;
+
+    /**
+     * @var array
+     */
+    protected $startLines = array();
+
+    /**
+     * @var array
+     */
+    protected $endLines = array();
+
+    /**
+     * @var bool
+     */
+    protected $cacheTokens;
+
+    /**
+     * Constructor.
+     *
+     * @param  string                       $name
+     * @param  PHP_CodeCoverage_Report_Node $parent
+     * @param  array                        $coverageData
+     * @param  array                        $testData
+     * @param  bool                         $cacheTokens
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function __construct($name, PHP_CodeCoverage_Report_Node $parent, array $coverageData, array $testData, $cacheTokens)
+    {
+        if (!is_bool($cacheTokens)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        parent::__construct($name, $parent);
+
+        $this->coverageData = $coverageData;
+        $this->testData     = $testData;
+        $this->cacheTokens  = $cacheTokens;
+
+        $this->calculateStatistics();
+    }
+
+    /**
+     * Returns the number of files in/under this node.
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return 1;
+    }
+
+    /**
+     * Returns the code coverage data of this node.
+     *
+     * @return array
+     */
+    public function getCoverageData()
+    {
+        return $this->coverageData;
+    }
+
+    /**
+     * Returns the test data of this node.
+     *
+     * @return array
+     */
+    public function getTestData()
+    {
+        return $this->testData;
+    }
+
+    /**
+     * Returns the classes of this node.
+     *
+     * @return array
+     */
+    public function getClasses()
+    {
+        return $this->classes;
+    }
+
+    /**
+     * Returns the traits of this node.
+     *
+     * @return array
+     */
+    public function getTraits()
+    {
+        return $this->traits;
+    }
+
+    /**
+     * Returns the functions of this node.
+     *
+     * @return array
+     */
+    public function getFunctions()
+    {
+        return $this->functions;
+    }
+
+    /**
+     * Returns the LOC/CLOC/NCLOC of this node.
+     *
+     * @return array
+     */
+    public function getLinesOfCode()
+    {
+        return $this->linesOfCode;
+    }
+
+    /**
+     * Returns the number of executable lines.
+     *
+     * @return int
+     */
+    public function getNumExecutableLines()
+    {
+        return $this->numExecutableLines;
+    }
+
+    /**
+     * Returns the number of executed lines.
+     *
+     * @return int
+     */
+    public function getNumExecutedLines()
+    {
+        return $this->numExecutedLines;
+    }
+
+    /**
+     * Returns the number of classes.
+     *
+     * @return int
+     */
+    public function getNumClasses()
+    {
+        return count($this->classes);
+    }
+
+    /**
+     * Returns the number of tested classes.
+     *
+     * @return int
+     */
+    public function getNumTestedClasses()
+    {
+        return $this->numTestedClasses;
+    }
+
+    /**
+     * Returns the number of traits.
+     *
+     * @return int
+     */
+    public function getNumTraits()
+    {
+        return count($this->traits);
+    }
+
+    /**
+     * Returns the number of tested traits.
+     *
+     * @return int
+     */
+    public function getNumTestedTraits()
+    {
+        return $this->numTestedTraits;
+    }
+
+    /**
+     * Returns the number of methods.
+     *
+     * @return int
+     */
+    public function getNumMethods()
+    {
+        if ($this->numMethods === null) {
+            $this->numMethods = 0;
+
+            foreach ($this->classes as $class) {
+                foreach ($class['methods'] as $method) {
+                    if ($method['executableLines'] > 0) {
+                        $this->numMethods++;
+                    }
+                }
+            }
+
+            foreach ($this->traits as $trait) {
+                foreach ($trait['methods'] as $method) {
+                    if ($method['executableLines'] > 0) {
+                        $this->numMethods++;
+                    }
+                }
+            }
+        }
+
+        return $this->numMethods;
+    }
+
+    /**
+     * Returns the number of tested methods.
+     *
+     * @return int
+     */
+    public function getNumTestedMethods()
+    {
+        if ($this->numTestedMethods === null) {
+            $this->numTestedMethods = 0;
+
+            foreach ($this->classes as $class) {
+                foreach ($class['methods'] as $method) {
+                    if ($method['executableLines'] > 0 &&
+                        $method['coverage'] == 100) {
+                        $this->numTestedMethods++;
+                    }
+                }
+            }
+
+            foreach ($this->traits as $trait) {
+                foreach ($trait['methods'] as $method) {
+                    if ($method['executableLines'] > 0 &&
+                        $method['coverage'] == 100) {
+                        $this->numTestedMethods++;
+                    }
+                }
+            }
+        }
+
+        return $this->numTestedMethods;
+    }
+
+    /**
+     * Returns the number of functions.
+     *
+     * @return int
+     */
+    public function getNumFunctions()
+    {
+        return count($this->functions);
+    }
+
+    /**
+     * Returns the number of tested functions.
+     *
+     * @return int
+     */
+    public function getNumTestedFunctions()
+    {
+        if ($this->numTestedFunctions === null) {
+            $this->numTestedFunctions = 0;
+
+            foreach ($this->functions as $function) {
+                if ($function['executableLines'] > 0 &&
+                    $function['coverage'] == 100) {
+                    $this->numTestedFunctions++;
+                }
+            }
+        }
+
+        return $this->numTestedFunctions;
+    }
+
+    /**
+     * Calculates coverage statistics for the file.
+     */
+    protected function calculateStatistics()
+    {
+        if ($this->cacheTokens) {
+            $tokens = PHP_Token_Stream_CachingFactory::get($this->getPath());
+        } else {
+            $tokens = new PHP_Token_Stream($this->getPath());
+        }
+
+        $this->processClasses($tokens);
+        $this->processTraits($tokens);
+        $this->processFunctions($tokens);
+        $this->linesOfCode = $tokens->getLinesOfCode();
+        unset($tokens);
+
+        for ($lineNumber = 1; $lineNumber <= $this->linesOfCode['loc']; $lineNumber++) {
+            if (isset($this->startLines[$lineNumber])) {
+                // Start line of a class.
+                if (isset($this->startLines[$lineNumber]['className'])) {
+                    $currentClass = &$this->startLines[$lineNumber];
+                } // Start line of a trait.
+                elseif (isset($this->startLines[$lineNumber]['traitName'])) {
+                    $currentTrait = &$this->startLines[$lineNumber];
+                } // Start line of a method.
+                elseif (isset($this->startLines[$lineNumber]['methodName'])) {
+                    $currentMethod = &$this->startLines[$lineNumber];
+                } // Start line of a function.
+                elseif (isset($this->startLines[$lineNumber]['functionName'])) {
+                    $currentFunction = &$this->startLines[$lineNumber];
+                }
+            }
+
+            if (isset($this->coverageData[$lineNumber]) &&
+                $this->coverageData[$lineNumber] !== null) {
+                if (isset($currentClass)) {
+                    $currentClass['executableLines']++;
+                }
+
+                if (isset($currentTrait)) {
+                    $currentTrait['executableLines']++;
+                }
+
+                if (isset($currentMethod)) {
+                    $currentMethod['executableLines']++;
+                }
+
+                if (isset($currentFunction)) {
+                    $currentFunction['executableLines']++;
+                }
+
+                $this->numExecutableLines++;
+
+                if (count($this->coverageData[$lineNumber]) > 0) {
+                    if (isset($currentClass)) {
+                        $currentClass['executedLines']++;
+                    }
+
+                    if (isset($currentTrait)) {
+                        $currentTrait['executedLines']++;
+                    }
+
+                    if (isset($currentMethod)) {
+                        $currentMethod['executedLines']++;
+                    }
+
+                    if (isset($currentFunction)) {
+                        $currentFunction['executedLines']++;
+                    }
+
+                    $this->numExecutedLines++;
+                }
+            }
+
+            if (isset($this->endLines[$lineNumber])) {
+                // End line of a class.
+                if (isset($this->endLines[$lineNumber]['className'])) {
+                    unset($currentClass);
+                } // End line of a trait.
+                elseif (isset($this->endLines[$lineNumber]['traitName'])) {
+                    unset($currentTrait);
+                } // End line of a method.
+                elseif (isset($this->endLines[$lineNumber]['methodName'])) {
+                    unset($currentMethod);
+                } // End line of a function.
+                elseif (isset($this->endLines[$lineNumber]['functionName'])) {
+                    unset($currentFunction);
+                }
+            }
+        }
+
+        foreach ($this->traits as &$trait) {
+            foreach ($trait['methods'] as &$method) {
+                if ($method['executableLines'] > 0) {
+                    $method['coverage'] = ($method['executedLines'] /
+                            $method['executableLines']) * 100;
+                } else {
+                    $method['coverage'] = 100;
+                }
+
+                $method['crap'] = $this->crap(
+                    $method['ccn'],
+                    $method['coverage']
+                );
+
+                $trait['ccn'] += $method['ccn'];
+            }
+
+            if ($trait['executableLines'] > 0) {
+                $trait['coverage'] = ($trait['executedLines'] /
+                        $trait['executableLines']) * 100;
+            } else {
+                $trait['coverage'] = 100;
+            }
+
+            if ($trait['coverage'] == 100) {
+                $this->numTestedClasses++;
+            }
+
+            $trait['crap'] = $this->crap(
+                $trait['ccn'],
+                $trait['coverage']
+            );
+        }
+
+        foreach ($this->classes as &$class) {
+            foreach ($class['methods'] as &$method) {
+                if ($method['executableLines'] > 0) {
+                    $method['coverage'] = ($method['executedLines'] /
+                            $method['executableLines']) * 100;
+                } else {
+                    $method['coverage'] = 100;
+                }
+
+                $method['crap'] = $this->crap(
+                    $method['ccn'],
+                    $method['coverage']
+                );
+
+                $class['ccn'] += $method['ccn'];
+            }
+
+            if ($class['executableLines'] > 0) {
+                $class['coverage'] = ($class['executedLines'] /
+                        $class['executableLines']) * 100;
+            } else {
+                $class['coverage'] = 100;
+            }
+
+            if ($class['coverage'] == 100) {
+                $this->numTestedClasses++;
+            }
+
+            $class['crap'] = $this->crap(
+                $class['ccn'],
+                $class['coverage']
+            );
+        }
+    }
+
+    /**
+     * @param PHP_Token_Stream $tokens
+     */
+    protected function processClasses(PHP_Token_Stream $tokens)
+    {
+        $classes = $tokens->getClasses();
+        unset($tokens);
+
+        $link = $this->getId() . '.html#';
+
+        foreach ($classes as $className => $class) {
+            $this->classes[$className] = array(
+                'className'       => $className,
+                'methods'         => array(),
+                'startLine'       => $class['startLine'],
+                'executableLines' => 0,
+                'executedLines'   => 0,
+                'ccn'             => 0,
+                'coverage'        => 0,
+                'crap'            => 0,
+                'package'         => $class['package'],
+                'link'            => $link . $class['startLine']
+            );
+
+            $this->startLines[$class['startLine']] = &$this->classes[$className];
+            $this->endLines[$class['endLine']]     = &$this->classes[$className];
+
+            foreach ($class['methods'] as $methodName => $method) {
+                $this->classes[$className]['methods'][$methodName] = array(
+                    'methodName'      => $methodName,
+                    'signature'       => $method['signature'],
+                    'startLine'       => $method['startLine'],
+                    'endLine'         => $method['endLine'],
+                    'executableLines' => 0,
+                    'executedLines'   => 0,
+                    'ccn'             => $method['ccn'],
+                    'coverage'        => 0,
+                    'crap'            => 0,
+                    'link'            => $link . $method['startLine']
+                );
+
+                $this->startLines[$method['startLine']] = &$this->classes[$className]['methods'][$methodName];
+                $this->endLines[$method['endLine']]     = &$this->classes[$className]['methods'][$methodName];
+            }
+        }
+    }
+
+    /**
+     * @param PHP_Token_Stream $tokens
+     */
+    protected function processTraits(PHP_Token_Stream $tokens)
+    {
+        $traits = $tokens->getTraits();
+        unset($tokens);
+
+        $link = $this->getId() . '.html#';
+
+        foreach ($traits as $traitName => $trait) {
+            $this->traits[$traitName] = array(
+                'traitName'       => $traitName,
+                'methods'         => array(),
+                'startLine'       => $trait['startLine'],
+                'executableLines' => 0,
+                'executedLines'   => 0,
+                'ccn'             => 0,
+                'coverage'        => 0,
+                'crap'            => 0,
+                'package'         => $trait['package'],
+                'link'            => $link . $trait['startLine']
+            );
+
+            $this->startLines[$trait['startLine']] = &$this->traits[$traitName];
+            $this->endLines[$trait['endLine']]     = &$this->traits[$traitName];
+
+            foreach ($trait['methods'] as $methodName => $method) {
+                $this->traits[$traitName]['methods'][$methodName] = array(
+                    'methodName'      => $methodName,
+                    'signature'       => $method['signature'],
+                    'startLine'       => $method['startLine'],
+                    'endLine'         => $method['endLine'],
+                    'executableLines' => 0,
+                    'executedLines'   => 0,
+                    'ccn'             => $method['ccn'],
+                    'coverage'        => 0,
+                    'crap'            => 0,
+                    'link'            => $link . $method['startLine']
+                );
+
+                $this->startLines[$method['startLine']] = &$this->traits[$traitName]['methods'][$methodName];
+                $this->endLines[$method['endLine']]     = &$this->traits[$traitName]['methods'][$methodName];
+            }
+        }
+    }
+
+    /**
+     * @param PHP_Token_Stream $tokens
+     */
+    protected function processFunctions(PHP_Token_Stream $tokens)
+    {
+        $functions = $tokens->getFunctions();
+        unset($tokens);
+
+        $link = $this->getId() . '.html#';
+
+        foreach ($functions as $functionName => $function) {
+            $this->functions[$functionName] = array(
+                'functionName'    => $functionName,
+                'signature'       => $function['signature'],
+                'startLine'       => $function['startLine'],
+                'executableLines' => 0,
+                'executedLines'   => 0,
+                'ccn'             => $function['ccn'],
+                'coverage'        => 0,
+                'crap'            => 0,
+                'link'            => $link . $function['startLine']
+            );
+
+            $this->startLines[$function['startLine']] = &$this->functions[$functionName];
+            $this->endLines[$function['endLine']]     = &$this->functions[$functionName];
+        }
+    }
+
+    /**
+     * Calculates the Change Risk Anti-Patterns (CRAP) index for a unit of code
+     * based on its cyclomatic complexity and percentage of code coverage.
+     *
+     * @param  int    $ccn
+     * @param  float  $coverage
+     * @return string
+     * @since  Method available since Release 1.2.0
+     */
+    protected function crap($ccn, $coverage)
+    {
+        if ($coverage == 0) {
+            return (string) (pow($ccn, 2) + $ccn);
+        }
+
+        if ($coverage >= 95) {
+            return (string) $ccn;
+        }
+
+        return sprintf(
+            '%01.2F',
+            pow($ccn, 2) * pow(1 - $coverage/100, 3) + $ccn
+        );
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Iterator.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Iterator.php
new file mode 100644
index 00000000..f468b6b8
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Iterator.php
@@ -0,0 +1,105 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Recursive iterator for PHP_CodeCoverage_Report_Node object graphs.
+ *
+ * @since Class available since Release 1.1.0
+ */
+class PHP_CodeCoverage_Report_Node_Iterator implements RecursiveIterator
+{
+    /**
+     * @var int
+     */
+    protected $position;
+
+    /**
+     * @var PHP_CodeCoverage_Report_Node[]
+     */
+    protected $nodes;
+
+    /**
+     * Constructor.
+     *
+     * @param PHP_CodeCoverage_Report_Node_Directory $node
+     */
+    public function __construct(PHP_CodeCoverage_Report_Node_Directory $node)
+    {
+        $this->nodes = $node->getChildNodes();
+    }
+
+    /**
+     * Rewinds the Iterator to the first element.
+     */
+    public function rewind()
+    {
+        $this->position = 0;
+    }
+
+    /**
+     * Checks if there is a current element after calls to rewind() or next().
+     *
+     * @return bool
+     */
+    public function valid()
+    {
+        return $this->position < count($this->nodes);
+    }
+
+    /**
+     * Returns the key of the current element.
+     *
+     * @return int
+     */
+    public function key()
+    {
+        return $this->position;
+    }
+
+    /**
+     * Returns the current element.
+     *
+     * @return PHPUnit_Framework_Test
+     */
+    public function current()
+    {
+        return $this->valid() ? $this->nodes[$this->position] : null;
+    }
+
+    /**
+     * Moves forward to next element.
+     */
+    public function next()
+    {
+        $this->position++;
+    }
+
+    /**
+     * Returns the sub iterator for the current element.
+     *
+     * @return PHP_CodeCoverage_Report_Node_Iterator
+     */
+    public function getChildren()
+    {
+        return new self(
+            $this->nodes[$this->position]
+        );
+    }
+
+    /**
+     * Checks whether the current element has children.
+     *
+     * @return bool
+     */
+    public function hasChildren()
+    {
+        return $this->nodes[$this->position] instanceof PHP_CodeCoverage_Report_Node_Directory;
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/PHP.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/PHP.php
new file mode 100644
index 00000000..f4e5a0f9
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/PHP.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Uses var_export() to write a PHP_CodeCoverage object to a file.
+ *
+ * @since Class available since Release 1.1.0
+ */
+class PHP_CodeCoverage_Report_PHP
+{
+    /**
+     * @param  PHP_CodeCoverage $coverage
+     * @param  string           $target
+     * @return string
+     */
+    public function process(PHP_CodeCoverage $coverage, $target = null)
+    {
+        $filter = $coverage->filter();
+
+        $output = sprintf(
+            '<?php
+$coverage = new PHP_CodeCoverage;
+$coverage->setData(%s);
+$coverage->setTests(%s);
+
+$filter = $coverage->filter();
+$filter->setBlacklistedFiles(%s);
+$filter->setWhitelistedFiles(%s);
+
+return $coverage;',
+            var_export($coverage->getData(true), 1),
+            var_export($coverage->getTests(), 1),
+            var_export($filter->getBlacklistedFiles(), 1),
+            var_export($filter->getWhitelistedFiles(), 1)
+        );
+
+        if ($target !== null) {
+            return file_put_contents($target, $output);
+        } else {
+            return $output;
+        }
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Text.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Text.php
new file mode 100644
index 00000000..7dc25452
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Text.php
@@ -0,0 +1,246 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Generates human readable output from an PHP_CodeCoverage object.
+ *
+ * The output gets put into a text file our written to the CLI.
+ *
+ * @since Class available since Release 1.1.0
+ */
+class PHP_CodeCoverage_Report_Text
+{
+    protected $lowUpperBound;
+    protected $highLowerBound;
+    protected $showUncoveredFiles;
+    protected $showOnlySummary;
+
+    protected $colors = array(
+        'green'  => "\x1b[30;42m",
+        'yellow' => "\x1b[30;43m",
+        'red'    => "\x1b[37;41m",
+        'header' => "\x1b[1;37;40m",
+        'reset'  => "\x1b[0m",
+        'eol'    => "\x1b[2K",
+    );
+
+    public function __construct($lowUpperBound, $highLowerBound, $showUncoveredFiles, $showOnlySummary)
+    {
+        $this->lowUpperBound      = $lowUpperBound;
+        $this->highLowerBound     = $highLowerBound;
+        $this->showUncoveredFiles = $showUncoveredFiles;
+        $this->showOnlySummary    = $showOnlySummary;
+    }
+
+    /**
+     * @param  PHP_CodeCoverage $coverage
+     * @param  bool             $showColors
+     * @return string
+     */
+    public function process(PHP_CodeCoverage $coverage, $showColors = false)
+    {
+        $output = PHP_EOL . PHP_EOL;
+        $report = $coverage->getReport();
+        unset($coverage);
+
+        $colors = array(
+            'header'  => '',
+            'classes' => '',
+            'methods' => '',
+            'lines'   => '',
+            'reset'   => '',
+            'eol'     => ''
+        );
+
+        if ($showColors) {
+            $colors['classes'] = $this->getCoverageColor(
+                $report->getNumTestedClassesAndTraits(),
+                $report->getNumClassesAndTraits()
+            );
+            $colors['methods'] = $this->getCoverageColor(
+                $report->getNumTestedMethods(),
+                $report->getNumMethods()
+            );
+            $colors['lines']   = $this->getCoverageColor(
+                $report->getNumExecutedLines(),
+                $report->getNumExecutableLines()
+            );
+            $colors['reset']   = $this->colors['reset'];
+            $colors['header']  = $this->colors['header'];
+            $colors['eol']     = $this->colors['eol'];
+        }
+
+        $classes = sprintf(
+            '  Classes: %6s (%d/%d)',
+            PHP_CodeCoverage_Util::percent(
+                $report->getNumTestedClassesAndTraits(),
+                $report->getNumClassesAndTraits(),
+                true
+            ),
+            $report->getNumTestedClassesAndTraits(),
+            $report->getNumClassesAndTraits()
+        );
+
+        $methods = sprintf(
+            '  Methods: %6s (%d/%d)',
+            PHP_CodeCoverage_Util::percent(
+                $report->getNumTestedMethods(),
+                $report->getNumMethods(),
+                true
+            ),
+            $report->getNumTestedMethods(),
+            $report->getNumMethods()
+        );
+
+        $lines = sprintf(
+            '  Lines:   %6s (%d/%d)',
+            PHP_CodeCoverage_Util::percent(
+                $report->getNumExecutedLines(),
+                $report->getNumExecutableLines(),
+                true
+            ),
+            $report->getNumExecutedLines(),
+            $report->getNumExecutableLines()
+        );
+
+        $padding = max(array_map('strlen', array($classes, $methods, $lines)));
+
+        if ($this->showOnlySummary) {
+            $title   = 'Code Coverage Report Summary:';
+            $padding = max($padding, strlen($title));
+
+            $output .= $this->format($colors['header'], $padding, $title);
+        } else {
+            $date  = date('  Y-m-d H:i:s', $_SERVER['REQUEST_TIME']);
+            $title = 'Code Coverage Report:';
+
+            $output .= $this->format($colors['header'], $padding, $title);
+            $output .= $this->format($colors['header'], $padding, $date);
+            $output .= $this->format($colors['header'], $padding, '');
+            $output .= $this->format($colors['header'], $padding, ' Summary:');
+        }
+
+        $output .= $this->format($colors['classes'], $padding, $classes);
+        $output .= $this->format($colors['methods'], $padding, $methods);
+        $output .= $this->format($colors['lines'], $padding, $lines);
+
+        if ($this->showOnlySummary) {
+            return $output . PHP_EOL;
+        }
+
+        $classCoverage = array();
+
+        foreach ($report as $item) {
+            if (!$item instanceof PHP_CodeCoverage_Report_Node_File) {
+                continue;
+            }
+
+            $classes  = $item->getClassesAndTraits();
+
+            foreach ($classes as $className => $class) {
+                $classStatements        = 0;
+                $coveredClassStatements = 0;
+                $coveredMethods         = 0;
+                $classMethods           = 0;
+
+                foreach ($class['methods'] as $method) {
+                    if ($method['executableLines'] == 0) {
+                        continue;
+                    }
+
+                    $classMethods++;
+                    $classStatements        += $method['executableLines'];
+                    $coveredClassStatements += $method['executedLines'];
+                    if ($method['coverage'] == 100) {
+                        $coveredMethods++;
+                    }
+                }
+
+                if (!empty($class['package']['namespace'])) {
+                    $namespace = '\\' . $class['package']['namespace'] . '::';
+                } elseif (!empty($class['package']['fullPackage'])) {
+                    $namespace = '@' . $class['package']['fullPackage'] . '::';
+                } else {
+                    $namespace = '';
+                }
+
+                $classCoverage[$namespace . $className] = array(
+                    'namespace'         => $namespace,
+                    'className '        => $className,
+                    'methodsCovered'    => $coveredMethods,
+                    'methodCount'       => $classMethods,
+                    'statementsCovered' => $coveredClassStatements,
+                    'statementCount'    => $classStatements,
+                );
+            }
+        }
+
+        ksort($classCoverage);
+
+        $methodColor = '';
+        $linesColor  = '';
+        $resetColor  = '';
+
+        foreach ($classCoverage as $fullQualifiedPath => $classInfo) {
+            if ($classInfo['statementsCovered'] != 0 ||
+                $this->showUncoveredFiles) {
+                if ($showColors) {
+                    $methodColor = $this->getCoverageColor($classInfo['methodsCovered'], $classInfo['methodCount']);
+                    $linesColor  = $this->getCoverageColor($classInfo['statementsCovered'], $classInfo['statementCount']);
+                    $resetColor  = $colors['reset'];
+                }
+
+                $output .= PHP_EOL . $fullQualifiedPath . PHP_EOL
+                    . '  ' . $methodColor . 'Methods: ' . $this->printCoverageCounts($classInfo['methodsCovered'], $classInfo['methodCount'], 2) . $resetColor . ' '
+                    . '  ' . $linesColor  . 'Lines: ' . $this->printCoverageCounts($classInfo['statementsCovered'], $classInfo['statementCount'], 3) . $resetColor
+                ;
+            }
+        }
+
+        return $output . PHP_EOL;
+    }
+
+    protected function getCoverageColor($numberOfCoveredElements, $totalNumberOfElements)
+    {
+        $coverage = PHP_CodeCoverage_Util::percent(
+            $numberOfCoveredElements,
+            $totalNumberOfElements
+        );
+
+        if ($coverage >= $this->highLowerBound) {
+            return $this->colors['green'];
+        } elseif ($coverage > $this->lowUpperBound) {
+            return $this->colors['yellow'];
+        }
+
+        return $this->colors['red'];
+    }
+
+    protected function printCoverageCounts($numberOfCoveredElements, $totalNumberOfElements, $presicion)
+    {
+        $format = '%' . $presicion . 's';
+
+        return PHP_CodeCoverage_Util::percent(
+            $numberOfCoveredElements,
+            $totalNumberOfElements,
+            true,
+            true
+        ) .
+        ' (' . sprintf($format, $numberOfCoveredElements) . '/' .
+        sprintf($format, $totalNumberOfElements) . ')';
+    }
+
+    private function format($color, $padding, $string)
+    {
+        $reset = $color ? $this->colors['reset'] : '';
+
+        return $color . str_pad($string, $padding) . $reset . PHP_EOL;
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML.php
new file mode 100644
index 00000000..5177b2bd
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML.php
@@ -0,0 +1,234 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * @since Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML
+{
+    /**
+     * @var string
+     */
+    private $target;
+
+    /**
+     * @var PHP_CodeCoverage_Report_XML_Project
+     */
+    private $project;
+
+    public function process(PHP_CodeCoverage $coverage, $target)
+    {
+        if (substr($target, -1, 1) != DIRECTORY_SEPARATOR) {
+            $target .= DIRECTORY_SEPARATOR;
+        }
+
+        $this->target = $target;
+        $this->initTargetDirectory($target);
+
+        $report = $coverage->getReport();
+
+        $this->project = new PHP_CodeCoverage_Report_XML_Project(
+            $coverage->getReport()->getName()
+        );
+
+        $this->processTests($coverage->getTests());
+        $this->processDirectory($report, $this->project);
+
+        $index                     = $this->project->asDom();
+        $index->formatOutput       = true;
+        $index->preserveWhiteSpace = false;
+        $index->save($target . '/index.xml');
+    }
+
+    private function initTargetDirectory($dir)
+    {
+        if (file_exists($dir)) {
+            if (!is_dir($dir)) {
+                throw new PHP_CodeCoverage_Exception(
+                    "'$dir' exists but is not a directory."
+                );
+            }
+
+            if (!is_writable($dir)) {
+                throw new PHP_CodeCoverage_Exception(
+                    "'$dir' exists but is not writable."
+                );
+            }
+        } elseif (!@mkdir($dir, 0777, true)) {
+            throw new PHP_CodeCoverage_Exception(
+                "'$dir' could not be created."
+            );
+        }
+    }
+
+    private function processDirectory(PHP_CodeCoverage_Report_Node_Directory $directory, PHP_CodeCoverage_Report_XML_Node $context)
+    {
+        $dirObject = $context->addDirectory($directory->getName());
+
+        $this->setTotals($directory, $dirObject->getTotals());
+
+        foreach ($directory as $node) {
+            if ($node instanceof PHP_CodeCoverage_Report_Node_Directory) {
+                $this->processDirectory($node, $dirObject);
+                continue;
+            }
+
+            if ($node instanceof PHP_CodeCoverage_Report_Node_File) {
+                $this->processFile($node, $dirObject);
+                continue;
+            }
+
+            throw new PHP_CodeCoverage_Exception(
+                'Unknown node type for XML report'
+            );
+        }
+    }
+
+    private function processFile(PHP_CodeCoverage_Report_Node_File $file, PHP_CodeCoverage_Report_XML_Directory $context)
+    {
+        $fileObject = $context->addFile(
+            $file->getName(),
+            $file->getId() . '.xml'
+        );
+
+        $this->setTotals($file, $fileObject->getTotals());
+
+        $fileReport = new PHP_CodeCoverage_Report_XML_File_Report(
+            $file->getName()
+        );
+
+        $this->setTotals($file, $fileReport->getTotals());
+
+        foreach ($file->getClassesAndTraits() as $unit) {
+            $this->processUnit($unit, $fileReport);
+        }
+
+        foreach ($file->getFunctions() as $function) {
+            $this->processFunction($function, $fileReport);
+        }
+
+        foreach ($file->getCoverageData() as $line => $tests) {
+            if (!is_array($tests) || count($tests) == 0) {
+                continue;
+            }
+
+            $coverage = $fileReport->getLineCoverage($line);
+
+            foreach ($tests as $test) {
+                $coverage->addTest($test);
+            }
+
+            $coverage->finalize();
+        }
+
+        $this->initTargetDirectory(
+            $this->target . dirname($file->getId()) . '/'
+        );
+
+        $fileDom                     = $fileReport->asDom();
+        $fileDom->formatOutput       = true;
+        $fileDom->preserveWhiteSpace = false;
+        $fileDom->save($this->target . $file->getId() . '.xml');
+    }
+
+    private function processUnit($unit, PHP_CodeCoverage_Report_XML_File_Report $report)
+    {
+        if (isset($unit['className'])) {
+            $unitObject = $report->getClassObject($unit['className']);
+        } else {
+            $unitObject = $report->getTraitObject($unit['traitName']);
+        }
+
+        $unitObject->setLines(
+            $unit['startLine'],
+            $unit['executableLines'],
+            $unit['executedLines']
+        );
+
+        $unitObject->setCrap($unit['crap']);
+
+        $unitObject->setPackage(
+            $unit['package']['fullPackage'],
+            $unit['package']['package'],
+            $unit['package']['subpackage'],
+            $unit['package']['category']
+        );
+
+        $unitObject->setNamespace($unit['package']['namespace']);
+
+        foreach ($unit['methods'] as $method) {
+            $methodObject = $unitObject->addMethod($method['methodName']);
+            $methodObject->setSignature($method['signature']);
+            $methodObject->setLines($method['startLine'], $method['endLine']);
+            $methodObject->setCrap($method['crap']);
+            $methodObject->setTotals(
+                $method['executableLines'],
+                $method['executedLines'],
+                $method['coverage']
+            );
+        }
+    }
+
+    private function processFunction($function, PHP_CodeCoverage_Report_XML_File_Report $report)
+    {
+        $functionObject = $report->getFunctionObject($function['functionName']);
+
+        $functionObject->setSignature($function['signature']);
+        $functionObject->setLines($function['startLine']);
+        $functionObject->setCrap($function['crap']);
+        $functionObject->setTotals($function['executableLines'], $function['executedLines'], $function['coverage']);
+    }
+
+    private function processTests(array $tests)
+    {
+        $testsObject = $this->project->getTests();
+
+        foreach ($tests as $test => $result) {
+            if ($test == 'UNCOVERED_FILES_FROM_WHITELIST') {
+                continue;
+            }
+
+            $testsObject->addTest($test, $result);
+        }
+    }
+
+    private function setTotals(PHP_CodeCoverage_Report_Node $node, PHP_CodeCoverage_Report_XML_Totals $totals)
+    {
+        $loc = $node->getLinesOfCode();
+
+        $totals->setNumLines(
+            $loc['loc'],
+            $loc['cloc'],
+            $loc['ncloc'],
+            $node->getNumExecutableLines(),
+            $node->getNumExecutedLines()
+        );
+
+        $totals->setNumClasses(
+            $node->getNumClasses(),
+            $node->getNumTestedClasses()
+        );
+
+        $totals->setNumTraits(
+            $node->getNumTraits(),
+            $node->getNumTestedTraits()
+        );
+
+        $totals->setNumMethods(
+            $node->getNumMethods(),
+            $node->getNumTestedMethods()
+        );
+
+        $totals->setNumFunctions(
+            $node->getNumFunctions(),
+            $node->getNumTestedFunctions()
+        );
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Directory.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Directory.php
new file mode 100644
index 00000000..8e292b50
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Directory.php
@@ -0,0 +1,16 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * @since Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_Directory extends PHP_CodeCoverage_Report_XML_Node
+{
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File.php
new file mode 100644
index 00000000..3c72bab2
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * @since Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_File
+{
+    /**
+     * @var DOMDocument
+     */
+    protected $dom;
+
+    /**
+     * @var DOMElement
+     */
+    protected $contextNode;
+
+    public function __construct(DOMElement $context)
+    {
+        $this->dom         = $context->ownerDocument;
+        $this->contextNode = $context;
+    }
+
+    public function getTotals()
+    {
+        $totalsContainer = $this->contextNode->firstChild;
+
+        if (!$totalsContainer) {
+            $totalsContainer = $this->contextNode->appendChild(
+                $this->dom->createElementNS(
+                    'http://schema.phpunit.de/coverage/1.0',
+                    'totals'
+                )
+            );
+        }
+
+        return new PHP_CodeCoverage_Report_XML_Totals($totalsContainer);
+    }
+
+    public function getLineCoverage($line)
+    {
+        $coverage = $this->contextNode->getElementsByTagNameNS(
+            'http://schema.phpunit.de/coverage/1.0',
+            'coverage'
+        )->item(0);
+
+        if (!$coverage) {
+            $coverage = $this->contextNode->appendChild(
+                $this->dom->createElementNS(
+                    'http://schema.phpunit.de/coverage/1.0',
+                    'coverage'
+                )
+            );
+        }
+
+        $lineNode = $coverage->appendChild(
+            $this->dom->createElementNS(
+                'http://schema.phpunit.de/coverage/1.0',
+                'line'
+            )
+        );
+
+        return new PHP_CodeCoverage_Report_XML_File_Coverage($lineNode, $line);
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Coverage.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Coverage.php
new file mode 100644
index 00000000..29a4e2ba
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Coverage.php
@@ -0,0 +1,66 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * @since Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_File_Coverage
+{
+    /**
+     * @var XMLWriter
+     */
+    private $writer;
+
+    /**
+     * @var DOMElement
+     */
+    private $contextNode;
+
+    /**
+     * @var bool
+     */
+    private $finalized = false;
+
+    public function __construct(DOMElement $context, $line)
+    {
+        $this->contextNode = $context;
+
+        $this->writer = new XMLWriter();
+        $this->writer->openMemory();
+        $this->writer->startElementNs(null, $context->nodeName, 'http://schema.phpunit.de/coverage/1.0');
+        $this->writer->writeAttribute('nr', $line);
+    }
+
+    public function addTest($test)
+    {
+        if ($this->finalized) {
+            throw new PHP_CodeCoverage_Exception('Coverage Report already finalized');
+        }
+
+        $this->writer->startElement('covered');
+        $this->writer->writeAttribute('by', $test);
+        $this->writer->endElement();
+    }
+
+    public function finalize()
+    {
+        $this->writer->endElement();
+
+        $fragment = $this->contextNode->ownerDocument->createDocumentFragment();
+        $fragment->appendXML($this->writer->outputMemory());
+
+        $this->contextNode->parentNode->replaceChild(
+            $fragment,
+            $this->contextNode
+        );
+
+        $this->finalized = true;
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Method.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Method.php
new file mode 100644
index 00000000..917628fd
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Method.php
@@ -0,0 +1,58 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * @since Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_File_Method
+{
+    /**
+     * @var DOMElement
+     */
+    private $contextNode;
+
+    public function __construct(DOMElement $context, $name)
+    {
+        $this->contextNode = $context;
+
+        $this->setName($name);
+    }
+
+    private function setName($name)
+    {
+        $this->contextNode->setAttribute('name', $name);
+    }
+
+    public function setSignature($signature)
+    {
+        $this->contextNode->setAttribute('signature', $signature);
+    }
+
+    public function setLines($start, $end = null)
+    {
+        $this->contextNode->setAttribute('start', $start);
+
+        if ($end !== null) {
+            $this->contextNode->setAttribute('end', $end);
+        }
+    }
+
+    public function setTotals($executable, $executed, $coverage)
+    {
+        $this->contextNode->setAttribute('executable', $executable);
+        $this->contextNode->setAttribute('executed', $executed);
+        $this->contextNode->setAttribute('coverage', $coverage);
+    }
+
+    public function setCrap($crap)
+    {
+        $this->contextNode->setAttribute('crap', $crap);
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Report.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Report.php
new file mode 100644
index 00000000..a6fe7ecf
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Report.php
@@ -0,0 +1,72 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * @since Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_File_Report extends PHP_CodeCoverage_Report_XML_File
+{
+    public function __construct($name)
+    {
+        $this->dom = new DOMDocument;
+        $this->dom->loadXML('<?xml version="1.0" ?><phpunit xmlns="http://schema.phpunit.de/coverage/1.0"><file /></phpunit>');
+
+        $this->contextNode = $this->dom->getElementsByTagNameNS(
+            'http://schema.phpunit.de/coverage/1.0',
+            'file'
+        )->item(0);
+
+        $this->setName($name);
+    }
+
+    private function setName($name)
+    {
+        $this->contextNode->setAttribute('name', $name);
+    }
+
+    public function asDom()
+    {
+        return $this->dom;
+    }
+
+    public function getFunctionObject($name)
+    {
+        $node = $this->contextNode->appendChild(
+            $this->dom->createElementNS(
+                'http://schema.phpunit.de/coverage/1.0',
+                'function'
+            )
+        );
+
+        return new PHP_CodeCoverage_Report_XML_File_Method($node, $name);
+    }
+
+    public function getClassObject($name)
+    {
+        return $this->getUnitObject('class', $name);
+    }
+
+    public function getTraitObject($name)
+    {
+        return $this->getUnitObject('trait', $name);
+    }
+
+    private function getUnitObject($tagName, $name)
+    {
+        $node = $this->contextNode->appendChild(
+            $this->dom->createElementNS(
+                'http://schema.phpunit.de/coverage/1.0',
+                $tagName
+            )
+        );
+
+        return new PHP_CodeCoverage_Report_XML_File_Unit($node, $name);
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Unit.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Unit.php
new file mode 100644
index 00000000..769d9dab
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Unit.php
@@ -0,0 +1,97 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * @since Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_File_Unit
+{
+    /**
+     * @var DOMElement
+     */
+    private $contextNode;
+
+    public function __construct(DOMElement $context, $name)
+    {
+        $this->contextNode = $context;
+
+        $this->setName($name);
+    }
+
+    private function setName($name)
+    {
+        $this->contextNode->setAttribute('name', $name);
+    }
+
+    public function setLines($start, $executable, $executed)
+    {
+        $this->contextNode->setAttribute('start', $start);
+        $this->contextNode->setAttribute('executable', $executable);
+        $this->contextNode->setAttribute('executed', $executed);
+    }
+
+    public function setCrap($crap)
+    {
+        $this->contextNode->setAttribute('crap', $crap);
+    }
+
+    public function setPackage($full, $package, $sub, $category)
+    {
+        $node = $this->contextNode->getElementsByTagNameNS(
+            'http://schema.phpunit.de/coverage/1.0',
+            'package'
+        )->item(0);
+
+        if (!$node) {
+            $node = $this->contextNode->appendChild(
+                $this->contextNode->ownerDocument->createElementNS(
+                    'http://schema.phpunit.de/coverage/1.0',
+                    'package'
+                )
+            );
+        }
+
+        $node->setAttribute('full', $full);
+        $node->setAttribute('name', $package);
+        $node->setAttribute('sub', $sub);
+        $node->setAttribute('category', $category);
+    }
+
+    public function setNamespace($namespace)
+    {
+        $node = $this->contextNode->getElementsByTagNameNS(
+            'http://schema.phpunit.de/coverage/1.0',
+            'namespace'
+        )->item(0);
+
+        if (!$node) {
+            $node = $this->contextNode->appendChild(
+                $this->contextNode->ownerDocument->createElementNS(
+                    'http://schema.phpunit.de/coverage/1.0',
+                    'namespace'
+                )
+            );
+        }
+
+        $node->setAttribute('name', $namespace);
+    }
+
+    public function addMethod($name)
+    {
+        $node = $this->contextNode->appendChild(
+            $this->contextNode->ownerDocument->createElementNS(
+                'http://schema.phpunit.de/coverage/1.0',
+                'method'
+            )
+        );
+
+        return new PHP_CodeCoverage_Report_XML_File_Method($node, $name);
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Node.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Node.php
new file mode 100644
index 00000000..43dda57c
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Node.php
@@ -0,0 +1,89 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * @since Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_Node
+{
+    /**
+     * @var DOMDocument
+     */
+    private $dom;
+
+    /**
+     * @var DOMElement
+     */
+    private $contextNode;
+
+    public function __construct(DOMElement $context)
+    {
+        $this->setContextNode($context);
+    }
+
+    protected function setContextNode(DOMElement $context)
+    {
+        $this->dom         = $context->ownerDocument;
+        $this->contextNode = $context;
+    }
+
+    public function getDom()
+    {
+        return $this->dom;
+    }
+
+    protected function getContextNode()
+    {
+        return $this->contextNode;
+    }
+
+    public function getTotals()
+    {
+        $totalsContainer = $this->getContextNode()->firstChild;
+
+        if (!$totalsContainer) {
+            $totalsContainer = $this->getContextNode()->appendChild(
+                $this->dom->createElementNS(
+                    'http://schema.phpunit.de/coverage/1.0',
+                    'totals'
+                )
+            );
+        }
+
+        return new PHP_CodeCoverage_Report_XML_Totals($totalsContainer);
+    }
+
+    public function addDirectory($name)
+    {
+        $dirNode = $this->getDom()->createElementNS(
+            'http://schema.phpunit.de/coverage/1.0',
+            'directory'
+        );
+
+        $dirNode->setAttribute('name', $name);
+        $this->getContextNode()->appendChild($dirNode);
+
+        return new PHP_CodeCoverage_Report_XML_Directory($dirNode);
+    }
+
+    public function addFile($name, $href)
+    {
+        $fileNode = $this->getDom()->createElementNS(
+            'http://schema.phpunit.de/coverage/1.0',
+            'file'
+        );
+
+        $fileNode->setAttribute('name', $name);
+        $fileNode->setAttribute('href', $href);
+        $this->getContextNode()->appendChild($fileNode);
+
+        return new PHP_CodeCoverage_Report_XML_File($fileNode);
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Project.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Project.php
new file mode 100644
index 00000000..b8dae04d
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Project.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * @since Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_Project extends PHP_CodeCoverage_Report_XML_Node
+{
+    public function __construct($name)
+    {
+        $this->init();
+        $this->setProjectName($name);
+    }
+
+    private function init()
+    {
+        $dom = new DOMDocument;
+        $dom->loadXML('<?xml version="1.0" ?><phpunit xmlns="http://schema.phpunit.de/coverage/1.0"><project/></phpunit>');
+
+        $this->setContextNode(
+            $dom->getElementsByTagNameNS(
+                'http://schema.phpunit.de/coverage/1.0',
+                'project'
+            )->item(0)
+        );
+    }
+
+    private function setProjectName($name)
+    {
+        $this->getContextNode()->setAttribute('name', $name);
+    }
+
+    public function getTests()
+    {
+        $testsNode = $this->getContextNode()->getElementsByTagNameNS(
+            'http://schema.phpunit.de/coverage/1.0',
+            'tests'
+        )->item(0);
+
+        if (!$testsNode) {
+            $testsNode = $this->getContextNode()->appendChild(
+                $this->getDom()->createElementNS(
+                    'http://schema.phpunit.de/coverage/1.0',
+                    'tests'
+                )
+            );
+        }
+
+        return new PHP_CodeCoverage_Report_XML_Tests($testsNode);
+    }
+
+    public function asDom()
+    {
+        return $this->getDom();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Tests.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Tests.php
new file mode 100644
index 00000000..46214679
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Tests.php
@@ -0,0 +1,45 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * @since Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_Tests
+{
+    private $contextNode;
+
+    private $codeMap = array(
+        0 => 'PASSED',     // PHPUnit_Runner_BaseTestRunner::STATUS_PASSED
+        1 => 'SKIPPED',    // PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED
+        2 => 'INCOMPLETE', // PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE
+        3 => 'FAILURE',    // PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE
+        4 => 'ERROR',      // PHPUnit_Runner_BaseTestRunner::STATUS_ERROR
+        5 => 'RISKY'       // PHPUnit_Runner_BaseTestRunner::STATUS_RISKY
+    );
+
+    public function __construct(DOMElement $context)
+    {
+        $this->contextNode = $context;
+    }
+
+    public function addTest($test, array $result)
+    {
+        $node = $this->contextNode->appendChild(
+            $this->contextNode->ownerDocument->createElementNS(
+                'http://schema.phpunit.de/coverage/1.0',
+                'test'
+            )
+        );
+        $node->setAttribute('name', $test);
+        $node->setAttribute('size', $result['size']);
+        $node->setAttribute('result', (int) $result['status']);
+        $node->setAttribute('status', $this->codeMap[(int) $result['status']]);
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Totals.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Totals.php
new file mode 100644
index 00000000..d6073d95
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Totals.php
@@ -0,0 +1,140 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * @since Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_Totals
+{
+    /**
+     * @var DOMNode
+     */
+    private $container;
+
+    /**
+     * @var DOMElement
+     */
+    private $linesNode;
+
+    /**
+     * @var DOMElement
+     */
+    private $methodsNode;
+
+    /**
+     * @var DOMElement
+     */
+    private $functionsNode;
+
+    /**
+     * @var DOMElement
+     */
+    private $classesNode;
+
+    /**
+     * @var DOMElement
+     */
+    private $traitsNode;
+
+    public function __construct(DOMElement $container)
+    {
+        $this->container = $container;
+        $dom             = $container->ownerDocument;
+
+        $this->linesNode = $dom->createElementNS(
+            'http://schema.phpunit.de/coverage/1.0',
+            'lines'
+        );
+
+        $this->methodsNode = $dom->createElementNS(
+            'http://schema.phpunit.de/coverage/1.0',
+            'methods'
+        );
+
+        $this->functionsNode = $dom->createElementNS(
+            'http://schema.phpunit.de/coverage/1.0',
+            'functions'
+        );
+
+        $this->classesNode = $dom->createElementNS(
+            'http://schema.phpunit.de/coverage/1.0',
+            'classes'
+        );
+
+        $this->traitsNode = $dom->createElementNS(
+            'http://schema.phpunit.de/coverage/1.0',
+            'traits'
+        );
+
+        $container->appendChild($this->linesNode);
+        $container->appendChild($this->methodsNode);
+        $container->appendChild($this->functionsNode);
+        $container->appendChild($this->classesNode);
+        $container->appendChild($this->traitsNode);
+    }
+
+    public function getContainer()
+    {
+        return $this->container;
+    }
+
+    public function setNumLines($loc, $cloc, $ncloc, $executable, $executed)
+    {
+        $this->linesNode->setAttribute('total', $loc);
+        $this->linesNode->setAttribute('comments', $cloc);
+        $this->linesNode->setAttribute('code', $ncloc);
+        $this->linesNode->setAttribute('executable', $executable);
+        $this->linesNode->setAttribute('executed', $executed);
+        $this->linesNode->setAttribute(
+            'percent',
+            PHP_CodeCoverage_Util::percent($executed, $executable, true)
+        );
+    }
+
+    public function setNumClasses($count, $tested)
+    {
+        $this->classesNode->setAttribute('count', $count);
+        $this->classesNode->setAttribute('tested', $tested);
+        $this->classesNode->setAttribute(
+            'percent',
+            PHP_CodeCoverage_Util::percent($tested, $count, true)
+        );
+    }
+
+    public function setNumTraits($count, $tested)
+    {
+        $this->traitsNode->setAttribute('count', $count);
+        $this->traitsNode->setAttribute('tested', $tested);
+        $this->traitsNode->setAttribute(
+            'percent',
+            PHP_CodeCoverage_Util::percent($tested, $count, true)
+        );
+    }
+
+    public function setNumMethods($count, $tested)
+    {
+        $this->methodsNode->setAttribute('count', $count);
+        $this->methodsNode->setAttribute('tested', $tested);
+        $this->methodsNode->setAttribute(
+            'percent',
+            PHP_CodeCoverage_Util::percent($tested, $count, true)
+        );
+    }
+
+    public function setNumFunctions($count, $tested)
+    {
+        $this->functionsNode->setAttribute('count', $count);
+        $this->functionsNode->setAttribute('tested', $tested);
+        $this->functionsNode->setAttribute(
+            'percent',
+            PHP_CodeCoverage_Util::percent($tested, $count, true)
+        );
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util.php
new file mode 100644
index 00000000..eadb3c92
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util.php
@@ -0,0 +1,45 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Utility methods.
+ *
+ * @since Class available since Release 1.0.0
+ */
+class PHP_CodeCoverage_Util
+{
+    /**
+     * @param  float $a
+     * @param  float $b
+     * @return float ($a / $b) * 100
+     */
+    public static function percent($a, $b, $asString = false, $fixedWidth = false)
+    {
+        if ($asString && $b == 0) {
+            return '';
+        }
+
+        if ($b > 0) {
+            $percent = ($a / $b) * 100;
+        } else {
+            $percent = 100;
+        }
+
+        if ($asString) {
+            if ($fixedWidth) {
+                return sprintf('%6.2F%%', $percent);
+            }
+
+            return sprintf('%01.2F%%', $percent);
+        } else {
+            return $percent;
+        }
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util/InvalidArgumentHelper.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util/InvalidArgumentHelper.php
new file mode 100644
index 00000000..d66e4992
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util/InvalidArgumentHelper.php
@@ -0,0 +1,39 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Factory for PHP_CodeCoverage_Exception objects that are used to describe
+ * invalid arguments passed to a function or method.
+ *
+ * @since Class available since Release 1.2.0
+ */
+class PHP_CodeCoverage_Util_InvalidArgumentHelper
+{
+    /**
+     * @param int    $argument
+     * @param string $type
+     * @param mixed  $value
+     */
+    public static function factory($argument, $type, $value = null)
+    {
+        $stack = debug_backtrace(false);
+
+        return new PHP_CodeCoverage_Exception(
+            sprintf(
+                'Argument #%d%sof %s::%s() must be a %s',
+                $argument,
+                $value !== null ? ' (' . gettype($value) . '#' . $value . ')' : ' (No Value) ',
+                $stack[1]['class'],
+                $stack[1]['function'],
+                $type
+            )
+        );
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/FilterTest.php b/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/FilterTest.php
new file mode 100644
index 00000000..66f8bb42
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/FilterTest.php
@@ -0,0 +1,281 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+if (!defined('TEST_FILES_PATH')) {
+    define(
+        'TEST_FILES_PATH',
+        dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR .
+        '_files' . DIRECTORY_SEPARATOR
+    );
+}
+
+/**
+ * Tests for the PHP_CodeCoverage_Filter class.
+ *
+ * @since Class available since Release 1.0.0
+ */
+class PHP_CodeCoverage_FilterTest extends PHPUnit_Framework_TestCase
+{
+    protected $filter;
+    protected $files;
+
+    protected function setUp()
+    {
+        $this->filter = unserialize('O:23:"PHP_CodeCoverage_Filter":0:{}');
+
+        $this->files = array(
+            TEST_FILES_PATH . 'BankAccount.php',
+            TEST_FILES_PATH . 'BankAccountTest.php',
+            TEST_FILES_PATH . 'CoverageClassExtendedTest.php',
+            TEST_FILES_PATH . 'CoverageClassTest.php',
+            TEST_FILES_PATH . 'CoverageFunctionParenthesesTest.php',
+            TEST_FILES_PATH . 'CoverageFunctionParenthesesWhitespaceTest.php',
+            TEST_FILES_PATH . 'CoverageFunctionTest.php',
+            TEST_FILES_PATH . 'CoverageMethodOneLineAnnotationTest.php',
+            TEST_FILES_PATH . 'CoverageMethodParenthesesTest.php',
+            TEST_FILES_PATH . 'CoverageMethodParenthesesWhitespaceTest.php',
+            TEST_FILES_PATH . 'CoverageMethodTest.php',
+            TEST_FILES_PATH . 'CoverageNoneTest.php',
+            TEST_FILES_PATH . 'CoverageNotPrivateTest.php',
+            TEST_FILES_PATH . 'CoverageNotProtectedTest.php',
+            TEST_FILES_PATH . 'CoverageNotPublicTest.php',
+            TEST_FILES_PATH . 'CoverageNothingTest.php',
+            TEST_FILES_PATH . 'CoveragePrivateTest.php',
+            TEST_FILES_PATH . 'CoverageProtectedTest.php',
+            TEST_FILES_PATH . 'CoveragePublicTest.php',
+            TEST_FILES_PATH . 'CoverageTwoDefaultClassAnnotations.php',
+            TEST_FILES_PATH . 'CoveredClass.php',
+            TEST_FILES_PATH . 'CoveredFunction.php',
+            TEST_FILES_PATH . 'NamespaceCoverageClassExtendedTest.php',
+            TEST_FILES_PATH . 'NamespaceCoverageClassTest.php',
+            TEST_FILES_PATH . 'NamespaceCoverageCoversClassPublicTest.php',
+            TEST_FILES_PATH . 'NamespaceCoverageCoversClassTest.php',
+            TEST_FILES_PATH . 'NamespaceCoverageMethodTest.php',
+            TEST_FILES_PATH . 'NamespaceCoverageNotPrivateTest.php',
+            TEST_FILES_PATH . 'NamespaceCoverageNotProtectedTest.php',
+            TEST_FILES_PATH . 'NamespaceCoverageNotPublicTest.php',
+            TEST_FILES_PATH . 'NamespaceCoveragePrivateTest.php',
+            TEST_FILES_PATH . 'NamespaceCoverageProtectedTest.php',
+            TEST_FILES_PATH . 'NamespaceCoveragePublicTest.php',
+            TEST_FILES_PATH . 'NamespaceCoveredClass.php',
+            TEST_FILES_PATH . 'NotExistingCoveredElementTest.php',
+            TEST_FILES_PATH . 'source_with_class_and_anonymous_function.php',
+            TEST_FILES_PATH . 'source_with_ignore.php',
+            TEST_FILES_PATH . 'source_with_namespace.php',
+            TEST_FILES_PATH . 'source_with_oneline_annotations.php',
+            TEST_FILES_PATH . 'source_without_ignore.php',
+            TEST_FILES_PATH . 'source_without_namespace.php'
+        );
+    }
+
+    /**
+     * @covers PHP_CodeCoverage_Filter::addFileToBlacklist
+     * @covers PHP_CodeCoverage_Filter::getBlacklist
+     */
+    public function testAddingAFileToTheBlacklistWorks()
+    {
+        $this->filter->addFileToBlacklist($this->files[0]);
+
+        $this->assertEquals(
+            array($this->files[0]),
+            $this->filter->getBlacklist()
+        );
+    }
+
+    /**
+     * @covers PHP_CodeCoverage_Filter::removeFileFromBlacklist
+     * @covers PHP_CodeCoverage_Filter::getBlacklist
+     */
+    public function testRemovingAFileFromTheBlacklistWorks()
+    {
+        $this->filter->addFileToBlacklist($this->files[0]);
+        $this->filter->removeFileFromBlacklist($this->files[0]);
+
+        $this->assertEquals(array(), $this->filter->getBlacklist());
+    }
+
+    /**
+     * @covers  PHP_CodeCoverage_Filter::addDirectoryToBlacklist
+     * @covers  PHP_CodeCoverage_Filter::getBlacklist
+     * @depends testAddingAFileToTheBlacklistWorks
+     */
+    public function testAddingADirectoryToTheBlacklistWorks()
+    {
+        $this->filter->addDirectoryToBlacklist(TEST_FILES_PATH);
+
+        $blacklist = $this->filter->getBlacklist();
+        sort($blacklist);
+
+        $this->assertEquals($this->files, $blacklist);
+    }
+
+    /**
+     * @covers PHP_CodeCoverage_Filter::addFilesToBlacklist
+     * @covers PHP_CodeCoverage_Filter::getBlacklist
+     */
+    public function testAddingFilesToTheBlacklistWorks()
+    {
+        $facade = new File_Iterator_Facade;
+        $files  = $facade->getFilesAsArray(
+            TEST_FILES_PATH,
+            $suffixes = '.php'
+        );
+
+        $this->filter->addFilesToBlacklist($files);
+
+        $blacklist = $this->filter->getBlacklist();
+        sort($blacklist);
+
+        $this->assertEquals($this->files, $blacklist);
+    }
+
+    /**
+     * @covers  PHP_CodeCoverage_Filter::removeDirectoryFromBlacklist
+     * @covers  PHP_CodeCoverage_Filter::getBlacklist
+     * @depends testAddingADirectoryToTheBlacklistWorks
+     */
+    public function testRemovingADirectoryFromTheBlacklistWorks()
+    {
+        $this->filter->addDirectoryToBlacklist(TEST_FILES_PATH);
+        $this->filter->removeDirectoryFromBlacklist(TEST_FILES_PATH);
+
+        $this->assertEquals(array(), $this->filter->getBlacklist());
+    }
+
+    /**
+     * @covers PHP_CodeCoverage_Filter::addFileToWhitelist
+     * @covers PHP_CodeCoverage_Filter::getWhitelist
+     */
+    public function testAddingAFileToTheWhitelistWorks()
+    {
+        $this->filter->addFileToWhitelist($this->files[0]);
+
+        $this->assertEquals(
+            array($this->files[0]),
+            $this->filter->getWhitelist()
+        );
+    }
+
+    /**
+     * @covers PHP_CodeCoverage_Filter::removeFileFromWhitelist
+     * @covers PHP_CodeCoverage_Filter::getWhitelist
+     */
+    public function testRemovingAFileFromTheWhitelistWorks()
+    {
+        $this->filter->addFileToWhitelist($this->files[0]);
+        $this->filter->removeFileFromWhitelist($this->files[0]);
+
+        $this->assertEquals(array(), $this->filter->getWhitelist());
+    }
+
+    /**
+     * @covers  PHP_CodeCoverage_Filter::addDirectoryToWhitelist
+     * @covers  PHP_CodeCoverage_Filter::getWhitelist
+     * @depends testAddingAFileToTheWhitelistWorks
+     */
+    public function testAddingADirectoryToTheWhitelistWorks()
+    {
+        $this->filter->addDirectoryToWhitelist(TEST_FILES_PATH);
+
+        $whitelist = $this->filter->getWhitelist();
+        sort($whitelist);
+
+        $this->assertEquals($this->files, $whitelist);
+    }
+
+    /**
+     * @covers PHP_CodeCoverage_Filter::addFilesToWhitelist
+     * @covers PHP_CodeCoverage_Filter::getBlacklist
+     */
+    public function testAddingFilesToTheWhitelistWorks()
+    {
+        $facade = new File_Iterator_Facade;
+        $files  = $facade->getFilesAsArray(
+            TEST_FILES_PATH,
+            $suffixes = '.php'
+        );
+
+        $this->filter->addFilesToWhitelist($files);
+
+        $whitelist = $this->filter->getWhitelist();
+        sort($whitelist);
+
+        $this->assertEquals($this->files, $whitelist);
+    }
+
+    /**
+     * @covers  PHP_CodeCoverage_Filter::removeDirectoryFromWhitelist
+     * @covers  PHP_CodeCoverage_Filter::getWhitelist
+     * @depends testAddingADirectoryToTheWhitelistWorks
+     */
+    public function testRemovingADirectoryFromTheWhitelistWorks()
+    {
+        $this->filter->addDirectoryToWhitelist(TEST_FILES_PATH);
+        $this->filter->removeDirectoryFromWhitelist(TEST_FILES_PATH);
+
+        $this->assertEquals(array(), $this->filter->getWhitelist());
+    }
+
+    /**
+     * @covers PHP_CodeCoverage_Filter::isFile
+     */
+    public function testIsFile()
+    {
+        $this->assertFalse($this->filter->isFile('vfs://root/a/path'));
+        $this->assertFalse($this->filter->isFile('xdebug://debug-eval'));
+        $this->assertFalse($this->filter->isFile('eval()\'d code'));
+        $this->assertFalse($this->filter->isFile('runtime-created function'));
+        $this->assertFalse($this->filter->isFile('assert code'));
+        $this->assertFalse($this->filter->isFile('regexp code'));
+        $this->assertTrue($this->filter->isFile(__FILE__));
+    }
+
+    /**
+     * @covers PHP_CodeCoverage_Filter::isFiltered
+     */
+    public function testBlacklistedFileIsFiltered()
+    {
+        $this->filter->addFileToBlacklist($this->files[0]);
+        $this->assertTrue($this->filter->isFiltered($this->files[0]));
+    }
+
+    /**
+     * @covers PHP_CodeCoverage_Filter::isFiltered
+     */
+    public function testWhitelistedFileIsNotFiltered()
+    {
+        $this->filter->addFileToWhitelist($this->files[0]);
+        $this->assertFalse($this->filter->isFiltered($this->files[0]));
+    }
+
+    /**
+     * @covers PHP_CodeCoverage_Filter::isFiltered
+     */
+    public function testNotWhitelistedFileIsFiltered()
+    {
+        $this->filter->addFileToWhitelist($this->files[0]);
+        $this->assertTrue($this->filter->isFiltered($this->files[1]));
+    }
+
+    /**
+     * @covers PHP_CodeCoverage_Filter::isFiltered
+     * @covers PHP_CodeCoverage_Filter::isFile
+     */
+    public function testNonFilesAreFiltered()
+    {
+        $this->assertTrue($this->filter->isFiltered('vfs://root/a/path'));
+        $this->assertTrue($this->filter->isFiltered('xdebug://debug-eval'));
+        $this->assertTrue($this->filter->isFiltered('eval()\'d code'));
+        $this->assertTrue($this->filter->isFiltered('runtime-created function'));
+        $this->assertTrue($this->filter->isFiltered('assert code'));
+        $this->assertTrue($this->filter->isFiltered('regexp code'));
+        $this->assertFalse($this->filter->isFiltered(__FILE__));
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/Report/CloverTest.php b/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/Report/CloverTest.php
new file mode 100644
index 00000000..8d860bd2
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/Report/CloverTest.php
@@ -0,0 +1,66 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+if (!defined('TEST_FILES_PATH')) {
+    define(
+        'TEST_FILES_PATH',
+        dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR .
+        '_files' . DIRECTORY_SEPARATOR
+    );
+}
+
+require_once TEST_FILES_PATH . '../TestCase.php';
+
+/**
+ * Tests for the PHP_CodeCoverage_Report_Clover class.
+ *
+ * @since Class available since Release 1.0.0
+ */
+class PHP_CodeCoverage_Report_CloverTest extends PHP_CodeCoverage_TestCase
+{
+    /**
+     * @covers PHP_CodeCoverage_Report_Clover
+     */
+    public function testCloverForBankAccountTest()
+    {
+        $clover = new PHP_CodeCoverage_Report_Clover;
+
+        $this->assertStringMatchesFormatFile(
+            TEST_FILES_PATH . 'BankAccount-clover.xml',
+            $clover->process($this->getCoverageForBankAccount(), null, 'BankAccount')
+        );
+    }
+
+    /**
+     * @covers PHP_CodeCoverage_Report_Clover
+     */
+    public function testCloverForFileWithIgnoredLines()
+    {
+        $clover = new PHP_CodeCoverage_Report_Clover;
+
+        $this->assertStringMatchesFormatFile(
+            TEST_FILES_PATH . 'ignored-lines-clover.xml',
+            $clover->process($this->getCoverageForFileWithIgnoredLines())
+        );
+    }
+
+    /**
+     * @covers PHP_CodeCoverage_Report_Clover
+     */
+    public function testCloverForClassWithAnonymousFunction()
+    {
+        $clover = new PHP_CodeCoverage_Report_Clover;
+
+        $this->assertStringMatchesFormatFile(
+            TEST_FILES_PATH . 'class-with-anonymous-function-clover.xml',
+            $clover->process($this->getCoverageForClassWithAnonymousFunction())
+        );
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/Report/FactoryTest.php b/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/Report/FactoryTest.php
new file mode 100644
index 00000000..fc3e2511
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/Report/FactoryTest.php
@@ -0,0 +1,222 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+if (!defined('TEST_FILES_PATH')) {
+    define(
+        'TEST_FILES_PATH',
+        dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR .
+        '_files' . DIRECTORY_SEPARATOR
+    );
+}
+
+require_once TEST_FILES_PATH . '../TestCase.php';
+
+/**
+ * Tests for the PHP_CodeCoverage_Report_Factory class.
+ *
+ * @since Class available since Release 1.1.0
+ */
+class PHP_CodeCoverage_Report_FactoryTest extends PHP_CodeCoverage_TestCase
+{
+    protected $factory;
+
+    protected function setUp()
+    {
+        $this->factory = new PHP_CodeCoverage_Report_Factory;
+    }
+
+    public function testSomething()
+    {
+        $root = $this->getCoverageForBankAccount()->getReport();
+
+        $expectedPath = rtrim(TEST_FILES_PATH, DIRECTORY_SEPARATOR);
+        $this->assertEquals($expectedPath, $root->getName());
+        $this->assertEquals($expectedPath, $root->getPath());
+        $this->assertEquals(10, $root->getNumExecutableLines());
+        $this->assertEquals(5, $root->getNumExecutedLines());
+        $this->assertEquals(1, $root->getNumClasses());
+        $this->assertEquals(0, $root->getNumTestedClasses());
+        $this->assertEquals(4, $root->getNumMethods());
+        $this->assertEquals(3, $root->getNumTestedMethods());
+        $this->assertEquals('0.00%', $root->getTestedClassesPercent());
+        $this->assertEquals('75.00%', $root->getTestedMethodsPercent());
+        $this->assertEquals('50.00%', $root->getLineExecutedPercent());
+        $this->assertEquals(0, $root->getNumFunctions());
+        $this->assertEquals(0, $root->getNumTestedFunctions());
+        $this->assertNull($root->getParent());
+        $this->assertEquals(array(), $root->getDirectories());
+        #$this->assertEquals(array(), $root->getFiles());
+        #$this->assertEquals(array(), $root->getChildNodes());
+
+        $this->assertEquals(
+            array(
+                'BankAccount' => array(
+                    'methods' => array(
+                        'getBalance' => array(
+                            'signature' => 'getBalance()',
+                            'startLine' => 6,
+                            'endLine' => 9,
+                            'executableLines' => 1,
+                            'executedLines' => 1,
+                            'ccn' => 1,
+                            'coverage' => 100,
+                            'crap' => '1',
+                            'link' => 'BankAccount.php.html#6',
+                            'methodName' => 'getBalance'
+                        ),
+                        'setBalance' => array(
+                            'signature' => 'setBalance($balance)',
+                            'startLine' => 11,
+                            'endLine' => 18,
+                            'executableLines' => 5,
+                            'executedLines' => 0,
+                            'ccn' => 2,
+                            'coverage' => 0,
+                            'crap' => 6,
+                            'link' => 'BankAccount.php.html#11',
+                            'methodName' => 'setBalance'
+                        ),
+                        'depositMoney' => array(
+                            'signature' => 'depositMoney($balance)',
+                            'startLine' => 20,
+                            'endLine' => 25,
+                            'executableLines' => 2,
+                            'executedLines' => 2,
+                            'ccn' => 1,
+                            'coverage' => 100,
+                            'crap' => '1',
+                            'link' => 'BankAccount.php.html#20',
+                            'methodName' => 'depositMoney'
+                        ),
+                        'withdrawMoney' => array(
+                            'signature' => 'withdrawMoney($balance)',
+                            'startLine' => 27,
+                            'endLine' => 32,
+                            'executableLines' => 2,
+                            'executedLines' => 2,
+                            'ccn' => 1,
+                            'coverage' => 100,
+                            'crap' => '1',
+                            'link' => 'BankAccount.php.html#27',
+                            'methodName' => 'withdrawMoney'
+                        ),
+                    ),
+                    'startLine' => 2,
+                    'executableLines' => 10,
+                    'executedLines' => 5,
+                    'ccn' => 5,
+                    'coverage' => 50,
+                    'crap' => '8.12',
+                    'package' => array(
+                        'namespace' => '',
+                        'fullPackage' => '',
+                        'category' => '',
+                        'package' => '',
+                        'subpackage' => ''
+                    ),
+                    'link' => 'BankAccount.php.html#2',
+                    'className' => 'BankAccount'
+                )
+            ),
+            $root->getClasses()
+        );
+
+        $this->assertEquals(array(), $root->getFunctions());
+    }
+
+    /**
+     * @covers PHP_CodeCoverage_Report_Factory::buildDirectoryStructure
+     */
+    public function testBuildDirectoryStructure()
+    {
+        $method = new ReflectionMethod(
+            'PHP_CodeCoverage_Report_Factory',
+            'buildDirectoryStructure'
+        );
+
+        $method->setAccessible(true);
+
+        $this->assertEquals(
+            array(
+                'src' => array(
+                    'Money.php/f' => array(),
+                    'MoneyBag.php/f' => array()
+                )
+            ),
+            $method->invoke(
+                $this->factory,
+                array('src/Money.php' => array(), 'src/MoneyBag.php' => array())
+            )
+        );
+    }
+
+    /**
+     * @covers       PHP_CodeCoverage_Report_Factory::reducePaths
+     * @dataProvider reducePathsProvider
+     */
+    public function testReducePaths($reducedPaths, $commonPath, $paths)
+    {
+        $method = new ReflectionMethod(
+            'PHP_CodeCoverage_Report_Factory',
+            'reducePaths'
+        );
+
+        $method->setAccessible(true);
+
+        $_commonPath = $method->invokeArgs($this->factory, array(&$paths));
+
+        $this->assertEquals($reducedPaths, $paths);
+        $this->assertEquals($commonPath, $_commonPath);
+    }
+
+    public function reducePathsProvider()
+    {
+        return array(
+            array(
+                array(
+                    'Money.php' => array(),
+                    'MoneyBag.php' => array()
+                ),
+                '/home/sb/Money',
+                array(
+                    '/home/sb/Money/Money.php' => array(),
+                    '/home/sb/Money/MoneyBag.php' => array()
+                )
+            ),
+            array(
+                array(
+                    'Money.php' => array()
+                ),
+                '/home/sb/Money/',
+                array(
+                    '/home/sb/Money/Money.php' => array()
+                )
+            ),
+            array(
+                array(),
+                '.',
+                array()
+            ),
+            array(
+                array(
+                    'Money.php' => array(),
+                    'MoneyBag.php' => array(),
+                    'Cash.phar/Cash.php' => array(),
+                ),
+                '/home/sb/Money',
+                array(
+                    '/home/sb/Money/Money.php' => array(),
+                    '/home/sb/Money/MoneyBag.php' => array(),
+                    'phar:///home/sb/Money/Cash.phar/Cash.php' => array(),
+                ),
+            ),
+        );
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/UtilTest.php b/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/UtilTest.php
new file mode 100644
index 00000000..0b4caea9
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/UtilTest.php
@@ -0,0 +1,30 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Tests for the PHP_CodeCoverage_Util class.
+ *
+ * @since Class available since Release 1.0.0
+ */
+class PHP_CodeCoverage_UtilTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers PHP_CodeCoverage_Util::percent
+     */
+    public function testPercent()
+    {
+        $this->assertEquals(100, PHP_CodeCoverage_Util::percent(100, 0));
+        $this->assertEquals(100, PHP_CodeCoverage_Util::percent(100, 100));
+        $this->assertEquals(
+            '100.00%',
+            PHP_CodeCoverage_Util::percent(100, 100, true)
+        );
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverageTest.php b/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverageTest.php
new file mode 100644
index 00000000..f9bf12e5
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverageTest.php
@@ -0,0 +1,487 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+if (!defined('TEST_FILES_PATH')) {
+    define(
+        'TEST_FILES_PATH',
+        dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR .
+        '_files' . DIRECTORY_SEPARATOR
+    );
+}
+
+require_once TEST_FILES_PATH . '../TestCase.php';
+require_once TEST_FILES_PATH . 'BankAccount.php';
+require_once TEST_FILES_PATH . 'BankAccountTest.php';
+
+/**
+ * Tests for the PHP_CodeCoverage class.
+ *
+ * @since Class available since Release 1.0.0
+ */
+class PHP_CodeCoverageTest extends PHP_CodeCoverage_TestCase
+{
+    /**
+     * @var PHP_CodeCoverage
+     */
+    private $coverage;
+
+    protected function setUp()
+    {
+        $this->coverage = new PHP_CodeCoverage;
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::__construct
+     * @covers PHP_CodeCoverage::filter
+     */
+    public function testConstructor()
+    {
+        $this->assertAttributeInstanceOf(
+            'PHP_CodeCoverage_Driver_Xdebug',
+            'driver',
+            $this->coverage
+        );
+
+        $this->assertAttributeInstanceOf(
+            'PHP_CodeCoverage_Filter',
+            'filter',
+            $this->coverage
+        );
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::__construct
+     * @covers PHP_CodeCoverage::filter
+     */
+    public function testConstructor2()
+    {
+        $filter   = new PHP_CodeCoverage_Filter;
+        $coverage = new PHP_CodeCoverage(null, $filter);
+
+        $this->assertAttributeInstanceOf(
+            'PHP_CodeCoverage_Driver_Xdebug',
+            'driver',
+            $coverage
+        );
+
+        $this->assertSame($filter, $coverage->filter());
+    }
+
+    /**
+     * @covers            PHP_CodeCoverage::start
+     * @expectedException PHP_CodeCoverage_Exception
+     */
+    public function testStartThrowsExceptionForInvalidArgument()
+    {
+        $this->coverage->start(null, array(), null);
+    }
+
+    /**
+     * @covers            PHP_CodeCoverage::stop
+     * @expectedException PHP_CodeCoverage_Exception
+     */
+    public function testStopThrowsExceptionForInvalidArgument()
+    {
+        $this->coverage->stop(null);
+    }
+
+    /**
+     * @covers            PHP_CodeCoverage::stop
+     * @expectedException PHP_CodeCoverage_Exception
+     */
+    public function testStopThrowsExceptionForInvalidArgument2()
+    {
+        $this->coverage->stop(true, null);
+    }
+
+    /**
+     * @covers            PHP_CodeCoverage::append
+     * @expectedException PHP_CodeCoverage_Exception
+     */
+    public function testAppendThrowsExceptionForInvalidArgument()
+    {
+        $this->coverage->append(array(), null);
+    }
+
+    /**
+     * @covers            PHP_CodeCoverage::setCacheTokens
+     * @expectedException PHP_CodeCoverage_Exception
+     */
+    public function testSetCacheTokensThrowsExceptionForInvalidArgument()
+    {
+        $this->coverage->setCacheTokens(null);
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::setCacheTokens
+     */
+    public function testSetCacheTokens()
+    {
+        $this->coverage->setCacheTokens(true);
+        $this->assertAttributeEquals(true, 'cacheTokens', $this->coverage);
+    }
+
+    /**
+     * @covers            PHP_CodeCoverage::setCheckForUnintentionallyCoveredCode
+     * @expectedException PHP_CodeCoverage_Exception
+     */
+    public function testSetCheckForUnintentionallyCoveredCodeThrowsExceptionForInvalidArgument()
+    {
+        $this->coverage->setCheckForUnintentionallyCoveredCode(null);
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::setCheckForUnintentionallyCoveredCode
+     */
+    public function testSetCheckForUnintentionallyCoveredCode()
+    {
+        $this->coverage->setCheckForUnintentionallyCoveredCode(true);
+        $this->assertAttributeEquals(
+            true,
+            'checkForUnintentionallyCoveredCode',
+            $this->coverage
+        );
+    }
+
+    /**
+     * @covers            PHP_CodeCoverage::setForceCoversAnnotation
+     * @expectedException PHP_CodeCoverage_Exception
+     */
+    public function testSetForceCoversAnnotationThrowsExceptionForInvalidArgument()
+    {
+        $this->coverage->setForceCoversAnnotation(null);
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::setForceCoversAnnotation
+     */
+    public function testSetForceCoversAnnotation()
+    {
+        $this->coverage->setForceCoversAnnotation(true);
+        $this->assertAttributeEquals(
+            true,
+            'forceCoversAnnotation',
+            $this->coverage
+        );
+    }
+
+    /**
+     * @covers            PHP_CodeCoverage::setAddUncoveredFilesFromWhitelist
+     * @expectedException PHP_CodeCoverage_Exception
+     */
+    public function testSetAddUncoveredFilesFromWhitelistThrowsExceptionForInvalidArgument()
+    {
+        $this->coverage->setAddUncoveredFilesFromWhitelist(null);
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::setAddUncoveredFilesFromWhitelist
+     */
+    public function testSetAddUncoveredFilesFromWhitelist()
+    {
+        $this->coverage->setAddUncoveredFilesFromWhitelist(true);
+        $this->assertAttributeEquals(
+            true,
+            'addUncoveredFilesFromWhitelist',
+            $this->coverage
+        );
+    }
+
+    /**
+     * @covers            PHP_CodeCoverage::setProcessUncoveredFilesFromWhitelist
+     * @expectedException PHP_CodeCoverage_Exception
+     */
+    public function testSetProcessUncoveredFilesFromWhitelistThrowsExceptionForInvalidArgument()
+    {
+        $this->coverage->setProcessUncoveredFilesFromWhitelist(null);
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::setProcessUncoveredFilesFromWhitelist
+     */
+    public function testSetProcessUncoveredFilesFromWhitelist()
+    {
+        $this->coverage->setProcessUncoveredFilesFromWhitelist(true);
+        $this->assertAttributeEquals(
+            true,
+            'processUncoveredFilesFromWhitelist',
+            $this->coverage
+        );
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::setMapTestClassNameToCoveredClassName
+     */
+    public function testSetMapTestClassNameToCoveredClassName()
+    {
+        $this->coverage->setMapTestClassNameToCoveredClassName(true);
+        $this->assertAttributeEquals(
+            true,
+            'mapTestClassNameToCoveredClassName',
+            $this->coverage
+        );
+    }
+
+    /**
+     * @covers            PHP_CodeCoverage::setMapTestClassNameToCoveredClassName
+     * @expectedException PHP_CodeCoverage_Exception
+     */
+    public function testSetMapTestClassNameToCoveredClassNameThrowsExceptionForInvalidArgument()
+    {
+        $this->coverage->setMapTestClassNameToCoveredClassName(null);
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::clear
+     */
+    public function testClear()
+    {
+        $this->coverage->clear();
+
+        $this->assertAttributeEquals(null, 'currentId', $this->coverage);
+        $this->assertAttributeEquals(array(), 'data', $this->coverage);
+        $this->assertAttributeEquals(array(), 'tests', $this->coverage);
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::start
+     * @covers PHP_CodeCoverage::stop
+     * @covers PHP_CodeCoverage::append
+     * @covers PHP_CodeCoverage::applyListsFilter
+     * @covers PHP_CodeCoverage::initializeFilesThatAreSeenTheFirstTime
+     * @covers PHP_CodeCoverage::applyCoversAnnotationFilter
+     * @covers PHP_CodeCoverage::getTests
+     */
+    public function testCollect()
+    {
+        $coverage = $this->getCoverageForBankAccount();
+
+        $this->assertEquals(
+            $this->getExpectedDataArrayForBankAccount(),
+            $coverage->getData()
+        );
+
+        if (version_compare(PHPUnit_Runner_Version::id(), '4.7', '>=')) {
+            $size = 'unknown';
+        } else {
+            $size = 'small';
+        }
+
+        $this->assertEquals(
+            array(
+                'BankAccountTest::testBalanceIsInitiallyZero' => array('size' => $size, 'status' => null),
+                'BankAccountTest::testBalanceCannotBecomeNegative' => array('size' => $size, 'status' => null),
+                'BankAccountTest::testBalanceCannotBecomeNegative2' => array('size' => $size, 'status' => null),
+                'BankAccountTest::testDepositWithdrawMoney' => array('size' => $size, 'status' => null)
+            ),
+            $coverage->getTests()
+        );
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::getData
+     * @covers PHP_CodeCoverage::merge
+     */
+    public function testMerge()
+    {
+        $coverage = $this->getCoverageForBankAccountForFirstTwoTests();
+        $coverage->merge($this->getCoverageForBankAccountForLastTwoTests());
+
+        $this->assertEquals(
+            $this->getExpectedDataArrayForBankAccount(),
+            $coverage->getData()
+        );
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::getData
+     * @covers PHP_CodeCoverage::merge
+     */
+    public function testMerge2()
+    {
+        $coverage = new PHP_CodeCoverage(
+            $this->getMock('PHP_CodeCoverage_Driver_Xdebug'),
+            new PHP_CodeCoverage_Filter
+        );
+
+        $coverage->merge($this->getCoverageForBankAccount());
+
+        $this->assertEquals(
+            $this->getExpectedDataArrayForBankAccount(),
+            $coverage->getData()
+        );
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::getLinesToBeIgnored
+     */
+    public function testGetLinesToBeIgnored()
+    {
+        $this->assertEquals(
+            array(
+                1,
+                3,
+                4,
+                5,
+                7,
+                8,
+                9,
+                10,
+                11,
+                12,
+                13,
+                14,
+                15,
+                16,
+                17,
+                18,
+                19,
+                20,
+                21,
+                22,
+                23,
+                24,
+                25,
+                26,
+                27,
+                28,
+                30,
+                32,
+                33,
+                34,
+                35,
+                36,
+                37,
+                38
+            ),
+            $this->getLinesToBeIgnored()->invoke(
+                $this->coverage,
+                TEST_FILES_PATH . 'source_with_ignore.php'
+            )
+        );
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::getLinesToBeIgnored
+     */
+    public function testGetLinesToBeIgnored2()
+    {
+        $this->assertEquals(
+            array(1, 5),
+            $this->getLinesToBeIgnored()->invoke(
+                $this->coverage,
+                TEST_FILES_PATH . 'source_without_ignore.php'
+            )
+        );
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::getLinesToBeIgnored
+     */
+    public function testGetLinesToBeIgnored3()
+    {
+        $this->assertEquals(
+            array(
+                1,
+                2,
+                3,
+                4,
+                5,
+                8,
+                11,
+                15,
+                16,
+                19,
+                20
+            ),
+            $this->getLinesToBeIgnored()->invoke(
+                $this->coverage,
+                TEST_FILES_PATH . 'source_with_class_and_anonymous_function.php'
+            )
+        );
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::getLinesToBeIgnored
+     */
+    public function testGetLinesToBeIgnoredOneLineAnnotations()
+    {
+        $this->assertEquals(
+            array(
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+                10,
+                11,
+                12,
+                13,
+                14,
+                15,
+                16,
+                18,
+                20,
+                21,
+                23,
+                24,
+                25,
+                27,
+                28,
+                29,
+                30,
+                31,
+                32,
+                33,
+                34,
+                37
+            ),
+            $this->getLinesToBeIgnored()->invoke(
+                $this->coverage,
+                TEST_FILES_PATH . 'source_with_oneline_annotations.php'
+            )
+        );
+    }
+
+    /**
+     * @return ReflectionMethod
+     */
+    private function getLinesToBeIgnored()
+    {
+        $getLinesToBeIgnored = new ReflectionMethod(
+            'PHP_CodeCoverage',
+            'getLinesToBeIgnored'
+        );
+
+        $getLinesToBeIgnored->setAccessible(true);
+
+        return $getLinesToBeIgnored;
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::getLinesToBeIgnored
+     */
+    public function testGetLinesToBeIgnoredWhenIgnoreIsDisabled()
+    {
+        $this->coverage->setDisableIgnoredLines(true);
+
+        $this->assertEquals(
+            array(),
+            $this->getLinesToBeIgnored()->invoke(
+                $this->coverage,
+                TEST_FILES_PATH . 'source_with_ignore.php'
+            )
+        );
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/TestCase.php b/vendor/phpunit/php-code-coverage/tests/TestCase.php
new file mode 100644
index 00000000..09899dca
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/TestCase.php
@@ -0,0 +1,311 @@
+<?php
+/*
+ * This file is part of the PHP_CodeCoverage package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Abstract base class for test case classes.
+ *
+ * @since Class available since Release 1.0.0
+ */
+abstract class PHP_CodeCoverage_TestCase extends PHPUnit_Framework_TestCase
+{
+    protected function getXdebugDataForBankAccount()
+    {
+        return array(
+            array(
+                TEST_FILES_PATH . 'BankAccount.php' => array(
+                    8 =>  1,
+                    9 => -2,
+                    13 => -1,
+                    14 => -1,
+                    15 => -1,
+                    16 => -1,
+                    18 => -1,
+                    22 => -1,
+                    24 => -1,
+                    25 => -2,
+                    29 => -1,
+                    31 => -1,
+                    32 => -2
+                )
+            ),
+            array(
+                TEST_FILES_PATH . 'BankAccount.php' => array(
+                    8 => 1,
+                    13 => 1,
+                    16 => 1,
+                    29 => 1,
+                )
+            ),
+            array(
+                TEST_FILES_PATH . 'BankAccount.php' => array(
+                    8 => 1,
+                    13 => 1,
+                    16 => 1,
+                    22 => 1,
+                )
+            ),
+            array(
+                TEST_FILES_PATH . 'BankAccount.php' => array(
+                    8 => 1,
+                    13 => 1,
+                    14 => 1,
+                    15 => 1,
+                    18 => 1,
+                    22 => 1,
+                    24 => 1,
+                    29 => 1,
+                    31 => 1,
+                )
+            )
+        );
+    }
+
+    protected function getCoverageForBankAccount()
+    {
+        $data = $this->getXdebugDataForBankAccount();
+
+        $stub = $this->getMock('PHP_CodeCoverage_Driver_Xdebug');
+        $stub->expects($this->any())
+            ->method('stop')
+            ->will($this->onConsecutiveCalls(
+                $data[0],
+                $data[1],
+                $data[2],
+                $data[3]
+            ));
+
+        $coverage = new PHP_CodeCoverage($stub, new PHP_CodeCoverage_Filter);
+
+        $coverage->start(
+            new BankAccountTest('testBalanceIsInitiallyZero'),
+            true
+        );
+
+        $coverage->stop(
+            true,
+            array(TEST_FILES_PATH . 'BankAccount.php' => range(6, 9))
+        );
+
+        $coverage->start(
+            new BankAccountTest('testBalanceCannotBecomeNegative')
+        );
+
+        $coverage->stop(
+            true,
+            array(TEST_FILES_PATH . 'BankAccount.php' => range(27, 32))
+        );
+
+        $coverage->start(
+            new BankAccountTest('testBalanceCannotBecomeNegative2')
+        );
+
+        $coverage->stop(
+            true,
+            array(TEST_FILES_PATH . 'BankAccount.php' => range(20, 25))
+        );
+
+        $coverage->start(
+            new BankAccountTest('testDepositWithdrawMoney')
+        );
+
+        $coverage->stop(
+            true,
+            array(
+                TEST_FILES_PATH . 'BankAccount.php' => array_merge(
+                    range(6, 9),
+                    range(20, 25),
+                    range(27, 32)
+                )
+            )
+        );
+
+        return $coverage;
+    }
+
+    protected function getCoverageForBankAccountForFirstTwoTests()
+    {
+        $data = $this->getXdebugDataForBankAccount();
+
+        $stub = $this->getMock('PHP_CodeCoverage_Driver_Xdebug');
+        $stub->expects($this->any())
+            ->method('stop')
+            ->will($this->onConsecutiveCalls(
+                $data[0],
+                $data[1]
+            ));
+
+        $coverage = new PHP_CodeCoverage($stub, new PHP_CodeCoverage_Filter);
+
+        $coverage->start(
+            new BankAccountTest('testBalanceIsInitiallyZero'),
+            true
+        );
+
+        $coverage->stop(
+            true,
+            array(TEST_FILES_PATH . 'BankAccount.php' => range(6, 9))
+        );
+
+        $coverage->start(
+            new BankAccountTest('testBalanceCannotBecomeNegative')
+        );
+
+        $coverage->stop(
+            true,
+            array(TEST_FILES_PATH . 'BankAccount.php' => range(27, 32))
+        );
+
+        return $coverage;
+    }
+
+    protected function getCoverageForBankAccountForLastTwoTests()
+    {
+        $data = $this->getXdebugDataForBankAccount();
+
+        $stub = $this->getMock('PHP_CodeCoverage_Driver_Xdebug');
+        $stub->expects($this->any())
+            ->method('stop')
+            ->will($this->onConsecutiveCalls(
+                $data[2],
+                $data[3]
+            ));
+
+        $coverage = new PHP_CodeCoverage($stub, new PHP_CodeCoverage_Filter);
+
+        $coverage->start(
+            new BankAccountTest('testBalanceCannotBecomeNegative2')
+        );
+
+        $coverage->stop(
+            true,
+            array(TEST_FILES_PATH . 'BankAccount.php' => range(20, 25))
+        );
+
+        $coverage->start(
+            new BankAccountTest('testDepositWithdrawMoney')
+        );
+
+        $coverage->stop(
+            true,
+            array(
+                TEST_FILES_PATH . 'BankAccount.php' => array_merge(
+                    range(6, 9),
+                    range(20, 25),
+                    range(27, 32)
+                )
+            )
+        );
+
+        return $coverage;
+    }
+
+    protected function getExpectedDataArrayForBankAccount()
+    {
+        return array(
+            TEST_FILES_PATH . 'BankAccount.php' => array(
+                8 => array(
+                    0 => 'BankAccountTest::testBalanceIsInitiallyZero',
+                    1 => 'BankAccountTest::testDepositWithdrawMoney'
+                ),
+                9 => null,
+                13 => array(),
+                14 => array(),
+                15 => array(),
+                16 => array(),
+                18 => array(),
+                22 => array(
+                    0 => 'BankAccountTest::testBalanceCannotBecomeNegative2',
+                    1 => 'BankAccountTest::testDepositWithdrawMoney'
+                ),
+                24 => array(
+                    0 => 'BankAccountTest::testDepositWithdrawMoney',
+                ),
+                25 => null,
+                29 => array(
+                    0 => 'BankAccountTest::testBalanceCannotBecomeNegative',
+                    1 => 'BankAccountTest::testDepositWithdrawMoney'
+                ),
+                31 => array(
+                    0 => 'BankAccountTest::testDepositWithdrawMoney'
+                ),
+                32 => null
+            )
+        );
+    }
+
+    protected function getCoverageForFileWithIgnoredLines()
+    {
+        $coverage = new PHP_CodeCoverage(
+            $this->setUpXdebugStubForFileWithIgnoredLines(),
+            new PHP_CodeCoverage_Filter
+        );
+
+        $coverage->start('FileWithIgnoredLines', true);
+        $coverage->stop();
+
+        return $coverage;
+    }
+
+    protected function setUpXdebugStubForFileWithIgnoredLines()
+    {
+        $stub = $this->getMock('PHP_CodeCoverage_Driver_Xdebug');
+        $stub->expects($this->any())
+            ->method('stop')
+            ->will($this->returnValue(
+                array(
+                    TEST_FILES_PATH . 'source_with_ignore.php' => array(
+                        2 => 1,
+                        4 => -1,
+                        6 => -1,
+                        7 => 1
+                    )
+                )
+            ));
+
+        return $stub;
+    }
+
+    protected function getCoverageForClassWithAnonymousFunction()
+    {
+        $coverage = new PHP_CodeCoverage(
+            $this->setUpXdebugStubForClassWithAnonymousFunction(),
+            new PHP_CodeCoverage_Filter
+        );
+
+        $coverage->start('ClassWithAnonymousFunction', true);
+        $coverage->stop();
+
+        return $coverage;
+    }
+
+    protected function setUpXdebugStubForClassWithAnonymousFunction()
+    {
+        $stub = $this->getMock('PHP_CodeCoverage_Driver_Xdebug');
+        $stub->expects($this->any())
+            ->method('stop')
+            ->will($this->returnValue(
+                array(
+                    TEST_FILES_PATH . 'source_with_class_and_anonymous_function.php' => array(
+                        7  => 1,
+                        9  => 1,
+                        10 => -1,
+                        11 => 1,
+                        12 => 1,
+                        13 => 1,
+                        14 => 1,
+                        17 => 1,
+                        18 => 1
+                    )
+                )
+            ));
+
+        return $stub;
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/BankAccount-clover.xml b/vendor/phpunit/php-code-coverage/tests/_files/BankAccount-clover.xml
new file mode 100644
index 00000000..578a7ccc
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/BankAccount-clover.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<coverage generated="%i">
+  <project timestamp="%i" name="BankAccount">
+    <file name="%s/BankAccount.php">
+      <class name="BankAccount" namespace="global">
+        <metrics methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
+      </class>
+      <line num="6" type="method" name="getBalance" crap="1" count="2"/>
+      <line num="8" type="stmt" count="2"/>
+      <line num="11" type="method" name="setBalance" crap="6" count="0"/>
+      <line num="13" type="stmt" count="0"/>
+      <line num="14" type="stmt" count="0"/>
+      <line num="15" type="stmt" count="0"/>
+      <line num="16" type="stmt" count="0"/>
+      <line num="18" type="stmt" count="0"/>
+      <line num="20" type="method" name="depositMoney" crap="1" count="2"/>
+      <line num="22" type="stmt" count="2"/>
+      <line num="24" type="stmt" count="1"/>
+      <line num="27" type="method" name="withdrawMoney" crap="1" count="2"/>
+      <line num="29" type="stmt" count="2"/>
+      <line num="31" type="stmt" count="1"/>
+      <metrics loc="33" ncloc="33" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
+    </file>
+    <metrics files="1" loc="33" ncloc="33" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
+  </project>
+</coverage>
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/BankAccount.php b/vendor/phpunit/php-code-coverage/tests/_files/BankAccount.php
new file mode 100644
index 00000000..4238c155
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/BankAccount.php
@@ -0,0 +1,33 @@
+<?php
+class BankAccount
+{
+    protected $balance = 0;
+
+    public function getBalance()
+    {
+        return $this->balance;
+    }
+
+    protected function setBalance($balance)
+    {
+        if ($balance >= 0) {
+            $this->balance = $balance;
+        } else {
+            throw new RuntimeException;
+        }
+    }
+
+    public function depositMoney($balance)
+    {
+        $this->setBalance($this->getBalance() + $balance);
+
+        return $this->getBalance();
+    }
+
+    public function withdrawMoney($balance)
+    {
+        $this->setBalance($this->getBalance() - $balance);
+
+        return $this->getBalance();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/BankAccountTest.php b/vendor/phpunit/php-code-coverage/tests/_files/BankAccountTest.php
new file mode 100644
index 00000000..3a6277ba
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/BankAccountTest.php
@@ -0,0 +1,66 @@
+<?php
+require_once 'BankAccount.php';
+
+class BankAccountTest extends PHPUnit_Framework_TestCase
+{
+    protected $ba;
+
+    protected function setUp()
+    {
+        $this->ba = new BankAccount;
+    }
+
+    /**
+     * @covers BankAccount::getBalance
+     */
+    public function testBalanceIsInitiallyZero()
+    {
+        $this->assertEquals(0, $this->ba->getBalance());
+    }
+
+    /**
+     * @covers BankAccount::withdrawMoney
+     */
+    public function testBalanceCannotBecomeNegative()
+    {
+        try {
+            $this->ba->withdrawMoney(1);
+        } catch (RuntimeException $e) {
+            $this->assertEquals(0, $this->ba->getBalance());
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers BankAccount::depositMoney
+     */
+    public function testBalanceCannotBecomeNegative2()
+    {
+        try {
+            $this->ba->depositMoney(-1);
+        } catch (RuntimeException $e) {
+            $this->assertEquals(0, $this->ba->getBalance());
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers BankAccount::getBalance
+     * @covers BankAccount::depositMoney
+     * @covers BankAccount::withdrawMoney
+     */
+    public function testDepositWithdrawMoney()
+    {
+        $this->assertEquals(0, $this->ba->getBalance());
+        $this->ba->depositMoney(1);
+        $this->assertEquals(1, $this->ba->getBalance());
+        $this->ba->withdrawMoney(1);
+        $this->assertEquals(0, $this->ba->getBalance());
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageClassExtendedTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageClassExtendedTest.php
new file mode 100644
index 00000000..df12d347
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageClassExtendedTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageClassExtendedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass<extended>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageClassTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageClassTest.php
new file mode 100644
index 00000000..7f569ae6
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageClassTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageClassTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesTest.php
new file mode 100644
index 00000000..33b5fe3d
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesTest.php
@@ -0,0 +1,11 @@
+<?php
+class CoverageFunctionParenthesesTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::globalFunction()
+     */
+    public function testSomething()
+    {
+        globalFunction();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php
new file mode 100644
index 00000000..becc6c8f
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php
@@ -0,0 +1,11 @@
+<?php
+class CoverageFunctionParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::globalFunction ( )
+     */
+    public function testSomething()
+    {
+        globalFunction();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionTest.php
new file mode 100644
index 00000000..c621fd21
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionTest.php
@@ -0,0 +1,11 @@
+<?php
+class CoverageFunctionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::globalFunction
+     */
+    public function testSomething()
+    {
+        globalFunction();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodOneLineAnnotationTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodOneLineAnnotationTest.php
new file mode 100644
index 00000000..55d7f571
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodOneLineAnnotationTest.php
@@ -0,0 +1,11 @@
+<?php
+
+class CoverageMethodOneLineAnnotationTest extends PHPUnit_Framework_TestCase
+{
+    /** @covers CoveredClass::publicMethod */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesTest.php
new file mode 100644
index 00000000..42230045
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageMethodParenthesesTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::publicMethod()
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesWhitespaceTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesWhitespaceTest.php
new file mode 100644
index 00000000..d1be1c6c
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesWhitespaceTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageMethodParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::publicMethod ( )
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodTest.php
new file mode 100644
index 00000000..167b3db4
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageMethodTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::publicMethod
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageNoneTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageNoneTest.php
new file mode 100644
index 00000000..0b414c2e
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageNoneTest.php
@@ -0,0 +1,9 @@
+<?php
+class CoverageNoneTest extends PHPUnit_Framework_TestCase
+{
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageNotPrivateTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageNotPrivateTest.php
new file mode 100644
index 00000000..12b56e80
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageNotPrivateTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageNotPrivateTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<!private>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageNotProtectedTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageNotProtectedTest.php
new file mode 100644
index 00000000..c69d261d
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageNotProtectedTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageNotProtectedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<!protected>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageNotPublicTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageNotPublicTest.php
new file mode 100644
index 00000000..aebfe4bd
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageNotPublicTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageNotPublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<!public>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageNothingTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageNothingTest.php
new file mode 100644
index 00000000..5d5680d9
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageNothingTest.php
@@ -0,0 +1,13 @@
+<?php
+class CoverageNothingTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::publicMethod
+     * @coversNothing
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoveragePrivateTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoveragePrivateTest.php
new file mode 100644
index 00000000..f09560d3
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoveragePrivateTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoveragePrivateTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<private>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageProtectedTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageProtectedTest.php
new file mode 100644
index 00000000..9b3acbf6
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageProtectedTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageProtectedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<protected>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoveragePublicTest.php b/vendor/phpunit/php-code-coverage/tests/_files/CoveragePublicTest.php
new file mode 100644
index 00000000..480a522b
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoveragePublicTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoveragePublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<public>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoverageTwoDefaultClassAnnotations.php b/vendor/phpunit/php-code-coverage/tests/_files/CoverageTwoDefaultClassAnnotations.php
new file mode 100644
index 00000000..7c743db9
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoverageTwoDefaultClassAnnotations.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @coversDefaultClass \NamespaceOne
+ * @coversDefaultClass \AnotherDefault\Name\Space\Does\Not\Work
+ */
+class CoverageTwoDefaultClassAnnotations
+{
+
+    /**
+     * @covers Foo\CoveredClass::<public>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoveredClass.php b/vendor/phpunit/php-code-coverage/tests/_files/CoveredClass.php
new file mode 100644
index 00000000..f382ce99
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoveredClass.php
@@ -0,0 +1,36 @@
+<?php
+class CoveredParentClass
+{
+    private function privateMethod()
+    {
+    }
+
+    protected function protectedMethod()
+    {
+        $this->privateMethod();
+    }
+
+    public function publicMethod()
+    {
+        $this->protectedMethod();
+    }
+}
+
+class CoveredClass extends CoveredParentClass
+{
+    private function privateMethod()
+    {
+    }
+
+    protected function protectedMethod()
+    {
+        parent::protectedMethod();
+        $this->privateMethod();
+    }
+
+    public function publicMethod()
+    {
+        parent::publicMethod();
+        $this->protectedMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/CoveredFunction.php b/vendor/phpunit/php-code-coverage/tests/_files/CoveredFunction.php
new file mode 100644
index 00000000..9989eb02
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/CoveredFunction.php
@@ -0,0 +1,4 @@
+<?php
+function globalFunction()
+{
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageClassExtendedTest.php b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageClassExtendedTest.php
new file mode 100644
index 00000000..d0954cba
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageClassExtendedTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageClassExtendedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass<extended>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageClassTest.php b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageClassTest.php
new file mode 100644
index 00000000..63912c08
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageClassTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageClassTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassPublicTest.php b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassPublicTest.php
new file mode 100644
index 00000000..45f583b7
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassPublicTest.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @coversDefaultClass \Foo\CoveredClass
+ */
+class NamespaceCoverageCoversClassPublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::publicMethod
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassTest.php b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassTest.php
new file mode 100644
index 00000000..b3367454
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassTest.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @coversDefaultClass \Foo\CoveredClass
+ */
+class NamespaceCoverageCoversClassTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::privateMethod
+     * @covers ::protectedMethod
+     * @covers ::publicMethod
+     * @covers \Foo\CoveredParentClass::privateMethod
+     * @covers \Foo\CoveredParentClass::protectedMethod
+     * @covers \Foo\CoveredParentClass::publicMethod
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageMethodTest.php b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageMethodTest.php
new file mode 100644
index 00000000..35dfb8b1
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageMethodTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageMethodTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::publicMethod
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotPrivateTest.php b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotPrivateTest.php
new file mode 100644
index 00000000..552c9ec5
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotPrivateTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageNotPrivateTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<!private>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotProtectedTest.php b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotProtectedTest.php
new file mode 100644
index 00000000..33fc8c72
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotProtectedTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageNotProtectedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<!protected>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotPublicTest.php b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotPublicTest.php
new file mode 100644
index 00000000..ccbc5009
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotPublicTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageNotPublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<!public>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveragePrivateTest.php b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveragePrivateTest.php
new file mode 100644
index 00000000..cce7ba9d
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveragePrivateTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoveragePrivateTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<private>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageProtectedTest.php b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageProtectedTest.php
new file mode 100644
index 00000000..dbbcc1c3
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageProtectedTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageProtectedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<protected>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveragePublicTest.php b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveragePublicTest.php
new file mode 100644
index 00000000..bf1bff8c
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveragePublicTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoveragePublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<public>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveredClass.php b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveredClass.php
new file mode 100644
index 00000000..5bd0ddfb
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveredClass.php
@@ -0,0 +1,38 @@
+<?php
+namespace Foo;
+
+class CoveredParentClass
+{
+    private function privateMethod()
+    {
+    }
+
+    protected function protectedMethod()
+    {
+        $this->privateMethod();
+    }
+
+    public function publicMethod()
+    {
+        $this->protectedMethod();
+    }
+}
+
+class CoveredClass extends CoveredParentClass
+{
+    private function privateMethod()
+    {
+    }
+
+    protected function protectedMethod()
+    {
+        parent::protectedMethod();
+        $this->privateMethod();
+    }
+
+    public function publicMethod()
+    {
+        parent::publicMethod();
+        $this->protectedMethod();
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/NotExistingCoveredElementTest.php b/vendor/phpunit/php-code-coverage/tests/_files/NotExistingCoveredElementTest.php
new file mode 100644
index 00000000..be07ef45
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/NotExistingCoveredElementTest.php
@@ -0,0 +1,24 @@
+<?php
+class NotExistingCoveredElementTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers NotExistingClass
+     */
+    public function testOne()
+    {
+    }
+
+    /**
+     * @covers NotExistingClass::notExistingMethod
+     */
+    public function testTwo()
+    {
+    }
+
+    /**
+     * @covers NotExistingClass::<public>
+     */
+    public function testThree()
+    {
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/class-with-anonymous-function-clover.xml b/vendor/phpunit/php-code-coverage/tests/_files/class-with-anonymous-function-clover.xml
new file mode 100644
index 00000000..ac43b806
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/class-with-anonymous-function-clover.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<coverage generated="%i">
+  <project timestamp="%i">
+    <file name="%s/source_with_class_and_anonymous_function.php">
+      <class name="CoveredClassWithAnonymousFunctionInStaticMethod" namespace="global">
+        <metrics methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="5" coveredstatements="4" elements="7" coveredelements="5"/>
+      </class>
+      <line num="5" type="method" name="runAnonymous" crap="1.04" count="1"/>
+      <line num="7" type="stmt" count="1"/>
+      <line num="9" type="stmt" count="1"/>
+      <line num="10" type="stmt" count="0"/>
+      <line num="11" type="method" name="anonymous function" crap="1" count="1"/>
+      <line num="12" type="stmt" count="1"/>
+      <line num="13" type="stmt" count="1"/>
+      <line num="14" type="stmt" count="1"/>
+      <line num="17" type="stmt" count="1"/>
+      <line num="18" type="stmt" count="1"/>
+      <metrics loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
+    </file>
+    <metrics files="1" loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
+  </project>
+</coverage>
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/ignored-lines-clover.xml b/vendor/phpunit/php-code-coverage/tests/_files/ignored-lines-clover.xml
new file mode 100644
index 00000000..cda929cd
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/ignored-lines-clover.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<coverage generated="%i">
+  <project timestamp="%i">
+    <file name="%s/source_with_ignore.php">
+      <class name="Foo" namespace="global">
+        <metrics methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
+      </class>
+      <class name="Bar" namespace="global">
+        <metrics methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
+      </class>
+      <line num="2" type="stmt" count="1"/>
+      <line num="6" type="stmt" count="0"/>
+      <metrics loc="37" ncloc="25" classes="2" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
+    </file>
+    <metrics files="1" loc="37" ncloc="25" classes="2" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
+  </project>
+</coverage>
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/source_with_class_and_anonymous_function.php b/vendor/phpunit/php-code-coverage/tests/_files/source_with_class_and_anonymous_function.php
new file mode 100644
index 00000000..eaba387d
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/source_with_class_and_anonymous_function.php
@@ -0,0 +1,19 @@
+<?php
+
+class CoveredClassWithAnonymousFunctionInStaticMethod
+{
+    public static function runAnonymous()
+    {
+        $filter = array('abc124', 'abc123', '123');
+
+        array_walk(
+            $filter,
+            function (&$val, $key) {
+                $val = preg_replace('|[^0-9]|', '', $val);
+            }
+        );
+
+        // Should be covered
+        $extravar = true;
+    }
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/source_with_ignore.php b/vendor/phpunit/php-code-coverage/tests/_files/source_with_ignore.php
new file mode 100644
index 00000000..dd9aa12a
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/source_with_ignore.php
@@ -0,0 +1,37 @@
+<?php
+if ($neverHappens) {
+    // @codeCoverageIgnoreStart
+    print '*';
+    // @codeCoverageIgnoreEnd
+}
+
+/**
+ * @codeCoverageIgnore
+ */
+class Foo
+{
+    public function bar()
+    {
+    }
+}
+
+class Bar
+{
+    /**
+     * @codeCoverageIgnore
+     */
+    public function foo()
+    {
+    }
+}
+
+function baz()
+{
+    print '*'; // @codeCoverageIgnore
+}
+
+interface Bor
+{
+    public function foo();
+
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/source_with_namespace.php b/vendor/phpunit/php-code-coverage/tests/_files/source_with_namespace.php
new file mode 100644
index 00000000..ebe98ee1
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/source_with_namespace.php
@@ -0,0 +1,20 @@
+<?php
+namespace bar\baz;
+
+/**
+ * Represents foo.
+ */
+class source_with_namespace
+{
+}
+
+/**
+ * @param mixed $bar
+ */
+function &foo($bar)
+{
+    $baz = function () {};
+    $a   = true ? true : false;
+    $b = "{$a}";
+    $c = "${b}";
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/source_with_oneline_annotations.php b/vendor/phpunit/php-code-coverage/tests/_files/source_with_oneline_annotations.php
new file mode 100644
index 00000000..19dd4cd4
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/source_with_oneline_annotations.php
@@ -0,0 +1,36 @@
+<?php
+
+/** Docblock */
+interface Foo
+{
+    public function bar();
+}
+
+class Foo
+{
+    public function bar()
+    {
+    }
+}
+
+function baz()
+{
+    // a one-line comment
+    print '*'; // a one-line comment
+
+    /* a one-line comment */
+    print '*'; /* a one-line comment */
+
+    /* a one-line comment
+     */
+    print '*'; /* a one-line comment
+    */
+
+    print '*'; // @codeCoverageIgnore
+
+    print '*'; // @codeCoverageIgnoreStart
+    print '*';
+    print '*'; // @codeCoverageIgnoreEnd
+
+    print '*';
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/source_without_ignore.php b/vendor/phpunit/php-code-coverage/tests/_files/source_without_ignore.php
new file mode 100644
index 00000000..be4e8364
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/source_without_ignore.php
@@ -0,0 +1,4 @@
+<?php
+if ($neverHappens) {
+    print '*';
+}
diff --git a/vendor/phpunit/php-code-coverage/tests/_files/source_without_namespace.php b/vendor/phpunit/php-code-coverage/tests/_files/source_without_namespace.php
new file mode 100644
index 00000000..24d78e59
--- /dev/null
+++ b/vendor/phpunit/php-code-coverage/tests/_files/source_without_namespace.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Represents foo.
+ */
+class Foo
+{
+}
+
+/**
+ * @param mixed $bar
+ */
+function &foo($bar)
+{
+    $baz = function () {};
+    $a   = true ? true : false;
+    $b = "{$a}";
+    $c = "${b}";
+}
diff --git a/vendor/phpunit/php-file-iterator/.gitattributes b/vendor/phpunit/php-file-iterator/.gitattributes
new file mode 100644
index 00000000..461090b7
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/.gitattributes
@@ -0,0 +1 @@
+*.php diff=php
diff --git a/vendor/phpunit/php-file-iterator/.gitignore b/vendor/phpunit/php-file-iterator/.gitignore
new file mode 100644
index 00000000..a7419836
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/.gitignore
@@ -0,0 +1,7 @@
+build/api
+build/code-browser
+build/coverage
+build/logs
+build/pdepend
+cache.properties
+phpunit.xml
diff --git a/vendor/phpunit/php-file-iterator/ChangeLog.markdown b/vendor/phpunit/php-file-iterator/ChangeLog.markdown
new file mode 100644
index 00000000..fd9ed1bf
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/ChangeLog.markdown
@@ -0,0 +1,31 @@
+File_Iterator 1.3
+=================
+
+This is the list of changes for the File_Iterator 1.3 release series.
+
+File_Iterator 1.3.4
+-------------------
+
+* Symlinks are now followed.
+
+File_Iterator 1.3.3
+-------------------
+
+* No changes.
+
+File_Iterator 1.3.2
+-------------------
+
+* No changes.
+
+File_Iterator 1.3.1
+-------------------
+
+* Fixed infinite loop in `File_Iterator_Facade::getCommonPath()` for empty directories.
+
+File_Iterator 1.3.0
+-------------------
+
+* Added `File_Iterator_Facade` for the most common use case.
+* Moved `File_Iterator_Factory::getFilesAsArray()` to `File_Iterator_Facade::getFilesAsArray()`.
+* `File_Iterator_Factory` is no longer static.
diff --git a/vendor/phpunit/php-file-iterator/File/Iterator.php b/vendor/phpunit/php-file-iterator/File/Iterator.php
new file mode 100644
index 00000000..f898ef51
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/File/Iterator.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * php-file-iterator
+ *
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package   File
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @since     File available since Release 1.0.0
+ */
+
+/**
+ * FilterIterator implementation that filters files based on prefix(es) and/or
+ * suffix(es). Hidden files and files from hidden directories are also filtered.
+ *
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version   Release: @package_version@
+ * @link      http://github.com/sebastianbergmann/php-file-iterator/tree
+ * @since     Class available since Release 1.0.0
+ */
+class File_Iterator extends FilterIterator
+{
+    const PREFIX = 0;
+    const SUFFIX = 1;
+
+    /**
+     * @var array
+     */
+    protected $suffixes = array();
+
+    /**
+     * @var array
+     */
+    protected $prefixes = array();
+
+    /**
+     * @var array
+     */
+    protected $exclude = array();
+
+    /**
+     * @var string
+     */
+    protected $basepath;
+
+    /**
+     * @param  Iterator $iterator
+     * @param  array    $suffixes
+     * @param  array    $prefixes
+     * @param  array    $exclude
+     * @param  string   $basepath
+     */
+    public function __construct(Iterator $iterator, array $suffixes = array(), array $prefixes = array(), array $exclude = array(), $basepath = NULL)
+    {
+        $exclude = array_filter(array_map('realpath', $exclude));
+
+        if ($basepath !== NULL) {
+            $basepath = realpath($basepath);
+        }
+
+        if ($basepath === FALSE) {
+            $basepath = NULL;
+        } else {
+            foreach ($exclude as &$_exclude) {
+                $_exclude = str_replace($basepath, '', $_exclude);
+            }
+        }
+
+        $this->prefixes = $prefixes;
+        $this->suffixes = $suffixes;
+        $this->exclude  = $exclude;
+        $this->basepath = $basepath;
+
+        parent::__construct($iterator);
+    }
+
+    /**
+     * @return boolean
+     */
+    public function accept()
+    {
+        $current  = $this->getInnerIterator()->current();
+        $filename = $current->getFilename();
+        $realpath = $current->getRealPath();
+
+        if ($this->basepath !== NULL) {
+            $realpath = str_replace($this->basepath, '', $realpath);
+        }
+
+        // Filter files in hidden directories.
+        if (preg_match('=/\.[^/]*/=', $realpath)) {
+            return FALSE;
+        }
+
+        return $this->acceptPath($realpath) &&
+               $this->acceptPrefix($filename) &&
+               $this->acceptSuffix($filename);
+    }
+
+    /**
+     * @param  string $path
+     * @return boolean
+     * @since  Method available since Release 1.1.0
+     */
+    protected function acceptPath($path)
+    {
+        foreach ($this->exclude as $exclude) {
+            if (strpos($path, $exclude) === 0) {
+                return FALSE;
+            }
+        }
+
+        return TRUE;
+    }
+
+    /**
+     * @param  string $filename
+     * @return boolean
+     * @since  Method available since Release 1.1.0
+     */
+    protected function acceptPrefix($filename)
+    {
+        return $this->acceptSubString($filename, $this->prefixes, self::PREFIX);
+    }
+
+    /**
+     * @param  string $filename
+     * @return boolean
+     * @since  Method available since Release 1.1.0
+     */
+    protected function acceptSuffix($filename)
+    {
+        return $this->acceptSubString($filename, $this->suffixes, self::SUFFIX);
+    }
+
+    /**
+     * @param  string  $filename
+     * @param  array   $subString
+     * @param  integer $type
+     * @return boolean
+     * @since  Method available since Release 1.1.0
+     */
+    protected function acceptSubString($filename, array $subStrings, $type)
+    {
+        if (empty($subStrings)) {
+            return TRUE;
+        }
+
+        $matched = FALSE;
+
+        foreach ($subStrings as $string) {
+            if (($type == self::PREFIX && strpos($filename, $string) === 0) ||
+                ($type == self::SUFFIX &&
+                 substr($filename, -1 * strlen($string)) == $string)) {
+                $matched = TRUE;
+                break;
+            }
+        }
+
+        return $matched;
+    }
+}
diff --git a/vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php b/vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php
new file mode 100644
index 00000000..5a8c01aa
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * php-file-iterator
+ *
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package   File
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @since     File available since Release 1.3.0
+ */
+
+spl_autoload_register(
+  function ($class)
+  {
+      static $classes = NULL;
+      static $path = NULL;
+
+      if ($classes === NULL) {
+          $classes = array(
+            'file_iterator' => '/Iterator.php',
+            'file_iterator_facade' => '/Iterator/Facade.php',
+            'file_iterator_factory' => '/Iterator/Factory.php'
+          );
+
+          $path = dirname(dirname(__FILE__));
+      }
+
+      $cn = strtolower($class);
+
+      if (isset($classes[$cn])) {
+          require $path . $classes[$cn];
+      }
+  }
+);
diff --git a/vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php.in b/vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php.in
new file mode 100644
index 00000000..56da6c14
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php.in
@@ -0,0 +1,64 @@
+<?php
+/**
+ * php-file-iterator
+ *
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package   File
+ * @author    Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @since     File available since Release 1.3.0
+ */
+
+spl_autoload_register(
+  function ($class)
+  {
+      static $classes = NULL;
+      static $path = NULL;
+
+      if ($classes === NULL) {
+          $classes = array(
+            ___CLASSLIST___
+          );
+
+          $path = dirname(dirname(__FILE__));
+      }
+
+      $cn = strtolower($class);
+
+      if (isset($classes[$cn])) {
+          require $path . $classes[$cn];
+      }
+  }
+);
diff --git a/vendor/phpunit/php-file-iterator/File/Iterator/Facade.php b/vendor/phpunit/php-file-iterator/File/Iterator/Facade.php
new file mode 100644
index 00000000..2b846d09
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/File/Iterator/Facade.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * php-file-iterator
+ *
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package   File
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @since     File available since Release 1.3.0
+ */
+
+/**
+ * Façade implementation that uses File_Iterator_Factory to create a
+ * File_Iterator that operates on an AppendIterator that contains an
+ * RecursiveDirectoryIterator for each given path. The list of unique
+ * files is returned as an array.
+ *
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version   Release: @package_version@
+ * @link      http://github.com/sebastianbergmann/php-file-iterator/tree
+ * @since     Class available since Release 1.3.0
+ */
+class File_Iterator_Facade
+{
+    /**
+     * @param  array|string $paths
+     * @param  array|string $suffixes
+     * @param  array|string $prefixes
+     * @param  array        $exclude
+     * @param  boolean      $commonPath
+     * @return array
+     */
+    public function getFilesAsArray($paths, $suffixes = '', $prefixes = '', array $exclude = array(), $commonPath = FALSE)
+    {
+        if (is_string($paths)) {
+            $paths = array($paths);
+        }
+
+        $factory  = new File_Iterator_Factory;
+        $iterator = $factory->getFileIterator(
+          $paths, $suffixes, $prefixes, $exclude
+        );
+
+        $files = array();
+
+        foreach ($iterator as $file) {
+            $file = $file->getRealPath();
+
+            if ($file) {
+                $files[] = $file;
+            }
+        }
+
+        foreach ($paths as $path) {
+            if (is_file($path)) {
+                $files[] = realpath($path);
+            }
+        }
+
+        $files = array_unique($files);
+        sort($files);
+
+        if ($commonPath) {
+            return array(
+              'commonPath' => $this->getCommonPath($files),
+              'files'      => $files
+            );
+        } else {
+            return $files;
+        }
+    }
+
+    /**
+     * Returns the common path of a set of files.
+     *
+     * @param  array $files
+     * @return string
+     */
+    protected function getCommonPath(array $files)
+    {
+        $count = count($files);
+
+        if ($count == 0) {
+            return '';
+        }
+
+        if ($count == 1) {
+            return dirname($files[0]) . DIRECTORY_SEPARATOR;
+        }
+
+        $_files = array();
+
+        foreach ($files as $file) {
+            $_files[] = $_fileParts = explode(DIRECTORY_SEPARATOR, $file);
+
+            if (empty($_fileParts[0])) {
+                $_fileParts[0] = DIRECTORY_SEPARATOR;
+            }
+        }
+
+        $common = '';
+        $done   = FALSE;
+        $j      = 0;
+        $count--;
+
+        while (!$done) {
+            for ($i = 0; $i < $count; $i++) {
+                if ($_files[$i][$j] != $_files[$i+1][$j]) {
+                    $done = TRUE;
+                    break;
+                }
+            }
+
+            if (!$done) {
+                $common .= $_files[0][$j];
+
+                if ($j > 0) {
+                    $common .= DIRECTORY_SEPARATOR;
+                }
+            }
+
+            $j++;
+        }
+
+        return DIRECTORY_SEPARATOR . $common;
+    }
+}
diff --git a/vendor/phpunit/php-file-iterator/File/Iterator/Factory.php b/vendor/phpunit/php-file-iterator/File/Iterator/Factory.php
new file mode 100644
index 00000000..3c0166e0
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/File/Iterator/Factory.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * php-file-iterator
+ *
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package   File
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @since     File available since Release 1.1.0
+ */
+
+/**
+ * Factory Method implementation that creates a File_Iterator that operates on
+ * an AppendIterator that contains an RecursiveDirectoryIterator for each given
+ * path.
+ *
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version   Release: @package_version@
+ * @link      http://github.com/sebastianbergmann/php-file-iterator/tree
+ * @since     Class available since Release 1.1.0
+ */
+class File_Iterator_Factory
+{
+    /**
+     * @param  array|string $paths
+     * @param  array|string $suffixes
+     * @param  array|string $prefixes
+     * @param  array        $exclude
+     * @return AppendIterator
+     */
+    public function getFileIterator($paths, $suffixes = '', $prefixes = '', array $exclude = array())
+    {
+        if (is_string($paths)) {
+            $paths = array($paths);
+        }
+
+        $_paths = array();
+
+        foreach ($paths as $path) {
+            if ($locals = glob($path, GLOB_ONLYDIR)) {
+                $_paths = array_merge($_paths, $locals);
+            } else {
+                $_paths[] = $path;
+            }
+        }
+
+        $paths = $_paths;
+        unset($_paths);
+
+        if (is_string($prefixes)) {
+            if ($prefixes != '') {
+                $prefixes = array($prefixes);
+            } else {
+                $prefixes = array();
+            }
+        }
+
+        if (is_string($suffixes)) {
+            if ($suffixes != '') {
+                $suffixes = array($suffixes);
+            } else {
+                $suffixes = array();
+            }
+        }
+
+        $iterator = new AppendIterator;
+
+        foreach ($paths as $path) {
+            if (is_dir($path)) {
+                $iterator->append(
+                  new File_Iterator(
+                    new RecursiveIteratorIterator(
+                      new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::FOLLOW_SYMLINKS)
+                    ),
+                    $suffixes,
+                    $prefixes,
+                    $exclude,
+                    $path
+                  )
+                );
+            }
+        }
+
+        return $iterator;
+    }
+}
diff --git a/vendor/phpunit/php-file-iterator/LICENSE b/vendor/phpunit/php-file-iterator/LICENSE
new file mode 100644
index 00000000..c392d412
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/LICENSE
@@ -0,0 +1,33 @@
+File_Iterator
+
+Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/phpunit/php-file-iterator/README.markdown b/vendor/phpunit/php-file-iterator/README.markdown
new file mode 100644
index 00000000..c8971c2d
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/README.markdown
@@ -0,0 +1,23 @@
+File_Iterator
+=============
+
+Installation
+------------
+
+File_Iterator should be installed using the [PEAR Installer](http://pear.php.net/). This installer is the backbone of PEAR, which provides a distribution system for PHP packages, and is shipped with every release of PHP since version 4.3.0.
+
+The PEAR channel (`pear.phpunit.de`) that is used to distribute File_Iterator needs to be registered with the local PEAR environment:
+
+    sb@ubuntu ~ % pear channel-discover pear.phpunit.de
+    Adding Channel "pear.phpunit.de" succeeded
+    Discovery of channel "pear.phpunit.de" succeeded
+
+This has to be done only once. Now the PEAR Installer can be used to install packages from the PHPUnit channel:
+
+    sb@vmware ~ % pear install phpunit/File_Iterator
+    downloading File_Iterator-1.1.1.tgz ...
+    Starting to download File_Iterator-1.1.1.tgz (3,173 bytes)
+    ....done: 3,173 bytes
+    install ok: channel://pear.phpunit.de/File_Iterator-1.1.1
+
+After the installation you can find the File_Iterator source files inside your local PEAR directory; the path is usually `/usr/lib/php/File`.
diff --git a/vendor/phpunit/php-file-iterator/build.xml b/vendor/phpunit/php-file-iterator/build.xml
new file mode 100644
index 00000000..29d362fa
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/build.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="File_Iterator" default="build">
+ <property name="php" value="php"/>
+ <property name="phpunit" value="phpunit"/>
+
+ <target name="build"
+   depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpcb"/>
+
+ <target name="build-parallel"
+   depends="prepare,lint,tools-parallel,phpcb"/>
+
+ <target name="tools-parallel"
+         description="Run tools in parallel">
+  <parallel threadCount="2">
+   <sequential>
+    <antcall target="pdepend"/>
+    <antcall target="phpmd-ci"/>
+   </sequential>
+   <antcall target="phpcpd"/>
+   <antcall target="phpcs-ci"/>
+   <antcall target="phploc"/>
+  </parallel>
+ </target>
+
+ <target name="clean" description="Cleanup build artifacts">
+  <delete dir="${basedir}/build/api"/>
+  <delete dir="${basedir}/build/code-browser"/>
+  <delete dir="${basedir}/build/coverage"/>
+  <delete dir="${basedir}/build/logs"/>
+  <delete dir="${basedir}/build/pdepend"/>
+ </target>
+
+ <target name="prepare" depends="clean,phpab"
+         description="Prepare for build">
+  <mkdir dir="${basedir}/build/api"/>
+  <mkdir dir="${basedir}/build/code-browser"/>
+  <mkdir dir="${basedir}/build/coverage"/>
+  <mkdir dir="${basedir}/build/logs"/>
+  <mkdir dir="${basedir}/build/pdepend"/>
+ </target>
+
+ <target name="phpab" description="Generate autoloader scripts">
+  <exec executable="phpab">
+   <arg value="--output" />
+   <arg path="File/Iterator/Autoload.php" />
+   <arg value="--template" />
+   <arg path="File/Iterator/Autoload.php.in" />
+   <arg value="--indent" />
+   <arg value="            " />
+   <arg path="File" />
+  </exec>
+ </target>
+
+ <target name="lint">
+  <apply executable="${php}" failonerror="true">
+   <arg value="-l" />
+
+   <fileset dir="${basedir}/File">
+    <include name="**/*.php" />
+    <modified />
+   </fileset>
+<!--
+   <fileset dir="${basedir}/Tests">
+    <include name="**/*.php" />
+    <modified />
+   </fileset>
+-->
+  </apply>
+ </target>
+
+ <target name="phploc" description="Measure project size using PHPLOC">
+  <exec executable="phploc">
+   <arg value="--log-csv" />
+   <arg value="${basedir}/build/logs/phploc.csv" />
+   <arg path="${basedir}/File" />
+  </exec>
+ </target>
+
+ <target name="pdepend"
+         description="Calculate software metrics using PHP_Depend">
+  <exec executable="pdepend">
+   <arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
+   <arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
+   <arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
+   <arg path="${basedir}/File" />
+  </exec>
+ </target>
+
+ <target name="phpmd"
+         description="Perform project mess detection using PHPMD">
+  <exec executable="phpmd">
+   <arg path="${basedir}/File" />
+   <arg value="text" />
+   <arg value="${basedir}/build/phpmd.xml" />
+  </exec>
+ </target>
+
+ <target name="phpmd-ci"
+         description="Perform project mess detection using PHPMD">
+  <exec executable="phpmd">
+   <arg path="${basedir}/File" />
+   <arg value="xml" />
+   <arg value="${basedir}/build/phpmd.xml" />
+   <arg value="--reportfile" />
+   <arg value="${basedir}/build/logs/pmd.xml" />
+  </exec>
+ </target>
+
+ <target name="phpcs"
+         description="Find coding standard violations using PHP_CodeSniffer">
+  <exec executable="phpcs">
+   <arg value="--standard=${basedir}/build/PHPCS" />
+   <arg value="--extensions=php" />
+   <arg value="--ignore=Autoload.php" />
+   <arg path="${basedir}/File" />
+  </exec>
+ </target>
+
+ <target name="phpcs-ci"
+         description="Find coding standard violations using PHP_CodeSniffer">
+  <exec executable="phpcs" output="/dev/null">
+   <arg value="--report=checkstyle" />
+   <arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
+   <arg value="--standard=${basedir}/build/PHPCS" />
+   <arg value="--extensions=php" />
+   <arg value="--ignore=Autoload.php" />
+   <arg path="${basedir}/File" />
+  </exec>
+ </target>
+
+ <target name="phpcpd" description="Find duplicate code using PHPCPD">
+  <exec executable="phpcpd">
+   <arg value="--log-pmd" />
+   <arg value="${basedir}/build/logs/pmd-cpd.xml" />
+   <arg path="${basedir}/File" />
+  </exec>
+ </target>
+
+ <target name="phpunit" description="Run unit tests with PHPUnit">
+  <condition property="phpunit_cmd" value="${php} ${phpunit}" else="${phpunit}">
+   <not>
+    <equals arg1="${phpunit}" arg2="phpunit" />
+   </not>
+  </condition>
+
+  <exec executable="${phpunit_cmd}" failonerror="true"/>
+ </target>
+
+ <target name="phpcb"
+         description="Aggregate tool output with PHP_CodeBrowser">
+  <exec executable="phpcb">
+   <arg value="--log" />
+   <arg path="${basedir}/build/logs" />
+   <arg value="--source" />
+   <arg path="${basedir}/File" />
+   <arg value="--output" />
+   <arg path="${basedir}/build/code-browser" />
+  </exec>
+ </target>
+</project>
diff --git a/vendor/phpunit/php-file-iterator/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php b/vendor/phpunit/php-file-iterator/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php
new file mode 100644
index 00000000..bf9d520d
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php
@@ -0,0 +1,22 @@
+<?php
+class PHPCS_Sniffs_ControlStructures_ControlSignatureSniff extends PHP_CodeSniffer_Standards_AbstractPatternSniff
+{
+    public function __construct()
+    {
+        parent::__construct(true);
+    }
+
+    protected function getPatterns()
+    {
+        return array(
+          'do {EOL...} while (...);EOL',
+          'while (...) {EOL',
+          'for (...) {EOL',
+          'if (...) {EOL',
+          'foreach (...) {EOL',
+          '}EOLelse if (...) {EOL',
+          '}EOLelse {EOL',
+          'do {EOL',
+        );
+    }
+}
diff --git a/vendor/phpunit/php-file-iterator/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php b/vendor/phpunit/php-file-iterator/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php
new file mode 100644
index 00000000..e91d6c6d
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php
@@ -0,0 +1,22 @@
+<?php
+class PHPCS_Sniffs_Whitespace_ConcatenationSpacingSniff implements PHP_CodeSniffer_Sniff
+{
+    public function register()
+    {
+        return array(T_STRING_CONCAT);
+    }
+
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        if ($tokens[($stackPtr - 1)]['code'] !== T_WHITESPACE ||
+            $tokens[($stackPtr + 1)]['code'] !== T_WHITESPACE) {
+
+            $phpcsFile->addError(
+              'Concatenation operator must be surrounded by whitespace',
+              $stackPtr
+            );
+        }
+    }
+}
diff --git a/vendor/phpunit/php-file-iterator/build/PHPCS/ruleset.xml b/vendor/phpunit/php-file-iterator/build/PHPCS/ruleset.xml
new file mode 100644
index 00000000..402f2140
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/build/PHPCS/ruleset.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<ruleset name="Sebastian">
+ <description>Sebastian Bergmann's coding standard</description>
+
+ <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop"/>
+ <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall"/>
+ <rule ref="Generic.CodeAnalysis.JumbledIncrementer"/>
+ <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement"/>
+ <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
+ <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
+
+ <rule ref="Generic.Commenting.Todo"/>
+
+ <rule ref="Generic.ControlStructures.InlineControlStructure"/>
+
+ <rule ref="Generic.Files.LineEndings"/>
+
+ <rule ref="Generic.Formatting.DisallowMultipleStatements"/>
+ <rule ref="Generic.Formatting.NoSpaceAfterCast"/>
+
+ <rule ref="Generic.Functions.OpeningFunctionBraceBsdAllman"/>
+ <rule ref="PEAR.Functions.ValidDefaultValue"/>
+
+ <rule ref="Generic.NamingConventions.ConstructorName"/>
+ <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
+ <rule ref="PEAR.NamingConventions.ValidClassName"/>
+
+ <rule ref="Generic.PHP.DisallowShortOpenTag"/>
+ <rule ref="Generic.PHP.NoSilencedErrors"/>
+ <rule ref="Generic.PHP.UpperCaseConstant"/>
+
+ <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
+ <rule ref="Generic.WhiteSpace.ScopeIndent"/>
+ <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
+</ruleset>
diff --git a/vendor/phpunit/php-file-iterator/build/phpmd.xml b/vendor/phpunit/php-file-iterator/build/phpmd.xml
new file mode 100644
index 00000000..23ecb8b0
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/build/phpmd.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+
+<ruleset name="Sebastian"
+         xmlns="http://pmd.sf.net/ruleset/1.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+         xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+  <description>Sebastian Bergmann's ruleset</description>
+
+  <rule ref="rulesets/codesize.xml/CyclomaticComplexity" />
+  <rule ref="rulesets/codesize.xml/NPathComplexity" />
+  <rule ref="rulesets/codesize.xml/ExcessiveClassComplexity" />
+  <rule ref="rulesets/codesize.xml/ExcessiveClassLength" />
+  <rule ref="rulesets/codesize.xml/ExcessiveMethodLength" />
+  <rule ref="rulesets/codesize.xml/ExcessiveParameterList" />
+
+  <rule ref="rulesets/design.xml/EvalExpression" />
+  <rule ref="rulesets/design.xml/ExitExpression" />
+  <rule ref="rulesets/design.xml/GotoStatement" />
+
+  <rule ref="rulesets/naming.xml/ConstructorWithNameAsEnclosingClass" />
+
+  <rule ref="rulesets/unusedcode.xml/UnusedFormalParameter" />
+  <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable" />
+  <rule ref="rulesets/unusedcode.xml/UnusedPrivateField" />
+  <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod" />
+</ruleset>
diff --git a/vendor/phpunit/php-file-iterator/composer.json b/vendor/phpunit/php-file-iterator/composer.json
new file mode 100644
index 00000000..1ddd5b88
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "phpunit/php-file-iterator",
+    "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+    "type": "library",
+    "keywords": [
+        "iterator",
+        "filesystem"
+    ],
+    "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sb@sebastian-bergmann.de",
+            "role": "lead"
+        }
+    ],
+    "support": {
+        "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+        "irc": "irc://irc.freenode.net/phpunit"
+    },
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "autoload": {
+        "classmap": [
+            "File/"
+        ]
+    },
+    "include-path": [
+        ""
+    ]
+}
diff --git a/vendor/phpunit/php-file-iterator/package.xml b/vendor/phpunit/php-file-iterator/package.xml
new file mode 100644
index 00000000..f6ca981b
--- /dev/null
+++ b/vendor/phpunit/php-file-iterator/package.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.4.10" version="2.0"
+  xmlns="http://pear.php.net/dtd/package-2.0"
+  xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+                      http://pear.php.net/dtd/tasks-1.0.xsd
+                      http://pear.php.net/dtd/package-2.0
+                      http://pear.php.net/dtd/package-2.0.xsd">
+ <name>File_Iterator</name>
+ <channel>pear.phpunit.de</channel>
+ <summary>FilterIterator implementation that filters files based on a list of suffixes.</summary>
+ <description>FilterIterator implementation that filters files based on a list of suffixes.</description>
+ <lead>
+  <name>Sebastian Bergmann</name>
+  <user>sb</user>
+  <email>sb@sebastian-bergmann.de</email>
+  <active>yes</active>
+ </lead>
+ <date>2013-10-10</date>
+ <version>
+  <release>1.3.4</release>
+  <api>1.3.0</api>
+ </version>
+ <stability>
+  <release>stable</release>
+  <api>stable</api>
+ </stability>
+ <license>The BSD 3-Clause License</license>
+ <notes>http://github.com/sebastianbergmann/php-file-iterator/tree</notes>
+ <contents>
+  <dir name="/">
+   <dir name="File">
+    <dir name="Iterator">
+     <file baseinstalldir="/" name="Autoload.php" role="php">
+      <tasks:replace from="@package_version@" to="version" type="package-info" />
+     </file>
+     <file baseinstalldir="/" name="Facade.php" role="php">
+      <tasks:replace from="@package_version@" to="version" type="package-info" />
+     </file>
+     <file baseinstalldir="/" name="Factory.php" role="php">
+      <tasks:replace from="@package_version@" to="version" type="package-info" />
+     </file>
+    </dir>
+    <file baseinstalldir="/" name="Iterator.php" role="php">
+     <tasks:replace from="@package_version@" to="version" type="package-info" />
+    </file>
+   </dir>
+   <file baseinstalldir="/" name="ChangeLog.markdown" role="doc"/>
+   <file baseinstalldir="/" name="LICENSE" role="doc"/>
+   <file baseinstalldir="/" name="README.markdown" role="doc"/>
+  </dir>
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>5.3.3</min>
+   </php>
+   <pearinstaller>
+    <min>1.9.4</min>
+   </pearinstaller>
+  </required>
+ </dependencies>
+ <phprelease/>
+</package>
diff --git a/vendor/phpunit/php-text-template/.gitattributes b/vendor/phpunit/php-text-template/.gitattributes
new file mode 100644
index 00000000..461090b7
--- /dev/null
+++ b/vendor/phpunit/php-text-template/.gitattributes
@@ -0,0 +1 @@
+*.php diff=php
diff --git a/vendor/phpunit/php-text-template/.gitignore b/vendor/phpunit/php-text-template/.gitignore
new file mode 100644
index 00000000..c5992124
--- /dev/null
+++ b/vendor/phpunit/php-text-template/.gitignore
@@ -0,0 +1,5 @@
+/composer.lock
+/composer.phar
+/.idea
+/vendor
+
diff --git a/vendor/phpunit/php-text-template/LICENSE b/vendor/phpunit/php-text-template/LICENSE
new file mode 100644
index 00000000..9f9a32d9
--- /dev/null
+++ b/vendor/phpunit/php-text-template/LICENSE
@@ -0,0 +1,33 @@
+Text_Template
+
+Copyright (c) 2009-2015, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/phpunit/php-text-template/README.md b/vendor/phpunit/php-text-template/README.md
new file mode 100644
index 00000000..ec8f5936
--- /dev/null
+++ b/vendor/phpunit/php-text-template/README.md
@@ -0,0 +1,14 @@
+# Text_Template
+
+## Installation
+
+## Installation
+
+To add this package as a local, per-project dependency to your project, simply add a dependency on `phpunit/php-text-template` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Text_Template:
+
+    {
+        "require": {
+            "phpunit/php-text-template": "~1.2"
+        }
+    }
+
diff --git a/vendor/phpunit/php-text-template/composer.json b/vendor/phpunit/php-text-template/composer.json
new file mode 100644
index 00000000..a5779c83
--- /dev/null
+++ b/vendor/phpunit/php-text-template/composer.json
@@ -0,0 +1,29 @@
+{
+    "name": "phpunit/php-text-template",
+    "description": "Simple template engine.",
+    "type": "library",
+    "keywords": [
+        "template"
+    ],
+    "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sebastian@phpunit.de",
+            "role": "lead"
+        }
+    ],
+    "support": {
+        "issues": "https://github.com/sebastianbergmann/php-text-template/issues"
+    },
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    }
+}
+
diff --git a/vendor/phpunit/php-text-template/src/Template.php b/vendor/phpunit/php-text-template/src/Template.php
new file mode 100644
index 00000000..9eb39ad5
--- /dev/null
+++ b/vendor/phpunit/php-text-template/src/Template.php
@@ -0,0 +1,135 @@
+<?php
+/*
+ * This file is part of the Text_Template package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A simple template engine.
+ *
+ * @since Class available since Release 1.0.0
+ */
+class Text_Template
+{
+    /**
+     * @var string
+     */
+    protected $template = '';
+
+    /**
+     * @var string
+     */
+    protected $openDelimiter = '{';
+
+    /**
+     * @var string
+     */
+    protected $closeDelimiter = '}';
+
+    /**
+     * @var array
+     */
+    protected $values = array();
+
+    /**
+     * Constructor.
+     *
+     * @param  string                   $file
+     * @throws InvalidArgumentException
+     */
+    public function __construct($file = '', $openDelimiter = '{', $closeDelimiter = '}')
+    {
+        $this->setFile($file);
+        $this->openDelimiter  = $openDelimiter;
+        $this->closeDelimiter = $closeDelimiter;
+    }
+
+    /**
+     * Sets the template file.
+     *
+     * @param  string                   $file
+     * @throws InvalidArgumentException
+     */
+    public function setFile($file)
+    {
+        $distFile = $file . '.dist';
+
+        if (file_exists($file)) {
+            $this->template = file_get_contents($file);
+        }
+
+        else if (file_exists($distFile)) {
+            $this->template = file_get_contents($distFile);
+        }
+
+        else {
+            throw new InvalidArgumentException(
+              'Template file could not be loaded.'
+            );
+        }
+    }
+
+    /**
+     * Sets one or more template variables.
+     *
+     * @param array $values
+     * @param bool  $merge
+     */
+    public function setVar(array $values, $merge = TRUE)
+    {
+        if (!$merge || empty($this->values)) {
+            $this->values = $values;
+        } else {
+            $this->values = array_merge($this->values, $values);
+        }
+    }
+
+    /**
+     * Renders the template and returns the result.
+     *
+     * @return string
+     */
+    public function render()
+    {
+        $keys = array();
+
+        foreach ($this->values as $key => $value) {
+            $keys[] = $this->openDelimiter . $key . $this->closeDelimiter;
+        }
+
+        return str_replace($keys, $this->values, $this->template);
+    }
+
+    /**
+     * Renders the template and writes the result to a file.
+     *
+     * @param string $target
+     */
+    public function renderTo($target)
+    {
+        $fp = @fopen($target, 'wt');
+
+        if ($fp) {
+            fwrite($fp, $this->render());
+            fclose($fp);
+        } else {
+            $error = error_get_last();
+
+            throw new RuntimeException(
+              sprintf(
+                'Could not write to %s: %s',
+                $target,
+                substr(
+                  $error['message'],
+                  strpos($error['message'], ':') + 2
+                )
+              )
+            );
+        }
+    }
+}
+
diff --git a/vendor/phpunit/php-timer/.gitattributes b/vendor/phpunit/php-timer/.gitattributes
new file mode 100644
index 00000000..461090b7
--- /dev/null
+++ b/vendor/phpunit/php-timer/.gitattributes
@@ -0,0 +1 @@
+*.php diff=php
diff --git a/vendor/phpunit/php-timer/.gitignore b/vendor/phpunit/php-timer/.gitignore
new file mode 100644
index 00000000..a7419836
--- /dev/null
+++ b/vendor/phpunit/php-timer/.gitignore
@@ -0,0 +1,7 @@
+build/api
+build/code-browser
+build/coverage
+build/logs
+build/pdepend
+cache.properties
+phpunit.xml
diff --git a/vendor/phpunit/php-timer/.travis.yml b/vendor/phpunit/php-timer/.travis.yml
new file mode 100644
index 00000000..1563ea39
--- /dev/null
+++ b/vendor/phpunit/php-timer/.travis.yml
@@ -0,0 +1,22 @@
+language: php
+
+php:
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+script:
+  - phpunit --bootstrap src/Timer.php tests
+
+notifications:
+  email: false
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
+    on_success: always
+    on_failure: always
+    on_start: false
+
diff --git a/vendor/phpunit/php-timer/LICENSE b/vendor/phpunit/php-timer/LICENSE
new file mode 100644
index 00000000..16c45991
--- /dev/null
+++ b/vendor/phpunit/php-timer/LICENSE
@@ -0,0 +1,33 @@
+PHP_Timer
+
+Copyright (c) 2010-2015, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/phpunit/php-timer/README.md b/vendor/phpunit/php-timer/README.md
new file mode 100644
index 00000000..61e2cca2
--- /dev/null
+++ b/vendor/phpunit/php-timer/README.md
@@ -0,0 +1,47 @@
+[![Build Status](https://travis-ci.org/sebastianbergmann/php-timer.svg?branch=master)](https://travis-ci.org/sebastianbergmann/php-timer)
+
+# PHP_Timer
+
+Utility class for timing things, factored out of PHPUnit into a stand-alone component.
+
+## Installation
+
+To add this package as a local, per-project dependency to your project, simply add a dependency on `phpunit/php-timer` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on PHP_Timer:
+
+    {
+        "require": {
+            "phpunit/php-timer": "~1.0"
+        }
+    }
+
+## Usage
+
+### Basic Timing
+
+```php
+PHP_Timer::start();
+
+$timer->start();
+
+// ...
+
+$time = PHP_Timer::stop();
+var_dump($time);
+
+print PHP_Timer::secondsToTimeString($time);
+```
+
+The code above yields the output below:
+
+    double(1.0967254638672E-5)
+    0 ms
+
+### Resource Consumption Since PHP Startup
+
+```php
+print PHP_Timer::resourceUsage();
+```
+
+The code above yields the output below:
+
+    Time: 0 ms, Memory: 0.50Mb
diff --git a/vendor/phpunit/php-timer/composer.json b/vendor/phpunit/php-timer/composer.json
new file mode 100644
index 00000000..4adc8dbc
--- /dev/null
+++ b/vendor/phpunit/php-timer/composer.json
@@ -0,0 +1,29 @@
+{
+    "name": "phpunit/php-timer",
+    "description": "Utility class for timing",
+    "type": "library",
+    "keywords": [
+        "timer"
+    ],
+    "homepage": "https://github.com/sebastianbergmann/php-timer/",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sb@sebastian-bergmann.de",
+            "role": "lead"
+        }
+    ],
+    "support": {
+        "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+        "irc": "irc://irc.freenode.net/phpunit"
+    },
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    }
+}
diff --git a/vendor/phpunit/php-timer/src/Timer.php b/vendor/phpunit/php-timer/src/Timer.php
new file mode 100644
index 00000000..19fec739
--- /dev/null
+++ b/vendor/phpunit/php-timer/src/Timer.php
@@ -0,0 +1,107 @@
+<?php
+/*
+ * This file is part of the PHP_Timer package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Utility class for timing.
+ *
+ * @since      Class available since Release 1.0.0
+ */
+class PHP_Timer
+{
+    /**
+     * @var array
+     */
+    private static $times = array(
+      'hour'   => 3600000,
+      'minute' => 60000,
+      'second' => 1000
+    );
+
+    /**
+     * @var array
+     */
+    private static $startTimes = array();
+
+    /**
+     * @var float
+     */
+    public static $requestTime;
+
+    /**
+     * Starts the timer.
+     */
+    public static function start()
+    {
+        array_push(self::$startTimes, microtime(true));
+    }
+
+    /**
+     * Stops the timer and returns the elapsed time.
+     *
+     * @return float
+     */
+    public static function stop()
+    {
+        return microtime(true) - array_pop(self::$startTimes);
+    }
+
+    /**
+     * Formats the elapsed time as a string.
+     *
+     * @param  float  $time
+     * @return string
+     */
+    public static function secondsToTimeString($time)
+    {
+        $ms = round($time * 1000);
+
+        foreach (self::$times as $unit => $value) {
+            if ($ms >= $value) {
+                $time = floor($ms / $value * 100.0) / 100.0;
+
+                return $time . ' ' . ($time == 1 ? $unit : $unit . 's');
+            }
+        }
+
+        return $ms . ' ms';
+    }
+
+    /**
+     * Formats the elapsed time since the start of the request as a string.
+     *
+     * @return string
+     */
+    public static function timeSinceStartOfRequest()
+    {
+        return self::secondsToTimeString(microtime(true) - self::$requestTime);
+    }
+
+    /**
+     * Returns the resources (time, memory) of the request as a string.
+     *
+     * @return string
+     */
+    public static function resourceUsage()
+    {
+        return sprintf(
+            'Time: %s, Memory: %4.2fMb',
+            self::timeSinceStartOfRequest(),
+            memory_get_peak_usage(true) / 1048576
+        );
+    }
+}
+
+if (isset($_SERVER['REQUEST_TIME_FLOAT'])) {
+    PHP_Timer::$requestTime = $_SERVER['REQUEST_TIME_FLOAT'];
+} elseif (isset($_SERVER['REQUEST_TIME'])) {
+    PHP_Timer::$requestTime = $_SERVER['REQUEST_TIME'];
+} else {
+    PHP_Timer::$requestTime = microtime(true);
+}
diff --git a/vendor/phpunit/php-timer/tests/TimerTest.php b/vendor/phpunit/php-timer/tests/TimerTest.php
new file mode 100644
index 00000000..9d97d300
--- /dev/null
+++ b/vendor/phpunit/php-timer/tests/TimerTest.php
@@ -0,0 +1,101 @@
+<?php
+/*
+ * This file is part of the PHP_Timer package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Tests for PHP_Timer.
+ *
+ * @since      Class available since Release 1.0.0
+ */
+class PHP_TimerTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers PHP_Timer::start
+     * @covers PHP_Timer::stop
+     */
+    public function testStartStop()
+    {
+        $this->assertInternalType('float', PHP_Timer::stop());
+    }
+
+    /**
+     * @covers       PHP_Timer::secondsToTimeString
+     * @dataProvider secondsProvider
+     */
+    public function testSecondsToTimeString($string, $seconds)
+    {
+        $this->assertEquals(
+            $string,
+            PHP_Timer::secondsToTimeString($seconds)
+        );
+    }
+
+    /**
+     * @covers PHP_Timer::timeSinceStartOfRequest
+     */
+    public function testTimeSinceStartOfRequest()
+    {
+        $this->assertStringMatchesFormat(
+            '%f %s',
+            PHP_Timer::timeSinceStartOfRequest()
+        );
+    }
+
+
+    /**
+     * @covers PHP_Timer::resourceUsage
+     */
+    public function testResourceUsage()
+    {
+        $this->assertStringMatchesFormat(
+            'Time: %s, Memory: %s',
+            PHP_Timer::resourceUsage()
+        );
+    }
+
+    public function secondsProvider()
+    {
+        return array(
+          array('0 ms', 0),
+          array('1 ms', .001),
+          array('10 ms', .01),
+          array('100 ms', .1),
+          array('999 ms', .999),
+          array('1 second', .9999),
+          array('1 second', 1),
+          array('2 seconds', 2),
+          array('59.9 seconds', 59.9),
+          array('59.99 seconds', 59.99),
+          array('59.99 seconds', 59.999),
+          array('1 minute', 59.9999),
+          array('59 seconds', 59.001),
+          array('59.01 seconds', 59.01),
+          array('1 minute', 60),
+          array('1.01 minutes', 61),
+          array('2 minutes', 120),
+          array('2.01 minutes', 121),
+          array('59.99 minutes', 3599.9),
+          array('59.99 minutes', 3599.99),
+          array('59.99 minutes', 3599.999),
+          array('1 hour', 3599.9999),
+          array('59.98 minutes', 3599.001),
+          array('59.98 minutes', 3599.01),
+          array('1 hour', 3600),
+          array('1 hour', 3601),
+          array('1 hour', 3601.9),
+          array('1 hour', 3601.99),
+          array('1 hour', 3601.999),
+          array('1 hour', 3601.9999),
+          array('1.01 hours', 3659.9999),
+          array('1.01 hours', 3659.001),
+          array('1.01 hours', 3659.01),
+          array('2 hours', 7199.9999),
+        );
+    }
+}
diff --git a/vendor/phpunit/php-token-stream/.gitattributes b/vendor/phpunit/php-token-stream/.gitattributes
new file mode 100644
index 00000000..461090b7
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/.gitattributes
@@ -0,0 +1 @@
+*.php diff=php
diff --git a/vendor/phpunit/php-token-stream/.gitignore b/vendor/phpunit/php-token-stream/.gitignore
new file mode 100644
index 00000000..103eecf8
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/.gitignore
@@ -0,0 +1,4 @@
+/.idea
+/composer.lock
+/composer.phar
+/vendor
diff --git a/vendor/phpunit/php-token-stream/.travis.yml b/vendor/phpunit/php-token-stream/.travis.yml
new file mode 100644
index 00000000..bc962b77
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/.travis.yml
@@ -0,0 +1,30 @@
+language: php
+
+php:
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+before_script:
+  - composer self-update
+  - composer install --no-interaction --prefer-source --dev
+
+script:
+  - ./vendor/bin/phpunit --configuration ./build/phpunit.xml
+
+matrix:
+  allow_failures:
+    - php: hhvm
+
+notifications:
+  email: false
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
+    on_success: always
+    on_failure: always
+    on_start: false
+
diff --git a/vendor/phpunit/php-token-stream/LICENSE b/vendor/phpunit/php-token-stream/LICENSE
new file mode 100644
index 00000000..6a176fa0
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/LICENSE
@@ -0,0 +1,33 @@
+PHP_TokenStream
+
+Copyright (c) 2009-2015, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/phpunit/php-token-stream/README.md b/vendor/phpunit/php-token-stream/README.md
new file mode 100644
index 00000000..31d4b24b
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/README.md
@@ -0,0 +1,13 @@
+[![Build Status](https://travis-ci.org/sebastianbergmann/php-token-stream.svg?branch=master)](https://travis-ci.org/sebastianbergmann/php-token-stream)
+
+# PHP_TokenStream
+
+## Installation
+
+To add this package as a local, per-project dependency to your project, simply add a dependency on `phpunit/php-token-stream` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on PHP_TokenStream:
+
+    {
+        "require": {
+            "phpunit/php-token-stream": "~1.2"
+        }
+    }
diff --git a/vendor/phpunit/php-token-stream/build.xml b/vendor/phpunit/php-token-stream/build.xml
new file mode 100644
index 00000000..f02f4b5c
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/build.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="php-token-stream">
+ <target name="clean" description="Cleanup build artifacts">
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
+ </target>
+
+ <target name="composer" depends="clean" description="Install dependencies with Composer">
+  <tstamp>
+   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
+  </tstamp>
+  <delete>
+   <fileset dir="${basedir}">
+    <include name="composer.phar" />
+    <date datetime="${thirty.days.ago}" when="before"/>
+   </fileset>
+  </delete>
+
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
+
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
+  </exec>
+ </target>
+
+ <target name="phpunit" description="Run unit tests with PHPUnit">
+  <exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
+   <arg value="--configuration"/>
+   <arg path="${basedir}/build/phpunit.xml"/>
+  </exec>
+ </target>
+</project>
diff --git a/vendor/phpunit/php-token-stream/build/phpunit.xml b/vendor/phpunit/php-token-stream/build/phpunit.xml
new file mode 100644
index 00000000..139586d2
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/build/phpunit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="../tests/bootstrap.php"
+         verbode="true">
+  <testsuites>
+    <testsuite name="php-token-stream">
+      <directory suffix="Test.php">../tests</directory>
+    </testsuite>
+  </testsuites>
+
+  <filter>
+    <whitelist addUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">../src</directory>
+    </whitelist>
+  </filter>
+</phpunit>
diff --git a/vendor/phpunit/php-token-stream/composer.json b/vendor/phpunit/php-token-stream/composer.json
new file mode 100644
index 00000000..dfde7299
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/composer.json
@@ -0,0 +1,34 @@
+{
+    "name": "phpunit/php-token-stream",
+    "description": "Wrapper around PHP's tokenizer extension.",
+    "type": "library",
+    "keywords": ["tokenizer"],
+    "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sebastian@phpunit.de"
+        }
+    ],
+    "support": {
+        "issues": "https://github.com/sebastianbergmann/php-token-stream/issues"
+    },
+    "require": {
+        "php": ">=5.3.3",
+        "ext-tokenizer": "*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.2"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.4-dev"
+        }
+    }
+}
diff --git a/vendor/phpunit/php-token-stream/src/Token.php b/vendor/phpunit/php-token-stream/src/Token.php
new file mode 100644
index 00000000..85c1846d
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/src/Token.php
@@ -0,0 +1,846 @@
+<?php
+/*
+ * This file is part of the PHP_TokenStream package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A PHP token.
+ *
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
+ * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link      http://github.com/sebastianbergmann/php-token-stream/tree
+ * @since     Class available since Release 1.0.0
+ */
+abstract class PHP_Token
+{
+    /**
+     * @var string
+     */
+    protected $text;
+
+    /**
+     * @var integer
+     */
+    protected $line;
+
+    /**
+     * @var PHP_Token_Stream
+     */
+    protected $tokenStream;
+
+    /**
+     * @var integer
+     */
+    protected $id;
+
+    /**
+     * Constructor.
+     *
+     * @param string           $text
+     * @param integer          $line
+     * @param PHP_Token_Stream $tokenStream
+     * @param integer          $id
+     */
+    public function __construct($text, $line, PHP_Token_Stream $tokenStream, $id)
+    {
+        $this->text        = $text;
+        $this->line        = $line;
+        $this->tokenStream = $tokenStream;
+        $this->id          = $id;
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->text;
+    }
+
+    /**
+     * @return integer
+     */
+    public function getLine()
+    {
+        return $this->line;
+    }
+}
+
+abstract class PHP_TokenWithScope extends PHP_Token
+{
+    /**
+     * @var integer
+     */
+    protected $endTokenId;
+
+    /**
+     * Get the docblock for this token
+     *
+     * This method will fetch the docblock belonging to the current token. The
+     * docblock must be placed on the line directly above the token to be
+     * recognized.
+     *
+     * @return string|null Returns the docblock as a string if found
+     */
+    public function getDocblock()
+    {
+        $tokens            = $this->tokenStream->tokens();
+        $currentLineNumber = $tokens[$this->id]->getLine();
+        $prevLineNumber    = $currentLineNumber - 1;
+
+        for ($i = $this->id - 1; $i; $i--) {
+            if (!isset($tokens[$i])) {
+                return;
+            }
+
+            if ($tokens[$i] instanceof PHP_Token_FUNCTION ||
+                $tokens[$i] instanceof PHP_Token_CLASS ||
+                $tokens[$i] instanceof PHP_Token_TRAIT) {
+                // Some other trait, class or function, no docblock can be
+                // used for the current token
+                break;
+            }
+
+            $line = $tokens[$i]->getLine();
+
+            if ($line == $currentLineNumber ||
+                ($line == $prevLineNumber &&
+                 $tokens[$i] instanceof PHP_Token_WHITESPACE)) {
+                continue;
+            }
+
+            if ($line < $currentLineNumber &&
+                !$tokens[$i] instanceof PHP_Token_DOC_COMMENT) {
+                break;
+            }
+
+            return (string)$tokens[$i];
+        }
+    }
+
+    /**
+     * @return integer
+     */
+    public function getEndTokenId()
+    {
+        $block  = 0;
+        $i      = $this->id;
+        $tokens = $this->tokenStream->tokens();
+
+        while ($this->endTokenId === null && isset($tokens[$i])) {
+            if ($tokens[$i] instanceof PHP_Token_OPEN_CURLY ||
+                $tokens[$i] instanceof PHP_Token_CURLY_OPEN) {
+                $block++;
+            } elseif ($tokens[$i] instanceof PHP_Token_CLOSE_CURLY) {
+                $block--;
+
+                if ($block === 0) {
+                    $this->endTokenId = $i;
+                }
+            } elseif (($this instanceof PHP_Token_FUNCTION ||
+                $this instanceof PHP_Token_NAMESPACE) &&
+                $tokens[$i] instanceof PHP_Token_SEMICOLON) {
+                if ($block === 0) {
+                    $this->endTokenId = $i;
+                }
+            }
+
+            $i++;
+        }
+
+        if ($this->endTokenId === null) {
+            $this->endTokenId = $this->id;
+        }
+
+        return $this->endTokenId;
+    }
+
+    /**
+     * @return integer
+     */
+    public function getEndLine()
+    {
+        return $this->tokenStream[$this->getEndTokenId()]->getLine();
+    }
+}
+
+abstract class PHP_TokenWithScopeAndVisibility extends PHP_TokenWithScope
+{
+    /**
+     * @return string
+     */
+    public function getVisibility()
+    {
+        $tokens = $this->tokenStream->tokens();
+
+        for ($i = $this->id - 2; $i > $this->id - 7; $i -= 2) {
+            if (isset($tokens[$i]) &&
+               ($tokens[$i] instanceof PHP_Token_PRIVATE ||
+                $tokens[$i] instanceof PHP_Token_PROTECTED ||
+                $tokens[$i] instanceof PHP_Token_PUBLIC)) {
+                return strtolower(
+                    str_replace('PHP_Token_', '', get_class($tokens[$i]))
+                );
+            }
+            if (isset($tokens[$i]) &&
+              !($tokens[$i] instanceof PHP_Token_STATIC ||
+                $tokens[$i] instanceof PHP_Token_FINAL ||
+                $tokens[$i] instanceof PHP_Token_ABSTRACT)) {
+                // no keywords; stop visibility search
+                break;
+            }
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getKeywords()
+    {
+        $keywords = array();
+        $tokens   = $this->tokenStream->tokens();
+
+        for ($i = $this->id - 2; $i > $this->id - 7; $i -= 2) {
+            if (isset($tokens[$i]) &&
+               ($tokens[$i] instanceof PHP_Token_PRIVATE ||
+                $tokens[$i] instanceof PHP_Token_PROTECTED ||
+                $tokens[$i] instanceof PHP_Token_PUBLIC)) {
+                continue;
+            }
+
+            if (isset($tokens[$i]) &&
+               ($tokens[$i] instanceof PHP_Token_STATIC ||
+                $tokens[$i] instanceof PHP_Token_FINAL ||
+                $tokens[$i] instanceof PHP_Token_ABSTRACT)) {
+                $keywords[] = strtolower(
+                    str_replace('PHP_Token_', '', get_class($tokens[$i]))
+                );
+            }
+        }
+
+        return implode(',', $keywords);
+    }
+}
+
+abstract class PHP_Token_Includes extends PHP_Token
+{
+    /**
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * @var string
+     */
+    protected $type;
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        if ($this->name === null) {
+            $this->process();
+        }
+
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType()
+    {
+        if ($this->type === null) {
+            $this->process();
+        }
+
+        return $this->type;
+    }
+
+    private function process()
+    {
+        $tokens = $this->tokenStream->tokens();
+
+        if ($tokens[$this->id+2] instanceof PHP_Token_CONSTANT_ENCAPSED_STRING) {
+            $this->name = trim($tokens[$this->id+2], "'\"");
+            $this->type = strtolower(
+                str_replace('PHP_Token_', '', get_class($tokens[$this->id]))
+            );
+        }
+    }
+}
+
+
+class PHP_Token_FUNCTION extends PHP_TokenWithScopeAndVisibility
+{
+    /**
+     * @var array
+     */
+    protected $arguments;
+
+    /**
+     * @var integer
+     */
+    protected $ccn;
+
+    /**
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * @var string
+     */
+    protected $signature;
+
+    /**
+     * @return array
+     */
+    public function getArguments()
+    {
+        if ($this->arguments !== null) {
+            return $this->arguments;
+        }
+
+        $this->arguments = array();
+        $tokens          = $this->tokenStream->tokens();
+        $typeDeclaration = null;
+
+        // Search for first token inside brackets
+        $i = $this->id + 2;
+
+        while (!$tokens[$i-1] instanceof PHP_Token_OPEN_BRACKET) {
+            $i++;
+        }
+
+        while (!$tokens[$i] instanceof PHP_Token_CLOSE_BRACKET) {
+            if ($tokens[$i] instanceof PHP_Token_STRING) {
+                $typeDeclaration = (string)$tokens[$i];
+            } elseif ($tokens[$i] instanceof PHP_Token_VARIABLE) {
+                $this->arguments[(string)$tokens[$i]] = $typeDeclaration;
+                $typeDeclaration                      = null;
+            }
+
+            $i++;
+        }
+
+        return $this->arguments;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        if ($this->name !== null) {
+            return $this->name;
+        }
+
+        $tokens = $this->tokenStream->tokens();
+
+        for ($i = $this->id + 1; $i < count($tokens); $i++) {
+            if ($tokens[$i] instanceof PHP_Token_STRING) {
+                $this->name = (string)$tokens[$i];
+                break;
+            } elseif ($tokens[$i] instanceof PHP_Token_AMPERSAND &&
+                     $tokens[$i+1] instanceof PHP_Token_STRING) {
+                $this->name = (string)$tokens[$i+1];
+                break;
+            } elseif ($tokens[$i] instanceof PHP_Token_OPEN_BRACKET) {
+                $this->name = 'anonymous function';
+                break;
+            }
+        }
+
+        if ($this->name != 'anonymous function') {
+            for ($i = $this->id; $i; --$i) {
+                if ($tokens[$i] instanceof PHP_Token_NAMESPACE) {
+                    $this->name = $tokens[$i]->getName() . '\\' . $this->name;
+                    break;
+                }
+
+                if ($tokens[$i] instanceof PHP_Token_INTERFACE) {
+                    break;
+                }
+            }
+        }
+
+        return $this->name;
+    }
+
+    /**
+     * @return integer
+     */
+    public function getCCN()
+    {
+        if ($this->ccn !== null) {
+            return $this->ccn;
+        }
+
+        $this->ccn = 1;
+        $end       = $this->getEndTokenId();
+        $tokens    = $this->tokenStream->tokens();
+
+        for ($i = $this->id; $i <= $end; $i++) {
+            switch (get_class($tokens[$i])) {
+                case 'PHP_Token_IF':
+                case 'PHP_Token_ELSEIF':
+                case 'PHP_Token_FOR':
+                case 'PHP_Token_FOREACH':
+                case 'PHP_Token_WHILE':
+                case 'PHP_Token_CASE':
+                case 'PHP_Token_CATCH':
+                case 'PHP_Token_BOOLEAN_AND':
+                case 'PHP_Token_LOGICAL_AND':
+                case 'PHP_Token_BOOLEAN_OR':
+                case 'PHP_Token_LOGICAL_OR':
+                case 'PHP_Token_QUESTION_MARK':
+                    $this->ccn++;
+                    break;
+            }
+        }
+
+        return $this->ccn;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSignature()
+    {
+        if ($this->signature !== null) {
+            return $this->signature;
+        }
+
+        if ($this->getName() == 'anonymous function') {
+            $this->signature = 'anonymous function';
+            $i               = $this->id + 1;
+        } else {
+            $this->signature = '';
+            $i               = $this->id + 2;
+        }
+
+        $tokens = $this->tokenStream->tokens();
+
+        while (isset($tokens[$i]) &&
+               !$tokens[$i] instanceof PHP_Token_OPEN_CURLY &&
+               !$tokens[$i] instanceof PHP_Token_SEMICOLON) {
+            $this->signature .= $tokens[$i++];
+        }
+
+        $this->signature = trim($this->signature);
+
+        return $this->signature;
+    }
+}
+
+class PHP_Token_INTERFACE extends PHP_TokenWithScopeAndVisibility
+{
+    /**
+     * @var array
+     */
+    protected $interfaces;
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return (string)$this->tokenStream[$this->id + 2];
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasParent()
+    {
+        return $this->tokenStream[$this->id + 4] instanceof PHP_Token_EXTENDS;
+    }
+
+    /**
+     * @return array
+     */
+    public function getPackage()
+    {
+        $className  = $this->getName();
+        $docComment = $this->getDocblock();
+
+        $result = array(
+            'namespace'   => '',
+            'fullPackage' => '',
+            'category'    => '',
+            'package'     => '',
+            'subpackage'  => ''
+        );
+
+        for ($i = $this->id; $i; --$i) {
+            if ($this->tokenStream[$i] instanceof PHP_Token_NAMESPACE) {
+                $result['namespace'] = $this->tokenStream[$i]->getName();
+                break;
+            }
+        }
+
+        if (preg_match('/@category[\s]+([\.\w]+)/', $docComment, $matches)) {
+            $result['category'] = $matches[1];
+        }
+
+        if (preg_match('/@package[\s]+([\.\w]+)/', $docComment, $matches)) {
+            $result['package']     = $matches[1];
+            $result['fullPackage'] = $matches[1];
+        }
+
+        if (preg_match('/@subpackage[\s]+([\.\w]+)/', $docComment, $matches)) {
+            $result['subpackage']   = $matches[1];
+            $result['fullPackage'] .= '.' . $matches[1];
+        }
+
+        if (empty($result['fullPackage'])) {
+            $result['fullPackage'] = $this->arrayToName(
+                explode('_', str_replace('\\', '_', $className)),
+                '.'
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param  array  $parts
+     * @param  string $join
+     * @return string
+     */
+    protected function arrayToName(array $parts, $join = '\\')
+    {
+        $result = '';
+
+        if (count($parts) > 1) {
+            array_pop($parts);
+
+            $result = join($join, $parts);
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return boolean|string
+     */
+    public function getParent()
+    {
+        if (!$this->hasParent()) {
+            return false;
+        }
+
+        $i         = $this->id + 6;
+        $tokens    = $this->tokenStream->tokens();
+        $className = (string)$tokens[$i];
+
+        while (isset($tokens[$i+1]) &&
+               !$tokens[$i+1] instanceof PHP_Token_WHITESPACE) {
+            $className .= (string)$tokens[++$i];
+        }
+
+        return $className;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasInterfaces()
+    {
+        return (isset($this->tokenStream[$this->id + 4]) &&
+                $this->tokenStream[$this->id + 4] instanceof PHP_Token_IMPLEMENTS) ||
+               (isset($this->tokenStream[$this->id + 8]) &&
+                $this->tokenStream[$this->id + 8] instanceof PHP_Token_IMPLEMENTS);
+    }
+
+    /**
+     * @return array|boolean
+     */
+    public function getInterfaces()
+    {
+        if ($this->interfaces !== null) {
+            return $this->interfaces;
+        }
+
+        if (!$this->hasInterfaces()) {
+            return ($this->interfaces = false);
+        }
+
+        if ($this->tokenStream[$this->id + 4] instanceof PHP_Token_IMPLEMENTS) {
+            $i = $this->id + 3;
+        } else {
+            $i = $this->id + 7;
+        }
+
+        $tokens = $this->tokenStream->tokens();
+
+        while (!$tokens[$i+1] instanceof PHP_Token_OPEN_CURLY) {
+            $i++;
+
+            if ($tokens[$i] instanceof PHP_Token_STRING) {
+                $this->interfaces[] = (string)$tokens[$i];
+            }
+        }
+
+        return $this->interfaces;
+    }
+}
+
+class PHP_Token_ABSTRACT extends PHP_Token {}
+class PHP_Token_AMPERSAND extends PHP_Token {}
+class PHP_Token_AND_EQUAL extends PHP_Token {}
+class PHP_Token_ARRAY extends PHP_Token {}
+class PHP_Token_ARRAY_CAST extends PHP_Token {}
+class PHP_Token_AS extends PHP_Token {}
+class PHP_Token_AT extends PHP_Token {}
+class PHP_Token_BACKTICK extends PHP_Token {}
+class PHP_Token_BAD_CHARACTER extends PHP_Token {}
+class PHP_Token_BOOLEAN_AND extends PHP_Token {}
+class PHP_Token_BOOLEAN_OR extends PHP_Token {}
+class PHP_Token_BOOL_CAST extends PHP_Token {}
+class PHP_Token_BREAK extends PHP_Token {}
+class PHP_Token_CARET extends PHP_Token {}
+class PHP_Token_CASE extends PHP_Token {}
+class PHP_Token_CATCH extends PHP_Token {}
+class PHP_Token_CHARACTER extends PHP_Token {}
+
+class PHP_Token_CLASS extends PHP_Token_INTERFACE
+{
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        $next = $this->tokenStream[$this->id + 1];
+
+        if ($next instanceof PHP_Token_WHITESPACE) {
+            $next = $this->tokenStream[$this->id + 2];
+        }
+
+        if ($next instanceof PHP_Token_STRING) {
+            return (string) $next;
+        }
+
+        if ($next instanceof PHP_Token_OPEN_CURLY ||
+            $next instanceof PHP_Token_EXTENDS ||
+            $next instanceof PHP_Token_IMPLEMENTS) {
+            return 'anonymous class';
+        }
+    }
+}
+
+class PHP_Token_CLASS_C extends PHP_Token {}
+class PHP_Token_CLASS_NAME_CONSTANT extends PHP_Token {}
+class PHP_Token_CLONE extends PHP_Token {}
+class PHP_Token_CLOSE_BRACKET extends PHP_Token {}
+class PHP_Token_CLOSE_CURLY extends PHP_Token {}
+class PHP_Token_CLOSE_SQUARE extends PHP_Token {}
+class PHP_Token_CLOSE_TAG extends PHP_Token {}
+class PHP_Token_COLON extends PHP_Token {}
+class PHP_Token_COMMA extends PHP_Token {}
+class PHP_Token_COMMENT extends PHP_Token {}
+class PHP_Token_CONCAT_EQUAL extends PHP_Token {}
+class PHP_Token_CONST extends PHP_Token {}
+class PHP_Token_CONSTANT_ENCAPSED_STRING extends PHP_Token {}
+class PHP_Token_CONTINUE extends PHP_Token {}
+class PHP_Token_CURLY_OPEN extends PHP_Token {}
+class PHP_Token_DEC extends PHP_Token {}
+class PHP_Token_DECLARE extends PHP_Token {}
+class PHP_Token_DEFAULT extends PHP_Token {}
+class PHP_Token_DIV extends PHP_Token {}
+class PHP_Token_DIV_EQUAL extends PHP_Token {}
+class PHP_Token_DNUMBER extends PHP_Token {}
+class PHP_Token_DO extends PHP_Token {}
+class PHP_Token_DOC_COMMENT extends PHP_Token {}
+class PHP_Token_DOLLAR extends PHP_Token {}
+class PHP_Token_DOLLAR_OPEN_CURLY_BRACES extends PHP_Token {}
+class PHP_Token_DOT extends PHP_Token {}
+class PHP_Token_DOUBLE_ARROW extends PHP_Token {}
+class PHP_Token_DOUBLE_CAST extends PHP_Token {}
+class PHP_Token_DOUBLE_COLON extends PHP_Token {}
+class PHP_Token_DOUBLE_QUOTES extends PHP_Token {}
+class PHP_Token_ECHO extends PHP_Token {}
+class PHP_Token_ELSE extends PHP_Token {}
+class PHP_Token_ELSEIF extends PHP_Token {}
+class PHP_Token_EMPTY extends PHP_Token {}
+class PHP_Token_ENCAPSED_AND_WHITESPACE extends PHP_Token {}
+class PHP_Token_ENDDECLARE extends PHP_Token {}
+class PHP_Token_ENDFOR extends PHP_Token {}
+class PHP_Token_ENDFOREACH extends PHP_Token {}
+class PHP_Token_ENDIF extends PHP_Token {}
+class PHP_Token_ENDSWITCH extends PHP_Token {}
+class PHP_Token_ENDWHILE extends PHP_Token {}
+class PHP_Token_END_HEREDOC extends PHP_Token {}
+class PHP_Token_EQUAL extends PHP_Token {}
+class PHP_Token_EVAL extends PHP_Token {}
+class PHP_Token_EXCLAMATION_MARK extends PHP_Token {}
+class PHP_Token_EXIT extends PHP_Token {}
+class PHP_Token_EXTENDS extends PHP_Token {}
+class PHP_Token_FILE extends PHP_Token {}
+class PHP_Token_FINAL extends PHP_Token {}
+class PHP_Token_FOR extends PHP_Token {}
+class PHP_Token_FOREACH extends PHP_Token {}
+class PHP_Token_FUNC_C extends PHP_Token {}
+class PHP_Token_GLOBAL extends PHP_Token {}
+class PHP_Token_GT extends PHP_Token {}
+class PHP_Token_IF extends PHP_Token {}
+class PHP_Token_IMPLEMENTS extends PHP_Token {}
+class PHP_Token_INC extends PHP_Token {}
+class PHP_Token_INCLUDE extends PHP_Token_Includes {}
+class PHP_Token_INCLUDE_ONCE extends PHP_Token_Includes {}
+class PHP_Token_INLINE_HTML extends PHP_Token {}
+class PHP_Token_INSTANCEOF extends PHP_Token {}
+class PHP_Token_INT_CAST extends PHP_Token {}
+class PHP_Token_ISSET extends PHP_Token {}
+class PHP_Token_IS_EQUAL extends PHP_Token {}
+class PHP_Token_IS_GREATER_OR_EQUAL extends PHP_Token {}
+class PHP_Token_IS_IDENTICAL extends PHP_Token {}
+class PHP_Token_IS_NOT_EQUAL extends PHP_Token {}
+class PHP_Token_IS_NOT_IDENTICAL extends PHP_Token {}
+class PHP_Token_IS_SMALLER_OR_EQUAL extends PHP_Token {}
+class PHP_Token_LINE extends PHP_Token {}
+class PHP_Token_LIST extends PHP_Token {}
+class PHP_Token_LNUMBER extends PHP_Token {}
+class PHP_Token_LOGICAL_AND extends PHP_Token {}
+class PHP_Token_LOGICAL_OR extends PHP_Token {}
+class PHP_Token_LOGICAL_XOR extends PHP_Token {}
+class PHP_Token_LT extends PHP_Token {}
+class PHP_Token_METHOD_C extends PHP_Token {}
+class PHP_Token_MINUS extends PHP_Token {}
+class PHP_Token_MINUS_EQUAL extends PHP_Token {}
+class PHP_Token_MOD_EQUAL extends PHP_Token {}
+class PHP_Token_MULT extends PHP_Token {}
+class PHP_Token_MUL_EQUAL extends PHP_Token {}
+class PHP_Token_NEW extends PHP_Token {}
+class PHP_Token_NUM_STRING extends PHP_Token {}
+class PHP_Token_OBJECT_CAST extends PHP_Token {}
+class PHP_Token_OBJECT_OPERATOR extends PHP_Token {}
+class PHP_Token_OPEN_BRACKET extends PHP_Token {}
+class PHP_Token_OPEN_CURLY extends PHP_Token {}
+class PHP_Token_OPEN_SQUARE extends PHP_Token {}
+class PHP_Token_OPEN_TAG extends PHP_Token {}
+class PHP_Token_OPEN_TAG_WITH_ECHO extends PHP_Token {}
+class PHP_Token_OR_EQUAL extends PHP_Token {}
+class PHP_Token_PAAMAYIM_NEKUDOTAYIM extends PHP_Token {}
+class PHP_Token_PERCENT extends PHP_Token {}
+class PHP_Token_PIPE extends PHP_Token {}
+class PHP_Token_PLUS extends PHP_Token {}
+class PHP_Token_PLUS_EQUAL extends PHP_Token {}
+class PHP_Token_PRINT extends PHP_Token {}
+class PHP_Token_PRIVATE extends PHP_Token {}
+class PHP_Token_PROTECTED extends PHP_Token {}
+class PHP_Token_PUBLIC extends PHP_Token {}
+class PHP_Token_QUESTION_MARK extends PHP_Token {}
+class PHP_Token_REQUIRE extends PHP_Token_Includes {}
+class PHP_Token_REQUIRE_ONCE extends PHP_Token_Includes {}
+class PHP_Token_RETURN extends PHP_Token {}
+class PHP_Token_SEMICOLON extends PHP_Token {}
+class PHP_Token_SL extends PHP_Token {}
+class PHP_Token_SL_EQUAL extends PHP_Token {}
+class PHP_Token_SR extends PHP_Token {}
+class PHP_Token_SR_EQUAL extends PHP_Token {}
+class PHP_Token_START_HEREDOC extends PHP_Token {}
+class PHP_Token_STATIC extends PHP_Token {}
+class PHP_Token_STRING extends PHP_Token {}
+class PHP_Token_STRING_CAST extends PHP_Token {}
+class PHP_Token_STRING_VARNAME extends PHP_Token {}
+class PHP_Token_SWITCH extends PHP_Token {}
+class PHP_Token_THROW extends PHP_Token {}
+class PHP_Token_TILDE extends PHP_Token {}
+class PHP_Token_TRY extends PHP_Token {}
+class PHP_Token_UNSET extends PHP_Token {}
+class PHP_Token_UNSET_CAST extends PHP_Token {}
+class PHP_Token_USE extends PHP_Token {}
+class PHP_Token_VAR extends PHP_Token {}
+class PHP_Token_VARIABLE extends PHP_Token {}
+class PHP_Token_WHILE extends PHP_Token {}
+class PHP_Token_WHITESPACE extends PHP_Token {}
+class PHP_Token_XOR_EQUAL extends PHP_Token {}
+
+// Tokens introduced in PHP 5.1
+class PHP_Token_HALT_COMPILER extends PHP_Token {}
+
+// Tokens introduced in PHP 5.3
+class PHP_Token_DIR extends PHP_Token {}
+class PHP_Token_GOTO extends PHP_Token {}
+
+class PHP_Token_NAMESPACE extends PHP_TokenWithScope
+{
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        $tokens    = $this->tokenStream->tokens();
+        $namespace = (string)$tokens[$this->id+2];
+
+        for ($i = $this->id + 3;; $i += 2) {
+            if (isset($tokens[$i]) &&
+                $tokens[$i] instanceof PHP_Token_NS_SEPARATOR) {
+                $namespace .= '\\' . $tokens[$i+1];
+            } else {
+                break;
+            }
+        }
+
+        return $namespace;
+    }
+}
+
+class PHP_Token_NS_C extends PHP_Token {}
+class PHP_Token_NS_SEPARATOR extends PHP_Token {}
+
+// Tokens introduced in PHP 5.4
+class PHP_Token_CALLABLE extends PHP_Token {}
+class PHP_Token_INSTEADOF extends PHP_Token {}
+class PHP_Token_TRAIT extends PHP_Token_INTERFACE {}
+class PHP_Token_TRAIT_C extends PHP_Token {}
+
+// Tokens introduced in PHP 5.5
+class PHP_Token_FINALLY extends PHP_Token {}
+class PHP_Token_YIELD extends PHP_Token {}
+
+// Tokens introduced in PHP 5.6
+class PHP_Token_ELLIPSIS extends PHP_Token {}
+class PHP_Token_POW extends PHP_Token {}
+class PHP_Token_POW_EQUAL extends PHP_Token {}
+
+// Tokens introduced in PHP 7.0
+class PHP_Token_COALESCE extends PHP_Token {}
+class PHP_Token_SPACESHIP extends PHP_Token {}
+class PHP_Token_YIELD_FROM extends PHP_Token {}
+
+// Tokens introduced in HackLang / HHVM
+class PHP_Token_ASYNC extends PHP_Token {}
+class PHP_Token_AWAIT extends PHP_Token {}
+class PHP_Token_COMPILER_HALT_OFFSET extends PHP_Token {}
+class PHP_Token_ENUM extends PHP_Token {}
+class PHP_Token_EQUALS extends PHP_Token {}
+class PHP_Token_IN extends PHP_Token {}
+class PHP_Token_JOIN extends PHP_Token {}
+class PHP_Token_LAMBDA_ARROW extends PHP_Token {}
+class PHP_Token_LAMBDA_CP extends PHP_Token {}
+class PHP_Token_LAMBDA_OP extends PHP_Token {}
+class PHP_Token_ONUMBER extends PHP_Token {}
+class PHP_Token_SHAPE extends PHP_Token {}
+class PHP_Token_TYPE extends PHP_Token {}
+class PHP_Token_TYPELIST_GT extends PHP_Token {}
+class PHP_Token_TYPELIST_LT extends PHP_Token {}
+class PHP_Token_WHERE extends PHP_Token {}
+class PHP_Token_XHP_ATTRIBUTE extends PHP_Token {}
+class PHP_Token_XHP_CATEGORY extends PHP_Token {}
+class PHP_Token_XHP_CATEGORY_LABEL extends PHP_Token {}
+class PHP_Token_XHP_CHILDREN extends PHP_Token {}
+class PHP_Token_XHP_LABEL extends PHP_Token {}
+class PHP_Token_XHP_REQUIRED extends PHP_Token {}
+class PHP_Token_XHP_TAG_GT extends PHP_Token {}
+class PHP_Token_XHP_TAG_LT extends PHP_Token {}
+class PHP_Token_XHP_TEXT extends PHP_Token {}
diff --git a/vendor/phpunit/php-token-stream/src/Token/Stream.php b/vendor/phpunit/php-token-stream/src/Token/Stream.php
new file mode 100644
index 00000000..a9c69bef
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/src/Token/Stream.php
@@ -0,0 +1,606 @@
+<?php
+/*
+ * This file is part of the PHP_TokenStream package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A stream of PHP tokens.
+ *
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
+ * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link      http://github.com/sebastianbergmann/php-token-stream/tree
+ * @since     Class available since Release 1.0.0
+ */
+class PHP_Token_Stream implements ArrayAccess, Countable, SeekableIterator
+{
+    /**
+     * @var array
+     */
+    protected static $customTokens = array(
+        '(' => 'PHP_Token_OPEN_BRACKET',
+        ')' => 'PHP_Token_CLOSE_BRACKET',
+        '[' => 'PHP_Token_OPEN_SQUARE',
+        ']' => 'PHP_Token_CLOSE_SQUARE',
+        '{' => 'PHP_Token_OPEN_CURLY',
+        '}' => 'PHP_Token_CLOSE_CURLY',
+        ';' => 'PHP_Token_SEMICOLON',
+        '.' => 'PHP_Token_DOT',
+        ',' => 'PHP_Token_COMMA',
+        '=' => 'PHP_Token_EQUAL',
+        '<' => 'PHP_Token_LT',
+        '>' => 'PHP_Token_GT',
+        '+' => 'PHP_Token_PLUS',
+        '-' => 'PHP_Token_MINUS',
+        '*' => 'PHP_Token_MULT',
+        '/' => 'PHP_Token_DIV',
+        '?' => 'PHP_Token_QUESTION_MARK',
+        '!' => 'PHP_Token_EXCLAMATION_MARK',
+        ':' => 'PHP_Token_COLON',
+        '"' => 'PHP_Token_DOUBLE_QUOTES',
+        '@' => 'PHP_Token_AT',
+        '&' => 'PHP_Token_AMPERSAND',
+        '%' => 'PHP_Token_PERCENT',
+        '|' => 'PHP_Token_PIPE',
+        '$' => 'PHP_Token_DOLLAR',
+        '^' => 'PHP_Token_CARET',
+        '~' => 'PHP_Token_TILDE',
+        '`' => 'PHP_Token_BACKTICK'
+    );
+
+    /**
+     * @var string
+     */
+    protected $filename;
+
+    /**
+     * @var array
+     */
+    protected $tokens = array();
+
+    /**
+     * @var integer
+     */
+    protected $position = 0;
+
+    /**
+     * @var array
+     */
+    protected $linesOfCode = array('loc' => 0, 'cloc' => 0, 'ncloc' => 0);
+
+    /**
+     * @var array
+     */
+    protected $classes;
+
+    /**
+     * @var array
+     */
+    protected $functions;
+
+    /**
+     * @var array
+     */
+    protected $includes;
+
+    /**
+     * @var array
+     */
+    protected $interfaces;
+
+    /**
+     * @var array
+     */
+    protected $traits;
+
+    /**
+     * @var array
+     */
+    protected $lineToFunctionMap = array();
+
+    /**
+     * Constructor.
+     *
+     * @param string $sourceCode
+     */
+    public function __construct($sourceCode)
+    {
+        if (is_file($sourceCode)) {
+            $this->filename = $sourceCode;
+            $sourceCode     = file_get_contents($sourceCode);
+        }
+
+        $this->scan($sourceCode);
+    }
+
+    /**
+     * Destructor.
+     */
+    public function __destruct()
+    {
+        $this->tokens = array();
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        $buffer = '';
+
+        foreach ($this as $token) {
+            $buffer .= $token;
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * @return string
+     * @since  Method available since Release 1.1.0
+     */
+    public function getFilename()
+    {
+        return $this->filename;
+    }
+
+    /**
+     * Scans the source for sequences of characters and converts them into a
+     * stream of tokens.
+     *
+     * @param string $sourceCode
+     */
+    protected function scan($sourceCode)
+    {
+        $line      = 1;
+        $tokens    = token_get_all($sourceCode);
+        $numTokens = count($tokens);
+
+        $lastNonWhitespaceTokenWasDoubleColon = false;
+
+        for ($i = 0; $i < $numTokens; ++$i) {
+            $token = $tokens[$i];
+            unset($tokens[$i]);
+
+            if (is_array($token)) {
+                $name = substr(token_name($token[0]), 2);
+                $text = $token[1];
+
+                if ($lastNonWhitespaceTokenWasDoubleColon && $name == 'CLASS') {
+                    $name = 'CLASS_NAME_CONSTANT';
+                }
+
+                $tokenClass = 'PHP_Token_' . $name;
+            } else {
+                $text       = $token;
+                $tokenClass = self::$customTokens[$token];
+            }
+
+            $this->tokens[] = new $tokenClass($text, $line, $this, $i);
+            $lines          = substr_count($text, "\n");
+            $line          += $lines;
+
+            if ($tokenClass == 'PHP_Token_HALT_COMPILER') {
+                break;
+            } elseif ($tokenClass == 'PHP_Token_COMMENT' ||
+                $tokenClass == 'PHP_Token_DOC_COMMENT') {
+                $this->linesOfCode['cloc'] += $lines + 1;
+            }
+
+            if ($name == 'DOUBLE_COLON') {
+                $lastNonWhitespaceTokenWasDoubleColon = true;
+            } elseif ($name != 'WHITESPACE') {
+                $lastNonWhitespaceTokenWasDoubleColon = false;
+            }
+        }
+
+        $this->linesOfCode['loc']   = substr_count($sourceCode, "\n");
+        $this->linesOfCode['ncloc'] = $this->linesOfCode['loc'] -
+                                      $this->linesOfCode['cloc'];
+    }
+
+    /**
+     * @return integer
+     */
+    public function count()
+    {
+        return count($this->tokens);
+    }
+
+    /**
+     * @return PHP_Token[]
+     */
+    public function tokens()
+    {
+        return $this->tokens;
+    }
+
+    /**
+     * @return array
+     */
+    public function getClasses()
+    {
+        if ($this->classes !== null) {
+            return $this->classes;
+        }
+
+        $this->parse();
+
+        return $this->classes;
+    }
+
+    /**
+     * @return array
+     */
+    public function getFunctions()
+    {
+        if ($this->functions !== null) {
+            return $this->functions;
+        }
+
+        $this->parse();
+
+        return $this->functions;
+    }
+
+    /**
+     * @return array
+     */
+    public function getInterfaces()
+    {
+        if ($this->interfaces !== null) {
+            return $this->interfaces;
+        }
+
+        $this->parse();
+
+        return $this->interfaces;
+    }
+
+    /**
+     * @return array
+     * @since  Method available since Release 1.1.0
+     */
+    public function getTraits()
+    {
+        if ($this->traits !== null) {
+            return $this->traits;
+        }
+
+        $this->parse();
+
+        return $this->traits;
+    }
+
+    /**
+     * Gets the names of all files that have been included
+     * using include(), include_once(), require() or require_once().
+     *
+     * Parameter $categorize set to TRUE causing this function to return a
+     * multi-dimensional array with categories in the keys of the first dimension
+     * and constants and their values in the second dimension.
+     *
+     * Parameter $category allow to filter following specific inclusion type
+     *
+     * @param bool   $categorize OPTIONAL
+     * @param string $category   OPTIONAL Either 'require_once', 'require',
+     *                                           'include_once', 'include'.
+     * @return array
+     * @since  Method available since Release 1.1.0
+     */
+    public function getIncludes($categorize = false, $category = null)
+    {
+        if ($this->includes === null) {
+            $this->includes = array(
+              'require_once' => array(),
+              'require'      => array(),
+              'include_once' => array(),
+              'include'      => array()
+            );
+
+            foreach ($this->tokens as $token) {
+                switch (get_class($token)) {
+                    case 'PHP_Token_REQUIRE_ONCE':
+                    case 'PHP_Token_REQUIRE':
+                    case 'PHP_Token_INCLUDE_ONCE':
+                    case 'PHP_Token_INCLUDE':
+                        $this->includes[$token->getType()][] = $token->getName();
+                        break;
+                }
+            }
+        }
+
+        if (isset($this->includes[$category])) {
+            $includes = $this->includes[$category];
+        } elseif ($categorize === false) {
+            $includes = array_merge(
+                $this->includes['require_once'],
+                $this->includes['require'],
+                $this->includes['include_once'],
+                $this->includes['include']
+            );
+        } else {
+            $includes = $this->includes;
+        }
+
+        return $includes;
+    }
+
+    /**
+     * Returns the name of the function or method a line belongs to.
+     *
+     * @return string or null if the line is not in a function or method
+     * @since  Method available since Release 1.2.0
+     */
+    public function getFunctionForLine($line)
+    {
+        $this->parse();
+
+        if (isset($this->lineToFunctionMap[$line])) {
+            return $this->lineToFunctionMap[$line];
+        }
+    }
+
+    protected function parse()
+    {
+        $this->interfaces = array();
+        $this->classes    = array();
+        $this->traits     = array();
+        $this->functions  = array();
+        $class            = false;
+        $classEndLine     = false;
+        $trait            = false;
+        $traitEndLine     = false;
+        $interface        = false;
+        $interfaceEndLine = false;
+
+        foreach ($this->tokens as $token) {
+            switch (get_class($token)) {
+                case 'PHP_Token_HALT_COMPILER':
+                    return;
+
+                case 'PHP_Token_INTERFACE':
+                    $interface        = $token->getName();
+                    $interfaceEndLine = $token->getEndLine();
+
+                    $this->interfaces[$interface] = array(
+                      'methods'   => array(),
+                      'parent'    => $token->getParent(),
+                      'keywords'  => $token->getKeywords(),
+                      'docblock'  => $token->getDocblock(),
+                      'startLine' => $token->getLine(),
+                      'endLine'   => $interfaceEndLine,
+                      'package'   => $token->getPackage(),
+                      'file'      => $this->filename
+                    );
+                    break;
+
+                case 'PHP_Token_CLASS':
+                case 'PHP_Token_TRAIT':
+                    $tmp = array(
+                      'methods'   => array(),
+                      'parent'    => $token->getParent(),
+                      'interfaces'=> $token->getInterfaces(),
+                      'keywords'  => $token->getKeywords(),
+                      'docblock'  => $token->getDocblock(),
+                      'startLine' => $token->getLine(),
+                      'endLine'   => $token->getEndLine(),
+                      'package'   => $token->getPackage(),
+                      'file'      => $this->filename
+                    );
+
+                    if ($token instanceof PHP_Token_CLASS) {
+                        $class                 = $token->getName();
+                        $classEndLine          = $token->getEndLine();
+
+                        if ($class != 'anonymous class') {
+                            $this->classes[$class] = $tmp;
+                        }
+                    } else {
+                        $trait                = $token->getName();
+                        $traitEndLine         = $token->getEndLine();
+                        $this->traits[$trait] = $tmp;
+                    }
+                    break;
+
+                case 'PHP_Token_FUNCTION':
+                    $name = $token->getName();
+                    $tmp  = array(
+                      'docblock'  => $token->getDocblock(),
+                      'keywords'  => $token->getKeywords(),
+                      'visibility'=> $token->getVisibility(),
+                      'signature' => $token->getSignature(),
+                      'startLine' => $token->getLine(),
+                      'endLine'   => $token->getEndLine(),
+                      'ccn'       => $token->getCCN(),
+                      'file'      => $this->filename
+                    );
+
+                    if ($class === false &&
+                        $trait === false &&
+                        $interface === false) {
+                        $this->functions[$name] = $tmp;
+
+                        $this->addFunctionToMap(
+                            $name,
+                            $tmp['startLine'],
+                            $tmp['endLine']
+                        );
+                    } elseif ($class !== false && $class != 'anonymous class') {
+                        $this->classes[$class]['methods'][$name] = $tmp;
+
+                        $this->addFunctionToMap(
+                            $class . '::' . $name,
+                            $tmp['startLine'],
+                            $tmp['endLine']
+                        );
+                    } elseif ($trait !== false) {
+                        $this->traits[$trait]['methods'][$name] = $tmp;
+
+                        $this->addFunctionToMap(
+                            $trait . '::' . $name,
+                            $tmp['startLine'],
+                            $tmp['endLine']
+                        );
+                    } else {
+                        $this->interfaces[$interface]['methods'][$name] = $tmp;
+                    }
+                    break;
+
+                case 'PHP_Token_CLOSE_CURLY':
+                    if ($classEndLine !== false &&
+                        $classEndLine == $token->getLine()) {
+                        $class        = false;
+                        $classEndLine = false;
+                    } elseif ($traitEndLine !== false &&
+                        $traitEndLine == $token->getLine()) {
+                        $trait        = false;
+                        $traitEndLine = false;
+                    } elseif ($interfaceEndLine !== false &&
+                        $interfaceEndLine == $token->getLine()) {
+                        $interface        = false;
+                        $interfaceEndLine = false;
+                    }
+                    break;
+            }
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function getLinesOfCode()
+    {
+        return $this->linesOfCode;
+    }
+
+    /**
+     */
+    public function rewind()
+    {
+        $this->position = 0;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function valid()
+    {
+        return isset($this->tokens[$this->position]);
+    }
+
+    /**
+     * @return integer
+     */
+    public function key()
+    {
+        return $this->position;
+    }
+
+    /**
+     * @return PHP_Token
+     */
+    public function current()
+    {
+        return $this->tokens[$this->position];
+    }
+
+    /**
+     */
+    public function next()
+    {
+        $this->position++;
+    }
+
+    /**
+     * @param  integer $offset
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->tokens[$offset]);
+    }
+
+    /**
+     * @param  integer $offset
+     * @return mixed
+     * @throws OutOfBoundsException
+     */
+    public function offsetGet($offset)
+    {
+        if (!$this->offsetExists($offset)) {
+            throw new OutOfBoundsException(
+                sprintf(
+                    'No token at position "%s"',
+                    $offset
+                )
+            );
+        }
+
+        return $this->tokens[$offset];
+    }
+
+    /**
+     * @param integer $offset
+     * @param mixed   $value
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->tokens[$offset] = $value;
+    }
+
+    /**
+     * @param  integer $offset
+     * @throws OutOfBoundsException
+     */
+    public function offsetUnset($offset)
+    {
+        if (!$this->offsetExists($offset)) {
+            throw new OutOfBoundsException(
+                sprintf(
+                    'No token at position "%s"',
+                    $offset
+                )
+            );
+        }
+
+        unset($this->tokens[$offset]);
+    }
+
+    /**
+     * Seek to an absolute position.
+     *
+     * @param  integer $position
+     * @throws OutOfBoundsException
+     */
+    public function seek($position)
+    {
+        $this->position = $position;
+
+        if (!$this->valid()) {
+            throw new OutOfBoundsException(
+                sprintf(
+                    'No token at position "%s"',
+                    $this->position
+                )
+            );
+        }
+    }
+
+    /**
+     * @param string  $name
+     * @param integer $startLine
+     * @param integer $endLine
+     */
+    private function addFunctionToMap($name, $startLine, $endLine)
+    {
+        for ($line = $startLine; $line <= $endLine; $line++) {
+            $this->lineToFunctionMap[$line] = $name;
+        }
+    }
+}
diff --git a/vendor/phpunit/php-token-stream/src/Token/Stream/CachingFactory.php b/vendor/phpunit/php-token-stream/src/Token/Stream/CachingFactory.php
new file mode 100644
index 00000000..b41b25f6
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/src/Token/Stream/CachingFactory.php
@@ -0,0 +1,51 @@
+<?php
+/*
+ * This file is part of the PHP_TokenStream package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A caching factory for token stream objects.
+ *
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
+ * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link      http://github.com/sebastianbergmann/php-token-stream/tree
+ * @since     Class available since Release 1.0.0
+ */
+class PHP_Token_Stream_CachingFactory
+{
+    /**
+     * @var array
+     */
+    protected static $cache = array();
+
+    /**
+     * @param  string $filename
+     * @return PHP_Token_Stream
+     */
+    public static function get($filename)
+    {
+        if (!isset(self::$cache[$filename])) {
+            self::$cache[$filename] = new PHP_Token_Stream($filename);
+        }
+
+        return self::$cache[$filename];
+    }
+
+    /**
+     * @param string $filename
+     */
+    public static function clear($filename = null)
+    {
+        if (is_string($filename)) {
+            unset(self::$cache[$filename]);
+        } else {
+            self::$cache = array();
+        }
+    }
+}
diff --git a/vendor/phpunit/php-token-stream/tests/Token/ClassTest.php b/vendor/phpunit/php-token-stream/tests/Token/ClassTest.php
new file mode 100644
index 00000000..7080e565
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/Token/ClassTest.php
@@ -0,0 +1,96 @@
+<?php
+/*
+ * This file is part of the PHP_TokenStream package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Tests for the PHP_Token_CLASS class.
+ *
+ * @package    PHP_TokenStream
+ * @subpackage Tests
+ * @author     Laurent Laville <pear@laurent-laville.org>
+ * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/php-token-stream/
+ * @since      Class available since Release 1.0.2
+ */
+class PHP_Token_ClassTest extends PHPUnit_Framework_TestCase
+{
+    protected $class;
+    protected $function;
+
+    protected function setUp()
+    {
+        $ts = new PHP_Token_Stream(TEST_FILES_PATH . 'source2.php');
+
+        foreach ($ts as $token) {
+            if ($token instanceof PHP_Token_CLASS) {
+                $this->class = $token;
+            }
+
+            if ($token instanceof PHP_Token_FUNCTION) {
+                $this->function = $token;
+                break;
+            }
+        }
+    }
+
+    /**
+     * @covers PHP_Token_CLASS::getKeywords
+     */
+    public function testGetClassKeywords()
+    {
+        $this->assertEquals('abstract', $this->class->getKeywords());
+    }
+
+    /**
+     * @covers PHP_Token_FUNCTION::getKeywords
+     */
+    public function testGetFunctionKeywords()
+    {
+        $this->assertEquals('abstract,static', $this->function->getKeywords());
+    }
+
+    /**
+     * @covers PHP_Token_FUNCTION::getVisibility
+     */
+    public function testGetFunctionVisibility()
+    {
+        $this->assertEquals('public', $this->function->getVisibility());
+    }
+
+    public function testIssue19()
+    {
+        $ts = new PHP_Token_Stream(TEST_FILES_PATH . 'issue19.php');
+
+        foreach ($ts as $token) {
+            if ($token instanceof PHP_Token_CLASS) {
+                $this->assertFalse($token->hasInterfaces());
+            }
+        }
+    }
+
+    public function testIssue30()
+    {
+        $ts = new PHP_Token_Stream(TEST_FILES_PATH . 'issue30.php');
+        $this->assertCount(1, $ts->getClasses());
+    }
+
+    /**
+     * @requires PHP 7
+     */
+    public function testAnonymousClassesAreHandledCorrectly()
+    {
+        $ts = new PHP_Token_Stream(TEST_FILES_PATH . 'class_with_method_that_declares_anonymous_class.php');
+
+        $classes = $ts->getClasses();
+
+        $this->assertEquals(array('class_with_method_that_declares_anonymous_class'), array_keys($classes));
+    }
+}
diff --git a/vendor/phpunit/php-token-stream/tests/Token/ClosureTest.php b/vendor/phpunit/php-token-stream/tests/Token/ClosureTest.php
new file mode 100644
index 00000000..f1e508cf
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/Token/ClosureTest.php
@@ -0,0 +1,85 @@
+<?php
+/*
+ * This file is part of the PHP_TokenStream package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Tests for the PHP_Token_FUNCTION class.
+ *
+ * @package    PHP_TokenStream
+ * @subpackage Tests
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/php-token-stream/
+ * @since      Class available since Release 1.0.0
+ */
+class PHP_Token_ClosureTest extends PHPUnit_Framework_TestCase
+{
+    protected $functions;
+
+    protected function setUp()
+    {
+        $ts = new PHP_Token_Stream(TEST_FILES_PATH . 'closure.php');
+
+        foreach ($ts as $token) {
+            if ($token instanceof PHP_Token_FUNCTION) {
+                $this->functions[] = $token;
+            }
+        }
+    }
+
+    /**
+     * @covers PHP_Token_FUNCTION::getArguments
+     */
+    public function testGetArguments()
+    {
+        $this->assertEquals(array('$foo' => null, '$bar' => null), $this->functions[0]->getArguments());
+        $this->assertEquals(array('$foo' => 'Foo', '$bar' => null), $this->functions[1]->getArguments());
+        $this->assertEquals(array('$foo' => null, '$bar' => null, '$baz' => null), $this->functions[2]->getArguments());
+        $this->assertEquals(array('$foo' => 'Foo', '$bar' => null, '$baz' => null), $this->functions[3]->getArguments());
+        $this->assertEquals(array(), $this->functions[4]->getArguments());
+        $this->assertEquals(array(), $this->functions[5]->getArguments());
+    }
+
+    /**
+     * @covers PHP_Token_FUNCTION::getName
+     */
+    public function testGetName()
+    {
+        $this->assertEquals('anonymous function', $this->functions[0]->getName());
+        $this->assertEquals('anonymous function', $this->functions[1]->getName());
+        $this->assertEquals('anonymous function', $this->functions[2]->getName());
+        $this->assertEquals('anonymous function', $this->functions[3]->getName());
+        $this->assertEquals('anonymous function', $this->functions[4]->getName());
+        $this->assertEquals('anonymous function', $this->functions[5]->getName());
+    }
+
+    /**
+     * @covers PHP_Token::getLine
+     */
+    public function testGetLine()
+    {
+        $this->assertEquals(2, $this->functions[0]->getLine());
+        $this->assertEquals(3, $this->functions[1]->getLine());
+        $this->assertEquals(4, $this->functions[2]->getLine());
+        $this->assertEquals(5, $this->functions[3]->getLine());
+    }
+
+    /**
+     * @covers PHP_TokenWithScope::getEndLine
+     */
+    public function testGetEndLine()
+    {
+        $this->assertEquals(2, $this->functions[0]->getLine());
+        $this->assertEquals(3, $this->functions[1]->getLine());
+        $this->assertEquals(4, $this->functions[2]->getLine());
+        $this->assertEquals(5, $this->functions[3]->getLine());
+    }
+}
diff --git a/vendor/phpunit/php-token-stream/tests/Token/FunctionTest.php b/vendor/phpunit/php-token-stream/tests/Token/FunctionTest.php
new file mode 100644
index 00000000..4f23c39d
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/Token/FunctionTest.php
@@ -0,0 +1,146 @@
+<?php
+/*
+ * This file is part of the PHP_TokenStream package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Tests for the PHP_Token_FUNCTION class.
+ *
+ * @package    PHP_TokenStream
+ * @subpackage Tests
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/php-token-stream/
+ * @since      Class available since Release 1.0.0
+ */
+class PHP_Token_FunctionTest extends PHPUnit_Framework_TestCase
+{
+    protected $functions;
+
+    protected function setUp()
+    {
+        $ts = new PHP_Token_Stream(TEST_FILES_PATH . 'source.php');
+
+        foreach ($ts as $token) {
+            if ($token instanceof PHP_Token_FUNCTION) {
+                $this->functions[] = $token;
+            }
+        }
+    }
+
+    /**
+     * @covers PHP_Token_FUNCTION::getArguments
+     */
+    public function testGetArguments()
+    {
+        $this->assertEquals(array(), $this->functions[0]->getArguments());
+
+        $this->assertEquals(
+          array('$baz' => 'Baz'), $this->functions[1]->getArguments()
+        );
+
+        $this->assertEquals(
+          array('$foobar' => 'Foobar'), $this->functions[2]->getArguments()
+        );
+
+        $this->assertEquals(
+          array('$barfoo' => 'Barfoo'), $this->functions[3]->getArguments()
+        );
+
+        $this->assertEquals(array(), $this->functions[4]->getArguments());
+
+        $this->assertEquals(array('$x' => null, '$y' => null), $this->functions[5]->getArguments());
+    }
+
+    /**
+     * @covers PHP_Token_FUNCTION::getName
+     */
+    public function testGetName()
+    {
+        $this->assertEquals('foo', $this->functions[0]->getName());
+        $this->assertEquals('bar', $this->functions[1]->getName());
+        $this->assertEquals('foobar', $this->functions[2]->getName());
+        $this->assertEquals('barfoo', $this->functions[3]->getName());
+        $this->assertEquals('baz', $this->functions[4]->getName());
+    }
+
+    /**
+     * @covers PHP_Token::getLine
+     */
+    public function testGetLine()
+    {
+        $this->assertEquals(5, $this->functions[0]->getLine());
+        $this->assertEquals(10, $this->functions[1]->getLine());
+        $this->assertEquals(17, $this->functions[2]->getLine());
+        $this->assertEquals(21, $this->functions[3]->getLine());
+        $this->assertEquals(29, $this->functions[4]->getLine());
+    }
+
+    /**
+     * @covers PHP_TokenWithScope::getEndLine
+     */
+    public function testGetEndLine()
+    {
+        $this->assertEquals(5, $this->functions[0]->getEndLine());
+        $this->assertEquals(12, $this->functions[1]->getEndLine());
+        $this->assertEquals(19, $this->functions[2]->getEndLine());
+        $this->assertEquals(23, $this->functions[3]->getEndLine());
+        $this->assertEquals(31, $this->functions[4]->getEndLine());
+    }
+
+    /**
+     * @covers PHP_Token_FUNCTION::getDocblock
+     */
+    public function testGetDocblock()
+    {
+        $this->assertNull($this->functions[0]->getDocblock());
+
+        $this->assertEquals(
+          "/**\n     * @param Baz \$baz\n     */",
+          $this->functions[1]->getDocblock()
+        );
+
+        $this->assertEquals(
+          "/**\n     * @param Foobar \$foobar\n     */",
+          $this->functions[2]->getDocblock()
+        );
+
+        $this->assertNull($this->functions[3]->getDocblock());
+        $this->assertNull($this->functions[4]->getDocblock());
+    }
+
+    public function testSignature()
+    {
+        $ts = new PHP_Token_Stream(TEST_FILES_PATH . 'source5.php');
+        $f  = $ts->getFunctions();
+        $c  = $ts->getClasses();
+        $i  = $ts->getInterfaces();
+
+        $this->assertEquals(
+          'foo($a, array $b, array $c = array())',
+          $f['foo']['signature']
+        );
+
+        $this->assertEquals(
+          'm($a, array $b, array $c = array())',
+          $c['c']['methods']['m']['signature']
+        );
+
+        $this->assertEquals(
+          'm($a, array $b, array $c = array())',
+          $c['a']['methods']['m']['signature']
+        );
+
+        $this->assertEquals(
+          'm($a, array $b, array $c = array())',
+          $i['i']['methods']['m']['signature']
+        );
+    }
+}
diff --git a/vendor/phpunit/php-token-stream/tests/Token/IncludeTest.php b/vendor/phpunit/php-token-stream/tests/Token/IncludeTest.php
new file mode 100644
index 00000000..1e433512
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/Token/IncludeTest.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ * This file is part of the PHP_TokenStream package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Tests for the PHP_Token_REQUIRE_ONCE, PHP_Token_REQUIRE
+ * PHP_Token_INCLUDE_ONCE and PHP_Token_INCLUDE_ONCE classes.
+ *
+ * @package    PHP_TokenStream
+ * @subpackage Tests
+ * @author     Laurent Laville <pear@laurent-laville.org>
+ * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/php-token-stream/
+ * @since      Class available since Release 1.0.2
+ */
+class PHP_Token_IncludeTest extends PHPUnit_Framework_TestCase
+{
+    protected $ts;
+
+    protected function setUp()
+    {
+        $this->ts = new PHP_Token_Stream(TEST_FILES_PATH . 'source3.php');
+    }
+
+    /**
+     * @covers PHP_Token_Includes::getName
+     * @covers PHP_Token_Includes::getType
+     */
+    public function testGetIncludes()
+    {
+        $this->assertSame(
+          array('test4.php', 'test3.php', 'test2.php', 'test1.php'),
+          $this->ts->getIncludes()
+        );
+    }
+
+    /**
+     * @covers PHP_Token_Includes::getName
+     * @covers PHP_Token_Includes::getType
+     */
+    public function testGetIncludesCategorized()
+    {
+        $this->assertSame(
+          array(
+            'require_once' => array('test4.php'),
+            'require'      => array('test3.php'),
+            'include_once' => array('test2.php'),
+            'include'      => array('test1.php')
+          ),
+          $this->ts->getIncludes(TRUE)
+        );
+    }
+
+    /**
+     * @covers PHP_Token_Includes::getName
+     * @covers PHP_Token_Includes::getType
+     */
+    public function testGetIncludesCategory()
+    {
+        $this->assertSame(
+          array('test4.php'),
+          $this->ts->getIncludes(TRUE, 'require_once')
+        );
+    }
+}
diff --git a/vendor/phpunit/php-token-stream/tests/Token/InterfaceTest.php b/vendor/phpunit/php-token-stream/tests/Token/InterfaceTest.php
new file mode 100644
index 00000000..56caede2
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/Token/InterfaceTest.php
@@ -0,0 +1,191 @@
+<?php
+/*
+ * This file is part of the PHP_TokenStream package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Tests for the PHP_Token_INTERFACE class.
+ *
+ * @package    PHP_TokenStream
+ * @subpackage Tests
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Laurent Laville <pear@laurent-laville.org>
+ * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/php-token-stream/
+ * @since      Class available since Release 1.0.0
+ */
+class PHP_Token_InterfaceTest extends PHPUnit_Framework_TestCase
+{
+    protected $class;
+    protected $interfaces;
+
+    protected function setUp()
+    {
+        $ts = new PHP_Token_Stream(TEST_FILES_PATH . 'source4.php');
+        $i  = 0;
+        foreach ($ts as $token) {
+            if ($token instanceof PHP_Token_CLASS) {
+                $this->class = $token;
+            }
+            elseif ($token instanceof PHP_Token_INTERFACE) {
+                $this->interfaces[$i] = $token;
+                $i++;
+            }
+        }
+    }
+
+    /**
+     * @covers PHP_Token_INTERFACE::getName
+     */
+    public function testGetName()
+    {
+        $this->assertEquals(
+            'iTemplate', $this->interfaces[0]->getName()
+        );
+    }
+
+    /**
+     * @covers PHP_Token_INTERFACE::getParent
+     */
+    public function testGetParentNotExists()
+    {
+        $this->assertFalse(
+            $this->interfaces[0]->getParent()
+        );
+    }
+
+    /**
+     * @covers PHP_Token_INTERFACE::hasParent
+     */
+    public function testHasParentNotExists()
+    {
+        $this->assertFalse(
+            $this->interfaces[0]->hasParent()
+        );
+    }
+
+    /**
+     * @covers PHP_Token_INTERFACE::getParent
+     */
+    public function testGetParentExists()
+    {
+        $this->assertEquals(
+            'a', $this->interfaces[2]->getParent()
+        );
+    }
+
+    /**
+     * @covers PHP_Token_INTERFACE::hasParent
+     */
+    public function testHasParentExists()
+    {
+        $this->assertTrue(
+            $this->interfaces[2]->hasParent()
+        );
+    }
+
+    /**
+     * @covers PHP_Token_INTERFACE::getInterfaces
+     */
+    public function testGetInterfacesExists()
+    {
+        $this->assertEquals(
+            array('b'),
+            $this->class->getInterfaces()
+        );
+    }
+
+    /**
+     * @covers PHP_Token_INTERFACE::hasInterfaces
+     */
+    public function testHasInterfacesExists()
+    {
+        $this->assertTrue(
+            $this->class->hasInterfaces()
+        );
+    }
+    /**
+     * @covers PHP_Token_INTERFACE::getPackage
+     */
+    public function testGetPackageNamespace() {
+        $tokenStream = new PHP_Token_Stream(TEST_FILES_PATH . 'classInNamespace.php');
+        foreach($tokenStream as $token) {
+            if($token instanceOf PHP_Token_INTERFACE) {
+                $package = $token->getPackage();
+                $this->assertSame('Foo\\Bar', $package['namespace']);
+            }
+        }
+    }
+
+
+    public function provideFilesWithClassesWithinMultipleNamespaces() {
+        return array(
+            array(TEST_FILES_PATH . 'multipleNamespacesWithOneClassUsingBraces.php'),
+            array(TEST_FILES_PATH . 'multipleNamespacesWithOneClassUsingNonBraceSyntax.php'),
+        );
+    }
+
+    /**
+     * @dataProvider provideFilesWithClassesWithinMultipleNamespaces
+     * @covers PHP_Token_INTERFACE::getPackage
+     */
+    public function testGetPackageNamespaceForFileWithMultipleNamespaces($filepath) {
+        $tokenStream = new PHP_Token_Stream($filepath);
+        $firstClassFound = false;
+        foreach($tokenStream as $token) {
+            if($firstClassFound === false && $token instanceOf PHP_Token_INTERFACE) {
+                $package = $token->getPackage();
+                $this->assertSame('TestClassInBar', $token->getName());
+                $this->assertSame('Foo\\Bar', $package['namespace']);
+                $firstClassFound = true;
+                continue;
+            }
+            // Secound class
+            if($token instanceOf PHP_Token_INTERFACE) {
+                $package = $token->getPackage();
+                $this->assertSame('TestClassInBaz', $token->getName());
+                $this->assertSame('Foo\\Baz', $package['namespace']);
+                return;
+            }
+        }
+        $this->fail("Seachring for 2 classes failed");
+    }
+
+    public function testGetPackageNamespaceIsEmptyForInterfacesThatAreNotWithinNamespaces() {
+        foreach($this->interfaces as $token) {
+            $package = $token->getPackage();
+            $this->assertSame("", $package['namespace']);
+        }
+    }
+
+    /**
+     * @covers PHP_Token_INTERFACE::getPackage
+     */
+    public function testGetPackageNamespaceWhenExtentingFromNamespaceClass() {
+        $tokenStream = new PHP_Token_Stream(TEST_FILES_PATH . 'classExtendsNamespacedClass.php');
+        $firstClassFound = false;
+        foreach($tokenStream as $token) {
+            if($firstClassFound === false && $token instanceOf PHP_Token_INTERFACE) {
+                $package = $token->getPackage();
+                $this->assertSame('Baz', $token->getName());
+                $this->assertSame('Foo\\Bar', $package['namespace']);
+                $firstClassFound = true;
+                continue;
+            }
+            if($token instanceOf PHP_Token_INTERFACE) {
+                $package = $token->getPackage();
+                $this->assertSame('Extender', $token->getName());
+                $this->assertSame('Other\\Space', $package['namespace']);
+                return;
+            }
+        }
+        $this->fail("Searching for 2 classes failed");
+    }
+}
diff --git a/vendor/phpunit/php-token-stream/tests/Token/NamespaceTest.php b/vendor/phpunit/php-token-stream/tests/Token/NamespaceTest.php
new file mode 100644
index 00000000..469f7872
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/Token/NamespaceTest.php
@@ -0,0 +1,80 @@
+<?php
+/*
+ * This file is part of the PHP_TokenStream package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Tests for the PHP_Token_NAMESPACE class.
+ *
+ * @package    PHP_TokenStream
+ * @subpackage Tests
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/php-token-stream/
+ * @since      Class available since Release 1.0.0
+ */
+class PHP_Token_NamespaceTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers PHP_Token_NAMESPACE::getName
+     */
+    public function testGetName()
+    {
+        $tokenStream = new PHP_Token_Stream(
+          TEST_FILES_PATH . 'classInNamespace.php'
+        );
+
+        foreach ($tokenStream as $token) {
+            if ($token instanceof PHP_Token_NAMESPACE) {
+                $this->assertSame('Foo\\Bar', $token->getName());
+            }
+        }
+    }
+
+    public function testGetStartLineWithUnscopedNamespace()
+    {
+        $tokenStream = new PHP_Token_Stream(TEST_FILES_PATH . 'classInNamespace.php');
+        foreach($tokenStream as $token) {
+            if($token instanceOf PHP_Token_NAMESPACE) {
+                $this->assertSame(2, $token->getLine());
+            }
+        }
+    }
+
+    public function testGetEndLineWithUnscopedNamespace()
+    {
+        $tokenStream = new PHP_Token_Stream(TEST_FILES_PATH . 'classInNamespace.php');
+        foreach($tokenStream as $token) {
+            if($token instanceOf PHP_Token_NAMESPACE) {
+                $this->assertSame(2, $token->getEndLine());
+            }
+        }
+    }
+    public function testGetStartLineWithScopedNamespace()
+    {
+        $tokenStream = new PHP_Token_Stream(TEST_FILES_PATH . 'classInScopedNamespace.php');
+        foreach($tokenStream as $token) {
+            if($token instanceOf PHP_Token_NAMESPACE) {
+                $this->assertSame(2, $token->getLine());
+            }
+        }
+    }
+
+    public function testGetEndLineWithScopedNamespace()
+    {
+        $tokenStream = new PHP_Token_Stream(TEST_FILES_PATH . 'classInScopedNamespace.php');
+        foreach($tokenStream as $token) {
+            if($token instanceOf PHP_Token_NAMESPACE) {
+                $this->assertSame(8, $token->getEndLine());
+            }
+        }
+    }
+
+}
diff --git a/vendor/phpunit/php-token-stream/tests/TokenTest.php b/vendor/phpunit/php-token-stream/tests/TokenTest.php
new file mode 100644
index 00000000..67bf79a0
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/TokenTest.php
@@ -0,0 +1,42 @@
+<?php
+/*
+ * This file is part of the PHP_TokenStream package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Tests for the PHP_Token class.
+ *
+ * @package    PHP_TokenStream
+ * @subpackage Tests
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/php-token-stream/
+ * @since      Class available since Release 1.0.0
+ */
+class PHP_TokenTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers PHP_Token::__construct
+     * @covers PHP_Token::__toString
+     */
+    public function testToString()
+    {
+        $this->markTestIncomplete();
+    }
+
+    /**
+     * @covers PHP_Token::__construct
+     * @covers PHP_Token::getLine
+     */
+    public function testGetLine()
+    {
+        $this->markTestIncomplete();
+    }
+}
diff --git a/vendor/phpunit/php-token-stream/tests/_fixture/classExtendsNamespacedClass.php b/vendor/phpunit/php-token-stream/tests/_fixture/classExtendsNamespacedClass.php
new file mode 100644
index 00000000..560eec94
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/_fixture/classExtendsNamespacedClass.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Foo\Bar;
+
+class Baz {}
+
+namespace Other\Space;
+
+class Extender extends \Foo\Bar\Baz {}
+
diff --git a/vendor/phpunit/php-token-stream/tests/_fixture/classInNamespace.php b/vendor/phpunit/php-token-stream/tests/_fixture/classInNamespace.php
new file mode 100644
index 00000000..8ade7cdf
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/_fixture/classInNamespace.php
@@ -0,0 +1,6 @@
+<?php
+namespace Foo\Bar;
+
+class TestClass
+{
+}
diff --git a/vendor/phpunit/php-token-stream/tests/_fixture/classInScopedNamespace.php b/vendor/phpunit/php-token-stream/tests/_fixture/classInScopedNamespace.php
new file mode 100644
index 00000000..1ba475ce
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/_fixture/classInScopedNamespace.php
@@ -0,0 +1,9 @@
+<?php
+namespace Foo\BarScoped {
+
+    class TestClass {
+
+    }
+
+}
+
diff --git a/vendor/phpunit/php-token-stream/tests/_fixture/class_with_method_that_declares_anonymous_class.php b/vendor/phpunit/php-token-stream/tests/_fixture/class_with_method_that_declares_anonymous_class.php
new file mode 100644
index 00000000..4a02fe13
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/_fixture/class_with_method_that_declares_anonymous_class.php
@@ -0,0 +1,15 @@
+<?php
+interface foo {
+}
+
+class class_with_method_that_declares_anonymous_class
+{
+    public function method()
+    {
+        $o = new class { public function foo() {} };
+        $o = new class{public function foo(){}};
+        $o = new class extends stdClass {};
+        $o = new class extends stdClass {};
+        $o = new class implements foo {};
+    }
+}
diff --git a/vendor/phpunit/php-token-stream/tests/_fixture/closure.php b/vendor/phpunit/php-token-stream/tests/_fixture/closure.php
new file mode 100644
index 00000000..a0e3a81d
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/_fixture/closure.php
@@ -0,0 +1,7 @@
+<?php
+$function1 = function($foo, $bar) use ($var) {};
+$function2 = function(Foo $foo, $bar) use ($var) {};
+$function3 = function ($foo, $bar, $baz) {};
+$function4 = function (Foo $foo, $bar, $baz) {};
+$function5 = function () {};
+$function6 = function() {};
diff --git a/vendor/phpunit/php-token-stream/tests/_fixture/issue19.php b/vendor/phpunit/php-token-stream/tests/_fixture/issue19.php
new file mode 100644
index 00000000..91eeb473
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/_fixture/issue19.php
@@ -0,0 +1,3 @@
+<?php
+class TestClass {
+}
diff --git a/vendor/phpunit/php-token-stream/tests/_fixture/issue30.php b/vendor/phpunit/php-token-stream/tests/_fixture/issue30.php
new file mode 100644
index 00000000..0d1f6f35
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/_fixture/issue30.php
@@ -0,0 +1,8 @@
+<?php
+class Foo
+{
+    public function bar()
+    {
+        return Foo::CLASS;
+    }
+}
diff --git a/vendor/phpunit/php-token-stream/tests/_fixture/multipleNamespacesWithOneClassUsingBraces.php b/vendor/phpunit/php-token-stream/tests/_fixture/multipleNamespacesWithOneClassUsingBraces.php
new file mode 100644
index 00000000..d3a12e30
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/_fixture/multipleNamespacesWithOneClassUsingBraces.php
@@ -0,0 +1,12 @@
+<?php
+namespace Foo\Bar;
+
+class TestClassInBar
+{
+}
+
+namespace Foo\Baz;
+
+class TestClassInBaz
+{
+}
diff --git a/vendor/phpunit/php-token-stream/tests/_fixture/multipleNamespacesWithOneClassUsingNonBraceSyntax.php b/vendor/phpunit/php-token-stream/tests/_fixture/multipleNamespacesWithOneClassUsingNonBraceSyntax.php
new file mode 100644
index 00000000..4ee4f249
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/_fixture/multipleNamespacesWithOneClassUsingNonBraceSyntax.php
@@ -0,0 +1,14 @@
+<?php
+namespace Foo\Bar
+{
+    class TestClassInBar
+    {
+    }
+}
+
+namespace Foo\Baz
+{
+    class TestClassInBaz
+    {
+    }
+}
diff --git a/vendor/phpunit/php-token-stream/tests/_fixture/source.php b/vendor/phpunit/php-token-stream/tests/_fixture/source.php
new file mode 100644
index 00000000..0c9b87f6
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/_fixture/source.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Some comment
+ */
+class Foo{function foo(){}
+
+    /**
+     * @param Baz $baz
+     */
+    public function bar(Baz $baz)
+    {
+    }
+
+    /**
+     * @param Foobar $foobar
+     */
+    static public function foobar(Foobar $foobar)
+    {
+    }
+
+    public function barfoo(Barfoo $barfoo)
+    {
+    }
+
+    /**
+     * This docblock does not belong to the baz function
+     */
+
+    public function baz()
+    {
+    }
+
+    public function blaz($x, $y)
+    {
+    }
+}
diff --git a/vendor/phpunit/php-token-stream/tests/_fixture/source2.php b/vendor/phpunit/php-token-stream/tests/_fixture/source2.php
new file mode 100644
index 00000000..b33dce1f
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/_fixture/source2.php
@@ -0,0 +1,6 @@
+<?php
+// short desc
+abstract class A {
+    /* abst meth: */
+    public static  abstract function method();
+}
diff --git a/vendor/phpunit/php-token-stream/tests/_fixture/source3.php b/vendor/phpunit/php-token-stream/tests/_fixture/source3.php
new file mode 100644
index 00000000..7e42b60f
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/_fixture/source3.php
@@ -0,0 +1,14 @@
+<?php
+// This file is example#1
+// from http://www.php.net/manual/en/function.get-included-files.php
+
+include 'test1.php';
+include_once 'test2.php';
+require 'test3.php';
+require_once 'test4.php';
+
+$included_files = get_included_files();
+
+foreach ($included_files as $filename) {
+    echo "$filename\n";
+}
diff --git a/vendor/phpunit/php-token-stream/tests/_fixture/source4.php b/vendor/phpunit/php-token-stream/tests/_fixture/source4.php
new file mode 100644
index 00000000..6b064fcd
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/_fixture/source4.php
@@ -0,0 +1,30 @@
+<?php
+// Declare the interface 'iTemplate'
+interface iTemplate
+{
+    public function setVariable($name, $var);
+    public function
+        getHtml($template);
+}
+
+interface a
+{
+    public function foo();
+}
+
+interface b extends a
+{
+    public function baz(Baz $baz);
+}
+
+// short desc for class that implement a unique interface
+class c implements b
+{
+    public function foo()
+    {
+    }
+
+    public function baz(Baz $baz)
+    {
+    }
+}
diff --git a/vendor/phpunit/php-token-stream/tests/_fixture/source5.php b/vendor/phpunit/php-token-stream/tests/_fixture/source5.php
new file mode 100644
index 00000000..ef7d4746
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/_fixture/source5.php
@@ -0,0 +1,5 @@
+<?php
+function foo($a, array $b, array $c = array()) {}
+interface i { public function m($a, array $b, array $c = array()); }
+abstract class a { abstract public function m($a, array $b, array $c = array()); }
+class c { public function m($a, array $b, array $c = array()) {} }
diff --git a/vendor/phpunit/php-token-stream/tests/bootstrap.php b/vendor/phpunit/php-token-stream/tests/bootstrap.php
new file mode 100644
index 00000000..f92b7df0
--- /dev/null
+++ b/vendor/phpunit/php-token-stream/tests/bootstrap.php
@@ -0,0 +1,7 @@
+<?php
+require __DIR__ . '/../vendor/autoload.php';
+
+define(
+    'TEST_FILES_PATH',
+    __DIR__ . DIRECTORY_SEPARATOR . '_fixture' . DIRECTORY_SEPARATOR
+);
diff --git a/vendor/phpunit/phpunit-mock-objects/.gitattributes b/vendor/phpunit/phpunit-mock-objects/.gitattributes
new file mode 100644
index 00000000..461090b7
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/.gitattributes
@@ -0,0 +1 @@
+*.php diff=php
diff --git a/vendor/phpunit/phpunit-mock-objects/.gitignore b/vendor/phpunit/phpunit-mock-objects/.gitignore
new file mode 100644
index 00000000..b17f73fd
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/.gitignore
@@ -0,0 +1,8 @@
+build/coverage
+build/logs
+cache.properties
+phpunit.xml
+/vendor
+/composer.lock
+/composer.phar
+/.idea
diff --git a/vendor/phpunit/phpunit-mock-objects/.travis.yml b/vendor/phpunit/phpunit-mock-objects/.travis.yml
new file mode 100644
index 00000000..b6a76ecd
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/.travis.yml
@@ -0,0 +1,29 @@
+language: php
+
+before_script:
+  - composer self-update
+  - composer install --no-interaction --prefer-source --dev
+
+script: ./vendor/bin/phpunit --configuration ./build/travis-ci.xml
+
+php:
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: hhvm
+
+notifications:
+  email: false
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
+    on_success: always
+    on_failure: always
+    on_start: false
+
diff --git a/vendor/phpunit/phpunit-mock-objects/CONTRIBUTING.md b/vendor/phpunit/phpunit-mock-objects/CONTRIBUTING.md
new file mode 100644
index 00000000..b2905398
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/CONTRIBUTING.md
@@ -0,0 +1,5 @@
+Pull Requests for bug fixes should be made against the current release branch (1.2). 
+
+Pull Requests for new features should be made against master.
+
+For further notes please refer to [https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md](https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md)
diff --git a/vendor/phpunit/phpunit-mock-objects/LICENSE b/vendor/phpunit/phpunit-mock-objects/LICENSE
new file mode 100644
index 00000000..6c7e93b1
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/LICENSE
@@ -0,0 +1,33 @@
+PHPUnit_MockObject
+
+Copyright (c) 2002-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/phpunit/phpunit-mock-objects/README.md b/vendor/phpunit/phpunit-mock-objects/README.md
new file mode 100644
index 00000000..cb855a8a
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/README.md
@@ -0,0 +1,21 @@
+[![Latest Stable Version](https://poser.pugx.org/phpunit/phpunit-mock-objects/v/stable.png)](https://packagist.org/packages/phpunit/phpunit-mock-objects)
+[![Build Status](https://travis-ci.org/sebastianbergmann/phpunit-mock-objects.png?branch=master)](https://travis-ci.org/sebastianbergmann/phpunit-mock-objects)
+
+# PHPUnit_MockObject
+
+**PHPUnit_MockObject** is the default mock object library for PHPUnit.
+
+## Requirements
+
+* PHP 5.3.3 is required but using the latest version of PHP is highly recommended
+
+## Installation
+
+To add PHPUnit_MockObject as a local, per-project dependency to your project, simply add a dependency on `phpunit/phpunit-mock-objects` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on PHPUnit_MockObject 2.0:
+
+    {
+        "require": {
+            "phpunit/phpunit-mock-objects": "2.1.*"
+        }
+    }
+
diff --git a/vendor/phpunit/phpunit-mock-objects/build.xml b/vendor/phpunit/phpunit-mock-objects/build.xml
new file mode 100644
index 00000000..aa44cbec
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/build.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="PHPUnit_MockObjects">
+ <target name="clean" description="Cleanup build artifacts">
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
+
+  <delete>
+   <fileset dir="${basedir}/build">
+    <include name="**/*.phar" />
+   </fileset>
+  </delete>
+ </target>
+
+ <target name="composer" depends="clean" description="Install dependencies with Composer">
+  <tstamp>
+   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
+  </tstamp>
+  <delete>
+   <fileset dir="${basedir}">
+    <include name="composer.phar" />
+    <date datetime="${thirty.days.ago}" when="before"/>
+   </fileset>
+  </delete>
+
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
+
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
+  </exec>
+ </target>
+
+ <target name="phpab" description="Generate autoloader script">
+  <exec executable="phpab">
+   <arg value="--output" />
+   <arg path="tests/autoload.php" />
+   <arg path="tests" />
+  </exec>
+ </target>
+
+ <target name="phpcs" description="Find coding standard violations using PHP_CodeSniffer">
+  <exec executable="phpcs">
+   <arg value="--standard=PSR2" />
+   <arg value="--extensions=php" />
+   <arg path="${basedir}/src" />
+   <arg path="${basedir}/tests" />
+  </exec>
+ </target>
+</project>
+
diff --git a/vendor/phpunit/phpunit-mock-objects/build/travis-ci.xml b/vendor/phpunit/phpunit-mock-objects/build/travis-ci.xml
new file mode 100644
index 00000000..f2b2216a
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/build/travis-ci.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         bootstrap="../tests/bootstrap.php"
+         backupGlobals="false"
+         verbose="true">
+  <testsuite name="PHPUnit Mock Objects">
+    <directory suffix="Test.php">../tests</directory>
+    <directory suffix=".phpt">../tests</directory>
+  </testsuite>
+</phpunit>
+
diff --git a/vendor/phpunit/phpunit-mock-objects/composer.json b/vendor/phpunit/phpunit-mock-objects/composer.json
new file mode 100644
index 00000000..46fda2b5
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/composer.json
@@ -0,0 +1,46 @@
+{
+    "name": "phpunit/phpunit-mock-objects",
+    "description": "Mock Object library for PHPUnit",
+    "type": "library",
+    "keywords": [
+        "xunit",
+        "mock"
+    ],
+    "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sb@sebastian-bergmann.de",
+            "role": "lead"
+        }
+    ],
+    "support": {
+        "issues": "https://github.com/sebastianbergmann/phpunit-mock-objects/issues",
+        "irc": "irc://irc.freenode.net/phpunit"
+    },
+    "require": {
+        "php": ">=5.3.3",
+        "phpunit/php-text-template": "~1.2"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.1"
+    },
+    "suggest": {
+        "ext-soap": "*"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.1.x-dev"
+        }
+    },
+    "include-path": [
+        ""
+    ]
+}
+
diff --git a/vendor/phpunit/phpunit-mock-objects/phpunit.xml.dist b/vendor/phpunit/phpunit-mock-objects/phpunit.xml.dist
new file mode 100644
index 00000000..84db1114
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/phpunit.xml.dist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         bootstrap="tests/bootstrap.php"
+         backupGlobals="false"
+         verbose="true">
+  <testsuite name="PHPUnit Mock Objects">
+    <directory suffix="Test.php">tests</directory>
+    <directory suffix=".phpt">tests</directory>
+  </testsuite>
+
+  <logging>
+    <log type="coverage-html" target="build/coverage"/>
+  </logging>
+
+  <filter>
+    <whitelist processUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">src</directory>
+    </whitelist>
+  </filter>
+</phpunit>
+
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Identity.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Identity.php
new file mode 100644
index 00000000..67c2b6c0
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Identity.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Builder interface for unique identifiers.
+ *
+ * Defines the interface for recording unique identifiers. The identifiers
+ * can be used to define the invocation order of expectations. The expectation
+ * is recorded using id() and then defined in order using
+ * PHPUnit_Framework_MockObject_Builder_Match::after().
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Interface available since Release 1.0.0
+ */
+interface PHPUnit_Framework_MockObject_Builder_Identity
+{
+    /**
+     * Sets the identification of the expectation to $id.
+     *
+     * @note The identifier is unique per mock object.
+     * @param string $id Unique identifiation of expectation.
+     */
+    public function id($id);
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/InvocationMocker.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/InvocationMocker.php
new file mode 100644
index 00000000..9b83c173
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/InvocationMocker.php
@@ -0,0 +1,294 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Builder for mocked or stubbed invocations.
+ *
+ * Provides methods for building expectations without having to resort to
+ * instantiating the various matchers manually. These methods also form a
+ * more natural way of reading the expectation. This class should be together
+ * with the test case PHPUnit_Framework_MockObject_TestCase.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Builder_InvocationMocker implements PHPUnit_Framework_MockObject_Builder_MethodNameMatch
+{
+    /**
+     * @var PHPUnit_Framework_MockObject_Stub_MatcherCollection
+     */
+    protected $collection;
+
+    /**
+     * @var PHPUnit_Framework_MockObject_Matcher
+     */
+    protected $matcher;
+
+    /**
+     * @param PHPUnit_Framework_MockObject_Stub_MatcherCollection $collection
+     * @param PHPUnit_Framework_MockObject_Matcher_Invocation     $invocationMatcher
+     */
+    public function __construct(PHPUnit_Framework_MockObject_Stub_MatcherCollection $collection, PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher)
+    {
+        $this->collection = $collection;
+        $this->matcher    = new PHPUnit_Framework_MockObject_Matcher(
+          $invocationMatcher
+        );
+
+        $this->collection->addMatcher($this->matcher);
+    }
+
+    /**
+     * @return PHPUnit_Framework_MockObject_Matcher
+     */
+    public function getMatcher()
+    {
+        return $this->matcher;
+    }
+
+    /**
+     * @param  mixed                                                 $id
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function id($id)
+    {
+        $this->collection->registerId($id, $this);
+
+        return $this;
+    }
+
+    /**
+     * @param  PHPUnit_Framework_MockObject_Stub                     $stub
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function will(PHPUnit_Framework_MockObject_Stub $stub)
+    {
+        $this->matcher->stub = $stub;
+
+        return $this;
+    }
+
+    /**
+     * @param  mixed                                                 $value
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function willReturn($value)
+    {
+        $stub = new PHPUnit_Framework_MockObject_Stub_Return(
+          $value
+        );
+
+        return $this->will($stub);
+    }
+
+    /**
+     * @param  array                                                 $valueMap
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function willReturnMap(array $valueMap)
+    {
+        $stub = new PHPUnit_Framework_MockObject_Stub_ReturnValueMap(
+          $valueMap
+        );
+
+        return $this->will($stub);
+    }
+
+    /**
+     * @param  mixed                                                 $argumentIndex
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function willReturnArgument($argumentIndex)
+    {
+        $stub = new PHPUnit_Framework_MockObject_Stub_ReturnArgument(
+          $argumentIndex
+        );
+
+        return $this->will($stub);
+    }
+
+    /**
+     * @param  callable                                              $callback
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function willReturnCallback($callback)
+    {
+        $stub = new PHPUnit_Framework_MockObject_Stub_ReturnCallback(
+          $callback
+        );
+
+        return $this->will($stub);
+    }
+
+    /**
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function willReturnSelf()
+    {
+        $stub = new PHPUnit_Framework_MockObject_Stub_ReturnSelf();
+
+        return $this->will($stub);
+    }
+
+    /**
+     * @param  mixed                                                 $value, ...
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function willReturnOnConsecutiveCalls()
+    {
+        $args = func_get_args();
+
+        $stub = new PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls($args);
+
+        return $this->will($stub);
+    }
+
+    /**
+     * @param  Exception                                             $exception
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function willThrowException(Exception $exception)
+    {
+        $stub = new PHPUnit_Framework_MockObject_Stub_Exception($exception);
+
+        return $this->will($stub);
+    }
+
+    /**
+     * @param  mixed                                                 $id
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function after($id)
+    {
+        $this->matcher->afterMatchBuilderId = $id;
+
+        return $this;
+    }
+
+    /**
+     * Validate that a parameters matcher can be defined, throw exceptions otherwise.
+     *
+     * @throws PHPUnit_Framework_Exception
+     */
+    private function canDefineParameters()
+    {
+        if ($this->matcher->methodNameMatcher === NULL) {
+            throw new PHPUnit_Framework_Exception(
+              'Method name matcher is not defined, cannot define parameter ' .
+              ' matcher without one'
+            );
+        }
+
+        if ($this->matcher->parametersMatcher !== NULL) {
+            throw new PHPUnit_Framework_Exception(
+              'Parameter matcher is already defined, cannot redefine'
+            );
+        }
+    }
+
+    /**
+     * @param  mixed                                                 $argument, ...
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function with()
+    {
+        $args = func_get_args();
+
+        $this->canDefineParameters();
+
+        $this->matcher->parametersMatcher = new PHPUnit_Framework_MockObject_Matcher_Parameters($args);
+
+        return $this;
+    }
+
+    /**
+     * @param  mixed ...$argument
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function withConsecutive() {
+
+        $args = func_get_args();
+
+        $this->canDefineParameters();
+
+        $this->matcher->parametersMatcher =
+          new PHPUnit_Framework_MockObject_Matcher_ConsecutiveParameters($args);
+
+        return $this;
+    }
+
+    /**
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function withAnyParameters()
+    {
+        $this->canDefineParameters();
+
+        $this->matcher->parametersMatcher = new PHPUnit_Framework_MockObject_Matcher_AnyParameters;
+
+        return $this;
+    }
+
+    /**
+     * @param  PHPUnit_Framework_Constraint|string                   $constraint
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function method($constraint)
+    {
+        if ($this->matcher->methodNameMatcher !== NULL) {
+            throw new PHPUnit_Framework_Exception(
+              'Method name matcher is already defined, cannot redefine'
+            );
+        }
+
+        $this->matcher->methodNameMatcher = new PHPUnit_Framework_MockObject_Matcher_MethodName($constraint);
+
+        return $this;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Match.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Match.php
new file mode 100644
index 00000000..4acedd30
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Match.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Builder interface for invocation order matches.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Interface available since Release 1.0.0
+ */
+interface PHPUnit_Framework_MockObject_Builder_Match extends PHPUnit_Framework_MockObject_Builder_Stub
+{
+    /**
+     * Defines the expectation which must occur before the current is valid.
+     *
+     * @param  string                                    $id The identification of the expectation that should
+     *                                                       occur before this one.
+     * @return PHPUnit_Framework_MockObject_Builder_Stub
+     */
+    public function after($id);
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/MethodNameMatch.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/MethodNameMatch.php
new file mode 100644
index 00000000..3576a56f
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/MethodNameMatch.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Builder interface for matcher of method names.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Interface available since Release 1.0.0
+ */
+interface PHPUnit_Framework_MockObject_Builder_MethodNameMatch extends PHPUnit_Framework_MockObject_Builder_ParametersMatch
+{
+    /**
+     * Adds a new method name match and returns the parameter match object for
+     * further matching possibilities.
+     *
+     * @param  PHPUnit_Framework_Constraint                         $name
+     *                                                                    Constraint for matching method, if a string is passed it will use
+     *                                                                    the PHPUnit_Framework_Constraint_IsEqual.
+     * @return PHPUnit_Framework_MockObject_Builder_ParametersMatch
+     */
+    public function method($name);
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Namespace.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Namespace.php
new file mode 100644
index 00000000..7b5c7027
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Namespace.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Interface for builders which can register builders with a given identification.
+ *
+ * This interface relates to PHPUnit_Framework_MockObject_Builder_Identity.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Interface available since Release 1.0.0
+ */
+interface PHPUnit_Framework_MockObject_Builder_Namespace
+{
+    /**
+     * Looks up the match builder with identification $id and returns it.
+     *
+     * @param  string                                     $id The identifiction of the match builder.
+     * @return PHPUnit_Framework_MockObject_Builder_Match
+     */
+    public function lookupId($id);
+
+    /**
+     * Registers the match builder $builder with the identification $id. The
+     * builder can later be looked up using lookupId() to figure out if it
+     * has been invoked.
+     *
+     * @param string                                     $id
+     *                                                            The identification of the match builder.
+     * @param PHPUnit_Framework_MockObject_Builder_Match $builder
+     *                                                            The builder which is being registered.
+     */
+    public function registerId($id, PHPUnit_Framework_MockObject_Builder_Match $builder);
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/ParametersMatch.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/ParametersMatch.php
new file mode 100644
index 00000000..2bd8849c
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/ParametersMatch.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Builder interface for parameter matchers.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Interface available since Release 1.0.0
+ */
+interface PHPUnit_Framework_MockObject_Builder_ParametersMatch extends PHPUnit_Framework_MockObject_Builder_Match
+{
+    /**
+     * Sets the parameters to match for, each parameter to this funtion will
+     * be part of match. To perform specific matches or constraints create a
+     * new PHPUnit_Framework_Constraint and use it for the parameter.
+     * If the parameter value is not a constraint it will use the
+     * PHPUnit_Framework_Constraint_IsEqual for the value.
+     *
+     * Some examples:
+     * <code>
+     * // match first parameter with value 2
+     * $b->with(2);
+     * // match first parameter with value 'smock' and second identical to 42
+     * $b->with('smock', new PHPUnit_Framework_Constraint_IsEqual(42));
+     * </code>
+     *
+     * @return PHPUnit_Framework_MockObject_Builder_ParametersMatch
+     */
+    public function with();
+
+    /**
+     * Sets a matcher which allows any kind of parameters.
+     *
+     * Some examples:
+     * <code>
+     * // match any number of parameters
+     * $b->withAnyParamers();
+     * </code>
+     *
+     * @return PHPUnit_Framework_MockObject_Matcher_AnyParameters
+     */
+    public function withAnyParameters();
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Stub.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Stub.php
new file mode 100644
index 00000000..156e0f80
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Stub.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Builder interface for stubs which are actions replacing an invocation.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Interface available since Release 1.0.0
+ */
+interface PHPUnit_Framework_MockObject_Builder_Stub extends PHPUnit_Framework_MockObject_Builder_Identity
+{
+    /**
+     * Stubs the matching method with the stub object $stub. Any invocations of
+     * the matched method will now be handled by the stub instead.
+     *
+     * @param  PHPUnit_Framework_MockObject_Stub             $stub The stub object.
+     * @return PHPUnit_Framework_MockObject_Builder_Identity
+     */
+    public function will(PHPUnit_Framework_MockObject_Stub $stub);
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php
new file mode 100644
index 00000000..a0cd1f30
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 2.0.6
+ */
+
+/**
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 2.0.6
+ */
+class PHPUnit_Framework_MockObject_BadMethodCallException extends BadMethodCallException implements PHPUnit_Framework_MockObject_Exception
+{
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php
new file mode 100644
index 00000000..8ce99ff2
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * Interface for exceptions used by PHPUnit_MockObject.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Interface available since Release 2.0.6
+ */
+interface PHPUnit_Framework_MockObject_Exception
+{
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php
new file mode 100644
index 00000000..b13ab685
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 2.0.6
+ */
+
+/**
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 2.0.6
+ */
+class PHPUnit_Framework_MockObject_RuntimeException extends RuntimeException implements PHPUnit_Framework_MockObject_Exception
+{
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php
new file mode 100644
index 00000000..7e2983ca
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php
@@ -0,0 +1,1098 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+if (!function_exists('trait_exists')) {
+    function trait_exists($traitname, $autoload = true)
+    {
+        return false;
+    }
+}
+
+/**
+ * Mock Object Code Generator
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Generator
+{
+    /**
+     * @var array
+     */
+    private static $cache = array();
+
+    /**
+     * @var array
+     */
+    protected $blacklistedMethodNames = array(
+      '__CLASS__' => TRUE,
+      '__DIR__' => TRUE,
+      '__FILE__' => TRUE,
+      '__FUNCTION__' => TRUE,
+      '__LINE__' => TRUE,
+      '__METHOD__' => TRUE,
+      '__NAMESPACE__' => TRUE,
+      '__TRAIT__' => TRUE,
+      '__clone' => TRUE,
+      '__halt_compiler' => TRUE,
+      'abstract' => TRUE,
+      'and' => TRUE,
+      'array' => TRUE,
+      'as' => TRUE,
+      'break' => TRUE,
+      'callable' => TRUE,
+      'case' => TRUE,
+      'catch' => TRUE,
+      'class' => TRUE,
+      'clone' => TRUE,
+      'const' => TRUE,
+      'continue' => TRUE,
+      'declare' => TRUE,
+      'default' => TRUE,
+      'die' => TRUE,
+      'do' => TRUE,
+      'echo' => TRUE,
+      'else' => TRUE,
+      'elseif' => TRUE,
+      'empty' => TRUE,
+      'enddeclare' => TRUE,
+      'endfor' => TRUE,
+      'endforeach' => TRUE,
+      'endif' => TRUE,
+      'endswitch' => TRUE,
+      'endwhile' => TRUE,
+      'eval' => TRUE,
+      'exit' => TRUE,
+      'expects' => TRUE,
+      'extends' => TRUE,
+      'final' => TRUE,
+      'for' => TRUE,
+      'foreach' => TRUE,
+      'function' => TRUE,
+      'global' => TRUE,
+      'goto' => TRUE,
+      'if' => TRUE,
+      'implements' => TRUE,
+      'include' => TRUE,
+      'include_once' => TRUE,
+      'instanceof' => TRUE,
+      'insteadof' => TRUE,
+      'interface' => TRUE,
+      'isset' => TRUE,
+      'list' => TRUE,
+      'namespace' => TRUE,
+      'new' => TRUE,
+      'or' => TRUE,
+      'print' => TRUE,
+      'private' => TRUE,
+      'protected' => TRUE,
+      'public' => TRUE,
+      'require' => TRUE,
+      'require_once' => TRUE,
+      'return' => TRUE,
+      'static' => TRUE,
+      'switch' => TRUE,
+      'throw' => TRUE,
+      'trait' => TRUE,
+      'try' => TRUE,
+      'unset' => TRUE,
+      'use' => TRUE,
+      'var' => TRUE,
+      'while' => TRUE,
+      'xor' => TRUE
+    );
+
+    /**
+     * @var boolean
+     */
+    protected $soapLoaded = NULL;
+
+    /**
+     * Returns a mock object for the specified class.
+     *
+     * @param  array|string                $type
+     * @param  array                       $methods
+     * @param  array                       $arguments
+     * @param  string                      $mockClassName
+     * @param  boolean                     $callOriginalConstructor
+     * @param  boolean                     $callOriginalClone
+     * @param  boolean                     $callAutoload
+     * @param  boolean                     $cloneArguments
+     * @param  boolean                     $callOriginalMethods
+     * @param  object                      $proxyTarget
+     * @return object
+     * @throws InvalidArgumentException
+     * @throws PHPUnit_Framework_Exception
+     * @throws PHPUnit_Framework_MockObject_RuntimeException
+     * @since  Method available since Release 1.0.0
+     */
+    public function getMock($type, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $cloneArguments = TRUE, $callOriginalMethods = FALSE, $proxyTarget = NULL)
+    {
+        if (!is_array($type) && !is_string($type)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'array or string');
+        }
+
+        if (!is_string($mockClassName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(4, 'string');
+        }
+
+        if (!is_array($methods) && !is_null($methods)) {
+            throw new InvalidArgumentException;
+        }
+
+        if (NULL !== $methods) {
+            foreach ($methods as $method) {
+                if (!preg_match('~[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*~', $method)) {
+                    throw new PHPUnit_Framework_Exception(
+                      sprintf(
+                        'Cannot stub or mock method with invalid name "%s"',
+                        $method
+                      )
+                    );
+                }
+            }
+
+            if ($methods != array_unique($methods)) {
+                throw new PHPUnit_Framework_MockObject_RuntimeException(
+                  sprintf(
+                    'Cannot stub or mock using a method list that contains duplicates: "%s"',
+                    implode(', ', $methods)
+                  )
+                );
+            }
+        }
+
+        if ($mockClassName != '' && class_exists($mockClassName, FALSE)) {
+            $reflect = new ReflectionClass($mockClassName);
+
+            if (!$reflect->implementsInterface("PHPUnit_Framework_MockObject_MockObject")) {
+                throw new PHPUnit_Framework_MockObject_RuntimeException(
+                  sprintf(
+                    'Class "%s" already exists.',
+                    $mockClassName
+                  )
+                );
+            }
+        }
+
+        $mock = $this->generate(
+          $type,
+          $methods,
+          $mockClassName,
+          $callOriginalClone,
+          $callAutoload,
+          $cloneArguments,
+          $callOriginalMethods
+        );
+
+        return $this->getObject(
+          $mock['code'],
+          $mock['mockClassName'],
+          $type,
+          $callOriginalConstructor,
+          $callAutoload,
+          $arguments,
+          $callOriginalMethods,
+          $proxyTarget
+        );
+    }
+
+    /**
+     * @param  string       $code
+     * @param  string       $className
+     * @param  array|string $type
+     * @param  boolean      $callOriginalConstructor
+     * @param  boolean      $callAutoload
+     * @param  array        $arguments
+     * @param  boolean      $callOriginalMethods
+     * @param  object       $proxyTarget
+     * @return object
+     */
+    protected function getObject($code, $className, $type = '', $callOriginalConstructor = FALSE, $callAutoload = FALSE, array $arguments = array(), $callOriginalMethods = FALSE, $proxyTarget = NULL)
+    {
+        $this->evalClass($code, $className);
+
+        if ($callOriginalConstructor &&
+            is_string($type) &&
+            !interface_exists($type, $callAutoload)) {
+            if (count($arguments) == 0) {
+                $object = new $className;
+            } else {
+                $class  = new ReflectionClass($className);
+                $object = $class->newInstanceArgs($arguments);
+            }
+        } else {
+            $class = new ReflectionClass('ReflectionClass');
+            $hasNewInstanceWithoutConstructor = $class->hasMethod('newInstanceWithoutConstructor');;
+
+            $class      = new ReflectionClass($className);
+            $isInternal = $this->isInternalClass($class);
+
+            if ($isInternal || !$hasNewInstanceWithoutConstructor) {
+                $object = unserialize(
+                    sprintf('%s:%d:"%s":0:{}',
+                        (version_compare(PHP_VERSION, '5.4', '>') && $class->implementsInterface("Serializable") ? "C" : "O"),
+                        strlen($className),
+                        $className
+                    )
+                );
+            } else {
+                $object = $class->newInstanceWithoutConstructor();
+            }
+        }
+
+        if ($callOriginalMethods) {
+            if (!is_object($proxyTarget)) {
+                if (count($arguments) == 0) {
+                    $proxyTarget = new $type;
+                } else {
+                    $class       = new ReflectionClass($type);
+                    $proxyTarget = $class->newInstanceArgs($arguments);
+                }
+            }
+
+            $object->__phpunit_setOriginalObject($proxyTarget);
+        }
+
+        return $object;
+    }
+
+    /**
+     * @param string $code
+     * @param string $className
+     */
+    protected function evalClass($code, $className)
+    {
+        if (!class_exists($className, FALSE)) {
+            eval($code);
+        }
+    }
+
+    /**
+     * Returns a mock object for the specified abstract class with all abstract
+     * methods of the class mocked. Concrete methods to mock can be specified with
+     * the last parameter
+     *
+     * @param  string                      $originalClassName
+     * @param  array                       $arguments
+     * @param  string                      $mockClassName
+     * @param  boolean                     $callOriginalConstructor
+     * @param  boolean                     $callOriginalClone
+     * @param  boolean                     $callAutoload
+     * @param  array                       $mockedMethods
+     * @param  boolean                     $cloneArguments
+     * @return object
+     * @since  Method available since Release 1.0.0
+     * @throws PHPUnit_Framework_MockObject_RuntimeException
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function getMockForAbstractClass($originalClassName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $mockedMethods = array(), $cloneArguments = TRUE)
+    {
+        if (!is_string($originalClassName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_string($mockClassName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'string');
+        }
+
+        if (class_exists($originalClassName, $callAutoload) ||
+            interface_exists($originalClassName, $callAutoload)) {
+            $reflector = new ReflectionClass($originalClassName);
+            $methods   = $mockedMethods;
+
+            foreach ($reflector->getMethods() as $method) {
+                if ($method->isAbstract() && !in_array($method->getName(), $methods)) {
+                    $methods[] = $method->getName();
+                }
+            }
+
+            if (empty($methods)) {
+                $methods = NULL;
+            }
+
+            return $this->getMock(
+              $originalClassName,
+              $methods,
+              $arguments,
+              $mockClassName,
+              $callOriginalConstructor,
+              $callOriginalClone,
+              $callAutoload,
+              $cloneArguments
+            );
+        } else {
+            throw new PHPUnit_Framework_MockObject_RuntimeException(
+              sprintf('Class "%s" does not exist.', $originalClassName)
+            );
+        }
+    }
+
+    /**
+     * Returns a mock object for the specified trait with all abstract methods
+     * of the trait mocked. Concrete methods to mock can be specified with the
+     * `$mockedMethods` parameter.
+     *
+     * @param  string                   $traitName
+     * @param  array                    $arguments
+     * @param  string                   $mockClassName
+     * @param  boolean                  $callOriginalConstructor
+     * @param  boolean                  $callOriginalClone
+     * @param  boolean                  $callAutoload
+     * @param  array                    $mockedMethods
+     * @param  boolean                  $cloneArguments
+     * @return object
+     * @since  Method available since Release 1.2.3
+     * @throws PHPUnit_Framework_MockObject_RuntimeException
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function getMockForTrait($traitName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $mockedMethods = array(), $cloneArguments = TRUE)
+    {
+        if (!is_string($traitName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_string($mockClassName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'string');
+        }
+
+        if (!trait_exists($traitName, $callAutoload)) {
+            throw new PHPUnit_Framework_MockObject_RuntimeException(
+              sprintf(
+                'Trait "%s" does not exist.',
+                $traitName
+              )
+            );
+        }
+
+        $className = $this->generateClassName(
+          $traitName, '', 'Trait_'
+        );
+
+        $templateDir   = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Generator' .
+                         DIRECTORY_SEPARATOR;
+        $classTemplate = new Text_Template(
+                           $templateDir . 'trait_class.tpl'
+                         );
+
+        $classTemplate->setVar(
+          array(
+            'prologue'   => 'abstract ',
+            'class_name' => $className['className'],
+            'trait_name' => $traitName
+          )
+        );
+
+        $this->evalClass(
+          $classTemplate->render(),
+          $className['className']
+        );
+
+        return $this->getMockForAbstractClass($className['className'], $arguments, $mockClassName, $callOriginalConstructor, $callOriginalClone, $callAutoload, $mockedMethods, $cloneArguments);
+    }
+
+    /**
+     * Returns an object for the specified trait.
+     *
+     * @param  string                      $traitName
+     * @param  array                       $arguments
+     * @param  string                      $traitClassName
+     * @param  boolean                     $callOriginalConstructor
+     * @param  boolean                     $callOriginalClone
+     * @param  boolean                     $callAutoload
+     * @return object
+     * @since  Method available since Release 1.1.0
+     * @throws PHPUnit_Framework_MockObject_RuntimeException
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function getObjectForTrait($traitName, array $arguments = array(), $traitClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE)
+    {
+        if (!is_string($traitName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_string($traitClassName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'string');
+        }
+
+        if (!trait_exists($traitName, $callAutoload)) {
+            throw new PHPUnit_Framework_MockObject_RuntimeException(
+              sprintf(
+                'Trait "%s" does not exist.',
+                $traitName
+              )
+            );
+        }
+
+        $className = $this->generateClassName(
+          $traitName, $traitClassName, 'Trait_'
+        );
+
+        $templateDir   = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Generator' .
+                         DIRECTORY_SEPARATOR;
+        $classTemplate = new Text_Template(
+                           $templateDir . 'trait_class.tpl'
+                         );
+
+        $classTemplate->setVar(
+          array(
+            'prologue'   => '',
+            'class_name' => $className['className'],
+            'trait_name' => $traitName
+          )
+        );
+
+        return $this->getObject(
+          $classTemplate->render(),
+          $className['className']
+        );
+    }
+
+    /**
+     * @param  array|string $type
+     * @param  array        $methods
+     * @param  string       $mockClassName
+     * @param  boolean      $callOriginalClone
+     * @param  boolean      $callAutoload
+     * @param  boolean      $cloneArguments
+     * @param  boolean      $callOriginalMethods
+     * @return array
+     */
+    public function generate($type, array $methods = NULL, $mockClassName = '', $callOriginalClone = TRUE, $callAutoload = TRUE, $cloneArguments = TRUE, $callOriginalMethods = FALSE)
+    {
+        if (is_array($type)) {
+            sort($type);
+        }
+
+        if ($mockClassName == '') {
+            $key = md5(
+              is_array($type) ? join('_', $type) : $type .
+              serialize($methods) .
+              serialize($callOriginalClone) .
+              serialize($cloneArguments) .
+              serialize($callOriginalMethods)
+            );
+
+            if (isset(self::$cache[$key])) {
+                return self::$cache[$key];
+            }
+        }
+
+        $mock = $this->generateMock(
+          $type,
+          $methods,
+          $mockClassName,
+          $callOriginalClone,
+          $callAutoload,
+          $cloneArguments,
+          $callOriginalMethods
+        );
+
+        if (isset($key)) {
+            self::$cache[$key] = $mock;
+        }
+
+        return $mock;
+    }
+
+    /**
+     * @param  string                      $wsdlFile
+     * @param  string                      $className
+     * @param  array                       $methods
+     * @param  array                       $options
+     * @return string
+     * @throws PHPUnit_Framework_MockObject_RuntimeException
+     */
+    public function generateClassFromWsdl($wsdlFile, $className, array $methods = array(), array $options = array())
+    {
+        if ($this->soapLoaded === NULL) {
+            $this->soapLoaded = extension_loaded('soap');
+        }
+
+        if ($this->soapLoaded) {
+            $options = array_merge($options, array('cache_wsdl'=>FALSE));
+            $client   = new SoapClient($wsdlFile, $options);
+            $_methods = array_unique($client->__getFunctions());
+            unset($client);
+
+            sort($_methods);
+
+            $templateDir    = dirname(__FILE__) . DIRECTORY_SEPARATOR .
+                              'Generator' . DIRECTORY_SEPARATOR;
+            $methodTemplate = new Text_Template(
+                                $templateDir . 'wsdl_method.tpl'
+                              );
+            $methodsBuffer  = '';
+
+            foreach ($_methods as $method) {
+                $nameStart = strpos($method, ' ') + 1;
+                $nameEnd   = strpos($method, '(');
+                $name      = substr($method, $nameStart, $nameEnd - $nameStart);
+
+                if (empty($methods) || in_array($name, $methods)) {
+                    $args    = explode(
+                                 ',',
+                                 substr(
+                                   $method,
+                                   $nameEnd + 1,
+                                   strpos($method, ')') - $nameEnd - 1
+                                 )
+                               );
+                    $numArgs = count($args);
+
+                    for ($i = 0; $i < $numArgs; $i++) {
+                        $args[$i] = substr($args[$i], strpos($args[$i], '$'));
+                    }
+
+                    $methodTemplate->setVar(
+                      array(
+                        'method_name' => $name,
+                        'arguments'   => join(', ', $args)
+                      )
+                    );
+
+                    $methodsBuffer .= $methodTemplate->render();
+                }
+            }
+
+            $optionsBuffer = 'array(';
+
+            foreach ($options as $key => $value) {
+                $optionsBuffer .= $key . ' => ' . $value;
+            }
+
+            $optionsBuffer .= ')';
+
+            $classTemplate = new Text_Template(
+              $templateDir . 'wsdl_class.tpl'
+            );
+
+            $namespace = '';
+
+            if (strpos($className, '\\') !== FALSE) {
+                $parts     = explode('\\', $className);
+                $className = array_pop($parts);
+                $namespace = 'namespace ' . join('\\', $parts) . ';' . "\n\n";
+            }
+
+            $classTemplate->setVar(
+              array(
+                'namespace'  => $namespace,
+                'class_name' => $className,
+                'wsdl'       => $wsdlFile,
+                'options'    => $optionsBuffer,
+                'methods'    => $methodsBuffer
+              )
+            );
+
+            return $classTemplate->render();
+        } else {
+            throw new PHPUnit_Framework_MockObject_RuntimeException(
+              'The SOAP extension is required to generate a mock object ' .
+              'from WSDL.'
+            );
+        }
+    }
+
+    /**
+     * @param  array|string                $type
+     * @param  array|null                  $methods
+     * @param  string                      $mockClassName
+     * @param  boolean                     $callOriginalClone
+     * @param  boolean                     $callAutoload
+     * @param  boolean                     $cloneArguments
+     * @param  boolean                     $callOriginalMethods
+     * @return array
+     * @throws PHPUnit_Framework_Exception
+     */
+    protected function generateMock($type, $methods, $mockClassName, $callOriginalClone, $callAutoload, $cloneArguments, $callOriginalMethods)
+    {
+        $templateDir   = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Generator' .
+                         DIRECTORY_SEPARATOR;
+        $classTemplate = new Text_Template(
+                           $templateDir . 'mocked_class.tpl'
+                         );
+
+        $additionalInterfaces = array();
+        $cloneTemplate        = '';
+        $isClass              = FALSE;
+        $isInterface          = FALSE;
+
+        $mockClassName = $this->generateClassName(
+          $type, $mockClassName, 'Mock_'
+        );
+
+        if (is_array($type)) {
+            foreach ($type as $_type) {
+                if (!interface_exists($_type, $callAutoload)) {
+                    throw new PHPUnit_Framework_Exception(
+                      sprintf(
+                        'Interface "%s" does not exist.', $_type
+                      )
+                    );
+                }
+
+                $additionalInterfaces[] = $_type;
+
+                foreach (get_class_methods($_type) as $method) {
+                    if (in_array($method, $methods)) {
+                        throw new PHPUnit_Framework_Exception(
+                          sprintf(
+                            'Duplicate method "%s" not allowed.', $method
+                          )
+                        );
+                    }
+
+                    $methods[] = $method;
+                }
+            }
+        }
+
+        if (class_exists($mockClassName['fullClassName'], $callAutoload)) {
+            $isClass = TRUE;
+        } else {
+            if (interface_exists($mockClassName['fullClassName'], $callAutoload)) {
+                $isInterface = TRUE;
+            }
+        }
+
+        if (!class_exists($mockClassName['fullClassName'], $callAutoload) &&
+            !interface_exists($mockClassName['fullClassName'], $callAutoload)) {
+            $prologue = 'class ' . $mockClassName['originalClassName'] . "\n{\n}\n\n";
+
+            if (!empty($mockClassName['namespaceName'])) {
+                $prologue = 'namespace ' . $mockClassName['namespaceName'] .
+                            " {\n\n" . $prologue . "}\n\n" .
+                            "namespace {\n\n";
+
+                $epilogue = "\n\n}";
+            }
+
+            $cloneTemplate = new Text_Template(
+              $templateDir . 'mocked_clone.tpl'
+            );
+        } else {
+            $class = new ReflectionClass($mockClassName['fullClassName']);
+
+            if ($class->isFinal()) {
+                throw new PHPUnit_Framework_Exception(
+                  sprintf(
+                    'Class "%s" is declared "final" and cannot be mocked.',
+                    $mockClassName['fullClassName']
+                  )
+                );
+            }
+
+            if ($class->hasMethod('__clone')) {
+                $cloneMethod = $class->getMethod('__clone');
+
+                if (!$cloneMethod->isFinal()) {
+                    if ($callOriginalClone && !$isInterface) {
+                        $cloneTemplate = new Text_Template(
+                          $templateDir . 'unmocked_clone.tpl'
+                        );
+                    } else {
+                        $cloneTemplate = new Text_Template(
+                          $templateDir . 'mocked_clone.tpl'
+                        );
+                    }
+                }
+            } else {
+                $cloneTemplate = new Text_Template(
+                  $templateDir . 'mocked_clone.tpl'
+                );
+            }
+        }
+
+        if (is_object($cloneTemplate)) {
+            $cloneTemplate = $cloneTemplate->render();
+        }
+
+        if (is_array($methods) && empty($methods) &&
+            ($isClass || $isInterface)) {
+            $methods = get_class_methods($mockClassName['fullClassName']);
+        }
+
+        if (!is_array($methods)) {
+            $methods = array();
+        }
+
+        $mockedMethods = '';
+
+        if (isset($class)) {
+            // https://github.com/sebastianbergmann/phpunit-mock-objects/issues/103
+            if ($isInterface && $class->implementsInterface('Traversable') &&
+                !$class->implementsInterface('Iterator') &&
+                !$class->implementsInterface('IteratorAggregate')) {
+                $additionalInterfaces[] = 'Iterator';
+                $methods = array_merge($methods, get_class_methods('Iterator'));
+            }
+
+            foreach ($methods as $methodName) {
+                try {
+                    $method = $class->getMethod($methodName);
+
+                    if ($this->canMockMethod($method)) {
+                        $mockedMethods .= $this->generateMockedMethodDefinitionFromExisting(
+                          $templateDir,
+                          $method,
+                          $cloneArguments,
+                          $callOriginalMethods
+                        );
+                    }
+                } catch (ReflectionException $e) {
+                    $mockedMethods .= $this->generateMockedMethodDefinition(
+                      $templateDir, $mockClassName['fullClassName'], $methodName, $cloneArguments
+                    );
+                }
+            }
+        } else {
+            foreach ($methods as $methodName) {
+                $mockedMethods .= $this->generateMockedMethodDefinition(
+                  $templateDir, $mockClassName['fullClassName'], $methodName, $cloneArguments
+                );
+            }
+        }
+
+        $method = '';
+
+        if (!in_array('method', $methods)) {
+            $methodTemplate = new Text_Template(
+                $templateDir . 'mocked_class_method.tpl'
+            );
+
+            $method = $methodTemplate->render();
+        }
+
+        $classTemplate->setVar(
+          array(
+            'prologue'          => isset($prologue) ? $prologue : '',
+            'epilogue'          => isset($epilogue) ? $epilogue : '',
+            'class_declaration' => $this->generateMockClassDeclaration(
+                                     $mockClassName,
+                                     $isInterface,
+                                     $additionalInterfaces
+                                   ),
+            'clone'             => $cloneTemplate,
+            'mock_class_name'   => $mockClassName['className'],
+            'mocked_methods'    => $mockedMethods,
+            'method'            => $method
+          )
+        );
+
+        return array(
+          'code'          => $classTemplate->render(),
+          'mockClassName' => $mockClassName['className']
+        );
+    }
+
+    /**
+     * @param  array|string $type
+     * @param  string       $className
+     * @param  string       $prefix
+     * @return array
+     */
+    protected function generateClassName($type, $className, $prefix)
+    {
+        if (is_array($type)) {
+            $type = join('_', $type);
+        }
+
+        if ($type[0] == '\\') {
+            $type = substr($type, 1);
+        }
+
+        $classNameParts = explode('\\', $type);
+
+        if (count($classNameParts) > 1) {
+            $type          = array_pop($classNameParts);
+            $namespaceName = join('\\', $classNameParts);
+            $fullClassName = $namespaceName . '\\' . $type;
+        } else {
+            $namespaceName = '';
+            $fullClassName = $type;
+        }
+
+        if ($className == '') {
+            do {
+                $className = $prefix . $type . '_' .
+                             substr(md5(microtime()), 0, 8);
+            } while (class_exists($className, FALSE));
+        }
+
+        return array(
+          'className'         => $className,
+          'originalClassName' => $type,
+          'fullClassName'     => $fullClassName,
+          'namespaceName'     => $namespaceName
+        );
+    }
+
+    /**
+     * @param  array   $mockClassName
+     * @param  boolean $isInterface
+     * @param  array   $additionalInterfaces
+     * @return array
+     */
+    protected function generateMockClassDeclaration(array $mockClassName, $isInterface, array $additionalInterfaces = array())
+    {
+        $buffer = 'class ';
+
+        $additionalInterfaces[] = 'PHPUnit_Framework_MockObject_MockObject';
+        $interfaces = implode(', ', $additionalInterfaces);
+
+        if ($isInterface) {
+            $buffer .= sprintf(
+              "%s implements %s, %s%s",
+              $mockClassName['className'],
+              $interfaces,
+              !empty($mockClassName['namespaceName']) ? $mockClassName['namespaceName'] . '\\' : '',
+              $mockClassName['originalClassName']
+            );
+        } else {
+            $buffer .= sprintf(
+              "%s extends %s%s implements %s",
+              $mockClassName['className'],
+              !empty($mockClassName['namespaceName']) ? $mockClassName['namespaceName'] . '\\' : '',
+              $mockClassName['originalClassName'],
+              $interfaces
+            );
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * @param  string           $templateDir
+     * @param  ReflectionMethod $method
+     * @param  boolean          $cloneArguments
+     * @param  boolean          $callOriginalMethods
+     * @return string
+     */
+    protected function generateMockedMethodDefinitionFromExisting($templateDir, ReflectionMethod $method, $cloneArguments, $callOriginalMethods)
+    {
+        if ($method->isPrivate()) {
+            $modifier = 'private';
+        } elseif ($method->isProtected()) {
+            $modifier = 'protected';
+        } else {
+            $modifier = 'public';
+        }
+
+        if ($method->isStatic()) {
+            $modifier .= ' static';
+        }
+
+        if ($method->returnsReference()) {
+            $reference = '&';
+        } else {
+            $reference = '';
+        }
+
+        return $this->generateMockedMethodDefinition(
+          $templateDir,
+          $method->getDeclaringClass()->getName(),
+          $method->getName(),
+          $cloneArguments,
+          $modifier,
+          $this->getMethodParameters($method),
+          $this->getMethodParameters($method, TRUE),
+          $reference,
+          $callOriginalMethods,
+          $method->isStatic()
+        );
+    }
+
+    /**
+     * @param  string  $templateDir
+     * @param  string  $className
+     * @param  string  $methodName
+     * @param  boolean $cloneArguments
+     * @param  string  $modifier
+     * @param  string  $arguments_decl
+     * @param  string  $arguments_call
+     * @param  string  $reference
+     * @param  boolean $callOriginalMethods
+     * @param  boolean $static
+     * @return string
+     */
+    protected function generateMockedMethodDefinition($templateDir, $className, $methodName, $cloneArguments = TRUE, $modifier = 'public', $arguments_decl = '', $arguments_call = '', $reference = '', $callOriginalMethods = FALSE, $static = FALSE)
+    {
+        if ($static) {
+            $templateFile = 'mocked_static_method.tpl';
+        } else {
+            $templateFile = sprintf(
+              '%s_method.tpl',
+              $callOriginalMethods ? 'proxied' : 'mocked'
+            );
+        }
+
+        $template = new Text_Template($templateDir . $templateFile);
+
+        $template->setVar(
+          array(
+            'arguments_decl'  => $arguments_decl,
+            'arguments_call'  => $arguments_call,
+            'arguments_count' => !empty($arguments_call) ? count(explode(',', $arguments_call)) : 0,
+            'class_name'      => $className,
+            'method_name'     => $methodName,
+            'modifier'        => $modifier,
+            'reference'       => $reference,
+            'clone_arguments' => $cloneArguments ? 'TRUE' : 'FALSE'
+          )
+        );
+
+        return $template->render();
+    }
+
+    /**
+     * @param  ReflectionMethod $method
+     * @return boolean
+     */
+    protected function canMockMethod(ReflectionMethod $method)
+    {
+        if ($method->isConstructor() ||
+            $method->isFinal() ||
+            isset($this->blacklistedMethodNames[$method->getName()])) {
+            return FALSE;
+        }
+
+        return TRUE;
+    }
+
+    /**
+     * Returns the parameters of a function or method.
+     *
+     * @param  ReflectionMethod $method
+     * @param  boolean          $forCall
+     * @return string
+     * @throws PHPUnit_Framework_MockObject_RuntimeException
+     * @since  Method available since Release 2.0.0
+     */
+    protected function getMethodParameters(ReflectionMethod $method, $forCall = FALSE)
+    {
+        $parameters = array();
+
+        foreach ($method->getParameters() as $i => $parameter) {
+            $name = '$' . $parameter->getName();
+
+            /* Note: PHP extensions may use empty names for reference arguments
+             * or "..." for methods taking a variable number of arguments.
+             */
+            if ($name === '$' || $name === '$...') {
+                $name = '$arg' . $i;
+            }
+
+            $default   = '';
+            $reference = '';
+            $typeHint  = '';
+
+            if (!$forCall) {
+                if ($parameter->isArray()) {
+                    $typeHint = 'array ';
+                } elseif ((defined('HHVM_VERSION') || version_compare(PHP_VERSION, '5.4.0', '>='))
+                          && $parameter->isCallable()) {
+                    $typeHint = 'callable ';
+                } else {
+                    try {
+                        $class = $parameter->getClass();
+                    } catch (ReflectionException $e) {
+                        throw new PHPUnit_Framework_MockObject_RuntimeException(
+                          sprintf(
+                            'Cannot mock %s::%s() because a class or ' .
+                            'interface used in the signature is not loaded',
+                            $method->getDeclaringClass()->getName(),
+                            $method->getName()
+                          ),
+                          0,
+                          $e
+                        );
+                    }
+
+                    if ($class !== NULL) {
+                        $typeHint = $class->getName() . ' ';
+                    }
+                }
+
+                if ($parameter->isDefaultValueAvailable()) {
+                    $value   = $parameter->getDefaultValue();
+                    $default = ' = ' . var_export($value, TRUE);
+                } elseif ($parameter->isOptional()) {
+                    $default = ' = null';
+                }
+            }
+
+            if ($parameter->isPassedByReference()) {
+                $reference = '&';
+            }
+
+            $parameters[] = $typeHint . $reference . $name . $default;
+        }
+
+        return join(', ', $parameters);
+    }
+
+    /**
+     * @param  ReflectionClass $class
+     * @return boolean
+     * @since  Method available since Release 2.0.8
+     */
+    private function isInternalClass(ReflectionClass $class)
+    {
+        while ($class) {
+            if ($class->isInternal()) {
+                return true;
+            }
+
+            $class = $class->getParentClass();
+        }
+
+        return false;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class.tpl.dist
new file mode 100644
index 00000000..a9a94cd0
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class.tpl.dist
@@ -0,0 +1,36 @@
+{prologue}{class_declaration}
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+{clone}{mocked_methods}
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+{method}
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}{epilogue}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class_method.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class_method.tpl.dist
new file mode 100644
index 00000000..9e29c0d5
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class_method.tpl.dist
@@ -0,0 +1,7 @@
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_clone.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_clone.tpl.dist
new file mode 100644
index 00000000..bd846dee
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_clone.tpl.dist
@@ -0,0 +1,4 @@
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_method.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_method.tpl.dist
new file mode 100644
index 00000000..e2f55d9f
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_method.tpl.dist
@@ -0,0 +1,22 @@
+
+    {modifier} function {reference}{method_name}({arguments_decl})
+    {
+        $arguments = array({arguments_call});
+        $count     = func_num_args();
+
+        if ($count > {arguments_count}) {
+            $_arguments = func_get_args();
+
+            for ($i = {arguments_count}; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $result = $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            '{class_name}', '{method_name}', $arguments, $this, {clone_arguments}
+          )
+        );
+
+        return $result;
+    }
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_static_method.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_static_method.tpl.dist
new file mode 100644
index 00000000..5454b2f3
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_static_method.tpl.dist
@@ -0,0 +1,5 @@
+
+    {modifier} function {reference}{method_name}({arguments_decl})
+    {
+        throw new PHPUnit_Framework_MockObject_BadMethodCallException;
+    }
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/proxied_method.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/proxied_method.tpl.dist
new file mode 100644
index 00000000..15e89bd6
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/proxied_method.tpl.dist
@@ -0,0 +1,22 @@
+
+    {modifier} function {reference}{method_name}({arguments_decl})
+    {
+        $arguments = array({arguments_call});
+        $count     = func_num_args();
+
+        if ($count > {arguments_count}) {
+            $_arguments = func_get_args();
+
+            for ($i = {arguments_count}; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            '{class_name}', '{method_name}', $arguments, $this, {clone_arguments}
+          )
+        );
+
+        return call_user_func_array(array($this->__phpunit_originalObject, "{method_name}"), $arguments);
+    }
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/trait_class.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/trait_class.tpl.dist
new file mode 100644
index 00000000..4143b0f6
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/trait_class.tpl.dist
@@ -0,0 +1,4 @@
+{prologue}class {class_name}
+{
+    use {trait_name};
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/unmocked_clone.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/unmocked_clone.tpl.dist
new file mode 100644
index 00000000..fa0e70ab
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/unmocked_clone.tpl.dist
@@ -0,0 +1,5 @@
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+        parent::__clone();
+    }
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_class.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_class.tpl.dist
new file mode 100644
index 00000000..cc69fd34
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_class.tpl.dist
@@ -0,0 +1,7 @@
+{namespace}class {class_name} extends \SoapClient
+{
+    public function __construct($wsdl, array $options)
+    {
+        parent::__construct('{wsdl}', $options);
+    }
+{methods}}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_method.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_method.tpl.dist
new file mode 100644
index 00000000..bb16e763
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_method.tpl.dist
@@ -0,0 +1,4 @@
+
+    public function {method_name}({arguments})
+    {
+    }
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation.php
new file mode 100644
index 00000000..992b927a
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Interface for invocations.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Interface available since Release 1.0.0
+ */
+interface PHPUnit_Framework_MockObject_Invocation
+{
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Object.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Object.php
new file mode 100644
index 00000000..6cb98e70
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Object.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Represents a non-static invocation.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Invocation_Object extends PHPUnit_Framework_MockObject_Invocation_Static
+{
+    /**
+     * @var object
+     */
+    public $object;
+
+    /**
+     * @param string $className
+     * @param string $methodname
+     * @param array  $parameters
+     * @param object $object
+     * @param object $cloneObjects
+     */
+    public function __construct($className, $methodName, array $parameters, $object, $cloneObjects = FALSE)
+    {
+        parent::__construct($className, $methodName, $parameters, $cloneObjects);
+        $this->object = $object;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Static.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Static.php
new file mode 100644
index 00000000..862367a0
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Static.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+use SebastianBergmann\Exporter\Exporter;
+
+/**
+ * Represents a static invocation.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Invocation_Static implements PHPUnit_Framework_MockObject_Invocation, PHPUnit_Framework_SelfDescribing
+{
+    /**
+     * @var array
+     */
+    protected static $uncloneableExtensions = array(
+      'mysqli' => TRUE,
+      'SQLite' => TRUE,
+      'sqlite3' => TRUE,
+      'tidy' => TRUE,
+      'xmlwriter' => TRUE,
+      'xsl' => TRUE
+    );
+
+    /**
+     * @var array
+     */
+    protected static $uncloneableClasses = array(
+      'Closure',
+      'COMPersistHelper',
+      'IteratorIterator',
+      'RecursiveIteratorIterator',
+      'SplFileObject',
+      'PDORow',
+      'ZipArchive'
+    );
+
+    /**
+     * @var string
+     */
+    public $className;
+
+    /**
+     * @var string
+     */
+    public $methodName;
+
+    /**
+     * @var array
+     */
+    public $parameters;
+
+    /**
+     * @param string  $className
+     * @param string  $methodname
+     * @param array   $parameters
+     * @param boolean $cloneObjects
+     */
+    public function __construct($className, $methodName, array $parameters, $cloneObjects = FALSE)
+    {
+        $this->className  = $className;
+        $this->methodName = $methodName;
+        $this->parameters = $parameters;
+
+        if (!$cloneObjects) {
+            return;
+        }
+
+        foreach ($this->parameters as $key => $value) {
+            if (is_object($value)) {
+                $this->parameters[$key] = $this->cloneObject($value);
+            }
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        $exporter = new Exporter;
+
+        return sprintf(
+          "%s::%s(%s)",
+
+          $this->className,
+          $this->methodName,
+          join(
+            ', ',
+            array_map(
+              array($exporter, 'shortenedExport'),
+              $this->parameters
+            )
+          )
+        );
+    }
+
+    /**
+     * @param  object $original
+     * @return object
+     */
+    protected function cloneObject($original)
+    {
+        $cloneable = NULL;
+        $object    = new ReflectionObject($original);
+
+        // Check the blacklist before asking PHP reflection to work around
+        // https://bugs.php.net/bug.php?id=53967
+        if ($object->isInternal() &&
+            isset(self::$uncloneableExtensions[$object->getExtensionName()])) {
+            $cloneable = FALSE;
+        }
+
+        if ($cloneable === NULL) {
+            foreach (self::$uncloneableClasses as $class) {
+                if ($original instanceof $class) {
+                    $cloneable = FALSE;
+                    break;
+                }
+            }
+        }
+
+        if ($cloneable === NULL && method_exists($object, 'isCloneable')) {
+            $cloneable = $object->isCloneable();
+        }
+
+        if ($cloneable === NULL && $object->hasMethod('__clone')) {
+            $method    = $object->getMethod('__clone');
+            $cloneable = $method->isPublic();
+        }
+
+        if ($cloneable === NULL) {
+            $cloneable = TRUE;
+        }
+
+        if ($cloneable) {
+            try {
+                return clone $original;
+            } catch (Exception $e) {
+                return $original;
+            }
+        } else {
+            return $original;
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/InvocationMocker.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/InvocationMocker.php
new file mode 100644
index 00000000..ac407207
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/InvocationMocker.php
@@ -0,0 +1,195 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Mocker for invocations which are sent from
+ * PHPUnit_Framework_MockObject_MockObject objects.
+ *
+ * Keeps track of all expectations and stubs as well as registering
+ * identifications for builders.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_InvocationMocker implements PHPUnit_Framework_MockObject_Stub_MatcherCollection, PHPUnit_Framework_MockObject_Invokable, PHPUnit_Framework_MockObject_Builder_Namespace
+{
+    /**
+     * @var PHPUnit_Framework_MockObject_Matcher_Invocation[]
+     */
+    protected $matchers = array();
+
+    /**
+     * @var PHPUnit_Framework_MockObject_Builder_Match[]
+     */
+    protected $builderMap = array();
+
+    /**
+     * @param PHPUnit_Framework_MockObject_Matcher_Invocation $matcher
+     */
+    public function addMatcher(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        $this->matchers[] = $matcher;
+    }
+
+    /**
+     * @since Method available since Release 1.1.0
+     */
+    public function hasMatchers()
+    {
+        foreach ($this->matchers as $matcher) {
+            if ($matcher->hasMatchers()) {
+                return TRUE;
+            }
+        }
+
+        return FALSE;
+    }
+
+    /**
+     * @param  mixed        $id
+     * @return boolean|null
+     */
+    public function lookupId($id)
+    {
+        if (isset($this->builderMap[$id])) {
+            return $this->builderMap[$id];
+        }
+
+        return NULL;
+    }
+
+    /**
+     * @param  mixed                                      $id
+     * @param  PHPUnit_Framework_MockObject_Builder_Match $builder
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function registerId($id, PHPUnit_Framework_MockObject_Builder_Match $builder)
+    {
+        if (isset($this->builderMap[$id])) {
+            throw new PHPUnit_Framework_Exception(
+              'Match builder with id <' . $id . '> is already registered.'
+            );
+        }
+
+        $this->builderMap[$id] = $builder;
+    }
+
+    /**
+     * @param  PHPUnit_Framework_MockObject_Matcher_Invocation       $matcher
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return new PHPUnit_Framework_MockObject_Builder_InvocationMocker(
+          $this, $matcher
+        );
+    }
+
+    /**
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     * @return mixed
+     */
+    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        $exception      = NULL;
+        $hasReturnValue = FALSE;
+
+        if (strtolower($invocation->methodName) == '__tostring') {
+            $returnValue = '';
+        } else {
+            $returnValue = NULL;
+        }
+
+        foreach ($this->matchers as $match) {
+            try {
+                if ($match->matches($invocation)) {
+                    $value = $match->invoked($invocation);
+
+                    if (!$hasReturnValue) {
+                        $returnValue    = $value;
+                        $hasReturnValue = TRUE;
+                    }
+                }
+            } catch (Exception $e) {
+                $exception = $e;
+            }
+        }
+
+        if ($exception !== NULL) {
+            throw $exception;
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     * @return boolean
+     */
+    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        foreach ($this->matchers as $matcher) {
+            if (!$matcher->matches($invocation)) {
+                return FALSE;
+            }
+        }
+
+        return TRUE;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function verify()
+    {
+        foreach ($this->matchers as $matcher) {
+            $matcher->verify();
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invokable.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invokable.php
new file mode 100644
index 00000000..e02b2c29
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invokable.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Interface for classes which can be invoked.
+ *
+ * The invocation will be taken from a mock object and passed to an object
+ * of this class.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Interface available since Release 1.0.0
+ */
+interface PHPUnit_Framework_MockObject_Invokable extends PHPUnit_Framework_MockObject_Verifiable
+{
+    /**
+     * Invokes the invocation object $invocation so that it can be checked for
+     * expectations or matched against stubs.
+     *
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     *                                                             The invocation object passed from mock object.
+     * @return object
+     */
+    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation);
+
+    /**
+     * Checks if the invocation matches.
+     *
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     *                                                             The invocation object passed from mock object.
+     * @return boolean
+     */
+    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation);
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher.php
new file mode 100644
index 00000000..219c0d02
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher.php
@@ -0,0 +1,316 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Main matcher which defines a full expectation using method, parameter and
+ * invocation matchers.
+ * This matcher encapsulates all the other matchers and allows the builder to
+ * set the specific matchers when the appropriate methods are called (once(),
+ * where() etc.).
+ *
+ * All properties are public so that they can easily be accessed by the builder.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Matcher implements PHPUnit_Framework_MockObject_Matcher_Invocation
+{
+    /**
+     * @var PHPUnit_Framework_MockObject_Matcher_Invocation
+     */
+    public $invocationMatcher;
+
+    /**
+     * @var mixed
+     */
+    public $afterMatchBuilderId = NULL;
+
+    /**
+     * @var boolean
+     */
+    public $afterMatchBuilderIsInvoked = FALSE;
+
+    /**
+     * @var PHPUnit_Framework_MockObject_Matcher_MethodName
+     */
+    public $methodNameMatcher = NULL;
+
+    /**
+     * @var PHPUnit_Framework_MockObject_Matcher_Parameters
+     */
+    public $parametersMatcher = NULL;
+
+    /**
+     * @var PHPUnit_Framework_MockObject_Stub
+     */
+    public $stub = NULL;
+
+    /**
+     * @param PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher
+     */
+    public function __construct(PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher)
+    {
+        $this->invocationMatcher = $invocationMatcher;
+    }
+
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        $list = array();
+
+        if ($this->invocationMatcher !== NULL) {
+            $list[] = $this->invocationMatcher->toString();
+        }
+
+        if ($this->methodNameMatcher !== NULL) {
+            $list[] = 'where ' . $this->methodNameMatcher->toString();
+        }
+
+        if ($this->parametersMatcher !== NULL) {
+            $list[] = 'and ' . $this->parametersMatcher->toString();
+        }
+
+        if ($this->afterMatchBuilderId !== NULL) {
+            $list[] = 'after ' . $this->afterMatchBuilderId;
+        }
+
+        if ($this->stub !== NULL) {
+            $list[] = 'will ' . $this->stub->toString();
+        }
+
+        return join(' ', $list);
+    }
+
+    /**
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     * @return mixed
+     */
+    public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        if ($this->invocationMatcher === NULL) {
+            throw new PHPUnit_Framework_Exception(
+              'No invocation matcher is set'
+            );
+        }
+
+        if ($this->methodNameMatcher === NULL) {
+            throw new PHPUnit_Framework_Exception('No method matcher is set');
+        }
+
+        if ($this->afterMatchBuilderId !== NULL) {
+            $builder = $invocation->object
+                                  ->__phpunit_getInvocationMocker()
+                                  ->lookupId($this->afterMatchBuilderId);
+
+            if (!$builder) {
+                throw new PHPUnit_Framework_Exception(
+                  sprintf(
+                    'No builder found for match builder identification <%s>',
+
+                    $this->afterMatchBuilderId
+                  )
+                );
+            }
+
+            $matcher = $builder->getMatcher();
+
+            if ($matcher && $matcher->invocationMatcher->hasBeenInvoked()) {
+                $this->afterMatchBuilderIsInvoked = TRUE;
+            }
+        }
+
+        $this->invocationMatcher->invoked($invocation);
+
+        try {
+            if ( $this->parametersMatcher !== NULL &&
+                !$this->parametersMatcher->matches($invocation)) {
+                $this->parametersMatcher->verify();
+            }
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            throw new PHPUnit_Framework_ExpectationFailedException(
+              sprintf(
+                "Expectation failed for %s when %s\n%s",
+
+                $this->methodNameMatcher->toString(),
+                $this->invocationMatcher->toString(),
+                $e->getMessage()
+              ),
+              $e->getComparisonFailure()
+            );
+        }
+
+        if ($this->stub) {
+            return $this->stub->invoke($invocation);
+        }
+
+        return NULL;
+    }
+
+    /**
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     * @return boolean
+     */
+    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        if ($this->afterMatchBuilderId !== NULL) {
+            $builder = $invocation->object
+                                  ->__phpunit_getInvocationMocker()
+                                  ->lookupId($this->afterMatchBuilderId);
+
+            if (!$builder) {
+                throw new PHPUnit_Framework_Exception(
+                  sprintf(
+                    'No builder found for match builder identification <%s>',
+
+                    $this->afterMatchBuilderId
+                  )
+                );
+            }
+
+            $matcher = $builder->getMatcher();
+
+            if (!$matcher) {
+                return FALSE;
+            }
+
+            if (!$matcher->invocationMatcher->hasBeenInvoked()) {
+                return FALSE;
+            }
+        }
+
+        if ($this->invocationMatcher === NULL) {
+            throw new PHPUnit_Framework_Exception(
+              'No invocation matcher is set'
+            );
+        }
+
+        if ($this->methodNameMatcher === NULL) {
+            throw new PHPUnit_Framework_Exception('No method matcher is set');
+        }
+
+        if (!$this->invocationMatcher->matches($invocation)) {
+            return FALSE;
+        }
+
+        try {
+            if (!$this->methodNameMatcher->matches($invocation)) {
+                return FALSE;
+            }
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            throw new PHPUnit_Framework_ExpectationFailedException(
+              sprintf(
+                "Expectation failed for %s when %s\n%s",
+
+                $this->methodNameMatcher->toString(),
+                $this->invocationMatcher->toString(),
+                $e->getMessage()
+              ),
+              $e->getComparisonFailure()
+            );
+        }
+
+        return TRUE;
+    }
+
+    /**
+     * @throws PHPUnit_Framework_Exception
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function verify()
+    {
+        if ($this->invocationMatcher === NULL) {
+            throw new PHPUnit_Framework_Exception(
+              'No invocation matcher is set'
+            );
+        }
+
+        if ($this->methodNameMatcher === NULL) {
+            throw new PHPUnit_Framework_Exception('No method matcher is set');
+        }
+
+        try {
+            $this->invocationMatcher->verify();
+
+            if ($this->parametersMatcher === NULL) {
+                $this->parametersMatcher = new PHPUnit_Framework_MockObject_Matcher_AnyParameters;
+            }
+
+            $invocationIsAny = get_class($this->invocationMatcher) === 'PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount';
+            $invocationIsNever = get_class($this->invocationMatcher) === 'PHPUnit_Framework_MockObject_Matcher_InvokedCount' && $this->invocationMatcher->isNever();
+            if (!$invocationIsAny && !$invocationIsNever) {
+                $this->parametersMatcher->verify();
+            }
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            throw new PHPUnit_Framework_ExpectationFailedException(
+              sprintf(
+                "Expectation failed for %s when %s.\n%s",
+
+                $this->methodNameMatcher->toString(),
+                $this->invocationMatcher->toString(),
+                PHPUnit_Framework_TestFailure::exceptionToString($e)
+              )
+            );
+        }
+    }
+
+    /**
+     * @since Method available since Release 1.2.4
+     */
+    public function hasMatchers()
+    {
+        if ($this->invocationMatcher !== NULL &&
+            !$this->invocationMatcher instanceof PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount) {
+            return TRUE;
+        }
+
+        return FALSE;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyInvokedCount.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyInvokedCount.php
new file mode 100644
index 00000000..cf066da8
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyInvokedCount.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Invocation matcher which checks if a method has been invoked zero or more
+ * times. This matcher will always match.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount extends PHPUnit_Framework_MockObject_Matcher_InvokedRecorder
+{
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        return 'invoked zero or more times';
+    }
+
+    /**
+     */
+    public function verify()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyParameters.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyParameters.php
new file mode 100644
index 00000000..5a0e11b1
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyParameters.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Invocation matcher which allos any parameters to a method.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Matcher_AnyParameters extends PHPUnit_Framework_MockObject_Matcher_StatelessInvocation
+{
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        return 'with any parameters';
+    }
+
+    /**
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     * @return boolean
+     */
+    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        return TRUE;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/ConsecutiveParameters.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/ConsecutiveParameters.php
new file mode 100644
index 00000000..7f17225a
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/ConsecutiveParameters.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ */
+
+/**
+ * Invocation matcher which looks for sets of specific parameters in the invocations.
+ *
+ * Checks the parameters of the incoming invocations, the parameter list is
+ * checked against the defined constraints in $parameters. If the constraint
+ * is met it will return true in matches().
+ *
+ * It takes a list of match groups and and increases a call index after each invocation.
+ * So the first invocation uses the first group of constraints, the second the next and so on.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ */
+class PHPUnit_Framework_MockObject_Matcher_ConsecutiveParameters
+  extends PHPUnit_Framework_MockObject_Matcher_StatelessInvocation
+{
+
+  /**
+   * @var array
+   */
+  private $_parameterGroups = array();
+
+  /**
+   * @var array
+   */
+  private $_invocations = array();
+
+  /**
+   * @param array $parameterGroups
+   */
+  public function __construct(array $parameterGroups)
+  {
+      foreach ($parameterGroups as $index => $parameters) {
+          foreach ($parameters as $parameter) {
+              if (!($parameter instanceof \PHPUnit_Framework_Constraint))
+              {
+                  $parameter = new \PHPUnit_Framework_Constraint_IsEqual($parameter);
+              }
+              $this->_parameterGroups[$index][] = $parameter;
+          }
+      }
+  }
+
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        $text = 'with consecutive parameters';
+
+        return $text;
+    }
+
+  /**
+   * @param PHPUnit_Framework_MockObject_Invocation $invocation
+   * @return bool
+   */
+  public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
+  {
+      $this->_invocations[] = $invocation;
+      $callIndex = count($this->_invocations) - 1;
+      $this->verifyInvocation($invocation, $callIndex);
+      return FALSE;
+  }
+
+  public function verify()
+  {
+      foreach ($this->_invocations as $callIndex => $invocation) {
+        $this->verifyInvocation($invocation, $callIndex);
+      }
+  }
+
+  /**
+   * Verify a single invocation
+   *
+   * @param PHPUnit_Framework_MockObject_Invocation $invocation
+   * @param int $callIndex
+   * @throws PHPUnit_Framework_ExpectationFailedException
+   */
+  private function verifyInvocation(PHPUnit_Framework_MockObject_Invocation $invocation, $callIndex)
+  {
+
+      if (isset($this->_parameterGroups[$callIndex])) {
+          $parameters = $this->_parameterGroups[$callIndex];
+      }
+
+      if ($invocation === NULL) {
+          throw new PHPUnit_Framework_ExpectationFailedException(
+            'Mocked method does not exist.'
+          );
+      }
+
+      if (count($invocation->parameters) < count($parameters)) {
+          throw new PHPUnit_Framework_ExpectationFailedException(
+              sprintf(
+                'Parameter count for invocation %s is too low.',
+                $invocation->toString()
+              )
+          );
+      }
+
+      foreach ($parameters as $i => $parameter) {
+          $parameter->evaluate(
+              $invocation->parameters[$i],
+              sprintf(
+                'Parameter %s for invocation #%d %s does not match expected ' .
+                'value.',
+                $i,
+                $callIndex,
+                $invocation->toString()
+              )
+          );
+      }
+  }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Invocation.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Invocation.php
new file mode 100644
index 00000000..7891a7b4
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Invocation.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Interface for classes which matches an invocation based on its
+ * method name, argument, order or call count.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Interface available since Release 1.0.0
+ */
+interface PHPUnit_Framework_MockObject_Matcher_Invocation extends PHPUnit_Framework_SelfDescribing, PHPUnit_Framework_MockObject_Verifiable
+{
+    /**
+     * Registers the invocation $invocation in the object as being invoked.
+     * This will only occur after matches() returns true which means the
+     * current invocation is the correct one.
+     *
+     * The matcher can store information from the invocation which can later
+     * be checked in verify(), or it can check the values directly and throw
+     * and exception if an expectation is not met.
+     *
+     * If the matcher is a stub it will also have a return value.
+     *
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     *                                                             Object containing information on a mocked or stubbed method which
+     *                                                             was invoked.
+     * @return mixed
+     */
+    public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation);
+
+    /**
+     * Checks if the invocation $invocation matches the current rules. If it does
+     * the matcher will get the invoked() method called which should check if an
+     * expectation is met.
+     *
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     *                                                             Object containing information on a mocked or stubbed method which
+     *                                                             was invoked.
+     * @return bool
+     */
+    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation);
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtIndex.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtIndex.php
new file mode 100644
index 00000000..0d3a8e89
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtIndex.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Invocation matcher which checks if a method was invoked at a certain index.
+ *
+ * If the expected index number does not match the current invocation index it
+ * will not match which means it skips all method and parameter matching. Only
+ * once the index is reached will the method and parameter start matching and
+ * verifying.
+ *
+ * If the index is never reached it will throw an exception in index.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex implements PHPUnit_Framework_MockObject_Matcher_Invocation
+{
+    /**
+     * @var integer
+     */
+    protected $sequenceIndex;
+
+    /**
+     * @var integer
+     */
+    protected $currentIndex = -1;
+
+    /**
+     * @param integer $sequenceIndex
+     */
+    public function __construct($sequenceIndex)
+    {
+        $this->sequenceIndex = $sequenceIndex;
+    }
+
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        return 'invoked at sequence index ' . $this->sequenceIndex;
+    }
+
+    /**
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     * @return boolean
+     */
+    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        $this->currentIndex++;
+
+        return $this->currentIndex == $this->sequenceIndex;
+    }
+
+    /**
+     * @param PHPUnit_Framework_MockObject_Invocation $invocation
+     */
+    public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+    }
+
+    /**
+     * Verifies that the current expectation is valid. If everything is OK the
+     * code should just return, if not it must throw an exception.
+     *
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function verify()
+    {
+        if ($this->currentIndex < $this->sequenceIndex) {
+            throw new PHPUnit_Framework_ExpectationFailedException(
+              sprintf(
+                'The expected invocation at index %s was never reached.',
+
+                $this->sequenceIndex
+              )
+            );
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php
new file mode 100644
index 00000000..5b4d36f2
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Invocation matcher which checks if a method has been invoked at least one
+ * time.
+ *
+ * If the number of invocations is 0 it will throw an exception in verify.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce extends PHPUnit_Framework_MockObject_Matcher_InvokedRecorder
+{
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        return 'invoked at least once';
+    }
+
+    /**
+     * Verifies that the current expectation is valid. If everything is OK the
+     * code should just return, if not it must throw an exception.
+     *
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function verify()
+    {
+        $count = $this->getInvocationCount();
+
+        if ($count < 1) {
+            throw new PHPUnit_Framework_ExpectationFailedException(
+              'Expected invocation at least once but it never occured.'
+            );
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedCount.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedCount.php
new file mode 100644
index 00000000..848f420e
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedCount.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Invocation matcher which checks if a method has been invoked a certain amount
+ * of times.
+ * If the number of invocations exceeds the value it will immediately throw an
+ * exception,
+ * If the number is less it will later be checked in verify() and also throw an
+ * exception.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Matcher_InvokedCount extends PHPUnit_Framework_MockObject_Matcher_InvokedRecorder
+{
+    /**
+     * @var integer
+     */
+    protected $expectedCount;
+
+    /**
+     * @param integer $expectedCount
+     */
+    public function __construct($expectedCount)
+    {
+        $this->expectedCount = $expectedCount;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function isNever()
+    {
+        return $this->expectedCount == 0;
+    }
+
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        return 'invoked ' . $this->expectedCount . ' time(s)';
+    }
+
+    /**
+     * @param  PHPUnit_Framework_MockObject_Invocation      $invocation
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        parent::invoked($invocation);
+
+        $count = $this->getInvocationCount();
+
+        if ($count > $this->expectedCount) {
+            $message = $invocation->toString() . ' ';
+
+            switch ($this->expectedCount) {
+                case 0: {
+                    $message .= 'was not expected to be called.';
+                }
+                break;
+
+                case 1: {
+                    $message .= 'was not expected to be called more than once.';
+                }
+                break;
+
+                default: {
+                    $message .= sprintf(
+                      'was not expected to be called more than %d times.',
+
+                      $this->expectedCount
+                    );
+                }
+            }
+
+            throw new PHPUnit_Framework_ExpectationFailedException($message);
+        }
+    }
+
+    /**
+     * Verifies that the current expectation is valid. If everything is OK the
+     * code should just return, if not it must throw an exception.
+     *
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function verify()
+    {
+        $count = $this->getInvocationCount();
+
+        if ($count !== $this->expectedCount) {
+            throw new PHPUnit_Framework_ExpectationFailedException(
+              sprintf(
+                'Method was expected to be called %d times, ' .
+                'actually called %d times.',
+
+                $this->expectedCount,
+                $count
+              )
+            );
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedRecorder.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedRecorder.php
new file mode 100644
index 00000000..9a345164
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedRecorder.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Records invocations and provides convenience methods for checking them later
+ * on.
+ * This abstract class can be implemented by matchers which needs to check the
+ * number of times an invocation has occured.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ * @abstract
+ */
+abstract class PHPUnit_Framework_MockObject_Matcher_InvokedRecorder implements PHPUnit_Framework_MockObject_Matcher_Invocation
+{
+    /**
+     * @var PHPUnit_Framework_MockObject_Invocation[]
+     */
+    protected $invocations = array();
+
+    /**
+     * @return integer
+     */
+    public function getInvocationCount()
+    {
+        return count($this->invocations);
+    }
+
+    /**
+     * @return PHPUnit_Framework_MockObject_Invocation[]
+     */
+    public function getInvocations()
+    {
+        return $this->invocations;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasBeenInvoked()
+    {
+        return count($this->invocations) > 0;
+    }
+
+    /**
+     * @param PHPUnit_Framework_MockObject_Invocation $invocation
+     */
+    public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        $this->invocations[] = $invocation;
+    }
+
+    /**
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     * @return boolean
+     */
+    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        return TRUE;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/MethodName.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/MethodName.php
new file mode 100644
index 00000000..8b9ec10d
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/MethodName.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Invocation matcher which looks for a specific method name in the invocations.
+ *
+ * Checks the method name all incoming invocations, the name is checked against
+ * the defined constraint $constraint. If the constraint is met it will return
+ * true in matches().
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Matcher_MethodName extends PHPUnit_Framework_MockObject_Matcher_StatelessInvocation
+{
+    /**
+     * @var PHPUnit_Framework_Constraint
+     */
+    protected $constraint;
+
+    /**
+     * @param  PHPUnit_Framework_Constraint|string
+     * @throws PHPUnit_Framework_Constraint
+     */
+    public function __construct($constraint)
+    {
+        if (!$constraint instanceof PHPUnit_Framework_Constraint) {
+            if (!is_string($constraint)) {
+                throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+            }
+
+            $constraint = new PHPUnit_Framework_Constraint_IsEqual(
+              $constraint, 0, 10, FALSE, TRUE
+            );
+        }
+
+        $this->constraint = $constraint;
+    }
+
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        return 'method name ' . $this->constraint->toString();
+    }
+
+    /**
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     * @return boolean
+     */
+    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        return $this->constraint->evaluate($invocation->methodName, '', TRUE);
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Parameters.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Parameters.php
new file mode 100644
index 00000000..90abaa59
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Parameters.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Invocation matcher which looks for specific parameters in the invocations.
+ *
+ * Checks the parameters of all incoming invocations, the parameter list is
+ * checked against the defined constraints in $parameters. If the constraint
+ * is met it will return true in matches().
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Matcher_Parameters extends PHPUnit_Framework_MockObject_Matcher_StatelessInvocation
+{
+    /**
+     * @var array
+     */
+    protected $parameters = array();
+
+    /**
+     * @var PHPUnit_Framework_MockObject_Invocation
+     */
+    protected $invocation;
+
+    /**
+     * @param array $parameters
+     */
+    public function __construct(array $parameters)
+    {
+        foreach ($parameters as $parameter) {
+            if (!($parameter instanceof PHPUnit_Framework_Constraint)) {
+                $parameter = new PHPUnit_Framework_Constraint_IsEqual(
+                  $parameter
+                );
+            }
+
+            $this->parameters[] = $parameter;
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        $text = 'with parameter';
+
+        foreach ($this->parameters as $index => $parameter) {
+            if ($index > 0) {
+                $text .= ' and';
+            }
+
+            $text .= ' ' . $index . ' ' . $parameter->toString();
+        }
+
+        return $text;
+    }
+
+    /**
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     * @return boolean
+     */
+    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        $this->invocation = $invocation;
+        return $this->verify();
+    }
+
+    /**
+     * Checks if the invocation $invocation matches the current rules. If it
+     * does the matcher will get the invoked() method called which should check
+     * if an expectation is met.
+     *
+     * @param  PHPUnit_Framework_MockObject_Invocation      $invocation
+     *                                                                  Object containing information on a mocked or stubbed method which
+     *                                                                  was invoked.
+     * @return bool
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function verify()
+    {
+        if ($this->invocation === NULL) {
+            throw new PHPUnit_Framework_ExpectationFailedException(
+              'Mocked method does not exist.'
+            );
+        }
+
+        if (count($this->invocation->parameters) < count($this->parameters)) {
+            throw new PHPUnit_Framework_ExpectationFailedException(
+              sprintf(
+                'Parameter count for invocation %s is too low.',
+
+                $this->invocation->toString()
+              )
+            );
+        }
+
+        foreach ($this->parameters as $i => $parameter) {
+            $parameter->evaluate(
+              $this->invocation->parameters[$i],
+              sprintf(
+                'Parameter %s for invocation %s does not match expected ' .
+                'value.',
+
+                $i,
+                $this->invocation->toString()
+              )
+            );
+        }
+
+        return true;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/StatelessInvocation.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/StatelessInvocation.php
new file mode 100644
index 00000000..3d0283ee
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/StatelessInvocation.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Invocation matcher which does not care about previous state from earlier
+ * invocations.
+ *
+ * This abstract class can be implemented by matchers which does not care about
+ * state but only the current run-time value of the invocation itself.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ * @abstract
+ */
+abstract class PHPUnit_Framework_MockObject_Matcher_StatelessInvocation implements PHPUnit_Framework_MockObject_Matcher_Invocation
+{
+    /**
+     * Registers the invocation $invocation in the object as being invoked.
+     * This will only occur after matches() returns true which means the
+     * current invocation is the correct one.
+     *
+     * The matcher can store information from the invocation which can later
+     * be checked in verify(), or it can check the values directly and throw
+     * and exception if an expectation is not met.
+     *
+     * If the matcher is a stub it will also have a return value.
+     *
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     *                                                             Object containing information on a mocked or stubbed method which
+     *                                                             was invoked.
+     * @return mixed
+     */
+    public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+    }
+
+    /**
+     * Checks if the invocation $invocation matches the current rules. If it does
+     * the matcher will get the invoked() method called which should check if an
+     * expectation is met.
+     *
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     *                                                             Object containing information on a mocked or stubbed method which
+     *                                                             was invoked.
+     * @return bool
+     */
+    public function verify()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockBuilder.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockBuilder.php
new file mode 100644
index 00000000..3ff86556
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockBuilder.php
@@ -0,0 +1,363 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Implementation of the Builder pattern for Mock objects.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_MockBuilder
+{
+    /**
+     * @var PHPUnit_Framework_TestCase
+     */
+    private $testCase;
+
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @var array
+     */
+    private $methods = array();
+
+    /**
+     * @var string
+     */
+    private $mockClassName = '';
+
+    /**
+     * @var array
+     */
+    private $constructorArgs = array();
+
+    /**
+     * @var boolean
+     */
+    private $originalConstructor = TRUE;
+
+    /**
+     * @var boolean
+     */
+    private $originalClone = TRUE;
+
+    /**
+     * @var boolean
+     */
+    private $autoload = TRUE;
+
+    /**
+     * @var boolean
+     */
+    private $cloneArguments = FALSE;
+
+    /**
+     * @var boolean
+     */
+    private $callOriginalMethods = FALSE;
+
+    /**
+     * @var object
+     */
+    private $proxyTarget = NULL;
+
+    /**
+     * @param PHPUnit_Framework_TestCase $testCase
+     * @param array|string               $type
+     */
+    public function __construct(PHPUnit_Framework_TestCase $testCase, $type)
+    {
+        $this->testCase = $testCase;
+        $this->type     = $type;
+    }
+
+    /**
+     * Creates a mock object using a fluent interface.
+     *
+     * @return PHPUnit_Framework_MockObject_MockObject
+     */
+    public function getMock()
+    {
+        return $this->testCase->getMock(
+          $this->type,
+          $this->methods,
+          $this->constructorArgs,
+          $this->mockClassName,
+          $this->originalConstructor,
+          $this->originalClone,
+          $this->autoload,
+          $this->cloneArguments,
+          $this->callOriginalMethods,
+          $this->proxyTarget
+        );
+    }
+
+    /**
+     * Creates a mock object for an abstract class using a fluent interface.
+     *
+     * @return PHPUnit_Framework_MockObject_MockObject
+     */
+    public function getMockForAbstractClass()
+    {
+        return $this->testCase->getMockForAbstractClass(
+          $this->type,
+          $this->constructorArgs,
+          $this->mockClassName,
+          $this->originalConstructor,
+          $this->originalClone,
+          $this->autoload,
+          $this->methods,
+          $this->cloneArguments
+        );
+    }
+
+    /**
+     * Creates a mock object for a trait using a fluent interface.
+     *
+     * @return PHPUnit_Framework_MockObject_MockObject
+     */
+    public function getMockForTrait()
+    {
+        return $this->testCase->getMockForTrait(
+          $this->type,
+          $this->constructorArgs,
+          $this->mockClassName,
+          $this->originalConstructor,
+          $this->originalClone,
+          $this->autoload,
+          $this->methods,
+          $this->cloneArguments
+        );
+    }
+
+    /**
+     * Specifies the subset of methods to mock. Default is to mock all of them.
+     *
+     * @param  array|null                               $methods
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     */
+    public function setMethods($methods)
+    {
+        $this->methods = $methods;
+
+        return $this;
+    }
+
+    /**
+     * Specifies the arguments for the constructor.
+     *
+     * @param  array                                    $args
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     */
+    public function setConstructorArgs(array $args)
+    {
+        $this->constructorArgs = $args;
+
+        return $this;
+    }
+
+    /**
+     * Specifies the name for the mock class.
+     *
+     * @param  string                                   $name
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     */
+    public function setMockClassName($name)
+    {
+        $this->mockClassName = $name;
+
+        return $this;
+    }
+
+    /**
+     * Disables the invocation of the original constructor.
+     *
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     */
+    public function disableOriginalConstructor()
+    {
+        $this->originalConstructor = FALSE;
+
+        return $this;
+    }
+
+    /**
+     * Enables the invocation of the original constructor.
+     *
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     * @since  Method available since Release 1.2.0
+     */
+    public function enableOriginalConstructor()
+    {
+        $this->originalConstructor = TRUE;
+
+        return $this;
+    }
+
+    /**
+     * Disables the invocation of the original clone constructor.
+     *
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     */
+    public function disableOriginalClone()
+    {
+        $this->originalClone = FALSE;
+
+        return $this;
+    }
+
+    /**
+     * Enables the invocation of the original clone constructor.
+     *
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     * @since  Method available since Release 1.2.0
+     */
+    public function enableOriginalClone()
+    {
+        $this->originalClone = TRUE;
+
+        return $this;
+    }
+
+    /**
+     * Disables the use of class autoloading while creating the mock object.
+     *
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     */
+    public function disableAutoload()
+    {
+        $this->autoload = FALSE;
+
+        return $this;
+    }
+
+    /**
+     * Enables the use of class autoloading while creating the mock object.
+     *
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     * @since  Method available since Release 1.2.0
+     */
+    public function enableAutoload()
+    {
+        $this->autoload = TRUE;
+
+        return $this;
+    }
+
+    /**
+     * Disables the cloning of arguments passed to mocked methods.
+     *
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     * @since  Method available since Release 1.2.0
+     */
+    public function disableArgumentCloning()
+    {
+        $this->cloneArguments = FALSE;
+
+        return $this;
+    }
+
+    /**
+     * Enables the cloning of arguments passed to mocked methods.
+     *
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     * @since  Method available since Release 1.2.0
+     */
+    public function enableArgumentCloning()
+    {
+        $this->cloneArguments = TRUE;
+
+        return $this;
+    }
+
+    /**
+     * Enables the invocation of the original methods.
+     *
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     * @since  Method available since Release 2.0.0
+     */
+    public function enableProxyingToOriginalMethods()
+    {
+        $this->callOriginalMethods = TRUE;
+
+        return $this;
+    }
+
+    /**
+     * Disables the invocation of the original methods.
+     *
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     * @since  Method available since Release 2.0.0
+     */
+    public function disableProxyingToOriginalMethods()
+    {
+        $this->callOriginalMethods = FALSE;
+        $this->proxyTarget         = NULL;
+
+        return $this;
+    }
+
+    /**
+     * Sets the proxy target.
+     *
+     * @param  object                                   $object
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     * @since  Method available since Release 2.0.0
+     */
+    public function setProxyTarget($object)
+    {
+        $this->proxyTarget = $object;
+
+        return $this;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockObject.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockObject.php
new file mode 100644
index 00000000..f7534b38
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockObject.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Interface for all mock objects which are generated by
+ * PHPUnit_Framework_MockObject_Mock.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Interface available since Release 1.0.0
+ */
+interface PHPUnit_Framework_MockObject_MockObject /*extends PHPUnit_Framework_MockObject_Verifiable*/
+{
+    /**
+     * Registers a new expectation in the mock object and returns the match
+     * object which can be infused with further details.
+     *
+     * @param  PHPUnit_Framework_MockObject_Matcher_Invocation       $matcher
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher);
+
+    /**
+     * @return PHPUnit_Framework_MockObject_InvocationMocker
+     * @since  Method available since Release 2.0.0
+     */
+    public function __phpunit_setOriginalObject($originalObject);
+
+    /**
+     * @return PHPUnit_Framework_MockObject_InvocationMocker
+     */
+    public function __phpunit_getInvocationMocker();
+
+    /**
+     * Verifies that the current expectation is valid. If everything is OK the
+     * code should just return, if not it must throw an exception.
+     *
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function __phpunit_verify();
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub.php
new file mode 100644
index 00000000..ca8f2627
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * An object that stubs the process of a normal method for a mock object.
+ *
+ * The stub object will replace the code for the stubbed method and return a
+ * specific value instead of the original value.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Interface available since Release 1.0.0
+ */
+interface PHPUnit_Framework_MockObject_Stub extends PHPUnit_Framework_SelfDescribing
+{
+    /**
+     * Fakes the processing of the invocation $invocation by returning a
+     * specific value.
+     *
+     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     *                                                             The invocation which was mocked and matched by the current method
+     *                                                             and argument matchers.
+     * @return mixed
+     */
+    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation);
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ConsecutiveCalls.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ConsecutiveCalls.php
new file mode 100644
index 00000000..10563c18
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ConsecutiveCalls.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Patrick Müller <elias0@gmx.net>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Stubs a method by returning a user-defined stack of values.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Patrick Müller <elias0@gmx.net>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls implements PHPUnit_Framework_MockObject_Stub
+{
+    protected $stack;
+    protected $value;
+
+    public function __construct($stack)
+    {
+        $this->stack = $stack;
+    }
+
+    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        $this->value = array_shift($this->stack);
+
+        if ($this->value instanceof PHPUnit_Framework_MockObject_Stub) {
+            $this->value = $this->value->invoke($invocation);
+        }
+
+        return $this->value;
+    }
+
+    public function toString()
+    {
+        return sprintf(
+          'return user-specified value %s',
+
+          PHPUnit_Util_Type::export($this->value)
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Exception.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Exception.php
new file mode 100644
index 00000000..1a4d476c
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Exception.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Oliver Schlicht <o.schlicht@bitExpert.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Stubs a method by raising a user-defined exception.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Oliver Schlicht <o.schlicht@bitExpert.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Stub_Exception implements PHPUnit_Framework_MockObject_Stub
+{
+    protected $exception;
+
+    public function __construct(Exception $exception)
+    {
+        $this->exception = $exception;
+    }
+
+    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        throw $this->exception;
+    }
+
+    public function toString()
+    {
+        return sprintf(
+          'raise user-specified exception %s',
+
+          PHPUnit_Util_Type::export($this->exception)
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/MatcherCollection.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/MatcherCollection.php
new file mode 100644
index 00000000..cfdd6b77
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/MatcherCollection.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Stubs a method by returning a user-defined value.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Interface available since Release 1.0.0
+ */
+interface PHPUnit_Framework_MockObject_Stub_MatcherCollection
+{
+    /**
+     * Adds a new matcher to the collection which can be used as an expectation
+     * or a stub.
+     *
+     * @param PHPUnit_Framework_MockObject_Matcher_Invocation $matcher
+     *                                                                 Matcher for invocations to mock objects.
+     */
+    public function addMatcher(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher);
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Return.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Return.php
new file mode 100644
index 00000000..9ef71ef6
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Return.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Stubs a method by returning a user-defined value.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Stub_Return implements PHPUnit_Framework_MockObject_Stub
+{
+    protected $value;
+
+    public function __construct($value)
+    {
+        $this->value = $value;
+    }
+
+    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        return $this->value;
+    }
+
+    public function toString()
+    {
+        return sprintf(
+          'return user-specified value %s',
+
+          PHPUnit_Util_Type::export($this->value)
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnArgument.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnArgument.php
new file mode 100644
index 00000000..68f6564c
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnArgument.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Stubs a method by returning an argument that was passed to the mocked method.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Stub_ReturnArgument extends PHPUnit_Framework_MockObject_Stub_Return
+{
+    protected $argumentIndex;
+
+    public function __construct($argumentIndex)
+    {
+        $this->argumentIndex = $argumentIndex;
+    }
+
+    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        if (isset($invocation->parameters[$this->argumentIndex])) {
+            return $invocation->parameters[$this->argumentIndex];
+        } else {
+            return NULL;
+        }
+    }
+
+    public function toString()
+    {
+        return sprintf('return argument #%d', $this->argumentIndex);
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnCallback.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnCallback.php
new file mode 100644
index 00000000..a093abf1
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnCallback.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Stub_ReturnCallback implements PHPUnit_Framework_MockObject_Stub
+{
+    protected $callback;
+
+    public function __construct($callback)
+    {
+        $this->callback = $callback;
+    }
+
+    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        return call_user_func_array($this->callback, $invocation->parameters);
+    }
+
+    public function toString()
+    {
+        if (is_array($this->callback)) {
+            if (is_object($this->callback[0])) {
+                $class = get_class($this->callback[0]);
+                $type  = '->';
+            } else {
+                $class = $this->callback[0];
+                $type  = '::';
+            }
+
+            return sprintf(
+              'return result of user defined callback %s%s%s() with the ' .
+              'passed arguments',
+
+              $class,
+              $type,
+              $this->callback[1]
+            );
+        } else {
+            return 'return result of user defined callback ' . $this->callback .
+                   ' with the passed arguments';
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnSelf.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnSelf.php
new file mode 100644
index 00000000..b24bdb53
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnSelf.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Kris Wallsmith <kris.wallsmith@gmail.com>
+ * @copyright  2010 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.1.0
+ */
+
+/**
+ * Stubs a method by returning the current object.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Kris Wallsmith <kris.wallsmith@gmail.com>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.1.0
+ */
+class PHPUnit_Framework_MockObject_Stub_ReturnSelf implements PHPUnit_Framework_MockObject_Stub
+{
+    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        if (!$invocation instanceof PHPUnit_Framework_MockObject_Invocation_Object) {
+            throw new PHPUnit_Framework_Exception(
+                'The current object can only be returned when mocking an ' .
+                'object, not a static class.'
+            );
+        }
+
+        return $invocation->object;
+    }
+
+    public function toString()
+    {
+        return 'return the current object';
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnValueMap.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnValueMap.php
new file mode 100644
index 00000000..36e82c66
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnValueMap.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.1.0
+ */
+
+/**
+ * Stubs a method by returning a value from a map.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.1.0
+ */
+class PHPUnit_Framework_MockObject_Stub_ReturnValueMap implements PHPUnit_Framework_MockObject_Stub
+{
+    protected $valueMap;
+
+    public function __construct(array $valueMap)
+    {
+        $this->valueMap = $valueMap;
+    }
+
+    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
+    {
+        $parameterCount = count($invocation->parameters);
+
+        foreach ($this->valueMap as $map) {
+            if (!is_array($map) || $parameterCount != count($map) - 1) {
+                continue;
+            }
+
+            $return = array_pop($map);
+            if ($invocation->parameters === $map) {
+                return $return;
+            }
+        }
+
+        return NULL;
+    }
+
+    public function toString()
+    {
+        return 'return value from a map';
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Verifiable.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Verifiable.php
new file mode 100644
index 00000000..21ccbf48
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Verifiable.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Interface for classes which must verify a given expectation.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Interface available since Release 1.0.0
+ */
+interface PHPUnit_Framework_MockObject_Verifiable
+{
+    /**
+     * Verifies that the current expectation is valid. If everything is OK the
+     * code should just return, if not it must throw an exception.
+     *
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function verify();
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/GeneratorTest.php b/vendor/phpunit/phpunit-mock-objects/tests/GeneratorTest.php
new file mode 100644
index 00000000..6663ab46
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/GeneratorTest.php
@@ -0,0 +1,142 @@
+<?php
+class Framework_MockObject_GeneratorTest extends PHPUnit_Framework_TestCase
+{
+    protected $generator;
+
+    protected function setUp()
+    {
+        $this->generator = new PHPUnit_Framework_MockObject_Generator;
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMock
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetMockFailsWhenInvalidFunctionNameIsPassedInAsAFunctionToMock()
+    {
+        $this->generator->getMock('StdClass', array(0));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMock
+     */
+    public function testGetMockCanCreateNonExistingFunctions()
+    {
+        $mock = $this->generator->getMock('StdClass', array('testFunction'));
+        $this->assertTrue(method_exists($mock, 'testFunction'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMock
+     * @expectedException PHPUnit_Framework_MockObject_RuntimeException
+     * @expectedExceptionMessage duplicates: "foo, foo"
+     */
+    public function testGetMockGeneratorFails()
+    {
+        $mock = $this->generator->getMock('StdClass', array('foo', 'foo'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
+     */
+    public function testGetMockForAbstractClassDoesNotFailWhenFakingInterfaces()
+    {
+        $mock = $this->generator->getMockForAbstractClass('Countable');
+        $this->assertTrue(method_exists($mock, 'count'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
+     */
+    public function testGetMockForAbstractClassStubbingAbstractClass()
+    {
+        $mock = $this->generator->getMockForAbstractClass('AbstractMockTestClass');
+        $this->assertTrue(method_exists($mock, 'doSomething'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
+     */
+    public function testGetMockForAbstractClassWithNonExistentMethods()
+    {
+        $mock = $this->generator->getMockForAbstractClass(
+            'AbstractMockTestClass', array(), '',  true,
+            true, true, array('nonexistentMethod')
+        );
+
+        $this->assertTrue(method_exists($mock, 'nonexistentMethod'));
+        $this->assertTrue(method_exists($mock, 'doSomething'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
+     */
+    public function testGetMockForAbstractClassShouldCreateStubsOnlyForAbstractMethodWhenNoMethodsWereInformed()
+    {
+        $mock = $this->generator->getMockForAbstractClass('AbstractMockTestClass');
+
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willReturn('testing');
+
+        $this->assertEquals('testing', $mock->doSomething());
+        $this->assertEquals(1, $mock->returnAnything());
+    }
+
+    /**
+     * @dataProvider getMockForAbstractClassExpectsInvalidArgumentExceptionDataprovider
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetMockForAbstractClassExpectingInvalidArgumentException($className, $mockClassName)
+    {
+        $mock = $this->generator->getMockForAbstractClass($className, array(), $mockClassName);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
+     * @expectedException PHPUnit_Framework_MockObject_RuntimeException
+     */
+    public function testGetMockForAbstractClassAnstractClassDoesNotExist()
+    {
+        $mock = $this->generator->getMockForAbstractClass('Tux');
+    }
+
+    /**
+     * Dataprovider for test "testGetMockForAbstractClassExpectingInvalidArgumentException"
+     */
+    public static function getMockForAbstractClassExpectsInvalidArgumentExceptionDataprovider()
+    {
+        return array(
+            'className not a string' => array(array(), ''),
+            'mockClassName not a string' => array('Countable', new StdClass),
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForTrait
+     * @requires PHP 5.4.0
+     */
+    public function testGetMockForTraitWithNonExistentMethodsAndNonAbstractMethods()
+    {
+        $mock = $this->generator->getMockForTrait(
+            'AbstractTrait', array(), '',  true,
+            true, true, array('nonexistentMethod')
+        );
+
+        $this->assertTrue(method_exists($mock, 'nonexistentMethod'));
+        $this->assertTrue(method_exists($mock, 'doSomething'));
+        $this->assertTrue($mock->mockableMethod());
+        $this->assertTrue($mock->anotherMockableMethod());
+    }
+
+    /**
+     * @covers   PHPUnit_Framework_MockObject_Generator::getMockForTrait
+     * @requires PHP 5.4.0
+     */
+    public function testGetMockForTraitStubbingAbstractMethod()
+    {
+        $mock = $this->generator->getMockForTrait('AbstractTrait');
+        $this->assertTrue(method_exists($mock, 'doSomething'));
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockBuilderTest.php b/vendor/phpunit/phpunit-mock-objects/tests/MockBuilderTest.php
new file mode 100644
index 00000000..c770e2a9
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockBuilderTest.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * @package    PHPUnit_MockObject
+ * @author     Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+class Framework_MockBuilderTest extends PHPUnit_Framework_TestCase
+{
+    public function testMockBuilderRequiresClassName()
+    {
+        $spec = $this->getMockBuilder('Mockable');
+        $mock = $spec->getMock();
+        $this->assertTrue($mock instanceof Mockable);
+    }
+
+    public function testByDefaultMocksAllMethods()
+    {
+        $spec = $this->getMockBuilder('Mockable');
+        $mock = $spec->getMock();
+        $this->assertNull($mock->mockableMethod());
+        $this->assertNull($mock->anotherMockableMethod());
+    }
+
+    public function testMethodsToMockCanBeSpecified()
+    {
+        $spec = $this->getMockBuilder('Mockable');
+        $spec->setMethods(array('mockableMethod'));
+        $mock = $spec->getMock();
+        $this->assertNull($mock->mockableMethod());
+        $this->assertTrue($mock->anotherMockableMethod());
+    }
+
+    public function testByDefaultDoesNotPassArgumentsToTheConstructor()
+    {
+        $spec = $this->getMockBuilder('Mockable');
+        $mock = $spec->getMock();
+        $this->assertEquals(array(NULL, NULL), $mock->constructorArgs);
+    }
+
+    public function testMockClassNameCanBeSpecified()
+    {
+        $spec = $this->getMockBuilder('Mockable');
+        $spec->setMockClassName('ACustomClassName');
+        $mock = $spec->getMock();
+        $this->assertTrue($mock instanceof ACustomClassName);
+    }
+
+    public function testConstructorArgumentsCanBeSpecified()
+    {
+        $spec = $this->getMockBuilder('Mockable');
+        $spec->setConstructorArgs($expected = array(23, 42));
+        $mock = $spec->getMock();
+        $this->assertEquals($expected, $mock->constructorArgs);
+    }
+
+    public function testOriginalConstructorCanBeDisabled()
+    {
+        $spec = $this->getMockBuilder('Mockable');
+        $spec->disableOriginalConstructor();
+        $mock = $spec->getMock();
+        $this->assertNull($mock->constructorArgs);
+    }
+
+    public function testByDefaultOriginalCloneIsPreserved()
+    {
+        $spec = $this->getMockBuilder('Mockable');
+        $mock = $spec->getMock();
+        $cloned = clone $mock;
+        $this->assertTrue($cloned->cloned);
+    }
+
+    public function testOriginalCloneCanBeDisabled()
+    {
+        $spec = $this->getMockBuilder('Mockable');
+        $spec->disableOriginalClone();
+        $mock = $spec->getMock();
+        $mock->cloned = FALSE;
+        $cloned = clone $mock;
+        $this->assertFalse($cloned->cloned);
+    }
+
+    public function testCallingAutoloadCanBeDisabled()
+    {
+        // it is not clear to me how to test this nor the difference
+        // between calling it or not
+        $this->markTestIncomplete();
+    }
+
+    public function testProvidesAFluentInterface()
+    {
+        $spec = $this->getMockBuilder('Mockable')
+                     ->setMethods(array('mockableMethod'))
+                     ->setConstructorArgs(array())
+                     ->setMockClassName('DummyClassName')
+                     ->disableOriginalConstructor()
+                     ->disableOriginalClone()
+                     ->disableAutoload();
+        $this->assertTrue($spec instanceof PHPUnit_Framework_MockObject_MockBuilder);
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/ObjectTest.php b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/ObjectTest.php
new file mode 100644
index 00000000..110ee75a
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/ObjectTest.php
@@ -0,0 +1,81 @@
+<?php
+
+class Framework_MockObject_Invocation_ObjectTest extends PHPUnit_Framework_TestCase
+{
+    public function testConstructorRequiresClassAndMethodAndParametersAndObject()
+    {
+        new PHPUnit_Framework_MockObject_Invocation_Object(
+            'FooClass',
+            'FooMethod',
+            array('an_argument'),
+            new StdClass);
+    }
+
+    public function testAllowToGetClassNameSetInConstructor()
+    {
+        $invocation = new PHPUnit_Framework_MockObject_Invocation_Object(
+            'FooClass',
+            'FooMethod',
+            array('an_argument'),
+            new StdClass);
+
+        $this->assertSame('FooClass', $invocation->className);
+    }
+
+    public function testAllowToGetMethodNameSetInConstructor()
+    {
+        $invocation = new PHPUnit_Framework_MockObject_Invocation_Object(
+            'FooClass',
+            'FooMethod',
+            array('an_argument'),
+            new StdClass);
+
+        $this->assertSame('FooMethod', $invocation->methodName);
+    }
+
+    public function testAllowToGetObjectSetInConstructor()
+    {
+        $expectedObject = new StdClass;
+
+        $invocation = new PHPUnit_Framework_MockObject_Invocation_Object(
+            'FooClass',
+            'FooMethod',
+            array('an_argument'),
+            $expectedObject);
+
+        $this->assertSame($expectedObject, $invocation->object);
+    }
+
+    public function testAllowToGetMethodParametersSetInConstructor()
+    {
+        $expectedParameters = array(
+          'foo', 5, array('a', 'b'), new StdClass, NULL, FALSE
+        );
+
+        $invocation = new PHPUnit_Framework_MockObject_Invocation_Object(
+          'FooClass',
+          'FooMethod',
+          $expectedParameters,
+          new StdClass
+        );
+
+        $this->assertSame($expectedParameters, $invocation->parameters);
+    }
+
+    public function testConstructorAllowToSetFlagCloneObjectsInParameters()
+    {
+        $parameters   = array(new StdClass);
+        $cloneObjects = TRUE;
+
+        $invocation = new PHPUnit_Framework_MockObject_Invocation_Object(
+          'FooClass',
+          'FooMethod',
+          $parameters,
+          new StdClass,
+          $cloneObjects
+        );
+
+        $this->assertEquals($parameters, $invocation->parameters);
+        $this->assertNotSame($parameters, $invocation->parameters);
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/StaticTest.php b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/StaticTest.php
new file mode 100644
index 00000000..09e6e3c6
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/StaticTest.php
@@ -0,0 +1,52 @@
+<?php
+
+class Framework_MockObject_Invocation_StaticTest extends PHPUnit_Framework_TestCase
+{
+    public function testConstructorRequiresClassAndMethodAndParameters()
+    {
+        new PHPUnit_Framework_MockObject_Invocation_Static('FooClass', 'FooMethod', array('an_argument'));
+    }
+
+    public function testAllowToGetClassNameSetInConstructor()
+    {
+        $invocation = new PHPUnit_Framework_MockObject_Invocation_Static('FooClass', 'FooMethod', array('an_argument'));
+
+        $this->assertSame('FooClass', $invocation->className);
+    }
+
+    public function testAllowToGetMethodNameSetInConstructor()
+    {
+        $invocation = new PHPUnit_Framework_MockObject_Invocation_Static('FooClass', 'FooMethod', array('an_argument'));
+
+        $this->assertSame('FooMethod', $invocation->methodName);
+    }
+
+    public function testAllowToGetMethodParametersSetInConstructor()
+    {
+        $expectedParameters = array(
+          'foo', 5, array('a', 'b'), new StdClass, NULL, FALSE
+        );
+
+        $invocation = new PHPUnit_Framework_MockObject_Invocation_Static(
+          'FooClass', 'FooMethod', $expectedParameters
+        );
+
+        $this->assertSame($expectedParameters, $invocation->parameters);
+    }
+
+    public function testConstructorAllowToSetFlagCloneObjectsInParameters()
+    {
+        $parameters = array(new StdClass);
+        $cloneObjects = TRUE;
+
+        $invocation = new PHPUnit_Framework_MockObject_Invocation_Static(
+          'FooClass',
+          'FooMethod',
+          $parameters,
+          $cloneObjects
+        );
+
+        $this->assertEquals($parameters, $invocation->parameters);
+        $this->assertNotSame($parameters, $invocation->parameters);
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Matcher/ConsecutiveParametersTest.php b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Matcher/ConsecutiveParametersTest.php
new file mode 100644
index 00000000..d12ba5b9
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Matcher/ConsecutiveParametersTest.php
@@ -0,0 +1,32 @@
+<?php
+class Framework_MockObject_Matcher_ConsecutiveParametersTest extends PHPUnit_Framework_TestCase
+{
+    public function testIntegration()
+    {
+        $mock = $this->getMock('stdClass', array('foo'));
+        $mock
+            ->expects($this->any())
+            ->method('foo')
+            ->withConsecutive(
+                array('bar'),
+                array(21, 42)
+            );
+        $mock->foo('bar');
+        $mock->foo(21, 42);
+    }
+
+    public function testIntegrationExpectingException()
+    {
+        $mock = $this->getMock('stdClass', array('foo'));
+        $mock
+            ->expects($this->any())
+            ->method('foo')
+            ->withConsecutive(
+                array('bar'),
+                array(21, 42)
+            );
+        $mock->foo('bar');
+        $this->setExpectedException('PHPUnit_Framework_ExpectationFailedException');
+        $mock->foo('invalid');
+    }
+}
\ No newline at end of file
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class.phpt
new file mode 100644
index 00000000..2e40328c
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class.phpt
@@ -0,0 +1,121 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
+--FILE--
+<?php
+class Foo
+{
+    public function bar(Foo $foo)
+    {
+    }
+
+    public function baz(Foo $foo)
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo',
+  array(),
+  'MockFoo',
+  TRUE,
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function bar(Foo $foo)
+    {
+        $arguments = array($foo);
+        $count     = func_num_args();
+
+        if ($count > 1) {
+            $_arguments = func_get_args();
+
+            for ($i = 1; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $result = $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'Foo', 'bar', $arguments, $this, TRUE
+          )
+        );
+
+        return $result;
+    }
+
+    public function baz(Foo $foo)
+    {
+        $arguments = array($foo);
+        $count     = func_num_args();
+
+        if ($count > 1) {
+            $_arguments = func_get_args();
+
+            for ($i = 1; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $result = $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'Foo', 'baz', $arguments, $this, TRUE
+          )
+        );
+
+        return $result;
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_clone.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_clone.phpt
new file mode 100644
index 00000000..0f91a986
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_clone.phpt
@@ -0,0 +1,73 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE)
+--FILE--
+<?php
+class Foo
+{
+    public function __clone()
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo',
+  array(),
+  'MockFoo',
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+        parent::__clone();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_constructor.phpt
new file mode 100644
index 00000000..6f037ee2
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_constructor.phpt
@@ -0,0 +1,72 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE)
+--FILE--
+<?php
+class Foo
+{
+    public function __construct()
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo',
+  array(),
+  'MockFoo',
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_clone.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_clone.phpt
new file mode 100644
index 00000000..dc829389
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_clone.phpt
@@ -0,0 +1,72 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', FALSE)
+--FILE--
+<?php
+class Foo
+{
+    public function __clone()
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo',
+  array(),
+  'MockFoo',
+  FALSE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_constructor.phpt
new file mode 100644
index 00000000..6f037ee2
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_constructor.phpt
@@ -0,0 +1,72 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE)
+--FILE--
+<?php
+class Foo
+{
+    public function __construct()
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo',
+  array(),
+  'MockFoo',
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_call_parent_constructor.phpt
new file mode 100644
index 00000000..cfc43d89
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_call_parent_constructor.phpt
@@ -0,0 +1,77 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE)
+--FILE--
+<?php
+interface IFoo
+{
+    public function __construct($bar);
+}
+
+class Foo implements IFoo
+{
+    public function __construct($bar)
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo',
+  array(),
+  'MockFoo',
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt
new file mode 100644
index 00000000..cfc43d89
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt
@@ -0,0 +1,77 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE)
+--FILE--
+<?php
+interface IFoo
+{
+    public function __construct($bar);
+}
+
+class Foo implements IFoo
+{
+    public function __construct($bar)
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo',
+  array(),
+  'MockFoo',
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_partial.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_partial.phpt
new file mode 100644
index 00000000..b8332aed
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_partial.phpt
@@ -0,0 +1,99 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array('bar'), 'MockFoo', TRUE, TRUE)
+--FILE--
+<?php
+class Foo
+{
+    public function bar(Foo $foo)
+    {
+    }
+
+    public function baz(Foo $foo)
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo',
+  array('bar'),
+  'MockFoo',
+  TRUE,
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function bar(Foo $foo)
+    {
+        $arguments = array($foo);
+        $count     = func_num_args();
+
+        if ($count > 1) {
+            $_arguments = func_get_args();
+
+            for ($i = 1; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $result = $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'Foo', 'bar', $arguments, $this, TRUE
+          )
+        );
+
+        return $result;
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_with_method_named_method.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_with_method_named_method.phpt
new file mode 100644
index 00000000..6e1ddf63
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_with_method_named_method.phpt
@@ -0,0 +1,88 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
+--FILE--
+<?php
+class Foo
+{
+    public function method()
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo',
+  array(),
+  'MockFoo',
+  TRUE,
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function method()
+    {
+        $arguments = array();
+        $count     = func_num_args();
+
+        if ($count > 0) {
+            $_arguments = func_get_args();
+
+            for ($i = 0; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $result = $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'Foo', 'method', $arguments, $this, TRUE
+          )
+        );
+
+        return $result;
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/interface.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/interface.phpt
new file mode 100644
index 00000000..2d38209e
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/interface.phpt
@@ -0,0 +1,93 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
+--FILE--
+<?php
+interface Foo
+{
+    public function bar(Foo $foo);
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo',
+  array(),
+  'MockFoo',
+  TRUE,
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo implements PHPUnit_Framework_MockObject_MockObject, Foo
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function bar(Foo $foo)
+    {
+        $arguments = array($foo);
+        $count     = func_num_args();
+
+        if ($count > 1) {
+            $_arguments = func_get_args();
+
+            for ($i = 1; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $result = $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'Foo', 'bar', $arguments, $this, TRUE
+          )
+        );
+
+        return $result;
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/invocation_object_clone_object.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/invocation_object_clone_object.phpt
new file mode 100644
index 00000000..87a979e9
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/invocation_object_clone_object.phpt
@@ -0,0 +1,122 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE, TRUE)
+--FILE--
+<?php
+class Foo
+{
+    public function bar(Foo $foo)
+    {
+    }
+
+    public function baz(Foo $foo)
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo',
+  array(),
+  'MockFoo',
+  TRUE,
+  TRUE,
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function bar(Foo $foo)
+    {
+        $arguments = array($foo);
+        $count     = func_num_args();
+
+        if ($count > 1) {
+            $_arguments = func_get_args();
+
+            for ($i = 1; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $result = $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'Foo', 'bar', $arguments, $this, TRUE
+          )
+        );
+
+        return $result;
+    }
+
+    public function baz(Foo $foo)
+    {
+        $arguments = array($foo);
+        $count     = func_num_args();
+
+        if ($count > 1) {
+            $_arguments = func_get_args();
+
+            for ($i = 1; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $result = $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'Foo', 'baz', $arguments, $this, TRUE
+          )
+        );
+
+        return $result;
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class.phpt
new file mode 100644
index 00000000..e30bddc0
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class.phpt
@@ -0,0 +1,123 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', TRUE, TRUE)
+--FILE--
+<?php
+namespace NS;
+
+class Foo
+{
+    public function bar(Foo $foo)
+    {
+    }
+
+    public function baz(Foo $foo)
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'NS\Foo',
+  array(),
+  'MockFoo',
+  TRUE,
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function bar(NS\Foo $foo)
+    {
+        $arguments = array($foo);
+        $count     = func_num_args();
+
+        if ($count > 1) {
+            $_arguments = func_get_args();
+
+            for ($i = 1; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $result = $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'NS\Foo', 'bar', $arguments, $this, TRUE
+          )
+        );
+
+        return $result;
+    }
+
+    public function baz(NS\Foo $foo)
+    {
+        $arguments = array($foo);
+        $count     = func_num_args();
+
+        if ($count > 1) {
+            $_arguments = func_get_args();
+
+            for ($i = 1; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $result = $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'NS\Foo', 'baz', $arguments, $this, TRUE
+          )
+        );
+
+        return $result;
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_clone.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_clone.phpt
new file mode 100644
index 00000000..3dee9c91
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_clone.phpt
@@ -0,0 +1,75 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', TRUE)
+--FILE--
+<?php
+namespace NS;
+
+class Foo
+{
+    public function __clone()
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'NS\Foo',
+  array(),
+  'MockFoo',
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+        parent::__clone();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_constructor.phpt
new file mode 100644
index 00000000..105a372b
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_constructor.phpt
@@ -0,0 +1,74 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', TRUE)
+--FILE--
+<?php
+namespace NS;
+
+class Foo
+{
+    public function __construct()
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'NS\Foo',
+  array(),
+  'MockFoo',
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_clone.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_clone.phpt
new file mode 100644
index 00000000..1de9253f
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_clone.phpt
@@ -0,0 +1,74 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', FALSE)
+--FILE--
+<?php
+namespace NS;
+
+class Foo
+{
+    public function __clone()
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'NS\Foo',
+  array(),
+  'MockFoo',
+  FALSE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt
new file mode 100644
index 00000000..105a372b
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt
@@ -0,0 +1,74 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', TRUE)
+--FILE--
+<?php
+namespace NS;
+
+class Foo
+{
+    public function __construct()
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'NS\Foo',
+  array(),
+  'MockFoo',
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt
new file mode 100644
index 00000000..6b9f6bcb
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt
@@ -0,0 +1,79 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', TRUE)
+--FILE--
+<?php
+namespace NS;
+
+interface IFoo
+{
+    public function __construct($bar);
+}
+
+class Foo implements IFoo
+{
+    public function __construct($bar)
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'NS\Foo',
+  array(),
+  'MockFoo',
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt
new file mode 100644
index 00000000..6b9f6bcb
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt
@@ -0,0 +1,79 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', TRUE)
+--FILE--
+<?php
+namespace NS;
+
+interface IFoo
+{
+    public function __construct($bar);
+}
+
+class Foo implements IFoo
+{
+    public function __construct($bar)
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'NS\Foo',
+  array(),
+  'MockFoo',
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_partial.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_partial.phpt
new file mode 100644
index 00000000..86fee1cb
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_partial.phpt
@@ -0,0 +1,101 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array('bar'), 'MockFoo', TRUE, TRUE)
+--FILE--
+<?php
+namespace NS;
+
+class Foo
+{
+    public function bar(Foo $foo)
+    {
+    }
+
+    public function baz(Foo $foo)
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'NS\Foo',
+  array('bar'),
+  'MockFoo',
+  TRUE,
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function bar(NS\Foo $foo)
+    {
+        $arguments = array($foo);
+        $count     = func_num_args();
+
+        if ($count > 1) {
+            $_arguments = func_get_args();
+
+            for ($i = 1; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $result = $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'NS\Foo', 'bar', $arguments, $this, TRUE
+          )
+        );
+
+        return $result;
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_interface.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_interface.phpt
new file mode 100644
index 00000000..80486463
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_interface.phpt
@@ -0,0 +1,95 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', TRUE, TRUE)
+--FILE--
+<?php
+namespace NS;
+
+interface Foo
+{
+    public function bar(Foo $foo);
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'NS\Foo',
+  array(),
+  'MockFoo',
+  TRUE,
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo implements PHPUnit_Framework_MockObject_MockObject, NS\Foo
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function bar(NS\Foo $foo)
+    {
+        $arguments = array($foo);
+        $count     = func_num_args();
+
+        if ($count > 1) {
+            $_arguments = func_get_args();
+
+            for ($i = 1; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $result = $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'NS\Foo', 'bar', $arguments, $this, TRUE
+          )
+        );
+
+        return $result;
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class.phpt
new file mode 100644
index 00000000..5dbb3852
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class.phpt
@@ -0,0 +1,70 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
+--FILE--
+<?php
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo',
+  array(),
+  'MockFoo',
+  TRUE,
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class Foo
+{
+}
+
+class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace.phpt
new file mode 100644
index 00000000..78689775
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace.phpt
@@ -0,0 +1,78 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
+--FILE--
+<?php
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'NS\Foo',
+  array(),
+  'MockFoo',
+  TRUE,
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+namespace NS {
+
+class Foo
+{
+}
+
+}
+
+namespace {
+
+class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
+
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt
new file mode 100644
index 00000000..b59d1ddf
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt
@@ -0,0 +1,78 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
+--FILE--
+<?php
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  '\NS\Foo',
+  array(),
+  'MockFoo',
+  TRUE,
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+namespace NS {
+
+class Foo
+{
+}
+
+}
+
+namespace {
+
+class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
+
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/proxy.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/proxy.phpt
new file mode 100644
index 00000000..f31bf3ff
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/proxy.phpt
@@ -0,0 +1,117 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', NULL, 'ProxyFoo', TRUE, TRUE, TRUE, TRUE)
+--FILE--
+<?php
+class Foo
+{
+    public function bar(Foo $foo)
+    {
+    }
+
+    public function baz(Foo $foo)
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo', array(), 'ProxyFoo', TRUE, TRUE, TRUE, TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class ProxyFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function bar(Foo $foo)
+    {
+        $arguments = array($foo);
+        $count     = func_num_args();
+
+        if ($count > 1) {
+            $_arguments = func_get_args();
+
+            for ($i = 1; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'Foo', 'bar', $arguments, $this, TRUE
+          )
+        );
+
+        return call_user_func_array(array($this->__phpunit_originalObject, "bar"), $arguments);
+    }
+
+    public function baz(Foo $foo)
+    {
+        $arguments = array($foo);
+        $count     = func_num_args();
+
+        if ($count > 1) {
+            $_arguments = func_get_args();
+
+            for ($i = 1; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'Foo', 'baz', $arguments, $this, TRUE
+          )
+        );
+
+        return call_user_func_array(array($this->__phpunit_originalObject, "baz"), $arguments);
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class.phpt
new file mode 100644
index 00000000..06b255f1
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class.phpt
@@ -0,0 +1,37 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generateClassFromWsdl('GoogleSearch.wsdl', 'GoogleSearch')
+--SKIPIF--
+<?php
+if (!extension_loaded('soap')) echo 'skip: SOAP extension is required';
+?>
+--FILE--
+<?php
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+print $generator->generateClassFromWsdl(
+  dirname(dirname(__FILE__)) . '/_fixture/GoogleSearch.wsdl',
+  'GoogleSearch'
+);
+?>
+--EXPECTF--
+class GoogleSearch extends \SoapClient
+{
+    public function __construct($wsdl, array $options)
+    {
+        parent::__construct('%s/GoogleSearch.wsdl', $options);
+    }
+
+    public function doGoogleSearch($key, $q, $start, $maxResults, $filter, $restrict, $safeSearch, $lr, $ie, $oe)
+    {
+    }
+
+    public function doGetCachedPage($key, $url)
+    {
+    }
+
+    public function doSpellingSuggestion($key, $phrase)
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_namespace.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_namespace.phpt
new file mode 100644
index 00000000..9460e6b4
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_namespace.phpt
@@ -0,0 +1,39 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generateClassFromWsdl('GoogleSearch.wsdl', 'GoogleSearch')
+--SKIPIF--
+<?php
+if (!extension_loaded('soap')) echo 'skip: SOAP extension is required';
+?>
+--FILE--
+<?php
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+print $generator->generateClassFromWsdl(
+  dirname(dirname(__FILE__)) . '/_fixture/GoogleSearch.wsdl',
+  'My\\Space\\GoogleSearch'
+);
+?>
+--EXPECTF--
+namespace My\Space;
+
+class GoogleSearch extends \SoapClient
+{
+    public function __construct($wsdl, array $options)
+    {
+        parent::__construct('%s/GoogleSearch.wsdl', $options);
+    }
+
+    public function doGoogleSearch($key, $q, $start, $maxResults, $filter, $restrict, $safeSearch, $lr, $ie, $oe)
+    {
+    }
+
+    public function doGetCachedPage($key, $url)
+    {
+    }
+
+    public function doSpellingSuggestion($key, $phrase)
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_partial.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_partial.phpt
new file mode 100644
index 00000000..fc814bd1
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_partial.phpt
@@ -0,0 +1,30 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generateClassFromWsdl('GoogleSearch.wsdl', 'GoogleSearch', array('doGoogleSearch'))
+--SKIPIF--
+<?php
+if (!extension_loaded('soap')) echo 'skip: SOAP extension is required';
+?>
+--FILE--
+<?php
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+print $generator->generateClassFromWsdl(
+  dirname(dirname(__FILE__)) . '/_fixture/GoogleSearch.wsdl',
+  'GoogleSearch',
+  array('doGoogleSearch')
+);
+?>
+--EXPECTF--
+class GoogleSearch extends \SoapClient
+{
+    public function __construct($wsdl, array $options)
+    {
+        parent::__construct('%s/GoogleSearch.wsdl', $options);
+    }
+
+    public function doGoogleSearch($key, $q, $start, $maxResults, $filter, $restrict, $safeSearch, $lr, $ie, $oe)
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php b/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php
new file mode 100644
index 00000000..ec195f12
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php
@@ -0,0 +1,804 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Patrick Mueller <elias0@gmx.net>
+ * @author     Frank Kleine <mikey@stubbles.net>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class Framework_MockObjectTest extends PHPUnit_Framework_TestCase
+{
+    public function testMockedMethodIsNeverCalled()
+    {
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->never())
+             ->method('doSomething');
+    }
+
+    public function testMockedMethodIsNeverCalledWithParameter()
+    {
+        $mock = $this->getMock('SomeClass');
+        $mock->expects($this->never())
+            ->method('doSomething')
+            ->with('someArg');
+    }
+
+    public function testMockedMethodIsNotCalledWhenExpectsAnyWithParameter()
+    {
+        $mock = $this->getMock('SomeClass');
+        $mock->expects($this->any())
+             ->method('doSomethingElse')
+             ->with('someArg');
+    }
+
+    public function testMockedMethodIsNotCalledWhenMethodSpecifiedDirectlyWithParameter()
+    {
+        $mock = $this->getMock('SomeClass');
+        $mock->method('doSomethingElse')
+            ->with('someArg');
+    }
+
+    public function testMockedMethodIsCalledAtLeastOnce()
+    {
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->atLeastOnce())
+             ->method('doSomething');
+
+        $mock->doSomething();
+    }
+
+    public function testMockedMethodIsCalledAtLeastOnce2()
+    {
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->atLeastOnce())
+             ->method('doSomething');
+
+        $mock->doSomething();
+        $mock->doSomething();
+    }
+
+    public function testMockedMethodIsCalledOnce()
+    {
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->once())
+             ->method('doSomething');
+
+        $mock->doSomething();
+    }
+
+    public function testMockedMethodIsCalledOnceWithParameter()
+    {
+        $mock = $this->getMock('SomeClass');
+        $mock->expects($this->once())
+             ->method('doSomethingElse')
+             ->with($this->equalTo('something'));
+
+        $mock->doSomethingElse('something');
+    }
+
+    public function testMockedMethodIsCalledExactly()
+    {
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->exactly(2))
+             ->method('doSomething');
+
+        $mock->doSomething();
+        $mock->doSomething();
+    }
+
+    public function testStubbedException()
+    {
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->will($this->throwException(new Exception));
+
+        try {
+            $mock->doSomething();
+        } catch (Exception $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    public function testStubbedWillThrowException()
+    {
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willThrowException(new Exception);
+
+        try {
+            $mock->doSomething();
+        } catch (Exception $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    public function testStubbedReturnValue()
+    {
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->will($this->returnValue('something'));
+
+        $this->assertEquals('something', $mock->doSomething());
+
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willReturn('something');
+
+        $this->assertEquals('something', $mock->doSomething());
+    }
+
+    public function testStubbedReturnValueMap()
+    {
+        $map = array(
+            array('a', 'b', 'c', 'd'),
+            array('e', 'f', 'g', 'h')
+        );
+
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->will($this->returnValueMap($map));
+
+        $this->assertEquals('d', $mock->doSomething('a', 'b', 'c'));
+        $this->assertEquals('h', $mock->doSomething('e', 'f', 'g'));
+        $this->assertEquals(NULL, $mock->doSomething('foo', 'bar'));
+
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willReturnMap($map);
+
+        $this->assertEquals('d', $mock->doSomething('a', 'b', 'c'));
+        $this->assertEquals('h', $mock->doSomething('e', 'f', 'g'));
+        $this->assertEquals(NULL, $mock->doSomething('foo', 'bar'));
+    }
+
+    public function testStubbedReturnArgument()
+    {
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->will($this->returnArgument(1));
+
+        $this->assertEquals('b', $mock->doSomething('a', 'b'));
+
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willReturnArgument(1);
+
+        $this->assertEquals('b', $mock->doSomething('a', 'b'));
+    }
+
+    public function testFunctionCallback()
+    {
+        $mock = $this->getMock('SomeClass', array('doSomething'), array(), '', FALSE);
+        $mock->expects($this->once())
+             ->method('doSomething')
+             ->will($this->returnCallback('functionCallback'));
+
+        $this->assertEquals('pass', $mock->doSomething('foo', 'bar'));
+
+        $mock = $this->getMock('SomeClass', array('doSomething'), array(), '', FALSE);
+        $mock->expects($this->once())
+             ->method('doSomething')
+             ->willReturnCallback('functionCallback');
+
+        $this->assertEquals('pass', $mock->doSomething('foo', 'bar'));
+    }
+
+    public function testStubbedReturnSelf()
+    {
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->will($this->returnSelf());
+
+        $this->assertEquals($mock, $mock->doSomething());
+
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willReturnSelf();
+
+        $this->assertEquals($mock, $mock->doSomething());
+    }
+
+    public function testStubbedReturnOnConsecutiveCalls()
+    {
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->will($this->onConsecutiveCalls('a', 'b', 'c'));
+
+        $this->assertEquals('a', $mock->doSomething());
+        $this->assertEquals('b', $mock->doSomething());
+        $this->assertEquals('c', $mock->doSomething());
+
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willReturnOnConsecutiveCalls('a', 'b', 'c');
+
+        $this->assertEquals('a', $mock->doSomething());
+        $this->assertEquals('b', $mock->doSomething());
+        $this->assertEquals('c', $mock->doSomething());
+    }
+
+    public function testStaticMethodCallback()
+    {
+        $mock = $this->getMock('SomeClass', array('doSomething'), array(), '', FALSE);
+        $mock->expects($this->once())
+             ->method('doSomething')
+             ->will($this->returnCallback(array('MethodCallback', 'staticCallback')));
+
+        $this->assertEquals('pass', $mock->doSomething('foo', 'bar'));
+    }
+
+    public function testPublicMethodCallback()
+    {
+        $mock = $this->getMock('SomeClass', array('doSomething'), array(), '', FALSE);
+        $mock->expects($this->once())
+             ->method('doSomething')
+             ->will($this->returnCallback(array(new MethodCallback, 'nonStaticCallback')));
+
+        $this->assertEquals('pass', $mock->doSomething('foo', 'bar'));
+    }
+
+    public function testMockClassOnlyGeneratedOnce()
+    {
+        $mock1 = $this->getMock('AnInterface');
+        $mock2 = $this->getMock('AnInterface');
+
+        $this->assertEquals(get_class($mock1), get_class($mock2));
+    }
+
+    public function testMockClassDifferentForPartialMocks()
+    {
+        $mock1 = $this->getMock('PartialMockTestClass');
+        $mock2 = $this->getMock('PartialMockTestClass', array('doSomething'));
+        $mock3 = $this->getMock('PartialMockTestClass', array('doSomething'));
+        $mock4 = $this->getMock('PartialMockTestClass', array('doAnotherThing'));
+        $mock5 = $this->getMock('PartialMockTestClass', array('doAnotherThing'));
+
+        $this->assertNotEquals(get_class($mock1), get_class($mock2));
+        $this->assertNotEquals(get_class($mock1), get_class($mock3));
+        $this->assertNotEquals(get_class($mock1), get_class($mock4));
+        $this->assertNotEquals(get_class($mock1), get_class($mock5));
+        $this->assertEquals(get_class($mock2), get_class($mock3));
+        $this->assertNotEquals(get_class($mock2), get_class($mock4));
+        $this->assertNotEquals(get_class($mock2), get_class($mock5));
+        $this->assertEquals(get_class($mock4), get_class($mock5));
+    }
+
+    public function testMockClassStoreOverrulable()
+    {
+        $mock1 = $this->getMock('PartialMockTestClass');
+        $mock2 = $this->getMock('PartialMockTestClass', array(), array(), 'MyMockClassNameForPartialMockTestClass1');
+        $mock3 = $this->getMock('PartialMockTestClass');
+        $mock4 = $this->getMock('PartialMockTestClass', array('doSomething'), array(), 'AnotherMockClassNameForPartialMockTestClass');
+        $mock5 = $this->getMock('PartialMockTestClass', array(), array(), 'MyMockClassNameForPartialMockTestClass2');
+
+        $this->assertNotEquals(get_class($mock1), get_class($mock2));
+        $this->assertEquals(get_class($mock1), get_class($mock3));
+        $this->assertNotEquals(get_class($mock1), get_class($mock4));
+        $this->assertNotEquals(get_class($mock2), get_class($mock3));
+        $this->assertNotEquals(get_class($mock2), get_class($mock4));
+        $this->assertNotEquals(get_class($mock2), get_class($mock5));
+        $this->assertNotEquals(get_class($mock3), get_class($mock4));
+        $this->assertNotEquals(get_class($mock3), get_class($mock5));
+        $this->assertNotEquals(get_class($mock4), get_class($mock5));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMock
+     */
+    public function testGetMockWithFixedClassNameCanProduceTheSameMockTwice()
+    {
+        $mock = $this->getMockBuilder('StdClass')->setMockClassName('FixedName')->getMock();
+        $mock = $this->getMockBuilder('StdClass')->setMockClassName('FixedName')->getMock();
+        $this->assertInstanceOf('StdClass', $mock);
+    }
+
+    public function testOriginalConstructorSettingConsidered()
+    {
+        $mock1 = $this->getMock('PartialMockTestClass');
+        $mock2 = $this->getMock('PartialMockTestClass', array(), array(), '', FALSE);
+
+        $this->assertTrue($mock1->constructorCalled);
+        $this->assertFalse($mock2->constructorCalled);
+    }
+
+    public function testOriginalCloneSettingConsidered()
+    {
+        $mock1 = $this->getMock('PartialMockTestClass');
+        $mock2 = $this->getMock('PartialMockTestClass', array(), array(), '', TRUE, FALSE);
+
+        $this->assertNotEquals(get_class($mock1), get_class($mock2));
+    }
+
+    public function testGetMockForAbstractClass()
+    {
+        $mock = $this->getMock('AbstractMockTestClass');
+        $mock->expects($this->never())
+             ->method('doSomething');
+    }
+
+    public function testGetMockForTraversableInterface()
+    {
+        $mock = $this->getMock('TraversableMockTestInterface');
+        $this->assertInstanceOf('Traversable', $mock);
+    }
+
+    public function testMultipleInterfacesCanBeMockedInSingleObject()
+    {
+        $mock = $this->getMock(array('AnInterface', 'AnotherInterface'));
+        $this->assertInstanceOf('AnInterface', $mock);
+        $this->assertInstanceOf('AnotherInterface', $mock);
+    }
+
+    /**
+     * @requires PHP 5.4.0
+     */
+    public function testGetMockForTrait()
+    {
+        $mock = $this->getMockForTrait('AbstractTrait');
+        $mock->expects($this->never())->method('doSomething');
+
+        $parent = get_parent_class($mock);
+        $traits = class_uses($parent, FALSE);
+
+        $this->assertContains('AbstractTrait', $traits);
+    }
+
+    public function testClonedMockObjectShouldStillEqualTheOriginal()
+    {
+        $a = $this->getMock('stdClass');
+        $b = clone $a;
+        $this->assertEquals($a, $b);
+    }
+
+    public function testMockObjectsConstructedIndepentantlyShouldBeEqual()
+    {
+        $a = $this->getMock('stdClass');
+        $b = $this->getMock('stdClass');
+        $this->assertEquals($a, $b);
+    }
+
+    public function testMockObjectsConstructedIndepentantlyShouldNotBeTheSame()
+    {
+        $a = $this->getMock('stdClass');
+        $b = $this->getMock('stdClass');
+        $this->assertNotSame($a, $b);
+    }
+
+    public function testClonedMockObjectCanBeUsedInPlaceOfOriginalOne()
+    {
+        $x = $this->getMock('stdClass');
+        $y = clone $x;
+
+        $mock = $this->getMock('stdClass', array('foo'));
+        $mock->expects($this->once())->method('foo')->with($this->equalTo($x));
+        $mock->foo($y);
+    }
+
+    public function testClonedMockObjectIsNotIdenticalToOriginalOne()
+    {
+        $x = $this->getMock('stdClass');
+        $y = clone $x;
+
+        $mock = $this->getMock('stdClass', array('foo'));
+        $mock->expects($this->once())->method('foo')->with($this->logicalNot($this->identicalTo($x)));
+        $mock->foo($y);
+    }
+
+    public function testObjectMethodCallWithArgumentCloningEnabled()
+    {
+        $expectedObject = new StdClass;
+
+        $mock = $this->getMockBuilder('SomeClass')
+                     ->setMethods(array('doSomethingElse'))
+                     ->enableArgumentCloning()
+                     ->getMock();
+
+        $actualArguments = array();
+
+        $mock->expects($this->any())
+        ->method('doSomethingElse')
+        ->will($this->returnCallback(function () use (&$actualArguments) {
+            $actualArguments = func_get_args();
+        }));
+
+        $mock->doSomethingElse($expectedObject);
+
+        $this->assertEquals(1, count($actualArguments));
+        $this->assertEquals($expectedObject, $actualArguments[0]);
+        $this->assertNotSame($expectedObject, $actualArguments[0]);
+    }
+
+    public function testObjectMethodCallWithArgumentCloningDisabled()
+    {
+        $expectedObject = new StdClass;
+
+        $mock = $this->getMockBuilder('SomeClass')
+                     ->setMethods(array('doSomethingElse'))
+                     ->disableArgumentCloning()
+                     ->getMock();
+
+        $actualArguments = array();
+
+        $mock->expects($this->any())
+        ->method('doSomethingElse')
+        ->will($this->returnCallback(function () use (&$actualArguments) {
+            $actualArguments = func_get_args();
+        }));
+
+        $mock->doSomethingElse($expectedObject);
+
+        $this->assertEquals(1, count($actualArguments));
+        $this->assertSame($expectedObject, $actualArguments[0]);
+    }
+
+    public function testArgumentCloningOptionGeneratesUniqueMock()
+    {
+        $mockWithCloning = $this->getMockBuilder('SomeClass')
+                                ->setMethods(array('doSomethingElse'))
+                                ->enableArgumentCloning()
+                                ->getMock();
+
+        $mockWithoutCloning = $this->getMockBuilder('SomeClass')
+                                   ->setMethods(array('doSomethingElse'))
+                                   ->disableArgumentCloning()
+                                   ->getMock();
+
+        $this->assertNotEquals($mockWithCloning, $mockWithoutCloning);
+    }
+
+    public function testVerificationOfMethodNameFailsWithoutParameters()
+    {
+        $mock = $this->getMock('SomeClass', array('right', 'wrong'), array(), '', TRUE, TRUE, TRUE);
+        $mock->expects($this->once())
+             ->method('right');
+
+        $mock->wrong();
+        try {
+            $mock->__phpunit_verify();
+            $this->fail('Expected exception');
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertSame(
+                "Expectation failed for method name is equal to <string:right> when invoked 1 time(s).\n"
+                . "Method was expected to be called 1 times, actually called 0 times.\n",
+                $e->getMessage()
+            );
+        }
+
+        $this->resetMockObjects();
+    }
+
+    public function testVerificationOfMethodNameFailsWithParameters()
+    {
+        $mock = $this->getMock('SomeClass', array('right', 'wrong'), array(), '', TRUE, TRUE, TRUE);
+        $mock->expects($this->once())
+             ->method('right');
+
+        $mock->wrong();
+        try {
+            $mock->__phpunit_verify();
+            $this->fail('Expected exception');
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertSame(
+                "Expectation failed for method name is equal to <string:right> when invoked 1 time(s).\n"
+                . "Method was expected to be called 1 times, actually called 0 times.\n",
+                $e->getMessage()
+            );
+        }
+
+        $this->resetMockObjects();
+    }
+
+    public function testVerificationOfMethodNameFailsWithWrongParameters()
+    {
+        $mock = $this->getMock('SomeClass', array('right', 'wrong'), array(), '', TRUE, TRUE, TRUE);
+        $mock->expects($this->once())
+             ->method('right')
+             ->with(array('first', 'second'));
+
+        try {
+            $mock->right(array('second'));
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertSame(
+                "Expectation failed for method name is equal to <string:right> when invoked 1 time(s)\n"
+                . "Parameter 0 for invocation SomeClass::right(Array (...)) does not match expected value.\n"
+                . "Failed asserting that two arrays are equal.",
+                $e->getMessage()
+            );
+        }
+
+        try {
+            $mock->__phpunit_verify();
+            $this->fail('Expected exception');
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertSame(
+                "Expectation failed for method name is equal to <string:right> when invoked 1 time(s).\n"
+                . "Parameter 0 for invocation SomeClass::right(Array (...)) does not match expected value.\n"
+                . "Failed asserting that two arrays are equal.\n"
+                . "--- Expected\n"
+                . "+++ Actual\n"
+                . "@@ @@\n"
+                . " Array (\n"
+                . "-    0 => 'first'\n"
+                . "-    1 => 'second'\n"
+                . "+    0 => 'second'\n"
+                . " )\n",
+                $e->getMessage()
+            );
+        }
+
+        $this->resetMockObjects();
+    }
+
+    public function testVerificationOfNeverFailsWithEmptyParameters()
+    {
+        $mock = $this->getMock('SomeClass', array('right', 'wrong'), array(), '', TRUE, TRUE, TRUE);
+        $mock->expects($this->never())
+             ->method('right')
+             ->with();
+
+        try {
+            $mock->right();
+            $this->fail('Expected exception');
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertSame(
+                'SomeClass::right() was not expected to be called.',
+                $e->getMessage()
+            );
+        }
+
+        $this->resetMockObjects();
+    }
+
+    public function testVerificationOfNeverFailsWithAnyParameters()
+    {
+        $mock = $this->getMock('SomeClass', array('right', 'wrong'), array(), '', TRUE, TRUE, TRUE);
+        $mock->expects($this->never())
+             ->method('right')
+             ->withAnyParameters();
+
+        try {
+            $mock->right();
+            $this->fail('Expected exception');
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertSame(
+                'SomeClass::right() was not expected to be called.',
+                $e->getMessage()
+            );
+        }
+
+        $this->resetMockObjects();
+    }
+
+    /**
+     * See https://github.com/sebastianbergmann/phpunit-mock-objects/issues/81
+     */
+    public function testMockArgumentsPassedByReference()
+    {
+        $foo = $this->getMockBuilder('MethodCallbackByReference')
+                    ->setMethods(array('bar'))
+                    ->disableOriginalConstructor()
+                    ->disableArgumentCloning()
+                    ->getMock();
+
+        $foo->expects($this->any())
+            ->method('bar')
+            ->will($this->returnCallback(array($foo, 'callback')));
+
+        $a = $b = $c = 0;
+
+        $foo->bar($a, $b, $c);
+
+        $this->assertEquals(1, $b);
+    }
+
+    /**
+     * See https://github.com/sebastianbergmann/phpunit-mock-objects/issues/81
+     */
+    public function testMockArgumentsPassedByReference2()
+    {
+        $foo = $this->getMockBuilder('MethodCallbackByReference')
+                    ->disableOriginalConstructor()
+                    ->disableArgumentCloning()
+                    ->getMock();
+
+        $foo->expects($this->any())
+            ->method('bar')
+            ->will($this->returnCallback(
+            function (&$a, &$b, $c) {
+                $b = 1;
+            }
+            ));
+
+        $a = $b = $c = 0;
+
+        $foo->bar($a, $b, $c);
+
+        $this->assertEquals(1, $b);
+    }
+
+    /**
+     * https://github.com/sebastianbergmann/phpunit-mock-objects/issues/116
+     */
+    public function testMockArgumentsPassedByReference3()
+    {
+        $foo = $this->getMockBuilder('MethodCallbackByReference')
+                    ->setMethods(array('bar'))
+                    ->disableOriginalConstructor()
+                    ->disableArgumentCloning()
+                    ->getMock();
+
+        $a = new stdClass();
+        $b = $c = 0;
+
+        $foo->expects($this->any())
+            ->method('bar')
+            ->with($a, $b, $c)
+            ->will($this->returnCallback(array($foo, 'callback')));
+
+        $foo->bar($a, $b, $c);
+    }
+
+    /**
+     * https://github.com/sebastianbergmann/phpunit/issues/796
+     */
+    public function testMockArgumentsPassedByReference4()
+    {
+        $foo = $this->getMockBuilder('MethodCallbackByReference')
+                    ->setMethods(array('bar'))
+                    ->disableOriginalConstructor()
+                    ->disableArgumentCloning()
+                    ->getMock();
+
+        $a = new stdClass();
+        $b = $c = 0;
+
+        $foo->expects($this->any())
+            ->method('bar')
+            ->with($this->isInstanceOf("stdClass"), $b, $c)
+            ->will($this->returnCallback(array($foo, 'callback')));
+
+        $foo->bar($a, $b, $c);
+    }
+
+    /**
+     * @requires extension soap
+     */
+    public function testCreateMockFromWsdl()
+    {
+        $mock = $this->getMockFromWsdl(__DIR__ . '/_fixture/GoogleSearch.wsdl', 'WsdlMock');
+        $this->assertStringStartsWith(
+            'Mock_WsdlMock_',
+            get_class($mock)
+        );
+    }
+
+    /**
+     * @requires extension soap
+     */
+    public function testCreateNamespacedMockFromWsdl()
+    {
+        $mock = $this->getMockFromWsdl(__DIR__ . '/_fixture/GoogleSearch.wsdl', 'My\\Space\\WsdlMock');
+        $this->assertStringStartsWith(
+            'Mock_WsdlMock_',
+            get_class($mock)
+        );
+    }
+
+    /**
+     * @requires extension soap
+     */
+    public function testCreateTwoMocksOfOneWsdlFile()
+    {
+        $mock = $this->getMockFromWsdl(__DIR__ . '/_fixture/GoogleSearch.wsdl');
+        $mock = $this->getMockFromWsdl(__DIR__ . '/_fixture/GoogleSearch.wsdl');
+    }
+
+    /**
+     * @see    https://github.com/sebastianbergmann/phpunit-mock-objects/issues/156
+     * @ticket 156
+     */
+    public function testInterfaceWithStaticMethodCanBeStubbed()
+    {
+        $this->assertInstanceOf(
+            'InterfaceWithStaticMethod',
+            $this->getMock('InterfaceWithStaticMethod')
+        );
+    }
+
+    /**
+     * @expectedException PHPUnit_Framework_MockObject_BadMethodCallException
+     */
+    public function testInvokingStubbedStaticMethodRaisesException()
+    {
+        $mock = $this->getMock('ClassWithStaticMethod');
+        $mock->staticMethod();
+    }
+
+    /**
+     * @see    https://github.com/sebastianbergmann/phpunit-mock-objects/issues/171
+     * @ticket 171
+     */
+    public function testStubForClassThatImplementsSerializableCanBeCreatedWithoutInvokingTheConstructor()
+    {
+        $this->assertInstanceOf(
+            'ClassThatImplementsSerializable',
+            $this->getMockBuilder('ClassThatImplementsSerializable')
+                 ->disableOriginalConstructor()
+                 ->getMock()
+        );
+    }
+
+    private function resetMockObjects()
+    {
+        $refl = new ReflectionObject($this);
+        $refl = $refl->getParentClass();
+        $prop = $refl->getProperty('mockObjects');
+        $prop->setAccessible(true);
+        $prop->setValue($this, array());
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/ProxyObjectTest.php b/vendor/phpunit/phpunit-mock-objects/tests/ProxyObjectTest.php
new file mode 100644
index 00000000..3e735211
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/ProxyObjectTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class Framework_ProxyObjectTest extends PHPUnit_Framework_TestCase
+{
+    public function testMockedMethodIsProxiedToOriginalMethod()
+    {
+        $proxy = $this->getMockBuilder('Bar')
+                      ->enableProxyingToOriginalMethods()
+                      ->getMock();
+
+        $proxy->expects($this->once())
+              ->method('doSomethingElse');
+
+        $foo = new Foo;
+        $this->assertEquals('result', $foo->doSomething($proxy));
+    }
+
+    public function testMockedMethodWithReferenceIsProxiedToOriginalMethod()
+    {
+        $proxy = $this->getMockBuilder('MethodCallbackByReference')
+                      ->enableProxyingToOriginalMethods()
+                      ->getMock();
+        $a = $b = $c = 0;
+
+        $proxy->callback($a, $b, $c);
+
+        $this->assertEquals(1, $b);
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassThatImplementsSerializable.php b/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassThatImplementsSerializable.php
new file mode 100644
index 00000000..87576cad
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassThatImplementsSerializable.php
@@ -0,0 +1,15 @@
+<?php
+class ClassThatImplementsSerializable implements Serializable
+{
+    public function serialize()
+    {
+        return get_object_vars($this);
+    }
+
+    public function unserialize($serialized)
+    {
+        foreach (unserialize($serialized) as $key => $value) {
+            $this->{$key} = $value;
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassWithStaticMethod.php b/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassWithStaticMethod.php
new file mode 100644
index 00000000..0c13c120
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassWithStaticMethod.php
@@ -0,0 +1,7 @@
+<?php
+class ClassWithStaticMethod
+{
+    public static function staticMethod()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractMockTestClass.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractMockTestClass.php
new file mode 100644
index 00000000..b006e2d5
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractMockTestClass.php
@@ -0,0 +1,10 @@
+<?php
+abstract class AbstractMockTestClass
+{
+    abstract public function doSomething();
+
+    public function returnAnything()
+    {
+        return 1;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractTrait.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractTrait.php
new file mode 100644
index 00000000..071535c8
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractTrait.php
@@ -0,0 +1,15 @@
+<?php
+trait AbstractTrait
+{
+    abstract public function doSomething();
+
+    public function mockableMethod()
+    {
+        return TRUE;
+    }
+
+    public function anotherMockableMethod()
+    {
+        return TRUE;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnInterface.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnInterface.php
new file mode 100644
index 00000000..5b7d4cc4
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnInterface.php
@@ -0,0 +1,5 @@
+<?php
+interface AnInterface
+{
+    public function doSomething();
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnotherInterface.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnotherInterface.php
new file mode 100644
index 00000000..62bff0a2
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnotherInterface.php
@@ -0,0 +1,5 @@
+<?php
+interface AnotherInterface
+{
+    public function doSomethingElse();
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Bar.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Bar.php
new file mode 100644
index 00000000..4a4d165c
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Bar.php
@@ -0,0 +1,8 @@
+<?php
+class Bar
+{
+    public function doSomethingElse()
+    {
+        return 'result';
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Foo.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Foo.php
new file mode 100644
index 00000000..16a9ed72
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Foo.php
@@ -0,0 +1,8 @@
+<?php
+class Foo
+{
+    public function doSomething(Bar $bar)
+    {
+        return $bar->doSomethingElse();
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/FunctionCallback.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/FunctionCallback.php
new file mode 100644
index 00000000..c12ac6cb
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/FunctionCallback.php
@@ -0,0 +1,9 @@
+<?php
+function functionCallback()
+{
+    $args = func_get_args();
+
+    if ($args == array('foo', 'bar')) {
+        return 'pass';
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/GoogleSearch.wsdl b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/GoogleSearch.wsdl
new file mode 100644
index 00000000..e448501d
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/GoogleSearch.wsdl
@@ -0,0 +1,198 @@
+<?xml version="1.0"?>
+
+<!-- WSDL description of the Google Web APIs.
+     The Google Web APIs are in beta release. All interfaces are subject to
+     change as we refine and extend our APIs. Please see the terms of use
+     for more information. -->
+
+<!-- Revision 2002-08-16 -->
+
+<definitions name="GoogleSearch"
+             targetNamespace="urn:GoogleSearch"
+             xmlns:typens="urn:GoogleSearch"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+             xmlns="http://schemas.xmlsoap.org/wsdl/">
+
+  <!-- Types for search - result elements, directory categories -->
+
+  <types>
+    <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+                targetNamespace="urn:GoogleSearch">
+
+      <xsd:complexType name="GoogleSearchResult">
+        <xsd:all>
+          <xsd:element name="documentFiltering"           type="xsd:boolean"/>
+          <xsd:element name="searchComments"              type="xsd:string"/>
+          <xsd:element name="estimatedTotalResultsCount"  type="xsd:int"/>
+          <xsd:element name="estimateIsExact"             type="xsd:boolean"/>
+          <xsd:element name="resultElements"              type="typens:ResultElementArray"/>
+          <xsd:element name="searchQuery"                 type="xsd:string"/>
+          <xsd:element name="startIndex"                  type="xsd:int"/>
+          <xsd:element name="endIndex"                    type="xsd:int"/>
+          <xsd:element name="searchTips"                  type="xsd:string"/>
+          <xsd:element name="directoryCategories"         type="typens:DirectoryCategoryArray"/>
+          <xsd:element name="searchTime"                  type="xsd:double"/>
+        </xsd:all>
+      </xsd:complexType>
+
+      <xsd:complexType name="ResultElement">
+        <xsd:all>
+          <xsd:element name="summary" type="xsd:string"/>
+          <xsd:element name="URL" type="xsd:string"/>
+          <xsd:element name="snippet" type="xsd:string"/>
+          <xsd:element name="title" type="xsd:string"/>
+          <xsd:element name="cachedSize" type="xsd:string"/>
+          <xsd:element name="relatedInformationPresent" type="xsd:boolean"/>
+          <xsd:element name="hostName" type="xsd:string"/>
+          <xsd:element name="directoryCategory" type="typens:DirectoryCategory"/>
+          <xsd:element name="directoryTitle" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+
+      <xsd:complexType name="ResultElementArray">
+        <xsd:complexContent>
+          <xsd:restriction base="soapenc:Array">
+             <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:ResultElement[]"/>
+          </xsd:restriction>
+        </xsd:complexContent>
+      </xsd:complexType>
+
+      <xsd:complexType name="DirectoryCategoryArray">
+        <xsd:complexContent>
+          <xsd:restriction base="soapenc:Array">
+             <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:DirectoryCategory[]"/>
+          </xsd:restriction>
+        </xsd:complexContent>
+      </xsd:complexType>
+
+      <xsd:complexType name="DirectoryCategory">
+        <xsd:all>
+          <xsd:element name="fullViewableName" type="xsd:string"/>
+          <xsd:element name="specialEncoding" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+
+    </xsd:schema>
+  </types>
+
+  <!-- Messages for Google Web APIs - cached page, search, spelling. -->
+
+  <message name="doGetCachedPage">
+    <part name="key"            type="xsd:string"/>
+    <part name="url"            type="xsd:string"/>
+  </message>
+
+  <message name="doGetCachedPageResponse">
+    <part name="return"         type="xsd:base64Binary"/>
+  </message>
+
+  <message name="doSpellingSuggestion">
+    <part name="key"            type="xsd:string"/>
+    <part name="phrase"         type="xsd:string"/>
+  </message>
+
+  <message name="doSpellingSuggestionResponse">
+    <part name="return"         type="xsd:string"/>
+  </message>
+
+  <!-- note, ie and oe are ignored by server; all traffic is UTF-8. -->
+
+  <message name="doGoogleSearch">
+    <part name="key"            type="xsd:string"/>
+    <part name="q"              type="xsd:string"/>
+    <part name="start"          type="xsd:int"/>
+    <part name="maxResults"     type="xsd:int"/>
+    <part name="filter"         type="xsd:boolean"/>
+    <part name="restrict"       type="xsd:string"/>
+    <part name="safeSearch"     type="xsd:boolean"/>
+    <part name="lr"             type="xsd:string"/>
+    <part name="ie"             type="xsd:string"/>
+    <part name="oe"             type="xsd:string"/>
+  </message>
+
+  <message name="doGoogleSearchResponse">
+    <part name="return"         type="typens:GoogleSearchResult"/>
+  </message>
+
+  <!-- Port for Google Web APIs, "GoogleSearch" -->
+
+  <portType name="GoogleSearchPort">
+
+    <operation name="doGetCachedPage">
+      <input message="typens:doGetCachedPage"/>
+      <output message="typens:doGetCachedPageResponse"/>
+    </operation>
+
+    <operation name="doSpellingSuggestion">
+      <input message="typens:doSpellingSuggestion"/>
+      <output message="typens:doSpellingSuggestionResponse"/>
+    </operation>
+
+    <operation name="doGoogleSearch">
+      <input message="typens:doGoogleSearch"/>
+      <output message="typens:doGoogleSearchResponse"/>
+    </operation>
+
+  </portType>
+
+
+  <!-- Binding for Google Web APIs - RPC, SOAP over HTTP -->
+
+  <binding name="GoogleSearchBinding" type="typens:GoogleSearchPort">
+    <soap:binding style="rpc"
+                  transport="http://schemas.xmlsoap.org/soap/http"/>
+
+    <operation name="doGetCachedPage">
+      <soap:operation soapAction="urn:GoogleSearchAction"/>
+      <input>
+        <soap:body use="encoded"
+                   namespace="urn:GoogleSearch"
+                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded"
+                   namespace="urn:GoogleSearch"
+                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+
+    <operation name="doSpellingSuggestion">
+      <soap:operation soapAction="urn:GoogleSearchAction"/>
+      <input>
+        <soap:body use="encoded"
+                   namespace="urn:GoogleSearch"
+                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded"
+                   namespace="urn:GoogleSearch"
+                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+
+    <operation name="doGoogleSearch">
+      <soap:operation soapAction="urn:GoogleSearchAction"/>
+      <input>
+        <soap:body use="encoded"
+                   namespace="urn:GoogleSearch"
+                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded"
+                   namespace="urn:GoogleSearch"
+                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+  </binding>
+
+  <!-- Endpoint for Google Web APIs -->
+  <service name="GoogleSearchService">
+    <port name="GoogleSearchPort" binding="typens:GoogleSearchBinding">
+      <soap:address location="http://api.google.com/search/beta2"/>
+    </port>
+  </service>
+
+</definitions>
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/InterfaceWithStaticMethod.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/InterfaceWithStaticMethod.php
new file mode 100644
index 00000000..9e38d1e8
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/InterfaceWithStaticMethod.php
@@ -0,0 +1,6 @@
+<?php
+interface InterfaceWithStaticMethod
+{
+    public static function staticMethod();
+}
+
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallback.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallback.php
new file mode 100644
index 00000000..f8db62ed
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallback.php
@@ -0,0 +1,21 @@
+<?php
+class MethodCallback
+{
+    public static function staticCallback()
+    {
+        $args = func_get_args();
+
+        if ($args == array('foo', 'bar')) {
+            return 'pass';
+        }
+    }
+
+    public function nonStaticCallback()
+    {
+        $args = func_get_args();
+
+        if ($args == array('foo', 'bar')) {
+            return 'pass';
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallbackByReference.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallbackByReference.php
new file mode 100644
index 00000000..ef26f3e7
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallbackByReference.php
@@ -0,0 +1,13 @@
+<?php
+class MethodCallbackByReference
+{
+    public function bar(&$a, &$b, $c)
+    {
+        Legacy::bar($a, $b, $c);
+    }
+
+    public function callback(&$a, &$b, $c)
+    {
+        $b = 1;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Mockable.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Mockable.php
new file mode 100644
index 00000000..a4ccb243
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Mockable.php
@@ -0,0 +1,28 @@
+<?php
+class Mockable
+{
+    public $constructorArgs;
+    public $cloned;
+
+    public function __construct($arg1 = NULL, $arg2 = NULL)
+    {
+        $this->constructorArgs = array($arg1, $arg2);
+    }
+
+    public function mockableMethod()
+    {
+        // something different from NULL
+        return TRUE;
+    }
+
+    public function anotherMockableMethod()
+    {
+        // something different from NULL
+        return TRUE;
+    }
+
+    public function __clone()
+    {
+        $this->cloned = TRUE;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/PartialMockTestClass.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/PartialMockTestClass.php
new file mode 100644
index 00000000..1b119f12
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/PartialMockTestClass.php
@@ -0,0 +1,18 @@
+<?php
+class PartialMockTestClass
+{
+    public $constructorCalled = FALSE;
+
+    public function __construct()
+    {
+        $this->constructorCalled = TRUE;
+    }
+
+    public function doSomething()
+    {
+    }
+
+    public function doAnotherThing()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/SomeClass.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/SomeClass.php
new file mode 100644
index 00000000..2cd53b21
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/SomeClass.php
@@ -0,0 +1,13 @@
+<?php
+class SomeClass
+{
+    public function doSomething($a, $b)
+    {
+        return NULL;
+    }
+
+    public function doSomethingElse($c)
+    {
+        return NULL;
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/StaticMockTestClass.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/StaticMockTestClass.php
new file mode 100644
index 00000000..ac467c9a
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/StaticMockTestClass.php
@@ -0,0 +1,12 @@
+<?php
+class StaticMockTestClass
+{
+    public static function doSomething()
+    {
+    }
+
+    public static function doSomethingElse()
+    {
+        return static::doSomething();
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/TraversableMockTestInterface.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/TraversableMockTestInterface.php
new file mode 100644
index 00000000..3467cce8
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/TraversableMockTestInterface.php
@@ -0,0 +1,4 @@
+<?php
+interface TraversableMockTestInterface extends Traversable
+{
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/autoload.php b/vendor/phpunit/phpunit-mock-objects/tests/autoload.php
new file mode 100644
index 00000000..cf63f630
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/autoload.php
@@ -0,0 +1,41 @@
+<?php
+// @codingStandardsIgnoreFile
+// @codeCoverageIgnoreStart
+// this is an autogenerated file - do not edit
+spl_autoload_register(
+    function($class) {
+        static $classes = null;
+        if ($classes === null) {
+            $classes = array(
+                'abstractmocktestclass' => '/_fixture/AbstractMockTestClass.php',
+                'abstracttrait' => '/_fixture/AbstractTrait.php',
+                'aninterface' => '/_fixture/AnInterface.php',
+                'anotherinterface' => '/_fixture/AnotherInterface.php',
+                'bar' => '/_fixture/Bar.php',
+                'classthatimplementsserializable' => '/_files/ClassThatImplementsSerializable.php',
+                'classwithstaticmethod' => '/_files/ClassWithStaticMethod.php',
+                'foo' => '/_fixture/Foo.php',
+                'framework_mockbuildertest' => '/MockBuilderTest.php',
+                'framework_mockobject_generatortest' => '/GeneratorTest.php',
+                'framework_mockobject_invocation_objecttest' => '/MockObject/Invocation/ObjectTest.php',
+                'framework_mockobject_invocation_statictest' => '/MockObject/Invocation/StaticTest.php',
+                'framework_mockobject_matcher_consecutiveparameterstest' => '/MockObject/Matcher/ConsecutiveParametersTest.php',
+                'framework_mockobjecttest' => '/MockObjectTest.php',
+                'framework_proxyobjecttest' => '/ProxyObjectTest.php',
+                'interfacewithstaticmethod' => '/_fixture/InterfaceWithStaticMethod.php',
+                'methodcallback' => '/_fixture/MethodCallback.php',
+                'methodcallbackbyreference' => '/_fixture/MethodCallbackByReference.php',
+                'mockable' => '/_fixture/Mockable.php',
+                'partialmocktestclass' => '/_fixture/PartialMockTestClass.php',
+                'someclass' => '/_fixture/SomeClass.php',
+                'staticmocktestclass' => '/_fixture/StaticMockTestClass.php',
+                'traversablemocktestinterface' => '/_fixture/TraversableMockTestInterface.php'
+            );
+        }
+        $cn = strtolower($class);
+        if (isset($classes[$cn])) {
+            require __DIR__ . $classes[$cn];
+        }
+    }
+);
+// @codeCoverageIgnoreEnd
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/bootstrap.php b/vendor/phpunit/phpunit-mock-objects/tests/bootstrap.php
new file mode 100644
index 00000000..39a9c12a
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/bootstrap.php
@@ -0,0 +1,5 @@
+<?php
+require __DIR__ . '/autoload.php';
+require __DIR__ . '/_fixture/FunctionCallback.php';
+require __DIR__ . '/../vendor/autoload.php';
+
diff --git a/vendor/phpunit/phpunit/.gitattributes b/vendor/phpunit/phpunit/.gitattributes
new file mode 100644
index 00000000..821227aa
--- /dev/null
+++ b/vendor/phpunit/phpunit/.gitattributes
@@ -0,0 +1,3 @@
+*.php diff=php
+composer.json merge=ours
+src/Runner/Version.php merge=ours
diff --git a/vendor/phpunit/phpunit/.gitignore b/vendor/phpunit/phpunit/.gitignore
new file mode 100644
index 00000000..65a2321e
--- /dev/null
+++ b/vendor/phpunit/phpunit/.gitignore
@@ -0,0 +1,22 @@
+build/api
+build/code-browser
+build/coverage
+build/logs
+build/pdepend
+build/phar
+build/phpdox
+build/*.phar
+build/*.phar.asc
+tests/TextUI/*.diff
+tests/TextUI/*.exp
+tests/TextUI/*.log
+tests/TextUI/*.out
+tests/TextUI/*.php
+/bin
+/vendor
+/composer.lock
+/composer.phar
+phpunit.xml
+cache.properties
+.idea
+.ant_targets
diff --git a/vendor/phpunit/phpunit/.travis.yml b/vendor/phpunit/phpunit/.travis.yml
new file mode 100644
index 00000000..320d7087
--- /dev/null
+++ b/vendor/phpunit/phpunit/.travis.yml
@@ -0,0 +1,27 @@
+language: php
+
+php:
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+  - hhvm-nightly
+
+before_script:
+  - composer self-update
+  - composer install --no-interaction --prefer-source --dev
+  - if [[ "$TRAVIS_PHP_VERSION" == hhvm* ]]; then echo -e '\nhhvm.libxml.ext_entity_whitelist = "file"' | sudo tee -a /etc/hhvm/php.ini; fi
+
+script: ./phpunit --configuration ./build/travis-ci.xml
+
+notifications:
+  email: false
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
+    on_success: always
+    on_failure: always
+    on_start: false
+
diff --git a/vendor/phpunit/phpunit/CONTRIBUTING.md b/vendor/phpunit/phpunit/CONTRIBUTING.md
new file mode 100644
index 00000000..b6421e28
--- /dev/null
+++ b/vendor/phpunit/phpunit/CONTRIBUTING.md
@@ -0,0 +1,23 @@
+# Contributing to PHPUnit
+
+Contributions to PHPUnit, its related modules, and its documentation are always welcome. You make our lives easier by sending us your contributions through GitHub pull requests.
+
+Pull requests for bug fixes must be based on the current stable branch whereas pull requests for new features must be based on `master`.
+
+We are trying to keep backwards compatibility breaks in PHPUnit to an absolute minimum. Please take this into account when proposing changes.
+
+Due to time constraints, we are not always able to respond as quickly as we would like. Please do not take delays personal and feel free to remind us here or on IRC if you feel that we forgot to respond.
+
+## Using PHPUnit From a Git Checkout
+
+The following commands can be used to perform the initial checkout of PHPUnit:
+
+    git clone git://github.com/sebastianbergmann/phpunit.git
+    cd phpunit
+
+Retrieve PHPUnit's dependencies using [Composer](http://getcomposer.org/):
+
+    wget http://getcomposer.org/composer.phar
+    php composer.phar install
+
+The `phpunit` script can be used to invoke the PHPUnit test runner.
diff --git a/vendor/phpunit/phpunit/LICENSE b/vendor/phpunit/phpunit/LICENSE
new file mode 100644
index 00000000..fe178b08
--- /dev/null
+++ b/vendor/phpunit/phpunit/LICENSE
@@ -0,0 +1,33 @@
+PHPUnit
+
+Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/phpunit/phpunit/README.md b/vendor/phpunit/phpunit/README.md
new file mode 100644
index 00000000..6c6aaf1e
--- /dev/null
+++ b/vendor/phpunit/phpunit/README.md
@@ -0,0 +1,41 @@
+# PHPUnit
+
+PHPUnit is a programmer-oriented testing framework for PHP. It is an instance of the xUnit architecture for unit testing frameworks.
+
+[![Latest Stable Version](https://poser.pugx.org/phpunit/phpunit/v/stable.png)](https://packagist.org/packages/phpunit/phpunit)
+[![Build Status](https://travis-ci.org/sebastianbergmann/phpunit.png?branch=master)](https://travis-ci.org/sebastianbergmann/phpunit)
+[![Dependency Status](https://www.versioneye.com/php/phpunit:phpunit/dev-master/badge.png)](https://www.versioneye.com/php/phpunit:phpunit/dev-master)
+
+## Installation
+
+We distribute a [PHP Archive (PHAR)](http://php.net/phar) that has all required (as well as some optional) dependencies of PHPUnit bundled in a single file:
+
+    wget https://phar.phpunit.de/phpunit.phar
+    chmod +x phpunit.phar
+    mv phpunit.phar /usr/local/bin/phpunit
+
+You can also immediately use the PHAR after you have downloaded it, of course:
+
+    wget https://phar.phpunit.de/phpunit.phar
+    php phpunit.phar
+
+Alternatively, you may use [Composer](http://getcomposer.org/) to download and install PHPUnit as well as its dependencies. Please refer to the [documentation](http://phpunit.de/documentation.html) for details on how to do this.
+
+## Contribute
+
+Please refer to [CONTRIBUTING.md](https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md) for information on how to contribute to PHPUnit and its related projects.
+
+The development of PHPUnit is discussed on the [dev@phpunit.de](mailto:dev-subscribe@phpunit.de) mailing list as well as on the [#phpunit channel on the Freenode IRC network](irc://irc.freenode.net/phpunit).
+
+## List of Contributors
+
+Thanks to everyone who has contributed to PHPUnit! You can find a detailed list of contributors on every PHPUnit related package on GitHub. This list shows only the major components:
+
+* [PHPUnit](https://github.com/sebastianbergmann/phpunit/graphs/contributors)
+* [PHP_CodeCoverage](https://github.com/sebastianbergmann/php-code-coverage/graphs/contributors)
+* [PHPUnit_MockObject](https://github.com/sebastianbergmann/phpunit-mock-objects/graphs/contributors)
+
+A very special thanks to everyone who has contributed to the documentation and helps maintaining the translations:
+
+* [PHPUnit Documentation](https://github.com/sebastianbergmann/phpunit-documentation/graphs/contributors)
+
diff --git a/vendor/phpunit/phpunit/build.xml b/vendor/phpunit/phpunit/build.xml
new file mode 100644
index 00000000..7d6befc6
--- /dev/null
+++ b/vendor/phpunit/phpunit/build.xml
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="PHPUnit" default="build">
+ <property name="php" value="php"/>
+
+ <target name="build"
+   depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpunit,phpdox"/>
+
+ <target name="clean" description="Cleanup build artifacts">
+  <delete dir="${basedir}/bin"/>
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
+  <delete dir="${basedir}/build/api"/>
+  <delete dir="${basedir}/build/code-browser"/>
+  <delete dir="${basedir}/build/coverage"/>
+  <delete dir="${basedir}/build/logs"/>
+  <delete dir="${basedir}/build/pdepend"/>
+  <delete dir="${basedir}/build/phar"/>
+  <delete dir="${basedir}/build/phpdox"/>
+
+  <delete>
+   <fileset dir="${basedir}/build">
+    <include name="**/*.phar" />
+    <include name="**/*.phar.asc" />
+   </fileset>
+  </delete>
+ </target>
+
+ <target name="prepare" description="Prepare for build">
+  <mkdir dir="${basedir}/build/api"/>
+  <mkdir dir="${basedir}/build/code-browser"/>
+  <mkdir dir="${basedir}/build/coverage"/>
+  <mkdir dir="${basedir}/build/logs"/>
+  <mkdir dir="${basedir}/build/pdepend"/>
+  <mkdir dir="${basedir}/build/phpdox"/>
+ </target>
+
+ <target name="download-composer" description="Downloads composer.phar (when it does not exist or is older than 30 days)">
+  <tstamp>
+   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
+  </tstamp>
+  <delete>
+   <fileset dir="${basedir}">
+    <include name="composer.phar" />
+    <date datetime="${thirty.days.ago}" when="before"/>
+   </fileset>
+  </delete>
+
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
+ </target>
+
+ <target name="composer" depends="download-composer" description="Install dependencies with Composer">
+
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
+  </exec>
+ </target>
+
+ <target name="lint">
+  <apply executable="${php}" failonerror="true">
+   <arg value="-l" />
+
+   <fileset dir="${basedir}/src">
+    <include name="**/*.php" />
+    <modified />
+   </fileset>
+
+   <fileset dir="${basedir}/tests">
+    <include name="**/*.php" />
+    <modified />
+   </fileset>
+  </apply>
+ </target>
+
+ <target name="phploc" description="Measure project size using PHPLOC">
+  <exec executable="phploc">
+   <arg value="--log-csv" />
+   <arg value="${basedir}/build/logs/phploc.csv" />
+   <arg value="--log-xml" />
+   <arg value="${basedir}/build/logs/phploc.xml" />
+   <arg path="${basedir}/src" />
+  </exec>
+ </target>
+
+ <target name="pdepend"
+         description="Calculate software metrics using PHP_Depend">
+  <exec executable="pdepend">
+   <arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
+   <arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
+   <arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
+   <arg path="${basedir}/src" />
+  </exec>
+ </target>
+
+ <target name="phpmd"
+         description="Perform project mess detection using PHPMD">
+  <exec executable="phpmd">
+   <arg path="${basedir}/src" />
+   <arg value="text" />
+   <arg value="${basedir}/build/phpmd.xml" />
+  </exec>
+ </target>
+
+ <target name="phpmd-ci"
+         description="Perform project mess detection using PHPMD">
+  <exec executable="phpmd">
+   <arg path="${basedir}/src" />
+   <arg value="xml" />
+   <arg value="${basedir}/build/phpmd.xml" />
+   <arg value="--reportfile" />
+   <arg value="${basedir}/build/logs/pmd.xml" />
+  </exec>
+ </target>
+
+ <target name="phpcs"
+         description="Find coding standard violations using PHP_CodeSniffer">
+  <exec executable="phpcs">
+   <arg value="--standard=PSR2" />
+   <arg value="--extensions=php" />
+   <arg path="${basedir}/src" />
+   <arg path="${basedir}/tests" />
+  </exec>
+ </target>
+
+ <target name="phpcs-ci"
+         description="Find coding standard violations using PHP_CodeSniffer">
+  <exec executable="phpcs" output="/dev/null">
+   <arg value="--report=checkstyle" />
+   <arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
+   <arg value="--standard=PSR2" />
+   <arg value="--extensions=php" />
+   <arg path="${basedir}/src" />
+   <arg path="${basedir}/tests" />
+  </exec>
+ </target>
+
+ <target name="phpcpd" description="Find duplicate code using PHPCPD">
+  <exec executable="phpcpd">
+   <arg value="--log-pmd" />
+   <arg value="${basedir}/build/logs/pmd-cpd.xml" />
+   <arg path="${basedir}/src" />
+  </exec>
+ </target>
+
+ <target name="phpunit" description="Run unit tests with PHPUnit">
+  <exec executable="${php}" failonerror="true">
+   <arg path="${basedir}/src" />
+  </exec>
+ </target>
+
+ <target name="phpdox"
+         description="Generate software project documentation using phpDox">
+  <exec executable="phpdox" />
+ </target>
+
+ <target name="signed-phar"
+         description="Create signed PHAR archive of PHPUnit and all its dependencies (release)"
+         depends="phar">
+  <exec executable="bash" outputproperty="version">
+   <arg value="-c" />
+   <arg value="${basedir}/phpunit --version | awk 'BEGIN { ORS = &quot;&quot;; } {print $2}'" />
+  </exec>
+
+  <exec executable="gpg" failonerror="true">
+   <arg value="--armor" />
+   <arg value="--detach-sign" />
+   <arg path="${basedir}/build/phpunit-${version}.phar" />
+  </exec>
+ </target>
+
+ <target name="phar"
+         description="Create PHAR archive of PHPUnit and all its dependencies (release)"
+         depends="phar-prepare">
+  <exec executable="bash" outputproperty="version">
+   <arg value="-c" />
+   <arg value="${basedir}/phpunit --version | awk 'BEGIN { ORS = &quot;&quot;; } {print $2}'" />
+  </exec>
+
+  <antcall target="phar-build">
+   <param name="version" value="${version}"/>
+  </antcall>
+ </target>
+
+ <target name="phar-alpha"
+         description="Create PHAR archive of PHPUnit and all its dependencies (alpha)"
+         depends="phar-prepare">
+  <antcall target="phar-build">
+   <param name="version" value="alpha"/>
+  </antcall>
+ </target>
+
+ <target name="phar-beta"
+         description="Create PHAR archive of PHPUnit and all its dependencies (beta)"
+         depends="phar-prepare">
+  <antcall target="phar-build">
+   <param name="version" value="beta"/>
+  </antcall>
+ </target>
+
+ <target name="phar-prepare" depends="clean,download-composer">
+  <mkdir dir="${basedir}/build/phar"/>
+  <copy file="${basedir}/composer.json" tofile="${basedir}/composer.json.bak"/>
+
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="require"/>
+   <arg value="phpunit/dbunit:1.3.*"/>
+   <arg value="phpunit/phpunit-selenium:1.3.*"/>
+   <arg value="phpunit/php-invoker:1.1.*"/>
+  </exec>
+
+  <move file="${basedir}/composer.json.bak" tofile="${basedir}/composer.json"/>
+
+  <exec executable="${basedir}/build/phar-manifest.php" output="${basedir}/build/phar/manifest.txt"/>
+  <copy todir="${basedir}/build/phar" file="${basedir}/build/ca.pem" />
+
+  <copy file="${basedir}/vendor/phpunit/php-code-coverage/LICENSE" tofile="${basedir}/build/phar/php-code-coverage/LICENSE"/>
+  <copy todir="${basedir}/build/phar/php-code-coverage">
+   <fileset dir="${basedir}/vendor/phpunit/php-code-coverage/src">
+    <include name="**/*" />
+   </fileset>
+  </copy>
+
+  <copy file="${basedir}/vendor/phpunit/php-file-iterator/LICENSE" tofile="${basedir}/build/phar/php-file-iterator/LICENSE"/>
+  <copy todir="${basedir}/build/phar/php-file-iterator">
+   <fileset dir="${basedir}/vendor/phpunit/php-file-iterator/File">
+    <include name="**/*.php" />
+    <exclude name="**/Autoload.*" />
+   </fileset>
+  </copy>
+
+  <copy file="${basedir}/vendor/phpunit/php-text-template/LICENSE" tofile="${basedir}/build/phar/php-text-template/LICENSE"/>
+  <copy todir="${basedir}/build/phar/php-text-template">
+   <fileset dir="${basedir}/vendor/phpunit/php-text-template/Text">
+    <include name="**/*.php" />
+    <exclude name="**/Autoload.*" />
+   </fileset>
+  </copy>
+
+  <copy file="${basedir}/vendor/phpunit/php-timer/LICENSE" tofile="${basedir}/build/phar/php-timer/LICENSE"/>
+  <copy todir="${basedir}/build/phar/php-timer">
+   <fileset dir="${basedir}/vendor/phpunit/php-timer/PHP">
+    <include name="**/*.php" />
+    <exclude name="**/Autoload.*" />
+   </fileset>
+  </copy>
+
+  <copy file="${basedir}/vendor/phpunit/php-token-stream/LICENSE" tofile="${basedir}/build/phar/php-token-stream/LICENSE"/>
+  <copy todir="${basedir}/build/phar/php-token-stream">
+   <fileset dir="${basedir}/vendor/phpunit/php-token-stream/PHP">
+    <include name="**/*.php" />
+    <exclude name="**/Autoload.*" />
+   </fileset>
+  </copy>
+
+  <copy file="${basedir}/vendor/phpunit/phpunit-mock-objects/LICENSE" tofile="${basedir}/build/phar/phpunit-mock-objects/LICENSE"/>
+  <copy todir="${basedir}/build/phar/phpunit-mock-objects">
+   <fileset dir="${basedir}/vendor/phpunit/phpunit-mock-objects/src">
+    <include name="**/*" />
+   </fileset>
+  </copy>
+
+  <copy file="${basedir}/vendor/sebastian/comparator/LICENSE" tofile="${basedir}/build/phar/sebastian-comparator/LICENSE"/>
+  <copy todir="${basedir}/build/phar/sebastian-comparator">
+   <fileset dir="${basedir}/vendor/sebastian/comparator/src">
+    <include name="**/*.php" />
+   </fileset>
+  </copy>
+
+  <copy file="${basedir}/vendor/sebastian/diff/LICENSE" tofile="${basedir}/build/phar/sebastian-diff/LICENSE"/>
+  <copy todir="${basedir}/build/phar/sebastian-diff">
+   <fileset dir="${basedir}/vendor/sebastian/diff/src">
+    <include name="**/*.php" />
+    <exclude name="**/autoload.php" />
+   </fileset>
+  </copy>
+
+  <copy file="${basedir}/vendor/sebastian/environment/LICENSE" tofile="${basedir}/build/phar/sebastian-environment/LICENSE"/>
+  <copy todir="${basedir}/build/phar/sebastian-environment">
+   <fileset dir="${basedir}/vendor/sebastian/environment/src">
+    <include name="**/*.php" />
+   </fileset>
+  </copy>
+
+  <copy file="${basedir}/vendor/sebastian/exporter/LICENSE" tofile="${basedir}/build/phar/sebastian-exporter/LICENSE"/>
+  <copy todir="${basedir}/build/phar/sebastian-exporter">
+   <fileset dir="${basedir}/vendor/sebastian/exporter/src">
+    <include name="**/*.php" />
+    <exclude name="**/autoload.php" />
+   </fileset>
+  </copy>
+
+  <copy file="${basedir}/vendor/sebastian/version/LICENSE" tofile="${basedir}/build/phar/sebastian-version/LICENSE"/>
+  <copy todir="${basedir}/build/phar/sebastian-version">
+   <fileset dir="${basedir}/vendor/sebastian/version/src">
+    <include name="**/*.php" />
+    <exclude name="**/autoload.php" />
+   </fileset>
+  </copy>
+
+  <copy file="${basedir}/vendor/symfony/yaml/Symfony/Component/Yaml/LICENSE" tofile="${basedir}/build/phar/symfony/LICENSE"/>
+  <copy todir="${basedir}/build/phar/symfony">
+   <fileset dir="${basedir}/vendor/symfony">
+    <include name="**/*.php" />
+    <exclude name="**/Tests/**" />
+   </fileset>
+  </copy>
+
+  <copy todir="${basedir}/build/phar/dbunit">
+   <fileset dir="${basedir}/vendor/phpunit/dbunit/PHPUnit">
+    <include name="**/*.php" />
+    <exclude name="**/Autoload.*" />
+   </fileset>
+  </copy>
+
+  <copy todir="${basedir}/build/phar/php-invoker">
+   <fileset dir="${basedir}/vendor/phpunit/php-invoker/PHP">
+    <include name="**/*.php" />
+    <exclude name="**/Autoload.*" />
+   </fileset>
+  </copy>
+
+  <copy todir="${basedir}/build/phar/phpunit-selenium">
+   <fileset dir="${basedir}/vendor/phpunit/phpunit-selenium/PHPUnit">
+    <include name="**/*.php" />
+    <exclude name="**/Autoload.*" />
+   </fileset>
+  </copy>
+ </target>
+
+ <target name="phar-build">
+  <copy todir="${basedir}/build/phar/phpunit">
+   <fileset dir="${basedir}/src">
+    <include name="**/*.php" />
+    <include name="**/*.tpl*" />
+   </fileset>
+  </copy>
+
+  <exec executable="${basedir}/build/phar-version.php" outputproperty="_version">
+   <arg value="${version}" />
+  </exec>
+
+  <exec executable="phpab">
+   <arg value="--all" />
+   <arg value="--phar" />
+   <arg value="--output" />
+   <arg path="${basedir}/build/phpunit-${_version}.phar" />
+   <arg value="--template" />
+   <arg path="${basedir}/build/phar-autoload.php.in" />
+   <arg value="--indent" />
+   <arg value="            " />
+   <arg path="${basedir}/build/phar" />
+  </exec>
+
+  <chmod file="${basedir}/build/phpunit-${_version}.phar" perm="ugo+rx"/>
+ </target>
+</project>
+
diff --git a/vendor/phpunit/phpunit/build/ca.pem b/vendor/phpunit/phpunit/build/ca.pem
new file mode 100644
index 00000000..960f2657
--- /dev/null
+++ b/vendor/phpunit/phpunit/build/ca.pem
@@ -0,0 +1,44 @@
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
+ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
+LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
+BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
+dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
+cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
+YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
+dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
+bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
+YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
+TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
+9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
+jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
+FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
+ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
+ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
+EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
+L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
+O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
+um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
+NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
+-----END CERTIFICATE-----
diff --git a/vendor/phpunit/phpunit/build/phar-autoload.php.in b/vendor/phpunit/phpunit/build/phar-autoload.php.in
new file mode 100644
index 00000000..26660de6
--- /dev/null
+++ b/vendor/phpunit/phpunit/build/phar-autoload.php.in
@@ -0,0 +1,43 @@
+#!/usr/bin/env php
+<?php
+if ($GLOBALS['_SERVER']['SCRIPT_NAME'] != '-') {
+    $phar = realpath($GLOBALS['_SERVER']['SCRIPT_NAME']);
+} else {
+    $files = get_included_files();
+    $phar = $files[0];
+}
+
+define('__PHPUNIT_PHAR__', str_replace(DIRECTORY_SEPARATOR, '/', $phar));
+define('__PHPUNIT_PHAR_ROOT__', 'phar://___PHAR___');
+
+spl_autoload_register(
+  function ($class)
+  {
+      static $classes = NULL;
+
+      if ($classes === NULL) {
+          $classes = array(
+            ___CLASSLIST___
+          );
+      }
+
+      $class = strtolower($class);
+
+      if (isset($classes[$class])) {
+          require __PHPUNIT_PHAR_ROOT__ . $classes[$class];
+      }
+  }
+);
+
+Phar::mapPhar('___PHAR___');
+
+if (isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == '--manifest') {
+    print file_get_contents(__PHPUNIT_PHAR_ROOT__ . '/manifest.txt');
+    exit;
+}
+
+if ($GLOBALS['_SERVER']['SCRIPT_NAME'] != '-') {
+    PHPUnit_TextUI_Command::main();
+}
+
+__HALT_COMPILER();
diff --git a/vendor/phpunit/phpunit/build/phar-manifest.php b/vendor/phpunit/phpunit/build/phar-manifest.php
new file mode 100644
index 00000000..50608fb4
--- /dev/null
+++ b/vendor/phpunit/phpunit/build/phar-manifest.php
@@ -0,0 +1,28 @@
+#!/usr/bin/env php
+<?php
+print 'phpunit/phpunit: ';
+
+$tag = @exec('git describe --tags 2>&1');
+
+if (strpos($tag, '-') === false && strpos($tag, 'No names found') === false) {
+    print $tag;
+} else {
+    $branch = @exec('git rev-parse --abbrev-ref HEAD');
+    $hash   = @exec('git log -1 --format="%H"');
+    print $branch . '@' . $hash;
+}
+
+print "\n";
+
+$lock = json_decode(file_get_contents(__DIR__ . '/../composer.lock'));
+
+foreach ($lock->packages as $package) {
+    print $package->name . ': ' . $package->version;
+
+    if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) {
+        print '@' . $package->source->reference;
+    }
+
+    print "\n";
+}
+
diff --git a/vendor/phpunit/phpunit/build/phar-version.php b/vendor/phpunit/phpunit/build/phar-version.php
new file mode 100644
index 00000000..83b8746d
--- /dev/null
+++ b/vendor/phpunit/phpunit/build/phar-version.php
@@ -0,0 +1,22 @@
+#!/usr/bin/env php
+<?php
+if (!isset($argv[1])) {
+    exit(1);
+}
+
+if ($argv[1] == 'alpha' || $argv[1] == 'beta') {
+    $version = sprintf('%s-%s', $argv[1], date('Y-m-d'));
+} else {
+    $version = $argv[1];
+}
+
+file_put_contents(
+    __DIR__ . '/phar/phpunit/Runner/Version.php',
+    str_replace(
+        'private static $pharVersion;',
+        'private static $pharVersion = "' . $version . '";',
+        file_get_contents(__DIR__ . '/phar/phpunit/Runner/Version.php')
+    )
+);
+
+print $version;
diff --git a/vendor/phpunit/phpunit/build/phpmd.xml b/vendor/phpunit/phpunit/build/phpmd.xml
new file mode 100644
index 00000000..23ecb8b0
--- /dev/null
+++ b/vendor/phpunit/phpunit/build/phpmd.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+
+<ruleset name="Sebastian"
+         xmlns="http://pmd.sf.net/ruleset/1.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+         xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+  <description>Sebastian Bergmann's ruleset</description>
+
+  <rule ref="rulesets/codesize.xml/CyclomaticComplexity" />
+  <rule ref="rulesets/codesize.xml/NPathComplexity" />
+  <rule ref="rulesets/codesize.xml/ExcessiveClassComplexity" />
+  <rule ref="rulesets/codesize.xml/ExcessiveClassLength" />
+  <rule ref="rulesets/codesize.xml/ExcessiveMethodLength" />
+  <rule ref="rulesets/codesize.xml/ExcessiveParameterList" />
+
+  <rule ref="rulesets/design.xml/EvalExpression" />
+  <rule ref="rulesets/design.xml/ExitExpression" />
+  <rule ref="rulesets/design.xml/GotoStatement" />
+
+  <rule ref="rulesets/naming.xml/ConstructorWithNameAsEnclosingClass" />
+
+  <rule ref="rulesets/unusedcode.xml/UnusedFormalParameter" />
+  <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable" />
+  <rule ref="rulesets/unusedcode.xml/UnusedPrivateField" />
+  <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod" />
+</ruleset>
diff --git a/vendor/phpunit/phpunit/build/travis-ci.xml b/vendor/phpunit/phpunit/build/travis-ci.xml
new file mode 100644
index 00000000..bf237fec
--- /dev/null
+++ b/vendor/phpunit/phpunit/build/travis-ci.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         bootstrap="../tests/bootstrap-travis.php"
+         backupGlobals="false"
+         verbose="true">
+  <testsuites>
+    <testsuite name="small">
+      <directory suffix="Test.php">../tests/Framework</directory>
+      <directory suffix="Test.php">../tests/Extensions</directory>
+      <directory suffix="Test.php">../tests/Runner</directory>
+      <directory suffix="Test.php">../tests/Util</directory>
+    </testsuite>
+
+    <testsuite name="large">
+      <directory suffix=".phpt">../tests/TextUI</directory>
+      <directory suffix=".phpt">../tests/Regression</directory>
+    </testsuite>
+  </testsuites>
+
+  <php>
+    <const name="PHPUNIT_TESTSUITE" value="true"/>
+  </php>
+</phpunit>
+
diff --git a/vendor/phpunit/phpunit/composer.json b/vendor/phpunit/phpunit/composer.json
new file mode 100644
index 00000000..a5a94e51
--- /dev/null
+++ b/vendor/phpunit/phpunit/composer.json
@@ -0,0 +1,74 @@
+{
+    "name": "phpunit/phpunit",
+    "description": "The PHP Unit Testing framework.",
+    "type": "library",
+    "keywords": [
+        "phpunit",
+        "xunit",
+        "testing"
+    ],
+    "homepage": "http://www.phpunit.de/",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sebastian@phpunit.de",
+            "role": "lead"
+        }
+    ],
+    "support": {
+        "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+        "irc": "irc://irc.freenode.net/phpunit"
+    },
+    "require": {
+        "php": ">=5.3.3",
+        "phpunit/php-file-iterator": "~1.3.1",
+        "phpunit/php-text-template": "~1.2",
+        "phpunit/php-code-coverage": "~2.0",
+        "phpunit/php-timer": "~1.0.2",
+        "phpunit/phpunit-mock-objects": "2.1.5",
+        "symfony/yaml": "~2.0",
+        "sebastian/comparator": "~1.0",
+        "sebastian/diff": "~1.1",
+        "sebastian/environment": "~1.0",
+        "sebastian/exporter": "~1.0",
+        "sebastian/version": "~1.0",
+        "ext-dom": "*",
+        "ext-json": "*",
+        "ext-pcre": "*",
+        "ext-reflection": "*",
+        "ext-spl": "*"
+    },
+    "suggest": {
+        "phpunit/php-invoker": "~1.1"
+    },
+    "bin": [
+        "phpunit"
+    ],
+    "config": {
+        "bin-dir": "bin"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    },
+    "autoload-dev": {
+        "classmap": [
+            "tests/"
+        ],
+        "files": [
+            "src/Framework/Assert/Functions.php",
+            "tests/_files/CoveredFunction.php"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "4.1.x-dev"
+        }
+    },
+    "include-path": [
+        "",
+        "../../symfony/yaml/"
+    ]
+}
diff --git a/vendor/phpunit/phpunit/phpdox.xml.dist b/vendor/phpunit/phpunit/phpdox.xml.dist
new file mode 100644
index 00000000..e77645e0
--- /dev/null
+++ b/vendor/phpunit/phpunit/phpdox.xml.dist
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<phpdox xmlns="http://phpdox.net/config">
+ <project name="PHPUnit" source="src" workdir="build/phpdox">
+  <collector publiconly="false">
+   <include mask="*.php" />
+  </collector>
+
+  <generator output="build">
+   <enrich base="${basedir}/build/logs">
+    <source type="build" />
+    <source type="git" />
+    <source type="phploc" />
+    <source type="checkstyle" />
+    <source type="pmd" />
+   </enrich>
+
+   <build engine="html" enabled="true" output="api">
+    <file extension="html" />
+   </build>
+  </generator>
+ </project>
+</phpdox>
+
diff --git a/vendor/phpunit/phpunit/phpunit b/vendor/phpunit/phpunit/phpunit
new file mode 100644
index 00000000..44f3c6d9
--- /dev/null
+++ b/vendor/phpunit/phpunit/phpunit
@@ -0,0 +1,55 @@
+#!/usr/bin/env php
+<?php
+/* PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
+    if (file_exists($file)) {
+        define('PHPUNIT_COMPOSER_INSTALL', $file);
+        break;
+    }
+}
+
+if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
+    die(
+        'You need to set up the project dependencies using the following commands:' . PHP_EOL .
+        'wget http://getcomposer.org/composer.phar' . PHP_EOL .
+        'php composer.phar install' . PHP_EOL
+    );
+}
+
+require PHPUNIT_COMPOSER_INSTALL;
+
+PHPUnit_TextUI_Command::main();
diff --git a/vendor/phpunit/phpunit/phpunit.xml.dist b/vendor/phpunit/phpunit/phpunit.xml.dist
new file mode 100644
index 00000000..50966d7c
--- /dev/null
+++ b/vendor/phpunit/phpunit/phpunit.xml.dist
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         bootstrap="tests/bootstrap.php"
+         backupGlobals="false"
+         verbose="true">
+  <testsuites>
+    <testsuite name="small">
+      <directory suffix="Test.php">tests/Framework</directory>
+      <directory suffix="Test.php">tests/Extensions</directory>
+      <directory suffix="Test.php">tests/Runner</directory>
+      <directory suffix="Test.php">tests/Util</directory>
+    </testsuite>
+
+    <testsuite name="large">
+      <directory suffix=".phpt">tests/TextUI</directory>
+      <directory suffix=".phpt">tests/Regression</directory>
+    </testsuite>
+  </testsuites>
+
+  <logging>
+    <log type="coverage-html" target="build/coverage"/>
+  </logging>
+
+  <filter>
+    <whitelist processUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">src</directory>
+      <exclude>
+       <file>src/Framework/Assert/Functions.php</file>
+      </exclude>
+    </whitelist>
+  </filter>
+
+  <php>
+    <const name="PHPUNIT_TESTSUITE" value="true"/>
+  </php>
+</phpunit>
+
diff --git a/vendor/phpunit/phpunit/phpunit.xsd b/vendor/phpunit/phpunit/phpunit.xsd
new file mode 100644
index 00000000..0f46f111
--- /dev/null
+++ b/vendor/phpunit/phpunit/phpunit.xsd
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:annotation>
+    <xs:documentation source="http://www.phpunit.de/manual/4.1/en/appendixes.configuration.html">
+      This Schema file defines the rules by which the XML configuration file of PHPUnit 4.1 may be structured.
+    </xs:documentation>
+    <xs:appinfo source="http://www.phpunit.de/manual/current/en/appendixes.configuration.html"/>
+  </xs:annotation>
+  <xs:element name="phpunit" type="phpUnitType">
+    <xs:annotation>
+      <xs:documentation>Root Element</xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:complexType name="filtersType">
+    <xs:choice>
+      <xs:sequence>
+        <xs:element name="blacklist" type="filterType"/>
+        <xs:element name="whitelist" type="whiteListType" minOccurs="0"/>
+      </xs:sequence>
+      <xs:sequence>
+        <xs:element name="whitelist" type="whiteListType"/>
+      </xs:sequence>
+    </xs:choice>
+  </xs:complexType>
+  <xs:complexType name="filterType">
+    <xs:sequence>
+      <xs:group ref="pathGroup"/>
+      <xs:element name="exclude" maxOccurs="unbounded" minOccurs="0">
+        <xs:complexType>
+          <xs:group ref="pathGroup"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="whiteListType">
+    <xs:complexContent>
+      <xs:extension base="filterType">
+        <xs:attribute name="processUncoveredFilesFromWhitelist" default="true" type="xs:boolean"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="groupsType">
+    <xs:choice>
+      <xs:sequence>
+        <xs:element name="include" type="groupType"/>
+        <xs:element name="exclude" type="groupType" minOccurs="0"/>
+      </xs:sequence>
+      <xs:sequence>
+        <xs:element name="exclude" type="groupType"/>
+      </xs:sequence>
+    </xs:choice>
+  </xs:complexType>
+  <xs:complexType name="groupType">
+    <xs:sequence>
+      <xs:element name="group" type="xs:string" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="listenersType">
+    <xs:sequence>
+      <xs:element name="listener" type="objectType" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="objectType">
+    <xs:sequence>
+      <xs:element name="arguments" minOccurs="0">
+        <xs:complexType>
+          <xs:group ref="argumentsGroup"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+    <xs:attribute name="class" type="xs:string" use="required"/>
+    <xs:attribute name="file" type="xs:anyURI"/>
+  </xs:complexType>
+  <xs:complexType name="arrayType">
+    <xs:sequence>
+      <xs:element name="element" type="argumentType" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="argumentType">
+    <xs:group ref="argumentChoice"/>
+    <xs:attribute name="key" use="required"/>
+  </xs:complexType>
+  <xs:group name="argumentsGroup">
+    <xs:sequence>
+      <xs:element name="array" type="arrayType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="integer" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="string" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="double" type="xs:double" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="null" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="object" type="objectType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="file" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="directory" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:group>
+  <xs:group name="argumentChoice">
+    <xs:choice>
+      <xs:element name="array" type="arrayType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="integer" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="string" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="double" type="xs:double" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="null" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="object" type="objectType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="file" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="directory" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:choice>
+  </xs:group>
+  <xs:complexType name="loggersType">
+    <xs:sequence>
+      <xs:element name="log" type="loggerType" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="loggerType">
+    <xs:attribute name="type">
+      <xs:simpleType>
+        <xs:restriction base="xs:string">
+          <xs:enumeration value="coverage-html"/>
+          <xs:enumeration value="coverage-text"/>
+          <xs:enumeration value="coverage-clover"/>
+          <xs:enumeration value="json"/>
+          <xs:enumeration value="plain"/>
+          <xs:enumeration value="tap"/>
+          <xs:enumeration value="junit"/>
+          <xs:enumeration value="testdox-html"/>
+          <xs:enumeration value="testdox-text"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="target" type="xs:anyURI"/>
+    <xs:attribute name="lowUpperBound" type="xs:nonNegativeInteger" default="35"/>
+    <xs:attribute name="highLowerBound" type="xs:nonNegativeInteger" default="70"/>
+    <xs:attribute name="logIncompleteSkipped" type="xs:boolean" default="false"/>
+    <xs:attribute name="showUncoveredFiles" type="xs:boolean" default="false"/>
+  </xs:complexType>
+  <xs:group name="pathGroup">
+    <xs:sequence>
+      <xs:element name="directory" type="directoryFilterType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="file" type="fileFilterType" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:group>
+  <xs:complexType name="directoryFilterType">
+    <xs:simpleContent>
+      <xs:extension base="xs:anyURI">
+        <xs:attribute type="xs:string" name="suffix" default="Test.php"/>
+        <xs:attributeGroup ref="phpVersionGroup"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="fileFilterType">
+    <xs:simpleContent>
+      <xs:extension base="xs:anyURI">
+        <xs:attributeGroup ref="phpVersionGroup"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:attributeGroup name="phpVersionGroup">
+    <xs:attribute name="phpVersion" type="xs:string" default="5.3.0"/>
+    <xs:attribute name="phpVersionOperator" type="xs:string" default="&gt;="/>
+  </xs:attributeGroup>
+  <xs:complexType name="phpType">
+    <xs:sequence>
+      <xs:element name="includePath" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="ini" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="const" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="var" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="env" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="post" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="get" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="cookie" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="server" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="files" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="request" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="namedValueType">
+    <xs:attribute name="name" use="required" type="xs:string"/>
+    <xs:attribute name="value" use="required" type="xs:anySimpleType"/>
+  </xs:complexType>
+  <xs:complexType name="phpUnitType">
+    <xs:annotation>
+      <xs:documentation>The main type specifying the document structure</xs:documentation>
+    </xs:annotation>
+    <xs:group ref="configGroup"/>
+    <xs:attributeGroup ref="configAttributeGroup"/>
+  </xs:complexType>
+  <xs:attributeGroup name="configAttributeGroup">
+    <xs:attribute name="backupGlobals" type="xs:boolean" default="true"/>
+    <xs:attribute name="backupStaticAttributes" type="xs:boolean" default="false"/>
+    <xs:attribute name="bootstrap" type="xs:anyURI"/>
+    <xs:attribute name="cacheTokens" type="xs:boolean"/>
+    <xs:attribute name="colors" type="xs:boolean" default="false"/>
+    <xs:attribute name="convertErrorsToExceptions" type="xs:boolean" default="true"/>
+    <xs:attribute name="convertNoticesToExceptions" type="xs:boolean" default="true"/>
+    <xs:attribute name="convertWarningsToExceptions" type="xs:boolean" default="true"/>
+    <xs:attribute name="forceCoversAnnotation" type="xs:boolean" default="false"/>
+    <xs:attribute name="mapTestClassNameToCoveredClassName" type="xs:boolean" default="false"/>
+    <xs:attribute name="printerClass" type="xs:string" default="PHPUnit_TextUI_ResultPrinter"/>
+    <xs:attribute name="printerFile" type="xs:anyURI"/>
+    <xs:attribute name="processIsolation" type="xs:boolean" default="false"/>
+    <xs:attribute name="stopOnError" type="xs:boolean" default="false"/>
+    <xs:attribute name="stopOnFailure" type="xs:boolean" default="false"/>
+    <xs:attribute name="stopOnIncomplete" type="xs:boolean" default="false"/>
+    <xs:attribute name="stopOnRisky" type="xs:boolean" default="false"/>
+    <xs:attribute name="stopOnSkipped" type="xs:boolean" default="false"/>
+    <xs:attribute name="beStrictAboutTestsThatDoNotTestAnything" type="xs:boolean" default="false"/>
+    <xs:attribute name="beStrictAboutOutputDuringTests" type="xs:boolean" default="false"/>
+    <xs:attribute name="beStrictAboutTestSize" type="xs:boolean" default="false"/>
+    <xs:attribute name="checkForUnintentionallyCoveredCode" type="xs:boolean" default="false"/>
+    <xs:attribute name="strict" type="xs:boolean" default="false"/>
+    <xs:attribute name="testSuiteLoaderClass" type="xs:string" default="PHPUnit_Runner_StandardTestSuiteLoader"/>
+    <xs:attribute name="testSuiteLoaderFile" type="xs:anyURI"/>
+    <xs:attribute name="timeoutForSmallTests" type="xs:integer" default="1"/>
+    <xs:attribute name="timeoutForMediumTests" type="xs:integer" default="10"/>
+    <xs:attribute name="timeoutForLargeTests" type="xs:integer" default="60"/>
+    <xs:attribute name="verbose" type="xs:boolean" default="false"/>
+  </xs:attributeGroup>
+  <xs:group name="configGroup">
+    <xs:all>
+      <xs:element ref="testSuiteFacet" minOccurs="0"/>
+      <xs:element name="groups" type="groupsType" minOccurs="0"/>
+      <xs:element name="filter" type="filtersType" minOccurs="0"/>
+      <xs:element name="logging" type="loggersType" minOccurs="0"/>
+      <xs:element name="listeners" type="listenersType" minOccurs="0"/>
+      <xs:element name="php" type="phpType" minOccurs="0"/>
+      <xs:element name="selenium" type="seleniumType" minOccurs="0"/>
+    </xs:all>
+  </xs:group>
+  <xs:complexType name="seleniumType">
+    <xs:sequence>
+      <xs:element name="browser" type="browserType"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="browserType">
+    <xs:attribute name="name" type="xs:string"/>
+    <xs:attribute name="browser" type="xs:string"/>
+    <xs:attribute name="host" type="xs:anyURI"/>
+    <xs:attribute name="port" type="xs:nonNegativeInteger"/>
+    <xs:attribute name="timeout" type="xs:nonNegativeInteger"/>
+  </xs:complexType>
+  <xs:element name="testSuiteFacet" abstract="true"/>
+  <xs:element name="testsuite" type="testSuiteType" substitutionGroup="testSuiteFacet"/>
+  <xs:element name="testsuites" type="testSuitesType" substitutionGroup="testSuiteFacet"/>
+  <xs:complexType name="testSuitesType">
+    <xs:sequence>
+      <xs:element name="testsuite" type="testSuiteType"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="testSuiteType">
+    <xs:sequence>
+      <xs:group ref="pathGroup"/>
+      <xs:element name="exclude" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="name" type="xs:string" use="required"/>
+  </xs:complexType>
+</xs:schema>
diff --git a/vendor/phpunit/phpunit/src/Exception.php b/vendor/phpunit/phpunit/src/Exception.php
new file mode 100644
index 00000000..9ea7dc29
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Exception.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * Marker interface for PHPUnit exceptions.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Interface available since Release 4.0.0
+ */
+interface PHPUnit_Exception
+{
+}
diff --git a/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php b/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php
new file mode 100644
index 00000000..9735a829
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Extensions
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.3.0
+ */
+
+/**
+ * We have a TestSuite object A.
+ * In TestSuite object A we have Tests tagged with @group.
+ * We want a TestSuite object B that contains TestSuite objects C, D, ...
+ * for the Tests tagged with @group C, @group D, ...
+ * Running the Tests from TestSuite object B results in Tests tagged with both
+ * @group C and @group D in TestSuite object A to be run twice .
+ *
+ * <code>
+ * $suite = new PHPUnit_Extensions_GroupTestSuite($A, array('C', 'D'));
+ * </code>
+ *
+ * @package    PHPUnit
+ * @subpackage Extensions
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.3.0
+ */
+class PHPUnit_Extensions_GroupTestSuite extends PHPUnit_Framework_TestSuite
+{
+    public function __construct(PHPUnit_Framework_TestSuite $suite, array $groups)
+    {
+        $groupSuites = array();
+        $name        = $suite->getName();
+
+        foreach ($groups as $group) {
+            $groupSuites[$group] = new PHPUnit_Framework_TestSuite($name . ' - ' . $group);
+            $this->addTest($groupSuites[$group]);
+        }
+
+        $tests = new RecursiveIteratorIterator(
+          new PHPUnit_Util_TestSuiteIterator($suite),
+          RecursiveIteratorIterator::LEAVES_ONLY
+        );
+
+        foreach ($tests as $test) {
+            if ($test instanceof PHPUnit_Framework_TestCase) {
+                $testGroups = PHPUnit_Util_Test::getGroups(
+                  get_class($test), $test->getName(false)
+                );
+
+                foreach ($groups as $group) {
+                    foreach ($testGroups as $testGroup) {
+                        if ($group == $testGroup) {
+                            $groupSuites[$group]->addTest($test);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php b/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php
new file mode 100644
index 00000000..49fbd96e
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Extensions_PhptTestCase
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.1.4
+ */
+
+/**
+ * Runner for PHPT test cases.
+ *
+ * @package    PHPUnit
+ * @subpackage Extensions_PhptTestCase
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.1.4
+ */
+class PHPUnit_Extensions_PhptTestCase implements PHPUnit_Framework_Test, PHPUnit_Framework_SelfDescribing
+{
+    /**
+     * @var string
+     */
+    private $filename;
+
+    /**
+     * @var array
+     */
+    private $settings = array(
+        'allow_url_fopen=1',
+        'auto_append_file=',
+        'auto_prepend_file=',
+        'disable_functions=',
+        'display_errors=1',
+        'docref_root=',
+        'docref_ext=.html',
+        'error_append_string=',
+        'error_prepend_string=',
+        'error_reporting=-1',
+        'html_errors=0',
+        'log_errors=0',
+        'magic_quotes_runtime=0',
+        'output_handler=',
+        'open_basedir=',
+        'output_buffering=Off',
+        'report_memleaks=0',
+        'report_zend_debug=0',
+        'safe_mode=0',
+        'track_errors=1',
+        'xdebug.default_enable=0'
+    );
+
+    /**
+     * Constructs a test case with the given filename.
+     *
+     * @param  string                      $filename
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function __construct($filename)
+    {
+        if (!is_string($filename)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_file($filename)) {
+            throw new PHPUnit_Framework_Exception(
+              sprintf(
+                'File "%s" does not exist.',
+                $filename
+              )
+            );
+        }
+
+        $this->filename = $filename;
+    }
+
+    /**
+     * Counts the number of test cases executed by run(TestResult result).
+     *
+     * @return integer
+     */
+    public function count()
+    {
+        return 1;
+    }
+
+    /**
+     * Runs a test and collects its result in a TestResult instance.
+     *
+     * @param  PHPUnit_Framework_TestResult $result
+     * @return PHPUnit_Framework_TestResult
+     */
+    public function run(PHPUnit_Framework_TestResult $result = null)
+    {
+        $sections = $this->parse();
+        $code     = $this->render($sections['FILE']);
+
+        if ($result === null) {
+            $result = new PHPUnit_Framework_TestResult;
+        }
+
+        $php  = PHPUnit_Util_PHP::factory();
+        $skip = false;
+        $time = 0;
+
+        $result->startTest($this);
+
+        if (isset($sections['SKIPIF'])) {
+            $jobResult = $php->runJob($sections['SKIPIF'], $this->settings);
+
+            if (!strncasecmp('skip', ltrim($jobResult['stdout']), 4)) {
+                if (preg_match('/^\s*skip\s*(.+)\s*/i', $jobResult['stdout'], $message)) {
+                    $message = substr($message[1], 2);
+                } else {
+                    $message = '';
+                }
+
+                $result->addFailure($this, new PHPUnit_Framework_SkippedTestError($message), 0);
+
+                $skip = true;
+            }
+        }
+
+        if (!$skip) {
+            PHP_Timer::start();
+            $jobResult = $php->runJob($code, $this->settings);
+            $time = PHP_Timer::stop();
+
+            if (isset($sections['EXPECT'])) {
+                $assertion = 'assertEquals';
+                $expected  = preg_replace('/\r\n/', "\n", trim($sections['EXPECT']));
+            } else {
+                $assertion = 'assertStringMatchesFormat';
+                $expected  = trim($sections['EXPECTF']);
+            }
+
+            try {
+                PHPUnit_Framework_Assert::$assertion($expected, trim($jobResult['stdout']));
+            } catch (PHPUnit_Framework_AssertionFailedError $e) {
+                $result->addFailure($this, $e, $time);
+            } catch (Exception $e) {
+                $result->addError($this, $e, $time);
+            }
+        }
+
+        $result->endTest($this, $time);
+
+        return $result;
+    }
+
+    /**
+     * Returns the name of the test case.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->toString();
+    }
+
+    /**
+     * Returns a string representation of the test case.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return $this->filename;
+    }
+
+    /**
+     * @return array
+     * @throws PHPUnit_Framework_Exception
+     */
+    private function parse()
+    {
+        $sections = array();
+        $section  = '';
+
+        foreach (file($this->filename) as $line) {
+            if (preg_match('/^--([_A-Z]+)--/', $line, $result)) {
+                $section            = $result[1];
+                $sections[$section] = '';
+                continue;
+            } elseif (empty($section)) {
+                throw new PHPUnit_Framework_Exception('Invalid PHPT file');
+            }
+
+            $sections[$section] .= $line;
+        }
+
+        if (!isset($sections['FILE']) ||
+            (!isset($sections['EXPECT']) && !isset($sections['EXPECTF']))) {
+            throw new PHPUnit_Framework_Exception('Invalid PHPT file');
+        }
+
+        return $sections;
+    }
+
+    /**
+     * @param  string $code
+     * @return string
+     */
+    private function render($code)
+    {
+        return str_replace(
+          array(
+            '__DIR__',
+            '__FILE__'
+          ),
+          array(
+            "'" . dirname($this->filename) . "'",
+            "'" . $this->filename . "'"
+          ),
+          $code
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php b/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php
new file mode 100644
index 00000000..f0b4b3ff
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Extensions_PhptTestCase
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.1.4
+ */
+
+/**
+ * Suite for .phpt test cases.
+ *
+ * @package    PHPUnit
+ * @subpackage Extensions_PhptTestCase
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.1.4
+ */
+class PHPUnit_Extensions_PhptTestSuite extends PHPUnit_Framework_TestSuite
+{
+    /**
+     * Constructs a new TestSuite for .phpt test cases.
+     *
+     * @param  string                      $directory
+     * @param  array                       $options   Array with ini settings for the php instance run,
+     *                                                key being the name if the setting, value the ini value.
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function __construct($directory, array $options = array())
+    {
+        if (is_string($directory) && is_dir($directory)) {
+            $this->setName($directory);
+
+            $facade = new File_Iterator_Facade;
+            $files  = $facade->getFilesAsArray($directory, '.phpt');
+
+            foreach ($files as $file) {
+                $this->addTestFile($file, $options);
+            }
+        } else {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'directory name');
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php b/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php
new file mode 100644
index 00000000..65efc670
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * A Decorator that runs a test repeatedly.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class PHPUnit_Extensions_RepeatedTest extends PHPUnit_Extensions_TestDecorator
+{
+    /**
+     * @var mixed
+     */
+    protected $filter = false;
+
+    /**
+     * @var array
+     */
+    protected $groups = array();
+
+    /**
+     * @var array
+     */
+    protected $excludeGroups = array();
+
+    /**
+     * @var boolean
+     */
+    protected $processIsolation = false;
+
+    /**
+     * @var integer
+     */
+    protected $timesRepeat = 1;
+
+    /**
+     * Constructor.
+     *
+     * @param  PHPUnit_Framework_Test      $test
+     * @param  integer                     $timesRepeat
+     * @param  mixed                       $filter
+     * @param  array                       $groups
+     * @param  array                       $excludeGroups
+     * @param  boolean                     $processIsolation
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function __construct(PHPUnit_Framework_Test $test, $timesRepeat = 1, $processIsolation = false)
+    {
+        parent::__construct($test);
+
+        if (is_integer($timesRepeat) &&
+            $timesRepeat >= 0) {
+            $this->timesRepeat = $timesRepeat;
+        } else {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(
+              2, 'positive integer'
+            );
+        }
+
+        $this->processIsolation = $processIsolation;
+    }
+
+    /**
+     * Counts the number of test cases that
+     * will be run by this test.
+     *
+     * @return integer
+     */
+    public function count()
+    {
+        return $this->timesRepeat * count($this->test);
+    }
+
+    /**
+     * Runs the decorated test and collects the
+     * result in a TestResult.
+     *
+     * @param  PHPUnit_Framework_TestResult $result
+     * @return PHPUnit_Framework_TestResult
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function run(PHPUnit_Framework_TestResult $result = null)
+    {
+        if ($result === null) {
+            $result = $this->createResult();
+        }
+
+        //@codingStandardsIgnoreStart
+        for ($i = 0; $i < $this->timesRepeat && !$result->shouldStop(); $i++) {
+            //@codingStandardsIgnoreEnd
+            if ($this->test instanceof PHPUnit_Framework_TestSuite) {
+                $this->test->setRunTestInSeparateProcess($this->processIsolation);
+            }
+            $this->test->run($result);
+        }
+
+        return $result;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php b/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php
new file mode 100644
index 00000000..e3ec809b
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Extensions
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * A Decorator for Tests.
+ *
+ * Use TestDecorator as the base class for defining new
+ * test decorators. Test decorator subclasses can be introduced
+ * to add behaviour before or after a test is run.
+ *
+ * @package    PHPUnit
+ * @subpackage Extensions
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class PHPUnit_Extensions_TestDecorator extends PHPUnit_Framework_Assert implements PHPUnit_Framework_Test, PHPUnit_Framework_SelfDescribing
+{
+    /**
+     * The Test to be decorated.
+     *
+     * @var    object
+     */
+    protected $test = null;
+
+    /**
+     * Constructor.
+     *
+     * @param PHPUnit_Framework_Test $test
+     */
+    public function __construct(PHPUnit_Framework_Test $test)
+    {
+        $this->test = $test;
+    }
+
+    /**
+     * Returns a string representation of the test.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return $this->test->toString();
+    }
+
+    /**
+     * Runs the test and collects the
+     * result in a TestResult.
+     *
+     * @param PHPUnit_Framework_TestResult $result
+     */
+    public function basicRun(PHPUnit_Framework_TestResult $result)
+    {
+        $this->test->run($result);
+    }
+
+    /**
+     * Counts the number of test cases that
+     * will be run by this test.
+     *
+     * @return integer
+     */
+    public function count()
+    {
+        return count($this->test);
+    }
+
+    /**
+     * Creates a default TestResult object.
+     *
+     * @return PHPUnit_Framework_TestResult
+     */
+    protected function createResult()
+    {
+        return new PHPUnit_Framework_TestResult;
+    }
+
+    /**
+     * Returns the test to be run.
+     *
+     * @return PHPUnit_Framework_Test
+     */
+    public function getTest()
+    {
+        return $this->test;
+    }
+
+    /**
+     * Runs the decorated test and collects the
+     * result in a TestResult.
+     *
+     * @param  PHPUnit_Framework_TestResult $result
+     * @return PHPUnit_Framework_TestResult
+     */
+    public function run(PHPUnit_Framework_TestResult $result = null)
+    {
+        if ($result === null) {
+            $result = $this->createResult();
+        }
+
+        $this->basicRun($result);
+
+        return $result;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Extensions/TicketListener.php b/vendor/phpunit/phpunit/src/Extensions/TicketListener.php
new file mode 100644
index 00000000..48782c70
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Extensions/TicketListener.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Extensions_TicketListener
+ * @author     Sean Coates <sean@caedmon.net>
+ * @author     Raphael Stolt <raphael.stolt@gmail.com>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.4.0
+ */
+
+/**
+ * Base class for test listeners that interact with an issue tracker.
+ *
+ * @package    PHPUnit
+ * @subpackage Extensions_TicketListener
+ * @author     Sean Coates <sean@caedmon.net>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.4.0
+ */
+abstract class PHPUnit_Extensions_TicketListener implements PHPUnit_Framework_TestListener
+{
+    /**
+     * @var array
+     */
+    protected $ticketCounts = array();
+
+    /**
+     * @var boolean
+     */
+    protected $ran = false;
+
+    /**
+     * An error occurred.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+    }
+
+    /**
+     * A failure occurred.
+     *
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
+     */
+    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
+    {
+    }
+
+    /**
+     * Incomplete test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+    }
+
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+    }
+
+    /**
+     * Skipped test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 3.0.0
+     */
+    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+    }
+
+    /**
+     * A test suite started.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+    }
+
+    /**
+     * A test suite ended.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+    }
+
+    /**
+     * A test started.
+     *
+     * @param PHPUnit_Framework_Test $test
+     */
+    public function startTest(PHPUnit_Framework_Test $test)
+    {
+        if (!$test instanceof PHPUnit_Framework_Warning) {
+            if ($this->ran) {
+                return;
+            }
+
+            $name    = $test->getName(false);
+            $tickets = PHPUnit_Util_Test::getTickets(get_class($test), $name);
+
+            foreach ($tickets as $ticket) {
+                $this->ticketCounts[$ticket][$name] = 1;
+            }
+
+            $this->ran = true;
+        }
+    }
+
+    /**
+     * A test ended.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
+     */
+    public function endTest(PHPUnit_Framework_Test $test, $time)
+    {
+        if (!$test instanceof PHPUnit_Framework_Warning) {
+            if ($test->getStatus() == PHPUnit_Runner_BaseTestRunner::STATUS_PASSED) {
+                $ifStatus   = array('assigned', 'new', 'reopened');
+                $newStatus  = 'closed';
+                $message    = 'Automatically closed by PHPUnit (test passed).';
+                $resolution = 'fixed';
+                $cumulative = true;
+            } elseif ($test->getStatus() == PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE) {
+                $ifStatus   = array('closed');
+                $newStatus  = 'reopened';
+                $message    = 'Automatically reopened by PHPUnit (test failed).';
+                $resolution = '';
+                $cumulative = false;
+            } else {
+                return;
+            }
+
+            $name    = $test->getName(false);
+            $tickets = PHPUnit_Util_Test::getTickets(get_class($test), $name);
+
+            foreach ($tickets as $ticket) {
+                // Remove this test from the totals (if it passed).
+                if ($test->getStatus() == PHPUnit_Runner_BaseTestRunner::STATUS_PASSED) {
+                    unset($this->ticketCounts[$ticket][$name]);
+                }
+
+                // Only close tickets if ALL referenced cases pass
+                // but reopen tickets if a single test fails.
+                if ($cumulative) {
+                    // Determine number of to-pass tests:
+                    if (count($this->ticketCounts[$ticket]) > 0) {
+                        // There exist remaining test cases with this reference.
+                        $adjustTicket = false;
+                    } else {
+                        // No remaining tickets, go ahead and adjust.
+                        $adjustTicket = true;
+                    }
+                } else {
+                    $adjustTicket = true;
+                }
+
+                $ticketInfo = $this->getTicketInfo($ticket);
+
+                if ($adjustTicket && in_array($ticketInfo['status'], $ifStatus)) {
+                    $this->updateTicket($ticket, $newStatus, $message, $resolution);
+                }
+            }
+        }
+    }
+
+    abstract protected function getTicketInfo($ticketId = null);
+    abstract protected function updateTicket($ticketId, $newStatus, $message, $resolution);
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Assert.php b/vendor/phpunit/phpunit/src/Framework/Assert.php
new file mode 100644
index 00000000..8b1b1f5f
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Assert.php
@@ -0,0 +1,2993 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * A set of assert methods.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+abstract class PHPUnit_Framework_Assert
+{
+    /**
+     * @var integer
+     */
+    private static $count = 0;
+
+    /**
+     * Asserts that an array has a specified key.
+     *
+     * @param mixed             $key
+     * @param array|ArrayAccess $array
+     * @param string            $message
+     * @since  Method available since Release 3.0.0
+     */
+    public static function assertArrayHasKey($key, $array, $message = '')
+    {
+        if (!(is_integer($key) || is_string($key))) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(
+              1, 'integer or string'
+            );
+        }
+
+        if (!(is_array($array) || $array instanceof ArrayAccess)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(
+              2, 'array or ArrayAccess'
+            );
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_ArrayHasKey($key);
+
+        self::assertThat($array, $constraint, $message);
+    }
+
+    /**
+     * Asserts that an array does not have a specified key.
+     *
+     * @param mixed             $key
+     * @param array|ArrayAccess $array
+     * @param string            $message
+     * @since  Method available since Release 3.0.0
+     */
+    public static function assertArrayNotHasKey($key, $array, $message = '')
+    {
+        if (!(is_integer($key) || is_string($key))) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(
+              1, 'integer or string'
+            );
+        }
+
+        if (!(is_array($array) || $array instanceof ArrayAccess)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(
+              2, 'array or ArrayAccess'
+            );
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+          new PHPUnit_Framework_Constraint_ArrayHasKey($key)
+        );
+
+        self::assertThat($array, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a haystack contains a needle.
+     *
+     * @param mixed   $needle
+     * @param mixed   $haystack
+     * @param string  $message
+     * @param boolean $ignoreCase
+     * @param boolean $checkForObjectIdentity
+     * @param boolean $checkForNonObjectIdentity
+     * @since  Method available since Release 2.1.0
+     */
+    public static function assertContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
+    {
+        if (is_array($haystack) ||
+            is_object($haystack) && $haystack instanceof Traversable) {
+            $constraint = new PHPUnit_Framework_Constraint_TraversableContains(
+              $needle, $checkForObjectIdentity, $checkForNonObjectIdentity
+            );
+        } elseif (is_string($haystack)) {
+            $constraint = new PHPUnit_Framework_Constraint_StringContains(
+              $needle, $ignoreCase
+            );
+        } else {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(
+              2, 'array, traversable or string'
+            );
+        }
+
+        self::assertThat($haystack, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a haystack that is stored in a static attribute of a class
+     * or an attribute of an object contains a needle.
+     *
+     * @param mixed   $needle
+     * @param string  $haystackAttributeName
+     * @param mixed   $haystackClassOrObject
+     * @param string  $message
+     * @param boolean $ignoreCase
+     * @param boolean $checkForObjectIdentity
+     * @param boolean $checkForNonObjectIdentity
+     * @since  Method available since Release 3.0.0
+     */
+    public static function assertAttributeContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
+    {
+        self::assertContains(
+          $needle,
+          self::readAttribute($haystackClassOrObject, $haystackAttributeName),
+          $message,
+          $ignoreCase,
+          $checkForObjectIdentity,
+          $checkForNonObjectIdentity
+        );
+    }
+
+    /**
+     * Asserts that a haystack does not contain a needle.
+     *
+     * @param mixed   $needle
+     * @param mixed   $haystack
+     * @param string  $message
+     * @param boolean $ignoreCase
+     * @param boolean $checkForObjectIdentity
+     * @param boolean $checkForNonObjectIdentity
+     * @since  Method available since Release 2.1.0
+     */
+    public static function assertNotContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
+    {
+        if (is_array($haystack) ||
+            is_object($haystack) && $haystack instanceof Traversable) {
+            $constraint = new PHPUnit_Framework_Constraint_Not(
+              new PHPUnit_Framework_Constraint_TraversableContains(
+                $needle, $checkForObjectIdentity, $checkForNonObjectIdentity
+              )
+            );
+        } elseif (is_string($haystack)) {
+            $constraint = new PHPUnit_Framework_Constraint_Not(
+              new PHPUnit_Framework_Constraint_StringContains(
+                $needle, $ignoreCase
+              )
+            );
+        } else {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(
+              2, 'array, traversable or string'
+            );
+        }
+
+        self::assertThat($haystack, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a haystack that is stored in a static attribute of a class
+     * or an attribute of an object does not contain a needle.
+     *
+     * @param mixed   $needle
+     * @param string  $haystackAttributeName
+     * @param mixed   $haystackClassOrObject
+     * @param string  $message
+     * @param boolean $ignoreCase
+     * @param boolean $checkForObjectIdentity
+     * @param boolean $checkForNonObjectIdentity
+     * @since  Method available since Release 3.0.0
+     */
+    public static function assertAttributeNotContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
+    {
+        self::assertNotContains(
+          $needle,
+          self::readAttribute($haystackClassOrObject, $haystackAttributeName),
+          $message,
+          $ignoreCase,
+          $checkForObjectIdentity,
+          $checkForNonObjectIdentity
+        );
+    }
+
+    /**
+     * Asserts that a haystack contains only values of a given type.
+     *
+     * @param string  $type
+     * @param mixed   $haystack
+     * @param boolean $isNativeType
+     * @param string  $message
+     * @since  Method available since Release 3.1.4
+     */
+    public static function assertContainsOnly($type, $haystack, $isNativeType = null, $message = '')
+    {
+        if (!(is_array($haystack) ||
+            is_object($haystack) && $haystack instanceof Traversable)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(
+              2, 'array or traversable'
+            );
+        }
+
+        if ($isNativeType == null) {
+            $isNativeType = PHPUnit_Util_Type::isType($type);
+        }
+
+        self::assertThat(
+          $haystack,
+          new PHPUnit_Framework_Constraint_TraversableContainsOnly(
+            $type, $isNativeType
+          ),
+          $message
+        );
+    }
+
+    /**
+     * Asserts that a haystack contains only instances of a given classname
+     *
+     * @param string            $classname
+     * @param array|Traversable $haystack
+     * @param string            $message
+     */
+    public static function assertContainsOnlyInstancesOf($classname, $haystack, $message = '')
+    {
+        if (!(is_array($haystack) ||
+            is_object($haystack) && $haystack instanceof Traversable)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(
+              2, 'array or traversable'
+            );
+        }
+
+        self::assertThat(
+            $haystack,
+            new PHPUnit_Framework_Constraint_TraversableContainsOnly(
+                $classname, false
+            ),
+            $message
+        );
+    }
+
+    /**
+     * Asserts that a haystack that is stored in a static attribute of a class
+     * or an attribute of an object contains only values of a given type.
+     *
+     * @param string  $type
+     * @param string  $haystackAttributeName
+     * @param mixed   $haystackClassOrObject
+     * @param boolean $isNativeType
+     * @param string  $message
+     * @since  Method available since Release 3.1.4
+     */
+    public static function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '')
+    {
+        self::assertContainsOnly(
+          $type,
+          self::readAttribute($haystackClassOrObject, $haystackAttributeName),
+          $isNativeType,
+          $message
+        );
+    }
+
+    /**
+     * Asserts that a haystack does not contain only values of a given type.
+     *
+     * @param string  $type
+     * @param mixed   $haystack
+     * @param boolean $isNativeType
+     * @param string  $message
+     * @since  Method available since Release 3.1.4
+     */
+    public static function assertNotContainsOnly($type, $haystack, $isNativeType = null, $message = '')
+    {
+        if (!(is_array($haystack) ||
+            is_object($haystack) && $haystack instanceof Traversable)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(
+              2, 'array or traversable'
+            );
+        }
+
+        if ($isNativeType == null) {
+            $isNativeType = PHPUnit_Util_Type::isType($type);
+        }
+
+        self::assertThat(
+          $haystack,
+          new PHPUnit_Framework_Constraint_Not(
+            new PHPUnit_Framework_Constraint_TraversableContainsOnly(
+              $type, $isNativeType
+            )
+          ),
+          $message
+        );
+    }
+
+    /**
+     * Asserts that a haystack that is stored in a static attribute of a class
+     * or an attribute of an object does not contain only values of a given
+     * type.
+     *
+     * @param string  $type
+     * @param string  $haystackAttributeName
+     * @param mixed   $haystackClassOrObject
+     * @param boolean $isNativeType
+     * @param string  $message
+     * @since  Method available since Release 3.1.4
+     */
+    public static function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '')
+    {
+        self::assertNotContainsOnly(
+          $type,
+          self::readAttribute($haystackClassOrObject, $haystackAttributeName),
+          $isNativeType,
+          $message
+        );
+    }
+
+    /**
+     * Asserts the number of elements of an array, Countable or Traversable.
+     *
+     * @param integer $expectedCount
+     * @param mixed   $haystack
+     * @param string  $message
+     */
+    public static function assertCount($expectedCount, $haystack, $message = '')
+    {
+        if (!is_int($expectedCount)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'integer');
+        }
+
+        if (!$haystack instanceof Countable &&
+            !$haystack instanceof Traversable &&
+            !is_array($haystack)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable or traversable');
+        }
+
+        self::assertThat(
+          $haystack,
+          new PHPUnit_Framework_Constraint_Count($expectedCount),
+          $message
+        );
+    }
+
+    /**
+     * Asserts the number of elements of an array, Countable or Traversable
+     * that is stored in an attribute.
+     *
+     * @param integer $expectedCount
+     * @param string  $haystackAttributeName
+     * @param mixed   $haystackClassOrObject
+     * @param string  $message
+     * @since Method available since Release 3.6.0
+     */
+    public static function assertAttributeCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '')
+    {
+        self::assertCount(
+          $expectedCount,
+          self::readAttribute($haystackClassOrObject, $haystackAttributeName),
+          $message
+        );
+    }
+
+    /**
+     * Asserts the number of elements of an array, Countable or Traversable.
+     *
+     * @param integer $expectedCount
+     * @param mixed   $haystack
+     * @param string  $message
+     */
+    public static function assertNotCount($expectedCount, $haystack, $message = '')
+    {
+        if (!is_int($expectedCount)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'integer');
+        }
+
+        if (!$haystack instanceof Countable &&
+            !$haystack instanceof Traversable &&
+            !is_array($haystack)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable or traversable');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+          new PHPUnit_Framework_Constraint_Count($expectedCount)
+        );
+
+        self::assertThat($haystack, $constraint, $message);
+    }
+
+    /**
+     * Asserts the number of elements of an array, Countable or Traversable
+     * that is stored in an attribute.
+     *
+     * @param integer $expectedCount
+     * @param string  $haystackAttributeName
+     * @param mixed   $haystackClassOrObject
+     * @param string  $message
+     * @since Method available since Release 3.6.0
+     */
+    public static function assertAttributeNotCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '')
+    {
+        self::assertNotCount(
+          $expectedCount,
+          self::readAttribute($haystackClassOrObject, $haystackAttributeName),
+          $message
+        );
+    }
+
+    /**
+     * Asserts that two variables are equal.
+     *
+     * @param mixed   $expected
+     * @param mixed   $actual
+     * @param string  $message
+     * @param float   $delta
+     * @param integer $maxDepth
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
+     */
+    public static function assertEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
+    {
+        $constraint = new PHPUnit_Framework_Constraint_IsEqual(
+          $expected, $delta, $maxDepth, $canonicalize, $ignoreCase
+        );
+
+        self::assertThat($actual, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a variable is equal to an attribute of an object.
+     *
+     * @param mixed   $expected
+     * @param string  $actualAttributeName
+     * @param string  $actualClassOrObject
+     * @param string  $message
+     * @param float   $delta
+     * @param integer $maxDepth
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
+     */
+    public static function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
+    {
+        self::assertEquals(
+          $expected,
+          self::readAttribute($actualClassOrObject, $actualAttributeName),
+          $message,
+          $delta,
+          $maxDepth,
+          $canonicalize,
+          $ignoreCase
+        );
+    }
+
+    /**
+     * Asserts that two variables are not equal.
+     *
+     * @param mixed   $expected
+     * @param mixed   $actual
+     * @param string  $message
+     * @param float   $delta
+     * @param integer $maxDepth
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
+     * @since  Method available since Release 2.3.0
+     */
+    public static function assertNotEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
+    {
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+          new PHPUnit_Framework_Constraint_IsEqual(
+            $expected, $delta, $maxDepth, $canonicalize, $ignoreCase
+          )
+        );
+
+        self::assertThat($actual, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a variable is not equal to an attribute of an object.
+     *
+     * @param mixed   $expected
+     * @param string  $actualAttributeName
+     * @param string  $actualClassOrObject
+     * @param string  $message
+     * @param float   $delta
+     * @param integer $maxDepth
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
+     */
+    public static function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
+    {
+        self::assertNotEquals(
+          $expected,
+          self::readAttribute($actualClassOrObject, $actualAttributeName),
+          $message,
+          $delta,
+          $maxDepth,
+          $canonicalize,
+          $ignoreCase
+        );
+    }
+
+    /**
+     * Asserts that a variable is empty.
+     *
+     * @param  mixed                                  $actual
+     * @param  string                                 $message
+     * @throws PHPUnit_Framework_AssertionFailedError
+     */
+    public static function assertEmpty($actual, $message = '')
+    {
+        self::assertThat($actual, self::isEmpty(), $message);
+    }
+
+    /**
+     * Asserts that a static attribute of a class or an attribute of an object
+     * is empty.
+     *
+     * @param string $haystackAttributeName
+     * @param mixed  $haystackClassOrObject
+     * @param string $message
+     * @since Method available since Release 3.5.0
+     */
+    public static function assertAttributeEmpty($haystackAttributeName, $haystackClassOrObject, $message = '')
+    {
+        self::assertEmpty(
+          self::readAttribute($haystackClassOrObject, $haystackAttributeName),
+          $message
+        );
+    }
+
+    /**
+     * Asserts that a variable is not empty.
+     *
+     * @param  mixed                                  $actual
+     * @param  string                                 $message
+     * @throws PHPUnit_Framework_AssertionFailedError
+     */
+    public static function assertNotEmpty($actual, $message = '')
+    {
+        self::assertThat($actual, self::logicalNot(self::isEmpty()), $message);
+    }
+
+    /**
+     * Asserts that a static attribute of a class or an attribute of an object
+     * is not empty.
+     *
+     * @param string $haystackAttributeName
+     * @param mixed  $haystackClassOrObject
+     * @param string $message
+     * @since Method available since Release 3.5.0
+     */
+    public static function assertAttributeNotEmpty($haystackAttributeName, $haystackClassOrObject, $message = '')
+    {
+        self::assertNotEmpty(
+          self::readAttribute($haystackClassOrObject, $haystackAttributeName),
+          $message
+        );
+    }
+
+    /**
+     * Asserts that a value is greater than another value.
+     *
+     * @param mixed  $expected
+     * @param mixed  $actual
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertGreaterThan($expected, $actual, $message = '')
+    {
+        self::assertThat($actual, self::greaterThan($expected), $message);
+    }
+
+    /**
+     * Asserts that an attribute is greater than another value.
+     *
+     * @param mixed  $expected
+     * @param string $actualAttributeName
+     * @param string $actualClassOrObject
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertAttributeGreaterThan($expected, $actualAttributeName, $actualClassOrObject, $message = '')
+    {
+        self::assertGreaterThan(
+          $expected,
+          self::readAttribute($actualClassOrObject, $actualAttributeName),
+          $message
+        );
+    }
+
+    /**
+     * Asserts that a value is greater than or equal to another value.
+     *
+     * @param mixed  $expected
+     * @param mixed  $actual
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertGreaterThanOrEqual($expected, $actual, $message = '')
+    {
+        self::assertThat(
+          $actual, self::greaterThanOrEqual($expected), $message
+        );
+    }
+
+    /**
+     * Asserts that an attribute is greater than or equal to another value.
+     *
+     * @param mixed  $expected
+     * @param string $actualAttributeName
+     * @param string $actualClassOrObject
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertAttributeGreaterThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '')
+    {
+        self::assertGreaterThanOrEqual(
+          $expected,
+          self::readAttribute($actualClassOrObject, $actualAttributeName),
+          $message
+        );
+    }
+
+    /**
+     * Asserts that a value is smaller than another value.
+     *
+     * @param mixed  $expected
+     * @param mixed  $actual
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertLessThan($expected, $actual, $message = '')
+    {
+        self::assertThat($actual, self::lessThan($expected), $message);
+    }
+
+    /**
+     * Asserts that an attribute is smaller than another value.
+     *
+     * @param mixed  $expected
+     * @param string $actualAttributeName
+     * @param string $actualClassOrObject
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertAttributeLessThan($expected, $actualAttributeName, $actualClassOrObject, $message = '')
+    {
+        self::assertLessThan(
+          $expected,
+          self::readAttribute($actualClassOrObject, $actualAttributeName),
+          $message
+        );
+    }
+
+    /**
+     * Asserts that a value is smaller than or equal to another value.
+     *
+     * @param mixed  $expected
+     * @param mixed  $actual
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertLessThanOrEqual($expected, $actual, $message = '')
+    {
+        self::assertThat($actual, self::lessThanOrEqual($expected), $message);
+    }
+
+    /**
+     * Asserts that an attribute is smaller than or equal to another value.
+     *
+     * @param mixed  $expected
+     * @param string $actualAttributeName
+     * @param string $actualClassOrObject
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertAttributeLessThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '')
+    {
+        self::assertLessThanOrEqual(
+          $expected,
+          self::readAttribute($actualClassOrObject, $actualAttributeName),
+          $message
+        );
+    }
+
+    /**
+     * Asserts that the contents of one file is equal to the contents of another
+     * file.
+     *
+     * @param string  $expected
+     * @param string  $actual
+     * @param string  $message
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
+     * @since  Method available since Release 3.2.14
+     */
+    public static function assertFileEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false)
+    {
+        self::assertFileExists($expected, $message);
+        self::assertFileExists($actual, $message);
+
+        self::assertEquals(
+          file_get_contents($expected),
+          file_get_contents($actual),
+          $message,
+          0,
+          10,
+          $canonicalize,
+          $ignoreCase
+        );
+    }
+
+    /**
+     * Asserts that the contents of one file is not equal to the contents of
+     * another file.
+     *
+     * @param string  $expected
+     * @param string  $actual
+     * @param string  $message
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
+     * @since  Method available since Release 3.2.14
+     */
+    public static function assertFileNotEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false)
+    {
+        self::assertFileExists($expected, $message);
+        self::assertFileExists($actual, $message);
+
+        self::assertNotEquals(
+          file_get_contents($expected),
+          file_get_contents($actual),
+          $message,
+          0,
+          10,
+          $canonicalize,
+          $ignoreCase
+        );
+    }
+
+    /**
+     * Asserts that the contents of a string is equal
+     * to the contents of a file.
+     *
+     * @param string  $expectedFile
+     * @param string  $actualString
+     * @param string  $message
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
+     * @since  Method available since Release 3.3.0
+     */
+    public static function assertStringEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false)
+    {
+        self::assertFileExists($expectedFile, $message);
+
+        self::assertEquals(
+          file_get_contents($expectedFile),
+          $actualString,
+          $message,
+          0,
+          10,
+          $canonicalize,
+          $ignoreCase
+        );
+    }
+
+    /**
+     * Asserts that the contents of a string is not equal
+     * to the contents of a file.
+     *
+     * @param string  $expectedFile
+     * @param string  $actualString
+     * @param string  $message
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
+     * @since  Method available since Release 3.3.0
+     */
+    public static function assertStringNotEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false)
+    {
+        self::assertFileExists($expectedFile, $message);
+
+        self::assertNotEquals(
+          file_get_contents($expectedFile),
+          $actualString,
+          $message,
+          0,
+          10,
+          $canonicalize,
+          $ignoreCase
+        );
+    }
+
+    /**
+     * Asserts that a file exists.
+     *
+     * @param string $filename
+     * @param string $message
+     * @since  Method available since Release 3.0.0
+     */
+    public static function assertFileExists($filename, $message = '')
+    {
+        if (!is_string($filename)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_FileExists;
+
+        self::assertThat($filename, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a file does not exist.
+     *
+     * @param string $filename
+     * @param string $message
+     * @since  Method available since Release 3.0.0
+     */
+    public static function assertFileNotExists($filename, $message = '')
+    {
+        if (!is_string($filename)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+          new PHPUnit_Framework_Constraint_FileExists
+        );
+
+        self::assertThat($filename, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a condition is true.
+     *
+     * @param  boolean                                $condition
+     * @param  string                                 $message
+     * @throws PHPUnit_Framework_AssertionFailedError
+     */
+    public static function assertTrue($condition, $message = '')
+    {
+        self::assertThat($condition, self::isTrue(), $message);
+    }
+
+    /**
+     * Asserts that a condition is not true.
+     *
+     * @param  boolean                                $condition
+     * @param  string                                 $message
+     * @throws PHPUnit_Framework_AssertionFailedError
+     */
+    public static function assertNotTrue($condition, $message = '')
+    {
+        self::assertThat($condition, self::logicalNot(self::isTrue()), $message);
+    }
+
+    /**
+     * Asserts that a condition is false.
+     *
+     * @param  boolean                                $condition
+     * @param  string                                 $message
+     * @throws PHPUnit_Framework_AssertionFailedError
+     */
+    public static function assertFalse($condition, $message = '')
+    {
+        self::assertThat($condition, self::isFalse(), $message);
+    }
+
+    /**
+     * Asserts that a condition is not false.
+     *
+     * @param  boolean                                $condition
+     * @param  string                                 $message
+     * @throws PHPUnit_Framework_AssertionFailedError
+     */
+    public static function assertNotFalse($condition, $message = '')
+    {
+        self::assertThat($condition, self::logicalNot(self::isFalse()), $message);
+    }
+
+    /**
+     * Asserts that a variable is not null.
+     *
+     * @param mixed  $actual
+     * @param string $message
+     */
+    public static function assertNotNull($actual, $message = '')
+    {
+        self::assertThat($actual, self::logicalNot(self::isNull()), $message);
+    }
+
+    /**
+     * Asserts that a variable is null.
+     *
+     * @param mixed  $actual
+     * @param string $message
+     */
+    public static function assertNull($actual, $message = '')
+    {
+        self::assertThat($actual, self::isNull(), $message);
+    }
+
+    /**
+     * Asserts that a class has a specified attribute.
+     *
+     * @param string $attributeName
+     * @param string $className
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertClassHasAttribute($attributeName, $className, $message = '')
+    {
+        if (!is_string($attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
+        }
+
+        if (!is_string($className) || !class_exists($className, false)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'class name');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_ClassHasAttribute(
+          $attributeName
+        );
+
+        self::assertThat($className, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a class does not have a specified attribute.
+     *
+     * @param string $attributeName
+     * @param string $className
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertClassNotHasAttribute($attributeName, $className, $message = '')
+    {
+        if (!is_string($attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
+        }
+
+        if (!is_string($className) || !class_exists($className, false)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'class name');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+          new PHPUnit_Framework_Constraint_ClassHasAttribute($attributeName)
+        );
+
+        self::assertThat($className, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a class has a specified static attribute.
+     *
+     * @param string $attributeName
+     * @param string $className
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertClassHasStaticAttribute($attributeName, $className, $message = '')
+    {
+        if (!is_string($attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
+        }
+
+        if (!is_string($className) || !class_exists($className, false)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'class name');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_ClassHasStaticAttribute(
+          $attributeName
+        );
+
+        self::assertThat($className, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a class does not have a specified static attribute.
+     *
+     * @param string $attributeName
+     * @param string $className
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertClassNotHasStaticAttribute($attributeName, $className, $message = '')
+    {
+        if (!is_string($attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
+        }
+
+        if (!is_string($className) || !class_exists($className, false)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'class name');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+          new PHPUnit_Framework_Constraint_ClassHasStaticAttribute(
+            $attributeName
+          )
+        );
+
+        self::assertThat($className, $constraint, $message);
+    }
+
+    /**
+     * Asserts that an object has a specified attribute.
+     *
+     * @param string $attributeName
+     * @param object $object
+     * @param string $message
+     * @since  Method available since Release 3.0.0
+     */
+    public static function assertObjectHasAttribute($attributeName, $object, $message = '')
+    {
+        if (!is_string($attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
+        }
+
+        if (!is_object($object)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'object');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_ObjectHasAttribute(
+          $attributeName
+        );
+
+        self::assertThat($object, $constraint, $message);
+    }
+
+    /**
+     * Asserts that an object does not have a specified attribute.
+     *
+     * @param string $attributeName
+     * @param object $object
+     * @param string $message
+     * @since  Method available since Release 3.0.0
+     */
+    public static function assertObjectNotHasAttribute($attributeName, $object, $message = '')
+    {
+        if (!is_string($attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
+        }
+
+        if (!is_object($object)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'object');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+          new PHPUnit_Framework_Constraint_ObjectHasAttribute($attributeName)
+        );
+
+        self::assertThat($object, $constraint, $message);
+    }
+
+    /**
+     * Asserts that two variables have the same type and value.
+     * Used on objects, it asserts that two variables reference
+     * the same object.
+     *
+     * @param mixed  $expected
+     * @param mixed  $actual
+     * @param string $message
+     */
+    public static function assertSame($expected, $actual, $message = '')
+    {
+        if (is_bool($expected) && is_bool($actual)) {
+            self::assertEquals($expected, $actual, $message);
+        } else {
+            $constraint = new PHPUnit_Framework_Constraint_IsIdentical(
+              $expected
+            );
+
+            self::assertThat($actual, $constraint, $message);
+        }
+    }
+
+    /**
+     * Asserts that a variable and an attribute of an object have the same type
+     * and value.
+     *
+     * @param mixed  $expected
+     * @param string $actualAttributeName
+     * @param object $actualClassOrObject
+     * @param string $message
+     */
+    public static function assertAttributeSame($expected, $actualAttributeName, $actualClassOrObject, $message = '')
+    {
+        self::assertSame(
+          $expected,
+          self::readAttribute($actualClassOrObject, $actualAttributeName),
+          $message
+        );
+    }
+
+    /**
+     * Asserts that two variables do not have the same type and value.
+     * Used on objects, it asserts that two variables do not reference
+     * the same object.
+     *
+     * @param mixed  $expected
+     * @param mixed  $actual
+     * @param string $message
+     */
+    public static function assertNotSame($expected, $actual, $message = '')
+    {
+        if (is_bool($expected) && is_bool($actual)) {
+            self::assertNotEquals($expected, $actual, $message);
+        } else {
+            $constraint = new PHPUnit_Framework_Constraint_Not(
+              new PHPUnit_Framework_Constraint_IsIdentical($expected)
+            );
+
+            self::assertThat($actual, $constraint, $message);
+        }
+    }
+
+    /**
+     * Asserts that a variable and an attribute of an object do not have the
+     * same type and value.
+     *
+     * @param mixed  $expected
+     * @param string $actualAttributeName
+     * @param object $actualClassOrObject
+     * @param string $message
+     */
+    public static function assertAttributeNotSame($expected, $actualAttributeName, $actualClassOrObject, $message = '')
+    {
+        self::assertNotSame(
+          $expected,
+          self::readAttribute($actualClassOrObject, $actualAttributeName),
+          $message
+        );
+    }
+
+    /**
+     * Asserts that a variable is of a given type.
+     *
+     * @param string $expected
+     * @param mixed  $actual
+     * @param string $message
+     * @since Method available since Release 3.5.0
+     */
+    public static function assertInstanceOf($expected, $actual, $message = '')
+    {
+        if (!(is_string($expected) && (class_exists($expected) || interface_exists($expected)))) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'class or interface name');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_IsInstanceOf(
+            $expected
+        );
+
+        self::assertThat($actual, $constraint, $message);
+    }
+
+    /**
+     * Asserts that an attribute is of a given type.
+     *
+     * @param string $expected
+     * @param string $attributeName
+     * @param mixed  $classOrObject
+     * @param string $message
+     * @since Method available since Release 3.5.0
+     */
+    public static function assertAttributeInstanceOf($expected, $attributeName, $classOrObject, $message = '')
+    {
+        self::assertInstanceOf(
+          $expected,
+          self::readAttribute($classOrObject, $attributeName),
+          $message
+        );
+    }
+
+    /**
+     * Asserts that a variable is not of a given type.
+     *
+     * @param string $expected
+     * @param mixed  $actual
+     * @param string $message
+     * @since Method available since Release 3.5.0
+     */
+    public static function assertNotInstanceOf($expected, $actual, $message = '')
+    {
+        if (!(is_string($expected) && (class_exists($expected) || interface_exists($expected)))) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'class or interface name');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+            new PHPUnit_Framework_Constraint_IsInstanceOf($expected)
+        );
+
+        self::assertThat($actual, $constraint, $message);
+    }
+
+    /**
+     * Asserts that an attribute is of a given type.
+     *
+     * @param string $expected
+     * @param string $attributeName
+     * @param mixed  $classOrObject
+     * @param string $message
+     * @since Method available since Release 3.5.0
+     */
+    public static function assertAttributeNotInstanceOf($expected, $attributeName, $classOrObject, $message = '')
+    {
+        self::assertNotInstanceOf(
+          $expected,
+          self::readAttribute($classOrObject, $attributeName),
+          $message
+        );
+    }
+
+    /**
+     * Asserts that a variable is of a given type.
+     *
+     * @param string $expected
+     * @param mixed  $actual
+     * @param string $message
+     * @since Method available since Release 3.5.0
+     */
+    public static function assertInternalType($expected, $actual, $message = '')
+    {
+        if (!is_string($expected)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_IsType(
+            $expected
+        );
+
+        self::assertThat($actual, $constraint, $message);
+    }
+
+    /**
+     * Asserts that an attribute is of a given type.
+     *
+     * @param string $expected
+     * @param string $attributeName
+     * @param mixed  $classOrObject
+     * @param string $message
+     * @since Method available since Release 3.5.0
+     */
+    public static function assertAttributeInternalType($expected, $attributeName, $classOrObject, $message = '')
+    {
+        self::assertInternalType(
+          $expected,
+          self::readAttribute($classOrObject, $attributeName),
+          $message
+        );
+    }
+
+    /**
+     * Asserts that a variable is not of a given type.
+     *
+     * @param string $expected
+     * @param mixed  $actual
+     * @param string $message
+     * @since Method available since Release 3.5.0
+     */
+    public static function assertNotInternalType($expected, $actual, $message = '')
+    {
+        if (!is_string($expected)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+            new PHPUnit_Framework_Constraint_IsType($expected)
+        );
+
+        self::assertThat($actual, $constraint, $message);
+    }
+
+    /**
+     * Asserts that an attribute is of a given type.
+     *
+     * @param string $expected
+     * @param string $attributeName
+     * @param mixed  $classOrObject
+     * @param string $message
+     * @since Method available since Release 3.5.0
+     */
+    public static function assertAttributeNotInternalType($expected, $attributeName, $classOrObject, $message = '')
+    {
+        self::assertNotInternalType(
+          $expected,
+          self::readAttribute($classOrObject, $attributeName),
+          $message
+        );
+    }
+
+    /**
+     * Asserts that a string matches a given regular expression.
+     *
+     * @param string $pattern
+     * @param string $string
+     * @param string $message
+     */
+    public static function assertRegExp($pattern, $string, $message = '')
+    {
+        if (!is_string($pattern)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_string($string)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_PCREMatch($pattern);
+
+        self::assertThat($string, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a string does not match a given regular expression.
+     *
+     * @param string $pattern
+     * @param string $string
+     * @param string $message
+     * @since  Method available since Release 2.1.0
+     */
+    public static function assertNotRegExp($pattern, $string, $message = '')
+    {
+        if (!is_string($pattern)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_string($string)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+          new PHPUnit_Framework_Constraint_PCREMatch($pattern)
+        );
+
+        self::assertThat($string, $constraint, $message);
+    }
+
+    /**
+     * Assert that the size of two arrays (or `Countable` or `Traversable` objects)
+     * is the same.
+     *
+     * @param array|Countable|Traversable $expected
+     * @param array|Countable|Traversable $actual
+     * @param string                      $message
+     */
+    public static function assertSameSize($expected, $actual, $message = '')
+    {
+        if (!$expected instanceof Countable &&
+            !$expected instanceof Traversable &&
+            !is_array($expected)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'countable or traversable');
+        }
+
+        if (!$actual instanceof Countable &&
+            !$actual instanceof Traversable &&
+            !is_array($actual)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable or traversable');
+        }
+
+        self::assertThat(
+          $actual,
+          new PHPUnit_Framework_Constraint_SameSize($expected),
+          $message
+        );
+    }
+
+    /**
+     * Assert that the size of two arrays (or `Countable` or `Traversable` objects)
+     * is not the same.
+     *
+     * @param array|Countable|Traversable $expected
+     * @param array|Countable|Traversable $actual
+     * @param string                      $message
+     */
+    public static function assertNotSameSize($expected, $actual, $message = '')
+    {
+        if (!$expected instanceof Countable &&
+            !$expected instanceof Traversable &&
+            !is_array($expected)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'countable or traversable');
+        }
+
+        if (!$actual instanceof Countable &&
+            !$actual instanceof Traversable &&
+            !is_array($actual)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable or traversable');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+          new PHPUnit_Framework_Constraint_SameSize($expected)
+        );
+
+        self::assertThat($actual, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a string matches a given format string.
+     *
+     * @param string $format
+     * @param string $string
+     * @param string $message
+     * @since  Method available since Release 3.5.0
+     */
+    public static function assertStringMatchesFormat($format, $string, $message = '')
+    {
+        if (!is_string($format)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_string($string)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_StringMatches($format);
+
+        self::assertThat($string, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a string does not match a given format string.
+     *
+     * @param string $format
+     * @param string $string
+     * @param string $message
+     * @since  Method available since Release 3.5.0
+     */
+    public static function assertStringNotMatchesFormat($format, $string, $message = '')
+    {
+        if (!is_string($format)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_string($string)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+          new PHPUnit_Framework_Constraint_StringMatches($format)
+        );
+
+        self::assertThat($string, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a string matches a given format file.
+     *
+     * @param string $formatFile
+     * @param string $string
+     * @param string $message
+     * @since  Method available since Release 3.5.0
+     */
+    public static function assertStringMatchesFormatFile($formatFile, $string, $message = '')
+    {
+        self::assertFileExists($formatFile, $message);
+
+        if (!is_string($string)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_StringMatches(
+          file_get_contents($formatFile)
+        );
+
+        self::assertThat($string, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a string does not match a given format string.
+     *
+     * @param string $formatFile
+     * @param string $string
+     * @param string $message
+     * @since  Method available since Release 3.5.0
+     */
+    public static function assertStringNotMatchesFormatFile($formatFile, $string, $message = '')
+    {
+        self::assertFileExists($formatFile, $message);
+
+        if (!is_string($string)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+          new PHPUnit_Framework_Constraint_StringMatches(
+            file_get_contents($formatFile)
+          )
+        );
+
+        self::assertThat($string, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a string starts with a given prefix.
+     *
+     * @param string $prefix
+     * @param string $string
+     * @param string $message
+     * @since  Method available since Release 3.4.0
+     */
+    public static function assertStringStartsWith($prefix, $string, $message = '')
+    {
+        if (!is_string($prefix)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_string($string)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_StringStartsWith(
+          $prefix
+        );
+
+        self::assertThat($string, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a string starts not with a given prefix.
+     *
+     * @param string $prefix
+     * @param string $string
+     * @param string $message
+     * @since  Method available since Release 3.4.0
+     */
+    public static function assertStringStartsNotWith($prefix, $string, $message = '')
+    {
+        if (!is_string($prefix)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_string($string)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+          new PHPUnit_Framework_Constraint_StringStartsWith($prefix)
+        );
+
+        self::assertThat($string, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a string ends with a given suffix.
+     *
+     * @param string $suffix
+     * @param string $string
+     * @param string $message
+     * @since  Method available since Release 3.4.0
+     */
+    public static function assertStringEndsWith($suffix, $string, $message = '')
+    {
+        if (!is_string($suffix)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_string($string)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_StringEndsWith($suffix);
+
+        self::assertThat($string, $constraint, $message);
+    }
+
+    /**
+     * Asserts that a string ends not with a given suffix.
+     *
+     * @param string $suffix
+     * @param string $string
+     * @param string $message
+     * @since  Method available since Release 3.4.0
+     */
+    public static function assertStringEndsNotWith($suffix, $string, $message = '')
+    {
+        if (!is_string($suffix)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_string($string)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
+        }
+
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+          new PHPUnit_Framework_Constraint_StringEndsWith($suffix)
+        );
+
+        self::assertThat($string, $constraint, $message);
+    }
+
+    /**
+     * Asserts that two XML files are equal.
+     *
+     * @param string $expectedFile
+     * @param string $actualFile
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertXmlFileEqualsXmlFile($expectedFile, $actualFile, $message = '')
+    {
+        self::assertFileExists($expectedFile);
+        self::assertFileExists($actualFile);
+
+        $expected = new DOMDocument;
+        $expected->preserveWhiteSpace = false;
+        $expected->load($expectedFile);
+
+        $actual = new DOMDocument;
+        $actual->preserveWhiteSpace = false;
+        $actual->load($actualFile);
+
+        self::assertEquals($expected, $actual, $message);
+    }
+
+    /**
+     * Asserts that two XML files are not equal.
+     *
+     * @param string $expectedFile
+     * @param string $actualFile
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertXmlFileNotEqualsXmlFile($expectedFile, $actualFile, $message = '')
+    {
+        self::assertFileExists($expectedFile);
+        self::assertFileExists($actualFile);
+
+        $expected = new DOMDocument;
+        $expected->preserveWhiteSpace = false;
+        $expected->load($expectedFile);
+
+        $actual = new DOMDocument;
+        $actual->preserveWhiteSpace = false;
+        $actual->load($actualFile);
+
+        self::assertNotEquals($expected, $actual, $message);
+    }
+
+    /**
+     * Asserts that two XML documents are equal.
+     *
+     * @param string $expectedFile
+     * @param string $actualXml
+     * @param string $message
+     * @since  Method available since Release 3.3.0
+     */
+    public static function assertXmlStringEqualsXmlFile($expectedFile, $actualXml, $message = '')
+    {
+        self::assertFileExists($expectedFile);
+
+        $expected = new DOMDocument;
+        $expected->preserveWhiteSpace = false;
+        $expected->load($expectedFile);
+
+        $actual = new DOMDocument;
+        $actual->preserveWhiteSpace = false;
+        $actual->loadXML($actualXml);
+
+        self::assertEquals($expected, $actual, $message);
+    }
+
+    /**
+     * Asserts that two XML documents are not equal.
+     *
+     * @param string $expectedFile
+     * @param string $actualXml
+     * @param string $message
+     * @since  Method available since Release 3.3.0
+     */
+    public static function assertXmlStringNotEqualsXmlFile($expectedFile, $actualXml, $message = '')
+    {
+        self::assertFileExists($expectedFile);
+
+        $expected = new DOMDocument;
+        $expected->preserveWhiteSpace = false;
+        $expected->load($expectedFile);
+
+        $actual = new DOMDocument;
+        $actual->preserveWhiteSpace = false;
+        $actual->loadXML($actualXml);
+
+        self::assertNotEquals($expected, $actual, $message);
+    }
+
+    /**
+     * Asserts that two XML documents are equal.
+     *
+     * @param string $expectedXml
+     * @param string $actualXml
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertXmlStringEqualsXmlString($expectedXml, $actualXml, $message = '')
+    {
+        $expected = new DOMDocument;
+        $expected->preserveWhiteSpace = false;
+        $expected->loadXML($expectedXml);
+
+        $actual = new DOMDocument;
+        $actual->preserveWhiteSpace = false;
+        $actual->loadXML($actualXml);
+
+        self::assertEquals($expected, $actual, $message);
+    }
+
+    /**
+     * Asserts that two XML documents are not equal.
+     *
+     * @param string $expectedXml
+     * @param string $actualXml
+     * @param string $message
+     * @since  Method available since Release 3.1.0
+     */
+    public static function assertXmlStringNotEqualsXmlString($expectedXml, $actualXml, $message = '')
+    {
+        $expected = new DOMDocument;
+        $expected->preserveWhiteSpace = false;
+        $expected->loadXML($expectedXml);
+
+        $actual = new DOMDocument;
+        $actual->preserveWhiteSpace = false;
+        $actual->loadXML($actualXml);
+
+        self::assertNotEquals($expected, $actual, $message);
+    }
+
+    /**
+     * Asserts that a hierarchy of DOMElements matches.
+     *
+     * @param DOMElement $expectedElement
+     * @param DOMElement $actualElement
+     * @param boolean    $checkAttributes
+     * @param string     $message
+     * @author Mattis Stordalen Flister <mattis@xait.no>
+     * @since  Method available since Release 3.3.0
+     */
+    public static function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actualElement, $checkAttributes = false, $message = '')
+    {
+        self::assertEquals(
+          $expectedElement->tagName,
+          $actualElement->tagName,
+          $message
+        );
+
+        if ($checkAttributes) {
+            self::assertEquals(
+              $expectedElement->attributes->length,
+              $actualElement->attributes->length,
+              sprintf(
+                '%s%sNumber of attributes on node "%s" does not match',
+                $message,
+                !empty($message) ? "\n" : '',
+                $expectedElement->tagName
+              )
+            );
+
+            for ($i = 0 ; $i < $expectedElement->attributes->length; $i++) {
+                $expectedAttribute = $expectedElement->attributes->item($i);
+                $actualAttribute   = $actualElement->attributes->getNamedItem(
+                  $expectedAttribute->name
+                );
+
+                if (!$actualAttribute) {
+                    self::fail(
+                      sprintf(
+                        '%s%sCould not find attribute "%s" on node "%s"',
+                        $message,
+                        !empty($message) ? "\n" : '',
+                        $expectedAttribute->name,
+                        $expectedElement->tagName
+                      )
+                    );
+                }
+            }
+        }
+
+        PHPUnit_Util_XML::removeCharacterDataNodes($expectedElement);
+        PHPUnit_Util_XML::removeCharacterDataNodes($actualElement);
+
+        self::assertEquals(
+          $expectedElement->childNodes->length,
+          $actualElement->childNodes->length,
+          sprintf(
+            '%s%sNumber of child nodes of "%s" differs',
+            $message,
+            !empty($message) ? "\n" : '',
+            $expectedElement->tagName
+          )
+        );
+
+        for ($i = 0; $i < $expectedElement->childNodes->length; $i++) {
+            self::assertEqualXMLStructure(
+              $expectedElement->childNodes->item($i),
+              $actualElement->childNodes->item($i),
+              $checkAttributes,
+              $message
+            );
+        }
+    }
+
+    /**
+     * Assert the presence, absence, or count of elements in a document matching
+     * the CSS $selector, regardless of the contents of those elements.
+     *
+     * The first argument, $selector, is the CSS selector used to match
+     * the elements in the $actual document.
+     *
+     * The second argument, $count, can be either boolean or numeric.
+     * When boolean, it asserts for presence of elements matching the selector
+     * (true) or absence of elements (false).
+     * When numeric, it asserts the count of elements.
+     *
+     * assertSelectCount("#binder", true, $xml);  // any?
+     * assertSelectCount(".binder", 3, $xml);     // exactly 3?
+     *
+     * @param array   $selector
+     * @param integer $count
+     * @param mixed   $actual
+     * @param string  $message
+     * @param boolean $isHtml
+     * @since  Method available since Release 3.3.0
+     * @author Mike Naberezny <mike@maintainable.com>
+     * @author Derek DeVries <derek@maintainable.com>
+     */
+    public static function assertSelectCount($selector, $count, $actual, $message = '', $isHtml = true)
+    {
+        self::assertSelectEquals(
+          $selector, true, $count, $actual, $message, $isHtml
+        );
+    }
+
+    /**
+     * assertSelectRegExp("#binder .name", "/Mike|Derek/", true, $xml); // any?
+     * assertSelectRegExp("#binder .name", "/Mike|Derek/", 3, $xml);    // 3?
+     *
+     * @param array   $selector
+     * @param string  $pattern
+     * @param integer $count
+     * @param mixed   $actual
+     * @param string  $message
+     * @param boolean $isHtml
+     * @since  Method available since Release 3.3.0
+     * @author Mike Naberezny <mike@maintainable.com>
+     * @author Derek DeVries <derek@maintainable.com>
+     */
+    public static function assertSelectRegExp($selector, $pattern, $count, $actual, $message = '', $isHtml = true)
+    {
+        self::assertSelectEquals(
+          $selector, "regexp:$pattern", $count, $actual, $message, $isHtml
+        );
+    }
+
+    /**
+     * assertSelectEquals("#binder .name", "Chuck", true,  $xml);  // any?
+     * assertSelectEquals("#binder .name", "Chuck", false, $xml);  // none?
+     *
+     * @param array   $selector
+     * @param string  $content
+     * @param integer $count
+     * @param mixed   $actual
+     * @param string  $message
+     * @param boolean $isHtml
+     * @since  Method available since Release 3.3.0
+     * @author Mike Naberezny <mike@maintainable.com>
+     * @author Derek DeVries <derek@maintainable.com>
+     */
+    public static function assertSelectEquals($selector, $content, $count, $actual, $message = '', $isHtml = true)
+    {
+        $tags = PHPUnit_Util_XML::cssSelect(
+          $selector, $content, $actual, $isHtml
+        );
+
+        // assert specific number of elements
+        if (is_numeric($count)) {
+            $counted = $tags ? count($tags) : 0;
+            self::assertEquals($count, $counted, $message);
+        }
+
+        // assert any elements exist if true, assert no elements exist if false
+        else if (is_bool($count)) {
+            $any = count($tags) > 0 && $tags[0] instanceof DOMNode;
+
+            if ($count) {
+                self::assertTrue($any, $message);
+            } else {
+                self::assertFalse($any, $message);
+            }
+        }
+
+        // check for range number of elements
+        else if (is_array($count) &&
+                (isset($count['>']) || isset($count['<']) ||
+                isset($count['>=']) || isset($count['<=']))) {
+            $counted = $tags ? count($tags) : 0;
+
+            if (isset($count['>'])) {
+                self::assertTrue($counted > $count['>'], $message);
+            }
+
+            if (isset($count['>='])) {
+                self::assertTrue($counted >= $count['>='], $message);
+            }
+
+            if (isset($count['<'])) {
+                self::assertTrue($counted < $count['<'], $message);
+            }
+
+            if (isset($count['<='])) {
+                self::assertTrue($counted <= $count['<='], $message);
+            }
+        } else {
+            throw new PHPUnit_Framework_Exception;
+        }
+    }
+
+    /**
+     * Evaluate an HTML or XML string and assert its structure and/or contents.
+     *
+     * The first argument ($matcher) is an associative array that specifies the
+     * match criteria for the assertion:
+     *
+     *  - `id`           : the node with the given id attribute must match the
+     *                     corresponding value.
+     *  - `tag`          : the node type must match the corresponding value.
+     *  - `attributes`   : a hash. The node's attributes must match the
+     *                     corresponding values in the hash.
+     *  - `content`      : The text content must match the given value.
+     *  - `parent`       : a hash. The node's parent must match the
+     *                     corresponding hash.
+     *  - `child`        : a hash. At least one of the node's immediate children
+     *                     must meet the criteria described by the hash.
+     *  - `ancestor`     : a hash. At least one of the node's ancestors must
+     *                     meet the criteria described by the hash.
+     *  - `descendant`   : a hash. At least one of the node's descendants must
+     *                     meet the criteria described by the hash.
+     *  - `children`     : a hash, for counting children of a node.
+     *                     Accepts the keys:
+     *    - `count`        : a number which must equal the number of children
+     *                       that match
+     *    - `less_than`    : the number of matching children must be greater
+     *                       than this number
+     *    - `greater_than` : the number of matching children must be less than
+     *                       this number
+     *    - `only`         : another hash consisting of the keys to use to match
+     *                       on the children, and only matching children will be
+     *                       counted
+     *
+     * <code>
+     * // Matcher that asserts that there is an element with an id="my_id".
+     * $matcher = array('id' => 'my_id');
+     *
+     * // Matcher that asserts that there is a "span" tag.
+     * $matcher = array('tag' => 'span');
+     *
+     * // Matcher that asserts that there is a "span" tag with the content
+     * // "Hello World".
+     * $matcher = array('tag' => 'span', 'content' => 'Hello World');
+     *
+     * // Matcher that asserts that there is a "span" tag with content matching
+     * // the regular expression pattern.
+     * $matcher = array('tag' => 'span', 'content' => 'regexp:/Try P(HP|ython)/');
+     *
+     * // Matcher that asserts that there is a "span" with an "list" class
+     * // attribute.
+     * $matcher = array(
+     *   'tag'        => 'span',
+     *   'attributes' => array('class' => 'list')
+     * );
+     *
+     * // Matcher that asserts that there is a "span" inside of a "div".
+     * $matcher = array(
+     *   'tag'    => 'span',
+     *   'parent' => array('tag' => 'div')
+     * );
+     *
+     * // Matcher that asserts that there is a "span" somewhere inside a
+     * // "table".
+     * $matcher = array(
+     *   'tag'      => 'span',
+     *   'ancestor' => array('tag' => 'table')
+     * );
+     *
+     * // Matcher that asserts that there is a "span" with at least one "em"
+     * // child.
+     * $matcher = array(
+     *   'tag'   => 'span',
+     *   'child' => array('tag' => 'em')
+     * );
+     *
+     * // Matcher that asserts that there is a "span" containing a (possibly
+     * // nested) "strong" tag.
+     * $matcher = array(
+     *   'tag'        => 'span',
+     *   'descendant' => array('tag' => 'strong')
+     * );
+     *
+     * // Matcher that asserts that there is a "span" containing 5-10 "em" tags
+     * // as immediate children.
+     * $matcher = array(
+     *   'tag'      => 'span',
+     *   'children' => array(
+     *     'less_than'    => 11,
+     *     'greater_than' => 4,
+     *     'only'         => array('tag' => 'em')
+     *   )
+     * );
+     *
+     * // Matcher that asserts that there is a "div", with an "ul" ancestor and
+     * // a "li" parent (with class="enum"), and containing a "span" descendant
+     * // that contains an element with id="my_test" and the text "Hello World".
+     * $matcher = array(
+     *   'tag'        => 'div',
+     *   'ancestor'   => array('tag' => 'ul'),
+     *   'parent'     => array(
+     *     'tag'        => 'li',
+     *     'attributes' => array('class' => 'enum')
+     *   ),
+     *   'descendant' => array(
+     *     'tag'   => 'span',
+     *     'child' => array(
+     *       'id'      => 'my_test',
+     *       'content' => 'Hello World'
+     *     )
+     *   )
+     * );
+     *
+     * // Use assertTag() to apply a $matcher to a piece of $html.
+     * $this->assertTag($matcher, $html);
+     *
+     * // Use assertTag() to apply a $matcher to a piece of $xml.
+     * $this->assertTag($matcher, $xml, '', false);
+     * </code>
+     *
+     * The second argument ($actual) is a string containing either HTML or
+     * XML text to be tested.
+     *
+     * The third argument ($message) is an optional message that will be
+     * used if the assertion fails.
+     *
+     * The fourth argument ($html) is an optional flag specifying whether
+     * to load the $actual string into a DOMDocument using the HTML or
+     * XML load strategy.  It is true by default, which assumes the HTML
+     * load strategy.  In many cases, this will be acceptable for XML as well.
+     *
+     * @param array   $matcher
+     * @param string  $actual
+     * @param string  $message
+     * @param boolean $isHtml
+     * @since  Method available since Release 3.3.0
+     * @author Mike Naberezny <mike@maintainable.com>
+     * @author Derek DeVries <derek@maintainable.com>
+     */
+    public static function assertTag($matcher, $actual, $message = '', $isHtml = true)
+    {
+        $dom     = PHPUnit_Util_XML::load($actual, $isHtml);
+        $tags    = PHPUnit_Util_XML::findNodes($dom, $matcher, $isHtml);
+        $matched = count($tags) > 0 && $tags[0] instanceof DOMNode;
+
+        self::assertTrue($matched, $message);
+    }
+
+    /**
+     * This assertion is the exact opposite of assertTag().
+     *
+     * Rather than asserting that $matcher results in a match, it asserts that
+     * $matcher does not match.
+     *
+     * @param array   $matcher
+     * @param string  $actual
+     * @param string  $message
+     * @param boolean $isHtml
+     * @since  Method available since Release 3.3.0
+     * @author Mike Naberezny <mike@maintainable.com>
+     * @author Derek DeVries <derek@maintainable.com>
+     */
+    public static function assertNotTag($matcher, $actual, $message = '', $isHtml = true)
+    {
+        $dom     = PHPUnit_Util_XML::load($actual, $isHtml);
+        $tags    = PHPUnit_Util_XML::findNodes($dom, $matcher, $isHtml);
+        $matched = count($tags) > 0 && $tags[0] instanceof DOMNode;
+
+        self::assertFalse($matched, $message);
+    }
+
+    /**
+     * Evaluates a PHPUnit_Framework_Constraint matcher object.
+     *
+     * @param mixed                        $value
+     * @param PHPUnit_Framework_Constraint $constraint
+     * @param string                       $message
+     * @since  Method available since Release 3.0.0
+     */
+    public static function assertThat($value, PHPUnit_Framework_Constraint $constraint, $message = '')
+    {
+        self::$count += count($constraint);
+
+        $constraint->evaluate($value, $message);
+    }
+
+    /**
+     * Asserts that a string is a valid JSON string.
+     *
+     * @param string $actualJson
+     * @param string $message
+     * @since  Method available since Release 3.7.20
+     */
+    public static function assertJson($actualJson, $message = '')
+    {
+        if (!is_string($actualJson)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        self::assertThat($actualJson, self::isJson(), $message);
+    }
+
+    /**
+     * Asserts that two given JSON encoded objects or arrays are equal.
+     *
+     * @param string $expectedJson
+     * @param string $actualJson
+     * @param string $message
+     */
+    public static function assertJsonStringEqualsJsonString($expectedJson, $actualJson, $message = '')
+    {
+        self::assertJson($expectedJson, $message);
+        self::assertJson($actualJson, $message);
+
+        $expected = json_decode($expectedJson);
+        $actual   = json_decode($actualJson);
+
+        self::assertEquals($expected, $actual, $message);
+    }
+
+    /**
+     * Asserts that two given JSON encoded objects or arrays are not equal.
+     *
+     * @param string $expectedJson
+     * @param string $actualJson
+     * @param string $message
+     */
+    public static function assertJsonStringNotEqualsJsonString($expectedJson, $actualJson, $message = '')
+    {
+        self::assertJson($expectedJson, $message);
+        self::assertJson($actualJson, $message);
+
+        $expected = json_decode($expectedJson);
+        $actual   = json_decode($actualJson);
+
+        self::assertNotEquals($expected, $actual, $message);
+    }
+
+    /**
+     * Asserts that the generated JSON encoded object and the content of the given file are equal.
+     *
+     * @param string $expectedFile
+     * @param string $actualJson
+     * @param string $message
+     */
+    public static function assertJsonStringEqualsJsonFile($expectedFile, $actualJson, $message = '')
+    {
+        self::assertFileExists($expectedFile, $message);
+        $expectedJson = file_get_contents($expectedFile);
+
+        self::assertJson($expectedJson, $message);
+        self::assertJson($actualJson, $message);
+
+        // call constraint
+        $constraint = new PHPUnit_Framework_Constraint_JsonMatches(
+          $expectedJson
+        );
+
+        self::assertThat($actualJson, $constraint, $message);
+    }
+
+    /**
+     * Asserts that the generated JSON encoded object and the content of the given file are not equal.
+     *
+     * @param string $expectedFile
+     * @param string $actualJson
+     * @param string $message
+     */
+    public static function assertJsonStringNotEqualsJsonFile($expectedFile, $actualJson, $message = '')
+    {
+        self::assertFileExists($expectedFile, $message);
+        $expectedJson = file_get_contents($expectedFile);
+
+        self::assertJson($expectedJson, $message);
+        self::assertJson($actualJson, $message);
+
+        // call constraint
+        $constraint = new PHPUnit_Framework_Constraint_JsonMatches(
+          $expectedJson
+        );
+
+        self::assertThat($actualJson, new PHPUnit_Framework_Constraint_Not($constraint), $message);
+    }
+
+    /**
+     * Asserts that two JSON files are not equal.
+     *
+     * @param string $expectedFile
+     * @param string $actualFile
+     * @param string $message
+     */
+    public static function assertJsonFileNotEqualsJsonFile($expectedFile, $actualFile, $message = '')
+    {
+        self::assertFileExists($expectedFile, $message);
+        self::assertFileExists($actualFile, $message);
+
+        $actualJson = file_get_contents($actualFile);
+        $expectedJson = file_get_contents($expectedFile);
+
+        self::assertJson($expectedJson, $message);
+        self::assertJson($actualJson, $message);
+
+        // call constraint
+        $constraintExpected = new PHPUnit_Framework_Constraint_JsonMatches(
+          $expectedJson
+        );
+
+        $constraintActual = new PHPUnit_Framework_Constraint_JsonMatches($actualJson);
+
+        self::assertThat($expectedJson, new PHPUnit_Framework_Constraint_Not($constraintActual), $message);
+        self::assertThat($actualJson, new PHPUnit_Framework_Constraint_Not($constraintExpected), $message);
+    }
+
+    /**
+     * Asserts that two JSON files are equal.
+     *
+     * @param string $expectedFile
+     * @param string $actualFile
+     * @param string $message
+     */
+    public static function assertJsonFileEqualsJsonFile($expectedFile, $actualFile, $message = '')
+    {
+        self::assertFileExists($expectedFile, $message);
+        self::assertFileExists($actualFile, $message);
+
+        $actualJson = file_get_contents($actualFile);
+        $expectedJson = file_get_contents($expectedFile);
+
+        self::assertJson($expectedJson, $message);
+        self::assertJson($actualJson, $message);
+
+        // call constraint
+        $constraintExpected = new PHPUnit_Framework_Constraint_JsonMatches(
+          $expectedJson
+        );
+
+        $constraintActual = new PHPUnit_Framework_Constraint_JsonMatches($actualJson);
+
+        self::assertThat($expectedJson, $constraintActual, $message);
+        self::assertThat($actualJson, $constraintExpected, $message);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_And matcher object.
+     *
+     * @return PHPUnit_Framework_Constraint_And
+     * @since  Method available since Release 3.0.0
+     */
+    public static function logicalAnd()
+    {
+        $constraints = func_get_args();
+
+        $constraint = new PHPUnit_Framework_Constraint_And;
+        $constraint->setConstraints($constraints);
+
+        return $constraint;
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_Or matcher object.
+     *
+     * @return PHPUnit_Framework_Constraint_Or
+     * @since  Method available since Release 3.0.0
+     */
+    public static function logicalOr()
+    {
+        $constraints = func_get_args();
+
+        $constraint = new PHPUnit_Framework_Constraint_Or;
+        $constraint->setConstraints($constraints);
+
+        return $constraint;
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_Not matcher object.
+     *
+     * @param  PHPUnit_Framework_Constraint     $constraint
+     * @return PHPUnit_Framework_Constraint_Not
+     * @since  Method available since Release 3.0.0
+     */
+    public static function logicalNot(PHPUnit_Framework_Constraint $constraint)
+    {
+        return new PHPUnit_Framework_Constraint_Not($constraint);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_Xor matcher object.
+     *
+     * @return PHPUnit_Framework_Constraint_Xor
+     * @since  Method available since Release 3.0.0
+     */
+    public static function logicalXor()
+    {
+        $constraints = func_get_args();
+
+        $constraint = new PHPUnit_Framework_Constraint_Xor;
+        $constraint->setConstraints($constraints);
+
+        return $constraint;
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_IsAnything matcher object.
+     *
+     * @return PHPUnit_Framework_Constraint_IsAnything
+     * @since  Method available since Release 3.0.0
+     */
+    public static function anything()
+    {
+        return new PHPUnit_Framework_Constraint_IsAnything;
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_IsTrue matcher object.
+     *
+     * @return PHPUnit_Framework_Constraint_IsTrue
+     * @since  Method available since Release 3.3.0
+     */
+    public static function isTrue()
+    {
+        return new PHPUnit_Framework_Constraint_IsTrue;
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_Callback matcher object.
+     *
+     * @param  callable                              $callback
+     * @return PHPUnit_Framework_Constraint_Callback
+     */
+    public static function callback($callback)
+    {
+        return new PHPUnit_Framework_Constraint_Callback($callback);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_IsFalse matcher object.
+     *
+     * @return PHPUnit_Framework_Constraint_IsFalse
+     * @since  Method available since Release 3.3.0
+     */
+    public static function isFalse()
+    {
+        return new PHPUnit_Framework_Constraint_IsFalse;
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_IsJson matcher object.
+     *
+     * @return PHPUnit_Framework_Constraint_IsJson
+     * @since  Method available since Release 3.7.20
+     */
+    public static function isJson()
+    {
+        return new PHPUnit_Framework_Constraint_IsJson;
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_IsNull matcher object.
+     *
+     * @return PHPUnit_Framework_Constraint_IsNull
+     * @since  Method available since Release 3.3.0
+     */
+    public static function isNull()
+    {
+        return new PHPUnit_Framework_Constraint_IsNull;
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_Attribute matcher object.
+     *
+     * @param  PHPUnit_Framework_Constraint           $constraint
+     * @param  string                                 $attributeName
+     * @return PHPUnit_Framework_Constraint_Attribute
+     * @since  Method available since Release 3.1.0
+     */
+    public static function attribute(PHPUnit_Framework_Constraint $constraint, $attributeName)
+    {
+        return new PHPUnit_Framework_Constraint_Attribute(
+          $constraint, $attributeName
+        );
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_TraversableContains matcher
+     * object.
+     *
+     * @param  mixed                                            $value
+     * @param  boolean                                          $checkForObjectIdentity
+     * @param  boolean                                          $checkForNonObjectIdentity
+     * @return PHPUnit_Framework_Constraint_TraversableContains
+     * @since  Method available since Release 3.0.0
+     */
+    public static function contains($value, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
+    {
+        return new PHPUnit_Framework_Constraint_TraversableContains($value, $checkForObjectIdentity, $checkForNonObjectIdentity);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher
+     * object.
+     *
+     * @param  string                                               $type
+     * @return PHPUnit_Framework_Constraint_TraversableContainsOnly
+     * @since  Method available since Release 3.1.4
+     */
+    public static function containsOnly($type)
+    {
+        return new PHPUnit_Framework_Constraint_TraversableContainsOnly($type);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher
+     * object.
+     *
+     * @param  string                                               $classname
+     * @return PHPUnit_Framework_Constraint_TraversableContainsOnly
+     */
+    public static function containsOnlyInstancesOf($classname)
+    {
+        return new PHPUnit_Framework_Constraint_TraversableContainsOnly($classname, false);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_ArrayHasKey matcher object.
+     *
+     * @param  mixed                                    $key
+     * @return PHPUnit_Framework_Constraint_ArrayHasKey
+     * @since  Method available since Release 3.0.0
+     */
+    public static function arrayHasKey($key)
+    {
+        return new PHPUnit_Framework_Constraint_ArrayHasKey($key);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_IsEqual matcher object.
+     *
+     * @param  mixed                                $value
+     * @param  float                                $delta
+     * @param  integer                              $maxDepth
+     * @param  boolean                              $canonicalize
+     * @param  boolean                              $ignoreCase
+     * @return PHPUnit_Framework_Constraint_IsEqual
+     * @since  Method available since Release 3.0.0
+     */
+    public static function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
+    {
+        return new PHPUnit_Framework_Constraint_IsEqual(
+          $value, $delta, $maxDepth, $canonicalize, $ignoreCase
+        );
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_IsEqual matcher object
+     * that is wrapped in a PHPUnit_Framework_Constraint_Attribute matcher
+     * object.
+     *
+     * @param  string                                 $attributeName
+     * @param  mixed                                  $value
+     * @param  float                                  $delta
+     * @param  integer                                $maxDepth
+     * @param  boolean                                $canonicalize
+     * @param  boolean                                $ignoreCase
+     * @return PHPUnit_Framework_Constraint_Attribute
+     * @since  Method available since Release 3.1.0
+     */
+    public static function attributeEqualTo($attributeName, $value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
+    {
+        return self::attribute(
+          self::equalTo(
+            $value, $delta, $maxDepth, $canonicalize, $ignoreCase
+          ),
+          $attributeName
+        );
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_IsEmpty matcher object.
+     *
+     * @return PHPUnit_Framework_Constraint_IsEmpty
+     * @since  Method available since Release 3.5.0
+     */
+    public static function isEmpty()
+    {
+        return new PHPUnit_Framework_Constraint_IsEmpty;
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_FileExists matcher object.
+     *
+     * @return PHPUnit_Framework_Constraint_FileExists
+     * @since  Method available since Release 3.0.0
+     */
+    public static function fileExists()
+    {
+        return new PHPUnit_Framework_Constraint_FileExists;
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_GreaterThan matcher object.
+     *
+     * @param  mixed                                    $value
+     * @return PHPUnit_Framework_Constraint_GreaterThan
+     * @since  Method available since Release 3.0.0
+     */
+    public static function greaterThan($value)
+    {
+        return new PHPUnit_Framework_Constraint_GreaterThan($value);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_Or matcher object that wraps
+     * a PHPUnit_Framework_Constraint_IsEqual and a
+     * PHPUnit_Framework_Constraint_GreaterThan matcher object.
+     *
+     * @param  mixed                           $value
+     * @return PHPUnit_Framework_Constraint_Or
+     * @since  Method available since Release 3.1.0
+     */
+    public static function greaterThanOrEqual($value)
+    {
+        return self::logicalOr(
+          new PHPUnit_Framework_Constraint_IsEqual($value),
+          new PHPUnit_Framework_Constraint_GreaterThan($value)
+        );
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_ClassHasAttribute matcher object.
+     *
+     * @param  string                                         $attributeName
+     * @return PHPUnit_Framework_Constraint_ClassHasAttribute
+     * @since  Method available since Release 3.1.0
+     */
+    public static function classHasAttribute($attributeName)
+    {
+        return new PHPUnit_Framework_Constraint_ClassHasAttribute(
+          $attributeName
+        );
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_ClassHasStaticAttribute matcher
+     * object.
+     *
+     * @param  string                                               $attributeName
+     * @return PHPUnit_Framework_Constraint_ClassHasStaticAttribute
+     * @since  Method available since Release 3.1.0
+     */
+    public static function classHasStaticAttribute($attributeName)
+    {
+        return new PHPUnit_Framework_Constraint_ClassHasStaticAttribute(
+          $attributeName
+        );
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_ObjectHasAttribute matcher object.
+     *
+     * @param  string                                          $attributeName
+     * @return PHPUnit_Framework_Constraint_ObjectHasAttribute
+     * @since  Method available since Release 3.0.0
+     */
+    public static function objectHasAttribute($attributeName)
+    {
+        return new PHPUnit_Framework_Constraint_ObjectHasAttribute(
+          $attributeName
+        );
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_IsIdentical matcher object.
+     *
+     * @param  mixed                                    $value
+     * @return PHPUnit_Framework_Constraint_IsIdentical
+     * @since  Method available since Release 3.0.0
+     */
+    public static function identicalTo($value)
+    {
+        return new PHPUnit_Framework_Constraint_IsIdentical($value);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_IsInstanceOf matcher object.
+     *
+     * @param  string                                    $className
+     * @return PHPUnit_Framework_Constraint_IsInstanceOf
+     * @since  Method available since Release 3.0.0
+     */
+    public static function isInstanceOf($className)
+    {
+        return new PHPUnit_Framework_Constraint_IsInstanceOf($className);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_IsType matcher object.
+     *
+     * @param  string                              $type
+     * @return PHPUnit_Framework_Constraint_IsType
+     * @since  Method available since Release 3.0.0
+     */
+    public static function isType($type)
+    {
+        return new PHPUnit_Framework_Constraint_IsType($type);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_LessThan matcher object.
+     *
+     * @param  mixed                                 $value
+     * @return PHPUnit_Framework_Constraint_LessThan
+     * @since  Method available since Release 3.0.0
+     */
+    public static function lessThan($value)
+    {
+        return new PHPUnit_Framework_Constraint_LessThan($value);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_Or matcher object that wraps
+     * a PHPUnit_Framework_Constraint_IsEqual and a
+     * PHPUnit_Framework_Constraint_LessThan matcher object.
+     *
+     * @param  mixed                           $value
+     * @return PHPUnit_Framework_Constraint_Or
+     * @since  Method available since Release 3.1.0
+     */
+    public static function lessThanOrEqual($value)
+    {
+        return self::logicalOr(
+          new PHPUnit_Framework_Constraint_IsEqual($value),
+          new PHPUnit_Framework_Constraint_LessThan($value)
+        );
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_PCREMatch matcher object.
+     *
+     * @param  string                                 $pattern
+     * @return PHPUnit_Framework_Constraint_PCREMatch
+     * @since  Method available since Release 3.0.0
+     */
+    public static function matchesRegularExpression($pattern)
+    {
+        return new PHPUnit_Framework_Constraint_PCREMatch($pattern);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_StringMatches matcher object.
+     *
+     * @param  string                                     $string
+     * @return PHPUnit_Framework_Constraint_StringMatches
+     * @since  Method available since Release 3.5.0
+     */
+    public static function matches($string)
+    {
+        return new PHPUnit_Framework_Constraint_StringMatches($string);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_StringStartsWith matcher object.
+     *
+     * @param  mixed                                         $prefix
+     * @return PHPUnit_Framework_Constraint_StringStartsWith
+     * @since  Method available since Release 3.4.0
+     */
+    public static function stringStartsWith($prefix)
+    {
+        return new PHPUnit_Framework_Constraint_StringStartsWith($prefix);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_StringContains matcher object.
+     *
+     * @param  string                                      $string
+     * @param  boolean                                     $case
+     * @return PHPUnit_Framework_Constraint_StringContains
+     * @since  Method available since Release 3.0.0
+     */
+    public static function stringContains($string, $case = true)
+    {
+        return new PHPUnit_Framework_Constraint_StringContains($string, $case);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_StringEndsWith matcher object.
+     *
+     * @param  mixed                                       $suffix
+     * @return PHPUnit_Framework_Constraint_StringEndsWith
+     * @since  Method available since Release 3.4.0
+     */
+    public static function stringEndsWith($suffix)
+    {
+        return new PHPUnit_Framework_Constraint_StringEndsWith($suffix);
+    }
+
+    /**
+     * Returns a PHPUnit_Framework_Constraint_Count matcher object.
+     *
+     * @param  int                                $count
+     * @return PHPUnit_Framework_Constraint_Count
+     */
+    public static function countOf($count)
+    {
+        return new PHPUnit_Framework_Constraint_Count($count);
+    }
+    /**
+     * Fails a test with the given message.
+     *
+     * @param  string                                 $message
+     * @throws PHPUnit_Framework_AssertionFailedError
+     */
+    public static function fail($message = '')
+    {
+        throw new PHPUnit_Framework_AssertionFailedError($message);
+    }
+
+    /**
+     * Returns the value of an attribute of a class or an object.
+     * This also works for attributes that are declared protected or private.
+     *
+     * @param  mixed                       $classOrObject
+     * @param  string                      $attributeName
+     * @return mixed
+     * @throws PHPUnit_Framework_Exception
+     */
+    public static function readAttribute($classOrObject, $attributeName)
+    {
+        if (!is_string($attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
+        }
+
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'valid attribute name');
+        }
+
+        if (is_string($classOrObject)) {
+            if (!class_exists($classOrObject)) {
+                throw PHPUnit_Util_InvalidArgumentHelper::factory(
+                  1, 'class name'
+                );
+            }
+
+            return self::getStaticAttribute(
+              $classOrObject,
+              $attributeName
+            );
+        } elseif (is_object($classOrObject)) {
+            return self::getObjectAttribute(
+              $classOrObject,
+              $attributeName
+            );
+        } else {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(
+              1, 'class name or object'
+            );
+        }
+    }
+
+    /**
+     * Returns the value of a static attribute.
+     * This also works for attributes that are declared protected or private.
+     *
+     * @param  string                      $className
+     * @param  string                      $attributeName
+     * @return mixed
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 4.0.0
+     */
+    public static function getStaticAttribute($className, $attributeName)
+    {
+        if (!is_string($className)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!class_exists($className)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'class name');
+        }
+
+        if (!is_string($attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
+        }
+
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'valid attribute name');
+        }
+
+        $class = new ReflectionClass($className);
+
+        while ($class) {
+            $attributes = $class->getStaticProperties();
+
+            if (array_key_exists($attributeName, $attributes)) {
+                return $attributes[$attributeName];
+            }
+
+            $class = $class->getParentClass();
+        }
+
+        throw new PHPUnit_Framework_Exception(
+          sprintf(
+            'Attribute "%s" not found in class.',
+            $attributeName
+          )
+        );
+    }
+
+    /**
+     * Returns the value of an object's attribute.
+     * This also works for attributes that are declared protected or private.
+     *
+     * @param  object                      $object
+     * @param  string                      $attributeName
+     * @return mixed
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 4.0.0
+     */
+    public static function getObjectAttribute($object, $attributeName)
+    {
+        if (!is_object($object)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'object');
+        }
+
+        if (!is_string($attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
+        }
+
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'valid attribute name');
+        }
+
+        try {
+            $attribute = new ReflectionProperty($object, $attributeName);
+        } catch (ReflectionException $e) {
+            $reflector = new ReflectionObject($object);
+
+            while ($reflector = $reflector->getParentClass()) {
+                try {
+                    $attribute = $reflector->getProperty($attributeName);
+                    break;
+                } catch (ReflectionException $e) {
+                }
+            }
+        }
+
+        if (isset($attribute)) {
+            if (!$attribute || $attribute->isPublic()) {
+                return $object->$attributeName;
+            }
+
+            $attribute->setAccessible(true);
+            $value = $attribute->getValue($object);
+            $attribute->setAccessible(false);
+
+            return $value;
+        }
+
+        throw new PHPUnit_Framework_Exception(
+          sprintf(
+            'Attribute "%s" not found in object.',
+            $attributeName
+          )
+        );
+    }
+
+    /**
+     * Mark the test as incomplete.
+     *
+     * @param  string                                $message
+     * @throws PHPUnit_Framework_IncompleteTestError
+     * @since  Method available since Release 3.0.0
+     */
+    public static function markTestIncomplete($message = '')
+    {
+        throw new PHPUnit_Framework_IncompleteTestError($message);
+    }
+
+    /**
+     * Mark the test as skipped.
+     *
+     * @param  string                             $message
+     * @throws PHPUnit_Framework_SkippedTestError
+     * @since  Method available since Release 3.0.0
+     */
+    public static function markTestSkipped($message = '')
+    {
+        throw new PHPUnit_Framework_SkippedTestError($message);
+    }
+
+    /**
+     * Return the current assertion count.
+     *
+     * @return integer
+     * @since  Method available since Release 3.3.3
+     */
+    public static function getCount()
+    {
+        return self::$count;
+    }
+
+    /**
+     * Reset the assertion counter.
+     *
+     * @since  Method available since Release 3.3.3
+     */
+    public static function resetCount()
+    {
+        self::$count = 0;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php b/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php
new file mode 100644
index 00000000..041ce201
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php
@@ -0,0 +1,2461 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.5.0
+ */
+
+/**
+ * Returns a matcher that matches when the method it is evaluated for
+ * is executed zero or more times.
+ *
+ * @return PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount
+ * @since  Method available since Release 3.0.0
+ */
+function any()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_TestCase::any',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_IsAnything matcher object.
+ *
+ * @return PHPUnit_Framework_Constraint_IsAnything
+ * @since  Method available since Release 3.0.0
+ */
+function anything()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::anything',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_ArrayHasKey matcher object.
+ *
+ * @param  mixed $key
+ * @return PHPUnit_Framework_Constraint_ArrayHasKey
+ * @since  Method available since Release 3.0.0
+ */
+function arrayHasKey($key)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::arrayHasKey',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that an array has a specified key.
+ *
+ * @param  mixed  $key
+ * @param  array|ArrayAccess  $array
+ * @param  string $message
+ * @since  Method available since Release 3.0.0
+ */
+function assertArrayHasKey($key, $array, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertArrayHasKey',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that an array does not have a specified key.
+ *
+ * @param  mixed  $key
+ * @param  array|ArrayAccess  $array
+ * @param  string $message
+ * @since  Method available since Release 3.0.0
+ */
+function assertArrayNotHasKey($key, $array, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertArrayNotHasKey',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a haystack that is stored in a static attribute of a class
+ * or an attribute of an object contains a needle.
+ *
+ * @param  mixed   $needle
+ * @param  string  $haystackAttributeName
+ * @param  mixed   $haystackClassOrObject
+ * @param  string  $message
+ * @param  boolean $ignoreCase
+ * @param  boolean $checkForObjectIdentity
+ * @param  boolean $checkForNonObjectIdentity
+ * @since  Method available since Release 3.0.0
+ */
+function assertAttributeContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeContains',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a haystack that is stored in a static attribute of a class
+ * or an attribute of an object contains only values of a given type.
+ *
+ * @param  string  $type
+ * @param  string  $haystackAttributeName
+ * @param  mixed   $haystackClassOrObject
+ * @param  boolean $isNativeType
+ * @param  string  $message
+ * @since  Method available since Release 3.1.4
+ */
+function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeContainsOnly',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts the number of elements of an array, Countable or Traversable
+ * that is stored in an attribute.
+ *
+ * @param integer $expectedCount
+ * @param string  $haystackAttributeName
+ * @param mixed   $haystackClassOrObject
+ * @param string  $message
+ * @since Method available since Release 3.6.0
+ */
+function assertAttributeCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeCount',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a static attribute of a class or an attribute of an object
+ * is empty.
+ *
+ * @param string $haystackAttributeName
+ * @param mixed  $haystackClassOrObject
+ * @param string $message
+ * @since Method available since Release 3.5.0
+ */
+function assertAttributeEmpty($haystackAttributeName, $haystackClassOrObject, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeEmpty',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a variable is equal to an attribute of an object.
+ *
+ * @param  mixed   $expected
+ * @param  string  $actualAttributeName
+ * @param  string  $actualClassOrObject
+ * @param  string  $message
+ * @param  float   $delta
+ * @param  integer $maxDepth
+ * @param  boolean $canonicalize
+ * @param  boolean $ignoreCase
+ */
+function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeEquals',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that an attribute is greater than another value.
+ *
+ * @param  mixed   $expected
+ * @param  string  $actualAttributeName
+ * @param  string  $actualClassOrObject
+ * @param  string  $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertAttributeGreaterThan($expected, $actualAttributeName, $actualClassOrObject, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeGreaterThan',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that an attribute is greater than or equal to another value.
+ *
+ * @param  mixed   $expected
+ * @param  string  $actualAttributeName
+ * @param  string  $actualClassOrObject
+ * @param  string  $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertAttributeGreaterThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeGreaterThanOrEqual',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that an attribute is of a given type.
+ *
+ * @param string $expected
+ * @param string $attributeName
+ * @param mixed  $classOrObject
+ * @param string $message
+ * @since Method available since Release 3.5.0
+ */
+function assertAttributeInstanceOf($expected, $attributeName, $classOrObject, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeInstanceOf',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that an attribute is of a given type.
+ *
+ * @param string $expected
+ * @param string $attributeName
+ * @param mixed  $classOrObject
+ * @param string $message
+ * @since Method available since Release 3.5.0
+ */
+function assertAttributeInternalType($expected, $attributeName, $classOrObject, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeInternalType',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that an attribute is smaller than another value.
+ *
+ * @param  mixed   $expected
+ * @param  string  $actualAttributeName
+ * @param  string  $actualClassOrObject
+ * @param  string  $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertAttributeLessThan($expected, $actualAttributeName, $actualClassOrObject, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeLessThan',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that an attribute is smaller than or equal to another value.
+ *
+ * @param  mixed   $expected
+ * @param  string  $actualAttributeName
+ * @param  string  $actualClassOrObject
+ * @param  string  $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertAttributeLessThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeLessThanOrEqual',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a haystack that is stored in a static attribute of a class
+ * or an attribute of an object does not contain a needle.
+ *
+ * @param  mixed   $needle
+ * @param  string  $haystackAttributeName
+ * @param  mixed   $haystackClassOrObject
+ * @param  string  $message
+ * @param  boolean $ignoreCase
+ * @param  boolean $checkForObjectIdentity
+ * @param  boolean $checkForNonObjectIdentity
+ * @since  Method available since Release 3.0.0
+ */
+function assertAttributeNotContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeNotContains',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a haystack that is stored in a static attribute of a class
+ * or an attribute of an object does not contain only values of a given
+ * type.
+ *
+ * @param  string  $type
+ * @param  string  $haystackAttributeName
+ * @param  mixed   $haystackClassOrObject
+ * @param  boolean $isNativeType
+ * @param  string  $message
+ * @since  Method available since Release 3.1.4
+ */
+function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeNotContainsOnly',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts the number of elements of an array, Countable or Traversable
+ * that is stored in an attribute.
+ *
+ * @param integer $expectedCount
+ * @param string  $haystackAttributeName
+ * @param mixed   $haystackClassOrObject
+ * @param string  $message
+ * @since Method available since Release 3.6.0
+ */
+function assertAttributeNotCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeNotCount',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a static attribute of a class or an attribute of an object
+ * is not empty.
+ *
+ * @param string $haystackAttributeName
+ * @param mixed  $haystackClassOrObject
+ * @param string $message
+ * @since Method available since Release 3.5.0
+ */
+function assertAttributeNotEmpty($haystackAttributeName, $haystackClassOrObject, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeNotEmpty',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a variable is not equal to an attribute of an object.
+ *
+ * @param  mixed   $expected
+ * @param  string  $actualAttributeName
+ * @param  string  $actualClassOrObject
+ * @param  string  $message
+ * @param  float   $delta
+ * @param  integer $maxDepth
+ * @param  boolean $canonicalize
+ * @param  boolean $ignoreCase
+ */
+function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeNotEquals',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that an attribute is of a given type.
+ *
+ * @param string $expected
+ * @param string $attributeName
+ * @param mixed  $classOrObject
+ * @param string $message
+ * @since Method available since Release 3.5.0
+ */
+function assertAttributeNotInstanceOf($expected, $attributeName, $classOrObject, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeNotInstanceOf',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that an attribute is of a given type.
+ *
+ * @param string $expected
+ * @param string $attributeName
+ * @param mixed  $classOrObject
+ * @param string $message
+ * @since Method available since Release 3.5.0
+ */
+function assertAttributeNotInternalType($expected, $attributeName, $classOrObject, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeNotInternalType',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a variable and an attribute of an object do not have the
+ * same type and value.
+ *
+ * @param  mixed  $expected
+ * @param  string $actualAttributeName
+ * @param  object $actualClassOrObject
+ * @param  string $message
+ */
+function assertAttributeNotSame($expected, $actualAttributeName, $actualClassOrObject, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeNotSame',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a variable and an attribute of an object have the same type
+ * and value.
+ *
+ * @param  mixed  $expected
+ * @param  string $actualAttributeName
+ * @param  object $actualClassOrObject
+ * @param  string $message
+ */
+function assertAttributeSame($expected, $actualAttributeName, $actualClassOrObject, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertAttributeSame',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a class has a specified attribute.
+ *
+ * @param  string $attributeName
+ * @param  string $className
+ * @param  string $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertClassHasAttribute($attributeName, $className, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertClassHasAttribute',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a class has a specified static attribute.
+ *
+ * @param  string $attributeName
+ * @param  string $className
+ * @param  string $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertClassHasStaticAttribute($attributeName, $className, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertClassHasStaticAttribute',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a class does not have a specified attribute.
+ *
+ * @param  string $attributeName
+ * @param  string $className
+ * @param  string $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertClassNotHasAttribute($attributeName, $className, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertClassNotHasAttribute',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a class does not have a specified static attribute.
+ *
+ * @param  string $attributeName
+ * @param  string $className
+ * @param  string $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertClassNotHasStaticAttribute($attributeName, $className, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertClassNotHasStaticAttribute',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a haystack contains a needle.
+ *
+ * @param  mixed   $needle
+ * @param  mixed   $haystack
+ * @param  string  $message
+ * @param  boolean $ignoreCase
+ * @param  boolean $checkForObjectIdentity
+ * @param  boolean $checkForNonObjectIdentity
+ * @since  Method available since Release 2.1.0
+ */
+function assertContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertContains',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a haystack contains only values of a given type.
+ *
+ * @param  string  $type
+ * @param  mixed   $haystack
+ * @param  boolean $isNativeType
+ * @param  string  $message
+ * @since  Method available since Release 3.1.4
+ */
+function assertContainsOnly($type, $haystack, $isNativeType = null, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertContainsOnly',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a haystack contains only instances of a given classname
+ *
+ * @param string $classname
+ * @param array|Traversable $haystack
+ * @param string $message
+ */
+function assertContainsOnlyInstancesOf($classname, $haystack, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertContainsOnlyInstancesOf',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts the number of elements of an array, Countable or Traversable.
+ *
+ * @param integer $expectedCount
+ * @param mixed   $haystack
+ * @param string  $message
+ */
+function assertCount($expectedCount, $haystack, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertCount',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a variable is empty.
+ *
+ * @param  mixed   $actual
+ * @param  string  $message
+ * @throws PHPUnit_Framework_AssertionFailedError
+ */
+function assertEmpty($actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertEmpty',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a hierarchy of DOMElements matches.
+ *
+ * @param DOMElement $expectedElement
+ * @param DOMElement $actualElement
+ * @param boolean $checkAttributes
+ * @param string  $message
+ * @author Mattis Stordalen Flister <mattis@xait.no>
+ * @since  Method available since Release 3.3.0
+ */
+function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actualElement, $checkAttributes = false, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertEqualXMLStructure',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that two variables are equal.
+ *
+ * @param  mixed   $expected
+ * @param  mixed   $actual
+ * @param  string  $message
+ * @param  float   $delta
+ * @param  integer $maxDepth
+ * @param  boolean $canonicalize
+ * @param  boolean $ignoreCase
+ */
+function assertEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertEquals',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a condition is not true.
+ *
+ * @param  boolean  $condition
+ * @param  string   $message
+ * @throws PHPUnit_Framework_AssertionFailedError
+ */
+function assertNotTrue($condition, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotTrue',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a condition is false.
+ *
+ * @param  boolean  $condition
+ * @param  string   $message
+ * @throws PHPUnit_Framework_AssertionFailedError
+ */
+function assertFalse($condition, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertFalse',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that the contents of one file is equal to the contents of another
+ * file.
+ *
+ * @param  string  $expected
+ * @param  string  $actual
+ * @param  string  $message
+ * @param  boolean $canonicalize
+ * @param  boolean $ignoreCase
+ * @since  Method available since Release 3.2.14
+ */
+function assertFileEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertFileEquals',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a file exists.
+ *
+ * @param  string $filename
+ * @param  string $message
+ * @since  Method available since Release 3.0.0
+ */
+function assertFileExists($filename, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertFileExists',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that the contents of one file is not equal to the contents of
+ * another file.
+ *
+ * @param  string  $expected
+ * @param  string  $actual
+ * @param  string  $message
+ * @param  boolean $canonicalize
+ * @param  boolean $ignoreCase
+ * @since  Method available since Release 3.2.14
+ */
+function assertFileNotEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertFileNotEquals',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a file does not exist.
+ *
+ * @param  string $filename
+ * @param  string $message
+ * @since  Method available since Release 3.0.0
+ */
+function assertFileNotExists($filename, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertFileNotExists',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a value is greater than another value.
+ *
+ * @param  mixed   $expected
+ * @param  mixed   $actual
+ * @param  string  $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertGreaterThan($expected, $actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertGreaterThan',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a value is greater than or equal to another value.
+ *
+ * @param  mixed   $expected
+ * @param  mixed   $actual
+ * @param  string  $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertGreaterThanOrEqual($expected, $actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertGreaterThanOrEqual',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a variable is of a given type.
+ *
+ * @param string $expected
+ * @param mixed  $actual
+ * @param string $message
+ * @since Method available since Release 3.5.0
+ */
+function assertInstanceOf($expected, $actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertInstanceOf',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a variable is of a given type.
+ *
+ * @param string $expected
+ * @param mixed  $actual
+ * @param string $message
+ * @since Method available since Release 3.5.0
+ */
+function assertInternalType($expected, $actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertInternalType',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a string is a valid JSON string.
+ *
+ * @param  string $filename
+ * @param  string $message
+ * @since  Method available since Release 3.7.20
+ */
+function assertJson($expectedJson, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertJson',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that two JSON files are equal.
+ *
+ * @param  string $expectedFile
+ * @param  string $actualFile
+ * @param  string $message
+ */
+function assertJsonFileEqualsJsonFile($expectedFile, $actualFile, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertJsonFileEqualsJsonFile',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that two JSON files are not equal.
+ *
+ * @param  string $expectedFile
+ * @param  string $actualFile
+ * @param  string $message
+ */
+function assertJsonFileNotEqualsJsonFile($expectedFile, $actualFile, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertJsonFileNotEqualsJsonFile',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that the generated JSON encoded object and the content of the given file are equal.
+ *
+ * @param string $expectedFile
+ * @param string $actualJson
+ * @param string $message
+ */
+function assertJsonStringEqualsJsonFile($expectedFile, $actualJson, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertJsonStringEqualsJsonFile',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that two given JSON encoded objects or arrays are equal.
+ *
+ * @param string $expectedJson
+ * @param string $actualJson
+ * @param string $message
+ */
+function assertJsonStringEqualsJsonString($expectedJson, $actualJson, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertJsonStringEqualsJsonString',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that the generated JSON encoded object and the content of the given file are not equal.
+ *
+ * @param string $expectedFile
+ * @param string $actualJson
+ * @param string $message
+ */
+function assertJsonStringNotEqualsJsonFile($expectedFile, $actualJson, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertJsonStringNotEqualsJsonFile',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that two given JSON encoded objects or arrays are not equal.
+ *
+ * @param string $expectedJson
+ * @param string $actualJson
+ * @param string $message
+ */
+function assertJsonStringNotEqualsJsonString($expectedJson, $actualJson, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertJsonStringNotEqualsJsonString',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a value is smaller than another value.
+ *
+ * @param  mixed   $expected
+ * @param  mixed   $actual
+ * @param  string  $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertLessThan($expected, $actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertLessThan',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a value is smaller than or equal to another value.
+ *
+ * @param  mixed   $expected
+ * @param  mixed   $actual
+ * @param  string  $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertLessThanOrEqual($expected, $actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertLessThanOrEqual',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a haystack does not contain a needle.
+ *
+ * @param  mixed   $needle
+ * @param  mixed   $haystack
+ * @param  string  $message
+ * @param  boolean $ignoreCase
+ * @param  boolean $checkForObjectIdentity
+ * @param  boolean $checkForNonObjectIdentity
+ * @since  Method available since Release 2.1.0
+ */
+function assertNotContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotContains',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a haystack does not contain only values of a given type.
+ *
+ * @param  string  $type
+ * @param  mixed   $haystack
+ * @param  boolean $isNativeType
+ * @param  string  $message
+ * @since  Method available since Release 3.1.4
+ */
+function assertNotContainsOnly($type, $haystack, $isNativeType = null, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotContainsOnly',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts the number of elements of an array, Countable or Traversable.
+ *
+ * @param integer $expectedCount
+ * @param mixed   $haystack
+ * @param string  $message
+ */
+function assertNotCount($expectedCount, $haystack, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotCount',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a variable is not empty.
+ *
+ * @param  mixed   $actual
+ * @param  string  $message
+ * @throws PHPUnit_Framework_AssertionFailedError
+ */
+function assertNotEmpty($actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotEmpty',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that two variables are not equal.
+ *
+ * @param  mixed   $expected
+ * @param  mixed   $actual
+ * @param  string  $message
+ * @param  float   $delta
+ * @param  integer $maxDepth
+ * @param  boolean $canonicalize
+ * @param  boolean $ignoreCase
+ * @since  Method available since Release 2.3.0
+ */
+function assertNotEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotEquals',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a variable is not of a given type.
+ *
+ * @param string $expected
+ * @param mixed  $actual
+ * @param string $message
+ * @since Method available since Release 3.5.0
+ */
+function assertNotInstanceOf($expected, $actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotInstanceOf',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a variable is not of a given type.
+ *
+ * @param string $expected
+ * @param mixed  $actual
+ * @param string $message
+ * @since Method available since Release 3.5.0
+ */
+function assertNotInternalType($expected, $actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotInternalType',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a condition is not false.
+ *
+ * @param  boolean  $condition
+ * @param  string   $message
+ * @throws PHPUnit_Framework_AssertionFailedError
+ */
+function assertNotFalse($condition, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotFalse',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a variable is not null.
+ *
+ * @param  mixed  $actual
+ * @param  string $message
+ */
+function assertNotNull($actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotNull',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a string does not match a given regular expression.
+ *
+ * @param  string $pattern
+ * @param  string $string
+ * @param  string $message
+ * @since  Method available since Release 2.1.0
+ */
+function assertNotRegExp($pattern, $string, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotRegExp',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that two variables do not have the same type and value.
+ * Used on objects, it asserts that two variables do not reference
+ * the same object.
+ *
+ * @param  mixed  $expected
+ * @param  mixed  $actual
+ * @param  string $message
+ */
+function assertNotSame($expected, $actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotSame',
+      func_get_args()
+    );
+}
+
+/**
+ * Assert that the size of two arrays (or `Countable` or `Traversable` objects)
+ * is not the same.
+ *
+ * @param array|Countable|Traversable $expected
+ * @param array|Countable|Traversable $actual
+ * @param string $message
+ */
+function assertNotSameSize($expected, $actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotSameSize',
+      func_get_args()
+    );
+}
+
+/**
+ * This assertion is the exact opposite of assertTag().
+ *
+ * Rather than asserting that $matcher results in a match, it asserts that
+ * $matcher does not match.
+ *
+ * @param  array   $matcher
+ * @param  string  $actual
+ * @param  string  $message
+ * @param  boolean $isHtml
+ * @since  Method available since Release 3.3.0
+ * @author Mike Naberezny <mike@maintainable.com>
+ * @author Derek DeVries <derek@maintainable.com>
+ */
+function assertNotTag($matcher, $actual, $message = '', $isHtml = true)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotTag',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a variable is null.
+ *
+ * @param  mixed  $actual
+ * @param  string $message
+ */
+function assertNull($actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNull',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that an object has a specified attribute.
+ *
+ * @param  string $attributeName
+ * @param  object $object
+ * @param  string $message
+ * @since  Method available since Release 3.0.0
+ */
+function assertObjectHasAttribute($attributeName, $object, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertObjectHasAttribute',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that an object does not have a specified attribute.
+ *
+ * @param  string $attributeName
+ * @param  object $object
+ * @param  string $message
+ * @since  Method available since Release 3.0.0
+ */
+function assertObjectNotHasAttribute($attributeName, $object, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertObjectNotHasAttribute',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a string matches a given regular expression.
+ *
+ * @param  string $pattern
+ * @param  string $string
+ * @param  string $message
+ */
+function assertRegExp($pattern, $string, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertRegExp',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that two variables have the same type and value.
+ * Used on objects, it asserts that two variables reference
+ * the same object.
+ *
+ * @param  mixed  $expected
+ * @param  mixed  $actual
+ * @param  string $message
+ */
+function assertSame($expected, $actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertSame',
+      func_get_args()
+    );
+}
+
+/**
+ * Assert that the size of two arrays (or `Countable` or `Traversable` objects)
+ * is the same.
+ *
+ * @param array|Countable|Traversable $expected
+ * @param array|Countable|Traversable $actual
+ * @param string $message
+ */
+function assertSameSize($expected, $actual, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertSameSize',
+      func_get_args()
+    );
+}
+
+/**
+ * Assert the presence, absence, or count of elements in a document matching
+ * the CSS $selector, regardless of the contents of those elements.
+ *
+ * The first argument, $selector, is the CSS selector used to match
+ * the elements in the $actual document.
+ *
+ * The second argument, $count, can be either boolean or numeric.
+ * When boolean, it asserts for presence of elements matching the selector
+ * (true) or absence of elements (false).
+ * When numeric, it asserts the count of elements.
+ *
+ * assertSelectCount("#binder", true, $xml);  // any?
+ * assertSelectCount(".binder", 3, $xml); // exactly 3?
+ *
+ * @param  array   $selector
+ * @param  integer $count
+ * @param  mixed   $actual
+ * @param  string  $message
+ * @param  boolean $isHtml
+ * @since  Method available since Release 3.3.0
+ * @author Mike Naberezny <mike@maintainable.com>
+ * @author Derek DeVries <derek@maintainable.com>
+ */
+function assertSelectCount($selector, $count, $actual, $message = '', $isHtml = true)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertSelectCount',
+      func_get_args()
+    );
+}
+
+/**
+ * assertSelectEquals("#binder .name", "Chuck", true,  $xml);  // any?
+ * assertSelectEquals("#binder .name", "Chuck", false, $xml);  // none?
+ *
+ * @param  array   $selector
+ * @param  string  $content
+ * @param  integer $count
+ * @param  mixed   $actual
+ * @param  string  $message
+ * @param  boolean $isHtml
+ * @since  Method available since Release 3.3.0
+ * @author Mike Naberezny <mike@maintainable.com>
+ * @author Derek DeVries <derek@maintainable.com>
+ */
+function assertSelectEquals($selector, $content, $count, $actual, $message = '', $isHtml = true)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertSelectEquals',
+      func_get_args()
+    );
+}
+
+/**
+ * assertSelectRegExp("#binder .name", "/Mike|Derek/", true, $xml); // any?
+ * assertSelectRegExp("#binder .name", "/Mike|Derek/", 3, $xml);// 3?
+ *
+ * @param  array   $selector
+ * @param  string  $pattern
+ * @param  integer $count
+ * @param  mixed   $actual
+ * @param  string  $message
+ * @param  boolean $isHtml
+ * @since  Method available since Release 3.3.0
+ * @author Mike Naberezny <mike@maintainable.com>
+ * @author Derek DeVries <derek@maintainable.com>
+ */
+function assertSelectRegExp($selector, $pattern, $count, $actual, $message = '', $isHtml = true)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertSelectRegExp',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a string ends not with a given prefix.
+ *
+ * @param  string $suffix
+ * @param  string $string
+ * @param  string $message
+ * @since  Method available since Release 3.4.0
+ */
+function assertStringEndsNotWith($suffix, $string, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertStringEndsNotWith',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a string ends with a given prefix.
+ *
+ * @param  string $suffix
+ * @param  string $string
+ * @param  string $message
+ * @since  Method available since Release 3.4.0
+ */
+function assertStringEndsWith($suffix, $string, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertStringEndsWith',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that the contents of a string is equal
+ * to the contents of a file.
+ *
+ * @param  string  $expectedFile
+ * @param  string  $actualString
+ * @param  string  $message
+ * @param  boolean $canonicalize
+ * @param  boolean $ignoreCase
+ * @since  Method available since Release 3.3.0
+ */
+function assertStringEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertStringEqualsFile',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a string matches a given format string.
+ *
+ * @param  string $format
+ * @param  string $string
+ * @param  string $message
+ * @since  Method available since Release 3.5.0
+ */
+function assertStringMatchesFormat($format, $string, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertStringMatchesFormat',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a string matches a given format file.
+ *
+ * @param  string $formatFile
+ * @param  string $string
+ * @param  string $message
+ * @since  Method available since Release 3.5.0
+ */
+function assertStringMatchesFormatFile($formatFile, $string, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertStringMatchesFormatFile',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that the contents of a string is not equal
+ * to the contents of a file.
+ *
+ * @param  string  $expectedFile
+ * @param  string  $actualString
+ * @param  string  $message
+ * @param  boolean $canonicalize
+ * @param  boolean $ignoreCase
+ * @since  Method available since Release 3.3.0
+ */
+function assertStringNotEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertStringNotEqualsFile',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a string does not match a given format string.
+ *
+ * @param  string $format
+ * @param  string $string
+ * @param  string $message
+ * @since  Method available since Release 3.5.0
+ */
+function assertStringNotMatchesFormat($format, $string, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertStringNotMatchesFormat',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a string does not match a given format string.
+ *
+ * @param  string $formatFile
+ * @param  string $string
+ * @param  string $message
+ * @since  Method available since Release 3.5.0
+ */
+function assertStringNotMatchesFormatFile($formatFile, $string, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertStringNotMatchesFormatFile',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a string starts not with a given prefix.
+ *
+ * @param  string $prefix
+ * @param  string $string
+ * @param  string $message
+ * @since  Method available since Release 3.4.0
+ */
+function assertStringStartsNotWith($prefix, $string, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertStringStartsNotWith',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a string starts with a given prefix.
+ *
+ * @param  string $prefix
+ * @param  string $string
+ * @param  string $message
+ * @since  Method available since Release 3.4.0
+ */
+function assertStringStartsWith($prefix, $string, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertStringStartsWith',
+      func_get_args()
+    );
+}
+
+/**
+ * Evaluate an HTML or XML string and assert its structure and/or contents.
+ *
+ * The first argument ($matcher) is an associative array that specifies the
+ * match criteria for the assertion:
+ *
+ *  - `id`   : the node with the given id attribute must match the
+ * corresponding value.
+ *  - `tag`  : the node type must match the corresponding value.
+ *  - `attributes`   : a hash. The node's attributes must match the
+ * corresponding values in the hash.
+ *  - `content`  : The text content must match the given value.
+ *  - `parent`   : a hash. The node's parent must match the
+ * corresponding hash.
+ *  - `child`: a hash. At least one of the node's immediate children
+ * must meet the criteria described by the hash.
+ *  - `ancestor` : a hash. At least one of the node's ancestors must
+ * meet the criteria described by the hash.
+ *  - `descendant`   : a hash. At least one of the node's descendants must
+ * meet the criteria described by the hash.
+ *  - `children` : a hash, for counting children of a node.
+ * Accepts the keys:
+ *- `count`: a number which must equal the number of children
+ *   that match
+ *- `less_than`: the number of matching children must be greater
+ *   than this number
+ *- `greater_than` : the number of matching children must be less than
+ *   this number
+ *- `only` : another hash consisting of the keys to use to match
+ *   on the children, and only matching children will be
+ *   counted
+ *
+ * <code>
+ * // Matcher that asserts that there is an element with an id="my_id".
+ * $matcher = array('id' => 'my_id');
+ *
+ * // Matcher that asserts that there is a "span" tag.
+ * $matcher = array('tag' => 'span');
+ *
+ * // Matcher that asserts that there is a "span" tag with the content
+ * // "Hello World".
+ * $matcher = array('tag' => 'span', 'content' => 'Hello World');
+ *
+ * // Matcher that asserts that there is a "span" tag with content matching
+ * // the regular expression pattern.
+ * $matcher = array('tag' => 'span', 'content' => 'regexp:/Try P(HP|ython)/');
+ *
+ * // Matcher that asserts that there is a "span" with an "list" class
+ * // attribute.
+ * $matcher = array(
+ *   'tag'=> 'span',
+ *   'attributes' => array('class' => 'list')
+ * );
+ *
+ * // Matcher that asserts that there is a "span" inside of a "div".
+ * $matcher = array(
+ *   'tag'=> 'span',
+ *   'parent' => array('tag' => 'div')
+ * );
+ *
+ * // Matcher that asserts that there is a "span" somewhere inside a
+ * // "table".
+ * $matcher = array(
+ *   'tag'  => 'span',
+ *   'ancestor' => array('tag' => 'table')
+ * );
+ *
+ * // Matcher that asserts that there is a "span" with at least one "em"
+ * // child.
+ * $matcher = array(
+ *   'tag'   => 'span',
+ *   'child' => array('tag' => 'em')
+ * );
+ *
+ * // Matcher that asserts that there is a "span" containing a (possibly
+ * // nested) "strong" tag.
+ * $matcher = array(
+ *   'tag'=> 'span',
+ *   'descendant' => array('tag' => 'strong')
+ * );
+ *
+ * // Matcher that asserts that there is a "span" containing 5-10 "em" tags
+ * // as immediate children.
+ * $matcher = array(
+ *   'tag'  => 'span',
+ *   'children' => array(
+ * 'less_than'=> 11,
+ * 'greater_than' => 4,
+ * 'only' => array('tag' => 'em')
+ *   )
+ * );
+ *
+ * // Matcher that asserts that there is a "div", with an "ul" ancestor and
+ * // a "li" parent (with class="enum"), and containing a "span" descendant
+ * // that contains an element with id="my_test" and the text "Hello World".
+ * $matcher = array(
+ *   'tag'=> 'div',
+ *   'ancestor'   => array('tag' => 'ul'),
+ *   'parent' => array(
+ * 'tag'=> 'li',
+ * 'attributes' => array('class' => 'enum')
+ *   ),
+ *   'descendant' => array(
+ * 'tag'   => 'span',
+ * 'child' => array(
+ *   'id'  => 'my_test',
+ *   'content' => 'Hello World'
+ * )
+ *   )
+ * );
+ *
+ * // Use assertTag() to apply a $matcher to a piece of $html.
+ * $this->assertTag($matcher, $html);
+ *
+ * // Use assertTag() to apply a $matcher to a piece of $xml.
+ * $this->assertTag($matcher, $xml, '', false);
+ * </code>
+ *
+ * The second argument ($actual) is a string containing either HTML or
+ * XML text to be tested.
+ *
+ * The third argument ($message) is an optional message that will be
+ * used if the assertion fails.
+ *
+ * The fourth argument ($html) is an optional flag specifying whether
+ * to load the $actual string into a DOMDocument using the HTML or
+ * XML load strategy.  It is true by default, which assumes the HTML
+ * load strategy.  In many cases, this will be acceptable for XML as well.
+ *
+ * @param  array   $matcher
+ * @param  string  $actual
+ * @param  string  $message
+ * @param  boolean $isHtml
+ * @since  Method available since Release 3.3.0
+ * @author Mike Naberezny <mike@maintainable.com>
+ * @author Derek DeVries <derek@maintainable.com>
+ */
+function assertTag($matcher, $actual, $message = '', $isHtml = true)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertTag',
+      func_get_args()
+    );
+}
+
+/**
+ * Evaluates a PHPUnit_Framework_Constraint matcher object.
+ *
+ * @param  mixed$value
+ * @param  PHPUnit_Framework_Constraint $constraint
+ * @param  string   $message
+ * @since  Method available since Release 3.0.0
+ */
+function assertThat($value, PHPUnit_Framework_Constraint $constraint, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertThat',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a condition is true.
+ *
+ * @param  boolean $condition
+ * @param  string  $message
+ * @throws PHPUnit_Framework_AssertionFailedError
+ */
+function assertTrue($condition, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertTrue',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that two XML files are equal.
+ *
+ * @param  string $expectedFile
+ * @param  string $actualFile
+ * @param  string $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertXmlFileEqualsXmlFile($expectedFile, $actualFile, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertXmlFileEqualsXmlFile',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that two XML files are not equal.
+ *
+ * @param  string $expectedFile
+ * @param  string $actualFile
+ * @param  string $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertXmlFileNotEqualsXmlFile($expectedFile, $actualFile, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertXmlFileNotEqualsXmlFile',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that two XML documents are equal.
+ *
+ * @param  string $expectedFile
+ * @param  string $actualXml
+ * @param  string $message
+ * @since  Method available since Release 3.3.0
+ */
+function assertXmlStringEqualsXmlFile($expectedFile, $actualXml, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertXmlStringEqualsXmlFile',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that two XML documents are equal.
+ *
+ * @param  string $expectedXml
+ * @param  string $actualXml
+ * @param  string $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertXmlStringEqualsXmlString($expectedXml, $actualXml, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertXmlStringEqualsXmlString',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that two XML documents are not equal.
+ *
+ * @param  string $expectedFile
+ * @param  string $actualXml
+ * @param  string $message
+ * @since  Method available since Release 3.3.0
+ */
+function assertXmlStringNotEqualsXmlFile($expectedFile, $actualXml, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertXmlStringNotEqualsXmlFile',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that two XML documents are not equal.
+ *
+ * @param  string $expectedXml
+ * @param  string $actualXml
+ * @param  string $message
+ * @since  Method available since Release 3.1.0
+ */
+function assertXmlStringNotEqualsXmlString($expectedXml, $actualXml, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertXmlStringNotEqualsXmlString',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a matcher that matches when the method it is evaluated for
+ * is invoked at the given $index.
+ *
+ * @param  integer $index
+ * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex
+ * @since  Method available since Release 3.0.0
+ */
+function at($index)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_TestCase::at',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a matcher that matches when the method it is evaluated for
+ * is executed at least once.
+ *
+ * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce
+ * @since  Method available since Release 3.0.0
+ */
+function atLeastOnce()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_TestCase::atLeastOnce',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_Attribute matcher object.
+ *
+ * @param  PHPUnit_Framework_Constraint $constraint
+ * @param  string   $attributeName
+ * @return PHPUnit_Framework_Constraint_Attribute
+ * @since  Method available since Release 3.1.0
+ */
+function attribute(PHPUnit_Framework_Constraint $constraint, $attributeName)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::attribute',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_IsEqual matcher object
+ * that is wrapped in a PHPUnit_Framework_Constraint_Attribute matcher
+ * object.
+ *
+ * @param  string  $attributeName
+ * @param  mixed   $value
+ * @param  float   $delta
+ * @param  integer $maxDepth
+ * @param  boolean $canonicalize
+ * @param  boolean $ignoreCase
+ * @return PHPUnit_Framework_Constraint_Attribute
+ * @since  Method available since Release 3.1.0
+ */
+function attributeEqualTo($attributeName, $value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::attributeEqualTo',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_Callback matcher object.
+ *
+ * @param callable $callback
+ * @return PHPUnit_Framework_Constraint_Callback
+ */
+function callback($callback)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::callback',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_ClassHasAttribute matcher object.
+ *
+ * @param  string $attributeName
+ * @return PHPUnit_Framework_Constraint_ClassHasAttribute
+ * @since  Method available since Release 3.1.0
+ */
+function classHasAttribute($attributeName)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::classHasAttribute',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_ClassHasStaticAttribute matcher
+ * object.
+ *
+ * @param  string $attributeName
+ * @return PHPUnit_Framework_Constraint_ClassHasStaticAttribute
+ * @since  Method available since Release 3.1.0
+ */
+function classHasStaticAttribute($attributeName)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::classHasStaticAttribute',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_TraversableContains matcher
+ * object.
+ *
+ * @param  mixed   $value
+ * @param  boolean $checkForObjectIdentity
+ * @param  boolean $checkForNonObjectIdentity
+ * @return PHPUnit_Framework_Constraint_TraversableContains
+ * @since  Method available since Release 3.0.0
+ */
+function contains($value, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::contains',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher
+ * object.
+ *
+ * @param  string $type
+ * @return PHPUnit_Framework_Constraint_TraversableContainsOnly
+ * @since  Method available since Release 3.1.4
+ */
+function containsOnly($type)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::containsOnly',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher
+ * object.
+ *
+ * @param string $classname
+ * @return PHPUnit_Framework_Constraint_TraversableContainsOnly
+ */
+function containsOnlyInstancesOf($classname)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::containsOnlyInstancesOf',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_IsEqual matcher object.
+ *
+ * @param  mixed   $value
+ * @param  float   $delta
+ * @param  integer $maxDepth
+ * @param  boolean $canonicalize
+ * @param  boolean $ignoreCase
+ * @return PHPUnit_Framework_Constraint_IsEqual
+ * @since  Method available since Release 3.0.0
+ */
+function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::equalTo',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a matcher that matches when the method it is evaluated for
+ * is executed exactly $count times.
+ *
+ * @param  integer $count
+ * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
+ * @since  Method available since Release 3.0.0
+ */
+function exactly($count)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_TestCase::exactly',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_FileExists matcher object.
+ *
+ * @return PHPUnit_Framework_Constraint_FileExists
+ * @since  Method available since Release 3.0.0
+ */
+function fileExists()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::fileExists',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_GreaterThan matcher object.
+ *
+ * @param  mixed $value
+ * @return PHPUnit_Framework_Constraint_GreaterThan
+ * @since  Method available since Release 3.0.0
+ */
+function greaterThan($value)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::greaterThan',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_Or matcher object that wraps
+ * a PHPUnit_Framework_Constraint_IsEqual and a
+ * PHPUnit_Framework_Constraint_GreaterThan matcher object.
+ *
+ * @param  mixed $value
+ * @return PHPUnit_Framework_Constraint_Or
+ * @since  Method available since Release 3.1.0
+ */
+function greaterThanOrEqual($value)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::greaterThanOrEqual',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_IsIdentical matcher object.
+ *
+ * @param  mixed $value
+ * @return PHPUnit_Framework_Constraint_IsIdentical
+ * @since  Method available since Release 3.0.0
+ */
+function identicalTo($value)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::identicalTo',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_IsEmpty matcher object.
+ *
+ * @return PHPUnit_Framework_Constraint_IsEmpty
+ * @since  Method available since Release 3.5.0
+ */
+function isEmpty()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::isEmpty',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_IsFalse matcher object.
+ *
+ * @return PHPUnit_Framework_Constraint_IsFalse
+ * @since  Method available since Release 3.3.0
+ */
+function isFalse()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::isFalse',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_IsInstanceOf matcher object.
+ *
+ * @param  string $className
+ * @return PHPUnit_Framework_Constraint_IsInstanceOf
+ * @since  Method available since Release 3.0.0
+ */
+function isInstanceOf($className)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::isInstanceOf',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_IsJson matcher object.
+ *
+ * @return PHPUnit_Framework_Constraint_IsJson
+ * @since  Method available since Release 3.7.20
+ */
+function isJson()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::isJson',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_IsNull matcher object.
+ *
+ * @return PHPUnit_Framework_Constraint_IsNull
+ * @since  Method available since Release 3.3.0
+ */
+function isNull()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::isNull',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_IsTrue matcher object.
+ *
+ * @return PHPUnit_Framework_Constraint_IsTrue
+ * @since  Method available since Release 3.3.0
+ */
+function isTrue()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::isTrue',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_IsType matcher object.
+ *
+ * @param  string $type
+ * @return PHPUnit_Framework_Constraint_IsType
+ * @since  Method available since Release 3.0.0
+ */
+function isType($type)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::isType',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_LessThan matcher object.
+ *
+ * @param  mixed $value
+ * @return PHPUnit_Framework_Constraint_LessThan
+ * @since  Method available since Release 3.0.0
+ */
+function lessThan($value)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::lessThan',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_Or matcher object that wraps
+ * a PHPUnit_Framework_Constraint_IsEqual and a
+ * PHPUnit_Framework_Constraint_LessThan matcher object.
+ *
+ * @param  mixed $value
+ * @return PHPUnit_Framework_Constraint_Or
+ * @since  Method available since Release 3.1.0
+ */
+function lessThanOrEqual($value)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::lessThanOrEqual',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_And matcher object.
+ *
+ * @return PHPUnit_Framework_Constraint_And
+ * @since  Method available since Release 3.0.0
+ */
+function logicalAnd()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::logicalAnd',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_Not matcher object.
+ *
+ * @param  PHPUnit_Framework_Constraint $constraint
+ * @return PHPUnit_Framework_Constraint_Not
+ * @since  Method available since Release 3.0.0
+ */
+function logicalNot(PHPUnit_Framework_Constraint $constraint)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::logicalNot',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_Or matcher object.
+ *
+ * @return PHPUnit_Framework_Constraint_Or
+ * @since  Method available since Release 3.0.0
+ */
+function logicalOr()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::logicalOr',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_Xor matcher object.
+ *
+ * @return PHPUnit_Framework_Constraint_Xor
+ * @since  Method available since Release 3.0.0
+ */
+function logicalXor()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::logicalXor',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_StringMatches matcher object.
+ *
+ * @param  string $string
+ * @return PHPUnit_Framework_Constraint_StringMatches
+ * @since  Method available since Release 3.5.0
+ */
+function matches($string)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::matches',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_PCREMatch matcher object.
+ *
+ * @param  string $pattern
+ * @return PHPUnit_Framework_Constraint_PCREMatch
+ * @since  Method available since Release 3.0.0
+ */
+function matchesRegularExpression($pattern)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::matchesRegularExpression',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a matcher that matches when the method it is evaluated for
+ * is never executed.
+ *
+ * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
+ * @since  Method available since Release 3.0.0
+ */
+function never()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_TestCase::never',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_ObjectHasAttribute matcher object.
+ *
+ * @param  string $attributeName
+ * @return PHPUnit_Framework_Constraint_ObjectHasAttribute
+ * @since  Method available since Release 3.0.0
+ */
+function objectHasAttribute($attributeName)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::objectHasAttribute',
+      func_get_args()
+    );
+}
+
+/**
+ * @param  mixed $value, ...
+ * @return PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls
+ * @since  Method available since Release 3.0.0
+ */
+function onConsecutiveCalls()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_TestCase::onConsecutiveCalls',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a matcher that matches when the method it is evaluated for
+ * is executed exactly once.
+ *
+ * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
+ * @since  Method available since Release 3.0.0
+ */
+function once()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_TestCase::once',
+      func_get_args()
+    );
+}
+
+/**
+ *
+ *
+ * @param  integer $argumentIndex
+ * @return PHPUnit_Framework_MockObject_Stub_ReturnArgument
+ * @since  Method available since Release 3.3.0
+ */
+function returnArgument($argumentIndex)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_TestCase::returnArgument',
+      func_get_args()
+    );
+}
+
+/**
+ *
+ *
+ * @param  mixed $callback
+ * @return PHPUnit_Framework_MockObject_Stub_ReturnCallback
+ * @since  Method available since Release 3.3.0
+ */
+function returnCallback($callback)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_TestCase::returnCallback',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns the current object.
+ *
+ * This method is useful when mocking a fluent interface.
+ *
+ * @return PHPUnit_Framework_MockObject_Stub_ReturnSelf
+ * @since  Method available since Release 3.6.0
+ */
+function returnSelf()
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_TestCase::returnSelf',
+      func_get_args()
+    );
+}
+
+/**
+ *
+ *
+ * @param  mixed $value
+ * @return PHPUnit_Framework_MockObject_Stub_Return
+ * @since  Method available since Release 3.0.0
+ */
+function returnValue($value)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_TestCase::returnValue',
+      func_get_args()
+    );
+}
+
+/**
+ *
+ *
+ * @param  array $valueMap
+ * @return PHPUnit_Framework_MockObject_Stub_ReturnValueMap
+ * @since  Method available since Release 3.6.0
+ */
+function returnValueMap(array $valueMap)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_TestCase::returnValueMap',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_StringContains matcher object.
+ *
+ * @param  string  $string
+ * @param  boolean $case
+ * @return PHPUnit_Framework_Constraint_StringContains
+ * @since  Method available since Release 3.0.0
+ */
+function stringContains($string, $case = true)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::stringContains',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_StringEndsWith matcher object.
+ *
+ * @param  mixed $suffix
+ * @return PHPUnit_Framework_Constraint_StringEndsWith
+ * @since  Method available since Release 3.4.0
+ */
+function stringEndsWith($suffix)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::stringEndsWith',
+      func_get_args()
+    );
+}
+
+/**
+ * Returns a PHPUnit_Framework_Constraint_StringStartsWith matcher object.
+ *
+ * @param  mixed $prefix
+ * @return PHPUnit_Framework_Constraint_StringStartsWith
+ * @since  Method available since Release 3.4.0
+ */
+function stringStartsWith($prefix)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::stringStartsWith',
+      func_get_args()
+    );
+}
+
+/**
+ *
+ *
+ * @param  Exception $exception
+ * @return PHPUnit_Framework_MockObject_Stub_Exception
+ * @since  Method available since Release 3.1.0
+ */
+function throwException(Exception $exception)
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_TestCase::throwException',
+      func_get_args()
+    );
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/AssertionFailedError.php b/vendor/phpunit/phpunit/src/Framework/AssertionFailedError.php
new file mode 100644
index 00000000..27ca6c92
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/AssertionFailedError.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * Thrown when an assertion failed.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class PHPUnit_Framework_AssertionFailedError extends PHPUnit_Framework_Exception implements PHPUnit_Framework_SelfDescribing
+{
+    /**
+     * Wrapper for getMessage() which is declared as final.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return $this->getMessage();
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php b/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php
new file mode 100644
index 00000000..c787d6d1
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Giorgio Sironi <info@giorgiosironi.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * An empty Listener that can be extended to implement TestListener
+ * with just a few lines of code.
+ * @see PHPUnit_Framework_TestListener for documentation on the API methods.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Giorgio Sironi<info@giorgiosironi.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+abstract class PHPUnit_Framework_BaseTestListener implements PHPUnit_Framework_TestListener
+{
+    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) {}
+
+    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) {}
+
+    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) {}
+
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) {}
+
+    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) {}
+
+    public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {}
+
+    public function endTestSuite(PHPUnit_Framework_TestSuite $suite) {}
+
+    public function startTest(PHPUnit_Framework_Test $test) {}
+
+    public function endTest(PHPUnit_Framework_Test $test, $time) {}
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/CodeCoverageException.php b/vendor/phpunit/phpunit/src/Framework/CodeCoverageException.php
new file mode 100644
index 00000000..eee14645
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/CodeCoverageException.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Framework_CodeCoverageException extends PHPUnit_Framework_Exception
+{
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint.php b/vendor/phpunit/phpunit/src/Framework/Constraint.php
new file mode 100644
index 00000000..8e9a888e
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+use SebastianBergmann\Exporter\Exporter;
+
+/**
+ * Abstract base class for constraints. which are placed upon any value.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Interface available since Release 3.0.0
+ */
+abstract class PHPUnit_Framework_Constraint implements Countable, PHPUnit_Framework_SelfDescribing
+{
+    protected $exporter;
+
+    public function __construct()
+    {
+        $this->exporter = new Exporter;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other
+     *
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
+     *
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
+     * failure.
+     *
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
+     * @return mixed
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function evaluate($other, $description = '', $returnResult = false)
+    {
+        $success = false;
+
+        if ($this->matches($other)) {
+            $success = true;
+        }
+
+        if ($returnResult) {
+            return $success;
+        }
+
+        if (!$success) {
+            $this->fail($other, $description);
+        }
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * This method can be overridden to implement the evaluation algorithm.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        return false;
+    }
+
+    /**
+     * Counts the number of constraint elements.
+     *
+     * @return integer
+     * @since  Method available since Release 3.4.0
+     */
+    public function count()
+    {
+        return 1;
+    }
+
+    /**
+     * Throws an exception for the given compared value and test description
+     *
+     * @param  mixed $other Evaluated value or object.
+     * @param  string $description Additional information about the test
+     * @param  SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    protected function fail($other, $description, SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure = null)
+    {
+        $failureDescription = sprintf(
+          'Failed asserting that %s.',
+          $this->failureDescription($other)
+        );
+
+        $additionalFailureDescription = $this->additionalFailureDescription($other);
+
+        if ($additionalFailureDescription) {
+            $failureDescription .= "\n" . $additionalFailureDescription;
+        }
+
+        if (!empty($description)) {
+            $failureDescription = $description . "\n" . $failureDescription;
+        }
+
+        throw new PHPUnit_Framework_ExpectationFailedException(
+          $failureDescription,
+          $comparisonFailure
+        );
+    }
+
+    /**
+     * Return additional failure description where needed
+     *
+     * The function can be overridden to provide additional failure
+     * information like a diff
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function additionalFailureDescription($other)
+    {
+        return '';
+    }
+
+    /**
+     * Returns the description of the failure
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * To provide additional failure information additionalFailureDescription
+     * can be used.
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function failureDescription($other)
+    {
+        return $this->exporter->export($other) . ' ' . $this->toString();
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/And.php b/vendor/phpunit/phpunit/src/Framework/Constraint/And.php
new file mode 100644
index 00000000..28ecc958
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/And.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Logical AND.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_And extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var PHPUnit_Framework_Constraint[]
+     */
+    protected $constraints = array();
+
+    /**
+     * @var PHPUnit_Framework_Constraint
+     */
+    protected $lastConstraint = null;
+
+    /**
+     * @param  PHPUnit_Framework_Constraint[] $constraints
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function setConstraints(array $constraints)
+    {
+        $this->constraints = array();
+
+        foreach ($constraints as $constraint) {
+            if (!($constraint instanceof PHPUnit_Framework_Constraint)) {
+                throw new PHPUnit_Framework_Exception(
+                  'All parameters to ' . __CLASS__ .
+                  ' must be a constraint object.'
+                );
+            }
+
+            $this->constraints[] = $constraint;
+        }
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other
+     *
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
+     *
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
+     * failure.
+     *
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
+     * @return mixed
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function evaluate($other, $description = '', $returnResult = false)
+    {
+        $success = true;
+        $constraint = null;
+
+        foreach ($this->constraints as $constraint) {
+            if (!$constraint->evaluate($other, $description, true)) {
+                $success = false;
+                break;
+            }
+        }
+
+        if ($returnResult) {
+            return $success;
+        }
+
+        if (!$success) {
+            $this->fail($other, $description);
+        }
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        $text = '';
+
+        foreach ($this->constraints as $key => $constraint) {
+            if ($key > 0) {
+                $text .= ' and ';
+            }
+
+            $text .= $constraint->toString();
+        }
+
+        return $text;
+    }
+
+    /**
+     * Counts the number of constraint elements.
+     *
+     * @return integer
+     * @since  Method available since Release 3.4.0
+     */
+    public function count()
+    {
+        $count = 0;
+
+        foreach ($this->constraints as $constraint) {
+            $count += count($constraint);
+        }
+
+        return $count;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php
new file mode 100644
index 00000000..56b5b3b3
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Constraint that asserts that the array it is evaluated for has a given key.
+ *
+ * Uses array_key_exists() to check if the key is found in the input array, if
+ * not found the evaluation fails.
+ *
+ * The array key is passed in the constructor.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_ArrayHasKey extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var integer|string
+     */
+    protected $key;
+
+    /**
+     * @param integer|string $key
+     */
+    public function __construct($key)
+    {
+        parent::__construct();
+        $this->key = $key;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        if (is_array($other)) {
+            return array_key_exists($this->key, $other);
+        }
+
+        if ($other instanceof ArrayAccess) {
+            return $other->offsetExists($this->key);
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'has the key ' . $this->exporter->export($this->key);
+    }
+
+    /**
+     * Returns the description of the failure
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function failureDescription($other)
+    {
+        return 'an array ' . $this->toString();
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php
new file mode 100644
index 00000000..822ed188
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.1.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.1.0
+ */
+
+class PHPUnit_Framework_Constraint_Attribute extends PHPUnit_Framework_Constraint_Composite
+{
+    /**
+     * @var string
+     */
+    protected $attributeName;
+
+    /**
+     * @param PHPUnit_Framework_Constraint $constraint
+     * @param string                       $attributeName
+     */
+    public function __construct(PHPUnit_Framework_Constraint $constraint, $attributeName)
+    {
+        parent::__construct($constraint);
+
+        $this->attributeName = $attributeName;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other
+     *
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
+     *
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
+     * failure.
+     *
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
+     * @return mixed
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function evaluate($other, $description = '', $returnResult = false)
+    {
+        return parent::evaluate(
+          PHPUnit_Framework_Assert::readAttribute(
+            $other, $this->attributeName
+          ),
+          $description,
+          $returnResult
+        );
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'attribute "' . $this->attributeName . '" ' .
+               $this->innerConstraint->toString();
+    }
+
+    /**
+     * Returns the description of the failure
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function failureDescription($other)
+    {
+        return $this->toString();
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php
new file mode 100644
index 00000000..e0f49760
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ */
+
+/**
+ * Constraint that evaluates against a specified closure.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Timon Rapp <timon@zaeda.net>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ */
+class PHPUnit_Framework_Constraint_Callback extends PHPUnit_Framework_Constraint
+{
+    private $callback;
+
+    /**
+     * @param  callable                    $callback
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function __construct($callback)
+    {
+        if (!is_callable($callback)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(
+                1, 'callable'
+            );
+        }
+
+        parent::__construct();
+
+        $this->callback = $callback;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $value. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        return call_user_func($this->callback, $other);
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'is accepted by specified callback';
+    }
+
+    private function callbackToString($callback)
+    {
+        if (!is_array($callback)) {
+            return $callback;
+        }
+        if (empty($callback)) {
+            return "empty array";
+        }
+        if (!isset($callback[0]) || !isset($callback[1])) {
+            return "array without indexes 0 and 1 set";
+        }
+        if (is_object($callback[0])) {
+            $callback[0] = get_class($callback[0]);
+        }
+
+        return $callback[0] . '::' . $callback[1];
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php
new file mode 100644
index 00000000..5f387f56
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.1.0
+ */
+
+/**
+ * Constraint that asserts that the class it is evaluated for has a given
+ * attribute.
+ *
+ * The attribute name is passed in the constructor.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.1.0
+ */
+class PHPUnit_Framework_Constraint_ClassHasAttribute extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var string
+     */
+    protected $attributeName;
+
+    /**
+     * @param string $attributeName
+     */
+    public function __construct($attributeName)
+    {
+        parent::__construct();
+        $this->attributeName = $attributeName;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        $class = new ReflectionClass($other);
+
+        return $class->hasProperty($this->attributeName);
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return sprintf(
+          'has attribute "%s"',
+
+          $this->attributeName
+        );
+    }
+
+    /**
+     * Returns the description of the failure
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function failureDescription($other)
+    {
+        return sprintf(
+          '%sclass "%s" %s',
+
+          is_object($other) ? 'object of ' : '',
+          is_object($other) ? get_class($other) : $other,
+          $this->toString()
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php
new file mode 100644
index 00000000..5aa0f894
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.1.0
+ */
+
+/**
+ * Constraint that asserts that the class it is evaluated for has a given
+ * static attribute.
+ *
+ * The attribute name is passed in the constructor.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.1.0
+ */
+class PHPUnit_Framework_Constraint_ClassHasStaticAttribute extends PHPUnit_Framework_Constraint_ClassHasAttribute
+{
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        $class = new ReflectionClass($other);
+
+        if ($class->hasProperty($this->attributeName)) {
+            $attribute = $class->getProperty($this->attributeName);
+
+            return $attribute->isStatic();
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     * @since  Method available since Release 3.3.0
+     */
+    public function toString()
+    {
+        return sprintf(
+          'has static attribute "%s"',
+
+          $this->attributeName
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php
new file mode 100644
index 00000000..d0aaa37a
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.6.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.6.0
+ */
+
+abstract class PHPUnit_Framework_Constraint_Composite extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var PHPUnit_Framework_Constraint
+     */
+    protected $innerConstraint;
+
+    /**
+     * @param PHPUnit_Framework_Constraint $innerConstraint
+     * @param string                       $attributeName
+     */
+    public function __construct(PHPUnit_Framework_Constraint $innerConstraint)
+    {
+        parent::__construct();
+        $this->innerConstraint = $innerConstraint;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other
+     *
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
+     *
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
+     * failure.
+     *
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
+     * @return mixed
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function evaluate($other, $description = '', $returnResult = false)
+    {
+        try {
+            return $this->innerConstraint->evaluate(
+              $other,
+              $description,
+              $returnResult
+            );
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->fail($other, $description);
+        }
+    }
+
+    /**
+     * Counts the number of constraint elements.
+     *
+     * @return integer
+     */
+    public function count()
+    {
+        return count($this->innerConstraint);
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php
new file mode 100644
index 00000000..943c3cb7
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.6.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.6.0
+ */
+class PHPUnit_Framework_Constraint_Count extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var integer
+     */
+    protected $expectedCount = 0;
+
+    /**
+     * @param integer $expected
+     */
+    public function __construct($expected)
+    {
+        parent::__construct();
+        $this->expectedCount = $expected;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed   $other
+     * @return boolean
+     */
+    protected function matches($other)
+    {
+        return $this->expectedCount === $this->getCountOf($other);
+    }
+
+    /**
+     * @param  mixed   $other
+     * @return boolean
+     */
+    protected function getCountOf($other)
+    {
+        if ($other instanceof Countable || is_array($other)) {
+            return count($other);
+        }
+
+        else if ($other instanceof Traversable) {
+            if ($other instanceof IteratorAggregate) {
+                $iterator = $other->getIterator();
+            } else {
+                $iterator = $other;
+            }
+
+            $key = $iterator->key();
+            $count = iterator_count($iterator);
+
+            // manually rewind $iterator to previous key, since iterator_count
+            // moves pointer
+            if ($key !== null) {
+                $iterator->rewind();
+                while ($key !== $iterator->key()) {
+                    $iterator->next();
+                }
+            }
+
+            return $count;
+        }
+    }
+
+    /**
+     * Returns the description of the failure
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function failureDescription($other)
+    {
+        return sprintf(
+          'actual size %d matches expected size %d',
+
+          $this->getCountOf($other),
+          $this->expectedCount
+        );
+    }
+
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        return 'count matches ';
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php
new file mode 100644
index 00000000..dc6efdef
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.6.6
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.6.6
+ */
+class PHPUnit_Framework_Constraint_Exception extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var string
+     */
+    protected $className;
+
+    /**
+     * @param string $className
+     */
+    public function __construct($className)
+    {
+        parent::__construct();
+        $this->className = $className;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        return $other instanceof $this->className;
+    }
+
+    /**
+     * Returns the description of the failure
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function failureDescription($other)
+    {
+        if ($other !== null) {
+            $message = '';
+            if ($other instanceof Exception) {
+                $message = '. Message was: "' . $other->getMessage() . '" at'
+                        . "\n" . $other->getTraceAsString();
+            }
+
+            return sprintf(
+              'exception of type "%s" matches expected exception "%s"%s',
+
+              get_class($other),
+              $this->className,
+              $message
+            );
+        }
+
+        return sprintf(
+          'exception of type "%s" is thrown',
+
+          $this->className
+        );
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return sprintf(
+          'exception of type "%s"',
+
+          $this->className
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php
new file mode 100644
index 00000000..8a4e7cc0
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.6.6
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.6.6
+ */
+class PHPUnit_Framework_Constraint_ExceptionCode extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var integer
+     */
+    protected $expectedCode;
+
+    /**
+     * @param integer $expected
+     */
+    public function __construct($expected)
+    {
+        parent::__construct();
+        $this->expectedCode = $expected;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  Exception $other
+     * @return boolean
+     */
+    protected function matches($other)
+    {
+        return (string) $other->getCode() == (string) $this->expectedCode;
+    }
+
+    /**
+     * Returns the description of the failure
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function failureDescription($other)
+    {
+        return sprintf(
+          '%s is equal to expected exception code %s',
+          $this->exporter->export($other->getCode()),
+          $this->exporter->export($this->expectedCode)
+        );
+    }
+
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        return 'exception code is ';
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php
new file mode 100644
index 00000000..407a5f60
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.6.6
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.6.6
+ */
+class PHPUnit_Framework_Constraint_ExceptionMessage extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var integer
+     */
+    protected $expectedMessage;
+
+    /**
+     * @param string $expected
+     */
+    public function __construct($expected)
+    {
+        parent::__construct();
+        $this->expectedMessage = $expected;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  Exception $other
+     * @return boolean
+     */
+    protected function matches($other)
+    {
+        return strpos($other->getMessage(), $this->expectedMessage) !== false;
+    }
+
+    /**
+     * Returns the description of the failure
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function failureDescription($other)
+    {
+        return sprintf(
+          "exception message '%s' contains '%s'",
+          $other->getMessage(),
+          $this->expectedMessage
+        );
+    }
+
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        return 'exception message contains ';
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php b/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php
new file mode 100644
index 00000000..4e43e13d
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Constraint that checks if the file(name) that it is evaluated for exists.
+ *
+ * The file path to check is passed as $other in evaluate().
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_FileExists extends PHPUnit_Framework_Constraint
+{
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        return file_exists($other);
+    }
+
+    /**
+     * Returns the description of the failure
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function failureDescription($other)
+    {
+        return sprintf(
+          'file "%s" exists',
+
+          $other
+        );
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'file exists';
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php b/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php
new file mode 100644
index 00000000..628bf0b3
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Constraint that asserts that the value it is evaluated for is greater
+ * than a given value.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_GreaterThan extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var numeric
+     */
+    protected $value;
+
+    /**
+     * @param numeric $value
+     */
+    public function __construct($value)
+    {
+        parent::__construct();
+        $this->value = $value;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        return $this->value < $other;
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'is greater than ' . $this->exporter->export($this->value);
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php
new file mode 100644
index 00000000..c7a65e64
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Constraint that accepts any input value.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_IsAnything extends PHPUnit_Framework_Constraint
+{
+    /**
+     * Evaluates the constraint for parameter $other
+     *
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
+     *
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
+     * failure.
+     *
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
+     * @return mixed
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function evaluate($other, $description = '', $returnResult = false)
+    {
+        return $returnResult ? true : null;
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'is anything';
+    }
+
+    /**
+     * Counts the number of constraint elements.
+     *
+     * @return integer
+     * @since  Method available since Release 3.5.0
+     */
+    public function count()
+    {
+        return 0;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php
new file mode 100644
index 00000000..cbd9b860
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.5.0
+ */
+
+/**
+ * Constraint that checks whether a variable is empty().
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.5.0
+ */
+class PHPUnit_Framework_Constraint_IsEmpty extends PHPUnit_Framework_Constraint
+{
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        if ($other instanceof Countable) {
+            return count($other) === 0;
+        }
+
+        return empty($other);
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'is empty';
+    }
+
+    /**
+     * Returns the description of the failure
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function failureDescription($other)
+    {
+        $type = gettype($other);
+
+        return sprintf(
+          '%s %s %s',
+
+          $type[0] == 'a' || $type[0] == 'o' ? 'an' : 'a',
+          $type,
+          $this->toString()
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php
new file mode 100644
index 00000000..cd7a0c0b
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php
@@ -0,0 +1,216 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Kore Nordmann <kn@ez.no>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Constraint that checks if one value is equal to another.
+ *
+ * Equality is checked with PHP's == operator, the operator is explained in
+ * detail at {@url http://www.php.net/manual/en/types.comparisons.php}.
+ * Two values are equal if they have the same value disregarding type.
+ *
+ * The expected value is passed in the constructor.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Kore Nordmann <kn@ez.no>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_IsEqual extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var mixed
+     */
+    protected $value;
+
+    /**
+     * @var float
+     */
+    protected $delta = 0.0;
+
+    /**
+     * @var integer
+     */
+    protected $maxDepth = 10;
+
+    /**
+     * @var boolean
+     */
+    protected $canonicalize = false;
+
+    /**
+     * @var boolean
+     */
+    protected $ignoreCase = false;
+
+    /**
+     * @var SebastianBergmann\Comparator\ComparisonFailure
+     */
+    protected $lastFailure;
+
+    /**
+     * @param  mixed                       $value
+     * @param  float                       $delta
+     * @param  integer                     $maxDepth
+     * @param  boolean                     $canonicalize
+     * @param  boolean                     $ignoreCase
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function __construct($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
+    {
+        parent::__construct();
+
+        if (!is_numeric($delta)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'numeric');
+        }
+
+        if (!is_int($maxDepth)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'integer');
+        }
+
+        if (!is_bool($canonicalize)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(4, 'boolean');
+        }
+
+        if (!is_bool($ignoreCase)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(5, 'boolean');
+        }
+
+        $this->value        = $value;
+        $this->delta        = $delta;
+        $this->maxDepth     = $maxDepth;
+        $this->canonicalize = $canonicalize;
+        $this->ignoreCase   = $ignoreCase;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other
+     *
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
+     *
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
+     * failure.
+     *
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
+     * @return mixed
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function evaluate($other, $description = '', $returnResult = false)
+    {
+        $comparatorFactory = new SebastianBergmann\Comparator\Factory;
+
+        try {
+            $comparator = $comparatorFactory->getComparatorFor(
+              $other, $this->value
+            );
+
+            $comparator->assertEquals(
+              $this->value,
+              $other,
+              $this->delta,
+              $this->canonicalize,
+              $this->ignoreCase
+            );
+        } catch (SebastianBergmann\Comparator\ComparisonFailure $f) {
+            if ($returnResult) {
+                return false;
+            }
+
+            throw new PHPUnit_Framework_ExpectationFailedException(
+              trim($description . "\n" . $f->getMessage()),
+              $f
+            );
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        $delta = '';
+
+        if (is_string($this->value)) {
+            if (strpos($this->value, "\n") !== false) {
+                return 'is equal to <text>';
+            } else {
+                return sprintf(
+                  'is equal to <string:%s>',
+
+                  $this->value
+                );
+            }
+        } else {
+            if ($this->delta != 0) {
+                $delta = sprintf(
+                  ' with delta <%F>',
+
+                  $this->delta
+                );
+            }
+
+            return sprintf(
+              'is equal to %s%s',
+
+              $this->exporter->export($this->value),
+              $delta
+            );
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php
new file mode 100644
index 00000000..bd76c452
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.3.0
+ */
+
+/**
+ * Constraint that accepts false.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.3.0
+ */
+class PHPUnit_Framework_Constraint_IsFalse extends PHPUnit_Framework_Constraint
+{
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        return $other === false;
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'is false';
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
new file mode 100644
index 00000000..d96952c6
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Constraint that asserts that one value is identical to another.
+ *
+ * Identical check is performed with PHP's === operator, the operator is
+ * explained in detail at
+ * {@url http://www.php.net/manual/en/types.comparisons.php}.
+ * Two values are identical if they have the same value and are of the same
+ * type.
+ *
+ * The expected value is passed in the constructor.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_IsIdentical extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var float
+     */
+    const EPSILON = 0.0000000001;
+
+    /**
+     * @var mixed
+     */
+    protected $value;
+
+    /**
+     * @param mixed $value
+     */
+    public function __construct($value)
+    {
+        parent::__construct();
+        $this->value = $value;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other
+     *
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
+     *
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
+     * failure.
+     *
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
+     * @return mixed
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function evaluate($other, $description = '', $returnResult = false)
+    {
+        if (is_double($this->value) && is_double($other) &&
+            !is_infinite($this->value) && !is_infinite($other) &&
+            !is_nan($this->value) && !is_nan($other)) {
+            $success = abs($this->value - $other) < self::EPSILON;
+        } else {
+            $success = $this->value === $other;
+        }
+
+        if ($returnResult) {
+            return $success;
+        }
+
+        if (!$success) {
+            $f = null;
+
+            // if both values are strings, make sure a diff is generated
+            if (is_string($this->value) && is_string($other)) {
+                $f = new SebastianBergmann\Comparator\ComparisonFailure(
+                  $this->value,
+                  $other,
+                  $this->value,
+                  $other
+                );
+            }
+
+            $this->fail($other, $description, $f);
+        }
+    }
+
+    /**
+     * Returns the description of the failure
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function failureDescription($other)
+    {
+        if (is_object($this->value) && is_object($other)) {
+            return 'two variables reference the same object';
+        }
+
+        if (is_string($this->value) && is_string($other)) {
+            return 'two strings are identical';
+        }
+
+        return parent::failureDescription($other);
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        if (is_object($this->value)) {
+            return 'is identical to an object of class "' .
+                   get_class($this->value) . '"';
+        } else {
+            return 'is identical to ' .
+                   $this->exporter->export($this->value);
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php
new file mode 100644
index 00000000..d288338c
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Constraint that asserts that the object it is evaluated for is an instance
+ * of a given class.
+ *
+ * The expected class name is passed in the constructor.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_IsInstanceOf extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var string
+     */
+    protected $className;
+
+    /**
+     * @param string $className
+     */
+    public function __construct($className)
+    {
+        parent::__construct();
+        $this->className = $className;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        return ($other instanceof $this->className);
+    }
+
+    /**
+     * Returns the description of the failure
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function failureDescription($other)
+    {
+        return sprintf(
+          '%s is an instance of %s "%s"',
+          $this->exporter->shortenedExport($other),
+          $this->getType(),
+          $this->className
+        );
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return sprintf(
+          'is instance of %s "%s"',
+          $this->getType(),
+          $this->className
+        );
+    }
+
+    private function getType()
+    {
+        try {
+            $reflection = new ReflectionClass($this->className);
+            if ($reflection->isInterface()) {
+                return 'interface';
+            }
+        } catch (ReflectionException $e) {
+        }
+
+        return 'class';
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php
new file mode 100644
index 00000000..f5f25ed3
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.7.20
+ */
+
+/**
+ * Constraint that asserts that a string is valid JSON.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.7.20
+ */
+class PHPUnit_Framework_Constraint_IsJson extends PHPUnit_Framework_Constraint
+{
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        json_decode($other);
+        if (json_last_error()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns the description of the failure
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function failureDescription($other)
+    {
+        json_decode($other);
+        $error = PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider::determineJsonError(
+          json_last_error()
+        );
+
+        return sprintf(
+          '%s is valid JSON (%s)',
+
+          $this->exporter->shortenedExport($other),
+          $error
+        );
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'is valid JSON';
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php
new file mode 100644
index 00000000..06654f74
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.3.0
+ */
+
+/**
+ * Constraint that accepts null.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.3.0
+ */
+class PHPUnit_Framework_Constraint_IsNull extends PHPUnit_Framework_Constraint
+{
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        return $other === null;
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'is null';
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php
new file mode 100644
index 00000000..c00e60e9
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.3.0
+ */
+
+/**
+ * Constraint that accepts true.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.3.0
+ */
+class PHPUnit_Framework_Constraint_IsTrue extends PHPUnit_Framework_Constraint
+{
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        return $other === true;
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'is true';
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php
new file mode 100644
index 00000000..3f6f4d0b
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Constraint that asserts that the value it is evaluated for is of a
+ * specified type.
+ *
+ * The expected value is passed in the constructor.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_IsType extends PHPUnit_Framework_Constraint
+{
+    const TYPE_ARRAY    = 'array';
+    const TYPE_BOOL     = 'bool';
+    const TYPE_FLOAT    = 'float';
+    const TYPE_INT      = 'int';
+    const TYPE_null     = 'null';
+    const TYPE_NUMERIC  = 'numeric';
+    const TYPE_OBJECT   = 'object';
+    const TYPE_RESOURCE = 'resource';
+    const TYPE_STRING   = 'string';
+    const TYPE_SCALAR   = 'scalar';
+    const TYPE_CALLABLE = 'callable';
+
+    /**
+     * @var array
+     */
+    protected $types = array(
+      'array' => true,
+      'boolean' => true,
+      'bool' => true,
+      'float' => true,
+      'integer' => true,
+      'int' => true,
+      'null' => true,
+      'numeric' => true,
+      'object' => true,
+      'resource' => true,
+      'string' => true,
+      'scalar' => true,
+      'callable' => true
+    );
+
+    /**
+     * @var string
+     */
+    protected $type;
+
+    /**
+     * @param  string                      $type
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function __construct($type)
+    {
+        parent::__construct();
+
+        if (!isset($this->types[$type])) {
+            throw new PHPUnit_Framework_Exception(
+              sprintf(
+                'Type specified for PHPUnit_Framework_Constraint_IsType <%s> ' .
+                'is not a valid type.',
+                $type
+              )
+            );
+        }
+
+        $this->type = $type;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        switch ($this->type) {
+            case 'numeric': {
+                return is_numeric($other);
+            }
+
+            case 'integer':
+            case 'int': {
+                return is_integer($other);
+            }
+
+            case 'float': {
+                return is_float($other);
+            }
+
+            case 'string': {
+                return is_string($other);
+            }
+
+            case 'boolean':
+            case 'bool': {
+                return is_bool($other);
+            }
+
+            case 'null': {
+                return is_null($other);
+            }
+
+            case 'array': {
+                return is_array($other);
+            }
+
+            case 'object': {
+                return is_object($other);
+            }
+
+            case 'resource': {
+                return is_resource($other);
+            }
+
+            case 'scalar': {
+                return is_scalar($other);
+            }
+
+            case 'callable': {
+                return is_callable($other);
+            }
+        }
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return sprintf(
+          'is of type "%s"',
+
+          $this->type
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php b/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php
new file mode 100644
index 00000000..d9e7eedc
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Bastian Feder <php@bastian-feder.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.7.0
+ */
+
+/**
+ * Asserts whether or not two JSON objects are equal.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Bastian Feder <php@bastian-feder.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.7.0
+ */
+class PHPUnit_Framework_Constraint_JsonMatches extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var string
+     */
+    protected $value;
+
+    /**
+     * Creates a new constraint.
+     *
+     * @param string $value
+     */
+    public function __construct($value)
+    {
+        parent::__construct();
+        $this->value = $value;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * This method can be overridden to implement the evaluation algorithm.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        $decodedOther = json_decode($other);
+        if (json_last_error()) {
+            return false;
+        }
+
+        $decodedValue = json_decode($this->value);
+        if (json_last_error()) {
+            return false;
+        }
+
+        return $decodedOther == $decodedValue;
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return sprintf(
+            'matches JSON string "%s"',
+            $this->value
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php b/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php
new file mode 100644
index 00000000..8606fc6f
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Bastian Feder <php@bastian-feder.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.7.0
+ */
+
+/**
+ * Provides human readable messages for each JSON error.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Bastian Feder <php@bastian-feder.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.7.0
+ */
+class PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider
+{
+    /**
+     * Translates JSON error to a human readable string.
+     *
+     * @param  string $error
+     * @return string
+     */
+    public static function determineJsonError($error, $prefix = '')
+    {
+        switch ($error) {
+            case JSON_ERROR_NONE:
+                return;
+            case JSON_ERROR_DEPTH:
+                return $prefix . 'Maximum stack depth exceeded';
+            case JSON_ERROR_STATE_MISMATCH:
+                return $prefix . 'Underflow or the modes mismatch';
+            case JSON_ERROR_CTRL_CHAR:
+                return $prefix . 'Unexpected control character found';
+            case JSON_ERROR_SYNTAX:
+                return $prefix . 'Syntax error, malformed JSON';
+            case JSON_ERROR_UTF8:
+                return $prefix . 'Malformed UTF-8 characters, possibly incorrectly encoded';
+            default:
+                return $prefix . 'Unknown error';
+        }
+    }
+
+    /**
+     * Translates a given type to a human readable message prefix.
+     *
+     * @param  string $type
+     * @return string
+     */
+    public static function translateTypeToPrefix($type)
+    {
+        switch (strtolower($type)) {
+            case 'expected':
+                $prefix = 'Expected value JSON decode error - ';
+                break;
+            case 'actual':
+                $prefix = 'Actual value JSON decode error - ';
+                break;
+            default:
+                $prefix = '';
+                break;
+        }
+
+        return $prefix;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php b/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php
new file mode 100644
index 00000000..a47a91ce
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Constraint that asserts that the value it is evaluated for is less than
+ * a given value.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_LessThan extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var numeric
+     */
+    protected $value;
+
+    /**
+     * @param numeric $value
+     */
+    public function __construct($value)
+    {
+        parent::__construct();
+        $this->value = $value;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        return $this->value > $other;
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'is less than ' . $this->exporter->export($this->value);
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php
new file mode 100644
index 00000000..d34ca786
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Logical NOT.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+
+class PHPUnit_Framework_Constraint_Not extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var PHPUnit_Framework_Constraint
+     */
+    protected $constraint;
+
+    /**
+     * @param PHPUnit_Framework_Constraint $constraint
+     */
+    public function __construct($constraint)
+    {
+        parent::__construct();
+
+        if (!($constraint instanceof PHPUnit_Framework_Constraint)) {
+            $constraint = new PHPUnit_Framework_Constraint_IsEqual($constraint);
+        }
+
+        $this->constraint = $constraint;
+    }
+
+    /**
+     * @param  string $string
+     * @return string
+     */
+    public static function negate($string)
+    {
+        return str_replace(
+          array(
+            'contains ',
+            'exists',
+            'has ',
+            'is ',
+            'are ',
+            'matches ',
+            'starts with ',
+            'ends with ',
+            'reference ',
+            'not not '
+          ),
+          array(
+            'does not contain ',
+            'does not exist',
+            'does not have ',
+            'is not ',
+            'are not ',
+            'does not match ',
+            'starts not with ',
+            'ends not with ',
+            'don\'t reference ',
+            'not '
+          ),
+          $string
+        );
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other
+     *
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
+     *
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
+     * failure.
+     *
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
+     * @return mixed
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function evaluate($other, $description = '', $returnResult = false)
+    {
+        $success = !$this->constraint->evaluate($other, $description, true);
+
+        if ($returnResult) {
+            return $success;
+        }
+
+        if (!$success) {
+            $this->fail($other, $description);
+        }
+    }
+
+    /**
+     * Returns the description of the failure
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function failureDescription($other)
+    {
+        switch (get_class($this->constraint)) {
+            case 'PHPUnit_Framework_Constraint_And':
+            case 'PHPUnit_Framework_Constraint_Not':
+            case 'PHPUnit_Framework_Constraint_Or': {
+                return 'not( ' . $this->constraint->failureDescription($other) . ' )';
+            }
+            break;
+
+            default: {
+                return self::negate(
+                  $this->constraint->failureDescription($other)
+                );
+            }
+        }
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        switch (get_class($this->constraint)) {
+            case 'PHPUnit_Framework_Constraint_And':
+            case 'PHPUnit_Framework_Constraint_Not':
+            case 'PHPUnit_Framework_Constraint_Or': {
+                return 'not( ' . $this->constraint->toString() . ' )';
+            }
+            break;
+
+            default: {
+                return self::negate(
+                  $this->constraint->toString()
+                );
+            }
+        }
+    }
+
+    /**
+     * Counts the number of constraint elements.
+     *
+     * @return integer
+     * @since  Method available since Release 3.4.0
+     */
+    public function count()
+    {
+        return count($this->constraint);
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php
new file mode 100644
index 00000000..46fab024
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Constraint that asserts that the object it is evaluated for has a given
+ * attribute.
+ *
+ * The attribute name is passed in the constructor.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_ObjectHasAttribute extends PHPUnit_Framework_Constraint_ClassHasAttribute
+{
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        $object = new ReflectionObject($other);
+
+        return $object->hasProperty($this->attributeName);
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php
new file mode 100644
index 00000000..9d879223
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Logical OR.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_Or extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var PHPUnit_Framework_Constraint[]
+     */
+    protected $constraints = array();
+
+    /**
+     * @param PHPUnit_Framework_Constraint[] $constraints
+     */
+    public function setConstraints(array $constraints)
+    {
+        $this->constraints = array();
+
+        foreach ($constraints as $constraint) {
+            if (!($constraint instanceof PHPUnit_Framework_Constraint)) {
+                $constraint = new PHPUnit_Framework_Constraint_IsEqual(
+                  $constraint
+                );
+            }
+
+            $this->constraints[] = $constraint;
+        }
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other
+     *
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
+     *
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
+     * failure.
+     *
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
+     * @return mixed
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function evaluate($other, $description = '', $returnResult = false)
+    {
+        $success = false;
+        $constraint = null;
+
+        foreach ($this->constraints as $constraint) {
+            if ($constraint->evaluate($other, $description, true)) {
+                $success = true;
+                break;
+            }
+        }
+
+        if ($returnResult) {
+            return $success;
+        }
+
+        if (!$success) {
+            $this->fail($other, $description);
+        }
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        $text = '';
+
+        foreach ($this->constraints as $key => $constraint) {
+            if ($key > 0) {
+                $text .= ' or ';
+            }
+
+            $text .= $constraint->toString();
+        }
+
+        return $text;
+    }
+
+    /**
+     * Counts the number of constraint elements.
+     *
+     * @return integer
+     * @since  Method available since Release 3.4.0
+     */
+    public function count()
+    {
+        $count = 0;
+
+        foreach ($this->constraints as $constraint) {
+            $count += count($constraint);
+        }
+
+        return $count;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php b/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php
new file mode 100644
index 00000000..ee778712
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Constraint that asserts that the string it is evaluated for matches
+ * a regular expression.
+ *
+ * Checks a given value using the Perl Compatible Regular Expression extension
+ * in PHP. The pattern is matched by executing preg_match().
+ *
+ * The pattern string passed in the constructor.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_PCREMatch extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var string
+     */
+    protected $pattern;
+
+    /**
+     * @param string $pattern
+     */
+    public function __construct($pattern)
+    {
+        parent::__construct();
+        $this->pattern = $pattern;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        return preg_match($this->pattern, $other) > 0;
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return sprintf(
+          'matches PCRE pattern "%s"',
+
+          $this->pattern
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/SameSize.php b/vendor/phpunit/phpunit/src/Framework/Constraint/SameSize.php
new file mode 100644
index 00000000..f0a478ae
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/SameSize.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.6.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.6.0
+ */
+class PHPUnit_Framework_Constraint_SameSize extends PHPUnit_Framework_Constraint_Count
+{
+    /**
+     * @var integer
+     */
+    protected $expectedCount;
+
+    /**
+     * @param integer $expected
+     */
+    public function __construct($expected)
+    {
+        parent::__construct($this->getCountOf($expected));
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php b/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php
new file mode 100644
index 00000000..bf628a16
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Constraint that asserts that the string it is evaluated for contains
+ * a given string.
+ *
+ * Uses strpos() to find the position of the string in the input, if not found
+ * the evaluation fails.
+ *
+ * The sub-string is passed in the constructor.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_StringContains extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var string
+     */
+    protected $string;
+
+    /**
+     * @var boolean
+     */
+    protected $ignoreCase;
+
+    /**
+     * @param string  $string
+     * @param boolean $ignoreCase
+     */
+    public function __construct($string, $ignoreCase = false)
+    {
+        parent::__construct();
+
+        $this->string     = $string;
+        $this->ignoreCase = $ignoreCase;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        if ($this->ignoreCase) {
+            return stripos($other, $this->string) !== false;
+        } else {
+            return strpos($other, $this->string) !== false;
+        }
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        if ($this->ignoreCase) {
+            $string = strtolower($this->string);
+        } else {
+            $string = $this->string;
+        }
+
+        return sprintf(
+          'contains "%s"',
+
+          $string
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php b/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php
new file mode 100644
index 00000000..5a77f8ac
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.4.0
+ */
+
+/**
+ * Constraint that asserts that the string it is evaluated for ends with a given
+ * suffix.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.4.0
+ */
+class PHPUnit_Framework_Constraint_StringEndsWith extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var string
+     */
+    protected $suffix;
+
+    /**
+     * @param string $suffix
+     */
+    public function __construct($suffix)
+    {
+        parent::__construct();
+        $this->suffix = $suffix;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        return substr($other, 0 - strlen($this->suffix)) == $this->suffix;
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'ends with "' . $this->suffix . '"';
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php b/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php
new file mode 100644
index 00000000..234cd36d
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.5.0
+ */
+
+use SebastianBergmann\Diff\Differ;
+
+/**
+ * ...
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.5.0
+ */
+class PHPUnit_Framework_Constraint_StringMatches extends PHPUnit_Framework_Constraint_PCREMatch
+{
+    /**
+     * @var string
+     */
+    protected $string;
+
+    /**
+     * @param string $string
+     */
+    public function __construct($string)
+    {
+        parent::__construct($string);
+
+        $this->pattern = $this->createPatternFromFormat(
+            preg_replace('/\r\n/', "\n", $string)
+        );
+
+        $this->string = $string;
+    }
+
+    protected function failureDescription($other)
+    {
+        return "format description matches text";
+    }
+
+    protected function additionalFailureDescription($other)
+    {
+        $from = preg_split('(\r\n|\r|\n)', $this->string);
+        $to   = preg_split('(\r\n|\r|\n)', $other);
+
+        foreach ($from as $index => $line) {
+            if (isset($to[$index]) && $line !== $to[$index]) {
+                $line = $this->createPatternFromFormat($line);
+
+                if (preg_match($line, $to[$index]) > 0) {
+                    $from[$index] = $to[$index];
+                }
+            }
+        }
+
+        $this->string = join("\n", $from);
+        $other        = join("\n", $to);
+
+        $differ = new Differ("--- Expected\n+++ Actual\n");
+
+        return $differ->diff($this->string, $other);
+    }
+
+    protected function createPatternFromFormat($string)
+    {
+        $string = str_replace(
+          array(
+            '%e',
+            '%s',
+            '%S',
+            '%a',
+            '%A',
+            '%w',
+            '%i',
+            '%d',
+            '%x',
+            '%f',
+            '%c'
+          ),
+          array(
+            '\\' . DIRECTORY_SEPARATOR,
+            '[^\r\n]+',
+            '[^\r\n]*',
+            '.+',
+            '.*',
+            '\s*',
+            '[+-]?\d+',
+            '\d+',
+            '[0-9a-fA-F]+',
+            '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?',
+            '.'
+          ),
+          preg_quote($string, '/')
+        );
+
+        return '/^' . $string . '$/s';
+    }
+
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php b/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php
new file mode 100644
index 00000000..20276c48
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.4.0
+ */
+
+/**
+ * Constraint that asserts that the string it is evaluated for begins with a
+ * given prefix.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.4.0
+ */
+class PHPUnit_Framework_Constraint_StringStartsWith extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var string
+     */
+    protected $prefix;
+
+    /**
+     * @param string $prefix
+     */
+    public function __construct($prefix)
+    {
+        parent::__construct();
+        $this->prefix = $prefix;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        return strpos($other, $this->prefix) === 0;
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'starts with "' . $this->prefix . '"';
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php b/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php
new file mode 100644
index 00000000..cb74e1d2
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Constraint that asserts that the Traversable it is applied to contains
+ * a given value.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_TraversableContains extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var boolean
+     */
+    protected $checkForObjectIdentity;
+
+    /**
+     * @var boolean
+     */
+    protected $checkForNonObjectIdentity;
+
+    /**
+     * @var mixed
+     */
+    protected $value;
+
+    /**
+     * @param  mixed                       $value
+     * @param  boolean                     $checkForObjectIdentity
+     * @param  boolean                     $checkForNonObjectIdentity
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function __construct($value, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
+    {
+        parent::__construct();
+
+        if (!is_bool($checkForObjectIdentity)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'boolean');
+        }
+
+        if (!is_bool($checkForNonObjectIdentity)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'boolean');
+        }
+
+        $this->checkForObjectIdentity    = $checkForObjectIdentity;
+        $this->checkForNonObjectIdentity = $checkForNonObjectIdentity;
+        $this->value                     = $value;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param  mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    protected function matches($other)
+    {
+        if ($other instanceof SplObjectStorage) {
+            return $other->contains($this->value);
+        }
+
+        if (is_object($this->value)) {
+            foreach ($other as $element) {
+                if (($this->checkForObjectIdentity &&
+                     $element === $this->value) ||
+                    (!$this->checkForObjectIdentity &&
+                     $element == $this->value)) {
+                    return true;
+                }
+            }
+        } else {
+            foreach ($other as $element) {
+                if (($this->checkForNonObjectIdentity &&
+                     $element === $this->value) ||
+                    (!$this->checkForNonObjectIdentity &&
+                     $element == $this->value)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        if (is_string($this->value) && strpos($this->value, "\n") !== false) {
+            return 'contains "' . $this->value . '"';
+        } else {
+            return 'contains ' . $this->exporter->export($this->value);
+        }
+    }
+
+    /**
+     * Returns the description of the failure
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * @param  mixed  $other Evaluated value or object.
+     * @return string
+     */
+    protected function failureDescription($other)
+    {
+        return sprintf(
+          '%s %s',
+
+           is_array($other) ? 'an array' : 'a traversable',
+           $this->toString()
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php b/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php
new file mode 100644
index 00000000..1116cf78
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.1.4
+ */
+
+/**
+ * Constraint that asserts that the Traversable it is applied to contains
+ * only values of a given type.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.1.4
+ */
+class PHPUnit_Framework_Constraint_TraversableContainsOnly extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var PHPUnit_Framework_Constraint
+     */
+    protected $constraint;
+
+    /**
+     * @var string
+     */
+    protected $type;
+
+    /**
+     * @param string  $type
+     * @param boolean $isNativeType
+     */
+    public function __construct($type, $isNativeType = true)
+    {
+        parent::__construct();
+
+        if ($isNativeType) {
+            $this->constraint = new PHPUnit_Framework_Constraint_IsType($type);
+        } else {
+            $this->constraint = new PHPUnit_Framework_Constraint_IsInstanceOf(
+              $type
+            );
+        }
+
+        $this->type = $type;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other
+     *
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
+     *
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
+     * failure.
+     *
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
+     * @return mixed
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function evaluate($other, $description = '', $returnResult = false)
+    {
+        $success = true;
+
+        foreach ($other as $item) {
+            if (!$this->constraint->evaluate($item, '', true)) {
+                $success = false;
+                break;
+            }
+        }
+
+        if ($returnResult) {
+            return $success;
+        }
+
+        if (!$success) {
+            $this->fail($other, $description);
+        }
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'contains only values of type "' . $this->type . '"';
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php
new file mode 100644
index 00000000..18762159
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Logical XOR.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Constraint
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_Constraint_Xor extends PHPUnit_Framework_Constraint
+{
+    /**
+     * @var PHPUnit_Framework_Constraint[]
+     */
+    protected $constraints = array();
+
+    /**
+     * @param PHPUnit_Framework_Constraint[] $constraints
+     */
+    public function setConstraints(array $constraints)
+    {
+        $this->constraints = array();
+
+        foreach ($constraints as $constraint) {
+            if (!($constraint instanceof PHPUnit_Framework_Constraint)) {
+                $constraint = new PHPUnit_Framework_Constraint_IsEqual(
+                  $constraint
+                );
+            }
+
+            $this->constraints[] = $constraint;
+        }
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other
+     *
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
+     *
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
+     * failure.
+     *
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
+     * @return mixed
+     * @throws PHPUnit_Framework_ExpectationFailedException
+     */
+    public function evaluate($other, $description = '', $returnResult = false)
+    {
+        $success = true;
+        $lastResult = null;
+        $constraint = null;
+
+        foreach ($this->constraints as $constraint) {
+            $result = $constraint->evaluate($other, $description, true);
+
+            if ($result === $lastResult) {
+                $success = false;
+                break;
+            }
+
+            $lastResult = $result;
+        }
+
+        if ($returnResult) {
+            return $success;
+        }
+
+        if (!$success) {
+            $this->fail($other, $description);
+        }
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        $text = '';
+
+        foreach ($this->constraints as $key => $constraint) {
+            if ($key > 0) {
+                $text .= ' xor ';
+            }
+
+            $text .= $constraint->toString();
+        }
+
+        return $text;
+    }
+
+    /**
+     * Counts the number of constraint elements.
+     *
+     * @return integer
+     * @since  Method available since Release 3.4.0
+     */
+    public function count()
+    {
+        $count = 0;
+
+        foreach ($this->constraints as $constraint) {
+            $count += count($constraint);
+        }
+
+        return $count;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Error.php b/vendor/phpunit/phpunit/src/Framework/Error.php
new file mode 100644
index 00000000..65ced265
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Error.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.2.0
+ */
+
+/**
+ * Wrapper for PHP errors.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.2.0
+ */
+class PHPUnit_Framework_Error extends Exception
+{
+    /**
+     * Constructor.
+     *
+     * @param string    $message
+     * @param integer   $code
+     * @param string    $file
+     * @param integer   $line
+     * @param Exception $previous
+     */
+    public function __construct($message, $code, $file, $line, Exception $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+
+        $this->file  = $file;
+        $this->line  = $line;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Error/Deprecated.php b/vendor/phpunit/phpunit/src/Framework/Error/Deprecated.php
new file mode 100644
index 00000000..30ebe0d7
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Error/Deprecated.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Error
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.3.0
+ */
+
+/**
+ * Wrapper for PHP deprecated errors.
+ * You can disable deprecated-to-exception conversion by setting
+ *
+ * <code>
+ * PHPUnit_Framework_Error_Deprecated::$enabled = false;
+ * </code>
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Error
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.3.0
+ */
+class PHPUnit_Framework_Error_Deprecated extends PHPUnit_Framework_Error
+{
+    public static $enabled = true;
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Error/Notice.php b/vendor/phpunit/phpunit/src/Framework/Error/Notice.php
new file mode 100644
index 00000000..3ea05099
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Error/Notice.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Error
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.3.0
+ */
+
+/**
+ * Wrapper for PHP notices.
+ * You can disable notice-to-exception conversion by setting
+ *
+ * <code>
+ * PHPUnit_Framework_Error_Notice::$enabled = false;
+ * </code>
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Error
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.3.0
+ */
+class PHPUnit_Framework_Error_Notice extends PHPUnit_Framework_Error
+{
+    public static $enabled = true;
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Error/Warning.php b/vendor/phpunit/phpunit/src/Framework/Error/Warning.php
new file mode 100644
index 00000000..569ae5fc
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Error/Warning.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Error
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.3.0
+ */
+
+/**
+ * Wrapper for PHP warnings.
+ * You can disable notice-to-exception conversion by setting
+ *
+ * <code>
+ * PHPUnit_Framework_Error_Warning::$enabled = false;
+ * </code>
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_Error
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.3.0
+ */
+class PHPUnit_Framework_Error_Warning extends PHPUnit_Framework_Error
+{
+    public static $enabled = true;
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Exception.php b/vendor/phpunit/phpunit/src/Framework/Exception.php
new file mode 100644
index 00000000..832b3a19
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Exception.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.4.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.4.0
+ */
+class PHPUnit_Framework_Exception extends RuntimeException implements PHPUnit_Exception
+{
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/ExpectationFailedException.php b/vendor/phpunit/phpunit/src/Framework/ExpectationFailedException.php
new file mode 100644
index 00000000..84eda51e
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/ExpectationFailedException.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Exception for expectations which failed their check.
+ *
+ * The exception contains the error message and optionally a
+ * SebastianBergmann\Comparator\ComparisonFailure which is used to
+ * generate diff output of the failed expectations.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_ExpectationFailedException extends PHPUnit_Framework_AssertionFailedError
+{
+    /**
+     * @var SebastianBergmann\Comparator\ComparisonFailure
+     */
+    protected $comparisonFailure;
+
+    public function __construct($message, SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure = null, Exception $previous = null)
+    {
+        $this->comparisonFailure = $comparisonFailure;
+
+        parent::__construct($message, 0, $previous);
+    }
+
+    /**
+     * @return SebastianBergmann\Comparator\ComparisonFailure
+     */
+    public function getComparisonFailure()
+    {
+        return $this->comparisonFailure;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/IncompleteTest.php b/vendor/phpunit/phpunit/src/Framework/IncompleteTest.php
new file mode 100644
index 00000000..ed92f8a2
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/IncompleteTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * A marker interface for marking any exception/error as result of an unit
+ * test as incomplete implementation or currently not implemented.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Interface available since Release 2.0.0
+ */
+interface PHPUnit_Framework_IncompleteTest
+{
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/IncompleteTestError.php b/vendor/phpunit/phpunit/src/Framework/IncompleteTestError.php
new file mode 100644
index 00000000..838b9858
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/IncompleteTestError.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
+ * case of an incomplete test.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class PHPUnit_Framework_IncompleteTestError extends PHPUnit_Framework_AssertionFailedError implements PHPUnit_Framework_IncompleteTest
+{
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php b/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php
new file mode 100644
index 00000000..3babf2de
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
+ * case of a test that is skipped because of an invalid @covers annotation.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Framework_InvalidCoversTargetError extends PHPUnit_Framework_AssertionFailedError implements PHPUnit_Framework_SkippedTest
+{
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php b/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php
new file mode 100644
index 00000000..86ee3557
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Framework_InvalidCoversTargetException extends PHPUnit_Framework_CodeCoverageException
+{
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/OutputError.php b/vendor/phpunit/phpunit/src/Framework/OutputError.php
new file mode 100644
index 00000000..e198887b
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/OutputError.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.6.0
+ */
+
+/**
+ * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
+ * case of a test that printed output.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.6.0
+ */
+class PHPUnit_Framework_OutputError extends PHPUnit_Framework_AssertionFailedError
+{
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/RiskyTest.php b/vendor/phpunit/phpunit/src/Framework/RiskyTest.php
new file mode 100644
index 00000000..c1538e02
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/RiskyTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * A marker interface for marking any exception/error as result of an unit
+ * test as risky.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Interface available since Release 4.0.0
+ */
+interface PHPUnit_Framework_RiskyTest
+{
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/RiskyTestError.php b/vendor/phpunit/phpunit/src/Framework/RiskyTestError.php
new file mode 100644
index 00000000..0d96ba44
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/RiskyTestError.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
+ * case of a risky test.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Framework_RiskyTestError extends PHPUnit_Framework_AssertionFailedError implements PHPUnit_Framework_RiskyTest
+{
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php b/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php
new file mode 100644
index 00000000..033ae85a
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Interface for classes that can return a description of itself.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Interface available since Release 3.0.0
+ */
+interface PHPUnit_Framework_SelfDescribing
+{
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString();
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/SkippedTest.php b/vendor/phpunit/phpunit/src/Framework/SkippedTest.php
new file mode 100644
index 00000000..fa75648e
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/SkippedTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * A marker interface for marking a unit test as being skipped.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Interface available since Release 3.0.0
+ */
+interface PHPUnit_Framework_SkippedTest
+{
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/SkippedTestError.php b/vendor/phpunit/phpunit/src/Framework/SkippedTestError.php
new file mode 100644
index 00000000..1f75c7bd
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/SkippedTestError.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
+ * case of a skipped test.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Framework_SkippedTestError extends PHPUnit_Framework_AssertionFailedError implements PHPUnit_Framework_SkippedTest
+{
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php b/vendor/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php
new file mode 100644
index 00000000..7e8added
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.1.0
+ */
+
+/**
+ * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
+ * case of a skipped test suite.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.1.0
+ */
+class PHPUnit_Framework_SkippedTestSuiteError extends PHPUnit_Framework_AssertionFailedError implements PHPUnit_Framework_SkippedTest
+{
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/SyntheticError.php b/vendor/phpunit/phpunit/src/Framework/SyntheticError.php
new file mode 100644
index 00000000..0bf01521
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/SyntheticError.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.5.0
+ */
+
+/**
+ * Creates a synthetic failed assertion.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.5.0
+ */
+class PHPUnit_Framework_SyntheticError extends PHPUnit_Framework_AssertionFailedError
+{
+    /**
+     * The synthetic file.
+     *
+     * @var string
+     */
+    protected $syntheticFile = '';
+
+    /**
+     * The synthetic line number.
+     *
+     * @var integer
+     */
+    protected $syntheticLine = 0;
+
+    /**
+     * The synthetic trace.
+     *
+     * @var array
+     */
+    protected $syntheticTrace = array();
+
+    /**
+     * Constructor.
+     *
+     * @param string  $message
+     * @param integer $code
+     * @param string  $file
+     * @param integer $line
+     * @param array   $trace
+     */
+    public function __construct($message, $code, $file, $line, $trace)
+    {
+        parent::__construct($message, $code);
+
+        $this->syntheticFile  = $file;
+        $this->syntheticLine  = $line;
+        $this->syntheticTrace = $trace;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSyntheticFile()
+    {
+        return $this->syntheticFile;
+    }
+
+    /**
+     * @return integer
+     */
+    public function getSyntheticLine()
+    {
+        return $this->syntheticLine;
+    }
+
+    /**
+     * @return array
+     */
+    public function getSyntheticTrace()
+    {
+        return $this->syntheticTrace;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Test.php b/vendor/phpunit/phpunit/src/Framework/Test.php
new file mode 100644
index 00000000..e68314d8
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Test.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * A Test can be run and collect its results.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Interface available since Release 2.0.0
+ */
+interface PHPUnit_Framework_Test extends Countable
+{
+    /**
+     * Runs a test and collects its result in a TestResult instance.
+     *
+     * @param  PHPUnit_Framework_TestResult $result
+     * @return PHPUnit_Framework_TestResult
+     */
+    public function run(PHPUnit_Framework_TestResult $result = null);
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/TestCase.php b/vendor/phpunit/phpunit/src/Framework/TestCase.php
new file mode 100644
index 00000000..2f64102e
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/TestCase.php
@@ -0,0 +1,1925 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * A TestCase defines the fixture to run multiple tests.
+ *
+ * To define a TestCase
+ *
+ *   1) Implement a subclass of PHPUnit_Framework_TestCase.
+ *   2) Define instance variables that store the state of the fixture.
+ *   3) Initialize the fixture state by overriding setUp().
+ *   4) Clean-up after a test by overriding tearDown().
+ *
+ * Each test runs in its own fixture so there can be no side effects
+ * among test runs.
+ *
+ * Here is an example:
+ *
+ * <code>
+ * <?php
+ * class MathTest extends PHPUnit_Framework_TestCase
+ * {
+ *     public $value1;
+ *     public $value2;
+ *
+ *     protected function setUp()
+ *     {
+ *         $this->value1 = 2;
+ *         $this->value2 = 3;
+ *     }
+ * }
+ * ?>
+ * </code>
+ *
+ * For each test implement a method which interacts with the fixture.
+ * Verify the expected results with assertions specified by calling
+ * assert with a boolean.
+ *
+ * <code>
+ * <?php
+ * public function testPass()
+ * {
+ *     $this->assertTrue($this->value1 + $this->value2 == 5);
+ * }
+ * ?>
+ * </code>
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert implements PHPUnit_Framework_Test, PHPUnit_Framework_SelfDescribing
+{
+    /**
+     * Enable or disable the backup and restoration of the $GLOBALS array.
+     * Overwrite this attribute in a child class of TestCase.
+     * Setting this attribute in setUp() has no effect!
+     *
+     * @var boolean
+     */
+    protected $backupGlobals = null;
+
+    /**
+     * @var array
+     */
+    protected $backupGlobalsBlacklist = array();
+
+    /**
+     * Enable or disable the backup and restoration of static attributes.
+     * Overwrite this attribute in a child class of TestCase.
+     * Setting this attribute in setUp() has no effect!
+     *
+     * @var boolean
+     */
+    protected $backupStaticAttributes = null;
+
+    /**
+     * @var array
+     */
+    protected $backupStaticAttributesBlacklist = array();
+
+    /**
+     * Whether or not this test is to be run in a separate PHP process.
+     *
+     * @var boolean
+     */
+    protected $runTestInSeparateProcess = null;
+
+    /**
+     * Whether or not this test should preserve the global state when
+     * running in a separate PHP process.
+     *
+     * @var boolean
+     */
+    protected $preserveGlobalState = true;
+
+    /**
+     * Whether or not this test is running in a separate PHP process.
+     *
+     * @var boolean
+     */
+    private $inIsolation = false;
+
+    /**
+     * @var array
+     */
+    private $data = array();
+
+    /**
+     * @var string
+     */
+    private $dataName = '';
+
+    /**
+     * @var boolean
+     */
+    private $useErrorHandler = null;
+
+    /**
+     * The name of the expected Exception.
+     *
+     * @var mixed
+     */
+    private $expectedException = null;
+
+    /**
+     * The message of the expected Exception.
+     *
+     * @var string
+     */
+    private $expectedExceptionMessage = '';
+
+    /**
+     * The code of the expected Exception.
+     *
+     * @var integer
+     */
+    private $expectedExceptionCode;
+
+    /**
+     * The required preconditions for a test.
+     *
+     * @var array
+     */
+    private $required = array(
+        'PHP' => null,
+        'PHPUnit' => null,
+        'OS' => null,
+        'functions' => array(),
+        'extensions' => array()
+    );
+
+    /**
+     * The name of the test case.
+     *
+     * @var string
+     */
+    private $name = null;
+
+    /**
+     * @var array
+     */
+    private $dependencies = array();
+
+    /**
+     * @var array
+     */
+    private $dependencyInput = array();
+
+    /**
+     * @var array
+     */
+    private $iniSettings = array();
+
+    /**
+     * @var array
+     */
+    private $locale = array();
+
+    /**
+     * @var array
+     */
+    private $mockObjects = array();
+
+    /**
+     * @var array
+     */
+    private $mockObjectGenerator = null;
+
+    /**
+     * @var integer
+     */
+    private $status;
+
+    /**
+     * @var string
+     */
+    private $statusMessage = '';
+
+    /**
+     * @var integer
+     */
+    private $numAssertions = 0;
+
+    /**
+     * @var PHPUnit_Framework_TestResult
+     */
+    private $result;
+
+    /**
+     * @var mixed
+     */
+    private $testResult;
+
+    /**
+     * @var string
+     */
+    private $output = '';
+
+    /**
+     * @var string
+     */
+    private $outputExpectedRegex = null;
+
+    /**
+     * @var string
+     */
+    private $outputExpectedString = null;
+
+    /**
+     * @var bool
+     */
+    private $hasPerformedExpectationsOnOutput = false;
+
+    /**
+     * @var mixed
+     */
+    private $outputCallback = false;
+
+    /**
+     * @var boolean
+     */
+    private $outputBufferingActive = false;
+
+    /**
+     * Constructs a test case with the given name.
+     *
+     * @param string $name
+     * @param array  $data
+     * @param string $dataName
+     */
+    public function __construct($name = null, array $data = array(), $dataName = '')
+    {
+        if ($name !== null) {
+            $this->setName($name);
+        }
+
+        $this->data                = $data;
+        $this->dataName            = $dataName;
+    }
+
+    /**
+     * Returns a string representation of the test case.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        $class = new ReflectionClass($this);
+
+        $buffer = sprintf(
+          '%s::%s',
+
+          $class->name,
+          $this->getName(false)
+        );
+
+        return $buffer . $this->getDataSetAsString();
+    }
+
+    /**
+     * Counts the number of test cases executed by run(TestResult result).
+     *
+     * @return integer
+     */
+    public function count()
+    {
+        return 1;
+    }
+
+    /**
+     * Returns the annotations for this test.
+     *
+     * @return array
+     * @since Method available since Release 3.4.0
+     */
+    public function getAnnotations()
+    {
+        return PHPUnit_Util_Test::parseTestMethodAnnotations(
+          get_class($this), $this->name
+        );
+    }
+
+    /**
+     * Gets the name of a TestCase.
+     *
+     * @param  boolean $withDataSet
+     * @return string
+     */
+    public function getName($withDataSet = true)
+    {
+        if ($withDataSet) {
+            return $this->name . $this->getDataSetAsString(false);
+        } else {
+            return $this->name;
+        }
+    }
+
+    /**
+     * Returns the size of the test.
+     *
+     * @return integer
+     * @since  Method available since Release 3.6.0
+     */
+    public function getSize()
+    {
+        return PHPUnit_Util_Test::getSize(
+          get_class($this), $this->getName(false)
+        );
+    }
+
+    /**
+     * @return string
+     * @since  Method available since Release 3.6.0
+     */
+    public function getActualOutput()
+    {
+        if (!$this->outputBufferingActive) {
+            return $this->output;
+        } else {
+            return ob_get_contents();
+        }
+    }
+
+    /**
+     * @return boolean
+     * @since  Method available since Release 3.6.0
+     */
+    public function hasOutput()
+    {
+        if (strlen($this->output) === 0) {
+            return false;
+        }
+
+        if ($this->outputExpectedString !== null ||
+            $this->outputExpectedRegex  !== null ||
+            $this->hasPerformedExpectationsOnOutput) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param  string                      $expectedRegex
+     * @since Method available since Release 3.6.0
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function expectOutputRegex($expectedRegex)
+    {
+        if ($this->outputExpectedString !== null) {
+            throw new PHPUnit_Framework_Exception;
+        }
+
+        if (is_string($expectedRegex) || is_null($expectedRegex)) {
+            $this->outputExpectedRegex = $expectedRegex;
+        }
+    }
+
+    /**
+     * @param string $expectedString
+     * @since Method available since Release 3.6.0
+     */
+    public function expectOutputString($expectedString)
+    {
+        if ($this->outputExpectedRegex !== null) {
+            throw new PHPUnit_Framework_Exception;
+        }
+
+        if (is_string($expectedString) || is_null($expectedString)) {
+            $this->outputExpectedString = $expectedString;
+        }
+    }
+
+    /**
+     * @return bool
+     * @since Method available since Release 3.6.5
+     */
+    public function hasPerformedExpectationsOnOutput()
+    {
+        return $this->hasPerformedExpectationsOnOutput;
+    }
+
+    /**
+     * @return string
+     * @since  Method available since Release 3.2.0
+     */
+    public function getExpectedException()
+    {
+        return $this->expectedException;
+    }
+
+    /**
+     * @param mixed   $exceptionName
+     * @param string  $exceptionMessage
+     * @param integer $exceptionCode
+     * @since  Method available since Release 3.2.0
+     */
+    public function setExpectedException($exceptionName, $exceptionMessage = '', $exceptionCode = null)
+    {
+        $this->expectedException        = $exceptionName;
+        $this->expectedExceptionMessage = $exceptionMessage;
+        $this->expectedExceptionCode    = $exceptionCode;
+    }
+
+    /**
+     * @since  Method available since Release 3.4.0
+     */
+    protected function setExpectedExceptionFromAnnotation()
+    {
+        try {
+            $expectedException = PHPUnit_Util_Test::getExpectedException(
+              get_class($this), $this->name
+            );
+
+            if ($expectedException !== false) {
+                $this->setExpectedException(
+                  $expectedException['class'],
+                  $expectedException['message'],
+                  $expectedException['code']
+                );
+            }
+        } catch (ReflectionException $e) {
+        }
+    }
+
+    /**
+     * @param boolean $useErrorHandler
+     * @since Method available since Release 3.4.0
+     */
+    public function setUseErrorHandler($useErrorHandler)
+    {
+        $this->useErrorHandler = $useErrorHandler;
+    }
+
+    /**
+     * @since Method available since Release 3.4.0
+     */
+    protected function setUseErrorHandlerFromAnnotation()
+    {
+        try {
+            $useErrorHandler = PHPUnit_Util_Test::getErrorHandlerSettings(
+              get_class($this), $this->name
+            );
+
+            if ($useErrorHandler !== null) {
+                $this->setUseErrorHandler($useErrorHandler);
+            }
+        } catch (ReflectionException $e) {
+        }
+    }
+
+    /**
+     * @since Method available since Release 3.6.0
+     */
+    protected function setRequirementsFromAnnotation()
+    {
+        try {
+            $requirements = PHPUnit_Util_Test::getRequirements(
+              get_class($this), $this->name
+            );
+
+            if (isset($requirements['PHP'])) {
+                $this->required['PHP'] = $requirements['PHP'];
+            }
+
+            if (isset($requirements['PHPUnit'])) {
+                $this->required['PHPUnit'] = $requirements['PHPUnit'];
+            }
+
+            if (isset($requirements['OS'])) {
+                $this->required['OS'] = $requirements['OS'];
+            }
+
+            if (isset($requirements['extensions'])) {
+                $this->required['extensions'] = $requirements['extensions'];
+            }
+
+            if (isset($requirements['functions'])) {
+                $this->required['functions'] = $requirements['functions'];
+            }
+        } catch (ReflectionException $e) {
+        }
+    }
+
+    /**
+     * @since Method available since Release 3.6.0
+     */
+    protected function checkRequirements()
+    {
+        $this->setRequirementsFromAnnotation();
+
+        $missingRequirements = array();
+
+        if ($this->required['PHP'] &&
+            version_compare(PHP_VERSION, $this->required['PHP'], '<')) {
+            $missingRequirements[] = sprintf(
+              'PHP %s (or later) is required.',
+              $this->required['PHP']
+            );
+        }
+
+        $phpunitVersion = PHPUnit_Runner_Version::id();
+        if ($this->required['PHPUnit'] &&
+            version_compare($phpunitVersion, $this->required['PHPUnit'], '<')) {
+            $missingRequirements[] = sprintf(
+              'PHPUnit %s (or later) is required.',
+              $this->required['PHPUnit']
+            );
+        }
+
+        if ($this->required['OS'] &&
+            !preg_match($this->required['OS'], PHP_OS)) {
+            $missingRequirements[] = sprintf(
+              'Operating system matching %s is required.',
+              $this->required['OS']
+            );
+        }
+
+        foreach ($this->required['functions'] as $function) {
+            $pieces = explode('::', $function);
+            if (2 === count($pieces) && method_exists($pieces[0], $pieces[1])) {
+                continue;
+            }
+            if (function_exists($function)) {
+                continue;
+            }
+            $missingRequirements[] = sprintf(
+              'Function %s is required.',
+              $function
+            );
+        }
+
+        foreach ($this->required['extensions'] as $extension) {
+            if (!extension_loaded($extension)) {
+                $missingRequirements[] = sprintf(
+                  'Extension %s is required.',
+                  $extension
+                );
+            }
+        }
+
+        if ($missingRequirements) {
+            $this->markTestSkipped(
+              implode(
+                PHP_EOL,
+                $missingRequirements
+              )
+            );
+        }
+    }
+
+    /**
+     * Returns the status of this test.
+     *
+     * @return integer
+     * @since  Method available since Release 3.1.0
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    /**
+     * Returns the status message of this test.
+     *
+     * @return string
+     * @since  Method available since Release 3.3.0
+     */
+    public function getStatusMessage()
+    {
+        return $this->statusMessage;
+    }
+
+    /**
+     * Returns whether or not this test has failed.
+     *
+     * @return boolean
+     * @since  Method available since Release 3.0.0
+     */
+    public function hasFailed()
+    {
+        $status = $this->getStatus();
+
+        return $status == PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE ||
+               $status == PHPUnit_Runner_BaseTestRunner::STATUS_ERROR;
+    }
+
+    /**
+     * Runs the test case and collects the results in a TestResult object.
+     * If no TestResult object is passed a new one will be created.
+     *
+     * @param  PHPUnit_Framework_TestResult $result
+     * @return PHPUnit_Framework_TestResult
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function run(PHPUnit_Framework_TestResult $result = null)
+    {
+        if ($result === null) {
+            $result = $this->createResult();
+        }
+
+        if (!$this instanceof PHPUnit_Framework_Warning) {
+            $this->setTestResultObject($result);
+            $this->setUseErrorHandlerFromAnnotation();
+        }
+
+        if ($this->useErrorHandler !== null) {
+            $oldErrorHandlerSetting = $result->getConvertErrorsToExceptions();
+            $result->convertErrorsToExceptions($this->useErrorHandler);
+        }
+
+        if (!$this instanceof PHPUnit_Framework_Warning && !$this->handleDependencies()) {
+            return;
+        }
+
+        if ($this->runTestInSeparateProcess === true &&
+            $this->inIsolation !== true &&
+            !$this instanceof PHPUnit_Extensions_SeleniumTestCase &&
+            !$this instanceof PHPUnit_Extensions_PhptTestCase) {
+            $class = new ReflectionClass($this);
+
+            $template = new Text_Template(
+              __DIR__ . '/../Util/PHP/Template/TestCaseMethod.tpl'
+            );
+
+            if ($this->preserveGlobalState) {
+                $constants     = PHPUnit_Util_GlobalState::getConstantsAsString();
+                $globals       = PHPUnit_Util_GlobalState::getGlobalsAsString();
+                $includedFiles = PHPUnit_Util_GlobalState::getIncludedFilesAsString();
+                $iniSettings   = PHPUnit_Util_GlobalState::getIniSettingsAsString();
+            } else {
+                $constants     = '';
+                $globals       = '';
+                $includedFiles = '';
+                $iniSettings   = '';
+            }
+
+            $coverage                                = $result->getCollectCodeCoverageInformation()       ? 'true' : 'false';
+            $isStrictAboutTestsThatDoNotTestAnything = $result->isStrictAboutTestsThatDoNotTestAnything() ? 'true' : 'false';
+            $isStrictAboutOutputDuringTests          = $result->isStrictAboutOutputDuringTests()          ? 'true' : 'false';
+            $isStrictAboutTestSize                   = $result->isStrictAboutTestSize()                   ? 'true' : 'false';
+
+            if (defined('PHPUNIT_COMPOSER_INSTALL')) {
+                $composerAutoload = var_export(PHPUNIT_COMPOSER_INSTALL, true);
+            } else {
+                $composerAutoload = '\'\'';
+            }
+
+            if (defined('__PHPUNIT_PHAR__')) {
+                $phar = var_export(__PHPUNIT_PHAR__, true);
+            } else {
+                $phar = '\'\'';
+            }
+
+            $data            = var_export(serialize($this->data), true);
+            $dataName        = var_export($this->dataName, true);
+            $dependencyInput = var_export(serialize($this->dependencyInput), true);
+            $includePath     = var_export(get_include_path(), true);
+            // must do these fixes because TestCaseMethod.tpl has unserialize('{data}') in it, and we can't break BC
+            // the lines above used to use addcslashes() rather than var_export(), which breaks null byte escape sequences
+            $data            = "'." . $data . ".'";
+            $dataName        = "'.(" . $dataName . ").'";
+            $dependencyInput = "'." . $dependencyInput . ".'";
+            $includePath     = "'." . $includePath . ".'";
+
+            $template->setVar(
+              array(
+                'composerAutoload'                        => $composerAutoload,
+                'phar'                                    => $phar,
+                'filename'                                => $class->getFileName(),
+                'className'                               => $class->getName(),
+                'methodName'                              => $this->name,
+                'collectCodeCoverageInformation'          => $coverage,
+                'data'                                    => $data,
+                'dataName'                                => $dataName,
+                'dependencyInput'                         => $dependencyInput,
+                'constants'                               => $constants,
+                'globals'                                 => $globals,
+                'include_path'                            => $includePath,
+                'included_files'                          => $includedFiles,
+                'iniSettings'                             => $iniSettings,
+                'isStrictAboutTestsThatDoNotTestAnything' => $isStrictAboutTestsThatDoNotTestAnything,
+                'isStrictAboutOutputDuringTests'          => $isStrictAboutOutputDuringTests,
+                'isStrictAboutTestSize'                   => $isStrictAboutTestSize
+              )
+            );
+
+            $this->prepareTemplate($template);
+
+            $php = PHPUnit_Util_PHP::factory();
+            $php->runTestJob($template->render(), $this, $result);
+        } else {
+            $result->run($this);
+        }
+
+        if ($this->useErrorHandler !== null) {
+            $result->convertErrorsToExceptions($oldErrorHandlerSetting);
+        }
+
+        $this->result = null;
+
+        return $result;
+    }
+
+    /**
+     * Runs the bare test sequence.
+     */
+    public function runBare()
+    {
+        $this->numAssertions = 0;
+
+        // Backup the $GLOBALS array and static attributes.
+        if ($this->runTestInSeparateProcess !== true &&
+            $this->inIsolation !== true) {
+            if ($this->backupGlobals === null ||
+                $this->backupGlobals === true) {
+                PHPUnit_Util_GlobalState::backupGlobals(
+                  $this->backupGlobalsBlacklist
+                );
+            }
+
+            if ($this->backupStaticAttributes === true) {
+                PHPUnit_Util_GlobalState::backupStaticAttributes(
+                  $this->backupStaticAttributesBlacklist
+                );
+            }
+        }
+
+        // Start output buffering.
+        ob_start();
+        $this->outputBufferingActive = true;
+
+        // Clean up stat cache.
+        clearstatcache();
+
+        // Backup the cwd
+        $currentWorkingDirectory = getcwd();
+
+        $hookMethods = PHPUnit_Util_Test::getHookMethods(get_class($this));
+
+        try {
+            $hasMetRequirements = false;
+            $this->checkRequirements();
+            $hasMetRequirements = true;
+
+            if ($this->inIsolation) {
+                foreach ($hookMethods['beforeClass'] as $method) {
+                    $this->$method();
+                }
+            }
+
+            $this->setExpectedExceptionFromAnnotation();
+
+            foreach ($hookMethods['before'] as $method) {
+                $this->$method();
+            }
+
+            $this->assertPreConditions();
+            $this->testResult = $this->runTest();
+            $this->verifyMockObjects();
+            $this->assertPostConditions();
+            $this->status = PHPUnit_Runner_BaseTestRunner::STATUS_PASSED;
+        } catch (PHPUnit_Framework_IncompleteTest $e) {
+            $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE;
+            $this->statusMessage = $e->getMessage();
+        } catch (PHPUnit_Framework_SkippedTest $e) {
+            $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED;
+            $this->statusMessage = $e->getMessage();
+        } catch (PHPUnit_Framework_AssertionFailedError $e) {
+            $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE;
+            $this->statusMessage = $e->getMessage();
+        } catch (Exception $e) {
+            $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_ERROR;
+            $this->statusMessage = $e->getMessage();
+        }
+
+        // Clean up the mock objects.
+        $this->mockObjects = array();
+
+        // Tear down the fixture. An exception raised in tearDown() will be
+        // caught and passed on when no exception was raised before.
+        try {
+            if ($hasMetRequirements) {
+                foreach ($hookMethods['after'] as $method) {
+                    $this->$method();
+                }
+
+                if ($this->inIsolation) {
+                    foreach ($hookMethods['afterClass'] as $method) {
+                        $this->$method();
+                    }
+                }
+            }
+        } catch (Exception $_e) {
+            if (!isset($e)) {
+                $e = $_e;
+            }
+        }
+
+        // Stop output buffering.
+        if ($this->outputCallback === false) {
+            $this->output = ob_get_contents();
+        } else {
+            $this->output = call_user_func_array(
+              $this->outputCallback, array(ob_get_contents())
+            );
+        }
+
+        ob_end_clean();
+        $this->outputBufferingActive = false;
+
+        // Clean up stat cache.
+        clearstatcache();
+
+        // Restore the cwd if it was changed by the test
+        if ($currentWorkingDirectory != getcwd()) {
+            chdir($currentWorkingDirectory);
+        }
+
+        // Restore the $GLOBALS array and static attributes.
+        if ($this->runTestInSeparateProcess !== true &&
+            $this->inIsolation !== true) {
+            if ($this->backupGlobals === null ||
+                $this->backupGlobals === true) {
+                PHPUnit_Util_GlobalState::restoreGlobals(
+                   $this->backupGlobalsBlacklist
+                );
+            }
+
+            if ($this->backupStaticAttributes === true) {
+                PHPUnit_Util_GlobalState::restoreStaticAttributes();
+            }
+        }
+
+        // Clean up INI settings.
+        foreach ($this->iniSettings as $varName => $oldValue) {
+            ini_set($varName, $oldValue);
+        }
+
+        $this->iniSettings = array();
+
+        // Clean up locale settings.
+        foreach ($this->locale as $category => $locale) {
+            setlocale($category, $locale);
+        }
+
+        // Perform assertion on output.
+        if (!isset($e)) {
+            try {
+                if ($this->outputExpectedRegex !== null) {
+                    $this->hasPerformedExpectationsOnOutput = true;
+                    $this->assertRegExp($this->outputExpectedRegex, $this->output);
+                    $this->outputExpectedRegex = null;
+                } elseif ($this->outputExpectedString !== null) {
+                    $this->hasPerformedExpectationsOnOutput = true;
+                    $this->assertEquals($this->outputExpectedString, $this->output);
+                    $this->outputExpectedString = null;
+                }
+            } catch (Exception $_e) {
+                $e = $_e;
+            }
+        }
+
+        // Workaround for missing "finally".
+        if (isset($e)) {
+            $this->onNotSuccessfulTest($e);
+        }
+    }
+
+    /**
+     * Override to run the test and assert its state.
+     *
+     * @return mixed
+     * @throws Exception|PHPUnit_Framework_Exception
+     * @throws PHPUnit_Framework_Exception
+     */
+    protected function runTest()
+    {
+        if ($this->name === null) {
+            throw new PHPUnit_Framework_Exception(
+              'PHPUnit_Framework_TestCase::$name must not be null.'
+            );
+        }
+
+        try {
+            $class  = new ReflectionClass($this);
+            $method = $class->getMethod($this->name);
+        } catch (ReflectionException $e) {
+            $this->fail($e->getMessage());
+        }
+
+        try {
+            $testResult = $method->invokeArgs(
+              $this, array_merge($this->data, $this->dependencyInput)
+            );
+        } catch (Exception $e) {
+            $checkException = false;
+
+            if (is_string($this->expectedException)) {
+                $checkException = true;
+
+                if ($e instanceof PHPUnit_Framework_Exception) {
+                    $checkException = false;
+                }
+
+                $reflector = new ReflectionClass($this->expectedException);
+
+                if ($this->expectedException == 'PHPUnit_Framework_Exception' ||
+                    $reflector->isSubclassOf('PHPUnit_Framework_Exception')) {
+                    $checkException = true;
+                }
+            }
+
+            if ($checkException) {
+                $this->assertThat(
+                  $e,
+                  new PHPUnit_Framework_Constraint_Exception(
+                    $this->expectedException
+                  )
+                );
+
+                if (is_string($this->expectedExceptionMessage) &&
+                    !empty($this->expectedExceptionMessage)) {
+                    $this->assertThat(
+                      $e,
+                      new PHPUnit_Framework_Constraint_ExceptionMessage(
+                        $this->expectedExceptionMessage
+                      )
+                    );
+                }
+
+                if ($this->expectedExceptionCode !== null) {
+                    $this->assertThat(
+                      $e,
+                      new PHPUnit_Framework_Constraint_ExceptionCode(
+                        $this->expectedExceptionCode
+                      )
+                    );
+                }
+
+                return;
+            } else {
+                throw $e;
+            }
+        }
+
+        if ($this->expectedException !== null) {
+            $this->assertThat(
+              null,
+              new PHPUnit_Framework_Constraint_Exception(
+                $this->expectedException
+              )
+            );
+        }
+
+        return $testResult;
+    }
+
+    /**
+     * Verifies the mock object expectations.
+     *
+     * @since Method available since Release 3.5.0
+     */
+    protected function verifyMockObjects()
+    {
+        foreach ($this->mockObjects as $mockObject) {
+            if ($mockObject->__phpunit_hasMatchers()) {
+                $this->numAssertions++;
+            }
+
+            $mockObject->__phpunit_verify();
+        }
+    }
+
+    /**
+     * Sets the name of a TestCase.
+     *
+     * @param  string
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * Sets the dependencies of a TestCase.
+     *
+     * @param array $dependencies
+     * @since  Method available since Release 3.4.0
+     */
+    public function setDependencies(array $dependencies)
+    {
+        $this->dependencies = $dependencies;
+    }
+
+    /**
+     * Returns true if the tests has dependencies
+     *
+     * @return boolean
+     * @since Method available since Release 4.0.0
+     */
+    public function hasDependencies()
+    {
+        return count($this->dependencies) > 0;
+    }
+
+    /**
+     * Sets
+     *
+     * @param array $dependencyInput
+     * @since  Method available since Release 3.4.0
+     */
+    public function setDependencyInput(array $dependencyInput)
+    {
+        $this->dependencyInput = $dependencyInput;
+    }
+
+    /**
+     * Calling this method in setUp() has no effect!
+     *
+     * @param boolean $backupGlobals
+     * @since  Method available since Release 3.3.0
+     */
+    public function setBackupGlobals($backupGlobals)
+    {
+        if (is_null($this->backupGlobals) && is_bool($backupGlobals)) {
+            $this->backupGlobals = $backupGlobals;
+        }
+    }
+
+    /**
+     * Calling this method in setUp() has no effect!
+     *
+     * @param boolean $backupStaticAttributes
+     * @since  Method available since Release 3.4.0
+     */
+    public function setBackupStaticAttributes($backupStaticAttributes)
+    {
+        if (is_null($this->backupStaticAttributes) &&
+            is_bool($backupStaticAttributes)) {
+            $this->backupStaticAttributes = $backupStaticAttributes;
+        }
+    }
+
+    /**
+     * @param  boolean                     $runTestInSeparateProcess
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.4.0
+     */
+    public function setRunTestInSeparateProcess($runTestInSeparateProcess)
+    {
+        if (is_bool($runTestInSeparateProcess)) {
+            if ($this->runTestInSeparateProcess === null) {
+                $this->runTestInSeparateProcess = $runTestInSeparateProcess;
+            }
+        } else {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+    }
+
+    /**
+     * @param  boolean                     $preserveGlobalState
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.4.0
+     */
+    public function setPreserveGlobalState($preserveGlobalState)
+    {
+        if (is_bool($preserveGlobalState)) {
+            $this->preserveGlobalState = $preserveGlobalState;
+        } else {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+    }
+
+    /**
+     * @param  boolean                     $inIsolation
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.4.0
+     */
+    public function setInIsolation($inIsolation)
+    {
+        if (is_bool($inIsolation)) {
+            $this->inIsolation = $inIsolation;
+        } else {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+    }
+
+    /**
+     * @return mixed
+     * @since  Method available since Release 3.4.0
+     */
+    public function getResult()
+    {
+        return $this->testResult;
+    }
+
+    /**
+     * @param mixed $result
+     * @since  Method available since Release 3.4.0
+     */
+    public function setResult($result)
+    {
+        $this->testResult = $result;
+    }
+
+    /**
+     * @param  callable                    $callback
+     * @throws PHPUnit_Framework_Exception
+     * @since Method available since Release 3.6.0
+     */
+    public function setOutputCallback($callback)
+    {
+        if (!is_callable($callback)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'callback');
+        }
+
+        $this->outputCallback = $callback;
+    }
+
+    /**
+     * @return PHPUnit_Framework_TestResult
+     * @since  Method available since Release 3.5.7
+     */
+    public function getTestResultObject()
+    {
+        return $this->result;
+    }
+
+    /**
+     * @param PHPUnit_Framework_TestResult $result
+     * @since Method available since Release 3.6.0
+     */
+    public function setTestResultObject(PHPUnit_Framework_TestResult $result)
+    {
+        $this->result = $result;
+    }
+
+    /**
+     * This method is a wrapper for the ini_set() function that automatically
+     * resets the modified php.ini setting to its original value after the
+     * test is run.
+     *
+     * @param  string                      $varName
+     * @param  string                      $newValue
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.0.0
+     */
+    protected function iniSet($varName, $newValue)
+    {
+        if (!is_string($varName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        $currentValue = ini_set($varName, $newValue);
+
+        if ($currentValue !== false) {
+            $this->iniSettings[$varName] = $currentValue;
+        } else {
+            throw new PHPUnit_Framework_Exception(
+              sprintf(
+                'INI setting "%s" could not be set to "%s".',
+                $varName,
+                $newValue
+              )
+            );
+        }
+    }
+
+    /**
+     * This method is a wrapper for the setlocale() function that automatically
+     * resets the locale to its original value after the test is run.
+     *
+     * @param  integer                     $category
+     * @param  string                      $locale
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.1.0
+     */
+    protected function setLocale()
+    {
+        $args = func_get_args();
+
+        if (count($args) < 2) {
+            throw new PHPUnit_Framework_Exception;
+        }
+
+        $category = $args[0];
+        $locale   = $args[1];
+
+        $categories = array(
+          LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, LC_TIME
+        );
+
+        if (defined('LC_MESSAGES')) {
+            $categories[] = LC_MESSAGES;
+        }
+
+        if (!in_array($category, $categories)) {
+            throw new PHPUnit_Framework_Exception;
+        }
+
+        if (!is_array($locale) && !is_string($locale)) {
+            throw new PHPUnit_Framework_Exception;
+        }
+
+        $this->locale[$category] = setlocale($category, null);
+
+        $result = call_user_func_array( 'setlocale', $args );
+
+        if ($result === false) {
+            throw new PHPUnit_Framework_Exception(
+              'The locale functionality is not implemented on your platform, ' .
+              'the specified locale does not exist or the category name is ' .
+              'invalid.'
+            );
+        }
+    }
+
+    /**
+     * Returns a mock object for the specified class.
+     *
+     * @param  string                                  $originalClassName       Name of the class to mock.
+     * @param  array|null                              $methods                 When provided, only methods whose names are in the array
+     *                                                                          are replaced with a configurable test double. The behavior
+     *                                                                          of the other methods is not changed.
+     *                                                                          Providing null means that no methods will be replaced.
+     * @param  array                                   $arguments               Parameters to pass to the original class' constructor.
+     * @param  string                                  $mockClassName           Class name for the generated test double class.
+     * @param  boolean                                 $callOriginalConstructor Can be used to disable the call to the original class' constructor.
+     * @param  boolean                                 $callOriginalClone       Can be used to disable the call to the original class' clone constructor.
+     * @param  boolean                                 $callAutoload            Can be used to disable __autoload() during the generation of the test double class.
+     * @param  boolean                                 $cloneArguments
+     * @param  boolean                                 $callOriginalMethods
+     * @return PHPUnit_Framework_MockObject_MockObject
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.0.0
+     */
+    public function getMock($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false, $callOriginalMethods = false)
+    {
+        $mockObject = $this->getMockObjectGenerator()->getMock(
+          $originalClassName,
+          $methods,
+          $arguments,
+          $mockClassName,
+          $callOriginalConstructor,
+          $callOriginalClone,
+          $callAutoload,
+          $cloneArguments,
+          $callOriginalMethods
+        );
+
+        $this->mockObjects[] = $mockObject;
+
+        return $mockObject;
+    }
+
+    /**
+     * Returns a builder object to create mock objects using a fluent interface.
+     *
+     * @param  string                                   $className
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     * @since  Method available since Release 3.5.0
+     */
+    public function getMockBuilder($className)
+    {
+        return new PHPUnit_Framework_MockObject_MockBuilder(
+          $this, $className
+        );
+    }
+
+    /**
+     * Mocks the specified class and returns the name of the mocked class.
+     *
+     * @param  string                      $originalClassName
+     * @param  array                       $methods
+     * @param  array                       $arguments
+     * @param  string                      $mockClassName
+     * @param  boolean                     $callOriginalConstructor
+     * @param  boolean                     $callOriginalClone
+     * @param  boolean                     $callAutoload
+     * @param  boolean                     $cloneArguments
+     * @return string
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.5.0
+     */
+    protected function getMockClass($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = false, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false)
+    {
+        $mock = $this->getMock(
+          $originalClassName,
+          $methods,
+          $arguments,
+          $mockClassName,
+          $callOriginalConstructor,
+          $callOriginalClone,
+          $callAutoload,
+          $cloneArguments
+        );
+
+        return get_class($mock);
+    }
+
+    /**
+     * Returns a mock object for the specified abstract class with all abstract
+     * methods of the class mocked. Concrete methods to mock can be specified with
+     * the last parameter
+     *
+     * @param  string                                  $originalClassName
+     * @param  array                                   $arguments
+     * @param  string                                  $mockClassName
+     * @param  boolean                                 $callOriginalConstructor
+     * @param  boolean                                 $callOriginalClone
+     * @param  boolean                                 $callAutoload
+     * @param  array                                   $mockedMethods
+     * @param  boolean                                 $cloneArguments
+     * @return PHPUnit_Framework_MockObject_MockObject
+     * @since  Method available since Release 3.4.0
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function getMockForAbstractClass($originalClassName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $mockedMethods = array(), $cloneArguments = false)
+    {
+        $mockObject = $this->getMockObjectGenerator()->getMockForAbstractClass(
+          $originalClassName,
+          $arguments,
+          $mockClassName,
+          $callOriginalConstructor,
+          $callOriginalClone,
+          $callAutoload,
+          $mockedMethods,
+          $cloneArguments
+        );
+
+        $this->mockObjects[] = $mockObject;
+
+        return $mockObject;
+    }
+
+    /**
+     * Returns a mock object based on the given WSDL file.
+     *
+     * @param  string                                  $wsdlFile
+     * @param  string                                  $originalClassName
+     * @param  string                                  $mockClassName
+     * @param  array                                   $methods
+     * @param  boolean                                 $callOriginalConstructor
+     * @param  array                                   $options                 An array of options passed to SOAPClient::_construct
+     * @return PHPUnit_Framework_MockObject_MockObject
+     * @since  Method available since Release 3.4.0
+     */
+    protected function getMockFromWsdl($wsdlFile, $originalClassName = '', $mockClassName = '', array $methods = array(), $callOriginalConstructor = true, array $options = array())
+    {
+        if ($originalClassName === '') {
+            $originalClassName = str_replace(
+              '.wsdl', '', basename($wsdlFile)
+            );
+        }
+
+        if (!class_exists($originalClassName)) {
+          eval(
+            $this->getMockObjectGenerator()->generateClassFromWsdl(
+              $wsdlFile, $originalClassName, $methods, $options
+            )
+          );
+        }
+
+        return $this->getMock(
+          $originalClassName,
+          $methods,
+          array('', $options),
+          $mockClassName,
+          $callOriginalConstructor,
+          false,
+          false
+        );
+    }
+
+    /**
+     * Returns a mock object for the specified trait with all abstract methods
+     * of the trait mocked. Concrete methods to mock can be specified with the
+     * `$mockedMethods` parameter.
+     *
+     * @param  string                                  $traitName
+     * @param  array                                   $arguments
+     * @param  string                                  $mockClassName
+     * @param  boolean                                 $callOriginalConstructor
+     * @param  boolean                                 $callOriginalClone
+     * @param  boolean                                 $callAutoload
+     * @param  array                                   $mockedMethods
+     * @param  boolean                                 $cloneArguments
+     * @return PHPUnit_Framework_MockObject_MockObject
+     * @since  Method available since Release 4.0.0
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function getMockForTrait($traitName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $mockedMethods = array(), $cloneArguments = false)
+    {
+        $mockObject = $this->getMockObjectGenerator()->getMockForTrait(
+          $traitName,
+          $arguments,
+          $mockClassName,
+          $callOriginalConstructor,
+          $callOriginalClone,
+          $callAutoload,
+          $mockedMethods,
+          $cloneArguments
+        );
+
+        $this->mockObjects[] = $mockObject;
+
+        return $mockObject;
+    }
+
+    /**
+     * Returns an object for the specified trait.
+     *
+     * @param  string                      $traitName
+     * @param  array                       $arguments
+     * @param  string                      $traitClassName
+     * @param  boolean                     $callOriginalConstructor
+     * @param  boolean                     $callOriginalClone
+     * @param  boolean                     $callAutoload
+     * @param  boolean                     $cloneArguments
+     * @return object
+     * @since  Method available since Release 3.6.0
+     * @throws PHPUnit_Framework_Exception
+     */
+    protected function getObjectForTrait($traitName, array $arguments = array(), $traitClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false)
+    {
+        return $this->getMockObjectGenerator()->getObjectForTrait(
+          $traitName,
+          $arguments,
+          $traitClassName,
+          $callOriginalConstructor,
+          $callOriginalClone,
+          $callAutoload,
+          $cloneArguments
+        );
+    }
+
+    /**
+     * Adds a value to the assertion counter.
+     *
+     * @param integer $count
+     * @since Method available since Release 3.3.3
+     */
+    public function addToAssertionCount($count)
+    {
+        $this->numAssertions += $count;
+    }
+
+    /**
+     * Returns the number of assertions performed by this test.
+     *
+     * @return integer
+     * @since  Method available since Release 3.3.0
+     */
+    public function getNumAssertions()
+    {
+        return $this->numAssertions;
+    }
+
+    /**
+     * Returns a matcher that matches when the method it is evaluated for
+     * is executed zero or more times.
+     *
+     * @return PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount
+     * @since  Method available since Release 3.0.0
+     */
+    public static function any()
+    {
+        return new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+    }
+
+    /**
+     * Returns a matcher that matches when the method it is evaluated for
+     * is never executed.
+     *
+     * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
+     * @since  Method available since Release 3.0.0
+     */
+    public static function never()
+    {
+        return new PHPUnit_Framework_MockObject_Matcher_InvokedCount(0);
+    }
+
+    /**
+     * Returns a matcher that matches when the method it is evaluated for
+     * is executed at least once.
+     *
+     * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce
+     * @since  Method available since Release 3.0.0
+     */
+    public static function atLeastOnce()
+    {
+        return new PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce;
+    }
+
+    /**
+     * Returns a matcher that matches when the method it is evaluated for
+     * is executed exactly once.
+     *
+     * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
+     * @since  Method available since Release 3.0.0
+     */
+    public static function once()
+    {
+        return new PHPUnit_Framework_MockObject_Matcher_InvokedCount(1);
+    }
+
+    /**
+     * Returns a matcher that matches when the method it is evaluated for
+     * is executed exactly $count times.
+     *
+     * @param  integer                                           $count
+     * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
+     * @since  Method available since Release 3.0.0
+     */
+    public static function exactly($count)
+    {
+        return new PHPUnit_Framework_MockObject_Matcher_InvokedCount($count);
+    }
+
+    /**
+     * Returns a matcher that matches when the method it is evaluated for
+     * is invoked at the given $index.
+     *
+     * @param  integer                                             $index
+     * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex
+     * @since  Method available since Release 3.0.0
+     */
+    public static function at($index)
+    {
+        return new PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex($index);
+    }
+
+    /**
+     *
+     *
+     * @param  mixed                                    $value
+     * @return PHPUnit_Framework_MockObject_Stub_Return
+     * @since  Method available since Release 3.0.0
+     */
+    public static function returnValue($value)
+    {
+        return new PHPUnit_Framework_MockObject_Stub_Return($value);
+    }
+
+    /**
+     *
+     *
+     * @param  array                                            $valueMap
+     * @return PHPUnit_Framework_MockObject_Stub_ReturnValueMap
+     * @since  Method available since Release 3.6.0
+     */
+    public static function returnValueMap(array $valueMap)
+    {
+        return new PHPUnit_Framework_MockObject_Stub_ReturnValueMap($valueMap);
+    }
+
+    /**
+     *
+     *
+     * @param  integer                                          $argumentIndex
+     * @return PHPUnit_Framework_MockObject_Stub_ReturnArgument
+     * @since  Method available since Release 3.3.0
+     */
+    public static function returnArgument($argumentIndex)
+    {
+        return new PHPUnit_Framework_MockObject_Stub_ReturnArgument(
+          $argumentIndex
+        );
+    }
+
+    /**
+     *
+     *
+     * @param  mixed                                            $callback
+     * @return PHPUnit_Framework_MockObject_Stub_ReturnCallback
+     * @since  Method available since Release 3.3.0
+     */
+    public static function returnCallback($callback)
+    {
+        return new PHPUnit_Framework_MockObject_Stub_ReturnCallback($callback);
+    }
+
+    /**
+     * Returns the current object.
+     *
+     * This method is useful when mocking a fluent interface.
+     *
+     * @return PHPUnit_Framework_MockObject_Stub_ReturnSelf
+     * @since  Method available since Release 3.6.0
+     */
+    public static function returnSelf()
+    {
+        return new PHPUnit_Framework_MockObject_Stub_ReturnSelf();
+    }
+
+    /**
+     *
+     *
+     * @param  Exception                                   $exception
+     * @return PHPUnit_Framework_MockObject_Stub_Exception
+     * @since  Method available since Release 3.1.0
+     */
+    public static function throwException(Exception $exception)
+    {
+        return new PHPUnit_Framework_MockObject_Stub_Exception($exception);
+    }
+
+    /**
+     * @param  mixed                                              $value, ...
+     * @return PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls
+     * @since  Method available since Release 3.0.0
+     */
+    public static function onConsecutiveCalls()
+    {
+        $args = func_get_args();
+
+        return new PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls($args);
+    }
+
+    /**
+     * @param  mixed  $data
+     * @return string
+     * @since  Method available since Release 3.2.1
+     */
+    protected function dataToString($data)
+    {
+        $result = array();
+
+        set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+            throw new ErrorException($errstr, $errno, $errno, $errfile, $errline);
+        }, E_WARNING);
+
+        foreach ($data as $key => $_data) {
+            try {
+                // Detect array-recursions by using count
+                // http://php.net/manual/en/function.count.php
+                $iRecursiveCheck = count($_data, COUNT_RECURSIVE);
+
+                if (is_array($_data)) {
+                    $result[] = 'array(' . $this->dataToString($_data) . ')';
+                } elseif (is_object($_data)) {
+                    $object = new ReflectionObject($_data);
+
+                    if ($object->hasMethod('__toString')) {
+                        $result[] = (string) $_data;
+                    } else {
+                        $result[] = get_class($_data);
+                    }
+                } elseif (is_resource($_data)) {
+                    $result[] = '<resource>';
+                } else {
+                    $result[] = var_export($_data, true);
+                }
+            } catch (ErrorException $e) {
+                $result[] = '*RECURSION*';
+            }
+        }
+
+        restore_error_handler();
+
+        return join(', ', $result);
+    }
+
+    /**
+     * Gets the data set description of a TestCase.
+     *
+     * @param  boolean $includeData
+     * @return string
+     * @since  Method available since Release 3.3.0
+     */
+    protected function getDataSetAsString($includeData = true)
+    {
+        $buffer = '';
+
+        if (!empty($this->data)) {
+            if (is_int($this->dataName)) {
+                $buffer .= sprintf(' with data set #%d', $this->dataName);
+            } else {
+                $buffer .= sprintf(' with data set "%s"', $this->dataName);
+            }
+
+            if ($includeData) {
+                $buffer .= sprintf(' (%s)', $this->dataToString($this->data));
+            }
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * Creates a default TestResult object.
+     *
+     * @return PHPUnit_Framework_TestResult
+     */
+    protected function createResult()
+    {
+        return new PHPUnit_Framework_TestResult;
+    }
+
+    /**
+     * @since Method available since Release 3.5.4
+     */
+    protected function handleDependencies()
+    {
+        if (!empty($this->dependencies) && !$this->inIsolation) {
+            $className  = get_class($this);
+            $passed     = $this->result->passed();
+            $passedKeys = array_keys($passed);
+            $numKeys    = count($passedKeys);
+
+            for ($i = 0; $i < $numKeys; $i++) {
+                $pos = strpos($passedKeys[$i], ' with data set');
+
+                if ($pos !== false) {
+                    $passedKeys[$i] = substr($passedKeys[$i], 0, $pos);
+                }
+            }
+
+            $passedKeys = array_flip(array_unique($passedKeys));
+
+            foreach ($this->dependencies as $dependency) {
+                if (strpos($dependency, '::') === false) {
+                    $dependency = $className . '::' . $dependency;
+                }
+
+                if (!isset($passedKeys[$dependency])) {
+                    $this->result->addError(
+                      $this,
+                      new PHPUnit_Framework_SkippedTestError(
+                        sprintf(
+                          'This test depends on "%s" to pass.', $dependency
+                        )
+                      ),
+                      0
+                    );
+
+                    return false;
+                }
+
+                if (isset($passed[$dependency])) {
+                    if ($passed[$dependency]['size'] > $this->getSize()) {
+                        $this->result->addError(
+                          $this,
+                          new PHPUnit_Framework_SkippedTestError(
+                            'This test depends on a test that is larger than itself.'
+                          ),
+                          0
+                        );
+
+                        return false;
+                    }
+
+                    $this->dependencyInput[] = $passed[$dependency]['result'];
+                } else {
+                    $this->dependencyInput[] = null;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * This method is called before the first test of this test class is run.
+     *
+     * @since Method available since Release 3.4.0
+     */
+    public static function setUpBeforeClass()
+    {
+    }
+
+    /**
+     * Sets up the fixture, for example, open a network connection.
+     * This method is called before a test is executed.
+     *
+     */
+    protected function setUp()
+    {
+    }
+
+    /**
+     * Performs assertions shared by all tests of a test case.
+     *
+     * This method is called before the execution of a test starts
+     * and after setUp() is called.
+     *
+     * @since  Method available since Release 3.2.8
+     */
+    protected function assertPreConditions()
+    {
+    }
+
+    /**
+     * Performs assertions shared by all tests of a test case.
+     *
+     * This method is called before the execution of a test ends
+     * and before tearDown() is called.
+     *
+     * @since  Method available since Release 3.2.8
+     */
+    protected function assertPostConditions()
+    {
+    }
+
+    /**
+     * Tears down the fixture, for example, close a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
+
+    /**
+     * This method is called after the last test of this test class is run.
+     *
+     * @since Method available since Release 3.4.0
+     */
+    public static function tearDownAfterClass()
+    {
+    }
+
+    /**
+     * This method is called when a test method did not execute successfully.
+     *
+     * @param  Exception $e
+     * @since Method available since Release 3.4.0
+     * @throws Exception
+     */
+    protected function onNotSuccessfulTest(Exception $e)
+    {
+        throw $e;
+    }
+
+    /**
+     * Performs custom preparations on the process isolation template.
+     *
+     * @param Text_Template $template
+     * @since Method available since Release 3.4.0
+     */
+    protected function prepareTemplate(Text_Template $template)
+    {
+    }
+
+    /**
+     * Get the mock object generator, creating it if it doesn't exist.
+     *
+     * @return   PHPUnit_Framework_MockObject_Generator
+     */
+    protected function getMockObjectGenerator()
+    {
+        if (null === $this->mockObjectGenerator) {
+            $this->mockObjectGenerator = new PHPUnit_Framework_MockObject_Generator;
+        }
+
+        return $this->mockObjectGenerator;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/TestFailure.php b/vendor/phpunit/phpunit/src/Framework/TestFailure.php
new file mode 100644
index 00000000..9da0b739
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/TestFailure.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * A TestFailure collects a failed test together with the caught exception.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class PHPUnit_Framework_TestFailure
+{
+    /**
+     * @var    PHPUnit_Framework_Test
+     */
+    protected $failedTest;
+
+    /**
+     * @var    Exception
+     */
+    protected $thrownException;
+
+    /**
+     * Constructs a TestFailure with the given test and exception.
+     *
+     * @param PHPUnit_Framework_Test $failedTest
+     * @param Exception              $thrownException
+     */
+    public function __construct(PHPUnit_Framework_Test $failedTest, Exception $thrownException)
+    {
+        $this->failedTest      = $failedTest;
+        $this->thrownException = $thrownException;
+    }
+
+    /**
+     * Returns a short description of the failure.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return sprintf(
+          '%s: %s',
+
+          $this->failedTest->toString(),
+          $this->thrownException->getMessage()
+        );
+    }
+
+    /**
+     * Returns a description for the thrown exception.
+     *
+     * @return string
+     * @since  Method available since Release 3.4.0
+     */
+    public function getExceptionAsString()
+    {
+        return self::exceptionToString($this->thrownException);
+    }
+
+    /**
+     * Returns a description for an exception.
+     *
+     * @param  Exception $e
+     * @return string
+     * @since  Method available since Release 3.2.0
+     */
+    public static function exceptionToString(Exception $e)
+    {
+        if ($e instanceof PHPUnit_Framework_SelfDescribing) {
+            $buffer = $e->toString();
+
+            if ($e instanceof PHPUnit_Framework_ExpectationFailedException && $e->getComparisonFailure()) {
+                $buffer = $buffer . $e->getComparisonFailure()->getDiff();
+            }
+
+            if (!empty($buffer)) {
+                $buffer = trim($buffer) . "\n";
+            }
+        } elseif ($e instanceof PHPUnit_Framework_Error) {
+            $buffer = $e->getMessage() . "\n";
+        } else {
+            $buffer = get_class($e) . ': ' . $e->getMessage() . "\n";
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * Gets the failed test.
+     *
+     * @return PHPUnit_Framework_Test
+     */
+    public function failedTest()
+    {
+        return $this->failedTest;
+    }
+
+    /**
+     * Gets the thrown exception.
+     *
+     * @return Exception
+     */
+    public function thrownException()
+    {
+        return $this->thrownException;
+    }
+
+    /**
+     * Returns the exception's message.
+     *
+     * @return string
+     */
+    public function exceptionMessage()
+    {
+        return $this->thrownException()->getMessage();
+    }
+
+    /**
+     * Returns true if the thrown exception
+     * is of type AssertionFailedError.
+     *
+     * @return boolean
+     */
+    public function isFailure()
+    {
+        return ($this->thrownException() instanceof PHPUnit_Framework_AssertionFailedError);
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/TestListener.php b/vendor/phpunit/phpunit/src/Framework/TestListener.php
new file mode 100644
index 00000000..8a4a604b
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/TestListener.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * A Listener for test progress.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Interface available since Release 2.0.0
+ */
+interface PHPUnit_Framework_TestListener
+{
+    /**
+     * An error occurred.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time);
+
+    /**
+     * A failure occurred.
+     *
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
+     */
+    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time);
+
+    /**
+     * Incomplete test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time);
+
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time);
+
+    /**
+     * Skipped test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 3.0.0
+     */
+    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time);
+
+    /**
+     * A test suite started.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function startTestSuite(PHPUnit_Framework_TestSuite $suite);
+
+    /**
+     * A test suite ended.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function endTestSuite(PHPUnit_Framework_TestSuite $suite);
+
+    /**
+     * A test started.
+     *
+     * @param PHPUnit_Framework_Test $test
+     */
+    public function startTest(PHPUnit_Framework_Test $test);
+
+    /**
+     * A test ended.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
+     */
+    public function endTest(PHPUnit_Framework_Test $test, $time);
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/TestResult.php b/vendor/phpunit/phpunit/src/Framework/TestResult.php
new file mode 100644
index 00000000..f373b082
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/TestResult.php
@@ -0,0 +1,1124 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * A TestResult collects the results of executing a test case.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class PHPUnit_Framework_TestResult implements Countable
+{
+    /**
+     * @var array
+     */
+    protected $passed = array();
+
+    /**
+     * @var array
+     */
+    protected $errors = array();
+
+    /**
+     * @var array
+     */
+    protected $deprecatedFeatures = array();
+
+    /**
+     * @var array
+     */
+    protected $failures = array();
+
+    /**
+     * @var array
+     */
+    protected $notImplemented = array();
+
+    /**
+     * @var array
+     */
+    protected $risky = array();
+
+    /**
+     * @var array
+     */
+    protected $skipped = array();
+
+    /**
+     * @var array
+     */
+    protected $listeners = array();
+
+    /**
+     * @var integer
+     */
+    protected $runTests = 0;
+
+    /**
+     * @var float
+     */
+    protected $time = 0;
+
+    /**
+     * @var PHPUnit_Framework_TestSuite
+     */
+    protected $topTestSuite = null;
+
+    /**
+     * Code Coverage information.
+     *
+     * @var PHP_CodeCoverage
+     */
+    protected $codeCoverage;
+
+    /**
+     * @var boolean
+     */
+    protected $convertErrorsToExceptions = true;
+
+    /**
+     * @var boolean
+     */
+    protected $stop = false;
+
+    /**
+     * @var boolean
+     */
+    protected $stopOnError = false;
+
+    /**
+     * @var boolean
+     */
+    protected $stopOnFailure = false;
+
+    /**
+     * @var boolean
+     */
+    protected $beStrictAboutTestsThatDoNotTestAnything = false;
+
+    /**
+     * @var boolean
+     */
+    protected $beStrictAboutOutputDuringTests = false;
+
+    /**
+     * @var boolean
+     */
+    protected $beStrictAboutTestSize = false;
+
+    /**
+     * @var boolean
+     */
+    protected $stopOnRisky = false;
+
+    /**
+     * @var boolean
+     */
+    protected $stopOnIncomplete = false;
+
+    /**
+     * @var boolean
+     */
+    protected $stopOnSkipped = false;
+
+    /**
+     * @var boolean
+     */
+    protected $lastTestFailed = false;
+
+    /**
+     * @var integer
+     */
+    protected $timeoutForSmallTests = 1;
+
+    /**
+     * @var integer
+     */
+    protected $timeoutForMediumTests = 10;
+
+    /**
+     * @var integer
+     */
+    protected $timeoutForLargeTests = 60;
+
+    /**
+     * Registers a TestListener.
+     *
+     * @param  PHPUnit_Framework_TestListener
+     */
+    public function addListener(PHPUnit_Framework_TestListener $listener)
+    {
+        $this->listeners[] = $listener;
+    }
+
+    /**
+     * Unregisters a TestListener.
+     *
+     * @param PHPUnit_Framework_TestListener $listener
+     */
+    public function removeListener(PHPUnit_Framework_TestListener $listener)
+    {
+        foreach ($this->listeners as $key => $_listener) {
+            if ($listener === $_listener) {
+                unset($this->listeners[$key]);
+            }
+        }
+    }
+
+    /**
+     * Flushes all flushable TestListeners.
+     *
+     * @since  Method available since Release 3.0.0
+     */
+    public function flushListeners()
+    {
+        foreach ($this->listeners as $listener) {
+            if ($listener instanceof PHPUnit_Util_Printer) {
+                $listener->flush();
+            }
+        }
+    }
+
+    /**
+     * Adds an error to the list of errors.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        if ($e instanceof PHPUnit_Framework_RiskyTest) {
+            $this->risky[] = new PHPUnit_Framework_TestFailure(
+              $test, $e
+            );
+
+            $notifyMethod = 'addRiskyTest';
+
+            if ($this->stopOnRisky) {
+                $this->stop();
+            }
+        } elseif ($e instanceof PHPUnit_Framework_IncompleteTest) {
+            $this->notImplemented[] = new PHPUnit_Framework_TestFailure(
+              $test, $e
+            );
+
+            $notifyMethod = 'addIncompleteTest';
+
+            if ($this->stopOnIncomplete) {
+                $this->stop();
+            }
+        } elseif ($e instanceof PHPUnit_Framework_SkippedTest) {
+            $this->skipped[] = new PHPUnit_Framework_TestFailure($test, $e);
+            $notifyMethod    = 'addSkippedTest';
+
+            if ($this->stopOnSkipped) {
+                $this->stop();
+            }
+        } else {
+            $this->errors[] = new PHPUnit_Framework_TestFailure($test, $e);
+            $notifyMethod   = 'addError';
+
+            if ($this->stopOnError || $this->stopOnFailure) {
+                $this->stop();
+            }
+        }
+
+        foreach ($this->listeners as $listener) {
+            $listener->$notifyMethod($test, $e, $time);
+        }
+
+        $this->lastTestFailed = true;
+        $this->time          += $time;
+    }
+
+    /**
+     * Adds a failure to the list of failures.
+     * The passed in exception caused the failure.
+     *
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
+     */
+    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
+    {
+        if ($e instanceof PHPUnit_Framework_RiskyTest) {
+            $this->risky[] = new PHPUnit_Framework_TestFailure(
+              $test, $e
+            );
+
+            $notifyMethod = 'addRiskyTest';
+
+            if ($this->stopOnRisky) {
+                $this->stop();
+            }
+        } elseif ($e instanceof PHPUnit_Framework_IncompleteTest) {
+            $this->notImplemented[] = new PHPUnit_Framework_TestFailure(
+              $test, $e
+            );
+
+            $notifyMethod = 'addIncompleteTest';
+
+            if ($this->stopOnIncomplete) {
+                $this->stop();
+            }
+        } elseif ($e instanceof PHPUnit_Framework_SkippedTest) {
+            $this->skipped[] = new PHPUnit_Framework_TestFailure($test, $e);
+            $notifyMethod    = 'addSkippedTest';
+
+            if ($this->stopOnSkipped) {
+                $this->stop();
+            }
+        } else {
+            $this->failures[] = new PHPUnit_Framework_TestFailure($test, $e);
+            $notifyMethod     = 'addFailure';
+
+            if ($this->stopOnFailure) {
+                $this->stop();
+            }
+        }
+
+        foreach ($this->listeners as $listener) {
+            $listener->$notifyMethod($test, $e, $time);
+        }
+
+        $this->lastTestFailed = true;
+        $this->time          += $time;
+    }
+
+    /**
+     * Adds a deprecated feature notice to the list of deprecated features used during run
+     *
+     * @param PHPUnit_Util_DeprecatedFeature $deprecatedFeature
+     */
+    public function addDeprecatedFeature(PHPUnit_Util_DeprecatedFeature $deprecatedFeature)
+    {
+        $this->deprecatedFeatures[] = $deprecatedFeature;
+    }
+
+    /**
+     * Informs the result that a testsuite will be started.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+        if ($this->topTestSuite === null) {
+            $this->topTestSuite = $suite;
+        }
+
+        foreach ($this->listeners as $listener) {
+            $listener->startTestSuite($suite);
+        }
+    }
+
+    /**
+     * Informs the result that a testsuite was completed.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+        foreach ($this->listeners as $listener) {
+            $listener->endTestSuite($suite);
+        }
+    }
+
+    /**
+     * Informs the result that a test will be started.
+     *
+     * @param PHPUnit_Framework_Test $test
+     */
+    public function startTest(PHPUnit_Framework_Test $test)
+    {
+        $this->lastTestFailed = false;
+        $this->runTests      += count($test);
+
+        foreach ($this->listeners as $listener) {
+            $listener->startTest($test);
+        }
+    }
+
+    /**
+     * Informs the result that a test was completed.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
+     */
+    public function endTest(PHPUnit_Framework_Test $test, $time)
+    {
+        foreach ($this->listeners as $listener) {
+            $listener->endTest($test, $time);
+        }
+
+        if (!$this->lastTestFailed && $test instanceof PHPUnit_Framework_TestCase) {
+            $class  = get_class($test);
+            $key    =  $class . '::' . $test->getName();
+
+            $this->passed[$key] = array(
+              'result' => $test->getResult(),
+              'size'   => PHPUnit_Util_Test::getSize(
+                            $class, $test->getName(false)
+                          )
+            );
+
+            $this->time += $time;
+        }
+    }
+
+    /**
+     * Returns true if no risky test occurred.
+     *
+     * @return boolean
+     * @since  Method available since Release 4.0.0
+     */
+    public function allHarmless()
+    {
+        return $this->riskyCount() == 0;
+    }
+
+    /**
+     * Gets the number of risky tests.
+     *
+     * @return integer
+     * @since  Method available since Release 4.0.0
+     */
+    public function riskyCount()
+    {
+        return count($this->risky);
+    }
+
+    /**
+     * Returns true if no incomplete test occurred.
+     *
+     * @return boolean
+     */
+    public function allCompletelyImplemented()
+    {
+        return $this->notImplementedCount() == 0;
+    }
+
+    /**
+     * Gets the number of incomplete tests.
+     *
+     * @return integer
+     */
+    public function notImplementedCount()
+    {
+        return count($this->notImplemented);
+    }
+
+    /**
+     * Returns an Enumeration for the risky tests.
+     *
+     * @return array
+     * @since  Method available since Release 4.0.0
+     */
+    public function risky()
+    {
+        return $this->risky;
+    }
+
+    /**
+     * Returns an Enumeration for the incomplete tests.
+     *
+     * @return array
+     */
+    public function notImplemented()
+    {
+        return $this->notImplemented;
+    }
+
+    /**
+     * Returns true if no test has been skipped.
+     *
+     * @return boolean
+     * @since  Method available since Release 3.0.0
+     */
+    public function noneSkipped()
+    {
+        return $this->skippedCount() == 0;
+    }
+
+    /**
+     * Gets the number of skipped tests.
+     *
+     * @return integer
+     * @since  Method available since Release 3.0.0
+     */
+    public function skippedCount()
+    {
+        return count($this->skipped);
+    }
+
+    /**
+     * Returns an Enumeration for the skipped tests.
+     *
+     * @return array
+     * @since  Method available since Release 3.0.0
+     */
+    public function skipped()
+    {
+        return $this->skipped;
+    }
+
+    /**
+     * Gets the number of detected errors.
+     *
+     * @return integer
+     */
+    public function errorCount()
+    {
+        return count($this->errors);
+    }
+
+    /**
+     * Returns an Enumeration for the errors.
+     *
+     * @return array
+     */
+    public function errors()
+    {
+        return $this->errors;
+    }
+
+    /**
+     * Returns an Enumeration for the deprecated features used.
+     *
+     * @return array
+     * @since  Method available since Release 3.5.7
+     */
+    public function deprecatedFeatures()
+    {
+        return $this->deprecatedFeatures;
+    }
+
+    /**
+     * Returns an Enumeration for the deprecated features used.
+     *
+     * @return array
+     * @since  Method available since Release 3.5.7
+     */
+    public function deprecatedFeaturesCount()
+    {
+        return count($this->deprecatedFeatures);
+    }
+
+    /**
+     * Gets the number of detected failures.
+     *
+     * @return integer
+     */
+    public function failureCount()
+    {
+        return count($this->failures);
+    }
+
+    /**
+     * Returns an Enumeration for the failures.
+     *
+     * @return array
+     */
+    public function failures()
+    {
+        return $this->failures;
+    }
+
+    /**
+     * Returns the names of the tests that have passed.
+     *
+     * @return array
+     * @since  Method available since Release 3.4.0
+     */
+    public function passed()
+    {
+        return $this->passed;
+    }
+
+    /**
+     * Returns the (top) test suite.
+     *
+     * @return PHPUnit_Framework_TestSuite
+     * @since  Method available since Release 3.0.0
+     */
+    public function topTestSuite()
+    {
+        return $this->topTestSuite;
+    }
+
+    /**
+     * Returns whether code coverage information should be collected.
+     *
+     * @return boolean If code coverage should be collected
+     * @since  Method available since Release 3.2.0
+     */
+    public function getCollectCodeCoverageInformation()
+    {
+        return $this->codeCoverage !== null;
+    }
+
+    /**
+     * Runs a TestCase.
+     *
+     * @param PHPUnit_Framework_Test $test
+     */
+    public function run(PHPUnit_Framework_Test $test)
+    {
+        PHPUnit_Framework_Assert::resetCount();
+
+        $error      = false;
+        $failure    = false;
+        $incomplete = false;
+        $risky      = false;
+        $skipped    = false;
+
+        $this->startTest($test);
+
+        $errorHandlerSet = false;
+
+        if ($this->convertErrorsToExceptions) {
+            $oldErrorHandler = set_error_handler(
+              array('PHPUnit_Util_ErrorHandler', 'handleError'),
+              E_ALL | E_STRICT
+            );
+
+            if ($oldErrorHandler === null) {
+                $errorHandlerSet = true;
+            } else {
+                restore_error_handler();
+            }
+        }
+
+        $collectCodeCoverage = $this->codeCoverage !== null &&
+                               !$test instanceof PHPUnit_Extensions_SeleniumTestCase &&
+                               !$test instanceof PHPUnit_Framework_Warning;
+
+        if ($collectCodeCoverage) {
+            // We need to blacklist test source files when no whitelist is used.
+            if (!$this->codeCoverage->filter()->hasWhitelist()) {
+                $classes = $this->getHierarchy(get_class($test), true);
+
+                foreach ($classes as $class) {
+                    $this->codeCoverage->filter()->addFileToBlacklist(
+                      $class->getFileName()
+                    );
+                }
+            }
+
+            $this->codeCoverage->start($test);
+        }
+
+        PHP_Timer::start();
+
+        try {
+            if (!$test instanceof PHPUnit_Framework_Warning &&
+                $this->beStrictAboutTestSize &&
+                extension_loaded('pcntl') && class_exists('PHP_Invoker')) {
+                switch ($test->getSize()) {
+                    case PHPUnit_Util_Test::SMALL: {
+                        $_timeout = $this->timeoutForSmallTests;
+                    }
+                    break;
+
+                    case PHPUnit_Util_Test::MEDIUM: {
+                        $_timeout = $this->timeoutForMediumTests;
+                    }
+                    break;
+
+                    case PHPUnit_Util_Test::LARGE: {
+                        $_timeout = $this->timeoutForLargeTests;
+                    }
+                    break;
+                }
+
+                $invoker = new PHP_Invoker;
+                $invoker->invoke(array($test, 'runBare'), array(), $_timeout);
+            } else {
+                $test->runBare();
+            }
+        } catch (PHPUnit_Framework_AssertionFailedError $e) {
+            $failure = true;
+
+            if ($e instanceof PHPUnit_Framework_RiskyTestError) {
+                $risky = true;
+            } elseif ($e instanceof PHPUnit_Framework_IncompleteTestError) {
+                $incomplete = true;
+            } elseif ($e instanceof PHPUnit_Framework_SkippedTestError) {
+                $skipped = true;
+            }
+        } catch (Exception $e) {
+            $error = true;
+        }
+
+        $time = PHP_Timer::stop();
+        $test->addToAssertionCount(PHPUnit_Framework_Assert::getCount());
+
+        if ($this->beStrictAboutTestsThatDoNotTestAnything &&
+            $test->getNumAssertions() == 0) {
+            $risky = true;
+        }
+
+        if ($collectCodeCoverage) {
+            $append           = !$risky && !$incomplete && !$skipped;
+            $linesToBeCovered = array();
+            $linesToBeUsed    = array();
+
+            if ($append && $test instanceof PHPUnit_Framework_TestCase) {
+                $linesToBeCovered = PHPUnit_Util_Test::getLinesToBeCovered(
+                  get_class($test), $test->getName(false)
+                );
+
+                $linesToBeUsed = PHPUnit_Util_Test::getLinesToBeUsed(
+                  get_class($test), $test->getName(false)
+                );
+            }
+
+            try {
+                $this->codeCoverage->stop(
+                  $append, $linesToBeCovered, $linesToBeUsed
+                );
+            } catch (PHP_CodeCoverage_Exception_UnintentionallyCoveredCode $cce) {
+                $this->addFailure(
+                  $test,
+                  new PHPUnit_Framework_UnintentionallyCoveredCodeError(
+                    'This test executed code that is not listed as code to be covered or used:' .
+                    PHP_EOL . $cce->getMessage()
+                  ),
+                  $time
+                );
+            } catch (PHPUnit_Framework_InvalidCoversTargetException $cce) {
+                $this->addFailure(
+                  $test,
+                  new PHPUnit_Framework_InvalidCoversTargetError(
+                    $cce->getMessage()
+                  ),
+                  $time
+                );
+            } catch (PHP_CodeCoverage_Exception $cce) {
+                $error = true;
+
+                if (!isset($e)) {
+                    $e = $cce;
+                }
+            }
+        }
+
+        if ($errorHandlerSet === true) {
+            restore_error_handler();
+        }
+
+        if ($error === true) {
+            $this->addError($test, $e, $time);
+        } elseif ($failure === true) {
+            $this->addFailure($test, $e, $time);
+        } elseif ($this->beStrictAboutTestsThatDoNotTestAnything &&
+                 $test->getNumAssertions() == 0) {
+            $this->addFailure(
+              $test,
+              new PHPUnit_Framework_RiskyTestError(
+                'This test did not perform any assertions'
+              ),
+              $time
+            );
+        } elseif ($this->beStrictAboutOutputDuringTests && $test->hasOutput()) {
+            $this->addFailure(
+              $test,
+              new PHPUnit_Framework_OutputError(
+                sprintf(
+                  'This test printed output: %s',
+                  $test->getActualOutput()
+                )
+              ),
+              $time
+            );
+        }
+
+        $this->endTest($test, $time);
+    }
+
+    /**
+     * Gets the number of run tests.
+     *
+     * @return integer
+     */
+    public function count()
+    {
+        return $this->runTests;
+    }
+
+    /**
+     * Checks whether the test run should stop.
+     *
+     * @return boolean
+     */
+    public function shouldStop()
+    {
+        return $this->stop;
+    }
+
+    /**
+     * Marks that the test run should stop.
+     *
+     */
+    public function stop()
+    {
+        $this->stop = true;
+    }
+
+    /**
+     * Returns the PHP_CodeCoverage object.
+     *
+     * @return PHP_CodeCoverage
+     * @since  Method available since Release 3.5.0
+     */
+    public function getCodeCoverage()
+    {
+        return $this->codeCoverage;
+    }
+
+    /**
+     * Sets the PHP_CodeCoverage object.
+     *
+     * @param PHP_CodeCoverage $codeCoverage
+     * @since Method available since Release 3.6.0
+     */
+    public function setCodeCoverage(PHP_CodeCoverage $codeCoverage)
+    {
+        $this->codeCoverage = $codeCoverage;
+    }
+
+    /**
+     * Enables or disables the error-to-exception conversion.
+     *
+     * @param  boolean                     $flag
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.2.14
+     */
+    public function convertErrorsToExceptions($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+
+        $this->convertErrorsToExceptions = $flag;
+    }
+
+    /**
+     * Returns the error-to-exception conversion setting.
+     *
+     * @return boolean
+     * @since  Method available since Release 3.4.0
+     */
+    public function getConvertErrorsToExceptions()
+    {
+        return $this->convertErrorsToExceptions;
+    }
+
+    /**
+     * Enables or disables the stopping when an error occurs.
+     *
+     * @param  boolean                     $flag
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.5.0
+     */
+    public function stopOnError($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+
+        $this->stopOnError = $flag;
+    }
+
+    /**
+     * Enables or disables the stopping when a failure occurs.
+     *
+     * @param  boolean                     $flag
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.1.0
+     */
+    public function stopOnFailure($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+
+        $this->stopOnFailure = $flag;
+    }
+
+    /**
+     * @param  boolean                     $flag
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 4.0.0
+     */
+    public function beStrictAboutTestsThatDoNotTestAnything($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+
+        $this->beStrictAboutTestsThatDoNotTestAnything = $flag;
+    }
+
+    /**
+     * @return boolean
+     * @since  Method available since Release 4.0.0
+     */
+    public function isStrictAboutTestsThatDoNotTestAnything()
+    {
+        return $this->beStrictAboutTestsThatDoNotTestAnything;
+    }
+
+    /**
+     * @param  boolean                     $flag
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 4.0.0
+     */
+    public function beStrictAboutOutputDuringTests($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+
+        $this->beStrictAboutOutputDuringTests = $flag;
+    }
+
+    /**
+     * @return boolean
+     * @since  Method available since Release 4.0.0
+     */
+    public function isStrictAboutOutputDuringTests()
+    {
+        return $this->beStrictAboutOutputDuringTests;
+    }
+
+    /**
+     * @param  boolean                     $flag
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 4.0.0
+     */
+    public function beStrictAboutTestSize($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+
+        $this->beStrictAboutTestSize = $flag;
+    }
+
+    /**
+     * @return boolean
+     * @since  Method available since Release 4.0.0
+     */
+    public function isStrictAboutTestSize()
+    {
+        return $this->beStrictAboutTestSize;
+    }
+
+    /**
+     * Enables or disables the stopping for risky tests.
+     *
+     * @param  boolean                     $flag
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 4.0.0
+     */
+    public function stopOnRisky($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+
+        $this->stopOnRisky = $flag;
+    }
+
+    /**
+     * Enables or disables the stopping for incomplete tests.
+     *
+     * @param  boolean                     $flag
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.5.0
+     */
+    public function stopOnIncomplete($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+
+        $this->stopOnIncomplete = $flag;
+    }
+
+    /**
+     * Enables or disables the stopping for skipped tests.
+     *
+     * @param  boolean                     $flag
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.1.0
+     */
+    public function stopOnSkipped($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+
+        $this->stopOnSkipped = $flag;
+    }
+
+    /**
+     * Returns the time spent running the tests.
+     *
+     * @return float
+     */
+    public function time()
+    {
+        return $this->time;
+    }
+
+    /**
+     * Returns whether the entire test was successful or not.
+     *
+     * @return boolean
+     */
+    public function wasSuccessful()
+    {
+        return empty($this->errors) && empty($this->failures);
+    }
+
+    /**
+     * Sets the timeout for small tests.
+     *
+     * @param  integer                     $timeout
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.6.0
+     */
+    public function setTimeoutForSmallTests($timeout)
+    {
+        if (!is_integer($timeout)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'integer');
+        }
+
+        $this->timeoutForSmallTests = $timeout;
+    }
+
+    /**
+     * Sets the timeout for medium tests.
+     *
+     * @param  integer                     $timeout
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.6.0
+     */
+    public function setTimeoutForMediumTests($timeout)
+    {
+        if (!is_integer($timeout)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'integer');
+        }
+
+        $this->timeoutForMediumTests = $timeout;
+    }
+
+    /**
+     * Sets the timeout for large tests.
+     *
+     * @param  integer                     $timeout
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.6.0
+     */
+    public function setTimeoutForLargeTests($timeout)
+    {
+        if (!is_integer($timeout)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'integer');
+        }
+
+        $this->timeoutForLargeTests = $timeout;
+    }
+
+    /**
+     * Returns the class hierarchy for a given class.
+     *
+     * @param  string  $className
+     * @param  boolean $asReflectionObjects
+     * @return array
+     */
+    protected function getHierarchy($className, $asReflectionObjects = false)
+    {
+        if ($asReflectionObjects) {
+            $classes = array(new ReflectionClass($className));
+        } else {
+            $classes = array($className);
+        }
+
+        $done = false;
+
+        while (!$done) {
+            if ($asReflectionObjects) {
+                $class = new ReflectionClass(
+                  $classes[count($classes)-1]->getName()
+                );
+            } else {
+                $class = new ReflectionClass($classes[count($classes)-1]);
+            }
+
+            $parent = $class->getParentClass();
+
+            if ($parent !== false) {
+                if ($asReflectionObjects) {
+                    $classes[] = $parent;
+                } else {
+                    $classes[] = $parent->getName();
+                }
+            } else {
+                $done = true;
+            }
+        }
+
+        return $classes;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/TestSuite.php b/vendor/phpunit/phpunit/src/Framework/TestSuite.php
new file mode 100644
index 00000000..fa38ed61
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/TestSuite.php
@@ -0,0 +1,935 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * A TestSuite is a composite of Tests. It runs a collection of test cases.
+ *
+ * Here is an example using the dynamic test definition.
+ *
+ * <code>
+ * <?php
+ * $suite = new PHPUnit_Framework_TestSuite;
+ * $suite->addTest(new MathTest('testPass'));
+ * ?>
+ * </code>
+ *
+ * Alternatively, a TestSuite can extract the tests to be run automatically.
+ * To do so you pass a ReflectionClass instance for your
+ * PHPUnit_Framework_TestCase class to the PHPUnit_Framework_TestSuite
+ * constructor.
+ *
+ * <code>
+ * <?php
+ * $suite = new PHPUnit_Framework_TestSuite(
+ *   new ReflectionClass('MathTest')
+ * );
+ * ?>
+ * </code>
+ *
+ * This constructor creates a suite with all the methods starting with
+ * "test" that take no arguments.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class PHPUnit_Framework_TestSuite implements PHPUnit_Framework_Test, PHPUnit_Framework_SelfDescribing, IteratorAggregate
+{
+    /**
+     * Enable or disable the backup and restoration of the $GLOBALS array.
+     *
+     * @var boolean
+     */
+    protected $backupGlobals = null;
+
+    /**
+     * Enable or disable the backup and restoration of static attributes.
+     *
+     * @var boolean
+     */
+    protected $backupStaticAttributes = null;
+
+    /**
+     * @var boolean
+     */
+    protected $runTestInSeparateProcess = false;
+
+    /**
+     * The name of the test suite.
+     *
+     * @var string
+     */
+    protected $name = '';
+
+    /**
+     * The test groups of the test suite.
+     *
+     * @var array
+     */
+    protected $groups = array();
+
+    /**
+     * The tests in the test suite.
+     *
+     * @var array
+     */
+    protected $tests = array();
+
+    /**
+     * The number of tests in the test suite.
+     *
+     * @var integer
+     */
+    protected $numTests = -1;
+
+    /**
+     * @var boolean
+     */
+    protected $testCase = false;
+
+    /**
+     * @var array
+     */
+    protected $foundClasses = array();
+
+    /**
+     * @var PHPUnit_Runner_Filter_Factory
+     */
+    private $iteratorFilter = null;
+
+    /**
+     * Constructs a new TestSuite:
+     *
+     *   - PHPUnit_Framework_TestSuite() constructs an empty TestSuite.
+     *
+     *   - PHPUnit_Framework_TestSuite(ReflectionClass) constructs a
+     *     TestSuite from the given class.
+     *
+     *   - PHPUnit_Framework_TestSuite(ReflectionClass, String)
+     *     constructs a TestSuite from the given class with the given
+     *     name.
+     *
+     *   - PHPUnit_Framework_TestSuite(String) either constructs a
+     *     TestSuite from the given class (if the passed string is the
+     *     name of an existing class) or constructs an empty TestSuite
+     *     with the given name.
+     *
+     * @param  mixed                       $theClass
+     * @param  string                      $name
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function __construct($theClass = '', $name = '')
+    {
+        $argumentsValid = false;
+
+        if (is_object($theClass) &&
+            $theClass instanceof ReflectionClass) {
+            $argumentsValid = true;
+        } elseif (is_string($theClass) &&
+                 $theClass !== '' &&
+                 class_exists($theClass, false)) {
+            $argumentsValid = true;
+
+            if ($name == '') {
+                $name = $theClass;
+            }
+
+            $theClass = new ReflectionClass($theClass);
+        } elseif (is_string($theClass)) {
+            $this->setName($theClass);
+
+            return;
+        }
+
+        if (!$argumentsValid) {
+            throw new PHPUnit_Framework_Exception;
+        }
+
+        if (!$theClass->isSubclassOf('PHPUnit_Framework_TestCase')) {
+            throw new PHPUnit_Framework_Exception(
+              'Class "' . $theClass->name . '" does not extend PHPUnit_Framework_TestCase.'
+            );
+        }
+
+        if ($name != '') {
+            $this->setName($name);
+        } else {
+            $this->setName($theClass->getName());
+        }
+
+        $constructor = $theClass->getConstructor();
+
+        if ($constructor !== null &&
+            !$constructor->isPublic()) {
+            $this->addTest(
+              self::warning(
+                sprintf(
+                  'Class "%s" has no public constructor.',
+
+                  $theClass->getName()
+                )
+              )
+            );
+
+            return;
+        }
+
+        foreach ($theClass->getMethods() as $method) {
+            $this->addTestMethod($theClass, $method);
+        }
+
+        if (empty($this->tests)) {
+            $this->addTest(
+              self::warning(
+                sprintf(
+                  'No tests found in class "%s".',
+
+                  $theClass->getName()
+                )
+              )
+            );
+        }
+
+        $this->testCase = true;
+    }
+
+    /**
+     * Returns a string representation of the test suite.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return $this->getName();
+    }
+
+    /**
+     * Adds a test to the suite.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param array                  $groups
+     */
+    public function addTest(PHPUnit_Framework_Test $test, $groups = array())
+    {
+        $class = new ReflectionClass($test);
+
+        if (!$class->isAbstract()) {
+            $this->tests[]  = $test;
+            $this->numTests = -1;
+
+            if ($test instanceof PHPUnit_Framework_TestSuite &&
+                empty($groups)) {
+                $groups = $test->getGroups();
+            }
+
+            if (empty($groups)) {
+                $groups = array('__nogroup__');
+            }
+
+            foreach ($groups as $group) {
+                if (!isset($this->groups[$group])) {
+                    $this->groups[$group] = array($test);
+                } else {
+                    $this->groups[$group][] = $test;
+                }
+            }
+        }
+    }
+
+    /**
+     * Adds the tests from the given class to the suite.
+     *
+     * @param  mixed                       $testClass
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function addTestSuite($testClass)
+    {
+        if (is_string($testClass) && class_exists($testClass)) {
+            $testClass = new ReflectionClass($testClass);
+        }
+
+        if (!is_object($testClass)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(
+              1, 'class name or object'
+            );
+        }
+
+        if ($testClass instanceof PHPUnit_Framework_TestSuite) {
+            $this->addTest($testClass);
+        } elseif ($testClass instanceof ReflectionClass) {
+            $suiteMethod = false;
+
+            if (!$testClass->isAbstract()) {
+                if ($testClass->hasMethod(PHPUnit_Runner_BaseTestRunner::SUITE_METHODNAME)) {
+                    $method = $testClass->getMethod(
+                      PHPUnit_Runner_BaseTestRunner::SUITE_METHODNAME
+                    );
+
+                    if ($method->isStatic()) {
+                        $this->addTest(
+                          $method->invoke(null, $testClass->getName())
+                        );
+
+                        $suiteMethod = true;
+                    }
+                }
+            }
+
+            if (!$suiteMethod && !$testClass->isAbstract()) {
+                $this->addTest(new PHPUnit_Framework_TestSuite($testClass));
+            }
+        } else {
+            throw new PHPUnit_Framework_Exception;
+        }
+    }
+
+    /**
+     * Wraps both <code>addTest()</code> and <code>addTestSuite</code>
+     * as well as the separate import statements for the user's convenience.
+     *
+     * If the named file cannot be read or there are no new tests that can be
+     * added, a <code>PHPUnit_Framework_Warning</code> will be created instead,
+     * leaving the current test run untouched.
+     *
+     * @param  string                      $filename
+     * @param  array                       $phptOptions Array with ini settings for the php instance
+     *                                                  run, key being the name if the setting,
+     *                                                  value the ini value.
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 2.3.0
+     * @author Stefano F. Rausch <stefano@rausch-e.net>
+     */
+    public function addTestFile($filename, $phptOptions = array())
+    {
+        if (!is_string($filename)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (file_exists($filename) && substr($filename, -5) == '.phpt') {
+            $this->addTest(
+              new PHPUnit_Extensions_PhptTestCase($filename, $phptOptions)
+            );
+            return;
+        }
+
+        // The given file may contain further stub classes in addition to the
+        // test class itself. Figure out the actual test class.
+        $classes    = get_declared_classes();
+        $filename   = PHPUnit_Util_Fileloader::checkAndLoad($filename);
+        $newClasses = array_diff(get_declared_classes(), $classes);
+
+        // The diff is empty in case a parent class (with test methods) is added
+        // AFTER a child class that inherited from it. To account for that case,
+        // cumulate all discovered classes, so the parent class may be found in
+        // a later invocation.
+        if ($newClasses) {
+            // On the assumption that test classes are defined first in files,
+            // process discovered classes in approximate LIFO order, so as to
+            // avoid unnecessary reflection.
+            $this->foundClasses = array_merge($newClasses, $this->foundClasses);
+        }
+
+        // The test class's name must match the filename, either in full, or as
+        // a PEAR/PSR-0 prefixed shortname ('NameSpace_ShortName'), or as a
+        // PSR-1 local shortname ('NameSpace\ShortName'). The comparison must be
+        // anchored to prevent false-positive matches (e.g., 'OtherShortName').
+        $shortname = basename($filename, '.php');
+        $shortnameRegEx = '/(?:^|_|\\\\)' . preg_quote($shortname, '/') . '$/';
+
+        foreach ($this->foundClasses as $i => $className) {
+            if (preg_match($shortnameRegEx, $className)) {
+                $class = new ReflectionClass($className);
+
+                if ($class->getFileName() == $filename) {
+                    $newClasses = array($className);
+                    unset($this->foundClasses[$i]);
+                    break;
+                }
+            }
+        }
+
+        foreach ($newClasses as $className) {
+            $class = new ReflectionClass($className);
+
+            if (!$class->isAbstract()) {
+                if ($class->hasMethod(PHPUnit_Runner_BaseTestRunner::SUITE_METHODNAME)) {
+                    $method = $class->getMethod(
+                      PHPUnit_Runner_BaseTestRunner::SUITE_METHODNAME
+                    );
+
+                    if ($method->isStatic()) {
+                        $this->addTest($method->invoke(null, $className));
+                    }
+                } elseif ($class->implementsInterface('PHPUnit_Framework_Test')) {
+                    $this->addTestSuite($class);
+                }
+            }
+        }
+
+        $this->numTests = -1;
+    }
+
+    /**
+     * Wrapper for addTestFile() that adds multiple test files.
+     *
+     * @param  array|Iterator              $filenames
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 2.3.0
+     */
+    public function addTestFiles($filenames)
+    {
+        if (!(is_array($filenames) ||
+             (is_object($filenames) && $filenames instanceof Iterator))) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(
+              1, 'array or iterator'
+            );
+        }
+
+        foreach ($filenames as $filename) {
+            $this->addTestFile((string) $filename);
+        }
+    }
+
+    /**
+     * Counts the number of test cases that will be run by this test.
+     *
+     * @return integer
+     */
+    public function count()
+    {
+        $numTests = 0;
+
+        foreach ($this as $test) {
+            $numTests += count($test);
+        }
+
+        return $numTests;
+    }
+
+    /**
+     * @param  ReflectionClass             $theClass
+     * @param  string                      $name
+     * @return PHPUnit_Framework_Test
+     * @throws PHPUnit_Framework_Exception
+     */
+    public static function createTest(ReflectionClass $theClass, $name)
+    {
+        $className = $theClass->getName();
+
+        if (!$theClass->isInstantiable()) {
+            return self::warning(
+              sprintf('Cannot instantiate class "%s".', $className)
+            );
+        }
+
+        $backupSettings           = PHPUnit_Util_Test::getBackupSettings(
+                                      $className, $name
+                                    );
+        $preserveGlobalState      = PHPUnit_Util_Test::getPreserveGlobalStateSettings(
+                                      $className, $name
+                                    );
+        $runTestInSeparateProcess = PHPUnit_Util_Test::getProcessIsolationSettings(
+                                      $className, $name
+                                    );
+
+        $constructor = $theClass->getConstructor();
+
+        if ($constructor !== null) {
+            $parameters = $constructor->getParameters();
+
+            // TestCase() or TestCase($name)
+            if (count($parameters) < 2) {
+                $test = new $className;
+            }
+
+            // TestCase($name, $data)
+            else {
+                try {
+                    $data = PHPUnit_Util_Test::getProvidedData(
+                      $className, $name
+                    );
+                } catch (Exception $e) {
+                    $message = sprintf(
+                      'The data provider specified for %s::%s is invalid.',
+                      $className,
+                      $name
+                    );
+
+                    $_message = $e->getMessage();
+
+                    if (!empty($_message)) {
+                        $message .= "\n" . $_message;
+                    }
+
+                    $data = self::warning($message);
+                }
+
+                // Test method with @dataProvider.
+                if (isset($data)) {
+                    $test = new PHPUnit_Framework_TestSuite_DataProvider(
+                      $className . '::' . $name
+                    );
+
+                    if (empty($data)) {
+                        $data = self::warning(
+                          sprintf(
+                            'No tests found in suite "%s".',
+                            $test->getName()
+                          )
+                        );
+                    }
+
+                    $groups = PHPUnit_Util_Test::getGroups($className, $name);
+
+                    if ($data instanceof PHPUnit_Framework_Warning) {
+                        $test->addTest($data, $groups);
+                    } else {
+                        foreach ($data as $_dataName => $_data) {
+                            $_test = new $className($name, $_data, $_dataName);
+
+                            if ($runTestInSeparateProcess) {
+                                $_test->setRunTestInSeparateProcess(true);
+
+                                if ($preserveGlobalState !== null) {
+                                    $_test->setPreserveGlobalState($preserveGlobalState);
+                                }
+                            }
+
+                            if ($backupSettings['backupGlobals'] !== null) {
+                                $_test->setBackupGlobals(
+                                  $backupSettings['backupGlobals']
+                                );
+                            }
+
+                            if ($backupSettings['backupStaticAttributes'] !== null) {
+                                $_test->setBackupStaticAttributes(
+                                  $backupSettings['backupStaticAttributes']
+                                );
+                            }
+
+                            $test->addTest($_test, $groups);
+                        }
+                    }
+                } else {
+                    $test = new $className;
+                }
+            }
+        }
+
+        if (!isset($test)) {
+            throw new PHPUnit_Framework_Exception('No valid test provided.');
+        }
+
+        if ($test instanceof PHPUnit_Framework_TestCase) {
+            $test->setName($name);
+
+            if ($runTestInSeparateProcess) {
+                $test->setRunTestInSeparateProcess(true);
+
+                if ($preserveGlobalState !== null) {
+                    $test->setPreserveGlobalState($preserveGlobalState);
+                }
+            }
+
+            if ($backupSettings['backupGlobals'] !== null) {
+                $test->setBackupGlobals($backupSettings['backupGlobals']);
+            }
+
+            if ($backupSettings['backupStaticAttributes'] !== null) {
+                $test->setBackupStaticAttributes(
+                  $backupSettings['backupStaticAttributes']
+                );
+            }
+        }
+
+        return $test;
+    }
+
+    /**
+     * Creates a default TestResult object.
+     *
+     * @return PHPUnit_Framework_TestResult
+     */
+    protected function createResult()
+    {
+        return new PHPUnit_Framework_TestResult;
+    }
+
+    /**
+     * Returns the name of the suite.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Returns the test groups of the suite.
+     *
+     * @return array
+     * @since  Method available since Release 3.2.0
+     */
+    public function getGroups()
+    {
+        return array_keys($this->groups);
+    }
+
+    public function getGroupDetails()
+    {
+        return $this->groups;
+    }
+
+    /**
+     * Set tests groups of the test case
+     *
+     * @param array $groups
+     * @since Method available since Release 4.0.0
+     */
+    public function setGroupDetails(array $groups)
+    {
+        $this->groups = $groups;
+    }
+
+    /**
+     * Runs the tests and collects their result in a TestResult.
+     *
+     * @param PHPUnit_Framework_TestResult $result
+     * @return PHPUnit_Framework_TestResult
+     */
+    public function run(PHPUnit_Framework_TestResult $result = null)
+    {
+        if ($result === null) {
+            $result = $this->createResult();
+        }
+
+        if (count($this) == 0) {
+            return $result;
+        }
+
+        $hookMethods = PHPUnit_Util_Test::getHookMethods($this->name);
+
+        $result->startTestSuite($this);
+
+        try {
+            $this->setUp();
+
+            foreach ($hookMethods['beforeClass'] as $beforeClassMethod) {
+                if ($this->testCase === true && class_exists($this->name, false) && method_exists($this->name, $beforeClassMethod)) {
+                    call_user_func(array($this->name, $beforeClassMethod));
+                }
+            }
+        } catch (PHPUnit_Framework_SkippedTestSuiteError $e) {
+            $numTests = count($this);
+
+            for ($i = 0; $i < $numTests; $i++) {
+                $result->addFailure($this, $e, 0);
+            }
+
+            return $result;
+        } catch (Exception $e) {
+            $numTests = count($this);
+
+            for ($i = 0; $i < $numTests; $i++) {
+                $result->addError($this, $e, 0);
+            }
+
+            return $result;
+        }
+
+        foreach ($this as $test) {
+            if ($result->shouldStop()) {
+                break;
+            }
+
+            if ($test instanceof PHPUnit_Framework_TestCase ||
+                $test instanceof PHPUnit_Framework_TestSuite) {
+                $test->setBackupGlobals($this->backupGlobals);
+                $test->setBackupStaticAttributes($this->backupStaticAttributes);
+                $test->setRunTestInSeparateProcess($this->runTestInSeparateProcess);
+            }
+
+            $test->run($result);
+        }
+
+        foreach ($hookMethods['afterClass'] as $afterClassMethod) {
+            if ($this->testCase === true && class_exists($this->name, false) && method_exists($this->name, $afterClassMethod)) {
+                call_user_func(array($this->name, $afterClassMethod));
+            }
+        }
+
+        $this->tearDown();
+
+        $result->endTestSuite($this);
+
+        return $result;
+    }
+
+    /**
+     * @param  boolean                     $runTestInSeparateProcess
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.7.0
+     */
+    public function setRunTestInSeparateProcess($runTestInSeparateProcess)
+    {
+        if (is_bool($runTestInSeparateProcess)) {
+            $this->runTestInSeparateProcess = $runTestInSeparateProcess;
+        } else {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+    }
+
+    /**
+     * Runs a test.
+     *
+     * @deprecated
+     * @param PHPUnit_Framework_Test       $test
+     * @param PHPUnit_Framework_TestResult $result
+     */
+    public function runTest(PHPUnit_Framework_Test $test, PHPUnit_Framework_TestResult $result)
+    {
+        $test->run($result);
+    }
+
+    /**
+     * Sets the name of the suite.
+     *
+     * @param  string
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * Returns the test at the given index.
+     *
+     * @param  integer
+     * @return PHPUnit_Framework_Test
+     */
+    public function testAt($index)
+    {
+        if (isset($this->tests[$index])) {
+            return $this->tests[$index];
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Returns the tests as an enumeration.
+     *
+     * @return array
+     */
+    public function tests()
+    {
+        return $this->tests;
+    }
+
+    /**
+     * Set tests of the test suite
+     *
+     * @param array $tests
+     * @since Method available since Release 4.0.0
+     */
+    public function setTests(array $tests)
+    {
+        $this->tests = $tests;
+    }
+
+    /**
+     * Mark the test suite as skipped.
+     *
+     * @param  string                                  $message
+     * @throws PHPUnit_Framework_SkippedTestSuiteError
+     * @since  Method available since Release 3.0.0
+     */
+    public function markTestSuiteSkipped($message = '')
+    {
+        throw new PHPUnit_Framework_SkippedTestSuiteError($message);
+    }
+
+    /**
+     * @param ReflectionClass  $class
+     * @param ReflectionMethod $method
+     */
+    protected function addTestMethod(ReflectionClass $class, ReflectionMethod $method)
+    {
+        if (!$this->isTestMethod($method))
+            return;
+
+        $name = $method->getName();
+
+        if (!$method->isPublic()) {
+            $this->addTest(
+                self::warning(
+                    sprintf(
+                        'Test method "%s" in test class "%s" is not public.',
+                        $name,
+                        $class->getName()
+                        )
+                    )
+                );
+
+            return;
+        }
+
+        $test = self::createTest($class, $name);
+
+        if ($test instanceof PHPUnit_Framework_TestCase ||
+            $test instanceof PHPUnit_Framework_TestSuite_DataProvider) {
+            $test->setDependencies(
+                PHPUnit_Util_Test::getDependencies($class->getName(), $name)
+            );
+        }
+
+        $this->addTest(
+            $test,
+            PHPUnit_Util_Test::getGroups($class->getName(), $name)
+        );
+    }
+
+    /**
+     * @param  ReflectionMethod $method
+     * @return boolean
+     */
+    public static function isTestMethod(ReflectionMethod $method)
+    {
+        if (strpos($method->name, 'test') === 0) {
+            return true;
+        }
+
+        // @scenario on TestCase::testMethod()
+        // @test     on TestCase::testMethod()
+        $doc_comment = $method->getDocComment();
+
+        return strpos($doc_comment, '@test')     !== false ||
+               strpos($doc_comment, '@scenario') !== false;
+    }
+
+    /**
+     * @param  string                    $message
+     * @return PHPUnit_Framework_Warning
+     */
+    protected static function warning($message)
+    {
+        return new PHPUnit_Framework_Warning($message);
+    }
+
+    /**
+     * @param boolean $backupGlobals
+     * @since  Method available since Release 3.3.0
+     */
+    public function setBackupGlobals($backupGlobals)
+    {
+        if (is_null($this->backupGlobals) && is_bool($backupGlobals)) {
+            $this->backupGlobals = $backupGlobals;
+        }
+    }
+
+    /**
+     * @param boolean $backupStaticAttributes
+     * @since  Method available since Release 3.4.0
+     */
+    public function setBackupStaticAttributes($backupStaticAttributes)
+    {
+        if (is_null($this->backupStaticAttributes) &&
+            is_bool($backupStaticAttributes)) {
+            $this->backupStaticAttributes = $backupStaticAttributes;
+        }
+    }
+
+    /**
+     * Returns an iterator for this test suite.
+     *
+     * @return RecursiveIteratorIterator
+     * @since  Method available since Release 3.1.0
+     */
+    public function getIterator()
+    {
+        $iterator = new PHPUnit_Util_TestSuiteIterator($this);
+
+        if ($this->iteratorFilter !== null) {
+            $iterator = $this->iteratorFilter->factory($iterator, $this);
+        }
+
+        return $iterator;
+    }
+
+    public function injectFilter(PHPUnit_Runner_Filter_Factory $filter)
+    {
+        $this->iteratorFilter = $filter;
+        foreach ($this as $test) {
+            if ($test instanceof PHPUnit_Framework_TestSuite) {
+                $test->injectFilter($filter);
+            }
+        }
+    }
+
+    /**
+     * Template Method that is called before the tests
+     * of this test suite are run.
+     *
+     * @since  Method available since Release 3.1.0
+     */
+    protected function setUp()
+    {
+    }
+
+    /**
+     * Template Method that is called after the tests
+     * of this test suite have finished running.
+     *
+     * @since  Method available since Release 3.1.0
+     */
+    protected function tearDown()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php b/vendor/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php
new file mode 100644
index 00000000..a8e28a94
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_TestSuite
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.4.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @subpackage Framework_TestSuite
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.4.0
+ */
+class PHPUnit_Framework_TestSuite_DataProvider extends PHPUnit_Framework_TestSuite
+{
+    /**
+     * Sets the dependencies of a TestCase.
+     *
+     * @param array $dependencies
+     */
+    public function setDependencies(array $dependencies)
+    {
+        foreach ($this->tests as $test) {
+            $test->setDependencies($dependencies);
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php b/vendor/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php
new file mode 100644
index 00000000..6e0954d5
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
+ * case of a test test that unintentionally covers code.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Framework_UnintentionallyCoveredCodeError extends PHPUnit_Framework_RiskyTestError
+{
+}
diff --git a/vendor/phpunit/phpunit/src/Framework/Warning.php b/vendor/phpunit/phpunit/src/Framework/Warning.php
new file mode 100644
index 00000000..0fcb9316
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Framework/Warning.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * A warning.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class PHPUnit_Framework_Warning extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var string
+     */
+    protected $message = '';
+
+    /**
+     * @var boolean
+     */
+    protected $backupGlobals = false;
+
+    /**
+     * @var boolean
+     */
+    protected $backupStaticAttributes = false;
+
+    /**
+     * @var boolean
+     */
+    protected $runTestInSeparateProcess = false;
+
+    /**
+     * @var boolean
+     */
+    protected $useErrorHandler = false;
+
+    /**
+     * @param string $message
+     */
+    public function __construct($message = '')
+    {
+        $this->message = $message;
+        parent::__construct('Warning');
+    }
+
+    /**
+     * @throws PHPUnit_Framework_Exception
+     */
+    protected function runTest()
+    {
+        $this->fail($this->message);
+    }
+
+    /**
+     * @return string
+     * @since  Method available since Release 3.0.0
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * Returns a string representation of the test case.
+     *
+     * @return string
+     * @since  Method available since Release 3.4.0
+     */
+    public function toString()
+    {
+        return 'Warning';
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php b/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php
new file mode 100644
index 00000000..d92b200f
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * Base class for all test runners.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+abstract class PHPUnit_Runner_BaseTestRunner
+{
+    const STATUS_PASSED     = 0;
+    const STATUS_SKIPPED    = 1;
+    const STATUS_INCOMPLETE = 2;
+    const STATUS_FAILURE    = 3;
+    const STATUS_ERROR      = 4;
+    const STATUS_RISKY      = 5;
+    const SUITE_METHODNAME  = 'suite';
+
+    /**
+     * Returns the loader to be used.
+     *
+     * @return PHPUnit_Runner_TestSuiteLoader
+     */
+    public function getLoader()
+    {
+        return new PHPUnit_Runner_StandardTestSuiteLoader;
+    }
+
+    /**
+     * Returns the Test corresponding to the given suite.
+     * This is a template method, subclasses override
+     * the runFailed() and clearStatus() methods.
+     *
+     * @param  string                 $suiteClassName
+     * @param  string                 $suiteClassFile
+     * @param  mixed                  $suffixes
+     * @return PHPUnit_Framework_Test
+     */
+    public function getTest($suiteClassName, $suiteClassFile = '', $suffixes = '')
+    {
+        if (is_dir($suiteClassName) &&
+            !is_file($suiteClassName . '.php') && empty($suiteClassFile)) {
+            $facade = new File_Iterator_Facade;
+            $files  = $facade->getFilesAsArray(
+              $suiteClassName, $suffixes
+            );
+
+            $suite = new PHPUnit_Framework_TestSuite($suiteClassName);
+            $suite->addTestFiles($files);
+
+            return $suite;
+        }
+
+        try {
+            $testClass = $this->loadSuiteClass(
+              $suiteClassName, $suiteClassFile
+            );
+        } catch (PHPUnit_Framework_Exception $e) {
+            $this->runFailed($e->getMessage());
+
+            return null;
+        }
+
+        try {
+            $suiteMethod = $testClass->getMethod(self::SUITE_METHODNAME);
+
+            if (!$suiteMethod->isStatic()) {
+                $this->runFailed(
+                  'suite() method must be static.'
+                );
+
+                return null;
+            }
+
+            try {
+                $test = $suiteMethod->invoke(null, $testClass->getName());
+            } catch (ReflectionException $e) {
+                $this->runFailed(
+                  sprintf(
+                    "Failed to invoke suite() method.\n%s",
+
+                    $e->getMessage()
+                  )
+                );
+
+                return null;
+            }
+        } catch (ReflectionException $e) {
+            try {
+                $test = new PHPUnit_Framework_TestSuite($testClass);
+            } catch (PHPUnit_Framework_Exception $e) {
+                $test = new PHPUnit_Framework_TestSuite;
+                $test->setName($suiteClassName);
+            }
+        }
+
+        $this->clearStatus();
+
+        return $test;
+    }
+
+    /**
+     * Returns the loaded ReflectionClass for a suite name.
+     *
+     * @param  string          $suiteClassName
+     * @param  string          $suiteClassFile
+     * @return ReflectionClass
+     */
+    protected function loadSuiteClass($suiteClassName, $suiteClassFile = '')
+    {
+        $loader = $this->getLoader();
+
+        if ($loader instanceof PHPUnit_Runner_StandardTestSuiteLoader) {
+            return $loader->load($suiteClassName, $suiteClassFile);
+        } else {
+            return $loader->load($suiteClassName, $suiteClassFile);
+        }
+    }
+
+    /**
+     * Clears the status message.
+     *
+     */
+    protected function clearStatus()
+    {
+    }
+
+    /**
+     * Override to define how to handle a failed loading of
+     * a test suite.
+     *
+     * @param string $message
+     */
+    abstract protected function runFailed($message);
+}
diff --git a/vendor/phpunit/phpunit/src/Runner/Exception.php b/vendor/phpunit/phpunit/src/Runner/Exception.php
new file mode 100644
index 00000000..bce04aec
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Runner/Exception.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Runner_Exception extends RuntimeException implements PHPUnit_Exception
+{
+}
diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php b/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php
new file mode 100644
index 00000000..0b2abf1f
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Runner_Filter_Factory
+{
+    /**
+     * @var array
+     */
+    private $filters = array();
+
+    /**
+     * @param ReflectionClass $filter
+     * @param mixed           $args
+     */
+    public function addFilter(ReflectionClass $filter, $args)
+    {
+        if (!$filter->isSubclassOf('RecursiveFilterIterator')) {
+            throw new InvalidArgumentException(
+              sprintf(
+                'Class "%s" does not extend RecursiveFilterIterator',
+                $filter->name
+              )
+            );
+        }
+
+        $this->filters[] = array($filter, $args);
+    }
+
+    /**
+     * @return FilterIterator
+     */
+    public function factory(Iterator $iterator, PHPUnit_Framework_TestSuite $suite)
+    {
+        foreach ($this->filters as $filter) {
+            list($class, $args) = $filter;
+            $iterator = $class->newInstance($iterator, $args, $suite);
+        }
+
+        return $iterator;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/Group.php b/vendor/phpunit/phpunit/src/Runner/Filter/Group.php
new file mode 100644
index 00000000..ee097ce7
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Runner/Filter/Group.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+abstract class PHPUnit_Runner_Filter_GroupFilterIterator extends RecursiveFilterIterator
+{
+    /**
+     * @var array
+     */
+    protected $groupTests = array();
+
+    /**
+     * @param RecursiveIterator           $iterator
+     * @param array                       $groups
+     * @param PHPUnit_Framework_TestSuite $suite
+     */
+    public function __construct(RecursiveIterator $iterator, array $groups, PHPUnit_Framework_TestSuite $suite)
+    {
+        parent::__construct($iterator);
+
+        foreach ($suite->getGroupDetails() as $group => $tests) {
+            if (in_array($group, $groups)) {
+                $testHashes = array_map(
+                  function ($test) { return spl_object_hash($test); },
+                  $tests
+                );
+
+                $this->groupTests = array_merge($this->groupTests, $testHashes);
+            }
+        }
+    }
+
+    /**
+     * @return boolean
+     */
+    public function accept()
+    {
+        $test = $this->getInnerIterator()->current();
+
+        if ($test instanceof PHPUnit_Framework_TestSuite) {
+            return true;
+        }
+
+        return $this->doAccept(spl_object_hash($test));
+    }
+
+    abstract protected function doAccept($hash);
+}
diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php b/vendor/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php
new file mode 100644
index 00000000..e2a22d06
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Runner_Filter_Group_Exclude extends PHPUnit_Runner_Filter_GroupFilterIterator
+{
+    protected function doAccept($hash)
+    {
+        return !in_array($hash, $this->groupTests);
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/Group/Include.php b/vendor/phpunit/phpunit/src/Runner/Filter/Group/Include.php
new file mode 100644
index 00000000..ce8cd826
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Runner/Filter/Group/Include.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Runner_Filter_Group_Include extends PHPUnit_Runner_Filter_GroupFilterIterator
+{
+    protected function doAccept($hash)
+    {
+        return in_array($hash, $this->groupTests);
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/Test.php b/vendor/phpunit/phpunit/src/Runner/Filter/Test.php
new file mode 100644
index 00000000..106b8a98
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Runner/Filter/Test.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Runner_Filter_Test extends RecursiveFilterIterator
+{
+    /**
+     * @var string
+     */
+    protected $filter = null;
+
+    /**
+     * @var integer
+     */
+    protected $filterMin;
+    /**
+     * @var integer
+     */
+    protected $filterMax;
+
+    /**
+     * @param RecursiveIterator $iterator
+     * @param string            $filter
+     */
+    public function __construct(RecursiveIterator $iterator, $filter)
+    {
+        parent::__construct($iterator);
+        $this->setFilter($filter);
+    }
+
+    /**
+     * @param string $filter
+     */
+    protected function setFilter($filter)
+    {
+        if ($filter[0] != substr($filter, -1) ||
+            preg_match('/^[a-zA-Z0-9_]/', $filter)) {
+
+            // Handles:
+            //  * testAssertEqualsSucceeds#4
+            //  * testAssertEqualsSucceeds#4-8
+            if (preg_match('/^(.*?)#(\d+)(?:-(\d+))?$/', $filter, $matches)) {
+                if (isset($matches[3]) && $matches[2] < $matches[3]) {
+                    $filter = sprintf(
+                      '%s.*with data set #(\d+)$',
+                      $matches[1]
+                    );
+
+                    $this->filterMin = $matches[2];
+                    $this->filterMax = $matches[3];
+                } else {
+                    $filter = sprintf(
+                      '%s.*with data set #%s$',
+                      $matches[1],
+                      $matches[2]
+                    );
+                }
+            }
+
+            // Handles:
+            //  * testDetermineJsonError@JSON_ERROR_NONE
+            //  * testDetermineJsonError@JSON.*
+            elseif (preg_match('/^(.*?)@(.+)$/', $filter, $matches)) {
+                $filter = sprintf(
+                  '%s.*with data set "%s"$',
+                  $matches[1],
+                  $matches[2]
+                );
+            }
+
+            // Escape delimiters in regular expression. Do NOT use preg_quote,
+            // to keep magic characters.
+            $filter = sprintf('/%s/', str_replace(
+              '/', '\\/', $filter
+            ));
+        }
+
+        $this->filter = $filter;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function accept()
+    {
+        $test = $this->getInnerIterator()->current();
+
+        if ($test instanceof PHPUnit_Framework_TestSuite) {
+            return true;
+        }
+
+        $tmp = PHPUnit_Util_Test::describe($test, false);
+
+        if ($tmp[0] != '') {
+            $name = join('::', $tmp);
+        } else {
+            $name = $tmp[1];
+        }
+
+        $accepted = preg_match($this->filter, $name, $matches);
+
+        if ($accepted && isset($this->filterMax)) {
+            $set = end($matches);
+            $accepted = $set >= $this->filterMin && $set <= $this->filterMax;
+        }
+
+        return $accepted;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php b/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php
new file mode 100644
index 00000000..9de65a8c
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * The standard test suite loader.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class PHPUnit_Runner_StandardTestSuiteLoader implements PHPUnit_Runner_TestSuiteLoader
+{
+    /**
+     * @param  string                      $suiteClassName
+     * @param  string                      $suiteClassFile
+     * @return ReflectionClass
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function load($suiteClassName, $suiteClassFile = '')
+    {
+        $suiteClassName = str_replace('.php', '', $suiteClassName);
+
+        if (empty($suiteClassFile)) {
+            $suiteClassFile = PHPUnit_Util_Filesystem::classNameToFilename(
+              $suiteClassName
+            );
+        }
+
+        if (!class_exists($suiteClassName, false)) {
+            $loadedClasses = get_declared_classes();
+
+            $filename = PHPUnit_Util_Fileloader::checkAndLoad($suiteClassFile);
+
+            $loadedClasses = array_values(
+              array_diff(get_declared_classes(), $loadedClasses)
+            );
+        }
+
+        if (!class_exists($suiteClassName, false) && !empty($loadedClasses)) {
+            $offset = 0 - strlen($suiteClassName);
+
+            foreach ($loadedClasses as $loadedClass) {
+                $class = new ReflectionClass($loadedClass);
+                if (substr($loadedClass, $offset) === $suiteClassName &&
+                    $class->getFileName() == $filename) {
+                    $suiteClassName = $loadedClass;
+                    break;
+                }
+            }
+        }
+
+        if (!class_exists($suiteClassName, false) && !empty($loadedClasses)) {
+            $testCaseClass = 'PHPUnit_Framework_TestCase';
+
+            foreach ($loadedClasses as $loadedClass) {
+                $class     = new ReflectionClass($loadedClass);
+                $classFile = $class->getFileName();
+
+                if ($class->isSubclassOf($testCaseClass) &&
+                    !$class->isAbstract()) {
+                    $suiteClassName = $loadedClass;
+                    $testCaseClass  = $loadedClass;
+
+                    if ($classFile == realpath($suiteClassFile)) {
+                        break;
+                    }
+                }
+
+                if ($class->hasMethod('suite')) {
+                    $method = $class->getMethod('suite');
+
+                    if (!$method->isAbstract() &&
+                        $method->isPublic() &&
+                        $method->isStatic()) {
+                        $suiteClassName = $loadedClass;
+
+                        if ($classFile == realpath($suiteClassFile)) {
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (class_exists($suiteClassName, false)) {
+            $class = new ReflectionClass($suiteClassName);
+
+            if ($class->getFileName() == realpath($suiteClassFile)) {
+                return $class;
+            }
+        }
+
+        throw new PHPUnit_Framework_Exception(
+          sprintf(
+            "Class '%s' could not be found in '%s'.",
+
+            $suiteClassName,
+            $suiteClassFile
+          )
+        );
+    }
+
+    /**
+     * @param  ReflectionClass $aClass
+     * @return ReflectionClass
+     */
+    public function reload(ReflectionClass $aClass)
+    {
+        return $aClass;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php b/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php
new file mode 100644
index 00000000..37001c6f
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * An interface to define how a test suite should be loaded.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Interface available since Release 2.0.0
+ */
+interface PHPUnit_Runner_TestSuiteLoader
+{
+    /**
+     * @param  string          $suiteClassName
+     * @param  string          $suiteClassFile
+     * @return ReflectionClass
+     */
+    public function load($suiteClassName, $suiteClassFile = '');
+
+    /**
+     * @param  ReflectionClass $aClass
+     * @return ReflectionClass
+     */
+    public function reload(ReflectionClass $aClass);
+}
diff --git a/vendor/phpunit/phpunit/src/Runner/Version.php b/vendor/phpunit/phpunit/src/Runner/Version.php
new file mode 100644
index 00000000..7a9c12ca
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Runner/Version.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * This class defines the current version of PHPUnit.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class PHPUnit_Runner_Version
+{
+    private static $pharVersion;
+    private static $version;
+
+    /**
+     * Returns the current version of PHPUnit.
+     *
+     * @return string
+     */
+    public static function id()
+    {
+        if (self::$pharVersion !== null) {
+            return self::$pharVersion;
+        }
+
+        if (self::$version === null) {
+            $version = new SebastianBergmann\Version('4.1.6', dirname(dirname(__DIR__)));
+            self::$version = $version->getVersion();
+        }
+
+        return self::$version;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getVersionString()
+    {
+        return 'PHPUnit ' . self::id() . ' by Sebastian Bergmann.';
+    }
+
+    /**
+     * @return string
+     * @since  Method available since Release 4.0.0
+     */
+    public static function getReleaseChannel()
+    {
+        if (strpos(self::$pharVersion, 'alpha') !== false) {
+            return '-alpha';
+        }
+
+        if (strpos(self::$pharVersion, 'beta') !== false) {
+            return '-beta';
+        }
+
+        return '';
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/TextUI/Command.php b/vendor/phpunit/phpunit/src/TextUI/Command.php
new file mode 100644
index 00000000..cd62882f
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/TextUI/Command.php
@@ -0,0 +1,977 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage TextUI
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * A TestRunner for the Command Line Interface (CLI)
+ * PHP SAPI Module.
+ *
+ * @package    PHPUnit
+ * @subpackage TextUI
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_TextUI_Command
+{
+    /**
+     * @var array
+     */
+    protected $arguments = array(
+      'listGroups'              => false,
+      'loader'                  => null,
+      'useDefaultConfiguration' => true
+    );
+
+    /**
+     * @var array
+     */
+    protected $options = array();
+
+    /**
+     * @var array
+     */
+    protected $longOptions = array(
+      'colors' => null,
+      'bootstrap=' => null,
+      'configuration=' => null,
+      'coverage-clover=' => null,
+      'coverage-crap4j=' => null,
+      'coverage-html=' => null,
+      'coverage-php=' => null,
+      'coverage-text==' => null,
+      'coverage-xml=' => null,
+      'debug' => null,
+      'exclude-group=' => null,
+      'filter=' => null,
+      'testsuite=' => null,
+      'group=' => null,
+      'help' => null,
+      'include-path=' => null,
+      'list-groups' => null,
+      'loader=' => null,
+      'log-json=' => null,
+      'log-junit=' => null,
+      'log-tap=' => null,
+      'process-isolation' => null,
+      'repeat=' => null,
+      'stderr' => null,
+      'stop-on-error' => null,
+      'stop-on-failure' => null,
+      'stop-on-incomplete' => null,
+      'stop-on-risky' => null,
+      'stop-on-skipped' => null,
+      'report-useless-tests' => null,
+      'strict-coverage' => null,
+      'disallow-test-output' => null,
+      'enforce-time-limit' => null,
+      'strict' => null,
+      'tap' => null,
+      'testdox' => null,
+      'testdox-html=' => null,
+      'testdox-text=' => null,
+      'test-suffix=' => null,
+      'no-configuration' => null,
+      'no-globals-backup' => null,
+      'printer=' => null,
+      'static-backup' => null,
+      'verbose' => null,
+      'version' => null
+    );
+
+    /**
+     * @param boolean $exit
+     */
+    public static function main($exit = true)
+    {
+        $command = new static;
+
+        return $command->run($_SERVER['argv'], $exit);
+    }
+
+    /**
+     * @param array   $argv
+     * @param boolean $exit
+     */
+    public function run(array $argv, $exit = true)
+    {
+        $this->handleArguments($argv);
+
+        $runner = $this->createRunner();
+
+        if (is_object($this->arguments['test']) &&
+            $this->arguments['test'] instanceof PHPUnit_Framework_Test) {
+            $suite = $this->arguments['test'];
+        } else {
+            $suite = $runner->getTest(
+              $this->arguments['test'],
+              $this->arguments['testFile'],
+              $this->arguments['testSuffixes']
+            );
+        }
+
+        if ($this->arguments['listGroups']) {
+            PHPUnit_TextUI_TestRunner::printVersionString();
+
+            print "Available test group(s):\n";
+
+            $groups = $suite->getGroups();
+            sort($groups);
+
+            foreach ($groups as $group) {
+                print " - $group\n";
+            }
+
+            if ($exit) {
+                exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT);
+            } else {
+                return PHPUnit_TextUI_TestRunner::SUCCESS_EXIT;
+            }
+        }
+
+        unset($this->arguments['test']);
+        unset($this->arguments['testFile']);
+
+        try {
+            $result = $runner->doRun($suite, $this->arguments);
+        } catch (PHPUnit_Framework_Exception $e) {
+            print $e->getMessage() . "\n";
+        }
+
+        $ret = PHPUnit_TextUI_TestRunner::FAILURE_EXIT;
+
+        if (isset($result) && $result->wasSuccessful()) {
+            $ret = PHPUnit_TextUI_TestRunner::SUCCESS_EXIT;
+        } elseif (!isset($result) || $result->errorCount() > 0) {
+            $ret = PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT;
+        }
+
+        if ($exit) {
+            exit($ret);
+        } else {
+            return $ret;
+        }
+    }
+
+    /**
+     * Create a TestRunner, override in subclasses.
+     *
+     * @return PHPUnit_TextUI_TestRunner
+     * @since  Method available since Release 3.6.0
+     */
+    protected function createRunner()
+    {
+        return new PHPUnit_TextUI_TestRunner($this->arguments['loader']);
+    }
+
+    /**
+     * Handles the command-line arguments.
+     *
+     * A child class of PHPUnit_TextUI_Command can hook into the argument
+     * parsing by adding the switch(es) to the $longOptions array and point to a
+     * callback method that handles the switch(es) in the child class like this
+     *
+     * <code>
+     * <?php
+     * class MyCommand extends PHPUnit_TextUI_Command
+     * {
+     *     public function __construct()
+     *     {
+     *         // my-switch won't accept a value, it's an on/off
+     *         $this->longOptions['my-switch'] = 'myHandler';
+     *         // my-secondswitch will accept a value - note the equals sign
+     *         $this->longOptions['my-secondswitch='] = 'myOtherHandler';
+     *     }
+     *
+     *     // --my-switch  -> myHandler()
+     *     protected function myHandler()
+     *     {
+     *     }
+     *
+     *     // --my-secondswitch foo -> myOtherHandler('foo')
+     *     protected function myOtherHandler ($value)
+     *     {
+     *     }
+     *
+     *     // You will also need this - the static keyword in the
+     *     // PHPUnit_TextUI_Command will mean that it'll be
+     *     // PHPUnit_TextUI_Command that gets instantiated,
+     *     // not MyCommand
+     *     public static function main($exit = true)
+     *     {
+     *         $command = new static;
+     *
+     *         return $command->run($_SERVER['argv'], $exit);
+     *     }
+     *
+     * }
+     * </code>
+     *
+     * @param array $argv
+     */
+    protected function handleArguments(array $argv)
+    {
+        if (defined('__PHPUNIT_PHAR__')) {
+            $this->longOptions['selfupdate']  = null;
+            $this->longOptions['self-update'] = null;
+        }
+
+        try {
+            $this->options = PHPUnit_Util_Getopt::getopt(
+              $argv,
+              'd:c:hv',
+              array_keys($this->longOptions)
+            );
+        } catch (PHPUnit_Framework_Exception $e) {
+            PHPUnit_TextUI_TestRunner::showError($e->getMessage());
+        }
+
+        foreach ($this->options[0] as $option) {
+            switch ($option[0]) {
+                case '--colors': {
+                    $this->arguments['colors'] = true;
+                }
+                break;
+
+                case '--bootstrap': {
+                    $this->arguments['bootstrap'] = $option[1];
+                }
+                break;
+
+                case 'c':
+                case '--configuration': {
+                    $this->arguments['configuration'] = $option[1];
+                }
+                break;
+
+                case '--coverage-clover': {
+                    $this->arguments['coverageClover'] = $option[1];
+                }
+                break;
+
+                case '--coverage-crap4j': {
+                    $this->arguments['coverageCrap4J'] = $option[1];
+                }
+                break;
+
+                case '--coverage-html': {
+                    $this->arguments['coverageHtml'] = $option[1];
+                }
+                break;
+
+                case '--coverage-php': {
+                    $this->arguments['coveragePHP'] = $option[1];
+                }
+                break;
+
+                case '--coverage-text': {
+                    if ($option[1] === null) {
+                        $option[1] = 'php://stdout';
+                    }
+
+                    $this->arguments['coverageText'] = $option[1];
+                    $this->arguments['coverageTextShowUncoveredFiles'] = false;
+                    $this->arguments['coverageTextShowOnlySummary'] = false;
+                }
+                break;
+
+                case '--coverage-xml': {
+                    $this->arguments['coverageXml'] = $option[1];
+                }
+                break;
+
+                case 'd': {
+                    $ini = explode('=', $option[1]);
+
+                    if (isset($ini[0])) {
+                        if (isset($ini[1])) {
+                            ini_set($ini[0], $ini[1]);
+                        } else {
+                            ini_set($ini[0], true);
+                        }
+                    }
+                }
+                break;
+
+                case '--debug': {
+                    $this->arguments['debug'] = true;
+                }
+                break;
+
+                case 'h':
+                case '--help': {
+                    $this->showHelp();
+                    exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT);
+                }
+                break;
+
+                case '--filter': {
+                    $this->arguments['filter'] = $option[1];
+                }
+                break;
+
+                case '--testsuite': {
+                    $this->arguments['testsuite'] = $option[1];
+                }
+                break;
+
+                case '--group': {
+                    $this->arguments['groups'] = explode(',', $option[1]);
+                }
+                break;
+
+                case '--exclude-group': {
+                    $this->arguments['excludeGroups'] = explode(
+                      ',', $option[1]
+                    );
+                }
+                break;
+
+                case '--test-suffix': {
+                    $this->arguments['testSuffixes'] = explode(
+                      ',', $option[1]
+                    );
+                }
+                break;
+
+                case '--include-path': {
+                    $includePath = $option[1];
+                }
+                break;
+
+                case '--list-groups': {
+                    $this->arguments['listGroups'] = true;
+                }
+                break;
+
+                case '--printer': {
+                    $this->arguments['printer'] = $option[1];
+                }
+                break;
+
+                case '--loader': {
+                    $this->arguments['loader'] = $option[1];
+                }
+                break;
+
+                case '--log-json': {
+                    $this->arguments['jsonLogfile'] = $option[1];
+                }
+                break;
+
+                case '--log-junit': {
+                    $this->arguments['junitLogfile'] = $option[1];
+                }
+                break;
+
+                case '--log-tap': {
+                    $this->arguments['tapLogfile'] = $option[1];
+                }
+                break;
+
+                case '--process-isolation': {
+                    $this->arguments['processIsolation'] = true;
+                }
+                break;
+
+                case '--repeat': {
+                    $this->arguments['repeat'] = (int) $option[1];
+                }
+                break;
+
+                case '--stderr': {
+                    $this->arguments['stderr'] = true;
+                }
+                break;
+
+                case '--stop-on-error': {
+                    $this->arguments['stopOnError'] = true;
+                }
+                break;
+
+                case '--stop-on-failure': {
+                    $this->arguments['stopOnFailure'] = true;
+                }
+                break;
+
+                case '--stop-on-incomplete': {
+                    $this->arguments['stopOnIncomplete'] = true;
+                }
+                break;
+
+                case '--stop-on-risky': {
+                    $this->arguments['stopOnRisky'] = true;
+                }
+                break;
+
+                case '--stop-on-skipped': {
+                    $this->arguments['stopOnSkipped'] = true;
+                }
+                break;
+
+                case '--tap': {
+                    $this->arguments['printer'] = new PHPUnit_Util_Log_TAP;
+                }
+                break;
+
+                case '--testdox': {
+                    $this->arguments['printer'] = new PHPUnit_Util_TestDox_ResultPrinter_Text;
+                }
+                break;
+
+                case '--testdox-html': {
+                    $this->arguments['testdoxHTMLFile'] = $option[1];
+                }
+                break;
+
+                case '--testdox-text': {
+                    $this->arguments['testdoxTextFile'] = $option[1];
+                }
+                break;
+
+                case '--no-configuration': {
+                    $this->arguments['useDefaultConfiguration'] = false;
+                }
+                break;
+
+                case '--no-globals-backup': {
+                    $this->arguments['backupGlobals'] = false;
+                }
+                break;
+
+                case '--static-backup': {
+                    $this->arguments['backupStaticAttributes'] = true;
+                }
+                break;
+
+                case 'v':
+                case '--verbose': {
+                    $this->arguments['verbose'] = true;
+                }
+                break;
+
+                case '--version': {
+                    PHPUnit_TextUI_TestRunner::printVersionString();
+                    exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT);
+                }
+                break;
+
+                case '--report-useless-tests': {
+                    $this->arguments['reportUselessTests'] = true;
+                }
+                break;
+
+                case '--strict-coverage': {
+                    $this->arguments['strictCoverage'] = true;
+                }
+                break;
+
+                case '--disallow-test-output': {
+                    $this->arguments['disallowTestOutput'] = true;
+                }
+                break;
+
+                case '--enforce-time-limit': {
+                    $this->arguments['enforceTimeLimit'] = true;
+                }
+                break;
+
+                case '--strict': {
+                    $this->arguments['reportUselessTests'] = true;
+                    $this->arguments['strictCoverage']     = true;
+                    $this->arguments['disallowTestOutput'] = true;
+                    $this->arguments['enforceTimeLimit']   = true;
+                }
+                break;
+
+                case '--selfupdate':
+                case '--self-update': {
+                    $this->handleSelfUpdate();
+                }
+                break;
+
+                default: {
+                    $optionName = str_replace('--', '', $option[0]);
+
+                    if (isset($this->longOptions[$optionName])) {
+                        $handler = $this->longOptions[$optionName];
+                    } elseif (isset($this->longOptions[$optionName . '='])) {
+                        $handler = $this->longOptions[$optionName . '='];
+                    }
+
+                    if (isset($handler) && is_callable(array($this, $handler))) {
+                        $this->$handler($option[1]);
+                    }
+                }
+            }
+        }
+
+        $this->handleCustomTestSuite();
+
+        if (!isset($this->arguments['test'])) {
+
+            if (isset($this->options[1][0])) {
+                $this->arguments['test'] = $this->options[1][0];
+            }
+
+            if (isset($this->options[1][1])) {
+                $this->arguments['testFile'] = realpath($this->options[1][1]);
+            } else {
+                $this->arguments['testFile'] = '';
+            }
+
+            if (isset($this->arguments['test']) &&
+                is_file($this->arguments['test']) &&
+                substr($this->arguments['test'], -5, 5) != '.phpt') {
+                $this->arguments['testFile'] = realpath($this->arguments['test']);
+                $this->arguments['test']     = substr($this->arguments['test'], 0, strrpos($this->arguments['test'], '.'));
+            }
+        }
+
+        if (!isset($this->arguments['testSuffixes'])) {
+            $this->arguments['testSuffixes'] = array('Test.php', '.phpt');
+        }
+
+        if (isset($includePath)) {
+            ini_set(
+              'include_path',
+              $includePath . PATH_SEPARATOR . ini_get('include_path')
+            );
+        }
+
+        if (isset($this->arguments['bootstrap'])) {
+            $this->handleBootstrap($this->arguments['bootstrap']);
+        }
+
+        if (isset($this->arguments['printer']) &&
+            is_string($this->arguments['printer'])) {
+            $this->arguments['printer'] = $this->handlePrinter($this->arguments['printer']);
+        }
+
+        if ($this->arguments['loader'] !== null) {
+            $this->arguments['loader'] = $this->handleLoader($this->arguments['loader']);
+        }
+
+        if (isset($this->arguments['configuration']) &&
+            is_dir($this->arguments['configuration'])) {
+            $configurationFile = $this->arguments['configuration'] .
+                                 '/phpunit.xml';
+
+            if (file_exists($configurationFile)) {
+                $this->arguments['configuration'] = realpath(
+                  $configurationFile
+                );
+            } elseif (file_exists($configurationFile . '.dist')) {
+                $this->arguments['configuration'] = realpath(
+                  $configurationFile . '.dist'
+                );
+            }
+        } elseif (!isset($this->arguments['configuration']) &&
+                 $this->arguments['useDefaultConfiguration']) {
+            if (file_exists('phpunit.xml')) {
+                $this->arguments['configuration'] = realpath('phpunit.xml');
+            } elseif (file_exists('phpunit.xml.dist')) {
+                $this->arguments['configuration'] = realpath(
+                  'phpunit.xml.dist'
+                );
+            }
+        }
+
+        if (isset($this->arguments['configuration'])) {
+            try {
+                $configuration = PHPUnit_Util_Configuration::getInstance(
+                  $this->arguments['configuration']
+                );
+            } catch (Exception $e) {
+                print $e->getMessage() . "\n";
+                exit(PHPUnit_TextUI_TestRunner::FAILURE_EXIT);
+            }
+
+            $phpunit = $configuration->getPHPUnitConfiguration();
+
+            $configuration->handlePHPConfiguration();
+
+            if (!isset($this->arguments['bootstrap']) && isset($phpunit['bootstrap'])) {
+                $this->handleBootstrap($phpunit['bootstrap']);
+            }
+
+            /**
+             * Issue #657
+             */
+            if (isset($phpunit['stderr']) && $phpunit['stderr'] == true) {
+                $this->arguments['printer'] = new PHPUnit_TextUI_ResultPrinter(
+                  'php://stderr',
+                  isset($this->arguments['verbose']) ? $this->arguments['verbose'] : FALSE
+                );
+            }
+
+            if (isset($phpunit['printerClass'])) {
+                if (isset($phpunit['printerFile'])) {
+                    $file = $phpunit['printerFile'];
+                } else {
+                    $file = '';
+                }
+
+                $this->arguments['printer'] = $this->handlePrinter(
+                  $phpunit['printerClass'], $file
+                );
+            }
+
+            if (isset($phpunit['testSuiteLoaderClass'])) {
+                if (isset($phpunit['testSuiteLoaderFile'])) {
+                    $file = $phpunit['testSuiteLoaderFile'];
+                } else {
+                    $file = '';
+                }
+
+                $this->arguments['loader'] = $this->handleLoader(
+                  $phpunit['testSuiteLoaderClass'], $file
+                );
+            }
+
+            $browsers = $configuration->getSeleniumBrowserConfiguration();
+
+            if (!empty($browsers) &&
+                class_exists('PHPUnit_Extensions_SeleniumTestCase')) {
+                PHPUnit_Extensions_SeleniumTestCase::$browsers = $browsers;
+            }
+
+            if (!isset($this->arguments['test'])) {
+                $testSuite = $configuration->getTestSuiteConfiguration(isset($this->arguments['testsuite']) ? $this->arguments['testsuite'] : null);
+
+                if ($testSuite !== null) {
+                    $this->arguments['test'] = $testSuite;
+                }
+            }
+        }
+
+        if (isset($this->arguments['test']) && is_string($this->arguments['test']) && substr($this->arguments['test'], -5, 5) == '.phpt') {
+            $test = new PHPUnit_Extensions_PhptTestCase($this->arguments['test']);
+
+            $this->arguments['test'] = new PHPUnit_Framework_TestSuite;
+            $this->arguments['test']->addTest($test);
+        }
+
+        if (!isset($this->arguments['test']) ||
+            (isset($this->arguments['testDatabaseLogRevision']) && !isset($this->arguments['testDatabaseDSN']))) {
+            $this->showHelp();
+            exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT);
+        }
+    }
+
+    /**
+     * Handles the loading of the PHPUnit_Runner_TestSuiteLoader implementation.
+     *
+     * @param  string                         $loaderClass
+     * @param  string                         $loaderFile
+     * @return PHPUnit_Runner_TestSuiteLoader
+     */
+    protected function handleLoader($loaderClass, $loaderFile = '')
+    {
+        if (!class_exists($loaderClass, false)) {
+            if ($loaderFile == '') {
+                $loaderFile = PHPUnit_Util_Filesystem::classNameToFilename(
+                  $loaderClass
+                );
+            }
+
+            $loaderFile = stream_resolve_include_path($loaderFile);
+
+            if ($loaderFile) {
+                require $loaderFile;
+            }
+        }
+
+        if (class_exists($loaderClass, false)) {
+            $class = new ReflectionClass($loaderClass);
+
+            if ($class->implementsInterface('PHPUnit_Runner_TestSuiteLoader') &&
+                $class->isInstantiable()) {
+                $loader = $class->newInstance();
+            }
+        }
+
+        if (!isset($loader)) {
+            if ($loaderClass == 'PHPUnit_Runner_StandardTestSuiteLoader') {
+                return;
+            }
+
+            PHPUnit_TextUI_TestRunner::showError(
+              sprintf(
+                'Could not use "%s" as loader.',
+
+                $loaderClass
+              )
+            );
+        }
+
+        return $loader;
+    }
+
+    /**
+     * Handles the loading of the PHPUnit_Util_Printer implementation.
+     *
+     * @param  string               $printerClass
+     * @param  string               $printerFile
+     * @return PHPUnit_Util_Printer
+     */
+    protected function handlePrinter($printerClass, $printerFile = '')
+    {
+        if (!class_exists($printerClass, false)) {
+            if ($printerFile == '') {
+                $printerFile = PHPUnit_Util_Filesystem::classNameToFilename(
+                  $printerClass
+                );
+            }
+
+            $printerFile = stream_resolve_include_path($printerFile);
+
+            if ($printerFile) {
+                require $printerFile;
+            }
+        }
+
+        if (class_exists($printerClass)) {
+            $class = new ReflectionClass($printerClass);
+
+            if ($class->implementsInterface('PHPUnit_Framework_TestListener') &&
+                $class->isSubclassOf('PHPUnit_Util_Printer') &&
+                $class->isInstantiable()) {
+                if ($class->isSubclassOf('PHPUnit_TextUI_ResultPrinter')) {
+                    return $printerClass;
+                }
+
+                $printer = $class->newInstance();
+            }
+        }
+
+        if (!isset($printer)) {
+            PHPUnit_TextUI_TestRunner::showError(
+              sprintf(
+                'Could not use "%s" as printer.',
+
+                $printerClass
+              )
+            );
+        }
+
+        return $printer;
+    }
+
+    /**
+     * Loads a bootstrap file.
+     *
+     * @param string $filename
+     */
+    protected function handleBootstrap($filename)
+    {
+        try {
+            PHPUnit_Util_Fileloader::checkAndLoad($filename);
+        } catch (PHPUnit_Framework_Exception $e) {
+            PHPUnit_TextUI_TestRunner::showError($e->getMessage());
+        }
+    }
+
+    /**
+     * @since Method available since Release 4.0.0
+     */
+    protected function handleSelfUpdate()
+    {
+        PHPUnit_TextUI_TestRunner::printVersionString();
+
+        if (!extension_loaded('openssl')) {
+            print "The OpenSSL extension is not loaded.\n";
+            exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT);
+        }
+
+        $remoteFilename = sprintf(
+          'https://phar.phpunit.de/phpunit%s.phar',
+          PHPUnit_Runner_Version::getReleaseChannel()
+        );
+
+        $localFilename = realpath($_SERVER['argv'][0]);
+        $tempFilename  = basename($localFilename, '.phar') . '-temp.phar';
+
+        // Workaround for https://bugs.php.net/bug.php?id=65538
+        $caFile = dirname($tempFilename) . '/ca.pem';
+        copy(__PHPUNIT_PHAR_ROOT__ . '/ca.pem', $caFile);
+
+        print 'Updating the PHPUnit PHAR ... ';
+
+        $options = array(
+            'ssl' => array(
+                'allow_self_signed' => false,
+                'cafile' => $caFile,
+                'verify_peer' => true
+            )
+        );
+
+        if (PHP_VERSION_ID < 50600) {
+            $options['ssl']['CN_match']        = 'phar.phpunit.de';
+            $options['ssl']['SNI_server_name'] = 'phar.phpunit.de';
+        }
+
+        file_put_contents(
+          $tempFilename,
+          file_get_contents(
+            $remoteFilename,
+            false,
+            stream_context_create($options)
+          )
+        );
+
+        chmod($tempFilename, 0777 & ~umask());
+
+        try {
+            $phar = new Phar($tempFilename);
+            unset($phar);
+            rename($tempFilename, $localFilename);
+            unlink($caFile);
+        } catch (Exception $e) {
+            unlink($caFile);
+            unlink($tempFilename);
+            print " done\n\n" . $e->getMessage() . "\n";
+            exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT);
+        }
+
+        print " done\n";
+        exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT);
+    }
+
+    /**
+     * Show the help message.
+     */
+    protected function showHelp()
+    {
+        PHPUnit_TextUI_TestRunner::printVersionString();
+
+        print <<<EOT
+Usage: phpunit [options] UnitTest [UnitTest.php]
+       phpunit [options] <directory>
+
+Code Coverage Options:
+
+  --coverage-clover <file>  Generate code coverage report in Clover XML format.
+  --coverage-crap4j <file>  Generate code coverage report in Crap4J XML format.
+  --coverage-html <dir>     Generate code coverage report in HTML format.
+  --coverage-php <file>     Export PHP_CodeCoverage object to file.
+  --coverage-text=<file>    Generate code coverage report in text format.
+                            Default: Standard output.
+  --coverage-xml <dir>      Generate code coverage report in PHPUnit XML format.
+
+Logging Options:
+
+  --log-junit <file>        Log test execution in JUnit XML format to file.
+  --log-tap <file>          Log test execution in TAP format to file.
+  --log-json <file>         Log test execution in JSON format.
+  --testdox-html <file>     Write agile documentation in HTML format to file.
+  --testdox-text <file>     Write agile documentation in Text format to file.
+
+Test Selection Options:
+
+  --filter <pattern>        Filter which tests to run.
+  --testsuite <pattern>     Filter which testsuite to run.
+  --group ...               Only runs tests from the specified group(s).
+  --exclude-group ...       Exclude tests from the specified group(s).
+  --list-groups             List available test groups.
+  --test-suffix ...         Only search for test in files with specified
+                            suffix(es). Default: Test.php,.phpt
+
+Test Execution Options:
+
+  --report-useless-tests    Be strict about tests that do not test anything.
+  --strict-coverage         Be strict about unintentionally covered code.
+  --disallow-test-output    Be strict about output during tests.
+  --enforce-time-limit      Enforce time limit based on test size.
+  --strict                  Run tests in strict mode (enables all of the above).
+
+  --process-isolation       Run each test in a separate PHP process.
+  --no-globals-backup       Do not backup and restore \$GLOBALS for each test.
+  --static-backup           Backup and restore static attributes for each test.
+
+  --colors                  Use colors in output.
+  --stderr                  Write to STDERR instead of STDOUT.
+  --stop-on-error           Stop execution upon first error.
+  --stop-on-failure         Stop execution upon first error or failure.
+  --stop-on-risky           Stop execution upon first risky test.
+  --stop-on-skipped         Stop execution upon first skipped test.
+  --stop-on-incomplete      Stop execution upon first incomplete test.
+  -v|--verbose              Output more verbose information.
+  --debug                   Display debugging information during test execution.
+
+  --loader <loader>         TestSuiteLoader implementation to use.
+  --repeat <times>          Runs the test(s) repeatedly.
+  --tap                     Report test execution progress in TAP format.
+  --testdox                 Report test execution progress in TestDox format.
+  --printer <printer>       TestSuiteListener implementation to use.
+
+Configuration Options:
+
+  --bootstrap <file>        A "bootstrap" PHP file that is run before the tests.
+  -c|--configuration <file> Read configuration from XML file.
+  --no-configuration        Ignore default configuration file (phpunit.xml).
+  --include-path <path(s)>  Prepend PHP's include_path with given path(s).
+  -d key[=value]            Sets a php.ini value.
+
+Miscellaneous Options:
+
+  -h|--help                 Prints this usage information.
+  --version                 Prints the version and exits.
+
+EOT;
+
+        if (defined('__PHPUNIT_PHAR__')) {
+            print "\n  --self-update             Update PHPUnit to the latest version.\n";
+        }
+    }
+
+    /**
+     * Custom callback for test suite discovery.
+     */
+    protected function handleCustomTestSuite()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php b/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php
new file mode 100644
index 00000000..3a316c19
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php
@@ -0,0 +1,732 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage TextUI
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * Prints the result of a TextUI TestRunner run.
+ *
+ * @package    PHPUnit
+ * @subpackage TextUI
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class PHPUnit_TextUI_ResultPrinter extends PHPUnit_Util_Printer implements PHPUnit_Framework_TestListener
+{
+    const EVENT_TEST_START      = 0;
+    const EVENT_TEST_END        = 1;
+    const EVENT_TESTSUITE_START = 2;
+    const EVENT_TESTSUITE_END   = 3;
+
+    /**
+     * @var array
+     */
+    private static $ansiCodes = array(
+      'bold'       => 1,
+      'fg-black'   => 30,
+      'fg-red'     => 31,
+      'fg-yellow'  => 33,
+      'fg-cyan'    => 36,
+      'fg-white'   => 37,
+      'bg-red'     => 41,
+      'bg-green'   => 42,
+      'bg-yellow'  => 43
+    );
+
+    /**
+     * @var integer
+     */
+    protected $column = 0;
+
+    /**
+     * @var integer
+     */
+    protected $maxColumn;
+
+    /**
+     * @var boolean
+     */
+    protected $lastTestFailed = false;
+
+    /**
+     * @var integer
+     */
+    protected $numAssertions = 0;
+
+    /**
+     * @var integer
+     */
+    protected $numTests = -1;
+
+    /**
+     * @var integer
+     */
+    protected $numTestsRun = 0;
+
+    /**
+     * @var integer
+     */
+    protected $numTestsWidth;
+
+    /**
+     * @var boolean
+     */
+    protected $colors = false;
+
+    /**
+     * @var boolean
+     */
+    protected $debug = false;
+
+    /**
+     * @var boolean
+     */
+    protected $verbose = false;
+
+    /**
+     * Constructor.
+     *
+     * @param  mixed                       $out
+     * @param  boolean                     $verbose
+     * @param  boolean                     $colors
+     * @param  boolean                     $debug
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.0.0
+     */
+    public function __construct($out = null, $verbose = false, $colors = false, $debug = false)
+    {
+        parent::__construct($out);
+
+        if (is_bool($verbose)) {
+            $this->verbose = $verbose;
+        } else {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'boolean');
+        }
+
+        if (is_bool($colors)) {
+            $this->colors = $colors;
+        } else {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'boolean');
+        }
+
+        if (is_bool($debug)) {
+            $this->debug = $debug;
+        } else {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(4, 'boolean');
+        }
+    }
+
+    /**
+     * @param PHPUnit_Framework_TestResult $result
+     */
+    public function printResult(PHPUnit_Framework_TestResult $result)
+    {
+        $this->printHeader();
+
+        $this->printErrors($result);
+        $printSeparator = $result->errorCount() > 0;
+
+        if ($printSeparator && $result->failureCount() > 0) {
+            $this->write("\n--\n\n");
+        }
+
+        $printSeparator = $printSeparator || $result->failureCount() > 0;
+        $this->printFailures($result);
+
+        if ($this->verbose) {
+            if ($printSeparator && $result->deprecatedFeaturesCount() > 0) {
+                $this->write("\n--\n\n");
+            }
+
+            $printSeparator = $printSeparator ||
+                              $result->deprecatedFeaturesCount() > 0;
+
+            $this->printDeprecated($result);
+
+            if ($printSeparator && $result->riskyCount() > 0) {
+                $this->write("\n--\n\n");
+            }
+
+            $printSeparator = $printSeparator ||
+                              $result->riskyCount() > 0;
+
+            $this->printRisky($result);
+
+            if ($printSeparator && $result->notImplementedCount() > 0) {
+                $this->write("\n--\n\n");
+            }
+
+            $printSeparator = $printSeparator ||
+                              $result->notImplementedCount() > 0;
+
+            $this->printIncompletes($result);
+
+            if ($printSeparator && $result->skippedCount() > 0) {
+                $this->write("\n--\n\n");
+            }
+
+            $this->printSkipped($result);
+        }
+
+        $this->printFooter($result);
+    }
+
+    /**
+     * @param array  $defects
+     * @param string $type
+     */
+    protected function printDefects(array $defects, $type)
+    {
+        $count = count($defects);
+
+        if ($count == 0) {
+            return;
+        }
+
+        $this->write(
+          sprintf(
+            "There %s %d %s%s:\n",
+
+            ($count == 1) ? 'was' : 'were',
+            $count,
+            $type,
+            ($count == 1) ? '' : 's'
+          )
+        );
+
+        $i = 1;
+
+        foreach ($defects as $defect) {
+            $this->printDefect($defect, $i++);
+        }
+    }
+
+    /**
+     * @param PHPUnit_Framework_TestFailure $defect
+     * @param integer                       $count
+     */
+    protected function printDefect(PHPUnit_Framework_TestFailure $defect, $count)
+    {
+        $this->printDefectHeader($defect, $count);
+        $this->printDefectTrace($defect);
+    }
+
+    /**
+     * @param PHPUnit_Framework_TestFailure $defect
+     * @param integer                       $count
+     */
+    protected function printDefectHeader(PHPUnit_Framework_TestFailure $defect, $count)
+    {
+        $failedTest = $defect->failedTest();
+
+        if ($failedTest instanceof PHPUnit_Framework_SelfDescribing) {
+            $testName = $failedTest->toString();
+        } else {
+            $testName = get_class($failedTest);
+        }
+
+        $this->write(
+          sprintf(
+            "\n%d) %s\n",
+
+            $count,
+            $testName
+          )
+        );
+    }
+
+    /**
+     * @param PHPUnit_Framework_TestFailure $defect
+     */
+    protected function printDefectTrace(PHPUnit_Framework_TestFailure $defect)
+    {
+        $this->write($defect->getExceptionAsString());
+
+        $trace = PHPUnit_Util_Filter::getFilteredStacktrace(
+          $defect->thrownException()
+        );
+
+        if (!empty($trace)) {
+            $this->write("\n" . $trace);
+        }
+
+        $e = $defect->thrownException()->getPrevious();
+
+        while ($e) {
+          $this->write(
+            "\nCaused by\n" .
+            PHPUnit_Framework_TestFailure::exceptionToString($e). "\n" .
+            PHPUnit_Util_Filter::getFilteredStacktrace($e)
+          );
+
+          $e = $e->getPrevious();
+        }
+    }
+
+    /**
+     * @param PHPUnit_Framework_TestResult $result
+     */
+    protected function printErrors(PHPUnit_Framework_TestResult $result)
+    {
+        $this->printDefects($result->errors(), 'error');
+    }
+
+    /**
+     * @param PHPUnit_Framework_TestResult $result
+     */
+    protected function printFailures(PHPUnit_Framework_TestResult $result)
+    {
+        $this->printDefects($result->failures(), 'failure');
+    }
+
+    /**
+     * @param PHPUnit_Framework_TestResult $result
+     */
+    protected function printIncompletes(PHPUnit_Framework_TestResult $result)
+    {
+        $this->printDefects($result->notImplemented(), 'incomplete test');
+    }
+
+    /**
+     * @param PHPUnit_Framework_TestResult $result
+     * @since  Method available since Release 4.0.0
+     */
+    protected function printRisky(PHPUnit_Framework_TestResult $result)
+    {
+        $this->printDefects($result->risky(), 'risky test');
+    }
+
+    /**
+     * @param PHPUnit_Framework_TestResult $result
+     * @since  Method available since Release 3.0.0
+     */
+    protected function printSkipped(PHPUnit_Framework_TestResult $result)
+    {
+        $this->printDefects($result->skipped(), 'skipped test');
+    }
+
+    /**
+     * @param PHPUnit_Framework_TestResult $result
+     * @since Method available since Release 4.0.0
+     */
+    protected function printDeprecated(PHPUnit_Framework_TestResult $result)
+    {
+        $deprecatedFeatures = $result->deprecatedFeatures();
+        $count              = count($deprecatedFeatures);
+
+        if ($count == 0) {
+            return;
+        }
+
+        $this->write(
+          sprintf(
+            "There %s %d tests that use%s deprecated features:\n",
+
+            ($count == 1) ? 'was' : 'were',
+            $count,
+            ($count != 1) ? '' : 's'
+          )
+        );
+
+        $i = 1;
+
+        foreach ($result->deprecatedFeatures() as $deprecatedFeature) {
+            $this->write(
+              sprintf(
+                "\n%d) %s\n\n%s\n",
+
+                $i++,
+                $deprecatedFeature->getMessage(),
+                $deprecatedFeature->getSource()
+              )
+            );
+        }
+    }
+
+    protected function printHeader()
+    {
+        $this->write("\n\n" . PHP_Timer::resourceUsage() . "\n\n");
+    }
+
+    /**
+     * @param PHPUnit_Framework_TestResult $result
+     */
+    protected function printFooter(PHPUnit_Framework_TestResult $result)
+    {
+        if (count($result) === 0) {
+            $this->writeWithColor(
+              'fg-black, bg-yellow',
+              'No tests executed!'
+            );
+        } elseif ($result->wasSuccessful() &&
+                 $result->allHarmless() &&
+                 $result->allCompletelyImplemented() &&
+                 $result->noneSkipped()) {
+
+            $this->writeWithColor(
+              'fg-black, bg-green',
+              sprintf(
+                'OK (%d test%s, %d assertion%s)',
+
+                count($result),
+                (count($result) == 1) ? '' : 's',
+                $this->numAssertions,
+                ($this->numAssertions == 1) ? '' : 's'
+              )
+            );
+        } elseif ((!$result->allCompletelyImplemented() ||
+                  !$result->allHarmless() ||
+                  !$result->noneSkipped()) &&
+                 $result->wasSuccessful()) {
+            $this->writeWithColor(
+              'fg-black, bg-yellow',
+              sprintf(
+                "%sOK, but incomplete, skipped, or risky tests!\n" .
+                'Tests: %d, Assertions: %d%s%s%s.',
+
+                $this->verbose ? "\n" : '',
+                count($result),
+                $this->numAssertions,
+                $this->getCountString(
+                  $result->notImplementedCount(), 'Incomplete'
+                ),
+                $this->getCountString(
+                  $result->skippedCount(), 'Skipped'
+                ),
+                $this->getCountString(
+                  $result->riskyCount(), 'Risky'
+                )
+              )
+            );
+        } else {
+            $this->writeWithColor(
+              'fg-white, bg-red',
+              sprintf(
+                "\nFAILURES!\n" .
+                'Tests: %d, Assertions: %s%s%s%s%s.',
+
+                count($result),
+                $this->numAssertions,
+                $this->getCountString($result->failureCount(), 'Failures'),
+                $this->getCountString($result->errorCount(), 'Errors'),
+                $this->getCountString(
+                  $result->notImplementedCount(), 'Incomplete'
+                ),
+                $this->getCountString($result->skippedCount(), 'Skipped')
+              )
+            );
+        }
+
+        if (!$this->verbose &&
+            $result->deprecatedFeaturesCount() > 0) {
+            $this->write("\n");
+
+            $this->writeWithColor(
+              'fg-white, bg-red',
+              sprintf(
+                "Warning: Deprecated PHPUnit features are being used %s times!\n" .
+                'Use --verbose for more information.',
+
+                $result->deprecatedFeaturesCount()
+              )
+            );
+        }
+    }
+
+    /**
+     * @param  integer $count
+     * @param  string  $name
+     * @return string
+     * @since  Method available since Release 3.0.0
+     */
+    protected function getCountString($count, $name)
+    {
+        $string = '';
+
+        if ($count > 0) {
+            $string = sprintf(
+              ', %s: %d',
+
+              $name,
+              $count
+            );
+        }
+
+        return $string;
+    }
+
+    /**
+     */
+    public function printWaitPrompt()
+    {
+        $this->write("\n<RETURN> to continue\n");
+    }
+
+    /**
+     * An error occurred.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->writeProgressWithColor('fg-red, bold', 'E');
+        $this->lastTestFailed = true;
+    }
+
+    /**
+     * A failure occurred.
+     *
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
+     */
+    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
+    {
+        $this->writeProgressWithColor('bg-red, fg-white', 'F');
+        $this->lastTestFailed = true;
+    }
+
+    /**
+     * Incomplete test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->writeProgressWithColor('fg-yellow, bold', 'I');
+        $this->lastTestFailed = true;
+    }
+
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->writeProgressWithColor('fg-yellow, bold', 'R');
+        $this->lastTestFailed = true;
+    }
+
+    /**
+     * Skipped test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 3.0.0
+     */
+    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->writeProgressWithColor('fg-cyan, bold', 'S');
+        $this->lastTestFailed = true;
+    }
+
+    /**
+     * A testsuite started.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+        if ($this->numTests == -1) {
+            $this->numTests      = count($suite);
+            $this->numTestsWidth = strlen((string) $this->numTests);
+            $this->maxColumn     = 69 - (2 * $this->numTestsWidth);
+        }
+    }
+
+    /**
+     * A testsuite ended.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+    }
+
+    /**
+     * A test started.
+     *
+     * @param PHPUnit_Framework_Test $test
+     */
+    public function startTest(PHPUnit_Framework_Test $test)
+    {
+        if ($this->debug) {
+            $this->write(
+              sprintf(
+                "\nStarting test '%s'.\n", PHPUnit_Util_Test::describe($test)
+              )
+            );
+        }
+    }
+
+    /**
+     * A test ended.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
+     */
+    public function endTest(PHPUnit_Framework_Test $test, $time)
+    {
+        if (!$this->lastTestFailed) {
+            $this->writeProgress('.');
+        }
+
+        if ($test instanceof PHPUnit_Framework_TestCase) {
+            $this->numAssertions += $test->getNumAssertions();
+        } elseif ($test instanceof PHPUnit_Extensions_PhptTestCase) {
+            $this->numAssertions++;
+        }
+
+        $this->lastTestFailed = false;
+
+        if ($test instanceof PHPUnit_Framework_TestCase) {
+            if (!$test->hasPerformedExpectationsOnOutput()) {
+                $this->write($test->getActualOutput());
+            }
+        }
+    }
+
+    /**
+     * @param string $progress
+     */
+    protected function writeProgress($progress)
+    {
+        $this->write($progress);
+        $this->column++;
+        $this->numTestsRun++;
+
+        if ($this->column == $this->maxColumn) {
+            $this->write(
+              sprintf(
+                ' %' . $this->numTestsWidth . 'd / %' .
+                       $this->numTestsWidth . 'd (%3s%%)',
+
+                $this->numTestsRun,
+                $this->numTests,
+                floor(($this->numTestsRun / $this->numTests) * 100)
+              )
+            );
+
+            $this->writeNewLine();
+        }
+    }
+
+    protected function writeNewLine()
+    {
+        $this->column = 0;
+        $this->write("\n");
+    }
+
+    /**
+     * Formats a buffer with a specified ANSI color sequence if colors are
+     * enabled.
+     *
+     * @param  string $color
+     * @param  string $buffer
+     * @return string
+     * @since  Method available since Release 4.0.0
+     */
+    protected function formatWithColor($color, $buffer)
+    {
+        if (!$this->colors) {
+            return $buffer;
+        }
+
+        $codes = array_map('trim', explode(',', $color));
+        $lines = explode("\n", $buffer);
+        $padding = max(array_map('strlen', $lines));
+
+        $styles = array();
+        foreach ($codes as $code) {
+            $styles[] = self::$ansiCodes[$code];
+        }
+        $style = sprintf("\x1b[%sm", implode(';', $styles));
+
+        $styledLines = array();
+        foreach ($lines as $line) {
+            $styledLines[] = $style . str_pad($line, $padding) . "\x1b[0m";
+        }
+
+        return implode("\n", $styledLines);
+    }
+
+    /**
+     * Writes a buffer out with a color sequence if colors are enabled.
+     *
+     * @param string $color
+     * @param string $buffer
+     * @since  Method available since Release 4.0.0
+     */
+    protected function writeWithColor($color, $buffer)
+    {
+        $buffer = $this->formatWithColor($color, $buffer);
+        $this->write($buffer . "\n");
+    }
+
+    /**
+     * Writes progress with a color sequence if colors are enabled.
+     *
+     * @param string $color
+     * @param string $buffer
+     * @since  Method available since Release 4.0.0
+     */
+    protected function writeProgressWithColor($color, $buffer)
+    {
+        $buffer = $this->formatWithColor($color, $buffer);
+        $this->writeProgress($buffer);
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/TextUI/TestRunner.php b/vendor/phpunit/phpunit/src/TextUI/TestRunner.php
new file mode 100644
index 00000000..73f0383f
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/TextUI/TestRunner.php
@@ -0,0 +1,983 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage TextUI
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+use SebastianBergmann\Environment\Runtime;
+
+/**
+ * A TestRunner for the Command Line Interface (CLI)
+ * PHP SAPI Module.
+ *
+ * @package    PHPUnit
+ * @subpackage TextUI
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class PHPUnit_TextUI_TestRunner extends PHPUnit_Runner_BaseTestRunner
+{
+    const SUCCESS_EXIT   = 0;
+    const FAILURE_EXIT   = 1;
+    const EXCEPTION_EXIT = 2;
+
+    /**
+     * @var PHP_CodeCoverage_Filter
+     */
+    protected $codeCoverageFilter;
+
+    /**
+     * @var PHPUnit_Runner_TestSuiteLoader
+     */
+    protected $loader = null;
+
+    /**
+     * @var PHPUnit_TextUI_ResultPrinter
+     */
+    protected $printer = null;
+
+    /**
+     * @var boolean
+     */
+    protected static $versionStringPrinted = false;
+
+    /**
+     * @var array
+     */
+    private $missingExtensions = array();
+
+    /**
+     * @var boolean
+     */
+    private $canCollectCodeCoverage;
+
+    /**
+     * @param PHPUnit_Runner_TestSuiteLoader $loader
+     * @param PHP_CodeCoverage_Filter        $filter
+     * @since Method available since Release 3.4.0
+     */
+    public function __construct(PHPUnit_Runner_TestSuiteLoader $loader = null, PHP_CodeCoverage_Filter $filter = null)
+    {
+        if ($filter === null) {
+            $filter = new PHP_CodeCoverage_Filter;
+        }
+
+        $this->codeCoverageFilter = $filter;
+        $this->loader             = $loader;
+
+        $runtime = new Runtime;
+        $this->canCollectCodeCoverage = $runtime->canCollectCodeCoverage();
+    }
+
+    /**
+     * @param  PHPUnit_Framework_Test|ReflectionClass $test
+     * @param  array                               $arguments
+     * @return PHPUnit_Framework_TestResult
+     * @throws PHPUnit_Framework_Exception
+     */
+    public static function run($test, array $arguments = array())
+    {
+        if ($test instanceof ReflectionClass) {
+            $test = new PHPUnit_Framework_TestSuite($test);
+        }
+
+        if ($test instanceof PHPUnit_Framework_Test) {
+            $aTestRunner = new PHPUnit_TextUI_TestRunner;
+
+            return $aTestRunner->doRun(
+              $test,
+              $arguments
+            );
+        } else {
+            throw new PHPUnit_Framework_Exception(
+              'No test case or test suite found.'
+            );
+        }
+    }
+
+    /**
+     * @return PHPUnit_Framework_TestResult
+     */
+    protected function createTestResult()
+    {
+        return new PHPUnit_Framework_TestResult;
+    }
+
+    private function processSuiteFilters(PHPUnit_Framework_TestSuite $suite, array $arguments)
+    {
+        if (!$arguments['filter'] &&
+            empty($arguments['groups']) &&
+            empty($arguments['excludeGroups'])) {
+            return;
+        }
+
+        $filterFactory = new PHPUnit_Runner_Filter_Factory();
+
+        if (!empty($arguments['excludeGroups'])) {
+            $filterFactory->addFilter(
+                new ReflectionClass('PHPUnit_Runner_Filter_Group_Exclude'),
+                $arguments['excludeGroups']
+            );
+        }
+
+        if (!empty($arguments['groups'])) {
+            $filterFactory->addFilter(
+                new ReflectionClass('PHPUnit_Runner_Filter_Group_Include'),
+                $arguments['groups']
+            );
+        }
+
+        if ($arguments['filter']) {
+            $filterFactory->addFilter(
+                new ReflectionClass('PHPUnit_Runner_Filter_Test'),
+                $arguments['filter']
+            );
+        }
+        $suite->injectFilter($filterFactory);
+    }
+
+    /**
+     * @param  PHPUnit_Framework_Test       $suite
+     * @param  array                        $arguments
+     * @return PHPUnit_Framework_TestResult
+     */
+    public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array())
+    {
+        $this->handleConfiguration($arguments);
+
+        $this->processSuiteFilters($suite, $arguments);
+
+        if (isset($arguments['bootstrap'])) {
+            $GLOBALS['__PHPUNIT_BOOTSTRAP'] = $arguments['bootstrap'];
+        }
+
+        if ($arguments['backupGlobals'] === false) {
+            $suite->setBackupGlobals(false);
+        }
+
+        if ($arguments['backupStaticAttributes'] === true) {
+            $suite->setBackupStaticAttributes(true);
+        }
+
+        if (is_integer($arguments['repeat'])) {
+            $test = new PHPUnit_Extensions_RepeatedTest(
+              $suite,
+              $arguments['repeat'],
+              $arguments['processIsolation']
+            );
+
+            $suite = new PHPUnit_Framework_TestSuite();
+            $suite->addTest($test);
+        }
+
+        $result = $this->createTestResult();
+
+        if (!$arguments['convertErrorsToExceptions']) {
+            $result->convertErrorsToExceptions(false);
+        }
+
+        if (!$arguments['convertNoticesToExceptions']) {
+            PHPUnit_Framework_Error_Notice::$enabled = false;
+        }
+
+        if (!$arguments['convertWarningsToExceptions']) {
+            PHPUnit_Framework_Error_Warning::$enabled = false;
+        }
+
+        if ($arguments['stopOnError']) {
+            $result->stopOnError(true);
+        }
+
+        if ($arguments['stopOnFailure']) {
+            $result->stopOnFailure(true);
+        }
+
+        if ($arguments['stopOnIncomplete']) {
+            $result->stopOnIncomplete(true);
+        }
+
+        if ($arguments['stopOnRisky']) {
+            $result->stopOnRisky(true);
+        }
+
+        if ($arguments['stopOnSkipped']) {
+            $result->stopOnSkipped(true);
+        }
+
+        if ($this->printer === null) {
+            if (isset($arguments['printer']) &&
+                $arguments['printer'] instanceof PHPUnit_Util_Printer) {
+                $this->printer = $arguments['printer'];
+            } else {
+                $printerClass = 'PHPUnit_TextUI_ResultPrinter';
+                if (isset($arguments['printer']) &&
+                    is_string($arguments['printer']) &&
+                    class_exists($arguments['printer'], false)) {
+                    $class = new ReflectionClass($arguments['printer']);
+
+                    if ($class->isSubclassOf('PHPUnit_TextUI_ResultPrinter')) {
+                        $printerClass = $arguments['printer'];
+                    }
+                }
+
+                $this->printer = new $printerClass(
+                  isset($arguments['stderr']) ? 'php://stderr' : null,
+                  $arguments['verbose'],
+                  $arguments['colors'],
+                  $arguments['debug']
+                );
+            }
+        }
+
+        if (!$this->printer instanceof PHPUnit_Util_Log_TAP) {
+            $this->printer->write(
+              PHPUnit_Runner_Version::getVersionString() . "\n\n"
+            );
+
+            self::$versionStringPrinted = true;
+
+            if (isset($arguments['configuration'])) {
+                $this->printer->write(
+                  sprintf(
+                    "Configuration read from %s\n\n",
+                    $arguments['configuration']->getFilename()
+                  )
+                );
+            }
+        }
+
+        foreach ($arguments['listeners'] as $listener) {
+            $result->addListener($listener);
+        }
+
+        $result->addListener($this->printer);
+
+        if ($this->printer instanceof PHPUnit_TextUI_ResultPrinter) {
+            $result->addListener(new PHPUnit_Util_DeprecatedFeature_Logger);
+        }
+
+        if (isset($arguments['testdoxHTMLFile'])) {
+            $result->addListener(
+              new PHPUnit_Util_TestDox_ResultPrinter_HTML(
+                $arguments['testdoxHTMLFile']
+              )
+            );
+        }
+
+        if (isset($arguments['testdoxTextFile'])) {
+            $result->addListener(
+              new PHPUnit_Util_TestDox_ResultPrinter_Text(
+                $arguments['testdoxTextFile']
+              )
+            );
+        }
+
+        $codeCoverageReports = 0;
+
+        if (isset($arguments['coverageClover'])) {
+            $codeCoverageReports++;
+        }
+
+        if (isset($arguments['coverageCrap4J'])) {
+            $codeCoverageReports++;
+        }
+
+        if (isset($arguments['coverageHtml'])) {
+            $codeCoverageReports++;
+        }
+
+        if (isset($arguments['coveragePHP'])) {
+            $codeCoverageReports++;
+        }
+
+        if (isset($arguments['coverageText'])) {
+            $codeCoverageReports++;
+        }
+
+        if (isset($arguments['coverageXml'])) {
+            $codeCoverageReports++;
+        }
+
+        if ($codeCoverageReports > 0 && (!extension_loaded('tokenizer') || !$this->canCollectCodeCoverage)) {
+            if (!extension_loaded('tokenizer')) {
+                $this->showExtensionNotLoadedMessage(
+                    'tokenizer', 'No code coverage will be generated.'
+                );
+            } elseif (!extension_loaded('Xdebug')) {
+                $this->showExtensionNotLoadedMessage(
+                    'Xdebug', 'No code coverage will be generated.'
+                );
+            }
+
+            $codeCoverageReports = 0;
+        }
+
+        if ($codeCoverageReports > 0) {
+            $codeCoverage = new PHP_CodeCoverage(
+              null, $this->codeCoverageFilter
+            );
+
+            $codeCoverage->setAddUncoveredFilesFromWhitelist(
+              $arguments['addUncoveredFilesFromWhitelist']
+            );
+
+            $codeCoverage->setCheckForUnintentionallyCoveredCode(
+              $arguments['strictCoverage']
+            );
+
+            $codeCoverage->setProcessUncoveredFilesFromWhitelist(
+              $arguments['processUncoveredFilesFromWhitelist']
+            );
+
+            if (isset($arguments['forceCoversAnnotation'])) {
+                $codeCoverage->setForceCoversAnnotation(
+                  $arguments['forceCoversAnnotation']
+                );
+            }
+
+            if (isset($arguments['mapTestClassNameToCoveredClassName'])) {
+                $codeCoverage->setMapTestClassNameToCoveredClassName(
+                  $arguments['mapTestClassNameToCoveredClassName']
+                );
+            }
+
+            $result->setCodeCoverage($codeCoverage);
+        }
+
+        if ($codeCoverageReports > 1) {
+            if (isset($arguments['cacheTokens'])) {
+                $codeCoverage->setCacheTokens($arguments['cacheTokens']);
+            }
+        }
+
+        if (isset($arguments['jsonLogfile'])) {
+            $result->addListener(
+              new PHPUnit_Util_Log_JSON($arguments['jsonLogfile'])
+            );
+        }
+
+        if (isset($arguments['tapLogfile'])) {
+            $result->addListener(
+              new PHPUnit_Util_Log_TAP($arguments['tapLogfile'])
+            );
+        }
+
+        if (isset($arguments['junitLogfile'])) {
+            $result->addListener(
+              new PHPUnit_Util_Log_JUnit(
+                $arguments['junitLogfile'], $arguments['logIncompleteSkipped']
+              )
+            );
+        }
+
+        $result->beStrictAboutTestsThatDoNotTestAnything($arguments['reportUselessTests']);
+        $result->beStrictAboutOutputDuringTests($arguments['disallowTestOutput']);
+        $result->beStrictAboutTestSize($arguments['enforceTimeLimit']);
+        $result->setTimeoutForSmallTests($arguments['timeoutForSmallTests']);
+        $result->setTimeoutForMediumTests($arguments['timeoutForMediumTests']);
+        $result->setTimeoutForLargeTests($arguments['timeoutForLargeTests']);
+
+        if ($suite instanceof PHPUnit_Framework_TestSuite) {
+            $suite->setRunTestInSeparateProcess($arguments['processIsolation']);
+        }
+
+        $suite->run($result);
+
+        unset($suite);
+        $result->flushListeners();
+
+        if ($this->printer instanceof PHPUnit_TextUI_ResultPrinter) {
+            $this->printer->printResult($result);
+        }
+
+        if (isset($codeCoverage)) {
+            if (isset($arguments['coverageClover'])) {
+                $this->printer->write(
+                  "\nGenerating code coverage report in Clover XML format ..."
+                );
+
+                $writer = new PHP_CodeCoverage_Report_Clover;
+                $writer->process($codeCoverage, $arguments['coverageClover']);
+
+                $this->printer->write(" done\n");
+                unset($writer);
+            }
+
+            if (isset($arguments['coverageCrap4J'])) {
+                $this->printer->write(
+                  "\nGenerating Crap4J report XML file ..."
+                );
+
+                $writer = new PHP_CodeCoverage_Report_Crap4j;
+                $writer->process($codeCoverage, $arguments['coverageCrap4J']);
+
+                $this->printer->write(" done\n");
+                unset($writer);
+            }
+
+            if (isset($arguments['coverageHtml'])) {
+                $this->printer->write(
+                  "\nGenerating code coverage report in HTML format ..."
+                );
+
+                $writer = new PHP_CodeCoverage_Report_HTML(
+                  $arguments['reportLowUpperBound'],
+                  $arguments['reportHighLowerBound'],
+                  sprintf(
+                    ' and <a href="http://phpunit.de/">PHPUnit %s</a>',
+                    PHPUnit_Runner_Version::id()
+                  )
+                );
+
+                $writer->process($codeCoverage, $arguments['coverageHtml']);
+
+                $this->printer->write(" done\n");
+                unset($writer);
+            }
+
+            if (isset($arguments['coveragePHP'])) {
+                $this->printer->write(
+                  "\nGenerating code coverage report in PHP format ..."
+                );
+
+                $writer = new PHP_CodeCoverage_Report_PHP;
+                $writer->process($codeCoverage, $arguments['coveragePHP']);
+
+                $this->printer->write(" done\n");
+                unset($writer);
+            }
+
+            if (isset($arguments['coverageText'])) {
+                if ($arguments['coverageText'] == 'php://stdout') {
+                    $outputStream = $this->printer;
+                    $colors       = (bool) $arguments['colors'];
+                } else {
+                    $outputStream = new PHPUnit_Util_Printer($arguments['coverageText']);
+                    $colors       = false;
+                }
+
+                $processor = new PHP_CodeCoverage_Report_Text(
+                  $arguments['reportLowUpperBound'],
+                  $arguments['reportHighLowerBound'],
+                  $arguments['coverageTextShowUncoveredFiles'],
+                  $arguments['coverageTextShowOnlySummary']
+                );
+
+                $outputStream->write(
+                  $processor->process($codeCoverage, $colors)
+                );
+            }
+
+            if (isset($arguments['coverageXml'])) {
+                $this->printer->write(
+                  "\nGenerating code coverage report in PHPUnit XML format ..."
+                );
+
+                $writer = new PHP_CodeCoverage_Report_XML;
+                $writer->process($codeCoverage, $arguments['coverageXml']);
+
+                $this->printer->write(" done\n");
+                unset($writer);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param PHPUnit_TextUI_ResultPrinter $resultPrinter
+     */
+    public function setPrinter(PHPUnit_TextUI_ResultPrinter $resultPrinter)
+    {
+        $this->printer = $resultPrinter;
+    }
+
+    /**
+     * Override to define how to handle a failed loading of
+     * a test suite.
+     *
+     * @param string $message
+     */
+    protected function runFailed($message)
+    {
+        self::printVersionString();
+        self::write($message . PHP_EOL);
+        exit(self::FAILURE_EXIT);
+    }
+
+    /**
+     * @param string $buffer
+     * @since  Method available since Release 3.1.0
+     */
+    protected static function write($buffer)
+    {
+        if (PHP_SAPI != 'cli') {
+            $buffer = htmlspecialchars($buffer);
+        }
+
+        print $buffer;
+    }
+
+    /**
+     * Returns the loader to be used.
+     *
+     * @return PHPUnit_Runner_TestSuiteLoader
+     * @since  Method available since Release 2.2.0
+     */
+    public function getLoader()
+    {
+        if ($this->loader === null) {
+            $this->loader = new PHPUnit_Runner_StandardTestSuiteLoader;
+        }
+
+        return $this->loader;
+    }
+
+    /**
+     */
+    public static function showError($message)
+    {
+        self::printVersionString();
+        self::write($message . "\n");
+
+        exit(self::FAILURE_EXIT);
+    }
+
+    /**
+     */
+    public static function printVersionString()
+    {
+        if (!self::$versionStringPrinted) {
+            self::write(PHPUnit_Runner_Version::getVersionString() . "\n\n");
+            self::$versionStringPrinted = true;
+        }
+    }
+
+    /**
+     * @param array $arguments
+     * @since  Method available since Release 3.2.1
+     */
+    protected function handleConfiguration(array &$arguments)
+    {
+        if (isset($arguments['configuration']) &&
+            !$arguments['configuration'] instanceof PHPUnit_Util_Configuration) {
+            $arguments['configuration'] = PHPUnit_Util_Configuration::getInstance(
+              $arguments['configuration']
+            );
+        }
+
+        $arguments['debug']     = isset($arguments['debug'])     ? $arguments['debug']     : false;
+        $arguments['filter']    = isset($arguments['filter'])    ? $arguments['filter']    : false;
+        $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
+
+        if (isset($arguments['configuration'])) {
+            $arguments['configuration']->handlePHPConfiguration();
+
+            $phpunitConfiguration = $arguments['configuration']->getPHPUnitConfiguration();
+
+            if (isset($phpunitConfiguration['backupGlobals']) &&
+                !isset($arguments['backupGlobals'])) {
+                $arguments['backupGlobals'] = $phpunitConfiguration['backupGlobals'];
+            }
+
+            if (isset($phpunitConfiguration['backupStaticAttributes']) &&
+                !isset($arguments['backupStaticAttributes'])) {
+                $arguments['backupStaticAttributes'] = $phpunitConfiguration['backupStaticAttributes'];
+            }
+
+            if (isset($phpunitConfiguration['bootstrap']) &&
+                !isset($arguments['bootstrap'])) {
+                $arguments['bootstrap'] = $phpunitConfiguration['bootstrap'];
+            }
+
+            if (isset($phpunitConfiguration['cacheTokens']) &&
+                !isset($arguments['cacheTokens'])) {
+                $arguments['cacheTokens'] = $phpunitConfiguration['cacheTokens'];
+            }
+
+            if (isset($phpunitConfiguration['colors']) &&
+                !isset($arguments['colors'])) {
+                $arguments['colors'] = $phpunitConfiguration['colors'];
+            }
+
+            if (isset($phpunitConfiguration['convertErrorsToExceptions']) &&
+                !isset($arguments['convertErrorsToExceptions'])) {
+                $arguments['convertErrorsToExceptions'] = $phpunitConfiguration['convertErrorsToExceptions'];
+            }
+
+            if (isset($phpunitConfiguration['convertNoticesToExceptions']) &&
+                !isset($arguments['convertNoticesToExceptions'])) {
+                $arguments['convertNoticesToExceptions'] = $phpunitConfiguration['convertNoticesToExceptions'];
+            }
+
+            if (isset($phpunitConfiguration['convertWarningsToExceptions']) &&
+                !isset($arguments['convertWarningsToExceptions'])) {
+                $arguments['convertWarningsToExceptions'] = $phpunitConfiguration['convertWarningsToExceptions'];
+            }
+
+            if (isset($phpunitConfiguration['processIsolation']) &&
+                !isset($arguments['processIsolation'])) {
+                $arguments['processIsolation'] = $phpunitConfiguration['processIsolation'];
+            }
+
+            if (isset($phpunitConfiguration['stopOnFailure']) &&
+                !isset($arguments['stopOnFailure'])) {
+                $arguments['stopOnFailure'] = $phpunitConfiguration['stopOnFailure'];
+            }
+
+            if (isset($phpunitConfiguration['timeoutForSmallTests']) &&
+                !isset($arguments['timeoutForSmallTests'])) {
+                $arguments['timeoutForSmallTests'] = $phpunitConfiguration['timeoutForSmallTests'];
+            }
+
+            if (isset($phpunitConfiguration['timeoutForMediumTests']) &&
+                !isset($arguments['timeoutForMediumTests'])) {
+                $arguments['timeoutForMediumTests'] = $phpunitConfiguration['timeoutForMediumTests'];
+            }
+
+            if (isset($phpunitConfiguration['timeoutForLargeTests']) &&
+                !isset($arguments['timeoutForLargeTests'])) {
+                $arguments['timeoutForLargeTests'] = $phpunitConfiguration['timeoutForLargeTests'];
+            }
+
+            if (isset($phpunitConfiguration['reportUselessTests']) &&
+                !isset($arguments['reportUselessTests'])) {
+                $arguments['reportUselessTests'] = $phpunitConfiguration['reportUselessTests'];
+            }
+
+            if (isset($phpunitConfiguration['strictCoverage']) &&
+                !isset($arguments['strictCoverage'])) {
+                $arguments['strictCoverage'] = $phpunitConfiguration['strictCoverage'];
+            }
+
+            if (isset($phpunitConfiguration['disallowTestOutput']) &&
+                !isset($arguments['disallowTestOutput'])) {
+                $arguments['disallowTestOutput'] = $phpunitConfiguration['disallowTestOutput'];
+            }
+
+            if (isset($phpunitConfiguration['enforceTimeLimit']) &&
+                !isset($arguments['enforceTimeLimit'])) {
+                $arguments['enforceTimeLimit'] = $phpunitConfiguration['enforceTimeLimit'];
+            }
+
+            if (isset($phpunitConfiguration['verbose']) &&
+                !isset($arguments['verbose'])) {
+                $arguments['verbose'] = $phpunitConfiguration['verbose'];
+            }
+
+            if (isset($phpunitConfiguration['forceCoversAnnotation']) &&
+                !isset($arguments['forceCoversAnnotation'])) {
+                $arguments['forceCoversAnnotation'] = $phpunitConfiguration['forceCoversAnnotation'];
+            }
+
+            if (isset($phpunitConfiguration['mapTestClassNameToCoveredClassName']) &&
+                !isset($arguments['mapTestClassNameToCoveredClassName'])) {
+                $arguments['mapTestClassNameToCoveredClassName'] = $phpunitConfiguration['mapTestClassNameToCoveredClassName'];
+            }
+
+            $groupCliArgs = array();
+            if (!empty($arguments['groups'])) {
+                $groupCliArgs = $arguments['groups'];
+            }
+
+            $groupConfiguration = $arguments['configuration']->getGroupConfiguration();
+
+            if (!empty($groupConfiguration['include']) &&
+                !isset($arguments['groups'])) {
+                $arguments['groups'] = $groupConfiguration['include'];
+            }
+
+            if (!empty($groupConfiguration['exclude']) &&
+                !isset($arguments['excludeGroups'])) {
+                $arguments['excludeGroups'] = array_diff($groupConfiguration['exclude'], $groupCliArgs);
+            }
+
+            foreach ($arguments['configuration']->getListenerConfiguration() as $listener) {
+                if (!class_exists($listener['class'], false) &&
+                    $listener['file'] !== '') {
+                    require_once $listener['file'];
+                }
+
+                if (class_exists($listener['class'])) {
+                    if (count($listener['arguments']) == 0) {
+                        $listener = new $listener['class'];
+                    } else {
+                        $listenerClass = new ReflectionClass(
+                                           $listener['class']
+                                         );
+                        $listener      = $listenerClass->newInstanceArgs(
+                                           $listener['arguments']
+                                         );
+                    }
+
+                    if ($listener instanceof PHPUnit_Framework_TestListener) {
+                        $arguments['listeners'][] = $listener;
+                    }
+                }
+            }
+
+            $loggingConfiguration = $arguments['configuration']->getLoggingConfiguration();
+
+            if (isset($loggingConfiguration['coverage-clover']) &&
+                !isset($arguments['coverageClover'])) {
+                $arguments['coverageClover'] = $loggingConfiguration['coverage-clover'];
+            }
+
+            if (isset($loggingConfiguration['coverage-crap4j']) &&
+                !isset($arguments['coverageCrap4J'])) {
+                $arguments['coverageCrap4J'] = $loggingConfiguration['coverage-crap4j'];
+            }
+
+            if (isset($loggingConfiguration['coverage-html']) &&
+                !isset($arguments['coverageHtml'])) {
+                if (isset($loggingConfiguration['lowUpperBound']) &&
+                    !isset($arguments['reportLowUpperBound'])) {
+                    $arguments['reportLowUpperBound'] = $loggingConfiguration['lowUpperBound'];
+                }
+
+                if (isset($loggingConfiguration['highLowerBound']) &&
+                    !isset($arguments['reportHighLowerBound'])) {
+                    $arguments['reportHighLowerBound'] = $loggingConfiguration['highLowerBound'];
+                }
+
+                $arguments['coverageHtml'] = $loggingConfiguration['coverage-html'];
+            }
+
+            if (isset($loggingConfiguration['coverage-php']) &&
+                !isset($arguments['coveragePHP'])) {
+                $arguments['coveragePHP'] = $loggingConfiguration['coverage-php'];
+            }
+
+            if (isset($loggingConfiguration['coverage-text']) &&
+                !isset($arguments['coverageText'])) {
+                $arguments['coverageText'] = $loggingConfiguration['coverage-text'];
+                if (isset($loggingConfiguration['coverageTextShowUncoveredFiles'])) {
+                    $arguments['coverageTextShowUncoveredFiles'] = $loggingConfiguration['coverageTextShowUncoveredFiles'];
+                } else {
+                    $arguments['coverageTextShowUncoveredFiles'] = false;
+                }
+                if (isset($loggingConfiguration['coverageTextShowOnlySummary'])) {
+                    $arguments['coverageTextShowOnlySummary'] = $loggingConfiguration['coverageTextShowOnlySummary'];
+                } else {
+                    $arguments['coverageTextShowOnlySummary'] = false;
+                }
+            }
+
+            if (isset($loggingConfiguration['coverage-xml']) &&
+                !isset($arguments['coverageXml'])) {
+                $arguments['coverageXml'] = $loggingConfiguration['coverage-xml'];
+            }
+
+            if (isset($loggingConfiguration['json']) &&
+                !isset($arguments['jsonLogfile'])) {
+                $arguments['jsonLogfile'] = $loggingConfiguration['json'];
+            }
+
+            if (isset($loggingConfiguration['plain'])) {
+                $arguments['listeners'][] = new PHPUnit_TextUI_ResultPrinter(
+                  $loggingConfiguration['plain'], true
+                );
+            }
+
+            if (isset($loggingConfiguration['tap']) &&
+                !isset($arguments['tapLogfile'])) {
+                $arguments['tapLogfile'] = $loggingConfiguration['tap'];
+            }
+
+            if (isset($loggingConfiguration['junit']) &&
+                !isset($arguments['junitLogfile'])) {
+                $arguments['junitLogfile'] = $loggingConfiguration['junit'];
+
+                if (isset($loggingConfiguration['logIncompleteSkipped']) &&
+                    !isset($arguments['logIncompleteSkipped'])) {
+                    $arguments['logIncompleteSkipped'] = $loggingConfiguration['logIncompleteSkipped'];
+                }
+            }
+
+            if (isset($loggingConfiguration['testdox-html']) &&
+                !isset($arguments['testdoxHTMLFile'])) {
+                $arguments['testdoxHTMLFile'] = $loggingConfiguration['testdox-html'];
+            }
+
+            if (isset($loggingConfiguration['testdox-text']) &&
+                !isset($arguments['testdoxTextFile'])) {
+                $arguments['testdoxTextFile'] = $loggingConfiguration['testdox-text'];
+            }
+
+            if ((isset($arguments['coverageClover']) ||
+                isset($arguments['coverageCrap4J']) ||
+                isset($arguments['coverageHtml']) ||
+                isset($arguments['coveragePHP'])) ||
+                isset($arguments['coverageText']) &&
+                $this->canCollectCodeCoverage) {
+
+                $filterConfiguration = $arguments['configuration']->getFilterConfiguration();
+                $arguments['addUncoveredFilesFromWhitelist'] = $filterConfiguration['whitelist']['addUncoveredFilesFromWhitelist'];
+                $arguments['processUncoveredFilesFromWhitelist'] = $filterConfiguration['whitelist']['processUncoveredFilesFromWhitelist'];
+
+                if (empty($filterConfiguration['whitelist']['include']['directory']) &&
+                    empty($filterConfiguration['whitelist']['include']['file'])) {
+                    if (defined('__PHPUNIT_PHAR__')) {
+                        $this->codeCoverageFilter->addFileToBlacklist(__PHPUNIT_PHAR__);
+                    }
+
+                    $blacklist = new PHPUnit_Util_Blacklist;
+
+                    foreach ($blacklist->getBlacklistedDirectories() as $directory) {
+                        $this->codeCoverageFilter->addDirectoryToBlacklist($directory);
+                    }
+
+                    foreach ($filterConfiguration['blacklist']['include']['directory'] as $dir) {
+                        $this->codeCoverageFilter->addDirectoryToBlacklist(
+                            $dir['path'], $dir['suffix'], $dir['prefix'], $dir['group']
+                        );
+                    }
+
+                    foreach ($filterConfiguration['blacklist']['include']['file'] as $file) {
+                        $this->codeCoverageFilter->addFileToBlacklist($file);
+                    }
+
+                    foreach ($filterConfiguration['blacklist']['exclude']['directory'] as $dir) {
+                        $this->codeCoverageFilter->removeDirectoryFromBlacklist(
+                            $dir['path'], $dir['suffix'], $dir['prefix'], $dir['group']
+                        );
+                    }
+
+                    foreach ($filterConfiguration['blacklist']['exclude']['file'] as $file) {
+                        $this->codeCoverageFilter->removeFileFromBlacklist($file);
+                    }
+                }
+
+                foreach ($filterConfiguration['whitelist']['include']['directory'] as $dir) {
+                    $this->codeCoverageFilter->addDirectoryToWhitelist(
+                      $dir['path'], $dir['suffix'], $dir['prefix']
+                    );
+                }
+
+                foreach ($filterConfiguration['whitelist']['include']['file'] as $file) {
+                    $this->codeCoverageFilter->addFileToWhitelist($file);
+                }
+
+                foreach ($filterConfiguration['whitelist']['exclude']['directory'] as $dir) {
+                    $this->codeCoverageFilter->removeDirectoryFromWhitelist(
+                      $dir['path'], $dir['suffix'], $dir['prefix']
+                    );
+                }
+
+                foreach ($filterConfiguration['whitelist']['exclude']['file'] as $file) {
+                    $this->codeCoverageFilter->removeFileFromWhitelist($file);
+                }
+            }
+        }
+
+        $arguments['addUncoveredFilesFromWhitelist']     = isset($arguments['addUncoveredFilesFromWhitelist'])     ? $arguments['addUncoveredFilesFromWhitelist']     : true;
+        $arguments['processUncoveredFilesFromWhitelist'] = isset($arguments['processUncoveredFilesFromWhitelist']) ? $arguments['processUncoveredFilesFromWhitelist'] : false;
+        $arguments['backupGlobals']                      = isset($arguments['backupGlobals'])                      ? $arguments['backupGlobals']                      : null;
+        $arguments['backupStaticAttributes']             = isset($arguments['backupStaticAttributes'])             ? $arguments['backupStaticAttributes']             : null;
+        $arguments['cacheTokens']                        = isset($arguments['cacheTokens'])                        ? $arguments['cacheTokens']                        : false;
+        $arguments['colors']                             = isset($arguments['colors'])                             ? $arguments['colors']                             : false;
+        $arguments['convertErrorsToExceptions']          = isset($arguments['convertErrorsToExceptions'])          ? $arguments['convertErrorsToExceptions']          : true;
+        $arguments['convertNoticesToExceptions']         = isset($arguments['convertNoticesToExceptions'])         ? $arguments['convertNoticesToExceptions']         : true;
+        $arguments['convertWarningsToExceptions']        = isset($arguments['convertWarningsToExceptions'])        ? $arguments['convertWarningsToExceptions']        : true;
+        $arguments['excludeGroups']                      = isset($arguments['excludeGroups'])                      ? $arguments['excludeGroups']                      : array();
+        $arguments['groups']                             = isset($arguments['groups'])                             ? $arguments['groups']                             : array();
+        $arguments['logIncompleteSkipped']               = isset($arguments['logIncompleteSkipped'])               ? $arguments['logIncompleteSkipped']               : false;
+        $arguments['processIsolation']                   = isset($arguments['processIsolation'])                   ? $arguments['processIsolation']                   : false;
+        $arguments['repeat']                             = isset($arguments['repeat'])                             ? $arguments['repeat']                             : false;
+        $arguments['reportHighLowerBound']               = isset($arguments['reportHighLowerBound'])               ? $arguments['reportHighLowerBound']               : 90;
+        $arguments['reportLowUpperBound']                = isset($arguments['reportLowUpperBound'])                ? $arguments['reportLowUpperBound']                : 50;
+        $arguments['stopOnError']                        = isset($arguments['stopOnError'])                        ? $arguments['stopOnError']                        : false;
+        $arguments['stopOnFailure']                      = isset($arguments['stopOnFailure'])                      ? $arguments['stopOnFailure']                      : false;
+        $arguments['stopOnIncomplete']                   = isset($arguments['stopOnIncomplete'])                   ? $arguments['stopOnIncomplete']                   : false;
+        $arguments['stopOnRisky']                        = isset($arguments['stopOnRisky'])                        ? $arguments['stopOnRisky']                        : false;
+        $arguments['stopOnSkipped']                      = isset($arguments['stopOnSkipped'])                      ? $arguments['stopOnSkipped']                      : false;
+        $arguments['timeoutForSmallTests']               = isset($arguments['timeoutForSmallTests'])               ? $arguments['timeoutForSmallTests']               : 1;
+        $arguments['timeoutForMediumTests']              = isset($arguments['timeoutForMediumTests'])              ? $arguments['timeoutForMediumTests']              : 10;
+        $arguments['timeoutForLargeTests']               = isset($arguments['timeoutForLargeTests'])               ? $arguments['timeoutForLargeTests']               : 60;
+        $arguments['reportUselessTests']                 = isset($arguments['reportUselessTests'])                 ? $arguments['reportUselessTests']                 : false;
+        $arguments['strictCoverage']                     = isset($arguments['strictCoverage'])                     ? $arguments['strictCoverage']                     : false;
+        $arguments['disallowTestOutput']                 = isset($arguments['disallowTestOutput'])                 ? $arguments['disallowTestOutput']                 : false;
+        $arguments['enforceTimeLimit']                   = isset($arguments['enforceTimeLimit'])                   ? $arguments['enforceTimeLimit']                   : false;
+        $arguments['verbose']                            = isset($arguments['verbose'])                            ? $arguments['verbose']                            : false;
+    }
+
+    /**
+     * @param string $message
+     * @since Method available since Release 4.0.0
+     */
+    private function showExtensionNotLoadedMessage($extension, $message = '')
+    {
+        if (isset($this->missingExtensions[$extension])) {
+            return;
+        }
+
+        if (!empty($message)) {
+            $message = ' ' . $message;
+        }
+
+        $this->showMessage(
+          'The ' . $extension . ' extension is not loaded.' . $message . "\n"
+        );
+
+        $this->missingExtensions[$extension] = true;
+    }
+
+    /**
+     * Shows a message.
+     *
+     * @param string  $message
+     * @param boolean $exit
+     * @since Method available since Release 4.0.0
+     */
+    private function showMessage($message, $exit = false)
+    {
+        $this->printVersionString();
+        $this->write($message . "\n");
+
+        if ($exit) {
+            exit(self::EXCEPTION_EXIT);
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/Blacklist.php b/vendor/phpunit/phpunit/src/Util/Blacklist.php
new file mode 100644
index 00000000..d767d81b
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/Blacklist.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * Utility class for blacklisting PHPUnit's own source code files.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Util_Blacklist
+{
+    /**
+     * @var array
+     */
+    public static $blacklistedClassNames = array(
+        'File_Iterator' => 1,
+        'PHP_CodeCoverage' => 1,
+        'PHP_Invoker' => 1,
+        'PHP_Timer' => 1,
+        'PHP_Token' => 1,
+        'PHPUnit_Framework_TestCase' => 2,
+        'PHPUnit_Extensions_Database_TestCase' => 2,
+        'PHPUnit_Framework_MockObject_Generator' => 2,
+        'PHPUnit_Extensions_SeleniumTestCase' => 2,
+        'PHPUnit_Extensions_Story_TestCase' => 2,
+        'Text_Template' => 1,
+        'Symfony\Component\Yaml\Yaml' => 1,
+        'SebastianBergmann\Diff\Diff' => 1,
+        'SebastianBergmann\Environment\Runtime' => 1,
+        'SebastianBergmann\Comparator\Comparator' => 1,
+        'SebastianBergmann\Exporter\Exporter' => 1,
+        'SebastianBergmann\Version' => 1,
+        'Composer\Autoload\ClassLoader' => 1
+    );
+
+    /**
+     * @var array
+     */
+    private static $directories;
+
+    /**
+     * @return array
+     * @since  Method available since Release 4.1.0
+     */
+    public function getBlacklistedDirectories()
+    {
+        $this->initialize();
+
+        return self::$directories;
+    }
+
+    /**
+     * @param  string  $file
+     * @return boolean
+     */
+    public function isBlacklisted($file)
+    {
+        if (defined('PHPUNIT_TESTSUITE')) {
+            return false;
+        }
+
+        $this->initialize();
+
+        foreach (self::$directories as $directory) {
+            if (strpos($file, $directory) === 0) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private function initialize()
+    {
+        if (self::$directories === null) {
+            self::$directories = array();
+
+            foreach (self::$blacklistedClassNames as $className => $parent) {
+                if (!class_exists($className)) {
+                    continue;
+                }
+
+                $reflector = new ReflectionClass($className);
+                $directory = $reflector->getFileName();
+
+                for ($i = 0; $i < $parent; $i++) {
+                    $directory = dirname($directory);
+                }
+
+                self::$directories[] = $directory;
+            }
+
+            // Hide process isolation workaround on Windows.
+            // @see PHPUnit_Util_PHP::factory()
+            // @see PHPUnit_Util_PHP_Windows::process()
+            if (DIRECTORY_SEPARATOR === '\\') {
+                // tempnam() prefix is limited to first 3 chars.
+                // @see http://php.net/manual/en/function.tempnam.php
+                self::$directories[] = sys_get_temp_dir() . '\\PHP';
+            }
+       }
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/Configuration.php b/vendor/phpunit/phpunit/src/Util/Configuration.php
new file mode 100644
index 00000000..6cbe4727
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/Configuration.php
@@ -0,0 +1,1102 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.2.0
+ */
+
+/**
+ * Wrapper for the PHPUnit XML configuration file.
+ *
+ * Example XML configuration file:
+ * <code>
+ * <?xml version="1.0" encoding="utf-8" ?>
+ *
+ * <phpunit backupGlobals="true"
+ *          backupStaticAttributes="false"
+ *          bootstrap="/path/to/bootstrap.php"
+ *          cacheTokens="false"
+ *          colors="false"
+ *          stderr="false"
+ *          convertErrorsToExceptions="true"
+ *          convertNoticesToExceptions="true"
+ *          convertWarningsToExceptions="true"
+ *          forceCoversAnnotation="false"
+ *          mapTestClassNameToCoveredClassName="false"
+ *          printerClass="PHPUnit_TextUI_ResultPrinter"
+ *          processIsolation="false"
+ *          stopOnError="false"
+ *          stopOnFailure="false"
+ *          stopOnIncomplete="false"
+ *          stopOnRisky="false"
+ *          stopOnSkipped="false"
+ *          testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader"
+ *          timeoutForSmallTests="1"
+ *          timeoutForMediumTests="10"
+ *          timeoutForLargeTests="60"
+ *          beStrictAboutTestsThatDoNotTestAnything="false"
+ *          beStrictAboutOutputDuringTests="false"
+ *          beStrictAboutTestSize="false"
+ *          checkForUnintentionallyCoveredCode="false"
+ *          verbose="false">
+ *   <testsuites>
+ *     <testsuite name="My Test Suite">
+ *       <directory suffix="Test.php" phpVersion="5.3.0" phpVersionOperator=">=">/path/to/files</directory>
+ *       <file phpVersion="5.3.0" phpVersionOperator=">=">/path/to/MyTest.php</file>
+ *       <exclude>/path/to/files/exclude</exclude>
+ *     </testsuite>
+ *   </testsuites>
+ *
+ *   <groups>
+ *     <include>
+ *       <group>name</group>
+ *     </include>
+ *     <exclude>
+ *       <group>name</group>
+ *     </exclude>
+ *   </groups>
+ *
+ *   <filter>
+ *     <blacklist>
+ *       <directory suffix=".php">/path/to/files</directory>
+ *       <file>/path/to/file</file>
+ *       <exclude>
+ *         <directory suffix=".php">/path/to/files</directory>
+ *         <file>/path/to/file</file>
+ *       </exclude>
+ *     </blacklist>
+ *     <whitelist addUncoveredFilesFromWhitelist="true"
+ *                processUncoveredFilesFromWhitelist="false">
+ *       <directory suffix=".php">/path/to/files</directory>
+ *       <file>/path/to/file</file>
+ *       <exclude>
+ *         <directory suffix=".php">/path/to/files</directory>
+ *         <file>/path/to/file</file>
+ *       </exclude>
+ *     </whitelist>
+ *   </filter>
+ *
+ *   <listeners>
+ *     <listener class="MyListener" file="/optional/path/to/MyListener.php">
+ *       <arguments>
+ *         <array>
+ *           <element key="0">
+ *             <string>Sebastian</string>
+ *           </element>
+ *         </array>
+ *         <integer>22</integer>
+ *         <string>April</string>
+ *         <double>19.78</double>
+ *         <null/>
+ *         <object class="stdClass"/>
+ *         <file>MyRelativeFile.php</file>
+ *         <directory>MyRelativeDir</directory>
+ *       </arguments>
+ *     </listener>
+ *   </listeners>
+ *
+ *   <logging>
+ *     <log type="coverage-html" target="/tmp/report" lowUpperBound="50" highLowerBound="90"/>
+ *     <log type="coverage-clover" target="/tmp/clover.xml"/>
+ *     <log type="json" target="/tmp/logfile.json"/>
+ *     <log type="plain" target="/tmp/logfile.txt"/>
+ *     <log type="tap" target="/tmp/logfile.tap"/>
+ *     <log type="junit" target="/tmp/logfile.xml" logIncompleteSkipped="false"/>
+ *     <log type="testdox-html" target="/tmp/testdox.html"/>
+ *     <log type="testdox-text" target="/tmp/testdox.txt"/>
+ *     <log type="coverage-crap4j" target="/tmp/crap.xml"/>
+ *   </logging>
+ *
+ *   <php>
+ *     <includePath>.</includePath>
+ *     <ini name="foo" value="bar"/>
+ *     <const name="foo" value="bar"/>
+ *     <var name="foo" value="bar"/>
+ *     <env name="foo" value="bar"/>
+ *     <post name="foo" value="bar"/>
+ *     <get name="foo" value="bar"/>
+ *     <cookie name="foo" value="bar"/>
+ *     <server name="foo" value="bar"/>
+ *     <files name="foo" value="bar"/>
+ *     <request name="foo" value="bar"/>
+ *   </php>
+ *
+ *   <selenium>
+ *     <browser name="Firefox on Linux"
+ *              browser="*firefox /usr/lib/firefox/firefox-bin"
+ *              host="my.linux.box"
+ *              port="4444"
+ *              timeout="30000"/>
+ *   </selenium>
+ * </phpunit>
+ * </code>
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.2.0
+ */
+class PHPUnit_Util_Configuration
+{
+    private static $instances = array();
+
+    protected $document;
+    protected $xpath;
+    protected $filename;
+
+    /**
+     * Loads a PHPUnit configuration file.
+     *
+     * @param string $filename
+     */
+    protected function __construct($filename)
+    {
+        $this->filename = $filename;
+        $this->document = PHPUnit_Util_XML::loadFile($filename, false, true, true);
+        $this->xpath    = new DOMXPath($this->document);
+    }
+
+    /**
+     * @since  Method available since Release 3.4.0
+     */
+    final private function __clone()
+    {
+    }
+
+    /**
+     * Returns a PHPUnit configuration object.
+     *
+     * @param  string                     $filename
+     * @return PHPUnit_Util_Configuration
+     * @since  Method available since Release 3.4.0
+     */
+    public static function getInstance($filename)
+    {
+        $realpath = realpath($filename);
+
+        if ($realpath === false) {
+            throw new PHPUnit_Framework_Exception(
+              sprintf(
+                'Could not read "%s".',
+                $filename
+              )
+            );
+        }
+
+        if (!isset(self::$instances[$realpath])) {
+            self::$instances[$realpath] = new PHPUnit_Util_Configuration($realpath);
+        }
+
+        return self::$instances[$realpath];
+    }
+
+    /**
+     * Returns the realpath to the configuration file.
+     *
+     * @return string
+     * @since  Method available since Release 3.6.0
+     */
+    public function getFilename()
+    {
+        return $this->filename;
+    }
+
+    /**
+     * Returns the configuration for SUT filtering.
+     *
+     * @return array
+     * @since  Method available since Release 3.2.1
+     */
+    public function getFilterConfiguration()
+    {
+        $addUncoveredFilesFromWhitelist     = true;
+        $processUncoveredFilesFromWhitelist = false;
+
+        $tmp = $this->xpath->query('filter/whitelist');
+
+        if ($tmp->length == 1) {
+            if ($tmp->item(0)->hasAttribute('addUncoveredFilesFromWhitelist')) {
+                $addUncoveredFilesFromWhitelist = $this->getBoolean(
+                  (string) $tmp->item(0)->getAttribute(
+                    'addUncoveredFilesFromWhitelist'
+                  ),
+                  true
+                );
+            }
+
+            if ($tmp->item(0)->hasAttribute('processUncoveredFilesFromWhitelist')) {
+                $processUncoveredFilesFromWhitelist = $this->getBoolean(
+                  (string) $tmp->item(0)->getAttribute(
+                    'processUncoveredFilesFromWhitelist'
+                  ),
+                  false
+                );
+            }
+        }
+
+        return array(
+          'blacklist' => array(
+            'include' => array(
+              'directory' => $this->readFilterDirectories(
+                'filter/blacklist/directory'
+              ),
+              'file' => $this->readFilterFiles(
+                'filter/blacklist/file'
+              )
+            ),
+            'exclude' => array(
+              'directory' => $this->readFilterDirectories(
+                'filter/blacklist/exclude/directory'
+               ),
+              'file' => $this->readFilterFiles(
+                'filter/blacklist/exclude/file'
+              )
+            )
+          ),
+          'whitelist' => array(
+            'addUncoveredFilesFromWhitelist' => $addUncoveredFilesFromWhitelist,
+            'processUncoveredFilesFromWhitelist' => $processUncoveredFilesFromWhitelist,
+            'include' => array(
+              'directory' => $this->readFilterDirectories(
+                'filter/whitelist/directory'
+              ),
+              'file' => $this->readFilterFiles(
+                'filter/whitelist/file'
+              )
+            ),
+            'exclude' => array(
+              'directory' => $this->readFilterDirectories(
+                'filter/whitelist/exclude/directory'
+              ),
+              'file' => $this->readFilterFiles(
+                'filter/whitelist/exclude/file'
+              )
+            )
+          )
+        );
+    }
+
+    /**
+     * Returns the configuration for groups.
+     *
+     * @return array
+     * @since  Method available since Release 3.2.1
+     */
+    public function getGroupConfiguration()
+    {
+        $groups = array(
+          'include' => array(),
+          'exclude' => array()
+        );
+
+        foreach ($this->xpath->query('groups/include/group') as $group) {
+            $groups['include'][] = (string) $group->nodeValue;
+        }
+
+        foreach ($this->xpath->query('groups/exclude/group') as $group) {
+            $groups['exclude'][] = (string) $group->nodeValue;
+        }
+
+        return $groups;
+    }
+
+    /**
+     * Returns the configuration for listeners.
+     *
+     * @return array
+     * @since  Method available since Release 3.4.0
+     */
+    public function getListenerConfiguration()
+    {
+        $result = array();
+
+        foreach ($this->xpath->query('listeners/listener') as $listener) {
+            $class     = (string) $listener->getAttribute('class');
+            $file      = '';
+            $arguments = array();
+
+            if ($listener->getAttribute('file')) {
+                $file = $this->toAbsolutePath(
+                  (string) $listener->getAttribute('file'), true
+                );
+            }
+
+            foreach ($listener->childNodes as $node) {
+              if ($node instanceof DOMElement && $node->tagName == 'arguments') {
+                foreach ($node->childNodes as $argument) {
+                    if ($argument instanceof DOMElement) {
+                        if ($argument->tagName == 'file' ||
+                            $argument->tagName == 'directory') {
+                            $arguments[] = $this->toAbsolutePath((string) $argument->nodeValue);
+                        } else {
+                            $arguments[] = PHPUnit_Util_XML::xmlToVariable($argument);
+                        }
+                    }
+                }
+              }
+            }
+
+            $result[] = array(
+              'class'     => $class,
+              'file'      => $file,
+              'arguments' => $arguments
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the logging configuration.
+     *
+     * @return array
+     */
+    public function getLoggingConfiguration()
+    {
+        $result = array();
+
+        foreach ($this->xpath->query('logging/log') as $log) {
+            $type = (string) $log->getAttribute('type');
+            $target = (string) $log->getAttribute('target');
+
+            if (!$target) {
+                continue;
+            }
+
+            $target = $this->toAbsolutePath($target);
+
+            if ($type == 'coverage-html') {
+                if ($log->hasAttribute('lowUpperBound')) {
+                    $result['lowUpperBound'] = (string) $log->getAttribute('lowUpperBound');
+                }
+
+                if ($log->hasAttribute('highLowerBound')) {
+                    $result['highLowerBound'] = (string) $log->getAttribute('highLowerBound');
+                }
+            } elseif ($type == 'junit') {
+                if ($log->hasAttribute('logIncompleteSkipped')) {
+                    $result['logIncompleteSkipped'] = $this->getBoolean(
+                      (string) $log->getAttribute('logIncompleteSkipped'),
+                      false
+                    );
+                }
+            } elseif ($type == 'coverage-text') {
+                if ($log->hasAttribute('showUncoveredFiles')) {
+                    $result['coverageTextShowUncoveredFiles'] = $this->getBoolean(
+                      (string) $log->getAttribute('showUncoveredFiles'),
+                      false
+                    );
+                }
+                if ($log->hasAttribute('showOnlySummary')) {
+                    $result['coverageTextShowOnlySummary'] = $this->getBoolean(
+                      (string) $log->getAttribute('showOnlySummary'),
+                      false
+                    );
+                }
+            }
+
+            $result[$type] = $target;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the PHP configuration.
+     *
+     * @return array
+     * @since  Method available since Release 3.2.1
+     */
+    public function getPHPConfiguration()
+    {
+        $result = array(
+          'include_path' => array(),
+          'ini'          => array(),
+          'const'        => array(),
+          'var'          => array(),
+          'env'          => array(),
+          'post'         => array(),
+          'get'          => array(),
+          'cookie'       => array(),
+          'server'       => array(),
+          'files'        => array(),
+          'request'      => array()
+        );
+
+        foreach ($this->xpath->query('php/includePath') as $includePath) {
+            $path = (string) $includePath->nodeValue;
+            if ($path) {
+                $result['include_path'][] = $this->toAbsolutePath($path);
+            }
+        }
+
+        foreach ($this->xpath->query('php/ini') as $ini) {
+            $name  = (string) $ini->getAttribute('name');
+            $value = (string) $ini->getAttribute('value');
+
+            $result['ini'][$name] = $value;
+        }
+
+        foreach ($this->xpath->query('php/const') as $const) {
+            $name  = (string) $const->getAttribute('name');
+            $value = (string) $const->getAttribute('value');
+
+            $result['const'][$name] = $this->getBoolean($value, $value);
+        }
+
+        foreach (array('var', 'env', 'post', 'get', 'cookie', 'server', 'files', 'request') as $array) {
+            foreach ($this->xpath->query('php/' . $array) as $var) {
+                $name  = (string) $var->getAttribute('name');
+                $value = (string) $var->getAttribute('value');
+
+                $result[$array][$name] = $this->getBoolean($value, $value);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Handles the PHP configuration.
+     *
+     * @since  Method available since Release 3.2.20
+     */
+    public function handlePHPConfiguration()
+    {
+        $configuration = $this->getPHPConfiguration();
+
+        if (! empty($configuration['include_path'])) {
+            ini_set(
+              'include_path',
+              implode(PATH_SEPARATOR, $configuration['include_path']) .
+              PATH_SEPARATOR .
+              ini_get('include_path')
+            );
+        }
+
+        foreach ($configuration['ini'] as $name => $value) {
+            if (defined($value)) {
+                $value = constant($value);
+            }
+
+            ini_set($name, $value);
+        }
+
+        foreach ($configuration['const'] as $name => $value) {
+            if (!defined($name)) {
+                define($name, $value);
+            }
+        }
+
+        foreach (array('var', 'post', 'get', 'cookie', 'server', 'files', 'request') as $array) {
+            // See https://github.com/sebastianbergmann/phpunit/issues/277
+            switch ($array) {
+                case 'var':
+                    $target = &$GLOBALS;
+                    break;
+
+                case 'server':
+                    $target = &$_SERVER;
+                    break;
+
+                default:
+                    $target = &$GLOBALS['_' . strtoupper($array)];
+                    break;
+            }
+
+            foreach ($configuration[$array] as $name => $value) {
+                $target[$name] = $value;
+            }
+        }
+
+        foreach ($configuration['env'] as $name => $value) {
+            if (false === getenv($name)) {
+                putenv("{$name}={$value}");
+            }
+            if (!isset($_ENV[$name])) {
+                $_ENV[$name] = $value;
+            }
+        }
+    }
+
+    /**
+     * Returns the PHPUnit configuration.
+     *
+     * @return array
+     * @since  Method available since Release 3.2.14
+     */
+    public function getPHPUnitConfiguration()
+    {
+        $result = array();
+        $root   = $this->document->documentElement;
+
+        if ($root->hasAttribute('cacheTokens')) {
+            $result['cacheTokens'] = $this->getBoolean(
+              (string) $root->getAttribute('cacheTokens'), false
+            );
+        }
+
+        if ($root->hasAttribute('colors')) {
+            $result['colors'] = $this->getBoolean(
+              (string) $root->getAttribute('colors'), false
+            );
+        }
+
+        /**
+         * Issue #657
+         */
+        if ($root->hasAttribute('stderr')) {
+            $result['stderr'] = $this->getBoolean(
+              (string)$root->getAttribute('stderr'), FALSE
+            );
+        }
+
+        if ($root->hasAttribute('backupGlobals')) {
+            $result['backupGlobals'] = $this->getBoolean(
+              (string) $root->getAttribute('backupGlobals'), true
+            );
+        }
+
+        if ($root->hasAttribute('backupStaticAttributes')) {
+            $result['backupStaticAttributes'] = $this->getBoolean(
+              (string) $root->getAttribute('backupStaticAttributes'), false
+            );
+        }
+
+        if ($root->getAttribute('bootstrap')) {
+            $result['bootstrap'] = $this->toAbsolutePath(
+              (string) $root->getAttribute('bootstrap')
+            );
+        }
+
+        if ($root->hasAttribute('convertErrorsToExceptions')) {
+            $result['convertErrorsToExceptions'] = $this->getBoolean(
+              (string) $root->getAttribute('convertErrorsToExceptions'), true
+            );
+        }
+
+        if ($root->hasAttribute('convertNoticesToExceptions')) {
+            $result['convertNoticesToExceptions'] = $this->getBoolean(
+              (string) $root->getAttribute('convertNoticesToExceptions'), true
+            );
+        }
+
+        if ($root->hasAttribute('convertWarningsToExceptions')) {
+            $result['convertWarningsToExceptions'] = $this->getBoolean(
+              (string) $root->getAttribute('convertWarningsToExceptions'), true
+            );
+        }
+
+        if ($root->hasAttribute('forceCoversAnnotation')) {
+            $result['forceCoversAnnotation'] = $this->getBoolean(
+              (string) $root->getAttribute('forceCoversAnnotation'), false
+            );
+        }
+
+        if ($root->hasAttribute('mapTestClassNameToCoveredClassName')) {
+            $result['mapTestClassNameToCoveredClassName'] = $this->getBoolean(
+              (string) $root->getAttribute('mapTestClassNameToCoveredClassName'),
+              false
+            );
+        }
+
+        if ($root->hasAttribute('processIsolation')) {
+            $result['processIsolation'] = $this->getBoolean(
+              (string) $root->getAttribute('processIsolation'), false
+            );
+        }
+
+        if ($root->hasAttribute('stopOnError')) {
+            $result['stopOnError'] = $this->getBoolean(
+              (string) $root->getAttribute('stopOnError'), false
+            );
+        }
+
+        if ($root->hasAttribute('stopOnFailure')) {
+            $result['stopOnFailure'] = $this->getBoolean(
+              (string) $root->getAttribute('stopOnFailure'), false
+            );
+        }
+
+        if ($root->hasAttribute('stopOnIncomplete')) {
+            $result['stopOnIncomplete'] = $this->getBoolean(
+              (string) $root->getAttribute('stopOnIncomplete'), false
+            );
+        }
+
+        if ($root->hasAttribute('stopOnRisky')) {
+            $result['stopOnRisky'] = $this->getBoolean(
+              (string) $root->getAttribute('stopOnRisky'), false
+            );
+        }
+
+        if ($root->hasAttribute('stopOnSkipped')) {
+            $result['stopOnSkipped'] = $this->getBoolean(
+              (string) $root->getAttribute('stopOnSkipped'), false
+            );
+        }
+
+        if ($root->hasAttribute('testSuiteLoaderClass')) {
+            $result['testSuiteLoaderClass'] = (string) $root->getAttribute(
+              'testSuiteLoaderClass'
+            );
+        }
+
+        if ($root->getAttribute('testSuiteLoaderFile')) {
+            $result['testSuiteLoaderFile'] = $this->toAbsolutePath(
+              (string) $root->getAttribute('testSuiteLoaderFile')
+            );
+        }
+
+        if ($root->hasAttribute('printerClass')) {
+            $result['printerClass'] = (string) $root->getAttribute(
+              'printerClass'
+            );
+        }
+
+        if ($root->getAttribute('printerFile')) {
+            $result['printerFile'] = $this->toAbsolutePath(
+              (string) $root->getAttribute('printerFile')
+            );
+        }
+
+        if ($root->hasAttribute('timeoutForSmallTests')) {
+            $result['timeoutForSmallTests'] = $this->getInteger(
+              (string) $root->getAttribute('timeoutForSmallTests'), 1
+            );
+        }
+
+        if ($root->hasAttribute('timeoutForMediumTests')) {
+            $result['timeoutForMediumTests'] = $this->getInteger(
+              (string) $root->getAttribute('timeoutForMediumTests'), 10
+            );
+        }
+
+        if ($root->hasAttribute('timeoutForLargeTests')) {
+            $result['timeoutForLargeTests'] = $this->getInteger(
+              (string) $root->getAttribute('timeoutForLargeTests'), 60
+            );
+        }
+
+        if ($root->hasAttribute('beStrictAboutTestsThatDoNotTestAnything')) {
+            $result['reportUselessTests'] = $this->getBoolean(
+                (string) $root->getAttribute('beStrictAboutTestsThatDoNotTestAnything'), false
+            );
+        }
+
+        if ($root->hasAttribute('checkForUnintentionallyCoveredCode')) {
+            $result['strictCoverage'] = $this->getBoolean(
+                (string) $root->getAttribute('checkForUnintentionallyCoveredCode'), false
+            );
+        }
+
+        if ($root->hasAttribute('beStrictAboutOutputDuringTests')) {
+            $result['disallowTestOutput'] = $this->getBoolean(
+                (string) $root->getAttribute('beStrictAboutOutputDuringTests'), false
+            );
+        }
+
+        if ($root->hasAttribute('beStrictAboutTestSize')) {
+            $result['enforceTimeLimit'] = $this->getBoolean(
+                (string) $root->getAttribute('beStrictAboutTestSize'), false
+            );
+        }
+
+        if ($root->hasAttribute('strict')) {
+            $flag = $this->getBoolean(
+                (string) $root->getAttribute('strict'), false
+            );
+
+            $result['reportUselessTests'] = $flag;
+            $result['strictCoverage']     = $flag;
+            $result['disallowTestOutput'] = $flag;
+            $result['enforceTimeLimit']   = $flag;
+        }
+
+        if ($root->hasAttribute('verbose')) {
+            $result['verbose'] = $this->getBoolean(
+              (string) $root->getAttribute('verbose'), false
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the SeleniumTestCase browser configuration.
+     *
+     * @return array
+     * @since  Method available since Release 3.2.9
+     */
+    public function getSeleniumBrowserConfiguration()
+    {
+        $result = array();
+
+        foreach ($this->xpath->query('selenium/browser') as $config) {
+            $name    = (string) $config->getAttribute('name');
+            $browser = (string) $config->getAttribute('browser');
+
+            if ($config->hasAttribute('host')) {
+                $host = (string) $config->getAttribute('host');
+            } else {
+                $host = 'localhost';
+            }
+
+            if ($config->hasAttribute('port')) {
+                $port = $this->getInteger(
+                  (string) $config->getAttribute('port'), 4444
+                );
+            } else {
+                $port = 4444;
+            }
+
+            if ($config->hasAttribute('timeout')) {
+                $timeout = $this->getInteger(
+                  (string) $config->getAttribute('timeout'), 30000
+                );
+            } else {
+                $timeout = 30000;
+            }
+
+            $result[] = array(
+              'name'    => $name,
+              'browser' => $browser,
+              'host'    => $host,
+              'port'    => $port,
+              'timeout' => $timeout
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the test suite configuration.
+     *
+     * @return PHPUnit_Framework_TestSuite
+     * @since  Method available since Release 3.2.1
+     */
+    public function getTestSuiteConfiguration($testSuiteFilter=null)
+    {
+        $testSuiteNodes = $this->xpath->query('testsuites/testsuite');
+
+        if ($testSuiteNodes->length == 0) {
+            $testSuiteNodes = $this->xpath->query('testsuite');
+        }
+
+        if ($testSuiteNodes->length == 1) {
+            return $this->getTestSuite($testSuiteNodes->item(0), $testSuiteFilter);
+        }
+
+        if ($testSuiteNodes->length > 1) {
+            $suite = new PHPUnit_Framework_TestSuite;
+
+            foreach ($testSuiteNodes as $testSuiteNode) {
+                $suite->addTestSuite(
+                  $this->getTestSuite($testSuiteNode, $testSuiteFilter)
+                );
+            }
+
+            return $suite;
+        }
+    }
+
+    /**
+     * @param  DOMElement                  $testSuiteNode
+     * @return PHPUnit_Framework_TestSuite
+     * @since  Method available since Release 3.4.0
+     */
+    protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter=null)
+    {
+        if ($testSuiteNode->hasAttribute('name')) {
+            $suite = new PHPUnit_Framework_TestSuite(
+              (string) $testSuiteNode->getAttribute('name')
+            );
+        } else {
+            $suite = new PHPUnit_Framework_TestSuite;
+        }
+
+        $exclude = array();
+
+        foreach ($testSuiteNode->getElementsByTagName('exclude') as $excludeNode) {
+            $excludeFile = (string) $excludeNode->nodeValue;
+            if ($excludeFile) {
+                $exclude[] = $this->toAbsolutePath($excludeFile);
+            }
+        }
+
+        $fileIteratorFacade = new File_Iterator_Facade;
+
+        foreach ($testSuiteNode->getElementsByTagName('directory') as $directoryNode) {
+            if ($testSuiteFilter && $directoryNode->parentNode->getAttribute('name') != $testSuiteFilter) {
+                continue;
+            }
+
+            $directory = (string) $directoryNode->nodeValue;
+
+            if (empty($directory)) {
+                continue;
+            }
+
+            if ($directoryNode->hasAttribute('phpVersion')) {
+                $phpVersion = (string) $directoryNode->getAttribute('phpVersion');
+            } else {
+                $phpVersion = PHP_VERSION;
+            }
+
+            if ($directoryNode->hasAttribute('phpVersionOperator')) {
+                $phpVersionOperator = (string) $directoryNode->getAttribute('phpVersionOperator');
+            } else {
+                $phpVersionOperator = '>=';
+            }
+
+            if (!version_compare(PHP_VERSION, $phpVersion, $phpVersionOperator)) {
+                continue;
+            }
+
+            if ($directoryNode->hasAttribute('prefix')) {
+                $prefix = (string) $directoryNode->getAttribute('prefix');
+            } else {
+                $prefix = '';
+            }
+
+            if ($directoryNode->hasAttribute('suffix')) {
+                $suffix = (string) $directoryNode->getAttribute('suffix');
+            } else {
+                $suffix = 'Test.php';
+            }
+
+            $files = $fileIteratorFacade->getFilesAsArray(
+              $this->toAbsolutePath($directory),
+              $suffix,
+              $prefix,
+              $exclude
+            );
+            $suite->addTestFiles($files);
+        }
+
+        foreach ($testSuiteNode->getElementsByTagName('file') as $fileNode) {
+            if ($testSuiteFilter && $fileNode->parentNode->getAttribute('name') != $testSuiteFilter) {
+                continue;
+            }
+
+            $file = (string) $fileNode->nodeValue;
+
+            if (empty($file)) {
+                continue;
+            }
+
+            // Get the absolute path to the file
+            $file = $fileIteratorFacade->getFilesAsArray(
+              $this->toAbsolutePath($file)
+            );
+
+            if (!isset($file[0])) {
+                continue;
+            }
+
+            $file = $file[0];
+
+            if ($fileNode->hasAttribute('phpVersion')) {
+                $phpVersion = (string) $fileNode->getAttribute('phpVersion');
+            } else {
+                $phpVersion = PHP_VERSION;
+            }
+
+            if ($fileNode->hasAttribute('phpVersionOperator')) {
+                $phpVersionOperator = (string) $fileNode->getAttribute('phpVersionOperator');
+            } else {
+                $phpVersionOperator = '>=';
+            }
+
+            if (!version_compare(PHP_VERSION, $phpVersion, $phpVersionOperator)) {
+                continue;
+            }
+
+            $suite->addTestFile($file);
+        }
+
+        return $suite;
+    }
+
+    /**
+     * @param  string  $value
+     * @param  boolean $default
+     * @return boolean
+     * @since  Method available since Release 3.2.3
+     */
+    protected function getBoolean($value, $default)
+    {
+        if (strtolower($value) == 'false') {
+            return false;
+        } elseif (strtolower($value) == 'true') {
+            return true;
+        }
+
+        return $default;
+    }
+
+    /**
+     * @param  string  $value
+     * @param  boolean $default
+     * @return boolean
+     * @since  Method available since Release 3.6.0
+     */
+    protected function getInteger($value, $default)
+    {
+        if (is_numeric($value)) {
+            return (int) $value;
+        }
+
+        return $default;
+    }
+
+    /**
+     * @param  string $query
+     * @return array
+     * @since  Method available since Release 3.2.3
+     */
+    protected function readFilterDirectories($query)
+    {
+        $directories = array();
+
+        foreach ($this->xpath->query($query) as $directory) {
+            $directoryPath = (string) $directory->nodeValue;
+
+            if (!$directoryPath) {
+                continue;
+            }
+
+            if ($directory->hasAttribute('prefix')) {
+                $prefix = (string) $directory->getAttribute('prefix');
+            } else {
+                $prefix = '';
+            }
+
+            if ($directory->hasAttribute('suffix')) {
+                $suffix = (string) $directory->getAttribute('suffix');
+            } else {
+                $suffix = '.php';
+            }
+
+            if ($directory->hasAttribute('group')) {
+                $group = (string) $directory->getAttribute('group');
+            } else {
+                $group = 'DEFAULT';
+            }
+
+            $directories[] = array(
+              'path'   => $this->toAbsolutePath($directoryPath),
+              'prefix' => $prefix,
+              'suffix' => $suffix,
+              'group'  => $group
+            );
+        }
+
+        return $directories;
+    }
+
+    /**
+     * @param  string $query
+     * @return array
+     * @since  Method available since Release 3.2.3
+     */
+    protected function readFilterFiles($query)
+    {
+        $files = array();
+
+        foreach ($this->xpath->query($query) as $file) {
+            $filePath = (string) $file->nodeValue;
+            if ($filePath) {
+                $files[] = $this->toAbsolutePath($filePath);
+            }
+        }
+
+        return $files;
+    }
+
+    /**
+     * @param  string  $path
+     * @param  boolean $useIncludePath
+     * @return string
+     * @since  Method available since Release 3.5.0
+     */
+    protected function toAbsolutePath($path, $useIncludePath = false)
+    {
+        if ($path[0] === '/') {
+            return $path;
+        }
+
+        // Matches the following on Windows:
+        //  - \\NetworkComputer\Path
+        //  - \\.\D:
+        //  - \\.\c:
+        //  - C:\Windows
+        //  - C:\windows
+        //  - C:/windows
+        //  - c:/windows
+        if (defined('PHP_WINDOWS_VERSION_BUILD') &&
+            ($path[0] === '\\' ||
+            (strlen($path) >= 3 && preg_match('#^[A-Z]\:[/\\\]#i', substr($path, 0, 3))))) {
+            return $path;
+        }
+
+        // Stream
+        if (strpos($path, '://') !== false) {
+            return $path;
+        }
+
+        $file = dirname($this->filename) . DIRECTORY_SEPARATOR . $path;
+
+        if ($useIncludePath && !file_exists($file)) {
+            $includePathFile = stream_resolve_include_path($path);
+
+            if ($includePathFile) {
+                $file = $includePathFile;
+            }
+        }
+
+        return $file;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/DeprecatedFeature.php b/vendor/phpunit/phpunit/src/Util/DeprecatedFeature.php
new file mode 100644
index 00000000..637feb3a
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/DeprecatedFeature.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Ralph Schindler <ralph.schindler@zend.com>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.5.7
+ */
+
+/**
+ * Class to hold the information about a deprecated feature that was used
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Ralph Schindler <ralph.schindler@zend.com>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Interface available since Release 3.5.7
+ */
+class PHPUnit_Util_DeprecatedFeature
+{
+    /**
+     * @var array
+     */
+    protected $traceInfo = array();
+
+    /**
+     * @var string
+     */
+    protected $message = null;
+
+    /**
+     * @param string $message
+     * @param array  $traceInfo
+     */
+    public function __construct($message, array $traceInfo = array())
+    {
+        $this->message   = $message;
+        $this->traceInfo = $traceInfo;
+    }
+
+    /**
+     * @return string
+     * @since  Method available since Release 4.0.0
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * @return string
+     * @since  Method available since Release 4.0.0
+     */
+    public function getSource()
+    {
+        $source = '';
+
+        if (isset($this->traceInfo['file'])) {
+            $source .= $this->traceInfo['file'];
+
+            if (isset($this->traceInfo['line'])) {
+                $source .= ':' . $this->traceInfo['line'];
+            }
+        }
+
+        return $source;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/DeprecatedFeature/Logger.php b/vendor/phpunit/phpunit/src/Util/DeprecatedFeature/Logger.php
new file mode 100644
index 00000000..d77a87a5
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/DeprecatedFeature/Logger.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Ralph Schindler <ralph.schindler@zend.com>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.5.7
+ */
+
+/**
+ * Test Listener that tracks the usage of deprecated features.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Ralph Schindler <ralph.schindler@zend.com>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.5.7
+ */
+class PHPUnit_Util_DeprecatedFeature_Logger implements PHPUnit_Framework_TestListener
+{
+    /**
+     * @var PHPUnit_Framework_TestCase
+     */
+    protected static $currentTest = null;
+
+    /**
+     * This is the publicly accessible API for notifying the system that a
+     * deprecated feature has been used.
+     *
+     * If it is run via a TestRunner and the test extends
+     * PHPUnit_Framework_TestCase, then this will inject the result into the
+     * test runner for display, if not, it will throw the notice to STDERR.
+     *
+     * @param string   $message
+     * @param int|bool $backtraceDepth
+     */
+    public static function log($message, $backtraceDepth = 2)
+    {
+        if ($backtraceDepth !== false) {
+            $trace = debug_backtrace(false);
+
+            if (is_int($backtraceDepth)) {
+                $traceItem = $trace[$backtraceDepth];
+            }
+
+            if (!isset($traceItem['file'])) {
+                $reflectionClass   = new ReflectionClass($traceItem['class']);
+                $traceItem['file'] = $reflectionClass->getFileName();
+            }
+
+            if (!isset($traceItem['line']) &&
+                 isset($traceItem['class']) &&
+                 isset($traceItem['function'])) {
+                if (!isset($reflectionClass)) {
+                    $reflectionClass = new ReflectionClass($traceItem['class']);
+                }
+
+                $method = $reflectionClass->getMethod($traceItem['function']);
+                $traceItem['line'] = $method->getStartLine() . '-' . $method->getEndLine();
+            }
+        }
+
+        $deprecatedFeature = new PHPUnit_Util_DeprecatedFeature(
+          $message, $traceItem
+        );
+
+        if (self::$currentTest instanceof PHPUnit_Framework_TestCase) {
+            $result = self::$currentTest->getTestResultObject();
+            $result->addDeprecatedFeature($deprecatedFeature);
+        } else {
+            file_put_contents('php://stderr', $deprecatedFeature);
+        }
+    }
+
+    /**
+     * An error occurred.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+    }
+
+    /**
+     * A failure occurred.
+     *
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
+     */
+    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
+    {
+    }
+
+    /**
+     * Incomplete test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+    }
+
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+    }
+
+    /**
+     * Skipped test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 3.0.0
+     */
+    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+    }
+
+    /**
+     * A test suite started.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+    }
+
+    /**
+     * A test suite ended.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+    }
+
+    /**
+     * A test started.
+     *
+     * @param PHPUnit_Framework_Test $test
+     */
+    public function startTest(PHPUnit_Framework_Test $test)
+    {
+        self::$currentTest = $test;
+    }
+
+    /**
+     * A test ended.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
+     */
+    public function endTest(PHPUnit_Framework_Test $test, $time)
+    {
+        self::$currentTest = null;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/ErrorHandler.php b/vendor/phpunit/phpunit/src/Util/ErrorHandler.php
new file mode 100644
index 00000000..c97ad095
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/ErrorHandler.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.3.0
+ */
+
+// Workaround for http://bugs.php.net/bug.php?id=47987,
+// see https://github.com/sebastianbergmann/phpunit/issues#issue/125 for details
+require_once __DIR__ . '/../Framework/Error.php';
+require_once __DIR__ . '/../Framework/Error/Notice.php';
+require_once __DIR__ . '/../Framework/Error/Warning.php';
+require_once __DIR__ . '/../Framework/Error/Deprecated.php';
+
+/**
+ * Error handler that converts PHP errors and warnings to exceptions.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.3.0
+ */
+class PHPUnit_Util_ErrorHandler
+{
+    protected static $errorStack = array();
+
+    /**
+     * Returns the error stack.
+     *
+     * @return array
+     */
+    public static function getErrorStack()
+    {
+        return self::$errorStack;
+    }
+
+    /**
+     * @param  integer                 $errno
+     * @param  string                  $errstr
+     * @param  string                  $errfile
+     * @param  integer                 $errline
+     * @throws PHPUnit_Framework_Error
+     */
+    public static function handleError($errno, $errstr, $errfile, $errline)
+    {
+        if (!($errno & error_reporting())) {
+            return false;
+        }
+
+        self::$errorStack[] = array($errno, $errstr, $errfile, $errline);
+
+        $trace = debug_backtrace(false);
+        array_shift($trace);
+
+        foreach ($trace as $frame) {
+            if ($frame['function'] == '__toString') {
+                return false;
+            }
+        }
+
+        if ($errno == E_NOTICE || $errno == E_USER_NOTICE || $errno == E_STRICT) {
+            if (PHPUnit_Framework_Error_Notice::$enabled !== true) {
+                return false;
+            }
+
+            $exception = 'PHPUnit_Framework_Error_Notice';
+        } elseif ($errno == E_WARNING || $errno == E_USER_WARNING) {
+            if (PHPUnit_Framework_Error_Warning::$enabled !== true) {
+                return false;
+            }
+
+            $exception = 'PHPUnit_Framework_Error_Warning';
+        } elseif ($errno == E_DEPRECATED || $errno == E_USER_DEPRECATED) {
+            if (PHPUnit_Framework_Error_Deprecated::$enabled !== true) {
+                return false;
+            }
+
+            $exception = 'PHPUnit_Framework_Error_Deprecated';
+        } else {
+            $exception = 'PHPUnit_Framework_Error';
+        }
+
+        throw new $exception($errstr, $errno, $errfile, $errline);
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/Fileloader.php b/vendor/phpunit/phpunit/src/Util/Fileloader.php
new file mode 100644
index 00000000..e2dcb52e
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/Fileloader.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.3.0
+ */
+
+/**
+ * Utility methods to load PHP sourcefiles.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.3.0
+ */
+class PHPUnit_Util_Fileloader
+{
+    /**
+     * Checks if a PHP sourcefile is readable.
+     * The sourcefile is loaded through the load() method.
+     *
+     * @param  string                      $filename
+     * @return string
+     * @throws PHPUnit_Framework_Exception
+     */
+    public static function checkAndLoad($filename)
+    {
+        $includePathFilename = stream_resolve_include_path($filename);
+
+        if (!$includePathFilename || !is_readable($includePathFilename)) {
+            throw new PHPUnit_Framework_Exception(
+              sprintf('Cannot open file "%s".' . "\n", $filename)
+            );
+        }
+
+        self::load($includePathFilename);
+
+        return $includePathFilename;
+    }
+
+    /**
+     * Loads a PHP sourcefile.
+     *
+     * @param  string $filename
+     * @return mixed
+     * @since  Method available since Release 3.0.0
+     */
+    public static function load($filename)
+    {
+        $oldVariableNames = array_keys(get_defined_vars());
+
+        include_once $filename;
+
+        $newVariables     = get_defined_vars();
+        $newVariableNames = array_diff(
+                              array_keys($newVariables), $oldVariableNames
+                            );
+
+        foreach ($newVariableNames as $variableName) {
+            if ($variableName != 'oldVariableNames') {
+                $GLOBALS[$variableName] = $newVariables[$variableName];
+            }
+        }
+
+        return $filename;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/Filesystem.php b/vendor/phpunit/phpunit/src/Util/Filesystem.php
new file mode 100644
index 00000000..d5f8feef
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/Filesystem.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Filesystem helpers.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Util_Filesystem
+{
+    /**
+     * @var array
+     */
+    protected static $buffer = array();
+
+    /**
+     * Maps class names to source file names:
+     *   - PEAR CS:   Foo_Bar_Baz -> Foo/Bar/Baz.php
+     *   - Namespace: Foo\Bar\Baz -> Foo/Bar/Baz.php
+     *
+     * @param  string $className
+     * @return string
+     * @since  Method available since Release 3.4.0
+     */
+    public static function classNameToFilename($className)
+    {
+        return str_replace(
+          array('_', '\\'),
+          DIRECTORY_SEPARATOR,
+          $className
+        ) . '.php';
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/Filter.php b/vendor/phpunit/phpunit/src/Util/Filter.php
new file mode 100644
index 00000000..b36ce7d7
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/Filter.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * Utility class for code filtering.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class PHPUnit_Util_Filter
+{
+    /**
+     * Filters stack frames from PHPUnit classes.
+     *
+     * @param  Exception $e
+     * @param  boolean   $asString
+     * @return string
+     */
+    public static function getFilteredStacktrace(Exception $e, $asString = true)
+    {
+        $prefix = false;
+        $script = realpath($GLOBALS['_SERVER']['SCRIPT_NAME']);
+
+        if (defined('__PHPUNIT_PHAR_ROOT__')) {
+            $prefix = __PHPUNIT_PHAR_ROOT__;
+        }
+
+        if ($asString === true) {
+            $filteredStacktrace = '';
+        } else {
+            $filteredStacktrace = array();
+        }
+
+        if ($e instanceof PHPUnit_Framework_SyntheticError) {
+            $eTrace = $e->getSyntheticTrace();
+            $eFile  = $e->getSyntheticFile();
+            $eLine  = $e->getSyntheticLine();
+        } else {
+            if ($e->getPrevious()) {
+                $eTrace = $e->getPrevious()->getTrace();
+            } else {
+                $eTrace = $e->getTrace();
+            }
+            $eFile  = $e->getFile();
+            $eLine  = $e->getLine();
+        }
+
+        if (!self::frameExists($eTrace, $eFile, $eLine)) {
+            array_unshift(
+              $eTrace, array('file' => $eFile, 'line' => $eLine)
+            );
+        }
+
+        $blacklist = new PHPUnit_Util_Blacklist;
+
+        foreach ($eTrace as $frame) {
+            if (isset($frame['file']) && is_file($frame['file']) &&
+                !$blacklist->isBlacklisted($frame['file']) &&
+                ($prefix === false || strpos($frame['file'], $prefix) !== 0) &&
+                $frame['file'] !== $script) {
+                if ($asString === true) {
+                    $filteredStacktrace .= sprintf(
+                      "%s:%s\n",
+
+                      $frame['file'],
+                      isset($frame['line']) ? $frame['line'] : '?'
+                    );
+                } else {
+                    $filteredStacktrace[] = $frame;
+                }
+            }
+        }
+
+        return $filteredStacktrace;
+    }
+
+    /**
+     * @param  array   $trace
+     * @param  string  $file
+     * @param  int     $line
+     * @return boolean
+     * @since  Method available since Release 3.3.2
+     */
+    private static function frameExists(array $trace, $file, $line)
+    {
+        foreach ($trace as $frame) {
+            if (isset($frame['file']) && $frame['file'] == $file &&
+                isset($frame['line']) && $frame['line'] == $line) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/Getopt.php b/vendor/phpunit/phpunit/src/Util/Getopt.php
new file mode 100644
index 00000000..b68a75b8
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/Getopt.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Command-line options parsing class.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Andrei Zmievski <andrei@php.net>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Util_Getopt
+{
+    public static function getopt(array $args, $short_options, $long_options = null)
+    {
+        if (empty($args)) {
+            return array(array(), array());
+        }
+
+        $opts     = array();
+        $non_opts = array();
+
+        if ($long_options) {
+            sort($long_options);
+        }
+
+        if (isset($args[0][0]) && $args[0][0] != '-') {
+            array_shift($args);
+        }
+
+        reset($args);
+        array_map('trim', $args);
+
+        while (list($i, $arg) = each($args)) {
+            if ($arg == '') {
+                continue;
+            }
+
+            if ($arg == '--') {
+                $non_opts = array_merge($non_opts, array_slice($args, $i + 1));
+                break;
+            }
+
+            if ($arg[0] != '-' ||
+                (strlen($arg) > 1 && $arg[1] == '-' && !$long_options)) {
+                $non_opts = array_merge($non_opts, array_slice($args, $i));
+                break;
+            } elseif (strlen($arg) > 1 && $arg[1] == '-') {
+                self::parseLongOption(
+                  substr($arg, 2), $long_options, $opts, $args
+                );
+            } else {
+                self::parseShortOption(
+                  substr($arg, 1), $short_options, $opts, $args
+                );
+            }
+        }
+
+        return array($opts, $non_opts);
+    }
+
+    protected static function parseShortOption($arg, $short_options, &$opts, &$args)
+    {
+        $argLen = strlen($arg);
+
+        for ($i = 0; $i < $argLen; $i++) {
+            $opt     = $arg[$i];
+            $opt_arg = null;
+
+            if (($spec = strstr($short_options, $opt)) === false ||
+                $arg[$i] == ':') {
+                throw new PHPUnit_Framework_Exception(
+                  "unrecognized option -- $opt"
+                );
+            }
+
+            if (strlen($spec) > 1 && $spec[1] == ':') {
+                if (strlen($spec) > 2 && $spec[2] == ':') {
+                    if ($i + 1 < $argLen) {
+                        $opts[] = array($opt, substr($arg, $i + 1));
+                        break;
+                    }
+                } else {
+                    if ($i + 1 < $argLen) {
+                        $opts[] = array($opt, substr($arg, $i + 1));
+                        break;
+                    } elseif (list(, $opt_arg) = each($args)) {
+                    } else {
+                        throw new PHPUnit_Framework_Exception(
+                          "option requires an argument -- $opt"
+                        );
+                    }
+                }
+            }
+
+            $opts[] = array($opt, $opt_arg);
+        }
+    }
+
+    protected static function parseLongOption($arg, $long_options, &$opts, &$args)
+    {
+        $count   = count($long_options);
+        $list    = explode('=', $arg);
+        $opt     = $list[0];
+        $opt_arg = null;
+
+        if (count($list) > 1) {
+            $opt_arg = $list[1];
+        }
+
+        $opt_len = strlen($opt);
+
+        for ($i = 0; $i < $count; $i++) {
+            $long_opt  = $long_options[$i];
+            $opt_start = substr($long_opt, 0, $opt_len);
+
+            if ($opt_start != $opt) {
+                continue;
+            }
+
+            $opt_rest = substr($long_opt, $opt_len);
+
+            if ($opt_rest != '' && $opt[0] != '=' && $i + 1 < $count &&
+                $opt == substr($long_options[$i+1], 0, $opt_len)) {
+                throw new PHPUnit_Framework_Exception(
+                  "option --$opt is ambiguous"
+                );
+            }
+
+            if (substr($long_opt, -1) == '=') {
+                if (substr($long_opt, -2) != '==') {
+                    if (!strlen($opt_arg) &&
+                        !(list(, $opt_arg) = each($args))) {
+                        throw new PHPUnit_Framework_Exception(
+                          "option --$opt requires an argument"
+                        );
+                    }
+                }
+            } elseif ($opt_arg) {
+                throw new PHPUnit_Framework_Exception(
+                  "option --$opt doesn't allow an argument"
+                );
+            }
+
+            $full_option = '--' . preg_replace('/={1,2}$/', '', $long_opt);
+            $opts[] = array($full_option, $opt_arg);
+
+            return;
+        }
+
+        throw new PHPUnit_Framework_Exception("unrecognized option --$opt");
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/GlobalState.php b/vendor/phpunit/phpunit/src/Util/GlobalState.php
new file mode 100644
index 00000000..3cfc199b
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/GlobalState.php
@@ -0,0 +1,388 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.4.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.4.0
+ */
+class PHPUnit_Util_GlobalState
+{
+    /**
+     * @var array
+     */
+    protected static $globals = array();
+
+    /**
+     * @var array
+     */
+    protected static $staticAttributes = array();
+
+    /**
+     * @var array
+     */
+    protected static $superGlobalArrays = array(
+      '_ENV',
+      '_POST',
+      '_GET',
+      '_COOKIE',
+      '_SERVER',
+      '_FILES',
+      '_REQUEST'
+    );
+
+    /**
+     * @var array
+     */
+    protected static $superGlobalArraysLong = array(
+      'HTTP_ENV_VARS',
+      'HTTP_POST_VARS',
+      'HTTP_GET_VARS',
+      'HTTP_COOKIE_VARS',
+      'HTTP_SERVER_VARS',
+      'HTTP_POST_FILES'
+    );
+
+    public static function backupGlobals(array $blacklist)
+    {
+        self::$globals     = array();
+        $superGlobalArrays = self::getSuperGlobalArrays();
+
+        foreach ($superGlobalArrays as $superGlobalArray) {
+            if (!in_array($superGlobalArray, $blacklist)) {
+                self::backupSuperGlobalArray($superGlobalArray);
+            }
+        }
+
+        foreach (array_keys($GLOBALS) as $key) {
+            if ($key != 'GLOBALS' &&
+                !in_array($key, $superGlobalArrays) &&
+                !in_array($key, $blacklist) &&
+                !$GLOBALS[$key] instanceof Closure) {
+                self::$globals['GLOBALS'][$key] = serialize($GLOBALS[$key]);
+            }
+        }
+    }
+
+    public static function restoreGlobals(array $blacklist)
+    {
+        if (ini_get('register_long_arrays') == '1') {
+            $superGlobalArrays = array_merge(
+              self::$superGlobalArrays, self::$superGlobalArraysLong
+            );
+        } else {
+            $superGlobalArrays = self::$superGlobalArrays;
+        }
+
+        foreach ($superGlobalArrays as $superGlobalArray) {
+            if (!in_array($superGlobalArray, $blacklist)) {
+                self::restoreSuperGlobalArray($superGlobalArray);
+            }
+        }
+
+        foreach (array_keys($GLOBALS) as $key) {
+            if ($key != 'GLOBALS' &&
+                !in_array($key, $superGlobalArrays) &&
+                !in_array($key, $blacklist)) {
+                if (isset(self::$globals['GLOBALS'][$key])) {
+                    $GLOBALS[$key] = unserialize(
+                      self::$globals['GLOBALS'][$key]
+                    );
+                } else {
+                    unset($GLOBALS[$key]);
+                }
+            }
+        }
+
+        self::$globals = array();
+    }
+
+    protected static function backupSuperGlobalArray($superGlobalArray)
+    {
+        self::$globals[$superGlobalArray] = array();
+
+        if (isset($GLOBALS[$superGlobalArray]) &&
+            is_array($GLOBALS[$superGlobalArray])) {
+            foreach ($GLOBALS[$superGlobalArray] as $key => $value) {
+                self::$globals[$superGlobalArray][$key] = serialize($value);
+            }
+        }
+    }
+
+    protected static function restoreSuperGlobalArray($superGlobalArray)
+    {
+        if (isset($GLOBALS[$superGlobalArray]) &&
+            is_array($GLOBALS[$superGlobalArray]) &&
+            isset(self::$globals[$superGlobalArray])) {
+            $keys = array_keys(
+              array_merge(
+                $GLOBALS[$superGlobalArray], self::$globals[$superGlobalArray]
+              )
+            );
+
+            foreach ($keys as $key) {
+                if (isset(self::$globals[$superGlobalArray][$key])) {
+                    $GLOBALS[$superGlobalArray][$key] = unserialize(
+                      self::$globals[$superGlobalArray][$key]
+                    );
+                } else {
+                    unset($GLOBALS[$superGlobalArray][$key]);
+                }
+            }
+        }
+
+        self::$globals[$superGlobalArray] = array();
+    }
+
+    public static function getIncludedFilesAsString()
+    {
+        $blacklist = new PHPUnit_Util_Blacklist;
+        $files     = get_included_files();
+        $prefix    = false;
+        $result    = '';
+
+        if (defined('__PHPUNIT_PHAR__')) {
+            $prefix = 'phar://' . __PHPUNIT_PHAR__ . '/';
+        }
+
+        for ($i = count($files) - 1; $i > 0; $i--) {
+            $file = $files[$i];
+
+            if ($prefix !== false && strpos($file, $prefix) === 0) {
+                continue;
+            }
+
+            if (!$blacklist->isBlacklisted($file) && is_file($file)) {
+                $result = 'require_once \'' . $file . "';\n" . $result;
+            }
+        }
+
+        return $result;
+    }
+
+    public static function getIniSettingsAsString()
+    {
+        $result      = '';
+        $iniSettings = ini_get_all(null, false);
+
+        foreach ($iniSettings as $key => $value) {
+            $result .= sprintf(
+              '@ini_set(%s, %s);' . "\n",
+              self::exportVariable($key),
+              self::exportVariable($value)
+            );
+        }
+
+        return $result;
+    }
+
+    public static function getConstantsAsString()
+    {
+        $constants = get_defined_constants(true);
+        $result    = '';
+
+        if (isset($constants['user'])) {
+            foreach ($constants['user'] as $name => $value) {
+                $result .= sprintf(
+                  'if (!defined(\'%s\')) define(\'%s\', %s);' . "\n",
+                  $name,
+                  $name,
+                  self::exportVariable($value)
+                );
+            }
+        }
+
+        return $result;
+    }
+
+    public static function getGlobalsAsString()
+    {
+        $result            = '';
+        $superGlobalArrays = self::getSuperGlobalArrays();
+
+        foreach ($superGlobalArrays as $superGlobalArray) {
+            if (isset($GLOBALS[$superGlobalArray]) &&
+                is_array($GLOBALS[$superGlobalArray])) {
+                foreach (array_keys($GLOBALS[$superGlobalArray]) as $key) {
+                    if ($GLOBALS[$superGlobalArray][$key] instanceof Closure) {
+                        continue;
+                    }
+
+                    $result .= sprintf(
+                      '$GLOBALS[\'%s\'][\'%s\'] = %s;' . "\n",
+                      $superGlobalArray,
+                      $key,
+                      self::exportVariable($GLOBALS[$superGlobalArray][$key])
+                    );
+                }
+            }
+        }
+
+        $blacklist   = $superGlobalArrays;
+        $blacklist[] = 'GLOBALS';
+
+        foreach (array_keys($GLOBALS) as $key) {
+            if (!in_array($key, $blacklist) && !$GLOBALS[$key] instanceof Closure) {
+                $result .= sprintf(
+                  '$GLOBALS[\'%s\'] = %s;' . "\n",
+                  $key,
+                  self::exportVariable($GLOBALS[$key])
+                );
+            }
+        }
+
+        return $result;
+    }
+
+    protected static function getSuperGlobalArrays()
+    {
+        if (ini_get('register_long_arrays') == '1') {
+            return array_merge(
+              self::$superGlobalArrays, self::$superGlobalArraysLong
+            );
+        } else {
+            return self::$superGlobalArrays;
+        }
+    }
+
+    public static function backupStaticAttributes(array $blacklist)
+    {
+        self::$staticAttributes = array();
+        $declaredClasses        = get_declared_classes();
+        $declaredClassesNum     = count($declaredClasses);
+
+        for ($i = $declaredClassesNum - 1; $i >= 0; $i--) {
+            if (strpos($declaredClasses[$i], 'PHPUnit') !== 0 &&
+                strpos($declaredClasses[$i], 'File_Iterator') !== 0 &&
+                strpos($declaredClasses[$i], 'PHP_CodeCoverage') !== 0 &&
+                strpos($declaredClasses[$i], 'PHP_Invoker') !== 0 &&
+                strpos($declaredClasses[$i], 'PHP_Timer') !== 0 &&
+                strpos($declaredClasses[$i], 'PHP_Token_Stream') !== 0 &&
+                strpos($declaredClasses[$i], 'Symfony') !== 0 &&
+                strpos($declaredClasses[$i], 'Text_Template') !== 0) {
+                $class = new ReflectionClass($declaredClasses[$i]);
+
+                if ($class->isSubclassOf('PHPUnit_Framework_Test')) {
+                    continue;
+                }
+
+                if (!$class->isUserDefined()) {
+                    break;
+                }
+
+                $backup = array();
+
+                foreach ($class->getProperties() as $attribute) {
+                    if ($attribute->isStatic()) {
+                        $name = $attribute->getName();
+
+                        if (!isset($blacklist[$declaredClasses[$i]]) ||
+                           !in_array($name, $blacklist[$declaredClasses[$i]])) {
+                            $attribute->setAccessible(true);
+                            $value = $attribute->getValue();
+
+                            if (!$value instanceof Closure) {
+                                $backup[$name] = serialize($value);
+                            }
+                        }
+                    }
+                }
+
+                if (!empty($backup)) {
+                    self::$staticAttributes[$declaredClasses[$i]] = $backup;
+                }
+            }
+        }
+    }
+
+    public static function restoreStaticAttributes()
+    {
+        foreach (self::$staticAttributes as $className => $staticAttributes) {
+            foreach ($staticAttributes as $name => $value) {
+                $reflector = new ReflectionProperty($className, $name);
+                $reflector->setAccessible(true);
+                $reflector->setValue(unserialize($value));
+            }
+        }
+
+        self::$staticAttributes = array();
+    }
+
+    protected static function exportVariable($variable)
+    {
+        if (is_scalar($variable) || is_null($variable) ||
+           (is_array($variable) && self::arrayOnlyContainsScalars($variable))) {
+            return var_export($variable, true);
+        }
+        return 'unserialize(' .
+                var_export(serialize($variable), true) .
+                ')';
+    }
+
+    protected static function arrayOnlyContainsScalars(array $array)
+    {
+        $result = true;
+
+        foreach ($array as $element) {
+            if (is_array($element)) {
+                $result = self::arrayOnlyContainsScalars($element);
+            } elseif (!is_scalar($element) && !is_null($element)) {
+                $result = false;
+            }
+
+            if ($result === false) {
+                break;
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php b/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php
new file mode 100644
index 00000000..94f3cf49
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.4.0
+ */
+
+/**
+ * Factory for PHPUnit_Framework_Exception objects that are used to describe
+ * invalid arguments passed to a function or method.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.4.0
+ */
+class PHPUnit_Util_InvalidArgumentHelper
+{
+    /**
+     * @param  integer                     $argument
+     * @param  string                      $type
+     * @param  mixed                       $value
+     * @return PHPUnit_Framework_Exception
+     */
+    public static function factory($argument, $type, $value = null)
+    {
+        $stack = debug_backtrace(false);
+
+        return new PHPUnit_Framework_Exception(
+          sprintf(
+            'Argument #%d%sof %s::%s() must be a %s',
+            $argument,
+            $value !== null ? ' (' . gettype($value) . '#' . $value . ')' : ' (No Value) ',
+            $stack[1]['class'],
+            $stack[1]['function'],
+            $type
+          )
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/Log/JSON.php b/vendor/phpunit/phpunit/src/Util/Log/JSON.php
new file mode 100644
index 00000000..dfb3163d
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/Log/JSON.php
@@ -0,0 +1,282 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util_Log
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+if (!defined('JSON_PRETTY_PRINT')) {
+    define('JSON_PRETTY_PRINT', 128);
+}
+
+/**
+ * A TestListener that generates JSON messages.
+ *
+ * @package    PHPUnit
+ * @subpackage Util_Log
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Util_Log_JSON extends PHPUnit_Util_Printer implements PHPUnit_Framework_TestListener
+{
+    /**
+     * @var    string
+     */
+    protected $currentTestSuiteName = '';
+
+    /**
+     * @var    string
+     */
+    protected $currentTestName = '';
+
+    /**
+     * @var     boolean
+     * @access  private
+     */
+    protected $currentTestPass = true;
+
+    /**
+     * An error occurred.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->writeCase(
+          'error',
+          $time,
+          PHPUnit_Util_Filter::getFilteredStacktrace($e, false),
+          $e->getMessage(),
+          $test
+        );
+
+        $this->currentTestPass = false;
+    }
+
+    /**
+     * A failure occurred.
+     *
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
+     */
+    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
+    {
+        $this->writeCase(
+          'fail',
+          $time,
+          PHPUnit_Util_Filter::getFilteredStacktrace($e, false),
+          $e->getMessage(),
+          $test
+        );
+
+        $this->currentTestPass = false;
+    }
+
+    /**
+     * Incomplete test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->writeCase(
+          'error',
+          $time,
+          PHPUnit_Util_Filter::getFilteredStacktrace($e, false),
+          'Incomplete Test: ' . $e->getMessage(),
+          $test
+        );
+
+        $this->currentTestPass = false;
+    }
+
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->writeCase(
+          'error',
+          $time,
+          PHPUnit_Util_Filter::getFilteredStacktrace($e, false),
+          'Risky Test: ' . $e->getMessage(),
+          $test
+        );
+
+        $this->currentTestPass = false;
+    }
+
+    /**
+     * Skipped test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->writeCase(
+          'error',
+          $time,
+          PHPUnit_Util_Filter::getFilteredStacktrace($e, false),
+          'Skipped Test: ' . $e->getMessage(),
+          $test
+        );
+
+        $this->currentTestPass = false;
+    }
+
+    /**
+     * A testsuite started.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     */
+    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+        $this->currentTestSuiteName = $suite->getName();
+        $this->currentTestName      = '';
+
+        $this->write(
+          array(
+            'event' => 'suiteStart',
+            'suite' => $this->currentTestSuiteName,
+            'tests' => count($suite)
+          )
+        );
+    }
+
+    /**
+     * A testsuite ended.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     */
+    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+        $this->currentTestSuiteName = '';
+        $this->currentTestName      = '';
+    }
+
+    /**
+     * A test started.
+     *
+     * @param PHPUnit_Framework_Test $test
+     */
+    public function startTest(PHPUnit_Framework_Test $test)
+    {
+        $this->currentTestName = PHPUnit_Util_Test::describe($test);
+        $this->currentTestPass = true;
+
+        $this->write(
+          array(
+            'event' => 'testStart',
+            'suite' => $this->currentTestSuiteName,
+            'test'  => $this->currentTestName
+          )
+        );
+    }
+
+    /**
+     * A test ended.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
+     */
+    public function endTest(PHPUnit_Framework_Test $test, $time)
+    {
+        if ($this->currentTestPass) {
+            $this->writeCase('pass', $time, array(), '', $test);
+        }
+    }
+
+    /**
+     * @param string $status
+     * @param float  $time
+     * @param array  $trace
+     * @param string $message
+     */
+    protected function writeCase($status, $time, array $trace = array(), $message = '', $test = null)
+    {
+        $output = '';
+        // take care of TestSuite producing error (e.g. by running into exception) as TestSuite doesn't have hasOutput
+        if ($test !== null && method_exists($test, 'hasOutput') && $test->hasOutput()) {
+            $output = $test->getActualOutput();
+        }
+        $this->write(
+          array(
+            'event'   => 'test',
+            'suite'   => $this->currentTestSuiteName,
+            'test'    => $this->currentTestName,
+            'status'  => $status,
+            'time'    => $time,
+            'trace'   => $trace,
+            'message' => PHPUnit_Util_String::convertToUtf8($message),
+            'output'  => $output,
+          )
+        );
+    }
+
+    /**
+     * @param string $buffer
+     */
+    public function write($buffer)
+    {
+        array_walk_recursive($buffer, function (&$input) {
+            if (is_string($input)) {
+                $input = PHPUnit_Util_String::convertToUtf8($input);
+            }
+        });
+
+        parent::write(json_encode($buffer, JSON_PRETTY_PRINT));
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/Log/JUnit.php b/vendor/phpunit/phpunit/src/Util/Log/JUnit.php
new file mode 100644
index 00000000..13fe0ec4
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/Log/JUnit.php
@@ -0,0 +1,483 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util_Log
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.3.0
+ */
+
+/**
+ * A TestListener that generates a logfile of the test execution in XML markup.
+ *
+ * The XML markup used is the same as the one that is used by the JUnit Ant task.
+ *
+ * @package    PHPUnit
+ * @subpackage Util_Log
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.1.0
+ */
+class PHPUnit_Util_Log_JUnit extends PHPUnit_Util_Printer implements PHPUnit_Framework_TestListener
+{
+    /**
+     * @var    DOMDocument
+     */
+    protected $document;
+
+    /**
+     * @var    DOMElement
+     */
+    protected $root;
+
+    /**
+     * @var    boolean
+     */
+    protected $logIncompleteSkipped = false;
+
+    /**
+     * @var    boolean
+     */
+    protected $writeDocument = true;
+
+    /**
+     * @var    DOMElement[]
+     */
+    protected $testSuites = array();
+
+    /**
+     * @var    integer[]
+     */
+    protected $testSuiteTests = array(0);
+
+    /**
+     * @var    integer[]
+     */
+    protected $testSuiteAssertions = array(0);
+
+    /**
+     * @var    integer[]
+     */
+    protected $testSuiteErrors = array(0);
+
+    /**
+     * @var    integer[]
+     */
+    protected $testSuiteFailures = array(0);
+
+    /**
+     * @var    integer[]
+     */
+    protected $testSuiteTimes = array(0);
+
+    /**
+     * @var    integer
+     */
+    protected $testSuiteLevel = 0;
+
+    /**
+     * @var    DOMElement
+     */
+    protected $currentTestCase = null;
+
+    /**
+     * @var    boolean
+     */
+    protected $attachCurrentTestCase = true;
+
+    /**
+     * Constructor.
+     *
+     * @param mixed   $out
+     * @param boolean $logIncompleteSkipped
+     */
+    public function __construct($out = null, $logIncompleteSkipped = false)
+    {
+        $this->document = new DOMDocument('1.0', 'UTF-8');
+        $this->document->formatOutput = true;
+
+        $this->root = $this->document->createElement('testsuites');
+        $this->document->appendChild($this->root);
+
+        parent::__construct($out);
+
+        $this->logIncompleteSkipped = $logIncompleteSkipped;
+    }
+
+    /**
+     * Flush buffer and close output.
+     *
+     */
+    public function flush()
+    {
+        if ($this->writeDocument === true) {
+            $this->write($this->getXML());
+        }
+
+        parent::flush();
+    }
+
+    /**
+     * An error occurred.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        if ($this->currentTestCase !== null) {
+            if ($test instanceof PHPUnit_Framework_SelfDescribing) {
+                $buffer = $test->toString() . "\n";
+            } else {
+                $buffer = '';
+            }
+
+            $buffer .= PHPUnit_Framework_TestFailure::exceptionToString($e) .
+                       "\n" .
+                       PHPUnit_Util_Filter::getFilteredStacktrace($e);
+
+            $error = $this->document->createElement(
+              'error', PHPUnit_Util_XML::prepareString($buffer)
+            );
+
+            $error->setAttribute('type', get_class($e));
+
+            $this->currentTestCase->appendChild($error);
+
+            $this->testSuiteErrors[$this->testSuiteLevel]++;
+        }
+    }
+
+    /**
+     * A failure occurred.
+     *
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
+     */
+    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
+    {
+        if ($this->currentTestCase !== null) {
+            if (!$test instanceof PHPUnit_Framework_Warning) {
+                if ($test instanceof PHPUnit_Framework_SelfDescribing) {
+                    $buffer = $test->toString() . "\n";
+                } else {
+                    $buffer = '';
+                }
+
+                $buffer .= PHPUnit_Framework_TestFailure::exceptionToString($e) .
+                           "\n" .
+                           PHPUnit_Util_Filter::getFilteredStacktrace($e);
+
+                $failure = $this->document->createElement(
+                  'failure', PHPUnit_Util_XML::prepareString($buffer)
+                );
+
+                $failure->setAttribute('type', get_class($e));
+
+                $this->currentTestCase->appendChild($failure);
+
+                $this->testSuiteFailures[$this->testSuiteLevel]++;
+            }
+        }
+    }
+
+    /**
+     * Incomplete test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        if ($this->logIncompleteSkipped && $this->currentTestCase !== null) {
+            $error = $this->document->createElement(
+              'error',
+              PHPUnit_Util_XML::prepareString(
+                "Incomplete Test\n" .
+                PHPUnit_Util_Filter::getFilteredStacktrace($e)
+              )
+            );
+
+            $error->setAttribute('type', get_class($e));
+
+            $this->currentTestCase->appendChild($error);
+
+            $this->testSuiteErrors[$this->testSuiteLevel]++;
+        } else {
+            $this->attachCurrentTestCase = false;
+        }
+    }
+
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        if ($this->logIncompleteSkipped && $this->currentTestCase !== null) {
+            $error = $this->document->createElement(
+              'error',
+              PHPUnit_Util_XML::prepareString(
+                "Risky Test\n" .
+                PHPUnit_Util_Filter::getFilteredStacktrace($e)
+              )
+            );
+
+            $error->setAttribute('type', get_class($e));
+
+            $this->currentTestCase->appendChild($error);
+
+            $this->testSuiteErrors[$this->testSuiteLevel]++;
+        } else {
+            $this->attachCurrentTestCase = false;
+        }
+    }
+
+    /**
+     * Skipped test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 3.0.0
+     */
+    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        if ($this->logIncompleteSkipped && $this->currentTestCase !== null) {
+            $error = $this->document->createElement(
+              'error',
+              PHPUnit_Util_XML::prepareString(
+                "Skipped Test\n" .
+                PHPUnit_Util_Filter::getFilteredStacktrace($e)
+              )
+            );
+
+            $error->setAttribute('type', get_class($e));
+
+            $this->currentTestCase->appendChild($error);
+
+            $this->testSuiteErrors[$this->testSuiteLevel]++;
+        } else {
+            $this->attachCurrentTestCase = false;
+        }
+    }
+
+    /**
+     * A testsuite started.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+        $testSuite = $this->document->createElement('testsuite');
+        $testSuite->setAttribute('name', $suite->getName());
+
+        if (class_exists($suite->getName(), false)) {
+            try {
+                $class = new ReflectionClass($suite->getName());
+
+                $testSuite->setAttribute('file', $class->getFileName());
+            } catch (ReflectionException $e) {
+            }
+        }
+
+        if ($this->testSuiteLevel > 0) {
+            $this->testSuites[$this->testSuiteLevel]->appendChild($testSuite);
+        } else {
+            $this->root->appendChild($testSuite);
+        }
+
+        $this->testSuiteLevel++;
+        $this->testSuites[$this->testSuiteLevel]          = $testSuite;
+        $this->testSuiteTests[$this->testSuiteLevel]      = 0;
+        $this->testSuiteAssertions[$this->testSuiteLevel] = 0;
+        $this->testSuiteErrors[$this->testSuiteLevel]     = 0;
+        $this->testSuiteFailures[$this->testSuiteLevel]   = 0;
+        $this->testSuiteTimes[$this->testSuiteLevel]      = 0;
+    }
+
+    /**
+     * A testsuite ended.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+        $this->testSuites[$this->testSuiteLevel]->setAttribute(
+          'tests', $this->testSuiteTests[$this->testSuiteLevel]
+        );
+
+        $this->testSuites[$this->testSuiteLevel]->setAttribute(
+          'assertions', $this->testSuiteAssertions[$this->testSuiteLevel]
+        );
+
+        $this->testSuites[$this->testSuiteLevel]->setAttribute(
+          'failures', $this->testSuiteFailures[$this->testSuiteLevel]
+        );
+
+        $this->testSuites[$this->testSuiteLevel]->setAttribute(
+          'errors', $this->testSuiteErrors[$this->testSuiteLevel]
+        );
+
+        $this->testSuites[$this->testSuiteLevel]->setAttribute(
+          'time', sprintf('%F', $this->testSuiteTimes[$this->testSuiteLevel])
+        );
+
+        if ($this->testSuiteLevel > 1) {
+            $this->testSuiteTests[$this->testSuiteLevel - 1]      += $this->testSuiteTests[$this->testSuiteLevel];
+            $this->testSuiteAssertions[$this->testSuiteLevel - 1] += $this->testSuiteAssertions[$this->testSuiteLevel];
+            $this->testSuiteErrors[$this->testSuiteLevel - 1]     += $this->testSuiteErrors[$this->testSuiteLevel];
+            $this->testSuiteFailures[$this->testSuiteLevel - 1]   += $this->testSuiteFailures[$this->testSuiteLevel];
+            $this->testSuiteTimes[$this->testSuiteLevel - 1]      += $this->testSuiteTimes[$this->testSuiteLevel];
+        }
+
+        $this->testSuiteLevel--;
+    }
+
+    /**
+     * A test started.
+     *
+     * @param PHPUnit_Framework_Test $test
+     */
+    public function startTest(PHPUnit_Framework_Test $test)
+    {
+        if (!$test instanceof PHPUnit_Framework_Warning) {
+            $testCase = $this->document->createElement('testcase');
+            $testCase->setAttribute('name', $test->getName());
+
+            if ($test instanceof PHPUnit_Framework_TestCase) {
+                $class      = new ReflectionClass($test);
+                $methodName = $test->getName();
+
+                if ($class->hasMethod($methodName)) {
+                    $method = $class->getMethod($test->getName());
+
+                    $testCase->setAttribute('class', $class->getName());
+                    $testCase->setAttribute('file', $class->getFileName());
+                    $testCase->setAttribute('line', $method->getStartLine());
+                }
+            }
+
+            $this->currentTestCase = $testCase;
+        }
+    }
+
+    /**
+     * A test ended.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
+     */
+    public function endTest(PHPUnit_Framework_Test $test, $time)
+    {
+        if (!$test instanceof PHPUnit_Framework_Warning) {
+            if ($this->attachCurrentTestCase) {
+                if ($test instanceof PHPUnit_Framework_TestCase) {
+                    $numAssertions = $test->getNumAssertions();
+                    $this->testSuiteAssertions[$this->testSuiteLevel] += $numAssertions;
+
+                    $this->currentTestCase->setAttribute(
+                      'assertions', $numAssertions
+                    );
+                }
+
+                $this->currentTestCase->setAttribute(
+                  'time', sprintf('%F', $time)
+                );
+
+                $this->testSuites[$this->testSuiteLevel]->appendChild(
+                  $this->currentTestCase
+                );
+
+                $this->testSuiteTests[$this->testSuiteLevel]++;
+                $this->testSuiteTimes[$this->testSuiteLevel] += $time;
+
+                if (method_exists($test, 'hasOutput') && $test->hasOutput()) {
+                    $systemOut = $this->document->createElement('system-out');
+                    $systemOut->appendChild(
+                      $this->document->createTextNode($test->getActualOutput())
+                    );
+                    $this->currentTestCase->appendChild($systemOut);
+                }
+            }
+        }
+
+        $this->attachCurrentTestCase = true;
+        $this->currentTestCase       = null;
+    }
+
+    /**
+     * Returns the XML as a string.
+     *
+     * @return string
+     * @since  Method available since Release 2.2.0
+     */
+    public function getXML()
+    {
+        return $this->document->saveXML();
+    }
+
+    /**
+     * Enables or disables the writing of the document
+     * in flush().
+     *
+     * This is a "hack" needed for the integration of
+     * PHPUnit with Phing.
+     *
+     * @return string
+     * @since  Method available since Release 2.2.0
+     */
+    public function setWriteDocument($flag)
+    {
+        if (is_bool($flag)) {
+            $this->writeDocument = $flag;
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/Log/TAP.php b/vendor/phpunit/phpunit/src/Util/Log/TAP.php
new file mode 100644
index 00000000..8fc924ca
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/Log/TAP.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util_Log
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * A TestListener that generates a logfile of the
+ * test execution using the Test Anything Protocol (TAP).
+ *
+ * @package    PHPUnit
+ * @subpackage Util_Log
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Util_Log_TAP extends PHPUnit_Util_Printer implements PHPUnit_Framework_TestListener
+{
+    /**
+     * @var    integer
+     */
+    protected $testNumber = 0;
+
+    /**
+     * @var    integer
+     */
+    protected $testSuiteLevel = 0;
+
+    /**
+     * @var    boolean
+     */
+    protected $testSuccessful = true;
+
+    /**
+     * Constructor.
+     *
+     * @param  mixed                       $out
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.3.4
+     */
+    public function __construct($out = null)
+    {
+        parent::__construct($out);
+        $this->write("TAP version 13\n");
+    }
+
+    /**
+     * An error occurred.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->writeNotOk($test, 'Error');
+    }
+
+    /**
+     * A failure occurred.
+     *
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
+     */
+    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
+    {
+        $this->writeNotOk($test, 'Failure');
+
+        $message = explode(
+          "\n", PHPUnit_Framework_TestFailure::exceptionToString($e)
+        );
+
+        $diagnostic = array(
+          'message'  => $message[0],
+          'severity' => 'fail'
+        );
+
+        if ($e instanceof PHPUnit_Framework_ExpectationFailedException) {
+            $cf = $e->getComparisonFailure();
+
+            if ($cf !== null) {
+                $diagnostic['data'] = array(
+                  'got'      => $cf->getActual(),
+                  'expected' => $cf->getExpected()
+                );
+            }
+        }
+
+        $yaml = new Symfony\Component\Yaml\Dumper;
+
+        $this->write(
+          sprintf(
+            "  ---\n%s  ...\n",
+            $yaml->dump($diagnostic, 2, 2)
+          )
+        );
+    }
+
+    /**
+     * Incomplete test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->writeNotOk($test, '', 'TODO Incomplete Test');
+    }
+
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->write(
+          sprintf(
+            "ok %d - # RISKY%s\n",
+
+            $this->testNumber,
+            $e->getMessage() != '' ? ' ' . $e->getMessage() : ''
+          )
+        );
+
+        $this->testSuccessful = false;
+    }
+
+    /**
+     * Skipped test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 3.0.0
+     */
+    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->write(
+          sprintf(
+            "ok %d - # SKIP%s\n",
+
+            $this->testNumber,
+            $e->getMessage() != '' ? ' ' . $e->getMessage() : ''
+          )
+        );
+
+        $this->testSuccessful = false;
+    }
+
+    /**
+     * A testsuite started.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     */
+    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+        $this->testSuiteLevel++;
+    }
+
+    /**
+     * A testsuite ended.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     */
+    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+        $this->testSuiteLevel--;
+
+        if ($this->testSuiteLevel == 0) {
+            $this->write(sprintf("1..%d\n", $this->testNumber));
+        }
+    }
+
+    /**
+     * A test started.
+     *
+     * @param PHPUnit_Framework_Test $test
+     */
+    public function startTest(PHPUnit_Framework_Test $test)
+    {
+        $this->testNumber++;
+        $this->testSuccessful = true;
+    }
+
+    /**
+     * A test ended.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
+     */
+    public function endTest(PHPUnit_Framework_Test $test, $time)
+    {
+        if ($this->testSuccessful === true) {
+            $this->write(
+              sprintf(
+                "ok %d - %s\n",
+
+                $this->testNumber,
+                PHPUnit_Util_Test::describe($test)
+              )
+            );
+        }
+    }
+
+    /**
+     * @param PHPUnit_Framework_Test $test
+     * @param string                 $prefix
+     * @param string                 $directive
+     */
+    protected function writeNotOk(PHPUnit_Framework_Test $test, $prefix = '', $directive = '')
+    {
+        $this->write(
+          sprintf(
+            "not ok %d - %s%s%s\n",
+
+            $this->testNumber,
+            $prefix != '' ? $prefix . ': ' : '',
+            PHPUnit_Util_Test::describe($test),
+            $directive != '' ? ' # ' . $directive : ''
+          )
+        );
+
+        $this->testSuccessful = false;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/PHP.php b/vendor/phpunit/phpunit/src/Util/PHP.php
new file mode 100644
index 00000000..d3d36a06
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/PHP.php
@@ -0,0 +1,243 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.4.0
+ */
+
+/**
+ * Utility methods for PHP sub-processes.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.4.0
+ */
+abstract class PHPUnit_Util_PHP
+{
+    /**
+     * @return PHPUnit_Util_PHP
+     * @since  Method available since Release 3.5.12
+     */
+    public static function factory()
+    {
+        if (DIRECTORY_SEPARATOR == '\\') {
+            return new PHPUnit_Util_PHP_Windows;
+        }
+
+        return new PHPUnit_Util_PHP_Default;
+    }
+
+    /**
+     * Runs a single test in a separate PHP process.
+     *
+     * @param  string                       $job
+     * @param  PHPUnit_Framework_Test       $test
+     * @param  PHPUnit_Framework_TestResult $result
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function runTestJob($job, PHPUnit_Framework_Test $test, PHPUnit_Framework_TestResult $result)
+    {
+        $result->startTest($test);
+
+        $_result = $this->runJob($job);
+
+        $this->processChildResult(
+          $test, $result, $_result['stdout'], $_result['stderr']
+        );
+    }
+
+    /**
+     * Runs a single job (PHP code) using a separate PHP process.
+     *
+     * @param  string                      $job
+     * @param  array                       $settings
+     * @return array
+     * @throws PHPUnit_Framework_Exception
+     */
+    abstract public function runJob($job, array $settings = array());
+
+    /**
+     * @param  array  $settings
+     * @return string
+     * @since Method available since Release 4.0.0
+     */
+    protected function settingsToParameters(array $settings)
+    {
+        $buffer = '';
+
+        foreach ($settings as $setting) {
+            $buffer .= ' -d ' . $setting;
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * Processes the TestResult object from an isolated process.
+     *
+     * @param PHPUnit_Framework_Test       $test
+     * @param PHPUnit_Framework_TestResult $result
+     * @param string                       $stdout
+     * @param string                       $stderr
+     * @since Method available since Release 3.5.0
+     */
+    private function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Framework_TestResult $result, $stdout, $stderr)
+    {
+        $time = 0;
+
+        if (!empty($stderr)) {
+            $result->addError(
+              $test,
+              new PHPUnit_Framework_Exception(trim($stderr)), $time
+            );
+        } else {
+            set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+                throw new ErrorException($errstr, $errno, $errno, $errfile, $errline);
+            });
+            try {
+                if (strpos($stdout, "#!/usr/bin/env php\n") === 0) {
+                    $stdout = substr($stdout, 19);
+                }
+
+                $childResult = unserialize(str_replace("#!/usr/bin/env php\n", '', $stdout));
+                restore_error_handler();
+            } catch (ErrorException $e) {
+                restore_error_handler();
+                $childResult = false;
+
+                $result->addError(
+                  $test, new PHPUnit_Framework_Exception(trim($stdout), 0, $e), $time
+                );
+            }
+
+            if ($childResult !== false) {
+                if (!empty($childResult['output'])) {
+                    $output = $childResult['output'];
+                }
+
+                $test->setResult($childResult['testResult']);
+                $test->addToAssertionCount($childResult['numAssertions']);
+
+                $childResult = $childResult['result'];
+
+                if ($result->getCollectCodeCoverageInformation()) {
+                    $result->getCodeCoverage()->merge(
+                      $childResult->getCodeCoverage()
+                    );
+                }
+
+                $time           = $childResult->time();
+                $notImplemented = $childResult->notImplemented();
+                $risky          = $childResult->risky();
+                $skipped        = $childResult->skipped();
+                $errors         = $childResult->errors();
+                $failures       = $childResult->failures();
+
+                if (!empty($notImplemented)) {
+                    $result->addError(
+                      $test, $this->getException($notImplemented[0]), $time
+                    );
+                } elseif (!empty($risky)) {
+                    $result->addError(
+                      $test, $this->getException($risky[0]), $time
+                    );
+                } elseif (!empty($skipped)) {
+                    $result->addError(
+                      $test, $this->getException($skipped[0]), $time
+                    );
+                } elseif (!empty($errors)) {
+                    $result->addError(
+                      $test, $this->getException($errors[0]), $time
+                    );
+                } elseif (!empty($failures)) {
+                    $result->addFailure(
+                      $test, $this->getException($failures[0]), $time
+                    );
+                }
+            }
+        }
+
+        $result->endTest($test, $time);
+
+        if (!empty($output)) {
+            print $output;
+        }
+    }
+
+    /**
+     * Gets the thrown exception from a PHPUnit_Framework_TestFailure.
+     *
+     * @param  PHPUnit_Framework_TestFailure $error
+     * @return Exception
+     * @since  Method available since Release 3.6.0
+     * @see    https://github.com/sebastianbergmann/phpunit/issues/74
+     */
+    private function getException(PHPUnit_Framework_TestFailure $error)
+    {
+        $exception = $error->thrownException();
+
+        if ($exception instanceof __PHP_Incomplete_Class) {
+            $exceptionArray = array();
+            foreach ((array) $exception as $key => $value) {
+                $key = substr($key, strrpos($key, "\0") + 1);
+                $exceptionArray[$key] = $value;
+            }
+
+            $exception = new PHPUnit_Framework_SyntheticError(
+              sprintf(
+                '%s: %s',
+                $exceptionArray['_PHP_Incomplete_Class_Name'],
+                $exceptionArray['message']
+              ),
+              $exceptionArray['code'],
+              $exceptionArray['file'],
+              $exceptionArray['line'],
+              $exceptionArray['trace']
+            );
+        }
+
+        return $exception;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/PHP/Default.php b/vendor/phpunit/phpunit/src/Util/PHP/Default.php
new file mode 100644
index 00000000..af228fc5
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/PHP/Default.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.5.12
+ */
+
+use SebastianBergmann\Environment\Runtime;
+
+/**
+ * Default utility for PHP sub-processes.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.5.12
+ */
+class PHPUnit_Util_PHP_Default extends PHPUnit_Util_PHP
+{
+    /**
+     * Runs a single job (PHP code) using a separate PHP process.
+     *
+     * @param  string                      $job
+     * @param  array                       $settings
+     * @return array
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function runJob($job, array $settings = array())
+    {
+        $runtime = new Runtime;
+
+        $process = proc_open(
+          $runtime->getBinary() . $this->settingsToParameters($settings),
+          array(
+            0 => array('pipe', 'r'),
+            1 => array('pipe', 'w'),
+            2 => array('pipe', 'w')
+          ),
+          $pipes
+        );
+
+        if (!is_resource($process)) {
+            throw new PHPUnit_Framework_Exception(
+              'Unable to spawn worker process'
+            );
+        }
+
+        $this->process($pipes[0], $job);
+        fclose($pipes[0]);
+
+        $stdout = stream_get_contents($pipes[1]);
+        fclose($pipes[1]);
+
+        $stderr = stream_get_contents($pipes[2]);
+        fclose($pipes[2]);
+
+        proc_close($process);
+        $this->cleanup();
+
+        return array('stdout' => $stdout, 'stderr' => $stderr);
+    }
+
+    /**
+     * @param  resource                    $pipe
+     * @param  string                      $job
+     * @throws PHPUnit_Framework_Exception
+     * @since Method available since Release 3.5.12
+     */
+    protected function process($pipe, $job)
+    {
+        fwrite($pipe, $job);
+    }
+
+    /**
+     * @since Method available since Release 3.5.12
+     */
+    protected function cleanup()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseMethod.tpl.dist b/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseMethod.tpl.dist
new file mode 100644
index 00000000..b81e9bb2
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseMethod.tpl.dist
@@ -0,0 +1,64 @@
+<?php
+{iniSettings}
+ini_set('display_errors', 'stderr');
+set_include_path('{include_path}');
+
+$composerAutoload = {composerAutoload};
+$phar             = {phar};
+
+ob_start();
+
+if ($composerAutoload) {
+    require_once $composerAutoload;
+    define('PHPUNIT_COMPOSER_INSTALL', $composerAutoload);
+} else if ($phar) {
+    require $phar;
+}
+
+function __phpunit_run_isolated_test()
+{
+    if (!class_exists('{className}')) {
+        require_once '{filename}';
+    }
+
+    $result = new PHPUnit_Framework_TestResult;
+
+    if ({collectCodeCoverageInformation}) {
+        $result->setCodeCoverage(new PHP_CodeCoverage);
+    }
+
+    $result->beStrictAboutTestsThatDoNotTestAnything({isStrictAboutTestsThatDoNotTestAnything});
+    $result->beStrictAboutOutputDuringTests({isStrictAboutOutputDuringTests});
+    $result->beStrictAboutTestSize({isStrictAboutTestSize});
+
+    $test = new {className}('{methodName}', unserialize('{data}'), '{dataName}');
+    $test->setDependencyInput(unserialize('{dependencyInput}'));
+    $test->setInIsolation(TRUE);
+
+    ob_end_clean();
+    $test->run($result);
+    $output = $test->getActualOutput();
+
+    print serialize(
+      array(
+        'testResult'    => $test->getResult(),
+        'numAssertions' => $test->getNumAssertions(),
+        'result'        => $result,
+        'output'        => $output
+      )
+    );
+
+    ob_start();
+}
+
+{constants}
+{included_files}
+{globals}
+
+if (isset($GLOBALS['__PHPUNIT_BOOTSTRAP'])) {
+    require_once $GLOBALS['__PHPUNIT_BOOTSTRAP'];
+    unset($GLOBALS['__PHPUNIT_BOOTSTRAP']);
+}
+
+__phpunit_run_isolated_test();
+ob_end_clean();
diff --git a/vendor/phpunit/phpunit/src/Util/PHP/Windows.php b/vendor/phpunit/phpunit/src/Util/PHP/Windows.php
new file mode 100644
index 00000000..d9b6ffc7
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/PHP/Windows.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.5.12
+ */
+
+use SebastianBergmann\Environment\Runtime;
+
+/**
+ * Windows utility for PHP sub-processes.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.5.12
+ */
+class PHPUnit_Util_PHP_Windows extends PHPUnit_Util_PHP_Default
+{
+    /**
+     * @var string
+     */
+    private $tempFile;
+
+    /**
+     * {@inheritdoc}
+     *
+     * Reading from STDOUT or STDERR hangs forever on Windows if the output is
+     * too large.
+     *
+     * @see https://bugs.php.net/bug.php?id=51800
+     */
+    public function runJob($job, array $settings = array())
+    {
+        $runtime = new Runtime;
+
+        if (false === $stdout_handle = tmpfile()) {
+            throw new PHPUnit_Framework_Exception(
+              'A temporary file could not be created; verify that your TEMP environment variable is writable'
+            );
+        }
+
+        $process = proc_open(
+          $runtime->getBinary() . $this->settingsToParameters($settings),
+          array(
+            0 => array('pipe', 'r'),
+            1 => $stdout_handle,
+            2 => array('pipe', 'w')
+          ),
+          $pipes
+        );
+
+        if (!is_resource($process)) {
+            throw new PHPUnit_Framework_Exception(
+              'Unable to spawn worker process'
+            );
+        }
+
+        $this->process($pipes[0], $job);
+        fclose($pipes[0]);
+
+        $stderr = stream_get_contents($pipes[2]);
+        fclose($pipes[2]);
+
+        proc_close($process);
+
+        rewind($stdout_handle);
+        $stdout = stream_get_contents($stdout_handle);
+        fclose($stdout_handle);
+
+        $this->cleanup();
+
+        return array('stdout' => $stdout, 'stderr' => $stderr);
+    }
+
+    /**
+     * @param  resource                    $pipe
+     * @param  string                      $job
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.5.12
+     */
+    protected function process($pipe, $job)
+    {
+        if (!($this->tempFile = tempnam(sys_get_temp_dir(), 'PHPUnit')) ||
+            file_put_contents($this->tempFile, $job) === false) {
+            throw new PHPUnit_Framework_Exception(
+              'Unable to write temporary file'
+            );
+        }
+
+        fwrite(
+          $pipe,
+          "<?php require_once " . var_export($this->tempFile, true) .  "; ?>"
+        );
+    }
+
+    /**
+     * @since Method available since Release 3.5.12
+     */
+    protected function cleanup()
+    {
+        unlink($this->tempFile);
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/Printer.php b/vendor/phpunit/phpunit/src/Util/Printer.php
new file mode 100644
index 00000000..9d67ad30
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/Printer.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * Utility class that can print to STDOUT or write to a file.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class PHPUnit_Util_Printer
+{
+    /**
+     * If true, flush output after every write.
+     *
+     * @var boolean
+     */
+    protected $autoFlush = false;
+
+    /**
+     * @var    resource
+     */
+    protected $out;
+
+    /**
+     * @var    string
+     */
+    protected $outTarget;
+
+    /**
+     * @var    boolean
+     */
+    protected $printsHTML = false;
+
+    /**
+     * Constructor.
+     *
+     * @param  mixed                       $out
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function __construct($out = null)
+    {
+        if ($out !== null) {
+            if (is_string($out)) {
+                if (strpos($out, 'socket://') === 0) {
+                    $out = explode(':', str_replace('socket://', '', $out));
+
+                    if (sizeof($out) != 2) {
+                        throw new PHPUnit_Framework_Exception;
+                    }
+
+                    $this->out = fsockopen($out[0], $out[1]);
+                } else {
+                    if (strpos($out, 'php://') === false &&
+                        !is_dir(dirname($out))) {
+                        mkdir(dirname($out), 0777, true);
+                    }
+
+                    $this->out = fopen($out, 'wt');
+                }
+
+                $this->outTarget = $out;
+            } else {
+                $this->out = $out;
+            }
+        }
+    }
+
+    /**
+     * Flush buffer, optionally tidy up HTML, and close output if it's not to a php stream
+     */
+    public function flush()
+    {
+        if ($this->out && strncmp($this->outTarget, 'php://', 6) !== 0) {
+            fclose($this->out);
+        }
+
+        if ($this->printsHTML === true &&
+            $this->outTarget !== null &&
+            strpos($this->outTarget, 'php://') !== 0 &&
+            strpos($this->outTarget, 'socket://') !== 0 &&
+            extension_loaded('tidy')) {
+            file_put_contents(
+              $this->outTarget,
+              tidy_repair_file(
+                $this->outTarget, array('indent' => true, 'wrap' => 0), 'utf8'
+              )
+            );
+        }
+    }
+
+    /**
+     * Performs a safe, incremental flush.
+     *
+     * Do not confuse this function with the flush() function of this class,
+     * since the flush() function may close the file being written to, rendering
+     * the current object no longer usable.
+     *
+     * @since  Method available since Release 3.3.0
+     */
+    public function incrementalFlush()
+    {
+        if ($this->out) {
+            fflush($this->out);
+        } else {
+            flush();
+        }
+    }
+
+    /**
+     * @param string $buffer
+     */
+    public function write($buffer)
+    {
+        if ($this->out) {
+            fwrite($this->out, $buffer);
+
+            if ($this->autoFlush) {
+                $this->incrementalFlush();
+            }
+        } else {
+            if (PHP_SAPI != 'cli') {
+                $buffer = htmlspecialchars($buffer);
+            }
+
+            print $buffer;
+
+            if ($this->autoFlush) {
+                $this->incrementalFlush();
+            }
+        }
+    }
+
+    /**
+     * Check auto-flush mode.
+     *
+     * @return boolean
+     * @since  Method available since Release 3.3.0
+     */
+    public function getAutoFlush()
+    {
+        return $this->autoFlush;
+    }
+
+    /**
+     * Set auto-flushing mode.
+     *
+     * If set, *incremental* flushes will be done after each write. This should
+     * not be confused with the different effects of this class' flush() method.
+     *
+     * @param boolean $autoFlush
+     * @since  Method available since Release 3.3.0
+     */
+    public function setAutoFlush($autoFlush)
+    {
+        if (is_bool($autoFlush)) {
+            $this->autoFlush = $autoFlush;
+        } else {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/String.php b/vendor/phpunit/phpunit/src/Util/String.php
new file mode 100644
index 00000000..a526bf43
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/String.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.6.0
+ */
+
+/**
+ * String helpers.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.6.0
+ */
+class PHPUnit_Util_String
+{
+    /**
+     * Converts a string to UTF-8 encoding.
+     *
+     * @param  string $string
+     * @return string
+     */
+    public static function convertToUtf8($string)
+    {
+        if (!self::isUtf8($string)) {
+            if (function_exists('mb_convert_encoding')) {
+                $string = mb_convert_encoding($string, 'UTF-8');
+            } else {
+                $string = utf8_encode($string);
+            }
+        }
+
+        return $string;
+    }
+
+    /**
+     * Checks a string for UTF-8 encoding.
+     *
+     * @param  string  $string
+     * @return boolean
+     */
+    protected static function isUtf8($string)
+    {
+        $length = strlen($string);
+
+        for ($i = 0; $i < $length; $i++) {
+            if (ord($string[$i]) < 0x80) {
+                $n = 0;
+            } elseif ((ord($string[$i]) & 0xE0) == 0xC0) {
+                $n = 1;
+            } elseif ((ord($string[$i]) & 0xF0) == 0xE0) {
+                $n = 2;
+            } elseif ((ord($string[$i]) & 0xF0) == 0xF0) {
+                $n = 3;
+            } else {
+                return false;
+            }
+
+            for ($j = 0; $j < $n; $j++) {
+                if ((++$i == $length) || ((ord($string[$i]) & 0xC0) != 0x80)) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/Test.php b/vendor/phpunit/phpunit/src/Util/Test.php
new file mode 100644
index 00000000..95c2298d
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/Test.php
@@ -0,0 +1,957 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+if (!function_exists('trait_exists')) {
+    function trait_exists($traitname, $autoload = true)
+    {
+        return false;
+    }
+}
+
+/**
+ * Test helpers.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Util_Test
+{
+    const REGEX_DATA_PROVIDER      = '/@dataProvider\s+([a-zA-Z0-9._:-\\\\x7f-\xff]+)/';
+    const REGEX_EXPECTED_EXCEPTION = '(@expectedException\s+([:.\w\\\\x7f-\xff]+)(?:[\t ]+(\S*))?(?:[\t ]+(\S*))?\s*$)m';
+    const REGEX_REQUIRES_VERSION   = '/@requires\s+(?P<name>PHP(?:Unit)?)\s+(?P<value>[\d\.-]+(dev|(RC|alpha|beta)[\d\.])?)[ \t]*\r?$/m';
+    const REGEX_REQUIRES_OS        = '/@requires\s+OS\s+(?P<value>.+?)[ \t]*\r?$/m';
+    const REGEX_REQUIRES           = '/@requires\s+(?P<name>function|extension)\s+(?P<value>([^ ]+?))[ \t]*\r?$/m';
+
+    const SMALL  = 0;
+    const MEDIUM = 1;
+    const LARGE  = 2;
+
+    private static $annotationCache = array();
+
+    private static $templateMethods = array(
+      'setUp', 'assertPreConditions', 'assertPostConditions', 'tearDown'
+    );
+
+    private static $hookMethods = array();
+
+    /**
+     * @param  PHPUnit_Framework_Test $test
+     * @param  boolean                $asString
+     * @return mixed
+     */
+    public static function describe(PHPUnit_Framework_Test $test, $asString = true)
+    {
+        if ($asString) {
+            if ($test instanceof PHPUnit_Framework_SelfDescribing) {
+                return $test->toString();
+            } else {
+                return get_class($test);
+            }
+        } else {
+            if ($test instanceof PHPUnit_Framework_TestCase) {
+                return array(
+                  get_class($test), $test->getName()
+                );
+            } elseif ($test instanceof PHPUnit_Framework_SelfDescribing) {
+                return array('', $test->toString());
+            } else {
+                return array('', get_class($test));
+            }
+        }
+    }
+
+    /**
+     * @param  string     $className
+     * @param  string     $methodName
+     * @return array|bool
+     * @throws PHPUnit_Framework_CodeCoverageException
+     * @since  Method available since Release 4.0.0
+     */
+    public static function getLinesToBeCovered($className, $methodName)
+    {
+        $codeToCoverList = array();
+
+        $class = new ReflectionClass($className);
+
+        try {
+            $method = new ReflectionMethod($className, $methodName);
+        } catch (ReflectionException $e) {
+            return array();
+        }
+
+        $docComment = self::getDocCommentsOfTestClassAndTestMethodAndTemplateMethods($class, $method);
+
+        if (strpos($docComment, '@coversNothing') !== false) {
+            return false;
+        }
+
+        $classShortcut = preg_match_all(
+          '(@coversDefaultClass\s+(?P<coveredClass>[^\s]++)\s*$)m',
+          $class->getDocComment(),
+          $matches
+        );
+
+        if ($classShortcut) {
+            if ($classShortcut > 1) {
+                throw new PHPUnit_Framework_CodeCoverageException(
+                  sprintf(
+                    'More than one @coversClass annotation in class or interface "%s".',
+                    $className
+                  )
+                );
+            }
+
+            $classShortcut = $matches['coveredClass'][0];
+        }
+
+        $match = preg_match_all(
+          '(@covers\s+(?P<coveredElement>[^\s()]++)[\s()]*$)m',
+          $docComment,
+          $matches
+        );
+
+        if ($match) {
+            foreach ($matches['coveredElement'] as $coveredElement) {
+                if ($classShortcut && strncmp($coveredElement, '::', 2) === 0) {
+                    $coveredElement = $classShortcut . $coveredElement;
+                }
+
+                $codeToCoverList = array_merge(
+                  $codeToCoverList,
+                  self::resolveElementToReflectionObjects($coveredElement)
+                );
+            }
+        }
+
+        return self::resolveReflectionObjectsToLines($codeToCoverList);
+    }
+
+    /**
+     * Returns lines of code specified with the @uses annotation.
+     *
+     * @param  string $className
+     * @param  string $methodName
+     * @return array
+     * @since  Method available since Release 4.0.0
+     */
+    public static function getLinesToBeUsed($className, $methodName)
+    {
+        $annotations = self::parseTestMethodAnnotations(
+          $className, $methodName
+        );
+
+        $uses = array();
+
+        if (isset($annotations['class']['uses'])) {
+            $uses = $annotations['class']['uses'];
+        }
+
+        if (isset($annotations['method']['uses'])) {
+            $uses = array_merge($uses, $annotations['method']['uses']);
+        }
+
+        $uses          = array_unique($uses);
+        $codeToUseList = array();
+
+        foreach (array_unique($uses) as $element) {
+            $codeToUseList = array_merge(
+              $codeToUseList,
+              self::resolveElementToReflectionObjects($element)
+            );
+        }
+
+        return self::resolveReflectionObjectsToLines($codeToUseList);
+    }
+
+    /**
+     * Returns the requirements for a test.
+     *
+     * @param  string $className
+     * @param  string $methodName
+     * @return array
+     * @since  Method available since Release 3.6.0
+     */
+    public static function getRequirements($className, $methodName)
+    {
+        $reflector  = new ReflectionClass($className);
+        $docComment = $reflector->getDocComment();
+        $reflector  = new ReflectionMethod($className, $methodName);
+        $docComment .= "\n" . $reflector->getDocComment();
+        $requires   = array();
+
+        if ($count = preg_match_all(self::REGEX_REQUIRES_OS, $docComment, $matches)) {
+            $requires['OS'] = sprintf(
+              '/%s/i',
+              addcslashes($matches['value'][$count - 1], '/')
+            );
+        }
+        if ($count = preg_match_all(self::REGEX_REQUIRES_VERSION, $docComment, $matches)) {
+            for ($i = 0; $i < $count; $i++) {
+                $requires[$matches['name'][$i]] = $matches['value'][$i];
+            }
+        }
+
+        // https://bugs.php.net/bug.php?id=63055
+        $matches = array();
+
+        if ($count = preg_match_all(self::REGEX_REQUIRES, $docComment, $matches)) {
+            for ($i = 0; $i < $count; $i++) {
+                $name = $matches['name'][$i] . 's';
+                if (!isset($requires[$name])) {
+                    $requires[$name] = array();
+                }
+                $requires[$name][] = $matches['value'][$i];
+            }
+        }
+
+        return $requires;
+    }
+
+    /**
+     * Returns the expected exception for a test.
+     *
+     * @param  string $className
+     * @param  string $methodName
+     * @return array
+     * @since  Method available since Release 3.3.6
+     */
+    public static function getExpectedException($className, $methodName)
+    {
+        $reflector  = new ReflectionMethod($className, $methodName);
+        $docComment = $reflector->getDocComment();
+        $docComment = substr($docComment, 3, -2);
+
+        if (preg_match(self::REGEX_EXPECTED_EXCEPTION, $docComment, $matches)) {
+            $annotations = self::parseTestMethodAnnotations(
+              $className, $methodName
+            );
+
+            $class   = $matches[1];
+            $code    = null;
+            $message = '';
+
+            if (isset($matches[2])) {
+                $message = trim($matches[2]);
+            } elseif (isset($annotations['method']['expectedExceptionMessage'])) {
+                $message = self::parseAnnotationContent(
+                    $annotations['method']['expectedExceptionMessage'][0]
+                );
+            }
+
+            if (isset($matches[3])) {
+                $code = $matches[3];
+            } elseif (isset($annotations['method']['expectedExceptionCode'])) {
+                $code = self::parseAnnotationContent(
+                    $annotations['method']['expectedExceptionCode'][0]
+                );
+            }
+
+            if (is_numeric($code)) {
+                $code = (int) $code;
+            } elseif (is_string($code) && defined($code)) {
+                $code = (int) constant($code);
+            }
+
+            return array(
+              'class' => $class, 'code' => $code, 'message' => $message
+            );
+        }
+
+        return false;
+    }
+
+    /**
+     * Parse annotation content to use constant/class constant values
+     *
+     * Constants are specified using a starting '@'. For example: @ClassName::CONST_NAME
+     *
+     * If the constant is not found the string is used as is to ensure maximum BC.
+     *
+     * @param  string $message
+     * @return string
+     */
+    private static function parseAnnotationContent($message)
+    {
+        if (strpos($message, '::') !== false && count(explode('::', $message) == 2)) {
+            if (defined($message)) {
+                $message = constant($message);
+            }
+        }
+
+        return $message;
+    }
+
+    /**
+     * Returns the provided data for a method.
+     *
+     * @param  string           $className
+     * @param  string           $methodName
+     * @return array|Iterator when a data provider is specified and exists
+     *         false          when a data provider is specified but does not exist
+     *         null           when no data provider is specified
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.2.0
+     */
+    public static function getProvidedData($className, $methodName)
+    {
+        $reflector  = new ReflectionMethod($className, $methodName);
+        $docComment = $reflector->getDocComment();
+        $data       = null;
+
+        if (preg_match(self::REGEX_DATA_PROVIDER, $docComment, $matches)) {
+            $dataProviderMethodNameNamespace = explode('\\', $matches[1]);
+            $leaf                            = explode('::', array_pop($dataProviderMethodNameNamespace));
+            $dataProviderMethodName          = array_pop($leaf);
+
+            if (!empty($dataProviderMethodNameNamespace)) {
+                $dataProviderMethodNameNamespace = join('\\', $dataProviderMethodNameNamespace) . '\\';
+            } else {
+                $dataProviderMethodNameNamespace = '';
+            }
+
+            if (!empty($leaf)) {
+                $dataProviderClassName = $dataProviderMethodNameNamespace . array_pop($leaf);
+            } else {
+                $dataProviderClassName = $className;
+            }
+
+            $dataProviderClass  = new ReflectionClass($dataProviderClassName);
+            $dataProviderMethod = $dataProviderClass->getMethod(
+              $dataProviderMethodName
+            );
+
+            if ($dataProviderMethod->isStatic()) {
+                $object = null;
+            } else {
+                $object = $dataProviderClass->newInstance();
+            }
+
+            if ($dataProviderMethod->getNumberOfParameters() == 0) {
+                $data = $dataProviderMethod->invoke($object);
+            } else {
+                $data = $dataProviderMethod->invoke($object, $methodName);
+            }
+        }
+
+        if ($data !== null) {
+            if (is_object($data)) {
+                $data = iterator_to_array($data);
+            }
+
+            foreach ($data as $key => $value) {
+                if (!is_array($value)) {
+                    throw new PHPUnit_Framework_Exception(
+                      sprintf(
+                        'Data set %s is invalid.',
+                        is_int($key) ? '#' . $key : '"' . $key . '"'
+                      )
+                    );
+                }
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param  string              $className
+     * @param  string              $methodName
+     * @return array
+     * @throws ReflectionException
+     * @since  Method available since Release 3.4.0
+     */
+    public static function parseTestMethodAnnotations($className, $methodName = '')
+    {
+        if (!isset(self::$annotationCache[$className])) {
+            $class = new ReflectionClass($className);
+            self::$annotationCache[$className] = self::parseAnnotations($class->getDocComment());
+        }
+
+        if (!empty($methodName) && !isset(self::$annotationCache[$className . '::' . $methodName])) {
+            try {
+                $method = new ReflectionMethod($className, $methodName);
+                $annotations = self::parseAnnotations($method->getDocComment());
+            } catch (ReflectionException $e) {
+                $annotations = array();
+            }
+            self::$annotationCache[$className . '::' . $methodName] = $annotations;
+        }
+
+        return array(
+          'class'  => self::$annotationCache[$className],
+          'method' => !empty($methodName) ? self::$annotationCache[$className . '::' . $methodName] : array()
+        );
+    }
+
+    /**
+     * @param  string $docblock
+     * @return array
+     * @since  Method available since Release 3.4.0
+     */
+    private static function parseAnnotations($docblock)
+    {
+        $annotations = array();
+        // Strip away the docblock header and footer to ease parsing of one line annotations
+        $docblock = substr($docblock, 3, -2);
+
+        if (preg_match_all('/@(?P<name>[A-Za-z_-]+)(?:[ \t]+(?P<value>.*?))?[ \t]*\r?$/m', $docblock, $matches)) {
+            $numMatches = count($matches[0]);
+
+            for ($i = 0; $i < $numMatches; ++$i) {
+                $annotations[$matches['name'][$i]][] = $matches['value'][$i];
+            }
+        }
+
+        return $annotations;
+    }
+
+    /**
+     * Returns the backup settings for a test.
+     *
+     * @param  string $className
+     * @param  string $methodName
+     * @return array
+     * @since  Method available since Release 3.4.0
+     */
+    public static function getBackupSettings($className, $methodName)
+    {
+        return array(
+          'backupGlobals' => self::getBooleanAnnotationSetting(
+            $className, $methodName, 'backupGlobals'
+          ),
+          'backupStaticAttributes' => self::getBooleanAnnotationSetting(
+            $className, $methodName, 'backupStaticAttributes'
+          )
+        );
+    }
+
+    /**
+     * Returns the dependencies for a test class or method.
+     *
+     * @param  string $className
+     * @param  string $methodName
+     * @return array
+     * @since  Method available since Release 3.4.0
+     */
+    public static function getDependencies($className, $methodName)
+    {
+        $annotations = self::parseTestMethodAnnotations(
+          $className, $methodName
+        );
+
+        $dependencies = array();
+
+        if (isset($annotations['class']['depends'])) {
+            $dependencies = $annotations['class']['depends'];
+        }
+
+        if (isset($annotations['method']['depends'])) {
+            $dependencies = array_merge(
+              $dependencies, $annotations['method']['depends']
+            );
+        }
+
+        return array_unique($dependencies);
+    }
+
+    /**
+     * Returns the error handler settings for a test.
+     *
+     * @param  string  $className
+     * @param  string  $methodName
+     * @return boolean
+     * @since  Method available since Release 3.4.0
+     */
+    public static function getErrorHandlerSettings($className, $methodName)
+    {
+        return self::getBooleanAnnotationSetting(
+          $className, $methodName, 'errorHandler'
+        );
+    }
+
+    /**
+     * Returns the groups for a test class or method.
+     *
+     * @param  string $className
+     * @param  string $methodName
+     * @return array
+     * @since  Method available since Release 3.2.0
+     */
+    public static function getGroups($className, $methodName = '')
+    {
+        $annotations = self::parseTestMethodAnnotations(
+          $className, $methodName
+        );
+
+        $groups = array();
+
+        if (isset($annotations['method']['author'])) {
+            $groups = $annotations['method']['author'];
+        } elseif (isset($annotations['class']['author'])) {
+            $groups = $annotations['class']['author'];
+        }
+
+        if (isset($annotations['class']['group'])) {
+            $groups = array_merge($groups, $annotations['class']['group']);
+        }
+
+        if (isset($annotations['method']['group'])) {
+            $groups = array_merge($groups, $annotations['method']['group']);
+        }
+
+        if (isset($annotations['class']['ticket'])) {
+            $groups = array_merge($groups, $annotations['class']['ticket']);
+        }
+
+        if (isset($annotations['method']['ticket'])) {
+            $groups = array_merge($groups, $annotations['method']['ticket']);
+        }
+
+        foreach (array('small', 'medium', 'large') as $size) {
+            if (isset($annotations['method'][$size])) {
+                $groups[] = $size;
+            } elseif (isset($annotations['class'][$size])) {
+                $groups[] = $size;
+            }
+        }
+
+        return array_unique($groups);
+    }
+
+    /**
+     * Returns the size of the test.
+     *
+     * @param  string  $className
+     * @param  string  $methodName
+     * @return integer
+     * @since  Method available since Release 3.6.0
+     */
+    public static function getSize($className, $methodName)
+    {
+        $groups = array_flip(self::getGroups($className, $methodName));
+        $size   = self::SMALL;
+        $class  = new ReflectionClass($className);
+
+        if ((class_exists('PHPUnit_Extensions_Database_TestCase', false) &&
+             $class->isSubclassOf('PHPUnit_Extensions_Database_TestCase')) ||
+            (class_exists('PHPUnit_Extensions_SeleniumTestCase', false) &&
+             $class->isSubclassOf('PHPUnit_Extensions_SeleniumTestCase'))) {
+            $size = self::LARGE;
+        } elseif (isset($groups['medium'])) {
+            $size = self::MEDIUM;
+        } elseif (isset($groups['large'])) {
+            $size = self::LARGE;
+        }
+
+        return $size;
+    }
+
+    /**
+     * Returns the tickets for a test class or method.
+     *
+     * @param  string $className
+     * @param  string $methodName
+     * @return array
+     * @since  Method available since Release 3.4.0
+     */
+    public static function getTickets($className, $methodName)
+    {
+        $annotations = self::parseTestMethodAnnotations(
+          $className, $methodName
+        );
+
+        $tickets = array();
+
+        if (isset($annotations['class']['ticket'])) {
+            $tickets = $annotations['class']['ticket'];
+        }
+
+        if (isset($annotations['method']['ticket'])) {
+            $tickets = array_merge($tickets, $annotations['method']['ticket']);
+        }
+
+        return array_unique($tickets);
+    }
+
+    /**
+     * Returns the process isolation settings for a test.
+     *
+     * @param  string  $className
+     * @param  string  $methodName
+     * @return boolean
+     * @since  Method available since Release 3.4.1
+     */
+    public static function getProcessIsolationSettings($className, $methodName)
+    {
+        $annotations = self::parseTestMethodAnnotations(
+          $className, $methodName
+        );
+
+        if (isset($annotations['class']['runTestsInSeparateProcesses']) ||
+            isset($annotations['method']['runInSeparateProcess'])) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Returns the preserve global state settings for a test.
+     *
+     * @param  string  $className
+     * @param  string  $methodName
+     * @return boolean
+     * @since  Method available since Release 3.4.0
+     */
+    public static function getPreserveGlobalStateSettings($className, $methodName)
+    {
+        return self::getBooleanAnnotationSetting(
+          $className, $methodName, 'preserveGlobalState'
+        );
+    }
+
+    /**
+     * @param  string $className
+     * @return array
+     * @since  Method available since Release 4.0.8
+     */
+    public static function getHookMethods($className)
+    {
+        if (!class_exists($className, false)) {
+            return self::emptyHookMethodsArray();
+        }
+
+        if (!isset(self::$hookMethods[$className])) {
+            self::$hookMethods[$className] = self::emptyHookMethodsArray();
+
+            try {
+                $class = new ReflectionClass($className);
+
+                foreach ($class->getMethods() as $method) {
+                    if ($method->getDeclaringClass()->getName() != $className) {
+                        continue;
+                    }
+
+                    if (self::isBeforeClassMethod($method)) {
+                        self::$hookMethods[$className]['beforeClass'][] = $method->getName();
+                    }
+
+                    if (self::isBeforeMethod($method)) {
+                        self::$hookMethods[$className]['before'][] = $method->getName();
+                    }
+
+                    if (self::isAfterMethod($method)) {
+                        self::$hookMethods[$className]['after'][] = $method->getName();
+                    }
+
+                    if (self::isAfterClassMethod($method)) {
+                        self::$hookMethods[$className]['afterClass'][] = $method->getName();
+                    }
+                }
+            } catch (ReflectionException $e) {
+            }
+        }
+
+        return self::$hookMethods[$className];
+    }
+
+    /**
+     * @return array
+     * @since  Method available since Release 4.0.9
+     */
+    private static function emptyHookMethodsArray()
+    {
+        return array(
+            'beforeClass' => array('setUpBeforeClass'),
+            'before' => array('setUp'),
+            'after' => array('tearDown'),
+            'afterClass' => array('tearDownAfterClass')
+        );
+    }
+
+    /**
+     * @param  string  $className
+     * @param  string  $methodName
+     * @param  string  $settingName
+     * @return boolean
+     * @since  Method available since Release 3.4.0
+     */
+    private static function getBooleanAnnotationSetting($className, $methodName, $settingName)
+    {
+        $annotations = self::parseTestMethodAnnotations(
+          $className, $methodName
+        );
+
+        $result = null;
+
+        if (isset($annotations['class'][$settingName])) {
+            if ($annotations['class'][$settingName][0] == 'enabled') {
+                $result = true;
+            } elseif ($annotations['class'][$settingName][0] == 'disabled') {
+                $result = false;
+            }
+        }
+
+        if (isset($annotations['method'][$settingName])) {
+            if ($annotations['method'][$settingName][0] == 'enabled') {
+                $result = true;
+            } elseif ($annotations['method'][$settingName][0] == 'disabled') {
+                $result = false;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param  string $element
+     * @return array
+     * @throws PHPUnit_Framework_InvalidCoversTargetException
+     * @since  Method available since Release 4.0.0
+     */
+    private static function resolveElementToReflectionObjects($element)
+    {
+        $codeToCoverList = array();
+
+        if (strpos($element, '::') !== false) {
+            list($className, $methodName) = explode('::', $element);
+
+            if (isset($methodName[0]) && $methodName[0] == '<') {
+                $classes = array($className);
+
+                foreach ($classes as $className) {
+                    if (!class_exists($className) &&
+                        !interface_exists($className)) {
+                        throw new PHPUnit_Framework_InvalidCoversTargetException(
+                          sprintf(
+                            'Trying to @cover or @use not existing class or ' .
+                            'interface "%s".',
+                            $className
+                          )
+                        );
+                    }
+
+                    $class   = new ReflectionClass($className);
+                    $methods = $class->getMethods();
+                    $inverse = isset($methodName[1]) && $methodName[1] == '!';
+
+                    if (strpos($methodName, 'protected')) {
+                        $visibility = 'isProtected';
+                    } elseif (strpos($methodName, 'private')) {
+                        $visibility = 'isPrivate';
+                    } elseif (strpos($methodName, 'public')) {
+                        $visibility = 'isPublic';
+                    }
+
+                    foreach ($methods as $method) {
+                        if ($inverse && !$method->$visibility()) {
+                            $codeToCoverList[] = $method;
+                        } elseif (!$inverse && $method->$visibility()) {
+                            $codeToCoverList[] = $method;
+                        }
+                    }
+                }
+            } else {
+                $classes = array($className);
+
+                foreach ($classes as $className) {
+                    if ($className == '' && function_exists($methodName)) {
+                        $codeToCoverList[] = new ReflectionFunction(
+                          $methodName
+                        );
+                    } else {
+                        if (!((class_exists($className) ||
+                               interface_exists($className) ||
+                               trait_exists($className)) &&
+                              method_exists($className, $methodName))) {
+                            throw new PHPUnit_Framework_InvalidCoversTargetException(
+                              sprintf(
+                                'Trying to @cover or @use not existing method "%s::%s".',
+                                $className,
+                                $methodName
+                              )
+                            );
+                        }
+
+                        $codeToCoverList[] = new ReflectionMethod(
+                          $className, $methodName
+                        );
+                    }
+                }
+            }
+        } else {
+            $extended = false;
+
+            if (strpos($element, '<extended>') !== false) {
+                $element = str_replace(
+                  '<extended>', '', $element
+                );
+
+                $extended = true;
+            }
+
+            $classes = array($element);
+
+            if ($extended) {
+                $classes = array_merge(
+                  $classes,
+                  class_implements($element),
+                  class_parents($element)
+                );
+            }
+
+            foreach ($classes as $className) {
+                if (!class_exists($className) &&
+                    !interface_exists($className) &&
+                    !trait_exists($className)) {
+                    throw new PHPUnit_Framework_InvalidCoversTargetException(
+                      sprintf(
+                        'Trying to @cover or @use not existing class or ' .
+                        'interface "%s".',
+                        $className
+                      )
+                    );
+                }
+
+                $codeToCoverList[] = new ReflectionClass($className);
+            }
+        }
+
+        return $codeToCoverList;
+    }
+
+    /**
+     * @param  array $reflectors
+     * @return array
+     */
+    private static function resolveReflectionObjectsToLines(array $reflectors)
+    {
+        $result = array();
+
+        foreach ($reflectors as $reflector) {
+            $filename = $reflector->getFileName();
+
+            if (!isset($result[$filename])) {
+                $result[$filename] = array();
+            }
+
+            $result[$filename] = array_unique(
+              array_merge(
+                $result[$filename],
+                range(
+                  $reflector->getStartLine(), $reflector->getEndLine()
+                )
+              )
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param  ReflectionClass $class
+     * @param  ReflectionMethod $method
+     * @return string
+     */
+    private static function getDocCommentsOfTestClassAndTestMethodAndTemplateMethods(ReflectionClass $class, ReflectionMethod $method)
+    {
+        $buffer = substr($class->getDocComment(),  3, -2) . PHP_EOL .
+                  substr($method->getDocComment(), 3, -2);
+
+        foreach (self::$templateMethods as $templateMethod) {
+            if ($class->hasMethod($templateMethod)) {
+                $_method = $class->getMethod($templateMethod);
+                $buffer .= PHP_EOL . substr($_method->getDocComment(), 3, -2);
+            }
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * @param  ReflectionMethod $method
+     * @return boolean
+     * @since  Method available since Release 4.0.8
+     */
+    private static function isBeforeClassMethod(ReflectionMethod $method)
+    {
+        return $method->isStatic() && strpos($method->getDocComment(), '@beforeClass') !== false;
+    }
+
+    /**
+     * @param  ReflectionMethod $method
+     * @return boolean
+     * @since  Method available since Release 4.0.8
+     */
+    private static function isBeforeMethod(ReflectionMethod $method)
+    {
+        return preg_match('/@before\b/', $method->getDocComment());
+    }
+
+    /**
+     * @param  ReflectionMethod $method
+     * @return boolean
+     * @since  Method available since Release 4.0.8
+     */
+    private static function isAfterClassMethod(ReflectionMethod $method)
+    {
+        return $method->isStatic() && strpos($method->getDocComment(), '@afterClass') !== false;
+    }
+
+    /**
+     * @param  ReflectionMethod $method
+     * @return boolean
+     * @since  Method available since Release 4.0.8
+     */
+    private static function isAfterMethod(ReflectionMethod $method)
+    {
+        return preg_match('/@after\b/', $method->getDocComment());
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php b/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php
new file mode 100644
index 00000000..8e599b4e
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util_TestDox
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.3.0
+ */
+
+/**
+ * Prettifies class and method names for use in TestDox documentation.
+ *
+ * @package    PHPUnit
+ * @subpackage Util_TestDox
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.1.0
+ */
+class PHPUnit_Util_TestDox_NamePrettifier
+{
+    /**
+     * @var    string
+     */
+    protected $prefix = 'Test';
+
+    /**
+     * @var    string
+     */
+    protected $suffix = 'Test';
+
+    /**
+     * @var    array
+     */
+    protected $strings = array();
+
+    /**
+     * Prettifies the name of a test class.
+     *
+     * @param  string $name
+     * @return string
+     */
+    public function prettifyTestClass($name)
+    {
+        $title = $name;
+
+        if ($this->suffix !== null &&
+            $this->suffix == substr($name, -1 * strlen($this->suffix))) {
+            $title = substr($title, 0, strripos($title, $this->suffix));
+        }
+
+        if ($this->prefix !== null &&
+            $this->prefix == substr($name, 0, strlen($this->prefix))) {
+            $title = substr($title, strlen($this->prefix));
+        }
+
+        if (substr($title, 0, 1) == '\\') {
+            $title = substr($title, 1);
+        }
+
+        return $title;
+    }
+
+    /**
+     * Prettifies the name of a test method.
+     *
+     * @param  string $name
+     * @return string
+     */
+    public function prettifyTestMethod($name)
+    {
+        $buffer = '';
+
+        if (!is_string($name) || strlen($name) == 0) {
+            return $buffer;
+        }
+
+        $string = preg_replace('#\d+$#', '', $name, -1, $count);
+
+        if (in_array($string, $this->strings)) {
+            $name = $string;
+        } elseif ($count == 0) {
+            $this->strings[] = $string;
+        }
+
+        if (strpos($name, '_') !== false) {
+            return str_replace('_', ' ', $name);
+        }
+
+        $max = strlen($name);
+
+        if (substr($name, 0, 4) == 'test') {
+            $offset = 4;
+        } else {
+            $offset  = 0;
+            $name[0] = strtoupper($name[0]);
+        }
+
+        $wasNumeric = false;
+
+        for ($i = $offset; $i < $max; $i++) {
+            if ($i > $offset &&
+                ord($name[$i]) >= 65 &&
+                ord($name[$i]) <= 90) {
+                $buffer .= ' ' . strtolower($name[$i]);
+            } else {
+                $isNumeric = is_numeric($name[$i]);
+
+                if (!$wasNumeric && $isNumeric) {
+                    $buffer    .= ' ';
+                    $wasNumeric = true;
+                }
+
+                if ($wasNumeric && !$isNumeric) {
+                    $wasNumeric = false;
+                }
+
+                $buffer .= $name[$i];
+            }
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * Sets the prefix of test names.
+     *
+     * @param string $prefix
+     */
+    public function setPrefix($prefix)
+    {
+        $this->prefix = $prefix;
+    }
+
+    /**
+     * Sets the suffix of test names.
+     *
+     * @param string $suffix
+     */
+    public function setSuffix($suffix)
+    {
+        $this->suffix = $suffix;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php b/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php
new file mode 100644
index 00000000..b227f24f
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php
@@ -0,0 +1,368 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util_TestDox
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.3.0
+ */
+
+/**
+ * Base class for printers of TestDox documentation.
+ *
+ * @package    PHPUnit
+ * @subpackage Util_TestDox
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.1.0
+ */
+abstract class PHPUnit_Util_TestDox_ResultPrinter extends PHPUnit_Util_Printer implements PHPUnit_Framework_TestListener
+{
+    /**
+     * @var PHPUnit_Util_TestDox_NamePrettifier
+     */
+    protected $prettifier;
+
+    /**
+     * @var string
+     */
+    protected $testClass = '';
+
+    /**
+     * @var integer
+     */
+    protected $testStatus = false;
+
+    /**
+     * @var array
+     */
+    protected $tests = array();
+
+    /**
+     * @var integer
+     */
+    protected $successful = 0;
+
+    /**
+     * @var integer
+     */
+    protected $failed = 0;
+
+    /**
+     * @var integer
+     */
+    protected $risky = 0;
+
+    /**
+     * @var integer
+     */
+    protected $skipped = 0;
+
+    /**
+     * @var integer
+     */
+    protected $incomplete = 0;
+
+    /**
+     * @var string
+     */
+    protected $testTypeOfInterest = 'PHPUnit_Framework_TestCase';
+
+    /**
+     * @var string
+     */
+    protected $currentTestClassPrettified;
+
+    /**
+     * @var string
+     */
+    protected $currentTestMethodPrettified;
+
+    /**
+     * Constructor.
+     *
+     * @param resource $out
+     */
+    public function __construct($out = null)
+    {
+        parent::__construct($out);
+
+        $this->prettifier = new PHPUnit_Util_TestDox_NamePrettifier;
+        $this->startRun();
+    }
+
+    /**
+     * Flush buffer and close output.
+     *
+     */
+    public function flush()
+    {
+        $this->doEndClass();
+        $this->endRun();
+
+        parent::flush();
+    }
+
+    /**
+     * An error occurred.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        if ($test instanceof $this->testTypeOfInterest) {
+            $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_ERROR;
+            $this->failed++;
+        }
+    }
+
+    /**
+     * A failure occurred.
+     *
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
+     */
+    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
+    {
+        if ($test instanceof $this->testTypeOfInterest) {
+            $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE;
+            $this->failed++;
+        }
+    }
+
+    /**
+     * Incomplete test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     */
+    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        if ($test instanceof $this->testTypeOfInterest) {
+            $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE;
+            $this->incomplete++;
+        }
+    }
+
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        if ($test instanceof $this->testTypeOfInterest) {
+            $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_RISKY;
+            $this->risky++;
+        }
+    }
+
+    /**
+     * Skipped test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 3.0.0
+     */
+    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        if ($test instanceof $this->testTypeOfInterest) {
+            $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED;
+            $this->skipped++;
+        }
+    }
+
+    /**
+     * A testsuite started.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+    }
+
+    /**
+     * A testsuite ended.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+    }
+
+    /**
+     * A test started.
+     *
+     * @param PHPUnit_Framework_Test $test
+     */
+    public function startTest(PHPUnit_Framework_Test $test)
+    {
+        if ($test instanceof $this->testTypeOfInterest) {
+            $class = get_class($test);
+
+            if ($this->testClass != $class) {
+                if ($this->testClass != '') {
+                    $this->doEndClass();
+                }
+
+                $this->currentTestClassPrettified = $this->prettifier->prettifyTestClass($class);
+                $this->startClass($class);
+
+                $this->testClass = $class;
+                $this->tests     = array();
+            }
+
+            $prettified = false;
+
+            if ($test instanceof PHPUnit_Framework_TestCase &&
+               !$test instanceof PHPUnit_Framework_Warning) {
+                $annotations = $test->getAnnotations();
+
+                if (isset($annotations['method']['testdox'][0])) {
+                    $this->currentTestMethodPrettified = $annotations['method']['testdox'][0];
+                    $prettified                        = true;
+                }
+            }
+
+            if (!$prettified) {
+                $this->currentTestMethodPrettified = $this->prettifier->prettifyTestMethod($test->getName(false));
+            }
+
+            $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_PASSED;
+        }
+    }
+
+    /**
+     * A test ended.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
+     */
+    public function endTest(PHPUnit_Framework_Test $test, $time)
+    {
+        if ($test instanceof $this->testTypeOfInterest) {
+            if (!isset($this->tests[$this->currentTestMethodPrettified])) {
+                if ($this->testStatus == PHPUnit_Runner_BaseTestRunner::STATUS_PASSED) {
+                    $this->tests[$this->currentTestMethodPrettified]['success'] = 1;
+                    $this->tests[$this->currentTestMethodPrettified]['failure'] = 0;
+                } else {
+                    $this->tests[$this->currentTestMethodPrettified]['success'] = 0;
+                    $this->tests[$this->currentTestMethodPrettified]['failure'] = 1;
+                }
+            } else {
+                if ($this->testStatus == PHPUnit_Runner_BaseTestRunner::STATUS_PASSED) {
+                    $this->tests[$this->currentTestMethodPrettified]['success']++;
+                } else {
+                    $this->tests[$this->currentTestMethodPrettified]['failure']++;
+                }
+            }
+
+            $this->currentTestClassPrettified  = null;
+            $this->currentTestMethodPrettified = null;
+        }
+    }
+
+    /**
+     * @since  Method available since Release 2.3.0
+     */
+    protected function doEndClass()
+    {
+        foreach ($this->tests as $name => $data) {
+            $this->onTest($name, $data['failure'] == 0);
+        }
+
+        $this->endClass($this->testClass);
+    }
+
+    /**
+     * Handler for 'start run' event.
+     *
+     */
+    protected function startRun()
+    {
+    }
+
+    /**
+     * Handler for 'start class' event.
+     *
+     * @param string $name
+     */
+    protected function startClass($name)
+    {
+    }
+
+    /**
+     * Handler for 'on test' event.
+     *
+     * @param string  $name
+     * @param boolean $success
+     */
+    protected function onTest($name, $success = true)
+    {
+    }
+
+    /**
+     * Handler for 'end class' event.
+     *
+     * @param string $name
+     */
+    protected function endClass($name)
+    {
+    }
+
+    /**
+     * Handler for 'end run' event.
+     *
+     */
+    protected function endRun()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php b/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php
new file mode 100644
index 00000000..c501dc72
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util_TestDox
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.3.0
+ */
+
+/**
+ * Prints TestDox documentation in HTML format.
+ *
+ * @package    PHPUnit
+ * @subpackage Util_TestDox
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.1.0
+ */
+class PHPUnit_Util_TestDox_ResultPrinter_HTML extends PHPUnit_Util_TestDox_ResultPrinter
+{
+    /**
+     * @var    boolean
+     */
+    protected $printsHTML = true;
+
+    /**
+     * Handler for 'start run' event.
+     *
+     */
+    protected function startRun()
+    {
+        $this->write('<html><body>');
+    }
+
+    /**
+     * Handler for 'start class' event.
+     *
+     * @param string $name
+     */
+    protected function startClass($name)
+    {
+        $this->write(
+          '<h2 id="' . $name . '">' . $this->currentTestClassPrettified .
+          '</h2><ul>'
+        );
+    }
+
+    /**
+     * Handler for 'on test' event.
+     *
+     * @param string  $name
+     * @param boolean $success
+     */
+    protected function onTest($name, $success = true)
+    {
+        if (!$success) {
+            $strikeOpen  = '<span style="text-decoration:line-through;">';
+            $strikeClose = '</span>';
+        } else {
+            $strikeOpen  = '';
+            $strikeClose = '';
+        }
+
+        $this->write('<li>' . $strikeOpen . $name . $strikeClose . '</li>');
+    }
+
+    /**
+     * Handler for 'end class' event.
+     *
+     * @param string $name
+     */
+    protected function endClass($name)
+    {
+        $this->write('</ul>');
+    }
+
+    /**
+     * Handler for 'end run' event.
+     *
+     */
+    protected function endRun()
+    {
+        $this->write('</body></html>');
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php b/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php
new file mode 100644
index 00000000..6a76c314
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util_TestDox
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.3.0
+ */
+
+/**
+ * Prints TestDox documentation in text format.
+ *
+ * @package    PHPUnit
+ * @subpackage Util_TestDox
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.1.0
+ */
+class PHPUnit_Util_TestDox_ResultPrinter_Text extends PHPUnit_Util_TestDox_ResultPrinter
+{
+    /**
+     * Handler for 'start class' event.
+     *
+     * @param string $name
+     */
+    protected function startClass($name)
+    {
+        $this->write($this->currentTestClassPrettified . "\n");
+    }
+
+    /**
+     * Handler for 'on test' event.
+     *
+     * @param string  $name
+     * @param boolean $success
+     */
+    protected function onTest($name, $success = true)
+    {
+        if ($success) {
+            $this->write(' [x] ');
+        } else {
+            $this->write(' [ ] ');
+        }
+
+        $this->write($name . "\n");
+    }
+
+    /**
+     * Handler for 'end class' event.
+     *
+     * @param string $name
+     */
+    protected function endClass($name)
+    {
+        $this->write("\n");
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php b/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php
new file mode 100644
index 00000000..dc497907
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.1.0
+ */
+
+/**
+ * Iterator for test suites.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.1.0
+ */
+class PHPUnit_Util_TestSuiteIterator implements RecursiveIterator
+{
+    /**
+     * @var    integer
+     */
+    protected $position;
+
+    /**
+     * @var    PHPUnit_Framework_Test[]
+     */
+    protected $tests;
+
+    /**
+     * Constructor.
+     *
+     * @param PHPUnit_Framework_TestSuite $suite
+     */
+    public function __construct(PHPUnit_Framework_TestSuite $testSuite)
+    {
+        $this->tests = $testSuite->tests();
+    }
+
+    /**
+     * Rewinds the Iterator to the first element.
+     *
+     */
+    public function rewind()
+    {
+        $this->position = 0;
+    }
+
+    /**
+     * Checks if there is a current element after calls to rewind() or next().
+     *
+     * @return boolean
+     */
+    public function valid()
+    {
+        return $this->position < count($this->tests);
+    }
+
+    /**
+     * Returns the key of the current element.
+     *
+     * @return integer
+     */
+    public function key()
+    {
+        return $this->position;
+    }
+
+    /**
+     * Returns the current element.
+     *
+     * @return PHPUnit_Framework_Test
+     */
+    public function current()
+    {
+        return $this->valid() ? $this->tests[$this->position] : null;
+    }
+
+    /**
+     * Moves forward to next element.
+     *
+     */
+    public function next()
+    {
+        $this->position++;
+    }
+
+    /**
+     * Returns the sub iterator for the current element.
+     *
+     * @return PHPUnit_Util_TestSuiteIterator
+     */
+    public function getChildren()
+    {
+        return new PHPUnit_Util_TestSuiteIterator(
+          $this->tests[$this->position]
+        );
+    }
+
+    /**
+     * Checks whether the current element has children.
+     *
+     * @return boolean
+     */
+    public function hasChildren()
+    {
+        return $this->tests[$this->position] instanceof PHPUnit_Framework_TestSuite;
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/Type.php b/vendor/phpunit/phpunit/src/Util/Type.php
new file mode 100644
index 00000000..d48d4c2b
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/Type.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Utility class for textual type (and value) representation.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Util_Type
+{
+    public static function isType($type)
+    {
+        return in_array(
+          $type,
+          array(
+            'numeric',
+            'integer',
+            'int',
+            'float',
+            'string',
+            'boolean',
+            'bool',
+            'null',
+            'array',
+            'object',
+            'resource',
+            'scalar'
+          )
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/src/Util/XML.php b/vendor/phpunit/phpunit/src/Util/XML.php
new file mode 100644
index 00000000..13d38bc9
--- /dev/null
+++ b/vendor/phpunit/phpunit/src/Util/XML.php
@@ -0,0 +1,978 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.2.0
+ */
+
+/**
+ * XML helpers.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.2.0
+ */
+class PHPUnit_Util_XML
+{
+    /**
+     * Escapes a string for the use in XML documents
+     * Any Unicode character is allowed, excluding the surrogate blocks, FFFE,
+     * and FFFF (not even as character reference).
+     * See http://www.w3.org/TR/xml/#charsets
+     *
+     * @param  string $string
+     * @return string
+     * @author Kore Nordmann <mail@kore-nordmann.de>
+     * @since  Method available since Release 3.4.6
+     */
+    public static function prepareString($string)
+    {
+        return preg_replace(
+          '/[\\x00-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]/',
+          '',
+          htmlspecialchars(
+            PHPUnit_Util_String::convertToUtf8($string), ENT_QUOTES, 'UTF-8'
+          )
+        );
+    }
+
+    /**
+     * Loads an XML (or HTML) file into a DOMDocument object.
+     *
+     * @param  string      $filename
+     * @param  boolean     $isHtml
+     * @param  boolean     $xinclude
+     * @param  boolean     $strict
+     * @return DOMDocument
+     * @since  Method available since Release 3.3.0
+     */
+    public static function loadFile($filename, $isHtml = false, $xinclude = false, $strict = false)
+    {
+        $reporting = error_reporting(0);
+        $contents  = file_get_contents($filename);
+        error_reporting($reporting);
+
+        if ($contents === false) {
+            throw new PHPUnit_Framework_Exception(
+              sprintf(
+                'Could not read "%s".',
+                $filename
+              )
+            );
+        }
+
+        return self::load($contents, $isHtml, $filename, $xinclude, $strict);
+    }
+
+    /**
+     * Load an $actual document into a DOMDocument.  This is called
+     * from the selector assertions.
+     *
+     * If $actual is already a DOMDocument, it is returned with
+     * no changes.  Otherwise, $actual is loaded into a new DOMDocument
+     * as either HTML or XML, depending on the value of $isHtml. If $isHtml is
+     * false and $xinclude is true, xinclude is performed on the loaded
+     * DOMDocument.
+     *
+     * Note: prior to PHPUnit 3.3.0, this method loaded a file and
+     * not a string as it currently does.  To load a file into a
+     * DOMDocument, use loadFile() instead.
+     *
+     * @param  string|DOMDocument $actual
+     * @param  boolean            $isHtml
+     * @param  string             $filename
+     * @param  boolean            $xinclude
+     * @param  boolean            $strict
+     * @return DOMDocument
+     * @since  Method available since Release 3.3.0
+     * @author Mike Naberezny <mike@maintainable.com>
+     * @author Derek DeVries <derek@maintainable.com>
+     * @author Tobias Schlitt <toby@php.net>
+     */
+    public static function load($actual, $isHtml = false, $filename = '', $xinclude = false, $strict = false)
+    {
+        if ($actual instanceof DOMDocument) {
+            return $actual;
+        }
+
+        // Required for XInclude on Windows.
+        if ($xinclude) {
+            $cwd = getcwd();
+            chdir(dirname($filename));
+        }
+
+        $document  = new DOMDocument;
+
+        $internal  = libxml_use_internal_errors(true);
+        $message   = '';
+        $reporting = error_reporting(0);
+
+        if ('' !== $filename) {
+            // Necessary for xinclude
+            $document->documentURI = $filename;
+        }
+
+        if ($isHtml) {
+            $loaded = $document->loadHTML($actual);
+        } else {
+            $loaded = $document->loadXML($actual);
+        }
+
+        if (!$isHtml && $xinclude) {
+            $document->xinclude();
+        }
+
+        foreach (libxml_get_errors() as $error) {
+            $message .= "\n" . $error->message;
+        }
+
+        libxml_use_internal_errors($internal);
+        error_reporting($reporting);
+
+        if ($xinclude) {
+            chdir($cwd);
+        }
+
+        if ($loaded === false || ($strict && $message !== '')) {
+            if ($filename !== '') {
+                throw new PHPUnit_Framework_Exception(
+                  sprintf(
+                    'Could not load "%s".%s',
+
+                    $filename,
+                    $message != '' ? "\n" . $message : ''
+                  )
+                );
+            } else {
+                throw new PHPUnit_Framework_Exception($message);
+            }
+        }
+
+        return $document;
+    }
+
+    /**
+     *
+     *
+     * @param  DOMNode $node
+     * @return string
+     * @since  Method available since Release 3.4.0
+     */
+    public static function nodeToText(DOMNode $node)
+    {
+        if ($node->childNodes->length == 1) {
+            return $node->nodeValue;
+        }
+
+        $result = '';
+
+        foreach ($node->childNodes as $childNode) {
+            $result .= $node->ownerDocument->saveXML($childNode);
+        }
+
+        return $result;
+    }
+
+    /**
+     *
+     *
+     * @param DOMNode $node
+     * @since  Method available since Release 3.3.0
+     * @author Mattis Stordalen Flister <mattis@xait.no>
+     */
+    public static function removeCharacterDataNodes(DOMNode $node)
+    {
+        if ($node->hasChildNodes()) {
+            for ($i = $node->childNodes->length - 1; $i >= 0; $i--) {
+                if (($child = $node->childNodes->item($i)) instanceof DOMCharacterData) {
+                    $node->removeChild($child);
+                }
+            }
+        }
+    }
+
+    /**
+     * "Convert" a DOMElement object into a PHP variable.
+     *
+     * @param  DOMElement $element
+     * @return mixed
+     * @since  Method available since Release 3.4.0
+     */
+    public static function xmlToVariable(DOMElement $element)
+    {
+        $variable = null;
+
+        switch ($element->tagName) {
+            case 'array': {
+                $variable = array();
+
+                foreach ($element->getElementsByTagName('element') as $element) {
+                    $value = self::xmlToVariable($element->childNodes->item(1));
+
+                    if ($element->hasAttribute('key')) {
+                        $variable[(string) $element->getAttribute('key')] = $value;
+                    } else {
+                        $variable[] = $value;
+                    }
+                }
+            }
+            break;
+
+            case 'object': {
+                $className = $element->getAttribute('class');
+
+                if ($element->hasChildNodes()) {
+                    $arguments       = $element->childNodes->item(1)->childNodes;
+                    $constructorArgs = array();
+
+                    foreach ($arguments as $argument) {
+                        if ($argument instanceof DOMElement) {
+                            $constructorArgs[] = self::xmlToVariable($argument);
+                        }
+                    }
+
+                    $class    = new ReflectionClass($className);
+                    $variable = $class->newInstanceArgs($constructorArgs);
+                } else {
+                    $variable = new $className;
+                }
+            }
+            break;
+
+            case 'boolean': {
+                $variable = $element->nodeValue == 'true' ? true : false;
+            }
+            break;
+
+            case 'integer':
+            case 'double':
+            case 'string': {
+                $variable = $element->nodeValue;
+
+                settype($variable, $element->tagName);
+            }
+            break;
+        }
+
+        return $variable;
+    }
+
+    /**
+     * Validate list of keys in the associative array.
+     *
+     * @param  array                       $hash
+     * @param  array                       $validKeys
+     * @return array
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.3.0
+     * @author Mike Naberezny <mike@maintainable.com>
+     * @author Derek DeVries <derek@maintainable.com>
+     */
+    public static function assertValidKeys(array $hash, array $validKeys)
+    {
+        $valids = array();
+
+        // Normalize validation keys so that we can use both indexed and
+        // associative arrays.
+        foreach ($validKeys as $key => $val) {
+            is_int($key) ? $valids[$val] = null : $valids[$key] = $val;
+        }
+
+        $validKeys = array_keys($valids);
+
+        // Check for invalid keys.
+        foreach ($hash as $key => $value) {
+            if (!in_array($key, $validKeys)) {
+                $unknown[] = $key;
+            }
+        }
+
+        if (!empty($unknown)) {
+            throw new PHPUnit_Framework_Exception(
+              'Unknown key(s): ' . implode(', ', $unknown)
+            );
+        }
+
+        // Add default values for any valid keys that are empty.
+        foreach ($valids as $key => $value) {
+            if (!isset($hash[$key])) {
+                $hash[$key] = $value;
+            }
+        }
+
+        return $hash;
+    }
+
+    /**
+     * Parse a CSS selector into an associative array suitable for
+     * use with findNodes().
+     *
+     * @param  string $selector
+     * @param  mixed  $content
+     * @return array
+     * @since  Method available since Release 3.3.0
+     * @author Mike Naberezny <mike@maintainable.com>
+     * @author Derek DeVries <derek@maintainable.com>
+     */
+    public static function convertSelectToTag($selector, $content = true)
+    {
+        $selector = trim(preg_replace("/\s+/", " ", $selector));
+
+        // substitute spaces within attribute value
+        while (preg_match('/\[[^\]]+"[^"]+\s[^"]+"\]/', $selector)) {
+            $selector = preg_replace(
+              '/(\[[^\]]+"[^"]+)\s([^"]+"\])/', "$1__SPACE__$2", $selector
+            );
+        }
+
+        if (strstr($selector, ' ')) {
+            $elements = explode(' ', $selector);
+        } else {
+            $elements = array($selector);
+        }
+
+        $previousTag = array();
+
+        foreach (array_reverse($elements) as $element) {
+            $element = str_replace('__SPACE__', ' ', $element);
+
+            // child selector
+            if ($element == '>') {
+                $previousTag = array('child' => $previousTag['descendant']);
+                continue;
+            }
+
+            // adjacent-sibling selector
+            if ($element == '+') {
+                $previousTag = array('adjacent-sibling' => $previousTag['descendant']);
+                continue;
+            }
+
+            $tag = array();
+
+            // match element tag
+            preg_match("/^([^\.#\[]*)/", $element, $eltMatches);
+
+            if (!empty($eltMatches[1])) {
+                $tag['tag'] = $eltMatches[1];
+            }
+
+            // match attributes (\[[^\]]*\]*), ids (#[^\.#\[]*),
+            // and classes (\.[^\.#\[]*))
+            preg_match_all(
+              "/(\[[^\]]*\]*|#[^\.#\[]*|\.[^\.#\[]*)/", $element, $matches
+            );
+
+            if (!empty($matches[1])) {
+                $classes = array();
+                $attrs   = array();
+
+                foreach ($matches[1] as $match) {
+                    // id matched
+                    if (substr($match, 0, 1) == '#') {
+                        $tag['id'] = substr($match, 1);
+                    }
+
+                    // class matched
+                    else if (substr($match, 0, 1) == '.') {
+                        $classes[] = substr($match, 1);
+                    }
+
+                    // attribute matched
+                    else if (substr($match, 0, 1) == '[' &&
+                             substr($match, -1, 1) == ']') {
+                        $attribute = substr($match, 1, strlen($match) - 2);
+                        $attribute = str_replace('"', '', $attribute);
+
+                        // match single word
+                        if (strstr($attribute, '~=')) {
+                            list($key, $value) = explode('~=', $attribute);
+                            $value             = "regexp:/.*\b$value\b.*/";
+                        }
+
+                        // match substring
+                        else if (strstr($attribute, '*=')) {
+                            list($key, $value) = explode('*=', $attribute);
+                            $value             = "regexp:/.*$value.*/";
+                        }
+
+                        // exact match
+                        else {
+                            list($key, $value) = explode('=', $attribute);
+                        }
+
+                        $attrs[$key] = $value;
+                    }
+                }
+
+                if ($classes) {
+                    $tag['class'] = join(' ', $classes);
+                }
+
+                if ($attrs) {
+                    $tag['attributes'] = $attrs;
+                }
+            }
+
+            // tag content
+            if (is_string($content)) {
+                $tag['content'] = $content;
+            }
+
+            // determine previous child/descendants
+            if (!empty($previousTag['descendant'])) {
+                $tag['descendant'] = $previousTag['descendant'];
+            } elseif (!empty($previousTag['child'])) {
+                $tag['child'] = $previousTag['child'];
+            } elseif (!empty($previousTag['adjacent-sibling'])) {
+                $tag['adjacent-sibling'] = $previousTag['adjacent-sibling'];
+                unset($tag['content']);
+            }
+
+            $previousTag = array('descendant' => $tag);
+        }
+
+        return $tag;
+    }
+
+    /**
+     * Parse an $actual document and return an array of DOMNodes
+     * matching the CSS $selector.  If an error occurs, it will
+     * return false.
+     *
+     * To only return nodes containing a certain content, give
+     * the $content to match as a string.  Otherwise, setting
+     * $content to true will return all nodes matching $selector.
+     *
+     * The $actual document may be a DOMDocument or a string
+     * containing XML or HTML, identified by $isHtml.
+     *
+     * @param  array         $selector
+     * @param  string        $content
+     * @param  mixed         $actual
+     * @param  boolean       $isHtml
+     * @return boolean|array
+     * @since  Method available since Release 3.3.0
+     * @author Mike Naberezny <mike@maintainable.com>
+     * @author Derek DeVries <derek@maintainable.com>
+     * @author Tobias Schlitt <toby@php.net>
+     */
+    public static function cssSelect($selector, $content, $actual, $isHtml = true)
+    {
+        $matcher = self::convertSelectToTag($selector, $content);
+        $dom     = self::load($actual, $isHtml);
+        $tags    = self::findNodes($dom, $matcher, $isHtml);
+
+        return $tags;
+    }
+
+    /**
+     * Parse out the options from the tag using DOM object tree.
+     *
+     * @param  DOMDocument $dom
+     * @param  array       $options
+     * @param  boolean     $isHtml
+     * @return array
+     * @since  Method available since Release 3.3.0
+     * @author Mike Naberezny <mike@maintainable.com>
+     * @author Derek DeVries <derek@maintainable.com>
+     * @author Tobias Schlitt <toby@php.net>
+     */
+    public static function findNodes(DOMDocument $dom, array $options, $isHtml = true)
+    {
+        $valid = array(
+          'id', 'class', 'tag', 'content', 'attributes', 'parent',
+          'child', 'ancestor', 'descendant', 'children', 'adjacent-sibling'
+        );
+
+        $filtered = array();
+        $options  = self::assertValidKeys($options, $valid);
+
+        // find the element by id
+        if ($options['id']) {
+            $options['attributes']['id'] = $options['id'];
+        }
+
+        if ($options['class']) {
+            $options['attributes']['class'] = $options['class'];
+        }
+
+        // find the element by a tag type
+        if ($options['tag']) {
+            if ($isHtml) {
+                $elements = self::getElementsByCaseInsensitiveTagName(
+                  $dom, $options['tag']
+                );
+            } else {
+                $elements = $dom->getElementsByTagName($options['tag']);
+            }
+
+            foreach ($elements as $element) {
+                $nodes[] = $element;
+            }
+
+            if (empty($nodes)) {
+                return false;
+            }
+        }
+
+        // no tag selected, get them all
+        else {
+            $tags = array(
+              'a', 'abbr', 'acronym', 'address', 'area', 'b', 'base', 'bdo',
+              'big', 'blockquote', 'body', 'br', 'button', 'caption', 'cite',
+              'code', 'col', 'colgroup', 'dd', 'del', 'div', 'dfn', 'dl',
+              'dt', 'em', 'fieldset', 'form', 'frame', 'frameset', 'h1', 'h2',
+              'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html', 'i', 'iframe',
+              'img', 'input', 'ins', 'kbd', 'label', 'legend', 'li', 'link',
+              'map', 'meta', 'noframes', 'noscript', 'object', 'ol', 'optgroup',
+              'option', 'p', 'param', 'pre', 'q', 'samp', 'script', 'select',
+              'small', 'span', 'strong', 'style', 'sub', 'sup', 'table',
+              'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'title',
+              'tr', 'tt', 'ul', 'var',
+              // HTML5
+              'article', 'aside', 'audio', 'bdi', 'canvas', 'command',
+              'datalist', 'details', 'dialog', 'embed', 'figure', 'figcaption',
+              'footer', 'header', 'hgroup', 'keygen', 'mark', 'meter', 'nav',
+              'output', 'progress', 'ruby', 'rt', 'rp', 'track', 'section',
+              'source', 'summary', 'time', 'video', 'wbr'
+            );
+
+            foreach ($tags as $tag) {
+                if ($isHtml) {
+                    $elements = self::getElementsByCaseInsensitiveTagName(
+                      $dom, $tag
+                    );
+                } else {
+                    $elements = $dom->getElementsByTagName($tag);
+                }
+
+                foreach ($elements as $element) {
+                    $nodes[] = $element;
+                }
+            }
+
+            if (empty($nodes)) {
+                return false;
+            }
+        }
+
+        // filter by attributes
+        if ($options['attributes']) {
+            foreach ($nodes as $node) {
+                $invalid = false;
+
+                foreach ($options['attributes'] as $name => $value) {
+                    // match by regexp if like "regexp:/foo/i"
+                    if (preg_match('/^regexp\s*:\s*(.*)/i', $value, $matches)) {
+                        if (!preg_match($matches[1], $node->getAttribute($name))) {
+                            $invalid = true;
+                        }
+                    }
+
+                    // class can match only a part
+                    else if ($name == 'class') {
+                        // split to individual classes
+                        $findClasses = explode(
+                          ' ', preg_replace("/\s+/", " ", $value)
+                        );
+
+                        $allClasses = explode(
+                          ' ',
+                          preg_replace("/\s+/", " ", $node->getAttribute($name))
+                        );
+
+                        // make sure each class given is in the actual node
+                        foreach ($findClasses as $findClass) {
+                            if (!in_array($findClass, $allClasses)) {
+                                $invalid = true;
+                            }
+                        }
+                    }
+
+                    // match by exact string
+                    else {
+                        if ($node->getAttribute($name) != $value) {
+                            $invalid = true;
+                        }
+                    }
+                }
+
+                // if every attribute given matched
+                if (!$invalid) {
+                    $filtered[] = $node;
+                }
+            }
+
+            $nodes    = $filtered;
+            $filtered = array();
+
+            if (empty($nodes)) {
+                return false;
+            }
+        }
+
+        // filter by content
+        if ($options['content'] !== null) {
+            foreach ($nodes as $node) {
+                $invalid = false;
+
+                // match by regexp if like "regexp:/foo/i"
+                if (preg_match('/^regexp\s*:\s*(.*)/i', $options['content'], $matches)) {
+                    if (!preg_match($matches[1], self::getNodeText($node))) {
+                        $invalid = true;
+                    }
+                }
+
+                // match empty string
+                else if ($options['content'] === '') {
+                    if (self::getNodeText($node) !== '') {
+                        $invalid = true;
+                    }
+                }
+
+                // match by exact string
+                else if (strstr(self::getNodeText($node), $options['content']) === false) {
+                    $invalid = true;
+                }
+
+                if (!$invalid) {
+                    $filtered[] = $node;
+                }
+            }
+
+            $nodes    = $filtered;
+            $filtered = array();
+
+            if (empty($nodes)) {
+                return false;
+            }
+        }
+
+        // filter by parent node
+        if ($options['parent']) {
+            $parentNodes = self::findNodes($dom, $options['parent'], $isHtml);
+            $parentNode  = isset($parentNodes[0]) ? $parentNodes[0] : null;
+
+            foreach ($nodes as $node) {
+                if ($parentNode !== $node->parentNode) {
+                    continue;
+                }
+
+                $filtered[] = $node;
+            }
+
+            $nodes    = $filtered;
+            $filtered = array();
+
+            if (empty($nodes)) {
+                return false;
+            }
+        }
+
+        // filter by child node
+        if ($options['child']) {
+            $childNodes = self::findNodes($dom, $options['child'], $isHtml);
+            $childNodes = !empty($childNodes) ? $childNodes : array();
+
+            foreach ($nodes as $node) {
+                foreach ($node->childNodes as $child) {
+                    foreach ($childNodes as $childNode) {
+                        if ($childNode === $child) {
+                            $filtered[] = $node;
+                        }
+                    }
+                }
+            }
+
+            $nodes    = $filtered;
+            $filtered = array();
+
+            if (empty($nodes)) {
+                return false;
+            }
+        }
+
+        // filter by adjacent-sibling
+        if ($options['adjacent-sibling']) {
+            $adjacentSiblingNodes = self::findNodes($dom, $options['adjacent-sibling'], $isHtml);
+            $adjacentSiblingNodes = !empty($adjacentSiblingNodes) ? $adjacentSiblingNodes : array();
+
+            foreach ($nodes as $node) {
+                $sibling = $node;
+
+                while ($sibling = $sibling->nextSibling) {
+                    if ($sibling->nodeType !== XML_ELEMENT_NODE) {
+                        continue;
+                    }
+
+                    foreach ($adjacentSiblingNodes as $adjacentSiblingNode) {
+                        if ($sibling === $adjacentSiblingNode) {
+                            $filtered[] = $node;
+                            break;
+                        }
+                    }
+
+                    break;
+                }
+            }
+
+            $nodes    = $filtered;
+            $filtered = array();
+
+            if (empty($nodes)) {
+                return false;
+            }
+        }
+
+        // filter by ancestor
+        if ($options['ancestor']) {
+            $ancestorNodes = self::findNodes($dom, $options['ancestor'], $isHtml);
+            $ancestorNode  = isset($ancestorNodes[0]) ? $ancestorNodes[0] : null;
+
+            foreach ($nodes as $node) {
+                $parent = $node->parentNode;
+
+                while ($parent && $parent->nodeType != XML_HTML_DOCUMENT_NODE) {
+                    if ($parent === $ancestorNode) {
+                        $filtered[] = $node;
+                    }
+
+                    $parent = $parent->parentNode;
+                }
+            }
+
+            $nodes    = $filtered;
+            $filtered = array();
+
+            if (empty($nodes)) {
+                return false;
+            }
+        }
+
+        // filter by descendant
+        if ($options['descendant']) {
+            $descendantNodes = self::findNodes($dom, $options['descendant'], $isHtml);
+            $descendantNodes = !empty($descendantNodes) ? $descendantNodes : array();
+
+            foreach ($nodes as $node) {
+                foreach (self::getDescendants($node) as $descendant) {
+                    foreach ($descendantNodes as $descendantNode) {
+                        if ($descendantNode === $descendant) {
+                            $filtered[] = $node;
+                        }
+                    }
+                }
+            }
+
+            $nodes    = $filtered;
+            $filtered = array();
+
+            if (empty($nodes)) {
+                return false;
+            }
+        }
+
+        // filter by children
+        if ($options['children']) {
+            $validChild   = array('count', 'greater_than', 'less_than', 'only');
+            $childOptions = self::assertValidKeys(
+                              $options['children'], $validChild
+                            );
+
+            foreach ($nodes as $node) {
+                $childNodes = $node->childNodes;
+
+                foreach ($childNodes as $childNode) {
+                    if ($childNode->nodeType !== XML_CDATA_SECTION_NODE &&
+                        $childNode->nodeType !== XML_TEXT_NODE) {
+                        $children[] = $childNode;
+                    }
+                }
+
+                // we must have children to pass this filter
+                if (!empty($children)) {
+                    // exact count of children
+                    if ($childOptions['count'] !== null) {
+                        if (count($children) !== $childOptions['count']) {
+                            break;
+                        }
+                    }
+
+                    // range count of children
+                    else if ($childOptions['less_than']    !== null &&
+                            $childOptions['greater_than'] !== null) {
+                        if (count($children) >= $childOptions['less_than'] ||
+                            count($children) <= $childOptions['greater_than']) {
+                            break;
+                        }
+                    }
+
+                    // less than a given count
+                    else if ($childOptions['less_than'] !== null) {
+                        if (count($children) >= $childOptions['less_than']) {
+                            break;
+                        }
+                    }
+
+                    // more than a given count
+                    else if ($childOptions['greater_than'] !== null) {
+                        if (count($children) <= $childOptions['greater_than']) {
+                            break;
+                        }
+                    }
+
+                    // match each child against a specific tag
+                    if ($childOptions['only']) {
+                        $onlyNodes = self::findNodes(
+                          $dom, $childOptions['only'], $isHtml
+                        );
+
+                        // try to match each child to one of the 'only' nodes
+                        foreach ($children as $child) {
+                            $matched = false;
+
+                            foreach ($onlyNodes as $onlyNode) {
+                                if ($onlyNode === $child) {
+                                    $matched = true;
+                                }
+                            }
+
+                            if (!$matched) {
+                                break 2;
+                            }
+                        }
+                    }
+
+                    $filtered[] = $node;
+                }
+            }
+
+            $nodes = $filtered;
+
+            if (empty($nodes)) {
+                return;
+            }
+        }
+
+        // return the first node that matches all criteria
+        return !empty($nodes) ? $nodes : array();
+    }
+
+    /**
+     * Recursively get flat array of all descendants of this node.
+     *
+     * @param  DOMNode $node
+     * @return array
+     * @since  Method available since Release 3.3.0
+     * @author Mike Naberezny <mike@maintainable.com>
+     * @author Derek DeVries <derek@maintainable.com>
+     */
+    protected static function getDescendants(DOMNode $node)
+    {
+        $allChildren = array();
+        $childNodes  = $node->childNodes ? $node->childNodes : array();
+
+        foreach ($childNodes as $child) {
+            if ($child->nodeType === XML_CDATA_SECTION_NODE ||
+                $child->nodeType === XML_TEXT_NODE) {
+                continue;
+            }
+
+            $children    = self::getDescendants($child);
+            $allChildren = array_merge($allChildren, $children, array($child));
+        }
+
+        return isset($allChildren) ? $allChildren : array();
+    }
+
+    /**
+     * Gets elements by case insensitive tagname.
+     *
+     * @param  DOMDocument $dom
+     * @param  string      $tag
+     * @return DOMNodeList
+     * @since  Method available since Release 3.4.0
+     */
+    protected static function getElementsByCaseInsensitiveTagName(DOMDocument $dom, $tag)
+    {
+        $elements = $dom->getElementsByTagName(strtolower($tag));
+
+        if ($elements->length == 0) {
+            $elements = $dom->getElementsByTagName(strtoupper($tag));
+        }
+
+        return $elements;
+    }
+
+    /**
+     * Get the text value of this node's child text node.
+     *
+     * @param  DOMNode $node
+     * @return string
+     * @since  Method available since Release 3.3.0
+     * @author Mike Naberezny <mike@maintainable.com>
+     * @author Derek DeVries <derek@maintainable.com>
+     */
+    protected static function getNodeText(DOMNode $node)
+    {
+        if (!$node->childNodes instanceof DOMNodeList) {
+            return '';
+        }
+
+        $result = '';
+
+        foreach ($node->childNodes as $childNode) {
+            if ($childNode->nodeType === XML_TEXT_NODE ||
+                $childNode->nodeType === XML_CDATA_SECTION_NODE) {
+                $result .= trim($childNode->data) . ' ';
+            } else {
+                $result .= self::getNodeText($childNode);
+            }
+        }
+
+        return str_replace('  ', ' ', $result);
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Extensions/RepeatedTestTest.php b/vendor/phpunit/phpunit/tests/Extensions/RepeatedTestTest.php
new file mode 100644
index 00000000..e934e9ba
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Extensions/RepeatedTestTest.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ * @covers     PHPUnit_Extensions_RepeatedTest
+ */
+class Extensions_RepeatedTestTest extends PHPUnit_Framework_TestCase
+{
+    protected $suite;
+
+    public function __construct()
+    {
+        $this->suite = new PHPUnit_Framework_TestSuite;
+
+        $this->suite->addTest(new Success);
+        $this->suite->addTest(new Success);
+    }
+
+    public function testRepeatedOnce()
+    {
+        $test = new PHPUnit_Extensions_RepeatedTest($this->suite, 1);
+        $this->assertEquals(2, count($test));
+
+        $result = $test->run();
+        $this->assertEquals(2, count($result));
+    }
+
+    public function testRepeatedMoreThanOnce()
+    {
+        $test = new PHPUnit_Extensions_RepeatedTest($this->suite, 3);
+        $this->assertEquals(6, count($test));
+
+        $result = $test->run();
+        $this->assertEquals(6, count($result));
+    }
+
+    public function testRepeatedZero()
+    {
+        $test = new PHPUnit_Extensions_RepeatedTest($this->suite, 0);
+        $this->assertEquals(0, count($test));
+
+        $result = $test->run();
+        $this->assertEquals(0, count($result));
+    }
+
+    public function testRepeatedNegative()
+    {
+        try {
+            $test = new PHPUnit_Extensions_RepeatedTest($this->suite, -1);
+        }
+
+        catch (Exception $e) {
+            return;
+        }
+
+        $this->fail('Should throw an Exception');
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Framework/AssertTest.php b/vendor/phpunit/phpunit/tests/Framework/AssertTest.php
new file mode 100644
index 00000000..17365208
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Framework/AssertTest.php
@@ -0,0 +1,4127 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class Framework_AssertTest extends PHPUnit_Framework_TestCase
+{
+    private $filesDirectory;
+
+    protected function setUp()
+    {
+        $this->filesDirectory = dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR;
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::fail
+     */
+    public function testFail()
+    {
+        try {
+            $this->fail();
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        throw new PHPUnit_Framework_AssertionFailedError('Fail did not throw fail exception');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertContains
+     */
+    public function testAssertSplObjectStorageContainsObject()
+    {
+        $a = new stdClass;
+        $b = new stdClass;
+        $c = new SplObjectStorage;
+        $c->attach($a);
+
+        $this->assertContains($a, $c);
+
+        try {
+            $this->assertContains($b, $c);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertContains
+     */
+    public function testAssertArrayContainsObject()
+    {
+        $a = new stdClass;
+        $b = new stdClass;
+
+        $this->assertContains($a, array($a));
+
+        try {
+            $this->assertContains($a, array($b));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertContains
+     */
+    public function testAssertArrayContainsString()
+    {
+        $this->assertContains('foo', array('foo'));
+
+        try {
+            $this->assertContains('foo', array('bar'));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertContains
+     */
+    public function testAssertArrayContainsNonObject()
+    {
+        $this->assertContains('foo', array(true));
+
+        try {
+            $this->assertContains('foo', array(true), '', false, true, true);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertContainsOnlyInstancesOf
+     */
+    public function testAssertContainsOnlyInstancesOf()
+    {
+        $test = array(
+            new Book(),
+            new Book
+        );
+        $this->assertContainsOnlyInstancesOf('Book', $test);
+        $this->assertContainsOnlyInstancesOf('stdClass', array(new stdClass()));
+
+        $test2 = array(
+            new Author('Test')
+        );
+        try {
+            $this->assertContainsOnlyInstancesOf('Book', $test2);
+        } catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+        $this->fail();
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertArrayHasKey
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertArrayHasKeyThrowsExceptionForInvalidFirstArgument()
+    {
+        $this->assertArrayHasKey(null, array());
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertArrayHasKey
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertArrayHasKeyThrowsExceptionForInvalidSecondArgument()
+    {
+        $this->assertArrayHasKey(0, null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertArrayHasKey
+     */
+    public function testAssertArrayHasIntegerKey()
+    {
+        $this->assertArrayHasKey(0, array('foo'));
+
+        try {
+            $this->assertArrayHasKey(1, array('foo'));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertArrayNotHasKey
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertArrayNotHasKeyThrowsExceptionForInvalidFirstArgument()
+    {
+        $this->assertArrayNotHasKey(null, array());
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertArrayNotHasKey
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertArrayNotHasKeyThrowsExceptionForInvalidSecondArgument()
+    {
+        $this->assertArrayNotHasKey(0, null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertArrayNotHasKey
+     */
+    public function testAssertArrayNotHasIntegerKey()
+    {
+        $this->assertArrayNotHasKey(1, array('foo'));
+
+        try {
+            $this->assertArrayNotHasKey(0, array('foo'));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertArrayHasKey
+     */
+    public function testAssertArrayHasStringKey()
+    {
+        $this->assertArrayHasKey('foo', array('foo' => 'bar'));
+
+        try {
+            $this->assertArrayHasKey('bar', array('foo' => 'bar'));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertArrayNotHasKey
+     */
+    public function testAssertArrayNotHasStringKey()
+    {
+        $this->assertArrayNotHasKey('bar', array('foo' => 'bar'));
+
+        try {
+            $this->assertArrayNotHasKey('foo', array('foo' => 'bar'));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertArrayHasKey
+     */
+    public function testAssertArrayHasKeyAcceptsArrayObjectValue()
+    {
+        $array = new ArrayObject();
+        $array['foo'] = 'bar';
+        $this->assertArrayHasKey('foo', $array);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertArrayHasKey
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertArrayHasKeyProperlyFailsWithArrayObjectValue()
+    {
+        $array = new ArrayObject();
+        $array['bar'] = 'bar';
+        $this->assertArrayHasKey('foo', $array);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertArrayHasKey
+     */
+    public function testAssertArrayHasKeyAcceptsArrayAccessValue()
+    {
+        $array = new SampleArrayAccess();
+        $array['foo'] = 'bar';
+        $this->assertArrayHasKey('foo', $array);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertArrayHasKey
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertArrayHasKeyProperlyFailsWithArrayAccessValue()
+    {
+        $array = new SampleArrayAccess();
+        $array['bar'] = 'bar';
+        $this->assertArrayHasKey('foo', $array);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertArrayNotHasKey
+     */
+    public function testAssertArrayNotHasKeyAcceptsArrayAccessValue()
+    {
+        $array = new ArrayObject();
+        $array['foo'] = 'bar';
+        $this->assertArrayNotHasKey('bar', $array);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertArrayNotHasKey
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertArrayNotHasKeyPropertlyFailsWithArrayAccessValue()
+    {
+        $array = new ArrayObject();
+        $array['bar'] = 'bar';
+        $this->assertArrayNotHasKey('bar', $array);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertContains
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertContainsThrowsException()
+    {
+        $this->assertContains(null, null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertContains
+     */
+    public function testAssertIteratorContainsObject()
+    {
+        $foo = new stdClass;
+
+        $this->assertContains($foo, new TestIterator(array($foo)));
+
+        try {
+            $this->assertContains($foo, new TestIterator(array(new stdClass)));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertContains
+     */
+    public function testAssertIteratorContainsString()
+    {
+        $this->assertContains('foo', new TestIterator(array('foo')));
+
+        try {
+            $this->assertContains('foo', new TestIterator(array('bar')));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertContains
+     */
+    public function testAssertStringContainsString()
+    {
+        $this->assertContains('foo', 'foobar');
+
+        try {
+            $this->assertContains('foo', 'bar');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertNotContains
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotContainsThrowsException()
+    {
+        $this->assertNotContains(null, null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotContains
+     */
+    public function testAssertSplObjectStorageNotContainsObject()
+    {
+        $a = new stdClass;
+        $b = new stdClass;
+        $c = new SplObjectStorage;
+        $c->attach($a);
+
+        $this->assertNotContains($b, $c);
+
+        try {
+            $this->assertNotContains($a, $c);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotContains
+     */
+    public function testAssertArrayNotContainsObject()
+    {
+        $a = new stdClass;
+        $b = new stdClass;
+
+        $this->assertNotContains($a, array($b));
+
+        try {
+            $this->assertNotContains($a, array($a));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotContains
+     */
+    public function testAssertArrayNotContainsString()
+    {
+        $this->assertNotContains('foo', array('bar'));
+
+        try {
+            $this->assertNotContains('foo', array('foo'));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotContains
+     */
+    public function testAssertArrayNotContainsNonObject()
+    {
+        $this->assertNotContains('foo', array(true), '', false, true, true);
+
+        try {
+            $this->assertNotContains('foo', array(true));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotContains
+     */
+    public function testAssertStringNotContainsString()
+    {
+        $this->assertNotContains('foo', 'bar');
+
+        try {
+            $this->assertNotContains('foo', 'foo');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertContainsOnly
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertContainsOnlyThrowsException()
+    {
+        $this->assertContainsOnly(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertNotContainsOnly
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotContainsOnlyThrowsException()
+    {
+        $this->assertNotContainsOnly(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertContainsOnlyInstancesOf
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertContainsOnlyInstancesOfThrowsException()
+    {
+        $this->assertContainsOnlyInstancesOf(null, null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertContainsOnly
+     */
+    public function testAssertArrayContainsOnlyIntegers()
+    {
+        $this->assertContainsOnly('integer', array(1, 2, 3));
+
+        try {
+            $this->assertContainsOnly('integer', array("1", 2, 3));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotContainsOnly
+     */
+    public function testAssertArrayNotContainsOnlyIntegers()
+    {
+        $this->assertNotContainsOnly('integer', array("1", 2, 3));
+
+        try {
+            $this->assertNotContainsOnly('integer', array(1, 2, 3));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertContainsOnly
+     */
+    public function testAssertArrayContainsOnlyStdClass()
+    {
+        $this->assertContainsOnly('StdClass', array(new StdClass));
+
+        try {
+            $this->assertContainsOnly('StdClass', array('StdClass'));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotContainsOnly
+     */
+    public function testAssertArrayNotContainsOnlyStdClass()
+    {
+        $this->assertNotContainsOnly('StdClass', array('StdClass'));
+
+        try {
+            $this->assertNotContainsOnly('StdClass', array(new StdClass));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    protected function createDOMDocument($content)
+    {
+        $document = new DOMDocument;
+        $document->preserveWhiteSpace = false;
+        $document->loadXML($content);
+
+        return $document;
+    }
+
+    protected function sameValues()
+    {
+        $object = new SampleClass(4, 8, 15);
+        // cannot use $filesDirectory, because neither setUp() nor
+        // setUpBeforeClass() are executed before the data providers
+        $file = dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'foo.xml';
+        $resource = fopen($file, 'r');
+
+        return array(
+            // null
+            array(null, null),
+            // strings
+            array('a', 'a'),
+            // integers
+            array(0, 0),
+            // floats
+            array(2.3, 2.3),
+            array(1/3, 1 - 2/3),
+            array(log(0), log(0)),
+            // arrays
+            array(array(), array()),
+            array(array(0 => 1), array(0 => 1)),
+            array(array(0 => null), array(0 => null)),
+            array(array('a', 'b' => array(1, 2)), array('a', 'b' => array(1, 2))),
+            // objects
+            array($object, $object),
+            // resources
+            array($resource, $resource),
+        );
+    }
+
+    protected function notEqualValues()
+    {
+        // cyclic dependencies
+        $book1 = new Book;
+        $book1->author = new Author('Terry Pratchett');
+        $book1->author->books[] = $book1;
+        $book2 = new Book;
+        $book2->author = new Author('Terry Pratch');
+        $book2->author->books[] = $book2;
+
+        $book3 = new Book;
+        $book3->author = 'Terry Pratchett';
+        $book4 = new stdClass;
+        $book4->author = 'Terry Pratchett';
+
+        $object1 = new SampleClass( 4,  8, 15);
+        $object2 = new SampleClass(16, 23, 42);
+        $object3 = new SampleClass( 4,  8, 15);
+        $storage1 = new SplObjectStorage;
+        $storage1->attach($object1);
+        $storage2 = new SplObjectStorage;
+        $storage2->attach($object3); // same content, different object
+
+        // cannot use $filesDirectory, because neither setUp() nor
+        // setUpBeforeClass() are executed before the data providers
+        $file = dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'foo.xml';
+
+        return array(
+            // strings
+            array('a', 'b'),
+            array('a', 'A'),
+            // https://github.com/sebastianbergmann/phpunit/issues/1023
+            array('9E6666666','9E7777777'),
+            // integers
+            array(1, 2),
+            array(2, 1),
+            // floats
+            array(2.3, 4.2),
+            array(2.3, 4.2, 0.5),
+            array(array(2.3), array(4.2), 0.5),
+            array(array(array(2.3)), array(array(4.2)), 0.5),
+            array(new Struct(2.3), new Struct(4.2), 0.5),
+            array(array(new Struct(2.3)), array(new Struct(4.2)), 0.5),
+            // NAN
+            array(NAN, NAN),
+            // arrays
+            array(array(), array(0 => 1)),
+            array(array(0 => 1), array()),
+            array(array(0 => null), array()),
+            array(array(0 => 1, 1 => 2), array(0 => 1, 1 => 3)),
+            array(array('a', 'b' => array(1, 2)), array('a', 'b' => array(2, 1))),
+            // objects
+            array(new SampleClass(4, 8, 15), new SampleClass(16, 23, 42)),
+            array($object1, $object2),
+            array($book1, $book2),
+            array($book3, $book4), // same content, different class
+            // resources
+            array(fopen($file, 'r'), fopen($file, 'r')),
+            // SplObjectStorage
+            array($storage1, $storage2),
+            // DOMDocument
+            array(
+                $this->createDOMDocument('<root></root>'),
+                $this->createDOMDocument('<bar/>'),
+            ),
+            array(
+                $this->createDOMDocument('<foo attr1="bar"/>'),
+                $this->createDOMDocument('<foo attr1="foobar"/>'),
+            ),
+            array(
+                $this->createDOMDocument('<foo> bar </foo>'),
+                $this->createDOMDocument('<foo />'),
+            ),
+            array(
+                $this->createDOMDocument('<foo xmlns="urn:myns:bar"/>'),
+                $this->createDOMDocument('<foo xmlns="urn:notmyns:bar"/>'),
+            ),
+            array(
+                $this->createDOMDocument('<foo> bar </foo>'),
+                $this->createDOMDocument('<foo> bir </foo>'),
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/New_York')),
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/New_York')),
+                3500
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 05:13:35', new DateTimeZone('America/New_York')),
+                3500
+            ),
+            array(
+                new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+            ),
+            array(
+                new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+                43200
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/Chicago')),
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/Chicago')),
+                3500
+            ),
+            array(
+                new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-30', new DateTimeZone('America/Chicago')),
+            ),
+            array(
+                new DateTime('2013-03-29T05:13:35-0600'),
+                new DateTime('2013-03-29T04:13:35-0600'),
+            ),
+            array(
+                new DateTime('2013-03-29T05:13:35-0600'),
+                new DateTime('2013-03-29T05:13:35-0500'),
+            ),
+            // Exception
+            //array(new Exception('Exception 1'), new Exception('Exception 2')),
+            // different types
+            array(new SampleClass(4, 8, 15), false),
+            array(false, new SampleClass(4, 8, 15)),
+            array(array(0 => 1, 1 => 2), false),
+            array(false, array(0 => 1, 1 => 2)),
+            array(array(), new stdClass),
+            array(new stdClass, array()),
+            // PHP: 0 == 'Foobar' => true!
+            // We want these values to differ
+            array(0, 'Foobar'),
+            array('Foobar', 0),
+            array(3, acos(8)),
+            array(acos(8), 3)
+        );
+    }
+
+    protected function equalValues()
+    {
+        // cyclic dependencies
+        $book1 = new Book;
+        $book1->author = new Author('Terry Pratchett');
+        $book1->author->books[] = $book1;
+        $book2 = new Book;
+        $book2->author = new Author('Terry Pratchett');
+        $book2->author->books[] = $book2;
+
+        $object1 = new SampleClass(4, 8, 15);
+        $object2 = new SampleClass(4, 8, 15);
+        $storage1 = new SplObjectStorage;
+        $storage1->attach($object1);
+        $storage2 = new SplObjectStorage;
+        $storage2->attach($object1);
+
+        return array(
+            // strings
+            array('a', 'A', 0, false, true), // ignore case
+            // arrays
+            array(array('a' => 1, 'b' => 2), array('b' => 2, 'a' => 1)),
+            array(array(1), array('1')),
+            array(array(3, 2, 1), array(2, 3, 1), 0, true), // canonicalized comparison
+            // floats
+            array(2.3, 2.5, 0.5),
+            array(array(2.3), array(2.5), 0.5),
+            array(array(array(2.3)), array(array(2.5)), 0.5),
+            array(new Struct(2.3), new Struct(2.5), 0.5),
+            array(array(new Struct(2.3)), array(new Struct(2.5)), 0.5),
+            // numeric with delta
+            array(1, 2, 1),
+            // objects
+            array($object1, $object2),
+            array($book1, $book2),
+            // SplObjectStorage
+            array($storage1, $storage2),
+            // DOMDocument
+            array(
+                $this->createDOMDocument('<root></root>'),
+                $this->createDOMDocument('<root/>'),
+            ),
+            array(
+                $this->createDOMDocument('<root attr="bar"></root>'),
+                $this->createDOMDocument('<root attr="bar"/>'),
+            ),
+            array(
+                $this->createDOMDocument('<root><foo attr="bar"></foo></root>'),
+                $this->createDOMDocument('<root><foo attr="bar"/></root>'),
+            ),
+            array(
+                $this->createDOMDocument("<root>\n  <child/>\n</root>"),
+                $this->createDOMDocument('<root><child/></root>'),
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 04:13:25', new DateTimeZone('America/New_York')),
+                10
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 04:14:40', new DateTimeZone('America/New_York')),
+                65
+            ),
+            array(
+                new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/Chicago')),
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 03:13:49', new DateTimeZone('America/Chicago')),
+                15
+            ),
+            array(
+                new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 23:00:00', new DateTimeZone('America/Chicago')),
+            ),
+            array(
+                new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 23:01:30', new DateTimeZone('America/Chicago')),
+                100
+            ),
+            array(
+                new DateTime('@1364616000'),
+                new DateTime('2013-03-29 23:00:00', new DateTimeZone('America/Chicago')),
+            ),
+            array(
+                new DateTime('2013-03-29T05:13:35-0500'),
+                new DateTime('2013-03-29T04:13:35-0600'),
+            ),
+            // Exception
+            //array(new Exception('Exception 1'), new Exception('Exception 1')),
+            // mixed types
+            array(0, '0'),
+            array('0', 0),
+            array(2.3, '2.3'),
+            array('2.3', 2.3),
+            array((string)(1/3), 1 - 2/3),
+            array(1/3, (string)(1 - 2/3)),
+            array('string representation', new ClassWithToString),
+            array(new ClassWithToString, 'string representation'),
+        );
+    }
+
+    public function equalProvider()
+    {
+        // same |= equal
+        return array_merge($this->equalValues(), $this->sameValues());
+    }
+
+    public function notEqualProvider()
+    {
+        return $this->notEqualValues();
+    }
+
+    public function sameProvider()
+    {
+        return $this->sameValues();
+    }
+
+    public function notSameProvider()
+    {
+        // not equal |= not same
+        // equal, ¬same |= not same
+        return array_merge($this->notEqualValues(), $this->equalValues());
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertEquals
+     * @dataProvider equalProvider
+     */
+    public function testAssertEqualsSucceeds($a, $b, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
+    {
+        $this->assertEquals($a, $b, '', $delta, 10, $canonicalize, $ignoreCase);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertEquals
+     * @dataProvider notEqualProvider
+     */
+    public function testAssertEqualsFails($a, $b, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
+    {
+        try {
+            $this->assertEquals($a, $b, '', $delta, 10, $canonicalize, $ignoreCase);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotEquals
+     * @dataProvider notEqualProvider
+     */
+    public function testAssertNotEqualsSucceeds($a, $b, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
+    {
+        $this->assertNotEquals($a, $b, '', $delta, 10, $canonicalize, $ignoreCase);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotEquals
+     * @dataProvider equalProvider
+     */
+    public function testAssertNotEqualsFails($a, $b, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
+    {
+        try {
+            $this->assertNotEquals($a, $b, '', $delta, 10, $canonicalize, $ignoreCase);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSame
+     * @dataProvider sameProvider
+     */
+    public function testAssertSameSucceeds($a, $b)
+    {
+        $this->assertSame($a, $b);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSame
+     * @dataProvider notSameProvider
+     */
+    public function testAssertSameFails($a, $b)
+    {
+        try {
+            $this->assertSame($a, $b);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotSame
+     * @dataProvider notSameProvider
+     */
+    public function testAssertNotSameSucceeds($a, $b)
+    {
+        $this->assertNotSame($a, $b);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotSame
+     * @dataProvider sameProvider
+     */
+    public function testAssertNotSameFails($a, $b)
+    {
+        try {
+            $this->assertNotSame($a, $b);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertXmlFileEqualsXmlFile
+     */
+    public function testAssertXmlFileEqualsXmlFile()
+    {
+        $this->assertXmlFileEqualsXmlFile(
+          $this->filesDirectory . 'foo.xml',
+          $this->filesDirectory . 'foo.xml'
+        );
+
+        try {
+            $this->assertXmlFileEqualsXmlFile(
+              $this->filesDirectory . 'foo.xml',
+              $this->filesDirectory . 'bar.xml'
+            );
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertXmlFileNotEqualsXmlFile
+     */
+    public function testAssertXmlFileNotEqualsXmlFile()
+    {
+        $this->assertXmlFileNotEqualsXmlFile(
+          $this->filesDirectory . 'foo.xml',
+          $this->filesDirectory . 'bar.xml'
+        );
+
+        try {
+            $this->assertXmlFileNotEqualsXmlFile(
+              $this->filesDirectory . 'foo.xml',
+              $this->filesDirectory . 'foo.xml'
+            );
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertXmlStringEqualsXmlFile
+     */
+    public function testAssertXmlStringEqualsXmlFile()
+    {
+        $this->assertXmlStringEqualsXmlFile(
+          $this->filesDirectory . 'foo.xml',
+          file_get_contents($this->filesDirectory . 'foo.xml')
+        );
+
+        try {
+            $this->assertXmlStringEqualsXmlFile(
+              $this->filesDirectory . 'foo.xml',
+              file_get_contents($this->filesDirectory . 'bar.xml')
+            );
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertXmlStringNotEqualsXmlFile
+     */
+    public function testXmlStringNotEqualsXmlFile()
+    {
+        $this->assertXmlStringNotEqualsXmlFile(
+          $this->filesDirectory . 'foo.xml',
+          file_get_contents($this->filesDirectory . 'bar.xml')
+        );
+
+        try {
+            $this->assertXmlStringNotEqualsXmlFile(
+              $this->filesDirectory . 'foo.xml',
+              file_get_contents($this->filesDirectory . 'foo.xml')
+            );
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertXmlStringEqualsXmlString
+     */
+    public function testAssertXmlStringEqualsXmlString()
+    {
+        $this->assertXmlStringEqualsXmlString('<root/>', '<root/>');
+
+        try {
+            $this->assertXmlStringEqualsXmlString('<foo/>', '<bar/>');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertXmlStringNotEqualsXmlString
+     */
+    public function testAssertXmlStringNotEqualsXmlString()
+    {
+        $this->assertXmlStringNotEqualsXmlString('<foo/>', '<bar/>');
+
+        try {
+            $this->assertXmlStringNotEqualsXmlString('<root/>', '<root/>');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertEqualXMLStructure
+     */
+    public function testXMLStructureIsSame()
+    {
+        $expected = new DOMDocument;
+        $expected->load($this->filesDirectory . 'structureExpected.xml');
+
+        $actual = new DOMDocument;
+        $actual->load($this->filesDirectory . 'structureExpected.xml');
+
+        $this->assertEqualXMLStructure(
+          $expected->firstChild, $actual->firstChild, true
+        );
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertEqualXMLStructure
+     * @expectedException PHPUnit_Framework_ExpectationFailedException
+     */
+    public function testXMLStructureWrongNumberOfAttributes()
+    {
+        $expected = new DOMDocument;
+        $expected->load($this->filesDirectory . 'structureExpected.xml');
+
+        $actual = new DOMDocument;
+        $actual->load($this->filesDirectory . 'structureWrongNumberOfAttributes.xml');
+
+        $this->assertEqualXMLStructure(
+          $expected->firstChild, $actual->firstChild, true
+        );
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertEqualXMLStructure
+     * @expectedException PHPUnit_Framework_ExpectationFailedException
+     */
+    public function testXMLStructureWrongNumberOfNodes()
+    {
+        $expected = new DOMDocument;
+        $expected->load($this->filesDirectory . 'structureExpected.xml');
+
+        $actual = new DOMDocument;
+        $actual->load($this->filesDirectory . 'structureWrongNumberOfNodes.xml');
+
+        $this->assertEqualXMLStructure(
+          $expected->firstChild, $actual->firstChild, true
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertEqualXMLStructure
+     */
+    public function testXMLStructureIsSameButDataIsNot()
+    {
+        $expected = new DOMDocument;
+        $expected->load($this->filesDirectory . 'structureExpected.xml');
+
+        $actual = new DOMDocument;
+        $actual->load($this->filesDirectory . 'structureIsSameButDataIsNot.xml');
+
+        $this->assertEqualXMLStructure(
+          $expected->firstChild, $actual->firstChild, true
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertEqualXMLStructure
+     */
+    public function testXMLStructureAttributesAreSameButValuesAreNot()
+    {
+        $expected = new DOMDocument;
+        $expected->load($this->filesDirectory . 'structureExpected.xml');
+
+        $actual = new DOMDocument;
+        $actual->load($this->filesDirectory . 'structureAttributesAreSameButValuesAreNot.xml');
+
+        $this->assertEqualXMLStructure(
+          $expected->firstChild, $actual->firstChild, true
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertEqualXMLStructure
+     */
+    public function testXMLStructureIgnoreTextNodes()
+    {
+        $expected = new DOMDocument;
+        $expected->load($this->filesDirectory . 'structureExpected.xml');
+
+        $actual = new DOMDocument;
+        $actual->load($this->filesDirectory . 'structureIgnoreTextNodes.xml');
+
+        $this->assertEqualXMLStructure(
+          $expected->firstChild, $actual->firstChild, true
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertEquals
+     */
+    public function testAssertStringEqualsNumeric()
+    {
+        $this->assertEquals('0', 0);
+
+        try {
+            $this->assertEquals('0', 1);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotEquals
+     */
+    public function testAssertStringEqualsNumeric2()
+    {
+        $this->assertNotEquals('A', 0);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertFileExists
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertFileExistsThrowsException()
+    {
+        $this->assertFileExists(null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertFileExists
+     */
+    public function testAssertFileExists()
+    {
+        $this->assertFileExists(__FILE__);
+
+        try {
+            $this->assertFileExists(__DIR__ . DIRECTORY_SEPARATOR . 'NotExisting');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertFileNotExists
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertFileNotExistsThrowsException()
+    {
+        $this->assertFileNotExists(null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertFileNotExists
+     */
+    public function testAssertFileNotExists()
+    {
+        $this->assertFileNotExists(__DIR__ . DIRECTORY_SEPARATOR . 'NotExisting');
+
+        try {
+            $this->assertFileNotExists(__FILE__);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertObjectHasAttribute
+     */
+    public function testAssertObjectHasAttribute()
+    {
+        $o = new Author('Terry Pratchett');
+
+        $this->assertObjectHasAttribute('name', $o);
+
+        try {
+            $this->assertObjectHasAttribute('foo', $o);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertObjectNotHasAttribute
+     */
+    public function testAssertObjectNotHasAttribute()
+    {
+        $o = new Author('Terry Pratchett');
+
+        $this->assertObjectNotHasAttribute('foo', $o);
+
+        try {
+            $this->assertObjectNotHasAttribute('name', $o);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNull
+     */
+    public function testAssertNull()
+    {
+        $this->assertNull(null);
+
+        try {
+            $this->assertNull(new stdClass);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotNull
+     */
+    public function testAssertNotNull()
+    {
+        $this->assertNotNull(new stdClass);
+
+        try {
+            $this->assertNotNull(null);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTrue
+     */
+    public function testAssertTrue()
+    {
+        $this->assertTrue(true);
+
+        try {
+            $this->assertTrue(false);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotTrue
+     */
+    public function testAssertNotTrue()
+    {
+        $this->assertNotTrue(false);
+        $this->assertNotTrue(1);
+        $this->assertNotTrue("true");
+
+        try {
+            $this->assertNotTrue(true);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertFalse
+     */
+    public function testAssertFalse()
+    {
+        $this->assertFalse(false);
+
+        try {
+            $this->assertFalse(true);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotFalse
+     */
+    public function testAssertNotFalse()
+    {
+        $this->assertNotFalse(true);
+        $this->assertNotFalse(0);
+        $this->assertNotFalse("");
+
+        try {
+            $this->assertNotFalse(false);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertRegExp
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertRegExpThrowsException()
+    {
+        $this->assertRegExp(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertRegExp
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertRegExpThrowsException2()
+    {
+        $this->assertRegExp('', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertNotRegExp
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotRegExpThrowsException()
+    {
+        $this->assertNotRegExp(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertNotRegExp
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotRegExpThrowsException2()
+    {
+        $this->assertNotRegExp('', null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertRegExp
+     */
+    public function testAssertRegExp()
+    {
+        $this->assertRegExp('/foo/', 'foobar');
+
+        try {
+            $this->assertRegExp('/foo/', 'bar');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotRegExp
+     */
+    public function testAssertNotRegExp()
+    {
+        $this->assertNotRegExp('/foo/', 'bar');
+
+        try {
+            $this->assertNotRegExp('/foo/', 'foobar');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSame
+     */
+    public function testAssertSame()
+    {
+        $o = new stdClass;
+
+        $this->assertSame($o, $o);
+
+        try {
+            $this->assertSame(
+              new stdClass,
+              new stdClass
+            );
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSame
+     */
+    public function testAssertSame2()
+    {
+        $this->assertSame(true, true);
+        $this->assertSame(false, false);
+
+        try {
+            $this->assertSame(true, false);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotSame
+     */
+    public function testAssertNotSame()
+    {
+        $this->assertNotSame(
+          new stdClass,
+          null
+        );
+
+        $this->assertNotSame(
+          null,
+          new stdClass
+        );
+
+        $this->assertNotSame(
+          new stdClass,
+          new stdClass
+        );
+
+        $o = new stdClass;
+
+        try {
+            $this->assertNotSame($o, $o);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotSame
+     */
+    public function testAssertNotSame2()
+    {
+        $this->assertNotSame(true, false);
+        $this->assertNotSame(false, true);
+
+        try {
+            $this->assertNotSame(true, true);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotSame
+     */
+    public function testAssertNotSameFailsNull()
+    {
+        try {
+            $this->assertNotSame(null, null);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertGreaterThan
+     */
+    public function testGreaterThan()
+    {
+        $this->assertGreaterThan(1, 2);
+
+        try {
+            $this->assertGreaterThan(2, 1);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeGreaterThan
+     */
+    public function testAttributeGreaterThan()
+    {
+        $this->assertAttributeGreaterThan(
+          1, 'bar', new ClassWithNonPublicAttributes
+        );
+
+        try {
+            $this->assertAttributeGreaterThan(
+              1, 'foo', new ClassWithNonPublicAttributes
+            );
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertGreaterThanOrEqual
+     */
+    public function testGreaterThanOrEqual()
+    {
+        $this->assertGreaterThanOrEqual(1, 2);
+
+        try {
+            $this->assertGreaterThanOrEqual(2, 1);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeGreaterThanOrEqual
+     */
+    public function testAttributeGreaterThanOrEqual()
+    {
+        $this->assertAttributeGreaterThanOrEqual(
+          1, 'bar', new ClassWithNonPublicAttributes
+        );
+
+        try {
+            $this->assertAttributeGreaterThanOrEqual(
+              2, 'foo', new ClassWithNonPublicAttributes
+            );
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertLessThan
+     */
+    public function testLessThan()
+    {
+        $this->assertLessThan(2, 1);
+
+        try {
+            $this->assertLessThan(1, 2);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeLessThan
+     */
+    public function testAttributeLessThan()
+    {
+        $this->assertAttributeLessThan(
+          2, 'foo', new ClassWithNonPublicAttributes
+        );
+
+        try {
+            $this->assertAttributeLessThan(
+              1, 'bar', new ClassWithNonPublicAttributes
+            );
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertLessThanOrEqual
+     */
+    public function testLessThanOrEqual()
+    {
+        $this->assertLessThanOrEqual(2, 1);
+
+        try {
+            $this->assertLessThanOrEqual(1, 2);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeLessThanOrEqual
+     */
+    public function testAttributeLessThanOrEqual()
+    {
+        $this->assertAttributeLessThanOrEqual(
+          2, 'foo', new ClassWithNonPublicAttributes
+        );
+
+        try {
+            $this->assertAttributeLessThanOrEqual(
+              1, 'bar', new ClassWithNonPublicAttributes
+            );
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::readAttribute
+     * @covers PHPUnit_Framework_Assert::getStaticAttribute
+     * @covers PHPUnit_Framework_Assert::getObjectAttribute
+     */
+    public function testReadAttribute()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertEquals('foo', $this->readAttribute($obj, 'publicAttribute'));
+        $this->assertEquals('bar', $this->readAttribute($obj, 'protectedAttribute'));
+        $this->assertEquals('baz', $this->readAttribute($obj, 'privateAttribute'));
+        $this->assertEquals('bar', $this->readAttribute($obj, 'protectedParentAttribute'));
+        //$this->assertEquals('bar', $this->readAttribute($obj, 'privateParentAttribute'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::readAttribute
+     * @covers PHPUnit_Framework_Assert::getStaticAttribute
+     * @covers PHPUnit_Framework_Assert::getObjectAttribute
+     */
+    public function testReadAttribute2()
+    {
+        $this->assertEquals('foo', $this->readAttribute('ClassWithNonPublicAttributes', 'publicStaticAttribute'));
+        $this->assertEquals('bar', $this->readAttribute('ClassWithNonPublicAttributes', 'protectedStaticAttribute'));
+        $this->assertEquals('baz', $this->readAttribute('ClassWithNonPublicAttributes', 'privateStaticAttribute'));
+        $this->assertEquals('foo', $this->readAttribute('ClassWithNonPublicAttributes', 'protectedStaticParentAttribute'));
+        $this->assertEquals('foo', $this->readAttribute('ClassWithNonPublicAttributes', 'privateStaticParentAttribute'));
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::readAttribute
+     * @covers            PHPUnit_Framework_Assert::getStaticAttribute
+     * @covers            PHPUnit_Framework_Assert::getObjectAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testReadAttribute3()
+    {
+        $this->readAttribute('StdClass', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::readAttribute
+     * @covers            PHPUnit_Framework_Assert::getStaticAttribute
+     * @covers            PHPUnit_Framework_Assert::getObjectAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testReadAttribute4()
+    {
+        $this->readAttribute('NotExistingClass', 'foo');
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::readAttribute
+     * @covers            PHPUnit_Framework_Assert::getStaticAttribute
+     * @covers            PHPUnit_Framework_Assert::getObjectAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testReadAttribute5()
+    {
+        $this->readAttribute(null, 'foo');
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::readAttribute
+     * @covers            PHPUnit_Framework_Assert::getStaticAttribute
+     * @covers            PHPUnit_Framework_Assert::getObjectAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testReadAttributeIfAttributeNameIsNotValid()
+    {
+        $this->readAttribute('StdClass', '2');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetStaticAttributeRaisesExceptionForInvalidFirstArgument()
+    {
+        $this->getStaticAttribute(null, 'foo');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetStaticAttributeRaisesExceptionForInvalidFirstArgument2()
+    {
+        $this->getStaticAttribute('NotExistingClass', 'foo');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetStaticAttributeRaisesExceptionForInvalidSecondArgument()
+    {
+        $this->getStaticAttribute('stdClass', null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetStaticAttributeRaisesExceptionForInvalidSecondArgument2()
+    {
+        $this->getStaticAttribute('stdClass', '0');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetStaticAttributeRaisesExceptionForInvalidSecondArgument3()
+    {
+        $this->getStaticAttribute('stdClass', 'foo');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getObjectAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetObjectAttributeRaisesExceptionForInvalidFirstArgument()
+    {
+        $this->getObjectAttribute(null, 'foo');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getObjectAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetObjectAttributeRaisesExceptionForInvalidSecondArgument()
+    {
+        $this->getObjectAttribute(new stdClass, null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getObjectAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetObjectAttributeRaisesExceptionForInvalidSecondArgument2()
+    {
+        $this->getObjectAttribute(new stdClass, '0');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getObjectAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetObjectAttributeRaisesExceptionForInvalidSecondArgument3()
+    {
+        $this->getObjectAttribute(new stdClass, 'foo');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getObjectAttribute
+     */
+    public function testGetObjectAttributeWorksForInheritedAttributes()
+    {
+        $this->assertEquals(
+          'bar',
+          $this->getObjectAttribute(new ClassWithNonPublicAttributes, 'privateParentAttribute')
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeContains
+     */
+    public function testAssertPublicAttributeContains()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeContains('foo', 'publicArray', $obj);
+
+        try {
+            $this->assertAttributeContains('bar', 'publicArray', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeContainsOnly
+     */
+    public function testAssertPublicAttributeContainsOnly()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeContainsOnly('string', 'publicArray', $obj);
+
+        try {
+            $this->assertAttributeContainsOnly('integer', 'publicArray', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotContains
+     */
+    public function testAssertPublicAttributeNotContains()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeNotContains('bar', 'publicArray', $obj);
+
+        try {
+            $this->assertAttributeNotContains('foo', 'publicArray', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotContainsOnly
+     */
+    public function testAssertPublicAttributeNotContainsOnly()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeNotContainsOnly('integer', 'publicArray', $obj);
+
+        try {
+            $this->assertAttributeNotContainsOnly('string', 'publicArray', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeContains
+     */
+    public function testAssertProtectedAttributeContains()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeContains('bar', 'protectedArray', $obj);
+
+        try {
+            $this->assertAttributeContains('foo', 'protectedArray', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotContains
+     */
+    public function testAssertProtectedAttributeNotContains()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeNotContains('foo', 'protectedArray', $obj);
+
+        try {
+            $this->assertAttributeNotContains('bar', 'protectedArray', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeContains
+     */
+    public function testAssertPrivateAttributeContains()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeContains('baz', 'privateArray', $obj);
+
+        try {
+            $this->assertAttributeContains('foo', 'privateArray', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotContains
+     */
+    public function testAssertPrivateAttributeNotContains()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeNotContains('foo', 'privateArray', $obj);
+
+        try {
+            $this->assertAttributeNotContains('baz', 'privateArray', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeContains
+     */
+    public function testAssertAttributeContainsNonObject()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeContains(true, 'privateArray', $obj);
+
+        try {
+            $this->assertAttributeContains(true, 'privateArray', $obj, '', false, true, true);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotContains
+     */
+    public function testAssertAttributeNotContainsNonObject()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeNotContains(true, 'privateArray', $obj, '', false, true, true);
+
+        try {
+            $this->assertAttributeNotContains(true, 'privateArray', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeEquals
+     */
+    public function testAssertPublicAttributeEquals()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeEquals('foo', 'publicAttribute', $obj);
+
+        try {
+            $this->assertAttributeEquals('bar', 'publicAttribute', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotEquals
+     */
+    public function testAssertPublicAttributeNotEquals()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeNotEquals('bar', 'publicAttribute', $obj);
+
+        try {
+            $this->assertAttributeNotEquals('foo', 'publicAttribute', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeSame
+     */
+    public function testAssertPublicAttributeSame()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeSame('foo', 'publicAttribute', $obj);
+
+        try {
+            $this->assertAttributeSame('bar', 'publicAttribute', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotSame
+     */
+    public function testAssertPublicAttributeNotSame()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeNotSame('bar', 'publicAttribute', $obj);
+
+        try {
+            $this->assertAttributeNotSame('foo', 'publicAttribute', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeEquals
+     */
+    public function testAssertProtectedAttributeEquals()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeEquals('bar', 'protectedAttribute', $obj);
+
+        try {
+            $this->assertAttributeEquals('foo', 'protectedAttribute', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotEquals
+     */
+    public function testAssertProtectedAttributeNotEquals()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeNotEquals('foo', 'protectedAttribute', $obj);
+
+        try {
+            $this->assertAttributeNotEquals('bar', 'protectedAttribute', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeEquals
+     */
+    public function testAssertPrivateAttributeEquals()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeEquals('baz', 'privateAttribute', $obj);
+
+        try {
+            $this->assertAttributeEquals('foo', 'privateAttribute', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotEquals
+     */
+    public function testAssertPrivateAttributeNotEquals()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeNotEquals('foo', 'privateAttribute', $obj);
+
+        try {
+            $this->assertAttributeNotEquals('baz', 'privateAttribute', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeEquals
+     */
+    public function testAssertPublicStaticAttributeEquals()
+    {
+        $this->assertAttributeEquals('foo', 'publicStaticAttribute', 'ClassWithNonPublicAttributes');
+
+        try {
+            $this->assertAttributeEquals('bar', 'publicStaticAttribute', 'ClassWithNonPublicAttributes');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotEquals
+     */
+    public function testAssertPublicStaticAttributeNotEquals()
+    {
+        $this->assertAttributeNotEquals('bar', 'publicStaticAttribute', 'ClassWithNonPublicAttributes');
+
+        try {
+            $this->assertAttributeNotEquals('foo', 'publicStaticAttribute', 'ClassWithNonPublicAttributes');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeEquals
+     */
+    public function testAssertProtectedStaticAttributeEquals()
+    {
+        $this->assertAttributeEquals('bar', 'protectedStaticAttribute', 'ClassWithNonPublicAttributes');
+
+        try {
+            $this->assertAttributeEquals('foo', 'protectedStaticAttribute', 'ClassWithNonPublicAttributes');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotEquals
+     */
+    public function testAssertProtectedStaticAttributeNotEquals()
+    {
+        $this->assertAttributeNotEquals('foo', 'protectedStaticAttribute', 'ClassWithNonPublicAttributes');
+
+        try {
+            $this->assertAttributeNotEquals('bar', 'protectedStaticAttribute', 'ClassWithNonPublicAttributes');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeEquals
+     */
+    public function testAssertPrivateStaticAttributeEquals()
+    {
+        $this->assertAttributeEquals('baz', 'privateStaticAttribute', 'ClassWithNonPublicAttributes');
+
+        try {
+            $this->assertAttributeEquals('foo', 'privateStaticAttribute', 'ClassWithNonPublicAttributes');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotEquals
+     */
+    public function testAssertPrivateStaticAttributeNotEquals()
+    {
+        $this->assertAttributeNotEquals('foo', 'privateStaticAttribute', 'ClassWithNonPublicAttributes');
+
+        try {
+            $this->assertAttributeNotEquals('baz', 'privateStaticAttribute', 'ClassWithNonPublicAttributes');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassHasAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassHasAttributeThrowsException()
+    {
+        $this->assertClassHasAttribute(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassHasAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassHasAttributeThrowsException2()
+    {
+        $this->assertClassHasAttribute('foo', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassHasAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassHasAttributeThrowsExceptionIfAttributeNameIsNotValid()
+    {
+        $this->assertClassHasAttribute('1', 'ClassWithNonPublicAttributes');
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassNotHasAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassNotHasAttributeThrowsException()
+    {
+        $this->assertClassNotHasAttribute(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassNotHasAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassNotHasAttributeThrowsException2()
+    {
+        $this->assertClassNotHasAttribute('foo', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassNotHasAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassNotHasAttributeThrowsExceptionIfAttributeNameIsNotValid()
+    {
+        $this->assertClassNotHasAttribute('1', 'ClassWithNonPublicAttributes');
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassHasStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassHasStaticAttributeThrowsException()
+    {
+        $this->assertClassHasStaticAttribute(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassHasStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassHasStaticAttributeThrowsException2()
+    {
+        $this->assertClassHasStaticAttribute('foo', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassHasStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassHasStaticAttributeThrowsExceptionIfAttributeNameIsNotValid()
+    {
+        $this->assertClassHasStaticAttribute('1', 'ClassWithNonPublicAttributes');
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassNotHasStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassNotHasStaticAttributeThrowsException()
+    {
+        $this->assertClassNotHasStaticAttribute(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassNotHasStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassNotHasStaticAttributeThrowsException2()
+    {
+        $this->assertClassNotHasStaticAttribute('foo', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassNotHasStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassNotHasStaticAttributeThrowsExceptionIfAttributeNameIsNotValid()
+    {
+        $this->assertClassNotHasStaticAttribute('1', 'ClassWithNonPublicAttributes');
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertObjectHasAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertObjectHasAttributeThrowsException()
+    {
+        $this->assertObjectHasAttribute(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertObjectHasAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertObjectHasAttributeThrowsException2()
+    {
+        $this->assertObjectHasAttribute('foo', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertObjectHasAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertObjectHasAttributeThrowsExceptionIfAttributeNameIsNotValid()
+    {
+        $this->assertObjectHasAttribute('1', 'ClassWithNonPublicAttributes');
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertObjectNotHasAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertObjectNotHasAttributeThrowsException()
+    {
+        $this->assertObjectNotHasAttribute(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertObjectNotHasAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertObjectNotHasAttributeThrowsException2()
+    {
+        $this->assertObjectNotHasAttribute('foo', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertObjectNotHasAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertObjectNotHasAttributeThrowsExceptionIfAttributeNameIsNotValid()
+    {
+        $this->assertObjectNotHasAttribute('1', 'ClassWithNonPublicAttributes');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertClassHasAttribute
+     */
+    public function testClassHasPublicAttribute()
+    {
+        $this->assertClassHasAttribute('publicAttribute', 'ClassWithNonPublicAttributes');
+
+        try {
+            $this->assertClassHasAttribute('attribute', 'ClassWithNonPublicAttributes');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertClassNotHasAttribute
+     */
+    public function testClassNotHasPublicAttribute()
+    {
+        $this->assertClassNotHasAttribute('attribute', 'ClassWithNonPublicAttributes');
+
+        try {
+            $this->assertClassNotHasAttribute('publicAttribute', 'ClassWithNonPublicAttributes');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertClassHasStaticAttribute
+     */
+    public function testClassHasPublicStaticAttribute()
+    {
+        $this->assertClassHasStaticAttribute('publicStaticAttribute', 'ClassWithNonPublicAttributes');
+
+        try {
+            $this->assertClassHasStaticAttribute('attribute', 'ClassWithNonPublicAttributes');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertClassNotHasStaticAttribute
+     */
+    public function testClassNotHasPublicStaticAttribute()
+    {
+        $this->assertClassNotHasStaticAttribute('attribute', 'ClassWithNonPublicAttributes');
+
+        try {
+            $this->assertClassNotHasStaticAttribute('publicStaticAttribute', 'ClassWithNonPublicAttributes');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertObjectHasAttribute
+     */
+    public function testObjectHasPublicAttribute()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertObjectHasAttribute('publicAttribute', $obj);
+
+        try {
+            $this->assertObjectHasAttribute('attribute', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertObjectNotHasAttribute
+     */
+    public function testObjectNotHasPublicAttribute()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertObjectNotHasAttribute('attribute', $obj);
+
+        try {
+            $this->assertObjectNotHasAttribute('publicAttribute', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertObjectHasAttribute
+     */
+    public function testObjectHasOnTheFlyAttribute()
+    {
+        $obj = new StdClass;
+        $obj->foo = 'bar';
+
+        $this->assertObjectHasAttribute('foo', $obj);
+
+        try {
+            $this->assertObjectHasAttribute('bar', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertObjectNotHasAttribute
+     */
+    public function testObjectNotHasOnTheFlyAttribute()
+    {
+        $obj = new StdClass;
+        $obj->foo = 'bar';
+
+        $this->assertObjectNotHasAttribute('bar', $obj);
+
+        try {
+            $this->assertObjectNotHasAttribute('foo', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertObjectHasAttribute
+     */
+    public function testObjectHasProtectedAttribute()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertObjectHasAttribute('protectedAttribute', $obj);
+
+        try {
+            $this->assertObjectHasAttribute('attribute', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertObjectNotHasAttribute
+     */
+    public function testObjectNotHasProtectedAttribute()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertObjectNotHasAttribute('attribute', $obj);
+
+        try {
+            $this->assertObjectNotHasAttribute('protectedAttribute', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertObjectHasAttribute
+     */
+    public function testObjectHasPrivateAttribute()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertObjectHasAttribute('privateAttribute', $obj);
+
+        try {
+            $this->assertObjectHasAttribute('attribute', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertObjectNotHasAttribute
+     */
+    public function testObjectNotHasPrivateAttribute()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertObjectNotHasAttribute('attribute', $obj);
+
+        try {
+            $this->assertObjectNotHasAttribute('privateAttribute', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::attribute
+     * @covers PHPUnit_Framework_Assert::equalTo
+     */
+    public function testAssertThatAttributeEquals()
+    {
+        $this->assertThat(
+          new ClassWithNonPublicAttributes,
+          $this->attribute(
+            $this->equalTo('foo'),
+            'publicAttribute'
+          )
+        );
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertThat
+     * @covers            PHPUnit_Framework_Assert::attribute
+     * @covers            PHPUnit_Framework_Assert::equalTo
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertThatAttributeEquals2()
+    {
+        $this->assertThat(
+          new ClassWithNonPublicAttributes,
+          $this->attribute(
+            $this->equalTo('bar'),
+            'publicAttribute'
+          )
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::attribute
+     * @covers PHPUnit_Framework_Assert::equalTo
+     */
+    public function testAssertThatAttributeEqualTo()
+    {
+        $this->assertThat(
+          new ClassWithNonPublicAttributes,
+          $this->attributeEqualTo('publicAttribute', 'foo')
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::anything
+     */
+    public function testAssertThatAnything()
+    {
+        $this->assertThat('anything', $this->anything());
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::anything
+     * @covers PHPUnit_Framework_Assert::logicalAnd
+     */
+    public function testAssertThatAnythingAndAnything()
+    {
+        $this->assertThat(
+          'anything',
+          $this->logicalAnd(
+            $this->anything(), $this->anything()
+          )
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::anything
+     * @covers PHPUnit_Framework_Assert::logicalOr
+     */
+    public function testAssertThatAnythingOrAnything()
+    {
+        $this->assertThat(
+          'anything',
+          $this->logicalOr(
+            $this->anything(), $this->anything()
+          )
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::anything
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_Assert::logicalXor
+     */
+    public function testAssertThatAnythingXorNotAnything()
+    {
+        $this->assertThat(
+          'anything',
+          $this->logicalXor(
+            $this->anything(),
+            $this->logicalNot($this->anything())
+          )
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::contains
+     */
+    public function testAssertThatContains()
+    {
+        $this->assertThat(array('foo'), $this->contains('foo'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::stringContains
+     */
+    public function testAssertThatStringContains()
+    {
+        $this->assertThat('barfoobar', $this->stringContains('foo'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::containsOnly
+     */
+    public function testAssertThatContainsOnly()
+    {
+        $this->assertThat(array('foo'), $this->containsOnly('string'));
+    }
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::containsOnlyInstancesOf
+     */
+    public function testAssertThatContainsOnlyInstancesOf()
+    {
+        $this->assertThat(array(new Book), $this->containsOnlyInstancesOf('Book'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::arrayHasKey
+     */
+    public function testAssertThatArrayHasKey()
+    {
+        $this->assertThat(array('foo' => 'bar'), $this->arrayHasKey('foo'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::classHasAttribute
+     */
+    public function testAssertThatClassHasAttribute()
+    {
+        $this->assertThat(
+          new ClassWithNonPublicAttributes,
+          $this->classHasAttribute('publicAttribute')
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::classHasStaticAttribute
+     */
+    public function testAssertThatClassHasStaticAttribute()
+    {
+        $this->assertThat(
+          new ClassWithNonPublicAttributes,
+          $this->classHasStaticAttribute('publicStaticAttribute')
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::objectHasAttribute
+     */
+    public function testAssertThatObjectHasAttribute()
+    {
+        $this->assertThat(
+          new ClassWithNonPublicAttributes,
+          $this->objectHasAttribute('publicAttribute')
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::equalTo
+     */
+    public function testAssertThatEqualTo()
+    {
+        $this->assertThat('foo', $this->equalTo('foo'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::identicalTo
+     */
+    public function testAssertThatIdenticalTo()
+    {
+        $value      = new StdClass;
+        $constraint = $this->identicalTo($value);
+
+        $this->assertThat($value, $constraint);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::isInstanceOf
+     */
+    public function testAssertThatIsInstanceOf()
+    {
+        $this->assertThat(new StdClass, $this->isInstanceOf('StdClass'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::isType
+     */
+    public function testAssertThatIsType()
+    {
+        $this->assertThat('string', $this->isType('string'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::isEmpty
+     */
+    public function testAssertThatIsEmpty()
+    {
+        $this->assertThat(array(), $this->isEmpty());
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::fileExists
+     */
+    public function testAssertThatFileExists()
+    {
+        $this->assertThat(__FILE__, $this->fileExists());
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::greaterThan
+     */
+    public function testAssertThatGreaterThan()
+    {
+        $this->assertThat(2, $this->greaterThan(1));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::greaterThanOrEqual
+     */
+    public function testAssertThatGreaterThanOrEqual()
+    {
+        $this->assertThat(2, $this->greaterThanOrEqual(1));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::lessThan
+     */
+    public function testAssertThatLessThan()
+    {
+        $this->assertThat(1, $this->lessThan(2));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::lessThanOrEqual
+     */
+    public function testAssertThatLessThanOrEqual()
+    {
+        $this->assertThat(1, $this->lessThanOrEqual(2));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::matchesRegularExpression
+     */
+    public function testAssertThatMatchesRegularExpression()
+    {
+        $this->assertThat('foobar', $this->matchesRegularExpression('/foo/'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::callback
+     */
+    public function testAssertThatCallback()
+    {
+        $this->assertThat(null, $this->callback(function ($other) { return true; }));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::countOf
+     */
+    public function testAssertThatCountOf()
+    {
+        $this->assertThat(array(1), $this->countOf(1));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertFileEquals
+     */
+    public function testAssertFileEquals()
+    {
+        $this->assertFileEquals(
+          $this->filesDirectory . 'foo.xml',
+          $this->filesDirectory . 'foo.xml'
+        );
+
+        try {
+            $this->assertFileEquals(
+              $this->filesDirectory . 'foo.xml',
+              $this->filesDirectory . 'bar.xml'
+            );
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertFileNotEquals
+     */
+    public function testAssertFileNotEquals()
+    {
+        $this->assertFileNotEquals(
+          $this->filesDirectory . 'foo.xml',
+          $this->filesDirectory . 'bar.xml'
+        );
+
+        try {
+            $this->assertFileNotEquals(
+              $this->filesDirectory . 'foo.xml',
+              $this->filesDirectory . 'foo.xml'
+            );
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertStringEqualsFile
+     */
+    public function testAssertStringEqualsFile()
+    {
+        $this->assertStringEqualsFile(
+          $this->filesDirectory . 'foo.xml',
+          file_get_contents($this->filesDirectory . 'foo.xml')
+        );
+
+        try {
+            $this->assertStringEqualsFile(
+              $this->filesDirectory . 'foo.xml',
+              file_get_contents($this->filesDirectory . 'bar.xml')
+            );
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertStringNotEqualsFile
+     */
+    public function testAssertStringNotEqualsFile()
+    {
+        $this->assertStringNotEqualsFile(
+          $this->filesDirectory . 'foo.xml',
+          file_get_contents($this->filesDirectory . 'bar.xml')
+        );
+
+        try {
+            $this->assertStringNotEqualsFile(
+              $this->filesDirectory . 'foo.xml',
+              file_get_contents($this->filesDirectory . 'foo.xml')
+            );
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertStringStartsWith
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertStringStartsWithThrowsException()
+    {
+        $this->assertStringStartsWith(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertStringStartsWith
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertStringStartsWithThrowsException2()
+    {
+        $this->assertStringStartsWith('', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertStringStartsNotWith
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertStringStartsNotWithThrowsException()
+    {
+        $this->assertStringStartsNotWith(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertStringStartsNotWith
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertStringStartsNotWithThrowsException2()
+    {
+        $this->assertStringStartsNotWith('', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertStringEndsWith
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertStringEndsWithThrowsException()
+    {
+        $this->assertStringEndsWith(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertStringEndsWith
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertStringEndsWithThrowsException2()
+    {
+        $this->assertStringEndsWith('', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertStringEndsNotWith
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertStringEndsNotWithThrowsException()
+    {
+        $this->assertStringEndsNotWith(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertStringEndsNotWith
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertStringEndsNotWithThrowsException2()
+    {
+        $this->assertStringEndsNotWith('', null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertStringStartsWith
+     */
+    public function testAssertStringStartsWith()
+    {
+        $this->assertStringStartsWith('prefix', 'prefixfoo');
+
+        try {
+            $this->assertStringStartsWith('prefix', 'foo');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertStringStartsNotWith
+     */
+    public function testAssertStringStartsNotWith()
+    {
+        $this->assertStringStartsNotWith('prefix', 'foo');
+
+        try {
+            $this->assertStringStartsNotWith('prefix', 'prefixfoo');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertStringEndsWith
+     */
+    public function testAssertStringEndsWith()
+    {
+        $this->assertStringEndsWith('suffix', 'foosuffix');
+
+        try {
+            $this->assertStringEndsWith('suffix', 'foo');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertStringEndsNotWith
+     */
+    public function testAssertStringEndsNotWith()
+    {
+        $this->assertStringEndsNotWith('suffix', 'foo');
+
+        try {
+            $this->assertStringEndsNotWith('suffix', 'foosuffix');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertStringMatchesFormat
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertStringMatchesFormatRaisesExceptionForInvalidFirstArgument()
+    {
+        $this->assertStringMatchesFormat(null, '');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertStringMatchesFormat
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertStringMatchesFormatRaisesExceptionForInvalidSecondArgument()
+    {
+        $this->assertStringMatchesFormat('', null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertStringMatchesFormat
+     */
+    public function testAssertStringMatchesFormat()
+    {
+        $this->assertStringMatchesFormat('*%s*', '***');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertStringMatchesFormat
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertStringMatchesFormatFailure()
+    {
+        $this->assertStringMatchesFormat('*%s*', '**');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertStringNotMatchesFormat
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertStringNotMatchesFormatRaisesExceptionForInvalidFirstArgument()
+    {
+        $this->assertStringNotMatchesFormat(null, '');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertStringNotMatchesFormat
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertStringNotMatchesFormatRaisesExceptionForInvalidSecondArgument()
+    {
+        $this->assertStringNotMatchesFormat('', null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertStringNotMatchesFormat
+     */
+    public function testAssertStringNotMatchesFormat()
+    {
+        $this->assertStringNotMatchesFormat('*%s*', '**');
+
+        try {
+            $this->assertStringMatchesFormat('*%s*', '**');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertEmpty
+     */
+    public function testAssertEmpty()
+    {
+        $this->assertEmpty(array());
+
+        try {
+            $this->assertEmpty(array('foo'));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotEmpty
+     */
+    public function testAssertNotEmpty()
+    {
+        $this->assertNotEmpty(array('foo'));
+
+        try {
+            $this->assertNotEmpty(array());
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeEmpty
+     */
+    public function testAssertAttributeEmpty()
+    {
+        $o    = new StdClass;
+        $o->a = array();
+
+        $this->assertAttributeEmpty('a', $o);
+
+        try {
+            $o->a = array('b');
+            $this->assertAttributeEmpty('a', $o);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotEmpty
+     */
+    public function testAssertAttributeNotEmpty()
+    {
+        $o    = new StdClass;
+        $o->a = array('b');
+
+        $this->assertAttributeNotEmpty('a', $o);
+
+        try {
+            $o->a = array();
+            $this->assertAttributeNotEmpty('a', $o);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::markTestIncomplete
+     */
+    public function testMarkTestIncomplete()
+    {
+        try {
+            $this->markTestIncomplete('incomplete');
+        }
+
+        catch (PHPUnit_Framework_IncompleteTestError $e) {
+            $this->assertEquals('incomplete', $e->getMessage());
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::markTestSkipped
+     */
+    public function testMarkTestSkipped()
+    {
+        try {
+            $this->markTestSkipped('skipped');
+        }
+
+        catch (PHPUnit_Framework_SkippedTestError $e) {
+            $this->assertEquals('skipped', $e->getMessage());
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertCount
+     */
+    public function testAssertCount()
+    {
+        $this->assertCount(2, array(1,2));
+
+        try {
+            $this->assertCount(2, array(1,2,3));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertCount
+     */
+    public function testAssertCountThrowsExceptionIfExpectedCountIsNoInteger()
+    {
+        try {
+            $this->assertCount('a', array());
+        }
+
+        catch (PHPUnit_Framework_Exception $e) {
+            $this->assertEquals('Argument #1 (No Value) of PHPUnit_Framework_Assert::assertCount() must be a integer', $e->getMessage());
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertCount
+     */
+    public function testAssertCountThrowsExceptionIfElementIsNotCountable()
+    {
+
+        try {
+            $this->assertCount(2, '');
+        }
+
+        catch (PHPUnit_Framework_Exception $e) {
+            $this->assertEquals('Argument #2 (No Value) of PHPUnit_Framework_Assert::assertCount() must be a countable or traversable', $e->getMessage());
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeCount
+     */
+    public function testAssertAttributeCount()
+    {
+        $o    = new stdClass;
+        $o->a = array();
+
+        $this->assertAttributeCount(0, 'a', $o);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotCount
+     */
+    public function testAssertNotCount()
+    {
+        $this->assertNotCount(2, array(1,2,3));
+
+        try {
+            $this->assertNotCount(2, array(1,2));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotCount
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotCountThrowsExceptionIfExpectedCountIsNoInteger()
+    {
+        $this->assertNotCount('a', array());
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotCount
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotCountThrowsExceptionIfElementIsNotCountable()
+    {
+        $this->assertNotCount(2, '');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotCount
+     */
+    public function testAssertAttributeNotCount()
+    {
+        $o    = new stdClass;
+        $o->a = array();
+
+        $this->assertAttributeNotCount(1, 'a', $o);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSameSize
+     */
+    public function testAssertSameSize()
+    {
+        $this->assertSameSize(array(1,2), array(3,4));
+
+        try {
+            $this->assertSameSize(array(1,2), array(1,2,3));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSameSize
+     */
+    public function testAssertSameSizeThrowsExceptionIfExpectedIsNotCountable()
+    {
+        try {
+            $this->assertSameSize('a', array());
+        }
+
+        catch (PHPUnit_Framework_Exception $e) {
+            $this->assertEquals('Argument #1 (No Value) of PHPUnit_Framework_Assert::assertSameSize() must be a countable or traversable', $e->getMessage());
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSameSize
+     */
+    public function testAssertSameSizeThrowsExceptionIfActualIsNotCountable()
+    {
+        try {
+            $this->assertSameSize(array(), '');
+        }
+
+        catch (PHPUnit_Framework_Exception $e) {
+            $this->assertEquals('Argument #2 (No Value) of PHPUnit_Framework_Assert::assertSameSize() must be a countable or traversable', $e->getMessage());
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotSameSize
+     */
+    public function testAssertNotSameSize()
+    {
+        $this->assertNotSameSize(array(1,2), array(1,2,3));
+
+        try {
+            $this->assertNotSameSize(array(1,2), array(3,4));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotSameSize
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotSameSizeThrowsExceptionIfExpectedIsNotCountable()
+    {
+        $this->assertNotSameSize('a', array());
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotSameSize
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotSameSizeThrowsExceptionIfActualIsNotCountable()
+    {
+        $this->assertNotSameSize(array(), '');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertJson
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertJsonRaisesExceptionForInvalidArgument()
+    {
+        $this->assertJson(null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertJsonStringEqualsJsonString
+     */
+    public function testAssertJsonStringEqualsJsonString()
+    {
+        $expected = '{"Mascott" : "Tux"}';
+        $actual   = '{"Mascott" : "Tux"}';
+        $message  = 'Given Json strings do not match';
+
+        $this->assertJsonStringEqualsJsonString($expected, $actual, $message);
+    }
+
+    /**
+     * @dataProvider validInvalidJsonDataprovider
+     * @covers PHPUnit_Framework_Assert::assertJsonStringEqualsJsonString
+     */
+    public function testAssertJsonStringEqualsJsonStringErrorRaised($expected, $actual)
+    {
+        try {
+            $this->assertJsonStringEqualsJsonString($expected, $actual);
+        } catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+        $this->fail('Expected exception not found');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertJsonStringNotEqualsJsonString
+     */
+    public function testAssertJsonStringNotEqualsJsonString()
+    {
+        $expected = '{"Mascott" : "Beastie"}';
+        $actual   = '{"Mascott" : "Tux"}';
+        $message  = 'Given Json strings do match';
+
+        $this->assertJsonStringNotEqualsJsonString($expected, $actual, $message);
+    }
+
+    /**
+     * @dataProvider validInvalidJsonDataprovider
+     * @covers PHPUnit_Framework_Assert::assertJsonStringNotEqualsJsonString
+     */
+    public function testAssertJsonStringNotEqualsJsonStringErrorRaised($expected, $actual)
+    {
+        try {
+            $this->assertJsonStringNotEqualsJsonString($expected, $actual);
+        } catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+        $this->fail('Expected exception not found');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertJsonStringEqualsJsonFile
+     */
+    public function testAssertJsonStringEqualsJsonFile()
+    {
+        $file = __DIR__ . '/../_files/JsonData/simpleObject.js';
+        $actual = json_encode(array("Mascott" => "Tux"));
+        $message = '';
+        $this->assertJsonStringEqualsJsonFile($file, $actual, $message);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertJsonStringEqualsJsonFile
+     */
+    public function testAssertJsonStringEqualsJsonFileExpectingExpectationFailedException()
+    {
+        $file = __DIR__ . '/../_files/JsonData/simpleObject.js';
+        $actual = json_encode(array("Mascott" => "Beastie"));
+        $message = '';
+        try {
+            $this->assertJsonStringEqualsJsonFile($file, $actual, $message);
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+                'Failed asserting that \'{"Mascott":"Beastie"}\' matches JSON string "{"Mascott":"Tux"}".',
+                $e->getMessage()
+            );
+            return;
+        }
+
+        $this->fail('Expected Exception not thrown.');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertJsonStringEqualsJsonFile
+     */
+    public function testAssertJsonStringEqualsJsonFileExpectingException()
+    {
+        $file = __DIR__ . '/../_files/JsonData/simpleObject.js';
+        try {
+            $this->assertJsonStringEqualsJsonFile($file, null);
+        } catch (PHPUnit_Framework_Exception $e) {
+            return;
+        }
+        $this->fail('Expected Exception not thrown.');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertJsonStringNotEqualsJsonFile
+     */
+    public function testAssertJsonStringNotEqualsJsonFile()
+    {
+        $file = __DIR__ . '/../_files/JsonData/simpleObject.js';
+        $actual = json_encode(array("Mascott" => "Beastie"));
+        $message = '';
+        $this->assertJsonStringNotEqualsJsonFile($file, $actual, $message);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertJsonStringNotEqualsJsonFile
+     */
+    public function testAssertJsonStringNotEqualsJsonFileExpectingException()
+    {
+        $file = __DIR__ . '/../_files/JsonData/simpleObject.js';
+        try {
+            $this->assertJsonStringNotEqualsJsonFile($file, null);
+        } catch (PHPUnit_Framework_Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not found.');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertJsonFileNotEqualsJsonFile
+     */
+    public function testAssertJsonFileNotEqualsJsonFile()
+    {
+        $fileExpected = __DIR__ . '/../_files/JsonData/simpleObject.js';
+        $fileActual   = __DIR__ . '/../_files/JsonData/arrayObject.js';
+        $message = '';
+        $this->assertJsonFileNotEqualsJsonFile($fileExpected, $fileActual, $message);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertJsonFileEqualsJsonFile
+     */
+    public function testAssertJsonFileEqualsJsonFile()
+    {
+        $file = __DIR__ . '/../_files/JsonData/simpleObject.js';
+        $message = '';
+        $this->assertJsonFileEqualsJsonFile($file, $file, $message);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertInstanceOf
+     */
+    public function testAssertInstanceOf()
+    {
+        $this->assertInstanceOf('stdClass', new stdClass);
+
+        try {
+            $this->assertInstanceOf('Exception', new stdClass);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertInstanceOf
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertInstanceOfThrowsExceptionForInvalidArgument()
+    {
+        $this->assertInstanceOf(null, new stdClass);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeInstanceOf
+     */
+    public function testAssertAttributeInstanceOf()
+    {
+        $o    = new stdClass;
+        $o->a = new stdClass;
+
+        $this->assertAttributeInstanceOf('stdClass', 'a', $o);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotInstanceOf
+     */
+    public function testAssertNotInstanceOf()
+    {
+        $this->assertNotInstanceOf('Exception', new stdClass);
+
+        try {
+            $this->assertNotInstanceOf('stdClass', new stdClass);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotInstanceOf
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotInstanceOfThrowsExceptionForInvalidArgument()
+    {
+        $this->assertNotInstanceOf(null, new stdClass);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotInstanceOf
+     */
+    public function testAssertAttributeNotInstanceOf()
+    {
+        $o    = new stdClass;
+        $o->a = new stdClass;
+
+        $this->assertAttributeNotInstanceOf('Exception', 'a', $o);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertInternalType
+     */
+    public function testAssertInternalType()
+    {
+        $this->assertInternalType('integer', 1);
+
+        try {
+            $this->assertInternalType('string', 1);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertInternalType
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertInternalTypeThrowsExceptionForInvalidArgument()
+    {
+        $this->assertInternalType(null, 1);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeInternalType
+     */
+    public function testAssertAttributeInternalType()
+    {
+        $o    = new stdClass;
+        $o->a = 1;
+
+        $this->assertAttributeInternalType('integer', 'a', $o);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotInternalType
+     */
+    public function testAssertNotInternalType()
+    {
+        $this->assertNotInternalType('string', 1);
+
+        try {
+            $this->assertNotInternalType('integer', 1);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotInternalType
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotInternalTypeThrowsExceptionForInvalidArgument()
+    {
+        $this->assertNotInternalType(null, 1);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotInternalType
+     */
+    public function testAssertAttributeNotInternalType()
+    {
+        $o    = new stdClass;
+        $o->a = 1;
+
+        $this->assertAttributeNotInternalType('string', 'a', $o);
+    }
+
+    public static function validInvalidJsonDataprovider()
+    {
+        return array(
+            'error syntax in expected JSON' => array('{"Mascott"::}', '{"Mascott" : "Tux"}'),
+            'error UTF-8 in actual JSON'    => array('{"Mascott" : "Tux"}', '{"Mascott" : :}'),
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Framework/BaseTestListenerTest.php b/vendor/phpunit/phpunit/tests/Framework/BaseTestListenerTest.php
new file mode 100644
index 00000000..5e46c0fb
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Framework/BaseTestListenerTest.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Giorgio Sironi <info@giorgiosironi.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Giorgio Sironi <info@giorgiosironi.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class Framework_BaseTestListenerTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var PHPUnit_Framework_TestResult
+     */
+    private $result;
+
+    /**
+     * @covers PHPUnit_Framework_TestResult
+     */
+    public function testEndEventsAreCounted()
+    {
+        $this->result = new PHPUnit_Framework_TestResult;
+        $listener = new BaseTestListenerSample();
+        $this->result->addListener($listener);
+        $test = new Success;
+        $test->run($this->result);
+
+        $this->assertEquals(1, $listener->endCount);
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/CountTest.php b/vendor/phpunit/phpunit/tests/Framework/Constraint/CountTest.php
new file mode 100644
index 00000000..326b6c3c
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Framework/Constraint/CountTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Jeroen Versteeg <jversteeg@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.7.30
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Jeroen Versteeg <jversteeg@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.7.30
+ * @covers     PHPUnit_Framework_Constraint_Count
+ */
+class CountTest extends PHPUnit_Framework_TestCase
+{
+    public function testCount()
+    {
+        $countConstraint = new PHPUnit_Framework_Constraint_Count(3);
+        $this->assertTrue($countConstraint->evaluate(array(1,2,3), '', true));
+
+        $countConstraint = new PHPUnit_Framework_Constraint_Count(0);
+        $this->assertTrue($countConstraint->evaluate(array(), '', true));
+
+        $countConstraint = new PHPUnit_Framework_Constraint_Count(2);
+        $it = new TestIterator(array(1, 2));
+        $this->assertTrue($countConstraint->evaluate($it, '', true));
+    }
+
+    public function testCountDoesNotChangeIteratorKey()
+    {
+        $countConstraint = new PHPUnit_Framework_Constraint_Count(2);
+
+        // test with 1st implementation of Iterator
+        $it = new TestIterator(array(1, 2));
+
+        $countConstraint->evaluate($it, '', true);
+        $this->assertEquals(1, $it->current());
+
+        $it->next();
+        $countConstraint->evaluate($it, '', true);
+        $this->assertEquals(2, $it->current());
+
+        $it->next();
+        $countConstraint->evaluate($it, '', true);
+        $this->assertFalse($it->valid());
+
+        // test with 2nd implementation of Iterator
+        $it = new TestIterator2(array(1, 2));
+
+        $countConstraint = new PHPUnit_Framework_Constraint_Count(2);
+        $countConstraint->evaluate($it, '', true);
+        $this->assertEquals(1, $it->current());
+
+        $it->next();
+        $countConstraint->evaluate($it, '', true);
+        $this->assertEquals(2, $it->current());
+
+        $it->next();
+        $countConstraint->evaluate($it, '', true);
+        $this->assertFalse($it->valid());
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php b/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php
new file mode 100644
index 00000000..929afad7
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Bastian Feder <php@bastian-feder.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.7.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @author     Bastian Feder <php@bastian-feder.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.7.0
+ */
+class Framework_Constraint_JsonMatches_ErrorMessageProviderTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider translateTypeToPrefixDataprovider
+     * @covers PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider::translateTypeToPrefix
+     */
+    public function testTranslateTypeToPrefix($expected, $type)
+    {
+        $this->assertEquals(
+            $expected,
+            PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider::translateTypeToPrefix($type)
+        );
+    }
+
+    /**
+     * @dataProvider determineJsonErrorDataprovider
+     * @covers PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider::determineJsonError
+     */
+    public function testDetermineJsonError($expected, $error, $prefix)
+    {
+        $this->assertEquals(
+            $expected,
+            PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider::determineJsonError(
+                $error,
+                $prefix
+            )
+        );
+    }
+
+    public static function determineJsonErrorDataprovider()
+    {
+        return array(
+            'JSON_ERROR_NONE'  => array(
+                null, 'json_error_none', ''
+            ),
+            'JSON_ERROR_DEPTH' => array(
+                'Maximum stack depth exceeded', JSON_ERROR_DEPTH, ''
+            ),
+            'prefixed JSON_ERROR_DEPTH' => array(
+                'TUX: Maximum stack depth exceeded', JSON_ERROR_DEPTH, 'TUX: '
+            ),
+            'JSON_ERROR_STATE_MISMatch' => array(
+                'Underflow or the modes mismatch', JSON_ERROR_STATE_MISMATCH, ''
+            ),
+            'JSON_ERROR_CTRL_CHAR' => array(
+                'Unexpected control character found', JSON_ERROR_CTRL_CHAR, ''
+            ),
+            'JSON_ERROR_SYNTAX' => array(
+                'Syntax error, malformed JSON', JSON_ERROR_SYNTAX, ''
+            ),
+            'JSON_ERROR_UTF8`' => array(
+                'Malformed UTF-8 characters, possibly incorrectly encoded',
+                JSON_ERROR_UTF8,
+                ''
+            ),
+            'Invalid error indicator' => array(
+                'Unknown error', 55, ''
+            ),
+        );
+    }
+
+    public static function translateTypeToPrefixDataprovider()
+    {
+        return array(
+            'expected' => array('Expected value JSON decode error - ', 'expected'),
+            'actual' => array('Actual value JSON decode error - ', 'actual'),
+            'default' => array('', ''),
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatchesTest.php b/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatchesTest.php
new file mode 100644
index 00000000..08e74c41
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatchesTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Bastian Feder <php@bastian-feder.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.7.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @author     Bastian Feder <php@bastian-feder.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.7.0
+ */
+class Framework_Constraint_JsonMatchesTest extends PHPUnit_Framework_TestCase
+{
+
+    /**
+     * @dataProvider evaluateDataprovider
+     * @covers PHPUnit_Framework_Constraint_JsonMatches::evaluate
+     * @covers PHPUnit_Framework_Constraint_JsonMatches::matches
+     * @covers PHPUnit_Framework_Constraint_JsonMatches::__construct
+     */
+    public function testEvaluate($expected, $jsonOther, $jsonValue)
+    {
+        $constraint = new PHPUnit_Framework_Constraint_JsonMatches($jsonValue);
+        $this->assertEquals($expected, $constraint->evaluate($jsonOther, '', true));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_JsonMatches::toString
+     */
+    public function testToString()
+    {
+        $jsonValue = json_encode(array('Mascott' => 'Tux'));
+        $constraint = new PHPUnit_Framework_Constraint_JsonMatches($jsonValue);
+
+        $this->assertEquals('matches JSON string "' . $jsonValue . '"', $constraint->toString());
+    }
+
+
+    public static function evaluateDataprovider()
+    {
+        return array(
+            'valid JSON' => array(true, json_encode(array('Mascott' => 'Tux')), json_encode(array('Mascott' => 'Tux'))),
+            'error syntax' => array(false, '{"Mascott"::}', json_encode(array('Mascott' => 'Tux'))),
+            'error UTF-8' => array(false, json_encode('\xB1\x31'), json_encode(array('Mascott' => 'Tux'))),
+            'invalid JSON in class instantiation' => array(false, json_encode(array('Mascott' => 'Tux')), '{"Mascott"::}'),
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Framework/ConstraintTest.php b/vendor/phpunit/phpunit/tests/Framework/ConstraintTest.php
new file mode 100644
index 00000000..7151146d
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Framework/ConstraintTest.php
@@ -0,0 +1,3664 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class Framework_ConstraintTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers PHPUnit_Framework_Constraint_ArrayHasKey
+     * @covers PHPUnit_Framework_Assert::arrayHasKey
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintArrayHasKey()
+    {
+        $constraint = PHPUnit_Framework_Assert::arrayHasKey(0);
+
+        $this->assertFalse($constraint->evaluate(array(), '', true));
+        $this->assertEquals('has the key 0', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(array());
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+Failed asserting that an array has the key 0.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_ArrayHasKey
+     * @covers PHPUnit_Framework_Assert::arrayHasKey
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintArrayHasKey2()
+    {
+        $constraint = PHPUnit_Framework_Assert::arrayHasKey(0);
+
+        try {
+            $constraint->evaluate(array(), 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message\nFailed asserting that an array has the key 0.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_ArrayHasKey
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::arrayHasKey
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintArrayNotHasKey()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::arrayHasKey(0)
+        );
+
+        $this->assertFalse($constraint->evaluate(array(0 => 1), '', true));
+        $this->assertEquals('does not have the key 0', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(array(0 => 1));
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that an array does not have the key 0.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_ArrayHasKey
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::arrayHasKey
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintArrayNotHasKey2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::arrayHasKey(0)
+        );
+
+        try {
+            $constraint->evaluate(array(0), 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that an array does not have the key 0.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_FileExists
+     * @covers PHPUnit_Framework_Assert::fileExists
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintFileExists()
+    {
+        $constraint = PHPUnit_Framework_Assert::fileExists();
+
+        $this->assertFalse($constraint->evaluate('foo', '', true));
+        $this->assertEquals('file exists', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate('foo');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that file "foo" exists.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_FileExists
+     * @covers PHPUnit_Framework_Assert::fileExists
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintFileExists2()
+    {
+        $constraint = PHPUnit_Framework_Assert::fileExists();
+
+        try {
+            $constraint->evaluate('foo', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that file "foo" exists.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_FileExists
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_Assert::fileExists
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintFileNotExists()
+    {
+        $file = dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ClassWithNonPublicAttributes.php';
+
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::fileExists()
+        );
+
+        $this->assertFalse($constraint->evaluate($file, '', true));
+        $this->assertEquals('file does not exist', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate($file);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that file "$file" does not exist.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_FileExists
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_Assert::fileExists
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintFileNotExists2()
+    {
+        $file = dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ClassWithNonPublicAttributes.php';
+
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::fileExists()
+        );
+
+        try {
+            $constraint->evaluate($file, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that file "$file" does not exist.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_GreaterThan
+     * @covers PHPUnit_Framework_Assert::greaterThan
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintGreaterThan()
+    {
+        $constraint = PHPUnit_Framework_Assert::greaterThan(1);
+
+        $this->assertFalse($constraint->evaluate(0, '', true));
+        $this->assertTrue($constraint->evaluate(2, '', true));
+        $this->assertEquals('is greater than 1', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(0);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 0 is greater than 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_GreaterThan
+     * @covers PHPUnit_Framework_Assert::greaterThan
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintGreaterThan2()
+    {
+        $constraint = PHPUnit_Framework_Assert::greaterThan(1);
+
+        try {
+            $constraint->evaluate(0, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that 0 is greater than 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_GreaterThan
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::greaterThan
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintNotGreaterThan()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::greaterThan(1)
+        );
+
+        $this->assertTrue($constraint->evaluate(1, '', true));
+        $this->assertEquals('is not greater than 1', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(2);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 2 is not greater than 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_GreaterThan
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::greaterThan
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintNotGreaterThan2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::greaterThan(1)
+        );
+
+        try {
+            $constraint->evaluate(2, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that 2 is not greater than 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsEqual
+     * @covers PHPUnit_Framework_Constraint_GreaterThan
+     * @covers PHPUnit_Framework_Constraint_Or
+     * @covers PHPUnit_Framework_Assert::greaterThanOrEqual
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintGreaterThanOrEqual()
+    {
+        $constraint = PHPUnit_Framework_Assert::greaterThanOrEqual(1);
+
+        $this->assertTrue($constraint->evaluate(1, '', true));
+        $this->assertFalse($constraint->evaluate(0, '', true));
+        $this->assertEquals('is equal to 1 or is greater than 1', $constraint->toString());
+        $this->assertEquals(2, count($constraint));
+
+        try {
+            $constraint->evaluate(0);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 0 is equal to 1 or is greater than 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsEqual
+     * @covers PHPUnit_Framework_Constraint_GreaterThan
+     * @covers PHPUnit_Framework_Constraint_Or
+     * @covers PHPUnit_Framework_Assert::greaterThanOrEqual
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintGreaterThanOrEqual2()
+    {
+        $constraint = PHPUnit_Framework_Assert::greaterThanOrEqual(1);
+
+        try {
+            $constraint->evaluate(0, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that 0 is equal to 1 or is greater than 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsEqual
+     * @covers PHPUnit_Framework_Constraint_GreaterThan
+     * @covers PHPUnit_Framework_Constraint_Or
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::greaterThanOrEqual
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintNotGreaterThanOrEqual()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::greaterThanOrEqual(1)
+        );
+
+        $this->assertFalse($constraint->evaluate(1, '', true));
+        $this->assertEquals('not( is equal to 1 or is greater than 1 )', $constraint->toString());
+        $this->assertEquals(2, count($constraint));
+
+        try {
+            $constraint->evaluate(1);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that not( 1 is equal to 1 or is greater than 1 ).
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsEqual
+     * @covers PHPUnit_Framework_Constraint_GreaterThan
+     * @covers PHPUnit_Framework_Constraint_Or
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::greaterThanOrEqual
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintNotGreaterThanOrEqual2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::greaterThanOrEqual(1)
+        );
+
+        try {
+            $constraint->evaluate(1, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that not( 1 is equal to 1 or is greater than 1 ).
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsAnything
+     * @covers PHPUnit_Framework_Assert::anything
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsAnything()
+    {
+        $constraint = PHPUnit_Framework_Assert::anything();
+
+        $this->assertTrue($constraint->evaluate(null, '', true));
+        $this->assertNull($constraint->evaluate(null));
+        $this->assertEquals('is anything', $constraint->toString());
+        $this->assertEquals(0, count($constraint));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsAnything
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::anything
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintNotIsAnything()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::anything()
+        );
+
+        $this->assertFalse($constraint->evaluate(null, '', true));
+        $this->assertEquals('is not anything', $constraint->toString());
+        $this->assertEquals(0, count($constraint));
+
+        try {
+            $constraint->evaluate(null);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that null is not anything.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsEqual
+     * @covers PHPUnit_Framework_Assert::equalTo
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsEqual()
+    {
+        $constraint = PHPUnit_Framework_Assert::equalTo(1);
+
+        $this->assertTrue($constraint->evaluate(1, '', true));
+        $this->assertFalse($constraint->evaluate(0, '', true));
+        $this->assertEquals('is equal to 1', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(0);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 0 matches expected 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    public function isEqualProvider()
+    {
+        $a = new stdClass;
+        $a->foo = 'bar';
+        $b = new stdClass;
+        $ahash = spl_object_hash($a);
+        $bhash = spl_object_hash($b);
+
+        $c = new stdClass;
+        $c->foo = 'bar';
+        $c->int = 1;
+        $c->array = array(0, array(1), array(2), 3);
+        $c->related = new stdClass;
+        $c->related->foo = "a\nb\nc\nd\ne\nf\ng\nh\ni\nj\nk";
+        $c->self = $c;
+        $c->c = $c;
+        $d = new stdClass;
+        $d->foo = 'bar';
+        $d->int = 2;
+        $d->array = array(0, array(4), array(2), 3);
+        $d->related = new stdClass;
+        $d->related->foo = "a\np\nc\nd\ne\nf\ng\nh\ni\nw\nk";
+        $d->self = $d;
+        $d->c = $c;
+
+        $storage1 = new SplObjectStorage;
+        $storage1->attach($a);
+        $storage1->attach($b);
+        $storage2 = new SplObjectStorage;
+        $storage2->attach($b);
+        $storage1hash = spl_object_hash($storage1);
+        $storage2hash = spl_object_hash($storage2);
+
+        $dom1 = new DOMDocument;
+        $dom1->preserveWhiteSpace = false;
+        $dom1->loadXML('<root></root>');
+        $dom2 = new DOMDocument;
+        $dom2->preserveWhiteSpace = false;
+        $dom2->loadXML('<root><foo/></root>');
+
+        return array(
+            array(1, 0, <<<EOF
+Failed asserting that 0 matches expected 1.
+
+EOF
+            ),
+            array(1.1, 0, <<<EOF
+Failed asserting that 0 matches expected 1.1.
+
+EOF
+            ),
+            array('a', 'b', <<<EOF
+Failed asserting that two strings are equal.
+--- Expected
++++ Actual
+@@ @@
+-'a'
++'b'
+
+EOF
+            ),
+            array("a\nb\nc\nd\ne\nf\ng\nh\ni\nj\nk", "a\np\nc\nd\ne\nf\ng\nh\ni\nw\nk", <<<EOF
+Failed asserting that two strings are equal.
+--- Expected
++++ Actual
+@@ @@
+ 'a
+-b
++p
+
+@@ @@
+ i
+-j
++w
+ k'
+
+EOF
+            ),
+            array(1, array(0), <<<EOF
+Array (...) does not match expected type "integer".
+
+EOF
+            ),
+            array(array(0), 1, <<<EOF
+1 does not match expected type "array".
+
+EOF
+            ),
+            array(array(0), array(1), <<<EOF
+Failed asserting that two arrays are equal.
+--- Expected
++++ Actual
+@@ @@
+ Array (
+-    0 => 0
++    0 => 1
+ )
+
+EOF
+            ),
+            array(array(true), array('true'), <<<EOF
+Failed asserting that two arrays are equal.
+--- Expected
++++ Actual
+@@ @@
+ Array (
+-    0 => true
++    0 => 'true'
+ )
+
+EOF
+            ),
+            array(array(0, array(1), array(2), 3), array(0, array(4), array(2), 3), <<<EOF
+Failed asserting that two arrays are equal.
+--- Expected
++++ Actual
+@@ @@
+ Array (
+     0 => 0
+     1 => Array (
+-        0 => 1
++        0 => 4
+     )
+     2 => Array (...)
+     3 => 3
+ )
+
+EOF
+            ),
+            array($a, array(0), <<<EOF
+Array (...) does not match expected type "object".
+
+EOF
+            ),
+            array(array(0), $a, <<<EOF
+stdClass Object (...) does not match expected type "array".
+
+EOF
+            ),
+            array($a, $b, <<<EOF
+Failed asserting that two objects are equal.
+--- Expected
++++ Actual
+@@ @@
+ stdClass Object (
+-    'foo' => 'bar'
+ )
+
+EOF
+            ),
+            array($c, $d, <<<EOF
+Failed asserting that two objects are equal.
+--- Expected
++++ Actual
+@@ @@
+ stdClass Object (
+     'foo' => 'bar'
+-    'int' => 1
++    'int' => 2
+     'array' => Array (
+         0 => 0
+         1 => Array (
+-            0 => 1
++            0 => 4
+
+@@ @@
+         'foo' => 'a
+-        b
++        p
+
+@@ @@
+         i
+-        j
++        w
+         k'
+     )
+     'self' => stdClass Object (...)
+     'c' => stdClass Object (...)
+ )
+
+EOF
+            ),
+            array($storage1, $storage2, <<<EOF
+Failed asserting that two objects are equal.
+--- Expected
++++ Actual
+@@ @@
+-SplObjectStorage Object &$storage1hash (
+-    '$ahash' => Array &0 (
+-        'obj' => stdClass Object &$ahash (
+-            'foo' => 'bar'
+-        )
++SplObjectStorage Object &$storage2hash (
++    '$bhash' => Array &0 (
++        'obj' => stdClass Object &$bhash ()
+         'inf' => null
+     )
+-    '$bhash' => Array &0
+ )
+
+EOF
+            ),
+            array($dom1, $dom2, <<<EOF
+Failed asserting that two DOM documents are equal.
+--- Expected
++++ Actual
+@@ @@
+ <?xml version="1.0"?>
+-<root/>
++<root>
++  <foo/>
++</root>
+
+EOF
+            ),
+            array(
+              new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+              new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/Chicago')),
+              <<<EOF
+Failed asserting that two DateTime objects are equal.
+--- Expected
++++ Actual
+@@ @@
+-2013-03-29T04:13:35-0400
++2013-03-29T04:13:35-0500
+
+EOF
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider isEqualProvider
+     * @covers PHPUnit_Framework_Constraint_IsEqual
+     * @covers PHPUnit_Framework_Assert::equalTo
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsEqual2($expected, $actual, $message)
+    {
+        $constraint = PHPUnit_Framework_Assert::equalTo($expected);
+
+        try {
+            $constraint->evaluate($actual, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              "custom message\n$message",
+              $this->trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsEqual
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::equalTo
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsNotEqual()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::equalTo(1)
+        );
+
+        $this->assertTrue($constraint->evaluate(0, '', true));
+        $this->assertFalse($constraint->evaluate(1, '', true));
+        $this->assertEquals('is not equal to 1', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(1);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 1 is not equal to 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsEqual
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::equalTo
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsNotEqual2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::equalTo(1)
+        );
+
+        try {
+            $constraint->evaluate(1, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that 1 is not equal to 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsIdentical
+     * @covers PHPUnit_Framework_Assert::identicalTo
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsIdentical()
+    {
+        $a = new stdClass;
+        $b = new stdClass;
+
+        $constraint = PHPUnit_Framework_Assert::identicalTo($a);
+
+        $this->assertFalse($constraint->evaluate($b, '', true));
+        $this->assertTrue($constraint->evaluate($a, '', true));
+        $this->assertEquals('is identical to an object of class "stdClass"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate($b);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+Failed asserting that two variables reference the same object.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsIdentical
+     * @covers PHPUnit_Framework_Assert::identicalTo
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsIdentical2()
+    {
+        $a = new stdClass;
+        $b = new stdClass;
+
+        $constraint = PHPUnit_Framework_Assert::identicalTo($a);
+
+        try {
+            $constraint->evaluate($b, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that two variables reference the same object.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsIdentical
+     * @covers PHPUnit_Framework_Assert::identicalTo
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsIdentical3()
+    {
+        $constraint = PHPUnit_Framework_Assert::identicalTo('a');
+
+        try {
+            $constraint->evaluate('b', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that two strings are identical.
+--- Expected
++++ Actual
+@@ @@
+-a
++b
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsIdentical
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::identicalTo
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsNotIdentical()
+    {
+        $a = new stdClass;
+        $b = new stdClass;
+
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::identicalTo($a)
+        );
+
+        $this->assertTrue($constraint->evaluate($b, '', true));
+        $this->assertFalse($constraint->evaluate($a, '', true));
+        $this->assertEquals('is not identical to an object of class "stdClass"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate($a);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+Failed asserting that two variables don't reference the same object.
+
+EOF
+              ,
+              $this->trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsIdentical
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::identicalTo
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsNotIdentical2()
+    {
+        $a = new stdClass;
+
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::identicalTo($a)
+        );
+
+        try {
+            $constraint->evaluate($a, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that two variables don't reference the same object.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsIdentical
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::identicalTo
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsNotIdentical3()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::identicalTo('a')
+        );
+
+        try {
+            $constraint->evaluate('a', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that two strings are not identical.
+
+EOF
+              ,
+              $this->trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsInstanceOf
+     * @covers PHPUnit_Framework_Assert::isInstanceOf
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsInstanceOf()
+    {
+        $constraint = PHPUnit_Framework_Assert::isInstanceOf('Exception');
+
+        $this->assertFalse($constraint->evaluate(new stdClass, '', true));
+        $this->assertTrue($constraint->evaluate(new Exception, '', true));
+        $this->assertEquals('is instance of class "Exception"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        $interfaceConstraint = PHPUnit_Framework_Assert::isInstanceOf('Countable');
+        $this->assertFalse($interfaceConstraint->evaluate(new stdClass, '', true));
+        $this->assertTrue($interfaceConstraint->evaluate(new ArrayObject, '', true));
+        $this->assertEquals('is instance of interface "Countable"', $interfaceConstraint->toString());
+
+        try {
+            $constraint->evaluate(new stdClass);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that stdClass Object () is an instance of class "Exception".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsInstanceOf
+     * @covers PHPUnit_Framework_Assert::isInstanceOf
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsInstanceOf2()
+    {
+        $constraint = PHPUnit_Framework_Assert::isInstanceOf('Exception');
+
+        try {
+            $constraint->evaluate(new stdClass, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that stdClass Object () is an instance of class "Exception".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsInstanceOf
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::isInstanceOf
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsNotInstanceOf()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::isInstanceOf('stdClass')
+        );
+
+        $this->assertFalse($constraint->evaluate(new stdClass, '', true));
+        $this->assertTrue($constraint->evaluate(new Exception, '', true));
+        $this->assertEquals('is not instance of class "stdClass"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(new stdClass);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that stdClass Object () is not an instance of class "stdClass".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsInstanceOf
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::isInstanceOf
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsNotInstanceOf2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::isInstanceOf('stdClass')
+        );
+
+        try {
+            $constraint->evaluate(new stdClass, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that stdClass Object () is not an instance of class "stdClass".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsType
+     * @covers PHPUnit_Framework_Assert::isType
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsType()
+    {
+        $constraint = PHPUnit_Framework_Assert::isType('string');
+
+        $this->assertFalse($constraint->evaluate(0, '', true));
+        $this->assertTrue($constraint->evaluate('', '', true));
+        $this->assertEquals('is of type "string"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(new stdClass);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertStringMatchesFormat(<<<EOF
+Failed asserting that stdClass Object &%x () is of type "string".
+
+EOF
+              ,
+              $this->trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsType
+     * @covers PHPUnit_Framework_Assert::isType
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsType2()
+    {
+        $constraint = PHPUnit_Framework_Assert::isType('string');
+
+        try {
+            $constraint->evaluate(new stdClass, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertStringMatchesFormat(<<<EOF
+custom message
+Failed asserting that stdClass Object &%x () is of type "string".
+
+EOF
+              ,
+              $this->trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsType
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::isType
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsNotType()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::isType('string')
+        );
+
+        $this->assertTrue($constraint->evaluate(0, '', true));
+        $this->assertFalse($constraint->evaluate('', '', true));
+        $this->assertEquals('is not of type "string"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate('');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that '' is not of type "string".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsType
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::isType
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsNotType2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::isType('string')
+        );
+
+        try {
+            $constraint->evaluate('', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that '' is not of type "string".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsNull
+     * @covers PHPUnit_Framework_Assert::isNull
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsNull()
+    {
+        $constraint = PHPUnit_Framework_Assert::isNull();
+
+        $this->assertFalse($constraint->evaluate(0, '', true));
+        $this->assertTrue($constraint->evaluate(null, '', true));
+        $this->assertEquals('is null', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(0);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+Failed asserting that 0 is null.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsNull
+     * @covers PHPUnit_Framework_Assert::isNull
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsNull2()
+    {
+        $constraint = PHPUnit_Framework_Assert::isNull();
+
+        try {
+            $constraint->evaluate(0, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that 0 is null.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsNull
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::isNull
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsNotNull()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::isNull()
+        );
+
+        $this->assertFalse($constraint->evaluate(null, '', true));
+        $this->assertTrue($constraint->evaluate(0, '', true));
+        $this->assertEquals('is not null', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(null);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+Failed asserting that null is not null.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsNull
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::isNull
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsNotNull2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::isNull()
+        );
+
+        try {
+            $constraint->evaluate(null, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that null is not null.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_LessThan
+     * @covers PHPUnit_Framework_Assert::lessThan
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintLessThan()
+    {
+        $constraint = PHPUnit_Framework_Assert::lessThan(1);
+
+        $this->assertTrue($constraint->evaluate(0, '', true));
+        $this->assertFalse($constraint->evaluate(1, '', true));
+        $this->assertEquals('is less than 1', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(1);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 1 is less than 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_LessThan
+     * @covers PHPUnit_Framework_Assert::lessThan
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintLessThan2()
+    {
+        $constraint = PHPUnit_Framework_Assert::lessThan(1);
+
+        try {
+            $constraint->evaluate(1, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that 1 is less than 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_LessThan
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::lessThan
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintNotLessThan()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::lessThan(1)
+        );
+
+        $this->assertTrue($constraint->evaluate(1, '', true));
+        $this->assertFalse($constraint->evaluate(0, '', true));
+        $this->assertEquals('is not less than 1', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(0);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 0 is not less than 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_LessThan
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::lessThan
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintNotLessThan2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::lessThan(1)
+        );
+
+        try {
+            $constraint->evaluate(0, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that 0 is not less than 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsEqual
+     * @covers PHPUnit_Framework_Constraint_LessThan
+     * @covers PHPUnit_Framework_Constraint_Or
+     * @covers PHPUnit_Framework_Assert::lessThanOrEqual
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintLessThanOrEqual()
+    {
+        $constraint = PHPUnit_Framework_Assert::lessThanOrEqual(1);
+
+        $this->assertTrue($constraint->evaluate(1, '', true));
+        $this->assertFalse($constraint->evaluate(2, '', true));
+        $this->assertEquals('is equal to 1 or is less than 1', $constraint->toString());
+        $this->assertEquals(2, count($constraint));
+
+        try {
+            $constraint->evaluate(2);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 2 is equal to 1 or is less than 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_Callback
+     */
+    public function testConstraintCallback()
+    {
+        $closureReflect = function($parameter) {
+            return $parameter;
+        };
+
+        $closureWithoutParameter = function() {
+            return true;
+        };
+
+        $constraint = PHPUnit_Framework_Assert::callback($closureWithoutParameter);
+        $this->assertTrue($constraint->evaluate('', '', true));
+
+        $constraint = PHPUnit_Framework_Assert::callback($closureReflect);
+        $this->assertTrue($constraint->evaluate(true, '', true));
+        $this->assertFalse($constraint->evaluate(false, '', true));
+
+        $callback = array($this, 'callbackReturningTrue');
+        $constraint = PHPUnit_Framework_Assert::callback($callback);
+        $this->assertTrue($constraint->evaluate(false,  '', true));
+
+        $callback = array('Framework_ConstraintTest', 'staticCallbackReturningTrue');
+        $constraint = PHPUnit_Framework_Assert::callback($callback);
+        $this->assertTrue($constraint->evaluate(null, '', true));
+
+        $this->assertEquals('is accepted by specified callback', $constraint->toString());
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_Callback
+     * @expectedException PHPUnit_Framework_ExpectationFailedException
+     * @expectedExceptionMessage Failed asserting that 'This fails' is accepted by specified callback.
+     */
+    public function testConstraintCallbackFailure()
+    {
+        $constraint = PHPUnit_Framework_Assert::callback(function() {
+            return false;
+        });
+        $constraint->evaluate('This fails');
+    }
+
+    public function callbackReturningTrue()
+    {
+        return true;
+    }
+
+    public static function staticCallbackReturningTrue()
+    {
+        return true;
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsEqual
+     * @covers PHPUnit_Framework_Constraint_LessThan
+     * @covers PHPUnit_Framework_Constraint_Or
+     * @covers PHPUnit_Framework_Assert::lessThanOrEqual
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintLessThanOrEqual2()
+    {
+        $constraint = PHPUnit_Framework_Assert::lessThanOrEqual(1);
+
+        try {
+            $constraint->evaluate(2, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that 2 is equal to 1 or is less than 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsEqual
+     * @covers PHPUnit_Framework_Constraint_LessThan
+     * @covers PHPUnit_Framework_Constraint_Or
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::lessThanOrEqual
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintNotLessThanOrEqual()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::lessThanOrEqual(1)
+        );
+
+        $this->assertTrue($constraint->evaluate(2, '', true));
+        $this->assertFalse($constraint->evaluate(1, '', true));
+        $this->assertEquals('not( is equal to 1 or is less than 1 )', $constraint->toString());
+        $this->assertEquals(2, count($constraint));
+
+        try {
+            $constraint->evaluate(1);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that not( 1 is equal to 1 or is less than 1 ).
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsEqual
+     * @covers PHPUnit_Framework_Constraint_LessThan
+     * @covers PHPUnit_Framework_Constraint_Or
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::lessThanOrEqual
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintNotLessThanOrEqual2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::lessThanOrEqual(1)
+        );
+
+        try {
+            $constraint->evaluate(1, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that not( 1 is equal to 1 or is less than 1 ).
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_ClassHasAttribute
+     * @covers PHPUnit_Framework_Assert::classHasAttribute
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintClassHasAttribute()
+    {
+        $constraint = PHPUnit_Framework_Assert::classHasAttribute('privateAttribute');
+
+        $this->assertTrue($constraint->evaluate('ClassWithNonPublicAttributes', '', true));
+        $this->assertFalse($constraint->evaluate('stdClass', '', true));
+        $this->assertEquals('has attribute "privateAttribute"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate('stdClass');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that class "stdClass" has attribute "privateAttribute".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_ClassHasAttribute
+     * @covers PHPUnit_Framework_Assert::classHasAttribute
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintClassHasAttribute2()
+    {
+        $constraint = PHPUnit_Framework_Assert::classHasAttribute('privateAttribute');
+
+        try {
+            $constraint->evaluate('stdClass', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that class "stdClass" has attribute "privateAttribute".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_ClassHasAttribute
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::classHasAttribute
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintClassNotHasAttribute()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::classHasAttribute('privateAttribute')
+        );
+
+        $this->assertTrue($constraint->evaluate('stdClass', '', true));
+        $this->assertFalse($constraint->evaluate('ClassWithNonPublicAttributes', '', true));
+        $this->assertEquals('does not have attribute "privateAttribute"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate('ClassWithNonPublicAttributes');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that class "ClassWithNonPublicAttributes" does not have attribute "privateAttribute".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_ClassHasAttribute
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::classHasAttribute
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintClassNotHasAttribute2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::classHasAttribute('privateAttribute')
+        );
+
+        try {
+            $constraint->evaluate('ClassWithNonPublicAttributes', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that class "ClassWithNonPublicAttributes" does not have attribute "privateAttribute".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_ClassHasStaticAttribute
+     * @covers PHPUnit_Framework_Assert::classHasStaticAttribute
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintClassHasStaticAttribute()
+    {
+        $constraint = PHPUnit_Framework_Assert::classHasStaticAttribute('privateStaticAttribute');
+
+        $this->assertTrue($constraint->evaluate('ClassWithNonPublicAttributes', '', true));
+        $this->assertFalse($constraint->evaluate('stdClass', '', true));
+        $this->assertEquals('has static attribute "privateStaticAttribute"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate('stdClass');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that class "stdClass" has static attribute "privateStaticAttribute".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_ClassHasStaticAttribute
+     * @covers PHPUnit_Framework_Assert::classHasStaticAttribute
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintClassHasStaticAttribute2()
+    {
+        $constraint = PHPUnit_Framework_Assert::classHasStaticAttribute('foo');
+
+        try {
+            $constraint->evaluate('stdClass', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that class "stdClass" has static attribute "foo".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_ClassHasStaticAttribute
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::classHasStaticAttribute
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintClassNotHasStaticAttribute()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::classHasStaticAttribute('privateStaticAttribute')
+        );
+
+        $this->assertTrue($constraint->evaluate('stdClass', '', true));
+        $this->assertFalse($constraint->evaluate('ClassWithNonPublicAttributes', '', true));
+        $this->assertEquals('does not have static attribute "privateStaticAttribute"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate('ClassWithNonPublicAttributes');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that class "ClassWithNonPublicAttributes" does not have static attribute "privateStaticAttribute".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_ClassHasStaticAttribute
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::classHasStaticAttribute
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintClassNotHasStaticAttribute2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::classHasStaticAttribute('privateStaticAttribute')
+        );
+
+        try {
+            $constraint->evaluate('ClassWithNonPublicAttributes', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that class "ClassWithNonPublicAttributes" does not have static attribute "privateStaticAttribute".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_ObjectHasAttribute
+     * @covers PHPUnit_Framework_Assert::objectHasAttribute
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintObjectHasAttribute()
+    {
+        $constraint = PHPUnit_Framework_Assert::objectHasAttribute('privateAttribute');
+
+        $this->assertTrue($constraint->evaluate(new ClassWithNonPublicAttributes, '', true));
+        $this->assertFalse($constraint->evaluate(new stdClass, '', true));
+        $this->assertEquals('has attribute "privateAttribute"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(new stdClass);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that object of class "stdClass" has attribute "privateAttribute".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_ObjectHasAttribute
+     * @covers PHPUnit_Framework_Assert::objectHasAttribute
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintObjectHasAttribute2()
+    {
+        $constraint = PHPUnit_Framework_Assert::objectHasAttribute('privateAttribute');
+
+        try {
+            $constraint->evaluate(new stdClass, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that object of class "stdClass" has attribute "privateAttribute".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_ObjectHasAttribute
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::objectHasAttribute
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintObjectNotHasAttribute()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::objectHasAttribute('privateAttribute')
+        );
+
+        $this->assertTrue($constraint->evaluate(new stdClass, '', true));
+        $this->assertFalse($constraint->evaluate(new ClassWithNonPublicAttributes, '', true));
+        $this->assertEquals('does not have attribute "privateAttribute"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(new ClassWithNonPublicAttributes);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that object of class "ClassWithNonPublicAttributes" does not have attribute "privateAttribute".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_ObjectHasAttribute
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::objectHasAttribute
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintObjectNotHasAttribute2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::objectHasAttribute('privateAttribute')
+        );
+
+        try {
+            $constraint->evaluate(new ClassWithNonPublicAttributes, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that object of class "ClassWithNonPublicAttributes" does not have attribute "privateAttribute".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_PCREMatch
+     * @covers PHPUnit_Framework_Assert::matchesRegularExpression
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintPCREMatch()
+    {
+        $constraint = PHPUnit_Framework_Assert::matchesRegularExpression('/foo/');
+
+        $this->assertFalse($constraint->evaluate('barbazbar', '', true));
+        $this->assertTrue($constraint->evaluate('barfoobar', '', true));
+        $this->assertEquals('matches PCRE pattern "/foo/"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate('barbazbar');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 'barbazbar' matches PCRE pattern "/foo/".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_PCREMatch
+     * @covers PHPUnit_Framework_Assert::matchesRegularExpression
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintPCREMatch2()
+    {
+        $constraint = PHPUnit_Framework_Assert::matchesRegularExpression('/foo/');
+
+        try {
+            $constraint->evaluate('barbazbar', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that 'barbazbar' matches PCRE pattern "/foo/".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_PCREMatch
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::matchesRegularExpression
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintPCRENotMatch()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::matchesRegularExpression('/foo/')
+        );
+
+        $this->assertTrue($constraint->evaluate('barbazbar', '', true));
+        $this->assertFalse($constraint->evaluate('barfoobar', '', true));
+        $this->assertEquals('does not match PCRE pattern "/foo/"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate('barfoobar');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 'barfoobar' does not match PCRE pattern "/foo/".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_PCREMatch
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::matchesRegularExpression
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintPCRENotMatch2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::matchesRegularExpression('/foo/')
+        );
+
+        try {
+            $constraint->evaluate('barfoobar', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(<<<EOF
+custom message
+Failed asserting that 'barfoobar' does not match PCRE pattern "/foo/".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringMatches
+     * @covers PHPUnit_Framework_Assert::matches
+     * @covers PHPUnit_Framework_Constraint::count
+     */
+    public function testConstraintStringMatches()
+    {
+        $constraint = PHPUnit_Framework_Assert::matches('*%c*');
+        $this->assertFalse($constraint->evaluate('**', '', true));
+        $this->assertTrue($constraint->evaluate('***', '', true));
+        $this->assertEquals('matches PCRE pattern "/^\*.\*$/s"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringMatches
+     * @covers PHPUnit_Framework_Assert::matches
+     * @covers PHPUnit_Framework_Constraint::count
+     */
+    public function testConstraintStringMatches2()
+    {
+        $constraint = PHPUnit_Framework_Assert::matches('*%s*');
+        $this->assertFalse($constraint->evaluate('**', '', true));
+        $this->assertTrue($constraint->evaluate('***', '', true));
+        $this->assertEquals('matches PCRE pattern "/^\*[^\r\n]+\*$/s"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringMatches
+     * @covers PHPUnit_Framework_Assert::matches
+     * @covers PHPUnit_Framework_Constraint::count
+     */
+    public function testConstraintStringMatches3()
+    {
+        $constraint = PHPUnit_Framework_Assert::matches('*%i*');
+        $this->assertFalse($constraint->evaluate('**', '', true));
+        $this->assertTrue($constraint->evaluate('*0*', '', true));
+        $this->assertEquals('matches PCRE pattern "/^\*[+-]?\d+\*$/s"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringMatches
+     * @covers PHPUnit_Framework_Assert::matches
+     * @covers PHPUnit_Framework_Constraint::count
+     */
+    public function testConstraintStringMatches4()
+    {
+        $constraint = PHPUnit_Framework_Assert::matches('*%d*');
+        $this->assertFalse($constraint->evaluate('**', '', true));
+        $this->assertTrue($constraint->evaluate('*0*', '', true));
+        $this->assertEquals('matches PCRE pattern "/^\*\d+\*$/s"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringMatches
+     * @covers PHPUnit_Framework_Assert::matches
+     * @covers PHPUnit_Framework_Constraint::count
+     */
+    public function testConstraintStringMatches5()
+    {
+        $constraint = PHPUnit_Framework_Assert::matches('*%x*');
+        $this->assertFalse($constraint->evaluate('**', '', true));
+        $this->assertTrue($constraint->evaluate('*0f0f0f*', '', true));
+        $this->assertEquals('matches PCRE pattern "/^\*[0-9a-fA-F]+\*$/s"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringMatches
+     * @covers PHPUnit_Framework_Assert::matches
+     * @covers PHPUnit_Framework_Constraint::count
+     */
+    public function testConstraintStringMatches6()
+    {
+        $constraint = PHPUnit_Framework_Assert::matches('*%f*');
+        $this->assertFalse($constraint->evaluate('**', '', true));
+        $this->assertTrue($constraint->evaluate('*1.0*', '', true));
+        $this->assertEquals('matches PCRE pattern "/^\*[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?\*$/s"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringStartsWith
+     * @covers PHPUnit_Framework_Assert::stringStartsWith
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintStringStartsWith()
+    {
+        $constraint = PHPUnit_Framework_Assert::stringStartsWith('prefix');
+
+        $this->assertFalse($constraint->evaluate('foo', '', true));
+        $this->assertTrue($constraint->evaluate('prefixfoo', '', true));
+        $this->assertEquals('starts with "prefix"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate('foo');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 'foo' starts with "prefix".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringStartsWith
+     * @covers PHPUnit_Framework_Assert::stringStartsWith
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintStringStartsWith2()
+    {
+        $constraint = PHPUnit_Framework_Assert::stringStartsWith('prefix');
+
+        try {
+            $constraint->evaluate('foo', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message\nFailed asserting that 'foo' starts with "prefix".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringStartsWith
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::stringStartsWith
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintStringStartsNotWith()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::stringStartsWith('prefix')
+        );
+
+        $this->assertTrue($constraint->evaluate('foo', '', true));
+        $this->assertFalse($constraint->evaluate('prefixfoo', '', true));
+        $this->assertEquals('starts not with "prefix"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate('prefixfoo');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 'prefixfoo' starts not with "prefix".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringStartsWith
+     * @covers PHPUnit_Framework_Assert::stringStartsWith
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintStringStartsNotWith2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::stringStartsWith('prefix')
+        );
+
+        try {
+            $constraint->evaluate('prefixfoo', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that 'prefixfoo' starts not with "prefix".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringContains
+     * @covers PHPUnit_Framework_Assert::stringContains
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintStringContains()
+    {
+        $constraint = PHPUnit_Framework_Assert::stringContains('foo');
+
+        $this->assertFalse($constraint->evaluate('barbazbar', '', true));
+        $this->assertTrue($constraint->evaluate('barfoobar', '', true));
+        $this->assertEquals('contains "foo"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate('barbazbar');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 'barbazbar' contains "foo".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringContains
+     * @covers PHPUnit_Framework_Assert::stringContains
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintStringContains2()
+    {
+        $constraint = PHPUnit_Framework_Assert::stringContains('foo');
+
+        try {
+            $constraint->evaluate('barbazbar', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that 'barbazbar' contains "foo".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringContains
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::stringContains
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintStringNotContains()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::stringContains('foo')
+        );
+
+        $this->assertTrue($constraint->evaluate('barbazbar', '', true));
+        $this->assertFalse($constraint->evaluate('barfoobar', '', true));
+        $this->assertEquals('does not contain "foo"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate('barfoobar');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 'barfoobar' does not contain "foo".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringContains
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::stringContains
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintStringNotContains2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::stringContains('foo')
+        );
+
+        try {
+            $constraint->evaluate('barfoobar', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that 'barfoobar' does not contain "foo".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringEndsWith
+     * @covers PHPUnit_Framework_Assert::stringEndsWith
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintStringEndsWith()
+    {
+        $constraint = PHPUnit_Framework_Assert::stringEndsWith('suffix');
+
+        $this->assertFalse($constraint->evaluate('foo', '', true));
+        $this->assertTrue($constraint->evaluate('foosuffix', '', true));
+        $this->assertEquals('ends with "suffix"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate('foo');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 'foo' ends with "suffix".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringEndsWith
+     * @covers PHPUnit_Framework_Assert::stringEndsWith
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintStringEndsWith2()
+    {
+        $constraint = PHPUnit_Framework_Assert::stringEndsWith('suffix');
+
+        try {
+            $constraint->evaluate('foo', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that 'foo' ends with "suffix".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringEndsWith
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::stringEndsWith
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintStringEndsNotWith()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::stringEndsWith('suffix')
+        );
+
+        $this->assertTrue($constraint->evaluate('foo', '', true));
+        $this->assertFalse($constraint->evaluate('foosuffix', '', true));
+        $this->assertEquals('ends not with "suffix"', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate('foosuffix');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that 'foosuffix' ends not with "suffix".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_StringEndsWith
+     * @covers PHPUnit_Framework_Assert::stringEndsWith
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintStringEndsNotWith2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::stringEndsWith('suffix')
+        );
+
+        try {
+            $constraint->evaluate('foosuffix', 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that 'foosuffix' ends not with "suffix".
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_TraversableContains
+     */
+    public function testConstraintArrayContainsCheckForObjectIdentity()
+    {
+        // Check for primitive type.
+        $constraint = new PHPUnit_Framework_Constraint_TraversableContains('foo', true, true);
+
+        $this->assertFalse($constraint->evaluate(array(0), '', true));
+        $this->assertFalse($constraint->evaluate(array(true), '', true));
+
+        // Default case.
+        $constraint = new PHPUnit_Framework_Constraint_TraversableContains('foo');
+
+        $this->assertTrue($constraint->evaluate(array(0), '', true));
+        $this->assertTrue($constraint->evaluate(array(true), '', true));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_TraversableContains
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintArrayContains()
+    {
+        $constraint = new PHPUnit_Framework_Constraint_TraversableContains('foo');
+
+        $this->assertFalse($constraint->evaluate(array('bar'), '', true));
+        $this->assertTrue($constraint->evaluate(array('foo'), '', true));
+        $this->assertEquals("contains 'foo'", $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(array('bar'));
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that an array contains 'foo'.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_TraversableContains
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintArrayContains2()
+    {
+        $constraint = new PHPUnit_Framework_Constraint_TraversableContains('foo');
+
+        try {
+            $constraint->evaluate(array('bar'), 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that an array contains 'foo'.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_TraversableContains
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintArrayNotContains()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          new PHPUnit_Framework_Constraint_TraversableContains('foo')
+        );
+
+        $this->assertTrue($constraint->evaluate(array('bar'), '', true));
+        $this->assertFalse($constraint->evaluate(array('foo'), '', true));
+        $this->assertEquals("does not contain 'foo'", $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(array('foo'));
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that an array does not contain 'foo'.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_TraversableContains
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintArrayNotContains2()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          new PHPUnit_Framework_Constraint_TraversableContains('foo')
+        );
+
+        try {
+            $constraint->evaluate(array('foo'), 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message
+Failed asserting that an array does not contain 'foo'.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_TraversableContains
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintSplObjectStorageContains()
+    {
+        $object     = new StdClass;
+        $constraint = new PHPUnit_Framework_Constraint_TraversableContains($object);
+        $this->assertStringMatchesFormat("contains stdClass Object &%s ()", $constraint->toString());
+
+        $storage = new SplObjectStorage;
+        $this->assertFalse($constraint->evaluate($storage, '', true));
+
+        $storage->attach($object);
+        $this->assertTrue($constraint->evaluate($storage, '', true));
+
+        try {
+            $constraint->evaluate(new SplObjectStorage);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertStringMatchesFormat(
+              <<<EOF
+Failed asserting that a traversable contains stdClass Object &%x ().
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_TraversableContains
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintSplObjectStorageContains2()
+    {
+        $object     = new StdClass;
+        $constraint = new PHPUnit_Framework_Constraint_TraversableContains($object);
+
+        try {
+            $constraint->evaluate(new SplObjectStorage, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertStringMatchesFormat(
+              <<<EOF
+custom message
+Failed asserting that a traversable contains stdClass Object &%x ().
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::attributeEqualTo
+     * @covers PHPUnit_Framework_Constraint_Attribute
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testAttributeEqualTo()
+    {
+        $object     = new ClassWithNonPublicAttributes;
+        $constraint = PHPUnit_Framework_Assert::attributeEqualTo('foo', 1);
+
+        $this->assertTrue($constraint->evaluate($object, '', true));
+        $this->assertEquals('attribute "foo" is equal to 1', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        $constraint = PHPUnit_Framework_Assert::attributeEqualTo('foo', 2);
+
+        $this->assertFalse($constraint->evaluate($object, '', true));
+
+        try {
+            $constraint->evaluate($object);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that attribute "foo" is equal to 2.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::attributeEqualTo
+     * @covers PHPUnit_Framework_Constraint_Attribute
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testAttributeEqualTo2()
+    {
+        $object     = new ClassWithNonPublicAttributes;
+        $constraint = PHPUnit_Framework_Assert::attributeEqualTo('foo', 2);
+
+        try {
+            $constraint->evaluate($object, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message\nFailed asserting that attribute "foo" is equal to 2.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::attributeEqualTo
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_Constraint_Attribute
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testAttributeNotEqualTo()
+    {
+        $object     = new ClassWithNonPublicAttributes;
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::attributeEqualTo('foo', 2)
+        );
+
+        $this->assertTrue($constraint->evaluate($object, '', true));
+        $this->assertEquals('attribute "foo" is not equal to 2', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::attributeEqualTo('foo', 1)
+        );
+
+        $this->assertFalse($constraint->evaluate($object, '', true));
+
+        try {
+            $constraint->evaluate($object);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that attribute "foo" is not equal to 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::attributeEqualTo
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_Constraint_Attribute
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testAttributeNotEqualTo2()
+    {
+        $object     = new ClassWithNonPublicAttributes;
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          PHPUnit_Framework_Assert::attributeEqualTo('foo', 1)
+        );
+
+        try {
+            $constraint->evaluate($object, 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message\nFailed asserting that attribute "foo" is not equal to 1.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsEmpty
+     * @covers PHPUnit_Framework_Constraint::count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsEmpty()
+    {
+        $constraint = new PHPUnit_Framework_Constraint_IsEmpty;
+
+        $this->assertFalse($constraint->evaluate(array('foo'), '', true));
+        $this->assertTrue($constraint->evaluate(array(), '', true));
+        $this->assertFalse($constraint->evaluate(new ArrayObject(array('foo')), '', true));
+        $this->assertTrue($constraint->evaluate(new ArrayObject(array()), '', true));
+        $this->assertEquals('is empty', $constraint->toString());
+        $this->assertEquals(1, count($constraint));
+
+        try {
+            $constraint->evaluate(array('foo'));
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that an array is empty.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_IsEmpty
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintIsEmpty2()
+    {
+        $constraint = new PHPUnit_Framework_Constraint_IsEmpty;
+
+        try {
+            $constraint->evaluate(array('foo'), 'custom message');
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+custom message\nFailed asserting that an array is empty.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_Count
+     */
+    public function testConstraintCountWithAnArray()
+    {
+        $constraint = new PHPUnit_Framework_Constraint_Count(5);
+
+        $this->assertTrue($constraint->evaluate(array(1,2,3,4,5), '', true));
+        $this->assertFalse($constraint->evaluate(array(1,2,3,4), '', true));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_Count
+     */
+    public function testConstraintCountWithAnIteratorWhichDoesNotImplementCountable()
+    {
+        $constraint = new PHPUnit_Framework_Constraint_Count(5);
+
+        $this->assertTrue($constraint->evaluate(new TestIterator(array(1,2,3,4,5)), '', true));
+        $this->assertFalse($constraint->evaluate(new TestIterator(array(1,2,3,4)), '', true));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_Count
+     */
+    public function testConstraintCountWithAnObjectImplementingCountable()
+    {
+        $constraint = new PHPUnit_Framework_Constraint_Count(5);
+
+        $this->assertTrue($constraint->evaluate(new ArrayObject(array(1,2,3,4,5)), '', true));
+        $this->assertFalse($constraint->evaluate(new ArrayObject(array(1,2,3,4)), '', true));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_Count
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintCountFailing()
+    {
+        $constraint = new PHPUnit_Framework_Constraint_Count(5);
+
+        try {
+            $constraint->evaluate(array(1,2));
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that actual size 2 matches expected size 5.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_Count
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintNotCountFailing()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          new PHPUnit_Framework_Constraint_Count(2)
+        );
+
+        try {
+            $constraint->evaluate(array(1,2));
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that actual size 2 does not match expected size 2.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_SameSize
+     */
+    public function testConstraintSameSizeWithAnArray()
+    {
+        $constraint = new PHPUnit_Framework_Constraint_SameSize(array(1,2,3,4,5));
+
+        $this->assertTrue($constraint->evaluate(array(6,7,8,9,10), '', true));
+        $this->assertFalse($constraint->evaluate(array(1,2,3,4), '', true));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_SameSize
+     */
+    public function testConstraintSameSizeWithAnIteratorWhichDoesNotImplementCountable()
+    {
+        $constraint = new PHPUnit_Framework_Constraint_SameSize(new TestIterator(array(1,2,3,4,5)));
+
+        $this->assertTrue($constraint->evaluate(new TestIterator(array(6,7,8,9,10)), '', true));
+        $this->assertFalse($constraint->evaluate(new TestIterator(array(1,2,3,4)), '', true));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_SameSize
+     */
+    public function testConstraintSameSizeWithAnObjectImplementingCountable()
+    {
+        $constraint = new PHPUnit_Framework_Constraint_SameSize(new ArrayObject(array(1,2,3,4,5)));
+
+        $this->assertTrue($constraint->evaluate(new ArrayObject(array(6,7,8,9,10)), '', true));
+        $this->assertFalse($constraint->evaluate(new ArrayObject(array(1,2,3,4)), '', true));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_SameSize
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintSameSizeFailing()
+    {
+        $constraint = new PHPUnit_Framework_Constraint_SameSize(array(1,2,3,4,5));
+
+        try {
+            $constraint->evaluate(array(1,2));
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that actual size 2 matches expected size 5.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_SameSize
+     * @covers PHPUnit_Framework_Constraint_Not
+     * @covers PHPUnit_Framework_Assert::logicalNot
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintNotSameSizeFailing()
+    {
+        $constraint = PHPUnit_Framework_Assert::logicalNot(
+          new PHPUnit_Framework_Constraint_SameSize(array(1,2))
+        );
+
+        try {
+            $constraint->evaluate(array(3,4));
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that actual size 2 does not match expected size 2.
+
+EOF
+              ,
+              PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_Exception
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintException()
+    {
+        $constraint = new PHPUnit_Framework_Constraint_Exception('FoobarException');
+        $exception = new DummyException('Test');
+        $stackTrace = $exception->getTraceAsString();
+
+        try {
+            $constraint->evaluate($exception);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that exception of type "DummyException" matches expected exception "FoobarException". Message was: "Test" at
+$stackTrace.
+
+EOF
+                ,
+                PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * Removes spaces in front of newlines
+     *
+     * @param  string $string
+     * @return string
+     */
+    private function trimnl($string)
+    {
+        return preg_replace('/[ ]*\n/', "\n", $string);
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Framework/SelectorAssertionsTest.php b/vendor/phpunit/phpunit/tests/Framework/SelectorAssertionsTest.php
new file mode 100644
index 00000000..fa0c5beb
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Framework/SelectorAssertionsTest.php
@@ -0,0 +1,998 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class Framework_SelectorAssertionsTest extends PHPUnit_Framework_TestCase
+{
+    private $html;
+
+    protected function setUp()
+    {
+        $this->html = file_get_contents(
+            dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'SelectorAssertionsFixture.html'
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagTypeTrue()
+    {
+        $matcher = array('tag' => 'html');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagTypeFalse()
+    {
+        $matcher = array('tag' => 'code');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagIdTrue()
+    {
+        $matcher = array('id' => 'test_text');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagIdFalse()
+    {
+        $matcher = array('id' => 'test_text_doesnt_exist');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagStringContentTrue()
+    {
+        $matcher = array('id' => 'test_text',
+            'content' => 'My test tag content');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagStringContentFalse()
+    {
+        $matcher = array('id' => 'test_text',
+            'content' => 'My non existent tag content');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagRegexpContentTrue()
+    {
+        $matcher = array('id' => 'test_text',
+            'content' => 'regexp:/test tag/');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagRegexpModifierContentTrue()
+    {
+        $matcher = array('id' => 'test_text',
+            'content' => 'regexp:/TEST TAG/i');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagRegexpContentFalse()
+    {
+        $matcher = array('id' => 'test_text',
+            'content' => 'regexp:/asdf/');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagCdataContentTrue()
+    {
+        $matcher = array('tag' => 'script',
+            'content' => 'alert(\'Hello, world!\');');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagCdataontentFalse()
+    {
+        $matcher = array('tag' => 'script',
+            'content' => 'asdf');
+        $this->assertTag($matcher, $this->html);
+    }
+
+
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAttributesTrueA()
+    {
+        $matcher = array('tag' => 'span',
+            'attributes' => array('class' => 'test_class'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAttributesTrueB()
+    {
+        $matcher = array('tag' => 'div',
+            'attributes' => array('id' => 'test_child_id'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagAttributesFalse()
+    {
+        $matcher = array('tag' => 'span',
+            'attributes' => array('class' => 'test_missing_class'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAttributesRegexpTrueA()
+    {
+        $matcher = array('tag' => 'span',
+            'attributes' => array('class' => 'regexp:/.+_class/'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAttributesRegexpTrueB()
+    {
+        $matcher = array('tag' => 'div',
+            'attributes' => array('id' => 'regexp:/.+_child_.+/'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAttributesRegexpModifierTrue()
+    {
+        $matcher = array('tag' => 'div',
+            'attributes' => array('id' => 'regexp:/.+_CHILD_.+/i'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagAttributesRegexpModifierFalse()
+    {
+        $matcher = array('tag' => 'div',
+            'attributes' => array('id' => 'regexp:/.+_CHILD_.+/'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagAttributesRegexpFalse()
+    {
+        $matcher = array('tag' => 'span',
+            'attributes' => array('class' => 'regexp:/.+_missing_.+/'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAttributesMultiPartClassTrueA()
+    {
+        $matcher = array('tag' => 'div',
+            'id'  => 'test_multi_class',
+            'attributes' => array('class' => 'multi class'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAttributesMultiPartClassTrueB()
+    {
+        $matcher = array('tag' => 'div',
+            'id'  => 'test_multi_class',
+            'attributes' => array('class' => 'multi'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagAttributesMultiPartClassFalse()
+    {
+        $matcher = array('tag' => 'div',
+            'id'  => 'test_multi_class',
+            'attributes' => array('class' => 'mul'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagParentTrue()
+    {
+        $matcher = array('tag' => 'head',
+            'parent' => array('tag' => 'html'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagParentFalse()
+    {
+        $matcher = array('tag' => 'head',
+            'parent' => array('tag' => 'div'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagMultiplePossibleChildren()
+    {
+        $matcher = array(
+            'tag' => 'li',
+            'parent' => array(
+                'tag' => 'ul',
+                'id' => 'another_ul'
+            )
+        );
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagChildTrue()
+    {
+        $matcher = array('tag' => 'html',
+            'child' => array('tag' => 'head'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagChildFalse()
+    {
+        $matcher = array('tag' => 'html',
+            'child' => array('tag' => 'div'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAdjacentSiblingTrue()
+    {
+        $matcher = array('tag' => 'img',
+            'adjacent-sibling' => array('tag' => 'input'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagAdjacentSiblingFalse()
+    {
+        $matcher = array('tag' => 'img',
+            'adjacent-sibling' => array('tag' => 'div'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAncestorTrue()
+    {
+        $matcher = array('tag' => 'div',
+            'ancestor' => array('tag' => 'html'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagAncestorFalse()
+    {
+        $matcher = array('tag' => 'html',
+            'ancestor' => array('tag' => 'div'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagDescendantTrue()
+    {
+        $matcher = array('tag' => 'html',
+            'descendant' => array('tag' => 'div'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagDescendantFalse()
+    {
+        $matcher = array('tag' => 'div',
+            'descendant' => array('tag' => 'html'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagChildrenCountTrue()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('count' => 3));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagChildrenCountFalse()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('count' => 5));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagChildrenLessThanTrue()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('less_than' => 10));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagChildrenLessThanFalse()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('less_than' => 2));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagChildrenGreaterThanTrue()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('greater_than' => 2));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagChildrenGreaterThanFalse()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('greater_than' => 10));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagChildrenOnlyTrue()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('only' => array('tag' =>'li')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagChildrenOnlyFalse()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('only' => array('tag' =>'div')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagTypeIdTrueA()
+    {
+        $matcher = array('tag' => 'ul', 'id' => 'my_ul');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagTypeIdTrueB()
+    {
+        $matcher = array('id' => 'my_ul', 'tag' => 'ul');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagTypeIdTrueC()
+    {
+        $matcher = array('tag' => 'input', 'id'  => 'input_test_id');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagTypeIdFalse()
+    {
+        $matcher = array('tag' => 'div', 'id'  => 'my_ul');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagContentAttributes()
+    {
+        $matcher = array('tag' => 'div',
+            'content'    => 'Test Id Text',
+            'attributes' => array('id' => 'test_id',
+                'class' => 'my_test_class'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertParentContentAttributes()
+    {
+        $matcher = array('tag'        => 'div',
+            'content'    => 'Test Id Text',
+            'attributes' => array('id'    => 'test_id',
+                'class' => 'my_test_class'),
+            'parent'     => array('tag' => 'body'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertChildContentAttributes()
+    {
+        $matcher = array('tag'        => 'div',
+            'content'    => 'Test Id Text',
+            'attributes' => array('id'    => 'test_id',
+                'class' => 'my_test_class'),
+            'child'      => array('tag'        => 'div',
+                'attributes' => array('id' => 'test_child_id')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertAdjacentSiblingContentAttributes()
+    {
+        $matcher = array('tag'              => 'div',
+            'content'          => 'Test Id Text',
+            'attributes'       => array('id'    => 'test_id',
+                'class' => 'my_test_class'),
+            'adjacent-sibling' => array('tag'        => 'div',
+                'attributes' => array('id' => 'test_children')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertChildSubChildren()
+    {
+        $matcher = array('id' => 'test_id',
+            'child' => array('id' => 'test_child_id',
+                'child' => array('id' => 'test_subchild_id')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertAdjacentSiblingSubAdjacentSibling()
+    {
+        $matcher = array('id' => 'test_id',
+            'adjacent-sibling' => array('id' => 'test_children',
+                'adjacent-sibling' => array('class' => 'test_class')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertAncestorContentAttributes()
+    {
+        $matcher = array('id'         => 'test_subchild_id',
+            'content'    => 'My Subchild',
+            'attributes' => array('id' => 'test_subchild_id'),
+            'ancestor'   => array('tag'        => 'div',
+                'attributes' => array('id' => 'test_id')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertDescendantContentAttributes()
+    {
+        $matcher = array('id'         => 'test_id',
+            'content'    => 'Test Id Text',
+            'attributes' => array('id'  => 'test_id'),
+            'descendant' => array('tag'        => 'span',
+                'attributes' => array('id' => 'test_subchild_id')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertChildrenContentAttributes()
+    {
+        $matcher = array('id'         => 'test_children',
+            'content'    => 'My Children',
+            'attributes' => array('class'  => 'children'),
+
+            'children' => array('less_than'    => '25',
+                'greater_than' => '2',
+                'only'         => array('tag' => 'div',
+                    'attributes' => array('class' => 'my_child'))
+            ));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     * @ticket 1380
+     */
+    public function testAssertTagWithMalformedHTML()
+    {
+        $matcher = array(
+            'tag' => 'form',
+            'descendant' => array(
+                'tag' => 'input',
+                'attributes' => array(
+                    'name' => 'property',
+                    'value' => 'Foo'
+                )
+            )
+        );
+
+        $html = '<form><input name="property" value="Foo"><hr></hr></form>';
+        $this->assertTag($matcher, $html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotTag
+     */
+    public function testAssertNotTagTypeIdFalse()
+    {
+        $matcher = array('tag' => 'div', 'id'  => 'my_ul');
+        $this->assertNotTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertNotTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertNotTagContentAttributes()
+    {
+        $matcher = array('tag' => 'div',
+            'content'    => 'Test Id Text',
+            'attributes' => array('id' => 'test_id',
+                'class' => 'my_test_class'));
+        $this->assertNotTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountPresentTrue()
+    {
+        $selector = 'div#test_id';
+        $count    = true;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountPresentFalse()
+    {
+        $selector = 'div#non_existent';
+        $count    = true;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountNotPresentTrue()
+    {
+        $selector = 'div#non_existent';
+        $count    = false;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectNotPresentFalse()
+    {
+        $selector = 'div#test_id';
+        $count    = false;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountChildTrue()
+    {
+        $selector = '#my_ul > li';
+        $count    = 3;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountChildFalse()
+    {
+        $selector = '#my_ul > li';
+        $count    = 4;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountAdjacentSiblingTrue()
+    {
+        $selector = 'div + div + div';
+        $count    = 2;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountAdjacentSiblingFalse()
+    {
+        $selector = '#test_children + div';
+        $count    = 1;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountDescendantTrue()
+    {
+        $selector = '#my_ul li';
+        $count    = 3;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountDescendantFalse()
+    {
+        $selector = '#my_ul li';
+        $count    = 4;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountGreaterThanTrue()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('>' => 2);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountGreaterThanFalse()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('>' => 3);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountGreaterThanEqualToTrue()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('>=' => 3);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountGreaterThanEqualToFalse()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('>=' => 4);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountLessThanTrue()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('<' => 4);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountLessThanFalse()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('<' => 3);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountLessThanEqualToTrue()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('<=' => 3);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountLessThanEqualToFalse()
+    {
+        $selector = '#my_ul > li';
+        $range  = array('<=' => 2);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountRangeTrue()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('>' => 2, '<' => 4);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountRangeFalse()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('>' => 1, '<' => 3);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectEquals
+     */
+    public function testAssertSelectEqualsContentPresentTrue()
+    {
+        $selector = 'span.test_class';
+        $content  = 'Test Class Text';
+
+        $this->assertSelectEquals($selector, $content, true, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectEquals
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectEqualsContentPresentFalse()
+    {
+        $selector = 'span.test_class';
+        $content  = 'Test Nonexistent';
+
+        $this->assertSelectEquals($selector, $content, true, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectEquals
+     */
+    public function testAssertSelectEqualsContentNotPresentTrue()
+    {
+        $selector = 'span.test_class';
+        $content  = 'Test Nonexistent';
+
+        $this->assertSelectEquals($selector, $content, false, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectEquals
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectEqualsContentNotPresentFalse()
+    {
+        $selector = 'span.test_class';
+        $content  = 'Test Class Text';
+
+        $this->assertSelectEquals($selector, $content, false, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectRegExp
+     */
+    public function testAssertSelectRegExpContentPresentTrue()
+    {
+        $selector = 'span.test_class';
+        $regexp   = '/Test.*Text/';
+
+        $this->assertSelectRegExp($selector, $regexp, true, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectRegExp
+     */
+    public function testAssertSelectRegExpContentPresentFalse()
+    {
+        $selector = 'span.test_class';
+        $regexp   = '/Nonexistant/';
+
+        $this->assertSelectRegExp($selector, $regexp, false, $this->html);
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Framework/SuiteTest.php b/vendor/phpunit/phpunit/tests/Framework/SuiteTest.php
new file mode 100644
index 00000000..390d6122
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Framework/SuiteTest.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'BeforeAndAfterTest.php';
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'BeforeClassAndAfterClassTest.php';
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'InheritedTestCase.php';
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NoTestCaseClass.php';
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NoTestCases.php';
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NotPublicTestCase.php';
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NotVoidTestCase.php';
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'OverrideTestCase.php';
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ * @covers     PHPUnit_Framework_TestSuite
+ */
+class Framework_SuiteTest extends PHPUnit_Framework_TestCase {
+    protected $result;
+
+    protected function setUp()
+    {
+        $this->result = new PHPUnit_Framework_TestResult;
+    }
+
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite;
+
+        $suite->addTest(new Framework_SuiteTest('testAddTestSuite'));
+        $suite->addTest(new Framework_SuiteTest('testInheritedTests'));
+        $suite->addTest(new Framework_SuiteTest('testNoTestCases'));
+        $suite->addTest(new Framework_SuiteTest('testNoTestCaseClass'));
+        $suite->addTest(new Framework_SuiteTest('testNotExistingTestCase'));
+        $suite->addTest(new Framework_SuiteTest('testNotPublicTestCase'));
+        $suite->addTest(new Framework_SuiteTest('testNotVoidTestCase'));
+        $suite->addTest(new Framework_SuiteTest('testOneTestCase'));
+        $suite->addTest(new Framework_SuiteTest('testShadowedTests'));
+        $suite->addTest(new Framework_SuiteTest('testBeforeClassAndAfterClassAnnotations'));
+        $suite->addTest(new Framework_SuiteTest('testBeforeAnnotation'));
+        $suite->addTest(new Framework_SuiteTest('testDontSkipInheritedClass'));
+
+        return $suite;
+    }
+
+    public function testAddTestSuite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite(
+          'OneTestCase'
+        );
+
+        $suite->run($this->result);
+
+        $this->assertEquals(1, count($this->result));
+    }
+
+    public function testInheritedTests()
+    {
+        $suite = new PHPUnit_Framework_TestSuite(
+          'InheritedTestCase'
+        );
+
+        $suite->run($this->result);
+
+        $this->assertTrue($this->result->wasSuccessful());
+        $this->assertEquals(2, count($this->result));
+    }
+
+    public function testNoTestCases()
+    {
+        $suite = new PHPUnit_Framework_TestSuite(
+          'NoTestCases'
+        );
+
+        $suite->run($this->result);
+
+        $this->assertTrue(!$this->result->wasSuccessful());
+        $this->assertEquals(1, $this->result->failureCount());
+        $this->assertEquals(1, count($this->result));
+    }
+
+    /**
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testNoTestCaseClass()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('NoTestCaseClass');
+    }
+
+    public function testNotExistingTestCase()
+    {
+        $suite = new Framework_SuiteTest('notExistingMethod');
+
+        $suite->run($this->result);
+
+        $this->assertEquals(0, $this->result->errorCount());
+        $this->assertEquals(1, $this->result->failureCount());
+        $this->assertEquals(1, count($this->result));
+    }
+
+    public function testNotPublicTestCase()
+    {
+        $suite = new PHPUnit_Framework_TestSuite(
+          'NotPublicTestCase'
+        );
+
+        $this->assertEquals(2, count($suite));
+    }
+
+    public function testNotVoidTestCase()
+    {
+        $suite = new PHPUnit_Framework_TestSuite(
+          'NotVoidTestCase'
+        );
+
+        $this->assertEquals(1, count($suite));
+    }
+
+    public function testOneTestCase()
+    {
+        $suite = new PHPUnit_Framework_TestSuite(
+          'OneTestCase'
+        );
+
+        $suite->run($this->result);
+
+        $this->assertEquals(0, $this->result->errorCount());
+        $this->assertEquals(0, $this->result->failureCount());
+        $this->assertEquals(1, count($this->result));
+        $this->assertTrue($this->result->wasSuccessful());
+    }
+
+    public function testShadowedTests()
+    {
+        $suite = new PHPUnit_Framework_TestSuite(
+          'OverrideTestCase'
+        );
+
+        $suite->run($this->result);
+
+        $this->assertEquals(1, count($this->result));
+    }
+
+    public function testBeforeClassAndAfterClassAnnotations()
+    {
+        $suite = new PHPUnit_Framework_TestSuite(
+          'BeforeClassAndAfterClassTest'
+        );
+
+        BeforeClassAndAfterClassTest::resetProperties();
+        $suite->run($this->result);
+
+        $this->assertEquals(1, BeforeClassAndAfterClassTest::$beforeClassWasRun, "@beforeClass method was not run once for the whole suite.");
+        $this->assertEquals(1, BeforeClassAndAfterClassTest::$afterClassWasRun, "@afterClass method was not run once for the whole suite.");
+    }
+
+    public function testBeforeAnnotation()
+    {
+        $test = new PHPUnit_Framework_TestSuite(
+            'BeforeAndAfterTest'
+        );
+
+        BeforeAndAfterTest::resetProperties();
+        $result = $test->run();
+
+        $this->assertEquals(2, BeforeAndAfterTest::$beforeWasRun);
+        $this->assertEquals(2, BeforeAndAfterTest::$afterWasRun);
+    }
+
+    public function testDontSkipInheritedClass()
+    {
+        $suite = new PHPUnit_Framework_TestSuite(
+          'DontSkipInheritedClass'
+        );
+
+        $dir = dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Inheritance' . DIRECTORY_SEPARATOR;
+
+        $suite->addTestFile($dir.'InheritanceA.php');
+        $suite->addTestFile($dir.'InheritanceB.php');
+        $result = $suite->run();
+        $this->assertEquals(2, count($result));
+
+    }
+
+}
diff --git a/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php b/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php
new file mode 100644
index 00000000..b660ec66
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php
@@ -0,0 +1,463 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NoArgTestCaseTest.php';
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Singleton.php';
+
+$GLOBALS['a']  = 'a';
+$_ENV['b']     = 'b';
+$_POST['c']    = 'c';
+$_GET['d']     = 'd';
+$_COOKIE['e']  = 'e';
+$_SERVER['f']  = 'f';
+$_FILES['g']   = 'g';
+$_REQUEST['h'] = 'h';
+$GLOBALS['i']  = 'i';
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ * @covers     PHPUnit_Framework_TestCase
+ */
+class Framework_TestCaseTest extends PHPUnit_Framework_TestCase
+{
+    protected $backupGlobalsBlacklist = array('i', 'singleton');
+
+    /**
+     * Used be testStaticAttributesBackupPre
+     */
+    protected static $_testStatic = 0;
+
+    public function testCaseToString()
+    {
+        $this->assertEquals(
+          'Framework_TestCaseTest::testCaseToString',
+          $this->toString()
+        );
+    }
+
+    public function testSuccess()
+    {
+        $test   = new Success;
+        $result = $test->run();
+
+        $this->assertEquals(0, $result->errorCount());
+        $this->assertEquals(0, $result->failureCount());
+        $this->assertEquals(1, count($result));
+    }
+
+    public function testFailure()
+    {
+        $test   = new Failure;
+        $result = $test->run();
+
+        $this->assertEquals(0, $result->errorCount());
+        $this->assertEquals(1, $result->failureCount());
+        $this->assertEquals(1, count($result));
+    }
+
+    public function testError()
+    {
+        $test   = new Error;
+        $result = $test->run();
+
+        $this->assertEquals(1, $result->errorCount());
+        $this->assertEquals(0, $result->failureCount());
+        $this->assertEquals(1, count($result));
+    }
+
+    public function testExceptionInSetUp()
+    {
+        $test   = new ExceptionInSetUpTest('testSomething');
+        $result = $test->run();
+
+        $this->assertTrue($test->setUp);
+        $this->assertFalse($test->assertPreConditions);
+        $this->assertFalse($test->testSomething);
+        $this->assertFalse($test->assertPostConditions);
+        $this->assertTrue($test->tearDown);
+    }
+
+    public function testExceptionInAssertPreConditions()
+    {
+        $test   = new ExceptionInAssertPreConditionsTest('testSomething');
+        $result = $test->run();
+
+        $this->assertTrue($test->setUp);
+        $this->assertTrue($test->assertPreConditions);
+        $this->assertFalse($test->testSomething);
+        $this->assertFalse($test->assertPostConditions);
+        $this->assertTrue($test->tearDown);
+    }
+
+    public function testExceptionInTest()
+    {
+        $test   = new ExceptionInTest('testSomething');
+        $result = $test->run();
+
+        $this->assertTrue($test->setUp);
+        $this->assertTrue($test->assertPreConditions);
+        $this->assertTrue($test->testSomething);
+        $this->assertFalse($test->assertPostConditions);
+        $this->assertTrue($test->tearDown);
+    }
+
+    public function testExceptionInAssertPostConditions()
+    {
+        $test   = new ExceptionInAssertPostConditionsTest('testSomething');
+        $result = $test->run();
+
+        $this->assertTrue($test->setUp);
+        $this->assertTrue($test->assertPreConditions);
+        $this->assertTrue($test->testSomething);
+        $this->assertTrue($test->assertPostConditions);
+        $this->assertTrue($test->tearDown);
+    }
+
+    public function testExceptionInTearDown()
+    {
+        $test   = new ExceptionInTearDownTest('testSomething');
+        $result = $test->run();
+
+        $this->assertTrue($test->setUp);
+        $this->assertTrue($test->assertPreConditions);
+        $this->assertTrue($test->testSomething);
+        $this->assertTrue($test->assertPostConditions);
+        $this->assertTrue($test->tearDown);
+    }
+
+    public function testNoArgTestCasePasses()
+    {
+        $result = new PHPUnit_Framework_TestResult;
+        $t      = new PHPUnit_Framework_TestSuite('NoArgTestCaseTest');
+
+        $t->run($result);
+
+        $this->assertEquals(1, count($result));
+        $this->assertEquals(0, $result->failureCount());
+        $this->assertEquals(0, $result->errorCount());
+    }
+
+    public function testWasRun()
+    {
+        $test = new WasRun;
+        $test->run();
+
+        $this->assertTrue($test->wasRun);
+    }
+
+    public function testException()
+    {
+        $test = new ThrowExceptionTestCase('test');
+        $test->setExpectedException('RuntimeException');
+
+        $result = $test->run();
+
+        $this->assertEquals(1, count($result));
+        $this->assertTrue($result->wasSuccessful());
+    }
+
+    public function testNoException()
+    {
+        $test = new ThrowNoExceptionTestCase('test');
+        $test->setExpectedException('RuntimeException');
+
+        $result = $test->run();
+
+        $this->assertEquals(1, $result->failureCount());
+        $this->assertEquals(1, count($result));
+    }
+
+    public function testWrongException()
+    {
+        $test = new ThrowExceptionTestCase('test');
+        $test->setExpectedException('InvalidArgumentException');
+
+        $result = $test->run();
+
+        $this->assertEquals(1, $result->failureCount());
+        $this->assertEquals(1, count($result));
+    }
+
+    /**
+     * @backupGlobals enabled
+     */
+    public function testGlobalsBackupPre()
+    {
+        global $a;
+        global $i;
+
+        $this->assertEquals('a', $a);
+        $this->assertEquals('a', $GLOBALS['a']);
+        $this->assertEquals('b', $_ENV['b']);
+        $this->assertEquals('c', $_POST['c']);
+        $this->assertEquals('d', $_GET['d']);
+        $this->assertEquals('e', $_COOKIE['e']);
+        $this->assertEquals('f', $_SERVER['f']);
+        $this->assertEquals('g', $_FILES['g']);
+        $this->assertEquals('h', $_REQUEST['h']);
+        $this->assertEquals('i', $i);
+        $this->assertEquals('i', $GLOBALS['i']);
+
+        $GLOBALS['a']   = 'aa';
+        $GLOBALS['foo'] = 'bar';
+        $_ENV['b']      = 'bb';
+        $_POST['c']     = 'cc';
+        $_GET['d']      = 'dd';
+        $_COOKIE['e']   = 'ee';
+        $_SERVER['f']   = 'ff';
+        $_FILES['g']    = 'gg';
+        $_REQUEST['h']  = 'hh';
+        $GLOBALS['i']   = 'ii';
+
+        $this->assertEquals('aa', $a);
+        $this->assertEquals('aa', $GLOBALS['a']);
+        $this->assertEquals('bar', $GLOBALS['foo']);
+        $this->assertEquals('bb', $_ENV['b']);
+        $this->assertEquals('cc', $_POST['c']);
+        $this->assertEquals('dd', $_GET['d']);
+        $this->assertEquals('ee', $_COOKIE['e']);
+        $this->assertEquals('ff', $_SERVER['f']);
+        $this->assertEquals('gg', $_FILES['g']);
+        $this->assertEquals('hh', $_REQUEST['h']);
+        $this->assertEquals('ii', $i);
+        $this->assertEquals('ii', $GLOBALS['i']);
+    }
+
+    public function testGlobalsBackupPost()
+    {
+        global $a;
+        global $i;
+
+        $this->assertEquals('a', $a);
+        $this->assertEquals('a', $GLOBALS['a']);
+        $this->assertEquals('b', $_ENV['b']);
+        $this->assertEquals('c', $_POST['c']);
+        $this->assertEquals('d', $_GET['d']);
+        $this->assertEquals('e', $_COOKIE['e']);
+        $this->assertEquals('f', $_SERVER['f']);
+        $this->assertEquals('g', $_FILES['g']);
+        $this->assertEquals('h', $_REQUEST['h']);
+        $this->assertEquals('ii', $i);
+        $this->assertEquals('ii', $GLOBALS['i']);
+
+        $this->assertArrayNotHasKey('foo', $GLOBALS);
+    }
+
+    /**
+     * @backupGlobals enabled
+     * @backupStaticAttributes enabled
+     */
+    public function testStaticAttributesBackupPre()
+    {
+        $GLOBALS['singleton'] = Singleton::getInstance();
+        self::$_testStatic = 123;
+    }
+
+    /**
+     * @depends testStaticAttributesBackupPre
+     */
+    public function testStaticAttributesBackupPost()
+    {
+        $this->assertNotSame($GLOBALS['singleton'], Singleton::getInstance());
+        $this->assertSame(123, self::$_testStatic);
+    }
+
+    public function testExpectOutputStringFooActualFoo()
+    {
+        $test   = new OutputTestCase('testExpectOutputStringFooActualFoo');
+        $result = $test->run();
+
+        $this->assertEquals(1, count($result));
+        $this->assertTrue($result->wasSuccessful());
+    }
+
+    public function testExpectOutputStringFooActualBar()
+    {
+        $test   = new OutputTestCase('testExpectOutputStringFooActualBar');
+        $result = $test->run();
+
+        $this->assertEquals(1, count($result));
+        $this->assertFalse($result->wasSuccessful());
+    }
+
+    public function testExpectOutputRegexFooActualFoo()
+    {
+        $test   = new OutputTestCase('testExpectOutputRegexFooActualFoo');
+        $result = $test->run();
+
+        $this->assertEquals(1, count($result));
+        $this->assertTrue($result->wasSuccessful());
+    }
+
+    public function testExpectOutputRegexFooActualBar()
+    {
+        $test   = new OutputTestCase('testExpectOutputRegexFooActualBar');
+        $result = $test->run();
+
+        $this->assertEquals(1, count($result));
+        $this->assertFalse($result->wasSuccessful());
+    }
+
+    public function testSkipsIfRequiresHigherVersionOfPHPUnit()
+    {
+        $test   = new RequirementsTest('testAlwaysSkip');
+        $result = $test->run();
+
+        $this->assertEquals(1, $result->skippedCount());
+        $this->assertEquals(
+          'PHPUnit 1111111 (or later) is required.',
+          $test->getStatusMessage()
+        );
+    }
+
+    public function testSkipsIfRequiresHigherVersionOfPHP()
+    {
+        $test   = new RequirementsTest('testAlwaysSkip2');
+        $result = $test->run();
+
+        $this->assertEquals(1, $result->skippedCount());
+        $this->assertEquals(
+          'PHP 9999999 (or later) is required.',
+          $test->getStatusMessage()
+        );
+    }
+
+    public function testSkipsIfRequiresNonExistingOs()
+    {
+        $test   = new RequirementsTest('testAlwaysSkip3');
+        $result = $test->run();
+
+        $this->assertEquals(1, $result->skippedCount());
+        $this->assertEquals(
+          'Operating system matching /DOESNOTEXIST/i is required.',
+          $test->getStatusMessage()
+        );
+    }
+
+    public function testSkipsIfRequiresNonExistingFunction()
+    {
+        $test   = new RequirementsTest('testNine');
+        $result = $test->run();
+
+        $this->assertEquals(1, $result->skippedCount());
+        $this->assertEquals(
+          'Function testFunc is required.',
+          $test->getStatusMessage()
+        );
+    }
+
+    public function testSkipsIfRequiresNonExistingExtension()
+    {
+        $test   = new RequirementsTest('testTen');
+        $result = $test->run();
+
+        $this->assertEquals(
+          'Extension testExt is required.',
+          $test->getStatusMessage()
+        );
+    }
+
+    public function testSkipsProvidesMessagesForAllSkippingReasons()
+    {
+        $test   = new RequirementsTest('testAllPossibleRequirements');
+        $result = $test->run();
+
+        $this->assertEquals(
+          'PHP 99-dev (or later) is required.' . PHP_EOL .
+          'PHPUnit 9-dev (or later) is required.' . PHP_EOL .
+          'Operating system matching /DOESNOTEXIST/i is required.' . PHP_EOL .
+          'Function testFuncOne is required.' . PHP_EOL .
+          'Function testFuncTwo is required.' . PHP_EOL .
+          'Extension testExtOne is required.' . PHP_EOL .
+          'Extension testExtTwo is required.',
+          $test->getStatusMessage()
+        );
+    }
+
+    public function testRequiringAnExistingMethodDoesNotSkip()
+    {
+        $test   = new RequirementsTest('testExistingMethod');
+        $result = $test->run();
+        $this->assertEquals(0, $result->skippedCount());
+    }
+
+    public function testRequiringAnExistingFunctionDoesNotSkip()
+    {
+        $test   = new RequirementsTest('testExistingFunction');
+        $result = $test->run();
+        $this->assertEquals(0, $result->skippedCount());
+    }
+
+    public function testRequiringAnExistingExtensionDoesNotSkip()
+    {
+        $test   = new RequirementsTest('testExistingExtension');
+        $result = $test->run();
+        $this->assertEquals(0, $result->skippedCount());
+    }
+
+    public function testRequiringAnExistingOsDoesNotSkip()
+    {
+        $test   = new RequirementsTest('testExistingOs');
+        $result = $test->run();
+        $this->assertEquals(0, $result->skippedCount());
+    }
+
+    public function testCurrentWorkingDirectoryIsRestored()
+    {
+        $expectedCwd = getcwd();
+
+        $test = new ChangeCurrentWorkingDirectoryTest('testSomethingThatChangesTheCwd');
+        $test->run();
+
+        $this->assertSame($expectedCwd, getcwd());
+    }
+
+}
diff --git a/vendor/phpunit/phpunit/tests/Framework/TestFailureTest.php b/vendor/phpunit/phpunit/tests/Framework/TestFailureTest.php
new file mode 100644
index 00000000..4b8805ae
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Framework/TestFailureTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.7.20
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.7.20
+ */
+class Framework_TestFailureTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers PHPUnit_Framework_TestFailure::toString
+     */
+    public function testToString()
+    {
+        $test = new self(__FUNCTION__);
+        $exception = new PHPUnit_Framework_Exception('message');
+        $failure = new PHPUnit_Framework_TestFailure($test, $exception);
+
+        $this->assertEquals(__METHOD__ . ': message', $failure->toString());
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Framework/TestImplementorTest.php b/vendor/phpunit/phpunit/tests/Framework/TestImplementorTest.php
new file mode 100644
index 00000000..f2d33a83
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Framework/TestImplementorTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class Framework_TestImplementorTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers PHPUnit_Framework_TestCase
+     */
+    public function testSuccessfulRun()
+    {
+        $result = new PHPUnit_Framework_TestResult;
+
+        $test = new DoubleTestCase(new Success);
+        $test->run($result);
+
+        $this->assertEquals(count($test), count($result));
+        $this->assertEquals(0, $result->errorCount());
+        $this->assertEquals(0, $result->failureCount());
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Framework/TestListenerTest.php b/vendor/phpunit/phpunit/tests/Framework/TestListenerTest.php
new file mode 100644
index 00000000..30d184b5
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Framework/TestListenerTest.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ * @covers     PHPUnit_Framework_TestCase
+ */
+class Framework_TestListenerTest extends PHPUnit_Framework_TestCase implements PHPUnit_Framework_TestListener
+{
+    protected $endCount;
+    protected $errorCount;
+    protected $failureCount;
+    protected $notImplementedCount;
+    protected $riskyCount;
+    protected $skippedCount;
+    protected $result;
+    protected $startCount;
+
+    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->errorCount++;
+    }
+
+    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
+    {
+        $this->failureCount++;
+    }
+
+    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->notImplementedCount++;
+    }
+
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->riskyCount++;
+    }
+
+    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->skippedCount++;
+    }
+
+    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+    }
+
+    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+    }
+
+    public function startTest(PHPUnit_Framework_Test $test)
+    {
+        $this->startCount++;
+    }
+
+    public function endTest(PHPUnit_Framework_Test $test, $time)
+    {
+        $this->endCount++;
+    }
+
+    protected function setUp()
+    {
+        $this->result = new PHPUnit_Framework_TestResult;
+        $this->result->addListener($this);
+
+        $this->endCount            = 0;
+        $this->failureCount        = 0;
+        $this->notImplementedCount = 0;
+        $this->riskyCount          = 0;
+        $this->skippedCount        = 0;
+        $this->startCount          = 0;
+    }
+
+    public function testError()
+    {
+        $test = new Error;
+        $test->run($this->result);
+
+        $this->assertEquals(1, $this->errorCount);
+        $this->assertEquals(1, $this->endCount);
+    }
+
+    public function testFailure()
+    {
+        $test = new Failure;
+        $test->run($this->result);
+
+        $this->assertEquals(1, $this->failureCount);
+        $this->assertEquals(1, $this->endCount);
+    }
+
+    public function testStartStop()
+    {
+        $test = new Success;
+        $test->run($this->result);
+
+        $this->assertEquals(1, $this->startCount);
+        $this->assertEquals(1, $this->endCount);
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/1021.phpt b/vendor/phpunit/phpunit/tests/Regression/1021.phpt
new file mode 100644
index 00000000..2f31e734
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/1021.phpt
@@ -0,0 +1,19 @@
+--TEST--
+#1021: Depending on a test that uses a data provider does not work
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue1021Test';
+$_SERVER['argv'][3] = dirname(__FILE__).'/1021/Issue1021Test.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 1 assertion)
diff --git a/vendor/phpunit/phpunit/tests/Regression/1021/Issue1021Test.php b/vendor/phpunit/phpunit/tests/Regression/1021/Issue1021Test.php
new file mode 100644
index 00000000..5814e94c
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/1021/Issue1021Test.php
@@ -0,0 +1,23 @@
+<?php
+class Issue1021Test extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provider
+     */
+    public function testSomething($data)
+    {
+        $this->assertTrue($data);
+    }
+
+    /**
+     * @depends testSomething
+     */
+    public function testSomethingElse()
+    {
+    }
+
+    public function provider()
+    {
+        return array(array(true));
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/523.phpt b/vendor/phpunit/phpunit/tests/Regression/523.phpt
new file mode 100644
index 00000000..339570fc
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/523.phpt
@@ -0,0 +1,19 @@
+--TEST--
+#523: assertAttributeEquals does not work with classes extending ArrayIterator
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue523Test';
+$_SERVER['argv'][3] = dirname(__FILE__).'/523/Issue523Test.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/vendor/phpunit/phpunit/tests/Regression/523/Issue523Test.php b/vendor/phpunit/phpunit/tests/Regression/523/Issue523Test.php
new file mode 100644
index 00000000..80124f1d
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/523/Issue523Test.php
@@ -0,0 +1,13 @@
+<?php
+class Issue523Test extends PHPUnit_Framework_TestCase
+{
+    public function testAttributeEquals()
+    {
+        $this->assertAttributeEquals('foo', 'field', new Issue523());
+    }
+};
+
+class Issue523 extends ArrayIterator
+{
+    protected $field = 'foo';
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/578.phpt b/vendor/phpunit/phpunit/tests/Regression/578.phpt
new file mode 100644
index 00000000..4a4d3e07
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/578.phpt
@@ -0,0 +1,37 @@
+--TEST--
+#578: Double printing of trace line for exceptions from notices and warnings
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue578Test';
+$_SERVER['argv'][3] = dirname(__FILE__).'/578/Issue578Test.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+EEE
+
+Time: %s, Memory: %sMb
+
+There were 3 errors:
+
+1) Issue578Test::testNoticesDoublePrintStackTrace
+Invalid error type specified
+
+%sIssue578Test.php:%i
+
+2) Issue578Test::testWarningsDoublePrintStackTrace
+Invalid error type specified
+
+%sIssue578Test.php:%i
+
+3) Issue578Test::testUnexpectedExceptionsPrintsCorrectly
+Exception: Double printed exception
+
+%sIssue578Test.php:%i
+
+FAILURES!
+Tests: 3, Assertions: 0, Errors: 3.
diff --git a/vendor/phpunit/phpunit/tests/Regression/578/Issue578Test.php b/vendor/phpunit/phpunit/tests/Regression/578/Issue578Test.php
new file mode 100644
index 00000000..262d97f6
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/578/Issue578Test.php
@@ -0,0 +1,20 @@
+<?php
+class Issue578Test extends PHPUnit_Framework_TestCase
+{
+    public function testNoticesDoublePrintStackTrace()
+    {
+        $this->iniSet('error_reporting', E_ALL | E_NOTICE);
+        trigger_error('Stack Trace Test Notice', E_NOTICE);
+    }
+
+    public function testWarningsDoublePrintStackTrace()
+    {
+        $this->iniSet('error_reporting', E_ALL | E_NOTICE);
+        trigger_error('Stack Trace Test Notice', E_WARNING);
+    }
+
+    public function testUnexpectedExceptionsPrintsCorrectly()
+    {
+        throw new Exception('Double printed exception');
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/684.phpt b/vendor/phpunit/phpunit/tests/Regression/684.phpt
new file mode 100644
index 00000000..139b3f9a
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/684.phpt
@@ -0,0 +1,25 @@
+--TEST--
+#684: Unable to find test class when no test methods exists
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue684Test';
+$_SERVER['argv'][3] = dirname(__FILE__).'/684/Issue684Test.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+F
+
+Time: %s, Memory: %sMb
+
+There was 1 failure:
+
+1) Warning
+No tests found in class "Foo_Bar_Issue684Test".
+
+FAILURES!
+Tests: 1, Assertions: 0, Failures: 1.
diff --git a/vendor/phpunit/phpunit/tests/Regression/684/Issue684Test.php b/vendor/phpunit/phpunit/tests/Regression/684/Issue684Test.php
new file mode 100644
index 00000000..e8e5d87e
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/684/Issue684Test.php
@@ -0,0 +1,4 @@
+<?php
+class Foo_Bar_Issue684Test extends PHPUnit_Framework_TestCase
+{
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/783.phpt b/vendor/phpunit/phpunit/tests/Regression/783.phpt
new file mode 100644
index 00000000..84f00f6b
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/783.phpt
@@ -0,0 +1,21 @@
+--TEST--
+#783: Tests getting executed twice when using multiple groups
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--group';
+$_SERVER['argv'][3] = 'foo,bar';
+$_SERVER['argv'][4] = 'ParentSuite';
+$_SERVER['argv'][5] = dirname(__FILE__).'/783/ParentSuite.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 0 assertions)
diff --git a/vendor/phpunit/phpunit/tests/Regression/783/ChildSuite.php b/vendor/phpunit/phpunit/tests/Regression/783/ChildSuite.php
new file mode 100644
index 00000000..8bac5144
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/783/ChildSuite.php
@@ -0,0 +1,15 @@
+<?php
+require_once 'OneTest.php';
+require_once 'TwoTest.php';
+
+class ChildSuite
+{
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('Child');
+        $suite->addTestSuite('OneTest');
+        $suite->addTestSuite('TwoTest');
+
+        return $suite;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/783/OneTest.php b/vendor/phpunit/phpunit/tests/Regression/783/OneTest.php
new file mode 100644
index 00000000..3daa91b6
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/783/OneTest.php
@@ -0,0 +1,10 @@
+<?php
+/**
+* @group foo
+*/
+class OneTest extends PHPUnit_Framework_TestCase
+{
+    public function testSomething()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/783/ParentSuite.php b/vendor/phpunit/phpunit/tests/Regression/783/ParentSuite.php
new file mode 100644
index 00000000..6dd63e27
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/783/ParentSuite.php
@@ -0,0 +1,13 @@
+<?php
+require_once 'ChildSuite.php';
+
+class ParentSuite
+{
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('Parent');
+        $suite->addTest(ChildSuite::suite());
+
+        return $suite;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/783/TwoTest.php b/vendor/phpunit/phpunit/tests/Regression/783/TwoTest.php
new file mode 100644
index 00000000..8fa9958c
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/783/TwoTest.php
@@ -0,0 +1,10 @@
+<?php
+/**
+* @group bar
+*/
+class TwoTest extends PHPUnit_Framework_TestCase
+{
+    public function testSomething()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1149.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/1149.phpt
new file mode 100644
index 00000000..7d9dfcf2
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1149.phpt
@@ -0,0 +1,20 @@
+--TEST--
+GH-1149: Test swallows output buffer when run in a separate process
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue1149Test';
+$_SERVER['argv'][3] = dirname(__FILE__).'/1149/Issue1149Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.1.2
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 2 assertions)
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1149/Issue1149Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/1149/Issue1149Test.php
new file mode 100644
index 00000000..01ac870a
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1149/Issue1149Test.php
@@ -0,0 +1,18 @@
+<?php
+class Issue1149Test extends PHPUnit_Framework_TestCase
+{
+    public function testOne()
+    {
+        $this->assertTrue(true);
+        print '1';
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testTwo()
+    {
+        $this->assertTrue(true);
+        print '2';
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1265.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/1265.phpt
new file mode 100644
index 00000000..12556647
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1265.phpt
@@ -0,0 +1,23 @@
+--TEST--
+GH-1265: Could not use "PHPUnit_Runner_StandardTestSuiteLoader" as loader
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--configuration';
+$_SERVER['argv'][2] = dirname(__FILE__).'/1265/phpunit1265.xml';
+$_SERVER['argv'][3] = 'Issue1265Test';
+$_SERVER['argv'][4] = dirname(__FILE__).'/1265/Issue1265Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+Configuration read from %s
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1265/Issue1265Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/1265/Issue1265Test.php
new file mode 100644
index 00000000..68d71b3c
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1265/Issue1265Test.php
@@ -0,0 +1,8 @@
+<?php
+class Issue1265Test extends PHPUnit_Framework_TestCase
+{
+    public function testTrue()
+    {
+        $this->assertTrue(true);
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1265/phpunit1265.xml b/vendor/phpunit/phpunit/tests/Regression/GitHub/1265/phpunit1265.xml
new file mode 100644
index 00000000..27fdd529
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1265/phpunit1265.xml
@@ -0,0 +1,2 @@
+<phpunit testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader">
+</phpunit>
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1330.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/1330.phpt
new file mode 100644
index 00000000..af02df1c
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1330.phpt
@@ -0,0 +1,26 @@
+--TEST--
+GH-1330: Allow non-ambiguous shortened longopts
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--deb';
+$_SERVER['argv'][2] = '--config';
+$_SERVER['argv'][3] = dirname(__FILE__).'/1330/phpunit1330.xml';
+$_SERVER['argv'][4] = 'Issue1330Test';
+$_SERVER['argv'][5] = dirname(__FILE__).'/1330/Issue1330Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+Configuration read from %s
+
+
+Starting test 'Issue1330Test::testTrue'.
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/Issue1330Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/Issue1330Test.php
new file mode 100644
index 00000000..0829cb95
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/Issue1330Test.php
@@ -0,0 +1,8 @@
+<?php
+class Issue1330Test extends PHPUnit_Framework_TestCase
+{
+    public function testTrue()
+    {
+        $this->assertTrue(PHPUNIT_1330);
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/phpunit1330.xml b/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/phpunit1330.xml
new file mode 100644
index 00000000..a61e0cc1
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/phpunit1330.xml
@@ -0,0 +1,5 @@
+<phpunit>
+  <php>
+    <const name="PHPUNIT_1330" value="true"/>
+  </php>
+</phpunit>
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1335.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/1335.phpt
new file mode 100644
index 00000000..de467f6a
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1335.phpt
@@ -0,0 +1,21 @@
+--TEST--
+GH-1335: exportVariable multiple backslash problem
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--bootstrap';
+$_SERVER['argv'][3] = dirname(__FILE__).'/1335/bootstrap1335.php';
+$_SERVER['argv'][4] = dirname(__FILE__).'/1335/Issue1335Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+............
+
+Time: %s, Memory: %sMb
+
+OK (12 tests, 12 assertions)
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/Issue1335Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/Issue1335Test.php
new file mode 100644
index 00000000..307ef66a
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/Issue1335Test.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState enabled
+ */
+class Issue1335Test extends PHPUnit_Framework_TestCase
+{
+    function testGlobalString()
+    {
+        $this->assertEquals("Hello", $GLOBALS['globalString']);
+    }
+
+    function testGlobalIntTruthy()
+    {
+        $this->assertEquals(1, $GLOBALS['globalIntTruthy']);
+    }
+
+    function testGlobalIntFalsey()
+    {
+        $this->assertEquals(0, $GLOBALS['globalIntFalsey']);
+    }
+
+    function testGlobalFloat()
+    {
+        $this->assertEquals(1.123, $GLOBALS['globalFloat']);
+    }
+
+    function testGlobalBoolTrue()
+    {
+        $this->assertEquals(true, $GLOBALS['globalBoolTrue']);
+    }
+
+    function testGlobalBoolFalse()
+    {
+        $this->assertEquals(false, $GLOBALS['globalBoolFalse']);
+    }
+
+    function testGlobalNull()
+    {
+        $this->assertEquals(null, $GLOBALS['globalNull']);
+    }
+
+    function testGlobalArray()
+    {
+        $this->assertEquals(array("foo"), $GLOBALS['globalArray']);
+    }
+
+    function testGlobalNestedArray()
+    {
+        $this->assertEquals(array(array("foo")), $GLOBALS['globalNestedArray']);
+    }
+
+    function testGlobalObject()
+    {
+        $this->assertEquals((object)array("foo"=>"bar"), $GLOBALS['globalObject']);
+    }
+
+    function testGlobalObjectWithBackSlashString()
+    {
+        $this->assertEquals((object)array("foo"=>"back\\slash"), $GLOBALS['globalObjectWithBackSlashString']);
+    }
+
+    function testGlobalObjectWithDoubleBackSlashString()
+    {
+        $this->assertEquals((object)array("foo"=>"back\\\\slash"), $GLOBALS['globalObjectWithDoubleBackSlashString']);
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/bootstrap1335.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/bootstrap1335.php
new file mode 100644
index 00000000..6435677b
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/bootstrap1335.php
@@ -0,0 +1,13 @@
+<?php
+$globalString = "Hello";
+$globalIntTruthy = 1;
+$globalIntFalsey = 0;
+$globalFloat = 1.123;
+$globalBoolTrue = true;
+$globalBoolFalse = false;
+$globalNull = null;
+$globalArray = array("foo");
+$globalNestedArray = array(array("foo"));
+$globalObject = (object)array("foo"=>"bar");
+$globalObjectWithBackSlashString = (object)array("foo"=>"back\\slash");
+$globalObjectWithDoubleBackSlashString = (object)array("foo"=>"back\\\\slash");
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1337.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/1337.phpt
new file mode 100644
index 00000000..17ee08e3
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1337.phpt
@@ -0,0 +1,21 @@
+--TEST--
+GH-1337: Data Provider with \ at the end of the name breaks with process isolation
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = 'Issue1337Test';
+$_SERVER['argv'][4] = dirname(__FILE__).'/1337/Issue1337Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 2 assertions)
\ No newline at end of file
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1337/Issue1337Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/1337/Issue1337Test.php
new file mode 100644
index 00000000..44a2fceb
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1337/Issue1337Test.php
@@ -0,0 +1,19 @@
+<?php
+class Issue1337Test extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider dataProvider
+     */
+    public function testProvider($a)
+    {
+        $this->assertTrue($a);
+    }
+
+    public function dataProvider()
+    {
+        return array(
+          'c:\\'=>array(true),
+          0.9=>array(true)
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1340.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/1340.phpt
new file mode 100644
index 00000000..4e1cd1fe
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1340.phpt
@@ -0,0 +1,34 @@
+--TEST--
+GH-1340: Process isolation blocks infinitely upon fatal error
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][3] = 'Issue1340Test';
+$_SERVER['argv'][4] = dirname(__FILE__).'/1340/Issue1340Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+%A
+.E.EE
+
+Time: %s, Memory: %sMb
+
+There were 3 errors:
+
+1) Issue1340Test::testLargeStderrOutputDoesNotBlockInIsolation
+PHPUnit_Framework_Exception: testLargeStderrOutputDoesNotBlockInIsolation: stderr:%d
+%A
+2) Issue1340Test::testPhpNoticeWithStderrOutputIsAnError
+PHPUnit_Framework_Exception: shutdown: stderr:%d
+%A
+3) Issue1340Test::testFatalErrorDoesNotPass
+PHPUnit_Framework_Exception: Fatal error: Call to undefined function undefined_function() in %s on line %d
+%A
+shutdown: stderr:%d
+%A
+FAILURES!
+Tests: 5, Assertions: 3, Errors: 3.
\ No newline at end of file
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1340/Issue1340Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/1340/Issue1340Test.php
new file mode 100644
index 00000000..580d98ab
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1340/Issue1340Test.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @see https://bugs.php.net/bug.php?id=51800
+ */
+class Issue1340Test extends PHPUnit_Framework_TestCase
+{
+    private static function get4KB()
+    {
+        return str_repeat('1', 4096 + 1);
+    }
+
+    /**
+     * Also fails despite no isolation, because a phpt test is executed in
+     * subprocess on its own.
+     */
+    public function testLargeStderrOutputDoesNotBlock()
+    {
+        // STDERR of a phpt test is not caught/validated at this point, so this
+        // error output does not cause this test to fail.
+        // @see https://github.com/sebastianbergmann/phpunit/issues/1169
+        error_log("\n" . __FUNCTION__ . ": stderr:" . self::get4KB() . "\n");
+        $this->assertTrue(true);
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testLargeStderrOutputDoesNotBlockInIsolation()
+    {
+        error_log("\n" . __FUNCTION__ . ": stderr:" . self::get4KB() . "\n");
+        $this->assertTrue(true);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @expectedException \PHPUnit_Framework_Error_Notice
+     * @expectedExceptionMessage Undefined variable: foo
+     */
+    public function testPhpNoticeIsCaught()
+    {
+        $bar = $foo['foo'];
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @expectedException \PHPUnit_Framework_Error_Notice
+     * @expectedExceptionMessage Undefined variable: foo
+     */
+    public function testPhpNoticeWithStderrOutputIsAnError()
+    {
+        register_shutdown_function(__CLASS__ . '::onShutdown');
+        $bar = $foo['foo'];
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testFatalErrorDoesNotPass()
+    {
+        register_shutdown_function(__CLASS__ . '::onShutdown');
+        $undefined = 'undefined_function';
+        $undefined();
+    }
+
+    public static function onShutdown() {
+        echo "\nshutdown: stdout:", self::get4KB(), "\n";
+        error_log("\nshutdown: stderr:" . self::get4KB());
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1374.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/1374.phpt
new file mode 100644
index 00000000..9ec7e3c7
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1374.phpt
@@ -0,0 +1,21 @@
+--TEST--
+GH-1374: tearDown() is called despite unmet requirements
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue1374Test';
+$_SERVER['argv'][3] = dirname(__FILE__).'/1374/Issue1374Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+S
+
+Time: %s, Memory: %sMb
+
+OK, but incomplete, skipped, or risky tests!
+Tests: 1, Assertions: 0, Skipped: 1.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1374/Issue1374Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/1374/Issue1374Test.php
new file mode 100644
index 00000000..ad6a3bf0
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/1374/Issue1374Test.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @requires extension I_DO_NOT_EXIST
+ */
+class Issue1374Test extends PHPUnit_Framework_TestCase
+{
+    protected function setUp()
+    {
+        print __FUNCTION__;
+    }
+
+    public function testSomething()
+    {
+        $this->fail('This should not be reached');
+    }
+
+    protected function tearDown()
+    {
+        print __FUNCTION__;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/244.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/244.phpt
new file mode 100644
index 00000000..33ec8192
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/244.phpt
@@ -0,0 +1,32 @@
+--TEST--
+GH-244: Expected Exception should support string codes
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = 'Issue244Test';
+$_SERVER['argv'][4] = dirname(__FILE__).'/244/Issue244Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.FFF
+
+Time: %s, Memory: %sMb
+
+There were 3 failures:
+
+1) Issue244Test::testFails
+Failed asserting that '123StringCode' is equal to expected exception code 'OtherString'.
+
+2) Issue244Test::testFailsTooIfExpectationIsANumber
+Failed asserting that '123StringCode' is equal to expected exception code 123.
+
+3) Issue244Test::testFailsTooIfExceptionCodeIsANumber
+Failed asserting that 123 is equal to expected exception code '123String'.
+
+FAILURES!
+Tests: 4, Assertions: 8, Failures: 3.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/244/Issue244Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/244/Issue244Test.php
new file mode 100644
index 00000000..621c4cf5
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/244/Issue244Test.php
@@ -0,0 +1,55 @@
+<?php
+class Issue244Test extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @expectedException Issue244Exception
+     * @expectedExceptionCode 123StringCode
+     */
+    public function testWorks()
+    {
+        throw new Issue244Exception;
+    }
+
+    /**
+     * @expectedException Issue244Exception
+     * @expectedExceptionCode OtherString
+     */
+    public function testFails()
+    {
+        throw new Issue244Exception;
+    }
+
+    /**
+     * @expectedException Issue244Exception
+     * @expectedExceptionCode 123
+     */
+    public function testFailsTooIfExpectationIsANumber()
+    {
+        throw new Issue244Exception;
+    }
+
+    /**
+     * @expectedException Issue244ExceptionIntCode
+     * @expectedExceptionCode 123String
+     */
+    public function testFailsTooIfExceptionCodeIsANumber()
+    {
+        throw new Issue244ExceptionIntCode;
+    }
+}
+
+class Issue244Exception extends Exception
+{
+    public function __construct()
+    {
+        $this->code = '123StringCode';
+    }
+}
+
+class Issue244ExceptionIntCode extends Exception
+{
+    public function __construct()
+    {
+        $this->code = 123;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/322.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/322.phpt
new file mode 100644
index 00000000..7fc31c49
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/322.phpt
@@ -0,0 +1,28 @@
+--TEST--
+GH-322: group commandline option should override group/exclude setting in phpunit.xml
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--configuration';
+$_SERVER['argv'][2] = dirname(__FILE__).'/322/phpunit322.xml';
+$_SERVER['argv'][3] = '--debug';
+$_SERVER['argv'][4] = '--group';
+$_SERVER['argv'][5] = 'one';
+$_SERVER['argv'][6] = 'Issue322Test';
+$_SERVER['argv'][7] = dirname(__FILE__).'/322/Issue322Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+Configuration read from %s
+
+
+Starting test 'Issue322Test::testOne'.
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 0 assertions)
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/322/Issue322Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/322/Issue322Test.php
new file mode 100644
index 00000000..618bcaa1
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/322/Issue322Test.php
@@ -0,0 +1,17 @@
+<?php
+class Issue322Test extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @group one
+     */
+    public function testOne()
+    {
+    }
+
+    /**
+     * @group two
+     */
+    public function testTwo()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/322/phpunit322.xml b/vendor/phpunit/phpunit/tests/Regression/GitHub/322/phpunit322.xml
new file mode 100644
index 00000000..e3b29483
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/322/phpunit322.xml
@@ -0,0 +1,11 @@
+<phpunit>
+  <testsuite name="My Test Suite">
+    <file>Test.php</file>
+  </testsuite>
+
+  <groups>
+    <exclude>
+      <group>one</group>
+    </exclude>
+  </groups>
+</phpunit>
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/433.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/433.phpt
new file mode 100644
index 00000000..9c512d8a
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/433.phpt
@@ -0,0 +1,31 @@
+--TEST--
+GH-433: expectOutputString not completely working as expected
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue433Test';
+$_SERVER['argv'][3] = dirname(__FILE__).'/433/Issue433Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..F
+
+Time: %s, Memory: %sMb
+
+There was 1 failure:
+
+1) Issue433Test::testNotMatchingOutput
+Failed asserting that two strings are equal.
+--- Expected
++++ Actual
+@@ @@
+-'foo'
++'bar'
+
+FAILURES!
+Tests: 3, Assertions: 3, Failures: 1.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/433/Issue433Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/433/Issue433Test.php
new file mode 100644
index 00000000..e0a91b35
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/433/Issue433Test.php
@@ -0,0 +1,21 @@
+<?php
+class Issue433Test extends PHPUnit_Framework_TestCase
+{
+    public function testOutputWithExpectationBefore()
+    {
+        $this->expectOutputString('test');
+        print 'test';
+    }
+
+    public function testOutputWithExpectationAfter()
+    {
+        print 'test';
+        $this->expectOutputString('test');
+    }
+
+    public function testNotMatchingOutput()
+    {
+        print 'bar';
+        $this->expectOutputString('foo');
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/445.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/445.phpt
new file mode 100644
index 00000000..37e2a861
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/445.phpt
@@ -0,0 +1,32 @@
+--TEST--
+GH-455: expectOutputString not working in strict mode
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--strict';
+$_SERVER['argv'][3] = 'Issue445Test';
+$_SERVER['argv'][4] = dirname(__FILE__).'/445/Issue445Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..F
+
+Time: %s, Memory: %sMb
+
+There was 1 failure:
+
+1) Issue445Test::testNotMatchingOutput
+Failed asserting that two strings are equal.
+--- Expected
++++ Actual
+@@ @@
+-'foo'
++'bar'
+
+FAILURES!
+Tests: 3, Assertions: 3, Failures: 1.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/445/Issue445Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/445/Issue445Test.php
new file mode 100644
index 00000000..c3090259
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/445/Issue445Test.php
@@ -0,0 +1,21 @@
+<?php
+class Issue445Test extends PHPUnit_Framework_TestCase
+{
+    public function testOutputWithExpectationBefore()
+    {
+        $this->expectOutputString('test');
+        print 'test';
+    }
+
+    public function testOutputWithExpectationAfter()
+    {
+        print 'test';
+        $this->expectOutputString('test');
+    }
+
+    public function testNotMatchingOutput()
+    {
+        print 'bar';
+        $this->expectOutputString('foo');
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/498.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/498.phpt
new file mode 100644
index 00000000..e2ef876d
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/498.phpt
@@ -0,0 +1,29 @@
+--TEST--
+GH-498: The test methods won't be run if a dataProvider throws Exception and --group is added in command line
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--group';
+$_SERVER['argv'][3] = 'trueOnly';
+$_SERVER['argv'][4] = 'Issue498Test';
+$_SERVER['argv'][5] = dirname(__FILE__).'/498/Issue498Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+F
+
+Time: %s, Memory: %sMb
+
+There was 1 failure:
+
+1) Warning
+The data provider specified for Issue498Test::shouldBeFalse is invalid.
+Can't create the data
+
+FAILURES!
+Tests: 1, Assertions: 0, Failures: 1.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/498/Issue498Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/498/Issue498Test.php
new file mode 100644
index 00000000..a42c6295
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/498/Issue498Test.php
@@ -0,0 +1,46 @@
+<?php
+
+class Issue498Test extends PHPUnit_Framework_TestCase
+{
+
+    /**
+     * @test
+     * @dataProvider shouldBeTrueDataProvider
+     * @group falseOnly
+     */
+    public function shouldBeTrue($testData)
+    {
+        $this->assertTrue(true);
+    }
+
+
+    /**
+     * @test
+     * @dataProvider shouldBeFalseDataProvider
+     * @group trueOnly
+     */
+    public function shouldBeFalse($testData)
+    {
+        $this->assertFalse(false);
+    }
+
+    public function shouldBeTrueDataProvider()
+    {
+
+        //throw new Exception("Can't create the data");
+        return array(
+            array(true),
+            array(false)
+        );
+    }
+
+    public function shouldBeFalseDataProvider()
+    {
+
+        throw new Exception("Can't create the data");
+        return array(
+            array(true),
+            array(false)
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/503.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/503.phpt
new file mode 100644
index 00000000..6e4c46b6
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/503.phpt
@@ -0,0 +1,33 @@
+--TEST--
+GH-503: assertEquals() Line Ending Differences Are Obscure
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue503Test';
+$_SERVER['argv'][3] = dirname(__FILE__).'/503/Issue503Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+F
+
+Time: %s, Memory: %sMb
+
+There was 1 failure:
+
+1) Issue503Test::testCompareDifferentLineEndings
+Failed asserting that two strings are identical.
+--- Expected
++++ Actual
+@@ @@
+ #Warning: Strings contain different line endings!
+ foo
+
+%s:%i
+
+FAILURES!
+Tests: 1, Assertions: 1, Failures: 1.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/503/Issue503Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/503/Issue503Test.php
new file mode 100644
index 00000000..75ca8d45
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/503/Issue503Test.php
@@ -0,0 +1,11 @@
+<?php
+class Issue503Test extends PHPUnit_Framework_TestCase
+{
+    public function testCompareDifferentLineEndings()
+    {
+        $this->assertSame(
+            "foo\n",
+            "foo\r\n"
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/581.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/581.phpt
new file mode 100644
index 00000000..1ba868ad
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/581.phpt
@@ -0,0 +1,42 @@
+--TEST--
+GH-581: PHPUnit_Util_Type::export adds extra newlines in Windows
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue581Test';
+$_SERVER['argv'][3] = dirname(__FILE__).'/581/Issue581Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+F
+
+Time: %s, Memory: %sMb
+
+There was 1 failure:
+
+1) Issue581Test::testExportingObjectsDoesNotBreakWindowsLineFeeds
+Failed asserting that two objects are equal.
+--- Expected
++++ Actual
+@@ @@
+ stdClass Object (
+     0 => 1
+     1 => 2
+     2 => 'Test\n'
+     3 => 4
+-    4 => 5
++    4 => 1
+     5 => 6
+     6 => 7
+     7 => 8
+ )
+
+%s:%i
+
+FAILURES!
+Tests: 1, Assertions: 1, Failures: 1.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/581/Issue581Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/581/Issue581Test.php
new file mode 100644
index 00000000..201780cd
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/581/Issue581Test.php
@@ -0,0 +1,10 @@
+<?php
+class Issue581Test extends PHPUnit_Framework_TestCase
+{
+    public function testExportingObjectsDoesNotBreakWindowsLineFeeds() {
+        $this->assertEquals(
+            (object)array(1,2,"Test\r\n",4,5,6,7,8),
+            (object)array(1,2,"Test\r\n",4,1,6,7,8)
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/74.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/74.phpt
new file mode 100644
index 00000000..7005b41f
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/74.phpt
@@ -0,0 +1,28 @@
+--TEST--
+GH-74: catchable fatal error in 3.5
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = 'Issue74Test';
+$_SERVER['argv'][4] = dirname(__FILE__).'/74/Issue74Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+E
+
+Time: %s, Memory: %sMb
+
+There was 1 error:
+
+1) Issue74Test::testCreateAndThrowNewExceptionInProcessIsolation
+NewException: Testing GH-74
+
+%sIssue74Test.php:7
+
+FAILURES!
+Tests: 1, Assertions: 0, Errors: 1.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/74/Issue74Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/74/Issue74Test.php
new file mode 100644
index 00000000..72f35928
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/74/Issue74Test.php
@@ -0,0 +1,9 @@
+<?php
+class Issue74Test extends PHPUnit_Framework_TestCase
+{
+    public function testCreateAndThrowNewExceptionInProcessIsolation()
+    {
+        require_once __DIR__ . '/NewException.php';
+        throw new NewException('Testing GH-74');
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/74/NewException.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/74/NewException.php
new file mode 100644
index 00000000..abe2f711
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/74/NewException.php
@@ -0,0 +1,4 @@
+<?php
+class NewException extends Exception
+{
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/765.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/765.phpt
new file mode 100644
index 00000000..eadcd116
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/765.phpt
@@ -0,0 +1,26 @@
+--TEST--
+GH-765: Fatal error triggered in PHPUnit when exception is thrown in data provider of a test with a dependency
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue765Test';
+$_SERVER['argv'][3] = dirname(__FILE__).'/765/Issue765Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.F
+
+Time: %s, Memory: %sMb
+
+There was 1 failure:
+
+1) Warning
+The data provider specified for Issue765Test::testDependent is invalid.
+
+FAILURES!
+Tests: 2, Assertions: 1, Failures: 1.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/765/Issue765Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/765/Issue765Test.php
new file mode 100644
index 00000000..a47474b2
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/765/Issue765Test.php
@@ -0,0 +1,22 @@
+<?php
+class Issue765Test extends PHPUnit_Framework_TestCase
+{
+    public function testDependee()
+    {
+        $this->assertTrue(true);
+    }
+
+    /**
+     * @depends testDependee
+     * @dataProvider dependentProvider
+     */
+    public function testDependent($a)
+    {
+        $this->assertTrue(true);
+    }
+
+    public function dependentProvider()
+    {
+        throw new Exception;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/863.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/863.phpt
new file mode 100644
index 00000000..5a622053
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/863.phpt
@@ -0,0 +1,24 @@
+--TEST--
+GH-863: Number of tests to run calculated incorrectly when --repeat is used
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--repeat';
+$_SERVER['argv'][3] = '50';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(dirname(dirname(__FILE__))) . '/_files/BankAccountTest.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...............................................................  63 / 150 ( 42%)
+............................................................... 126 / 150 ( 84%)
+........................
+
+Time: %s, Memory: %sMb
+
+OK (150 tests, 150 assertions)
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/873.phpt b/vendor/phpunit/phpunit/tests/Regression/GitHub/873.phpt
new file mode 100644
index 00000000..ca33c7fc
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/873.phpt
@@ -0,0 +1,16 @@
+--TEST--
+GH-873: PHPUnit suppresses exceptions thrown outside of test case function
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue873Test';
+$_SERVER['argv'][3] = dirname(__FILE__) . '/873/Issue873Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+
+Fatal error: Uncaught exception 'Exception' with message 'PHPUnit suppresses exceptions thrown outside of test case function' in %s:%i
+Stack trace:
+%a
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/873/Issue873Test.php b/vendor/phpunit/phpunit/tests/Regression/GitHub/873/Issue873Test.php
new file mode 100644
index 00000000..70ef27d1
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Regression/GitHub/873/Issue873Test.php
@@ -0,0 +1,9 @@
+<?php
+
+    if (extension_loaded('xdebug')) {
+        xdebug_disable();
+    }
+
+    throw new Exception(
+      'PHPUnit suppresses exceptions thrown outside of test case function'
+    );
\ No newline at end of file
diff --git a/vendor/phpunit/phpunit/tests/Runner/BaseTestRunnerTest.php b/vendor/phpunit/phpunit/tests/Runner/BaseTestRunnerTest.php
new file mode 100644
index 00000000..77e38545
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Runner/BaseTestRunnerTest.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ * @covers     PHPUnit_Runner_BaseTestRunner
+ */
+class Runner_BaseTestRunnerTest extends PHPUnit_Framework_TestCase
+{
+    public function testInvokeNonStaticSuite()
+    {
+        $runner = new MockRunner;
+        $runner->getTest('NonStatic');
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/TextUI/abstract-test-class.phpt b/vendor/phpunit/phpunit/tests/TextUI/abstract-test-class.phpt
new file mode 100644
index 00000000..42ff953a
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/abstract-test-class.phpt
@@ -0,0 +1,25 @@
+--TEST--
+phpunit AbstractTest ../_files/AbstractTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'AbstractTest';
+$_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/AbstractTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+F
+
+Time: %s, Memory: %sMb
+
+There was 1 failure:
+
+1) Warning
+Cannot instantiate class "AbstractTest".
+
+FAILURES!
+Tests: 1, Assertions: 0, Failures: 1.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/concrete-test-class.phpt b/vendor/phpunit/phpunit/tests/TextUI/concrete-test-class.phpt
new file mode 100644
index 00000000..f27530bb
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/concrete-test-class.phpt
@@ -0,0 +1,19 @@
+--TEST--
+phpunit ConcreteTest ../_files/ConcreteTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'ConcreteTest';
+$_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/ConcreteTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 0 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/custom-printer-debug.phpt b/vendor/phpunit/phpunit/tests/TextUI/custom-printer-debug.phpt
new file mode 100644
index 00000000..fcbd3a47
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/custom-printer-debug.phpt
@@ -0,0 +1,29 @@
+--TEST--
+phpunit -c ../_files/configuration.custom-printer.xml --debug BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '-c';
+$_SERVER['argv'][2] = dirname(__FILE__).'/../_files/configuration.custom-printer.xml';
+$_SERVER['argv'][3] = '--debug';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+Configuration read from %sconfiguration.custom-printer.xml
+
+
+Starting test 'BankAccountTest::testBalanceIsInitiallyZero'.
+.
+Starting test 'BankAccountTest::testBalanceCannotBecomeNegative'.
+.
+Starting test 'BankAccountTest::testBalanceCannotBecomeNegative2'.
+.
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/custom-printer-verbose.phpt b/vendor/phpunit/phpunit/tests/TextUI/custom-printer-verbose.phpt
new file mode 100644
index 00000000..fc5f9f48
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/custom-printer-verbose.phpt
@@ -0,0 +1,31 @@
+--TEST--
+phpunit -c ../_files/configuration.custom-printer.xml --verbose IncompleteTest ../_files/IncompleteTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '-c';
+$_SERVER['argv'][2] = dirname(__FILE__).'/../_files/configuration.custom-printer.xml';
+$_SERVER['argv'][3] = '--verbose';
+$_SERVER['argv'][4] = 'IncompleteTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/IncompleteTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+Configuration read from %sconfiguration.custom-printer.xml
+
+I
+
+Time: %s, Memory: %sMb
+
+There was 1 incomplete test:
+
+1) IncompleteTest::testIncomplete
+Test incomplete
+
+%s
+
+OK, but incomplete, skipped, or risky tests!
+Tests: 1, Assertions: 0, Incomplete: 1.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml-isolation.phpt
new file mode 100644
index 00000000..5154f422
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml-isolation.phpt
@@ -0,0 +1,47 @@
+--TEST--
+phpunit --process-isolation --log-junit php://stdout DataProviderTest ../_files/DataProviderTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--log-junit';
+$_SERVER['argv'][4] = 'php://stdout';
+$_SERVER['argv'][5] = 'DataProviderTest';
+$_SERVER['argv'][6] = dirname(dirname(__FILE__)) . '/_files/DataProviderTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..F.<?xml version="1.0" encoding="UTF-8"?>
+<testsuites>
+  <testsuite name="DataProviderTest" file="%sDataProviderTest.php" tests="4" assertions="4" failures="1" errors="0" time="%f">
+    <testsuite name="DataProviderTest::testAdd" tests="4" assertions="4" failures="1" errors="0" time="%f">
+      <testcase name="testAdd with data set #0" assertions="1" time="%f"/>
+      <testcase name="testAdd with data set #1" assertions="1" time="%f"/>
+      <testcase name="testAdd with data set #2" assertions="1" time="%f">
+        <failure type="PHPUnit_Framework_ExpectationFailedException">DataProviderTest::testAdd with data set #2 (1, 1, 3)
+Failed asserting that 2 matches expected 3.
+
+%s:%i
+</failure>
+      </testcase>
+      <testcase name="testAdd with data set #3" assertions="1" time="%f"/>
+    </testsuite>
+  </testsuite>
+</testsuites>
+
+
+Time: %s, Memory: %sMb
+
+There was 1 failure:
+
+1) DataProviderTest::testAdd with data set #2 (1, 1, 3)
+Failed asserting that 2 matches expected 3.
+
+%s:%i
+
+FAILURES!
+Tests: 4, Assertions: 4, Failures: 1.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml.phpt b/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml.phpt
new file mode 100644
index 00000000..9854e2f1
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml.phpt
@@ -0,0 +1,46 @@
+--TEST--
+phpunit --log-junit php://stdout DataProviderTest ../_files/DataProviderTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--log-junit';
+$_SERVER['argv'][3] = 'php://stdout';
+$_SERVER['argv'][4] = 'DataProviderTest';
+$_SERVER['argv'][5] = dirname(dirname(__FILE__)) . '/_files/DataProviderTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..F.<?xml version="1.0" encoding="UTF-8"?>
+<testsuites>
+  <testsuite name="DataProviderTest" file="%sDataProviderTest.php" tests="4" assertions="4" failures="1" errors="0" time="%f">
+    <testsuite name="DataProviderTest::testAdd" tests="4" assertions="4" failures="1" errors="0" time="%f">
+      <testcase name="testAdd with data set #0" assertions="1" time="%f"/>
+      <testcase name="testAdd with data set #1" assertions="1" time="%f"/>
+      <testcase name="testAdd with data set #2" assertions="1" time="%f">
+        <failure type="PHPUnit_Framework_ExpectationFailedException">DataProviderTest::testAdd with data set #2 (1, 1, 3)
+Failed asserting that 2 matches expected 3.
+
+%s:%i
+</failure>
+      </testcase>
+      <testcase name="testAdd with data set #3" assertions="1" time="%f"/>
+    </testsuite>
+  </testsuite>
+</testsuites>
+
+
+Time: %s, Memory: %sMb
+
+There was 1 failure:
+
+1) DataProviderTest::testAdd with data set #2 (1, 1, 3)
+Failed asserting that 2 matches expected 3.
+
+%s:%i
+
+FAILURES!
+Tests: 4, Assertions: 4, Failures: 1.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-testdox.phpt b/vendor/phpunit/phpunit/tests/TextUI/dataprovider-testdox.phpt
new file mode 100644
index 00000000..b3544c2f
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/dataprovider-testdox.phpt
@@ -0,0 +1,17 @@
+--TEST--
+phpunit --testdox DataProviderTest ../_files/DataProviderTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--testdox';
+$_SERVER['argv'][3] = 'DataProviderTest';
+$_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/DataProviderTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+DataProvider
+ [ ] Add
diff --git a/vendor/phpunit/phpunit/tests/TextUI/debug.phpt b/vendor/phpunit/phpunit/tests/TextUI/debug.phpt
new file mode 100644
index 00000000..7be7b39f
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/debug.phpt
@@ -0,0 +1,26 @@
+--TEST--
+phpunit --debug BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--debug';
+$_SERVER['argv'][3] = 'BankAccountTest';
+$_SERVER['argv'][4] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+
+Starting test 'BankAccountTest::testBalanceIsInitiallyZero'.
+.
+Starting test 'BankAccountTest::testBalanceCannotBecomeNegative'.
+.
+Starting test 'BankAccountTest::testBalanceCannotBecomeNegative2'.
+.
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/default-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/default-isolation.phpt
new file mode 100644
index 00000000..210cdfb5
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/default-isolation.phpt
@@ -0,0 +1,20 @@
+--TEST--
+phpunit --process-isolation BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = 'BankAccountTest';
+$_SERVER['argv'][4] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/default.phpt b/vendor/phpunit/phpunit/tests/TextUI/default.phpt
new file mode 100644
index 00000000..73da9152
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/default.phpt
@@ -0,0 +1,19 @@
+--TEST--
+phpunit BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'BankAccountTest';
+$_SERVER['argv'][3] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dependencies-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/dependencies-isolation.phpt
new file mode 100644
index 00000000..08817b86
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/dependencies-isolation.phpt
@@ -0,0 +1,38 @@
+--TEST--
+phpunit --process-isolation --verbose DependencyTestSuite ../_files/DependencyTestSuite.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--verbose';
+$_SERVER['argv'][4] = 'DependencyTestSuite';
+$_SERVER['argv'][5] = dirname(dirname(__FILE__)) . '/_files/DependencyTestSuite.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...FSS
+
+Time: %s, Memory: %sMb
+
+There was 1 failure:
+
+1) DependencyFailureTest::testOne
+
+%s:%i
+
+--
+
+There were 2 skipped tests:
+
+1) DependencyFailureTest::testTwo
+This test depends on "DependencyFailureTest::testOne" to pass.
+
+2) DependencyFailureTest::testThree
+This test depends on "DependencyFailureTest::testTwo" to pass.
+
+FAILURES!
+Tests: 4, Assertions: 0, Failures: 1, Skipped: 2.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dependencies.phpt b/vendor/phpunit/phpunit/tests/TextUI/dependencies.phpt
new file mode 100644
index 00000000..d95baccb
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/dependencies.phpt
@@ -0,0 +1,37 @@
+--TEST--
+phpunit --verbose DependencyTestSuite ../_files/DependencyTestSuite.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--verbose';
+$_SERVER['argv'][3] = 'DependencyTestSuite';
+$_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/DependencyTestSuite.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...FSS
+
+Time: %s, Memory: %sMb
+
+There was 1 failure:
+
+1) DependencyFailureTest::testOne
+
+%s:%i
+
+--
+
+There were 2 skipped tests:
+
+1) DependencyFailureTest::testTwo
+This test depends on "DependencyFailureTest::testOne" to pass.
+
+2) DependencyFailureTest::testThree
+This test depends on "DependencyFailureTest::testTwo" to pass.
+
+FAILURES!
+Tests: 4, Assertions: 0, Failures: 1, Skipped: 2.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dependencies2-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/dependencies2-isolation.phpt
new file mode 100644
index 00000000..45c2d605
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/dependencies2-isolation.phpt
@@ -0,0 +1,20 @@
+--TEST--
+phpunit --process-isolation StackTest ../_files/StackTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = 'StackTest';
+$_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/StackTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 5 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dependencies2.phpt b/vendor/phpunit/phpunit/tests/TextUI/dependencies2.phpt
new file mode 100644
index 00000000..5fe5f399
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/dependencies2.phpt
@@ -0,0 +1,19 @@
+--TEST--
+phpunit StackTest ../_files/StackTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'StackTest';
+$_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/StackTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 5 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dependencies3-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/dependencies3-isolation.phpt
new file mode 100644
index 00000000..7981df0e
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/dependencies3-isolation.phpt
@@ -0,0 +1,20 @@
+--TEST--
+phpunit --process-isolation MultiDependencyTest ../_files/MultiDependencyTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = 'MultiDependencyTest';
+$_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/MultiDependencyTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 2 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dependencies3.phpt b/vendor/phpunit/phpunit/tests/TextUI/dependencies3.phpt
new file mode 100644
index 00000000..4b7ba743
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/dependencies3.phpt
@@ -0,0 +1,19 @@
+--TEST--
+phpunit MultiDependencyTest ../_files/MultiDependencyTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'MultiDependencyTest';
+$_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/MultiDependencyTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 2 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/empty-testcase.phpt b/vendor/phpunit/phpunit/tests/TextUI/empty-testcase.phpt
new file mode 100644
index 00000000..6538c47b
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/empty-testcase.phpt
@@ -0,0 +1,25 @@
+--TEST--
+phpunit EmptyTestCaseTest ../_files/EmptyTestCaseTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'EmptyTestCaseTest';
+$_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/EmptyTestCaseTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+F
+
+Time: %s, Memory: %sMb
+
+There was 1 failure:
+
+1) Warning
+No tests found in class "EmptyTestCaseTest".
+
+FAILURES!
+Tests: 1, Assertions: 0, Failures: 1.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/exception-stack.phpt b/vendor/phpunit/phpunit/tests/TextUI/exception-stack.phpt
new file mode 100644
index 00000000..9d81da41
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/exception-stack.phpt
@@ -0,0 +1,66 @@
+--TEST--
+phpunit ExceptionStackTest ../_files/ExceptionStackTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'ExceptionStackTest';
+$_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/ExceptionStackTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+EE
+
+Time: %s, Memory: %sMb
+
+There were 2 errors:
+
+1) ExceptionStackTest::testPrintingChildException
+ExceptionStackTestException: Child exception
+message
+Failed asserting that two arrays are equal.
+--- Expected
++++ Actual
+@@ @@
+ Array (
+-    0 => 1
++    0 => 2
+ )
+
+
+%s:%i
+%s:%i
+
+Caused by
+message
+Failed asserting that two arrays are equal.
+--- Expected
++++ Actual
+@@ @@
+ Array (
+-    0 => 1
++    0 => 2
+ )
+
+%s:%i
+
+2) ExceptionStackTest::testNestedExceptions
+Exception: One
+
+%s:%i
+
+Caused by
+InvalidArgumentException: Two
+
+%s:%i
+
+Caused by
+Exception: Three
+
+%s:%i
+
+FAILURES!
+Tests: 2, Assertions: 1, Errors: 2.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/exclude-group-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/exclude-group-isolation.phpt
new file mode 100644
index 00000000..01189e16
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/exclude-group-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --exclude-group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--exclude-group';
+$_SERVER['argv'][4] = 'balanceIsInitiallyZero';
+$_SERVER['argv'][5] = 'BankAccountTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 2 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/exclude-group.phpt b/vendor/phpunit/phpunit/tests/TextUI/exclude-group.phpt
new file mode 100644
index 00000000..ad3022e8
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/exclude-group.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --exclude-group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--exclude-group';
+$_SERVER['argv'][3] = 'balanceIsInitiallyZero';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 2 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/failure-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/failure-isolation.phpt
new file mode 100644
index 00000000..686cfd3b
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/failure-isolation.phpt
@@ -0,0 +1,142 @@
+--TEST--
+phpunit --process-isolation FailureTest ../_files/FailureTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = 'FailureTest';
+$_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/FailureTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+FFFFFFFFFFFFF
+
+Time: %s, Memory: %sMb
+
+There were 13 failures:
+
+1) FailureTest::testAssertArrayEqualsArray
+message
+Failed asserting that two arrays are equal.
+--- Expected
++++ Actual
+@@ @@
+ Array (
+-    0 => 1
++    0 => 2
+ )
+
+%s:%i
+
+2) FailureTest::testAssertIntegerEqualsInteger
+message
+Failed asserting that 2 matches expected 1.
+
+%s:%i
+
+3) FailureTest::testAssertObjectEqualsObject
+message
+Failed asserting that two objects are equal.
+--- Expected
++++ Actual
+@@ @@
+ stdClass Object (
+-    'foo' => 'bar'
++    'bar' => 'foo'
+ )
+
+%s:%i
+
+4) FailureTest::testAssertNullEqualsString
+message
+Failed asserting that 'bar' matches expected null.
+
+%s:%i
+
+5) FailureTest::testAssertStringEqualsString
+message
+Failed asserting that two strings are equal.
+--- Expected
++++ Actual
+@@ @@
+-'foo'
++'bar'
+
+%s:%i
+
+6) FailureTest::testAssertTextEqualsText
+message
+Failed asserting that two strings are equal.
+--- Expected
++++ Actual
+@@ @@
+ 'foo
+-bar
++baz
+ '
+
+%s:%i
+
+7) FailureTest::testAssertStringMatchesFormat
+message
+Failed asserting that format description matches text.
+--- Expected
++++ Actual
+@@ @@
+-*%s*
++**
+
+%s:%i
+
+8) FailureTest::testAssertNumericEqualsNumeric
+message
+Failed asserting that 2 matches expected 1.
+
+%s:%i
+
+9) FailureTest::testAssertTextSameText
+message
+Failed asserting that two strings are identical.
+--- Expected
++++ Actual
+@@ @@
+-foo
++bar
+
+%s:%i
+
+10) FailureTest::testAssertObjectSameObject
+message
+Failed asserting that two variables reference the same object.
+
+%s:%i
+
+11) FailureTest::testAssertObjectSameNull
+message
+Failed asserting that null is identical to an object of class "stdClass".
+
+%s:%i
+
+12) FailureTest::testAssertFloatSameFloat
+message
+Failed asserting that 1.5 is identical to 1.0.
+
+%s:%i
+
+13) FailureTest::testAssertStringMatchesFormatFile
+Failed asserting that format description matches text.
+--- Expected
++++ Actual
+@@ @@
+-FOO
+-
++...BAR...
+
+%s:%i
+
+FAILURES!
+Tests: 13, Assertions: 14, Failures: 13.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/failure.phpt b/vendor/phpunit/phpunit/tests/TextUI/failure.phpt
new file mode 100644
index 00000000..453f841d
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/failure.phpt
@@ -0,0 +1,141 @@
+--TEST--
+phpunit FailureTest ../_files/FailureTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'FailureTest';
+$_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/FailureTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+FFFFFFFFFFFFF
+
+Time: %s, Memory: %sMb
+
+There were 13 failures:
+
+1) FailureTest::testAssertArrayEqualsArray
+message
+Failed asserting that two arrays are equal.
+--- Expected
++++ Actual
+@@ @@
+ Array (
+-    0 => 1
++    0 => 2
+ )
+
+%s:%i
+
+2) FailureTest::testAssertIntegerEqualsInteger
+message
+Failed asserting that 2 matches expected 1.
+
+%s:%i
+
+3) FailureTest::testAssertObjectEqualsObject
+message
+Failed asserting that two objects are equal.
+--- Expected
++++ Actual
+@@ @@
+ stdClass Object (
+-    'foo' => 'bar'
++    'bar' => 'foo'
+ )
+
+%s:%i
+
+4) FailureTest::testAssertNullEqualsString
+message
+Failed asserting that 'bar' matches expected null.
+
+%s:%i
+
+5) FailureTest::testAssertStringEqualsString
+message
+Failed asserting that two strings are equal.
+--- Expected
++++ Actual
+@@ @@
+-'foo'
++'bar'
+
+%s:%i
+
+6) FailureTest::testAssertTextEqualsText
+message
+Failed asserting that two strings are equal.
+--- Expected
++++ Actual
+@@ @@
+ 'foo
+-bar
++baz
+ '
+
+%s:%i
+
+7) FailureTest::testAssertStringMatchesFormat
+message
+Failed asserting that format description matches text.
+--- Expected
++++ Actual
+@@ @@
+-*%s*
++**
+
+%s:%i
+
+8) FailureTest::testAssertNumericEqualsNumeric
+message
+Failed asserting that 2 matches expected 1.
+
+%s:%i
+
+9) FailureTest::testAssertTextSameText
+message
+Failed asserting that two strings are identical.
+--- Expected
++++ Actual
+@@ @@
+-foo
++bar
+
+%s:%i
+
+10) FailureTest::testAssertObjectSameObject
+message
+Failed asserting that two variables reference the same object.
+
+%s:%i
+
+11) FailureTest::testAssertObjectSameNull
+message
+Failed asserting that null is identical to an object of class "stdClass".
+
+%s:%i
+
+12) FailureTest::testAssertFloatSameFloat
+message
+Failed asserting that 1.5 is identical to 1.0.
+
+%s:%i
+
+13) FailureTest::testAssertStringMatchesFormatFile
+Failed asserting that format description matches text.
+--- Expected
++++ Actual
+@@ @@
+-FOO
+-
++...BAR...
+
+%s:%i
+
+FAILURES!
+Tests: 13, Assertions: 14, Failures: 13.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/fatal-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/fatal-isolation.phpt
new file mode 100644
index 00000000..0a28dc85
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/fatal-isolation.phpt
@@ -0,0 +1,26 @@
+--TEST--
+phpunit FatalTest ../_files/FatalTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = 'FatalTest';
+$_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/FatalTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+E
+
+Time: %s, Memory: %sMb
+
+There was 1 error:
+
+1) FatalTest::testFatalError
+%s
+
+FAILURES!
+Tests: 1, Assertions: 0, Errors: 1.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/fatal.phpt b/vendor/phpunit/phpunit/tests/TextUI/fatal.phpt
new file mode 100644
index 00000000..c1bb7bf2
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/fatal.phpt
@@ -0,0 +1,16 @@
+--TEST--
+phpunit FatalTest ../_files/FatalTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'FatalTest';
+$_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/FatalTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+
+Fatal error: Call to undefined function non_existing_function() in %s
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-class-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-class-isolation.phpt
new file mode 100644
index 00000000..63af89e8
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-class-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter BankAccountTest BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = 'BankAccountTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-class.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-class.phpt
new file mode 100644
index 00000000..e75e87ae
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-class.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter BankAccountTest BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = 'BankAccountTest';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt
new file mode 100644
index 00000000..b76bfade
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = 'DataProviderFilterTest#1-3';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt
new file mode 100644
index 00000000..f80e9b11
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = 'DataProviderFilterTest#1-3';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number-isolation.phpt
new file mode 100644
index 00000000..364378c3
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter testTrue#3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = 'testTrue#3';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number.phpt
new file mode 100644
index 00000000..8279e81a
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter testTrue#3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = 'testTrue#3';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt
new file mode 100644
index 00000000..3937ada7
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter \#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = '#1-3';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range.phpt
new file mode 100644
index 00000000..8317b458
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter \#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = '#1-3';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt
new file mode 100644
index 00000000..a753566b
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter @false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = '@false.*';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 2 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp.phpt
new file mode 100644
index 00000000..a868011b
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter @false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = '@false.*';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 2 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt
new file mode 100644
index 00000000..ec2a8fa1
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter @false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = '@false test';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string.phpt
new file mode 100644
index 00000000..496ed231
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter @false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = '@false test';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range-isolation.phpt
new file mode 100644
index 00000000..f1467b9e
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter testTrue#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = 'testTrue#1-3';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range.phpt
new file mode 100644
index 00000000..759e1208
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter testTrue#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = 'testTrue#1-3';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt
new file mode 100644
index 00000000..136e0569
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter testFalse@false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = 'testFalse@false.*';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 2 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp.phpt
new file mode 100644
index 00000000..5db30b1d
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter testFalse@false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = 'testFalse@false.*';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 2 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string-isolation.phpt
new file mode 100644
index 00000000..521a58ef
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter testFalse@false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = 'testFalse@false test';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string.phpt
new file mode 100644
index 00000000..bbf955f1
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter testFalse@false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = 'testFalse@false test';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-method-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-method-isolation.phpt
new file mode 100644
index 00000000..643c8dab
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-method-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter testBalanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = 'testBalanceIsInitiallyZero';
+$_SERVER['argv'][5] = 'BankAccountTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-method.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-method.phpt
new file mode 100644
index 00000000..ec3e0a00
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-method.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter testBalanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = 'testBalanceIsInitiallyZero';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-no-results.phpt b/vendor/phpunit/phpunit/tests/TextUI/filter-no-results.phpt
new file mode 100644
index 00000000..b917f5c2
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/filter-no-results.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter testBalanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = 'doesNotExist';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+
+
+Time: %s, Memory: %sMb
+
+No tests executed!
diff --git a/vendor/phpunit/phpunit/tests/TextUI/group-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/group-isolation.phpt
new file mode 100644
index 00000000..fc79220b
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/group-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--group';
+$_SERVER['argv'][4] = 'balanceIsInitiallyZero';
+$_SERVER['argv'][5] = 'BankAccountTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/group.phpt b/vendor/phpunit/phpunit/tests/TextUI/group.phpt
new file mode 100644
index 00000000..56f488f6
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/group.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--group';
+$_SERVER['argv'][3] = 'balanceIsInitiallyZero';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/help.phpt b/vendor/phpunit/phpunit/tests/TextUI/help.phpt
new file mode 100644
index 00000000..e0a0ec80
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/help.phpt
@@ -0,0 +1,83 @@
+--TEST--
+phpunit
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+Usage: phpunit [options] UnitTest [UnitTest.php]
+       phpunit [options] <directory>
+
+Code Coverage Options:
+
+  --coverage-clover <file>  Generate code coverage report in Clover XML format.
+  --coverage-crap4j <file>  Generate code coverage report in Crap4J XML format.
+  --coverage-html <dir>     Generate code coverage report in HTML format.
+  --coverage-php <file>     Export PHP_CodeCoverage object to file.
+  --coverage-text=<file>    Generate code coverage report in text format.
+                            Default: Standard output.
+  --coverage-xml <dir>      Generate code coverage report in PHPUnit XML format.
+
+Logging Options:
+
+  --log-junit <file>        Log test execution in JUnit XML format to file.
+  --log-tap <file>          Log test execution in TAP format to file.
+  --log-json <file>         Log test execution in JSON format.
+  --testdox-html <file>     Write agile documentation in HTML format to file.
+  --testdox-text <file>     Write agile documentation in Text format to file.
+
+Test Selection Options:
+
+  --filter <pattern>        Filter which tests to run.
+  --testsuite <pattern>     Filter which testsuite to run.
+  --group ...               Only runs tests from the specified group(s).
+  --exclude-group ...       Exclude tests from the specified group(s).
+  --list-groups             List available test groups.
+  --test-suffix ...         Only search for test in files with specified
+                            suffix(es). Default: Test.php,.phpt
+
+Test Execution Options:
+
+  --report-useless-tests    Be strict about tests that do not test anything.
+  --strict-coverage         Be strict about unintentionally covered code.
+  --disallow-test-output    Be strict about output during tests.
+  --enforce-time-limit      Enforce time limit based on test size.
+  --strict                  Run tests in strict mode (enables all of the above).
+
+  --process-isolation       Run each test in a separate PHP process.
+  --no-globals-backup       Do not backup and restore $GLOBALS for each test.
+  --static-backup           Backup and restore static attributes for each test.
+
+  --colors                  Use colors in output.
+  --stderr                  Write to STDERR instead of STDOUT.
+  --stop-on-error           Stop execution upon first error.
+  --stop-on-failure         Stop execution upon first error or failure.
+  --stop-on-risky           Stop execution upon first risky test.
+  --stop-on-skipped         Stop execution upon first skipped test.
+  --stop-on-incomplete      Stop execution upon first incomplete test.
+  -v|--verbose              Output more verbose information.
+  --debug                   Display debugging information during test execution.
+
+  --loader <loader>         TestSuiteLoader implementation to use.
+  --repeat <times>          Runs the test(s) repeatedly.
+  --tap                     Report test execution progress in TAP format.
+  --testdox                 Report test execution progress in TestDox format.
+  --printer <printer>       TestSuiteListener implementation to use.
+
+Configuration Options:
+
+  --bootstrap <file>        A "bootstrap" PHP file that is run before the tests.
+  -c|--configuration <file> Read configuration from XML file.
+  --no-configuration        Ignore default configuration file (phpunit.xml).
+  --include-path <path(s)>  Prepend PHP's include_path with given path(s).
+  -d key[=value]            Sets a php.ini value.
+
+Miscellaneous Options:
+
+  -h|--help                 Prints this usage information.
+  --version                 Prints the version and exits.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/help2.phpt b/vendor/phpunit/phpunit/tests/TextUI/help2.phpt
new file mode 100644
index 00000000..0e1297a1
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/help2.phpt
@@ -0,0 +1,84 @@
+--TEST--
+phpunit --help
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--help';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+Usage: phpunit [options] UnitTest [UnitTest.php]
+       phpunit [options] <directory>
+
+Code Coverage Options:
+
+  --coverage-clover <file>  Generate code coverage report in Clover XML format.
+  --coverage-crap4j <file>  Generate code coverage report in Crap4J XML format.
+  --coverage-html <dir>     Generate code coverage report in HTML format.
+  --coverage-php <file>     Export PHP_CodeCoverage object to file.
+  --coverage-text=<file>    Generate code coverage report in text format.
+                            Default: Standard output.
+  --coverage-xml <dir>      Generate code coverage report in PHPUnit XML format.
+
+Logging Options:
+
+  --log-junit <file>        Log test execution in JUnit XML format to file.
+  --log-tap <file>          Log test execution in TAP format to file.
+  --log-json <file>         Log test execution in JSON format.
+  --testdox-html <file>     Write agile documentation in HTML format to file.
+  --testdox-text <file>     Write agile documentation in Text format to file.
+
+Test Selection Options:
+
+  --filter <pattern>        Filter which tests to run.
+  --testsuite <pattern>     Filter which testsuite to run.
+  --group ...               Only runs tests from the specified group(s).
+  --exclude-group ...       Exclude tests from the specified group(s).
+  --list-groups             List available test groups.
+  --test-suffix ...         Only search for test in files with specified
+                            suffix(es). Default: Test.php,.phpt
+
+Test Execution Options:
+
+  --report-useless-tests    Be strict about tests that do not test anything.
+  --strict-coverage         Be strict about unintentionally covered code.
+  --disallow-test-output    Be strict about output during tests.
+  --enforce-time-limit      Enforce time limit based on test size.
+  --strict                  Run tests in strict mode (enables all of the above).
+
+  --process-isolation       Run each test in a separate PHP process.
+  --no-globals-backup       Do not backup and restore $GLOBALS for each test.
+  --static-backup           Backup and restore static attributes for each test.
+
+  --colors                  Use colors in output.
+  --stderr                  Write to STDERR instead of STDOUT.
+  --stop-on-error           Stop execution upon first error.
+  --stop-on-failure         Stop execution upon first error or failure.
+  --stop-on-risky           Stop execution upon first risky test.
+  --stop-on-skipped         Stop execution upon first skipped test.
+  --stop-on-incomplete      Stop execution upon first incomplete test.
+  -v|--verbose              Output more verbose information.
+  --debug                   Display debugging information during test execution.
+
+  --loader <loader>         TestSuiteLoader implementation to use.
+  --repeat <times>          Runs the test(s) repeatedly.
+  --tap                     Report test execution progress in TAP format.
+  --testdox                 Report test execution progress in TestDox format.
+  --printer <printer>       TestSuiteListener implementation to use.
+
+Configuration Options:
+
+  --bootstrap <file>        A "bootstrap" PHP file that is run before the tests.
+  -c|--configuration <file> Read configuration from XML file.
+  --no-configuration        Ignore default configuration file (phpunit.xml).
+  --include-path <path(s)>  Prepend PHP's include_path with given path(s).
+  -d key[=value]            Sets a php.ini value.
+
+Miscellaneous Options:
+
+  -h|--help                 Prints this usage information.
+  --version                 Prints the version and exits.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/ini-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/ini-isolation.phpt
new file mode 100644
index 00000000..824da279
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/ini-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation -d default_mimetype=application/x-test IniTest ../_files/IniTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '-d';
+$_SERVER['argv'][4] = 'default_mimetype=application/x-test';
+$_SERVER['argv'][5] = 'IniTest';
+$_SERVER['argv'][6] = dirname(dirname(__FILE__)) . '/_files/IniTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/list-groups.phpt b/vendor/phpunit/phpunit/tests/TextUI/list-groups.phpt
new file mode 100644
index 00000000..f95d7793
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/list-groups.phpt
@@ -0,0 +1,20 @@
+--TEST--
+phpunit --list-groups BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--list-groups';
+$_SERVER['argv'][3] = 'BankAccountTest';
+$_SERVER['argv'][4] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+Available test group(s):
+ - Sebastian Bergmann <sebastian@phpunit.de>
+ - balanceCannotBecomeNegative
+ - balanceIsInitiallyZero
+ - specification
diff --git a/vendor/phpunit/phpunit/tests/TextUI/log-json-5.3.phpt b/vendor/phpunit/phpunit/tests/TextUI/log-json-5.3.phpt
new file mode 100644
index 00000000..24181aef
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/log-json-5.3.phpt
@@ -0,0 +1,25 @@
+--TEST--
+phpunit --log-json php://stdout BankAccountTest ../_files/BankAccountTest.php
+--SKIPIF--
+<?php
+if (version_compare(PHP_VERSION, '5.4.0') >= 0) print 'skip: PHP < 5.4 required';
+?>
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--log-json';
+$_SERVER['argv'][3] = 'php://stdout';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+{"event":"suiteStart","suite":"BankAccountTest","tests":3}{"event":"testStart","suite":"BankAccountTest","test":"BankAccountTest::testBalanceIsInitiallyZero"}.{"event":"test","suite":"BankAccountTest","test":"BankAccountTest::testBalanceIsInitiallyZero","status":"pass","time":%f,"trace":[],"message":"","output":""}{"event":"testStart","suite":"BankAccountTest","test":"BankAccountTest::testBalanceCannotBecomeNegative"}.{"event":"test","suite":"BankAccountTest","test":"BankAccountTest::testBalanceCannotBecomeNegative","status":"pass","time":%f,"trace":[],"message":"","output":""}{"event":"testStart","suite":"BankAccountTest","test":"BankAccountTest::testBalanceCannotBecomeNegative2"}.{"event":"test","suite":"BankAccountTest","test":"BankAccountTest::testBalanceCannotBecomeNegative2","status":"pass","time":%f,"trace":[],"message":"","output":""}
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/log-json-post-66021.phpt b/vendor/phpunit/phpunit/tests/TextUI/log-json-post-66021.phpt
new file mode 100644
index 00000000..326cc347
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/log-json-post-66021.phpt
@@ -0,0 +1,72 @@
+--TEST--
+phpunit --log-json php://stdout BankAccountTest ../_files/BankAccountTest.php
+--SKIPIF--
+<?php
+if (!((version_compare(PHP_VERSION, '5.4.28', '>=') && version_compare(PHP_VERSION, '5.5', '<')) ||
+    (version_compare(PHP_VERSION, '5.5.12', '>=') && version_compare(PHP_VERSION, '5.6', '<')) ||
+    version_compare(PHP_VERSION, '5.6.0beta2', '>=') || PHP_VERSION == '5.6.0-dev') ||
+    (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.2.0-dev', '<')))
+    print "skip: PHP 5.4.(28+) or PHP 5.5.(12+) or PHP 5.6.0beta2+ or HHVM 3.(2+) required";
+?>
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--log-json';
+$_SERVER['argv'][3] = 'php://stdout';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+{
+    "event": "suiteStart",
+    "suite": "BankAccountTest",
+    "tests": 3
+}{
+    "event": "testStart",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceIsInitiallyZero"
+}.{
+    "event": "test",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceIsInitiallyZero",
+    "status": "pass",
+    "time": %f,
+    "trace": [],
+    "message": "",
+    "output": ""
+}{
+    "event": "testStart",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceCannotBecomeNegative"
+}.{
+    "event": "test",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceCannotBecomeNegative",
+    "status": "pass",
+    "time": %f,
+    "trace": [],
+    "message": "",
+    "output": ""
+}{
+    "event": "testStart",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceCannotBecomeNegative2"
+}.{
+    "event": "test",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceCannotBecomeNegative2",
+    "status": "pass",
+    "time": %f,
+    "trace": [],
+    "message": "",
+    "output": ""
+}
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/log-json-pre-66021.phpt b/vendor/phpunit/phpunit/tests/TextUI/log-json-pre-66021.phpt
new file mode 100644
index 00000000..9fed9883
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/log-json-pre-66021.phpt
@@ -0,0 +1,78 @@
+--TEST--
+phpunit --log-json php://stdout BankAccountTest ../_files/BankAccountTest.php
+--SKIPIF--
+<?php
+if (!((version_compare(PHP_VERSION, '5.4', '>=') && version_compare(PHP_VERSION, '5.4.27', '<=')) ||
+    (version_compare(PHP_VERSION, '5.5', '>=') && version_compare(PHP_VERSION, '5.5.11', '<=')) ||
+    (version_compare(PHP_VERSION, '5.6', '>=') && version_compare(PHP_VERSION, '5.6.0beta1', '<=') && PHP_VERSION != '5.6.0-dev') ||
+    (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.2.0-dev', '<'))))
+    print "skip: PHP 5.4.(0-27) or PHP 5.5.(0-11) or PHP 5.6.(0alpha1-0beta1) or HHVM < 3.2 required";
+?>
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--log-json';
+$_SERVER['argv'][3] = 'php://stdout';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+{
+    "event": "suiteStart",
+    "suite": "BankAccountTest",
+    "tests": 3
+}{
+    "event": "testStart",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceIsInitiallyZero"
+}.{
+    "event": "test",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceIsInitiallyZero",
+    "status": "pass",
+    "time": %f,
+    "trace": [
+
+    ],
+    "message": "",
+    "output": ""
+}{
+    "event": "testStart",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceCannotBecomeNegative"
+}.{
+    "event": "test",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceCannotBecomeNegative",
+    "status": "pass",
+    "time": %f,
+    "trace": [
+
+    ],
+    "message": "",
+    "output": ""
+}{
+    "event": "testStart",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceCannotBecomeNegative2"
+}.{
+    "event": "test",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceCannotBecomeNegative2",
+    "status": "pass",
+    "time": %f,
+    "trace": [
+
+    ],
+    "message": "",
+    "output": ""
+}
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/log-tap.phpt b/vendor/phpunit/phpunit/tests/TextUI/log-tap.phpt
new file mode 100644
index 00000000..986dbfe7
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/log-tap.phpt
@@ -0,0 +1,26 @@
+--TEST--
+phpunit --log-tap php://stdout BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--log-tap';
+$_SERVER['argv'][3] = 'php://stdout';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+TAP version 13
+.ok 1 - BankAccountTest::testBalanceIsInitiallyZero
+.ok 2 - BankAccountTest::testBalanceCannotBecomeNegative
+.ok 3 - BankAccountTest::testBalanceCannotBecomeNegative2
+1..3
+
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/log-xml.phpt b/vendor/phpunit/phpunit/tests/TextUI/log-xml.phpt
new file mode 100644
index 00000000..c1f83fbc
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/log-xml.phpt
@@ -0,0 +1,29 @@
+--TEST--
+phpunit --log-junit php://stdout BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--log-junit';
+$_SERVER['argv'][3] = 'php://stdout';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...<?xml version="1.0" encoding="UTF-8"?>
+<testsuites>
+  <testsuite name="BankAccountTest" file="%sBankAccountTest.php" tests="3" assertions="3" failures="0" errors="0" time="%f">
+    <testcase name="testBalanceIsInitiallyZero" class="BankAccountTest" file="%sBankAccountTest.php" line="69" assertions="1" time="%f"/>
+    <testcase name="testBalanceCannotBecomeNegative" class="BankAccountTest" file="%sBankAccountTest.php" line="79" assertions="1" time="%f"/>
+    <testcase name="testBalanceCannotBecomeNegative2" class="BankAccountTest" file="%sBankAccountTest.php" line="99" assertions="1" time="%f"/>
+  </testsuite>
+</testsuites>
+
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/repeat.phpt b/vendor/phpunit/phpunit/tests/TextUI/repeat.phpt
new file mode 100644
index 00000000..a8dd7e83
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/repeat.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --repeat 3 BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--repeat';
+$_SERVER['argv'][3] = '3';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.........
+
+Time: %s, Memory: %sMb
+
+OK (9 tests, 9 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/strict-incomplete.phpt b/vendor/phpunit/phpunit/tests/TextUI/strict-incomplete.phpt
new file mode 100644
index 00000000..de99cdd4
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/strict-incomplete.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --strict IncompleteTest ../_files/IncompleteTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--strict';
+$_SERVER['argv'][3] = 'IncompleteTest';
+$_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/IncompleteTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+I
+
+Time: %s, Memory: %sMb
+
+OK, but incomplete, skipped, or risky tests!
+Tests: 1, Assertions: 0, Incomplete: 1.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/strict-isolation.phpt b/vendor/phpunit/phpunit/tests/TextUI/strict-isolation.phpt
new file mode 100644
index 00000000..6a6a7cc4
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/strict-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --strict --process-isolation IncompleteTest ../_files/IncompleteTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--strict';
+$_SERVER['argv'][3] = '--process-isolation';
+$_SERVER['argv'][4] = 'NothingTest';
+$_SERVER['argv'][5] = dirname(dirname(__FILE__)) . '/_files/NothingTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+R
+
+Time: %s, Memory: %sMb
+
+OK, but incomplete, skipped, or risky tests!
+Tests: 1, Assertions: 0, Risky: 1.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/strict.phpt b/vendor/phpunit/phpunit/tests/TextUI/strict.phpt
new file mode 100644
index 00000000..d5f2feb5
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/strict.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --strict NothingTest ../_files/NothingTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--strict';
+$_SERVER['argv'][3] = 'NothingTest';
+$_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/NothingTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+R
+
+Time: %s, Memory: %sMb
+
+OK, but incomplete, skipped, or risky tests!
+Tests: 1, Assertions: 0, Risky: 1.
diff --git a/vendor/phpunit/phpunit/tests/TextUI/tap.phpt b/vendor/phpunit/phpunit/tests/TextUI/tap.phpt
new file mode 100644
index 00000000..88d855ff
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/tap.phpt
@@ -0,0 +1,18 @@
+--TEST--
+phpunit --tap BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--tap';
+$_SERVER['argv'][3] = 'BankAccountTest';
+$_SERVER['argv'][4] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+TAP version 13
+ok 1 - BankAccountTest::testBalanceIsInitiallyZero
+ok 2 - BankAccountTest::testBalanceCannotBecomeNegative
+ok 3 - BankAccountTest::testBalanceCannotBecomeNegative2
+1..3
diff --git a/vendor/phpunit/phpunit/tests/TextUI/test-suffix-multiple.phpt b/vendor/phpunit/phpunit/tests/TextUI/test-suffix-multiple.phpt
new file mode 100644
index 00000000..0f81cfd7
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/test-suffix-multiple.phpt
@@ -0,0 +1,20 @@
+--TEST--
+phpunit --test-suffix .test.php,.my.php ../_files/
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--test-suffix';
+$_SERVER['argv'][3] = '.test.php,.my.php';
+$_SERVER['argv'][4] = dirname(__FILE__).'/../_files/';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.....
+
+Time: %s, Memory: %sMb
+
+OK (5 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/test-suffix-single.phpt b/vendor/phpunit/phpunit/tests/TextUI/test-suffix-single.phpt
new file mode 100644
index 00000000..db205a2d
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/test-suffix-single.phpt
@@ -0,0 +1,20 @@
+--TEST--
+phpunit --test-suffix .test.php ../_files/
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--test-suffix';
+$_SERVER['argv'][3] = '.test.php';
+$_SERVER['argv'][4] = dirname(__FILE__).'/../_files/';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/testdox-html.phpt b/vendor/phpunit/phpunit/tests/TextUI/testdox-html.phpt
new file mode 100644
index 00000000..f2b3f932
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/testdox-html.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --testdox-html php://stdout BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--testdox-html';
+$_SERVER['argv'][3] = 'php://stdout';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+<html><body><h2 id="BankAccountTest">BankAccount</h2><ul>...<li>Balance is initially zero</li><li>Balance cannot become negative</li></ul></body></html>
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/testdox-text.phpt b/vendor/phpunit/phpunit/tests/TextUI/testdox-text.phpt
new file mode 100644
index 00000000..06f34a6b
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/testdox-text.phpt
@@ -0,0 +1,25 @@
+--TEST--
+phpunit --testdox-text php://stdout BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--testdox-text';
+$_SERVER['argv'][3] = 'php://stdout';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+BankAccount
+... [x] Balance is initially zero
+ [x] Balance cannot become negative
+
+
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/vendor/phpunit/phpunit/tests/TextUI/testdox.phpt b/vendor/phpunit/phpunit/tests/TextUI/testdox.phpt
new file mode 100644
index 00000000..57e32ff4
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/TextUI/testdox.phpt
@@ -0,0 +1,19 @@
+--TEST--
+phpunit --testdox php://stdout BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--testdox';
+$_SERVER['argv'][3] = 'BankAccountTest';
+$_SERVER['argv'][4] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+BankAccount
+ [x] Balance is initially zero
+ [x] Balance cannot become negative
+
diff --git a/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php b/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php
new file mode 100644
index 00000000..a1d3f1df
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php
@@ -0,0 +1,491 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.3.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.3.0
+ */
+class Util_ConfigurationTest extends PHPUnit_Framework_TestCase
+{
+    protected $configuration;
+
+    protected function setUp()
+    {
+        $this->configuration = PHPUnit_Util_Configuration::getInstance(
+          dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration.xml'
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Configuration::getInstance
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testExceptionIsThrownForNotExistingConfigurationFile()
+    {
+        PHPUnit_Util_Configuration::getInstance('not_existing_file.xml');
+    }
+
+    /**
+     * @covers PHPUnit_Util_Configuration::getFilterConfiguration
+     */
+    public function testFilterConfigurationIsReadCorrectly()
+    {
+        $this->assertEquals(
+          array(
+            'blacklist' =>
+            array(
+              'include' =>
+              array(
+                'directory' =>
+                array(
+                  0 =>
+                  array(
+                    'path' => '/path/to/files',
+                    'prefix' => '',
+                    'suffix' => '.php',
+                    'group' => 'DEFAULT'
+                  ),
+                ),
+                'file' =>
+                array(
+                  0 => '/path/to/file',
+                ),
+              ),
+              'exclude' =>
+              array(
+                'directory' =>
+                array(
+                  0 =>
+                  array(
+                    'path' => '/path/to/files',
+                    'prefix' => '',
+                    'suffix' => '.php',
+                    'group' => 'DEFAULT'
+                  ),
+                ),
+                'file' =>
+                array(
+                  0 => '/path/to/file',
+                ),
+              ),
+            ),
+            'whitelist' =>
+            array(
+              'addUncoveredFilesFromWhitelist' => true,
+              'processUncoveredFilesFromWhitelist' => false,
+              'include' =>
+              array(
+                'directory' =>
+                array(
+                  0 =>
+                  array(
+                    'path' => '/path/to/files',
+                    'prefix' => '',
+                    'suffix' => '.php',
+                    'group' => 'DEFAULT'
+                  ),
+                ),
+                'file' =>
+                array(
+                  0 => '/path/to/file',
+                ),
+              ),
+              'exclude' =>
+              array(
+                'directory' =>
+                array(
+                  0 =>
+                  array(
+                    'path' => '/path/to/files',
+                    'prefix' => '',
+                    'suffix' => '.php',
+                    'group' => 'DEFAULT'
+                  ),
+                ),
+                'file' =>
+                array(
+                  0 => '/path/to/file',
+                ),
+              ),
+            ),
+          ),
+          $this->configuration->getFilterConfiguration()
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Configuration::getGroupConfiguration
+     */
+    public function testGroupConfigurationIsReadCorrectly()
+    {
+        $this->assertEquals(
+          array(
+            'include' =>
+            array(
+              0 => 'name',
+            ),
+            'exclude' =>
+            array(
+              0 => 'name',
+            ),
+          ),
+          $this->configuration->getGroupConfiguration()
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Configuration::getListenerConfiguration
+     */
+    public function testListenerConfigurationIsReadCorrectly()
+    {
+        $dir = __DIR__;
+        $includePath = ini_get('include_path');
+
+        ini_set('include_path', $dir . PATH_SEPARATOR . $includePath);
+
+        $this->assertEquals(
+          array(
+            0 =>
+            array(
+              'class' => 'MyListener',
+              'file' => '/optional/path/to/MyListener.php',
+              'arguments' =>
+              array(
+                0 =>
+                array(
+                  0 => 'Sebastian',
+                ),
+                1 => 22,
+                2 => 'April',
+                3 => 19.78,
+                4 => null,
+                5 => new stdClass,
+                6 => dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'MyTestFile.php',
+                7 => dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'MyRelativePath',
+              ),
+            ),
+            array(
+              'class' => 'IncludePathListener',
+              'file' => __FILE__,
+              'arguments' => array()
+            ),
+            array(
+              'class' => 'CompactArgumentsListener',
+              'file' => '/CompactArgumentsListener.php',
+              'arguments' =>
+              array(
+                0 => 42
+              ),
+            ),
+          ),
+          $this->configuration->getListenerConfiguration()
+        );
+
+        ini_set('include_path', $includePath);
+    }
+
+    /**
+     * @covers PHPUnit_Util_Configuration::getLoggingConfiguration
+     */
+    public function testLoggingConfigurationIsReadCorrectly()
+    {
+        $this->assertEquals(
+          array(
+            'lowUpperBound' => '50',
+            'highLowerBound' => '90',
+            'coverage-html' => '/tmp/report',
+            'coverage-clover' => '/tmp/clover.xml',
+            'json' => '/tmp/logfile.json',
+            'plain' => '/tmp/logfile.txt',
+            'tap' => '/tmp/logfile.tap',
+            'logIncompleteSkipped' => false,
+            'junit' => '/tmp/logfile.xml',
+            'testdox-html' => '/tmp/testdox.html',
+            'testdox-text' => '/tmp/testdox.txt',
+          ),
+          $this->configuration->getLoggingConfiguration()
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Configuration::getPHPConfiguration
+     */
+    public function testPHPConfigurationIsReadCorrectly()
+    {
+        $this->assertEquals(
+          array(
+            'include_path' =>
+            array(
+              dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . '.',
+              '/path/to/lib'
+            ),
+            'ini'=> array('foo' => 'bar'),
+            'const'=> array('FOO' => false, 'BAR' => true),
+            'var'=> array('foo' => false),
+            'env'=> array('foo' => true),
+            'post'=> array('foo' => 'bar'),
+            'get'=> array('foo' => 'bar'),
+            'cookie'=> array('foo' => 'bar'),
+            'server'=> array('foo' => 'bar'),
+            'files'=> array('foo' => 'bar'),
+            'request'=> array('foo' => 'bar'),
+          ),
+          $this->configuration->getPHPConfiguration()
+        );
+    }
+
+    /**
+     * @backupGlobals enabled
+     * @covers PHPUnit_Util_Configuration::handlePHPConfiguration
+     */
+    public function testPHPConfigurationIsHandledCorrectly()
+    {
+        $this->configuration->handlePHPConfiguration();
+
+        $path = dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . '.' . PATH_SEPARATOR . '/path/to/lib';
+        $this->assertStringStartsWith($path, ini_get('include_path'));
+        $this->assertEquals(false, FOO);
+        $this->assertEquals(true, BAR);
+        $this->assertEquals(false, $GLOBALS['foo']);
+        $this->assertEquals(true, $_ENV['foo']);
+        $this->assertEquals(true, getenv('foo'));
+        $this->assertEquals('bar', $_POST['foo']);
+        $this->assertEquals('bar', $_GET['foo']);
+        $this->assertEquals('bar', $_COOKIE['foo']);
+        $this->assertEquals('bar', $_SERVER['foo']);
+        $this->assertEquals('bar', $_FILES['foo']);
+        $this->assertEquals('bar', $_REQUEST['foo']);
+    }
+
+    /**
+     * @backupGlobals enabled
+     * @see https://github.com/sebastianbergmann/phpunit/issues/1181
+     */
+    public function testHandlePHPConfigurationDoesNotOverwrittenExistingEnvArrayVariables()
+    {
+        $_ENV['foo'] = false;
+        $this->configuration->handlePHPConfiguration();
+
+        $this->assertEquals(false, $_ENV['foo']);
+        $this->assertEquals(true, getenv('foo'));
+    }
+
+    /**
+     * @backupGlobals enabled
+     * @see https://github.com/sebastianbergmann/phpunit/issues/1181
+     */
+    public function testHandlePHPConfigurationDoesNotOverriteVariablesFromPutEnv()
+    {
+        putenv('foo=putenv');
+        $this->configuration->handlePHPConfiguration();
+
+        $this->assertEquals(true, $_ENV['foo']);
+        $this->assertEquals('putenv', getenv('foo'));
+    }
+
+    /**
+     * @covers PHPUnit_Util_Configuration::getPHPUnitConfiguration
+     */
+    public function testPHPUnitConfigurationIsReadCorrectly()
+    {
+        $this->assertEquals(
+          array(
+            'backupGlobals' => true,
+            'backupStaticAttributes' => false,
+            'bootstrap' => '/path/to/bootstrap.php',
+            'cacheTokens' => false,
+            'colors' => false,
+            'stderr' => false,
+            'convertErrorsToExceptions' => true,
+            'convertNoticesToExceptions' => true,
+            'convertWarningsToExceptions' => true,
+            'forceCoversAnnotation' => false,
+            'mapTestClassNameToCoveredClassName' => false,
+            'printerClass' => 'PHPUnit_TextUI_ResultPrinter',
+            'stopOnFailure' => false,
+            'reportUselessTests' => false,
+            'strictCoverage' => false,
+            'disallowTestOutput' => false,
+            'enforceTimeLimit' => false,
+            'testSuiteLoaderClass' => 'PHPUnit_Runner_StandardTestSuiteLoader',
+            'verbose' => false,
+            'timeoutForSmallTests' => 1,
+            'timeoutForMediumTests' => 10,
+            'timeoutForLargeTests' => 60
+          ),
+          $this->configuration->getPHPUnitConfiguration()
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Configuration::getSeleniumBrowserConfiguration
+     */
+    public function testSeleniumBrowserConfigurationIsReadCorrectly()
+    {
+        $this->assertEquals(
+          array(
+            0 =>
+            array(
+              'name' => 'Firefox on Linux',
+              'browser' => '*firefox /usr/lib/firefox/firefox-bin',
+              'host' => 'my.linux.box',
+              'port' => 4444,
+              'timeout' => 30000,
+            ),
+          ),
+          $this->configuration->getSeleniumBrowserConfiguration()
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Configuration::getInstance
+     */
+    public function testXincludeInConfiguration()
+    {
+        $configurationWithXinclude = PHPUnit_Util_Configuration::getInstance(
+          dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration_xinclude.xml'
+        );
+
+        $this->assertConfigurationEquals(
+            $this->configuration,
+            $configurationWithXinclude
+        );
+    }
+
+    /**
+     * @ticket 1311
+     * @covers PHPUnit_Util_Configuration::getLoggingConfiguration
+     * @covers PHPUnit_Util_Configuration::getPHPConfiguration
+     * @covers PHPUnit_Util_Configuration::getPHPUnitConfiguration
+     * @covers PHPUnit_Util_Configuration::getTestSuiteConfiguration
+     * @covers PHPUnit_Util_Configuration::getFilterConfiguration
+     * @uses   PHPUnit_Util_Configuration::getInstance
+     */
+    public function testWithEmptyConfigurations()
+    {
+        $emptyConfiguration = PHPUnit_Util_Configuration::getInstance(
+          dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration_empty.xml'
+        );
+
+        $logging = $emptyConfiguration->getLoggingConfiguration();
+        $this->assertEmpty($logging);
+
+        $php = $emptyConfiguration->getPHPConfiguration();
+        $this->assertEmpty($php['include_path']);
+
+        $phpunit = $emptyConfiguration->getPHPUnitConfiguration();
+        $this->assertArrayNotHasKey('bootstrap', $phpunit);
+        $this->assertArrayNotHasKey('testSuiteLoaderFile', $phpunit);
+        $this->assertArrayNotHasKey('printerFile', $phpunit);
+
+        $suite = $emptyConfiguration->getTestSuiteConfiguration();
+        $this->assertEmpty($suite->getGroups());
+
+        $filter = $emptyConfiguration->getFilterConfiguration();
+        $this->assertEmpty($filter['blacklist']['include']['directory']);
+        $this->assertEmpty($filter['blacklist']['include']['file']);
+        $this->assertEmpty($filter['blacklist']['exclude']['directory']);
+        $this->assertEmpty($filter['blacklist']['exclude']['file']);
+        $this->assertEmpty($filter['whitelist']['include']['directory']);
+        $this->assertEmpty($filter['whitelist']['include']['file']);
+        $this->assertEmpty($filter['whitelist']['exclude']['directory']);
+        $this->assertEmpty($filter['whitelist']['exclude']['file']);
+    }
+
+    /**
+     * Asserts that the values in $actualConfiguration equal $expectedConfiguration.
+     *
+     * @param PHPUnit_Util_Configuration $expectedConfiguration
+     * @param PHPUnit_Util_Configuration $actualConfiguration
+     * @return void
+     */
+    protected function assertConfigurationEquals( PHPUnit_Util_Configuration $expectedConfiguration, PHPUnit_Util_Configuration $actualConfiguration )
+    {
+        $this->assertEquals(
+            $expectedConfiguration->getFilterConfiguration(),
+            $actualConfiguration->getFilterConfiguration()
+        );
+
+        $this->assertEquals(
+            $expectedConfiguration->getGroupConfiguration(),
+            $actualConfiguration->getGroupConfiguration()
+        );
+
+        $this->assertEquals(
+            $expectedConfiguration->getListenerConfiguration(),
+            $actualConfiguration->getListenerConfiguration()
+        );
+
+        $this->assertEquals(
+            $expectedConfiguration->getLoggingConfiguration(),
+            $actualConfiguration->getLoggingConfiguration()
+        );
+
+        $this->assertEquals(
+            $expectedConfiguration->getPHPConfiguration(),
+            $actualConfiguration->getPHPConfiguration()
+        );
+
+        $this->assertEquals(
+            $expectedConfiguration->getPHPUnitConfiguration(),
+            $actualConfiguration->getPHPUnitConfiguration()
+        );
+
+        $this->assertEquals(
+            $expectedConfiguration->getSeleniumBrowserConfiguration(),
+            $actualConfiguration->getSeleniumBrowserConfiguration()
+        );
+
+        $this->assertEquals(
+            $expectedConfiguration->getTestSuiteConfiguration(),
+            $actualConfiguration->getTestSuiteConfiguration()
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Util/TestDox/NamePrettifierTest.php b/vendor/phpunit/phpunit/tests/Util/TestDox/NamePrettifierTest.php
new file mode 100644
index 00000000..d20260f9
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Util/TestDox/NamePrettifierTest.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.3.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.1.0
+ */
+class Util_TestDox_NamePrettifierTest extends PHPUnit_Framework_TestCase
+{
+    protected $namePrettifier;
+
+    protected function setUp()
+    {
+        $this->namePrettifier = new PHPUnit_Util_TestDox_NamePrettifier;
+    }
+
+    /**
+     * @covers PHPUnit_Util_TestDox_NamePrettifier::prettifyTestClass
+     */
+    public function testTitleHasSensibleDefaults()
+    {
+        $this->assertEquals('Foo', $this->namePrettifier->prettifyTestClass('FooTest'));
+        $this->assertEquals('Foo', $this->namePrettifier->prettifyTestClass('TestFoo'));
+        $this->assertEquals('Foo', $this->namePrettifier->prettifyTestClass('TestFooTest'));
+        $this->assertEquals('Foo', $this->namePrettifier->prettifyTestClass('Test\FooTest'));
+    }
+
+    /**
+     * @covers PHPUnit_Util_TestDox_NamePrettifier::prettifyTestClass
+     */
+    public function testCaterForUserDefinedSuffix()
+    {
+        $this->namePrettifier->setSuffix('TestCase');
+        $this->namePrettifier->setPrefix(null);
+
+        $this->assertEquals('Foo', $this->namePrettifier->prettifyTestClass('FooTestCase'));
+        $this->assertEquals('TestFoo', $this->namePrettifier->prettifyTestClass('TestFoo'));
+        $this->assertEquals('FooTest', $this->namePrettifier->prettifyTestClass('FooTest'));
+    }
+
+    /**
+     * @covers PHPUnit_Util_TestDox_NamePrettifier::prettifyTestClass
+     */
+    public function testCaterForUserDefinedPrefix()
+    {
+        $this->namePrettifier->setSuffix(null);
+        $this->namePrettifier->setPrefix('XXX');
+
+        $this->assertEquals('Foo', $this->namePrettifier->prettifyTestClass('XXXFoo'));
+        $this->assertEquals('TestXXX', $this->namePrettifier->prettifyTestClass('TestXXX'));
+        $this->assertEquals('XXX', $this->namePrettifier->prettifyTestClass('XXXXXX'));
+    }
+
+    /**
+     * @covers PHPUnit_Util_TestDox_NamePrettifier::prettifyTestMethod
+     */
+    public function testTestNameIsConvertedToASentence()
+    {
+        $this->assertEquals('This is a test', $this->namePrettifier->prettifyTestMethod('testThisIsATest'));
+        $this->assertEquals('This is a test', $this->namePrettifier->prettifyTestMethod('testThisIsATest2'));
+        $this->assertEquals('this is a test', $this->namePrettifier->prettifyTestMethod('this_is_a_test'));
+        $this->assertEquals('Foo for bar is 0', $this->namePrettifier->prettifyTestMethod('testFooForBarIs0'));
+        $this->assertEquals('Foo for baz is 1', $this->namePrettifier->prettifyTestMethod('testFooForBazIs1'));
+    }
+
+    /**
+     * @covers PHPUnit_Util_TestDox_NamePrettifier::prettifyTestMethod
+     * @ticket 224
+     */
+    public function testTestNameIsNotGroupedWhenNotInSequence()
+    {
+        $this->assertEquals('Sets redirect header on 301', $this->namePrettifier->prettifyTestMethod('testSetsRedirectHeaderOn301'));
+        $this->assertEquals('Sets redirect header on 302', $this->namePrettifier->prettifyTestMethod('testSetsRedirectHeaderOn302'));
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Util/TestTest.php b/vendor/phpunit/phpunit/tests/Util/TestTest.php
new file mode 100644
index 00000000..99e55bdc
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Util/TestTest.php
@@ -0,0 +1,538 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.3.6
+ */
+
+if (!defined('TEST_FILES_PATH')) {
+    define(
+      'TEST_FILES_PATH',
+      dirname(__DIR__) . DIRECTORY_SEPARATOR .
+      '_files' . DIRECTORY_SEPARATOR
+    );
+}
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.3.6
+ */
+class Util_TestTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers PHPUnit_Util_Test::getExpectedException
+     * @todo   Split up in separate tests
+     */
+    public function testGetExpectedException()
+    {
+        $this->assertSame(
+          array('class' => 'FooBarBaz', 'code' => null, 'message' => ''),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testOne')
+        );
+
+        $this->assertSame(
+          array('class' => 'Foo_Bar_Baz', 'code' => null, 'message' => ''),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testTwo')
+        );
+
+        $this->assertSame(
+          array('class' => 'Foo\Bar\Baz', 'code' => null, 'message' => ''),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testThree')
+        );
+
+        $this->assertSame(
+          array('class' => 'ほげ', 'code' => null, 'message' => ''),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testFour')
+        );
+
+        $this->assertSame(
+          array('class' => 'Class', 'code' => 1234, 'message' => 'Message'),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testFive')
+        );
+
+        $this->assertSame(
+          array('class' => 'Class', 'code' => 1234, 'message' => 'Message'),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSix')
+        );
+
+        $this->assertSame(
+          array('class' => 'Class', 'code' => 'ExceptionCode', 'message' => 'Message'),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSeven')
+        );
+
+        $this->assertSame(
+          array('class' => 'Class', 'code' => 0, 'message' => 'Message'),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testEight')
+        );
+
+        $this->assertSame(
+          array('class' => 'Class', 'code' => ExceptionTest::ERROR_CODE, 'message' => ExceptionTest::ERROR_MESSAGE),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testNine')
+        );
+
+        $this->assertSame(
+          array('class' => 'Class', 'code' => null, 'message' => ''),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSingleLine')
+        );
+
+        $this->assertSame(
+            array('class' => 'Class', 'code' => My\Space\ExceptionNamespaceTest::ERROR_CODE, 'message' => My\Space\ExceptionNamespaceTest::ERROR_MESSAGE),
+            PHPUnit_Util_Test::getExpectedException('My\Space\ExceptionNamespaceTest', 'testConstants')
+        );
+
+        // Ensure the Class::CONST expression is only evaluated when the constant really exists
+        $this->assertSame(
+            array('class' => 'Class', 'code' => 'ExceptionTest::UNKNOWN_CODE_CONSTANT', 'message' => 'ExceptionTest::UNKNOWN_MESSAGE_CONSTANT'),
+            PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testUnknownConstants')
+        );
+
+        $this->assertSame(
+            array('class' => 'Class', 'code' => 'My\Space\ExceptionNamespaceTest::UNKNOWN_CODE_CONSTANT', 'message' => 'My\Space\ExceptionNamespaceTest::UNKNOWN_MESSAGE_CONSTANT'),
+            PHPUnit_Util_Test::getExpectedException('My\Space\ExceptionNamespaceTest', 'testUnknownConstants')
+        );
+    }
+
+    /**
+     * @covers       PHPUnit_Util_Test::getRequirements
+     * @dataProvider requirementsProvider
+     */
+    public function testGetRequirements($test, $result)
+    {
+        $this->assertEquals(
+          $result,
+          PHPUnit_Util_Test::getRequirements('RequirementsTest', $test)
+        );
+    }
+
+    public function requirementsProvider()
+    {
+        return array(
+            array('testOne',    array()),
+            array('testTwo',    array('PHPUnit' => '1.0')),
+            array('testThree',  array('PHP' => '2.0')),
+            array('testFour',   array('PHPUnit'=>'2.0', 'PHP' => '1.0')),
+            array('testFive',   array('PHP' => '5.4.0RC6')),
+            array('testSix',    array('PHP' => '5.4.0-alpha1')),
+            array('testSeven',  array('PHP' => '5.4.0beta2')),
+            array('testEight',  array('PHP' => '5.4-dev')),
+            array('testNine',   array('functions' => array('testFunc'))),
+            array('testTen',    array('extensions' => array('testExt'))),
+            array('testEleven', array('OS' => '/Linux/i')),
+            array(
+                'testSpace',
+                array(
+                    'extensions' => array('spl'),
+                    'OS' => '/.*/i'
+                )
+            ),
+            array(
+                'testAllPossibleRequirements',
+                array(
+                    'PHP' => '99-dev',
+                    'PHPUnit' => '9-dev',
+                    'OS' => '/DOESNOTEXIST/i',
+                    'functions' => array(
+                        'testFuncOne',
+                        'testFuncTwo',
+                    ),
+                    'extensions' => array(
+                        'testExtOne',
+                        'testExtTwo',
+                    )
+                )
+            )
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getRequirements
+     */
+    public function testGetRequirementsMergesClassAndMethodDocBlocks()
+    {
+        $expectedAnnotations = array(
+            'PHP' => '5.4',
+            'PHPUnit' => '3.7',
+            'OS' => '/WINNT/i',
+            'functions' => array(
+                'testFuncClass',
+                'testFuncMethod',
+            ),
+            'extensions' => array(
+                'testExtClass',
+                'testExtMethod',
+            )
+        );
+
+        $this->assertEquals(
+          $expectedAnnotations,
+          PHPUnit_Util_Test::getRequirements('RequirementsClassDocBlockTest', 'testMethod')
+        );
+    }
+
+    /**
+     * @coversNothing
+     * @todo   This test does not really test functionality of PHPUnit_Util_Test
+     */
+    public function testGetProvidedDataRegEx()
+    {
+        $result = preg_match(PHPUnit_Util_Test::REGEX_DATA_PROVIDER, '@dataProvider method', $matches);
+        $this->assertEquals(1, $result);
+        $this->assertEquals('method', $matches[1]);
+
+        $result = preg_match(PHPUnit_Util_Test::REGEX_DATA_PROVIDER, '@dataProvider class::method', $matches);
+        $this->assertEquals(1, $result);
+        $this->assertEquals('class::method', $matches[1]);
+
+        $result = preg_match(PHPUnit_Util_Test::REGEX_DATA_PROVIDER, '@dataProvider namespace\class::method', $matches);
+        $this->assertEquals(1, $result);
+        $this->assertEquals('namespace\class::method', $matches[1]);
+
+        $result = preg_match(PHPUnit_Util_Test::REGEX_DATA_PROVIDER, '@dataProvider namespace\namespace\class::method', $matches);
+        $this->assertEquals(1, $result);
+        $this->assertEquals('namespace\namespace\class::method', $matches[1]);
+
+        $result = preg_match(PHPUnit_Util_Test::REGEX_DATA_PROVIDER, '@dataProvider メソッド', $matches);
+        $this->assertEquals(1, $result);
+        $this->assertEquals('メソッド', $matches[1]);
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getDependencies
+     * @todo   Not sure what this test tests (name is misleading at least)
+     */
+    public function testParseAnnotation()
+    {
+        $this->assertEquals(
+          array('Foo', 'ほげ'),
+          PHPUnit_Util_Test::getDependencies(get_class($this), 'methodForTestParseAnnotation')
+        );
+    }
+
+    /**
+     * @depends Foo
+     * @depends ほげ
+     * @todo    Remove fixture from test class
+     */
+    public function methodForTestParseAnnotation()
+    {
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getDependencies
+     */
+    public function testParseAnnotationThatIsOnlyOneLine()
+    {
+        $this->assertEquals(
+          array('Bar'),
+          PHPUnit_Util_Test::getDependencies(get_class($this), 'methodForTestParseAnnotationThatIsOnlyOneLine')
+        );
+    }
+
+    /** @depends Bar */
+    public function methodForTestParseAnnotationThatIsOnlyOneLine()
+    {
+        // TODO Remove fixture from test class
+    }
+
+    /**
+     * @covers       PHPUnit_Util_Test::getLinesToBeCovered
+     * @covers       PHPUnit_Util_Test::resolveElementToReflectionObjects
+     * @dataProvider getLinesToBeCoveredProvider
+     */
+    public function testGetLinesToBeCovered($test, $lines)
+    {
+        if (strpos($test, 'Namespace') === 0) {
+            $expected = array(
+              TEST_FILES_PATH . 'NamespaceCoveredClass.php' => $lines
+            );
+        }
+
+        else if ($test === 'CoverageNoneTest') {
+            $expected = array();
+        }
+
+        else if ($test === 'CoverageNothingTest') {
+            $expected = false;
+        }
+
+        else if ($test === 'CoverageFunctionTest') {
+            $expected = array(
+              TEST_FILES_PATH . 'CoveredFunction.php' => $lines
+            );
+        }
+
+        else {
+            $expected = array(TEST_FILES_PATH . 'CoveredClass.php' => $lines);
+        }
+
+        $this->assertEquals(
+          $expected,
+          PHPUnit_Util_Test::getLinesToBeCovered(
+            $test, 'testSomething'
+          )
+        );
+    }
+
+    /**
+     * @covers            PHPUnit_Util_Test::getLinesToBeCovered
+     * @covers            PHPUnit_Util_Test::resolveElementToReflectionObjects
+     * @expectedException PHPUnit_Framework_CodeCoverageException
+     */
+    public function testGetLinesToBeCovered2()
+    {
+        PHPUnit_Util_Test::getLinesToBeCovered(
+          'NotExistingCoveredElementTest', 'testOne'
+        );
+    }
+
+    /**
+     * @covers            PHPUnit_Util_Test::getLinesToBeCovered
+     * @covers            PHPUnit_Util_Test::resolveElementToReflectionObjects
+     * @expectedException PHPUnit_Framework_CodeCoverageException
+     */
+    public function testGetLinesToBeCovered3()
+    {
+        PHPUnit_Util_Test::getLinesToBeCovered(
+          'NotExistingCoveredElementTest', 'testTwo'
+        );
+    }
+
+    /**
+     * @covers            PHPUnit_Util_Test::getLinesToBeCovered
+     * @covers            PHPUnit_Util_Test::resolveElementToReflectionObjects
+     * @expectedException PHPUnit_Framework_CodeCoverageException
+     */
+    public function testGetLinesToBeCovered4()
+    {
+        PHPUnit_Util_Test::getLinesToBeCovered(
+          'NotExistingCoveredElementTest', 'testThree'
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getLinesToBeCovered
+     */
+    public function testGetLinesToBeCoveredSkipsNonExistantMethods()
+    {
+        $this->assertSame(
+          array(),
+          PHPUnit_Util_Test::getLinesToBeCovered(
+            'NotExistingCoveredElementTest',
+            'methodDoesNotExist'
+          )
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getLinesToBeCovered
+     * @expectedException PHPUnit_Framework_CodeCoverageException
+     */
+    public function testTwoCoversDefaultClassAnnoationsAreNotAllowed()
+    {
+        PHPUnit_Util_Test::getLinesToBeCovered(
+          'CoverageTwoDefaultClassAnnotations',
+          'testSomething'
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getLinesToBeCovered
+     */
+    public function testFunctionParenthesesAreAllowed()
+    {
+        $this->assertSame(
+          array(TEST_FILES_PATH . 'CoveredFunction.php' => range(2, 4)),
+          PHPUnit_Util_Test::getLinesToBeCovered(
+            'CoverageFunctionParenthesesTest',
+            'testSomething'
+          )
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getLinesToBeCovered
+     */
+    public function testFunctionParenthesesAreAllowedWithWhitespace()
+    {
+        $this->assertSame(
+          array(TEST_FILES_PATH . 'CoveredFunction.php' => range(2, 4)),
+          PHPUnit_Util_Test::getLinesToBeCovered(
+            'CoverageFunctionParenthesesWhitespaceTest',
+            'testSomething'
+          )
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getLinesToBeCovered
+     */
+    public function testMethodParenthesesAreAllowed()
+    {
+        $this->assertSame(
+          array(TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35)),
+          PHPUnit_Util_Test::getLinesToBeCovered(
+            'CoverageMethodParenthesesTest',
+            'testSomething'
+          )
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getLinesToBeCovered
+     */
+    public function testMethodParenthesesAreAllowedWithWhitespace()
+    {
+        $this->assertSame(
+          array(TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35)),
+          PHPUnit_Util_Test::getLinesToBeCovered(
+            'CoverageMethodParenthesesWhitespaceTest',
+            'testSomething'
+          )
+        );
+    }
+
+    public function getLinesToBeCoveredProvider()
+    {
+        return array(
+          array(
+            'CoverageNoneTest',
+            array()
+          ),
+          array(
+            'CoverageClassExtendedTest',
+            array_merge(range(19, 36), range(2, 17))
+          ),
+          array(
+            'CoverageClassTest',
+            range(19, 36)
+          ),
+          array(
+            'CoverageMethodTest',
+            range(31, 35)
+          ),
+          array(
+            'CoverageMethodOneLineAnnotationTest',
+            range(31, 35)
+          ),
+          array(
+            'CoverageNotPrivateTest',
+            array_merge(range(25, 29), range(31, 35))
+          ),
+          array(
+            'CoverageNotProtectedTest',
+            array_merge(range(21, 23), range(31, 35))
+          ),
+          array(
+            'CoverageNotPublicTest',
+            array_merge(range(21, 23), range(25, 29))
+          ),
+          array(
+            'CoveragePrivateTest',
+            range(21, 23)
+          ),
+          array(
+            'CoverageProtectedTest',
+            range(25, 29)
+          ),
+          array(
+            'CoveragePublicTest',
+            range(31, 35)
+          ),
+          array(
+            'CoverageFunctionTest',
+            range(2, 4)
+          ),
+          array(
+            'NamespaceCoverageClassExtendedTest',
+            array_merge(range(21, 38), range(4, 19))
+          ),
+          array(
+            'NamespaceCoverageClassTest',
+            range(21, 38)
+          ),
+          array(
+            'NamespaceCoverageMethodTest',
+            range(33, 37)
+          ),
+          array(
+            'NamespaceCoverageNotPrivateTest',
+            array_merge(range(27, 31), range(33, 37))
+          ),
+          array(
+            'NamespaceCoverageNotProtectedTest',
+            array_merge(range(23, 25), range(33, 37))
+          ),
+          array(
+            'NamespaceCoverageNotPublicTest',
+            array_merge(range(23, 25), range(27, 31))
+          ),
+          array(
+            'NamespaceCoveragePrivateTest',
+            range(23, 25)
+          ),
+          array(
+            'NamespaceCoverageProtectedTest',
+            range(27, 31)
+          ),
+          array(
+            'NamespaceCoveragePublicTest',
+            range(33, 37)
+          ),
+          array(
+            'NamespaceCoverageCoversClassTest',
+            array_merge(range(23, 25), range(27, 31), range(33, 37), range(6, 8), range(10, 13), range(15, 18))
+          ),
+          array(
+            'NamespaceCoverageCoversClassPublicTest',
+            range(33, 37)
+          ),
+          array(
+            'CoverageNothingTest',
+            false
+          )
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Util/XMLTest.php b/vendor/phpunit/phpunit/tests/Util/XMLTest.php
new file mode 100644
index 00000000..8cf30723
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/Util/XMLTest.php
@@ -0,0 +1,369 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Mike Naberezny <mike@maintainable.com>
+ * @author     Derek DeVries <derek@maintainable.com>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.3.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Mike Naberezny <mike@maintainable.com>
+ * @author     Derek DeVries <derek@maintainable.com>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.3.0
+ * @covers     PHPUnit_Util_XML
+ */
+class Util_XMLTest extends PHPUnit_Framework_TestCase
+{
+    public function testAssertValidKeysValidKeys()
+    {
+        $options   = array('testA' => 1, 'testB' => 2, 'testC' => 3);
+        $valid     = array('testA', 'testB', 'testC');
+        $expected  = array('testA' => 1, 'testB' => 2, 'testC' => 3);
+        $validated = PHPUnit_Util_XML::assertValidKeys($options, $valid);
+
+        $this->assertEquals($expected, $validated);
+    }
+
+    public function testAssertValidKeysValidKeysEmpty()
+    {
+        $options   = array('testA' => 1, 'testB' => 2);
+        $valid     = array('testA', 'testB', 'testC');
+        $expected  = array('testA' => 1, 'testB' => 2, 'testC' => null);
+        $validated = PHPUnit_Util_XML::assertValidKeys($options, $valid);
+
+        $this->assertEquals($expected, $validated);
+    }
+
+    public function testAssertValidKeysDefaultValuesA()
+    {
+        $options   = array('testA' => 1, 'testB' => 2);
+        $valid     = array('testA' => 23, 'testB' => 24, 'testC' => 25);
+        $expected  = array('testA' => 1, 'testB' => 2, 'testC' => 25);
+        $validated = PHPUnit_Util_XML::assertValidKeys($options, $valid);
+
+        $this->assertEquals($expected, $validated);
+    }
+
+    public function testAssertValidKeysDefaultValuesB()
+    {
+        $options   = array();
+        $valid     = array('testA' => 23, 'testB' => 24, 'testC' => 25);
+        $expected  = array('testA' => 23, 'testB' => 24, 'testC' => 25);
+        $validated = PHPUnit_Util_XML::assertValidKeys($options, $valid);
+
+        $this->assertEquals($expected, $validated);
+    }
+
+    public function testAssertValidKeysInvalidKey()
+    {
+        $options = array('testA' => 1, 'testB' => 2, 'testD' => 3);
+        $valid   = array('testA', 'testB', 'testC');
+
+        try {
+            $validated = PHPUnit_Util_XML::assertValidKeys($options, $valid);
+            $this->fail();
+        }
+
+        catch (PHPUnit_Framework_Exception $e) {
+            $this->assertEquals('Unknown key(s): testD', $e->getMessage());
+        }
+    }
+
+    public function testAssertValidKeysInvalidKeys()
+    {
+        $options = array('testA' => 1, 'testD' => 2, 'testE' => 3);
+        $valid   = array('testA', 'testB', 'testC');
+
+        try {
+            $validated = PHPUnit_Util_XML::assertValidKeys($options, $valid);
+            $this->fail();
+        }
+
+        catch (PHPUnit_Framework_Exception $e) {
+            $this->assertEquals('Unknown key(s): testD, testE', $e->getMessage());
+        }
+    }
+
+    public function testConvertAssertSelect()
+    {
+        $selector  = 'div#folder.open a[href="http://www.xerox.com"][title="xerox"].selected.big > span + h1';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('tag'   => 'div',
+                           'id'    => 'folder',
+                           'class' => 'open',
+                           'descendant' => array('tag'        => 'a',
+                                                 'class'      => 'selected big',
+                                                 'attributes' => array('href'  => 'http://www.xerox.com',
+                                                                       'title' => 'xerox'),
+                                                 'child'      => array('tag' => 'span',
+                                                                       'adjacent-sibling' => array('tag' => 'h1'))));
+         $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertSelectElt()
+    {
+        $selector  = 'div';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('tag' => 'div');
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertClass()
+    {
+        $selector  = '.foo';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('class' => 'foo');
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertId()
+    {
+        $selector  = '#foo';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('id' => 'foo');
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertAttribute()
+    {
+        $selector  = '[foo="bar"]';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('attributes' => array('foo' => 'bar'));
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertAttributeSpaces()
+    {
+        $selector  = '[foo="bar baz"] div[value="foo bar"]';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('attributes' => array('foo' => 'bar baz'),
+                           'descendant' => array('tag'        => 'div',
+                                                 'attributes' => array('value' => 'foo bar')));
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertAttributeMultipleSpaces()
+    {
+        $selector = '[foo="bar baz"] div[value="foo bar baz"]';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag      = array('attributes' => array('foo' => 'bar baz'),
+                          'descendant' => array('tag' => 'div',
+                                                'attributes' => array('value' => 'foo bar baz')));
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertSelectEltClass()
+    {
+        $selector  = 'div.foo';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('tag' => 'div', 'class' => 'foo');
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertSelectEltId()
+    {
+        $selector  = 'div#foo';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('tag' => 'div', 'id' => 'foo');
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertSelectEltAttrEqual()
+    {
+        $selector  = 'div[foo="bar"]';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('tag' => 'div', 'attributes' => array('foo' => 'bar'));
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertSelectEltMultiAttrEqual()
+    {
+        $selector  = 'div[foo="bar"][baz="fob"]';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('tag' => 'div', 'attributes' => array('foo' => 'bar', 'baz' => 'fob'));
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertSelectEltAttrHasOne()
+    {
+        $selector  = 'div[foo~="bar"]';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('tag' => 'div', 'attributes' => array('foo' => 'regexp:/.*\bbar\b.*/'));
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertSelectEltAttrContains()
+    {
+        $selector  = 'div[foo*="bar"]';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('tag' => 'div', 'attributes' => array('foo' => 'regexp:/.*bar.*/'));
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertSelectEltChild()
+    {
+        $selector  = 'div > a';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('tag' => 'div', 'child' => array('tag' => 'a'));
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertSelectEltAdjacentSibling()
+    {
+        $selector  = 'div + a';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('tag' => 'div', 'adjacent-sibling' => array('tag' => 'a'));
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertSelectEltDescendant()
+    {
+        $selector  = 'div a';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('tag' => 'div', 'descendant' => array('tag' => 'a'));
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertSelectContent()
+    {
+        $selector  = '#foo';
+        $content   = 'div contents';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector, $content);
+        $tag       = array('id' => 'foo', 'content' => 'div contents');
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertSelectTrue()
+    {
+        $selector  = '#foo';
+        $content   = true;
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector, $content);
+        $tag       = array('id' => 'foo');
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertSelectFalse()
+    {
+        $selector  = '#foo';
+        $content   = false;
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector, $content);
+        $tag       = array('id' => 'foo');
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertNumber()
+    {
+        $selector  = '.foo';
+        $content   = 3;
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector, $content);
+        $tag       = array('class' => 'foo');
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    public function testConvertAssertRange()
+    {
+        $selector  = '#foo';
+        $content   = array('greater_than' => 5, 'less_than' => 10);
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector, $content);
+        $tag       = array('id' => 'foo');
+
+        $this->assertEquals($tag, $converted);
+    }
+
+    /**
+     * @dataProvider charProvider
+     */
+    public function testPrepareString($char)
+    {
+        $e = null;
+
+        $escapedString = PHPUnit_Util_XML::prepareString($char);
+        $xml = "<?xml version='1.0' encoding='UTF-8' ?><tag>$escapedString</tag>";
+        $dom = new DomDocument('1.0', 'UTF-8');
+
+        try {
+            $dom->loadXML($xml);
+        }
+
+        catch (Exception $e) {
+        }
+
+        $this->assertNull($e, sprintf(
+          'PHPUnit_Util_XML::prepareString("\x%02x") should not crash DomDocument',
+          ord($char)
+        ));
+    }
+
+    public function charProvider()
+    {
+        $data = array();
+
+        for ($i = 0; $i < 256; $i++) {
+            $data[] = array(chr($i));
+        }
+
+        return $data;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/AbstractTest.php b/vendor/phpunit/phpunit/tests/_files/AbstractTest.php
new file mode 100644
index 00000000..556e7dbc
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/AbstractTest.php
@@ -0,0 +1,7 @@
+<?php
+abstract class AbstractTest extends PHPUnit_Framework_TestCase
+{
+    public function testOne()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/Author.php b/vendor/phpunit/phpunit/tests/_files/Author.php
new file mode 100644
index 00000000..54c67cde
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/Author.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.6.0
+ */
+
+/**
+ * An author.
+ *
+ * @package    PHPUnit
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.6.0
+ */
+class Author
+{
+    // the order of properties is important for testing the cycle!
+    public $books = array();
+
+    private $name = '';
+
+    public function __construct($name)
+    {
+        $this->name = $name;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/BankAccount.php b/vendor/phpunit/phpunit/tests/_files/BankAccount.php
new file mode 100644
index 00000000..e35831c3
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/BankAccount.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.3.0
+ */
+
+class BankAccountException extends RuntimeException {}
+
+/**
+ * A bank account.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.3.0
+ */
+class BankAccount
+{
+    /**
+     * The bank account's balance.
+     *
+     * @var    float
+     */
+    protected $balance = 0;
+
+    /**
+     * Returns the bank account's balance.
+     *
+     * @return float
+     */
+    public function getBalance()
+    {
+        return $this->balance;
+    }
+
+    /**
+     * Sets the bank account's balance.
+     *
+     * @param  float $balance
+     * @throws BankAccountException
+     */
+    protected function setBalance($balance)
+    {
+        if ($balance >= 0) {
+            $this->balance = $balance;
+        } else {
+            throw new BankAccountException;
+        }
+    }
+
+    /**
+     * Deposits an amount of money to the bank account.
+     *
+     * @param  float $balance
+     * @throws BankAccountException
+     */
+    public function depositMoney($balance)
+    {
+        $this->setBalance($this->getBalance() + $balance);
+
+        return $this->getBalance();
+    }
+
+    /**
+     * Withdraws an amount of money from the bank account.
+     *
+     * @param  float $balance
+     * @throws BankAccountException
+     */
+    public function withdrawMoney($balance)
+    {
+        $this->setBalance($this->getBalance() - $balance);
+
+        return $this->getBalance();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/BankAccountTest.php b/vendor/phpunit/phpunit/tests/_files/BankAccountTest.php
new file mode 100644
index 00000000..bfe88753
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/BankAccountTest.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.3.0
+ */
+
+/**
+ * Tests for the BankAccount class.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.3.0
+ */
+class BankAccountTest extends PHPUnit_Framework_TestCase
+{
+    protected $ba;
+
+    protected function setUp()
+    {
+        $this->ba = new BankAccount;
+    }
+
+    /**
+     * @covers BankAccount::getBalance
+     * @group balanceIsInitiallyZero
+     * @group specification
+     */
+    public function testBalanceIsInitiallyZero()
+    {
+        $this->assertEquals(0, $this->ba->getBalance());
+    }
+
+    /**
+     * @covers BankAccount::withdrawMoney
+     * @group balanceCannotBecomeNegative
+     * @group specification
+     */
+    public function testBalanceCannotBecomeNegative()
+    {
+        try {
+            $this->ba->withdrawMoney(1);
+        }
+
+        catch (BankAccountException $e) {
+            $this->assertEquals(0, $this->ba->getBalance());
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers BankAccount::depositMoney
+     * @group balanceCannotBecomeNegative
+     * @group specification
+     */
+    public function testBalanceCannotBecomeNegative2()
+    {
+        try {
+            $this->ba->depositMoney(-1);
+        }
+
+        catch (BankAccountException $e) {
+            $this->assertEquals(0, $this->ba->getBalance());
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers BankAccount::getBalance
+     * @covers BankAccount::depositMoney
+     * @covers BankAccount::withdrawMoney
+     * @group balanceCannotBecomeNegative
+     */
+    /*
+    public function testDepositingAndWithdrawingMoneyWorks()
+    {
+        $this->assertEquals(0, $this->ba->getBalance());
+        $this->ba->depositMoney(1);
+        $this->assertEquals(1, $this->ba->getBalance());
+        $this->ba->withdrawMoney(1);
+        $this->assertEquals(0, $this->ba->getBalance());
+    }
+    */
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/BankAccountTest.test.php b/vendor/phpunit/phpunit/tests/_files/BankAccountTest.test.php
new file mode 100644
index 00000000..4a9a55a1
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/BankAccountTest.test.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.3.0
+ */
+
+/**
+ * Tests for the BankAccount class.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.3.0
+ */
+class BankAccountWithCustomExtensionTest extends PHPUnit_Framework_TestCase
+{
+    protected $ba;
+
+    protected function setUp()
+    {
+        $this->ba = new BankAccount;
+    }
+
+    /**
+     * @covers BankAccount::getBalance
+     * @group balanceIsInitiallyZero
+     * @group specification
+     */
+    public function testBalanceIsInitiallyZero()
+    {
+        $this->assertEquals(0, $this->ba->getBalance());
+    }
+
+    /**
+     * @covers BankAccount::withdrawMoney
+     * @group balanceCannotBecomeNegative
+     * @group specification
+     */
+    public function testBalanceCannotBecomeNegative()
+    {
+        try {
+            $this->ba->withdrawMoney(1);
+        }
+
+        catch (BankAccountException $e) {
+            $this->assertEquals(0, $this->ba->getBalance());
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers BankAccount::depositMoney
+     * @group balanceCannotBecomeNegative
+     * @group specification
+     */
+    public function testBalanceCannotBecomeNegative2()
+    {
+        try {
+            $this->ba->depositMoney(-1);
+        }
+
+        catch (BankAccountException $e) {
+            $this->assertEquals(0, $this->ba->getBalance());
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers BankAccount::getBalance
+     * @covers BankAccount::depositMoney
+     * @covers BankAccount::withdrawMoney
+     * @group balanceCannotBecomeNegative
+     */
+    /*
+    public function testDepositingAndWithdrawingMoneyWorks()
+    {
+        $this->assertEquals(0, $this->ba->getBalance());
+        $this->ba->depositMoney(1);
+        $this->assertEquals(1, $this->ba->getBalance());
+        $this->ba->withdrawMoney(1);
+        $this->assertEquals(0, $this->ba->getBalance());
+    }
+    */
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/BaseTestListenerSample.php b/vendor/phpunit/phpunit/tests/_files/BaseTestListenerSample.php
new file mode 100644
index 00000000..f90f3075
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/BaseTestListenerSample.php
@@ -0,0 +1,11 @@
+<?php
+
+class BaseTestListenerSample extends PHPUnit_Framework_BaseTestListener
+{
+    public $endCount = 0;
+
+    public function endTest(PHPUnit_Framework_Test $test, $time)
+    {
+        $this->endCount++;
+    }
+}
\ No newline at end of file
diff --git a/vendor/phpunit/phpunit/tests/_files/BeforeAndAfterTest.php b/vendor/phpunit/phpunit/tests/_files/BeforeAndAfterTest.php
new file mode 100644
index 00000000..95a7484f
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/BeforeAndAfterTest.php
@@ -0,0 +1,31 @@
+<?php
+class BeforeAndAfterTest extends PHPUnit_Framework_TestCase
+{
+    public static $beforeWasRun;
+    public static $afterWasRun;
+
+    public static function resetProperties()
+    {
+        self::$beforeWasRun = 0;
+        self::$afterWasRun = 0;
+    }
+
+    /**
+     * @before
+     */
+    public function initialSetup()
+    {
+        self::$beforeWasRun++;
+    }
+
+    /**
+     * @after
+     */
+    public function finalTeardown()
+    {
+        self::$afterWasRun++;
+    }
+
+    public function test1() {}
+    public function test2() {}
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/BeforeClassAndAfterClassTest.php b/vendor/phpunit/phpunit/tests/_files/BeforeClassAndAfterClassTest.php
new file mode 100644
index 00000000..27a8b9c0
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/BeforeClassAndAfterClassTest.php
@@ -0,0 +1,31 @@
+<?php
+class BeforeClassAndAfterClassTest extends PHPUnit_Framework_TestCase
+{
+    public static $beforeClassWasRun = 0;
+    public static $afterClassWasRun = 0;
+
+    public static function resetProperties()
+    {
+        self::$beforeClassWasRun = 0;
+        self::$afterClassWasRun = 0;
+    }
+
+    /**
+     * @beforeClass
+     */
+    public static function initialClassSetup()
+    {
+        self::$beforeClassWasRun++;
+    }
+
+    /**
+     * @afterClass
+     */
+    public static function finalClassTeardown()
+    {
+        self::$afterClassWasRun++;
+    }
+
+    public function test1() {}
+    public function test2() {}
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/Book.php b/vendor/phpunit/phpunit/tests/_files/Book.php
new file mode 100644
index 00000000..521ae8cc
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/Book.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.6.0
+ */
+
+/**
+ * A book.
+ *
+ * @package    PHPUnit
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.6.0
+ */
+class Book
+{
+    // the order of properties is important for testing the cycle!
+    public $author = null;
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/Calculator.php b/vendor/phpunit/phpunit/tests/_files/Calculator.php
new file mode 100644
index 00000000..e269bd6c
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/Calculator.php
@@ -0,0 +1,14 @@
+<?php
+class Calculator
+{
+    /**
+     * @assert (0, 0) == 0
+     * @assert (0, 1) == 1
+     * @assert (1, 0) == 1
+     * @assert (1, 1) == 2
+     */
+    public function add($a, $b)
+    {
+        return $a + $b;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/ChangeCurrentWorkingDirectoryTest.php b/vendor/phpunit/phpunit/tests/_files/ChangeCurrentWorkingDirectoryTest.php
new file mode 100644
index 00000000..1a839a2f
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/ChangeCurrentWorkingDirectoryTest.php
@@ -0,0 +1,10 @@
+<?php
+class ChangeCurrentWorkingDirectoryTest extends PHPUnit_Framework_TestCase
+{
+    public function testSomethingThatChangesTheCwd()
+    {
+        chdir('../');
+        $this->assertTrue(true);
+    }
+
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/ClassWithNonPublicAttributes.php b/vendor/phpunit/phpunit/tests/_files/ClassWithNonPublicAttributes.php
new file mode 100644
index 00000000..bb979e75
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/ClassWithNonPublicAttributes.php
@@ -0,0 +1,29 @@
+<?php
+class ParentClassWithPrivateAttributes
+{
+    private static $privateStaticParentAttribute = 'foo';
+    private $privateParentAttribute = 'bar';
+}
+
+class ParentClassWithProtectedAttributes extends ParentClassWithPrivateAttributes
+{
+    protected static $protectedStaticParentAttribute = 'foo';
+    protected $protectedParentAttribute = 'bar';
+}
+
+class ClassWithNonPublicAttributes extends ParentClassWithProtectedAttributes
+{
+    public static $publicStaticAttribute = 'foo';
+    protected static $protectedStaticAttribute = 'bar';
+    protected static $privateStaticAttribute = 'baz';
+
+    public $publicAttribute = 'foo';
+    public $foo = 1;
+    public $bar = 2;
+    protected $protectedAttribute = 'bar';
+    protected $privateAttribute = 'baz';
+
+    public $publicArray = array('foo');
+    protected $protectedArray = array('bar');
+    protected $privateArray = array('baz');
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/ClassWithToString.php b/vendor/phpunit/phpunit/tests/_files/ClassWithToString.php
new file mode 100644
index 00000000..4481abec
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/ClassWithToString.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.6.0
+ */
+
+/**
+ * A class with a __toString() method.
+ *
+ * @package    PHPUnit
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.6.0
+ */
+class ClassWithToString
+{
+    public function __toString()
+    {
+        return 'string representation';
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/ConcreteTest.my.php b/vendor/phpunit/phpunit/tests/_files/ConcreteTest.my.php
new file mode 100644
index 00000000..fe01ceed
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/ConcreteTest.my.php
@@ -0,0 +1,7 @@
+<?php
+class ConcreteWithMyCustomExtensionTest extends AbstractTest
+{
+    public function testTwo()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/ConcreteTest.php b/vendor/phpunit/phpunit/tests/_files/ConcreteTest.php
new file mode 100644
index 00000000..4f51a180
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/ConcreteTest.php
@@ -0,0 +1,7 @@
+<?php
+class ConcreteTest extends AbstractTest
+{
+    public function testTwo()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageClassExtendedTest.php b/vendor/phpunit/phpunit/tests/_files/CoverageClassExtendedTest.php
new file mode 100644
index 00000000..df12d347
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageClassExtendedTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageClassExtendedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass<extended>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageClassTest.php b/vendor/phpunit/phpunit/tests/_files/CoverageClassTest.php
new file mode 100644
index 00000000..7f569ae6
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageClassTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageClassTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesTest.php b/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesTest.php
new file mode 100644
index 00000000..33b5fe3d
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesTest.php
@@ -0,0 +1,11 @@
+<?php
+class CoverageFunctionParenthesesTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::globalFunction()
+     */
+    public function testSomething()
+    {
+        globalFunction();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php b/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php
new file mode 100644
index 00000000..d7f7848b
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php
@@ -0,0 +1,11 @@
+<?php
+class CoverageFunctionParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::globalFunction ( ) 
+     */
+    public function testSomething()
+    {
+        globalFunction();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageFunctionTest.php b/vendor/phpunit/phpunit/tests/_files/CoverageFunctionTest.php
new file mode 100644
index 00000000..c621fd21
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageFunctionTest.php
@@ -0,0 +1,11 @@
+<?php
+class CoverageFunctionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::globalFunction
+     */
+    public function testSomething()
+    {
+        globalFunction();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageMethodOneLineAnnotationTest.php b/vendor/phpunit/phpunit/tests/_files/CoverageMethodOneLineAnnotationTest.php
new file mode 100644
index 00000000..185cddf2
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageMethodOneLineAnnotationTest.php
@@ -0,0 +1,12 @@
+<?php
+
+class CoverageMethodOneLineAnnotationTest extends PHPUnit_Framework_TestCase
+{
+    /** @covers CoveredClass::publicMethod */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
+
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesTest.php b/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesTest.php
new file mode 100644
index 00000000..42230045
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageMethodParenthesesTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::publicMethod()
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesWhitespaceTest.php b/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesWhitespaceTest.php
new file mode 100644
index 00000000..7f67f4b3
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesWhitespaceTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageMethodParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::publicMethod ( ) 
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageMethodTest.php b/vendor/phpunit/phpunit/tests/_files/CoverageMethodTest.php
new file mode 100644
index 00000000..167b3db4
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageMethodTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageMethodTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::publicMethod
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageNoneTest.php b/vendor/phpunit/phpunit/tests/_files/CoverageNoneTest.php
new file mode 100644
index 00000000..0b414c2e
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageNoneTest.php
@@ -0,0 +1,9 @@
+<?php
+class CoverageNoneTest extends PHPUnit_Framework_TestCase
+{
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageNotPrivateTest.php b/vendor/phpunit/phpunit/tests/_files/CoverageNotPrivateTest.php
new file mode 100644
index 00000000..12b56e80
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageNotPrivateTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageNotPrivateTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<!private>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageNotProtectedTest.php b/vendor/phpunit/phpunit/tests/_files/CoverageNotProtectedTest.php
new file mode 100644
index 00000000..c69d261d
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageNotProtectedTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageNotProtectedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<!protected>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageNotPublicTest.php b/vendor/phpunit/phpunit/tests/_files/CoverageNotPublicTest.php
new file mode 100644
index 00000000..aebfe4bd
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageNotPublicTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageNotPublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<!public>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageNothingTest.php b/vendor/phpunit/phpunit/tests/_files/CoverageNothingTest.php
new file mode 100644
index 00000000..5d5680d9
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageNothingTest.php
@@ -0,0 +1,13 @@
+<?php
+class CoverageNothingTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::publicMethod
+     * @coversNothing
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoveragePrivateTest.php b/vendor/phpunit/phpunit/tests/_files/CoveragePrivateTest.php
new file mode 100644
index 00000000..f09560d3
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoveragePrivateTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoveragePrivateTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<private>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageProtectedTest.php b/vendor/phpunit/phpunit/tests/_files/CoverageProtectedTest.php
new file mode 100644
index 00000000..9b3acbf6
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageProtectedTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageProtectedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<protected>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoveragePublicTest.php b/vendor/phpunit/phpunit/tests/_files/CoveragePublicTest.php
new file mode 100644
index 00000000..480a522b
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoveragePublicTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoveragePublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<public>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoverageTwoDefaultClassAnnotations.php b/vendor/phpunit/phpunit/tests/_files/CoverageTwoDefaultClassAnnotations.php
new file mode 100644
index 00000000..7c743db9
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoverageTwoDefaultClassAnnotations.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @coversDefaultClass \NamespaceOne
+ * @coversDefaultClass \AnotherDefault\Name\Space\Does\Not\Work
+ */
+class CoverageTwoDefaultClassAnnotations
+{
+
+    /**
+     * @covers Foo\CoveredClass::<public>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoveredClass.php b/vendor/phpunit/phpunit/tests/_files/CoveredClass.php
new file mode 100644
index 00000000..f382ce99
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoveredClass.php
@@ -0,0 +1,36 @@
+<?php
+class CoveredParentClass
+{
+    private function privateMethod()
+    {
+    }
+
+    protected function protectedMethod()
+    {
+        $this->privateMethod();
+    }
+
+    public function publicMethod()
+    {
+        $this->protectedMethod();
+    }
+}
+
+class CoveredClass extends CoveredParentClass
+{
+    private function privateMethod()
+    {
+    }
+
+    protected function protectedMethod()
+    {
+        parent::protectedMethod();
+        $this->privateMethod();
+    }
+
+    public function publicMethod()
+    {
+        parent::publicMethod();
+        $this->protectedMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CoveredFunction.php b/vendor/phpunit/phpunit/tests/_files/CoveredFunction.php
new file mode 100644
index 00000000..9989eb02
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CoveredFunction.php
@@ -0,0 +1,4 @@
+<?php
+function globalFunction()
+{
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/CustomPrinter.php b/vendor/phpunit/phpunit/tests/_files/CustomPrinter.php
new file mode 100644
index 00000000..4cb66b76
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/CustomPrinter.php
@@ -0,0 +1,4 @@
+<?php
+class CustomPrinter extends PHPUnit_TextUI_ResultPrinter
+{
+}
\ No newline at end of file
diff --git a/vendor/phpunit/phpunit/tests/_files/DataProviderFilterTest.php b/vendor/phpunit/phpunit/tests/_files/DataProviderFilterTest.php
new file mode 100644
index 00000000..298f0b06
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/DataProviderFilterTest.php
@@ -0,0 +1,39 @@
+<?php
+class DataProviderFilterTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider truthProvider
+     */
+    public function testTrue($truth)
+    {
+        $this->assertTrue($truth);
+    }
+
+    public static function truthProvider()
+    {
+        return array(
+           array(true),
+           array(true),
+           array(true),
+           array(true)
+        );
+    }
+
+    /**
+     * @dataProvider falseProvider
+     */
+    public function testFalse($false)
+    {
+        $this->assertFalse($false);
+    }
+
+    public static function falseProvider()
+    {
+        return array(
+          'false test'=>array(false),
+          'false test 2'=>array(false),
+          'other false test'=>array(false),
+          'other false test2'=>array(false)
+        );
+    }
+}
\ No newline at end of file
diff --git a/vendor/phpunit/phpunit/tests/_files/DataProviderTest.php b/vendor/phpunit/phpunit/tests/_files/DataProviderTest.php
new file mode 100644
index 00000000..d940a059
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/DataProviderTest.php
@@ -0,0 +1,21 @@
+<?php
+class DataProviderTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider providerMethod
+     */
+    public function testAdd($a, $b, $c)
+    {
+        $this->assertEquals($c, $a + $b);
+    }
+
+    public static function providerMethod()
+    {
+        return array(
+          array(0, 0, 0),
+          array(0, 1, 1),
+          array(1, 1, 3),
+          array(1, 0, 1)
+        );
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/DependencyFailureTest.php b/vendor/phpunit/phpunit/tests/_files/DependencyFailureTest.php
new file mode 100644
index 00000000..d83aecd8
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/DependencyFailureTest.php
@@ -0,0 +1,22 @@
+<?php
+class DependencyFailureTest extends PHPUnit_Framework_TestCase
+{
+    public function testOne()
+    {
+        $this->fail();
+    }
+
+    /**
+     * @depends testOne
+     */
+    public function testTwo()
+    {
+    }
+
+    /**
+     * @depends testTwo
+     */
+    public function testThree()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/DependencySuccessTest.php b/vendor/phpunit/phpunit/tests/_files/DependencySuccessTest.php
new file mode 100644
index 00000000..0e4b5dde
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/DependencySuccessTest.php
@@ -0,0 +1,21 @@
+<?php
+class DependencySuccessTest extends PHPUnit_Framework_TestCase
+{
+    public function testOne()
+    {
+    }
+
+    /**
+     * @depends testOne
+     */
+    public function testTwo()
+    {
+    }
+
+    /**
+     * @depends DependencySuccessTest::testTwo
+     */
+    public function testThree()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/DependencyTestSuite.php b/vendor/phpunit/phpunit/tests/_files/DependencyTestSuite.php
new file mode 100644
index 00000000..b5babc7f
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/DependencyTestSuite.php
@@ -0,0 +1,13 @@
+<?php
+class DependencyTestSuite
+{
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('Test Dependencies');
+
+        $suite->addTestSuite('DependencySuccessTest');
+        $suite->addTestSuite('DependencyFailureTest');
+
+        return $suite;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/DoubleTestCase.php b/vendor/phpunit/phpunit/tests/_files/DoubleTestCase.php
new file mode 100644
index 00000000..b1f00a8f
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/DoubleTestCase.php
@@ -0,0 +1,25 @@
+<?php
+class DoubleTestCase implements PHPUnit_Framework_Test
+{
+    protected $testCase;
+
+    public function __construct(PHPUnit_Framework_TestCase $testCase)
+    {
+        $this->testCase = $testCase;
+    }
+
+    public function count()
+    {
+        return 2;
+    }
+
+    public function run(PHPUnit_Framework_TestResult $result = null)
+    {
+        $result->startTest($this);
+
+        $this->testCase->runBare();
+        $this->testCase->runBare();
+
+        $result->endTest($this, 0);
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/DummyException.php b/vendor/phpunit/phpunit/tests/_files/DummyException.php
new file mode 100644
index 00000000..29a69b99
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/DummyException.php
@@ -0,0 +1,5 @@
+<?php
+
+class DummyException extends Exception
+{
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/EmptyTestCaseTest.php b/vendor/phpunit/phpunit/tests/_files/EmptyTestCaseTest.php
new file mode 100644
index 00000000..2a77bb20
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/EmptyTestCaseTest.php
@@ -0,0 +1,4 @@
+<?php
+class EmptyTestCaseTest extends PHPUnit_Framework_TestCase
+{
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/Error.php b/vendor/phpunit/phpunit/tests/_files/Error.php
new file mode 100644
index 00000000..9417ba65
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/Error.php
@@ -0,0 +1,8 @@
+<?php
+class Error extends PHPUnit_Framework_TestCase
+{
+    protected function runTest()
+    {
+        throw new Exception;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/ExceptionInAssertPostConditionsTest.php b/vendor/phpunit/phpunit/tests/_files/ExceptionInAssertPostConditionsTest.php
new file mode 100644
index 00000000..0f53f226
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/ExceptionInAssertPostConditionsTest.php
@@ -0,0 +1,35 @@
+<?php
+class ExceptionInAssertPostConditionsTest extends PHPUnit_Framework_TestCase
+{
+    public $setUp = false;
+    public $assertPreConditions = false;
+    public $assertPostConditions = false;
+    public $tearDown = false;
+    public $testSomething = false;
+
+    protected function setUp()
+    {
+        $this->setUp = true;
+    }
+
+    protected function assertPreConditions()
+    {
+        $this->assertPreConditions = true;
+    }
+
+    public function testSomething()
+    {
+        $this->testSomething = true;
+    }
+
+    protected function assertPostConditions()
+    {
+        $this->assertPostConditions = true;
+        throw new Exception;
+    }
+
+    protected function tearDown()
+    {
+        $this->tearDown = true;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/ExceptionInAssertPreConditionsTest.php b/vendor/phpunit/phpunit/tests/_files/ExceptionInAssertPreConditionsTest.php
new file mode 100644
index 00000000..db08f9cc
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/ExceptionInAssertPreConditionsTest.php
@@ -0,0 +1,35 @@
+<?php
+class ExceptionInAssertPreConditionsTest extends PHPUnit_Framework_TestCase
+{
+    public $setUp = false;
+    public $assertPreConditions = false;
+    public $assertPostConditions = false;
+    public $tearDown = false;
+    public $testSomething = false;
+
+    protected function setUp()
+    {
+        $this->setUp = true;
+    }
+
+    protected function assertPreConditions()
+    {
+        $this->assertPreConditions = true;
+        throw new Exception;
+    }
+
+    public function testSomething()
+    {
+        $this->testSomething = true;
+    }
+
+    protected function assertPostConditions()
+    {
+        $this->assertPostConditions = true;
+    }
+
+    protected function tearDown()
+    {
+        $this->tearDown = true;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/ExceptionInSetUpTest.php b/vendor/phpunit/phpunit/tests/_files/ExceptionInSetUpTest.php
new file mode 100644
index 00000000..9c48030b
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/ExceptionInSetUpTest.php
@@ -0,0 +1,35 @@
+<?php
+class ExceptionInSetUpTest extends PHPUnit_Framework_TestCase
+{
+    public $setUp = false;
+    public $assertPreConditions = false;
+    public $assertPostConditions = false;
+    public $tearDown = false;
+    public $testSomething = false;
+
+    protected function setUp()
+    {
+        $this->setUp = true;
+        throw new Exception;
+    }
+
+    protected function assertPreConditions()
+    {
+        $this->assertPreConditions = true;
+    }
+
+    public function testSomething()
+    {
+        $this->testSomething = true;
+    }
+
+    protected function assertPostConditions()
+    {
+        $this->assertPostConditions = true;
+    }
+
+    protected function tearDown()
+    {
+        $this->tearDown = true;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/ExceptionInTearDownTest.php b/vendor/phpunit/phpunit/tests/_files/ExceptionInTearDownTest.php
new file mode 100644
index 00000000..f5cf7e59
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/ExceptionInTearDownTest.php
@@ -0,0 +1,35 @@
+<?php
+class ExceptionInTearDownTest extends PHPUnit_Framework_TestCase
+{
+    public $setUp = false;
+    public $assertPreConditions = false;
+    public $assertPostConditions = false;
+    public $tearDown = false;
+    public $testSomething = false;
+
+    protected function setUp()
+    {
+        $this->setUp = true;
+    }
+
+    protected function assertPreConditions()
+    {
+        $this->assertPreConditions = true;
+    }
+
+    public function testSomething()
+    {
+        $this->testSomething = true;
+    }
+
+    protected function assertPostConditions()
+    {
+        $this->assertPostConditions = true;
+    }
+
+    protected function tearDown()
+    {
+        $this->tearDown = true;
+        throw new Exception;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/ExceptionInTest.php b/vendor/phpunit/phpunit/tests/_files/ExceptionInTest.php
new file mode 100644
index 00000000..4ca556e5
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/ExceptionInTest.php
@@ -0,0 +1,35 @@
+<?php
+class ExceptionInTest extends PHPUnit_Framework_TestCase
+{
+    public $setUp = false;
+    public $assertPreConditions = false;
+    public $assertPostConditions = false;
+    public $tearDown = false;
+    public $testSomething = false;
+
+    protected function setUp()
+    {
+        $this->setUp = true;
+    }
+
+    protected function assertPreConditions()
+    {
+        $this->assertPreConditions = true;
+    }
+
+    public function testSomething()
+    {
+        $this->testSomething = true;
+        throw new Exception;
+    }
+
+    protected function assertPostConditions()
+    {
+        $this->assertPostConditions = true;
+    }
+
+    protected function tearDown()
+    {
+        $this->tearDown = true;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/ExceptionNamespaceTest.php b/vendor/phpunit/phpunit/tests/_files/ExceptionNamespaceTest.php
new file mode 100644
index 00000000..9644aae6
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/ExceptionNamespaceTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace My\Space;
+
+class ExceptionNamespaceTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Exception message
+     *
+     * @var string
+     */
+    const ERROR_MESSAGE = 'Exception namespace message';
+
+    /**
+     * Exception code
+     *
+     * @var integer
+     */
+    const ERROR_CODE = 200;
+
+    /**
+     * @expectedException Class
+     * @expectedExceptionMessage My\Space\ExceptionNamespaceTest::ERROR_MESSAGE
+     * @expectedExceptionCode My\Space\ExceptionNamespaceTest::ERROR_CODE
+     */
+    public function testConstants()
+    {
+    }
+
+    /**
+     * @expectedException Class
+     * @expectedExceptionCode My\Space\ExceptionNamespaceTest::UNKNOWN_CODE_CONSTANT
+     * @expectedExceptionMessage My\Space\ExceptionNamespaceTest::UNKNOWN_MESSAGE_CONSTANT
+     */
+    public function testUnknownConstants()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/ExceptionStackTest.php b/vendor/phpunit/phpunit/tests/_files/ExceptionStackTest.php
new file mode 100644
index 00000000..fd86c8cf
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/ExceptionStackTest.php
@@ -0,0 +1,23 @@
+<?php
+class ExceptionStackTestException extends Exception { }
+
+class ExceptionStackTest extends PHPUnit_Framework_TestCase
+{
+    public function testPrintingChildException()
+    {
+        try {
+            $this->assertEquals(array(1), array(2), 'message');
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $message = $e->getMessage() . $e->getComparisonFailure()->getDiff();
+            throw new ExceptionStackTestException("Child exception\n$message", 101, $e);
+        }
+    }
+
+    public function testNestedExceptions()
+    {
+        $exceptionThree = new Exception('Three');
+        $exceptionTwo = new InvalidArgumentException('Two', 0, $exceptionThree);
+        $exceptionOne = new Exception('One', 0, $exceptionTwo);
+        throw $exceptionOne;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/ExceptionTest.php b/vendor/phpunit/phpunit/tests/_files/ExceptionTest.php
new file mode 100644
index 00000000..95a7c0af
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/ExceptionTest.php
@@ -0,0 +1,102 @@
+<?php
+class ExceptionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Exception message
+     *
+     * @var string
+     */
+    const ERROR_MESSAGE = 'Exception message';
+
+    /**
+     * Exception code
+     *
+     * @var integer
+     */
+    const ERROR_CODE = 500;
+
+    /**
+     * @expectedException FooBarBaz
+     */
+    public function testOne()
+    {
+    }
+
+    /**
+     * @expectedException Foo_Bar_Baz
+     */
+    public function testTwo()
+    {
+    }
+
+    /**
+     * @expectedException Foo\Bar\Baz
+     */
+    public function testThree()
+    {
+    }
+
+    /**
+     * @expectedException ほげ
+     */
+    public function testFour()
+    {
+    }
+
+    /**
+     * @expectedException Class Message 1234
+     */
+    public function testFive()
+    {
+    }
+
+    /**
+     * @expectedException Class
+     * @expectedExceptionMessage Message
+     * @expectedExceptionCode 1234
+     */
+    public function testSix()
+    {
+    }
+
+    /**
+     * @expectedException Class
+     * @expectedExceptionMessage Message
+     * @expectedExceptionCode ExceptionCode
+     */
+    public function testSeven()
+    {
+    }
+
+    /**
+     * @expectedException Class
+     * @expectedExceptionMessage Message
+     * @expectedExceptionCode 0
+     */
+    public function testEight()
+    {
+    }
+
+    /**
+     * @expectedException Class
+     * @expectedExceptionMessage ExceptionTest::ERROR_MESSAGE
+     * @expectedExceptionCode ExceptionTest::ERROR_CODE
+     */
+    public function testNine()
+    {
+    }
+
+    /** @expectedException Class */
+    public function testSingleLine()
+    {
+    }
+
+    /**
+     * @expectedException Class
+     * @expectedExceptionCode ExceptionTest::UNKNOWN_CODE_CONSTANT
+     * @expectedExceptionMessage ExceptionTest::UNKNOWN_MESSAGE_CONSTANT
+     */
+    public function testUnknownConstants()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/Failure.php b/vendor/phpunit/phpunit/tests/_files/Failure.php
new file mode 100644
index 00000000..586aa542
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/Failure.php
@@ -0,0 +1,8 @@
+<?php
+class Failure extends PHPUnit_Framework_TestCase
+{
+    protected function runTest()
+    {
+        $this->fail();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/FailureTest.php b/vendor/phpunit/phpunit/tests/_files/FailureTest.php
new file mode 100644
index 00000000..2bea3dad
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/FailureTest.php
@@ -0,0 +1,76 @@
+<?php
+class FailureTest extends PHPUnit_Framework_TestCase
+{
+    public function testAssertArrayEqualsArray()
+    {
+        $this->assertEquals(array(1), array(2), 'message');
+    }
+
+    public function testAssertIntegerEqualsInteger()
+    {
+        $this->assertEquals(1, 2, 'message');
+    }
+
+    public function testAssertObjectEqualsObject()
+    {
+        $a = new StdClass;
+        $a->foo = 'bar';
+
+        $b = new StdClass;
+        $b->bar = 'foo';
+
+        $this->assertEquals($a, $b, 'message');
+    }
+
+    public function testAssertNullEqualsString()
+    {
+        $this->assertEquals(null, 'bar', 'message');
+    }
+
+    public function testAssertStringEqualsString()
+    {
+        $this->assertEquals('foo', 'bar', 'message');
+    }
+
+    public function testAssertTextEqualsText()
+    {
+        $this->assertEquals("foo\nbar\n", "foo\nbaz\n", 'message');
+    }
+
+    public function testAssertStringMatchesFormat()
+    {
+        $this->assertStringMatchesFormat('*%s*', '**', 'message');
+    }
+
+    public function testAssertNumericEqualsNumeric()
+    {
+        $this->assertEquals(1, 2, 'message');
+    }
+
+    public function testAssertTextSameText()
+    {
+        $this->assertSame('foo', 'bar', 'message');
+    }
+
+    public function testAssertObjectSameObject()
+    {
+        $this->assertSame(new StdClass, new StdClass, 'message');
+    }
+
+    public function testAssertObjectSameNull()
+    {
+        $this->assertSame(new StdClass, null, 'message');
+    }
+
+    public function testAssertFloatSameFloat()
+    {
+        $this->assertSame(1.0, 1.5, 'message');
+    }
+
+    // Note that due to the implementation of this assertion it counts as 2 asserts
+    public function testAssertStringMatchesFormatFile()
+    {
+        $this->assertStringMatchesFormatFile(__DIR__ . '/expectedFileFormat.txt', '...BAR...');
+    }
+
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/FatalTest.php b/vendor/phpunit/phpunit/tests/_files/FatalTest.php
new file mode 100644
index 00000000..85bdb19f
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/FatalTest.php
@@ -0,0 +1,14 @@
+<?php
+
+class FatalTest extends PHPUnit_Framework_TestCase
+{
+    public function testFatalError()
+    {
+        if(extension_loaded('xdebug')) {
+            xdebug_disable();
+        }
+
+        non_existing_function();
+    }
+
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/IncompleteTest.php b/vendor/phpunit/phpunit/tests/_files/IncompleteTest.php
new file mode 100644
index 00000000..36ca8a05
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/IncompleteTest.php
@@ -0,0 +1,8 @@
+<?php
+class IncompleteTest extends PHPUnit_Framework_TestCase
+{
+    public function testIncomplete()
+    {
+        $this->markTestIncomplete('Test incomplete');
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/Inheritance/InheritanceA.php b/vendor/phpunit/phpunit/tests/_files/Inheritance/InheritanceA.php
new file mode 100644
index 00000000..2dd4c446
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/Inheritance/InheritanceA.php
@@ -0,0 +1,8 @@
+<?php
+
+require_once(__DIR__.'/InheritanceB.php');
+
+class InheritanceA extends InheritanceB
+{
+
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/Inheritance/InheritanceB.php b/vendor/phpunit/phpunit/tests/_files/Inheritance/InheritanceB.php
new file mode 100644
index 00000000..b7d4a501
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/Inheritance/InheritanceB.php
@@ -0,0 +1,9 @@
+<?php
+
+class InheritanceB extends PHPUnit_Framework_TestCase
+{
+    public function testSomething()
+    {
+
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/InheritedTestCase.php b/vendor/phpunit/phpunit/tests/_files/InheritedTestCase.php
new file mode 100644
index 00000000..3df72156
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/InheritedTestCase.php
@@ -0,0 +1,7 @@
+<?php
+class InheritedTestCase extends OneTestCase
+{
+    public function test2()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/IniTest.php b/vendor/phpunit/phpunit/tests/_files/IniTest.php
new file mode 100644
index 00000000..5846abf5
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/IniTest.php
@@ -0,0 +1,8 @@
+<?php
+class IniTest extends PHPUnit_Framework_TestCase
+{
+    public function testIni()
+    {
+        $this->assertEquals('application/x-test', ini_get('default_mimetype'));
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/JsonData/arrayObject.js b/vendor/phpunit/phpunit/tests/_files/JsonData/arrayObject.js
new file mode 100644
index 00000000..8a74fc58
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/JsonData/arrayObject.js
@@ -0,0 +1 @@
+["Mascott", "Tux", "OS", "Linux"]
diff --git a/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject.js b/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject.js
new file mode 100644
index 00000000..27085be2
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject.js
@@ -0,0 +1 @@
+{"Mascott":"Tux"}
\ No newline at end of file
diff --git a/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject2.js b/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject2.js
new file mode 100644
index 00000000..27085be2
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject2.js
@@ -0,0 +1 @@
+{"Mascott":"Tux"}
\ No newline at end of file
diff --git a/vendor/phpunit/phpunit/tests/_files/MockRunner.php b/vendor/phpunit/phpunit/tests/_files/MockRunner.php
new file mode 100644
index 00000000..b3bc0cc4
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/MockRunner.php
@@ -0,0 +1,7 @@
+<?php
+class MockRunner extends PHPUnit_Runner_BaseTestRunner
+{
+    protected function runFailed($message)
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/MultiDependencyTest.php b/vendor/phpunit/phpunit/tests/_files/MultiDependencyTest.php
new file mode 100644
index 00000000..886a8096
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/MultiDependencyTest.php
@@ -0,0 +1,23 @@
+<?php
+class MultiDependencyTest extends PHPUnit_Framework_TestCase
+{
+    public function testOne()
+    {
+        return 'foo';
+    }
+
+    public function testTwo()
+    {
+        return 'bar';
+    }
+
+    /**
+     * @depends testOne
+     * @depends testTwo
+     */
+    public function testThree($a, $b)
+    {
+        $this->assertEquals('foo', $a);
+        $this->assertEquals('bar', $b);
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageClassExtendedTest.php b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageClassExtendedTest.php
new file mode 100644
index 00000000..d0954cba
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageClassExtendedTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageClassExtendedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass<extended>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageClassTest.php b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageClassTest.php
new file mode 100644
index 00000000..63912c08
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageClassTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageClassTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassPublicTest.php b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassPublicTest.php
new file mode 100644
index 00000000..d3d48efb
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassPublicTest.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @coversDefaultClass \Foo\CoveredClass
+ */
+class NamespaceCoverageCoversClassPublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::publicMethod
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
+
diff --git a/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php
new file mode 100644
index 00000000..79d1010d
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @coversDefaultClass \Foo\CoveredClass
+ */
+class NamespaceCoverageCoversClassTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::privateMethod
+     * @covers ::protectedMethod
+     * @covers ::publicMethod
+     * @covers \Foo\CoveredParentClass::privateMethod
+     * @covers \Foo\CoveredParentClass::protectedMethod
+     * @covers \Foo\CoveredParentClass::publicMethod
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
+
diff --git a/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageMethodTest.php b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageMethodTest.php
new file mode 100644
index 00000000..35dfb8b1
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageMethodTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageMethodTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::publicMethod
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotPrivateTest.php b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotPrivateTest.php
new file mode 100644
index 00000000..552c9ec5
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotPrivateTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageNotPrivateTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<!private>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotProtectedTest.php b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotProtectedTest.php
new file mode 100644
index 00000000..33fc8c72
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotProtectedTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageNotProtectedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<!protected>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotPublicTest.php b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotPublicTest.php
new file mode 100644
index 00000000..ccbc5009
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotPublicTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageNotPublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<!public>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NamespaceCoveragePrivateTest.php b/vendor/phpunit/phpunit/tests/_files/NamespaceCoveragePrivateTest.php
new file mode 100644
index 00000000..cce7ba9d
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NamespaceCoveragePrivateTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoveragePrivateTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<private>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageProtectedTest.php b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageProtectedTest.php
new file mode 100644
index 00000000..dbbcc1c3
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageProtectedTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageProtectedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<protected>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NamespaceCoveragePublicTest.php b/vendor/phpunit/phpunit/tests/_files/NamespaceCoveragePublicTest.php
new file mode 100644
index 00000000..bf1bff8c
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NamespaceCoveragePublicTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoveragePublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<public>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NamespaceCoveredClass.php b/vendor/phpunit/phpunit/tests/_files/NamespaceCoveredClass.php
new file mode 100644
index 00000000..5bd0ddfb
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NamespaceCoveredClass.php
@@ -0,0 +1,38 @@
+<?php
+namespace Foo;
+
+class CoveredParentClass
+{
+    private function privateMethod()
+    {
+    }
+
+    protected function protectedMethod()
+    {
+        $this->privateMethod();
+    }
+
+    public function publicMethod()
+    {
+        $this->protectedMethod();
+    }
+}
+
+class CoveredClass extends CoveredParentClass
+{
+    private function privateMethod()
+    {
+    }
+
+    protected function protectedMethod()
+    {
+        parent::protectedMethod();
+        $this->privateMethod();
+    }
+
+    public function publicMethod()
+    {
+        parent::publicMethod();
+        $this->protectedMethod();
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NoArgTestCaseTest.php b/vendor/phpunit/phpunit/tests/_files/NoArgTestCaseTest.php
new file mode 100644
index 00000000..5867ba3c
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NoArgTestCaseTest.php
@@ -0,0 +1,7 @@
+<?php
+class NoArgTestCaseTest extends PHPUnit_Framework_TestCase
+{
+    public function testNothing()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NoTestCaseClass.php b/vendor/phpunit/phpunit/tests/_files/NoTestCaseClass.php
new file mode 100644
index 00000000..d64e4e1c
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NoTestCaseClass.php
@@ -0,0 +1,4 @@
+<?php
+class NoTestCaseClass
+{
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NoTestCases.php b/vendor/phpunit/phpunit/tests/_files/NoTestCases.php
new file mode 100644
index 00000000..ae932330
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NoTestCases.php
@@ -0,0 +1,7 @@
+<?php
+class NoTestCases extends PHPUnit_Framework_TestCase
+{
+    public function noTestCase()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NonStatic.php b/vendor/phpunit/phpunit/tests/_files/NonStatic.php
new file mode 100644
index 00000000..23d7ef7d
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NonStatic.php
@@ -0,0 +1,8 @@
+<?php
+class NonStatic
+{
+    public function suite()
+    {
+        return null;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NotExistingCoveredElementTest.php b/vendor/phpunit/phpunit/tests/_files/NotExistingCoveredElementTest.php
new file mode 100644
index 00000000..be07ef45
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NotExistingCoveredElementTest.php
@@ -0,0 +1,24 @@
+<?php
+class NotExistingCoveredElementTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers NotExistingClass
+     */
+    public function testOne()
+    {
+    }
+
+    /**
+     * @covers NotExistingClass::notExistingMethod
+     */
+    public function testTwo()
+    {
+    }
+
+    /**
+     * @covers NotExistingClass::<public>
+     */
+    public function testThree()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NotPublicTestCase.php b/vendor/phpunit/phpunit/tests/_files/NotPublicTestCase.php
new file mode 100644
index 00000000..a3910100
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NotPublicTestCase.php
@@ -0,0 +1,11 @@
+<?php
+class NotPublicTestCase extends PHPUnit_Framework_TestCase
+{
+    public function testPublic()
+    {
+    }
+
+    protected function testNotPublic()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NotVoidTestCase.php b/vendor/phpunit/phpunit/tests/_files/NotVoidTestCase.php
new file mode 100644
index 00000000..19a95678
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NotVoidTestCase.php
@@ -0,0 +1,4 @@
+<?php
+class NotVoidTestCase extends PHPUnit_Framework_TestCase
+{
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/NothingTest.php b/vendor/phpunit/phpunit/tests/_files/NothingTest.php
new file mode 100644
index 00000000..b56d7d7a
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/NothingTest.php
@@ -0,0 +1,7 @@
+<?php
+class NothingTest extends PHPUnit_Framework_TestCase
+{
+    public function testNothing()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/OneTestCase.php b/vendor/phpunit/phpunit/tests/_files/OneTestCase.php
new file mode 100644
index 00000000..15eeed93
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/OneTestCase.php
@@ -0,0 +1,11 @@
+<?php
+class OneTestCase extends PHPUnit_Framework_TestCase
+{
+    public function noTestCase()
+    {
+    }
+
+    public function testCase($arg = '')
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/OutputTestCase.php b/vendor/phpunit/phpunit/tests/_files/OutputTestCase.php
new file mode 100644
index 00000000..ae972b56
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/OutputTestCase.php
@@ -0,0 +1,27 @@
+<?php
+class OutputTestCase extends PHPUnit_Framework_TestCase
+{
+    public function testExpectOutputStringFooActualFoo()
+    {
+        $this->expectOutputString('foo');
+        print 'foo';
+    }
+
+    public function testExpectOutputStringFooActualBar()
+    {
+        $this->expectOutputString('foo');
+        print 'bar';
+    }
+
+    public function testExpectOutputRegexFooActualFoo()
+    {
+        $this->expectOutputRegex('/foo/');
+        print 'foo';
+    }
+
+    public function testExpectOutputRegexFooActualBar()
+    {
+        $this->expectOutputRegex('/foo/');
+        print 'bar';
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/OverrideTestCase.php b/vendor/phpunit/phpunit/tests/_files/OverrideTestCase.php
new file mode 100644
index 00000000..fcc276c5
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/OverrideTestCase.php
@@ -0,0 +1,7 @@
+<?php
+class OverrideTestCase extends OneTestCase
+{
+    public function testCase($arg = '')
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php b/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php
new file mode 100644
index 00000000..537603e8
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @requires PHP 5.3
+ * @requires PHPUnit 4.0
+ * @requires OS Linux
+ * @requires function testFuncClass
+ * @requires extension testExtClass
+ */
+class RequirementsClassDocBlockTest {
+
+    /**
+     * @requires PHP 5.4
+     * @requires PHPUnit 3.7
+     * @requires OS WINNT
+     * @requires function testFuncMethod
+     * @requires extension testExtMethod
+     */
+    public function testMethod()
+    {
+    }
+
+}
+
+
diff --git a/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php b/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php
new file mode 100644
index 00000000..0b4002dd
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php
@@ -0,0 +1,149 @@
+<?php
+class RequirementsTest extends PHPUnit_Framework_TestCase
+{
+    public function testOne()
+    {
+    }
+
+    /**
+     * @requires PHPUnit 1.0
+     */
+    public function testTwo()
+    {
+    }
+
+    /**
+     * @requires PHP 2.0
+     */
+    public function testThree()
+    {
+    }
+
+    /**
+     * @requires PHPUnit 2.0
+     * @requires PHP 1.0
+     */
+    public function testFour()
+    {
+    }
+
+    /**
+     * @requires PHP 5.4.0RC6
+     */
+    public function testFive()
+    {
+    }
+
+    /**
+     * @requires PHP 5.4.0-alpha1
+     */
+    public function testSix()
+    {
+    }
+
+    /**
+     * @requires PHP 5.4.0beta2
+     */
+    public function testSeven()
+    {
+    }
+
+    /**
+     * @requires PHP 5.4-dev
+     */
+    public function testEight()
+    {
+    }
+
+
+    /**
+     * @requires function testFunc
+     */
+    public function testNine()
+    {
+    }
+
+    /**
+     * @requires extension testExt
+     */
+    public function testTen()
+    {
+    }
+
+    /**
+     * @requires OS Linux
+     */
+    public function testEleven()
+    {
+    }
+
+    /**
+     * @requires PHP 99-dev
+     * @requires PHPUnit 9-dev
+     * @requires OS DOESNOTEXIST
+     * @requires function testFuncOne
+     * @requires function testFuncTwo
+     * @requires extension testExtOne
+     * @requires extension testExtTwo
+     */
+    public function testAllPossibleRequirements()
+    {
+    }
+
+    /**
+     * @requires function array_merge
+     */
+    public function testExistingFunction()
+    {
+    }
+
+    /**
+     * @requires function ReflectionMethod::setAccessible
+     */
+    public function testExistingMethod()
+    {
+    }
+
+    /**
+     * @requires extension spl
+     */
+    public function testExistingExtension()
+    {
+    }
+
+    /**
+     * @requires OS .*
+     */
+    public function testExistingOs()
+    {
+    }
+
+    /**
+     * @requires PHPUnit 1111111
+     */
+    public function testAlwaysSkip()
+    {
+    }
+
+    /**
+     * @requires PHP 9999999
+     */
+    public function testAlwaysSkip2()
+    {
+    }
+
+    /**
+     * @requires OS DOESNOTEXIST
+     */
+    public function testAlwaysSkip3()
+    {
+    }
+
+    /**
+     * @requires	  extension	  spl	  
+     * @requires	  OS	  .*	      
+     */
+    public function testSpace()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/SampleArrayAccess.php b/vendor/phpunit/phpunit/tests/_files/SampleArrayAccess.php
new file mode 100644
index 00000000..0d97d780
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/SampleArrayAccess.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Sample class that implements ArrayAccess copied from
+ * http://www.php.net/manual/en/class.arrayaccess.php
+ * with some minor changes
+ * This class required for PHPUnit_Framework_Constraint_ArrayHasKey testing
+ */
+
+class SampleArrayAccess implements ArrayAccess
+{
+    private $container;
+
+    public function __construct() {
+        $this->container = array();
+    }
+    public function offsetSet($offset, $value) {
+        if (is_null($offset)) {
+            $this->container[] = $value;
+        } else {
+            $this->container[$offset] = $value;
+        }
+    }
+    public function offsetExists($offset) {
+        return isset($this->container[$offset]);
+    }
+    public function offsetUnset($offset) {
+        unset($this->container[$offset]);
+    }
+    public function offsetGet($offset) {
+        return isset($this->container[$offset]) ? $this->container[$offset] : null;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/SampleClass.php b/vendor/phpunit/phpunit/tests/_files/SampleClass.php
new file mode 100644
index 00000000..06c51c51
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/SampleClass.php
@@ -0,0 +1,14 @@
+<?php
+class SampleClass
+{
+    public $a;
+    protected $b;
+    protected $c;
+
+    public function __construct($a, $b, $c)
+    {
+        $this->a = $a;
+        $this->b = $b;
+        $this->c = $c;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/SelectorAssertionsFixture.html b/vendor/phpunit/phpunit/tests/_files/SelectorAssertionsFixture.html
new file mode 100644
index 00000000..41256dab
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/SelectorAssertionsFixture.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+ <head>
+  <title>Login</title>
+  <link type="text/css" rel="Stylesheet" href="/stylesheets/screen.css">
+  <script type="text/javascript">alert('Hello, world!');</script>
+ </head>
+ <body id="login">
+  <ul id="my_ul" class="my_ul_class">
+    <li class="my_li">Test LI 1</li>
+    <li class="my_li">Test LI 2</li>
+    <li class="my_li">Test LI 3</li>
+  </ul>
+  <ul id="another_ul" class="my_ul_class">
+    <li class="my_li">Test LI 4</li>
+  </ul>
+  <div id="test_id" class="my_test_class">
+    <div id="test_child_id">
+      <span id="test_subchild_id">My Subchild</span>
+      My Child
+    </div>
+
+    Test Id Text
+  </div>
+  <div id="test_children" class="children">
+    My Children
+    <div class="my_child">1</div>
+    <div class="my_child">2</div>
+    <div class="my_child">3</div>
+    <div class="my_child">4</div>
+  </div>
+  <span class="test_class">
+    Test Class Text
+  </span>
+  <img src="/images/login_logo.gif" alt="Login Logo">
+  <input id="input_test_id" type="text" class="full">
+  <div id="test_text">
+    My test tag content
+    <div class="another_node">more text</div>
+  </div>
+  <div id="test_multi_class" class="multi part class">test</div>
+ </body>
+</html>
diff --git a/vendor/phpunit/phpunit/tests/_files/Singleton.php b/vendor/phpunit/phpunit/tests/_files/Singleton.php
new file mode 100644
index 00000000..2509efb3
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/Singleton.php
@@ -0,0 +1,22 @@
+<?php
+class Singleton
+{
+    private static $uniqueInstance = null;
+
+    protected function __construct()
+    {
+    }
+
+    private final function __clone()
+    {
+    }
+
+    public static function getInstance()
+    {
+        if (self::$uniqueInstance === null) {
+            self::$uniqueInstance = new Singleton;
+        }
+
+        return self::$uniqueInstance;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/StackTest.php b/vendor/phpunit/phpunit/tests/_files/StackTest.php
new file mode 100644
index 00000000..2e29e876
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/StackTest.php
@@ -0,0 +1,24 @@
+<?php
+class StackTest extends PHPUnit_Framework_TestCase
+{
+    public function testPush()
+    {
+        $stack = array();
+        $this->assertEquals(0, count($stack));
+
+        array_push($stack, 'foo');
+        $this->assertEquals('foo', $stack[count($stack)-1]);
+        $this->assertEquals(1, count($stack));
+
+        return $stack;
+    }
+
+    /**
+     * @depends testPush
+     */
+    public function testPop(array $stack)
+    {
+        $this->assertEquals('foo', array_pop($stack));
+        $this->assertEquals(0, count($stack));
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/Struct.php b/vendor/phpunit/phpunit/tests/_files/Struct.php
new file mode 100644
index 00000000..12977a99
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/Struct.php
@@ -0,0 +1,10 @@
+<?php
+class Struct
+{
+    public $var;
+
+    public function __construct($var)
+    {
+        $this->var = $var;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/Success.php b/vendor/phpunit/phpunit/tests/_files/Success.php
new file mode 100644
index 00000000..6d3dd618
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/Success.php
@@ -0,0 +1,7 @@
+<?php
+class Success extends PHPUnit_Framework_TestCase
+{
+    protected function runTest()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/TemplateMethodsTest.php b/vendor/phpunit/phpunit/tests/_files/TemplateMethodsTest.php
new file mode 100644
index 00000000..d6b1364f
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/TemplateMethodsTest.php
@@ -0,0 +1,51 @@
+<?php
+class TemplateMethodsTest extends PHPUnit_Framework_TestCase
+{
+    public static function setUpBeforeClass()
+    {
+        print __METHOD__ . "\n";
+    }
+
+    protected function setUp()
+    {
+        print __METHOD__ . "\n";
+    }
+
+    protected function assertPreConditions()
+    {
+        print __METHOD__ . "\n";
+    }
+
+    public function testOne()
+    {
+        print __METHOD__ . "\n";
+        $this->assertTrue(true);
+    }
+
+    public function testTwo()
+    {
+        print __METHOD__ . "\n";
+        $this->assertTrue(false);
+    }
+
+    protected function assertPostConditions()
+    {
+        print __METHOD__ . "\n";
+    }
+
+    protected function tearDown()
+    {
+        print __METHOD__ . "\n";
+    }
+
+    public static function tearDownAfterClass()
+    {
+        print __METHOD__ . "\n";
+    }
+
+    protected function onNotSuccessfulTest(Exception $e)
+    {
+        print __METHOD__ . "\n";
+        throw $e;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/TestIterator.php b/vendor/phpunit/phpunit/tests/_files/TestIterator.php
new file mode 100644
index 00000000..01135e3b
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/TestIterator.php
@@ -0,0 +1,36 @@
+<?php
+class TestIterator implements Iterator
+{
+    protected $array;
+    protected $position = 0;
+
+    public function __construct($array = array())
+    {
+        $this->array = $array;
+    }
+
+    public function rewind()
+    {
+        $this->position = 0;
+    }
+
+    public function valid()
+    {
+        return $this->position < count($this->array);
+    }
+
+    public function key()
+    {
+        return $this->position;
+    }
+
+    public function current()
+    {
+        return $this->array[$this->position];
+    }
+
+    public function next()
+    {
+        $this->position++;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/TestIterator2.php b/vendor/phpunit/phpunit/tests/_files/TestIterator2.php
new file mode 100644
index 00000000..bae3655f
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/TestIterator2.php
@@ -0,0 +1,35 @@
+<?php
+class TestIterator2 implements Iterator {
+
+    protected $data;
+
+    public function __construct(array $array)
+    {
+        $this->data = $array;
+    }
+
+    public function current()
+    {
+        return current($this->data);
+    }
+
+    public function next()
+    {
+        next($this->data);
+    }
+
+    public function key()
+    {
+        return key($this->data);
+    }
+
+    public function valid()
+    {
+        return key($this->data) !== null;
+    }
+
+    public function rewind()
+    {
+        reset($this->data);
+    }
+}
\ No newline at end of file
diff --git a/vendor/phpunit/phpunit/tests/_files/ThrowExceptionTestCase.php b/vendor/phpunit/phpunit/tests/_files/ThrowExceptionTestCase.php
new file mode 100644
index 00000000..0f8af55d
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/ThrowExceptionTestCase.php
@@ -0,0 +1,8 @@
+<?php
+class ThrowExceptionTestCase extends PHPUnit_Framework_TestCase
+{
+    public function test()
+    {
+        throw new RuntimeException;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/ThrowNoExceptionTestCase.php b/vendor/phpunit/phpunit/tests/_files/ThrowNoExceptionTestCase.php
new file mode 100644
index 00000000..76958cb7
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/ThrowNoExceptionTestCase.php
@@ -0,0 +1,7 @@
+<?php
+class ThrowNoExceptionTestCase extends PHPUnit_Framework_TestCase
+{
+    public function test()
+    {
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/WasRun.php b/vendor/phpunit/phpunit/tests/_files/WasRun.php
new file mode 100644
index 00000000..4221b6dd
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/WasRun.php
@@ -0,0 +1,10 @@
+<?php
+class WasRun extends PHPUnit_Framework_TestCase
+{
+    public $wasRun = false;
+
+    protected function runTest()
+    {
+        $this->wasRun = true;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/_files/bar.xml b/vendor/phpunit/phpunit/tests/_files/bar.xml
new file mode 100644
index 00000000..5d3fa282
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/bar.xml
@@ -0,0 +1 @@
+<bar/>
diff --git a/vendor/phpunit/phpunit/tests/_files/configuration.custom-printer.xml b/vendor/phpunit/phpunit/tests/_files/configuration.custom-printer.xml
new file mode 100644
index 00000000..7a5a1f1d
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/configuration.custom-printer.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit printerFile="CustomPrinter.php" printerClass="CustomPrinter" />
\ No newline at end of file
diff --git a/vendor/phpunit/phpunit/tests/_files/configuration.xml b/vendor/phpunit/phpunit/tests/_files/configuration.xml
new file mode 100644
index 00000000..32e232c4
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/configuration.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<phpunit backupGlobals="true"
+         backupStaticAttributes="false"
+         bootstrap="/path/to/bootstrap.php"
+         cacheTokens="false"
+         colors="false"
+         stderr="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         forceCoversAnnotation="false"
+         mapTestClassNameToCoveredClassName="false"
+         printerClass="PHPUnit_TextUI_ResultPrinter"
+         stopOnFailure="false"
+         testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader"
+         timeoutForSmallTests="1"
+         timeoutForMediumTests="10"
+         timeoutForLargeTests="60"
+         beStrictAboutTestsThatDoNotTestAnything="false"
+         beStrictAboutOutputDuringTests="false"
+         beStrictAboutTestSize="false"
+         checkForUnintentionallyCoveredCode="false"
+         verbose="false">
+  <testsuites>
+    <testsuite name="My Test Suite">
+      <directory suffix="Test.php" phpVersion="5.3.0" phpVersionOperator=">=">/path/to/files</directory>
+      <file phpVersion="5.3.0" phpVersionOperator=">=">/path/to/MyTest.php</file>
+    </testsuite>
+  </testsuites>
+
+  <groups>
+    <include>
+      <group>name</group>
+    </include>
+    <exclude>
+      <group>name</group>
+    </exclude>
+  </groups>
+
+  <filter>
+    <blacklist>
+      <directory suffix=".php">/path/to/files</directory>
+      <file>/path/to/file</file>
+      <exclude>
+        <directory suffix=".php">/path/to/files</directory>
+        <file>/path/to/file</file>
+      </exclude>
+    </blacklist>
+    <whitelist addUncoveredFilesFromWhitelist="true"
+               processUncoveredFilesFromWhitelist="false">
+      <directory suffix=".php">/path/to/files</directory>
+      <file>/path/to/file</file>
+      <exclude>
+        <directory suffix=".php">/path/to/files</directory>
+        <file>/path/to/file</file>
+      </exclude>
+    </whitelist>
+  </filter>
+
+  <listeners>
+    <listener class="MyListener" file="/optional/path/to/MyListener.php">
+      <arguments>
+        <array>
+          <element key="0">
+            <string>Sebastian</string>
+          </element>
+        </array>
+        <integer>22</integer>
+        <string>April</string>
+        <double>19.78</double>
+        <null/>
+        <object class="stdClass"/>
+        <file>MyTestFile.php</file>
+        <directory>MyRelativePath</directory>
+      </arguments>
+    </listener>
+    <listener class="IncludePathListener" file="ConfigurationTest.php" />
+    <listener class="CompactArgumentsListener" file="/CompactArgumentsListener.php"><arguments><integer>42</integer></arguments></listener>
+  </listeners>
+
+  <logging>
+    <log type="coverage-html" target="/tmp/report" lowUpperBound="50" highLowerBound="90"/>
+    <log type="coverage-clover" target="/tmp/clover.xml"/>
+    <log type="json" target="/tmp/logfile.json"/>
+    <log type="plain" target="/tmp/logfile.txt"/>
+    <log type="tap" target="/tmp/logfile.tap"/>
+    <log type="junit" target="/tmp/logfile.xml" logIncompleteSkipped="false"/>
+    <log type="testdox-html" target="/tmp/testdox.html"/>
+    <log type="testdox-text" target="/tmp/testdox.txt"/>
+  </logging>
+
+  <php>
+    <includePath>.</includePath>
+    <includePath>/path/to/lib</includePath>
+    <ini name="foo" value="bar"/>
+    <const name="FOO" value="false"/>
+    <const name="BAR" value="true"/>
+    <var name="foo" value="false"/>
+    <env name="foo" value="true"/>
+    <post name="foo" value="bar"/>
+    <get name="foo" value="bar"/>
+    <cookie name="foo" value="bar"/>
+    <server name="foo" value="bar"/>
+    <files name="foo" value="bar"/>
+    <request name="foo" value="bar"/>
+  </php>
+
+  <selenium>
+    <browser name="Firefox on Linux"
+             browser="*firefox /usr/lib/firefox/firefox-bin"
+             host="my.linux.box"
+             port="4444"
+             timeout="30000"/>
+  </selenium>
+</phpunit>
+
diff --git a/vendor/phpunit/phpunit/tests/_files/configuration_empty.xml b/vendor/phpunit/phpunit/tests/_files/configuration_empty.xml
new file mode 100644
index 00000000..13c8b71d
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/configuration_empty.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<phpunit bootstrap=""
+         testSuiteLoaderFile=""
+         printerFile="">
+  <testsuites>
+    <testsuite name="My Test Suite">
+      <directory></directory>
+      <file></file>
+    </testsuite>
+  </testsuites>
+
+  <groups>
+    <include>
+      <group></group>
+    </include>
+    <exclude>
+      <group></group>
+    </exclude>
+  </groups>
+
+  <filter>
+    <blacklist>
+      <directory></directory>
+      <file></file>
+      <exclude>
+        <directory></directory>
+        <file></file>
+      </exclude>
+    </blacklist>
+    <whitelist>
+      <directory></directory>
+      <file></file>
+      <exclude>
+        <directory></directory>
+        <file></file>
+      </exclude>
+    </whitelist>
+  </filter>
+
+  <logging>
+    <log type="coverage-html" target=""/>
+    <log type="coverage-clover" target=""/>
+    <log type="json" target=""/>
+    <log type="plain" target=""/>
+    <log type="tap" target=""/>
+    <log type="junit" target="" logIncompleteSkipped="false"/>
+    <log type="testdox-html" target=""/>
+    <log type="testdox-text" target=""/>
+  </logging>
+
+  <php>
+    <includePath/>
+    <includePath></includePath>
+  </php>
+</phpunit>
+
diff --git a/vendor/phpunit/phpunit/tests/_files/configuration_xinclude.xml b/vendor/phpunit/phpunit/tests/_files/configuration_xinclude.xml
new file mode 100644
index 00000000..902706c3
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/configuration_xinclude.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<phpunit backupGlobals="true"
+         backupStaticAttributes="false"
+         bootstrap="/path/to/bootstrap.php"
+         cacheTokens="false"
+         colors="false"
+         stderr="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         forceCoversAnnotation="false"
+         mapTestClassNameToCoveredClassName="false"
+         printerClass="PHPUnit_TextUI_ResultPrinter"
+         stopOnFailure="false"
+         testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader"
+         timeoutForSmallTests="1"
+         timeoutForMediumTests="10"
+         timeoutForLargeTests="60"
+         strict="false"
+         verbose="false">
+         <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+             href="configuration.xml"
+             parse="xml"
+             xpointer="xpointer(/phpunit/testsuites)" />
+
+  <groups>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+          href="configuration.xml"
+        parse="xml"
+        xpointer="xpointer(/phpunit/groups/*)" />
+  </groups>
+
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="configuration.xml"
+      parse="xml"
+      xpointer="xpointer(/phpunit/filter)" />
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="configuration.xml"
+      parse="xml"
+      xpointer="xpointer(/phpunit/listeners)" />
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="configuration.xml"
+      parse="xml"
+      xpointer="xpointer(/phpunit/logging)" />
+
+  <php>
+    <includePath>.</includePath>
+    <includePath>/path/to/lib</includePath>
+    <ini name="foo" value="bar"/>
+    <const name="FOO" value="false"/>
+    <const name="BAR" value="true"/>
+    <var name="foo" value="false"/>
+    <env name="foo" value="true"/>
+    <post name="foo" value="bar"/>
+    <get name="foo" value="bar"/>
+    <cookie name="foo" value="bar"/>
+    <server name="foo" value="bar"/>
+    <files name="foo" value="bar"/>
+    <request name="foo" value="bar"/>
+  </php>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="configuration.xml"
+      parse="xml"
+      xpointer="xpointer(/phpunit/selenium)" />
+</phpunit>
+
diff --git a/vendor/phpunit/phpunit/tests/_files/expectedFileFormat.txt b/vendor/phpunit/phpunit/tests/_files/expectedFileFormat.txt
new file mode 100644
index 00000000..b7d6715e
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/expectedFileFormat.txt
@@ -0,0 +1 @@
+FOO
diff --git a/vendor/phpunit/phpunit/tests/_files/foo.xml b/vendor/phpunit/phpunit/tests/_files/foo.xml
new file mode 100644
index 00000000..f1999f80
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/foo.xml
@@ -0,0 +1 @@
+<foo/>
diff --git a/vendor/phpunit/phpunit/tests/_files/structureAttributesAreSameButValuesAreNot.xml b/vendor/phpunit/phpunit/tests/_files/structureAttributesAreSameButValuesAreNot.xml
new file mode 100644
index 00000000..a5d9ab33
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/structureAttributesAreSameButValuesAreNot.xml
@@ -0,0 +1,10 @@
+<text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0">
+  <draw:frame xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" svg:width="12.567708175cm" svg:height="16.848541467cm" draw:style-name="Frame">
+    <draw:text-box>
+      <draw:frame svg:width="12.567708175cm" svg:height="15.848541467cm" draw:style-name="Image">
+        <draw:image xmlns:xlink="notthesame" xlink:href="Pictures/kristian.jpg"/>
+      </draw:frame>
+      <text:p text:style-name="Text">Image <text:sequence xmlns:style="notthesame" text:ref-name="refImage1" style:num-format="1" text:formula="ooow:Image+1" text:name="Image">1</text:sequence>: Dette er en test caption</text:p>
+    </draw:text-box>
+  </draw:frame>
+</text:p>
diff --git a/vendor/phpunit/phpunit/tests/_files/structureExpected.xml b/vendor/phpunit/phpunit/tests/_files/structureExpected.xml
new file mode 100644
index 00000000..d9001059
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/structureExpected.xml
@@ -0,0 +1,10 @@
+<text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0">
+  <draw:frame xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" svg:width="12.567708175cm" svg:height="16.848541467cm" draw:style-name="Frame">
+    <draw:text-box>
+      <draw:frame svg:width="12.567708175cm" svg:height="15.848541467cm" draw:style-name="Image">
+        <draw:image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="Pictures/kristian.jpg"/>
+      </draw:frame>
+      <text:p text:style-name="Text">Image <text:sequence xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" text:ref-name="refImage1" style:num-format="1" text:formula="ooow:Image+1" text:name="Image">1</text:sequence>: Dette er en test caption</text:p>
+    </draw:text-box>
+  </draw:frame>
+</text:p>
diff --git a/vendor/phpunit/phpunit/tests/_files/structureIgnoreTextNodes.xml b/vendor/phpunit/phpunit/tests/_files/structureIgnoreTextNodes.xml
new file mode 100644
index 00000000..0771b60c
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/structureIgnoreTextNodes.xml
@@ -0,0 +1,13 @@
+<text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0">
+  <draw:frame xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" svg:width="12.567708175cm" svg:height="16.848541467cm" draw:style-name="Frame">
+    <draw:text-box>
+    textnode
+      <draw:frame svg:width="12.567708175cm" svg:height="15.848541467cm" draw:style-name="Image">
+        <draw:image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="Pictures/kristian.jpg"/> textnode
+      </draw:frame>
+      textnode
+      <text:p text:style-name="Text">Image <text:sequence xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" text:ref-name="refImage1" style:num-format="1" text:formula="ooow:Image+1" text:name="Image">1</text:sequence>: Dette er en test caption</text:p>
+      textnode
+    </draw:text-box>
+  </draw:frame>
+</text:p>
diff --git a/vendor/phpunit/phpunit/tests/_files/structureIsSameButDataIsNot.xml b/vendor/phpunit/phpunit/tests/_files/structureIsSameButDataIsNot.xml
new file mode 100644
index 00000000..2ba21b98
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/structureIsSameButDataIsNot.xml
@@ -0,0 +1,10 @@
+<text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0">
+  <draw:frame xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" svg:width="12.567708175cm" svg:height="16.848541467cm" draw:style-name="Frame">
+    <draw:text-box>
+      <draw:frame svg:width="12.567708175cm" svg:height="15.848541467cm" draw:style-name="Image">
+        <draw:image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="Pictures/kristian.jpg"/>
+      </draw:frame>
+      <text:p text:style-name="Text">Image is not the same <text:sequence xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" text:ref-name="refImage1" style:num-format="1" text:formula="ooow:Image+1" text:name="Image">1</text:sequence>: Dette er en test caption</text:p>
+    </draw:text-box>
+  </draw:frame>
+</text:p>
diff --git a/vendor/phpunit/phpunit/tests/_files/structureWrongNumberOfAttributes.xml b/vendor/phpunit/phpunit/tests/_files/structureWrongNumberOfAttributes.xml
new file mode 100644
index 00000000..af9b9741
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/structureWrongNumberOfAttributes.xml
@@ -0,0 +1,10 @@
+<text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0">
+  <draw:frame xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" svg:width="12.567708175cm" svg:height="16.848541467cm" draw:style-name="Frame">
+    <draw:text-box>
+      <draw:frame svg:width="12.567708175cm" svg:height="15.848541467cm" draw:style-name="Image">
+        <draw:image/>
+      </draw:frame>
+      <text:p text:style-name="Text">Image <text:sequence xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" text:ref-name="refImage1" style:num-format="1" text:formula="ooow:Image+1" text:name="Image">1</text:sequence>: Dette er en test caption</text:p>
+    </draw:text-box>
+  </draw:frame>
+</text:p>
diff --git a/vendor/phpunit/phpunit/tests/_files/structureWrongNumberOfNodes.xml b/vendor/phpunit/phpunit/tests/_files/structureWrongNumberOfNodes.xml
new file mode 100644
index 00000000..9a394e23
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/_files/structureWrongNumberOfNodes.xml
@@ -0,0 +1,9 @@
+<text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0">
+  <draw:frame xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" svg:width="12.567708175cm" svg:height="16.848541467cm" draw:style-name="Frame">
+    <draw:text-box>
+      <draw:frame svg:width="12.567708175cm" svg:height="15.848541467cm" draw:style-name="Image">
+        <draw:image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="Pictures/kristian.jpg"/>
+      </draw:frame>
+    </draw:text-box>
+  </draw:frame>
+</text:p>
diff --git a/vendor/phpunit/phpunit/tests/bootstrap-travis.php b/vendor/phpunit/phpunit/tests/bootstrap-travis.php
new file mode 100644
index 00000000..bce48187
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/bootstrap-travis.php
@@ -0,0 +1,4 @@
+<?php
+
+ini_set('precision', 14);
+ini_set('serialize_precision', 14);
diff --git a/vendor/phpunit/phpunit/tests/bootstrap.php b/vendor/phpunit/phpunit/tests/bootstrap.php
new file mode 100644
index 00000000..bde92694
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/bootstrap.php
@@ -0,0 +1,10 @@
+<?php
+require __DIR__ . '/../vendor/autoload.php';
+
+if (!ini_get('date.timezone') && !defined('HHVM_VERSION')) {
+  echo PHP_EOL . 'Error: PHPUnit\'s test suite requires the "date.timezone" runtime configuration to be set. Please check your php.ini.' . PHP_EOL;
+  exit(1);
+}
+
+ini_set('precision', 14);
+ini_set('serialize_precision', 14);
diff --git a/vendor/sebastian/comparator/.gitignore b/vendor/sebastian/comparator/.gitignore
new file mode 100644
index 00000000..c2990fc6
--- /dev/null
+++ b/vendor/sebastian/comparator/.gitignore
@@ -0,0 +1,6 @@
+/build/coverage
+/composer.lock
+/composer.phar
+/phpunit.xml
+/.idea
+/vendor
diff --git a/vendor/sebastian/comparator/.travis.yml b/vendor/sebastian/comparator/.travis.yml
new file mode 100644
index 00000000..082370fe
--- /dev/null
+++ b/vendor/sebastian/comparator/.travis.yml
@@ -0,0 +1,25 @@
+language: php
+
+sudo: false
+
+install:
+  - travis_retry composer install --no-interaction --prefer-source
+
+script: ./vendor/bin/phpunit --configuration ./build/travis-ci.xml
+
+php:
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+notifications:
+  email: false
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
+    on_success: always
+    on_failure: always
+    on_start: false
diff --git a/vendor/sebastian/comparator/LICENSE b/vendor/sebastian/comparator/LICENSE
new file mode 100644
index 00000000..334b637a
--- /dev/null
+++ b/vendor/sebastian/comparator/LICENSE
@@ -0,0 +1,33 @@
+Comparator
+
+Copyright (c) 2002-2015, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/comparator/README.md b/vendor/sebastian/comparator/README.md
new file mode 100644
index 00000000..faea412b
--- /dev/null
+++ b/vendor/sebastian/comparator/README.md
@@ -0,0 +1,41 @@
+[![Build Status](https://travis-ci.org/sebastianbergmann/comparator.svg?branch=master)](https://travis-ci.org/sebastianbergmann/comparator)
+
+# Comparator
+
+This component provides the functionality to compare PHP values for equality.
+
+## Installation
+
+To add Comparator as a local, per-project dependency to your project, simply add a dependency on `sebastian/comparator` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Comparator 1.2:
+
+```JSON
+{
+    "require": {
+        "sebastian/comparator": "~1.2"
+    }
+}
+```
+
+## Usage
+
+```php
+<?php
+use SebastianBergmann\Comparator\Factory;
+use SebastianBergmann\Comparator\ComparisonFailure;
+
+$date1 = new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York'));
+$date2 = new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/Chicago'));
+
+$factory = new Factory;
+$comparator = $factory->getComparatorFor($date1, $date2);
+
+try {
+    $comparator->assertEquals($date1, $date2);
+    print "Dates match";
+}
+
+catch (ComparisonFailure $failure) {
+    print "Dates don't match";
+}
+```
+
diff --git a/vendor/sebastian/comparator/build.xml b/vendor/sebastian/comparator/build.xml
new file mode 100644
index 00000000..552ebce6
--- /dev/null
+++ b/vendor/sebastian/comparator/build.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="comparator">
+ <target name="clean" description="Cleanup build artifacts">
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
+ </target>
+
+ <target name="composer" depends="clean" description="Install dependencies with Composer">
+  <tstamp>
+   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
+  </tstamp>
+  <delete>
+   <fileset dir="${basedir}">
+    <include name="composer.phar" />
+    <date datetime="${thirty.days.ago}" when="before"/>
+   </fileset>
+  </delete>
+
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
+
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
+  </exec>
+ </target>
+
+ <target name="phpab" description="Generate autoloader script">
+  <exec executable="phpab">
+   <arg value="--output" />
+   <arg path="tests/autoload.php" />
+   <arg path="tests" />
+  </exec>
+ </target>
+</project>
diff --git a/vendor/sebastian/comparator/build/travis-ci.xml b/vendor/sebastian/comparator/build/travis-ci.xml
new file mode 100644
index 00000000..751a3bc3
--- /dev/null
+++ b/vendor/sebastian/comparator/build/travis-ci.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.2/phpunit.xsd"
+         bootstrap="../tests/bootstrap.php"
+         backupGlobals="false"
+         verbose="true">
+  <testsuite name="Comparator">
+    <directory suffix="Test.php">../tests</directory>
+  </testsuite>
+</phpunit>
+
diff --git a/vendor/sebastian/comparator/composer.json b/vendor/sebastian/comparator/composer.json
new file mode 100644
index 00000000..79f0803f
--- /dev/null
+++ b/vendor/sebastian/comparator/composer.json
@@ -0,0 +1,44 @@
+{
+    "name": "sebastian/comparator",
+    "description": "Provides the functionality to compare PHP values for equality",
+    "keywords": ["comparator","compare","equality"],
+    "homepage": "http://www.github.com/sebastianbergmann/comparator",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sebastian@phpunit.de"
+        },
+        {
+            "name": "Jeff Welch",
+            "email": "whatthejeff@gmail.com"
+        },
+        {
+            "name": "Volker Dusch",
+            "email": "github@wallbash.com"
+        },
+        {
+            "name": "Bernhard Schussek",
+            "email": "bschussek@2bepublished.at"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3",
+        "sebastian/diff": "~1.2",
+        "sebastian/exporter": "~1.2"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.4"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.2.x-dev"
+        }
+    }
+}
+
diff --git a/vendor/sebastian/comparator/phpunit.xml.dist b/vendor/sebastian/comparator/phpunit.xml.dist
new file mode 100644
index 00000000..e1eaf2c8
--- /dev/null
+++ b/vendor/sebastian/comparator/phpunit.xml.dist
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         bootstrap="tests/bootstrap.php"
+         backupGlobals="false"
+         verbose="true">
+  <testsuite name="Comparator">
+    <directory suffix="Test.php">tests</directory>
+  </testsuite>
+
+  <logging>
+    <log type="coverage-html" target="build/coverage"/>
+  </logging>
+
+  <filter>
+    <whitelist processUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">src</directory>
+    </whitelist>
+  </filter>
+</phpunit>
+
diff --git a/vendor/sebastian/comparator/src/ArrayComparator.php b/vendor/sebastian/comparator/src/ArrayComparator.php
new file mode 100644
index 00000000..80f1cdce
--- /dev/null
+++ b/vendor/sebastian/comparator/src/ArrayComparator.php
@@ -0,0 +1,136 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * Compares arrays for equality.
+ */
+class ArrayComparator extends Comparator
+{
+    /**
+     * Returns whether the comparator can compare two values.
+     *
+     * @param  mixed $expected The first value to compare
+     * @param  mixed $actual   The second value to compare
+     * @return bool
+     */
+    public function accepts($expected, $actual)
+    {
+        return is_array($expected) && is_array($actual);
+    }
+
+    /**
+     * Asserts that two values are equal.
+     *
+     * @param  mixed             $expected     The first value to compare
+     * @param  mixed             $actual       The second value to compare
+     * @param  float             $delta        The allowed numerical distance between two values to
+     *                                         consider them equal
+     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
+     *                                         comparison
+     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
+     *                                         ignored when comparing string values
+     * @param  array             $processed
+     * @throws ComparisonFailure Thrown when the comparison
+     *                                        fails. Contains information about the
+     *                                        specific errors that lead to the failure.
+     */
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = array())
+    {
+        if ($canonicalize) {
+            sort($expected);
+            sort($actual);
+        }
+
+        $remaining = $actual;
+        $expString = $actString = "Array (\n";
+        $equal     = true;
+
+        foreach ($expected as $key => $value) {
+            unset($remaining[$key]);
+
+            if (!array_key_exists($key, $actual)) {
+                $expString .= sprintf(
+                    "    %s => %s\n",
+                    $this->exporter->export($key),
+                    $this->exporter->shortenedExport($value)
+                );
+
+                $equal = false;
+
+                continue;
+            }
+
+            try {
+                $comparator = $this->factory->getComparatorFor($value, $actual[$key]);
+                $comparator->assertEquals($value, $actual[$key], $delta, $canonicalize, $ignoreCase, $processed);
+
+                $expString .= sprintf(
+                    "    %s => %s\n",
+                    $this->exporter->export($key),
+                    $this->exporter->shortenedExport($value)
+                );
+                $actString .= sprintf(
+                    "    %s => %s\n",
+                    $this->exporter->export($key),
+                    $this->exporter->shortenedExport($actual[$key])
+                );
+            } catch (ComparisonFailure $e) {
+                $expString .= sprintf(
+                    "    %s => %s\n",
+                    $this->exporter->export($key),
+                    $e->getExpectedAsString()
+                    ? $this->indent($e->getExpectedAsString())
+                    : $this->exporter->shortenedExport($e->getExpected())
+                );
+
+                $actString .= sprintf(
+                    "    %s => %s\n",
+                    $this->exporter->export($key),
+                    $e->getActualAsString()
+                    ? $this->indent($e->getActualAsString())
+                    : $this->exporter->shortenedExport($e->getActual())
+                );
+
+                $equal = false;
+            }
+        }
+
+        foreach ($remaining as $key => $value) {
+            $actString .= sprintf(
+                "    %s => %s\n",
+                $this->exporter->export($key),
+                $this->exporter->shortenedExport($value)
+            );
+
+            $equal = false;
+        }
+
+        $expString .= ')';
+        $actString .= ')';
+
+        if (!$equal) {
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                $expString,
+                $actString,
+                false,
+                'Failed asserting that two arrays are equal.'
+            );
+        }
+    }
+
+    protected function indent($lines)
+    {
+        return trim(str_replace("\n", "\n    ", $lines));
+    }
+}
diff --git a/vendor/sebastian/comparator/src/Comparator.php b/vendor/sebastian/comparator/src/Comparator.php
new file mode 100644
index 00000000..ef126a41
--- /dev/null
+++ b/vendor/sebastian/comparator/src/Comparator.php
@@ -0,0 +1,68 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+use SebastianBergmann\Exporter\Exporter;
+
+/**
+ * Abstract base class for comparators which compare values for equality.
+ */
+abstract class Comparator
+{
+    /**
+     * @var Factory
+     */
+    protected $factory;
+
+    /**
+     * @var Exporter
+     */
+    protected $exporter;
+
+    public function __construct()
+    {
+        $this->exporter = new Exporter;
+    }
+
+    /**
+     * @param Factory $factory
+     */
+    public function setFactory(Factory $factory)
+    {
+        $this->factory = $factory;
+    }
+
+    /**
+     * Returns whether the comparator can compare two values.
+     *
+     * @param  mixed $expected The first value to compare
+     * @param  mixed $actual   The second value to compare
+     * @return bool
+     */
+    abstract public function accepts($expected, $actual);
+
+    /**
+     * Asserts that two values are equal.
+     *
+     * @param  mixed             $expected     The first value to compare
+     * @param  mixed             $actual       The second value to compare
+     * @param  float             $delta        The allowed numerical distance between two values to
+     *                                         consider them equal
+     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
+     *                                         comparison
+     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
+     *                                         ignored when comparing string values
+     * @throws ComparisonFailure Thrown when the comparison
+     *                                        fails. Contains information about the
+     *                                        specific errors that lead to the failure.
+     */
+    abstract public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false);
+}
diff --git a/vendor/sebastian/comparator/src/ComparisonFailure.php b/vendor/sebastian/comparator/src/ComparisonFailure.php
new file mode 100644
index 00000000..2c254538
--- /dev/null
+++ b/vendor/sebastian/comparator/src/ComparisonFailure.php
@@ -0,0 +1,129 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+use SebastianBergmann\Diff\Differ;
+
+/**
+ * Thrown when an assertion for string equality failed.
+ */
+class ComparisonFailure extends \RuntimeException
+{
+    /**
+     * Expected value of the retrieval which does not match $actual.
+     * @var mixed
+     */
+    protected $expected;
+
+    /**
+     * Actually retrieved value which does not match $expected.
+     * @var mixed
+     */
+    protected $actual;
+
+    /**
+     * The string representation of the expected value
+     * @var string
+     */
+    protected $expectedAsString;
+
+    /**
+     * The string representation of the actual value
+     * @var string
+     */
+    protected $actualAsString;
+
+    /**
+     * @var bool
+     */
+    protected $identical;
+
+    /**
+     * Optional message which is placed in front of the first line
+     * returned by toString().
+     * @var string
+     */
+    protected $message;
+
+    /**
+     * Initialises with the expected value and the actual value.
+     *
+     * @param mixed  $expected         Expected value retrieved.
+     * @param mixed  $actual           Actual value retrieved.
+     * @param string $expectedAsString
+     * @param string $actualAsString
+     * @param bool   $identical
+     * @param string $message          A string which is prefixed on all returned lines
+     *                                 in the difference output.
+     */
+    public function __construct($expected, $actual, $expectedAsString, $actualAsString, $identical = false, $message = '')
+    {
+        $this->expected         = $expected;
+        $this->actual           = $actual;
+        $this->expectedAsString = $expectedAsString;
+        $this->actualAsString   = $actualAsString;
+        $this->message          = $message;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getActual()
+    {
+        return $this->actual;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getExpected()
+    {
+        return $this->expected;
+    }
+
+    /**
+     * @return string
+     */
+    public function getActualAsString()
+    {
+        return $this->actualAsString;
+    }
+
+    /**
+     * @return string
+     */
+    public function getExpectedAsString()
+    {
+        return $this->expectedAsString;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDiff()
+    {
+        if (!$this->actualAsString && !$this->expectedAsString) {
+            return '';
+        }
+
+        $differ = new Differ("\n--- Expected\n+++ Actual\n");
+
+        return $differ->diff($this->expectedAsString, $this->actualAsString);
+    }
+
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        return $this->message . $this->getDiff();
+    }
+}
diff --git a/vendor/sebastian/comparator/src/DOMNodeComparator.php b/vendor/sebastian/comparator/src/DOMNodeComparator.php
new file mode 100644
index 00000000..4c8a39d0
--- /dev/null
+++ b/vendor/sebastian/comparator/src/DOMNodeComparator.php
@@ -0,0 +1,110 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+use DOMDocument;
+use DOMNode;
+
+/**
+ * Compares DOMNode instances for equality.
+ */
+class DOMNodeComparator extends ObjectComparator
+{
+    /**
+     * Returns whether the comparator can compare two values.
+     *
+     * @param  mixed $expected The first value to compare
+     * @param  mixed $actual   The second value to compare
+     * @return bool
+     */
+    public function accepts($expected, $actual)
+    {
+        return $expected instanceof DOMNode && $actual instanceof DOMNode;
+    }
+
+    /**
+     * Asserts that two values are equal.
+     *
+     * @param  mixed             $expected     The first value to compare
+     * @param  mixed             $actual       The second value to compare
+     * @param  float             $delta        The allowed numerical distance between two values to
+     *                                         consider them equal
+     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
+     *                                         comparison
+     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
+     *                                         ignored when comparing string values
+     * @throws ComparisonFailure Thrown when the comparison
+     *                                        fails. Contains information about the
+     *                                        specific errors that lead to the failure.
+     */
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
+    {
+        $expectedAsString = $this->nodeToText($expected, true, $ignoreCase);
+        $actualAsString   = $this->nodeToText($actual, true, $ignoreCase);
+
+        if ($expectedAsString !== $actualAsString) {
+            if ($expected instanceof DOMDocument) {
+                $type = 'documents';
+            } else {
+                $type = 'nodes';
+            }
+
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                $expectedAsString,
+                $actualAsString,
+                false,
+                sprintf("Failed asserting that two DOM %s are equal.\n", $type)
+            );
+        }
+    }
+
+    /**
+     * Returns the normalized, whitespace-cleaned, and indented textual
+     * representation of a DOMNode.
+     *
+     * @param  DOMNode $node
+     * @param  bool    $canonicalize
+     * @param  bool    $ignoreCase
+     * @return string
+     */
+    private function nodeToText(DOMNode $node, $canonicalize, $ignoreCase)
+    {
+        if ($canonicalize) {
+            $document = new DOMDocument;
+            $document->loadXML($node->C14N());
+
+            $node = $document;
+        }
+
+        if ($node instanceof DOMDocument) {
+            $document = $node;
+        } else {
+            $document = $node->ownerDocument;
+        }
+
+        $document->formatOutput = true;
+        $document->normalizeDocument();
+
+        if ($node instanceof DOMDocument) {
+            $text = $node->saveXML();
+        } else {
+            $text = $document->saveXML($node);
+        }
+
+        if ($ignoreCase) {
+            $text = strtolower($text);
+        }
+
+        return $text;
+    }
+}
diff --git a/vendor/sebastian/comparator/src/DateTimeComparator.php b/vendor/sebastian/comparator/src/DateTimeComparator.php
new file mode 100644
index 00000000..f7bcd233
--- /dev/null
+++ b/vendor/sebastian/comparator/src/DateTimeComparator.php
@@ -0,0 +1,80 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * Compares DateTimeInterface instances for equality.
+ */
+class DateTimeComparator extends ObjectComparator
+{
+    /**
+     * Returns whether the comparator can compare two values.
+     *
+     * @param  mixed $expected The first value to compare
+     * @param  mixed $actual   The second value to compare
+     * @return bool
+     */
+    public function accepts($expected, $actual)
+    {
+        return ($expected instanceof \DateTime || $expected instanceof \DateTimeInterface) &&
+            ($actual instanceof \DateTime || $actual instanceof \DateTimeInterface);
+    }
+
+    /**
+     * Asserts that two values are equal.
+     *
+     * @param  mixed             $expected     The first value to compare
+     * @param  mixed             $actual       The second value to compare
+     * @param  float             $delta        The allowed numerical distance between two values to
+     *                                         consider them equal
+     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
+     *                                         comparison
+     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
+     *                                         ignored when comparing string values
+     * @throws ComparisonFailure Thrown when the comparison
+     *                                        fails. Contains information about the
+     *                                        specific errors that lead to the failure.
+     */
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
+    {
+        $delta = new \DateInterval(sprintf('PT%sS', abs($delta)));
+
+        $expectedLower = clone $expected;
+        $expectedUpper = clone $expected;
+
+        if ($actual < $expectedLower->sub($delta) ||
+            $actual > $expectedUpper->add($delta)) {
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                $this->dateTimeToString($expected),
+                $this->dateTimeToString($actual),
+                false,
+                'Failed asserting that two DateTime objects are equal.'
+            );
+        }
+    }
+
+    /**
+     * Returns an ISO 8601 formatted string representation of a datetime or
+     * 'Invalid DateTimeInterface object' if the provided DateTimeInterface was not properly
+     * initialized.
+     *
+     * @param  \DateTimeInterface $datetime
+     * @return string
+     */
+    protected function dateTimeToString($datetime)
+    {
+        $string = $datetime->format(\DateTime::ISO8601);
+
+        return $string ? $string : 'Invalid DateTimeInterface object';
+    }
+}
diff --git a/vendor/sebastian/comparator/src/DoubleComparator.php b/vendor/sebastian/comparator/src/DoubleComparator.php
new file mode 100644
index 00000000..051f6680
--- /dev/null
+++ b/vendor/sebastian/comparator/src/DoubleComparator.php
@@ -0,0 +1,60 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * Compares doubles for equality.
+ */
+class DoubleComparator extends NumericComparator
+{
+    /**
+     * Smallest value available in PHP.
+     *
+     * @var float
+     */
+    const EPSILON = 0.0000000001;
+
+    /**
+     * Returns whether the comparator can compare two values.
+     *
+     * @param  mixed $expected The first value to compare
+     * @param  mixed $actual   The second value to compare
+     * @return bool
+     */
+    public function accepts($expected, $actual)
+    {
+        return (is_double($expected) || is_double($actual)) && is_numeric($expected) && is_numeric($actual);
+    }
+
+    /**
+     * Asserts that two values are equal.
+     *
+     * @param  mixed             $expected     The first value to compare
+     * @param  mixed             $actual       The second value to compare
+     * @param  float             $delta        The allowed numerical distance between two values to
+     *                                         consider them equal
+     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
+     *                                         comparison
+     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
+     *                                         ignored when comparing string values
+     * @throws ComparisonFailure Thrown when the comparison
+     *                                        fails. Contains information about the
+     *                                        specific errors that lead to the failure.
+     */
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
+    {
+        if ($delta == 0) {
+            $delta = self::EPSILON;
+        }
+
+        parent::assertEquals($expected, $actual, $delta, $canonicalize, $ignoreCase);
+    }
+}
diff --git a/vendor/sebastian/comparator/src/ExceptionComparator.php b/vendor/sebastian/comparator/src/ExceptionComparator.php
new file mode 100644
index 00000000..52336464
--- /dev/null
+++ b/vendor/sebastian/comparator/src/ExceptionComparator.php
@@ -0,0 +1,51 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * Compares Exception instances for equality.
+ */
+class ExceptionComparator extends ObjectComparator
+{
+    /**
+     * Returns whether the comparator can compare two values.
+     *
+     * @param  mixed $expected The first value to compare
+     * @param  mixed $actual   The second value to compare
+     * @return bool
+     */
+    public function accepts($expected, $actual)
+    {
+        return $expected instanceof \Exception && $actual instanceof \Exception;
+    }
+
+    /**
+     * Converts an object to an array containing all of its private, protected
+     * and public properties.
+     *
+     * @param  object $object
+     * @return array
+     */
+    protected function toArray($object)
+    {
+        $array = parent::toArray($object);
+
+        unset(
+            $array['file'],
+            $array['line'],
+            $array['trace'],
+            $array['string'],
+            $array['xdebug_message']
+        );
+
+        return $array;
+    }
+}
diff --git a/vendor/sebastian/comparator/src/Factory.php b/vendor/sebastian/comparator/src/Factory.php
new file mode 100644
index 00000000..ed3d5e14
--- /dev/null
+++ b/vendor/sebastian/comparator/src/Factory.php
@@ -0,0 +1,107 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * Factory for comparators which compare values for equality.
+ */
+class Factory
+{
+    /**
+     * @var Comparator[]
+     */
+    private $comparators = array();
+
+    /**
+     * @var Factory
+     */
+    private static $instance;
+
+    /**
+     * Constructs a new factory.
+     */
+    public function __construct()
+    {
+        $this->register(new TypeComparator);
+        $this->register(new ScalarComparator);
+        $this->register(new NumericComparator);
+        $this->register(new DoubleComparator);
+        $this->register(new ArrayComparator);
+        $this->register(new ResourceComparator);
+        $this->register(new ObjectComparator);
+        $this->register(new ExceptionComparator);
+        $this->register(new SplObjectStorageComparator);
+        $this->register(new DOMNodeComparator);
+        $this->register(new MockObjectComparator);
+        $this->register(new DateTimeComparator);
+    }
+
+    /**
+     * @return Factory
+     */
+    public static function getInstance()
+    {
+        if (self::$instance === null) {
+            self::$instance = new self;
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Returns the correct comparator for comparing two values.
+     *
+     * @param  mixed      $expected The first value to compare
+     * @param  mixed      $actual   The second value to compare
+     * @return Comparator
+     */
+    public function getComparatorFor($expected, $actual)
+    {
+        foreach ($this->comparators as $comparator) {
+            if ($comparator->accepts($expected, $actual)) {
+                return $comparator;
+            }
+        }
+    }
+
+    /**
+     * Registers a new comparator.
+     *
+     * This comparator will be returned by getInstance() if its accept() method
+     * returns TRUE for the compared values. It has higher priority than the
+     * existing comparators, meaning that its accept() method will be tested
+     * before those of the other comparators.
+     *
+     * @param Comparator $comparator The registered comparator
+     */
+    public function register(Comparator $comparator)
+    {
+        array_unshift($this->comparators, $comparator);
+
+        $comparator->setFactory($this);
+    }
+
+    /**
+     * Unregisters a comparator.
+     *
+     * This comparator will no longer be returned by getInstance().
+     *
+     * @param Comparator $comparator The unregistered comparator
+     */
+    public function unregister(Comparator $comparator)
+    {
+        foreach ($this->comparators as $key => $_comparator) {
+            if ($comparator === $_comparator) {
+                unset($this->comparators[$key]);
+            }
+        }
+    }
+}
diff --git a/vendor/sebastian/comparator/src/MockObjectComparator.php b/vendor/sebastian/comparator/src/MockObjectComparator.php
new file mode 100644
index 00000000..a16903c6
--- /dev/null
+++ b/vendor/sebastian/comparator/src/MockObjectComparator.php
@@ -0,0 +1,45 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * Compares PHPUnit_Framework_MockObject_MockObject instances for equality.
+ */
+class MockObjectComparator extends ObjectComparator
+{
+    /**
+     * Returns whether the comparator can compare two values.
+     *
+     * @param  mixed $expected The first value to compare
+     * @param  mixed $actual   The second value to compare
+     * @return bool
+     */
+    public function accepts($expected, $actual)
+    {
+        return $expected instanceof \PHPUnit_Framework_MockObject_MockObject && $actual instanceof \PHPUnit_Framework_MockObject_MockObject;
+    }
+
+    /**
+     * Converts an object to an array containing all of its private, protected
+     * and public properties.
+     *
+     * @param  object $object
+     * @return array
+     */
+    protected function toArray($object)
+    {
+        $array = parent::toArray($object);
+
+        unset($array['__phpunit_invocationMocker']);
+
+        return $array;
+    }
+}
\ No newline at end of file
diff --git a/vendor/sebastian/comparator/src/NumericComparator.php b/vendor/sebastian/comparator/src/NumericComparator.php
new file mode 100644
index 00000000..90890c08
--- /dev/null
+++ b/vendor/sebastian/comparator/src/NumericComparator.php
@@ -0,0 +1,72 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * Compares numerical values for equality.
+ */
+class NumericComparator extends ScalarComparator
+{
+    /**
+     * Returns whether the comparator can compare two values.
+     *
+     * @param  mixed $expected The first value to compare
+     * @param  mixed $actual   The second value to compare
+     * @return bool
+     */
+    public function accepts($expected, $actual)
+    {
+        // all numerical values, but not if one of them is a double
+        // or both of them are strings
+        return is_numeric($expected) && is_numeric($actual) &&
+               !(is_double($expected) || is_double($actual)) &&
+               !(is_string($expected) && is_string($actual));
+    }
+
+    /**
+     * Asserts that two values are equal.
+     *
+     * @param  mixed             $expected     The first value to compare
+     * @param  mixed             $actual       The second value to compare
+     * @param  float             $delta        The allowed numerical distance between two values to
+     *                                         consider them equal
+     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
+     *                                         comparison
+     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
+     *                                         ignored when comparing string values
+     * @throws ComparisonFailure Thrown when the comparison
+     *                                        fails. Contains information about the
+     *                                        specific errors that lead to the failure.
+     */
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
+    {
+        if (is_infinite($actual) && is_infinite($expected)) {
+            return;
+        }
+
+        if ((is_infinite($actual) xor is_infinite($expected)) ||
+            (is_nan($actual) or is_nan($expected)) ||
+            abs($actual - $expected) > $delta) {
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                '',
+                '',
+                false,
+                sprintf(
+                    'Failed asserting that %s matches expected %s.',
+                    $this->exporter->export($actual),
+                    $this->exporter->export($expected)
+                )
+            );
+        }
+    }
+}
diff --git a/vendor/sebastian/comparator/src/ObjectComparator.php b/vendor/sebastian/comparator/src/ObjectComparator.php
new file mode 100644
index 00000000..08ffb677
--- /dev/null
+++ b/vendor/sebastian/comparator/src/ObjectComparator.php
@@ -0,0 +1,109 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * Compares objects for equality.
+ */
+class ObjectComparator extends ArrayComparator
+{
+    /**
+     * Returns whether the comparator can compare two values.
+     *
+     * @param  mixed $expected The first value to compare
+     * @param  mixed $actual   The second value to compare
+     * @return bool
+     */
+    public function accepts($expected, $actual)
+    {
+        return is_object($expected) && is_object($actual);
+    }
+
+    /**
+     * Asserts that two values are equal.
+     *
+     * @param  mixed             $expected     The first value to compare
+     * @param  mixed             $actual       The second value to compare
+     * @param  float             $delta        The allowed numerical distance between two values to
+     *                                         consider them equal
+     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
+     *                                         comparison
+     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
+     *                                         ignored when comparing string values
+     * @param  array             $processed
+     * @throws ComparisonFailure Thrown when the comparison
+     *                                        fails. Contains information about the
+     *                                        specific errors that lead to the failure.
+     */
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = array())
+    {
+        if (get_class($actual) !== get_class($expected)) {
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                $this->exporter->export($expected),
+                $this->exporter->export($actual),
+                false,
+                sprintf(
+                    '%s is not instance of expected class "%s".',
+                    $this->exporter->export($actual),
+                    get_class($expected)
+                )
+            );
+        }
+
+        // don't compare twice to allow for cyclic dependencies
+        if (in_array(array($actual, $expected), $processed, true) ||
+            in_array(array($expected, $actual), $processed, true)) {
+            return;
+        }
+
+        $processed[] = array($actual, $expected);
+
+        // don't compare objects if they are identical
+        // this helps to avoid the error "maximum function nesting level reached"
+        // CAUTION: this conditional clause is not tested
+        if ($actual !== $expected) {
+            try {
+                parent::assertEquals(
+                    $this->toArray($expected),
+                    $this->toArray($actual),
+                    $delta,
+                    $canonicalize,
+                    $ignoreCase,
+                    $processed
+                );
+            } catch (ComparisonFailure $e) {
+                throw new ComparisonFailure(
+                    $expected,
+                    $actual,
+                    // replace "Array" with "MyClass object"
+                    substr_replace($e->getExpectedAsString(), get_class($expected) . ' Object', 0, 5),
+                    substr_replace($e->getActualAsString(), get_class($actual) . ' Object', 0, 5),
+                    false,
+                    'Failed asserting that two objects are equal.'
+                );
+            }
+        }
+    }
+
+    /**
+     * Converts an object to an array containing all of its private, protected
+     * and public properties.
+     *
+     * @param  object $object
+     * @return array
+     */
+    protected function toArray($object)
+    {
+        return $this->exporter->toArray($object);
+    }
+}
diff --git a/vendor/sebastian/comparator/src/ResourceComparator.php b/vendor/sebastian/comparator/src/ResourceComparator.php
new file mode 100644
index 00000000..877cc7da
--- /dev/null
+++ b/vendor/sebastian/comparator/src/ResourceComparator.php
@@ -0,0 +1,56 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * Compares resources for equality.
+ */
+class ResourceComparator extends Comparator
+{
+    /**
+     * Returns whether the comparator can compare two values.
+     *
+     * @param  mixed $expected The first value to compare
+     * @param  mixed $actual   The second value to compare
+     * @return bool
+     */
+    public function accepts($expected, $actual)
+    {
+        return is_resource($expected) && is_resource($actual);
+    }
+
+    /**
+     * Asserts that two values are equal.
+     *
+     * @param  mixed             $expected     The first value to compare
+     * @param  mixed             $actual       The second value to compare
+     * @param  float             $delta        The allowed numerical distance between two values to
+     *                                         consider them equal
+     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
+     *                                         comparison
+     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
+     *                                         ignored when comparing string values
+     * @throws ComparisonFailure Thrown when the comparison
+     *                                        fails. Contains information about the
+     *                                        specific errors that lead to the failure.
+     */
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
+    {
+        if ($actual != $expected) {
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                $this->exporter->export($expected),
+                $this->exporter->export($actual)
+            );
+        }
+    }
+}
diff --git a/vendor/sebastian/comparator/src/ScalarComparator.php b/vendor/sebastian/comparator/src/ScalarComparator.php
new file mode 100644
index 00000000..df5a7464
--- /dev/null
+++ b/vendor/sebastian/comparator/src/ScalarComparator.php
@@ -0,0 +1,94 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * Compares scalar or NULL values for equality.
+ */
+class ScalarComparator extends Comparator
+{
+    /**
+     * Returns whether the comparator can compare two values.
+     *
+     * @param  mixed $expected The first value to compare
+     * @param  mixed $actual   The second value to compare
+     * @return bool
+     * @since  Method available since Release 3.6.0
+     */
+    public function accepts($expected, $actual)
+    {
+        return ((is_scalar($expected) xor null === $expected) &&
+               (is_scalar($actual) xor null === $actual))
+               // allow comparison between strings and objects featuring __toString()
+               || (is_string($expected) && is_object($actual) && method_exists($actual, '__toString'))
+               || (is_object($expected) && method_exists($expected, '__toString') && is_string($actual));
+    }
+
+    /**
+     * Asserts that two values are equal.
+     *
+     * @param  mixed             $expected     The first value to compare
+     * @param  mixed             $actual       The second value to compare
+     * @param  float             $delta        The allowed numerical distance between two values to
+     *                                         consider them equal
+     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
+     *                                         comparison
+     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
+     *                                         ignored when comparing string values
+     * @throws ComparisonFailure Thrown when the comparison
+     *                                        fails. Contains information about the
+     *                                        specific errors that lead to the failure.
+     */
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
+    {
+        $expectedToCompare = $expected;
+        $actualToCompare   = $actual;
+
+        // always compare as strings to avoid strange behaviour
+        // otherwise 0 == 'Foobar'
+        if (is_string($expected) || is_string($actual)) {
+            $expectedToCompare = (string) $expectedToCompare;
+            $actualToCompare   = (string) $actualToCompare;
+
+            if ($ignoreCase) {
+                $expectedToCompare = strtolower($expectedToCompare);
+                $actualToCompare   = strtolower($actualToCompare);
+            }
+        }
+
+        if ($expectedToCompare != $actualToCompare) {
+            if (is_string($expected) && is_string($actual)) {
+                throw new ComparisonFailure(
+                    $expected,
+                    $actual,
+                    $this->exporter->export($expected),
+                    $this->exporter->export($actual),
+                    false,
+                    'Failed asserting that two strings are equal.'
+                );
+            }
+
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                // no diff is required
+                '',
+                '',
+                false,
+                sprintf(
+                    'Failed asserting that %s matches expected %s.',
+                    $this->exporter->export($actual),
+                    $this->exporter->export($expected)
+                )
+            );
+        }
+    }
+}
diff --git a/vendor/sebastian/comparator/src/SplObjectStorageComparator.php b/vendor/sebastian/comparator/src/SplObjectStorageComparator.php
new file mode 100644
index 00000000..a1ec1198
--- /dev/null
+++ b/vendor/sebastian/comparator/src/SplObjectStorageComparator.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * Compares \SplObjectStorage instances for equality.
+ */
+class SplObjectStorageComparator extends Comparator
+{
+    /**
+     * Returns whether the comparator can compare two values.
+     *
+     * @param  mixed $expected The first value to compare
+     * @param  mixed $actual   The second value to compare
+     * @return bool
+     */
+    public function accepts($expected, $actual)
+    {
+        return $expected instanceof \SplObjectStorage && $actual instanceof \SplObjectStorage;
+    }
+
+    /**
+     * Asserts that two values are equal.
+     *
+     * @param  mixed             $expected     The first value to compare
+     * @param  mixed             $actual       The second value to compare
+     * @param  float             $delta        The allowed numerical distance between two values to
+     *                                         consider them equal
+     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
+     *                                         comparison
+     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
+     *                                         ignored when comparing string values
+     * @throws ComparisonFailure Thrown when the comparison
+     *                                        fails. Contains information about the
+     *                                        specific errors that lead to the failure.
+     */
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
+    {
+        foreach ($actual as $object) {
+            if (!$expected->contains($object)) {
+                throw new ComparisonFailure(
+                    $expected,
+                    $actual,
+                    $this->exporter->export($expected),
+                    $this->exporter->export($actual),
+                    false,
+                    'Failed asserting that two objects are equal.'
+                );
+            }
+        }
+
+        foreach ($expected as $object) {
+            if (!$actual->contains($object)) {
+                throw new ComparisonFailure(
+                    $expected,
+                    $actual,
+                    $this->exporter->export($expected),
+                    $this->exporter->export($actual),
+                    false,
+                    'Failed asserting that two objects are equal.'
+                );
+            }
+        }
+    }
+}
diff --git a/vendor/sebastian/comparator/src/TypeComparator.php b/vendor/sebastian/comparator/src/TypeComparator.php
new file mode 100644
index 00000000..6fe20779
--- /dev/null
+++ b/vendor/sebastian/comparator/src/TypeComparator.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * Compares values for type equality.
+ */
+class TypeComparator extends Comparator
+{
+    /**
+     * Returns whether the comparator can compare two values.
+     *
+     * @param  mixed $expected The first value to compare
+     * @param  mixed $actual   The second value to compare
+     * @return bool
+     */
+    public function accepts($expected, $actual)
+    {
+        return true;
+    }
+
+    /**
+     * Asserts that two values are equal.
+     *
+     * @param  mixed             $expected     The first value to compare
+     * @param  mixed             $actual       The second value to compare
+     * @param  float             $delta        The allowed numerical distance between two values to
+     *                                         consider them equal
+     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
+     *                                         comparison
+     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
+     *                                         ignored when comparing string values
+     * @throws ComparisonFailure Thrown when the comparison
+     *                                        fails. Contains information about the
+     *                                        specific errors that lead to the failure.
+     */
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
+    {
+        if (gettype($expected) != gettype($actual)) {
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                // we don't need a diff
+                '',
+                '',
+                false,
+                sprintf(
+                    '%s does not match expected type "%s".',
+                    $this->exporter->shortenedExport($actual),
+                    gettype($expected)
+                )
+            );
+        }
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/ArrayComparatorTest.php b/vendor/sebastian/comparator/tests/ArrayComparatorTest.php
new file mode 100644
index 00000000..ee44615b
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/ArrayComparatorTest.php
@@ -0,0 +1,163 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\ArrayComparator
+ *
+ */
+class ArrayComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new ArrayComparator;
+        $this->comparator->setFactory(new Factory);
+    }
+
+    public function acceptsFailsProvider()
+    {
+        return array(
+          array(array(), null),
+          array(null, array()),
+          array(null, null)
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        return array(
+          array(
+            array('a' => 1, 'b' => 2),
+            array('b' => 2, 'a' => 1)
+          ),
+          array(
+            array(1),
+            array('1')
+          ),
+          array(
+            array(3, 2, 1),
+            array(2, 3, 1),
+            0,
+            true
+          ),
+          array(
+            array(2.3),
+            array(2.5),
+            0.5
+          ),
+          array(
+            array(array(2.3)),
+            array(array(2.5)),
+            0.5
+          ),
+          array(
+            array(new Struct(2.3)),
+            array(new Struct(2.5)),
+            0.5
+          ),
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        return array(
+          array(
+            array(),
+            array(0 => 1)
+          ),
+          array(
+            array(0 => 1),
+            array()
+          ),
+          array(
+            array(0 => null),
+            array()
+          ),
+          array(
+            array(0 => 1, 1 => 2),
+            array(0 => 1, 1 => 3)
+          ),
+          array(
+            array('a', 'b' => array(1, 2)),
+            array('a', 'b' => array(2, 1))
+          ),
+          array(
+            array(2.3),
+            array(4.2),
+            0.5
+          ),
+          array(
+            array(array(2.3)),
+            array(array(4.2)),
+            0.5
+          ),
+          array(
+            array(new Struct(2.3)),
+            array(new Struct(4.2)),
+            0.5
+          )
+        );
+    }
+
+    /**
+     * @covers  ::accepts
+     */
+    public function testAcceptsSucceeds()
+    {
+        $this->assertTrue(
+          $this->comparator->accepts(array(), array())
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual, $delta = 0.0, $canonicalize = false)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual, $delta, $canonicalize);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual,$delta = 0.0, $canonicalize = false)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\Comparator\\ComparisonFailure',
+          'Failed asserting that two arrays are equal'
+        );
+        $this->comparator->assertEquals($expected, $actual, $delta, $canonicalize);
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/DOMNodeComparatorTest.php b/vendor/sebastian/comparator/tests/DOMNodeComparatorTest.php
new file mode 100644
index 00000000..a769b84c
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/DOMNodeComparatorTest.php
@@ -0,0 +1,162 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+use DOMNode;
+use DOMDocument;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\DOMNodeComparator
+ *
+ */
+class DOMNodeComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new DOMNodeComparator;
+    }
+
+    public function acceptsSucceedsProvider()
+    {
+        $document = new DOMDocument;
+        $node = new DOMNode;
+
+        return array(
+          array($document, $document),
+          array($node, $node),
+          array($document, $node),
+          array($node, $document)
+        );
+    }
+
+    public function acceptsFailsProvider()
+    {
+        $document = new DOMDocument;
+
+        return array(
+          array($document, null),
+          array(null, $document),
+          array(null, null)
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        return array(
+          array(
+            $this->createDOMDocument('<root></root>'),
+            $this->createDOMDocument('<root/>')
+          ),
+          array(
+            $this->createDOMDocument('<root attr="bar"></root>'),
+            $this->createDOMDocument('<root attr="bar"/>')
+          ),
+          array(
+            $this->createDOMDocument('<root><foo attr="bar"></foo></root>'),
+            $this->createDOMDocument('<root><foo attr="bar"/></root>')
+          ),
+          array(
+            $this->createDOMDocument("<root>\n  <child/>\n</root>"),
+            $this->createDOMDocument('<root><child/></root>')
+          ),
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        return array(
+          array(
+            $this->createDOMDocument('<root></root>'),
+            $this->createDOMDocument('<bar/>')
+          ),
+          array(
+            $this->createDOMDocument('<foo attr1="bar"/>'),
+            $this->createDOMDocument('<foo attr1="foobar"/>')
+          ),
+          array(
+            $this->createDOMDocument('<foo> bar </foo>'),
+            $this->createDOMDocument('<foo />')
+          ),
+          array(
+            $this->createDOMDocument('<foo xmlns="urn:myns:bar"/>'),
+            $this->createDOMDocument('<foo xmlns="urn:notmyns:bar"/>')
+          ),
+          array(
+            $this->createDOMDocument('<foo> bar </foo>'),
+            $this->createDOMDocument('<foo> bir </foo>')
+          )
+        );
+    }
+
+    private function createDOMDocument($content)
+    {
+        $document = new DOMDocument;
+        $document->preserveWhiteSpace = false;
+        $document->loadXML($content);
+
+        return $document;
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsSucceedsProvider
+     */
+    public function testAcceptsSucceeds($expected, $actual)
+    {
+        $this->assertTrue(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\Comparator\\ComparisonFailure',
+          'Failed asserting that two DOM'
+        );
+        $this->comparator->assertEquals($expected, $actual);
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/DateTimeComparatorTest.php b/vendor/sebastian/comparator/tests/DateTimeComparatorTest.php
new file mode 100644
index 00000000..9abcff76
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/DateTimeComparatorTest.php
@@ -0,0 +1,216 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+use DateTime;
+use DateTimeImmutable;
+use DateTimeZone;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\DateTimeComparator
+ *
+ */
+class DateTimeComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new DateTimeComparator;
+    }
+
+    public function acceptsFailsProvider()
+    {
+        $datetime = new DateTime;
+
+        return array(
+          array($datetime, null),
+          array(null, $datetime),
+          array(null, null)
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        return array(
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York'))
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 04:13:25', new DateTimeZone('America/New_York')),
+            10
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 04:14:40', new DateTimeZone('America/New_York')),
+            65
+          ),
+          array(
+            new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29', new DateTimeZone('America/New_York'))
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/Chicago'))
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 03:13:49', new DateTimeZone('America/Chicago')),
+            15
+          ),
+          array(
+            new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 23:00:00', new DateTimeZone('America/Chicago'))
+          ),
+          array(
+            new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 23:01:30', new DateTimeZone('America/Chicago')),
+            100
+          ),
+          array(
+            new DateTime('@1364616000'),
+            new DateTime('2013-03-29 23:00:00', new DateTimeZone('America/Chicago'))
+          ),
+          array(
+            new DateTime('2013-03-29T05:13:35-0500'),
+            new DateTime('2013-03-29T04:13:35-0600')
+          )
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        return array(
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/New_York'))
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/New_York')),
+            3500
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 05:13:35', new DateTimeZone('America/New_York')),
+            3500
+          ),
+          array(
+            new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-30', new DateTimeZone('America/New_York'))
+          ),
+          array(
+            new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+            43200
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/Chicago')),
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/Chicago')),
+            3500
+          ),
+          array(
+            new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-30', new DateTimeZone('America/Chicago'))
+          ),
+          array(
+            new DateTime('2013-03-29T05:13:35-0600'),
+            new DateTime('2013-03-29T04:13:35-0600')
+          ),
+          array(
+            new DateTime('2013-03-29T05:13:35-0600'),
+            new DateTime('2013-03-29T05:13:35-0500')
+          ),
+        );
+    }
+
+    /**
+     * @covers  ::accepts
+     */
+    public function testAcceptsSucceeds()
+    {
+        $this->assertTrue(
+          $this->comparator->accepts(
+            new DateTime,
+            new DateTime
+          )
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual, $delta = 0.0)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual, $delta);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual, $delta = 0.0)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\Comparator\\ComparisonFailure',
+          'Failed asserting that two DateTime objects are equal.'
+        );
+        $this->comparator->assertEquals($expected, $actual, $delta);
+    }
+
+    /**
+     * @requires PHP 5.5
+     * @covers   ::accepts
+     */
+    public function testAcceptsDateTimeInterface()
+    {
+        $this->assertTrue($this->comparator->accepts(new DateTime, new DateTimeImmutable));
+    }
+
+    /**
+     * @requires PHP 5.5
+     * @covers   ::assertEquals
+     */
+    public function testSupportsDateTimeInterface()
+    {
+        $this->comparator->assertEquals(
+          new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+          new DateTimeImmutable('2013-03-29 04:13:35', new DateTimeZone('America/New_York'))
+        );
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/DoubleComparatorTest.php b/vendor/sebastian/comparator/tests/DoubleComparatorTest.php
new file mode 100644
index 00000000..6b898bab
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/DoubleComparatorTest.php
@@ -0,0 +1,134 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\DoubleComparator
+ *
+ */
+class DoubleComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new DoubleComparator;
+    }
+
+    public function acceptsSucceedsProvider()
+    {
+        return array(
+          array(0, 5.0),
+          array(5.0, 0),
+          array('5', 4.5),
+          array(1.2e3, 7E-10),
+          array(3, acos(8)),
+          array(acos(8), 3),
+          array(acos(8), acos(8))
+        );
+    }
+
+    public function acceptsFailsProvider()
+    {
+        return array(
+          array(5, 5),
+          array('4.5', 5),
+          array(0x539, 02471),
+          array(5.0, false),
+          array(null, 5.0)
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        return array(
+          array(2.3, 2.3),
+          array('2.3', 2.3),
+          array(5.0, 5),
+          array(5, 5.0),
+          array(5.0, '5'),
+          array(1.2e3, 1200),
+          array(2.3, 2.5, 0.5),
+          array(3, 3.05, 0.05),
+          array(1.2e3, 1201, 1),
+          array((string)(1/3), 1 - 2/3),
+          array(1/3, (string)(1 - 2/3))
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        return array(
+          array(2.3, 4.2),
+          array('2.3', 4.2),
+          array(5.0, '4'),
+          array(5.0, 6),
+          array(1.2e3, 1201),
+          array(2.3, 2.5, 0.2),
+          array(3, 3.05, 0.04),
+          array(3, acos(8)),
+          array(acos(8), 3),
+          array(acos(8), acos(8))
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsSucceedsProvider
+     */
+    public function testAcceptsSucceeds($expected, $actual)
+    {
+        $this->assertTrue(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual, $delta = 0.0)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual, $delta);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual, $delta = 0.0)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\Comparator\\ComparisonFailure', 'matches expected'
+        );
+        $this->comparator->assertEquals($expected, $actual, $delta);
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/ExceptionComparatorTest.php b/vendor/sebastian/comparator/tests/ExceptionComparatorTest.php
new file mode 100644
index 00000000..fa8cc0a3
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/ExceptionComparatorTest.php
@@ -0,0 +1,136 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+use \Exception;
+use \RuntimeException;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\ExceptionComparator
+ *
+ */
+class ExceptionComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new ExceptionComparator;
+        $this->comparator->setFactory(new Factory);
+    }
+
+    public function acceptsSucceedsProvider()
+    {
+        return array(
+          array(new Exception, new Exception),
+          array(new RuntimeException, new RuntimeException),
+          array(new Exception, new RuntimeException)
+        );
+    }
+
+    public function acceptsFailsProvider()
+    {
+        return array(
+          array(new Exception, null),
+          array(null, new Exception),
+          array(null, null)
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        $exception1 = new Exception;
+        $exception2 = new Exception;
+
+        $exception3 = new RunTimeException('Error', 100);
+        $exception4 = new RunTimeException('Error', 100);
+
+        return array(
+          array($exception1, $exception1),
+          array($exception1, $exception2),
+          array($exception3, $exception3),
+          array($exception3, $exception4)
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        $typeMessage = 'not instance of expected class';
+        $equalMessage = 'Failed asserting that two objects are equal.';
+
+        $exception1 = new Exception('Error', 100);
+        $exception2 = new Exception('Error', 101);
+        $exception3 = new Exception('Errors', 101);
+
+        $exception4 = new RunTimeException('Error', 100);
+        $exception5 = new RunTimeException('Error', 101);
+
+        return array(
+          array($exception1, $exception2, $equalMessage),
+          array($exception1, $exception3, $equalMessage),
+          array($exception1, $exception4, $typeMessage),
+          array($exception2, $exception3, $equalMessage),
+          array($exception4, $exception5, $equalMessage)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsSucceedsProvider
+     */
+    public function testAcceptsSucceeds($expected, $actual)
+    {
+        $this->assertTrue(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual, $message)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\Comparator\\ComparisonFailure', $message
+        );
+        $this->comparator->assertEquals($expected, $actual);
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/FactoryTest.php b/vendor/sebastian/comparator/tests/FactoryTest.php
new file mode 100644
index 00000000..cb58c20c
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/FactoryTest.php
@@ -0,0 +1,115 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\Factory
+ *
+ */
+class FactoryTest extends \PHPUnit_Framework_TestCase
+{
+    public function instanceProvider()
+    {
+        $tmpfile = tmpfile();
+
+        return array(
+            array(NULL, NULL, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array(NULL, TRUE, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array(TRUE, NULL, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array(TRUE, TRUE, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array(FALSE, FALSE, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array(TRUE, FALSE, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array(FALSE, TRUE, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array('', '', 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array('0', '0', 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array('0', 0, 'SebastianBergmann\\Comparator\\NumericComparator'),
+            array(0, '0', 'SebastianBergmann\\Comparator\\NumericComparator'),
+            array(0, 0, 'SebastianBergmann\\Comparator\\NumericComparator'),
+            array(1.0, 0, 'SebastianBergmann\\Comparator\\DoubleComparator'),
+            array(0, 1.0, 'SebastianBergmann\\Comparator\\DoubleComparator'),
+            array(1.0, 1.0, 'SebastianBergmann\\Comparator\\DoubleComparator'),
+            array(array(1), array(1), 'SebastianBergmann\\Comparator\\ArrayComparator'),
+            array($tmpfile, $tmpfile, 'SebastianBergmann\\Comparator\\ResourceComparator'),
+            array(new \stdClass, new \stdClass, 'SebastianBergmann\\Comparator\\ObjectComparator'),
+            array(new \DateTime, new \DateTime, 'SebastianBergmann\\Comparator\\DateTimeComparator'),
+            array(new \SplObjectStorage, new \SplObjectStorage, 'SebastianBergmann\\Comparator\\SplObjectStorageComparator'),
+            array(new \Exception, new \Exception, 'SebastianBergmann\\Comparator\\ExceptionComparator'),
+            array(new \DOMDocument, new \DOMDocument, 'SebastianBergmann\\Comparator\\DOMNodeComparator'),
+            // mixed types
+            array($tmpfile, array(1), 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(array(1), $tmpfile, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array($tmpfile, '1', 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array('1', $tmpfile, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array($tmpfile, new \stdClass, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(new \stdClass, $tmpfile, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(new \stdClass, array(1), 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(array(1), new \stdClass, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(new \stdClass, '1', 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array('1', new \stdClass, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(new ClassWithToString, '1', 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array('1', new ClassWithToString, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array(1.0, new \stdClass, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(new \stdClass, 1.0, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(1.0, array(1), 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(array(1), 1.0, 'SebastianBergmann\\Comparator\\TypeComparator'),
+        );
+    }
+
+    /**
+     * @dataProvider instanceProvider
+     * @covers       ::getComparatorFor
+     * @covers       ::__construct
+     */
+    public function testGetComparatorFor($a, $b, $expected)
+    {
+        $factory = new Factory;
+        $actual = $factory->getComparatorFor($a, $b);
+        $this->assertInstanceOf($expected, $actual);
+    }
+
+    /**
+     * @covers ::register
+     */
+    public function testRegister()
+    {
+        $comparator = new TestClassComparator;
+
+        $factory = new Factory;
+        $factory->register($comparator);
+
+        $a = new TestClass;
+        $b = new TestClass;
+        $expected = 'SebastianBergmann\\Comparator\\TestClassComparator';
+        $actual = $factory->getComparatorFor($a, $b);
+
+        $factory->unregister($comparator);
+        $this->assertInstanceOf($expected, $actual);
+    }
+
+    /**
+     * @covers ::unregister
+     */
+    public function testUnregister()
+    {
+        $comparator = new TestClassComparator;
+
+        $factory = new Factory;
+        $factory->register($comparator);
+        $factory->unregister($comparator);
+
+        $a = new TestClass;
+        $b = new TestClass;
+        $expected = 'SebastianBergmann\\Comparator\\ObjectComparator';
+        $actual = $factory->getComparatorFor($a, $b);
+
+        $this->assertInstanceOf($expected, $actual);
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/MockObjectComparatorTest.php b/vendor/sebastian/comparator/tests/MockObjectComparatorTest.php
new file mode 100644
index 00000000..7910ad7a
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/MockObjectComparatorTest.php
@@ -0,0 +1,166 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\MockObjectComparator
+ *
+ */
+class MockObjectComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new MockObjectComparator;
+        $this->comparator->setFactory(new Factory);
+    }
+
+    public function acceptsSucceedsProvider()
+    {
+        $testmock = $this->getMock('SebastianBergmann\\Comparator\\TestClass');
+        $stdmock = $this->getMock('stdClass');
+
+        return array(
+          array($testmock, $testmock),
+          array($stdmock, $stdmock),
+          array($stdmock, $testmock)
+        );
+    }
+
+    public function acceptsFailsProvider()
+    {
+        $stdmock = $this->getMock('stdClass');
+
+        return array(
+          array($stdmock, null),
+          array(null, $stdmock),
+          array(null, null)
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        // cyclic dependencies
+        $book1 = $this->getMock('SebastianBergmann\\Comparator\\Book', null);
+        $book1->author = $this->getMock('SebastianBergmann\\Comparator\\Author', null, array('Terry Pratchett'));
+        $book1->author->books[] = $book1;
+        $book2 = $this->getMock('SebastianBergmann\\Comparator\\Book', null);
+        $book2->author = $this->getMock('SebastianBergmann\\Comparator\\Author', null, array('Terry Pratchett'));
+        $book2->author->books[] = $book2;
+
+        $object1 = $this->getMock('SebastianBergmann\\Comparator\\SampleClass', null, array(4, 8, 15));
+        $object2 = $this->getMock('SebastianBergmann\\Comparator\\SampleClass', null, array(4, 8, 15));
+
+        return array(
+          array($object1, $object1),
+          array($object1, $object2),
+          array($book1, $book1),
+          array($book1, $book2),
+          array(
+            $this->getMock('SebastianBergmann\\Comparator\\Struct', null, array(2.3)),
+            $this->getMock('SebastianBergmann\\Comparator\\Struct', null, array(2.5)),
+            0.5
+          )
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        $typeMessage = 'is not instance of expected class';
+        $equalMessage = 'Failed asserting that two objects are equal.';
+
+        // cyclic dependencies
+        $book1 = $this->getMock('SebastianBergmann\\Comparator\\Book', null);
+        $book1->author = $this->getMock('SebastianBergmann\\Comparator\\Author', null, array('Terry Pratchett'));
+        $book1->author->books[] = $book1;
+        $book2 = $this->getMock('SebastianBergmann\\Comparator\\Book', null);
+        $book2->author = $this->getMock('SebastianBergmann\\Comparator\\Author', null, array('Terry Pratch'));
+        $book2->author->books[] = $book2;
+
+        $book3 = $this->getMock('SebastianBergmann\\Comparator\\Book', null);
+        $book3->author = 'Terry Pratchett';
+        $book4 = $this->getMock('stdClass');
+        $book4->author = 'Terry Pratchett';
+
+        $object1 = $this->getMock('SebastianBergmann\\Comparator\\SampleClass', null, array(4, 8, 15));
+        $object2 = $this->getMock('SebastianBergmann\\Comparator\\SampleClass', null, array(16, 23, 42));
+
+        return array(
+          array(
+            $this->getMock('SebastianBergmann\\Comparator\\SampleClass', null, array(4, 8, 15)),
+            $this->getMock('SebastianBergmann\\Comparator\\SampleClass', null, array(16, 23, 42)),
+            $equalMessage
+          ),
+          array($object1, $object2, $equalMessage),
+          array($book1, $book2, $equalMessage),
+          array($book3, $book4, $typeMessage),
+          array(
+            $this->getMock('SebastianBergmann\\Comparator\\Struct', null, array(2.3)),
+            $this->getMock('SebastianBergmann\\Comparator\\Struct', null, array(4.2)),
+            $equalMessage,
+            0.5
+          )
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsSucceedsProvider
+     */
+    public function testAcceptsSucceeds($expected, $actual)
+    {
+        $this->assertTrue(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual, $delta = 0.0)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual, $delta);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual, $message, $delta = 0.0)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\Comparator\\ComparisonFailure', $message
+        );
+        $this->comparator->assertEquals($expected, $actual, $delta);
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/NumericComparatorTest.php b/vendor/sebastian/comparator/tests/NumericComparatorTest.php
new file mode 100644
index 00000000..fec7d00a
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/NumericComparatorTest.php
@@ -0,0 +1,122 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\NumericComparator
+ *
+ */
+class NumericComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new NumericComparator;
+    }
+
+    public function acceptsSucceedsProvider()
+    {
+        return array(
+          array(5, 10),
+          array(8, '0'),
+          array('10', 0),
+          array(0x74c3b00c, 42),
+          array(0755, 0777)
+        );
+    }
+
+    public function acceptsFailsProvider()
+    {
+        return array(
+          array('5', '10'),
+          array(8, 5.0),
+          array(5.0, 8),
+          array(10, null),
+          array(false, 12)
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        return array(
+          array(1337, 1337),
+          array('1337', 1337),
+          array(0x539, 1337),
+          array(02471, 1337),
+          array(1337, 1338, 1),
+          array('1337', 1340, 5),
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        return array(
+          array(1337, 1338),
+          array('1338', 1337),
+          array(0x539, 1338),
+          array(1337, 1339, 1),
+          array('1337', 1340, 2),
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsSucceedsProvider
+     */
+    public function testAcceptsSucceeds($expected, $actual)
+    {
+        $this->assertTrue(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual, $delta = 0.0)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual, $delta);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual, $delta = 0.0)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\Comparator\\ComparisonFailure', 'matches expected'
+        );
+        $this->comparator->assertEquals($expected, $actual, $delta);
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/ObjectComparatorTest.php b/vendor/sebastian/comparator/tests/ObjectComparatorTest.php
new file mode 100644
index 00000000..a9582325
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/ObjectComparatorTest.php
@@ -0,0 +1,150 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+use stdClass;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\ObjectComparator
+ *
+ */
+class ObjectComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new ObjectComparator;
+        $this->comparator->setFactory(new Factory);
+    }
+
+    public function acceptsSucceedsProvider()
+    {
+        return array(
+          array(new TestClass, new TestClass),
+          array(new stdClass, new stdClass),
+          array(new stdClass, new TestClass)
+        );
+    }
+
+    public function acceptsFailsProvider()
+    {
+        return array(
+          array(new stdClass, null),
+          array(null, new stdClass),
+          array(null, null)
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        // cyclic dependencies
+        $book1 = new Book;
+        $book1->author = new Author('Terry Pratchett');
+        $book1->author->books[] = $book1;
+        $book2 = new Book;
+        $book2->author = new Author('Terry Pratchett');
+        $book2->author->books[] = $book2;
+
+        $object1 = new SampleClass(4, 8, 15);
+        $object2 = new SampleClass(4, 8, 15);
+
+        return array(
+          array($object1, $object1),
+          array($object1, $object2),
+          array($book1, $book1),
+          array($book1, $book2),
+          array(new Struct(2.3), new Struct(2.5), 0.5)
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        $typeMessage = 'is not instance of expected class';
+        $equalMessage = 'Failed asserting that two objects are equal.';
+
+        // cyclic dependencies
+        $book1 = new Book;
+        $book1->author = new Author('Terry Pratchett');
+        $book1->author->books[] = $book1;
+        $book2 = new Book;
+        $book2->author = new Author('Terry Pratch');
+        $book2->author->books[] = $book2;
+
+        $book3 = new Book;
+        $book3->author = 'Terry Pratchett';
+        $book4 = new stdClass;
+        $book4->author = 'Terry Pratchett';
+
+        $object1 = new SampleClass( 4,  8, 15);
+        $object2 = new SampleClass(16, 23, 42);
+
+        return array(
+          array(new SampleClass(4, 8, 15), new SampleClass(16, 23, 42), $equalMessage),
+          array($object1, $object2, $equalMessage),
+          array($book1, $book2, $equalMessage),
+          array($book3, $book4, $typeMessage),
+          array(new Struct(2.3), new Struct(4.2), $equalMessage, 0.5)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsSucceedsProvider
+     */
+    public function testAcceptsSucceeds($expected, $actual)
+    {
+        $this->assertTrue(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual, $delta = 0.0)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual, $delta);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual, $message, $delta = 0.0)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\Comparator\\ComparisonFailure', $message
+        );
+        $this->comparator->assertEquals($expected, $actual, $delta);
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/ResourceComparatorTest.php b/vendor/sebastian/comparator/tests/ResourceComparatorTest.php
new file mode 100644
index 00000000..a9e9e955
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/ResourceComparatorTest.php
@@ -0,0 +1,120 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\ResourceComparator
+ *
+ */
+class ResourceComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new ResourceComparator;
+    }
+
+    public function acceptsSucceedsProvider()
+    {
+        $tmpfile1 = tmpfile();
+        $tmpfile2 = tmpfile();
+
+        return array(
+          array($tmpfile1, $tmpfile1),
+          array($tmpfile2, $tmpfile2),
+          array($tmpfile1, $tmpfile2)
+        );
+    }
+
+    public function acceptsFailsProvider()
+    {
+        $tmpfile1 = tmpfile();
+
+        return array(
+          array($tmpfile1, null),
+          array(null, $tmpfile1),
+          array(null, null)
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        $tmpfile1 = tmpfile();
+        $tmpfile2 = tmpfile();
+
+        return array(
+          array($tmpfile1, $tmpfile1),
+          array($tmpfile2, $tmpfile2)
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        $tmpfile1 = tmpfile();
+        $tmpfile2 = tmpfile();
+
+        return array(
+          array($tmpfile1, $tmpfile2),
+          array($tmpfile2, $tmpfile1)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsSucceedsProvider
+     */
+    public function testAcceptsSucceeds($expected, $actual)
+    {
+        $this->assertTrue(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual)
+    {
+        $this->setExpectedException('SebastianBergmann\\Comparator\\ComparisonFailure');
+        $this->comparator->assertEquals($expected, $actual);
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/ScalarComparatorTest.php b/vendor/sebastian/comparator/tests/ScalarComparatorTest.php
new file mode 100644
index 00000000..e5156aa3
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/ScalarComparatorTest.php
@@ -0,0 +1,158 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\ScalarComparator
+ *
+ */
+class ScalarComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new ScalarComparator;
+    }
+
+    public function acceptsSucceedsProvider()
+    {
+        return array(
+          array("string", "string"),
+          array(new ClassWithToString, "string"),
+          array("string", new ClassWithToString),
+          array("string", null),
+          array(false, "string"),
+          array(false, true),
+          array(null, false),
+          array(null, null),
+          array("10", 10),
+          array("", false),
+          array("1", true),
+          array(1, true),
+          array(0, false),
+          array(0.1, "0.1")
+        );
+    }
+
+    public function acceptsFailsProvider()
+    {
+        return array(
+          array(array(), array()),
+          array("string", array()),
+          array(new ClassWithToString, new ClassWithToString),
+          array(false, new ClassWithToString),
+          array(tmpfile(), tmpfile())
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        return array(
+          array("string", "string"),
+          array(new ClassWithToString, new ClassWithToString),
+          array("string representation", new ClassWithToString),
+          array(new ClassWithToString, "string representation"),
+          array("string", "STRING", true),
+          array("STRING", "string", true),
+          array("String Representation", new ClassWithToString, true),
+          array(new ClassWithToString, "String Representation", true),
+          array("10", 10),
+          array("", false),
+          array("1", true),
+          array(1, true),
+          array(0, false),
+          array(0.1, "0.1"),
+          array(false, null),
+          array(false, false),
+          array(true, true),
+          array(null, null)
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        $stringException = 'Failed asserting that two strings are equal.';
+        $otherException = 'matches expected';
+
+        return array(
+          array("string", "other string", $stringException),
+          array("string", "STRING", $stringException),
+          array("STRING", "string", $stringException),
+          array("string", "other string", $stringException),
+          // https://github.com/sebastianbergmann/phpunit/issues/1023
+          array('9E6666666','9E7777777', $stringException),
+          array(new ClassWithToString, "does not match", $otherException),
+          array("does not match", new ClassWithToString, $otherException),
+          array(0, 'Foobar', $otherException),
+          array('Foobar', 0, $otherException),
+          array("10", 25, $otherException),
+          array("1", false, $otherException),
+          array("", true, $otherException),
+          array(false, true, $otherException),
+          array(true, false, $otherException),
+          array(null, true, $otherException),
+          array(0, true, $otherException)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsSucceedsProvider
+     */
+    public function testAcceptsSucceeds($expected, $actual)
+    {
+        $this->assertTrue(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual, $ignoreCase = false)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual, 0.0, false, $ignoreCase);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual, $message)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\Comparator\\ComparisonFailure', $message
+        );
+        $this->comparator->assertEquals($expected, $actual);
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/SplObjectStorageComparatorTest.php b/vendor/sebastian/comparator/tests/SplObjectStorageComparatorTest.php
new file mode 100644
index 00000000..766dd2df
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/SplObjectStorageComparatorTest.php
@@ -0,0 +1,137 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+use SplObjectStorage;
+use stdClass;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\SplObjectStorageComparator
+ *
+ */
+class SplObjectStorageComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new SplObjectStorageComparator;
+    }
+
+    public function acceptsFailsProvider()
+    {
+        return array(
+          array(new SplObjectStorage, new stdClass),
+          array(new stdClass, new SplObjectStorage),
+          array(new stdClass, new stdClass)
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        $object1 = new stdClass();
+        $object2 = new stdClass();
+
+        $storage1 = new SplObjectStorage();
+        $storage2 = new SplObjectStorage();
+
+        $storage3 = new SplObjectStorage();
+        $storage3->attach($object1);
+        $storage3->attach($object2);
+
+        $storage4 = new SplObjectStorage();
+        $storage4->attach($object2);
+        $storage4->attach($object1);
+
+        return array(
+          array($storage1, $storage1),
+          array($storage1, $storage2),
+          array($storage3, $storage3),
+          array($storage3, $storage4)
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        $object1 = new stdClass;
+        $object2 = new stdClass;
+
+        $storage1 = new SplObjectStorage;
+
+        $storage2 = new SplObjectStorage;
+        $storage2->attach($object1);
+
+        $storage3 = new SplObjectStorage;
+        $storage3->attach($object2);
+        $storage3->attach($object1);
+
+        return array(
+          array($storage1, $storage2),
+          array($storage1, $storage3),
+          array($storage2, $storage3),
+        );
+    }
+
+    /**
+     * @covers  ::accepts
+     */
+    public function testAcceptsSucceeds()
+    {
+        $this->assertTrue(
+          $this->comparator->accepts(
+            new SplObjectStorage,
+            new SplObjectStorage
+          )
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\Comparator\\ComparisonFailure',
+          'Failed asserting that two objects are equal.'
+        );
+        $this->comparator->assertEquals($expected, $actual);
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/TypeComparatorTest.php b/vendor/sebastian/comparator/tests/TypeComparatorTest.php
new file mode 100644
index 00000000..bb51f8a1
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/TypeComparatorTest.php
@@ -0,0 +1,104 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+use stdClass;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\TypeComparator
+ *
+ */
+class TypeComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new TypeComparator;
+    }
+
+    public function acceptsSucceedsProvider()
+    {
+        return array(
+          array(true, 1),
+          array(false, array(1)),
+          array(null, new stdClass),
+          array(1.0, 5),
+          array("", "")
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        return array(
+          array(true, true),
+          array(true, false),
+          array(false, false),
+          array(null, null),
+          array(new stdClass, new stdClass),
+          array(0, 0),
+          array(1.0, 2.0),
+          array("hello", "world"),
+          array("", ""),
+          array(array(), array(1,2,3))
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        return array(
+          array(true, null),
+          array(null, false),
+          array(1.0, 0),
+          array(new stdClass, array()),
+          array("1", 1)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsSucceedsProvider
+     */
+    public function testAcceptsSucceeds($expected, $actual)
+    {
+        $this->assertTrue(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual)
+    {
+        $this->setExpectedException('SebastianBergmann\\Comparator\\ComparisonFailure', 'does not match expected type');
+        $this->comparator->assertEquals($expected, $actual);
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/_files/Author.php b/vendor/sebastian/comparator/tests/_files/Author.php
new file mode 100644
index 00000000..ae698c3c
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/_files/Author.php
@@ -0,0 +1,28 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * An author.
+ *
+ */
+class Author
+{
+    // the order of properties is important for testing the cycle!
+    public $books = array();
+
+    private $name = '';
+
+    public function __construct($name)
+    {
+        $this->name = $name;
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/_files/Book.php b/vendor/sebastian/comparator/tests/_files/Book.php
new file mode 100644
index 00000000..6171bc33
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/_files/Book.php
@@ -0,0 +1,21 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * A book.
+ *
+ */
+class Book
+{
+    // the order of properties is important for testing the cycle!
+    public $author = null;
+}
diff --git a/vendor/sebastian/comparator/tests/_files/ClassWithToString.php b/vendor/sebastian/comparator/tests/_files/ClassWithToString.php
new file mode 100644
index 00000000..e8e03bc7
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/_files/ClassWithToString.php
@@ -0,0 +1,19 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+class ClassWithToString
+{
+    public function __toString()
+    {
+        return 'string representation';
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/_files/SampleClass.php b/vendor/sebastian/comparator/tests/_files/SampleClass.php
new file mode 100644
index 00000000..6079dd34
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/_files/SampleClass.php
@@ -0,0 +1,29 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * A sample class.
+ *
+ */
+class SampleClass
+{
+    public $a;
+    protected $b;
+    protected $c;
+
+    public function __construct($a, $b, $c)
+    {
+        $this->a = $a;
+        $this->b = $b;
+        $this->c = $c;
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/_files/Struct.php b/vendor/sebastian/comparator/tests/_files/Struct.php
new file mode 100644
index 00000000..79ec559a
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/_files/Struct.php
@@ -0,0 +1,25 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * A struct.
+ *
+ */
+class Struct
+{
+    public $var;
+
+    public function __construct($var)
+    {
+        $this->var = $var;
+    }
+}
diff --git a/vendor/sebastian/comparator/tests/_files/TestClass.php b/vendor/sebastian/comparator/tests/_files/TestClass.php
new file mode 100644
index 00000000..e4c9b78c
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/_files/TestClass.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+class TestClass {
+}
diff --git a/vendor/sebastian/comparator/tests/_files/TestClassComparator.php b/vendor/sebastian/comparator/tests/_files/TestClassComparator.php
new file mode 100644
index 00000000..52aac3fd
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/_files/TestClassComparator.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * This file is part of the Comparator package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Comparator;
+
+class TestClassComparator extends ObjectComparator {
+}
diff --git a/vendor/sebastian/comparator/tests/autoload.php b/vendor/sebastian/comparator/tests/autoload.php
new file mode 100644
index 00000000..f4d9bbcc
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/autoload.php
@@ -0,0 +1,38 @@
+<?php
+// @codingStandardsIgnoreFile
+// @codeCoverageIgnoreStart
+// this is an autogenerated file - do not edit
+spl_autoload_register(
+    function($class) {
+        static $classes = null;
+        if ($classes === null) {
+            $classes = array(
+                'sebastianbergmann\\comparator\\arraycomparatortest' => '/ArrayComparatorTest.php',
+                'sebastianbergmann\\comparator\\author' => '/_files/Author.php',
+                'sebastianbergmann\\comparator\\book' => '/_files/Book.php',
+                'sebastianbergmann\\comparator\\classwithtostring' => '/_files/ClassWithToString.php',
+                'sebastianbergmann\\comparator\\datetimecomparatortest' => '/DateTimeComparatorTest.php',
+                'sebastianbergmann\\comparator\\domnodecomparatortest' => '/DOMNodeComparatorTest.php',
+                'sebastianbergmann\\comparator\\doublecomparatortest' => '/DoubleComparatorTest.php',
+                'sebastianbergmann\\comparator\\exceptioncomparatortest' => '/ExceptionComparatorTest.php',
+                'sebastianbergmann\\comparator\\factorytest' => '/FactoryTest.php',
+                'sebastianbergmann\\comparator\\mockobjectcomparatortest' => '/MockObjectComparatorTest.php',
+                'sebastianbergmann\\comparator\\numericcomparatortest' => '/NumericComparatorTest.php',
+                'sebastianbergmann\\comparator\\objectcomparatortest' => '/ObjectComparatorTest.php',
+                'sebastianbergmann\\comparator\\resourcecomparatortest' => '/ResourceComparatorTest.php',
+                'sebastianbergmann\\comparator\\sampleclass' => '/_files/SampleClass.php',
+                'sebastianbergmann\\comparator\\scalarcomparatortest' => '/ScalarComparatorTest.php',
+                'sebastianbergmann\\comparator\\splobjectstoragecomparatortest' => '/SplObjectStorageComparatorTest.php',
+                'sebastianbergmann\\comparator\\struct' => '/_files/Struct.php',
+                'sebastianbergmann\\comparator\\testclass' => '/_files/TestClass.php',
+                'sebastianbergmann\\comparator\\testclasscomparator' => '/_files/TestClassComparator.php',
+                'sebastianbergmann\\comparator\\typecomparatortest' => '/TypeComparatorTest.php'
+            );
+        }
+        $cn = strtolower($class);
+        if (isset($classes[$cn])) {
+            require __DIR__ . $classes[$cn];
+        }
+    }
+);
+// @codeCoverageIgnoreEnd
diff --git a/vendor/sebastian/comparator/tests/bootstrap.php b/vendor/sebastian/comparator/tests/bootstrap.php
new file mode 100644
index 00000000..8f1c57c3
--- /dev/null
+++ b/vendor/sebastian/comparator/tests/bootstrap.php
@@ -0,0 +1,7 @@
+<?php
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/autoload.php';
+
+ini_set('precision', 14);
+ini_set('serialize_precision', 14);
+
diff --git a/vendor/sebastian/diff/.gitignore b/vendor/sebastian/diff/.gitignore
new file mode 100644
index 00000000..d571f240
--- /dev/null
+++ b/vendor/sebastian/diff/.gitignore
@@ -0,0 +1,10 @@
+.idea
+phpunit.xml
+composer.lock
+composer.phar
+vendor/
+cache.properties
+build/SebastianBergmann
+build/LICENSE
+build/README.md
+build/*.tgz
diff --git a/vendor/sebastian/diff/.travis.yml b/vendor/sebastian/diff/.travis.yml
new file mode 100644
index 00000000..c5ea677f
--- /dev/null
+++ b/vendor/sebastian/diff/.travis.yml
@@ -0,0 +1,16 @@
+language: php
+
+install:
+  - travis_retry composer install --no-interaction --prefer-source
+
+php:
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+notifications:
+  email: false
+  irc: "irc.freenode.org#phpunit"
diff --git a/vendor/sebastian/diff/LICENSE b/vendor/sebastian/diff/LICENSE
new file mode 100644
index 00000000..0941c065
--- /dev/null
+++ b/vendor/sebastian/diff/LICENSE
@@ -0,0 +1,33 @@
+Diff
+
+Copyright (c) 2002-2015, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/diff/README.md b/vendor/sebastian/diff/README.md
new file mode 100644
index 00000000..921957bf
--- /dev/null
+++ b/vendor/sebastian/diff/README.md
@@ -0,0 +1,126 @@
+# Diff
+
+Diff implementation for PHP, factored out of PHPUnit into a stand-alone component.
+
+## Installation
+
+To add this package as a local, per-project dependency to your project, simply add a dependency on `sebastian/diff` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Diff:
+
+    {
+        "require": {
+            "sebastian/diff": "*"
+        }
+    }
+
+### Usage
+
+The `Differ` class can be used to generate a textual representation of the difference between two strings:
+
+```php
+use SebastianBergmann\Diff\Differ;
+
+$differ = new Differ;
+print $differ->diff('foo', 'bar');
+```
+
+The code above yields the output below:
+
+    --- Original
+    +++ New
+    @@ @@
+    -foo
+    +bar
+
+The `Parser` class can be used to parse a unified diff into an object graph:
+
+```php
+use SebastianBergmann\Diff\Parser;
+use SebastianBergmann\Git;
+
+$git = new Git('/usr/local/src/money');
+
+$diff = $git->getDiff(
+  '948a1a07768d8edd10dcefa8315c1cbeffb31833',
+  'c07a373d2399f3e686234c4f7f088d635eb9641b'
+);
+
+$parser = new Parser;
+
+print_r($parser->parse($diff));
+```
+
+The code above yields the output below:
+
+    Array
+    (
+        [0] => SebastianBergmann\Diff\Diff Object
+            (
+                [from:SebastianBergmann\Diff\Diff:private] => a/tests/MoneyTest.php
+                [to:SebastianBergmann\Diff\Diff:private] => b/tests/MoneyTest.php
+                [chunks:SebastianBergmann\Diff\Diff:private] => Array
+                    (
+                        [0] => SebastianBergmann\Diff\Chunk Object
+                            (
+                                [start:SebastianBergmann\Diff\Chunk:private] => 87
+                                [startRange:SebastianBergmann\Diff\Chunk:private] => 7
+                                [end:SebastianBergmann\Diff\Chunk:private] => 87
+                                [endRange:SebastianBergmann\Diff\Chunk:private] => 7
+                                [lines:SebastianBergmann\Diff\Chunk:private] => Array
+                                    (
+                                        [0] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 3
+                                                [content:SebastianBergmann\Diff\Line:private] =>      * @covers SebastianBergmann\Money\Money::add
+                                            )
+
+                                        [1] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 3
+                                                [content:SebastianBergmann\Diff\Line:private] =>      * @covers SebastianBergmann\Money\Money::newMoney
+                                            )
+
+                                        [2] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 3
+                                                [content:SebastianBergmann\Diff\Line:private] =>      */
+                                            )
+
+                                        [3] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 2
+                                                [content:SebastianBergmann\Diff\Line:private] =>     public function testAnotherMoneyWithSameCurrencyObjectCanBeAdded()
+                                            )
+
+                                        [4] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 1
+                                                [content:SebastianBergmann\Diff\Line:private] =>     public function testAnotherMoneyObjectWithSameCurrencyCanBeAdded()
+                                            )
+
+                                        [5] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 3
+                                                [content:SebastianBergmann\Diff\Line:private] =>     {
+                                            )
+
+                                        [6] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 3
+                                                [content:SebastianBergmann\Diff\Line:private] =>         $a = new Money(1, new Currency('EUR'));
+                                            )
+
+                                        [7] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 3
+                                                [content:SebastianBergmann\Diff\Line:private] =>         $b = new Money(2, new Currency('EUR'));
+                                            )
+
+                                    )
+
+                            )
+
+                    )
+
+            )
+
+    )
diff --git a/vendor/sebastian/diff/build.xml b/vendor/sebastian/diff/build.xml
new file mode 100644
index 00000000..7366087d
--- /dev/null
+++ b/vendor/sebastian/diff/build.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="diff">
+ <target name="clean" description="Cleanup build artifacts">
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
+ </target>
+
+ <target name="composer" depends="clean" description="Install dependencies with Composer">
+  <tstamp>
+   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
+  </tstamp>
+  <delete>
+   <fileset dir="${basedir}">
+    <include name="composer.phar" />
+    <date datetime="${thirty.days.ago}" when="before"/>
+   </fileset>
+  </delete>
+
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
+
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
+  </exec>
+ </target>
+</project>
diff --git a/vendor/sebastian/diff/composer.json b/vendor/sebastian/diff/composer.json
new file mode 100644
index 00000000..3c04952d
--- /dev/null
+++ b/vendor/sebastian/diff/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "sebastian/diff",
+    "description": "Diff implementation",
+    "keywords": ["diff"],
+    "homepage": "http://www.github.com/sebastianbergmann/diff",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sebastian@phpunit.de"
+        },
+        {
+            "name": "Kore Nordmann",
+            "email": "mail@kore-nordmann.de"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.2"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.3-dev"
+        }
+    }
+}
diff --git a/vendor/sebastian/diff/phpunit.xml.dist b/vendor/sebastian/diff/phpunit.xml.dist
new file mode 100644
index 00000000..387a9b3d
--- /dev/null
+++ b/vendor/sebastian/diff/phpunit.xml.dist
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.2/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         verbose="true">
+  <testsuite name="Diff">
+    <directory suffix="Test.php">tests</directory>
+  </testsuite>
+
+  <filter>
+    <whitelist processUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">src</directory>
+    </whitelist>
+  </filter>
+</phpunit>
+
diff --git a/vendor/sebastian/diff/src/Chunk.php b/vendor/sebastian/diff/src/Chunk.php
new file mode 100644
index 00000000..79d13fc8
--- /dev/null
+++ b/vendor/sebastian/diff/src/Chunk.php
@@ -0,0 +1,110 @@
+<?php
+/*
+ * This file is part of the Diff package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Diff;
+
+/**
+ * @package    Diff
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Kore Nordmann <mail@kore-nordmann.de>
+ * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/diff
+ */
+class Chunk
+{
+    /**
+     * @var int
+     */
+    private $start;
+
+    /**
+     * @var int
+     */
+    private $startRange;
+
+    /**
+     * @var int
+     */
+    private $end;
+    /**
+     * @var int
+     */
+    private $endRange;
+
+    /**
+     * @var array
+     */
+    private $lines;
+
+    /**
+     * @param int   $start
+     * @param int   $startRange
+     * @param int   $end
+     * @param int   $endRange
+     * @param array $lines
+     */
+    public function __construct($start = 0, $startRange = 1, $end = 0, $endRange = 1, array $lines = array())
+    {
+        $this->start      = (int) $start;
+        $this->startRange = (int) $startRange;
+        $this->end        = (int) $end;
+        $this->endRange   = (int) $endRange;
+        $this->lines      = $lines;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStart()
+    {
+        return $this->start;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStartRange()
+    {
+        return $this->startRange;
+    }
+
+    /**
+     * @return int
+     */
+    public function getEnd()
+    {
+        return $this->end;
+    }
+
+    /**
+     * @return int
+     */
+    public function getEndRange()
+    {
+        return $this->endRange;
+    }
+
+    /**
+     * @return array
+     */
+    public function getLines()
+    {
+        return $this->lines;
+    }
+
+    /**
+     * @param array $lines
+     */
+    public function setLines(array $lines)
+    {
+        $this->lines = $lines;
+    }
+}
diff --git a/vendor/sebastian/diff/src/Diff.php b/vendor/sebastian/diff/src/Diff.php
new file mode 100644
index 00000000..45aaae6f
--- /dev/null
+++ b/vendor/sebastian/diff/src/Diff.php
@@ -0,0 +1,81 @@
+<?php
+/*
+ * This file is part of the Diff package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Diff;
+
+/**
+ * @package    Diff
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Kore Nordmann <mail@kore-nordmann.de>
+ * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/diff
+ */
+class Diff
+{
+    /**
+     * @var string
+     */
+    private $from;
+
+    /**
+     * @var string
+     */
+    private $to;
+
+    /**
+     * @var Chunk[]
+     */
+    private $chunks;
+
+    /**
+     * @param string  $from
+     * @param string  $to
+     * @param Chunk[] $chunks
+     */
+    public function __construct($from, $to, array $chunks = array())
+    {
+        $this->from   = $from;
+        $this->to     = $to;
+        $this->chunks = $chunks;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFrom()
+    {
+        return $this->from;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTo()
+    {
+        return $this->to;
+    }
+
+    /**
+     * @return Chunk[]
+     */
+    public function getChunks()
+    {
+        return $this->chunks;
+    }
+
+    /**
+     * @param Chunk[] $chunks
+     */
+    public function setChunks(array $chunks)
+    {
+        $this->chunks = $chunks;
+    }
+}
diff --git a/vendor/sebastian/diff/src/Differ.php b/vendor/sebastian/diff/src/Differ.php
new file mode 100644
index 00000000..76630ed2
--- /dev/null
+++ b/vendor/sebastian/diff/src/Differ.php
@@ -0,0 +1,256 @@
+<?php
+/*
+ * This file is part of the Diff package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Diff;
+
+use SebastianBergmann\Diff\LCS\LongestCommonSubsequence;
+use SebastianBergmann\Diff\LCS\TimeEfficientImplementation;
+use SebastianBergmann\Diff\LCS\MemoryEfficientImplementation;
+
+/**
+ * Diff implementation.
+ *
+ * @package    Diff
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Kore Nordmann <mail@kore-nordmann.de>
+ * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/diff
+ */
+class Differ
+{
+    /**
+     * @var string
+     */
+    private $header;
+
+    /**
+     * @param string $header
+     */
+    public function __construct($header = "--- Original\n+++ New\n")
+    {
+        $this->header = $header;
+    }
+
+    /**
+     * Returns the diff between two arrays or strings as string.
+     *
+     * @param  array|string             $from
+     * @param  array|string             $to
+     * @param  LongestCommonSubsequence $lcs
+     * @return string
+     */
+    public function diff($from, $to, LongestCommonSubsequence $lcs = null)
+    {
+        if (!is_array($from) && !is_string($from)) {
+            $from = (string) $from;
+        }
+
+        if (!is_array($to) && !is_string($to)) {
+            $to = (string) $to;
+        }
+
+        $buffer = $this->header;
+        $diff   = $this->diffToArray($from, $to, $lcs);
+
+        $inOld = false;
+        $i     = 0;
+        $old   = array();
+
+        foreach ($diff as $line) {
+            if ($line[1] ===  0 /* OLD */) {
+                if ($inOld === false) {
+                    $inOld = $i;
+                }
+            } elseif ($inOld !== false) {
+                if (($i - $inOld) > 5) {
+                    $old[$inOld] = $i - 1;
+                }
+
+                $inOld = false;
+            }
+
+            ++$i;
+        }
+
+        $start = isset($old[0]) ? $old[0] : 0;
+        $end   = count($diff);
+
+        if ($tmp = array_search($end, $old)) {
+            $end = $tmp;
+        }
+
+        $newChunk = true;
+
+        for ($i = $start; $i < $end; $i++) {
+            if (isset($old[$i])) {
+                $buffer  .= "\n";
+                $newChunk = true;
+                $i        = $old[$i];
+            }
+
+            if ($newChunk) {
+                $buffer  .= "@@ @@\n";
+                $newChunk = false;
+            }
+
+            if ($diff[$i][1] === 1 /* ADDED */) {
+                $buffer .= '+' . $diff[$i][0] . "\n";
+            } elseif ($diff[$i][1] === 2 /* REMOVED */) {
+                $buffer .= '-' . $diff[$i][0] . "\n";
+            } else {
+                $buffer .= ' ' . $diff[$i][0] . "\n";
+            }
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * Returns the diff between two arrays or strings as array.
+     *
+     * Each array element contains two elements:
+     *   - [0] => string $token
+     *   - [1] => 2|1|0
+     *
+     * - 2: REMOVED: $token was removed from $from
+     * - 1: ADDED: $token was added to $from
+     * - 0: OLD: $token is not changed in $to
+     *
+     * @param  array|string             $from
+     * @param  array|string             $to
+     * @param  LongestCommonSubsequence $lcs
+     * @return array
+     */
+    public function diffToArray($from, $to, LongestCommonSubsequence $lcs = null)
+    {
+        preg_match_all('(\r\n|\r|\n)', $from, $fromMatches);
+        preg_match_all('(\r\n|\r|\n)', $to, $toMatches);
+
+        if (is_string($from)) {
+            $from = preg_split('(\r\n|\r|\n)', $from);
+        }
+
+        if (is_string($to)) {
+            $to = preg_split('(\r\n|\r|\n)', $to);
+        }
+
+        $start      = array();
+        $end        = array();
+        $fromLength = count($from);
+        $toLength   = count($to);
+        $length     = min($fromLength, $toLength);
+
+        for ($i = 0; $i < $length; ++$i) {
+            if ($from[$i] === $to[$i]) {
+                $start[] = $from[$i];
+                unset($from[$i], $to[$i]);
+            } else {
+                break;
+            }
+        }
+
+        $length -= $i;
+
+        for ($i = 1; $i < $length; ++$i) {
+            if ($from[$fromLength - $i] === $to[$toLength - $i]) {
+                array_unshift($end, $from[$fromLength - $i]);
+                unset($from[$fromLength - $i], $to[$toLength - $i]);
+            } else {
+                break;
+            }
+        }
+
+        if ($lcs === null) {
+            $lcs = $this->selectLcsImplementation($from, $to);
+        }
+
+        $common = $lcs->calculate(array_values($from), array_values($to));
+        $diff   = array();
+
+        if (isset($fromMatches[0]) && $toMatches[0] &&
+            count($fromMatches[0]) === count($toMatches[0]) &&
+            $fromMatches[0] !== $toMatches[0]) {
+            $diff[] = array(
+              '#Warning: Strings contain different line endings!', 0
+            );
+        }
+
+        foreach ($start as $token) {
+            $diff[] = array($token, 0 /* OLD */);
+        }
+
+        reset($from);
+        reset($to);
+
+        foreach ($common as $token) {
+            while ((($fromToken = reset($from)) !== $token)) {
+                $diff[] = array(array_shift($from), 2 /* REMOVED */);
+            }
+
+            while ((($toToken = reset($to)) !== $token)) {
+                $diff[] = array(array_shift($to), 1 /* ADDED */);
+            }
+
+            $diff[] = array($token, 0 /* OLD */);
+
+            array_shift($from);
+            array_shift($to);
+        }
+
+        while (($token = array_shift($from)) !== null) {
+            $diff[] = array($token, 2 /* REMOVED */);
+        }
+
+        while (($token = array_shift($to)) !== null) {
+            $diff[] = array($token, 1 /* ADDED */);
+        }
+
+        foreach ($end as $token) {
+            $diff[] = array($token, 0 /* OLD */);
+        }
+
+        return $diff;
+    }
+
+    /**
+     * @param  array $from
+     * @param  array $to
+     * @return LongestCommonSubsequence
+     */
+    private function selectLcsImplementation(array $from, array $to)
+    {
+        // We do not want to use the time-efficient implementation if its memory
+        // footprint will probably exceed this value. Note that the footprint
+        // calculation is only an estimation for the matrix and the LCS method
+        // will typically allocate a bit more memory than this.
+        $memoryLimit = 100 * 1024 * 1024;
+
+        if ($this->calculateEstimatedFootprint($from, $to) > $memoryLimit) {
+            return new MemoryEfficientImplementation;
+        }
+
+        return new TimeEfficientImplementation;
+    }
+
+    /**
+     * Calculates the estimated memory footprint for the DP-based method.
+     *
+     * @param  array $from
+     * @param  array $to
+     * @return integer
+     */
+    private function calculateEstimatedFootprint(array $from, array $to)
+    {
+        $itemSize = PHP_INT_SIZE == 4 ? 76 : 144;
+
+        return $itemSize * pow(min(count($from), count($to)), 2);
+    }
+}
diff --git a/vendor/sebastian/diff/src/LCS/LongestCommonSubsequence.php b/vendor/sebastian/diff/src/LCS/LongestCommonSubsequence.php
new file mode 100644
index 00000000..80364745
--- /dev/null
+++ b/vendor/sebastian/diff/src/LCS/LongestCommonSubsequence.php
@@ -0,0 +1,33 @@
+<?php
+/*
+ * This file is part of the Diff package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Diff\LCS;
+
+/**
+ * Interface for implementations of longest common subsequence calculation.
+ *
+ * @package    Diff
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Kore Nordmann <mail@kore-nordmann.de>
+ * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/diff
+ */
+interface LongestCommonSubsequence
+{
+    /**
+     * Calculates the longest common subsequence of two arrays.
+     *
+     * @param  array $from
+     * @param  array $to
+     * @return array
+     */
+    public function calculate(array $from, array $to);
+}
diff --git a/vendor/sebastian/diff/src/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php b/vendor/sebastian/diff/src/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php
new file mode 100644
index 00000000..6213607a
--- /dev/null
+++ b/vendor/sebastian/diff/src/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php
@@ -0,0 +1,98 @@
+<?php
+/*
+ * This file is part of the Diff package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Diff\LCS;
+
+/**
+ * Memory-efficient implementation of longest common subsequence calculation.
+ *
+ * @package    Diff
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Denes Lados <lados.denes@gmail.com>
+ * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/diff
+ */
+class MemoryEfficientImplementation implements LongestCommonSubsequence
+{
+    /**
+     * Calculates the longest common subsequence of two arrays.
+     *
+     * @param  array $from
+     * @param  array $to
+     * @return array
+     */
+    public function calculate(array $from, array $to)
+    {
+        $cFrom = count($from);
+        $cTo   = count($to);
+
+        if ($cFrom == 0) {
+            return array();
+        } elseif ($cFrom == 1) {
+            if (in_array($from[0], $to)) {
+                return array($from[0]);
+            } else {
+                return array();
+            }
+        } else {
+            $i         = intval($cFrom / 2);
+            $fromStart = array_slice($from, 0, $i);
+            $fromEnd   = array_slice($from, $i);
+            $llB       = $this->length($fromStart, $to);
+            $llE       = $this->length(array_reverse($fromEnd), array_reverse($to));
+            $jMax      = 0;
+            $max       = 0;
+
+            for ($j = 0; $j <= $cTo; $j++) {
+                $m = $llB[$j] + $llE[$cTo - $j];
+
+                if ($m >= $max) {
+                    $max  = $m;
+                    $jMax = $j;
+                }
+            }
+
+            $toStart = array_slice($to, 0, $jMax);
+            $toEnd   = array_slice($to, $jMax);
+
+            return array_merge(
+                $this->calculate($fromStart, $toStart),
+                $this->calculate($fromEnd, $toEnd)
+            );
+        }
+    }
+
+    /**
+     * @param array $from
+     * @param array $to
+     * @return array
+     */
+    private function length(array $from, array $to)
+    {
+        $current = array_fill(0, count($to) + 1, 0);
+        $cFrom   = count($from);
+        $cTo     = count($to);
+
+        for ($i = 0; $i < $cFrom; $i++) {
+            $prev = $current;
+
+            for ($j = 0; $j < $cTo; $j++) {
+                if ($from[$i] == $to[$j]) {
+                    $current[$j + 1] = $prev[$j] + 1;
+                } else {
+                    $current[$j + 1] = max($current[$j], $prev[$j + 1]);
+                }
+            }
+        }
+
+        return $current;
+    }
+}
diff --git a/vendor/sebastian/diff/src/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php b/vendor/sebastian/diff/src/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php
new file mode 100644
index 00000000..b569586d
--- /dev/null
+++ b/vendor/sebastian/diff/src/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php
@@ -0,0 +1,79 @@
+<?php
+/*
+ * This file is part of the Diff package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Diff\LCS;
+
+/**
+ * Time-efficient implementation of longest common subsequence calculation.
+ *
+ * @package    Diff
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Kore Nordmann <mail@kore-nordmann.de>
+ * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/diff
+ */
+class TimeEfficientImplementation implements LongestCommonSubsequence
+{
+    /**
+     * Calculates the longest common subsequence of two arrays.
+     *
+     * @param  array $from
+     * @param  array $to
+     * @return array
+     */
+    public function calculate(array $from, array $to)
+    {
+        $common     = array();
+        $fromLength = count($from);
+        $toLength   = count($to);
+        $width      = $fromLength + 1;
+        $matrix     = new \SplFixedArray($width * ($toLength + 1));
+
+        for ($i = 0; $i <= $fromLength; ++$i) {
+            $matrix[$i] = 0;
+        }
+
+        for ($j = 0; $j <= $toLength; ++$j) {
+            $matrix[$j * $width] = 0;
+        }
+
+        for ($i = 1; $i <= $fromLength; ++$i) {
+            for ($j = 1; $j <= $toLength; ++$j) {
+                $o = ($j * $width) + $i;
+                $matrix[$o] = max(
+                    $matrix[$o - 1],
+                    $matrix[$o - $width],
+                    $from[$i - 1] === $to[$j - 1] ? $matrix[$o - $width - 1] + 1 : 0
+                );
+            }
+        }
+
+        $i = $fromLength;
+        $j = $toLength;
+
+        while ($i > 0 && $j > 0) {
+            if ($from[$i-1] === $to[$j-1]) {
+                $common[] = $from[$i-1];
+                --$i;
+                --$j;
+            } else {
+                $o = ($j * $width) + $i;
+                if ($matrix[$o - $width] > $matrix[$o - 1]) {
+                    --$j;
+                } else {
+                    --$i;
+                }
+            }
+        }
+
+        return array_reverse($common);
+    }
+}
diff --git a/vendor/sebastian/diff/src/Line.php b/vendor/sebastian/diff/src/Line.php
new file mode 100644
index 00000000..28c66aa2
--- /dev/null
+++ b/vendor/sebastian/diff/src/Line.php
@@ -0,0 +1,62 @@
+<?php
+/*
+ * This file is part of the Diff package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Diff;
+
+/**
+ * @package    Diff
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Kore Nordmann <mail@kore-nordmann.de>
+ * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/diff
+ */
+class Line
+{
+    const ADDED = 1;
+    const REMOVED = 2;
+    const UNCHANGED = 3;
+
+    /**
+     * @var int
+     */
+    private $type;
+
+    /**
+     * @var string
+     */
+    private $content;
+
+    /**
+     * @param int    $type
+     * @param string $content
+     */
+    public function __construct($type = self::UNCHANGED, $content = '')
+    {
+        $this->type    = $type;
+        $this->content = $content;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContent()
+    {
+        return $this->content;
+    }
+
+    /**
+     * @return int
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+}
diff --git a/vendor/sebastian/diff/src/Parser.php b/vendor/sebastian/diff/src/Parser.php
new file mode 100644
index 00000000..79e2413e
--- /dev/null
+++ b/vendor/sebastian/diff/src/Parser.php
@@ -0,0 +1,105 @@
+<?php
+/*
+ * This file is part of the Diff package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Diff;
+
+/**
+ * Unified diff parser.
+ *
+ * @package    Diff
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Kore Nordmann <mail@kore-nordmann.de>
+ * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/diff
+ */
+class Parser
+{
+    /**
+     * @param  string $string
+     * @return Diff[]
+     */
+    public function parse($string)
+    {
+        $lines     = preg_split('(\r\n|\r|\n)', $string);
+        $lineCount = count($lines);
+        $diffs     = array();
+        $diff      = null;
+        $collected = array();
+
+        for ($i = 0; $i < $lineCount; ++$i) {
+            if (preg_match('(^---\\s+(?P<file>\\S+))', $lines[$i], $fromMatch) &&
+                preg_match('(^\\+\\+\\+\\s+(?P<file>\\S+))', $lines[$i + 1], $toMatch)) {
+                if ($diff !== null) {
+                    $this->parseFileDiff($diff, $collected);
+                    $diffs[]   = $diff;
+                    $collected = array();
+                }
+
+                $diff = new Diff($fromMatch['file'], $toMatch['file']);
+                ++$i;
+            } else {
+                if (preg_match('/^(?:diff --git |index [\da-f\.]+|[+-]{3} [ab])/', $lines[$i])) {
+                    continue;
+                }
+                $collected[] = $lines[$i];
+            }
+        }
+
+        if (count($collected) && ($diff !== null)) {
+            $this->parseFileDiff($diff, $collected);
+            $diffs[] = $diff;
+        }
+
+        return $diffs;
+    }
+
+    /**
+     * @param Diff  $diff
+     * @param array $lines
+     */
+    private function parseFileDiff(Diff $diff, array $lines)
+    {
+        $chunks = array();
+
+        foreach ($lines as $line) {
+            if (preg_match('/^@@\s+-(?P<start>\d+)(?:,\s*(?P<startrange>\d+))?\s+\+(?P<end>\d+)(?:,\s*(?P<endrange>\d+))?\s+@@/', $line, $match)) {
+                $chunk = new Chunk(
+                    $match['start'],
+                    isset($match['startrange']) ? max(1, $match['startrange']) : 1,
+                    $match['end'],
+                    isset($match['endrange']) ? max(1, $match['endrange']) : 1
+                );
+
+                $chunks[] = $chunk;
+                $diffLines = array();
+                continue;
+            }
+
+            if (preg_match('/^(?P<type>[+ -])?(?P<line>.*)/', $line, $match)) {
+                $type = Line::UNCHANGED;
+
+                if ($match['type'] == '+') {
+                    $type = Line::ADDED;
+                } elseif ($match['type'] == '-') {
+                    $type = Line::REMOVED;
+                }
+
+                $diffLines[] = new Line($type, $match['line']);
+
+                if (isset($chunk)) {
+                    $chunk->setLines($diffLines);
+                }
+            }
+        }
+
+        $diff->setChunks($chunks);
+    }
+}
diff --git a/vendor/sebastian/diff/tests/DifferTest.php b/vendor/sebastian/diff/tests/DifferTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..a786325bc1b8beae1133a7e459df7563585fa218
GIT binary patch
literal 11371
zcmeHNZExC05YAWpD^@5{NPq-GAgRgqk|tEGl$IzV_X(+5>?K$Qo3odsxhVhrW_E33
zgN<<tSL^OvskrNTdFEwzW_Nq``*bu_jt&%ZKzbw7B|~$}2>ec|!-+j4e8k9=IUK@(
z{+&LsL!d<BlD<#w*nqm+q!#(WoQDauEOO@hW9J}vW|{oZVDCMikG3P^4QJyq(e3H8
zV?K;Hp_W0$rp_!EG+RU4nNV)pR)tK*jKbKX$({t?_2<jZ*Sij?7clvVa`Hr7Vwf&>
z%)yK^gFKmh1k_-HYtI~=fg(eoK2j8mPM8aZusL)ec^{2zE6NNM-h8^b2jt&AIzazq
zJKw+cn9DB#OIv&o?2a(^uP^WVU)aQUo;$;#shiB=pC@3$1YU$isoXtt!V-BEeN0_f
z1cNyUh_D}=S%$j;ukxZ0cy!wW^4rdr?jM~i@*AnQL&FzWS7J~N4|cDSt_BW4{-Xnk
zIX(yE{E<2y25;y{{7xP7k#a_M4e%p#JjSVGbEachhBHgYs1ld)`)O%kFiCVMco!p9
zeJ`0ovjri?h@d3={<;hVGL%jTbsYK({Ore6DDps&bNLzb!g?UPL&u&ZeByTS!JwSp
zIQFAyFh@%E{}qtv_9Js#gal7QB1qtxhSv1#3q+WS9}{UsDtNLyzt09RcjoTpkQhSa
zEt@*b^;54qL{OL1`oL}>XPCo`dlx(tQFE=k(S$8Y?*`7TNJqjCw-X`=Dast)`Ey3c
zZYj(d4zLWg=bDlTj*wXqagSh%0@~kCNe4gPn@<N0v+bv|;U7(d9w6RG7KFoy6KO;7
z-)P|ft?R(bg0jh#U_nt%)`A68|MAser8iQOVg2=BLC<n7{8KB!0+6-C?^WqF>T{~s
zE@v*cC!ZLFqABX<y~~W{{sn72G!5a-rL=c>f7k1NA)h)ISDo8Es9jPUbPis>6RDQL
zM{F&M5#IB2a(>>os<dyF2YstpiO_mIm#nI#J-SyRdxJe$pix$|Xij4~hTij(xn1b>
zo!*FAqJOxsj62ah38QZiX^h#js;@AkTCI{U^!cVm#{j-uCSTc8-|`JoVXVGv&~md-
zQY)k$XHo&1(*ky;(T)!T5*}YF5P~Pt@gYl4;>G86y1g6fK+B_Ppx$Mu@klAe`B>7G
zM6jTO`W?!?Qg~4cg<Zk!Cy=CV<2W>NvoVLn@+hkB1*MdODFrk!Q3&LNDk%bJ3tk(&
z2v7LNw|ptL9mZ#lCHvu0B=H1abO`e;VR-&Yq^QfrLrwEGCHv8gMpAsFBuM58>>H3=
zY*yxJAgLh3m)TKA1T4~mq{!F;Ujp!iVHD^C#5tG6AU&YZV9_AnBz-$J(Ye>x3X(pj
z&tMa3iG)Oi31meEHx(y3m^*$gqo^@w$Yd3;MJy0zp|r^8=IjdcX+5(-e#m52tW_Xv
zD^`U-Zqq7M6TvTIwJoc%=ingZh)mH+Fl>vK83xOoi6NG3)(K^?kpq#D@p;8a>xJf<
z{GYFb#gyhJzMGTT7nhQ6S`^bj3<L^&sRt7<Hd%4ffKX^`%ldM6>&?bEhrF#!qyqtO
zlwqxo_lcOlk?fKP-?p}=gF!5VL@aS`L4*;2>y?=_C<r1M3a(KRrC!{&0!26kuq68>
z0nK(i18`t1lHS4Jh5ecDi45!2+?DeMYiU;z-mk!FCHE1q7cuGB{EHdipgDzo!`azc
zr+ckXP1RmZt=8^p^%JeQVryK~8rqAiH5yuRX9d{~9t9TLt_ITVv2n<MaQs(8O=07<
z#{_5m0aG)DNgvIu?{2Y85u0blX`&UENL|#L!i*K71>KIz;jXLLHZ>LCAJ>wRgvf8H
z^}vv)fhMo;l;nXUcV9sRU?;gXAP&SIqxe({#-_!DbB+V&B!~DKh>Kc1EyPH+!{J;Y
z0NzRlE{Nfl3GSmr5`gwPJgTY|+pp-@l}Yy&M8fac5CIx|1fqKG5H)g!=+%$g#-~~H
z4bx1mWtnF!B+fL?PP5H3b)B{J7o_$76Ky!`$1Fy2=F6#{gNX*ISyt6L{E?83b2j%)
zt@-N_fs?A?xV7>J=_DVJu++jM3ft+ghvXH1AJMzqA%bF(hkir^O@s|=t>{QLUTf8p
zHxyee(ChcK*^8~<Sih+~*-}&ch8A)jvb;34VMO_8YQu<fQfr~o!e&G+kol;!VJGFF
z)-EjBIViQT4TpLr9tDms@G3NV4_PP_yn8u#D~Piz?-Zg?uc^n-I#g@Nq;{$`RjpP(
zY_-(W*6B(89VyouwHln&z*V$&0+GPbM21GqXMii~s#<A~vRXM7xAA2RB6KKyi+FuX
z{2MYhD=G+TRZa!xYI@Khd&7u0zZZhR@T-?dFuL+hfIq1;L3XRsk|0(xkg_*v;w8fg
f7rK20|7X`bZYu2tuj1qh&Z7zi{7c?DzbbzN(hb7J

literal 0
HcmV?d00001

diff --git a/vendor/sebastian/diff/tests/LCS/TimeEfficientImplementationTest.php b/vendor/sebastian/diff/tests/LCS/TimeEfficientImplementationTest.php
new file mode 100644
index 00000000..babc4076
--- /dev/null
+++ b/vendor/sebastian/diff/tests/LCS/TimeEfficientImplementationTest.php
@@ -0,0 +1,175 @@
+<?php
+/*
+ * This file is part of the Diff package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Diff\LCS;
+
+use PHPUnit_Framework_TestCase;
+
+/**
+ * Some of these tests are volontary stressfull, in order to give some approximative benchmark hints.
+ */
+class TimeEfficientImplementationTest extends PHPUnit_Framework_TestCase
+{
+    private $implementation;
+    private $memory_limit;
+    private $stress_sizes = array(1, 2, 3, 100, 500, 1000, 2000);
+
+    protected function setUp()
+    {
+        $this->memory_limit = ini_get('memory_limit');
+        ini_set('memory_limit', '256M');
+
+        $this->implementation = new TimeEfficientImplementation;
+    }
+
+    protected function tearDown()
+    {
+        ini_set('memory_limit', $this->memory_limit);
+    }
+
+    public function testBothEmpty()
+    {
+        $from   = array();
+        $to     = array();
+        $common = $this->implementation->calculate($from, $to);
+
+        $this->assertEquals(array(), $common);
+    }
+
+    public function testIsStrictComparison()
+    {
+        $from = array(
+            false, 0, 0.0, '', null, array(),
+            true, 1, 1.0, 'foo', array('foo', 'bar'), array('foo' => 'bar')
+        );
+        $to = $from;
+        $common = $this->implementation->calculate($from, $to);
+
+        $this->assertEquals($from, $common);
+
+        $to = array(
+            false, false, false, false, false, false,
+            true, true, true, true, true, true
+        );
+        $expected = array(
+            false,
+            true,
+        );
+        $common = $this->implementation->calculate($from, $to);
+
+        $this->assertEquals($expected, $common);
+    }
+
+    public function testEqualSequences()
+    {
+        foreach ($this->stress_sizes as $size) {
+            $range  = range(1, $size);
+            $from   = $range;
+            $to     = $range;
+            $common = $this->implementation->calculate($from, $to);
+
+            $this->assertEquals($range, $common);
+        }
+    }
+
+    public function testDistinctSequences()
+    {
+        $from  = array('A');
+        $to    = array('B');
+        $common = $this->implementation->calculate($from, $to);
+        $this->assertEquals(array(), $common);
+
+        $from  = array('A', 'B', 'C');
+        $to    = array('D', 'E', 'F');
+        $common = $this->implementation->calculate($from, $to);
+        $this->assertEquals(array(), $common);
+
+        foreach ($this->stress_sizes as $size) {
+            $from  = range(1, $size);
+            $to    = range($size + 1, $size * 2);
+            $common = $this->implementation->calculate($from, $to);
+            $this->assertEquals(array(), $common);
+        }
+    }
+
+    public function testCommonSubsequence()
+    {
+        $from     = array('A',      'C',      'E', 'F', 'G'     );
+        $to       = array('A', 'B',      'D', 'E',           'H');
+        $expected = array('A',                'E'               );
+        $common   = $this->implementation->calculate($from, $to);
+        $this->assertEquals($expected, $common);
+
+        $from     = array('A',      'C',      'E', 'F', 'G'     );
+        $to       = array(     'B', 'C', 'D', 'E', 'F',      'H');
+        $expected = array('C',                'E', 'F'          );
+        $common   = $this->implementation->calculate($from, $to);
+        $this->assertEquals($expected, $common);
+
+        foreach ($this->stress_sizes as $size) {
+            $from     = $size < 2 ? array(1) : range(1, $size + 1, 2);
+            $to       = $size < 3 ? array(1) : range(1, $size + 1, 3);
+            $expected = $size < 6 ? array(1) : range(1, $size + 1, 6);
+            $common   = $this->implementation->calculate($from, $to);
+
+            $this->assertEquals($expected, $common);
+        }
+    }
+
+    public function testSingleElementSubsequenceAtStart()
+    {
+        foreach ($this->stress_sizes as $size) {
+            $from   = range(1, $size);
+            $to     = array_slice($from, 0, 1);
+            $common = $this->implementation->calculate($from, $to);
+
+            $this->assertEquals($to, $common);
+        }
+    }
+
+    public function testSingleElementSubsequenceAtMiddle()
+    {
+        foreach ($this->stress_sizes as $size) {
+            $from   = range(1, $size);
+            $to     = array_slice($from, (int) $size / 2, 1);
+            $common = $this->implementation->calculate($from, $to);
+
+            $this->assertEquals($to, $common);
+        }
+    }
+
+    public function testSingleElementSubsequenceAtEnd()
+    {
+        foreach ($this->stress_sizes as $size) {
+            $from   = range(1, $size);
+            $to     = array_slice($from, $size - 1, 1);
+            $common = $this->implementation->calculate($from, $to);
+
+            $this->assertEquals($to, $common);
+        }
+    }
+
+    public function testReversedSequences()
+    {
+        $from     = array('A', 'B');
+        $to       = array('B', 'A');
+        $expected = array('A');
+        $common   = $this->implementation->calculate($from, $to);
+        $this->assertEquals($expected, $common);
+
+        foreach ($this->stress_sizes as $size) {
+            $from   = range(1, $size);
+            $to     = array_reverse($from);
+            $common = $this->implementation->calculate($from, $to);
+
+            $this->assertEquals(array(1), $common);
+        }
+    }
+}
diff --git a/vendor/sebastian/diff/tests/ParserTest.php b/vendor/sebastian/diff/tests/ParserTest.php
new file mode 100644
index 00000000..3a7b9720
--- /dev/null
+++ b/vendor/sebastian/diff/tests/ParserTest.php
@@ -0,0 +1,62 @@
+<?php
+/*
+ * This file is part of the Diff package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Diff;
+
+use PHPUnit_Framework_TestCase;
+
+class ParserTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Parser
+     */
+    private $parser;
+
+    protected function setUp()
+    {
+        $this->parser = new Parser;
+    }
+
+    public function testParse()
+    {
+        $content = file_get_contents(__DIR__ . '/fixtures/patch.txt');
+
+        $diffs = $this->parser->parse($content);
+
+        $this->assertCount(1, $diffs);
+
+        $chunks = $diffs[0]->getChunks();
+        $this->assertCount(1, $chunks);
+
+        $this->assertEquals(20, $chunks[0]->getStart());
+
+        $this->assertCount(5, $chunks[0]->getLines());
+    }
+
+    public function testParseWithMultipleChunks()
+    {
+        $content = file_get_contents(__DIR__ . '/fixtures/patch2.txt');
+
+        $diffs = $this->parser->parse($content);
+
+        $this->assertCount(1, $diffs);
+
+        $chunks = $diffs[0]->getChunks();
+        $this->assertCount(3, $chunks);
+
+        $this->assertEquals(20, $chunks[0]->getStart());
+        $this->assertEquals(320, $chunks[1]->getStart());
+        $this->assertEquals(600, $chunks[2]->getStart());
+
+        $this->assertCount(5, $chunks[0]->getLines());
+        $this->assertCount(5, $chunks[1]->getLines());
+        $this->assertCount(5, $chunks[2]->getLines());
+    }
+}
diff --git a/vendor/sebastian/diff/tests/fixtures/patch.txt b/vendor/sebastian/diff/tests/fixtures/patch.txt
new file mode 100644
index 00000000..144b61d0
--- /dev/null
+++ b/vendor/sebastian/diff/tests/fixtures/patch.txt
@@ -0,0 +1,9 @@
+diff --git a/Foo.php b/Foo.php
+index abcdefg..abcdefh 100644
+--- a/Foo.php
++++ b/Foo.php
+@@ -20,4 +20,5 @@ class Foo
+     const ONE = 1;
+     const TWO = 2;
++    const THREE = 3;
+     const FOUR = 4;
diff --git a/vendor/sebastian/diff/tests/fixtures/patch2.txt b/vendor/sebastian/diff/tests/fixtures/patch2.txt
new file mode 100644
index 00000000..41fbc959
--- /dev/null
+++ b/vendor/sebastian/diff/tests/fixtures/patch2.txt
@@ -0,0 +1,21 @@
+diff --git a/Foo.php b/Foo.php
+index abcdefg..abcdefh 100644
+--- a/Foo.php
++++ b/Foo.php
+@@ -20,4 +20,5 @@ class Foo
+     const ONE = 1;
+     const TWO = 2;
++    const THREE = 3;
+     const FOUR = 4;
+
+@@ -320,4 +320,5 @@ class Foo
+     const A = 'A';
+     const B = 'B';
++    const C = 'C';
+     const D = 'D';
+
+@@ -600,4 +600,5 @@ class Foo
+     public function doSomething() {
+
++        return 'foo';
+     }
diff --git a/vendor/sebastian/environment/.gitignore b/vendor/sebastian/environment/.gitignore
new file mode 100644
index 00000000..57948548
--- /dev/null
+++ b/vendor/sebastian/environment/.gitignore
@@ -0,0 +1,5 @@
+/.idea
+/vendor
+/composer.lock
+/composer.phar
+/phpunit.xml
diff --git a/vendor/sebastian/environment/.travis.yml b/vendor/sebastian/environment/.travis.yml
new file mode 100644
index 00000000..76a9bde4
--- /dev/null
+++ b/vendor/sebastian/environment/.travis.yml
@@ -0,0 +1,16 @@
+language: php
+
+before_script:
+  - composer self-update
+  - composer install --no-interaction --prefer-source --dev
+
+php:
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+notifications:
+  email: false
diff --git a/vendor/sebastian/environment/LICENSE b/vendor/sebastian/environment/LICENSE
new file mode 100644
index 00000000..08539af4
--- /dev/null
+++ b/vendor/sebastian/environment/LICENSE
@@ -0,0 +1,33 @@
+Environment
+
+Copyright (c) 2014-2015, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/environment/README.md b/vendor/sebastian/environment/README.md
new file mode 100644
index 00000000..5f3cb3b9
--- /dev/null
+++ b/vendor/sebastian/environment/README.md
@@ -0,0 +1,72 @@
+# Environment
+
+This component provides functionality that helps writing PHP code that has runtime-specific (PHP / HHVM) execution paths.
+
+[![Latest Stable Version](https://poser.pugx.org/sebastian/environment/v/stable.png)](https://packagist.org/packages/sebastian/environment)
+[![Build Status](https://travis-ci.org/sebastianbergmann/environment.png?branch=master)](https://travis-ci.org/sebastianbergmann/environment)
+
+## Installation
+
+To add Environment as a local, per-project dependency to your project, simply add a dependency on `sebastian/environment` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Environment 1.0:
+
+    {
+        "require": {
+            "sebastian/environment": "1.0.*"
+        }
+    }
+
+## Usage
+
+```php
+<?php
+use SebastianBergmann\Environment\Runtime;
+
+$runtime = new Runtime;
+
+var_dump($runtime->getNameWithVersion());
+var_dump($runtime->getName());
+var_dump($runtime->getVersion());
+var_dump($runtime->getBinary());
+var_dump($runtime->isHHVM());
+var_dump($runtime->isPHP());
+var_dump($runtime->hasXdebug());
+var_dump($runtime->canCollectCodeCoverage());
+```
+
+### Output on PHP
+
+    $ php --version
+    PHP 5.5.8 (cli) (built: Jan  9 2014 08:33:30)
+    Copyright (c) 1997-2013 The PHP Group
+    Zend Engine v2.5.0, Copyright (c) 1998-2013 Zend Technologies
+        with Xdebug v2.2.3, Copyright (c) 2002-2013, by Derick Rethans
+
+
+    $ php example.php
+    string(9) "PHP 5.5.8"
+    string(3) "PHP"
+    string(5) "5.5.8"
+    string(14) "'/usr/bin/php'"
+    bool(false)
+    bool(true)
+    bool(true)
+    bool(true)
+
+### Output on HHVM
+
+    $ hhvm --version
+    HipHop VM 2.4.0-dev (rel)
+    Compiler: heads/master-0-ga98e57cabee7e7f0d14493ab17d5c7ab0157eb98
+    Repo schema: 8d6e69287c41c1f09bb4d327421720d1922cfc67
+
+
+    $ hhvm example.php
+    string(14) "HHVM 2.4.0-dev"
+    string(4) "HHVM"
+    string(9) "2.4.0-dev"
+    string(42) "'/usr/local/src/hhvm/hphp/hhvm/hhvm' --php"
+    bool(true)
+    bool(false)
+    bool(false)
+    bool(true)
+
diff --git a/vendor/sebastian/environment/build.xml b/vendor/sebastian/environment/build.xml
new file mode 100644
index 00000000..92fb1c54
--- /dev/null
+++ b/vendor/sebastian/environment/build.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="environment">
+ <target name="clean" description="Cleanup build artifacts">
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
+ </target>
+
+ <target name="composer" depends="clean" description="Install dependencies with Composer">
+  <tstamp>
+   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
+  </tstamp>
+  <delete>
+   <fileset dir="${basedir}">
+    <include name="composer.phar" />
+    <date datetime="${thirty.days.ago}" when="before"/>
+   </fileset>
+  </delete>
+
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
+
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
+  </exec>
+ </target>
+</project>
diff --git a/vendor/sebastian/environment/composer.json b/vendor/sebastian/environment/composer.json
new file mode 100644
index 00000000..fd3ec7dc
--- /dev/null
+++ b/vendor/sebastian/environment/composer.json
@@ -0,0 +1,29 @@
+{
+    "name": "sebastian/environment",
+    "description": "Provides functionality to handle HHVM/PHP environments",
+    "keywords": ["environment","hhvm","xdebug"],
+    "homepage": "http://www.github.com/sebastianbergmann/environment",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sebastian@phpunit.de"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.4"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.3.x-dev"
+        }
+    }
+}
diff --git a/vendor/sebastian/environment/phpunit.xml.dist b/vendor/sebastian/environment/phpunit.xml.dist
new file mode 100644
index 00000000..75148fde
--- /dev/null
+++ b/vendor/sebastian/environment/phpunit.xml.dist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         checkForUnintentionallyCoveredCode="true"
+         verbose="true">
+ <testsuites>
+  <testsuite name="Environment">
+   <directory>tests</directory>
+  </testsuite>
+ </testsuites>
+ <filter>
+  <whitelist addUncoveredFilesFromWhitelist="true">
+   <directory>src</directory>
+  </whitelist>
+ </filter>
+</phpunit>
diff --git a/vendor/sebastian/environment/src/Console.php b/vendor/sebastian/environment/src/Console.php
new file mode 100644
index 00000000..9f15d547
--- /dev/null
+++ b/vendor/sebastian/environment/src/Console.php
@@ -0,0 +1,81 @@
+<?php
+/*
+ * This file is part of the Environment package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Environment;
+
+/**
+ */
+class Console
+{
+    const STDIN  = 0;
+    const STDOUT = 1;
+    const STDERR = 2;
+
+    /**
+     * Returns true if STDOUT supports colorization.
+     *
+     * This code has been copied and adapted from
+     * Symfony\Component\Console\Output\OutputStream.
+     *
+     * @return bool
+     */
+    public function hasColorSupport()
+    {
+        if (DIRECTORY_SEPARATOR == '\\') {
+            return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI');
+        }
+
+        if (!defined('STDOUT')) {
+            return false;
+        }
+
+        return $this->isInteractive(STDOUT);
+    }
+
+    /**
+     * Returns the number of columns of the terminal.
+     *
+     * @return int
+     */
+    public function getNumberOfColumns()
+    {
+        // Windows terminals have a fixed size of 80
+        // but one column is used for the cursor.
+        if (DIRECTORY_SEPARATOR == '\\') {
+            return 79;
+        }
+
+        if (!$this->isInteractive(self::STDIN)) {
+            return 80;
+        }
+
+        if (preg_match('#\d+ (\d+)#', shell_exec('stty size'), $match) === 1) {
+            return (int) $match[1];
+        }
+
+        if (preg_match('#columns = (\d+);#', shell_exec('stty'), $match) === 1) {
+            return (int) $match[1];
+        }
+
+        return 80;
+    }
+
+    /**
+     * Returns if the file descriptor is an interactive terminal or not.
+     *
+     * @param int|resource $fileDescriptor
+     *
+     * @return bool
+     */
+    public function isInteractive($fileDescriptor = self::STDOUT)
+    {
+        return function_exists('posix_isatty') && @posix_isatty($fileDescriptor);
+    }
+}
diff --git a/vendor/sebastian/environment/src/Runtime.php b/vendor/sebastian/environment/src/Runtime.php
new file mode 100644
index 00000000..f12071a6
--- /dev/null
+++ b/vendor/sebastian/environment/src/Runtime.php
@@ -0,0 +1,192 @@
+<?php
+/*
+ * This file is part of the Environment package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Environment;
+
+/**
+ * Utility class for HHVM/PHP environment handling.
+ */
+class Runtime
+{
+    /**
+     * @var string
+     */
+    private static $binary;
+
+    /**
+     * Returns true when Xdebug is supported or
+     * the runtime used is PHPDBG (PHP >= 7.0).
+     *
+     * @return bool
+     */
+    public function canCollectCodeCoverage()
+    {
+        return $this->hasXdebug() || $this->hasPHPDBGCodeCoverage();
+    }
+
+    /**
+     * Returns the path to the binary of the current runtime.
+     * Appends ' --php' to the path when the runtime is HHVM.
+     *
+     * @return string
+     */
+    public function getBinary()
+    {
+        // HHVM
+        if (self::$binary === null && $this->isHHVM()) {
+            if ((self::$binary = getenv('PHP_BINARY')) === false) {
+                self::$binary = PHP_BINARY;
+            }
+
+            self::$binary = escapeshellarg(self::$binary) . ' --php';
+        }
+
+        // PHP >= 5.4.0
+        if (self::$binary === null && defined('PHP_BINARY')) {
+            self::$binary = escapeshellarg(PHP_BINARY);
+        }
+
+        // PHP < 5.4.0
+        if (self::$binary === null) {
+            if (PHP_SAPI == 'cli' && isset($_SERVER['_'])) {
+                if (strpos($_SERVER['_'], 'phpunit') !== false) {
+                    $file = file($_SERVER['_']);
+
+                    if (strpos($file[0], ' ') !== false) {
+                        $tmp          = explode(' ', $file[0]);
+                        self::$binary = escapeshellarg(trim($tmp[1]));
+                    } else {
+                        self::$binary = escapeshellarg(ltrim(trim($file[0]), '#!'));
+                    }
+                } elseif (strpos(basename($_SERVER['_']), 'php') !== false) {
+                    self::$binary = escapeshellarg($_SERVER['_']);
+                }
+            }
+        }
+
+        if (self::$binary === null) {
+            $possibleBinaryLocations = array(
+                PHP_BINDIR . '/php',
+                PHP_BINDIR . '/php-cli.exe',
+                PHP_BINDIR . '/php.exe'
+            );
+
+            foreach ($possibleBinaryLocations as $binary) {
+                if (is_readable($binary)) {
+                    self::$binary = escapeshellarg($binary);
+                    break;
+                }
+            }
+        }
+
+        if (self::$binary === null) {
+            self::$binary = 'php';
+        }
+
+        return self::$binary;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNameWithVersion()
+    {
+        return $this->getName() . ' ' . $this->getVersion();
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        if ($this->isHHVM()) {
+            return 'HHVM';
+        } elseif ($this->isPHPDBG()) {
+            return 'PHPDBG';
+        } else {
+            return 'PHP';
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getVendorUrl()
+    {
+        if ($this->isHHVM()) {
+            return 'http://hhvm.com/';
+        } else {
+            return 'http://php.net/';
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getVersion()
+    {
+        if ($this->isHHVM()) {
+            return HHVM_VERSION;
+        } else {
+            return PHP_VERSION;
+        }
+    }
+
+    /**
+     * Returns true when the runtime used is PHP and Xdebug is loaded.
+     *
+     * @return bool
+     */
+    public function hasXdebug()
+    {
+        return ($this->isPHP() || $this->isHHVM()) && extension_loaded('xdebug');
+    }
+
+    /**
+     * Returns true when the runtime used is HHVM.
+     *
+     * @return bool
+     */
+    public function isHHVM()
+    {
+        return defined('HHVM_VERSION');
+    }
+
+    /**
+     * Returns true when the runtime used is PHP without the PHPDBG SAPI.
+     *
+     * @return bool
+     */
+    public function isPHP()
+    {
+        return !$this->isHHVM() && !$this->isPHPDBG();
+    }
+
+    /**
+     * Returns true when the runtime used is PHP with the PHPDBG SAPI.
+     *
+     * @return bool
+     */
+    public function isPHPDBG()
+    {
+        return PHP_SAPI === 'phpdbg' && !$this->isHHVM();
+    }
+
+    /**
+     * Returns true when the runtime used is PHP with the PHPDBG SAPI
+     * and the phpdbg_*_oplog() functions are available (PHP >= 7.0).
+     *
+     * @return bool
+     */
+    public function hasPHPDBGCodeCoverage()
+    {
+        return $this->isPHPDBG() && function_exists('phpdbg_start_oplog');
+    }
+}
diff --git a/vendor/sebastian/environment/tests/ConsoleTest.php b/vendor/sebastian/environment/tests/ConsoleTest.php
new file mode 100644
index 00000000..6b40172b
--- /dev/null
+++ b/vendor/sebastian/environment/tests/ConsoleTest.php
@@ -0,0 +1,60 @@
+<?php
+/*
+ * This file is part of the Environment package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Environment;
+
+use PHPUnit_Framework_TestCase;
+
+class ConsoleTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \SebastianBergmann\Environment\Console
+     */
+    private $console;
+
+    protected function setUp()
+    {
+        $this->console = new Console;
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Console::isInteractive
+     */
+    public function testCanDetectIfStdoutIsInteractiveByDefault()
+    {
+        $this->assertInternalType('boolean', $this->console->isInteractive());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Console::isInteractive
+     */
+    public function testCanDetectIfFileDescriptorIsInteractive()
+    {
+        $this->assertInternalType('boolean', $this->console->isInteractive(STDOUT));
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Console::hasColorSupport
+     * @uses   \SebastianBergmann\Environment\Console::isInteractive
+     */
+    public function testCanDetectColorSupport()
+    {
+        $this->assertInternalType('boolean', $this->console->hasColorSupport());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Console::getNumberOfColumns
+     * @uses   \SebastianBergmann\Environment\Console::isInteractive
+     */
+    public function testCanDetectNumberOfColumns()
+    {
+        $this->assertInternalType('integer', $this->console->getNumberOfColumns());
+    }
+}
diff --git a/vendor/sebastian/environment/tests/RuntimeTest.php b/vendor/sebastian/environment/tests/RuntimeTest.php
new file mode 100644
index 00000000..8ea83730
--- /dev/null
+++ b/vendor/sebastian/environment/tests/RuntimeTest.php
@@ -0,0 +1,112 @@
+<?php
+/*
+ * This file is part of the Environment package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Environment;
+
+use PHPUnit_Framework_TestCase;
+
+class RuntimeTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \SebastianBergmann\Environment\Runtime
+     */
+    private $env;
+
+    protected function setUp()
+    {
+        $this->env = new Runtime;
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::canCollectCodeCoverage
+     * @uses   \SebastianBergmann\Environment\Runtime::hasXdebug
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     * @uses   \SebastianBergmann\Environment\Runtime::isPHP
+     */
+    public function testAbilityToCollectCodeCoverageCanBeAssessed()
+    {
+        $this->assertInternalType('boolean', $this->env->canCollectCodeCoverage());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::getBinary
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     */
+    public function testBinaryCanBeRetrieved()
+    {
+        $this->assertInternalType('string', $this->env->getBinary());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::isHHVM
+     */
+    public function testCanBeDetected()
+    {
+        $this->assertInternalType('boolean', $this->env->isHHVM());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::isPHP
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     */
+    public function testCanBeDetected2()
+    {
+        $this->assertInternalType('boolean', $this->env->isPHP());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::hasXdebug
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     * @uses   \SebastianBergmann\Environment\Runtime::isPHP
+     */
+    public function testXdebugCanBeDetected()
+    {
+        $this->assertInternalType('boolean', $this->env->hasXdebug());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::getNameWithVersion
+     * @uses   \SebastianBergmann\Environment\Runtime::getName
+     * @uses   \SebastianBergmann\Environment\Runtime::getVersion
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     * @uses   \SebastianBergmann\Environment\Runtime::isPHP
+     */
+    public function testNameAndVersionCanBeRetrieved()
+    {
+        $this->assertInternalType('string', $this->env->getNameWithVersion());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::getName
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     */
+    public function testNameCanBeRetrieved()
+    {
+        $this->assertInternalType('string', $this->env->getName());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::getVersion
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     */
+    public function testVersionCanBeRetrieved()
+    {
+        $this->assertInternalType('string', $this->env->getVersion());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::getVendorUrl
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     */
+    public function testVendorUrlCanBeRetrieved()
+    {
+        $this->assertInternalType('string', $this->env->getVendorUrl());
+    }
+}
diff --git a/vendor/sebastian/exporter/.gitignore b/vendor/sebastian/exporter/.gitignore
new file mode 100644
index 00000000..3beb10f9
--- /dev/null
+++ b/vendor/sebastian/exporter/.gitignore
@@ -0,0 +1,9 @@
+.idea
+phpunit.xml
+composer.lock
+composer.phar
+vendor/
+cache.properties
+build/LICENSE
+build/README.md
+build/*.tgz
diff --git a/vendor/sebastian/exporter/.travis.yml b/vendor/sebastian/exporter/.travis.yml
new file mode 100644
index 00000000..657519b1
--- /dev/null
+++ b/vendor/sebastian/exporter/.travis.yml
@@ -0,0 +1,23 @@
+language: php
+
+before_script:
+  - composer self-update
+  - composer install --no-interaction --prefer-source --dev
+
+php:
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+notifications:
+  email: false
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
+    on_success: always
+    on_failure: always
+    on_start: false
+
diff --git a/vendor/sebastian/exporter/LICENSE b/vendor/sebastian/exporter/LICENSE
new file mode 100644
index 00000000..55a13d47
--- /dev/null
+++ b/vendor/sebastian/exporter/LICENSE
@@ -0,0 +1,33 @@
+Exporter
+
+Copyright (c) 2002-2015, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/exporter/README.md b/vendor/sebastian/exporter/README.md
new file mode 100644
index 00000000..9a40a77b
--- /dev/null
+++ b/vendor/sebastian/exporter/README.md
@@ -0,0 +1,171 @@
+Exporter
+========
+
+[![Build Status](https://secure.travis-ci.org/sebastianbergmann/exporter.png?branch=master)](https://travis-ci.org/sebastianbergmann/exporter)
+
+This component provides the functionality to export PHP variables for visualization.
+
+## Usage
+
+Exporting:
+
+```php
+<?php
+use SebastianBergmann\Exporter\Exporter;
+
+$exporter = new Exporter;
+
+/*
+Exception Object &0000000078de0f0d000000002003a261 (
+    'message' => ''
+    'string' => ''
+    'code' => 0
+    'file' => '/home/sebastianbergmann/test.php'
+    'line' => 34
+    'trace' => Array &0 ()
+    'previous' => null
+)
+*/
+
+print $exporter->export(new Exception);
+```
+
+## Data Types
+
+Exporting simple types:
+
+```php
+<?php
+use SebastianBergmann\Exporter\Exporter;
+
+$exporter = new Exporter;
+
+// 46
+print $exporter->export(46);
+
+// 4.0
+print $exporter->export(4.0);
+
+// 'hello, world!'
+print $exporter->export('hello, world!');
+
+// false
+print $exporter->export(false);
+
+// NAN
+print $exporter->export(acos(8));
+
+// -INF
+print $exporter->export(log(0));
+
+// null
+print $exporter->export(null);
+
+// resource(13) of type (stream)
+print $exporter->export(fopen('php://stderr', 'w'));
+
+// Binary String: 0x000102030405
+print $exporter->export(chr(0) . chr(1) . chr(2) . chr(3) . chr(4) . chr(5));
+```
+
+Exporting complex types:
+
+```php
+<?php
+use SebastianBergmann\Exporter\Exporter;
+
+$exporter = new Exporter;
+
+/*
+Array &0 (
+    0 => Array &1 (
+        0 => 1
+        1 => 2
+        2 => 3
+    )
+    1 => Array &2 (
+        0 => ''
+        1 => 0
+        2 => false
+    )
+)
+*/
+
+print $exporter->export(array(array(1,2,3), array("",0,FALSE)));
+
+/*
+Array &0 (
+    'self' => Array &1 (
+        'self' => Array &1
+    )
+)
+*/
+
+$array = array();
+$array['self'] = &$array;
+print $exporter->export($array);
+
+/*
+stdClass Object &0000000003a66dcc0000000025e723e2 (
+    'self' => stdClass Object &0000000003a66dcc0000000025e723e2
+)
+*/
+
+$obj = new stdClass();
+$obj->self = $obj;
+print $exporter->export($obj);
+```
+
+Compact exports:
+
+```php
+<?php
+use SebastianBergmann\Exporter\Exporter;
+
+$exporter = new Exporter;
+
+// Array ()
+print $exporter->shortenedExport(array());
+
+// Array (...)
+print $exporter->shortenedExport(array(1,2,3,4,5));
+
+// stdClass Object ()
+print $exporter->shortenedExport(new stdClass);
+
+// Exception Object (...)
+print $exporter->shortenedExport(new Exception);
+
+// this\nis\na\nsuper\nlong\nstring\nt...\nspace
+print $exporter->shortenedExport(
+<<<LONG_STRING
+this
+is
+a
+super
+long
+string
+that
+wraps
+a
+lot
+and
+eats
+up
+a
+lot
+of
+space
+LONG_STRING
+);
+```
+
+## Installation
+
+To add Exporter as a local, per-project dependency to your project, simply add a dependency on `sebastian/exporter` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Exporter 1.0:
+
+    {
+        "require": {
+            "sebastian/exporter": "1.0.*"
+        }
+    }
diff --git a/vendor/sebastian/exporter/build.xml b/vendor/sebastian/exporter/build.xml
new file mode 100644
index 00000000..e66a71a6
--- /dev/null
+++ b/vendor/sebastian/exporter/build.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="exporter">
+ <target name="clean" description="Cleanup build artifacts">
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
+ </target>
+
+ <target name="composer" depends="clean" description="Install dependencies with Composer">
+  <tstamp>
+   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
+  </tstamp>
+  <delete>
+   <fileset dir="${basedir}">
+    <include name="composer.phar" />
+    <date datetime="${thirty.days.ago}" when="before"/>
+   </fileset>
+  </delete>
+
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
+
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
+  </exec>
+ </target>
+</project>
+
diff --git a/vendor/sebastian/exporter/composer.json b/vendor/sebastian/exporter/composer.json
new file mode 100644
index 00000000..723596e1
--- /dev/null
+++ b/vendor/sebastian/exporter/composer.json
@@ -0,0 +1,47 @@
+{
+    "name": "sebastian/exporter",
+    "description": "Provides the functionality to export PHP variables for visualization",
+    "keywords": ["exporter","export"],
+    "homepage": "http://www.github.com/sebastianbergmann/exporter",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sebastian@phpunit.de"
+        },
+        {
+            "name": "Jeff Welch",
+            "email": "whatthejeff@gmail.com"
+        },
+        {
+            "name": "Volker Dusch",
+            "email": "github@wallbash.com"
+        },
+        {
+            "name": "Adam Harvey",
+            "email": "aharvey@php.net"
+        },
+        {
+            "name": "Bernhard Schussek",
+            "email": "bschussek@2bepublished.at"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3",
+        "sebastian/recursion-context": "~1.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.4"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.2.x-dev"
+        }
+    }
+}
+
diff --git a/vendor/sebastian/exporter/phpunit.xml.dist b/vendor/sebastian/exporter/phpunit.xml.dist
new file mode 100644
index 00000000..8d85af64
--- /dev/null
+++ b/vendor/sebastian/exporter/phpunit.xml.dist
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         bootstrap="vendor/autoload.php"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         checkForUnintentionallyCoveredCode="true"
+         forceCoversAnnotation="true"
+         verbose="true">
+ <testsuites>
+  <testsuite name="exporter">
+   <directory>tests</directory>
+  </testsuite>
+ </testsuites>
+ <filter>
+  <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
+   <directory>src</directory>
+  </whitelist>
+ </filter>
+</phpunit>
+
diff --git a/vendor/sebastian/exporter/src/Exporter.php b/vendor/sebastian/exporter/src/Exporter.php
new file mode 100644
index 00000000..a9f5157c
--- /dev/null
+++ b/vendor/sebastian/exporter/src/Exporter.php
@@ -0,0 +1,296 @@
+<?php
+/*
+ * This file is part of the Exporter package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Exporter;
+
+use SebastianBergmann\RecursionContext\Context;
+
+/**
+ * A nifty utility for visualizing PHP variables.
+ *
+ * <code>
+ * <?php
+ * use SebastianBergmann\Exporter\Exporter;
+ *
+ * $exporter = new Exporter;
+ * print $exporter->export(new Exception);
+ * </code>
+ */
+class Exporter
+{
+    /**
+     * Exports a value as a string
+     *
+     * The output of this method is similar to the output of print_r(), but
+     * improved in various aspects:
+     *
+     *  - NULL is rendered as "null" (instead of "")
+     *  - TRUE is rendered as "true" (instead of "1")
+     *  - FALSE is rendered as "false" (instead of "")
+     *  - Strings are always quoted with single quotes
+     *  - Carriage returns and newlines are normalized to \n
+     *  - Recursion and repeated rendering is treated properly
+     *
+     * @param  mixed  $value
+     * @param  int    $indentation The indentation level of the 2nd+ line
+     * @return string
+     */
+    public function export($value, $indentation = 0)
+    {
+        return $this->recursiveExport($value, $indentation);
+    }
+
+    /**
+     * @param  mixed   $data
+     * @param  Context $context
+     * @return string
+     */
+    public function shortenedRecursiveExport(&$data, Context $context = null)
+    {
+        $result   = array();
+        $exporter = new self();
+
+        if (!$context) {
+            $context = new Context;
+        }
+
+        $context->add($data);
+
+        foreach ($data as $key => $value) {
+            if (is_array($value)) {
+                if ($context->contains($data[$key]) !== false) {
+                    $result[] = '*RECURSION*';
+                }
+
+                else {
+                    $result[] = sprintf(
+                        'array(%s)',
+                        $this->shortenedRecursiveExport($data[$key], $context)
+                    );
+                }
+            }
+
+            else {
+                $result[] = $exporter->shortenedExport($value);
+            }
+        }
+
+        return implode(', ', $result);
+    }
+
+    /**
+     * Exports a value into a single-line string
+     *
+     * The output of this method is similar to the output of
+     * SebastianBergmann\Exporter\Exporter::export. This method guarantees
+     * thought that the result contains now newlines.
+     *
+     * Newlines are replaced by the visible string '\n'. Contents of arrays
+     * and objects (if any) are replaced by '...'.
+     *
+     * @param  mixed  $value
+     * @return string
+     * @see    SebastianBergmann\Exporter\Exporter::export
+     */
+    public function shortenedExport($value)
+    {
+        if (is_string($value)) {
+            $string = $this->export($value);
+
+            if (strlen($string) > 40) {
+                $string = substr($string, 0, 30) . '...' . substr($string, -7);
+            }
+
+            return str_replace("\n", '\n', $string);
+        }
+
+        if (is_object($value)) {
+            return sprintf(
+                '%s Object (%s)',
+                get_class($value),
+                count($this->toArray($value)) > 0 ? '...' : ''
+            );
+        }
+
+        if (is_array($value)) {
+            return sprintf(
+                'Array (%s)',
+                count($value) > 0 ? '...' : ''
+            );
+        }
+
+        return $this->export($value);
+    }
+
+    /**
+     * Converts an object to an array containing all of its private, protected
+     * and public properties.
+     *
+     * @param  mixed $value
+     * @return array
+     */
+    public function toArray($value)
+    {
+        if (!is_object($value)) {
+            return (array) $value;
+        }
+
+        $array = array();
+
+        foreach ((array) $value as $key => $val) {
+            // properties are transformed to keys in the following way:
+            // private   $property => "\0Classname\0property"
+            // protected $property => "\0*\0property"
+            // public    $property => "property"
+            if (preg_match('/^\0.+\0(.+)$/', $key, $matches)) {
+                $key = $matches[1];
+            }
+
+            // See https://github.com/php/php-src/commit/5721132
+            if ($key === "\0gcdata") {
+                continue;
+            }
+
+            $array[$key] = $val;
+        }
+
+        // Some internal classes like SplObjectStorage don't work with the
+        // above (fast) mechanism nor with reflection in Zend.
+        // Format the output similarly to print_r() in this case
+        if ($value instanceof \SplObjectStorage) {
+            // However, the fast method does work in HHVM, and exposes the
+            // internal implementation. Hide it again.
+            if (property_exists('\SplObjectStorage', '__storage')) {
+                unset($array['__storage']);
+            } elseif (property_exists('\SplObjectStorage', 'storage')) {
+                unset($array['storage']);
+            }
+
+            if (property_exists('\SplObjectStorage', '__key')) {
+                unset($array['__key']);
+            }
+
+            foreach ($value as $key => $val) {
+                $array[spl_object_hash($val)] = array(
+                    'obj' => $val,
+                    'inf' => $value->getInfo(),
+                );
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * Recursive implementation of export
+     *
+     * @param  mixed                                       $value       The value to export
+     * @param  int                                         $indentation The indentation level of the 2nd+ line
+     * @param  \SebastianBergmann\RecursionContext\Context $processed   Previously processed objects
+     * @return string
+     * @see    SebastianBergmann\Exporter\Exporter::export
+     */
+    protected function recursiveExport(&$value, $indentation, $processed = null)
+    {
+        if ($value === null) {
+            return 'null';
+        }
+
+        if ($value === true) {
+            return 'true';
+        }
+
+        if ($value === false) {
+            return 'false';
+        }
+
+        if (is_float($value) && floatval(intval($value)) === $value) {
+            return "$value.0";
+        }
+
+        if (is_resource($value)) {
+            return sprintf(
+                'resource(%d) of type (%s)',
+                $value,
+                get_resource_type($value)
+            );
+        }
+
+        if (is_string($value)) {
+            // Match for most non printable chars somewhat taking multibyte chars into account
+            if (preg_match('/[^\x09-\x0d\x20-\xff]/', $value)) {
+                return 'Binary String: 0x' . bin2hex($value);
+            }
+
+            return "'" .
+            str_replace(array("\r\n", "\n\r", "\r"), array("\n", "\n", "\n"), $value) .
+            "'";
+        }
+
+        $whitespace = str_repeat(' ', 4 * $indentation);
+
+        if (!$processed) {
+            $processed = new Context;
+        }
+
+        if (is_array($value)) {
+            if (($key = $processed->contains($value)) !== false) {
+                return 'Array &' . $key;
+            }
+
+            $key    = $processed->add($value);
+            $values = '';
+
+            if (count($value) > 0) {
+                foreach ($value as $k => $v) {
+                    $values .= sprintf(
+                        '%s    %s => %s' . "\n",
+                        $whitespace,
+                        $this->recursiveExport($k, $indentation),
+                        $this->recursiveExport($value[$k], $indentation + 1, $processed)
+                    );
+                }
+
+                $values = "\n" . $values . $whitespace;
+            }
+
+            return sprintf('Array &%s (%s)', $key, $values);
+        }
+
+        if (is_object($value)) {
+            $class = get_class($value);
+
+            if ($hash = $processed->contains($value)) {
+                return sprintf('%s Object &%s', $class, $hash);
+            }
+
+            $hash   = $processed->add($value);
+            $values = '';
+            $array  = $this->toArray($value);
+
+            if (count($array) > 0) {
+                foreach ($array as $k => $v) {
+                    $values .= sprintf(
+                        '%s    %s => %s' . "\n",
+                        $whitespace,
+                        $this->recursiveExport($k, $indentation),
+                        $this->recursiveExport($v, $indentation + 1, $processed)
+                    );
+                }
+
+                $values = "\n" . $values . $whitespace;
+            }
+
+            return sprintf('%s Object &%s (%s)', $class, $hash, $values);
+        }
+
+        return var_export($value, true);
+    }
+}
diff --git a/vendor/sebastian/exporter/tests/ExporterTest.php b/vendor/sebastian/exporter/tests/ExporterTest.php
new file mode 100644
index 00000000..6b590bfb
--- /dev/null
+++ b/vendor/sebastian/exporter/tests/ExporterTest.php
@@ -0,0 +1,333 @@
+<?php
+/*
+ * This file is part of the Exporter package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Exporter;
+
+/**
+ * @covers SebastianBergmann\Exporter\Exporter
+ */
+class ExporterTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Exporter
+     */
+    private $exporter;
+
+    protected function setUp()
+    {
+        $this->exporter = new Exporter;
+    }
+
+    public function exportProvider()
+    {
+        $obj2 = new \stdClass;
+        $obj2->foo = 'bar';
+
+        $obj3 = (object)array(1,2,"Test\r\n",4,5,6,7,8);
+
+        $obj = new \stdClass;
+        //@codingStandardsIgnoreStart
+        $obj->null = null;
+        //@codingStandardsIgnoreEnd
+        $obj->boolean = true;
+        $obj->integer = 1;
+        $obj->double = 1.2;
+        $obj->string = '1';
+        $obj->text = "this\nis\na\nvery\nvery\nvery\nvery\nvery\nvery\rlong\n\rtext";
+        $obj->object = $obj2;
+        $obj->objectagain = $obj2;
+        $obj->array = array('foo' => 'bar');
+        $obj->self = $obj;
+
+        $storage = new \SplObjectStorage;
+        $storage->attach($obj2);
+        $storage->foo = $obj2;
+
+        return array(
+            array(null, 'null'),
+            array(true, 'true'),
+            array(false, 'false'),
+            array(1, '1'),
+            array(1.0, '1.0'),
+            array(1.2, '1.2'),
+            array(fopen('php://memory', 'r'), 'resource(%d) of type (stream)'),
+            array('1', "'1'"),
+            array(array(array(1,2,3), array(3,4,5)),
+        <<<EOF
+Array &0 (
+    0 => Array &1 (
+        0 => 1
+        1 => 2
+        2 => 3
+    )
+    1 => Array &2 (
+        0 => 3
+        1 => 4
+        2 => 5
+    )
+)
+EOF
+            ),
+            // \n\r and \r is converted to \n
+            array("this\nis\na\nvery\nvery\nvery\nvery\nvery\nvery\rlong\n\rtext",
+            <<<EOF
+'this
+is
+a
+very
+very
+very
+very
+very
+very
+long
+text'
+EOF
+            ),
+            array(new \stdClass, 'stdClass Object &%x ()'),
+            array($obj,
+            <<<EOF
+stdClass Object &%x (
+    'null' => null
+    'boolean' => true
+    'integer' => 1
+    'double' => 1.2
+    'string' => '1'
+    'text' => 'this
+is
+a
+very
+very
+very
+very
+very
+very
+long
+text'
+    'object' => stdClass Object &%x (
+        'foo' => 'bar'
+    )
+    'objectagain' => stdClass Object &%x
+    'array' => Array &%d (
+        'foo' => 'bar'
+    )
+    'self' => stdClass Object &%x
+)
+EOF
+            ),
+            array(array(), 'Array &%d ()'),
+            array($storage,
+            <<<EOF
+SplObjectStorage Object &%x (
+    'foo' => stdClass Object &%x (
+        'foo' => 'bar'
+    )
+    '%x' => Array &0 (
+        'obj' => stdClass Object &%x
+        'inf' => null
+    )
+)
+EOF
+            ),
+            array($obj3,
+            <<<EOF
+stdClass Object &%x (
+    0 => 1
+    1 => 2
+    2 => 'Test\n'
+    3 => 4
+    4 => 5
+    5 => 6
+    6 => 7
+    7 => 8
+)
+EOF
+            ),
+            array(
+                chr(0) . chr(1) . chr(2) . chr(3) . chr(4) . chr(5),
+                'Binary String: 0x000102030405'
+            ),
+            array(
+                implode('', array_map('chr', range(0x0e, 0x1f))),
+                'Binary String: 0x0e0f101112131415161718191a1b1c1d1e1f'
+            ),
+            array(
+                chr(0x00) . chr(0x09),
+                'Binary String: 0x0009'
+            ),
+            array(
+                '',
+                "''"
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider exportProvider
+     */
+    public function testExport($value, $expected)
+    {
+        $this->assertStringMatchesFormat(
+            $expected,
+            $this->trimNewline($this->exporter->export($value))
+        );
+    }
+
+    public function testExport2()
+    {
+        if (PHP_VERSION === '5.3.3') {
+            $this->markTestSkipped('Skipped due to "Nesting level too deep - recursive dependency?" fatal error');
+        }
+
+        $obj = new \stdClass;
+        $obj->foo = 'bar';
+
+        $array = array(
+            0 => 0,
+            'null' => null,
+            'boolean' => true,
+            'integer' => 1,
+            'double' => 1.2,
+            'string' => '1',
+            'text' => "this\nis\na\nvery\nvery\nvery\nvery\nvery\nvery\rlong\n\rtext",
+            'object' => $obj,
+            'objectagain' => $obj,
+            'array' => array('foo' => 'bar'),
+        );
+
+        $array['self'] = &$array;
+
+        $expected = <<<EOF
+Array &%d (
+    0 => 0
+    'null' => null
+    'boolean' => true
+    'integer' => 1
+    'double' => 1.2
+    'string' => '1'
+    'text' => 'this
+is
+a
+very
+very
+very
+very
+very
+very
+long
+text'
+    'object' => stdClass Object &%x (
+        'foo' => 'bar'
+    )
+    'objectagain' => stdClass Object &%x
+    'array' => Array &%d (
+        'foo' => 'bar'
+    )
+    'self' => Array &%d (
+        0 => 0
+        'null' => null
+        'boolean' => true
+        'integer' => 1
+        'double' => 1.2
+        'string' => '1'
+        'text' => 'this
+is
+a
+very
+very
+very
+very
+very
+very
+long
+text'
+        'object' => stdClass Object &%x
+        'objectagain' => stdClass Object &%x
+        'array' => Array &%d (
+            'foo' => 'bar'
+        )
+        'self' => Array &%d
+    )
+)
+EOF;
+
+        $this->assertStringMatchesFormat(
+            $expected,
+            $this->trimNewline($this->exporter->export($array))
+        );
+    }
+
+    public function shortenedExportProvider()
+    {
+        $obj = new \stdClass;
+        $obj->foo = 'bar';
+
+        $array = array(
+            'foo' => 'bar',
+        );
+
+        return array(
+            array(null, 'null'),
+            array(true, 'true'),
+            array(1, '1'),
+            array(1.0, '1.0'),
+            array(1.2, '1.2'),
+            array('1', "'1'"),
+            // \n\r and \r is converted to \n
+            array("this\nis\na\nvery\nvery\nvery\nvery\nvery\nvery\rlong\n\rtext", "'this\\nis\\na\\nvery\\nvery\\nvery\\nvery...g\\ntext'"),
+            array(new \stdClass, 'stdClass Object ()'),
+            array($obj, 'stdClass Object (...)'),
+            array(array(), 'Array ()'),
+            array($array, 'Array (...)'),
+        );
+    }
+
+    /**
+     * @dataProvider shortenedExportProvider
+     */
+    public function testShortenedExport($value, $expected)
+    {
+        $this->assertSame(
+            $expected,
+            $this->trimNewline($this->exporter->shortenedExport($value))
+        );
+    }
+
+    public function provideNonBinaryMultibyteStrings()
+    {
+        return array(
+            array(implode('', array_map('chr', range(0x09, 0x0d))), 5),
+            array(implode('', array_map('chr', range(0x20, 0x7f))), 96),
+            array(implode('', array_map('chr', range(0x80, 0xff))), 128),
+        );
+    }
+
+
+    /**
+     * @dataProvider provideNonBinaryMultibyteStrings
+     */
+    public function testNonBinaryStringExport($value, $expectedLength)
+    {
+        $this->assertRegExp(
+            "~'.{{$expectedLength}}'\$~s",
+            $this->exporter->export($value)
+        );
+    }
+
+    public function testNonObjectCanBeReturnedAsArray()
+    {
+        $this->assertEquals(array(true), $this->exporter->toArray(true));
+    }
+
+    private function trimNewline($string)
+    {
+        return preg_replace('/[ ]*\n/', "\n", $string);
+    }
+}
diff --git a/vendor/sebastian/recursion-context/.gitignore b/vendor/sebastian/recursion-context/.gitignore
new file mode 100644
index 00000000..3beb10f9
--- /dev/null
+++ b/vendor/sebastian/recursion-context/.gitignore
@@ -0,0 +1,9 @@
+.idea
+phpunit.xml
+composer.lock
+composer.phar
+vendor/
+cache.properties
+build/LICENSE
+build/README.md
+build/*.tgz
diff --git a/vendor/sebastian/recursion-context/.travis.yml b/vendor/sebastian/recursion-context/.travis.yml
new file mode 100644
index 00000000..c5952a11
--- /dev/null
+++ b/vendor/sebastian/recursion-context/.travis.yml
@@ -0,0 +1,21 @@
+language: php
+
+php:
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+sudo: false
+
+before_script:
+  - composer self-update
+  - composer install --no-interaction --prefer-source --dev
+
+script: ./vendor/bin/phpunit
+
+notifications:
+  email: false
+  irc: "irc.freenode.org#phpunit"
diff --git a/vendor/sebastian/recursion-context/LICENSE b/vendor/sebastian/recursion-context/LICENSE
new file mode 100644
index 00000000..f8c30c27
--- /dev/null
+++ b/vendor/sebastian/recursion-context/LICENSE
@@ -0,0 +1,33 @@
+Recursion Context
+
+Copyright (c) 2002-2015, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/recursion-context/README.md b/vendor/sebastian/recursion-context/README.md
new file mode 100644
index 00000000..bd43985c
--- /dev/null
+++ b/vendor/sebastian/recursion-context/README.md
@@ -0,0 +1,13 @@
+# Recursion Context
+
+...
+
+## Installation
+
+To add Recursion Context as a local, per-project dependency to your project, simply add a dependency on `sebastian/recursion-context` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Recursion Context 1.0:
+
+    {
+        "require": {
+            "sebastian/recursion-context": "~1.0"
+        }
+    }
diff --git a/vendor/sebastian/recursion-context/build.xml b/vendor/sebastian/recursion-context/build.xml
new file mode 100644
index 00000000..b4fd1935
--- /dev/null
+++ b/vendor/sebastian/recursion-context/build.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="recursion-context">
+ <target name="clean" description="Cleanup build artifacts">
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
+ </target>
+
+ <target name="composer" depends="clean" description="Install dependencies with Composer">
+  <tstamp>
+   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
+  </tstamp>
+  <delete>
+   <fileset dir="${basedir}">
+    <include name="composer.phar" />
+    <date datetime="${thirty.days.ago}" when="before"/>
+   </fileset>
+  </delete>
+
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
+
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
+  </exec>
+ </target>
+</project>
+
diff --git a/vendor/sebastian/recursion-context/composer.json b/vendor/sebastian/recursion-context/composer.json
new file mode 100644
index 00000000..fed033d2
--- /dev/null
+++ b/vendor/sebastian/recursion-context/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "sebastian/recursion-context",
+    "description": "Provides functionality to recursively process PHP variables",
+    "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sebastian@phpunit.de"
+        },
+        {
+            "name": "Jeff Welch",
+            "email": "whatthejeff@gmail.com"
+        },
+        {
+            "name": "Adam Harvey",
+            "email": "aharvey@php.net"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.4"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}
diff --git a/vendor/sebastian/recursion-context/phpunit.xml.dist b/vendor/sebastian/recursion-context/phpunit.xml.dist
new file mode 100644
index 00000000..757e3e60
--- /dev/null
+++ b/vendor/sebastian/recursion-context/phpunit.xml.dist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         bootstrap="vendor/autoload.php"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         checkForUnintentionallyCoveredCode="true"
+         forceCoversAnnotation="true"
+         verbose="true">
+<testsuites>
+  <testsuite name="recursion-context">
+   <directory>tests</directory>
+  </testsuite>
+ </testsuites>
+ <filter>
+  <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
+   <directory>src</directory>
+  </whitelist>
+ </filter>
+</phpunit>
diff --git a/vendor/sebastian/recursion-context/src/Context.php b/vendor/sebastian/recursion-context/src/Context.php
new file mode 100644
index 00000000..06bf6ce8
--- /dev/null
+++ b/vendor/sebastian/recursion-context/src/Context.php
@@ -0,0 +1,153 @@
+<?php
+/*
+ * This file is part of the Recursion Context package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\RecursionContext;
+
+/**
+ * A context containing previously processed arrays and objects
+ * when recursively processing a value.
+ */
+final class Context
+{
+    /**
+     * @var array[]
+     */
+    private $arrays;
+
+    /**
+     * @var \SplObjectStorage
+     */
+    private $objects;
+
+    /**
+     * Initialises the context
+     */
+    public function __construct()
+    {
+        $this->arrays  = array();
+        $this->objects = new \SplObjectStorage;
+    }
+
+    /**
+     * Adds a value to the context.
+     *
+     * @param  array|object             $value The value to add.
+     * @return int|string               The ID of the stored value, either as
+     *                                        a string or integer.
+     * @throws InvalidArgumentException Thrown if $value is not an array or
+     *                                        object
+     */
+    public function add(&$value)
+    {
+        if (is_array($value)) {
+            return $this->addArray($value);
+        }
+
+        else if (is_object($value)) {
+            return $this->addObject($value);
+        }
+
+        throw new InvalidArgumentException(
+            'Only arrays and objects are supported'
+        );
+    }
+
+    /**
+     * Checks if the given value exists within the context.
+     *
+     * @param  array|object             $value The value to check.
+     * @return int|string|false         The string or integer ID of the stored
+     *                                        value if it has already been seen, or
+     *                                        false if the value is not stored.
+     * @throws InvalidArgumentException Thrown if $value is not an array or
+     *                                        object
+     */
+    public function contains(&$value)
+    {
+        if (is_array($value)) {
+            return $this->containsArray($value);
+        }
+
+        else if (is_object($value)) {
+            return $this->containsObject($value);
+        }
+
+        throw new InvalidArgumentException(
+            'Only arrays and objects are supported'
+        );
+    }
+
+    /**
+     * @param  array    $array
+     * @return bool|int
+     */
+    private function addArray(array &$array)
+    {
+        $key = $this->containsArray($array);
+
+        if ($key !== false) {
+            return $key;
+        }
+
+        $this->arrays[] = &$array;
+
+        return count($this->arrays) - 1;
+    }
+
+    /**
+     * @param  object $object
+     * @return string
+     */
+    private function addObject($object)
+    {
+        if (!$this->objects->contains($object)) {
+            $this->objects->attach($object);
+        }
+
+        return spl_object_hash($object);
+    }
+
+    /**
+     * @param  array     $array
+     * @return int|false
+     */
+    private function containsArray(array &$array)
+    {
+        $keys = array_keys($this->arrays, $array, true);
+        $hash = '_Key_' . hash('sha512', microtime(true));
+
+        foreach ($keys as $key) {
+            $this->arrays[$key][$hash] = $hash;
+
+            if (isset($array[$hash]) && $array[$hash] === $hash) {
+                unset($this->arrays[$key][$hash]);
+
+                return $key;
+            }
+
+            unset($this->arrays[$key][$hash]);
+        }
+
+        return false;
+    }
+
+    /**
+     * @param  object       $value
+     * @return string|false
+     */
+    private function containsObject($value)
+    {
+        if ($this->objects->contains($value)) {
+            return spl_object_hash($value);
+        }
+
+        return false;
+    }
+}
diff --git a/vendor/sebastian/recursion-context/src/Exception.php b/vendor/sebastian/recursion-context/src/Exception.php
new file mode 100644
index 00000000..4a1557ba
--- /dev/null
+++ b/vendor/sebastian/recursion-context/src/Exception.php
@@ -0,0 +1,17 @@
+<?php
+/*
+ * This file is part of the Recursion Context package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\RecursionContext;
+
+/**
+ */
+interface Exception
+{
+}
diff --git a/vendor/sebastian/recursion-context/src/InvalidArgumentException.php b/vendor/sebastian/recursion-context/src/InvalidArgumentException.php
new file mode 100644
index 00000000..032c5043
--- /dev/null
+++ b/vendor/sebastian/recursion-context/src/InvalidArgumentException.php
@@ -0,0 +1,17 @@
+<?php
+/*
+ * This file is part of the Recursion Context package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\RecursionContext;
+
+/**
+ */
+final class InvalidArgumentException extends \InvalidArgumentException implements Exception
+{
+}
diff --git a/vendor/sebastian/recursion-context/tests/ContextTest.php b/vendor/sebastian/recursion-context/tests/ContextTest.php
new file mode 100644
index 00000000..8e8cc56f
--- /dev/null
+++ b/vendor/sebastian/recursion-context/tests/ContextTest.php
@@ -0,0 +1,144 @@
+<?php
+/*
+ * This file is part of the Recursion Context package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\RecursionContext;
+
+use PHPUnit_Framework_TestCase;
+
+/**
+ * @covers SebastianBergmann\RecursionContext\Context
+ */
+class ContextTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \SebastianBergmann\RecursionContext\Context
+     */
+    private $context;
+
+    protected function setUp()
+    {
+        $this->context = new Context();
+    }
+
+    public function failsProvider()
+    {
+        return array(
+            array(true),
+            array(false),
+            array(null),
+            array('string'),
+            array(1),
+            array(1.5),
+            array(fopen('php://memory', 'r'))
+        );
+    }
+
+    public function valuesProvider()
+    {
+        $obj2 = new \stdClass();
+        $obj2->foo = 'bar';
+
+        $obj3 = (object) array(1,2,"Test\r\n",4,5,6,7,8);
+
+        $obj = new \stdClass();
+        //@codingStandardsIgnoreStart
+        $obj->null = null;
+        //@codingStandardsIgnoreEnd
+        $obj->boolean = true;
+        $obj->integer = 1;
+        $obj->double = 1.2;
+        $obj->string = '1';
+        $obj->text = "this\nis\na\nvery\nvery\nvery\nvery\nvery\nvery\rlong\n\rtext";
+        $obj->object = $obj2;
+        $obj->objectagain = $obj2;
+        $obj->array = array('foo' => 'bar');
+        $obj->array2 = array(1,2,3,4,5,6);
+        $obj->array3 = array($obj, $obj2, $obj3);
+        $obj->self = $obj;
+
+        $storage = new \SplObjectStorage();
+        $storage->attach($obj2);
+        $storage->foo = $obj2;
+
+        return array(
+            array($obj, spl_object_hash($obj)),
+            array($obj2, spl_object_hash($obj2)),
+            array($obj3, spl_object_hash($obj3)),
+            array($storage, spl_object_hash($storage)),
+            array($obj->array, 0),
+            array($obj->array2, 0),
+            array($obj->array3, 0)
+        );
+    }
+
+    /**
+     * @covers       SebastianBergmann\RecursionContext\Context::add
+     * @uses         SebastianBergmann\RecursionContext\InvalidArgumentException
+     * @dataProvider failsProvider
+     */
+    public function testAddFails($value)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\RecursionContext\\Exception',
+          'Only arrays and objects are supported'
+        );
+        $this->context->add($value);
+    }
+
+    /**
+     * @covers       SebastianBergmann\RecursionContext\Context::contains
+     * @uses         SebastianBergmann\RecursionContext\InvalidArgumentException
+     * @dataProvider failsProvider
+     */
+    public function testContainsFails($value)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\RecursionContext\\Exception',
+          'Only arrays and objects are supported'
+        );
+        $this->context->contains($value);
+    }
+
+    /**
+     * @covers       SebastianBergmann\RecursionContext\Context::add
+     * @dataProvider valuesProvider
+     */
+    public function testAdd($value, $key)
+    {
+        $this->assertEquals($key, $this->context->add($value));
+
+        // Test we get the same key on subsequent adds
+        $this->assertEquals($key, $this->context->add($value));
+    }
+
+    /**
+     * @covers       SebastianBergmann\RecursionContext\Context::contains
+     * @uses         SebastianBergmann\RecursionContext\Context::add
+     * @depends      testAdd
+     * @dataProvider valuesProvider
+     */
+    public function testContainsFound($value, $key)
+    {
+        $this->context->add($value);
+        $this->assertEquals($key, $this->context->contains($value));
+
+        // Test we get the same key on subsequent calls
+        $this->assertEquals($key, $this->context->contains($value));
+    }
+
+    /**
+     * @covers       SebastianBergmann\RecursionContext\Context::contains
+     * @dataProvider valuesProvider
+     */
+    public function testContainsNotFound($value)
+    {
+        $this->assertFalse($this->context->contains($value));
+    }
+}
diff --git a/vendor/sebastian/version/.gitattributes b/vendor/sebastian/version/.gitattributes
new file mode 100644
index 00000000..461090b7
--- /dev/null
+++ b/vendor/sebastian/version/.gitattributes
@@ -0,0 +1 @@
+*.php diff=php
diff --git a/vendor/sebastian/version/.gitignore b/vendor/sebastian/version/.gitignore
new file mode 100644
index 00000000..a09c56df
--- /dev/null
+++ b/vendor/sebastian/version/.gitignore
@@ -0,0 +1 @@
+/.idea
diff --git a/vendor/sebastian/version/LICENSE b/vendor/sebastian/version/LICENSE
new file mode 100644
index 00000000..5b79c41f
--- /dev/null
+++ b/vendor/sebastian/version/LICENSE
@@ -0,0 +1,33 @@
+Version
+
+Copyright (c) 2013-2015, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/version/README.md b/vendor/sebastian/version/README.md
new file mode 100644
index 00000000..be6b687b
--- /dev/null
+++ b/vendor/sebastian/version/README.md
@@ -0,0 +1,37 @@
+# Version
+
+**Version** is a library that helps with managing the version number of Git-hosted PHP projects.
+
+## Installation
+
+Simply add a dependency on `sebastian/version` to your project's `composer.json` file if you use [Composer](http://getcomposer.org/) to manage the dependencies of your project.
+
+## Usage
+
+The constructor of the `SebastianBergmann\Version` class expects two parameters:
+
+* `$release` is the version number of the latest release (`X.Y.Z`, for instance) or the name of the release series (`X.Y`) when no release has been made from that branch / for that release series yet.
+* `$path` is the path to the directory (or a subdirectory thereof) where the sourcecode of the project can be found. Simply passing `__DIR__` here usually suffices.
+
+Apart from the constructor, the `SebastianBergmann\Version` class has a single public method: `getVersion()`.
+
+Here is a contrived example that shows the basic usage:
+
+    <?php
+    $version = new SebastianBergmann\Version(
+      '3.7.10', '/usr/local/src/phpunit'
+    );
+
+    var_dump($version->getVersion());
+    ?>
+
+    string(18) "3.7.10-17-g00f3408"
+
+When a new release is prepared, the string that is passed to the constructor as the first argument needs to be updated.
+
+### How SebastianBergmann\Version::getVersion() works
+
+* If `$path` is not (part of) a Git repository and `$release` is in `X.Y.Z` format then `$release` is returned as-is.
+* If `$path` is not (part of) a Git repository and `$release` is in `X.Y` format then `$release` is returned suffixed with `-dev`.
+* If `$path` is (part of) a Git repository and `$release` is in `X.Y.Z` format then the output of `git describe --tags` is returned as-is.
+* If `$path` is (part of) a Git repository and `$release` is in `X.Y` format then a string is returned that begins with `X.Y` and ends with information from `git describe --tags`.
diff --git a/vendor/sebastian/version/composer.json b/vendor/sebastian/version/composer.json
new file mode 100644
index 00000000..39d65697
--- /dev/null
+++ b/vendor/sebastian/version/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "sebastian/version",
+    "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+    "homepage": "https://github.com/sebastianbergmann/version",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sebastian@phpunit.de",
+            "role": "lead"
+        }
+    ],
+    "support": {
+        "issues": "https://github.com/sebastianbergmann/version/issues"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    }
+}
diff --git a/vendor/sebastian/version/src/Version.php b/vendor/sebastian/version/src/Version.php
new file mode 100644
index 00000000..3cb3e092
--- /dev/null
+++ b/vendor/sebastian/version/src/Version.php
@@ -0,0 +1,82 @@
+<?php
+/*
+ * This file is part of the Version package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann;
+
+/**
+ * @since Class available since Release 1.0.0
+ */
+class Version
+{
+    private $path;
+    private $release;
+    private $version;
+
+    /**
+     * @param string $release
+     * @param string $path
+     */
+    public function __construct($release, $path)
+    {
+        $this->release = $release;
+        $this->path    = $path;
+    }
+
+    /**
+     * @return string
+     */
+    public function getVersion()
+    {
+        if ($this->version === null) {
+            if (count(explode('.', $this->release)) == 3) {
+                $this->version = $this->release;
+            } else {
+                $this->version = $this->release . '-dev';
+            }
+
+            $git = $this->getGitInformation($this->path);
+
+            if ($git) {
+                if (count(explode('.', $this->release)) == 3) {
+                    $this->version = $git;
+                } else {
+                    $git = explode('-', $git);
+
+                    $this->version = $this->release . '-' . end($git);
+                }
+            }
+        }
+
+        return $this->version;
+    }
+
+    /**
+     * @param  string      $path
+     * @return bool|string
+     */
+    private function getGitInformation($path)
+    {
+        if (!is_dir($path . DIRECTORY_SEPARATOR . '.git')) {
+            return false;
+        }
+
+        $dir = getcwd();
+        chdir($path);
+        $returnCode = 1;
+        $result     = @exec('git describe --tags 2>&1', $output, $returnCode);
+        chdir($dir);
+
+        if ($returnCode !== 0) {
+            return false;
+        }
+
+        return $result;
+    }
+}
diff --git a/vendor/symfony/yaml/.gitignore b/vendor/symfony/yaml/.gitignore
new file mode 100644
index 00000000..c49a5d8d
--- /dev/null
+++ b/vendor/symfony/yaml/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/vendor/symfony/yaml/CHANGELOG.md b/vendor/symfony/yaml/CHANGELOG.md
new file mode 100644
index 00000000..096cf654
--- /dev/null
+++ b/vendor/symfony/yaml/CHANGELOG.md
@@ -0,0 +1,8 @@
+CHANGELOG
+=========
+
+2.1.0
+-----
+
+ * Yaml::parse() does not evaluate loaded files as PHP files by default
+   anymore (call Yaml::enablePhpParsing() to get back the old behavior)
diff --git a/vendor/symfony/yaml/Dumper.php b/vendor/symfony/yaml/Dumper.php
new file mode 100644
index 00000000..39cdcfc5
--- /dev/null
+++ b/vendor/symfony/yaml/Dumper.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml;
+
+/**
+ * Dumper dumps PHP variables to YAML strings.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Dumper
+{
+    /**
+     * The amount of spaces to use for indentation of nested nodes.
+     *
+     * @var int
+     */
+    protected $indentation = 4;
+
+    /**
+     * Sets the indentation.
+     *
+     * @param int $num The amount of spaces to use for indentation of nested nodes.
+     */
+    public function setIndentation($num)
+    {
+        $this->indentation = (int) $num;
+    }
+
+    /**
+     * Dumps a PHP value to YAML.
+     *
+     * @param mixed $input                  The PHP value
+     * @param int   $inline                 The level where you switch to inline YAML
+     * @param int   $indent                 The level of indentation (used internally)
+     * @param bool  $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param bool  $objectSupport          true if object support is enabled, false otherwise
+     *
+     * @return string The YAML representation of the PHP value
+     */
+    public function dump($input, $inline = 0, $indent = 0, $exceptionOnInvalidType = false, $objectSupport = false)
+    {
+        $output = '';
+        $prefix = $indent ? str_repeat(' ', $indent) : '';
+
+        if ($inline <= 0 || !is_array($input) || empty($input)) {
+            $output .= $prefix.Inline::dump($input, $exceptionOnInvalidType, $objectSupport);
+        } else {
+            $isAHash = array_keys($input) !== range(0, count($input) - 1);
+
+            foreach ($input as $key => $value) {
+                $willBeInlined = $inline - 1 <= 0 || !is_array($value) || empty($value);
+
+                $output .= sprintf('%s%s%s%s',
+                    $prefix,
+                    $isAHash ? Inline::dump($key, $exceptionOnInvalidType, $objectSupport).':' : '-',
+                    $willBeInlined ? ' ' : "\n",
+                    $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + $this->indentation, $exceptionOnInvalidType, $objectSupport)
+                ).($willBeInlined ? "\n" : '');
+            }
+        }
+
+        return $output;
+    }
+}
diff --git a/vendor/symfony/yaml/Escaper.php b/vendor/symfony/yaml/Escaper.php
new file mode 100644
index 00000000..ac325a2c
--- /dev/null
+++ b/vendor/symfony/yaml/Escaper.php
@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml;
+
+/**
+ * Escaper encapsulates escaping rules for single and double-quoted
+ * YAML strings.
+ *
+ * @author Matthew Lewinski <matthew@lewinski.org>
+ */
+class Escaper
+{
+    // Characters that would cause a dumped string to require double quoting.
+    const REGEX_CHARACTER_TO_ESCAPE = "[\\x00-\\x1f]|\xc2\x85|\xc2\xa0|\xe2\x80\xa8|\xe2\x80\xa9";
+
+    // Mapping arrays for escaping a double quoted string. The backslash is
+    // first to ensure proper escaping because str_replace operates iteratively
+    // on the input arrays. This ordering of the characters avoids the use of strtr,
+    // which performs more slowly.
+    private static $escapees = array('\\', '\\\\', '\\"', '"',
+                                     "\x00",  "\x01",  "\x02",  "\x03",  "\x04",  "\x05",  "\x06",  "\x07",
+                                     "\x08",  "\x09",  "\x0a",  "\x0b",  "\x0c",  "\x0d",  "\x0e",  "\x0f",
+                                     "\x10",  "\x11",  "\x12",  "\x13",  "\x14",  "\x15",  "\x16",  "\x17",
+                                     "\x18",  "\x19",  "\x1a",  "\x1b",  "\x1c",  "\x1d",  "\x1e",  "\x1f",
+                                     "\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9",);
+    private static $escaped = array('\\\\', '\\"', '\\\\', '\\"',
+                                     '\\0',   '\\x01', '\\x02', '\\x03', '\\x04', '\\x05', '\\x06', '\\a',
+                                     '\\b',   '\\t',   '\\n',   '\\v',   '\\f',   '\\r',   '\\x0e', '\\x0f',
+                                     '\\x10', '\\x11', '\\x12', '\\x13', '\\x14', '\\x15', '\\x16', '\\x17',
+                                     '\\x18', '\\x19', '\\x1a', '\\e',   '\\x1c', '\\x1d', '\\x1e', '\\x1f',
+                                     '\\N', '\\_', '\\L', '\\P',);
+
+    /**
+     * Determines if a PHP value would require double quoting in YAML.
+     *
+     * @param string $value A PHP value
+     *
+     * @return bool True if the value would require double quotes.
+     */
+    public static function requiresDoubleQuoting($value)
+    {
+        return preg_match('/'.self::REGEX_CHARACTER_TO_ESCAPE.'/u', $value);
+    }
+
+    /**
+     * Escapes and surrounds a PHP value with double quotes.
+     *
+     * @param string $value A PHP value
+     *
+     * @return string The quoted, escaped string
+     */
+    public static function escapeWithDoubleQuotes($value)
+    {
+        return sprintf('"%s"', str_replace(self::$escapees, self::$escaped, $value));
+    }
+
+    /**
+     * Determines if a PHP value would require single quoting in YAML.
+     *
+     * @param string $value A PHP value
+     *
+     * @return bool True if the value would require single quotes.
+     */
+    public static function requiresSingleQuoting($value)
+    {
+        // Determines if a PHP value is entirely composed of a value that would
+        // require single quoting in YAML.
+        if (in_array(strtolower($value), array('null', '~', 'true', 'false', 'y', 'n', 'yes', 'no', 'on', 'off'))) {
+            return true;
+        }
+
+        // Determines if the PHP value contains any single characters that would
+        // cause it to require single quoting in YAML.
+        return preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ \- ? | < > = ! % @ ` ]/x', $value);
+    }
+
+    /**
+     * Escapes and surrounds a PHP value with single quotes.
+     *
+     * @param string $value A PHP value
+     *
+     * @return string The quoted, escaped string
+     */
+    public static function escapeWithSingleQuotes($value)
+    {
+        return sprintf("'%s'", str_replace('\'', '\'\'', $value));
+    }
+}
diff --git a/vendor/symfony/yaml/Exception/DumpException.php b/vendor/symfony/yaml/Exception/DumpException.php
new file mode 100644
index 00000000..9b3e6de0
--- /dev/null
+++ b/vendor/symfony/yaml/Exception/DumpException.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml\Exception;
+
+/**
+ * Exception class thrown when an error occurs during dumping.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @api
+ */
+class DumpException extends RuntimeException
+{
+}
diff --git a/vendor/symfony/yaml/Exception/ExceptionInterface.php b/vendor/symfony/yaml/Exception/ExceptionInterface.php
new file mode 100644
index 00000000..92e5c2ea
--- /dev/null
+++ b/vendor/symfony/yaml/Exception/ExceptionInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml\Exception;
+
+/**
+ * Exception interface for all exceptions thrown by the component.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @api
+ */
+interface ExceptionInterface
+{
+}
diff --git a/vendor/symfony/yaml/Exception/ParseException.php b/vendor/symfony/yaml/Exception/ParseException.php
new file mode 100644
index 00000000..0447dff1
--- /dev/null
+++ b/vendor/symfony/yaml/Exception/ParseException.php
@@ -0,0 +1,148 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml\Exception;
+
+/**
+ * Exception class thrown when an error occurs during parsing.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @api
+ */
+class ParseException extends RuntimeException
+{
+    private $parsedFile;
+    private $parsedLine;
+    private $snippet;
+    private $rawMessage;
+
+    /**
+     * Constructor.
+     *
+     * @param string     $message    The error message
+     * @param int        $parsedLine The line where the error occurred
+     * @param int        $snippet    The snippet of code near the problem
+     * @param string     $parsedFile The file name where the error occurred
+     * @param \Exception $previous   The previous exception
+     */
+    public function __construct($message, $parsedLine = -1, $snippet = null, $parsedFile = null, \Exception $previous = null)
+    {
+        $this->parsedFile = $parsedFile;
+        $this->parsedLine = $parsedLine;
+        $this->snippet = $snippet;
+        $this->rawMessage = $message;
+
+        $this->updateRepr();
+
+        parent::__construct($this->message, 0, $previous);
+    }
+
+    /**
+     * Gets the snippet of code near the error.
+     *
+     * @return string The snippet of code
+     */
+    public function getSnippet()
+    {
+        return $this->snippet;
+    }
+
+    /**
+     * Sets the snippet of code near the error.
+     *
+     * @param string $snippet The code snippet
+     */
+    public function setSnippet($snippet)
+    {
+        $this->snippet = $snippet;
+
+        $this->updateRepr();
+    }
+
+    /**
+     * Gets the filename where the error occurred.
+     *
+     * This method returns null if a string is parsed.
+     *
+     * @return string The filename
+     */
+    public function getParsedFile()
+    {
+        return $this->parsedFile;
+    }
+
+    /**
+     * Sets the filename where the error occurred.
+     *
+     * @param string $parsedFile The filename
+     */
+    public function setParsedFile($parsedFile)
+    {
+        $this->parsedFile = $parsedFile;
+
+        $this->updateRepr();
+    }
+
+    /**
+     * Gets the line where the error occurred.
+     *
+     * @return int The file line
+     */
+    public function getParsedLine()
+    {
+        return $this->parsedLine;
+    }
+
+    /**
+     * Sets the line where the error occurred.
+     *
+     * @param int $parsedLine The file line
+     */
+    public function setParsedLine($parsedLine)
+    {
+        $this->parsedLine = $parsedLine;
+
+        $this->updateRepr();
+    }
+
+    private function updateRepr()
+    {
+        $this->message = $this->rawMessage;
+
+        $dot = false;
+        if ('.' === substr($this->message, -1)) {
+            $this->message = substr($this->message, 0, -1);
+            $dot = true;
+        }
+
+        if (null !== $this->parsedFile) {
+            if (PHP_VERSION_ID >= 50400) {
+                $jsonOptions = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
+            } else {
+                $jsonOptions = 0;
+            }
+            $this->message .= sprintf(' in %s', json_encode($this->parsedFile, $jsonOptions));
+        }
+
+        if ($this->parsedLine >= 0) {
+            $this->message .= sprintf(' at line %d', $this->parsedLine);
+        }
+
+        if ($this->snippet) {
+            $this->message .= sprintf(' (near "%s")', $this->snippet);
+        }
+
+        if ($dot) {
+            $this->message .= '.';
+        }
+    }
+}
diff --git a/vendor/symfony/yaml/Exception/RuntimeException.php b/vendor/symfony/yaml/Exception/RuntimeException.php
new file mode 100644
index 00000000..3573bf15
--- /dev/null
+++ b/vendor/symfony/yaml/Exception/RuntimeException.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml\Exception;
+
+/**
+ * Exception class thrown when an error occurs during parsing.
+ *
+ * @author Romain Neutron <imprec@gmail.com>
+ *
+ * @api
+ */
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/symfony/yaml/Inline.php b/vendor/symfony/yaml/Inline.php
new file mode 100644
index 00000000..6e3877bf
--- /dev/null
+++ b/vendor/symfony/yaml/Inline.php
@@ -0,0 +1,546 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml;
+
+use Symfony\Component\Yaml\Exception\ParseException;
+use Symfony\Component\Yaml\Exception\DumpException;
+
+/**
+ * Inline implements a YAML parser/dumper for the YAML inline syntax.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Inline
+{
+    const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
+
+    private static $exceptionOnInvalidType = false;
+    private static $objectSupport = false;
+    private static $objectForMap = false;
+
+    /**
+     * Converts a YAML string to a PHP array.
+     *
+     * @param string $value                  A YAML string
+     * @param bool   $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param bool   $objectSupport          true if object support is enabled, false otherwise
+     * @param bool   $objectForMap           true if maps should return a stdClass instead of array()
+     * @param array  $references             Mapping of variable names to values
+     *
+     * @return array A PHP array representing the YAML string
+     *
+     * @throws ParseException
+     */
+    public static function parse($value, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false, $references = array())
+    {
+        self::$exceptionOnInvalidType = $exceptionOnInvalidType;
+        self::$objectSupport = $objectSupport;
+        self::$objectForMap = $objectForMap;
+
+        $value = trim($value);
+
+        if ('' === $value) {
+            return '';
+        }
+
+        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('ASCII');
+        }
+
+        $i = 0;
+        switch ($value[0]) {
+            case '[':
+                $result = self::parseSequence($value, $i, $references);
+                ++$i;
+                break;
+            case '{':
+                $result = self::parseMapping($value, $i, $references);
+                ++$i;
+                break;
+            default:
+                $result = self::parseScalar($value, null, array('"', "'"), $i, true, $references);
+        }
+
+        // some comments are allowed at the end
+        if (preg_replace('/\s+#.*$/A', '', substr($value, $i))) {
+            throw new ParseException(sprintf('Unexpected characters near "%s".', substr($value, $i)));
+        }
+
+        if (isset($mbEncoding)) {
+            mb_internal_encoding($mbEncoding);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Dumps a given PHP variable to a YAML string.
+     *
+     * @param mixed $value                  The PHP variable to convert
+     * @param bool  $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param bool  $objectSupport          true if object support is enabled, false otherwise
+     *
+     * @return string The YAML string representing the PHP array
+     *
+     * @throws DumpException When trying to dump PHP resource
+     */
+    public static function dump($value, $exceptionOnInvalidType = false, $objectSupport = false)
+    {
+        switch (true) {
+            case is_resource($value):
+                if ($exceptionOnInvalidType) {
+                    throw new DumpException(sprintf('Unable to dump PHP resources in a YAML file ("%s").', get_resource_type($value)));
+                }
+
+                return 'null';
+            case is_object($value):
+                if ($objectSupport) {
+                    return '!!php/object:'.serialize($value);
+                }
+
+                if ($exceptionOnInvalidType) {
+                    throw new DumpException('Object support when dumping a YAML file has been disabled.');
+                }
+
+                return 'null';
+            case is_array($value):
+                return self::dumpArray($value, $exceptionOnInvalidType, $objectSupport);
+            case null === $value:
+                return 'null';
+            case true === $value:
+                return 'true';
+            case false === $value:
+                return 'false';
+            case ctype_digit($value):
+                return is_string($value) ? "'$value'" : (int) $value;
+            case is_numeric($value):
+                $locale = setlocale(LC_NUMERIC, 0);
+                if (false !== $locale) {
+                    setlocale(LC_NUMERIC, 'C');
+                }
+                if (is_float($value)) {
+                    $repr = (string) $value;
+                    if (is_infinite($value)) {
+                        $repr = str_ireplace('INF', '.Inf', $repr);
+                    } elseif (floor($value) == $value && $repr == $value) {
+                        // Preserve float data type since storing a whole number will result in integer value.
+                        $repr = '!!float '.$repr;
+                    }
+                } else {
+                    $repr = is_string($value) ? "'$value'" : (string) $value;
+                }
+                if (false !== $locale) {
+                    setlocale(LC_NUMERIC, $locale);
+                }
+
+                return $repr;
+            case '' == $value:
+                return "''";
+            case Escaper::requiresDoubleQuoting($value):
+                return Escaper::escapeWithDoubleQuotes($value);
+            case Escaper::requiresSingleQuoting($value):
+            case preg_match(self::getHexRegex(), $value):
+            case preg_match(self::getTimestampRegex(), $value):
+                return Escaper::escapeWithSingleQuotes($value);
+            default:
+                return $value;
+        }
+    }
+
+    /**
+     * Dumps a PHP array to a YAML string.
+     *
+     * @param array $value                  The PHP array to dump
+     * @param bool  $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param bool  $objectSupport          true if object support is enabled, false otherwise
+     *
+     * @return string The YAML string representing the PHP array
+     */
+    private static function dumpArray($value, $exceptionOnInvalidType, $objectSupport)
+    {
+        // array
+        $keys = array_keys($value);
+        $keysCount = count($keys);
+        if ((1 === $keysCount && '0' == $keys[0])
+            || ($keysCount > 1 && array_reduce($keys, function ($v, $w) { return (int) $v + $w; }, 0) === $keysCount * ($keysCount - 1) / 2)
+        ) {
+            $output = array();
+            foreach ($value as $val) {
+                $output[] = self::dump($val, $exceptionOnInvalidType, $objectSupport);
+            }
+
+            return sprintf('[%s]', implode(', ', $output));
+        }
+
+        // mapping
+        $output = array();
+        foreach ($value as $key => $val) {
+            $output[] = sprintf('%s: %s', self::dump($key, $exceptionOnInvalidType, $objectSupport), self::dump($val, $exceptionOnInvalidType, $objectSupport));
+        }
+
+        return sprintf('{ %s }', implode(', ', $output));
+    }
+
+    /**
+     * Parses a scalar to a YAML string.
+     *
+     * @param string $scalar
+     * @param string $delimiters
+     * @param array  $stringDelimiters
+     * @param int    &$i
+     * @param bool   $evaluate
+     * @param array  $references
+     *
+     * @return string A YAML string
+     *
+     * @throws ParseException When malformed inline YAML string is parsed
+     */
+    public static function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true, $references = array())
+    {
+        if (in_array($scalar[$i], $stringDelimiters)) {
+            // quoted scalar
+            $output = self::parseQuotedScalar($scalar, $i);
+
+            if (null !== $delimiters) {
+                $tmp = ltrim(substr($scalar, $i), ' ');
+                if (!in_array($tmp[0], $delimiters)) {
+                    throw new ParseException(sprintf('Unexpected characters (%s).', substr($scalar, $i)));
+                }
+            }
+        } else {
+            // "normal" string
+            if (!$delimiters) {
+                $output = substr($scalar, $i);
+                $i += strlen($output);
+
+                // remove comments
+                if (false !== $strpos = strpos($output, ' #')) {
+                    $output = rtrim(substr($output, 0, $strpos));
+                }
+            } elseif (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
+                $output = $match[1];
+                $i += strlen($output);
+            } else {
+                throw new ParseException(sprintf('Malformed inline YAML string (%s).', $scalar));
+            }
+
+            if ($evaluate) {
+                $output = self::evaluateScalar($output, $references);
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Parses a quoted scalar to YAML.
+     *
+     * @param string $scalar
+     * @param int    &$i
+     *
+     * @return string A YAML string
+     *
+     * @throws ParseException When malformed inline YAML string is parsed
+     */
+    private static function parseQuotedScalar($scalar, &$i)
+    {
+        if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) {
+            throw new ParseException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i)));
+        }
+
+        $output = substr($match[0], 1, strlen($match[0]) - 2);
+
+        $unescaper = new Unescaper();
+        if ('"' == $scalar[$i]) {
+            $output = $unescaper->unescapeDoubleQuotedString($output);
+        } else {
+            $output = $unescaper->unescapeSingleQuotedString($output);
+        }
+
+        $i += strlen($match[0]);
+
+        return $output;
+    }
+
+    /**
+     * Parses a sequence to a YAML string.
+     *
+     * @param string $sequence
+     * @param int    &$i
+     * @param array  $references
+     *
+     * @return string A YAML string
+     *
+     * @throws ParseException When malformed inline YAML string is parsed
+     */
+    private static function parseSequence($sequence, &$i = 0, $references = array())
+    {
+        $output = array();
+        $len = strlen($sequence);
+        ++$i;
+
+        // [foo, bar, ...]
+        while ($i < $len) {
+            switch ($sequence[$i]) {
+                case '[':
+                    // nested sequence
+                    $output[] = self::parseSequence($sequence, $i, $references);
+                    break;
+                case '{':
+                    // nested mapping
+                    $output[] = self::parseMapping($sequence, $i, $references);
+                    break;
+                case ']':
+                    return $output;
+                case ',':
+                case ' ':
+                    break;
+                default:
+                    $isQuoted = in_array($sequence[$i], array('"', "'"));
+                    $value = self::parseScalar($sequence, array(',', ']'), array('"', "'"), $i, true, $references);
+
+                    // the value can be an array if a reference has been resolved to an array var
+                    if (!is_array($value) && !$isQuoted && false !== strpos($value, ': ')) {
+                        // embedded mapping?
+                        try {
+                            $pos = 0;
+                            $value = self::parseMapping('{'.$value.'}', $pos, $references);
+                        } catch (\InvalidArgumentException $e) {
+                            // no, it's not
+                        }
+                    }
+
+                    $output[] = $value;
+
+                    --$i;
+            }
+
+            ++$i;
+        }
+
+        throw new ParseException(sprintf('Malformed inline YAML string %s', $sequence));
+    }
+
+    /**
+     * Parses a mapping to a YAML string.
+     *
+     * @param string $mapping
+     * @param int    &$i
+     * @param array  $references
+     *
+     * @return string A YAML string
+     *
+     * @throws ParseException When malformed inline YAML string is parsed
+     */
+    private static function parseMapping($mapping, &$i = 0, $references = array())
+    {
+        $output = array();
+        $len = strlen($mapping);
+        ++$i;
+
+        // {foo: bar, bar:foo, ...}
+        while ($i < $len) {
+            switch ($mapping[$i]) {
+                case ' ':
+                case ',':
+                    ++$i;
+                    continue 2;
+                case '}':
+                    if (self::$objectForMap) {
+                        return (object) $output;
+                    }
+
+                    return $output;
+            }
+
+            // key
+            $key = self::parseScalar($mapping, array(':', ' '), array('"', "'"), $i, false);
+
+            // value
+            $done = false;
+
+            while ($i < $len) {
+                switch ($mapping[$i]) {
+                    case '[':
+                        // nested sequence
+                        $value = self::parseSequence($mapping, $i, $references);
+                        // Spec: Keys MUST be unique; first one wins.
+                        // Parser cannot abort this mapping earlier, since lines
+                        // are processed sequentially.
+                        if (!isset($output[$key])) {
+                            $output[$key] = $value;
+                        }
+                        $done = true;
+                        break;
+                    case '{':
+                        // nested mapping
+                        $value = self::parseMapping($mapping, $i, $references);
+                        // Spec: Keys MUST be unique; first one wins.
+                        // Parser cannot abort this mapping earlier, since lines
+                        // are processed sequentially.
+                        if (!isset($output[$key])) {
+                            $output[$key] = $value;
+                        }
+                        $done = true;
+                        break;
+                    case ':':
+                    case ' ':
+                        break;
+                    default:
+                        $value = self::parseScalar($mapping, array(',', '}'), array('"', "'"), $i, true, $references);
+                        // Spec: Keys MUST be unique; first one wins.
+                        // Parser cannot abort this mapping earlier, since lines
+                        // are processed sequentially.
+                        if (!isset($output[$key])) {
+                            $output[$key] = $value;
+                        }
+                        $done = true;
+                        --$i;
+                }
+
+                ++$i;
+
+                if ($done) {
+                    continue 2;
+                }
+            }
+        }
+
+        throw new ParseException(sprintf('Malformed inline YAML string %s', $mapping));
+    }
+
+    /**
+     * Evaluates scalars and replaces magic values.
+     *
+     * @param string $scalar
+     * @param array  $references
+     *
+     * @return string A YAML string
+     *
+     * @throws ParseException when object parsing support was disabled and the parser detected a PHP object or when a reference could not be resolved
+     */
+    private static function evaluateScalar($scalar, $references = array())
+    {
+        $scalar = trim($scalar);
+        $scalarLower = strtolower($scalar);
+
+        if (0 === strpos($scalar, '*')) {
+            if (false !== $pos = strpos($scalar, '#')) {
+                $value = substr($scalar, 1, $pos - 2);
+            } else {
+                $value = substr($scalar, 1);
+            }
+
+            // an unquoted *
+            if (false === $value || '' === $value) {
+                throw new ParseException('A reference must contain at least one character.');
+            }
+
+            if (!array_key_exists($value, $references)) {
+                throw new ParseException(sprintf('Reference "%s" does not exist.', $value));
+            }
+
+            return $references[$value];
+        }
+
+        switch (true) {
+            case 'null' === $scalarLower:
+            case '' === $scalar:
+            case '~' === $scalar:
+                return;
+            case 'true' === $scalarLower:
+                return true;
+            case 'false' === $scalarLower:
+                return false;
+            // Optimise for returning strings.
+            case $scalar[0] === '+' || $scalar[0] === '-' || $scalar[0] === '.' || $scalar[0] === '!' || is_numeric($scalar[0]):
+                switch (true) {
+                    case 0 === strpos($scalar, '!str'):
+                        return (string) substr($scalar, 5);
+                    case 0 === strpos($scalar, '! '):
+                        return (int) self::parseScalar(substr($scalar, 2));
+                    case 0 === strpos($scalar, '!!php/object:'):
+                        if (self::$objectSupport) {
+                            return unserialize(substr($scalar, 13));
+                        }
+
+                        if (self::$exceptionOnInvalidType) {
+                            throw new ParseException('Object support when parsing a YAML file has been disabled.');
+                        }
+
+                        return;
+                    case 0 === strpos($scalar, '!!float '):
+                        return (float) substr($scalar, 8);
+                    case ctype_digit($scalar):
+                        $raw = $scalar;
+                        $cast = (int) $scalar;
+
+                        return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
+                    case '-' === $scalar[0] && ctype_digit(substr($scalar, 1)):
+                        $raw = $scalar;
+                        $cast = (int) $scalar;
+
+                        return '0' == $scalar[1] ? octdec($scalar) : (((string) $raw === (string) $cast) ? $cast : $raw);
+                    case is_numeric($scalar):
+                    case preg_match(self::getHexRegex(), $scalar):
+                        return '0x' === $scalar[0].$scalar[1] ? hexdec($scalar) : (float) $scalar;
+                    case '.inf' === $scalarLower:
+                    case '.nan' === $scalarLower:
+                        return -log(0);
+                    case '-.inf' === $scalarLower:
+                        return log(0);
+                    case preg_match('/^(-|\+)?[0-9,]+(\.[0-9]+)?$/', $scalar):
+                        return (float) str_replace(',', '', $scalar);
+                    case preg_match(self::getTimestampRegex(), $scalar):
+                        return strtotime($scalar);
+                }
+            default:
+                return (string) $scalar;
+        }
+    }
+
+    /**
+     * Gets a regex that matches a YAML date.
+     *
+     * @return string The regular expression
+     *
+     * @see http://www.yaml.org/spec/1.2/spec.html#id2761573
+     */
+    private static function getTimestampRegex()
+    {
+        return <<<EOF
+        ~^
+        (?P<year>[0-9][0-9][0-9][0-9])
+        -(?P<month>[0-9][0-9]?)
+        -(?P<day>[0-9][0-9]?)
+        (?:(?:[Tt]|[ \t]+)
+        (?P<hour>[0-9][0-9]?)
+        :(?P<minute>[0-9][0-9])
+        :(?P<second>[0-9][0-9])
+        (?:\.(?P<fraction>[0-9]*))?
+        (?:[ \t]*(?P<tz>Z|(?P<tz_sign>[-+])(?P<tz_hour>[0-9][0-9]?)
+        (?::(?P<tz_minute>[0-9][0-9]))?))?)?
+        $~x
+EOF;
+    }
+
+    /**
+     * Gets a regex that matches a YAML number in hexadecimal notation.
+     *
+     * @return string
+     */
+    private static function getHexRegex()
+    {
+        return '~^0x[0-9a-f]++$~i';
+    }
+}
diff --git a/vendor/symfony/yaml/LICENSE b/vendor/symfony/yaml/LICENSE
new file mode 100644
index 00000000..43028bc6
--- /dev/null
+++ b/vendor/symfony/yaml/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2004-2015 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vendor/symfony/yaml/Parser.php b/vendor/symfony/yaml/Parser.php
new file mode 100644
index 00000000..2de62e58
--- /dev/null
+++ b/vendor/symfony/yaml/Parser.php
@@ -0,0 +1,697 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml;
+
+use Symfony\Component\Yaml\Exception\ParseException;
+
+/**
+ * Parser parses YAML strings to convert them to PHP arrays.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Parser
+{
+    const FOLDED_SCALAR_PATTERN = '(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?';
+
+    private $offset = 0;
+    private $lines = array();
+    private $currentLineNb = -1;
+    private $currentLine = '';
+    private $refs = array();
+
+    /**
+     * Constructor.
+     *
+     * @param int $offset The offset of YAML document (used for line numbers in error messages)
+     */
+    public function __construct($offset = 0)
+    {
+        $this->offset = $offset;
+    }
+
+    /**
+     * Parses a YAML string to a PHP value.
+     *
+     * @param string $value                  A YAML string
+     * @param bool   $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param bool   $objectSupport          true if object support is enabled, false otherwise
+     * @param bool   $objectForMap           true if maps should return a stdClass instead of array()
+     *
+     * @return mixed A PHP value
+     *
+     * @throws ParseException If the YAML is not valid
+     */
+    public function parse($value, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
+    {
+        if (!preg_match('//u', $value)) {
+            throw new ParseException('The YAML value does not appear to be valid UTF-8.');
+        }
+        $this->currentLineNb = -1;
+        $this->currentLine = '';
+        $value = $this->cleanup($value);
+        $this->lines = explode("\n", $value);
+
+        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('UTF-8');
+        }
+
+        $data = array();
+        $context = null;
+        $allowOverwrite = false;
+        while ($this->moveToNextLine()) {
+            if ($this->isCurrentLineEmpty()) {
+                continue;
+            }
+
+            // tab?
+            if ("\t" === $this->currentLine[0]) {
+                throw new ParseException('A YAML file cannot contain tabs as indentation.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+            }
+
+            $isRef = $mergeNode = false;
+            if (preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+?))?\s*$#u', $this->currentLine, $values)) {
+                if ($context && 'mapping' == $context) {
+                    throw new ParseException('You cannot define a sequence item when in a mapping');
+                }
+                $context = 'sequence';
+
+                if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
+                    $isRef = $matches['ref'];
+                    $values['value'] = $matches['value'];
+                }
+
+                // array
+                if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
+                    $c = $this->getRealCurrentLineNb() + 1;
+                    $parser = new self($c);
+                    $parser->refs = &$this->refs;
+                    $data[] = $parser->parse($this->getNextEmbedBlock(null, true), $exceptionOnInvalidType, $objectSupport, $objectForMap);
+                } else {
+                    if (isset($values['leadspaces'])
+                        && preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\{\[].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $values['value'], $matches)
+                    ) {
+                        // this is a compact notation element, add to next block and parse
+                        $c = $this->getRealCurrentLineNb();
+                        $parser = new self($c);
+                        $parser->refs = &$this->refs;
+
+                        $block = $values['value'];
+                        if ($this->isNextLineIndented()) {
+                            $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + strlen($values['leadspaces']) + 1);
+                        }
+
+                        $data[] = $parser->parse($block, $exceptionOnInvalidType, $objectSupport, $objectForMap);
+                    } else {
+                        $data[] = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap);
+                    }
+                }
+            } elseif (preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\[\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values) && (false === strpos($values['key'], ' #') || in_array($values['key'][0], array('"', "'")))) {
+                if ($context && 'sequence' == $context) {
+                    throw new ParseException('You cannot define a mapping item when in a sequence');
+                }
+                $context = 'mapping';
+
+                // force correct settings
+                Inline::parse(null, $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs);
+                try {
+                    $key = Inline::parseScalar($values['key']);
+                } catch (ParseException $e) {
+                    $e->setParsedLine($this->getRealCurrentLineNb() + 1);
+                    $e->setSnippet($this->currentLine);
+
+                    throw $e;
+                }
+
+                if ('<<' === $key) {
+                    $mergeNode = true;
+                    $allowOverwrite = true;
+                    if (isset($values['value']) && 0 === strpos($values['value'], '*')) {
+                        $refName = substr($values['value'], 1);
+                        if (!array_key_exists($refName, $this->refs)) {
+                            throw new ParseException(sprintf('Reference "%s" does not exist.', $refName), $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                        }
+
+                        $refValue = $this->refs[$refName];
+
+                        if (!is_array($refValue)) {
+                            throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                        }
+
+                        foreach ($refValue as $key => $value) {
+                            if (!isset($data[$key])) {
+                                $data[$key] = $value;
+                            }
+                        }
+                    } else {
+                        if (isset($values['value']) && $values['value'] !== '') {
+                            $value = $values['value'];
+                        } else {
+                            $value = $this->getNextEmbedBlock();
+                        }
+                        $c = $this->getRealCurrentLineNb() + 1;
+                        $parser = new self($c);
+                        $parser->refs = &$this->refs;
+                        $parsed = $parser->parse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap);
+
+                        if (!is_array($parsed)) {
+                            throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                        }
+
+                        if (isset($parsed[0])) {
+                            // If the value associated with the merge key is a sequence, then this sequence is expected to contain mapping nodes
+                            // and each of these nodes is merged in turn according to its order in the sequence. Keys in mapping nodes earlier
+                            // in the sequence override keys specified in later mapping nodes.
+                            foreach ($parsed as $parsedItem) {
+                                if (!is_array($parsedItem)) {
+                                    throw new ParseException('Merge items must be arrays.', $this->getRealCurrentLineNb() + 1, $parsedItem);
+                                }
+
+                                foreach ($parsedItem as $key => $value) {
+                                    if (!isset($data[$key])) {
+                                        $data[$key] = $value;
+                                    }
+                                }
+                            }
+                        } else {
+                            // If the value associated with the key is a single mapping node, each of its key/value pairs is inserted into the
+                            // current mapping, unless the key already exists in it.
+                            foreach ($parsed as $key => $value) {
+                                if (!isset($data[$key])) {
+                                    $data[$key] = $value;
+                                }
+                            }
+                        }
+                    }
+                } elseif (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
+                    $isRef = $matches['ref'];
+                    $values['value'] = $matches['value'];
+                }
+
+                if ($mergeNode) {
+                    // Merge keys
+                } elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
+                    // hash
+                    // if next line is less indented or equal, then it means that the current value is null
+                    if (!$this->isNextLineIndented() && !$this->isNextLineUnIndentedCollection()) {
+                        // Spec: Keys MUST be unique; first one wins.
+                        // But overwriting is allowed when a merge node is used in current block.
+                        if ($allowOverwrite || !isset($data[$key])) {
+                            $data[$key] = null;
+                        }
+                    } else {
+                        $c = $this->getRealCurrentLineNb() + 1;
+                        $parser = new self($c);
+                        $parser->refs = &$this->refs;
+                        $value = $parser->parse($this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport, $objectForMap);
+                        // Spec: Keys MUST be unique; first one wins.
+                        // But overwriting is allowed when a merge node is used in current block.
+                        if ($allowOverwrite || !isset($data[$key])) {
+                            $data[$key] = $value;
+                        }
+                    }
+                } else {
+                    $value = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap);
+                    // Spec: Keys MUST be unique; first one wins.
+                    // But overwriting is allowed when a merge node is used in current block.
+                    if ($allowOverwrite || !isset($data[$key])) {
+                        $data[$key] = $value;
+                    }
+                }
+            } else {
+                // multiple documents are not supported
+                if ('---' === $this->currentLine) {
+                    throw new ParseException('Multiple documents are not supported.');
+                }
+
+                // 1-liner optionally followed by newline(s)
+                if (is_string($value) && $this->lines[0] === trim($value)) {
+                    try {
+                        $value = Inline::parse($this->lines[0], $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs);
+                    } catch (ParseException $e) {
+                        $e->setParsedLine($this->getRealCurrentLineNb() + 1);
+                        $e->setSnippet($this->currentLine);
+
+                        throw $e;
+                    }
+
+                    if (is_array($value)) {
+                        $first = reset($value);
+                        if (is_string($first) && 0 === strpos($first, '*')) {
+                            $data = array();
+                            foreach ($value as $alias) {
+                                $data[] = $this->refs[substr($alias, 1)];
+                            }
+                            $value = $data;
+                        }
+                    }
+
+                    if (isset($mbEncoding)) {
+                        mb_internal_encoding($mbEncoding);
+                    }
+
+                    return $value;
+                }
+
+                switch (preg_last_error()) {
+                    case PREG_INTERNAL_ERROR:
+                        $error = 'Internal PCRE error.';
+                        break;
+                    case PREG_BACKTRACK_LIMIT_ERROR:
+                        $error = 'pcre.backtrack_limit reached.';
+                        break;
+                    case PREG_RECURSION_LIMIT_ERROR:
+                        $error = 'pcre.recursion_limit reached.';
+                        break;
+                    case PREG_BAD_UTF8_ERROR:
+                        $error = 'Malformed UTF-8 data.';
+                        break;
+                    case PREG_BAD_UTF8_OFFSET_ERROR:
+                        $error = 'Offset doesn\'t correspond to the begin of a valid UTF-8 code point.';
+                        break;
+                    default:
+                        $error = 'Unable to parse.';
+                }
+
+                throw new ParseException($error, $this->getRealCurrentLineNb() + 1, $this->currentLine);
+            }
+
+            if ($isRef) {
+                $this->refs[$isRef] = end($data);
+            }
+        }
+
+        if (isset($mbEncoding)) {
+            mb_internal_encoding($mbEncoding);
+        }
+
+        return empty($data) ? null : $data;
+    }
+
+    /**
+     * Returns the current line number (takes the offset into account).
+     *
+     * @return int The current line number
+     */
+    private function getRealCurrentLineNb()
+    {
+        return $this->currentLineNb + $this->offset;
+    }
+
+    /**
+     * Returns the current line indentation.
+     *
+     * @return int The current line indentation
+     */
+    private function getCurrentLineIndentation()
+    {
+        return strlen($this->currentLine) - strlen(ltrim($this->currentLine, ' '));
+    }
+
+    /**
+     * Returns the next embed block of YAML.
+     *
+     * @param int  $indentation The indent level at which the block is to be read, or null for default
+     * @param bool $inSequence  True if the enclosing data structure is a sequence
+     *
+     * @return string A YAML string
+     *
+     * @throws ParseException When indentation problem are detected
+     */
+    private function getNextEmbedBlock($indentation = null, $inSequence = false)
+    {
+        $oldLineIndentation = $this->getCurrentLineIndentation();
+
+        if (!$this->moveToNextLine()) {
+            return;
+        }
+
+        if (null === $indentation) {
+            $newIndent = $this->getCurrentLineIndentation();
+
+            $unindentedEmbedBlock = $this->isStringUnIndentedCollectionItem($this->currentLine);
+
+            if (!$this->isCurrentLineEmpty() && 0 === $newIndent && !$unindentedEmbedBlock) {
+                throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+            }
+        } else {
+            $newIndent = $indentation;
+        }
+
+        $data = array();
+        if ($this->getCurrentLineIndentation() >= $newIndent) {
+            $data[] = substr($this->currentLine, $newIndent);
+        } else {
+            $this->moveToPreviousLine();
+
+            return;
+        }
+
+        if ($inSequence && $oldLineIndentation === $newIndent && isset($data[0][0]) && '-' === $data[0][0]) {
+            // the previous line contained a dash but no item content, this line is a sequence item with the same indentation
+            // and therefore no nested list or mapping
+            $this->moveToPreviousLine();
+
+            return;
+        }
+
+        $isItUnindentedCollection = $this->isStringUnIndentedCollectionItem($this->currentLine);
+
+        // Comments must not be removed inside a string block (ie. after a line ending with "|")
+        $removeCommentsPattern = '~'.self::FOLDED_SCALAR_PATTERN.'$~';
+        $removeComments = !preg_match($removeCommentsPattern, $this->currentLine);
+
+        while ($this->moveToNextLine()) {
+            $indent = $this->getCurrentLineIndentation();
+
+            if ($indent === $newIndent) {
+                $removeComments = !preg_match($removeCommentsPattern, $this->currentLine);
+            }
+
+            if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem($this->currentLine) && $newIndent === $indent) {
+                $this->moveToPreviousLine();
+                break;
+            }
+
+            if ($this->isCurrentLineBlank()) {
+                $data[] = substr($this->currentLine, $newIndent);
+                continue;
+            }
+
+            if ($removeComments && $this->isCurrentLineComment()) {
+                continue;
+            }
+
+            if ($indent >= $newIndent) {
+                $data[] = substr($this->currentLine, $newIndent);
+            } elseif (0 == $indent) {
+                $this->moveToPreviousLine();
+
+                break;
+            } else {
+                throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+            }
+        }
+
+        return implode("\n", $data);
+    }
+
+    /**
+     * Moves the parser to the next line.
+     *
+     * @return bool
+     */
+    private function moveToNextLine()
+    {
+        if ($this->currentLineNb >= count($this->lines) - 1) {
+            return false;
+        }
+
+        $this->currentLine = $this->lines[++$this->currentLineNb];
+
+        return true;
+    }
+
+    /**
+     * Moves the parser to the previous line.
+     */
+    private function moveToPreviousLine()
+    {
+        $this->currentLine = $this->lines[--$this->currentLineNb];
+    }
+
+    /**
+     * Parses a YAML value.
+     *
+     * @param string $value                  A YAML value
+     * @param bool   $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
+     * @param bool   $objectSupport          True if object support is enabled, false otherwise
+     * @param bool   $objectForMap           true if maps should return a stdClass instead of array()
+     *
+     * @return mixed A PHP value
+     *
+     * @throws ParseException When reference does not exist
+     */
+    private function parseValue($value, $exceptionOnInvalidType, $objectSupport, $objectForMap)
+    {
+        if (0 === strpos($value, '*')) {
+            if (false !== $pos = strpos($value, '#')) {
+                $value = substr($value, 1, $pos - 2);
+            } else {
+                $value = substr($value, 1);
+            }
+
+            if (!array_key_exists($value, $this->refs)) {
+                throw new ParseException(sprintf('Reference "%s" does not exist.', $value), $this->currentLine);
+            }
+
+            return $this->refs[$value];
+        }
+
+        if (preg_match('/^'.self::FOLDED_SCALAR_PATTERN.'$/', $value, $matches)) {
+            $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
+
+            return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs($modifiers));
+        }
+
+        try {
+            return Inline::parse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs);
+        } catch (ParseException $e) {
+            $e->setParsedLine($this->getRealCurrentLineNb() + 1);
+            $e->setSnippet($this->currentLine);
+
+            throw $e;
+        }
+    }
+
+    /**
+     * Parses a folded scalar.
+     *
+     * @param string $separator   The separator that was used to begin this folded scalar (| or >)
+     * @param string $indicator   The indicator that was used to begin this folded scalar (+ or -)
+     * @param int    $indentation The indentation that was used to begin this folded scalar
+     *
+     * @return string The text value
+     */
+    private function parseFoldedScalar($separator, $indicator = '', $indentation = 0)
+    {
+        $notEOF = $this->moveToNextLine();
+        if (!$notEOF) {
+            return '';
+        }
+
+        $isCurrentLineBlank = $this->isCurrentLineBlank();
+        $text = '';
+
+        // leading blank lines are consumed before determining indentation
+        while ($notEOF && $isCurrentLineBlank) {
+            // newline only if not EOF
+            if ($notEOF = $this->moveToNextLine()) {
+                $text .= "\n";
+                $isCurrentLineBlank = $this->isCurrentLineBlank();
+            }
+        }
+
+        // determine indentation if not specified
+        if (0 === $indentation) {
+            if (preg_match('/^ +/', $this->currentLine, $matches)) {
+                $indentation = strlen($matches[0]);
+            }
+        }
+
+        if ($indentation > 0) {
+            $pattern = sprintf('/^ {%d}(.*)$/', $indentation);
+
+            while (
+                $notEOF && (
+                    $isCurrentLineBlank ||
+                    preg_match($pattern, $this->currentLine, $matches)
+                )
+            ) {
+                if ($isCurrentLineBlank) {
+                    $text .= substr($this->currentLine, $indentation);
+                } else {
+                    $text .= $matches[1];
+                }
+
+                // newline only if not EOF
+                if ($notEOF = $this->moveToNextLine()) {
+                    $text .= "\n";
+                    $isCurrentLineBlank = $this->isCurrentLineBlank();
+                }
+            }
+        } elseif ($notEOF) {
+            $text .= "\n";
+        }
+
+        if ($notEOF) {
+            $this->moveToPreviousLine();
+        }
+
+        // replace all non-trailing single newlines with spaces in folded blocks
+        if ('>' === $separator) {
+            preg_match('/(\n*)$/', $text, $matches);
+            $text = preg_replace('/(?<!\n)\n(?!\n)/', ' ', rtrim($text, "\n"));
+            $text .= $matches[1];
+        }
+
+        // deal with trailing newlines as indicated
+        if ('' === $indicator) {
+            $text = preg_replace('/\n+$/', "\n", $text);
+        } elseif ('-' === $indicator) {
+            $text = preg_replace('/\n+$/', '', $text);
+        }
+
+        return $text;
+    }
+
+    /**
+     * Returns true if the next line is indented.
+     *
+     * @return bool Returns true if the next line is indented, false otherwise
+     */
+    private function isNextLineIndented()
+    {
+        $currentIndentation = $this->getCurrentLineIndentation();
+        $EOF = !$this->moveToNextLine();
+
+        while (!$EOF && $this->isCurrentLineEmpty()) {
+            $EOF = !$this->moveToNextLine();
+        }
+
+        if ($EOF) {
+            return false;
+        }
+
+        $ret = false;
+        if ($this->getCurrentLineIndentation() > $currentIndentation) {
+            $ret = true;
+        }
+
+        $this->moveToPreviousLine();
+
+        return $ret;
+    }
+
+    /**
+     * Returns true if the current line is blank or if it is a comment line.
+     *
+     * @return bool Returns true if the current line is empty or if it is a comment line, false otherwise
+     */
+    private function isCurrentLineEmpty()
+    {
+        return $this->isCurrentLineBlank() || $this->isCurrentLineComment();
+    }
+
+    /**
+     * Returns true if the current line is blank.
+     *
+     * @return bool Returns true if the current line is blank, false otherwise
+     */
+    private function isCurrentLineBlank()
+    {
+        return '' == trim($this->currentLine, ' ');
+    }
+
+    /**
+     * Returns true if the current line is a comment line.
+     *
+     * @return bool Returns true if the current line is a comment line, false otherwise
+     */
+    private function isCurrentLineComment()
+    {
+        //checking explicitly the first char of the trim is faster than loops or strpos
+        $ltrimmedLine = ltrim($this->currentLine, ' ');
+
+        return $ltrimmedLine[0] === '#';
+    }
+
+    /**
+     * Cleanups a YAML string to be parsed.
+     *
+     * @param string $value The input YAML string
+     *
+     * @return string A cleaned up YAML string
+     */
+    private function cleanup($value)
+    {
+        $value = str_replace(array("\r\n", "\r"), "\n", $value);
+
+        // strip YAML header
+        $count = 0;
+        $value = preg_replace('#^\%YAML[: ][\d\.]+.*\n#u', '', $value, -1, $count);
+        $this->offset += $count;
+
+        // remove leading comments
+        $trimmedValue = preg_replace('#^(\#.*?\n)+#s', '', $value, -1, $count);
+        if ($count == 1) {
+            // items have been removed, update the offset
+            $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
+            $value = $trimmedValue;
+        }
+
+        // remove start of the document marker (---)
+        $trimmedValue = preg_replace('#^\-\-\-.*?\n#s', '', $value, -1, $count);
+        if ($count == 1) {
+            // items have been removed, update the offset
+            $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
+            $value = $trimmedValue;
+
+            // remove end of the document marker (...)
+            $value = preg_replace('#\.\.\.\s*$#', '', $value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Returns true if the next line starts unindented collection.
+     *
+     * @return bool Returns true if the next line starts unindented collection, false otherwise
+     */
+    private function isNextLineUnIndentedCollection()
+    {
+        $currentIndentation = $this->getCurrentLineIndentation();
+        $notEOF = $this->moveToNextLine();
+
+        while ($notEOF && $this->isCurrentLineEmpty()) {
+            $notEOF = $this->moveToNextLine();
+        }
+
+        if (false === $notEOF) {
+            return false;
+        }
+
+        $ret = false;
+        if (
+            $this->getCurrentLineIndentation() == $currentIndentation
+            &&
+            $this->isStringUnIndentedCollectionItem($this->currentLine)
+        ) {
+            $ret = true;
+        }
+
+        $this->moveToPreviousLine();
+
+        return $ret;
+    }
+
+    /**
+     * Returns true if the string is un-indented collection item.
+     *
+     * @return bool Returns true if the string is un-indented collection item, false otherwise
+     */
+    private function isStringUnIndentedCollectionItem()
+    {
+        return (0 === strpos($this->currentLine, '- '));
+    }
+}
diff --git a/vendor/symfony/yaml/README.md b/vendor/symfony/yaml/README.md
new file mode 100644
index 00000000..85a97867
--- /dev/null
+++ b/vendor/symfony/yaml/README.md
@@ -0,0 +1,21 @@
+Yaml Component
+==============
+
+YAML implements most of the YAML 1.2 specification.
+
+```php
+use Symfony\Component\Yaml\Yaml;
+
+$array = Yaml::parse(file_get_contents(filename));
+
+print Yaml::dump($array);
+```
+
+Resources
+---------
+
+You can run the unit tests with the following command:
+
+    $ cd path/to/Symfony/Component/Yaml/
+    $ composer install
+    $ phpunit
diff --git a/vendor/symfony/yaml/Tests/DumperTest.php b/vendor/symfony/yaml/Tests/DumperTest.php
new file mode 100644
index 00000000..b103b9a1
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/DumperTest.php
@@ -0,0 +1,236 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml\Tests;
+
+use Symfony\Component\Yaml\Parser;
+use Symfony\Component\Yaml\Dumper;
+
+class DumperTest extends \PHPUnit_Framework_TestCase
+{
+    protected $parser;
+    protected $dumper;
+    protected $path;
+
+    protected $array = array(
+        '' => 'bar',
+        'foo' => '#bar',
+        'foo\'bar' => array(),
+        'bar' => array(1, 'foo'),
+        'foobar' => array(
+            'foo' => 'bar',
+            'bar' => array(1, 'foo'),
+            'foobar' => array(
+                'foo' => 'bar',
+                'bar' => array(1, 'foo'),
+            ),
+        ),
+    );
+
+    protected function setUp()
+    {
+        $this->parser = new Parser();
+        $this->dumper = new Dumper();
+        $this->path = __DIR__.'/Fixtures';
+    }
+
+    protected function tearDown()
+    {
+        $this->parser = null;
+        $this->dumper = null;
+        $this->path = null;
+        $this->array = null;
+    }
+
+    public function testSetIndentation()
+    {
+        $this->dumper->setIndentation(7);
+
+        $expected = <<<EOF
+'': bar
+foo: '#bar'
+'foo''bar': {  }
+bar:
+       - 1
+       - foo
+foobar:
+       foo: bar
+       bar:
+              - 1
+              - foo
+       foobar:
+              foo: bar
+              bar:
+                     - 1
+                     - foo
+
+EOF;
+        $this->assertEquals($expected, $this->dumper->dump($this->array, 4, 0));
+    }
+
+    public function testSpecifications()
+    {
+        $files = $this->parser->parse(file_get_contents($this->path.'/index.yml'));
+        foreach ($files as $file) {
+            $yamls = file_get_contents($this->path.'/'.$file.'.yml');
+
+            // split YAMLs documents
+            foreach (preg_split('/^---( %YAML\:1\.0)?/m', $yamls) as $yaml) {
+                if (!$yaml) {
+                    continue;
+                }
+
+                $test = $this->parser->parse($yaml);
+                if (isset($test['dump_skip']) && $test['dump_skip']) {
+                    continue;
+                } elseif (isset($test['todo']) && $test['todo']) {
+                    // TODO
+                } else {
+                    eval('$expected = '.trim($test['php']).';');
+                    $this->assertSame($expected, $this->parser->parse($this->dumper->dump($expected, 10)), $test['test']);
+                }
+            }
+        }
+    }
+
+    public function testInlineLevel()
+    {
+        $expected = <<<EOF
+{ '': bar, foo: '#bar', 'foo''bar': {  }, bar: [1, foo], foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } } }
+EOF;
+        $this->assertEquals($expected, $this->dumper->dump($this->array, -10), '->dump() takes an inline level argument');
+        $this->assertEquals($expected, $this->dumper->dump($this->array, 0), '->dump() takes an inline level argument');
+
+        $expected = <<<EOF
+'': bar
+foo: '#bar'
+'foo''bar': {  }
+bar: [1, foo]
+foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } }
+
+EOF;
+        $this->assertEquals($expected, $this->dumper->dump($this->array, 1), '->dump() takes an inline level argument');
+
+        $expected = <<<EOF
+'': bar
+foo: '#bar'
+'foo''bar': {  }
+bar:
+    - 1
+    - foo
+foobar:
+    foo: bar
+    bar: [1, foo]
+    foobar: { foo: bar, bar: [1, foo] }
+
+EOF;
+        $this->assertEquals($expected, $this->dumper->dump($this->array, 2), '->dump() takes an inline level argument');
+
+        $expected = <<<EOF
+'': bar
+foo: '#bar'
+'foo''bar': {  }
+bar:
+    - 1
+    - foo
+foobar:
+    foo: bar
+    bar:
+        - 1
+        - foo
+    foobar:
+        foo: bar
+        bar: [1, foo]
+
+EOF;
+        $this->assertEquals($expected, $this->dumper->dump($this->array, 3), '->dump() takes an inline level argument');
+
+        $expected = <<<EOF
+'': bar
+foo: '#bar'
+'foo''bar': {  }
+bar:
+    - 1
+    - foo
+foobar:
+    foo: bar
+    bar:
+        - 1
+        - foo
+    foobar:
+        foo: bar
+        bar:
+            - 1
+            - foo
+
+EOF;
+        $this->assertEquals($expected, $this->dumper->dump($this->array, 4), '->dump() takes an inline level argument');
+        $this->assertEquals($expected, $this->dumper->dump($this->array, 10), '->dump() takes an inline level argument');
+    }
+
+    public function testObjectSupportEnabled()
+    {
+        $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, false, true);
+
+        $this->assertEquals('{ foo: !!php/object:O:30:"Symfony\Component\Yaml\Tests\A":1:{s:1:"a";s:3:"foo";}, bar: 1 }', $dump, '->dump() is able to dump objects');
+    }
+
+    public function testObjectSupportDisabledButNoExceptions()
+    {
+        $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1));
+
+        $this->assertEquals('{ foo: null, bar: 1 }', $dump, '->dump() does not dump objects when disabled');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\DumpException
+     */
+    public function testObjectSupportDisabledWithExceptions()
+    {
+        $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, true, false);
+    }
+
+    /**
+     * @dataProvider getEscapeSequences
+     */
+    public function testEscapedEscapeSequencesInQuotedScalar($input, $expected)
+    {
+        $this->assertEquals($expected, $this->dumper->dump($input));
+    }
+
+    public function getEscapeSequences()
+    {
+        return array(
+            'null' => array("\t\\0", '"\t\\\\0"'),
+            'bell' => array("\t\\a", '"\t\\\\a"'),
+            'backspace' => array("\t\\b", '"\t\\\\b"'),
+            'horizontal-tab' => array("\t\\t", '"\t\\\\t"'),
+            'line-feed' => array("\t\\n", '"\t\\\\n"'),
+            'vertical-tab' => array("\t\\v", '"\t\\\\v"'),
+            'form-feed' => array("\t\\f", '"\t\\\\f"'),
+            'carriage-return' => array("\t\\r", '"\t\\\\r"'),
+            'escape' => array("\t\\e", '"\t\\\\e"'),
+            'space' => array("\t\\ ", '"\t\\\\ "'),
+            'double-quote' => array("\t\\\"", '"\t\\\\\\""'),
+            'slash' => array("\t\\/", '"\t\\\\/"'),
+            'backslash' => array("\t\\\\", '"\t\\\\\\\\"'),
+            'next-line' => array("\t\\N", '"\t\\\\N"'),
+            'non-breaking-space' => array("\t\\�", '"\t\\\\�"'),
+            'line-separator' => array("\t\\L", '"\t\\\\L"'),
+            'paragraph-separator' => array("\t\\P", '"\t\\\\P"'),
+        );
+    }
+}
+
+class A
+{
+    public $a = 'foo';
+}
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml
new file mode 100644
index 00000000..5f9c9427
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml
@@ -0,0 +1,31 @@
+--- %YAML:1.0
+test: Simple Alias Example
+brief: >
+    If you need to refer to the same item of data twice,
+    you can give that item an alias.  The alias is a plain
+    string, starting with an ampersand.  The item may then
+    be referred to by the alias throughout your document
+    by using an asterisk before the name of the alias.
+    This is called an anchor.
+yaml: |
+    - &showell Steve
+    - Clark
+    - Brian
+    - Oren
+    - *showell
+php: |
+    array('Steve', 'Clark', 'Brian', 'Oren', 'Steve')
+
+---
+test: Alias of a Mapping
+brief: >
+    An alias can be used on any item of data, including
+    sequences, mappings, and other complex data types.
+yaml: |
+    - &hello
+        Meat: pork
+        Starch: potato
+    - banana
+    - *hello
+php: |
+    array(array('Meat'=>'pork', 'Starch'=>'potato'), 'banana', array('Meat'=>'pork', 'Starch'=>'potato'))
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml
new file mode 100644
index 00000000..dfd93021
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml
@@ -0,0 +1,202 @@
+--- %YAML:1.0
+test: Simple Sequence
+brief: |
+    You can specify a list in YAML by placing each
+    member of the list on a new line with an opening
+    dash. These lists are called sequences.
+yaml: |
+    - apple
+    - banana
+    - carrot
+php: |
+    array('apple', 'banana', 'carrot')
+---
+test: Sequence With Item Being Null In The Middle
+brief: |
+    You can specify a list in YAML by placing each
+    member of the list on a new line with an opening
+    dash. These lists are called sequences.
+yaml: |
+    - apple
+    -
+    - carrot
+php: |
+    array('apple', null, 'carrot')
+---
+test: Sequence With Last Item Being Null
+brief: |
+    You can specify a list in YAML by placing each
+    member of the list on a new line with an opening
+    dash. These lists are called sequences.
+yaml: |
+    - apple
+    - banana
+    -
+php: |
+    array('apple', 'banana', null)
+---
+test: Nested Sequences
+brief: |
+    You can include a sequence within another
+    sequence by giving the sequence an empty
+    dash, followed by an indented list.
+yaml: |
+    -
+     - foo
+     - bar
+     - baz
+php: |
+    array(array('foo', 'bar', 'baz'))
+---
+test: Mixed Sequences
+brief: |
+    Sequences can contain any YAML data,
+    including strings and other sequences.
+yaml: |
+    - apple
+    -
+     - foo
+     - bar
+     - x123
+    - banana
+    - carrot
+php: |
+    array('apple', array('foo', 'bar', 'x123'), 'banana', 'carrot')
+---
+test: Deeply Nested Sequences
+brief: |
+    Sequences can be nested even deeper, with each
+    level of indentation representing a level of
+    depth.
+yaml: |
+    -
+     -
+      - uno
+      - dos
+php: |
+    array(array(array('uno', 'dos')))
+---
+test: Simple Mapping
+brief: |
+    You can add a keyed list (also known as a dictionary or
+    hash) to your document by placing each member of the
+    list on a new line, with a colon separating the key
+    from its value.  In YAML, this type of list is called
+    a mapping.
+yaml: |
+    foo: whatever
+    bar: stuff
+php: |
+    array('foo' => 'whatever', 'bar' => 'stuff')
+---
+test: Sequence in a Mapping
+brief: |
+    A value in a mapping can be a sequence.
+yaml: |
+    foo: whatever
+    bar:
+     - uno
+     - dos
+php: |
+    array('foo' => 'whatever', 'bar' => array('uno', 'dos'))
+---
+test: Nested Mappings
+brief: |
+    A value in a mapping can be another mapping.
+yaml: |
+    foo: whatever
+    bar:
+     fruit: apple
+     name: steve
+     sport: baseball
+php: |
+    array(
+      'foo' => 'whatever',
+      'bar' => array(
+         'fruit' => 'apple',
+         'name' => 'steve',
+         'sport' => 'baseball'
+       )
+    )
+---
+test: Mixed Mapping
+brief: |
+    A mapping can contain any assortment
+    of mappings and sequences as values.
+yaml: |
+    foo: whatever
+    bar:
+     -
+       fruit: apple
+       name: steve
+       sport: baseball
+     - more
+     -
+       python: rocks
+       perl: papers
+       ruby: scissorses
+php: |
+    array(
+      'foo' => 'whatever',
+      'bar' => array(
+        array(
+            'fruit' => 'apple',
+            'name' => 'steve',
+            'sport' => 'baseball'
+        ),
+        'more',
+        array(
+            'python' => 'rocks',
+            'perl' => 'papers',
+            'ruby' => 'scissorses'
+        )
+      )
+    )
+---
+test: Mapping-in-Sequence Shortcut
+todo: true
+brief: |
+     If you are adding a mapping to a sequence, you
+     can place the mapping on the same line as the
+     dash as a shortcut.
+yaml: |
+     - work on YAML.py:
+        - work on Store
+php: |
+    array(array('work on YAML.py' => array('work on Store')))
+---
+test: Sequence-in-Mapping Shortcut
+todo: true
+brief: |
+     The dash in a sequence counts as indentation, so
+     you can add a sequence inside of a mapping without
+     needing spaces as indentation.
+yaml: |
+     allow:
+     - 'localhost'
+     - '%.sourceforge.net'
+     - '%.freepan.org'
+php: |
+     array('allow' => array('localhost', '%.sourceforge.net', '%.freepan.org'))
+---
+todo: true
+test: Merge key
+brief: |
+     A merge key ('<<') can be used in a mapping to insert other mappings.  If
+     the value associated with the merge key is a mapping, each of its key/value
+     pairs is inserted into the current mapping.
+yaml: |
+     mapping:
+       name: Joe
+       job: Accountant
+       <<:
+         age: 38
+php: |
+     array(
+       'mapping' =>
+       array(
+         'name' => 'Joe',
+         'job' => 'Accountant',
+         'age' => 38
+       )
+     )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsBlockMapping.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsBlockMapping.yml
new file mode 100644
index 00000000..f7ca469b
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/YtsBlockMapping.yml
@@ -0,0 +1,51 @@
+---
+test: One Element Mapping
+brief: |
+    A mapping with one key/value pair
+yaml: |
+    foo: bar
+php: |
+    array('foo' => 'bar')
+---
+test: Multi Element Mapping
+brief: |
+    More than one key/value pair
+yaml: |
+    red: baron
+    white: walls
+    blue: berries
+php: |
+    array(
+     'red' => 'baron',
+     'white' => 'walls',
+     'blue' => 'berries',
+    )
+---
+test: Values aligned
+brief: |
+    Often times human editors of documents will align the values even
+    though YAML emitters generally don't.
+yaml: |
+    red:   baron
+    white: walls
+    blue:  berries
+php: |
+    array(
+     'red' => 'baron',
+     'white' => 'walls',
+     'blue' => 'berries',
+    )
+---
+test: Colons aligned
+brief: |
+    Spaces can come before the ': ' key/value separator.
+yaml: |
+    red   : baron
+    white : walls
+    blue  : berries
+php: |
+    array(
+     'red' => 'baron',
+     'white' => 'walls',
+     'blue' => 'berries',
+    )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml
new file mode 100644
index 00000000..f8501ddc
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml
@@ -0,0 +1,85 @@
+--- %YAML:1.0
+test: Trailing Document Separator
+todo: true
+brief: >
+    You can separate YAML documents
+    with a string of three dashes.
+yaml: |
+    - foo: 1
+      bar: 2
+    ---
+    more: stuff
+python: |
+    [
+        [ { 'foo': 1, 'bar': 2 } ],
+        { 'more': 'stuff' }
+    ]
+ruby: |
+    [ { 'foo' => 1, 'bar' => 2 } ]
+
+---
+test: Leading Document Separator
+todo: true
+brief: >
+    You can explicity give an opening
+    document separator to your YAML stream.
+yaml: |
+    ---
+    - foo: 1
+      bar: 2
+    ---
+    more: stuff
+python: |
+    [
+        [ {'foo': 1, 'bar': 2}],
+        {'more': 'stuff'}
+    ]
+ruby: |
+    [ { 'foo' => 1, 'bar' => 2 } ]
+
+---
+test: YAML Header
+todo: true
+brief: >
+    The opening separator can contain directives
+    to the YAML parser, such as the version
+    number.
+yaml: |
+    --- %YAML:1.0
+    foo: 1
+    bar: 2
+php: |
+    array('foo' => 1, 'bar' => 2)
+documents: 1
+
+---
+test: Red Herring Document Separator
+brief: >
+    Separators included in blocks or strings
+    are treated as blocks or strings, as the
+    document separator should have no indentation
+    preceding it.
+yaml: |
+    foo: |
+        ---
+php: |
+    array('foo' => "---\n")
+
+---
+test: Multiple Document Separators in Block
+brief: >
+    This technique allows you to embed other YAML
+    documents within literal blocks.
+yaml: |
+    foo: |
+        ---
+        foo: bar
+        ---
+        yo: baz
+    bar: |
+        fooness
+php: |
+    array(
+       'foo' => "---\nfoo: bar\n---\nyo: baz\n",
+       'bar' => "fooness\n"
+    )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsErrorTests.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsErrorTests.yml
new file mode 100644
index 00000000..e8506fcb
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/YtsErrorTests.yml
@@ -0,0 +1,25 @@
+---
+test: Missing value for hash item
+todo: true
+brief: |
+    Third item in this hash doesn't have a value
+yaml: |
+    okay: value
+    also okay: ~
+    causes error because no value specified
+    last key: value okay here too
+python-error: causes error because no value specified
+
+---
+test: Not indenting enough
+brief: |
+    There was a bug in PyYaml where it was off by one
+    in the indentation check.  It was allowing the YAML
+    below.
+# This is actually valid YAML now. Someone should tell showell.
+yaml: |
+    foo:
+    firstline: 1
+    secondline: 2
+php: |
+  array('foo' => null, 'firstline' => 1, 'secondline' => 2)
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsFlowCollections.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsFlowCollections.yml
new file mode 100644
index 00000000..03090e4a
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/YtsFlowCollections.yml
@@ -0,0 +1,60 @@
+---
+test: Simple Inline Array
+brief: >
+    Sequences can be contained on a
+    single line, using the inline syntax.
+    Separate each entry with commas and
+    enclose in square brackets.
+yaml: |
+    seq: [ a, b, c ]
+php: |
+    array('seq' => array('a', 'b', 'c'))
+---
+test: Simple Inline Hash
+brief: >
+    Mapping can also be contained on
+    a single line, using the inline
+    syntax.  Each key-value pair is
+    separated by a colon, with a comma
+    between each entry in the mapping.
+    Enclose with curly braces.
+yaml: |
+    hash: { name: Steve, foo: bar }
+php: |
+    array('hash' => array('name' => 'Steve', 'foo' => 'bar'))
+---
+test: Multi-line Inline Collections
+todo: true
+brief: >
+    Both inline sequences and inline mappings
+    can span multiple lines, provided that you
+    indent the additional lines.
+yaml: |
+    languages: [ Ruby,
+                 Perl,
+                 Python ]
+    websites: { YAML: yaml.org,
+                Ruby: ruby-lang.org,
+                Python: python.org,
+                Perl: use.perl.org }
+php: |
+    array(
+      'languages' => array('Ruby', 'Perl', 'Python'),
+      'websites' => array(
+        'YAML' => 'yaml.org',
+        'Ruby' => 'ruby-lang.org',
+        'Python' => 'python.org',
+        'Perl' => 'use.perl.org'
+      )
+    )
+---
+test: Commas in Values (not in the spec!)
+todo: true
+brief: >
+    List items in collections are delimited by commas, but
+    there must be a space after each comma.  This allows you
+    to add numbers without quoting.
+yaml: |
+    attendances: [ 45,123, 70,000, 17,222 ]
+php: |
+    array('attendances' => array(45123, 70000, 17222))
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsFoldedScalars.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsFoldedScalars.yml
new file mode 100644
index 00000000..a14735a5
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/YtsFoldedScalars.yml
@@ -0,0 +1,176 @@
+--- %YAML:1.0
+test: Single ending newline
+brief: >
+    A pipe character, followed by an indented
+    block of text is treated as a literal
+    block, in which newlines are preserved
+    throughout the block, including the final
+    newline.
+yaml: |
+    ---
+    this: |
+        Foo
+        Bar
+php: |
+    array('this' => "Foo\nBar\n")
+---
+test: The '+' indicator
+brief: >
+    The '+' indicator says to keep newlines at the end of text
+    blocks.
+yaml: |
+    normal: |
+      extra new lines not kept
+
+    preserving: |+
+      extra new lines are kept
+
+
+    dummy: value
+php: |
+    array(
+        'normal' => "extra new lines not kept\n",
+        'preserving' => "extra new lines are kept\n\n\n",
+        'dummy' => 'value'
+    )
+---
+test: Three trailing newlines in literals
+brief: >
+    To give you more control over how space
+    is preserved in text blocks, YAML has
+    the keep '+' and chomp '-' indicators.
+    The keep indicator will preserve all
+    ending newlines, while the chomp indicator
+    will strip all ending newlines.
+yaml: |
+    clipped: |
+        This has one newline.
+
+
+
+    same as "clipped" above: "This has one newline.\n"
+
+    stripped: |-
+        This has no newline.
+
+
+
+    same as "stripped" above: "This has no newline."
+
+    kept: |+
+        This has four newlines.
+
+
+
+    same as "kept" above: "This has four newlines.\n\n\n\n"
+php: |
+    array(
+      'clipped' => "This has one newline.\n",
+      'same as "clipped" above' => "This has one newline.\n",
+      'stripped' => 'This has no newline.',
+      'same as "stripped" above' => 'This has no newline.',
+      'kept' => "This has four newlines.\n\n\n\n",
+      'same as "kept" above' => "This has four newlines.\n\n\n\n"
+    )
+---
+test: Extra trailing newlines with spaces
+todo: true
+brief: >
+    Normally, only a single newline is kept
+    from the end of a literal block, unless the
+    keep '+' character is used in combination
+    with the pipe.  The following example
+    will preserve all ending whitespace
+    since the last line of both literal blocks
+    contains spaces which extend past the indentation
+    level.
+yaml: |
+    ---
+    this: |
+        Foo
+
+
+    kept: |+
+        Foo
+
+
+php: |
+    array('this' => "Foo\n\n  \n",
+      'kept' => "Foo\n\n  \n" )
+
+---
+test: Folded Block in a Sequence
+brief: >
+    A greater-then character, followed by an indented
+    block of text is treated as a folded block, in
+    which lines of text separated by a single newline
+    are concatenated as a single line.
+yaml: |
+    ---
+    - apple
+    - banana
+    - >
+        can't you see
+        the beauty of yaml?
+        hmm
+    - dog
+php: |
+    array(
+        'apple',
+        'banana',
+        "can't you see the beauty of yaml? hmm\n",
+        'dog'
+    )
+---
+test: Folded Block as a Mapping Value
+brief: >
+    Both literal and folded blocks can be
+    used in collections, as values in a
+    sequence or a mapping.
+yaml: |
+    ---
+    quote: >
+        Mark McGwire's
+        year was crippled
+        by a knee injury.
+    source: espn
+php: |
+    array(
+        'quote' => "Mark McGwire's year was crippled by a knee injury.\n",
+        'source' => 'espn'
+    )
+---
+test: Three trailing newlines in folded blocks
+brief: >
+    The keep and chomp indicators can also
+    be applied to folded blocks.
+yaml: |
+    clipped: >
+        This has one newline.
+
+
+
+    same as "clipped" above: "This has one newline.\n"
+
+    stripped: >-
+        This has no newline.
+
+
+
+    same as "stripped" above: "This has no newline."
+
+    kept: >+
+        This has four newlines.
+
+
+
+    same as "kept" above: "This has four newlines.\n\n\n\n"
+php: |
+    array(
+      'clipped' => "This has one newline.\n",
+      'same as "clipped" above' => "This has one newline.\n",
+      'stripped' => 'This has no newline.',
+      'same as "stripped" above' => 'This has no newline.',
+      'kept' => "This has four newlines.\n\n\n\n",
+      'same as "kept" above' => "This has four newlines.\n\n\n\n"
+    )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsNullsAndEmpties.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsNullsAndEmpties.yml
new file mode 100644
index 00000000..9a5300f2
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/YtsNullsAndEmpties.yml
@@ -0,0 +1,45 @@
+--- %YAML:1.0
+test: Empty Sequence
+brief: >
+    You can represent the empty sequence
+    with an empty inline sequence.
+yaml: |
+    empty: []
+php: |
+    array('empty' => array())
+---
+test: Empty Mapping
+brief: >
+    You can represent the empty mapping
+    with an empty inline mapping.
+yaml: |
+    empty: {}
+php: |
+    array('empty' => array())
+---
+test: Empty Sequence as Entire Document
+yaml: |
+    []
+php: |
+    array()
+---
+test: Empty Mapping as Entire Document
+yaml: |
+    {}
+php: |
+    array()
+---
+test: Null as Document
+yaml: |
+    ~
+php: |
+    null
+---
+test: Empty String
+brief: >
+    You can represent an empty string
+    with a pair of quotes.
+yaml: |
+    ''
+php: |
+    ''
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml
new file mode 100644
index 00000000..0a8b5def
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml
@@ -0,0 +1,1697 @@
+--- %YAML:1.0
+test: Sequence of scalars
+spec: 2.1
+yaml: |
+  - Mark McGwire
+  - Sammy Sosa
+  - Ken Griffey
+php: |
+  array('Mark McGwire', 'Sammy Sosa', 'Ken Griffey')
+---
+test: Mapping of scalars to scalars
+spec: 2.2
+yaml: |
+  hr:  65
+  avg: 0.278
+  rbi: 147
+php: |
+  array('hr' => 65, 'avg' => 0.278, 'rbi' => 147)
+---
+test: Mapping of scalars to sequences
+spec: 2.3
+yaml: |
+    american:
+       - Boston Red Sox
+       - Detroit Tigers
+       - New York Yankees
+    national:
+       - New York Mets
+       - Chicago Cubs
+       - Atlanta Braves
+php: |
+    array('american' =>
+        array( 'Boston Red Sox', 'Detroit Tigers',
+          'New York Yankees' ),
+      'national' =>
+        array( 'New York Mets', 'Chicago Cubs',
+          'Atlanta Braves' )
+    )
+---
+test: Sequence of mappings
+spec: 2.4
+yaml: |
+    -
+      name: Mark McGwire
+      hr:   65
+      avg:  0.278
+    -
+      name: Sammy Sosa
+      hr:   63
+      avg:  0.288
+php: |
+    array(
+      array('name' => 'Mark McGwire', 'hr' => 65, 'avg' => 0.278),
+      array('name' => 'Sammy Sosa', 'hr' => 63, 'avg' => 0.288)
+    )
+---
+test: Legacy A5
+todo: true
+spec: legacy_A5
+yaml: |
+    ?
+        - New York Yankees
+        - Atlanta Braves
+    :
+      - 2001-07-02
+      - 2001-08-12
+      - 2001-08-14
+    ?
+        - Detroit Tigers
+        - Chicago Cubs
+    :
+      - 2001-07-23
+perl-busted: >
+    YAML.pm will be able to emulate this behavior soon. In this regard
+    it may be somewhat more correct than Python's native behaviour which
+    can only use tuples as mapping keys. PyYAML will also need to figure
+    out some clever way to roundtrip structured keys.
+python: |
+    [
+    {
+        ('New York Yankees', 'Atlanta Braves'):
+            [yaml.timestamp('2001-07-02'),
+             yaml.timestamp('2001-08-12'),
+             yaml.timestamp('2001-08-14')],
+        ('Detroit Tigers', 'Chicago Cubs'):
+        [yaml.timestamp('2001-07-23')]
+    }
+    ]
+ruby: |
+    {
+      [ 'New York Yankees', 'Atlanta Braves' ] =>
+        [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ), Date.new( 2001, 8, 14 ) ],
+      [ 'Detroit Tigers', 'Chicago Cubs' ] =>
+        [ Date.new( 2001, 7, 23 ) ]
+    }
+syck: |
+  struct test_node seq1[] = {
+      { T_STR, 0, "New York Yankees" },
+      { T_STR, 0, "Atlanta Braves" },
+      end_node
+  };
+  struct test_node seq2[] = {
+      { T_STR, 0, "2001-07-02" },
+      { T_STR, 0, "2001-08-12" },
+      { T_STR, 0, "2001-08-14" },
+      end_node
+  };
+  struct test_node seq3[] = {
+      { T_STR, 0, "Detroit Tigers" },
+      { T_STR, 0, "Chicago Cubs" },
+      end_node
+  };
+  struct test_node seq4[] = {
+      { T_STR, 0, "2001-07-23" },
+      end_node
+  };
+  struct test_node map[] = {
+      { T_SEQ, 0, 0, seq1 },
+      { T_SEQ, 0, 0, seq2 },
+      { T_SEQ, 0, 0, seq3 },
+      { T_SEQ, 0, 0, seq4 },
+      end_node
+  };
+  struct test_node stream[] = {
+      { T_MAP, 0, 0, map },
+      end_node
+  };
+
+---
+test: Sequence of sequences
+spec: 2.5
+yaml: |
+  - [ name         , hr , avg   ]
+  - [ Mark McGwire , 65 , 0.278 ]
+  - [ Sammy Sosa   , 63 , 0.288 ]
+php: |
+  array(
+    array( 'name', 'hr', 'avg' ),
+    array( 'Mark McGwire', 65, 0.278 ),
+    array( 'Sammy Sosa', 63, 0.288 )
+  )
+---
+test: Mapping of mappings
+todo: true
+spec: 2.6
+yaml: |
+  Mark McGwire: {hr: 65, avg: 0.278}
+  Sammy Sosa: {
+      hr: 63,
+      avg: 0.288
+    }
+php: |
+  array(
+    'Mark McGwire' =>
+      array( 'hr' => 65, 'avg' => 0.278 ),
+    'Sammy Sosa' =>
+      array( 'hr' => 63, 'avg' => 0.288 )
+  )
+---
+test: Two documents in a stream each with a leading comment
+todo: true
+spec: 2.7
+yaml: |
+  # Ranking of 1998 home runs
+  ---
+  - Mark McGwire
+  - Sammy Sosa
+  - Ken Griffey
+
+  # Team ranking
+  ---
+  - Chicago Cubs
+  - St Louis Cardinals
+ruby: |
+  y = YAML::Stream.new
+  y.add( [ 'Mark McGwire', 'Sammy Sosa', 'Ken Griffey' ] )
+  y.add( [ 'Chicago Cubs', 'St Louis Cardinals' ] )
+documents: 2
+
+---
+test: Play by play feed from a game
+todo: true
+spec: 2.8
+yaml: |
+  ---
+  time: 20:03:20
+  player: Sammy Sosa
+  action: strike (miss)
+  ...
+  ---
+  time: 20:03:47
+  player: Sammy Sosa
+  action: grand slam
+  ...
+perl: |
+  [ 'Mark McGwire', 'Sammy Sosa', 'Ken Griffey' ]
+documents: 2
+
+---
+test: Single document with two comments
+spec: 2.9
+yaml: |
+  hr: # 1998 hr ranking
+    - Mark McGwire
+    - Sammy Sosa
+  rbi:
+    # 1998 rbi ranking
+    - Sammy Sosa
+    - Ken Griffey
+php: |
+  array(
+    'hr' => array( 'Mark McGwire', 'Sammy Sosa' ),
+    'rbi' => array( 'Sammy Sosa', 'Ken Griffey' )
+  )
+---
+test: Node for Sammy Sosa appears twice in this document
+spec: 2.10
+yaml: |
+   ---
+   hr:
+      - Mark McGwire
+      # Following node labeled SS
+      - &SS Sammy Sosa
+   rbi:
+      - *SS # Subsequent occurrence
+      - Ken Griffey
+php: |
+   array(
+      'hr' =>
+         array('Mark McGwire', 'Sammy Sosa'),
+      'rbi' =>
+         array('Sammy Sosa', 'Ken Griffey')
+   )
+---
+test: Mapping between sequences
+todo: true
+spec: 2.11
+yaml: |
+   ? # PLAY SCHEDULE
+     - Detroit Tigers
+     - Chicago Cubs
+   :
+     - 2001-07-23
+
+   ? [ New York Yankees,
+       Atlanta Braves ]
+   : [ 2001-07-02, 2001-08-12,
+       2001-08-14 ]
+ruby: |
+   {
+      [ 'Detroit Tigers', 'Chicago Cubs' ] => [ Date.new( 2001, 7, 23 ) ],
+      [ 'New York Yankees', 'Atlanta Braves' ] => [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ), Date.new( 2001, 8, 14 ) ]
+   }
+syck: |
+  struct test_node seq1[] = {
+      { T_STR, 0, "New York Yankees" },
+      { T_STR, 0, "Atlanta Braves" },
+      end_node
+  };
+  struct test_node seq2[] = {
+      { T_STR, 0, "2001-07-02" },
+      { T_STR, 0, "2001-08-12" },
+      { T_STR, 0, "2001-08-14" },
+      end_node
+  };
+  struct test_node seq3[] = {
+      { T_STR, 0, "Detroit Tigers" },
+      { T_STR, 0, "Chicago Cubs" },
+      end_node
+  };
+  struct test_node seq4[] = {
+      { T_STR, 0, "2001-07-23" },
+      end_node
+  };
+  struct test_node map[] = {
+      { T_SEQ, 0, 0, seq3 },
+      { T_SEQ, 0, 0, seq4 },
+      { T_SEQ, 0, 0, seq1 },
+      { T_SEQ, 0, 0, seq2 },
+      end_node
+  };
+  struct test_node stream[] = {
+      { T_MAP, 0, 0, map },
+      end_node
+  };
+
+---
+test: Sequence key shortcut
+spec: 2.12
+yaml: |
+  ---
+  # products purchased
+  - item    : Super Hoop
+    quantity: 1
+  - item    : Basketball
+    quantity: 4
+  - item    : Big Shoes
+    quantity: 1
+php: |
+  array (
+    array (
+      'item' => 'Super Hoop',
+      'quantity' => 1,
+    ),
+    array (
+      'item' => 'Basketball',
+      'quantity' => 4,
+    ),
+    array (
+      'item' => 'Big Shoes',
+      'quantity' => 1,
+    )
+  )
+perl: |
+  [
+     { item => 'Super Hoop', quantity => 1 },
+     { item => 'Basketball', quantity => 4 },
+     { item => 'Big Shoes',  quantity => 1 }
+  ]
+
+ruby: |
+  [
+     { 'item' => 'Super Hoop', 'quantity' => 1 },
+     { 'item' => 'Basketball', 'quantity' => 4 },
+     { 'item' => 'Big Shoes', 'quantity' => 1 }
+  ]
+python: |
+  [
+       { 'item': 'Super Hoop', 'quantity': 1 },
+       { 'item': 'Basketball', 'quantity': 4 },
+       { 'item': 'Big Shoes',  'quantity': 1 }
+  ]
+syck: |
+  struct test_node map1[] = {
+      { T_STR, 0, "item" },
+          { T_STR, 0, "Super Hoop" },
+      { T_STR, 0, "quantity" },
+          { T_STR, 0, "1" },
+      end_node
+  };
+  struct test_node map2[] = {
+      { T_STR, 0, "item" },
+          { T_STR, 0, "Basketball" },
+      { T_STR, 0, "quantity" },
+          { T_STR, 0, "4" },
+      end_node
+  };
+  struct test_node map3[] = {
+      { T_STR, 0, "item" },
+          { T_STR, 0, "Big Shoes" },
+      { T_STR, 0, "quantity" },
+          { T_STR, 0, "1" },
+      end_node
+  };
+  struct test_node seq[] = {
+      { T_MAP, 0, 0, map1 },
+      { T_MAP, 0, 0, map2 },
+      { T_MAP, 0, 0, map3 },
+      end_node
+  };
+  struct test_node stream[] = {
+      { T_SEQ, 0, 0, seq },
+      end_node
+  };
+
+
+---
+test: Literal perserves newlines
+todo: true
+spec: 2.13
+yaml: |
+  # ASCII Art
+  --- |
+    \//||\/||
+    // ||  ||_
+perl: |
+  "\\//||\\/||\n// ||  ||_\n"
+ruby: |
+  "\\//||\\/||\n// ||  ||_\n"
+python: |
+    [
+        flushLeft(
+        """
+        \//||\/||
+        // ||  ||_
+        """
+        )
+    ]
+syck: |
+  struct test_node stream[] = {
+      { T_STR, 0, "\\//||\\/||\n// ||  ||_\n" },
+      end_node
+  };
+
+---
+test: Folded treats newlines as a space
+todo: true
+spec: 2.14
+yaml: |
+  ---
+    Mark McGwire's
+    year was crippled
+    by a knee injury.
+perl: |
+  "Mark McGwire's year was crippled by a knee injury."
+ruby: |
+  "Mark McGwire's year was crippled by a knee injury."
+python: |
+    [ "Mark McGwire's year was crippled by a knee injury." ]
+syck: |
+  struct test_node stream[] = {
+      { T_STR, 0, "Mark McGwire's year was crippled by a knee injury." },
+      end_node
+  };
+
+---
+test: Newlines preserved for indented and blank lines
+todo: true
+spec: 2.15
+yaml: |
+  --- >
+   Sammy Sosa completed another
+   fine season with great stats.
+
+     63 Home Runs
+     0.288 Batting Average
+
+   What a year!
+perl: |
+  "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n"
+ruby: |
+  "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n"
+python: |
+    [
+        flushLeft(
+        """
+        Sammy Sosa completed another fine season with great stats.
+
+          63 Home Runs
+          0.288 Batting Average
+
+        What a year!
+        """
+        )
+    ]
+syck: |
+  struct test_node stream[] = {
+      { T_STR, 0, "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n" },
+      end_node
+  };
+
+
+---
+test: Indentation determines scope
+spec: 2.16
+yaml: |
+  name: Mark McGwire
+  accomplishment: >
+     Mark set a major league
+     home run record in 1998.
+  stats: |
+     65 Home Runs
+     0.278 Batting Average
+php: |
+  array(
+    'name' => 'Mark McGwire',
+    'accomplishment' => "Mark set a major league home run record in 1998.\n",
+    'stats' => "65 Home Runs\n0.278 Batting Average\n"
+  )
+---
+test: Quoted scalars
+todo: true
+spec: 2.17
+yaml: |
+  unicode: "Sosa did fine.\u263A"
+  control: "\b1998\t1999\t2000\n"
+  hexesc:  "\x0D\x0A is \r\n"
+
+  single: '"Howdy!" he cried.'
+  quoted: ' # not a ''comment''.'
+  tie-fighter: '|\-*-/|'
+ruby: |
+  {
+    "tie-fighter" => "|\\-*-/|",
+    "control"=>"\0101998\t1999\t2000\n",
+    "unicode"=>"Sosa did fine." + ["263A".hex ].pack('U*'),
+    "quoted"=>" # not a 'comment'.",
+    "single"=>"\"Howdy!\" he cried.",
+    "hexesc"=>"\r\n is \r\n"
+  }
+---
+test: Multiline flow scalars
+todo: true
+spec: 2.18
+yaml: |
+  plain:
+    This unquoted scalar
+    spans many lines.
+
+  quoted: "So does this
+    quoted scalar.\n"
+ruby: |
+  {
+    'plain' => 'This unquoted scalar spans many lines.',
+    'quoted' => "So does this quoted scalar.\n"
+  }
+---
+test: Integers
+spec: 2.19
+yaml: |
+  canonical: 12345
+  decimal: +12,345
+  octal: 014
+  hexadecimal: 0xC
+php: |
+  array(
+    'canonical' => 12345,
+    'decimal' => 12345,
+    'octal' => 014,
+    'hexadecimal' => 0xC
+  )
+---
+# FIX: spec shows parens around -inf and NaN
+test: Floating point
+spec: 2.20
+yaml: |
+  canonical: 1.23015e+3
+  exponential: 12.3015e+02
+  fixed: 1,230.15
+  negative infinity: -.inf
+  not a number: .NaN
+  float as whole number: !!float 1
+php: |
+  array(
+    'canonical' => 1230.15,
+    'exponential' => 1230.15,
+    'fixed' => 1230.15,
+    'negative infinity' => log(0),
+    'not a number' => -log(0),
+    'float as whole number' => (float) 1
+  )
+---
+test: Miscellaneous
+spec: 2.21
+yaml: |
+  null: ~
+  true: true
+  false: false
+  string: '12345'
+php: |
+  array(
+    '' => null,
+    1 => true,
+    0 => false,
+    'string' => '12345'
+  )
+---
+test: Timestamps
+todo: true
+spec: 2.22
+yaml: |
+  canonical: 2001-12-15T02:59:43.1Z
+  iso8601:  2001-12-14t21:59:43.10-05:00
+  spaced:  2001-12-14 21:59:43.10 -05:00
+  date:   2002-12-14 # Time is noon UTC
+php: |
+  array(
+    'canonical' => YAML::mktime( 2001, 12, 15, 2, 59, 43, 0.10 ),
+    'iso8601' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
+    'spaced' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
+    'date' => Date.new( 2002, 12, 14 )
+  )
+---
+test: legacy Timestamps test
+todo: true
+spec: legacy D4
+yaml: |
+    canonical: 2001-12-15T02:59:43.00Z
+    iso8601:  2001-02-28t21:59:43.00-05:00
+    spaced:  2001-12-14 21:59:43.00 -05:00
+    date:   2002-12-14
+php: |
+   array(
+     'canonical' => Time::utc( 2001, 12, 15, 2, 59, 43, 0 ),
+     'iso8601' => YAML::mktime( 2001, 2, 28, 21, 59, 43, 0, "-05:00" ),
+     'spaced' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0, "-05:00" ),
+     'date' => Date.new( 2002, 12, 14 )
+   )
+---
+test: Various explicit families
+todo: true
+spec: 2.23
+yaml: |
+  not-date: !str 2002-04-28
+  picture: !binary |
+   R0lGODlhDAAMAIQAAP//9/X
+   17unp5WZmZgAAAOfn515eXv
+   Pz7Y6OjuDg4J+fn5OTk6enp
+   56enmleECcgggoBADs=
+
+  application specific tag: !!something |
+   The semantics of the tag
+   above may be different for
+   different documents.
+
+ruby-setup: |
+  YAML.add_private_type( "something" ) do |type, val|
+    "SOMETHING: #{val}"
+  end
+ruby: |
+  {
+    'not-date' => '2002-04-28',
+    'picture' => "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236i^\020' \202\n\001\000;",
+    'application specific tag' => "SOMETHING: The semantics of the tag\nabove may be different for\ndifferent documents.\n"
+  }
+---
+test: Application specific family
+todo: true
+spec: 2.24
+yaml: |
+  # Establish a tag prefix
+  --- !clarkevans.com,2002/graph/^shape
+    # Use the prefix: shorthand for
+    # !clarkevans.com,2002/graph/circle
+  - !^circle
+    center: &ORIGIN {x: 73, 'y': 129}
+    radius: 7
+  - !^line # !clarkevans.com,2002/graph/line
+    start: *ORIGIN
+    finish: { x: 89, 'y': 102 }
+  - !^label
+    start: *ORIGIN
+    color: 0xFFEEBB
+    value: Pretty vector drawing.
+ruby-setup: |
+  YAML.add_domain_type( "clarkevans.com,2002", 'graph/shape' ) { |type, val|
+    if Array === val
+      val << "Shape Container"
+      val
+    else
+      raise YAML::Error, "Invalid graph of class #{ val.class }: " + val.inspect
+    end
+  }
+  one_shape_proc = Proc.new { |type, val|
+    scheme, domain, type = type.split( /:/, 3 )
+    if val.is_a? ::Hash
+      val['TYPE'] = "Shape: #{type}"
+      val
+    else
+      raise YAML::Error, "Invalid graph of class #{ val.class }: " + val.inspect
+    end
+  }
+  YAML.add_domain_type( "clarkevans.com,2002", 'graph/circle', &one_shape_proc )
+  YAML.add_domain_type( "clarkevans.com,2002", 'graph/line', &one_shape_proc )
+  YAML.add_domain_type( "clarkevans.com,2002", 'graph/label', &one_shape_proc )
+ruby: |
+  [
+    {
+      "radius" => 7,
+      "center"=>
+      {
+        "x" => 73,
+        "y" => 129
+      },
+      "TYPE" => "Shape: graph/circle"
+    }, {
+      "finish" =>
+      {
+        "x" => 89,
+        "y" => 102
+      },
+      "TYPE" => "Shape: graph/line",
+      "start" =>
+      {
+        "x" => 73,
+        "y" => 129
+      }
+    }, {
+      "TYPE" => "Shape: graph/label",
+      "value" => "Pretty vector drawing.",
+      "start" =>
+      {
+        "x" => 73,
+        "y" => 129
+      },
+      "color" => 16772795
+    },
+    "Shape Container"
+  ]
+# ---
+# test: Unordered set
+# spec: 2.25
+# yaml: |
+#   # sets are represented as a
+#   # mapping where each key is
+#   # associated with the empty string
+#   --- !set
+#   ? Mark McGwire
+#   ? Sammy Sosa
+#   ? Ken Griff
+---
+test: Ordered mappings
+todo: true
+spec: 2.26
+yaml: |
+  # ordered maps are represented as
+  # a sequence of mappings, with
+  # each mapping having one key
+  --- !omap
+  - Mark McGwire: 65
+  - Sammy Sosa: 63
+  - Ken Griffy: 58
+ruby: |
+  YAML::Omap[
+    'Mark McGwire', 65,
+    'Sammy Sosa', 63,
+    'Ken Griffy', 58
+  ]
+---
+test: Invoice
+dump_skip: true
+spec: 2.27
+yaml: |
+  --- !clarkevans.com,2002/^invoice
+  invoice: 34843
+  date   : 2001-01-23
+  bill-to: &id001
+      given  : Chris
+      family : Dumars
+      address:
+          lines: |
+              458 Walkman Dr.
+              Suite #292
+          city    : Royal Oak
+          state   : MI
+          postal  : 48046
+  ship-to: *id001
+  product:
+      -
+        sku         : BL394D
+        quantity    : 4
+        description : Basketball
+        price       : 450.00
+      -
+        sku         : BL4438H
+        quantity    : 1
+        description : Super Hoop
+        price       : 2392.00
+  tax  : 251.42
+  total: 4443.52
+  comments: >
+    Late afternoon is best.
+    Backup contact is Nancy
+    Billsmer @ 338-4338.
+php: |
+  array(
+     'invoice' => 34843, 'date' => mktime(0, 0, 0, 1, 23, 2001),
+     'bill-to' =>
+      array( 'given' => 'Chris', 'family' => 'Dumars', 'address' => array( 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak', 'state' => 'MI', 'postal' => 48046 ) )
+     , 'ship-to' =>
+      array( 'given' => 'Chris', 'family' => 'Dumars', 'address' => array( 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak', 'state' => 'MI', 'postal' => 48046 ) )
+     , 'product' =>
+       array(
+        array( 'sku' => 'BL394D', 'quantity' => 4, 'description' => 'Basketball', 'price' => 450.00 ),
+        array( 'sku' => 'BL4438H', 'quantity' => 1, 'description' => 'Super Hoop', 'price' => 2392.00 )
+      ),
+     'tax' => 251.42, 'total' => 4443.52,
+     'comments' => "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.\n"
+  )
+---
+test: Log file
+todo: true
+spec: 2.28
+yaml: |
+  ---
+  Time: 2001-11-23 15:01:42 -05:00
+  User: ed
+  Warning: >
+    This is an error message
+    for the log file
+  ---
+  Time: 2001-11-23 15:02:31 -05:00
+  User: ed
+  Warning: >
+    A slightly different error
+    message.
+  ---
+  Date: 2001-11-23 15:03:17 -05:00
+  User: ed
+  Fatal: >
+    Unknown variable "bar"
+  Stack:
+    - file: TopClass.py
+      line: 23
+      code: |
+        x = MoreObject("345\n")
+    - file: MoreClass.py
+      line: 58
+      code: |-
+        foo = bar
+ruby: |
+  y = YAML::Stream.new
+  y.add( { 'Time' => YAML::mktime( 2001, 11, 23, 15, 01, 42, 00, "-05:00" ),
+           'User' => 'ed', 'Warning' => "This is an error message for the log file\n" } )
+  y.add( { 'Time' => YAML::mktime( 2001, 11, 23, 15, 02, 31, 00, "-05:00" ),
+           'User' => 'ed', 'Warning' => "A slightly different error message.\n" } )
+  y.add( { 'Date' => YAML::mktime( 2001, 11, 23, 15, 03, 17, 00, "-05:00" ),
+           'User' => 'ed', 'Fatal' => "Unknown variable \"bar\"\n",
+           'Stack' => [
+           { 'file' => 'TopClass.py', 'line' => 23, 'code' => "x = MoreObject(\"345\\n\")\n" },
+           { 'file' => 'MoreClass.py', 'line' => 58, 'code' => "foo = bar" } ] } )
+documents: 3
+
+---
+test: Throwaway comments
+yaml: |
+   ### These are four throwaway comment  ###
+
+   ### lines (the second line is empty). ###
+   this: |   # Comments may trail lines.
+      contains three lines of text.
+      The third one starts with a
+      # character. This isn't a comment.
+
+   # These are three throwaway comment
+   # lines (the first line is empty).
+php: |
+   array(
+     'this' => "contains three lines of text.\nThe third one starts with a\n# character. This isn't a comment.\n"
+   )
+---
+test: Document with a single value
+todo: true
+yaml: |
+   --- >
+   This YAML stream contains a single text value.
+   The next stream is a log file - a sequence of
+   log entries. Adding an entry to the log is a
+   simple matter of appending it at the end.
+ruby: |
+   "This YAML stream contains a single text value. The next stream is a log file - a sequence of log entries. Adding an entry to the log is a simple matter of appending it at the end.\n"
+---
+test: Document stream
+todo: true
+yaml: |
+   ---
+   at: 2001-08-12 09:25:00.00 Z
+   type: GET
+   HTTP: '1.0'
+   url: '/index.html'
+   ---
+   at: 2001-08-12 09:25:10.00 Z
+   type: GET
+   HTTP: '1.0'
+   url: '/toc.html'
+ruby: |
+   y = YAML::Stream.new
+   y.add( {
+      'at' => Time::utc( 2001, 8, 12, 9, 25, 00 ),
+      'type' => 'GET',
+      'HTTP' => '1.0',
+      'url' => '/index.html'
+   } )
+   y.add( {
+      'at' => Time::utc( 2001, 8, 12, 9, 25, 10 ),
+      'type' => 'GET',
+      'HTTP' => '1.0',
+      'url' => '/toc.html'
+   } )
+documents: 2
+
+---
+test: Top level mapping
+yaml: |
+   # This stream is an example of a top-level mapping.
+   invoice : 34843
+   date    : 2001-01-23
+   total   : 4443.52
+php: |
+   array(
+      'invoice' => 34843,
+      'date' => mktime(0, 0, 0, 1, 23, 2001),
+      'total' => 4443.52
+   )
+---
+test: Single-line documents
+todo: true
+yaml: |
+  # The following is a sequence of three documents.
+  # The first contains an empty mapping, the second
+  # an empty sequence, and the last an empty string.
+  --- {}
+  --- [ ]
+  --- ''
+ruby: |
+  y = YAML::Stream.new
+  y.add( {} )
+  y.add( [] )
+  y.add( '' )
+documents: 3
+
+---
+test: Document with pause
+todo: true
+yaml: |
+  # A communication channel based on a YAML stream.
+  ---
+  sent at: 2002-06-06 11:46:25.10 Z
+  payload: Whatever
+  # Receiver can process this as soon as the following is sent:
+  ...
+  # Even if the next message is sent long after:
+  ---
+  sent at: 2002-06-06 12:05:53.47 Z
+  payload: Whatever
+  ...
+ruby: |
+  y = YAML::Stream.new
+  y.add(
+    { 'sent at' => YAML::mktime( 2002, 6, 6, 11, 46, 25, 0.10 ),
+      'payload' => 'Whatever' }
+  )
+  y.add(
+    { "payload" => "Whatever", "sent at" => YAML::mktime( 2002, 6, 6, 12, 5, 53, 0.47 ) }
+  )
+documents: 2
+
+---
+test: Explicit typing
+yaml: |
+   integer: 12
+   also int: ! "12"
+   string: !str 12
+php: |
+   array( 'integer' => 12, 'also int' => 12, 'string' => '12' )
+---
+test: Private types
+todo: true
+yaml: |
+  # Both examples below make use of the 'x-private:ball'
+  # type family URI, but with different semantics.
+  ---
+  pool: !!ball
+    number: 8
+    color: black
+  ---
+  bearing: !!ball
+    material: steel
+ruby: |
+  y = YAML::Stream.new
+  y.add( { 'pool' =>
+    YAML::PrivateType.new( 'ball',
+      { 'number' => 8, 'color' => 'black' } ) }
+  )
+  y.add( { 'bearing' =>
+    YAML::PrivateType.new( 'ball',
+      { 'material' => 'steel' } ) }
+  )
+documents: 2
+
+---
+test: Type family under yaml.org
+yaml: |
+  # The URI is 'tag:yaml.org,2002:str'
+  - !str a Unicode string
+php: |
+  array( 'a Unicode string' )
+---
+test: Type family under perl.yaml.org
+todo: true
+yaml: |
+  # The URI is 'tag:perl.yaml.org,2002:Text::Tabs'
+  - !perl/Text::Tabs {}
+ruby: |
+  [ YAML::DomainType.new( 'perl.yaml.org,2002', 'Text::Tabs', {} ) ]
+---
+test: Type family under clarkevans.com
+todo: true
+yaml: |
+  # The URI is 'tag:clarkevans.com,2003-02:timesheet'
+  - !clarkevans.com,2003-02/timesheet {}
+ruby: |
+  [ YAML::DomainType.new( 'clarkevans.com,2003-02', 'timesheet', {} ) ]
+---
+test: URI Escaping
+todo: true
+yaml: |
+  same:
+    - !domain.tld,2002/type\x30 value
+    - !domain.tld,2002/type0 value
+  different: # As far as the YAML parser is concerned
+    - !domain.tld,2002/type%30 value
+    - !domain.tld,2002/type0 value
+ruby-setup: |
+  YAML.add_domain_type( "domain.tld,2002", "type0" ) { |type, val|
+    "ONE: #{val}"
+  }
+  YAML.add_domain_type( "domain.tld,2002", "type%30" ) { |type, val|
+    "TWO: #{val}"
+  }
+ruby: |
+  { 'same' => [ 'ONE: value', 'ONE: value' ], 'different' => [ 'TWO: value', 'ONE: value' ] }
+---
+test: URI Prefixing
+todo: true
+yaml: |
+  # 'tag:domain.tld,2002:invoice' is some type family.
+  invoice: !domain.tld,2002/^invoice
+    # 'seq' is shorthand for 'tag:yaml.org,2002:seq'.
+    # This does not effect '^customer' below
+    # because it is does not specify a prefix.
+    customers: !seq
+      # '^customer' is shorthand for the full
+      # notation 'tag:domain.tld,2002:customer'.
+      - !^customer
+        given : Chris
+        family : Dumars
+ruby-setup: |
+  YAML.add_domain_type( "domain.tld,2002", /(invoice|customer)/ ) { |type, val|
+    if val.is_a? ::Hash
+      scheme, domain, type = type.split( /:/, 3 )
+      val['type'] = "domain #{type}"
+      val
+    else
+      raise YAML::Error, "Not a Hash in domain.tld/invoice: " + val.inspect
+    end
+  }
+ruby: |
+  { "invoice"=> { "customers"=> [ { "given"=>"Chris", "type"=>"domain customer", "family"=>"Dumars" } ], "type"=>"domain invoice" } }
+
+---
+test: Overriding anchors
+yaml: |
+  anchor : &A001 This scalar has an anchor.
+  override : &A001 >
+   The alias node below is a
+   repeated use of this value.
+  alias : *A001
+php: |
+  array( 'anchor' => 'This scalar has an anchor.',
+    'override' => "The alias node below is a repeated use of this value.\n",
+    'alias' => "The alias node below is a repeated use of this value.\n" )
+---
+test: Flow and block formatting
+todo: true
+yaml: |
+  empty: []
+  flow: [ one, two, three # May span lines,
+           , four,           # indentation is
+             five ]          # mostly ignored.
+  block:
+   - First item in top sequence
+   -
+    - Subordinate sequence entry
+   - >
+     A folded sequence entry
+   - Sixth item in top sequence
+ruby: |
+  { 'empty' => [], 'flow' => [ 'one', 'two', 'three', 'four', 'five' ],
+    'block' => [ 'First item in top sequence', [ 'Subordinate sequence entry' ],
+    "A folded sequence entry\n", 'Sixth item in top sequence' ] }
+---
+test: Complete mapping test
+todo: true
+yaml: |
+ empty: {}
+ flow: { one: 1, two: 2 }
+ spanning: { one: 1,
+    two: 2 }
+ block:
+  first : First entry
+  second:
+   key: Subordinate mapping
+  third:
+   - Subordinate sequence
+   - { }
+   - Previous mapping is empty.
+   - A key: value pair in a sequence.
+     A second: key:value pair.
+   - The previous entry is equal to the following one.
+   -
+     A key: value pair in a sequence.
+     A second: key:value pair.
+  !float 12 : This key is a float.
+  ? >
+   ?
+  : This key had to be protected.
+  "\a" : This key had to be escaped.
+  ? >
+   This is a
+   multi-line
+   folded key
+  : Whose value is
+    also multi-line.
+  ? this also works as a key
+  : with a value at the next line.
+  ?
+   - This key
+   - is a sequence
+  :
+   - With a sequence value.
+  ?
+   This: key
+   is a: mapping
+  :
+   with a: mapping value.
+ruby: |
+  { 'empty' => {}, 'flow' => { 'one' => 1, 'two' => 2 },
+    'spanning' => { 'one' => 1, 'two' => 2 },
+    'block' => { 'first' => 'First entry', 'second' =>
+    { 'key' => 'Subordinate mapping' }, 'third' =>
+      [ 'Subordinate sequence', {}, 'Previous mapping is empty.',
+        { 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' },
+        'The previous entry is equal to the following one.',
+        { 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' } ],
+    12.0 => 'This key is a float.', "?\n" => 'This key had to be protected.',
+    "\a" => 'This key had to be escaped.',
+    "This is a multi-line folded key\n" => "Whose value is also multi-line.",
+    'this also works as a key' => 'with a value at the next line.',
+    [ 'This key', 'is a sequence' ] => [ 'With a sequence value.' ] } }
+  # Couldn't recreate map exactly, so we'll do a detailed check to be sure it's entact
+  obj_y['block'].keys.each { |k|
+    if Hash === k
+      v = obj_y['block'][k]
+      if k['This'] == 'key' and k['is a'] == 'mapping' and v['with a'] == 'mapping value.'
+         obj_r['block'][k] = v
+      end
+    end
+  }
+---
+test: Literal explicit indentation
+yaml: |
+   # Explicit indentation must
+   # be given in all the three
+   # following cases.
+   leading spaces: |2
+         This value starts with four spaces.
+
+   leading line break: |2
+
+     This value starts with a line break.
+
+   leading comment indicator: |2
+     # first line starts with a
+     # character.
+
+   # Explicit indentation may
+   # also be given when it is
+   # not required.
+   redundant: |2
+     This value is indented 2 spaces.
+php: |
+   array(
+      'leading spaces' => "    This value starts with four spaces.\n",
+      'leading line break' => "\nThis value starts with a line break.\n",
+      'leading comment indicator' => "# first line starts with a\n# character.\n",
+      'redundant' => "This value is indented 2 spaces.\n"
+   )
+---
+test: Chomping and keep modifiers
+yaml: |
+    clipped: |
+        This has one newline.
+
+    same as "clipped" above: "This has one newline.\n"
+
+    stripped: |-
+        This has no newline.
+
+    same as "stripped" above: "This has no newline."
+
+    kept: |+
+        This has two newlines.
+
+    same as "kept" above: "This has two newlines.\n\n"
+php: |
+    array(
+      'clipped' => "This has one newline.\n",
+      'same as "clipped" above' => "This has one newline.\n",
+      'stripped' => 'This has no newline.',
+      'same as "stripped" above' => 'This has no newline.',
+      'kept' => "This has two newlines.\n\n",
+      'same as "kept" above' => "This has two newlines.\n\n"
+    )
+---
+test: Literal combinations
+todo: true
+yaml: |
+   empty: |
+
+   literal: |
+    The \ ' " characters may be
+    freely used. Leading white
+       space is significant.
+
+    Line breaks are significant.
+    Thus this value contains one
+    empty line and ends with a
+    single line break, but does
+    not start with one.
+
+   is equal to: "The \\ ' \" characters may \
+    be\nfreely used. Leading white\n   space \
+    is significant.\n\nLine breaks are \
+    significant.\nThus this value contains \
+    one\nempty line and ends with a\nsingle \
+    line break, but does\nnot start with one.\n"
+
+   # Comments may follow a block
+   # scalar value. They must be
+   # less indented.
+
+   # Modifiers may be combined in any order.
+   indented and chomped: |2-
+       This has no newline.
+
+   also written as: |-2
+       This has no newline.
+
+   both are equal to: "  This has no newline."
+php: |
+   array(
+     'empty' => '',
+     'literal' => "The \\ ' \" characters may be\nfreely used. Leading white\n   space " +
+       "is significant.\n\nLine breaks are significant.\nThus this value contains one\n" +
+       "empty line and ends with a\nsingle line break, but does\nnot start with one.\n",
+     'is equal to' => "The \\ ' \" characters may be\nfreely used. Leading white\n   space " +
+       "is significant.\n\nLine breaks are significant.\nThus this value contains one\n" +
+       "empty line and ends with a\nsingle line break, but does\nnot start with one.\n",
+     'indented and chomped' => '  This has no newline.',
+     'also written as' => '  This has no newline.',
+     'both are equal to' => '  This has no newline.'
+   )
+---
+test: Folded combinations
+todo: true
+yaml: |
+   empty: >
+
+   one paragraph: >
+    Line feeds are converted
+    to spaces, so this value
+    contains no line breaks
+    except for the final one.
+
+   multiple paragraphs: >2
+
+     An empty line, either
+     at the start or in
+     the value:
+
+     Is interpreted as a
+     line break. Thus this
+     value contains three
+     line breaks.
+
+   indented text: >
+       This is a folded
+       paragraph followed
+       by a list:
+        * first entry
+        * second entry
+       Followed by another
+       folded paragraph,
+       another list:
+
+        * first entry
+
+        * second entry
+
+       And a final folded
+       paragraph.
+
+   above is equal to: |
+       This is a folded paragraph followed by a list:
+        * first entry
+        * second entry
+       Followed by another folded paragraph, another list:
+
+        * first entry
+
+        * second entry
+
+       And a final folded paragraph.
+
+   # Explicit comments may follow
+   # but must be less indented.
+php: |
+   array(
+     'empty' => '',
+     'one paragraph' => 'Line feeds are converted to spaces, so this value'.
+       " contains no line breaks except for the final one.\n",
+     'multiple paragraphs' => "\nAn empty line, either at the start or in the value:\n".
+       "Is interpreted as a line break. Thus this value contains three line breaks.\n",
+     'indented text' => "This is a folded paragraph followed by a list:\n".
+       " * first entry\n * second entry\nFollowed by another folded paragraph, ".
+       "another list:\n\n * first entry\n\n * second entry\n\nAnd a final folded paragraph.\n",
+     'above is equal to' => "This is a folded paragraph followed by a list:\n".
+       " * first entry\n * second entry\nFollowed by another folded paragraph, ".
+       "another list:\n\n * first entry\n\n * second entry\n\nAnd a final folded paragraph.\n"
+   )
+---
+test: Single quotes
+todo: true
+yaml: |
+   empty: ''
+   second: '! : \ etc. can be used freely.'
+   third: 'a single quote '' must be escaped.'
+   span: 'this contains
+         six spaces
+
+         and one
+         line break'
+   is same as: "this contains six spaces\nand one line break"
+php: |
+   array(
+     'empty' => '',
+     'second' => '! : \\ etc. can be used freely.',
+     'third' => "a single quote ' must be escaped.",
+     'span' => "this contains six spaces\nand one line break",
+     'is same as' => "this contains six spaces\nand one line break"
+   )
+---
+test: Double quotes
+todo: true
+yaml: |
+   empty: ""
+   second: "! : etc. can be used freely."
+   third: "a \" or a \\ must be escaped."
+   fourth: "this value ends with an LF.\n"
+   span: "this contains
+     four  \
+         spaces"
+   is equal to: "this contains four  spaces"
+php: |
+   array(
+     'empty' => '',
+     'second' => '! : etc. can be used freely.',
+     'third' => 'a " or a \\ must be escaped.',
+     'fourth' => "this value ends with an LF.\n",
+     'span' => "this contains four  spaces",
+     'is equal to' => "this contains four  spaces"
+   )
+---
+test: Unquoted strings
+todo: true
+yaml: |
+   first: There is no unquoted empty string.
+
+   second: 12          ## This is an integer.
+
+   third: !str 12      ## This is a string.
+
+   span: this contains
+         six spaces
+
+         and one
+         line break
+
+   indicators: this has no comments.
+               #:foo and bar# are
+               both text.
+
+   flow: [ can span
+              lines, # comment
+              like
+              this ]
+
+   note: { one-line keys: but multi-line values }
+
+php: |
+   array(
+     'first' => 'There is no unquoted empty string.',
+     'second' => 12,
+     'third' => '12',
+     'span' => "this contains six spaces\nand one line break",
+     'indicators' => "this has no comments. #:foo and bar# are both text.",
+     'flow' => [ 'can span lines', 'like this' ],
+     'note' => { 'one-line keys' => 'but multi-line values' }
+   )
+---
+test: Spanning sequences
+todo: true
+yaml: |
+   # The following are equal seqs
+   # with different identities.
+   flow: [ one, two ]
+   spanning: [ one,
+        two ]
+   block:
+     - one
+     - two
+php: |
+   array(
+     'flow' => [ 'one', 'two' ],
+     'spanning' => [ 'one', 'two' ],
+     'block' => [ 'one', 'two' ]
+   )
+---
+test: Flow mappings
+yaml: |
+   # The following are equal maps
+   # with different identities.
+   flow: { one: 1, two: 2 }
+   block:
+       one: 1
+       two: 2
+php: |
+   array(
+     'flow' => array( 'one' => 1, 'two' => 2 ),
+     'block' => array( 'one' => 1, 'two' => 2 )
+   )
+---
+test: Representations of 12
+todo: true
+yaml: |
+   - 12 # An integer
+   # The following scalars
+   # are loaded to the
+   # string value '1' '2'.
+   - !str 12
+   - '12'
+   - "12"
+   - "\
+     1\
+     2\
+     "
+   # Strings containing paths and regexps can be unquoted:
+   - /foo/bar
+   - d:/foo/bar
+   - foo/bar
+   - /a.*b/
+php: |
+   array( 12, '12', '12', '12', '12', '/foo/bar', 'd:/foo/bar', 'foo/bar', '/a.*b/' )
+---
+test: "Null"
+todo: true
+yaml: |
+   canonical: ~
+
+   english: null
+
+   # This sequence has five
+   # entries, two with values.
+   sparse:
+     - ~
+     - 2nd entry
+     - Null
+     - 4th entry
+     -
+
+   four: This mapping has five keys,
+         only two with values.
+
+php: |
+   array (
+     'canonical' => null,
+     'english' => null,
+     'sparse' => array( null, '2nd entry', null, '4th entry', null ]),
+     'four' => 'This mapping has five keys, only two with values.'
+   )
+---
+test: Omap
+todo: true
+yaml: |
+   # Explicitly typed dictionary.
+   Bestiary: !omap
+     - aardvark: African pig-like ant eater. Ugly.
+     - anteater: South-American ant eater. Two species.
+     - anaconda: South-American constrictor snake. Scary.
+     # Etc.
+ruby: |
+   {
+     'Bestiary' => YAML::Omap[
+       'aardvark', 'African pig-like ant eater. Ugly.',
+       'anteater', 'South-American ant eater. Two species.',
+       'anaconda', 'South-American constrictor snake. Scary.'
+     ]
+   }
+
+---
+test: Pairs
+todo: true
+yaml: |
+  # Explicitly typed pairs.
+  tasks: !pairs
+    - meeting: with team.
+    - meeting: with boss.
+    - break: lunch.
+    - meeting: with client.
+ruby: |
+  {
+    'tasks' => YAML::Pairs[
+      'meeting', 'with team.',
+      'meeting', 'with boss.',
+      'break', 'lunch.',
+      'meeting', 'with client.'
+    ]
+  }
+
+---
+test: Set
+todo: true
+yaml: |
+  # Explicitly typed set.
+  baseball players: !set
+    Mark McGwire:
+    Sammy Sosa:
+    Ken Griffey:
+ruby: |
+  {
+    'baseball players' => YAML::Set[
+      'Mark McGwire', nil,
+      'Sammy Sosa', nil,
+      'Ken Griffey', nil
+    ]
+  }
+
+---
+test: Boolean
+yaml: |
+   false: used as key
+   logical:  true
+   answer: false
+php: |
+   array(
+     false => 'used as key',
+     'logical' => true,
+     'answer' => false
+   )
+---
+test: Integer
+yaml: |
+   canonical: 12345
+   decimal: +12,345
+   octal: 014
+   hexadecimal: 0xC
+php: |
+   array(
+     'canonical' => 12345,
+     'decimal' => 12345,
+     'octal' => 12,
+     'hexadecimal' => 12
+   )
+---
+test: Float
+yaml: |
+   canonical: 1.23015e+3
+   exponential: 12.3015e+02
+   fixed: 1,230.15
+   negative infinity: -.inf
+   not a number: .NaN
+php: |
+  array(
+    'canonical' => 1230.15,
+    'exponential' => 1230.15,
+    'fixed' => 1230.15,
+    'negative infinity' => log(0),
+    'not a number' => -log(0)
+  )
+---
+test: Timestamp
+todo: true
+yaml: |
+   canonical:       2001-12-15T02:59:43.1Z
+   valid iso8601:   2001-12-14t21:59:43.10-05:00
+   space separated: 2001-12-14 21:59:43.10 -05:00
+   date (noon UTC): 2002-12-14
+ruby: |
+   array(
+     'canonical' => YAML::mktime( 2001, 12, 15, 2, 59, 43, 0.10 ),
+     'valid iso8601' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
+     'space separated' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
+     'date (noon UTC)' => Date.new( 2002, 12, 14 )
+   )
+---
+test: Binary
+todo: true
+yaml: |
+   canonical: !binary "\
+    R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOfn515eXvPz7Y6OjuDg4J+fn5\
+    OTk6enp56enmlpaWNjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++f/++f/+\
+    +f/++f/++f/++f/++f/++SH+Dk1hZGUgd2l0aCBHSU1QACwAAAAADAAMAAAFLC\
+    AgjoEwnuNAFOhpEMTRiggcz4BNJHrv/zCFcLiwMWYNG84BwwEeECcgggoBADs="
+   base64: !binary |
+    R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOfn515eXvPz7Y6OjuDg4J+fn5
+    OTk6enp56enmlpaWNjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++f/++f/+
+    +f/++f/++f/++f/++f/++SH+Dk1hZGUgd2l0aCBHSU1QACwAAAAADAAMAAAFLC
+    AgjoEwnuNAFOhpEMTRiggcz4BNJHrv/zCFcLiwMWYNG84BwwEeECcgggoBADs=
+   description: >
+    The binary value above is a tiny arrow
+    encoded as a gif image.
+ruby-setup: |
+   arrow_gif = "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236iiiccc\243\243\243\204\204\204\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371!\376\016Made with GIMP\000,\000\000\000\000\f\000\f\000\000\005,  \216\2010\236\343@\024\350i\020\304\321\212\010\034\317\200M$z\357\3770\205p\270\2601f\r\e\316\001\303\001\036\020' \202\n\001\000;"
+ruby: |
+   {
+     'canonical' => arrow_gif,
+     'base64' => arrow_gif,
+     'description' => "The binary value above is a tiny arrow encoded as a gif image.\n"
+   }
+
+---
+test: Merge key
+todo: true
+yaml: |
+  ---
+  - &CENTER { x: 1, y: 2 }
+  - &LEFT { x: 0, y: 2 }
+  - &BIG { r: 10 }
+  - &SMALL { r: 1 }
+
+  # All the following maps are equal:
+
+  - # Explicit keys
+    x: 1
+    y: 2
+    r: 10
+    label: center/big
+
+  - # Merge one map
+    << : *CENTER
+    r: 10
+    label: center/big
+
+  - # Merge multiple maps
+    << : [ *CENTER, *BIG ]
+    label: center/big
+
+  - # Override
+    << : [ *BIG, *LEFT, *SMALL ]
+    x: 1
+    label: center/big
+
+ruby-setup: |
+  center = { 'x' => 1, 'y' => 2 }
+  left = { 'x' => 0, 'y' => 2 }
+  big = { 'r' => 10 }
+  small = { 'r' => 1 }
+  node1 = { 'x' => 1, 'y' => 2, 'r' => 10, 'label' => 'center/big' }
+  node2 = center.dup
+  node2.update( { 'r' => 10, 'label' => 'center/big' } )
+  node3 = big.dup
+  node3.update( center )
+  node3.update( { 'label' => 'center/big' } )
+  node4 = small.dup
+  node4.update( left )
+  node4.update( big )
+  node4.update( { 'x' => 1, 'label' => 'center/big' } )
+
+ruby: |
+  [
+    center, left, big, small, node1, node2, node3, node4
+  ]
+
+---
+test: Default key
+todo: true
+yaml: |
+   ---     # Old schema
+   link with:
+     - library1.dll
+     - library2.dll
+   ---     # New schema
+   link with:
+     - = : library1.dll
+       version: 1.2
+     - = : library2.dll
+       version: 2.3
+ruby: |
+   y = YAML::Stream.new
+   y.add( { 'link with' => [ 'library1.dll', 'library2.dll' ] } )
+   obj_h = Hash[ 'version' => 1.2 ]
+   obj_h.default = 'library1.dll'
+   obj_h2 = Hash[ 'version' => 2.3 ]
+   obj_h2.default = 'library2.dll'
+   y.add( { 'link with' => [ obj_h, obj_h2 ] } )
+documents: 2
+
+---
+test: Special keys
+todo: true
+yaml: |
+   "!": These three keys
+   "&": had to be quoted
+   "=": and are normal strings.
+   # NOTE: the following node should NOT be serialized this way.
+   encoded node :
+    !special '!' : '!type'
+    !special|canonical '&' : 12
+    = : value
+   # The proper way to serialize the above node is as follows:
+   node : !!type &12 value
+ruby: |
+   { '!' => 'These three keys', '&' => 'had to be quoted',
+     '=' => 'and are normal strings.',
+     'encoded node' => YAML::PrivateType.new( 'type', 'value' ),
+     'node' => YAML::PrivateType.new( 'type', 'value' ) }
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsTypeTransfers.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsTypeTransfers.yml
new file mode 100644
index 00000000..aac4e680
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/YtsTypeTransfers.yml
@@ -0,0 +1,244 @@
+--- %YAML:1.0
+test: Strings
+brief: >
+    Any group of characters beginning with an
+    alphabetic or numeric character is a string,
+    unless it belongs to one of the groups below
+    (such as an Integer or Time).
+yaml: |
+    String
+php: |
+    'String'
+---
+test: String characters
+brief: >
+    A string can contain any alphabetic or
+    numeric character, along with many
+    punctuation characters, including the
+    period, dash, space, quotes, exclamation, and
+    question mark.
+yaml: |
+    - What's Yaml?
+    - It's for writing data structures in plain text.
+    - And?
+    - And what? That's not good enough for you?
+    - No, I mean, "And what about Yaml?"
+    - Oh, oh yeah. Uh.. Yaml for Ruby.
+php: |
+    array(
+      "What's Yaml?",
+      "It's for writing data structures in plain text.",
+      "And?",
+      "And what? That's not good enough for you?",
+      "No, I mean, \"And what about Yaml?\"",
+      "Oh, oh yeah. Uh.. Yaml for Ruby."
+    )
+---
+test: Indicators in Strings
+brief: >
+    Be careful using indicators in strings.  In particular,
+    the comma, colon, and pound sign must be used carefully.
+yaml: |
+    the colon followed by space is an indicator: but is a string:right here
+    same for the pound sign: here we have it#in a string
+    the comma can, honestly, be used in most cases: [ but not in, inline collections ]
+php: |
+    array(
+      'the colon followed by space is an indicator' => 'but is a string:right here',
+      'same for the pound sign' => 'here we have it#in a string',
+      'the comma can, honestly, be used in most cases' => array('but not in', 'inline collections')
+    )
+---
+test: Forcing Strings
+brief: >
+    Any YAML type can be forced into a string using the
+    explicit !str method.
+yaml: |
+    date string: !str 2001-08-01
+    number string: !str 192
+php: |
+    array(
+      'date string' => '2001-08-01',
+      'number string' => '192'
+    )
+---
+test: Single-quoted Strings
+brief: >
+    You can also enclose your strings within single quotes,
+    which allows use of slashes, colons, and other indicators
+    freely.  Inside single quotes, you can represent a single
+    quote in your string by using two single quotes next to
+    each other.
+yaml: |
+    all my favorite symbols: '#:!/%.)'
+    a few i hate: '&(*'
+    why do i hate them?: 'it''s very hard to explain'
+    entities: '&pound; me'
+php: |
+    array(
+      'all my favorite symbols' => '#:!/%.)',
+      'a few i hate' => '&(*',
+      'why do i hate them?' => 'it\'s very hard to explain',
+      'entities' => '&pound; me'
+    )
+---
+test: Double-quoted Strings
+brief: >
+    Enclosing strings in double quotes allows you
+    to use escapings to represent ASCII and
+    Unicode characters.
+yaml: |
+    i know where i want my line breaks: "one here\nand another here\n"
+php: |
+    array(
+      'i know where i want my line breaks' => "one here\nand another here\n"
+    )
+---
+test: Multi-line Quoted Strings
+todo: true
+brief: >
+    Both single- and double-quoted strings may be
+    carried on to new lines in your YAML document.
+    They must be indented a step and indentation
+    is interpreted as a single space.
+yaml: |
+    i want a long string: "so i'm going to
+      let it go on and on to other lines
+      until i end it with a quote."
+php: |
+    array('i want a long string' => "so i'm going to ".
+         "let it go on and on to other lines ".
+         "until i end it with a quote."
+    )
+
+---
+test: Plain scalars
+todo: true
+brief: >
+    Unquoted strings may also span multiple lines, if they
+    are free of YAML space indicators and indented.
+yaml: |
+    - My little toe is broken in two places;
+    - I'm crazy to have skied this way;
+    - I'm not the craziest he's seen, since there was always the German guy
+      who skied for 3 hours on a broken shin bone (just below the kneecap);
+    - Nevertheless, second place is respectable, and he doesn't
+      recommend going for the record;
+    - He's going to put my foot in plaster for a month;
+    - This would impair my skiing ability somewhat for the
+      duration, as can be imagined.
+php: |
+    array(
+      "My little toe is broken in two places;",
+      "I'm crazy to have skied this way;",
+      "I'm not the craziest he's seen, since there was always ".
+         "the German guy who skied for 3 hours on a broken shin ".
+         "bone (just below the kneecap);",
+      "Nevertheless, second place is respectable, and he doesn't ".
+         "recommend going for the record;",
+      "He's going to put my foot in plaster for a month;",
+      "This would impair my skiing ability somewhat for the duration, ".
+         "as can be imagined."
+    )
+---
+test: 'Null'
+brief: >
+    You can use the tilde '~' character for a null value.
+yaml: |
+    name: Mr. Show
+    hosted by: Bob and David
+    date of next season: ~
+php: |
+    array(
+      'name' => 'Mr. Show',
+      'hosted by' => 'Bob and David',
+      'date of next season' => null
+    )
+---
+test: Boolean
+brief: >
+    You can use 'true' and 'false' for Boolean values.
+yaml: |
+    Is Gus a Liar?: true
+    Do I rely on Gus for Sustenance?: false
+php: |
+    array(
+      'Is Gus a Liar?' => true,
+      'Do I rely on Gus for Sustenance?' => false
+    )
+---
+test: Integers
+dump_skip: true
+brief: >
+    An integer is a series of numbers, optionally
+    starting with a positive or negative sign.  Integers
+    may also contain commas for readability.
+yaml: |
+    zero: 0
+    simple: 12
+    one-thousand: 1,000
+    negative one-thousand: -1,000
+php: |
+    array(
+      'zero' => 0,
+      'simple' => 12,
+      'one-thousand' => 1000,
+      'negative one-thousand' => -1000
+    )
+---
+test: Integers as Map Keys
+brief: >
+    An integer can be used a dictionary key.
+yaml: |
+    1: one
+    2: two
+    3: three
+php: |
+    array(
+        1 => 'one',
+        2 => 'two',
+        3 => 'three'
+    )
+---
+test: Floats
+dump_skip: true
+brief: >
+     Floats are represented by numbers with decimals,
+     allowing for scientific notation, as well as
+     positive and negative infinity and "not a number."
+yaml: |
+     a simple float: 2.00
+     larger float: 1,000.09
+     scientific notation: 1.00009e+3
+php: |
+     array(
+       'a simple float' => 2.0,
+       'larger float' => 1000.09,
+       'scientific notation' => 1000.09
+     )
+---
+test: Time
+todo: true
+brief: >
+    You can represent timestamps by using
+    ISO8601 format, or a variation which
+    allows spaces between the date, time and
+    time zone.
+yaml: |
+    iso8601: 2001-12-14t21:59:43.10-05:00
+    space separated: 2001-12-14 21:59:43.10 -05:00
+php: |
+    array(
+      'iso8601' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
+      'space separated' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" )
+    )
+---
+test: Date
+todo: true
+brief: >
+    A date can be represented by its year,
+    month and day in ISO8601 order.
+yaml: |
+    1976-07-31
+php: |
+    date( 1976, 7, 31 )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/embededPhp.yml b/vendor/symfony/yaml/Tests/Fixtures/embededPhp.yml
new file mode 100644
index 00000000..ec456ed0
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/embededPhp.yml
@@ -0,0 +1 @@
+value: <?php echo 1 + 2 + 3 ?>
diff --git a/vendor/symfony/yaml/Tests/Fixtures/escapedCharacters.yml b/vendor/symfony/yaml/Tests/Fixtures/escapedCharacters.yml
new file mode 100644
index 00000000..09bf86e7
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/escapedCharacters.yml
@@ -0,0 +1,147 @@
+test: outside double quotes
+yaml: |
+    \0 \ \a \b \n
+php: |
+    "\\0 \\ \\a \\b \\n"
+---
+test: null
+yaml: |
+    "\0"
+php: |
+    "\x00"
+---
+test: bell
+yaml: |
+    "\a"
+php: |
+    "\x07"
+---
+test: backspace
+yaml: |
+    "\b"
+php: |
+    "\x08"
+---
+test: horizontal tab (1)
+yaml: |
+    "\t"
+php: |
+    "\x09"
+---
+test: horizontal tab (2)
+yaml: |
+    "\	"
+php: |
+    "\x09"
+---
+test: line feed
+yaml: |
+    "\n"
+php: |
+    "\x0a"
+---
+test: vertical tab
+yaml: |
+    "\v"
+php: |
+    "\x0b"
+---
+test: form feed
+yaml: |
+    "\f"
+php: |
+    "\x0c"
+---
+test: carriage return
+yaml: |
+    "\r"
+php: |
+    "\x0d"
+---
+test: escape
+yaml: |
+    "\e"
+php: |
+   "\x1b"
+---
+test: space
+yaml: |
+    "\ "
+php: |
+    "\x20"
+---
+test: slash
+yaml: |
+    "\/"
+php: |
+    "\x2f"
+---
+test: backslash
+yaml: |
+    "\\"
+php: |
+    "\\"
+---
+test: Unicode next line
+yaml: |
+    "\N"
+php: |
+    "\xc2\x85"
+---
+test: Unicode non-breaking space
+yaml: |
+    "\_"
+php: |
+    "\xc2\xa0"
+---
+test: Unicode line separator
+yaml: |
+    "\L"
+php: |
+    "\xe2\x80\xa8"
+---
+test: Unicode paragraph separator
+yaml: |
+    "\P"
+php: |
+    "\xe2\x80\xa9"
+---
+test: Escaped 8-bit Unicode
+yaml: |
+    "\x42"
+php: |
+    "B"
+---
+test: Escaped 16-bit Unicode
+yaml: |
+    "\u20ac"
+php: |
+    "\xe2\x82\xac"
+---
+test: Escaped 32-bit Unicode
+yaml: |
+    "\U00000043"
+php: |
+    "C"
+---
+test: Example 5.13 Escaped Characters
+note: |
+    Currently throws an error parsing first line. Maybe Symfony Yaml doesn't support
+    continuation of string across multiple lines? Keeping test here but disabled.
+todo: true
+yaml: |
+    "Fun with \\
+    \" \a \b \e \f \
+    \n \r \t \v \0 \
+    \  \_ \N \L \P \
+    \x41 \u0041 \U00000041"
+php: |
+    "Fun with \x5C\n\x22 \x07 \x08 \x1B \x0C\n\x0A \x0D \x09 \x0B \x00\n\x20 \xA0 \x85 \xe2\x80\xa8 \xe2\x80\xa9\nA A A"
+---
+test: Double quotes with a line feed
+yaml: |
+   { double: "some value\n \"some quoted string\" and 'some single quotes one'" }
+php: |
+    array(
+        'double' => "some value\n \"some quoted string\" and 'some single quotes one'"
+    )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/index.yml b/vendor/symfony/yaml/Tests/Fixtures/index.yml
new file mode 100644
index 00000000..3216a89e
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/index.yml
@@ -0,0 +1,18 @@
+- escapedCharacters
+- sfComments
+- sfCompact
+- sfTests
+- sfObjects
+- sfMergeKey
+- sfQuotes
+- YtsAnchorAlias
+- YtsBasicTests
+- YtsBlockMapping
+- YtsDocumentSeparator
+- YtsErrorTests
+- YtsFlowCollections
+- YtsFoldedScalars
+- YtsNullsAndEmpties
+- YtsSpecificationExamples
+- YtsTypeTransfers
+- unindentedCollections
diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml b/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml
new file mode 100644
index 00000000..6a7ffeca
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml
@@ -0,0 +1,73 @@
+--- %YAML:1.0
+test: Comments at the end of a line
+brief: >
+    Comments at the end of a line
+yaml: |
+    ex1: "foo # bar"
+    ex2: "foo # bar" # comment
+    ex3: 'foo # bar' # comment
+    ex4: foo # comment
+php: |
+    array('ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo')
+---
+test: Comments in the middle
+brief: >
+  Comments in the middle
+yaml: |
+    foo:
+    # some comment
+    # some comment
+      bar: foo
+    # some comment
+    # some comment
+php: |
+    array('foo' => array('bar' => 'foo'))
+---
+test: Comments on a hash line
+brief: >
+  Comments on a hash line
+yaml: |
+    foo:   # a comment
+      foo: bar # a comment
+php: |
+    array('foo' => array('foo' => 'bar'))
+---
+test: 'Value starting with a #'
+brief: >
+  'Value starting with a #'
+yaml: |
+    foo:   '#bar'
+php: |
+    array('foo' => '#bar')
+---
+test: Document starting with a comment and a separator
+brief: >
+  Commenting before document start is allowed
+yaml: |
+    # document comment
+    ---
+    foo: bar # a comment
+php: |
+    array('foo' => 'bar')
+---
+test: Comment containing a colon on a hash line
+brief: >
+    Comment containing a colon on a scalar line
+yaml: 'foo # comment: this is also part of the comment'
+php: |
+    'foo'
+---
+test: 'Hash key containing a #'
+brief: >
+    'Hash key containing a #'
+yaml: 'foo#bar: baz'
+php: |
+    array('foo#bar' => 'baz')
+---
+test: 'Hash key ending with a space and a #'
+brief: >
+    'Hash key ending with a space and a #'
+yaml: |
+    'foo #': baz
+php: |
+    array('foo #' => 'baz')
diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfCompact.yml b/vendor/symfony/yaml/Tests/Fixtures/sfCompact.yml
new file mode 100644
index 00000000..1339d23a
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/sfCompact.yml
@@ -0,0 +1,159 @@
+--- %YAML:1.0
+test: Compact notation
+brief: |
+    Compact notation for sets of mappings with single element
+yaml: |
+  ---
+  # products purchased
+  - item    : Super Hoop
+  - item    : Basketball
+    quantity: 1
+  - item:
+      name: Big Shoes
+      nick: Biggies
+    quantity: 1
+php: |
+  array (
+    array (
+      'item' => 'Super Hoop',
+    ),
+    array (
+      'item' => 'Basketball',
+      'quantity' => 1,
+    ),
+    array (
+      'item' => array(
+        'name' => 'Big Shoes',
+        'nick' => 'Biggies'
+      ),
+      'quantity' => 1
+    )
+  )
+---
+test: Compact notation combined with inline notation
+brief: |
+    Combinations of compact and inline notation are allowed
+yaml: |
+  ---
+  items:
+    - { item: Super Hoop, quantity: 1 }
+    - [ Basketball, Big Shoes ]
+php: |
+  array (
+    'items' => array (
+      array (
+        'item' => 'Super Hoop',
+        'quantity' => 1,
+      ),
+      array (
+        'Basketball',
+        'Big Shoes'
+      )
+    )
+  )
+--- %YAML:1.0
+test: Compact notation
+brief: |
+    Compact notation for sets of mappings with single element
+yaml: |
+  ---
+  # products purchased
+  - item    : Super Hoop
+  - item    : Basketball
+    quantity: 1
+  - item:
+      name: Big Shoes
+      nick: Biggies
+    quantity: 1
+php: |
+  array (
+    array (
+      'item' => 'Super Hoop',
+    ),
+    array (
+      'item' => 'Basketball',
+      'quantity' => 1,
+    ),
+    array (
+      'item' => array(
+        'name' => 'Big Shoes',
+        'nick' => 'Biggies'
+      ),
+      'quantity' => 1
+    )
+  )
+---
+test: Compact notation combined with inline notation
+brief: |
+    Combinations of compact and inline notation are allowed
+yaml: |
+  ---
+  items:
+    - { item: Super Hoop, quantity: 1 }
+    - [ Basketball, Big Shoes ]
+php: |
+  array (
+    'items' => array (
+      array (
+        'item' => 'Super Hoop',
+        'quantity' => 1,
+      ),
+      array (
+        'Basketball',
+        'Big Shoes'
+      )
+    )
+  )
+--- %YAML:1.0
+test: Compact notation
+brief: |
+    Compact notation for sets of mappings with single element
+yaml: |
+  ---
+  # products purchased
+  - item    : Super Hoop
+  - item    : Basketball
+    quantity: 1
+  - item:
+      name: Big Shoes
+      nick: Biggies
+    quantity: 1
+php: |
+  array (
+    array (
+      'item' => 'Super Hoop',
+    ),
+    array (
+      'item' => 'Basketball',
+      'quantity' => 1,
+    ),
+    array (
+      'item' => array(
+        'name' => 'Big Shoes',
+        'nick' => 'Biggies'
+      ),
+      'quantity' => 1
+    )
+  )
+---
+test: Compact notation combined with inline notation
+brief: |
+    Combinations of compact and inline notation are allowed
+yaml: |
+  ---
+  items:
+    - { item: Super Hoop, quantity: 1 }
+    - [ Basketball, Big Shoes ]
+php: |
+  array (
+    'items' => array (
+      array (
+        'item' => 'Super Hoop',
+        'quantity' => 1,
+      ),
+      array (
+        'Basketball',
+        'Big Shoes'
+      )
+    )
+  )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfMergeKey.yml b/vendor/symfony/yaml/Tests/Fixtures/sfMergeKey.yml
new file mode 100644
index 00000000..fd991017
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/sfMergeKey.yml
@@ -0,0 +1,45 @@
+--- %YAML:1.0
+test: Simple In Place Substitution
+brief: >
+    If you want to reuse an entire alias, only overwriting what is different
+    you can use a << in place substitution. This is not part of the official
+    YAML spec, but a widely implemented extension. See the following URL for
+    details: http://yaml.org/type/merge.html
+yaml: |
+    foo: &foo
+        a: Steve
+        b: Clark
+        c: Brian
+    bar:
+        a: before
+        d: other
+        <<: *foo
+        b: new
+        x: Oren
+        c:
+            foo: bar
+            foo: ignore
+            bar: foo
+    duplicate:
+        foo: bar
+        foo: ignore
+    foo2: &foo2
+        a: Ballmer
+    ding: &dong [ fi, fei, fo, fam]
+    check:
+        <<:
+            - *foo
+            - *dong
+        isit: tested
+    head:
+        <<: [ *foo , *dong , *foo2 ]
+php: |
+    array(
+        'foo' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian'),
+        'bar' => array('a' => 'before', 'd' => 'other', 'b' => 'new', 'c' => array('foo' => 'bar', 'bar' => 'foo'), 'x' => 'Oren'),
+        'duplicate' => array('foo' => 'bar'),
+        'foo2' => array('a' => 'Ballmer'),
+        'ding' => array('fi', 'fei', 'fo', 'fam'),
+        'check' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'fi', 'fei', 'fo', 'fam', 'isit' => 'tested'),
+        'head' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'fi', 'fei', 'fo', 'fam')
+    )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfObjects.yml b/vendor/symfony/yaml/Tests/Fixtures/sfObjects.yml
new file mode 100644
index 00000000..ee124b24
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/sfObjects.yml
@@ -0,0 +1,11 @@
+--- %YAML:1.0
+test: Objects
+brief: >
+    Comments at the end of a line
+yaml: |
+    ex1: "foo # bar"
+    ex2: "foo # bar" # comment
+    ex3: 'foo # bar' # comment
+    ex4: foo # comment
+php: |
+    array('ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo')
diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfQuotes.yml b/vendor/symfony/yaml/Tests/Fixtures/sfQuotes.yml
new file mode 100644
index 00000000..741f1bef
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/sfQuotes.yml
@@ -0,0 +1,33 @@
+--- %YAML:1.0
+test: Some characters at the beginning of a string must be escaped
+brief: >
+    Some characters at the beginning of a string must be escaped
+yaml: |
+    foo: | bar
+php: |
+    array('foo' => '| bar')
+---
+test: A key can be a quoted string
+brief: >
+  A key can be a quoted string
+yaml: |
+    "foo1": bar
+    'foo2': bar
+    "foo \" bar": bar
+    'foo '' bar': bar
+    'foo3: ': bar
+    "foo4: ": bar
+    foo5: { "foo \" bar: ": bar, 'foo '' bar: ': bar }
+php: |
+    array(
+      'foo1' => 'bar',
+      'foo2' => 'bar',
+      'foo " bar' => 'bar',
+      'foo \' bar' => 'bar',
+      'foo3: ' => 'bar',
+      'foo4: ' => 'bar',
+      'foo5' => array(
+        'foo " bar: ' => 'bar',
+        'foo \' bar: ' => 'bar',
+      ),
+    )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfTests.yml b/vendor/symfony/yaml/Tests/Fixtures/sfTests.yml
new file mode 100644
index 00000000..7a54f163
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/sfTests.yml
@@ -0,0 +1,135 @@
+--- %YAML:1.0
+test: Multiple quoted string on one line
+brief: >
+    Multiple quoted string on one line
+yaml: |
+    stripped_title: { name: "foo bar", help: "bar foo" }
+php: |
+    array('stripped_title' => array('name' => 'foo bar', 'help' => 'bar foo'))
+---
+test: Empty sequence
+yaml: |
+    foo: [ ]
+php: |
+    array('foo' => array())
+---
+test: Empty value
+yaml: |
+    foo:
+php: |
+    array('foo' => null)
+---
+test: Inline string parsing
+brief: >
+    Inline string parsing
+yaml: |
+    test: ['complex: string', 'another [string]']
+php: |
+    array('test' => array('complex: string', 'another [string]'))
+---
+test: Boolean
+brief: >
+    Boolean
+yaml: |
+    - false
+    - true
+    - null
+    - ~
+    - 'false'
+    - 'true'
+    - 'null'
+    - '~'
+php: |
+    array(
+      false,
+      true,
+      null,
+      null,
+      'false',
+      'true',
+      'null',
+      '~',
+    )
+---
+test: Empty lines in folded blocks
+brief: >
+  Empty lines in folded blocks
+yaml: |
+  foo:
+    bar: |
+      foo
+
+
+        
+      bar
+php: |
+  array('foo' => array('bar' => "foo\n\n\n  \nbar\n"))
+---
+test: IP addresses
+brief: >
+  IP addresses
+yaml: |
+  foo: 10.0.0.2
+php: |
+  array('foo' => '10.0.0.2')
+---
+test: A sequence with an embedded mapping
+brief: >
+  A sequence with an embedded mapping
+yaml: |
+  - foo
+  - bar: { bar: foo }
+php: |
+  array('foo', array('bar' => array('bar' => 'foo')))
+---
+test: A sequence with an unordered array
+brief: >
+  A sequence with an unordered array
+yaml: |
+  1: foo
+  0: bar
+php: |
+  array(1 => 'foo', 0 => 'bar')
+---
+test: Octal
+brief: as in spec example 2.19, octal value is converted
+yaml: |
+  foo: 0123
+php: |
+  array('foo' => 83)
+---
+test: Octal strings
+brief: Octal notation in a string must remain a string
+yaml: |
+  foo: "0123"
+php: |
+  array('foo' => '0123')
+---
+test: Octal strings
+brief: Octal notation in a string must remain a string
+yaml: |
+  foo: '0123'
+php: |
+  array('foo' => '0123')
+---
+test: Octal strings
+brief: Octal notation in a string must remain a string
+yaml: |
+  foo: |
+    0123
+php: |
+  array('foo' => "0123\n")
+---
+test: Document as a simple hash
+brief: Document as a simple hash
+yaml: |
+  { foo: bar }
+php: |
+  array('foo' => 'bar')
+---
+test: Document as a simple array
+brief: Document as a simple array
+yaml: |
+  [ foo, bar ]
+php: |
+  array('foo', 'bar')
diff --git a/vendor/symfony/yaml/Tests/Fixtures/unindentedCollections.yml b/vendor/symfony/yaml/Tests/Fixtures/unindentedCollections.yml
new file mode 100644
index 00000000..0c96108e
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/unindentedCollections.yml
@@ -0,0 +1,82 @@
+--- %YAML:1.0
+test: Unindented collection
+brief: >
+    Unindented collection
+yaml: |
+    collection:
+    - item1
+    - item2
+    - item3
+php: |
+    array('collection' => array('item1', 'item2', 'item3'))
+---
+test: Nested unindented collection (two levels)
+brief: >
+    Nested unindented collection
+yaml: |
+    collection:
+        key:
+        - a
+        - b
+        - c
+php: |
+    array('collection' => array('key' => array('a', 'b', 'c')))
+---
+test: Nested unindented collection (three levels)
+brief: >
+    Nested unindented collection
+yaml: |
+    collection:
+        key:
+            subkey:
+            - one
+            - two
+            - three
+php: |
+    array('collection' => array('key' => array('subkey' => array('one', 'two', 'three'))))
+---
+test: Key/value after unindented collection (1)
+brief: >
+    Key/value after unindented collection (1)
+yaml: |
+    collection:
+        key:
+        - a
+        - b
+        - c
+    foo: bar
+php: |
+    array('collection' => array('key' => array('a', 'b', 'c')), 'foo' => 'bar')
+---
+test: Key/value after unindented collection (at the same level)
+brief: >
+    Key/value after unindented collection
+yaml: |
+    collection:
+        key:
+        - a
+        - b
+        - c
+        foo: bar
+php: |
+    array('collection' => array('key' => array('a', 'b', 'c'), 'foo' => 'bar'))
+---
+test: Shortcut Key after unindented collection
+brief: >
+    Key/value after unindented collection
+yaml: |
+    collection:
+    - key: foo
+      foo: bar
+php: |
+    array('collection' => array(array('key' => 'foo', 'foo' => 'bar')))
+---
+test: Shortcut Key after unindented collection with custom spaces
+brief: >
+    Key/value after unindented collection
+yaml: |
+    collection:
+    -  key: foo
+       foo: bar
+php: |
+    array('collection' => array(array('key' => 'foo', 'foo' => 'bar')))
diff --git a/vendor/symfony/yaml/Tests/InlineTest.php b/vendor/symfony/yaml/Tests/InlineTest.php
new file mode 100644
index 00000000..0776e4fa
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/InlineTest.php
@@ -0,0 +1,384 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml\Tests;
+
+use Symfony\Component\Yaml\Inline;
+
+class InlineTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider getTestsForParse
+     */
+    public function testParse($yaml, $value)
+    {
+        $this->assertSame($value, Inline::parse($yaml), sprintf('::parse() converts an inline YAML to a PHP structure (%s)', $yaml));
+    }
+
+    /**
+     * @dataProvider getTestsForParseWithMapObjects
+     */
+    public function testParseWithMapObjects($yaml, $value)
+    {
+        $actual = Inline::parse($yaml, false, false, true);
+
+        $this->assertSame(serialize($value), serialize($actual));
+    }
+
+    /**
+     * @dataProvider getTestsForDump
+     */
+    public function testDump($yaml, $value)
+    {
+        $this->assertEquals($yaml, Inline::dump($value), sprintf('::dump() converts a PHP structure to an inline YAML (%s)', $yaml));
+
+        $this->assertSame($value, Inline::parse(Inline::dump($value)), 'check consistency');
+    }
+
+    public function testDumpNumericValueWithLocale()
+    {
+        $locale = setlocale(LC_NUMERIC, 0);
+        if (false === $locale) {
+            $this->markTestSkipped('Your platform does not support locales.');
+        }
+
+        try {
+            $requiredLocales = array('fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252');
+            if (false === setlocale(LC_NUMERIC, $requiredLocales)) {
+                $this->markTestSkipped('Could not set any of required locales: '.implode(', ', $requiredLocales));
+            }
+
+            $this->assertEquals('1.2', Inline::dump(1.2));
+            $this->assertContains('fr', strtolower(setlocale(LC_NUMERIC, 0)));
+            setlocale(LC_NUMERIC, $locale);
+        } catch (\Exception $e) {
+            setlocale(LC_NUMERIC, $locale);
+            throw $e;
+        }
+    }
+
+    public function testHashStringsResemblingExponentialNumericsShouldNotBeChangedToINF()
+    {
+        $value = '686e444';
+
+        $this->assertSame($value, Inline::parse(Inline::dump($value)));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     */
+    public function testParseScalarWithIncorrectlyQuotedStringShouldThrowException()
+    {
+        $value = "'don't do somthin' like that'";
+        Inline::parse($value);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     */
+    public function testParseScalarWithIncorrectlyDoubleQuotedStringShouldThrowException()
+    {
+        $value = '"don"t do somthin" like that"';
+        Inline::parse($value);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     */
+    public function testParseInvalidMappingKeyShouldThrowException()
+    {
+        $value = '{ "foo " bar": "bar" }';
+        Inline::parse($value);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     */
+    public function testParseInvalidMappingShouldThrowException()
+    {
+        Inline::parse('[foo] bar');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     */
+    public function testParseInvalidSequenceShouldThrowException()
+    {
+        Inline::parse('{ foo: bar } bar');
+    }
+
+    public function testParseScalarWithCorrectlyQuotedStringShouldReturnString()
+    {
+        $value = "'don''t do somthin'' like that'";
+        $expect = "don't do somthin' like that";
+
+        $this->assertSame($expect, Inline::parseScalar($value));
+    }
+
+    /**
+     * @dataProvider getDataForParseReferences
+     */
+    public function testParseReferences($yaml, $expected)
+    {
+        $this->assertSame($expected, Inline::parse($yaml, false, false, false, array('var' => 'var-value')));
+    }
+
+    public function getDataForParseReferences()
+    {
+        return array(
+            'scalar' => array('*var', 'var-value'),
+            'list' => array('[ *var ]', array('var-value')),
+            'list-in-list' => array('[[ *var ]]', array(array('var-value'))),
+            'map-in-list' => array('[ { key: *var } ]', array(array('key' => 'var-value'))),
+            'embedded-mapping-in-list' => array('[ key: *var ]', array(array('key' => 'var-value'))),
+            'map' => array('{ key: *var }', array('key' => 'var-value')),
+            'list-in-map' => array('{ key: [*var] }', array('key' => array('var-value'))),
+            'map-in-map' => array('{ foo: { bar: *var } }', array('foo' => array('bar' => 'var-value'))),
+        );
+    }
+
+    public function testParseMapReferenceInSequence()
+    {
+        $foo = array(
+            'a' => 'Steve',
+            'b' => 'Clark',
+            'c' => 'Brian',
+        );
+        $this->assertSame(array($foo), Inline::parse('[*foo]', false, false, false, array('foo' => $foo)));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     * @expectedExceptionMessage A reference must contain at least one character.
+     */
+    public function testParseUnquotedAsterisk()
+    {
+        Inline::parse('{ foo: * }');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     * @expectedExceptionMessage A reference must contain at least one character.
+     */
+    public function testParseUnquotedAsteriskFollowedByAComment()
+    {
+        Inline::parse('{ foo: * #foo }');
+    }
+
+    public function getTestsForParse()
+    {
+        return array(
+            array('', ''),
+            array('null', null),
+            array('false', false),
+            array('true', true),
+            array('12', 12),
+            array('-12', -12),
+            array('"quoted string"', 'quoted string'),
+            array("'quoted string'", 'quoted string'),
+            array('12.30e+02', 12.30e+02),
+            array('0x4D2', 0x4D2),
+            array('02333', 02333),
+            array('.Inf', -log(0)),
+            array('-.Inf', log(0)),
+            array("'686e444'", '686e444'),
+            array('686e444', 646e444),
+            array('123456789123456789123456789123456789', '123456789123456789123456789123456789'),
+            array('"foo\r\nbar"', "foo\r\nbar"),
+            array("'foo#bar'", 'foo#bar'),
+            array("'foo # bar'", 'foo # bar'),
+            array("'#cfcfcf'", '#cfcfcf'),
+            array('::form_base.html.twig', '::form_base.html.twig'),
+
+            // Pre-YAML-1.2 booleans
+            array("'y'", 'y'),
+            array("'n'", 'n'),
+            array("'yes'", 'yes'),
+            array("'no'", 'no'),
+            array("'on'", 'on'),
+            array("'off'", 'off'),
+
+            array('2007-10-30', mktime(0, 0, 0, 10, 30, 2007)),
+            array('2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)),
+            array('2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)),
+            array('1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)),
+            array('1730-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 1730)),
+
+            array('"a \\"string\\" with \'quoted strings inside\'"', 'a "string" with \'quoted strings inside\''),
+            array("'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''),
+
+            // sequences
+            // urls are no key value mapping. see #3609. Valid yaml "key: value" mappings require a space after the colon
+            array('[foo, http://urls.are/no/mappings, false, null, 12]', array('foo', 'http://urls.are/no/mappings', false, null, 12)),
+            array('[  foo  ,   bar , false  ,  null     ,  12  ]', array('foo', 'bar', false, null, 12)),
+            array('[\'foo,bar\', \'foo bar\']', array('foo,bar', 'foo bar')),
+
+            // mappings
+            array('{foo:bar,bar:foo,false:false,null:null,integer:12}', array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
+            array('{ foo  : bar, bar : foo,  false  :   false,  null  :   null,  integer :  12  }', array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
+            array('{foo: \'bar\', bar: \'foo: bar\'}', array('foo' => 'bar', 'bar' => 'foo: bar')),
+            array('{\'foo\': \'bar\', "bar": \'foo: bar\'}', array('foo' => 'bar', 'bar' => 'foo: bar')),
+            array('{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', array('foo\'' => 'bar', 'bar"' => 'foo: bar')),
+            array('{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', array('foo: ' => 'bar', 'bar: ' => 'foo: bar')),
+
+            // nested sequences and mappings
+            array('[foo, [bar, foo]]', array('foo', array('bar', 'foo'))),
+            array('[foo, {bar: foo}]', array('foo', array('bar' => 'foo'))),
+            array('{ foo: {bar: foo} }', array('foo' => array('bar' => 'foo'))),
+            array('{ foo: [bar, foo] }', array('foo' => array('bar', 'foo'))),
+
+            array('[  foo, [  bar, foo  ]  ]', array('foo', array('bar', 'foo'))),
+
+            array('[{ foo: {bar: foo} }]', array(array('foo' => array('bar' => 'foo')))),
+
+            array('[foo, [bar, [foo, [bar, foo]], foo]]', array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo'))),
+
+            array('[foo, {bar: foo, foo: [foo, {bar: foo}]}, [foo, {bar: foo}]]', array('foo', array('bar' => 'foo', 'foo' => array('foo', array('bar' => 'foo'))), array('foo', array('bar' => 'foo')))),
+
+            array('[foo, bar: { foo: bar }]', array('foo', '1' => array('bar' => array('foo' => 'bar')))),
+            array('[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', array('foo', '@foo.baz', array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, '@service_container')),
+        );
+    }
+
+    public function getTestsForParseWithMapObjects()
+    {
+        return array(
+            array('', ''),
+            array('null', null),
+            array('false', false),
+            array('true', true),
+            array('12', 12),
+            array('-12', -12),
+            array('"quoted string"', 'quoted string'),
+            array("'quoted string'", 'quoted string'),
+            array('12.30e+02', 12.30e+02),
+            array('0x4D2', 0x4D2),
+            array('02333', 02333),
+            array('.Inf', -log(0)),
+            array('-.Inf', log(0)),
+            array("'686e444'", '686e444'),
+            array('686e444', 646e444),
+            array('123456789123456789123456789123456789', '123456789123456789123456789123456789'),
+            array('"foo\r\nbar"', "foo\r\nbar"),
+            array("'foo#bar'", 'foo#bar'),
+            array("'foo # bar'", 'foo # bar'),
+            array("'#cfcfcf'", '#cfcfcf'),
+            array('::form_base.html.twig', '::form_base.html.twig'),
+
+            array('2007-10-30', mktime(0, 0, 0, 10, 30, 2007)),
+            array('2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)),
+            array('2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)),
+            array('1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)),
+            array('1730-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 1730)),
+
+            array('"a \\"string\\" with \'quoted strings inside\'"', 'a "string" with \'quoted strings inside\''),
+            array("'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''),
+
+            // sequences
+            // urls are no key value mapping. see #3609. Valid yaml "key: value" mappings require a space after the colon
+            array('[foo, http://urls.are/no/mappings, false, null, 12]', array('foo', 'http://urls.are/no/mappings', false, null, 12)),
+            array('[  foo  ,   bar , false  ,  null     ,  12  ]', array('foo', 'bar', false, null, 12)),
+            array('[\'foo,bar\', \'foo bar\']', array('foo,bar', 'foo bar')),
+
+            // mappings
+            array('{foo:bar,bar:foo,false:false,null:null,integer:12}', (object) array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
+            array('{ foo  : bar, bar : foo,  false  :   false,  null  :   null,  integer :  12  }', (object) array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
+            array('{foo: \'bar\', bar: \'foo: bar\'}', (object) array('foo' => 'bar', 'bar' => 'foo: bar')),
+            array('{\'foo\': \'bar\', "bar": \'foo: bar\'}', (object) array('foo' => 'bar', 'bar' => 'foo: bar')),
+            array('{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', (object) array('foo\'' => 'bar', "bar\"" => 'foo: bar')),
+            array('{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', (object) array('foo: ' => 'bar', "bar: " => 'foo: bar')),
+
+            // nested sequences and mappings
+            array('[foo, [bar, foo]]', array('foo', array('bar', 'foo'))),
+            array('[foo, {bar: foo}]', array('foo', (object) array('bar' => 'foo'))),
+            array('{ foo: {bar: foo} }', (object) array('foo' => (object) array('bar' => 'foo'))),
+            array('{ foo: [bar, foo] }', (object) array('foo' => array('bar', 'foo'))),
+
+            array('[  foo, [  bar, foo  ]  ]', array('foo', array('bar', 'foo'))),
+
+            array('[{ foo: {bar: foo} }]', array((object) array('foo' => (object) array('bar' => 'foo')))),
+
+            array('[foo, [bar, [foo, [bar, foo]], foo]]', array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo'))),
+
+            array('[foo, {bar: foo, foo: [foo, {bar: foo}]}, [foo, {bar: foo}]]', array('foo', (object) array('bar' => 'foo', 'foo' => array('foo', (object) array('bar' => 'foo'))), array('foo', (object) array('bar' => 'foo')))),
+
+            array('[foo, bar: { foo: bar }]', array('foo', '1' => (object) array('bar' => (object) array('foo' => 'bar')))),
+            array('[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', array('foo', '@foo.baz', (object) array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, '@service_container')),
+
+            array('{}', new \stdClass()),
+            array('{ foo  : bar, bar : {}  }', (object) array('foo' => 'bar', 'bar' => new \stdClass())),
+            array('{ foo  : [], bar : {}  }', (object) array('foo' => array(), 'bar' => new \stdClass())),
+            array('{foo: \'bar\', bar: {} }', (object) array('foo' => 'bar', 'bar' => new \stdClass())),
+            array('{\'foo\': \'bar\', "bar": {}}', (object) array('foo' => 'bar', 'bar' => new \stdClass())),
+            array('{\'foo\': \'bar\', "bar": \'{}\'}', (object) array('foo' => 'bar', 'bar' => '{}')),
+
+            array('[foo, [{}, {}]]', array('foo', array(new \stdClass(), new \stdClass()))),
+            array('[foo, [[], {}]]', array('foo', array(array(), new \stdClass()))),
+            array('[foo, [[{}, {}], {}]]', array('foo', array(array(new \stdClass(), new \stdClass()), new \stdClass()))),
+            array('[foo, {bar: {}}]', array('foo', '1' => (object) array('bar' => new \stdClass()))),
+        );
+    }
+
+    public function getTestsForDump()
+    {
+        return array(
+            array('null', null),
+            array('false', false),
+            array('true', true),
+            array('12', 12),
+            array("'quoted string'", 'quoted string'),
+            array('!!float 1230', 12.30e+02),
+            array('1234', 0x4D2),
+            array('1243', 02333),
+            array('.Inf', -log(0)),
+            array('-.Inf', log(0)),
+            array("'686e444'", '686e444'),
+            array('"foo\r\nbar"', "foo\r\nbar"),
+            array("'foo#bar'", 'foo#bar'),
+            array("'foo # bar'", 'foo # bar'),
+            array("'#cfcfcf'", '#cfcfcf'),
+
+            array("'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''),
+
+            array("'-dash'", '-dash'),
+            array("'-'", '-'),
+
+            // Pre-YAML-1.2 booleans
+            array("'y'", 'y'),
+            array("'n'", 'n'),
+            array("'yes'", 'yes'),
+            array("'no'", 'no'),
+            array("'on'", 'on'),
+            array("'off'", 'off'),
+
+            // sequences
+            array('[foo, bar, false, null, 12]', array('foo', 'bar', false, null, 12)),
+            array('[\'foo,bar\', \'foo bar\']', array('foo,bar', 'foo bar')),
+
+            // mappings
+            array('{ foo: bar, bar: foo, \'false\': false, \'null\': null, integer: 12 }', array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
+            array('{ foo: bar, bar: \'foo: bar\' }', array('foo' => 'bar', 'bar' => 'foo: bar')),
+
+            // nested sequences and mappings
+            array('[foo, [bar, foo]]', array('foo', array('bar', 'foo'))),
+
+            array('[foo, [bar, [foo, [bar, foo]], foo]]', array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo'))),
+
+            array('{ foo: { bar: foo } }', array('foo' => array('bar' => 'foo'))),
+
+            array('[foo, { bar: foo }]', array('foo', array('bar' => 'foo'))),
+
+            array('[foo, { bar: foo, foo: [foo, { bar: foo }] }, [foo, { bar: foo }]]', array('foo', array('bar' => 'foo', 'foo' => array('foo', array('bar' => 'foo'))), array('foo', array('bar' => 'foo')))),
+
+            array('[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', array('foo', '@foo.baz', array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, '@service_container')),
+        );
+    }
+}
diff --git a/vendor/symfony/yaml/Tests/ParseExceptionTest.php b/vendor/symfony/yaml/Tests/ParseExceptionTest.php
new file mode 100644
index 00000000..0a9db257
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/ParseExceptionTest.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml\Tests;
+
+use Symfony\Component\Yaml\Exception\ParseException;
+
+class ParseExceptionTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetMessage()
+    {
+        $exception = new ParseException('Error message', 42, 'foo: bar', '/var/www/featherbb/config.yml');
+        if (PHP_VERSION_ID >= 50400) {
+            $message = 'Error message in "/var/www/featherbb/config.yml" at line 42 (near "foo: bar")';
+        } else {
+            $message = 'Error message in "\\/var\\/www\\/app\\/config.yml" at line 42 (near "foo: bar")';
+        }
+
+        $this->assertEquals($message, $exception->getMessage());
+    }
+
+    public function testGetMessageWithUnicodeInFilename()
+    {
+        $exception = new ParseException('Error message', 42, 'foo: bar', 'äöü.yml');
+        if (PHP_VERSION_ID >= 50400) {
+            $message = 'Error message in "äöü.yml" at line 42 (near "foo: bar")';
+        } else {
+            $message = 'Error message in "\u00e4\u00f6\u00fc.yml" at line 42 (near "foo: bar")';
+        }
+
+        $this->assertEquals($message, $exception->getMessage());
+    }
+}
diff --git a/vendor/symfony/yaml/Tests/ParserTest.php b/vendor/symfony/yaml/Tests/ParserTest.php
new file mode 100644
index 00000000..f434d558
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/ParserTest.php
@@ -0,0 +1,755 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml\Tests;
+
+use Symfony\Component\Yaml\Yaml;
+use Symfony\Component\Yaml\Parser;
+
+class ParserTest extends \PHPUnit_Framework_TestCase
+{
+    protected $parser;
+
+    protected function setUp()
+    {
+        $this->parser = new Parser();
+    }
+
+    protected function tearDown()
+    {
+        $this->parser = null;
+    }
+
+    /**
+     * @dataProvider getDataFormSpecifications
+     */
+    public function testSpecifications($file, $expected, $yaml, $comment)
+    {
+        $this->assertEquals($expected, var_export($this->parser->parse($yaml), true), $comment);
+    }
+
+    public function getDataFormSpecifications()
+    {
+        $parser = new Parser();
+        $path = __DIR__.'/Fixtures';
+
+        $tests = array();
+        $files = $parser->parse(file_get_contents($path.'/index.yml'));
+        foreach ($files as $file) {
+            $yamls = file_get_contents($path.'/'.$file.'.yml');
+
+            // split YAMLs documents
+            foreach (preg_split('/^---( %YAML\:1\.0)?/m', $yamls) as $yaml) {
+                if (!$yaml) {
+                    continue;
+                }
+
+                $test = $parser->parse($yaml);
+                if (isset($test['todo']) && $test['todo']) {
+                    // TODO
+                } else {
+                    eval('$expected = '.trim($test['php']).';');
+
+                    $tests[] = array($file, var_export($expected, true), $test['yaml'], $test['test']);
+                }
+            }
+        }
+
+        return $tests;
+    }
+
+    public function testTabsInYaml()
+    {
+        // test tabs in YAML
+        $yamls = array(
+            "foo:\n	bar",
+            "foo:\n 	bar",
+            "foo:\n	 bar",
+            "foo:\n 	 bar",
+        );
+
+        foreach ($yamls as $yaml) {
+            try {
+                $content = $this->parser->parse($yaml);
+
+                $this->fail('YAML files must not contain tabs');
+            } catch (\Exception $e) {
+                $this->assertInstanceOf('\Exception', $e, 'YAML files must not contain tabs');
+                $this->assertEquals('A YAML file cannot contain tabs as indentation at line 2 (near "'.strpbrk($yaml, "\t").'").', $e->getMessage(), 'YAML files must not contain tabs');
+            }
+        }
+    }
+
+    public function testEndOfTheDocumentMarker()
+    {
+        $yaml = <<<EOF
+--- %YAML:1.0
+foo
+...
+EOF;
+
+        $this->assertEquals('foo', $this->parser->parse($yaml));
+    }
+
+    public function getBlockChompingTests()
+    {
+        $tests = array();
+
+        $yaml = <<<'EOF'
+foo: |-
+    one
+    two
+bar: |-
+    one
+    two
+
+EOF;
+        $expected = array(
+            'foo' => "one\ntwo",
+            'bar' => "one\ntwo",
+        );
+        $tests['Literal block chomping strip with single trailing newline'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: |-
+    one
+    two
+
+bar: |-
+    one
+    two
+
+
+EOF;
+        $expected = array(
+            'foo' => "one\ntwo",
+            'bar' => "one\ntwo",
+        );
+        $tests['Literal block chomping strip with multiple trailing newlines'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+{}
+
+
+EOF;
+        $expected = array();
+        $tests['Literal block chomping strip with multiple trailing newlines after a 1-liner'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: |-
+    one
+    two
+bar: |-
+    one
+    two
+EOF;
+        $expected = array(
+            'foo' => "one\ntwo",
+            'bar' => "one\ntwo",
+        );
+        $tests['Literal block chomping strip without trailing newline'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: |
+    one
+    two
+bar: |
+    one
+    two
+
+EOF;
+        $expected = array(
+            'foo' => "one\ntwo\n",
+            'bar' => "one\ntwo\n",
+        );
+        $tests['Literal block chomping clip with single trailing newline'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: |
+    one
+    two
+
+bar: |
+    one
+    two
+
+
+EOF;
+        $expected = array(
+            'foo' => "one\ntwo\n",
+            'bar' => "one\ntwo\n",
+        );
+        $tests['Literal block chomping clip with multiple trailing newlines'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: |
+    one
+    two
+bar: |
+    one
+    two
+EOF;
+        $expected = array(
+            'foo' => "one\ntwo\n",
+            'bar' => "one\ntwo",
+        );
+        $tests['Literal block chomping clip without trailing newline'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: |+
+    one
+    two
+bar: |+
+    one
+    two
+
+EOF;
+        $expected = array(
+            'foo' => "one\ntwo\n",
+            'bar' => "one\ntwo\n",
+        );
+        $tests['Literal block chomping keep with single trailing newline'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: |+
+    one
+    two
+
+bar: |+
+    one
+    two
+
+
+EOF;
+        $expected = array(
+            'foo' => "one\ntwo\n\n",
+            'bar' => "one\ntwo\n\n",
+        );
+        $tests['Literal block chomping keep with multiple trailing newlines'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: |+
+    one
+    two
+bar: |+
+    one
+    two
+EOF;
+        $expected = array(
+            'foo' => "one\ntwo\n",
+            'bar' => "one\ntwo",
+        );
+        $tests['Literal block chomping keep without trailing newline'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: >-
+    one
+    two
+bar: >-
+    one
+    two
+
+EOF;
+        $expected = array(
+            'foo' => 'one two',
+            'bar' => 'one two',
+        );
+        $tests['Folded block chomping strip with single trailing newline'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: >-
+    one
+    two
+
+bar: >-
+    one
+    two
+
+
+EOF;
+        $expected = array(
+            'foo' => 'one two',
+            'bar' => 'one two',
+        );
+        $tests['Folded block chomping strip with multiple trailing newlines'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: >-
+    one
+    two
+bar: >-
+    one
+    two
+EOF;
+        $expected = array(
+            'foo' => 'one two',
+            'bar' => 'one two',
+        );
+        $tests['Folded block chomping strip without trailing newline'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: >
+    one
+    two
+bar: >
+    one
+    two
+
+EOF;
+        $expected = array(
+            'foo' => "one two\n",
+            'bar' => "one two\n",
+        );
+        $tests['Folded block chomping clip with single trailing newline'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: >
+    one
+    two
+
+bar: >
+    one
+    two
+
+
+EOF;
+        $expected = array(
+            'foo' => "one two\n",
+            'bar' => "one two\n",
+        );
+        $tests['Folded block chomping clip with multiple trailing newlines'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: >
+    one
+    two
+bar: >
+    one
+    two
+EOF;
+        $expected = array(
+            'foo' => "one two\n",
+            'bar' => 'one two',
+        );
+        $tests['Folded block chomping clip without trailing newline'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: >+
+    one
+    two
+bar: >+
+    one
+    two
+
+EOF;
+        $expected = array(
+            'foo' => "one two\n",
+            'bar' => "one two\n",
+        );
+        $tests['Folded block chomping keep with single trailing newline'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: >+
+    one
+    two
+
+bar: >+
+    one
+    two
+
+
+EOF;
+        $expected = array(
+            'foo' => "one two\n\n",
+            'bar' => "one two\n\n",
+        );
+        $tests['Folded block chomping keep with multiple trailing newlines'] = array($expected, $yaml);
+
+        $yaml = <<<'EOF'
+foo: >+
+    one
+    two
+bar: >+
+    one
+    two
+EOF;
+        $expected = array(
+            'foo' => "one two\n",
+            'bar' => 'one two',
+        );
+        $tests['Folded block chomping keep without trailing newline'] = array($expected, $yaml);
+
+        return $tests;
+    }
+
+    /**
+     * @dataProvider getBlockChompingTests
+     */
+    public function testBlockChomping($expected, $yaml)
+    {
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
+    /**
+     * Regression test for issue #7989.
+     *
+     * @see https://github.com/symfony/symfony/issues/7989
+     */
+    public function testBlockLiteralWithLeadingNewlines()
+    {
+        $yaml = <<<'EOF'
+foo: |-
+
+
+    bar
+
+EOF;
+        $expected = array(
+            'foo' => "\n\nbar",
+        );
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
+    public function testObjectSupportEnabled()
+    {
+        $input = <<<EOF
+foo: !!php/object:O:30:"Symfony\Component\Yaml\Tests\B":1:{s:1:"b";s:3:"foo";}
+bar: 1
+EOF;
+        $this->assertEquals(array('foo' => new B(), 'bar' => 1), $this->parser->parse($input, false, true), '->parse() is able to parse objects');
+    }
+
+    public function testObjectSupportDisabledButNoExceptions()
+    {
+        $input = <<<EOF
+foo: !!php/object:O:30:"Symfony\Tests\Component\Yaml\B":1:{s:1:"b";s:3:"foo";}
+bar: 1
+EOF;
+
+        $this->assertEquals(array('foo' => null, 'bar' => 1), $this->parser->parse($input), '->parse() does not parse objects');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     */
+    public function testObjectsSupportDisabledWithExceptions()
+    {
+        $this->parser->parse('foo: !!php/object:O:30:"Symfony\Tests\Component\Yaml\B":1:{s:1:"b";s:3:"foo";}', true, false);
+    }
+
+    public function testNonUtf8Exception()
+    {
+        if (!function_exists('iconv')) {
+            $this->markTestSkipped('Exceptions for non-utf8 charsets require the iconv() function.');
+
+            return;
+        }
+
+        $yamls = array(
+            iconv('UTF-8', 'ISO-8859-1', "foo: 'äöüß'"),
+            iconv('UTF-8', 'ISO-8859-15', "euro: '€'"),
+            iconv('UTF-8', 'CP1252', "cp1252: '©ÉÇáñ'"),
+        );
+
+        foreach ($yamls as $yaml) {
+            try {
+                $this->parser->parse($yaml);
+
+                $this->fail('charsets other than UTF-8 are rejected.');
+            } catch (\Exception $e) {
+                $this->assertInstanceOf('Symfony\Component\Yaml\Exception\ParseException', $e, 'charsets other than UTF-8 are rejected.');
+            }
+        }
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     */
+    public function testUnindentedCollectionException()
+    {
+        $yaml = <<<EOF
+
+collection:
+-item1
+-item2
+-item3
+
+EOF;
+
+        $this->parser->parse($yaml);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     */
+    public function testShortcutKeyUnindentedCollectionException()
+    {
+        $yaml = <<<EOF
+
+collection:
+-  key: foo
+  foo: bar
+
+EOF;
+
+        $this->parser->parse($yaml);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     * @expectedExceptionMessage Multiple documents are not supported.
+     */
+    public function testMultipleDocumentsNotSupportedException()
+    {
+        Yaml::parse(<<<EOL
+# Ranking of 1998 home runs
+---
+- Mark McGwire
+- Sammy Sosa
+- Ken Griffey
+
+# Team ranking
+---
+- Chicago Cubs
+- St Louis Cardinals
+EOL
+        );
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     */
+    public function testSequenceInAMapping()
+    {
+        Yaml::parse(<<<EOF
+yaml:
+  hash: me
+  - array stuff
+EOF
+        );
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     */
+    public function testMappingInASequence()
+    {
+        Yaml::parse(<<<EOF
+yaml:
+  - array stuff
+  hash: me
+EOF
+        );
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     * @expectedExceptionMessage missing colon
+     */
+    public function testScalarInSequence()
+    {
+        Yaml::parse(<<<EOF
+foo:
+    - bar
+"missing colon"
+    foo: bar
+EOF
+        );
+    }
+
+    /**
+     * > It is an error for two equal keys to appear in the same mapping node.
+     * > In such a case the YAML processor may continue, ignoring the second
+     * > `key: value` pair and issuing an appropriate warning. This strategy
+     * > preserves a consistent information model for one-pass and random access
+     * > applications.
+     *
+     * @see http://yaml.org/spec/1.2/spec.html#id2759572
+     * @see http://yaml.org/spec/1.1/#id932806
+     *
+     * @covers \Symfony\Component\Yaml\Parser::parse
+     */
+    public function testMappingDuplicateKeyBlock()
+    {
+        $input = <<<EOD
+parent:
+    child: first
+    child: duplicate
+parent:
+    child: duplicate
+    child: duplicate
+EOD;
+        $expected = array(
+            'parent' => array(
+                'child' => 'first',
+            ),
+        );
+        $this->assertSame($expected, Yaml::parse($input));
+    }
+
+    /**
+     * @covers \Symfony\Component\Yaml\Inline::parseMapping
+     */
+    public function testMappingDuplicateKeyFlow()
+    {
+        $input = <<<EOD
+parent: { child: first, child: duplicate }
+parent: { child: duplicate, child: duplicate }
+EOD;
+        $expected = array(
+            'parent' => array(
+                'child' => 'first',
+            ),
+        );
+        $this->assertSame($expected, Yaml::parse($input));
+    }
+
+    public function testEmptyValue()
+    {
+        $input = <<<EOF
+hash:
+EOF;
+
+        $this->assertEquals(array('hash' => null), Yaml::parse($input));
+    }
+
+    public function testStringBlockWithComments()
+    {
+        $this->assertEquals(array('content' => <<<EOT
+# comment 1
+header
+
+    # comment 2
+    <body>
+        <h1>title</h1>
+    </body>
+
+footer # comment3
+EOT
+        ), Yaml::parse(<<<EOF
+content: |
+    # comment 1
+    header
+
+        # comment 2
+        <body>
+            <h1>title</h1>
+        </body>
+
+    footer # comment3
+EOF
+        ));
+    }
+
+    public function testFoldedStringBlockWithComments()
+    {
+        $this->assertEquals(array(array('content' => <<<EOT
+# comment 1
+header
+
+    # comment 2
+    <body>
+        <h1>title</h1>
+    </body>
+
+footer # comment3
+EOT
+        )), Yaml::parse(<<<EOF
+-
+    content: |
+        # comment 1
+        header
+
+            # comment 2
+            <body>
+                <h1>title</h1>
+            </body>
+
+        footer # comment3
+EOF
+        ));
+    }
+
+    public function testNestedFoldedStringBlockWithComments()
+    {
+        $this->assertEquals(array(array(
+            'title' => 'some title',
+            'content' => <<<EOT
+# comment 1
+header
+
+    # comment 2
+    <body>
+        <h1>title</h1>
+    </body>
+
+footer # comment3
+EOT
+        )), Yaml::parse(<<<EOF
+-
+    title: some title
+    content: |
+        # comment 1
+        header
+
+            # comment 2
+            <body>
+                <h1>title</h1>
+            </body>
+
+        footer # comment3
+EOF
+        ));
+    }
+
+    public function testReferenceResolvingInInlineStrings()
+    {
+        $this->assertEquals(array(
+            'var' => 'var-value',
+            'scalar' => 'var-value',
+            'list' => array('var-value'),
+            'list_in_list' => array(array('var-value')),
+            'map_in_list' => array(array('key' => 'var-value')),
+            'embedded_mapping' => array(array('key' => 'var-value')),
+            'map' => array('key' => 'var-value'),
+            'list_in_map' => array('key' => array('var-value')),
+            'map_in_map' => array('foo' => array('bar' => 'var-value')),
+        ), Yaml::parse(<<<EOF
+var:  &var var-value
+scalar: *var
+list: [ *var ]
+list_in_list: [[ *var ]]
+map_in_list: [ { key: *var } ]
+embedded_mapping: [ key: *var ]
+map: { key: *var }
+list_in_map: { key: [*var] }
+map_in_map: { foo: { bar: *var } }
+EOF
+        ));
+    }
+
+    public function testYamlDirective()
+    {
+        $yaml = <<<EOF
+%YAML 1.2
+---
+foo: 1
+bar: 2
+EOF;
+        $this->assertEquals(array('foo' => 1, 'bar' => 2), $this->parser->parse($yaml));
+    }
+}
+
+class B
+{
+    public $b = 'foo';
+}
diff --git a/vendor/symfony/yaml/Tests/YamlTest.php b/vendor/symfony/yaml/Tests/YamlTest.php
new file mode 100644
index 00000000..8db65e39
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/YamlTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml\Tests;
+
+use Symfony\Component\Yaml\Yaml;
+
+class YamlTest extends \PHPUnit_Framework_TestCase
+{
+    public function testParseAndDump()
+    {
+        $data = array('lorem' => 'ipsum', 'dolor' => 'sit');
+        $yml = Yaml::dump($data);
+        $parsed = Yaml::parse($yml);
+        $this->assertEquals($data, $parsed);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyParseFromFile()
+    {
+        $filename = __DIR__.'/Fixtures/index.yml';
+        $contents = file_get_contents($filename);
+        $parsedByFilename = Yaml::parse($filename);
+        $parsedByContents = Yaml::parse($contents);
+        $this->assertEquals($parsedByFilename, $parsedByContents);
+    }
+}
diff --git a/vendor/symfony/yaml/Unescaper.php b/vendor/symfony/yaml/Unescaper.php
new file mode 100644
index 00000000..93206f92
--- /dev/null
+++ b/vendor/symfony/yaml/Unescaper.php
@@ -0,0 +1,146 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml;
+
+/**
+ * Unescaper encapsulates unescaping rules for single and double-quoted
+ * YAML strings.
+ *
+ * @author Matthew Lewinski <matthew@lewinski.org>
+ */
+class Unescaper
+{
+    /**
+     * Parser and Inline assume UTF-8 encoding, so escaped Unicode characters
+     * must be converted to that encoding.
+     *
+     * @deprecated since version 2.5, to be removed in 3.0
+     * @internal
+     */
+    const ENCODING = 'UTF-8';
+
+    /**
+     * Regex fragment that matches an escaped character in a double quoted string.
+     */
+    const REGEX_ESCAPED_CHARACTER = "\\\\([0abt\tnvfre \\\"\\/\\\\N_LP]|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})";
+
+    /**
+     * Unescapes a single quoted string.
+     *
+     * @param string $value A single quoted string.
+     *
+     * @return string The unescaped string.
+     */
+    public function unescapeSingleQuotedString($value)
+    {
+        return str_replace('\'\'', '\'', $value);
+    }
+
+    /**
+     * Unescapes a double quoted string.
+     *
+     * @param string $value A double quoted string.
+     *
+     * @return string The unescaped string.
+     */
+    public function unescapeDoubleQuotedString($value)
+    {
+        $self = $this;
+        $callback = function ($match) use ($self) {
+            return $self->unescapeCharacter($match[0]);
+        };
+
+        // evaluate the string
+        return preg_replace_callback('/'.self::REGEX_ESCAPED_CHARACTER.'/u', $callback, $value);
+    }
+
+    /**
+     * Unescapes a character that was found in a double-quoted string.
+     *
+     * @param string $value An escaped character
+     *
+     * @return string The unescaped character
+     */
+    public function unescapeCharacter($value)
+    {
+        switch ($value{1}) {
+            case '0':
+                return "\x0";
+            case 'a':
+                return "\x7";
+            case 'b':
+                return "\x8";
+            case 't':
+                return "\t";
+            case "\t":
+                return "\t";
+            case 'n':
+                return "\n";
+            case 'v':
+                return "\xB";
+            case 'f':
+                return "\xC";
+            case 'r':
+                return "\r";
+            case 'e':
+                return "\x1B";
+            case ' ':
+                return ' ';
+            case '"':
+                return '"';
+            case '/':
+                return '/';
+            case '\\':
+                return '\\';
+            case 'N':
+                // U+0085 NEXT LINE
+                return "\xC2\x85";
+            case '_':
+                // U+00A0 NO-BREAK SPACE
+                return "\xC2\xA0";
+            case 'L':
+                // U+2028 LINE SEPARATOR
+                return "\xE2\x80\xA8";
+            case 'P':
+                // U+2029 PARAGRAPH SEPARATOR
+                return "\xE2\x80\xA9";
+            case 'x':
+                return self::utf8chr(hexdec(substr($value, 2, 2)));
+            case 'u':
+                return self::utf8chr(hexdec(substr($value, 2, 4)));
+            case 'U':
+                return self::utf8chr(hexdec(substr($value, 2, 8)));
+        }
+    }
+
+    /**
+     * Get the UTF-8 character for the given code point.
+     *
+     * @param int $c The unicode code point
+     *
+     * @return string The corresponding UTF-8 character
+     */
+    private static function utf8chr($c)
+    {
+        if (0x80 > $c %= 0x200000) {
+            return chr($c);
+        }
+        if (0x800 > $c) {
+            return chr(0xC0 | $c >> 6).chr(0x80 | $c & 0x3F);
+        }
+        if (0x10000 > $c) {
+            return chr(0xE0 | $c >> 12).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
+        }
+
+        return chr(0xF0 | $c >> 18).chr(0x80 | $c >> 12 & 0x3F).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
+    }
+}
diff --git a/vendor/symfony/yaml/Yaml.php b/vendor/symfony/yaml/Yaml.php
new file mode 100644
index 00000000..b6def517
--- /dev/null
+++ b/vendor/symfony/yaml/Yaml.php
@@ -0,0 +1,105 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml;
+
+use Symfony\Component\Yaml\Exception\ParseException;
+
+/**
+ * Yaml offers convenience methods to load and dump YAML.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @api
+ */
+class Yaml
+{
+    /**
+     * Parses YAML into a PHP array.
+     *
+     * The parse method, when supplied with a YAML stream (string or file),
+     * will do its best to convert YAML in a file into a PHP array.
+     *
+     *  Usage:
+     *  <code>
+     *   $array = Yaml::parse(file_get_contents('config.yml'));
+     *   print_r($array);
+     *  </code>
+     *
+     * As this method accepts both plain strings and file names as an input,
+     * you must validate the input before calling this method. Passing a file
+     * as an input is a deprecated feature and will be removed in 3.0.
+     *
+     * Note: the ability to pass file names to the Yaml::parse method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.
+     *
+     * @param string $input                  Path to a YAML file or a string containing YAML
+     * @param bool   $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
+     * @param bool   $objectSupport          True if object support is enabled, false otherwise
+     * @param bool   $objectForMap           True if maps should return a stdClass instead of array()
+     *
+     * @return array The YAML converted to a PHP array
+     *
+     * @throws ParseException If the YAML is not valid
+     *
+     * @api
+     */
+    public static function parse($input, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
+    {
+        // if input is a file, process it
+        $file = '';
+        if (strpos($input, "\n") === false && is_file($input)) {
+            @trigger_error('The ability to pass file names to the '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.', E_USER_DEPRECATED);
+
+            if (false === is_readable($input)) {
+                throw new ParseException(sprintf('Unable to parse "%s" as the file is not readable.', $input));
+            }
+
+            $file = $input;
+            $input = file_get_contents($file);
+        }
+
+        $yaml = new Parser();
+
+        try {
+            return $yaml->parse($input, $exceptionOnInvalidType, $objectSupport, $objectForMap);
+        } catch (ParseException $e) {
+            if ($file) {
+                $e->setParsedFile($file);
+            }
+
+            throw $e;
+        }
+    }
+
+    /**
+     * Dumps a PHP array to a YAML string.
+     *
+     * The dump method, when supplied with an array, will do its best
+     * to convert the array into friendly YAML.
+     *
+     * @param array $array                  PHP array
+     * @param int   $inline                 The level where you switch to inline YAML
+     * @param int   $indent                 The amount of spaces to use for indentation of nested nodes.
+     * @param bool  $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param bool  $objectSupport          true if object support is enabled, false otherwise
+     *
+     * @return string A YAML string representing the original PHP array
+     *
+     * @api
+     */
+    public static function dump($array, $inline = 2, $indent = 4, $exceptionOnInvalidType = false, $objectSupport = false)
+    {
+        $yaml = new Dumper();
+        $yaml->setIndentation($indent);
+
+        return $yaml->dump($array, $inline, 0, $exceptionOnInvalidType, $objectSupport);
+    }
+}
diff --git a/vendor/symfony/yaml/composer.json b/vendor/symfony/yaml/composer.json
new file mode 100644
index 00000000..b07b439c
--- /dev/null
+++ b/vendor/symfony/yaml/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "symfony/yaml",
+    "type": "library",
+    "description": "Symfony Yaml Component",
+    "keywords": [],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Fabien Potencier",
+            "email": "fabien@symfony.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.9"
+    },
+    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Component\\Yaml\\": "" }
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.7-dev"
+        }
+    }
+}
diff --git a/vendor/symfony/yaml/phpunit.xml.dist b/vendor/symfony/yaml/phpunit.xml.dist
new file mode 100644
index 00000000..418b2c6c
--- /dev/null
+++ b/vendor/symfony/yaml/phpunit.xml.dist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony Yaml Component Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./vendor</directory>
+                <directory>./Tests</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/view/admin/plugins.php b/view/admin/plugins.php
new file mode 100644
index 00000000..c09245ed
--- /dev/null
+++ b/view/admin/plugins.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+<div class="block">
+    <h2>Plugins</h2>
+    <div class="box">
+        <div class="inbox">
+            <table class="table">
+                <caption>The following plugins are available</caption>
+                <thead>
+                    <tr>
+                        <th>Extension</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php foreach ($pluginsList as $plugin => $class) : ?>
+                        <tr>
+                            <td>
+                                <strong><?= $class::$name; ?></strong>
+                                <div class="plugin-actions">
+                                    <?php if (array_key_exists($class, $activePlugins)) { ?>
+                                        <a href="<?= $feather->url->get('/admin/plugins/deactivate?plugin='.$class) ?>">Deactivate</a>
+                                    <?php } else { ?>
+                                        <a href="<?= $feather->url->get('/admin/plugins/activate?plugin='.$class) ?>">Activate</a>
+                                    <?php } ?>
+                                </div>
+                            </td>
+                            <td>
+                                <?= $class::$description; ?>
+                                <div class="plugin-details">
+                                    Version <?= $class::$version; ?> |
+                                    By <?= $class::$author; ?>
+                                </div>
+                            </td>
+                        </tr>
+                    <?php endforeach; ?>
+                </tbody>
+            </table>
+            <p style="text-align:right"><?= count($pluginsList) ?> éléments</p>
+        </div>
+    </div>
+</div>
+
+	<div class="clearer"></div>
+</div>
diff --git a/view/help.php b/view/help.php
index dd449bc4..9644da0d 100644
--- a/view/help.php
+++ b/view/help.php
@@ -124,7 +124,7 @@
 <?php
 
 // Display the smiley set
-require FEATHER_ROOT.'app/Helpers/parser.php';
+require FEATHER_ROOT.'featherbb/Helpers/parser.php';
 
 $smiley_groups = array();
 
diff --git a/view/post.php b/view/post.php
index e6159e4e..248d7ff3 100644
--- a/view/post.php
+++ b/view/post.php
@@ -52,7 +52,7 @@
 <?php
 
 } elseif ($feather->request->post('preview')) {
-    require_once FEATHER_ROOT.'app/Helpers/parser.php';
+    require_once FEATHER_ROOT.'featherbb/Helpers/parser.php';
     $preview_message = parse_message($post['message'], $post['hide_smilies']);
 
     ?>

From 820f8865b02b7d1cf581b4398f228edb5c7b5176 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Thu, 3 Sep 2015 17:53:48 +0200
Subject: [PATCH 293/353] Add more functions to utils

---
 featherbb/Core/Utils.php                           | 14 ++++++++++++++
 featherbb/Helpers/functions.php                    | 14 --------------
 featherbb/Model/Admin/Statistics.php               |  2 +-
 featherbb/Model/Debug.php                          |  4 ++--
 .../FeatherBB/view/profile/upload_avatar.php       |  4 ++--
 .../MyFeatherBB/view/profile/upload_avatar.php     |  4 ++--
 view/profile/upload_avatar.php                     |  4 ++--
 7 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/featherbb/Core/Utils.php b/featherbb/Core/Utils.php
index e76ba680..3ea29c8e 100644
--- a/featherbb/Core/Utils.php
+++ b/featherbb/Core/Utils.php
@@ -184,4 +184,18 @@ public static function feather_hash($str)
     {
         return sha1($str);
     }
+
+    //
+    // Converts the file size in bytes to a human readable file size
+    //
+    public function file_size($size)
+    {
+        $units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB');
+
+        for ($i = 0; $size > 1024; $i++) {
+            $size /= 1024;
+        }
+
+        return sprintf(__('Size unit '.$units[$i]), round($size, 2));
+    }
 }
diff --git a/featherbb/Helpers/functions.php b/featherbb/Helpers/functions.php
index 45752f2b..40642d78 100644
--- a/featherbb/Helpers/functions.php
+++ b/featherbb/Helpers/functions.php
@@ -499,20 +499,6 @@ function redirect($destination_url, $message = null)
 }
 
 
-//
-// Converts the file size in bytes to a human readable file size
-//
-function file_size($size)
-{
-    $units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB');
-
-    for ($i = 0; $size > 1024; $i++) {
-        $size /= 1024;
-    }
-
-    return sprintf(__('Size unit '.$units[$i]), round($size, 2));
-}
-
 //
 // Generate a cache ID based on the last modification time for all stopwords files
 //
diff --git a/featherbb/Model/Admin/Statistics.php b/featherbb/Model/Admin/Statistics.php
index f869f1a8..a9de8ec0 100644
--- a/featherbb/Model/Admin/Statistics.php
+++ b/featherbb/Model/Admin/Statistics.php
@@ -76,7 +76,7 @@ public function get_total_size()
                 $total['size'] += $status['Data_length'] + $status['Index_length'];
             }
 
-            $total['size'] = file_size($total['size']);
+            $total['size'] = $this->feather->utils->file_size($total['size']);
         }
 
         $total = $this->hook->fire('model.statistics.get_total_size.total', $total);
diff --git a/featherbb/Model/Debug.php b/featherbb/Model/Debug.php
index d7a041be..a0acbbab 100644
--- a/featherbb/Model/Debug.php
+++ b/featherbb/Model/Debug.php
@@ -32,8 +32,8 @@ public static function get_info()
 
         $data = array('exec_time' => (self::$feather->utils->get_microtime() - self::$feather->start));
         $data['nb_queries'] = (isset(DB::get_query_log()[0])) ? count(DB::get_query_log()[0]) : 'N/A';
-        $data['mem_usage'] = (function_exists('memory_get_usage')) ? file_size(memory_get_usage()) : 'N/A';
-        $data['mem_peak_usage'] = (function_exists('memory_get_peak_usage')) ? file_size(memory_get_peak_usage()) : 'N/A';
+        $data['mem_usage'] = (function_exists('memory_get_usage')) ? self::$feather->utils->file_size(memory_get_usage()) : 'N/A';
+        $data['mem_peak_usage'] = (function_exists('memory_get_peak_usage')) ? self::$feather->utils->file_size(memory_get_peak_usage()) : 'N/A';
         return $data;
     }
 }
diff --git a/style/themes/FeatherBB/view/profile/upload_avatar.php b/style/themes/FeatherBB/view/profile/upload_avatar.php
index 15261a67..f92da260 100644
--- a/style/themes/FeatherBB/view/profile/upload_avatar.php
+++ b/style/themes/FeatherBB/view/profile/upload_avatar.php
@@ -9,7 +9,7 @@
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
-    exit;
+	exit;
 }
 
 ?>
@@ -25,7 +25,7 @@
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php _e('Avatar desc').' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
+						<p><?php _e('Avatar desc'); echo ' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.$feather->utils->file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/themes/MyFeatherBB/view/profile/upload_avatar.php b/style/themes/MyFeatherBB/view/profile/upload_avatar.php
index 15261a67..f92da260 100644
--- a/style/themes/MyFeatherBB/view/profile/upload_avatar.php
+++ b/style/themes/MyFeatherBB/view/profile/upload_avatar.php
@@ -9,7 +9,7 @@
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
-    exit;
+	exit;
 }
 
 ?>
@@ -25,7 +25,7 @@
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php _e('Avatar desc').' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
+						<p><?php _e('Avatar desc'); echo ' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.$feather->utils->file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
index 15261a67..f92da260 100644
--- a/view/profile/upload_avatar.php
+++ b/view/profile/upload_avatar.php
@@ -9,7 +9,7 @@
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
-    exit;
+	exit;
 }
 
 ?>
@@ -25,7 +25,7 @@
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php _e('Avatar desc').' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
+						<p><?php _e('Avatar desc'); echo ' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.$feather->utils->file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>

From bd652dfc49adc2d4d72cd631e939c925f487ea70 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sat, 5 Sep 2015 18:26:10 +0200
Subject: [PATCH 294/353] Use urlFor() in controllers

---
 .gitignore                                    |    2 +-
 ...5bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache |    1 -
 cache/cache_parser_data.php                   | 1433 -----------------
 extern.php                                    |    2 +-
 featherbb/Controller/Admin/Categories.php     |   16 +-
 featherbb/Controller/Admin/Forums.php         |   18 +-
 featherbb/Controller/Admin/Index.php          |    6 +-
 featherbb/Controller/Admin/Parser.php         |    8 +-
 featherbb/Controller/Admin/Plugins.php        |    8 +-
 featherbb/Controller/Auth.php                 |   12 +-
 featherbb/Controller/Edit.php                 |    3 +-
 featherbb/Controller/Install.php              |    2 +-
 featherbb/Controller/Login.php                |    2 +-
 featherbb/Controller/Misc.php                 |    4 +-
 featherbb/Controller/Moderate.php             |   10 +-
 featherbb/Controller/Post.php                 |    2 +-
 featherbb/Controller/Profile.php              |    2 +-
 featherbb/Controller/Register.php             |    9 +-
 featherbb/Controller/Search.php               |    4 +-
 featherbb/Core/Cache.php                      |    2 +-
 featherbb/Core/Core.php                       |    4 +-
 featherbb/Helpers/bbcd_compile.php            |    4 +-
 featherbb/Helpers/parser.php                  |    4 +-
 featherbb/Model/Admin/Bans.php                |    4 +-
 featherbb/Model/Admin/Censoring.php           |    6 +-
 featherbb/Model/Admin/Groups.php              |    8 +-
 featherbb/Model/Admin/Maintenance.php         |    2 +-
 featherbb/Model/Admin/Options.php             |    2 +-
 featherbb/Model/Profile.php                   |    4 +-
 featherbb/routes.php                          |  142 +-
 index.php                                     |    2 +-
 31 files changed, 146 insertions(+), 1582 deletions(-)
 delete mode 100644 cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
 delete mode 100644 cache/cache_parser_data.php

diff --git a/.gitignore b/.gitignore
index 81898019..e656a543 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-featherbb/cache/
+cache/
 featherbb/config.php
 .idea/
 nbproject/
diff --git a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
deleted file mode 100644
index 2f1d9ca6..00000000
--- a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
+++ /dev/null
@@ -1 +0,0 @@
-{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1440702252,"expire":0,"data":"a:4:{i:1;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:2;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:3;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:4;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1440867139,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1440768048,"expire":0,"data":"a:2:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;}"}}
\ No newline at end of file
diff --git a/cache/cache_parser_data.php b/cache/cache_parser_data.php
deleted file mode 100644
index a3ea0f5b..00000000
--- a/cache/cache_parser_data.php
+++ /dev/null
@@ -1,1433 +0,0 @@
-<?php // File: cache_parser_data.php. Automatically generated: 2015-08-23 06:16:14. DO NOT EDIT!!!
-$pd = array (
-  'newer_php_version' => true,
-  'in_signature' => false,
-  'ipass' => 0,
-  'tag_stack' => 
-  array (
-    0 => '_ROOT_',
-  ),
-  'config' => 
-  array (
-    'textile' => true,
-    'quote_links' => true,
-    'quote_imgs' => false,
-    'valid_imgs' => true,
-    'click_imgs' => true,
-    'max_size' => 100000,
-    'max_width' => 800,
-    'max_height' => 600,
-    'def_width' => 240,
-    'def_height' => 180,
-    'smiley_size' => 100,
-  ),
-  're_smilies' => '/ # re_smilies Rev:20110220_1200
-# Match special smiley character sequences within BBCode content.
-(?<=^|[>\\s])                    # Only if preceeded by ">" or whitespace.
-(?:\\:\\)|\\=\\)|\\:\\||\\=\\||\\:\\(|\\=\\(|\\:D|\\=D|\\:o|\\:O|;\\)|\\:\\/|\\:P|\\:p|\\:lol\\:|\\:mad\\:|\\:rolleyes\\:|\\:cool\\:)
-(?=$|[\\[<\\s])                   # Only if followed by "<", "[" or whitespace.
-                                /Sx',
-  're_color' => '% # re_color Rev:20110220_1200
-# Match a valid CSS color value. #123, #123456, or "red", "blue", etc.
-^                               # Anchor to start of string.
-(                               # $1: Foreground color (required).
-  \\#(?:[0-9A-Fa-f]{3}){1,2}     # Either a "#" and a 3 or 6 digit hex number,
-| (?: maroon|red|orange|yellow| # or a recognized CSS color word.
-      olive|purple|fuchsia|white|
-      lime|green|navy|blue|aqua|
-      teal|black|silver|gray
-  )                             # End group of recognized color words.
-)                               # End $1. Foreground color.
-# Match optional CSS background color value. ;#123, ;#123456, or ;"red", "blue", etc.
-(?:                             # Begin group for optional background color
-  ;?+                           # foreground;background delimiter: e.g. "#123;#456".
-  ((?1))                        # $2: Background color. (Same regex as the first.)
-)?+                             # Background color spec is optional.
-$                               # Anchor to end of string.
-                                %ix',
-  're_textile' => '/ # re_textile Rev:20110220_1200
-# Match textile inline phrase: _em_ *strong* @tt@ ^super^ ~sub~ -del- +ins+
-([+\\-@*_\\^~])                   # $1: literal exposed start of phrase char, but
-(?<=                            # only if preceded by...
-  ^          [+\\-@*_]           # start of string (for _em_ *strong* -del- +ins+ @code)
-| \\s         [+\\-@*_]           # or whitespace   (for _em_ *strong* -del- +ins+ @code)
-| [A-Za-z0-9)}\\]>][\\^~]         # or alphanum or bracket (for ^superscript^ ~subscript~).
-)                               # only if preceded by whitespace or start of string.
-(                               # $2: Textile phrase contents.
-  [A-Za-z0-9({\\[<]              # First char following delim must be alphanum or bracket.
-  [^+\\-@*_\\^~\\n]*+              # "normal*" == Zero or more non-delim, non-newline.
-  (?>                           # Begin unrolling-the-loop. "(special normal*)*"
-    (?!                         # One of two conditions must be true for inside delim:
-      (?:(?<=[A-Za-z0-9)}\\]>][.,;:!?])(?=\\1(?:\\s|$)))
-    | (?:(?<=[A-Za-z0-9)}\\]>])(?=\\1(?:[\\s.,;:!?]|$)))
-    )[+\\-@*_\\^~]                # If so then not yet at phrase end. Match delim and
-    [^+\\-@*_\\^~\\n]*+            # more "normal*" non-delim, non-linefeeds.
-  )*+                           # Continue unrolling. "(special normal*)*"
-)                               # End $2: Textile phrase contents.
-(?>
-  (?:(?<=[A-Za-z0-9)}\\]>][.,;:!?])(?=\\1(?:\\s|$)))
-| (?:(?<=[A-Za-z0-9)}\\]>])(?=\\1(?:[\\s.,;:!?]|$)))
-)
-\\1                              # Match delim end of phrase, but only if
-                                /Smx',
-  're_bbcode' => '% # re_bbcode Rev:20110220_1200
-# First, match opening tag of syntax: "[TAGNAME (= ("\')ATTRIBUTE("\') )]";
-\\[                              # Match opening bracket of outermost opening TAGNAME tag.
-(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err|dbug)\\s*+) # $1:
-(?>                             # Atomically group remainder of opening tag.
-  (?:                           # Optional attribute.
-    (=)\\s*+                     # $2: = Optional attribute\'s equals sign delimiter, ws.
-    (?:                         # Group for 1-line attribute value alternatives.
-      \'([^\'\\r\\n\\\\]*+(?:\\\\.[^\'\\r\\n\\\\]*+)*+)\'  # Either $3: == single quoted,
-    | "([^"\\r\\n\\\\]*+(?:\\\\.[^"\\r\\n\\\\]*+)*+)"      # or     $4: == double quoted,
-    | ( [^[\\]\\r\\n]*+            # or $5: == un-or-any-quoted. "normal*" == non-"[]"
-        (?:                     # Begin "(special normal*)*" "Unrolling-the-loop" construct.
-          \\[[^[\\]\\r\\n]*+\\]      # Allow matching [square brackets] 1 level deep. "special".
-            [^[\\]\\r\\n]*+        # More "normal*" any non-"[]", non-newline characters.
-        )*+                     # End "(special normal*)*" "Unrolling-the-loop" construct.
-      )                         # End $5: Un-or-any-quoted attribute value.
-    )                           # End group of attribute values alternatives.
-    \\s*+                        # Optional whitespace following quoted values.
-  )?                            # End optional attribute group.
-  \\]                            # Match closing bracket of outermost opening TAGNAME tag.
-)                               # End atomic group with opening tag remainder.
-# Second, match the contents of the tag.
-(                               # $6: Non-trimmed contents of TAGNAME tag.
-  (?>                           # Atomic group for contents alternatives.
-    [^\\[]++                     # Option 1: Match non-tag chars (starting with non-"[").
-    (?:                         # Begin "(special normal*)*" "Unrolling-the-loop" construct.
-      (?!\\[/?+\\1[\\]=\\s])\\[      # "special" = "[" if not start of [TAGNAME*] or [/TAGNAME].
-      [^\\[]*+                   # More "normal*".
-    )*+                         # Zero or more "special normal*"s allowed for option 1.
-  | (?:                         # or Option 2: Match non-tag chars (starting with "[").
-      (?!\\[/?+\\1[\\]=\\s])\\[      # "special" = "[" if not start of [TAGNAME*] or [/TAGNAME].
-      [^\\[]*+                   # More "normal*".
-    )++                         # One or more "special normal*"s required for option 2.
-  | (?R)                        # Or option 3: recursively match nested [TAGNAME]..[/TAGNAME].
-  )*+                           # One of these three options as many times as necessary.
-)                               # End $6: Non-trimmed contents of TAGNAME tag.
-# Finally, match the closing tag.
-\\[/\\1\\s*+\\]                     # Match outermost closing [/  TAGNAME  ]
-                                %ix',
-  're_bbtag' => '%# re_bbtag Rev:20110220_1200
-# Match open or close BBtag.
-\\[/?+                           # Match opening bracket of outermost opening TAGNAME tag.
-(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err|dbug)\\s*+) #$1:
-(?:                             # Optional attribute.
-  (=)\\s*+                       # $2: = Optional attribute\'s equals sign delimiter, ws.
-  (?:                           # Group for 1-line attribute value alternatives.
-    \'([^\'\\r\\n\\\\]*+(?:\\\\.[^\'\\r\\n\\\\]*+)*+)\'  # Either $3: == single quoted,
-  | "([^"\\r\\n\\\\]*+(?:\\\\.[^"\\r\\n\\\\]*+)*+)"      # or     $4: == double quoted,
-  | ( [^[\\]\\r\\n]*+              # or $5: == un-or-any-quoted. "normal*" == non-"[]"
-      (?:                       # Begin "(special normal*)*" "Unrolling-the-loop" construct.
-        \\[[^[\\]\\r\\n]*+\\]        # Allow matching [square brackets] 1 level deep. "special".
-          [^[\\]\\r\\n]*+          # More "normal*" any non-"[]", non-newline characters.
-      )*+                       # End loop construct. See: "Mastering Regular Expressions".
-    )                           # End $5: Un-or-any-quoted attribute value.
-  )                             # End group of attribute values alternatives.
-  \\s*+                          # Optional whitespace following quoted values.
-)?                              # End optional attribute.
-\\]                              # Match closing bracket of outermost opening TAGNAME tag.
-                                %ix',
-  're_fixlist_1' => '%# re_fixlist_1 Rev:20110220_1200
-# Match and repair invalid characters at start of LIST tag (before first [*]).
-^                               # Anchor to start of subject text.
-(                               # $1: Substring with invalid chars to be enclosed.
-  \\s*+                          # Optional whitespace before first invalid char.
-  (?!\\[(?:\\*|/list)\\])          # Assert invalid char(s). (i.e. valid if [*] or [/list]).
-  [^[]*                         # (Normal*) Zero or more non-[.
-  (?:                           # Begin (special normal*)* "Unroll-the-loop- construct.
-    (?!\\[(?:\\*|/list)\\])        # If this [ is not the start of [*] or [/list], then
-    \\[                          # go ahead and match non-[*], non-[/list] left bracket.
-    [^[]*                       # More (normal*).
-  )*                            # End (special normal*)* "unroll-the-loop- construct.
-)                               # End $1: non-whitespace before first [*] (or [/list]).
-(?<!\\s)                         # Backtrack to exclude any trailing whitespace.
-(?=\\s*\\[(?:\\*|/list)\\])         # Done once we reach a [*] or [/list].
-								%ix',
-  're_fixlist_2' => '%# re_fixlist_2 Rev:20110220_1200
-# Match and repair invalid characters between [/*] and next [*] (or [/list]].
-\\[/\\*\\]                         # Match [/*] close tag.
-(                               # $1: Substring with invalid chars to be enclosed.
-  \\s*+                          # Optional whitespace before first invalid char.
-  (?!\\[(?:\\*|/list)\\])          # Assert invalid char(s). (i.e. valid if [*] or [/list]).
-  [^[]*                         # (Normal*) Zero or more non-[.
-  (?:                           # Begin (special normal*)* "Unroll-the-loop- construct.
-    (?!\\[(?:\\*|/list)\\])        # If this [ is not the start of [*] or [/list], then
-    \\[                          # go ahead and match non-[*], non-[/list] left bracket.
-    [^[]*                       # More (normal*).
-  )*                            # End (special normal*)* "unroll-the-loop- construct.
-)                               # End $1: non-whitespace before first [*] (or [/list]).
-(?<!\\s)                         # Backtrack to exclude any trailing whitespace.
-(?=\\s*\\[(?:\\*|/list)\\])         # Done once we reach a [*] or [/list].
-								%ix',
-  'smilies' => 
-  array (
-    ':)' => 
-    array (
-      'file' => 'smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/smile.png" alt="Smile" title="Smile" />',
-    ),
-    '=)' => 
-    array (
-      'file' => 'smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/smile.png" alt="Smile" title="Smile" />',
-    ),
-    ':|' => 
-    array (
-      'file' => 'neutral.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/neutral.png" alt="Neutral" title="Neutral" />',
-    ),
-    '=|' => 
-    array (
-      'file' => 'neutral.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/neutral.png" alt="Neutral" title="Neutral" />',
-    ),
-    ':(' => 
-    array (
-      'file' => 'sad.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/sad.png" alt="Sad" title="Sad" />',
-    ),
-    '=(' => 
-    array (
-      'file' => 'sad.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/sad.png" alt="Sad" title="Sad" />',
-    ),
-    ':D' => 
-    array (
-      'file' => 'big_smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/big_smile.png" alt="Big Smile" title="Big Smile" />',
-    ),
-    '=D' => 
-    array (
-      'file' => 'big_smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/big_smile.png" alt="Big Smile" title="Big Smile" />',
-    ),
-    ':o' => 
-    array (
-      'file' => 'yikes.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/yikes.png" alt="Yikes" title="Yikes" />',
-    ),
-    ':O' => 
-    array (
-      'file' => 'yikes.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/yikes.png" alt="Yikes" title="Yikes" />',
-    ),
-    ';)' => 
-    array (
-      'file' => 'wink.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/wink.png" alt="Wink" title="Wink" />',
-    ),
-    ':/' => 
-    array (
-      'file' => 'hmm.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/hmm.png" alt="Hmm" title="Hmm" />',
-    ),
-    ':P' => 
-    array (
-      'file' => 'tongue.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/tongue.png" alt="Tongue" title="Tongue" />',
-    ),
-    ':p' => 
-    array (
-      'file' => 'tongue.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/tongue.png" alt="Tongue" title="Tongue" />',
-    ),
-    ':lol:' => 
-    array (
-      'file' => 'lol.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/lol.png" alt="Lol" title="Lol" />',
-    ),
-    ':mad:' => 
-    array (
-      'file' => 'mad.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/mad.png" alt="Mad" title="Mad" />',
-    ),
-    ':rolleyes:' => 
-    array (
-      'file' => 'roll.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/roll.png" alt="Roll" title="Roll" />',
-    ),
-    ':cool:' => 
-    array (
-      'file' => 'cool.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/cool.png" alt="Cool" title="Cool" />',
-    ),
-  ),
-  'bbcd' => 
-  array (
-    'b' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<strong>
%c_str%
</strong>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'code' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><div class="codebox"><h4>Code: "%a_str%"</h4><pre>%c_str%</pre></div><p>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div class="codebox"><pre>%c_str%</pre></div><p>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'hidden',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'color' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'color',
-          'c_type' => 'text',
-          'format' => '
<span style="color: %a_str%;">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'colour' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'color',
-          'c_type' => 'text',
-          'format' => '
<span style="color: %a_str%;">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'del' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<del>
%c_str%
</del>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'email' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'email',
-          'c_type' => 'text',
-          'format' => '
<a href="mailto:%a_str%" rel="nofollow">
%c_str%
</a>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'email',
-          'format' => '
<a href="mailto:%c_str%" rel="nofollow">
%c_str%
</a>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'email' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'url' => true,
-        'dbug' => true,
-      ),
-    ),
-    'em' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<em>
%c_str%
</em>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'h' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><h5>
%c_str%
</h5><p>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'img' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'width_height',
-          'c_type' => 'url',
-          'format' => '
<img src="%c_str%" alt="%a_str%" title="%a_str%" width="%w_str%" height="%h_str%" />
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'url',
-          'format' => '
<img src="%c_str%" alt="%c_str%" />
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'atomic',
-      'tags_excluded' => 
-      array (
-        'b' => true,
-        'code' => true,
-        'color' => true,
-        'colour' => true,
-        'del' => true,
-        'email' => true,
-        'em' => true,
-        'h' => true,
-        'ins' => true,
-        'i' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'sub' => true,
-        'sup' => true,
-        's' => true,
-        'tt' => true,
-        'url' => true,
-        'u' => true,
-        'center' => true,
-        'right' => true,
-        'left' => true,
-        'justify' => true,
-        'youtube' => true,
-        'large' => true,
-        'small' => true,
-        'err' => true,
-        'dbug' => true,
-      ),
-    ),
-    'ins' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<ins>
%c_str%
</ins>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'i' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<em>
%c_str%
</em>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'table' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><table>
%c_str%
</table><p>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'b' => true,
-        'code' => true,
-        'color' => true,
-        'colour' => true,
-        'del' => true,
-        'email' => true,
-        'em' => true,
-        'h' => true,
-        'img' => true,
-        'ins' => true,
-        'i' => true,
-        'table' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'sub' => true,
-        'sup' => true,
-        's' => true,
-        'tt' => true,
-        'url' => true,
-        'u' => true,
-        'center' => true,
-        'right' => true,
-        'left' => true,
-        'justify' => true,
-        'youtube' => true,
-        'large' => true,
-        'small' => true,
-        'dbug' => true,
-      ),
-      'tags_only' => true,
-    ),
-    'tr' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<tr>
%c_str%
</tr>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'parents' => 
-      array (
-        'table' => true,
-      ),
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'b' => true,
-        'code' => true,
-        'color' => true,
-        'colour' => true,
-        'del' => true,
-        'email' => true,
-        'em' => true,
-        'h' => true,
-        'img' => true,
-        'ins' => true,
-        'i' => true,
-        'table' => true,
-        'tr' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'sub' => true,
-        'sup' => true,
-        's' => true,
-        'tt' => true,
-        'url' => true,
-        'u' => true,
-        'center' => true,
-        'right' => true,
-        'left' => true,
-        'justify' => true,
-        'youtube' => true,
-        'large' => true,
-        'small' => true,
-        'dbug' => true,
-      ),
-      'tags_only' => true,
-    ),
-    'th' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<th><p>
%c_str%
</p></th>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'parents' => 
-      array (
-        'tr' => true,
-      ),
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'td' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<td><p>
%c_str%
</p></td>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'parents' => 
-      array (
-        'tr' => true,
-      ),
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'list' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        1 => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><ol class="decimal">
%c_str%
</ol><p>
',
-        ),
-        'a' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><ol class="alpha">
%c_str%
</ol><p>
',
-        ),
-        '*' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><ul>
%c_str%
</ul><p>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><ul>
%c_str%
</ul><p>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'b' => true,
-        'code' => true,
-        'color' => true,
-        'colour' => true,
-        'del' => true,
-        'email' => true,
-        'em' => true,
-        'h' => true,
-        'img' => true,
-        'ins' => true,
-        'i' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'quote' => true,
-        'sub' => true,
-        'sup' => true,
-        's' => true,
-        'tt' => true,
-        'url' => true,
-        'u' => true,
-        'center' => true,
-        'right' => true,
-        'left' => true,
-        'justify' => true,
-        'youtube' => true,
-        'large' => true,
-        'small' => true,
-        'err' => true,
-        'dbug' => true,
-      ),
-      'tags_only' => true,
-    ),
-    '*' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<li><p>
%c_str%
</p></li>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'parents' => 
-      array (
-        'list' => true,
-      ),
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'quote' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><div class="quotebox"><cite>%a_str%</cite><blockquote><div><p>
%c_str%
</p></div></blockquote></div><p>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div class="quotebox"><blockquote><div><p>
%c_str%
</p></div></blockquote></div><p>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'clip',
-      'tag_type' => 'zombie',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'sub' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<sub>
%c_str%
</sub>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'sup' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<sup>
%c_str%
</sup>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    's' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<span class="bbs">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'tt' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<tt>%c_str%</tt>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'hidden',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'url' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'url',
-          'c_type' => 'text',
-          'format' => '
<a href="%a_str%" rel="nofollow">
%c_str%
</a>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'url',
-          'format' => '
<a href="%c_str%" rel="nofollow">%c_str%</a>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'email' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'url' => true,
-        'dbug' => true,
-      ),
-    ),
-    'u' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<span class="bbu">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'center' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div align="center"><p>
%c_str%
</p></div><p>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'right' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div align="right"><p>
%c_str%
</p></div><p>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'left' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div align="left"><p>
%c_str%
</p></div><p>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'justify' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div align="justify"><p>
%c_str%
</p></div><p>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'youtube' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'width_height',
-          'c_regex' => '%(?:^|\\bv[=/])(\\w{10,12})\\b%S',
-          'c_type' => 'text',
-          'format' => '
<object type="application/x-shockwave-flash" width="%w_str%" height="%h_str%" data="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1&amp;rel=0"><param name="movie" value="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1" /><param name="allowFullScreen" value="true" /></object>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'width_height',
-          'c_regex' => '%(?:^|\\bv[=/])(\\w{10,12})\\b%S',
-          'c_type' => 'width_height',
-          'format' => '
<object type="application/x-shockwave-flash" width="%w_str%" height="%h_str%" data="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1&amp;rel=0"><param name="movie" value="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1" /><param name="allowFullScreen" value="true" /></object>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => false,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'b' => true,
-        'code' => true,
-        'color' => true,
-        'colour' => true,
-        'del' => true,
-        'email' => true,
-        'em' => true,
-        'h' => true,
-        'img' => true,
-        'ins' => true,
-        'i' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'sub' => true,
-        'sup' => true,
-        's' => true,
-        'tt' => true,
-        'url' => true,
-        'u' => true,
-        'center' => true,
-        'right' => true,
-        'left' => true,
-        'justify' => true,
-        'youtube' => true,
-        'large' => true,
-        'small' => true,
-        'err' => true,
-        'dbug' => true,
-      ),
-      'x_padding' => 20,
-      'y_padding' => 45,
-    ),
-    'large' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<span style="font-size: larger;">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'small' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<span style="font-size: smaller;">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'dbug' => true,
-      ),
-    ),
-    'err' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
<span class="err" title="%a_str%">%c_str%</span>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<span class="err">%c_str%</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'hidden',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'dbug' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><p class="debug" title="%a_str%">
%c_str%
</p><p>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    '_ROOT_' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
<span class="err" title="_ROOT_">%c_str%</span>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => false,
-      'in_sig' => false,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-  ),
-);
-?>
\ No newline at end of file
diff --git a/extern.php b/extern.php
index 22457700..528e005b 100644
--- a/extern.php
+++ b/extern.php
@@ -70,7 +70,7 @@
 $feather->add(new \FeatherBB\Csrf());
 
 $feather_settings = array('config_file' => 'featherbb/config.php',
-    'cache_dir' => 'featherbb/cache/',
+    'cache_dir' => 'cache/',
     'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
 $feather->add(new \FeatherBB\Auth());
 $feather->add(new \FeatherBB\Core($feather_settings));
diff --git a/featherbb/Controller/Admin/Categories.php b/featherbb/Controller/Admin/Categories.php
index 10869aae..6c423a84 100644
--- a/featherbb/Controller/Admin/Categories.php
+++ b/featherbb/Controller/Admin/Categories.php
@@ -31,13 +31,13 @@ public function add_category()
     {
         $cat_name = $this->feather->utils->trim($this->request->post('cat_name'));
         if ($cat_name == '') {
-            redirect($this->feather->url->get('admin/categories/'), __('Must enter name message'));
+            $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Must enter name message'));
         }
 
         if ($this->model->add_category($cat_name)) {
-            redirect($this->feather->url->get('admin/categories/'), __('Category added redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Category added redirect'));
         } else { //TODO, add error message
-            redirect($this->feather->url->get('admin/categories/'), __('Category added redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Category added redirect'));
         }
     }
 
@@ -52,7 +52,7 @@ public function edit_categories()
                               'name' => $this->feather->utils->escape($properties['name']),
                               'order' => (int) $properties['order'], );
             if ($category['name'] == '') {
-                redirect($this->feather->url->get('admin/categories/'), __('Must enter name message'));
+                $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Must enter name message'));
             }
             $this->model->update_category($category);
         }
@@ -60,7 +60,7 @@ public function edit_categories()
         // Regenerate the quick jump cache
         $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
-        redirect($this->feather->url->get('admin/categories/'), __('Categories updated redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Categories updated redirect'));
     }
 
     public function delete_category()
@@ -72,13 +72,13 @@ public function delete_category()
         }
 
         if (intval($this->request->post('disclaimer')) != 1) {
-            redirect($this->feather->url->get('admin/categories/'), __('Delete category not validated'));
+            $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Delete category not validated'));
         }
 
         if ($this->model->delete_category($cat_to_delete)) {
-            redirect($this->feather->url->get('admin/categories/'), __('Category deleted redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Category deleted redirect'));
         } else {
-            redirect($this->feather->url->get('admin/categories/'), __('Unable to delete category'));
+            $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Unable to delete category'));
         }
     }
 
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
index e9106cd0..a8c5f4cf 100644
--- a/featherbb/Controller/Admin/Forums.php
+++ b/featherbb/Controller/Admin/Forums.php
@@ -36,15 +36,15 @@ public function add_forum()
         $cat_id = (int) $this->request->post('cat');
 
         if ($cat_id < 1) {
-            redirect($this->feather->url->get('admin/forums/'), __('Must be valid category'));
+            $this->feather->url->redirect($this->feather->urlFor('adminForums'), __('Must be valid category'));
         }
 
         if ($fid = $this->model->add_forum($cat_id, __('New forum'))) {
             // Regenerate the quick jump cache
             $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
-            redirect($this->feather->url->get('admin/forums/edit/'.$fid.'/'), __('Forum added redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('editForum', array('id' => $fid)), __('Forum added redirect'));
         } else {
-            redirect($this->feather->url->get('admin/forums/'), __('Unable to add forum'));
+            $this->feather->url->redirect($this->feather->urlFor('adminForums'), __('Unable to add forum'));
         }
     }
 
@@ -61,10 +61,10 @@ public function edit_forum($forum_id)
                                     'redirect_url' => $this->feather->url->is_valid($this->request->post('redirect_url')) ? $this->feather->utils->escape($this->request->post('redirect_url')) : NULL);
 
                 if ($forum_data['forum_name'] == '') {
-                    redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Must enter name message'));
+                    $this->feather->url->redirect($this->feather->urlFor('editForum', array('id' => $forum_id)), __('Must enter name message'));
                 }
                 if ($forum_data['cat_id'] < 1) {
-                    redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Must be valid category'));
+                    $this->feather->url->redirect($this->feather->urlFor('editForum', array('id' => $forum_id)), __('Must be valid category'));
                 }
 
                 $this->model->update_forum($forum_id, $forum_data);
@@ -100,7 +100,7 @@ public function edit_forum($forum_id)
                 // Regenerate the quick jump cache
                 $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
-                redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Forum updated redirect'));
+                $this->feather->url->redirect($this->feather->urlFor('editForum', array('id' => $forum_id)), __('Forum updated redirect'));
 
             } elseif ($this->request->post('revert_perms')) {
                 $this->model->delete_permissions($forum_id);
@@ -108,7 +108,7 @@ public function edit_forum($forum_id)
                 // Regenerate the quick jump cache
                 $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
-                redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Perms reverted redirect'));
+                $this->feather->url->redirect($this->feather->urlFor('editForum', array('id' => $forum_id)), __('Perms reverted redirect'));
             }
 
         } else {
@@ -134,7 +134,7 @@ public function delete_forum($forum_id)
             // Regenerate the quick jump cache
             $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
-            redirect($this->feather->url->get('admin/forums/'), __('Forum deleted redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('adminForums'), __('Forum deleted redirect'));
 
         } else { // If the user hasn't confirmed
 
@@ -162,7 +162,7 @@ public function edit_positions()
         // Regenerate the quick jump cache
         $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
-        redirect($this->feather->url->get('admin/forums/'), __('Forums updated redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('adminForums'), __('Forums updated redirect'));
     }
 
     public function display()
diff --git a/featherbb/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
index e0420931..c9cde53e 100644
--- a/featherbb/Controller/Admin/Index.php
+++ b/featherbb/Controller/Admin/Index.php
@@ -55,9 +55,9 @@ public function display($action = null)
             }
 
             if (version_compare($this->config['o_cur_version'], $latest_version, '>=')) {
-                redirect($this->feather->url->get('admin/'), __('Running latest version message'));
+                $this->feather->url->redirect($this->feather->urlFor('adminIndex'), __('Running latest version message'));
             } else {
-                redirect($this->feather->url->get('admin/'), sprintf(__('New version available message'), '<a href="http://featherbb.org/">FeatherBB.org</a>'));
+                $this->feather->url->redirect($this->feather->urlFor('adminIndex'), sprintf(__('New version available message'), '<a href="http://featherbb.org/">FeatherBB.org</a>'));
             }
         }
         // Remove /install
@@ -65,7 +65,7 @@ public function display($action = null)
             $deleted = $this->remove_install_folder($this->feather->forum_env['FEATHER_ROOT'].'install');
 
             if ($deleted) {
-                redirect($this->feather->url->get('admin/'), __('Deleted install.php redirect'));
+                $this->feather->url->redirect($this->feather->urlFor('adminIndex'), __('Deleted install.php redirect'));
             } else {
                 throw new \FeatherBB\Error(__('Delete install.php failed'), 500);
             }
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
index b550fe72..b6b9ef30 100644
--- a/featherbb/Controller/Admin/Parser.php
+++ b/featherbb/Controller/Admin/Parser.php
@@ -35,13 +35,13 @@ public function display()
         require FEATHER_ROOT . 'featherbb/lang/' . $this->user->language . '/admin/parser.php';
 
         // This is where the parser data lives and breathes.
-        $cache_file = FEATHER_ROOT.'featherbb/cache/cache_parser_data.php';
+        $cache_file = FEATHER_ROOT.'cache/cache_parser_data.php';
 
         // If RESET button pushed, or no cache file, re-compile master bbcode source file.
         if ($this->request->post('reset') || !file_exists($cache_file)) {
             require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_source.php');
             require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_compile.php');
-            redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['reset_success']);
+            $this->feather->url->redirect($this->feather->urlFor('adminParser'), $lang_admin_parser['reset_success']);
         }
 
         // Load the current BBCode $pd array from featherbb/Helpers/parser_data.inc.php.
@@ -65,7 +65,7 @@ public function display()
                             if (preg_match('%^image/%', $f['type'])) {        // If we have an image file type?
                                 if ($f['size'] > 0 && $f['size'] <= $this->config['o_avatars_size']) {
                                     if (move_uploaded_file($f['tmp_name'], FEATHER_ROOT .'style/img/smilies/'. $name)) {
-                                        redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['upload success']);
+                                        $this->feather->url->redirect($this->feather->urlFor('adminParser'), $lang_admin_parser['upload success']);
                                     } else { //  Error #1: 'Smiley upload failed. Unable to move to smiley folder.'.
                                         throw new \FeatherBB\Error($lang_admin_parser['upload_err_1'], 500);
                                     }
@@ -199,7 +199,7 @@ public function display()
             }
 
             require_once('featherbb/Helpers/bbcd_compile.php'); // Compile $bbcd and save into $pd['bbcd']
-            redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['save_success']);
+            $this->feather->url->redirect($this->feather->urlFor('adminParser'), $lang_admin_parser['save_success']);
         }
 
         \FeatherBB\AdminUtils::generateAdminMenu('parser');
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
index 1765a9a0..f6be24e3 100644
--- a/featherbb/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -66,10 +66,10 @@ public function activate()
         try {
             $plugin->activate($class);
         } catch (\Exception $e) {
-            redirect($this->feather->url->get('admin/plugins/'), $e->getMessage());
+            $this->feather->url->redirect($this->feather->urlFor('adminPlugins'), $e->getMessage());
         }
         // Plugin has been activated, confirm and redirect
-        $this->feather->url->redirect($this->feather->url->get('admin/plugins/'), 'Plugin "'.$class::$name.'" activated!');
+        $this->feather->url->redirect($this->feather->urlFor('adminPlugins'), 'Plugin "'.$class::$name.'" activated!');
     }
 
     public function deactivate()
@@ -84,10 +84,10 @@ public function deactivate()
         try {
             $plugin->deactivate($class);
         } catch (\Exception $e) {
-            redirect($this->feather->url->get('admin/plugins/'), $this->feather->utils->escape($e->getMessage()));
+            $this->feather->url->redirect($this->feather->urlFor('adminPlugins'), $this->feather->utils->escape($e->getMessage()));
         }
         // Plugin has been activated, confirm and redirect
-        $this->feather->url->redirect($this->feather->url->get('admin/plugins/'), array('warning', 'Plugin "'.$class::$name.'" deactivated!'));
+        $this->feather->url->redirect($this->feather->urlFor('adminPlugins'), array('warning', 'Plugin "'.$class::$name.'" deactivated!'));
     }
 
     public function display()
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
index 4df72e8c..6f54cda9 100644
--- a/featherbb/Controller/Auth.php
+++ b/featherbb/Controller/Auth.php
@@ -21,7 +21,7 @@ public function __construct()
     public function login()
     {
         if (!$this->feather->user->is_guest) {
-            $this->feather->url->redirect($this->feather->url->get('/'), 'Already logged in');
+            $this->feather->url->redirect($this->feather->urlFor('home'), 'Already logged in');
         }
 
         if ($this->feather->request->isPost()) {
@@ -50,7 +50,7 @@ public function login()
                     $expire = $this->feather->hooks->fire('expire_login', $expire);
                     \FeatherBB\Model\Auth::feather_setcookie($user->id, $form_password_hash, $expire);
 
-                    $this->feather->url->redirect($this->feather->url->base(), __('Login redirect'));
+                    $this->feather->url->redirect($this->feather->urlFor('home'), __('Login redirect'));
                 }
             }
             throw new \FeatherBB\Error(__('Wrong user/pass').' <a href="'.$this->feather->url->get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
@@ -70,7 +70,7 @@ public function logout($token)
         $token = $this->feather->hooks->fire('logout_start', $token);
 
         if ($this->feather->user->is_guest || !isset($token) || $token != \FeatherBB\Utils::feather_hash($this->feather->user->id.\FeatherBB\Utils::feather_hash($this->feather->request->getIp()))) {
-            $this->feather->url->redirect($this->feather->url->get('/'), 'Not logged in');
+            $this->feather->url->redirect($this->feather->urlFor('home'), 'Not logged in');
         }
 
         \FeatherBB\Model\Auth::delete_online_by_id($this->feather->user->id);
@@ -83,13 +83,13 @@ public function logout($token)
         \FeatherBB\Model\Auth::feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), time() + 31536000);
         $this->feather->hooks->fire('logout_end');
 
-        redirect($this->feather->url->base(), __('Logout redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('home'), __('Logout redirect'));
     }
 
     public function forget()
     {
         if (!$this->feather->user->is_guest) {
-            $this->feather->url->redirect($this->feather->url->get('/'), 'Already logged in');
+            $this->feather->url->redirect($this->feather->urlFor('home'), 'Already logged in');
         }
 
         if ($this->feather->request->isPost()) {
@@ -134,7 +134,7 @@ public function forget()
 
                 $this->feather->email->feather_mail($email, $mail_subject, $cur_mail_message);
 
-                $this->feather->url->redirect($this->feather->url->get('/'), __('Forget mail').' <a href="mailto:'.$this->feather->utils->escape($this->feather->forum_settings['o_admin_email']).'">'.$this->feather->utils->escape($this->feather->forum_settings['o_admin_email']).'</a>.', 200);
+                $this->feather->url->redirect($this->feather->urlFor('home'), __('Forget mail').' <a href="mailto:'.$this->feather->utils->escape($this->feather->forum_settings['o_admin_email']).'">'.$this->feather->utils->escape($this->feather->forum_settings['o_admin_email']).'</a>.', 200);
             } else {
                 throw new \FeatherBB\Error(__('No email match').' '.$this->feather->utils->escape($email).'.', 400);
             }
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index 2204191e..66ab1972 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -74,7 +74,8 @@ public function editpost($id)
                 // Edit the post
                 $this->model->edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod);
 
-                redirect($this->feather->url->get('post/'.$id.'/#p'.$id), __('Post redirect'));
+                // $this->feather->url->redirect($this->feather->urlFor('viewPost', array('pid' => $id)), __('Post redirect'));
+                $this->feather->url->redirect($this->feather->url->get('post/'.$id.'/#p'.$id), __('Post redirect'));
             }
         } else {
             $post = '';
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
index 39275112..bb8f2d6f 100644
--- a/featherbb/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -200,7 +200,7 @@ public function create_db(array $data)
         $flash->save();
 
         // Redirect to homepage
-        redirect($this->feather->url->get('/'));
+        $this->feather->url->redirect($this->feather->urlFor('home'));
     }
 
     public function write_config($array)
diff --git a/featherbb/Controller/Login.php b/featherbb/Controller/Login.php
index e73cf0b4..ad2ce3b9 100644
--- a/featherbb/Controller/Login.php
+++ b/featherbb/Controller/Login.php
@@ -32,7 +32,7 @@ public function __autoload($class_name)
     public function display()
     {
         if (!$this->user->is_guest) {
-            $this->feather->url->redirect($this->feather->url->get('/'), 'Already logged in');
+            $this->feather->url->redirect($this->feather->urlFor('home'), 'Already logged in');
         }
 
         $this->feather->view2->setPageInfo(array(
diff --git a/featherbb/Controller/Misc.php b/featherbb/Controller/Misc.php
index 479d48e0..2d9b602a 100644
--- a/featherbb/Controller/Misc.php
+++ b/featherbb/Controller/Misc.php
@@ -42,7 +42,7 @@ public function markread()
         // Reset tracked topics
         set_tracked_topics(null);
 
-        redirect($this->feather->url->base(), __('Mark read redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('home'), __('Mark read redirect'));
     }
 
     public function markforumread($id)
@@ -55,7 +55,7 @@ public function markforumread($id)
         $tracked_topics['forums'][$id] = time();
         set_tracked_topics($tracked_topics);
 
-        redirect($this->feather->url->get('forum/'.$id.'/'), __('Mark forum read redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('viewForum', array('id' => $id)), __('Mark forum read redirect'));
     }
 
     public function subscribeforum($id)
diff --git a/featherbb/Controller/Moderate.php b/featherbb/Controller/Moderate.php
index 91d96636..7e2f5007 100644
--- a/featherbb/Controller/Moderate.php
+++ b/featherbb/Controller/Moderate.php
@@ -97,7 +97,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         if ($action == 'stick') {
             $this->model->stick_topic($id, $fid);
 
-            redirect($this->feather->url->get('topic/'.$id.'/'), __('Stick topic redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Stick topic redirect'));
         }
 
 
@@ -105,21 +105,21 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         if ($action == 'unstick') {
             $this->model->unstick_topic($id, $fid);
 
-            redirect($this->feather->url->get('topic/'.$id.'/'), __('Unstick topic redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Unstick topic redirect'));
         }
 
         // Open a topic
         if ($action == 'open') {
             $this->model->open_topic($id, $fid);
 
-            redirect($this->feather->url->get('topic/'.$id.'/'), __('Open topic redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Open topic redirect'));
         }
 
         // Close a topic
         if ($action == 'close') {
             $this->model->close_topic($id, $fid);
 
-            redirect($this->feather->url->get('topic/'.$id.'/'), __('Close topic redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Close topic redirect'));
         }
 
         $cur_topic = $this->model->get_topic_info($fid, $id);
@@ -350,7 +350,7 @@ public function dealposts($fid)
                 $this->model->close_multiple_topics($action, $topics, $fid);
 
                 $redirect_msg = ($action) ? __('Close topics redirect') : __('Open topics redirect');
-                redirect($this->feather->url->get('moderate/forum/'.$fid.'/'), $redirect_msg);
+                $this->feather->url->redirect($this->feather->urlFor('moderateForum', array('id' => $fid)), $redirect_msg);
             }
         }
     }
diff --git a/featherbb/Controller/Post.php b/featherbb/Controller/Post.php
index 75c70641..7bcdb96d 100644
--- a/featherbb/Controller/Post.php
+++ b/featherbb/Controller/Post.php
@@ -120,7 +120,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             $this->model->increment_post_count($post, $new['tid']);
                         }
 
-                    redirect($this->feather->url->get('post/'.$new['pid'].'/#p'.$new['pid']), __('Post redirect'));
+                    $this->feather->url->redirect($this->feather->url->get('post/'.$new['pid'].'/#p'.$new['pid']), __('Post redirect'));
                 }
         }
 
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
index 52e22cbd..6d444e36 100644
--- a/featherbb/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -312,7 +312,7 @@ public function action($id, $action)
 
             $this->model->delete_avatar($id);
 
-            redirect($this->feather->url->get('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
+            $this->feather->url->redirect($this->feather->url->get('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
         } elseif ($action == 'promote') {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_promote_users == '0')) {
                 throw new \FeatherBB\Error(__('No permission'), 403);
diff --git a/featherbb/Controller/Register.php b/featherbb/Controller/Register.php
index 810955e8..c251172a 100644
--- a/featherbb/Controller/Register.php
+++ b/featherbb/Controller/Register.php
@@ -77,17 +77,14 @@ public function display()
 
     public function cancel()
     {
-        redirect($this->feather->url->base());
+        $this->feather->redirect($this->feather->urlFor('home'));
     }
 
     public function rules()
     {
-        // TODO: fix $_GET w/ URL rewriting
-
         // If we are logged in, we shouldn't be here
         if (!$this->user->is_guest) {
-            header('Location: '.$this->feather->url->base());
-            exit;
+            $this->feather->redirect($this->feather->urlFor('home'));
         }
 
         // Display an error message if new registrations are disabled
@@ -96,7 +93,7 @@ public function rules()
         }
 
         if ($this->config['o_rules'] != '1') {
-            redirect($this->feather->url->get('register/agree/'));
+            $this->feather->redirect($this->feather->urlFor('register'));
         }
 
         $this->feather->view2->setPageInfo(array(
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index 159c4741..e8ff4872 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -73,7 +73,7 @@ public function display()
                     $this->feather->view2->addTemplate('search/footer.php', 10)->display();
 
                 } else {
-                    redirect($this->feather->url->get('search/'), __('No hits'));
+                    $this->feather->url->redirect($this->feather->urlFor('search'), __('No hits'));
                 }
         }
         // Display the form
@@ -90,6 +90,6 @@ public function display()
 
     public function quicksearches($show)
     {
-        redirect($this->feather->url->get('search/?action=show_'.$show));
+        $this->feather->redirect($this->feather->urlFor('quickSearch', array('show' => '?action=show_'.$show));
     }
 }
diff --git a/featherbb/Core/Cache.php b/featherbb/Core/Cache.php
index 0bcb0588..98647dc7 100644
--- a/featherbb/Core/Cache.php
+++ b/featherbb/Core/Cache.php
@@ -54,7 +54,7 @@ public function __construct($config = array())
     protected static function getDefaultSettings()
     {
         return array('name' => 'default',
-        'path' => 'featherbb/cache/',
+        'path' => 'cache/',
         'extension' => '.cache');
     }
 
diff --git a/featherbb/Core/Core.php b/featherbb/Core/Core.php
index 4cdef204..ae6588b4 100644
--- a/featherbb/Core/Core.php
+++ b/featherbb/Core/Core.php
@@ -28,7 +28,7 @@ public function __construct(array $data)
 	{
         // Handle empty values in data
         $data = array_merge(array('config_file' => 'featherbb/config.php',
-                                  'cache_dir' => 'featherbb/cache/',
+                                  'cache_dir' => 'cache/',
                                   'debug'   => false), $data);
         // Define some core variables
         $this->forum_env['FEATHER_ROOT'] = realpath(dirname(__FILE__).'/../../').'/';
@@ -55,7 +55,7 @@ public static function load_default_forum_env()
                 'FEATHER' => true, // Legacy
                 'FEATHER_ROOT' => '',
                 'FORUM_CONFIG_FILE' => 'featherbb/config.php',
-                'FORUM_CACHE_DIR' => 'featherbb/cache/',
+                'FORUM_CACHE_DIR' => 'cache/',
                 'FORUM_VERSION' => '1.0.0',
                 'FORUM_NAME' => 'FeatherBB',
                 'FORUM_DB_REVISION' => 21,
diff --git a/featherbb/Helpers/bbcd_compile.php b/featherbb/Helpers/bbcd_compile.php
index 565fac62..02b2c3b3 100644
--- a/featherbb/Helpers/bbcd_compile.php
+++ b/featherbb/Helpers/bbcd_compile.php
@@ -9,7 +9,7 @@
  */
 
 // This script compiles the $options, $smilies and $bbcd arrays (from bbcd_source.php script
-// or from an admin page web form) into the featherbb/cache/cache_parser_data.php.
+// or from an admin page web form) into the cache/cache_parser_data.php.
 
 // Initialize a new global parser data array $pd:
 $pd = array(
@@ -419,7 +419,7 @@ function file2title($file)
 $s .= ";\n";
 
 $s .= "?>";
-file_put_contents(FEATHER_ROOT.'featherbb/cache/cache_parser_data.php', $s);
+file_put_contents(FEATHER_ROOT.'cache/cache_parser_data.php', $s);
 
 // Clean up our global variables.
 unset($all_tags); unset($all_block_tags);
diff --git a/featherbb/Helpers/parser.php b/featherbb/Helpers/parser.php
index be8a9746..7bd40710 100644
--- a/featherbb/Helpers/parser.php
+++ b/featherbb/Helpers/parser.php
@@ -16,8 +16,8 @@
 define('FEATHER_PARSER', '11-Feb-2011 13:33');
 
 // globals. we share one array: $pd
-if (file_exists(FEATHER_ROOT.'featherbb/cache/cache_parser_data.php')) { // If file already exists
-    require_once(FEATHER_ROOT.'featherbb/cache/cache_parser_data.php');
+if (file_exists(FEATHER_ROOT.'cache/cache_parser_data.php')) { // If file already exists
+    require_once(FEATHER_ROOT.'cache/cache_parser_data.php');
 } else { // It needs to be re-generated.
     require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_source.php');
     require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_compile.php');
diff --git a/featherbb/Model/Admin/Bans.php b/featherbb/Model/Admin/Bans.php
index f74d25ea..85ba3721 100644
--- a/featherbb/Model/Admin/Bans.php
+++ b/featherbb/Model/Admin/Bans.php
@@ -276,7 +276,7 @@ public function insert_ban()
         // Regenerate the bans cache
         $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
 
-        redirect($this->feather->url->get('admin/bans/'), __('Ban edited redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('adminBans'), __('Ban edited redirect'));
     }
 
     public function remove_ban($ban_id)
@@ -291,7 +291,7 @@ public function remove_ban($ban_id)
         // Regenerate the bans cache
         $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
 
-        redirect($this->feather->url->get('admin/bans/'), __('Ban removed redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('adminBans'), __('Ban removed redirect'));
     }
 
     public function find_ban($start_from = false)
diff --git a/featherbb/Model/Admin/Censoring.php b/featherbb/Model/Admin/Censoring.php
index 34aeced3..b3489cc8 100644
--- a/featherbb/Model/Admin/Censoring.php
+++ b/featherbb/Model/Admin/Censoring.php
@@ -46,7 +46,7 @@ public function add_word()
         $this->feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
         $this->feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
 
-        redirect($this->feather->url->get('admin/censoring/'), __('Word added redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('adminCensoring'), __('Word added redirect'));
     }
 
     public function update_word()
@@ -74,7 +74,7 @@ public function update_word()
         $this->feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
         $this->feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
 
-        redirect($this->feather->url->get('admin/censoring/'), __('Word updated redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('adminCensoring'), __('Word updated redirect'));
     }
 
     public function remove_word()
@@ -90,7 +90,7 @@ public function remove_word()
         $this->feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
         $this->feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
 
-        redirect($this->feather->url->get('admin/censoring/'),  __('Word removed redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('adminCensoring'),  __('Word removed redirect'));
     }
 
     public function get_words()
diff --git a/featherbb/Model/Admin/Groups.php b/featherbb/Model/Admin/Groups.php
index d47f310e..9d6ed1b4 100644
--- a/featherbb/Model/Admin/Groups.php
+++ b/featherbb/Model/Admin/Groups.php
@@ -258,9 +258,9 @@ public function add_edit_group($groups)
         $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
         if ($this->request->post('mode') == 'edit') {
-            redirect($this->feather->url->get('admin/groups/'), __('Group edited redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('adminGroups'), __('Group edited redirect'));
         } else {
-            redirect($this->feather->url->get('admin/groups/'), __('Group added redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('adminGroups'), __('Group added redirect'));
         }
     }
 
@@ -285,7 +285,7 @@ public function set_default_group($groups)
         // Regenerate the config cache
         $this->feather->cache->store('config', \FeatherBB\Model\Cache::get_config());
 
-        redirect($this->feather->url->get('admin/groups/'), __('Default group redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('adminGroups'), __('Default group redirect'));
     }
 
     public function check_members($group_id)
@@ -328,7 +328,7 @@ public function delete_group($group_id)
         DB::for_table('groups')->where('g_promote_next_group', $group_id)
                                                    ->update_many('g_promote_next_group', 0);
 
-        redirect($this->feather->url->get('admin/groups/'), __('Group removed redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('adminGroups'), __('Group removed redirect'));
     }
 
     public function get_group_title($group_id)
diff --git a/featherbb/Model/Admin/Maintenance.php b/featherbb/Model/Admin/Maintenance.php
index c4c51306..c7c1e034 100644
--- a/featherbb/Model/Admin/Maintenance.php
+++ b/featherbb/Model/Admin/Maintenance.php
@@ -211,7 +211,7 @@ public function prune_comply($prune_from, $prune_sticky)
                     ->delete_many();
         }
 
-        redirect($this->feather->url->get('admin/maintenance/'), __('Posts pruned redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('adminMaintenance'), __('Posts pruned redirect'));
     }
 
     public function get_info_prune($prune_sticky, $prune_from)
diff --git a/featherbb/Model/Admin/Options.php b/featherbb/Model/Admin/Options.php
index 6ef7f8ad..d7f04dfb 100644
--- a/featherbb/Model/Admin/Options.php
+++ b/featherbb/Model/Admin/Options.php
@@ -230,7 +230,7 @@ public function update_options()
         $this->feather->cache->store('config', \FeatherBB\Model\Cache::get_config());
         $this->clear_feed_cache();
 
-        redirect($this->feather->url->get('admin/options/'), __('Options updated redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('adminOptions'), __('Options updated redirect'));
     }
 
     public function clear_feed_cache()
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index 4b785929..d840187c 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -57,7 +57,7 @@ public function change_pass($id)
                 $query = $this->hook->fireDB('change_pass_activate_query', $query);
                 $query = $query->save();
 
-                $this->feather->url->redirect($this->feather->url->get('/'), __('Pass updated'));
+                $this->feather->url->redirect($this->feather->urlFor('home'), __('Pass updated'));
             }
         }
 
@@ -193,7 +193,7 @@ public function change_email($id)
                 $update_mail = $this->hook->fireDB('change_email_query', $update_mail);
                 $update_mail = $update_mail->save();
 
-                $this->feather->url->redirect($this->feather->url->get('/'), __('Email updated'));
+                $this->feather->url->redirect($this->feather->urlFor('home'), __('Email updated'));
             }
         } elseif ($this->request->isPost()) {
             $this->hook->fire('change_email_post');
diff --git a/featherbb/routes.php b/featherbb/routes.php
index 975a5945..c10e5400 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -8,78 +8,78 @@
  */
 
 // Index
-$feather->get('/', '\FeatherBB\Controller\index:display');
+$feather->get('/', '\FeatherBB\Controller\index:display')->name('home');
 
 // Viewforum
-$feather->get('/forum/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\viewforum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
+$feather->get('/forum/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\viewforum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('viewForum');
 
 // Viewtopic
 $feather->group('/topic', function() use ($feather) {
-    $feather->get('/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\viewtopic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
-    $feather->get('/:id/action/:action(/)', '\FeatherBB\Controller\viewtopic:action')->conditions(array('id' => '[0-9]+'));
+    $feather->get('/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\viewtopic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('viewTopic');
+    $feather->get('/:id/action/:action(/)', '\FeatherBB\Controller\viewtopic:action')->conditions(array('id' => '[0-9]+'))->name('topicAction');
 });
-$feather->get('/post/:pid(/)', '\FeatherBB\Controller\viewtopic:viewpost')->conditions(array('pid' => '[0-9]+'));
+$feather->get('/post/:pid(/)', '\FeatherBB\Controller\viewtopic:viewpost')->conditions(array('pid' => '[0-9]+'))->name('viewPost');
 
 // Userlist
-$feather->get('/userlist(/)', '\FeatherBB\Controller\userlist:display');
+$feather->get('/userlist(/)', '\FeatherBB\Controller\userlist:display')->name('userList');
 
 // Auth routes
 $feather->group('/auth', function() use ($feather) {
     $feather->get('(/)', function () use ($feather) {
         if (!$feather->user->is_guest) {
-            $this->feather->url->redirect($this->feather->url->get('/'));
+            $feather->url->redirect($feather->urlFor('home'), 'Already logged');
         } else {
-            $this->feather->url->redirect($this->feather->url->get('/auth/login'));
+            $feather->redirect($feather->urlFor('login'));
         }
     });
-    $feather->map('/login(/)', '\FeatherBB\Controller\auth:login')->via('GET', 'POST');
-    $feather->map('/forget(/)', '\FeatherBB\Controller\auth:forget')->via('GET', 'POST');
-    $feather->get('/logout/token/:token(/)', '\FeatherBB\Controller\auth:logout');
+    $feather->map('/login(/)', '\FeatherBB\Controller\auth:login')->via('GET', 'POST')->name('login');
+    $feather->map('/forget(/)', '\FeatherBB\Controller\auth:forget')->via('GET', 'POST')->name('resetPassword');
+    $feather->get('/logout/token/:token(/)', '\FeatherBB\Controller\auth:logout')->name('logout');
 });
 
 // Register routes
 $feather->group('/register', function() use ($feather) {
-    $feather->get('(/)', '\FeatherBB\Controller\register:rules');
-    $feather->map('/agree(/)', '\FeatherBB\Controller\register:display')->via('GET', 'POST');
-    $feather->get('/cancel(/)', '\FeatherBB\Controller\register:cancel');
+    $feather->get('(/)', '\FeatherBB\Controller\register:rules')->name('registerRules');
+    $feather->map('/agree(/)', '\FeatherBB\Controller\register:display')->via('GET', 'POST')->name('register');
+    $feather->get('/cancel(/)', '\FeatherBB\Controller\register:cancel')->name('registerCancel');
 });
 
 // Post routes
 $feather->group('/post', function() use ($feather) {
-    $feather->map('/new-topic/:fid(/)', '\FeatherBB\Controller\post:newpost')->conditions(array('fid' => '[0-9]+'))->via('GET', 'POST');
-    $feather->map('/reply/:tid(/)(/quote/:qid)(/)', '\FeatherBB\Controller\post:newreply')->conditions(array('tid' => '[0-9]+', 'qid' => '[0-9]+'))->via('GET', 'POST');
+    $feather->map('/new-topic/:fid(/)', '\FeatherBB\Controller\post:newpost')->conditions(array('fid' => '[0-9]+'))->via('GET', 'POST')->name('newTopic');
+    $feather->map('/reply/:tid(/)(/quote/:qid)(/)', '\FeatherBB\Controller\post:newreply')->conditions(array('tid' => '[0-9]+', 'qid' => '[0-9]+'))->via('GET', 'POST')->name('newReply');
 });
 
 // Edit
-$feather->map('/edit/:id(/)', '\FeatherBB\Controller\edit:editpost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+$feather->map('/edit/:id(/)', '\FeatherBB\Controller\edit:editpost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('editPost');
 
 // Delete
-$feather->map('/delete/:id(/)', '\FeatherBB\Controller\delete:deletepost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+$feather->map('/delete/:id(/)', '\FeatherBB\Controller\delete:deletepost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('deletePost');
 
 // Search routes
 $feather->group('/search', function() use ($feather) {
-    $feather->get('(/)', '\FeatherBB\Controller\search:display');
-    $feather->get('/show/:show(/)', '\FeatherBB\Controller\search:quicksearches');
+    $feather->get('(/)', '\FeatherBB\Controller\search:display')->name('search');
+    $feather->get('/show/:show(/)', '\FeatherBB\Controller\search:quicksearches')->name('quickSearch');
 });
 
 // Help
-$feather->get('/help(/)', '\FeatherBB\Controller\help:display');
+$feather->get('/help(/)', '\FeatherBB\Controller\help:display')->name('help');
 
 // Misc
-$feather->get('/rules(/)', '\FeatherBB\Controller\misc:rules');
-$feather->get('/mark-read(/)', '\FeatherBB\Controller\misc:markread');
-$feather->get('/mark-forum-read/:id(/)', '\FeatherBB\Controller\misc:markforumread')->conditions(array('id' => '[0-9]+'));
-$feather->map('/email/:id(/)', '\FeatherBB\Controller\misc:email')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-$feather->map('/report/:id(/)', '\FeatherBB\Controller\misc:report')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-$feather->get('/subscribe/forum/:id(/)', '\FeatherBB\Controller\misc:subscribeforum')->conditions(array('id' => '[0-9]+'));
-$feather->get('/unsubscribe/forum/:id(/)', '\FeatherBB\Controller\misc:unsubscribeforum')->conditions(array('id' => '[0-9]+'));
-$feather->get('/subscribe/topic/:id(/)', '\FeatherBB\Controller\misc:subscribetopic')->conditions(array('id' => '[0-9]+'));
-$feather->get('/unsubscribe/topic/:id(/)', '\FeatherBB\Controller\misc:unsubscribetopic')->conditions(array('id' => '[0-9]+'));
+$feather->get('/rules(/)', '\FeatherBB\Controller\misc:rules')->name('rules');
+$feather->get('/mark-read(/)', '\FeatherBB\Controller\misc:markread')->name('markRead');
+$feather->get('/mark-forum-read/:id(/)', '\FeatherBB\Controller\misc:markforumread')->conditions(array('id' => '[0-9]+'))->name('markForumRead');
+$feather->map('/email/:id(/)', '\FeatherBB\Controller\misc:email')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('email');
+$feather->map('/report/:id(/)', '\FeatherBB\Controller\misc:report')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('report');
+$feather->get('/subscribe/forum/:id(/)', '\FeatherBB\Controller\misc:subscribeforum')->conditions(array('id' => '[0-9]+'))->name('subscribeForum');
+$feather->get('/unsubscribe/forum/:id(/)', '\FeatherBB\Controller\misc:unsubscribeforum')->conditions(array('id' => '[0-9]+'))->name('unsubscribeForum');
+$feather->get('/subscribe/topic/:id(/)', '\FeatherBB\Controller\misc:subscribetopic')->conditions(array('id' => '[0-9]+'))->name('subscribeTopic');
+$feather->get('/unsubscribe/topic/:id(/)', '\FeatherBB\Controller\misc:unsubscribetopic')->conditions(array('id' => '[0-9]+'))->name('unsubscribeTopic');
 
 // Profile routes
 $feather->group('/user', function() use ($feather) {
-    $feather->map('/:id(/section/:section)(/)', '\FeatherBB\Controller\profile:display')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-    $feather->map('/:id(/action/:action)(/)', '\FeatherBB\Controller\profile:action')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+    $feather->map('/:id(/section/:section)(/)', '\FeatherBB\Controller\profile:display')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('profile');
+    $feather->map('/:id(/action/:action)(/)', '\FeatherBB\Controller\profile:action')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('profileAction');
 });
 
 /**
@@ -87,18 +87,18 @@
  */
 $isAdmmod = function() use ($feather) {
     if(!$feather->user->is_admmod) {
-        redirect($feather->url->base(), __('No permission'));
+        $feather->redirect($feather->urlFor('home'), __('No permission'));
     }
 };
 
 // Moderate routes
 $feather->group('/moderate', $isAdmmod, function() use ($feather) {
-    $feather->get('/forum/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'));
-    $feather->get('/get-host/post/:pid(/)', '\FeatherBB\Controller\moderate:gethostpost')->conditions(array('pid' => '[0-9]+'));
-    $feather->get('/get-host/ip/:ip(/)', '\FeatherBB\Controller\moderate:gethostip');
-    $feather->map('/topic/:id/forum/:fid/action/:action(/param/:param)(/)', '\FeatherBB\Controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST');
-    $feather->map('/topic/:id/forum/:fid/action/:action(/page/:param)(/)', '\FeatherBB\Controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST');
-    $feather->post('/forum/:fid(/page/:page)(/)', '\FeatherBB\Controller\moderate:dealposts')->conditions(array('fid' => '[0-9]+', 'page' => '[0-9]+'));
+    $feather->get('/forum/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('moderateForum');
+    $feather->get('/get-host/post/:pid(/)', '\FeatherBB\Controller\moderate:gethostpost')->conditions(array('pid' => '[0-9]+'))->name('getHostPost');
+    $feather->get('/get-host/ip/:ip(/)', '\FeatherBB\Controller\moderate:gethostip')->name('getHostIp');
+    $feather->map('/topic/:id/forum/:fid/action/:action(/param/:param)(/)', '\FeatherBB\Controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST')->name('moderateTopic');
+    $feather->map('/topic/:id/forum/:fid/action/:action(/page/:param)(/)', '\FeatherBB\Controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST')->name('moderateTopicPage');
+    $feather->post('/forum/:fid(/page/:page)(/)', '\FeatherBB\Controller\moderate:dealposts')->conditions(array('fid' => '[0-9]+', 'page' => '[0-9]+'))->name('dealPosts');
 });
 
 // Admin routes
@@ -109,81 +109,81 @@
      */
     $isAdmin = function() use ($feather) {
         if($feather->user->g_id != FEATHER_ADMIN) {
-            redirect($feather->url->base(), __('No permission'));
+            $feather->redirect($feather->urlFor('home'), __('No permission'));
         }
     };
 
     // Admin index
     $feather->get('(/action/:action)(/)', '\FeatherBB\Controller\Admin\index:display');
-    $feather->get('/index(/)', '\FeatherBB\Controller\Admin\index:display');
+    $feather->get('/index(/)', '\FeatherBB\Controller\Admin\index:display')->name('adminIndex');
 
     // Admin bans
     $feather->group('/bans', function() use ($feather) {
-        $feather->get('(/)', '\FeatherBB\Controller\Admin\Bans:display');
-        $feather->get('/delete/:id(/)', '\FeatherBB\Controller\Admin\Bans:delete')->conditions(array('id' => '[0-9]+'));
-        $feather->map('/edit/:id(/)', '\FeatherBB\Controller\Admin\Bans:edit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-        $feather->map('/add(/:id)(/)', '\FeatherBB\Controller\Admin\Bans:add')->via('GET', 'POST');
+        $feather->get('(/)', '\FeatherBB\Controller\Admin\Bans:display')->name('adminBans');
+        $feather->get('/delete/:id(/)', '\FeatherBB\Controller\Admin\Bans:delete')->conditions(array('id' => '[0-9]+'))->name('deleteBan');
+        $feather->map('/edit/:id(/)', '\FeatherBB\Controller\Admin\Bans:edit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('editBan');
+        $feather->map('/add(/:id)(/)', '\FeatherBB\Controller\Admin\Bans:add')->via('GET', 'POST')->name('addBan');
     });
 
     // Admin options
-    $feather->map('/options(/)', $isAdmin, '\FeatherBB\Controller\Admin\options:display')->via('GET', 'POST');
+    $feather->map('/options(/)', $isAdmin, '\FeatherBB\Controller\Admin\options:display')->via('GET', 'POST')->name('adminOptions');
 
     // Admin categories
     $feather->group('/categories', $isAdmin, function() use ($feather) {
-        $feather->get('(/)', '\FeatherBB\Controller\Admin\categories:display');
-        $feather->post('/add(/)', '\FeatherBB\Controller\Admin\categories:add_category');
-        $feather->post('/edit(/)', '\FeatherBB\Controller\Admin\categories:edit_categories');
-        $feather->post('/delete(/)', '\FeatherBB\Controller\Admin\categories:delete_category');
+        $feather->get('(/)', '\FeatherBB\Controller\Admin\categories:display')->name('adminCategories');
+        $feather->post('/add(/)', '\FeatherBB\Controller\Admin\categories:add_category')->name('addCategory');
+        $feather->post('/edit(/)', '\FeatherBB\Controller\Admin\categories:edit_categories')->name('editCategory');
+        $feather->post('/delete(/)', '\FeatherBB\Controller\Admin\categories:delete_category')->name('deleteCategory');
     });
 
     // Admin censoring
-    $feather->map('/censoring(/)', $isAdmin, '\FeatherBB\Controller\Admin\censoring:display')->via('GET', 'POST');
+    $feather->map('/censoring(/)', $isAdmin, '\FeatherBB\Controller\Admin\censoring:display')->via('GET', 'POST')->name('adminCensoring');
 
     // Admin reports
-    $feather->map('/reports(/)', '\FeatherBB\Controller\Admin\reports:display')->via('GET', 'POST');
+    $feather->map('/reports(/)', '\FeatherBB\Controller\Admin\reports:display')->via('GET', 'POST')->name('reports');
 
     // Admin permissions
-    $feather->map('/permissions(/)', $isAdmin, '\FeatherBB\Controller\Admin\permissions:display')->via('GET', 'POST');
+    $feather->map('/permissions(/)', $isAdmin, '\FeatherBB\Controller\Admin\permissions:display')->via('GET', 'POST')->name('adminPermissions');
 
     // Admin statistics
-    $feather->get('/statistics(/)', '\FeatherBB\Controller\Admin\statistics:display');
-    $feather->get('/phpinfo(/)', '\FeatherBB\Controller\Admin\statistics:phpinfo');
+    $feather->get('/statistics(/)', '\FeatherBB\Controller\Admin\statistics:display')->name('statistics');
+    $feather->get('/phpinfo(/)', '\FeatherBB\Controller\Admin\statistics:phpinfo')->name('phpInfo');
 
     // Admin forums
     $feather->group('/forums', $isAdmin, function() use ($feather) {
-        $feather->map('(/)', '\FeatherBB\Controller\Admin\forums:display')->via('GET', 'POST');
-        $feather->post('/add(/)', '\FeatherBB\Controller\Admin\forums:add_forum');
-        $feather->map('/edit/:id(/)', '\FeatherBB\Controller\Admin\forums:edit_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-        $feather->map('/delete/:id(/)', '\FeatherBB\Controller\Admin\forums:delete_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+        $feather->map('(/)', '\FeatherBB\Controller\Admin\forums:display')->via('GET', 'POST')->name('adminForums');
+        $feather->post('/add(/)', '\FeatherBB\Controller\Admin\forums:add_forum')->name('addForum');
+        $feather->map('/edit/:id(/)', '\FeatherBB\Controller\Admin\forums:edit_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('editForum');
+        $feather->map('/delete/:id(/)', '\FeatherBB\Controller\Admin\forums:delete_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('deleteForum');
     });
 
     // Admin groups
     $feather->group('/groups', $isAdmin, function() use ($feather) {
-        $feather->map('(/)', '\FeatherBB\Controller\Admin\groups:display')->via('GET', 'POST');
-        $feather->map('/add(/)', '\FeatherBB\Controller\Admin\groups:addedit')->via('GET', 'POST');
-        $feather->map('/edit/:id(/)', '\FeatherBB\Controller\Admin\groups:addedit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
-        $feather->map('/delete/:id(/)', '\FeatherBB\Controller\Admin\groups:delete')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST');
+        $feather->map('(/)', '\FeatherBB\Controller\Admin\groups:display')->via('GET', 'POST')->name('adminGroups');
+        $feather->map('/add(/)', '\FeatherBB\Controller\Admin\groups:addedit')->via('GET', 'POST')->name('addGroup');
+        $feather->map('/edit/:id(/)', '\FeatherBB\Controller\Admin\groups:addedit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('editGroup');
+        $feather->map('/delete/:id(/)', '\FeatherBB\Controller\Admin\groups:delete')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('deleteGroup');
     });
 
     // Admin plugins
     $feather->group('/plugins', function() use ($feather) {
-        $feather->map('/(/)', '\FeatherBB\Controller\Admin\plugins:index')->via('GET', 'POST');
-        $feather->map('/activate(/)', '\FeatherBB\Controller\Admin\plugins:activate')->via('GET');
-        $feather->map('/deactivate(/)', '\FeatherBB\Controller\Admin\plugins:deactivate')->via('GET');
+        $feather->map('/(/)', '\FeatherBB\Controller\Admin\plugins:index')->via('GET', 'POST')->name('adminPlugins');
+        $feather->map('/activate(/)', '\FeatherBB\Controller\Admin\plugins:activate')->via('GET')->name('activatePlugin');
+        $feather->map('/deactivate(/)', '\FeatherBB\Controller\Admin\plugins:deactivate')->via('GET')->name('deactivatePlugin');
         // $feather->map('/loader(/)', '\FeatherBB\Controller\Admin\plugins:display')->via('GET', 'POST');
     });
 
     // Admin maintenance
-    $feather->map('/maintenance(/)', $isAdmin, '\FeatherBB\Controller\Admin\maintenance:display')->via('GET', 'POST');
+    $feather->map('/maintenance(/)', $isAdmin, '\FeatherBB\Controller\Admin\maintenance:display')->via('GET', 'POST')->name('adminMaintenance');
 
     // Admin parser
-    $feather->map('/parser(/)', $isAdmin, '\FeatherBB\Controller\Admin\parser:display')->via('GET', 'POST');
+    $feather->map('/parser(/)', $isAdmin, '\FeatherBB\Controller\Admin\parser:display')->via('GET', 'POST')->name('adminParser');
 
     // Admin users
     $feather->group('/users', function() use ($feather) {
-        $feather->map('(/)', '\FeatherBB\Controller\Admin\users:display')->via('GET', 'POST');
-        $feather->get('/ip-stats/id/:id(/)', '\FeatherBB\Controller\Admin\users:ipstats')->conditions(array('id' => '[0-9]+'));
-        $feather->get('/show-users/ip/:ip(/)', '\FeatherBB\Controller\Admin\users:showusers');
+        $feather->map('(/)', '\FeatherBB\Controller\Admin\users:display')->via('GET', 'POST')->name('adminUsers');
+        $feather->get('/ip-stats/id/:id(/)', '\FeatherBB\Controller\Admin\users:ipstats')->conditions(array('id' => '[0-9]+'))->name('usersIpStats');
+        $feather->get('/show-users/ip/:ip(/)', '\FeatherBB\Controller\Admin\users:showusers')->name('usersIpShow');
     });
 
 });
diff --git a/index.php b/index.php
index 955ec623..bba2dbaf 100644
--- a/index.php
+++ b/index.php
@@ -21,7 +21,7 @@
 $feather->add(new \FeatherBB\Csrf());
 
 $feather_settings = array('config_file' => 'featherbb/config.php',
-                          'cache_dir' => 'featherbb/cache/',
+                          'cache_dir' => 'cache/',
                           'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
 $feather->add(new \FeatherBB\Auth());
 $feather->add(new \FeatherBB\Core($feather_settings));

From f5be25c95517ba7bc9674b22e11c1422ed67b7f3 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 5 Sep 2015 19:16:25 +0200
Subject: [PATCH 295/353] Switch to protected

---
 featherbb/Model/Index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/featherbb/Model/Index.php b/featherbb/Model/Index.php
index 0ed34f9f..32858ff6 100644
--- a/featherbb/Model/Index.php
+++ b/featherbb/Model/Index.php
@@ -58,7 +58,7 @@ public function get_forum_actions()
     }
 
     // Detects if a "new" icon has to be displayed
-    public function get_new_posts()
+    protected function get_new_posts()
     {
         $this->hook->fire('get_new_posts_start');
 

From 38a5a4cd0ed62c455cbc6e248bff6ccf2d0fb2d1 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sat, 5 Sep 2015 19:25:08 +0200
Subject: [PATCH 296/353] urlFor() in models

---
 featherbb/Controller/Search.php       |  2 +-
 featherbb/Core/Url.php                |  2 +-
 featherbb/Model/Admin/Permissions.php |  2 +-
 featherbb/Model/Admin/Reports.php     |  2 +-
 featherbb/Model/Admin/Users.php       |  6 +++---
 featherbb/Model/Delete.php            |  4 ++--
 featherbb/Model/Login.php             |  4 ++--
 featherbb/Model/Misc.php              | 13 +++++++------
 featherbb/Model/Moderate.php          | 10 +++++-----
 featherbb/Model/Profile.php           | 22 +++++++++++-----------
 featherbb/Model/Register.php          |  5 ++---
 featherbb/routes.php                  |  8 ++++----
 12 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index e8ff4872..498a92a5 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -90,6 +90,6 @@ public function display()
 
     public function quicksearches($show)
     {
-        $this->feather->redirect($this->feather->urlFor('quickSearch', array('show' => '?action=show_'.$show));
+        $this->feather->redirect($this->feather->urlFor('quickSearch', array('show' => '?action=show_'.$show)));
     }
 }
diff --git a/featherbb/Core/Url.php b/featherbb/Core/Url.php
index ae7a5730..93721c2d 100644
--- a/featherbb/Core/Url.php
+++ b/featherbb/Core/Url.php
@@ -921,6 +921,6 @@ public function redirect($destination_url, $message = null, $status = 302)
         // Add a flash message
         $this->feather->flash($message[0], $message[1]);
 
-        $this->feather->redirect($destination_url);
+        $this->feather->redirect($destination_url.'/');
     }
 }
diff --git a/featherbb/Model/Admin/Permissions.php b/featherbb/Model/Admin/Permissions.php
index 4a635d4b..0f62aa6b 100644
--- a/featherbb/Model/Admin/Permissions.php
+++ b/featherbb/Model/Admin/Permissions.php
@@ -45,6 +45,6 @@ public function update_permissions()
         $this->feather->cache->store('config', \FeatherBB\Model\Cache::get_config());
         // $this->clear_feed_cache();
 
-        redirect($this->feather->url->get('admin/permissions/'), __('Perms updated redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('adminPermissions'), __('Perms updated redirect'));
     }
 }
diff --git a/featherbb/Model/Admin/Reports.php b/featherbb/Model/Admin/Reports.php
index 34ef7a76..9e0091a5 100644
--- a/featherbb/Model/Admin/Reports.php
+++ b/featherbb/Model/Admin/Reports.php
@@ -58,7 +58,7 @@ public function zap_report()
                 ->delete_many();
         }
 
-        redirect($this->feather->url->get('admin/reports/'), __('Report zapped redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('adminReports'), __('Report zapped redirect'));
     }
 
     public function get_reports()
diff --git a/featherbb/Model/Admin/Users.php b/featherbb/Model/Admin/Users.php
index cce23d65..b120bf1e 100644
--- a/featherbb/Model/Admin/Users.php
+++ b/featherbb/Model/Admin/Users.php
@@ -241,7 +241,7 @@ public function move_users()
             DB::for_table('users')->where_in('id', $move['user_ids'])
                                                       ->update_many('group_id', $new_group);
 
-            redirect($this->feather->url->get('admin/users/'), __('Users move redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('adminUsers'), __('Users move redirect'));
         }
 
         $move = $this->hook->fire('model.users.move_users.move', $move);
@@ -406,7 +406,7 @@ public function delete_users()
 
             $stats = $this->feather->cache->retrieve('users_info');
 
-            redirect($this->feather->url->get('admin/users/'), __('Users delete redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('adminUsers'), __('Users delete redirect'));
         }
 
         return $user_ids;
@@ -525,7 +525,7 @@ public function ban_users()
                 // Regenerate the bans cache
                 $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
 
-                redirect($this->feather->url->get('admin/users/'), __('Users banned redirect'));
+                $this->feather->url->redirect($this->feather->urlFor('adminUsers'), __('Users banned redirect'));
             }
         }
         return $user_ids;
diff --git a/featherbb/Model/Delete.php b/featherbb/Model/Delete.php
index eb1673db..e5542e55 100644
--- a/featherbb/Model/Delete.php
+++ b/featherbb/Model/Delete.php
@@ -65,7 +65,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
             delete_topic($tid);
             update_forum($fid);
 
-            redirect($this->feather->url->get('forum/'.$fid.'/'), __('Topic del redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('viewForum', array('id' => $fid)), __('Topic del redirect'));
         } else {
             $this->hook->fire('handle_deletion', $tid, $fid, $id);
 
@@ -84,7 +84,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
 
             $post = $post->find_one();
 
-            redirect($this->feather->url->get('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
+            $this->feather->url->redirect($this->feather->url->get('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
         }
     }
 }
diff --git a/featherbb/Model/Login.php b/featherbb/Model/Login.php
index 1964332f..5cade270 100644
--- a/featherbb/Model/Login.php
+++ b/featherbb/Model/Login.php
@@ -84,7 +84,7 @@ public function login()
         $redirect_url = $this->request->post('redirect_url');
         $redirect_url = $this->hook->fire('redirect_url_login', $redirect_url);
 
-        redirect($this->feather->utils->escape($redirect_url), __('Login redirect'));
+        $this->feather->url->redirect($this->feather->utils->escape($redirect_url), __('Login redirect'));
     }
 
     public function logout($id, $token)
@@ -114,7 +114,7 @@ public function logout($id, $token)
 
         $this->auth->feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), time() + 31536000);
 
-        redirect($this->feather->url->base(), __('Logout redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('home'), __('Logout redirect'));
     }
 
     public function password_forgotten()
diff --git a/featherbb/Model/Misc.php b/featherbb/Model/Misc.php
index b6d35f7f..510b43d1 100644
--- a/featherbb/Model/Misc.php
+++ b/featherbb/Model/Misc.php
@@ -109,7 +109,7 @@ public function send_email($mail)
         // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after the email is sent) TODO
         //$redirect_url = validate_redirect($this->request->post('redirect_url'), 'index.php');
 
-        redirect($this->feather->url->base(), __('Email sent redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('home'), __('Email sent redirect'));
     }
 
     public function get_redirect_url($recipient_id)
@@ -221,7 +221,8 @@ public function insert_report($post_id)
         $last_report_sent = $this->hook->fireDB('insert_last_report_sent', $last_report_sent);
         $last_report_sent = $last_report_sent->save();
 
-        redirect($this->feather->url->get('forum/'.$report['forum_id'].'/'.$this->feather->url->url_friendly($report['subject']).'/'), __('Report redirect'));
+        $this->feather->url->redirect($this->feather->url->get('post/'.$post_id.'/#p'.$post_id), __('Report redirect'));
+        // redirect($this->feather->url->get('forum/'.$report['forum_id'].'/'.$this->feather->url->url_friendly($report['subject']).'/'), __('Report redirect'));
     }
 
     public function get_info_report($post_id)
@@ -305,7 +306,7 @@ public function subscribe_topic($topic_id)
         $subscription = $this->hook->fireDB('subscribe_topic_query', $subscription);
         $subscription = $subscription->save();
 
-        redirect($this->feather->url->get('topic/'.$topic_id.'/'), __('Subscribe redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $topic_id)), __('Subscribe redirect'));
     }
 
     public function unsubscribe_topic($topic_id)
@@ -333,7 +334,7 @@ public function unsubscribe_topic($topic_id)
         $delete = $this->hook->fireDB('unsubscribe_topic_query', $delete);
         $delete = $delete->delete_many();
 
-        redirect($this->feather->url->get('topic/'.$topic_id.'/'), __('Unsubscribe redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $topic_id)), __('Unsubscribe redirect'));
     }
 
     public function unsubscribe_forum($forum_id)
@@ -361,7 +362,7 @@ public function unsubscribe_forum($forum_id)
         $delete = $this->hook->fireDB('unsubscribe_forum_query', $delete);
         $delete = $delete->delete_many();
 
-        redirect($this->feather->url->get('forum/'.$forum_id.'/'), __('Unsubscribe redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('viewForum', array('id' => $forum_id)), __('Unsubscribe redirect'));
     }
 
     public function subscribe_forum($forum_id)
@@ -412,6 +413,6 @@ public function subscribe_forum($forum_id)
         $subscription = $this->hook->fireDB('subscribe_forum_query', $subscription);
         $subscription = $subscription->save();
 
-        redirect($this->feather->url->get('forum/'.$forum_id.'/'), __('Subscribe redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('viewForum', array('id' => $forum_id)), __('Subscribe redirect'));
     }
 }
diff --git a/featherbb/Model/Moderate.php b/featherbb/Model/Moderate.php
index 70a6506d..3ac3f168 100644
--- a/featherbb/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -155,7 +155,7 @@ public function delete_posts($tid, $fid, $p = null)
 
             update_forum($fid);
 
-            redirect($this->feather->url->get('topic/'.$tid.'/'), __('Delete posts redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $tid)), __('Delete posts redirect'));
         }
 
         $posts = $this->hook->fire('delete_posts', $posts);
@@ -316,7 +316,7 @@ public function split_posts($tid, $fid, $p = null)
             update_forum($fid);
             update_forum($move_to_forum);
 
-            redirect($this->feather->url->get('topic/'.$new_tid.'/'), __('Split posts redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $new_tid)), __('Split posts redirect'));
         }
 
         $posts = $this->hook->fire('split_posts', $posts);
@@ -585,7 +585,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
 
         $redirect_msg = (count($topics) > 1) ? __('Move topics redirect') : __('Move topic redirect');
         $redirect_msg = $this->hook->fire('move_topics_to_redirect_message', $redirect_msg);
-        redirect($this->feather->url->get('forum/'.$move_to_forum.'/'), $redirect_msg);
+        $this->feather->url->redirect($this->feather->urlFor('viewForum', array('id' => $move_to_forum)), $redirect_msg);
     }
 
     public function check_move_possible()
@@ -737,7 +737,7 @@ public function merge_topics($fid)
 
         // Update the forum FROM which the topic was moved and redirect
         update_forum($fid);
-        redirect($this->feather->url->get('forum/'.$fid.'/'), __('Merge topics redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('viewForum', array('id' => $fid)), __('Merge topics redirect'));
     }
 
     public function delete_topics($topics, $fid)
@@ -821,7 +821,7 @@ public function delete_topics($topics, $fid)
 
         $this->hook->fire('delete_topics');
 
-        redirect($this->feather->url->get('forum/'.$fid.'/'), __('Delete topics redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('viewForum', array('id' => $fid)), __('Delete topics redirect'));
     }
 
     public function get_forum_info($fid)
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index d840187c..47ed1dae 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -135,8 +135,7 @@ public function change_pass($id)
             }
 
             $this->hook->fire('change_pass');
-
-            redirect($this->feather->url->get('user/'.$id.'/section/essentials/'), __('Pass updated redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'essentials')), __('Pass updated redirect'));
         }
     }
 
@@ -402,7 +401,7 @@ public function upload_avatar($id, $files_data)
 
         $uploaded_file = $this->hook->fire('upload_avatar', $uploaded_file);
 
-        redirect($this->feather->url->get('user/'.$id.'/section/personality/'), __('Avatar upload redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'personality')), __('Avatar upload redirect'));
     }
 
     public function update_group_membership($id)
@@ -469,7 +468,7 @@ public function update_group_membership($id)
 
         $id = $this->hook->fire('update_group_membership', $id);
 
-        redirect($this->feather->url->get('user/'.$id.'/section/admin/'), __('Group membership redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'admin')), __('Group membership redirect'));
     }
 
     public function get_username($id)
@@ -539,7 +538,7 @@ public function update_mod_forums($id)
 
         $id = $this->hook->fire('update_mod_forums', $id);
 
-        redirect($this->feather->url->get('user/'.$id.'/section/admin/'), __('Update forums redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'admin')), __('Update forums redirect'));
     }
 
     public function ban_user($id)
@@ -558,9 +557,9 @@ public function ban_user($id)
         $ban_id = $ban_id->find_one_col('id');
 
         if ($ban_id) {
-            redirect($this->feather->url->get('admin/bans/edit/'.$ban_id.'/'), __('Ban redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('editBan', array('id' => $ban_id)), __('Ban redirect'));
         } else {
-            redirect($this->feather->url->get('admin/bans/add/'.$id.'/'), __('Ban redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('addBan', array('id' => $id)), __('Ban redirect'));
         }
     }
 
@@ -592,7 +591,7 @@ public function promote_user($id)
 
         $pid = $this->hook->fire('promote_user', $pid);
 
-        redirect($this->feather->url->get('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
+        $this->feather->url->redirect($this->feather->url->get('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
     }
 
     public function delete_user($id)
@@ -732,7 +731,7 @@ public function delete_user($id)
 
             $this->hook->fire('delete_user');
 
-            redirect($this->feather->url->base(), __('User delete redirect'));
+            $this->feather->url->redirect($this->feather->urlFor('home'), __('User delete redirect'));
         }
     }
 
@@ -1040,7 +1039,8 @@ public function update_profile($id, $info, $section)
             // If the user is a moderator or an administrator we have to update the moderator lists
             $group_id = DB::for_table('users')
                 ->where('id', $id);
-            $group_id = $this->hook->fireDB('update_profile_group_id', $update_online);
+            // TODO: restore hook
+            // $group_id = $this->hook->fireDB('update_profile_group_id', $update_online);
             $group_id = $group_id->find_one_col('group_id');
 
             $group_mod = DB::for_table('groups')
@@ -1086,7 +1086,7 @@ public function update_profile($id, $info, $section)
 
         $section = $this->hook->fireDB('update_profile', $section, $id);
 
-        redirect($this->feather->url->get('user/'.$id.'/section/'.$section.'/'), __('Profile redirect'));
+        $this->feather->url->redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => $section)), __('Profile redirect'));
     }
 
     public function get_user_info($id)
diff --git a/featherbb/Model/Register.php b/featherbb/Model/Register.php
index 6444a7fc..d6c15bbe 100644
--- a/featherbb/Model/Register.php
+++ b/featherbb/Model/Register.php
@@ -263,14 +263,13 @@ public function insert_user($user)
 
             $this->email->feather_mail($user['email1'], $mail_subject, $mail_message);
 
-            redirect($this->feather->url->base(),__('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
-
+            $this->feather->url->redirect($this->feather->urlFor('home'), __('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
         }
 
         $this->auth->feather_setcookie($new_uid, $password_hash, time() + $this->config['o_timeout_visit']);
 
         $this->hook->fire('insert_user');
 
-        redirect($this->feather->url->base(), __('Reg complete'));
+        $this->feather->url->redirect($this->feather->urlFor('home'), __('Reg complete'));
     }
 }
diff --git a/featherbb/routes.php b/featherbb/routes.php
index c10e5400..433e60ee 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -78,7 +78,7 @@
 
 // Profile routes
 $feather->group('/user', function() use ($feather) {
-    $feather->map('/:id(/section/:section)(/)', '\FeatherBB\Controller\profile:display')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('profile');
+    $feather->map('/:id(/section/:section)(/)', '\FeatherBB\Controller\profile:display')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('profileSection');
     $feather->map('/:id(/action/:action)(/)', '\FeatherBB\Controller\profile:action')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('profileAction');
 });
 
@@ -87,7 +87,7 @@
  */
 $isAdmmod = function() use ($feather) {
     if(!$feather->user->is_admmod) {
-        $feather->redirect($feather->urlFor('home'), __('No permission'));
+        $feather->url->redirect($feather->urlFor('home'), __('No permission'));
     }
 };
 
@@ -109,7 +109,7 @@
      */
     $isAdmin = function() use ($feather) {
         if($feather->user->g_id != FEATHER_ADMIN) {
-            $feather->redirect($feather->urlFor('home'), __('No permission'));
+            $feather->url->redirect($feather->urlFor('home'), __('No permission'));
         }
     };
 
@@ -140,7 +140,7 @@
     $feather->map('/censoring(/)', $isAdmin, '\FeatherBB\Controller\Admin\censoring:display')->via('GET', 'POST')->name('adminCensoring');
 
     // Admin reports
-    $feather->map('/reports(/)', '\FeatherBB\Controller\Admin\reports:display')->via('GET', 'POST')->name('reports');
+    $feather->map('/reports(/)', '\FeatherBB\Controller\Admin\reports:display')->via('GET', 'POST')->name('adminReports');
 
     // Admin permissions
     $feather->map('/permissions(/)', $isAdmin, '\FeatherBB\Controller\Admin\permissions:display')->via('GET', 'POST')->name('adminPermissions');

From fc4cbf43613888462dd1cbe6a30c6296e1d774d5 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 5 Sep 2015 20:00:44 +0200
Subject: [PATCH 297/353] Implement OOP-parser

---
 featherbb/Controller/Delete.php    |    5 +-
 featherbb/Controller/Edit.php      |    3 +-
 featherbb/Controller/Profile.php   |    2 +-
 featherbb/Controller/Search.php    |    2 -
 featherbb/Controller/Viewtopic.php |    3 -
 featherbb/Core/Core.php            |    6 +
 featherbb/Helpers/bbcd_compile.php |    2 +-
 featherbb/Helpers/parser.php       | 2079 +++++++++++++++-------------
 featherbb/Model/Edit.php           |   10 +-
 featherbb/Model/Moderate.php       |    6 +-
 featherbb/Model/Post.php           |   12 +-
 featherbb/Model/Profile.php        |    6 +-
 featherbb/Model/Search.php         |    4 +-
 featherbb/Model/Viewtopic.php      |    6 +-
 14 files changed, 1153 insertions(+), 993 deletions(-)

diff --git a/featherbb/Controller/Delete.php b/featherbb/Controller/Delete.php
index c9e92bde..02d84d34 100644
--- a/featherbb/Controller/Delete.php
+++ b/featherbb/Controller/Delete.php
@@ -21,8 +21,6 @@ public function __construct()
 
     public function deletepost($id)
     {
-        global $pd;
-
         if ($this->feather->user->g_read_board == '0') {
             throw new \FeatherBB\Error(__('No view'), 403);
         }
@@ -57,8 +55,7 @@ public function deletepost($id)
             $this->model->handle_deletion($is_topic_post, $id, $cur_post['tid'], $cur_post['fid']);
         }
 
-        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/parser.php';
-        $cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
+        $cur_post['message'] = $this->feather->parser->parse_message($cur_post['message'], $cur_post['hide_smilies']);
 
         $this->feather->view2->setPageInfo(array(
             'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Delete post')),
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index 2204191e..a6bd0651 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -81,8 +81,7 @@ public function editpost($id)
         }
 
         if ($this->request->post('preview')) {
-            require_once FEATHER_ROOT.'featherbb/Helpers/parser.php';
-            $preview_message = parse_message($post['message'], $post['hide_smilies']);
+            $preview_message = $this->feather->parser->parse_message($post['message'], $post['hide_smilies']);
         } else {
             $preview_message = '';
         }
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
index 52e22cbd..5e0958da 100644
--- a/featherbb/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -31,7 +31,7 @@ public function __autoload($class_name)
 
     public function display($id, $section = null)
     {
-        global $pd, $forum_time_formats, $forum_date_formats;
+        global $forum_time_formats, $forum_date_formats;
 
         // Include UTF-8 function
         require FEATHER_ROOT.'featherbb/Helpers/utf8/substr_replace.php';
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index 159c4741..b624a831 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -31,8 +31,6 @@ public function __autoload($class_name)
 
     public function display()
     {
-        global $pd;
-
         if ($this->user->g_read_board == '0') {
             throw new \FeatherBB\Error(__('No view'), 403);
         } elseif ($this->user->g_search == '0') {
diff --git a/featherbb/Controller/Viewtopic.php b/featherbb/Controller/Viewtopic.php
index 36263045..987e24d5 100644
--- a/featherbb/Controller/Viewtopic.php
+++ b/featherbb/Controller/Viewtopic.php
@@ -22,8 +22,6 @@ public function __construct()
 
     public function display($id = null, $name = null, $page = null, $pid = null)
     {
-        global $pd;
-
         if ($this->feather->user->g_read_board == '0') {
             throw new \FeatherBB\Error(__('No view'), 403);
         }
@@ -71,7 +69,6 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         $quickpost = $this->model->is_quickpost($cur_topic['post_replies'], $cur_topic['closed'], $is_admmod);
         $subscraction = $this->model->get_subscraction($cur_topic['is_subscribed'], $id);
 
-        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/parser.php';
         $lang_bbeditor = array(
             'btnBold' => __('btnBold'),
             'btnItalic' => __('btnItalic'),
diff --git a/featherbb/Core/Core.php b/featherbb/Core/Core.php
index 4cdef204..cc5e6ef5 100644
--- a/featherbb/Core/Core.php
+++ b/featherbb/Core/Core.php
@@ -210,6 +210,12 @@ public function call()
             return new \FeatherBB\Email();
         });
 
+        // TODO: move parser to autoload
+        require $this->forum_env['FEATHER_ROOT'].'featherbb/Helpers/parser.php';
+        $this->app->container->singleton('parser', function () {
+            return new \FeatherBB\Parser();
+        });
+
         // This is the very first hook fired
         $this->app->hooks->fire('core.start');
 
diff --git a/featherbb/Helpers/bbcd_compile.php b/featherbb/Helpers/bbcd_compile.php
index 565fac62..0ae218e3 100644
--- a/featherbb/Helpers/bbcd_compile.php
+++ b/featherbb/Helpers/bbcd_compile.php
@@ -182,7 +182,7 @@
 // Validate and compute replacement texts for smilies array.
 $re_keys = array();                                    // Array of regex-safe smiley texts.
 $file_path = FEATHER_ROOT . 'style/img/smilies/';                // File system path to smilies.
-$url_path = $feather->url->base(true);                        // Convert abs URL to relative URL.
+$url_path = $feather->request->getScriptName();                        // Convert abs URL to relative URL.
 $url_path = preg_replace('%^https?://[^/]++(.*)$%i', '$1', $url_path) . '/style/img/smilies/';
 foreach ($smilies as $smiley_text => $smiley_img) {    // Loop through all smilieys in array.
     $file = $file_path . $smiley_img['file'];        // Local file system address of smiley.
diff --git a/featherbb/Helpers/parser.php b/featherbb/Helpers/parser.php
index be8a9746..591463be 100644
--- a/featherbb/Helpers/parser.php
+++ b/featherbb/Helpers/parser.php
@@ -1,27 +1,23 @@
 <?php
 
-/**
- * Copyright (C) 2015 FeatherBB
- * Parser (C) 2011 Jeff Roberson (jmrware.com)
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
+// parser.php Rev:20110413_1700
+/*---
+
+Copyright (C) 2008-2011 FluxBB.org
+New 2011 parser code copyright (C) 2011 Jeff Roberson (jmrware.com).
+based on code copyright (C) 2002-2005 Rickard Andersson
+License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+
+---*/
+
+namespace FeatherBB;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!defined('FEATHER'))
     exit;
-}
 
 define('FEATHER_PARSER', '11-Feb-2011 13:33');
 
-// globals. we share one array: $pd
-if (file_exists(FEATHER_ROOT.'featherbb/cache/cache_parser_data.php')) { // If file already exists
-    require_once(FEATHER_ROOT.'featherbb/cache/cache_parser_data.php');
-} else { // It needs to be re-generated.
-    require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_source.php');
-    require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_compile.php');
-}
 // !!!! AVOIDING PCRE STACK OVERFLOWS WHICH SEG-FAULT CRASH APACHE/PHP !!!!
 // By default, PHP sets up pcre.recursion_limit way too high (100000). According
 // to PCRE documentation, a sensible value for this parameter is the stacksize
@@ -32,658 +28,854 @@
 // executable to stack-overflow, and seg-fault crash with no warning. Taking the
 // following precaution, prevents this severe error and allows the program to
 // gracefully recover and display an appropriate error message.
-if (isset($_ENV['OS']) && $_ENV['OS'] === "Windows_NT") { // Are we: Win NT, 2K, XP, Vista or 7)?
-    ini_set("pcre.recursion_limit", "524");        // 256KB / 500 = 524
-} else {                                        // Otherwise assume we are on a *nix box.
-    ini_set("pcre.recursion_limit", "16777");    // 8MB / 500 = 16777
-}
-//
-// Convert open urls into clickable links
-//
-function linkify($text)
-{
-    return preg_replace_callback('/ # Rev:20110220_1200 github.com\/jmrware\/LinkifyURL
-	# Match http & ftp URL that is not already linkified.
-	  # Alternative 1: URL delimited by (parentheses).
-	  (\()					   # $1	 "(" start delimiter.
-	  ((?:ht|f)tps?:\/\/[a-z0-9\-._~!$&\'()*+,;=:\/?#[\]@%]+)  # $2: URL.
-	  (\))					   # $3: ")" end delimiter.
-	| # Alternative 2: URL delimited by [square brackets].
-	  (\[)					   # $4: "[" start delimiter.
-	  ((?:ht|f)tps?:\/\/[a-z0-9\-._~!$&\'()*+,;=:\/?#[\]@%]+)  # $5: URL.
-	  (\])					   # $6: "]" end delimiter.
-	| # Alternative 3: URL delimited by {curly braces}.
-	  (\{)					   # $7: "{" start delimiter.
-	  ((?:ht|f)tps?:\/\/[a-z0-9\-._~!$&\'()*+,;=:\/?#[\]@%]+)  # $8: URL.
-	  (\})					   # $9: "}" end delimiter.
-	| # Alternative 4: URL delimited by <angle brackets>.
-	  (<|&(?:lt|\#60|\#x3c);)  # $10: "<" start delimiter (or HTML entity).
-	  ((?:ht|f)tps?:\/\/[a-z0-9\-._~!$&\'()*+,;=:\/?#[\]@%]+)  # $11: URL.
-	  (>|&(?:gt|\#62|\#x3e);)  # $12: ">" end delimiter (or HTML entity).
-	| # Alternative 5: URL not delimited by (), [], {} or <>.
-	  (						   # $13: Prefix proving URL not already linked.
-		(?: ^				   # Can be a beginning of line or string, or
-		| [^=\s\'"\]]		   # a non-"=", non-quote, non-"]", followed by
-		) \s*[\'"]?			   # optional whitespace and optional quote;
-	  | [^=\s]\s+			   # or... a non-equals sign followed by whitespace.
-	  )						   # End $13. Non-prelinkified-proof prefix.
-	  ( \b					   # $14: Other non-delimited URL.
-		(?:ht|f)tps?:\/\/	   # Required literal http, https, ftp or ftps prefix.
-		[a-z0-9\-._~!$\'()*+,;=:\/?#[\]@%]+ # All URI chars except "&" (normal*).
-		(?:					   # Either on a "&" or at the end of URI.
-		  (?!				   # Allow a "&" char only if not start of an...
-			&(?:gt|\#0*62|\#x0*3e);					 # HTML ">" entity, or
-		  | &(?:amp|apos|quot|\#0*3[49]|\#x0*2[27]); # a [&\'"] entity if
-			[.!&\',:?;]?		# followed by optional punctuation then
-			(?:[^a-z0-9\-._~!$&\'()*+,;=:\/?#[\]@%]|$)	# a non-URI char or EOS.
-		  ) &				   # If neg-assertion true, match "&" (special).
-		  [a-z0-9\-._~!$\'()*+,;=:\/?#[\]@%]* # More non-& URI chars (normal*).
-		)*					   # Unroll-the-loop (special normal*)*.
-		[a-z0-9\-_~$()*+=\/#[\]@%]	# Last char can\'t be [.!&\',;:?]
-	  )						   # End $14. Other non-delimited URL.
-	/imx', '_linkify_callback', $text);
-//	  $url_replace = '$1$4$7$10$13[url]$2$5$8$11$14[/url]$3$6$9$12';
+if (isset($_ENV['OS']) && $_ENV['OS'] === "Windows_NT")
+{ // Are we: Win NT, 2K, XP, Vista or 7)?
+    ini_set("pcre.recursion_limit", "524"); // 256KB / 500 = 524
 }
-function _linkify_callback($m)
-{ // Only linkify valid urls.
-    $feather = \Slim\Slim::getInstance();
-    $url = $m[2] . $m[5] . $m[8] . $m[11] . $m[14];
-    if (is_array($u = $feather->url->is_valid($url))) {
-        if (preg_match('%\.(?:jpe?g|gif|png)$%Si', $u['path_abempty'])) {
-            return    $m[1].$m[4].$m[7].$m[10].$m[13] .'[img]'. $u['url'] .'[/img]'. $m[3].$m[6].$m[9].$m[12];
-        } else {
-            return    $m[1].$m[4].$m[7].$m[10].$m[13] .'[url]'. $u['url'] .'[/url]'. $m[3].$m[6].$m[9].$m[12];
-        }
-    } else {
-        return    $m[1].$m[4].$m[7].$m[10].$m[13].        $url.               $m[3].$m[6].$m[9].$m[12];
-    }
+else
+{ // Otherwise assume we are on a *nix box.
+    ini_set("pcre.recursion_limit", "16777"); // 8MB / 500 = 16777
 }
-/* ***********************************************************
-callback function _preparse_bbcode_callback($matches)
-
-  This is the callback function for the main pre-parser. This routine is
-called when the preg_replace_callback function within the preparse_bbcode()
-function matches one BBCode open/close pair. The BBCode tag components are
-passed in $matches. This routine checks for various error conditions and
-repairs some of them. Erroneous code that cannot be fixed is wrapped in the
-special error BBCode tag: ERR.
-
-Parameters: (See the BBcode regex to see how each of these parameters are captured.)
-    $matches[0];					=  ([TAG=att]..content..[/TAG])	// The whole match.
-    $matches[1];	$tagname		=  (TAG)				// The BBCode tag name.
-    $matches[2];					=  (=)					// Attribute equals sign delimiter.
-    $matches[3];	$attribute		= '(attribute)'			// Attribute within single quotes, or
-    $matches[4];	$attribute		= "(attribute)"			// Attribute within double quotes or
-    $matches[5];	$attribute		=  (attribute)			// Attribute within no or any quotes.
-    $matches[6];	$contents		=  (tag contents)		// BBCode tag contents.
-*********************************************************** */
-function _preparse_bbcode_callback($matches)
+
+if (!defined('PARSER_ROOT'))
+    define('PARSER_ROOT', dirname(__FILE__).'/');
+
+
+class Parser
 {
-    global $errors, $pd;
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    // Initialize some local variables. Use reference variables where possible.
-    $tagname =& $matches[1];                                // BBCode tag name.
-    $contents =& $matches[6];                                // BBCode tag contents.
-    $tag =& $pd['bbcd'][$tagname];                            // alias to this tags array element of the BBCD database
-    $parent = end($pd['tag_stack']);                        // Name of parent tag. ("_ROOT_" is base parent tag).
-/*	$new_errors = array();	*/                                // BBCode tag error messages. (Create on error.)
-
-    // First things first.
-    $tag['depth']++;                                        // Increment tag-specific nesting level depth.
-    $tagname = strtolower($tagname);                        // Force lowercase tags name.
-    array_push($pd['tag_stack'], $tagname);                    // Push this tags name onto the tag stack.
-
-    // ---------------------------------------------------------------------------
-    // Recursively parse any nested BBCode tag markup (unless tag type is hidden):
-    // ---------------------------------------------------------------------------
-    if ($tag['tag_type'] !== 'hidden' && strpos($contents, '[') !== false) {
-        $contents = preg_replace_callback($pd['re_bbcode'], '_preparse_bbcode_callback', $contents);
-        if ($contents === null) {
-            // On error, preg_replace_callback returns NULL.
- // Error #1: '(%s) Message is too long or too complex. Please shorten.'
-            $new_errors[] = sprintf(__('BBerr pcre'), preg_error());
-            $contents = ''; // Zero out the contents.
-        }
+    public static function compile()
+    {
+        require_once (PARSER_ROOT.'bbcd_source.php');
+        require_once (PARSER_ROOT.'bbcd_compile.php');
+        return $pd;
     }
-    // ---------------------------------------------------------------------------------------
-    // Process optional $attribute. Set $fmt_open, $fmt_close and $handler based on attribute.
-    // ---------------------------------------------------------------------------------------
-    $fmt_close = '[/'. $tagname .']';                        // BBCode closing tag format specifier string.
-    if ($matches[2]) {                                        // Check if attribute specified?
-        // Attribute specified. Pick value from one of the three possible quote delimitations.
-        if ($matches[3]) {                                    // Non-empty single-quoted value.
-            $attribute =& $matches[3];                        // Set attribute to quoted content.
-            $fmt_open = '['. $tagname .'=\'%a_str%\']';        // Set 'single-quoted' opening format.
-        } elseif ($matches[4]) {                                // Non-empty double-quoted value.
-            $attribute =& $matches[4];                        // Set attribute to quoted content.
-            $fmt_open = '['. $tagname .'="%a_str%"]';        // Set "double-quoted" opening format.
-        } elseif ($matches[5]) {                                // Non-empty un-or-any-quoted value.
-            $attribute =& $matches[5];                        // Set attribute to unquoted content.
-            $fmt_open = '['. $tagname .'=%a_str%]';            // Set un-'or'-"any"-quoted opening format.
-        } else {                                                // Otherwise must be empty.
-            $attribute = '';                                // Set empty attribute.
-            $fmt_open = '['. $tagname .'=%a_str%]';            // Set empty-attribute opening format.
+
+    public $pd;
+
+    public function __construct($pd = null)
+    {
+        if (!isset($pd))
+            $pd = Parser::compile();
+
+        $this->pd = $pd;
+        $this->feather = \Slim\Slim::getInstance();
+    }
+
+    /**
+     * Parse post or signature message text.
+     *
+     * @param string &$text
+     * @param integer $hide_smilies
+     * @return string
+     */
+    public function parse_bbcode(&$text, $hide_smilies = 0)
+    {
+        if ($this->feather->config['o_censoring'] === '1')
+        {
+            $text = censor_words($text);
         }
-        // Consolidate consecutive attribute whitespace to a single space. Trim start and end.
-        $attribute = preg_replace(array('/\s++/S', '/^ /', '/ $/'), array(' ', '', ''), $attribute);
-
-        // Determine attribute handler: fixed or variable or none.
-        if (isset($tag['handlers'][$attribute])) {            // If attribute matches handler key
-            $handler =& $tag['handlers'][$attribute];        // use the fixed-attribute handler.
-        } elseif (isset($tag['handlers']['ATTRIB'])) {        // Else if we have one, use this tags
-            $handler =& $tag['handlers']['ATTRIB'];            // variable attribute handler. Otherwise...
-        } elseif (isset($tag['handlers']['NO_ATTRIB']) &&    // Otherwise we have an erroneous attribute
-                            count($tag['handlers']) === 1) {
-            // which is either unexpected or unrecognized.
- // Error #2: 'Unexpected attribute: "%1$s". (No attribute allowed for [%2$s].'.
-            $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = sprintf(__('BBerr unexpected attribute'), $attribute, $tagname);
-        } else { // Error #3: 'Unrecognized attribute: "%1$s", is not valid for [%2$s].'
-            $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = sprintf(__('BBerr unrecognized attribute'), $attribute, $tagname);
+        // Convert [&<>] characters to HTML entities (but preserve [""''] quotes).
+        $text = htmlspecialchars($text, ENT_NOQUOTES);
+
+        // Parse BBCode if globally enabled.
+        if ($this->feather->config['p_message_bbcode'])
+        {
+            $text = preg_replace_callback($this->pd['re_bbcode'], array($this, '_parse_bbcode_callback'), $text);
         }
-        // Make sure attribute does nor contain a valid BBcode tag.
-        if (preg_match($pd['re_bbtag'], $attribute)) { // Error #4: 'Attribute may NOT contain open or close bbcode tags'
-            $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = __('BBerr bbcode attribute');
+        // Set $smile_on flag depending on global flags and whether or not this is a signature.
+        if ($this->pd['in_signature'])
+        {
+            $smile_on = ($this->feather->config['o_smilies_sig'] && $this->feather->user['show_smilies'] && !$hide_smilies) ? 1 : 0;
         }
-        // Validate and filter tag's attribute value if and according to custom attribute regex.
-        if (isset($handler['a_regex'])) { // Check if this tag has an attribute regex? (very rare)
-            if (preg_match($handler['a_regex'], $attribute, $m)) { // Yes. Check if regex matches attribute?
-                $attribute = $m[1];
-            } else { // Error #4b: 'Invalid attribute, [%s] requires specific attribute.'
-                $new_errors[] = sprintf(__('BBerr invalid attrib'), $tagname);
-            }
+        else
+        {
+            $smile_on = ($this->feather->config['o_smilies'] && $this->feather->user['show_smilies'] && !$hide_smilies) ? 1 : 0;
         }
-    } else { // Attribute not specified. Use the NO_ATTRIB handler if it exixts else error.
-        $attribute = '';                                    // No attribute? Make it so.
-        $fmt_open = '['. $tagname .']';                        // Set no-attribute fmt_open string.
-        if (isset($tag['handlers']['NO_ATTRIB'])) {            // If we have one, use this tags
-            $handler =& $tag['handlers']['NO_ATTRIB'];        // no-attribute handler. Otherwise...
-        } else { // Error #5: '[%1$s] is missing a required attribute.'.
-            $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-            $new_errors[] = sprintf(__('BBerr missing attribute'), $tagname);
+        // Split text into hidden and non-hidden chunks. Process the non-hidden content chunks.
+        $parts = explode("\1", $text); // Hidden chunks pre-marked like so: "\1\2<code.../code>\1"
+        for ($i = 0, $len = count($parts); $i < $len; ++$i)
+        { // Loop through hidden and non-hidden text chunks.
+            $part = &$parts[$i]; // Use shortcut alias
+            if (empty($part))
+                continue; // Skip empty string chunks.
+            if ($part[0] !== "\2")
+            { // If not hidden, process this normal text content.
+                if ($smile_on)
+                { // If smileys enebled, do em all in one whack.
+                    $part = preg_replace_callback($this->pd['re_smilies'], array($this, '_do_smilies_callback'), $part);
+                }
+                // Deal with newlines, tabs and multiple spaces
+                $part = str_replace(array("\n", "\t", '  ', '  '), array('<br />', '&#160; &#160; ', '&#160; ', ' &#160;'), $part);
+            }
+            else
+                $part = substr($part, 1); // For hidden chunks, strip \2 marker byte.
         }
+        $text = implode("", $parts); // Put hidden and non-hidden chunks back together.
+
+        // Add paragraph tag around post, but make sure there are no empty paragraphs
+        $text = str_replace('<p><br />', '<p>', $text);
+        $text = str_replace('<p></p>', '', '<p>'.$text.'</p>');
+        return $text;
     }
-    // -------------------------------------------------------
-    // Do some validation checks. Fix problems where possible:
-    // -------------------------------------------------------
-    // Handle tag nesting depth overflow.
-    if ($tag['depth'] > $tag['depth_max']) { // Allowable tag nesting level exceeded?
-        switch ($tag['nest_type']) {            // Overflow. Handle based upon tag's "nest_type"
-        case 'clip':                        // Silently strip overly nested tags and content.
-            $contents = '';
-            break;
-        case 'fix':                            // Silently strip overly-nested tags (keep contents).
-            $fmt_open = $fmt_close = '';
-            break;
-        case 'err':    // Error #6: '[%1$s] tag nesting depth: %2$d exceeds allowable limit: %3$d.'.
-            $new_errors[] = sprintf(__('BBerr nesting overflow'),
-                                $tagname, $tag['depth'], $tag['depth_max']);
-            break;
-        default:
-        }
+
+    /**
+     * Helper preg_replace_callback function for smilies processing
+     *
+     * @param array $matches
+     * @return string
+     */
+    private function _do_smilies_callback($matches)
+    {
+        return $this->pd['smilies'][$matches[0]]['html'];
     }
-    // Verify this tag is not in its parent's excluded tags list.
-    if (isset($pd['bbcd'][$parent]['tags_excluded'][$tagname])) {
-        // Are we illegitimate?
-    // Yes. Pick between error #6 and #7.
-        if ($parent === $tagname) { // Error #7: '[%s] was opened within itself, this is not allowed.'
-            $new_errors[] = sprintf(__('BBerr self-nesting'), $tagname);
-        } else { // Error #8: '[%1$s] was opened within [%2$s], this is not allowed.'
-            $new_errors[] = sprintf(__('BBerr invalid nesting'), $tagname, $parent);
-        }
+
+    /**
+     * Parse message text
+     *
+     * @param string $text
+     * @param integer $hide_smilies
+     * @return string
+     */
+    public function parse_message($text, $hide_smilies)
+    {
+        $this->pd['in_signature'] = false;
+        // Disable images via the $bbcd['in_post'] flag if globally disabled.
+        if ($this->feather->config['p_message_img_tag'] !== '1' || $this->feather->user['show_img'] !== '1')
+            if (isset($this->pd['bbcd']['img']))
+                $this->pd['bbcd']['img']['in_post'] = false;
+        return $this->parse_bbcode($text, $hide_smilies);
     }
-    // Verfify our parent tag is in our 'parents' allowable array if it exists.
-    if (isset($tag['parents']) && !isset($tag['parents'][$parent])) { // Error #9: '[%1$s] cannot be within: [%2$s]. Allowable parent tags: %3$s.'.
-        $new_errors[] = sprintf(__('BBerr invalid parent'),
-            $tagname, $parent, '('. implode('), (', array_keys($tag['parents'])) .')');
+
+    /**
+     * Parse signature text
+     *
+     * @param string $text
+     * @return string
+     */
+    public function parse_signature($text)
+    {
+        $this->pd['in_signature'] = true;
+        // Disable images via the $bbcd['in_sig'] flag if globally disabled.
+        if ($this->feather->config['p_sig_img_tag'] !== '1' || $this->feather->user['show_img_sig'] !== '1')
+            if (isset($this->pd['bbcd']['img']))
+                $this->pd['bbcd']['img']['in_sig'] = false;
+        return $this->parse_bbcode($text);
     }
-    // -----------------------------------------
-    // Perform content-type-specific processing:
-    // -----------------------------------------
-    switch ($handler['c_type']) {
-    case 'width_height':
-        if (preg_match('/\b(\d++)[Xx](\d++)\b/S', $contents, $m)) {
-            $width = (int)$m[1];
-            $height = (int)$m[2];
-        }
-        if (preg_match('/\bw(?:idth)?+\s*+=\s*+[\'"]?+(\d++)\b/Si',  $contents, $m)) {
-            $width  = (int)$m[1];
-        }
-        if (preg_match('/\bh(?:eight)?+\s*+=\s*+[\'"]?+(\d++)\b/Si', $contents, $m)) {
-            $height = (int)$m[1];
-        }
-        if (isset($height, $tag['x_padding'], $tag['y_padding'])) {
-            $height -= $tag['y_padding'] - $tag['x_padding']; // Adjust for height of embedded controller.
-        }
-        break;
-
-    case 'url':
-        // Sanitize contents which is (hopefully) a url link. Trim spaces.
-        $contents = preg_replace(array('/^\s+/', '/\s+$/S'), '', $contents);
-        // Handle special case link to a
-        if ($feather->user->g_post_links != '1') {
-            $new_errors[] = __('BBerr cannot post URLs');
-        }
-        else if (($m = $feather->url->is_valid($contents))) {
-            $contents = $m['url']; // Fetch possibly more complete url address.
-        } else { // Error #10a: 'Invalid URL name: %s'.
-            $new_errors[] = sprintf(__('BBerr Invalid URL name'), $contents);
-        }
-        break;
 
-    case 'email':
-        if (filter_var($contents, FILTER_VALIDATE_EMAIL)) { // Error #10c: 'Invalid email address: %s'.
-            $new_errors[] = sprintf(__('BBerr Invalid email address'), $contents);
+    /**
+     * This is the callback function for the main pre-parser. This routine is
+     * called when the preg_replace_callback function within the preparse_bbcode()
+     * function matches one BBCode open/close pair. The BBCode tag components are
+     * passed in $matches. This routine checks for various error conditions and
+     * repairs some of them. Erroneous code that cannot be fixed is wrapped in the
+     * special error BBCode tag: ERR.
+     *
+     * @param array $matches
+     * 		Parameters: (See the BBcode regex to see how each of these parameters are captured.)
+     * 		$matches[0];					=  ([TAG=att]..content..[/TAG])	// The whole match.
+     * 		$matches[1];	$tagname		=  (TAG)				// The BBCode tag name.
+     * 		$matches[2];					=  (=)					// Attribute equals sign delimiter.
+     * 		$matches[3];	$attribute		= '(attribute)'			// Attribute within single quotes, or
+     * 		$matches[4];	$attribute		= "(attribute)"			// Attribute within double quotes or
+     * 		$matches[5];	$attribute		=  (attribute)			// Attribute within no or any quotes.
+     * 		$matches[6];	$contents		=  (tag contents)		// BBCode tag contents.
+     *
+     * @return string
+     */
+    private function _preparse_bbcode_callback($matches)
+    {
+        global $errors;
+
+        // Initialize some local variables. Use reference variables where possible.
+        $tagname = &$matches[1]; // BBCode tag name.
+        $contents = &$matches[6]; // BBCode tag contents.
+        $tag = &$this->pd['bbcd'][$tagname]; // alias to this tags array element of the BBCD database
+        $parent = end($this->pd['tag_stack']); // Name of parent tag. ("_ROOT_" is base parent tag).
+        /*	$new_errors = array();	*/
+        // BBCode tag error messages. (Create on error.)
+
+
+        // First things first.
+        $tag['depth']++; // Increment tag-specific nesting level depth.
+        $tagname = strtolower($tagname); // Force lowercase tags name.
+        array_push($this->pd['tag_stack'], $tagname); // Push this tags name onto the tag stack.
+
+
+        // ---------------------------------------------------------------------------
+        // Recursively parse any nested BBCode tag markup (unless tag type is hidden):
+        // ---------------------------------------------------------------------------
+        if ($tag['tag_type'] !== 'hidden' && strpos($contents, '[') !== false)
+        {
+            $contents = preg_replace_callback($this->pd['re_bbcode'], array($this, '_preparse_bbcode_callback'), $contents);
+            if ($contents === null) // On error, preg_replace_callback returns NULL.
+
+            { // Error #1: '(%s) Message is too long or too complex. Please shorten.'
+                $new_errors[] = sprintf(__('BBerr pcre', preg_error()));
+                $contents = ''; // Zero out the contents.
+            }
         }
-        break;
-
-    default:
-    } // End c_type switch().
-    // -------------------------------------------
-    // Perform attribute-type-specific processing:
-    // -------------------------------------------
-    switch ($handler['a_type']) {
-    case 'width_height':
-        if ($attribute) {
-            if (preg_match('/\b(\d++)[Xx](\d++)\b/', $attribute, $m)) {    // Check for a "123x456" WxH spec?
-                $width = (int)$m[1];                                    // Yes. Set both dimensions.
-                $height = (int)$m[2];
+
+        // ---------------------------------------------------------------------------------------
+        // Process optional $attribute. Set $fmt_open, $fmt_close and $handler based on attribute.
+        // ---------------------------------------------------------------------------------------
+        $fmt_close = '[/'.$tagname.']'; // BBCode closing tag format specifier string.
+        if ($matches[2])
+        { // Check if attribute specified?
+            // Attribute specified. Pick value from one of the three possible quote delimitations.
+            if ($matches[3])
+            { // Non-empty single-quoted value.
+                $attribute = &$matches[3]; // Set attribute to quoted content.
+                $fmt_open = '['.$tagname.'=\'%a_str%\']'; // Set 'single-quoted' opening format.
+            } elseif ($matches[4])
+            { // Non-empty double-quoted value.
+                $attribute = &$matches[4]; // Set attribute to quoted content.
+                $fmt_open = '['.$tagname.'="%a_str%"]'; // Set "double-quoted" opening format.
+            } elseif ($matches[5])
+            { // Non-empty un-or-any-quoted value.
+                $attribute = &$matches[5]; // Set attribute to unquoted content.
+                $fmt_open = '['.$tagname.'=%a_str%]'; // Set un-'or'-"any"-quoted opening format.
             }
-            if (preg_match('/\bw(?:idth)?+\s*+=\s*+[\'"]?+(\d++)\b/i', $attribute, $m)) {
-                $width  = (int)$m[1];
+            else
+            { // Otherwise must be empty.
+                $attribute = ''; // Set empty attribute.
+                $fmt_open = '['.$tagname.'=%a_str%]'; // Set empty-attribute opening format.
             }
-            if (preg_match('/\bh(?:eight)?+\s*+=\s*+[\'"]?+(\d++)\b/i', $attribute, $m)) {
-                $height = (int)$m[1];
+            // Consolidate consecutive attribute whitespace to a single space. Trim start and end.
+            $attribute = preg_replace(array('/\s++/S', '/^ /', '/ $/'), array(' ', '', ''), $attribute);
+
+            // Determine attribute handler: fixed or variable or none.
+            if (isset($tag['handlers'][$attribute]))
+            { // If attribute matches handler key
+                $handler = &$tag['handlers'][$attribute]; // use the fixed-attribute handler.
+            } elseif (isset($tag['handlers']['ATTRIB']))
+            { // Else if we have one, use this tags
+                $handler = &$tag['handlers']['ATTRIB']; // variable attribute handler. Otherwise...
+            } elseif (isset($tag['handlers']['NO_ATTRIB']) && count($tag['handlers']) == 1)
+            { // Otherwise we have an erroneous attribute which is either unexpected or unrecognized.
+                // Error #2: 'Unexpected attribute: "%1$s". (No attribute allowed for [%2$s].'.
+                $handler = &$this->pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
+                $new_errors[] = sprintf(__('BBerr unexpected attribute', $attribute, $tagname));
+            }
+            else
+            { // Error #3: 'Unrecognized attribute: "%1$s", is not valid for [%2$s].'
+                $handler = &$this->pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
+                $new_errors[] = sprintf(__('BBerr unrecognized attribute', $attribute, $tagname));
+            }
+
+            // Make sure attribute does nor contain a valid BBcode tag.
+            if (preg_match($this->pd['re_bbtag'], $attribute))
+            { // Error #4: 'Attribute may NOT contain open or close bbcode tags'
+                $handler = &$this->pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
+                $new_errors[] = sprintf(__('BBerr bbcode attribute'));
+            }
+
+            // Validate and filter tag's attribute value if and according to custom attribute regex.
+            if (isset($handler['a_regex']))
+            { // Check if this tag has an attribute regex? (very rare)
+                if (preg_match($handler['a_regex'], $attribute, $m))
+                { // Yes. Check if regex matches attribute?
+                    $attribute = $m[1];
+                }
+                else
+                { // Error #4b: 'Invalid attribute, [%s] requires specific attribute.'
+                    $new_errors[] = sprintf(__('BBerr invalid attrib', $tagname));
+                }
+            }
+        }
+        else
+        { // Attribute not specified. Use the NO_ATTRIB handler if it exixts else error.
+            $attribute = ''; // No attribute? Make it so.
+            $fmt_open = '['.$tagname.']'; // Set no-attribute fmt_open string.
+            if (isset($tag['handlers']['NO_ATTRIB']))
+            { // If we have one, use this tags
+                $handler = &$tag['handlers']['NO_ATTRIB']; // no-attribute handler. Otherwise...
+            }
+            else
+            { // Error #5: '[%1$s] is missing a required attribute.'.
+                $handler = &$this->pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
+                $new_errors[] = sprintf(__('BBerr missing attribute', $tagname));
             }
-            $attribute = preg_replace('/[;\s]?+\b(?:(?:w(?:idth)?+|h(?:eight)?+)\s*+=\s*+|\d++[Xx])\d++\b/Si',
-                            '', $attribute);
         }
-        break;
 
-    case 'url':
-        if (($m = $feather->url->is_valid($attribute))) {
-            $attribute = $m['url']; // Fetch possibly more complete url address.
-        } else { // Error #10b: 'Invalid URL name: %s'.
-            $new_errors[] = sprintf(__('BBerr Invalid URL name'), $attribute);
+        // -------------------------------------------------------
+        // Do some validation checks. Fix problems where possible:
+        // -------------------------------------------------------
+        // Handle tag nesting depth overflow.
+        if ($tag['depth'] > $tag['depth_max'])
+        { // Allowable tag nesting level exceeded?
+            switch ($tag['nest_type'])
+            { // Overflow. Handle based upon tag's "nest_type"
+                case 'clip': // Silently strip overly nested tags and content.
+                    $contents = '';
+                    break;
+                case 'fix': // Silently strip overly-nested tags (keep contents).
+                    $fmt_open = $fmt_close = '';
+                    break;
+                case 'err': // Error #6: '[%1$s] tag nesting depth: %2$d exceeds allowable limit: %3$d.'.
+                    $new_errors[] = sprintf(__('BBerr nesting overflow', $tagname, $tag['depth'], $tag['depth_max']));
+                    break;
+                default:
+            }
         }
-        break;
 
-    case 'color':
-        if (!preg_match($pd['re_color'], $attribute)) { // Error #11: 'Invalid color attribute: %s'.
-            $new_errors[] = sprintf(__('BBerr Invalid color'), $attribute);
+        // Verify this tag is not in its parent's excluded tags list.
+        if (isset($this->pd['bbcd'][$parent]['tags_excluded'][$tagname]))
+        { // Are we illegitimate?
+            // Yes. Pick between error #6 and #7.
+            if ($parent === $tagname)
+            { // Error #7: '[%s] was opened within itself, this is not allowed.'
+                $new_errors[] = sprintf(__('BBerr self-nesting', $tagname));
+            }
+            else
+            { // Error #8: '[%1$s] was opened within [%2$s], this is not allowed.'
+                $new_errors[] = sprintf(__('BBerr invalid nesting', $tagname, $parent));
+            }
         }
-        break;
 
-    case 'email':
-        // TODO: improve this quick-n-dirty email check.
-        if (!preg_match('/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,6}$/i', $attribute)) { // Error #10c: 'Invalid email address: %s'.
-            $new_errors[] = sprintf(__('BBerr Invalid email address'), $attribute);
+        // Verify our parent tag is in our 'parents' allowable array if it exists.
+        if (isset($tag['parents']) && !isset($tag['parents'][$parent]))
+        { // Error #9: '[%1$s] cannot be within: [%2$s]. Allowable parent tags: %3$s.'.
+            $new_errors[] = sprintf(__('BBerr invalid parent', $tagname, $parent, '('.implode('), (', array_keys($tag['parents'])).')'));
         }
-        break;
-
-    default:
-    } // End a_type switch().
-
-    // ----------------------------------------------------------
-    // Perform tag-specific processing of attribute and contents:
-    // ----------------------------------------------------------
-    switch ($tagname) {
-    case 'img': // Handle bad image url, file too big, then scale-to-fit within forum defaults if too large.
-        if ($tag['depth'] === 1) { // Check if not overly nested?
-            if (($pd['ipass'] === 2) && $pd['config']['valid_imgs'] && $feather->url->is_valid($contents)) { // Valid URI?
-                // Yes. Fetch file headers containing file type and size ("Content-Type" and "Content-Length").
-                if (($http = @get_headers($contents)) !== false && is_array($http)) {
-                    if (preg_match('/\b200\s++OK\s*+$/i', $http[0])) { // Good response header?
-                        for ($i = 1, $len = count($http); $i < $len; ++$i) { // Yes. Loop through HTTP response headers.
-                            if (preg_match('/^\s*+Content-Length\s*+:\s*+(\d++)\s*+$/i', $http[$i], $m)) {
-                                $size = (int)$m[1];
-                            }                // File size found.
-                            if (preg_match('/^\s*+Content-Type\s*+:\s*+image\/(.++)$/i', $http[$i], $m)) {
-                                $type = $m[1];
-                            }                    // Image file type found.
-                        }
-                        // Verify Content-Type is an image.
-                        if (isset($type)) {
-                            // Verify remote file size is not too big. (If too big, handle error.)
-                            if (isset($size)) {
-                                if ($size <= $pd['config']['max_size']) {
-                                    // Filesize is ok. Do nothing.
-                                    if (($info = @getimagesize($contents)) && is_array($info)) {
-                                        // Fetch width & height.
-                                        // Now we know the filesize, width and height of remote image.
-                                        if (($iwidth = (int)$info[0]) && ($iheight = (int)$info[1])) {
-                                            // To resize or not resize, that is the question.
-                                            // If bigger than default, scale down. Otherwise dont touch.
-                                            // Scale image to fit within forum default width/height box dimensions.
-                                            $ar = ((float)$iwidth) / ((float)$iheight);
-                                            // Otherwise, for images that naturally fit inside the box,
-                                            // leave the attribute clean (or unset).
-                                            if (!isset($width) && !isset($height) &&
-                                                    ($iwidth > $pd['config']['def_width'] ||
-                                                        $iheight > $pd['config']['def_height'])
-                                            ) {    // Remote file dimensions are too big to fit within default box.
-                                                // Explicitly scale a new width and height in IMG attribute.
-                                                $width = $pd['config']['def_width'];
-                                                $height = (int)((((float)$width) / $ar) + 0.5);
-                                                if ($height > $pd['config']['def_height']) {
-                                                    $height = $pd['config']['def_height'];
-                                                    $width = (int)((((float)$height) * $ar) + 0.5);
+
+        // -----------------------------------------
+        // Perform content-type-specific processing:
+        // -----------------------------------------
+        switch ($handler['c_type'])
+        {
+            case 'width_height':
+                if (preg_match('/\b(\d++)[Xx](\d++)\b/S', $contents, $m))
+                {
+                    $width = (int)$m[1];
+                    $height = (int)$m[2];
+                }
+                if (preg_match('/\bw(?:idth)?+\s*+=\s*+[\'"]?+(\d++)\b/Si', $contents, $m))
+                {
+                    $width = (int)$m[1];
+                }
+                if (preg_match('/\bh(?:eight)?+\s*+=\s*+[\'"]?+(\d++)\b/Si', $contents, $m))
+                {
+                    $height = (int)$m[1];
+                }
+                if (isset($height, $tag['x_padding'], $tag['y_padding']))
+                {
+                    $height -= $tag['y_padding'] - $tag['x_padding']; // Adjust for height of embedded controller.
+                }
+                break;
+
+            case 'url':
+                // Sanitize contents which is (hopefully) a url link. Trim spaces.
+                $contents = preg_replace(array('/^\s+/', '/\s+$/S'), '', $contents);
+                // Handle special case link to a
+                if (($m = $this->feather->url->is_valid($contents)))
+                {
+                    $contents = $m['url']; // Fetch possibly more complete url address.
+                }
+                else
+                { // Error #10a: 'Invalid URL name: %s'.
+                    $new_errors[] = sprintf(__('BBerr Invalid URL name', $contents));
+                }
+                break;
+
+            case 'email':
+                // TODO: improve this quick-n-dirty email check.
+                if (!preg_match('/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,6}$/i', $contents))
+                { // Error #10c: 'Invalid email address: %s'.
+                    $new_errors[] = sprintf(__('BBerr Invalid email address', $contents));
+                }
+                break;
+
+            default:
+        } // End c_type switch().
+
+        // -------------------------------------------
+        // Perform attribute-type-specific processing:
+        // -------------------------------------------
+        switch ($handler['a_type'])
+        {
+            case 'width_height':
+                if ($attribute)
+                {
+                    if (preg_match('/\b(\d++)[Xx](\d++)\b/', $attribute, $m))
+                    { // Check for a "123x456" WxH spec?
+                        $width = (int)$m[1]; // Yes. Set both dimensions.
+                        $height = (int)$m[2];
+                    }
+                    if (preg_match('/\bw(?:idth)?+\s*+=\s*+[\'"]?+(\d++)\b/i', $attribute, $m))
+                    {
+                        $width = (int)$m[1];
+                    }
+                    if (preg_match('/\bh(?:eight)?+\s*+=\s*+[\'"]?+(\d++)\b/i', $attribute, $m))
+                    {
+                        $height = (int)$m[1];
+                    }
+                    $attribute = preg_replace('/[;\s]?+\b(?:(?:w(?:idth)?+|h(?:eight)?+)\s*+=\s*+|\d++[Xx])\d++\b/Si', '', $attribute);
+                }
+                break;
+
+            case 'url':
+                if (($m = $this->feather->url->is_valid($attribute)))
+                {
+                    $attribute = $m['url']; // Fetch possibly more complete url address.
+                }
+                else
+                { // Error #10b: 'Invalid URL name: %s'.
+                    $new_errors[] = sprintf(__('BBerr Invalid URL name', $attribute));
+                }
+                break;
+
+            case 'color':
+                if (!preg_match($this->pd['re_color'], $attribute))
+                { // Error #11: 'Invalid color attribute: %s'.
+                    $new_errors[] = sprintf(__('BBerr Invalid color', $attribute));
+                }
+                break;
+
+            case 'email':
+                // TODO: improve this quick-n-dirty email check.
+                if (!preg_match('/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,6}$/i', $attribute))
+                { // Error #10c: 'Invalid email address: %s'.
+                    $new_errors[] = sprintf(__('BBerr Invalid email address', $attribute));
+                }
+                break;
+
+            default:
+        } // End a_type switch().
+
+
+        // ----------------------------------------------------------
+        // Perform tag-specific processing of attribute and contents:
+        // ----------------------------------------------------------
+        switch ($tagname)
+        {
+            case 'img': // Handle bad image url, file too big, then scale-to-fit within forum defaults if too large.
+                if ($tag['depth'] === 1)
+                { // Check if not overly nested?
+                    if (($this->pd['ipass'] === 2) && $this->pd['config']['valid_imgs'] && $this->feather->url->is_valid($contents))
+                    { // Valid URI?
+                        // Yes. Fetch file headers containing file type and size ("Content-Type" and "Content-Length").
+                        // ??? Should this call to get_headers have an @ in case of weird errors?
+                        if (($http = get_headers($contents)) !== false && is_array($http))
+                        {
+                            if (preg_match('/\b200\s++OK\s*+$/i', $http[0]))
+                            { // Good response header?
+                                for ($i = 1, $len = count($http); $i < $len; ++$i)
+                                { // Yes. Loop through HTTP response headers.
+                                    if (preg_match('/^\s*+Content-Length\s*+:\s*+(\d++)\s*+$/i', $http[$i], $m))
+                                        $size = (int)$m[1]; // File size found.
+                                    if (preg_match('/^\s*+Content-Type\s*+:\s*+image\/(.++)$/i', $http[$i], $m))
+                                        $type = $m[1]; // Image file type found.
+                                }
+                                // Verify Content-Type is an image.
+                                if (isset($type))
+                                {
+                                    // Verify remote file size is not too big. (If too big, handle error.)
+                                    if (isset($size))
+                                    {
+                                        if ($size <= $this->pd['config']['max_size'])
+                                        {
+                                            // Filesize is ok. Do nothing.
+                                            if (($info = @getimagesize($contents)) && is_array($info))
+                                            { // Fetch width & height.
+                                                // Now we know the filesize, width and height of remote image.
+                                                if (($iwidth = (int)$info[0]) && ($iheight = (int)$info[1]))
+                                                {
+                                                    // To resize or not resize, that is the question.
+                                                    // If bigger than default, scale down. Otherwise dont touch.
+                                                    // Scale image to fit within forum default width/height box dimensions.
+                                                    $ar = ((float)$iwidth) / ((float)$iheight);
+                                                    // Otherwise, for images that naturally fit inside the box,
+                                                    // leave the attribute clean (or unset).
+                                                    if (!isset($width) && !isset($height) && ($iwidth > $this->pd['config']['def_width'] || $iheight > $this->pd['config']['def_height']))
+                                                    { // Remote file dimensions are too big to fit within default box.
+                                                        // Explicitly scale a new width and height in IMG attribute.
+                                                        $width = $this->pd['config']['def_width'];
+                                                        $height = (int)((((float)$width) / $ar) + 0.5);
+                                                        if ($height > $this->pd['config']['def_height'])
+                                                        {
+                                                            $height = $this->pd['config']['def_height'];
+                                                            $width = (int)((((float)$height) * $ar) + 0.5);
+                                                        }
+                                                    } // Else remote image fits. Do nothing special with width and height.
                                                 }
-                                            } // Else remote image fits. Do nothing special with width and height.
+                                            }
+                                            else
+                                            { // Error #13: 'Unable to retrieve image data from remote url: %s'.
+                                                $new_errors[] = sprintf(__('BBerr bad meta data', $contents));
+                                            } // NOTE: cannot generate this error.
+                                        }
+                                        else
+                                        { // Filesize of remote image is too big. Silently convert to link if possible.
+                                            if (isset($this->pd['bbcd']['url']) && $this->pd['bbcd']['url']['depth'] === 0)
+                                            {
+                                                $fmt_open = '{[url='.$contents.']';
+                                                $fmt_close = '[/url]}';
+                                                $contents = __('BBmsg big image');
+                                            }
+                                            else
+                                            { // Image within a url cannot be linkified. Just display url name.
+                                                $contents = '{'.$contents.'}';
+                                                $fmt_open = '';
+                                                $fmt_close = '';
+                                            }
                                         }
-                                    } else { // Error #13: 'Unable to retrieve image data from remote url: %s'.
-                                        $new_errors[] = sprintf(__('BBerr bad meta data'), $contents);
-                                    } // NOTE: cannot generate this error.
-                                } else { // Filesize of remote image is too big. Silently convert to link if possible.
-                                    if (isset($pd['bbcd']['url']) && $pd['bbcd']['url']['depth'] === 0) {
-                                        $fmt_open  = '{[url='. $contents .']';
-                                        $fmt_close = '[/url]}';
-                                        $contents = __('BBmsg big image');
-                                    } else { // Image within a url cannot be linkified. Just display url name.
-                                        $contents = '{'. $contents .'}';
-                                        $fmt_open  = '';
-                                        $fmt_close = '';
                                     }
+                                    else // $size not set.
+
+                                    { // Error #14: 'Unable to determine remote file size.'.
+                                        $new_errors[] = __('BBerr no file size');
+                                    } // NOTE: cannot generate this error.
+                                }
+                                else
+                                { // Error #15: 'Remote url does not have Content-Type: "image".'
+                                    $new_errors[] = __('BBerr non image');
                                 }
-                            } else {
-                                // $size not set.
- // Error #14: 'Unable to determine remote file size.'.
-                                $new_errors[] = __('BBerr no file size');
-                            } // NOTE: cannot generate this error.
-                        } else { // Error #15: 'Remote url does not have Content-Type: "image".'
-                            $new_errors[] = __('BBerr non image');
+                            }
+                            else
+                            { // Error #16: 'Bad HTTP response header: "%s"'.
+                                $new_errors[] = sprintf(__('BBerr bad http response', $http[0]));
+                            }
                         }
-                    } else { // Error #16: 'Bad HTTP response header: "%s"'.
-                        $new_errors[] = sprintf(__('BBerr bad http response'), $http[0]);
-                    }
-                } else { // Error #17: 'Unable to read remote image http headers.'.
-                    $new_errors[] = __('BBerr bad headers');
+                        else
+                        { // Error #17: 'Unable to read remote image http headers.'.
+                            $new_errors[] = __('BBerr bad headers');
+                        }
+
+                    } // Image validation turned off. Do nothing.
                 }
-            } // Image validation turned off. Do nothing.
-        } else { // Non-Error: IMG tag self nesting. Handle by silently stripping tags with no error.
-            $fmt_open = $fmt_close = '';
-        }
-        break;
-
-    case 'list': // Fixup lists within lists. In lists, everything must be in a [*] tag.
-        // Check if LIST contents well-formed.
-        if ($pd['ipass'] === 2 && !preg_match('% # Rev:20110220_1200
-			^\s*+  # This regex validates well-formed list content.
-			(?:
-			  \[\*\]
-			  [^[]*+(?:(?!\[/?\*\])\[[^[]*+)*+
-			  \[/\*\]\s*+
-			)++
-			$
-			%x', $contents)) { // Not well formed. Do fixup to ensure list contents are only * tags.
-            // First regex wraps invalid characters at start of LIST in a [*]...[/*] tag.
-            $contents = preg_replace($pd['re_fixlist_1'], '[*]$1[/*]', $contents);
-            // Second regex wraps invalid characters between [/*] and [*] (or [/list]).
-            $contents = preg_replace($pd['re_fixlist_2'], '$1[/*]', $contents);
-        } // Well-formed LIST contents!
-        if ($parent === 'list') {
-            $fmt_open = '[*]'. $fmt_open;
-            $fmt_close .= '[/*]';
-        }
-        break;
-
-    default:
-        break;
-    } // End switch statement.
-    // -------------------------------------------
-    // Process width and height values if present.
-    // -------------------------------------------
-    if (isset($width) || isset($height)) { // Check if dimension specified in attrib or contents?
-        // Yes. Clip both $width and/or $height to their respective config maximums.
-        if (isset($width)) {                            // Clip to max. Set to default if zero.
-            if ($width > $pd['config']['max_width']) {
-                $width = $pd['config']['max_width'];
-            } elseif ($width === 0) {
-                $width = $pd['config']['def_width'];
+                else
+                { // Non-Error: IMG tag self nesting. Handle by silently stripping tags with no error.
+                    $fmt_open = $fmt_close = '';
+                }
+                break;
+
+            case 'list': // Fixup lists within lists. In lists, everything must be in a [*] tag.
+                // Check if LIST contents well-formed.
+                if ($this->pd['ipass'] === 2 && !preg_match('% # Rev:20110220_1200
+				^\s*+  # This regex validates well-formed list content.
+				(?:
+				\[\*\]
+				[^[]*+(?:(?!\[/?\*\])\[[^[]*+)*+
+				\[/\*\]\s*+
+				)++
+				$
+				%x', $contents))
+                { // Not well formed. Do fixup to ensure list contents are only * tags.
+                    // First regex wraps invalid characters at start of LIST in a [*]...[/*] tag.
+                    $contents = preg_replace($this->pd['re_fixlist_1'], '[*]$1[/*]', $contents);
+                    // Second regex wraps invalid characters between [/*] and [*] (or [/list]).
+                    $contents = preg_replace($this->pd['re_fixlist_2'], '$1[/*]', $contents);
+                } // Well-formed LIST contents!
+                if ($parent === 'list')
+                {
+                    $fmt_open = '[*]'.$fmt_open;
+                    $fmt_close .= '[/*]';
+                }
+                break;
+
+            default:
+                break;
+        } // End switch statement.
+        // -------------------------------------------
+        // Process width and height values if present.
+        // -------------------------------------------
+        if (isset($width) || isset($height))
+        { // Check if dimension specified in attrib or contents?
+            // Yes. Clip both $width and/or $height to their respective config maximums.
+            if (isset($width))
+            { // Clip to max. Set to default if zero.
+                if ($width > $this->pd['config']['max_width'])
+                    $width = $this->pd['config']['max_width'];
+                elseif ($width === 0)
+                    $width = $this->pd['config']['def_width'];
             }
-        }
-        if (isset($height)) {                            // Clip to max. Set to default if zero.
-            if ($height > $pd['config']['max_height']) {
-                $height = $pd['config']['max_height'];
-            } elseif ($height === 0) {
-                $height = $pd['config']['def_height'];
+            if (isset($height))
+            { // Clip to max. Set to default if zero.
+                if ($height > $this->pd['config']['max_height'])
+                    $height = $this->pd['config']['max_height'];
+                elseif ($height === 0)
+                    $height = $this->pd['config']['def_height'];
             }
-        }
-        if (isset($ar)) { // If the real image dimensions are known ($ar), then adjust to fit in box and maintain $ar.
-            if (isset($width) && isset($height)) {        // Check if both dimensions set?
-                if ($ar > (((float)$width) / ((float)$height))) {    // Yes. Check if $width more precise than $height?
-                    $height = (int)((((float)$width) / $ar) + 0.5); // Yes. Compute height from width and AR.
-                    if ($height > $pd['config']['max_height']) {
-                        $height = $pd['config']['max_height'];
+            if (isset($ar))
+            { // If the real image dimensions are known ($ar), then adjust to fit in box and maintain $ar.
+                if (isset($width) && isset($height))
+                { // Check if both dimensions set?
+                    if ($ar > (((float)$width) / ((float)$height)))
+                    { // Yes. Check if $width more precise than $height?
+                        $height = (int)((((float)$width) / $ar) + 0.5); // Yes. Compute height from width and AR.
+                        if ($height > $this->pd['config']['max_height'])
+                        {
+                            $height = $this->pd['config']['max_height'];
+                            $width = (int)((((float)$height) * $ar) + 0.5);
+                        }
+                    }
+                    else
+                    {
+                        $width = (int)((((float)$height) * $ar) + 0.5); // Compute width from height and AR.
+                        if ($width > $this->pd['config']['max_width'])
+                        {
+                            $width = $this->pd['config']['max_width'];
+                            $height = (int)((((float)$width) / $ar) + 0.5);
+                        }
+                    }
+                } elseif (isset($width))
+                {
+                    $height = (int)((((float)$width) / $ar) + 0.5); // Compute height from width and AR.
+                    if ($height > $this->pd['config']['max_height'])
+                    {
+                        $height = $this->pd['config']['max_height'];
                         $width = (int)((((float)$height) * $ar) + 0.5);
                     }
-                } else {
+                }
+                else
+                {
                     $width = (int)((((float)$height) * $ar) + 0.5); // Compute width from height and AR.
-                    if ($width > $pd['config']['max_width']) {
-                        $width = $pd['config']['max_width'];
+                    if ($width > $this->pd['config']['max_width'])
+                    {
+                        $width = $this->pd['config']['max_width'];
                         $height = (int)((((float)$width) / $ar) + 0.5);
                     }
                 }
-            } elseif (isset($width)) {
-                $height = (int)((((float)$width) / $ar) + 0.5);        // Compute height from width and AR.
-                if ($height > $pd['config']['max_height']) {
-                    $height = $pd['config']['max_height'];
-                    $width = (int)((((float)$height) * $ar) + 0.5);
-                }
-            } else {
-                $width = (int)((((float)$height) * $ar) + 0.5);    // Compute width from height and AR.
-                if ($width > $pd['config']['max_width']) {
-                    $width = $pd['config']['max_width'];
-                    $height = (int)((((float)$width) / $ar) + 0.5);
-                }
             }
+            // Unconditionally write width and/or height data back into attribute.
+            if ($width === 0)
+                $width = 1;
+            if ($height === 0)
+                $height = 1;
+            if ($attribute)
+                $attribute .= ';'; // Add delimiter for non-empty attrib.
+            if (isset($width) && isset($height))
+            {
+                $attribute .= $width.'x'.$height;
+            } elseif (isset($width))
+            {
+                $attribute .= 'w='.$width;
+            }
+            else
+            {
+                $attribute .= 'h='.$height;
+            }
+            $fmt_open = '['.$tagname.'=%a_str%]'; // Set open tag format to receive attribute.
         }
-        // Unconditionally write width and/or height data back into attribute.
-        if ($width === 0) {
-            $width = 1;
-        }
-        if ($height === 0) {
-            $height = 1;
+        // Validate and filter tag's contents if and according to optional contents regex.
+        if (isset($handler['c_regex']))
+        { // Check if this tag has a contents regex? (youtube, vimeo, etc.)
+            // Yes. Check if regex matches contents?
+            if (preg_match($handler['c_regex'], $contents, $m))
+                $contents = $m[1];
+            else
+            { // Error #12: 'Invalid content, [%s] requires specific content.'
+                $new_errors[] = sprintf(__('BBerr invalid content', $tagname));
+            }
         }
-        if ($attribute) {
-            $attribute .= ';';
-        }                // Add delimiter for non-empty attrib.
-        if (isset($width) && isset($height)) {
-            $attribute .= $width .'x'. $height;
-        } elseif (isset($width)) {
-            $attribute .= 'w='. $width;
-        } else {
-            $attribute .= 'h='. $height;
+        // Silently strip empty or all-white tags:
+        if (preg_match('/^\s*+$/', $contents))
+            $contents = '';
+
+        // Unconditionally hide all opening square brackets within hidden CODE contents.
+        // This is necessary otherwise the LIST fixup code would process "[*]" within CODE tags.
+        // These \3 byte markers are subsequently removed by preparse_bbcode().
+        if ($tag['tag_type'] === 'hidden')
+        {
+            $contents = str_replace('[', "\3", $contents);
         }
-        $fmt_open = '['. $tagname .'=%a_str%]';    // Set open tag format to receive attribute.
-    }
-    // Validate and filter tag's contents if and according to optional contents regex.
-    if (isset($handler['c_regex'])) { // Check if this tag has a contents regex? (youtube, vimeo, etc.)
-        // Yes. Check if regex matches contents?
-        if (preg_match($handler['c_regex'], $contents, $m)) {
-            $contents = $m[1];
-        } else { // Error #12: 'Invalid content, [%s] requires specific content.'
-            $new_errors[] = sprintf(__('BBerr invalid content'), $tagname);
+        // On first pass, fix inline tags which span paragraphs by closting then re-opening.
+        if ($this->pd['ipass'] === 1 && $tag['html_type'] === 'inline' && $tag['tag_type'] !== 'hidden' && strpos($contents, "\n") !== false)
+        {
+            $contents = preg_replace('/\n\s*?\n\s*/', "\1\2".$fmt_close."\1".'$0'."\1\2".str_replace('%a_str%', $attribute, $fmt_open)."\1", $contents);
         }
-    }
-    // Silently strip empty or all-white tags:
-    if (preg_match('/^\s*+$/', $contents)) {
-        $contents = '';
-    }
+        // ***********************************************************************************
+        // Handle errors. Wrap this tags open and close BBCode tag each in a valid [err] tag.
+        // ***********************************************************************************
+        if (isset($new_errors) && $fmt_open)
+        { // check if we detected any errors?
+            // Yes, we have detected one or more new error conditions.
+            foreach ($new_errors as $errmsg)
+            { // Push all new errors on g errors array.
+                $this->pd['new_errors'][] = htmlspecialchars($errmsg);
+            }
 
-    // Unconditionally hide all opening square brackets within hidden CODE contents.
-    // This is necessary otherwise the LIST fixup code would process "[*]" within CODE tags.
-    // These \3 byte markers are subsequently removed by preparse_bbcode().
-    if ($tag['tag_type'] === 'hidden') {
-        $contents = str_replace('[', "\3", $contents);
-    }
-    // On first pass, fix inline tags which span paragraphs by closting then re-opening.
-    if ($pd['ipass'] === 1 && $tag['html_type'] === 'inline' &&
-            $tag['tag_type'] !== 'hidden' && strpos($contents, "\n") !== false) {
-        $contents = preg_replace('/\n\s*?\n\s*/',
-            "\1\2". $fmt_close ."\1".'$0'."\1\2". str_replace('%a_str%', $attribute, $fmt_open) ."\1", $contents);
-    }
-    // ***********************************************************************************
-    // Handle errors. Wrap this tags open and close BBCode tag each in a valid [err] tag.
-    // ***********************************************************************************
-    if (isset($new_errors) && $fmt_open) {
-        // check if we detected any errors?
- // Yes, we have detected one or more new error conditions.
-        foreach ($new_errors as $errmsg) { // Push all new errors on g errors array.
-            $pd['new_errors'][] = htmlspecialchars($errmsg);
+            // Wrap offending BBCode open and close tags each in its own valid error tag (last err only).
+            $fmt_open = '[err='.$errmsg.']'.$fmt_open.'[/err]'; // Wrap tags in the last error message.
+            $fmt_close = '[err='.$errmsg.']'.$fmt_close.'[/err]';
         }
-        // Wrap offending BBCode open and close tags each in its own valid error tag (last err only).
-        $fmt_open  = '[err='. $errmsg .']'. $fmt_open  . '[/err]';    // Wrap tags in the last error message.
-        $fmt_close = '[err='. $errmsg .']'. $fmt_close . '[/err]';
-    }
 
-    // -----------------------------------------------------------------------------
-    // All done processing. Substitute $attribute and $contents into format strings:
-    // -----------------------------------------------------------------------------
-    if ($contents) {
-        if ($pd['ipass'] === 1) {                    // Add byte markers on first pass.
-            if ($tag['tag_type'] === 'hidden' || $handler['c_type'] == 'url') {
-                $text = "\1\2". $fmt_open .'%c_str%'. $fmt_close ."\1";
-            } else {
-                $text = "\1\2". $fmt_open ."\1%c_str%\1\2". $fmt_close ."\1";
+        // -----------------------------------------------------------------------------
+        // All done processing. Substitute $attribute and $contents into format strings:
+        // -----------------------------------------------------------------------------
+        if ($contents)
+        {
+            if ($this->pd['ipass'] === 1)
+            { // Add byte markers on first pass.
+                if ($tag['tag_type'] === 'hidden' || $handler['c_type'] == 'url')
+                    $text = "\1\2".$fmt_open.'%c_str%'.$fmt_close."\1";
+                else
+                    $text = "\1\2".$fmt_open."\1%c_str%\1\2".$fmt_close."\1";
             }
-        } else {
-            $text = $fmt_open .'%c_str%'. $fmt_close;
-        } // Pass 2, dont bother with byte markers.
-        $text = str_replace('%a_str%', $attribute, $text);
-        $text = str_replace('%c_str%', $contents, $text);
-    } else {
-        $text = '';
-    }
-    array_pop($pd['tag_stack']);                            // Were done. Pop this tag off the stack.
-    $tag['depth']--;                                        // Restore pre-call tag specific depth.
-    return $text;
-} // Exit _preparse_bbcode_callback
-
-/**----------------------------------------------------------------
- * Pre-process text containing BBCodes. Check for integrity,
- * well-formedness, nesting, etc. Flag errors by wrapping offending
- * tags in a special [err] tag.
- *-----------------------------------------------------------------
- */
-function preparse_bbcode($text, &$errors, $is_signature = false)
-{
-    global $feather_config, $pd;
-
-    $pd['new_errors'] = array(); // Reset the parser error message stack.
-    $pd['in_signature'] = ($is_signature) ? true : false;
-    $pd['ipass'] = 1;
-    $newtext = preg_replace_callback($pd['re_bbcode'], '_preparse_bbcode_callback', $text);
-    if ($newtext === null) {
-        // On error, preg_replace_callback returns NULL.
- // Error #1: '(%s) Message is too long or too complex. Please shorten.'
-        $errors[] = sprintf(__('BBerr pcre'), preg_error());
+            else
+                $text = $fmt_open.'%c_str%'.$fmt_close; // Pass 2, dont bother with byte markers.
+            $text = str_replace('%a_str%', $attribute, $text);
+            $text = str_replace('%c_str%', $contents, $text);
+        }
+        else
+            $text = '';
+        array_pop($this->pd['tag_stack']); // Were done. Pop this tag off the stack.
+        $tag['depth']--; // Restore pre-call tag specific depth.
         return $text;
     }
-    $newtext = str_replace("\3", '[', $newtext); // Fixup CODE sections.
-    $parts = explode("\1", $newtext); // Hidden chunks pre-marked like so: "\1\2<code.../code>\1"
-    for ($i = 0, $len = count($parts); $i < $len; ++$i) {    // Loop through hidden and non-hidden text chunks.
-        $part =& $parts[$i];                                // Use shortcut alias
-        if (empty($part)) {
-            continue;
-        }                            // Skip empty string chunks.
-        if ($part[0] !== "\2") { // If not hidden, process this normal text content.
-            // Mark erroneous orphan tags.
-            $part = preg_replace_callback($pd['re_bbtag'], '_orphan_callback', $part);
-            // Process do-clickeys if enabled.
-            if ($feather_config['o_make_links']) {
-                $part = linkify($part);
+
+    /**
+     * Pre-process text containing BBCodes. Check for integrity,
+     * well-formedness, nesting, etc. Flag errors by wrapping offending
+     * tags in a special [err] tag.
+     *
+     * @param string $text
+     * @param array &$errors
+     * @param integer $is_signature
+     * @return string
+     */
+    function preparse_bbcode($text, &$errors, $is_signature = false)
+    {
+        $this->pd['new_errors'] = array(); // Reset the parser error message stack.
+        $this->pd['in_signature'] = ($is_signature) ? true : false;
+        $this->pd['ipass'] = 1;
+        $newtext = preg_replace_callback($this->pd['re_bbcode'], array($this, '_preparse_bbcode_callback'), $text);
+        if ($newtext === null)
+        { // On error, preg_replace_callback returns NULL.
+            // Error #1: '(%s) Message is too long or too complex. Please shorten.'
+            $errors[] = sprintf(__('BBerr pcre', preg_error()));
+            return $text;
+        }
+        $newtext = str_replace("\3", '[', $newtext); // Fixup CODE sections.
+        $parts = explode("\1", $newtext); // Hidden chunks pre-marked like so: "\1\2<code.../code>\1"
+        for ($i = 0, $len = count($parts); $i < $len; ++$i)
+        { // Loop through hidden and non-hidden text chunks.
+            $part = &$parts[$i]; // Use shortcut alias
+            if (empty($part))
+                continue; // Skip empty string chunks.
+            if ($part[0] !== "\2")
+            { // If not hidden, process this normal text content.
+                // Mark erroneous orphan tags.
+                $part = preg_replace_callback($this->pd['re_bbtag'], array($this, '_orphan_callback'), $part);
+                // Process do-clickeys if enabled.
+                if ($this->feather->config['o_make_links'])
+                    $part = $this->linkify($part);
+
+                // Process textile syntax tag shortcuts.
+                if ($this->pd['config']['textile'])
+                {
+                    // Do phrase replacements.
+                    $part = preg_replace_callback($this->pd['re_textile'], array($this, '_textile_phrase_callback'), $part);
+                    // Do lists.
+                    $part = preg_replace_callback('/^([*#]) .*+(?:\n\1 .*+)++$/Sm', array($this, '_textile_list_callback'), $part);
+                }
+                $part = preg_replace('/^[ \t]++$/m', '', $part); // Clear "white" lines of spaces and tabs.
             }
-            // Process textile syntax tag shortcuts.
-            if ($pd['config']['textile']) {
-                // Do phrase replacements.
-                $part = preg_replace_callback($pd['re_textile'],
-                            '_textile_phrase_callback', $part);
-                // Do lists.
-                $part = preg_replace_callback('/^([*#]) .*+(?:\n\1 .*+)++$/Sm',
-                            '_textile_list_callback', $part);
+            else
+                $part = substr($part, 1); // For hidden chunks, strip \2 marker byte.
+        }
+        $text = implode("", $parts); // Put hidden and non-hidden chunks back together.
+        $this->pd['ipass'] = 2; // Run a second pass through parser to clean changed content.
+        $text = preg_replace_callback($this->pd['re_bbcode'], array($this, '_preparse_bbcode_callback'), $text);
+        $text = str_replace("\3", '[', $text); // Fixup CODE sections.
+        if (!empty($this->pd['new_errors']))
+        {
+            foreach ($this->pd['new_errors'] as $errmsg)
+            {
+                $errors[] = $errmsg; // Push all new errors on global array.
             }
-            $part = preg_replace('/^[ \t]++$/m', '', $part);    // Clear "white" lines of spaces and tabs.
-        } else {
-            $part = substr($part, 1);
-        } // For hidden chunks, strip \2 marker byte.
-    }
-    $text = implode("", $parts); // Put hidden and non-hidden chunks back together.
-    $pd['ipass'] = 2; // Run a second pass through parser to clean changed content.
-    $text = preg_replace_callback($pd['re_bbcode'], '_preparse_bbcode_callback', $text);
-    $text = str_replace("\3", '[', $text); // Fixup CODE sections.
-    if (!empty($pd['new_errors'])) {
-        foreach ($pd['new_errors'] as $errmsg) {
-            $errors[] = $errmsg;
-        } // Push all new errors on global array.
-    }
-    return $text;
-}
-//
-// Helper preg_replace_callback function for orphan processing.
-//
-function _orphan_callback($matches)
-{
-    global $pd;
-    if ($matches[0][1] === '/') { // Error #18: 'Orphan close tag: [/%s] is missing its open tag.'
-        $errmsg = sprintf(__('BBerr orphan close'), $matches[1]);
-    } else { // Error #19: 'Orphan open tag: [%s] is missing its close tag.'
-        $errmsg = sprintf(__('BBerr orphan open'), $matches[1]);
+        }
+        return $text;
     }
-    $pd['new_errors'][] = $errmsg;    // Append to array of errors so far.
-    return '[err='. $errmsg .']'. $matches[0] .'[/err]';
-}
-//
-// Helper preg_replace_callback function for textile lists processing.
-//
-function _textile_list_callback($matches)
-{
-    global $pd;
-    if (!isset($pd['bbcd']['list'])) {
-        return $matches[0];
+
+    /**
+     * Helper preg_replace_callback function for orphan processing.
+     *
+     * @param array $matches
+     * @return string
+     */
+    private function _orphan_callback($matches)
+    {
+        if ($matches[0][1] === '/')
+        { // Error #18: 'Orphan close tag: [/%s] is missing its open tag.'
+            $errmsg = sprintf(__('BBerr orphan close', $matches[1]));
+        }
+        else
+        { // Error #19: 'Orphan open tag: [%s] is missing its close tag.'
+            $errmsg = sprintf(__('BBerr orphan open', $matches[1]));
+        }
+        $this->pd['new_errors'][] = $errmsg; // Append to array of errors so far.
+        return '[err='.$errmsg.']'.$matches[0].'[/err]';
     }
-    $parts = preg_split('/(?:^|\n)\\'. $matches[1] .' /S', $matches[0], -1, PREG_SPLIT_NO_EMPTY);
-    switch ($matches[1]) {
-    case '*': return "[list]\n[*]". implode("[/*]\n[*]", $parts) ."[/*]\n[/list]";
-    case '#': return "[list=1]\n[*]". implode("[/*]\n[*]", $parts) ."[/*]\n[/list]";
+
+    /**
+     * Helper preg_replace_callback function for textile lists processing.
+     *
+     * @param array $matches
+     * @return string
+     */
+    private function _textile_list_callback($matches)
+    {
+        if (!isset($this->pd['bbcd']['list']))
+            return $matches[0];
+        $parts = preg_split('/(?:^|\n)\\'.$matches[1].' /S', $matches[0], -1, PREG_SPLIT_NO_EMPTY);
+        switch ($matches[1])
+        {
+            case '*':
+                return "[list]\n[*]".implode("[/*]\n[*]", $parts)."[/*]\n[/list]";
+            case '#':
+                return "[list=1]\n[*]".implode("[/*]\n[*]", $parts)."[/*]\n[/list]";
+        }
     }
-}
-//
-// Helper preg_replace_callback function for textile processing.
-//
-function _textile_phrase_callback($matches)
-{
-    global $pd;
-    $matches[2] = preg_replace_callback($pd['re_textile'], '_textile_phrase_callback', $matches[2]);
-    switch ($matches[1]) {
-    case '_': return (isset($pd['bbcd']['i']))   ? '[i]'.   $matches[2] .'[/i]'   : $matches[0];
-    case '*': return (isset($pd['bbcd']['b']))   ? '[b]'.   $matches[2] .'[/b]'   : $matches[0];
-    case '@': return (isset($pd['bbcd']['tt']))  ? '[tt]'.  $matches[2] .'[/tt]'  : $matches[0];
-    case '^': return (isset($pd['bbcd']['sup'])) ? '[sup]'. $matches[2] .'[/sup]' : $matches[0];
-    case '~': return (isset($pd['bbcd']['sub'])) ? '[sub]'. $matches[2] .'[/sub]' : $matches[0];
-    case '-': return (isset($pd['bbcd']['del'])) ? '[del]'. $matches[2] .'[/del]' : $matches[0];
-    case '+': return (isset($pd['bbcd']['ins'])) ? '[ins]'. $matches[2] .'[/ins]' : $matches[0];
+
+    /**
+     * Helper preg_replace_callback function for textile processing.
+     *
+     * @param array $matches
+     * @return string
+     */
+    private function _textile_phrase_callback($matches)
+    {
+        $matches[2] = preg_replace_callback($this->pd['re_textile'], array($this, '_textile_phrase_callback'), $matches[2]);
+        switch ($matches[1])
+        {
+            case '_':
+                return (isset($this->pd['bbcd']['i'])) ? '[i]'.$matches[2].'[/i]':
+                    $matches[0];
+            case '*':
+                return (isset($this->pd['bbcd']['b'])) ? '[b]'.$matches[2].'[/b]':
+                    $matches[0];
+            case '@':
+                return (isset($this->pd['bbcd']['tt'])) ? '[tt]'.$matches[2].'[/tt]':
+                    $matches[0];
+            case '^':
+                return (isset($this->pd['bbcd']['sup'])) ? '[sup]'.$matches[2].'[/sup]':
+                    $matches[0];
+            case '~':
+                return (isset($this->pd['bbcd']['sub'])) ? '[sub]'.$matches[2].'[/sub]':
+                    $matches[0];
+            case '-':
+                return (isset($this->pd['bbcd']['del'])) ? '[del]'.$matches[2].'[/del]':
+                    $matches[0];
+            case '+':
+                return (isset($this->pd['bbcd']['ins'])) ? '[ins]'.$matches[2].'[/ins]':
+                    $matches[0];
+        }
     }
-}
 
-/* --- function preg_error()
-Check to see what the last PREG/PCRE error was. Returns a string describing the
-last error, or an empty string if there is no error (or if the PHP version is
-older than 5.2.0).
---- */
-function preg_error()
-{
-    global $pd;
-    $errmsg = '';                                        // assume no error has occured. return empty string
-    if ($pd['newer_php_version']) {                        // this function requires PHP 5.2.0 or higher
-        switch (preg_last_error()) {                    // this returns the last error condition as a number
+    /**
+     * Check to see what the last PREG/PCRE error was. Returns a string describing the
+     * last error, or an empty string if there is no error.
+     *
+     * @return string
+     */
+    public function preg_error()
+    {
+        $errmsg = ''; // assume no error has occured. return empty string
+        switch (preg_last_error())
+        { // this returns the last error condition as a number
             case PREG_NO_ERROR:
-                break;                                    // no error? return empty string === FALSE
+                break; // no error? return empty string === FALSE
             case PREG_INTERNAL_ERROR:
                 $errmsg = 'PREG_INTERNAL_ERROR';
                 break;
@@ -703,363 +895,358 @@ function preg_error()
                 $errmsg = 'Unrecognized PREG error';
                 break;
         }
-    }
-    return $errmsg;
-}
-/* ***********************************************************
-callback function _parse_bbcode_callback($matches)
-
-  This is the callback function for the main parser. This routine is called
-when the preg_replace_callback function within the parse_bbcode() function
-matches one BBCode open/close pair. The BBCode tag components are passed in
-$matches. The BBCode is converted to HTML markup according to the format
-string specified in the $bbcd array member for this tag. If an attribute is
-specified, it is encoded along with the tag contents to generate a valid
-HTML markup snippet. If this tag is not enabled (either the 'in_post' or
-'in_sig' member in $bbcd are FALSE), then the output depends upon the tag
-type; If 'zombie' or 'hidden', then both the tags and contents are displayed.
-If 'normal', then the open and close tags are stripped and the contents are
-displayed. If 'atomic', then both the tags and contents are stripped.
-
-Parameters:
-    $matches[0];					=  ([TAG=att]..[/TAG])	// The whole match
-    $matches[1];	$tagname		=  (TAG)				// The BBCode tag name.
-    $matches[2];					=  (=)					// Attribute equals sign delimiter.
-    $matches[3];	$attribute		= '(attribute)'			// Attribute within single quotes.
-    $matches[4];	$attribute		= "(attribute)"			// Attribute within double quotes.
-    $matches[5];	$attribute		=  (attribute)			// Attribute within no-or-any quotes.
-    $matches[6];	$contents		=  (ontents)			// Tag contents.
-*********************************************************** */
-function _parse_bbcode_callback($matches)
-{
-    global $pd;
-    $tagname =& $matches[1];            // TAGNAME we are currently servicing.
-    $contents =& $matches[6];            // Shortcut to contents.
-    $tag =& $pd['bbcd'][$tagname];        // Shortcut to bbcd array entry.
-    $tag['depth']++;                    // update tag-specific nesting level
-
-    // Set local parse enable flag based upon message type and global flags.
-    $enabled = (!$pd['in_signature'] && $tag['in_post'] ||    // If in a post and post-enabled, or
-        $pd['in_signature'] && $tag['in_sig']) ? true : false;    // in a sig and sig-enabled, then enabled.
-
-    // Recursively parse any nested BBCode tag markup (unless tag type is hidden).
-    if ($tag['tag_type'] !== 'hidden' && strpos($contents, '[') !== false) {
-        $contents = preg_replace_callback($pd['re_bbcode'], '_parse_bbcode_callback', $contents);
-    }
-    // ------------------------------------------------------------------------------
-    // Determine $attribute and format conversion $handler to use based on attribute.
-    // ------------------------------------------------------------------------------
-    if (!$matches[2]) {    // No attribute specified? Use the NO_ATTRIB handler.
-        $attribute = '';
-        if (isset($tag['handlers']['NO_ATTRIB'])) {            // If we have one, use this tags
-            $handler =& $tag['handlers']['NO_ATTRIB'];
-        }        // no-attribute handler. Otherwise...
-        else {
-            $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-        } // Missing attribute! Strip tag.
-    } else { // Attribute specified. Assign it from one of the three possible delimitations.
-        if ($matches[3]) {                                    // Non-empty single-quoted value.
-            $attribute =& $matches[3]; // Strip out escape from escapes and single quotes.
-            $attribute = str_replace(array('\\\\', '\\\''), array('\\', '\''), $attribute);
-        } elseif ($matches[4]) {                                // Non-empty double-quoted value.
-            $attribute =& $matches[4]; // Strip out escape from escapes and double quotes.
-            $attribute = str_replace(array('\\\\', '\\"'), array('\\', '"'), $attribute);
-        } elseif ($matches[5]) {
-            $attribute =& $matches[5];
-        }        // Non-empty un-or-any-quoted value.
-        else {
-            $attribute = '';
-        }                // Otherwise must be empty.
-        // Determine which type of attribute handler: fixed or variable.
-        if (isset($tag['handlers'][$attribute])) {            // If attribute matches handler key
-            $handler =& $tag['handlers'][$attribute];        // use the fixed-attribute handler.
-        } elseif (isset($tag['handlers']['ATTRIB'])) {        // Else if we have one, use this tags
-            $handler =& $tag['handlers']['ATTRIB'];            // variable attribute handler. Otherwise...
-        } else {
-            $handler =& $pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-        } // Missing attribute! Strip tag.
-        // htmlspecialchars() was already called (but not for quotes).
-        // Hide any double quotes in attribute now.
-        $attribute = str_replace('"', '&quot;', $attribute);
+        return $errmsg;
     }
 
-    // Set default format handler
-    $format = $handler['format'];
-
-    // -------------------------------------------
-    // Perform attribute-type-specific processing:
-    // -------------------------------------------
-    switch ($handler['a_type']) {
-    case 'width_height': // This attribute type is used for video BBCodes (YouTube, Vimeo, ...).
-        if ($attribute) {
-            if (preg_match('/\b(\d++)[Xx](\d++)\b/S', $attribute, $m)) {
-                // Check for a "123x456" WxH spec?
-                $width = (int)$m[1];                                    // Yes. Set both dimensions.
-                $height = (int)$m[2];
-            }
-            if (preg_match('%\bw(?:idth)?+\s*+=\s*+[\'"]?+(\d++)\b%Si', $attribute, $m)) {
-                $width  = (int)$m[1];
-            }
-            if (preg_match('%\bh(?:eight)?+\s*+=\s*+[\'"]?+(\d++)\b%Si', $attribute, $m)) {
-                $height = (int)$m[1];
-            }
-            if (isset($width) && isset($height)) {
-                $ar = (float)$width / (float)$height;
-            }
-            // Clean the attribute of any and all width/height specs.
-            $attribute = preg_replace('/[ ;#]?\b(?:(?:w(?:idth)?+|h(?:eight)?+)\s*+=\s*+([\'"])?+|\d++X)\d++\b(?(1)\1)?+/Si',
-                            '', $attribute);
-            if (isset($width)) { // If set, clip to max allowed. Convert zero to global default.
-                if ($width > $pd['config']['max_width']) {
-                    $width = $pd['config']['max_width'];
-                } elseif ($width === 0) {
-                    $width = $pd['config']['def_width'];
-                } // If zero, set to default.
-            }
-            if (isset($height)) { // If set, clip to max allowed. Convert zero to global default.
-                if ($height > $pd['config']['max_height']) {
-                    $height = $pd['config']['max_height'];
-                } elseif ($height === 0) {
-                    $height = $pd['config']['def_height'];
-                } // If zero, set to default.
-            }
-            if (!isset($width)) {
-                $format = str_replace('width="%w_str%"',  '', $format);
-            }
-            if (!isset($height)) {
-                $format = str_replace('height="%h_str%"', '', $format);
-            }
-        } else {
-            $width = $pd['config']['def_width'];
-            $height = $pd['config']['def_height'];
-        }
-        if (isset($tag['x_padding']) && $width) {
-            $width    += $tag['x_padding'];
+    /**
+     * This is the callback function for the main parser. This routine is called
+     * when the preg_replace_callback function within the parse_bbcode() function
+     * matches one BBCode open/close pair. The BBCode tag components are passed in
+     * $matches. The BBCode is converted to HTML markup according to the format
+     * string specified in the $bbcd array member for this tag. If an attribute is
+     * specified, it is encoded along with the tag contents to generate a valid
+     * HTML markup snippet. If this tag is not enabled (either the 'in_post' or
+     * 'in_sig' member in $bbcd are FALSE), then the output depends upon the tag
+     * type; If 'zombie' or 'hidden', then both the tags and contents are displayed.
+     * If 'normal', then the open and close tags are stripped and the contents are
+     * displayed. If 'atomic', then both the tags and contents are stripped.
+     *
+     * @param array $matches
+     * 			$matches[0];					=  ([TAG=att]..[/TAG])	// The whole match
+     * 			$matches[1];	$tagname		=  (TAG)				// The BBCode tag name.
+     * 			$matches[2];					=  (=)					// Attribute equals sign delimiter.
+     * 			$matches[3];	$attribute		= '(attribute)'			// Attribute within single quotes.
+     * 			$matches[4];	$attribute		= "(attribute)"			// Attribute within double quotes.
+     * 			$matches[5];	$attribute		=  (attribute)			// Attribute within no-or-any quotes.
+     * 			$matches[6];	$contents		=  (ontents)			// Tag contents.
+     *
+     * @return string
+     */
+    private function _parse_bbcode_callback($matches)
+    {
+        $tagname = &$matches[1]; // TAGNAME we are currently servicing.
+        $contents = &$matches[6]; // Shortcut to contents.
+        $tag = &$this->pd['bbcd'][$tagname]; // Shortcut to bbcd array entry.
+        $tag['depth']++; // update tag-specific nesting level
+
+        // Set local parse enable flag based upon message type and global flags.
+        $enabled = (!$this->pd['in_signature'] && $tag['in_post'] || // If in a post and post-enabled, or
+            $this->pd['in_signature'] && $tag['in_sig']) ? true : false; // in a sig and sig-enabled, then enabled.
+
+        // Recursively parse any nested BBCode tag markup (unless tag type is hidden).
+        if ($tag['tag_type'] !== 'hidden' && strpos($contents, '[') !== false)
+        {
+            $contents = preg_replace_callback($this->pd['re_bbcode'], array($this, '_parse_bbcode_callback'), $contents);
         }
-        if (isset($tag['y_padding']) && $height) {
-            $height    += $tag['y_padding'];
+        // ------------------------------------------------------------------------------
+        // Determine $attribute and format conversion $handler to use based on attribute.
+        // ------------------------------------------------------------------------------
+        if (!$matches[2])
+        { // No attribute specified? Use the NO_ATTRIB handler.
+            $attribute = '';
+            if (isset($tag['handlers']['NO_ATTRIB'])) // If we have one, use this tags
+
+                $handler = &$tag['handlers']['NO_ATTRIB']; // no-attribute handler. Otherwise...
+            else
+                $handler = &$this->pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB']; // Missing attribute! Strip tag.
         }
-        break;
-    default:
-    }
-    // ----------------------------------------------------------
-    // Perform tag-specific processing of attribute and contents:
-    // ----------------------------------------------------------
-    switch ($tagname) {
-
-    case 'img': // Handle disabled image, image inside of QUOTE, and width/height dimensions in attribute.
-        if (!$enabled || (!$pd['config']['quote_imgs'] && isset($pd['bbcd']['quote']) && $pd['bbcd']['quote']['depth'] > 0)) { // IMG not enabled in this context. Convert to a text URL link if possible and re-enable.
-            if (isset($pd['bbcd']['url']) && $pd['bbcd']['url']['depth'] > 0) {
-                $format = "{%c_str%}";
-            } else {
-                if ($attribute) {
-                    $format = '{<a href="%c_str%" title="%a_str%">'. __('Image link') .'</a>}';
-                } else {
-                    $format = '{<a href="%c_str%" title="'. __('BBmsg images disabled') .'">'.
-                    __('Image link') .'</a>}';
-                }
-                $enabled = true; // Re-enable to override defauslt disabled handling (i.e. dont delete.)
+        else
+        { // Attribute specified. Assign it from one of the three possible delimitations.
+            if ($matches[3])
+            { // Non-empty single-quoted value.
+                $attribute = &$matches[3]; // Strip out escape from escapes and single quotes.
+                $attribute = str_replace(array('\\\\', '\\\''), array('\\', '\''), $attribute);
+            } elseif ($matches[4])
+            { // Non-empty double-quoted value.
+                $attribute = &$matches[4]; // Strip out escape from escapes and double quotes.
+                $attribute = str_replace(array('\\\\', '\\"'), array('\\', '"'), $attribute);
+            } elseif ($matches[5])
+                $attribute = &$matches[5]; // Non-empty un-or-any-quoted value.
+            else
+                $attribute = ''; // Otherwise must be empty.
+            // Determine which type of attribute handler: fixed or variable.
+            if (isset($tag['handlers'][$attribute]))
+            { // If attribute matches handler key
+                $handler = &$tag['handlers'][$attribute]; // use the fixed-attribute handler.
+            } elseif (isset($tag['handlers']['ATTRIB']))
+            { // Else if we have one, use this tags
+                $handler = &$tag['handlers']['ATTRIB']; // variable attribute handler. Otherwise...
             }
-        } else { // IMG is enabled in this context. Wrap image inside a clickable link if global option is set.
-            if ($pd['config']['click_imgs'] && isset($pd['bbcd']['url']) && $pd['bbcd']['url']['depth'] === 0) {
-                $format = preg_replace('/^\x01\x02([^\x01]*+)\x01$/', '<a href="%c_str%">$1</a>', $format);
-            }
-        }
-        $format = "\1\2". $format ."\1";
-        // If user provided a verbose attribute (in addition to WxH), place this in the title attribute,
-        // otherwise place the URL ($contents) in the ALT attribute and remove the title attribute from format.
-        if (preg_match('/^\s*$/', $attribute)) {
-            $attribute = $contents;
-            $format = str_replace(' title="%a_str%"', '', $format);
+            else
+                $handler = &$this->pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB']; // Missing attribute! Strip tag.
+            // htmlspecialchars() was already called (but not for quotes).
+            // Hide any double quotes in attribute now.
+            $attribute = str_replace('"', '&quot;', $attribute);
         }
-        break;
-
-    case 'quote': // Quotes require language-specific "wrote:" following the posters name.
-        if ($attribute) { // Quote attribute specified. Convert optional #post_id to a post link.
-            if (preg_match('/#(\d++)$/', $attribute, $m)) {
-                // Check for optional embedded post id.
- // Attribute has optional '#1234' quoted post ID number. Convert to link back to quoted post.
-                $attribute = preg_replace('/\s*#\d++$/S', '', $attribute); // Strip post id from attribute.
-                $attribute .= ' '. __('wrote');  // Append language-specific "wrote:".
-                if ($pd['config']['quote_links']) {
-                    $attribute = ' <a href="'. get('post/'.$m[1].'/#p'.$m[1]) .'">'. $attribute .'</a>';
+
+        // Set default format handler
+        $format = $handler['format'];
+
+        // -------------------------------------------
+        // Perform attribute-type-specific processing:
+        // -------------------------------------------
+        switch ($handler['a_type'])
+        {
+            case 'width_height': // This attribute type is used for video BBCodes (YouTube, Vimeo, ...).
+                if ($attribute)
+                {
+                    if (preg_match('/\b(\d++)[Xx](\d++)\b/S', $attribute, $m))
+                    { // Check for a "123x456" WxH spec?
+                        $width = (int)$m[1]; // Yes. Set both dimensions.
+                        $height = (int)$m[2];
+                    }
+                    if (preg_match('%\bw(?:idth)?+\s*+=\s*+[\'"]?+(\d++)\b%Si', $attribute, $m))
+                        $width = (int)$m[1];
+                    if (preg_match('%\bh(?:eight)?+\s*+=\s*+[\'"]?+(\d++)\b%Si', $attribute, $m))
+                        $height = (int)$m[1];
+                    if (isset($width) && isset($height))
+                    {
+                        $ar = (float)$width / (float)$height;
+                    }
+                    // Clean the attribute of any and all width/height specs.
+                    $attribute = preg_replace('/[ ;#]?\b(?:(?:w(?:idth)?+|h(?:eight)?+)\s*+=\s*+([\'"])?+|\d++X)\d++\b(?(1)\1)?+/Si', '', $attribute);
+                    if (isset($width))
+                    { // If set, clip to max allowed. Convert zero to global default.
+                        if ($width > $this->pd['config']['max_width'])
+                            $width = $this->pd['config']['max_width'];
+                        elseif ($width === 0)
+                            $width = $this->pd['config']['def_width']; // If zero, set to default.
+                    }
+                    if (isset($height))
+                    { // If set, clip to max allowed. Convert zero to global default.
+                        if ($height > $this->pd['config']['max_height'])
+                            $height = $this->pd['config']['max_height'];
+                        elseif ($height === 0)
+                            $height = $this->pd['config']['def_height']; // If zero, set to default.
+                    }
+                    if (!isset($width))
+                        $format = str_replace('width="%w_str%"', '', $format);
+                    if (!isset($height))
+                        $format = str_replace('height="%h_str%"', '', $format);
                 }
-            } else {
-                $attribute .= ' '. __('wrote');
-            } // If no post id, just add "wrote:".
+                else
+                {
+                    $width = $this->pd['config']['def_width'];
+                    $height = $this->pd['config']['def_height'];
+                }
+                if (isset($tag['x_padding']) && $width)
+                    $width += $tag['x_padding'];
+                if (isset($tag['y_padding']) && $height)
+                    $height += $tag['y_padding'];
+                break;
+            default:
         }
-        break;
-
-// TODO: The following is somewhat of a hack. Need to implement generic handling of tags
-// which can only contain specific tags and must not contain any text (including whitespace).
-// For example: the UL and OL list tags may only contain LI tags. TABLE can only have THEAD,
-//  TBODY, TR, etc, and TR can only contain TD, etc...
-    case 'list': // Clean whitespace cruft bordering <li> tags.
-    case 'table': // Clean whitespace cruft bordering <tr> tags.
-    case 'tr': // Clean whitespace cruft bordering <td> tags.
-//		$contents = preg_replace(array('/^\s++/', '/\s+$/S', '%\s+(?=\x01\x02<(?:li|ol|ul)>)%S', '%(?<=</(?:li|ol|ul)>\x01)\s++%S'), '', $contents);
-        $contents = preg_replace(array('/^\s++/', '/\s+$/S', '%\s+(?=\x01\x02<(?:li|ol|ul|tr|td)>)%S', '%(?<=</(?:li|ol|ul|tr|td)>\x01)\s++%S'), '', $contents);
-        break;
-
-    case 'code':
-        if ($attribute) {
-            if (!isset($tag['handlers'][$attribute])) {
-                // Check for no matching attribute handler.
- // Yes, the attribute may be more complex. Extract the extra verbage to add to code header.
-                if (preg_match('/^([\w\-.:]++)\s*+(.*)$/', $attribute, $m)) {
-                    $type = strtolower($m[1]);
-                    if (isset($tag['handlers'][$type])) { // Check if we recognize this first word?
-                        $handler =& $tag['handlers'][$type];    // Yes. Set new fixed-attribute handler.
-                        if ($m[2]) { // Check if there are extra words.
-                            // Yes. Use this extra part of the attribute to augment the code header.
-                            $format = str_replace('</h4>', ' - "'. $m[2] .'"</h4>', $handler['format']);
+        // ----------------------------------------------------------
+        // Perform tag-specific processing of attribute and contents:
+        // ----------------------------------------------------------
+        switch ($tagname)
+        {
+
+            case 'img': // Handle disabled image, image inside of QUOTE, and width/height dimensions in attribute.
+                if (!$enabled || (!$this->pd['config']['quote_imgs'] && isset($this->pd['bbcd']['quote']) && $this->pd['bbcd']['quote']['depth'] > 0))
+                { // IMG not enabled in this context. Convert to a text URL link if possible and re-enable.
+                    if (isset($this->pd['bbcd']['url']) && $this->pd['bbcd']['url']['depth'] > 0)
+                        $format = "{%c_str%}";
+                    else
+                    {
+                        if ($attribute)
+                            $format = '{<a href="%c_str%" title="%a_str%">'.__('Image link').'</a>}';
+                        else
+                            $format = '{<a href="%c_str%" title="'.__('BBmsg images disabled').'">'.__('Image link').'</a>}';
+                        $enabled = true; // Re-enable to override defauslt disabled handling (i.e. dont delete.)
+                    }
+                }
+                else
+                { // IMG is enabled in this context. Wrap image inside a clickable link if global option is set.
+                    if ($this->pd['config']['click_imgs'] && isset($this->pd['bbcd']['url']) && $this->pd['bbcd']['url']['depth'] === 0)
+                    {
+                        $format = preg_replace('/^\x01\x02([^\x01]*+)\x01$/', '<a href="%c_str%">$1</a>', $format);
+                    }
+                }
+                $format = "\1\2".$format."\1";
+                // If user provided a verbose attribute (in addition to WxH), place this in the title attribute,
+                // otherwise place the URL ($contents) in the ALT attribute and remove the title attribute from format.
+                if (preg_match('/^\s*$/', $attribute))
+                {
+                    $attribute = $contents;
+                    $format = str_replace(' title="%a_str%"', '', $format);
+                }
+                break;
+
+            case 'quote': // Quotes require language-specific "wrote:" following the posters name.
+                if ($attribute)
+                { // Quote attribute specified. Convert optional #post_id to a post link.
+                    if (preg_match('/#(\d++)$/', $attribute, $m)) // Check for optional embedded post id.
+
+                    { // Attribute has optional '#1234' quoted post ID number. Convert to link back to quoted post.
+                        $attribute = preg_replace('/\s*#\d++$/S', '', $attribute); // Strip post id from attribute.
+                        $attribute .= ' '.__('wrote'); // Append language-specific "wrote:".
+                        if ($this->pd['config']['quote_links'])
+                        {
+                            $attribute = ' <a href="'. $this->feather->url->get('post/'.$m[1].'/#p'.$m[1]) .'">'. $attribute .'</a>';
                         }
-                        $attribute = $type;
                     }
+                    else
+                        $attribute .= ' '.__('wrote'); // If no post id, just add "wrote:".
                 }
-            }
-        }
-        break;
+                break;
 
-    case 'color':
-    case 'colour':
-        if (preg_match($pd['re_color'], $attribute, $m)) {
-            if (isset($m[2]) && $m[2]) {
-                $attribute = $m[1] .'; background-color: '. $m[2];
-            } else {
-                $attribute = $m[1];
-            }
+            // TODO: The following is somewhat of a hack. Need to implement generic handling of tags
+            // which can only contain specific tags and must not contain any text (including whitespace).
+            // For example: the UL and OL list tags may only contain LI tags. TABLE can only have THEAD,
+            //  TBODY, TR, etc, and TR can only contain TD, etc...
+            case 'list': // Clean whitespace cruft bordering <li> tags.
+            case 'table': // Clean whitespace cruft bordering <tr> tags.
+            case 'tr': // Clean whitespace cruft bordering <td> tags.
+                //		$contents = preg_replace(array('/^\s++/', '/\s+$/S', '%\s+(?=\x01\x02<(?:li|ol|ul)>)%S', '%(?<=</(?:li|ol|ul)>\x01)\s++%S'), '', $contents);
+                $contents = preg_replace(array('/^\s++/', '/\s+$/S', '%\s+(?=\x01\x02<(?:li|ol|ul|tr|td)>)%S', '%(?<=</(?:li|ol|ul|tr|td)>\x01)\s++%S'), '', $contents);
+                break;
+
+            case 'code':
+                if ($attribute)
+                {
+                    if (!isset($tag['handlers'][$attribute])) // Check for no matching attribute handler.
+
+                    { // Yes, the attribute may be more complex. Extract the extra verbage to add to code header.
+                        if (preg_match('/^([\w\-.:]++)\s*+(.*)$/', $attribute, $m))
+                        {
+                            $type = strtolower($m[1]);
+                            if (isset($tag['handlers'][$type]))
+                            { // Check if we recognize this first word?
+                                $handler = &$tag['handlers'][$type]; // Yes. Set new fixed-attribute handler.
+                                if ($m[2])
+                                { // Check if there are extra words.
+                                    // Yes. Use this extra part of the attribute to augment the code header.
+                                    $format = str_replace('</h4>', ' - "'.$m[2].'"</h4>', $handler['format']);
+                                }
+                                $attribute = $type;
+                            }
+                        }
+                    }
+                    // Accumulate list of syntax highlighting scripts we need to load.
+                    if (isset($tag['handlers'][$attribute]) && isset($this->pd['syntaxes'][$attribute]))
+                    {
+                        $scripts = &$this->pd['syntaxes'][$attribute];
+                        if (!isset($this->pd['code_scripts']))
+                            $this->pd['code_scripts'] = array();
+                        foreach ($scripts as $file)
+                        {
+                            if (!in_array($file, $this->pd['code_scripts']))
+                                $this->pd['code_scripts'][] = $file;
+                        }
+                    }
+                }
+                break;
+
+            case 'color':
+            case 'colour':
+                if (preg_match($this->pd['re_color'], $attribute, $m))
+                {
+                    if (isset($m[2]) && $m[2])
+                    {
+                        $attribute = $m[1].'; background-color: '.$m[2];
+                    }
+                    else
+                    {
+                        $attribute = $m[1];
+                    }
+                }
+            default:
         }
-    default:
-    }
 
-    // The return value depends upon whether this tag is currently enabled.
-    if ($enabled) { // Tag is enabled. Add byte markers to hidden chunks to allow easy explode() later.
-        if (isset($width)) {
-            $format = str_replace('%w_str%', $width, $format);
+        // The return value depends upon whether this tag is currently enabled.
+        if ($enabled)
+        { // Tag is enabled. Add byte markers to hidden chunks to allow easy explode() later.
+            if (isset($width))
+                $format = str_replace('%w_str%', $width, $format);
+            if (isset($height))
+                $format = str_replace('%h_str%', $height, $format);
+            // Subtitute attribute into format string.
+            $format = str_replace('%a_str%', $attribute, $format); // Encode attribute value.
+            // Finally, subtitute the content into the message.
+            $text = str_replace('%c_str%', $contents, $format); // Encode contents.
         }
-        if (isset($height)) {
-            $format = str_replace('%h_str%', $height, $format);
+        else
+        { // Tag is not enabled. Strip HTML tags and contents according to tag_type.
+            switch ($tag['tag_type'])
+            {
+                case 'atomic': // Strip everything.
+                    $text = '';
+                    break;
+                case 'normal': // Strip HTML open and close tags only.
+                    $text = &$contents;
+                    break;
+                case 'hidden': // Hidden and 'zombie' tags are displayed without.
+                case 'zombie': // stripping anything. All [BBCODES] are displayed.
+                default: // Default === hidden === zombie === Strip nothing.
+                    $text = &$matches[0]; // $format = '['. $tagname .']%c_str%[/'. $tagname .']';
+            }
         }
-        // Subtitute attribute into format string.
-        $format = str_replace('%a_str%', $attribute, $format);    // Encode attribute value.
-        // Finally, subtitute the content into the message.
-        $text = str_replace('%c_str%', $contents, $format);        // Encode contents.
-    } else { // Tag is not enabled. Strip HTML tags and contents according to tag_type.
-         switch ($tag['tag_type']) {
-         case 'atomic':                    // Strip everything.
-            $text = '';
-            break;
-         case 'normal':                    // Strip HTML open and close tags only.
-            $text =& $contents;
-            break;
-         case 'hidden':                    // Hidden and 'zombie' tags are displayed without.
-         case 'zombie':                    // stripping anything. All [BBCODES] are displayed.
-         default:                        // Default === hidden === zombie === Strip nothing.
-            $text =& $matches[0];        // $format = '['. $tagname .']%c_str%[/'. $tagname .']';
-         }
-    }
-    if ($tag['depth'] > $tag['depth_max']) {
-        $text = '';
-    } // Silently clip overly-nested tags.
-    $tag['depth']--;                    // restore pre-call tag specific depth
-    return $text;
-} // exit _parse_bbcode_callback
-//
-// Parse post or signature message text.
-//
-function parse_bbcode(&$text, $hide_smilies = 0)
-{
-    global $feather_config, $pd;
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
+        if ($tag['depth'] > $tag['depth_max'])
+            $text = ''; // Silently clip overly-nested tags.
+        $tag['depth']--; // restore pre-call tag specific depth
+        return $text;
+    } // exit _parse_bbcode_callback
 
-    if ($feather_config['o_censoring'] === '1') {
-        $text = censor_words($text);
+    //
+    // Convert open urls into clickable links
+    //
+    protected function linkify($text)
+    {
+        return preg_replace_callback('/ # Rev:20110220_1200 github.com\/jmrware\/LinkifyURL
+	# Match http & ftp URL that is not already linkified.
+	  # Alternative 1: URL delimited by (parentheses).
+	  (\()					   # $1	 "(" start delimiter.
+	  ((?:ht|f)tps?:\/\/[a-z0-9\-._~!$&\'()*+,;=:\/?#[\]@%]+)  # $2: URL.
+	  (\))					   # $3: ")" end delimiter.
+	| # Alternative 2: URL delimited by [square brackets].
+	  (\[)					   # $4: "[" start delimiter.
+	  ((?:ht|f)tps?:\/\/[a-z0-9\-._~!$&\'()*+,;=:\/?#[\]@%]+)  # $5: URL.
+	  (\])					   # $6: "]" end delimiter.
+	| # Alternative 3: URL delimited by {curly braces}.
+	  (\{)					   # $7: "{" start delimiter.
+	  ((?:ht|f)tps?:\/\/[a-z0-9\-._~!$&\'()*+,;=:\/?#[\]@%]+)  # $8: URL.
+	  (\})					   # $9: "}" end delimiter.
+	| # Alternative 4: URL delimited by <angle brackets>.
+	  (<|&(?:lt|\#60|\#x3c);)  # $10: "<" start delimiter (or HTML entity).
+	  ((?:ht|f)tps?:\/\/[a-z0-9\-._~!$&\'()*+,;=:\/?#[\]@%]+)  # $11: URL.
+	  (>|&(?:gt|\#62|\#x3e);)  # $12: ">" end delimiter (or HTML entity).
+	| # Alternative 5: URL not delimited by (), [], {} or <>.
+	  (						   # $13: Prefix proving URL not already linked.
+		(?: ^				   # Can be a beginning of line or string, or
+		| [^=\s\'"\]]		   # a non-"=", non-quote, non-"]", followed by
+		) \s*[\'"]?			   # optional whitespace and optional quote;
+	  | [^=\s]\s+			   # or... a non-equals sign followed by whitespace.
+	  )						   # End $13. Non-prelinkified-proof prefix.
+	  ( \b					   # $14: Other non-delimited URL.
+		(?:ht|f)tps?:\/\/	   # Required literal http, https, ftp or ftps prefix.
+		[a-z0-9\-._~!$\'()*+,;=:\/?#[\]@%]+ # All URI chars except "&" (normal*).
+		(?:					   # Either on a "&" or at the end of URI.
+		  (?!				   # Allow a "&" char only if not start of an...
+			&(?:gt|\#0*62|\#x0*3e);					 # HTML ">" entity, or
+		  | &(?:amp|apos|quot|\#0*3[49]|\#x0*2[27]); # a [&\'"] entity if
+			[.!&\',:?;]?		# followed by optional punctuation then
+			(?:[^a-z0-9\-._~!$&\'()*+,;=:\/?#[\]@%]|$)	# a non-URI char or EOS.
+		  ) &				   # If neg-assertion true, match "&" (special).
+		  [a-z0-9\-._~!$\'()*+,;=:\/?#[\]@%]* # More non-& URI chars (normal*).
+		)*					   # Unroll-the-loop (special normal*)*.
+		[a-z0-9\-_~$()*+=\/#[\]@%]	# Last char can\'t be [.!&\',;:?]
+	  )						   # End $14. Other non-delimited URL.
+	/imx', array($this, '_linkify_callback'), $text);
+//	  $url_replace = '$1$4$7$10$13[url]$2$5$8$11$14[/url]$3$6$9$12';
     }
-    // Convert [&<>] characters to HTML entities (but preserve [""''] quotes).
-    $text = htmlspecialchars($text, ENT_NOQUOTES);
 
-    // Parse BBCode if globally enabled.
-    if ($feather_config['p_message_bbcode']) {
-        $text = preg_replace_callback($pd['re_bbcode'], '_parse_bbcode_callback', $text);
-    }
-    // Set $smile_on flag depending on global flags and whether or not this is a signature.
-    if ($pd['in_signature']) {
-        $smile_on = ($feather_config['o_smilies_sig'] && $feather->user->show_smilies && !$hide_smilies) ? 1 : 0;
-    } else {
-        $smile_on = ($feather_config['o_smilies'] && $feather->user->show_smilies && !$hide_smilies) ? 1 : 0;
-    }
-    // Split text into hidden and non-hidden chunks. Process the non-hidden content chunks.
-    $parts = explode("\1", $text); // Hidden chunks pre-marked like so: "\1\2<code.../code>\1"
-    for ($i = 0, $len = count($parts); $i < $len; ++$i) { // Loop through hidden and non-hidden text chunks.
-        $part =& $parts[$i];                                    // Use shortcut alias
-        if (empty($part)) {
-            continue;
-        }                                // Skip empty string chunks.
-        if ($part[0] !== "\2") { // If not hidden, process this normal text content.
-            if ($smile_on) { // If smileys enebled, do them all in one whack.
-                $part = preg_replace_callback($pd['re_smilies'], '_do_smilies_callback', $part);
+    private function _linkify_callback($m)
+    { // Only linkify valid urls.
+        $url = $m[2] . $m[5] . $m[8] . $m[11] . $m[14];
+        if (is_array($u = $this->feather->url->is_valid($url))) {
+            if (preg_match('%\.(?:jpe?g|gif|png)$%Si', $u['path_abempty'])) {
+                return    $m[1].$m[4].$m[7].$m[10].$m[13] .'[img]'. $u['url'] .'[/img]'. $m[3].$m[6].$m[9].$m[12];
+            } else {
+                return    $m[1].$m[4].$m[7].$m[10].$m[13] .'[url]'. $u['url'] .'[/url]'. $m[3].$m[6].$m[9].$m[12];
             }
-            // Deal with newlines, tabs and multiple spaces
-            $part = str_replace(
-                array("\n",        "\t",                '  ',        '  '),
-                array('<br />', '&#160; &#160; ',    '&#160; ',    ' &#160;'), $part);
         } else {
-            $part = substr($part, 1);
-        } // For hidden chunks, strip \2 marker byte.
-    }
-    $text = implode("", $parts); // Put hidden and non-hidden chunks back together.
-
-    // Add paragraph tag around post, but make sure there are no empty paragraphs
-    $text = str_replace('<p><br />', '<p>', $text);
-    $text = str_replace('<p></p>', '', '<p>'. $text .'</p>');
-    return $text;
-}
-//
-// Helper preg_replace_callback function for smilies processing.
-//
-function _do_smilies_callback($matches)
-{
-    global $pd;
-    return $pd['smilies'][$matches[0]]['html'];
-}
-//
-// Parse message text
-//
-function parse_message($text, $hide_smilies)
-{
-    global $pd, $feather_config;
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    $pd['in_signature'] = false;
-    // Disable images via the $bbcd['in_post'] flag if globally disabled.
-    if ($feather_config['p_message_img_tag'] !== '1' || $feather->user->show_img !== '1') {
-        if (isset($pd['bbcd']['img'])) {
-            $pd['bbcd']['img']['in_post'] = false;
-        }
-    }
-    return parse_bbcode($text, $hide_smilies);
-}
-//
-// Parse signature text
-//
-function parse_signature($text)
-{
-    global $pd, $feather_config;
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    $pd['in_signature'] = true;
-    // Disable images via the $bbcd['in_sig'] flag if globally disabled.
-    if ($feather_config['p_sig_img_tag'] !== '1' || $feather->user->show_img_sig !== '1') {
-        if (isset($pd['bbcd']['img'])) {
-            $pd['bbcd']['img']['in_sig'] = false;
+            return    $m[1].$m[4].$m[7].$m[10].$m[13].        $url.               $m[3].$m[6].$m[9].$m[12];
         }
     }
-    return parse_bbcode($text);
 }
diff --git a/featherbb/Model/Edit.php b/featherbb/Model/Edit.php
index 6513121c..e3e2faa5 100644
--- a/featherbb/Model/Edit.php
+++ b/featherbb/Model/Edit.php
@@ -58,8 +58,6 @@ public function get_info_edit($id)
 
     public function check_errors_before_edit($can_edit_subject, $errors)
     {
-        global $pd;
-
         $errors = $this->hook->fire('check_errors_before_edit_start', $errors);
 
         // If it's a topic it must contain a subject
@@ -93,8 +91,7 @@ public function check_errors_before_edit($can_edit_subject, $errors)
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
-            require FEATHER_ROOT.'featherbb/Helpers/parser.php';
-            $message = preparse_bbcode($message, $errors);
+            $message = $this->feather->parser->preparse_bbcode($message, $errors);
         }
 
         if (empty($errors)) {
@@ -118,8 +115,6 @@ public function check_errors_before_edit($can_edit_subject, $errors)
     // If the previous check went OK, setup some variables used later
     public function setup_variables($cur_post, $is_admmod, $can_edit_subject, $errors)
     {
-        global $pd;
-
         $this->hook->fire('setup_variables_start');
 
         $post = array();
@@ -135,8 +130,7 @@ public function setup_variables($cur_post, $is_admmod, $can_edit_subject, $error
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
-            require_once FEATHER_ROOT.'featherbb/Helpers/parser.php';
-            $post['message'] = preparse_bbcode($post['message'], $errors);
+            $post['message'] = $this->feather->parser->preparse_bbcode($post['message'], $errors);
         }
 
         // Replace four-byte characters (MySQL cannot handle them)
diff --git a/featherbb/Model/Moderate.php b/featherbb/Model/Moderate.php
index 70a6506d..7777d227 100644
--- a/featherbb/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -418,14 +418,10 @@ public function get_forum_list_move($id)
 
     public function display_posts_view($tid, $start_from)
     {
-        global $pd;
-
         $this->hook->fire('display_posts_view_start', $tid, $start_from);
 
         $post_data = array();
 
-        require FEATHER_ROOT.'featherbb/Helpers/parser.php';
-
         $post_count = 0; // Keep track of post numbers
 
         // Retrieve a list of post IDs, LIMIT is (really) expensive so we only fetch the IDs here then later fetch the remaining data
@@ -480,7 +476,7 @@ public function display_posts_view($tid, $start_from)
             }
 
             // Perform the main parsing of the message (BBCode, smilies, censor words etc)
-            $cur_post->message = parse_message($cur_post->message, $cur_post->hide_smilies);
+            $cur_post->message = $this->feather->parser->parse_message($cur_post->message, $cur_post->hide_smilies);
 
             $post_data[] = $cur_post;
         }
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
index a6ad59ff..92ab0169 100644
--- a/featherbb/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -164,8 +164,7 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
-            require FEATHER_ROOT.'featherbb/Helpers/parser.php';
-            $message = preparse_bbcode($message, $errors);
+            $message = $this->feather->parser->preparse_bbcode($message, $errors);
             $message = $this->hook->fire('check_errors_before_post_bbcode', $message);
         }
 
@@ -217,8 +216,7 @@ public function setup_variables($errors, $is_admmod)
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
-            require_once FEATHER_ROOT.'featherbb/Helpers/parser.php';
-            $post['message']  = preparse_bbcode($post['message'], $errors);
+            $post['message']  = $this->feather->parser->preparse_bbcode($post['message'], $errors);
         }
 
         // Replace four-byte characters (MySQL cannot handle them)
@@ -871,14 +869,10 @@ public function get_checkboxes($fid, $is_admmod, $is_subscribed)
     // Display the topic review if needed
     public function topic_review($tid)
     {
-        global $pd;
-
         $post_data = array();
 
         $post_data = $this->hook->fire('topic_review_start', $post_data, $tid);
 
-        require_once FEATHER_ROOT.'featherbb/Helpers/parser.php';
-
         $select_topic_review = array('poster', 'message', 'hide_smilies', 'posted');
 
         $result = DB::for_table('posts')->select_many($select_topic_review)
@@ -888,7 +882,7 @@ public function topic_review($tid)
         $result = $result->find_many();
 
         foreach($result as $cur_post) {
-            $cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
+            $cur_post['message'] = $this->feather->parser->parse_message($cur_post['message'], $cur_post['hide_smilies']);
             $post_data[] = $cur_post;
         }
 
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index 4b785929..8a217d24 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -759,8 +759,6 @@ public function fetch_user_group($id)
 
     public function update_profile($id, $info, $section)
     {
-        global $pd;
-
         $info = $this->hook->fire('update_profile_start', $info, $id, $section);
 
         $username_updated = false;
@@ -905,11 +903,9 @@ public function update_profile($id, $info, $section)
 
                     // Validate BBCode syntax
                     if ($this->config['p_sig_bbcode'] == '1') {
-                        require FEATHER_ROOT.'featherbb/Helpers/parser.php';
-
                         $errors = array();
 
-                        $form['signature'] = preparse_bbcode($form['signature'], $errors, true);
+                        $form['signature'] = $this->feather->parser->preparse_bbcode($form['signature'], $errors, true);
 
                         if (count($errors) > 0) {
                             message('<ul><li>'.implode('</li><li>', $errors).'</li></ul>');
diff --git a/featherbb/Model/Search.php b/featherbb/Model/Search.php
index 3253ca00..5d5c6cea 100644
--- a/featherbb/Model/Search.php
+++ b/featherbb/Model/Search.php
@@ -690,8 +690,6 @@ public function get_search_results()
 
     public function display_search_results($search)
     {
-        global $pd;
-
         $search = $this->hook->fire('display_search_results_start', $search);
 
         // Get topic/forum tracking data
@@ -726,7 +724,7 @@ public function display_search_results($search)
                     $cur_search['message'] = censor_words($cur_search['message']);
                 }
 
-                $cur_search['message'] = parse_message($cur_search['message'], $cur_search['hide_smilies']);
+                $cur_search['message'] = $this->feather->parser->parse_message($cur_search['message'], $cur_search['hide_smilies']);
                 $pposter = $this->feather->utils->escape($cur_search['pposter']);
 
                 if ($cur_search['poster_id'] > 1 && $this->user->g_view_users == '1') {
diff --git a/featherbb/Model/Viewtopic.php b/featherbb/Model/Viewtopic.php
index 60649dfc..835f76ac 100644
--- a/featherbb/Model/Viewtopic.php
+++ b/featherbb/Model/Viewtopic.php
@@ -222,8 +222,6 @@ public function get_subscraction($is_subscribed, $topic_id)
     // Prints the posts
     public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
     {
-        global $pd;
-
         $post_data = array();
 
         $post_data = $this->hook->fire('print_posts_start', $post_data, $topic_id, $start_from, $cur_topic, $is_admmod);
@@ -387,14 +385,14 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
             }
 
             // Perform the main parsing of the message (BBCode, smilies, censor words etc)
-            $cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
+            $cur_post['message'] = $this->feather->parser->parse_message($cur_post['message'], $cur_post['hide_smilies']);
 
             // Do signature parsing/caching
             if ($this->config['o_signatures'] == '1' && $cur_post['signature'] != '' && $this->user->show_sig != '0') {
                 if (isset($avatar_cache[$cur_post['poster_id']])) {
                     $cur_post['signature_formatted'] = $avatar_cache[$cur_post['poster_id']];
                 } else {
-                    $cur_post['signature_formatted'] = parse_signature($cur_post['signature']);
+                    $cur_post['signature_formatted'] = $this->feather->parser->parse_signature($cur_post['signature']);
                     $avatar_cache[$cur_post['poster_id']] = $cur_post['signature_formatted'];
                 }
             }

From 1786e7478c4ea7f351c98755d53346f9cc445b3a Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 5 Sep 2015 20:05:41 +0200
Subject: [PATCH 298/353] Rebrand new parser

---
 featherbb/Helpers/parser.php | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/featherbb/Helpers/parser.php b/featherbb/Helpers/parser.php
index 591463be..1c396441 100644
--- a/featherbb/Helpers/parser.php
+++ b/featherbb/Helpers/parser.php
@@ -1,14 +1,12 @@
 <?php
 
-// parser.php Rev:20110413_1700
-/*---
-
-Copyright (C) 2008-2011 FluxBB.org
-New 2011 parser code copyright (C) 2011 Jeff Roberson (jmrware.com).
-based on code copyright (C) 2002-2005 Rickard Andersson
-License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
-
----*/
+/**
+ * Copyright (C) 2015 FeatherBB
+ * Parser (C) 2011 Jeff Roberson (jmrware.com)
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
 
 namespace FeatherBB;
 
@@ -16,7 +14,7 @@
 if (!defined('FEATHER'))
     exit;
 
-define('FEATHER_PARSER', '11-Feb-2011 13:33');
+define('FEATHER_PARSER', 1);
 
 // !!!! AVOIDING PCRE STACK OVERFLOWS WHICH SEG-FAULT CRASH APACHE/PHP !!!!
 // By default, PHP sets up pcre.recursion_limit way too high (100000). According
@@ -45,8 +43,8 @@ class Parser
 {
     public static function compile()
     {
-        require_once (PARSER_ROOT.'bbcd_source.php');
-        require_once (PARSER_ROOT.'bbcd_compile.php');
+        require(PARSER_ROOT.'bbcd_source.php');
+        require(PARSER_ROOT.'bbcd_compile.php');
         return $pd;
     }
 
@@ -54,10 +52,10 @@ public static function compile()
 
     public function __construct($pd = null)
     {
-        if (!isset($pd))
-            $pd = Parser::compile();
+        if (!isset($pd)) {
+            $this->pd = Parser::compile();
+        }
 
-        $this->pd = $pd;
         $this->feather = \Slim\Slim::getInstance();
     }
 

From f479075950647c7b9423c116e4e68ba340bd8875 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 5 Sep 2015 20:16:10 +0200
Subject: [PATCH 299/353] Typo

---
 featherbb/Helpers/parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/featherbb/Helpers/parser.php b/featherbb/Helpers/parser.php
index 1c396441..4ce4aaf4 100644
--- a/featherbb/Helpers/parser.php
+++ b/featherbb/Helpers/parser.php
@@ -1051,7 +1051,7 @@ private function _parse_bbcode_callback($matches)
                             $format = '{<a href="%c_str%" title="%a_str%">'.__('Image link').'</a>}';
                         else
                             $format = '{<a href="%c_str%" title="'.__('BBmsg images disabled').'">'.__('Image link').'</a>}';
-                        $enabled = true; // Re-enable to override defauslt disabled handling (i.e. dont delete.)
+                        $enabled = true; // Re-enable to override default disabled handling (i.e. dont delete.)
                     }
                 }
                 else

From 94e55bc1237799e321be8896cbc34fff0c570af8 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 5 Sep 2015 23:10:09 +0200
Subject: [PATCH 300/353] Typo

---
 featherbb/Helpers/parser.php | 40 ++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/featherbb/Helpers/parser.php b/featherbb/Helpers/parser.php
index 4ce4aaf4..09ab7cca 100644
--- a/featherbb/Helpers/parser.php
+++ b/featherbb/Helpers/parser.php
@@ -208,7 +208,7 @@ private function _preparse_bbcode_callback($matches)
             if ($contents === null) // On error, preg_replace_callback returns NULL.
 
             { // Error #1: '(%s) Message is too long or too complex. Please shorten.'
-                $new_errors[] = sprintf(__('BBerr pcre', preg_error()));
+                $new_errors[] = sprintf(__('BBerr pcre'), preg_error());
                 $contents = ''; // Zero out the contents.
             }
         }
@@ -252,12 +252,12 @@ private function _preparse_bbcode_callback($matches)
             { // Otherwise we have an erroneous attribute which is either unexpected or unrecognized.
                 // Error #2: 'Unexpected attribute: "%1$s". (No attribute allowed for [%2$s].'.
                 $handler = &$this->pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-                $new_errors[] = sprintf(__('BBerr unexpected attribute', $attribute, $tagname));
+                $new_errors[] = sprintf(__('BBerr unexpected attribute'), $attribute, $tagname);
             }
             else
             { // Error #3: 'Unrecognized attribute: "%1$s", is not valid for [%2$s].'
                 $handler = &$this->pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-                $new_errors[] = sprintf(__('BBerr unrecognized attribute', $attribute, $tagname));
+                $new_errors[] = sprintf(__('BBerr unrecognized attribute'), $attribute, $tagname);
             }
 
             // Make sure attribute does nor contain a valid BBcode tag.
@@ -276,7 +276,7 @@ private function _preparse_bbcode_callback($matches)
                 }
                 else
                 { // Error #4b: 'Invalid attribute, [%s] requires specific attribute.'
-                    $new_errors[] = sprintf(__('BBerr invalid attrib', $tagname));
+                    $new_errors[] = sprintf(__('BBerr invalid attrib'), $tagname);
                 }
             }
         }
@@ -291,7 +291,7 @@ private function _preparse_bbcode_callback($matches)
             else
             { // Error #5: '[%1$s] is missing a required attribute.'.
                 $handler = &$this->pd['bbcd']['_ROOT_']['handlers']['NO_ATTRIB'];
-                $new_errors[] = sprintf(__('BBerr missing attribute', $tagname));
+                $new_errors[] = sprintf(__('BBerr missing attribute'), $tagname);
             }
         }
 
@@ -310,7 +310,7 @@ private function _preparse_bbcode_callback($matches)
                     $fmt_open = $fmt_close = '';
                     break;
                 case 'err': // Error #6: '[%1$s] tag nesting depth: %2$d exceeds allowable limit: %3$d.'.
-                    $new_errors[] = sprintf(__('BBerr nesting overflow', $tagname, $tag['depth'], $tag['depth_max']));
+                    $new_errors[] = sprintf(__('BBerr nesting overflow'), $tagname, $tag['depth'], $tag['depth_max']);
                     break;
                 default:
             }
@@ -322,18 +322,18 @@ private function _preparse_bbcode_callback($matches)
             // Yes. Pick between error #6 and #7.
             if ($parent === $tagname)
             { // Error #7: '[%s] was opened within itself, this is not allowed.'
-                $new_errors[] = sprintf(__('BBerr self-nesting', $tagname));
+                $new_errors[] = sprintf(__('BBerr self-nesting'), $tagname);
             }
             else
             { // Error #8: '[%1$s] was opened within [%2$s], this is not allowed.'
-                $new_errors[] = sprintf(__('BBerr invalid nesting', $tagname, $parent));
+                $new_errors[] = sprintf(__('BBerr invalid nesting'), $tagname, $parent);
             }
         }
 
         // Verify our parent tag is in our 'parents' allowable array if it exists.
         if (isset($tag['parents']) && !isset($tag['parents'][$parent]))
         { // Error #9: '[%1$s] cannot be within: [%2$s]. Allowable parent tags: %3$s.'.
-            $new_errors[] = sprintf(__('BBerr invalid parent', $tagname, $parent, '('.implode('), (', array_keys($tag['parents'])).')'));
+            $new_errors[] = sprintf(__('BBerr invalid parent'), $tagname, $parent, '('.implode('), (', array_keys($tag['parents'])).')');
         }
 
         // -----------------------------------------
@@ -371,7 +371,7 @@ private function _preparse_bbcode_callback($matches)
                 }
                 else
                 { // Error #10a: 'Invalid URL name: %s'.
-                    $new_errors[] = sprintf(__('BBerr Invalid URL name', $contents));
+                    $new_errors[] = sprintf(__('BBerr Invalid URL name'), $contents);
                 }
                 break;
 
@@ -379,7 +379,7 @@ private function _preparse_bbcode_callback($matches)
                 // TODO: improve this quick-n-dirty email check.
                 if (!preg_match('/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,6}$/i', $contents))
                 { // Error #10c: 'Invalid email address: %s'.
-                    $new_errors[] = sprintf(__('BBerr Invalid email address', $contents));
+                    $new_errors[] = sprintf(__('BBerr Invalid email address'), $contents);
                 }
                 break;
 
@@ -418,14 +418,14 @@ private function _preparse_bbcode_callback($matches)
                 }
                 else
                 { // Error #10b: 'Invalid URL name: %s'.
-                    $new_errors[] = sprintf(__('BBerr Invalid URL name', $attribute));
+                    $new_errors[] = sprintf(__('BBerr Invalid URL name'), $attribute);
                 }
                 break;
 
             case 'color':
                 if (!preg_match($this->pd['re_color'], $attribute))
                 { // Error #11: 'Invalid color attribute: %s'.
-                    $new_errors[] = sprintf(__('BBerr Invalid color', $attribute));
+                    $new_errors[] = sprintf(__('BBerr Invalid color'), $attribute);
                 }
                 break;
 
@@ -433,7 +433,7 @@ private function _preparse_bbcode_callback($matches)
                 // TODO: improve this quick-n-dirty email check.
                 if (!preg_match('/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,6}$/i', $attribute))
                 { // Error #10c: 'Invalid email address: %s'.
-                    $new_errors[] = sprintf(__('BBerr Invalid email address', $attribute));
+                    $new_errors[] = sprintf(__('BBerr Invalid email address'), $attribute);
                 }
                 break;
 
@@ -499,7 +499,7 @@ private function _preparse_bbcode_callback($matches)
                                             }
                                             else
                                             { // Error #13: 'Unable to retrieve image data from remote url: %s'.
-                                                $new_errors[] = sprintf(__('BBerr bad meta data', $contents));
+                                                $new_errors[] = sprintf(__('BBerr bad meta data'), $contents);
                                             } // NOTE: cannot generate this error.
                                         }
                                         else
@@ -531,7 +531,7 @@ private function _preparse_bbcode_callback($matches)
                             }
                             else
                             { // Error #16: 'Bad HTTP response header: "%s"'.
-                                $new_errors[] = sprintf(__('BBerr bad http response', $http[0]));
+                                $new_errors[] = sprintf(__('BBerr bad http response'), $http[0]);
                             }
                         }
                         else
@@ -663,7 +663,7 @@ private function _preparse_bbcode_callback($matches)
                 $contents = $m[1];
             else
             { // Error #12: 'Invalid content, [%s] requires specific content.'
-                $new_errors[] = sprintf(__('BBerr invalid content', $tagname));
+                $new_errors[] = sprintf(__('BBerr invalid content'), $tagname);
             }
         }
         // Silently strip empty or all-white tags:
@@ -741,7 +741,7 @@ function preparse_bbcode($text, &$errors, $is_signature = false)
         if ($newtext === null)
         { // On error, preg_replace_callback returns NULL.
             // Error #1: '(%s) Message is too long or too complex. Please shorten.'
-            $errors[] = sprintf(__('BBerr pcre', preg_error()));
+            $errors[] = sprintf(__('BBerr pcre'), preg_error());
             return $text;
         }
         $newtext = str_replace("\3", '[', $newtext); // Fixup CODE sections.
@@ -796,11 +796,11 @@ private function _orphan_callback($matches)
     {
         if ($matches[0][1] === '/')
         { // Error #18: 'Orphan close tag: [/%s] is missing its open tag.'
-            $errmsg = sprintf(__('BBerr orphan close', $matches[1]));
+            $errmsg = sprintf(__('BBerr orphan close'), $matches[1]);
         }
         else
         { // Error #19: 'Orphan open tag: [%s] is missing its close tag.'
-            $errmsg = sprintf(__('BBerr orphan open', $matches[1]));
+            $errmsg = sprintf(__('BBerr orphan open'), $matches[1]);
         }
         $this->pd['new_errors'][] = $errmsg; // Append to array of errors so far.
         return '[err='.$errmsg.']'.$matches[0].'[/err]';

From 88ed73934e81af78fa845e78b305a8b0172acb9d Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 5 Sep 2015 23:15:02 +0200
Subject: [PATCH 301/353] Restore the "No links" permission + Suppress errors

---
 featherbb/Helpers/parser.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/featherbb/Helpers/parser.php b/featherbb/Helpers/parser.php
index 09ab7cca..fb49396f 100644
--- a/featherbb/Helpers/parser.php
+++ b/featherbb/Helpers/parser.php
@@ -365,7 +365,10 @@ private function _preparse_bbcode_callback($matches)
                 // Sanitize contents which is (hopefully) a url link. Trim spaces.
                 $contents = preg_replace(array('/^\s+/', '/\s+$/S'), '', $contents);
                 // Handle special case link to a
-                if (($m = $this->feather->url->is_valid($contents)))
+                if ($this->feather->user->g_post_links != '1') {
+                    $new_errors[] = __('BBerr cannot post URLs');
+                }
+                else if (($m = $this->feather->url->is_valid($contents)))
                 {
                     $contents = $m['url']; // Fetch possibly more complete url address.
                 }
@@ -453,7 +456,7 @@ private function _preparse_bbcode_callback($matches)
                     { // Valid URI?
                         // Yes. Fetch file headers containing file type and size ("Content-Type" and "Content-Length").
                         // ??? Should this call to get_headers have an @ in case of weird errors?
-                        if (($http = get_headers($contents)) !== false && is_array($http))
+                        if (($http = @get_headers($contents)) !== false && is_array($http))
                         {
                             if (preg_match('/\b200\s++OK\s*+$/i', $http[0]))
                             { // Good response header?

From 01715f0c6f32d05d809dab6face2c60d3543ad9a Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 5 Sep 2015 23:21:10 +0200
Subject: [PATCH 302/353] Restore the "No links" permission

---
 featherbb/Helpers/parser.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/featherbb/Helpers/parser.php b/featherbb/Helpers/parser.php
index fb49396f..fdbc621c 100644
--- a/featherbb/Helpers/parser.php
+++ b/featherbb/Helpers/parser.php
@@ -415,7 +415,10 @@ private function _preparse_bbcode_callback($matches)
                 break;
 
             case 'url':
-                if (($m = $this->feather->url->is_valid($attribute)))
+                if ($this->feather->user->g_post_links != '1') {
+                    $new_errors[] = __('BBerr cannot post URLs');
+                }
+                else if (($m = $this->feather->url->is_valid($attribute)))
                 {
                     $attribute = $m['url']; // Fetch possibly more complete url address.
                 }

From be211a9f91396b7dbaa53d5bfea5bc1bbe8305a5 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 5 Sep 2015 23:26:24 +0200
Subject: [PATCH 303/353]  Make sure no one attempts to run this script
 "directly"

---
 featherbb/Core/AdminUtils.php | 4 ++++
 featherbb/Core/Auth.php       | 4 ++++
 featherbb/Core/Core.php       | 4 ++++
 featherbb/Core/Csrf.php       | 4 ++++
 featherbb/Core/Database.php   | 4 ++++
 featherbb/Core/Email.php      | 4 ++++
 featherbb/Core/Error.php      | 4 ++++
 featherbb/Core/Hooks.php      | 4 ++++
 featherbb/Core/Lister.php     | 4 ++++
 featherbb/Core/Plugin.php     | 4 ++++
 featherbb/Core/Search.php     | 4 ++++
 featherbb/Core/Url.php        | 4 ++++
 featherbb/Core/Utils.php      | 4 ++++
 featherbb/Core/View.php       | 4 ++++
 14 files changed, 56 insertions(+)

diff --git a/featherbb/Core/AdminUtils.php b/featherbb/Core/AdminUtils.php
index 06117f74..1c63d731 100644
--- a/featherbb/Core/AdminUtils.php
+++ b/featherbb/Core/AdminUtils.php
@@ -9,6 +9,10 @@
 
 namespace FeatherBB;
 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER'))
+    exit;
+
 class AdminUtils
 {
 
diff --git a/featherbb/Core/Auth.php b/featherbb/Core/Auth.php
index a9723a8a..a86130ed 100644
--- a/featherbb/Core/Auth.php
+++ b/featherbb/Core/Auth.php
@@ -15,6 +15,10 @@
 
 use DB;
 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER'))
+    exit;
+
 class Auth extends \Slim\Middleware
 {
     protected $model;
diff --git a/featherbb/Core/Core.php b/featherbb/Core/Core.php
index cc5e6ef5..ac1bb666 100644
--- a/featherbb/Core/Core.php
+++ b/featherbb/Core/Core.php
@@ -14,6 +14,10 @@
 namespace FeatherBB;
 use DB;
 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER'))
+    exit;
+
 class Core extends \Slim\Middleware
 {
     protected $forum_env,
diff --git a/featherbb/Core/Csrf.php b/featherbb/Core/Csrf.php
index 823dd96e..a914f8d9 100644
--- a/featherbb/Core/Csrf.php
+++ b/featherbb/Core/Csrf.php
@@ -9,6 +9,10 @@
 
 namespace FeatherBB;
 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER'))
+    exit;
+
 class Csrf extends \Slim\Middleware
 {
     protected $key,
diff --git a/featherbb/Core/Database.php b/featherbb/Core/Database.php
index 2423f784..4ffcedc0 100644
--- a/featherbb/Core/Database.php
+++ b/featherbb/Core/Database.php
@@ -1,5 +1,9 @@
 <?php
 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER'))
+    exit;
+
     /**
      *
      * Idiorm
diff --git a/featherbb/Core/Email.php b/featherbb/Core/Email.php
index 7b51f38e..cb1b6470 100644
--- a/featherbb/Core/Email.php
+++ b/featherbb/Core/Email.php
@@ -9,6 +9,10 @@
 
 namespace FeatherBB;
 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER'))
+    exit;
+
 class Email
 {
     public function __construct()
diff --git a/featherbb/Core/Error.php b/featherbb/Core/Error.php
index 4616f8b5..4e1a1eee 100644
--- a/featherbb/Core/Error.php
+++ b/featherbb/Core/Error.php
@@ -9,6 +9,10 @@
 
 namespace FeatherBB;
 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER'))
+    exit;
+
 class Error extends \Exception
 {
     public function __construct($message, $code = 200)
diff --git a/featherbb/Core/Hooks.php b/featherbb/Core/Hooks.php
index 8cefd9b4..919ff068 100644
--- a/featherbb/Core/Hooks.php
+++ b/featherbb/Core/Hooks.php
@@ -9,6 +9,10 @@
 
 namespace FeatherBB;
 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER'))
+    exit;
+
 class Hooks extends \Slim\Slim
 {
     /**
diff --git a/featherbb/Core/Lister.php b/featherbb/Core/Lister.php
index 2e879a7b..0d32ddbd 100644
--- a/featherbb/Core/Lister.php
+++ b/featherbb/Core/Lister.php
@@ -9,6 +9,10 @@
 
 namespace FeatherBB;
 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER'))
+    exit;
+
 class Lister
 {
     /**
diff --git a/featherbb/Core/Plugin.php b/featherbb/Core/Plugin.php
index 2a74e4b6..382dcea7 100644
--- a/featherbb/Core/Plugin.php
+++ b/featherbb/Core/Plugin.php
@@ -11,6 +11,10 @@
 
 use DB;
 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER'))
+    exit;
+
 class Plugin
 {
     /**
diff --git a/featherbb/Core/Search.php b/featherbb/Core/Search.php
index 64c114e3..8e39109c 100644
--- a/featherbb/Core/Search.php
+++ b/featherbb/Core/Search.php
@@ -13,6 +13,10 @@
 namespace FeatherBB;
 use DB;
 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER'))
+    exit;
+
 class Search
 {
     public function __construct()
diff --git a/featherbb/Core/Url.php b/featherbb/Core/Url.php
index ae7a5730..2baaf81b 100644
--- a/featherbb/Core/Url.php
+++ b/featherbb/Core/Url.php
@@ -9,6 +9,10 @@
 
 namespace FeatherBB;
 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER'))
+    exit;
+
 class Url
 {
     protected $url_replace = array(
diff --git a/featherbb/Core/Utils.php b/featherbb/Core/Utils.php
index 3ea29c8e..731d307c 100644
--- a/featherbb/Core/Utils.php
+++ b/featherbb/Core/Utils.php
@@ -9,6 +9,10 @@
 
 namespace FeatherBB;
 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER'))
+    exit;
+
 class Utils
 {
     public function __construct()
diff --git a/featherbb/Core/View.php b/featherbb/Core/View.php
index 0a0efc1e..c1ce0bf6 100644
--- a/featherbb/Core/View.php
+++ b/featherbb/Core/View.php
@@ -9,6 +9,10 @@
 
 namespace FeatherBB;
 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER'))
+    exit;
+
 class View
 {
     protected $templatesDirectory,

From 35098a0599eb77abced6dada32ff269a8da64d56 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sat, 5 Sep 2015 23:29:19 +0200
Subject: [PATCH 304/353] Revert Make sure no one attempts to run this script
 "directly"

---
 featherbb/Core/AdminUtils.php | 4 ----
 featherbb/Core/Auth.php       | 4 ----
 featherbb/Core/Core.php       | 4 ----
 featherbb/Core/Csrf.php       | 4 ----
 featherbb/Core/Database.php   | 4 ----
 featherbb/Core/Email.php      | 4 ----
 featherbb/Core/Error.php      | 4 ----
 featherbb/Core/Hooks.php      | 4 ----
 featherbb/Core/Lister.php     | 4 ----
 featherbb/Core/Plugin.php     | 4 ----
 featherbb/Core/Search.php     | 4 ----
 featherbb/Core/Url.php        | 4 ----
 featherbb/Core/Utils.php      | 4 ----
 featherbb/Core/View.php       | 4 ----
 14 files changed, 56 deletions(-)

diff --git a/featherbb/Core/AdminUtils.php b/featherbb/Core/AdminUtils.php
index 1c63d731..06117f74 100644
--- a/featherbb/Core/AdminUtils.php
+++ b/featherbb/Core/AdminUtils.php
@@ -9,10 +9,6 @@
 
 namespace FeatherBB;
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER'))
-    exit;
-
 class AdminUtils
 {
 
diff --git a/featherbb/Core/Auth.php b/featherbb/Core/Auth.php
index a86130ed..a9723a8a 100644
--- a/featherbb/Core/Auth.php
+++ b/featherbb/Core/Auth.php
@@ -15,10 +15,6 @@
 
 use DB;
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER'))
-    exit;
-
 class Auth extends \Slim\Middleware
 {
     protected $model;
diff --git a/featherbb/Core/Core.php b/featherbb/Core/Core.php
index ac1bb666..cc5e6ef5 100644
--- a/featherbb/Core/Core.php
+++ b/featherbb/Core/Core.php
@@ -14,10 +14,6 @@
 namespace FeatherBB;
 use DB;
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER'))
-    exit;
-
 class Core extends \Slim\Middleware
 {
     protected $forum_env,
diff --git a/featherbb/Core/Csrf.php b/featherbb/Core/Csrf.php
index a914f8d9..823dd96e 100644
--- a/featherbb/Core/Csrf.php
+++ b/featherbb/Core/Csrf.php
@@ -9,10 +9,6 @@
 
 namespace FeatherBB;
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER'))
-    exit;
-
 class Csrf extends \Slim\Middleware
 {
     protected $key,
diff --git a/featherbb/Core/Database.php b/featherbb/Core/Database.php
index 4ffcedc0..2423f784 100644
--- a/featherbb/Core/Database.php
+++ b/featherbb/Core/Database.php
@@ -1,9 +1,5 @@
 <?php
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER'))
-    exit;
-
     /**
      *
      * Idiorm
diff --git a/featherbb/Core/Email.php b/featherbb/Core/Email.php
index cb1b6470..7b51f38e 100644
--- a/featherbb/Core/Email.php
+++ b/featherbb/Core/Email.php
@@ -9,10 +9,6 @@
 
 namespace FeatherBB;
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER'))
-    exit;
-
 class Email
 {
     public function __construct()
diff --git a/featherbb/Core/Error.php b/featherbb/Core/Error.php
index 4e1a1eee..4616f8b5 100644
--- a/featherbb/Core/Error.php
+++ b/featherbb/Core/Error.php
@@ -9,10 +9,6 @@
 
 namespace FeatherBB;
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER'))
-    exit;
-
 class Error extends \Exception
 {
     public function __construct($message, $code = 200)
diff --git a/featherbb/Core/Hooks.php b/featherbb/Core/Hooks.php
index 919ff068..8cefd9b4 100644
--- a/featherbb/Core/Hooks.php
+++ b/featherbb/Core/Hooks.php
@@ -9,10 +9,6 @@
 
 namespace FeatherBB;
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER'))
-    exit;
-
 class Hooks extends \Slim\Slim
 {
     /**
diff --git a/featherbb/Core/Lister.php b/featherbb/Core/Lister.php
index 0d32ddbd..2e879a7b 100644
--- a/featherbb/Core/Lister.php
+++ b/featherbb/Core/Lister.php
@@ -9,10 +9,6 @@
 
 namespace FeatherBB;
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER'))
-    exit;
-
 class Lister
 {
     /**
diff --git a/featherbb/Core/Plugin.php b/featherbb/Core/Plugin.php
index 382dcea7..2a74e4b6 100644
--- a/featherbb/Core/Plugin.php
+++ b/featherbb/Core/Plugin.php
@@ -11,10 +11,6 @@
 
 use DB;
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER'))
-    exit;
-
 class Plugin
 {
     /**
diff --git a/featherbb/Core/Search.php b/featherbb/Core/Search.php
index 8e39109c..64c114e3 100644
--- a/featherbb/Core/Search.php
+++ b/featherbb/Core/Search.php
@@ -13,10 +13,6 @@
 namespace FeatherBB;
 use DB;
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER'))
-    exit;
-
 class Search
 {
     public function __construct()
diff --git a/featherbb/Core/Url.php b/featherbb/Core/Url.php
index 2baaf81b..ae7a5730 100644
--- a/featherbb/Core/Url.php
+++ b/featherbb/Core/Url.php
@@ -9,10 +9,6 @@
 
 namespace FeatherBB;
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER'))
-    exit;
-
 class Url
 {
     protected $url_replace = array(
diff --git a/featherbb/Core/Utils.php b/featherbb/Core/Utils.php
index 731d307c..3ea29c8e 100644
--- a/featherbb/Core/Utils.php
+++ b/featherbb/Core/Utils.php
@@ -9,10 +9,6 @@
 
 namespace FeatherBB;
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER'))
-    exit;
-
 class Utils
 {
     public function __construct()
diff --git a/featherbb/Core/View.php b/featherbb/Core/View.php
index c1ce0bf6..0a0efc1e 100644
--- a/featherbb/Core/View.php
+++ b/featherbb/Core/View.php
@@ -9,10 +9,6 @@
 
 namespace FeatherBB;
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER'))
-    exit;
-
 class View
 {
     protected $templatesDirectory,

From 63c09c62e7facf97b085f152617b11a62626c759 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 00:11:02 +0200
Subject: [PATCH 305/353] Use utils::

---
 extern.php                                    |   50 +-
 featherbb/Controller/Admin/Bans.php           |   10 +-
 featherbb/Controller/Admin/Categories.php     |    8 +-
 featherbb/Controller/Admin/Censoring.php      |    4 +-
 featherbb/Controller/Admin/Forums.php         |   16 +-
 featherbb/Controller/Admin/Groups.php         |   10 +-
 featherbb/Controller/Admin/Index.php          |    4 +-
 featherbb/Controller/Admin/Maintenance.php    |   10 +-
 featherbb/Controller/Admin/Options.php        |    4 +-
 featherbb/Controller/Admin/Parser.php         |    4 +-
 featherbb/Controller/Admin/Permissions.php    |    4 +-
 featherbb/Controller/Admin/Plugins.php        |   14 +-
 featherbb/Controller/Admin/Reports.php        |    4 +-
 featherbb/Controller/Admin/Statistics.php     |    4 +-
 featherbb/Controller/Admin/Users.php          |   16 +-
 featherbb/Controller/Auth.php                 |   22 +-
 featherbb/Controller/Delete.php               |    4 +-
 featherbb/Controller/Edit.php                 |    4 +-
 featherbb/Controller/Help.php                 |    4 +-
 featherbb/Controller/Index.php                |    4 +-
 featherbb/Controller/Install.php              |   12 +-
 featherbb/Controller/Login.php                |    6 +-
 featherbb/Controller/Misc.php                 |    8 +-
 featherbb/Controller/Moderate.php             |   20 +-
 featherbb/Controller/Post.php                 |    4 +-
 featherbb/Controller/Profile.php              |   28 +-
 featherbb/Controller/Register.php             |    6 +-
 featherbb/Controller/Search.php               |    6 +-
 featherbb/Controller/Userlist.php             |    6 +-
 featherbb/Controller/Viewforum.php            |    4 +-
 featherbb/Controller/Viewtopic.php            |    4 +-
 featherbb/Core/AdminUtils.php                 |    8 +-
 featherbb/Core/Auth.php                       |    7 +-
 featherbb/Core/Core.php                       |    2 +-
 featherbb/Core/Email.php                      |   18 +-
 featherbb/Core/Search.php                     |    6 +-
 featherbb/Core/Url.php                        | 1155 +++++-----
 featherbb/Core/Utils.php                      |   18 +-
 featherbb/Core/View.php                       |    6 +-
 featherbb/Helpers/functions.php               |   12 +-
 featherbb/Model/Admin/Bans.php                |   25 +-
 featherbb/Model/Admin/Categories.php          |    1 +
 featherbb/Model/Admin/Censoring.php           |    9 +-
 featherbb/Model/Admin/Forums.php              |    1 +
 featherbb/Model/Admin/Groups.php              |   17 +-
 featherbb/Model/Admin/Maintenance.php         |    9 +-
 featherbb/Model/Admin/Options.php             |   47 +-
 featherbb/Model/Admin/Parser.php              |    1 +
 featherbb/Model/Admin/Permissions.php         |    1 +
 featherbb/Model/Admin/Reports.php             |    1 +
 featherbb/Model/Admin/Statistics.php          |    1 +
 featherbb/Model/Admin/Users.php               |   23 +-
 featherbb/Model/Auth.php                      |    3 +-
 featherbb/Model/Cache.php                     |    1 +
 featherbb/Model/Debug.php                     |    7 +-
 featherbb/Model/Delete.php                    |    1 +
 featherbb/Model/Edit.php                      |   25 +-
 featherbb/Model/Header.php                    |    1 +
 featherbb/Model/Index.php                     |   19 +-
 featherbb/Model/Install.php                   |    3 +-
 featherbb/Model/Login.php                     |   21 +-
 featherbb/Model/Misc.php                      |   13 +-
 featherbb/Model/Moderate.php                  |   27 +-
 featherbb/Model/Post.php                      |   47 +-
 featherbb/Model/Profile.php                   |  109 +-
 featherbb/Model/Register.php                  |   15 +-
 featherbb/Model/Search.php                    |   39 +-
 featherbb/Model/Userlist.php                  |    5 +-
 featherbb/Model/Viewforum.php                 |    9 +-
 featherbb/Model/Viewtopic.php                 |   23 +-
 featherbb/routes.php                          |    2 +-
 .../FeatherBB/view/admin/bans/add_ban.php     |   10 +-
 .../FeatherBB/view/admin/bans/admin_bans.php  |    2 +
 .../FeatherBB/view/admin/bans/search_ban.php  |   12 +-
 .../FeatherBB/view/admin/categories.php       |    6 +-
 .../themes/FeatherBB/view/admin/censoring.php |    4 +-
 .../view/admin/forums/admin_forums.php        |    8 +-
 .../view/admin/forums/delete_forum.php        |    2 +
 .../view/admin/forums/permissions.php         |   12 +-
 .../view/admin/groups/add_edit_group.php      |    8 +-
 .../view/admin/groups/admin_groups.php        |   12 +-
 .../view/admin/groups/confirm_delete.php      |    4 +-
 .../view/admin/groups/delete_group.php        |    4 +-
 style/themes/FeatherBB/view/admin/index.php   |    2 +
 style/themes/FeatherBB/view/admin/loader.php  |    2 +
 .../admin/maintenance/admin_maintenance.php   |    2 +
 .../view/admin/maintenance/prune.php          |    4 +-
 .../view/admin/maintenance/rebuild.php        |    2 +
 style/themes/FeatherBB/view/admin/menu.php    |    2 +
 style/themes/FeatherBB/view/admin/options.php |   34 +-
 style/themes/FeatherBB/view/admin/parser.php  |   10 +-
 .../FeatherBB/view/admin/permissions.php      |    2 +
 style/themes/FeatherBB/view/admin/plugins.php |    2 +
 style/themes/FeatherBB/view/admin/reports.php |   12 +-
 .../FeatherBB/view/admin/statistics.php       |    4 +-
 .../view/admin/users/admin_users.php          |    2 +
 .../FeatherBB/view/admin/users/ban_users.php  |    2 +
 .../view/admin/users/delete_users.php         |    2 +
 .../FeatherBB/view/admin/users/find_users.php |   10 +-
 .../FeatherBB/view/admin/users/move_users.php |    4 +-
 .../FeatherBB/view/admin/users/search_ip.php  |    4 +-
 .../FeatherBB/view/admin/users/show_users.php |   12 +-
 style/themes/FeatherBB/view/delete.php        |   10 +-
 style/themes/FeatherBB/view/edit.php          |   12 +-
 style/themes/FeatherBB/view/error.php         |    2 +
 style/themes/FeatherBB/view/footer.new.php    |   13 +-
 style/themes/FeatherBB/view/footer.php        |    2 +-
 style/themes/FeatherBB/view/header.new.php    |   15 +-
 style/themes/FeatherBB/view/header.php        |    4 +-
 style/themes/FeatherBB/view/help.php          |    8 +-
 style/themes/FeatherBB/view/index.php         |   20 +-
 style/themes/FeatherBB/view/install.php       |    2 +
 style/themes/FeatherBB/view/login/form.php    |    2 +
 .../view/login/password_forgotten.php         |    2 +
 style/themes/FeatherBB/view/misc/email.php    |    4 +-
 style/themes/FeatherBB/view/misc/report.php   |    6 +-
 style/themes/FeatherBB/view/misc/rules.php    |    2 +
 .../FeatherBB/view/moderate/delete_posts.php  |    2 +
 .../FeatherBB/view/moderate/delete_topics.php |    2 +
 .../FeatherBB/view/moderate/merge_topics.php  |    2 +
 .../view/moderate/moderator_forum.php         |   16 +-
 .../FeatherBB/view/moderate/move_topics.php   |    2 +
 .../FeatherBB/view/moderate/posts_view.php    |   12 +-
 .../FeatherBB/view/moderate/split_posts.php   |    2 +
 style/themes/FeatherBB/view/post.php          |   20 +-
 .../FeatherBB/view/profile/change_mail.php    |    2 +
 .../FeatherBB/view/profile/change_pass.php    |    2 +
 .../FeatherBB/view/profile/delete_user.php    |    4 +-
 style/themes/FeatherBB/view/profile/menu.php  |    2 +
 .../FeatherBB/view/profile/section_admin.php  |    4 +-
 .../view/profile/section_display.php          |    4 +-
 .../view/profile/section_essentials.php       |    8 +-
 .../view/profile/section_messaging.php        |   12 +-
 .../view/profile/section_personal.php         |   10 +-
 .../view/profile/section_personality.php      |    8 +-
 .../view/profile/section_privacy.php          |    4 +-
 .../FeatherBB/view/profile/upload_avatar.php  |    4 +-
 .../FeatherBB/view/profile/view_profile.php   |    2 +
 .../themes/FeatherBB/view/register/email.php  |    6 +-
 style/themes/FeatherBB/view/register/form.php |   12 +-
 .../themes/FeatherBB/view/register/rules.php  |    2 +
 style/themes/FeatherBB/view/search/footer.php |    2 +
 style/themes/FeatherBB/view/search/form.php   |    2 +
 style/themes/FeatherBB/view/search/header.php |    2 +
 style/themes/FeatherBB/view/search/posts.php  |    6 +-
 style/themes/FeatherBB/view/search/topics.php |    8 +-
 style/themes/FeatherBB/view/userlist.php      |    8 +-
 style/themes/FeatherBB/view/viewforum.php     |   14 +-
 style/themes/FeatherBB/view/viewtopic.php     |   20 +-
 style/themes/MyFeatherBB/base_admin.css       |    1 -
 .../MyFeatherBB/fonts/BebasNeue-webfont.eot   |  Bin 16442 -> 0 bytes
 .../MyFeatherBB/fonts/BebasNeue-webfont.svg   | 1991 -----------------
 .../MyFeatherBB/fonts/BebasNeue-webfont.ttf   |  Bin 48968 -> 0 bytes
 .../MyFeatherBB/fonts/BebasNeue-webfont.woff  |  Bin 17824 -> 0 bytes
 style/themes/MyFeatherBB/img/closed.png       |  Bin 1835 -> 0 bytes
 style/themes/MyFeatherBB/img/new.png          |  Bin 1897 -> 0 bytes
 style/themes/MyFeatherBB/img/old.png          |  Bin 1551 -> 0 bytes
 style/themes/MyFeatherBB/img/sticky.png       |  Bin 1816 -> 0 bytes
 style/themes/MyFeatherBB/phone.min.js         |    1 -
 style/themes/MyFeatherBB/style.css            | 1841 ---------------
 .../MyFeatherBB/view/admin/bans/add_ban.php   |   96 -
 .../view/admin/bans/admin_bans.php            |  102 -
 .../view/admin/bans/search_ban.php            |   87 -
 .../MyFeatherBB/view/admin/categories.php     |  111 -
 .../MyFeatherBB/view/admin/censoring.php      |   84 -
 .../view/admin/forums/admin_forums.php        |  114 -
 .../view/admin/forums/delete_forum.php        |   35 -
 .../view/admin/forums/permissions.php         |  137 --
 .../view/admin/groups/add_edit_group.php      |  311 ---
 .../view/admin/groups/admin_groups.php        |  110 -
 .../view/admin/groups/confirm_delete.php      |   36 -
 .../view/admin/groups/delete_group.php        |   39 -
 style/themes/MyFeatherBB/view/admin/index.php |   63 -
 .../themes/MyFeatherBB/view/admin/loader.php  |   17 -
 .../admin/maintenance/admin_maintenance.php   |   99 -
 .../view/admin/maintenance/prune.php          |   39 -
 .../view/admin/maintenance/rebuild.php        |   17 -
 style/themes/MyFeatherBB/view/admin/menu.php  |  116 -
 .../themes/MyFeatherBB/view/admin/options.php |  840 -------
 .../themes/MyFeatherBB/view/admin/parser.php  |  299 ---
 .../MyFeatherBB/view/admin/permissions.php    |  189 --
 .../themes/MyFeatherBB/view/admin/plugins.php |   57 -
 .../themes/MyFeatherBB/view/admin/reports.php |  116 -
 .../MyFeatherBB/view/admin/statistics.php     |   42 -
 .../view/admin/users/admin_users.php          |  172 --
 .../view/admin/users/ban_users.php            |   58 -
 .../view/admin/users/delete_users.php         |   39 -
 .../view/admin/users/find_users.php           |  100 -
 .../view/admin/users/move_users.php           |   47 -
 .../view/admin/users/search_ip.php            |   79 -
 .../view/admin/users/show_users.php           |  100 -
 style/themes/MyFeatherBB/view/delete.php      |   64 -
 style/themes/MyFeatherBB/view/edit.php        |  119 -
 style/themes/MyFeatherBB/view/error.php       |   26 -
 style/themes/MyFeatherBB/view/footer.new.php  |  160 --
 style/themes/MyFeatherBB/view/footer.php      |  133 --
 style/themes/MyFeatherBB/view/header.new.php  |  234 --
 style/themes/MyFeatherBB/view/header.php      |  137 --
 style/themes/MyFeatherBB/view/help.php        |  141 --
 style/themes/MyFeatherBB/view/index.php       |  111 -
 style/themes/MyFeatherBB/view/install.php     |  222 --
 style/themes/MyFeatherBB/view/login/form.php  |   41 -
 .../view/login/password_forgotten.php         |   57 -
 style/themes/MyFeatherBB/view/misc/email.php  |   37 -
 style/themes/MyFeatherBB/view/misc/report.php |   44 -
 style/themes/MyFeatherBB/view/misc/rules.php  |   23 -
 .../view/moderate/delete_posts.php            |   33 -
 .../view/moderate/delete_topics.php           |   34 -
 .../view/moderate/merge_topics.php            |   36 -
 .../view/moderate/moderator_forum.php         |  101 -
 .../MyFeatherBB/view/moderate/move_topics.php |   44 -
 .../MyFeatherBB/view/moderate/posts_view.php  |   95 -
 .../MyFeatherBB/view/moderate/split_posts.php |   40 -
 style/themes/MyFeatherBB/view/post.php        |  213 --
 .../MyFeatherBB/view/profile/change_mail.php  |   35 -
 .../MyFeatherBB/view/profile/change_pass.php  |   39 -
 .../MyFeatherBB/view/profile/delete_user.php  |   36 -
 .../themes/MyFeatherBB/view/profile/menu.php  |   55 -
 .../view/profile/section_admin.php            |   87 -
 .../view/profile/section_display.php          |  101 -
 .../view/profile/section_essentials.php       |  258 ---
 .../view/profile/section_messaging.php        |   39 -
 .../view/profile/section_personal.php         |   39 -
 .../view/profile/section_personality.php      |   56 -
 .../view/profile/section_privacy.php          |   62 -
 .../view/profile/upload_avatar.php            |   35 -
 .../MyFeatherBB/view/profile/view_profile.php |   66 -
 .../MyFeatherBB/view/register/email.php       |   39 -
 .../themes/MyFeatherBB/view/register/form.php |  134 --
 .../MyFeatherBB/view/register/rules.php       |   32 -
 .../themes/MyFeatherBB/view/search/footer.php |   40 -
 style/themes/MyFeatherBB/view/search/form.php |   79 -
 .../themes/MyFeatherBB/view/search/header.php |   48 -
 .../themes/MyFeatherBB/view/search/posts.php  |   56 -
 .../themes/MyFeatherBB/view/search/topics.php |   29 -
 style/themes/MyFeatherBB/view/userlist.php    |  115 -
 style/themes/MyFeatherBB/view/viewforum.php   |  100 -
 style/themes/MyFeatherBB/view/viewtopic.php   |  204 --
 view/admin/bans/add_ban.php                   |    8 +-
 view/admin/bans/search_ban.php                |   10 +-
 view/admin/categories.php                     |    4 +-
 view/admin/censoring.php                      |    2 +-
 view/admin/forums/admin_forums.php            |    6 +-
 view/admin/forums/permissions.php             |   10 +-
 view/admin/groups/add_edit_group.php          |    6 +-
 view/admin/groups/admin_groups.php            |   10 +-
 view/admin/groups/confirm_delete.php          |    2 +-
 view/admin/groups/delete_group.php            |    2 +-
 view/admin/maintenance/prune.php              |    2 +-
 view/admin/options.php                        |   30 +-
 view/admin/parser.php                         |    8 +-
 view/admin/reports.php                        |   10 +-
 view/admin/statistics.php                     |    2 +-
 view/admin/users/find_users.php               |    8 +-
 view/admin/users/move_users.php               |    2 +-
 view/admin/users/search_ip.php                |    2 +-
 view/admin/users/show_users.php               |   10 +-
 view/delete.php                               |    8 +-
 view/edit.php                                 |   10 +-
 view/help.php                                 |    6 +-
 view/index.php                                |   18 +-
 view/login/form.php                           |    2 +-
 view/misc/email.php                           |    2 +-
 view/misc/report.php                          |    4 +-
 view/moderate/moderator_forum.php             |   14 +-
 view/moderate/posts_view.php                  |   10 +-
 view/post.php                                 |   18 +-
 view/profile/delete_user.php                  |    2 +-
 view/profile/section_admin.php                |    2 +-
 view/profile/section_display.php              |    2 +-
 view/profile/section_essentials.php           |    6 +-
 view/profile/section_messaging.php            |   10 +-
 view/profile/section_personal.php             |    8 +-
 view/profile/section_personality.php          |    6 +-
 view/profile/section_privacy.php              |    2 +-
 view/profile/upload_avatar.php                |    2 +-
 view/register/email.php                       |    4 +-
 view/register/form.php                        |   10 +-
 view/search/posts.php                         |    4 +-
 view/search/topics.php                        |    6 +-
 view/userlist.php                             |    6 +-
 view/viewforum.php                            |   12 +-
 view/viewtopic.php                            |   18 +-
 283 files changed, 1569 insertions(+), 12821 deletions(-)
 delete mode 100644 style/themes/MyFeatherBB/base_admin.css
 delete mode 100644 style/themes/MyFeatherBB/fonts/BebasNeue-webfont.eot
 delete mode 100644 style/themes/MyFeatherBB/fonts/BebasNeue-webfont.svg
 delete mode 100644 style/themes/MyFeatherBB/fonts/BebasNeue-webfont.ttf
 delete mode 100644 style/themes/MyFeatherBB/fonts/BebasNeue-webfont.woff
 delete mode 100644 style/themes/MyFeatherBB/img/closed.png
 delete mode 100644 style/themes/MyFeatherBB/img/new.png
 delete mode 100644 style/themes/MyFeatherBB/img/old.png
 delete mode 100644 style/themes/MyFeatherBB/img/sticky.png
 delete mode 100644 style/themes/MyFeatherBB/phone.min.js
 delete mode 100644 style/themes/MyFeatherBB/style.css
 delete mode 100644 style/themes/MyFeatherBB/view/admin/bans/add_ban.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/bans/admin_bans.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/bans/search_ban.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/categories.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/censoring.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/forums/admin_forums.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/forums/delete_forum.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/forums/permissions.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/groups/add_edit_group.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/groups/admin_groups.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/groups/confirm_delete.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/groups/delete_group.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/index.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/loader.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/maintenance/admin_maintenance.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/maintenance/prune.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/maintenance/rebuild.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/menu.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/options.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/parser.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/permissions.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/plugins.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/reports.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/statistics.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/users/admin_users.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/users/ban_users.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/users/delete_users.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/users/find_users.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/users/move_users.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/users/search_ip.php
 delete mode 100644 style/themes/MyFeatherBB/view/admin/users/show_users.php
 delete mode 100644 style/themes/MyFeatherBB/view/delete.php
 delete mode 100644 style/themes/MyFeatherBB/view/edit.php
 delete mode 100644 style/themes/MyFeatherBB/view/error.php
 delete mode 100644 style/themes/MyFeatherBB/view/footer.new.php
 delete mode 100644 style/themes/MyFeatherBB/view/footer.php
 delete mode 100644 style/themes/MyFeatherBB/view/header.new.php
 delete mode 100644 style/themes/MyFeatherBB/view/header.php
 delete mode 100644 style/themes/MyFeatherBB/view/help.php
 delete mode 100644 style/themes/MyFeatherBB/view/index.php
 delete mode 100644 style/themes/MyFeatherBB/view/install.php
 delete mode 100644 style/themes/MyFeatherBB/view/login/form.php
 delete mode 100644 style/themes/MyFeatherBB/view/login/password_forgotten.php
 delete mode 100644 style/themes/MyFeatherBB/view/misc/email.php
 delete mode 100644 style/themes/MyFeatherBB/view/misc/report.php
 delete mode 100644 style/themes/MyFeatherBB/view/misc/rules.php
 delete mode 100644 style/themes/MyFeatherBB/view/moderate/delete_posts.php
 delete mode 100644 style/themes/MyFeatherBB/view/moderate/delete_topics.php
 delete mode 100644 style/themes/MyFeatherBB/view/moderate/merge_topics.php
 delete mode 100644 style/themes/MyFeatherBB/view/moderate/moderator_forum.php
 delete mode 100644 style/themes/MyFeatherBB/view/moderate/move_topics.php
 delete mode 100644 style/themes/MyFeatherBB/view/moderate/posts_view.php
 delete mode 100644 style/themes/MyFeatherBB/view/moderate/split_posts.php
 delete mode 100644 style/themes/MyFeatherBB/view/post.php
 delete mode 100644 style/themes/MyFeatherBB/view/profile/change_mail.php
 delete mode 100644 style/themes/MyFeatherBB/view/profile/change_pass.php
 delete mode 100644 style/themes/MyFeatherBB/view/profile/delete_user.php
 delete mode 100644 style/themes/MyFeatherBB/view/profile/menu.php
 delete mode 100644 style/themes/MyFeatherBB/view/profile/section_admin.php
 delete mode 100644 style/themes/MyFeatherBB/view/profile/section_display.php
 delete mode 100644 style/themes/MyFeatherBB/view/profile/section_essentials.php
 delete mode 100644 style/themes/MyFeatherBB/view/profile/section_messaging.php
 delete mode 100644 style/themes/MyFeatherBB/view/profile/section_personal.php
 delete mode 100644 style/themes/MyFeatherBB/view/profile/section_personality.php
 delete mode 100644 style/themes/MyFeatherBB/view/profile/section_privacy.php
 delete mode 100644 style/themes/MyFeatherBB/view/profile/upload_avatar.php
 delete mode 100644 style/themes/MyFeatherBB/view/profile/view_profile.php
 delete mode 100644 style/themes/MyFeatherBB/view/register/email.php
 delete mode 100644 style/themes/MyFeatherBB/view/register/form.php
 delete mode 100644 style/themes/MyFeatherBB/view/register/rules.php
 delete mode 100644 style/themes/MyFeatherBB/view/search/footer.php
 delete mode 100644 style/themes/MyFeatherBB/view/search/form.php
 delete mode 100644 style/themes/MyFeatherBB/view/search/header.php
 delete mode 100644 style/themes/MyFeatherBB/view/search/posts.php
 delete mode 100644 style/themes/MyFeatherBB/view/search/topics.php
 delete mode 100644 style/themes/MyFeatherBB/view/userlist.php
 delete mode 100644 style/themes/MyFeatherBB/view/viewforum.php
 delete mode 100644 style/themes/MyFeatherBB/view/viewtopic.php

diff --git a/extern.php b/extern.php
index 22457700..2abac8ad 100644
--- a/extern.php
+++ b/extern.php
@@ -87,7 +87,7 @@ function featherbb_write_cache_file($file, $content)
 {
     $fh = @fopen(FORUM_CACHE_DIR.$file, 'wb');
     if (!$fh) {
-        error('Unable to write cache file '.$feather->utils->escape($file).' to cache directory. Please make sure PHP has write access to the directory \''.$feather->utils->escape(FORUM_CACHE_DIR).'\'', __FILE__, __LINE__);
+        die('Unable to write cache file '.Utils::escape($file).' to cache directory. Please make sure PHP has write access to the directory \''.Utils::escape(FORUM_CACHE_DIR).'\'', __FILE__, __LINE__);
     }
 
     flock($fh, LOCK_EX);
@@ -224,7 +224,7 @@ function authenticate_user($user, $password, $password_is_hash = false)
 
     if (!isset($feather->user->id) ||
         ($password_is_hash && $password != $feather->user->password) ||
-        (!$password_is_hash && \FeatherBB\Utils::feather_hash($password) != $feather->user->password)) {
+        (!$password_is_hash && \FeatherBB\Utils::hash($password) != $feather->user->password)) {
         set_default_user();
     } else {
         $feather->user->is_guest = false;
@@ -286,9 +286,9 @@ function output_rss($feed)
     echo '<?xml version="1.0" encoding="utf-8"?>'."\n";
     echo '<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">'."\n";
     echo "\t".'<channel>'."\n";
-    echo "\t\t".'<atom:link href="'.$feather->utils->escape(get_current_url()).'" rel="self" type="application/rss+xml" />'."\n";
+    echo "\t\t".'<atom:link href="'.Utils::escape(get_current_url()).'" rel="self" type="application/rss+xml" />'."\n";
     echo "\t\t".'<title><![CDATA['.escape_cdata($feed['title']).']]></title>'."\n";
-    echo "\t\t".'<link>'.$feather->utils->escape($feed['link']).'</link>'."\n";
+    echo "\t\t".'<link>'.Utils::escape($feed['link']).'</link>'."\n";
     echo "\t\t".'<description><![CDATA['.escape_cdata($feed['description']).']]></description>'."\n";
     echo "\t\t".'<lastBuildDate>'.gmdate('r', count($feed['items']) ? $feed['items'][0]['pubdate'] : time()).'</lastBuildDate>'."\n";
 
@@ -301,11 +301,11 @@ function output_rss($feed)
     foreach ($feed['items'] as $item) {
         echo "\t\t".'<item>'."\n";
         echo "\t\t\t".'<title><![CDATA['.escape_cdata($item['title']).']]></title>'."\n";
-        echo "\t\t\t".'<link>'.$feather->utils->escape($item['link']).'</link>'."\n";
+        echo "\t\t\t".'<link>'.Utils::escape($item['link']).'</link>'."\n";
         echo "\t\t\t".'<description><![CDATA['.escape_cdata($item['description']).']]></description>'."\n";
         echo "\t\t\t".'<author><![CDATA['.(isset($item['author']['email']) ? escape_cdata($item['author']['email']) : 'dummy@example.com').' ('.escape_cdata($item['author']['name']).')]]></author>'."\n";
         echo "\t\t\t".'<pubDate>'.gmdate('r', $item['pubdate']).'</pubDate>'."\n";
-        echo "\t\t\t".'<guid>'.$feather->utils->escape($item['link']).'</guid>'."\n";
+        echo "\t\t\t".'<guid>'.Utils::escape($item['link']).'</guid>'."\n";
 
         echo "\t\t".'</item>'."\n";
     }
@@ -330,8 +330,8 @@ function output_atom($feed)
     echo '<feed xmlns="http://www.w3.org/2005/Atom">'."\n";
 
     echo "\t".'<title type="html"><![CDATA['.escape_cdata($feed['title']).']]></title>'."\n";
-    echo "\t".'<link rel="self" href="'.$feather->utils->escape(get_current_url()).'"/>'."\n";
-    echo "\t".'<link href="'.$feather->utils->escape($feed['link']).'"/>'."\n";
+    echo "\t".'<link rel="self" href="'.Utils::escape(get_current_url()).'"/>'."\n";
+    echo "\t".'<link href="'.Utils::escape($feed['link']).'"/>'."\n";
     echo "\t".'<updated>'.gmdate('Y-m-d\TH:i:s\Z', count($feed['items']) ? $feed['items'][0]['pubdate'] : time()).'</updated>'."\n";
 
     if ($feather->forum_settings['o_show_version'] == '1') {
@@ -340,14 +340,14 @@ function output_atom($feed)
         echo "\t".'<generator>FluxBB</generator>'."\n";
     }
 
-    echo "\t".'<id>'.$feather->utils->escape($feed['link']).'</id>'."\n";
+    echo "\t".'<id>'.Utils::escape($feed['link']).'</id>'."\n";
 
     $content_tag = ($feed['type'] == 'posts') ? 'content' : 'summary';
 
     foreach ($feed['items'] as $item) {
         echo "\t".'<entry>'."\n";
         echo "\t\t".'<title type="html"><![CDATA['.escape_cdata($item['title']).']]></title>'."\n";
-        echo "\t\t".'<link rel="alternate" href="'.$feather->utils->escape($item['link']).'"/>'."\n";
+        echo "\t\t".'<link rel="alternate" href="'.Utils::escape($item['link']).'"/>'."\n";
         echo "\t\t".'<'.$content_tag.' type="html"><![CDATA['.escape_cdata($item['description']).']]></'.$content_tag.'>'."\n";
         echo "\t\t".'<author>'."\n";
         echo "\t\t\t".'<name><![CDATA['.escape_cdata($item['author']['name']).']]></name>'."\n";
@@ -357,13 +357,13 @@ function output_atom($feed)
         }
 
         if (isset($item['author']['uri'])) {
-            echo "\t\t\t".'<uri>'.$feather->utils->escape($item['author']['uri']).'</uri>'."\n";
+            echo "\t\t\t".'<uri>'.Utils::escape($item['author']['uri']).'</uri>'."\n";
         }
 
         echo "\t\t".'</author>'."\n";
         echo "\t\t".'<updated>'.gmdate('Y-m-d\TH:i:s\Z', $item['pubdate']).'</updated>'."\n";
 
-        echo "\t\t".'<id>'.$feather->utils->escape($item['link']).'</id>'."\n";
+        echo "\t\t".'<id>'.Utils::escape($item['link']).'</id>'."\n";
         echo "\t".'</entry>'."\n";
     }
 
@@ -384,7 +384,7 @@ function output_xml($feed)
 
     echo '<?xml version="1.0" encoding="utf-8"?>'."\n";
     echo '<source>'."\n";
-    echo "\t".'<url>'.$feather->utils->escape($feed['link']).'</url>'."\n";
+    echo "\t".'<url>'.Utils::escape($feed['link']).'</url>'."\n";
 
     $forum_tag = ($feed['type'] == 'posts') ? 'post' : 'topic';
 
@@ -392,7 +392,7 @@ function output_xml($feed)
         echo "\t".'<'.$forum_tag.' id="'.$item['id'].'">'."\n";
 
         echo "\t\t".'<title><![CDATA['.escape_cdata($item['title']).']]></title>'."\n";
-        echo "\t\t".'<link>'.$feather->utils->escape($item['link']).'</link>'."\n";
+        echo "\t\t".'<link>'.Utils::escape($item['link']).'</link>'."\n";
         echo "\t\t".'<content><![CDATA['.escape_cdata($item['description']).']]></content>'."\n";
         echo "\t\t".'<author>'."\n";
         echo "\t\t\t".'<name><![CDATA['.escape_cdata($item['author']['name']).']]></name>'."\n";
@@ -402,7 +402,7 @@ function output_xml($feed)
         }
 
         if (isset($item['author']['uri'])) {
-            echo "\t\t\t".'<uri>'.$feather->utils->escape($item['author']['uri']).'</uri>'."\n";
+            echo "\t\t\t".'<uri>'.Utils::escape($item['author']['uri']).'</uri>'."\n";
         }
 
         echo "\t\t".'</author>'."\n";
@@ -428,12 +428,12 @@ function output_html($feed)
 
     foreach ($feed['items'] as $item) {
         if (utf8_strlen($item['title']) > FORUM_EXTERN_MAX_SUBJECT_LENGTH) {
-            $subject_truncated = $feather->utils->escape($feather->utils->trim(utf8_substr($item['title'], 0, (FORUM_EXTERN_MAX_SUBJECT_LENGTH - 5)))).' …';
+            $subject_truncated = Utils::escape($feather->utils->trim(utf8_substr($item['title'], 0, (FORUM_EXTERN_MAX_SUBJECT_LENGTH - 5)))).' …';
         } else {
-            $subject_truncated = $feather->utils->escape($item['title']);
+            $subject_truncated = Utils::escape($item['title']);
         }
 
-        echo '<li><a href="'.$feather->utils->escape($item['link']).'" title="'.$feather->utils->escape($item['title']).'">'.$subject_truncated.'</a></li>'."\n";
+        echo '<li><a href="'.Utils::escape($item['link']).'" title="'.Utils::escape($item['title']).'">'.$subject_truncated.'</a></li>'."\n";
     }
 }
 
@@ -700,7 +700,7 @@ function output_html($feed)
 
     foreach ($result as $feather_user_online) {
         if ($feather_user_online['user_id'] > 1) {
-            $users[] = ($feather->user->g_view_users == '1') ? '<a href="'.get('user/'.$feather_user_online['user_id'].'/').'">'.$feather->utils->escape($feather_user_online['ident']).'</a>' : $feather->utils->escape($feather_user_online['ident']);
+            $users[] = ($feather->user->g_view_users == '1') ? '<a href="'.get('user/'.$feather_user_online['user_id'].'/').'">'.Utils::escape($feather_user_online['ident']).'</a>' : Utils::escape($feather_user_online['ident']);
             ++$num_users;
         } else {
             ++$num_guests;
@@ -713,12 +713,12 @@ function output_html($feed)
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
 
-    echo sprintf(__('Guests online'), $feather->utils->forum_number_format($num_guests)).'<br />'."\n";
+    echo sprintf(__('Guests online'), Utils::forum_number_format($num_guests)).'<br />'."\n";
 
     if ($action == 'online_full' && !empty($users)) {
         echo sprintf(__('Users online'), implode(', ', $users)).'<br />'."\n";
     } else {
-        echo sprintf(__('Users online'), $feather->utils->forum_number_format($num_users)).'<br />'."\n";
+        echo sprintf(__('Users online'), Utils::forum_number_format($num_users)).'<br />'."\n";
     }
 
     exit;
@@ -747,10 +747,10 @@ function output_html($feed)
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
 
-    echo sprintf(__('No of users'), $feather->utils->forum_number_format($stats['total_users'])).'<br />'."\n";
-    echo sprintf(__('Newest user'), (($feather->user->g_view_users == '1') ? '<a href="'.get('user/'.$stats['last_user']['id'].'/').'">'.$feather->utils->escape($stats['last_user']['username']).'</a>' : $feather->utils->escape($stats['last_user']['username']))).'<br />'."\n";
-    echo sprintf(__('No of topics'), $feather->utils->forum_number_format($stats['total_topics'])).'<br />'."\n";
-    echo sprintf(__('No of posts'), $feather->utils->forum_number_format($stats['total_posts'])).'<br />'."\n";
+    echo sprintf(__('No of users'), Utils::forum_number_format($stats['total_users'])).'<br />'."\n";
+    echo sprintf(__('Newest user'), (($feather->user->g_view_users == '1') ? '<a href="'.get('user/'.$stats['last_user']['id'].'/').'">'.Utils::escape($stats['last_user']['username']).'</a>' : Utils::escape($stats['last_user']['username']))).'<br />'."\n";
+    echo sprintf(__('No of topics'), Utils::forum_number_format($stats['total_topics'])).'<br />'."\n";
+    echo sprintf(__('No of posts'), Utils::forum_number_format($stats['total_posts'])).'<br />'."\n";
 
     exit;
 }
diff --git a/featherbb/Controller/Admin/Bans.php b/featherbb/Controller/Admin/Bans.php
index 65ddb814..76c93a8c 100644
--- a/featherbb/Controller/Admin/Bans.php
+++ b/featherbb/Controller/Admin/Bans.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Utils;
+
 class Bans
 {
     public function __construct()
@@ -48,7 +50,7 @@ public function display()
             $this->feather->view2->setPageInfo(array(
                     'admin_console' => true,
                     'page' => $p,
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Bans'), __('Results head')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Bans'), __('Results head')),
                     'paging_links' => '<span class="pages-label">' . __('Pages') . ' </span>' . $this->feather->url->paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str'])),
                     'ban_data' => $ban_data['data'],
                 )
@@ -60,7 +62,7 @@ public function display()
             $this->feather->view2->setPageInfo(array(
                     'admin_console' => true,
                     'focus_element' => array('bans', 'new_ban_user'),
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Bans')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Bans')),
                 )
             )->addTemplate('admin/bans/admin_bans.php')->display();
         }
@@ -77,7 +79,7 @@ public function add($id = null)
         $this->feather->view2->setPageInfo(array(
                 'admin_console' => true,
                 'focus_element' => array('bans2', 'ban_user'),
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Bans')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Bans')),
                 'ban' => $this->model->add_ban_info($id),
             )
         )->addTemplate('admin/bans/add_ban.php')->display();
@@ -99,7 +101,7 @@ public function edit($id)
         $this->feather->view2->setPageInfo(array(
                 'admin_console' => true,
                 'focus_element' => array('bans2', 'ban_user'),
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Bans')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Bans')),
                 'ban' => $this->model->edit_ban_info($id),
             )
         )->addTemplate('admin/bans/add_ban.php')->display();
diff --git a/featherbb/Controller/Admin/Categories.php b/featherbb/Controller/Admin/Categories.php
index 10869aae..cd1463c3 100644
--- a/featherbb/Controller/Admin/Categories.php
+++ b/featherbb/Controller/Admin/Categories.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Utils;
+
 class Categories
 {
     public function __construct()
@@ -29,7 +31,7 @@ public function __autoload($class_name)
 
     public function add_category()
     {
-        $cat_name = $this->feather->utils->trim($this->request->post('cat_name'));
+        $cat_name = Utils::trim($this->request->post('cat_name'));
         if ($cat_name == '') {
             redirect($this->feather->url->get('admin/categories/'), __('Must enter name message'));
         }
@@ -49,7 +51,7 @@ public function edit_categories()
 
         foreach ($this->request->post('cat') as $cat_id => $properties) {
             $category = array('id' => (int) $cat_id,
-                              'name' => $this->feather->utils->escape($properties['name']),
+                              'name' => Utils::escape($properties['name']),
                               'order' => (int) $properties['order'], );
             if ($category['name'] == '') {
                 redirect($this->feather->url->get('admin/categories/'), __('Must enter name message'));
@@ -87,7 +89,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('categories');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Categories')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Categories')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'cat_list' => $this->model->get_cat_list(),
diff --git a/featherbb/Controller/Admin/Censoring.php b/featherbb/Controller/Admin/Censoring.php
index 45fc28c7..ec9c6524 100644
--- a/featherbb/Controller/Admin/Censoring.php
+++ b/featherbb/Controller/Admin/Censoring.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Utils;
+
 class Censoring
 {
     public function __construct()
@@ -47,7 +49,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('censoring');
 
         $this->feather->view2->setPageInfo(array(
-                'title'    =>    array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Censoring')),
+                'title'    =>    array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Censoring')),
                 'focus_element'    =>    array('censoring', 'new_search_for'),
                 'active_page'    =>    'admin',
                 'admin_console'    =>    true,
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
index e9106cd0..33b675ac 100644
--- a/featherbb/Controller/Admin/Forums.php
+++ b/featherbb/Controller/Admin/Forums.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Utils;
+
 class Forums
 {
     public function __construct()
@@ -54,11 +56,11 @@ public function edit_forum($forum_id)
             if ($this->request->post('save') && $this->request->post('read_forum_old')) {
 
                 // Forums parameters / TODO : better handling of wrong parameters
-                $forum_data = array('forum_name' => $this->feather->utils->escape($this->request->post('forum_name')),
-                                    'forum_desc' => $this->request->post('forum_desc') ? $this->feather->utils->linebreaks($this->feather->utils->trim($this->request->post('forum_desc'))) : NULL,
+                $forum_data = array('forum_name' => Utils::escape($this->request->post('forum_name')),
+                                    'forum_desc' => $this->request->post('forum_desc') ? Utils::linebreaks(Utils::trim($this->request->post('forum_desc'))) : NULL,
                                     'cat_id' => (int) $this->request->post('cat_id'),
                                     'sort_by' => (int) $this->request->post('sort_by'),
-                                    'redirect_url' => $this->feather->url->is_valid($this->request->post('redirect_url')) ? $this->feather->utils->escape($this->request->post('redirect_url')) : NULL);
+                                    'redirect_url' => $this->feather->url->is_valid($this->request->post('redirect_url')) ? Utils::escape($this->request->post('redirect_url')) : NULL);
 
                 if ($forum_data['forum_name'] == '') {
                     redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Must enter name message'));
@@ -115,7 +117,7 @@ public function edit_forum($forum_id)
             \FeatherBB\AdminUtils::generateAdminMenu('forums');
 
             $this->feather->view2->setPageInfo(array(
-                    'title'    =>    array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Forums')),
+                    'title'    =>    array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Forums')),
                     'active_page'    =>    'admin',
                     'admin_console'    =>    true,
                     'perm_data' => $this->model->get_permissions($forum_id),
@@ -141,7 +143,7 @@ public function delete_forum($forum_id)
             \FeatherBB\AdminUtils::generateAdminMenu('forums');
 
             $this->feather->view2->setPageInfo(array(
-                    'title'    =>    array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Forums')),
+                    'title'    =>    array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Forums')),
                     'active_page'    =>    'admin',
                     'admin_console'    =>    true,
                     'cur_forum' => $this->model->get_forum_info($forum_id),
@@ -155,7 +157,7 @@ public function delete_forum($forum_id)
     public function edit_positions()
     {
         foreach ($this->request->post('position') as $forum_id => $position) {
-            $position = (int) $this->feather->utils->trim($position);
+            $position = (int) Utils::trim($position);
             $this->model->update_positions($forum_id, $position);
         }
 
@@ -175,7 +177,7 @@ public function display()
 
         $categories_model = new \FeatherBB\Model\Admin\Categories();
         $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Forums')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Forums')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'cat_list' => $categories_model->get_cat_list(),
diff --git a/featherbb/Controller/Admin/Groups.php b/featherbb/Controller/Admin/Groups.php
index ee785212..6bdd128a 100644
--- a/featherbb/Controller/Admin/Groups.php
+++ b/featherbb/Controller/Admin/Groups.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Utils;
+
 class Groups
 {
     public function __construct()
@@ -39,7 +41,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('groups');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('User groups')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'groups' => $this->model->fetch_groups(),
@@ -70,7 +72,7 @@ public function delete($id)
                 \FeatherBB\AdminUtils::generateAdminMenu('groups');
 
                 $this->feather->view2->setPageInfo(array(
-                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                        'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('User groups')),
                         'active_page' => 'admin',
                         'admin_console' => true,
                         'group_title'      =>  $this->model->get_group_title($id),
@@ -83,7 +85,7 @@ public function delete($id)
         \FeatherBB\AdminUtils::generateAdminMenu('groups');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('User groups')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'id'    => $id,
@@ -110,7 +112,7 @@ public function addedit($id = '')
             $group = $this->model->info_add_group($groups, $id);
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('User groups')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('User groups')),
                     'active_page' => 'admin',
                     'admin_console' => true,
                     'focus_element' => array('groups2', 'req_title'),
diff --git a/featherbb/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
index e0420931..8f45d2b8 100644
--- a/featherbb/Controller/Admin/Index.php
+++ b/featherbb/Controller/Admin/Index.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Utils;
+
 class Index
 {
     public function __construct()
@@ -74,7 +76,7 @@ public function display($action = null)
         \FeatherBB\AdminUtils::generateAdminMenu('index');
 
         $this->feather->view2->setPageInfo(array(
-                            'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Index')),
+                            'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Index')),
                             'active_page' => 'admin',
                             'admin_console' => true,
                             'install_file_exists'    =>   is_dir($this->feather->forum_env['FEATHER_ROOT'].'install'),
diff --git a/featherbb/Controller/Admin/Maintenance.php b/featherbb/Controller/Admin/Maintenance.php
index 1d16356d..56b8cdfa 100644
--- a/featherbb/Controller/Admin/Maintenance.php
+++ b/featherbb/Controller/Admin/Maintenance.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Utils;
+
 class Maintenance
 {
     public function __construct()
@@ -31,14 +33,14 @@ public function display()
             $this->model->rebuild();
 
             $this->feather->view2->setPageInfo(array(
-                    'page_title'    =>    array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Rebuilding search index')),
+                    'page_title'    =>    array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Rebuilding search index')),
                     'query_str' => $this->model->get_query_str()
                 )
             )->addTemplate('admin/maintenance/rebuild.php')->display();
         }
 
         if ($action == 'prune') {
-            $prune_from = $this->feather->utils->trim($this->feather->request->post('prune_from'));
+            $prune_from = Utils::trim($this->feather->request->post('prune_from'));
             $prune_sticky = intval($this->feather->request->post('prune_sticky'));
 
             \FeatherBB\AdminUtils::generateAdminMenu('maintenance');
@@ -48,7 +50,7 @@ public function display()
             }
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Prune')),
+                    'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Prune')),
                     'active_page' => 'admin',
                     'admin_console' => true,
                     'prune_sticky'    =>    $prune_sticky,
@@ -61,7 +63,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('maintenance');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Maintenance')),
+                'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Maintenance')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'first_id' => $this->model->get_first_id(),
diff --git a/featherbb/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
index c48ca619..3cb58c56 100644
--- a/featherbb/Controller/Admin/Options.php
+++ b/featherbb/Controller/Admin/Options.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Utils;
+
 class Options
 {
     public function __construct()
@@ -36,7 +38,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('options');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Options')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Options')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'languages' => $this->model->get_langs(),
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
index b550fe72..1cc4a4d5 100644
--- a/featherbb/Controller/Admin/Parser.php
+++ b/featherbb/Controller/Admin/Parser.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Utils;
+
 class Parser
 {
     public function __construct()
@@ -205,7 +207,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('parser');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Parser')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Parser')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'lang_admin_parser'    =>    $lang_admin_parser,
diff --git a/featherbb/Controller/Admin/Permissions.php b/featherbb/Controller/Admin/Permissions.php
index 1b4d236e..171f9749 100644
--- a/featherbb/Controller/Admin/Permissions.php
+++ b/featherbb/Controller/Admin/Permissions.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Utils;
+
 class Permissions
 {
     public function __construct()
@@ -37,7 +39,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('permissions');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Permissions')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Permissions')),
                 'active_page' => 'admin',
                 'admin_console' => true,
             )
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
index 1765a9a0..729d865a 100644
--- a/featherbb/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Utils;
+
 class Plugins
 {
     public function __construct()
@@ -44,7 +46,7 @@ public function index()
                 'active_page' => 'admin',
                 'pluginsList'    =>    $pluginsList,
                 'activePlugins'    =>    $activePlugins,
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), 'Plugins'),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), 'Plugins'),
             )
         )->addTemplate('admin/plugins.php')->display();
     }
@@ -59,7 +61,7 @@ public function activate()
 
         // Check if plugin follows PSR-4 conventions and extends base forum plugin
         if (!class_exists($class) || !property_exists($class, 'isValidFBPlugin')) {
-            throw new \FeatherBB\Error(sprintf(__('No plugin message'), $this->feather->utils->escape($class)), 400);
+            throw new \FeatherBB\Error(sprintf(__('No plugin message'), Utils::escape($class)), 400);
         }
 
         $plugin = new $class;
@@ -84,7 +86,7 @@ public function deactivate()
         try {
             $plugin->deactivate($class);
         } catch (\Exception $e) {
-            redirect($this->feather->url->get('admin/plugins/'), $this->feather->utils->escape($e->getMessage()));
+            redirect($this->feather->url->get('admin/plugins/'), Utils::escape($e->getMessage()));
         }
         // Plugin has been activated, confirm and redirect
         $this->feather->url->redirect($this->feather->url->get('admin/plugins/'), array('warning', 'Plugin "'.$class::$name.'" deactivated!'));
@@ -106,7 +108,7 @@ public function display()
 
         // Make sure the file actually exists
         if (!file_exists(FEATHER_ROOT.'plugins/'.$plugin)) {
-            throw new \FeatherBB\Error(sprintf(__('No plugin message'), $this->feather->utils->escape($plugin)), 400);
+            throw new \FeatherBB\Error(sprintf(__('No plugin message'), Utils::escape($plugin)), 400);
         }
 
         // Construct REQUEST_URI if it isn't set TODO?
@@ -119,11 +121,11 @@ public function display()
         // get the "blank page of death"
         include FEATHER_ROOT.'plugins/'.$plugin;
         if (!defined('FEATHER_PLUGIN_LOADED')) {
-            throw new \FeatherBB\Error(sprintf(__('Plugin failed message'), $this->feather->utils->escape($plugin)));
+            throw new \FeatherBB\Error(sprintf(__('Plugin failed message'), Utils::escape($plugin)));
         }
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), str_replace('_', ' ', substr($plugin, strpos($plugin, '_') + 1, -4))),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), str_replace('_', ' ', substr($plugin, strpos($plugin, '_') + 1, -4))),
                 'active_page' => 'admin',
                 'admin_console' => true,
             )
diff --git a/featherbb/Controller/Admin/Reports.php b/featherbb/Controller/Admin/Reports.php
index 10e3e4df..26e14cb8 100644
--- a/featherbb/Controller/Admin/Reports.php
+++ b/featherbb/Controller/Admin/Reports.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Utils;
+
 use FeatherBB\AdminUtils;
 
 class Reports
@@ -39,7 +41,7 @@ public function display()
         AdminUtils::generateAdminMenu('reports');
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Reports')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Reports')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'report_data'   =>  $this->model->get_reports(),
diff --git a/featherbb/Controller/Admin/Statistics.php b/featherbb/Controller/Admin/Statistics.php
index efff22c6..33c2457d 100644
--- a/featherbb/Controller/Admin/Statistics.php
+++ b/featherbb/Controller/Admin/Statistics.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Utils;
+
 class Statistics
 {
     public function __construct()
@@ -33,7 +35,7 @@ public function display()
         $total = $this->model->get_total_size();
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Server statistics')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Server statistics')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'server_load'    =>    $this->model->get_server_load(),
diff --git a/featherbb/Controller/Admin/Users.php b/featherbb/Controller/Admin/Users.php
index 7350eb25..6e8b8e49 100644
--- a/featherbb/Controller/Admin/Users.php
+++ b/featherbb/Controller/Admin/Users.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Utils;
+
 class Users
 {
     public function __construct()
@@ -38,7 +40,7 @@ public function display()
             \FeatherBB\AdminUtils::generateAdminMenu('users');
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Move users')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Move users')),
                     'active_page' => 'moderate',
                     'admin_console' => true,
                     'move'              =>  $this->model->move_users(),
@@ -56,7 +58,7 @@ public function display()
             \FeatherBB\AdminUtils::generateAdminMenu('users');
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Delete users')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Delete users')),
                     'active_page' => 'moderate',
                     'admin_console' => true,
                     'user_ids'          => $this->model->delete_users(),
@@ -74,7 +76,7 @@ public function display()
             \FeatherBB\AdminUtils::generateAdminMenu('users');
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Bans')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Bans')),
                     'active_page' => 'moderate',
                     'focus_element' => array('bans2', 'ban_message'),
                     'admin_console' => true,
@@ -108,7 +110,7 @@ public function display()
             $this->feather->view2->addAsset('js', 'style/imports/common.js', array('type' => 'text/javascript'));
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
                     'active_page' => 'admin',
                     'admin_console' => true,
                     'paging_links' => $paging_links,
@@ -126,7 +128,7 @@ public function display()
             \FeatherBB\AdminUtils::generateAdminMenu('users');
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Users')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users')),
                     'active_page' => 'admin',
                     'admin_console' => true,
                     'focus_element' => array('find_user', 'form[username]'),
@@ -149,7 +151,7 @@ public function ipstats($id)
         $start_from = 50 * ($p - 1);
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'page' => $p,
@@ -177,7 +179,7 @@ public function showusers($ip)
         $start_from = 50 * ($p - 1);
 
         $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate_old($num_pages, $p, '?ip_stats='.$ip),
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
index 4df72e8c..b2b58b26 100644
--- a/featherbb/Controller/Auth.php
+++ b/featherbb/Controller/Auth.php
@@ -8,6 +8,8 @@
  */
 
 namespace FeatherBB\Controller;
+
+use FeatherBB\Utils;
 use DB;
 
 class Auth
@@ -26,14 +28,14 @@ public function login()
 
         if ($this->feather->request->isPost()) {
             $this->feather->hooks->fire('login_start');
-            $form_username = $this->feather->utils->trim($this->feather->request->post('req_username'));
-            $form_password = $this->feather->utils->trim($this->feather->request->post('req_password'));
+            $form_username = Utils::trim($this->feather->request->post('req_username'));
+            $form_password = Utils::trim($this->feather->request->post('req_password'));
             $save_pass = (bool) $this->feather->request->post('save_pass');
 
             $user = \FeatherBB\Model\Auth::get_user_from_name($form_username);
 
             if (!empty($user->password)) {
-                $form_password_hash = \FeatherBB\Utils::feather_hash($form_password); // Will result in a SHA-1 hash
+                $form_password_hash = \FeatherBB\Utils::hash($form_password); // Will result in a SHA-1 hash
                 if ($user->password == $form_password_hash) {
                     if ($user->group_id == FEATHER_UNVERIFIED) {
                         \FeatherBB\Model\Auth::update_group($user->id, $this->feather->forum_settings['o_default_user_group']);
@@ -57,7 +59,7 @@ public function login()
         } else {
             $this->feather->view2->setPageInfo(array(
                                 'active_page' => 'login',
-                                'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Login')),
+                                'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Login')),
                                 'required_fields' => array('req_username' => __('Username'), 'req_password' => __('Password')),
                                 'focus_element' => array('login', 'req_username'),
                                 )
@@ -69,7 +71,7 @@ public function logout($token)
     {
         $token = $this->feather->hooks->fire('logout_start', $token);
 
-        if ($this->feather->user->is_guest || !isset($token) || $token != \FeatherBB\Utils::feather_hash($this->feather->user->id.\FeatherBB\Utils::feather_hash($this->feather->request->getIp()))) {
+        if ($this->feather->user->is_guest || !isset($token) || $token != \FeatherBB\Utils::hash($this->feather->user->id.\FeatherBB\Utils::hash($this->feather->request->getIp()))) {
             $this->feather->url->redirect($this->feather->url->get('/'), 'Not logged in');
         }
 
@@ -80,7 +82,7 @@ public function logout($token)
             \FeatherBB\Model\Auth::set_last_visit($this->feather->user->id, $this->feather->user->logged);
         }
 
-        \FeatherBB\Model\Auth::feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), time() + 31536000);
+        \FeatherBB\Model\Auth::feather_setcookie(1, \FeatherBB\Utils::hash(uniqid(rand(), true)), time() + 31536000);
         $this->feather->hooks->fire('logout_end');
 
         redirect($this->feather->url->base(), __('Logout redirect'));
@@ -94,7 +96,7 @@ public function forget()
 
         if ($this->feather->request->isPost()) {
             // Validate the email address
-            $email = strtolower($this->feather->utils->trim($this->feather->request->post('req_email')));
+            $email = strtolower(Utils::trim($this->feather->request->post('req_email')));
             if (!$this->feather->email->is_valid_email($email)) {
                 throw new \FeatherBB\Error(__('Invalid email'), 400);
             }
@@ -134,16 +136,16 @@ public function forget()
 
                 $this->feather->email->feather_mail($email, $mail_subject, $cur_mail_message);
 
-                $this->feather->url->redirect($this->feather->url->get('/'), __('Forget mail').' <a href="mailto:'.$this->feather->utils->escape($this->feather->forum_settings['o_admin_email']).'">'.$this->feather->utils->escape($this->feather->forum_settings['o_admin_email']).'</a>.', 200);
+                $this->feather->url->redirect($this->feather->url->get('/'), __('Forget mail').' <a href="mailto:'.Utils::escape($this->feather->forum_settings['o_admin_email']).'">'.Utils::escape($this->feather->forum_settings['o_admin_email']).'</a>.', 200);
             } else {
-                throw new \FeatherBB\Error(__('No email match').' '.$this->feather->utils->escape($email).'.', 400);
+                throw new \FeatherBB\Error(__('No email match').' '.Utils::escape($email).'.', 400);
             }
         }
 
         $this->feather->view2->setPageInfo(array(
 //                'errors'    =>    $this->model->password_forgotten(),
                 'active_page' => 'login',
-                'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Request pass')),
+                'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Request pass')),
                 'required_fields' => array('req_email' => __('Email')),
                 'focus_element' => array('request_pass', 'req_email'),
             )
diff --git a/featherbb/Controller/Delete.php b/featherbb/Controller/Delete.php
index 02d84d34..322d7699 100644
--- a/featherbb/Controller/Delete.php
+++ b/featherbb/Controller/Delete.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Utils;
+
 class Delete
 {
     public function __construct()
@@ -58,7 +60,7 @@ public function deletepost($id)
         $cur_post['message'] = $this->feather->parser->parse_message($cur_post['message'], $cur_post['hide_smilies']);
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Delete post')),
+            'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Delete post')),
             'active_page' => 'delete',
             'cur_post' => $cur_post,
             'id' => $id,
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index a6bd0651..7ea22f6e 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Utils;
+
 class Edit
 {
     public function __construct()
@@ -106,7 +108,7 @@ public function editpost($id)
         );
 
         $this->feather->view2->setPageInfo(array(
-                            'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Edit post')),
+                            'title' => array(Utils::escape($this->config['o_board_title']), __('Edit post')),
                             'required_fields' => array('req_subject' => __('Subject'), 'req_message' => __('Message')),
                             'focus_element' => array('edit', 'req_message'),
                             'cur_post' => $cur_post,
diff --git a/featherbb/Controller/Help.php b/featherbb/Controller/Help.php
index 89e519b1..1b8855f2 100644
--- a/featherbb/Controller/Help.php
+++ b/featherbb/Controller/Help.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Utils;
+
 class Help
 {
     public function __construct()
@@ -33,7 +35,7 @@ public function display()
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Help')),
+            'title' => array(Utils::escape($this->config['o_board_title']), __('Help')),
             'active_page' => 'help',
         ))->addTemplate('help.php')->display();
     }
diff --git a/featherbb/Controller/Index.php b/featherbb/Controller/Index.php
index df39c39e..13469d4c 100644
--- a/featherbb/Controller/Index.php
+++ b/featherbb/Controller/Index.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Utils;
+
 class Index
 {
     public function __construct()
@@ -25,7 +27,7 @@ public function display()
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title'])),
+            'title' => array(Utils::escape($this->feather->forum_settings['o_board_title'])),
             'active_page' => 'index',
             'is_indexed' => true,
             'index_data' => $this->model->print_categories_forums(),
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
index 39275112..d6e7ad3a 100644
--- a/featherbb/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Utils;
+
 class Install
 {
     protected $supported_dbs = array('mysql' => 'MySQL',
@@ -34,7 +36,7 @@ public function __construct()
     public function run()
     {
         if (!empty($this->feather->request->post('choose_lang'))) {
-            if (in_array($this->feather->utils->trim($this->feather->request->post('install_lang')), $this->available_langs)) {
+            if (in_array(Utils::trim($this->feather->request->post('install_lang')), $this->available_langs)) {
                 $this->install_lang = $this->feather->request->post('install_lang');
             }
         }
@@ -43,7 +45,7 @@ public function run()
         if ($this->feather->request->isPost() && empty($this->feather->request->post('choose_lang'))) {
             $missing_fields = array();
             $data = array_map(function ($item) {
-                return $this->feather->utils->escape($this->feather->utils->trim($item));
+                return Utils::escape(Utils::trim($item));
             }, $this->feather->request->post('install'));
 
             foreach ($data as $field => $value) {
@@ -66,9 +68,9 @@ public function run()
                 }
 
                 // Validate username and passwords
-                if ($this->feather->utils->strlen($data['username']) < 2) {
+                if (Utils::strlen($data['username']) < 2) {
                     $this->errors[] = __('Username 1');
-                } elseif ($this->feather->utils->strlen($data['username']) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
+                } elseif (Utils::strlen($data['username']) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
                     $this->errors[] = __('Username 2');
                 } elseif (!strcasecmp($data['username'], 'Guest')) {
                     $this->errors[] = __('Username 3');
@@ -80,7 +82,7 @@ public function run()
                     $this->errors[] = __('Username 6');
                 }
 
-                if ($this->feather->utils->strlen($data['password']) < 6) {
+                if (Utils::strlen($data['password']) < 6) {
                     $this->errors[] = __('Short password');
                 } elseif ($data['password'] != $data['password_conf']) {
                     $this->errors[] = __('Passwords not match');
diff --git a/featherbb/Controller/Login.php b/featherbb/Controller/Login.php
index e73cf0b4..8d0fc775 100644
--- a/featherbb/Controller/Login.php
+++ b/featherbb/Controller/Login.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Utils;
+
 class Login
 {
     public function __construct()
@@ -38,7 +40,7 @@ public function display()
         $this->feather->view2->setPageInfo(array(
                             'redirect_url'    =>    $redirect_url,
                             'active_page' => 'login',
-                            'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Login')),
+                            'title' => array(Utils::escape($this->config['o_board_title']), __('Login')),
                             'required_fields' => array('req_username' => __('Username'), 'req_password' => __('Password')),
                             'focus_element' => array('login', 'req_username'),
                             )
@@ -76,7 +78,7 @@ public function forget()
         $this->feather->view2->setPageInfo(array(
                 'errors'    =>    $this->model->password_forgotten(),
                 'active_page' => 'login',
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Request pass')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Request pass')),
                 'required_fields' => array('req_email' => __('Email')),
                 'focus_element' => array('request_pass', 'req_email'),
             )
diff --git a/featherbb/Controller/Misc.php b/featherbb/Controller/Misc.php
index 479d48e0..5ade2dcb 100644
--- a/featherbb/Controller/Misc.php
+++ b/featherbb/Controller/Misc.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Utils;
+
 class Misc
 {
     public function __construct()
@@ -26,7 +28,7 @@ public function rules()
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Forum rules')),
+            'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Forum rules')),
             'active_page' => 'rules'
             ))->addTemplate('misc/rules.php')->display();
     }
@@ -116,7 +118,7 @@ public function email($id)
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Send email to').' '.$this->feather->utils->escape($mail['recipient'])),
+            'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Send email to').' '.Utils::escape($mail['recipient'])),
             'active_page' => 'email',
             'required_fields' => array('req_subject' => __('Email subject'), 'req_message' => __('Email message')),
             'focus_element' => array('email', 'req_subject'),
@@ -143,7 +145,7 @@ public function report($id)
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('Report post')),
+            'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Report post')),
             'active_page' => 'report',
             'required_fields' => array('req_reason' => __('Reason')),
             'focus_element' => array('report', 'req_reason'),
diff --git a/featherbb/Controller/Moderate.php b/featherbb/Controller/Moderate.php
index 91d96636..2bf4e1ce 100644
--- a/featherbb/Controller/Moderate.php
+++ b/featherbb/Controller/Moderate.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Utils;
+
 class Moderate
 {
     public function __construct()
@@ -83,7 +85,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             $this->model->check_move_possible();
 
             $this->feather->view2->setPageInfo(array(
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Moderate')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Moderate')),
                     'active_page' => 'moderate',
                     'action'    =>    'multi',
                     'id'    =>    $fid,
@@ -137,7 +139,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             $this->model->check_move_possible();
 
             $this->feather->view2->setPageInfo(array(
-                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Moderate')),
+                        'title' => array(Utils::escape($this->config['o_board_title']), __('Moderate')),
                         'active_page' => 'moderate',
                         'page' => $p,
                         'action'    =>    'single',
@@ -156,7 +158,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                     $posts = $this->model->delete_posts($id, $fid, $p);
 
                     $this->feather->view2->setPageInfo(array(
-                            'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Moderate')),
+                            'title' => array(Utils::escape($this->config['o_board_title']), __('Moderate')),
                             'active_page' => 'moderate',
                             'page' => $p,
                             'id' => $id,
@@ -167,7 +169,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             if ($this->request->post('split_posts') || $this->request->post('split_posts_comply')) {
 
                 $this->feather->view2->setPageInfo(array(
-                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Moderate')),
+                        'title' => array(Utils::escape($this->config['o_board_title']), __('Moderate')),
                         'focus_element' => array('subject','new_subject'),
                         'page' => $p,
                         'active_page' => 'moderate',
@@ -193,7 +195,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             }
 
             $this->feather->view2->setPageInfo(array(
-                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), $this->feather->utils->escape($cur_topic['forum_name']), $this->feather->utils->escape($cur_topic['subject'])),
+                        'title' => array(Utils::escape($this->config['o_board_title']), Utils::escape($cur_topic['forum_name']), Utils::escape($cur_topic['subject'])),
                         'page' => $p,
                         'active_page' => 'moderate',
                         'cur_topic' => $cur_topic,
@@ -242,7 +244,7 @@ public function display($id, $name = null, $page = null)
         $url_forum = $this->feather->url->url_friendly($cur_forum['forum_name']);
 
         $this->feather->view2->setPageInfo(array(
-                            'title' => array($this->feather->utils->escape($this->config['o_board_title']), $this->feather->utils->escape($cur_forum['forum_name'])),
+                            'title' => array(Utils::escape($this->config['o_board_title']), Utils::escape($cur_forum['forum_name'])),
                             'active_page' => 'moderate',
                             'page' => $p,
                             'id' => $id,
@@ -286,7 +288,7 @@ public function dealposts($fid)
 
             $this->feather->view2->setPageInfo(array(
                         'action'    =>    'multi',
-                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Moderate')),
+                        'title' => array(Utils::escape($this->config['o_board_title']), __('Moderate')),
                         'active_page' => 'moderate',
                         'id'    =>    $fid,
                         'topics'    =>    implode(',', array_map('intval', array_keys($topics))),
@@ -307,7 +309,7 @@ public function dealposts($fid)
             }
 
             $this->feather->view2->setPageInfo(array(
-                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Moderate')),
+                        'title' => array(Utils::escape($this->config['o_board_title']), __('Moderate')),
                         'active_page' => 'moderate',
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
@@ -327,7 +329,7 @@ public function dealposts($fid)
             }
 
             $this->feather->view2->setPageInfo(array(
-                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Moderate')),
+                        'title' => array(Utils::escape($this->config['o_board_title']), __('Moderate')),
                         'active_page' => 'moderate',
                         'id'    =>    $fid,
                         'topics'    =>    $topics,
diff --git a/featherbb/Controller/Post.php b/featherbb/Controller/Post.php
index 75c70641..516266fe 100644
--- a/featherbb/Controller/Post.php
+++ b/featherbb/Controller/Post.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Utils;
+
 class Post
 {
     public function __construct()
@@ -199,7 +201,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
         );
 
         $this->feather->view2->setPageInfo(array(
-                            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), $action),
+                            'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), $action),
                             'required_fields' => $required_fields,
                             'focus_element' => $focus_element,
                             'active_page' => 'post',
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
index 5e0958da..d7a3891a 100644
--- a/featherbb/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Utils;
+
 class Profile
 {
     public function __construct()
@@ -64,7 +66,7 @@ public function display($id, $section = null)
             $this->model->delete_user($id, $this->feather);
 
             $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Confirm delete user')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Confirm delete user')),
                 'active_page' => 'profile',
                 'username' => $this->model->get_username($id),
                 'id' => $id,
@@ -108,7 +110,7 @@ public function display($id, $section = null)
                 $user_info = $this->model->parse_user_info($user);
 
             $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), sprintf(__('Users profile'), $this->feather->utils->escape($user['username']))),
+                'title' => array(Utils::escape($this->config['o_board_title']), sprintf(__('Users profile'), Utils::escape($user['username']))),
                 'active_page' => 'profile',
                 'user_info' => $user_info,
                 'id' => $id
@@ -120,7 +122,7 @@ public function display($id, $section = null)
                 $user_disp = $this->model->edit_essentials($id, $user);
 
                 $this->feather->view2->setPageInfo(array(
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Section essentials')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Section essentials')),
                     'required_fields' => array('req_username' => __('Username'), 'req_email' => __('Email')),
                     'active_page' => 'profile',
                     'id' => $id,
@@ -135,11 +137,11 @@ public function display($id, $section = null)
 
             } elseif ($section == 'personal') {
                 if ($this->user->g_set_title == '1') {
-                    $title_field = '<label>'.__('Title').' <em>('.__('Leave blank').')</em><br /><input type="text" name="title" value="'.$this->feather->utils->escape($user['title']).'" size="30" maxlength="50" /><br /></label>'."\n";
+                    $title_field = '<label>'.__('Title').' <em>('.__('Leave blank').')</em><br /><input type="text" name="title" value="'.Utils::escape($user['title']).'" size="30" maxlength="50" /><br /></label>'."\n";
                 }
 
                 $this->feather->view2->setPageInfo(array(
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Section personal')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Section personal')),
                     'active_page' => 'profile',
                     'id' => $id,
                     'page' => 'personal',
@@ -152,7 +154,7 @@ public function display($id, $section = null)
             } elseif ($section == 'messaging') {
 
                 $this->feather->view2->setPageInfo(array(
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Section messaging')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Section messaging')),
                     'active_page' => 'profile',
                     'page' => 'messaging',
                     'user' => $user,
@@ -182,7 +184,7 @@ public function display($id, $section = null)
                 }
 
                 $this->feather->view2->setPageInfo(array(
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Section personality')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Section personality')),
                     'active_page' => 'profile',
                     'user_avatar' => $user_avatar,
                     'avatar_field' => $avatar_field,
@@ -197,7 +199,7 @@ public function display($id, $section = null)
             } elseif ($section == 'display') {
 
                 $this->feather->view2->setPageInfo(array(
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Section display')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Section display')),
                     'active_page' => 'profile',
                     'page' => 'display',
                     'user' => $user,
@@ -209,7 +211,7 @@ public function display($id, $section = null)
             } elseif ($section == 'privacy') {
 
                 $this->feather->view2->setPageInfo(array(
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Section privacy')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Section privacy')),
                     'active_page' => 'profile',
                     'page' => 'privacy',
                     'user' => $user,
@@ -225,7 +227,7 @@ public function display($id, $section = null)
                 }
 
                 $this->feather->view2->setPageInfo(array(
-                    'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Section admin')),
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Section admin')),
                     'active_page' => 'profile',
                     'page' => 'admin',
                     'user' => $user,
@@ -260,7 +262,7 @@ public function action($id, $action)
             $this->model->change_pass($id, $this->feather);
 
             $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Change pass')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Change pass')),
                 'active_page' => 'profile',
                 'id' => $id,
                 'required_fields' => array('req_old_password' => __('Old pass'), 'req_new_password1' => __('New pass'), 'req_new_password2' => __('Confirm new pass')),
@@ -273,7 +275,7 @@ public function action($id, $action)
             $this->model->change_email($id, $this->feather);
 
             $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Change email')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Change email')),
                 'active_page' => 'profile',
                 'required_fields' => array('req_new_email' => __('New email'), 'req_password' => __('Password')),
                 'focus_element' => array('change_email', 'req_new_email'),
@@ -296,7 +298,7 @@ public function action($id, $action)
             }
 
             $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Profile'), __('Upload avatar')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Upload avatar')),
                 'active_page' => 'profile',
                 'required_fields' =>  array('req_file' => __('File')),
                 'focus_element' => array('upload_avatar', 'req_file'),
diff --git a/featherbb/Controller/Register.php b/featherbb/Controller/Register.php
index 810955e8..30836337 100644
--- a/featherbb/Controller/Register.php
+++ b/featherbb/Controller/Register.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Utils;
+
 class Register
 {
     public function __construct()
@@ -61,7 +63,7 @@ public function display()
         }
 
             $this->feather->view2->setPageInfo(array(
-                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Register')),
+                        'title' => array(Utils::escape($this->config['o_board_title']), __('Register')),
                         'focus_element' => array('register', 'req_user'),
                         'required_fields' => array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => __('Confirm pass'), 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => __('Robot title')),
                         'active_page' => 'register',
@@ -100,7 +102,7 @@ public function rules()
         }
 
         $this->feather->view2->setPageInfo(array(
-                            'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Register'), __('Forum rules')),
+                            'title' => array(Utils::escape($this->config['o_board_title']), __('Register'), __('Forum rules')),
                             'active_page' => 'register',
                             )
                     )->addTemplate('register/rules.php')->display();
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index b624a831..af419e46 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Utils;
+
 class Search
 {
     public function __construct()
@@ -49,7 +51,7 @@ public function display()
                     }
 
                     $this->feather->view2->setPageInfo(array(
-                        'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Search results')),
+                        'title' => array(Utils::escape($this->config['o_board_title']), __('Search results')),
                         'active_page' => 'search',
                     ));
 
@@ -77,7 +79,7 @@ public function display()
         // Display the form
         else {
             $this->feather->view2->setPageInfo(array(
-                'title' => array($this->feather->utils->escape($this->config['o_board_title']), __('Search')),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Search')),
                 'active_page' => 'search',
                 'focus_element' => array('search', 'keywords'),
                 'is_indexed' => true,
diff --git a/featherbb/Controller/Userlist.php b/featherbb/Controller/Userlist.php
index 417a47c4..d409425c 100644
--- a/featherbb/Controller/Userlist.php
+++ b/featherbb/Controller/Userlist.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Utils;
+
 class Userlist
 {
     public function __construct()
@@ -30,7 +32,7 @@ public function display()
         // Determine if we are allowed to view post counts
         $show_post_count = ($this->feather->forum_settings['o_show_post_count'] == '1' || $this->feather->user->is_admmod) ? true : false;
 
-        $username = $this->feather->request->get('username') && $this->feather->user->g_search_users == '1' ? $this->feather->utils->trim($this->feather->request->get('username')) : '';
+        $username = $this->feather->request->get('username') && $this->feather->user->g_search_users == '1' ? Utils::trim($this->feather->request->get('username')) : '';
         $show_group = $this->feather->request->get('show_group') ? intval($this->feather->request->get('show_group')) : -1;
         $sort_by = $this->feather->request->get('sort_by') && (in_array($this->feather->request->get('sort_by'), array('username', 'registered')) || ($this->feather->request->get('sort_by') == 'num_posts' && $show_post_count)) ? $this->feather->request->get('sort_by') : 'username';
         $sort_dir = $this->feather->request->get('sort_dir') && $this->feather->request->get('sort_dir') == 'DESC' ? 'DESC' : 'ASC';
@@ -54,7 +56,7 @@ public function display()
         $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), __('User list')),
+            'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('User list')),
             'active_page' => 'userlist',
             'page_number'  =>  $p,
             'paging_links'  =>  $paging_links,
diff --git a/featherbb/Controller/Viewforum.php b/featherbb/Controller/Viewforum.php
index e054924e..91135cb3 100644
--- a/featherbb/Controller/Viewforum.php
+++ b/featherbb/Controller/Viewforum.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Utils;
+
 class Viewforum
 {
     public function __construct()
@@ -84,7 +86,7 @@ public function display($id, $name = null, $page = null)
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), $this->feather->utils->escape($cur_forum['forum_name'])),
+            'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), Utils::escape($cur_forum['forum_name'])),
             'active_page' => 'viewforum',
             'page_number'  =>  $p,
             'paging_links'  =>  $paging_links,
diff --git a/featherbb/Controller/Viewtopic.php b/featherbb/Controller/Viewtopic.php
index 987e24d5..c9b1bce8 100644
--- a/featherbb/Controller/Viewtopic.php
+++ b/featherbb/Controller/Viewtopic.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Utils;
+
 class Viewtopic
 {
     public function __construct()
@@ -105,7 +107,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         }
 
         $this->feather->view2->setPageInfo(array(
-            'title' => array($this->feather->utils->escape($this->feather->forum_settings['o_board_title']), $this->feather->utils->escape($cur_topic['forum_name']), $this->feather->utils->escape($cur_topic['subject'])),
+            'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), Utils::escape($cur_topic['forum_name']), Utils::escape($cur_topic['subject'])),
             'active_page' => 'viewtopic',
             'page_number'  =>  $p,
             'paging_links'  =>  $paging_links,
diff --git a/featherbb/Core/AdminUtils.php b/featherbb/Core/AdminUtils.php
index 06117f74..06628ccf 100644
--- a/featherbb/Core/AdminUtils.php
+++ b/featherbb/Core/AdminUtils.php
@@ -52,10 +52,12 @@ public static function breadcrumbs_admin(array $links)
      */
     public static function get_admin_ids()
     {
-        if (!$this->feather->cache->isCached('admin_ids')) {
-            $this->feather->cache->store('admin_ids', \FeatherBB\Model\Cache::get_admin_ids());
+        self::$feather = \Slim\Slim::getInstance();
+
+        if (!self::$feather->cache->isCached('admin_ids')) {
+            self::$feather->cache->store('admin_ids', \FeatherBB\Model\Cache::get_admin_ids());
         }
 
-        return $this->feather->cache->retrieve('admin_ids');
+        return self::$feather->cache->retrieve('admin_ids');
     }
 }
diff --git a/featherbb/Core/Auth.php b/featherbb/Core/Auth.php
index a9723a8a..d62dff98 100644
--- a/featherbb/Core/Auth.php
+++ b/featherbb/Core/Auth.php
@@ -13,6 +13,7 @@
 
 namespace FeatherBB;
 
+use FeatherBB\Utils;
 use DB;
 
 class Auth extends \Slim\Middleware
@@ -178,7 +179,7 @@ public function check_bans()
                 \DB::for_table('online')
                     ->where('ident', $this->app->user->username)
                     ->delete_many();
-                throw new \FeatherBB\Error(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower(format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.$this->app->utils->escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.$this->app->utils->escape($this->app->forum_settings['o_admin_email']).'">'.$this->app->utils->escape($this->app->forum_settings['o_admin_email']).'</a>.', 403);
+                throw new \FeatherBB\Error(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower($this->app->utils->format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.Utils::escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.Utils::escape($this->app->forum_settings['o_admin_email']).'">'.Utils::escape($this->app->forum_settings['o_admin_email']).'</a>.', 403);
             }
         }
 
@@ -196,7 +197,7 @@ public function maintenance_message()
         $message = str_replace($pattern, $replace, $this->app->forum_settings['o_maintenance_message']);
 
         $this->app->view2->setPageInfo(array(
-            'title' => array($this->app->utils->escape($this->app->forum_settings['o_board_title']), __('Maintenance')),
+            'title' => array(Utils::escape($this->app->forum_settings['o_board_title']), __('Maintenance')),
             'active_page' => 'index',
             'message'    =>    $message,
             'no_back_link'    =>    '',
@@ -265,7 +266,7 @@ public function call()
                      ->update_many('logged', time());
             }
 
-            $this->model->feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), $this->app->now + 31536000);
+            $this->model->feather_setcookie(1, \FeatherBB\Utils::hash(uniqid(rand(), true)), $this->app->now + 31536000);
         }
 
         load_textdomain('featherbb', $this->app->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->app->user->language.'/common.mo');
diff --git a/featherbb/Core/Core.php b/featherbb/Core/Core.php
index cc5e6ef5..9a15440f 100644
--- a/featherbb/Core/Core.php
+++ b/featherbb/Core/Core.php
@@ -181,7 +181,7 @@ public function call()
             return new \FeatherBB\Utils();
         });
         // Record start time
-        $this->app->start = $this->app->utils->get_microtime();
+        $this->app->start = Utils::get_microtime();
         // Define now var
         $this->app->now = function () {
             return time();
diff --git a/featherbb/Core/Email.php b/featherbb/Core/Email.php
index 7b51f38e..bbaecb93 100644
--- a/featherbb/Core/Email.php
+++ b/featherbb/Core/Email.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB;
 
+use FeatherBB\Utils;
+
 class Email
 {
     public function __construct()
@@ -124,7 +126,7 @@ public function bbcode2email($text, $wrap_length = 72)
             $base_url = $this->feather->url->base();
         }
 
-        $text = $this->feather->utils->trim($text, "\t\n ");
+        $text = Utils::trim($text, "\t\n ");
 
         $shortcut_urls = array(
             'topic' => '/topic/$1/',
@@ -266,12 +268,12 @@ public function feather_mail($to, $subject, $message, $reply_to_email = '', $rep
         $from_email = $this->config['o_webmaster_email'];
 
         // Do a little spring cleaning
-        $to = $this->feather->utils->trim(preg_replace('%[\n\r]+%s', '', $to));
-        $subject = $this->feather->utils->trim(preg_replace('%[\n\r]+%s', '', $subject));
-        $from_email = $this->feather->utils->trim(preg_replace('%[\n\r:]+%s', '', $from_email));
-        $from_name = $this->feather->utils->trim(preg_replace('%[\n\r:]+%s', '', str_replace('"', '', $from_name)));
-        $reply_to_email = $this->feather->utils->trim(preg_replace('%[\n\r:]+%s', '', $reply_to_email));
-        $reply_to_name = $this->feather->utils->trim(preg_replace('%[\n\r:]+%s', '', str_replace('"', '', $reply_to_name)));
+        $to = Utils::trim(preg_replace('%[\n\r]+%s', '', $to));
+        $subject = Utils::trim(preg_replace('%[\n\r]+%s', '', $subject));
+        $from_email = Utils::trim(preg_replace('%[\n\r:]+%s', '', $from_email));
+        $from_name = Utils::trim(preg_replace('%[\n\r:]+%s', '', str_replace('"', '', $from_name)));
+        $reply_to_email = Utils::trim(preg_replace('%[\n\r:]+%s', '', $reply_to_email));
+        $reply_to_name = Utils::trim(preg_replace('%[\n\r:]+%s', '', str_replace('"', '', $reply_to_name)));
 
         // Set up some headers to take advantage of UTF-8
         $from = '"' . $this->encode_mail_text($from_name) . '" <' . $from_email . '>';
@@ -287,7 +289,7 @@ public function feather_mail($to, $subject, $message, $reply_to_email = '', $rep
         }
 
         // Make sure all linebreaks are LF in message (and strip out any NULL bytes)
-        $message = str_replace("\0", '', $this->feather->utils->linebreaks($message));
+        $message = str_replace("\0", '', Utils::linebreaks($message));
         $message = str_replace("\n", $EOL, $message);
 
         if ($smtp) {
diff --git a/featherbb/Core/Search.php b/featherbb/Core/Search.php
index 64c114e3..f6c0365b 100644
--- a/featherbb/Core/Search.php
+++ b/featherbb/Core/Search.php
@@ -56,10 +56,10 @@ public function split_words($text, $idx)
         $text = preg_replace('%\[/?(b|u|s|ins|del|em|i|h|colou?r|quote|code|img|url|email|list|topic|post|forum|user)(?:\=[^\]]*)?\]%', ' ', $text);
 
         // Remove any apostrophes or dashes which aren't part of words
-        $text = substr($this->feather->utils->ucp_preg_replace('%((?<=[^\p{L}\p{N}])[\'\-]|[\'\-](?=[^\p{L}\p{N}]))%u', '', ' ' . $text . ' '), 1, -1);
+        $text = substr(Utils::ucp_preg_replace('%((?<=[^\p{L}\p{N}])[\'\-]|[\'\-](?=[^\p{L}\p{N}]))%u', '', ' ' . $text . ' '), 1, -1);
 
         // Remove punctuation and symbols (actually anything that isn't a letter or number), allow apostrophes and dashes (and % * if we aren't indexing)
-        $text = $this->feather->utils->ucp_preg_replace('%(?![\'\-' . ($idx ? '' : '\%\*') . '])[^\p{L}\p{N}]+%u', ' ', $text);
+        $text = Utils::ucp_preg_replace('%(?![\'\-' . ($idx ? '' : '\%\*') . '])[^\p{L}\p{N}]+%u', ' ', $text);
 
         // Replace multiple whitespace or dashes
         $text = preg_replace('%(\s){2,}%u', '\1', $text);
@@ -112,7 +112,7 @@ public function validate_search_word($word, $idx)
         $word = str_replace(array('%', '*'), '', $word);
 
         // Check the word is within the min/max length
-        $num_chars = $this->feather->utils->strlen($word);
+        $num_chars = Utils::strlen($word);
         return $num_chars >= FEATHER_SEARCH_MIN_WORD && $num_chars <= FEATHER_SEARCH_MAX_WORD;
     }
 
diff --git a/featherbb/Core/Url.php b/featherbb/Core/Url.php
index ae7a5730..dd99a028 100644
--- a/featherbb/Core/Url.php
+++ b/featherbb/Core/Url.php
@@ -12,576 +12,579 @@
 class Url
 {
     protected $url_replace = array(
-                                    'À' => 'A',
-                                    'Á' => 'A',
-                                    'Â' => 'A',
-                                    'Ã' => 'A',
-                                    'Ä' => 'Ae',
-                                    'Å' => 'A',
-                                    'Æ' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    'Ç' => 'C',
-                                    '?' => 'C',
-                                    '?' => 'C',
-                                    '?' => 'C',
-                                    '?' => 'C',
-                                    '?' => 'D',
-                                    '?' => 'D',
-                                    'È' => 'E',
-                                    'É' => 'E',
-                                    'Ê' => 'E',
-                                    'Ë' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'G',
-                                    '?' => 'G',
-                                    '?' => 'G',
-                                    '?' => 'G',
-                                    '?' => 'H',
-                                    '?' => 'H',
-                                    'Ì' => 'I',
-                                    'Í' => 'I',
-                                    'Î' => 'I',
-                                    'Ï' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'IJ',
-                                    '?' => 'J',
-                                    '?' => 'K',
-                                    '?' => 'K',
-                                    '?' => 'K',
-                                    '?' => 'K',
-                                    '?' => 'K',
-                                    '?' => 'L',
-                                    'Ñ' => 'N',
-                                    '?' => 'N',
-                                    '?' => 'N',
-                                    '?' => 'N',
-                                    '?' => 'N',
-                                    'Ò' => 'O',
-                                    'Ó' => 'O',
-                                    'Ô' => 'O',
-                                    'Õ' => 'O',
-                                    'Ö' => 'Oe',
-                                    'Ø' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    'Œ' => 'OE',
-                                    '?' => 'R',
-                                    '?' => 'R',
-                                    '?' => 'R',
-                                    '?' => 'S',
-                                    '?' => 'S',
-                                    '?' => 'S',
-                                    '?' => 'S',
-                                    'Š' => 'S',
-                                    '?' => 'T',
-                                    '?' => 'T',
-                                    '?' => 'T',
-                                    '?' => 'T',
-                                    'Ù' => 'U',
-                                    'Ú' => 'U',
-                                    'Û' => 'U',
-                                    'Ü' => 'Ue',
-                                    '?' => 'U',
-                                    '?' => 'U',
-                                    '?' => 'U',
-                                    '?' => 'U',
-                                    '?' => 'U',
-                                    '?' => 'U',
-                                    '?' => 'W',
-                                    '?' => 'Y',
-                                    'Ÿ' => 'Y',
-                                    'Ý' => 'Y',
-                                    '?' => 'Z',
-                                    '?' => 'Z',
-                                    'Ž' => 'Z',
-                                    'à' => 'a',
-                                    'á' => 'a',
-                                    'â' => 'a',
-                                    'ã' => 'a',
-                                    'ä' => 'ae',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    'å' => 'a',
-                                    'æ' => 'ae',
-                                    'ç' => 'c',
-                                    '?' => 'c',
-                                    '?' => 'c',
-                                    '?' => 'c',
-                                    '?' => 'c',
-                                    '?' => 'd',
-                                    '?' => 'd',
-                                    'è' => 'e',
-                                    'é' => 'e',
-                                    'ê' => 'e',
-                                    'ë' => 'e',
-                                    '?' => 'e',
-                                    '?' => 'e',
-                                    '?' => 'e',
-                                    '?' => 'e',
-                                    '?' => 'e',
-                                    'ƒ' => 'f',
-                                    '?' => 'g',
-                                    '?' => 'g',
-                                    '?' => 'g',
-                                    '?' => 'g',
-                                    '?' => 'h',
-                                    '?' => 'h',
-                                    'ì' => 'i',
-                                    'í' => 'i',
-                                    'î' => 'i',
-                                    'ï' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'ij',
-                                    '?' => 'j',
-                                    '?' => 'k',
-                                    '?' => 'k',
-                                    '?' => 'l',
-                                    '?' => 'l',
-                                    '?' => 'l',
-                                    '?' => 'l',
-                                    '?' => 'l',
-                                    'ñ' => 'n',
-                                    '?' => 'n',
-                                    '?' => 'n',
-                                    '?' => 'n',
-                                    '?' => 'n',
-                                    '?' => 'n',
-                                    'ò' => 'o',
-                                    'ó' => 'o',
-                                    'ô' => 'o',
-                                    'õ' => 'o',
-                                    'ö' => 'oe',
-                                    'ø' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    'œ' => 'oe',
-                                    '?' => 'r',
-                                    '?' => 'r',
-                                    '?' => 'r',
-                                    '?' => 's',
-                                    'š' => 's',
-                                    '?' => 't',
-                                    'ù' => 'u',
-                                    'ú' => 'u',
-                                    'û' => 'u',
-                                    'ü' => 'ue',
-                                    '?' => 'u',
-                                    '?' => 'u',
-                                    '?' => 'u',
-                                    '?' => 'u',
-                                    '?' => 'u',
-                                    '?' => 'u',
-                                    '?' => 'w',
-                                    'ÿ' => 'y',
-                                    'ý' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'z',
-                                    '?' => 'z',
-                                    'ž' => 'z',
-                                    'ß' => 'ss',
-                                    '?' => 'ss',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'A',
-                                    '?' => 'B',
-                                    '?' => 'G',
-                                    '?' => 'D',
-                                    '?' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'Z',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'TH',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'K',
-                                    '?' => 'L',
-                                    '?' => 'M',
-                                    '?' => 'N',
-                                    '?' => 'KS',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'P',
-                                    '?' => 'R',
-                                    '?' => 'R',
-                                    '?' => 'S',
-                                    '?' => 'T',
-                                    '?' => 'Y',
-                                    '?' => 'Y',
-                                    '?' => 'Y',
-                                    '?' => 'Y',
-                                    '?' => 'Y',
-                                    '?' => 'Y',
-                                    '?' => 'Y',
-                                    '?' => 'Y',
-                                    '?' => 'Y',
-                                    '?' => 'Y',
-                                    '?' => 'Y',
-                                    '?' => 'F',
-                                    '?' => 'X',
-                                    '?' => 'PS',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'O',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'a',
-                                    '?' => 'b',
-                                    '?' => 'g',
-                                    '?' => 'd',
-                                    '?' => 'e',
-                                    '?' => 'e',
-                                    '?' => 'e',
-                                    '?' => 'e',
-                                    '?' => 'e',
-                                    '?' => 'e',
-                                    '?' => 'e',
-                                    '?' => 'e',
-                                    '?' => 'e',
-                                    '?' => 'e',
-                                    '?' => 'z',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'th',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'i',
-                                    '?' => 'k',
-                                    '?' => 'l',
-                                    '?' => 'm',
-                                    '?' => 'n',
-                                    '?' => 'ks',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'p',
-                                    '?' => 'r',
-                                    '?' => 'r',
-                                    '?' => 'r',
-                                    '?' => 's',
-                                    '?' => 's',
-                                    '?' => 't',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'y',
-                                    '?' => 'f',
-                                    '?' => 'x',
-                                    '?' => 'ps',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '?' => 'o',
-                                    '¨' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => 'A',
-                                    '?' => 'B',
-                                    '?' => 'V',
-                                    '?' => 'G',
-                                    '?' => 'D',
-                                    '?' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'ZH',
-                                    '?' => 'Z',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'K',
-                                    '?' => 'L',
-                                    '?' => 'M',
-                                    '?' => 'N',
-                                    '?' => 'O',
-                                    '?' => 'P',
-                                    '?' => 'R',
-                                    '?' => 'S',
-                                    '?' => 'T',
-                                    '?' => 'U',
-                                    '?' => 'F',
-                                    '?' => 'KH',
-                                    '?' => 'TS',
-                                    '?' => 'CH',
-                                    '?' => 'SH',
-                                    '?' => 'SHCH',
-                                    '?' => 'Y',
-                                    '?' => 'E',
-                                    '?' => 'YU',
-                                    '?' => 'YA',
-                                    '?' => 'A',
-                                    '?' => 'B',
-                                    '?' => 'V',
-                                    '?' => 'G',
-                                    '?' => 'D',
-                                    '?' => 'E',
-                                    '?' => 'E',
-                                    '?' => 'ZH',
-                                    '?' => 'Z',
-                                    '?' => 'I',
-                                    '?' => 'I',
-                                    '?' => 'K',
-                                    '?' => 'L',
-                                    '?' => 'M',
-                                    '?' => 'N',
-                                    '?' => 'O',
-                                    '?' => 'P',
-                                    '?' => 'R',
-                                    '?' => 'S',
-                                    '?' => 'T',
-                                    '?' => 'U',
-                                    '?' => 'F',
-                                    '?' => 'KH',
-                                    '?' => 'TS',
-                                    '?' => 'CH',
-                                    '?' => 'SH',
-                                    '?' => 'SHCH',
-                                    '?' => 'Y',
-                                    '?' => 'E',
-                                    '?' => 'YU',
-                                    '?' => 'YA',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => '',
-                                    '?' => 'YE',
-                                    '?' => 'YE',
-                                    '?' => 'YI',
-                                    '?' => 'YI',
-                                    '?' => 'KG',
-                                    '?' => 'KG',
-                                    'ð' => 'd',
-                                    'Ð' => 'D',
-                                    'þ' => 'th',
-                                    'Þ' => 'TH',
-                                    '&'    =>    '-',
-                                    '/'    =>    '-',
-                                    '('    =>    '-',
-                                    '"'    =>    '-',
-                                    "'"    =>    '-',
+                                        'À' => 'A',
+                                        'Á' => 'A',
+                                        'Â' => 'A',
+                                        'Ã' => 'A',
+                                        'Ä' => 'Ae',
+                                        'Å' => 'A',
+                                        'Æ' => 'A',
+                                        'Ā' => 'A',
+                                        'Ą' => 'A',
+                                        'Ă' => 'A',
+                                        'Ç' => 'C',
+                                        'Ć' => 'C',
+                                        'Č' => 'C',
+                                        'Ĉ' => 'C',
+                                        'Ċ' => 'C',
+                                        'Ď' => 'D',
+                                        'Đ' => 'D',
+                                        'È' => 'E',
+                                        'É' => 'E',
+                                        'Ê' => 'E',
+                                        'Ë' => 'E',
+                                        'Ē' => 'E',
+                                        'Ę' => 'E',
+                                        'Ě' => 'E',
+                                        'Ĕ' => 'E',
+                                        'Ė' => 'E',
+                                        'Ĝ' => 'G',
+                                        'Ğ' => 'G',
+                                        'Ġ' => 'G',
+                                        'Ģ' => 'G',
+                                        'Ĥ' => 'H',
+                                        'Ħ' => 'H',
+                                        'Ì' => 'I',
+                                        'Í' => 'I',
+                                        'Î' => 'I',
+                                        'Ï' => 'I',
+                                        'Ī' => 'I',
+                                        'Ĩ' => 'I',
+                                        'Ĭ' => 'I',
+                                        'Į' => 'I',
+                                        'İ' => 'I',
+                                        'IJ' => 'IJ',
+                                        'Ĵ' => 'J',
+                                        'Ķ' => 'K',
+                                        'Ľ' => 'K',
+                                        'Ĺ' => 'K',
+                                        'Ļ' => 'K',
+                                        'Ŀ' => 'K',
+                                        'Ł' => 'L',
+                                        'Ñ' => 'N',
+                                        'Ń' => 'N',
+                                        'Ň' => 'N',
+                                        'Ņ' => 'N',
+                                        'Ŋ' => 'N',
+                                        'Ò' => 'O',
+                                        'Ó' => 'O',
+                                        'Ô' => 'O',
+                                        'Õ' => 'O',
+                                        'Ö' => 'Oe',
+                                        'Ø' => 'O',
+                                        'Ō' => 'O',
+                                        'Ő' => 'O',
+                                        'Ŏ' => 'O',
+                                        'Œ' => 'OE',
+                                        'Ŕ' => 'R',
+                                        'Ř' => 'R',
+                                        'Ŗ' => 'R',
+                                        'Ś' => 'S',
+                                        'Ş' => 'S',
+                                        'Ŝ' => 'S',
+                                        'Ș' => 'S',
+                                        'Š' => 'S',
+                                        'Ť' => 'T',
+                                        'Ţ' => 'T',
+                                        'Ŧ' => 'T',
+                                        'Ț' => 'T',
+                                        'Ù' => 'U',
+                                        'Ú' => 'U',
+                                        'Û' => 'U',
+                                        'Ü' => 'Ue',
+                                        'Ū' => 'U',
+                                        'Ů' => 'U',
+                                        'Ű' => 'U',
+                                        'Ŭ' => 'U',
+                                        'Ũ' => 'U',
+                                        'Ų' => 'U',
+                                        'Ŵ' => 'W',
+                                        'Ŷ' => 'Y',
+                                        'Ÿ' => 'Y',
+                                        'Ý' => 'Y',
+                                        'Ź' => 'Z',
+                                        'Ż' => 'Z',
+                                        'Ž' => 'Z',
+                                        'à' => 'a',
+                                        'á' => 'a',
+                                        'â' => 'a',
+                                        'ã' => 'a',
+                                        'ä' => 'ae',
+                                        'ā' => 'a',
+                                        'ą' => 'a',
+                                        'ă' => 'a',
+                                        'å' => 'a',
+                                        'æ' => 'ae',
+                                        'ç' => 'c',
+                                        'ć' => 'c',
+                                        'č' => 'c',
+                                        'ĉ' => 'c',
+                                        'ċ' => 'c',
+                                        'ď' => 'd',
+                                        'đ' => 'd',
+                                        'è' => 'e',
+                                        'é' => 'e',
+                                        'ê' => 'e',
+                                        'ë' => 'e',
+                                        'ē' => 'e',
+                                        'ę' => 'e',
+                                        'ě' => 'e',
+                                        'ĕ' => 'e',
+                                        'ė' => 'e',
+                                        'ƒ' => 'f',
+                                        'ĝ' => 'g',
+                                        'ğ' => 'g',
+                                        'ġ' => 'g',
+                                        'ģ' => 'g',
+                                        'ĥ' => 'h',
+                                        'ħ' => 'h',
+                                        'ì' => 'i',
+                                        'í' => 'i',
+                                        'î' => 'i',
+                                        'ï' => 'i',
+                                        'ī' => 'i',
+                                        'ĩ' => 'i',
+                                        'ĭ' => 'i',
+                                        'į' => 'i',
+                                        'ı' => 'i',
+                                        'ij' => 'ij',
+                                        'ĵ' => 'j',
+                                        'ķ' => 'k',
+                                        'ĸ' => 'k',
+                                        'ł' => 'l',
+                                        'ľ' => 'l',
+                                        'ĺ' => 'l',
+                                        'ļ' => 'l',
+                                        'ŀ' => 'l',
+                                        'ñ' => 'n',
+                                        'ń' => 'n',
+                                        'ň' => 'n',
+                                        'ņ' => 'n',
+                                        'ʼn' => 'n',
+                                        'ŋ' => 'n',
+                                        'ò' => 'o',
+                                        'ó' => 'o',
+                                        'ô' => 'o',
+                                        'õ' => 'o',
+                                        'ö' => 'oe',
+                                        'ø' => 'o',
+                                        'ō' => 'o',
+                                        'ő' => 'o',
+                                        'ŏ' => 'o',
+                                        'œ' => 'oe',
+                                        'ŕ' => 'r',
+                                        'ř' => 'r',
+                                        'ŗ' => 'r',
+                                        'ś' => 's',
+                                        'š' => 's',
+                                        'ť' => 't',
+                                        'ù' => 'u',
+                                        'ú' => 'u',
+                                        'û' => 'u',
+                                        'ü' => 'ue',
+                                        'ū' => 'u',
+                                        'ů' => 'u',
+                                        'ű' => 'u',
+                                        'ŭ' => 'u',
+                                        'ũ' => 'u',
+                                        'ų' => 'u',
+                                        'ŵ' => 'w',
+                                        'ÿ' => 'y',
+                                        'ý' => 'y',
+                                        'ŷ' => 'y',
+                                        'ż' => 'z',
+                                        'ź' => 'z',
+                                        'ž' => 'z',
+                                        'ß' => 'ss',
+                                        'ſ' => 'ss',
+                                        'Α' => 'A',
+                                        'Ά' => 'A',
+                                        'Ἀ' => 'A',
+                                        'Ἁ' => 'A',
+                                        'Ἂ' => 'A',
+                                        'Ἃ' => 'A',
+                                        'Ἄ' => 'A',
+                                        'Ἅ' => 'A',
+                                        'Ἆ' => 'A',
+                                        'Ἇ' => 'A',
+                                        'ᾈ' => 'A',
+                                        'ᾉ' => 'A',
+                                        'ᾊ' => 'A',
+                                        'ᾋ' => 'A',
+                                        'ᾌ' => 'A',
+                                        'ᾍ' => 'A',
+                                        'ᾎ' => 'A',
+                                        'ᾏ' => 'A',
+                                        'Ᾰ' => 'A',
+                                        'Ᾱ' => 'A',
+                                        'Ὰ' => 'A',
+                                        'Ά' => 'A',
+                                        'ᾼ' => 'A',
+                                        'Β' => 'B',
+                                        'Γ' => 'G',
+                                        'Δ' => 'D',
+                                        'Ε' => 'E',
+                                        'Έ' => 'E',
+                                        'Ἐ' => 'E',
+                                        'Ἑ' => 'E',
+                                        'Ἒ' => 'E',
+                                        'Ἓ' => 'E',
+                                        'Ἔ' => 'E',
+                                        'Ἕ' => 'E',
+                                        'Έ' => 'E',
+                                        'Ὲ' => 'E',
+                                        'Ζ' => 'Z',
+                                        'Η' => 'I',
+                                        'Ή' => 'I',
+                                        'Ἠ' => 'I',
+                                        'Ἡ' => 'I',
+                                        'Ἢ' => 'I',
+                                        'Ἣ' => 'I',
+                                        'Ἤ' => 'I',
+                                        'Ἥ' => 'I',
+                                        'Ἦ' => 'I',
+                                        'Ἧ' => 'I',
+                                        'ᾘ' => 'I',
+                                        'ᾙ' => 'I',
+                                        'ᾚ' => 'I',
+                                        'ᾛ' => 'I',
+                                        'ᾜ' => 'I',
+                                        'ᾝ' => 'I',
+                                        'ᾞ' => 'I',
+                                        'ᾟ' => 'I',
+                                        'Ὴ' => 'I',
+                                        'Ή' => 'I',
+                                        'ῌ' => 'I',
+                                        'Θ' => 'TH',
+                                        'Ι' => 'I',
+                                        'Ί' => 'I',
+                                        'Ϊ' => 'I',
+                                        'Ἰ' => 'I',
+                                        'Ἱ' => 'I',
+                                        'Ἲ' => 'I',
+                                        'Ἳ' => 'I',
+                                        'Ἴ' => 'I',
+                                        'Ἵ' => 'I',
+                                        'Ἶ' => 'I',
+                                        'Ἷ' => 'I',
+                                        'Ῐ' => 'I',
+                                        'Ῑ' => 'I',
+                                        'Ὶ' => 'I',
+                                        'Ί' => 'I',
+                                        'Κ' => 'K',
+                                        'Λ' => 'L',
+                                        'Μ' => 'M',
+                                        'Ν' => 'N',
+                                        'Ξ' => 'KS',
+                                        'Ο' => 'O',
+                                        'Ό' => 'O',
+                                        'Ὀ' => 'O',
+                                        'Ὁ' => 'O',
+                                        'Ὂ' => 'O',
+                                        'Ὃ' => 'O',
+                                        'Ὄ' => 'O',
+                                        'Ὅ' => 'O',
+                                        'Ὸ' => 'O',
+                                        'Ό' => 'O',
+                                        'Π' => 'P',
+                                        'Ρ' => 'R',
+                                        'Ῥ' => 'R',
+                                        'Σ' => 'S',
+                                        'Τ' => 'T',
+                                        'Υ' => 'Y',
+                                        'Ύ' => 'Y',
+                                        'Ϋ' => 'Y',
+                                        'Ὑ' => 'Y',
+                                        'Ὓ' => 'Y',
+                                        'Ὕ' => 'Y',
+                                        'Ὗ' => 'Y',
+                                        'Ῠ' => 'Y',
+                                        'Ῡ' => 'Y',
+                                        'Ὺ' => 'Y',
+                                        'Ύ' => 'Y',
+                                        'Φ' => 'F',
+                                        'Χ' => 'X',
+                                        'Ψ' => 'PS',
+                                        'Ω' => 'O',
+                                        'Ώ' => 'O',
+                                        'Ὠ' => 'O',
+                                        'Ὡ' => 'O',
+                                        'Ὢ' => 'O',
+                                        'Ὣ' => 'O',
+                                        'Ὤ' => 'O',
+                                        'Ὥ' => 'O',
+                                        'Ὦ' => 'O',
+                                        'Ὧ' => 'O',
+                                        'ᾨ' => 'O',
+                                        'ᾩ' => 'O',
+                                        'ᾪ' => 'O',
+                                        'ᾫ' => 'O',
+                                        'ᾬ' => 'O',
+                                        'ᾭ' => 'O',
+                                        'ᾮ' => 'O',
+                                        'ᾯ' => 'O',
+                                        'Ὼ' => 'O',
+                                        'Ώ' => 'O',
+                                        'ῼ' => 'O',
+                                        'α' => 'a',
+                                        'ά' => 'a',
+                                        'ἀ' => 'a',
+                                        'ἁ' => 'a',
+                                        'ἂ' => 'a',
+                                        'ἃ' => 'a',
+                                        'ἄ' => 'a',
+                                        'ἅ' => 'a',
+                                        'ἆ' => 'a',
+                                        'ἇ' => 'a',
+                                        'ᾀ' => 'a',
+                                        'ᾁ' => 'a',
+                                        'ᾂ' => 'a',
+                                        'ᾃ' => 'a',
+                                        'ᾄ' => 'a',
+                                        'ᾅ' => 'a',
+                                        'ᾆ' => 'a',
+                                        'ᾇ' => 'a',
+                                        'ὰ' => 'a',
+                                        'ά' => 'a',
+                                        'ᾰ' => 'a',
+                                        'ᾱ' => 'a',
+                                        'ᾲ' => 'a',
+                                        'ᾳ' => 'a',
+                                        'ᾴ' => 'a',
+                                        'ᾶ' => 'a',
+                                        'ᾷ' => 'a',
+                                        'β' => 'b',
+                                        'γ' => 'g',
+                                        'δ' => 'd',
+                                        'ε' => 'e',
+                                        'έ' => 'e',
+                                        'ἐ' => 'e',
+                                        'ἑ' => 'e',
+                                        'ἒ' => 'e',
+                                        'ἓ' => 'e',
+                                        'ἔ' => 'e',
+                                        'ἕ' => 'e',
+                                        'ὲ' => 'e',
+                                        'έ' => 'e',
+                                        'ζ' => 'z',
+                                        'η' => 'i',
+                                        'ή' => 'i',
+                                        'ἠ' => 'i',
+                                        'ἡ' => 'i',
+                                        'ἢ' => 'i',
+                                        'ἣ' => 'i',
+                                        'ἤ' => 'i',
+                                        'ἥ' => 'i',
+                                        'ἦ' => 'i',
+                                        'ἧ' => 'i',
+                                        'ᾐ' => 'i',
+                                        'ᾑ' => 'i',
+                                        'ᾒ' => 'i',
+                                        'ᾓ' => 'i',
+                                        'ᾔ' => 'i',
+                                        'ᾕ' => 'i',
+                                        'ᾖ' => 'i',
+                                        'ᾗ' => 'i',
+                                        'ὴ' => 'i',
+                                        'ή' => 'i',
+                                        'ῂ' => 'i',
+                                        'ῃ' => 'i',
+                                        'ῄ' => 'i',
+                                        'ῆ' => 'i',
+                                        'ῇ' => 'i',
+                                        'θ' => 'th',
+                                        'ι' => 'i',
+                                        'ί' => 'i',
+                                        'ϊ' => 'i',
+                                        'ΐ' => 'i',
+                                        'ἰ' => 'i',
+                                        'ἱ' => 'i',
+                                        'ἲ' => 'i',
+                                        'ἳ' => 'i',
+                                        'ἴ' => 'i',
+                                        'ἵ' => 'i',
+                                        'ἶ' => 'i',
+                                        'ἷ' => 'i',
+                                        'ὶ' => 'i',
+                                        'ί' => 'i',
+                                        'ῐ' => 'i',
+                                        'ῑ' => 'i',
+                                        'ῒ' => 'i',
+                                        'ΐ' => 'i',
+                                        'ῖ' => 'i',
+                                        'ῗ' => 'i',
+                                        'κ' => 'k',
+                                        'λ' => 'l',
+                                        'μ' => 'm',
+                                        'ν' => 'n',
+                                        'ξ' => 'ks',
+                                        'ο' => 'o',
+                                        'ό' => 'o',
+                                        'ὀ' => 'o',
+                                        'ὁ' => 'o',
+                                        'ὂ' => 'o',
+                                        'ὃ' => 'o',
+                                        'ὄ' => 'o',
+                                        'ὅ' => 'o',
+                                        'ὸ' => 'o',
+                                        'ό' => 'o',
+                                        'π' => 'p',
+                                        'ρ' => 'r',
+                                        'ῤ' => 'r',
+                                        'ῥ' => 'r',
+                                        'σ' => 's',
+                                        'ς' => 's',
+                                        'τ' => 't',
+                                        'υ' => 'y',
+                                        'ύ' => 'y',
+                                        'ϋ' => 'y',
+                                        'ΰ' => 'y',
+                                        'ὐ' => 'y',
+                                        'ὑ' => 'y',
+                                        'ὒ' => 'y',
+                                        'ὓ' => 'y',
+                                        'ὔ' => 'y',
+                                        'ὕ' => 'y',
+                                        'ὖ' => 'y',
+                                        'ὗ' => 'y',
+                                        'ὺ' => 'y',
+                                        'ύ' => 'y',
+                                        'ῠ' => 'y',
+                                        'ῡ' => 'y',
+                                        'ῢ' => 'y',
+                                        'ΰ' => 'y',
+                                        'ῦ' => 'y',
+                                        'ῧ' => 'y',
+                                        'φ' => 'f',
+                                        'χ' => 'x',
+                                        'ψ' => 'ps',
+                                        'ω' => 'o',
+                                        'ώ' => 'o',
+                                        'ὠ' => 'o',
+                                        'ὡ' => 'o',
+                                        'ὢ' => 'o',
+                                        'ὣ' => 'o',
+                                        'ὤ' => 'o',
+                                        'ὥ' => 'o',
+                                        'ὦ' => 'o',
+                                        'ὧ' => 'o',
+                                        'ᾠ' => 'o',
+                                        'ᾡ' => 'o',
+                                        'ᾢ' => 'o',
+                                        'ᾣ' => 'o',
+                                        'ᾤ' => 'o',
+                                        'ᾥ' => 'o',
+                                        'ᾦ' => 'o',
+                                        'ᾧ' => 'o',
+                                        'ὼ' => 'o',
+                                        'ώ' => 'o',
+                                        'ῲ' => 'o',
+                                        'ῳ' => 'o',
+                                        'ῴ' => 'o',
+                                        'ῶ' => 'o',
+                                        'ῷ' => 'o',
+                                        '¨' => '',
+                                        '΅' => '',
+                                        '᾿' => '',
+                                        '῾' => '',
+                                        '῍' => '',
+                                        '῝' => '',
+                                        '῎' => '',
+                                        '῞' => '',
+                                        '῏' => '',
+                                        '῟' => '',
+                                        '῀' => '',
+                                        '῁' => '',
+                                        '΄' => '',
+                                        '΅' => '',
+                                        '`' => '',
+                                        '῭' => '',
+                                        'ͺ' => '',
+                                        '᾽' => '',
+                                        'А' => 'A',
+                                        'Б' => 'B',
+                                        'В' => 'V',
+                                        'Г' => 'G',
+                                        'Д' => 'D',
+                                        'Е' => 'E',
+                                        'Ё' => 'E',
+                                        'Ж' => 'ZH',
+                                        'З' => 'Z',
+                                        'И' => 'I',
+                                        'Й' => 'I',
+                                        'К' => 'K',
+                                        'Л' => 'L',
+                                        'М' => 'M',
+                                        'Н' => 'N',
+                                        'О' => 'O',
+                                        'П' => 'P',
+                                        'Р' => 'R',
+                                        'С' => 'S',
+                                        'Т' => 'T',
+                                        'У' => 'U',
+                                        'Ф' => 'F',
+                                        'Х' => 'KH',
+                                        'Ц' => 'TS',
+                                        'Ч' => 'CH',
+                                        'Ш' => 'SH',
+                                        'Щ' => 'SHCH',
+                                        'Ы' => 'Y',
+                                        'Э' => 'E',
+                                        'Ю' => 'YU',
+                                        'Я' => 'YA',
+                                        'а' => 'A',
+                                        'б' => 'B',
+                                        'в' => 'V',
+                                        'г' => 'G',
+                                        'д' => 'D',
+                                        'е' => 'E',
+                                        'ё' => 'E',
+                                        'ж' => 'ZH',
+                                        'з' => 'Z',
+                                        'и' => 'I',
+                                        'й' => 'I',
+                                        'к' => 'K',
+                                        'л' => 'L',
+                                        'м' => 'M',
+                                        'н' => 'N',
+                                        'о' => 'O',
+                                        'п' => 'P',
+                                        'р' => 'R',
+                                        'с' => 'S',
+                                        'т' => 'T',
+                                        'у' => 'U',
+                                        'ф' => 'F',
+                                        'х' => 'KH',
+                                        'ц' => 'TS',
+                                        'ч' => 'CH',
+                                        'ш' => 'SH',
+                                        'щ' => 'SHCH',
+                                        'ы' => 'Y',
+                                        'э' => 'E',
+                                        'ю' => 'YU',
+                                        'я' => 'YA',
+                                        'Ъ' => '',
+                                        'ъ' => '',
+                                        'Ь' => '',
+                                        'ь' => '',
+
+                                        'Є' => 'YE',
+                                        'є' => 'YE',
+                                        'Ї' => 'YI',
+                                        'ї' => 'YI',
+                                        'Ґ' => 'KG',
+                                        'ґ' => 'KG',
+
+                                        'ð' => 'd',
+                                        'Ð' => 'D',
+                                        'þ' => 'th',
+                                        'Þ' => 'TH',
+
+                                        '&'    =>    '-',
+                                        '/'    =>    '-',
+                                        '('    =>    '-',
+                                        '"'    =>    '-',
+                                        "'"    =>    '-',
                             );
 
     public function __construct()
@@ -624,9 +627,9 @@ public function paginate($num_pages, $cur_page, $link, $args = null)
                 if ($current < 1 || $current > $num_pages) {
                     continue;
                 } elseif ($current != $cur_page || $link_to_all) {
-                    $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.str_replace('#', '', $this->get_sublink($link, 'page/$1', $current, $args)).'">'.$this->feather->utils->forum_number_format($current).'</a>';
+                    $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.str_replace('#', '', $this->get_sublink($link, 'page/$1', $current, $args)).'">'.Utils::forum_number_format($current).'</a>';
                 } else {
-                    $pages[] = '<strong'.(empty($pages) ? ' class="item1"' : '').'>'.$this->feather->utils->forum_number_format($current).'</strong>';
+                    $pages[] = '<strong'.(empty($pages) ? ' class="item1"' : '').'>'.Utils::forum_number_format($current).'</strong>';
                 }
             }
 
@@ -635,7 +638,7 @@ public function paginate($num_pages, $cur_page, $link, $args = null)
                     $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
                 }
 
-                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$this->get_sublink($link, 'page/$1', $num_pages, $args).'">'.$this->feather->utils->forum_number_format($num_pages).'</a>';
+                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$this->get_sublink($link, 'page/$1', $num_pages, $args).'">'.Utils::forum_number_format($num_pages).'</a>';
             }
 
             // Add a next page link
@@ -683,9 +686,9 @@ public function paginate_old($num_pages, $cur_page, $link)
                 if ($current < 1 || $current > $num_pages) {
                     continue;
                 } elseif ($current != $cur_page || $link_to_all) {
-                    $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.($current == 1 ? '' : '&amp;p='.$current).'">'.$this->feather->utils->forum_number_format($current).'</a>';
+                    $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.($current == 1 ? '' : '&amp;p='.$current).'">'.Utils::forum_number_format($current).'</a>';
                 } else {
-                    $pages[] = '<strong'.(empty($pages) ? ' class="item1"' : '').'>'.$this->feather->utils->forum_number_format($current).'</strong>';
+                    $pages[] = '<strong'.(empty($pages) ? ' class="item1"' : '').'>'.Utils::forum_number_format($current).'</strong>';
                 }
             }
 
@@ -694,7 +697,7 @@ public function paginate_old($num_pages, $cur_page, $link)
                     $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
                 }
 
-                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.$num_pages.'">'.$this->feather->utils->forum_number_format($num_pages).'</a>';
+                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$link.'&amp;p='.$num_pages.'">'.Utils::forum_number_format($num_pages).'</a>';
             }
 
             // Add a next page link
diff --git a/featherbb/Core/Utils.php b/featherbb/Core/Utils.php
index 3ea29c8e..8593e25d 100644
--- a/featherbb/Core/Utils.php
+++ b/featherbb/Core/Utils.php
@@ -35,7 +35,7 @@ public static function get_microtime()
     public function strip_bad_multibyte_chars($str)
     {
         $result = '';
-        $length = strlen($str);
+        $length = self::strlen($str);
 
         for ($i = 0; $i < $length; $i++) {
             // Replace four-byte characters (11110www 10zzzzzz 10yyyyyy 10xxxxxx)
@@ -54,7 +54,7 @@ public function strip_bad_multibyte_chars($str)
     //
     // A wrapper for PHP's number_format function
     //
-    public function forum_number_format($number, $decimals = 0)
+    public static function forum_number_format($number, $decimals = 0)
     {
         return is_numeric($number) ? number_format($number, $decimals, __('lang_decimal_point'), __('lang_thousands_sep')) : $number;
     }
@@ -116,7 +116,7 @@ public static function escape($str)
     //
     // A wrapper for utf8_strlen for compatibility
     //
-    public function strlen($str)
+    public static function strlen($str)
     {
         return utf8_strlen($str);
     }
@@ -125,7 +125,7 @@ public function strlen($str)
     //
     // Convert \r\n and \r to \n
     //
-    public function linebreaks($str)
+    public static function linebreaks($str)
     {
         return str_replace(array("\r\n", "\r"), "\n", $str);
     }
@@ -134,7 +134,7 @@ public function linebreaks($str)
     //
     // A wrapper for utf8_trim for compatibility
     //
-    public function trim($str, $charlist = false)
+    public static function trim($str, $charlist = false)
     {
         return is_string($str) ? utf8_trim($str, $charlist) : '';
     }
@@ -142,7 +142,7 @@ public function trim($str, $charlist = false)
     //
     // Checks if a string is in all uppercase
     //
-    public function is_all_uppercase($string)
+    public static function is_all_uppercase($string)
     {
         return utf8_strtoupper($string) == $string && utf8_strtolower($string) != $string;
     }
@@ -152,7 +152,7 @@ public function is_all_uppercase($string)
     //
     // This function takes care of possibly disabled unicode properties in PCRE builds
     //
-    public function ucp_preg_replace($pattern, $replace, $subject, $callback = false)
+    public static function ucp_preg_replace($pattern, $replace, $subject, $callback = false)
     {
         if ($callback) {
             $replaced = preg_replace_callback($pattern, create_function('$matches', 'return '.$replace.';'), $subject);
@@ -180,7 +180,7 @@ public function ucp_preg_replace($pattern, $replace, $subject, $callback = false
     //
     // Compute a hash of $str
     //
-    public static function feather_hash($str)
+    public static function hash($str)
     {
         return sha1($str);
     }
@@ -188,7 +188,7 @@ public static function feather_hash($str)
     //
     // Converts the file size in bytes to a human readable file size
     //
-    public function file_size($size)
+    public static function file_size($size)
     {
         $units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB');
 
diff --git a/featherbb/Core/View.php b/featherbb/Core/View.php
index 0a0efc1e..2bf9cdd7 100644
--- a/featherbb/Core/View.php
+++ b/featherbb/Core/View.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB;
 
+use FeatherBB\Utils;
+
 class View
 {
     protected $templatesDirectory,
@@ -301,7 +303,7 @@ public function addAsset($type, $asset, $params = array())
 
         $params = array_merge(static::getDefaultParams($type), $params);
         if (isset($params['title'])) {
-            $params['title'] = $this->app->utils->escape($params['title']);
+            $params['title'] = Utils::escape($params['title']);
         }
         $this->assets[$type][] = array(
             'file' => (string) $asset,
@@ -368,7 +370,7 @@ protected function getDefaultPageInfo()
         }
 
         $data = array(
-            'title' => $this->app->utils->escape($this->app->forum_settings['o_board_title']),
+            'title' => Utils::escape($this->app->forum_settings['o_board_title']),
             'page_number' => null,
             'active_page' => 'index',
             'focus_element' => null,
diff --git a/featherbb/Helpers/functions.php b/featherbb/Helpers/functions.php
index 40642d78..136706dd 100644
--- a/featherbb/Helpers/functions.php
+++ b/featherbb/Helpers/functions.php
@@ -66,7 +66,7 @@ function check_username($username, $errors, $exclude_id = null)
 
     if ($result) {
         $busy = $result['username'];
-        $errors[] = __('Username dupe 1').' '.$feather->utils->escape($busy).'. '.__('Username dupe 2');
+        $errors[] = __('Username dupe 1').' '.Utils::escape($busy).'. '.__('Username dupe 2');
     }
 
     // Check username for any banned usernames
@@ -95,7 +95,7 @@ function generate_avatar_markup($user_id)
         $path = $feather->config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type;
 
         if (file_exists(FEATHER_ROOT.$path) && $img_size = getimagesize(FEATHER_ROOT.$path)) {
-            $avatar_markup = '<img src="'.$feather->utils->escape($feather->url->base(true).'/'.$path.'?m='.filemtime(FEATHER_ROOT.$path)).'" '.$img_size[3].' alt="" />';
+            $avatar_markup = '<img src="'.Utils::escape($feather->url->base(true).'/'.$path.'?m='.filemtime(FEATHER_ROOT.$path)).'" '.$img_size[3].' alt="" />';
             break;
         }
     }
@@ -118,7 +118,7 @@ function generate_page_title($page_title, $p = null)
     $page_title = array_reverse($page_title);
 
     if ($p > 1) {
-        $page_title[0] .= ' ('.sprintf(__('Page'), $feather->utils->forum_number_format($p)).')';
+        $page_title[0] .= ' ('.sprintf(__('Page'), Utils::forum_number_format($p)).')';
     }
 
     $crumbs = implode(__('Title separator'), $page_title);
@@ -388,7 +388,7 @@ function get_title($user)
 
     // If the user has a custom title
     if ($user['title'] != '') {
-        $user_title = $feather->utils->escape($user['title']);
+        $user_title = Utils::escape($user['title']);
     }
     // If the user is banned
     elseif (in_array(utf8_strtolower($user['username']), $ban_list)) {
@@ -396,7 +396,7 @@ function get_title($user)
     }
     // If the user group has a default user title
     elseif ($user['g_user_title'] != '') {
-        $user_title = $feather->utils->escape($user['g_user_title']);
+        $user_title = Utils::escape($user['g_user_title']);
     }
     // If the user is a guest
     elseif ($user['g_id'] == FEATHER_GUEST) {
@@ -434,7 +434,7 @@ function message($msg, $http_status = null, $no_back_link = false)
 
     if (!defined('FEATHER_HEADER')) {
         $feather->view2->setPageInfo(array(
-            'title' => array($feather->utils->escape($feather->config['o_board_title']), __('Info')),
+            'title' => array(Utils::escape($feather->config['o_board_title']), __('Info')),
         ));
     }
 
diff --git a/featherbb/Model/Admin/Bans.php b/featherbb/Model/Admin/Bans.php
index f74d25ea..b8da6a66 100644
--- a/featherbb/Model/Admin/Bans.php
+++ b/featherbb/Model/Admin/Bans.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Utils;
 use DB;
 
 class Bans
@@ -54,7 +55,7 @@ public function add_ban_info($id = null)
         } else {
             // Otherwise the username is in POST
 
-            $ban['ban_user'] = $this->feather->utils->trim($this->request->post('new_ban_user'));
+            $ban['ban_user'] = Utils::trim($this->request->post('new_ban_user'));
 
             if ($ban['ban_user'] != '') {
                 $select_add_ban_info = array('id', 'group_id', 'username', 'email');
@@ -79,14 +80,14 @@ public function add_ban_info($id = null)
         // Make sure we're not banning an admin or moderator
         if (isset($group_id)) {
             if ($group_id == FEATHER_ADMIN) {
-                throw new \FeatherBB\Error(sprintf(__('User is admin message'), $this->feather->utils->escape($ban['ban_user'])), 403);
+                throw new \FeatherBB\Error(sprintf(__('User is admin message'), Utils::escape($ban['ban_user'])), 403);
             }
 
             $is_moderator_group = DB::for_table('groups')->where('g_id', $group_id)
                                         ->find_one_col('g_moderator');
 
             if ($is_moderator_group) {
-                throw new \FeatherBB\Error(sprintf(__('User is mod message'), $this->feather->utils->escape($ban['ban_user'])), 403);
+                throw new \FeatherBB\Error(sprintf(__('User is mod message'), Utils::escape($ban['ban_user'])), 403);
             }
         }
 
@@ -146,11 +147,11 @@ public function edit_ban_info($id)
 
     public function insert_ban()
     {
-        $ban_user = $this->feather->utils->trim($this->request->post('ban_user'));
-        $ban_ip = $this->feather->utils->trim($this->request->post('ban_ip'));
-        $ban_email = strtolower($this->feather->utils->trim($this->request->post('ban_email')));
-        $ban_message = $this->feather->utils->trim($this->request->post('ban_message'));
-        $ban_expire = $this->feather->utils->trim($this->request->post('ban_expire'));
+        $ban_user = Utils::trim($this->request->post('ban_user'));
+        $ban_ip = Utils::trim($this->request->post('ban_ip'));
+        $ban_email = strtolower(Utils::trim($this->request->post('ban_email')));
+        $ban_message = Utils::trim($this->request->post('ban_message'));
+        $ban_expire = Utils::trim($this->request->post('ban_expire'));
 
         $this->hook->fire('insert_ban_start', $ban_user, $ban_ip, $ban_email, $ban_message, $ban_expire);
 
@@ -168,14 +169,14 @@ public function insert_ban()
 
             if ($group_id) {
                 if ($group_id == FEATHER_ADMIN) {
-                    throw new \FeatherBB\Error(sprintf(__('User is admin message'), $this->feather->utils->escape($ban_user)), 403);
+                    throw new \FeatherBB\Error(sprintf(__('User is admin message'), Utils::escape($ban_user)), 403);
                 }
 
                 $is_moderator_group = DB::for_table('groups')->where('g_id', $group_id)
                                             ->find_one_col('g_moderator');
 
                 if ($is_moderator_group) {
-                    throw new \FeatherBB\Error(sprintf(__('User is mod message'), $this->feather->utils->escape($ban_user)), 403);
+                    throw new \FeatherBB\Error(sprintf(__('User is mod message'), Utils::escape($ban_user)), 403);
                 }
             }
         }
@@ -303,8 +304,8 @@ public function find_ban($start_from = false)
         // trim() all elements in $form
         $ban_info['conditions'] = $ban_info['query_str'] = array();
 
-        $expire_after = $this->request->get('expire_after') ? $this->feather->utils->trim($this->request->get('expire_after')) : '';
-        $expire_before = $this->request->get('expire_before') ? $this->feather->utils->trim($this->request->get('expire_before')) : '';
+        $expire_after = $this->request->get('expire_after') ? Utils::trim($this->request->get('expire_after')) : '';
+        $expire_before = $this->request->get('expire_before') ? Utils::trim($this->request->get('expire_before')) : '';
         $ban_info['order_by'] = $this->request->get('order_by') && in_array($this->request->get('order_by'), array('username', 'ip', 'email', 'expire')) ? 'b.'.$this->request->get('order_by') : 'b.username';
         $ban_info['direction'] = $this->request->get('direction') && $this->request->get('direction') == 'DESC' ? 'DESC' : 'ASC';
 
diff --git a/featherbb/Model/Admin/Categories.php b/featherbb/Model/Admin/Categories.php
index 9d75b638..a668d3b6 100644
--- a/featherbb/Model/Admin/Categories.php
+++ b/featherbb/Model/Admin/Categories.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Utils;
 use DB;
 
 class Categories
diff --git a/featherbb/Model/Admin/Censoring.php b/featherbb/Model/Admin/Censoring.php
index 34aeced3..a933c808 100644
--- a/featherbb/Model/Admin/Censoring.php
+++ b/featherbb/Model/Admin/Censoring.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Utils;
 use DB;
 
 class Censoring
@@ -25,8 +26,8 @@ public function __construct()
 
     public function add_word()
     {
-        $search_for = $this->feather->utils->trim($this->request->post('new_search_for'));
-        $replace_with = $this->feather->utils->trim($this->request->post('new_replace_with'));
+        $search_for = Utils::trim($this->request->post('new_search_for'));
+        $replace_with = Utils::trim($this->request->post('new_replace_with'));
 
         if ($search_for == '') {
             throw new \FeatherBB\Error(__('Must enter word message'), 400);
@@ -53,8 +54,8 @@ public function update_word()
     {
         $id = intval(key($this->request->post('update')));
 
-        $search_for = $this->feather->utils->trim($this->request->post('search_for')[$id]);
-        $replace_with = $this->feather->utils->trim($this->request->post('replace_with')[$id]);
+        $search_for = Utils::trim($this->request->post('search_for')[$id]);
+        $replace_with = Utils::trim($this->request->post('replace_with')[$id]);
 
         if ($search_for == '') {
             throw new \FeatherBB\Error(__('Must enter word message'), 400);
diff --git a/featherbb/Model/Admin/Forums.php b/featherbb/Model/Admin/Forums.php
index 006d1cb8..7e1cf2ed 100644
--- a/featherbb/Model/Admin/Forums.php
+++ b/featherbb/Model/Admin/Forums.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Utils;
 use DB;
 
 class Forums
diff --git a/featherbb/Model/Admin/Groups.php b/featherbb/Model/Admin/Groups.php
index d47f310e..7db9fc69 100644
--- a/featherbb/Model/Admin/Groups.php
+++ b/featherbb/Model/Admin/Groups.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Utils;
 use DB;
 
 class Groups
@@ -71,9 +72,9 @@ public function get_group_list($groups, $group)
         foreach ($groups as $cur_group) {
             if (($cur_group['g_id'] != $group['info']['g_id'] || $group['mode'] == 'add') && $cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
                 if ($cur_group['g_id'] == $group['info']['g_promote_next_group']) {
-                    $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+                    $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
                 } else {
-                    $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+                    $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
                 }
             }
         }
@@ -99,9 +100,9 @@ public function get_group_list_delete($group_id)
         foreach ($result as $cur_group) {
             if ($cur_group['g_id'] == FEATHER_MEMBER) {
                 // Pre-select the pre-defined Members group
-                $output .= "\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
             } else {
-                $output .= "\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
             }
         }
 
@@ -123,13 +124,13 @@ public function add_edit_group($groups)
         $is_admin_group = ($this->request->post('group_id') && $this->request->post('group_id') == FEATHER_ADMIN) ? true : false;
 
         // Set group title
-        $title = $this->feather->utils->trim($this->request->post('req_title'));
+        $title = Utils::trim($this->request->post('req_title'));
         if ($title == '') {
             throw new \FeatherBB\Error(__('Must enter title message'), 400);
         }
         $title = $this->hook->fire('add_edit_group_set_title', $title);
         // Set user title
-        $user_title = $this->feather->utils->trim($this->request->post('user_title'));
+        $user_title = Utils::trim($this->request->post('user_title'));
         $user_title = ($user_title != '') ? $user_title : 'NULL';
         $user_title = $this->hook->fire('add_edit_group_set_user_title', $user_title);
 
@@ -201,7 +202,7 @@ public function add_edit_group($groups)
             // Creating a new group
             $title_exists = DB::for_table('groups')->where('g_title', $title)->find_one();
             if ($title_exists) {
-                throw new \FeatherBB\Error(sprintf(__('Title already exists message'), $this->feather->utils->escape($title)), 400);
+                throw new \FeatherBB\Error(sprintf(__('Title already exists message'), Utils::escape($title)), 400);
             }
 
             DB::for_table('groups')
@@ -236,7 +237,7 @@ public function add_edit_group($groups)
             // We are editing an existing group
             $title_exists = DB::for_table('groups')->where('g_title', $title)->where_not_equal('g_id', $this->request->post('group_id'))->find_one();
             if ($title_exists) {
-                throw new \FeatherBB\Error(sprintf(__('Title already exists message'), $this->feather->utils->escape($title)), 400);
+                throw new \FeatherBB\Error(sprintf(__('Title already exists message'), Utils::escape($title)), 400);
             }
             DB::for_table('groups')
                     ->find_one($this->request->post('group_id'))
diff --git a/featherbb/Model/Admin/Maintenance.php b/featherbb/Model/Admin/Maintenance.php
index c4c51306..991d08aa 100644
--- a/featherbb/Model/Admin/Maintenance.php
+++ b/featherbb/Model/Admin/Maintenance.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Utils;
 use DB;
 
 class Maintenance
@@ -218,7 +219,7 @@ public function get_info_prune($prune_sticky, $prune_from)
     {
         $prune = array();
 
-        $prune['days'] = $this->feather->utils->trim($this->request->post('req_prune_days'));
+        $prune['days'] = Utils::trim($this->request->post('req_prune_days'));
         if ($prune['days'] == '' || preg_match('%[^0-9]%', $prune['days'])) {
             throw new \FeatherBB\Error(__('Days must be integer message'), 400);
         }
@@ -243,7 +244,7 @@ public function get_info_prune($prune_sticky, $prune_from)
             $forum = $this->hook->fireDB('maintenance.get_info_prune.forum_query', $forum);
             $forum = $forum->find_one_col('forum_name');
 
-            $prune['forum'] = '"'.$this->feather->utils->escape($forum).'"';
+            $prune['forum'] = '"'.Utils::escape($forum).'"';
         } else {
             $prune['forum'] = __('All forums');
         }
@@ -283,11 +284,11 @@ public function get_categories()
                     $output .= "\t\t\t\t\t\t\t\t\t\t\t".'</optgroup>'."\n";
                 }
 
-                $output .=  "\t\t\t\t\t\t\t\t\t\t\t".'<optgroup label="'.$this->feather->utils->escape($forum['cat_name']).'">'."\n";
+                $output .=  "\t\t\t\t\t\t\t\t\t\t\t".'<optgroup label="'.Utils::escape($forum['cat_name']).'">'."\n";
                 $cur_category = $forum['cid'];
             }
 
-            $output .=  "\t\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$forum['fid'].'">'.$this->feather->utils->escape($forum['forum_name']).'</option>'."\n";
+            $output .=  "\t\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$forum['fid'].'">'.Utils::escape($forum['forum_name']).'</option>'."\n";
         }
 
         $output = $this->hook->fire('maintenance.get_categories.output', $output);
diff --git a/featherbb/Model/Admin/Options.php b/featherbb/Model/Admin/Options.php
index 6ef7f8ad..7abf2110 100644
--- a/featherbb/Model/Admin/Options.php
+++ b/featherbb/Model/Admin/Options.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Utils;
 use DB;
 
 class Options
@@ -27,15 +28,15 @@ public function __construct()
     public function update_options()
     {
         $form = array(
-            'board_title'            => $this->feather->utils->trim($this->request->post('form_board_title')),
-            'board_desc'            => $this->feather->utils->trim($this->request->post('form_board_desc')),
-            'base_url'                => $this->feather->utils->trim($this->request->post('form_base_url')),
+            'board_title'            => Utils::trim($this->request->post('form_board_title')),
+            'board_desc'            => Utils::trim($this->request->post('form_board_desc')),
+            'base_url'                => Utils::trim($this->request->post('form_base_url')),
             'default_timezone'        => floatval($this->request->post('form_default_timezone')),
             'default_dst'            => $this->request->post('form_default_dst') != '1' ? '0' : '1',
-            'default_lang'            => $this->feather->utils->trim($this->request->post('form_default_lang')),
-            'default_style'            => $this->feather->utils->trim($this->request->post('form_default_style')),
-            'time_format'            => $this->feather->utils->trim($this->request->post('form_time_format')),
-            'date_format'            => $this->feather->utils->trim($this->request->post('form_date_format')),
+            'default_lang'            => Utils::trim($this->request->post('form_default_lang')),
+            'default_style'            => Utils::trim($this->request->post('form_default_style')),
+            'time_format'            => Utils::trim($this->request->post('form_time_format')),
+            'date_format'            => Utils::trim($this->request->post('form_date_format')),
             'timeout_visit'            => (intval($this->request->post('form_timeout_visit')) > 0) ? intval($this->request->post('form_timeout_visit')) : 1,
             'timeout_online'        => (intval($this->request->post('form_timeout_online')) > 0) ? intval($this->request->post('form_timeout_online')) : 1,
             'redirect_delay'        => (intval($this->request->post('form_redirect_delay')) >= 0) ? intval($this->request->post('form_redirect_delay')) : 0,
@@ -59,33 +60,33 @@ public function update_options()
             'quickjump'                => $this->request->post('form_quickjump') != '1' ? '0' : '1',
             'gzip'                    => $this->request->post('form_gzip') != '1' ? '0' : '1',
             'search_all_forums'        => $this->request->post('form_search_all_forums') != '1' ? '0' : '1',
-            'additional_navlinks'    => $this->feather->utils->trim($this->request->post('form_additional_navlinks')),
+            'additional_navlinks'    => Utils::trim($this->request->post('form_additional_navlinks')),
             'feed_type'                => intval($this->request->post('form_feed_type')),
             'feed_ttl'                => intval($this->request->post('form_feed_ttl')),
             'report_method'            => intval($this->request->post('form_report_method')),
-            'mailing_list'            => $this->feather->utils->trim($this->request->post('form_mailing_list')),
+            'mailing_list'            => Utils::trim($this->request->post('form_mailing_list')),
             'avatars'                => $this->request->post('form_avatars') != '1' ? '0' : '1',
-            'avatars_dir'            => $this->feather->utils->trim($this->request->post('form_avatars_dir')),
+            'avatars_dir'            => Utils::trim($this->request->post('form_avatars_dir')),
             'avatars_width'            => (intval($this->request->post('form_avatars_width')) > 0) ? intval($this->request->post('form_avatars_width')) : 1,
             'avatars_height'        => (intval($this->request->post('form_avatars_height')) > 0) ? intval($this->request->post('form_avatars_height')) : 1,
             'avatars_size'            => (intval($this->request->post('form_avatars_size')) > 0) ? intval($this->request->post('form_avatars_size')) : 1,
-            'admin_email'            => strtolower($this->feather->utils->trim($this->request->post('form_admin_email'))),
-            'webmaster_email'        => strtolower($this->feather->utils->trim($this->request->post('form_webmaster_email'))),
+            'admin_email'            => strtolower(Utils::trim($this->request->post('form_admin_email'))),
+            'webmaster_email'        => strtolower(Utils::trim($this->request->post('form_webmaster_email'))),
             'forum_subscriptions'    => $this->request->post('form_forum_subscriptions') != '1' ? '0' : '1',
             'topic_subscriptions'    => $this->request->post('form_topic_subscriptions') != '1' ? '0' : '1',
-            'smtp_host'                => $this->feather->utils->trim($this->request->post('form_smtp_host')),
-            'smtp_user'                => $this->feather->utils->trim($this->request->post('form_smtp_user')),
+            'smtp_host'                => Utils::trim($this->request->post('form_smtp_host')),
+            'smtp_user'                => Utils::trim($this->request->post('form_smtp_user')),
             'smtp_ssl'                => $this->request->post('form_smtp_ssl') != '1' ? '0' : '1',
             'regs_allow'            => $this->request->post('form_regs_allow') != '1' ? '0' : '1',
             'regs_verify'            => $this->request->post('form_regs_verify') != '1' ? '0' : '1',
             'regs_report'            => $this->request->post('form_regs_report') != '1' ? '0' : '1',
             'rules'                    => $this->request->post('form_rules') != '1' ? '0' : '1',
-            'rules_message'            => $this->feather->utils->trim($this->request->post('form_rules_message')),
+            'rules_message'            => Utils::trim($this->request->post('form_rules_message')),
             'default_email_setting'    => intval($this->request->post('form_default_email_setting')),
             'announcement'            => $this->request->post('form_announcement') != '1' ? '0' : '1',
-            'announcement_message'    => $this->feather->utils->trim($this->request->post('form_announcement_message')),
+            'announcement_message'    => Utils::trim($this->request->post('form_announcement_message')),
             'maintenance'            => $this->request->post('form_maintenance') != '1' ? '0' : '1',
-            'maintenance_message'    => $this->feather->utils->trim($this->request->post('form_maintenance_message')),
+            'maintenance_message'    => Utils::trim($this->request->post('form_maintenance_message')),
         );
 
         $form = $this->hook->fire('options.update_options.form', $form);
@@ -144,13 +145,13 @@ public function update_options()
         }
 
         if ($form['additional_navlinks'] != '') {
-            $form['additional_navlinks'] = $this->feather->utils->trim($this->feather->utils->linebreaks($form['additional_navlinks']));
+            $form['additional_navlinks'] = Utils::trim(Utils::linebreaks($form['additional_navlinks']));
         }
 
         // Change or enter a SMTP password
         if ($this->request->post('form_smtp_change_pass')) {
-            $smtp_pass1 = $this->request->post('form_smtp_pass1') ? $this->feather->utils->trim($this->request->post('form_smtp_pass1')) : '';
-            $smtp_pass2 = $this->request->post('form_smtp_pass2') ? $this->feather->utils->trim($this->request->post('form_smtp_pass2')) : '';
+            $smtp_pass1 = $this->request->post('form_smtp_pass1') ? Utils::trim($this->request->post('form_smtp_pass1')) : '';
+            $smtp_pass2 = $this->request->post('form_smtp_pass2') ? Utils::trim($this->request->post('form_smtp_pass2')) : '';
 
             if ($smtp_pass1 == $smtp_pass2) {
                 $form['smtp_pass'] = $smtp_pass1;
@@ -160,21 +161,21 @@ public function update_options()
         }
 
         if ($form['announcement_message'] != '') {
-            $form['announcement_message'] = $this->feather->utils->linebreaks($form['announcement_message']);
+            $form['announcement_message'] = Utils::linebreaks($form['announcement_message']);
         } else {
             $form['announcement_message'] = __('Enter announcement here');
             $form['announcement'] = '0';
         }
 
         if ($form['rules_message'] != '') {
-            $form['rules_message'] = $this->feather->utils->linebreaks($form['rules_message']);
+            $form['rules_message'] = Utils::linebreaks($form['rules_message']);
         } else {
             $form['rules_message'] = __('Enter rules here');
             $form['rules'] = '0';
         }
 
         if ($form['maintenance_message'] != '') {
-            $form['maintenance_message'] = $this->feather->utils->linebreaks($form['maintenance_message']);
+            $form['maintenance_message'] = Utils::linebreaks($form['maintenance_message']);
         } else {
             $form['maintenance_message'] = __('Default maintenance message');
             $form['maintenance'] = '0';
diff --git a/featherbb/Model/Admin/Parser.php b/featherbb/Model/Admin/Parser.php
index 97e8d5a3..bbb65e5d 100644
--- a/featherbb/Model/Admin/Parser.php
+++ b/featherbb/Model/Admin/Parser.php
@@ -10,6 +10,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Utils;
 use DB;
 
 class Parser
diff --git a/featherbb/Model/Admin/Permissions.php b/featherbb/Model/Admin/Permissions.php
index 4a635d4b..223fbd63 100644
--- a/featherbb/Model/Admin/Permissions.php
+++ b/featherbb/Model/Admin/Permissions.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Utils;
 use DB;
 
 class Permissions
diff --git a/featherbb/Model/Admin/Reports.php b/featherbb/Model/Admin/Reports.php
index 34ef7a76..04796bd9 100644
--- a/featherbb/Model/Admin/Reports.php
+++ b/featherbb/Model/Admin/Reports.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Utils;
 use DB;
 
 class Reports
diff --git a/featherbb/Model/Admin/Statistics.php b/featherbb/Model/Admin/Statistics.php
index a9de8ec0..13ad31a9 100644
--- a/featherbb/Model/Admin/Statistics.php
+++ b/featherbb/Model/Admin/Statistics.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Utils;
 use DB;
 
 class Statistics
diff --git a/featherbb/Model/Admin/Users.php b/featherbb/Model/Admin/Users.php
index cce23d65..fc8e484d 100644
--- a/featherbb/Model/Admin/Users.php
+++ b/featherbb/Model/Admin/Users.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Utils;
 use DB;
 
 class Users
@@ -449,8 +450,8 @@ public function ban_users()
         }
 
         if ($this->request->post('ban_users_comply')) {
-            $ban_message = $this->feather->utils->trim($this->request->post('ban_message'));
-            $ban_expire = $this->feather->utils->trim($this->request->post('ban_expire'));
+            $ban_message = Utils::trim($this->request->post('ban_message'));
+            $ban_expire = Utils::trim($this->request->post('ban_expire'));
             $ban_the_ip = $this->request->post('ban_the_ip') ? intval($this->request->post('ban_the_ip')) : 0;
 
             $this->hook->fire('model.users.ban_users.comply', $ban_message, $ban_expire, $ban_the_ip);
@@ -541,14 +542,14 @@ public function get_user_search()
         // trim() all elements in $form
         $form = array_map('trim', $form);
 
-        $posts_greater = $this->request->get('posts_greater') ? $this->feather->utils->trim($this->request->get('posts_greater')) : '';
-        $posts_less = $this->request->get('posts_less') ? $this->feather->utils->trim($this->request->get('posts_less')) : '';
-        $last_post_after = $this->request->get('last_post_after') ? $this->feather->utils->trim($this->request->get('last_post_after')) : '';
-        $last_post_before = $this->request->get('last_post_before') ? $this->feather->utils->trim($this->request->get('last_post_before')) : '';
-        $last_visit_after = $this->request->get('last_visit_after') ? $this->feather->utils->trim($this->request->get('last_visit_after')) : '';
-        $last_visit_before = $this->request->get('last_visit_before') ? $this->feather->utils->trim($this->request->get('last_visit_before')) : '';
-        $registered_after = $this->request->get('registered_after') ? $this->feather->utils->trim($this->request->get('registered_after')) : '';
-        $registered_before = $this->request->get('registered_before') ? $this->feather->utils->trim($this->request->get('registered_before')) : '';
+        $posts_greater = $this->request->get('posts_greater') ? Utils::trim($this->request->get('posts_greater')) : '';
+        $posts_less = $this->request->get('posts_less') ? Utils::trim($this->request->get('posts_less')) : '';
+        $last_post_after = $this->request->get('last_post_after') ? Utils::trim($this->request->get('last_post_after')) : '';
+        $last_post_before = $this->request->get('last_post_before') ? Utils::trim($this->request->get('last_post_before')) : '';
+        $last_visit_after = $this->request->get('last_visit_after') ? Utils::trim($this->request->get('last_visit_after')) : '';
+        $last_visit_before = $this->request->get('last_visit_before') ? Utils::trim($this->request->get('last_visit_before')) : '';
+        $registered_after = $this->request->get('registered_after') ? Utils::trim($this->request->get('registered_after')) : '';
+        $registered_before = $this->request->get('registered_before') ? Utils::trim($this->request->get('registered_before')) : '';
         $order_by = $search['order_by'] = $this->request->get('order_by') && in_array($this->request->get('order_by'), array('username', 'email', 'num_posts', 'last_post', 'last_visit', 'registered')) ? $this->request->get('order_by') : 'username';
         $direction = $search['direction'] = $this->request->get('direction') && $this->request->get('direction') == 'DESC' ? 'DESC' : 'ASC';
         $user_group = $this->request->get('user_group') ? intval($this->request->get('user_group')) : -1;
@@ -692,7 +693,7 @@ public function get_group_list()
                         ->order_by('g_title');
 
         foreach ($result as $cur_group) {
-            $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+            $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
         }
 
         $output = $this->hook->fire('model.users.get_group_list.output', $output);
diff --git a/featherbb/Model/Auth.php b/featherbb/Model/Auth.php
index d2667858..52767205 100644
--- a/featherbb/Model/Auth.php
+++ b/featherbb/Model/Auth.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Auth
@@ -113,7 +114,7 @@ public static function set_new_password($pass, $key, $user_id)
         $feather = \Slim\Slim::getInstance();
 
         $query['update'] = array(
-            'activate_string' => feather_hash($pass),
+            'activate_string' => hash($pass),
             'activate_key'    => $key,
             'last_email_sent' => $feather->now
         );
diff --git a/featherbb/Model/Cache.php b/featherbb/Model/Cache.php
index 0675030b..e94b7eac 100644
--- a/featherbb/Model/Cache.php
+++ b/featherbb/Model/Cache.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Cache
diff --git a/featherbb/Model/Debug.php b/featherbb/Model/Debug.php
index a0acbbab..da7a623d 100644
--- a/featherbb/Model/Debug.php
+++ b/featherbb/Model/Debug.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Debug
@@ -30,10 +31,10 @@ public static function get_info()
     {
         self::$feather = \Slim\Slim::getInstance();
 
-        $data = array('exec_time' => (self::$feather->utils->get_microtime() - self::$feather->start));
+        $data = array('exec_time' => (Utils::get_microtime() - self::$feather->start));
         $data['nb_queries'] = (isset(DB::get_query_log()[0])) ? count(DB::get_query_log()[0]) : 'N/A';
-        $data['mem_usage'] = (function_exists('memory_get_usage')) ? self::$feather->utils->file_size(memory_get_usage()) : 'N/A';
-        $data['mem_peak_usage'] = (function_exists('memory_get_peak_usage')) ? self::$feather->utils->file_size(memory_get_peak_usage()) : 'N/A';
+        $data['mem_usage'] = (function_exists('memory_get_usage')) ? Utils::file_size(memory_get_usage()) : 'N/A';
+        $data['mem_peak_usage'] = (function_exists('memory_get_peak_usage')) ? Utils::file_size(memory_get_peak_usage()) : 'N/A';
         return $data;
     }
 }
diff --git a/featherbb/Model/Delete.php b/featherbb/Model/Delete.php
index eb1673db..3ff834dd 100644
--- a/featherbb/Model/Delete.php
+++ b/featherbb/Model/Delete.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Delete
diff --git a/featherbb/Model/Edit.php b/featherbb/Model/Edit.php
index e3e2faa5..6d28bab8 100644
--- a/featherbb/Model/Edit.php
+++ b/featherbb/Model/Edit.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Edit
@@ -62,30 +63,30 @@ public function check_errors_before_edit($can_edit_subject, $errors)
 
         // If it's a topic it must contain a subject
         if ($can_edit_subject) {
-            $subject = $this->feather->utils->trim($this->request->post('req_subject'));
+            $subject = Utils::trim($this->request->post('req_subject'));
 
             if ($this->config['o_censoring'] == '1') {
-                $censored_subject = $this->feather->utils->trim(censor_words($subject));
+                $censored_subject = Utils::trim(censor_words($subject));
             }
 
             if ($subject == '') {
                 $errors[] = __('No subject');
             } elseif ($this->config['o_censoring'] == '1' && $censored_subject == '') {
                 $errors[] = __('No subject after censoring');
-            } elseif ($this->feather->utils->strlen($subject) > 70) {
+            } elseif (Utils::strlen($subject) > 70) {
                 $errors[] = __('Too long subject');
-            } elseif ($this->config['p_subject_all_caps'] == '0' && $this->feather->utils->is_all_uppercase($subject) && !$this->user->is_admmod) {
+            } elseif ($this->config['p_subject_all_caps'] == '0' && Utils::is_all_uppercase($subject) && !$this->user->is_admmod) {
                 $errors[] = __('All caps subject');
             }
         }
 
         // Clean up message from POST
-        $message = $this->feather->utils->linebreaks($this->feather->utils->trim($this->request->post('req_message')));
+        $message = Utils::linebreaks(Utils::trim($this->request->post('req_message')));
 
-        // Here we use strlen() not $this->feather->utils->strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
+        // Here we use strlen() not Utils::strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         if (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            $errors[] = sprintf(__('Too long message'), $this->feather->utils->forum_number_format(FEATHER_MAX_POSTSIZE));
-        } elseif ($this->config['p_message_all_caps'] == '0' && $this->feather->utils->is_all_uppercase($message) && !$this->user->is_admmod) {
+            $errors[] = sprintf(__('Too long message'), Utils::forum_number_format(FEATHER_MAX_POSTSIZE));
+        } elseif ($this->config['p_message_all_caps'] == '0' && Utils::is_all_uppercase($message) && !$this->user->is_admmod) {
             $errors[] = __('All caps message');
         }
 
@@ -99,7 +100,7 @@ public function check_errors_before_edit($can_edit_subject, $errors)
                 $errors[] = __('No message');
             } elseif ($this->config['o_censoring'] == '1') {
                 // Censor message to see if that causes problems
-                $censored_message = $this->feather->utils->trim(censor_words($message));
+                $censored_message = Utils::trim(censor_words($message));
 
                 if ($censored_message == '') {
                     $errors[] = __('No message after censoring');
@@ -126,7 +127,7 @@ public function setup_variables($cur_post, $is_admmod, $can_edit_subject, $error
         }
 
         // Clean up message from POST
-        $post['message'] = $this->feather->utils->linebreaks($this->feather->utils->trim($this->request->post('req_message')));
+        $post['message'] = Utils::linebreaks(Utils::trim($this->request->post('req_message')));
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
@@ -134,11 +135,11 @@ public function setup_variables($cur_post, $is_admmod, $can_edit_subject, $error
         }
 
         // Replace four-byte characters (MySQL cannot handle them)
-        $post['message'] = $this->feather->utils->strip_bad_multibyte_chars($post['message']);
+        $post['message'] = Utils::strip_bad_multibyte_chars($post['message']);
 
         // Get the subject
         if ($can_edit_subject) {
-            $post['subject'] = $this->feather->utils->trim($this->request->post('req_subject'));
+            $post['subject'] = Utils::trim($this->request->post('req_subject'));
         }
 
         $post = $this->hook->fire('setup_variables_edit', $post);
diff --git a/featherbb/Model/Header.php b/featherbb/Model/Header.php
index 835c46fb..38f8ffe9 100644
--- a/featherbb/Model/Header.php
+++ b/featherbb/Model/Header.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Header
diff --git a/featherbb/Model/Index.php b/featherbb/Model/Index.php
index 32858ff6..4295b068 100644
--- a/featherbb/Model/Index.php
+++ b/featherbb/Model/Index.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Index
@@ -183,12 +184,12 @@ public function print_categories_forums()
 
             // Is this a redirect forum?
             if ($cur_forum->redirect_url != '') {
-                $cur_forum->forum_field = '<h3><span class="redirtext">'.__('Link to').'</span> <a href="'.$this->feather->utils->escape($cur_forum->redirect_url).'" title="'.__('Link to').' '.$this->feather->utils->escape($cur_forum->redirect_url).'">'.$this->feather->utils->escape($cur_forum->forum_name).'</a></h3>';
+                $cur_forum->forum_field = '<h3><span class="redirtext">'.__('Link to').'</span> <a href="'.Utils::escape($cur_forum->redirect_url).'" title="'.__('Link to').' '.Utils::escape($cur_forum->redirect_url).'">'.Utils::escape($cur_forum->forum_name).'</a></h3>';
                 $cur_forum->num_topics_formatted = $cur_forum->num_posts_formatted = '-';
                 $cur_forum->item_status .= ' iredirect';
                 $cur_forum->icon_type = 'icon';
             } else {
-                $cur_forum->forum_field = '<h3><a href="'.$this->feather->url->get('forum/'.$cur_forum->fid.'/'.$this->feather->url->url_friendly($cur_forum->forum_name)).'/'.'">'.$this->feather->utils->escape($cur_forum->forum_name).'</a>'.(!empty($forum_field_new) ? ' '.$forum_field_new : '').'</h3>';
+                $cur_forum->forum_field = '<h3><a href="'.$this->feather->url->get('forum/'.$cur_forum->fid.'/'.$this->feather->url->url_friendly($cur_forum->forum_name)).'/'.'">'.Utils::escape($cur_forum->forum_name).'</a>'.(!empty($forum_field_new) ? ' '.$forum_field_new : '').'</h3>';
                 $cur_forum->num_topics_formatted = $cur_forum->num_topics;
                 $cur_forum->num_posts_formatted = $cur_forum->num_posts;
             }
@@ -199,7 +200,7 @@ public function print_categories_forums()
 
             // If there is a last_post/last_poster
             if ($cur_forum->last_post != '') {
-                $cur_forum->last_post_formatted = '<a href="'.$this->feather->url->get('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.$this->feather->utils->format_time($cur_forum->last_post).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_forum->last_poster).'</span>';
+                $cur_forum->last_post_formatted = '<a href="'.$this->feather->url->get('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.$this->feather->utils->format_time($cur_forum->last_post).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_forum->last_poster).'</span>';
             } elseif ($cur_forum->redirect_url != '') {
                 $cur_forum->last_post_formatted = '- - -';
             } else {
@@ -212,9 +213,9 @@ public function print_categories_forums()
 
                 foreach ($mods_array as $mod_username => $mod_id) {
                     if ($this->user->g_view_users == '1') {
-                        $moderators[] = '<a href="'.$this->feather->url->get('user/'.$mod_id.'/').'">'.$this->feather->utils->escape($mod_username).'</a>';
+                        $moderators[] = '<a href="'.$this->feather->url->get('user/'.$mod_id.'/').'">'.Utils::escape($mod_username).'</a>';
                     } else {
-                        $moderators[] = $this->feather->utils->escape($mod_username);
+                        $moderators[] = Utils::escape($mod_username);
                     }
                 }
 
@@ -256,9 +257,9 @@ public function collect_stats()
         $stats['total_posts'] = intval($query['total_posts']);
 
         if ($this->user->g_view_users == '1') {
-            $stats['newest_user'] = '<a href="'.$this->feather->url->get('user/'.$stats['last_user']['id']).'/">'.$this->feather->utils->escape($stats['last_user']['username']).'</a>';
+            $stats['newest_user'] = '<a href="'.$this->feather->url->get('user/'.$stats['last_user']['id']).'/">'.Utils::escape($stats['last_user']['username']).'</a>';
         } else {
-            $stats['newest_user'] = $this->feather->utils->escape($stats['last_user']['username']);
+            $stats['newest_user'] = Utils::escape($stats['last_user']['username']);
         }
 
         $stats = $this->hook->fire('collect_stats', $stats);
@@ -291,9 +292,9 @@ public function fetch_users_online()
         foreach($query as $user_online) {
             if ($user_online->user_id > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $online['users'][] = "\n\t\t\t\t".'<dd><a href="'.$this->feather->url->get('user/'.$user_online->user_id).'/">'.$this->feather->utils->escape($user_online->ident).'</a>';
+                    $online['users'][] = "\n\t\t\t\t".'<dd><a href="'.$this->feather->url->get('user/'.$user_online->user_id).'/">'.Utils::escape($user_online->ident).'</a>';
                 } else {
-                    $online['users'][] = "\n\t\t\t\t".'<dd>'.$this->feather->utils->escape($user_online->ident);
+                    $online['users'][] = "\n\t\t\t\t".'<dd>'.Utils::escape($user_online->ident);
                 }
             } else {
                 ++$online['num_guests'];
diff --git a/featherbb/Model/Install.php b/featherbb/Model/Install.php
index c976050f..9b5d45de 100644
--- a/featherbb/Model/Install.php
+++ b/featherbb/Model/Install.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Install
@@ -393,7 +394,7 @@ public static function load_admin_user(array $data)
         return $user = array(
             'group_id' => 1,
             'username' => $data['username'],
-            'password' => \FeatherBB\Utils::feather_hash($data['password']),
+            'password' => \FeatherBB\Utils::hash($data['password']),
             'email' => $data['email'],
             'language' => $data['default_lang'],
             'style' => $data['default_style'],
diff --git a/featherbb/Model/Login.php b/featherbb/Model/Login.php
index 1964332f..33f042b5 100644
--- a/featherbb/Model/Login.php
+++ b/featherbb/Model/Login.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Login
@@ -29,8 +30,8 @@ public function login()
     {
         $this->hook->fire('login_start');
 
-        $form_username = $this->feather->utils->trim($this->request->post('req_username'));
-        $form_password = $this->feather->utils->trim($this->request->post('req_password'));
+        $form_username = Utils::trim($this->request->post('req_username'));
+        $form_password = Utils::trim($this->request->post('req_password'));
         $save_pass = $this->request->post('save_pass');
 
         $user = DB::for_table('users')->where('username', $form_username);
@@ -42,7 +43,7 @@ public function login()
         $authorized = false;
 
         if (!empty($user->password)) {
-            $form_password_hash = \FeatherBB\Utils::feather_hash($form_password); // Will result in a SHA-1 hash
+            $form_password_hash = \FeatherBB\Utils::hash($form_password); // Will result in a SHA-1 hash
             $authorized = ($user->password == $form_password_hash);
         }
 
@@ -84,14 +85,14 @@ public function login()
         $redirect_url = $this->request->post('redirect_url');
         $redirect_url = $this->hook->fire('redirect_url_login', $redirect_url);
 
-        redirect($this->feather->utils->escape($redirect_url), __('Login redirect'));
+        redirect(Utils::escape($redirect_url), __('Login redirect'));
     }
 
     public function logout($id, $token)
     {
         $token = $this->hook->fire('logout_start', $token, $id);
 
-        if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != \FeatherBB\Utils::feather_hash($this->user->id.\FeatherBB\Utils::feather_hash($this->request->getIp()))) {
+        if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != \FeatherBB\Utils::hash($this->user->id.\FeatherBB\Utils::hash($this->request->getIp()))) {
             header('Location: '.$this->feather->url->base());
             exit;
         }
@@ -112,7 +113,7 @@ public function logout($id, $token)
 
         $this->hook->fire('logout_end');
 
-        $this->auth->feather_setcookie(1, \FeatherBB\Utils::feather_hash(uniqid(rand(), true)), time() + 31536000);
+        $this->auth->feather_setcookie(1, \FeatherBB\Utils::hash(uniqid(rand(), true)), time() + 31536000);
 
         redirect($this->feather->url->base(), __('Logout redirect'));
     }
@@ -130,7 +131,7 @@ public function password_forgotten()
 
         if ($this->feather->request()->isPost()) {
             // Validate the email address
-            $email = strtolower($this->feather->utils->trim($this->request->post('req_email')));
+            $email = strtolower(Utils::trim($this->request->post('req_email')));
             if (!$this->email->is_valid_email($email)) {
                 $errors[] = __('Invalid email');
             }
@@ -172,7 +173,7 @@ public function password_forgotten()
                         $new_password_key = random_pass(8);
 
                         $query['update'] = array(
-                            'activate_string' => \FeatherBB\Utils::feather_hash($new_password),
+                            'activate_string' => \FeatherBB\Utils::hash($new_password),
                             'activate_key'    => $new_password_key,
                             'last_email_sent' => time()
                         );
@@ -193,9 +194,9 @@ public function password_forgotten()
                         $this->email->feather_mail($email, $mail_subject, $cur_mail_message);
                     }
 
-                    throw new \FeatherBB\Error(__('Forget mail').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.', 400);
+                    throw new \FeatherBB\Error(__('Forget mail').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', 400);
                 } else {
-                    $errors[] = __('No email match').' '.$this->feather->utils->escape($email).'.';
+                    $errors[] = __('No email match').' '.Utils::escape($email).'.';
                 }
             }
         }
diff --git a/featherbb/Model/Misc.php b/featherbb/Model/Misc.php
index b6d35f7f..8c98ed8b 100644
--- a/featherbb/Model/Misc.php
+++ b/featherbb/Model/Misc.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Misc
@@ -64,15 +65,15 @@ public function send_email($mail)
         $mail = $this->hook->fire('send_email_start', $mail);
 
         // Clean up message and subject from POST
-        $subject = $this->feather->utils->trim($this->request->post('req_subject'));
-        $message = $this->feather->utils->trim($this->request->post('req_message'));
+        $subject = Utils::trim($this->request->post('req_subject'));
+        $message = Utils::trim($this->request->post('req_message'));
 
         if ($subject == '') {
             throw new \FeatherBB\Error(__('No email subject'), 400);
         } elseif ($message == '') {
             throw new \FeatherBB\Error(__('No email message'), 400);
         }
-        // Here we use strlen() not $this->feather->utils->strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
+        // Here we use strlen() not Utils::strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         elseif (strlen($message) > FEATHER_MAX_POSTSIZE) {
             throw new \FeatherBB\Error(__('Too long email message'), 400);
         }
@@ -87,8 +88,8 @@ public function send_email($mail)
 
         // The first row contains the subject
         $first_crlf = strpos($mail_tpl, "\n");
-        $mail_subject = $this->feather->utils->trim(substr($mail_tpl, 8, $first_crlf-8));
-        $mail_message = $this->feather->utils->trim(substr($mail_tpl, $first_crlf));
+        $mail_subject = Utils::trim(substr($mail_tpl, 8, $first_crlf-8));
+        $mail_message = Utils::trim(substr($mail_tpl, $first_crlf));
 
         $mail_subject = str_replace('<mail_subject>', $subject, $mail_subject);
         $mail_message = str_replace('<sender>', $this->user->username, $mail_message);
@@ -138,7 +139,7 @@ public function insert_report($post_id)
         $post_id = $this->hook->fire('insert_report_start', $post_id);
 
         // Clean up reason from POST
-        $reason = $this->feather->utils->linebreaks($this->feather->utils->trim($this->request->post('req_reason')));
+        $reason = Utils::linebreaks(Utils::trim($this->request->post('req_reason')));
         if ($reason == '') {
             throw new \FeatherBB\Error(__('No reason'), 400);
         } elseif (strlen($reason) > 65535) { // TEXT field can only hold 65535 bytes
diff --git a/featherbb/Model/Moderate.php b/featherbb/Model/Moderate.php
index 7777d227..2c346b9b 100644
--- a/featherbb/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Moderate
@@ -219,11 +220,11 @@ public function split_posts($tid, $fid, $p = null)
             }
 
             // Check subject
-            $new_subject = $this->request->post('new_subject') ? $this->feather->utils->trim($this->request->post('new_subject')) : '';
+            $new_subject = $this->request->post('new_subject') ? Utils::trim($this->request->post('new_subject')) : '';
 
             if ($new_subject == '') {
                 throw new \FeatherBB\Error(__('No subject'), 400);
-            } elseif (feather_strlen($new_subject) > 70) {
+            } elseif (Utils::strlen($new_subject) > 70) {
                 throw new \FeatherBB\Error(__('Too long subject'), 400);
             }
 
@@ -357,11 +358,11 @@ public function get_forum_list_split($id)
                     $output .= "\t\t\t\t\t\t\t".'</optgroup>'."\n";
                 }
 
-                $output .= "\t\t\t\t\t\t\t".'<optgroup label="'.$this->feather->utils->escape($cur_forum->cat_name).'">'."\n";
+                $output .= "\t\t\t\t\t\t\t".'<optgroup label="'.Utils::escape($cur_forum->cat_name).'">'."\n";
                 $cur_category = $cur_forum->cid;
             }
 
-            $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_forum->fid.'"'.($id == $cur_forum->fid ? ' selected="selected"' : '').'>'.$this->feather->utils->escape($cur_forum->forum_name).'</option>'."\n";
+            $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_forum->fid.'"'.($id == $cur_forum->fid ? ' selected="selected"' : '').'>'.Utils::escape($cur_forum->forum_name).'</option>'."\n";
         }
 
         $output = $this->hook->fire('get_forum_list_split', $output);
@@ -402,12 +403,12 @@ public function get_forum_list_move($id)
                     $output .= "\t\t\t\t\t\t\t".'</optgroup>'."\n";
                 }
 
-                $output .= "\t\t\t\t\t\t\t".'<optgroup label="'.$this->feather->utils->escape($cur_forum->cat_name).'">'."\n";
+                $output .= "\t\t\t\t\t\t\t".'<optgroup label="'.Utils::escape($cur_forum->cat_name).'">'."\n";
                 $cur_category = $cur_forum->cid;
             }
 
             if ($cur_forum->fid != $id) {
-                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_forum->fid.'">'.$this->feather->utils->escape($cur_forum->forum_name).'</option>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_forum->fid.'">'.Utils::escape($cur_forum->forum_name).'</option>'."\n";
             }
         }
 
@@ -456,9 +457,9 @@ public function display_posts_view($tid, $start_from)
             // If the poster is a registered user
             if ($cur_post->poster_id > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $cur_post->poster_disp = '<a href="'.$this->feather->url->get('user/'.$cur_post->poster_id.'/').'">'.$this->feather->utils->escape($cur_post->poster).'</a>';
+                    $cur_post->poster_disp = '<a href="'.$this->feather->url->get('user/'.$cur_post->poster_id.'/').'">'.Utils::escape($cur_post->poster).'</a>';
                 } else {
-                    $cur_post->poster_disp = $this->feather->utils->escape($cur_post->poster);
+                    $cur_post->poster_disp = Utils::escape($cur_post->poster);
                 }
 
                 // get_title() requires that an element 'username' be present in the array
@@ -471,7 +472,7 @@ public function display_posts_view($tid, $start_from)
             }
             // If the poster is a guest (or a user that has been deleted)
             else {
-                $cur_post->poster_disp = $this->feather->utils->escape($cur_post->poster);
+                $cur_post->poster_disp = Utils::escape($cur_post->poster);
                 $cur_post->user_title = __('Guest');
             }
 
@@ -917,7 +918,7 @@ public function display_topics($fid, $sort_by, $start_from)
                 $url_topic = $this->feather->url->url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_disp'] = '<a href="'.$this->feather->url->get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.$this->feather->utils->format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_disp'] = '<a href="'.$this->feather->url->get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.$this->feather->utils->format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['last_poster']).'</span>';
                     $cur_topic['ghost_topic'] = false;
                 } else {
                     $cur_topic['last_post_disp'] = '- - -';
@@ -934,13 +935,13 @@ public function display_topics($fid, $sort_by, $start_from)
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.$this->feather->utils->escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.$this->feather->utils->escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.$this->feather->utils->escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
index 92ab0169..1124c8c2 100644
--- a/featherbb/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Post
@@ -76,7 +77,7 @@ public function get_info_post($tid, $fid)
     // Checks the post for errors before posting
     public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
     {
-        global $lang_antispam, $lang_antispam_questions, $pd;
+        global $lang_antispam, $lang_antispam_questions;
 
         $fid = $this->hook->fire('check_errors_before_post_start', $fid);
 
@@ -84,7 +85,7 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
         if ($this->user->is_guest) {
 
             // It's a guest, so we have to validate the username
-            $errors = check_username($this->feather->utils->trim($this->request->post('req_username')), $errors);
+            $errors = check_username(Utils::trim($this->request->post('req_username')), $errors);
 
             $errors = $this->hook->fire('check_errors_before_post_antispam', $errors);
 
@@ -108,11 +109,11 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
 
         // If it's a new topic
         if ($fid) {
-            $subject = $this->feather->utils->trim($this->request->post('req_subject'));
+            $subject = Utils::trim($this->request->post('req_subject'));
             $subject = $this->hook->fire('check_errors_before_new_topic_subject', $subject);
 
             if ($this->config['o_censoring'] == '1') {
-                $censored_subject = $this->feather->utils->trim(censor_words($subject));
+                $censored_subject = Utils::trim(censor_words($subject));
                 $censored_subject = $this->hook->fire('check_errors_before_censored', $censored_subject);
             }
 
@@ -120,9 +121,9 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
                 $errors[] = __('No subject');
             } elseif ($this->config['o_censoring'] == '1' && $censored_subject == '') {
                 $errors[] = __('No subject after censoring');
-            } elseif ($this->feather->utils->strlen($subject) > 70) {
+            } elseif (Utils::strlen($subject) > 70) {
                 $errors[] = __('Too long subject');
-            } elseif ($this->config['p_subject_all_caps'] == '0' && $this->feather->utils->is_all_uppercase($subject) && !$this->user->is_admmod) {
+            } elseif ($this->config['p_subject_all_caps'] == '0' && Utils::is_all_uppercase($subject) && !$this->user->is_admmod) {
                 $errors[] = __('All caps subject');
             }
 
@@ -130,7 +131,7 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
         }
 
         if ($this->user->is_guest) {
-            $email = strtolower($this->feather->utils->trim(($this->config['p_force_guest_email'] == '1') ? $this->request->post('req_email') : $this->request->post('email')));
+            $email = strtolower(Utils::trim(($this->config['p_force_guest_email'] == '1') ? $this->request->post('req_email') : $this->request->post('email')));
 
             if ($this->config['p_force_guest_email'] == '1' || $email != '') {
                 $errors = $this->hook->fire('check_errors_before_post_email', $errors, $email);
@@ -152,13 +153,13 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
         }
 
         // Clean up message from POST
-        $message = $this->feather->utils->linebreaks($this->feather->utils->trim($this->request->post('req_message')));
+        $message = Utils::linebreaks(Utils::trim($this->request->post('req_message')));
         $message = $this->hook->fire('check_errors_before_post_message', $message);
 
-        // Here we use strlen() not $this->feather->utils->strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
+        // Here we use strlen() not Utils::strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         if (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            $errors[] = sprintf(__('Too long message'), $this->feather->utils->forum_number_format(FEATHER_MAX_POSTSIZE));
-        } elseif ($this->config['p_message_all_caps'] == '0' && $this->feather->utils->is_all_uppercase($message) && !$this->user->is_admmod) {
+            $errors[] = sprintf(__('Too long message'), Utils::forum_number_format(FEATHER_MAX_POSTSIZE));
+        } elseif ($this->config['p_message_all_caps'] == '0' && Utils::is_all_uppercase($message) && !$this->user->is_admmod) {
             $errors[] = __('All caps message');
         }
 
@@ -174,7 +175,7 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
                 $errors[] = __('No message');
             } elseif ($this->config['o_censoring'] == '1') {
                 // Censor message to see if that causes problems
-                $censored_message = $this->feather->utils->trim(censor_words($message));
+                $censored_message = Utils::trim(censor_words($message));
 
                 if ($censored_message == '') {
                     $errors[] = __('No message after censoring');
@@ -200,19 +201,19 @@ public function setup_variables($errors, $is_admmod)
         }
         // Otherwise it should be in $feather ($_POST)
         else {
-            $post['username'] = $this->feather->utils->trim($this->request->post('req_username'));
-            $post['email'] = strtolower($this->feather->utils->trim(($this->config['p_force_guest_email'] == '1') ? $this->request->post('req_email') : $this->request->post('email')));
+            $post['username'] = Utils::trim($this->request->post('req_username'));
+            $post['email'] = strtolower(Utils::trim(($this->config['p_force_guest_email'] == '1') ? $this->request->post('req_email') : $this->request->post('email')));
         }
 
         if ($this->request->post('req_subject')) {
-            $post['subject'] = $this->feather->utils->trim($this->request->post('req_subject'));
+            $post['subject'] = Utils::trim($this->request->post('req_subject'));
         }
 
         $post['hide_smilies'] = $this->request->post('hide_smilies') ? '1' : '0';
         $post['subscribe'] = $this->request->post('subscribe') ? '1' : '0';
         $post['stick_topic'] = $this->request->post('stick_topic') && $is_admmod ? '1' : '0';
 
-        $post['message']  = $this->feather->utils->linebreaks($this->feather->utils->trim($this->request->post('req_message')));
+        $post['message']  = Utils::linebreaks(Utils::trim($this->request->post('req_message')));
 
         // Validate BBCode syntax
         if ($this->config['p_message_bbcode'] == '1') {
@@ -220,7 +221,7 @@ public function setup_variables($errors, $is_admmod)
         }
 
         // Replace four-byte characters (MySQL cannot handle them)
-        $post['message'] = $this->feather->utils->strip_bad_multibyte_chars($post['message']);
+        $post['message'] = Utils::strip_bad_multibyte_chars($post['message']);
 
         $post['time'] = time();
 
@@ -372,7 +373,7 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
         if ($result) {
             $notification_emails = array();
 
-            $censored_message = $this->feather->utils->trim(censor_words($post['message']));
+            $censored_message = Utils::trim(censor_words($post['message']));
 
             if ($this->config['o_censoring'] == '1') {
                 $cleaned_message = $this->email->bbcode2email($censored_message, -1);
@@ -580,8 +581,8 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
         if ($result) {
             $notification_emails = array();
 
-            $censored_message = $this->feather->utils->trim(censor_words($post['message']));
-            $censored_subject = $this->feather->utils->trim(censor_words($post['subject']));
+            $censored_message = Utils::trim(censor_words($post['message']));
+            $censored_subject = Utils::trim(censor_words($post['subject']));
 
             if ($this->config['o_censoring'] == '1') {
                 $cleaned_message = $this->email->bbcode2email($censored_message, -1);
@@ -794,7 +795,7 @@ public function get_quote_message($qid, $tid)
             $quote['message'] = censor_words($quote['message']);
         }
 
-        $quote['message'] = $this->feather->utils->escape($quote['message']);
+        $quote['message'] = Utils::escape($quote['message']);
 
         if ($this->config['p_message_bbcode'] == '1') {    // Sanitize username for inclusion within QUOTE BBCode attribute.
                 //   This is a bit tricky because a username can have any "special"
@@ -803,10 +804,10 @@ public function get_quote_message($qid, $tid)
                     // Check if we need to quote it.
                     // Post has special chars. Escape escapes and quotes then wrap in quotes.
                     if (strpos($quote['poster'], '"') !== false && strpos($quote['poster'], '\'') === false) { // If there are double quotes but no single quotes, use single quotes,
-                        $quote['poster'] = $this->feather->utils->escape(str_replace('\\', '\\\\', $quote['poster']));
+                        $quote['poster'] = Utils::escape(str_replace('\\', '\\\\', $quote['poster']));
                         $quote['poster'] = '\''. $quote['poster'] .'#'. $qid .'\'';
                     } else { // otherwise use double quotes.
-                        $quote['poster'] = $this->feather->utils->escape(str_replace(array('\\', '"'), array('\\\\', '\\"'), $quote['poster']));
+                        $quote['poster'] = Utils::escape(str_replace(array('\\', '"'), array('\\\\', '\\"'), $quote['poster']));
                         $quote['poster'] = '"'. $quote['poster'] .'#'. $qid .'"';
                     }
                 } else {
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index 8a217d24..37dba267 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Profile
@@ -46,7 +47,7 @@ public function change_pass($id)
             $cur_user = $cur_user->find_one();
 
             if ($key == '' || $key != $cur_user['activate_key']) {
-                throw new \FeatherBB\Error(__('Pass key bad').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.', 400);
+                throw new \FeatherBB\Error(__('Pass key bad').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', 400);
             } else {
                 $query = DB::for_table('users')
                     ->where('id', $id)
@@ -91,14 +92,14 @@ public function change_pass($id)
         }
 
         if ($this->request->isPost()) {
-            $old_password = $this->request->post('req_old_password') ? $this->feather->utils->trim($this->request->post('req_old_password')) : '';
-            $new_password1 = $this->feather->utils->trim($this->request->post('req_new_password1'));
-            $new_password2 = $this->feather->utils->trim($this->request->post('req_new_password2'));
+            $old_password = $this->request->post('req_old_password') ? Utils::trim($this->request->post('req_old_password')) : '';
+            $new_password1 = Utils::trim($this->request->post('req_new_password1'));
+            $new_password2 = Utils::trim($this->request->post('req_new_password2'));
 
             if ($new_password1 != $new_password2) {
                 throw new \FeatherBB\Error(__('Pass not match'), 400);
             }
-            if ($this->feather->utils->strlen($new_password1) < 6) {
+            if (Utils::strlen($new_password1) < 6) {
                 throw new \FeatherBB\Error(__('Pass too short'), 400);
             }
 
@@ -110,7 +111,7 @@ public function change_pass($id)
             $authorized = false;
 
             if (!empty($cur_user['password'])) {
-                $old_password_hash = \FeatherBB\Utils::feather_hash($old_password);
+                $old_password_hash = \FeatherBB\Utils::hash($old_password);
 
                 if ($cur_user['password'] == $old_password_hash || $this->user->is_admmod) {
                     $authorized = true;
@@ -121,7 +122,7 @@ public function change_pass($id)
                 throw new \FeatherBB\Error(__('Wrong pass'), 403);
             }
 
-            $new_password_hash = \FeatherBB\Utils::feather_hash($new_password1);
+            $new_password_hash = \FeatherBB\Utils::hash($new_password1);
 
             $update_password = DB::for_table('users')
                 ->where('id', $id)
@@ -182,7 +183,7 @@ public function change_email($id)
             $new_email_key = $new_email_key->find_one_col('activate_key');
 
             if ($key == '' || $key != $new_email_key) {
-                throw new \FeatherBB\Error(__('Email key bad').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.', 400);
+                throw new \FeatherBB\Error(__('Email key bad').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', 400);
             } else {
                 $update_mail = DB::for_table('users')
                     ->where('id', $id)
@@ -198,12 +199,12 @@ public function change_email($id)
         } elseif ($this->request->isPost()) {
             $this->hook->fire('change_email_post');
 
-            if (\FeatherBB\Utils::feather_hash($this->request->post('req_password')) !== $this->user->password) {
+            if (\FeatherBB\Utils::hash($this->request->post('req_password')) !== $this->user->password) {
                 message(__('Wrong pass'));
             }
 
             // Validate the email address
-            $new_email = strtolower($this->feather->utils->trim($this->request->post('req_new_email')));
+            $new_email = strtolower(Utils::trim($this->request->post('req_new_email')));
             $new_email = $this->hook->fire('change_email_new_email', $new_email);
             if (!$this->email->is_valid_email($new_email)) {
                 throw new \FeatherBB\Error(__('Invalid email'), 400);
@@ -308,7 +309,7 @@ public function change_email($id)
 
             $this->hook->fire('change_email_sent');
 
-            message(__('Activate email sent').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.', true);
+            message(__('Activate email sent').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', true);
         }
         $this->hook->fire('change_email');
     }
@@ -363,12 +364,12 @@ public function upload_avatar($id, $files_data)
 
             // Make sure the file isn't too big
             if ($uploaded_file['size'] > $this->config['o_avatars_size']) {
-                message(__('Too large').' '.$this->feather->utils->forum_number_format($this->config['o_avatars_size']).' '.__('bytes').'.');
+                message(__('Too large').' '.Utils::forum_number_format($this->config['o_avatars_size']).' '.__('bytes').'.');
             }
 
             // Move the file to the avatar directory. We do this before checking the width/height to circumvent open_basedir restrictions
             if (!@move_uploaded_file($uploaded_file['tmp_name'], FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp')) {
-                message(__('Move failed').' <a href="mailto:'.$this->feather->utils->escape($this->config['o_admin_email']).'">'.$this->feather->utils->escape($this->config['o_admin_email']).'</a>.');
+                message(__('Move failed').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.');
             }
 
             list($width, $height, $type, ) = @getimagesize(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
@@ -779,18 +780,18 @@ public function update_profile($id, $info, $section)
                 // Make sure we got a valid language string
                 if ($this->request->post('form_language')) {
                     $languages = \FeatherBB\Lister::getLangs();
-                    $form['language'] = $this->feather->utils->trim($this->request->post('form_language'));
+                    $form['language'] = Utils::trim($this->request->post('form_language'));
                     if (!in_array($form['language'], $languages)) {
                         message(__('Bad request'), '404');
                     }
                 }
 
                 if ($this->user->is_admmod) {
-                    $form['admin_note'] = $this->feather->utils->trim($this->request->post('admin_note'));
+                    $form['admin_note'] = Utils::trim($this->request->post('admin_note'));
 
                     // Are we allowed to change usernames?
                     if ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && $this->user->g_mod_rename_users == '1')) {
-                        $form['username'] = $this->feather->utils->trim($this->request->post('req_username'));
+                        $form['username'] = Utils::trim($this->request->post('req_username'));
 
                         if ($form['username'] != $info['old_username']) {
                             $errors = '';
@@ -811,7 +812,7 @@ public function update_profile($id, $info, $section)
 
                 if ($this->config['o_regs_verify'] == '0' || $this->user->is_admmod) {
                     // Validate the email address
-                    $form['email'] = strtolower($this->feather->utils->trim($this->request->post('req_email')));
+                    $form['email'] = strtolower(Utils::trim($this->request->post('req_email')));
                     if (!$this->email->is_valid_email($form['email'])) {
                         message(__('Invalid email'));
                     }
@@ -823,9 +824,9 @@ public function update_profile($id, $info, $section)
             case 'personal':
             {
                 $form = array(
-                    'realname'        => $this->request->post('form_realname') ? $this->feather->utils->trim($this->request->post('form_realname')) : '',
-                    'url'            => $this->request->post('form_url') ? $this->feather->utils->trim($this->request->post('form_url')) : '',
-                    'location'        => $this->request->post('form_location') ? $this->feather->utils->trim($this->request->post('form_location')) : '',
+                    'realname'        => $this->request->post('form_realname') ? Utils::trim($this->request->post('form_realname')) : '',
+                    'url'            => $this->request->post('form_url') ? Utils::trim($this->request->post('form_url')) : '',
+                    'location'        => $this->request->post('form_location') ? Utils::trim($this->request->post('form_location')) : '',
                 );
 
                 // Add http:// if the URL doesn't contain it already (while allowing https://, too)
@@ -848,9 +849,9 @@ public function update_profile($id, $info, $section)
                 }
 
                 if ($this->user->g_id == FEATHER_ADMIN) {
-                    $form['title'] = $this->feather->utils->trim($this->request->post('title'));
+                    $form['title'] = Utils::trim($this->request->post('title'));
                 } elseif ($this->user->g_set_title == '1') {
-                    $form['title'] = $this->feather->utils->trim($this->request->post('title'));
+                    $form['title'] = Utils::trim($this->request->post('title'));
 
                     if ($form['title'] != '') {
                         // A list of words that the title may not contain
@@ -869,11 +870,11 @@ public function update_profile($id, $info, $section)
             case 'messaging':
             {
                 $form = array(
-                    'jabber'        => $this->feather->utils->trim($this->request->post('form_jabber')),
-                    'icq'            => $this->feather->utils->trim($this->request->post('form_icq')),
-                    'msn'            => $this->feather->utils->trim($this->request->post('form_msn')),
-                    'aim'            => $this->feather->utils->trim($this->request->post('form_aim')),
-                    'yahoo'            => $this->feather->utils->trim($this->request->post('form_yahoo')),
+                    'jabber'        => Utils::trim($this->request->post('form_jabber')),
+                    'icq'            => Utils::trim($this->request->post('form_icq')),
+                    'msn'            => Utils::trim($this->request->post('form_msn')),
+                    'aim'            => Utils::trim($this->request->post('form_aim')),
+                    'yahoo'            => Utils::trim($this->request->post('form_yahoo')),
                 );
 
                 // If the ICQ UIN contains anything other than digits it's invalid
@@ -890,14 +891,14 @@ public function update_profile($id, $info, $section)
 
                 // Clean up signature from POST
                 if ($this->config['o_signatures'] == '1') {
-                    $form['signature'] = $this->feather->utils->linebreaks($this->feather->utils->trim($this->request->post('signature')));
+                    $form['signature'] = Utils::linebreaks(Utils::trim($this->request->post('signature')));
 
                     // Validate signature
-                    if ($this->feather->utils->strlen($form['signature']) > $this->config['p_sig_length']) {
-                        message(sprintf(__('Sig too long'), $this->config['p_sig_length'], $this->feather->utils->strlen($form['signature']) - $this->config['p_sig_length']));
+                    if (Utils::strlen($form['signature']) > $this->config['p_sig_length']) {
+                        message(sprintf(__('Sig too long'), $this->config['p_sig_length'], Utils::strlen($form['signature']) - $this->config['p_sig_length']));
                     } elseif (substr_count($form['signature'], "\n") > ($this->config['p_sig_lines']-1)) {
                         message(sprintf(__('Sig too many lines'), $this->config['p_sig_lines']));
-                    } elseif ($form['signature'] && $this->config['p_sig_all_caps'] == '0' && $this->feather->utils->is_all_uppercase($form['signature']) && !$this->user->is_admmod) {
+                    } elseif ($form['signature'] && $this->config['p_sig_all_caps'] == '0' && Utils::is_all_uppercase($form['signature']) && !$this->user->is_admmod) {
                         $form['signature'] = utf8_ucwords(utf8_strtolower($form['signature']));
                     }
 
@@ -919,8 +920,8 @@ public function update_profile($id, $info, $section)
             case 'display':
             {
                 $form = array(
-                    'disp_topics'        => $this->feather->utils->trim($this->request->post('form_disp_topics')),
-                    'disp_posts'        => $this->feather->utils->trim($this->request->post('form_disp_posts')),
+                    'disp_topics'        => Utils::trim($this->request->post('form_disp_topics')),
+                    'disp_posts'        => Utils::trim($this->request->post('form_disp_posts')),
                     'show_smilies'        => $this->request->post('form_show_smilies') ? '1' : '0',
                     'show_img'            => $this->request->post('form_show_img') ? '1' : '0',
                     'show_img_sig'        => $this->request->post('form_show_img_sig') ? '1' : '0',
@@ -949,7 +950,7 @@ public function update_profile($id, $info, $section)
                 // Make sure we got a valid style string
                 if ($this->request->post('form_style')) {
                     $styles = \FeatherBB\Lister::getStyles();
-                    $form['style'] = $this->feather->utils->trim($this->request->post('form_style'));
+                    $form['style'] = Utils::trim($this->request->post('form_style'));
                     if (!in_array($form['style'], $styles)) {
                         message(__('Bad request'), '404');
                     }
@@ -1111,7 +1112,7 @@ public function parse_user_info($user)
         $user_info = $this->hook->fire('parse_user_info_start', $user_info, $user);
 
         $user_info['personal'][] = '<dt>'.__('Username').'</dt>';
-        $user_info['personal'][] = '<dd>'.$this->feather->utils->escape($user['username']).'</dd>';
+        $user_info['personal'][] = '<dd>'.Utils::escape($user['username']).'</dd>';
 
         $user_title_field = get_title($user);
         $user_info['personal'][] = '<dt>'.__('Title').'</dt>';
@@ -1119,22 +1120,22 @@ public function parse_user_info($user)
 
         if ($user['realname'] != '') {
             $user_info['personal'][] = '<dt>'.__('Realname').'</dt>';
-            $user_info['personal'][] = '<dd>'.$this->feather->utils->escape(($this->config['o_censoring'] == '1') ? censor_words($user['realname']) : $user['realname']).'</dd>';
+            $user_info['personal'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? censor_words($user['realname']) : $user['realname']).'</dd>';
         }
 
         if ($user['location'] != '') {
             $user_info['personal'][] = '<dt>'.__('Location').'</dt>';
-            $user_info['personal'][] = '<dd>'.$this->feather->utils->escape(($this->config['o_censoring'] == '1') ? censor_words($user['location']) : $user['location']).'</dd>';
+            $user_info['personal'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? censor_words($user['location']) : $user['location']).'</dd>';
         }
 
         if ($user['url'] != '') {
-            $user['url'] = $this->feather->utils->escape(($this->config['o_censoring'] == '1') ? censor_words($user['url']) : $user['url']);
+            $user['url'] = Utils::escape(($this->config['o_censoring'] == '1') ? censor_words($user['url']) : $user['url']);
             $user_info['personal'][] = '<dt>'.__('Website').'</dt>';
             $user_info['personal'][] = '<dd><span class="website"><a href="'.$user['url'].'" rel="nofollow">'.$user['url'].'</a></span></dd>';
         }
 
         if ($user['email_setting'] == '0' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-            $user['email_field'] = '<a href="mailto:'.$this->feather->utils->escape($user['email']).'">'.$this->feather->utils->escape($user['email']).'</a>';
+            $user['email_field'] = '<a href="mailto:'.Utils::escape($user['email']).'">'.Utils::escape($user['email']).'</a>';
         } elseif ($user['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
             $user['email_field'] = '<a href="'.$this->feather->url->get('email/'.$user['id'].'/').'">'.__('Send email').'</a>';
         } else {
@@ -1147,7 +1148,7 @@ public function parse_user_info($user)
 
         if ($user['jabber'] != '') {
             $user_info['messaging'][] = '<dt>'.__('Jabber').'</dt>';
-            $user_info['messaging'][] = '<dd>'.$this->feather->utils->escape(($this->config['o_censoring'] == '1') ? censor_words($user['jabber']) : $user['jabber']).'</dd>';
+            $user_info['messaging'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? censor_words($user['jabber']) : $user['jabber']).'</dd>';
         }
 
         if ($user['icq'] != '') {
@@ -1157,17 +1158,17 @@ public function parse_user_info($user)
 
         if ($user['msn'] != '') {
             $user_info['messaging'][] = '<dt>'.__('MSN').'</dt>';
-            $user_info['messaging'][] = '<dd>'.$this->feather->utils->escape(($this->config['o_censoring'] == '1') ? censor_words($user['msn']) : $user['msn']).'</dd>';
+            $user_info['messaging'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? censor_words($user['msn']) : $user['msn']).'</dd>';
         }
 
         if ($user['aim'] != '') {
             $user_info['messaging'][] = '<dt>'.__('AOL IM').'</dt>';
-            $user_info['messaging'][] = '<dd>'.$this->feather->utils->escape(($this->config['o_censoring'] == '1') ? censor_words($user['aim']) : $user['aim']).'</dd>';
+            $user_info['messaging'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? censor_words($user['aim']) : $user['aim']).'</dd>';
         }
 
         if ($user['yahoo'] != '') {
             $user_info['messaging'][] = '<dt>'.__('Yahoo').'</dt>';
-            $user_info['messaging'][] = '<dd>'.$this->feather->utils->escape(($this->config['o_censoring'] == '1') ? censor_words($user['yahoo']) : $user['yahoo']).'</dd>';
+            $user_info['messaging'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? censor_words($user['yahoo']) : $user['yahoo']).'</dd>';
         }
 
         if ($this->config['o_avatars'] == '1') {
@@ -1187,7 +1188,7 @@ public function parse_user_info($user)
 
         $posts_field = '';
         if ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) {
-            $posts_field = $this->feather->utils->forum_number_format($user['num_posts']);
+            $posts_field = Utils::forum_number_format($user['num_posts']);
         }
         if ($this->user->g_search == '1') {
             $quick_searches = array();
@@ -1229,17 +1230,17 @@ public function edit_essentials($id, $user)
 
         if ($this->user->is_admmod) {
             if ($this->user->g_id == FEATHER_ADMIN || $this->user->g_mod_rename_users == '1') {
-                $user_disp['username_field'] = '<label class="required"><strong>'.__('Username').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_username" value="'.$this->feather->utils->escape($user['username']).'" size="25" maxlength="25" /><br /></label>'."\n";
+                $user_disp['username_field'] = '<label class="required"><strong>'.__('Username').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_username" value="'.Utils::escape($user['username']).'" size="25" maxlength="25" /><br /></label>'."\n";
             } else {
-                $user_disp['username_field'] = '<p>'.sprintf(__('Username info'), $this->feather->utils->escape($user['username'])).'</p>'."\n";
+                $user_disp['username_field'] = '<p>'.sprintf(__('Username info'), Utils::escape($user['username'])).'</p>'."\n";
             }
 
-            $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.$this->feather->utils->escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.$this->feather->url->get('email/'.$id.'/').'">'.__('Send email').'</a></span></p>'."\n";
+            $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.Utils::escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.$this->feather->url->get('email/'.$id.'/').'">'.__('Send email').'</a></span></p>'."\n";
         } else {
-            $user_disp['username_field'] = '<p>'.__('Username').': '.$this->feather->utils->escape($user['username']).'</p>'."\n";
+            $user_disp['username_field'] = '<p>'.__('Username').': '.Utils::escape($user['username']).'</p>'."\n";
 
             if ($this->config['o_regs_verify'] == '1') {
-                $user_disp['email_field'] = '<p>'.sprintf(__('Email info'), $this->feather->utils->escape($user['email']).' - <a href="'.$this->feather->url->get('user/'.$id.'/action/change_email/').'">'.__('Change email').'</a>').'</p>'."\n";
+                $user_disp['email_field'] = '<p>'.sprintf(__('Email info'), Utils::escape($user['email']).' - <a href="'.$this->feather->url->get('user/'.$id.'/action/change_email/').'">'.__('Change email').'</a>').'</p>'."\n";
             } else {
                 $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.$user['email'].'" size="40" maxlength="80" /><br /></label>'."\n";
             }
@@ -1251,7 +1252,7 @@ public function edit_essentials($id, $user)
         if ($this->user->g_id == FEATHER_ADMIN) {
             $user_disp['posts_field'] .= '<label>'.__('Posts').'<br /><input type="text" name="num_posts" value="'.$user['num_posts'].'" size="8" maxlength="8" /><br /></label>';
         } elseif ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) {
-            $posts_actions[] = sprintf(__('Posts info'), $this->feather->utils->forum_number_format($user['num_posts']));
+            $posts_actions[] = sprintf(__('Posts info'), Utils::forum_number_format($user['num_posts']));
         }
 
         if ($this->user->g_search == '1' || $this->user->g_id == FEATHER_ADMIN) {
@@ -1287,9 +1288,9 @@ public function get_group_list($user)
 
         foreach ($result as $cur_group) {
             if ($cur_group['g_id'] == $user['g_id'] || ($cur_group['g_id'] == $this->config['o_default_user_group'] && $user['g_id'] == '')) {
-                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
             } else {
-                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
             }
         }
 
@@ -1328,13 +1329,13 @@ public function get_forum_list($id)
                     $output .= "\n\t\t\t\t\t\t\t".'</div>'."\n";
                 }
 
-                $output .= "\t\t\t\t\t\t\t".'<div class="conl">'."\n\t\t\t\t\t\t\t\t".'<p><strong>'.$this->feather->utils->escape($cur_forum['cat_name']).'</strong></p>'."\n\t\t\t\t\t\t\t\t".'<div class="rbox">';
+                $output .= "\t\t\t\t\t\t\t".'<div class="conl">'."\n\t\t\t\t\t\t\t\t".'<p><strong>'.Utils::escape($cur_forum['cat_name']).'</strong></p>'."\n\t\t\t\t\t\t\t\t".'<div class="rbox">';
                 $cur_category = $cur_forum['cid'];
             }
 
             $moderators = ($cur_forum['moderators'] != '') ? unserialize($cur_forum['moderators']) : array();
 
-            $output .= "\n\t\t\t\t\t\t\t\t\t".'<label><input type="checkbox" name="moderator_in['.$cur_forum['fid'].']" value="1"'.((in_array($id, $moderators)) ? ' checked="checked"' : '').' />'.$this->feather->utils->escape($cur_forum['forum_name']).'<br /></label>'."\n";
+            $output .= "\n\t\t\t\t\t\t\t\t\t".'<label><input type="checkbox" name="moderator_in['.$cur_forum['fid'].']" value="1"'.((in_array($id, $moderators)) ? ' checked="checked"' : '').' />'.Utils::escape($cur_forum['forum_name']).'<br /></label>'."\n";
         }
 
         $output = $this->hook->fire('get_forum_list', $output);
diff --git a/featherbb/Model/Register.php b/featherbb/Model/Register.php
index 6444a7fc..5a8268a0 100644
--- a/featherbb/Model/Register.php
+++ b/featherbb/Model/Register.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Register
@@ -46,23 +47,23 @@ public function check_for_errors()
         }
 
 
-        $user['username'] = $this->feather->utils->trim($this->request->post('req_user'));
-        $user['email1'] = strtolower($this->feather->utils->trim($this->request->post('req_email1')));
+        $user['username'] = Utils::trim($this->request->post('req_user'));
+        $user['email1'] = strtolower(Utils::trim($this->request->post('req_email1')));
 
         if ($this->config['o_regs_verify'] == '1') {
-            $email2 = strtolower($this->feather->utils->trim($this->request->post('req_email2')));
+            $email2 = strtolower(Utils::trim($this->request->post('req_email2')));
 
             $user['password1'] = random_pass(12);
             $password2 = $user['password1'];
         } else {
-            $user['password1'] = $this->feather->utils->trim($this->request->post('req_password1'));
-            $password2 = $this->feather->utils->trim($this->request->post('req_password2'));
+            $user['password1'] = Utils::trim($this->request->post('req_password1'));
+            $password2 = Utils::trim($this->request->post('req_password2'));
         }
 
         // Validate username and passwords
         $user['errors'] = check_username($user['username'], $user['errors']);
 
-        if ($this->feather->utils->strlen($user['password1']) < 6) {
+        if (Utils::strlen($user['password1']) < 6) {
             $user['errors'][] = __('Pass too short');
         } elseif ($user['password1'] != $password2) {
             $user['errors'][] = __('Pass not match');
@@ -138,7 +139,7 @@ public function insert_user($user)
         $now = time();
 
         $intial_group_id = ($this->config['o_regs_verify'] == '0') ? $this->config['o_default_user_group'] : FEATHER_UNVERIFIED;
-        $password_hash = \FeatherBB\Utils::feather_hash($user['password1']);
+        $password_hash = \FeatherBB\Utils::hash($user['password1']);
 
         // Add the user
         $user['insert'] = array(
diff --git a/featherbb/Model/Search.php b/featherbb/Model/Search.php
index 5d5c6cea..232ad7a0 100644
--- a/featherbb/Model/Search.php
+++ b/featherbb/Model/Search.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Search
@@ -52,14 +53,14 @@ public function get_search_results()
         }
         // If it's a regular search (keywords and/or author)
         elseif ($action == 'search') {
-            $keywords = ($this->request->get('keywords')) ? utf8_strtolower($this->feather->utils->trim($this->request->get('keywords'))) : null;
-            $author = ($this->request->get('author')) ? utf8_strtolower($this->feather->utils->trim($this->request->get('author'))) : null;
+            $keywords = ($this->request->get('keywords')) ? utf8_strtolower(Utils::trim($this->request->get('keywords'))) : null;
+            $author = ($this->request->get('author')) ? utf8_strtolower(Utils::trim($this->request->get('author'))) : null;
 
-            if (preg_match('%^[\*\%]+$%', $keywords) || ($this->feather->utils->strlen(str_replace(array('*', '%'), '', $keywords)) < FEATHER_SEARCH_MIN_WORD && !$this->search->is_cjk($keywords))) {
+            if (preg_match('%^[\*\%]+$%', $keywords) || (Utils::strlen(str_replace(array('*', '%'), '', $keywords)) < FEATHER_SEARCH_MIN_WORD && !$this->search->is_cjk($keywords))) {
                 $keywords = '';
             }
 
-            if (preg_match('%^[\*\%]+$%', $author) || $this->feather->utils->strlen(str_replace(array('*', '%'), '', $author)) < 2) {
+            if (preg_match('%^[\*\%]+$%', $author) || Utils::strlen(str_replace(array('*', '%'), '', $author)) < 2) {
                 $author = '';
             }
 
@@ -290,13 +291,13 @@ public function get_search_results()
                 // If we searched for both keywords and author name we want the intersection between the results
                 if ($author && $keywords) {
                     $search_ids = array_intersect_assoc($keyword_results, $author_results);
-                    $search_type = array('both', array($keywords, $this->feather->utils->trim($this->request->get('author'))), implode(',', $forums), $search_in);
+                    $search_type = array('both', array($keywords, Utils::trim($this->request->get('author'))), implode(',', $forums), $search_in);
                 } elseif ($keywords) {
                     $search_ids = $keyword_results;
                     $search_type = array('keywords', $keywords, implode(',', $forums), $search_in);
                 } else {
                     $search_ids = $author_results;
-                    $search_type = array('author', $this->feather->utils->trim($this->request->get('author')), implode(',', $forums), $search_in);
+                    $search_type = array('author', Utils::trim($this->request->get('author')), implode(',', $forums), $search_in);
                 }
 
                 $search_ids = $this->hook->fire('get_search_results_search_ids', $search_ids);
@@ -643,9 +644,9 @@ public function get_search_results()
 
             if ($search_type[0] == 'action') {
                 if ($search_type[1] == 'show_user_topics') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_topics'), $this->feather->utils->escape($search['search_set'][0]['poster'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_topics'), Utils::escape($search['search_set'][0]['poster'])).'</a>';
                 } elseif ($search_type[1] == 'show_user_posts') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_posts'), $this->feather->utils->escape($search['search_set'][0]['pposter'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_posts'), Utils::escape($search['search_set'][0]['pposter'])).'</a>';
                 } elseif ($search_type[1] == 'show_subscriptions') {
                     // Fetch username of subscriber
                     $subscriber_id = $search_type[2];
@@ -658,7 +659,7 @@ public function get_search_results()
                         throw new \FeatherBB\Error(__('Bad request'), 404);
                     }
 
-                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), $this->feather->utils->escape($subscriber_name)).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), Utils::escape($subscriber_name)).'</a>';
                 } else {
                     $search_url = str_replace('_', '/', $search_type[1]);
                     $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/'.$search_url.'/').'">'.__('Quick search '.$search_type[1]).'</a>';
@@ -668,13 +669,13 @@ public function get_search_results()
 
                 if ($search_type[0] == 'both') {
                     list($keywords, $author) = $search_type[1];
-                    $search['crumbs_text']['search_type'] = sprintf(__('By both show as '.$show_as), $this->feather->utils->escape($keywords), $this->feather->utils->escape($author));
+                    $search['crumbs_text']['search_type'] = sprintf(__('By both show as '.$show_as), Utils::escape($keywords), Utils::escape($author));
                 } elseif ($search_type[0] == 'keywords') {
                     $keywords = $search_type[1];
-                    $search['crumbs_text']['search_type'] = sprintf(__('By keywords show as '.$show_as), $this->feather->utils->escape($keywords));
+                    $search['crumbs_text']['search_type'] = sprintf(__('By keywords show as '.$show_as), Utils::escape($keywords));
                 } elseif ($search_type[0] == 'author') {
                     $author = $search_type[1];
-                    $search['crumbs_text']['search_type'] = sprintf(__('By user show as '.$show_as), $this->feather->utils->escape($author));
+                    $search['crumbs_text']['search_type'] = sprintf(__('By user show as '.$show_as), Utils::escape($author));
                 }
 
                 $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=search&amp;keywords='.urlencode($keywords).'&amp;author='.urlencode($author).'&amp;forums='.$search_type[2].'&amp;search_in='.$search_type[3].'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir.'&amp;show_as='.$show_as).'">'.$search['crumbs_text']['search_type'].'</a>';
@@ -700,7 +701,7 @@ public function display_search_results($search)
         $post_count = $topic_count = 0;
 
         foreach ($search['search_set'] as $cur_search) {
-            $forum = '<a href="'.$this->feather->url->get('forum/'.$cur_search['forum_id'].'/'.$this->feather->url->url_friendly($cur_search['forum_name']).'/').'">'.$this->feather->utils->escape($cur_search['forum_name']).'</a>';
+            $forum = '<a href="'.$this->feather->url->get('forum/'.$cur_search['forum_id'].'/'.$this->feather->url->url_friendly($cur_search['forum_name']).'/').'">'.Utils::escape($cur_search['forum_name']).'</a>';
             $url_topic = $this->feather->url->url_friendly($cur_search['subject']);
 
             if ($this->config['o_censoring'] == '1') {
@@ -725,7 +726,7 @@ public function display_search_results($search)
                 }
 
                 $cur_search['message'] = $this->feather->parser->parse_message($cur_search['message'], $cur_search['hide_smilies']);
-                $pposter = $this->feather->utils->escape($cur_search['pposter']);
+                $pposter = Utils::escape($cur_search['pposter']);
 
                 if ($cur_search['poster_id'] > 1 && $this->user->g_view_users == '1') {
                     $cur_search['pposter_disp'] = '<strong><a href="'.$this->feather->url->get('user/'.$cur_search['poster_id'].'/').'">'.$pposter.'</a></strong>';
@@ -746,7 +747,7 @@ public function display_search_results($search)
                 $cur_search['item_status'] = ($topic_count % 2 == 0) ? 'roweven' : 'rowodd';
                 $cur_search['icon_type'] = 'icon';
 
-                $subject = '<a href="'.$this->feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.$this->feather->utils->escape($cur_search['subject']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_search['poster']).'</span>';
+                $subject = '<a href="'.$this->feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.Utils::escape($cur_search['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_search['poster']).'</span>';
 
                 if ($cur_search['sticky'] == '1') {
                     $cur_search['item_status'] .= ' isticky';
@@ -846,12 +847,12 @@ public function get_list_forums()
                         $output .= "\t\t\t\t\t\t\t".'</fieldset>'."\n";
                     }
 
-                    $output .= "\t\t\t\t\t\t\t".'<fieldset><legend><span>'.$this->feather->utils->escape($cur_forum['cat_name']).'</span></legend>'."\n";
+                    $output .= "\t\t\t\t\t\t\t".'<fieldset><legend><span>'.Utils::escape($cur_forum['cat_name']).'</span></legend>'."\n";
                     $output .= "\t\t\t\t\t\t\t\t".'<div class="rbox">';
                     $cur_category = $cur_forum['cid'];
                 }
 
-                $output .= "\t\t\t\t\t\t\t\t".'<label><input type="checkbox" name="forums[]" id="forum-'.$cur_forum['fid'].'" value="'.$cur_forum['fid'].'" />'.$this->feather->utils->escape($cur_forum['forum_name']).'</label>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t".'<label><input type="checkbox" name="forums[]" id="forum-'.$cur_forum['fid'].'" value="'.$cur_forum['fid'].'" />'.Utils::escape($cur_forum['forum_name']).'</label>'."\n";
             }
 
             if ($cur_category) {
@@ -877,11 +878,11 @@ public function get_list_forums()
                         $output .= "\t\t\t\t\t\t\t".'</optgroup>'."\n";
                     }
 
-                    $output .= "\t\t\t\t\t\t\t".'<optgroup label="'.$this->feather->utils->escape($cur_forum['cat_name']).'">'."\n";
+                    $output .= "\t\t\t\t\t\t\t".'<optgroup label="'.Utils::escape($cur_forum['cat_name']).'">'."\n";
                     $cur_category = $cur_forum['cid'];
                 }
 
-                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_forum['fid'].'">'.$this->feather->utils->escape($cur_forum['forum_name']).'</option>'."\n";
+                $output .= "\t\t\t\t\t\t\t\t".'<option value="'.$cur_forum['fid'].'">'.Utils::escape($cur_forum['forum_name']).'</option>'."\n";
             }
 
             $output .= "\t\t\t\t\t\t\t".'</optgroup>'."\n";
diff --git a/featherbb/Model/Userlist.php b/featherbb/Model/Userlist.php
index 0dfc32b1..0ea2036a 100644
--- a/featherbb/Model/Userlist.php
+++ b/featherbb/Model/Userlist.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Userlist
@@ -64,9 +65,9 @@ public function generate_dropdown_menu($show_group)
 
         foreach($result as $cur_group) {
             if ($cur_group['g_id'] == $show_group) {
-                $dropdown_menu .= "\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+                $dropdown_menu .= "\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
             } else {
-                $dropdown_menu .= "\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$this->feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+                $dropdown_menu .= "\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
             }
         }
 
diff --git a/featherbb/Model/Viewforum.php b/featherbb/Model/Viewforum.php
index 153eb58e..8d182079 100644
--- a/featherbb/Model/Viewforum.php
+++ b/featherbb/Model/Viewforum.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Viewforum
@@ -187,7 +188,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 $url_subject = $this->feather->url->url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_formatted'] = '<a href="'.$this->feather->url->get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.$this->feather->utils->format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_formatted'] = '<a href="'.$this->feather->url->get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.$this->feather->utils->format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['last_poster']).'</span>';
                 } else {
                     $cur_topic['last_post_formatted'] = '- - -';
                 }
@@ -202,13 +203,13 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.$this->feather->utils->escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.$this->feather->utils->escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.$this->feather->utils->escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.$this->feather->utils->escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
diff --git a/featherbb/Model/Viewtopic.php b/featherbb/Model/Viewtopic.php
index 835f76ac..f1013c51 100644
--- a/featherbb/Model/Viewtopic.php
+++ b/featherbb/Model/Viewtopic.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Utils;
 use DB;
 
 class Viewtopic
@@ -273,9 +274,9 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
             // If the poster is a registered user
             if ($cur_post['poster_id'] > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $cur_post['username_formatted'] = '<a href="'.$this->feather->url->base().'/user/'.$cur_post['poster_id'].'/">'.$this->feather->utils->escape($cur_post['username']).'</a>';
+                    $cur_post['username_formatted'] = '<a href="'.$this->feather->url->base().'/user/'.$cur_post['poster_id'].'/">'.Utils::escape($cur_post['username']).'</a>';
                 } else {
-                    $cur_post['username_formatted'] = $this->feather->utils->escape($cur_post['username']);
+                    $cur_post['username_formatted'] = Utils::escape($cur_post['username']);
                 }
 
                 $cur_post['user_title_formatted'] = get_title($cur_post);
@@ -302,18 +303,18 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                             $cur_post['location'] = censor_words($cur_post['location']);
                         }
 
-                        $cur_post['user_info'][] = '<dd><span>'.__('From').' '.$this->feather->utils->escape($cur_post['location']).'</span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.__('From').' '.Utils::escape($cur_post['location']).'</span></dd>';
                     }
 
                     $cur_post['user_info'][] = '<dd><span>'.__('Registered topic').' '.$this->feather->utils->format_time($cur_post['registered'], true).'</span></dd>';
 
                     if ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) {
-                        $cur_post['user_info'][] = '<dd><span>'.__('Posts topic').' '.$this->feather->utils->forum_number_format($cur_post['num_posts']).'</span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.__('Posts topic').' '.Utils::forum_number_format($cur_post['num_posts']).'</span></dd>';
                     }
 
                     // Now let's deal with the contact links (Email and URL)
                     if ((($cur_post['email_setting'] == '0' && !$this->user->is_guest) || $this->user->is_admmod) && $this->user->g_send_email == '1') {
-                        $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.$this->feather->utils->escape($cur_post['email']).'">'.__('Email').'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.Utils::escape($cur_post['email']).'">'.__('Email').'</a></span>';
                     } elseif ($cur_post['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
                         $cur_post['user_contacts'][] = '<span class="email"><a href="'.$this->feather->url->get('email/'.$cur_post['poster_id'].'/').'">'.__('Email').'</a></span>';
                     }
@@ -323,7 +324,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                             $cur_post['url'] = censor_words($cur_post['url']);
                         }
 
-                        $cur_post['user_contacts'][] = '<span class="website"><a href="'.$this->feather->utils->escape($cur_post['url']).'" rel="nofollow">'.__('Website').'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="website"><a href="'.Utils::escape($cur_post['url']).'" rel="nofollow">'.__('Website').'</a></span>';
                     }
                 }
 
@@ -334,24 +335,24 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 }
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.$this->feather->utils->escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.Utils::escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
 
                     if ($cur_post['admin_note'] != '') {
-                        $cur_post['user_info'][] = '<dd><span>'.__('Note').' <strong>'.$this->feather->utils->escape($cur_post['admin_note']).'</strong></span></dd>';
+                        $cur_post['user_info'][] = '<dd><span>'.__('Note').' <strong>'.Utils::escape($cur_post['admin_note']).'</strong></span></dd>';
                     }
                 }
             }
             // If the poster is a guest (or a user that has been deleted)
             else {
-                $cur_post['username_formatted'] = $this->feather->utils->escape($cur_post['username']);
+                $cur_post['username_formatted'] = Utils::escape($cur_post['username']);
                 $cur_post['user_title_formatted'] = get_title($cur_post);
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.$this->feather->utils->escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.Utils::escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
                 }
 
                 if ($this->config['o_show_user_info'] == '1' && $cur_post['poster_email'] != '' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-                    $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.$this->feather->utils->escape($cur_post['poster_email']).'">'.__('Email').'</a></span>';
+                    $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.Utils::escape($cur_post['poster_email']).'">'.__('Email').'</a></span>';
                 }
             }
 
diff --git a/featherbb/routes.php b/featherbb/routes.php
index 975a5945..07aae626 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -196,7 +196,7 @@
 $feather->error(function (\Exception $e) use ($feather) {
     $feather->response->setStatus($e->getCode());
     $feather->view2->setPageInfo(array(
-        'title' => array($feather->utils->escape($feather->config['o_board_title']), __('Error')),
+        'title' => array(Utils::escape($feather->config['o_board_title']), __('Error')),
         'msg_title' => __('Error'),
         'msg'    =>   $e->getMessage(),
         'no_back_link'    => false,
diff --git a/style/themes/FeatherBB/view/admin/bans/add_ban.php b/style/themes/FeatherBB/view/admin/bans/add_ban.php
index 1bda2c69..7ba13b22 100644
--- a/style/themes/FeatherBB/view/admin/bans/add_ban.php
+++ b/style/themes/FeatherBB/view/admin/bans/add_ban.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
 	exit;
@@ -31,7 +33,7 @@
 								<th scope="row"><?php _e('Username label') ?></th>
 								<td>
 									<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
-										echo $feather->utils->escape($ban['ban_user']);
+										echo Utils::escape($ban['ban_user']);
 									} ?>" tabindex="1" />
 									<span><?php _e('Username help') ?></span>
 								</td>
@@ -40,7 +42,7 @@
 								<th scope="row"><?php _e('IP label') ?></th>
 								<td>
 									<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
-										echo $feather->utils->escape($ban['ip']);
+										echo Utils::escape($ban['ip']);
 									} ?>" tabindex="2" />
 										<span><?php _e('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
 												printf(' '.__('IP help link'), '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.__('here').'</a>');
@@ -51,7 +53,7 @@
 								<th scope="row"><?php _e('E-mail label') ?></th>
 								<td>
 									<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
-										echo $feather->utils->escape($ban['email']);
+										echo Utils::escape($ban['email']);
 									} ?>" tabindex="3" />
 									<span><?php _e('E-mail help') ?></span>
 								</td>
@@ -70,7 +72,7 @@
 								<th scope="row"><?php _e('Ban message label') ?></th>
 								<td>
 									<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
-										echo $feather->utils->escape($ban['message']);
+										echo Utils::escape($ban['message']);
 									} ?>" tabindex="4" />
 									<span><?php _e('Ban message help') ?></span>
 								</td>
diff --git a/style/themes/FeatherBB/view/admin/bans/admin_bans.php b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
index 14b13968..c7632b9d 100644
--- a/style/themes/FeatherBB/view/admin/bans/admin_bans.php
+++ b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/admin/bans/search_ban.php b/style/themes/FeatherBB/view/admin/bans/search_ban.php
index 356a0baa..994a73fd 100644
--- a/style/themes/FeatherBB/view/admin/bans/search_ban.php
+++ b/style/themes/FeatherBB/view/admin/bans/search_ban.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -50,12 +52,12 @@
         foreach ($ban_data as $cur_ban) {
             ?>
 				<tr>
-					<td class="tcl"><?php echo($cur_ban['username'] != '') ? $feather->utils->escape($cur_ban['username']) : '&#160;' ?></td>
-					<td class="tc2"><?php echo($cur_ban['email'] != '') ? $feather->utils->escape($cur_ban['email']) : '&#160;' ?></td>
-					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? $feather->utils->escape($cur_ban['ip']) : '&#160;' ?></td>
+					<td class="tcl"><?php echo($cur_ban['username'] != '') ? Utils::escape($cur_ban['username']) : '&#160;' ?></td>
+					<td class="tc2"><?php echo($cur_ban['email'] != '') ? Utils::escape($cur_ban['email']) : '&#160;' ?></td>
+					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? Utils::escape($cur_ban['ip']) : '&#160;' ?></td>
 					<td class="tc4"><?php echo $feather->utils->format_time($cur_ban['expire'], true) ?></td>
-					<td class="tc5"><?php echo($cur_ban['message'] != '') ? $feather->utils->escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.$feather->utils->escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
+					<td class="tc5"><?php echo($cur_ban['message'] != '') ? Utils::escape($cur_ban['message']) : '&#160;' ?></td>
+					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.Utils::escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
 					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
 				</tr>
 <?php
diff --git a/style/themes/FeatherBB/view/admin/categories.php b/style/themes/FeatherBB/view/admin/categories.php
index 3a2057b7..713a375f 100644
--- a/style/themes/FeatherBB/view/admin/categories.php
+++ b/style/themes/FeatherBB/view/admin/categories.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -53,7 +55,7 @@
 <?php
 
     foreach ($cat_list as $cur_cat) {
-        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.$feather->utils->escape($cur_cat['cat_name']).'</option>'."\n";
+        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.Utils::escape($cur_cat['cat_name']).'</option>'."\n";
     }
 
 ?>
@@ -90,7 +92,7 @@
     foreach ($cat_list as $cur_cat) {
         ?>
 								<tr>
-									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo $feather->utils->escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
+									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo Utils::escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
 									<td><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][order]" value="<?php echo $cur_cat['disp_position'] ?>" size="3" maxlength="3" /></td>
 								</tr>
 <?php
diff --git a/style/themes/FeatherBB/view/admin/censoring.php b/style/themes/FeatherBB/view/admin/censoring.php
index 54a063a6..0063b938 100644
--- a/style/themes/FeatherBB/view/admin/censoring.php
+++ b/style/themes/FeatherBB/view/admin/censoring.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -61,7 +63,7 @@
 <?php
 
     foreach ($word_data as $word) {
-        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.$feather->utils->escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.$feather->utils->escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
+        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.Utils::escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.Utils::escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
     }
 
     ?>
diff --git a/style/themes/FeatherBB/view/admin/forums/admin_forums.php b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
index abcd2bf7..bca75ff6 100644
--- a/style/themes/FeatherBB/view/admin/forums/admin_forums.php
+++ b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -31,7 +33,7 @@
 									<td>
 										<select name="cat" tabindex="1">
 											<?php  foreach ($cat_list as $cat) {
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.$feather->utils->escape($cat['cat_name']).'</option>'."\n";
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.Utils::escape($cat['cat_name']).'</option>'."\n";
 											} ?>
 										</select>
 										<span><?php _e('Add forum help') ?></span>
@@ -73,7 +75,7 @@
             ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php _e('Category subhead') ?> <?php echo $feather->utils->escape($cat_data['cat_name']) ?></legend>
+						<legend><?php _e('Category subhead') ?> <?php echo Utils::escape($cat_data['cat_name']) ?></legend>
 						<div class="infldset">
 							<table>
 							<thead>
@@ -90,7 +92,7 @@
 								<tr>
 									<td class="tcl"><a href="<?php echo $feather->url->get('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
 									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
-									<td class="tcr"><strong><?php echo $feather->utils->escape($forum['forum_name']) ?></strong></td>
+									<td class="tcr"><strong><?php echo Utils::escape($forum['forum_name']) ?></strong></td>
 								</tr>
 <?php
     }
diff --git a/style/themes/FeatherBB/view/admin/forums/delete_forum.php b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
index 4a2df3f1..134606a5 100644
--- a/style/themes/FeatherBB/view/admin/forums/delete_forum.php
+++ b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/admin/forums/permissions.php b/style/themes/FeatherBB/view/admin/forums/permissions.php
index 8368cfa9..ec31603c 100644
--- a/style/themes/FeatherBB/view/admin/forums/permissions.php
+++ b/style/themes/FeatherBB/view/admin/forums/permissions.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -26,11 +28,11 @@
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php _e('Forum name label') ?></th>
-									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo $feather->utils->escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
+									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo Utils::escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Forum description label') ?></th>
-									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo $feather->utils->escape($cur_forum['forum_desc']) ?></textarea></td>
+									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo Utils::escape($cur_forum['forum_desc']) ?></textarea></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Category label') ?></th>
@@ -38,7 +40,7 @@
 										<select name="cat_id" tabindex="3">
 											<?php  foreach ($forum_data as $cat_id => $cat_data) {
 												$selected = ($cat_id == $cur_forum['cat_id']) ? 'selected="selected"' : '';
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.$feather->utils->escape($cat_data['cat_name']).'</option>'."\n";
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.Utils::escape($cat_data['cat_name']).'</option>'."\n";
 											} ?>
 										</select>
 									</td>
@@ -61,7 +63,7 @@
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Redirect label') ?></th>
-									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.$feather->utils->escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
+									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.Utils::escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
 								</tr>
 							</table>
 						</div>
@@ -86,7 +88,7 @@
     foreach ($perm_data as $perm) {
         ?>
 								<tr>
-									<th class="atcl"><?php echo $feather->utils->escape($perm['g_title']) ?></th>
+									<th class="atcl"><?php echo Utils::escape($perm['g_title']) ?></th>
 									<td<?php if (!$perm['read_forum_def']) {
     echo ' class="nodefault"';
 }
diff --git a/style/themes/FeatherBB/view/admin/groups/add_edit_group.php b/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
index f09d4255..01cf05f1 100644
--- a/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
+++ b/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -32,14 +34,14 @@
 									<th scope="row"><?php _e('Group title label') ?></th>
 									<td>
 										<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
-    echo $feather->utils->escape($group['info']['g_title']);
+    echo Utils::escape($group['info']['g_title']);
 } ?>" tabindex="1" />
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('User title label') ?></th>
 									<td>
-										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo $feather->utils->escape($group['info']['g_user_title']) ?>" tabindex="2" />
+										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo Utils::escape($group['info']['g_user_title']) ?>" tabindex="2" />
 										<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
 									</td>
 								</tr>
@@ -50,7 +52,7 @@
 											<option value="0"><?php _e('Disable promotion') ?></option>
 											<?php echo $group_list ?>
 										</select>
-										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo $feather->utils->escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
+										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo Utils::escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
 										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
 									</td>
 								</tr>
diff --git a/style/themes/FeatherBB/view/admin/groups/admin_groups.php b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
index 6d43231a..6986e418 100644
--- a/style/themes/FeatherBB/view/admin/groups/admin_groups.php
+++ b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -32,9 +34,9 @@
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
         if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
         } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
         }
     }
 }
@@ -65,9 +67,9 @@
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
         if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
         } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
         }
     }
 }
@@ -95,7 +97,7 @@
 							<table>
 <?php
 foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.$feather->utils->escape($cur_group['g_title']).'</td></tr>'."\n";
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.Utils::escape($cur_group['g_title']).'</td></tr>'."\n";
 }
 
 ?>
diff --git a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
index 2ea97c75..e222c71b 100644
--- a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
+++ b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -23,7 +25,7 @@
 					<fieldset>
 						<legend><?php _e('Confirm delete subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Confirm delete info'), $feather->utils->escape($group_title)) ?></p>
+							<p><?php printf(__('Confirm delete info'), Utils::escape($group_title)) ?></p>
 							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
 						</div>
 					</fieldset>
diff --git a/style/themes/FeatherBB/view/admin/groups/delete_group.php b/style/themes/FeatherBB/view/admin/groups/delete_group.php
index be55e2a4..b2a356d9 100644
--- a/style/themes/FeatherBB/view/admin/groups/delete_group.php
+++ b/style/themes/FeatherBB/view/admin/groups/delete_group.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -22,7 +24,7 @@
 					<fieldset>
 						<legend><?php _e('Move users subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Move users info'), $feather->utils->escape($group_info['title']), $feather->utils->forum_number_format($group_info['members'])) ?></p>
+							<p><?php printf(__('Move users info'), Utils::escape($group_info['title']), Utils::forum_number_format($group_info['members'])) ?></p>
 							<label><?php _e('Move users label') ?>
 							<select name="move_to_group">
 								<?= $group_list_delete; ?>
diff --git a/style/themes/FeatherBB/view/admin/index.php b/style/themes/FeatherBB/view/admin/index.php
index 4dcbbbbb..dc4bbb93 100644
--- a/style/themes/FeatherBB/view/admin/index.php
+++ b/style/themes/FeatherBB/view/admin/index.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/admin/loader.php b/style/themes/FeatherBB/view/admin/loader.php
index 6a61c22f..6e3dddbf 100644
--- a/style/themes/FeatherBB/view/admin/loader.php
+++ b/style/themes/FeatherBB/view/admin/loader.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
index 0e70cca3..846a63aa 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/admin/maintenance/prune.php b/style/themes/FeatherBB/view/admin/maintenance/prune.php
index fa4aea34..1fe2f3a8 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/prune.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/prune.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -26,7 +28,7 @@
 					<fieldset>
 						<legend><?php _e('Confirm prune subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], $feather->utils->forum_number_format($prune['num_topics'])) ?></p>
+							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], Utils::forum_number_format($prune['num_topics'])) ?></p>
 							<p class="warntext"><?php _e('Confirm prune warn') ?></p>
 						</div>
 					</fieldset>
diff --git a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
index 576d1ecf..6ad5fbd6 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/admin/menu.php b/style/themes/FeatherBB/view/admin/menu.php
index da238ac6..11735339 100644
--- a/style/themes/FeatherBB/view/admin/menu.php
+++ b/style/themes/FeatherBB/view/admin/menu.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/admin/options.php b/style/themes/FeatherBB/view/admin/options.php
index 78ed0fa6..6353c548 100644
--- a/style/themes/FeatherBB/view/admin/options.php
+++ b/style/themes/FeatherBB/view/admin/options.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -28,21 +30,21 @@
 								<tr>
 									<th scope="row"><?php _e('Board title label') ?></th>
 									<td>
-										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?>" />
+										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo Utils::escape($feather->forum_settings['o_board_title']) ?>" />
 										<span><?php _e('Board title help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Board desc label') ?></th>
 									<td>
-										<textarea name="form_board_desc" cols="60" rows="3"><?php echo $feather->utils->escape($feather->forum_settings['o_board_desc']) ?></textarea>
+										<textarea name="form_board_desc" cols="60" rows="3"><?php echo Utils::escape($feather->forum_settings['o_board_desc']) ?></textarea>
 										<span><?php _e('Board desc help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Base URL label') ?></th>
 									<td>
-										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo $feather->utils->escape($feather->forum_settings['o_base_url']) ?>" />
+										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo Utils::escape($feather->forum_settings['o_base_url']) ?>" />
 										<span><?php _e('Base URL help') ?></span>
 									</td>
 								</tr>
@@ -222,14 +224,14 @@
 								<tr>
 									<th scope="row"><?php _e('Time format label') ?></th>
 									<td>
-										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo $feather->utils->escape($feather->forum_settings['o_time_format']) ?>" />
+										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo Utils::escape($feather->forum_settings['o_time_format']) ?>" />
 										<span><?php printf(__('Time format help'), gmdate($feather->forum_settings['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Date format label') ?></th>
 									<td>
-										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo $feather->utils->escape($feather->forum_settings['o_date_format']) ?>" />
+										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo Utils::escape($feather->forum_settings['o_date_format']) ?>" />
 										<span><?php printf(__('Date format help'), gmdate($feather->forum_settings['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
@@ -490,7 +492,7 @@
 								<tr>
 									<th scope="row"><?php _e('Menu items label') ?></th>
 									<td>
-										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
+										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo Utils::escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
 										<span><?php _e('Menu items help') ?></span>
 									</td>
 								</tr>
@@ -557,7 +559,7 @@
 								<tr>
 									<th scope="row"><?php _e('Mailing list label') ?></th>
 									<td>
-										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_mailing_list']) ?></textarea>
+										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_mailing_list']) ?></textarea>
 										<span><?php _e('Mailing list help') ?></span>
 									</td>
 								</tr>
@@ -585,7 +587,7 @@
 								<tr>
 									<th scope="row"><?php _e('Upload directory label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo $feather->utils->escape($feather->forum_settings['o_avatars_dir']) ?>" />
+										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo Utils::escape($feather->forum_settings['o_avatars_dir']) ?>" />
 										<span><?php _e('Upload directory help') ?></span>
 									</td>
 								</tr>
@@ -622,14 +624,14 @@
 								<tr>
 									<th scope="row"><?php _e('Admin e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo $feather->utils->escape($feather->forum_settings['o_admin_email']) ?>" />
+										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo Utils::escape($feather->forum_settings['o_admin_email']) ?>" />
 										<span><?php _e('Admin e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo $feather->utils->escape($feather->forum_settings['o_webmaster_email']) ?>" />
+										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo Utils::escape($feather->forum_settings['o_webmaster_email']) ?>" />
 										<span><?php _e('Webmaster e-mail help') ?></span>
 									</td>
 								</tr>
@@ -660,14 +662,14 @@
 								<tr>
 									<th scope="row"><?php _e('SMTP address label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo $feather->utils->escape($feather->forum_settings['o_smtp_host']) ?>" />
+										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo Utils::escape($feather->forum_settings['o_smtp_host']) ?>" />
 										<span><?php _e('SMTP address help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('SMTP username label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo $feather->utils->escape($feather->forum_settings['o_smtp_user']) ?>" />
+										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo Utils::escape($feather->forum_settings['o_smtp_user']) ?>" />
 										<span><?php _e('SMTP username help') ?></span>
 									</td>
 								</tr>
@@ -675,7 +677,7 @@
 									<th scope="row"><?php _e('SMTP password label') ?></th>
 									<td>
 										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
-<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key($feather->utils->strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
+<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key(Utils::strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
 										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<span><?php _e('SMTP password help') ?></span>
@@ -753,7 +755,7 @@
 								<tr>
 									<th scope="row"><?php _e('Rules label') ?></th>
 									<td>
-										<textarea name="form_rules_message" rows="10" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_rules_message']) ?></textarea>
+										<textarea name="form_rules_message" rows="10" cols="55"><?php echo Utils::escape($feather->forum_settings['o_rules_message']) ?></textarea>
 										<span><?php _e('Rules help') ?></span>
 									</td>
 								</tr>
@@ -796,7 +798,7 @@
 								<tr>
 									<th scope="row"><?php _e('Announcement message label') ?></th>
 									<td>
-										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_announcement_message']) ?></textarea>
+										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_announcement_message']) ?></textarea>
 										<span><?php _e('Announcement message help') ?></span>
 									</td>
 								</tr>
@@ -824,7 +826,7 @@
 								<tr>
 									<th scope="row"><?php _e('Maintenance message label') ?></th>
 									<td>
-										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
+										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
 										<span><?php _e('Maintenance message help') ?></span>
 									</td>
 								</tr>
diff --git a/style/themes/FeatherBB/view/admin/parser.php b/style/themes/FeatherBB/view/admin/parser.php
index 35ee0cbe..e3d28854 100644
--- a/style/themes/FeatherBB/view/admin/parser.php
+++ b/style/themes/FeatherBB/view/admin/parser.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -87,12 +89,12 @@
 										<input type="radio" name="config[valid_imgs]" value="1"<?php if ($config['valid_imgs']) {
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
+    echo(' disabled="disabled" title="'. Utils::escape($lang_admin_parser['unavailable']) .'"');
 } ?> /> <strong><?php _e('Yes') ?></strong>
 										<input type="radio" name="config[valid_imgs]" value="0"<?php if (!$config['valid_imgs']) {
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
+    echo(' disabled="disabled" title="'. Utils::escape($lang_admin_parser['unavailable']) .'"');
 } ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td><?php echo $lang_admin_parser['valid_imgs help'] ?></td>
@@ -101,7 +103,7 @@
 									<th scope="row"><?php echo $lang_admin_parser['max_size'] ?></th>
 									<td colspan="2">
 										<input type="text" name="config[max_size]" size="10" maxlength="8" value="<?php echo($config['max_size'])?>"<?php if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
+    echo(' disabled="disabled" title="'. Utils::escape($lang_admin_parser['unavailable']) .'"');
 } ?> />
 									</td>
 									<td><span><?php echo $lang_admin_parser['max_size help'] ?></span></td>
@@ -165,7 +167,7 @@
         ?>
 								<tr>
 									<td><input type="text" name="smiley_text[<?php echo($i);
-        ?>]" value="<?php echo($feather->utils->escape($key));
+        ?>]" value="<?php echo(Utils::escape($key));
         ?>" size="20" maxlength="80" /></td>
 									<td>
 										<select name="smiley_file[<?php echo($i);
diff --git a/style/themes/FeatherBB/view/admin/permissions.php b/style/themes/FeatherBB/view/admin/permissions.php
index 1fe92218..0f33b3f5 100644
--- a/style/themes/FeatherBB/view/admin/permissions.php
+++ b/style/themes/FeatherBB/view/admin/permissions.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/admin/plugins.php b/style/themes/FeatherBB/view/admin/plugins.php
index c09245ed..4165d6e9 100644
--- a/style/themes/FeatherBB/view/admin/plugins.php
+++ b/style/themes/FeatherBB/view/admin/plugins.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/admin/reports.php b/style/themes/FeatherBB/view/admin/reports.php
index b364bfdc..e1076523 100644
--- a/style/themes/FeatherBB/view/admin/reports.php
+++ b/style/themes/FeatherBB/view/admin/reports.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -28,14 +30,14 @@
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
 									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?= $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
-									<td><?= str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
+									<td><?= str_replace("\n", '<br />', Utils::escape($report['message'])) ?></td>
 								</tr>
 							</table>
 						</div>
@@ -74,18 +76,18 @@
         ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.$feather->utils->escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
+						<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.Utils::escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
 									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?></th>
-									<td><?= str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
+									<td><?= str_replace("\n", '<br />', Utils::escape($report['message'])) ?></td>
 								</tr>
 							</table>
 						</div>
diff --git a/style/themes/FeatherBB/view/admin/statistics.php b/style/themes/FeatherBB/view/admin/statistics.php
index f2fd7a9a..f87bc877 100644
--- a/style/themes/FeatherBB/view/admin/statistics.php
+++ b/style/themes/FeatherBB/view/admin/statistics.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -30,7 +32,7 @@
 					</dd>
 					<dt><?php _e('Database label') ?></dt>
 					<dd>
-<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", $feather->utils->forum_number_format($total_records)) ?>
+<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", Utils::forum_number_format($total_records)) ?>
 						<br /><?php printf(__('Database data size')."\n", $total_size) ?>
 <?php endif; ?>					</dd>
 <?php endif; ?>
diff --git a/style/themes/FeatherBB/view/admin/users/admin_users.php b/style/themes/FeatherBB/view/admin/users/admin_users.php
index 74a05472..61281104 100644
--- a/style/themes/FeatherBB/view/admin/users/admin_users.php
+++ b/style/themes/FeatherBB/view/admin/users/admin_users.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/admin/users/ban_users.php b/style/themes/FeatherBB/view/admin/users/ban_users.php
index 8e06caff..99ce5630 100644
--- a/style/themes/FeatherBB/view/admin/users/ban_users.php
+++ b/style/themes/FeatherBB/view/admin/users/ban_users.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/admin/users/delete_users.php b/style/themes/FeatherBB/view/admin/users/delete_users.php
index 1a4360c6..259884c9 100644
--- a/style/themes/FeatherBB/view/admin/users/delete_users.php
+++ b/style/themes/FeatherBB/view/admin/users/delete_users.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/admin/users/find_users.php b/style/themes/FeatherBB/view/admin/users/find_users.php
index 3ddd2324..4299b782 100644
--- a/style/themes/FeatherBB/view/admin/users/find_users.php
+++ b/style/themes/FeatherBB/view/admin/users/find_users.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -54,11 +56,11 @@
         foreach ($user_data as $user) {
             ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.$feather->utils->escape($user['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo $feather->utils->escape($user['email']) ?>"><?php echo $feather->utils->escape($user['email']) ?></a></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
+					<td class="tc2"><a href="mailto:<?php echo Utils::escape($user['email']) ?>"><?php echo Utils::escape($user['email']) ?></a></td>
 					<td class="tc3"><?php echo $user['user_title'] ?></td>
-					<td class="tc4"><?php echo $feather->utils->forum_number_format($user['num_posts']) ?></td>
-					<td class="tc5"><?php echo($user['admin_note'] != '') ? $feather->utils->escape($user['admin_note']) : '&#160;' ?></td>
+					<td class="tc4"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
+					<td class="tc5"><?php echo($user['admin_note'] != '') ? Utils::escape($user['admin_note']) : '&#160;' ?></td>
 					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
 <?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
 <?php endif;
diff --git a/style/themes/FeatherBB/view/admin/users/move_users.php b/style/themes/FeatherBB/view/admin/users/move_users.php
index a2f96b91..417955cc 100644
--- a/style/themes/FeatherBB/view/admin/users/move_users.php
+++ b/style/themes/FeatherBB/view/admin/users/move_users.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -28,7 +30,7 @@
 									<th scope="row"><?php _e('New group label') ?></th>
 									<td>
 										<select name="new_group" tabindex="1">
-<?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo $feather->utils->escape($group) ?></option>
+<?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo Utils::escape($group) ?></option>
 <?php endforeach;
     ?>
 										</select>
diff --git a/style/themes/FeatherBB/view/admin/users/search_ip.php b/style/themes/FeatherBB/view/admin/users/search_ip.php
index a4db0174..1c7674ec 100644
--- a/style/themes/FeatherBB/view/admin/users/search_ip.php
+++ b/style/themes/FeatherBB/view/admin/users/search_ip.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -45,7 +47,7 @@
         foreach ($ip_data as $ip) {
             ?>
 				<tr>
-					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.$feather->utils->escape($ip['poster_ip']).'/') ?>"><?php echo $feather->utils->escape($ip['poster_ip']) ?></a></td>
+					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.Utils::escape($ip['poster_ip']).'/') ?>"><?php echo Utils::escape($ip['poster_ip']) ?></a></td>
 					<td class="tc2"><?php echo $feather->utils->format_time($ip['last_used']) ?></td>
 					<td class="tc3"><?php echo $ip['used_times'] ?></td>
 					<td class="tcr"><a href="<?php echo $feather->url->get('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
diff --git a/style/themes/FeatherBB/view/admin/users/show_users.php b/style/themes/FeatherBB/view/admin/users/show_users.php
index 99fccb06..862ab612 100644
--- a/style/themes/FeatherBB/view/admin/users/show_users.php
+++ b/style/themes/FeatherBB/view/admin/users/show_users.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -51,11 +53,11 @@
             if (isset($info['user_data'][$cur_poster['poster_id']])) {
                 ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.$feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.Utils::escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
+					<td class="tc2"><a href="mailto:<?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
 					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
-					<td class="tc4"><?php echo $feather->utils->forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
-					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
+					<td class="tc4"><?php echo Utils::forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
+					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? Utils::escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
 					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
 				</tr>
 <?php
@@ -63,7 +65,7 @@
             } else {
                 ?>
 				<tr>
-					<td class="tcl"><?php echo $feather->utils->escape($cur_poster['poster']) ?></td>
+					<td class="tcl"><?php echo Utils::escape($cur_poster['poster']) ?></td>
 					<td class="tc2">&#160;</td>
 					<td class="tc3"><?php _e('Results guest') ?></td>
 					<td class="tc4">&#160;</td>
diff --git a/style/themes/FeatherBB/view/delete.php b/style/themes/FeatherBB/view/delete.php
index abfc0a7f..ba43acca 100644
--- a/style/themes/FeatherBB/view/delete.php
+++ b/style/themes/FeatherBB/view/delete.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -17,8 +19,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>
@@ -31,7 +33,7 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.$feather->utils->escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
+					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.Utils::escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
 					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
 				</div>
 			</div>
@@ -47,7 +49,7 @@
 				<div class="postbody">
 					<div class="postleft">
 						<dl>
-							<dt><strong><?php echo $feather->utils->escape($cur_post['poster']) ?></strong></dt>
+							<dt><strong><?php echo Utils::escape($cur_post['poster']) ?></strong></dt>
 							<dd><span><?php echo $feather->utils->format_time($cur_post['posted']) ?></span></dd>
 						</dl>
 					</div>
diff --git a/style/themes/FeatherBB/view/edit.php b/style/themes/FeatherBB/view/edit.php
index ea9c3abe..79949a6f 100644
--- a/style/themes/FeatherBB/view/edit.php
+++ b/style/themes/FeatherBB/view/edit.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -20,8 +22,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
 		</ul>
 	</div>
@@ -69,7 +71,7 @@
 ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
+    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
@@ -84,10 +86,10 @@
 					<input type="hidden" name="form_sent" value="1" />
 					<div class="infldset txtarea">
 <?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo $feather->utils->escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
+						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo Utils::escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
 <?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
 						<script>postEditorToolbar('req_message');</script>
-                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo $feather->utils->escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
+                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo Utils::escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
 							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
 							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
diff --git a/style/themes/FeatherBB/view/error.php b/style/themes/FeatherBB/view/error.php
index d638a206..fc25491e 100644
--- a/style/themes/FeatherBB/view/error.php
+++ b/style/themes/FeatherBB/view/error.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/footer.new.php b/style/themes/FeatherBB/view/footer.new.php
index b66f807c..6562c4ff 100644
--- a/style/themes/FeatherBB/view/footer.new.php
+++ b/style/themes/FeatherBB/view/footer.new.php
@@ -7,6 +7,13 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
 ?>
 </div>
 
@@ -70,7 +77,7 @@
 					<select name="id" onchange="window.location=('<?php echo $feather->url->get('forum/') ?>'+this.options[this.selectedIndex].value)">
 <?php
 		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
-			echo "\t\t\t\t\t\t\t".'<optgroup label="'.$feather->utils->escape($cat_data['cat_name']).'">'."\n";
+			echo "\t\t\t\t\t\t\t".'<optgroup label="'.Utils::escape($cat_data['cat_name']).'">'."\n";
 			foreach ($cat_data['cat_forums'] as $forum) {
 				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($fid == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
 			}
@@ -134,8 +141,8 @@
 					<tbody>
 <?php foreach ($queries_info['raw'] as $time => $sql) {
 	echo "\t\t\t\t\t\t".'<tr>'."\n";
-	echo "\t\t\t\t\t\t\t".'<td class="tcl">'.$feather->utils->escape(round($time, 8)).'</td>'."\n";
-	echo "\t\t\t\t\t\t\t".'<td class="tcr">'.$feather->utils->escape($sql).'</td>'."\n";
+	echo "\t\t\t\t\t\t\t".'<td class="tcl">'.Utils::escape(round($time, 8)).'</td>'."\n";
+	echo "\t\t\t\t\t\t\t".'<td class="tcr">'.Utils::escape($sql).'</td>'."\n";
 	echo "\t\t\t\t\t\t".'</tr>'."\n";
 } ?>
 						<tr>
diff --git a/style/themes/FeatherBB/view/footer.php b/style/themes/FeatherBB/view/footer.php
index 9e19de90..adf00831 100644
--- a/style/themes/FeatherBB/view/footer.php
+++ b/style/themes/FeatherBB/view/footer.php
@@ -70,7 +70,7 @@
 					<select name="id" onchange="window.location=('<?php echo $feather->url->get('forum/') ?>'+this.options[this.selectedIndex].value)">
 <?php
 		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
-			echo "\t\t\t\t\t\t\t".'<optgroup label="'.$feather->utils->escape($cat_data['cat_name']).'">'."\n";
+			echo "\t\t\t\t\t\t\t".'<optgroup label="'.Utils::escape($cat_data['cat_name']).'">'."\n";
 			foreach ($cat_data['cat_forums'] as $forum) {
 				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
 			}
diff --git a/style/themes/FeatherBB/view/header.new.php b/style/themes/FeatherBB/view/header.new.php
index 99e56d2c..79d1796e 100644
--- a/style/themes/FeatherBB/view/header.new.php
+++ b/style/themes/FeatherBB/view/header.new.php
@@ -7,6 +7,13 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
 ?>
 <!doctype html>
 <html lang="<?php _e('lang_identifier') ?>">
@@ -124,7 +131,7 @@ function process_form(the_form)
         echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('admin/').'">'.__('Admin').'</a></li>'."\n";
     }
 
-    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.$feather->url->get('auth/logout/token/'.\FeatherBB\Utils::feather_hash($feather->user->id.\FeatherBB\Utils::feather_hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.$feather->url->get('auth/logout/token/'.\FeatherBB\Utils::hash($feather->user->id.\FeatherBB\Utils::hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
 }
 
 // // Are there any additional navlinks we should insert into the array before imploding it?
@@ -154,7 +161,7 @@ function process_form(the_form)
         <div class="container-title-status">
             <h1 class="title-site">
                 <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
-                    <p><?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?></p>
+                    <p><?php echo Utils::escape($feather->forum_settings['o_board_title']) ?></p>
                 </a>
                 <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
             </h1>
@@ -166,7 +173,7 @@ function process_form(the_form)
                     <p class="conl"><?= __('Not logged in')?></p>
 <?php } else {
     echo "\t\t\t\t\t".'<ul class="conl">';
-    echo "\t\t\t\t\t\t".'<li><span>'.__('Logged in as').' <strong>'.$feather->utils->escape($feather->user->username).'</strong></span></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li><span>'.__('Logged in as').' <strong>'.Utils::escape($feather->user->username).'</strong></span></li>'."\n";
     echo "\t\t\t\t\t\t".'<li><span>'.sprintf(__('Last visit'), $feather->utils->format_time($feather->user->last_visit)).'</span></li>'."\n";
 
     if ($feather->user->is_admmod) {
@@ -224,7 +231,7 @@ function process_form(the_form)
         <?php foreach ($flash->getMessages() as $type => $message) { ?>
         <div class="flashmsg info" data-type="<?= $type; ?>" id="flashmsg">
             <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
-            <p><?= $feather->utils->escape($message) ?></p>
+            <p><?= Utils::escape($message) ?></p>
         </div>
         <?php } ?>
         <?php endif; ?>
diff --git a/style/themes/FeatherBB/view/header.php b/style/themes/FeatherBB/view/header.php
index a2cee85b..bdeba110 100644
--- a/style/themes/FeatherBB/view/header.php
+++ b/style/themes/FeatherBB/view/header.php
@@ -92,7 +92,7 @@ function process_form(the_form)
         <div class="container-title-status">
             <h1 class="title-site">
                 <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
-                    <p><?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?></p>
+                    <p><?php echo Utils::escape($feather->forum_settings['o_board_title']) ?></p>
                 </a>
                 <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
             </h1>
@@ -125,7 +125,7 @@ function process_form(the_form)
         <?php foreach ($flash->getMessages() as $type => $message) { ?>
         <div class="flashmsg info" data-type="<?= $type; ?>" id="flashmsg">
             <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
-            <p><?= $feather->utils->escape($message) ?></p>
+            <p><?= Utils::escape($message) ?></p>
         </div>
         <?php } ?>
         <?php endif; ?>
diff --git a/style/themes/FeatherBB/view/help.php b/style/themes/FeatherBB/view/help.php
index 51627b21..574953db 100644
--- a/style/themes/FeatherBB/view/help.php
+++ b/style/themes/FeatherBB/view/help.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -41,8 +43,8 @@
 <div class="box">
 	<div class="inbox">
 		<p><?php _e('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>]<?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>"><?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>"><?php echo $feather->utils->escape($feather->url->base(true).'/') ?></a></samp></p>
+		<p><a name="url"></a><code>[url=<?php echo Utils::escape($feather->url->base(true).'/') ?>]<?php echo Utils::escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape($feather->url->base(true).'/') ?>"><?php echo Utils::escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo Utils::escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape($feather->url->base(true).'/') ?>"><?php echo Utils::escape($feather->url->base(true).'/') ?></a></samp></p>
 		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
 		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
@@ -58,7 +60,7 @@
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
         dede
-		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo $feather->utils->escape($feather->url->base(true)) ?>/style/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo $feather->utils->escape($feather->url->base(true)) ?>/style/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
+		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo Utils::escape($feather->url->base(true)) ?>/style/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo Utils::escape($feather->url->base(true)) ?>/style/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
 <h2><span><?php _e('Quotes') ?></span></h2>
diff --git a/style/themes/FeatherBB/view/index.php b/style/themes/FeatherBB/view/index.php
index 826fa47e..e3c4e741 100644
--- a/style/themes/FeatherBB/view/index.php
+++ b/style/themes/FeatherBB/view/index.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -27,7 +29,7 @@
 	<?php endif;
     ?>
 	<div id="idx<?php echo $forum->cid ?>" class="blocktable">
-	<h2><span><?php echo $feather->utils->escape($forum->cat_name) ?></span></h2>
+	<h2><span><?php echo Utils::escape($forum->cat_name) ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
@@ -46,15 +48,15 @@
     ?>
 				<tr class="<?php echo $forum->item_status ?>">
 					<td class="tcl">
-						<div class="<?php echo $forum->icon_type ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($forum->forum_count_formatted) ?></div></div>
+						<div class="<?php echo $forum->icon_type ?>"><div class="nosize"><?php echo Utils::forum_number_format($forum->forum_count_formatted) ?></div></div>
 						<div class="tclcon">
 							<div>
 								<?php echo $forum->forum_field."\n".$forum->moderators_formatted ?>
 							</div>
 						</div>
 					</td>
-					<td class="tc2"><?php echo $feather->utils->forum_number_format($forum->num_topics_formatted) ?></td>
-					<td class="tc3"><?php echo $feather->utils->forum_number_format($forum->num_posts_formatted) ?></td>
+					<td class="tc2"><?php echo Utils::forum_number_format($forum->num_topics_formatted) ?></td>
+					<td class="tc3"><?php echo Utils::forum_number_format($forum->num_posts_formatted) ?></td>
 					<td class="tcr"><?php echo $forum->last_post_formatted ?></td>
 				</tr>
 	<?php
@@ -85,16 +87,16 @@
 		<div class="inbox">
 			<dl class="conr">
 				<dt><strong><?php _e('Board stats') ?></strong></dt>
-				<dd><span><?php printf(__('No of users'), '<strong>'.$feather->utils->forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of topics'), '<strong>'.$feather->utils->forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of posts'), '<strong>'.$feather->utils->forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of users'), '<strong>'.Utils::forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of topics'), '<strong>'.Utils::forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of posts'), '<strong>'.Utils::forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
 			</dl>
 			<dl class="conl">
 				<dt><strong><?php _e('User info') ?></strong></dt>
 				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
 				<?php if ($feather->forum_settings['o_users_online'] == 1) : ?>
-				<dd><span><?php printf(__('Users online'), '<strong>'.$feather->utils->forum_number_format($online['num_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('Guests online'), '<strong>'.$feather->utils->forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Users online'), '<strong>'.Utils::forum_number_format($online['num_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Guests online'), '<strong>'.Utils::forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
 				<?php endif; ?>
 			</dl>
 			<?php
diff --git a/style/themes/FeatherBB/view/install.php b/style/themes/FeatherBB/view/install.php
index 0aed4825..480c3844 100644
--- a/style/themes/FeatherBB/view/install.php
+++ b/style/themes/FeatherBB/view/install.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/login/form.php b/style/themes/FeatherBB/view/login/form.php
index 59808e7f..804b73df 100644
--- a/style/themes/FeatherBB/view/login/form.php
+++ b/style/themes/FeatherBB/view/login/form.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/login/password_forgotten.php b/style/themes/FeatherBB/view/login/password_forgotten.php
index 1ca9b389..1d066cd3 100644
--- a/style/themes/FeatherBB/view/login/password_forgotten.php
+++ b/style/themes/FeatherBB/view/login/password_forgotten.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/misc/email.php b/style/themes/FeatherBB/view/misc/email.php
index 867ac9ee..c54475b8 100644
--- a/style/themes/FeatherBB/view/misc/email.php
+++ b/style/themes/FeatherBB/view/misc/email.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -14,7 +16,7 @@
 
 ?>
 <div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo $feather->utils->escape($mail['recipient']) ?></span></h2>
+	<h2><span><?php _e('Send email to') ?> <?php echo Utils::escape($mail['recipient']) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="<?php echo $feather->url->get('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/style/themes/FeatherBB/view/misc/report.php b/style/themes/FeatherBB/view/misc/report.php
index 6eeead9c..b51b43e1 100644
--- a/style/themes/FeatherBB/view/misc/report.php
+++ b/style/themes/FeatherBB/view/misc/report.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -17,8 +19,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
 		</ul>
 	</div>
diff --git a/style/themes/FeatherBB/view/misc/rules.php b/style/themes/FeatherBB/view/misc/rules.php
index feb662ad..c45dbd6a 100644
--- a/style/themes/FeatherBB/view/misc/rules.php
+++ b/style/themes/FeatherBB/view/misc/rules.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/moderate/delete_posts.php b/style/themes/FeatherBB/view/moderate/delete_posts.php
index 00b80920..003487b7 100644
--- a/style/themes/FeatherBB/view/moderate/delete_posts.php
+++ b/style/themes/FeatherBB/view/moderate/delete_posts.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/moderate/delete_topics.php b/style/themes/FeatherBB/view/moderate/delete_topics.php
index d0ab1eed..ee012f13 100644
--- a/style/themes/FeatherBB/view/moderate/delete_topics.php
+++ b/style/themes/FeatherBB/view/moderate/delete_topics.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/moderate/merge_topics.php b/style/themes/FeatherBB/view/moderate/merge_topics.php
index 820cedee..7a35e9ea 100644
--- a/style/themes/FeatherBB/view/moderate/merge_topics.php
+++ b/style/themes/FeatherBB/view/moderate/merge_topics.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/moderate/moderator_forum.php b/style/themes/FeatherBB/view/moderate/moderator_forum.php
index 06c6987b..9b1e3735 100644
--- a/style/themes/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/themes/FeatherBB/view/moderate/moderator_forum.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -18,7 +20,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -30,9 +32,9 @@
 
 <form method="post" action="<?php echo $feather->url->get('moderate/forum/'.$id.'/') ?>">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<input type="hidden" name="page" value="<?php echo $feather->utils->escape($p) ?>" />
+<input type="hidden" name="page" value="<?php echo Utils::escape($p) ?>" />
 <div id="vf" class="blocktable">
-	<h2><span><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></span></h2>
+	<h2><span><?php echo Utils::escape($cur_forum['forum_name']) ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
@@ -55,15 +57,15 @@
                 ?>
 							<tr class="<?php echo $topic['item_status'] ?>">
 					<td class="tcl">
-						<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
+						<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo Utils::forum_number_format($topic_count + $start_from) ?></div></div>
 						<div class="tclcon">
 							<div>
 								<?php echo $topic['subject_disp']."\n" ?>
 							</div>
 						</div>
 					</td>
-					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? $feather->utils->forum_number_format($topic['num_replies']) : '-' ?></td>
-<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? $feather->utils->forum_number_format($topic['num_views']) : '-' ?></td>
+					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? Utils::forum_number_format($topic['num_replies']) : '-' ?></td>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? Utils::forum_number_format($topic['num_views']) : '-' ?></td>
 <?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_disp'] ?></td>
 					<td class="tcmod"><input type="checkbox" name="topics[<?php echo $topic['id'] ?>]" value="1" /></td>
@@ -92,7 +94,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/themes/FeatherBB/view/moderate/move_topics.php b/style/themes/FeatherBB/view/moderate/move_topics.php
index e72ae5cb..053e5bcb 100644
--- a/style/themes/FeatherBB/view/moderate/move_topics.php
+++ b/style/themes/FeatherBB/view/moderate/move_topics.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/moderate/posts_view.php b/style/themes/FeatherBB/view/moderate/posts_view.php
index 0338555a..efedca10 100644
--- a/style/themes/FeatherBB/view/moderate/posts_view.php
+++ b/style/themes/FeatherBB/view/moderate/posts_view.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -17,8 +19,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -57,7 +59,7 @@
 						<div class="postmsg">
 							<?php echo $post['message']."\n" ?>
 	<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.$feather->utils->escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.Utils::escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 						</div>
@@ -85,8 +87,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/themes/FeatherBB/view/moderate/split_posts.php b/style/themes/FeatherBB/view/moderate/split_posts.php
index 7c59b0b9..25e50568 100644
--- a/style/themes/FeatherBB/view/moderate/split_posts.php
+++ b/style/themes/FeatherBB/view/moderate/split_posts.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/post.php b/style/themes/FeatherBB/view/post.php
index 248d7ff3..01eb541f 100644
--- a/style/themes/FeatherBB/view/post.php
+++ b/style/themes/FeatherBB/view/post.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -18,10 +20,10 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_posting['forum_name']) ?></a></li>
-<?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo $feather->utils->escape($feather->request->post('req_subject')) ?></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_posting['forum_name']) ?></a></li>
+<?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo Utils::escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
-<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_posting['subject']) ?></a></li>
+<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_posting['subject']) ?></a></li>
 <?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
 		</ul>
 	</div>
@@ -81,7 +83,7 @@
 ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
+    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
@@ -102,11 +104,11 @@
     $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
 						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
-    echo $feather->utils->escape($post['username']);
+    echo Utils::escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
-    echo $feather->utils->escape($post['email']);
+    echo Utils::escape($post['email']);
 }
     ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
@@ -115,11 +117,11 @@
 }
 if ($fid): ?>
 						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
-    echo $feather->utils->escape($post['subject']);
+    echo Utils::escape($post['subject']);
 } ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 <?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
                         <script>postEditorToolbar('req_message');</script>
-						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? $feather->utils->linebreaks($feather->utils->trim($feather->utils->escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
+						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? Utils::linebreaks(Utils::trim(Utils::escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
 							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
 							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
@@ -190,7 +192,7 @@
 			<div class="postbody">
 				<div class="postleft">
 					<dl>
-						<dt><strong><?php echo $feather->utils->escape($post['poster']) ?></strong></dt>
+						<dt><strong><?php echo Utils::escape($post['poster']) ?></strong></dt>
 						<dd><span><?php echo $feather->utils->format_time($post['posted']) ?></span></dd>
 					</dl>
 				</div>
diff --git a/style/themes/FeatherBB/view/profile/change_mail.php b/style/themes/FeatherBB/view/profile/change_mail.php
index 1e59ab54..a719ffba 100644
--- a/style/themes/FeatherBB/view/profile/change_mail.php
+++ b/style/themes/FeatherBB/view/profile/change_mail.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/profile/change_pass.php b/style/themes/FeatherBB/view/profile/change_pass.php
index 1bacb173..c7ee7113 100644
--- a/style/themes/FeatherBB/view/profile/change_pass.php
+++ b/style/themes/FeatherBB/view/profile/change_pass.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/profile/delete_user.php b/style/themes/FeatherBB/view/profile/delete_user.php
index 84a3b58d..6c9798cf 100644
--- a/style/themes/FeatherBB/view/profile/delete_user.php
+++ b/style/themes/FeatherBB/view/profile/delete_user.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -22,7 +24,7 @@
 				<fieldset>
 					<legend><?php _e('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php _e('Confirmation info').' <strong>'.$feather->utils->escape($username).'</strong>.' ?></p>
+						<p><?php _e('Confirmation info').' <strong>'.Utils::escape($username).'</strong>.' ?></p>
 						<div class="rbox">
 							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
 						</div>
diff --git a/style/themes/FeatherBB/view/profile/menu.php b/style/themes/FeatherBB/view/profile/menu.php
index a46fef80..a2ca1fb5 100644
--- a/style/themes/FeatherBB/view/profile/menu.php
+++ b/style/themes/FeatherBB/view/profile/menu.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/profile/section_admin.php b/style/themes/FeatherBB/view/profile/section_admin.php
index f06eb7d4..415d520b 100644
--- a/style/themes/FeatherBB/view/profile/section_admin.php
+++ b/style/themes/FeatherBB/view/profile/section_admin.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -14,7 +16,7 @@
 
 ?>
 	<div class="blockform">
-		<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section admin') ?></span></h2>
+		<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section admin') ?></span></h2>
 		<div class="box">
 			<form id="profile7" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/style/themes/FeatherBB/view/profile/section_display.php b/style/themes/FeatherBB/view/profile/section_display.php
index 7cce9e3c..e31ed2c2 100644
--- a/style/themes/FeatherBB/view/profile/section_display.php
+++ b/style/themes/FeatherBB/view/profile/section_display.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -14,7 +16,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section display') ?></span></h2>
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section display') ?></span></h2>
 	<div class="box">
 		<form id="profile5" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/style/themes/FeatherBB/view/profile/section_essentials.php b/style/themes/FeatherBB/view/profile/section_essentials.php
index b45114f6..f5322195 100644
--- a/style/themes/FeatherBB/view/profile/section_essentials.php
+++ b/style/themes/FeatherBB/view/profile/section_essentials.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -14,7 +16,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section essentials') ?></span></h2>
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section essentials') ?></span></h2>
 	<div class="box">
 		<form id="profile1" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -241,12 +243,12 @@
 				<fieldset>
 					<legend><?php _e('User activity') ?></legend>
 					<div class="infldset">
-						<p><?php printf(__('Registered info'), $feather->utils->format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.$feather->utils->escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Registered info'), $feather->utils->format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.Utils::escape($user['registration_ip']).'</a>)' : '')) ?></p>
 						<p><?php printf(__('Last post info'), $feather->utils->format_time($user['last_post'])) ?></p>
 						<p><?php printf(__('Last visit info'), $feather->utils->format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
 <?php if ($feather->user->is_admmod): ?>							<label><?php _e('Admin note') ?><br />
-						<input id="admin_note" type="text" name="admin_note" value="<?php echo $feather->utils->escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
+						<input id="admin_note" type="text" name="admin_note" value="<?php echo Utils::escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
diff --git a/style/themes/FeatherBB/view/profile/section_messaging.php b/style/themes/FeatherBB/view/profile/section_messaging.php
index 2d3268dd..ce6a075f 100644
--- a/style/themes/FeatherBB/view/profile/section_messaging.php
+++ b/style/themes/FeatherBB/view/profile/section_messaging.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -14,7 +16,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section messaging') ?></span></h2>
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section messaging') ?></span></h2>
 	<div class="box">
 		<form id="profile3" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -23,11 +25,11 @@
 					<legend><?php _e('Contact details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo $feather->utils->escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
+						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo Utils::escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
 						<label><?php _e('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo $feather->utils->escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo $feather->utils->escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo $feather->utils->escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo Utils::escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
+						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo Utils::escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo Utils::escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/themes/FeatherBB/view/profile/section_personal.php b/style/themes/FeatherBB/view/profile/section_personal.php
index 5ae81801..e4c0a3cc 100644
--- a/style/themes/FeatherBB/view/profile/section_personal.php
+++ b/style/themes/FeatherBB/view/profile/section_personal.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -14,7 +16,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section personal') ?></span></h2>
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personal') ?></span></h2>
 	<div class="box">
 		<form id="profile2" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -23,10 +25,10 @@
 					<legend><?php _e('Personal details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo $feather->utils->escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
+						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo Utils::escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
 <?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo $feather->utils->escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo $feather->utils->escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo Utils::escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo Utils::escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>
 					</div>
 				</fieldset>
diff --git a/style/themes/FeatherBB/view/profile/section_personality.php b/style/themes/FeatherBB/view/profile/section_personality.php
index ae9f7b0f..3d19bbbc 100644
--- a/style/themes/FeatherBB/view/profile/section_personality.php
+++ b/style/themes/FeatherBB/view/profile/section_personality.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -14,7 +16,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section personality') ?></span></h2>
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personality') ?></span></h2>
 	<div class="box">
 		<form id="profile4" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -35,8 +37,8 @@
 					<div class="infldset">
 						<p><?php _e('Signature info') ?></p>
 						<div class="txtarea">
-							<label><?php printf(__('Sig max size'), $feather->utils->forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
-							<textarea name="signature" rows="4" cols="65"><?php echo $feather->utils->escape($user['signature']) ?></textarea><br /></label>
+							<label><?php printf(__('Sig max size'), Utils::forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
+							<textarea name="signature" rows="4" cols="65"><?php echo Utils::escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
 							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
diff --git a/style/themes/FeatherBB/view/profile/section_privacy.php b/style/themes/FeatherBB/view/profile/section_privacy.php
index 48715858..b37d810e 100644
--- a/style/themes/FeatherBB/view/profile/section_privacy.php
+++ b/style/themes/FeatherBB/view/profile/section_privacy.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -14,7 +16,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section privacy') ?></span></h2>
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section privacy') ?></span></h2>
 	<div class="box">
 		<form id="profile6" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/style/themes/FeatherBB/view/profile/upload_avatar.php b/style/themes/FeatherBB/view/profile/upload_avatar.php
index f92da260..033dbe75 100644
--- a/style/themes/FeatherBB/view/profile/upload_avatar.php
+++ b/style/themes/FeatherBB/view/profile/upload_avatar.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
 	exit;
@@ -25,7 +27,7 @@
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php _e('Avatar desc'); echo ' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.$feather->utils->file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
+						<p><?php _e('Avatar desc'); echo ' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.Utils::forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.$feather->utils->file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/themes/FeatherBB/view/profile/view_profile.php b/style/themes/FeatherBB/view/profile/view_profile.php
index d30181fd..71ab3007 100644
--- a/style/themes/FeatherBB/view/profile/view_profile.php
+++ b/style/themes/FeatherBB/view/profile/view_profile.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/register/email.php b/style/themes/FeatherBB/view/register/email.php
index a93188f9..c8903ebd 100644
--- a/style/themes/FeatherBB/view/register/email.php
+++ b/style/themes/FeatherBB/view/register/email.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -15,7 +17,7 @@
 ?>
 
 <div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo $feather->utils->escape($recipient) ?></span></h2>
+	<h2><span><?php _e('Send email to') ?> <?php echo Utils::escape($recipient) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -24,7 +26,7 @@
 					<legend><?php _e('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="redirect_url" value="<?php echo $feather->utils->escape($redirect_url) ?>" />
+						<input type="hidden" name="redirect_url" value="<?php echo Utils::escape($redirect_url) ?>" />
 						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
 						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
diff --git a/style/themes/FeatherBB/view/register/form.php b/style/themes/FeatherBB/view/register/form.php
index d7deb65f..fc699571 100644
--- a/style/themes/FeatherBB/view/register/form.php
+++ b/style/themes/FeatherBB/view/register/form.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -54,7 +56,7 @@
 						<input type="hidden" name="username" value="" />
 						<input type="hidden" name="password" value="" />
 						<label class="required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
-    echo $feather->utils->escape($feather->request->post('req_user'));
+    echo Utils::escape($feather->request->post('req_user'));
 } ?>" size="25" maxlength="25" /><br /></label>
 					</div>
 				</fieldset>
@@ -64,10 +66,10 @@
 					<legend><?php _e('Pass legend') ?></legend>
 					<div class="infldset">
 						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
-    echo $feather->utils->escape($feather->request->post('req_password1'));
+    echo Utils::escape($feather->request->post('req_password1'));
 } ?>" size="16" /><br /></label>
 						<label class="conl required"><strong><?php _e('Confirm pass') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
-    echo $feather->utils->escape($feather->request->post('req_password2'));
+    echo Utils::escape($feather->request->post('req_password2'));
 } ?>" size="16" /><br /></label>
 						<p class="clearb"><?php _e('Pass info') ?></p>
 					</div>
@@ -80,11 +82,11 @@
 <?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
 <?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
-    echo $feather->utils->escape($feather->request->post('req_email1'));
+    echo Utils::escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
 <?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
-    echo $feather->utils->escape($feather->request->post('req_email2'));
+    echo Utils::escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>					</div>
 				</fieldset>
diff --git a/style/themes/FeatherBB/view/register/rules.php b/style/themes/FeatherBB/view/register/rules.php
index 326c96ad..351acfbd 100644
--- a/style/themes/FeatherBB/view/register/rules.php
+++ b/style/themes/FeatherBB/view/register/rules.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/search/footer.php b/style/themes/FeatherBB/view/search/footer.php
index 0dd6fc5e..63b3fdbf 100644
--- a/style/themes/FeatherBB/view/search/footer.php
+++ b/style/themes/FeatherBB/view/search/footer.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/search/form.php b/style/themes/FeatherBB/view/search/form.php
index 16cd788a..7d7d20f3 100644
--- a/style/themes/FeatherBB/view/search/form.php
+++ b/style/themes/FeatherBB/view/search/form.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/search/header.php b/style/themes/FeatherBB/view/search/header.php
index de5e1f0a..9a228a1f 100644
--- a/style/themes/FeatherBB/view/search/header.php
+++ b/style/themes/FeatherBB/view/search/header.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/search/posts.php b/style/themes/FeatherBB/view/search/posts.php
index 3a2be8ef..b28936a5 100644
--- a/style/themes/FeatherBB/view/search/posts.php
+++ b/style/themes/FeatherBB/view/search/posts.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -22,14 +24,14 @@
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
     _e('Re').' ';
-} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
+} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
 		<div class="postbody">
 			<div class="postleft">
 				<dl>
 					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.$feather->utils->forum_number_format($cur_search['num_replies']) ?></span></dd>
+<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.Utils::forum_number_format($cur_search['num_replies']) ?></span></dd>
 <?php endif; ?>
 					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
 				</dl>
diff --git a/style/themes/FeatherBB/view/search/topics.php b/style/themes/FeatherBB/view/search/topics.php
index 265cbb27..0fc3e2a6 100644
--- a/style/themes/FeatherBB/view/search/topics.php
+++ b/style/themes/FeatherBB/view/search/topics.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -16,7 +18,7 @@
 
 <tr class="<?php echo $cur_search['item_status'] ?>">
 	<td class="tcl">
-		<div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
+		<div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo Utils::forum_number_format($topic_count + $start_from) ?></div></div>
 		<div class="tclcon">
 			<div>
 				<?php echo $subject."\n" ?>
@@ -24,6 +26,6 @@
 		</div>
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
-	<td class="tc3"><?php echo $feather->utils->forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.$feather->utils->format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.$feather->utils->escape($cur_search['last_poster']) ?></span></td>
+	<td class="tc3"><?php echo Utils::forum_number_format($cur_search['num_replies']) ?></td>
+	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.$feather->utils->format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_search['last_poster']) ?></span></td>
 </tr>
\ No newline at end of file
diff --git a/style/themes/FeatherBB/view/userlist.php b/style/themes/FeatherBB/view/userlist.php
index 3166d107..04344370 100644
--- a/style/themes/FeatherBB/view/userlist.php
+++ b/style/themes/FeatherBB/view/userlist.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -21,7 +23,7 @@
 				<fieldset>
 					<legend><?php _e('User find legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo $feather->utils->escape($username) ?>" size="25" maxlength="25" /><br /></label>
+<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo Utils::escape($username) ?>" size="25" maxlength="25" /><br /></label>
 <?php endif; ?>						<label class="conl"><?php _e('User group')."\n" ?>
 						<br /><select name="show_group">
 							<option value="-1"<?php if ($show_group == -1) {
@@ -87,9 +89,9 @@
             foreach ($userlist_data as $user) {
                 ?>
 					<tr>
-						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.$feather->utils->escape($user['username']).'</a>' ?></td>
+						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
 						<td class="tc2"><?php echo get_title($user) ?></td>
-	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo $feather->utils->forum_number_format($user['num_posts']) ?></td>
+	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
 	<?php endif;
                 ?>
 						<td class="tcr"><?php echo $feather->utils->format_time($user['registered'], true) ?></td>
diff --git a/style/themes/FeatherBB/view/viewforum.php b/style/themes/FeatherBB/view/viewforum.php
index dbf440af..32bdbb31 100644
--- a/style/themes/FeatherBB/view/viewforum.php
+++ b/style/themes/FeatherBB/view/viewforum.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -17,7 +19,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -28,7 +30,7 @@
 </div>
 
 <div id="vf" class="blocktable">
-	<h2><span><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></span></h2>
+	<h2><span><?php echo Utils::escape($cur_forum['forum_name']) ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
@@ -48,15 +50,15 @@
                 ?>
 					<tr class="<?php echo $topic['item_status'] ?>">
 						<td class="tcl">
-							<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
+							<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo Utils::forum_number_format($topic_count + $start_from) ?></div></div>
 							<div class="tclcon">
 								<div>
 									<?php echo $topic['subject_formatted']."\n" ?>
 								</div>
 							</div>
 						</td>
-						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? $feather->utils->forum_number_format($topic['num_replies']) : '-' ?></td>
-	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? $feather->utils->forum_number_format($topic['num_views']) : '-' ?></td>
+						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? Utils::forum_number_format($topic['num_replies']) : '-' ?></td>
+	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? Utils::forum_number_format($topic['num_views']) : '-' ?></td>
 	<?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_formatted'] ?></td>
 					</tr>
@@ -92,7 +94,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
 		<div class="clearer"></div>
diff --git a/style/themes/FeatherBB/view/viewtopic.php b/style/themes/FeatherBB/view/viewtopic.php
index d16a862c..5fd070d2 100644
--- a/style/themes/FeatherBB/view/viewtopic.php
+++ b/style/themes/FeatherBB/view/viewtopic.php
@@ -7,6 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Utils;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -18,8 +20,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -66,11 +68,11 @@
 					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
     _e('Re').' ';
 }
-    ?><?php echo $feather->utils->escape($cur_topic['subject']) ?></h3>
+    ?><?php echo Utils::escape($cur_topic['subject']) ?></h3>
 					<div class="postmsg">
 						<?php echo $post['message']."\n" ?>
 <?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.$feather->utils->escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.Utils::escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 					</div>
@@ -108,8 +110,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 <?php echo $subscraction ?>
 		<div class="clearer"></div>
@@ -133,8 +135,8 @@
 					<legend><?php _e('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="pid" value="<?php echo $feather->utils->escape($pid) ?>" />
-						<input type="hidden" name="page" value="<?php echo $feather->utils->escape($page_number) ?>" />
+						<input type="hidden" name="pid" value="<?php echo Utils::escape($pid) ?>" />
+						<input type="hidden" name="page" value="<?php echo Utils::escape($page_number) ?>" />
 <?php if ($feather->forum_settings['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
 <?php endif;
 
@@ -155,7 +157,7 @@
     ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
+    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
diff --git a/style/themes/MyFeatherBB/base_admin.css b/style/themes/MyFeatherBB/base_admin.css
deleted file mode 100644
index c86ecfa6..00000000
--- a/style/themes/MyFeatherBB/base_admin.css
+++ /dev/null
@@ -1 +0,0 @@
-#adminmenu{float:left;width:27.5%}#adminconsole .block{width:70%;margin:0 0 0 30%}#adminconsole .block h2{border:1px solid #d8d8d8;border-bottom:none;padding:5px;margin:0;text-indent:10px;font-weight:400;font-size:18px;background-color:#f5f5f5;border-radius:3px 3px 0 0}#adminconsole .block .box{border-radius:0 0 3px 3px;border:1px solid #d8d8d8;background-color:#fff;margin-bottom:15px}#adminconsole .block .box .inbox,#adminconsole.block2col div.block div#adalerts.box p{padding:15px}#adminconsole .block #adintro p{padding:0 0 7px}#adminconsole .block #adstats dl{margin:0}#adminconsole .block #adstats dl dt{font-weight:700;padding:2px}#adminconsole .block #adstats dl dd{padding:2px;margin:0 0 7px}#adminconsole .blockform{width:70%;margin:0 0 0 30%}#adminconsole .blockform .box{margin-bottom:15px}#adminconsole .blockform .box .inbox{padding:15px}#adminconsole .blockform .box #stopspamforum span{font-weight:700}#adminconsole .blockform .box .submitend,#adminconsole .blockform .box .submittop{margin:7px;text-align: center;}#adminconsole .blockform .box .infldset tr{border-top:2px solid #d8d8d8;border-bottom:2px solid #d8d8d8}#adminconsole .blockform .box .infldset tr:first-child{border-top:none}#adminconsole .blockform .box .infldset tr:last-child{border-bottom:none}#adminconsole .blockform .box .infldset tr th{width:15em;vertical-align:top;text-align:left;padding:7px;font-weight:400}#adminconsole .blockform .box .infldset tr td{padding:7px}#adminconsole .blockform .box .infldset tr td input{box-shadow:inset 0 1px 2px rgba(0,0,0,.075);border:1px solid #ccc;border-radius:3px;background-color:#fafafa;padding:6px 8px;margin:6px 0}#adminconsole .blockform .box .infldset tr td input:focus{border:1px solid #51a7e8;background-color:#fff;box-shadow:0 0 5px rgba(81,167,232,.5);outline:0}#adminconsole .blockform .box .infldset tr td textarea{margin:7px 0;box-shadow:inset 0 1px 2px rgba(0,0,0,.075);border:1px solid #ccc;border-radius:3px;background-color:#fafafa;padding:7px 8px}#adminconsole .blockform .box .infldset tr td textarea:focus{border:1px solid #51a7e8;background-color:#fff;box-shadow:0 0 5px rgba(81,167,232,.5);outline:0}#adminconsole .blockform .box .infldset tr td label,#adminconsole .blockform .box .infldset tr td span{display:block}#adminconsole .blockform .box .infldset tr td .conl{display:inline-block;margin-left:3px}#adminconsole .blockform .box .infldset tr .location span{display:inline}#adminconsole .clearer{clear:both}input[type=radio]:focus{box-shadow:none!important}@media only screen and (max-width:768px){.block,.blockform{margin:0!important}.block{width:100%!important}.block label input{width:80%!important}.blockform{width:100%!important}.blockform td,.blockform th{display:block}.blockform input,.blockform textarea{width:80%}.blockform input[type=checkbox]{width:7%!important}}
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.eot b/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.eot
deleted file mode 100644
index 6170eea058e048efde81c3818aa506d0a806a5cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16442
zcmZvCRZtvG@aD2Cu(-P|?(XjH?k>UIB`ogl?iyTzhT!gQA-DyC1c!wCRo(sT9`0tU
ztH1fWtNUdhrl(s_900Hs0|0>kZ4lr;jSLSD1OnlJFff1=7{Gs=vN{_8P@?po?SEGK
z{{c9|6P*9U{a=j(kObHOECCh(PXGj<`XBcGPXGWkfaZVt(|;$Y|7;%rF+>2}{}_+|
z{Okd)0GI!~IRLEx3HyHn08syb<3RqOC;)(@mYn+k&Huj<EFdoiz)lU|*8_-2W6hq&
zP52q=P1+f`D~9+{TJ?A^e`1z-qJ4ss3fmzX`5O0l|DFLZ7msgo(l$q_PtX?U-tq{S
zvh+4DCC+R28nNC!S+SC(m(XP-d~(faDwk-=F;G@^MRdy6*yU>_ERfLMl@Jqvw|1$k
znY3P1;ms*BXrao~;eX|%C`4w|3t%zMHc*@}NMhvQTgj^HVox(RI)X<$SgdswK5&5V
zO^nWMM_XpXQ9#cS9A06~i=$!+sn*ZRY>xnMp)ZloNNI4zEwC~gI%t>QLKT$}5|T07
z=!$V(wnAYPkf?UhnkKw`$yR1Zt#)5F@+_!=_kBy=-m^=s7_{}8+Co_~AKl(W*rwkP
zAcDgCMaexuyWh1MHKN%m4rwO~xaE$umpOCaQKHCreGi3q!<8hZWoJ8P>t`uHXX}5q
zyTOnS2>GMdAurd(bBQ^i*c#+5Zh#jBBfHkZG=fsrrLn9}6(K~)%K@f$5HDj_3x!c5
zooN;fhpBw|0FkdY&(eEv^B*LYMIR^$MAr;tyO9m~Cx??zrZJso;gSjn_D!8j9`eu!
z3mY5+c5%_Zk5j~YM3!@oo=I&>Y5+Ar=h9RrFg&5B;u6xl$`MKaK!2n<$d_<;_!A&0
z)*k)joSLxtKZ(Dw8Gl%gm42rQ)!ic_*T>SP>UE@MOj9YrNvP8Q4xd->21$7kDrzKg
z?b}&gkNI`-gF#u)o7`%6!WTsuMTO5%h((C5$Y|NGOKg$<))JtY-#@p-A1^cNKdPi!
zE~iaZ=HSA1^f9c}6y$|x_rR&zlk}XtgdL!{Z3HKG{i|Vn4A~Gp=&=4{G-){!5-<{i
zyqe6U`<$v_DKl*qx%jusSIze?@}zcu6?rJ1Fp~)amVsBX(yzr*p=XFtBN4Pzq#?d~
zx1c6vZ`Nk#Nh}a1ci!I;flv$??#4ABf)f(UyS<V5q!l9eOdfeSG_nY8C!$NRv+Wy!
zq);p0<fPsc&~@A{AV}4NL&t4l2$@D~*19#Cq+QJ@JxB?#-+%T5V;}`tBNsNv3-An6
zVGnqVtUa5dNthskk<YY+UY8Ev9%^_jNI3McH2xIkCH``DpY8bSzn_jYYH@nd?-*~q
zb+PW#_w|#GU6*&?+PJZ|lL&XjDtHTTVU4y&a!GgZsv;b$J&7?n7WB_M?eaZ??sNRA
zxmaAkFz|0SbJ<kQ>ExIuQT@=&7ri2T+Sb(-uksEu`UknG{eAgZ3kF>I>8J{CYG$G#
z`cH8HrC2F#_uP8DG%gR)m4ED#wnb4!Tf9m{%1D{3QDO*t&b{v)OULk+5#`^rj^uxG
zfJf>zN9!$L0cRz{4+@=|@;Q0Mx_{Vph(CMAezsr~_)MQ6ArRQJi+9&q`K{p&#un;^
zxu*^7q8V(okauG!g5zdVOfwQEnUhpxr~+c6%!$|yh;t}mv%_9BgSpKix#E!L0SOnV
z#2IL0FAry_s*<O+#lqB_XSJD-gjAIgtd&-<@?4L~j^oWvFp;rc&L3Jrw_NshptsFA
z5>}JLB;1MOt;IzeIkXqUrQd41Ce$`8fTb&i#jg{03};8Z@#`XT+kV5aqIyc`!0NmB
zFom9aUo90@6fC1mY|)@s+CsSs?SXx@_yfg-J}Z{2d$R>`{lgA*_|b;Ey0*N$=Ac+E
z@vC026aH^<-|-=4Bmu#@z^Fv><=Y(^`M4w%6+Ca8l2*cLsLJaf(jjwg<pDzLI0!hE
z49ZXQ17-=rXP%3>BeK5$Ma(%6=K^Ed5z+$T`Fkl5TkYA54GSr#<w^#TVRyR>F!?b2
zVH-)tlp*+i%_)Zi;@=jd<JjHB8{Ji@(7*@bTPN(B($d*+*ptuTr8pmoBDKLbqQck=
zMW`X<EQd}YF|Jm=B7K7-tVL>hgQQ>!;{hG*lo8?Jjb65)rE=+!GfyBo?+=ZeZ5~|O
z9hcEjHscB}IraCnhV5n?Jq1}c=5rGoY>wA+1G>Q+vHG+eoEhS6NTFyI;+qvVxXPS3
zXPUTZ0p~HEGiuKBvi8r&U*uMx`JCGx;?gAdRBkA{ZAAyrqrcmRR!r#z+Jn6GPafkN
z+(%3p==D{RLqh?Pyz-fX6z<#w=~KO7mU$RsrM)Q-xVEH`uAKq?Z8*Syw4FR#0i*UG
zq?2(T|1`PJ*2&@`OW9N2kTYXafWs{7uj{7Yi9*dKYlLOjXg6&sM>2;XB*jcvju@wZ
z!Y-gtN0l>8(((QwL65%4(5P0RV;+c0p$C^k5I88!MOc2gh*G8h%pa*)ALN0o{e_f=
zta45Vq{XdS;k6Ke&tH$JTu2E%OTem-AgLmYoP+nMR*sb41mEYXn#E_gFyNH^WY37x
znEu!B5mSlx6ShnvfrxR5J;QQoLy(4`JzZEyTFx_ck$!aY0WAT4WVz{r-HgHQ2UY^3
zeW!FeVwIkkc|W7=R+&a*0B=o(h3Vfq8UkJZeHM&->q2%M3Ivf^FnZkK*#f;JIx_L}
zoL)X(7C3WLSSx#|vAdvYP<PTtAPA-VdDqk}{wneKl<_5ZY6nL)yDfXDNqJ7Uq>8(d
zq#xI8=GZ||GP8DiPg-j1&J!wq$CX|X6Pp{;XCRp>g)K>WIU{9WIuaL26Jfw@LzBk5
z#F<tQPi8}rqPwMulZC02EN^|~Oh2UrDmz>v6v|VwS1?a|50KnD2W28DfO6(jJoNKB
z`S}B}**wD&(;(@7rwBB$Y2Aavu>$Du#``>UuV`{hbEgPsIM7oBh^E~s0@Wm5<=}86
z?(kq1?n#A7<p7X5#$ylmkzyK(ekt5KSmN-{-VNp>I*VTr`;NHB81Bd!7tOfro^N;>
zh5loN{caB>978G_xWi#d{1wq+L8y87-a@Lk*W!cJFzRZ-Qh5JI6kHq<-sUoLsXf{m
z`!#1N=Uk3)WUHjt6)$ZVb`@fo>wh#QW~ovpgbT;cTRb9Y0Y@QLv$>>lMll5`lG0MU
zo|@qgRt5gZsi1b)b74zb1%BD*giIz4d=AYD9JnXJ5@6jea-VixRVolpo;Ymdq6_oQ
zO)HgAd<HJ*OQ<lsv|<V;(2_<TF7ySf0ywn8U8@zNAC(Eg!QZcxhlA%|svv}S;;x0|
zcZtemvPQ9}l;?!svDZX_DJImFnAi&gR^Wm*rdk^$=ossn)CEU%ptHqL22CWG6C`cu
zf}n(AVj;Ruxinn(Xw70<$(Ify$hmrNk)L}DzMcO|d{g)72|e#=v0_;qyZ`SnyYk`r
zM#I3OfD|Be^PeB?WfK^}Xsr8MD)SU_KlAFVbpOs%SUlN&A;UBCocGh8?LO^cHuIbS
z=vFnb=_>Es;S$?AEH)Qy7X|EdKMCJcy0;0x2pv&G7p(<EFbhAljZnbOXYxrRqm$Gn
zBHHmIghts`$WA!SD;wHcC96nB#Gnar0I}rxul}VZheQ43YI6>6JR<ziV1d)vx=Fg>
z8qa5xOJ;T>g>)K=x{r(G)LDtEIrXxUGgKr|7@426^x+>qKOtlb`2#i@Og?eZP#u1{
zuv_lX&2&RyTua_%HB?hYoBEsCTOIaL-0#VEygj<%<QPK?s$Z1hF8Zbv%Z=y=_6;y`
zQmgZP{IpWsFXU0P|2v3%BZx}j$Ky%Wl)uI&yx$}W5)BRK&PCFF*I!OneiO7G`Vu?4
zp&)>qCcm{=FOK*`h6NY)cg|LNPbApA{=`MK<XaAij>V||HFsnN>v#5*soKtx=B9@e
za|_w>?hu5lgL*v;Kj!+^rQytjmOsKjXm~FsVK#q=m#Nc_`HBBm8zlRKh(dtJ6+Ai8
ze}yUg{gaZB^y|4dRc{t!oD!90l2YUtQz~Wm=!D7`e7jM)u(RV>V7d9`K2>u>ThD5@
zdDf41N(zxJp=8TWhD9_chm({tAAw!f)d>wrZ^I7d`o&6IjXE6!C8_Ta;uWDgm|cmu
zm%oTehfUv`^UB%!2$<pm-?6o=pS0lWINuau0*J5nOk?|Z;LbXBe|9T8UH{hn?D<ra
zens|8K}_gjB>gcmudM$5q`^qxl`*VQZMWTFNDbwTDdMdsn@mlPezi_%{-DRB4ep}O
z<ZacM;%(LNAX_<`_WNZLi-rc)S`AIhA}C|&42s>USSsg|X_KTv*?6Bvfrc7k*cUUI
zjS9n}%&n-x$RVRaSd&mUmCk{b$|GyEVNrlP!L=~S$UM%32?@Z^1hIm}A6zj+9%69s
zAQDmvU?@;qRl7<@j=|}6x=0ELw~HZp_6^Kb9g5IEf)O|jM7m^$JcNZIOTN|Zj1c*5
zje{e^p)^kHBo0xqg`v=+OE3va3v5P$_)*adcwc@KnobPhCo)H1Z-7mhEpg*%Ml)PO
zpfBa7)um%^0T4atcZp-FLy=IxfbNYuB>hRl#88!M83#qwIuc^{sT$sg7!1-p6IUOa
zb1`5KTS3NlV`E!yv8=0$_^#|bnfP8f9nRk~J+&XPE~2VRy2_T4Vcm}>6q6%*De+vQ
zAr!QqQS>#yRN7NSL=f=L*-N{|(kfpf)R(;{X)9>4g{Q!#M82WYtJuK0G>PGc#O||)
zu+*ZhodUu{h4q4ckE6>BvTJcFWVwQ1VJ+n$?Zu_*VnisyJ8v&VynR{Xi<@Vm7LoOs
z#ca92Kl7;}NmP37z4rw-u8q;8Vr$Z>LfXU=b21h11LfjSG4PLt3N{OXbV!S#50+Lz
zMWfKom{O4H8(pBu>{J(3@<=$N#<Dp~4SxkKMglos(w^7%P^wECbbL@#*?<jg2Eh~>
zHG45Y>maSJ6TqT-fRHw%T=VB1<HJsnJZS8g83b{?Nm6grp2BZV{#c`kEQ+oTLSu&7
zHM8Z%6>)W+H8NwAi8bqg#6pOWgKQ=(sBr@VKW@+bvxH?Pvs>jssDR0QWEd3uX82%G
z*w5_}lu&%L+=xO59&xk})bEP~t|UK<JU0m{2d%-hAer?FRPAr=zaii!*3jZ9EMT*n
zGRTizx@>`DKp&$886#Bu7M_{uM>xGfG+Ze;4=m=MwKL2SADs`G!p~t-fVl6lAK%w|
zT&xidSg~^i!j<R&KYk|!i8FfY2w*;pY;+5bDQT!2x#a$i2)0$mYY6xz3B0F<SW<yP
z8dt5QZLbFcEvVW>4nhP3$P;sd$RUaNZtORdM3-(tKXp7n5;Q9SkZV*5^z9q0bnpv?
z``r#;5pQ@zSYeciK>jUvo~~w=@J2CavJfg18dbZ{7|@ljHiv$So~fm|Qs<pGdd!}O
zBH%xSZ?_2}fvi&w$3oQAs%=7(G8q9S|Ivd~t8SRtWhke?3TAkU^2bpP-uc+Yzj)sY
zw4+zj5T5zIm(9gaMr%@Bf^dv8Y}@~H#|W^Cf3*L0DjCnwBMYb4R5FO(!I2_aaK2YU
z=z9@E(ahU9<52FpirsrF?@5CcLr`C$XBXkkGw!6bDp}~vjPkI+h$tJ?tfks;D%E$0
zVHAKETQUgG&VorBNxA1&a=^YTVcHBAM}fnotW4U7c->mT?(;~Q+=-6eq2L6T6rW#w
z=H?`XAxDjZ=6|cKQL^KYl1zEJZO4(&)n-3fvzty}$dHxf4>4PQf#X|-MMp1<AlPA_
z67Fc?yyIR#;OJGd6B#bvk>|@zl0m&!kt=Q(Ed9hP1}bdCf2Sr1wu>}HaK*K&@=W(*
z=<;olf*;oQd!D7nN3DlQVgZPGsB9<l2DS|yqS2SmVkeHatLflQ7D$uSk4-K2<*z<)
z_#1_%4_#hOxDkbgm=A*du>aB;ynQ6#ec?cV!|jbm>Q$UE3o7~M7i;?Mp6?n%IgO2G
zFb(eFPSJ5zQv(A+VJs<V1o(?HZGI_>V3tnlxqqW*b(RERxmUV%@{GG8oQX5{&nt3N
zdigD8a~iG;FnzI4!7mcX#xG11;k*s40<i_PKg7?gaB%ny^srR0VfQ%+9@BkYwz^9*
zJ)BbTi;YNoYQ$2Qi>XNe7pEYGqN(t+S%FS5OhHgUtovyWP%uP+GLEyR&FMJy-D5_W
z8^%Z@-M%0&EN4lJLQ?Z>Qr)(;3T<d{TT2at0G3j}G(QH$36$S{jvnQn{QZMzFYN7C
z3+LXL!M7_j%qPz^VAg~;fcF4vQ&NZT6iwTS9zN4+ig$m)d}tTzUPOXe9=8{d>RdH@
zlTAfm5M*uQL$xEI!<bspIqWyr7GqUItMaG_8L0c1B}Bn{4@k>PO8AJP7gLnnOFLF5
zolhWIU$-{VC5IRC5=IZ}zs9v|=Re16tY*Ir*^-PV5Qq)=%6c#1G_m#v;_pr?y`_DK
zrxAx4F_T{5&7Oz%PHzDDSbHj=rt3k$6o&WTxKeX>iVc9KDIb0ahuL~Om3d&9(^JY)
zDCu2+?$Khg2e?I1f2mVvj_NMsBEY6~s;|2^V)wHL(=3EwMH9ihZ=R8*QXsu#hOS-@
z_^R~9)6S<ZTpJi){@_>AN)BO2saX-G5z{IG!EmyFC}+Xd8XS1;)AfEtW}go{M$)*V
zWFgupa6-&Ox8#465^GMWfw7~at7#<^sZ{XsCMJ1SL~D03OOfG4Sca;qYzltVKR4oX
z)T)Jj9i+x>sX;$x4?9>~<rZVc<tVdE<()K++?Ji;0qY&bN>=98%EelwRn+$%xcy>4
zB}hRGQ9YE8S@Ux6lAS>-vJJ0h)r|>9vk}brgoZ@2tEkNCf?O*dFe#yZ=G7YclvvL0
zdv>o$wl`lTevLsw1d~bqqsK}As89Y=4M|5V6V{z3Qb}dRK-$J}!P|ciT6e|K_#CTg
z?y-r})U8iAyq=Az<v|E|UT<7gBimZxmOXP8BWWL)M*JMMZfku!dn@I(YfDg>QI{Dl
zTenp(Xm8ySAzTwLKCFKZHE(YP*=BDoHZW|N>NjSVFLpn&azqf`j~GAZl*=QcJg0H|
zh;?q&DONPj4x1dJhlV~!HFYo6#D3b5RTnCcJZ5Jbu797rFdSv)Rn2iX`;i$gckOT<
z9qAXu4HJu|FmNYh+!>BW_$XG!@?}mjghv(Ih{5F+w@`?|+tk!$`rS<CIdEe0=&$TF
zSMm<svh=2&o+SZ6`y`4d0De4^_mDs<k~1n)_iGI^cwiESXy!}$l5LP(c|mZAmpqGY
z%d;e=y<LmynQ{$RyN%<InoITHNTfDZ7;}eEUNHf6T(>L|ye2&*^NBxLL1l{t=ke^G
zzlM;M)2qud_s)49rZWZ;G6x?xQbtM&39%PW$dzyhlgR`SPv)|ff_NR76aim~(A7X~
zG6sGcSV6bYLi$Q}xK8>EysdOfjl0~iecP+C3L@M(1~4<CL7TC=(`#`Sfw`4EMnHxq
zeyUllL@V!VUFr3ChJ<@EXB80}$CAdl`BK%q7V9^W1fg(6Lsh-qo^&gtyJR_fbz91)
z7NqL0o8o4c^CnpknGtGZaVzWu#5~{ThjKTI%w18Jb;&C>^#s(VD5Wxm$@n@hk8t{e
z^h2C^_8=dj_%HrgR**93UcVQ+KZ0`OId|GC-t7J=w3rtUCaSr<&A(`wRp?`QGe}}s
zP@7~uql~ILgy!YaVWxfw1~2rm{UW1>`%rKYKQGKaqAd_g`Q8Su{-ko1WK`!fE26fP
z)|`~e&mXTk15+wOUrNFzmXbwErn#2j-7ecosjZM1H=9=Qa`8AA$z!KbE?*Nuk`gD6
z@JD?zk%w)OQ7{_OEay_f-1C!3=cA{<h_TQ4Ftox;Rd*Hb;ypdYiP~+DI4w3dA#(J`
z*W-6Ti{3b*o&nRSq7&-h{fL+3Cb&7-`jv{ZyorLuk!)flzn*AWK4V6=LM?y%8@iqO
zTrRj~&mR^ElFlujST?R01M-I=PhxGTcRb4)P$ZxI>`7BUKCeC-{lN2b{iaxGQ%eG!
z79NV>2yC+<$n>T3tyvaq9v;j_<=RNG#*#q3{O_6}9p0&~Gh#1Dz#2-S!TV2d%kRhA
zm~(op$y0S^DQ=hxK7Z3HP}|DC2>5tVDZ=4qhKJ@VxB8TEpD>Z+BIQ5)-HWKy?PfW|
zM8aXofEmI!F|6$l&8ppm{vy3cQ5<Idney8IO6tZ!yPa1AA`_1m_w8D4PIYD%*5uBM
zM^=LiW(yZKmWIxuydt8pX3$EN3@fwLj1zlAwbXO&5h5O=GEj_~JCn?uJ&on%I)y>|
zF*#td@3*wl{*@MOunkG2O2BWe6ZWi=x)Cd_qc1MFP&ZphU3QBB@raIc%%?^oCmX!Z
zo?VtMa?htQk=V${lNVr}?z#|wvIm>HUt`GPW|0mQZX(k+Dvjz-qt#KMgr;2LO<gnS
zB9F3v>VkHF+AW8RDf8H6zwImS!^$aYBh)iE36?NWcE!`fqxQF<G6I{J`#H++p@C|d
ziGh-V5Cp(TUeVsqY@d8Ul!t4Hq0vZ9d9VnOHp+|x&9)Amo-XTtcQ^hzu6iTOs~Fd}
z@Lcgoh%Ve|#HrSk|ETqN=xARSgCVM9#~PvPZQ(MGluN5*#fS+3{&J{A=e*e9#%lG{
zntRsYafImKcn=+b`ztIzE>EI&OI6l&bF}ybu`e`bT?r96CP_eaHrVNG@&<<XhPvnS
zOx3nUP)`h%$ig#jd*%hI`dd35PBU`hrYM7!SU}>AiKyPim*$twDu%lGWngeb{T{^y
zu<hP9>-F`^p#psoV1chp$HyJ#Fos&y(p@u`JtmnhM{8mb!th^US}mUMy7(=4T(A^<
znO@7%p<}u9h&|){Rp8q=N{k}Q?SON2$Ialg`p=UNgZh!r+I<#d<F<XqD{<)-<>vRI
zqxX0fRJyf!E`Keks(&0sej)ZvMK<S^N6ZvtLab@A*eT(<Mp)MvrmR|92d*=l>)C%V
z95hN+38Ril{+g3YkNC+J=`59`hQW*y>%4-+?-RI$VL8`1-_JVTAgW^s3Fb!g3+g1k
zhA2@{L1R25=6b<E`0Wko*gsE!81L9HeAU^9Kl+6TJzoE(!^!*rocU<}ynNqbdEvv<
z@+?AUy{N{Ox(3V@C?StA{@5vXr1<kJYp_;TVeC5lYs2+eLQcC-pM!{(e0`$H71!Uv
zg$~Wl=WP@~mF=Z?9(D1K5H{?-B*-wPgBdXsOE>+nN&m$O<mz~P8bU>XNOZ`w6ZWHG
zJT`<sb&4QUWr~V3c&05QHU77@Pj9w!%i=S$m)w^JVBB4kW35{B47Lv(mL`Lg)+6WY
zalPHNPBIcH99|}^sC*1inL`Aay5SCk#HRJIUASOY)&&>aI;Qc~6A}?F^!1%#=!e(U
zaaX375ox6QsIiy0^zB1JFB7XoTU0z>nKQc%qow$iRxb9@H>HroOy~<zK72@!jHe#H
z(C|;h2w}=9NQai}(ArJItJ2M1?9|NPz!KS=%cby!pAl29r0O^@-|7xT)AwHP|Nb=$
z`}ch#77mbra?yBwK+IO5$7`R&o!j&3_|+r#3hOW@9&hx;ElyQ!*{ZYE=V)(|oLH-^
zr#;d{Of(2e!dP7+l-B9zOPDm?O02}$*_SActX*0^Zj<4N*LbHMfdSoV5C@GMo=)~y
zf)wnUj9&TJiQ(Fc4{0%1xpG4x$7y8oy7O@S`~6%xiex>42wtqm@OSm|9N0m<br@kq
z!+RxMh1LQL%ZCGY<4<^a>t_rkk_y%=rG!QJdvEW48-n8RXcjW5mT!S+6;hLwYb2Pb
zBNr0Cz50%Ut@JqPEwUOSN@q3fj|5eZG|GF%Otwv7-3ECtv_CBPG*@39bmOgvot)F`
zAFs^@l0{C^+u|olYEQ`)`L-0~Je}hv=D?Ku-9hw35$iivuuH8LiMg14zXkW{a>K>$
z(xO)@Vyx-L)T$L~T*n!HVH_Ow?6f6!M?D6uoFD+_GHDT4P#`xPAVPPTG`yZ;T;Ck&
z*^SxDEqIF-m!-NPL|m~J(Is0Xd%bvycZcSE)@jYN@d$2M+~3(ao^Xgcg=5c1GKC=2
zIkm76?K|{nGgK80kiM}5ZinV|Zh(fLl*kTu;7d$HZOD<w_2%3Z9EkcuvfVvGC4nqb
zzS-6nqVQpez%?(cTK~(Iqn>Yg3}N$+tjp==WMVDtU+ni<Utg<f4SU!w`HJ~PLR$b5
zR<d-88Wsa9I?X0MuJG|PUi^{kE6KZ#r9AW&{kn;=>d3#6mwSv=E38zbP5+HTBLNO?
zJ8&k>?N-CwIg!h%oZHU^vJrOD@(ga-9e_3Y;#j|{WLWMx;zamQH}*p$rvU1$->5}z
zjlO{HzhRIgHD6rW=eZ#nTK<x5sBe>xnL&W>oN;;rX5eZCas|?qTzUV!c8Yn*FT`yh
z0XcTdhry&+sl`{RA$Cgk3`m$2M??#hA)JB4xVu=U@LE@fefDE(54>+yY@==8;u5g$
z8x7ULT<nsONdwXhV(>r9Fp+p@qoJ7ZV@7cFC6X$(r+I~V$ywhz8%ke@#*RNkmg#Gr
z=)|R;DRl=6UhfRa*hJzZ;UTio6W3W#$Uu-&|LY8gJqJI_3;+D`iYF*NwpNg+#K!vk
z4+LJeNdA~oG(W8{fgg69=L!md!JLrfRLeaMaaLb%0BrfED5s=G2%|~da9+`{i;~L>
z<47>#0Km(V`f(#<@zbd;YV?B<aWuh;TE|fZ<T3p((%r>EZAtlM+t&*R6)l{i(a|jf
z@UALgge-#Od|5c99F)Tg=XD<1eioK%f#N|wx44R*1)q(vu$O%CY)i0_VD=*Eun$k)
zQqjaM@8#CuEU`X5fCFFX<dUf98pNe-C2@!XmOn?Xx$~|WYvwtg$4-hxDbq9oIICR<
zp=8wdB6Ghco0Z0E6lMw4!`bT#zrn-vjfMY;87(?2X$jvT8#fWdM#Ye`xB)~^iI^v#
zaF{zyJbfNfIkcUxmUrNG4V82;s?5P&KL3e?^t*`zM?D2LY!rb>bJIfE(p*doB~)D^
zGKpD#<ffop)1+jBh9?Ni=ss`qN<6T`0$M&_;a&h9i(-4$+yE{YIu@D6>Gc*gY_Xrq
zYa`$pCIY3n8;0?sS`rFA_#p1XfH;sk6TGFh{uAOlj`TodobIltj_fY*xTyBkra2?R
zOcV4=T*TW^gG0Q4R^M849nJfsM<B)8x@sUEwoXn*Zlp}UkAOwwAXT4vQK-$3Ga6B_
z%*sSKS2?Ves`6GS!xk3Cxk~GFSwikc@(kWR!g0ycbk$7)K$Y=)1oaZ;4;%f88o2bi
z#a@0!i<J`OF#$T}_-TjfO^{w}vIIwI9`d;!KTV@92PbfeK8t#T$3)W|XF(SzsWRd1
z4Za<+BT0c~kl#RMDjOqW@OZ`{uy(%jW}iPEb)@=2MnP<RYtv7|X7Al{0>ZupvgP4O
zC$CCmkP#@rhfv7xJyBt~M3bu?^>f(c)OPR1>WiAh7&Z($$_@rm%;39AMRJDp=;;pv
z`tJvsnckMshU36EiEX5vQ%PCtZa&U)s-&>-)kDMqlVl}Dq7Wy~lG1R}S+xt2g8KP%
ziORX<M!=~DRy*A#p70_t0rzE&(Iut!Utl=nTXzXeuJtvre&$Aty)|_CyoCN^qQA__
z;WhnTOGSibG~YSp=MpH!U9PMWG-ZpSubSUSX@3Yol2TS}%{eBC!0A4rkiT{6krv&W
zWHZ*+cu$2s`-xx(I)lLIDF7p1d4NY_vPqXIAHR68Z|6f3B2^`ih6E*7#2)7&W-0E2
z#3!$X&)cKDv(sinha2M;#Y~4)Jj73fJ|5B~CooUI429T@KQJ&gK@7&iO9eW%v)evy
z9&Sir5o-UhU5JN%*^QC`aKy8iMm1gZICz(#2D|&tgv&3_RWvMHID(YlKL13Mj1-ll
zHqa*^6)%k-qoDYNhXpnZ4KrAy2%+DQq3Ir=kdP$6bR+b2Sr|yk)z%@PT{H75c`go{
z=toEcLpK9>Mv+6Y6`x5b_Mob>GWU}3RSZ9+&#^GOjJU)he2|=EL4erwtvX6euwR&*
zQx~QgCcSWh+Lw8pJUe*G4|b6>s|!?HkXV_;e%_bGiNwD}800QL_b*CHif%dFqtW6k
zLk<u{Mff=#QG#%2L}D`?dtGAd3qvGKXmKg&unOt2;5a}=vfhzz`|Fc_d0(XzXF`K^
zZwz0mV_wP9iJ^=P3q&}<`GyEA2(2?hBT3maLQ{!#sW}!kfzqZ_XmH(#ShN7Y-R-+O
ztI37r;_vMA8r<W7h`-;=!|6qRge7102qmc}j`@zz@U$1xGAL}+N<kx%tRE-@uZRPw
zk4e&UOAjHr^}>j9lpo}FjO2E!GDA&9@QtmNPM9NRLj+?Kl6ck8pXTt!us$P_&U_yT
z2f=6}NxQ+|r9@;1LO`~bZs2%~=XNqxKQM+H5K3~oG$fB0-HnX##|Aj$9GLC0erB15
zNfW0Kg@`f0q6(4n#MiHAzYnJ~lbSiW!?SN1%v#_LC+g%NqFiquyjJFq)R%{(`ywKK
zV*gSi4wh%eoK)BOx|2Dmjk)fjLfwL5Mj&x&D?BJ_o)z8Y9`?s<q7~ac^hk5*p`mi;
zu<(u^Z{q+kXjRoGWjNwV;V#`_1qyzq2|T~D3f4{SBrg{GTA$r?6$(~OJUF$y+l`v7
z%$>JJ7QtebfVgpyCaWnp)MJ0yLrS>8vb;6Un9m%xyZbU(iz<_XUh*E3Y&jPicHym5
zMDrI`m}jFN3zjm+R?_2P4|Q@dw<DVhVxi2(OH+xdZ%+SfuhivxLQ2}RcYPU?!Tqjg
zfYF8~i_E)kJCbK8m@kFM&a@F;D<Nmdh+SY3m6Hqm1|=&39;qTMC=iap7@+}BFM#^r
z-zauEMr^gpA{5h_hh|I<MQI$~1?o+@tfLQaXoSfUUtR6cu2&FzDt~or66Ho9)Aik_
zb6=asvPLpdo<O--@~j1EXJA3=2=Yr(6X_i0ZAceleEbDRQs>gaipeqwqV>l_%BfQJ
zl$!}Ng{>!1L|{(AB|<)eZA1~PjCewN?mlcT?(us0IIiB|5OLhW*bw~=MQ6ec?`4Q2
zv#S^@DWeeY{ruBly3%6gGT}oNO{n;bNIoVJwKlPZDC4}|;BHiqyvJxiYeUIzXq7;#
zT|x3-*oha9rY($U!KH>}O3q`B^Lsr&PzC}2y57L)c`g7$6@4@s{9KiLMeb!iaB^`d
z#5Gx`_`8%v>Ll7=q9`ZUHel#CGN%u|h6GDQ=Ff8ph4Y5ORVl)V5fcNUgFhr-5|#C_
zwG$`iPm9NxvW4CDWm!y-p-fOnp_#_tU2N$HX`^D&#yjJp{8SuSG0tq}5N#mJ3oQWm
zqe#<ekBp?&o;^wTK(%D)bDt=UJRyCgfBHAAUM{XSE*cSCh|k<doMI#2($;0D;n`A=
z<XEKrcEc_G(Oa29u_yLEa;8mN@`=0=dB`mGWlTlt74dTMU2%L-p04pI{bBApX4KlN
zZ4A<@ZlG!^49;V<)i;X3EsD|mbsAN<V7OV;PsaJVxB@)BpDk-AlBqFp3h)W?Rj0be
zSUUL4yPg@5ykIWY5KmPp+JI&Q)i7D68Pi&=35Q5)T85S1*}mTYEOnVZuyCgGkTyGt
z8WW)5pJLI{F+J4%ah5oMfe(hFQ6Y-BqVYqv6q=lQehY!oYq&KqlIv5YEh|?f5{56@
zMrf4>FLt$mT?v^1Y285G?W}&0D)HS2a0Q#{UDiMw7WODlz60BDK&)Ni38aA`G=mMK
zfuBo;9bj<UCFR2@-c>g$I#eO+7A+Sg2ggXKbJuwENY9+CiP238q|~QZW7KH`dUYaL
z8!!_O2YK5MG|09LXLs>P*NE2puVy9J&pSL?qRmJu4(@l)=fet^+YX_z^$<1Uc+@g$
zdndH=+E63kE(Aj;wi8W{D;4$)`bqEFXxL@Q{g#|3-e8>rs#f;qFW1DwvENY@<M+b6
zgupraJs9BdWcD&g;^Xzu%@0OKFNr=OT=fNet0Y!qzV02I%GuY#cWzxJDsh)^->h}J
zJe=dlq>Tbo-ru&SPNS;L?O0FFl#5CdcfZa2bgvyc826|Mwf*5n@RD071<1_jbYyex
z5+!3UuH{~j3;H?)>?vwv+~b{zQ76hQ#v=l^t)xvbn(JFx6?J%bzHh_df-?wJkIR--
zM`WPiU8hO7S`E@k<-_vAX3BmnHgM^F%J-F7cj~NErfcd&&2k99bNsuj_ao;wK!NJ?
z=t_!(($(~7$8hJA3(Ymvm!dyOs?a+M!|5q5L(@JQf+%nK)5UXRU%H^mEAkjwj?5HI
zMOgAQq~UPL<L{2KIuWc#tZj6*k!9IbBBD#1GxmmjTm*JZ9AQR$Z~$4}n>vZPv@xQM
zZh@-3JhUQ^#!Rd1RJEo$pZ{+U+4s+3?lp%O*~)+avMMOU&+CY?XRGRe(gVxResX=U
z&2eUB@7VlqyQ*Q;3e7dvwJHsjC@W8Vuc4!5yZxH)QBL<nBe0>nJyVfV)AAkk^||dW
z;Jn(7qBZJ!0}Xf=8S$K4-R?WWf`%C}m&{BeXVV3G=R%ExkHe??7%`M6Peg*p1`C6~
zFr2m$#q+If7AHg+MoX4Fcf&os4t|uETah}(lfj?4JRC{aC;y(eDfAr*0jj=#$teVy
z1eE7xibj{pj{ktV=c{G3!xGNq%jB1;7TI10z<*sLP6*~LQROOI=g)t`B>qw1;c+JI
z$PgYIf;ETmZ0$`fgf!%RH&MYY3%#(Y0<I$Um8`|l_MOjD35~JWRQ3)@RsU>3la~zO
zkDYw}TWVdeHlQ}^Bs8Xoxy#;^8uz#DUIxx4DRRzFzWCwg3|{v~)1_Jy_``D;wastJ
zoQ_ZNUnyy3Rv4o0k0Cp_HV4W60s_(V-h;UenwmK&64%^C%>jxIDxr776QULC4<?O$
zRJ<LVaR9|Ug?7;#0z;isXv8gsqz>F>H2Qq2<EBXkSGBB8v^Ne(3@-%$hw%dG5r)Xk
zZqyGKG8oOGnmmX;y^|4)_u>VXy%@<iez}a!{cWzZAfw?w(Q8pU#N_i%Cn-_ciXW_g
z4xp;jKA;nP=~b20h5pE;*vIqhKzV+Q38s8MP!DEqs3Trk8WGo{8^2@bZEzaPC;z-7
z=;h@jdt)6Mv0;#@psluoF!1JLo^HwrH>~ZNc+CT6)Jyo_Cu$k_EPy7e5yQ5MF&^dU
zbuwrloVXwQ<zzb|B+{K2F+W#ugYR$~D+kc&MdC(xOl+Tclem{yUwxQIdwwYO3(G<O
z>lRmpwA8!dZP~I=A%nJ`LVK@#MzMDdgjt=isgJ(q9u7Tub6?k+=3OmTPpK@wm)MVy
zezta5@3`fTdslo$-q{r0w6;wd@9RSnk97yBsWO$62(pC&vCv}VeammuV}fV}Nt^dr
z3qo?w2$5-U&onknoSB#*x+|+xYa+jYVP9_*4cxKm(6Ro?7c16~jQ(Tl_4Y@7W;?3z
zPx|Z39>w^HE8zrKWxX~rjeM^7UTZr73|3te>gB)*?4A>TPhlP)ij|oueL~U{gt=<#
zxL;eSq_Df%ZJus`eng6?OEFlt$s)-}93D=kqYhIe@=^5wB8pmftU|B8>=v$N9b#WD
zMt{#bu%`ft=OOhSMFQ$2tel`|(;tv+(mjt5X@mDM+evNsOxn)ndgf~OzEH_A5Rq)G
z<E3A9Q5V+Q#V!Z)&?zI+riTn_*SetdERvDeVR8E(%qVuWT)jtLQ+Ao6D9Oa_+bZU$
zMH+plW)3?uV~8u2)m*a(lW9;dYuw+Agh8y0`md^=%U)RGMJmrYbDZqKSj~}TY@v@@
z`**8DI}m=8z#QAWeIC^cmSPpos}`iT!gbyuZlOI@XyxnNg?CO-t@}dSOI!sm)}2d-
z|7oDw7H?%|%?I7H`pNTE<2qd>2j#zd-{7DjZbb0xVfU94ep6#z5goY_4&D|sw9m`;
z7si;vxV!SIeO+CxiCaZnZR;;{;7w!rDD2yqT+o-bBK3YZy%!njew@63-@3Cp20kT1
z+31_?thg$riK2{^Qx?`?)s<2g+F`!sGBuou+B0QHvbBKfgqR+5J8p{h7@p>#8&y(J
z^Zgb<CXwuVwzUs-hG!=!AlYYCj-CaLA64FIW$i?Mk)D!54Y$y<7ze3@(}zAEM-`ny
z5skqW$1IL`v}H8%AnI0}zbB^#$&he~@KzQ;0<zf)izG(gw}XfBlB)?WF5lvl!a5yC
z2XpwW*RbMLhZ;bNgY-rb;q`kt1jqmM5TvF_NiTN&T4k94se(}Gkg<si6NF6LC3iEX
zW4TJ7F)?LxPWKFNm&$IKX}DYSE`RnnH+*>&0x>6XH}KAr#8y%$r&1A7$b^sG))Y|`
zEcwwZ+^u$0TQlGF8FD{rA)jR#eG2Dqmt=M)0ifc?gQK&;_j2l-UBoC-s1_}{M_P$#
zpGKwjEd@H<y<&#S_8Uhzs?JblB!xy}tYul!cS%80D3uO4{W`i#8Z;?OJNfuIiZp_u
z7s#e9lV(miETcAB4jtw90!=YtgQdz2+WLeWYV_0IsI0nma9Y-Xw2aGJgC8VU4lkdj
z8^xxDs2UuYGUT>=c(pLU==jn^tectqs;CW0fyWjw>-hNy!L%CN;()W^54{-m6Raf<
zpcsRLiB7yj5WXHxmgJJ7$S1Jt9L4Z~_W9Y4tjInzwSvq&zn8bmOGhW#VIsKEQxc?%
zD11L2{&>ldQT8rThG01iNJ>2H_3vbU|C(FZ-Q37NPEbNM7IGe@UE0!y6XEukenk}E
zaVPCji>?g=8Nq-si?7zN6wtC;^2QR7^9tf-{hRtG|B3o28EP<`le12+$qCnSO5wo6
zJ^8iaG6My;e}H;{G87TogeR#I2b_qb$|;Yb#1x=l)?cz^r1swv8BucAW{q41h=*$^
z0eazbXN`MD2^2XePB3Oh6Lky7QPwQ@<}Tynr#K!c_qYFi?N;Vs;buf?U7^l~=x9>K
z_DP(&XjRaRRH0D7YUt?u!_}l6B-YZ~264Zn!~wV^h)yCh3$|E1IVMT!f1lg%uKElJ
zmV6-;VyfQ0oOW1UwfO0V<3Qu}q)_sXv=+SZm6^7l<|s6y*OCEmjca!>s9fJoG_?`|
z>b~JO8puuHcH++;A%T$nAg^kQseJc*g6F91$y;N`>3q&Pw@mtPMnkrDk}8T*Nub5`
z>Y(;HOc>P!vHL7l_B(8d-_gDxe?6g1sgso6r#^qP)QwMR@aRo2RAxn~=75LPtWngZ
zzs7Y#08hdK5h@EbkEOd!x#n=dD1^7(5x?A(F#gRZ)A^tAIiA*|Cho%&E_!Iu100<T
z0&k`HY#xxhF-*x|_*(8CPdY~)L=k*;fpWoiSS<_PFi^!tp)|jDU-$zHKV%Y0Xcxs#
zRspW+OGnl)<ObbId#6{R1meHOr^me)qSHm}ORh{h1^wy+$Rz?XOte)dXG%v>xAbxC
zcN8Vu^~;*^+@9qbSfvMeLst`#aFuTCf{?ZFd^eOpdAtb%tPSNc{v<)BZTynsLy~}+
z3Z{6D`@JfBq^5?o&I-Y8R9Ixa5wwnbVD^cWHUbf|iKZbeYO~`5uRyHNDW#%6T2SGY
z9YENFSQ*1J^G`K~%I~Gjr9nlHIuLFT)(G7*Exrpio~C~C-n^^oD8w-R8wNIiJZ6r@
z9Ngt$=-Ll9Bs4C3yRMpAkHG(?m48?<^aC4i9b<7xsovx2@TKY5(X|INdDY1t?lldh
zW4%@f4*Y=mNtL1bxZJ;(*22fm1Yw#w=z8)Fhn=%PS?}7@EZoscq|O*fGGmCOS^*M%
z1z_{zQu*|HG%^M1SVOW+Tuo1^FlW;`@NzY9q(YM5-l}AZJMf@sh0;@hG6tJDlX`4U
z)w=DBL(_uFt%_>)pAtY{`m8|0*h=T8Ky=3!(WDkJ#{W9*`V=a68VBNYg#Wcq8?$d&
zPFS=M4iJZjN51l%rYo|J)y|BTbOn_jJCP%?;##PB`Nr^uOD1Qf%{tRRwJ&{g?AF+?
zL1vJR7?nT}scWW|t)>Pcx4N>M7^>KuydJdD5;X{Tdy{qZq*TFh?c#K<f=n3_#kVG{
zjkI7cO5pS{Qt1S;ZTZE&unE_T)G4GK%*BbOI+gonm5I0+8U-xnx%diGIheFKg2LcD
zJSZGLdOl6_tbWg8B2hIR<{1dVE6Vr91j*G~Bk~hWG}U|vuTcT^*_lyS-gQ9(I<QhC
z>l&LT7p$cR%CC7p0JB}|ru|?Dp)dShI7|HK);I!jRW*M@>|<6TQq)hsuyB}Jt-)id
zE`sn24lSmqcmr}9J|1VykE+4tn-x}p#+DHUGX8bok$LGB6r3gZkUnv>A#g#0fFlo*
z4x?Xea8y%6yPo;BAETDNh!4ZH`HbFQL@JtHYp@F7#N+j$&?H}L*-y$PvbFRIu7;yj
zga1(oH0%K36DTWpl#da?U5ngsa}mu=7FE?zdQ4_?@|1QpVi!_R;?_grH2+kS0Oty+
zU``_Xy&5?}L*c=mu5c~m(mF`VPUlu#mW!SxMmi0ffsbyl;gIN&AYDKCA;k2a5%Da6
zl|K%tf)Z7CFFiqSPF}`)Ujnn1)HQ%~$>WjDjEj&H%S)_=72$k+&I&}u)brbw;L~Hy
zj4YjgrCBq}z>FAmKHqplfVPgPORc{ohzk}k6m0!D@>-q%%rP>dtsWMgL%UZdF)B2;
zj;3+wj)HquaArehSjI8S{@|y<#zTou(qm3_v;JO|X^%r`lARRLmkVntq(-l<)c^N6
zNTS<gWK7@8ff?HMW6j$29Xh1{lVTucsOS%6Wy`$-J#w$v=PV&G#h(a*VrJo61;g*0
z7HhU#Hw%;-c{2Kmv-605t`wCEaR>_aLtoV#snd1l-H`jJKTxQ@e@l~lfuYA+`Pz3z
z&eg;;^>^Ws_cMDY69W-y7!idFCXx+1k$Vy149@*a4dHe4><dChVz-Lw7zAxx8$%bc
zUtTxBzLbpZ5b3QDisK}SNC`R;v%Wzn>|qXO2=1hYDZ`p@2B;KN*0Y~vhj&cXG}q+y
zMBx7!KT@s!RULsBv%*a_L)6Fr<<a4C?BJhZQw^aC(b?yzC%Ni4nG|`W9|gTF1tg!n
ztYRe;xY6|m4c}Cl@SEK(4$vX7N?ZXZ-kq(GK^RqL&Sax|tLz)M1k*<`adH3vX}y8#
zcRpUie&mnYH8=j5uu^3^aQ$CQQbK9Wx)^r|Rm3F_kD6Bcwc5GuZHF)sIGK)q_Jv<6
z)3}8PqiwWJ%d1+Bv^B29V2jz^q`eTHfG@b`uz#zJ+G{Bp*1g_&y3G8+I>@aiS-pjp
zXMDWEuBt(GVeo|{nUqX4<wv?7UZP2W9GTlWUmoF4!rLZM=a$Lx?th}=|NKqlT=n65
zTSCcaky1$v1IiW4NWyJ*pOKD{%2jPvD0RQ9x0c(c*@Ah>ip-`yMk#Xqb!Svw5jH(a
zFo3UKy`y6t1;&||2qqC?*ee_&YrjF}{<!#cl=$#w(oiYEllLLCi;h3apt7lvz1u<f
zB<ymdjhM9$zleUPzkXoQ9W>-$ItFE-`saeq<#T;xA1mO0Ucv-wwwlj~Q<~|UYuvZv
zE)h12Kzsr<iz;X9keOWdxK{MVsg<LMb1W=uRDPHABM}+e1s5)*&LwQ8FYRXp7$p5>
zS>PM=R7!jsvxo#TwrjV|8%Ik&eS5FPSnUz*TO*`A-rx3}ck2KYt2F&NY)>DJ<*~h_
zD=K>OY$I??#-0xBIe*EnwofDpyuXjVCa^mdt4x|`R?bVOAM!{^R6bKv;V<0+vFx@=
z2c^4dc+eSF{ll?<G4a(;tAso!{%-X@7piVgyuyR7$+u%#?9QFEE3+lw3Rnl*2;5B-
z?aM2ww@T9@!nKwnt@xjX;ob@*eLenn(quTo7B9(-gOxp~!>&on@e{>=92W}iQ=UAx
zas3q*RkE3$2^b5v3%G|NA3U8{AdEy?R1BW7UEzE47|btE=x%sIeR`sAJJ`AO`djn7
zJ)n)uHB%8uxH=pfG|B%FXOK8Y_oYIrru1&H_Nf8r;^VmNwJ|%`c|%dp_t4#k5yy9f
zDWp+Bm48og4*N<y^AD0fqXQn<hL_7SeM>avcvg;e!!lXP7dR_(;l$Z2t`K-Kfc_js
z<1OtecKBqh)Lx(_p3W*m(AW96zi*hK3k=oGAISX~KnIFv9Fvxc;9;B(ZnNMP+RG1p
zMWXDPhAMb;(NI}y`xl6)rSX32UgP*y0`PZhxM|e4yTFa<AuIg%djg(C`m)N3^_Tp0
z<nge?wt(oK0__(JRp<n3PaHjFwR~F(-5vq@z8rca{Thm(kwXcSR%m7a?%zVJ!T8WL
z3L*ti*lp?xG9LKUtv`A~p~hRMYD1nN)$y33RXn02Ui0`&5eRn+R?ZWUM`|vN#eq^%
zk3_zg0WtUO`J<P%iOw}lwLT#-86YNbiJEmo)yENeN*Ji5es3`DKo|%uf;mNgQv#pP
zOP(!!Gn7=cn-xhp`3Pv;)jcGPvF;6{tet8*sa-7V%fT$IvY30A?mheeC>O16Jm5lj
z29VufvB-!d%=x)%mk)7IB{7H?^w<{HZQeSYS^54YXWyX1v+!KYNGS)-!62{c1#(!U
z%>4ZwC`R>}3`ACl6wE~)HDa23Ex^$u8ZD3{XC+%eb0(x+_Zh}!So|INNj{+i4kz-J
z7oWtW)GvZFQaZKuLbb=sRiH0a;iDcc6uCt_G81hQbCEvnoHEB>vUKt%m?l5-3Jv!C
zo{4=gl5Hs@?Y*BO{D)N0!<ec03NeT6^iudADnX)eqj|zI=r6hV6grH}`;~Q*F>U``
zcQlx59gQtc4bZhJDV3+}gxwPwBrxoMYpFB{K#!VB9nj-&Tx1p}-TojTqSKZE)I^1`
z6adE1E!qTQ#jITRAc0DjV9s%K#$)sj4_Cnz@X4<LWb4HnE5d%Jq*))ak57^;%o7go
zIVnmqp#>=@YU=IFioXXOroIhvBuZM`{W#(uX)~!m0ZM2O4UBBS)tRugNyDKihzhGX
zU^qL&jQ+rDR_{m0kLzUEJMQtQb}B+6cQ}=3RYSA1crfeAZoxn%UYxi-gSRmLi=LhA
zT^_N4z4oq*NKkQ;r}uYd)OPFYPp0z+7YVH$<p^)(-5-s*${>*3ZOjvyYe!~zPO4EK
zF^fER(!lh7XzeU0zJ{V*dr+x(D(~$}Z6~|3UxnFsHu<JA^^~4Ih;kpM9ovWEbdc$s
z9<|bxfAXL}aEiJV;~Xwsw_?Xp9qx23OxR7OkXFn0a*x?fxc#^$b##S7gR=Ga2ey#n
ziLdPr7RC<rLx#3?QvF8=4qeybcSte#eSUv~e|KR58%W|66PM7!nLuM0%Fefl1x)lw
zld_$8{aybJ4wwCrRh#8G+3I3r^C=@(Rw!#AdlvbjI<M>(Sr9xK;zxTL4K%re<$!A%
zNEhQCg4&K`Ul>1G=wAC}BIvW$@y4)4@PaYLxIdF}7eo<H4eJK*ya{gxxu?SWwSzZ2
jc&#w*EJVf6hcI9H#JM+MljnKowQ1Q6sqbHBOjZ6D6XFsk

diff --git a/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.svg b/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.svg
deleted file mode 100644
index badd447f..00000000
--- a/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.svg
+++ /dev/null
@@ -1,1991 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="bebas_neueregular" horiz-adv-x="396" >
-<font-face units-per-em="1000" ascent="800" descent="-200" />
-<missing-glyph horiz-adv-x="155" />
-<glyph horiz-adv-x="1000" />
-<glyph horiz-adv-x="1000" />
-<glyph unicode="&#xd;" horiz-adv-x="1000" />
-<glyph unicode=" "  horiz-adv-x="155" />
-<glyph unicode="&#x09;" horiz-adv-x="155" />
-<glyph unicode="&#xa0;" horiz-adv-x="155" />
-<glyph unicode="!" horiz-adv-x="190" d="M40 408v292h110v-292l-14 -253h-82zM42 0v106h106v-106h-106z" />
-<glyph unicode="&#x22;" horiz-adv-x="325" d="M40 700h106l-16 -206h-75zM179 700h106l-16 -206h-75z" />
-<glyph unicode="#" horiz-adv-x="410" d="M15 200l8 78h49l19 183h-50l8 78h50l17 161h90l-17 -161h65l17 161h90l-17 -161h51l-8 -78h-51l-19 -183h51l-8 -78h-51l-21 -200h-90l21 200h-65l-21 -200h-90l21 200h-49zM162 278h65l19 183h-65z" />
-<glyph unicode="$" d="M34 178v48h104v-55q0 -68 57 -68t57 68q0 39 -22 71.5t-53.5 57.5t-63.5 52.5t-54 71t-22 98.5q0 145 116 171v52h90v-52q118 -24 118 -171v-22h-104v29q0 69 -55 69t-55 -69q0 -39 22 -71.5t53.5 -57.5t63.5 -52.5t54 -71t22 -98.5q0 -72 -30.5 -116t-88.5 -56v-51h-90 v51q-119 24 -119 172z" />
-<glyph unicode="%" horiz-adv-x="627" d="M34 363v230q0 54 27 83t79 29t79 -29t27 -83v-230q0 -54 -27 -83t-79 -29t-79 29t-27 83zM104 358q0 -44 36 -44t36 44v240q0 44 -36 44t-36 -44v-240zM140 0l276 700h65l-276 -700h-65zM381 107v230q0 54 27 83t79 29t79 -29t27 -83v-230q0 -54 -27 -83t-79 -29t-79 29 t-27 83zM451 102q0 -44 36 -44t36 44v240q0 44 -36 44t-36 -44v-240z" />
-<glyph unicode="&#x26;" horiz-adv-x="414" d="M41 152v71q0 113 76 147q-76 32 -76 144v13q0 173 164 173h126v-100h-124q-56 0 -56 -68v-43q0 -40 16.5 -57t49.5 -17h48v78h110v-78h29v-100h-29v-230q0 -57 12 -85h-112q-8 22 -10 55q-29 -63 -102 -63q-122 0 -122 160zM151 161q0 -69 57 -69q54 0 57 61v162h-42 q-38 0 -55 -20.5t-17 -68.5v-65z" />
-<glyph unicode="'" horiz-adv-x="180" d="M37 700h106l-16 -206h-75z" />
-<glyph unicode="(" horiz-adv-x="251" d="M47 153v394q0 83 35.5 118t118.5 35h34v-90h-27q-27 0 -39 -13.5t-12 -49.5v-394q0 -36 12 -49.5t39 -13.5h27v-90h-34q-83 0 -118.5 35t-35.5 118z" />
-<glyph unicode=")" horiz-adv-x="251" d="M16 0v90h27q27 0 39 13.5t12 49.5v394q0 36 -12 49.5t-39 13.5h-27v90h34q83 0 118.5 -35t35.5 -118v-394q0 -83 -35.5 -118t-118.5 -35h-34z" />
-<glyph unicode="*" d="M2 525l28 85l149 -75l-26 165h90l-26 -165l149 75l28 -85l-164 -28l117 -117l-72 -53l-77 148l-77 -148l-72 53l117 117z" />
-<glyph unicode="+" d="M25 311v78h134v135h78v-135h134v-78h-134v-137h-78v137h-134z" />
-<glyph unicode="," horiz-adv-x="186" d="M40 0v106h106v-95l-48 -111h-45l29 100h-42z" />
-<glyph unicode="-" horiz-adv-x="270" d="M35 300v100h200v-100h-200z" />
-<glyph unicode="." horiz-adv-x="186" d="M40 0v106h106v-106h-106z" />
-<glyph unicode="/" horiz-adv-x="381" d="M5 0l276 700h95l-276 -700h-95z" />
-<glyph unicode="0" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
-<glyph unicode="1" d="M108 534v78q57 0 81 22t40 66h74v-700h-110v534h-85z" />
-<glyph unicode="2" d="M40 0v86q0 57 22.5 104.5t54.5 83t64 70t54.5 81.5t22.5 103q0 45 -14.5 62.5t-42.5 17.5q-57 0 -57 -69v-75h-104v68q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5q0 -64 -24.5 -120.5t-58.5 -96.5t-67 -75t-53.5 -70.5t-14.5 -69.5h208v-100h-318z" />
-<glyph unicode="3" d="M34 168v58h104v-65q0 -69 57 -69q28 0 42.5 17.5t14.5 61.5v55q0 48 -17 68.5t-55 20.5h-37v100h43q33 0 49.5 17t16.5 57v39q0 45 -14.5 62.5t-42.5 17.5q-57 0 -57 -69v-45h-104v38q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5v-18q0 -112 -77 -144q77 -34 77 -147 v-55q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
-<glyph unicode="4" d="M14 127v100l200 473h120v-473h52v-100h-52v-127h-110v127h-210zM115 227h109v259z" />
-<glyph unicode="5" d="M35 168v58h104v-65q0 -68 57 -68t57 68v154q0 69 -57 69t-57 -69v-21h-104l20 406h290v-100h-191l-9 -167q31 51 96 51q122 0 122 -160v-156q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
-<glyph unicode="6" d="M33 168v358q0 182 168 182q80 0 122 -45.5t42 -130.5v-18h-104v25q0 69 -57 69q-31 0 -46 -19t-15 -67v-128q29 62 102 62q122 0 122 -160v-128q0 -84 -43 -130t-124 -46t-124 46t-43 130zM143 161q0 -68 57 -68t57 68v126q0 69 -57 69t-57 -69v-126z" />
-<glyph unicode="7" d="M33 600v100h330v-96l-162 -604h-110l161 600h-219z" />
-<glyph unicode="8" d="M26 168v55q0 108 68 146q-68 37 -68 141v22q0 84 44.5 130t127.5 46t127.5 -46t44.5 -130v-22q0 -103 -68 -141q68 -38 68 -146v-55q0 -84 -44.5 -130t-127.5 -46t-127.5 46t-44.5 130zM136 171q0 -79 62 -79q61 0 62 79v65q0 79 -62 79t-62 -79v-65zM136 489 q0 -74 62 -74t62 74v39q0 80 -62 80t-62 -80v-39z" />
-<glyph unicode="9" d="M29 404v128q0 84 43 130t124 46t124 -46t43 -130v-358q0 -182 -168 -182q-80 0 -122 45.5t-42 130.5v18h104v-25q0 -69 57 -69q31 0 46 19t15 67v128q-29 -62 -102 -62q-122 0 -122 160zM139 413q0 -69 57 -69t57 69v126q0 68 -57 68t-57 -68v-126z" />
-<glyph unicode=":" horiz-adv-x="186" d="M40 0v106h106v-106h-106zM40 381v106h106v-106h-106z" />
-<glyph unicode=";" horiz-adv-x="186" d="M40 0v106h106v-95l-48 -111h-45l29 100h-42zM40 381v106h106v-106h-106z" />
-<glyph unicode="&#x3c;" d="M30 311v78l326 120v-79l-224 -80l224 -80v-79z" />
-<glyph unicode="=" d="M35 230v78h326v-78h-326zM35 392v78h326v-78h-326z" />
-<glyph unicode="&#x3e;" d="M40 191v79l224 80l-224 80v79l326 -120v-78z" />
-<glyph unicode="?" horiz-adv-x="360" d="M20 463v69q0 85 41 130.5t121 45.5t121 -45.5t41 -130.5q0 -61 -20.5 -111.5t-44.5 -78t-44.5 -67t-20.5 -81.5q0 -22 4 -39h-98q-6 18 -6 43q0 51 19 93.5t41 69t41 73.5t19 105q0 69 -55 69t-55 -69v-76h-104zM115 0v106h106v-106h-106z" />
-<glyph unicode="@" horiz-adv-x="689" d="M24 290q0 94 23.5 175t68 142.5t116 97t161.5 35.5q148 0 213 -80t65 -214q0 -87 -19 -152.5t-50 -100t-62.5 -50.5t-63.5 -16q-82 0 -88 66q-31 -63 -97 -60q-106 3 -90 154l11 101q8 74 39 112t83 36q62 -1 82 -62l6 58h96l-30 -289q-3 -25 20 -25q39 0 59.5 69.5 t20.5 156.5q0 98 -49 154.5t-150 56.5q-132 0 -201.5 -98t-69.5 -272q0 -124 58.5 -192.5t174.5 -68.5q119 0 207 68l-8 -96q-84 -56 -205 -56q-163 0 -242 93.5t-79 256.5zM298 292q-7 -64 43 -66q23 -1 37.5 14.5t18.5 48.5l10 95q3 28 -9 42t-34 14q-24 1 -38.5 -14 t-18.5 -49z" />
-<glyph unicode="A" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM145 222h106l-53 354z" />
-<glyph unicode="B" horiz-adv-x="406" d="M40 0v700h166q85 0 124 -39.5t39 -121.5v-25q0 -108 -71 -141q82 -32 82 -150v-57q0 -81 -42.5 -123.5t-124.5 -42.5h-173zM150 100h63q29 0 43 15.5t14 53.5v61q0 48 -16.5 66.5t-54.5 18.5h-49v-215zM150 415h43q33 0 49.5 17t16.5 57v39q0 72 -56 72h-53v-185z" />
-<glyph unicode="C" horiz-adv-x="386" d="M31 168v364q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5v-68h-104v75q0 69 -57 69t-57 -69v-378q0 -68 57 -68t57 68v100h104v-93q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
-<glyph unicode="D" horiz-adv-x="408" d="M40 0v700h174q164 0 164 -173v-354q0 -173 -164 -173h-174zM150 100h62q56 0 56 68v364q0 68 -56 68h-62v-500z" />
-<glyph unicode="E" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300z" />
-<glyph unicode="F" horiz-adv-x="344" d="M40 0v700h291v-100h-181v-211h142v-100h-142v-289h-110z" />
-<glyph unicode="G" horiz-adv-x="390" d="M31 168v364q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5v-68h-104v75q0 69 -57 69t-57 -69v-378q0 -68 57 -68t57 68v129h-50v100h154v-222q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
-<glyph unicode="H" horiz-adv-x="427" d="M40 0v700h110v-300h125v300h112v-700h-112v300h-125v-300h-110z" />
-<glyph unicode="I" horiz-adv-x="190" d="M40 0v700h110v-700h-110z" />
-<glyph unicode="J" horiz-adv-x="256" d="M10 0v100q12 -1 38 -1q63 0 63 67v534h110v-526q0 -176 -158 -176q-35 0 -53 2z" />
-<glyph unicode="K" horiz-adv-x="414" d="M40 0v700h110v-305l144 305h110l-153 -312l153 -388h-113l-107 279l-34 -64v-215h-110z" />
-<glyph unicode="L" horiz-adv-x="339" d="M40 0v700h110v-600h181v-100h-291z" />
-<glyph unicode="M" horiz-adv-x="541" d="M39 0v700h153l81 -497l75 497h153v-700h-104v502l-76 -502h-104l-82 495v-495h-96z" />
-<glyph unicode="N" horiz-adv-x="427" d="M39 0v700h138l113 -419v419h98v-700h-113l-137 507v-507h-99z" />
-<glyph unicode="O" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
-<glyph unicode="P" horiz-adv-x="377" d="M40 0v700h162q164 0 164 -173v-91q0 -173 -164 -173h-52v-263h-110zM150 363h52q27 0 40.5 15t13.5 51v105q0 36 -13.5 51t-40.5 15h-52v-237z" />
-<glyph unicode="Q" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -59 -21 -98q6 -15 31 -15h10v-98h-15q-71 0 -95 48q-36 -13 -77 -13q-81 0 -124 46t-43 130zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
-<glyph unicode="R" horiz-adv-x="402" d="M40 0v700h166q85 0 124 -39.5t39 -121.5v-55q0 -108 -72 -142q73 -31 73 -149v-108q0 -57 12 -85h-112q-10 30 -10 86v110q0 48 -17 68.5t-55 20.5h-38v-285h-110zM150 385h43q33 0 49.5 17t16.5 57v69q0 72 -56 72h-53v-215z" />
-<glyph unicode="S" horiz-adv-x="374" d="M23 168v43h104v-50q0 -68 57 -68t57 68q0 39 -22 73.5t-53.5 62.5t-63.5 58.5t-54 76t-22 100.5q0 85 41 130.5t121 45.5t121 -45.5t41 -130.5v-22h-104v29q0 69 -55 69t-55 -69q0 -29 12 -55t31 -47t42 -41.5t45.5 -43t41.5 -48t31 -60.5t12 -76q0 -85 -42 -130.5 t-122 -45.5t-122 45.5t-42 130.5z" />
-<glyph unicode="T" horiz-adv-x="356" d="M8 600v100h340v-100h-115v-600h-110v600h-115z" />
-<glyph unicode="U" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
-<glyph unicode="V" horiz-adv-x="402" d="M11 700h111l84 -571l84 571h101l-108 -700h-164z" />
-<glyph unicode="W" horiz-adv-x="563" d="M15 700h107l59 -552l53 552h106l55 -556l57 556h96l-78 -700h-146l-40 373l-40 -373h-151z" />
-<glyph unicode="X" horiz-adv-x="430" d="M15 0l123 360l-115 340h114l83 -258l85 258h102l-115 -340l123 -360h-116l-90 277l-91 -277h-103z" />
-<glyph unicode="Y" d="M4 700h115l84 -319l84 319h105l-139 -468v-232h-110v232z" />
-<glyph unicode="Z" horiz-adv-x="370" d="M23 0v98l209 502h-199v100h312v-98l-209 -502h209v-100h-322z" />
-<glyph unicode="[" horiz-adv-x="251" d="M47 0v700h182v-90h-72v-520h72v-90h-182z" />
-<glyph unicode="\" horiz-adv-x="381" d="M5 700h95l276 -700h-95z" />
-<glyph unicode="]" horiz-adv-x="251" d="M22 0v90h72v520h-72v90h182v-700h-182z" />
-<glyph unicode="^" d="M20 390l139 310h78l139 -310h-88l-90 210l-90 -210h-88z" />
-<glyph unicode="_" horiz-adv-x="500" d="M0 -10h500v-80h-500v80z" />
-<glyph unicode="`" horiz-adv-x="250" d="M44 848h113l68 -111h-79z" />
-<glyph unicode="a" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM145 222h106l-53 354z" />
-<glyph unicode="b" horiz-adv-x="406" d="M40 0v700h166q85 0 124 -39.5t39 -121.5v-25q0 -108 -71 -141q82 -32 82 -150v-57q0 -81 -42.5 -123.5t-124.5 -42.5h-173zM150 100h63q29 0 43 15.5t14 53.5v61q0 48 -16.5 66.5t-54.5 18.5h-49v-215zM150 415h43q33 0 49.5 17t16.5 57v39q0 72 -56 72h-53v-185z" />
-<glyph unicode="c" horiz-adv-x="386" d="M31 168v364q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5v-68h-104v75q0 69 -57 69t-57 -69v-378q0 -68 57 -68t57 68v100h104v-93q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
-<glyph unicode="d" horiz-adv-x="408" d="M40 0v700h174q164 0 164 -173v-354q0 -173 -164 -173h-174zM150 100h62q56 0 56 68v364q0 68 -56 68h-62v-500z" />
-<glyph unicode="e" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300z" />
-<glyph unicode="f" horiz-adv-x="344" d="M40 0v700h291v-100h-181v-211h142v-100h-142v-289h-110z" />
-<glyph unicode="g" horiz-adv-x="390" d="M31 168v364q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5v-68h-104v75q0 69 -57 69t-57 -69v-378q0 -68 57 -68t57 68v129h-50v100h154v-222q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
-<glyph unicode="h" horiz-adv-x="427" d="M40 0v700h110v-300h125v300h112v-700h-112v300h-125v-300h-110z" />
-<glyph unicode="i" horiz-adv-x="190" d="M40 0v700h110v-700h-110z" />
-<glyph unicode="j" horiz-adv-x="256" d="M10 0v100q12 -1 38 -1q63 0 63 67v534h110v-526q0 -176 -158 -176q-35 0 -53 2z" />
-<glyph unicode="k" horiz-adv-x="414" d="M40 0v700h110v-305l144 305h110l-153 -312l153 -388h-113l-107 279l-34 -64v-215h-110z" />
-<glyph unicode="l" horiz-adv-x="339" d="M40 0v700h110v-600h181v-100h-291z" />
-<glyph unicode="m" horiz-adv-x="541" d="M39 0v700h153l81 -497l75 497h153v-700h-104v502l-76 -502h-104l-82 495v-495h-96z" />
-<glyph unicode="n" horiz-adv-x="427" d="M39 0v700h138l113 -419v419h98v-700h-113l-137 507v-507h-99z" />
-<glyph unicode="o" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
-<glyph unicode="p" horiz-adv-x="377" d="M40 0v700h162q164 0 164 -173v-91q0 -173 -164 -173h-52v-263h-110zM150 363h52q27 0 40.5 15t13.5 51v105q0 36 -13.5 51t-40.5 15h-52v-237z" />
-<glyph unicode="q" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -59 -21 -98q6 -15 31 -15h10v-98h-15q-71 0 -95 48q-36 -13 -77 -13q-81 0 -124 46t-43 130zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
-<glyph unicode="r" horiz-adv-x="402" d="M40 0v700h166q85 0 124 -39.5t39 -121.5v-55q0 -108 -72 -142q73 -31 73 -149v-108q0 -57 12 -85h-112q-10 30 -10 86v110q0 48 -17 68.5t-55 20.5h-38v-285h-110zM150 385h43q33 0 49.5 17t16.5 57v69q0 72 -56 72h-53v-215z" />
-<glyph unicode="s" horiz-adv-x="374" d="M23 168v43h104v-50q0 -68 57 -68t57 68q0 39 -22 73.5t-53.5 62.5t-63.5 58.5t-54 76t-22 100.5q0 85 41 130.5t121 45.5t121 -45.5t41 -130.5v-22h-104v29q0 69 -55 69t-55 -69q0 -29 12 -55t31 -47t42 -41.5t45.5 -43t41.5 -48t31 -60.5t12 -76q0 -85 -42 -130.5 t-122 -45.5t-122 45.5t-42 130.5z" />
-<glyph unicode="t" horiz-adv-x="356" d="M8 600v100h340v-100h-115v-600h-110v600h-115z" />
-<glyph unicode="u" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
-<glyph unicode="v" horiz-adv-x="402" d="M11 700h111l84 -571l84 571h101l-108 -700h-164z" />
-<glyph unicode="w" horiz-adv-x="563" d="M15 700h107l59 -552l53 552h106l55 -556l57 556h96l-78 -700h-146l-40 373l-40 -373h-151z" />
-<glyph unicode="x" horiz-adv-x="430" d="M15 0l123 360l-115 340h114l83 -258l85 258h102l-115 -340l123 -360h-116l-90 277l-91 -277h-103z" />
-<glyph unicode="y" d="M4 700h115l84 -319l84 319h105l-139 -468v-232h-110v232z" />
-<glyph unicode="z" horiz-adv-x="370" d="M23 0v98l209 502h-199v100h312v-98l-209 -502h209v-100h-322z" />
-<glyph unicode="{" horiz-adv-x="257" d="M11 305v90q31 0 42 12.5t13 47.5l8 134q4 55 33.5 83t77.5 28h56v-90h-16q-27 0 -39 -15.5t-14 -55.5l-5 -100q-4 -73 -65 -89q61 -16 65 -89l5 -100q2 -40 14 -55.5t39 -15.5h16v-90h-56q-48 0 -77.5 28t-33.5 83l-8 134q-2 35 -13 47.5t-42 12.5z" />
-<glyph unicode="|" horiz-adv-x="500" d="M210 -65v830h90v-830h-90z" />
-<glyph unicode="}" horiz-adv-x="257" d="M16 0v90h16q27 0 39 15.5t14 55.5l5 100q4 73 65 89q-61 16 -65 89l-5 100q-2 40 -14 55.5t-39 15.5h-16v90h56q48 0 77.5 -28t33.5 -83l8 -134q2 -35 13 -47.5t42 -12.5v-90q-31 0 -42 -12.5t-13 -47.5l-8 -134q-4 -55 -33.5 -83t-77.5 -28h-56z" />
-<glyph unicode="~" d="M8 332q34 51 61.5 70.5t57.5 19.5q29 0 76 -30.5t67 -30.5q16 0 28.5 11.5t37.5 45.5l52 -54q-34 -50 -61 -68t-58 -18q-29 0 -76 30.5t-67 30.5q-17 0 -29.5 -11.5t-36.5 -45.5z" />
-<glyph unicode="&#xa1;" horiz-adv-x="190" d="M40 0v292l14 253h82l14 -253v-292h-110zM42 594v106h106v-106h-106z" />
-<glyph unicode="&#xa2;" d="M36 208v284q0 145 117 171v52h90v-51q121 -24 121 -172v-48h-104v55q0 69 -57 69t-57 -69v-298q0 -68 57 -68t57 68v80h104v-73q0 -149 -121 -172v-51h-90v52q-117 24 -117 171z" />
-<glyph unicode="&#xa3;" d="M30 0v96q40 0 67 30.5t28 83.5h-81v85h67q-7 19 -27.5 60t-32 81.5t-11.5 95.5q0 85 41 130.5t121 45.5t121 -45.5t41 -130.5v-69h-104v76q0 69 -55 69t-55 -69q0 -55 12 -97.5t30.5 -81.5t24.5 -65h121v-85h-114q-7 -71 -56 -110h189v-100h-327z" />
-<glyph unicode="&#xa5;" d="M7 700h115l81 -309l81 309h105l-128 -429h83v-55h-91v-45h91v-55h-91v-116h-110v116h-91v55h91v45h-91v55h82z" />
-<glyph unicode="&#xa6;" horiz-adv-x="500" d="M210 -65v355h90v-355h-90zM210 410v355h90v-355h-90z" />
-<glyph unicode="&#xa7;" d="M35 314q0 83 69 122q-69 45 -69 130q0 63 42 102.5t120 39.5t120 -37t42 -99v-36h-104v21q0 27 -14.5 43.5t-40.5 16.5q-55 0 -55 -56q0 -22 22 -38.5t53.5 -30t63.5 -31.5t54 -53.5t22 -86.5q0 -83 -70 -123q70 -43 70 -129q0 -63 -42 -102.5t-120 -39.5t-120 37t-42 99 v50h104v-35q0 -27 14.5 -43.5t40.5 -16.5q55 0 55 56q0 22 -22 38.5t-53.5 30t-63.5 31.5t-54 53.5t-22 86.5zM140 318q0 -28 15.5 -45t45.5 -32q24 4 39 25.5t15 50.5q0 46 -62 76q-24 -4 -38.5 -25t-14.5 -50z" />
-<glyph unicode="&#xa8;" horiz-adv-x="250" d="M1 737v96h96v-96h-96zM153 737v96h96v-96h-96z" />
-<glyph unicode="&#xa9;" horiz-adv-x="736" d="M20 350q0 155 99.5 256.5t248.5 101.5t248.5 -101.5t99.5 -256.5t-99.5 -256.5t-248.5 -101.5t-248.5 101.5t-99.5 256.5zM92 350q0 -125 78.5 -206.5t197.5 -81.5t197.5 81.5t78.5 206.5t-78.5 206.5t-197.5 81.5t-197.5 -81.5t-78.5 -206.5zM251 252v194q0 124 113 124 t113 -124v-36h-72v42q0 48 -39 48t-39 -48v-204q0 -47 39 -47t39 47v60h72v-56q0 -122 -113 -122t-113 122z" />
-<glyph unicode="&#xaa;" horiz-adv-x="278" d="M30 218v69h212v-69h-212zM30 429v4q0 67 37 95t105 30v46q0 37 -28 37q-34 0 -34 -43v-23h-66v19q0 111 103 111q95 0 95 -111v-261h-59l-4 48q-17 -53 -71 -53q-78 0 -78 101zM100 435q0 -43 36 -43q33 0 36 36v78q-72 -3 -72 -62v-9z" />
-<glyph unicode="&#xab;" horiz-adv-x="355" d="M16 351l62 257h99l-61 -257l61 -273h-99zM178 351l62 257h99l-61 -257l61 -273h-99z" />
-<glyph unicode="&#xac;" d="M25 311v78h346v-215h-78v137h-268z" />
-<glyph unicode="&#xad;" horiz-adv-x="270" d="M35 300v100h200v-100h-200z" />
-<glyph unicode="&#xae;" horiz-adv-x="736" d="M20 350q0 155 99.5 256.5t248.5 101.5t248.5 -101.5t99.5 -256.5t-99.5 -256.5t-248.5 -101.5t-248.5 101.5t-99.5 256.5zM92 350q0 -125 78.5 -206.5t197.5 -81.5t197.5 81.5t78.5 206.5t-78.5 206.5t-197.5 81.5t-197.5 -81.5t-78.5 -206.5zM258 136v428h116 q113 0 113 -112v-9q0 -76 -52 -99q52 -21 52 -103v-46q0 -39 9 -59h-78q-7 18 -7 60v46q0 34 -12 48t-39 14h-26v-168h-76zM334 374h31q46 0 46 51v18q0 51 -41 51h-36v-120z" />
-<glyph unicode="&#xaf;" horiz-adv-x="250" d="M10 741v78h230v-78h-230z" />
-<glyph unicode="&#xb0;" horiz-adv-x="228" d="M15 609q0 41 29 70t70 29t70 -29t29 -70t-29 -70t-70 -29t-70 29t-29 70zM65 609q0 -20 14.5 -34.5t34.5 -14.5t34.5 14.5t14.5 34.5t-14.5 34.5t-34.5 14.5t-34.5 -14.5t-14.5 -34.5z" />
-<glyph unicode="&#xb1;" d="M35 174v78h124v80h-124v78h124v114h78v-114h124v-78h-124v-80h124v-78h-326z" />
-<glyph unicode="&#xb2;" horiz-adv-x="280" d="M42 351v54q0 36 14 66.5t34.5 53l41 45t34.5 53t14 65.5q0 50 -36 50t-36 -44v-47h-66v43q0 111 104 111t104 -111q0 -49 -23.5 -93.5t-51 -70.5t-48 -56t-15.5 -56h132v-63h-202z" />
-<glyph unicode="&#xb3;" horiz-adv-x="280" d="M36 458v36h66v-41q0 -44 36 -44t36 51v34q0 31 -10.5 43.5t-34.5 12.5h-24v63h27q42 0 42 48v25q0 51 -36 51t-36 -44v-28h-66v23q0 112 104 112t104 -112v-11q0 -71 -49 -91q49 -21 49 -93v-35q0 -112 -104 -112t-104 112z" />
-<glyph unicode="&#xb4;" horiz-adv-x="250" d="M27 737l68 111h108l-102 -111h-74z" />
-<glyph unicode="&#xb6;" d="M14 436v91q0 173 164 173h178v-765h-80v685h-54v-685h-80l2 330q-62 0 -96 47t-34 124z" />
-<glyph unicode="&#xb7;" horiz-adv-x="186" d="M40 297v106h106v-106h-106z" />
-<glyph unicode="&#xb8;" horiz-adv-x="250" d="M26 -79h74v-8q0 -20 22 -20q25 0 25 24q0 26 -36 26h-10v71h48v-53q38 0 56 -10.5t18 -36.5q0 -37 -25 -49t-76 -12q-96 0 -96 58v10z" />
-<glyph unicode="&#xb9;" horiz-adv-x="200" d="M25 690v49q36 0 51.5 14t26.5 42h46v-444h-70v339h-54z" />
-<glyph unicode="&#xba;" horiz-adv-x="280" d="M34 218v69h212v-69h-212zM34 439v155q0 53 27.5 82t78.5 29t78.5 -29t27.5 -82v-155q0 -53 -27.5 -82t-78.5 -29t-78.5 29t-27.5 82zM104 435q0 -43 36 -43t36 43v163q0 43 -36 43t-36 -43v-163z" />
-<glyph unicode="&#xbb;" horiz-adv-x="355" d="M16 78l61 273l-61 257h99l62 -257l-62 -273h-99zM178 78l61 273l-61 257h99l62 -257l-62 -273h-99z" />
-<glyph unicode="&#xbc;" horiz-adv-x="627" d="M65 595v49q36 0 51.5 14t26.5 42h46v-444h-70v339h-54zM160 0l276 700h65l-276 -700h-65zM371 80v64l127 300h76v-300h33v-64h-33v-80h-69v80h-134zM434 144h71v164z" />
-<glyph unicode="&#xbd;" horiz-adv-x="627" d="M65 595v49q36 0 51.5 14t26.5 42h46v-444h-70v339h-54zM130 0l276 700h65l-276 -700h-65zM389 0v54q0 36 14 66.5t34.5 53l41 45t34.5 53t14 65.5q0 50 -36 50t-36 -44v-47h-66v43q0 111 104 111t104 -111q0 -49 -23.5 -93.5t-51 -70.5t-48 -56t-15.5 -56h132v-63h-202z " />
-<glyph unicode="&#xbe;" horiz-adv-x="627" d="M36 363v36h66v-41q0 -44 36 -44t36 51v34q0 31 -10.5 43.5t-34.5 12.5h-24v63h27q42 0 42 48v25q0 51 -36 51t-36 -44v-28h-66v23q0 112 104 112t104 -112v-11q0 -71 -49 -91q49 -21 49 -93v-35q0 -112 -104 -112t-104 112zM170 0l276 700h65l-276 -700h-65zM371 80v64 l127 300h76v-300h33v-64h-33v-80h-69v80h-134zM434 144h71v164z" />
-<glyph unicode="&#xbf;" horiz-adv-x="360" d="M16 168q0 61 20.5 111.5t44.5 78t44.5 67t20.5 81.5q0 22 -4 39h98q6 -18 6 -43q0 -51 -19 -93.5t-41 -69t-41 -73.5t-19 -105q0 -69 55 -69t55 69v76h104v-69q0 -85 -41 -130.5t-121 -45.5t-121 45.5t-41 130.5zM139 594v106h106v-106h-106z" />
-<glyph unicode="&#xc0;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM83 848h113l68 -111h-79zM145 222h106l-53 354z" />
-<glyph unicode="&#xc1;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM145 222h106l-53 354zM145 737l68 111h108l-102 -111h-74z" />
-<glyph unicode="&#xc2;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM65 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94zM145 222h106l-53 354z" />
-<glyph unicode="&#xc3;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM68 770q25 68 85 68q23 0 50 -12.5t40 -12.5q29 0 43 29l53 -37q-25 -68 -85 -68q-22 0 -49 12.5t-41 12.5q-29 0 -43 -29zM145 222h106l-53 354z" />
-<glyph unicode="&#xc4;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM79 737v96h96v-96h-96zM145 222h106l-53 354zM231 737v96h96v-96h-96z" />
-<glyph unicode="&#xc5;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM123 814q0 34 23 57t57 23t57 -23t23 -57t-23 -57t-57 -23t-57 23t-23 57zM145 222h106l-53 354zM173 814q0 -13 8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5t-8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5z" />
-<glyph unicode="&#xc6;" horiz-adv-x="580" d="M4 0l187 700h361v-100h-190v-195h151v-100h-151v-205h190v-100h-300v127h-111l-32 -127h-105zM166 222h86v337z" />
-<glyph unicode="&#xc7;" horiz-adv-x="386" d="M31 168v364q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5v-68h-104v75q0 69 -57 69t-57 -69v-378q0 -68 57 -68t57 68v100h104v-93q0 -78 -36.5 -123.5t-105.5 -51.5v-32q38 0 56 -10.5t18 -36.5q0 -37 -25 -49t-76 -12q-96 0 -96 58v10h74v-8q0 -20 22 -20q25 0 25 24 q0 26 -36 26h-10v51q-138 14 -138 174z" />
-<glyph unicode="&#xc8;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM68 848h113l68 -111h-79z" />
-<glyph unicode="&#xc9;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM131 737l68 111h108l-102 -111h-74z" />
-<glyph unicode="&#xca;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM50 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94z" />
-<glyph unicode="&#xcb;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM65 737v96h96v-96h-96zM217 737v96h96v-96h-96z" />
-<glyph unicode="&#xcc;" horiz-adv-x="190" d="M-25 848h113l68 -111h-79zM40 0v700h110v-700h-110z" />
-<glyph unicode="&#xcd;" horiz-adv-x="190" d="M37 737l68 111h108l-102 -111h-74zM40 0v700h110v-700h-110z" />
-<glyph unicode="&#xce;" horiz-adv-x="190" d="M-43 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94zM40 0v700h110v-700h-110z" />
-<glyph unicode="&#xcf;" horiz-adv-x="190" d="M-29 737v96h96v-96h-96zM40 0v700h110v-700h-110zM123 737v96h96v-96h-96z" />
-<glyph unicode="&#xd0;" horiz-adv-x="408" d="M4 305v90h36v305h174q164 0 164 -173v-354q0 -173 -164 -173h-174v305h-36zM150 100h62q56 0 56 68v364q0 68 -56 68h-62v-205h68v-90h-68v-205z" />
-<glyph unicode="&#xd1;" horiz-adv-x="427" d="M39 0v700h138l113 -419v419h98v-700h-113l-137 507v-507h-99zM78 770q25 68 85 68q23 0 50 -12.5t40 -12.5q29 0 43 29l53 -37q-25 -68 -85 -68q-22 0 -49 12.5t-41 12.5q-29 0 -43 -29z" />
-<glyph unicode="&#xd2;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM77 848h113l68 -111h-79zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
-<glyph unicode="&#xd3;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM140 737l68 111h108l-102 -111h-74zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
-<glyph unicode="&#xd4;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM59 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
-<glyph unicode="&#xd5;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM63 770q25 68 85 68q22 0 49 -12.5t41 -12.5q29 0 43 29l53 -37q-25 -68 -85 -68q-23 0 -50 12.5t-40 12.5q-29 0 -43 -29zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69 t-57 -69v-378z" />
-<glyph unicode="&#xd6;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM74 737v96h96v-96h-96zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378zM226 737v96h96v-96h-96z" />
-<glyph unicode="&#xd7;" d="M38 244l106 106l-105 105l53 53l106 -105l106 106l53 -53l-106 -106l106 -106l-53 -53l-106 106l-107 -106z" />
-<glyph unicode="&#xd8;" d="M31 168v364q0 84 43 130t124 46q60 0 100 -26l20 55l37 -13l-26 -71q36 -43 36 -121v-364q0 -84 -43 -130t-124 -46q-62 0 -100 25l-20 -54l-37 13l25 70q-35 46 -35 122zM141 251l112 309q-7 48 -55 48q-57 0 -57 -69v-288zM142 140q8 -48 56 -48q57 0 57 69v288z" />
-<glyph unicode="&#xd9;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM79 848h113l68 -111h-79z" />
-<glyph unicode="&#xda;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM142 737l68 111h108l-102 -111h-74z" />
-<glyph unicode="&#xdb;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM62 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94z" />
-<glyph unicode="&#xdc;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM77 737v96h96v-96h-96zM229 737v96h96v-96h-96z" />
-<glyph unicode="&#xdd;" d="M4 700h115l84 -319l84 319h105l-139 -468v-232h-110v232zM144 737l68 111h108l-102 -111h-74z" />
-<glyph unicode="&#xde;" horiz-adv-x="377" d="M40 0v700h110v-80h52q164 0 164 -173v-91q0 -173 -164 -173h-52v-183h-110zM150 283h52q27 0 40.5 15t13.5 51v105q0 36 -13.5 51t-40.5 15h-52v-237z" />
-<glyph unicode="&#xdf;" horiz-adv-x="748" d="M23 168v43h104v-50q0 -68 57 -68t57 68q0 39 -22 73.5t-53.5 62.5t-63.5 58.5t-54 76t-22 100.5q0 85 41 130.5t121 45.5t121 -45.5t41 -130.5v-22h-104v29q0 69 -55 69t-55 -69q0 -29 12 -55t31 -47t42 -41.5t45.5 -43t41.5 -48t31 -60.5t12 -76q0 -85 -42 -130.5 t-122 -45.5t-122 45.5t-42 130.5zM397 168v43h104v-50q0 -68 57 -68t57 68q0 29 -12 55t-31 47t-41.5 41.5t-45.5 43t-42 48t-31 60.5t-12 76q0 85 41 130.5t121 45.5t121 -45.5t41 -130.5v-22h-104v29q0 69 -55 69t-55 -69q0 -29 12 -55t31 -47t42 -41.5t45.5 -43t41.5 -48 t31 -60.5t12 -76q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5z" />
-<glyph unicode="&#xe0;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM83 848h113l68 -111h-79zM145 222h106l-53 354z" />
-<glyph unicode="&#xe1;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM145 222h106l-53 354zM145 737l68 111h108l-102 -111h-74z" />
-<glyph unicode="&#xe2;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM65 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94zM145 222h106l-53 354z" />
-<glyph unicode="&#xe3;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM68 770q25 68 85 68q23 0 50 -12.5t40 -12.5q29 0 43 29l53 -37q-25 -68 -85 -68q-22 0 -49 12.5t-41 12.5q-29 0 -43 -29zM145 222h106l-53 354z" />
-<glyph unicode="&#xe4;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM79 737v96h96v-96h-96zM145 222h106l-53 354zM231 737v96h96v-96h-96z" />
-<glyph unicode="&#xe5;" horiz-adv-x="407" d="M11 0l112 700h161l112 -700h-111l-19 127h-135l-19 -127h-101zM123 814q0 34 23 57t57 23t57 -23t23 -57t-23 -57t-57 -23t-57 23t-23 57zM145 222h106l-53 354zM173 814q0 -13 8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5t-8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5z" />
-<glyph unicode="&#xe6;" horiz-adv-x="580" d="M4 0l187 700h361v-100h-190v-195h151v-100h-151v-205h190v-100h-300v127h-111l-32 -127h-105zM166 222h86v337z" />
-<glyph unicode="&#xe7;" horiz-adv-x="386" d="M31 168v364q0 85 42 130.5t122 45.5t122 -45.5t42 -130.5v-68h-104v75q0 69 -57 69t-57 -69v-378q0 -68 57 -68t57 68v100h104v-93q0 -78 -36.5 -123.5t-105.5 -51.5v-32q38 0 56 -10.5t18 -36.5q0 -37 -25 -49t-76 -12q-96 0 -96 58v10h74v-8q0 -20 22 -20q25 0 25 24 q0 26 -36 26h-10v51q-138 14 -138 174z" />
-<glyph unicode="&#xe8;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM68 848h113l68 -111h-79z" />
-<glyph unicode="&#xe9;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM131 737l68 111h108l-102 -111h-74z" />
-<glyph unicode="&#xea;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM50 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94z" />
-<glyph unicode="&#xeb;" horiz-adv-x="368" d="M40 0v700h300v-100h-190v-195h151v-100h-151v-205h190v-100h-300zM65 737v96h96v-96h-96zM217 737v96h96v-96h-96z" />
-<glyph unicode="&#xec;" horiz-adv-x="190" d="M-25 848h113l68 -111h-79zM40 0v700h110v-700h-110z" />
-<glyph unicode="&#xed;" horiz-adv-x="190" d="M37 737l68 111h108l-102 -111h-74zM40 0v700h110v-700h-110z" />
-<glyph unicode="&#xee;" horiz-adv-x="190" d="M-43 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94zM40 0v700h110v-700h-110z" />
-<glyph unicode="&#xef;" horiz-adv-x="190" d="M-29 737v96h96v-96h-96zM40 0v700h110v-700h-110zM123 737v96h96v-96h-96z" />
-<glyph unicode="&#xf0;" horiz-adv-x="408" d="M4 305v90h36v305h174q164 0 164 -173v-354q0 -173 -164 -173h-174v305h-36zM150 100h62q56 0 56 68v364q0 68 -56 68h-62v-205h68v-90h-68v-205z" />
-<glyph unicode="&#xf1;" horiz-adv-x="427" d="M39 0v700h138l113 -419v419h98v-700h-113l-137 507v-507h-99zM78 770q25 68 85 68q23 0 50 -12.5t40 -12.5q29 0 43 29l53 -37q-25 -68 -85 -68q-22 0 -49 12.5t-41 12.5q-29 0 -43 -29z" />
-<glyph unicode="&#xf2;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM77 848h113l68 -111h-79zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
-<glyph unicode="&#xf3;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM140 737l68 111h108l-102 -111h-74zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
-<glyph unicode="&#xf4;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM59 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378z" />
-<glyph unicode="&#xf5;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM63 770q25 68 85 68q22 0 49 -12.5t41 -12.5q29 0 43 29l53 -37q-25 -68 -85 -68q-23 0 -50 12.5t-40 12.5q-29 0 -43 -29zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69 t-57 -69v-378z" />
-<glyph unicode="&#xf6;" d="M31 168v364q0 84 43 130t124 46t124 -46t43 -130v-364q0 -84 -43 -130t-124 -46t-124 46t-43 130zM74 737v96h96v-96h-96zM141 161q0 -69 57 -69t57 69v378q0 69 -57 69t-57 -69v-378zM226 737v96h96v-96h-96z" />
-<glyph unicode="&#xf7;" d="M25 311v78h346v-78h-346zM145 144v106h106v-106h-106zM145 449v106h106v-106h-106z" />
-<glyph unicode="&#xf8;" d="M31 168v364q0 84 43 130t124 46q60 0 100 -26l20 55l37 -13l-26 -71q36 -43 36 -121v-364q0 -84 -43 -130t-124 -46q-62 0 -100 25l-20 -54l-37 13l25 70q-35 46 -35 122zM141 251l112 309q-7 48 -55 48q-57 0 -57 -69v-288zM142 140q8 -48 56 -48q57 0 57 69v288z" />
-<glyph unicode="&#xf9;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM79 848h113l68 -111h-79z" />
-<glyph unicode="&#xfa;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM142 737l68 111h108l-102 -111h-74z" />
-<glyph unicode="&#xfb;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM62 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94z" />
-<glyph unicode="&#xfc;" horiz-adv-x="398" d="M35 167v533h110v-540q0 -68 57 -68t57 68v540h104v-533q0 -85 -42 -130.5t-122 -45.5t-122 45.5t-42 130.5zM77 737v96h96v-96h-96zM229 737v96h96v-96h-96z" />
-<glyph unicode="&#xfd;" d="M4 700h115l84 -319l84 319h105l-139 -468v-232h-110v232zM144 737l68 111h108l-102 -111h-74z" />
-<glyph unicode="&#xfe;" horiz-adv-x="377" d="M40 0v700h110v-80h52q164 0 164 -173v-91q0 -173 -164 -173h-52v-183h-110zM150 283h52q27 0 40.5 15t13.5 51v105q0 36 -13.5 51t-40.5 15h-52v-237z" />
-<glyph unicode="&#xff;" d="M4 700h115l84 -319l84 319h105l-139 -468v-232h-110v232zM78 737v96h96v-96h-96zM230 737v96h96v-96h-96z" />
-<glyph unicode="&#x152;" horiz-adv-x="586" d="M30 173v354q0 173 164 173h364v-100h-190v-195h151v-100h-151v-205h190v-100h-364q-164 0 -164 173zM140 168q0 -68 56 -68h62v500h-62q-56 0 -56 -68v-364z" />
-<glyph unicode="&#x153;" horiz-adv-x="586" d="M30 173v354q0 173 164 173h364v-100h-190v-195h151v-100h-151v-205h190v-100h-364q-164 0 -164 173zM140 168q0 -68 56 -68h62v500h-62q-56 0 -56 -68v-364z" />
-<glyph unicode="&#x178;" d="M4 700h115l84 -319l84 319h105l-139 -468v-232h-110v232zM78 737v96h96v-96h-96zM230 737v96h96v-96h-96z" />
-<glyph unicode="&#x2c6;" horiz-adv-x="250" d="M-13 737l89 111h99l89 -111h-94l-45 55l-44 -55h-94z" />
-<glyph unicode="&#x2dc;" horiz-adv-x="250" d="M-10 770q25 68 85 68q22 0 49.5 -12.5t40.5 -12.5q29 0 43 29l53 -37q-25 -68 -85 -68q-22 0 -49 12.5t-41 12.5q-29 0 -43 -29z" />
-<glyph unicode="&#x2000;" horiz-adv-x="447" />
-<glyph unicode="&#x2001;" horiz-adv-x="894" />
-<glyph unicode="&#x2002;" horiz-adv-x="447" />
-<glyph unicode="&#x2003;" horiz-adv-x="894" />
-<glyph unicode="&#x2004;" horiz-adv-x="298" />
-<glyph unicode="&#x2005;" horiz-adv-x="223" />
-<glyph unicode="&#x2006;" horiz-adv-x="149" />
-<glyph unicode="&#x2007;" horiz-adv-x="149" />
-<glyph unicode="&#x2008;" horiz-adv-x="111" />
-<glyph unicode="&#x2009;" horiz-adv-x="178" />
-<glyph unicode="&#x200a;" horiz-adv-x="49" />
-<glyph unicode="&#x2010;" horiz-adv-x="270" d="M35 300v100h200v-100h-200z" />
-<glyph unicode="&#x2011;" horiz-adv-x="270" d="M35 300v100h200v-100h-200z" />
-<glyph unicode="&#x2012;" horiz-adv-x="270" d="M35 300v100h200v-100h-200z" />
-<glyph unicode="&#x2013;" horiz-adv-x="500" d="M0 305v90h500v-90h-500z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1000" d="M0 305v90h1000v-90h-1000z" />
-<glyph unicode="&#x2018;" horiz-adv-x="186" d="M40 494v95l48 111h45l-29 -100h42v-106h-106z" />
-<glyph unicode="&#x2019;" horiz-adv-x="186" d="M40 594v106h106v-95l-48 -111h-45l29 100h-42z" />
-<glyph unicode="&#x201a;" horiz-adv-x="186" d="M40 0v106h106v-95l-48 -111h-45l29 100h-42z" />
-<glyph unicode="&#x201c;" horiz-adv-x="332" d="M40 494v95l48 111h45l-29 -100h42v-106h-106zM186 494v95l48 111h45l-29 -100h42v-106h-106z" />
-<glyph unicode="&#x201d;" horiz-adv-x="332" d="M40 594v106h106v-95l-48 -111h-45l29 100h-42zM186 594v106h106v-95l-48 -111h-45l29 100h-42z" />
-<glyph unicode="&#x201e;" horiz-adv-x="332" d="M40 0v106h106v-95l-48 -111h-45l29 100h-42zM186 0v106h106v-95l-48 -111h-45l29 100h-42z" />
-<glyph unicode="&#x2022;" d="M59 350q0 58 40.5 98.5t98.5 40.5t98.5 -40.5t40.5 -98.5t-40.5 -98.5t-98.5 -40.5t-98.5 40.5t-40.5 98.5z" />
-<glyph unicode="&#x2026;" horiz-adv-x="478" d="M40 0v106h106v-106h-106zM186 0v106h106v-106h-106zM332 0v106h106v-106h-106z" />
-<glyph unicode="&#x202f;" horiz-adv-x="178" />
-<glyph unicode="&#x2039;" horiz-adv-x="196" d="M16 351l60 266h104l-59 -266l59 -282h-104z" />
-<glyph unicode="&#x203a;" horiz-adv-x="196" d="M16 69l59 282l-59 266h104l60 -266l-60 -282h-104z" />
-<glyph unicode="&#x205f;" horiz-adv-x="223" />
-<glyph unicode="&#x20ac;" d="M19 270v55h28v55h-28v55h28v97q0 85 40.5 130.5t120.5 45.5t120.5 -45.5t40.5 -130.5v-51h-104v58q0 69 -54 69t-54 -69v-104h154v-55h-154v-55h154v-55h-154v-109q0 -68 54 -68t54 68v63h104v-56q0 -85 -40.5 -130.5t-120.5 -45.5t-120.5 45.5t-40.5 130.5v102h-28z" />
-<glyph unicode="&#x2122;" horiz-adv-x="586" d="M10 636v64h216v-64h-73v-292h-70v292h-73zM268 344v356h97l52 -250l47 250h97v-356h-66v253l-47 -253h-66l-53 251v-251h-61z" />
-<glyph unicode="&#xe000;" horiz-adv-x="700" d="M0 0v700h700v-700h-700z" />
-<hkern u1="&#x28;" u2="&#x178;" k="-5" />
-<hkern u1="&#x28;" u2="&#xff;" k="-5" />
-<hkern u1="&#x28;" u2="&#xfd;" k="-5" />
-<hkern u1="&#x28;" u2="&#xdd;" k="-5" />
-<hkern u1="&#x28;" u2="y" k="-5" />
-<hkern u1="&#x28;" u2="w" k="-3" />
-<hkern u1="&#x28;" u2="v" k="-3" />
-<hkern u1="&#x28;" u2="t" k="-8" />
-<hkern u1="&#x28;" u2="Y" k="-5" />
-<hkern u1="&#x28;" u2="W" k="-3" />
-<hkern u1="&#x28;" u2="V" k="-3" />
-<hkern u1="&#x28;" u2="T" k="-8" />
-<hkern u1="&#x2c;" u2="&#x178;" k="80" />
-<hkern u1="&#x2c;" u2="&#x153;" k="10" />
-<hkern u1="&#x2c;" u2="&#x152;" k="10" />
-<hkern u1="&#x2c;" u2="&#xff;" k="80" />
-<hkern u1="&#x2c;" u2="&#xfd;" k="80" />
-<hkern u1="&#x2c;" u2="&#xfc;" k="6" />
-<hkern u1="&#x2c;" u2="&#xfb;" k="6" />
-<hkern u1="&#x2c;" u2="&#xfa;" k="6" />
-<hkern u1="&#x2c;" u2="&#xf9;" k="6" />
-<hkern u1="&#x2c;" u2="&#xf8;" k="10" />
-<hkern u1="&#x2c;" u2="&#xf6;" k="10" />
-<hkern u1="&#x2c;" u2="&#xf5;" k="10" />
-<hkern u1="&#x2c;" u2="&#xf4;" k="10" />
-<hkern u1="&#x2c;" u2="&#xf3;" k="10" />
-<hkern u1="&#x2c;" u2="&#xf2;" k="10" />
-<hkern u1="&#x2c;" u2="&#xe7;" k="10" />
-<hkern u1="&#x2c;" u2="&#xdf;" k="5" />
-<hkern u1="&#x2c;" u2="&#xdd;" k="80" />
-<hkern u1="&#x2c;" u2="&#xdc;" k="6" />
-<hkern u1="&#x2c;" u2="&#xdb;" k="6" />
-<hkern u1="&#x2c;" u2="&#xda;" k="6" />
-<hkern u1="&#x2c;" u2="&#xd9;" k="6" />
-<hkern u1="&#x2c;" u2="&#xd8;" k="10" />
-<hkern u1="&#x2c;" u2="&#xd6;" k="10" />
-<hkern u1="&#x2c;" u2="&#xd5;" k="10" />
-<hkern u1="&#x2c;" u2="&#xd4;" k="10" />
-<hkern u1="&#x2c;" u2="&#xd3;" k="10" />
-<hkern u1="&#x2c;" u2="&#xd2;" k="10" />
-<hkern u1="&#x2c;" u2="&#xc7;" k="10" />
-<hkern u1="&#x2c;" u2="y" k="80" />
-<hkern u1="&#x2c;" u2="w" k="40" />
-<hkern u1="&#x2c;" u2="v" k="60" />
-<hkern u1="&#x2c;" u2="u" k="6" />
-<hkern u1="&#x2c;" u2="t" k="60" />
-<hkern u1="&#x2c;" u2="s" k="5" />
-<hkern u1="&#x2c;" u2="q" k="10" />
-<hkern u1="&#x2c;" u2="o" k="10" />
-<hkern u1="&#x2c;" u2="g" k="10" />
-<hkern u1="&#x2c;" u2="c" k="10" />
-<hkern u1="&#x2c;" u2="Y" k="80" />
-<hkern u1="&#x2c;" u2="W" k="40" />
-<hkern u1="&#x2c;" u2="V" k="60" />
-<hkern u1="&#x2c;" u2="U" k="6" />
-<hkern u1="&#x2c;" u2="T" k="60" />
-<hkern u1="&#x2c;" u2="S" k="5" />
-<hkern u1="&#x2c;" u2="Q" k="10" />
-<hkern u1="&#x2c;" u2="O" k="10" />
-<hkern u1="&#x2c;" u2="G" k="10" />
-<hkern u1="&#x2c;" u2="C" k="10" />
-<hkern u1="&#x2d;" u2="x" k="15" />
-<hkern u1="&#x2d;" u2="v" k="10" />
-<hkern u1="&#x2d;" u2="X" k="15" />
-<hkern u1="&#x2d;" u2="V" k="10" />
-<hkern u1="&#x2e;" u2="&#x178;" k="80" />
-<hkern u1="&#x2e;" u2="&#x153;" k="10" />
-<hkern u1="&#x2e;" u2="&#x152;" k="10" />
-<hkern u1="&#x2e;" u2="&#xff;" k="80" />
-<hkern u1="&#x2e;" u2="&#xfd;" k="80" />
-<hkern u1="&#x2e;" u2="&#xfc;" k="6" />
-<hkern u1="&#x2e;" u2="&#xfb;" k="6" />
-<hkern u1="&#x2e;" u2="&#xfa;" k="6" />
-<hkern u1="&#x2e;" u2="&#xf9;" k="6" />
-<hkern u1="&#x2e;" u2="&#xf8;" k="10" />
-<hkern u1="&#x2e;" u2="&#xf6;" k="10" />
-<hkern u1="&#x2e;" u2="&#xf5;" k="10" />
-<hkern u1="&#x2e;" u2="&#xf4;" k="10" />
-<hkern u1="&#x2e;" u2="&#xf3;" k="10" />
-<hkern u1="&#x2e;" u2="&#xf2;" k="10" />
-<hkern u1="&#x2e;" u2="&#xe7;" k="10" />
-<hkern u1="&#x2e;" u2="&#xdf;" k="5" />
-<hkern u1="&#x2e;" u2="&#xdd;" k="80" />
-<hkern u1="&#x2e;" u2="&#xdc;" k="6" />
-<hkern u1="&#x2e;" u2="&#xdb;" k="6" />
-<hkern u1="&#x2e;" u2="&#xda;" k="6" />
-<hkern u1="&#x2e;" u2="&#xd9;" k="6" />
-<hkern u1="&#x2e;" u2="&#xd8;" k="10" />
-<hkern u1="&#x2e;" u2="&#xd6;" k="10" />
-<hkern u1="&#x2e;" u2="&#xd5;" k="10" />
-<hkern u1="&#x2e;" u2="&#xd4;" k="10" />
-<hkern u1="&#x2e;" u2="&#xd3;" k="10" />
-<hkern u1="&#x2e;" u2="&#xd2;" k="10" />
-<hkern u1="&#x2e;" u2="&#xc7;" k="10" />
-<hkern u1="&#x2e;" u2="y" k="80" />
-<hkern u1="&#x2e;" u2="w" k="40" />
-<hkern u1="&#x2e;" u2="v" k="60" />
-<hkern u1="&#x2e;" u2="u" k="6" />
-<hkern u1="&#x2e;" u2="t" k="60" />
-<hkern u1="&#x2e;" u2="s" k="5" />
-<hkern u1="&#x2e;" u2="q" k="10" />
-<hkern u1="&#x2e;" u2="o" k="10" />
-<hkern u1="&#x2e;" u2="g" k="10" />
-<hkern u1="&#x2e;" u2="c" k="10" />
-<hkern u1="&#x2e;" u2="Y" k="80" />
-<hkern u1="&#x2e;" u2="W" k="40" />
-<hkern u1="&#x2e;" u2="V" k="60" />
-<hkern u1="&#x2e;" u2="U" k="6" />
-<hkern u1="&#x2e;" u2="T" k="60" />
-<hkern u1="&#x2e;" u2="S" k="5" />
-<hkern u1="&#x2e;" u2="Q" k="10" />
-<hkern u1="&#x2e;" u2="O" k="10" />
-<hkern u1="&#x2e;" u2="G" k="10" />
-<hkern u1="&#x2e;" u2="C" k="10" />
-<hkern u1="&#x2f;" u2="&#x2f;" k="180" />
-<hkern u1="&#x3a;" u2="&#x178;" k="20" />
-<hkern u1="&#x3a;" u2="&#xff;" k="20" />
-<hkern u1="&#x3a;" u2="&#xfd;" k="20" />
-<hkern u1="&#x3a;" u2="&#xdd;" k="20" />
-<hkern u1="&#x3a;" u2="y" k="20" />
-<hkern u1="&#x3a;" u2="t" k="35" />
-<hkern u1="&#x3a;" u2="Y" k="20" />
-<hkern u1="&#x3a;" u2="T" k="35" />
-<hkern u1="&#x3b;" u2="&#x178;" k="20" />
-<hkern u1="&#x3b;" u2="&#xff;" k="20" />
-<hkern u1="&#x3b;" u2="&#xfd;" k="20" />
-<hkern u1="&#x3b;" u2="&#xdd;" k="20" />
-<hkern u1="&#x3b;" u2="y" k="20" />
-<hkern u1="&#x3b;" u2="t" k="35" />
-<hkern u1="&#x3b;" u2="Y" k="20" />
-<hkern u1="&#x3b;" u2="T" k="35" />
-<hkern u1="A" u2="&#x201d;" k="60" />
-<hkern u1="A" u2="&#x201c;" k="60" />
-<hkern u1="A" u2="&#x2019;" k="60" />
-<hkern u1="A" u2="&#x2018;" k="60" />
-<hkern u1="A" u2="&#x153;" k="1" />
-<hkern u1="A" u2="&#x152;" k="1" />
-<hkern u1="A" u2="v" k="25" />
-<hkern u1="A" u2="q" k="1" />
-<hkern u1="A" u2="V" k="25" />
-<hkern u1="A" u2="Q" k="1" />
-<hkern u1="A" u2="&#x3f;" k="30" />
-<hkern u1="B" u2="&#x2026;" k="5" />
-<hkern u1="B" u2="&#x201e;" k="5" />
-<hkern u1="B" u2="&#x201d;" k="10" />
-<hkern u1="B" u2="&#x201c;" k="10" />
-<hkern u1="B" u2="&#x201a;" k="5" />
-<hkern u1="B" u2="&#x2019;" k="10" />
-<hkern u1="B" u2="&#x2018;" k="10" />
-<hkern u1="B" u2="x" k="3" />
-<hkern u1="B" u2="v" k="4" />
-<hkern u1="B" u2="X" k="3" />
-<hkern u1="B" u2="V" k="4" />
-<hkern u1="B" u2="&#x2e;" k="5" />
-<hkern u1="B" u2="&#x2c;" k="5" />
-<hkern u1="C" u2="&#x2026;" k="6" />
-<hkern u1="C" u2="&#x201e;" k="6" />
-<hkern u1="C" u2="&#x201d;" k="6" />
-<hkern u1="C" u2="&#x201c;" k="6" />
-<hkern u1="C" u2="&#x201a;" k="6" />
-<hkern u1="C" u2="&#x2019;" k="6" />
-<hkern u1="C" u2="&#x2018;" k="6" />
-<hkern u1="C" u2="x" k="11" />
-<hkern u1="C" u2="X" k="11" />
-<hkern u1="C" u2="&#x2e;" k="6" />
-<hkern u1="C" u2="&#x2c;" k="6" />
-<hkern u1="D" u2="&#x2026;" k="10" />
-<hkern u1="D" u2="&#x201e;" k="10" />
-<hkern u1="D" u2="&#x201d;" k="10" />
-<hkern u1="D" u2="&#x201c;" k="10" />
-<hkern u1="D" u2="&#x201a;" k="10" />
-<hkern u1="D" u2="&#x2019;" k="10" />
-<hkern u1="D" u2="&#x2018;" k="10" />
-<hkern u1="D" u2="x" k="15" />
-<hkern u1="D" u2="v" k="1" />
-<hkern u1="D" u2="X" k="15" />
-<hkern u1="D" u2="V" k="1" />
-<hkern u1="D" u2="&#x2e;" k="10" />
-<hkern u1="D" u2="&#x2c;" k="10" />
-<hkern u1="F" u2="&#x2026;" k="70" />
-<hkern u1="F" u2="&#x201e;" k="70" />
-<hkern u1="F" u2="&#x201a;" k="70" />
-<hkern u1="F" u2="&#x7d;" k="-5" />
-<hkern u1="F" u2="]" k="-5" />
-<hkern u1="F" u2="&#x2e;" k="70" />
-<hkern u1="F" u2="&#x2c;" k="70" />
-<hkern u1="F" u2="&#x29;" k="-5" />
-<hkern u1="G" u2="&#x2026;" k="10" />
-<hkern u1="G" u2="&#x201e;" k="10" />
-<hkern u1="G" u2="&#x201d;" k="10" />
-<hkern u1="G" u2="&#x201c;" k="10" />
-<hkern u1="G" u2="&#x201a;" k="10" />
-<hkern u1="G" u2="&#x2019;" k="10" />
-<hkern u1="G" u2="&#x2018;" k="10" />
-<hkern u1="G" u2="x" k="15" />
-<hkern u1="G" u2="v" k="1" />
-<hkern u1="G" u2="X" k="15" />
-<hkern u1="G" u2="V" k="1" />
-<hkern u1="G" u2="&#x2e;" k="10" />
-<hkern u1="G" u2="&#x2c;" k="10" />
-<hkern u1="J" u2="&#x2026;" k="6" />
-<hkern u1="J" u2="&#x201e;" k="6" />
-<hkern u1="J" u2="&#x201a;" k="6" />
-<hkern u1="J" u2="&#x2e;" k="6" />
-<hkern u1="J" u2="&#x2c;" k="6" />
-<hkern u1="K" u2="&#x153;" k="7" />
-<hkern u1="K" u2="&#x152;" k="7" />
-<hkern u1="K" u2="q" k="7" />
-<hkern u1="K" u2="Q" k="7" />
-<hkern u1="L" u2="&#x201d;" k="75" />
-<hkern u1="L" u2="&#x201c;" k="75" />
-<hkern u1="L" u2="&#x2019;" k="75" />
-<hkern u1="L" u2="&#x2018;" k="75" />
-<hkern u1="L" u2="&#x7d;" k="-8" />
-<hkern u1="L" u2="v" k="33" />
-<hkern u1="L" u2="]" k="-8" />
-<hkern u1="L" u2="V" k="33" />
-<hkern u1="L" u2="&#x3f;" k="30" />
-<hkern u1="L" u2="&#x29;" k="-8" />
-<hkern u1="O" u2="&#x2026;" k="10" />
-<hkern u1="O" u2="&#x201e;" k="10" />
-<hkern u1="O" u2="&#x201d;" k="10" />
-<hkern u1="O" u2="&#x201c;" k="10" />
-<hkern u1="O" u2="&#x201a;" k="10" />
-<hkern u1="O" u2="&#x2019;" k="10" />
-<hkern u1="O" u2="&#x2018;" k="10" />
-<hkern u1="O" u2="x" k="15" />
-<hkern u1="O" u2="v" k="1" />
-<hkern u1="O" u2="X" k="15" />
-<hkern u1="O" u2="V" k="1" />
-<hkern u1="O" u2="&#x2e;" k="10" />
-<hkern u1="O" u2="&#x2c;" k="10" />
-<hkern u1="P" u2="&#x2026;" k="80" />
-<hkern u1="P" u2="&#x201e;" k="80" />
-<hkern u1="P" u2="&#x201a;" k="80" />
-<hkern u1="P" u2="x" k="11" />
-<hkern u1="P" u2="X" k="11" />
-<hkern u1="P" u2="&#x2e;" k="80" />
-<hkern u1="P" u2="&#x2c;" k="80" />
-<hkern u1="Q" u2="&#x201d;" k="10" />
-<hkern u1="Q" u2="&#x201c;" k="10" />
-<hkern u1="Q" u2="&#x2019;" k="10" />
-<hkern u1="Q" u2="&#x2018;" k="10" />
-<hkern u1="Q" u2="&#x178;" k="13" />
-<hkern u1="Q" u2="&#xff;" k="13" />
-<hkern u1="Q" u2="&#xfd;" k="13" />
-<hkern u1="Q" u2="&#xdd;" k="13" />
-<hkern u1="Q" u2="y" k="13" />
-<hkern u1="Q" u2="v" k="1" />
-<hkern u1="Q" u2="Y" k="13" />
-<hkern u1="Q" u2="V" k="1" />
-<hkern u1="R" u2="v" k="2" />
-<hkern u1="R" u2="V" k="2" />
-<hkern u1="S" u2="&#x2026;" k="5" />
-<hkern u1="S" u2="&#x201e;" k="5" />
-<hkern u1="S" u2="&#x201d;" k="5" />
-<hkern u1="S" u2="&#x201c;" k="5" />
-<hkern u1="S" u2="&#x201a;" k="5" />
-<hkern u1="S" u2="&#x2019;" k="5" />
-<hkern u1="S" u2="&#x2018;" k="5" />
-<hkern u1="S" u2="x" k="8" />
-<hkern u1="S" u2="v" k="1" />
-<hkern u1="S" u2="X" k="8" />
-<hkern u1="S" u2="V" k="1" />
-<hkern u1="S" u2="&#x2e;" k="5" />
-<hkern u1="S" u2="&#x2c;" k="5" />
-<hkern u1="T" u2="&#x2026;" k="60" />
-<hkern u1="T" u2="&#x201e;" k="60" />
-<hkern u1="T" u2="&#x201a;" k="60" />
-<hkern u1="T" u2="&#x7d;" k="-8" />
-<hkern u1="T" u2="]" k="-8" />
-<hkern u1="T" u2="&#x3b;" k="35" />
-<hkern u1="T" u2="&#x3a;" k="35" />
-<hkern u1="T" u2="&#x2e;" k="60" />
-<hkern u1="T" u2="&#x2c;" k="60" />
-<hkern u1="T" u2="&#x29;" k="-8" />
-<hkern u1="U" u2="&#x2026;" k="6" />
-<hkern u1="U" u2="&#x201e;" k="6" />
-<hkern u1="U" u2="&#x201a;" k="6" />
-<hkern u1="U" u2="&#x2e;" k="6" />
-<hkern u1="U" u2="&#x2c;" k="6" />
-<hkern u1="V" u2="&#x2026;" k="60" />
-<hkern u1="V" u2="&#x201e;" k="60" />
-<hkern u1="V" u2="&#x201a;" k="60" />
-<hkern u1="V" u2="&#x153;" k="1" />
-<hkern u1="V" u2="&#x152;" k="1" />
-<hkern u1="V" u2="&#xf8;" k="1" />
-<hkern u1="V" u2="&#xf6;" k="1" />
-<hkern u1="V" u2="&#xf5;" k="1" />
-<hkern u1="V" u2="&#xf4;" k="1" />
-<hkern u1="V" u2="&#xf3;" k="1" />
-<hkern u1="V" u2="&#xf2;" k="1" />
-<hkern u1="V" u2="&#xe7;" k="1" />
-<hkern u1="V" u2="&#xe6;" k="46" />
-<hkern u1="V" u2="&#xe5;" k="25" />
-<hkern u1="V" u2="&#xe4;" k="25" />
-<hkern u1="V" u2="&#xe3;" k="25" />
-<hkern u1="V" u2="&#xe2;" k="25" />
-<hkern u1="V" u2="&#xe1;" k="25" />
-<hkern u1="V" u2="&#xe0;" k="25" />
-<hkern u1="V" u2="&#xd8;" k="1" />
-<hkern u1="V" u2="&#xd6;" k="1" />
-<hkern u1="V" u2="&#xd5;" k="1" />
-<hkern u1="V" u2="&#xd4;" k="1" />
-<hkern u1="V" u2="&#xd3;" k="1" />
-<hkern u1="V" u2="&#xd2;" k="1" />
-<hkern u1="V" u2="&#xc7;" k="1" />
-<hkern u1="V" u2="&#xc6;" k="46" />
-<hkern u1="V" u2="&#xc5;" k="25" />
-<hkern u1="V" u2="&#xc4;" k="25" />
-<hkern u1="V" u2="&#xc3;" k="25" />
-<hkern u1="V" u2="&#xc2;" k="25" />
-<hkern u1="V" u2="&#xc1;" k="25" />
-<hkern u1="V" u2="&#xc0;" k="25" />
-<hkern u1="V" u2="&#xad;" k="10" />
-<hkern u1="V" u2="&#x7d;" k="-3" />
-<hkern u1="V" u2="q" k="1" />
-<hkern u1="V" u2="o" k="1" />
-<hkern u1="V" u2="j" k="25" />
-<hkern u1="V" u2="g" k="1" />
-<hkern u1="V" u2="c" k="1" />
-<hkern u1="V" u2="a" k="25" />
-<hkern u1="V" u2="]" k="-3" />
-<hkern u1="V" u2="Q" k="1" />
-<hkern u1="V" u2="O" k="1" />
-<hkern u1="V" u2="J" k="25" />
-<hkern u1="V" u2="G" k="1" />
-<hkern u1="V" u2="C" k="1" />
-<hkern u1="V" u2="A" k="25" />
-<hkern u1="V" u2="&#x2e;" k="60" />
-<hkern u1="V" u2="&#x2d;" k="10" />
-<hkern u1="V" u2="&#x2c;" k="60" />
-<hkern u1="V" u2="&#x29;" k="-3" />
-<hkern u1="W" u2="&#x2026;" k="40" />
-<hkern u1="W" u2="&#x201e;" k="40" />
-<hkern u1="W" u2="&#x201a;" k="40" />
-<hkern u1="W" u2="&#x7d;" k="-3" />
-<hkern u1="W" u2="]" k="-3" />
-<hkern u1="W" u2="&#x2e;" k="40" />
-<hkern u1="W" u2="&#x2c;" k="40" />
-<hkern u1="W" u2="&#x29;" k="-3" />
-<hkern u1="X" u2="&#x201d;" k="2" />
-<hkern u1="X" u2="&#x201c;" k="2" />
-<hkern u1="X" u2="&#x2019;" k="2" />
-<hkern u1="X" u2="&#x2018;" k="2" />
-<hkern u1="X" u2="&#x153;" k="15" />
-<hkern u1="X" u2="&#x152;" k="15" />
-<hkern u1="X" u2="&#xf8;" k="15" />
-<hkern u1="X" u2="&#xf6;" k="15" />
-<hkern u1="X" u2="&#xf5;" k="15" />
-<hkern u1="X" u2="&#xf4;" k="15" />
-<hkern u1="X" u2="&#xf3;" k="15" />
-<hkern u1="X" u2="&#xf2;" k="15" />
-<hkern u1="X" u2="&#xe7;" k="15" />
-<hkern u1="X" u2="&#xdf;" k="8" />
-<hkern u1="X" u2="&#xd8;" k="15" />
-<hkern u1="X" u2="&#xd6;" k="15" />
-<hkern u1="X" u2="&#xd5;" k="15" />
-<hkern u1="X" u2="&#xd4;" k="15" />
-<hkern u1="X" u2="&#xd3;" k="15" />
-<hkern u1="X" u2="&#xd2;" k="15" />
-<hkern u1="X" u2="&#xc7;" k="15" />
-<hkern u1="X" u2="&#xad;" k="15" />
-<hkern u1="X" u2="s" k="8" />
-<hkern u1="X" u2="q" k="15" />
-<hkern u1="X" u2="o" k="15" />
-<hkern u1="X" u2="g" k="15" />
-<hkern u1="X" u2="c" k="15" />
-<hkern u1="X" u2="S" k="8" />
-<hkern u1="X" u2="Q" k="15" />
-<hkern u1="X" u2="O" k="15" />
-<hkern u1="X" u2="G" k="15" />
-<hkern u1="X" u2="C" k="15" />
-<hkern u1="X" u2="&#x2d;" k="15" />
-<hkern u1="Y" u2="&#x2026;" k="80" />
-<hkern u1="Y" u2="&#x201e;" k="80" />
-<hkern u1="Y" u2="&#x201a;" k="80" />
-<hkern u1="Y" u2="&#x153;" k="15" />
-<hkern u1="Y" u2="&#x152;" k="15" />
-<hkern u1="Y" u2="&#x7d;" k="-5" />
-<hkern u1="Y" u2="q" k="15" />
-<hkern u1="Y" u2="]" k="-5" />
-<hkern u1="Y" u2="Q" k="15" />
-<hkern u1="Y" u2="&#x3b;" k="20" />
-<hkern u1="Y" u2="&#x3a;" k="20" />
-<hkern u1="Y" u2="&#x2e;" k="80" />
-<hkern u1="Y" u2="&#x2c;" k="80" />
-<hkern u1="Y" u2="&#x29;" k="-5" />
-<hkern u1="[" u2="&#x178;" k="-5" />
-<hkern u1="[" u2="&#xff;" k="-5" />
-<hkern u1="[" u2="&#xfd;" k="-5" />
-<hkern u1="[" u2="&#xdd;" k="-5" />
-<hkern u1="[" u2="y" k="-5" />
-<hkern u1="[" u2="w" k="-3" />
-<hkern u1="[" u2="v" k="-3" />
-<hkern u1="[" u2="t" k="-8" />
-<hkern u1="[" u2="Y" k="-5" />
-<hkern u1="[" u2="W" k="-3" />
-<hkern u1="[" u2="V" k="-3" />
-<hkern u1="[" u2="T" k="-8" />
-<hkern u1="a" u2="&#x201d;" k="60" />
-<hkern u1="a" u2="&#x201c;" k="60" />
-<hkern u1="a" u2="&#x2019;" k="60" />
-<hkern u1="a" u2="&#x2018;" k="60" />
-<hkern u1="a" u2="&#x153;" k="1" />
-<hkern u1="a" u2="&#x152;" k="1" />
-<hkern u1="a" u2="v" k="25" />
-<hkern u1="a" u2="q" k="1" />
-<hkern u1="a" u2="V" k="25" />
-<hkern u1="a" u2="Q" k="1" />
-<hkern u1="a" u2="&#x3f;" k="30" />
-<hkern u1="b" u2="&#x2026;" k="5" />
-<hkern u1="b" u2="&#x201e;" k="5" />
-<hkern u1="b" u2="&#x201d;" k="10" />
-<hkern u1="b" u2="&#x201c;" k="10" />
-<hkern u1="b" u2="&#x201a;" k="5" />
-<hkern u1="b" u2="&#x2019;" k="10" />
-<hkern u1="b" u2="&#x2018;" k="10" />
-<hkern u1="b" u2="x" k="3" />
-<hkern u1="b" u2="v" k="4" />
-<hkern u1="b" u2="X" k="3" />
-<hkern u1="b" u2="V" k="4" />
-<hkern u1="b" u2="&#x2e;" k="5" />
-<hkern u1="b" u2="&#x2c;" k="5" />
-<hkern u1="c" u2="&#x2026;" k="6" />
-<hkern u1="c" u2="&#x201e;" k="6" />
-<hkern u1="c" u2="&#x201d;" k="6" />
-<hkern u1="c" u2="&#x201c;" k="6" />
-<hkern u1="c" u2="&#x201a;" k="6" />
-<hkern u1="c" u2="&#x2019;" k="6" />
-<hkern u1="c" u2="&#x2018;" k="6" />
-<hkern u1="c" u2="x" k="11" />
-<hkern u1="c" u2="X" k="11" />
-<hkern u1="c" u2="&#x2e;" k="6" />
-<hkern u1="c" u2="&#x2c;" k="6" />
-<hkern u1="d" u2="&#x2026;" k="10" />
-<hkern u1="d" u2="&#x201e;" k="10" />
-<hkern u1="d" u2="&#x201d;" k="10" />
-<hkern u1="d" u2="&#x201c;" k="10" />
-<hkern u1="d" u2="&#x201a;" k="10" />
-<hkern u1="d" u2="&#x2019;" k="10" />
-<hkern u1="d" u2="&#x2018;" k="10" />
-<hkern u1="d" u2="x" k="15" />
-<hkern u1="d" u2="v" k="1" />
-<hkern u1="d" u2="X" k="15" />
-<hkern u1="d" u2="V" k="1" />
-<hkern u1="d" u2="&#x2e;" k="10" />
-<hkern u1="d" u2="&#x2c;" k="10" />
-<hkern u1="f" u2="&#x2026;" k="70" />
-<hkern u1="f" u2="&#x201e;" k="70" />
-<hkern u1="f" u2="&#x201a;" k="70" />
-<hkern u1="f" u2="&#x7d;" k="-5" />
-<hkern u1="f" u2="]" k="-5" />
-<hkern u1="f" u2="&#x2e;" k="70" />
-<hkern u1="f" u2="&#x2c;" k="70" />
-<hkern u1="f" u2="&#x29;" k="-5" />
-<hkern u1="g" u2="&#x2026;" k="10" />
-<hkern u1="g" u2="&#x201e;" k="10" />
-<hkern u1="g" u2="&#x201d;" k="10" />
-<hkern u1="g" u2="&#x201c;" k="10" />
-<hkern u1="g" u2="&#x201a;" k="10" />
-<hkern u1="g" u2="&#x2019;" k="10" />
-<hkern u1="g" u2="&#x2018;" k="10" />
-<hkern u1="g" u2="x" k="15" />
-<hkern u1="g" u2="v" k="1" />
-<hkern u1="g" u2="X" k="15" />
-<hkern u1="g" u2="V" k="1" />
-<hkern u1="g" u2="&#x2e;" k="10" />
-<hkern u1="g" u2="&#x2c;" k="10" />
-<hkern u1="j" u2="&#x2026;" k="6" />
-<hkern u1="j" u2="&#x201e;" k="6" />
-<hkern u1="j" u2="&#x201a;" k="6" />
-<hkern u1="j" u2="&#x2e;" k="6" />
-<hkern u1="j" u2="&#x2c;" k="6" />
-<hkern u1="k" u2="&#x153;" k="7" />
-<hkern u1="k" u2="&#x152;" k="7" />
-<hkern u1="k" u2="q" k="7" />
-<hkern u1="k" u2="Q" k="7" />
-<hkern u1="l" u2="&#x201d;" k="75" />
-<hkern u1="l" u2="&#x201c;" k="75" />
-<hkern u1="l" u2="&#x2019;" k="75" />
-<hkern u1="l" u2="&#x2018;" k="75" />
-<hkern u1="l" u2="&#x7d;" k="-8" />
-<hkern u1="l" u2="v" k="33" />
-<hkern u1="l" u2="]" k="-8" />
-<hkern u1="l" u2="V" k="33" />
-<hkern u1="l" u2="&#x3f;" k="30" />
-<hkern u1="l" u2="&#x29;" k="-8" />
-<hkern u1="o" u2="&#x2026;" k="10" />
-<hkern u1="o" u2="&#x201e;" k="10" />
-<hkern u1="o" u2="&#x201d;" k="10" />
-<hkern u1="o" u2="&#x201c;" k="10" />
-<hkern u1="o" u2="&#x201a;" k="10" />
-<hkern u1="o" u2="&#x2019;" k="10" />
-<hkern u1="o" u2="&#x2018;" k="10" />
-<hkern u1="o" u2="x" k="15" />
-<hkern u1="o" u2="v" k="1" />
-<hkern u1="o" u2="X" k="15" />
-<hkern u1="o" u2="V" k="1" />
-<hkern u1="o" u2="&#x2e;" k="10" />
-<hkern u1="o" u2="&#x2c;" k="10" />
-<hkern u1="p" u2="&#x2026;" k="80" />
-<hkern u1="p" u2="&#x201e;" k="80" />
-<hkern u1="p" u2="&#x201a;" k="80" />
-<hkern u1="p" u2="x" k="11" />
-<hkern u1="p" u2="X" k="11" />
-<hkern u1="p" u2="&#x2e;" k="80" />
-<hkern u1="p" u2="&#x2c;" k="80" />
-<hkern u1="q" u2="&#x201d;" k="10" />
-<hkern u1="q" u2="&#x201c;" k="10" />
-<hkern u1="q" u2="&#x2019;" k="10" />
-<hkern u1="q" u2="&#x2018;" k="10" />
-<hkern u1="q" u2="&#x178;" k="13" />
-<hkern u1="q" u2="&#xff;" k="13" />
-<hkern u1="q" u2="&#xfd;" k="13" />
-<hkern u1="q" u2="&#xdd;" k="13" />
-<hkern u1="q" u2="y" k="13" />
-<hkern u1="q" u2="v" k="1" />
-<hkern u1="q" u2="Y" k="13" />
-<hkern u1="q" u2="V" k="1" />
-<hkern u1="r" u2="v" k="2" />
-<hkern u1="r" u2="V" k="2" />
-<hkern u1="s" u2="&#x2026;" k="5" />
-<hkern u1="s" u2="&#x201e;" k="5" />
-<hkern u1="s" u2="&#x201d;" k="5" />
-<hkern u1="s" u2="&#x201c;" k="5" />
-<hkern u1="s" u2="&#x201a;" k="5" />
-<hkern u1="s" u2="&#x2019;" k="5" />
-<hkern u1="s" u2="&#x2018;" k="5" />
-<hkern u1="s" u2="x" k="8" />
-<hkern u1="s" u2="v" k="1" />
-<hkern u1="s" u2="X" k="8" />
-<hkern u1="s" u2="V" k="1" />
-<hkern u1="s" u2="&#x2e;" k="5" />
-<hkern u1="s" u2="&#x2c;" k="5" />
-<hkern u1="t" u2="&#x2026;" k="60" />
-<hkern u1="t" u2="&#x201e;" k="60" />
-<hkern u1="t" u2="&#x201a;" k="60" />
-<hkern u1="t" u2="&#x7d;" k="-8" />
-<hkern u1="t" u2="]" k="-8" />
-<hkern u1="t" u2="&#x3b;" k="35" />
-<hkern u1="t" u2="&#x3a;" k="35" />
-<hkern u1="t" u2="&#x2e;" k="60" />
-<hkern u1="t" u2="&#x2c;" k="60" />
-<hkern u1="t" u2="&#x29;" k="-8" />
-<hkern u1="u" u2="&#x2026;" k="6" />
-<hkern u1="u" u2="&#x201e;" k="6" />
-<hkern u1="u" u2="&#x201a;" k="6" />
-<hkern u1="u" u2="&#x2e;" k="6" />
-<hkern u1="u" u2="&#x2c;" k="6" />
-<hkern u1="v" u2="&#x2026;" k="60" />
-<hkern u1="v" u2="&#x201e;" k="60" />
-<hkern u1="v" u2="&#x201a;" k="60" />
-<hkern u1="v" u2="&#x153;" k="1" />
-<hkern u1="v" u2="&#x152;" k="1" />
-<hkern u1="v" u2="&#xf8;" k="1" />
-<hkern u1="v" u2="&#xf6;" k="1" />
-<hkern u1="v" u2="&#xf5;" k="1" />
-<hkern u1="v" u2="&#xf4;" k="1" />
-<hkern u1="v" u2="&#xf3;" k="1" />
-<hkern u1="v" u2="&#xf2;" k="1" />
-<hkern u1="v" u2="&#xe7;" k="1" />
-<hkern u1="v" u2="&#xe6;" k="46" />
-<hkern u1="v" u2="&#xe5;" k="25" />
-<hkern u1="v" u2="&#xe4;" k="25" />
-<hkern u1="v" u2="&#xe3;" k="25" />
-<hkern u1="v" u2="&#xe2;" k="25" />
-<hkern u1="v" u2="&#xe1;" k="25" />
-<hkern u1="v" u2="&#xe0;" k="25" />
-<hkern u1="v" u2="&#xd8;" k="1" />
-<hkern u1="v" u2="&#xd6;" k="1" />
-<hkern u1="v" u2="&#xd5;" k="1" />
-<hkern u1="v" u2="&#xd4;" k="1" />
-<hkern u1="v" u2="&#xd3;" k="1" />
-<hkern u1="v" u2="&#xd2;" k="1" />
-<hkern u1="v" u2="&#xc7;" k="1" />
-<hkern u1="v" u2="&#xc6;" k="46" />
-<hkern u1="v" u2="&#xc5;" k="25" />
-<hkern u1="v" u2="&#xc4;" k="25" />
-<hkern u1="v" u2="&#xc3;" k="25" />
-<hkern u1="v" u2="&#xc2;" k="25" />
-<hkern u1="v" u2="&#xc1;" k="25" />
-<hkern u1="v" u2="&#xc0;" k="25" />
-<hkern u1="v" u2="&#xad;" k="10" />
-<hkern u1="v" u2="&#x7d;" k="-3" />
-<hkern u1="v" u2="q" k="1" />
-<hkern u1="v" u2="o" k="1" />
-<hkern u1="v" u2="j" k="25" />
-<hkern u1="v" u2="g" k="1" />
-<hkern u1="v" u2="c" k="1" />
-<hkern u1="v" u2="a" k="25" />
-<hkern u1="v" u2="]" k="-3" />
-<hkern u1="v" u2="Q" k="1" />
-<hkern u1="v" u2="O" k="1" />
-<hkern u1="v" u2="J" k="25" />
-<hkern u1="v" u2="G" k="1" />
-<hkern u1="v" u2="C" k="1" />
-<hkern u1="v" u2="A" k="25" />
-<hkern u1="v" u2="&#x2e;" k="60" />
-<hkern u1="v" u2="&#x2d;" k="10" />
-<hkern u1="v" u2="&#x2c;" k="60" />
-<hkern u1="v" u2="&#x29;" k="-3" />
-<hkern u1="w" u2="&#x2026;" k="40" />
-<hkern u1="w" u2="&#x201e;" k="40" />
-<hkern u1="w" u2="&#x201a;" k="40" />
-<hkern u1="w" u2="&#x7d;" k="-3" />
-<hkern u1="w" u2="]" k="-3" />
-<hkern u1="w" u2="&#x2e;" k="40" />
-<hkern u1="w" u2="&#x2c;" k="40" />
-<hkern u1="w" u2="&#x29;" k="-3" />
-<hkern u1="x" u2="&#x201d;" k="2" />
-<hkern u1="x" u2="&#x201c;" k="2" />
-<hkern u1="x" u2="&#x2019;" k="2" />
-<hkern u1="x" u2="&#x2018;" k="2" />
-<hkern u1="x" u2="&#x153;" k="15" />
-<hkern u1="x" u2="&#x152;" k="15" />
-<hkern u1="x" u2="&#xf8;" k="15" />
-<hkern u1="x" u2="&#xf6;" k="15" />
-<hkern u1="x" u2="&#xf5;" k="15" />
-<hkern u1="x" u2="&#xf4;" k="15" />
-<hkern u1="x" u2="&#xf3;" k="15" />
-<hkern u1="x" u2="&#xf2;" k="15" />
-<hkern u1="x" u2="&#xe7;" k="15" />
-<hkern u1="x" u2="&#xdf;" k="8" />
-<hkern u1="x" u2="&#xd8;" k="15" />
-<hkern u1="x" u2="&#xd6;" k="15" />
-<hkern u1="x" u2="&#xd5;" k="15" />
-<hkern u1="x" u2="&#xd4;" k="15" />
-<hkern u1="x" u2="&#xd3;" k="15" />
-<hkern u1="x" u2="&#xd2;" k="15" />
-<hkern u1="x" u2="&#xc7;" k="15" />
-<hkern u1="x" u2="&#xad;" k="15" />
-<hkern u1="x" u2="s" k="8" />
-<hkern u1="x" u2="q" k="15" />
-<hkern u1="x" u2="o" k="15" />
-<hkern u1="x" u2="g" k="15" />
-<hkern u1="x" u2="c" k="15" />
-<hkern u1="x" u2="S" k="8" />
-<hkern u1="x" u2="Q" k="15" />
-<hkern u1="x" u2="O" k="15" />
-<hkern u1="x" u2="G" k="15" />
-<hkern u1="x" u2="C" k="15" />
-<hkern u1="x" u2="&#x2d;" k="15" />
-<hkern u1="y" u2="&#x2026;" k="80" />
-<hkern u1="y" u2="&#x201e;" k="80" />
-<hkern u1="y" u2="&#x201a;" k="80" />
-<hkern u1="y" u2="&#x153;" k="15" />
-<hkern u1="y" u2="&#x152;" k="15" />
-<hkern u1="y" u2="&#x7d;" k="-5" />
-<hkern u1="y" u2="q" k="15" />
-<hkern u1="y" u2="]" k="-5" />
-<hkern u1="y" u2="Q" k="15" />
-<hkern u1="y" u2="&#x3b;" k="20" />
-<hkern u1="y" u2="&#x3a;" k="20" />
-<hkern u1="y" u2="&#x2e;" k="80" />
-<hkern u1="y" u2="&#x2c;" k="80" />
-<hkern u1="y" u2="&#x29;" k="-5" />
-<hkern u1="&#x7b;" u2="&#x178;" k="-5" />
-<hkern u1="&#x7b;" u2="&#xff;" k="-5" />
-<hkern u1="&#x7b;" u2="&#xfd;" k="-5" />
-<hkern u1="&#x7b;" u2="&#xdd;" k="-5" />
-<hkern u1="&#x7b;" u2="y" k="-5" />
-<hkern u1="&#x7b;" u2="w" k="-3" />
-<hkern u1="&#x7b;" u2="v" k="-3" />
-<hkern u1="&#x7b;" u2="t" k="-8" />
-<hkern u1="&#x7b;" u2="Y" k="-5" />
-<hkern u1="&#x7b;" u2="W" k="-3" />
-<hkern u1="&#x7b;" u2="V" k="-3" />
-<hkern u1="&#x7b;" u2="T" k="-8" />
-<hkern u1="&#xad;" u2="x" k="15" />
-<hkern u1="&#xad;" u2="v" k="10" />
-<hkern u1="&#xad;" u2="X" k="15" />
-<hkern u1="&#xad;" u2="V" k="10" />
-<hkern u1="&#xbf;" u2="&#x178;" k="30" />
-<hkern u1="&#xbf;" u2="&#xff;" k="30" />
-<hkern u1="&#xbf;" u2="&#xfd;" k="30" />
-<hkern u1="&#xbf;" u2="&#xdd;" k="30" />
-<hkern u1="&#xbf;" u2="y" k="30" />
-<hkern u1="&#xbf;" u2="w" k="20" />
-<hkern u1="&#xbf;" u2="v" k="30" />
-<hkern u1="&#xbf;" u2="t" k="42" />
-<hkern u1="&#xbf;" u2="Y" k="30" />
-<hkern u1="&#xbf;" u2="W" k="20" />
-<hkern u1="&#xbf;" u2="V" k="30" />
-<hkern u1="&#xbf;" u2="T" k="42" />
-<hkern u1="&#xc0;" u2="&#x201d;" k="60" />
-<hkern u1="&#xc0;" u2="&#x201c;" k="60" />
-<hkern u1="&#xc0;" u2="&#x2019;" k="60" />
-<hkern u1="&#xc0;" u2="&#x2018;" k="60" />
-<hkern u1="&#xc0;" u2="&#x153;" k="1" />
-<hkern u1="&#xc0;" u2="&#x152;" k="1" />
-<hkern u1="&#xc0;" u2="v" k="25" />
-<hkern u1="&#xc0;" u2="q" k="1" />
-<hkern u1="&#xc0;" u2="V" k="25" />
-<hkern u1="&#xc0;" u2="Q" k="1" />
-<hkern u1="&#xc0;" u2="&#x3f;" k="30" />
-<hkern u1="&#xc1;" u2="&#x201d;" k="60" />
-<hkern u1="&#xc1;" u2="&#x201c;" k="60" />
-<hkern u1="&#xc1;" u2="&#x2019;" k="60" />
-<hkern u1="&#xc1;" u2="&#x2018;" k="60" />
-<hkern u1="&#xc1;" u2="&#x153;" k="1" />
-<hkern u1="&#xc1;" u2="&#x152;" k="1" />
-<hkern u1="&#xc1;" u2="v" k="25" />
-<hkern u1="&#xc1;" u2="q" k="1" />
-<hkern u1="&#xc1;" u2="V" k="25" />
-<hkern u1="&#xc1;" u2="Q" k="1" />
-<hkern u1="&#xc1;" u2="&#x3f;" k="30" />
-<hkern u1="&#xc2;" u2="&#x201d;" k="60" />
-<hkern u1="&#xc2;" u2="&#x201c;" k="60" />
-<hkern u1="&#xc2;" u2="&#x2019;" k="60" />
-<hkern u1="&#xc2;" u2="&#x2018;" k="60" />
-<hkern u1="&#xc2;" u2="&#x153;" k="1" />
-<hkern u1="&#xc2;" u2="&#x152;" k="1" />
-<hkern u1="&#xc2;" u2="v" k="25" />
-<hkern u1="&#xc2;" u2="q" k="1" />
-<hkern u1="&#xc2;" u2="V" k="25" />
-<hkern u1="&#xc2;" u2="Q" k="1" />
-<hkern u1="&#xc2;" u2="&#x3f;" k="30" />
-<hkern u1="&#xc3;" u2="&#x201d;" k="60" />
-<hkern u1="&#xc3;" u2="&#x201c;" k="60" />
-<hkern u1="&#xc3;" u2="&#x2019;" k="60" />
-<hkern u1="&#xc3;" u2="&#x2018;" k="60" />
-<hkern u1="&#xc3;" u2="&#x153;" k="1" />
-<hkern u1="&#xc3;" u2="&#x152;" k="1" />
-<hkern u1="&#xc3;" u2="v" k="25" />
-<hkern u1="&#xc3;" u2="q" k="1" />
-<hkern u1="&#xc3;" u2="V" k="25" />
-<hkern u1="&#xc3;" u2="Q" k="1" />
-<hkern u1="&#xc3;" u2="&#x3f;" k="30" />
-<hkern u1="&#xc4;" u2="&#x201d;" k="60" />
-<hkern u1="&#xc4;" u2="&#x201c;" k="60" />
-<hkern u1="&#xc4;" u2="&#x2019;" k="60" />
-<hkern u1="&#xc4;" u2="&#x2018;" k="60" />
-<hkern u1="&#xc4;" u2="&#x153;" k="1" />
-<hkern u1="&#xc4;" u2="&#x152;" k="1" />
-<hkern u1="&#xc4;" u2="v" k="25" />
-<hkern u1="&#xc4;" u2="q" k="1" />
-<hkern u1="&#xc4;" u2="V" k="25" />
-<hkern u1="&#xc4;" u2="Q" k="1" />
-<hkern u1="&#xc4;" u2="&#x3f;" k="30" />
-<hkern u1="&#xc5;" u2="&#x201d;" k="60" />
-<hkern u1="&#xc5;" u2="&#x201c;" k="60" />
-<hkern u1="&#xc5;" u2="&#x2019;" k="60" />
-<hkern u1="&#xc5;" u2="&#x2018;" k="60" />
-<hkern u1="&#xc5;" u2="&#x153;" k="1" />
-<hkern u1="&#xc5;" u2="&#x152;" k="1" />
-<hkern u1="&#xc5;" u2="v" k="25" />
-<hkern u1="&#xc5;" u2="q" k="1" />
-<hkern u1="&#xc5;" u2="V" k="25" />
-<hkern u1="&#xc5;" u2="Q" k="1" />
-<hkern u1="&#xc5;" u2="&#x3f;" k="30" />
-<hkern u1="&#xc7;" u2="&#x2026;" k="6" />
-<hkern u1="&#xc7;" u2="&#x201e;" k="6" />
-<hkern u1="&#xc7;" u2="&#x201d;" k="6" />
-<hkern u1="&#xc7;" u2="&#x201c;" k="6" />
-<hkern u1="&#xc7;" u2="&#x201a;" k="6" />
-<hkern u1="&#xc7;" u2="&#x2019;" k="6" />
-<hkern u1="&#xc7;" u2="&#x2018;" k="6" />
-<hkern u1="&#xc7;" u2="x" k="11" />
-<hkern u1="&#xc7;" u2="X" k="11" />
-<hkern u1="&#xc7;" u2="&#x2e;" k="6" />
-<hkern u1="&#xc7;" u2="&#x2c;" k="6" />
-<hkern u1="&#xd0;" u2="&#x2026;" k="10" />
-<hkern u1="&#xd0;" u2="&#x201e;" k="10" />
-<hkern u1="&#xd0;" u2="&#x201d;" k="10" />
-<hkern u1="&#xd0;" u2="&#x201c;" k="10" />
-<hkern u1="&#xd0;" u2="&#x201a;" k="10" />
-<hkern u1="&#xd0;" u2="&#x2019;" k="10" />
-<hkern u1="&#xd0;" u2="&#x2018;" k="10" />
-<hkern u1="&#xd0;" u2="x" k="15" />
-<hkern u1="&#xd0;" u2="v" k="1" />
-<hkern u1="&#xd0;" u2="X" k="15" />
-<hkern u1="&#xd0;" u2="V" k="1" />
-<hkern u1="&#xd0;" u2="&#x2e;" k="10" />
-<hkern u1="&#xd0;" u2="&#x2c;" k="10" />
-<hkern u1="&#xd2;" u2="&#x2026;" k="10" />
-<hkern u1="&#xd2;" u2="&#x201e;" k="10" />
-<hkern u1="&#xd2;" u2="&#x201d;" k="10" />
-<hkern u1="&#xd2;" u2="&#x201c;" k="10" />
-<hkern u1="&#xd2;" u2="&#x201a;" k="10" />
-<hkern u1="&#xd2;" u2="&#x2019;" k="10" />
-<hkern u1="&#xd2;" u2="&#x2018;" k="10" />
-<hkern u1="&#xd2;" u2="x" k="15" />
-<hkern u1="&#xd2;" u2="v" k="1" />
-<hkern u1="&#xd2;" u2="X" k="15" />
-<hkern u1="&#xd2;" u2="V" k="1" />
-<hkern u1="&#xd2;" u2="&#x2e;" k="10" />
-<hkern u1="&#xd2;" u2="&#x2c;" k="10" />
-<hkern u1="&#xd3;" u2="&#x2026;" k="10" />
-<hkern u1="&#xd3;" u2="&#x201e;" k="10" />
-<hkern u1="&#xd3;" u2="&#x201d;" k="10" />
-<hkern u1="&#xd3;" u2="&#x201c;" k="10" />
-<hkern u1="&#xd3;" u2="&#x201a;" k="10" />
-<hkern u1="&#xd3;" u2="&#x2019;" k="10" />
-<hkern u1="&#xd3;" u2="&#x2018;" k="10" />
-<hkern u1="&#xd3;" u2="x" k="15" />
-<hkern u1="&#xd3;" u2="v" k="1" />
-<hkern u1="&#xd3;" u2="X" k="15" />
-<hkern u1="&#xd3;" u2="V" k="1" />
-<hkern u1="&#xd3;" u2="&#x2e;" k="10" />
-<hkern u1="&#xd3;" u2="&#x2c;" k="10" />
-<hkern u1="&#xd4;" u2="&#x2026;" k="10" />
-<hkern u1="&#xd4;" u2="&#x201e;" k="10" />
-<hkern u1="&#xd4;" u2="&#x201d;" k="10" />
-<hkern u1="&#xd4;" u2="&#x201c;" k="10" />
-<hkern u1="&#xd4;" u2="&#x201a;" k="10" />
-<hkern u1="&#xd4;" u2="&#x2019;" k="10" />
-<hkern u1="&#xd4;" u2="&#x2018;" k="10" />
-<hkern u1="&#xd4;" u2="x" k="15" />
-<hkern u1="&#xd4;" u2="v" k="1" />
-<hkern u1="&#xd4;" u2="X" k="15" />
-<hkern u1="&#xd4;" u2="V" k="1" />
-<hkern u1="&#xd4;" u2="&#x2e;" k="10" />
-<hkern u1="&#xd4;" u2="&#x2c;" k="10" />
-<hkern u1="&#xd5;" u2="&#x2026;" k="10" />
-<hkern u1="&#xd5;" u2="&#x201e;" k="10" />
-<hkern u1="&#xd5;" u2="&#x201d;" k="10" />
-<hkern u1="&#xd5;" u2="&#x201c;" k="10" />
-<hkern u1="&#xd5;" u2="&#x201a;" k="10" />
-<hkern u1="&#xd5;" u2="&#x2019;" k="10" />
-<hkern u1="&#xd5;" u2="&#x2018;" k="10" />
-<hkern u1="&#xd5;" u2="x" k="15" />
-<hkern u1="&#xd5;" u2="v" k="1" />
-<hkern u1="&#xd5;" u2="X" k="15" />
-<hkern u1="&#xd5;" u2="V" k="1" />
-<hkern u1="&#xd5;" u2="&#x2e;" k="10" />
-<hkern u1="&#xd5;" u2="&#x2c;" k="10" />
-<hkern u1="&#xd6;" u2="&#x2026;" k="10" />
-<hkern u1="&#xd6;" u2="&#x201e;" k="10" />
-<hkern u1="&#xd6;" u2="&#x201d;" k="10" />
-<hkern u1="&#xd6;" u2="&#x201c;" k="10" />
-<hkern u1="&#xd6;" u2="&#x201a;" k="10" />
-<hkern u1="&#xd6;" u2="&#x2019;" k="10" />
-<hkern u1="&#xd6;" u2="&#x2018;" k="10" />
-<hkern u1="&#xd6;" u2="x" k="15" />
-<hkern u1="&#xd6;" u2="v" k="1" />
-<hkern u1="&#xd6;" u2="X" k="15" />
-<hkern u1="&#xd6;" u2="V" k="1" />
-<hkern u1="&#xd6;" u2="&#x2e;" k="10" />
-<hkern u1="&#xd6;" u2="&#x2c;" k="10" />
-<hkern u1="&#xd8;" u2="&#x2026;" k="10" />
-<hkern u1="&#xd8;" u2="&#x201e;" k="10" />
-<hkern u1="&#xd8;" u2="&#x201d;" k="10" />
-<hkern u1="&#xd8;" u2="&#x201c;" k="10" />
-<hkern u1="&#xd8;" u2="&#x201a;" k="10" />
-<hkern u1="&#xd8;" u2="&#x2019;" k="10" />
-<hkern u1="&#xd8;" u2="&#x2018;" k="10" />
-<hkern u1="&#xd8;" u2="x" k="15" />
-<hkern u1="&#xd8;" u2="v" k="1" />
-<hkern u1="&#xd8;" u2="X" k="15" />
-<hkern u1="&#xd8;" u2="V" k="1" />
-<hkern u1="&#xd8;" u2="&#x2e;" k="10" />
-<hkern u1="&#xd8;" u2="&#x2c;" k="10" />
-<hkern u1="&#xd9;" u2="&#x2026;" k="6" />
-<hkern u1="&#xd9;" u2="&#x201e;" k="6" />
-<hkern u1="&#xd9;" u2="&#x201a;" k="6" />
-<hkern u1="&#xd9;" u2="&#x2e;" k="6" />
-<hkern u1="&#xd9;" u2="&#x2c;" k="6" />
-<hkern u1="&#xda;" u2="&#x2026;" k="6" />
-<hkern u1="&#xda;" u2="&#x201e;" k="6" />
-<hkern u1="&#xda;" u2="&#x201a;" k="6" />
-<hkern u1="&#xda;" u2="&#x2e;" k="6" />
-<hkern u1="&#xda;" u2="&#x2c;" k="6" />
-<hkern u1="&#xdb;" u2="&#x2026;" k="6" />
-<hkern u1="&#xdb;" u2="&#x201e;" k="6" />
-<hkern u1="&#xdb;" u2="&#x201a;" k="6" />
-<hkern u1="&#xdb;" u2="&#x2e;" k="6" />
-<hkern u1="&#xdb;" u2="&#x2c;" k="6" />
-<hkern u1="&#xdc;" u2="&#x2026;" k="6" />
-<hkern u1="&#xdc;" u2="&#x201e;" k="6" />
-<hkern u1="&#xdc;" u2="&#x201a;" k="6" />
-<hkern u1="&#xdc;" u2="&#x2e;" k="6" />
-<hkern u1="&#xdc;" u2="&#x2c;" k="6" />
-<hkern u1="&#xdd;" u2="&#x2026;" k="80" />
-<hkern u1="&#xdd;" u2="&#x201e;" k="80" />
-<hkern u1="&#xdd;" u2="&#x201a;" k="80" />
-<hkern u1="&#xdd;" u2="&#x153;" k="15" />
-<hkern u1="&#xdd;" u2="&#x152;" k="15" />
-<hkern u1="&#xdd;" u2="&#x7d;" k="-5" />
-<hkern u1="&#xdd;" u2="q" k="15" />
-<hkern u1="&#xdd;" u2="]" k="-5" />
-<hkern u1="&#xdd;" u2="Q" k="15" />
-<hkern u1="&#xdd;" u2="&#x3b;" k="20" />
-<hkern u1="&#xdd;" u2="&#x3a;" k="20" />
-<hkern u1="&#xdd;" u2="&#x2e;" k="80" />
-<hkern u1="&#xdd;" u2="&#x2c;" k="80" />
-<hkern u1="&#xdd;" u2="&#x29;" k="-5" />
-<hkern u1="&#xde;" u2="&#x2026;" k="80" />
-<hkern u1="&#xde;" u2="&#x201e;" k="80" />
-<hkern u1="&#xde;" u2="&#x201a;" k="80" />
-<hkern u1="&#xde;" u2="&#x178;" k="9" />
-<hkern u1="&#xde;" u2="&#xff;" k="9" />
-<hkern u1="&#xde;" u2="&#xfd;" k="9" />
-<hkern u1="&#xde;" u2="&#xe6;" k="20" />
-<hkern u1="&#xde;" u2="&#xe5;" k="2" />
-<hkern u1="&#xde;" u2="&#xe4;" k="2" />
-<hkern u1="&#xde;" u2="&#xe3;" k="2" />
-<hkern u1="&#xde;" u2="&#xe2;" k="2" />
-<hkern u1="&#xde;" u2="&#xe1;" k="2" />
-<hkern u1="&#xde;" u2="&#xe0;" k="2" />
-<hkern u1="&#xde;" u2="&#xdd;" k="9" />
-<hkern u1="&#xde;" u2="&#xc6;" k="20" />
-<hkern u1="&#xde;" u2="&#xc5;" k="2" />
-<hkern u1="&#xde;" u2="&#xc4;" k="2" />
-<hkern u1="&#xde;" u2="&#xc3;" k="2" />
-<hkern u1="&#xde;" u2="&#xc2;" k="2" />
-<hkern u1="&#xde;" u2="&#xc1;" k="2" />
-<hkern u1="&#xde;" u2="&#xc0;" k="2" />
-<hkern u1="&#xde;" u2="z" k="10" />
-<hkern u1="&#xde;" u2="y" k="9" />
-<hkern u1="&#xde;" u2="x" k="20" />
-<hkern u1="&#xde;" u2="j" k="8" />
-<hkern u1="&#xde;" u2="a" k="2" />
-<hkern u1="&#xde;" u2="Z" k="10" />
-<hkern u1="&#xde;" u2="Y" k="9" />
-<hkern u1="&#xde;" u2="X" k="20" />
-<hkern u1="&#xde;" u2="J" k="8" />
-<hkern u1="&#xde;" u2="A" k="2" />
-<hkern u1="&#xde;" u2="&#x2e;" k="80" />
-<hkern u1="&#xde;" u2="&#x2c;" k="80" />
-<hkern u1="&#xdf;" u2="&#x2026;" k="5" />
-<hkern u1="&#xdf;" u2="&#x201e;" k="5" />
-<hkern u1="&#xdf;" u2="&#x201d;" k="5" />
-<hkern u1="&#xdf;" u2="&#x201c;" k="5" />
-<hkern u1="&#xdf;" u2="&#x201a;" k="5" />
-<hkern u1="&#xdf;" u2="&#x2019;" k="5" />
-<hkern u1="&#xdf;" u2="&#x2018;" k="5" />
-<hkern u1="&#xdf;" u2="x" k="8" />
-<hkern u1="&#xdf;" u2="v" k="1" />
-<hkern u1="&#xdf;" u2="X" k="8" />
-<hkern u1="&#xdf;" u2="V" k="1" />
-<hkern u1="&#xdf;" u2="&#x2e;" k="5" />
-<hkern u1="&#xdf;" u2="&#x2c;" k="5" />
-<hkern u1="&#xe0;" u2="&#x201d;" k="60" />
-<hkern u1="&#xe0;" u2="&#x201c;" k="60" />
-<hkern u1="&#xe0;" u2="&#x2019;" k="60" />
-<hkern u1="&#xe0;" u2="&#x2018;" k="60" />
-<hkern u1="&#xe0;" u2="&#x153;" k="1" />
-<hkern u1="&#xe0;" u2="&#x152;" k="1" />
-<hkern u1="&#xe0;" u2="v" k="25" />
-<hkern u1="&#xe0;" u2="q" k="1" />
-<hkern u1="&#xe0;" u2="V" k="25" />
-<hkern u1="&#xe0;" u2="Q" k="1" />
-<hkern u1="&#xe0;" u2="&#x3f;" k="30" />
-<hkern u1="&#xe1;" u2="&#x201d;" k="60" />
-<hkern u1="&#xe1;" u2="&#x201c;" k="60" />
-<hkern u1="&#xe1;" u2="&#x2019;" k="60" />
-<hkern u1="&#xe1;" u2="&#x2018;" k="60" />
-<hkern u1="&#xe1;" u2="&#x153;" k="1" />
-<hkern u1="&#xe1;" u2="&#x152;" k="1" />
-<hkern u1="&#xe1;" u2="v" k="25" />
-<hkern u1="&#xe1;" u2="q" k="1" />
-<hkern u1="&#xe1;" u2="V" k="25" />
-<hkern u1="&#xe1;" u2="Q" k="1" />
-<hkern u1="&#xe1;" u2="&#x3f;" k="30" />
-<hkern u1="&#xe2;" u2="&#x201d;" k="60" />
-<hkern u1="&#xe2;" u2="&#x201c;" k="60" />
-<hkern u1="&#xe2;" u2="&#x2019;" k="60" />
-<hkern u1="&#xe2;" u2="&#x2018;" k="60" />
-<hkern u1="&#xe2;" u2="&#x153;" k="1" />
-<hkern u1="&#xe2;" u2="&#x152;" k="1" />
-<hkern u1="&#xe2;" u2="v" k="25" />
-<hkern u1="&#xe2;" u2="q" k="1" />
-<hkern u1="&#xe2;" u2="V" k="25" />
-<hkern u1="&#xe2;" u2="Q" k="1" />
-<hkern u1="&#xe2;" u2="&#x3f;" k="30" />
-<hkern u1="&#xe3;" u2="&#x201d;" k="60" />
-<hkern u1="&#xe3;" u2="&#x201c;" k="60" />
-<hkern u1="&#xe3;" u2="&#x2019;" k="60" />
-<hkern u1="&#xe3;" u2="&#x2018;" k="60" />
-<hkern u1="&#xe3;" u2="&#x153;" k="1" />
-<hkern u1="&#xe3;" u2="&#x152;" k="1" />
-<hkern u1="&#xe3;" u2="v" k="25" />
-<hkern u1="&#xe3;" u2="q" k="1" />
-<hkern u1="&#xe3;" u2="V" k="25" />
-<hkern u1="&#xe3;" u2="Q" k="1" />
-<hkern u1="&#xe3;" u2="&#x3f;" k="30" />
-<hkern u1="&#xe4;" u2="&#x201d;" k="60" />
-<hkern u1="&#xe4;" u2="&#x201c;" k="60" />
-<hkern u1="&#xe4;" u2="&#x2019;" k="60" />
-<hkern u1="&#xe4;" u2="&#x2018;" k="60" />
-<hkern u1="&#xe4;" u2="&#x153;" k="1" />
-<hkern u1="&#xe4;" u2="&#x152;" k="1" />
-<hkern u1="&#xe4;" u2="v" k="25" />
-<hkern u1="&#xe4;" u2="q" k="1" />
-<hkern u1="&#xe4;" u2="V" k="25" />
-<hkern u1="&#xe4;" u2="Q" k="1" />
-<hkern u1="&#xe4;" u2="&#x3f;" k="30" />
-<hkern u1="&#xe5;" u2="&#x201d;" k="60" />
-<hkern u1="&#xe5;" u2="&#x201c;" k="60" />
-<hkern u1="&#xe5;" u2="&#x2019;" k="60" />
-<hkern u1="&#xe5;" u2="&#x2018;" k="60" />
-<hkern u1="&#xe5;" u2="&#x153;" k="1" />
-<hkern u1="&#xe5;" u2="&#x152;" k="1" />
-<hkern u1="&#xe5;" u2="v" k="25" />
-<hkern u1="&#xe5;" u2="q" k="1" />
-<hkern u1="&#xe5;" u2="V" k="25" />
-<hkern u1="&#xe5;" u2="Q" k="1" />
-<hkern u1="&#xe5;" u2="&#x3f;" k="30" />
-<hkern u1="&#xe7;" u2="&#x2026;" k="6" />
-<hkern u1="&#xe7;" u2="&#x201e;" k="6" />
-<hkern u1="&#xe7;" u2="&#x201d;" k="6" />
-<hkern u1="&#xe7;" u2="&#x201c;" k="6" />
-<hkern u1="&#xe7;" u2="&#x201a;" k="6" />
-<hkern u1="&#xe7;" u2="&#x2019;" k="6" />
-<hkern u1="&#xe7;" u2="&#x2018;" k="6" />
-<hkern u1="&#xe7;" u2="x" k="11" />
-<hkern u1="&#xe7;" u2="X" k="11" />
-<hkern u1="&#xe7;" u2="&#x2e;" k="6" />
-<hkern u1="&#xe7;" u2="&#x2c;" k="6" />
-<hkern u1="&#xf0;" u2="&#x2026;" k="10" />
-<hkern u1="&#xf0;" u2="&#x201e;" k="10" />
-<hkern u1="&#xf0;" u2="&#x201d;" k="10" />
-<hkern u1="&#xf0;" u2="&#x201c;" k="10" />
-<hkern u1="&#xf0;" u2="&#x201a;" k="10" />
-<hkern u1="&#xf0;" u2="&#x2019;" k="10" />
-<hkern u1="&#xf0;" u2="&#x2018;" k="10" />
-<hkern u1="&#xf0;" u2="x" k="15" />
-<hkern u1="&#xf0;" u2="v" k="1" />
-<hkern u1="&#xf0;" u2="X" k="15" />
-<hkern u1="&#xf0;" u2="V" k="1" />
-<hkern u1="&#xf0;" u2="&#x2e;" k="10" />
-<hkern u1="&#xf0;" u2="&#x2c;" k="10" />
-<hkern u1="&#xf2;" u2="&#x2026;" k="10" />
-<hkern u1="&#xf2;" u2="&#x201e;" k="10" />
-<hkern u1="&#xf2;" u2="&#x201d;" k="10" />
-<hkern u1="&#xf2;" u2="&#x201c;" k="10" />
-<hkern u1="&#xf2;" u2="&#x201a;" k="10" />
-<hkern u1="&#xf2;" u2="&#x2019;" k="10" />
-<hkern u1="&#xf2;" u2="&#x2018;" k="10" />
-<hkern u1="&#xf2;" u2="x" k="15" />
-<hkern u1="&#xf2;" u2="v" k="1" />
-<hkern u1="&#xf2;" u2="X" k="15" />
-<hkern u1="&#xf2;" u2="V" k="1" />
-<hkern u1="&#xf2;" u2="&#x2e;" k="10" />
-<hkern u1="&#xf2;" u2="&#x2c;" k="10" />
-<hkern u1="&#xf3;" u2="&#x2026;" k="10" />
-<hkern u1="&#xf3;" u2="&#x201e;" k="10" />
-<hkern u1="&#xf3;" u2="&#x201d;" k="10" />
-<hkern u1="&#xf3;" u2="&#x201c;" k="10" />
-<hkern u1="&#xf3;" u2="&#x201a;" k="10" />
-<hkern u1="&#xf3;" u2="&#x2019;" k="10" />
-<hkern u1="&#xf3;" u2="&#x2018;" k="10" />
-<hkern u1="&#xf3;" u2="x" k="15" />
-<hkern u1="&#xf3;" u2="v" k="1" />
-<hkern u1="&#xf3;" u2="X" k="15" />
-<hkern u1="&#xf3;" u2="V" k="1" />
-<hkern u1="&#xf3;" u2="&#x2e;" k="10" />
-<hkern u1="&#xf3;" u2="&#x2c;" k="10" />
-<hkern u1="&#xf4;" u2="&#x2026;" k="10" />
-<hkern u1="&#xf4;" u2="&#x201e;" k="10" />
-<hkern u1="&#xf4;" u2="&#x201d;" k="10" />
-<hkern u1="&#xf4;" u2="&#x201c;" k="10" />
-<hkern u1="&#xf4;" u2="&#x201a;" k="10" />
-<hkern u1="&#xf4;" u2="&#x2019;" k="10" />
-<hkern u1="&#xf4;" u2="&#x2018;" k="10" />
-<hkern u1="&#xf4;" u2="x" k="15" />
-<hkern u1="&#xf4;" u2="v" k="1" />
-<hkern u1="&#xf4;" u2="X" k="15" />
-<hkern u1="&#xf4;" u2="V" k="1" />
-<hkern u1="&#xf4;" u2="&#x2e;" k="10" />
-<hkern u1="&#xf4;" u2="&#x2c;" k="10" />
-<hkern u1="&#xf5;" u2="&#x2026;" k="10" />
-<hkern u1="&#xf5;" u2="&#x201e;" k="10" />
-<hkern u1="&#xf5;" u2="&#x201d;" k="10" />
-<hkern u1="&#xf5;" u2="&#x201c;" k="10" />
-<hkern u1="&#xf5;" u2="&#x201a;" k="10" />
-<hkern u1="&#xf5;" u2="&#x2019;" k="10" />
-<hkern u1="&#xf5;" u2="&#x2018;" k="10" />
-<hkern u1="&#xf5;" u2="x" k="15" />
-<hkern u1="&#xf5;" u2="v" k="1" />
-<hkern u1="&#xf5;" u2="X" k="15" />
-<hkern u1="&#xf5;" u2="V" k="1" />
-<hkern u1="&#xf5;" u2="&#x2e;" k="10" />
-<hkern u1="&#xf5;" u2="&#x2c;" k="10" />
-<hkern u1="&#xf6;" u2="&#x2026;" k="10" />
-<hkern u1="&#xf6;" u2="&#x201e;" k="10" />
-<hkern u1="&#xf6;" u2="&#x201d;" k="10" />
-<hkern u1="&#xf6;" u2="&#x201c;" k="10" />
-<hkern u1="&#xf6;" u2="&#x201a;" k="10" />
-<hkern u1="&#xf6;" u2="&#x2019;" k="10" />
-<hkern u1="&#xf6;" u2="&#x2018;" k="10" />
-<hkern u1="&#xf6;" u2="x" k="15" />
-<hkern u1="&#xf6;" u2="v" k="1" />
-<hkern u1="&#xf6;" u2="X" k="15" />
-<hkern u1="&#xf6;" u2="V" k="1" />
-<hkern u1="&#xf6;" u2="&#x2e;" k="10" />
-<hkern u1="&#xf6;" u2="&#x2c;" k="10" />
-<hkern u1="&#xf8;" u2="&#x2026;" k="10" />
-<hkern u1="&#xf8;" u2="&#x201e;" k="10" />
-<hkern u1="&#xf8;" u2="&#x201d;" k="10" />
-<hkern u1="&#xf8;" u2="&#x201c;" k="10" />
-<hkern u1="&#xf8;" u2="&#x201a;" k="10" />
-<hkern u1="&#xf8;" u2="&#x2019;" k="10" />
-<hkern u1="&#xf8;" u2="&#x2018;" k="10" />
-<hkern u1="&#xf8;" u2="x" k="15" />
-<hkern u1="&#xf8;" u2="v" k="1" />
-<hkern u1="&#xf8;" u2="X" k="15" />
-<hkern u1="&#xf8;" u2="V" k="1" />
-<hkern u1="&#xf8;" u2="&#x2e;" k="10" />
-<hkern u1="&#xf8;" u2="&#x2c;" k="10" />
-<hkern u1="&#xf9;" u2="&#x2026;" k="6" />
-<hkern u1="&#xf9;" u2="&#x201e;" k="6" />
-<hkern u1="&#xf9;" u2="&#x201a;" k="6" />
-<hkern u1="&#xf9;" u2="&#x2e;" k="6" />
-<hkern u1="&#xf9;" u2="&#x2c;" k="6" />
-<hkern u1="&#xfa;" u2="&#x2026;" k="6" />
-<hkern u1="&#xfa;" u2="&#x201e;" k="6" />
-<hkern u1="&#xfa;" u2="&#x201a;" k="6" />
-<hkern u1="&#xfa;" u2="&#x2e;" k="6" />
-<hkern u1="&#xfa;" u2="&#x2c;" k="6" />
-<hkern u1="&#xfb;" u2="&#x2026;" k="6" />
-<hkern u1="&#xfb;" u2="&#x201e;" k="6" />
-<hkern u1="&#xfb;" u2="&#x201a;" k="6" />
-<hkern u1="&#xfb;" u2="&#x2e;" k="6" />
-<hkern u1="&#xfb;" u2="&#x2c;" k="6" />
-<hkern u1="&#xfc;" u2="&#x2026;" k="6" />
-<hkern u1="&#xfc;" u2="&#x201e;" k="6" />
-<hkern u1="&#xfc;" u2="&#x201a;" k="6" />
-<hkern u1="&#xfc;" u2="&#x2e;" k="6" />
-<hkern u1="&#xfc;" u2="&#x2c;" k="6" />
-<hkern u1="&#xfd;" u2="&#x2026;" k="80" />
-<hkern u1="&#xfd;" u2="&#x201e;" k="80" />
-<hkern u1="&#xfd;" u2="&#x201a;" k="80" />
-<hkern u1="&#xfd;" u2="&#x153;" k="15" />
-<hkern u1="&#xfd;" u2="&#x152;" k="15" />
-<hkern u1="&#xfd;" u2="&#x7d;" k="-5" />
-<hkern u1="&#xfd;" u2="q" k="15" />
-<hkern u1="&#xfd;" u2="]" k="-5" />
-<hkern u1="&#xfd;" u2="Q" k="15" />
-<hkern u1="&#xfd;" u2="&#x3b;" k="20" />
-<hkern u1="&#xfd;" u2="&#x3a;" k="20" />
-<hkern u1="&#xfd;" u2="&#x2e;" k="80" />
-<hkern u1="&#xfd;" u2="&#x2c;" k="80" />
-<hkern u1="&#xfd;" u2="&#x29;" k="-5" />
-<hkern u1="&#xfe;" u2="&#x2026;" k="80" />
-<hkern u1="&#xfe;" u2="&#x201e;" k="80" />
-<hkern u1="&#xfe;" u2="&#x201a;" k="80" />
-<hkern u1="&#xfe;" u2="&#x178;" k="9" />
-<hkern u1="&#xfe;" u2="&#xff;" k="9" />
-<hkern u1="&#xfe;" u2="&#xfd;" k="9" />
-<hkern u1="&#xfe;" u2="&#xe6;" k="20" />
-<hkern u1="&#xfe;" u2="&#xe5;" k="2" />
-<hkern u1="&#xfe;" u2="&#xe4;" k="2" />
-<hkern u1="&#xfe;" u2="&#xe3;" k="2" />
-<hkern u1="&#xfe;" u2="&#xe2;" k="2" />
-<hkern u1="&#xfe;" u2="&#xe1;" k="2" />
-<hkern u1="&#xfe;" u2="&#xe0;" k="2" />
-<hkern u1="&#xfe;" u2="&#xdd;" k="9" />
-<hkern u1="&#xfe;" u2="&#xc6;" k="20" />
-<hkern u1="&#xfe;" u2="&#xc5;" k="2" />
-<hkern u1="&#xfe;" u2="&#xc4;" k="2" />
-<hkern u1="&#xfe;" u2="&#xc3;" k="2" />
-<hkern u1="&#xfe;" u2="&#xc2;" k="2" />
-<hkern u1="&#xfe;" u2="&#xc1;" k="2" />
-<hkern u1="&#xfe;" u2="&#xc0;" k="2" />
-<hkern u1="&#xfe;" u2="z" k="10" />
-<hkern u1="&#xfe;" u2="y" k="9" />
-<hkern u1="&#xfe;" u2="x" k="20" />
-<hkern u1="&#xfe;" u2="j" k="8" />
-<hkern u1="&#xfe;" u2="a" k="2" />
-<hkern u1="&#xfe;" u2="Z" k="10" />
-<hkern u1="&#xfe;" u2="Y" k="9" />
-<hkern u1="&#xfe;" u2="X" k="20" />
-<hkern u1="&#xfe;" u2="J" k="8" />
-<hkern u1="&#xfe;" u2="A" k="2" />
-<hkern u1="&#xfe;" u2="&#x2e;" k="80" />
-<hkern u1="&#xfe;" u2="&#x2c;" k="80" />
-<hkern u1="&#xff;" u2="&#x2026;" k="80" />
-<hkern u1="&#xff;" u2="&#x201e;" k="80" />
-<hkern u1="&#xff;" u2="&#x201a;" k="80" />
-<hkern u1="&#xff;" u2="&#x153;" k="15" />
-<hkern u1="&#xff;" u2="&#x152;" k="15" />
-<hkern u1="&#xff;" u2="&#x7d;" k="-5" />
-<hkern u1="&#xff;" u2="q" k="15" />
-<hkern u1="&#xff;" u2="]" k="-5" />
-<hkern u1="&#xff;" u2="Q" k="15" />
-<hkern u1="&#xff;" u2="&#x3b;" k="20" />
-<hkern u1="&#xff;" u2="&#x3a;" k="20" />
-<hkern u1="&#xff;" u2="&#x2e;" k="80" />
-<hkern u1="&#xff;" u2="&#x2c;" k="80" />
-<hkern u1="&#xff;" u2="&#x29;" k="-5" />
-<hkern u1="&#x178;" u2="&#x2026;" k="80" />
-<hkern u1="&#x178;" u2="&#x201e;" k="80" />
-<hkern u1="&#x178;" u2="&#x201a;" k="80" />
-<hkern u1="&#x178;" u2="&#x153;" k="15" />
-<hkern u1="&#x178;" u2="&#x152;" k="15" />
-<hkern u1="&#x178;" u2="&#x7d;" k="-5" />
-<hkern u1="&#x178;" u2="q" k="15" />
-<hkern u1="&#x178;" u2="]" k="-5" />
-<hkern u1="&#x178;" u2="Q" k="15" />
-<hkern u1="&#x178;" u2="&#x3b;" k="20" />
-<hkern u1="&#x178;" u2="&#x3a;" k="20" />
-<hkern u1="&#x178;" u2="&#x2e;" k="80" />
-<hkern u1="&#x178;" u2="&#x2c;" k="80" />
-<hkern u1="&#x178;" u2="&#x29;" k="-5" />
-<hkern u1="&#x2018;" u2="&#x153;" k="10" />
-<hkern u1="&#x2018;" u2="&#x152;" k="10" />
-<hkern u1="&#x2018;" u2="&#xf8;" k="10" />
-<hkern u1="&#x2018;" u2="&#xf6;" k="10" />
-<hkern u1="&#x2018;" u2="&#xf5;" k="10" />
-<hkern u1="&#x2018;" u2="&#xf4;" k="10" />
-<hkern u1="&#x2018;" u2="&#xf3;" k="10" />
-<hkern u1="&#x2018;" u2="&#xf2;" k="10" />
-<hkern u1="&#x2018;" u2="&#xe7;" k="10" />
-<hkern u1="&#x2018;" u2="&#xe5;" k="60" />
-<hkern u1="&#x2018;" u2="&#xe4;" k="60" />
-<hkern u1="&#x2018;" u2="&#xe3;" k="60" />
-<hkern u1="&#x2018;" u2="&#xe2;" k="60" />
-<hkern u1="&#x2018;" u2="&#xe1;" k="60" />
-<hkern u1="&#x2018;" u2="&#xe0;" k="60" />
-<hkern u1="&#x2018;" u2="&#xdf;" k="5" />
-<hkern u1="&#x2018;" u2="&#xd8;" k="10" />
-<hkern u1="&#x2018;" u2="&#xd6;" k="10" />
-<hkern u1="&#x2018;" u2="&#xd5;" k="10" />
-<hkern u1="&#x2018;" u2="&#xd4;" k="10" />
-<hkern u1="&#x2018;" u2="&#xd3;" k="10" />
-<hkern u1="&#x2018;" u2="&#xd2;" k="10" />
-<hkern u1="&#x2018;" u2="&#xc7;" k="10" />
-<hkern u1="&#x2018;" u2="&#xc5;" k="60" />
-<hkern u1="&#x2018;" u2="&#xc4;" k="60" />
-<hkern u1="&#x2018;" u2="&#xc3;" k="60" />
-<hkern u1="&#x2018;" u2="&#xc2;" k="60" />
-<hkern u1="&#x2018;" u2="&#xc1;" k="60" />
-<hkern u1="&#x2018;" u2="&#xc0;" k="60" />
-<hkern u1="&#x2018;" u2="z" k="4" />
-<hkern u1="&#x2018;" u2="x" k="2" />
-<hkern u1="&#x2018;" u2="s" k="5" />
-<hkern u1="&#x2018;" u2="q" k="10" />
-<hkern u1="&#x2018;" u2="o" k="10" />
-<hkern u1="&#x2018;" u2="j" k="40" />
-<hkern u1="&#x2018;" u2="g" k="10" />
-<hkern u1="&#x2018;" u2="c" k="10" />
-<hkern u1="&#x2018;" u2="a" k="60" />
-<hkern u1="&#x2018;" u2="Z" k="4" />
-<hkern u1="&#x2018;" u2="X" k="2" />
-<hkern u1="&#x2018;" u2="S" k="5" />
-<hkern u1="&#x2018;" u2="Q" k="10" />
-<hkern u1="&#x2018;" u2="O" k="10" />
-<hkern u1="&#x2018;" u2="J" k="40" />
-<hkern u1="&#x2018;" u2="G" k="10" />
-<hkern u1="&#x2018;" u2="C" k="10" />
-<hkern u1="&#x2018;" u2="A" k="60" />
-<hkern u1="&#x2019;" u2="&#x153;" k="10" />
-<hkern u1="&#x2019;" u2="&#x152;" k="10" />
-<hkern u1="&#x2019;" u2="&#xf8;" k="10" />
-<hkern u1="&#x2019;" u2="&#xf6;" k="10" />
-<hkern u1="&#x2019;" u2="&#xf5;" k="10" />
-<hkern u1="&#x2019;" u2="&#xf4;" k="10" />
-<hkern u1="&#x2019;" u2="&#xf3;" k="10" />
-<hkern u1="&#x2019;" u2="&#xf2;" k="10" />
-<hkern u1="&#x2019;" u2="&#xe7;" k="10" />
-<hkern u1="&#x2019;" u2="&#xe5;" k="60" />
-<hkern u1="&#x2019;" u2="&#xe4;" k="60" />
-<hkern u1="&#x2019;" u2="&#xe3;" k="60" />
-<hkern u1="&#x2019;" u2="&#xe2;" k="60" />
-<hkern u1="&#x2019;" u2="&#xe1;" k="60" />
-<hkern u1="&#x2019;" u2="&#xe0;" k="60" />
-<hkern u1="&#x2019;" u2="&#xdf;" k="5" />
-<hkern u1="&#x2019;" u2="&#xd8;" k="10" />
-<hkern u1="&#x2019;" u2="&#xd6;" k="10" />
-<hkern u1="&#x2019;" u2="&#xd5;" k="10" />
-<hkern u1="&#x2019;" u2="&#xd4;" k="10" />
-<hkern u1="&#x2019;" u2="&#xd3;" k="10" />
-<hkern u1="&#x2019;" u2="&#xd2;" k="10" />
-<hkern u1="&#x2019;" u2="&#xc7;" k="10" />
-<hkern u1="&#x2019;" u2="&#xc5;" k="60" />
-<hkern u1="&#x2019;" u2="&#xc4;" k="60" />
-<hkern u1="&#x2019;" u2="&#xc3;" k="60" />
-<hkern u1="&#x2019;" u2="&#xc2;" k="60" />
-<hkern u1="&#x2019;" u2="&#xc1;" k="60" />
-<hkern u1="&#x2019;" u2="&#xc0;" k="60" />
-<hkern u1="&#x2019;" u2="z" k="4" />
-<hkern u1="&#x2019;" u2="x" k="2" />
-<hkern u1="&#x2019;" u2="s" k="5" />
-<hkern u1="&#x2019;" u2="q" k="10" />
-<hkern u1="&#x2019;" u2="o" k="10" />
-<hkern u1="&#x2019;" u2="j" k="40" />
-<hkern u1="&#x2019;" u2="g" k="10" />
-<hkern u1="&#x2019;" u2="c" k="10" />
-<hkern u1="&#x2019;" u2="a" k="60" />
-<hkern u1="&#x2019;" u2="Z" k="4" />
-<hkern u1="&#x2019;" u2="X" k="2" />
-<hkern u1="&#x2019;" u2="S" k="5" />
-<hkern u1="&#x2019;" u2="Q" k="10" />
-<hkern u1="&#x2019;" u2="O" k="10" />
-<hkern u1="&#x2019;" u2="J" k="40" />
-<hkern u1="&#x2019;" u2="G" k="10" />
-<hkern u1="&#x2019;" u2="C" k="10" />
-<hkern u1="&#x2019;" u2="A" k="60" />
-<hkern u1="&#x201a;" u2="&#x178;" k="80" />
-<hkern u1="&#x201a;" u2="&#x153;" k="10" />
-<hkern u1="&#x201a;" u2="&#x152;" k="10" />
-<hkern u1="&#x201a;" u2="&#xff;" k="80" />
-<hkern u1="&#x201a;" u2="&#xfd;" k="80" />
-<hkern u1="&#x201a;" u2="&#xfc;" k="6" />
-<hkern u1="&#x201a;" u2="&#xfb;" k="6" />
-<hkern u1="&#x201a;" u2="&#xfa;" k="6" />
-<hkern u1="&#x201a;" u2="&#xf9;" k="6" />
-<hkern u1="&#x201a;" u2="&#xf8;" k="10" />
-<hkern u1="&#x201a;" u2="&#xf6;" k="10" />
-<hkern u1="&#x201a;" u2="&#xf5;" k="10" />
-<hkern u1="&#x201a;" u2="&#xf4;" k="10" />
-<hkern u1="&#x201a;" u2="&#xf3;" k="10" />
-<hkern u1="&#x201a;" u2="&#xf2;" k="10" />
-<hkern u1="&#x201a;" u2="&#xe7;" k="10" />
-<hkern u1="&#x201a;" u2="&#xdf;" k="5" />
-<hkern u1="&#x201a;" u2="&#xdd;" k="80" />
-<hkern u1="&#x201a;" u2="&#xdc;" k="6" />
-<hkern u1="&#x201a;" u2="&#xdb;" k="6" />
-<hkern u1="&#x201a;" u2="&#xda;" k="6" />
-<hkern u1="&#x201a;" u2="&#xd9;" k="6" />
-<hkern u1="&#x201a;" u2="&#xd8;" k="10" />
-<hkern u1="&#x201a;" u2="&#xd6;" k="10" />
-<hkern u1="&#x201a;" u2="&#xd5;" k="10" />
-<hkern u1="&#x201a;" u2="&#xd4;" k="10" />
-<hkern u1="&#x201a;" u2="&#xd3;" k="10" />
-<hkern u1="&#x201a;" u2="&#xd2;" k="10" />
-<hkern u1="&#x201a;" u2="&#xc7;" k="10" />
-<hkern u1="&#x201a;" u2="y" k="80" />
-<hkern u1="&#x201a;" u2="w" k="40" />
-<hkern u1="&#x201a;" u2="v" k="60" />
-<hkern u1="&#x201a;" u2="u" k="6" />
-<hkern u1="&#x201a;" u2="t" k="60" />
-<hkern u1="&#x201a;" u2="s" k="5" />
-<hkern u1="&#x201a;" u2="q" k="10" />
-<hkern u1="&#x201a;" u2="o" k="10" />
-<hkern u1="&#x201a;" u2="g" k="10" />
-<hkern u1="&#x201a;" u2="c" k="10" />
-<hkern u1="&#x201a;" u2="Y" k="80" />
-<hkern u1="&#x201a;" u2="W" k="40" />
-<hkern u1="&#x201a;" u2="V" k="60" />
-<hkern u1="&#x201a;" u2="U" k="6" />
-<hkern u1="&#x201a;" u2="T" k="60" />
-<hkern u1="&#x201a;" u2="S" k="5" />
-<hkern u1="&#x201a;" u2="Q" k="10" />
-<hkern u1="&#x201a;" u2="O" k="10" />
-<hkern u1="&#x201a;" u2="G" k="10" />
-<hkern u1="&#x201a;" u2="C" k="10" />
-<hkern u1="&#x201c;" u2="&#x153;" k="10" />
-<hkern u1="&#x201c;" u2="&#x152;" k="10" />
-<hkern u1="&#x201c;" u2="&#xf8;" k="10" />
-<hkern u1="&#x201c;" u2="&#xf6;" k="10" />
-<hkern u1="&#x201c;" u2="&#xf5;" k="10" />
-<hkern u1="&#x201c;" u2="&#xf4;" k="10" />
-<hkern u1="&#x201c;" u2="&#xf3;" k="10" />
-<hkern u1="&#x201c;" u2="&#xf2;" k="10" />
-<hkern u1="&#x201c;" u2="&#xe7;" k="10" />
-<hkern u1="&#x201c;" u2="&#xe5;" k="60" />
-<hkern u1="&#x201c;" u2="&#xe4;" k="60" />
-<hkern u1="&#x201c;" u2="&#xe3;" k="60" />
-<hkern u1="&#x201c;" u2="&#xe2;" k="60" />
-<hkern u1="&#x201c;" u2="&#xe1;" k="60" />
-<hkern u1="&#x201c;" u2="&#xe0;" k="60" />
-<hkern u1="&#x201c;" u2="&#xdf;" k="5" />
-<hkern u1="&#x201c;" u2="&#xd8;" k="10" />
-<hkern u1="&#x201c;" u2="&#xd6;" k="10" />
-<hkern u1="&#x201c;" u2="&#xd5;" k="10" />
-<hkern u1="&#x201c;" u2="&#xd4;" k="10" />
-<hkern u1="&#x201c;" u2="&#xd3;" k="10" />
-<hkern u1="&#x201c;" u2="&#xd2;" k="10" />
-<hkern u1="&#x201c;" u2="&#xc7;" k="10" />
-<hkern u1="&#x201c;" u2="&#xc5;" k="60" />
-<hkern u1="&#x201c;" u2="&#xc4;" k="60" />
-<hkern u1="&#x201c;" u2="&#xc3;" k="60" />
-<hkern u1="&#x201c;" u2="&#xc2;" k="60" />
-<hkern u1="&#x201c;" u2="&#xc1;" k="60" />
-<hkern u1="&#x201c;" u2="&#xc0;" k="60" />
-<hkern u1="&#x201c;" u2="z" k="4" />
-<hkern u1="&#x201c;" u2="x" k="2" />
-<hkern u1="&#x201c;" u2="s" k="5" />
-<hkern u1="&#x201c;" u2="q" k="10" />
-<hkern u1="&#x201c;" u2="o" k="10" />
-<hkern u1="&#x201c;" u2="j" k="40" />
-<hkern u1="&#x201c;" u2="g" k="10" />
-<hkern u1="&#x201c;" u2="c" k="10" />
-<hkern u1="&#x201c;" u2="a" k="60" />
-<hkern u1="&#x201c;" u2="Z" k="4" />
-<hkern u1="&#x201c;" u2="X" k="2" />
-<hkern u1="&#x201c;" u2="S" k="5" />
-<hkern u1="&#x201c;" u2="Q" k="10" />
-<hkern u1="&#x201c;" u2="O" k="10" />
-<hkern u1="&#x201c;" u2="J" k="40" />
-<hkern u1="&#x201c;" u2="G" k="10" />
-<hkern u1="&#x201c;" u2="C" k="10" />
-<hkern u1="&#x201c;" u2="A" k="60" />
-<hkern u1="&#x201d;" u2="&#x153;" k="10" />
-<hkern u1="&#x201d;" u2="&#x152;" k="10" />
-<hkern u1="&#x201d;" u2="&#xf8;" k="10" />
-<hkern u1="&#x201d;" u2="&#xf6;" k="10" />
-<hkern u1="&#x201d;" u2="&#xf5;" k="10" />
-<hkern u1="&#x201d;" u2="&#xf4;" k="10" />
-<hkern u1="&#x201d;" u2="&#xf3;" k="10" />
-<hkern u1="&#x201d;" u2="&#xf2;" k="10" />
-<hkern u1="&#x201d;" u2="&#xe7;" k="10" />
-<hkern u1="&#x201d;" u2="&#xe5;" k="60" />
-<hkern u1="&#x201d;" u2="&#xe4;" k="60" />
-<hkern u1="&#x201d;" u2="&#xe3;" k="60" />
-<hkern u1="&#x201d;" u2="&#xe2;" k="60" />
-<hkern u1="&#x201d;" u2="&#xe1;" k="60" />
-<hkern u1="&#x201d;" u2="&#xe0;" k="60" />
-<hkern u1="&#x201d;" u2="&#xdf;" k="5" />
-<hkern u1="&#x201d;" u2="&#xd8;" k="10" />
-<hkern u1="&#x201d;" u2="&#xd6;" k="10" />
-<hkern u1="&#x201d;" u2="&#xd5;" k="10" />
-<hkern u1="&#x201d;" u2="&#xd4;" k="10" />
-<hkern u1="&#x201d;" u2="&#xd3;" k="10" />
-<hkern u1="&#x201d;" u2="&#xd2;" k="10" />
-<hkern u1="&#x201d;" u2="&#xc7;" k="10" />
-<hkern u1="&#x201d;" u2="&#xc5;" k="60" />
-<hkern u1="&#x201d;" u2="&#xc4;" k="60" />
-<hkern u1="&#x201d;" u2="&#xc3;" k="60" />
-<hkern u1="&#x201d;" u2="&#xc2;" k="60" />
-<hkern u1="&#x201d;" u2="&#xc1;" k="60" />
-<hkern u1="&#x201d;" u2="&#xc0;" k="60" />
-<hkern u1="&#x201d;" u2="z" k="4" />
-<hkern u1="&#x201d;" u2="x" k="2" />
-<hkern u1="&#x201d;" u2="s" k="5" />
-<hkern u1="&#x201d;" u2="q" k="10" />
-<hkern u1="&#x201d;" u2="o" k="10" />
-<hkern u1="&#x201d;" u2="j" k="40" />
-<hkern u1="&#x201d;" u2="g" k="10" />
-<hkern u1="&#x201d;" u2="c" k="10" />
-<hkern u1="&#x201d;" u2="a" k="60" />
-<hkern u1="&#x201d;" u2="Z" k="4" />
-<hkern u1="&#x201d;" u2="X" k="2" />
-<hkern u1="&#x201d;" u2="S" k="5" />
-<hkern u1="&#x201d;" u2="Q" k="10" />
-<hkern u1="&#x201d;" u2="O" k="10" />
-<hkern u1="&#x201d;" u2="J" k="40" />
-<hkern u1="&#x201d;" u2="G" k="10" />
-<hkern u1="&#x201d;" u2="C" k="10" />
-<hkern u1="&#x201d;" u2="A" k="60" />
-<hkern u1="&#x201e;" u2="&#x178;" k="80" />
-<hkern u1="&#x201e;" u2="&#x153;" k="10" />
-<hkern u1="&#x201e;" u2="&#x152;" k="10" />
-<hkern u1="&#x201e;" u2="&#xff;" k="80" />
-<hkern u1="&#x201e;" u2="&#xfd;" k="80" />
-<hkern u1="&#x201e;" u2="&#xfc;" k="6" />
-<hkern u1="&#x201e;" u2="&#xfb;" k="6" />
-<hkern u1="&#x201e;" u2="&#xfa;" k="6" />
-<hkern u1="&#x201e;" u2="&#xf9;" k="6" />
-<hkern u1="&#x201e;" u2="&#xf8;" k="10" />
-<hkern u1="&#x201e;" u2="&#xf6;" k="10" />
-<hkern u1="&#x201e;" u2="&#xf5;" k="10" />
-<hkern u1="&#x201e;" u2="&#xf4;" k="10" />
-<hkern u1="&#x201e;" u2="&#xf3;" k="10" />
-<hkern u1="&#x201e;" u2="&#xf2;" k="10" />
-<hkern u1="&#x201e;" u2="&#xe7;" k="10" />
-<hkern u1="&#x201e;" u2="&#xdf;" k="5" />
-<hkern u1="&#x201e;" u2="&#xdd;" k="80" />
-<hkern u1="&#x201e;" u2="&#xdc;" k="6" />
-<hkern u1="&#x201e;" u2="&#xdb;" k="6" />
-<hkern u1="&#x201e;" u2="&#xda;" k="6" />
-<hkern u1="&#x201e;" u2="&#xd9;" k="6" />
-<hkern u1="&#x201e;" u2="&#xd8;" k="10" />
-<hkern u1="&#x201e;" u2="&#xd6;" k="10" />
-<hkern u1="&#x201e;" u2="&#xd5;" k="10" />
-<hkern u1="&#x201e;" u2="&#xd4;" k="10" />
-<hkern u1="&#x201e;" u2="&#xd3;" k="10" />
-<hkern u1="&#x201e;" u2="&#xd2;" k="10" />
-<hkern u1="&#x201e;" u2="&#xc7;" k="10" />
-<hkern u1="&#x201e;" u2="y" k="80" />
-<hkern u1="&#x201e;" u2="w" k="40" />
-<hkern u1="&#x201e;" u2="v" k="60" />
-<hkern u1="&#x201e;" u2="u" k="6" />
-<hkern u1="&#x201e;" u2="t" k="60" />
-<hkern u1="&#x201e;" u2="s" k="5" />
-<hkern u1="&#x201e;" u2="q" k="10" />
-<hkern u1="&#x201e;" u2="o" k="10" />
-<hkern u1="&#x201e;" u2="g" k="10" />
-<hkern u1="&#x201e;" u2="c" k="10" />
-<hkern u1="&#x201e;" u2="Y" k="80" />
-<hkern u1="&#x201e;" u2="W" k="40" />
-<hkern u1="&#x201e;" u2="V" k="60" />
-<hkern u1="&#x201e;" u2="U" k="6" />
-<hkern u1="&#x201e;" u2="T" k="60" />
-<hkern u1="&#x201e;" u2="S" k="5" />
-<hkern u1="&#x201e;" u2="Q" k="10" />
-<hkern u1="&#x201e;" u2="O" k="10" />
-<hkern u1="&#x201e;" u2="G" k="10" />
-<hkern u1="&#x201e;" u2="C" k="10" />
-<hkern u1="&#x2026;" u2="&#x178;" k="80" />
-<hkern u1="&#x2026;" u2="&#x153;" k="10" />
-<hkern u1="&#x2026;" u2="&#x152;" k="10" />
-<hkern u1="&#x2026;" u2="&#xff;" k="80" />
-<hkern u1="&#x2026;" u2="&#xfd;" k="80" />
-<hkern u1="&#x2026;" u2="&#xfc;" k="6" />
-<hkern u1="&#x2026;" u2="&#xfb;" k="6" />
-<hkern u1="&#x2026;" u2="&#xfa;" k="6" />
-<hkern u1="&#x2026;" u2="&#xf9;" k="6" />
-<hkern u1="&#x2026;" u2="&#xf8;" k="10" />
-<hkern u1="&#x2026;" u2="&#xf6;" k="10" />
-<hkern u1="&#x2026;" u2="&#xf5;" k="10" />
-<hkern u1="&#x2026;" u2="&#xf4;" k="10" />
-<hkern u1="&#x2026;" u2="&#xf3;" k="10" />
-<hkern u1="&#x2026;" u2="&#xf2;" k="10" />
-<hkern u1="&#x2026;" u2="&#xe7;" k="10" />
-<hkern u1="&#x2026;" u2="&#xdf;" k="5" />
-<hkern u1="&#x2026;" u2="&#xdd;" k="80" />
-<hkern u1="&#x2026;" u2="&#xdc;" k="6" />
-<hkern u1="&#x2026;" u2="&#xdb;" k="6" />
-<hkern u1="&#x2026;" u2="&#xda;" k="6" />
-<hkern u1="&#x2026;" u2="&#xd9;" k="6" />
-<hkern u1="&#x2026;" u2="&#xd8;" k="10" />
-<hkern u1="&#x2026;" u2="&#xd6;" k="10" />
-<hkern u1="&#x2026;" u2="&#xd5;" k="10" />
-<hkern u1="&#x2026;" u2="&#xd4;" k="10" />
-<hkern u1="&#x2026;" u2="&#xd3;" k="10" />
-<hkern u1="&#x2026;" u2="&#xd2;" k="10" />
-<hkern u1="&#x2026;" u2="&#xc7;" k="10" />
-<hkern u1="&#x2026;" u2="y" k="80" />
-<hkern u1="&#x2026;" u2="w" k="40" />
-<hkern u1="&#x2026;" u2="v" k="60" />
-<hkern u1="&#x2026;" u2="u" k="6" />
-<hkern u1="&#x2026;" u2="t" k="60" />
-<hkern u1="&#x2026;" u2="s" k="5" />
-<hkern u1="&#x2026;" u2="q" k="10" />
-<hkern u1="&#x2026;" u2="o" k="10" />
-<hkern u1="&#x2026;" u2="g" k="10" />
-<hkern u1="&#x2026;" u2="c" k="10" />
-<hkern u1="&#x2026;" u2="Y" k="80" />
-<hkern u1="&#x2026;" u2="W" k="40" />
-<hkern u1="&#x2026;" u2="V" k="60" />
-<hkern u1="&#x2026;" u2="U" k="6" />
-<hkern u1="&#x2026;" u2="T" k="60" />
-<hkern u1="&#x2026;" u2="S" k="5" />
-<hkern u1="&#x2026;" u2="Q" k="10" />
-<hkern u1="&#x2026;" u2="O" k="10" />
-<hkern u1="&#x2026;" u2="G" k="10" />
-<hkern u1="&#x2026;" u2="C" k="10" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="C,Ccedilla" 	k="1" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="G" 	k="1" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	k="1" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="T" 	k="38" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="W" 	k="15" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="Y,Yacute,Ydieresis" 	k="49" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="hyphen,uni00AD" 	k="10" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="c,ccedilla" 	k="1" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="g" 	k="1" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	k="1" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="t" 	k="38" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="w" 	k="15" />
-<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	g2="y,yacute,ydieresis" 	k="49" />
-<hkern g1="B" 	g2="W" 	k="1" />
-<hkern g1="B" 	g2="Y,Yacute,Ydieresis" 	k="15" />
-<hkern g1="B" 	g2="w" 	k="1" />
-<hkern g1="B" 	g2="y,yacute,ydieresis" 	k="15" />
-<hkern g1="b" 	g2="W" 	k="1" />
-<hkern g1="b" 	g2="Y,Yacute,Ydieresis" 	k="15" />
-<hkern g1="b" 	g2="w" 	k="1" />
-<hkern g1="b" 	g2="y,yacute,ydieresis" 	k="15" />
-<hkern g1="C,Ccedilla" 	g2="Y,Yacute,Ydieresis" 	k="11" />
-<hkern g1="C,Ccedilla" 	g2="y,yacute,ydieresis" 	k="11" />
-<hkern g1="c,ccedilla" 	g2="Y,Yacute,Ydieresis" 	k="11" />
-<hkern g1="c,ccedilla" 	g2="y,yacute,ydieresis" 	k="11" />
-<hkern g1="D,Eth" 	g2="Y,Yacute,Ydieresis" 	k="15" />
-<hkern g1="D,Eth" 	g2="y,yacute,ydieresis" 	k="15" />
-<hkern g1="D,Eth" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="1" />
-<hkern g1="D,Eth" 	g2="AE" 	k="2" />
-<hkern g1="D,Eth" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="1" />
-<hkern g1="D,Eth" 	g2="ae" 	k="2" />
-<hkern g1="d,eth" 	g2="Y,Yacute,Ydieresis" 	k="15" />
-<hkern g1="d,eth" 	g2="y,yacute,ydieresis" 	k="15" />
-<hkern g1="d,eth" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="1" />
-<hkern g1="d,eth" 	g2="AE" 	k="2" />
-<hkern g1="d,eth" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="1" />
-<hkern g1="d,eth" 	g2="ae" 	k="2" />
-<hkern g1="F" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="13" />
-<hkern g1="F" 	g2="AE" 	k="40" />
-<hkern g1="F" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="13" />
-<hkern g1="F" 	g2="ae" 	k="40" />
-<hkern g1="F" 	g2="J" 	k="20" />
-<hkern g1="F" 	g2="Z" 	k="10" />
-<hkern g1="F" 	g2="j" 	k="20" />
-<hkern g1="F" 	g2="z" 	k="10" />
-<hkern g1="f" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="13" />
-<hkern g1="f" 	g2="AE" 	k="40" />
-<hkern g1="f" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="13" />
-<hkern g1="f" 	g2="ae" 	k="40" />
-<hkern g1="f" 	g2="J" 	k="20" />
-<hkern g1="f" 	g2="Z" 	k="10" />
-<hkern g1="f" 	g2="j" 	k="20" />
-<hkern g1="f" 	g2="z" 	k="10" />
-<hkern g1="G" 	g2="Y,Yacute,Ydieresis" 	k="15" />
-<hkern g1="G" 	g2="y,yacute,ydieresis" 	k="15" />
-<hkern g1="G" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="1" />
-<hkern g1="G" 	g2="AE" 	k="2" />
-<hkern g1="G" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="1" />
-<hkern g1="G" 	g2="ae" 	k="2" />
-<hkern g1="g" 	g2="Y,Yacute,Ydieresis" 	k="15" />
-<hkern g1="g" 	g2="y,yacute,ydieresis" 	k="15" />
-<hkern g1="g" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="1" />
-<hkern g1="g" 	g2="AE" 	k="2" />
-<hkern g1="g" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="1" />
-<hkern g1="g" 	g2="ae" 	k="2" />
-<hkern g1="J" 	g2="AE" 	k="4" />
-<hkern g1="J" 	g2="ae" 	k="4" />
-<hkern g1="j" 	g2="AE" 	k="4" />
-<hkern g1="j" 	g2="ae" 	k="4" />
-<hkern g1="K" 	g2="C,Ccedilla" 	k="7" />
-<hkern g1="K" 	g2="G" 	k="7" />
-<hkern g1="K" 	g2="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	k="7" />
-<hkern g1="K" 	g2="c,ccedilla" 	k="7" />
-<hkern g1="K" 	g2="g" 	k="7" />
-<hkern g1="K" 	g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	k="7" />
-<hkern g1="K" 	g2="S" 	k="5" />
-<hkern g1="K" 	g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" 	k="4" />
-<hkern g1="K" 	g2="s,germandbls" 	k="5" />
-<hkern g1="K" 	g2="u,ugrave,uacute,ucircumflex,udieresis" 	k="4" />
-<hkern g1="k" 	g2="C,Ccedilla" 	k="7" />
-<hkern g1="k" 	g2="G" 	k="7" />
-<hkern g1="k" 	g2="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	k="7" />
-<hkern g1="k" 	g2="c,ccedilla" 	k="7" />
-<hkern g1="k" 	g2="g" 	k="7" />
-<hkern g1="k" 	g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	k="7" />
-<hkern g1="k" 	g2="S" 	k="5" />
-<hkern g1="k" 	g2="U,Ugrave,Uacute,Ucircumflex,Udieresis" 	k="4" />
-<hkern g1="k" 	g2="s,germandbls" 	k="5" />
-<hkern g1="k" 	g2="u,ugrave,uacute,ucircumflex,udieresis" 	k="4" />
-<hkern g1="L" 	g2="T" 	k="50" />
-<hkern g1="L" 	g2="W" 	k="17" />
-<hkern g1="L" 	g2="Y,Yacute,Ydieresis" 	k="62" />
-<hkern g1="L" 	g2="hyphen,uni00AD" 	k="40" />
-<hkern g1="L" 	g2="t" 	k="50" />
-<hkern g1="L" 	g2="w" 	k="17" />
-<hkern g1="L" 	g2="y,yacute,ydieresis" 	k="62" />
-<hkern g1="L" 	g2="J" 	k="-5" />
-<hkern g1="L" 	g2="j" 	k="-5" />
-<hkern g1="l" 	g2="T" 	k="50" />
-<hkern g1="l" 	g2="W" 	k="17" />
-<hkern g1="l" 	g2="Y,Yacute,Ydieresis" 	k="62" />
-<hkern g1="l" 	g2="hyphen,uni00AD" 	k="40" />
-<hkern g1="l" 	g2="t" 	k="50" />
-<hkern g1="l" 	g2="w" 	k="17" />
-<hkern g1="l" 	g2="y,yacute,ydieresis" 	k="62" />
-<hkern g1="l" 	g2="J" 	k="-5" />
-<hkern g1="l" 	g2="j" 	k="-5" />
-<hkern g1="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	g2="Y,Yacute,Ydieresis" 	k="15" />
-<hkern g1="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	g2="y,yacute,ydieresis" 	k="15" />
-<hkern g1="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="1" />
-<hkern g1="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	g2="AE" 	k="2" />
-<hkern g1="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="1" />
-<hkern g1="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	g2="ae" 	k="2" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	g2="Y,Yacute,Ydieresis" 	k="15" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	g2="y,yacute,ydieresis" 	k="15" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="1" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	g2="AE" 	k="2" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="1" />
-<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	g2="ae" 	k="2" />
-<hkern g1="P" 	g2="Y,Yacute,Ydieresis" 	k="2" />
-<hkern g1="P" 	g2="y,yacute,ydieresis" 	k="2" />
-<hkern g1="P" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="13" />
-<hkern g1="P" 	g2="AE" 	k="30" />
-<hkern g1="P" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="13" />
-<hkern g1="P" 	g2="ae" 	k="30" />
-<hkern g1="P" 	g2="J" 	k="18" />
-<hkern g1="P" 	g2="j" 	k="18" />
-<hkern g1="p" 	g2="Y,Yacute,Ydieresis" 	k="2" />
-<hkern g1="p" 	g2="y,yacute,ydieresis" 	k="2" />
-<hkern g1="p" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="13" />
-<hkern g1="p" 	g2="AE" 	k="30" />
-<hkern g1="p" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="13" />
-<hkern g1="p" 	g2="ae" 	k="30" />
-<hkern g1="p" 	g2="J" 	k="18" />
-<hkern g1="p" 	g2="j" 	k="18" />
-<hkern g1="R" 	g2="Y,Yacute,Ydieresis" 	k="10" />
-<hkern g1="R" 	g2="y,yacute,ydieresis" 	k="10" />
-<hkern g1="r" 	g2="Y,Yacute,Ydieresis" 	k="10" />
-<hkern g1="r" 	g2="y,yacute,ydieresis" 	k="10" />
-<hkern g1="S" 	g2="Y,Yacute,Ydieresis" 	k="7" />
-<hkern g1="S" 	g2="y,yacute,ydieresis" 	k="7" />
-<hkern g1="S" 	g2="AE" 	k="2" />
-<hkern g1="S" 	g2="ae" 	k="2" />
-<hkern g1="s,germandbls" 	g2="Y,Yacute,Ydieresis" 	k="7" />
-<hkern g1="s,germandbls" 	g2="y,yacute,ydieresis" 	k="7" />
-<hkern g1="s,germandbls" 	g2="AE" 	k="2" />
-<hkern g1="s,germandbls" 	g2="ae" 	k="2" />
-<hkern g1="T" 	g2="hyphen,uni00AD" 	k="32" />
-<hkern g1="T" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="38" />
-<hkern g1="T" 	g2="AE" 	k="50" />
-<hkern g1="T" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="38" />
-<hkern g1="T" 	g2="ae" 	k="50" />
-<hkern g1="T" 	g2="J" 	k="30" />
-<hkern g1="T" 	g2="j" 	k="30" />
-<hkern g1="t" 	g2="hyphen,uni00AD" 	k="32" />
-<hkern g1="t" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="38" />
-<hkern g1="t" 	g2="AE" 	k="50" />
-<hkern g1="t" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="38" />
-<hkern g1="t" 	g2="ae" 	k="50" />
-<hkern g1="t" 	g2="J" 	k="30" />
-<hkern g1="t" 	g2="j" 	k="30" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" 	g2="AE" 	k="4" />
-<hkern g1="U,Ugrave,Uacute,Ucircumflex,Udieresis" 	g2="ae" 	k="4" />
-<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" 	g2="AE" 	k="4" />
-<hkern g1="u,ugrave,uacute,ucircumflex,udieresis" 	g2="ae" 	k="4" />
-<hkern g1="W" 	g2="hyphen,uni00AD" 	k="4" />
-<hkern g1="W" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="15" />
-<hkern g1="W" 	g2="AE" 	k="25" />
-<hkern g1="W" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="15" />
-<hkern g1="W" 	g2="ae" 	k="25" />
-<hkern g1="W" 	g2="J" 	k="13" />
-<hkern g1="W" 	g2="j" 	k="13" />
-<hkern g1="w" 	g2="hyphen,uni00AD" 	k="4" />
-<hkern g1="w" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="15" />
-<hkern g1="w" 	g2="AE" 	k="25" />
-<hkern g1="w" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="15" />
-<hkern g1="w" 	g2="ae" 	k="25" />
-<hkern g1="w" 	g2="J" 	k="13" />
-<hkern g1="w" 	g2="j" 	k="13" />
-<hkern g1="Y,Yacute,Ydieresis" 	g2="C,Ccedilla" 	k="15" />
-<hkern g1="Y,Yacute,Ydieresis" 	g2="G" 	k="15" />
-<hkern g1="Y,Yacute,Ydieresis" 	g2="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	k="15" />
-<hkern g1="Y,Yacute,Ydieresis" 	g2="hyphen,uni00AD" 	k="18" />
-<hkern g1="Y,Yacute,Ydieresis" 	g2="c,ccedilla" 	k="15" />
-<hkern g1="Y,Yacute,Ydieresis" 	g2="g" 	k="15" />
-<hkern g1="Y,Yacute,Ydieresis" 	g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	k="15" />
-<hkern g1="Y,Yacute,Ydieresis" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="49" />
-<hkern g1="Y,Yacute,Ydieresis" 	g2="AE" 	k="63" />
-<hkern g1="Y,Yacute,Ydieresis" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="49" />
-<hkern g1="Y,Yacute,Ydieresis" 	g2="ae" 	k="63" />
-<hkern g1="Y,Yacute,Ydieresis" 	g2="J" 	k="35" />
-<hkern g1="Y,Yacute,Ydieresis" 	g2="j" 	k="35" />
-<hkern g1="Y,Yacute,Ydieresis" 	g2="S" 	k="7" />
-<hkern g1="Y,Yacute,Ydieresis" 	g2="s,germandbls" 	k="7" />
-<hkern g1="y,yacute,ydieresis" 	g2="C,Ccedilla" 	k="15" />
-<hkern g1="y,yacute,ydieresis" 	g2="G" 	k="15" />
-<hkern g1="y,yacute,ydieresis" 	g2="O,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash" 	k="15" />
-<hkern g1="y,yacute,ydieresis" 	g2="hyphen,uni00AD" 	k="18" />
-<hkern g1="y,yacute,ydieresis" 	g2="c,ccedilla" 	k="15" />
-<hkern g1="y,yacute,ydieresis" 	g2="g" 	k="15" />
-<hkern g1="y,yacute,ydieresis" 	g2="o,ograve,oacute,ocircumflex,otilde,odieresis,oslash" 	k="15" />
-<hkern g1="y,yacute,ydieresis" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="49" />
-<hkern g1="y,yacute,ydieresis" 	g2="AE" 	k="63" />
-<hkern g1="y,yacute,ydieresis" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="49" />
-<hkern g1="y,yacute,ydieresis" 	g2="ae" 	k="63" />
-<hkern g1="y,yacute,ydieresis" 	g2="J" 	k="35" />
-<hkern g1="y,yacute,ydieresis" 	g2="j" 	k="35" />
-<hkern g1="y,yacute,ydieresis" 	g2="S" 	k="7" />
-<hkern g1="y,yacute,ydieresis" 	g2="s,germandbls" 	k="7" />
-<hkern g1="Z" 	g2="hyphen,uni00AD" 	k="15" />
-<hkern g1="z" 	g2="hyphen,uni00AD" 	k="15" />
-<hkern g1="hyphen,uni00AD" 	g2="T" 	k="32" />
-<hkern g1="hyphen,uni00AD" 	g2="W" 	k="4" />
-<hkern g1="hyphen,uni00AD" 	g2="Y,Yacute,Ydieresis" 	k="18" />
-<hkern g1="hyphen,uni00AD" 	g2="t" 	k="32" />
-<hkern g1="hyphen,uni00AD" 	g2="w" 	k="4" />
-<hkern g1="hyphen,uni00AD" 	g2="y,yacute,ydieresis" 	k="18" />
-<hkern g1="hyphen,uni00AD" 	g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring" 	k="10" />
-<hkern g1="hyphen,uni00AD" 	g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring" 	k="10" />
-<hkern g1="hyphen,uni00AD" 	g2="Z" 	k="10" />
-<hkern g1="hyphen,uni00AD" 	g2="z" 	k="10" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.ttf b/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.ttf
deleted file mode 100644
index 7e0927722594fd4b98cb97ef8d845f8ed63c8099..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 48968
zcmeHw37lL-wRhFMy-)Yd^fvosdYOHC_BF{Q>CE(GLYB#F2{V&OW|B!V36n_(37g2G
z2pUik5fM>YBH{wC6A7XsAo7$CH$*lOHKNal%HtWqsKIo9|5MesyJvC}0^j$(@B6(k
z({uXPty{~fQ>RXyI(6zc<BTykz6`8k*|Oo)lhzA9z!>jDY*BBdXBl_m3F9NU_x1L#
z8M^3^i*s;)31ijcy+doera!*-V~o|jNYB>{)i-Uw@yLC+|2yu-H}9O-z54jrb&Q3O
zpZ{_5MSFd&|1bv`tBc@y=hofZc3z)x*;3qJ#hCTu+a@mDjreTFIy|^qwoPBU^#jjb
zo`L%!#<sjRwPj*5c5CCgjD606=WSDnFfUeL!hIO`rBgfiUef=^oL6x_$(VZM^sdbl
zU-{c7<}r5Xo2dV(ofDVrHeRee&e+|LA-!*AV&|5Do9fWsyN@uISFn56g?o?PcF&g>
z`_?}hQx5Llvt{=ik-%$=JrYIw8!z6nY3uxR2kvL=(J<~!0HPlI;i9{KLf8NCx8MDe
zu0Q(OAD$OaGI5hfF-*ZdXTJr2nz)lWZLFGgFg`u8cZONeZe{hFRX&zIxMnrJ8H>k7
zDg68`d+52$LnTmtmD$brlpJE*Ont}LX7)5!_>+K__z@*ji70!NdjU@=N0h%Pd(<Lz
zfjX^Tq<&R-N`2mNui+_UKXROT$|sHc`H|E|l)ne%YoDi36F$a%<HPDjsdT7;FiHQU
zr9|p}Q<tfWEApEw%+A`;*7<1P0zfA-vU71iitrd<1MWWy_%`5Cz~g{MRvtgbssT-a
z7C>A4E!G}?f_21?v-!9#h`-1><59K@&sG2i0mFcGNOvxtk09MBu472I0qL&8vzq{)
z0Nf1tB;Xdnt$<G>?QMY10B#3-7U@5aa=wUXhX7v#JODThco6Uq;2TKyO~AJR4+Fl9
zJdXk%!?W)I9!J;!OpmdJ@uR@x7+a4kXRi1vmcat?SJ0|Bp8q?rj^p{iBWD~r<Lo(L
z{XF1Bz|R2=mIYj#fcf!%qO=o8{ZEv30x6Fn<uUdGp1p|c&jBwX{4yW|xsD^(apd?b
zQvVgHk0bSQq&|++$C3ItQXfa^<D!mZNPP@-#1k0D1;(j5j-}Oc47rY>5AEoytoS#P
z^P4P;@HpTFgkJ)@44|hH3#wJC&49N51MU6?+WZf+`5(-Nk}QHM^W(opN#G7#$8miw
zei&FEM%{;j@nL30iBZ%SO}6U=gkJ)@46qCQJL7L4e;ob(2Kw?1^vxUSn>WxWZzO4^
z(Mv&&7*fY((V1xQcTvWAT%Q9yp9e@fzXd$rLXDEn67wwdlM_%J|0SCTpcWAJFCgwE
zz{`LZV5b86Cs;OUN2yEE>*c_+8c>UH6RyM+VWf-Tei_0m0ILxm#FaQ@9M5Ku|0={?
z4R}A`1AuD)9|T+*e+IlB2d~G$>v8aU9K0R}ugAgbadrpN+zGe~a5vxp;0u6zknf9l
zehBb2zypB8fCm8&0W|JRZxQuBwdh5(=0$-uVfO;UF9BW#_|ev*XyZ||@hIAN6zw~T
zvHW+m?I_xI6zw{Sb{)mI{X5!q6u2J+?ni<9QQ&?QxE}@XM}hlMjLE+P$D_dUC~!Oq
z9FGFWqrmYfa6AeekAj<yqQ7G3uNZhHhQ5liOyEhJDEX#1{u=t|HGv87EY(hYtL2`}
zPwnyN!6C0e-n<5R^9p3k^WckDAXi=kf4u_!dIkLT3i#_4@YgG7u~tthYOV#w3q{Vq
zu|?>$2;x>FZoSC;H})RUlQHyU3_Te`PsY%bG4x~%J^30+{~LNNh8~Nd$71NQ7<w#*
z9*d#JUPH})L(P9f&3^;kQ{$i>y!Av<hSs7d(&gwv<X!|B5<wbGey&EEbQ!uHY2Jf0
zS0T;SfcFDF0JsM5LBQ$cDap<|kmgRnU4Xj*2LN9HoKB`{vQuICkYCUdSQc|ZW|p!F
z^iLILRx7Jz^?1^RStOG!#wVXeST8GJ=dcxQ9$U@UFdrMloDyW`;Zw(E@Tq54vJbKb
zb{#(L>_&V#*iGyf%t*JgFQAMs;<JiH@mb9du?JZndk8bp5N4vs*?RUIdkN*ejL#;<
zb6*lOb1v)PV|>i`rtwWvj=95Lz&f;RR!jD}>~-$l?%jM$e)BQ5T+Dzp3(f_a74?8-
zN<E<2Qx9lH)dQMk^?+txJ)qfG4`_zg1Ddt<fM#+%pxIpqc)8$Kn)T-bX#sjb9IXeW
zE$9Jh5PCpbg&vTmp$DXW=mBXYdO%u=9?;0s1JY*nfJUbt3?p6-NE6b7bAi7ekjA73
zq($igX;ykb+Lj)W#L$DA5U&TMsp-MZh}Q$s==6ZJJUt-IPY*~N)C1BG^?<ZSJs?d|
z4@kSz1CpA0KoV0A4k2C-NL$r|2N16ZhY_y_r0MFxLx|S{(unoon~2u~(wy~xv}rvc
z4O<UL>(&FBP4s}Yb3Gu9T@N6$q0x0>wmlcu4PsWNnfEo+`WkY)2I)>(vmTHpst2T<
z>H%r2dO%vN9*}0M2c+%l0cpT`@EmBO2hSs34_-vP9?%Lz2Y83j6iHj03#1S00qMwk
zKzg$tkS?tUq+ja+>D+oidbl2tZmtKUuj>Kn@OltI`FcRQz8;YNuLray(1Ssw*Mnii
z>j7!(dO&LoJ)m`m9?)7u4`_X&2ef9<gKH442eh`)16uFs0j+`b;3mZD0j-tv;AX_@
z0j;U@fYw=hKx;2Op!Jv@&>Bq-Xx*j<w3gF@1BllHTJz}vtpoLd)`og;2=RJAYe+qK
z0P%W2YfU|%^`{=tnp6*HovH_9S<!<RAW!swR_%H~D|tQmo>=M9YIiQs>Q@hFMXU$3
zO4frG#OndAruBeU*m^*#Zao-8ydKc{SPy8$t_QS=*8^JF>%mQk*8{Qu=)uj1*8{Q?
z=mA*|^nff1dO%hNJs``29vniv9*~7X4<10g9*`wN56HTq2W0Wk1F~c20a-@$fUG5Y
zKo%4|AghWVkflWru=a(`L=VWWq6cJa(F3x-=mFVe^nmO%dO)@tJs^9I9*~Vk56JGL
z2V@J<1F{e4!S{sCi0nplf$W@mK(-}4AbXP@kPS)?I$<}`1F}`=K?L>c0ok<lfb3j)
zumSbz0olX!;40Ls2V^(X1G1&*0om8|;2Om10omd7fNXPmK=wL4ARC?@kX=s?$kwL^
zWdGBH1BllHvJ>h7*$(x9?1_3nHby-lyQ3bEEm9B2POk?qBVGr1fv{teEpsl+wGwIf
zdX^%JBO9n5G~t;Zv>;v&^ejjeM>bVGAUmrbM9?NZ(6b0poSsF9;>d2R2ZMN~2g8Wh
z13gO-#gQFY56CvG2V^hS1F|9O0oj%HfNafra1G-1fNauwpl5NSxSLJ^dKM>&yZIFG
zNyO{HEr{2HTM@4ZdX^u}j!w4pxj?pcJs^9#9*_-Q4-Oz+56D)p2YQw$iaT@)(6dBQ
z+yke8!-&^|2NACa4<TL;^ejKx{(_$MhqGMTGi6RzjD3U_*yI;tXJ8n%^Yz$AxRQO2
zJ%XKp=h+MFMfP*-2)xV`>(jIsV7}S%JS)Qv1dGeRm*Pj`KZzepzr#+(DgM$^ooODe
zDC9k=g+=XYcd7W<p?8x9W&bt3l-YObPtwD)Q_a3hPnRA}Zx3oc3T$Hp>1pPM-%XyA
z%6KFGVw~VL^Z{V*bG>_!{%!KS8{FPao|Ex|bY=wa<nL5@;{TwJR?_S{EmmIRZ^i#f
zfV$sBo<tcxj{j%;am;GsFD~w67~jSOBqL-%rg~?2DCfJO^}EV5i-W<_Z^T~_@H%h+
z=>5&+`ZLTki*wJAkKaw6BsUP|#2bX|Y>el&DaAo&o(E+fNiQe<5_+286+8jx|Gk?$
zb4xnaSeTnG{r*hyP@2>qB;3CXcmwSL=>MH*9+ZTSEF=E<th=AYzk@mHJJ`Qq0;tDC
zAI?g3hI!Jl)apx*d%N&E%M(8WnUWkM@{TxLa(5~uYE@V(yzH{!F;Iq&!mz81Il2NL
z6Z{9Nut#2vj}2Y~wb+TM!zUBo0rkkygpZ3g<KsaYtt^MN;gg5``gY9i9rzSsKYjsp
zgHC*WY!N;I_#Q;ypU{Jk%9i0{gfBube3Z_?#|n>x70@YG<Kuu&K_9e>HTXE;pD@VW
z@Glr*UbYsWT(%CMeC*$!%L>^DKE>FZA7drhiQfQ^lK0>f6rK#F!iT{id>Bl^hrtCO
zhFgL8r`hem@U!^%*yr)dXLrE2feYUTqwsAo3*QDed>bA@?cZPzqn2;u<HtVzqxdFo
z2OnrwB`9bH4NE~Cq97MkQv}sqf>NrWPL80CK~N`GP=|aIIzelqj$2SCThPTKXkit!
z@QC)?M4R(On=?e4^F^EOqRkG`X0K?onOz0%jZAheK3SsuT(n#jEmuX$b4ANdqUCv_
z<=N~We4L{F7SVE>Xt_<aJYTfjAzJPbEjOW+YZ9DO4t^nTlUndcJ=)t0erQ8mJJ7~X
zv@C-DUWR@qpOe+-*EML-5c+W)S~G%HYykE%!1`+Te)a)&4Y0osJ$4iO1iP7i5`HJQ
z0_WS<XV7Dx1;%%<JK0_AZgv3u^+oj5A@())06Ppnl!t)pH`%w)Q{M)rj{`#n-Yo(T
zYW}6<B?`S$@IHJ{`8s|hc+jBiS1v=`QhDVYSrZRgj7o;dq$r9};dd~!i?Nl7d@Qnj
za5Z+T97mYyi+3=lUctVPXP=<w%EQXTxDaRHK>~^dE{y#SF@#kSM%k0N)*+n%eZ|1>
zSD;M~us9#$mnh#;UiR619$$fPo-g1l_tpCr_%`~!>JJ>zuy-IQaqNS9Fp-}5vVD2J
zqD1=nY3X_VukqhPNBB<svG`1U#fcLqUOn=!M;<%!?IRB#`Nok4kKBLc3rDU#()#Pi
zeB_<`4*xiOfVE8UT?GN=6o7}S!DupDthNlhBQq=8>2iC#Ik|cH1%*Y$^GbaFK(Mr|
zyrQzIx+YXxSKrXs)ZEhA*4{CH!NSf(i<g9#c6GxGyLb6HD^{*r-M6NHU~p)7?YeVE
zM#t7~c+Yto$0yh|AH43vAHU`HJMXybz};W?;+O9I@>lNr>iz$6@N0)2c<}Hyzwxby
z*#(nZrhakJ=XdRRW#4vo?X7GNV_PMf=U>L|dFaZ`JLzuvy)SRN>I0vA>^nbu_Qjt+
z_x#t{qmQ%S{OZ?ua`6i<vG?!4`uY!j<f9+E;S)Ern{NBer`dO(AXn{6DCfz4Gi(w(
zJxRQf;0SO@e7^ET{O`EOcl_^k&-}`zQ5K5&#<$i+dB`{Ei$2yLHI$D<4L$2e{6T-=
z{t;iazkkFZ4UZQ3q8$|K7#;ORGkPW_qm^`<(c_CYP@sWQJk~$r+v?lDf5I2F^^c4r
z#z)U=6l$YT+j!yl=;&x+l+}!m2BWNhWXtGiZBz;QP>!K&0w@@}`$wY2U{}->>?-v8
zN27eaHmZh#z{fXv(736~M^6rAaHZOhV7G6-Z$FAV*kCN%KQJ=hUpO&1Iuabkv+&Re
z9uyMxiK=R&hEUYpU2_PG(mmc)8#UrK*cJ3eS+Hv&detUW7By7YMol3fVWjkIj`E&O
z;}L;`Sw^y&;6aO_Y~0tgKR7`|6K!OLM2D!a5VdL5Mb)z4L_}t`gbo^wJyAXpsf}7g
zD9`7MTDw;e2@nW&jYe&BH;6kM?rNj9knbS_+eBZRQBgFbd)&8w9JB|%wb6{w%HffN
zW*!+WjXJgjFR6{%Ln{YHRu0L?LO<f&BHj@?$n4!~M-JNU-Kf4RYO5KIvhJu-)^*TI
zUp9P2c@Bu6mi3Pu<e&_?qH90sifXOZ{vfhx;X?VGvM6QZ=_s1f3*>vpLBABq4&qot
z5KZrnvc-ou=Yrgsz{S`zJi?;(V3%(k<sNo8IOg51uKnW&9mbmI&YHpi8lQ!PnKiZ1
z?9f3@S7+#;LRVMlph{PF=%9hF9#EC8-q1l4U2{SQ&2-HT9kkFjFLcmK*Zfe_QgeoN
z7ohHZ<S9hmbS*;NbS*~Rbe)H~=~{xi>FPt>boHZdx&}};U4y8buB9Pgr{JHm5Sr{5
z_jQAy<J18YxJFB>{k75ZP_(QjS_aOm0F(8CH#F7@PILr)``3=ljYJREMk|x_<T=rb
z>L~X%2=Y~>H+S}<>X5HhU{e!fQC0FcMu}D*1zFAmLZ(C(2RjZ{b1$$8p$))5OEnG#
zn&_yF)`seGJ8PqLI#1E_n~|a(#A7*SzB*qojWIO(oc;TIgS{9zBb(5MD92c?<J{{(
zEe#>m4c^1QND?*m)NI*b7xei$_oJ-F)MH<rEF)?lLD5s=i;mMc3J;8YP4TI|!mlai
zYQbn1jcf}f1nNVL!DV3VZg43^5v!46O6eY-3`W)NiAfAzrF)_f;qg(71SFe4#Sn+V
zWfL8RL6ox$*yAF~LJ_hk)Bu5i8_=XCYDAwJDKGL(AW4}h9p4asg+c#lszmf&6Sc>O
zI*jFs_5?f8%w`cCwP1w!e9MBMTMd|?HrgVZ56qMVb=dGoov#yOn(#_QqOdgbmErCj
zJOZQjYz|6_ONkatP!%}UMq3j#c57rEr#S(w&?w&)3i|4(`O6@mI!EgcmU9m{yFD2V
z;-{iJlF=fymUUK|`Jre-jrL?#p$kIM#+v=;a_ZatVE&UT2C?g+<*0w5pa}7cM!+a|
zAqZBj1LsN{J24s|&613zHSz5^r}v#P3sHy0YG<&c(4W?E{?P;`i>S#O=@wHf{X}0v
zB!O+RVN1|3uN*NrVT8fqu8W2+K*FbpUkW+EJ?>~N(sYHQ^|*8sZF)dG-!h1CjT#XM
z28@_)5U(e62xq_$ScU+nKyT;}7ct8b5HaUannifDg3?f6C8eRjDoR6v)s$vF0)3Q*
z0&6G@1^Ous1qLY1LIegW4F!fM4F!fN4F%Rxn#BmLqcjvam(oyRgwjx8l+r9fV2sjG
zU_GUwzy?Y~f%k->O-VAJM>o+nL~j(Kc7(<S*C4tBHxr>~b29ZNx)G^2ix8!r6d_8w
zB@}H*Cf!OmBIz~}qNGzIL`k=YqOHlKJLpCvJzs<<>9hz@(w(82sAWr3E$zRA#CI)8
zUYu3KIw1>6iXS)C%5Bix&8!YnZ++(>v!Uoenhu(bFLxeN6$IHqm7<LleaLJo{%7YQ
zPVvo7zq6v*8T51OtKa{=a@&cmer1F-<Vw_V3v@#xR=uTRKlqCcAj;m&6h$2{a8-4v
z5tGSeHCbIQr_oj8b~ZcBL33-fw{j+P(7uD;%1dJ}pZLs<9mt0A`0KnF<q?iKVYiCO
zo((9_yzM;VbUL#Q?izQqIoJ-U+>yQVa)9#ikAM7Q%A1AuU5~tlSU)cdcbg1~l4V9-
zg^y)g6qfDCP^~s*9W??gd$*n2Yz|w5v66YkMaWZFke`>EgVBL%5`TF$OL%iTDnoSw
zfH*2f^#JiG%hKp>vNSozoJ#@CmS#7=JLX*q*tFEW^vS-j_uYv<T%N>V-`A->0`Z^m
z9m*fDzFr(&=*(0MN?AZLa;1x@24+y%6cQO2--;#~RK>8Kaifv10cni`%*c&Bg)UEl
z%W3k~w1bMCrq-4^wY7!9ImJBK+7j@3=BZwf$?OfbmItQxgqDOud&e%CnxVj=1!ET<
zYG{u{Dwa02pWFWNf|i!NPvjK$^vL_=BlhOzJoIKD{+2SJd<WW;8&--St6}e58LjId
z30Go~Z&ggz4Zx0D6uzFRDjPDOhdkZPVlfVxZHm$8Fh&Z)4JRcv7{C~m9)0cUwxL}P
z%48m5X0z8E84Y_qp6aUdvVgy+(39)Qb-UeOcZR3N-P+RDgw}aXf%0}w(;|*Wx_L8i
z*NG3bO|{{F+4AM3+_N<HS~Pjj&;Nbff(32#)ffu>ITSkaW#!=$k-4#g53AyT=Qo3w
z{M7QWP31;q9yeK(u9eYZP@%@a6)QJd6eD_vi}r|?nTE{VWD<=^1Wh1B)u~bsutee%
z1sqisfgtf<slUROhc0euFGqV9a&IsI0^}^@=;&r|(Cf(!mRFd9fp$-GQ+sPLVDeV2
zT6N%x%RBu3hMD4G`)-R;e9mPv^V`(w^1!XV7X*B}9rsN}YAOSLeUrbRUzFot@}-_d
zcU3i@y_}Wt*V)I!xO0WGlA{=7E?aSm5mzQh8l@!*!k>`V&E|y*)0&SFKZM@JfcKaA
zgBYpp&XzWTxXJ4z%+ZAM`re^HVPRfgVPRmX_tSj;(6X_@(%40%g=5R8Y@C#3KNMw4
zX`&24kbtyUdV|SC;Rw5#3spdxG`BW4wY551%4<NDrW{mb3T7vZ?;S$fd_R>v6uW3>
z8Om39FW-;yGg(nMKht5)uvsl;6D%XJTP#7zb{28->>77_Zbh@XJ=dITt}s`$D@C6y
z7%TW>(Sd!-SFc{aPjReW`Gqg6TwAoS_2!#f_YvOt?0$ZsV#j!?!4Sc@UcMS-qF@YZ
zbreK03?R<XgDP;qNyry7@iiJCdNbIXe{J8j*Y@%DzU!{*`|yXU%*y!fupRBdDC#<_
z!Xm-Je0DIOi*ZGPZ3i-M0P%`L0gpKm$<I%Z8x7lVYhoss)8HgZc_FwecQn)%@7TC&
z66FVZi2aG*2w7Vk#x5rKcr`L`h+E7VgsI9@rwU>qYw$@Pnw&%&;e~I)OJ#XsFU3#}
z?%<H6S{ACUa)*%V9MS}5%mr`B^!DzP(_=6jxo2bSH5!o+EhQL#JC!Gd{2?w&3JtIW
z9|Epk9wFh7;4<0uLO6gM0^X8!cdf(!%$_~>^6B9X8-`;y<9l^a55KGjE#qt&U-iHV
zXHUZ=ICRZbMfQ`Jxj<30#lkF3IcK#twY6jRb5751$X+p{<n%#yM3fv!3%(n87O}M}
zqgHfIF(P3a8%KV@yO4^iY8WtbgTY}yKf#1Y&s7L{y#%9SJ029VqCB^&%H&43wJe5o
zFQ>r|*$ye_^<=8Kpl)qATw7c;e`@%S;l@Z;mFekq^EdYPoYzqs>{%IEyMF!J@CE(L
zdIO0*3xJ+GfM+%P>fs<)RN^H<w}u%FFlqr^>h*D;20AF~nZaNhf^Y)%oSTQGcrIKS
z%|Mn=S{5+n)amntYh`k3utH3H`t+mV+5)$$%wHC8T5{zKhanCLD2KQRrHBEEXim%v
zfvNdL#ewp&8oxh5mes34n|l{5?Fok38>%J)l@*{(Z8_1#wc8iCpdBF~MOI7xe(-_~
zGN373?;!T?0!Q<uM$So#z#tn%uLubb>4s1S65B9}U1mtRR(G?LByzA7DpKZ?m$bCZ
z?A&?fB>#D=V)9B{(cLTv`k#+F3fM)5oj4(%qCXf<k#jzWzkvxiCeYt#B!NNGWg7iK
z`c!I=a_ec6gOZ*AP;|SJloT^37|HGT2F-2FO>#yJPVLz<<>7%xttCq@lO&5oZtLms
z@>?dq*nG$Bf=r;3A8ptL9?D}rw(W2hHwi9sfF(*Hd{hNYuR`Rhru7)4i8-DcGK7YB
ziTBH7GO)tw(v60#Znvj2;0~B`XbOQ`7rc)tu9zp0*3<z1z5T;e^P$6?bD1{aw?2pt
z&hII2xN7koSJAMKM6RGwPvhQ?FX{&qX{%DGk_gq5R!xj)Qq$e)_o^TlUvbyWoyy4M
z_=y9g_o}P_wAce$cwv(-XZ7JwrV3HdyI=%|%BE5WY7|HpSngm!o>1K6tS*%rjf3S(
z4(ZjJP;m+(k<oib#n;T@Mf~#1FTb~ay1Z;Eha_6gw(|1nc7)Ddvu5d<H78cAsOaxU
z8x@>ICtlO~$;%B!;x^e&z)e-?(6d1?LbEiPG%Qt>4@<F1{e)x&1^slobkt8SbW^Dt
z{UkLs%)gl87jdYiV$cfpM5=4W=$%woK``^1sc(j3x21aPOFcbTL`d?=b;V8m-$7|J
zs|uGh=*JLEm`TxpSXPLBG8iDZ%?3>0NTxbX*<zAY6I0KQ9sGSX0ii6KM^TmugLcEL
znH1WKm`PO=6mHc(r7IBCi7B-}PN{kiN5d{N-qm5YnV~<RV9c@R<Qyw8z&u;MgJxQZ
z26%5Cdz4S|6O{aGCWTjmXk}h=u6G_^cH{^q{!7;M_pbrILH2vToj)(yUIz)CYC9y8
zoT5PiOwlJ3pdI{L1_<(Hv2XHazwhh2tFMpvz7loMB<jZ6q7qW8y`t6Vtwhbs9;J#e
zK{|!uT`hbBypxYT!f820l$kI&VtkKdRibbMmL<u-Z7>)I%%sJWx?i412MK?=gri}1
z0kn;R;)3F$Le!I=m+!V<U8qfNiqLE^?I~Ew6mue`XYh`}s)j1VCR2H+e8#$i|D=b6
z_@XWCYpQdcuKeb;t>-Q1=~)$PM29OZFaCt`dF6L_m&juF^OeyG2&l|_Zd0?cf(mgn
zSGx+e2qh6Qno#S(04B($_0R{H&8XVeL&?X)Xg2Z<%#4M~8q9>2A!adKdNCVP$)rA~
zvRILYS&iJfhMh8BxKSqy=0+=teY^rjr!LHjS)B`7n}emL0SvkF(u}+sHz-6ZuP0Lp
z1}aPy<xBWto|}`~-mIEPDJGr4<n`oWbzsIgEH5+V=Cm#0ZRNpolR2+`^kZW;zrTF(
z65pVyq-#fZhGlWfVvlKjo|;=xwQ0*W*YDeV@rY&k(z`#$UFN3TVuMZ1%gHM?@W6R@
zy|?#{YtQ{akFRTqs(xzAid70<v>^8D{Oix%biot%U;g39c*nQC5LS4Je`8S*pBF%D
z73gt{-vGI5#u$W#Y{PgH!V(Onj3I@++XyC;N+d><nVB)WnxNpjo87^Rpc$>o*nQ{j
zUGD4L{vEBPBwl&tulOe9R7oG@m!s@V%uIgP5pK0`Jy9$)J3eHR!h<n?Nnw6ojx!7S
z9DXx|hf~Zn356n9F<0%V;g$ES?du&}JGf*?ago0qCO3ZvP+2pWKkfHjG=E_2WJ&p=
zhB8t#mIEcB!*0V^%4HkmND4xrU<i$iWxbj{kW|$;j48uQ<A^3x8fa6eOE&s-Hzszs
zn<f*ivJz8d00J1|79$1=<q}NgG_%u;&ZlX>L{|3n#IB7*Cf_5cbo2|+?lRFYS*$!9
z)b#8GtrCJ3uVZl7s8dXSqoflFdJqV@HmGv{fdk>i9UY66hwqDh4ogfvO)^}p6ZkO7
z&R{}{LBNs#hvZ6Fh)8;vr1U`gv}F;jO;D#urGlQzLyvswQ;#SQPkwjuN0Z5NSE5`i
ztE8!FZn+6n8%eFqN-Hf=qqP#9l{|R(qaQ_aKbwrvhG<$p<+E|wPt*e#zG9kGjhGfv
z5>HiyUhJi1J*hKDW)#!pDbvw3NlKWTrpc50DoFAz)mu%so!nhlPyQ;=Uy`OD5HzLU
z!a7sshEZW3>!!sfExysFS+oRS;}gWEa^`)zcfU`0IQA^Z`h|yL&x-bg2ZRkzThHmO
z&rm|;j98m-W`n=iF9i-*JJCc0IxwXRJqxzMU>^p(u!0J>0xGT0A%R+v9h!m7Ua(~5
zbHPd8t>m2eOH|_#va@8cvT(p=HGxNj@=X!}#xGHjY>+e`Qd8W`synEfVL-fb=F^|P
z;QRnu^b_6~dop%8&ketzwTTmt7=?{O=<b{=gQV-p#hsBEonl>#0?8J67>&DE@>c~A
z`z!L=X+&gLpfDv-!eR+X$r9|$?!x*|a9497Claec)micBft8=0S~WEYtg`q~(D_)*
z#{V<s6nIhD*Pv`G3x<6bl$9(xt+m9rV&MtY+`x}Y-G9NR3qFh@-^1@lk#EJYs3y7k
zU%O70@&Wx0eBG=%TmflIi$_`?CX8MQZ3#9Rrya&sW)1pH(1ajMvAC$=`8+8`EAKjR
zprxe{e=U#{>+g&GgP%XIbbBdY=|=5%j$aK~>A~8!F<fVb!6cibx4>1jY&<tjpEekT
znaQid01)t(r$iuxl37}r$Sy{P!lW(0Ys$A}_2!jU4a~9$EUd`d)Zj?j1!Q}#Kznmw
zL&jRr0#Tftr;<v&z1x(WtV)XWbCEiytiW#ux2Mk`Fwn_$t40JlgDgMCzS|ZkFHcS%
z?bCshi>Bun&Fh$HsEYlTUmd9IS&nw+LXY1FngrQ(a^)R>sKbaK2M^I&(O}Rl3{Y&e
z=|d{|5ae1)Otf3|lVYY3sZs`Ky%I-9zh3Ba=bvP7PR%)<c}5|^a;2>q%G%USUU^+@
zc^=8KnkE>VdpZ`ar{(rqGBp>sR9DqDFRPM5jWY|{vjH?WGhetE!vKv-?jgvbCe;Dj
zJs{l{1I@yRFPy=8Z1Tjtv>v1N_20z0&cO=8xl$g2Na`>qG-4D84`C^S7?Q#W5;r&_
z=Eg57-V?uzM3kZve-a3h2La>P0UwhrD>X!=TywgzA=lhA<keutuHoS=(+40t{#98B
z%N5~*eF&u#`R&vm8%bpha<YApOp`WD2o6`a5e7giMHa+^S?4co-O)aOyzi#U%1@!h
z7nRBr&nhIT_r<Q4<?_#?Tq!HfFej!^OOqZD{w|k`jH7N<l<f{?@T~V<xMyhX)(hXe
zcWgbM;={2RS7Kj{-O9bOKM~Fbe0>OITgWa7kFhkFCtD4CldXoO!*Jp7@b>E=8Dihz
zOJbo{Uqu<YC}R|5SZTgDVOBr~C>X(r9*~nm+MW<%AuK=#Va0U^X`$Wh&Hd^3dB;zG
zx``i~+!V8sI7Yc-Z~ixw3(v%`pIAT19myRgq)74z#vpj4*<1hM^5x3IV<-MThB8t%
zNV0Dy<^z~46ZUN$G;W0XQA}{6&K!J`9a^hX82}l?^rl~DE2K0aXZi96#}vyLIDs<{
zzgE~iO~eN<C4mb-4_wGh3qv!$u@n@u5Lf_euGw>a-}NJ7W60MQd+M2IPzH<N!{3Cj
ztIBf2v^LWgfOy1v1oB?L*U#UK*=<<-a~4v5!+xXopC-M#IX4)(AhJg7-vzmQRxigI
z?yO#ZRxh8shB~X4i~Y~DdU@K+dR8w#tCwSrJ*$^%OW>r=byhEjuK53(UJl)n9Ywo+
ztTQ~{h;_P?8yPJ2Min|g40|ercT8gU3#v1=!D%NDyWq&@V?KYizsxC|Aevy8Ud*MZ
z2(}f?IVF6aye+Tibv&aaN3j?dHgsec=3&=r(ISIU$t%q6Xjo{lC^@`wEI)W{d&gKw
z<>Wcp+2>4FmW*|@UmMIvEu1|Qf0T!m6VQiG@8ggQGs`n$OV!2yd|c$q#`iI;Z5~)6
zEZm?LlfA7AWzl94IsS<Cw^$VzVOJLWAfjz0PA^)Aw!sgA8rRk?8X}!ksBz8SfGLY-
z@?f@Zn@SQbKB-Nzsc4sl=kROzJ+R8uhO2E>tSa0fwMzC9ETGo_3#{O<4JmQtO0U1n
zA0X$s#W2XgBG=ZQi`uaW4&XdXpnYEPd7kY2{FXpl2|~{NJie;AVo`3Ot*I2>SSM&U
zLh|#2{hnOtQcI%bjvTfV8M*pd%vf+4U9=<TY;VqW(k4!2=3wUZ4qkfVMC@f{P`HMm
z9i{Q3d|LSdD`YcaJFF@SE67!_6@U%PKw@Kgt}Q&V`h&?F?r?JJsRCB1S;?>h2S36$
z&1h8Dfb%G+YU~;Px(Ak6k4IX~(_Q8?ySZ?hE8RDCDOt`h9ozRbFM^L;bKcDj?XaCc
zABpsz^U2)imOSDu7_NZ(6U@(cOS^F;17{iy<0h_{u~Jj`C=e9JDo?isYdPzHja#h_
zD{RMAGO054wrNM<+QU$X-{thW+}Q4NV)Lh&JW`;d)?t$@-4Mg!84@&^o4xZY+xS4Y
zxhhv$W6DgI?lCuhdwfyrTKC|9u*CGN>gj1;+gGr*w<595#)c;UAb389_E3bcMwgA;
z+{kV}2L8uRpUGexMa#$)0-kH8NSeQ-E1Nc@guy{t?#UqnC=!@292nSs)zJF&>t_ID
z8T|oojSaQew(s4GFYs4toWeKto$Yzj&{f6o9UEK9H^)B9e?i|M8p;jEzs{%7N3}S^
z_u;U$tubFQU{@otA6_E)1{*SPQ#cPi3)wY-aU?gz;a0UWnguTOrIINI<5rz?Vb~=!
z4m9egfgLUAE)KeLz<h3O|ED?*gHXC`nn6w&ro;vgS<T_t+3v~7UCdisDll4mdWLTw
zo+>VACr3{FzDMe2d&#`Kd5iOk`GTQ}+O<p8tXN#?E%bNf_zO#Wn};fE)=^YbP>X6W
z3S=2-itFYXs)<G%HiLhtOCi_9UOQPRU}nGtb{nIL9R`>h42HRT?c^0kZeD!6V_f;o
zIR0oa&Vy57KLow;wtm<xzbzfsnwZgKF~P~mg56WtE#V|$fRl(Bj-+NdlIr<(f%4?A
z(45L?vY27VJd>>97MaU3g$mC&8}?Wo!2rYqc52*i7kn?<vfF$)*(RUj$!Th9DGy+a
z8b)pMu!U(`ZnFhE-{;le|9<TGD?j`CXFvP8^2+kQzU8lcm$&`k2eGGqz<+!E?z@lQ
z9lPT3%P%jjZfN*neSK%gW#CH{vg0N87x>r0lY|A>_rkUkZn5SjJWSnac@6FUsfKa%
zkJX}B*P|)i#4I2iv!Q$VT9Rr*kS`vU*pyszLo$mpbw+tWTTug&gGLsUIV~Hy#$wj1
z2}HuY>i5knD#*+6x}8~>b{m8}xnE>t3vaCo@HL!P6E0fKO<rd(<)v!!&U^OR6_KJq
z*S3ud4bHZ{Wu<;~`Aa=LKQnZ9D0O8ux$a%NVsACHo?lbir!GW0vRNM=QfMbmXjj-E
zg0G%1r=~F}yu`txFnW@am#nGop#08Wym`^0&6DDrZ{$1{kNqci$}7o-gx@CrAj<EN
zGCUW<K{!`J3XrdbaIs`cPhlADe!|0Y&I9RYsck0-MYuJekC7+m3vlB^9q-Q1(lBc*
zl|h273@;}R;axVfVl*k(@52@`xWho)fq_BHp*NPYvukTA%d^X}%gXWt#M>D;C-b)4
zuo13E$$bkiv={7P)bQC{Zryu9ON+J7oL5*-Qdd<vm)mXptGlhMa=n9f6&_c0U7+aR
z*PC6<po2~MH}+?>8QgMuU5q4)?f1&Rk>?7@r!0>56eeU!VK@&l=!kQZO{IMxw+lV*
zqN$JsXkxr(Ef`#|V9-)rSzKJHbWnJ~#S|tN%^>`Bx5HmIi?zTX10!t*e6-0%i%A=%
zYdH6;#)X*&EgXv+xF#cI7HuZu&x(CqIj@ljlsnb%&FTZ(-`C%_XAi!p->c!HdtCLy
zF1}t$Gan+c7eHegO~CtwRP1G~Mni;usA>R{`DGHgUY#n9^bpNuxj8OZ9yT8#mB>R>
z`iC}=I|y`u>Y}QuqUBvr*SA+0ui+cpN*C4EE($h<>T7oGY8-9pELehiO7Z&yZ>m1#
zXNM0L(Y79DMVjvF(i}WFd_ql_9!=19HQ!KfHjCp3<QK}#%OQPS$W@<~3q1s>@;2Gv
zIwO2f(N@~xJA*9b9GVCD>@O8Ajl?IyQ%<^uf>RSj(7ZwerCrOta5b+6B^n!_=1-MY
zg_;8;`AZt|n?pspyLV^wdc4bnyFrUW%z-};cJsI4O&kR&j7)D;ezR*A^>HTF7j!n-
z!N`voIw<xFr|8tmc1?}2D|B$h8KB*sR`~IYo%o<TP@Z|<P=8y$vN*yYSbyIMRk`oP
z5MOZ~%B<v7@K^i98I6<59lT1@r3>Oa*{|Wv;$feVT~baGo?{LHeW@dp9jKir!KNWM
zQU}(e11pmA!P_JcL(iqT3F1fVxKor2ou?E{4`f5<0awB)uocn--9~;(*rRPNSdo)o
zYHKJjZE7B0WAWq_^tO5n%JLRqyg@c&{CrX^glwz8RwWHh2xM%aVPQjVB((nE3i)-O
z?5LezT9Q$>OgYq8R1}NAUmSlb=Gm99rlUDG3u6*Ko3xHYQ!vrNDTt<2qfzdt8nHyp
z@w%Luj>O~!_aIs=(BwAv97^EXXWO^7;~ytZFq8fAGp!32w9;2&P0igk@ZOs>hhb0I
zMmu*W&0(6NC6-VbrVKbiC6-X_*v8ZTvoW15Uc5wn_h~bkb_H?RQgjKnu|N_#+E~Ee
z6CNuN?#7vLe8WRKS4|*a1~+Hg6pPVp83Uin^_$S?jRRJPJip^`Sgj1+d5&C%I2Pq{
zW@lOLR-Bkf&^wE^V-t??@-R-CA9U+d(F0ZD2+mDcuJZePdV7_jM1P#Pk9OMn!{mYz
z?(YvD5dA~AuT9`y%5IV}vyquG)tSfP)WTH@^*p9Js4F;sl)~F;H4ZpzcC7Y<Ct{P#
zL;QKBnMT8Y*<eShqcj*OBG)kQtmbCUX>PNg+?B1)5UqYZT?Wr-x}HD=4GgSQ^xt<N
zlgn5GYvvonStOd9(R)f)1<&A1rHo#hl(wV|ilJ>IzkN(y=-UlhJOc;I?A8qX7)&mv
zAq!3=!I$4=vko}26}bkLGNLQ3AX~ya|DBga>SuRKoZI-jEh^mmPD-&@z_h8O3hB+m
ziy^}P^725Ssj<AFyrI6XHdIqxRT(G?l)1Dy#DxXx+s+}m;+$DJYtNolt`(jAp#+Qb
z^G`9yyfv5OAs67^LH=>%YdfiVp22U_$iTUf*vffiQ%ao!(7YMQ^DLDN9%x(j(_ukV
zP(XgRP>=F*VU21RPPG-y!f8}YoznM=h>)Ffu$_X<;JrKUJ;}Y6oNjrXW*b%R8)LpS
zBb3S7!!4Ouod{1ExQrV|G5IUpl<@2{C!J;Fc`IZh?@l=VYTlhH_N3L6hi5Uirz<rt
zPwZ2lIKel~s?&x#VRKA)ks86>Sn-Ww_@vxPwMsK!rOe38z)`QHTd6fwG2BWkFr%lr
zmbTL5uDO@qiAg@at(nZpy2D`yHyWJK3l+HgTTSRMYB6rPIniP`b_ririv_=cnPthe
zWYR&iM7wRN>QxxWu<f7L^!m}wqvzFzGPTx|p3&Ye2q0vn*soVtpeT~={o&Qw7R7AL
z#Zj{Y4(ZsH#SLN5!E7>M{bocr7_lg@05wYjHEXgnAmMP>6`1KE)+Vfk?YZPg6%3f+
za;MQKl;4@#<|xi=&F{=<%Ph{!(@<5FNPck{AjZ*MKtkfW6u1(PxL9vEBDuuO4H*`j
zdNQYI$Yo^_<+5B^m~<R=ONJ#yJ$oAUz_uVAP0Si{{_%M`TK(g)1Ia2ul)IBm6G?oo
z06z5VVg=NbE{$s~W`l(+5=Lf*(K?-bHJsqGo{s~D*;$#G0VM~g^`y4;06yCCL&GVf
zE>c$)0h#ih1x{yy#7(tRWL=E$O>a@G6MBLHvcD4YfUsK{UhKju2O|pFj)nYYG3^;F
zU~-82gawrRXRTNY(xk_jGdpdGV#~qUN;%Q`TgijkY4{f3PR_KkXLtGLuS>Ypk{>k{
zNdC$@Ir%HsaQB1NIk3Xgf`AT*wPCda)pnfJK7$JTmuj`Znq#)YBc7%nt67yxP>X4f
z^^6t<?J{@DpZUzQlUj=3RMjkN$=X$;b?WV_56?eMR;wB2p;Mwxvj?5Tb(O;A3WE@x
z#MO1PHfySE;?RrGZ<DUq=ky58Rw%jqPjbTUTW|6SZP!McZ*wNPpH-qGh9Ot!jkJ((
zP<2c@h}-B~1KDBc_P<5jb;yE*LoRu=)QX)4&Ewe%6CI>X!jC%kXUNt>&yxqx+&aN`
zqE0I<d*7x~JB}*av+SrjS+Q+)#gK32M8!W9a#c8S%e7N_TU~5LxEB%?$KpioHVCy-
zSC2Cp#PXtgm)(UCnL+@E#b>o#3Rtc2zmn25(S9jgK?3lBr2A4qcQ;{!IR)yI3ZHi~
z{J(W+FV3$UBiY%6Nwzy12kqvN!!ZXNNUCOlhR%PG=~OzlYZg@W2Y#Q0vD?L3)GSt&
zU<s^_$qPN{KWH$}!6!&Zc+ZK+6ZY?X^laG-O_wDkW2jvUv`EIDOO!?DsIY!Y6-K)_
za2VII?V{hvq+W(j>zyGwrIi_f4rTrkWzu;n`07f}HquBG4(kSfa}aM=z=0~->6?8>
z%1MW$v^fvO*U0Y35H(<yOX97@e~UVPp-P){2H9w^VzL-<;xI`GoZ}(nEfzvwP7!H`
z!K~RewCO~Rplk7X;Y^`0Q_D(-+^9jwTyg#(1M_KHxS32pkhWMC($<YQXe=~Lu`Cq6
zsPYvNnPRL3{Z8l-(4JsCgY$6>cjhL}M0jBqGL+(A#QigLG9nVeE+ucI;}N{^M|42q
zM|9`~^;e*Cufcq7g%-Fx+~cxgHqXawE?mRaE~n0PjtKz!FO)z!qLU#uJJXRt{*>4q
zBJC#WHm=T@$E6#2=bR}#-K{)1ixYmT^e<1yqg*yD=K~*|SXIu$V|53}q#Yr|#!BL3
zb|Gvb*o>qj;-^SK=U1FA?=0tSSnkL<QBCvP#-YJFuyy(DbKJ^5cb#}lJIg&6$MYnP
zeu*Q_q@4<d!Z5W%*>RdAICf>XlOce{HBOtu!&^=R=xxH5hRJMfcVfhxGY8v`VE81_
zokdg9LZ)yY7&=*Es>NO_k=6`RPk6%`Am5dtaU+hslaY|{K3$s8FoaTmp4VfCfOG<L
zi+me{c1|9c3&nFb@<nny+E2zGgHvmPMsIq<X(0<T%orX!l!ZcUjw@Ymu7ttXMjS6C
zgQ46ghZIP(!er7|#O?M6{XrmxL*8O$O^|dB!@6f<=u0S_P(Fncnm-5C`x7eYi6=Dn
z01D!a1Y`-#sky*;VYmaku22AAET<V&kAw5_?Do7uSh%6{CA%N`-Yi^6z$EY^B{cEU
zftvB+J$u%Ur@weW`3N-81OdMX$-`MW&SP%DdCUx)1;u&6O1x>NqCGe9!in-7+go?+
z5dY`DiSTwArr}f){{`O(TcsE6@U!{hHmpAs=Fb5`c$|>GYL~^Vu&~>u@FkcqG`iz-
zZ(?W$E333ub2K+mh4Q5t0ea0vdApnTBHgt2=qy<`&{^pzD=1wzu(;e)mLHtiZEl#)
zEe-QU%L>{Zy)}LGT7~>J$FjQ5^VWu**aZze+y}Wq`>ycEhum;r#YA4)258n;B`HF7
zL5J1WvUD;^9xZ^RCR*Y<AqNuv`Q)oS+ecrCNxdb#4mz7+z%p33lFZCZXQmUYV4Tv$
zDtLBH7{iI0&d1oDQ`5)D$~(I~9tInp8!JFs?ZP&7$|^mX9$BY_&gji*og96MY76D4
zJGtiecB)%V&~mAurI)pan=rW&_v+W|a%E<^ye_=RDA{OeWpfY!w~``~z@Qp>$lU6&
zpF5tIA3ubCw7{Mi3Rh_-1F%ufX>4oG0Aeb#TFGDrDreKSgzyA_3jhhp#AyL8bU^LI
z0RM*|uG9nRj8O)-n)d$Tt#9BEA6U*q<%M+?(;bAgJlp1VC+A*y-o~3aY2?KuoOn+}
z<xET3QKNpGHTpU)OdK^ro8Z5v(0)=7@A17`o~)@PF9$4d;JQHztn*-5z~LI4{!u*L
zaOJ@9nhYqNbUag9C9BfY(+QhXX9!m((lYpZ$QL`EGBH*i&gH$G3+H#>$c;R8W2bij
z(LRTK%~QIwhdgytrad*LJPOF4;527)_(fBD^2%%L%JbgIS)H|Xk|*u#j?P)0bX&<;
zyO0>4SiGIJ3!SwKowW;T%82l)I%^lA9nZ6Np-(+>)-DA5TtXc?YZt;^2sGuhcA>L&
zA?>{;3A4aiyU<y?5X=&(4axtOb|Dp3;2ZHC(HgA!Y1ec~xRV*M#UnPD$w^6Czj5|r
zHH<qd-n|7ste#Vwz{wkxUbRdnaQLLYf;V!)Ew%59xX`Pz&f1g2J0H&4lg`?cGO(BP
z?(9iq<i@)*U|%L1SvL8?XjU@pufeaLc9Uis%E;5qk?p|7rDia*rWwp=u##~uVKiGR
zHVIQkGhvt$Hc5JMPMz=<$R*nxEL&oSnCw-;?kjiU#32D}m-+*K;fE>>?#*e=0eFQp
zxupiY^A7N7;U94GftilQi#zV)o9+`kw)aN(o3x>*(3z+I!*%}OqA!oXq5OthVEZ&N
zyqikf<pgczD;VXgJjnf2dx=M4XVa0`WEP$~V2$`O<(D`NxdOWn4dGh&;=nz)%gk9g
ziz{%$#@^2w6r!T{(vRx}{eHN#&)vVXVgI8&&G{y6w=Vsh0mGi8_R8jW9?y6qf0JL2
z+2QoQ&`!)QNZ2?g_A+7F=Z)&CXP6HOllkz@e|8i2*u?zdd6?rs9*_lBWgQ5UdQplC
zud#Nw!kmm9bb7lce;sev#4Lu2>30JXW$3;u8>J=Q@tS&9c6yvV#3A0}DJn_5D;q}@
z>22Afj{nm4al;Od-#(!C2AN>#Cr+V*D7*_B_GWB+6E$!Wi^w51)g5NxOedJnWl0jI
zIgLJPL`o29b{%UUgrg@k3T!>nYsGWOH2_CnL~Wp!sEx?wr3d`{Iq{=mPYMz3C8z=s
zK|GRR+WW?*=%wS5kdm0dBYrzC74J58uv6ec^(zCiR&2c|@t6~TDm)ShoP-BqkmyqI
z%|iAwKEVF~ZA*K<4h=@yEMvSEyJ*hjsgi{Qdj|&g@>2RHe<|rR@}PJRI_YZIxxlNU
zk#_)Y)v5{d0<RZ3wQ5FqX;8U?KJpJ0XR{vmfU+GsW_a^CwkXM09OY_)hfwQrIe}W@
zkW=T>!i7^f-eij%i~W99e(b#ASj(LJU@8=V7Lb2AUhgjb%d=5NXJ-#DNECx|-0)Am
z0Q)2r?9*~jy#snEoo{6sR+}v&?U*YLw`MvND_juLPQ1d~*gnkccCQ_Mw?JlvV=MAn
zGi+(+Uf(XWIC2IgDoTUClH#I*e7w^dE?Jn&vV{MxIAoeS1zU{6)$-+$saIhx;_jlN
zqJcXGrlxPh-}DrMJhQ#MeS+Re){J+@PT^)}B(kJ~BDR7!nConK6K*5MqZubEy2D|2
zb_PZv?-CAyYyex_v@wO_Z}f_A?Os8b!yUzA@wjj}&S6h_eP#$p5%Kaex3d{<X~p}Z
z%)tt;?ZtDJePg1fexj?st5vx?9FDzAKZwF7j~|cSe&WPiZxJpS2|$Q`kMT6`Xl%r9
zv``xH?kVKS|3%Z2-}P+F>ijD!QD3DJe)O|HJg;5j&&7ADuc}wz9#ay<;t%zR-|}PX
zt9bq_a*3MdL-GAPKF$18nkexzh<gNbs|Ro!&S~Ai0?LIfz(2>T@C%S->@B>z>n)az
zcm<G;-?Xgcnb>!u>-%u_<OWs(m<Ch=0)R|F5a3Th0j|ZAUgWuf%}YG5!~r9Za**Zm
zPr=9k7UX|F%DNTT-GC9mwYdKZ@)3Rvefc?DhghXj%qkFHfpSXtrHG^JO}Jjfa``0A
z)qfQA-^4PMX0+#i(Ix}m1HS>Zg>c3-2YEdFO|<<u3;my}AA>dnbv}bD(bK{-+TVb4
zT#_zk@f`F6UR*f>9CJXg%_4n1(VgP(%!Xg@q`nIBJe*O>!<mEQtPuB^g3ia`lkz0a
z-sGV_kQe>AGy$ccdA4XT(R>al5xAC79}xZ1fIR|#wnxAVkHBy2k@#=XM}{Q*W&aZo
zXizS~)CcKs1M;A+l-JNlbL!RZ|2Ng2f4chd%%H4b^9U%+j^nqRkH?SkM`_$(_-I!g
ztHwzzhTnXZKu!esu_?Tfno&O_0X!teQG&k(kFNs#G`N8+<i7$BQ{E>qFA$(y)a?ci
zHpm0|qhB_r&mh~)p1^w{Zc#FoQe{wizjD9wqH0k~)lPMtdae3pHD<WM@QBf8e82G?
z<C~^+rprx_nVvPp%r5g@%VNv4<sr!C4(p`#2J0&}yRFo=!gi7EX4~VoKV}qU^kv+X
z@uGc|ea3#X{Q>(CN2UXB&U9SixW)01<0Z#mGHsb1nb%}KpJm8u$QsGIKkLP;KWFD;
zcV&-fe>D5S?BB!1`8?+V9KBfJ8h2gg`l{<C*FW8r?#tY_xPR}NhtCSnz20nZpZBsH
zdrni%_j1Q__vb#G`(j==Z$sX-c@O1V@;{pY<@{&!|6DLqa8<#>1%D~*FMOux$>Q?j
z@#5QyUzyi2@2YuEmt>bb<Fosg`#$P>)_2@r>R;#I?|&*#5SR`;5iAW}9{gVLmD0A-
zsnXAtzFbyNwyNx!@}~0X@_Wl)uZUFKQ1NnQQRT0y@~VcbZmT*{ZK`gl-c)@{_4765
zHJ8*p9cl=DDD+INt@gay8*9H;XQ=C{+gtb5x>xH1^&9GMt$(=w&!_nOv%%8fX=rFz
z)iBd=N5j*NO5?J|{f+lFK8w$rO?mj-+Vra?{Ia!>w!gz~3mZkhD%{3%@!P9R^@?A6
zp-30|73Kh}*AbQ{$tjF?4dPD5)9+b)G!a(ulEK>(VLDrMBoQ{U0&?FF<(Qa@&r5{O
z>^$C(2;-MgFa~8BE5gx4*v2m7&m_WjR;{c`gdLt1<)TD5lU3(@IT6lgo}6bBVJFMX
zc{LG!lI7&kdkqQy|G^q^?W~*a0ta7;-?ZJ%w&A6udzlZszZr9h55L9SfYH-{&?cnt
zf!8lZ>g{+sg>N4lW*4%3pw$+3KAT_{1Lzltm*RI`rg2S`c%iu4g4A0Odl9}Tk+KWd
zO~^w}`w-p-7zAuXXd3Z*=G1p`Z3~c7uM~>caMycIElICu9q#r3kL_sP4DvPtJ8E}h
zTIm{w`sHmGt(ZXGy(nn{?c2h3iZ+~&xLx?U;4`D%+f(@MQ~clSQR1Gx;HCx8K<Yt*
zDM10E!(MRCZqTF-yt50G+4$e&<3PX4PpU;)j1O(p3scHeJf)JK*>UnNJ>}edltRm!
z{%m$0tyC?gc0W6}53678NqsUzGC+P(ajB3Gee7eGC)3D#nSO50`jgV7=R3I;8Iwvg
zw^sdHD7FGEsTH64#I+W9$`}esIuNc}oECd|GDa_zYyst(n=W;)m6%?(jMLJjKhbL0
zn1+jt)5?*3l4|?uLn-=ebW5ezVzfS!PqbJqopyh!{-Ai7M$17l>ETo5bb#*Z?bWzZ
zFD^ah<)Xh*sWzg1nODYXPv)l6Ql+QW>eQ~3M$1oe>0vERDoz_~sd1vU_5X#dULU+2
zUjJ{kq!K+ao0lSNIdq9ZSbmq{$uJvb{jkya*fPZRBtmPTIgno95T72lmaP)0E0Jz5
z=ASLN_Fzt*#C0vw(LC=%8q#65Af94KW7&rIE%@vdv7`f4i4uo}rb8OaB<8Kn&`eS(
zQgi+^a&5ybM_SK>PFb7qd@uAPs)6(i(xUd^s$od6gyFsfh9OaojEkhrqC^F49;M!O
zKtCb9jPh+q8QT!vC0a;#7ovQ^X*&5#zbqfL6ViM3Lhri}?WWo_3{$NkY<J-awS~T^
z1rkH48)|LYi|2blC8C+sd+3Rz)yZ@weUbW(G%g={Ski?w2CZFGTdD*NQ;9S6C1FC(
zeF@Ei`ezTq+mrnvv7AA=8Axxbf6PsFF`n*$7E4%@w&FutYAtEHq={}rsdd1!=^f)K
zskRwqY!M|>d$xl<L|M{^iAuy18vTe%HX(jHVkoWb&)vvReM)h}DN?7BwAM=4jWQ|S
z7SV&#$hi$bDXC?3$<IEd(t1<&GqtQ)w`D{Hq6Uo<snzTC#l-^KDWu&eQj?}fJV3p!
zY1LFm%W3N%%qK-2(xJD53RK#u`u|MpY&~tAJApIRxfT2-N8O~L;$Cqlb$J>|v>qW`
zC=KCBYZzKF5Oy?rx1kJL2T?4gA^l%++HO1{`5<G7BDCV6oIBA%?TPH=*<3<p5FIWO
zb<>q<OXpO%dXgNG;vzZLw2?w|Zxb{aPL4zE8Sy%`#;3Cil%@Vxtou$L=Ngx77Idc3
zAxE=ZmlAE|x^(u6l3GC$;AD=ZHn)p5M{wF;2(6=8;T+5)J(xR4;^@&r(v3#YF3@_r
z=tCN7as+D<ajT#h(M(FWxf0@3GL~8)dr(RiS}pIvXF`l>l6J&FlDj0gX{%9L|H-YC
z{3@lJhMk;2(rF^4nS4&v+64}h^-z0BE;wMXNUhXTa}4ns@$NKoX+0#RKg}o;3GPiv
zVrmJsgGP`h-)2*f>c0?aXl5e**IGciNM6yn&?Fv>9-<FPtG%dC^0%aUdQCLPX?ZS0
zs;x*ZX-i|yAxa@Wm$=Efg2vU!HO|GGXhO12qb;?GFeRJER(xbB(tbfW&`6?Z(;}C|
zl(Yt-H?@we0@TN;Svq~**6-ho(KDnw&^O^sv%>6}h+@Q(B<YC``$RgDMcYs-*>p%g
zk+!2zN%EN<MTl;f3XX6<_o5mpmmC+=LMo5?j!GhnhQyg#L|ABaqMjov(Ac5&Q!lR(
zG>}|QIkmJ@Bh6}(PZprRsu5m=dS<|zJ~8gk%%VUVaJm#FT2r}!Q*d`6QP(iqD0!T8
z0^)hC->C#@gNEzLV=E;`r7WVcM4x4lHUlCwAhg<U(MlgAkf!5lw3EFj@g@rEYbR1B
zO@gYM(WWIRd8sIO6c}G9=sPNCPWg$R{xhyyjw-5I>K#6eHmRBTgbb88$#EG*pHuq1
z(4w{?74g)&$Avg!2BpXuz7!aw%h@w2m+X{2tO<x`3F~Rtoum{cJPBJVM{5NqXqG2U
zv!{OQPPB*GvKJKnU-?jZ#I>^SNx?;=15pb#on7`Wr973yt$YU@Pb(B!1zeuIO8jYs
zBwMb@3k?G)tEJw)2Uwjdf4`6?yV1`R09x75EHiP+^vgj<k`0uG#<;dhp;iC?zR#Ik
z7xiqkgW%SbW%*p(ZA$X9wD>jvZ?ZxAuoplyBHFe98d)nis{x+{(2_e4BW=sg*bPYR
z;l{s$IK98$VS9mI&_MoF^kN{q;uUWUu)%Y|4r*q?J1HAybzOLmxCiGjbFkx?haKAj
zoHH)M4(vQug4+C$VL|L8l;Qkx1$e#+GO`Avz7~?YURbG{fL9B!Y=hR*!R7<cg{+e;
zVv8|8!;lqS;PeP|pJl8Ua{U~%ZzW{xYOI~tVEha~CmKTA*Rpl&TsDGL*cjfDxq-b0
zzjn5fjk5{tTHMX9VIO3-uvgi&*yp&OeU^QR9pFZ`A8+^j0Q&?taWne}`w;ss`xUpa
z&#^DFzp^*kF?JWb5Bm(?XZM5Jo7s)vkRO1;PqL@jPuLIHkJyjdAJ7XwV^6c6vVTGU
z{F!~6J<pzH&tV+=iTwxrFg!iBV<y-M{+eNTfX^<#SSQV!)&>_rYW<O2f?b$P*?Zah
zFcKbOcd{$l73?Z@HG7S{j=jAoJIKDpUSvP#R_yF#a63FiGI<uy#tZyh+|51sQTrV1
z^?i*!$i9xfz6aQ0_OI+Z_7&^`J%aP%c|4!pzza;<rZ3$+)o9)~vmKjC5qVwOkhmu9
zyPD*ES99VzpRP^FkhqHcxEJYg73pwoNjz^&T-y@Y_QbU#an;IOD(@Q;<u*3jwr=0H
zZ_k#=i3_LXqo!r@+Pcipvv1EXy6FKP;L(*2u_p&d4s!m{(Qn`#j%>3p%7c-p8r&Vt
z?eY2WICEfS)HF0U5^X7rR*sHu_3d9f5>?73qP%Bwa8pzXMh<0gQ}rRc311$3jUF;o
zT6+c~hwK(}^+6Ml94zG@8W@R&KQwaCq(%;w)7?V`Mz=hI*Zhn=#N!`~8a{H+2)^V4
K_s@sV+5ZGUad}k$

diff --git a/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.woff b/style/themes/MyFeatherBB/fonts/BebasNeue-webfont.woff
deleted file mode 100644
index 15b116f051c39b88e32b9ace8caeadb783896b35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17824
zcmZ6yV{|S}&^CI<wr$(CcWm3)v27<iPIheDwr$(CcX;x=@3+=D-<j3dbk()Gda9>?
zOm$DSo4mL<00{7NiRA)N{;PW=|5yJ{{=YAAaTQqr0I2kb#r+Q^P!2&7qGIAd+~ALn
z{{uoGBmk&{g1qt%cL)GLV*miu2Cm(1=n~4R!T<ow$A4}9gLS-fth_P<GXMblUtgL(
zFtCi<tunSTwEyAUf9#`va4!3%6=v+}{9^+T`qPH~2fWBv5F}>y<~BbZD*yoc1^__C
zN5OasnHxI&*rG80w1NCTKs2}ZF#F*+0RXah0KoJzXx<yf!qm_N0O0zu1^fs0uT&;=
ziy!ibv-r^oen1Mr53+7y<NV_XSNM+~i2wjdoWeQ!skNQ)PdlC;pMko5FkbPJh;L))
z{_|Yk%^y3${{ZF&+;3}WWBSAWj2D~%0KmjnOrQ_4w{vm^07Phi?A8GQ;JWAZ;xc<j
z(;r*0|NM>n4-cZmmu{v;KR%14{^;QUflFPn`lkl^0br6Zf9Ah>?B#Ilzj|unY}tL?
z*uccVU>C#)3LMeE$N;o|L~s)LnCa*JzyP5G0PgEc>AKdcs_6bJT`dA1sBa~N(S(#n
z)`61-$>_6~%8EGDh0KItuq=rl*dnlLujQ!JW4yAj(w}FLNr4Ctg3x4Wr>NLQum}Zd
z!OfeCuxBs~aEUCEd0;nbc2~`_DNVSB+$?o8JACFl4a;l4uexrw-z)K@!bef5;+ds7
zA1Ze2lBJXg$I6!~j-`a2&Z+su_BB*!?mBjC7cQ7p5@@9yWu)}3<44lT;%U4|?s5K+
z$IEzwoedrxKAMO*YTrAx#&u?Xm^*5p&n?z3@|3+O`N`=?x|sQ7yAXN7p$q6eR9p&>
z((fc2uxZi5N<F7vvXs5}R+3kad2pQ^i8`LL#3%7;{;E70Y=KpiY_2Tn40ym^6>S4r
z&&A{3#i(bz{)?;uTy*R0EuAuaQbdcN<QOxtZ>xz!keIAf5p1Oab1|zu^VBlC(OU=J
zC3||czizt<;$=v18Rq#4xfQ#I@`{Q*`yKs`d!)sJ8-_9qOp%AyEqH^P8OkynD$A33
zw9a+9%L^m_Zt8)%C)Hzpm>QSwo-C6*a-f$V+2#vYV_dD@$2`oO66L-HwPg=gEXCiA
zD(vB%(cu&OY;*n0m;Pz-ERC_!&ZQT~dcwzuRv}agUe_A)?9vD^hcD`dcqR0|0^{Ob
ztgC>_-~j$e-$94VV{CZ=L51%dV{G?$th}MeFTH(l7-xs<Q2f#E1F@CT_4;rh|5k`_
z5C2q%*QG-T4x8lr*PG3VxjqM&kthe4rxpb_7?&1FdN<x-yx6UXil_(HM?t+?KQV8*
z*PaMtkVYXM=Uz!(k~-45(cCPoh3R#0j<Ahga`u+mHnz>_mf8-NlB_V^nUWl6L%ENt
zNw7bHT{rt3Kb=sem*r|AuD^BC=B{8UNkGx=dqYX!p)usC3we;8Br6Pguu0%iX}30`
zy(7HZ@+|hluR^)p8h&sLdroS^VqGv9^O;qSL_ek0;ZFcL!}k+e1P{!DO4Ra<KbdjD
zQ{;ll3DZPJPtPIAV#kzbShNSNoa<toSe^#_8^lI37L7)_6C1?1)9#kCMyeAVL_<;^
zym=;f5PQYn^9sH}>X!IFLeE&nE9RbYa4ZtP`2Q=E8ncV|nVwd_`XtAn4IDUIY)(eJ
zpB8lQM#N}V>5g25Kds(1vR<3;J~Hn-GF5w~X>(&?bWPIuMAzsIt1}!_{JmS6cs(cE
zkM~4Zcp&E0!>6?yg?ZEh+flvS8aD6|VGqlmoK3{?WEPP(I~{}NOUt8pZ+(aJq!o!Z
zJ*|V~OUWBye$)uXzbH7yS@aG{w~M~>Vrt6iVF{zprx2ehn5gp&;3@>pivQODoi*ol
zD(=i)@BqZUk%#WuD_0sskS_0X&Feoc#0mPx9y5J6?07N0jfJWqwWqiq_*fdr=@{4}
z^2;MV*`=PAxVfx8Sk<JxGkh`u+C$ZB;zEhaspyy51aFy{tcUQncy@f%sF8>M`Qb@D
zj3%|8=(tJCrMX!7U-D}QR86vxIBLt3#QV_3dgQLLUyDRINBM<q`Uv;Gr6y&<l0Ax(
z$gGgr)^<$&{<4s?(AqU8{lR^ZhFM0dr15Qe-4dOeHP08<gQ3X{sg6XSz;%9VoJCs_
zR@aQehS2>(hmE_AyN<_gjSMqj(M0K>v9EBROR^*EhKAn0P&>O77IG~~>-^U!uZK74
zSC~~;6Z{)Z^Xyi9$aN~MGlpp%4-L$gjpk{zVcmvd?0{aF5BxjcIi53z#a-P11$++o
z>Giy@xhzZ;6J0u93{R%Lg#+i=?0GJaQIs-#3Enj4Df~wM*52i9By+YCe7kXrLAIGh
zOW=|#--xWC>T+^Rtk&D?sj({qg4aK<xvbKm(Atw8jIBB?R?bGQMjmI*)9Tgyg}jZu
z1lfGrOH?{%0qZ<3lc@f^tY>#;2AjP1-%-dATVdL#+nf1|LT&@-?KLg4UEN|uLHsBh
zr%r)GT48hp9nW{CETJL%ZW`8Zr7o*`wF`OELOE`<k65EdEd%&rUGVR?&peAfrw^$^
zLSZ8Cf8fLL(s3WTW`%R${;y%#FYjdr@y}=#;(6kB!^*d#!{GhGP2o)9K3!-G;WyM)
z;a1_PbeW}ah4G1OSv{)#|GqNT34^>eh$yqL19%EtEnGS7M(#`(&Xe3V<S4l?+c0VP
znh@MbF^|!gt*B!yTGnr)JT5GlsRa#->tW#sE_66}8~7`DJb3-k%y_Z9pyL!;)*X{P
zE=rgwX-$jjap4Db^z?=LS>C@P$KAB71ZH_$%u!eHP4GOpuH1`U7PiyE4=(8G0}Y&~
z_M>@od$l5oLC5fPtT`5Q*Ry-MZIV%qBC)bYuA|0Un|95TPPynP$zt=F<srwKbgVB{
z4n3MgQyW?`D$SA)z3AyU&9mNhL#|<3VR-O7c;~pj)S46w?*$&tQ9<xwxY$1=E7ylg
zz2Zy8r_`v-XHFUFIBptEkrMsHk(ee8j!8i$-OWVKA%mkLcae1aQ9@ynL_%WE+&9?a
zb=D%4{J8b!j_<4Vh~kIKra(LC^-j=gbp4;sdC~P;w=D+QQd!pKU_UI=e4FdGk)~Fj
zSqXw((Y24B{l4pGL=;05gwoX_hxC^Hjq#v0*uUS{-z3)tU^uGn1(|%4uU@?VQ{VM|
z!+K)hTAMhnzs}A<*B{@>R$3tHurT$N?7n4jc>Up47-Ff4&a{jEK5R!c{<Hh?9lnUh
z;!_7+apwOgZ}ZBIjg@t`#8gys;1poT_3hgF1cARe{LS_;>e|kb@yh%#uvABeS0qC6
zbglU+J?^CBPir9Nn=mg-DxEFtcxY*okVL3#f|NipL%3kdq(mqkN9=*_5$?rH!E)$v
zh@=@gnZkUis2Mt$j5f;a0py`W9T(ggSZG3)KvzTDcF)bMNgZFN6e5$z5$CP>2lW@5
z60IFE!URKnT0MLk*+qQLnD!`cnGk-W?5OuzG%wP&i3Z}f;VASC<6*EHW@I5gRYL5c
zGOxAZ@tFB2Ef=BeYw-=cNthds<3I=8(0nB71cqa%)_UB(`It!rJD$mcscd+<RB2rp
z3p|@XQHv%Mi>CZprLtLW7U2t%kmWQiEef7SIXR20{aJ3XJYDjT=2YDE{XE3)B*X_2
zqT@26V@;ytPQ-^s#D@W*W1WA3=eLI<qymFEknttLhh>QWCJ{a4!aw2>JpyorphZ3s
zg%6egr!)v3F8oj7+H`rk9n~ClpKFmtXW~akxoU_GJBetFhEzw?1pDkt@LhJ3D?eRX
z8hjxCY>m;_CJvQ-?MAC<k*>Oo%X06D`dX*+GO4*7c<}W8(%|pA0sr75ggA<09XIUc
z|0TdS;lM>i=e`+PQ*y}q)x2ju(gQd&P5KE8|BEQ0e`0xj0Fbqzv+YmR{9lX>`2POy
z{$Jc^Y+wXyoY~tu-rK)8q%zdoy9=3zb$}I(>B6az*1EQunwqMShKa$*cnWgVg_YYo
zL^ArfFCgFr2&AFk4+b3km^<`9aBqx|tC&y5%RdPi1O-6#4eRrN`Zh2y^Ebc(7Y9dl
z2R>v9{6`B*;opcK1ROU6VRFa3$V6+l+JBqFlv)>fhPi+TMh}JrMg_(NMh3<P<^x6(
z;vT{l`3nK_>l-3t5N5H>-;ip6eVDM+6C4Z(3<?aZ)Ki-DDf+wT%kSfR_B-es;bZ3g
z=IP~T2LmC7pYzt>CWsHgm4EfwU@NEy0h=IoTOjuq^IQ%YK!O9JgF=E5XCSN&fCWZZ
zV|Rs@qqoJ^<M#y;A~Hl$WO9I#qO!!&<njO$BQr%)Wpja(rL)1)<?{g%Au&c#W^sa%
zrumJd&Eo|jL1B)e&f$h2&tONOFYxW(o4Xq~TYDQmT6&tg+WHzS8k(~FJRPxcOsi9C
zF}7bcp<b=g<aw3ua=~G{-DtY8tjpteV@N3@HPx!iE+BBBXh|-z0UJsT9?BYiQD1?X
za#bon4OZt=enZN}D$i$sd!LNMQKPppUHgqVFyQqPz<jh~$HeNw=IZwN{PZG|-Op&b
ze3=Ft7K;ifqV~rGm^w!E{m(oLf_T7E5l%LS1q4_kg#WB2s^9I#oDaVd2ni&=zJc~x
zD4A7(0aSB{KPw;i^(<9Ow*_(3<WAC<#91;JFc&Nqhupc*U^+}jOX?w4B3)d_Dp1`*
zTIVAkf_KfHW2(lJM-qXmmzcl7DcK9`6cRVn85J!$U06}ZqDAr`4u7~+?i~q}mqwJ%
z_#<%I_m1ik`Uq`D)%K|@QJNA($E-PclB9K}U6U(ODiiM<5i3flXIRLdgfjaJTGc7m
z3D+gNSf!BVaRsCrIfGs)rGTlhLO7GnLXpeo2vf@8O@D>y6~u>UfGe?MKa~#Tw-Zob
z<Ic1fHGvxxIwq6o)altAcQ|n0)<Z~DqFmbWMc3`sy(yLpQi~Upe6Lb*DPn^w4Jn0b
zMHCFk_-;usmsNr>o1)TCyC4i+U6*V$ho9vw+_@-LuqrQ2xronM$HqwDiF%B(%TXK^
zPdA4#tjH)<xeiS=gQPLpQ<1UE`5*&1r%Gm3Kxi!0K^NLC5}=vq#Db6}tWm0ZKwl}^
z5jL2aGtd`rU73g-$38v?9#2l&c0SmjK4RZ8Xnc24WwxCv>P$|FNfP|pk{^sHT!f9n
z;y-r}?|?-bpAyn(RRGT+p3I|}pRQzM)x$BiYn@U5C3_(?D^4)<qI~K`thvVtgIy)D
zZ;jtk{riYNNUMCSYc-w=uN>9EFDJ(>OOpcjp)s}Q?SArwKKCDoAnyUheKD2JdW(!=
zzRw1#={lIQiUmd<^;H5@vBh6mCRwj#RJL_D872|0Y00VYzil%lFI=4mL>yNgqq6V#
zjtkwfn~em7996=$>)?(HdV;oEe>NLw#9b~SS>fiVOQ-{LElr*VTB|DAfHm3XAB!T!
zI>L!ADp2rTmY1phP`{TV7;s06BC@aRb#zeNEVr6(_s(4Px3pN!L#u{4Vv@q{80QaW
zgQxH9;J=$WTskzI{wgF3A(R>@0l+DLLm;OvugMWstz7O;5coS_?Q>1YE-CqBGqL(G
z%)Gb9CZgPU@osTW(5>idiKe&&ZKm>lXh+Jpd=_*TC7&OLyBwKlH-$14_DAJk&`5d2
zG`k*Pkg2L|N6lOP^G3cmS+N(fm{{h6bq%JH^#~7JQK9;U(3Dhgi5S*`YKm_^9t5Km
zI@k*Df?)M~@GQ?069<MUG_SD>u~w2w7j36;-0cp(;`jQg`+nrDGYMBjxV%I1C#8FN
zMS-s~gpFQ<ZJFV(<nuHB1Lez$W*-$b?6QN)A-bhLwyAb;xuHjtf9V=qIPh98f(U2?
zva^z^Q%vnl<CuR;W&dUP(+`i^VOD8b_k_KdB{oK?x*;X{IPK$Sy0++>_M|vXjJAKT
z=eGROxpN{tZV?OcI}yB0sSNZqXGSyz;)1~*SnWTAA8>(XxVZI`k^Am}gNZuSyt2rg
zQYNU5kEU*$NEy+!t)B?RZ{jL<onMu(u(otJiowH=2}!}kjjQsz^^5lE)zyguaI!jL
zk>|7PmX>(7wvSj@<4h-u`s+Gfa^m^p`%BMqj8s2)0~_$YjJCnp=imn7IYRQ2h3&F9
z+5&mY!S`VtBEpUmt&*L<_kuV=;wOmIO2GG#II;tElZNfmI6@jZLLxibg7A`u?Lu*Z
z>L-fa{)w+ZN$WWhX7}%II3-uGDglpTM^B6Yjq=Qok>X>3v=)XQ?`d-Q7W|e3BmKEe
ztmIc4zDV$AGgZNFzhB9(Iebx{miQ^{uE>@2D7nvRd#*3%+OX=s-60?V(9ib~!F~P8
z$3sJB#pjgkq`HBb#ZAq?UlUW15EOPG7mnUS++a*tm~g|N1Sy0PbIjr{VNmg^P&SLx
zw?+!jye?y?E_u*L|8mCR_q$h(?PtQ<(!YJusr^FfW^T*P$0C<RegTe%fm`1mr|T@R
z+5PSs{cj+q0eh~O%$@G6oi^fVQph~*)lX4k?6WUkvJF?h>ajoHn=c-!|F)|~$iNB4
zPRKedcaKKc*uFA!W0gCzpC~?TH2tWB@C1CWxm>@;BS1T15XIM_hzQK&Q9?K+*JTiY
zjgjg&-VjAgB{C<I#;Pc&F6D6p1N9)EvVLgxq|7_6DZJOe)OtnuCKXHXX#Wc;BI`dX
zU|8Us3}XzH70Kr$Dqtj`d;Rpyv3ADRq)QG{e^0Rc_HeH&>3MFd+3Rxg-`TRa1F<Cc
zn&K;;)W`yVVdlPA!n*U&Nf?mAWq}qv+CC_jD;d!wENr9NhJ0aN9LbNjr?hyT(4U(&
zOrIJss>SsK+I{_Xv^VsvQu2cB<C){PEC5_nna#F~mJau)_u@62>AonUgq$Bt|Mo!o
zmhBGJUoxR$Ctv!KKq?eAjptL3ykVJCnG%OALB=G4wx2L<7R5h-mdPVVK`aj<pmCg3
zu~f+#67&MZmu)c(f*SnY@pDV5nm{1zfHnC-J~U8PiL%rxPlY~Fhj)d|+I5T9>tdhT
zceTs-xhnSM5GJHKzWbx;-%icVO{^~?E(7||&B01r!y2VMOWPZEhKW8Qy-^&bRJ`1M
z%xA0%LHo2d1+@d?k^`Thgp2q|IB7f;7ANYah_i0me5Q;d@2|YROHB@y6d^`?-o8D#
z-iaU%OJ&goVJ*X9Sg;^%Zsw{nQDYHC<Y>%LBxapHIg%BDS%_7zB@=Rj%MDo|sUR~;
z-=K@JfFYpQZ65yY;=cHK0Y0^_tZZ*fgOL~@?~AMRHxKodaX(}E8q{UIBgfUcH)&6X
zQ6*p|jx1zV4HQ)u_V({OPK7+>;z=R2EGj3;`=7{_Oe$->wA`_<GL{-K|G=n#B7&_|
z7)V}1n>mCzRj!e%pm+bv8~k=%N~DaG5PMrHU~Wx;8a29**~W@G4Z-aFzD-35&PB)P
zDP&^?fgG7{;;!{QdU{`dtGUxha6LiF*ZI=A{wVq+K1A5u%hAYaujuN}-ry|(x|_i2
zoQMLs_SwYYr_K$qnXYD((24it3|qCT1$N99xZfLAG@E4NnnDPo#RuvhbdH5=p`h}^
z*B20cEA~Cf;Vo5zjWzY!EaD$_R??E;>w=q%b)Jnl`mJ=^)U7C|cZ2ep+qMukLuE#~
zN!f5#Q%#gt>o@={&@ySp#53IC$7h-xp|n0`ilTD&{iCrmBZm*cG@oj_ixq>AHlz3s
z#DkYq0oH@(CVh#>iV9d|a2PBJcA<fSeo1_6qiK`3Xq1JGmUcFqZ>ewdm&hLsTPy*4
zgAep$uKMqVoNd3tyOhnYmt$L@R^vlOPZX!1Zs)*A1>yw|MhY2NYPu-^@ja<dVpMH#
zRBNltoI-U2I)`%GY8HyyHkZ%?%8kd&psw3q=2Zm&$x9sBZ2lYtDKs}|{|WdW4B|K@
zU#KHD)Jj@dK=i*oVm?hDn_=hv8frxl-?i8z=zu*d{qr?!eQsAzpkw(t`g@i)pk0s6
zN{Z1@5K0&WTdF+BGEvf=LlH`mGKRV85U_qzFdP1UviMT0`kP#Qt<ufFiY5k!47t8^
z#5Z<&ZKF=FnYX*#NoY8Hnokrf(o=nw)15z;nznul<KyBWg8_0tl|)*C2L@7U27DaA
zgm7aD4{Qi}AUhK$(|j`Wvig3X&S!e=0t&SA8<AqcXQ-VvAgRs?tQk<X;zoh;IxzvB
zwW)H>J-3=|-2uGr0^em<eBC}1w7fvg1-<=&=#Q|yYmzaSev?3x5d&fovmS?_<F<%s
zy4fnFv|c8=%89QXjjeb7SPO7|7Nma^NoMn~1xLS#YOk?WzEE3S^K#WA0WK}+$II>q
z&qHSr#a=K4c;_oMYrfW%?#}kV%UgTwO>D2jJ)UQ`>k5Y&NN1g(b~lCjUqmCBp-iFr
zu1F(k$DsYAbaEhO{o!Hhnz+G+q5KO}GSG+148M)(TZ<~r(Gkaoq<4&M(FTzAXfOpp
zl(g+YwNR?0dhn6(;Z<;Ha}^xE%7kHS!_!T_6Qee84#s4Dn-d$xAN2ycd%2HDGA$+F
zoM}ilw*c8Ro5isQu+WV)c)SKTZ^MAT*~EcStorjiWk3x1p^_%WP$n6n0ztDGZ&=&<
zZ_;C4g5tqj5c+YETwrj+5+%Gy+g;q~ci#>3pr7s}t)pN2=OCZ|>}8WyD$3jX^vkDd
z<q1IIqwwb>6y#RRC<U-b27-fZnX=J!l#8=OBhs_sQew#fhl}URNL>>JxQY`e&4btb
z1Ui-tIh~*fvHpuL@Hk`_su$k-GGY=H=)7IK1R*#u0p=zHge?$?D9#IS-;3g@wxN0e
zqFDV&m?HNJs1vv$jBF}s1lhsjLKL30hZrsI5)RB{!VEzdq)5s_6x$knh^v7(kV{N+
zZQOF)UuPfpUBmaP+o#lCQRIPxjE7`qc*5}ADaw8F?0KyC&Vhz|M<LKYqZrFA=&y2@
z*rl77SREtcKo9fZ@pZmXJ8TVokAR1}kjo&nGC{P0B~b<)HYVw7K#Q|ukQrZOQsPK(
zuxLqC3626XZqJ*LX?eMJlN#(R7*NglSq64e!dw>~PG$r$1(GdwVGG1yddL#FlEdUz
z@Oe2MZ+FMLeQd(u9r%aZD%ZTB6*bFlp$rmNc~ec&s1P;F%i)Sh=PZH9?x8}*U|*ff
z97an3wNy5M9MNEKaZH^LTPqqm1bI+;hh4c4)m{qE8=f}9?w<ZC0a|oB2GsB@^-YoQ
zfD<4*vrs{ASTm9Iy=!swYmt;b``^s1cGu!6d#<DtPqcJ%JHily!2}^~Dhlftzj-Z#
zj-<%YfNiC+_pX)ebgjDV%Wys&hG8wRiPDvWUWFv1)Sl~rfo~hMQ)U;S83muyM_HT$
zs&{V%l(1|d@|!{%B}*f&KRbFrM!uVa!r<{h-IWi?JV8EVMi+X8RqPo$EYdnopFl^0
zI-C1x#9mUqAhzD;2M2>tQ2NaUME+Ja5w%!^#s6#0M79b`e&G*->9GN}L<{a)3Ah}T
z%*;e4FINRSfsEuq(1a?ukDx9}HZ@f$P;1Sp8x9ERS?tAHC=IhH;MXItv-Wo}noG@t
zum*zm#EP}<yQ;%orzSPKy#)#5@#H={uqvi$xYWq^(-bA?exLdmq}~4|Nb5!F<}6X?
z?ox(9IVI`*r1>oM{8IQAHoj-=TLWiz_m5(U3Ivu4#!@Nkx`DpIatIbprNk1%1}nrJ
zz=1l!3BKReJ~~~vh5|eI45F{`Tv>GGu@0QcNq&kBzBPms^_)|Z-ZN*dqmOPE2hU<;
zEcC@+y>g?8<gaYef|Np=%sSc?tG}?OP@PJ>tjz@M0ueTp#J#4}P%h?HAvSbqU$I4Q
zSehCeGCpQ8NSccHQvQb7wt&}-oq1@eHhjfYfi(YL{zU;)m6MD@N$rt4j-K~xZCl?9
zm$%0af;Uh&3!nJb%cT503!UPz0)%ek%K)C5&n%;f(^^uW!>RXbGv}9>c?4rOeXozp
zhS=<$3PyofiX3(<8#&zH)`hZC)id;Q72m+F>L7T*kZTc8^w`pIDC`q9HNgEOl?)b1
z;;gsT)S$28%aTn+ti9td$I9k%I5$kl(p<2}H?0Q{kDRfDOyE2-#&49XFG4IO3x8zl
zv{Q|iV)#&|;OZ<^^&wt7kg+il{F=vcOV*b|@v<5}StQ7Z;R(2Sd2#JzOgxF^F+mmJ
z@nf=nHEy>1+>Z)7nYqc+fMXw&I$;iUgE><PS7W3n0S6HmWDGXyl`kVmDHQ`vBc3a2
zMJHe|uvs5df#7x+=Ca(u2=pua38ZV!V%k$o?T*hi6iAemC>TP&M-9zqh4lC11WRMM
zrfd)YQ<7i?<f55tHzwF<EqP>)qO#>da_8ki01H*Zsdzm0gE?8)+lTXgN}i#_8O<w$
z@yO>cFt$i*Fa^?^7MBYLiwmKN=dsg`zx4&)HA2EtUA;BLdLPcLF2MM8-!6sRcg95p
z&NmiRXz|pbNe!4oIP6Aaif^#IZCIX1?7Z`(UTeb?5k#i;9xF#r!tfJ8pdO;M3P=G>
z=uZLRH-xItWCj?H?~{$>Wjs3RMcA9c)hM-L+dggeWb58&y#@?11iatarxUjj&Loxc
z4qO;}F|IY<A7E=m`cb{Ebbn}@Pk*3$wLb!fe1y0r>rtLK5p>J=g0nO-JZwfIpIAkB
z=L`VaP`HU<#n(zDvjt0w#lVwcNy#Q>2Pi2tqhT|z-}a8=3(-&U(e?hVj97bLA2~Ip
zOO=R#>D}+*<N@wll$iu2lMs*)NocUBq+psD{0#nezfWh&0E_!cc}eS2XO$p5)L5B_
z?yVJ|ZPX2@S;1nU=D&LAMK1=FWdjcJ(eIbQ?Y=RtT}b}ua)Zj4#-YOIRAOxo;`x8X
zNvk&p5Jwax9olu+Iez;@sWae%m!6+8_)piQWIpQu`nun|Ij+xO)^<+)O=7KRYhzuf
z7unE#b9vX`)|X_Li_n);lZ=|z^IhjrUyCq-s~2R=w87{Ch7jA9VM>9TksrEqB|54M
zm8^_*@F<5}V9K)owHpHS`3ZNsgpgu%9Y0@lI#&D$cSasC(sI@Th$TGi?lNl$Qd*NB
ztBf$33f0v{lb>K_U<n}=q)i)Dks-`2j-W<a9<s8BEn_m@(qP?U(hRzoZf-x|%Witz
zhJOu}VmS`vPTjB1DZeMRTGM13F-F3~v#pZ12+$$`HjM7wBoDkLJWy|&;Y>`ES@SuR
zC(E$oYwD`Av~MdZcr<>iHt}-6y^R6b#RADH9r6)B$VCF*btcn{*Xs)U_YS)f5YNi1
zir@db4;AT~uA<_!W3@IrE(`TX(pI;xUad1o?3dLLT}&s^(AJ4DYi}{jx0v95hYo4p
z-@WFNX^Ax`<J#^iGXCvq7shCnbb9N`_aa1RrXxPC_KX-T9B%KgZqyqSlz-;@R%|*t
zg06-?><#;H;dkJX6}FgxWQYI+VY!Zs%80K6(hCb^9Bg^R{PHKqG%vY_0afE*e1=mn
zX@vS_kBc~`B0nD(->(<KbxJV#uTu5G!h#*Y3sCgPw-Jwe@J<DY&@ZQVpjXa0>H%0z
z1go}E!@xbr*QDH3F&R;17YeuIl>3bnifc=|Z^+5ll}eu@u+WsZl=&?qy|=OYsznn|
zC~Yjk3qwh7TM+UZuMydk;+V|VGdzx&={YfOU1~+OH=VNrR+Trbe%LfnABLJRwsa;u
z1HCAhT<8l0YKk3JKA(Xt1FT>AxdTPjIbWzpXve90&A=aB(0V|ay@EkZhIKT*kNAiT
zkNx30BYzh%&P|6B@3_an`ySwooK?V#NXu2YhCChT*#B!ig;#EhzBPjFZ06(QpU%$K
z{dZ(73x|BMk*u>*Znu!+7!4ll05P%xtL<XpCCjc^En?Sd24BhA*?({#Kh5lu@;*k`
zl~_}jk4xEE4*KX%Kp~c=xro(@0bDMeS^;*G-TL0XrrBzj`*>vMi*ig@k&{<b*$r(k
zF=?O*94^-~8h}714E6SF?20$o-mMN}ENVVaI+~+CUS(yiU+8T1Y^v3pg?=Y`g5%)+
z|1bLCIdI(ueE=WZ5OqvmL9c=cs7hx3iUf5M0T3aXPP4mt-z44KMj+;fG?F%xYKftU
z?f{mn#Y!acRGaKsZ1UAQAg_w6j~N$^viO3!Ln)OHw>nHi#BjWW_;^gSLM(5rX<f{H
z?VH<t_Na4i%0r%y*ZMxP$}q$3GAd?f>6;zb@WUV>cR0)?3iEcn<5ztsYt~!A`u5LM
zQua?*B=*oZ5z;Hp<P?jkk(6O9pTht=kN21b@CyOF5~8eSgpO;7M(0ITJE5Fx+L$#1
zQn``sQUi}$k1PhCE$P~s@UyfaZQ-t1s858%;6SNxB&Nm@%c95`C!xK^0Vf2b5(ZDC
z*GLwg%sZ$8*pEX-pJM@LuZOW>XG?3%Tk(g2`q<kmkN<?S{pp;OlS(^DO3HiP!_H^f
z9uI&v;~!2MkOX#+9`K*DweruBljmPn4ZF#}-3!(Igyic^q(C&;x2WH?-XMdLjGe!Y
zrD*oGah&AWweMEpDVnp_m*EHWK!9U}lu*xd*;JGwS>(Zp_F=$7ewW*(H5@o?v;OTi
zeZIoX>+yL`saY8Q*?5={zquL{nSIF;-kVh=h%|XGFcOFbT+RsFI*AXKT!FThjy_PE
zVvBuqf&d&#FgFW=rn$+p7WZyBYsq9_O{4ze@faHgClE&X3!pOgBl@@I6RP(LK`M4=
zR`r!2g%_#P;aFJ_<R*GG#)Q|tRh@6lSa$hw_wcw4a`KMR`QDuyG5ML~e~oHn6wP3F
ze$v0x#Z^GPpAQbRMIV?8eX*67)-xMx5^Qg%Eiqu-?iHi9h-lJCOCAA4y)8Lp<+g99
z%i7x7Ox+DZpLwT}i|@4`ICfy|2=&qUe73x@OWTpvch=UB-iqf(&fM;F2Mx=XN=}Jy
zEoiVv-O^$LwlNb8iGK@pwq?FjMS7!}pj)rF99akCtyBjY(j^<psL5F~!v6+s2Guix
zeZ5FRlE*Sc<S!7&DPx3BQfRccGQ6&7BQ$b`|KcTpl?b({?tyD;(#ZT;eKhLikKOjZ
z*)G?&wXlt3hZ8$+9#Pp?CK-Tufh!V$i|Dh@C*n)VvbyO6XLu^Ql>RqtlC_C-W1G-I
z_=nOf{^J*R-OGBNFc7PRxhw@56muHfSd6Y=>z?ch#K~IJ!)?egYwMfzGg>akaTV2l
ziBU#ZEM<8$^@HdNE8adyK6O1egfXs+lTMGJwe^tn+IUuZbyjP=_LQ%~-|kmW+l(|O
zzB1BOh*3y5lHF)m_*ZbPe*UHqumK;C&$Pn$iyM@5aG^p*jImuO=Lx5o<Zh>t5&f^%
z5q&cO?3`50@41|XfRh{spMM^22l@h!vo!?NTVF#DCkxu1p565}8`XUqtqYdKe$rpb
zK0rKDk_jInXV%5-Bt|Z&*xoc+!!ZdSyRjnXF<gQn<)RRz;V5W(kXlVtwOB$>5ld4z
z4X<?8cahgX>+1sn;_c<CTj0U-O@FR|i39Xy8(G<wB?gEF^iN!P`c?}hTfKQ<Z9v+l
zjT_)gP}NA4lId0179aaz-l6}D&9&feP`yKtKNq9SzwV$%?IgUw)?Y7AhdaDEpEYG~
zj!i!XH=+RU<Ds~RaMawL!6GQ*sSq~GgH`rZhzJ9vkTfIQc4jkNZ+sVk{YpkC>8et`
zLf(et4IkWh$Uk*cdnm2l2W_iCr}zw7l#$h}83)wDj?x9f*`;}GjsooI#m(yyA8M}m
ze}BBc(H>#zT7khd@8C*60aa8oiJ6uIS0)CSGMi(Kc5t`knY?>z^K7tmtLgv#O&d{v
z1zq#kCLVM7Sb_*r-Q81#<|rm(=J|z(ywO6$$H`5?v#OEj>|~m=Iwlz2tpyB3yFKv_
zLQf`~NgaQmudpw@X-zo%^xswaTBnegrv>DH&0=BTEaP<OUCq(d#~I=PP6ENGNbtq}
zGTV_oJRbOqyJz>#EV%s>JiDQp)%-Nz?w#IEM&q6}n7V{UQsrVu30R`~;&_nTAd4^;
zXsKyEjgpu}&FpC;ajBDTy5Fh;N+&ZpIsPjJC}HH&SwS3!@92mH`qEJ0Jtx6zzw5k2
zux@rhY=x%1du_jy4vAk#)VxlIhQs0KAR~f70!pn64q#owp?xj}ToJ>8nps_)Sz}^-
zeYCqpJUIB+<F>n8F0NJdSDL36O1#Y9+?EiGFU8EqXp~?E(dBvPES`e%J1+DVP|5@4
zm5H{S-r38F?+zeWEhL*9YWaa$e{ZZe&rWQaJy%}9c1_Z);$nlnXG%V#h!5CWqBa>+
zw8Z0B5{-^Mp1M<F+pGd7onC!%e>%1o&}3N0z`YFC>;8#nG1oEfn{_{joy`aG-hJq_
z^~GA7G;a#+FGIN;S}2Jh(F@l`clV9*8AJqPOrzf~OUAKYxiNFMAIedAWeUwoQvXmA
zXFlk<ea#CHu`U(-cE65Ci{Ptg7JI=P!p6EHe3?bii_dOkn1km@sn+j`|A=#!it|>e
zB@IH)9=}NUnmCavzT<^rwx@}<rFjpUfF0p%VXiMOa+^{J_n7zhoQGhN59R<nev4Np
zy3_`)iL2Pbh$+hAOLNwD{mR9UUXDEyeyW<o>t_%8@|Ls$Y%GUH04iN_+m&%15XK{M
z*sVt9r>d{JF7LL7hm`_|aR7s)ubV$1WfjQhTId(D6W3@0q4rUXoT6wJ*g~s4<?f3o
z?Mbm}=0^JiIYVchKz!Iu*TLyn_cufv9*^Ve^2XXf1@jYZf@O2t1GGRF{z>>ocjzM}
zUHC1zy!+6krXHW&(a_M)fA7IpW7PPv<RrZb#+`b*;J6oKIFoCh+qRcQ*m!*;cnQ#l
zPKr|(ChhrW4X2duU&F?prt^D9CvLp>VL@>kizs)u#)?2aHPd^pt-5ki+b*h)=wS}!
zZ@Eq+nIL!{kkfo_I$4saBg3mnL$S#cwI)8JgGwzPr*R$u4-kd|Mt#}jFOV5)(yaC_
z*rT;kzqlRob?|~|R@4Ws>?srROSJ3f`}iFY#!r&BS&hj-`?DJ<vVO7eqpOsH>)v2H
zH{h)41~f$(e-2sUbb>$qfn|RAXF1)&;4f=S#z!h0o91GX-q6d(zAmooEV_CcU*F`i
z-hO@vEy=oj_2ja6^upXSaFl&y^UQtZ^DI|lJbz$J41vaO)M!OqQZ!!UM-D6SqB8lf
z$B)|S@@X>v!n<RfUtEE20hTjLlsr-9`N_<anQx=L#nr|3%tF4ITpOer0ZO!{H%xRn
z!nI1hEs^EDD<ym(5#x@jrYhOJ7N(--@ZEm(cZb1^JyHl2sE9kGy+mEHisfZXMRDtZ
zDpoP0r_q5!-0b3taSmOu#9TP~<>W*0dUNHHnf7+PDDf*bTys<y0p~|dQP@h;iqQg{
zu9zK3gpcv<Uu^IDgwC~_5SbwLL$upH7I(&g@@4pXHTv<W2Q{@djhahh={3n;<(H%*
zGwATm8y#cwc?&c&kM2|Haz8&{+qTxL)CA)Q4>HQunwv3P`gG}QCN3QQVz@3^>$e0*
z)U5YU=Q*{s)Cqveb$jYE+$HiApXEhfhPB24b;Bn^MenJXYerox@3+f^*T}t`>xph^
zZEJ?O;Un5Dlq>A8KNP1GXm@n7KVzC7K4bz4g<pIa(X?Jfj)8KfS;>SWwB-9{|12x6
zfpS}vR~m9K&4VR^h`YeBN~B>K>;;Ar5N<%$0_l-WN~q|OEJi~I>(=SU1Ice@L|s86
zxF2j=q$yS+Mz!=;h$3mN1-c9-!~?KcV1$3MQg=9)H0mi?@1CE>Il2UJ+jHZ$T+h=i
zI;jIiY<+1$;W?!RJjhD74R*?Q{PQT>EU9Hx3_WqpmH_ql>>cx`YicLI&>&C<FP^l4
zL?L>rvxm&g#n9>J4qR)4=rt}OV3(=B7It$38by6rdH;MuuiJF5>kvJ?Te&SKKzI+l
zvV-vQpZ$|60yOFfU=Me7Cg)A9toZ$MhKJoSKJBZo8o3V(Vv;=dCJHaM#qbT)1;lYB
z&5&uk=KH6~B{q=X@~UNL^ksvm?CvmyQF%OU5PbPjf-*q_A~ui9SyyD`V3ssK@ccae
z9LqEHV}1WJc_+s3Y!|#mI@0*={v~6B!J$HA0fWJp!4rWu0!K2;JqnOLxK*1a(jcOF
zF$)uGH$jK5j^<%95w!VI_4_$BRax7;@nUe4<D%(>tE6wa)j!Q(kI+i-uflo?{d`H@
zMhCo$!QS{MSj@T}9JJc-`3mJHu64zb$0b0kgM1WEe?f?$rxXWS(Jc!{jh^AMQWx_w
z!;J0&&Q|?jJF#229*5v_nz4Z*k=#)QPhY97w}-^iJ&;?kI-LJ+xa0ob_0exZjTLIn
zdk>{+)pT&}5LQM+>{}{CV@d2@7AGXmOknsN1fn}Ee#rQhxPb<6><SaBpobX^?j}Pd
zG?m<mbAjIX5qJ9Xh=sC`+8x*(n>yDs6RfB@13aR$z3GLVrxE{#s)<wjj4OV2a79w0
zo#x|yCzUt>RdVIavE?P#06R`o8b%vytTPq1lk=9nPrrdo_w4eOOY|%o%y>rLb54=l
zGw5=Q=Q2LhqY)9M=9!=~9xxuAiIl%IHAGcknA<(SmkM<?3Id{~)K$uWJIVc5TtM|(
z!>LJeyXCI&?d<@*!zVZ?IPPg$w1GLCJ|-12<6vLTy^}^~5-ro#BGkXHbhI{Zym8cd
ziTfv9=#qOifb%KlJeH(Bkt$xGvFJ+(y6pGnOfP$>Q7vw0uZGxZ*WXpG2j9*scM)!Q
zfc&ogDeX6D!83QKjCZFzU?N%1cY3p;J~6sF>!L$6a#jxN*OhUXuBd*0wpysKH4TTT
zx6~wcwa&t9j~K0mLZ+dA<$}%R))z>g7Nvv7{etSo3au@QitXj+@*`APAPtPC9Cx%q
zkl_e-DQ-px{XBjg|8DdWS?+gN=}kpsEPq56Y_=z4U@{r5bn2)>^!Kz0hNV-0p(~f7
zYvc$V)@cG?|MqN$-o$oig4XozkJWBYsgQ-PWn<)kR5{u#BKw1T4I1{YWNaqG_^Zx>
zG8}v!A?{*WYqSk{8F+{CajpyBS3wR31n0{K;0Gd=Hv-vCq+yXOYE}SlN*>-se9%CD
z`Ny#q7(KXL%hLB(Au<(!RtaWxy|)3qA6?qWDFt+7+5fGStdnLY<%~}IHb&!qPS7<y
zh}skpAZZlkKr$^+VC&XMwC>NOpY}P;b}0d3+!rQP3TAxb{ju3b^3X&II$(@+%g}qT
zkU%su%dvpwFZD?hCcMEDW~t3@#Ai?3;4ETm8R3`X4aUDi$j{)g?)P_lRF9OXmqe&J
z10>FmF#$425cJc)uSikXc#su18h)jbZ#}$do##@*$>iN$=x#Qel>eAGk;9&0em5&%
zYDMPS3ZZ$qq$Uk_98}x5?1)8c#<l##`XqJfgwHq&C0y6Kx1r@dk#$9xHtULN9{u;u
z)6S_>oCAW1%&L&hQOE_ie=Ue|BjeH|AP=wh&A(Q?tr;UcS*}JK#B0|?GKfQG@Z#yM
z%NInwpSIPN%sVMg<Bat5Iz4$iHvZR@mQdv$RveJgcCO~yj<_^<mrz|XzE%&pRZf$2
z&}{n?%|=~>hF9<b7BN=?LMF|xn_(IVU_CoRQ~-mj_<9?>B@JR7;VQ7h==zZdC-KLD
z7m!`$m`fU-D+F>pssm+vJKES@Zy*-!>3|JX2MH9EwF{XdKFE5O)T4R{&D{y}OCM49
zi+rEA0wY1(wDjuM2+sTEbzz+1b60*1gNX}k=tpwQ@X=R!%CJc6B;P%%O|2HTVb|z6
z!&-~S_qOUG(Oln3j4u3Y>c~dHs3L_}PL1+q+XCfsgKlGcY)yeDZ}X|{2e?xdTMDh7
zE29bC*Ik`1PYVJ&DD2$UNsL}`N6pe#h2v0{-{bO-)7<3pwanwwBPf1fkJ@*4x4C@-
zeWNDEdL@j_atQl{aE43XRQs%%uEqaNtE*uo2yO@n+8Je~_~5X+A!%Z$!fh9lR%Vjc
zfqYEDuX2;4G1#8h;;1%cN1zup2=s^LA5oC=!w7f|@qd}|SvF)hYRbQTmr+Qe%aPzx
z5G?arR}#j|tIBGHVY;S!c;iDV*nr}xLjFQ$q9c`XXVeg?$3@uxN3uNi&<{C3A0u9u
zZ$c0jViDDHEy9^DN$yTi&RDrtPRf{uV5DuuyyzT|y$^KSg^>ag779*~H$t$dcsc;~
z_G?eTa_XD*ZGP!{K(CNH)?9n45N|4_!(pg^H&PYhu9jFMHd#hP6I9nH*(Zm37vn-Q
zwoMg+s8Hja&<xLX0E4gk?=RBc%IZH0nY$<Vsz_R@Dr!E{{wjE6?w>1AS4B0m9Sj?O
zmk>9=AYSI?V&6=g6rYdKH$eeM@9RIA1Ngqx9ER+Qid(%b$4R=%54lMI0sVlPJ%px%
z1-7$^5jh6hsx0FHb5r%~J1q}2*Qcg+b5k7EnQ^nQe+%{B2RS2jUpGOlBYgv8VCF>y
z%>3fWGffS@Nyo?f5-DPbqlyC=J<}N1sNYnO#)ws}uqCpcBO&l0S^HCgf$_cBa$)u1
z6ruJAPRH0*%qI=N5Z{SPJ=5HmUg^{zslvx{#(phireK7CtQaO5smi0_{;t-Cjky%t
zEfoyl-ID4Sqc{^V+FJC~gQq3|=Ln7wT0CILp<d(icsM+qV*PWIc(mS|_`!9W?w%4k
zc{@8?SZ$F|t`V{w6=J420Ube6bRcjyG=q;ZM$mvW$ihs@JEmpq{#xJ-?0ei2!~M^d
z?s~ILGFH+2Y-wJa?M0-JbfM|x?-J7c1X)MVCWO=Fx@zImGAm;&(A}NpGwosiO9ZLO
zEcebY9r%(3RhLQClEDi@cuBSjxjN*M1wPr$>o^?umI3~o$QN#%=^>h)Gy*OV!u9#G
zlw)^epUImM7SCPvbN6q0fpF!rzM(RokH-1k_6+PlfBqyQ$k1oE6Libb^-G*jojlkL
zj%&M0)U`tPY-&)#BJ78t^!IR|xm5lY_$CZzGaNYSPq--+;e`T<6N)`pWb+nn{p2}l
z^5H9m0P&^mO1@aA_UGIQ**f^L2HhBS(kiDr{J5xi{(9kfw(~kTZJxvBu}d$y+4Bn*
z#_;{Tm>*G7)AO3DuL8_2{PjhbsS(&4VWJ87hCoerKL4M5*`EwqgQQLy=lxnq-kvFS
zaF1gQL8Q=zzxsMXbKf;zGp4?MIuM7BjEn)IKyy%tNB`wg|8G_;6si74&)YZj0}OaB
zB(ys)pym}4@2AhML>_4oA;gfGN+c0rCWBGwgt)(L;6j7*zh=cRtuLEuAt|8)L(tLH
z`iOTyz`p$nDb<MU>T1!gRTXCYrwx#z+|4wF1?v{}jjyM#JEymkq3d;P`~yXl!YC3C
z0bNRB)0Ko25}1Qrk*|Y{Pz!dFz!<z3!rSXE&I^Bu(Dp59q2hVRxD!Z=PHbe*EL(2I
zfQgS$9o9q?T-&xys(seUn5COr`OPw)AwX9XDOhf0pvm5(o1fFC(&DkNsEwErdaPOe
z;DlJlJ>)KB_%+34%;&N#3m(M^`_?ir-)i27D;Ij{s?N{se(Q_%oy{A+lp(w$KaAoR
zJkG2=KrQL|Y{KlW9ZyN)nkwbi=r^@+bHoqA&5U>uL?8LY@IWu}TAzFZvGnn)29cEn
zfIKb3ywlEa$5U7x{+{{H0{X2QB&PymWx8EDu(K@xp{8GzCag7Q$EtmEC{q23&+gw$
z_h5@Z8e<%v8IN>*hriCc$>aFl@;Oq%Q)(o0eYUdtJD6@#+K<2sGF5sP#+ko3`G4lw
zU^cLyFcdhHB-$u?A@wy?B{eWLJ$0FB%i!2R&9K=J-q_YyZ|EboD9n_g0{Az|1@kh4
zwV^eeHN<Ll?WZw@5yM{X!RX#<-`J34Ut0g#z`yXQFzJwqsEX*{&?`jM>YGZNzMF}y
zcDJv$hj%i2YyA)Ye`8ntIYL`v+^}!px3xQSURz&jU$tJV?;37#ZY6GO4tn~&g#=}K
zr3i&`<qa}=S%j$iIQz(ik%iTSp@iXte+Sz_eIhL*RwHMVf5?c!Lw1R(g+qtGMW{vG
zg=0nFp~NEJAn%a)iu4N+i|5N4g^`At<Q!6u(IgNQ5*K0@K1=!}z{hoyIti=EvJ1J!
zT#|6Xw1Kz5+ymeLMRiBzMSVl9ru<M+QG`{#RN^fnElMhI7S$AM6aSZbPlCph44dph
z?WR(s;-jLy7`^DYs8-sg?5235*i%4M;2^Io%p&TPatuPpP6tv&T4kxV(zw(})5vg&
zdFp(sGk-MyXCW)sOD0xqMyf{C?$0)i57{T?C)S(Sqrk4eA1o)VC@d_jH|#wuI;IYz
z39~cHC9{s9I~ZgSrW9Zgw!lk#2T<%4vGS9u`9J3y4gtRaVE-uqU?6B941n#=NnSJ{
z{r?E}^(_r;yG<3uY@3OqQf(nsum}i~@?WH?^>UUllnk@%Wm+nyA*hQO#O7C|71qlY
zx^`-1A2_dIAHdnKShtbx;=K1T?q<gsT-{Y&QVhsw-1U6?=F^+go7Tkbf`0RsR#{xq
zqBE~btzsDeWcQSvvwc}#S*sT0!E^E^9{={)%|cYMfcHpYXc1t4pnuM4vAx=~FFHC;
zGk-+&-OM&D-+<>7(3D)`Y<9bUF6Q-}oQ?O-fcHpaV0<yY@^Savw)FMP_xB5ce~VY#
z<P>b6F2u!Hi1Mu$@%<Vt5Idho77)l&Z6E(Du@SvDXWTs!y<*yl-(xqQO3s=a{!Eoi
zrH_~0CFO&!7qE|Mha^Dai+|5&GO7KsdCXV;1~-7xjsMUzp^$STf#%z=x$JI^m)sP1
z>2jeLGUFEady?0v_~xz~{#lRi($(wY?CBQ&Hkq-=|0(Je(D>p(Uz~-ab>p6S!1UFD
zlAIjuQ4>Eya_Cm)ze;4tFEV`2Sdwbq{6$eP<vJTb;}O!v-5PzcbU9JiLhY_+YQ1!8
zbG$yNY33yR0jpJ>_5kw^CP#Dg#Pf;O=`8-2*`_A=ASXO3I#x3g4R$Bnbo4A^rftoc
zKE;ag#`2(B)7Q3;jmFpPv)uc-YRkgQuiA7zt*Oz-s|THd@0iyS_ZzeFTn9(%_-#5U
z(w@5^CB^;&yt5G%%h%?z_>a!Tac5e%UsmWhu$LZ#EIQrxeVR-AMDhuf&y-u4jQkmq
z4Wo0|2|KK3FPnyy8jf*L_N<QqLq76N9=n}AAI!ghgXPI1oJx1Z*#sa5<mzl?W=ajF
z>_WCkkr|~?N>{?w+Pc+$xWx4y-cQMa7e{kLm)S+2)E6LG@U5;32@Oq<<z)IzXXo0U
zgwfDwTDi+9++kF`1Gi0kGmBO*h1lol0%Sg|tFlu@wxnRCFg#|ETX~?IY(&>ro#VZt
z`H3dEp-QBI;ouE$uDlW^LmOPL1*6!x>0{+J+9JIr()c1#GYg^r$RKOJR5ow|zUdD-
z9u%k`R@>(N*}$57c;*Ig`5wiL>U38-r#=@R#?vtI=6L*F4xQl*)<!E?DOc?xzm%qx
z9aJZXJZpfCg%2`QtMEdIX5jkFvG}oA!Z<I4dDc=HQxc_TG+8^;D%JqYPq{hI{w~~d
zL|6FF<Z+@tg10*AbiCCwM@)gXe6Lj&9dK52()XQAe@}n}LQddktQJFRjRHBYj>r<;
zTwN!~Px5@2T2Hrz&O|jIe|^_vvmYjRU#VOHOHwk`W>uY1{p}(JZNh&@NW*te;ZyAq
zStM~}pw|9neM@Cst7$w0!0k%63oS+5sClNz`^VZ|+aMYy-tddGd5Z;sO34)~SMOw|
z*D~vRuB9?dCB#cdid_SvCTYb<`?Nz;VY2?&;JX%?D)8n$&#c8N^#2KP1dsb@%CWoI
z32J7U0!#fXffaf<!4V=&Pu!hpT&rcVN;v6eGm&O9UDsSOH9oSwKUd}{e79dXA<h1M
z<W2S7{2WA<BlvBQ<+rl+M#v;bh;Z@$<-#t>S7XbEBRhYw&jiuvY@s$Ua!Md`Y_w%P
zG22RHwJWm4mS;yb9IJBgm28)LtN8v7kH{#yE<in9{wXAxq@meccm;_6VwEn|?fUbb
zLfTyBUY02xr?L5DjHq!|9-t%XBVHswbqlpb{jAO+Q)t*hMZSx<sM6<Xb}m<Tk$+sU
zQy0%Z{8IE6Js!XY>g78H+^PA$`pFvey<+{@0Dn$S{zt*DWYN%Ub*aI-FBz}Rtg;=L
z&%1LEkpt$%R<#@HSRZ<av&|zwkI>cLhL#>@pe8CKvv7TPqB$w#y<Oh-1=GC=x=-N;
z%Y}^E1*eZr%sVz;aD9h%5gGx9;4d^aO1{kWU12DIPrbM-A!xZ;ce#=&PC{3^{D<(_
zAuP3K-Ys&9w3<g(;0ex8TxT!iw&@eVt}pv1s9oSa&r{oTGVbDYc>I!m!KK;LeW~6t
z&0W4oN}ay;?IWIR+W!##He|~MeC=A52^#V5GIk%)q8ZZZ(|)D@+D>kn<Nqvw4~#s1
z<@;lm<<`HsU%^JA<8`dvV4kZy*0@XlJo}4!?O!+ztQG)x+HKB9Op|dK$MNq2rG+xe
zUT)m`ecw`sf?A|??>!L(+A0DTtAZ#R!L7lVc+;qGQR1G_L=S4*D~>1!PafRypkB4u
zzc-)DC%-3o24VcI-|ZOuuik@%NjTw{h`@}6NTRS3O$@QbVI!Ud5=kPN6jDheoeVPR
zLRY%cogVb07g_YC4}IxJe+Dp+K@4UHLm9?!H1yzYJJ~qMA(uSz8No;jC}b3)8H1A|
z#!`$6H{%%31ST?x$xLA?)0oZ-W-^P}%waC`n9l+hvWUejVJRgnqf|_^(nK?d_`r7d
zvxmc+piLs!O$XaJC}y#+kDc7&okVhkll<fdzc|h*?sJ#ZEN2BRl<|;q?(u-9JmN7=
z_(%mWc*b+i;Nd$5c+E>*;pH=5*~LnHtYS5lRB@DQ)=-0=S^}(P9qakT2I{F}Bb#X8
zD#vJKGh5io7rt?gvz+5PZ+I(FVwGr#kywcno5V|kBubJbONyj&o(o*&3b(n)CGN0;
zc1hy~Hzi#%*ejW4Pi0+=SGNSJe43^ehjeO6m5U6eU76ph5gbtJN<(Q^W-A@a9A&OD
zPx)`3Go-He>bkYU=Lz`B%Svm#p_bte>2RA|0e^L8a0UPP0}`2%UjP70xB$pfSg`>C
zj#;?~00;nMAg}==M6d%RaIhCeARtS)01i=0um)3FSg<r3uqatzW*~}HSg-;mVXy&3
zV<Td)0wYAS3jqcyvJ3_WDzX#?1}a&y1SknbQbe*02nQ;$1_4B|Bmsy~Sg=5dSg{5J
qM6o6Th*4O$1OSLwu?7J|Sy@?GxB>r#ump{<1pq_<0a30wRsaCLz7hWb

diff --git a/style/themes/MyFeatherBB/img/closed.png b/style/themes/MyFeatherBB/img/closed.png
deleted file mode 100644
index ea86846740ef8bd1ef9eb6bc8c55e870369a7b0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1835
zcmZ{lXE+;b8^>eMv?xVY#fZ@;ky=HOnkli45L*zVC>gJ+RaGm58m(1ZjZ@<&)e1_5
zW46`QIt?{yl}4O$&^pG6^L~0iyw`L8pWk!c*Yp41&$owUXJY~6zrYUw0DuTfQwJ77
zr{d*i?S!bPzgXb*v9d4)oSd%m*R{E<4qv#X3xP$;e`P)#Y<Sv?2!{u-2>Mqk2gM~U
zt2)9I?uhQ&bPBf4b(SzxX1}TO7q!~i)h)}xmCl}&=TJWD%D>{EOirH;B^9R6oUPLE
zA7{+NKIb5Fu}_ThC?Pn)aGpn8AemsK>2E_(eqmM)T6n2yrH#Bu?c6`Ai|?2CJmFQk
zjGXyxEw*$m_I-3WK_XhaG$UY1)*`{~!16nqv;>9yvhpLnCk>o>?hpEef}mkC=t2xr
z@+gH6czgCl_y#E$+BLFE2G<O<iXtM?EM3Ep&Ww<(%k!IA0dcfyyVzHVUkxp28T0Ed
z4>Wf?icAP9DR@5LcU7q*L^kvxrQmra2493;Rm*)g_o;eVFWR*B@7;FUtyM(&`rftR
z-r3)CDu32j{~q4<f>Vv&u(Q^fM5yI|`|6<-P$x)j#ZC<)lxGt5rCCO|!AZ#%r-G9s
zJ?lc0><+_Y=YAAcCQz)jA%gjzK#t7#tWmy-jhnoa?I3sOBzxeZ>tRE007^{gnev13
zR#9cvv-(od3FNnU>Z&eN=NUa3oj@C?AJck`2hAHq4)~XVKg!lhCy!WR+CTEa<v_4I
zK=Q<NZyWdijmXclVNo{Jz&R*?g*z40aAZCXzzoW#jLyHV+|J)`9x+z`ZP2rO4UHJy
z;=mSI_R~PkASdLc2rba}I$2BS4LbeofLrX3PrOw~pz;8Re5tFA-v<<%iCAV*j38Bk
z;kjHF_-)Z8g5fE$p#P^6xsx(}XNV~w<qkJYe0kOavNrUj%aYESZ49v{9$;Epfr@&E
zLP24RoE|2)VqRi`yZk;g4a9i0nQ4ji?d<uskX>NLww)Q;wK-X8Ypc&_?Oj=ZlnUZB
zFRwCG*w?`&PIu~i-&!IF&}R5@J=hA2?N3wk<k2X~SE`3_z{Nd%byT$BC~wH(6_>04
zab`1JT~N<zOLlE)4wZ>?dUrpw;`7D3wo2Av%=?9*Qkd1BNN8)Dc#Y0~aB@Q=d-qHD
z;A#QU{^xzJQTHVoR4|(gzITc-TXxXE1x0s>I^Rt59>P2T?Y-fRI1H@fk&Ba|GgE>@
zHCicBw?p8vmWGqk@d%=K7guy|I*@ezDtXjmhS=O5F1&-s^&U<E4_d9uMOCABQm3b^
z9&g2#<sRAg81krDRH@tYaQJh$tF#yk?Z>pY2oBg;KBWPt-J~#jAK0%-H$o@p1asec
zrbY%YUbsC7MTI~TAW4c}$Hv_H<ry+reGt?o#rI$~oLrtlPRE%#tzIvtaFzf^4HsLV
z0-!{qkpO>Mai+<)+SFREhF+x0wp0uVL9Zpm_a@W<R1^PH!*o?lCH|BPx{`iwQ1uQV
zAKvm_#h!U=SAUeDxMwE)b<Bb-$)EGZm-M<v_2FIJ+=?-~#k_bQk?9zA4@tt3cH`v~
z5c8<suM;eDkP&qzg<qZlBjMHY;FiemX*$^euiQhjUvV=JD%oZwq+o?pVn-LmF6d)K
zUVxFOI&_7XIfcj93V5X2I@mV{LxTsMH9NEewQuyuircJfzwK`FG)m-R%ALvl7H6WG
zqmftqT+Lp2mpFt{nw!2Ac33z4&WnnbFn=S|Av9p4$V$7yv&+dRw=F!2$B0T&S2tS=
z78>A2_s~zYGI%EQ4JsxwmiaCYJ}_@E9+{g63_^UI_;ovz+hx__Z%ulc(TDZpAA0kV
z0%uF~{~JZ(lgE|yY2RyV58RV#U7xaleLTiNXN($BHtJxgxnwg^MH{*CyaD4o`8=)g
zxY7ZcsZb#yUwSK43^wU`uV%I1x#qBk8Uc~k-QfWy4+*$jTZ`8EG|%lwe+XIGh|O`N
z$PlaxMz>IP1=eJgz|)hX^QQR%`Ksr}ZpC$}d3@hki#nPYSFNE;w-62<2c_A(Gza<A
z=l)dH24`z{s$S}gWH%a^p?L`74h2`tlMa@j7Z*R#pQMk|HIu|oQddZ&3y(tz;}v3y
zeC`=Hb)Z%3FS#l`+W2}*&G}e1l0+0s21AhD*Ig6{3-s*<5wIIL%b-LGS47Ed6dV2`
z>2(1j`n2_r{^i;z`G<q$x#`-_IR{CXu>NLmQS&~LSo4#hN<tECR!Q*<*<J{^17rIp
z^D16R@0hEu*OoWYOWu$5hk%J@Xrdp6h}HAOV_5*epwMeqSfz2*QA0-$3e~%+3xUE|
zhane2-v1av!~BB$@BV)Sg>&>W%OH6=;g>Lf;vEbg3xNBD`CvhaP)q>U0gLgwiyOuo
Qur2`*W;UixH@p-60p!+4F#rGn

diff --git a/style/themes/MyFeatherBB/img/new.png b/style/themes/MyFeatherBB/img/new.png
deleted file mode 100644
index 1fb470cd49621d62b9a8a9b8fe47aff83d9f0186..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1897
zcmZ{ldpr~R8^<SN7>%7=YM64rosn{Fnp>NDwKF>An$cu*HVrd!Nz8FQgv4_DxnyoB
zRLX5(61C(~mb~0%i3lN=-#Y*O{`kF~=kt9(ujlpsJkOsG-Oc5^l*BO!001C`M%i8z
z5cW$zQNc^5Qr86#^>;jP3pn@{CC{sJ1Re3~sLNylQUA)GeGT!eNx6;;5)k&Ul6Q)V
z1y&;37K!ob`HGEl$_Y|9I9KB9SuZD|V=|!XPAF}On{4@wNdmqkr+ALob~=IYN-L#C
zPW9a``<|*vCi8K51)zK<Ze;@S(PV4r<-CwWt%2r+ZJyhF;7Ik&Z4K8Cu`&0jR(|X=
z7GgT`{XV5f%y1*S{6fF1UtFcqiBJUw8N6p)d0v4Aas(Z>@i@kKd$ZR#pX7ZRs7?ZR
zdjEsAG7Ge<ZIatm4%S`SvW)k5=B03EA-8yU@B8MoWNbyr3gw|$70;^BhOC`T5>NbY
z<Ugo)c(8z{w-fyG#y9N5PHn5HZoYeTu<r8CJccWYi(Evay59GdIyM~Xci{V3+FxDW
z5JFGC??XPxSKb<`d%Ex+Zgf6LD<2Mgh2K?U$sz7f`jkRPV8<YHuzRtQPQ9Cy)iQox
z=}Qyji!zxL4mZGmR3;ZZrlxo`B)3U9gFBk&duf-el6j=Fw)LYnTLbpM9_WBNNNnO!
z4^4AetNYA#ON$ZhONvJ#WQLuy@2=!{duw{(xULncN2P${00{Q<iFj%DdRF5T@!XGv
z$j9Y}F&3WVu5+V-sPPe&#NXcKiT#`|TsKUQ)jpRouDtBh&eC4&VK-M@E2zjdW|&6B
zUg&R!bg->n98SHH2#`?Av|THBY)*M>%lyQZU>_xxOe9~Jkj~j`L9PYWWu^FQl!0Z@
zCr%&;a9`s?ezGm5QOInngH9MFZ-*XNwhJx4mAiNhy;*<84$bxbM-`|>bw0@=jwF(z
zPpN$+B(YJ2)M{Z)2E}^ktpUn{Bd#rGaW2t%<e8{l76gJddAKY!t=cmCoU3GbjQHo`
zLtMG4(1S=t*HSMM2Kz1M;LU&(a<tDsMm$%2YHCO}h_Q5=`9QgUr%dcoRWxiSQocfY
zIY2N9lTol%g@c=_>M~<1-WZ&%OuMsoTO<X#-LkLk*svG9F<k&ns@41gX&Mr7seRAj
z-&XY5=w^~*;6G_9gS$_UR2DBLr9r%y5RA0W`-3Ootcx_FF-cln!H+fG#+via)2kCg
z|HXB?W$;Xj#1{%igu`UwPY3L=4c;)mCM`~_ccuLu;rk&8(Qo=rxQ1uF7Ef_o4vkj`
zhm|q2xs{wuhOa|vuqbYZRO_5RE*x^z1DJ4%5;=#X@p62G5m6=+-@GuwLXM454xx!4
zJKNA6{bYmcjPTBi2camlG07SfVlL!}T4^=CZKuH169$by^Z25`-osn+BMGkiFlE2!
zIoeM**w7@psE3k}^hO<9VKBBm>#ZXD*~IDGNnIG__YctuL<IM>Y)%T>rz{SlR-#n)
zqa@Cmniyw}ja#ugL<;NVRorlvvmT?P2*yrv+W8ioUf1U={h7`N<Lr@#(!Y%+L~av-
zx;>2Xv}CZX8ts!b|4K0vNIIeD-q78f))10dUHlq0RU%9voE0hEn32l?gddf+A0Lh7
z`=2t%{JA7E*cxb`=F7ZpovlTviyaip-_d@nB9zcb;kfdVFQi|^c^b+^$J=H>bV3}|
zH|=)!&rmjGJPSQqt+69Ez893XVmu^osXORhYgEj~oP!3^?j0bc&VPtD(ty6po=<p7
zx1K1{8LPPy(Jqfu25Pm(<2z>_JBdkH9zltiA?HdMDRozqu7<P&muTBm=7Ek<YQ0d$
zq>3o+oi6oj_k2+c*u2)hz-V5se|55}sU-+kxqM}?jTX&lHoXKc<1Q3E;s-U{6^m7A
z{WclHUaQTV{c<D3tXdQ0#2VF5@bR{Q=|AD9WZj(JA78S$+2&%<p`GheJDV=;WO8}|
z*sLt%|MB_f<1(+1E9(~^YyC1W6o<{TzVM0-fQ6VPFyh(3&FKj%{9GG{b5HnFGbOyO
zdaXXif1#M1Hi*yyjq1(NcR7PwEnOP(fq9#$Q6Tr(;p^Y@fAU*lwEL0?#!O_M@{D}c
z@Yy|gx3{jD+)D$&QA0w1(hT4@hw3LzBKyIEWLivXIZ`GgjczuE$87DcSOzI|XgX*;
zWkuv@$f%C~c<sezJk49(R$e>W-MHiva>)4JAhC!>`2G0t=f#pWhW5azKg_4PhxEHy
zMLo@%^ed*=?pE^27I|I8$wKJKhaZR14V4Jn*sxhBh)SlzE#dt;=hDES8dYo1Fwe@h
z2j^+Cd>jJn%~G)5%>`tR>3>eo=ny*GRE@pN$y*g%AoXxNkMID$aJ=~y5?%m+5gcx&
zFG#~v7()|tINaROL>F!(C}_qahyKSv3=1FxM*V+-6rufvz@YeR!=<pm@CZK=9)Ju8
g^T)%`M86>XMZ8}?)L(48rQj0)ZRcWJZ|$4#Us_0OEC2ui

diff --git a/style/themes/MyFeatherBB/img/old.png b/style/themes/MyFeatherBB/img/old.png
deleted file mode 100644
index 48294fc51bbd2e3bfe5d92bd4c68b55bc5b5465b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1551
zcmZ{kdpHw%7{}+*(8bhrV`;4tJIXdXV~VD^M~=%#%CJkNWo#i7lFQVRTkAq8xpcHC
zl2kJ?b7@A0L^>KtB%9WDT&J`8@BDF|_x=7p@AE#t@B9AuGQGWARxLML4gdgFxw+ze
z)P(+&E>Qi_<Kq=-0K+_7aDX2_qnKBor|#&{To2LJbp0jg_6Yl*%@`V%q9*j0GUf}5
z0Dxs+HyqY4uz3of;O*xRY1qSVl~%8Cl^Yn!Q&Kkwx_bq_-Z9MWLsionSWSJOiN{FW
z9QR{h`C2Wb1}qXQJk!&(bgyBcaSC=oNA^j@EjwODGtJ=@$)3dWk`Z5$lcLBCyja;@
zzHC7(D_pS4xQl=1e)u@3-{NGE$#M_)$z4I7_0)G+d|@083N=`hsWkX<d$<TW4;#y2
zLAx&*;Dn|hEwfQ|1JLMb_PkE|RCbn!xrcjKh1X!-k>_@HGeYUt7sgLpYbs{*Q3`B`
z0J;uB289dT-d)ZWluG)9P1JDQzH5r+)U*sExR?LZKgzikz78S0e<FQ-zl%7BInTsm
zFQa2r>YLrW(Orv<L;i1ruQ~pjBUyf>O}9=pGO~oVqao`K*Vvn3kW-?C9j|mIjSa2b
zOLL`CX<2O$M}x=Xt=Q)=qfm6amu5Lz*bw#ZQv|zAu#&zAQRLv=HD)VvtU`?Pf~UQ{
zeS7i@*un@1Sl_7$+$YMKQ7T`nRH~IUki>SVWb=H@qtnV&Jx(pH){-%1;q0A1zR{gc
zOiLVL;d2v~pF8+_5~LuObF+4}IoYLatqBA|L|9u3f^~qvmE>-aX`p^^lb%%ZAo$Ef
z>vWm11&;!SZ|^aK?efG2;gQ{aea^8HX#<2Sk46m6k55k{_M%W>fTd>L2+i~X3&b96
z$x`u)Ftf#$(Wku+61S#mP^u`iwpH!?XZQezzdJYD#wvoNbT6}5$PJq}Q@AB1B_evC
z;JwAe)Ga+xXqgh-#T^=L<+C;E4O0zTX`QtG`o{5r$2B8hFjz4<x=rhSv+e;X7}3$G
z$p#yBpEr%&m}wO)UwfkV#;M3iba6>Z_*FfF{Q$>cEx^h~2ujciz||MRYlGO=^F9<?
z64J@$EI0U%VR?a_5$gv2zTZlM?&VPJts3Ul0PuSYnhPlE5=6K<BW^kw^qyU{8234?
ze>A(;cGAPZ=4ragxtTb$IsBp#p{7ynfL47SUyn+Tk5=^Sai;a^rYg?V@SVUBm5tMF
zXt;x&$_@h?KL>;&Vz)%EhuX~`lJh@)*8%~7(q!84Eu@!qw?de4u(HKmefieyGUb(O
z42!S<uzG9_9W&!gY&xR)`f@*Hq{*N0_?{IlVHA7Jd)>%F!2X2wAbA9tM3uqZhOQr?
z|5<&)=gw2^{zD{t7c%n1suo@6ewcNmxnmF&#4#OP`!?y#*+sWcHUkyn?*W{qTZC_X
zA*|DHd|y$;0~lH}<Mhq5xoy&!i95|LJGY%pI{Lyd;pRz9Y<(JYt$*e2XF_4wgzN;L
zf8_N1MSfenkMoXu`1(@{)6;Cq!5(W8EKpgz@F+8Avc4dm6rzEGL3=)W#?;PAbPt6l
ze&ODTY~anJaRu-Ku7Wt{9di^L9zQnZ!L%eLn!uRnUcEj`hmg$AWf^W57K?cK-}8<d
zI>ijQ*e@HVt%ftn_^fhSP1UVR?p%54r!mo>i+eBE_=%*OQ0|aVh`OFjy*9$!#FjDy
z*Ps{1uJ&=CS4StoZg%u8X~`=m>t>xCuZU#wP3<<Vs1)`Gx)XCE;Z(XSu@oQX(lz%%
zF5l$J(o1a5q@RSm-FuLHUbgum3pF<Aa0~n>wM)O_FL7E1V-UkBJ;1q;t;Fevehn6D
zOSN5j=oHJ8+a?Y3l(^4#WD%9wM}F6`*FHEo+>Deo^a8Kes&x872E-koIU4Faxt-w@
z$RLI?NSN?wk{SRM0%5yTok%M`BpQQ2V30PyAyDcfE0Hnz9|JX#c$|FZ{|yUUL;-5U
u#-AH}Bgu@|&}b3>ON<O7LEWgK6p{}qlz1kpowP^&3E<}Bh2uIB&i@OwF42(y

diff --git a/style/themes/MyFeatherBB/img/sticky.png b/style/themes/MyFeatherBB/img/sticky.png
deleted file mode 100644
index 4d7d150bbf693bd2db022ae6e53fad3401b5bd95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1816
zcmZ{lX*3&X7sr#SvBX+RCzc~hYpoKY8exb8q19N%5^9g7NDxU;HK|q&ZMBWoEB0Mf
zixKNss+Lh(8HuG@Z7rc_EET1p^~QXAKfLGO|MR=&p7Ve1{dUu^j<%8@MGyc0ki^)b
zoCSm&NmN+yk`fYl0tg2<*rEW3M^V&KnJMUqMcH|h1ho5CHUr@nM@>qURfvF)f0fG5
z%NJOcF(@lnj~;H8=SA0$6aD92LA&ZCAV#~nDQ~h<=&ejc10%hjQ)W0T#rx#n8PU}x
zR-!)<%4^WiwQ#%TZeDC$^^LG`k$pc_1BPW1He=Dy3A-|$-H_vPn?+ieFxBW~{8oq<
zpwrE^ZyX+O<ZZN(e$BXk{M<Ym5nu;>6Ubp1XBq0F`xc(Svlbr94!aJ+E_!OPPJO_H
zO588Ma9IKxoWpU7HdHRmhTtp8suHcArupX2&F_Zr_llpL`jJ4PzM!it630XM8A+vv
zu&kvq@9{Xj?Ax#cqdV<;n1X_5eq^u-$EOoVR^P=>Y}`Swnk{i!cO$~d>KQwHr)A+|
zSU8+l+C=6b9|CdBdjdvO6dg#R`e6^VW{4*nRTZ23v^#@OmuWW^=OITtBg5CvO-{wC
zcPE&)wB7$W8=BnxTw(LYBk7x56VdfL>!?cW#9boO%BfHuWRm-ml`Dcw1s?t8rZXh@
zh%y~W3yq+Uf_KWDFO4<*Jx1Hj9}8Bd?EdnSl_~PxM{du=v*;5UX2YDHmC~A3w+t<G
z8HNszCjry1UFe2*9S<t?%yUqbVk1Y0n70hwCnm7b+|bS-AL%J}yQL0H*i5B%>2T%!
zLrpieoIt(_{pE-MJeZjIXIhMNjKDxFraW!#FyPt&T~)p!IYlDK{aI`>L<lTtg)76%
zAYJO1(MyRdv{rLz0Q~LOKG*Z3bTz%$@1Iwslpf%LP5Hg3?G8tV>8G1vw&F!gL2B%L
z?c~3hNer_qLdKe);|$B&>Y}TtxnOb1IeY2Gl$6(A@<zCj9kOZ~SR|C;b7p6>2EL37
z2Y=-`3T@8i2xIS|bfw~o_>9Xi0z#EqQ4G2G!b9THhDh<;EP!1Avc_uma=L1qfC~u>
zE-s|?fzR?<b(VcU5SAEUL9SR9zuX*_93RI@sg~xF(&k+w7g8X@E#9CJ_n{(ADKz_=
zKREgEA2RH;L95ypThVu#6gB&k=CAG|`hoL-5>R}~y3zGEh0klMWu-16H9qPmc>X8(
z+r_b1>R={;(ed%t9q9vu@9^ZrdskW%sC)-B_Qq>*PQN!6`jJ|4#ch*dh$gVKW+`08
zQ|I5+4bNOwXq0?{0XrsHGVOlU63Ufhb-Sy4%c<>TiDyb|2ruj<vmby?9l<7^QAJu)
z811XK!=}8k(P(PDc$`;3L-GcM&@!7)M;!Rsp%Qd267i`Ywv~_AlwJeG+W;9YWf5-L
zwJrxmUKSUqw*Y)eY}~X^U*&U|1ZiN6X)#DmM_;`wUP;K&qw5-AD*oh85d}hkM$S%p
z;aIh>d0>fI*XgplMP6d(twx<6GHPx%fJtawY*lZ%w+9$3l;KshsFEw{WU<(_$_;Qo
zupRz*V@UM13cN0oO>I2}oJ0YznGOGxig!4_A|W*@p!x)mLq9NoI!)EsVX+7HNN8Ba
z-f67$lF0iG8!cs6nhaYEDpgRQd>Go2u$wFVr`IIGID6)apT~2mH=8!4(`n14e1X(r
z)U{Kiw`8;Q1_E~WqFQ@#Ctj>%eJN%CEZacr)BnuAD-&chWOcn{^Pw0>_)D+({JV^a
z!2PO(?=dEWxIJH|wGxfoiM~D~v3LYb*65f1W-Zgi98MYIO$0sn*9u0U@6{!pL#Uq1
zheitLy`~&a3d(~>{C1W%cdW|GEU(#~<lbgU&Lui0o!zcq(AJquN8_hvv(jcBoM4}V
zE!R85t=e5h>d4XJCw1gJ+$omiffnR;^TLjI9dSHkbt#OnWxP7dkzWmWad54~JL0cF
z1DV*K6cVfc0FgT79RS}~t%M{NgotW%X;!Ry<Wm0pqDpGJiuy)dRT9eYiB8wMh<L0O
zMbe%h=MGk0hb!LdN{4v@f5`3V9;n32@4G(5-xrlnZJuD7(a^v$d-B1VcUa%@x8IW5
zn_`sj(q)GVhHk<XSn3mXc#Mmu7zLRVoYYOeL3<TF6+_d*2k2F%Wd<!rZ4Io9?w|_(
zpbw-R{>96lPH^nv`6-~r<-TPk8KM3Twpp?;0-UcnPg~ald}j&ARcxu|y=fX_Dh(n8
z2jg@s+9Ni|KNb%UjKK>4fEpNFI4ej)BUi)oa03Ilp{cF`R8XWR#;*O3A(9vr799Wo
z4f|@t?g9h&Xo3qdIQE)<3?5(=L=3<~Fp>TtcxSwSP<-?N{%8#V2JMKdLHZ^C7mOrA
A!~g&Q

diff --git a/style/themes/MyFeatherBB/phone.min.js b/style/themes/MyFeatherBB/phone.min.js
deleted file mode 100644
index 4cbfc6e4..00000000
--- a/style/themes/MyFeatherBB/phone.min.js
+++ /dev/null
@@ -1 +0,0 @@
-"use strict";var getHeight=function(t){var e=window.getComputedStyle(t),i=e.display,l=e.position,s=e.visibility,o=e.maxHeight.replace("px","").replace("%",""),a=0;return"none"!==i&&"0"!==o?t.offsetHeight:(t.style.position="absolute",t.style.visibility="hidden",t.style.display="block",a=t.offsetHeight,t.style.display=i,t.style.position=l,t.style.visibility=s,a)},toggleSlide=function(t){var e=0;t.getAttribute("data-max-height")?t.style.maxHeight="0"===t.style.maxHeight.replace("px","").replace("%","")?t.getAttribute("data-max-height"):"0":(e=getHeight(t)+"px",t.style.transition="max-height 0.5s ease-in-out",t.style.overflowY="hidden",t.style.maxHeight="0",t.setAttribute("data-max-height",e),t.style.display="block",setTimeout(function(){t.style.maxHeight=e},10))};document.querySelector("#phone-button").addEventListener("click",function(){toggleSlide(document.querySelector("#phone"))},!1);
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/style.css b/style/themes/MyFeatherBB/style.css
deleted file mode 100644
index 3a3015e9..00000000
--- a/style/themes/MyFeatherBB/style.css
+++ /dev/null
@@ -1,1841 +0,0 @@
-/*
- * FeatherBB default style
- *
- * Responsive, classy and modern!
- *
- * Based on awesome work from Magicalex and Jedediah (mondedie.fr)
- *
-*/
-
-
-img,
-legend {
-    border: 0
-}
-legend,
-td,
-th {
-    padding: 0
-}
-#brdfooter .clearer,
-#brdstats .clearb,
-#brdstats .clearer,
-.blockpost .box .postfoot .clearc,
-.container-title-status .clear,
-.linksb .crumbs,
-.linkst .clearer {
-    clear: both
-}
-#announce,
-#msg,
-#posterror {
-    text-shadow: 0 1px 0 rgba(255, 255, 255, .5)
-}
-html {
-    font-family: sans-serif;
-    -ms-text-size-adjust: 100%;
-    -webkit-text-size-adjust: 100%
-}
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-menu,
-nav,
-section,
-summary {
-    display: block
-}
-audio,
-canvas,
-progress,
-video {
-    display: inline-block;
-    vertical-align: baseline
-}
-audio:not([controls]) {
-    display: none;
-    height: 0
-}
-[hidden],
-template {
-    display: none
-}
-a {
-    background-color: transparent
-}
-a:active,
-a:hover {
-    outline: 0
-}
-abbr[title] {
-    border-bottom: 1px dotted
-}
-b,
-optgroup,
-strong {
-    font-weight: 700
-}
-dfn {
-    font-style: italic
-}
-h1 {
-    font-size: 2em;
-    margin: .67em 0
-}
-mark {
-    background: #ff0;
-    color: #000
-}
-small {
-    font-size: 80%
-}
-sub,
-sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline
-}
-sup {
-    top: -.5em
-}
-sub {
-    bottom: -.25em
-}
-svg:not(:root) {
-    overflow: hidden
-}
-figure {
-    margin: 1em 40px
-}
-hr {
-    box-sizing: content-box;
-    border: none;
-    border-top: 1px solid #d8d8d8;
-    height: 0;
-    width: 100%
-}
-pre,
-textarea {
-    overflow: auto
-}
-code,
-kbd,
-pre,
-samp {
-    font-family: monospace, monospace;
-    font-size: 1em
-}
-button,
-input,
-optgroup,
-select,
-textarea {
-    color: inherit;
-    font: inherit;
-    margin: 0
-}
-button {
-    overflow: visible
-}
-button,
-select {
-    text-transform: none
-}
-button,
-html input[type=button],
-input[type=reset],
-input[type=submit] {
-    -webkit-appearance: button;
-    cursor: pointer
-}
-button[disabled],
-html input[disabled] {
-    cursor: default
-}
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-    border: 0;
-    padding: 0
-}
-input {
-    line-height: normal
-}
-input[type=checkbox],
-input[type=radio] {
-    box-sizing: border-box;
-    padding: 0
-}
-input[type=number]::-webkit-inner-spin-button,
-input[type=number]::-webkit-outer-spin-button {
-    height: auto
-}
-input[type=search] {
-    -webkit-appearance: textfield;
-    box-sizing: content-box
-}
-input[type=search]::-webkit-search-cancel-button,
-input[type=search]::-webkit-search-decoration {
-    -webkit-appearance: none
-}
-fieldset {
-    border: 1px solid silver;
-    margin: 0 2px;
-    padding: .35em .625em .75em
-}
-body,
-li,
-nav ul,
-p,
-ul {
-    margin: 0
-}
-table {
-    border-collapse: collapse;
-    border-spacing: 0
-}
-* {
-    box-sizing: border-box
-}
-body {
-    font-size: 14px;
-    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-    line-height: 1.25;
-    color: #333;
-    background-color: #f9f9f9;
-    padding-top: 60px
-}
-.container-title-status .title-site .site-name,
-nav ul li a {
-    font-weight: 400;
-    font-family: bebas_neueregular, Arial, Helvetica, sans-serif
-}
-a {
-    text-decoration: none;
-    color: red
-}
-a:hover {
-    text-decoration: underline;
-    color: #2a6496
-}
-nav {
-    position: fixed;
-    z-index: 10;
-    top: 0;
-    left: 0;
-    right: 0;
-    line-height: 50px;
-    height: 50px;
-    background-color: #03a9f4;
-    box-shadow: 0 0 3px #000
-}
-nav ul {
-    padding: 0;
-    float: left;
-    list-style-type: none
-}
-nav ul li {
-    display: inline-block;
-    padding: 0 5px;
-    margin: 0
-}
-nav ul li a {
-    display: block;
-    color: #fff;
-    font-size: 1.5em;
-    text-decoration: none
-}
-nav ul li a:hover {
-    color: rgba(255, 255, 255, .9);
-    text-decoration: none
-}
-nav ul .isactive {
-    background-color: rgba(255, 255, 255, .3)
-}
-nav ul .isactive a:hover {
-    color: #fff
-}
-.container-title-status .status-avatar .avatar,
-.container-title-status .status-avatar .inbox {
-    display: inline-block;
-    vertical-align: middle
-}
-nav .navbar-right {
-    float: right
-}
-nav .navbar-right input {
-    width: 100%;
-    height: 1.8rem;
-    padding: 7px 10px;
-    border-radius: 3px;
-    background-color: #fff;
-    border: none
-}
-nav .navbar-right input:focus {
-    outline: 0
-}
-.container-title-status {
-    margin: 0 0 15px
-}
-.container-title-status .title-site {
-    margin: 0;
-    float: left
-}
-.container-title-status .title-site .site-name {
-    color: #90a4ae;
-    font-size: 80px;
-    line-height: 1;
-    text-decoration: none
-}
-.container-title-status .title-site .site-name p:first-letter {
-    color: #03a9f4
-}
-.container-title-status .title-site #brddesc {
-    color: #999;
-    font-size: 14px;
-    font-weight: 400;
-    font-style: italic;
-    line-height: 1;
-    margin: 0;
-    padding: 0;
-    text-align: center
-}
-.container-title-status .status-avatar {
-    float: right
-}
-.container-title-status .status-avatar .inbox p,
-.container-title-status .status-avatar .inbox ul {
-    margin: 0 15px 0 0;
-    padding: 0;
-    color: #5a5a5a
-}
-.container-title-status .status-avatar .inbox p li,
-.container-title-status .status-avatar .inbox ul li {
-    list-style-type: none;
-    text-align: right
-}
-.container-title-status .status-avatar .avatar img {
-    height: 90px;
-    width: 90px;
-    border-radius: 50%;
-    border: 1px solid #d1d1d1
-}
-#announce {
-    margin: 0 0 15px;
-    padding: 8px 35px 8px 14px;
-    color: #3a87ad;
-    background-color: #d9edf7;
-    border: 1px solid #bce8f1;
-    border-radius: 4px
-}
-#announce h2 {
-    margin: 0 0 4px;
-    font-size: 18px
-}
-section .blocktable .box table thead th,
-section .blocktable h2 {
-    font-weight: 400;
-    font-size: 20px;
-    font-family: bebas_neueregular, Arial, Helvetica, sans-serif;
-    color: #fff
-}
-#announce p {
-    margin: 0 0 2px
-}
-section {
-    margin-top: 15px;
-    margin-bottom: 20px
-}
-section .blocktable {
-    position: relative;
-    margin-bottom: 24px
-}
-section .blocktable h2 {
-    position: absolute;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    width: 56%;
-    left: 0;
-    top: 0;
-    z-index: 1;
-    padding: 9px;
-    margin: 0
-}
-section .blocktable .box table {
-    table-layout: fixed;
-    text-align: left;
-    width: 100%
-}
-section .blocktable .box table thead th {
-    height: 40px;
-    background-color: #039be5;
-    border: 1px solid #039be5;
-    line-height: 40px
-}
-section .blocktable .box table thead th.tcl {
-    font-size: 0
-}
-section .blocktable .box table thead th.tcr {
-    width: 16%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    padding-left: 8px
-}
-section .blocktable .box table thead th.tc2,
-section .blocktable .box table thead th.tc3,
-section .blocktable .box table thead th.tcmod {
-    text-align: center;
-    width: 11%
-}
-section .blocktable .box table tbody tr {
-    background-color: #fff
-}
-section .blocktable .box table tbody tr td {
-    width: 100%;
-    border: 1px solid #d1d1d1;
-    color: #5a5a5a
-}
-section .blocktable .box table tbody tr .tc2,
-section .blocktable .box table tbody tr .tc3,
-section .blocktable .box table tbody tr .tcmod {
-    text-align: center;
-    width: 11%
-}
-section .blocktable .box table tbody tr .tcl {
-    padding: 7px 8px
-}
-section .blocktable .box table tbody tr .tcl .icon {
-    background-image: url(img/old.png);
-    height: 32px;
-    width: 32px;
-	margin-right: 5px;
-    float: left;
-}
-section .blocktable .box table tbody tr .tcl .icon .nosize {
-    display: none
-}
-section .blocktable .box table tbody tr .tcl .icon-new {
-    background-image: url(img/new.png);
-}
-section .blocktable .box table tbody tr .tcl .icon-sticky {
-    background-image: url(img/sticky.png);
-}
-section .blocktable .box table tbody tr .tcl .icon-closed {
-    background-image: url(img/closed.png);
-}
-section .blocktable .box table tbody tr .tcl .tclcon {
-    margin-left: 35px;
-    overflow: hidden
-}
-section .blocktable .box table tbody tr .tcl .tclcon h3 {
-    margin: 0 0 4px;
-    font-size: 16px
-}
-section .blocktable .box table tbody tr .tcl .tclcon h3 a {
-    text-decoration: none;
-    color: #03a9f4
-}
-section .blocktable .box table tbody tr .tcl .tclcon h3 a:hover {
-    text-decoration: underline
-}
-section .blocktable .box table tbody tr .tcl .tclcon h3 .newtext {
-    font-size: 14px;
-    font-weight: 400
-}
-section .blocktable .box table tbody tr .tcl .tclcon h3 .newtext a {
-    text-decoration: none;
-    color: #428bca
-}
-section .blocktable .box table tbody tr .tcl .tclcon h3 .newtext a:hover {
-    text-decoration: underline;
-    color: #2a6496
-}
-section .blocktable .box table tbody tr .tcl .tclcon .forumdesc {
-    font-size: 12px
-}
-section .blocktable .box table tbody tr .tcr {
-    width: 20%;
-    padding: 7px 8px
-}
-section .blocktable .box table tbody tr .tcr .byuser {
-    display: block
-}
-#vf {
-    margin-bottom: 0
-}
-#vf .tclcon {
-    color: #5a5a5a
-}
-#vf .tclcon .byuser {
-    display: inline-block
-}
-#vf .tclcon .newtext,
-#vf .tclcon .pagestext {
-    display: inline-block;
-    font-size: 14px
-}
-#vf .tclcon a {
-    text-decoration: none;
-    color: #428bca
-}
-#vf .tclcon a:hover {
-    text-decoration: underline;
-    color: #2a6496
-}
-#vf .roweven {
-    background-color: #fafafa
-}
-#vf .closedtext {
-    color: #a94442
-}
-#vf .stickytext {
-    color: #3c763d
-}
-#vf .isticky {
-    background-color: #dff0d8
-}
-.last-topic {
-    margin-bottom: 24px!important
-}
-.linksb .crumbs,
-.linkst .crumbs,
-.postlinksb .crumbs {
-    background-color: #fff;
-    padding: 10px;
-    border: 1px solid #d8d8d8;
-    border-radius: 4px
-}
-.linksb .crumbs li,
-.linkst .crumbs li,
-.postlinksb .crumbs li {
-    display: inline-block;
-    color: #428bca
-}
-.linksb .crumbs li span,
-.linkst .crumbs li span,
-.postlinksb .crumbs li span {
-    color: #ccc
-}
-.linksb .crumbs li strong,
-.linksb .crumbs li strong a,
-.linkst .crumbs li strong,
-.linkst .crumbs li strong a,
-.postlinksb .crumbs li strong,
-.postlinksb .crumbs li strong a {
-    color: #777
-}
-.linksb .crumbs li strong a:hover,
-.linkst .crumbs li strong a:hover,
-.postlinksb .crumbs li strong a:hover {
-    color: #777;
-    text-decoration: none
-}
-.linksb .pagepost .postlink.conr,
-.linkst .pagepost .postlink.conr,
-.postlinksb .pagepost .postlink.conr {
-    display: block;
-    margin-top: 15px;
-    text-align: center
-}
-.linksb .pagepost .pagelink.conl,
-.linkst .pagepost .pagelink.conl,
-.postlinksb .pagepost .pagelink.conl {
-    padding-left: 1px;
-    overflow: auto
-}
-@media only screen and (min-width: 768px) {
-    .linksb .pagepost .pagelink.conl,
-    .linkst .pagepost .pagelink.conl,
-    .postlinksb .pagepost .pagelink.conl {
-        float: left
-    }
-    .linksb .pagepost .postlink.conr,
-    .linkst .pagepost .postlink.conr,
-    .postlinksb .pagepost .postlink.conr {
-        float: right;
-        margin: 0
-    }
-    .linksb .pagepost .modbuttons,
-    .linkst .pagepost .modbuttons,
-    .postlinksb .pagepost .modbuttons {
-        text-align: right
-    }
-    .linksb .pagepost .pagepost:after,
-    .linkst .pagepost .pagepost:after,
-    .postlinksb .pagepost .pagepost:after {
-        content: "";
-        display: block;
-        height: 0;
-        font-size: 0;
-        clear: both;
-        visibility: hidden
-    }
-}
-.linksb .pagepost .modbuttons,
-.linkst .pagepost .modbuttons,
-.postlinksb .pagepost .modbuttons {
-    display: block;
-    text-align: right
-}
-.linksb .pagepost,
-.linkst .pagepost,
-.postlinksb .pagepost {
-    overflow: auto;
-    margin: 10px 0;
-    padding: 10px 0
-}
-.linksb .pagepost .pagelink.conl a,
-.linksb .pagepost .pagelink.conl span,
-.linksb .pagepost .pagelink.conl strong,
-.linkst .pagepost .pagelink.conl a,
-.linkst .pagepost .pagelink.conl span,
-.linkst .pagepost .pagelink.conl strong,
-.postlinksb .pagepost .pagelink.conl a,
-.postlinksb .pagepost .pagelink.conl span,
-.postlinksb .pagepost .pagelink.conl strong {
-    position: relative;
-    float: left;
-    margin: 0 0 0 -1px;
-    padding: 6px 12px;
-    border: 1px solid #ddd;
-    background-color: #fff
-}
-.linksb .pagepost .pagelink.conl a:hover,
-.linksb .pagepost .pagelink.conl span:hover,
-.linksb .pagepost .pagelink.conl strong:hover,
-.linkst .pagepost .pagelink.conl a:hover,
-.linkst .pagepost .pagelink.conl span:hover,
-.linkst .pagepost .pagelink.conl strong:hover,
-.postlinksb .pagepost .pagelink.conl a:hover,
-.postlinksb .pagepost .pagelink.conl span:hover,
-.postlinksb .pagepost .pagelink.conl strong:hover {
-    text-decoration: none;
-    background-color: #fafafa
-}
-.linksb .pagepost .pagelink.conl .spacer,
-.linkst .pagepost .pagelink.conl .spacer,
-.postlinksb .pagepost .pagelink.conl .spacer {
-    background-color: #fafafa;
-    cursor: default;
-    color: #d3d3d3
-}
-.linksb .pagepost .pagelink.conl .spacer:hover,
-.linkst .pagepost .pagelink.conl .spacer:hover,
-.postlinksb .pagepost .pagelink.conl .spacer:hover {
-    background-color: #fafafa
-}
-.linksb .pagepost .pagelink.conl strong,
-.linkst .pagepost .pagelink.conl strong,
-.postlinksb .pagepost .pagelink.conl strong {
-    font-weight: 400;
-    background-color: #fafafa;
-    cursor: default
-}
-.linksb .pagepost .pagelink.conl .pages-label,
-.linkst .pagepost .pagelink.conl .pages-label,
-.postlinksb .pagepost .pagelink.conl .pages-label {
-    display: none
-}
-.postlinksb {
-    margin-bottom: 5px
-}
-.linksb .subscribelink {
-    margin: 15px 0;
-    text-align: right
-}
-.blockpost {
-    background-color: #fff
-}
-.blockpost h2 {
-    margin: 0;
-    padding: 10px;
-    font-size: 14px;
-    font-weight: 400;
-    background-color: #039be5
-}
-.blockpost h2 span>.conr,
-.blockpost h2 span>a {
-    padding: 7px;
-    color: #fff
-}
-.blockpost .box {
-    border: 1px solid #d8d8d8;
-    border-top: none
-}
-#postpreview .postbody,
-.blockmenu ul li,
-footer .footer-link {
-    border-top: 1px solid #d8d8d8
-}
-.blockpost .box .postleft {
-    float: left;
-    width: 20%;
-    padding: 7px 15px
-}
-.blockpost .box .postleft dl {
-    margin: 0;
-    color: #333
-}
-.blockpost .box .postleft dl dt strong a,
-.blockpost .box .postleft dl dt strong span {
-    font-size: 1.3rem;
-    font-weight: 400
-}
-.blockpost .box .postleft dl dt strong a:hover,
-.blockpost .box .postleft dl dt strong span:hover {
-    text-decoration: none
-}
-.blockpost .box .postleft dl dd {
-    margin: 5px 0
-}
-.blockpost .box .postright {
-    float: right;
-    line-height: 1.4;
-    width: 80%;
-    padding: 15px;
-    color: #333;
-    word-wrap: break-word
-}
-.blockpost .box .postright h3 {
-    display: none;
-    text-align: center
-}
-.blockpost .box .postright .postedit {
-    font-size: 12px;
-    margin-top: 7px
-}
-.blockpost .box .postright .postsignature hr {
-    margin: 15px 0
-}
-.blockpost .box .postfoot {
-    clear: both;
-    overflow: auto
-}
-.blockpost .box .postfoot .postfootleft {
-    float: left;
-    width: 20%;
-    padding: 7px 15px;
-    color: #333
-}
-.blockpost .box .postfoot .postfootleft strong {
-    border: none;
-    font-size: 12px;
-    height: 17px;
-    line-height: 17px;
-    padding: 0 5px;
-    font-weight: 700;
-    text-transform: uppercase;
-    color: #fff;
-    background-color: #009688
-}
-.blockpost .box .postfoot .postfootright {
-    float: right;
-    width: 80%;
-    padding: 7px 15px;
-    text-align: right
-}
-.blockpost .box .postfoot .postfootright ul {
-    visibility: hidden;
-    padding: 7px;
-    list-style-type: none
-}
-.blockpost .box .postfoot .postfootright ul li {
-    display: inline-block
-}
-.blockpost .box:hover .postfoot .postfootright ul {
-    visibility: visible
-}
-.firstpost {
-    margin: 0 0 4px
-}
-.firstpost .box {
-    border: 1px solid #039be5
-}
-.firstpost .postbody .postright>h3 {
-    display: block;
-    margin: 0 0 15px;
-    color: #777;
-    font-weight: 400;
-    font-size: 1.3rem
-}
-#editform .box fieldset .bblinks,
-#postform .box fieldset .bblinks,
-#punsearch .linksb .pagepost .pagelink .pages-label,
-#punsearch .linkst .pagepost .pagelink .pages-label,
-#punsearch .postlinksb .pagepost .pagelink .pages-label,
-#quickpost .box fieldset .bblinks,
-#reportform .box fieldset .bblinks {
-    display: none
-}
-.pagepost .postlink.conr a,
-.postfootright a,
-.subscribelink a {
-    border-radius: 3px;
-    border: 2px solid #00acc1;
-    color: #00acc1;
-    background-color: transparent;
-    padding: 4px;
-    text-decoration: none
-}
-.pagepost .postlink.conr a:hover,
-.postfootright a:hover,
-.subscribelink a:hover {
-    border: 2px solid rgba(0, 172, 193, .6);
-    color: rgba(0, 172, 193, .6)
-}
-.pagepost .postlink.conr a:active,
-.postfootright a:active,
-.subscribelink a:active {
-    border: 2px solid #0097a7;
-    color: #0097a7;
-    box-shadow: inset 0 3px 4px rgba(0, 0, 0, .2)
-}
-.pagepost .postlink.conr a:focus,
-.postfootright a:focus,
-.subscribelink a:focus {
-    outline: 0
-}
-.subscribelink {
-    margin: 15px 0;
-    text-align: right
-}
-#editform h2,
-#postform h2,
-#quickpost h2,
-#reportform h2 {
-    border: 1px solid #d8d8d8;
-    border-bottom: none;
-    padding: 5px;
-    margin: 0;
-    text-indent: 10px;
-    font-weight: 400;
-    font-size: 18px;
-    background-color: #f5f5f5;
-    border-radius: 3px 3px 0 0
-}
-#editform .box,
-#postform .box,
-#quickpost .box,
-#reportform .box {
-    border: 1px solid #d8d8d8;
-    border-radius: 0 0 3px 3px;
-    background-color: #fff;
-    padding: 15px
-}
-#editform .box .inform,
-#postform .box .inform,
-#quickpost .box .inform,
-#reportform .box .inform {
-    border: none
-}
-#editform .box fieldset,
-#postform .box fieldset,
-#quickpost .box fieldset,
-#reportform .box fieldset {
-    border: none;
-    color: #666
-}
-#editform .box fieldset legend,
-#postform .box fieldset legend,
-#quickpost .box fieldset legend,
-#reportform .box fieldset legend {
-    font-size: 16px;
-    margin: 0 0 7px;
-    font-weight: 700;
-    color: #666
-}
-#editform .box fieldset textarea,
-#postform .box fieldset textarea,
-#quickpost .box fieldset textarea,
-#reportform .box fieldset textarea {
-    margin: 7px 0;
-    width: 100%;
-    box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075);
-    border: 1px solid #ccc;
-    border-radius: 3px;
-    background-color: #fafafa;
-    padding: 7px 8px
-}
-#editform .box fieldset textarea:focus,
-#postform .box fieldset textarea:focus,
-#quickpost .box fieldset textarea:focus,
-#reportform .box fieldset textarea:focus {
-    border: 1px solid #51a7e8;
-    background-color: #fff;
-    box-shadow: 0 0 5px rgba(81, 167, 232, .5);
-    outline: 0
-}
-#postform {
-    margin: 15px 0 0
-}
-#postpreview,
-#postreview,
-.blockform {
-    margin-top: 15px
-}
-#postform .rbox input {
-    margin-right: 7px
-}
-#postreview {
-    overflow: auto
-}
-#postreview .blockpost {
-    overflow: auto;
-    border: 1px solid #d8d8d8;
-    background-color: #f9f9f9
-}
-#postreview .blockpost .box {
-    border: none
-}
-#postpreview {
-    overflow: auto
-}
-#postpreview h2 {
-    border: 1px solid #d8d8d8;
-    border-bottom: none;
-    padding: 5px;
-    margin: 0;
-    text-indent: 10px;
-    font-weight: 400;
-    font-size: 18px;
-    background-color: #f5f5f5;
-    border-radius: 3px 3px 0 0
-}
-#postpreview .postbody {
-    overflow: auto;
-    background-color: #fff
-}
-#postpreview .postbody .postright {
-    width: 100%;
-    float: none
-}
-#punsearch .blockpost h2 {
-    color: #fff
-}
-#punsearch .linksb .pagepost,
-#punsearch .linkst .pagepost,
-#punsearch .postlinksb .pagepost {
-    margin: 10px 0;
-    padding: 10px 1px
-}
-#punsearch .linksb .pagepost .pagelink a,
-#punsearch .linksb .pagepost .pagelink span,
-#punsearch .linksb .pagepost .pagelink strong,
-#punsearch .linkst .pagepost .pagelink a,
-#punsearch .linkst .pagepost .pagelink span,
-#punsearch .linkst .pagepost .pagelink strong,
-#punsearch .postlinksb .pagepost .pagelink a,
-#punsearch .postlinksb .pagepost .pagelink span,
-#punsearch .postlinksb .pagepost .pagelink strong {
-    position: relative;
-    float: left;
-    margin: 0 0 0 -1px;
-    padding: 6px 12px;
-    border: 1px solid #ddd;
-    background-color: #fff
-}
-#punsearch .linksb .pagepost .pagelink a:hover,
-#punsearch .linksb .pagepost .pagelink span:hover,
-#punsearch .linksb .pagepost .pagelink strong:hover,
-#punsearch .linkst .pagepost .pagelink a:hover,
-#punsearch .linkst .pagepost .pagelink span:hover,
-#punsearch .linkst .pagepost .pagelink strong:hover,
-#punsearch .postlinksb .pagepost .pagelink a:hover,
-#punsearch .postlinksb .pagepost .pagelink span:hover,
-#punsearch .postlinksb .pagepost .pagelink strong:hover {
-    text-decoration: none;
-    background-color: #fafafa
-}
-#punsearch .linksb .pagepost .pagelink .spacer,
-#punsearch .linkst .pagepost .pagelink .spacer,
-#punsearch .postlinksb .pagepost .pagelink .spacer {
-    background-color: #fafafa;
-    cursor: default;
-    color: #d3d3d3
-}
-#punsearch .linksb .pagepost .pagelink .spacer:hover,
-#punsearch .linkst .pagepost .pagelink .spacer:hover,
-#punsearch .postlinksb .pagepost .pagelink .spacer:hover {
-    background-color: #fafafa
-}
-#punsearch .linksb .pagepost .pagelink strong,
-#punsearch .linkst .pagepost .pagelink strong,
-#punsearch .postlinksb .pagepost .pagelink strong {
-    font-weight: 400;
-    background-color: #fafafa;
-    cursor: default
-}
-#brdfooter,
-#brdstats {
-    padding: 10px;
-    border: 1px solid #d8d8d8;
-    border-radius: 3px;
-    background-color: #fff
-}
-#searchform #search .checklist {
-    margin: 10px 0;
-    overflow: auto;
-    width: 20em;
-    max-height: 9em;
-    border: 1px solid #d8d8d8
-}
-#searchform #search .checklist legend {
-    font-size: 16px;
-    margin: 0
-}
-#searchform #search .checklist label {
-    text-indent: 10px;
-    display: block;
-    margin: 0
-}
-#brdstats .conl dt,
-#brdstats .conr dt,
-#brdstats h2 {
-    display: none
-}
-#brdstats .conl,
-#brdstats .conr {
-    margin: 0 0 10px;
-    color: #5a5a5a;
-    font-size: 12px
-}
-#brdstats .conl dd,
-#brdstats .conr dd {
-    margin: 0
-}
-#brdstats .conr {
-    text-align: right;
-    float: right
-}
-#brdstats .conl {
-    text-align: left;
-    float: left
-}
-#brdstats #onlinelist {
-    margin: 0;
-    font-size: 12px
-}
-#brdstats #onlinelist dd,
-#brdstats #onlinelist dt {
-    display: inline-block;
-    margin: 0
-}
-#brdfooter {
-    margin: 15px 0;
-    font-size: 12px
-}
-#brdfooter h2 {
-    display: none
-}
-#brdfooter .conr {
-    text-align: right;
-    float: right
-}
-#brdfooter .conl {
-    text-align: left;
-    float: left;
-	width: 20%;
-}
-#brdfooter select {
-    width: 80%
-}
-footer .footer-link {
-    position: relative;
-    font-size: 12px;
-    padding: 10px;
-    color: #5a5a5a
-}
-footer .footer-link #useful-links {
-    font-size: 14px;
-    font-weight: 700;
-    display: block;
-    margin-bottom: 7px
-}
-.blockform h2,
-.blockmenu h2 {
-    text-indent: 10px;
-    border: 1px solid #d8d8d8;
-    font-size: 18px
-}
-footer .footer-link #copyright {
-    position: absolute;
-    bottom: 10px;
-    right: 10px
-}
-footer .footer-link a {
-    display: block
-}
-.blockmenu h2 {
-    border-bottom-width: 0;
-    padding: 5px;
-    margin: 0;
-    font-weight: 400;
-    background-color: #f5f5f5;
-    border-radius: 3px 3px 0 0
-}
-.blockmenu ul {
-    margin: 0 0 15px;
-    padding: 0;
-    list-style-type: none;
-    border-radius: 0 0 3px 3px;
-    border: 1px solid #d8d8d8;
-    background-color: #fff
-}
-.blockmenu ul li:first-child {
-    border-top: none
-}
-.blockmenu ul li a {
-    text-decoration: none;
-    color: #555;
-    display: block;
-    padding: 10px
-}
-#punuserlist .pagelink .pages-label,
-.blockform .box .inform fieldset .bblinks {
-    display: none
-}
-.blockmenu ul li a:hover {
-    background-color: #edf7fa
-}
-.blockmenu ul .isactive a {
-    background-color: #edf7fa;
-    color: #0084B4;
-    font-weight: 700
-}
-.blockform h2 {
-    border-bottom: none;
-    padding: 5px;
-    margin: 0;
-    font-weight: 400;
-    background-color: #f5f5f5;
-    border-radius: 3px 3px 0 0
-}
-.blockform .box {
-    border: 1px solid #d8d8d8;
-    border-radius: 0 0 3px 3px;
-    background-color: #fff
-}
-.blockform .box .inform {
-    border-bottom: 1px solid #d8d8d8;
-    padding: 10px
-}
-.blockform .box .inform fieldset {
-    border: none;
-    color: #666;
-    padding: 5px 10px;
-    margin: 0
-}
-.blockform .box .inform fieldset legend {
-    font-size: 16px;
-    margin: 0 0 7px;
-    font-weight: 700;
-    color: #666
-}
-#viewprofile h2,
-.blockform .box .inform fieldset label strong {
-    font-weight: 400
-}
-.blockform .box .inform fieldset p {
-    margin: 4px 0
-}
-.blockform .box .inform fieldset label {
-    margin: 6px 0;
-	display: inline-block;
-	padding-right: 12px;
-}
-.blockform .box .inform fieldset input {
-    box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075);
-    border: 1px solid #ccc;
-    border-radius: 3px;
-    background-color: #fafafa;
-    padding: 7px 8px;
-    margin: 7px 0
-}
-.blockform .box .inform fieldset input:focus {
-    border: 1px solid #51a7e8;
-    background-color: #fff;
-    box-shadow: 0 0 5px rgba(81, 167, 232, .5);
-    outline: 0
-}
-.blockform .box .inform fieldset label select {
-    margin: 6px 0
-}
-.blockform .box .inform fieldset .rbox input {
-    margin-right: 7px
-}
-.blockform .box .inform fieldset .rbox input:focus {
-    box-shadow: none
-}
-.blockform .box .inform fieldset textarea {
-    margin: 7px 0;
-    box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075);
-    border: 1px solid #ccc;
-    border-radius: 3px;
-    background-color: #fafafa;
-    padding: 7px 8px
-}
-.blockform .box .inform fieldset textarea:focus {
-    border: 1px solid #51a7e8;
-    background-color: #fff;
-    box-shadow: 0 0 5px rgba(81, 167, 232, .5);
-    outline: 0
-}
-.blockform .box .buttons {
-    margin: 7px
-}
-#profile {
-    overflow: auto
-}
-#profile .blockform {
-    width: 70%;
-    margin: 0 0 0 30%
-}
-#profile .blockmenu {
-    float: left;
-    width: 27.5%
-}
-#viewprofile h2 {
-    border: 1px solid #d8d8d8;
-    border-bottom: none;
-    padding: 5px;
-    margin: 0;
-    text-indent: 10px;
-    font-size: 18px;
-    background-color: #f5f5f5;
-    border-radius: 3px 3px 0 0
-}
-#viewprofile .fakeform {
-    border: 1px solid #d8d8d8;
-    border-radius: 0 0 3px 3px;
-    background-color: #fff
-}
-#viewprofile .fakeform .inform {
-    border-bottom: 1px solid #d8d8d8;
-    padding: 10px
-}
-#viewprofile .fakeform .inform fieldset {
-    border: none;
-    color: #666
-}
-#viewprofile .fakeform .inform fieldset legend {
-    font-size: 18px;
-    font-weight: 700;
-    color: #666
-}
-#viewprofile .fakeform .inform fieldset dt {
-    font-size: 15px;
-    margin-bottom: 4px;
-    font-weight: 700
-}
-#viewprofile .fakeform .inform fieldset dd {
-    margin: 0 0 15px
-}
-#msg,
-#posterror {
-    margin: 15px 0;
-    padding: 8px 35px 8px 14px;
-    color: #c09853;
-    background-color: #fcf8e3;
-    border: 1px solid #fbeed5;
-    border-radius: 4px
-}
-#msg h2,
-#posterror h2 {
-    margin: 0 0 4px;
-    font-size: 18px
-}
-#msg p,
-#posterror p {
-    margin: 0 0 2px
-}
-#posterror {
-    background-color: #f2dede;
-    border: 1px solid #ebccd1;
-    color: #a94442
-}
-
-.error {
-    background-color: #f2dede !important;
-    border: 1px solid #ebccd1 !important;
-    color: #a94442 !important
-}
-
-
-.flashmsg {
-    position: fixed;
-    min-width: 220px;
-    max-width: 500px;
-    top: 5%;
-    right: 5%;
-    margin-left: -250px;
-    padding: 1em;
-    z-index: 100;
-    opacity: 0;
-    pointer-events: none;
-    box-shadow: 0 3px 6px rgba(0,0,0,0.25);
-    border: 1px solid #bbb;
-    -webkit-transform: translateY(-100%);
-       -moz-transform: translateY(-100%);
-        -ms-transform: translateY(-100%);
-         -o-transform: translateY(-100%);
-            transform: translateY(-100%);
-    -webkit-transition: all 0.75s ease-out;
-       -moz-transition: all 0.75s ease-out;
-        -ms-transition: all 0.75s ease-out;
-         -o-transition: all 0.75s ease-out;
-            transition: all 0.75s ease-out;
-}
-.flashmsg h2 {
-    margin: 0 0 4px;
-    font-size: 18px
-}
-.flashmsg.error {
-    background: #ebccd1;
-    background: -webkit-linear-gradient(top, #f2dede, #ebccd1);
-    background:    -moz-linear-gradient(top, #f2dede, #ebccd1);
-    background:         linear-gradient(top, #f2dede, #ebccd1);
-    color: #a94442 !important
-}
-.flashmsg.info {
-    background: #b3e1e4;
-    background: -webkit-linear-gradient(top, #d2ecea, #b3e1e4);
-    background:    -moz-linear-gradient(top, #d2ecea, #b3e1e4);
-    background:         linear-gradient(top, #d2ecea, #b3e1e4);
-    color: #147880 !important;
-}
-.flashmsg.warning {
-    background: #edc58c;
-    background: -webkit-linear-gradient(top, #e8d1af, #edc58c);
-    background:    -moz-linear-gradient(top, #f0ad4e, #f0ad4e);
-    background:         linear-gradient(top, #f0ad4e, #f0ad4e);
-    color: #8c5a13 !important;
-}
-.flashmsg.success {
-    background: #a1e9a1;
-    background: -webkit-linear-gradient(top, #cde9cd, #a1e9a1);
-    background:    -moz-linear-gradient(top, #cde9cd, #a1e9a1);
-    background:         linear-gradient(top, #cde9cd, #a1e9a1);
-    color: #2c752c !important;
-}
-.flashmsg.show {
-    opacity: 1;
-    pointer-events: auto;
-    -webkit-transform: translateY(0%);
-       -moz-transform: translateY(0%);
-        -ms-transform: translateY(0%);
-         -o-transform: translateY(0%);
-            transform: translateY(0%);
-}
-
-input[type=submit] {
-    border-radius: 3px;
-    border: 2px solid #00acc1;
-    color: #00acc1;
-    background-color: transparent;
-    padding: 4px;
-    margin-right: 4px
-}
-input[type=submit]:hover {
-    border: 2px solid rgba(0, 172, 193, .6);
-    color: rgba(0, 172, 193, .6)
-}
-input[type=submit]:active {
-    border: 2px solid #0097a7;
-    color: #0097a7;
-    box-shadow: inset 0 3px 4px rgba(0, 0, 0, .2)
-}
-input[type=submit]:focus {
-    outline: 0
-}
-#regform .forminfo {
-    padding: 5px 10px;
-    color: #666
-}
-#regform .forminfo h3 {
-    font-size: 18px;
-    margin: 0 0 7px;
-    font-weight: 700
-}
-#regform .forminfo p {
-    margin: 4px 0
-}
-#punuserlist .blocktable {
-    margin: 0
-}
-#punuserlist .blocktable table thead .tc2,
-#punuserlist .blocktable table thead .tc3,
-#punuserlist .blocktable table thead .tcl,
-#punuserlist .blocktable table thead .tcr {
-    width: 25%
-}
-#punuserlist .pagelink {
-    overflow: auto;
-    margin: 10px 0;
-    padding: 10px 0 10px 1px
-}
-#punuserlist .pagelink a,
-#punuserlist .pagelink span,
-#punuserlist .pagelink strong {
-    position: relative;
-    float: left;
-    margin: 0 0 0 -1px;
-    padding: 6px 12px;
-    border: 1px solid #ddd;
-    background-color: #fff
-}
-#punuserlist .pagelink a:hover,
-#punuserlist .pagelink span:hover,
-#punuserlist .pagelink strong:hover {
-    text-decoration: none;
-    background-color: #fafafa
-}
-#punuserlist .pagelink .spacer {
-    background-color: #fafafa;
-    cursor: default;
-    color: #d3d3d3
-}
-#punuserlist .pagelink .spacer:hover {
-    background-color: #fafafa
-}
-#punuserlist .pagelink strong {
-    font-weight: 400;
-    background-color: #fafafa;
-    cursor: default
-}
-@font-face {
-    font-family: bebas_neueregular;
-    src: url(fonts/BebasNeue-webfont.eot);
-    src: url(fonts/BebasNeue-webfont.eot?#iefix)format("embedded-opentype"), url(fonts/BebasNeue-webfont.woff)format("woff"), url(fonts/BebasNeue-webfont.ttf)format("truetype"), url(fonts/BebasNeue-webfont.svg#bebas_neueregular)format("svg");
-    font-weight: 400;
-    font-style: normal
-}
-code {
-    padding: 15px!important;
-}
-img {
-    max-width: 100%;
-    height: auto
-}
-.blockpost .box .postright p {
-    padding: 7px 0
-}
-.blockpost .box .postright pre {
-    margin: 0
-}
-.blockpost .box .postright code {
-    padding: 15px!important;
-    background-color: #272822
-}
-.blockpost .box .postright acronym {
-    cursor: help;
-    border-bottom: 1px dotted #777
-}
-.blockpost .box .postright .bbu {
-    text-decoration: underline
-}
-.blockpost .box .postright .bbs {
-    text-decoration: line-through
-}
-.blockpost .box .postright h5 {
-    font-size: 1.25rem;
-    margin: 15px 0;
-    color: #333
-}
-.blockpost .box .postright .codebox {
-    word-wrap: normal;
-    margin-bottom: 15px
-}
-.blockpost .box .postright .codebox .vscroll {
-    height: 32em;
-    overflow: auto
-}
-.blockpost .box .postright .quotebox {
-    border: 1px solid #00BCD4;
-    border-left: 3px solid #00BCD4;
-    background-color: #fafdff;
-    padding: 5px 10px;
-    margin: 10px 20px
-}
-.blockpost .box .postright .quotebox cite {
-    font-weight: 700;
-    color: #357082
-}
-.blockpost .box .postright .quotebox blockquote {
-    margin: 0
-}
-.container {
-    width: 100%
-}
-@media only screen and (min-width: 768px) {
-    .container {
-        margin: 0 auto;
-        padding: 0 15px
-    }
-}
-@media only screen and (min-width: 768px)and (max-width: 991px) {
-    .container {
-        width: 750px
-    }
-}
-@media only screen and (min-width: 992px)and (max-width: 1199px) {
-    .container {
-        width: 970px
-    }
-}
-@media only screen and (min-width: 1200px) {
-    .container {
-        width: 1075px
-    }
-}
-@media only screen and (max-width: 768px) {
-    body {
-        padding-top: 0
-    }
-    .phone-menu {
-        position: relative;
-        display: block;
-        width: 55px;
-        height: 55px;
-        cursor: pointer
-    }
-    .phone-menu .button-phone:after {
-        content: "";
-        display: block;
-        position: absolute;
-        top: 11px;
-        left: 16.25px;
-        width: 22.5px;
-        height: 0;
-        box-shadow: 0 10px 0 1px #fff, 0 16px 0 1px #fff, 0 22px 0 1px #fff
-    }
-    nav {
-        position: static;
-        line-height: normal;
-        height: 100%
-    }
-    #phone {
-        display: none;
-        border-top: 1px solid rgba(255, 255, 255, .3);
-        background-color: #29b6f6
-    }
-    #phone ul {
-        margin: 0;
-        float: none
-    }
-    #phone .navbar-right {
-        padding: 8px;
-        float: none
-    }
-    #phone .navbar-right input {
-        margin: auto;
-        display: block
-    }
-    #phone li {
-        display: block;
-        font-size: 14px;
-        padding: 0;
-        border-bottom: 1px solid rgba(255, 255, 255, .3)
-    }
-    #phone li a {
-        display: block;
-        text-align: center;
-        font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-        line-height: 40px
-    }
-    #phone .isactive {
-        border: none
-    }
-}
-@media only screen and (min-width: 768px) {
-    nav .navbar-right input {
-        width: 100px
-    }
-}
-@media only screen and (min-width: 992px) {
-    nav .navbar-right input {
-        width: 250px
-    }
-}
-@media only screen and (max-width: 992px) {
-    .status-avatar,
-    .title-site {
-        float: none!important;
-        text-align: center
-    }
-    .status-avatar {
-        margin-top: 10px
-    }
-    .status-avatar .conl li,
-    .status-avatar .conr li {
-        text-align: center!important
-    }
-}
-@media only screen and (max-width: 768px) {
-    .blocktable .box table .tc2,
-    .blocktable .box table .tc3 {
-        display: none
-    }
-    .blocktable .box table .tcr {
-        width: 35%!important
-    }
-    .blockpost .box .postfoot .postfootright,
-    .blockpost .box .postright {
-        float: none;
-        width: 100%
-    }
-    #punsearch .blockpost h2 span:nth-child(2),
-    #punsearch .blockpost h2 span:nth-child(3),
-    .blockpost .box .postleft dl dd {
-        display: none
-    }
-    .blockpost {
-        position: relative
-    }
-    .blockpost .box .postleft {
-        float: none
-    }
-    .blockpost .box .postleft dl dt {
-        position: absolute;
-        top: 4px;
-        right: 7px
-    }
-    .blockpost .box .postleft dl dt span {
-        color: #fff
-    }
-    .blockpost .box .postfoot .postfootleft {
-        float: none;
-        display: none
-    }
-    .blockpost .box .postfoot .postfootright ul {
-        visibility: visible
-    }
-    .blockmenu {
-        float: none!important;
-        width: 100%!important;
-        text-align: center
-    }
-    .blockform {
-        width: 100%!important;
-        margin: 0!important
-    }
-    .blockform label input {
-        width: 80%!important
-    }
-    .blockform label input[type=checkbox] {
-        width: 7%!important
-    }
-    .blockform textarea {
-        width: 100%
-    }
-    #brdstats .conl,
-    #brdstats .conr {
-        text-align: center;
-        display: block;
-        width: 100%
-    }
-    #brdstats .clearb,
-    #brdstats .clearer {
-        clear: none
-    }
-}
-#changelog h2 {
-    border: 1px solid #d8d8d8;
-    border-bottom: none;
-    padding: 5px;
-    margin: 0;
-    text-indent: 10px;
-    font-weight: 400;
-    font-size: 18px;
-    background-color: #f5f5f5;
-    border-radius: 3px 3px 0 0
-}
-#changelog .box {
-    border: 1px solid #d8d8d8;
-    border-radius: 0 0 3px 3px;
-    background-color: #fff
-}
-#changelog .box .change {
-    margin: 10px;
-    border-bottom: 2px solid #d8d8d8
-}
-#changelog .box .change:last-child {
-    border-bottom: none
-}
-#changelog .box .change h3 {
-    margin: 10px 10px 0;
-    font-size: 16px;
-    font-weight: 400
-}
-#changelog .box .change p {
-    font-size: 14px;
-    margin: 5px 10px 10px
-}
-#changelog .box .change li {
-    margin: 10px
-}
-
-#modcontrols.inbox {
-    font-size: 14px;
-    text-align: center;
-}
-#modcontrols.inbox dl dt {
-    margin-bottom: 5px;
-}
-
-#modcontrols.inbox dl dd {
-    display: inline;
-    margin-left: 0;
-    padding: 5px;
-}
-
-#debugtime {
-    margin-bottom: 10px;
-    text-align: center;
-}
-
-#debug.blocktable div.box div.inbox table {
-	table-layout: auto;
-}
-#debug.blocktable .box table tbody tr .tcl {
-    width: 20%;
-}
-#debug.blocktable .box table tbody tr .tcr {
-    width: 80%;
-}
-
-#searchform #search.multiselect {
-    float: left;
-    padding-bottom: 7px;
-}
-
-#profile.block2col div.blockform div.box form#profile1 div.inform fieldset div.infldset label,
-#profile.block2col div.blockform div.box form#profile2 div.inform fieldset div.infldset label,
-#profile.block2col div.blockform div.box form#profile3 div.inform fieldset div.infldset label,
-#profile.block2col div.blockform div.box form#profile5 div.inform fieldset div.infldset div.rbox label,
-#profile.block2col div.blockform div.box form#profile6 div.inform fieldset div.infldset div.rbox label,
-#profile.block2col div.blockform div.box form#profile7 div.inform fieldset div.infldset div.conl div.rbox label,
-#quickpost.blockform div.box form#quickpostform div.inform fieldset div.infldset.txtarea label,
-#postform.blockform div.box form#post div.inform fieldset div.infldset.txtarea label.required,
-#editform.blockform div.box form#edit div.inform fieldset div.infldset.txtarea label.required,
-#editform.blockform div.box form#edit div.inform fieldset div.infldset div.rbox label,
-#regform.blockform div.box form#register div.inform fieldset div.infldset div.rbox label{
-	display: block;
-}
-#redir {
-    text-align: center;
-}
-#vf.blocktable div.box div.inbox table tbody tr td.tcl div.tclcon {
-    margin-top: 7px;
-}
-#searchform.blockform div.box form#search div.inform fieldset div.infldset div.conl.multiselect {
-	display: inline-block;
-	float: left;
-}
-#searchform.blockform div.box form#search div.inform fieldset div.infldset label.conl {
-	padding: 5px;
-}
-#searchform.blockform div.box form#search div.inform fieldset div.infldset p.clearl {
-    margin-top: 100px;
-}
-#searchform.blockform div.box form#search div.inform fieldset div.infldset label.conl {
-    margin-top: -2px;
-}
-#searchform.blockform div.box form#search div.inform fieldset div.infldset label.conl select#search_in {
-    margin-top: 7px;
-}
-body #puninstall {
-    padding-bottom: 60px;
-}
-#puninstall .blockform .box .inform fieldset {
-	margin-top: 15px;
-}
-#puninstall h3 {
-	font-size: 22px;
-	text-align: center;
-}
-.forminfo p, #install p.buttons, html body div#puninstall.pun div.punwrap section.container div#brdheader.block div.box div#brdtitle.inbox {
-	text-align: center;
-}
-#install p.buttons {
-	font-size: 22px;
-}
-#puninstall .blockform .box .inform fieldset label {
-	display: block;
-}
-#puninstall .blockform .box .inform fieldset legend {
-	margin-bottom: 0;
-}
-#puninstall.pun div.punwrap section.container div#brdmain div.blockform div.box form#install div.inform fieldset div.infldset p{
-	margin-bottom: 12px;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-td,
-th {
-  padding: 0;
-}
-table {
-  background-color: transparent;
-}
-caption {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  color: #777777;
-  text-align: left;
-}
-th {
-  text-align: left;
-}
-.table {
-  width: 100%;
-  max-width: 100%;
-  margin-bottom: 20px;
-}
-.table > thead > tr > th,
-.table > tbody > tr > th,
-.table > tfoot > tr > th,
-.table > thead > tr > td,
-.table > tbody > tr > td,
-.table > tfoot > tr > td {
-  padding: 8px;
-  line-height: 1.42857143;
-  vertical-align: top;
-  border-top: 1px solid #dddddd;
-}
-.table > thead > tr > th {
-  vertical-align: bottom;
-  border-bottom: 2px solid #dddddd;
-}
-.table > caption + thead > tr:first-child > th,
-.table > colgroup + thead > tr:first-child > th,
-.table > thead:first-child > tr:first-child > th,
-.table > caption + thead > tr:first-child > td,
-.table > colgroup + thead > tr:first-child > td,
-.table > thead:first-child > tr:first-child > td {
-  border-top: 0;
-}
-.table > thead > tr > td.active,
-.table > tbody > tr > td.active,
-.table > tfoot > tr > td.active,
-.table > thead > tr > th.active,
-.table > tbody > tr > th.active,
-.table > tfoot > tr > th.active,
-.table > thead > tr.active > td,
-.table > tbody > tr.active > td,
-.table > tfoot > tr.active > td,
-.table > thead > tr.active > th,
-.table > tbody > tr.active > th,
-.table > tfoot > tr.active > th {
-  background-color: #f5f5f5;
-}
diff --git a/style/themes/MyFeatherBB/view/admin/bans/add_ban.php b/style/themes/MyFeatherBB/view/admin/bans/add_ban.php
deleted file mode 100644
index 1bda2c69..00000000
--- a/style/themes/MyFeatherBB/view/admin/bans/add_ban.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-	exit;
-}
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('Ban advanced head') ?></span></h2>
-	<div class="box">
-		<form id="bans2" method="post" action="">
-			<div class="inform">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="mode" value="<?php echo $ban['mode'] ?>" />
-				<?php if ($ban['mode'] == 'edit'): ?>				<input type="hidden" name="ban_id" value="<?php echo $ban['id'] ?>" />
-				<?php endif; ?>
-				<?php if ($ban['mode'] == 'add' && isset($ban['user_id'])): ?><input type="hidden" name="ban_user_id" value="<?php echo $ban['user_id'] ?>" />
-				<?php endif; ?><fieldset>
-					<legend><?php _e('Ban advanced subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Username label') ?></th>
-								<td>
-									<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
-										echo $feather->utils->escape($ban['ban_user']);
-									} ?>" tabindex="1" />
-									<span><?php _e('Username help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('IP label') ?></th>
-								<td>
-									<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
-										echo $feather->utils->escape($ban['ip']);
-									} ?>" tabindex="2" />
-										<span><?php _e('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
-												printf(' '.__('IP help link'), '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.__('here').'</a>');
-											} ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('E-mail label') ?></th>
-								<td>
-									<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
-										echo $feather->utils->escape($ban['email']);
-									} ?>" tabindex="3" />
-									<span><?php _e('E-mail help') ?></span>
-								</td>
-							</tr>
-						</table>
-						<p class="topspace"><strong class="warntext"><?php _e('Ban IP range info') ?></strong></p>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Message expiry subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Ban message label') ?></th>
-								<td>
-									<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
-										echo $feather->utils->escape($ban['message']);
-									} ?>" tabindex="4" />
-									<span><?php _e('Ban message help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Expire date label') ?></th>
-								<td>
-									<input type="text" name="ban_expire" size="17" maxlength="10" value="<?php if (isset($ban['expire'])) {
-										echo $ban['expire'];
-									} ?>" tabindex="5" />
-									<span><?php _e('Expire date help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php _e('Save') ?>" tabindex="6" /></p>
-		</form>
-	</div>
-</div>
-<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/bans/admin_bans.php b/style/themes/MyFeatherBB/view/admin/bans/admin_bans.php
deleted file mode 100644
index 14b13968..00000000
--- a/style/themes/MyFeatherBB/view/admin/bans/admin_bans.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('New ban head') ?></span></h2>
-		<div class="box">
-			<form id="bans" method="post" action="<?php echo $feather->url->get('admin/bans/add/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Add ban subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Username label') ?><div><input type="submit" name="add_ban" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
-									<td>
-										<input type="text" name="new_ban_user" size="25" maxlength="25" tabindex="1" />
-										<span><?php _e('Username advanced help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-
-		<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
-		<div class="box">
-			<form id="find_bans" method="get" action="<?php echo $feather->url->get('admin/bans/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Ban search subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Ban search info') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Username label') ?></th>
-									<td><input type="text" name="username" size="30" maxlength="25" tabindex="4" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('IP label') ?></th>
-									<td><input type="text" name="ip" size="30" maxlength="255" tabindex="5" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('E-mail label') ?></th>
-									<td><input type="text" name="email" size="30" maxlength="80" tabindex="6" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Message label') ?></th>
-									<td><input type="text" name="message" size="30" maxlength="255" tabindex="7" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Expire after label') ?></th>
-									<td><input type="text" name="expire_after" size="10" maxlength="10" tabindex="8" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Expire before label') ?></th>
-									<td><input type="text" name="expire_before" size="10" maxlength="10" tabindex="9" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Order by label') ?></th>
-									<td>
-										<select name="order_by" tabindex="10">
-											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
-											<option value="ip"><?php _e('Order by ip') ?></option>
-											<option value="email"><?php _e('Order by e-mail') ?></option>
-											<option value="expire"><?php _e('Order by expire') ?></option>
-										</select>
-                                        &#160;&#160;&#160;
-                                        <select name="direction" tabindex="11">
-											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
-											<option value="DESC"><?php _e('Descending') ?></option>
-										</select>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="12" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/bans/search_ban.php b/style/themes/MyFeatherBB/view/admin/bans/search_ban.php
deleted file mode 100644
index 356a0baa..00000000
--- a/style/themes/MyFeatherBB/view/admin/bans/search_ban.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-
-<div id="bans1" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results IP address head') ?></th>
-					<th class="tc4" scope="col"><?php _e('Results expire head') ?></th>
-					<th class="tc5" scope="col"><?php _e('Results message head') ?></th>
-					<th class="tc6" scope="col"><?php _e('Results banned by head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-
-        foreach ($ban_data as $cur_ban) {
-            ?>
-				<tr>
-					<td class="tcl"><?php echo($cur_ban['username'] != '') ? $feather->utils->escape($cur_ban['username']) : '&#160;' ?></td>
-					<td class="tc2"><?php echo($cur_ban['email'] != '') ? $feather->utils->escape($cur_ban['email']) : '&#160;' ?></td>
-					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? $feather->utils->escape($cur_ban['ip']) : '&#160;' ?></td>
-					<td class="tc4"><?php echo $feather->utils->format_time($cur_ban['expire'], true) ?></td>
-					<td class="tc5"><?php echo($cur_ban['message'] != '') ? $feather->utils->escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.$feather->utils->escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
-				</tr>
-<?php
-
-        }
-        if (empty($ban_data)) {
-            echo "\t\t\t\t".'<tr><td class="tcl" colspan="7">'.__('No match').'</td></tr>'."\n";
-        }
-
-?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-        <ul class="crumbs">
-            <li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
-            <li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-        </ul>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/categories.php b/style/themes/MyFeatherBB/view/admin/categories.php
deleted file mode 100644
index 3a2057b7..00000000
--- a/style/themes/MyFeatherBB/view/admin/categories.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-	<div class="blockform">
-		<h2><span><?php _e('Add categories head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/categories/add/') ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Add categories subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Add category label') ?><div><input type="submit" value="<?php _e('Add new submit') ?>" tabindex="2" /></div></th>
-									<td>
-										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
-										<span><?php printf(__('Add category help'), '<a href="'.$feather->url->get('admin/forums').'">'.__('Forums').'</a>') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-
-<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/categories/delete') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Delete categories subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Delete category label') ?><div><input type="submit" value="<?php _e('Delete') ?>" tabindex="4" /></div></th>
-									<td>
-										<select name="cat_to_delete" tabindex="3">
-<?php
-
-    foreach ($cat_list as $cur_cat) {
-        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.$feather->utils->escape($cur_cat['cat_name']).'</option>'."\n";
-    }
-
-?>
-										</select>
-										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php _e('Delete category disclaimer') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-<?php endif; ?>
-
-<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/categories/edit/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit categories subhead') ?></legend>
-						<div class="infldset">
-							<table id="categoryedit">
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php _e('Category name label') ?></th>
-									<th scope="col"><?php _e('Category position label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-
-    foreach ($cat_list as $cur_cat) {
-        ?>
-								<tr>
-									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo $feather->utils->escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
-									<td><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][order]" value="<?php echo $cur_cat['disp_position'] ?>" size="3" maxlength="3" /></td>
-								</tr>
-<?php
-
-    }
-
-?>
-							</tbody>
-							</table>
-							<div class="fsetsubmit"><input type="submit" value="<?php _e('Update') ?>" /></div>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-<?php endif; ?>	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/censoring.php b/style/themes/MyFeatherBB/view/admin/censoring.php
deleted file mode 100644
index 54a063a6..00000000
--- a/style/themes/MyFeatherBB/view/admin/censoring.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Censoring head') ?></span></h2>
-		<div class="box">
-			<form id="censoring" method="post" action="<?php echo $feather->url->get('admin/censoring/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Add word subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
-							<table>
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
-									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
-									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-								<tr>
-									<td class="tcl"><input type="text" name="new_search_for" size="24" maxlength="60" tabindex="1" /></td>
-									<td class="tc2"><input type="text" name="new_replace_with" size="24" maxlength="60" tabindex="2" /></td>
-									<td><input type="submit" name="add_word" value="<?php _e('Add') ?>" tabindex="3" /></td>
-								</tr>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit remove subhead') ?></legend>
-						<div class="infldset">
-<?php
-if (!empty($word_data)) {
-    ?>
-							<table>
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
-									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
-									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-
-    foreach ($word_data as $word) {
-        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.$feather->utils->escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.$feather->utils->escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
-    }
-
-    ?>
-							</tbody>
-							</table>
-<?php
-
-} else {
-    echo "\t\t\t\t\t\t\t".'<p>'.__('No words in list').'</p>'."\n";
-}
-
-?>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/forums/admin_forums.php b/style/themes/MyFeatherBB/view/admin/forums/admin_forums.php
deleted file mode 100644
index abcd2bf7..00000000
--- a/style/themes/MyFeatherBB/view/admin/forums/admin_forums.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Add forum head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/forums/add') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<?php
-if (!empty($cat_list)) {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Create new subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Add forum label') ?><div><input type="submit" value="<?php _e('Add forum') ?>" tabindex="2" /></div></th>
-									<td>
-										<select name="cat" tabindex="1">
-											<?php  foreach ($cat_list as $cat) {
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.$feather->utils->escape($cat['cat_name']).'</option>'."\n";
-											} ?>
-										</select>
-										<span><?php _e('Add forum help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-} else {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('None') ?></legend>
-						<div class="infldset">
-							<p><?php _e('No categories exist') ?></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-}
-
-?>
-			</form>
-		</div>
-<?php
-if (!empty($forum_data)) {
-    ?>
-		<h2 class="block2"><span><?php _e('Manage forums head') ?></span></h2>
-		<div class="box">
-			<form id="edforum" method="post" action="<?php echo $feather->url->get('admin/forums/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
-<?php
-    foreach ($forum_data as $cat_id => $cat_data) {
-            ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Category subhead') ?> <?php echo $feather->utils->escape($cat_data['cat_name']) ?></legend>
-						<div class="infldset">
-							<table>
-							<thead>
-								<tr>
-									<th class="tcl"><?php _e('Action') ?></th>
-									<th class="tc2"><?php _e('Position label') ?></th>
-									<th class="tcr"><?php _e('Forum label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-	foreach ($cat_data['cat_forums'] as $forum) {
-        ?>
-								<tr>
-									<td class="tcl"><a href="<?php echo $feather->url->get('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
-									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
-									<td class="tcr"><strong><?php echo $feather->utils->escape($forum['forum_name']) ?></strong></td>
-								</tr>
-<?php
-    }
-    ?>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-	}
-?>
-				<p class="submitend"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
-<?php
-	}
-?>
diff --git a/style/themes/MyFeatherBB/view/admin/forums/delete_forum.php b/style/themes/MyFeatherBB/view/admin/forums/delete_forum.php
deleted file mode 100644
index 4a2df3f1..00000000
--- a/style/themes/MyFeatherBB/view/admin/forums/delete_forum.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Confirm delete head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Confirm delete subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Confirm delete info'), $cur_forum['forum_name']) ?></p>
-							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="del_forum_comply" value="<?php _e('Delete') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/forums/permissions.php b/style/themes/MyFeatherBB/view/admin/forums/permissions.php
deleted file mode 100644
index 8368cfa9..00000000
--- a/style/themes/MyFeatherBB/view/admin/forums/permissions.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Edit forum head') ?></span></h2>
-		<div class="box">
-			<form id="edit_forum" method="post" action="<?php echo $feather->url->get('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit details subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Forum name label') ?></th>
-									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo $feather->utils->escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Forum description label') ?></th>
-									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo $feather->utils->escape($cur_forum['forum_desc']) ?></textarea></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Category label') ?></th>
-									<td>
-										<select name="cat_id" tabindex="3">
-											<?php  foreach ($forum_data as $cat_id => $cat_data) {
-												$selected = ($cat_id == $cur_forum['cat_id']) ? 'selected="selected"' : '';
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.$feather->utils->escape($cat_data['cat_name']).'</option>'."\n";
-											} ?>
-										</select>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Sort by label') ?></th>
-									<td>
-										<select name="sort_by" tabindex="4">
-											<option value="0"<?php if ($cur_forum['sort_by'] == '0') {
-    echo ' selected="selected"';
-} ?>><?php _e('Last post') ?></option>
-											<option value="1"<?php if ($cur_forum['sort_by'] == '1') {
-    echo ' selected="selected"';
-} ?>><?php _e('Topic start') ?></option>
-											<option value="2"<?php if ($cur_forum['sort_by'] == '2') {
-    echo ' selected="selected"';
-} ?>><?php _e('Subject') ?></option>
-										</select>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Redirect label') ?></th>
-									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.$feather->utils->escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Group permissions subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Group permissions info'), '<a href="admin_groups.php">'.__('User groups').'</a>') ?></p>
-							<table id="forumperms">
-							<thead>
-								<tr>
-									<th class="atcl">&#160;</th>
-									<th><?php _e('Read forum label') ?></th>
-									<th><?php _e('Post replies label') ?></th>
-									<th><?php _e('Post topics label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-    foreach ($perm_data as $perm) {
-        ?>
-								<tr>
-									<th class="atcl"><?php echo $feather->utils->escape($perm['g_title']) ?></th>
-									<td<?php if (!$perm['read_forum_def']) {
-    echo ' class="nodefault"';
-}
-        ?>>
-										<input type="hidden" name="read_forum_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['read_forum']) ? '1' : '0';
-        ?>" />
-										<input type="checkbox" name="read_forum_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['read_forum']) ? ' checked="checked"' : '';
-        ?><?php echo($perm['g_read_board'] == '0') ? ' disabled="disabled"' : '';
-        ?> tabindex="<?php echo $cur_index++ ?>" />
-									</td>
-									<td<?php if (!$perm['post_replies_def'] && $cur_forum['redirect_url'] == '') {
-    echo ' class="nodefault"';
-}
-        ?>>
-										<input type="hidden" name="post_replies_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['post_replies']) ? '1' : '0';
-        ?>" />
-										<input type="checkbox" name="post_replies_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['post_replies']) ? ' checked="checked"' : '';
-        ?><?php echo($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : '';
-        ?> tabindex="<?php echo $cur_index++ ?>" />
-									</td>
-									<td<?php if (!$perm['post_topics_def'] && $cur_forum['redirect_url'] == '') {
-    echo ' class="nodefault"';
-}
-        ?>>
-										<input type="hidden" name="post_topics_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['post_topics']) ? '1' : '0';
-        ?>" />
-										<input type="checkbox" name="post_topics_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['post_topics']) ? ' checked="checked"' : '';
-        ?><?php echo($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : '';
-        ?> tabindex="<?php echo $cur_index++ ?>" />
-									</td>
-								</tr>
-<?php
-
-    }
-
-?>
-							</tbody>
-							</table>
-							<div class="fsetsubmit"><input type="submit" name="revert_perms" value="<?php _e('Revert to default') ?>" tabindex="<?php echo $cur_index++ ?>" /></div>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/groups/add_edit_group.php b/style/themes/MyFeatherBB/view/admin/groups/add_edit_group.php
deleted file mode 100644
index f09d4255..00000000
--- a/style/themes/MyFeatherBB/view/admin/groups/add_edit_group.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Group settings head') ?></span></h2>
-		<div class="box">
-			<form id="groups2" method="post" action="" onsubmit="return process_form(this)">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" /></p>
-				<div class="inform">
-					<input type="hidden" name="mode" value="<?php echo $group['mode'] ?>" />
-<?php if ($group['mode'] == 'edit'): ?>					<input type="hidden" name="group_id" value="<?php echo $id ?>" />
-<?php endif; ?><?php if ($group['mode'] == 'add'): ?>					<input type="hidden" name="base_group" value="<?php echo $group['base_group'] ?>" />
-<?php endif; ?>					<fieldset>
-						<legend><?php _e('Group settings subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Group settings info') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Group title label') ?></th>
-									<td>
-										<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
-    echo $feather->utils->escape($group['info']['g_title']);
-} ?>" tabindex="1" />
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('User title label') ?></th>
-									<td>
-										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo $feather->utils->escape($group['info']['g_user_title']) ?>" tabindex="2" />
-										<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Promote users label') ?></th>
-									<td>
-										<select name="promote_next_group" tabindex="3">
-											<option value="0"><?php _e('Disable promotion') ?></option>
-											<?php echo $group_list ?>
-										</select>
-										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo $feather->utils->escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
-										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
-									</td>
-								</tr>
-<?php if ($group['mode'] != 'edit' || $feather->forum_settings['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
-									<th scope="row"> <?php _e('Mod privileges label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="5" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="moderator" value="0"<?php if ($group['info']['g_moderator'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="6" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Mod privileges help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Edit profile label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_edit_users" value="1"<?php if ($group['info']['g_mod_edit_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="7" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_edit_users" value="0"<?php if ($group['info']['g_mod_edit_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="8" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Edit profile help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Rename users label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_rename_users" value="1"<?php if ($group['info']['g_mod_rename_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="9" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_rename_users" value="0"<?php if ($group['info']['g_mod_rename_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="10" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Rename users help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Change passwords label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_change_passwords" value="1"<?php if ($group['info']['g_mod_change_passwords'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="11" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_change_passwords" value="0"<?php if ($group['info']['g_mod_change_passwords'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="12" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Change passwords help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Mod promote users label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_promote_users" value="1"<?php if ($group['info']['g_mod_promote_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="13" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_promote_users" value="0"<?php if ($group['info']['g_mod_promote_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="14" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Mod promote users help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Ban users label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_ban_users" value="1"<?php if ($group['info']['g_mod_ban_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="15" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_ban_users" value="0"<?php if ($group['info']['g_mod_ban_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="16" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Ban users help') ?></span>
-									</td>
-								</tr>
-<?php endif; endif; ?>								<tr>
-									<th scope="row"><?php _e('Read board label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="read_board" value="1"<?php if ($group['info']['g_read_board'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="17" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="read_board" value="0"<?php if ($group['info']['g_read_board'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="18" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Read board help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('View user info label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="view_users" value="1"<?php if ($group['info']['g_view_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="19" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="view_users" value="0"<?php if ($group['info']['g_view_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="20" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('View user info help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Post replies label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="post_replies" value="1"<?php if ($group['info']['g_post_replies'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="21" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="post_replies" value="0"<?php if ($group['info']['g_post_replies'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="22" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Post replies help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Post topics label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="post_topics" value="1"<?php if ($group['info']['g_post_topics'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="23" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="post_topics" value="0"<?php if ($group['info']['g_post_topics'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="24" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Post topics help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Edit posts label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="edit_posts" value="1"<?php if ($group['info']['g_edit_posts'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="25" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="edit_posts" value="0"<?php if ($group['info']['g_edit_posts'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="26" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Edit posts help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Delete posts label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="delete_posts" value="1"<?php if ($group['info']['g_delete_posts'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="27" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="delete_posts" value="0"<?php if ($group['info']['g_delete_posts'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="28" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Delete posts help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Delete topics label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="delete_topics" value="1"<?php if ($group['info']['g_delete_topics'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="29" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="delete_topics" value="0"<?php if ($group['info']['g_delete_topics'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="30" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Delete topics help') ?></span>
-									</td>
-								</tr>
-<?php endif; ?>								<tr>
-									<th scope="row"><?php _e('Post links label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="post_links" value="1"<?php if ($group['info']['g_post_links'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="31" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="post_links" value="0"<?php if ($group['info']['g_post_links'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="32" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Post links help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Set own title label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="set_title" value="1"<?php if ($group['info']['g_set_title'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="33" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="set_title" value="0"<?php if ($group['info']['g_set_title'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="34" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Set own title help') ?></span>
-									</td>
-								</tr>
-<?php endif; ?>								<tr>
-									<th scope="row"><?php _e('User search label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="search" value="1"<?php if ($group['info']['g_search'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="35" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="search" value="0"<?php if ($group['info']['g_search'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="36" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('User search help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('User list search label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="search_users" value="1"<?php if ($group['info']['g_search_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="37" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="search_users" value="0"<?php if ($group['info']['g_search_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="38" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('User list search help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Send e-mails label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="send_email" value="1"<?php if ($group['info']['g_send_email'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="39" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="send_email" value="0"<?php if ($group['info']['g_send_email'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="40" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Send e-mails help') ?></span>
-									</td>
-								</tr>
-<?php endif; ?>								<tr>
-									<th scope="row"><?php _e('Post flood label') ?></th>
-									<td>
-										<input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_post_flood'] ?>" tabindex="41" />
-										<span><?php _e('Post flood help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Search flood label') ?></th>
-									<td>
-										<input type="text" name="search_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_search_flood'] ?>" tabindex="42" />
-										<span><?php _e('Search flood help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('E-mail flood label') ?></th>
-									<td>
-										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_email_flood'] ?>" tabindex="43" />
-										<span><?php _e('E-mail flood help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Report flood label') ?></th>
-									<td>
-										<input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_report_flood'] ?>" tabindex="44" />
-										<span><?php _e('Report flood help') ?></span>
-									</td>
-								</tr>
-<?php endif; endif; ?>							</table>
-<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php _e('Moderator info') ?></p>
-<?php endif; ?>						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" tabindex="45" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/groups/admin_groups.php b/style/themes/MyFeatherBB/view/admin/groups/admin_groups.php
deleted file mode 100644
index 6d43231a..00000000
--- a/style/themes/MyFeatherBB/view/admin/groups/admin_groups.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Add groups head') ?></span></h2>
-		<div class="box">
-				<div class="inform">
-					<fieldset>
-                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/add/') ?>">
-                        <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php _e('Add group subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('New group label') ?><div><input type="submit" name="add_group" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
-									<td>
-										<select id="base_group" name="base_group" tabindex="1">
-<?php
-
-foreach ($groups as $cur_group) {
-    if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
-        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
-        } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
-        }
-    }
-}
-
-?>
-										</select>
-										<span><?php _e('New group help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-                        </form>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/') ?>">
-                        	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php _e('Default group subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Default group label') ?><div><input type="submit" name="set_default_group" value="<?php _e('Save') ?>" tabindex="4" /></div></th>
-									<td>
-										<select id="default_group" name="default_group" tabindex="3">
-<?php
-
-foreach ($groups as $cur_group) {
-    if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
-        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
-        } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
-        }
-    }
-}
-
-?>
-										</select>
-										<span><?php _e('Default group help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-                        </form>
-					</fieldset>
-				</div>
-		</div>
-
-		<h2 class="block2"><span><?php _e('Existing groups head') ?></span></h2>
-		<div class="box">
-			<div class="fakeform">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit groups subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Edit groups info') ?></p>
-							<table>
-<?php
-foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.$feather->utils->escape($cur_group['g_title']).'</td></tr>'."\n";
-}
-
-?>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/groups/confirm_delete.php b/style/themes/MyFeatherBB/view/admin/groups/confirm_delete.php
deleted file mode 100644
index 2ea97c75..00000000
--- a/style/themes/MyFeatherBB/view/admin/groups/confirm_delete.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Group delete head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-				<input type="hidden" name="group_to_delete" value="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>" />
-					<fieldset>
-						<legend><?php _e('Confirm delete subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Confirm delete info'), $feather->utils->escape($group_title)) ?></p>
-							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="del_group_comply" value="<?php _e('Delete') ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/groups/delete_group.php b/style/themes/MyFeatherBB/view/admin/groups/delete_group.php
deleted file mode 100644
index be55e2a4..00000000
--- a/style/themes/MyFeatherBB/view/admin/groups/delete_group.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Delete group head') ?></span></h2>
-		<div class="box">
-			<form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Move users subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Move users info'), $feather->utils->escape($group_info['title']), $feather->utils->forum_number_format($group_info['members'])) ?></p>
-							<label><?php _e('Move users label') ?>
-							<select name="move_to_group">
-								<?= $group_list_delete; ?>
-							</select>
-							<br /></label>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="del_group" value="<?php _e('Delete group') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
diff --git a/style/themes/MyFeatherBB/view/admin/index.php b/style/themes/MyFeatherBB/view/admin/index.php
deleted file mode 100644
index 4dcbbbbb..00000000
--- a/style/themes/MyFeatherBB/view/admin/index.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="block">
-		<h2><span><?php _e('Forum admin head') ?></span></h2>
-		<div id="adintro" class="box">
-			<div class="inbox">
-				<p><?php _e('Welcome to admin') ?></p>
-				<ul>
-					<li><span><?php _e('Welcome 1') ?></span></li>
-					<li><span><?php _e('Welcome 2') ?></span></li>
-					<li><span><?php _e('Welcome 3') ?></span></li>
-					<li><span><?php _e('Welcome 4') ?></span></li>
-					<li><span><?php _e('Welcome 5') ?></span></li>
-					<li><span><?php _e('Welcome 6') ?></span></li>
-					<li><span><?php _e('Welcome 7') ?></span></li>
-					<li><span><?php _e('Welcome 8') ?></span></li>
-					<li><span><?php _e('Welcome 9') ?></span></li>
-				</ul>
-			</div>
-		</div>
-
-<?php if ($install_file_exists) : ?>
-		<h2 class="block2"><span><?php _e('Alerts head') ?></span></h2>
-		<div id="adalerts" class="box">
-			<p><?php printf(__('Install file exists'), '<a href="'.$feather->url->get('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
-		</div>
-<?php endif; ?>
-
-		<h2 class="block2"><span><?php _e('About head') ?></span></h2>
-		<div id="adstats" class="box">
-			<div class="inbox">
-				<dl>
-					<dt><?php _e('FeatherBB version label') ?></dt>
-					<dd>
-						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.$feather->url->get('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
-					</dd>
-					<dt><?php _e('Server statistics label') ?></dt>
-					<dd>
-						<a href="<?php echo $feather->url->get('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
-					</dd>
-					<dt><?php _e('Support label') ?></dt>
-					<dd>
-						<a href="http://FeatherBB.org/forums/index.php"><?php _e('Forum label') ?></a> - <a href="http://gitter.im/featherbb/featherbb"><?php _e('IRC label') ?></a>
-					</dd>
-				</dl>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/loader.php b/style/themes/MyFeatherBB/view/admin/loader.php
deleted file mode 100644
index 6a61c22f..00000000
--- a/style/themes/MyFeatherBB/view/admin/loader.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/maintenance/admin_maintenance.php b/style/themes/MyFeatherBB/view/admin/maintenance/admin_maintenance.php
deleted file mode 100644
index 0e70cca3..00000000
--- a/style/themes/MyFeatherBB/view/admin/maintenance/admin_maintenance.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Maintenance head') ?></span></h2>
-		<div class="box">
-			<form method="get" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
-				<div class="inform">
-					<input type="hidden" name="action" value="rebuild" />
-					<fieldset>
-						<legend><?php _e('Rebuild index subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Rebuild index info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Posts per cycle label') ?></th>
-									<td>
-										<input type="text" name="i_per_page" size="7" maxlength="7" value="300" tabindex="1" />
-										<span><?php _e('Posts per cycle help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Starting post label') ?></th>
-									<td>
-										<input type="text" name="i_start_at" size="7" maxlength="7" value="<?php echo(isset($first_id)) ? $first_id : 0 ?>" tabindex="2" />
-										<span><?php _e('Starting post help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Empty index label') ?></th>
-									<td class="inputadmin">
-										<label><input type="checkbox" name="i_empty_index" value="1" tabindex="3" checked="checked" />&#160;&#160;<?php _e('Empty index help') ?></label>
-									</td>
-								</tr>
-							</table>
-							<p class="topspace"><?php _e('Rebuild completed info') ?></p>
-							<div class="fsetsubmit"><input type="submit" name="rebuild_index" value="<?php _e('Rebuild index') ?>" tabindex="4" /></div>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-
-			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>" onsubmit="return process_form(this)">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<input type="hidden" name="action" value="prune" />
-					<fieldset>
-						<legend><?php _e('Prune subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Days old label') ?></th>
-									<td>
-										<input type="text" name="req_prune_days" size="3" maxlength="3" tabindex="5" />
-										<span><?php _e('Days old help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Prune sticky label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="prune_sticky" value="1" tabindex="6" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="prune_sticky" value="0" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Prune sticky help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Prune from label') ?></th>
-									<td>
-										<select name="prune_from" tabindex="7">
-											<option value="all"><?php _e('All forums') ?></option>
-												<?php echo $categories; ?>
-											</optgroup>
-										</select>
-										<span><?php _e('Prune from help') ?></span>
-									</td>
-								</tr>
-							</table>
-							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
-							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php _e('Prune') ?>" tabindex="8" /></div>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/maintenance/prune.php b/style/themes/MyFeatherBB/view/admin/maintenance/prune.php
deleted file mode 100644
index fa4aea34..00000000
--- a/style/themes/MyFeatherBB/view/admin/maintenance/prune.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Prune head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<input type="hidden" name="action" value="prune" />
-					<input type="hidden" name="prune_days" value="<?php echo $prune['days'] ?>" />
-					<input type="hidden" name="prune_sticky" value="<?php echo $prune_sticky ?>" />
-					<input type="hidden" name="prune_from" value="<?php echo $prune_from ?>" />
-					<fieldset>
-						<legend><?php _e('Confirm prune subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], $feather->utils->forum_number_format($prune['num_topics'])) ?></p>
-							<p class="warntext"><?php _e('Confirm prune warn') ?></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="prune_comply" value="<?php _e('Prune') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/maintenance/rebuild.php b/style/themes/MyFeatherBB/view/admin/maintenance/rebuild.php
deleted file mode 100644
index 576d1ecf..00000000
--- a/style/themes/MyFeatherBB/view/admin/maintenance/rebuild.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-<h1><?php _e('Rebuilding index info') ?></h1>
-<script type="text/javascript">window.location="<?= $feather->url->get('admin/maintenance/').$query_str ?>"</script>
-<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.$feather->url->get('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>
diff --git a/style/themes/MyFeatherBB/view/admin/menu.php b/style/themes/MyFeatherBB/view/admin/menu.php
deleted file mode 100644
index da238ac6..00000000
--- a/style/themes/MyFeatherBB/view/admin/menu.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="adminconsole" class="block2col">
-	<div id="adminmenu" class="blockmenu">
-		<h2><span><?php _e('Moderator menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-					<li<?php if ($page == 'index') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Index') ?></a></li>
-					<li<?php if ($page == 'users') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-<?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
-<?php endif;
-    if ($is_admin || $feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
-<?php endif;
-    ?>				</ul>
-			</div>
-		</div>
-<?php
-
-    if ($is_admin) {
-        ?>
-		<h2 class="block2"><span><?php _e('Admin menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-					<li<?php if ($page == 'options') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/options/') ?>"><?php _e('Options') ?></a></li>
-					<li<?php if ($page == 'permissions') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
-					<li<?php if ($page == 'categories') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
-					<li<?php if ($page == 'forums') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
-					<li<?php if ($page == 'groups') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
-					<li<?php if ($page == 'plugins') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/plugins/') ?>"><?= 'Plugins'; ?></a></li>
-					<li<?php if ($page == 'censoring') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
-					<li<?php if ($page == 'parser') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
-					<li<?php if ($page == 'maintenance') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
-				</ul>
-			</div>
-		</div>
-<?php
-
-    }
-
-    // Did we find any plugins?
-    if (!empty($plugins)) {
-        ?>
-		<h2 class="block2"><span><?php _e('Plugins menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-<?php
-
-        foreach ($plugins as $plugin_name => $plugin) {
-            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.$feather->url->get('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
-        }
-
-        ?>
-				</ul>
-			</div>
-		</div>
-<?php
-
-    }
-
-    ?>
-	</div>
diff --git a/style/themes/MyFeatherBB/view/admin/options.php b/style/themes/MyFeatherBB/view/admin/options.php
deleted file mode 100644
index 78ed0fa6..00000000
--- a/style/themes/MyFeatherBB/view/admin/options.php
+++ /dev/null
@@ -1,840 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Options head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/options/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-				<div class="inform">
-					<input type="hidden" name="form_sent" value="1" />
-					<fieldset>
-						<legend><?php _e('Essentials subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Board title label') ?></th>
-									<td>
-										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?>" />
-										<span><?php _e('Board title help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Board desc label') ?></th>
-									<td>
-										<textarea name="form_board_desc" cols="60" rows="3"><?php echo $feather->utils->escape($feather->forum_settings['o_board_desc']) ?></textarea>
-										<span><?php _e('Board desc help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Base URL label') ?></th>
-									<td>
-										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo $feather->utils->escape($feather->forum_settings['o_base_url']) ?>" />
-										<span><?php _e('Base URL help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Timezone label') ?></th>
-									<td>
-										<select name="form_default_timezone">
-											<option value="-12"<?php if ($feather->forum_settings['o_default_timezone'] == -12) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-12:00') ?></option>
-											<option value="-11"<?php if ($feather->forum_settings['o_default_timezone'] == -11) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-11:00') ?></option>
-											<option value="-10"<?php if ($feather->forum_settings['o_default_timezone'] == -10) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-10:00') ?></option>
-											<option value="-9.5"<?php if ($feather->forum_settings['o_default_timezone'] == -9.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-09:30') ?></option>
-											<option value="-9"<?php if ($feather->forum_settings['o_default_timezone'] == -9) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-09:00') ?></option>
-											<option value="-8.5"<?php if ($feather->forum_settings['o_default_timezone'] == -8.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-08:30') ?></option>
-											<option value="-8"<?php if ($feather->forum_settings['o_default_timezone'] == -8) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-08:00') ?></option>
-											<option value="-7"<?php if ($feather->forum_settings['o_default_timezone'] == -7) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-07:00') ?></option>
-											<option value="-6"<?php if ($feather->forum_settings['o_default_timezone'] == -6) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-06:00') ?></option>
-											<option value="-5"<?php if ($feather->forum_settings['o_default_timezone'] == -5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-05:00') ?></option>
-											<option value="-4"<?php if ($feather->forum_settings['o_default_timezone'] == -4) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-04:00') ?></option>
-											<option value="-3.5"<?php if ($feather->forum_settings['o_default_timezone'] == -3.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-03:30') ?></option>
-											<option value="-3"<?php if ($feather->forum_settings['o_default_timezone'] == -3) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-03:00') ?></option>
-											<option value="-2"<?php if ($feather->forum_settings['o_default_timezone'] == -2) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-02:00') ?></option>
-											<option value="-1"<?php if ($feather->forum_settings['o_default_timezone'] == -1) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-01:00') ?></option>
-											<option value="0"<?php if ($feather->forum_settings['o_default_timezone'] == 0) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC') ?></option>
-											<option value="1"<?php if ($feather->forum_settings['o_default_timezone'] == 1) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+01:00') ?></option>
-											<option value="2"<?php if ($feather->forum_settings['o_default_timezone'] == 2) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+02:00') ?></option>
-											<option value="3"<?php if ($feather->forum_settings['o_default_timezone'] == 3) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+03:00') ?></option>
-											<option value="3.5"<?php if ($feather->forum_settings['o_default_timezone'] == 3.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+03:30') ?></option>
-											<option value="4"<?php if ($feather->forum_settings['o_default_timezone'] == 4) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+04:00') ?></option>
-											<option value="4.5"<?php if ($feather->forum_settings['o_default_timezone'] == 4.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+04:30') ?></option>
-											<option value="5"<?php if ($feather->forum_settings['o_default_timezone'] == 5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:00') ?></option>
-											<option value="5.5"<?php if ($feather->forum_settings['o_default_timezone'] == 5.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:30') ?></option>
-											<option value="5.75"<?php if ($feather->forum_settings['o_default_timezone'] == 5.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:45') ?></option>
-											<option value="6"<?php if ($feather->forum_settings['o_default_timezone'] == 6) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+06:00') ?></option>
-											<option value="6.5"<?php if ($feather->forum_settings['o_default_timezone'] == 6.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+06:30') ?></option>
-											<option value="7"<?php if ($feather->forum_settings['o_default_timezone'] == 7) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+07:00') ?></option>
-											<option value="8"<?php if ($feather->forum_settings['o_default_timezone'] == 8) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+08:00') ?></option>
-											<option value="8.75"<?php if ($feather->forum_settings['o_default_timezone'] == 8.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+08:45') ?></option>
-											<option value="9"<?php if ($feather->forum_settings['o_default_timezone'] == 9) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+09:00') ?></option>
-											<option value="9.5"<?php if ($feather->forum_settings['o_default_timezone'] == 9.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+09:30') ?></option>
-											<option value="10"<?php if ($feather->forum_settings['o_default_timezone'] == 10) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+10:00') ?></option>
-											<option value="10.5"<?php if ($feather->forum_settings['o_default_timezone'] == 10.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+10:30') ?></option>
-											<option value="11"<?php if ($feather->forum_settings['o_default_timezone'] == 11) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+11:00') ?></option>
-											<option value="11.5"<?php if ($feather->forum_settings['o_default_timezone'] == 11.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+11:30') ?></option>
-											<option value="12"<?php if ($feather->forum_settings['o_default_timezone'] == 12) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+12:00') ?></option>
-											<option value="12.75"<?php if ($feather->forum_settings['o_default_timezone'] == 12.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+12:45') ?></option>
-											<option value="13"<?php if ($feather->forum_settings['o_default_timezone'] == 13) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+13:00') ?></option>
-											<option value="14"<?php if ($feather->forum_settings['o_default_timezone'] == 14) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+14:00') ?></option>
-										</select>
-										<span><?php _e('Timezone help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('DST label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather->forum_settings['o_default_dst'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather->forum_settings['o_default_dst'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('DST help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Language label') ?></th>
-									<td>
-										<select name="form_default_lang">
-                                            <?php echo $languages; ?>
-										</select>
-										<span><?php _e('Language help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Default style label') ?></th>
-									<td>
-										<select name="form_default_style">
-											<?php echo $styles; ?>
-										</select>
-										<span><?php _e('Default style help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-    $diff = ($feather->user->timezone + $feather->user->dst) * 3600;
-    $timestamp = time() + $diff;
-
-?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Timeouts subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Time format label') ?></th>
-									<td>
-										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo $feather->utils->escape($feather->forum_settings['o_time_format']) ?>" />
-										<span><?php printf(__('Time format help'), gmdate($feather->forum_settings['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Date format label') ?></th>
-									<td>
-										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo $feather->utils->escape($feather->forum_settings['o_date_format']) ?>" />
-										<span><?php printf(__('Date format help'), gmdate($feather->forum_settings['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Visit timeout label') ?></th>
-									<td>
-										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_visit'] ?>" />
-										<span><?php _e('Visit timeout help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Online timeout label') ?></th>
-									<td>
-										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_online'] ?>" />
-										<span><?php _e('Online timeout help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Redirect time label') ?></th>
-									<td>
-										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_redirect_delay'] ?>" />
-										<span><?php _e('Redirect time help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Display subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Version number label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather->forum_settings['o_show_version'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather->forum_settings['o_show_version'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Version number help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Info in posts label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather->forum_settings['o_show_user_info'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather->forum_settings['o_show_user_info'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Info in posts help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Post count label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather->forum_settings['o_show_post_count'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather->forum_settings['o_show_post_count'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Post count help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Smilies label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather->forum_settings['o_smilies'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather->forum_settings['o_smilies'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Smilies help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Smilies sigs label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather->forum_settings['o_smilies_sig'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather->forum_settings['o_smilies_sig'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Smilies sigs help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Clickable links label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather->forum_settings['o_make_links'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather->forum_settings['o_make_links'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Clickable links help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Topic review label') ?></th>
-									<td>
-										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_topic_review'] ?>" />
-										<span><?php _e('Topic review help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Topics per page label') ?></th>
-									<td>
-										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_topics_default'] ?>" />
-										<span><?php _e('Topics per page help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Posts per page label') ?></th>
-									<td>
-										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_posts_default'] ?>" />
-										<span><?php _e('Posts per page help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Indent label') ?></th>
-									<td>
-										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_indent_num_spaces'] ?>" />
-										<span><?php _e('Indent help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Quote depth label') ?></th>
-									<td>
-										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_quote_depth'] ?>" />
-										<span><?php _e('Quote depth help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Features subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Quick post label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather->forum_settings['o_quickpost'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather->forum_settings['o_quickpost'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Quick post help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Users online label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather->forum_settings['o_users_online'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather->forum_settings['o_users_online'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Users online help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><a name="censoring"></a><?php _e('Censor words label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather->forum_settings['o_censoring'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.$feather->url->get('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><a name="signatures"></a><?php _e('Signatures label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather->forum_settings['o_signatures'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather->forum_settings['o_signatures'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Signatures help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('User has posted label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather->forum_settings['o_show_dot'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather->forum_settings['o_show_dot'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('User has posted help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Topic views label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather->forum_settings['o_topic_views'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather->forum_settings['o_topic_views'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Topic views help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Quick jump label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather->forum_settings['o_quickjump'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather->forum_settings['o_quickjump'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Quick jump help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('GZip label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather->forum_settings['o_gzip'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather->forum_settings['o_gzip'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('GZip help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Search all label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather->forum_settings['o_search_all_forums'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather->forum_settings['o_search_all_forums'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Search all help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Menu items label') ?></th>
-									<td>
-										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
-										<span><?php _e('Menu items help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Feed subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Default feed label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather->forum_settings['o_feed_type'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('None') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather->forum_settings['o_feed_type'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('RSS') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather->forum_settings['o_feed_type'] == '2') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Atom') ?></strong></label>
-										<span class="clearb"><?php _e('Default feed help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Feed TTL label') ?></th>
-									<td>
-										<select name="form_feed_ttl">
-											<option value="0"<?php if ($feather->forum_settings['o_feed_ttl'] == '0') {
-    echo ' selected="selected"';
-} ?>><?php _e('No cache') ?></option>
-											<?php echo $times ?>
-										</select>
-										<span><?php _e('Feed TTL help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Reports subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Reporting method label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather->forum_settings['o_report_method'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Internal') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather->forum_settings['o_report_method'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('By e-mail') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather->forum_settings['o_report_method'] == '2') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Both') ?></strong></label>
-										<span class="clearb"><?php _e('Reporting method help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Mailing list label') ?></th>
-									<td>
-										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_mailing_list']) ?></textarea>
-										<span><?php _e('Mailing list help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Avatars subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Use avatars label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather->forum_settings['o_avatars'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather->forum_settings['o_avatars'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Use avatars help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Upload directory label') ?></th>
-									<td>
-										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo $feather->utils->escape($feather->forum_settings['o_avatars_dir']) ?>" />
-										<span><?php _e('Upload directory help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max width label') ?></th>
-									<td>
-										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_width'] ?>" />
-										<span><?php _e('Max width help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max height label') ?></th>
-									<td>
-										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_height'] ?>" />
-										<span><?php _e('Max height help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max size label') ?></th>
-									<td>
-										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
-										<span><?php _e('Max size help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('E-mail subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Admin e-mail label') ?></th>
-									<td>
-										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo $feather->utils->escape($feather->forum_settings['o_admin_email']) ?>" />
-										<span><?php _e('Admin e-mail help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
-									<td>
-										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo $feather->utils->escape($feather->forum_settings['o_webmaster_email']) ?>" />
-										<span><?php _e('Webmaster e-mail help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Forum subscriptions label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Forum subscriptions help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Topic subscriptions label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Topic subscriptions help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('SMTP address label') ?></th>
-									<td>
-										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo $feather->utils->escape($feather->forum_settings['o_smtp_host']) ?>" />
-										<span><?php _e('SMTP address help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('SMTP username label') ?></th>
-									<td>
-										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo $feather->utils->escape($feather->forum_settings['o_smtp_user']) ?>" />
-										<span><?php _e('SMTP username help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('SMTP password label') ?></th>
-									<td>
-										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
-<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key($feather->utils->strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
-										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
-										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
-										<span><?php _e('SMTP password help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('SMTP SSL label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather->forum_settings['o_smtp_ssl'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather->forum_settings['o_smtp_ssl'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('SMTP SSL help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Registration subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Allow new label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather->forum_settings['o_regs_allow'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather->forum_settings['o_regs_allow'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Allow new help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Verify label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather->forum_settings['o_regs_verify'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather->forum_settings['o_regs_verify'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Verify help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Report new label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather->forum_settings['o_regs_report'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather->forum_settings['o_regs_report'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Report new help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Use rules label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather->forum_settings['o_rules'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather->forum_settings['o_rules'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Use rules help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Rules label') ?></th>
-									<td>
-										<textarea name="form_rules_message" rows="10" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_rules_message']) ?></textarea>
-										<span><?php _e('Rules help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('E-mail default label') ?></th>
-									<td>
-										<span><?php _e('E-mail default help') ?></span>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather->forum_settings['o_default_email_setting'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<?php _e('Display e-mail label') ?></label>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather->forum_settings['o_default_email_setting'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<?php _e('Hide allow form label') ?></label>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather->forum_settings['o_default_email_setting'] == '2') {
-    echo ' checked="checked"';
-} ?> />&#160;<?php _e('Hide both label') ?></label>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Announcement subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Display announcement label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather->forum_settings['o_announcement'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather->forum_settings['o_announcement'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Display announcement help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Announcement message label') ?></th>
-									<td>
-										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_announcement_message']) ?></textarea>
-										<span><?php _e('Announcement message help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Maintenance subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><a name="maintenance"></a><?php _e('Maintenance mode label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather->forum_settings['o_maintenance'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather->forum_settings['o_maintenance'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Maintenance mode help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Maintenance message label') ?></th>
-									<td>
-										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
-										<span><?php _e('Maintenance message help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
diff --git a/style/themes/MyFeatherBB/view/admin/parser.php b/style/themes/MyFeatherBB/view/admin/parser.php
deleted file mode 100644
index 35ee0cbe..00000000
--- a/style/themes/MyFeatherBB/view/admin/parser.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php echo $lang_admin_parser['Parser head'] ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/parser/') ?>" enctype="multipart/form-data">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop">
-					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
-					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
-				</p>
-				<div class="inform">
-					<input type="hidden" name="form_sent" value="1" />
-					<fieldset>
-						<legend><?php echo $lang_admin_parser['Config subhead'] ?></legend>
-						<div class="infldset">
-							<table class="aligntop" cellspacing="0">
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['textile'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[textile]" value="1"<?php if ($config['textile']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[textile]" value="0"<?php if (!$config['textile']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['textile help'] ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['quote_links'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[quote_links]" value="1"<?php if ($config['quote_links']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_links]" value="0"<?php if (!$config['quote_links']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['quote_links help'] ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['quote_imgs'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[quote_imgs]" value="1"<?php if ($config['quote_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_imgs]" value="0"<?php if (!$config['quote_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['quote_imgs help'] ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['click_imgs'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[click_imgs]" value="1"<?php if ($config['click_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[click_imgs]" value="0"<?php if (!$config['click_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['click_imgs help'] ?></span>
-									</td>
-								</tr>
-
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['valid_imgs'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[valid_imgs]" value="1"<?php if ($config['valid_imgs']) {
-    echo ' checked="checked"';
-} if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php _e('Yes') ?></strong>
-										<input type="radio" name="config[valid_imgs]" value="0"<?php if (!$config['valid_imgs']) {
-    echo ' checked="checked"';
-} if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td><?php echo $lang_admin_parser['valid_imgs help'] ?></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['max_size'] ?></th>
-									<td colspan="2">
-										<input type="text" name="config[max_size]" size="10" maxlength="8" value="<?php echo($config['max_size'])?>"<?php if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
-} ?> />
-									</td>
-									<td><span><?php echo $lang_admin_parser['max_size help'] ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['def_xy'] ?></th>
-									<td>
-										<input type="text" name="config[def_width]" size="5" maxlength="5" value="<?php echo $config['def_width'] ?>" /> X:Width
-									</td>
-									<td>
-										<input type="text" name="config[def_height]" size="5" maxlength="5" value="<?php echo $config['def_height'] ?>" /> Y:Height
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['def_xy help'] ?></span>
-									</td>
-								</tr>
-
-
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['max_xy'] ?></th>
-									<td>
-										<input type="text" name="config[max_width]" size="5" maxlength="5" value="<?php echo $config['max_width'] ?>" /> X:Width
-									</td>
-									<td>
-										<input type="text" name="config[max_height]" size="5" maxlength="5" value="<?php echo $config['max_height'] ?>" /> Y:Height
-									</td>
-									<td><?php echo $lang_admin_parser['max_xy help'] ?></td>
-								</tr>
-
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['smiley_size'] ?></th>
-									<td colspan=2>
-										<input type="text" name="config[smiley_size]" size="5" maxlength="5" value="<?php echo $config['smiley_size'] .'%' ?>" />
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['smiley_size help'] ?></span>
-									</td>
-								</tr>
-
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php echo $lang_admin_parser['Smilies subhead'] ?></legend>
-						<div class="infldset">
-							<table cellspacing="0">
-							<thead>
-								<tr>
-									<th scope="col"><?php echo $lang_admin_parser['smiley_text_label'] ?></th>
-									<th scope="col"><?php echo $lang_admin_parser['smiley_file_label'] ?></th>
-									<th scope="col">:)</th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-    foreach ($smilies as $key => $value) {
-        $i++;
-        $oldfile = $value['file'];
-        ?>
-								<tr>
-									<td><input type="text" name="smiley_text[<?php echo($i);
-        ?>]" value="<?php echo($feather->utils->escape($key));
-        ?>" size="20" maxlength="80" /></td>
-									<td>
-										<select name="smiley_file[<?php echo($i);
-        ?>]">
-<?php
-        foreach ($smiley_files as $file) {
-            if ($file === $oldfile) {
-                echo("\t\t\t\t\t\t\t\t\t\t\t<option selected=\"selected\">" . $file . "</option>\n");
-            } else {
-                echo("\t\t\t\t\t\t\t\t\t\t\t<option>" . $file . "</option>\n");
-            }
-        }
-        ?>
-										</select>
-									</td>
-									<td>
-										<?php echo($value['html']);
-        ?>
-									</td>
-								</tr>
-<?php
-
-    }
-?>
-								<tr>
-									<td><input type="text" name="smiley_text[<?php echo(++$i); ?>]" value="" size="20" maxlength="80" /><br />New smiley text</td>
-									<td>
-										<select name="smiley_file[<?php echo($i); ?>]">
-											<option selected="selected">select new file</option>
-<?php
-        foreach ($smiley_files as $file) {
-            echo("\t\t\t\t\t\t\t\t\t\t\t<option>" . $file . "</option>\n");
-        }
-?>
-										</select><br /><?php echo($lang_admin_parser['New smiley image']); ?>
-									</td>
-									<td></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo($lang_admin_parser['smiley_upload']); ?></th>
- <?php if (ini_get('file_uploads')) {
-    ?>
-									<td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
-										<input type="file" name="new_smiley" id="upload_smiley" /></td>
-									<td><input type="submit" name="upload" value="<?php echo($lang_admin_parser['upload_button']);
-    ?>" /></td>
-<?php 
-} else {
-    ?>
-									<td colspan="2"><?php echo($lang_admin_parser['upload_off']);
-    ?></td>
-<?php 
-} ?>
-								</tr>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-
-
-
-				<div class="inform">
-					<fieldset>
-						<legend><?php echo $lang_admin_parser['BBCodes subhead'] ?></legend>
-						<div class="infldset">
-							<table cellspacing="0">
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php echo $lang_admin_parser['tagname_label'] ?></th>
-									<th class="tc3" scope="col"><?php echo $lang_admin_parser['in_post_label'] ?></th>
-									<th class="hidehead" scope="col"><?php echo $lang_admin_parser['in_sig_label'] ?></th>
-									<th class="tc2" scope="col"><?php echo $lang_admin_parser['depth_max'] ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-foreach ($bbcd as $tagname => $tagdata) {
-    if ($tagname == '_ROOT_') {
-        continue;
-    } // Skip last pseudo-tag
-    $title = isset($lang_admin_parser['tag_summary'][$tagname]) ?
-                $lang_admin_parser['tag_summary'][$tagname] : '';
-    ?>
-								<tr>
-									<th scope="row" title="<?php echo($title);
-    ?>"><?php echo('['. $tagname .']') ?></th>
-									<td>
-										<input type="radio" name="<?php echo($tagname) ?>_in_post" value="1"<?php if ($bbcd[$tagname]['in_post']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_post" value="0"<?php if (!$bbcd[$tagname]['in_post']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<input type="radio" name="<?php echo($tagname) ?>_in_sig" value="1"<?php if ($bbcd[$tagname]['in_sig']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_sig" value="0"<?php if (!$bbcd[$tagname]['in_sig']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<input type="text" size="10" name="<?php echo($tagname) ?>_depth_max" value="<?php echo($bbcd[$tagname]['depth_max']);
-    ?>" <?php if ($tagdata['html_type'] === 'inline' || $tagdata['tag_type'] === 'hidden') {
-    echo(' disabled="disabled" style="display: none;"');
-}
-    ?> />
-									</td>
-								</tr>
-<?php 
-} ?>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-
-
-				<p class="submitend">
-					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
-					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
-				</p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/permissions.php b/style/themes/MyFeatherBB/view/admin/permissions.php
deleted file mode 100644
index 1fe92218..00000000
--- a/style/themes/MyFeatherBB/view/admin/permissions.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Permissions head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/permissions/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-				<div class="inform">
-					<input type="hidden" name="form_sent" value="1" />
-					<fieldset>
-						<legend><?php _e('Posting subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('BBCode label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather->forum_settings['p_message_bbcode'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather->forum_settings['p_message_bbcode'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('BBCode help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Image tag label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather->forum_settings['p_message_img_tag'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather->forum_settings['p_message_img_tag'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Image tag help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('All caps message label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather->forum_settings['p_message_all_caps'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather->forum_settings['p_message_all_caps'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('All caps message help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('All caps subject label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather->forum_settings['p_subject_all_caps'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather->forum_settings['p_subject_all_caps'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('All caps subject help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Require e-mail label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather->forum_settings['p_force_guest_email'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather->forum_settings['p_force_guest_email'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Require e-mail help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Signatures subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('BBCode sigs label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather->forum_settings['p_sig_bbcode'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather->forum_settings['p_sig_bbcode'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('BBCode sigs help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Image tag sigs label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather->forum_settings['p_sig_img_tag'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather->forum_settings['p_sig_img_tag'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Image tag sigs help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('All caps sigs label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather->forum_settings['p_sig_all_caps'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather->forum_settings['p_sig_all_caps'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('All caps sigs help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max sig length label') ?></th>
-									<td>
-										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather->forum_settings['p_sig_length'] ?>" />
-										<span class="clearb"><?php _e('Max sig length help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max sig lines label') ?></th>
-									<td>
-										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather->forum_settings['p_sig_lines'] ?>" />
-										<span class="clearb"><?php _e('Max sig lines help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Registration subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Banned e-mail label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather->forum_settings['p_allow_banned_email'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather->forum_settings['p_allow_banned_email'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Banned e-mail help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Duplicate e-mail label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Duplicate e-mail help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/plugins.php b/style/themes/MyFeatherBB/view/admin/plugins.php
deleted file mode 100644
index c09245ed..00000000
--- a/style/themes/MyFeatherBB/view/admin/plugins.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-<div class="block">
-    <h2>Plugins</h2>
-    <div class="box">
-        <div class="inbox">
-            <table class="table">
-                <caption>The following plugins are available</caption>
-                <thead>
-                    <tr>
-                        <th>Extension</th>
-                        <th>Description</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <?php foreach ($pluginsList as $plugin => $class) : ?>
-                        <tr>
-                            <td>
-                                <strong><?= $class::$name; ?></strong>
-                                <div class="plugin-actions">
-                                    <?php if (array_key_exists($class, $activePlugins)) { ?>
-                                        <a href="<?= $feather->url->get('/admin/plugins/deactivate?plugin='.$class) ?>">Deactivate</a>
-                                    <?php } else { ?>
-                                        <a href="<?= $feather->url->get('/admin/plugins/activate?plugin='.$class) ?>">Activate</a>
-                                    <?php } ?>
-                                </div>
-                            </td>
-                            <td>
-                                <?= $class::$description; ?>
-                                <div class="plugin-details">
-                                    Version <?= $class::$version; ?> |
-                                    By <?= $class::$author; ?>
-                                </div>
-                            </td>
-                        </tr>
-                    <?php endforeach; ?>
-                </tbody>
-            </table>
-            <p style="text-align:right"><?= count($pluginsList) ?> éléments</p>
-        </div>
-    </div>
-</div>
-
-	<div class="clearer"></div>
-</div>
diff --git a/style/themes/MyFeatherBB/view/admin/reports.php b/style/themes/MyFeatherBB/view/admin/reports.php
deleted file mode 100644
index b364bfdc..00000000
--- a/style/themes/MyFeatherBB/view/admin/reports.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('New reports head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?= $feather->url->get('admin/reports/') ?>">
-				<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
-<?php
-if (!empty($report_data)) {
-    foreach ($report_data as $report) {
-        ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php printf(__('Report subhead'), $feather->utils->format_time($report['created'])) ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?= $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
-									<td><?= str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-    }
-} else {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('None') ?></legend>
-						<div class="infldset">
-							<p><?php _e('No new reports') ?></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-}
-
-?>
-			</form>
-		</div>
-	</div>
-
-	<div class="blockform block2">
-		<h2><span><?php _e('Last 10 head') ?></span></h2>
-		<div class="box">
-			<div class="fakeform">
-<?php
-
-if (!empty($report_zapped_data)) {
-    foreach ($report_zapped_data as $report) {
-        ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.$feather->utils->escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Reason') ?></th>
-									<td><?= str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-    }
-} else {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('None') ?></legend>
-						<div class="infldset">
-							<p><?php _e('No zapped reports') ?></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-}
-
-?>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
diff --git a/style/themes/MyFeatherBB/view/admin/statistics.php b/style/themes/MyFeatherBB/view/admin/statistics.php
deleted file mode 100644
index f2fd7a9a..00000000
--- a/style/themes/MyFeatherBB/view/admin/statistics.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="block">
-		<h2><span><?php _e('Server statistics head') ?></span></h2>
-		<div id="adstats" class="box">
-			<div class="inbox">
-				<dl>
-					<dt><?php _e('Server load label') ?></dt>
-					<dd>
-						<?php printf(__('Server load data')."\n", $server_load, $num_online) ?>
-					</dd>
-<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
-					<dd>
-						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
-						<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->url->get('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
-						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
-					</dd>
-					<dt><?php _e('Database label') ?></dt>
-					<dd>
-<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", $feather->utils->forum_number_format($total_records)) ?>
-						<br /><?php printf(__('Database data size')."\n", $total_size) ?>
-<?php endif; ?>					</dd>
-<?php endif; ?>
-				</dl>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/users/admin_users.php b/style/themes/MyFeatherBB/view/admin/users/admin_users.php
deleted file mode 100644
index 74a05472..00000000
--- a/style/themes/MyFeatherBB/view/admin/users/admin_users.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('User search head') ?></span></h2>
-		<div class="box">
-			<form id="find_user" method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
-				<p class="submittop"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="1" /></p>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('User search subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('User search info') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Username label') ?></th>
-									<td><input type="text" name="form[username]" size="25" maxlength="25" tabindex="2" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('E-mail address label') ?></th>
-									<td><input type="text" name="form[email]" size="30" maxlength="80" tabindex="3" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Title label') ?></th>
-									<td><input type="text" name="form[title]" size="30" maxlength="50" tabindex="4" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Real name label') ?></th>
-									<td><input type="text" name="form[realname]" size="30" maxlength="40" tabindex="5" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Website label') ?></th>
-									<td><input type="text" name="form[url]" size="35" maxlength="100" tabindex="6" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Jabber label') ?></th>
-									<td><input type="text" name="form[jabber]" size="30" maxlength="75" tabindex="7" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('ICQ label') ?></th>
-									<td><input type="text" name="form[icq]" size="12" maxlength="12" tabindex="8" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('MSN label') ?></th>
-									<td><input type="text" name="form[msn]" size="30" maxlength="50" tabindex="9" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('AOL label') ?></th>
-									<td><input type="text" name="form[aim]" size="20" maxlength="20" tabindex="10" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Yahoo label') ?></th>
-									<td><input type="text" name="form[yahoo]" size="20" maxlength="20" tabindex="11" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Location label') ?></th>
-									<td><input type="text" name="form[location]" size="30" maxlength="30" tabindex="12" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Signature label') ?></th>
-									<td><input type="text" name="form[signature]" size="35" maxlength="512" tabindex="13" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Admin note label') ?></th>
-									<td><input type="text" name="form[admin_note]" size="30" maxlength="30" tabindex="14" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Posts more than label') ?></th>
-									<td><input type="text" name="posts_greater" size="5" maxlength="8" tabindex="15" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Posts less than label') ?></th>
-									<td><input type="text" name="posts_less" size="5" maxlength="8" tabindex="16" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last post after label') ?></th>
-									<td><input type="text" name="last_post_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last post before label') ?></th>
-									<td><input type="text" name="last_post_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last visit after label') ?></th>
-									<td><input type="text" name="last_visit_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last visit before label') ?></th>
-									<td><input type="text" name="last_visit_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Registered after label') ?></th>
-									<td><input type="text" name="registered_after" size="24" maxlength="19" tabindex="19" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Registered before label') ?></th>
-									<td><input type="text" name="registered_before" size="24" maxlength="19" tabindex="20" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Order by label') ?></th>
-									<td>
-										<select name="order_by" tabindex="21">
-											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
-											<option value="email"><?php _e('Order by e-mail') ?></option>
-											<option value="num_posts"><?php _e('Order by posts') ?></option>
-											<option value="last_post"><?php _e('Order by last post') ?></option>
-											<option value="last_visit"><?php _e('Order by last visit') ?></option>
-											<option value="registered"><?php _e('Order by registered') ?></option>
-										</select>&#160;&#160;&#160;<select name="direction" tabindex="22">
-											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
-											<option value="DESC"><?php _e('Descending') ?></option>
-										</select>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('User group label') ?></th>
-									<td>
-										<select name="user_group" tabindex="23">
-											<option value="-1" selected="selected"><?php _e('All groups') ?></option>
-											<option value="0"><?php _e('Unverified users') ?></option>
-											<?php echo $group_list; ?>
-										</select>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="25" /></p>
-			</form>
-		</div>
-
-		<h2 class="block2"><span><?php _e('IP search head') ?></span></h2>
-		<div class="box">
-			<form method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('IP search subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('IP address label') ?><div><input type="submit" value="<?php _e('Find IP address') ?>" tabindex="26" /></div></th>
-									<td><input type="text" name="show_users" size="18" maxlength="15" tabindex="24" />
-									<span><?php _e('IP address help') ?></span></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/users/ban_users.php b/style/themes/MyFeatherBB/view/admin/users/ban_users.php
deleted file mode 100644
index 8e06caff..00000000
--- a/style/themes/MyFeatherBB/view/admin/users/ban_users.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Ban users') ?></span></h2>
-		<div class="box">
-			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Message expiry subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Ban message label') ?></th>
-									<td>
-										<input type="text" name="ban_message" size="50" maxlength="255" tabindex="1" />
-										<span><?php _e('Ban message help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Expire date label') ?></th>
-									<td>
-										<input type="text" name="ban_expire" size="17" maxlength="10" tabindex="2" />
-										<span><?php _e('Expire date help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Ban IP label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="3" value="1" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="4" value="0" checked="checked" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Ban IP help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="ban_users_comply" value="<?php _e('Save') ?>" tabindex="3" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/users/delete_users.php b/style/themes/MyFeatherBB/view/admin/users/delete_users.php
deleted file mode 100644
index 1a4360c6..00000000
--- a/style/themes/MyFeatherBB/view/admin/users/delete_users.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Delete users') ?></span></h2>
-		<div class="box">
-			<form name="confirm_del_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Confirm delete legend') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Confirm delete info') ?></p>
-							<div class="rbox">
-								<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
-							</div>
-							<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="delete_users_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/users/find_users.php b/style/themes/MyFeatherBB/view/admin/users/find_users.php
deleted file mode 100644
index 3ddd2324..00000000
--- a/style/themes/MyFeatherBB/view/admin/users/find_users.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-
-<form id="search-users-form" action="<?php echo $feather->url->get('admin/users/') ?>" method="post">
-<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<div id="users2" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
-					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
-					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
-<?php if ($can_action): ?>					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
-<?php endif;
-    ?>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-    if (!empty($user_data)) {
-        foreach ($user_data as $user) {
-            ?>
-				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.$feather->utils->escape($user['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo $feather->utils->escape($user['email']) ?>"><?php echo $feather->utils->escape($user['email']) ?></a></td>
-					<td class="tc3"><?php echo $user['user_title'] ?></td>
-					<td class="tc4"><?php echo $feather->utils->forum_number_format($user['num_posts']) ?></td>
-					<td class="tc5"><?php echo($user['admin_note'] != '') ? $feather->utils->escape($user['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
-<?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
-<?php endif;
-            ?>
-				</tr>
-<?php
-
-        }
-    } else {
-        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('No match').'</td></tr>'."\n";
-    }
-
-    ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-<?php if ($can_action): ?>			<p class="conr modbuttons"><a href="#" onclick="return select_checkboxes('search-users-form', this, '<?php _e('Unselect all') ?>')"><?php _e('Select all') ?></a> <?php if ($can_ban) : ?><input type="submit" name="ban_users" value="<?php _e('Ban') ?>" /><?php endif;
-    if ($can_delete) : ?><input type="submit" name="delete_users" value="<?php _e('Delete') ?>" /><?php endif;
-    if ($can_move) : ?><input type="submit" name="move_users" value="<?php _e('Change group') ?>" /><?php endif;
-    ?></p>
-<?php endif;
-    ?>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
-</form>
diff --git a/style/themes/MyFeatherBB/view/admin/users/move_users.php b/style/themes/MyFeatherBB/view/admin/users/move_users.php
deleted file mode 100644
index a2f96b91..00000000
--- a/style/themes/MyFeatherBB/view/admin/users/move_users.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Move users') ?></span></h2>
-		<div class="box">
-			<form name="confirm_move_users" method="post" action="<?php echo $feather->url->get('admin/users/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Move users subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('New group label') ?></th>
-									<td>
-										<select name="new_group" tabindex="1">
-<?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo $feather->utils->escape($group) ?></option>
-<?php endforeach;
-    ?>
-										</select>
-										<span><?php _e('New group help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="move_users_comply" value="<?php _e('Save') ?>" tabindex="2" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/users/search_ip.php b/style/themes/MyFeatherBB/view/admin/users/search_ip.php
deleted file mode 100644
index a4db0174..00000000
--- a/style/themes/MyFeatherBB/view/admin/users/search_ip.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="users1" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results IP address head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results last used head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results times found head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results action head') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-        foreach ($ip_data as $ip) {
-            ?>
-				<tr>
-					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.$feather->utils->escape($ip['poster_ip']).'/') ?>"><?php echo $feather->utils->escape($ip['poster_ip']) ?></a></td>
-					<td class="tc2"><?php echo $feather->utils->format_time($ip['last_used']) ?></td>
-					<td class="tc3"><?php echo $ip['used_times'] ?></td>
-					<td class="tcr"><a href="<?php echo $feather->url->get('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
-				</tr>
-<?php
-
-        }
-        if (empty($ip_data)):
-            echo "\t\t\t\t".'<tr><td class="tcl" colspan="4">'.__('Results no posts found').'</td></tr>'."\n";
-        endif;
-
-    ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/admin/users/show_users.php b/style/themes/MyFeatherBB/view/admin/users/show_users.php
deleted file mode 100644
index 99fccb06..00000000
--- a/style/themes/MyFeatherBB/view/admin/users/show_users.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="users2" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
-					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
-					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-    if ($info['num_posts']) {
-
-        // Loop through users and print out some info
-        foreach ($info['posters'] as $cur_poster) {
-            if (isset($info['user_data'][$cur_poster['poster_id']])) {
-                ?>
-				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.$feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
-					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
-					<td class="tc4"><?php echo $feather->utils->forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
-					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
-				</tr>
-<?php
-
-            } else {
-                ?>
-				<tr>
-					<td class="tcl"><?php echo $feather->utils->escape($cur_poster['poster']) ?></td>
-					<td class="tc2">&#160;</td>
-					<td class="tc3"><?php _e('Results guest') ?></td>
-					<td class="tc4">&#160;</td>
-					<td class="tc5">&#160;</td>
-					<td class="tcr">&#160;</td>
-				</tr>
-<?php
-
-            }
-        }
-    } else {
-        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('Results no IP found').'</td></tr>'."\n";
-    }
-
-    ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/delete.php b/style/themes/MyFeatherBB/view/delete.php
deleted file mode 100644
index abfc0a7f..00000000
--- a/style/themes/MyFeatherBB/view/delete.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<div class="blockform">
-	<h2><span><?php _e('Delete post') ?></span></h2>
-	<div class="box">
-		<form method="post" action="<?php echo $feather->url->get('delete/'.$id.'/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.$feather->utils->escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
-					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
-				</div>
-			</div>
-			<p class="buttons"><input type="submit" name="delete" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
-
-<div id="postreview">
-	<div class="blockpost">
-		<div class="box">
-			<div class="inbox">
-				<div class="postbody">
-					<div class="postleft">
-						<dl>
-							<dt><strong><?php echo $feather->utils->escape($cur_post['poster']) ?></strong></dt>
-							<dd><span><?php echo $feather->utils->format_time($cur_post['posted']) ?></span></dd>
-						</dl>
-					</div>
-					<div class="postright">
-						<div class="postmsg">
-							<?php echo $cur_post['message']."\n" ?>
-						</div>
-					</div>
-				</div>
-				<div class="clearer"></div>
-			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/edit.php b/style/themes/MyFeatherBB/view/edit.php
deleted file mode 100644
index ea9c3abe..00000000
--- a/style/themes/MyFeatherBB/view/edit.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-$cur_index = 1;
-
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<?php
-
-// If there are errors, we display them
-if (!empty($errors)) :
-?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('Post errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('Post errors info') ?></p>
-			<ul class="error-list">
-<?php
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-?>
-			</ul>
-		</div>
-	</div>
-</div>
-<?php
-elseif ($feather->request->post('preview')):
-?>
-<div id="postpreview" class="blockpost">
-	<h2><span><?php _e('Post preview') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postright">
-					<div class="postmsg">
-						<?php echo $preview_message."\n" ?>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-<?php
-endif;
-?>
-<!-- Init BBcode editor toolbar -->
-<script>
-    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
-        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
-</script>
-<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
-<div id="editform" class="blockform">
-	<h2><span><?php _e('Edit post') ?></span></h2>
-	<div class="box">
-		<form id="edit" method="post" action="<?php echo $feather->url->get('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Edit post legend') ?></legend>
-					<input type="hidden" name="form_sent" value="1" />
-					<div class="infldset txtarea">
-<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo $feather->utils->escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
-						<script>postEditorToolbar('req_message');</script>
-                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo $feather->utils->escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
-						</ul>
-					</div>
-				</fieldset>
-			</div>
-<?php
-if (!empty($checkboxes)):
-?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Options') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php
-endif;
-?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/error.php b/style/themes/MyFeatherBB/view/error.php
deleted file mode 100644
index d638a206..00000000
--- a/style/themes/MyFeatherBB/view/error.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="msg" class="block error">
-    <h2><span><?= $msg_title ?></span></h2>
-    <div class="box">
-        <div class="inbox">
-            <p><?php echo $msg ?></p>
-            <?php if (!$no_back_link) {
-                echo "\t\t\t".'<p><a href="javascript: history.go(-1)">'.__('Go back').'</a></p>';
-            } ?>
-        </div>
-    </div>
-</div>
diff --git a/style/themes/MyFeatherBB/view/footer.new.php b/style/themes/MyFeatherBB/view/footer.new.php
deleted file mode 100644
index b66f807c..00000000
--- a/style/themes/MyFeatherBB/view/footer.new.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-?>
-</div>
-
-<div id="brdfooter" class="block">
-	<h2><span><?php _e('Board footer') ?></span></h2>
-	<div class="box">
-<?php
-
-if (isset($active_page) && ($active_page == 'viewforum' || $active_page == 'viewtopic') && $feather->user->is_admmod) {
-    echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
-
-    if ($active_page == 'viewforum') {
-        echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/forum/'.$fid.'/page/'.$page_number.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
-        echo "\t\t\t".'</dl>'."\n";
-    } elseif ($active_page == 'viewtopic') {
-        if (isset($pid)) {
-            $parameter = 'param/'.$pid.'/';
-        } elseif (isset($page_number) && $page_number != 1) {
-            $parameter = 'param/'.$page_number.'/';
-        } else {
-            $parameter = '';
-        }
-
-
-        echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/moderate/page/'.$page_number.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
-
-        if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
-        } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
-        }
-
-        if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
-        } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
-        }
-
-        echo "\t\t\t".'</dl>'."\n";
-    }
-
-    echo "\t\t\t".'<div class="clearer"></div>'."\n\t\t".'</div>'."\n";
-}
-
-?>
-		<div id="brdfooternav" class="inbox">
-
-<?php
-// Display the "Jump to" drop list
-if ($feather->forum_settings['o_quickjump'] == '1' && !empty($quickjump)) { ?>
-			<div class="conl">
-			<form id="qjump" method="get" action="">
-				<div><label><span><?php _e('Jump to') ?><br /></span></label>
-					<select name="id" onchange="window.location=('<?php echo $feather->url->get('forum/') ?>'+this.options[this.selectedIndex].value)">
-<?php
-		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
-			echo "\t\t\t\t\t\t\t".'<optgroup label="'.$feather->utils->escape($cat_data['cat_name']).'">'."\n";
-			foreach ($cat_data['cat_forums'] as $forum) {
-				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($fid == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
-			}
-			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
-		} ?>
-					</select>
-					<noscript><input type="submit" value="<?php _e('Go') ?>" accesskey="g" /></noscript>
-				</div>
-			</form>
-			</div>
-<?php } ?>
-
-			<div class="conr">
-<?php
-
-if ($active_page == 'index') {
-    if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
-    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
-    }
-} elseif ($active_page == 'viewforum') {
-    if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
-    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
-    }
-} elseif ($active_page == 'viewtopic') {
-    if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
-    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
-    }
-}
-
-?>
-				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather->forum_settings['o_show_version'] == '1') ? ' '.$feather->forum_settings['o_cur_version'] : '')) ?></p>
-			</div>
-			<div class="clearer"></div>
-		</div>
-	</div>
-</div>
-<?php
-
-// Display debug info (if enabled/defined)
-if (!empty($exec_info)) { ?>
-	<p id="debugtime">[ <?= sprintf(__('Querytime'), round($exec_info['exec_time'], 6), $exec_info['nb_queries']).' - '.sprintf(__('Memory usage'), $exec_info['mem_usage']).' '.sprintf(__('Peak usage'), $exec_info['mem_peak_usage'])?>]</p>
-<? }
-if (!empty($queries_info)) { ?>
-	<div id="debug" class="blocktable">
-		<h2><span><?php _e('Debug table') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<table>
-					<thead>
-						<tr>
-							<th class="tcl" scope="col"><?php _e('Query times') ?></th>
-							<th class="tcr" scope="col"><?php _e('Query') ?></th>
-						</tr>
-					</thead>
-					<tbody>
-<?php foreach ($queries_info['raw'] as $time => $sql) {
-	echo "\t\t\t\t\t\t".'<tr>'."\n";
-	echo "\t\t\t\t\t\t\t".'<td class="tcl">'.$feather->utils->escape(round($time, 8)).'</td>'."\n";
-	echo "\t\t\t\t\t\t\t".'<td class="tcr">'.$feather->utils->escape($sql).'</td>'."\n";
-	echo "\t\t\t\t\t\t".'</tr>'."\n";
-} ?>
-						<tr>
-							<td class="tcl" colspan="2"><?= sprintf(__('Total query time'), round($queries_info['total_time'], 7)).' s' ?></td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-		</div>
-	</div>
-<?php } ?>
-</section>
-</body>
-<!-- JS -->
-<?php foreach ($assets['js'] as $script) {
-    echo '<script ';
-    foreach ($script['params'] as $key => $value) {
-        echo $key.'="'.$value.'" ';
-    }
-    echo 'src="'.$feather->url->base().'/'.$script['file'].'"/></script>'."\n";
-} ?>
-</html>
diff --git a/style/themes/MyFeatherBB/view/footer.php b/style/themes/MyFeatherBB/view/footer.php
deleted file mode 100644
index 9e19de90..00000000
--- a/style/themes/MyFeatherBB/view/footer.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-?>
-</div>
-
-<div id="brdfooter" class="block">
-	<h2><span><?php _e('Board footer') ?></span></h2>
-	<div class="box">
-<?php
-
-if (isset($footer_style) && ($footer_style == 'viewforum' || $footer_style == 'viewtopic') && $is_admmod) {
-    echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
-
-    if ($footer_style == 'viewforum') {
-        echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
-        echo "\t\t\t".'</dl>'."\n";
-    } elseif ($footer_style == 'viewtopic') {
-        if (isset($pid)) {
-            $parameter = 'param/'.$pid.'/';
-        } elseif (isset($p) && $p != 1) {
-            $parameter = 'param/'.$p.'/';
-        } else {
-            $parameter = '';
-        }
-
-
-        echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
-
-        if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
-        } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
-        }
-
-        if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
-        } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
-        }
-
-        echo "\t\t\t".'</dl>'."\n";
-    }
-
-    echo "\t\t\t".'<div class="clearer"></div>'."\n\t\t".'</div>'."\n";
-}
-
-?>
-		<div id="brdfooternav" class="inbox">
-
-<?php
-// Display the "Jump to" drop list
-if ($feather->forum_settings['o_quickjump'] == '1' && !empty($quickjump)) { ?>
-			<div class="conl">
-			<form id="qjump" method="get" action="">
-				<div><label><span><?php _e('Jump to') ?><br /></span></label>
-					<select name="id" onchange="window.location=('<?php echo $feather->url->get('forum/') ?>'+this.options[this.selectedIndex].value)">
-<?php
-		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
-			echo "\t\t\t\t\t\t\t".'<optgroup label="'.$feather->utils->escape($cat_data['cat_name']).'">'."\n";
-			foreach ($cat_data['cat_forums'] as $forum) {
-				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
-			}
-			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
-		} ?>
-					</select>
-					<noscript><input type="submit" value="<?php _e('Go') ?>" accesskey="g" /></noscript>
-				</div>
-			</form>
-			</div>
-<?php } ?>
-
-			<div class="conr">
-<?php
-
-if ($footer_style == 'index') {
-    if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
-    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
-    }
-} elseif ($footer_style == 'viewforum') {
-    if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
-    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
-    }
-} elseif ($footer_style == 'viewtopic') {
-    if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
-    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
-    }
-}
-
-?>
-				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather->forum_settings['o_show_version'] == '1') ? ' '.$feather->forum_settings['o_cur_version'] : '')) ?></p>
-			</div>
-			<div class="clearer"></div>
-		</div>
-	</div>
-</div>
-<?php
-
-// Display debug info (if enabled/defined)
-if ($feather->forum_env['FEATHER_SHOW_INFO']) {
-    $feather->debug->info();
-}
-// Display executed queries (if enabled)
-if ($feather->forum_env['FEATHER_SHOW_QUERIES']) {
-    $feather->debug->queries();
-}
-?>
-
-</section>
-
-<script src="<?php echo $feather->url->base() ?>/style/themes/FeatherBB/phone.min.js"></script>
-
-</body>
-</html>
diff --git a/style/themes/MyFeatherBB/view/header.new.php b/style/themes/MyFeatherBB/view/header.new.php
deleted file mode 100644
index 4269d842..00000000
--- a/style/themes/MyFeatherBB/view/header.new.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-?>
-<!doctype html>
-<html lang="<?php _e('lang_identifier') ?>">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
-<?php if ($is_indexed) {
-    echo "\t".'<meta name="robots" content="noindex, follow">'."\n";
-} ?>
-    <title><?php echo generate_page_title($title, $page_number) ?></title>
-    <!-- Theme -->
-    <link rel="stylesheet" type="text/css" href="<?= $feather->url->base() ?>/style/themes/<?= $style ?>/style.css">
-<?php
-foreach($assets as $type => $items) {
-    if ($type == 'js') {
-        continue;
-    }
-    echo "\t".'<!-- '.ucfirst($type).' -->'."\n";
-    foreach ($items as $item) {
-        echo "\t".'<link ';
-        foreach ($item['params'] as $key => $value) {
-            echo $key.'="'.$value.'" ';
-        }
-        echo 'href="'.$feather->url->base().'/'.$item['file'].'">'."\n";
-    }
-}
-if ($admin_console) {
-    if (file_exists($feather->forum_env['FEATHER_ROOT'].'style/themes/'.$feather->user->style.'/base_admin.css')) {
-        echo "\t".'<link rel="stylesheet" type="text/css" href="'.$feather->url->base().'/style/themes/'.$feather->user->style.'/base_admin.css" />'."\n";
-    } else {
-        echo "\t".'<link rel="stylesheet" type="text/css" href="'.$feather->url->base().'/style/imports/base_admin.css" />'."\n";
-    }
-}
-if (isset($required_fields)) :
-    // Output JavaScript to validate form (make sure required fields are filled out)
-
-    ?>
-    <script type="text/javascript">
-        /* <![CDATA[ */
-        function process_form(the_form)
-        {
-            var required_fields = {
-                <?php
-                    // Output a JavaScript object with localised field names
-                    $tpl_temp = count($required_fields);
-                    foreach ($required_fields as $elem_orig => $elem_trans) {
-                        echo "\t\t\"".$elem_orig.'": "'.addslashes(str_replace('&#160;', ' ', $elem_trans));
-                        if (--$tpl_temp) {
-                            echo "\",\n";
-                        } else {
-                            echo "\"\n\t};\n";
-                        }
-                    }
-                    ?>
-                if (document.all || document.getElementById)
-            {
-                for (var i = 0; i < the_form.length; ++i)
-                {
-                    var elem = the_form.elements[i];
-                    if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
-                    {
-                        alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
-                        elem.focus();
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-        /* ]]> */
-    </script>
-    <?php
-endif;
-if (!empty($page_head)) :
-    echo implode("\n", $page_head)."\n";
-endif;
-?>
-</head>
-
-<body id="pun<?= $active_page ?>"<?= ($focus_element ? ' onload="document.getElementById(\''.$focus_element[0].'\').elements[\''.$focus_element[1].'\'].focus();"' : '')?>>
-<header>
-    <nav>
-        <div class="container">
-            <div class="phone-menu" id="phone-button">
-                <a class="button-phone"></a>
-            </div>
-            <div id="phone">
-                <div id="brdmenu" class="inbox">
-                    <ul>
-<?php
-echo "\t\t\t\t\t\t".'<li id="navindex"'.(($active_page == 'index') ? ' class="isactive"' : '').'><a href="'.$feather->url->base().'/">'.__('Index').'</a></li>'."\n";
-
-if ($feather->user->g_read_board == '1' && $feather->user->g_view_users == '1') {
-    echo "\t\t\t\t\t\t".'<li id="navuserlist"'.(($active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('userlist/').'">'.__('User list').'</a></li>'."\n";
-}
-
-if ($feather->forum_settings['o_rules'] == '1' && (!$feather->user->is_guest || $feather->user->g_read_board == '1' || $feather->forum_settings['o_regs_allow'] == '1')) {
-    echo "\t\t\t\t\t\t".'<li id="navrules"'.(($active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('rules/').'">'.__('Rules').'</a></li>'."\n";
-}
-
-if ($feather->user->g_read_board == '1' && $feather->user->g_search == '1') {
-    echo "\t\t\t\t\t\t".'<li id="navsearch"'.(($active_page == 'search') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('search/').'">'.__('Search').'</a></li>'."\n";
-}
-
-if ($feather->user->is_guest) {
-    echo "\t\t\t\t\t\t".'<li id="navregister"'.(($active_page == 'register') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('register/').'">'.__('Register').'</a></li>'."\n";
-    echo "\t\t\t\t\t\t".'<li id="navlogin"'.(($active_page == 'login') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('auth/login/').'">'.__('Login').'</a></li>'."\n";
-} else {
-    echo "\t\t\t\t\t\t".'<li id="navprofile"'.(($active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('user/'.$feather->user->id.'/').'">'.__('Profile').'</a></li>'."\n";
-
-    if ($feather->user->is_admmod) {
-        echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('admin/').'">'.__('Admin').'</a></li>'."\n";
-    }
-
-    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.$feather->url->get('auth/logout/token/'.\FeatherBB\Utils::feather_hash($feather->user->id.\FeatherBB\Utils::feather_hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
-}
-
-// // Are there any additional navlinks we should insert into the array before imploding it?
-// if ($feather->user->g_read_board == '1' && $feather->forum_settings['o_additional_navlinks'] != '') {
-//     if (preg_match_all('%([0-9]+)\s*=\s*(.*?)\n%s', $feather->forum_settings['o_additional_navlinks']."\n", $extra_links)) {
-//         // Insert any additional links into the $links array (at the correct index)
-//         $num_links = count($extra_links[1]);
-//         for ($i = 0; $i < $num_links; ++$i) {
-//             array_splice($links, $extra_links[1][$i], 0, array('<li id="navextra'.($i + 1).'">'.$extra_links[2][$i].'</li>'));
-//         }
-//     }
-// }
-?>
-                        </ul>
-                    </div>
-                <div class="navbar-right">
-                    <form method="get" action="/search" class="nav-search">
-                        <input type="hidden" name="action" value="search">
-                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php _e('Search') ?>">
-                    </form>
-                </div>
-            </div>
-        </div>
-    </nav>
-
-    <div class="container">
-        <div class="container-title-status">
-            <h1 class="title-site">
-                <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
-                    <p><?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?></p>
-                </a>
-                <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
-            </h1>
-            <div class="status-avatar">
-                <div id="brdwelcome" class="inbox">
-
-<?php
-if ($feather->user->is_guest) { ?>
-                    <p class="conl"><?= __('Not logged in')?></p>
-<?php } else {
-    echo "\t\t\t\t\t".'<ul class="conl">';
-    echo "\t\t\t\t\t\t".'<li><span>'.__('Logged in as').' <strong>'.$feather->utils->escape($feather->user->username).'</strong></span></li>'."\n";
-    echo "\t\t\t\t\t\t".'<li><span>'.sprintf(__('Last visit'), $feather->utils->format_time($feather->user->last_visit)).'</span></li>'."\n";
-
-    if ($feather->user->is_admmod) {
-        if ($feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2') {
-            if ($has_reports) {
-                echo "\t\t\t\t\t\t".'<li class="reportlink"><span><strong><a href="'.$feather->url->get('admin/reports/').'">'.__('New reports').'</a></strong></span></li>'."\n";
-            }
-        }
-
-        if ($feather->forum_settings['o_maintenance'] == '1') {
-            echo "\t\t\t\t\t\t".'<li class="maintenancelink"><span><strong><a href="'.$feather->url->get('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>'."\n";
-        }
-    }
-    echo "\t\t\t\t\t".'</ul>'."\n";
-}
-
-if ($feather->user->g_read_board == '1' && $feather->user->g_search == '1') {
-    echo "\t\t\t\t\t".'<ul class="conr">'."\n";
-    echo "\t\t\t\t\t\t".'<li><span>'.__('Topic searches').' ';
-    if (!$feather->user->is_guest) {
-        echo '<a href="'.$feather->url->get('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a> | ';
-        echo '<a href="'.$feather->url->get('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a> | ';
-    }
-    echo '<a href="'.$feather->url->get('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a> | ';
-    echo '<a href="'.$feather->url->get('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
-    echo '</li>'."\n";
-    echo "\t\t\t\t".'</ul>'."\n";
-} ?>
-                <div class="clearer"></div>
-                </div>
-            </div>
-            <div class="clear"></div>
-        </div>
-        <?php if ($feather->user->g_read_board == '1' && $feather->forum_settings['o_announcement'] == '1') : ?>
-        <div id="announce" class="block">
-            <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
-            <div class="box">
-                <div id="announce-block" class="inbox">
-                    <div class="usercontent"><?php echo $feather->forum_settings['o_announcement_message'] ?></div>
-                </div>
-            </div>
-        </div>
-    <?php endif; ?>
-        <?php if (!empty($flash->getMessages())) : ?>
-        <script type="text/javascript">
-            window.onload = function() {
-                var flashMessage = document.getElementById('flashmsg');
-                flashMessage.className = 'flashmsg '+flashMessage.getAttribute('data-type')+' show';
-                setTimeout(function () {
-                    flashMessage.className = 'flashmsg '+flashMessage.getAttribute('data-type');
-                }, 10000);
-                return false;
-            }
-        </script>
-        <?php foreach ($flash->getMessages() as $type => $message) { ?>
-        <div class="flashmsg info" data-type="<?= $type; ?>" id="flashmsg">
-            <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
-            <p><?= $feather->utils->escape($message) ?></p>
-        </div>
-        <?php } ?>
-        <?php endif; ?>
-    </div>
-</header>
-
-<section class="container">
-    <div id="brdmain">
diff --git a/style/themes/MyFeatherBB/view/header.php b/style/themes/MyFeatherBB/view/header.php
deleted file mode 100644
index b4dfdbdd..00000000
--- a/style/themes/MyFeatherBB/view/header.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php _e('lang_identifier') ?>" lang="<?php _e('lang_identifier') ?>" dir="<?php _e('lang_direction') ?>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
-<title><?php echo generate_page_title($page_title, $p) ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo $feather->url->base() ?>/style/<?php echo $feather->user->style.'.css' ?>" />
-<?php
-
-echo $allow_index;
-echo $admin_console;
-
-if (isset($required_fields)) :
-    // Output JavaScript to validate form (make sure required fields are filled out)
-
-    ?>
-    <script type="text/javascript">
-        /* <![CDATA[ */
-        function process_form(the_form)
-        {
-            var required_fields = {
-                <?php
-                    // Output a JavaScript object with localised field names
-                    $tpl_temp = count($required_fields);
-                    foreach ($required_fields as $elem_orig => $elem_trans) {
-                        echo "\t\t\"".$elem_orig.'": "'.addslashes(str_replace('&#160;', ' ', $elem_trans));
-                        if (--$tpl_temp) {
-                            echo "\",\n";
-                        } else {
-                            echo "\"\n\t};\n";
-                        }
-                    }
-                    ?>
-                if (document.all || document.getElementById)
-            {
-                for (var i = 0; i < the_form.length; ++i)
-                {
-                    var elem = the_form.elements[i];
-                    if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
-                    {
-                        alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
-                        elem.focus();
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-        /* ]]> */
-    </script>
-    <?php
-endif;
-if (!empty($page_head)) :
-    echo implode("\n", $page_head)."\n";
-endif;
-?>
-</head>
-
-<body id="pun<?= $active_page ?>"<?= $focus_element; ?>>
-
-<header>
-
-    <nav>
-        <div class="container">
-            <div class="phone-menu" id="phone-button">
-                <a class="button-phone"></a>
-            </div>
-            <div id="phone">
-                <?php echo $navlinks ?>
-                <div class="navbar-right">
-                    <form method="get" action="/search" class="nav-search">
-                        <input type="hidden" name="action" value="search">
-                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php _e('Search') ?>">
-                    </form>
-                </div>
-            </div>
-        </div>
-    </nav>
-
-    <div class="container">
-        <div class="container-title-status">
-            <h1 class="title-site">
-                <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
-                    <p><?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?></p>
-                </a>
-                <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
-            </h1>
-            <div class="status-avatar">
-                <?php echo $page_info ?>
-            </div>
-            <div class="clear"></div>
-        </div>
-        <?php if ($feather->user->g_read_board == '1' && $feather->forum_settings['o_announcement'] == '1') : ?>
-            <div id="announce" class="block">
-                <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
-                <div class="box">
-                    <div id="announce-block" class="inbox">
-                        <div class="usercontent"><?php echo $feather->forum_settings['o_announcement_message'] ?></div>
-                    </div>
-                </div>
-            </div>
-        <?php endif; ?>
-        <?php if (!empty($flash->getMessages())) : ?>
-        <script type="text/javascript">
-            window.onload = function() {
-                var flashMessage = document.getElementById('flashmsg');
-                flashMessage.className = 'flashmsg '+flashMessage.getAttribute('data-type')+' show';
-                setTimeout(function () {
-                    flashMessage.className = 'flashmsg '+flashMessage.getAttribute('data-type');
-                }, 10000);
-                return false;
-            }
-        </script>
-        <?php foreach ($flash->getMessages() as $type => $message) { ?>
-        <div class="flashmsg info" data-type="<?= $type; ?>" id="flashmsg">
-            <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
-            <p><?= $feather->utils->escape($message) ?></p>
-        </div>
-        <?php } ?>
-        <?php endif; ?>
-    </div>
-
-</header>
-
-<section class="container">
-    <div id="brdmain">
diff --git a/style/themes/MyFeatherBB/view/help.php b/style/themes/MyFeatherBB/view/help.php
deleted file mode 100644
index 9644da0d..00000000
--- a/style/themes/MyFeatherBB/view/help.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<h2><span><?php _e('BBCode') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><a name="bbcode"></a><?php _e('BBCode info 1') ?></p>
-		<p><?php _e('BBCode info 2') ?></p>
-	</div>
-</div>
-<h2><span><?php _e('Text style') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Text style info') ?></p>
-		<p><code>[b]<?php _e('Bold text') ?>[/b]</code> <?php _e('produces') ?> <samp><strong><?php _e('Bold text') ?></strong></samp></p>
-		<p><code>[u]<?php _e('Underlined text') ?>[/u]</code> <?php _e('produces') ?> <samp><span class="bbu"><?php _e('Underlined text') ?></span></samp></p>
-		<p><code>[i]<?php _e('Italic text') ?>[/i]</code> <?php _e('produces') ?> <samp><em><?php _e('Italic text') ?></em></samp></p>
-		<p><code>[s]<?php _e('Strike-through text') ?>[/s]</code> <?php _e('produces') ?> <samp><span class="bbs"><?php _e('Strike-through text') ?></span></samp></p>
-		<p><code>[del]<?php _e('Deleted text') ?>[/del]</code> <?php _e('produces') ?> <samp><del><?php _e('Deleted text') ?></del></samp></p>
-		<p><code>[ins]<?php _e('Inserted text') ?>[/ins]</code> <?php _e('produces') ?> <samp><ins><?php _e('Inserted text') ?></ins></samp></p>
-		<p><code>[em]<?php _e('Emphasised text') ?>[/em]</code> <?php _e('produces') ?> <samp><em><?php _e('Emphasised text') ?></em></samp></p>
-		<p><code>[color=#FF0000]<?php _e('Red text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: #ff0000"><?php _e('Red text') ?></span></samp></p>
-		<p><code>[color=blue]<?php _e('Blue text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: blue"><?php _e('Blue text') ?></span></samp></p>
-		<p><code>[h]<?php _e('Heading text') ?>[/h]</code> <?php _e('produces') ?></p> <div class="postmsg"><h5><?php _e('Heading text') ?></h5></div>
-	</div>
-</div>
-<h2><span><?php _e('Links and images') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>]<?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>"><?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>"><?php echo $feather->utils->escape($feather->url->base(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
-		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
-		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
-		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php echo $feather->url->get('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php echo $feather->url->get('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('forum/1/') ?>"><?php echo $feather->url->get('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php echo $feather->url->get('user/2/') ?></a></samp></p>
-	</div>
-	<div class="inbox">
-		<p><a name="img"></a><?php _e('Images info') ?></p>
-		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo $feather->utils->escape($feather->url->base(true)) ?>/style/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo $feather->utils->escape($feather->url->base(true)) ?>/style/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
-	</div>
-</div>
-<h2><span><?php _e('Quotes') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Quotes info') ?></p>
-		<p><code>[quote=James]<?php _e('Quote text') ?>[/quote]</code></p>
-		<p><?php _e('produces quote box') ?></p>
-		<div class="postmsg">
-			<div class="quotebox"><cite>James <?php _e('wrote') ?></cite><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
-		</div>
-		<p><?php _e('Quotes info 2') ?></p>
-		<p><code>[quote]<?php _e('Quote text') ?>[/quote]</code></p>
-		<p><?php _e('produces quote box') ?></p>
-		<div class="postmsg">
-			<div class="quotebox"><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
-		</div>
-		<p><?php _e('quote note') ?></p>
-	</div>
-</div>
-<h2><span><?php _e('Code') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Code info') ?></p>
-		<p><code>[code]<?php _e('Code text') ?>[/code]</code></p>
-		<p><?php _e('produces code box') ?></p>
-		<div class="postmsg">
-			<div class="codebox"><pre><code><?php _e('Code text') ?></code></pre></div>
-		</div>
-	</div>
-</div>
-<h2><span><?php _e('Lists') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><a name="lists"></a><?php _e('List info') ?></p>
-		<p><code>[list][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php _e('produces list') ?></span></p>
-		<div class="postmsg">
-			<ul><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ul>
-		</div>
-		<p><code>[list=1][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php _e('produces decimal list') ?></span></p>
-		<div class="postmsg">
-			<ol class="decimal"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
-		</div>
-		<p><code>[list=a][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php _e('produces alpha list') ?></span></p>
-		<div class="postmsg">
-			<ol class="alpha"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
-		</div>
-	</div>
-</div>
-<h2><span><?php _e('Nested tags') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Nested tags info') ?></p>
-		<p><code>[b][u]<?php _e('Bold, underlined text') ?>[/u][/b]</code> <?php _e('produces') ?> <samp><strong><span class="bbu"><?php _e('Bold, underlined text') ?></span></strong></samp></p>
-	</div>
-</div>
-<h2><span><?php _e('Smilies') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><a name="smilies"></a><?php _e('Smilies info') ?></p>
-<?php
-
-// Display the smiley set
-require FEATHER_ROOT.'featherbb/Helpers/parser.php';
-
-$smiley_groups = array();
-
-foreach ($pd['smilies'] as $smiley_text => $smiley_data) {
-    $smiley_groups[$smiley_data['file']][] = $smiley_text;
-}
-
-foreach ($smiley_groups as $smiley_img => $smiley_texts) {
-    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
-}
-
-?>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/index.php b/style/themes/MyFeatherBB/view/index.php
deleted file mode 100644
index 826fa47e..00000000
--- a/style/themes/MyFeatherBB/view/index.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-if (empty($index_data)): ?>
-    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php _e('Empty board') ?></p></div></div></div>
-<?php endif;
-foreach ($index_data as $forum) {
-    if ($forum->cid != $cur_cat) :
-        if ($cur_cat != 0) :
-    ?>
-				</tbody>
-			</table>
-		</div>
-	</div>
-	</div>
-	<?php endif;
-    ?>
-	<div id="idx<?php echo $forum->cid ?>" class="blocktable">
-	<h2><span><?php echo $feather->utils->escape($forum->cat_name) ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Forum') ?></th>
-					<th class="tc2" scope="col"><?php _e('Topics') ?></th>
-					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
-					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-	<?php
-    $cur_cat = $forum->cid;
-    endif;
-    ?>
-				<tr class="<?php echo $forum->item_status ?>">
-					<td class="tcl">
-						<div class="<?php echo $forum->icon_type ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($forum->forum_count_formatted) ?></div></div>
-						<div class="tclcon">
-							<div>
-								<?php echo $forum->forum_field."\n".$forum->moderators_formatted ?>
-							</div>
-						</div>
-					</td>
-					<td class="tc2"><?php echo $feather->utils->forum_number_format($forum->num_topics_formatted) ?></td>
-					<td class="tc3"><?php echo $feather->utils->forum_number_format($forum->num_posts_formatted) ?></td>
-					<td class="tcr"><?php echo $forum->last_post_formatted ?></td>
-				</tr>
-	<?php
-
-}
-if ($cur_cat > 0) :
-    ?>
-					</tbody>
-			</table>
-		</div>
-	</div>
-	</div>
-<?php
-endif;
-if (!empty($forum_actions)) :
-?>
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<p class="subscribelink clearb"><?php echo implode(' - ', $forum_actions); ?></p>
-	</div>
-</div>
-<?php
-endif;
-?>
-<div id="brdstats" class="block">
-	<h2><span><?php _e('Board info') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<dl class="conr">
-				<dt><strong><?php _e('Board stats') ?></strong></dt>
-				<dd><span><?php printf(__('No of users'), '<strong>'.$feather->utils->forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of topics'), '<strong>'.$feather->utils->forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of posts'), '<strong>'.$feather->utils->forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
-			</dl>
-			<dl class="conl">
-				<dt><strong><?php _e('User info') ?></strong></dt>
-				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
-				<?php if ($feather->forum_settings['o_users_online'] == 1) : ?>
-				<dd><span><?php printf(__('Users online'), '<strong>'.$feather->utils->forum_number_format($online['num_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('Guests online'), '<strong>'.$feather->utils->forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
-				<?php endif; ?>
-			</dl>
-			<?php
-            if ($feather->forum_settings['o_users_online'] == 1) :
-                if ($online['num_users'] > 0) {
-                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
-                } else {
-                    echo "\t\t\t".'<div class="clearer"></div>'."\n";
-                }
-            endif;
-            ?>
-		</div>
-	</div>
-</div>
diff --git a/style/themes/MyFeatherBB/view/install.php b/style/themes/MyFeatherBB/view/install.php
deleted file mode 100644
index c146b1b7..00000000
--- a/style/themes/MyFeatherBB/view/install.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title><?php _e('FeatherBB Installation') ?></title>
-    <link rel="stylesheet" type="text/css" href="style/<?php echo $feather->forum_env['FORUM_NAME'] ?>.css" />
-</head>
-
-<body>
-    <div id="puninstall" class="pun">
-        <div class="top-box"><div><!-- Top Corners --></div></div>
-        <div class="punwrap">
-
-            <section class="container">
-                <div id="brdheader" class="block">
-                    <div class="box">
-                        <div id="brdtitle" class="inbox">
-                            <h1><span><?php _e('FeatherBB Installation') ?></span></h1>
-                            <div id="brddesc"><p><?php _e('Welcome') ?></p></div>
-                        </div>
-                    </div>
-                </div>
-            </section>
-
-            <section class="container">
-                <div id="brdmain">
-                    <?php if (count($languages) > 1): ?>
-                        <div class="blockform">
-                            <h2><span><?php _e('Choose install language') ?></span></h2>
-                            <div class="box">
-                                <form id="install" method="post" action="">
-                                    <input type="hidden" name="choose_lang" value="1">
-                                    <div class="inform">
-                                        <fieldset>
-                                            <legend><?php _e('Install language') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Choose install language info') ?></p>
-                                                <label><strong><?php _e('Install language') ?></strong>
-                                                    <br /><select name="install_lang">
-                                                        <?php
-
-                                                        foreach ($languages as $lang) {
-                                                            echo "\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').'>'.$lang.'</option>'."\n";
-                                                        }
-
-                                                        ?>
-                                                    </select>
-                                                    <br /></label>
-                                                </div>
-                                            </fieldset>
-                                        </div>
-                                        <p class="buttons"><input type="submit" value="<?php _e('Change language') ?>" /></p>
-                                    </form>
-                                </div>
-                            </div>
-                        <?php endif;
-                        ?>
-
-                        <div class="blockform">
-                            <h2><span><?php echo sprintf(__('Install'), FORUM_VERSION) ?></span></h2>
-                            <div class="box">
-                                <form id="install" method="post" action="">
-                                    <?php if (!empty($errors)): ?>
-                                        <div class="inform">
-                                            <div class="forminfo error-info">
-                                                <h3><?php _e('Errors') ?></h3>
-                                                <ul class="error-list">
-                                                    <?php
-                                                    $errors = (!is_array($errors)) ? array($errors) : $errors;
-                                                    foreach ($errors as $error) {
-                                                        echo "\t\t\t\t\t\t".'<li><strong>'.$error.'</strong></li>'."\n";
-                                                    }
-                                                    ?>
-                                                </ul>
-                                            </div>
-                                        </div>
-                                        <?php endif;?>
-
-                                    <div class="inform">
-                                        <div class="forminfo">
-                                            <h3><?php _e('Database setup') ?></h3>
-                                            <p><?php _e('Info 1') ?></p>
-                                        </div>
-                                        <fieldset>
-                                            <legend><?php _e('Select database') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 2') ?></p>
-                                                <label class="required"><strong><?php _e('Database type') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <select name="install[db_type]" required>
-                                                    <?php
-
-                                                    foreach ($supported_dbs as $id => $db_type) {
-                                                        echo "\t\t\t\t\t\t\t".'<option value="'.$id.'">'.$db_type.'</option>'."\n";
-                                                    }
-
-                                                    ?>
-                                                </select>
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <fieldset>
-                                            <legend><?php _e('Database hostname') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 3') ?></p>
-                                                <label class="required"><strong><?php _e('Database server hostname') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[db_host]" size="50" required />
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <fieldset>
-                                            <legend><?php _e('Database enter name') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 4') ?></p>
-                                                <label class="required"><strong><?php _e('Database name') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[db_name]" size="30" required />
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <fieldset>
-                                            <legend><?php _e('Database enter informations') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 5') ?></p>
-                                                <label class="conl"><?php _e('Database username') ?></label>
-                                                <input type="text" name="install[db_user]" size="30" />
-                                                <label class="conl"><?php _e('Database password') ?></label>
-                                                <input type="password" name="install[db_pass]" size="30" />
-                                                <div class="clearer"></div>
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <fieldset>
-                                            <legend><?php _e('Database enter prefix') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 6') ?></p>
-                                                <label><?php _e('Table prefix') ?></label>
-                                                <input type="text" name="install[db_prefix]" size="20" maxlength="30" />
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <div class="forminfo">
-                                            <h3><?php _e('Administration setup') ?></h3>
-                                            <p><?php _e('Info 7') ?></p>
-                                        </div>
-                                        <fieldset>
-                                            <legend><?php _e('Administration setup') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 8') ?></p>
-                                                <label class="required"><strong><?php _e('Administrator username') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[username]" size="25" maxlength="25" required />
-                                                <label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="password" name="install[password]" size="16" required />
-                                                <label class="conl required"><strong><?php _e('Confirm password') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="password" name="install[password_conf]" size="16" required />
-                                                <!-- <div class="clearer"></div> -->
-                                                <label class="required"><strong><?php _e('Administrator email') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[email]" size="50" maxlength="80" required />
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <div class="forminfo">
-                                            <h3><?php _e('Board setup') ?></h3>
-                                            <p><?php _e('Info 11') ?></p>
-                                        </div>
-                                        <fieldset>
-                                            <legend><?php _e('General information') ?></legend>
-                                            <div class="infldset">
-                                                <label class="required"><strong><?php _e('Board title') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[title]" value="<? echo $data['title'] ?>" size="60" maxlength="255" required />
-                                                <label><?php _e('Board description') ?></label>
-                                                <input type="text" name="install[description]" value="<? echo $data['description'] ?>" size="60" maxlength="255" required />
-                                                <label class="required"><strong><?php _e('Base URL') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[base_url]" value="<? echo $data['base_url'] ?>" size="60" maxlength="100" required />
-                                                <label class="required"><strong><?php _e('Default language') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <select name="install[default_lang]" required />
-                                                <?php
-                                                foreach ($languages as $lang) {
-                                                    echo "\t\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').' >'.$lang.'</option>'."\n";
-                                                }
-                                                ?>
-                                            </select>
-                                        </div>
-                                    </fieldset>
-                                </div>
-
-                                <p class="buttons"><input type="submit" value="<?php _e('Start install') ?>" /></p>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-            </section>
-        </div>
-        <div class="end-box"><div><!-- Bottom Corners --></div></div>
-    </div>
-</body>
-</html>
diff --git a/style/themes/MyFeatherBB/view/login/form.php b/style/themes/MyFeatherBB/view/login/form.php
deleted file mode 100644
index 59808e7f..00000000
--- a/style/themes/MyFeatherBB/view/login/form.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Login') ?></span></h2>
-	<div class="box">
-		<form id="login" method="post" action="<?php echo $feather->url->get('auth/login') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Login legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="conl required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
-						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
-
-						<div class="rbox clearb">
-							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php _e('Remember me') ?><br /></label>
-						</div>
-
-						<p class="clearb"><?php _e('Login info') ?></p>
-						<p class="actions"><span><a href="<?php echo $feather->url->get('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo $feather->url->get('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="login" value="<?php _e('Login') ?>" tabindex="4" /></p>
-		</form>
-	</div>
-</div>
diff --git a/style/themes/MyFeatherBB/view/login/password_forgotten.php b/style/themes/MyFeatherBB/view/login/password_forgotten.php
deleted file mode 100644
index 432f9aee..00000000
--- a/style/themes/MyFeatherBB/view/login/password_forgotten.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-// If there are errors, we display them
-if (!empty($errors)) {
-    ?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('New password errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('New passworderrors info') ?></p>
-			<ul class="error-list">
-<?php
-
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-    ?>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<?php
-
-}
-?>
-<div class="blockform">
-	<h2><span><?php _e('Request pass') ?></span></h2>
-	<div class="box">
-		<form id="request_pass" method="post" action="<?php echo $feather->url->get('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Request pass legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
-						<p><?php _e('Request pass info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="request_pass" value="<?php _e('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a><?php endif; ?></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/misc/email.php b/style/themes/MyFeatherBB/view/misc/email.php
deleted file mode 100644
index 867ac9ee..00000000
--- a/style/themes/MyFeatherBB/view/misc/email.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo $feather->utils->escape($mail['recipient']) ?></span></h2>
-	<div class="box">
-		<form id="email" method="post" action="<?php echo $feather->url->get('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write email') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
-						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php _e('Email disclosure note') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
diff --git a/style/themes/MyFeatherBB/view/misc/report.php b/style/themes/MyFeatherBB/view/misc/report.php
deleted file mode 100644
index 6eeead9c..00000000
--- a/style/themes/MyFeatherBB/view/misc/report.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<div id="reportform" class="blockform">
-	<h2><span><?php _e('Report post') ?></span></h2>
-	<div class="box">
-		<form id="report" method="post" action="<?php echo $feather->url->get('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Reason desc') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('Reason') ?> <span><?php _e('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/misc/rules.php b/style/themes/MyFeatherBB/view/misc/rules.php
deleted file mode 100644
index feb662ad..00000000
--- a/style/themes/MyFeatherBB/view/misc/rules.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="rules" class="block">
-	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
-	<div class="box">
-		<div id="rules-block" class="inbox">
-			<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
-		</div>
-	</div>
-</div>
diff --git a/style/themes/MyFeatherBB/view/moderate/delete_posts.php b/style/themes/MyFeatherBB/view/moderate/delete_posts.php
deleted file mode 100644
index 00b80920..00000000
--- a/style/themes/MyFeatherBB/view/moderate/delete_posts.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Delete posts') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm delete legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<p><?php _e('Delete posts comply') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/moderate/delete_topics.php b/style/themes/MyFeatherBB/view/moderate/delete_topics.php
deleted file mode 100644
index d0ab1eed..00000000
--- a/style/themes/MyFeatherBB/view/moderate/delete_topics.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('Delete topics') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm delete legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Delete topics comply') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/moderate/merge_topics.php b/style/themes/MyFeatherBB/view/moderate/merge_topics.php
deleted file mode 100644
index 820cedee..00000000
--- a/style/themes/MyFeatherBB/view/moderate/merge_topics.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('Merge topics') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm merge legend') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1" /><?php _e('Leave redirect') ?><br /></label>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php _e('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/moderate/moderator_forum.php b/style/themes/MyFeatherBB/view/moderate/moderator_forum.php
deleted file mode 100644
index 06c6987b..00000000
--- a/style/themes/MyFeatherBB/view/moderate/moderator_forum.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<form method="post" action="<?php echo $feather->url->get('moderate/forum/'.$id.'/') ?>">
-<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<input type="hidden" name="page" value="<?php echo $feather->utils->escape($p) ?>" />
-<div id="vf" class="blocktable">
-	<h2><span><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
-					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
-<?php endif; ?>					<th class="tcr"><?php _e('Last post') ?></th>
-					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-			
-			<?php
-            $topic_count = 0;
-            $button_status = '';
-            foreach ($topic_data as $topic) {
-                ++$topic_count;
-                ?>
-							<tr class="<?php echo $topic['item_status'] ?>">
-					<td class="tcl">
-						<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
-						<div class="tclcon">
-							<div>
-								<?php echo $topic['subject_disp']."\n" ?>
-							</div>
-						</div>
-					</td>
-					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? $feather->utils->forum_number_format($topic['num_replies']) : '-' ?></td>
-<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? $feather->utils->forum_number_format($topic['num_views']) : '-' ?></td>
-<?php endif;
-                ?>					<td class="tcr"><?php echo $topic['last_post_disp'] ?></td>
-					<td class="tcmod"><input type="checkbox" name="topics[<?php echo $topic['id'] ?>]" value="1" /></td>
-				</tr>
-			<?php
-
-            }
-            if (empty($topic_data)):
-                $colspan = ($feather->forum_settings['o_topic_views'] == '1') ? 5 : 4;
-                $button_status = ' disabled="disabled"';
-                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
-            endif;
-            ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php _e('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php _e('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php _e('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php _e('Close') ?>"<?php echo $button_status ?> /></p>
-			<div class="clearer"></div>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
-</form>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/moderate/move_topics.php b/style/themes/MyFeatherBB/view/moderate/move_topics.php
deleted file mode 100644
index e72ae5cb..00000000
--- a/style/themes/MyFeatherBB/view/moderate/move_topics.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="blockform">
-	<h2><span><?php echo($action == 'single') ? __('Move topic') : __('Move topics') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-			<input type="hidden" name="topics" value="<?php echo $topics ?>" />
-				<fieldset>
-					<legend><?php _e('Move legend') ?></legend>
-					<div class="infldset">
-						<label><?php _e('Move to') ?>
-						<br /><select name="move_to_forum">
-								<?php echo $list_forums ?>
-							</optgroup>
-						</select>
-						<br /></label>
-						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1"<?php if ($action == 'single') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Leave redirect') ?><br /></label>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php _e('Move') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/moderate/posts_view.php b/style/themes/MyFeatherBB/view/moderate/posts_view.php
deleted file mode 100644
index 0338555a..00000000
--- a/style/themes/MyFeatherBB/view/moderate/posts_view.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<form method="post" action="">
-<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<?php
-$post_count = 0; // Keep track of post numbers
-foreach ($post_data as $post) {
-    $post_count++;
-    ?>
-	<div id="p<?php echo $post['id'] ?>" class="blockpost<?php if ($post['id'] == $cur_topic['first_post_id']) {
-    echo ' firstpost';
-}
-    ?><?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($post_count == 1) {
-    echo ' blockpost1';
-}
-    ?>">
-		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<div class="postbody">
-					<div class="postleft">
-						<dl>
-							<dt><strong><?php echo $post['poster_disp'] ?></strong></dt>
-							<dd class="usertitle"><strong><?php echo $post['user_title'] ?></strong></dd>
-						</dl>
-					</div>
-					<div class="postright">
-						<h3 class="nosize"><?php _e('Message') ?></h3>
-						<div class="postmsg">
-							<?php echo $post['message']."\n" ?>
-	<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.$feather->utils->escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
-}
-    ?>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="inbox">
-				<div class="postfoot clearb">
-					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.__('Select').'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.__('Cannot select first').'</p>' ?></div>
-				</div>
-			</div>
-		</div>
-	</div>
-<?php
-
-}
-?>
-
-<div class="postlinksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php _e('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /></p>
-			<div class="clearer"></div>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
-</form>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/moderate/split_posts.php b/style/themes/MyFeatherBB/view/moderate/split_posts.php
deleted file mode 100644
index 7c59b0b9..00000000
--- a/style/themes/MyFeatherBB/view/moderate/split_posts.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Split posts') ?></span></h2>
-	<div class="box">
-		<form id="subject" method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm split legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<label class="required"><strong><?php _e('New subject') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
-						<label><?php _e('Move to') ?>
-						<br /><select name="move_to_forum">
-								<?php echo $list_forums ?>
-							</optgroup>
-						</select>
-						<br /></label>
-						<p><?php _e('Split posts comply') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php _e('Split') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/post.php b/style/themes/MyFeatherBB/view/post.php
deleted file mode 100644
index 248d7ff3..00000000
--- a/style/themes/MyFeatherBB/view/post.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_posting['forum_name']) ?></a></li>
-<?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo $feather->utils->escape($feather->request->post('req_subject')) ?></li>
-<?php endif; ?>
-<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_posting['subject']) ?></a></li>
-<?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<?php
-
-// If there are errors, we display them
-if (!empty($errors)) {
-    ?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('Post errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('Post errors info') ?></p>
-			<ul class="error-list">
-<?php
-
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-    ?>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<?php
-
-} elseif ($feather->request->post('preview')) {
-    require_once FEATHER_ROOT.'featherbb/Helpers/parser.php';
-    $preview_message = parse_message($post['message'], $post['hide_smilies']);
-
-    ?>
-<div id="postpreview" class="blockpost">
-	<h2><span><?php _e('Post preview') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postright">
-					<div class="postmsg">
-						<?php echo $preview_message."\n" ?>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<?php
-
-}
-
-
-$cur_index = 1;
-
-?>
-<!-- Init BBcode editor toolbar -->
-<script>
-    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
-        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
-</script>
-<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
-
-<div id="postform" class="blockform">
-	<h2><span><?php echo $action ?></span></h2>
-	<div class="box">
-		<?php echo $form."\n" ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write message legend') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-                                                <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<?php
-if ($feather->user->is_guest) {
-    $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-    $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
-    ?>
-						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
-    echo $feather->utils->escape($post['username']);
-}
-    ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
-    echo $feather->utils->escape($post['email']);
-}
-    ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<div class="clearer"></div>
-<?php
-
-}
-if ($fid): ?>
-						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
-    echo $feather->utils->escape($post['subject']);
-} ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
-                        <script>postEditorToolbar('req_message');</script>
-						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? $feather->utils->linebreaks($feather->utils->trim($feather->utils->escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
-						</ul>
-					</div>
-				</fieldset>
-<?php
-if (!empty($checkboxes)) {
-    ?>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Options') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
-						</div>
-					</div>
-				</fieldset>
-<?php
-
-}
-
-?>
-			</div>
-			<?php if ($feather->user->is_guest) : ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Robot title') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Robot info')    ?></p>
-						<label class="required"><strong><?php
-                             $question = array_keys($lang_antispam_questions);
-                             $qencoded = md5($question[$index_questions]);
-                             echo sprintf(__('Robot question'), $question[$index_questions]);?>
-							 <span><?php _e('Required') ?></span></strong>
-							 <br />
-							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
-						</label>
-					</div>
-				</fieldset>
-			</div>
-			<?php endif; ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
-
-
-<?php
-if ($tid && $feather->forum_settings['o_topic_review'] != '0') :
-?>
-<div id="postreview">
-	<h2><span><?php _e('Topic review') ?></span></h2>
-
-	<?php
-    // Set background switching on
-    $post_count = 0;
-
-    foreach ($post_data as $post) {
-        ++$post_count;
-        ?>
-	<div class="blockpost">
-	<div class="box<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?>">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postleft">
-					<dl>
-						<dt><strong><?php echo $feather->utils->escape($post['poster']) ?></strong></dt>
-						<dd><span><?php echo $feather->utils->format_time($post['posted']) ?></span></dd>
-					</dl>
-				</div>
-				<div class="postright">
-					<div class="postmsg">
-						<?php echo $post['message']."\n" ?>
-					</div>
-				</div>
-			</div>
-			<div class="clearer"></div>
-		</div>
-	</div>
-</div>
-	<?php
-
-    }
-    ?>
-
-</div>
-<?php endif;?>
diff --git a/style/themes/MyFeatherBB/view/profile/change_mail.php b/style/themes/MyFeatherBB/view/profile/change_mail.php
deleted file mode 100644
index 1e59ab54..00000000
--- a/style/themes/MyFeatherBB/view/profile/change_mail.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Change email') ?></span></h2>
-	<div class="box">
-		<form id="change_email" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Email legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('New email') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
-						<label class="required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
-						<p><?php _e('Email instructions') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="new_email" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/profile/change_pass.php b/style/themes/MyFeatherBB/view/profile/change_pass.php
deleted file mode 100644
index 1bacb173..00000000
--- a/style/themes/MyFeatherBB/view/profile/change_pass.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Change pass') ?></span></h2>
-	<div class="box">
-		<form id="change_pass" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<input type="hidden" name="form_sent" value="1" />
-				<fieldset>
-					<legend><?php _e('Change pass legend') ?></legend>
-					<div class="infldset">
-<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php _e('Old pass') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="password" name="req_old_password" size="16" /><br /></label>
-<?php endif; ?>						<label class="conl required"><strong><?php _e('New pass') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="password" name="req_new_password1" size="16" /><br /></label>
-						<label class="conl required"><strong><?php _e('Confirm new pass') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="password" name="req_new_password2" size="16" /><br /></label>
-						<p class="clearb"><?php _e('Pass info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/profile/delete_user.php b/style/themes/MyFeatherBB/view/profile/delete_user.php
deleted file mode 100644
index 84a3b58d..00000000
--- a/style/themes/MyFeatherBB/view/profile/delete_user.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Confirm delete user') ?></span></h2>
-	<div class="box">
-		<form id="confirm_del_user" method="post" action="<?php echo $feather->url->get('user/'.$id.'/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm delete legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Confirmation info').' <strong>'.$feather->utils->escape($username).'</strong>.' ?></p>
-						<div class="rbox">
-							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
-						</div>
-						<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/profile/menu.php b/style/themes/MyFeatherBB/view/profile/menu.php
deleted file mode 100644
index a46fef80..00000000
--- a/style/themes/MyFeatherBB/view/profile/menu.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="profile" class="block2col">
-	<div class="blockmenu">
-		<h2><span><?php _e('Profile menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-					<li<?php if ($page == 'essentials') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
-					<li<?php if ($page == 'personal') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
-					<li<?php if ($page == 'messaging') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
-<?php if ($feather->forum_settings['o_avatars'] == '1' || $feather->forum_settings['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
-<?php endif;
-    ?>					<li<?php if ($page == 'display') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
-					<li<?php if ($page == 'privacy') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
-<?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
-<?php endif;
-    ?>				</ul>
-			</div>
-		</div>
-	</div>
diff --git a/style/themes/MyFeatherBB/view/profile/section_admin.php b/style/themes/MyFeatherBB/view/profile/section_admin.php
deleted file mode 100644
index f06eb7d4..00000000
--- a/style/themes/MyFeatherBB/view/profile/section_admin.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-	<div class="blockform">
-		<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section admin') ?></span></h2>
-		<div class="box">
-			<form id="profile7" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-				<input type="hidden" name="form_sent" value="1" />
-					<fieldset>
-<?php
-
-        if ($feather->user->g_moderator == '1') {
-            ?>
-						<legend><?php _e('Delete ban legend') ?></legend>
-						<div class="infldset">
-							<p><input type="submit" name="ban" value="<?php _e('Ban user') ?>" /></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-        } else {
-            if ($feather->user->id != $id) {
-                ?>
-						<legend><?php _e('Group membership legend') ?></legend>
-						<div class="infldset">
-							<select id="group_id" name="group_id">
-                                                            <?php echo $group_list ?>
-							</select>
-							<input type="submit" name="update_group_membership" value="<?php _e('Save') ?>" />
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-<?php
-
-            }
-
-            ?>
-						<legend><?php _e('Delete ban legend') ?></legend>
-						<div class="infldset">
-							<input type="submit" name="delete_user" value="<?php _e('Delete user') ?>" /> <input type="submit" name="ban" value="<?php _e('Ban user') ?>" />
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-            if ($user['g_moderator'] == '1' || $user['g_id'] == FEATHER_ADMIN) {
-                ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Set mods legend') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Moderator in info') ?></p>
-                                                        <?php echo $forum_list ?>
-								</div>
-							</div>
-							<br class="clearb" /><input type="submit" name="update_forums" value="<?php _e('Update forums') ?>" />
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-            }
-        }
-
-?>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/profile/section_display.php b/style/themes/MyFeatherBB/view/profile/section_display.php
deleted file mode 100644
index 7cce9e3c..00000000
--- a/style/themes/MyFeatherBB/view/profile/section_display.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section display') ?></span></h2>
-	<div class="box">
-		<form id="profile5" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div><input type="hidden" name="form_sent" value="1" /></div>
-<?php
-
-    $styles = \FeatherBB\Lister::getStyles();
-
-    // Only display the style selection box if there's more than one style available
-    if (count($styles) == 1) {
-        echo "\t\t\t".'<div><input type="hidden" name="form_style" value="'.$styles[0].'" /></div>'."\n";
-    } elseif (count($styles) > 1) {
-        ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Style legend') ?></legend>
-					<div class="infldset">
-						<label><?php _e('Styles') ?><br />
-						<select name="form_style">
-<?php
-
-        foreach ($styles as $temp) {
-            if ($user['style'] == $temp) {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.str_replace('_', ' ', $temp).'</option>'."\n";
-            } else {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.str_replace('_', ' ', $temp).'</option>'."\n";
-            }
-        }
-
-        ?>
-						</select>
-						<br /></label>
-					</div>
-				</fieldset>
-			</div>
-<?php
-
-    }
-
-?>
-<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1' || $feather->forum_settings['o_signatures'] == '1' || $feather->forum_settings['o_avatars'] == '1' || ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1')): ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Post display legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Post display info') ?></p>
-						<div class="rbox">
-<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show smilies') ?><br /></label>
-<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show sigs') ?><br /></label>
-<?php endif; if ($feather->forum_settings['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show avatars') ?><br /></label>
-<?php endif; if ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show images') ?><br /></label>
-<?php endif; if ($feather->forum_settings['o_signatures'] == '1' && $feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show images sigs') ?><br /></label>
-<?php endif; ?>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Pagination legend') ?></legend>
-					<div class="infldset">
-						<label class="conl"><?php _e('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
-						<label class="conl"><?php _e('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
-						<p class="clearb"><?php _e('Paginate info') ?> <?php _e('Leave blank') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
diff --git a/style/themes/MyFeatherBB/view/profile/section_essentials.php b/style/themes/MyFeatherBB/view/profile/section_essentials.php
deleted file mode 100644
index b45114f6..00000000
--- a/style/themes/MyFeatherBB/view/profile/section_essentials.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section essentials') ?></span></h2>
-	<div class="box">
-		<form id="profile1" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Username and pass legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
-<?php endif; ?>						</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Email legend') ?></legend>
-					<div class="infldset">
-						<?php echo $user_disp['email_field'] ?>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Localisation legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Time zone info') ?></p>
-						<label><?php _e('Time zone')."\n" ?>
-						<br /><select name="form_timezone">
-							<option value="-12"<?php if ($user['timezone'] == -12) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-12:00') ?></option>
-							<option value="-11"<?php if ($user['timezone'] == -11) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-11:00') ?></option>
-							<option value="-10"<?php if ($user['timezone'] == -10) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-10:00') ?></option>
-							<option value="-9.5"<?php if ($user['timezone'] == -9.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-09:30') ?></option>
-							<option value="-9"<?php if ($user['timezone'] == -9) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-09:00') ?></option>
-							<option value="-8.5"<?php if ($user['timezone'] == -8.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-08:30') ?></option>
-							<option value="-8"<?php if ($user['timezone'] == -8) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-08:00') ?></option>
-							<option value="-7"<?php if ($user['timezone'] == -7) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-07:00') ?></option>
-							<option value="-6"<?php if ($user['timezone'] == -6) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-06:00') ?></option>
-							<option value="-5"<?php if ($user['timezone'] == -5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-05:00') ?></option>
-							<option value="-4"<?php if ($user['timezone'] == -4) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-04:00') ?></option>
-							<option value="-3.5"<?php if ($user['timezone'] == -3.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-03:30') ?></option>
-							<option value="-3"<?php if ($user['timezone'] == -3) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-03:00') ?></option>
-							<option value="-2"<?php if ($user['timezone'] == -2) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-02:00') ?></option>
-							<option value="-1"<?php if ($user['timezone'] == -1) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-01:00') ?></option>
-							<option value="0"<?php if ($user['timezone'] == 0) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC') ?></option>
-							<option value="1"<?php if ($user['timezone'] == 1) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+01:00') ?></option>
-							<option value="2"<?php if ($user['timezone'] == 2) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+02:00') ?></option>
-							<option value="3"<?php if ($user['timezone'] == 3) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+03:00') ?></option>
-							<option value="3.5"<?php if ($user['timezone'] == 3.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+03:30') ?></option>
-							<option value="4"<?php if ($user['timezone'] == 4) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+04:00') ?></option>
-							<option value="4.5"<?php if ($user['timezone'] == 4.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+04:30') ?></option>
-							<option value="5"<?php if ($user['timezone'] == 5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:00') ?></option>
-							<option value="5.5"<?php if ($user['timezone'] == 5.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:30') ?></option>
-							<option value="5.75"<?php if ($user['timezone'] == 5.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:45') ?></option>
-							<option value="6"<?php if ($user['timezone'] == 6) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+06:00') ?></option>
-							<option value="6.5"<?php if ($user['timezone'] == 6.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+06:30') ?></option>
-							<option value="7"<?php if ($user['timezone'] == 7) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+07:00') ?></option>
-							<option value="8"<?php if ($user['timezone'] == 8) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+08:00') ?></option>
-							<option value="8.75"<?php if ($user['timezone'] == 8.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+08:45') ?></option>
-							<option value="9"<?php if ($user['timezone'] == 9) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+09:00') ?></option>
-							<option value="9.5"<?php if ($user['timezone'] == 9.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+09:30') ?></option>
-							<option value="10"<?php if ($user['timezone'] == 10) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+10:00') ?></option>
-							<option value="10.5"<?php if ($user['timezone'] == 10.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+10:30') ?></option>
-							<option value="11"<?php if ($user['timezone'] == 11) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+11:00') ?></option>
-							<option value="11.5"<?php if ($user['timezone'] == 11.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+11:30') ?></option>
-							<option value="12"<?php if ($user['timezone'] == 12) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+12:00') ?></option>
-							<option value="12.75"<?php if ($user['timezone'] == 12.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+12:45') ?></option>
-							<option value="13"<?php if ($user['timezone'] == 13) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+13:00') ?></option>
-							<option value="14"<?php if ($user['timezone'] == 14) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+14:00') ?></option>
-						</select>
-						<br /></label>
-						<div class="rbox">
-							<label><input type="checkbox" name="form_dst" value="1"<?php if ($user['dst'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('DST') ?><br /></label>
-						</div>
-						<label><?php _e('Time format') ?>
-
-						<br /><select name="form_time_format">
-<?php
-                            foreach (array_unique($forum_time_formats) as $key => $time_format) {
-                                echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
-                                if ($user['time_format'] == $key) {
-                                    echo ' selected="selected"';
-                                }
-                                echo '>'. $feather->utils->format_time(time(), false, null, $time_format, true, true);
-                                if ($key == 0) {
-                                    echo ' ('.__('Default').')';
-                                }
-                                echo "</option>\n";
-                            }
-                            ?>
-						</select>
-						<br /></label>
-						<label><?php _e('Date format') ?>
-
-						<br /><select name="form_date_format">
-<?php
-                            foreach (array_unique($forum_date_formats) as $key => $date_format) {
-                                echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
-                                if ($user['date_format'] == $key) {
-                                    echo ' selected="selected"';
-                                }
-                                echo '>'. $feather->utils->format_time(time(), true, $date_format, null, false, true);
-                                if ($key == 0) {
-                                    echo ' ('.__('Default').')';
-                                }
-                                echo "</option>\n";
-                            }
-                            ?>
-						</select>
-						<br /></label>
-
-<?php
-
-    $languages = \FeatherBB\Lister::getLangs();
-
-    // Only display the language selection box if there's more than one language available
-    if (count($languages) > 1) {
-        ?>
-						<label><?php _e('Language') ?>
-						<br /><select name="form_language">
-<?php
-
-        foreach ($languages as $temp) {
-            if ($user['language'] == $temp) {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
-            } else {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
-            }
-        }
-
-        ?>
-						</select>
-						<br /></label>
-<?php
-
-    }
-
-?>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('User activity') ?></legend>
-					<div class="infldset">
-						<p><?php printf(__('Registered info'), $feather->utils->format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.$feather->utils->escape($user['registration_ip']).'</a>)' : '')) ?></p>
-						<p><?php printf(__('Last post info'), $feather->utils->format_time($user['last_post'])) ?></p>
-						<p><?php printf(__('Last visit info'), $feather->utils->format_time($user['last_visit'])) ?></p>
-						<?php echo $user_disp['posts_field'] ?>
-<?php if ($feather->user->is_admmod): ?>							<label><?php _e('Admin note') ?><br />
-						<input id="admin_note" type="text" name="admin_note" value="<?php echo $feather->utils->escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
-<?php endif; ?>						</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
diff --git a/style/themes/MyFeatherBB/view/profile/section_messaging.php b/style/themes/MyFeatherBB/view/profile/section_messaging.php
deleted file mode 100644
index 2d3268dd..00000000
--- a/style/themes/MyFeatherBB/view/profile/section_messaging.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section messaging') ?></span></h2>
-	<div class="box">
-		<form id="profile3" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Contact details legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo $feather->utils->escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
-						<label><?php _e('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo $feather->utils->escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo $feather->utils->escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo $feather->utils->escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/profile/section_personal.php b/style/themes/MyFeatherBB/view/profile/section_personal.php
deleted file mode 100644
index 5ae81801..00000000
--- a/style/themes/MyFeatherBB/view/profile/section_personal.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section personal') ?></span></h2>
-	<div class="box">
-		<form id="profile2" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Personal details legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo $feather->utils->escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
-<?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo $feather->utils->escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo $feather->utils->escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
-<?php endif; ?>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/profile/section_personality.php b/style/themes/MyFeatherBB/view/profile/section_personality.php
deleted file mode 100644
index ae9f7b0f..00000000
--- a/style/themes/MyFeatherBB/view/profile/section_personality.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section personality') ?></span></h2>
-	<div class="box">
-		<form id="profile4" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div><input type="hidden" name="form_sent" value="1" /></div>
-<?php if ($feather->forum_settings['o_avatars'] == '1'): ?>				<div class="inform">
-				<fieldset id="profileavatar">
-					<legend><?php _e('Avatar legend') ?></legend>
-					<div class="infldset">
-<?php if ($user_avatar): ?>							<div class="useravatar"><?php echo $user_avatar ?></div>
-<?php endif; ?>							<p><?php _e('Avatar info') ?></p>
-						<p class="clearb actions"><?php echo $avatar_field ?></p>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>				<div class="inform">
-				<fieldset>
-					<legend><?php _e('Signature legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Signature info') ?></p>
-						<div class="txtarea">
-							<label><?php printf(__('Sig max size'), $feather->utils->forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
-							<textarea name="signature" rows="4" cols="65"><?php echo $feather->utils->escape($user['signature']) ?></textarea><br /></label>
-						</div>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
-						</ul>
-						<?php echo $signature_preview ?>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
diff --git a/style/themes/MyFeatherBB/view/profile/section_privacy.php b/style/themes/MyFeatherBB/view/profile/section_privacy.php
deleted file mode 100644
index 48715858..00000000
--- a/style/themes/MyFeatherBB/view/profile/section_privacy.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section privacy') ?></span></h2>
-	<div class="box">
-		<form id="profile6" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Privacy options legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<p><?php _e('Email setting info') ?></p>
-						<div class="rbox">
-							<label><input type="radio" name="form_email_setting" value="0"<?php if ($user['email_setting'] == '0') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Email setting 1') ?><br /></label>
-							<label><input type="radio" name="form_email_setting" value="1"<?php if ($user['email_setting'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Email setting 2') ?><br /></label>
-							<label><input type="radio" name="form_email_setting" value="2"<?php if ($user['email_setting'] == '2') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Email setting 3') ?><br /></label>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1' || $feather->forum_settings['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
-				<fieldset>
-					<legend><?php _e('Subscription legend') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Notify full') ?><br /></label>
-<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Auto notify full') ?><br /></label>
-<?php endif; ?>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/profile/upload_avatar.php b/style/themes/MyFeatherBB/view/profile/upload_avatar.php
deleted file mode 100644
index f92da260..00000000
--- a/style/themes/MyFeatherBB/view/profile/upload_avatar.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-	exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Upload avatar') ?></span></h2>
-	<div class="box">
-		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo $feather->url->get('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Upload avatar legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
-						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php _e('Avatar desc'); echo ' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.$feather->utils->file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="upload" value="<?php _e('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
diff --git a/style/themes/MyFeatherBB/view/profile/view_profile.php b/style/themes/MyFeatherBB/view/profile/view_profile.php
deleted file mode 100644
index d30181fd..00000000
--- a/style/themes/MyFeatherBB/view/profile/view_profile.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="viewprofile" class="block">
-	<h2><span><?php _e('Profile') ?></span></h2>
-	<div class="box">
-		<div class="fakeform">
-			<div class="inform">
-				<fieldset>
-				<legend><?php _e('Section personal') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personal'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-<?php if (!empty($user_info['messaging'])): ?>			<div class="inform">
-				<fieldset>
-				<legend><?php _e('Section messaging') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['messaging'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; if (!empty($user_info['personality'])): ?>			<div class="inform">
-				<fieldset>
-				<legend><?php _e('Section personality') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personality'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>			<div class="inform">
-				<fieldset>
-				<legend><?php _e('User activity') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['activity'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/register/email.php b/style/themes/MyFeatherBB/view/register/email.php
deleted file mode 100644
index a93188f9..00000000
--- a/style/themes/MyFeatherBB/view/register/email.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo $feather->utils->escape($recipient) ?></span></h2>
-	<div class="box">
-		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write email') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="redirect_url" value="<?php echo $feather->utils->escape($redirect_url) ?>" />
-						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
-						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php _e('Email disclosure note') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/register/form.php b/style/themes/MyFeatherBB/view/register/form.php
deleted file mode 100644
index d7deb65f..00000000
--- a/style/themes/MyFeatherBB/view/register/form.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-// If there are errors, we display them
-if (!empty($errors)) {
-    ?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('Registration errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('Registration errors info') ?></p>
-			<ul class="error-list">
-<?php
-
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-    ?>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<?php
-
-}
-?>
-<div id="regform" class="blockform">
-	<h2><span><?php _e('Register') ?></span></h2>
-	<div class="box">
-		<form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
-		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<div class="forminfo">
-					<h3><?php _e('Important information') ?></h3>
-					<p><?php _e('Desc 1') ?></p>
-					<p><?php _e('Desc 2') ?></p>
-				</div>
-				<fieldset>
-					<legend><?php _e('Username legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="username" value="" />
-						<input type="hidden" name="password" value="" />
-						<label class="required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
-    echo $feather->utils->escape($feather->request->post('req_user'));
-} ?>" size="25" maxlength="25" /><br /></label>
-					</div>
-				</fieldset>
-			</div>
-<?php if ($feather->forum_settings['o_regs_verify'] == '0'): ?>			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Pass legend') ?></legend>
-					<div class="infldset">
-						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
-    echo $feather->utils->escape($feather->request->post('req_password1'));
-} ?>" size="16" /><br /></label>
-						<label class="conl required"><strong><?php _e('Confirm pass') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
-    echo $feather->utils->escape($feather->request->post('req_password2'));
-} ?>" size="16" /><br /></label>
-						<p class="clearb"><?php _e('Pass info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>			<div class="inform">
-				<fieldset>
-					<legend><?php echo($feather->forum_settings['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
-					<div class="infldset">
-<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
-<?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
-    echo $feather->utils->escape($feather->request->post('req_email1'));
-} ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
-    echo $feather->utils->escape($feather->request->post('req_email2'));
-} ?>" size="50" maxlength="80" /><br /></label>
-<?php endif; ?>					</div>
-				</fieldset>
-			</div>
-<?php
-        // Only display the language selection box if there's more than one language available
-        if (count($languages) > 1) {
-            ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Localisation legend') ?></legend>
-					<div class="infldset">
-							<label><?php _e('Language') ?>
-							<br /><select name="language">
-<?php
-
-            foreach ($languages as $temp) {
-                if ($feather->forum_settings['o_default_lang'] == $temp) {
-                    echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
-                } else {
-                    echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
-                }
-            }
-
-            ?>
-							</select>
-							<br /></label>
-					</div>
-				</fieldset>
-			</div>
-<?php
-
-        }
-?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Robot title') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Robot info')    ?></p>
-						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php _e('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="register" value="<?php _e('Register') ?>" /></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/register/rules.php b/style/themes/MyFeatherBB/view/register/rules.php
deleted file mode 100644
index 326c96ad..00000000
--- a/style/themes/MyFeatherBB/view/register/rules.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div id="rules" class="blockform">
-	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
-	<div class="box">
-		<form method="get" action="<?php echo $feather->url->get('register/') ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Rules legend') ?></legend>
-					<div class="infldset">
-						<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="agree" value="<?php _e('Agree') ?>" /> <input type="submit" name="cancel" value="<?php _e('Cancel') ?>" /></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/search/footer.php b/style/themes/MyFeatherBB/view/search/footer.php
deleted file mode 100644
index 0dd6fc5e..00000000
--- a/style/themes/MyFeatherBB/view/search/footer.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-if ($search['show_as'] == 'topics') :
-?>
-			</tbody>
-		</table>
-		</div>
-	</div>
-</div>
-
-<?php
-endif;
-?>
-
-<div class="postlinksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
-		</ul>
-<?php echo(!empty($search['forum_actions']) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $search['forum_actions']).'</p>'."\n" : '') ?>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/search/form.php b/style/themes/MyFeatherBB/view/search/form.php
deleted file mode 100644
index 16cd788a..00000000
--- a/style/themes/MyFeatherBB/view/search/form.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div id="searchform" class="blockform">
-	<h2><span><?php _e('Search') ?></span></h2>
-	<div class="box">
-		<form id="search" method="get" action="">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Search criteria legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="action" value="search" />
-						<label class="conl"><?php _e('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
-						<label class="conl"><?php _e('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
-						<p class="clearb"><?php _e('Search info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Search in legend') ?></legend>
-					<div class="infldset">
-					<?php echo $forums ?>
-						<label class="conl"><?php _e('Search in')."\n" ?>
-						<br /><select id="search_in" name="search_in">
-							<option value="0"><?php _e('Message and subject') ?></option>
-							<option value="1"><?php _e('Message only') ?></option>
-							<option value="-1"><?php _e('Topic only') ?></option>
-						</select>
-						<br /></label>
-						<p class="clearl"><?php _e('Search in info') ?></p>
-<?php echo($feather->forum_settings['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Search results legend') ?></legend>
-					<div class="infldset">
-						<label class="conl"><?php _e('Sort by')."\n" ?>
-						<br /><select name="sort_by">
-							<option value="0"><?php _e('Sort by post time') ?></option>
-							<option value="1"><?php _e('Sort by author') ?></option>
-							<option value="2"><?php _e('Sort by subject') ?></option>
-							<option value="3"><?php _e('Sort by forum') ?></option>
-						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Sort order')."\n" ?>
-						<br /><select name="sort_dir">
-							<option value="DESC"><?php _e('Descending') ?></option>
-							<option value="ASC"><?php _e('Ascending') ?></option>
-						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Show as')."\n" ?>
-						<br /><select name="show_as">
-							<option value="topics"><?php _e('Show as topics') ?></option>
-							<option value="posts"><?php _e('Show as posts') ?></option>
-						</select>
-						<br /></label>
-						<p class="clearb"><?php _e('Search results info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/search/header.php b/style/themes/MyFeatherBB/view/search/header.php
deleted file mode 100644
index de5e1f0a..00000000
--- a/style/themes/MyFeatherBB/view/search/header.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<?php
-if ($search['show_as'] == 'topics') :
-?>
-<div id="vf" class="blocktable">
-	<h2><span><?php _e('Search results') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
-					<th class="tc2" scope="col"><?php _e('Forum') ?></th>
-					<th class="tc3" scope="col"><?php _e('Replies') ?></th>
-					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-endif;
diff --git a/style/themes/MyFeatherBB/view/search/posts.php b/style/themes/MyFeatherBB/view/search/posts.php
deleted file mode 100644
index 3a2be8ef..00000000
--- a/style/themes/MyFeatherBB/view/search/posts.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockpost<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($cur_search['pid'] == $cur_search['first_post_id']) {
-    echo ' firstpost';
-} ?><?php if ($post_count == 1) {
-    echo ' blockpost1';
-} ?><?php if ($cur_search['item_status'] != '') {
-    echo ' '.$cur_search['item_status'];
-} ?>">
-<h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
-    _e('Re').' ';
-} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
-<div class="box">
-	<div class="inbox">
-		<div class="postbody">
-			<div class="postleft">
-				<dl>
-					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.$feather->utils->forum_number_format($cur_search['num_replies']) ?></span></dd>
-<?php endif; ?>
-					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
-				</dl>
-			</div>
-			<div class="postright">
-				<div class="postmsg">
-					<?php echo $cur_search['message']."\n" ?>
-				</div>
-			</div>
-			<div class="clearer"></div>
-		</div>
-	</div>
-	<div class="inbox">
-		<div class="postfoot clearb">
-			<div class="postfootright">
-				<ul>
-					<li><span><a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
-					<li><span><a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/search/topics.php b/style/themes/MyFeatherBB/view/search/topics.php
deleted file mode 100644
index 265cbb27..00000000
--- a/style/themes/MyFeatherBB/view/search/topics.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<tr class="<?php echo $cur_search['item_status'] ?>">
-	<td class="tcl">
-		<div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
-		<div class="tclcon">
-			<div>
-				<?php echo $subject."\n" ?>
-			</div>
-		</div>
-	</td>
-	<td class="tc2"><?php echo $forum ?></td>
-	<td class="tc3"><?php echo $feather->utils->forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.$feather->utils->format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.$feather->utils->escape($cur_search['last_poster']) ?></span></td>
-</tr>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/userlist.php b/style/themes/MyFeatherBB/view/userlist.php
deleted file mode 100644
index 3166d107..00000000
--- a/style/themes/MyFeatherBB/view/userlist.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('User search') ?></span></h2>
-	<div class="box">
-		<form id="userlist" method="get" action="">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('User find legend') ?></legend>
-					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo $feather->utils->escape($username) ?>" size="25" maxlength="25" /><br /></label>
-<?php endif; ?>						<label class="conl"><?php _e('User group')."\n" ?>
-						<br /><select name="show_group">
-							<option value="-1"<?php if ($show_group == -1) {
-    echo ' selected="selected"';
-} ?>><?php _e('All users') ?></option>
-<?php echo $dropdown_menu ?>
-						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Sort by')."\n" ?>
-						<br /><select name="sort_by">
-							<option value="username"<?php if ($sort_by == 'username') {
-    echo ' selected="selected"';
-} ?>><?php _e('Username') ?></option>
-							<option value="registered"<?php if ($sort_by == 'registered') {
-    echo ' selected="selected"';
-} ?>><?php _e('Registered') ?></option>
-<?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
-    echo ' selected="selected"';
-} ?>><?php _e('No of posts') ?></option>
-<?php endif; ?>						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Sort order')."\n" ?>
-						<br /><select name="sort_dir">
-							<option value="ASC"<?php if ($sort_dir == 'ASC') {
-    echo ' selected="selected"';
-} ?>><?php _e('Ascending') ?></option>
-							<option value="DESC"<?php if ($sort_dir == 'DESC') {
-    echo ' selected="selected"';
-} ?>><?php _e('Descending') ?></option>
-						</select>
-						<br /></label>
-						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? __('User search info').' ' : '').__('User sort info'); ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
-		</form>
-	</div>
-</div>
-
-<div class="linkst">
-	<div class="inbox">
-		<p class="pagelink"><?php echo $paging_links ?></p>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="users1" class="blocktable">
-	<h2><span><?php _e('User list') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Username') ?></th>
-					<th class="tc2" scope="col"><?php _e('Title') ?></th>
-<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Registered') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-			<?php
-            foreach ($userlist_data as $user) {
-                ?>
-					<tr>
-						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.$feather->utils->escape($user['username']).'</a>' ?></td>
-						<td class="tc2"><?php echo get_title($user) ?></td>
-	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo $feather->utils->forum_number_format($user['num_posts']) ?></td>
-	<?php endif;
-                ?>
-						<td class="tcr"><?php echo $feather->utils->format_time($user['registered'], true) ?></td>
-					</tr>
-			<?php
-
-            }
-            if (empty($userlist_data)) {
-                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.__('No hits').'</td></tr>'."\n";
-            }
-            ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox">
-		<p class="pagelink"><?php echo $paging_links ?></p>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/style/themes/MyFeatherBB/view/viewforum.php b/style/themes/MyFeatherBB/view/viewforum.php
deleted file mode 100644
index dbf440af..00000000
--- a/style/themes/MyFeatherBB/view/viewforum.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="vf" class="blocktable">
-	<h2><span><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
-					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-			<?php
-            $topic_count = 0;
-            foreach ($forum_data as $topic) {
-                ++$topic_count;
-                ?>
-					<tr class="<?php echo $topic['item_status'] ?>">
-						<td class="tcl">
-							<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
-							<div class="tclcon">
-								<div>
-									<?php echo $topic['subject_formatted']."\n" ?>
-								</div>
-							</div>
-						</td>
-						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? $feather->utils->forum_number_format($topic['num_replies']) : '-' ?></td>
-	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? $feather->utils->forum_number_format($topic['num_views']) : '-' ?></td>
-	<?php endif;
-                ?>					<td class="tcr"><?php echo $topic['last_post_formatted'] ?></td>
-					</tr>
-			<?php
-
-            }
-            if (empty($forum_data)):
-            ?>
-					<tr class="rowodd inone">
-						<td class="tcl" colspan="<?php echo($feather->forum_settings['o_topic_views'] == 1) ? 4 : 3 ?>">
-							<div class="icon inone"><div class="nosize"><!-- --></div></div>
-							<div class="tclcon">
-								<div>
-									<strong><?php _e('Empty forum') ?></strong>
-								</div>
-							</div>
-						</td>
-					</tr>
-			<?php
-            endif;
-            ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></strong></li>
-		</ul>
-<?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
-		<div class="clearer"></div>
-	</div>
-</div>
diff --git a/style/themes/MyFeatherBB/view/viewtopic.php b/style/themes/MyFeatherBB/view/viewtopic.php
deleted file mode 100644
index d16a862c..00000000
--- a/style/themes/MyFeatherBB/view/viewtopic.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<?php
-$post_count = 1;
-foreach ($post_data as $post) {
-    ?>
-<div id="p<?php echo $post['id'] ?>" class="blockpost<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($post['id'] == $cur_topic['first_post_id']) {
-    echo ' firstpost';
-}
-    ?><?php if ($post_count == 1) {
-    echo ' blockpost1';
-}
-    ?>">
-	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postleft">
-					<dl>
-						<dt><strong><?php echo $post['username_formatted'] ?></strong></dt>
-						<dd class="usertitle"><strong><?php echo $post['user_title_formatted'] ?></strong></dd>
-<?php if ($post['user_avatar'] != '') {
-    echo "\t\t\t\t\t\t".'<dd class="postavatar">'.$post['user_avatar'].'</dd>'."\n";
-}
-    ?>
-<?php if (count($post['user_info'])) {
-    echo "\t\t\t\t\t\t".implode("\n\t\t\t\t\t\t", $post['user_info'])."\n";
-}
-    ?>
-<?php if (count($post['user_contacts'])) {
-    echo "\t\t\t\t\t\t".'<dd class="usercontacts">'.implode(' ', $post['user_contacts']).'</dd>'."\n";
-}
-    ?>
-					</dl>
-				</div>
-				<div class="postright">
-					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
-    _e('Re').' ';
-}
-    ?><?php echo $feather->utils->escape($cur_topic['subject']) ?></h3>
-					<div class="postmsg">
-						<?php echo $post['message']."\n" ?>
-<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.$feather->utils->escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
-}
-    ?>
-					</div>
-<?php if ($post['signature_formatted'] != '') {
-    echo "\t\t\t\t\t".'<div class="postsignature postmsg"><hr />'.$post['signature_formatted'].'</div>'."\n";
-}
-    ?>
-				</div>
-			</div>
-		</div>
-		<div class="inbox">
-			<div class="postfoot clearb">
-				<div class="postfootleft"><?php if ($post['poster_id'] > 1) {
-    echo '<p>'.$post['is_online_formatted'].'</p>';
-}
-    ?></div>
-<?php if (count($post['post_actions'])) {
-    echo "\t\t\t\t".'<div class="postfootright">'."\n\t\t\t\t\t".'<ul>'."\n\t\t\t\t\t\t".implode("\n\t\t\t\t\t\t", $post['post_actions'])."\n\t\t\t\t\t".'</ul>'."\n\t\t\t\t".'</div>'."\n";
-}
-    ?>
-			</div>
-		</div>
-	</div>
-</div>
-<?php
-    ++$post_count;
-}
-?>
-
-<div class="postlinksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></strong></li>
-		</ul>
-<?php echo $subscraction ?>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<?php
-
-// Display quick post if enabled
-if ($quickpost) {
-    $cur_index = 1;
-
-    ?>
-<div id="quickpost" class="blockform">
-	<h2><span><?php _e('Quick post') ?></span></h2>
-	<div class="box">
-		<form id="quickpostform" method="post" action="<?php echo $feather->url->get('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write message legend') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="pid" value="<?php echo $feather->utils->escape($pid) ?>" />
-						<input type="hidden" name="page" value="<?php echo $feather->utils->escape($page_number) ?>" />
-<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
-<?php endif;
-
-    if ($feather->user->is_guest) {
-        $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-        $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
-        ?>
-						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<div class="clearer"></div>
-<?php
-
-    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.__('Message').' <span>'.__('Required').'</span></strong><br />';
-    } else {
-        echo "\t\t\t\t\t\t".'<label>';
-    }
-
-    ?>
-<!-- Init BBcode editor toolbar -->
-<script>
-    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
-        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
-</script>
-<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
-<script>postEditorToolbar('req_message');</script>
-
-<textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
-    ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
-    ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
-    ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
-    ?></span></li>
-						</ul>
-					</div>
-				</fieldset>
-			</div>
-			<?php if ($feather->user->is_guest) : ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Robot title') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Robot info')    ?></p>
-						<label class="required"><strong><?php
-                             $question = array_keys($lang_antispam_questions);
-    $qencoded = md5($question[$index_questions]);
-    echo sprintf(__('Robot question'), $question[$index_questions]);
-    ?>
-							 <span><?php _e('Required') ?></span></strong>
-							 <br />
-							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
-						</label>
-					</div>
-				</fieldset>
-			</div>
-			<?php endif;
-    ?>
-			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php _e('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
-		</form>
-	</div>
-</div>
-<?php
-
-}
diff --git a/view/admin/bans/add_ban.php b/view/admin/bans/add_ban.php
index 1bda2c69..e3ea3744 100644
--- a/view/admin/bans/add_ban.php
+++ b/view/admin/bans/add_ban.php
@@ -31,7 +31,7 @@
 								<th scope="row"><?php _e('Username label') ?></th>
 								<td>
 									<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
-										echo $feather->utils->escape($ban['ban_user']);
+										echo Utils::escape($ban['ban_user']);
 									} ?>" tabindex="1" />
 									<span><?php _e('Username help') ?></span>
 								</td>
@@ -40,7 +40,7 @@
 								<th scope="row"><?php _e('IP label') ?></th>
 								<td>
 									<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
-										echo $feather->utils->escape($ban['ip']);
+										echo Utils::escape($ban['ip']);
 									} ?>" tabindex="2" />
 										<span><?php _e('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
 												printf(' '.__('IP help link'), '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.__('here').'</a>');
@@ -51,7 +51,7 @@
 								<th scope="row"><?php _e('E-mail label') ?></th>
 								<td>
 									<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
-										echo $feather->utils->escape($ban['email']);
+										echo Utils::escape($ban['email']);
 									} ?>" tabindex="3" />
 									<span><?php _e('E-mail help') ?></span>
 								</td>
@@ -70,7 +70,7 @@
 								<th scope="row"><?php _e('Ban message label') ?></th>
 								<td>
 									<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
-										echo $feather->utils->escape($ban['message']);
+										echo Utils::escape($ban['message']);
 									} ?>" tabindex="4" />
 									<span><?php _e('Ban message help') ?></span>
 								</td>
diff --git a/view/admin/bans/search_ban.php b/view/admin/bans/search_ban.php
index 356a0baa..b49f56d0 100644
--- a/view/admin/bans/search_ban.php
+++ b/view/admin/bans/search_ban.php
@@ -50,12 +50,12 @@
         foreach ($ban_data as $cur_ban) {
             ?>
 				<tr>
-					<td class="tcl"><?php echo($cur_ban['username'] != '') ? $feather->utils->escape($cur_ban['username']) : '&#160;' ?></td>
-					<td class="tc2"><?php echo($cur_ban['email'] != '') ? $feather->utils->escape($cur_ban['email']) : '&#160;' ?></td>
-					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? $feather->utils->escape($cur_ban['ip']) : '&#160;' ?></td>
+					<td class="tcl"><?php echo($cur_ban['username'] != '') ? Utils::escape($cur_ban['username']) : '&#160;' ?></td>
+					<td class="tc2"><?php echo($cur_ban['email'] != '') ? Utils::escape($cur_ban['email']) : '&#160;' ?></td>
+					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? Utils::escape($cur_ban['ip']) : '&#160;' ?></td>
 					<td class="tc4"><?php echo $feather->utils->format_time($cur_ban['expire'], true) ?></td>
-					<td class="tc5"><?php echo($cur_ban['message'] != '') ? $feather->utils->escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.$feather->utils->escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
+					<td class="tc5"><?php echo($cur_ban['message'] != '') ? Utils::escape($cur_ban['message']) : '&#160;' ?></td>
+					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.Utils::escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
 					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
 				</tr>
 <?php
diff --git a/view/admin/categories.php b/view/admin/categories.php
index 3a2057b7..a0e85893 100644
--- a/view/admin/categories.php
+++ b/view/admin/categories.php
@@ -53,7 +53,7 @@
 <?php
 
     foreach ($cat_list as $cur_cat) {
-        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.$feather->utils->escape($cur_cat['cat_name']).'</option>'."\n";
+        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.Utils::escape($cur_cat['cat_name']).'</option>'."\n";
     }
 
 ?>
@@ -90,7 +90,7 @@
     foreach ($cat_list as $cur_cat) {
         ?>
 								<tr>
-									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo $feather->utils->escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
+									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo Utils::escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
 									<td><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][order]" value="<?php echo $cur_cat['disp_position'] ?>" size="3" maxlength="3" /></td>
 								</tr>
 <?php
diff --git a/view/admin/censoring.php b/view/admin/censoring.php
index 54a063a6..a73bab1e 100644
--- a/view/admin/censoring.php
+++ b/view/admin/censoring.php
@@ -61,7 +61,7 @@
 <?php
 
     foreach ($word_data as $word) {
-        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.$feather->utils->escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.$feather->utils->escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
+        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.Utils::escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.Utils::escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
     }
 
     ?>
diff --git a/view/admin/forums/admin_forums.php b/view/admin/forums/admin_forums.php
index abcd2bf7..2f8a11cb 100644
--- a/view/admin/forums/admin_forums.php
+++ b/view/admin/forums/admin_forums.php
@@ -31,7 +31,7 @@
 									<td>
 										<select name="cat" tabindex="1">
 											<?php  foreach ($cat_list as $cat) {
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.$feather->utils->escape($cat['cat_name']).'</option>'."\n";
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.Utils::escape($cat['cat_name']).'</option>'."\n";
 											} ?>
 										</select>
 										<span><?php _e('Add forum help') ?></span>
@@ -73,7 +73,7 @@
             ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php _e('Category subhead') ?> <?php echo $feather->utils->escape($cat_data['cat_name']) ?></legend>
+						<legend><?php _e('Category subhead') ?> <?php echo Utils::escape($cat_data['cat_name']) ?></legend>
 						<div class="infldset">
 							<table>
 							<thead>
@@ -90,7 +90,7 @@
 								<tr>
 									<td class="tcl"><a href="<?php echo $feather->url->get('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
 									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
-									<td class="tcr"><strong><?php echo $feather->utils->escape($forum['forum_name']) ?></strong></td>
+									<td class="tcr"><strong><?php echo Utils::escape($forum['forum_name']) ?></strong></td>
 								</tr>
 <?php
     }
diff --git a/view/admin/forums/permissions.php b/view/admin/forums/permissions.php
index 8368cfa9..2320d98b 100644
--- a/view/admin/forums/permissions.php
+++ b/view/admin/forums/permissions.php
@@ -26,11 +26,11 @@
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php _e('Forum name label') ?></th>
-									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo $feather->utils->escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
+									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo Utils::escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Forum description label') ?></th>
-									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo $feather->utils->escape($cur_forum['forum_desc']) ?></textarea></td>
+									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo Utils::escape($cur_forum['forum_desc']) ?></textarea></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Category label') ?></th>
@@ -38,7 +38,7 @@
 										<select name="cat_id" tabindex="3">
 											<?php  foreach ($forum_data as $cat_id => $cat_data) {
 												$selected = ($cat_id == $cur_forum['cat_id']) ? 'selected="selected"' : '';
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.$feather->utils->escape($cat_data['cat_name']).'</option>'."\n";
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.Utils::escape($cat_data['cat_name']).'</option>'."\n";
 											} ?>
 										</select>
 									</td>
@@ -61,7 +61,7 @@
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Redirect label') ?></th>
-									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.$feather->utils->escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
+									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.Utils::escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
 								</tr>
 							</table>
 						</div>
@@ -86,7 +86,7 @@
     foreach ($perm_data as $perm) {
         ?>
 								<tr>
-									<th class="atcl"><?php echo $feather->utils->escape($perm['g_title']) ?></th>
+									<th class="atcl"><?php echo Utils::escape($perm['g_title']) ?></th>
 									<td<?php if (!$perm['read_forum_def']) {
     echo ' class="nodefault"';
 }
diff --git a/view/admin/groups/add_edit_group.php b/view/admin/groups/add_edit_group.php
index f09d4255..4641381b 100644
--- a/view/admin/groups/add_edit_group.php
+++ b/view/admin/groups/add_edit_group.php
@@ -32,14 +32,14 @@
 									<th scope="row"><?php _e('Group title label') ?></th>
 									<td>
 										<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
-    echo $feather->utils->escape($group['info']['g_title']);
+    echo Utils::escape($group['info']['g_title']);
 } ?>" tabindex="1" />
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('User title label') ?></th>
 									<td>
-										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo $feather->utils->escape($group['info']['g_user_title']) ?>" tabindex="2" />
+										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo Utils::escape($group['info']['g_user_title']) ?>" tabindex="2" />
 										<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
 									</td>
 								</tr>
@@ -50,7 +50,7 @@
 											<option value="0"><?php _e('Disable promotion') ?></option>
 											<?php echo $group_list ?>
 										</select>
-										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo $feather->utils->escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
+										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo Utils::escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
 										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
 									</td>
 								</tr>
diff --git a/view/admin/groups/admin_groups.php b/view/admin/groups/admin_groups.php
index 6d43231a..220ce676 100644
--- a/view/admin/groups/admin_groups.php
+++ b/view/admin/groups/admin_groups.php
@@ -32,9 +32,9 @@
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
         if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
         } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
         }
     }
 }
@@ -65,9 +65,9 @@
 foreach ($groups as $cur_group) {
     if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
         if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
         } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.$feather->utils->escape($cur_group['g_title']).'</option>'."\n";
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
         }
     }
 }
@@ -95,7 +95,7 @@
 							<table>
 <?php
 foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.$feather->utils->escape($cur_group['g_title']).'</td></tr>'."\n";
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.Utils::escape($cur_group['g_title']).'</td></tr>'."\n";
 }
 
 ?>
diff --git a/view/admin/groups/confirm_delete.php b/view/admin/groups/confirm_delete.php
index 2ea97c75..9eca30bf 100644
--- a/view/admin/groups/confirm_delete.php
+++ b/view/admin/groups/confirm_delete.php
@@ -23,7 +23,7 @@
 					<fieldset>
 						<legend><?php _e('Confirm delete subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Confirm delete info'), $feather->utils->escape($group_title)) ?></p>
+							<p><?php printf(__('Confirm delete info'), Utils::escape($group_title)) ?></p>
 							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
 						</div>
 					</fieldset>
diff --git a/view/admin/groups/delete_group.php b/view/admin/groups/delete_group.php
index be55e2a4..b3dd67af 100644
--- a/view/admin/groups/delete_group.php
+++ b/view/admin/groups/delete_group.php
@@ -22,7 +22,7 @@
 					<fieldset>
 						<legend><?php _e('Move users subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Move users info'), $feather->utils->escape($group_info['title']), $feather->utils->forum_number_format($group_info['members'])) ?></p>
+							<p><?php printf(__('Move users info'), Utils::escape($group_info['title']), Utils::forum_number_format($group_info['members'])) ?></p>
 							<label><?php _e('Move users label') ?>
 							<select name="move_to_group">
 								<?= $group_list_delete; ?>
diff --git a/view/admin/maintenance/prune.php b/view/admin/maintenance/prune.php
index fa4aea34..78992fe8 100644
--- a/view/admin/maintenance/prune.php
+++ b/view/admin/maintenance/prune.php
@@ -26,7 +26,7 @@
 					<fieldset>
 						<legend><?php _e('Confirm prune subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], $feather->utils->forum_number_format($prune['num_topics'])) ?></p>
+							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], Utils::forum_number_format($prune['num_topics'])) ?></p>
 							<p class="warntext"><?php _e('Confirm prune warn') ?></p>
 						</div>
 					</fieldset>
diff --git a/view/admin/options.php b/view/admin/options.php
index 98e4eed5..ab3d859e 100644
--- a/view/admin/options.php
+++ b/view/admin/options.php
@@ -28,21 +28,21 @@
 								<tr>
 									<th scope="row"><?php _e('Board title label') ?></th>
 									<td>
-										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?>" />
+										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo Utils::escape($feather->forum_settings['o_board_title']) ?>" />
 										<span><?php _e('Board title help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Board desc label') ?></th>
 									<td>
-										<textarea name="form_board_desc" cols="60" rows="3"><?php echo $feather->utils->escape($feather->forum_settings['o_board_desc']) ?></textarea>
+										<textarea name="form_board_desc" cols="60" rows="3"><?php echo Utils::escape($feather->forum_settings['o_board_desc']) ?></textarea>
 										<span><?php _e('Board desc help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Base URL label') ?></th>
 									<td>
-										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo $feather->utils->escape($feather->forum_settings['o_base_url']) ?>" />
+										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo Utils::escape($feather->forum_settings['o_base_url']) ?>" />
 										<span><?php _e('Base URL help') ?></span>
 									</td>
 								</tr>
@@ -231,14 +231,14 @@
 								<tr>
 									<th scope="row"><?php _e('Time format label') ?></th>
 									<td>
-										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo $feather->utils->escape($feather->forum_settings['o_time_format']) ?>" />
+										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo Utils::escape($feather->forum_settings['o_time_format']) ?>" />
 										<span><?php printf(__('Time format help'), gmdate($feather->forum_settings['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Date format label') ?></th>
 									<td>
-										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo $feather->utils->escape($feather->forum_settings['o_date_format']) ?>" />
+										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo Utils::escape($feather->forum_settings['o_date_format']) ?>" />
 										<span><?php printf(__('Date format help'), gmdate($feather->forum_settings['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
 									</td>
 								</tr>
@@ -499,7 +499,7 @@
 								<tr>
 									<th scope="row"><?php _e('Menu items label') ?></th>
 									<td>
-										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
+										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo Utils::escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
 										<span><?php _e('Menu items help') ?></span>
 									</td>
 								</tr>
@@ -566,7 +566,7 @@
 								<tr>
 									<th scope="row"><?php _e('Mailing list label') ?></th>
 									<td>
-										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_mailing_list']) ?></textarea>
+										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_mailing_list']) ?></textarea>
 										<span><?php _e('Mailing list help') ?></span>
 									</td>
 								</tr>
@@ -594,7 +594,7 @@
 								<tr>
 									<th scope="row"><?php _e('Upload directory label') ?></th>
 									<td>
-										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo $feather->utils->escape($feather->forum_settings['o_avatars_dir']) ?>" />
+										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo Utils::escape($feather->forum_settings['o_avatars_dir']) ?>" />
 										<span><?php _e('Upload directory help') ?></span>
 									</td>
 								</tr>
@@ -631,14 +631,14 @@
 								<tr>
 									<th scope="row"><?php _e('Admin e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo $feather->utils->escape($feather->forum_settings['o_admin_email']) ?>" />
+										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo Utils::escape($feather->forum_settings['o_admin_email']) ?>" />
 										<span><?php _e('Admin e-mail help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
 									<td>
-										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo $feather->utils->escape($feather->forum_settings['o_webmaster_email']) ?>" />
+										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo Utils::escape($feather->forum_settings['o_webmaster_email']) ?>" />
 										<span><?php _e('Webmaster e-mail help') ?></span>
 									</td>
 								</tr>
@@ -669,14 +669,14 @@
 								<tr>
 									<th scope="row"><?php _e('SMTP address label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo $feather->utils->escape($feather->forum_settings['o_smtp_host']) ?>" />
+										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo Utils::escape($feather->forum_settings['o_smtp_host']) ?>" />
 										<span><?php _e('SMTP address help') ?></span>
 									</td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('SMTP username label') ?></th>
 									<td>
-										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo $feather->utils->escape($feather->forum_settings['o_smtp_user']) ?>" />
+										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo Utils::escape($feather->forum_settings['o_smtp_user']) ?>" />
 										<span><?php _e('SMTP username help') ?></span>
 									</td>
 								</tr>
@@ -762,7 +762,7 @@
 								<tr>
 									<th scope="row"><?php _e('Rules label') ?></th>
 									<td>
-										<textarea name="form_rules_message" rows="10" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_rules_message']) ?></textarea>
+										<textarea name="form_rules_message" rows="10" cols="55"><?php echo Utils::escape($feather->forum_settings['o_rules_message']) ?></textarea>
 										<span><?php _e('Rules help') ?></span>
 									</td>
 								</tr>
@@ -805,7 +805,7 @@
 								<tr>
 									<th scope="row"><?php _e('Announcement message label') ?></th>
 									<td>
-										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_announcement_message']) ?></textarea>
+										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_announcement_message']) ?></textarea>
 										<span><?php _e('Announcement message help') ?></span>
 									</td>
 								</tr>
@@ -833,7 +833,7 @@
 								<tr>
 									<th scope="row"><?php _e('Maintenance message label') ?></th>
 									<td>
-										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo $feather->utils->escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
+										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
 										<span><?php _e('Maintenance message help') ?></span>
 									</td>
 								</tr>
diff --git a/view/admin/parser.php b/view/admin/parser.php
index 35ee0cbe..07894549 100644
--- a/view/admin/parser.php
+++ b/view/admin/parser.php
@@ -87,12 +87,12 @@
 										<input type="radio" name="config[valid_imgs]" value="1"<?php if ($config['valid_imgs']) {
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
+    echo(' disabled="disabled" title="'. Utils::escape($lang_admin_parser['unavailable']) .'"');
 } ?> /> <strong><?php _e('Yes') ?></strong>
 										<input type="radio" name="config[valid_imgs]" value="0"<?php if (!$config['valid_imgs']) {
     echo ' checked="checked"';
 } if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
+    echo(' disabled="disabled" title="'. Utils::escape($lang_admin_parser['unavailable']) .'"');
 } ?> /> <strong><?php _e('No') ?></strong>
 									</td>
 									<td><?php echo $lang_admin_parser['valid_imgs help'] ?></td>
@@ -101,7 +101,7 @@
 									<th scope="row"><?php echo $lang_admin_parser['max_size'] ?></th>
 									<td colspan="2">
 										<input type="text" name="config[max_size]" size="10" maxlength="8" value="<?php echo($config['max_size'])?>"<?php if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. $feather->utils->escape($lang_admin_parser['unavailable']) .'"');
+    echo(' disabled="disabled" title="'. Utils::escape($lang_admin_parser['unavailable']) .'"');
 } ?> />
 									</td>
 									<td><span><?php echo $lang_admin_parser['max_size help'] ?></span></td>
@@ -165,7 +165,7 @@
         ?>
 								<tr>
 									<td><input type="text" name="smiley_text[<?php echo($i);
-        ?>]" value="<?php echo($feather->utils->escape($key));
+        ?>]" value="<?php echo(Utils::escape($key));
         ?>" size="20" maxlength="80" /></td>
 									<td>
 										<select name="smiley_file[<?php echo($i);
diff --git a/view/admin/reports.php b/view/admin/reports.php
index b364bfdc..c86890e9 100644
--- a/view/admin/reports.php
+++ b/view/admin/reports.php
@@ -28,14 +28,14 @@
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
 									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?= $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
-									<td><?= str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
+									<td><?= str_replace("\n", '<br />', Utils::escape($report['message'])) ?></td>
 								</tr>
 							</table>
 						</div>
@@ -74,18 +74,18 @@
         ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.$feather->utils->escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
+						<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.Utils::escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.$feather->utils->escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
 									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?></th>
-									<td><?= str_replace("\n", '<br />', $feather->utils->escape($report['message'])) ?></td>
+									<td><?= str_replace("\n", '<br />', Utils::escape($report['message'])) ?></td>
 								</tr>
 							</table>
 						</div>
diff --git a/view/admin/statistics.php b/view/admin/statistics.php
index f2fd7a9a..fd964fc2 100644
--- a/view/admin/statistics.php
+++ b/view/admin/statistics.php
@@ -30,7 +30,7 @@
 					</dd>
 					<dt><?php _e('Database label') ?></dt>
 					<dd>
-<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", $feather->utils->forum_number_format($total_records)) ?>
+<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", Utils::forum_number_format($total_records)) ?>
 						<br /><?php printf(__('Database data size')."\n", $total_size) ?>
 <?php endif; ?>					</dd>
 <?php endif; ?>
diff --git a/view/admin/users/find_users.php b/view/admin/users/find_users.php
index 3ddd2324..959bc354 100644
--- a/view/admin/users/find_users.php
+++ b/view/admin/users/find_users.php
@@ -54,11 +54,11 @@
         foreach ($user_data as $user) {
             ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.$feather->utils->escape($user['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo $feather->utils->escape($user['email']) ?>"><?php echo $feather->utils->escape($user['email']) ?></a></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
+					<td class="tc2"><a href="mailto:<?php echo Utils::escape($user['email']) ?>"><?php echo Utils::escape($user['email']) ?></a></td>
 					<td class="tc3"><?php echo $user['user_title'] ?></td>
-					<td class="tc4"><?php echo $feather->utils->forum_number_format($user['num_posts']) ?></td>
-					<td class="tc5"><?php echo($user['admin_note'] != '') ? $feather->utils->escape($user['admin_note']) : '&#160;' ?></td>
+					<td class="tc4"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
+					<td class="tc5"><?php echo($user['admin_note'] != '') ? Utils::escape($user['admin_note']) : '&#160;' ?></td>
 					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
 <?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
 <?php endif;
diff --git a/view/admin/users/move_users.php b/view/admin/users/move_users.php
index a2f96b91..118570af 100644
--- a/view/admin/users/move_users.php
+++ b/view/admin/users/move_users.php
@@ -28,7 +28,7 @@
 									<th scope="row"><?php _e('New group label') ?></th>
 									<td>
 										<select name="new_group" tabindex="1">
-<?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo $feather->utils->escape($group) ?></option>
+<?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo Utils::escape($group) ?></option>
 <?php endforeach;
     ?>
 										</select>
diff --git a/view/admin/users/search_ip.php b/view/admin/users/search_ip.php
index a4db0174..0b62e017 100644
--- a/view/admin/users/search_ip.php
+++ b/view/admin/users/search_ip.php
@@ -45,7 +45,7 @@
         foreach ($ip_data as $ip) {
             ?>
 				<tr>
-					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.$feather->utils->escape($ip['poster_ip']).'/') ?>"><?php echo $feather->utils->escape($ip['poster_ip']) ?></a></td>
+					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.Utils::escape($ip['poster_ip']).'/') ?>"><?php echo Utils::escape($ip['poster_ip']) ?></a></td>
 					<td class="tc2"><?php echo $feather->utils->format_time($ip['last_used']) ?></td>
 					<td class="tc3"><?php echo $ip['used_times'] ?></td>
 					<td class="tcr"><a href="<?php echo $feather->url->get('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
diff --git a/view/admin/users/show_users.php b/view/admin/users/show_users.php
index 99fccb06..b84fdf10 100644
--- a/view/admin/users/show_users.php
+++ b/view/admin/users/show_users.php
@@ -51,11 +51,11 @@
             if (isset($info['user_data'][$cur_poster['poster_id']])) {
                 ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.$feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.Utils::escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
+					<td class="tc2"><a href="mailto:<?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
 					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
-					<td class="tc4"><?php echo $feather->utils->forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
-					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? $feather->utils->escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
+					<td class="tc4"><?php echo Utils::forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
+					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? Utils::escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
 					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
 				</tr>
 <?php
@@ -63,7 +63,7 @@
             } else {
                 ?>
 				<tr>
-					<td class="tcl"><?php echo $feather->utils->escape($cur_poster['poster']) ?></td>
+					<td class="tcl"><?php echo Utils::escape($cur_poster['poster']) ?></td>
 					<td class="tc2">&#160;</td>
 					<td class="tc3"><?php _e('Results guest') ?></td>
 					<td class="tc4">&#160;</td>
diff --git a/view/delete.php b/view/delete.php
index 70453628..43b5f372 100644
--- a/view/delete.php
+++ b/view/delete.php
@@ -17,8 +17,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>
@@ -31,7 +31,7 @@
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.$feather->utils->escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
+					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.Utils::escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
 					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
 				</div>
 			</div>
@@ -47,7 +47,7 @@
 				<div class="postbody">
 					<div class="postleft">
 						<dl>
-							<dt><strong><?php echo $feather->utils->escape($cur_post['poster']) ?></strong></dt>
+							<dt><strong><?php echo Utils::escape($cur_post['poster']) ?></strong></dt>
 							<dd><span><?php echo $feather->utils->format_time($cur_post['posted']) ?></span></dd>
 						</dl>
 					</div>
diff --git a/view/edit.php b/view/edit.php
index ea9c3abe..990b9eec 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -20,8 +20,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
 		</ul>
 	</div>
@@ -69,7 +69,7 @@
 ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
+    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
@@ -84,10 +84,10 @@
 					<input type="hidden" name="form_sent" value="1" />
 					<div class="infldset txtarea">
 <?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo $feather->utils->escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
+						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo Utils::escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
 <?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
 						<script>postEditorToolbar('req_message');</script>
-                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo $feather->utils->escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
+                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo Utils::escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
 							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
 							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
diff --git a/view/help.php b/view/help.php
index 9644da0d..1c659744 100644
--- a/view/help.php
+++ b/view/help.php
@@ -41,8 +41,8 @@
 <div class="box">
 	<div class="inbox">
 		<p><?php _e('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>]<?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>"><?php echo $feather->utils->escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->utils->escape($feather->url->base(true).'/') ?>"><?php echo $feather->utils->escape($feather->url->base(true).'/') ?></a></samp></p>
+		<p><a name="url"></a><code>[url=<?php echo Utils::escape($feather->url->base(true).'/') ?>]<?php echo Utils::escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape($feather->url->base(true).'/') ?>"><?php echo Utils::escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo Utils::escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape($feather->url->base(true).'/') ?>"><?php echo Utils::escape($feather->url->base(true).'/') ?></a></samp></p>
 		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
 		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
@@ -57,7 +57,7 @@
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
-		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo $feather->utils->escape($feather->url->base(true)) ?>/style/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo $feather->utils->escape($feather->url->base(true)) ?>/style/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
+		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo Utils::escape($feather->url->base(true)) ?>/style/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo Utils::escape($feather->url->base(true)) ?>/style/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
 <h2><span><?php _e('Quotes') ?></span></h2>
diff --git a/view/index.php b/view/index.php
index 826fa47e..911d4782 100644
--- a/view/index.php
+++ b/view/index.php
@@ -27,7 +27,7 @@
 	<?php endif;
     ?>
 	<div id="idx<?php echo $forum->cid ?>" class="blocktable">
-	<h2><span><?php echo $feather->utils->escape($forum->cat_name) ?></span></h2>
+	<h2><span><?php echo Utils::escape($forum->cat_name) ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
@@ -46,15 +46,15 @@
     ?>
 				<tr class="<?php echo $forum->item_status ?>">
 					<td class="tcl">
-						<div class="<?php echo $forum->icon_type ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($forum->forum_count_formatted) ?></div></div>
+						<div class="<?php echo $forum->icon_type ?>"><div class="nosize"><?php echo Utils::forum_number_format($forum->forum_count_formatted) ?></div></div>
 						<div class="tclcon">
 							<div>
 								<?php echo $forum->forum_field."\n".$forum->moderators_formatted ?>
 							</div>
 						</div>
 					</td>
-					<td class="tc2"><?php echo $feather->utils->forum_number_format($forum->num_topics_formatted) ?></td>
-					<td class="tc3"><?php echo $feather->utils->forum_number_format($forum->num_posts_formatted) ?></td>
+					<td class="tc2"><?php echo Utils::forum_number_format($forum->num_topics_formatted) ?></td>
+					<td class="tc3"><?php echo Utils::forum_number_format($forum->num_posts_formatted) ?></td>
 					<td class="tcr"><?php echo $forum->last_post_formatted ?></td>
 				</tr>
 	<?php
@@ -85,16 +85,16 @@
 		<div class="inbox">
 			<dl class="conr">
 				<dt><strong><?php _e('Board stats') ?></strong></dt>
-				<dd><span><?php printf(__('No of users'), '<strong>'.$feather->utils->forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of topics'), '<strong>'.$feather->utils->forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of posts'), '<strong>'.$feather->utils->forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of users'), '<strong>'.Utils::forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of topics'), '<strong>'.Utils::forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of posts'), '<strong>'.Utils::forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
 			</dl>
 			<dl class="conl">
 				<dt><strong><?php _e('User info') ?></strong></dt>
 				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
 				<?php if ($feather->forum_settings['o_users_online'] == 1) : ?>
-				<dd><span><?php printf(__('Users online'), '<strong>'.$feather->utils->forum_number_format($online['num_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('Guests online'), '<strong>'.$feather->utils->forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Users online'), '<strong>'.Utils::forum_number_format($online['num_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Guests online'), '<strong>'.Utils::forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
 				<?php endif; ?>
 			</dl>
 			<?php
diff --git a/view/login/form.php b/view/login/form.php
index 6a6d70a0..bc18735a 100644
--- a/view/login/form.php
+++ b/view/login/form.php
@@ -23,7 +23,7 @@
 					<legend><?php _e('Login legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="redirect_url" value="<?php echo $feather->utils->escape($redirect_url) ?>" />
+						<input type="hidden" name="redirect_url" value="<?php echo Utils::escape($redirect_url) ?>" />
 						<label class="conl required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
 						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
 
diff --git a/view/misc/email.php b/view/misc/email.php
index 867ac9ee..20449c8c 100644
--- a/view/misc/email.php
+++ b/view/misc/email.php
@@ -14,7 +14,7 @@
 
 ?>
 <div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo $feather->utils->escape($mail['recipient']) ?></span></h2>
+	<h2><span><?php _e('Send email to') ?> <?php echo Utils::escape($mail['recipient']) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="<?php echo $feather->url->get('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/view/misc/report.php b/view/misc/report.php
index 6eeead9c..55290e3e 100644
--- a/view/misc/report.php
+++ b/view/misc/report.php
@@ -17,8 +17,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
 		</ul>
 	</div>
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
index 06c6987b..ecaf4c66 100644
--- a/view/moderate/moderator_forum.php
+++ b/view/moderate/moderator_forum.php
@@ -18,7 +18,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -30,9 +30,9 @@
 
 <form method="post" action="<?php echo $feather->url->get('moderate/forum/'.$id.'/') ?>">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<input type="hidden" name="page" value="<?php echo $feather->utils->escape($p) ?>" />
+<input type="hidden" name="page" value="<?php echo Utils::escape($p) ?>" />
 <div id="vf" class="blocktable">
-	<h2><span><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></span></h2>
+	<h2><span><?php echo Utils::escape($cur_forum['forum_name']) ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
@@ -55,15 +55,15 @@
                 ?>
 							<tr class="<?php echo $topic['item_status'] ?>">
 					<td class="tcl">
-						<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
+						<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo Utils::forum_number_format($topic_count + $start_from) ?></div></div>
 						<div class="tclcon">
 							<div>
 								<?php echo $topic['subject_disp']."\n" ?>
 							</div>
 						</div>
 					</td>
-					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? $feather->utils->forum_number_format($topic['num_replies']) : '-' ?></td>
-<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? $feather->utils->forum_number_format($topic['num_views']) : '-' ?></td>
+					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? Utils::forum_number_format($topic['num_replies']) : '-' ?></td>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? Utils::forum_number_format($topic['num_views']) : '-' ?></td>
 <?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_disp'] ?></td>
 					<td class="tcmod"><input type="checkbox" name="topics[<?php echo $topic['id'] ?>]" value="1" /></td>
@@ -92,7 +92,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/view/moderate/posts_view.php b/view/moderate/posts_view.php
index 0338555a..ad3aca09 100644
--- a/view/moderate/posts_view.php
+++ b/view/moderate/posts_view.php
@@ -17,8 +17,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -57,7 +57,7 @@
 						<div class="postmsg">
 							<?php echo $post['message']."\n" ?>
 	<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.$feather->utils->escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.Utils::escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 						</div>
@@ -85,8 +85,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/view/post.php b/view/post.php
index 248d7ff3..17c888c4 100644
--- a/view/post.php
+++ b/view/post.php
@@ -18,10 +18,10 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_posting['forum_name']) ?></a></li>
-<?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo $feather->utils->escape($feather->request->post('req_subject')) ?></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_posting['forum_name']) ?></a></li>
+<?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo Utils::escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
-<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_posting['subject']) ?></a></li>
+<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_posting['subject']) ?></a></li>
 <?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
 		</ul>
 	</div>
@@ -81,7 +81,7 @@
 ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
+    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
@@ -102,11 +102,11 @@
     $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
     ?>
 						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
-    echo $feather->utils->escape($post['username']);
+    echo Utils::escape($post['username']);
 }
     ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
-    echo $feather->utils->escape($post['email']);
+    echo Utils::escape($post['email']);
 }
     ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 						<div class="clearer"></div>
@@ -115,11 +115,11 @@
 }
 if ($fid): ?>
 						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
-    echo $feather->utils->escape($post['subject']);
+    echo Utils::escape($post['subject']);
 } ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
 <?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
                         <script>postEditorToolbar('req_message');</script>
-						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? $feather->utils->linebreaks($feather->utils->trim($feather->utils->escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
+						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? $feather->utils->linebreaks($feather->utils->trim(Utils::escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
 							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
 							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
@@ -190,7 +190,7 @@
 			<div class="postbody">
 				<div class="postleft">
 					<dl>
-						<dt><strong><?php echo $feather->utils->escape($post['poster']) ?></strong></dt>
+						<dt><strong><?php echo Utils::escape($post['poster']) ?></strong></dt>
 						<dd><span><?php echo $feather->utils->format_time($post['posted']) ?></span></dd>
 					</dl>
 				</div>
diff --git a/view/profile/delete_user.php b/view/profile/delete_user.php
index 84a3b58d..937a8cd1 100644
--- a/view/profile/delete_user.php
+++ b/view/profile/delete_user.php
@@ -22,7 +22,7 @@
 				<fieldset>
 					<legend><?php _e('Confirm delete legend') ?></legend>
 					<div class="infldset">
-						<p><?php _e('Confirmation info').' <strong>'.$feather->utils->escape($username).'</strong>.' ?></p>
+						<p><?php _e('Confirmation info').' <strong>'.Utils::escape($username).'</strong>.' ?></p>
 						<div class="rbox">
 							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
 						</div>
diff --git a/view/profile/section_admin.php b/view/profile/section_admin.php
index f06eb7d4..1cb7ce4b 100644
--- a/view/profile/section_admin.php
+++ b/view/profile/section_admin.php
@@ -14,7 +14,7 @@
 
 ?>
 	<div class="blockform">
-		<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section admin') ?></span></h2>
+		<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section admin') ?></span></h2>
 		<div class="box">
 			<form id="profile7" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
index 7cce9e3c..dba0f449 100644
--- a/view/profile/section_display.php
+++ b/view/profile/section_display.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section display') ?></span></h2>
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section display') ?></span></h2>
 	<div class="box">
 		<form id="profile5" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/view/profile/section_essentials.php b/view/profile/section_essentials.php
index b45114f6..98387144 100644
--- a/view/profile/section_essentials.php
+++ b/view/profile/section_essentials.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section essentials') ?></span></h2>
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section essentials') ?></span></h2>
 	<div class="box">
 		<form id="profile1" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -241,12 +241,12 @@
 				<fieldset>
 					<legend><?php _e('User activity') ?></legend>
 					<div class="infldset">
-						<p><?php printf(__('Registered info'), $feather->utils->format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.$feather->utils->escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Registered info'), $feather->utils->format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.Utils::escape($user['registration_ip']).'</a>)' : '')) ?></p>
 						<p><?php printf(__('Last post info'), $feather->utils->format_time($user['last_post'])) ?></p>
 						<p><?php printf(__('Last visit info'), $feather->utils->format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
 <?php if ($feather->user->is_admmod): ?>							<label><?php _e('Admin note') ?><br />
-						<input id="admin_note" type="text" name="admin_note" value="<?php echo $feather->utils->escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
+						<input id="admin_note" type="text" name="admin_note" value="<?php echo Utils::escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
diff --git a/view/profile/section_messaging.php b/view/profile/section_messaging.php
index 2d3268dd..606e9aaf 100644
--- a/view/profile/section_messaging.php
+++ b/view/profile/section_messaging.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section messaging') ?></span></h2>
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section messaging') ?></span></h2>
 	<div class="box">
 		<form id="profile3" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -23,11 +23,11 @@
 					<legend><?php _e('Contact details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo $feather->utils->escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
+						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo Utils::escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
 						<label><?php _e('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo $feather->utils->escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo $feather->utils->escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo $feather->utils->escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo Utils::escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
+						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo Utils::escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo Utils::escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/profile/section_personal.php b/view/profile/section_personal.php
index 5ae81801..d78de6dd 100644
--- a/view/profile/section_personal.php
+++ b/view/profile/section_personal.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section personal') ?></span></h2>
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personal') ?></span></h2>
 	<div class="box">
 		<form id="profile2" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -23,10 +23,10 @@
 					<legend><?php _e('Personal details legend') ?></legend>
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo $feather->utils->escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
+						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo Utils::escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
 <?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo $feather->utils->escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo $feather->utils->escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo Utils::escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo Utils::escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>
 					</div>
 				</fieldset>
diff --git a/view/profile/section_personality.php b/view/profile/section_personality.php
index ae9f7b0f..bdb908fd 100644
--- a/view/profile/section_personality.php
+++ b/view/profile/section_personality.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section personality') ?></span></h2>
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personality') ?></span></h2>
 	<div class="box">
 		<form id="profile4" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -35,8 +35,8 @@
 					<div class="infldset">
 						<p><?php _e('Signature info') ?></p>
 						<div class="txtarea">
-							<label><?php printf(__('Sig max size'), $feather->utils->forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
-							<textarea name="signature" rows="4" cols="65"><?php echo $feather->utils->escape($user['signature']) ?></textarea><br /></label>
+							<label><?php printf(__('Sig max size'), Utils::forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
+							<textarea name="signature" rows="4" cols="65"><?php echo Utils::escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
 							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
diff --git a/view/profile/section_privacy.php b/view/profile/section_privacy.php
index 48715858..c630c7e4 100644
--- a/view/profile/section_privacy.php
+++ b/view/profile/section_privacy.php
@@ -14,7 +14,7 @@
 
 ?>
 <div class="blockform">
-	<h2><span><?php echo $feather->utils->escape($user['username']).' - '.__('Section privacy') ?></span></h2>
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section privacy') ?></span></h2>
 	<div class="box">
 		<form id="profile6" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
index f92da260..f2f87973 100644
--- a/view/profile/upload_avatar.php
+++ b/view/profile/upload_avatar.php
@@ -25,7 +25,7 @@
 						<input type="hidden" name="form_sent" value="1" />
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
 						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php _e('Avatar desc'); echo ' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.$feather->utils->file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
+						<p><?php _e('Avatar desc'); echo ' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.Utils::forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.$feather->utils->file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/view/register/email.php b/view/register/email.php
index a93188f9..6cb917e1 100644
--- a/view/register/email.php
+++ b/view/register/email.php
@@ -15,7 +15,7 @@
 ?>
 
 <div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo $feather->utils->escape($recipient) ?></span></h2>
+	<h2><span><?php _e('Send email to') ?> <?php echo Utils::escape($recipient) ?></span></h2>
 	<div class="box">
 		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
@@ -24,7 +24,7 @@
 					<legend><?php _e('Write email') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="redirect_url" value="<?php echo $feather->utils->escape($redirect_url) ?>" />
+						<input type="hidden" name="redirect_url" value="<?php echo Utils::escape($redirect_url) ?>" />
 						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
 						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
diff --git a/view/register/form.php b/view/register/form.php
index d7deb65f..a8a98ade 100644
--- a/view/register/form.php
+++ b/view/register/form.php
@@ -54,7 +54,7 @@
 						<input type="hidden" name="username" value="" />
 						<input type="hidden" name="password" value="" />
 						<label class="required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
-    echo $feather->utils->escape($feather->request->post('req_user'));
+    echo Utils::escape($feather->request->post('req_user'));
 } ?>" size="25" maxlength="25" /><br /></label>
 					</div>
 				</fieldset>
@@ -64,10 +64,10 @@
 					<legend><?php _e('Pass legend') ?></legend>
 					<div class="infldset">
 						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
-    echo $feather->utils->escape($feather->request->post('req_password1'));
+    echo Utils::escape($feather->request->post('req_password1'));
 } ?>" size="16" /><br /></label>
 						<label class="conl required"><strong><?php _e('Confirm pass') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
-    echo $feather->utils->escape($feather->request->post('req_password2'));
+    echo Utils::escape($feather->request->post('req_password2'));
 } ?>" size="16" /><br /></label>
 						<p class="clearb"><?php _e('Pass info') ?></p>
 					</div>
@@ -80,11 +80,11 @@
 <?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
 <?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
-    echo $feather->utils->escape($feather->request->post('req_email1'));
+    echo Utils::escape($feather->request->post('req_email1'));
 } ?>" size="50" maxlength="80" /><br /></label>
 <?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
 						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
-    echo $feather->utils->escape($feather->request->post('req_email2'));
+    echo Utils::escape($feather->request->post('req_email2'));
 } ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>					</div>
 				</fieldset>
diff --git a/view/search/posts.php b/view/search/posts.php
index 3a2be8ef..331c0732 100644
--- a/view/search/posts.php
+++ b/view/search/posts.php
@@ -22,14 +22,14 @@
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
     _e('Re').' ';
-} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
+} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
 		<div class="postbody">
 			<div class="postleft">
 				<dl>
 					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.$feather->utils->forum_number_format($cur_search['num_replies']) ?></span></dd>
+<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.Utils::forum_number_format($cur_search['num_replies']) ?></span></dd>
 <?php endif; ?>
 					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
 				</dl>
diff --git a/view/search/topics.php b/view/search/topics.php
index 265cbb27..2611aa23 100644
--- a/view/search/topics.php
+++ b/view/search/topics.php
@@ -16,7 +16,7 @@
 
 <tr class="<?php echo $cur_search['item_status'] ?>">
 	<td class="tcl">
-		<div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
+		<div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo Utils::forum_number_format($topic_count + $start_from) ?></div></div>
 		<div class="tclcon">
 			<div>
 				<?php echo $subject."\n" ?>
@@ -24,6 +24,6 @@
 		</div>
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
-	<td class="tc3"><?php echo $feather->utils->forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.$feather->utils->format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.$feather->utils->escape($cur_search['last_poster']) ?></span></td>
+	<td class="tc3"><?php echo Utils::forum_number_format($cur_search['num_replies']) ?></td>
+	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.$feather->utils->format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_search['last_poster']) ?></span></td>
 </tr>
\ No newline at end of file
diff --git a/view/userlist.php b/view/userlist.php
index 3166d107..0faf497b 100644
--- a/view/userlist.php
+++ b/view/userlist.php
@@ -21,7 +21,7 @@
 				<fieldset>
 					<legend><?php _e('User find legend') ?></legend>
 					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo $feather->utils->escape($username) ?>" size="25" maxlength="25" /><br /></label>
+<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo Utils::escape($username) ?>" size="25" maxlength="25" /><br /></label>
 <?php endif; ?>						<label class="conl"><?php _e('User group')."\n" ?>
 						<br /><select name="show_group">
 							<option value="-1"<?php if ($show_group == -1) {
@@ -87,9 +87,9 @@
             foreach ($userlist_data as $user) {
                 ?>
 					<tr>
-						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.$feather->utils->escape($user['username']).'</a>' ?></td>
+						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
 						<td class="tc2"><?php echo get_title($user) ?></td>
-	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo $feather->utils->forum_number_format($user['num_posts']) ?></td>
+	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
 	<?php endif;
                 ?>
 						<td class="tcr"><?php echo $feather->utils->format_time($user['registered'], true) ?></td>
diff --git a/view/viewforum.php b/view/viewforum.php
index dbf440af..84d94a28 100644
--- a/view/viewforum.php
+++ b/view/viewforum.php
@@ -17,7 +17,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -28,7 +28,7 @@
 </div>
 
 <div id="vf" class="blocktable">
-	<h2><span><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></span></h2>
+	<h2><span><?php echo Utils::escape($cur_forum['forum_name']) ?></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<table>
@@ -48,15 +48,15 @@
                 ?>
 					<tr class="<?php echo $topic['item_status'] ?>">
 						<td class="tcl">
-							<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo $feather->utils->forum_number_format($topic_count + $start_from) ?></div></div>
+							<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo Utils::forum_number_format($topic_count + $start_from) ?></div></div>
 							<div class="tclcon">
 								<div>
 									<?php echo $topic['subject_formatted']."\n" ?>
 								</div>
 							</div>
 						</td>
-						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? $feather->utils->forum_number_format($topic['num_replies']) : '-' ?></td>
-	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? $feather->utils->forum_number_format($topic['num_views']) : '-' ?></td>
+						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? Utils::forum_number_format($topic['num_replies']) : '-' ?></td>
+	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? Utils::forum_number_format($topic['num_views']) : '-' ?></td>
 	<?php endif;
                 ?>					<td class="tcr"><?php echo $topic['last_post_formatted'] ?></td>
 					</tr>
@@ -92,7 +92,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
 		<div class="clearer"></div>
diff --git a/view/viewtopic.php b/view/viewtopic.php
index d16a862c..b97809aa 100644
--- a/view/viewtopic.php
+++ b/view/viewtopic.php
@@ -18,8 +18,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -66,11 +66,11 @@
 					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
     _e('Re').' ';
 }
-    ?><?php echo $feather->utils->escape($cur_topic['subject']) ?></h3>
+    ?><?php echo Utils::escape($cur_topic['subject']) ?></h3>
 					<div class="postmsg">
 						<?php echo $post['message']."\n" ?>
 <?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.$feather->utils->escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.Utils::escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
 }
     ?>
 					</div>
@@ -108,8 +108,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo $feather->utils->escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo $feather->utils->escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 <?php echo $subscraction ?>
 		<div class="clearer"></div>
@@ -133,8 +133,8 @@
 					<legend><?php _e('Write message legend') ?></legend>
 					<div class="infldset txtarea">
 						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="pid" value="<?php echo $feather->utils->escape($pid) ?>" />
-						<input type="hidden" name="page" value="<?php echo $feather->utils->escape($page_number) ?>" />
+						<input type="hidden" name="pid" value="<?php echo Utils::escape($pid) ?>" />
+						<input type="hidden" name="page" value="<?php echo Utils::escape($page_number) ?>" />
 <?php if ($feather->forum_settings['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
 <?php endif;
 
@@ -155,7 +155,7 @@
     ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo $feather->utils->escape($feather->url->base(true)); ?>',
+    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
 <script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>

From 4b8a446258d7dab206397a1278444a87a8126d46 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 00:16:27 +0200
Subject: [PATCH 306/353] Some more Utils

---
 featherbb/Core/Url.php          |  4 +++-
 featherbb/Helpers/functions.php | 22 ++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/featherbb/Core/Url.php b/featherbb/Core/Url.php
index dd99a028..43373379 100644
--- a/featherbb/Core/Url.php
+++ b/featherbb/Core/Url.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB;
 
+use FeatherBB\Utils;
+
 class Url
 {
     protected $url_replace = array(
@@ -717,7 +719,7 @@ public function url_friendly($str)
     {
         $str = strtr($str, $this->url_replace);
         $str = strtolower(utf8_decode($str));
-        $str = $this->feather->utils->trim(preg_replace(array('/[^a-z0-9\s]/', '/[\s]+/'), array('', '-'), $str), '-');
+        $str = Utils::trim(preg_replace(array('/[^a-z0-9\s]/', '/[\s]+/'), array('', '-'), $str), '-');
 
         if (empty($str)) {
             $str = 'view';
diff --git a/featherbb/Helpers/functions.php b/featherbb/Helpers/functions.php
index 136706dd..6199868c 100644
--- a/featherbb/Helpers/functions.php
+++ b/featherbb/Helpers/functions.php
@@ -40,9 +40,9 @@ function check_username($username, $errors, $exclude_id = null)
     $username = preg_replace('%\s+%s', ' ', $username);
 
     // Validate username
-    if ($feather->utils->strlen($username) < 2) {
+    if (\FeatherBB\Utils::strlen($username) < 2) {
         $errors[] = __('Username too short');
-    } elseif ($feather->utils->strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
+    } elseif (\FeatherBB\Utils::strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
         $errors[] = __('Username too long');
     } elseif (!strcasecmp($username, 'Guest') || !utf8_strcasecmp($username, __('Guest'))) {
         $errors[] = __('Username guest');
@@ -62,11 +62,11 @@ function check_username($username, $errors, $exclude_id = null)
     // Check that the username (or a too similar username) is not already registered
     $query = (!is_null($exclude_id)) ? ' AND id!='.$exclude_id : '';
 
-    $result = \DB::for_table('online')->raw_query('SELECT username FROM '.$feather->forum_settings['db_prefix'].'users WHERE (UPPER(username)=UPPER(:username1) OR UPPER(username)=UPPER(:username2)) AND id>1'.$query, array(':username1' => $username, ':username2' => $feather->utils->ucp_preg_replace('%[^\p{L}\p{N}]%u', '', $username)))->find_one();
+    $result = \DB::for_table('online')->raw_query('SELECT username FROM '.$feather->forum_settings['db_prefix'].'users WHERE (UPPER(username)=UPPER(:username1) OR UPPER(username)=UPPER(:username2)) AND id>1'.$query, array(':username1' => $username, ':username2' => \FeatherBB\Utils::ucp_preg_replace('%[^\p{L}\p{N}]%u', '', $username)))->find_one();
 
     if ($result) {
         $busy = $result['username'];
-        $errors[] = __('Username dupe 1').' '.Utils::escape($busy).'. '.__('Username dupe 2');
+        $errors[] = __('Username dupe 1').' '.\FeatherBB\Utils::escape($busy).'. '.__('Username dupe 2');
     }
 
     // Check username for any banned usernames
@@ -95,7 +95,7 @@ function generate_avatar_markup($user_id)
         $path = $feather->config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type;
 
         if (file_exists(FEATHER_ROOT.$path) && $img_size = getimagesize(FEATHER_ROOT.$path)) {
-            $avatar_markup = '<img src="'.Utils::escape($feather->url->base(true).'/'.$path.'?m='.filemtime(FEATHER_ROOT.$path)).'" '.$img_size[3].' alt="" />';
+            $avatar_markup = '<img src="'.\FeatherBB\Utils::escape($feather->url->base(true).'/'.$path.'?m='.filemtime(FEATHER_ROOT.$path)).'" '.$img_size[3].' alt="" />';
             break;
         }
     }
@@ -118,7 +118,7 @@ function generate_page_title($page_title, $p = null)
     $page_title = array_reverse($page_title);
 
     if ($p > 1) {
-        $page_title[0] .= ' ('.sprintf(__('Page'), Utils::forum_number_format($p)).')';
+        $page_title[0] .= ' ('.sprintf(__('Page'), \FeatherBB\Utils::forum_number_format($p)).')';
     }
 
     $crumbs = implode(__('Title separator'), $page_title);
@@ -360,7 +360,7 @@ function censor_words($text)
     }
 
     if (!empty($search_for) && !empty($replace_with)) {
-        return substr($feather->utils->ucp_preg_replace($search_for, $replace_with, ' '.$text.' '), 1, -1);
+        return substr(\FeatherBB\Utils::ucp_preg_replace($search_for, $replace_with, ' '.$text.' '), 1, -1);
     } else {
         return $text;
     }
@@ -376,8 +376,6 @@ function get_title($user)
     global $feather_bans;
     static $ban_list;
 
-    $feather = \Slim\Slim::getInstance();
-
     // If not already built in a previous call, build an array of lowercase banned usernames
     if (empty($ban_list)) {
         $ban_list = array();
@@ -388,7 +386,7 @@ function get_title($user)
 
     // If the user has a custom title
     if ($user['title'] != '') {
-        $user_title = Utils::escape($user['title']);
+        $user_title = \FeatherBB\Utils::escape($user['title']);
     }
     // If the user is banned
     elseif (in_array(utf8_strtolower($user['username']), $ban_list)) {
@@ -396,7 +394,7 @@ function get_title($user)
     }
     // If the user group has a default user title
     elseif ($user['g_user_title'] != '') {
-        $user_title = Utils::escape($user['g_user_title']);
+        $user_title = \FeatherBB\Utils::escape($user['g_user_title']);
     }
     // If the user is a guest
     elseif ($user['g_id'] == FEATHER_GUEST) {
@@ -434,7 +432,7 @@ function message($msg, $http_status = null, $no_back_link = false)
 
     if (!defined('FEATHER_HEADER')) {
         $feather->view2->setPageInfo(array(
-            'title' => array(Utils::escape($feather->config['o_board_title']), __('Info')),
+            'title' => array(\FeatherBB\Utils::escape($feather->config['o_board_title']), __('Info')),
         ));
     }
 

From 1d4c56bdbf1b43bf529921f4db59338290dcecc6 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 00:27:48 +0200
Subject: [PATCH 307/353] Get rid of lasts message(

---
 featherbb/Core/Error.php        | 35 +++++++++++++++++--
 featherbb/Helpers/functions.php | 37 --------------------
 featherbb/Model/Admin/Bans.php  |  2 +-
 featherbb/Model/Moderate.php    |  4 +--
 featherbb/Model/Post.php        |  4 +--
 featherbb/Model/Profile.php     | 62 ++++++++++++++++-----------------
 6 files changed, 69 insertions(+), 75 deletions(-)

diff --git a/featherbb/Core/Error.php b/featherbb/Core/Error.php
index 4616f8b5..8f46b73b 100644
--- a/featherbb/Core/Error.php
+++ b/featherbb/Core/Error.php
@@ -11,8 +11,39 @@
 
 class Error extends \Exception
 {
-    public function __construct($message, $code = 200)
+    public function __construct($message, $code = 200, $no_back_link = false)
     {
-        parent::__construct($message, $code, null);
+        $this->feather = \Slim\Slim::getInstance();
+        return $this->error($message, $code, $no_back_link);
+    }
+
+    protected function error($msg, $http_status = null, $no_back_link)
+    {
+        // Did we receive a custom header?
+        if (!is_null($http_status)) {
+            header('HTTP/1.1 ' . $http_status);
+        }
+
+        $http_status = (int) $http_status;
+        if ($http_status > 0) {
+            $this->feather->response->setStatus($http_status);
+        }
+
+        // Overwrite existing body
+        $this->feather->response->setBody('');
+
+        if (!defined('FEATHER_HEADER')) {
+            $this->feather->view2->setPageInfo(array(
+                'title' => array(\FeatherBB\Utils::escape($this->feather->config['o_board_title']), __('Info')),
+            ));
+        }
+
+        $this->feather->view2->setPageInfo(array(
+            'msg'    =>    $msg,
+            'no_back_link'    => $no_back_link,
+        ))->addTemplate('message.php')->display();
+
+        // Don't display anything after a message
+        $this->feather->stop();
     }
 }
diff --git a/featherbb/Helpers/functions.php b/featherbb/Helpers/functions.php
index 6199868c..54867514 100644
--- a/featherbb/Helpers/functions.php
+++ b/featherbb/Helpers/functions.php
@@ -409,43 +409,6 @@ function get_title($user)
 }
 
 
-//
-// Display a message
-//
-function message($msg, $http_status = null, $no_back_link = false)
-{
-    // Did we receive a custom header?
-    if (!is_null($http_status)) {
-        header('HTTP/1.1 ' . $http_status);
-    }
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    $http_status = (int) $http_status;
-    if ($http_status > 0) {
-        $feather->response->setStatus($http_status);
-    }
-
-    // Overwrite existing body
-    $feather->response->setBody('');
-
-    if (!defined('FEATHER_HEADER')) {
-        $feather->view2->setPageInfo(array(
-            'title' => array(\FeatherBB\Utils::escape($feather->config['o_board_title']), __('Info')),
-        ));
-    }
-
-    $feather->view2->setPageInfo(array(
-        'message'    =>    $msg,
-        'no_back_link'    => $no_back_link,
-        ))->addTemplate('message.php')->display();
-
-    // Don't display anything after a message
-    $feather->stop();
-}
-
-
 //
 // Generate a random key of length $len
 //
diff --git a/featherbb/Model/Admin/Bans.php b/featherbb/Model/Admin/Bans.php
index b8da6a66..519acbaf 100644
--- a/featherbb/Model/Admin/Bans.php
+++ b/featherbb/Model/Admin/Bans.php
@@ -132,7 +132,7 @@ public function edit_ban_info($id)
             $ban['message'] = $result['message'];
             $ban['expire'] = $result['expire'];
         } else {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         $diff = ($this->user->timezone + $this->user->dst) * 3600;
diff --git a/featherbb/Model/Moderate.php b/featherbb/Model/Moderate.php
index 2c346b9b..d438f679 100644
--- a/featherbb/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -28,7 +28,7 @@ public function __construct()
     public function display_ip_info($ip)
     {
         $ip = $this->hook->fire('display_ip_info', $ip);
-        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.$this->feather->url->get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        throw new \FeatherBB\Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.$this->feather->url->get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function display_ip_address_post($pid)
@@ -46,7 +46,7 @@ public function display_ip_address_post($pid)
 
         $ip = $this->hook->fire('display_ip_address_post', $ip);
 
-        message(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.$this->feather->url->get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        throw new \FeatherBB\Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.$this->feather->url->get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function get_moderators($fid)
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
index 1124c8c2..a2bf32e2 100644
--- a/featherbb/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -66,7 +66,7 @@ public function get_info_post($tid, $fid)
         $cur_posting = $cur_posting->find_one();
 
         if (!$cur_posting) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         $cur_posting = $this->hook->fire('get_info_post', $cur_posting);
@@ -762,7 +762,7 @@ public function get_quote_message($qid, $tid)
         $quote = $quote->find_one();
 
         if (!$quote) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         // If the message contains a code tag we have to split it up (text within [code][/code] shouldn't be touched)
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index 37dba267..fbd2b8d7 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -200,7 +200,7 @@ public function change_email($id)
             $this->hook->fire('change_email_post');
 
             if (\FeatherBB\Utils::hash($this->request->post('req_password')) !== $this->user->password) {
-                message(__('Wrong pass'));
+                throw new \FeatherBB\Error(__('Wrong pass'));
             }
 
             // Validate the email address
@@ -309,7 +309,7 @@ public function change_email($id)
 
             $this->hook->fire('change_email_sent');
 
-            message(__('Activate email sent').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', true);
+            throw new \FeatherBB\Error(__('Activate email sent').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', true);
         }
         $this->hook->fire('change_email');
     }
@@ -319,7 +319,7 @@ public function upload_avatar($id, $files_data)
         $files_data = $this->hook->fire('upload_avatar_start', $files_data, $id);
 
         if (!isset($files_data['req_file'])) {
-            message(__('No file'));
+            throw new \FeatherBB\Error(__('No file'));
         }
 
         $uploaded_file = $files_data['req_file'];
@@ -329,25 +329,25 @@ public function upload_avatar($id, $files_data)
             switch ($uploaded_file['error']) {
                 case 1: // UPLOAD_ERR_INI_SIZE
                 case 2: // UPLOAD_ERR_FORM_SIZE
-                    message(__('Too large ini'));
+                    throw new \FeatherBB\Error(__('Too large ini'));
                     break;
 
                 case 3: // UPLOAD_ERR_PARTIAL
-                    message(__('Partial upload'));
+                    throw new \FeatherBB\Error(__('Partial upload'));
                     break;
 
                 case 4: // UPLOAD_ERR_NO_FILE
-                    message(__('No file'));
+                    throw new \FeatherBB\Error(__('No file'));
                     break;
 
                 case 6: // UPLOAD_ERR_NO_TMP_DIR
-                    message(__('No tmp directory'));
+                    throw new \FeatherBB\Error(__('No tmp directory'));
                     break;
 
                 default:
                     // No error occured, but was something actually uploaded?
                     if ($uploaded_file['size'] == 0) {
-                        message(__('No file'));
+                        throw new \FeatherBB\Error(__('No file'));
                     }
                     break;
             }
@@ -359,17 +359,17 @@ public function upload_avatar($id, $files_data)
             // Preliminary file check, adequate in most cases
             $allowed_types = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/png', 'image/x-png');
             if (!in_array($uploaded_file['type'], $allowed_types)) {
-                message(__('Bad type'));
+                throw new \FeatherBB\Error(__('Bad type'));
             }
 
             // Make sure the file isn't too big
             if ($uploaded_file['size'] > $this->config['o_avatars_size']) {
-                message(__('Too large').' '.Utils::forum_number_format($this->config['o_avatars_size']).' '.__('bytes').'.');
+                throw new \FeatherBB\Error(__('Too large').' '.Utils::forum_number_format($this->config['o_avatars_size']).' '.__('bytes').'.');
             }
 
             // Move the file to the avatar directory. We do this before checking the width/height to circumvent open_basedir restrictions
             if (!@move_uploaded_file($uploaded_file['tmp_name'], FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp')) {
-                message(__('Move failed').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.');
+                throw new \FeatherBB\Error(__('Move failed').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.');
             }
 
             list($width, $height, $type, ) = @getimagesize(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
@@ -384,13 +384,13 @@ public function upload_avatar($id, $files_data)
             } else {
                 // Invalid type
                 @unlink(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
-                message(__('Bad type'));
+                throw new \FeatherBB\Error(__('Bad type'));
             }
 
             // Now check the width/height
             if (empty($width) || empty($height) || $width > $this->config['o_avatars_width'] || $height > $this->config['o_avatars_height']) {
                 @unlink(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
-                message(__('Too wide or high').' '.$this->config['o_avatars_width'].'x'.$this->config['o_avatars_height'].' '.__('pixels').'.');
+                throw new \FeatherBB\Error(__('Too wide or high').' '.$this->config['o_avatars_width'].'x'.$this->config['o_avatars_height'].' '.__('pixels').'.');
             }
 
             // Delete any old avatars and put the new one in place
@@ -398,7 +398,7 @@ public function upload_avatar($id, $files_data)
             @rename(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp', FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.$extension);
             @chmod(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.$extension, 0644);
         } else {
-            message(__('Unknown failure'));
+            throw new \FeatherBB\Error(__('Unknown failure'));
         }
 
         $uploaded_file = $this->hook->fire('upload_avatar', $uploaded_file);
@@ -580,7 +580,7 @@ public function promote_user($id)
         $next_group_id = $next_group_id->find_one_col('g.g_promote_next_group');
 
         if (!$next_group_id) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         // Update the user
@@ -613,7 +613,7 @@ public function delete_user($id)
         $username = $result['username'];
 
         if ($group_id == FEATHER_ADMIN) {
-            message(__('No delete admin message'));
+            throw new \FeatherBB\Error(__('No delete admin message'));
         }
 
         if ($this->request->post('delete_user_comply')) {
@@ -752,7 +752,7 @@ public function fetch_user_group($id)
         $info = $info->find_one();
 
         if (!$info) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         return $info;
@@ -782,7 +782,7 @@ public function update_profile($id, $info, $section)
                     $languages = \FeatherBB\Lister::getLangs();
                     $form['language'] = Utils::trim($this->request->post('form_language'));
                     if (!in_array($form['language'], $languages)) {
-                        message(__('Bad request'), '404');
+                        throw new \FeatherBB\Error(__('Bad request'), 404);
                     }
                 }
 
@@ -797,7 +797,7 @@ public function update_profile($id, $info, $section)
                             $errors = '';
                             $errors = check_username($form['username'], $errors, $id);
                             if (!empty($errors)) {
-                                message($errors[0]);
+                                throw new \FeatherBB\Error($errors[0]);
                             }
 
                             $username_updated = true;
@@ -814,7 +814,7 @@ public function update_profile($id, $info, $section)
                     // Validate the email address
                     $form['email'] = strtolower(Utils::trim($this->request->post('req_email')));
                     if (!$this->email->is_valid_email($form['email'])) {
-                        message(__('Invalid email'));
+                        throw new \FeatherBB\Error(__('Invalid email'));
                     }
                 }
 
@@ -835,14 +835,14 @@ public function update_profile($id, $info, $section)
                         $url = $this->feather->url->is_valid($form['url']);
 
                         if ($url === false) {
-                            message(__('Invalid website URL'));
+                            throw new \FeatherBB\Error(__('Invalid website URL'));
                         }
 
                         $form['url'] = $url['url'];
                     }
                 } else {
                     if (!empty($form['url'])) {
-                        message(__('Website not allowed'));
+                        throw new \FeatherBB\Error(__('Website not allowed'));
                     }
 
                     $form['url'] = '';
@@ -859,7 +859,7 @@ public function update_profile($id, $info, $section)
                         $forbidden = array('member', 'moderator', 'administrator', 'banned', 'guest', utf8_strtolower(__('Member')), utf8_strtolower(__('Moderator')), utf8_strtolower(__('Administrator')), utf8_strtolower(__('Banned')), utf8_strtolower(__('Guest')));
 
                         if (in_array(utf8_strtolower($form['title']), $forbidden)) {
-                            message(__('Forbidden title'));
+                            throw new \FeatherBB\Error(__('Forbidden title'));
                         }
                     }
                 }
@@ -879,7 +879,7 @@ public function update_profile($id, $info, $section)
 
                 // If the ICQ UIN contains anything other than digits it's invalid
                 if (preg_match('%[^0-9]%', $form['icq'])) {
-                    message(__('Bad ICQ'));
+                    throw new \FeatherBB\Error(__('Bad ICQ'));
                 }
 
                 break;
@@ -895,9 +895,9 @@ public function update_profile($id, $info, $section)
 
                     // Validate signature
                     if (Utils::strlen($form['signature']) > $this->config['p_sig_length']) {
-                        message(sprintf(__('Sig too long'), $this->config['p_sig_length'], Utils::strlen($form['signature']) - $this->config['p_sig_length']));
+                        throw new \FeatherBB\Error(sprintf(__('Sig too long'), $this->config['p_sig_length'], Utils::strlen($form['signature']) - $this->config['p_sig_length']));
                     } elseif (substr_count($form['signature'], "\n") > ($this->config['p_sig_lines']-1)) {
-                        message(sprintf(__('Sig too many lines'), $this->config['p_sig_lines']));
+                        throw new \FeatherBB\Error(sprintf(__('Sig too many lines'), $this->config['p_sig_lines']));
                     } elseif ($form['signature'] && $this->config['p_sig_all_caps'] == '0' && Utils::is_all_uppercase($form['signature']) && !$this->user->is_admmod) {
                         $form['signature'] = utf8_ucwords(utf8_strtolower($form['signature']));
                     }
@@ -909,7 +909,7 @@ public function update_profile($id, $info, $section)
                         $form['signature'] = $this->feather->parser->preparse_bbcode($form['signature'], $errors, true);
 
                         if (count($errors) > 0) {
-                            message('<ul><li>'.implode('</li><li>', $errors).'</li></ul>');
+                            throw new \FeatherBB\Error('<ul><li>'.implode('</li><li>', $errors).'</li></ul>');
                         }
                     }
                 }
@@ -952,7 +952,7 @@ public function update_profile($id, $info, $section)
                     $styles = \FeatherBB\Lister::getStyles();
                     $form['style'] = Utils::trim($this->request->post('form_style'));
                     if (!in_array($form['style'], $styles)) {
-                        message(__('Bad request'), '404');
+                        throw new \FeatherBB\Error(__('Bad request'), 404);
                     }
                 }
 
@@ -975,7 +975,7 @@ public function update_profile($id, $info, $section)
             }
 
             default:
-                message(__('Bad request'), '404');
+                throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         $form = $this->hook->fire('update_profile_form', $form, $section, $id, $info);
@@ -987,7 +987,7 @@ public function update_profile($id, $info, $section)
         }
 
         if (empty($temp)) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         $update_user = DB::for_table('users')
@@ -1099,7 +1099,7 @@ public function get_user_info($id)
         $user = $user->find_one();
 
         if (!$user) {
-            message(__('Bad request'), '404');
+            throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
         return $user;

From 3ba5b894e95b53a32f96e12a0dcc59c65c868514 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 00:31:57 +0200
Subject: [PATCH 308/353] Rename view2 to template

---
 featherbb/Controller/Admin/Bans.php        |  8 ++--
 featherbb/Controller/Admin/Categories.php  |  2 +-
 featherbb/Controller/Admin/Censoring.php   |  2 +-
 featherbb/Controller/Admin/Forums.php      |  6 +--
 featherbb/Controller/Admin/Groups.php      |  8 ++--
 featherbb/Controller/Admin/Index.php       |  2 +-
 featherbb/Controller/Admin/Maintenance.php |  6 +--
 featherbb/Controller/Admin/Options.php     |  2 +-
 featherbb/Controller/Admin/Parser.php      |  2 +-
 featherbb/Controller/Admin/Permissions.php |  2 +-
 featherbb/Controller/Admin/Plugins.php     |  4 +-
 featherbb/Controller/Admin/Reports.php     |  2 +-
 featherbb/Controller/Admin/Statistics.php  |  2 +-
 featherbb/Controller/Admin/Users.php       | 16 +++----
 featherbb/Controller/Auth.php              |  4 +-
 featherbb/Controller/Delete.php            |  2 +-
 featherbb/Controller/Edit.php              |  2 +-
 featherbb/Controller/Help.php              |  2 +-
 featherbb/Controller/Index.php             |  2 +-
 featherbb/Controller/Install.php           |  6 +--
 featherbb/Controller/Login.php             |  4 +-
 featherbb/Controller/Misc.php              |  6 +--
 featherbb/Controller/Moderate.php          | 18 ++++----
 featherbb/Controller/Post.php              |  2 +-
 featherbb/Controller/Profile.php           | 50 +++++++++++-----------
 featherbb/Controller/Register.php          |  4 +-
 featherbb/Controller/Search.php            | 14 +++---
 featherbb/Controller/Userlist.php          |  2 +-
 featherbb/Controller/Viewforum.php         | 12 +++---
 featherbb/Controller/Viewtopic.php         | 12 +++---
 featherbb/Core/AdminUtils.php              |  2 +-
 featherbb/Core/Auth.php                    |  2 +-
 featherbb/Core/Core.php                    |  6 +--
 featherbb/Core/Csrf.php                    |  2 +-
 featherbb/Core/Error.php                   |  4 +-
 featherbb/Model/Search.php                 |  4 +-
 featherbb/routes.php                       |  2 +-
 37 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/featherbb/Controller/Admin/Bans.php b/featherbb/Controller/Admin/Bans.php
index 76c93a8c..a769f9a3 100644
--- a/featherbb/Controller/Admin/Bans.php
+++ b/featherbb/Controller/Admin/Bans.php
@@ -47,7 +47,7 @@ public function display()
 
             $ban_data = $this->model->find_ban($start_from);
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                     'admin_console' => true,
                     'page' => $p,
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Bans'), __('Results head')),
@@ -59,7 +59,7 @@ public function display()
         else {
             \FeatherBB\AdminUtils::generateAdminMenu('bans');
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                     'admin_console' => true,
                     'focus_element' => array('bans', 'new_ban_user'),
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Bans')),
@@ -76,7 +76,7 @@ public function add($id = null)
 
         \FeatherBB\AdminUtils::generateAdminMenu('bans');
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'admin_console' => true,
                 'focus_element' => array('bans2', 'ban_user'),
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Bans')),
@@ -98,7 +98,7 @@ public function edit($id)
         }
         \FeatherBB\AdminUtils::generateAdminMenu('bans');
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'admin_console' => true,
                 'focus_element' => array('bans2', 'ban_user'),
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Bans')),
diff --git a/featherbb/Controller/Admin/Categories.php b/featherbb/Controller/Admin/Categories.php
index cd1463c3..2a94c08d 100644
--- a/featherbb/Controller/Admin/Categories.php
+++ b/featherbb/Controller/Admin/Categories.php
@@ -88,7 +88,7 @@ public function display()
     {
         \FeatherBB\AdminUtils::generateAdminMenu('categories');
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Categories')),
                 'active_page' => 'admin',
                 'admin_console' => true,
diff --git a/featherbb/Controller/Admin/Censoring.php b/featherbb/Controller/Admin/Censoring.php
index ec9c6524..41707ea1 100644
--- a/featherbb/Controller/Admin/Censoring.php
+++ b/featherbb/Controller/Admin/Censoring.php
@@ -48,7 +48,7 @@ public function display()
 
         \FeatherBB\AdminUtils::generateAdminMenu('censoring');
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'title'    =>    array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Censoring')),
                 'focus_element'    =>    array('censoring', 'new_search_for'),
                 'active_page'    =>    'admin',
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
index 33b675ac..5f8dd432 100644
--- a/featherbb/Controller/Admin/Forums.php
+++ b/featherbb/Controller/Admin/Forums.php
@@ -116,7 +116,7 @@ public function edit_forum($forum_id)
         } else {
             \FeatherBB\AdminUtils::generateAdminMenu('forums');
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                     'title'    =>    array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Forums')),
                     'active_page'    =>    'admin',
                     'admin_console'    =>    true,
@@ -142,7 +142,7 @@ public function delete_forum($forum_id)
 
             \FeatherBB\AdminUtils::generateAdminMenu('forums');
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                     'title'    =>    array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Forums')),
                     'active_page'    =>    'admin',
                     'admin_console'    =>    true,
@@ -176,7 +176,7 @@ public function display()
         \FeatherBB\AdminUtils::generateAdminMenu('forums');
 
         $categories_model = new \FeatherBB\Model\Admin\Categories();
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Forums')),
                 'active_page' => 'admin',
                 'admin_console' => true,
diff --git a/featherbb/Controller/Admin/Groups.php b/featherbb/Controller/Admin/Groups.php
index 6bdd128a..fa9a8c9a 100644
--- a/featherbb/Controller/Admin/Groups.php
+++ b/featherbb/Controller/Admin/Groups.php
@@ -40,7 +40,7 @@ public function display()
 
         \FeatherBB\AdminUtils::generateAdminMenu('groups');
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('User groups')),
                 'active_page' => 'admin',
                 'admin_console' => true,
@@ -71,7 +71,7 @@ public function delete($id)
             } else {
                 \FeatherBB\AdminUtils::generateAdminMenu('groups');
 
-                $this->feather->view2->setPageInfo(array(
+                $this->feather->template->setPageInfo(array(
                         'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('User groups')),
                         'active_page' => 'admin',
                         'admin_console' => true,
@@ -84,7 +84,7 @@ public function delete($id)
 
         \FeatherBB\AdminUtils::generateAdminMenu('groups');
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('User groups')),
                 'active_page' => 'admin',
                 'admin_console' => true,
@@ -111,7 +111,7 @@ public function addedit($id = '')
 
             $group = $this->model->info_add_group($groups, $id);
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('User groups')),
                     'active_page' => 'admin',
                     'admin_console' => true,
diff --git a/featherbb/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
index 8f45d2b8..84638a16 100644
--- a/featherbb/Controller/Admin/Index.php
+++ b/featherbb/Controller/Admin/Index.php
@@ -75,7 +75,7 @@ public function display($action = null)
 
         \FeatherBB\AdminUtils::generateAdminMenu('index');
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                             'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Index')),
                             'active_page' => 'admin',
                             'admin_console' => true,
diff --git a/featherbb/Controller/Admin/Maintenance.php b/featherbb/Controller/Admin/Maintenance.php
index 56b8cdfa..35313406 100644
--- a/featherbb/Controller/Admin/Maintenance.php
+++ b/featherbb/Controller/Admin/Maintenance.php
@@ -32,7 +32,7 @@ public function display()
         if ($action == 'rebuild') {
             $this->model->rebuild();
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                     'page_title'    =>    array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Rebuilding search index')),
                     'query_str' => $this->model->get_query_str()
                 )
@@ -49,7 +49,7 @@ public function display()
                 $this->model->prune_comply($prune_from, $prune_sticky);
             }
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Prune')),
                     'active_page' => 'admin',
                     'admin_console' => true,
@@ -62,7 +62,7 @@ public function display()
 
         \FeatherBB\AdminUtils::generateAdminMenu('maintenance');
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Maintenance')),
                 'active_page' => 'admin',
                 'admin_console' => true,
diff --git a/featherbb/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
index 3cb58c56..efb75ad7 100644
--- a/featherbb/Controller/Admin/Options.php
+++ b/featherbb/Controller/Admin/Options.php
@@ -37,7 +37,7 @@ public function display()
 
         \FeatherBB\AdminUtils::generateAdminMenu('options');
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Options')),
                 'active_page' => 'admin',
                 'admin_console' => true,
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
index 1cc4a4d5..e396267c 100644
--- a/featherbb/Controller/Admin/Parser.php
+++ b/featherbb/Controller/Admin/Parser.php
@@ -206,7 +206,7 @@ public function display()
 
         \FeatherBB\AdminUtils::generateAdminMenu('parser');
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Parser')),
                 'active_page' => 'admin',
                 'admin_console' => true,
diff --git a/featherbb/Controller/Admin/Permissions.php b/featherbb/Controller/Admin/Permissions.php
index 171f9749..10a1d28b 100644
--- a/featherbb/Controller/Admin/Permissions.php
+++ b/featherbb/Controller/Admin/Permissions.php
@@ -38,7 +38,7 @@ public function display()
 
         \FeatherBB\AdminUtils::generateAdminMenu('permissions');
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Permissions')),
                 'active_page' => 'admin',
                 'admin_console' => true,
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
index 729d865a..651c8455 100644
--- a/featherbb/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -41,7 +41,7 @@ public function index()
         $activePlugins = $this->feather->cache->isCached('active_plugins') ? $this->feather->cache->retrieve('active_plugins') : array();
         // var_dump($activePlugins);
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'admin_console' => true,
                 'active_page' => 'admin',
                 'pluginsList'    =>    $pluginsList,
@@ -124,7 +124,7 @@ public function display()
             throw new \FeatherBB\Error(sprintf(__('Plugin failed message'), Utils::escape($plugin)));
         }
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), str_replace('_', ' ', substr($plugin, strpos($plugin, '_') + 1, -4))),
                 'active_page' => 'admin',
                 'admin_console' => true,
diff --git a/featherbb/Controller/Admin/Reports.php b/featherbb/Controller/Admin/Reports.php
index 26e14cb8..bda10810 100644
--- a/featherbb/Controller/Admin/Reports.php
+++ b/featherbb/Controller/Admin/Reports.php
@@ -40,7 +40,7 @@ public function display()
 
         AdminUtils::generateAdminMenu('reports');
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Reports')),
                 'active_page' => 'admin',
                 'admin_console' => true,
diff --git a/featherbb/Controller/Admin/Statistics.php b/featherbb/Controller/Admin/Statistics.php
index 33c2457d..eba8a8db 100644
--- a/featherbb/Controller/Admin/Statistics.php
+++ b/featherbb/Controller/Admin/Statistics.php
@@ -34,7 +34,7 @@ public function display()
 
         $total = $this->model->get_total_size();
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Server statistics')),
                 'active_page' => 'admin',
                 'admin_console' => true,
diff --git a/featherbb/Controller/Admin/Users.php b/featherbb/Controller/Admin/Users.php
index 6e8b8e49..070b42ac 100644
--- a/featherbb/Controller/Admin/Users.php
+++ b/featherbb/Controller/Admin/Users.php
@@ -39,7 +39,7 @@ public function display()
 
             \FeatherBB\AdminUtils::generateAdminMenu('users');
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Move users')),
                     'active_page' => 'moderate',
                     'admin_console' => true,
@@ -57,7 +57,7 @@ public function display()
 
             \FeatherBB\AdminUtils::generateAdminMenu('users');
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Delete users')),
                     'active_page' => 'moderate',
                     'admin_console' => true,
@@ -75,7 +75,7 @@ public function display()
 
             \FeatherBB\AdminUtils::generateAdminMenu('users');
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Bans')),
                     'active_page' => 'moderate',
                     'focus_element' => array('bans2', 'ban_message'),
@@ -107,9 +107,9 @@ public function display()
             $can_delete = $can_move = $this->user->g_id == FEATHER_ADMIN;
             $can_ban = $this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && $this->user->g_mod_ban_users == '1');
             $can_action = ($can_delete || $can_ban || $can_move) && $num_users > 0;
-            $this->feather->view2->addAsset('js', 'style/imports/common.js', array('type' => 'text/javascript'));
+            $this->feather->template->addAsset('js', 'style/imports/common.js', array('type' => 'text/javascript'));
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
                     'active_page' => 'admin',
                     'admin_console' => true,
@@ -127,7 +127,7 @@ public function display()
         else {
             \FeatherBB\AdminUtils::generateAdminMenu('users');
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users')),
                     'active_page' => 'admin',
                     'admin_console' => true,
@@ -150,7 +150,7 @@ public function ipstats($id)
         $p = (!$this->request->get('p') || $this->request->get('p') <= 1 || $this->request->get('p') > $num_pages) ? 1 : intval($this->request->get('p'));
         $start_from = 50 * ($p - 1);
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
                 'active_page' => 'admin',
                 'admin_console' => true,
@@ -178,7 +178,7 @@ public function showusers($ip)
         $p = (!$this->request->get('p') || $this->request->get('p') <= 1 || $this->request->get('p') > $num_pages) ? 1 : intval($this->request->get('p'));
         $start_from = 50 * ($p - 1);
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
                 'active_page' => 'admin',
                 'admin_console' => true,
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
index b2b58b26..e737a293 100644
--- a/featherbb/Controller/Auth.php
+++ b/featherbb/Controller/Auth.php
@@ -57,7 +57,7 @@ public function login()
             }
             throw new \FeatherBB\Error(__('Wrong user/pass').' <a href="'.$this->feather->url->get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
         } else {
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                                 'active_page' => 'login',
                                 'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Login')),
                                 'required_fields' => array('req_username' => __('Username'), 'req_password' => __('Password')),
@@ -142,7 +142,7 @@ public function forget()
             }
         }
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
 //                'errors'    =>    $this->model->password_forgotten(),
                 'active_page' => 'login',
                 'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Request pass')),
diff --git a/featherbb/Controller/Delete.php b/featherbb/Controller/Delete.php
index 322d7699..83a7c5d6 100644
--- a/featherbb/Controller/Delete.php
+++ b/featherbb/Controller/Delete.php
@@ -59,7 +59,7 @@ public function deletepost($id)
 
         $cur_post['message'] = $this->feather->parser->parse_message($cur_post['message'], $cur_post['hide_smilies']);
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
             'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Delete post')),
             'active_page' => 'delete',
             'cur_post' => $cur_post,
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index 7ea22f6e..be6fb82b 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -107,7 +107,7 @@ public function editpost($id)
             'promptQuote' => __('promptQuote')
         );
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                             'title' => array(Utils::escape($this->config['o_board_title']), __('Edit post')),
                             'required_fields' => array('req_subject' => __('Subject'), 'req_message' => __('Message')),
                             'focus_element' => array('edit', 'req_message'),
diff --git a/featherbb/Controller/Help.php b/featherbb/Controller/Help.php
index 1b8855f2..6a75e0b4 100644
--- a/featherbb/Controller/Help.php
+++ b/featherbb/Controller/Help.php
@@ -34,7 +34,7 @@ public function display()
             throw new \FeatherBB\Error(__('No view'), 403);
         }
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
             'title' => array(Utils::escape($this->config['o_board_title']), __('Help')),
             'active_page' => 'help',
         ))->addTemplate('help.php')->display();
diff --git a/featherbb/Controller/Index.php b/featherbb/Controller/Index.php
index 13469d4c..d3b85c89 100644
--- a/featherbb/Controller/Index.php
+++ b/featherbb/Controller/Index.php
@@ -26,7 +26,7 @@ public function display()
             throw new \FeatherBB\Error(__('No view'), 403);
         }
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
             'title' => array(Utils::escape($this->feather->forum_settings['o_board_title'])),
             'active_page' => 'index',
             'is_indexed' => true,
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
index d6e7ad3a..a33ca466 100644
--- a/featherbb/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -30,7 +30,7 @@ public function __construct()
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \FeatherBB\Model\install();
         $this->available_langs = \FeatherBB\Lister::getLangs();
-        $this->feather->view2->setStyle('FeatherBB');
+        $this->feather->template->setStyle('FeatherBB');
     }
 
     public function run()
@@ -116,7 +116,7 @@ public function run()
 
             // End validation and check errors
             if (!empty($this->errors)) {
-                $this->feather->view2->setPageInfo(array(
+                $this->feather->template->setPageInfo(array(
                                                         'languages' => $this->available_langs,
                                                         'supported_dbs' => $this->supported_dbs,
                                                         'data' => $data,
@@ -133,7 +133,7 @@ public function run()
                           'description' => __('Description'),
                           'base_url' => $base_url,
                           'default_lang' => $this->install_lang);
-          $this->feather->view2->setPageInfo(array(
+          $this->feather->template->setPageInfo(array(
                                                   'languages' => $this->available_langs,
                                                   'supported_dbs' => $this->supported_dbs,
                                                   'data' => $data,
diff --git a/featherbb/Controller/Login.php b/featherbb/Controller/Login.php
index 8d0fc775..c0ed40de 100644
--- a/featherbb/Controller/Login.php
+++ b/featherbb/Controller/Login.php
@@ -37,7 +37,7 @@ public function display()
             $this->feather->url->redirect($this->feather->url->get('/'), 'Already logged in');
         }
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                             'redirect_url'    =>    $redirect_url,
                             'active_page' => 'login',
                             'title' => array(Utils::escape($this->config['o_board_title']), __('Login')),
@@ -75,7 +75,7 @@ public function forget()
             exit;
         }
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                 'errors'    =>    $this->model->password_forgotten(),
                 'active_page' => 'login',
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Request pass')),
diff --git a/featherbb/Controller/Misc.php b/featherbb/Controller/Misc.php
index 5ade2dcb..2c948fac 100644
--- a/featherbb/Controller/Misc.php
+++ b/featherbb/Controller/Misc.php
@@ -27,7 +27,7 @@ public function rules()
             throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
             'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Forum rules')),
             'active_page' => 'rules'
             ))->addTemplate('misc/rules.php')->display();
@@ -117,7 +117,7 @@ public function email($id)
             $this->model->send_email($mail);
         }
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
             'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Send email to').' '.Utils::escape($mail['recipient'])),
             'active_page' => 'email',
             'required_fields' => array('req_subject' => __('Email subject'), 'req_message' => __('Email message')),
@@ -144,7 +144,7 @@ public function report($id)
             $cur_post['subject'] = censor_words($cur_post['subject']);
         }
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
             'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Report post')),
             'active_page' => 'report',
             'required_fields' => array('req_reason' => __('Reason')),
diff --git a/featherbb/Controller/Moderate.php b/featherbb/Controller/Moderate.php
index 2bf4e1ce..15e9c7ac 100644
--- a/featherbb/Controller/Moderate.php
+++ b/featherbb/Controller/Moderate.php
@@ -84,7 +84,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Moderate')),
                     'active_page' => 'moderate',
                     'action'    =>    'multi',
@@ -138,7 +138,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                         'title' => array(Utils::escape($this->config['o_board_title']), __('Moderate')),
                         'active_page' => 'moderate',
                         'page' => $p,
@@ -157,7 +157,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 if ($this->request->post('delete_posts') || $this->request->post('delete_posts_comply')) {
                     $posts = $this->model->delete_posts($id, $fid, $p);
 
-                    $this->feather->view2->setPageInfo(array(
+                    $this->feather->template->setPageInfo(array(
                             'title' => array(Utils::escape($this->config['o_board_title']), __('Moderate')),
                             'active_page' => 'moderate',
                             'page' => $p,
@@ -168,7 +168,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 }
             if ($this->request->post('split_posts') || $this->request->post('split_posts_comply')) {
 
-                $this->feather->view2->setPageInfo(array(
+                $this->feather->template->setPageInfo(array(
                         'title' => array(Utils::escape($this->config['o_board_title']), __('Moderate')),
                         'focus_element' => array('subject','new_subject'),
                         'page' => $p,
@@ -194,7 +194,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 $cur_topic['subject'] = censor_words($cur_topic['subject']);
             }
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                         'title' => array(Utils::escape($this->config['o_board_title']), Utils::escape($cur_topic['forum_name']), Utils::escape($cur_topic['subject'])),
                         'page' => $p,
                         'active_page' => 'moderate',
@@ -243,7 +243,7 @@ public function display($id, $name = null, $page = null)
         $start_from = $this->user->disp_topics * ($p - 1);
         $url_forum = $this->feather->url->url_friendly($cur_forum['forum_name']);
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                             'title' => array(Utils::escape($this->config['o_board_title']), Utils::escape($cur_forum['forum_name'])),
                             'active_page' => 'moderate',
                             'page' => $p,
@@ -286,7 +286,7 @@ public function dealposts($fid)
             // Check if there are enough forums to move the topic
             $this->model->check_move_possible();
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                         'action'    =>    'multi',
                         'title' => array(Utils::escape($this->config['o_board_title']), __('Moderate')),
                         'active_page' => 'moderate',
@@ -308,7 +308,7 @@ public function dealposts($fid)
                 throw new \FeatherBB\Error(__('Not enough topics selected'), 400);
             }
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                         'title' => array(Utils::escape($this->config['o_board_title']), __('Moderate')),
                         'active_page' => 'moderate',
                         'id'    =>    $fid,
@@ -328,7 +328,7 @@ public function dealposts($fid)
                 $this->model->delete_topics($topics, $fid);
             }
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                         'title' => array(Utils::escape($this->config['o_board_title']), __('Moderate')),
                         'active_page' => 'moderate',
                         'id'    =>    $fid,
diff --git a/featherbb/Controller/Post.php b/featherbb/Controller/Post.php
index 516266fe..17c01d4c 100644
--- a/featherbb/Controller/Post.php
+++ b/featherbb/Controller/Post.php
@@ -200,7 +200,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
             'promptQuote' => __('promptQuote')
         );
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                             'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), $action),
                             'required_fields' => $required_fields,
                             'focus_element' => $focus_element,
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
index d7a3891a..eaf0127e 100644
--- a/featherbb/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -65,15 +65,15 @@ public function display($id, $section = null)
 
             $this->model->delete_user($id, $this->feather);
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Confirm delete user')),
                 'active_page' => 'profile',
                 'username' => $this->model->get_username($id),
                 'id' => $id,
             ));
 
-            $this->feather->view2->addTemplate('profile/delete_user.php');
-            $this->feather->view2->display();
+            $this->feather->template->addTemplate('profile/delete_user.php');
+            $this->feather->template->display();
 
         } elseif ($this->request->post('form_sent')) {
 
@@ -109,19 +109,19 @@ public function display($id, $section = null)
             // or the user is another mod
                 $user_info = $this->model->parse_user_info($user);
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), sprintf(__('Users profile'), Utils::escape($user['username']))),
                 'active_page' => 'profile',
                 'user_info' => $user_info,
                 'id' => $id
             ));
 
-            $this->feather->view2->addTemplate('profile/view_profile.php');
+            $this->feather->template->addTemplate('profile/view_profile.php');
         } else {
             if (!$section || $section == 'essentials') {
                 $user_disp = $this->model->edit_essentials($id, $user);
 
-                $this->feather->view2->setPageInfo(array(
+                $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Section essentials')),
                     'required_fields' => array('req_username' => __('Username'), 'req_email' => __('Email')),
                     'active_page' => 'profile',
@@ -133,14 +133,14 @@ public function display($id, $section = null)
                     'forum_date_formats' => $forum_date_formats,
                 ));
 
-                $this->feather->view2->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_essentials.php')->display();
+                $this->feather->template->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_essentials.php')->display();
 
             } elseif ($section == 'personal') {
                 if ($this->user->g_set_title == '1') {
                     $title_field = '<label>'.__('Title').' <em>('.__('Leave blank').')</em><br /><input type="text" name="title" value="'.Utils::escape($user['title']).'" size="30" maxlength="50" /><br /></label>'."\n";
                 }
 
-                $this->feather->view2->setPageInfo(array(
+                $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Section personal')),
                     'active_page' => 'profile',
                     'id' => $id,
@@ -149,11 +149,11 @@ public function display($id, $section = null)
                     'title_field' => $title_field,
                 ));
 
-                $this->feather->view2->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_personal.php')->display();
+                $this->feather->template->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_personal.php')->display();
 
             } elseif ($section == 'messaging') {
 
-                $this->feather->view2->setPageInfo(array(
+                $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Section messaging')),
                     'active_page' => 'profile',
                     'page' => 'messaging',
@@ -161,7 +161,7 @@ public function display($id, $section = null)
                     'id' => $id
                 ));
 
-                $this->feather->view2->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_messaging.php')->display();
+                $this->feather->template->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_messaging.php')->display();
 
             } elseif ($section == 'personality') {
                 if ($this->config['o_avatars'] == '0' && $this->config['o_signatures'] == '0') {
@@ -183,7 +183,7 @@ public function display($id, $section = null)
                     $signature_preview = '<p>'.__('No sig').'</p>'."\n";
                 }
 
-                $this->feather->view2->setPageInfo(array(
+                $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Section personality')),
                     'active_page' => 'profile',
                     'user_avatar' => $user_avatar,
@@ -194,11 +194,11 @@ public function display($id, $section = null)
                     'id' => $id,
                 ));
 
-                $this->feather->view2->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_personality.php')->display();
+                $this->feather->template->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_personality.php')->display();
 
             } elseif ($section == 'display') {
 
-                $this->feather->view2->setPageInfo(array(
+                $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Section display')),
                     'active_page' => 'profile',
                     'page' => 'display',
@@ -206,11 +206,11 @@ public function display($id, $section = null)
                     'id' => $id
                 ));
 
-                $this->feather->view2->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_display.php')->display();
+                $this->feather->template->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_display.php')->display();
 
             } elseif ($section == 'privacy') {
 
-                $this->feather->view2->setPageInfo(array(
+                $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Section privacy')),
                     'active_page' => 'profile',
                     'page' => 'privacy',
@@ -218,7 +218,7 @@ public function display($id, $section = null)
                     'id' => $id
                 ));
 
-                $this->feather->view2->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_privacy.php')->display();
+                $this->feather->template->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_privacy.php')->display();
 
             } elseif ($section == 'admin') {
 
@@ -226,7 +226,7 @@ public function display($id, $section = null)
                     throw new \FeatherBB\Error(__('Bad request'), 404);
                 }
 
-                $this->feather->view2->setPageInfo(array(
+                $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Section admin')),
                     'active_page' => 'profile',
                     'page' => 'admin',
@@ -236,7 +236,7 @@ public function display($id, $section = null)
                     'id' => $id
                 ));
 
-                $this->feather->view2->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_admin.php')->display();
+                $this->feather->template->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_admin.php')->display();
             } else {
                 throw new \FeatherBB\Error(__('Bad request'), 404);
             }
@@ -261,7 +261,7 @@ public function action($id, $action)
         if ($action == 'change_pass') {
             $this->model->change_pass($id, $this->feather);
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Change pass')),
                 'active_page' => 'profile',
                 'id' => $id,
@@ -269,12 +269,12 @@ public function action($id, $action)
                 'focus_element' => array('change_pass', ((!$this->user->is_admmod) ? 'req_old_password' : 'req_new_password1')),
             ));
 
-            $this->feather->view2->addTemplate('profile/change_pass.php')->display();
+            $this->feather->template->addTemplate('profile/change_pass.php')->display();
 
         } elseif ($action == 'change_email') {
             $this->model->change_email($id, $this->feather);
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Change email')),
                 'active_page' => 'profile',
                 'required_fields' => array('req_new_email' => __('New email'), 'req_password' => __('Password')),
@@ -282,7 +282,7 @@ public function action($id, $action)
                 'id' => $id,
             ));
 
-            $this->feather->view2->addTemplate('profile/change_mail.php')->display();
+            $this->feather->template->addTemplate('profile/change_mail.php')->display();
 
         } elseif ($action == 'upload_avatar' || $action == 'upload_avatar2') {
             if ($this->config['o_avatars'] == '0') {
@@ -297,7 +297,7 @@ public function action($id, $action)
                 $this->model->upload_avatar($id, $_FILES);
             }
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Profile'), __('Upload avatar')),
                 'active_page' => 'profile',
                 'required_fields' =>  array('req_file' => __('File')),
@@ -305,7 +305,7 @@ public function action($id, $action)
                 'id' => $id,
             ));
 
-            $this->feather->view2->addTemplate('profile/upload_avatar.php')->display();
+            $this->feather->template->addTemplate('profile/upload_avatar.php')->display();
 
         } elseif ($action == 'delete_avatar') {
             if ($this->user->id != $id && !$this->user->is_admmod) {
diff --git a/featherbb/Controller/Register.php b/featherbb/Controller/Register.php
index 30836337..092d30a7 100644
--- a/featherbb/Controller/Register.php
+++ b/featherbb/Controller/Register.php
@@ -62,7 +62,7 @@ public function display()
             }
         }
 
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                         'title' => array(Utils::escape($this->config['o_board_title']), __('Register')),
                         'focus_element' => array('register', 'req_user'),
                         'required_fields' => array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => __('Confirm pass'), 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => __('Robot title')),
@@ -101,7 +101,7 @@ public function rules()
             redirect($this->feather->url->get('register/agree/'));
         }
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
                             'title' => array(Utils::escape($this->config['o_board_title']), __('Register'), __('Forum rules')),
                             'active_page' => 'register',
                             )
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index af419e46..1388d46d 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -50,27 +50,27 @@ public function display()
                         require FEATHER_ROOT.'featherbb/Helpers/parser.php';
                     }
 
-                    $this->feather->view2->setPageInfo(array(
+                    $this->feather->template->setPageInfo(array(
                         'title' => array(Utils::escape($this->config['o_board_title']), __('Search results')),
                         'active_page' => 'search',
                     ));
 
                     $this->model->display_search_results($search, $this->feather);
 
-                    $this->feather->view2->setPageInfo(array(
+                    $this->feather->template->setPageInfo(array(
                         'search' => $search,
                     ));
 
-                    $this->feather->view2->addTemplate('search/header.php', 1);
+                    $this->feather->template->addTemplate('search/header.php', 1);
 
                     if ($search['show_as'] == 'posts') {
-                        $this->feather->view2->addTemplate('search/posts.php', 5);
+                        $this->feather->template->addTemplate('search/posts.php', 5);
                     }
                     else {
-                        $this->feather->view2->addTemplate('search/topics.php', 5);
+                        $this->feather->template->addTemplate('search/topics.php', 5);
                     }
 
-                    $this->feather->view2->addTemplate('search/footer.php', 10)->display();
+                    $this->feather->template->addTemplate('search/footer.php', 10)->display();
 
                 } else {
                     redirect($this->feather->url->get('search/'), __('No hits'));
@@ -78,7 +78,7 @@ public function display()
         }
         // Display the form
         else {
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Search')),
                 'active_page' => 'search',
                 'focus_element' => array('search', 'keywords'),
diff --git a/featherbb/Controller/Userlist.php b/featherbb/Controller/Userlist.php
index d409425c..381096bc 100644
--- a/featherbb/Controller/Userlist.php
+++ b/featherbb/Controller/Userlist.php
@@ -55,7 +55,7 @@ public function display()
         // Generate paging links
         $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
             'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('User list')),
             'active_page' => 'userlist',
             'page_number'  =>  $p,
diff --git a/featherbb/Controller/Viewforum.php b/featherbb/Controller/Viewforum.php
index 91135cb3..42ec3b18 100644
--- a/featherbb/Controller/Viewforum.php
+++ b/featherbb/Controller/Viewforum.php
@@ -69,23 +69,23 @@ public function display($id, $name = null, $page = null)
 
         $forum_actions = $this->model->get_forum_actions($id, $this->feather->forum_settings['o_forum_subscriptions'], $cur_forum['is_subscribed']);
 
-        $this->feather->view2->addAsset('canonical', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/'));
+        $this->feather->template->addAsset('canonical', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/'));
         if ($num_pages > 1) {
             if ($p > 1) {
-                $this->feather->view2->addAsset('prev', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
+                $this->feather->template->addAsset('prev', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
             }
             if ($p < $num_pages) {
-                $this->feather->view2->addAsset('next', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
+                $this->feather->template->addAsset('next', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
             }
         }
 
         if ($this->feather->forum_settings['o_feed_type'] == '1') {
-            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=rss', array('title' => __('RSS forum feed')));
+            $this->feather->template->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=rss', array('title' => __('RSS forum feed')));
         } elseif ($this->feather->forum_settings['o_feed_type'] == '2') {
-            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=atom', array('title' => __('Atom forum feed')));
+            $this->feather->template->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=atom', array('title' => __('Atom forum feed')));
         }
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
             'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), Utils::escape($cur_forum['forum_name'])),
             'active_page' => 'viewforum',
             'page_number'  =>  $p,
diff --git a/featherbb/Controller/Viewtopic.php b/featherbb/Controller/Viewtopic.php
index c9b1bce8..9f824517 100644
--- a/featherbb/Controller/Viewtopic.php
+++ b/featherbb/Controller/Viewtopic.php
@@ -90,23 +90,23 @@ public function display($id = null, $name = null, $page = null, $pid = null)
             'promptQuote' => __('promptQuote')
         );
 
-        $this->feather->view2->addAsset('canonical', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/'));
+        $this->feather->template->addAsset('canonical', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/'));
         if ($num_pages > 1) {
             if ($p > 1) {
-                $this->feather->view2->addAsset('prev', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
+                $this->feather->template->addAsset('prev', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
             }
             if ($p < $num_pages) {
-                $this->feather->view2->addAsset('next', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
+                $this->feather->template->addAsset('next', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
             }
         }
 
         if ($this->feather->forum_settings['o_feed_type'] == '1') {
-            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=rss', array('title' => __('RSS forum feed')));
+            $this->feather->template->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=rss', array('title' => __('RSS forum feed')));
         } elseif ($this->feather->forum_settings['o_feed_type'] == '2') {
-            $this->feather->view2->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=atom', array('title' => __('Atom forum feed')));
+            $this->feather->template->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=atom', array('title' => __('Atom forum feed')));
         }
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
             'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), Utils::escape($cur_topic['forum_name']), Utils::escape($cur_topic['subject'])),
             'active_page' => 'viewtopic',
             'page_number'  =>  $p,
diff --git a/featherbb/Core/AdminUtils.php b/featherbb/Core/AdminUtils.php
index 06628ccf..3f775741 100644
--- a/featherbb/Core/AdminUtils.php
+++ b/featherbb/Core/AdminUtils.php
@@ -22,7 +22,7 @@ public static function generateAdminMenu($page = '')
         // $plugins = forum_list_plugins($is_admin);
         $plugins = array();
 
-        $feather->view2->setPageInfo(array(
+        $feather->template->setPageInfo(array(
             'page'    =>    $page,
             'is_admin'    =>    $is_admin,
             'plugins'    =>    $plugins,
diff --git a/featherbb/Core/Auth.php b/featherbb/Core/Auth.php
index d62dff98..7af559e5 100644
--- a/featherbb/Core/Auth.php
+++ b/featherbb/Core/Auth.php
@@ -196,7 +196,7 @@ public function maintenance_message()
         $replace = array('&#160; &#160; ', '&#160; ', ' &#160;');
         $message = str_replace($pattern, $replace, $this->app->forum_settings['o_maintenance_message']);
 
-        $this->app->view2->setPageInfo(array(
+        $this->app->template->setPageInfo(array(
             'title' => array(Utils::escape($this->app->forum_settings['o_board_title']), __('Maintenance')),
             'active_page' => 'index',
             'message'    =>    $message,
diff --git a/featherbb/Core/Core.php b/featherbb/Core/Core.php
index 9a15440f..4aa4327d 100644
--- a/featherbb/Core/Core.php
+++ b/featherbb/Core/Core.php
@@ -194,7 +194,7 @@ public function call()
                                                'extension' => '.cache'));
         });
         // Load FeatherBB view
-        $this->app->container->singleton('view2', function() {
+        $this->app->container->singleton('template', function() {
             return new \FeatherBB\View();
         });
         // Load FeatherBB url class
@@ -248,8 +248,8 @@ public function call()
         $this->forum_settings = array_merge($this->app->cache->retrieve('config'), $this->forum_settings);
 
         // Set default style and assets
-        $this->app->view2->setStyle($this->forum_settings['o_default_style']);
-        $this->app->view2->addAsset('js', 'style/themes/FeatherBB/phone.min.js');
+        $this->app->template->setStyle($this->forum_settings['o_default_style']);
+        $this->app->template->addAsset('js', 'style/themes/FeatherBB/phone.min.js');
 
         // Populate FeatherBB Slim object with forum_settings vars
         $this->hydrate('forum_settings', $this->forum_settings);
diff --git a/featherbb/Core/Csrf.php b/featherbb/Core/Csrf.php
index 823dd96e..f53b2b6b 100644
--- a/featherbb/Core/Csrf.php
+++ b/featherbb/Core/Csrf.php
@@ -61,7 +61,7 @@ public function check() {
             'csrf_key'      => $this->key,
             'csrf_token'    => $this->token,
         ));
-        $this->app->view2->replace(array(
+        $this->app->template->replace(array(
             'csrf_key'      => $this->key,
             'csrf_token'    => $this->token,
         ));
diff --git a/featherbb/Core/Error.php b/featherbb/Core/Error.php
index 8f46b73b..05281dba 100644
--- a/featherbb/Core/Error.php
+++ b/featherbb/Core/Error.php
@@ -33,12 +33,12 @@ protected function error($msg, $http_status = null, $no_back_link)
         $this->feather->response->setBody('');
 
         if (!defined('FEATHER_HEADER')) {
-            $this->feather->view2->setPageInfo(array(
+            $this->feather->template->setPageInfo(array(
                 'title' => array(\FeatherBB\Utils::escape($this->feather->config['o_board_title']), __('Info')),
             ));
         }
 
-        $this->feather->view2->setPageInfo(array(
+        $this->feather->template->setPageInfo(array(
             'msg'    =>    $msg,
             'no_back_link'    => $no_back_link,
         ))->addTemplate('message.php')->display();
diff --git a/featherbb/Model/Search.php b/featherbb/Model/Search.php
index 232ad7a0..bb448328 100644
--- a/featherbb/Model/Search.php
+++ b/featherbb/Model/Search.php
@@ -734,7 +734,7 @@ public function display_search_results($search)
                     $cur_search['pposter_disp'] = '<strong>'.$pposter.'</strong>';
                 }
 
-                $this->feather->view2->setPageInfo(array(
+                $this->feather->template->setPageInfo(array(
                     'post_count' => $post_count,
                     'url_topic' => $url_topic,
                     'cur_search' => $cur_search,
@@ -791,7 +791,7 @@ public function display_search_results($search)
                     $start_from = $cur_search['start_from'];
                 }
 
-                $this->feather->view2->setPageInfo(array(
+                $this->feather->template->setPageInfo(array(
                     'cur_search' => $cur_search,
                     'start_from' => $start_from,
                     'topic_count' => $topic_count,
diff --git a/featherbb/routes.php b/featherbb/routes.php
index 07aae626..53e322b3 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -195,7 +195,7 @@
 
 $feather->error(function (\Exception $e) use ($feather) {
     $feather->response->setStatus($e->getCode());
-    $feather->view2->setPageInfo(array(
+    $feather->template->setPageInfo(array(
         'title' => array(Utils::escape($feather->config['o_board_title']), __('Error')),
         'msg_title' => __('Error'),
         'msg'    =>   $e->getMessage(),

From 80bcae9fc92be0849bddb248530cb5985dbe3328 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 00:52:27 +0200
Subject: [PATCH 309/353] Static calls for Urls

---
 featherbb/Controller/Admin/Bans.php           |  3 +-
 featherbb/Controller/Admin/Categories.php     | 17 +++---
 featherbb/Controller/Admin/Censoring.php      |  1 +
 featherbb/Controller/Admin/Forums.php         | 21 ++++----
 featherbb/Controller/Admin/Groups.php         |  1 +
 featherbb/Controller/Admin/Index.php          |  7 +--
 featherbb/Controller/Admin/Maintenance.php    |  1 +
 featherbb/Controller/Admin/Options.php        |  1 +
 featherbb/Controller/Admin/Parser.php         |  7 +--
 featherbb/Controller/Admin/Permissions.php    |  1 +
 featherbb/Controller/Admin/Plugins.php        |  9 ++--
 featherbb/Controller/Admin/Reports.php        |  1 +
 featherbb/Controller/Admin/Statistics.php     |  1 +
 featherbb/Controller/Admin/Users.php          |  7 +--
 featherbb/Controller/Auth.php                 | 19 +++----
 featherbb/Controller/Delete.php               |  1 +
 featherbb/Controller/Edit.php                 |  3 +-
 featherbb/Controller/Help.php                 |  1 +
 featherbb/Controller/Index.php                |  1 +
 featherbb/Controller/Install.php              |  3 +-
 featherbb/Controller/Login.php                |  7 +--
 featherbb/Controller/Misc.php                 |  5 +-
 featherbb/Controller/Moderate.php             | 21 ++++----
 featherbb/Controller/Post.php                 | 13 ++---
 featherbb/Controller/Profile.php              |  9 ++--
 featherbb/Controller/Register.php             |  9 ++--
 featherbb/Controller/Search.php               |  5 +-
 featherbb/Controller/Userlist.php             |  3 +-
 featherbb/Controller/Viewforum.php            | 13 ++---
 featherbb/Controller/Viewtopic.php            | 13 ++---
 featherbb/Core/Auth.php                       |  1 +
 featherbb/Core/Email.php                      |  3 +-
 featherbb/Core/Url.php                        | 54 ++++++++-----------
 featherbb/Core/View.php                       |  1 +
 featherbb/Helpers/parser.php                  |  8 +--
 featherbb/Model/Admin/Bans.php                |  5 +-
 featherbb/Model/Admin/Categories.php          |  1 +
 featherbb/Model/Admin/Censoring.php           |  7 +--
 featherbb/Model/Admin/Forums.php              |  1 +
 featherbb/Model/Admin/Groups.php              |  9 ++--
 featherbb/Model/Admin/Maintenance.php         |  3 +-
 featherbb/Model/Admin/Options.php             |  3 +-
 featherbb/Model/Admin/Parser.php              |  1 +
 featherbb/Model/Admin/Permissions.php         |  3 +-
 featherbb/Model/Admin/Reports.php             |  3 +-
 featherbb/Model/Admin/Statistics.php          |  1 +
 featherbb/Model/Admin/Users.php               |  7 +--
 featherbb/Model/Auth.php                      |  1 +
 featherbb/Model/Cache.php                     |  1 +
 featherbb/Model/Debug.php                     |  1 +
 featherbb/Model/Delete.php                    |  5 +-
 featherbb/Model/Edit.php                      |  1 +
 featherbb/Model/Header.php                    |  1 +
 featherbb/Model/Index.php                     | 15 +++---
 featherbb/Model/Install.php                   |  1 +
 featherbb/Model/Login.php                     | 15 +++---
 featherbb/Model/Misc.php                      | 17 +++---
 featherbb/Model/Moderate.php                  | 31 +++++------
 featherbb/Model/Post.php                      | 19 +++----
 featherbb/Model/Profile.php                   | 53 +++++++++---------
 featherbb/Model/Register.php                  | 19 +++----
 featherbb/Model/Search.php                    | 27 +++++-----
 featherbb/Model/Userlist.php                  |  1 +
 featherbb/Model/Viewforum.php                 | 21 ++++----
 featherbb/Model/Viewtopic.php                 | 39 +++++++-------
 .../FeatherBB/view/admin/bans/add_ban.php     |  1 +
 .../FeatherBB/view/admin/bans/admin_bans.php  |  5 +-
 .../FeatherBB/view/admin/bans/search_ban.php  | 13 ++---
 .../FeatherBB/view/admin/categories.php       |  9 ++--
 .../themes/FeatherBB/view/admin/censoring.php |  5 +-
 .../view/admin/forums/admin_forums.php        |  7 +--
 .../view/admin/forums/delete_forum.php        |  3 +-
 .../view/admin/forums/permissions.php         |  3 +-
 .../view/admin/groups/add_edit_group.php      |  1 +
 .../view/admin/groups/admin_groups.php        |  7 +--
 .../view/admin/groups/confirm_delete.php      |  5 +-
 .../view/admin/groups/delete_group.php        |  3 +-
 style/themes/FeatherBB/view/admin/index.php   |  7 +--
 style/themes/FeatherBB/view/admin/loader.php  |  1 +
 .../admin/maintenance/admin_maintenance.php   |  9 ++--
 .../view/admin/maintenance/prune.php          |  3 +-
 .../view/admin/maintenance/rebuild.php        |  5 +-
 style/themes/FeatherBB/view/admin/menu.php    | 29 +++++-----
 style/themes/FeatherBB/view/admin/options.php |  5 +-
 style/themes/FeatherBB/view/admin/parser.php  |  3 +-
 .../FeatherBB/view/admin/permissions.php      |  3 +-
 style/themes/FeatherBB/view/admin/plugins.php |  5 +-
 style/themes/FeatherBB/view/admin/reports.php | 21 ++++----
 .../FeatherBB/view/admin/statistics.php       |  3 +-
 .../view/admin/users/admin_users.php          |  5 +-
 .../FeatherBB/view/admin/users/ban_users.php  |  3 +-
 .../view/admin/users/delete_users.php         |  3 +-
 .../FeatherBB/view/admin/users/find_users.php | 15 +++---
 .../FeatherBB/view/admin/users/move_users.php |  3 +-
 .../FeatherBB/view/admin/users/search_ip.php  | 13 ++---
 .../FeatherBB/view/admin/users/show_users.php | 13 ++---
 style/themes/FeatherBB/view/delete.php        |  9 ++--
 style/themes/FeatherBB/view/edit.php          | 21 ++++----
 style/themes/FeatherBB/view/error.php         |  1 +
 style/themes/FeatherBB/view/footer.new.php    | 33 ++++++------
 style/themes/FeatherBB/view/footer.php        | 32 +++++------
 style/themes/FeatherBB/view/header.new.php    | 41 +++++++-------
 style/themes/FeatherBB/view/header.php        |  4 +-
 style/themes/FeatherBB/view/help.php          | 25 ++++-----
 style/themes/FeatherBB/view/index.php         |  1 +
 style/themes/FeatherBB/view/install.php       |  1 +
 style/themes/FeatherBB/view/login/form.php    |  5 +-
 .../view/login/password_forgotten.php         |  3 +-
 style/themes/FeatherBB/view/misc/email.php    |  3 +-
 style/themes/FeatherBB/view/misc/report.php   |  9 ++--
 style/themes/FeatherBB/view/misc/rules.php    |  1 +
 .../FeatherBB/view/moderate/delete_posts.php  |  1 +
 .../FeatherBB/view/moderate/delete_topics.php |  1 +
 .../FeatherBB/view/moderate/merge_topics.php  |  1 +
 .../view/moderate/moderator_forum.php         | 11 ++--
 .../FeatherBB/view/moderate/move_topics.php   |  1 +
 .../FeatherBB/view/moderate/posts_view.php    | 15 +++---
 .../FeatherBB/view/moderate/split_posts.php   |  1 +
 style/themes/FeatherBB/view/post.php          | 19 +++----
 .../FeatherBB/view/profile/change_mail.php    |  3 +-
 .../FeatherBB/view/profile/change_pass.php    |  3 +-
 .../FeatherBB/view/profile/delete_user.php    |  3 +-
 style/themes/FeatherBB/view/profile/menu.php  | 15 +++---
 .../FeatherBB/view/profile/section_admin.php  |  3 +-
 .../view/profile/section_display.php          |  3 +-
 .../view/profile/section_essentials.php       |  7 +--
 .../view/profile/section_messaging.php        |  3 +-
 .../view/profile/section_personal.php         |  3 +-
 .../view/profile/section_personality.php      | 11 ++--
 .../view/profile/section_privacy.php          |  3 +-
 .../FeatherBB/view/profile/upload_avatar.php  |  3 +-
 .../FeatherBB/view/profile/view_profile.php   |  1 +
 .../themes/FeatherBB/view/register/email.php  |  1 +
 style/themes/FeatherBB/view/register/form.php |  1 +
 .../themes/FeatherBB/view/register/rules.php  |  3 +-
 style/themes/FeatherBB/view/search/footer.php |  5 +-
 style/themes/FeatherBB/view/search/form.php   |  1 +
 style/themes/FeatherBB/view/search/header.php |  5 +-
 style/themes/FeatherBB/view/search/posts.php  |  7 +--
 style/themes/FeatherBB/view/search/topics.php |  3 +-
 style/themes/FeatherBB/view/userlist.php      |  3 +-
 style/themes/FeatherBB/view/viewforum.php     |  9 ++--
 style/themes/FeatherBB/view/viewtopic.php     | 29 +++++-----
 143 files changed, 646 insertions(+), 515 deletions(-)

diff --git a/featherbb/Controller/Admin/Bans.php b/featherbb/Controller/Admin/Bans.php
index a769f9a3..7b063a5a 100644
--- a/featherbb/Controller/Admin/Bans.php
+++ b/featherbb/Controller/Admin/Bans.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Bans
 {
@@ -51,7 +52,7 @@ public function display()
                     'admin_console' => true,
                     'page' => $p,
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Bans'), __('Results head')),
-                    'paging_links' => '<span class="pages-label">' . __('Pages') . ' </span>' . $this->feather->url->paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str'])),
+                    'paging_links' => '<span class="pages-label">' . __('Pages') . ' </span>' . Url::paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str'])),
                     'ban_data' => $ban_data['data'],
                 )
             )->addTemplate('admin/bans/search_ban.php')->display();
diff --git a/featherbb/Controller/Admin/Categories.php b/featherbb/Controller/Admin/Categories.php
index 2a94c08d..159efc1b 100644
--- a/featherbb/Controller/Admin/Categories.php
+++ b/featherbb/Controller/Admin/Categories.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Categories
 {
@@ -33,13 +34,13 @@ public function add_category()
     {
         $cat_name = Utils::trim($this->request->post('cat_name'));
         if ($cat_name == '') {
-            redirect($this->feather->url->get('admin/categories/'), __('Must enter name message'));
+            redirect(Url::get('admin/categories/'), __('Must enter name message'));
         }
 
         if ($this->model->add_category($cat_name)) {
-            redirect($this->feather->url->get('admin/categories/'), __('Category added redirect'));
+            redirect(Url::get('admin/categories/'), __('Category added redirect'));
         } else { //TODO, add error message
-            redirect($this->feather->url->get('admin/categories/'), __('Category added redirect'));
+            redirect(Url::get('admin/categories/'), __('Category added redirect'));
         }
     }
 
@@ -54,7 +55,7 @@ public function edit_categories()
                               'name' => Utils::escape($properties['name']),
                               'order' => (int) $properties['order'], );
             if ($category['name'] == '') {
-                redirect($this->feather->url->get('admin/categories/'), __('Must enter name message'));
+                redirect(Url::get('admin/categories/'), __('Must enter name message'));
             }
             $this->model->update_category($category);
         }
@@ -62,7 +63,7 @@ public function edit_categories()
         // Regenerate the quick jump cache
         $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
-        redirect($this->feather->url->get('admin/categories/'), __('Categories updated redirect'));
+        redirect(Url::get('admin/categories/'), __('Categories updated redirect'));
     }
 
     public function delete_category()
@@ -74,13 +75,13 @@ public function delete_category()
         }
 
         if (intval($this->request->post('disclaimer')) != 1) {
-            redirect($this->feather->url->get('admin/categories/'), __('Delete category not validated'));
+            redirect(Url::get('admin/categories/'), __('Delete category not validated'));
         }
 
         if ($this->model->delete_category($cat_to_delete)) {
-            redirect($this->feather->url->get('admin/categories/'), __('Category deleted redirect'));
+            redirect(Url::get('admin/categories/'), __('Category deleted redirect'));
         } else {
-            redirect($this->feather->url->get('admin/categories/'), __('Unable to delete category'));
+            redirect(Url::get('admin/categories/'), __('Unable to delete category'));
         }
     }
 
diff --git a/featherbb/Controller/Admin/Censoring.php b/featherbb/Controller/Admin/Censoring.php
index 41707ea1..a6f08a50 100644
--- a/featherbb/Controller/Admin/Censoring.php
+++ b/featherbb/Controller/Admin/Censoring.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Censoring
 {
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
index 5f8dd432..176157f4 100644
--- a/featherbb/Controller/Admin/Forums.php
+++ b/featherbb/Controller/Admin/Forums.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Forums
 {
@@ -38,15 +39,15 @@ public function add_forum()
         $cat_id = (int) $this->request->post('cat');
 
         if ($cat_id < 1) {
-            redirect($this->feather->url->get('admin/forums/'), __('Must be valid category'));
+            redirect(Url::get('admin/forums/'), __('Must be valid category'));
         }
 
         if ($fid = $this->model->add_forum($cat_id, __('New forum'))) {
             // Regenerate the quick jump cache
             $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
-            redirect($this->feather->url->get('admin/forums/edit/'.$fid.'/'), __('Forum added redirect'));
+            redirect(Url::get('admin/forums/edit/'.$fid.'/'), __('Forum added redirect'));
         } else {
-            redirect($this->feather->url->get('admin/forums/'), __('Unable to add forum'));
+            redirect(Url::get('admin/forums/'), __('Unable to add forum'));
         }
     }
 
@@ -60,13 +61,13 @@ public function edit_forum($forum_id)
                                     'forum_desc' => $this->request->post('forum_desc') ? Utils::linebreaks(Utils::trim($this->request->post('forum_desc'))) : NULL,
                                     'cat_id' => (int) $this->request->post('cat_id'),
                                     'sort_by' => (int) $this->request->post('sort_by'),
-                                    'redirect_url' => $this->feather->url->is_valid($this->request->post('redirect_url')) ? Utils::escape($this->request->post('redirect_url')) : NULL);
+                                    'redirect_url' => Url::is_valid($this->request->post('redirect_url')) ? Utils::escape($this->request->post('redirect_url')) : NULL);
 
                 if ($forum_data['forum_name'] == '') {
-                    redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Must enter name message'));
+                    redirect(Url::get('admin/forums/edit/'.$forum_id.'/'), __('Must enter name message'));
                 }
                 if ($forum_data['cat_id'] < 1) {
-                    redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Must be valid category'));
+                    redirect(Url::get('admin/forums/edit/'.$forum_id.'/'), __('Must be valid category'));
                 }
 
                 $this->model->update_forum($forum_id, $forum_data);
@@ -102,7 +103,7 @@ public function edit_forum($forum_id)
                 // Regenerate the quick jump cache
                 $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
-                redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Forum updated redirect'));
+                redirect(Url::get('admin/forums/edit/'.$forum_id.'/'), __('Forum updated redirect'));
 
             } elseif ($this->request->post('revert_perms')) {
                 $this->model->delete_permissions($forum_id);
@@ -110,7 +111,7 @@ public function edit_forum($forum_id)
                 // Regenerate the quick jump cache
                 $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
-                redirect($this->feather->url->get('admin/forums/edit/'.$forum_id.'/'), __('Perms reverted redirect'));
+                redirect(Url::get('admin/forums/edit/'.$forum_id.'/'), __('Perms reverted redirect'));
             }
 
         } else {
@@ -136,7 +137,7 @@ public function delete_forum($forum_id)
             // Regenerate the quick jump cache
             $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
-            redirect($this->feather->url->get('admin/forums/'), __('Forum deleted redirect'));
+            redirect(Url::get('admin/forums/'), __('Forum deleted redirect'));
 
         } else { // If the user hasn't confirmed
 
@@ -164,7 +165,7 @@ public function edit_positions()
         // Regenerate the quick jump cache
         $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
-        redirect($this->feather->url->get('admin/forums/'), __('Forums updated redirect'));
+        redirect(Url::get('admin/forums/'), __('Forums updated redirect'));
     }
 
     public function display()
diff --git a/featherbb/Controller/Admin/Groups.php b/featherbb/Controller/Admin/Groups.php
index fa9a8c9a..10e13402 100644
--- a/featherbb/Controller/Admin/Groups.php
+++ b/featherbb/Controller/Admin/Groups.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Groups
 {
diff --git a/featherbb/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
index 84638a16..bfad3e39 100644
--- a/featherbb/Controller/Admin/Index.php
+++ b/featherbb/Controller/Admin/Index.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Index
 {
@@ -57,9 +58,9 @@ public function display($action = null)
             }
 
             if (version_compare($this->config['o_cur_version'], $latest_version, '>=')) {
-                redirect($this->feather->url->get('admin/'), __('Running latest version message'));
+                redirect(Url::get('admin/'), __('Running latest version message'));
             } else {
-                redirect($this->feather->url->get('admin/'), sprintf(__('New version available message'), '<a href="http://featherbb.org/">FeatherBB.org</a>'));
+                redirect(Url::get('admin/'), sprintf(__('New version available message'), '<a href="http://featherbb.org/">FeatherBB.org</a>'));
             }
         }
         // Remove /install
@@ -67,7 +68,7 @@ public function display($action = null)
             $deleted = $this->remove_install_folder($this->feather->forum_env['FEATHER_ROOT'].'install');
 
             if ($deleted) {
-                redirect($this->feather->url->get('admin/'), __('Deleted install.php redirect'));
+                redirect(Url::get('admin/'), __('Deleted install.php redirect'));
             } else {
                 throw new \FeatherBB\Error(__('Delete install.php failed'), 500);
             }
diff --git a/featherbb/Controller/Admin/Maintenance.php b/featherbb/Controller/Admin/Maintenance.php
index 35313406..d3508f45 100644
--- a/featherbb/Controller/Admin/Maintenance.php
+++ b/featherbb/Controller/Admin/Maintenance.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Maintenance
 {
diff --git a/featherbb/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
index efb75ad7..54207d37 100644
--- a/featherbb/Controller/Admin/Options.php
+++ b/featherbb/Controller/Admin/Options.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Options
 {
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
index e396267c..bf78dcde 100644
--- a/featherbb/Controller/Admin/Parser.php
+++ b/featherbb/Controller/Admin/Parser.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Parser
 {
@@ -43,7 +44,7 @@ public function display()
         if ($this->request->post('reset') || !file_exists($cache_file)) {
             require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_source.php');
             require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_compile.php');
-            redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['reset_success']);
+            redirect(Url::get('admin/parser/'), $lang_admin_parser['reset_success']);
         }
 
         // Load the current BBCode $pd array from featherbb/Helpers/parser_data.inc.php.
@@ -67,7 +68,7 @@ public function display()
                             if (preg_match('%^image/%', $f['type'])) {        // If we have an image file type?
                                 if ($f['size'] > 0 && $f['size'] <= $this->config['o_avatars_size']) {
                                     if (move_uploaded_file($f['tmp_name'], FEATHER_ROOT .'style/img/smilies/'. $name)) {
-                                        redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['upload success']);
+                                        redirect(Url::get('admin/parser/'), $lang_admin_parser['upload success']);
                                     } else { //  Error #1: 'Smiley upload failed. Unable to move to smiley folder.'.
                                         throw new \FeatherBB\Error($lang_admin_parser['upload_err_1'], 500);
                                     }
@@ -201,7 +202,7 @@ public function display()
             }
 
             require_once('featherbb/Helpers/bbcd_compile.php'); // Compile $bbcd and save into $pd['bbcd']
-            redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['save_success']);
+            redirect(Url::get('admin/parser/'), $lang_admin_parser['save_success']);
         }
 
         \FeatherBB\AdminUtils::generateAdminMenu('parser');
diff --git a/featherbb/Controller/Admin/Permissions.php b/featherbb/Controller/Admin/Permissions.php
index 10a1d28b..3eb7ae57 100644
--- a/featherbb/Controller/Admin/Permissions.php
+++ b/featherbb/Controller/Admin/Permissions.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Permissions
 {
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
index 651c8455..bcf270fc 100644
--- a/featherbb/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Plugins
 {
@@ -68,10 +69,10 @@ public function activate()
         try {
             $plugin->activate($class);
         } catch (\Exception $e) {
-            redirect($this->feather->url->get('admin/plugins/'), $e->getMessage());
+            redirect(Url::get('admin/plugins/'), $e->getMessage());
         }
         // Plugin has been activated, confirm and redirect
-        $this->feather->url->redirect($this->feather->url->get('admin/plugins/'), 'Plugin "'.$class::$name.'" activated!');
+        $this->feather->url->redirect(Url::get('admin/plugins/'), 'Plugin "'.$class::$name.'" activated!');
     }
 
     public function deactivate()
@@ -86,10 +87,10 @@ public function deactivate()
         try {
             $plugin->deactivate($class);
         } catch (\Exception $e) {
-            redirect($this->feather->url->get('admin/plugins/'), Utils::escape($e->getMessage()));
+            redirect(Url::get('admin/plugins/'), Utils::escape($e->getMessage()));
         }
         // Plugin has been activated, confirm and redirect
-        $this->feather->url->redirect($this->feather->url->get('admin/plugins/'), array('warning', 'Plugin "'.$class::$name.'" deactivated!'));
+        $this->feather->url->redirect(Url::get('admin/plugins/'), array('warning', 'Plugin "'.$class::$name.'" deactivated!'));
     }
 
     public function display()
diff --git a/featherbb/Controller/Admin/Reports.php b/featherbb/Controller/Admin/Reports.php
index bda10810..1ccfc158 100644
--- a/featherbb/Controller/Admin/Reports.php
+++ b/featherbb/Controller/Admin/Reports.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 use FeatherBB\AdminUtils;
 
diff --git a/featherbb/Controller/Admin/Statistics.php b/featherbb/Controller/Admin/Statistics.php
index eba8a8db..251f3357 100644
--- a/featherbb/Controller/Admin/Statistics.php
+++ b/featherbb/Controller/Admin/Statistics.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Statistics
 {
diff --git a/featherbb/Controller/Admin/Users.php b/featherbb/Controller/Admin/Users.php
index 070b42ac..35e3af80 100644
--- a/featherbb/Controller/Admin/Users.php
+++ b/featherbb/Controller/Admin/Users.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Users
 {
@@ -101,7 +102,7 @@ public function display()
             $start_from = 50 * ($p - 1);
 
             // Generate paging links
-            $paging_links = '<span class="pages-label">' . __('Pages') . ' </span>' . $this->feather->url->paginate_old($num_pages, $p, '?find_user=&amp;'.implode('&amp;', $search['query_str']));
+            $paging_links = '<span class="pages-label">' . __('Pages') . ' </span>' . Url::paginate_old($num_pages, $p, '?find_user=&amp;'.implode('&amp;', $search['query_str']));
 
             // Some helper variables for permissions
             $can_delete = $can_move = $this->user->g_id == FEATHER_ADMIN;
@@ -155,7 +156,7 @@ public function ipstats($id)
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'page' => $p,
-                'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate_old($num_pages, $p, '?ip_stats='.$id),
+                'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.Url::paginate_old($num_pages, $p, '?ip_stats='.$id),
                 'start_from'        =>  $start_from,
                 'ip_data'   =>  $this->model->get_ip_stats($id, $start_from),
             )
@@ -182,7 +183,7 @@ public function showusers($ip)
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Results head')),
                 'active_page' => 'admin',
                 'admin_console' => true,
-                'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate_old($num_pages, $p, '?ip_stats='.$ip),
+                'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.Url::paginate_old($num_pages, $p, '?ip_stats='.$ip),
                 'page' => $p,
                 'start_from'        =>  $start_from,
                 'info'   =>  $this->model->get_info_poster($ip, $start_from),
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
index e737a293..ce91f891 100644
--- a/featherbb/Controller/Auth.php
+++ b/featherbb/Controller/Auth.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Auth
@@ -23,7 +24,7 @@ public function __construct()
     public function login()
     {
         if (!$this->feather->user->is_guest) {
-            $this->feather->url->redirect($this->feather->url->get('/'), 'Already logged in');
+            $this->feather->url->redirect(Url::get('/'), 'Already logged in');
         }
 
         if ($this->feather->request->isPost()) {
@@ -52,10 +53,10 @@ public function login()
                     $expire = $this->feather->hooks->fire('expire_login', $expire);
                     \FeatherBB\Model\Auth::feather_setcookie($user->id, $form_password_hash, $expire);
 
-                    $this->feather->url->redirect($this->feather->url->base(), __('Login redirect'));
+                    $this->feather->url->redirect(Url::base(), __('Login redirect'));
                 }
             }
-            throw new \FeatherBB\Error(__('Wrong user/pass').' <a href="'.$this->feather->url->get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
+            throw new \FeatherBB\Error(__('Wrong user/pass').' <a href="'.Url::get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
         } else {
             $this->feather->template->setPageInfo(array(
                                 'active_page' => 'login',
@@ -72,7 +73,7 @@ public function logout($token)
         $token = $this->feather->hooks->fire('logout_start', $token);
 
         if ($this->feather->user->is_guest || !isset($token) || $token != \FeatherBB\Utils::hash($this->feather->user->id.\FeatherBB\Utils::hash($this->feather->request->getIp()))) {
-            $this->feather->url->redirect($this->feather->url->get('/'), 'Not logged in');
+            $this->feather->url->redirect(Url::get('/'), 'Not logged in');
         }
 
         \FeatherBB\Model\Auth::delete_online_by_id($this->feather->user->id);
@@ -85,13 +86,13 @@ public function logout($token)
         \FeatherBB\Model\Auth::feather_setcookie(1, \FeatherBB\Utils::hash(uniqid(rand(), true)), time() + 31536000);
         $this->feather->hooks->fire('logout_end');
 
-        redirect($this->feather->url->base(), __('Logout redirect'));
+        redirect(Url::base(), __('Logout redirect'));
     }
 
     public function forget()
     {
         if (!$this->feather->user->is_guest) {
-            $this->feather->url->redirect($this->feather->url->get('/'), 'Already logged in');
+            $this->feather->url->redirect(Url::get('/'), 'Already logged in');
         }
 
         if ($this->feather->request->isPost()) {
@@ -113,7 +114,7 @@ public function forget()
                 $mail_message = trim(substr($mail_tpl, $first_crlf));
 
                 // Do the generic replacements first (they apply to all emails sent out here)
-                $mail_message = str_replace('<base_url>', $this->feather->url->base().'/', $mail_message);
+                $mail_message = str_replace('<base_url>', Url::base().'/', $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->feather->forum_settings['o_board_title'], $mail_message);
 
                 $mail_message = $this->feather->hooks->fire('mail_message_password_forgotten', $mail_message);
@@ -130,13 +131,13 @@ public function forget()
 
                 // Do the user specific replacements to the template
                 $cur_mail_message = str_replace('<username>', $user->username, $mail_message);
-                $cur_mail_message = str_replace('<activation_url>', $this->feather->url->get('user/'.$user->id.'/action/change_pass/?key='.$new_password_key), $cur_mail_message);
+                $cur_mail_message = str_replace('<activation_url>', Url::get('user/'.$user->id.'/action/change_pass/?key='.$new_password_key), $cur_mail_message);
                 $cur_mail_message = str_replace('<new_password>', $new_password, $cur_mail_message);
                 $cur_mail_message = $this->feather->hooks->fire('cur_mail_message_password_forgotten', $cur_mail_message);
 
                 $this->feather->email->feather_mail($email, $mail_subject, $cur_mail_message);
 
-                $this->feather->url->redirect($this->feather->url->get('/'), __('Forget mail').' <a href="mailto:'.Utils::escape($this->feather->forum_settings['o_admin_email']).'">'.Utils::escape($this->feather->forum_settings['o_admin_email']).'</a>.', 200);
+                $this->feather->url->redirect(Url::get('/'), __('Forget mail').' <a href="mailto:'.Utils::escape($this->feather->forum_settings['o_admin_email']).'">'.Utils::escape($this->feather->forum_settings['o_admin_email']).'</a>.', 200);
             } else {
                 throw new \FeatherBB\Error(__('No email match').' '.Utils::escape($email).'.', 400);
             }
diff --git a/featherbb/Controller/Delete.php b/featherbb/Controller/Delete.php
index 83a7c5d6..77de3bb5 100644
--- a/featherbb/Controller/Delete.php
+++ b/featherbb/Controller/Delete.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Delete
 {
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index be6fb82b..167572b9 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Edit
 {
@@ -76,7 +77,7 @@ public function editpost($id)
                 // Edit the post
                 $this->model->edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod);
 
-                redirect($this->feather->url->get('post/'.$id.'/#p'.$id), __('Post redirect'));
+                redirect(Url::get('post/'.$id.'/#p'.$id), __('Post redirect'));
             }
         } else {
             $post = '';
diff --git a/featherbb/Controller/Help.php b/featherbb/Controller/Help.php
index 6a75e0b4..55c00654 100644
--- a/featherbb/Controller/Help.php
+++ b/featherbb/Controller/Help.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Help
 {
diff --git a/featherbb/Controller/Index.php b/featherbb/Controller/Index.php
index d3b85c89..ca9b1d86 100644
--- a/featherbb/Controller/Index.php
+++ b/featherbb/Controller/Index.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Index
 {
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
index a33ca466..1cf13de6 100644
--- a/featherbb/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Install
 {
@@ -202,7 +203,7 @@ public function create_db(array $data)
         $flash->save();
 
         // Redirect to homepage
-        redirect($this->feather->url->get('/'));
+        redirect(Url::get('/'));
     }
 
     public function write_config($array)
diff --git a/featherbb/Controller/Login.php b/featherbb/Controller/Login.php
index c0ed40de..feaa8f55 100644
--- a/featherbb/Controller/Login.php
+++ b/featherbb/Controller/Login.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Login
 {
@@ -34,7 +35,7 @@ public function __autoload($class_name)
     public function display()
     {
         if (!$this->user->is_guest) {
-            $this->feather->url->redirect($this->feather->url->get('/'), 'Already logged in');
+            $this->feather->url->redirect(Url::get('/'), 'Already logged in');
         }
 
         $this->feather->template->setPageInfo(array(
@@ -52,7 +53,7 @@ public function logmein()
         define('FEATHER_QUIET_VISIT', 1);
 
         if (!$this->user->is_guest) {
-            header('Location: '.$this->feather->url->base());
+            header('Location: '.Url::base());
             exit;
         }
 
@@ -71,7 +72,7 @@ public function forget()
         define('FEATHER_QUIET_VISIT', 1);
 
         if (!$this->user->is_guest) {
-            header('Location: '.$this->feather->url->base());
+            header('Location: '.Url::base());
             exit;
         }
 
diff --git a/featherbb/Controller/Misc.php b/featherbb/Controller/Misc.php
index 2c948fac..a823e9bd 100644
--- a/featherbb/Controller/Misc.php
+++ b/featherbb/Controller/Misc.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Misc
 {
@@ -44,7 +45,7 @@ public function markread()
         // Reset tracked topics
         set_tracked_topics(null);
 
-        redirect($this->feather->url->base(), __('Mark read redirect'));
+        redirect(Url::base(), __('Mark read redirect'));
     }
 
     public function markforumread($id)
@@ -57,7 +58,7 @@ public function markforumread($id)
         $tracked_topics['forums'][$id] = time();
         set_tracked_topics($tracked_topics);
 
-        redirect($this->feather->url->get('forum/'.$id.'/'), __('Mark forum read redirect'));
+        redirect(Url::get('forum/'.$id.'/'), __('Mark forum read redirect'));
     }
 
     public function subscribeforum($id)
diff --git a/featherbb/Controller/Moderate.php b/featherbb/Controller/Moderate.php
index 15e9c7ac..b6531167 100644
--- a/featherbb/Controller/Moderate.php
+++ b/featherbb/Controller/Moderate.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Moderate
 {
@@ -99,7 +100,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         if ($action == 'stick') {
             $this->model->stick_topic($id, $fid);
 
-            redirect($this->feather->url->get('topic/'.$id.'/'), __('Stick topic redirect'));
+            redirect(Url::get('topic/'.$id.'/'), __('Stick topic redirect'));
         }
 
 
@@ -107,21 +108,21 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         if ($action == 'unstick') {
             $this->model->unstick_topic($id, $fid);
 
-            redirect($this->feather->url->get('topic/'.$id.'/'), __('Unstick topic redirect'));
+            redirect(Url::get('topic/'.$id.'/'), __('Unstick topic redirect'));
         }
 
         // Open a topic
         if ($action == 'open') {
             $this->model->open_topic($id, $fid);
 
-            redirect($this->feather->url->get('topic/'.$id.'/'), __('Open topic redirect'));
+            redirect(Url::get('topic/'.$id.'/'), __('Open topic redirect'));
         }
 
         // Close a topic
         if ($action == 'close') {
             $this->model->close_topic($id, $fid);
 
-            redirect($this->feather->url->get('topic/'.$id.'/'), __('Close topic redirect'));
+            redirect(Url::get('topic/'.$id.'/'), __('Close topic redirect'));
         }
 
         $cur_topic = $this->model->get_topic_info($fid, $id);
@@ -199,11 +200,11 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                         'page' => $p,
                         'active_page' => 'moderate',
                         'cur_topic' => $cur_topic,
-                        'url_topic' => $this->feather->url->url_friendly($cur_topic['subject']),
-                        'url_forum' => $this->feather->url->url_friendly($cur_topic['forum_name']),
+                        'url_topic' => Url::url_friendly($cur_topic['subject']),
+                        'url_forum' => Url::url_friendly($cur_topic['forum_name']),
                         'fid' => $fid,
                         'id' => $id,
-                        'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate($num_pages, $p, 'moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/#'),
+                        'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.Url::paginate($num_pages, $p, 'moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/#'),
                         'post_data' => $this->model->display_posts_view($id, $start_from),
                         'button_status' => $button_status,
                         'start_from' => $start_from,
@@ -241,7 +242,7 @@ public function display($id, $name = null, $page = null)
 
         $p = (!isset($page) || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
         $start_from = $this->user->disp_topics * ($p - 1);
-        $url_forum = $this->feather->url->url_friendly($cur_forum['forum_name']);
+        $url_forum = Url::url_friendly($cur_forum['forum_name']);
 
         $this->feather->template->setPageInfo(array(
                             'title' => array(Utils::escape($this->config['o_board_title']), Utils::escape($cur_forum['forum_name'])),
@@ -251,7 +252,7 @@ public function display($id, $name = null, $page = null)
                             'p' => $p,
                             'url_forum' => $url_forum,
                             'cur_forum' => $cur_forum,
-                            'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate($num_pages, $p, 'moderate/forum/'.$id.'/#'),
+                            'paging_links' => '<span class="pages-label">'.__('Pages').' </span>'.Url::paginate($num_pages, $p, 'moderate/forum/'.$id.'/#'),
                             'topic_data' => $this->model->display_topics($id, $sort_by, $start_from),
                             'start_from' => $start_from,
                             )
@@ -352,7 +353,7 @@ public function dealposts($fid)
                 $this->model->close_multiple_topics($action, $topics, $fid);
 
                 $redirect_msg = ($action) ? __('Close topics redirect') : __('Open topics redirect');
-                redirect($this->feather->url->get('moderate/forum/'.$fid.'/'), $redirect_msg);
+                redirect(Url::get('moderate/forum/'.$fid.'/'), $redirect_msg);
             }
         }
     }
diff --git a/featherbb/Controller/Post.php b/featherbb/Controller/Post.php
index 17c01d4c..ae621805 100644
--- a/featherbb/Controller/Post.php
+++ b/featherbb/Controller/Post.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Post
 {
@@ -122,7 +123,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             $this->model->increment_post_count($post, $new['tid']);
                         }
 
-                    redirect($this->feather->url->get('post/'.$new['pid'].'/#p'.$new['pid']), __('Post redirect'));
+                    redirect(Url::get('post/'.$new['pid'].'/#p'.$new['pid']), __('Post redirect'));
                 }
         }
 
@@ -131,28 +132,28 @@ public function newpost($fid = null, $tid = null, $qid = null)
         // If a topic ID was specified in the url (it's a reply)
         if ($tid) {
             $action = __('Post a reply');
-            $form = '<form id="post" method="post" action="'.$this->feather->url->get('post/reply/'.$tid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
+            $form = '<form id="post" method="post" action="'.Url::get('post/reply/'.$tid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
 
                 // If a quote ID was specified in the url
                 if (isset($qid)) {
                     $quote = $this->model->get_quote_message($qid, $tid);
-                    $form = '<form id="post" method="post" action="'.$this->feather->url->get('post/reply/'.$tid.'/quote/'.$qid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
+                    $form = '<form id="post" method="post" action="'.Url::get('post/reply/'.$tid.'/quote/'.$qid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
                 }
         }
         // If a forum ID was specified in the url (new topic)
         elseif ($fid) {
             $action = __('Post new topic');
-            $form = '<form id="post" method="post" action="'.$this->feather->url->get('post/new-topic/'.$fid.'/').'" onsubmit="return process_form(this)">';
+            $form = '<form id="post" method="post" action="'.Url::get('post/new-topic/'.$fid.'/').'" onsubmit="return process_form(this)">';
         } else {
             throw new \FeatherBB\Error(__('Bad request'), 404);
         }
 
-        $url_forum = $this->feather->url->url_friendly($cur_posting['forum_name']);
+        $url_forum = Url::url_friendly($cur_posting['forum_name']);
 
         $is_subscribed = $tid && $cur_posting['is_subscribed'];
 
         if (isset($cur_posting['subject'])) {
-            $url_topic = $this->feather->url->url_friendly($cur_posting['subject']);
+            $url_topic = Url::url_friendly($cur_posting['subject']);
         } else {
             $url_topic = '';
         }
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
index eaf0127e..99e0029b 100644
--- a/featherbb/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Profile
 {
@@ -168,13 +169,13 @@ public function display($id, $section = null)
                     throw new \FeatherBB\Error(__('Bad request'), 404);
                 }
 
-                $avatar_field = '<span><a href="'.$this->feather->url->get('user/'.$id.'/action/upload_avatar/').'">'.__('Change avatar').'</a></span>';
+                $avatar_field = '<span><a href="'.Url::get('user/'.$id.'/action/upload_avatar/').'">'.__('Change avatar').'</a></span>';
 
                 $user_avatar = generate_avatar_markup($id);
                 if ($user_avatar) {
-                    $avatar_field .= ' <span><a href="'.$this->feather->url->get('user/'.$id.'/action/delete_avatar/').'">'.__('Delete avatar').'</a></span>';
+                    $avatar_field .= ' <span><a href="'.Url::get('user/'.$id.'/action/delete_avatar/').'">'.__('Delete avatar').'</a></span>';
                 } else {
-                    $avatar_field = '<span><a href="'.$this->feather->url->get('user/'.$id.'/action/upload_avatar/').'">'.__('Upload avatar').'</a></span>';
+                    $avatar_field = '<span><a href="'.Url::get('user/'.$id.'/action/upload_avatar/').'">'.__('Upload avatar').'</a></span>';
                 }
 
                 if ($user['signature'] != '') {
@@ -314,7 +315,7 @@ public function action($id, $action)
 
             $this->model->delete_avatar($id);
 
-            redirect($this->feather->url->get('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
+            redirect(Url::get('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
         } elseif ($action == 'promote') {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_promote_users == '0')) {
                 throw new \FeatherBB\Error(__('No permission'), 403);
diff --git a/featherbb/Controller/Register.php b/featherbb/Controller/Register.php
index 092d30a7..4cc0ec70 100644
--- a/featherbb/Controller/Register.php
+++ b/featherbb/Controller/Register.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Register
 {
@@ -34,7 +35,7 @@ public function __autoload($class_name)
     public function display()
     {
         if (!$this->user->is_guest) {
-            header('Location: '.$this->feather->url->base());
+            header('Location: '.Url::base());
             exit;
         }
 
@@ -79,7 +80,7 @@ public function display()
 
     public function cancel()
     {
-        redirect($this->feather->url->base());
+        redirect(Url::base());
     }
 
     public function rules()
@@ -88,7 +89,7 @@ public function rules()
 
         // If we are logged in, we shouldn't be here
         if (!$this->user->is_guest) {
-            header('Location: '.$this->feather->url->base());
+            header('Location: '.Url::base());
             exit;
         }
 
@@ -98,7 +99,7 @@ public function rules()
         }
 
         if ($this->config['o_rules'] != '1') {
-            redirect($this->feather->url->get('register/agree/'));
+            redirect(Url::get('register/agree/'));
         }
 
         $this->feather->template->setPageInfo(array(
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index 1388d46d..4914e977 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Search
 {
@@ -73,7 +74,7 @@ public function display()
                     $this->feather->template->addTemplate('search/footer.php', 10)->display();
 
                 } else {
-                    redirect($this->feather->url->get('search/'), __('No hits'));
+                    redirect(Url::get('search/'), __('No hits'));
                 }
         }
         // Display the form
@@ -90,6 +91,6 @@ public function display()
 
     public function quicksearches($show)
     {
-        redirect($this->feather->url->get('search/?action=show_'.$show));
+        redirect(Url::get('search/?action=show_'.$show));
     }
 }
diff --git a/featherbb/Controller/Userlist.php b/featherbb/Controller/Userlist.php
index 381096bc..382ee614 100644
--- a/featherbb/Controller/Userlist.php
+++ b/featherbb/Controller/Userlist.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Userlist
 {
@@ -53,7 +54,7 @@ public function display()
         }
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.Url::paginate_old($num_pages, $p, '?username='.urlencode($username).'&amp;show_group='.$show_group.'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir);
 
         $this->feather->template->setPageInfo(array(
             'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('User list')),
diff --git a/featherbb/Controller/Viewforum.php b/featherbb/Controller/Viewforum.php
index 42ec3b18..0bd72b46 100644
--- a/featherbb/Controller/Viewforum.php
+++ b/featherbb/Controller/Viewforum.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Viewforum
 {
@@ -52,7 +53,7 @@ public function display($id, $name = null, $page = null)
 
         // Can we or can we not post new topics?
         if (($cur_forum['post_topics'] == '' && $this->feather->user->g_post_topics == '1') || $cur_forum['post_topics'] == '1' || $is_admmod) {
-            $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.$this->feather->url->get('post/new-topic/'.$id.'/').'">'.__('Post topic').'</a></p>'."\n";
+            $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.Url::get('post/new-topic/'.$id.'/').'">'.__('Post topic').'</a></p>'."\n";
         } else {
             $post_link = '';
         }
@@ -62,20 +63,20 @@ public function display($id, $name = null, $page = null)
 
         $p = (!isset($page) || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
         $start_from = $this->feather->user->disp_topics * ($p - 1);
-        $url_forum = $this->feather->url->url_friendly($cur_forum['forum_name']);
+        $url_forum = Url::url_friendly($cur_forum['forum_name']);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate($num_pages, $p, 'forum/'.$id.'/'.$url_forum.'/#');
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.Url::paginate($num_pages, $p, 'forum/'.$id.'/'.$url_forum.'/#');
 
         $forum_actions = $this->model->get_forum_actions($id, $this->feather->forum_settings['o_forum_subscriptions'], $cur_forum['is_subscribed']);
 
-        $this->feather->template->addAsset('canonical', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/'));
+        $this->feather->template->addAsset('canonical', Url::get('forum/'.$id.'/'.$url_forum.'/'));
         if ($num_pages > 1) {
             if ($p > 1) {
-                $this->feather->template->addAsset('prev', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
+                $this->feather->template->addAsset('prev', Url::get('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
             }
             if ($p < $num_pages) {
-                $this->feather->template->addAsset('next', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
+                $this->feather->template->addAsset('next', Url::get('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
             }
         }
 
diff --git a/featherbb/Controller/Viewtopic.php b/featherbb/Controller/Viewtopic.php
index 9f824517..cad0c8fe 100644
--- a/featherbb/Controller/Viewtopic.php
+++ b/featherbb/Controller/Viewtopic.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Viewtopic
 {
@@ -58,11 +59,11 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         $p = (!isset($page) || $page <= 1 || $page > $num_pages) ? 1 : intval($page);
         $start_from = $this->feather->user->disp_posts * ($p - 1);
 
-        $url_topic = $this->feather->url->url_friendly($cur_topic['subject']);
-        $url_forum = $this->feather->url->url_friendly($cur_topic['forum_name']);
+        $url_topic = Url::url_friendly($cur_topic['subject']);
+        $url_forum = Url::url_friendly($cur_topic['forum_name']);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate($num_pages, $p, 'topic/'.$id.'/'.$url_topic.'/#');
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.Url::paginate($num_pages, $p, 'topic/'.$id.'/'.$url_topic.'/#');
 
         if ($this->feather->forum_settings['o_censoring'] == '1') {
             $cur_topic['subject'] = censor_words($cur_topic['subject']);
@@ -90,13 +91,13 @@ public function display($id = null, $name = null, $page = null, $pid = null)
             'promptQuote' => __('promptQuote')
         );
 
-        $this->feather->template->addAsset('canonical', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/'));
+        $this->feather->template->addAsset('canonical', Url::get('forum/'.$id.'/'.$url_forum.'/'));
         if ($num_pages > 1) {
             if ($p > 1) {
-                $this->feather->template->addAsset('prev', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
+                $this->feather->template->addAsset('prev', Url::get('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
             }
             if ($p < $num_pages) {
-                $this->feather->template->addAsset('next', $this->feather->url->get('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
+                $this->feather->template->addAsset('next', Url::get('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
             }
         }
 
diff --git a/featherbb/Core/Auth.php b/featherbb/Core/Auth.php
index 7af559e5..bec569e5 100644
--- a/featherbb/Core/Auth.php
+++ b/featherbb/Core/Auth.php
@@ -14,6 +14,7 @@
 namespace FeatherBB;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Auth extends \Slim\Middleware
diff --git a/featherbb/Core/Email.php b/featherbb/Core/Email.php
index bbaecb93..9eddb87a 100644
--- a/featherbb/Core/Email.php
+++ b/featherbb/Core/Email.php
@@ -10,6 +10,7 @@
 namespace FeatherBB;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class Email
 {
@@ -123,7 +124,7 @@ public function bbcode2email($text, $wrap_length = 72)
         static $base_url;
 
         if (!isset($base_url)) {
-            $base_url = $this->feather->url->base();
+            $base_url = Url::base();
         }
 
         $text = Utils::trim($text, "\t\n ");
diff --git a/featherbb/Core/Url.php b/featherbb/Core/Url.php
index 43373379..cbd5493b 100644
--- a/featherbb/Core/Url.php
+++ b/featherbb/Core/Url.php
@@ -13,7 +13,7 @@
 
 class Url
 {
-    protected $url_replace = array(
+    protected static $url_replace = array(
                                         'À' => 'A',
                                         'Á' => 'A',
                                         'Â' => 'A',
@@ -589,15 +589,12 @@ class Url
                                         "'"    =>    '-',
                             );
 
-    public function __construct()
-    {
-        $this->feather = \Slim\Slim::getInstance();
-    }
+    protected static $feather;
 
     //
     // Generate a string with numbered links (for multipage scripts)
     //
-    public function paginate($num_pages, $cur_page, $link, $args = null)
+    public static function paginate($num_pages, $cur_page, $link, $args = null)
     {
         $pages = array();
         $link_to_all = false;
@@ -613,7 +610,7 @@ public function paginate($num_pages, $cur_page, $link, $args = null)
         } else {
             // Add a previous page link
             if ($num_pages > 1 && $cur_page > 1) {
-                $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.$this->get_sublink($link, 'page/$1', ($cur_page - 1), $args).'">'.__('Previous').'</a>';
+                $pages[] = '<a rel="prev"'.(empty($pages) ? ' class="item1"' : '').' href="'.self::get_sublink($link, 'page/$1', ($cur_page - 1), $args).'">'.__('Previous').'</a>';
             }
 
             if ($cur_page > 3) {
@@ -629,7 +626,7 @@ public function paginate($num_pages, $cur_page, $link, $args = null)
                 if ($current < 1 || $current > $num_pages) {
                     continue;
                 } elseif ($current != $cur_page || $link_to_all) {
-                    $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.str_replace('#', '', $this->get_sublink($link, 'page/$1', $current, $args)).'">'.Utils::forum_number_format($current).'</a>';
+                    $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.str_replace('#', '', self::get_sublink($link, 'page/$1', $current, $args)).'">'.Utils::forum_number_format($current).'</a>';
                 } else {
                     $pages[] = '<strong'.(empty($pages) ? ' class="item1"' : '').'>'.Utils::forum_number_format($current).'</strong>';
                 }
@@ -640,12 +637,12 @@ public function paginate($num_pages, $cur_page, $link, $args = null)
                     $pages[] = '<span class="spacer">'.__('Spacer').'</span>';
                 }
 
-                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.$this->get_sublink($link, 'page/$1', $num_pages, $args).'">'.Utils::forum_number_format($num_pages).'</a>';
+                $pages[] = '<a'.(empty($pages) ? ' class="item1"' : '').' href="'.self::get_sublink($link, 'page/$1', $num_pages, $args).'">'.Utils::forum_number_format($num_pages).'</a>';
             }
 
             // Add a next page link
             if ($num_pages > 1 && !$link_to_all && $cur_page < $num_pages) {
-                $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.$this->get_sublink($link, 'page/$1', ($cur_page + 1), $args).'">'.__('Next').'</a>';
+                $pages[] = '<a rel="next"'.(empty($pages) ? ' class="item1"' : '').' href="'.self::get_sublink($link, 'page/$1', ($cur_page + 1), $args).'">'.__('Next').'</a>';
             }
         }
 
@@ -656,7 +653,7 @@ public function paginate($num_pages, $cur_page, $link, $args = null)
     // Generate a string with numbered links (for multipage scripts)
     // Old FluxBB-style function for search page
     //
-    public function paginate_old($num_pages, $cur_page, $link)
+    public static function paginate_old($num_pages, $cur_page, $link)
     {
         $pages = array();
         $link_to_all = false;
@@ -715,9 +712,9 @@ public function paginate_old($num_pages, $cur_page, $link)
     // Make a string safe to use in a URL
     // Inspired by (c) Panther <http://www.pantherforum.org/>
     //
-    public function url_friendly($str)
+    public static function url_friendly($str)
     {
-        $str = strtr($str, $this->url_replace);
+        $str = strtr($str, self::$url_replace);
         $str = strtolower(utf8_decode($str));
         $str = Utils::trim(preg_replace(array('/[^a-z0-9\s]/', '/[\s]+/'), array('', '-'), $str), '-');
 
@@ -732,9 +729,9 @@ public function url_friendly($str)
     // Generate link to another page on the forum
     // Inspired by (c) Panther <http://www.pantherforum.org/>
     //
-    public function get($link, $args = null)
+    public static function get($link, $args = null)
     {
-        $base_url = $this->base();
+        $base_url = self::base();
 
         $gen_link = $link;
         if ($args == null) {
@@ -755,12 +752,12 @@ public function get($link, $args = null)
     // Generate a hyperlink with parameters and anchor and a subsection such as a subpage
     // Inspired by (c) Panther <http://www.pantherforum.org/>
     //
-    private function get_sublink($link, $sublink, $subarg, $args = null)
+    private static function get_sublink($link, $sublink, $subarg, $args = null)
     {
-        $base_url = $this->base();
+        $base_url = self::base();
 
         if ($sublink == 'p$1' && $subarg == 1) {
-            return $this->get($link, $args);
+            return self::get($link, $args);
         }
 
         $gen_link = $link;
@@ -777,20 +774,13 @@ private function get_sublink($link, $sublink, $subarg, $args = null)
         return $gen_link;
     }
 
-    //
-    // Fetch the current protocol in use - http or https
-    //
-    public function protocol()
-    {
-        return $this->feather->request->getScheme();
-    }
-
     //
     // Fetch the base_url, optionally support HTTPS and HTTP
     //
-    public function base()
+    public static function base()
     {
-        return $this->feather->request->getScriptName();
+        self::$feather = \Slim\Slim::getInstance();
+        return self::$feather->request->getScriptName();
     }
 
     //
@@ -821,7 +811,7 @@ public function base()
     //	  [fragment] => fragone
     //	  [url] => http://www.jmrware.com:80/articles?height=10&width=75#fragone
     // )
-    public function is_valid($url)
+    public static function is_valid($url)
     {
         if (strpos($url, 'www.') === 0) {
             $url = 'http://'. $url;
@@ -920,12 +910,14 @@ public function is_valid($url)
     //
     public function redirect($destination_url, $message = null, $status = 302)
     {
+        self::$feather = \Slim\Slim::getInstance();
+
         // Set default type to info if not provided
         if (!is_array($message))
             $message = array('info', $message);
         // Add a flash message
-        $this->feather->flash($message[0], $message[1]);
+        self::$feather->flash($message[0], $message[1]);
 
-        $this->feather->redirect($destination_url);
+        self::$feather->redirect($destination_url);
     }
 }
diff --git a/featherbb/Core/View.php b/featherbb/Core/View.php
index 2bf9cdd7..99c70fef 100644
--- a/featherbb/Core/View.php
+++ b/featherbb/Core/View.php
@@ -10,6 +10,7 @@
 namespace FeatherBB;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 class View
 {
diff --git a/featherbb/Helpers/parser.php b/featherbb/Helpers/parser.php
index fdbc621c..1e298343 100644
--- a/featherbb/Helpers/parser.php
+++ b/featherbb/Helpers/parser.php
@@ -368,7 +368,7 @@ private function _preparse_bbcode_callback($matches)
                 if ($this->feather->user->g_post_links != '1') {
                     $new_errors[] = __('BBerr cannot post URLs');
                 }
-                else if (($m = $this->feather->url->is_valid($contents)))
+                else if (($m = Url::is_valid($contents)))
                 {
                     $contents = $m['url']; // Fetch possibly more complete url address.
                 }
@@ -418,7 +418,7 @@ private function _preparse_bbcode_callback($matches)
                 if ($this->feather->user->g_post_links != '1') {
                     $new_errors[] = __('BBerr cannot post URLs');
                 }
-                else if (($m = $this->feather->url->is_valid($attribute)))
+                else if (($m = Url::is_valid($attribute)))
                 {
                     $attribute = $m['url']; // Fetch possibly more complete url address.
                 }
@@ -455,7 +455,7 @@ private function _preparse_bbcode_callback($matches)
             case 'img': // Handle bad image url, file too big, then scale-to-fit within forum defaults if too large.
                 if ($tag['depth'] === 1)
                 { // Check if not overly nested?
-                    if (($this->pd['ipass'] === 2) && $this->pd['config']['valid_imgs'] && $this->feather->url->is_valid($contents))
+                    if (($this->pd['ipass'] === 2) && $this->pd['config']['valid_imgs'] && Url::is_valid($contents))
                     { // Valid URI?
                         // Yes. Fetch file headers containing file type and size ("Content-Type" and "Content-Length").
                         // ??? Should this call to get_headers have an @ in case of weird errors?
@@ -1243,7 +1243,7 @@ protected function linkify($text)
     private function _linkify_callback($m)
     { // Only linkify valid urls.
         $url = $m[2] . $m[5] . $m[8] . $m[11] . $m[14];
-        if (is_array($u = $this->feather->url->is_valid($url))) {
+        if (is_array($u = Url::is_valid($url))) {
             if (preg_match('%\.(?:jpe?g|gif|png)$%Si', $u['path_abempty'])) {
                 return    $m[1].$m[4].$m[7].$m[10].$m[13] .'[img]'. $u['url'] .'[/img]'. $m[3].$m[6].$m[9].$m[12];
             } else {
diff --git a/featherbb/Model/Admin/Bans.php b/featherbb/Model/Admin/Bans.php
index 519acbaf..a5908687 100644
--- a/featherbb/Model/Admin/Bans.php
+++ b/featherbb/Model/Admin/Bans.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Bans
@@ -277,7 +278,7 @@ public function insert_ban()
         // Regenerate the bans cache
         $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
 
-        redirect($this->feather->url->get('admin/bans/'), __('Ban edited redirect'));
+        redirect(Url::get('admin/bans/'), __('Ban edited redirect'));
     }
 
     public function remove_ban($ban_id)
@@ -292,7 +293,7 @@ public function remove_ban($ban_id)
         // Regenerate the bans cache
         $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
 
-        redirect($this->feather->url->get('admin/bans/'), __('Ban removed redirect'));
+        redirect(Url::get('admin/bans/'), __('Ban removed redirect'));
     }
 
     public function find_ban($start_from = false)
diff --git a/featherbb/Model/Admin/Categories.php b/featherbb/Model/Admin/Categories.php
index a668d3b6..05bab0db 100644
--- a/featherbb/Model/Admin/Categories.php
+++ b/featherbb/Model/Admin/Categories.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Categories
diff --git a/featherbb/Model/Admin/Censoring.php b/featherbb/Model/Admin/Censoring.php
index a933c808..97df6a01 100644
--- a/featherbb/Model/Admin/Censoring.php
+++ b/featherbb/Model/Admin/Censoring.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Censoring
@@ -47,7 +48,7 @@ public function add_word()
         $this->feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
         $this->feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
 
-        redirect($this->feather->url->get('admin/censoring/'), __('Word added redirect'));
+        redirect(Url::get('admin/censoring/'), __('Word added redirect'));
     }
 
     public function update_word()
@@ -75,7 +76,7 @@ public function update_word()
         $this->feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
         $this->feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
 
-        redirect($this->feather->url->get('admin/censoring/'), __('Word updated redirect'));
+        redirect(Url::get('admin/censoring/'), __('Word updated redirect'));
     }
 
     public function remove_word()
@@ -91,7 +92,7 @@ public function remove_word()
         $this->feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
         $this->feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
 
-        redirect($this->feather->url->get('admin/censoring/'),  __('Word removed redirect'));
+        redirect(Url::get('admin/censoring/'),  __('Word removed redirect'));
     }
 
     public function get_words()
diff --git a/featherbb/Model/Admin/Forums.php b/featherbb/Model/Admin/Forums.php
index 7e1cf2ed..d31d4a3b 100644
--- a/featherbb/Model/Admin/Forums.php
+++ b/featherbb/Model/Admin/Forums.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Forums
diff --git a/featherbb/Model/Admin/Groups.php b/featherbb/Model/Admin/Groups.php
index 7db9fc69..61fefb6b 100644
--- a/featherbb/Model/Admin/Groups.php
+++ b/featherbb/Model/Admin/Groups.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Groups
@@ -259,9 +260,9 @@ public function add_edit_group($groups)
         $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
         if ($this->request->post('mode') == 'edit') {
-            redirect($this->feather->url->get('admin/groups/'), __('Group edited redirect'));
+            redirect(Url::get('admin/groups/'), __('Group edited redirect'));
         } else {
-            redirect($this->feather->url->get('admin/groups/'), __('Group added redirect'));
+            redirect(Url::get('admin/groups/'), __('Group added redirect'));
         }
     }
 
@@ -286,7 +287,7 @@ public function set_default_group($groups)
         // Regenerate the config cache
         $this->feather->cache->store('config', \FeatherBB\Model\Cache::get_config());
 
-        redirect($this->feather->url->get('admin/groups/'), __('Default group redirect'));
+        redirect(Url::get('admin/groups/'), __('Default group redirect'));
     }
 
     public function check_members($group_id)
@@ -329,7 +330,7 @@ public function delete_group($group_id)
         DB::for_table('groups')->where('g_promote_next_group', $group_id)
                                                    ->update_many('g_promote_next_group', 0);
 
-        redirect($this->feather->url->get('admin/groups/'), __('Group removed redirect'));
+        redirect(Url::get('admin/groups/'), __('Group removed redirect'));
     }
 
     public function get_group_title($group_id)
diff --git a/featherbb/Model/Admin/Maintenance.php b/featherbb/Model/Admin/Maintenance.php
index 991d08aa..70d0bd25 100644
--- a/featherbb/Model/Admin/Maintenance.php
+++ b/featherbb/Model/Admin/Maintenance.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Maintenance
@@ -212,7 +213,7 @@ public function prune_comply($prune_from, $prune_sticky)
                     ->delete_many();
         }
 
-        redirect($this->feather->url->get('admin/maintenance/'), __('Posts pruned redirect'));
+        redirect(Url::get('admin/maintenance/'), __('Posts pruned redirect'));
     }
 
     public function get_info_prune($prune_sticky, $prune_from)
diff --git a/featherbb/Model/Admin/Options.php b/featherbb/Model/Admin/Options.php
index 7abf2110..f0d06433 100644
--- a/featherbb/Model/Admin/Options.php
+++ b/featherbb/Model/Admin/Options.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Options
@@ -231,7 +232,7 @@ public function update_options()
         $this->feather->cache->store('config', \FeatherBB\Model\Cache::get_config());
         $this->clear_feed_cache();
 
-        redirect($this->feather->url->get('admin/options/'), __('Options updated redirect'));
+        redirect(Url::get('admin/options/'), __('Options updated redirect'));
     }
 
     public function clear_feed_cache()
diff --git a/featherbb/Model/Admin/Parser.php b/featherbb/Model/Admin/Parser.php
index bbb65e5d..99616958 100644
--- a/featherbb/Model/Admin/Parser.php
+++ b/featherbb/Model/Admin/Parser.php
@@ -11,6 +11,7 @@
 namespace FeatherBB\Model\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Parser
diff --git a/featherbb/Model/Admin/Permissions.php b/featherbb/Model/Admin/Permissions.php
index 223fbd63..04e7f90c 100644
--- a/featherbb/Model/Admin/Permissions.php
+++ b/featherbb/Model/Admin/Permissions.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Permissions
@@ -46,6 +47,6 @@ public function update_permissions()
         $this->feather->cache->store('config', \FeatherBB\Model\Cache::get_config());
         // $this->clear_feed_cache();
 
-        redirect($this->feather->url->get('admin/permissions/'), __('Perms updated redirect'));
+        redirect(Url::get('admin/permissions/'), __('Perms updated redirect'));
     }
 }
diff --git a/featherbb/Model/Admin/Reports.php b/featherbb/Model/Admin/Reports.php
index 04796bd9..6268332d 100644
--- a/featherbb/Model/Admin/Reports.php
+++ b/featherbb/Model/Admin/Reports.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Reports
@@ -59,7 +60,7 @@ public function zap_report()
                 ->delete_many();
         }
 
-        redirect($this->feather->url->get('admin/reports/'), __('Report zapped redirect'));
+        redirect(Url::get('admin/reports/'), __('Report zapped redirect'));
     }
 
     public function get_reports()
diff --git a/featherbb/Model/Admin/Statistics.php b/featherbb/Model/Admin/Statistics.php
index 13ad31a9..0b3c5439 100644
--- a/featherbb/Model/Admin/Statistics.php
+++ b/featherbb/Model/Admin/Statistics.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Statistics
diff --git a/featherbb/Model/Admin/Users.php b/featherbb/Model/Admin/Users.php
index fc8e484d..b7a32f6e 100644
--- a/featherbb/Model/Admin/Users.php
+++ b/featherbb/Model/Admin/Users.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model\Admin;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Users
@@ -242,7 +243,7 @@ public function move_users()
             DB::for_table('users')->where_in('id', $move['user_ids'])
                                                       ->update_many('group_id', $new_group);
 
-            redirect($this->feather->url->get('admin/users/'), __('Users move redirect'));
+            redirect(Url::get('admin/users/'), __('Users move redirect'));
         }
 
         $move = $this->hook->fire('model.users.move_users.move', $move);
@@ -407,7 +408,7 @@ public function delete_users()
 
             $stats = $this->feather->cache->retrieve('users_info');
 
-            redirect($this->feather->url->get('admin/users/'), __('Users delete redirect'));
+            redirect(Url::get('admin/users/'), __('Users delete redirect'));
         }
 
         return $user_ids;
@@ -526,7 +527,7 @@ public function ban_users()
                 // Regenerate the bans cache
                 $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
 
-                redirect($this->feather->url->get('admin/users/'), __('Users banned redirect'));
+                redirect(Url::get('admin/users/'), __('Users banned redirect'));
             }
         }
         return $user_ids;
diff --git a/featherbb/Model/Auth.php b/featherbb/Model/Auth.php
index 52767205..aaa93d1c 100644
--- a/featherbb/Model/Auth.php
+++ b/featherbb/Model/Auth.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Auth
diff --git a/featherbb/Model/Cache.php b/featherbb/Model/Cache.php
index e94b7eac..3fa7eb70 100644
--- a/featherbb/Model/Cache.php
+++ b/featherbb/Model/Cache.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Cache
diff --git a/featherbb/Model/Debug.php b/featherbb/Model/Debug.php
index da7a623d..544546f2 100644
--- a/featherbb/Model/Debug.php
+++ b/featherbb/Model/Debug.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Debug
diff --git a/featherbb/Model/Delete.php b/featherbb/Model/Delete.php
index 3ff834dd..caed6725 100644
--- a/featherbb/Model/Delete.php
+++ b/featherbb/Model/Delete.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Delete
@@ -66,7 +67,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
             delete_topic($tid);
             update_forum($fid);
 
-            redirect($this->feather->url->get('forum/'.$fid.'/'), __('Topic del redirect'));
+            redirect(Url::get('forum/'.$fid.'/'), __('Topic del redirect'));
         } else {
             $this->hook->fire('handle_deletion', $tid, $fid, $id);
 
@@ -85,7 +86,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
 
             $post = $post->find_one();
 
-            redirect($this->feather->url->get('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
+            redirect(Url::get('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
         }
     }
 }
diff --git a/featherbb/Model/Edit.php b/featherbb/Model/Edit.php
index 6d28bab8..fb61e1b6 100644
--- a/featherbb/Model/Edit.php
+++ b/featherbb/Model/Edit.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Edit
diff --git a/featherbb/Model/Header.php b/featherbb/Model/Header.php
index 38f8ffe9..772e9e84 100644
--- a/featherbb/Model/Header.php
+++ b/featherbb/Model/Header.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Header
diff --git a/featherbb/Model/Index.php b/featherbb/Model/Index.php
index 4295b068..d9c00120 100644
--- a/featherbb/Model/Index.php
+++ b/featherbb/Model/Index.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Index
@@ -50,7 +51,7 @@ public function get_forum_actions()
 
         // Display a "mark all as read" link
         if (!$this->user->is_guest) {
-            $forum_actions[] = '<a href="'.$this->feather->url->get('mark-read/').'">'.__('Mark all as read').'</a>';
+            $forum_actions[] = '<a href="'.Url::get('mark-read/').'">'.__('Mark all as read').'</a>';
         }
 
         $forum_actions = $this->hook->fire('get_forum_actions', $forum_actions);
@@ -178,7 +179,7 @@ public function print_categories_forums()
             // Are there new posts since our last visit?
             if (isset($new_topics[$cur_forum->fid])) {
                 $cur_forum->item_status .= ' inew';
-                $forum_field_new = '<span class="newtext">[ <a href="'.$this->feather->url->get('search/?action=show_new&amp;fid='.$cur_forum->fid).'">'.__('New posts').'</a> ]</span>';
+                $forum_field_new = '<span class="newtext">[ <a href="'.Url::get('search/?action=show_new&amp;fid='.$cur_forum->fid).'">'.__('New posts').'</a> ]</span>';
                 $cur_forum->icon_type = 'icon icon-new';
             }
 
@@ -189,7 +190,7 @@ public function print_categories_forums()
                 $cur_forum->item_status .= ' iredirect';
                 $cur_forum->icon_type = 'icon';
             } else {
-                $cur_forum->forum_field = '<h3><a href="'.$this->feather->url->get('forum/'.$cur_forum->fid.'/'.$this->feather->url->url_friendly($cur_forum->forum_name)).'/'.'">'.Utils::escape($cur_forum->forum_name).'</a>'.(!empty($forum_field_new) ? ' '.$forum_field_new : '').'</h3>';
+                $cur_forum->forum_field = '<h3><a href="'.Url::get('forum/'.$cur_forum->fid.'/'.Url::url_friendly($cur_forum->forum_name)).'/'.'">'.Utils::escape($cur_forum->forum_name).'</a>'.(!empty($forum_field_new) ? ' '.$forum_field_new : '').'</h3>';
                 $cur_forum->num_topics_formatted = $cur_forum->num_topics;
                 $cur_forum->num_posts_formatted = $cur_forum->num_posts;
             }
@@ -200,7 +201,7 @@ public function print_categories_forums()
 
             // If there is a last_post/last_poster
             if ($cur_forum->last_post != '') {
-                $cur_forum->last_post_formatted = '<a href="'.$this->feather->url->get('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.$this->feather->utils->format_time($cur_forum->last_post).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_forum->last_poster).'</span>';
+                $cur_forum->last_post_formatted = '<a href="'.Url::get('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.$this->feather->utils->format_time($cur_forum->last_post).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_forum->last_poster).'</span>';
             } elseif ($cur_forum->redirect_url != '') {
                 $cur_forum->last_post_formatted = '- - -';
             } else {
@@ -213,7 +214,7 @@ public function print_categories_forums()
 
                 foreach ($mods_array as $mod_username => $mod_id) {
                     if ($this->user->g_view_users == '1') {
-                        $moderators[] = '<a href="'.$this->feather->url->get('user/'.$mod_id.'/').'">'.Utils::escape($mod_username).'</a>';
+                        $moderators[] = '<a href="'.Url::get('user/'.$mod_id.'/').'">'.Utils::escape($mod_username).'</a>';
                     } else {
                         $moderators[] = Utils::escape($mod_username);
                     }
@@ -257,7 +258,7 @@ public function collect_stats()
         $stats['total_posts'] = intval($query['total_posts']);
 
         if ($this->user->g_view_users == '1') {
-            $stats['newest_user'] = '<a href="'.$this->feather->url->get('user/'.$stats['last_user']['id']).'/">'.Utils::escape($stats['last_user']['username']).'</a>';
+            $stats['newest_user'] = '<a href="'.Url::get('user/'.$stats['last_user']['id']).'/">'.Utils::escape($stats['last_user']['username']).'</a>';
         } else {
             $stats['newest_user'] = Utils::escape($stats['last_user']['username']);
         }
@@ -292,7 +293,7 @@ public function fetch_users_online()
         foreach($query as $user_online) {
             if ($user_online->user_id > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $online['users'][] = "\n\t\t\t\t".'<dd><a href="'.$this->feather->url->get('user/'.$user_online->user_id).'/">'.Utils::escape($user_online->ident).'</a>';
+                    $online['users'][] = "\n\t\t\t\t".'<dd><a href="'.Url::get('user/'.$user_online->user_id).'/">'.Utils::escape($user_online->ident).'</a>';
                 } else {
                     $online['users'][] = "\n\t\t\t\t".'<dd>'.Utils::escape($user_online->ident);
                 }
diff --git a/featherbb/Model/Install.php b/featherbb/Model/Install.php
index 9b5d45de..396cee6e 100644
--- a/featherbb/Model/Install.php
+++ b/featherbb/Model/Install.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Install
diff --git a/featherbb/Model/Login.php b/featherbb/Model/Login.php
index 33f042b5..df330410 100644
--- a/featherbb/Model/Login.php
+++ b/featherbb/Model/Login.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Login
@@ -50,7 +51,7 @@ public function login()
         $authorized = $this->hook->fire('authorized_login', $authorized);
 
         if (!$authorized) {
-            throw new \FeatherBB\Error(__('Wrong user/pass').' <a href="'.$this->feather->url->get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
+            throw new \FeatherBB\Error(__('Wrong user/pass').' <a href="'.Url::get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
         }
 
         // Update the status if this is the first time the user logged in
@@ -93,7 +94,7 @@ public function logout($id, $token)
         $token = $this->hook->fire('logout_start', $token, $id);
 
         if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != \FeatherBB\Utils::hash($this->user->id.\FeatherBB\Utils::hash($this->request->getIp()))) {
-            header('Location: '.$this->feather->url->base());
+            header('Location: '.Url::base());
             exit;
         }
 
@@ -115,7 +116,7 @@ public function logout($id, $token)
 
         $this->auth->feather_setcookie(1, \FeatherBB\Utils::hash(uniqid(rand(), true)), time() + 31536000);
 
-        redirect($this->feather->url->base(), __('Logout redirect'));
+        redirect(Url::base(), __('Logout redirect'));
     }
 
     public function password_forgotten()
@@ -123,7 +124,7 @@ public function password_forgotten()
         $this->hook->fire('password_forgotten_start');
 
         if (!$this->user->is_guest) {
-            header('Location: '.$this->feather->url->base());
+            header('Location: '.Url::base());
             exit;
         }
         // Start with a clean slate
@@ -157,7 +158,7 @@ public function password_forgotten()
                     $mail_message = trim(substr($mail_tpl, $first_crlf));
 
                     // Do the generic replacements first (they apply to all emails sent out here)
-                    $mail_message = str_replace('<base_url>', $this->feather->url->base().'/', $mail_message);
+                    $mail_message = str_replace('<base_url>', Url::base().'/', $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
                     $mail_message = $this->hook->fire('mail_message_password_forgotten', $mail_message);
@@ -187,7 +188,7 @@ public function password_forgotten()
 
                         // Do the user specific replacements to the template
                         $cur_mail_message = str_replace('<username>', $cur_hit->username, $mail_message);
-                        $cur_mail_message = str_replace('<activation_url>', $this->feather->url->get('user/'.$cur_hit->id.'/action/change_pass/?key='.$new_password_key), $cur_mail_message);
+                        $cur_mail_message = str_replace('<activation_url>', Url::get('user/'.$cur_hit->id.'/action/change_pass/?key='.$new_password_key), $cur_mail_message);
                         $cur_mail_message = str_replace('<new_password>', $new_password, $cur_mail_message);
                         $cur_mail_message = $this->hook->fire('cur_mail_message_password_forgotten', $cur_mail_message);
 
@@ -215,7 +216,7 @@ public function get_redirect_url()
         }
 
         if (!isset($redirect_url)) {
-            $redirect_url = $this->feather->url->base();
+            $redirect_url = Url::base();
         } elseif (preg_match('%viewtopic\.php\?pid=(\d+)$%', $redirect_url, $matches)) { // TODO
             $redirect_url .= '#p'.$matches[1];
         }
diff --git a/featherbb/Model/Misc.php b/featherbb/Model/Misc.php
index 8c98ed8b..137177d6 100644
--- a/featherbb/Model/Misc.php
+++ b/featherbb/Model/Misc.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Misc
@@ -110,7 +111,7 @@ public function send_email($mail)
         // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after the email is sent) TODO
         //$redirect_url = validate_redirect($this->request->post('redirect_url'), 'index.php');
 
-        redirect($this->feather->url->base(), __('Email sent redirect'));
+        redirect(Url::base(), __('Email sent redirect'));
     }
 
     public function get_redirect_url($recipient_id)
@@ -124,7 +125,7 @@ public function get_redirect_url($recipient_id)
         }
 
         if (!isset($redirect_url)) {
-            $redirect_url = $this->feather->url->get('user/'.$recipient_id.'/');
+            $redirect_url = Url::get('user/'.$recipient_id.'/');
         } elseif (preg_match('%viewtopic\.php\?pid=(\d+)$%', $redirect_url, $matches)) {
             $redirect_url .= '#p'.$matches[1];
         }
@@ -206,7 +207,7 @@ public function insert_report($post_id)
                 $mail_subject = str_replace('<forum_id>', $report['forum_id'], $mail_subject);
                 $mail_subject = str_replace('<topic_subject>', $report['subject'], $mail_subject);
                 $mail_message = str_replace('<username>', $this->user->username, $mail_message);
-                $mail_message = str_replace('<post_url>', $this->feather->url->get('post/'.$post_id.'/#p'.$post_id), $mail_message);
+                $mail_message = str_replace('<post_url>', Url::get('post/'.$post_id.'/#p'.$post_id), $mail_message);
                 $mail_message = str_replace('<reason>', $reason, $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
@@ -222,7 +223,7 @@ public function insert_report($post_id)
         $last_report_sent = $this->hook->fireDB('insert_last_report_sent', $last_report_sent);
         $last_report_sent = $last_report_sent->save();
 
-        redirect($this->feather->url->get('forum/'.$report['forum_id'].'/'.$this->feather->url->url_friendly($report['subject']).'/'), __('Report redirect'));
+        redirect(Url::get('forum/'.$report['forum_id'].'/'.Url::url_friendly($report['subject']).'/'), __('Report redirect'));
     }
 
     public function get_info_report($post_id)
@@ -306,7 +307,7 @@ public function subscribe_topic($topic_id)
         $subscription = $this->hook->fireDB('subscribe_topic_query', $subscription);
         $subscription = $subscription->save();
 
-        redirect($this->feather->url->get('topic/'.$topic_id.'/'), __('Subscribe redirect'));
+        redirect(Url::get('topic/'.$topic_id.'/'), __('Subscribe redirect'));
     }
 
     public function unsubscribe_topic($topic_id)
@@ -334,7 +335,7 @@ public function unsubscribe_topic($topic_id)
         $delete = $this->hook->fireDB('unsubscribe_topic_query', $delete);
         $delete = $delete->delete_many();
 
-        redirect($this->feather->url->get('topic/'.$topic_id.'/'), __('Unsubscribe redirect'));
+        redirect(Url::get('topic/'.$topic_id.'/'), __('Unsubscribe redirect'));
     }
 
     public function unsubscribe_forum($forum_id)
@@ -362,7 +363,7 @@ public function unsubscribe_forum($forum_id)
         $delete = $this->hook->fireDB('unsubscribe_forum_query', $delete);
         $delete = $delete->delete_many();
 
-        redirect($this->feather->url->get('forum/'.$forum_id.'/'), __('Unsubscribe redirect'));
+        redirect(Url::get('forum/'.$forum_id.'/'), __('Unsubscribe redirect'));
     }
 
     public function subscribe_forum($forum_id)
@@ -413,6 +414,6 @@ public function subscribe_forum($forum_id)
         $subscription = $this->hook->fireDB('subscribe_forum_query', $subscription);
         $subscription = $subscription->save();
 
-        redirect($this->feather->url->get('forum/'.$forum_id.'/'), __('Subscribe redirect'));
+        redirect(Url::get('forum/'.$forum_id.'/'), __('Subscribe redirect'));
     }
 }
diff --git a/featherbb/Model/Moderate.php b/featherbb/Model/Moderate.php
index d438f679..71cbb619 100644
--- a/featherbb/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Moderate
@@ -28,7 +29,7 @@ public function __construct()
     public function display_ip_info($ip)
     {
         $ip = $this->hook->fire('display_ip_info', $ip);
-        throw new \FeatherBB\Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.$this->feather->url->get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        throw new \FeatherBB\Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Url::get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function display_ip_address_post($pid)
@@ -46,7 +47,7 @@ public function display_ip_address_post($pid)
 
         $ip = $this->hook->fire('display_ip_address_post', $ip);
 
-        throw new \FeatherBB\Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.$this->feather->url->get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        throw new \FeatherBB\Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Url::get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function get_moderators($fid)
@@ -156,7 +157,7 @@ public function delete_posts($tid, $fid, $p = null)
 
             update_forum($fid);
 
-            redirect($this->feather->url->get('topic/'.$tid.'/'), __('Delete posts redirect'));
+            redirect(Url::get('topic/'.$tid.'/'), __('Delete posts redirect'));
         }
 
         $posts = $this->hook->fire('delete_posts', $posts);
@@ -317,7 +318,7 @@ public function split_posts($tid, $fid, $p = null)
             update_forum($fid);
             update_forum($move_to_forum);
 
-            redirect($this->feather->url->get('topic/'.$new_tid.'/'), __('Split posts redirect'));
+            redirect(Url::get('topic/'.$new_tid.'/'), __('Split posts redirect'));
         }
 
         $posts = $this->hook->fire('split_posts', $posts);
@@ -457,7 +458,7 @@ public function display_posts_view($tid, $start_from)
             // If the poster is a registered user
             if ($cur_post->poster_id > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $cur_post->poster_disp = '<a href="'.$this->feather->url->get('user/'.$cur_post->poster_id.'/').'">'.Utils::escape($cur_post->poster).'</a>';
+                    $cur_post->poster_disp = '<a href="'.Url::get('user/'.$cur_post->poster_id.'/').'">'.Utils::escape($cur_post->poster).'</a>';
                 } else {
                     $cur_post->poster_disp = Utils::escape($cur_post->poster);
                 }
@@ -582,7 +583,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
 
         $redirect_msg = (count($topics) > 1) ? __('Move topics redirect') : __('Move topic redirect');
         $redirect_msg = $this->hook->fire('move_topics_to_redirect_message', $redirect_msg);
-        redirect($this->feather->url->get('forum/'.$move_to_forum.'/'), $redirect_msg);
+        redirect(Url::get('forum/'.$move_to_forum.'/'), $redirect_msg);
     }
 
     public function check_move_possible()
@@ -734,7 +735,7 @@ public function merge_topics($fid)
 
         // Update the forum FROM which the topic was moved and redirect
         update_forum($fid);
-        redirect($this->feather->url->get('forum/'.$fid.'/'), __('Merge topics redirect'));
+        redirect(Url::get('forum/'.$fid.'/'), __('Merge topics redirect'));
     }
 
     public function delete_topics($topics, $fid)
@@ -818,7 +819,7 @@ public function delete_topics($topics, $fid)
 
         $this->hook->fire('delete_topics');
 
-        redirect($this->feather->url->get('forum/'.$fid.'/'), __('Delete topics redirect'));
+        redirect(Url::get('forum/'.$fid.'/'), __('Delete topics redirect'));
     }
 
     public function get_forum_info($fid)
@@ -915,10 +916,10 @@ public function display_topics($fid, $sort_by, $start_from)
                 $status_text = array();
                 $cur_topic['item_status'] = ($topic_count % 2 == 0) ? 'roweven' : 'rowodd';
                 $cur_topic['icon_type'] = 'icon';
-                $url_topic = $this->feather->url->url_friendly($cur_topic['subject']);
+                $url_topic = Url::url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_disp'] = '<a href="'.$this->feather->url->get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.$this->feather->utils->format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_disp'] = '<a href="'.Url::get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.$this->feather->utils->format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['last_poster']).'</span>';
                     $cur_topic['ghost_topic'] = false;
                 } else {
                     $cur_topic['last_post_disp'] = '- - -';
@@ -935,13 +936,13 @@ public function display_topics($fid, $sort_by, $start_from)
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.Url::get('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.Url::get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.Url::get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
@@ -950,7 +951,7 @@ public function display_topics($fid, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_disp'] = '<strong>'.$cur_topic['subject_disp'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.Url::get('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
@@ -961,7 +962,7 @@ public function display_topics($fid, $sort_by, $start_from)
                 $num_pages_topic = ceil(($cur_topic['num_replies'] + 1) / $this->user->disp_posts);
 
                 if ($num_pages_topic > 1) {
-                    $subject_multipage = '<span class="pagestext">[ '.$this->feather->url->paginate($num_pages_topic, -1, 'topic/'.$cur_topic['id'].'/'.$url_topic.'/#').' ]</span>';
+                    $subject_multipage = '<span class="pagestext">[ '.Url::paginate($num_pages_topic, -1, 'topic/'.$cur_topic['id'].'/'.$url_topic.'/#').' ]</span>';
                 } else {
                     $subject_multipage = null;
                 }
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
index a2bf32e2..c0e7b513 100644
--- a/featherbb/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Post
@@ -407,8 +408,8 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
                         $mail_subject = str_replace('<topic_subject>', $cur_posting['subject'], $mail_subject);
                         $mail_message = str_replace('<topic_subject>', $cur_posting['subject'], $mail_message);
                         $mail_message = str_replace('<replier>', $post['username'], $mail_message);
-                        $mail_message = str_replace('<post_url>', $this->feather->url->get('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
-                        $mail_message = str_replace('<unsubscribe_url>', $this->feather->url->get('unsubscribe/topic/'.$tid.'/'), $mail_message);
+                        $mail_message = str_replace('<post_url>', Url::get('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
+                        $mail_message = str_replace('<unsubscribe_url>', Url::get('unsubscribe/topic/'.$tid.'/'), $mail_message);
                         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                         $mail_message = $this->hook->fire('send_notifications_reply_mail_message', $mail_message);
 
@@ -416,8 +417,8 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
                         $mail_message_full = str_replace('<topic_subject>', $cur_posting['subject'], $mail_message_full);
                         $mail_message_full = str_replace('<replier>', $post['username'], $mail_message_full);
                         $mail_message_full = str_replace('<message>', $cleaned_message, $mail_message_full);
-                        $mail_message_full = str_replace('<post_url>', $this->feather->url->get('post/'.$new_pid.'/#p'.$new_pid), $mail_message_full);
-                        $mail_message_full = str_replace('<unsubscribe_url>', $this->feather->url->get('unsubscribe/topic/'.$tid.'/'), $mail_message_full);
+                        $mail_message_full = str_replace('<post_url>', Url::get('post/'.$new_pid.'/#p'.$new_pid), $mail_message_full);
+                        $mail_message_full = str_replace('<unsubscribe_url>', Url::get('unsubscribe/topic/'.$tid.'/'), $mail_message_full);
                         $mail_message_full = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message_full);
                         $mail_message_full = $this->hook->fire('send_notifications_reply_mail_message_full', $mail_message_full);
 
@@ -615,8 +616,8 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
                         $mail_message = str_replace('<topic_subject>', $this->config['o_censoring'] == '1' ? $censored_subject : $post['subject'], $mail_message);
                         $mail_message = str_replace('<forum_name>', $cur_posting['forum_name'], $mail_message);
                         $mail_message = str_replace('<poster>', $post['username'], $mail_message);
-                        $mail_message = str_replace('<topic_url>', $this->feather->url->get('topic/'.$new_tid.'/'), $mail_message);
-                        $mail_message = str_replace('<unsubscribe_url>', $this->feather->url->get('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message);
+                        $mail_message = str_replace('<topic_url>', Url::get('topic/'.$new_tid.'/'), $mail_message);
+                        $mail_message = str_replace('<unsubscribe_url>', Url::get('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message);
                         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                         $mail_message = $this->hook->fire('send_notifications_new_topic_mail_message', $mail_message);
 
@@ -625,8 +626,8 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
                         $mail_message_full = str_replace('<forum_name>', $cur_posting['forum_name'], $mail_message_full);
                         $mail_message_full = str_replace('<poster>', $post['username'], $mail_message_full);
                         $mail_message_full = str_replace('<message>', $cleaned_message, $mail_message_full);
-                        $mail_message_full = str_replace('<topic_url>', $this->feather->url->get('topic/'.$new_tid.'/'), $mail_message_full);
-                        $mail_message_full = str_replace('<unsubscribe_url>', $this->feather->url->get('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message_full);
+                        $mail_message_full = str_replace('<topic_url>', Url::get('topic/'.$new_tid.'/'), $mail_message_full);
+                        $mail_message_full = str_replace('<unsubscribe_url>', Url::get('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message_full);
                         $mail_message_full = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message_full);
                         $mail_message_full = $this->hook->fire('send_notifications_new_topic_mail_message_full', $mail_message_full);
 
@@ -669,7 +670,7 @@ public function warn_banned_user($post, $new_pid)
 
         $mail_message = str_replace('<username>', $post['username'], $mail_message);
         $mail_message = str_replace('<email>', $post['email'], $mail_message);
-        $mail_message = str_replace('<post_url>', $this->feather->url->get('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
+        $mail_message = str_replace('<post_url>', Url::get('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
         $mail_message = $this->hook->fire('warn_banned_user_mail_message', $mail_message);
 
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index fbd2b8d7..e0a13956 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Profile
@@ -37,7 +38,7 @@ public function change_pass($id)
 
             // If the user is already logged in we shouldn't be here :)
             if (!$this->user->is_guest) {
-                header('Location: '.$this->feather->url->base());
+                header('Location: '.Url::base());
                 exit;
             }
 
@@ -58,7 +59,7 @@ public function change_pass($id)
                 $query = $this->hook->fireDB('change_pass_activate_query', $query);
                 $query = $query->save();
 
-                $this->feather->url->redirect($this->feather->url->get('/'), __('Pass updated'));
+                $this->feather->url->redirect(Url::get('/'), __('Pass updated'));
             }
         }
 
@@ -137,7 +138,7 @@ public function change_pass($id)
 
             $this->hook->fire('change_pass');
 
-            redirect($this->feather->url->get('user/'.$id.'/section/essentials/'), __('Pass updated redirect'));
+            redirect(Url::get('user/'.$id.'/section/essentials/'), __('Pass updated redirect'));
         }
     }
 
@@ -194,7 +195,7 @@ public function change_email($id)
                 $update_mail = $this->hook->fireDB('change_email_query', $update_mail);
                 $update_mail = $update_mail->save();
 
-                $this->feather->url->redirect($this->feather->url->get('/'), __('Email updated'));
+                $this->feather->url->redirect(Url::get('/'), __('Email updated'));
             }
         } elseif ($this->request->isPost()) {
             $this->hook->fire('change_email_post');
@@ -227,7 +228,7 @@ public function change_email($id)
                     $mail_message = trim(substr($mail_tpl, $first_crlf));
                     $mail_message = str_replace('<username>', $this->user->username, $mail_message);
                     $mail_message = str_replace('<email>', $new_email, $mail_message);
-                    $mail_message = str_replace('<profile_url>', $this->feather->url->get('user/'.$id.'/'), $mail_message);
+                    $mail_message = str_replace('<profile_url>', Url::get('user/'.$id.'/'), $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                     $mail_message = $this->hook->fire('change_email_mail_message', $mail_message);
 
@@ -264,7 +265,7 @@ public function change_email($id)
                     $mail_message = trim(substr($mail_tpl, $first_crlf));
                     $mail_message = str_replace('<username>', $this->user->username, $mail_message);
                     $mail_message = str_replace('<dupe_list>', implode(', ', $dupe_list), $mail_message);
-                    $mail_message = str_replace('<profile_url>', $this->feather->url->get('user/'.$id.'/'), $mail_message);
+                    $mail_message = str_replace('<profile_url>', Url::get('user/'.$id.'/'), $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                     $mail_message = $this->hook->fire('change_email_mail_dupe_message', $mail_message);
 
@@ -300,8 +301,8 @@ public function change_email($id)
 
             $mail_message = trim(substr($mail_tpl, $first_crlf));
             $mail_message = str_replace('<username>', $this->user->username, $mail_message);
-            $mail_message = str_replace('<base_url>', $this->feather->url->base(), $mail_message);
-            $mail_message = str_replace('<activation_url>', $this->feather->url->get('user/'.$id.'/action/change_email/?key='.$new_email_key), $mail_message);
+            $mail_message = str_replace('<base_url>', Url::base(), $mail_message);
+            $mail_message = str_replace('<activation_url>', Url::get('user/'.$id.'/action/change_email/?key='.$new_email_key), $mail_message);
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
             $mail_message = $this->hook->fire('change_email_mail_activate_message', $mail_message);
 
@@ -403,7 +404,7 @@ public function upload_avatar($id, $files_data)
 
         $uploaded_file = $this->hook->fire('upload_avatar', $uploaded_file);
 
-        redirect($this->feather->url->get('user/'.$id.'/section/personality/'), __('Avatar upload redirect'));
+        redirect(Url::get('user/'.$id.'/section/personality/'), __('Avatar upload redirect'));
     }
 
     public function update_group_membership($id)
@@ -470,7 +471,7 @@ public function update_group_membership($id)
 
         $id = $this->hook->fire('update_group_membership', $id);
 
-        redirect($this->feather->url->get('user/'.$id.'/section/admin/'), __('Group membership redirect'));
+        redirect(Url::get('user/'.$id.'/section/admin/'), __('Group membership redirect'));
     }
 
     public function get_username($id)
@@ -540,7 +541,7 @@ public function update_mod_forums($id)
 
         $id = $this->hook->fire('update_mod_forums', $id);
 
-        redirect($this->feather->url->get('user/'.$id.'/section/admin/'), __('Update forums redirect'));
+        redirect(Url::get('user/'.$id.'/section/admin/'), __('Update forums redirect'));
     }
 
     public function ban_user($id)
@@ -559,9 +560,9 @@ public function ban_user($id)
         $ban_id = $ban_id->find_one_col('id');
 
         if ($ban_id) {
-            redirect($this->feather->url->get('admin/bans/edit/'.$ban_id.'/'), __('Ban redirect'));
+            redirect(Url::get('admin/bans/edit/'.$ban_id.'/'), __('Ban redirect'));
         } else {
-            redirect($this->feather->url->get('admin/bans/add/'.$id.'/'), __('Ban redirect'));
+            redirect(Url::get('admin/bans/add/'.$id.'/'), __('Ban redirect'));
         }
     }
 
@@ -593,7 +594,7 @@ public function promote_user($id)
 
         $pid = $this->hook->fire('promote_user', $pid);
 
-        redirect($this->feather->url->get('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
+        redirect(Url::get('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
     }
 
     public function delete_user($id)
@@ -733,7 +734,7 @@ public function delete_user($id)
 
             $this->hook->fire('delete_user');
 
-            redirect($this->feather->url->base(), __('User delete redirect'));
+            redirect(Url::base(), __('User delete redirect'));
         }
     }
 
@@ -832,7 +833,7 @@ public function update_profile($id, $info, $section)
                 // Add http:// if the URL doesn't contain it already (while allowing https://, too)
                 if ($this->user->g_post_links == '1') {
                     if ($form['url'] != '') {
-                        $url = $this->feather->url->is_valid($form['url']);
+                        $url = Url::is_valid($form['url']);
 
                         if ($url === false) {
                             throw new \FeatherBB\Error(__('Invalid website URL'));
@@ -1083,7 +1084,7 @@ public function update_profile($id, $info, $section)
 
         $section = $this->hook->fireDB('update_profile', $section, $id);
 
-        redirect($this->feather->url->get('user/'.$id.'/section/'.$section.'/'), __('Profile redirect'));
+        redirect(Url::get('user/'.$id.'/section/'.$section.'/'), __('Profile redirect'));
     }
 
     public function get_user_info($id)
@@ -1137,7 +1138,7 @@ public function parse_user_info($user)
         if ($user['email_setting'] == '0' && !$this->user->is_guest && $this->user->g_send_email == '1') {
             $user['email_field'] = '<a href="mailto:'.Utils::escape($user['email']).'">'.Utils::escape($user['email']).'</a>';
         } elseif ($user['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-            $user['email_field'] = '<a href="'.$this->feather->url->get('email/'.$user['id'].'/').'">'.__('Send email').'</a>';
+            $user['email_field'] = '<a href="'.Url::get('email/'.$user['id'].'/').'">'.__('Send email').'</a>';
         } else {
             $user['email_field'] = '';
         }
@@ -1193,11 +1194,11 @@ public function parse_user_info($user)
         if ($this->user->g_search == '1') {
             $quick_searches = array();
             if ($user['num_posts'] > 0) {
-                $quick_searches[] = '<a href="'.$this->feather->url->get('search/?action=show_user_topics&amp;user_id='.$user['id']).'">'.__('Show topics').'</a>';
-                $quick_searches[] = '<a href="'.$this->feather->url->get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Show posts').'</a>';
+                $quick_searches[] = '<a href="'.Url::get('search/?action=show_user_topics&amp;user_id='.$user['id']).'">'.__('Show topics').'</a>';
+                $quick_searches[] = '<a href="'.Url::get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Show posts').'</a>';
             }
             if ($this->user->is_admmod && $this->config['o_topic_subscriptions'] == '1') {
-                $quick_searches[] = '<a href="'.$this->feather->url->get('search/?action=show_subscriptions&amp;user_id='.$user['id']).'">'.__('Show subscriptions').'</a>';
+                $quick_searches[] = '<a href="'.Url::get('search/?action=show_subscriptions&amp;user_id='.$user['id']).'">'.__('Show subscriptions').'</a>';
             }
 
             if (!empty($quick_searches)) {
@@ -1235,12 +1236,12 @@ public function edit_essentials($id, $user)
                 $user_disp['username_field'] = '<p>'.sprintf(__('Username info'), Utils::escape($user['username'])).'</p>'."\n";
             }
 
-            $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.Utils::escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.$this->feather->url->get('email/'.$id.'/').'">'.__('Send email').'</a></span></p>'."\n";
+            $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.Utils::escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.Url::get('email/'.$id.'/').'">'.__('Send email').'</a></span></p>'."\n";
         } else {
             $user_disp['username_field'] = '<p>'.__('Username').': '.Utils::escape($user['username']).'</p>'."\n";
 
             if ($this->config['o_regs_verify'] == '1') {
-                $user_disp['email_field'] = '<p>'.sprintf(__('Email info'), Utils::escape($user['email']).' - <a href="'.$this->feather->url->get('user/'.$id.'/action/change_email/').'">'.__('Change email').'</a>').'</p>'."\n";
+                $user_disp['email_field'] = '<p>'.sprintf(__('Email info'), Utils::escape($user['email']).' - <a href="'.Url::get('user/'.$id.'/action/change_email/').'">'.__('Change email').'</a>').'</p>'."\n";
             } else {
                 $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.$user['email'].'" size="40" maxlength="80" /><br /></label>'."\n";
             }
@@ -1256,11 +1257,11 @@ public function edit_essentials($id, $user)
         }
 
         if ($this->user->g_search == '1' || $this->user->g_id == FEATHER_ADMIN) {
-            $posts_actions[] = '<a href="'.$this->feather->url->get('search/?action=show_user_topics&amp;user_id='.$id).'">'.__('Show topics').'</a>';
-            $posts_actions[] = '<a href="'.$this->feather->url->get('search/?action=show_user_posts&amp;user_id='.$id).'">'.__('Show posts').'</a>';
+            $posts_actions[] = '<a href="'.Url::get('search/?action=show_user_topics&amp;user_id='.$id).'">'.__('Show topics').'</a>';
+            $posts_actions[] = '<a href="'.Url::get('search/?action=show_user_posts&amp;user_id='.$id).'">'.__('Show posts').'</a>';
 
             if ($this->config['o_topic_subscriptions'] == '1') {
-                $posts_actions[] = '<a href="'.$this->feather->url->get('search/?action=show_subscriptions&amp;user_id='.$id).'">'.__('Show subscriptions').'</a>';
+                $posts_actions[] = '<a href="'.Url::get('search/?action=show_subscriptions&amp;user_id='.$id).'">'.__('Show subscriptions').'</a>';
             }
         }
 
diff --git a/featherbb/Model/Register.php b/featherbb/Model/Register.php
index 5a8268a0..c7f612ae 100644
--- a/featherbb/Model/Register.php
+++ b/featherbb/Model/Register.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Register
@@ -191,7 +192,7 @@ public function insert_user($user)
                 $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
                 $mail_message = str_replace('<email>', $user['email1'], $mail_message);
-                $mail_message = str_replace('<profile_url>', $this->feather->url->get('user/'.$new_uid.'/'), $mail_message);
+                $mail_message = str_replace('<profile_url>', Url::get('user/'.$new_uid.'/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                 $mail_message = $this->hook->fire('insert_user_banned_mail_message', $mail_message);
 
@@ -212,7 +213,7 @@ public function insert_user($user)
                 $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
                 $mail_message = str_replace('<dupe_list>', implode(', ', $dupe_list), $mail_message);
-                $mail_message = str_replace('<profile_url>', $this->feather->url->get('user/'.$new_uid.'/'), $mail_message);
+                $mail_message = str_replace('<profile_url>', Url::get('user/'.$new_uid.'/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                 $mail_message = $this->hook->fire('insert_user_dupe_mail_message', $mail_message);
 
@@ -232,9 +233,9 @@ public function insert_user($user)
 
                 $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
-                $mail_message = str_replace('<base_url>', $this->feather->url->base().'/', $mail_message);
-                $mail_message = str_replace('<profile_url>', $this->feather->url->get('user/'.$new_uid.'/'), $mail_message);
-                $mail_message = str_replace('<admin_url>', $this->feather->url->get('user/'.$new_uid.'/section/admin/'), $mail_message);
+                $mail_message = str_replace('<base_url>', Url::base().'/', $mail_message);
+                $mail_message = str_replace('<profile_url>', Url::get('user/'.$new_uid.'/'), $mail_message);
+                $mail_message = str_replace('<admin_url>', Url::get('user/'.$new_uid.'/section/admin/'), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                 $mail_message = $this->hook->fire('insert_user_new_mail_message', $mail_message);
 
@@ -255,16 +256,16 @@ public function insert_user($user)
 
             $mail_message = trim(substr($mail_tpl, $first_crlf));
             $mail_subject = str_replace('<board_title>', $this->config['o_board_title'], $mail_subject);
-            $mail_message = str_replace('<base_url>', $this->feather->url->base().'/', $mail_message);
+            $mail_message = str_replace('<base_url>', Url::base().'/', $mail_message);
             $mail_message = str_replace('<username>', $user['username'], $mail_message);
             $mail_message = str_replace('<password>', $user['password1'], $mail_message);
-            $mail_message = str_replace('<login_url>', $this->feather->url->get('login/'), $mail_message);
+            $mail_message = str_replace('<login_url>', Url::get('login/'), $mail_message);
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
             $mail_message = $this->hook->fire('insert_user_welcome_mail_message', $mail_message);
 
             $this->email->feather_mail($user['email1'], $mail_subject, $mail_message);
 
-            redirect($this->feather->url->base(),__('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
+            redirect(Url::base(),__('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
 
         }
 
@@ -272,6 +273,6 @@ public function insert_user($user)
 
         $this->hook->fire('insert_user');
 
-        redirect($this->feather->url->base(), __('Reg complete'));
+        redirect(Url::base(), __('Reg complete'));
     }
 }
diff --git a/featherbb/Model/Search.php b/featherbb/Model/Search.php
index bb448328..ce08b486 100644
--- a/featherbb/Model/Search.php
+++ b/featherbb/Model/Search.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Search
@@ -570,7 +571,7 @@ public function get_search_results()
 
         // If we're on the new posts search, display a "mark all as read" link
         if (!$this->user->is_guest && $search_type[0] == 'action' && $search_type[1] == 'show_new') {
-            $search['forum_actions'][] = '<a href="'.$this->feather->url->get('mark-read/').'">'.__('Mark all as read').'</a>';
+            $search['forum_actions'][] = '<a href="'.Url::get('mark-read/').'">'.__('Mark all as read').'</a>';
         }
 
         // Fetch results to display
@@ -605,7 +606,7 @@ public function get_search_results()
             $search['start_from'] = $start_from;
 
             // Generate paging links
-            $search['paging_links'] = '<span class="pages-label">'.__('Pages').' </span>'.$this->feather->url->paginate_old($num_pages, $p, '?search_id='.$search_id);
+            $search['paging_links'] = '<span class="pages-label">'.__('Pages').' </span>'.Url::paginate_old($num_pages, $p, '?search_id='.$search_id);
 
             // throw away the first $start_from of $search_ids, only keep the top $per_page of $search_ids
             $search_ids = array_slice($search_ids, $start_from, $per_page);
@@ -644,9 +645,9 @@ public function get_search_results()
 
             if ($search_type[0] == 'action') {
                 if ($search_type[1] == 'show_user_topics') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_topics'), Utils::escape($search['search_set'][0]['poster'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.Url::get('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_topics'), Utils::escape($search['search_set'][0]['poster'])).'</a>';
                 } elseif ($search_type[1] == 'show_user_posts') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_posts'), Utils::escape($search['search_set'][0]['pposter'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.Url::get('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_posts'), Utils::escape($search['search_set'][0]['pposter'])).'</a>';
                 } elseif ($search_type[1] == 'show_subscriptions') {
                     // Fetch username of subscriber
                     $subscriber_id = $search_type[2];
@@ -659,10 +660,10 @@ public function get_search_results()
                         throw new \FeatherBB\Error(__('Bad request'), 404);
                     }
 
-                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), Utils::escape($subscriber_name)).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.Url::get('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), Utils::escape($subscriber_name)).'</a>';
                 } else {
                     $search_url = str_replace('_', '/', $search_type[1]);
-                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/'.$search_url.'/').'">'.__('Quick search '.$search_type[1]).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.Url::get('search/'.$search_url.'/').'">'.__('Quick search '.$search_type[1]).'</a>';
                 }
             } else {
                 $keywords = $author = '';
@@ -678,7 +679,7 @@ public function get_search_results()
                     $search['crumbs_text']['search_type'] = sprintf(__('By user show as '.$show_as), Utils::escape($author));
                 }
 
-                $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->url->get('search/?action=search&amp;keywords='.urlencode($keywords).'&amp;author='.urlencode($author).'&amp;forums='.$search_type[2].'&amp;search_in='.$search_type[3].'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir.'&amp;show_as='.$show_as).'">'.$search['crumbs_text']['search_type'].'</a>';
+                $search['crumbs_text']['search_type'] = '<a href="'.Url::get('search/?action=search&amp;keywords='.urlencode($keywords).'&amp;author='.urlencode($author).'&amp;forums='.$search_type[2].'&amp;search_in='.$search_type[3].'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir.'&amp;show_as='.$show_as).'">'.$search['crumbs_text']['search_type'].'</a>';
             }
         }
 
@@ -701,8 +702,8 @@ public function display_search_results($search)
         $post_count = $topic_count = 0;
 
         foreach ($search['search_set'] as $cur_search) {
-            $forum = '<a href="'.$this->feather->url->get('forum/'.$cur_search['forum_id'].'/'.$this->feather->url->url_friendly($cur_search['forum_name']).'/').'">'.Utils::escape($cur_search['forum_name']).'</a>';
-            $url_topic = $this->feather->url->url_friendly($cur_search['subject']);
+            $forum = '<a href="'.Url::get('forum/'.$cur_search['forum_id'].'/'.Url::url_friendly($cur_search['forum_name']).'/').'">'.Utils::escape($cur_search['forum_name']).'</a>';
+            $url_topic = Url::url_friendly($cur_search['subject']);
 
             if ($this->config['o_censoring'] == '1') {
                 $cur_search['subject'] = censor_words($cur_search['subject']);
@@ -729,7 +730,7 @@ public function display_search_results($search)
                 $pposter = Utils::escape($cur_search['pposter']);
 
                 if ($cur_search['poster_id'] > 1 && $this->user->g_view_users == '1') {
-                    $cur_search['pposter_disp'] = '<strong><a href="'.$this->feather->url->get('user/'.$cur_search['poster_id'].'/').'">'.$pposter.'</a></strong>';
+                    $cur_search['pposter_disp'] = '<strong><a href="'.Url::get('user/'.$cur_search['poster_id'].'/').'">'.$pposter.'</a></strong>';
                 } else {
                     $cur_search['pposter_disp'] = '<strong>'.$pposter.'</strong>';
                 }
@@ -747,7 +748,7 @@ public function display_search_results($search)
                 $cur_search['item_status'] = ($topic_count % 2 == 0) ? 'roweven' : 'rowodd';
                 $cur_search['icon_type'] = 'icon';
 
-                $subject = '<a href="'.$this->feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.Utils::escape($cur_search['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_search['poster']).'</span>';
+                $subject = '<a href="'.Url::get('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.Utils::escape($cur_search['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_search['poster']).'</span>';
 
                 if ($cur_search['sticky'] == '1') {
                     $cur_search['item_status'] .= ' isticky';
@@ -763,7 +764,7 @@ public function display_search_results($search)
                     $cur_search['item_status'] .= ' inew';
                     $cur_search['icon_type'] = 'icon icon-new';
                     $subject = '<strong>'.$subject.'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->url->get('topic/'.$cur_search['tid'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.Url::get('topic/'.$cur_search['tid'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
@@ -774,7 +775,7 @@ public function display_search_results($search)
                 $num_pages_topic = ceil(($cur_search['num_replies'] + 1) / $this->user->disp_posts);
 
                 if ($num_pages_topic > 1) {
-                    $subject_multipage = '<span class="pagestext">[ '.$this->feather->url->paginate($num_pages_topic, -1, 'topic/'.$cur_search['tid'].'/'.$url_topic.'/#').' ]</span>';
+                    $subject_multipage = '<span class="pagestext">[ '.Url::paginate($num_pages_topic, -1, 'topic/'.$cur_search['tid'].'/'.$url_topic.'/#').' ]</span>';
                 } else {
                     $subject_multipage = null;
                 }
diff --git a/featherbb/Model/Userlist.php b/featherbb/Model/Userlist.php
index 0ea2036a..713e2e7c 100644
--- a/featherbb/Model/Userlist.php
+++ b/featherbb/Model/Userlist.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Userlist
diff --git a/featherbb/Model/Viewforum.php b/featherbb/Model/Viewforum.php
index 8d182079..9501d498 100644
--- a/featherbb/Model/Viewforum.php
+++ b/featherbb/Model/Viewforum.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Viewforum
@@ -104,13 +105,13 @@ public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
         if (!$this->user->is_guest) {
             if ($subscriptions == 1) {
                 if ($is_subscribed) {
-                    $forum_actions[] = '<span>'.__('Is subscribed').' - </span><a href="'.$this->feather->url->get('unsubscribe/forum/'.$forum_id.'/').'">'.__('Unsubscribe').'</a>';
+                    $forum_actions[] = '<span>'.__('Is subscribed').' - </span><a href="'.Url::get('unsubscribe/forum/'.$forum_id.'/').'">'.__('Unsubscribe').'</a>';
                 } else {
-                    $forum_actions[] = '<a href="'.$this->feather->url->get('subscribe/forum/'.$forum_id.'/').'">'.__('Subscribe').'</a>';
+                    $forum_actions[] = '<a href="'.Url::get('subscribe/forum/'.$forum_id.'/').'">'.__('Subscribe').'</a>';
                 }
             }
 
-            $forum_actions[] = '<a href="'.$this->feather->url->get('mark-forum-read/'.$forum_id.'/').'">'.__('Mark forum read').'</a>';
+            $forum_actions[] = '<a href="'.Url::get('mark-forum-read/'.$forum_id.'/').'">'.__('Mark forum read').'</a>';
         }
 
         $forum_actions = $this->hook->fire('get_page_head', $forum_actions);
@@ -185,10 +186,10 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 $status_text = array();
                 $cur_topic['item_status'] = ($topic_count % 2 == 0) ? 'roweven' : 'rowodd';
                 $cur_topic['icon_type'] = 'icon';
-                $url_subject = $this->feather->url->url_friendly($cur_topic['subject']);
+                $url_subject = Url::url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_formatted'] = '<a href="'.$this->feather->url->get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.$this->feather->utils->format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_formatted'] = '<a href="'.Url::get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.$this->feather->utils->format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['last_poster']).'</span>';
                 } else {
                     $cur_topic['last_post_formatted'] = '- - -';
                 }
@@ -203,13 +204,13 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.Url::get('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.Url::get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.Url::get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
@@ -218,7 +219,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_formatted'] = '<strong>'.$cur_topic['subject_formatted'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->url->get('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.Url::get('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
@@ -237,7 +238,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 $num_pages_topic = ceil(($cur_topic['num_replies'] + 1) / $this->user->disp_posts);
 
                 if ($num_pages_topic > 1) {
-                    $subject_multipage = '<span class="pagestext">[ '.$this->feather->url->paginate($num_pages_topic, -1, 'topic/'.$cur_topic['id'].'/'.$url_subject.'/#').' ]</span>';
+                    $subject_multipage = '<span class="pagestext">[ '.Url::paginate($num_pages_topic, -1, 'topic/'.$cur_topic['id'].'/'.$url_subject.'/#').' ]</span>';
                 } else {
                     $subject_multipage = null;
                 }
diff --git a/featherbb/Model/Viewtopic.php b/featherbb/Model/Viewtopic.php
index f1013c51..80eb22bb 100644
--- a/featherbb/Model/Viewtopic.php
+++ b/featherbb/Model/Viewtopic.php
@@ -10,6 +10,7 @@
 namespace FeatherBB\Model;
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 use DB;
 
 class Viewtopic
@@ -79,7 +80,7 @@ public function handle_actions($topic_id, $action)
                 $first_new_post_id = $this->hook->fire('handle_actions_first_new', $first_new_post_id);
 
                 if ($first_new_post_id) {
-                    header('Location: '.$this->feather->url->base().'/post/'.$first_new_post_id.'/#p'.$first_new_post_id);
+                    header('Location: '.Url::base().'/post/'.$first_new_post_id.'/#p'.$first_new_post_id);
                     exit;
                 }
             }
@@ -97,7 +98,7 @@ public function handle_actions($topic_id, $action)
             $last_post_id = $this->hook->fire('handle_actions_last_post', $last_post_id);
 
             if ($last_post_id) {
-                header('Location: '.$this->feather->url->base().'/post/'.$last_post_id.'/#p'.$last_post_id);
+                header('Location: '.Url::base().'/post/'.$last_post_id.'/#p'.$last_post_id);
                 exit;
             }
         }
@@ -161,7 +162,7 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
 
         if ($closed == '0') {
             if (($post_replies == '' && $this->user->g_post_replies == '1') || $post_replies == '1' || $is_admmod) {
-                $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.$this->feather->url->get('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a></p>'."\n";
+                $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.Url::get('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a></p>'."\n";
             } else {
                 $post_link = '';
             }
@@ -169,7 +170,7 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
             $post_link = __('Topic closed');
 
             if ($is_admmod) {
-                $post_link .= ' / <a href="'.$this->feather->url->get('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a>';
+                $post_link .= ' / <a href="'.Url::get('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a>';
             }
 
             $post_link = "\t\t\t".'<p class="postlink conr">'.$post_link.'</p>'."\n";
@@ -207,9 +208,9 @@ public function get_subscraction($is_subscribed, $topic_id)
         if (!$this->user->is_guest && $this->config['o_topic_subscriptions'] == '1') {
             if ($is_subscribed) {
                 // I apologize for the variable naming here. It's a mix of subscription and action I guess :-)
-                $subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.__('Is subscribed').' - </span><a href="'.$this->feather->url->get('unsubscribe/topic/'.$topic_id.'/').'">'.__('Unsubscribe').'</a></p>'."\n";
+                $subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.__('Is subscribed').' - </span><a href="'.Url::get('unsubscribe/topic/'.$topic_id.'/').'">'.__('Unsubscribe').'</a></p>'."\n";
             } else {
-                $subscraction = "\t\t".'<p class="subscribelink clearb"><a href="'.$this->feather->url->get('subscribe/topic/'.$topic_id.'/').'">'.__('Subscribe').'</a></p>'."\n";
+                $subscraction = "\t\t".'<p class="subscribelink clearb"><a href="'.Url::get('subscribe/topic/'.$topic_id.'/').'">'.__('Subscribe').'</a></p>'."\n";
             }
         } else {
             $subscraction = '';
@@ -274,7 +275,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
             // If the poster is a registered user
             if ($cur_post['poster_id'] > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $cur_post['username_formatted'] = '<a href="'.$this->feather->url->base().'/user/'.$cur_post['poster_id'].'/">'.Utils::escape($cur_post['username']).'</a>';
+                    $cur_post['username_formatted'] = '<a href="'.Url::base().'/user/'.$cur_post['poster_id'].'/">'.Utils::escape($cur_post['username']).'</a>';
                 } else {
                     $cur_post['username_formatted'] = Utils::escape($cur_post['username']);
                 }
@@ -316,7 +317,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                     if ((($cur_post['email_setting'] == '0' && !$this->user->is_guest) || $this->user->is_admmod) && $this->user->g_send_email == '1') {
                         $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.Utils::escape($cur_post['email']).'">'.__('Email').'</a></span>';
                     } elseif ($cur_post['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.$this->feather->url->get('email/'.$cur_post['poster_id'].'/').'">'.__('Email').'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.Url::get('email/'.$cur_post['poster_id'].'/').'">'.__('Email').'</a></span>';
                     }
 
                     if ($cur_post['url'] != '') {
@@ -330,12 +331,12 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
 
                 if ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && $this->user->g_mod_promote_users == '1')) {
                     if ($cur_post['g_promote_next_group']) {
-                        $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->base().'/user/'.$cur_post['poster_id'].'/action/promote/pid/'.$cur_post['id'].'">'.__('Promote user').'</a></span></dd>';
+                        $cur_post['user_info'][] = '<dd><span><a href="'.Url::base().'/user/'.$cur_post['poster_id'].'/action/promote/pid/'.$cur_post['id'].'">'.__('Promote user').'</a></span></dd>';
                     }
                 }
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.Utils::escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.Url::get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.Utils::escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
 
                     if ($cur_post['admin_note'] != '') {
                         $cur_post['user_info'][] = '<dd><span>'.__('Note').' <strong>'.Utils::escape($cur_post['admin_note']).'</strong></span></dd>';
@@ -348,7 +349,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 $cur_post['user_title_formatted'] = get_title($cur_post);
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->url->get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.Utils::escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.Url::get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.Utils::escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
                 }
 
                 if ($this->config['o_show_user_info'] == '1' && $cur_post['poster_email'] != '' && !$this->user->is_guest && $this->user->g_send_email == '1') {
@@ -359,30 +360,30 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
             // Generation post action array (quote, edit, delete etc.)
             if (!$is_admmod) {
                 if (!$this->user->is_guest) {
-                    $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.$this->feather->url->get('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.Url::get('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
                 }
 
                 if ($cur_topic['closed'] == '0') {
                     if ($cur_post['poster_id'] == $this->user->id) {
                         if ((($start_from + $post_count) == 1 && $this->user->g_delete_topics == '1') || (($start_from + $post_count) > 1 && $this->user->g_delete_posts == '1')) {
-                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.$this->feather->url->get('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
+                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.Url::get('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
                         }
                         if ($this->user->g_edit_posts == '1') {
-                            $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.$this->feather->url->get('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
+                            $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.Url::get('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
                         }
                     }
 
                     if (($cur_topic['post_replies'] == '' && $this->user->g_post_replies == '1') || $cur_topic['post_replies'] == '1') {
-                        $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.$this->feather->url->get('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
+                        $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.Url::get('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
                     }
                 }
             } else {
-                $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.$this->feather->url->get('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
+                $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.Url::get('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
                 if ($this->user->g_id == FEATHER_ADMIN || !in_array($cur_post['poster_id'], $admin_ids)) {
-                    $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.$this->feather->url->get('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
-                    $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.$this->feather->url->get('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.Url::get('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.Url::get('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
                 }
-                $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.$this->feather->url->get('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
+                $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.Url::get('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
             }
 
             // Perform the main parsing of the message (BBCode, smilies, censor words etc)
diff --git a/style/themes/FeatherBB/view/admin/bans/add_ban.php b/style/themes/FeatherBB/view/admin/bans/add_ban.php
index 7ba13b22..4006193f 100644
--- a/style/themes/FeatherBB/view/admin/bans/add_ban.php
+++ b/style/themes/FeatherBB/view/admin/bans/add_ban.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/bans/admin_bans.php b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
index c7632b9d..d4170b24 100644
--- a/style/themes/FeatherBB/view/admin/bans/admin_bans.php
+++ b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('New ban head') ?></span></h2>
 		<div class="box">
-			<form id="bans" method="post" action="<?php echo $feather->url->get('admin/bans/add/') ?>">
+			<form id="bans" method="post" action="<?php echo Url::get('admin/bans/add/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
@@ -41,7 +42,7 @@
 
 		<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
 		<div class="box">
-			<form id="find_bans" method="get" action="<?php echo $feather->url->get('admin/bans/') ?>">
+			<form id="find_bans" method="get" action="<?php echo Url::get('admin/bans/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
 				<div class="inform">
diff --git a/style/themes/FeatherBB/view/admin/bans/search_ban.php b/style/themes/FeatherBB/view/admin/bans/search_ban.php
index 994a73fd..99d516f2 100644
--- a/style/themes/FeatherBB/view/admin/bans/search_ban.php
+++ b/style/themes/FeatherBB/view/admin/bans/search_ban.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,8 +19,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+			<li><a href="<?php echo Url::get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -57,8 +58,8 @@
 					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? Utils::escape($cur_ban['ip']) : '&#160;' ?></td>
 					<td class="tc4"><?php echo $feather->utils->format_time($cur_ban['expire'], true) ?></td>
 					<td class="tc5"><?php echo($cur_ban['message'] != '') ? Utils::escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.Utils::escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
+					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.Url::get('user/'.$cur_ban['ban_creator'].'/').'">'.Utils::escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
+					<td class="tcr"><?php echo '<a href="'.Url::get('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.Url::get('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
 				</tr>
 <?php
 
@@ -80,8 +81,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
         <ul class="crumbs">
-            <li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+            <li><a href="<?php echo Url::get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+            <li><span>»&#160;</span><a href="<?php echo Url::get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
             <li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
         </ul>
 		<div class="clearer"></div>
diff --git a/style/themes/FeatherBB/view/admin/categories.php b/style/themes/FeatherBB/view/admin/categories.php
index 713a375f..15f56eff 100644
--- a/style/themes/FeatherBB/view/admin/categories.php
+++ b/style/themes/FeatherBB/view/admin/categories.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Add categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/categories/add/') ?>">
+			<form method="post" action="<?php echo Url::get('admin/categories/add/') ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('Add categories subhead') ?></legend>
@@ -29,7 +30,7 @@
 									<td>
 										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
-										<span><?php printf(__('Add category help'), '<a href="'.$feather->url->get('admin/forums').'">'.__('Forums').'</a>') ?></span>
+										<span><?php printf(__('Add category help'), '<a href="'.Url::get('admin/forums').'">'.__('Forums').'</a>') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -41,7 +42,7 @@
 
 <?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/categories/delete') ?>">
+			<form method="post" action="<?php echo Url::get('admin/categories/delete') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
@@ -73,7 +74,7 @@
 
 <?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/categories/edit/') ?>">
+			<form method="post" action="<?php echo Url::get('admin/categories/edit/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/style/themes/FeatherBB/view/admin/censoring.php b/style/themes/FeatherBB/view/admin/censoring.php
index 0063b938..fd9f0a6e 100644
--- a/style/themes/FeatherBB/view/admin/censoring.php
+++ b/style/themes/FeatherBB/view/admin/censoring.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,13 +19,13 @@
 	<div class="blockform">
 		<h2><span><?php _e('Censoring head') ?></span></h2>
 		<div class="box">
-			<form id="censoring" method="post" action="<?php echo $feather->url->get('admin/censoring/') ?>">
+			<form id="censoring" method="post" action="<?php echo Url::get('admin/censoring/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('Add word subhead') ?></legend>
 						<div class="infldset">
-							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
+							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.Url::get('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.Url::get('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
 							<table>
 							<thead>
 								<tr>
diff --git a/style/themes/FeatherBB/view/admin/forums/admin_forums.php b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
index bca75ff6..67a6b80a 100644
--- a/style/themes/FeatherBB/view/admin/forums/admin_forums.php
+++ b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Add forum head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/forums/add') ?>">
+			<form method="post" action="<?php echo Url::get('admin/forums/add') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if (!empty($cat_list)) {
@@ -67,7 +68,7 @@
     ?>
 		<h2 class="block2"><span><?php _e('Manage forums head') ?></span></h2>
 		<div class="box">
-			<form id="edforum" method="post" action="<?php echo $feather->url->get('admin/forums/') ?>">
+			<form id="edforum" method="post" action="<?php echo Url::get('admin/forums/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
 <?php
@@ -90,7 +91,7 @@
 	foreach ($cat_data['cat_forums'] as $forum) {
         ?>
 								<tr>
-									<td class="tcl"><a href="<?php echo $feather->url->get('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
+									<td class="tcl"><a href="<?php echo Url::get('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo Url::get('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
 									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
 									<td class="tcr"><strong><?php echo Utils::escape($forum['forum_name']) ?></strong></td>
 								</tr>
diff --git a/style/themes/FeatherBB/view/admin/forums/delete_forum.php b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
index 134606a5..1e888093 100644
--- a/style/themes/FeatherBB/view/admin/forums/delete_forum.php
+++ b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Confirm delete head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
+			<form method="post" action="<?php echo Url::get('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/style/themes/FeatherBB/view/admin/forums/permissions.php b/style/themes/FeatherBB/view/admin/forums/permissions.php
index ec31603c..b7b502cb 100644
--- a/style/themes/FeatherBB/view/admin/forums/permissions.php
+++ b/style/themes/FeatherBB/view/admin/forums/permissions.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Edit forum head') ?></span></h2>
 		<div class="box">
-			<form id="edit_forum" method="post" action="<?php echo $feather->url->get('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
+			<form id="edit_forum" method="post" action="<?php echo Url::get('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
 				<div class="inform">
diff --git a/style/themes/FeatherBB/view/admin/groups/add_edit_group.php b/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
index 01cf05f1..854dc1cd 100644
--- a/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
+++ b/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/groups/admin_groups.php b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
index 6986e418..36cd2107 100644
--- a/style/themes/FeatherBB/view/admin/groups/admin_groups.php
+++ b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -20,7 +21,7 @@
 		<div class="box">
 				<div class="inform">
 					<fieldset>
-                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/add/') ?>">
+                        <form id="groups" method="post" action="<?php echo Url::get('admin/groups/add/') ?>">
                         <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 						<legend><?php _e('Add group subhead') ?></legend>
 						<div class="infldset">
@@ -53,7 +54,7 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/') ?>">
+                        <form id="groups" method="post" action="<?php echo Url::get('admin/groups/') ?>">
                         	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 						<legend><?php _e('Default group subhead') ?></legend>
 						<div class="infldset">
@@ -97,7 +98,7 @@
 							<table>
 <?php
 foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.Utils::escape($cur_group['g_title']).'</td></tr>'."\n";
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.Url::get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.Url::get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.Utils::escape($cur_group['g_title']).'</td></tr>'."\n";
 }
 
 ?>
diff --git a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
index e222c71b..d31dfbc4 100644
--- a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
+++ b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,10 +19,10 @@
 	<div class="blockform">
 		<h2><span><?php _e('Group delete head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
+			<form method="post" action="<?php echo Url::get('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
-				<input type="hidden" name="group_to_delete" value="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>" />
+				<input type="hidden" name="group_to_delete" value="<?php echo Url::get('admin/groups/delete/'.$id.'/') ?>" />
 					<fieldset>
 						<legend><?php _e('Confirm delete subhead') ?></legend>
 						<div class="infldset">
diff --git a/style/themes/FeatherBB/view/admin/groups/delete_group.php b/style/themes/FeatherBB/view/admin/groups/delete_group.php
index b2a356d9..1a2b306e 100644
--- a/style/themes/FeatherBB/view/admin/groups/delete_group.php
+++ b/style/themes/FeatherBB/view/admin/groups/delete_group.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Delete group head') ?></span></h2>
 		<div class="box">
-			<form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
+			<form id="groups" method="post" action="<?php echo Url::get('admin/groups/delete/'.$id.'/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/style/themes/FeatherBB/view/admin/index.php b/style/themes/FeatherBB/view/admin/index.php
index dc4bbb93..bfa3f7d0 100644
--- a/style/themes/FeatherBB/view/admin/index.php
+++ b/style/themes/FeatherBB/view/admin/index.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -37,7 +38,7 @@
 <?php if ($install_file_exists) : ?>
 		<h2 class="block2"><span><?php _e('Alerts head') ?></span></h2>
 		<div id="adalerts" class="box">
-			<p><?php printf(__('Install file exists'), '<a href="'.$feather->url->get('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
+			<p><?php printf(__('Install file exists'), '<a href="'.Url::get('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
 		</div>
 <?php endif; ?>
 
@@ -47,11 +48,11 @@
 				<dl>
 					<dt><?php _e('FeatherBB version label') ?></dt>
 					<dd>
-						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.$feather->url->get('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
+						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.Url::get('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
 					</dd>
 					<dt><?php _e('Server statistics label') ?></dt>
 					<dd>
-						<a href="<?php echo $feather->url->get('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
+						<a href="<?php echo Url::get('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
 					</dd>
 					<dt><?php _e('Support label') ?></dt>
 					<dd>
diff --git a/style/themes/FeatherBB/view/admin/loader.php b/style/themes/FeatherBB/view/admin/loader.php
index 6e3dddbf..b1534f1d 100644
--- a/style/themes/FeatherBB/view/admin/loader.php
+++ b/style/themes/FeatherBB/view/admin/loader.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
index 846a63aa..b785bc2a 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,13 +19,13 @@
 	<div class="blockform">
 		<h2><span><?php _e('Maintenance head') ?></span></h2>
 		<div class="box">
-			<form method="get" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
+			<form method="get" action="<?php echo Url::get('admin/maintenance/') ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="rebuild" />
 					<fieldset>
 						<legend><?php _e('Rebuild index subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Rebuild index info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<p><?php printf(__('Rebuild index info'), '<a href="'.Url::get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php _e('Posts per cycle label') ?></th>
@@ -54,7 +55,7 @@
 				</div>
 			</form>
 
-			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>" onsubmit="return process_form(this)">
+			<form method="post" action="<?php echo Url::get('admin/maintenance/') ?>" onsubmit="return process_form(this)">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
@@ -89,7 +90,7 @@
 									</td>
 								</tr>
 							</table>
-							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.Url::get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
 							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php _e('Prune') ?>" tabindex="8" /></div>
 						</div>
 					</fieldset>
diff --git a/style/themes/FeatherBB/view/admin/maintenance/prune.php b/style/themes/FeatherBB/view/admin/maintenance/prune.php
index 1fe2f3a8..491bfb47 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/prune.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/prune.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Prune head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
+			<form method="post" action="<?php echo Url::get('admin/maintenance/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
diff --git a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
index 6ad5fbd6..45afc488 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -15,5 +16,5 @@
 }
 ?>
 <h1><?php _e('Rebuilding index info') ?></h1>
-<script type="text/javascript">window.location="<?= $feather->url->get('admin/maintenance/').$query_str ?>"</script>
-<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.$feather->url->get('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>
+<script type="text/javascript">window.location="<?= Url::get('admin/maintenance/').$query_str ?>"</script>
+<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.Url::get('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>
diff --git a/style/themes/FeatherBB/view/admin/menu.php b/style/themes/FeatherBB/view/admin/menu.php
index 11735339..a03c60d1 100644
--- a/style/themes/FeatherBB/view/admin/menu.php
+++ b/style/themes/FeatherBB/view/admin/menu.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -24,20 +25,20 @@
 					<li<?php if ($page == 'index') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Index') ?></a></li>
+    ?>><a href="<?php echo Url::get('admin/') ?>"><?php _e('Index') ?></a></li>
 					<li<?php if ($page == 'users') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+    ?>><a href="<?php echo Url::get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 <?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+    ?>><a href="<?php echo Url::get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
 <?php endif;
     if ($is_admin || $feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
+    ?>><a href="<?php echo Url::get('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
@@ -53,39 +54,39 @@
 					<li<?php if ($page == 'options') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get('admin/options/') ?>"><?php _e('Options') ?></a></li>
+        ?>><a href="<?php echo Url::get('admin/options/') ?>"><?php _e('Options') ?></a></li>
 					<li<?php if ($page == 'permissions') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
+        ?>><a href="<?php echo Url::get('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
 					<li<?php if ($page == 'categories') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
+        ?>><a href="<?php echo Url::get('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
 					<li<?php if ($page == 'forums') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
+        ?>><a href="<?php echo Url::get('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
 					<li<?php if ($page == 'groups') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
+        ?>><a href="<?php echo Url::get('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
 					<li<?php if ($page == 'plugins') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get('admin/plugins/') ?>"><?= 'Plugins'; ?></a></li>
+        ?>><a href="<?php echo Url::get('admin/plugins/') ?>"><?= 'Plugins'; ?></a></li>
 					<li<?php if ($page == 'censoring') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
+        ?>><a href="<?php echo Url::get('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
 					<li<?php if ($page == 'parser') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
+        ?>><a href="<?php echo Url::get('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
 					<li<?php if ($page == 'maintenance') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo $feather->url->get('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
+        ?>><a href="<?php echo Url::get('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
 				</ul>
 			</div>
 		</div>
@@ -103,7 +104,7 @@
 <?php
 
         foreach ($plugins as $plugin_name => $plugin) {
-            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.$feather->url->get('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
+            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.Url::get('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
         }
 
         ?>
diff --git a/style/themes/FeatherBB/view/admin/options.php b/style/themes/FeatherBB/view/admin/options.php
index 6353c548..93fbeacf 100644
--- a/style/themes/FeatherBB/view/admin/options.php
+++ b/style/themes/FeatherBB/view/admin/options.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Options head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/options/') ?>">
+			<form method="post" action="<?php echo Url::get('admin/options/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
@@ -414,7 +415,7 @@
 										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.$feather->url->get('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
+										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.Url::get('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
diff --git a/style/themes/FeatherBB/view/admin/parser.php b/style/themes/FeatherBB/view/admin/parser.php
index e3d28854..6c3b1c91 100644
--- a/style/themes/FeatherBB/view/admin/parser.php
+++ b/style/themes/FeatherBB/view/admin/parser.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php echo $lang_admin_parser['Parser head'] ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/parser/') ?>" enctype="multipart/form-data">
+			<form method="post" action="<?php echo Url::get('admin/parser/') ?>" enctype="multipart/form-data">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop">
 					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
diff --git a/style/themes/FeatherBB/view/admin/permissions.php b/style/themes/FeatherBB/view/admin/permissions.php
index 0f33b3f5..aa8a4c83 100644
--- a/style/themes/FeatherBB/view/admin/permissions.php
+++ b/style/themes/FeatherBB/view/admin/permissions.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Permissions head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/permissions/') ?>">
+			<form method="post" action="<?php echo Url::get('admin/permissions/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
diff --git a/style/themes/FeatherBB/view/admin/plugins.php b/style/themes/FeatherBB/view/admin/plugins.php
index 4165d6e9..01c654d7 100644
--- a/style/themes/FeatherBB/view/admin/plugins.php
+++ b/style/themes/FeatherBB/view/admin/plugins.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -33,9 +34,9 @@
                                 <strong><?= $class::$name; ?></strong>
                                 <div class="plugin-actions">
                                     <?php if (array_key_exists($class, $activePlugins)) { ?>
-                                        <a href="<?= $feather->url->get('/admin/plugins/deactivate?plugin='.$class) ?>">Deactivate</a>
+                                        <a href="<?= Url::get('/admin/plugins/deactivate?plugin='.$class) ?>">Deactivate</a>
                                     <?php } else { ?>
-                                        <a href="<?= $feather->url->get('/admin/plugins/activate?plugin='.$class) ?>">Activate</a>
+                                        <a href="<?= Url::get('/admin/plugins/activate?plugin='.$class) ?>">Activate</a>
                                     <?php } ?>
                                 </div>
                             </td>
diff --git a/style/themes/FeatherBB/view/admin/reports.php b/style/themes/FeatherBB/view/admin/reports.php
index e1076523..f51a1194 100644
--- a/style/themes/FeatherBB/view/admin/reports.php
+++ b/style/themes/FeatherBB/view/admin/reports.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('New reports head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?= $feather->url->get('admin/reports/') ?>">
+			<form method="post" action="<?= Url::get('admin/reports/') ?>">
 				<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
 <?php
 if (!empty($report_data)) {
@@ -30,10 +31,10 @@
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.Url::get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => Url::get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => Url::get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => Url::get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?= $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
@@ -76,14 +77,14 @@
         ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.Utils::escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
+						<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.Url::get('user/'.$report['zapped_by_id'].'/').'">'.Utils::escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.Url::get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => Url::get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => Url::get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => Url::get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?></th>
diff --git a/style/themes/FeatherBB/view/admin/statistics.php b/style/themes/FeatherBB/view/admin/statistics.php
index f87bc877..8eb426a3 100644
--- a/style/themes/FeatherBB/view/admin/statistics.php
+++ b/style/themes/FeatherBB/view/admin/statistics.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -27,7 +28,7 @@
 <?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
 					<dd>
 						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
-						<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->url->get('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
+						<?php printf(__('Environment data version'), phpversion(), '<a href="'.Url::get('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
 						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
 					</dd>
 					<dt><?php _e('Database label') ?></dt>
diff --git a/style/themes/FeatherBB/view/admin/users/admin_users.php b/style/themes/FeatherBB/view/admin/users/admin_users.php
index 61281104..e279aed8 100644
--- a/style/themes/FeatherBB/view/admin/users/admin_users.php
+++ b/style/themes/FeatherBB/view/admin/users/admin_users.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('User search head') ?></span></h2>
 		<div class="box">
-			<form id="find_user" method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
+			<form id="find_user" method="get" action="<?php echo Url::get('admin/users/') ?>">
 				<p class="submittop"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="1" /></p>
 				<div class="inform">
 					<fieldset>
@@ -152,7 +153,7 @@
 
 		<h2 class="block2"><span><?php _e('IP search head') ?></span></h2>
 		<div class="box">
-			<form method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
+			<form method="get" action="<?php echo Url::get('admin/users/') ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('IP search subhead') ?></legend>
diff --git a/style/themes/FeatherBB/view/admin/users/ban_users.php b/style/themes/FeatherBB/view/admin/users/ban_users.php
index 99ce5630..5b59cdc6 100644
--- a/style/themes/FeatherBB/view/admin/users/ban_users.php
+++ b/style/themes/FeatherBB/view/admin/users/ban_users.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Ban users') ?></span></h2>
 		<div class="box">
-			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
+			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo Url::get('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
diff --git a/style/themes/FeatherBB/view/admin/users/delete_users.php b/style/themes/FeatherBB/view/admin/users/delete_users.php
index 259884c9..44e0fe0f 100644
--- a/style/themes/FeatherBB/view/admin/users/delete_users.php
+++ b/style/themes/FeatherBB/view/admin/users/delete_users.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Delete users') ?></span></h2>
 		<div class="box">
-			<form name="confirm_del_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
+			<form name="confirm_del_users" method="post" action="<?php echo Url::get('admin/users') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
diff --git a/style/themes/FeatherBB/view/admin/users/find_users.php b/style/themes/FeatherBB/view/admin/users/find_users.php
index 4299b782..d5799c0a 100644
--- a/style/themes/FeatherBB/view/admin/users/find_users.php
+++ b/style/themes/FeatherBB/view/admin/users/find_users.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,8 +19,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo Url::get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -30,7 +31,7 @@
 </div>
 
 
-<form id="search-users-form" action="<?php echo $feather->url->get('admin/users/') ?>" method="post">
+<form id="search-users-form" action="<?php echo Url::get('admin/users/') ?>" method="post">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <div id="users2" class="blocktable">
 	<h2><span><?php _e('Results head') ?></span></h2>
@@ -56,12 +57,12 @@
         foreach ($user_data as $user) {
             ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
+					<td class="tcl"><?php echo '<a href="'.Url::get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
 					<td class="tc2"><a href="mailto:<?php echo Utils::escape($user['email']) ?>"><?php echo Utils::escape($user['email']) ?></a></td>
 					<td class="tc3"><?php echo $user['user_title'] ?></td>
 					<td class="tc4"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
 					<td class="tc5"><?php echo($user['admin_note'] != '') ? Utils::escape($user['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.Url::get('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.Url::get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
 <?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
 <?php endif;
             ?>
@@ -92,8 +93,8 @@
     ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo Url::get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/themes/FeatherBB/view/admin/users/move_users.php b/style/themes/FeatherBB/view/admin/users/move_users.php
index 417955cc..898bd404 100644
--- a/style/themes/FeatherBB/view/admin/users/move_users.php
+++ b/style/themes/FeatherBB/view/admin/users/move_users.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Move users') ?></span></h2>
 		<div class="box">
-			<form name="confirm_move_users" method="post" action="<?php echo $feather->url->get('admin/users/') ?>">
+			<form name="confirm_move_users" method="post" action="<?php echo Url::get('admin/users/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
 				<div class="inform">
diff --git a/style/themes/FeatherBB/view/admin/users/search_ip.php b/style/themes/FeatherBB/view/admin/users/search_ip.php
index 1c7674ec..8e387a77 100644
--- a/style/themes/FeatherBB/view/admin/users/search_ip.php
+++ b/style/themes/FeatherBB/view/admin/users/search_ip.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,8 +19,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo Url::get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -47,10 +48,10 @@
         foreach ($ip_data as $ip) {
             ?>
 				<tr>
-					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.Utils::escape($ip['poster_ip']).'/') ?>"><?php echo Utils::escape($ip['poster_ip']) ?></a></td>
+					<td class="tcl"><a href="<?php echo Url::get('moderate/get-host/ip/'.Utils::escape($ip['poster_ip']).'/') ?>"><?php echo Utils::escape($ip['poster_ip']) ?></a></td>
 					<td class="tc2"><?php echo $feather->utils->format_time($ip['last_used']) ?></td>
 					<td class="tc3"><?php echo $ip['used_times'] ?></td>
-					<td class="tcr"><a href="<?php echo $feather->url->get('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
+					<td class="tcr"><a href="<?php echo Url::get('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
 				</tr>
 <?php
 
@@ -72,8 +73,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo Url::get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/themes/FeatherBB/view/admin/users/show_users.php b/style/themes/FeatherBB/view/admin/users/show_users.php
index 862ab612..73c8e659 100644
--- a/style/themes/FeatherBB/view/admin/users/show_users.php
+++ b/style/themes/FeatherBB/view/admin/users/show_users.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,8 +19,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo Url::get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -53,12 +54,12 @@
             if (isset($info['user_data'][$cur_poster['poster_id']])) {
                 ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.Utils::escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
+					<td class="tcl"><?php echo '<a href="'.Url::get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.Utils::escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
 					<td class="tc2"><a href="mailto:<?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
 					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
 					<td class="tc4"><?php echo Utils::forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
 					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? Utils::escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.Url::get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
 				</tr>
 <?php
 
@@ -93,8 +94,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo Url::get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('admin/users/') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/themes/FeatherBB/view/delete.php b/style/themes/FeatherBB/view/delete.php
index ba43acca..4c06ef81 100644
--- a/style/themes/FeatherBB/view/delete.php
+++ b/style/themes/FeatherBB/view/delete.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,9 +19,9 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
+			<li><a href="<?php echo Url::base() ?>>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('post/'.$id.'/#p'.$id) ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>
@@ -29,7 +30,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Delete post') ?></span></h2>
 	<div class="box">
-		<form method="post" action="<?php echo $feather->url->get('delete/'.$id.'/') ?>">
+		<form method="post" action="<?php echo Url::get('delete/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
diff --git a/style/themes/FeatherBB/view/edit.php b/style/themes/FeatherBB/view/edit.php
index 79949a6f..d9cef761 100644
--- a/style/themes/FeatherBB/view/edit.php
+++ b/style/themes/FeatherBB/view/edit.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -21,9 +22,9 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
+			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
 		</ul>
 	</div>
@@ -71,14 +72,14 @@
 ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
+    var baseUrl = '<?php echo Utils::escape(Url::base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
-<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
+<script src="<?php echo Url::base() ?>/js/bbeditor.js"></script>
 <div id="editform" class="blockform">
 	<h2><span><?php _e('Edit post') ?></span></h2>
 	<div class="box">
-		<form id="edit" method="post" action="<?php echo $feather->url->get('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
+		<form id="edit" method="post" action="<?php echo Url::get('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -91,10 +92,10 @@
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo Utils::escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo Url::get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo Url::get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo Url::get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo Url::get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/style/themes/FeatherBB/view/error.php b/style/themes/FeatherBB/view/error.php
index fc25491e..5ab7e7dd 100644
--- a/style/themes/FeatherBB/view/error.php
+++ b/style/themes/FeatherBB/view/error.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/footer.new.php b/style/themes/FeatherBB/view/footer.new.php
index 6562c4ff..e8b2b354 100644
--- a/style/themes/FeatherBB/view/footer.new.php
+++ b/style/themes/FeatherBB/view/footer.new.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -28,7 +29,7 @@
     if ($active_page == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/forum/'.$fid.'/page/'.$page_number.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/forum/'.$fid.'/page/'.$page_number.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($active_page == 'viewtopic') {
         if (isset($pid)) {
@@ -43,20 +44,20 @@
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/moderate/page/'.$page_number.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+        //echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/moderate/page/'.$page_number.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
 
         if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
         }
 
         if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
         }
 
         echo "\t\t\t".'</dl>'."\n";
@@ -74,7 +75,7 @@
 			<div class="conl">
 			<form id="qjump" method="get" action="">
 				<div><label><span><?php _e('Jump to') ?><br /></span></label>
-					<select name="id" onchange="window.location=('<?php echo $feather->url->get('forum/') ?>'+this.options[this.selectedIndex].value)">
+					<select name="id" onchange="window.location=('<?php echo Url::get('forum/') ?>'+this.options[this.selectedIndex].value)">
 <?php
 		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
 			echo "\t\t\t\t\t\t\t".'<optgroup label="'.Utils::escape($cat_data['cat_name']).'">'."\n";
@@ -95,21 +96,21 @@
 
 if ($active_page == 'index') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
 } elseif ($active_page == 'viewforum') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
 } elseif ($active_page == 'viewtopic') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
     }
 }
 
@@ -162,6 +163,6 @@
     foreach ($script['params'] as $key => $value) {
         echo $key.'="'.$value.'" ';
     }
-    echo 'src="'.$feather->url->base().'/'.$script['file'].'"/></script>'."\n";
+    echo 'src="'.Url::base().'/'.$script['file'].'"/></script>'."\n";
 } ?>
 </html>
diff --git a/style/themes/FeatherBB/view/footer.php b/style/themes/FeatherBB/view/footer.php
index adf00831..13713c40 100644
--- a/style/themes/FeatherBB/view/footer.php
+++ b/style/themes/FeatherBB/view/footer.php
@@ -21,7 +21,7 @@
     if ($footer_style == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($footer_style == 'viewtopic') {
         if (isset($pid)) {
@@ -36,20 +36,20 @@
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+        //echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
 
         if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
         }
 
         if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.$feather->url->get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
         }
 
         echo "\t\t\t".'</dl>'."\n";
@@ -67,7 +67,7 @@
 			<div class="conl">
 			<form id="qjump" method="get" action="">
 				<div><label><span><?php _e('Jump to') ?><br /></span></label>
-					<select name="id" onchange="window.location=('<?php echo $feather->url->get('forum/') ?>'+this.options[this.selectedIndex].value)">
+					<select name="id" onchange="window.location=('<?php echo Url::get('forum/') ?>'+this.options[this.selectedIndex].value)">
 <?php
 		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
 			echo "\t\t\t\t\t\t\t".'<optgroup label="'.Utils::escape($cat_data['cat_name']).'">'."\n";
@@ -88,21 +88,21 @@
 
 if ($footer_style == 'index') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewforum') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
 } elseif ($footer_style == 'viewtopic') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
     }
 }
 
@@ -127,7 +127,7 @@
 
 </section>
 
-<script src="<?php echo $feather->url->base() ?>/style/themes/FeatherBB/phone.min.js"></script>
+<script src="<?php echo Url::base() ?>/style/themes/FeatherBB/phone.min.js"></script>
 
 </body>
 </html>
diff --git a/style/themes/FeatherBB/view/header.new.php b/style/themes/FeatherBB/view/header.new.php
index 79d1796e..e609ae52 100644
--- a/style/themes/FeatherBB/view/header.new.php
+++ b/style/themes/FeatherBB/view/header.new.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -27,7 +28,7 @@
 } ?>
     <title><?php echo generate_page_title($title, $page_number) ?></title>
     <!-- Theme -->
-    <link rel="stylesheet" type="text/css" href="<?= $feather->url->base() ?>/style/themes/<?= $style ?>/style.css">
+    <link rel="stylesheet" type="text/css" href="<?= Url::base() ?>/style/themes/<?= $style ?>/style.css">
 <?php
 
 foreach($assets as $type => $items) {
@@ -40,14 +41,14 @@
         foreach ($item['params'] as $key => $value) {
             echo $key.'="'.$value.'" ';
         }
-        echo 'href="'.$feather->url->base().'/'.$item['file'].'">'."\n";
+        echo 'href="'.Url::base().'/'.$item['file'].'">'."\n";
     }
 }
 if ($admin_console) {
     if (file_exists($feather->forum_env['FEATHER_ROOT'].'style/themes/'.$feather->user->style.'/base_admin.css')) {
-        echo "\t".'<link rel="stylesheet" type="text/css" href="'.$feather->url->base().'/style/themes/'.$feather->user->style.'/base_admin.css" />'."\n";
+        echo "\t".'<link rel="stylesheet" type="text/css" href="'.Url::base().'/style/themes/'.$feather->user->style.'/base_admin.css" />'."\n";
     } else {
-        echo "\t".'<link rel="stylesheet" type="text/css" href="'.$feather->url->base().'/style/imports/base_admin.css" />'."\n";
+        echo "\t".'<link rel="stylesheet" type="text/css" href="'.Url::base().'/style/imports/base_admin.css" />'."\n";
     }
 }
 if (isset($required_fields)) :
@@ -107,31 +108,31 @@ function process_form(the_form)
                 <div id="brdmenu" class="inbox">
                     <ul>
 <?php
-echo "\t\t\t\t\t\t".'<li id="navindex"'.(($active_page == 'index') ? ' class="isactive"' : '').'><a href="'.$feather->url->base().'/">'.__('Index').'</a></li>'."\n";
+echo "\t\t\t\t\t\t".'<li id="navindex"'.(($active_page == 'index') ? ' class="isactive"' : '').'><a href="'.Url::base().'/">'.__('Index').'</a></li>'."\n";
 
 if ($feather->user->g_read_board == '1' && $feather->user->g_view_users == '1') {
-    echo "\t\t\t\t\t\t".'<li id="navuserlist"'.(($active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('userlist/').'">'.__('User list').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navuserlist"'.(($active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.Url::get('userlist/').'">'.__('User list').'</a></li>'."\n";
 }
 
 if ($feather->forum_settings['o_rules'] == '1' && (!$feather->user->is_guest || $feather->user->g_read_board == '1' || $feather->forum_settings['o_regs_allow'] == '1')) {
-    echo "\t\t\t\t\t\t".'<li id="navrules"'.(($active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('rules/').'">'.__('Rules').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navrules"'.(($active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.Url::get('rules/').'">'.__('Rules').'</a></li>'."\n";
 }
 
 if ($feather->user->g_read_board == '1' && $feather->user->g_search == '1') {
-    echo "\t\t\t\t\t\t".'<li id="navsearch"'.(($active_page == 'search') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('search/').'">'.__('Search').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navsearch"'.(($active_page == 'search') ? ' class="isactive"' : '').'><a href="'.Url::get('search/').'">'.__('Search').'</a></li>'."\n";
 }
 
 if ($feather->user->is_guest) {
-    echo "\t\t\t\t\t\t".'<li id="navregister"'.(($active_page == 'register') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('register/').'">'.__('Register').'</a></li>'."\n";
-    echo "\t\t\t\t\t\t".'<li id="navlogin"'.(($active_page == 'login') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('auth/login/').'">'.__('Login').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navregister"'.(($active_page == 'register') ? ' class="isactive"' : '').'><a href="'.Url::get('register/').'">'.__('Register').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogin"'.(($active_page == 'login') ? ' class="isactive"' : '').'><a href="'.Url::get('auth/login/').'">'.__('Login').'</a></li>'."\n";
 } else {
-    echo "\t\t\t\t\t\t".'<li id="navprofile"'.(($active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('user/'.$feather->user->id.'/').'">'.__('Profile').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navprofile"'.(($active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.Url::get('user/'.$feather->user->id.'/').'">'.__('Profile').'</a></li>'."\n";
 
     if ($feather->user->is_admmod) {
-        echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.$feather->url->get('admin/').'">'.__('Admin').'</a></li>'."\n";
+        echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.Url::get('admin/').'">'.__('Admin').'</a></li>'."\n";
     }
 
-    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.$feather->url->get('auth/logout/token/'.\FeatherBB\Utils::hash($feather->user->id.\FeatherBB\Utils::hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.Url::get('auth/logout/token/'.\FeatherBB\Utils::hash($feather->user->id.\FeatherBB\Utils::hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
 }
 
 // // Are there any additional navlinks we should insert into the array before imploding it?
@@ -160,7 +161,7 @@ function process_form(the_form)
     <div class="container">
         <div class="container-title-status">
             <h1 class="title-site">
-                <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
+                <a href="<?php echo Url::base() ?>" title="" class="site-name">
                     <p><?php echo Utils::escape($feather->forum_settings['o_board_title']) ?></p>
                 </a>
                 <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
@@ -179,12 +180,12 @@ function process_form(the_form)
     if ($feather->user->is_admmod) {
         if ($feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2') {
             if ($has_reports) {
-                echo "\t\t\t\t\t\t".'<li class="reportlink"><span><strong><a href="'.$feather->url->get('admin/reports/').'">'.__('New reports').'</a></strong></span></li>'."\n";
+                echo "\t\t\t\t\t\t".'<li class="reportlink"><span><strong><a href="'.Url::get('admin/reports/').'">'.__('New reports').'</a></strong></span></li>'."\n";
             }
         }
 
         if ($feather->forum_settings['o_maintenance'] == '1') {
-            echo "\t\t\t\t\t\t".'<li class="maintenancelink"><span><strong><a href="'.$feather->url->get('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>'."\n";
+            echo "\t\t\t\t\t\t".'<li class="maintenancelink"><span><strong><a href="'.Url::get('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>'."\n";
         }
     }
     echo "\t\t\t\t\t".'</ul>'."\n";
@@ -194,11 +195,11 @@ function process_form(the_form)
     echo "\t\t\t\t\t".'<ul class="conr">'."\n";
     echo "\t\t\t\t\t\t".'<li><span>'.__('Topic searches').' ';
     if (!$feather->user->is_guest) {
-        echo '<a href="'.$feather->url->get('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a> | ';
-        echo '<a href="'.$feather->url->get('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a> | ';
+        echo '<a href="'.Url::get('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a> | ';
+        echo '<a href="'.Url::get('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a> | ';
     }
-    echo '<a href="'.$feather->url->get('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a> | ';
-    echo '<a href="'.$feather->url->get('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
+    echo '<a href="'.Url::get('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a> | ';
+    echo '<a href="'.Url::get('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
     echo '</li>'."\n";
     echo "\t\t\t\t".'</ul>'."\n";
 } ?>
diff --git a/style/themes/FeatherBB/view/header.php b/style/themes/FeatherBB/view/header.php
index bdeba110..9e84eebb 100644
--- a/style/themes/FeatherBB/view/header.php
+++ b/style/themes/FeatherBB/view/header.php
@@ -15,7 +15,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
 <title><?php echo generate_page_title($page_title, $p) ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo $feather->url->base() ?>/style/themes/<?php echo $feather->user->style.'/style.css' ?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo Url::base() ?>/style/themes/<?php echo $feather->user->style.'/style.css' ?>" />
 <?php
 
 echo $allow_index;
@@ -91,7 +91,7 @@ function process_form(the_form)
     <div class="container">
         <div class="container-title-status">
             <h1 class="title-site">
-                <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
+                <a href="<?php echo Url::base() ?>" title="" class="site-name">
                     <p><?php echo Utils::escape($feather->forum_settings['o_board_title']) ?></p>
                 </a>
                 <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
diff --git a/style/themes/FeatherBB/view/help.php b/style/themes/FeatherBB/view/help.php
index 574953db..085eee8c 100644
--- a/style/themes/FeatherBB/view/help.php
+++ b/style/themes/FeatherBB/view/help.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -43,24 +44,24 @@
 <div class="box">
 	<div class="inbox">
 		<p><?php _e('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo Utils::escape($feather->url->base(true).'/') ?>]<?php echo Utils::escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape($feather->url->base(true).'/') ?>"><?php echo Utils::escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo Utils::escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape($feather->url->base(true).'/') ?>"><?php echo Utils::escape($feather->url->base(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
+		<p><a name="url"></a><code>[url=<?php echo Utils::escape(Url::base(true).'/') ?>]<?php echo Utils::escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape(Url::base(true).'/') ?>"><?php echo Utils::escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo Utils::escape(Url::base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape(Url::base(true).'/') ?>"><?php echo Utils::escape(Url::base(true).'/') ?></a></samp></p>
+		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
 		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
-		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php echo $feather->url->get('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php echo $feather->url->get('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('forum/1/') ?>"><?php echo $feather->url->get('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php echo $feather->url->get('user/2/') ?></a></samp></p>
+		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('topic/1/') ?>"><?php echo Url::get('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('post/1/#p1') ?>"><?php echo Url::get('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('forum/1/') ?>"><?php echo Url::get('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('user/2/') ?>"><?php echo Url::get('user/2/') ?></a></samp></p>
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
         dede
-		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo Utils::escape($feather->url->base(true)) ?>/style/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo Utils::escape($feather->url->base(true)) ?>/style/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
+		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo Utils::escape(Url::base(true)) ?>/style/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo Utils::escape(Url::base(true)) ?>/style/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
 	</div>
 </div>
 <h2><span><?php _e('Quotes') ?></span></h2>
diff --git a/style/themes/FeatherBB/view/index.php b/style/themes/FeatherBB/view/index.php
index e3c4e741..b1a99b8a 100644
--- a/style/themes/FeatherBB/view/index.php
+++ b/style/themes/FeatherBB/view/index.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/install.php b/style/themes/FeatherBB/view/install.php
index 480c3844..816a41b7 100644
--- a/style/themes/FeatherBB/view/install.php
+++ b/style/themes/FeatherBB/view/install.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/login/form.php b/style/themes/FeatherBB/view/login/form.php
index 804b73df..b88f1ce2 100644
--- a/style/themes/FeatherBB/view/login/form.php
+++ b/style/themes/FeatherBB/view/login/form.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Login') ?></span></h2>
 	<div class="box">
-		<form id="login" method="post" action="<?php echo $feather->url->get('auth/login') ?>" onsubmit="return process_form(this)">
+		<form id="login" method="post" action="<?php echo Url::get('auth/login') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -33,7 +34,7 @@
 						</div>
 
 						<p class="clearb"><?php _e('Login info') ?></p>
-						<p class="actions"><span><a href="<?php echo $feather->url->get('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo $feather->url->get('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
+						<p class="actions"><span><a href="<?php echo Url::get('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo Url::get('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/themes/FeatherBB/view/login/password_forgotten.php b/style/themes/FeatherBB/view/login/password_forgotten.php
index 1d066cd3..232fe23a 100644
--- a/style/themes/FeatherBB/view/login/password_forgotten.php
+++ b/style/themes/FeatherBB/view/login/password_forgotten.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -41,7 +42,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Request pass') ?></span></h2>
 	<div class="box">
-		<form id="request_pass" method="post" action="<?php echo $feather->url->get('auth/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
+		<form id="request_pass" method="post" action="<?php echo Url::get('auth/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/themes/FeatherBB/view/misc/email.php b/style/themes/FeatherBB/view/misc/email.php
index c54475b8..e26229b5 100644
--- a/style/themes/FeatherBB/view/misc/email.php
+++ b/style/themes/FeatherBB/view/misc/email.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 <div id="emailform" class="blockform">
 	<h2><span><?php _e('Send email to') ?> <?php echo Utils::escape($mail['recipient']) ?></span></h2>
 	<div class="box">
-		<form id="email" method="post" action="<?php echo $feather->url->get('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="email" method="post" action="<?php echo Url::get('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/themes/FeatherBB/view/misc/report.php b/style/themes/FeatherBB/view/misc/report.php
index b51b43e1..f59e1605 100644
--- a/style/themes/FeatherBB/view/misc/report.php
+++ b/style/themes/FeatherBB/view/misc/report.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,9 +19,9 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
+			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('post/'.$id.'/#p'.$id) ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
 		</ul>
 	</div>
@@ -29,7 +30,7 @@
 <div id="reportform" class="blockform">
 	<h2><span><?php _e('Report post') ?></span></h2>
 	<div class="box">
-		<form id="report" method="post" action="<?php echo $feather->url->get('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="report" method="post" action="<?php echo Url::get('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/themes/FeatherBB/view/misc/rules.php b/style/themes/FeatherBB/view/misc/rules.php
index c45dbd6a..6cbeca3f 100644
--- a/style/themes/FeatherBB/view/misc/rules.php
+++ b/style/themes/FeatherBB/view/misc/rules.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/delete_posts.php b/style/themes/FeatherBB/view/moderate/delete_posts.php
index 003487b7..1d0bd1fe 100644
--- a/style/themes/FeatherBB/view/moderate/delete_posts.php
+++ b/style/themes/FeatherBB/view/moderate/delete_posts.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/delete_topics.php b/style/themes/FeatherBB/view/moderate/delete_topics.php
index ee012f13..5eb15a2c 100644
--- a/style/themes/FeatherBB/view/moderate/delete_topics.php
+++ b/style/themes/FeatherBB/view/moderate/delete_topics.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/merge_topics.php b/style/themes/FeatherBB/view/moderate/merge_topics.php
index 7a35e9ea..5f17a4ff 100644
--- a/style/themes/FeatherBB/view/moderate/merge_topics.php
+++ b/style/themes/FeatherBB/view/moderate/merge_topics.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/moderator_forum.php b/style/themes/FeatherBB/view/moderate/moderator_forum.php
index 9b1e3735..44438887 100644
--- a/style/themes/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/themes/FeatherBB/view/moderate/moderator_forum.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -19,8 +20,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
+			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -30,7 +31,7 @@
 	</div>
 </div>
 
-<form method="post" action="<?php echo $feather->url->get('moderate/forum/'.$id.'/') ?>">
+<form method="post" action="<?php echo Url::get('moderate/forum/'.$id.'/') ?>">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <input type="hidden" name="page" value="<?php echo Utils::escape($p) ?>" />
 <div id="vf" class="blocktable">
@@ -93,8 +94,8 @@
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
+			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/themes/FeatherBB/view/moderate/move_topics.php b/style/themes/FeatherBB/view/moderate/move_topics.php
index 053e5bcb..85f380ad 100644
--- a/style/themes/FeatherBB/view/moderate/move_topics.php
+++ b/style/themes/FeatherBB/view/moderate/move_topics.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/posts_view.php b/style/themes/FeatherBB/view/moderate/posts_view.php
index efedca10..7e35720f 100644
--- a/style/themes/FeatherBB/view/moderate/posts_view.php
+++ b/style/themes/FeatherBB/view/moderate/posts_view.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,9 +19,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
+			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -44,7 +45,7 @@
     echo ' blockpost1';
 }
     ?>">
-		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
+		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo Url::get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<div class="postbody">
@@ -86,9 +87,9 @@
 			<div class="clearer"></div>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
+			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/themes/FeatherBB/view/moderate/split_posts.php b/style/themes/FeatherBB/view/moderate/split_posts.php
index 25e50568..17e9b71a 100644
--- a/style/themes/FeatherBB/view/moderate/split_posts.php
+++ b/style/themes/FeatherBB/view/moderate/split_posts.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/post.php b/style/themes/FeatherBB/view/post.php
index 01eb541f..eca06d53 100644
--- a/style/themes/FeatherBB/view/post.php
+++ b/style/themes/FeatherBB/view/post.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -19,11 +20,11 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_posting['forum_name']) ?></a></li>
+			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo Utils::escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
-<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_posting['subject']) ?></a></li>
+<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo Url::get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_posting['subject']) ?></a></li>
 <?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
 		</ul>
 	</div>
@@ -83,10 +84,10 @@
 ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
+    var baseUrl = '<?php echo Utils::escape(Url::base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
-<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
+<script src="<?php echo Url::base() ?>/js/bbeditor.js"></script>
 
 <div id="postform" class="blockform">
 	<h2><span><?php echo $action ?></span></h2>
@@ -123,10 +124,10 @@
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? Utils::linebreaks(Utils::trim(Utils::escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo Url::get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo Url::get('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo Url::get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo Url::get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/style/themes/FeatherBB/view/profile/change_mail.php b/style/themes/FeatherBB/view/profile/change_mail.php
index a719ffba..e422d9cd 100644
--- a/style/themes/FeatherBB/view/profile/change_mail.php
+++ b/style/themes/FeatherBB/view/profile/change_mail.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Change email') ?></span></h2>
 	<div class="box">
-		<form id="change_email" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
+		<form id="change_email" method="post" action="<?php echo Url::get('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/themes/FeatherBB/view/profile/change_pass.php b/style/themes/FeatherBB/view/profile/change_pass.php
index c7ee7113..ccd7007e 100644
--- a/style/themes/FeatherBB/view/profile/change_pass.php
+++ b/style/themes/FeatherBB/view/profile/change_pass.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Change pass') ?></span></h2>
 	<div class="box">
-		<form id="change_pass" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
+		<form id="change_pass" method="post" action="<?php echo Url::get('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
diff --git a/style/themes/FeatherBB/view/profile/delete_user.php b/style/themes/FeatherBB/view/profile/delete_user.php
index 6c9798cf..b3c197fa 100644
--- a/style/themes/FeatherBB/view/profile/delete_user.php
+++ b/style/themes/FeatherBB/view/profile/delete_user.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Confirm delete user') ?></span></h2>
 	<div class="box">
-		<form id="confirm_del_user" method="post" action="<?php echo $feather->url->get('user/'.$id.'/') ?>">
+		<form id="confirm_del_user" method="post" action="<?php echo Url::get('user/'.$id.'/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/themes/FeatherBB/view/profile/menu.php b/style/themes/FeatherBB/view/profile/menu.php
index a2ca1fb5..b063329c 100644
--- a/style/themes/FeatherBB/view/profile/menu.php
+++ b/style/themes/FeatherBB/view/profile/menu.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -24,32 +25,32 @@
 					<li<?php if ($page == 'essentials') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
+    ?>><a href="<?php echo Url::get('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
 					<li<?php if ($page == 'personal') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
+    ?>><a href="<?php echo Url::get('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
 					<li<?php if ($page == 'messaging') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
+    ?>><a href="<?php echo Url::get('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
 <?php if ($feather->forum_settings['o_avatars'] == '1' || $feather->forum_settings['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
+    ?>><a href="<?php echo Url::get('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
 <?php endif;
     ?>					<li<?php if ($page == 'display') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
+    ?>><a href="<?php echo Url::get('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
 					<li<?php if ($page == 'privacy') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
+    ?>><a href="<?php echo Url::get('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
 <?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
+    ?>><a href="<?php echo Url::get('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
diff --git a/style/themes/FeatherBB/view/profile/section_admin.php b/style/themes/FeatherBB/view/profile/section_admin.php
index 415d520b..9fe4381b 100644
--- a/style/themes/FeatherBB/view/profile/section_admin.php
+++ b/style/themes/FeatherBB/view/profile/section_admin.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section admin') ?></span></h2>
 		<div class="box">
-			<form id="profile7" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>">
+			<form id="profile7" method="post" action="<?php echo Url::get('user/'.$id.'/section/admin/') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
diff --git a/style/themes/FeatherBB/view/profile/section_display.php b/style/themes/FeatherBB/view/profile/section_display.php
index e31ed2c2..2b5357d0 100644
--- a/style/themes/FeatherBB/view/profile/section_display.php
+++ b/style/themes/FeatherBB/view/profile/section_display.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section display') ?></span></h2>
 	<div class="box">
-		<form id="profile5" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>">
+		<form id="profile5" method="post" action="<?php echo Url::get('user/'.$id.'/section/display/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php
diff --git a/style/themes/FeatherBB/view/profile/section_essentials.php b/style/themes/FeatherBB/view/profile/section_essentials.php
index f5322195..bfa14ed3 100644
--- a/style/themes/FeatherBB/view/profile/section_essentials.php
+++ b/style/themes/FeatherBB/view/profile/section_essentials.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section essentials') ?></span></h2>
 	<div class="box">
-		<form id="profile1" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
+		<form id="profile1" method="post" action="<?php echo Url::get('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -26,7 +27,7 @@
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo Url::get('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
@@ -243,7 +244,7 @@
 				<fieldset>
 					<legend><?php _e('User activity') ?></legend>
 					<div class="infldset">
-						<p><?php printf(__('Registered info'), $feather->utils->format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.Utils::escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Registered info'), $feather->utils->format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.Url::get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.Utils::escape($user['registration_ip']).'</a>)' : '')) ?></p>
 						<p><?php printf(__('Last post info'), $feather->utils->format_time($user['last_post'])) ?></p>
 						<p><?php printf(__('Last visit info'), $feather->utils->format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
diff --git a/style/themes/FeatherBB/view/profile/section_messaging.php b/style/themes/FeatherBB/view/profile/section_messaging.php
index ce6a075f..351681f1 100644
--- a/style/themes/FeatherBB/view/profile/section_messaging.php
+++ b/style/themes/FeatherBB/view/profile/section_messaging.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section messaging') ?></span></h2>
 	<div class="box">
-		<form id="profile3" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>">
+		<form id="profile3" method="post" action="<?php echo Url::get('user/'.$id.'/section/messaging/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/themes/FeatherBB/view/profile/section_personal.php b/style/themes/FeatherBB/view/profile/section_personal.php
index e4c0a3cc..d7807213 100644
--- a/style/themes/FeatherBB/view/profile/section_personal.php
+++ b/style/themes/FeatherBB/view/profile/section_personal.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personal') ?></span></h2>
 	<div class="box">
-		<form id="profile2" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>">
+		<form id="profile2" method="post" action="<?php echo Url::get('user/'.$id.'/section/personal/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/themes/FeatherBB/view/profile/section_personality.php b/style/themes/FeatherBB/view/profile/section_personality.php
index 3d19bbbc..c508cb4d 100644
--- a/style/themes/FeatherBB/view/profile/section_personality.php
+++ b/style/themes/FeatherBB/view/profile/section_personality.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personality') ?></span></h2>
 	<div class="box">
-		<form id="profile4" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>">
+		<form id="profile4" method="post" action="<?php echo Url::get('user/'.$id.'/section/personality/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php if ($feather->forum_settings['o_avatars'] == '1'): ?>				<div class="inform">
@@ -41,10 +42,10 @@
 							<textarea name="signature" rows="4" cols="65"><?php echo Utils::escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo Url::get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo Url::get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo Url::get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo Url::get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
diff --git a/style/themes/FeatherBB/view/profile/section_privacy.php b/style/themes/FeatherBB/view/profile/section_privacy.php
index b37d810e..3b6373c7 100644
--- a/style/themes/FeatherBB/view/profile/section_privacy.php
+++ b/style/themes/FeatherBB/view/profile/section_privacy.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section privacy') ?></span></h2>
 	<div class="box">
-		<form id="profile6" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>">
+		<form id="profile6" method="post" action="<?php echo Url::get('user/'.$id.'/section/privacy/') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/themes/FeatherBB/view/profile/upload_avatar.php b/style/themes/FeatherBB/view/profile/upload_avatar.php
index 033dbe75..36c5f24e 100644
--- a/style/themes/FeatherBB/view/profile/upload_avatar.php
+++ b/style/themes/FeatherBB/view/profile/upload_avatar.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Upload avatar') ?></span></h2>
 	<div class="box">
-		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo $feather->url->get('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
+		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo Url::get('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/themes/FeatherBB/view/profile/view_profile.php b/style/themes/FeatherBB/view/profile/view_profile.php
index 71ab3007..4bbfda56 100644
--- a/style/themes/FeatherBB/view/profile/view_profile.php
+++ b/style/themes/FeatherBB/view/profile/view_profile.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/register/email.php b/style/themes/FeatherBB/view/register/email.php
index c8903ebd..249fb275 100644
--- a/style/themes/FeatherBB/view/register/email.php
+++ b/style/themes/FeatherBB/view/register/email.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/register/form.php b/style/themes/FeatherBB/view/register/form.php
index fc699571..ca9c3eff 100644
--- a/style/themes/FeatherBB/view/register/form.php
+++ b/style/themes/FeatherBB/view/register/form.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/register/rules.php b/style/themes/FeatherBB/view/register/rules.php
index 351acfbd..d20ff943 100644
--- a/style/themes/FeatherBB/view/register/rules.php
+++ b/style/themes/FeatherBB/view/register/rules.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -19,7 +20,7 @@
 <div id="rules" class="blockform">
 	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
 	<div class="box">
-		<form method="get" action="<?php echo $feather->url->get('register/') ?>">
+		<form method="get" action="<?php echo Url::get('register/') ?>">
 			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Rules legend') ?></legend>
diff --git a/style/themes/FeatherBB/view/search/footer.php b/style/themes/FeatherBB/view/search/footer.php
index 63b3fdbf..6254c7a8 100644
--- a/style/themes/FeatherBB/view/search/footer.php
+++ b/style/themes/FeatherBB/view/search/footer.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -32,8 +33,8 @@
 			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
 <?php echo(!empty($search['forum_actions']) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $search['forum_actions']).'</p>'."\n" : '') ?>
diff --git a/style/themes/FeatherBB/view/search/form.php b/style/themes/FeatherBB/view/search/form.php
index 7d7d20f3..048c9ce4 100644
--- a/style/themes/FeatherBB/view/search/form.php
+++ b/style/themes/FeatherBB/view/search/form.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/search/header.php b/style/themes/FeatherBB/view/search/header.php
index 9a228a1f..2232ec0d 100644
--- a/style/themes/FeatherBB/view/search/header.php
+++ b/style/themes/FeatherBB/view/search/header.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,8 +19,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
 		<div class="pagepost">
diff --git a/style/themes/FeatherBB/view/search/posts.php b/style/themes/FeatherBB/view/search/posts.php
index b28936a5..0d3ab831 100644
--- a/style/themes/FeatherBB/view/search/posts.php
+++ b/style/themes/FeatherBB/view/search/posts.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -24,7 +25,7 @@
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
     _e('Re').' ';
-} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
+} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo Url::get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo Url::get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
 		<div class="postbody">
@@ -48,8 +49,8 @@
 		<div class="postfoot clearb">
 			<div class="postfootright">
 				<ul>
-					<li><span><a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
-					<li><span><a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
+					<li><span><a href="<?php echo Url::get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
+					<li><span><a href="<?php echo Url::get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
 				</ul>
 			</div>
 		</div>
diff --git a/style/themes/FeatherBB/view/search/topics.php b/style/themes/FeatherBB/view/search/topics.php
index 0fc3e2a6..c0afc167 100644
--- a/style/themes/FeatherBB/view/search/topics.php
+++ b/style/themes/FeatherBB/view/search/topics.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -27,5 +28,5 @@
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
 	<td class="tc3"><?php echo Utils::forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.$feather->utils->format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_search['last_poster']) ?></span></td>
+	<td class="tcr"><?php echo '<a href="'.Url::get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.$feather->utils->format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_search['last_poster']) ?></span></td>
 </tr>
\ No newline at end of file
diff --git a/style/themes/FeatherBB/view/userlist.php b/style/themes/FeatherBB/view/userlist.php
index 04344370..eaa39f76 100644
--- a/style/themes/FeatherBB/view/userlist.php
+++ b/style/themes/FeatherBB/view/userlist.php
@@ -8,6 +8,7 @@
  */
  
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -89,7 +90,7 @@
             foreach ($userlist_data as $user) {
                 ?>
 					<tr>
-						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
+						<td class="tcl"><?php echo '<a href="'.Url::get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
 						<td class="tc2"><?php echo get_title($user) ?></td>
 	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
 	<?php endif;
diff --git a/style/themes/FeatherBB/view/viewforum.php b/style/themes/FeatherBB/view/viewforum.php
index 32bdbb31..63f872e2 100644
--- a/style/themes/FeatherBB/view/viewforum.php
+++ b/style/themes/FeatherBB/view/viewforum.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -18,8 +19,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><a href="<?php echo Url::base() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php Url::get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -93,8 +94,8 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><a href="<?php echo Url::base() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php Url::get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
 		<div class="clearer"></div>
diff --git a/style/themes/FeatherBB/view/viewtopic.php b/style/themes/FeatherBB/view/viewtopic.php
index 5fd070d2..cc8466a7 100644
--- a/style/themes/FeatherBB/view/viewtopic.php
+++ b/style/themes/FeatherBB/view/viewtopic.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Utils;
+use FeatherBB\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -19,9 +20,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
+			<li><a href="<?php echo Url::base() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo Url::get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -42,7 +43,7 @@
     echo ' blockpost1';
 }
     ?>">
-	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
+	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo Url::get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">
@@ -109,9 +110,9 @@
 <?php echo $post_link ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
+			<li><a href="<?php echo Url::base() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo Url::get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 <?php echo $subscraction ?>
 		<div class="clearer"></div>
@@ -128,7 +129,7 @@
 <div id="quickpost" class="blockform">
 	<h2><span><?php _e('Quick post') ?></span></h2>
 	<div class="box">
-		<form id="quickpostform" method="post" action="<?php echo $feather->url->get('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="quickpostform" method="post" action="<?php echo Url::get('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -157,21 +158,21 @@
     ?>
 <!-- Init BBcode editor toolbar -->
 <script>
-    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
+    var baseUrl = '<?php echo Utils::escape(Url::base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
-<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
+<script src="<?php echo Url::base() ?>/js/bbeditor.js"></script>
 <script>postEditorToolbar('req_message');</script>
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo Url::get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo Url::get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo Url::get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo Url::get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>

From e8608baf43166f5138f407101201cce34fe1d180 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 6 Sep 2015 04:24:17 +0200
Subject: [PATCH 310/353] Group Middlewares in subfolder

---
 .gitignore                              | 2 +-
 extern.php                              | 2 +-
 featherbb/Controller/Admin/Parser.php   | 2 +-
 featherbb/Core/Cache.php                | 2 +-
 featherbb/Helpers/bbcd_compile.php      | 4 ++--
 featherbb/{Core => Middleware}/Auth.php | 2 +-
 featherbb/{Core => Middleware}/Core.php | 6 +++---
 featherbb/{Core => Middleware}/Csrf.php | 2 +-
 index.php                               | 8 ++++----
 9 files changed, 15 insertions(+), 15 deletions(-)
 rename featherbb/{Core => Middleware}/Auth.php (99%)
 rename featherbb/{Core => Middleware}/Core.php (98%)
 rename featherbb/{Core => Middleware}/Csrf.php (98%)

diff --git a/.gitignore b/.gitignore
index 81898019..e656a543 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-featherbb/cache/
+cache/
 featherbb/config.php
 .idea/
 nbproject/
diff --git a/extern.php b/extern.php
index 2abac8ad..4bfe99b9 100644
--- a/extern.php
+++ b/extern.php
@@ -70,7 +70,7 @@
 $feather->add(new \FeatherBB\Csrf());
 
 $feather_settings = array('config_file' => 'featherbb/config.php',
-    'cache_dir' => 'featherbb/cache/',
+    'cache_dir' => 'cache/',
     'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
 $feather->add(new \FeatherBB\Auth());
 $feather->add(new \FeatherBB\Core($feather_settings));
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
index bf78dcde..93f73d13 100644
--- a/featherbb/Controller/Admin/Parser.php
+++ b/featherbb/Controller/Admin/Parser.php
@@ -38,7 +38,7 @@ public function display()
         require FEATHER_ROOT . 'featherbb/lang/' . $this->user->language . '/admin/parser.php';
 
         // This is where the parser data lives and breathes.
-        $cache_file = FEATHER_ROOT.'featherbb/cache/cache_parser_data.php';
+        $cache_file = FEATHER_ROOT.'cache/cache_parser_data.php';
 
         // If RESET button pushed, or no cache file, re-compile master bbcode source file.
         if ($this->request->post('reset') || !file_exists($cache_file)) {
diff --git a/featherbb/Core/Cache.php b/featherbb/Core/Cache.php
index 0bcb0588..98647dc7 100644
--- a/featherbb/Core/Cache.php
+++ b/featherbb/Core/Cache.php
@@ -54,7 +54,7 @@ public function __construct($config = array())
     protected static function getDefaultSettings()
     {
         return array('name' => 'default',
-        'path' => 'featherbb/cache/',
+        'path' => 'cache/',
         'extension' => '.cache');
     }
 
diff --git a/featherbb/Helpers/bbcd_compile.php b/featherbb/Helpers/bbcd_compile.php
index 0ae218e3..8035debb 100644
--- a/featherbb/Helpers/bbcd_compile.php
+++ b/featherbb/Helpers/bbcd_compile.php
@@ -9,7 +9,7 @@
  */
 
 // This script compiles the $options, $smilies and $bbcd arrays (from bbcd_source.php script
-// or from an admin page web form) into the featherbb/cache/cache_parser_data.php.
+// or from an admin page web form) into the cache/cache_parser_data.php.
 
 // Initialize a new global parser data array $pd:
 $pd = array(
@@ -419,7 +419,7 @@ function file2title($file)
 $s .= ";\n";
 
 $s .= "?>";
-file_put_contents(FEATHER_ROOT.'featherbb/cache/cache_parser_data.php', $s);
+file_put_contents(FEATHER_ROOT.'cache/cache_parser_data.php', $s);
 
 // Clean up our global variables.
 unset($all_tags); unset($all_block_tags);
diff --git a/featherbb/Core/Auth.php b/featherbb/Middleware/Auth.php
similarity index 99%
rename from featherbb/Core/Auth.php
rename to featherbb/Middleware/Auth.php
index bec569e5..252f15aa 100644
--- a/featherbb/Core/Auth.php
+++ b/featherbb/Middleware/Auth.php
@@ -11,7 +11,7 @@
  *
  */
 
-namespace FeatherBB;
+namespace FeatherBB\Middleware;
 
 use FeatherBB\Utils;
 use FeatherBB\Url;
diff --git a/featherbb/Core/Core.php b/featherbb/Middleware/Core.php
similarity index 98%
rename from featherbb/Core/Core.php
rename to featherbb/Middleware/Core.php
index 4aa4327d..9b4905c8 100644
--- a/featherbb/Core/Core.php
+++ b/featherbb/Middleware/Core.php
@@ -11,7 +11,7 @@
  *
  */
 
-namespace FeatherBB;
+namespace FeatherBB\Middleware;
 use DB;
 
 class Core extends \Slim\Middleware
@@ -28,7 +28,7 @@ public function __construct(array $data)
 	{
         // Handle empty values in data
         $data = array_merge(array('config_file' => 'featherbb/config.php',
-                                  'cache_dir' => 'featherbb/cache/',
+                                  'cache_dir' => 'cache/',
                                   'debug'   => false), $data);
         // Define some core variables
         $this->forum_env['FEATHER_ROOT'] = realpath(dirname(__FILE__).'/../../').'/';
@@ -55,7 +55,7 @@ public static function load_default_forum_env()
                 'FEATHER' => true, // Legacy
                 'FEATHER_ROOT' => '',
                 'FORUM_CONFIG_FILE' => 'featherbb/config.php',
-                'FORUM_CACHE_DIR' => 'featherbb/cache/',
+                'FORUM_CACHE_DIR' => 'cache/',
                 'FORUM_VERSION' => '1.0.0',
                 'FORUM_NAME' => 'FeatherBB',
                 'FORUM_DB_REVISION' => 21,
diff --git a/featherbb/Core/Csrf.php b/featherbb/Middleware/Csrf.php
similarity index 98%
rename from featherbb/Core/Csrf.php
rename to featherbb/Middleware/Csrf.php
index f53b2b6b..4aa9cdf6 100644
--- a/featherbb/Core/Csrf.php
+++ b/featherbb/Middleware/Csrf.php
@@ -7,7 +7,7 @@
 *
 */
 
-namespace FeatherBB;
+namespace FeatherBB\Middleware;
 
 class Csrf extends \Slim\Middleware
 {
diff --git a/index.php b/index.php
index 955ec623..86637a57 100644
--- a/index.php
+++ b/index.php
@@ -18,13 +18,13 @@
 
 // Instantiate Slim and add CSRF
 $feather = new \Slim\Slim();
-$feather->add(new \FeatherBB\Csrf());
+$feather->add(new \FeatherBB\Middleware\Csrf());
 
 $feather_settings = array('config_file' => 'featherbb/config.php',
-                          'cache_dir' => 'featherbb/cache/',
+                          'cache_dir' => 'cache/',
                           'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
-$feather->add(new \FeatherBB\Auth());
-$feather->add(new \FeatherBB\Core($feather_settings));
+$feather->add(new \FeatherBB\Middleware\Auth());
+$feather->add(new \FeatherBB\Middleware\Core($feather_settings));
 
 // Load the routes
 require 'featherbb/routes.php';

From 2ab962db927727a610b9a6e13136ccd663a2146b Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 6 Sep 2015 05:09:32 +0200
Subject: [PATCH 311/353] Clean namespaces

---
 Plugins/Test.php                              |   2 +-
 ...5bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache |   2 +-
 cache/cache_parser_data.php                   |  38 +++----
 composer.json                                 |   4 +-
 extern.php                                    |   2 +-
 featherbb/Controller/Admin/Bans.php           |  13 ++-
 featherbb/Controller/Admin/Categories.php     |  11 +-
 featherbb/Controller/Admin/Censoring.php      |   7 +-
 featherbb/Controller/Admin/Forums.php         |  11 +-
 featherbb/Controller/Admin/Groups.php         |  17 +--
 featherbb/Controller/Admin/Index.php          |  13 ++-
 featherbb/Controller/Admin/Maintenance.php    |   9 +-
 featherbb/Controller/Admin/Options.php        |   7 +-
 featherbb/Controller/Admin/Parser.php         |  27 ++---
 featherbb/Controller/Admin/Permissions.php    |   7 +-
 featherbb/Controller/Admin/Plugins.php        |  23 ++--
 featherbb/Controller/Admin/Reports.php        |   7 +-
 featherbb/Controller/Admin/Statistics.php     |  11 +-
 featherbb/Controller/Admin/Users.php          |  21 ++--
 featherbb/Controller/Auth.php                 |  18 +--
 featherbb/Controller/Delete.php               |  10 +-
 featherbb/Controller/Edit.php                 |  10 +-
 featherbb/Controller/Help.php                 |   6 +-
 featherbb/Controller/Index.php                |   6 +-
 featherbb/Controller/Install.php              |   8 +-
 featherbb/Controller/Login.php                |   4 +-
 featherbb/Controller/Misc.php                 |  26 ++---
 featherbb/Controller/Moderate.php             |  32 +++---
 featherbb/Controller/Post.php                 |  12 +-
 featherbb/Controller/Profile.php              |  34 +++---
 featherbb/Controller/Register.php             |  10 +-
 featherbb/Controller/Search.php               |   8 +-
 featherbb/Controller/Userlist.php             |   8 +-
 featherbb/Controller/Viewforum.php            |   8 +-
 featherbb/Controller/Viewtopic.php            |   6 +-
 featherbb/Core/AdminUtils.php                 |   2 +-
 featherbb/Core/Cache.php                      |   2 +-
 featherbb/Core/Email.php                      |  12 +-
 featherbb/Core/Error.php                      |   6 +-
 featherbb/Core/Hooks.php                      |   4 +-
 featherbb/Core/Lister.php                     |   4 +-
 featherbb/Core/Plugin.php                     |   2 +-
 featherbb/Core/Search.php                     |   6 +-
 featherbb/Core/Url.php                        |   4 +-
 featherbb/Core/Utils.php                      |   4 +-
 featherbb/Core/View.php                       |   6 +-
 featherbb/Helpers/functions.php               |  20 ++--
 featherbb/Middleware/Auth.php                 |   8 +-
 featherbb/Middleware/Core.php                 |  16 +--
 featherbb/Model/Admin/Bans.php                |  38 +++----
 featherbb/Model/Admin/Categories.php          |   4 +-
 featherbb/Model/Admin/Censoring.php           |   8 +-
 featherbb/Model/Admin/Forums.php              |   4 +-
 featherbb/Model/Admin/Groups.php              |  16 +--
 featherbb/Model/Admin/Maintenance.php         |  12 +-
 featherbb/Model/Admin/Options.php             |  36 +++---
 featherbb/Model/Admin/Parser.php              |   4 +-
 featherbb/Model/Admin/Permissions.php         |   4 +-
 featherbb/Model/Admin/Reports.php             |   4 +-
 featherbb/Model/Admin/Statistics.php          |   4 +-
 featherbb/Model/Admin/Users.php               |  38 +++----
 featherbb/Model/Auth.php                      |   4 +-
 featherbb/Model/Cache.php                     |   4 +-
 featherbb/Model/Debug.php                     |   4 +-
 featherbb/Model/Delete.php                    |   6 +-
 featherbb/Model/Edit.php                      |   8 +-
 featherbb/Model/Header.php                    |   4 +-
 featherbb/Model/Index.php                     |   4 +-
 featherbb/Model/Install.php                   |   6 +-
 featherbb/Model/Login.php                     |  18 +--
 featherbb/Model/Misc.php                      |  46 ++++----
 featherbb/Model/Moderate.php                  |  60 +++++-----
 featherbb/Model/Post.php                      |  10 +-
 featherbb/Model/Profile.php                   | 104 +++++++++---------
 featherbb/Model/Register.php                  |  10 +-
 featherbb/Model/Search.php                    |  48 ++++----
 featherbb/Model/Userlist.php                  |   4 +-
 featherbb/Model/Viewforum.php                 |   6 +-
 featherbb/Model/Viewtopic.php                 |  10 +-
 featherbb/routes.php                          |   4 +-
 .../FeatherBB/view/admin/bans/add_ban.php     |   4 +-
 .../FeatherBB/view/admin/bans/admin_bans.php  |   4 +-
 .../FeatherBB/view/admin/bans/search_ban.php  |   4 +-
 .../FeatherBB/view/admin/categories.php       |   4 +-
 .../themes/FeatherBB/view/admin/censoring.php |   4 +-
 .../view/admin/forums/admin_forums.php        |   4 +-
 .../view/admin/forums/delete_forum.php        |   4 +-
 .../view/admin/forums/permissions.php         |   4 +-
 .../view/admin/groups/add_edit_group.php      |   4 +-
 .../view/admin/groups/admin_groups.php        |   4 +-
 .../view/admin/groups/confirm_delete.php      |   4 +-
 .../view/admin/groups/delete_group.php        |   4 +-
 style/themes/FeatherBB/view/admin/index.php   |   4 +-
 style/themes/FeatherBB/view/admin/loader.php  |   4 +-
 .../admin/maintenance/admin_maintenance.php   |   4 +-
 .../view/admin/maintenance/prune.php          |   4 +-
 .../view/admin/maintenance/rebuild.php        |   4 +-
 style/themes/FeatherBB/view/admin/menu.php    |   4 +-
 style/themes/FeatherBB/view/admin/options.php |   4 +-
 style/themes/FeatherBB/view/admin/parser.php  |   4 +-
 .../FeatherBB/view/admin/permissions.php      |   4 +-
 style/themes/FeatherBB/view/admin/plugins.php |   4 +-
 style/themes/FeatherBB/view/admin/reports.php |   8 +-
 .../FeatherBB/view/admin/statistics.php       |   4 +-
 .../view/admin/users/admin_users.php          |   4 +-
 .../FeatherBB/view/admin/users/ban_users.php  |   4 +-
 .../view/admin/users/delete_users.php         |   4 +-
 .../FeatherBB/view/admin/users/find_users.php |   4 +-
 .../FeatherBB/view/admin/users/move_users.php |   4 +-
 .../FeatherBB/view/admin/users/search_ip.php  |   4 +-
 .../FeatherBB/view/admin/users/show_users.php |   4 +-
 style/themes/FeatherBB/view/delete.php        |   4 +-
 style/themes/FeatherBB/view/edit.php          |   4 +-
 style/themes/FeatherBB/view/error.php         |   4 +-
 style/themes/FeatherBB/view/footer.new.php    |   4 +-
 style/themes/FeatherBB/view/header.new.php    |   6 +-
 style/themes/FeatherBB/view/help.php          |   4 +-
 style/themes/FeatherBB/view/index.php         |   4 +-
 style/themes/FeatherBB/view/install.php       |   4 +-
 style/themes/FeatherBB/view/login/form.php    |   4 +-
 .../view/login/password_forgotten.php         |   4 +-
 style/themes/FeatherBB/view/misc/email.php    |   4 +-
 style/themes/FeatherBB/view/misc/report.php   |   4 +-
 style/themes/FeatherBB/view/misc/rules.php    |   4 +-
 .../FeatherBB/view/moderate/delete_posts.php  |   4 +-
 .../FeatherBB/view/moderate/delete_topics.php |   4 +-
 .../FeatherBB/view/moderate/merge_topics.php  |   4 +-
 .../view/moderate/moderator_forum.php         |   4 +-
 .../FeatherBB/view/moderate/move_topics.php   |   4 +-
 .../FeatherBB/view/moderate/posts_view.php    |   4 +-
 .../FeatherBB/view/moderate/split_posts.php   |   4 +-
 style/themes/FeatherBB/view/post.php          |   4 +-
 .../FeatherBB/view/profile/change_mail.php    |   4 +-
 .../FeatherBB/view/profile/change_pass.php    |   4 +-
 .../FeatherBB/view/profile/delete_user.php    |   4 +-
 style/themes/FeatherBB/view/profile/menu.php  |   4 +-
 .../FeatherBB/view/profile/section_admin.php  |   4 +-
 .../view/profile/section_display.php          |   6 +-
 .../view/profile/section_essentials.php       |   6 +-
 .../view/profile/section_messaging.php        |   4 +-
 .../view/profile/section_personal.php         |   4 +-
 .../view/profile/section_personality.php      |   4 +-
 .../view/profile/section_privacy.php          |   4 +-
 .../FeatherBB/view/profile/upload_avatar.php  |   4 +-
 .../FeatherBB/view/profile/view_profile.php   |   4 +-
 .../themes/FeatherBB/view/register/email.php  |   4 +-
 style/themes/FeatherBB/view/register/form.php |   4 +-
 .../themes/FeatherBB/view/register/rules.php  |   4 +-
 style/themes/FeatherBB/view/search/footer.php |   4 +-
 style/themes/FeatherBB/view/search/form.php   |   4 +-
 style/themes/FeatherBB/view/search/header.php |   4 +-
 style/themes/FeatherBB/view/search/posts.php  |   4 +-
 style/themes/FeatherBB/view/search/topics.php |   4 +-
 style/themes/FeatherBB/view/userlist.php      |   4 +-
 style/themes/FeatherBB/view/viewforum.php     |   4 +-
 style/themes/FeatherBB/view/viewtopic.php     |   4 +-
 vendor/composer/autoload_psr4.php             |   4 +-
 vendor/composer/include_paths.php             |  13 ---
 view/admin/reports.php                        |   4 +-
 view/profile/section_display.php              |   2 +-
 view/profile/section_essentials.php           |   2 +-
 161 files changed, 705 insertions(+), 700 deletions(-)
 delete mode 100644 vendor/composer/include_paths.php

diff --git a/Plugins/Test.php b/Plugins/Test.php
index a0a8cf37..bbbe07ca 100644
--- a/Plugins/Test.php
+++ b/Plugins/Test.php
@@ -9,7 +9,7 @@
 
 namespace Plugins;
 
-use \FeatherBB\Plugin as Plugin;
+use \FeatherBB\Core\Plugin as Plugin;
 
 class Test extends Plugin
 {
diff --git a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
index 2f1d9ca6..4ee85750 100644
--- a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
+++ b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
@@ -1 +1 @@
-{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1440702252,"expire":0,"data":"a:4:{i:1;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:2;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:3;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:4;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1440867139,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1440768048,"expire":0,"data":"a:2:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;}"}}
\ No newline at end of file
+{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1440702252,"expire":0,"data":"a:4:{i:1;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:2;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:3;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:4;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1441508919,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:23:\"Lighter than a feather.\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:11:\"deuh@oij.gt\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:17:\"style\/img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:26:\"http:\/\/localhost\/featherbb\";s:13:\"o_admin_email\";s:11:\"deuh@oij.gt\";s:17:\"o_webmaster_email\";s:11:\"deuh@oij.gt\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"0\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1440768048,"expire":0,"data":"a:2:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;}"}}
\ No newline at end of file
diff --git a/cache/cache_parser_data.php b/cache/cache_parser_data.php
index a3ea0f5b..5c246796 100644
--- a/cache/cache_parser_data.php
+++ b/cache/cache_parser_data.php
@@ -1,4 +1,4 @@
-<?php // File: cache_parser_data.php. Automatically generated: 2015-08-23 06:16:14. DO NOT EDIT!!!
+<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 05:08:39. DO NOT EDIT!!!
 $pd = array (
   'newer_php_version' => true,
   'in_signature' => false,
@@ -166,92 +166,92 @@
     ':)' => 
     array (
       'file' => 'smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/smile.png" alt="Smile" title="Smile" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/smile.png" alt="Smile" title="Smile" />',
     ),
     '=)' => 
     array (
       'file' => 'smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/smile.png" alt="Smile" title="Smile" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/smile.png" alt="Smile" title="Smile" />',
     ),
     ':|' => 
     array (
       'file' => 'neutral.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/neutral.png" alt="Neutral" title="Neutral" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/neutral.png" alt="Neutral" title="Neutral" />',
     ),
     '=|' => 
     array (
       'file' => 'neutral.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/neutral.png" alt="Neutral" title="Neutral" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/neutral.png" alt="Neutral" title="Neutral" />',
     ),
     ':(' => 
     array (
       'file' => 'sad.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/sad.png" alt="Sad" title="Sad" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/sad.png" alt="Sad" title="Sad" />',
     ),
     '=(' => 
     array (
       'file' => 'sad.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/sad.png" alt="Sad" title="Sad" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/sad.png" alt="Sad" title="Sad" />',
     ),
     ':D' => 
     array (
       'file' => 'big_smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/big_smile.png" alt="Big Smile" title="Big Smile" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/big_smile.png" alt="Big Smile" title="Big Smile" />',
     ),
     '=D' => 
     array (
       'file' => 'big_smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/big_smile.png" alt="Big Smile" title="Big Smile" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/big_smile.png" alt="Big Smile" title="Big Smile" />',
     ),
     ':o' => 
     array (
       'file' => 'yikes.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/yikes.png" alt="Yikes" title="Yikes" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/yikes.png" alt="Yikes" title="Yikes" />',
     ),
     ':O' => 
     array (
       'file' => 'yikes.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/yikes.png" alt="Yikes" title="Yikes" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/yikes.png" alt="Yikes" title="Yikes" />',
     ),
     ';)' => 
     array (
       'file' => 'wink.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/wink.png" alt="Wink" title="Wink" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/wink.png" alt="Wink" title="Wink" />',
     ),
     ':/' => 
     array (
       'file' => 'hmm.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/hmm.png" alt="Hmm" title="Hmm" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/hmm.png" alt="Hmm" title="Hmm" />',
     ),
     ':P' => 
     array (
       'file' => 'tongue.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/tongue.png" alt="Tongue" title="Tongue" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/tongue.png" alt="Tongue" title="Tongue" />',
     ),
     ':p' => 
     array (
       'file' => 'tongue.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/tongue.png" alt="Tongue" title="Tongue" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/tongue.png" alt="Tongue" title="Tongue" />',
     ),
     ':lol:' => 
     array (
       'file' => 'lol.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/lol.png" alt="Lol" title="Lol" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/lol.png" alt="Lol" title="Lol" />',
     ),
     ':mad:' => 
     array (
       'file' => 'mad.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/mad.png" alt="Mad" title="Mad" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/mad.png" alt="Mad" title="Mad" />',
     ),
     ':rolleyes:' => 
     array (
       'file' => 'roll.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/roll.png" alt="Roll" title="Roll" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/roll.png" alt="Roll" title="Roll" />',
     ),
     ':cool:' => 
     array (
       'file' => 'cool.png',
-      'html' => '<img width="15" height="15" src="/featherbb/img/smilies/cool.png" alt="Cool" title="Cool" />',
+      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/cool.png" alt="Cool" title="Cool" />',
     ),
   ),
   'bbcd' => 
diff --git a/composer.json b/composer.json
index 51c50373..b2a3d827 100644
--- a/composer.json
+++ b/composer.json
@@ -18,8 +18,8 @@
 	"autoload": {
         "classmap": ["featherbb/Core/Database.php", "featherbb/Core/pomo/MO.php"],
 		"psr-4": {
-			"Plugins\\": "/plugins",
-			"FeatherBB\\": "featherbb/Core",
+			"Plugins\\": "plugins/",
+			"FeatherBB\\": "featherbb/",
 			"": ""
 		}
 	},
diff --git a/extern.php b/extern.php
index 4bfe99b9..eb00e94b 100644
--- a/extern.php
+++ b/extern.php
@@ -224,7 +224,7 @@ function authenticate_user($user, $password, $password_is_hash = false)
 
     if (!isset($feather->user->id) ||
         ($password_is_hash && $password != $feather->user->password) ||
-        (!$password_is_hash && \FeatherBB\Utils::hash($password) != $feather->user->password)) {
+        (!$password_is_hash && \FeatherBB\Core\Utils::hash($password) != $feather->user->password)) {
         set_default_user();
     } else {
         $feather->user->is_guest = false;
diff --git a/featherbb/Controller/Admin/Bans.php b/featherbb/Controller/Admin/Bans.php
index 7b063a5a..461e5f76 100644
--- a/featherbb/Controller/Admin/Bans.php
+++ b/featherbb/Controller/Admin/Bans.php
@@ -9,8 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Url;
 
 class Bans
 {
@@ -25,7 +26,7 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/bans.mo');
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            throw new \FeatherBB\Error(__('No permission'), '403');
+            throw new \FeatherBB\Core\Error(__('No permission'), '403');
         }
     }
 
@@ -58,7 +59,7 @@ public function display()
             )->addTemplate('admin/bans/search_ban.php')->display();
         }
         else {
-            \FeatherBB\AdminUtils::generateAdminMenu('bans');
+            AdminUtils::generateAdminMenu('bans');
 
             $this->feather->template->setPageInfo(array(
                     'admin_console' => true,
@@ -75,7 +76,7 @@ public function add($id = null)
             $this->model->insert_ban();
         }
 
-        \FeatherBB\AdminUtils::generateAdminMenu('bans');
+        AdminUtils::generateAdminMenu('bans');
 
         $this->feather->template->setPageInfo(array(
                 'admin_console' => true,
@@ -97,7 +98,7 @@ public function edit($id)
         if ($this->request->post('add_edit_ban')) {
             $this->model->insert_ban();
         }
-        \FeatherBB\AdminUtils::generateAdminMenu('bans');
+        AdminUtils::generateAdminMenu('bans');
 
         $this->feather->template->setPageInfo(array(
                 'admin_console' => true,
diff --git a/featherbb/Controller/Admin/Categories.php b/featherbb/Controller/Admin/Categories.php
index 159efc1b..56d2f9c9 100644
--- a/featherbb/Controller/Admin/Categories.php
+++ b/featherbb/Controller/Admin/Categories.php
@@ -9,8 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Url;
 
 class Categories
 {
@@ -47,7 +48,7 @@ public function add_category()
     public function edit_categories()
     {
         if (empty($this->request->post('cat'))) {
-            throw new \FeatherBB\Error(__('Bad request'), '400');
+            throw new \FeatherBB\Core\Error(__('Bad request'), '400');
         }
 
         foreach ($this->request->post('cat') as $cat_id => $properties) {
@@ -71,7 +72,7 @@ public function delete_category()
         $cat_to_delete = (int) $this->request->post('cat_to_delete');
 
         if ($cat_to_delete < 1) {
-            throw new \FeatherBB\Error(__('Bad request'), '400');
+            throw new \FeatherBB\Core\Error(__('Bad request'), '400');
         }
 
         if (intval($this->request->post('disclaimer')) != 1) {
@@ -87,7 +88,7 @@ public function delete_category()
 
     public function display()
     {
-        \FeatherBB\AdminUtils::generateAdminMenu('categories');
+        AdminUtils::generateAdminMenu('categories');
 
         $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Categories')),
diff --git a/featherbb/Controller/Admin/Censoring.php b/featherbb/Controller/Admin/Censoring.php
index a6f08a50..8438e36f 100644
--- a/featherbb/Controller/Admin/Censoring.php
+++ b/featherbb/Controller/Admin/Censoring.php
@@ -9,8 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Url;
 
 class Censoring
 {
@@ -47,7 +48,7 @@ public function display()
             $this->model->remove_word();
         }
 
-        \FeatherBB\AdminUtils::generateAdminMenu('censoring');
+        AdminUtils::generateAdminMenu('censoring');
 
         $this->feather->template->setPageInfo(array(
                 'title'    =>    array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Censoring')),
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
index 176157f4..20cf91ed 100644
--- a/featherbb/Controller/Admin/Forums.php
+++ b/featherbb/Controller/Admin/Forums.php
@@ -9,8 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Url;
 
 class Forums
 {
@@ -115,7 +116,7 @@ public function edit_forum($forum_id)
             }
 
         } else {
-            \FeatherBB\AdminUtils::generateAdminMenu('forums');
+            AdminUtils::generateAdminMenu('forums');
 
             $this->feather->template->setPageInfo(array(
                     'title'    =>    array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Forums')),
@@ -141,7 +142,7 @@ public function delete_forum($forum_id)
 
         } else { // If the user hasn't confirmed
 
-            \FeatherBB\AdminUtils::generateAdminMenu('forums');
+            AdminUtils::generateAdminMenu('forums');
 
             $this->feather->template->setPageInfo(array(
                     'title'    =>    array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Forums')),
@@ -174,7 +175,7 @@ public function display()
             $this->edit_positions();
         }
 
-        \FeatherBB\AdminUtils::generateAdminMenu('forums');
+        AdminUtils::generateAdminMenu('forums');
 
         $categories_model = new \FeatherBB\Model\Admin\Categories();
         $this->feather->template->setPageInfo(array(
diff --git a/featherbb/Controller/Admin/Groups.php b/featherbb/Controller/Admin/Groups.php
index 10e13402..7bf2bf3f 100644
--- a/featherbb/Controller/Admin/Groups.php
+++ b/featherbb/Controller/Admin/Groups.php
@@ -9,8 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Url;
 
 class Groups
 {
@@ -39,7 +40,7 @@ public function display()
             $this->model->set_default_group($groups, $this->feather);
         }
 
-        \FeatherBB\AdminUtils::generateAdminMenu('groups');
+        AdminUtils::generateAdminMenu('groups');
 
         $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('User groups')),
@@ -54,12 +55,12 @@ public function display()
     public function delete($id)
     {
         if ($id < 5) {
-            throw new \FeatherBB\Error(__('Bad request'), 403);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 403);
         }
 
         // Make sure we don't remove the default group
         if ($id == $this->config['o_default_user_group']) {
-            throw new \FeatherBB\Error(__('Cannot remove default message'), 403);
+            throw new \FeatherBB\Core\Error(__('Cannot remove default message'), 403);
         }
 
         // Check if this group has any members
@@ -70,7 +71,7 @@ public function delete($id)
             if ($this->request->post('del_group_comply') || $this->request->post('del_group')) {
                 $this->model->delete_group($id);
             } else {
-                \FeatherBB\AdminUtils::generateAdminMenu('groups');
+                AdminUtils::generateAdminMenu('groups');
 
                 $this->feather->template->setPageInfo(array(
                         'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('User groups')),
@@ -83,7 +84,7 @@ public function delete($id)
             }
         }
 
-        \FeatherBB\AdminUtils::generateAdminMenu('groups');
+        AdminUtils::generateAdminMenu('groups');
 
         $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('User groups')),
@@ -108,7 +109,7 @@ public function addedit($id = '')
         // Add/edit a group (stage 1)
         elseif ($this->request->post('add_group') || isset($id)) {
 
-            \FeatherBB\AdminUtils::generateAdminMenu('groups');
+            AdminUtils::generateAdminMenu('groups');
 
             $group = $this->model->info_add_group($groups, $id);
 
diff --git a/featherbb/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
index bfad3e39..9ee6a065 100644
--- a/featherbb/Controller/Admin/Index.php
+++ b/featherbb/Controller/Admin/Index.php
@@ -9,8 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Url;
 
 class Index
 {
@@ -49,12 +50,12 @@ public function display($action = null)
         // Check for upgrade
         if ($action == 'check_upgrade') {
             if (!ini_get('allow_url_fopen')) {
-                throw new \FeatherBB\Error(__('fopen disabled message'), 500);
+                throw new \FeatherBB\Core\Error(__('fopen disabled message'), 500);
             }
 
             $latest_version = trim(@file_get_contents('http://featherbb.org/latest_version'));
             if (empty($latest_version)) {
-                throw new \FeatherBB\Error(__('Upgrade check failed message'), 500);
+                throw new \FeatherBB\Core\Error(__('Upgrade check failed message'), 500);
             }
 
             if (version_compare($this->config['o_cur_version'], $latest_version, '>=')) {
@@ -70,11 +71,11 @@ public function display($action = null)
             if ($deleted) {
                 redirect(Url::get('admin/'), __('Deleted install.php redirect'));
             } else {
-                throw new \FeatherBB\Error(__('Delete install.php failed'), 500);
+                throw new \FeatherBB\Core\Error(__('Delete install.php failed'), 500);
             }
         }
 
-        \FeatherBB\AdminUtils::generateAdminMenu('index');
+        AdminUtils::generateAdminMenu('index');
 
         $this->feather->template->setPageInfo(array(
                             'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Index')),
diff --git a/featherbb/Controller/Admin/Maintenance.php b/featherbb/Controller/Admin/Maintenance.php
index d3508f45..06fc2d48 100644
--- a/featherbb/Controller/Admin/Maintenance.php
+++ b/featherbb/Controller/Admin/Maintenance.php
@@ -9,8 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Url;
 
 class Maintenance
 {
@@ -44,7 +45,7 @@ public function display()
             $prune_from = Utils::trim($this->feather->request->post('prune_from'));
             $prune_sticky = intval($this->feather->request->post('prune_sticky'));
 
-            \FeatherBB\AdminUtils::generateAdminMenu('maintenance');
+            AdminUtils::generateAdminMenu('maintenance');
 
             if ($this->feather->request->post('prune_comply')) {
                 $this->model->prune_comply($prune_from, $prune_sticky);
@@ -61,7 +62,7 @@ public function display()
             )->addTemplate('admin/maintenance/prune.php')->display();
         }
 
-        \FeatherBB\AdminUtils::generateAdminMenu('maintenance');
+        AdminUtils::generateAdminMenu('maintenance');
 
         $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Maintenance')),
diff --git a/featherbb/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
index 54207d37..744ede53 100644
--- a/featherbb/Controller/Admin/Options.php
+++ b/featherbb/Controller/Admin/Options.php
@@ -9,8 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Url;
 
 class Options
 {
@@ -36,7 +37,7 @@ public function display()
             $this->model->update_options();
         }
 
-        \FeatherBB\AdminUtils::generateAdminMenu('options');
+        AdminUtils::generateAdminMenu('options');
 
         $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Options')),
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
index 93f73d13..e0b1fd83 100644
--- a/featherbb/Controller/Admin/Parser.php
+++ b/featherbb/Controller/Admin/Parser.php
@@ -9,8 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Url;
 
 class Parser
 {
@@ -70,26 +71,26 @@ public function display()
                                     if (move_uploaded_file($f['tmp_name'], FEATHER_ROOT .'style/img/smilies/'. $name)) {
                                         redirect(Url::get('admin/parser/'), $lang_admin_parser['upload success']);
                                     } else { //  Error #1: 'Smiley upload failed. Unable to move to smiley folder.'.
-                                        throw new \FeatherBB\Error($lang_admin_parser['upload_err_1'], 500);
+                                        throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_1'], 500);
                                     }
                                 } else { // Error #2: 'Smiley upload failed. File is too big.'
-                                    throw new \FeatherBB\Error($lang_admin_parser['upload_err_2'], 400);
+                                    throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_2'], 400);
                                 }
                             } else { // Error #3: 'Smiley upload failed. File type is not an image.'.
-                                throw new \FeatherBB\Error($lang_admin_parser['upload_err_3'], 400);
+                                throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_3'], 400);
                             }
                         } else { // Error #4: 'Smiley upload failed. Bad filename.'
-                            throw new \FeatherBB\Error($lang_admin_parser['upload_err_4'], 400);
+                            throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_4'], 400);
                         }
                         break;
                     case 1: // case 1 similar to case 2 so fall through...
-                    case 2: throw new \FeatherBB\Error($lang_admin_parser['upload_err_2'], 400);    // File exceeds MAX_FILE_SIZE.
-                    case 3: throw new \FeatherBB\Error($lang_admin_parser['upload_err_5'], 400);    // File only partially uploaded.
+                    case 2: throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_2'], 400);    // File exceeds MAX_FILE_SIZE.
+                    case 3: throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_5'], 400);    // File only partially uploaded.
                     //		case 4: break; // No error. Normal response when this form element left empty
-                    case 4: throw new \FeatherBB\Error($lang_admin_parser['upload_err_6'], 400);    // No filename.
-                    case 6: throw new \FeatherBB\Error($lang_admin_parser['upload_err_7'], 500);    // No temp folder.
-                    case 7: throw new \FeatherBB\Error($lang_admin_parser['upload_err_8'], 500);    // Cannot write to disk.
-                    default: throw new \FeatherBB\Error($lang_admin_parser['upload_err_9'], 500);        // Generic/unknown error
+                    case 4: throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_6'], 400);    // No filename.
+                    case 6: throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_7'], 500);    // No temp folder.
+                    case 7: throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_8'], 500);    // Cannot write to disk.
+                    default: throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_9'], 500);        // Generic/unknown error
                 }
             }
 
@@ -205,7 +206,7 @@ public function display()
             redirect(Url::get('admin/parser/'), $lang_admin_parser['save_success']);
         }
 
-        \FeatherBB\AdminUtils::generateAdminMenu('parser');
+        AdminUtils::generateAdminMenu('parser');
 
         $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Parser')),
diff --git a/featherbb/Controller/Admin/Permissions.php b/featherbb/Controller/Admin/Permissions.php
index 3eb7ae57..78b17d0d 100644
--- a/featherbb/Controller/Admin/Permissions.php
+++ b/featherbb/Controller/Admin/Permissions.php
@@ -9,8 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Url;
 
 class Permissions
 {
@@ -37,7 +38,7 @@ public function display()
             $this->model->update_permissions();
         }
 
-        \FeatherBB\AdminUtils::generateAdminMenu('permissions');
+        AdminUtils::generateAdminMenu('permissions');
 
         $this->feather->template->setPageInfo(array(
                 'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Permissions')),
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
index bcf270fc..2ee70069 100644
--- a/featherbb/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -9,8 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Url;
 
 class Plugins
 {
@@ -35,9 +36,9 @@ public function index()
         //     $this->model->update_permissions();
         // }
 
-        \FeatherBB\AdminUtils::generateAdminMenu('plugins');
+        AdminUtils::generateAdminMenu('plugins');
 
-        $pluginsList = \FeatherBB\Lister::getValidPlugins();
+        $pluginsList = \FeatherBB\Core\Lister::getValidPlugins();
         // var_dump($pluginsList);
         $activePlugins = $this->feather->cache->isCached('active_plugins') ? $this->feather->cache->retrieve('active_plugins') : array();
         // var_dump($activePlugins);
@@ -57,12 +58,12 @@ public function activate()
         // The plugin to load should be supplied via GET
         $class = $this->request->get('plugin') ? $this->request->get('plugin') : null;
         if (!$class) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         // Check if plugin follows PSR-4 conventions and extends base forum plugin
         if (!class_exists($class) || !property_exists($class, 'isValidFBPlugin')) {
-            throw new \FeatherBB\Error(sprintf(__('No plugin message'), Utils::escape($class)), 400);
+            throw new \FeatherBB\Core\Error(sprintf(__('No plugin message'), Utils::escape($class)), 400);
         }
 
         $plugin = new $class;
@@ -80,7 +81,7 @@ public function deactivate()
         // The plugin to load should be supplied via GET
         $class = $this->request->get('plugin') ? $this->request->get('plugin') : null;
         if (!$class) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         $plugin = new $class;
@@ -98,18 +99,18 @@ public function display()
         // The plugin to load should be supplied via GET
         $plugin = $this->request->get('plugin') ? $this->request->get('plugin') : '';
         if (!preg_match('%^AM?P_(\w*?)\.php$%i', $plugin)) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         // AP_ == Admins only, AMP_ == admins and moderators
         $prefix = substr($plugin, 0, strpos($plugin, '_'));
         if ($this->user->g_moderator == '1' && $prefix == 'AP') {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         // Make sure the file actually exists
         if (!file_exists(FEATHER_ROOT.'plugins/'.$plugin)) {
-            throw new \FeatherBB\Error(sprintf(__('No plugin message'), Utils::escape($plugin)), 400);
+            throw new \FeatherBB\Core\Error(sprintf(__('No plugin message'), Utils::escape($plugin)), 400);
         }
 
         // Construct REQUEST_URI if it isn't set TODO?
@@ -122,7 +123,7 @@ public function display()
         // get the "blank page of death"
         include FEATHER_ROOT.'plugins/'.$plugin;
         if (!defined('FEATHER_PLUGIN_LOADED')) {
-            throw new \FeatherBB\Error(sprintf(__('Plugin failed message'), Utils::escape($plugin)));
+            throw new \FeatherBB\Core\Error(sprintf(__('Plugin failed message'), Utils::escape($plugin)));
         }
 
         $this->feather->template->setPageInfo(array(
diff --git a/featherbb/Controller/Admin/Reports.php b/featherbb/Controller/Admin/Reports.php
index 1ccfc158..be6690b4 100644
--- a/featherbb/Controller/Admin/Reports.php
+++ b/featherbb/Controller/Admin/Reports.php
@@ -9,10 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
-
-use FeatherBB\AdminUtils;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Url;
 
 class Reports
 {
diff --git a/featherbb/Controller/Admin/Statistics.php b/featherbb/Controller/Admin/Statistics.php
index 251f3357..ac76e62d 100644
--- a/featherbb/Controller/Admin/Statistics.php
+++ b/featherbb/Controller/Admin/Statistics.php
@@ -9,8 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Url;
 
 class Statistics
 {
@@ -28,10 +29,10 @@ public function __construct()
     public function display()
     {
         if (!$this->user->is_admmod) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
-        \FeatherBB\AdminUtils::generateAdminMenu('index');
+        AdminUtils::generateAdminMenu('index');
 
         $total = $this->model->get_total_size();
 
@@ -54,7 +55,7 @@ public function phpinfo()
         // Show phpinfo() output
         // Is phpinfo() a disabled function?
         if (strpos(strtolower((string) ini_get('disable_functions')), 'phpinfo') !== false) {
-            throw new \FeatherBB\Error(__('PHPinfo disabled message'), 404);
+            throw new \FeatherBB\Core\Error(__('PHPinfo disabled message'), 404);
         }
 
         phpinfo();
diff --git a/featherbb/Controller/Admin/Users.php b/featherbb/Controller/Admin/Users.php
index 35e3af80..532b7143 100644
--- a/featherbb/Controller/Admin/Users.php
+++ b/featherbb/Controller/Admin/Users.php
@@ -9,8 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Url;
 
 class Users
 {
@@ -35,10 +36,10 @@ public function display()
         // Move multiple users to other user groups
         if ($this->request->post('move_users') || $this->request->post('move_users_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                throw new \FeatherBB\Error(__('No permission'), 403);
+                throw new \FeatherBB\Core\Error(__('No permission'), 403);
             }
 
-            \FeatherBB\AdminUtils::generateAdminMenu('users');
+            AdminUtils::generateAdminMenu('users');
 
             $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Move users')),
@@ -53,10 +54,10 @@ public function display()
         // Delete multiple users
         if ($this->request->post('delete_users') || $this->request->post('delete_users_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                throw new \FeatherBB\Error(__('No permission'), 403);
+                throw new \FeatherBB\Core\Error(__('No permission'), 403);
             }
 
-            \FeatherBB\AdminUtils::generateAdminMenu('users');
+            AdminUtils::generateAdminMenu('users');
 
             $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Delete users')),
@@ -71,10 +72,10 @@ public function display()
         // Ban multiple users
         if ($this->request->post('ban_users') || $this->request->post('ban_users_comply')) {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-                throw new \FeatherBB\Error(__('No permission'), 403);
+                throw new \FeatherBB\Core\Error(__('No permission'), 403);
             }
 
-            \FeatherBB\AdminUtils::generateAdminMenu('users');
+            AdminUtils::generateAdminMenu('users');
 
             $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users'), __('Bans')),
@@ -126,7 +127,7 @@ public function display()
             )->addTemplate('admin/users/find_users.php')->display();
         }
         else {
-            \FeatherBB\AdminUtils::generateAdminMenu('users');
+            AdminUtils::generateAdminMenu('users');
 
             $this->feather->template->setPageInfo(array(
                     'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Users')),
@@ -167,7 +168,7 @@ public function ipstats($id)
     public function showusers($ip)
     {
         if (!@preg_match('%^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$%', $ip) && !@preg_match('%^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$%', $ip)) {
-            throw new \FeatherBB\Error(__('Bad IP message'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad IP message'), 400);
         }
 
         // Fetch user count
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
index ce91f891..b74424ed 100644
--- a/featherbb/Controller/Auth.php
+++ b/featherbb/Controller/Auth.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Auth
@@ -36,7 +36,7 @@ public function login()
             $user = \FeatherBB\Model\Auth::get_user_from_name($form_username);
 
             if (!empty($user->password)) {
-                $form_password_hash = \FeatherBB\Utils::hash($form_password); // Will result in a SHA-1 hash
+                $form_password_hash = Utils::hash($form_password); // Will result in a SHA-1 hash
                 if ($user->password == $form_password_hash) {
                     if ($user->group_id == FEATHER_UNVERIFIED) {
                         \FeatherBB\Model\Auth::update_group($user->id, $this->feather->forum_settings['o_default_user_group']);
@@ -56,7 +56,7 @@ public function login()
                     $this->feather->url->redirect(Url::base(), __('Login redirect'));
                 }
             }
-            throw new \FeatherBB\Error(__('Wrong user/pass').' <a href="'.Url::get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
+            throw new \FeatherBB\Core\Error(__('Wrong user/pass').' <a href="'.Url::get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
         } else {
             $this->feather->template->setPageInfo(array(
                                 'active_page' => 'login',
@@ -72,7 +72,7 @@ public function logout($token)
     {
         $token = $this->feather->hooks->fire('logout_start', $token);
 
-        if ($this->feather->user->is_guest || !isset($token) || $token != \FeatherBB\Utils::hash($this->feather->user->id.\FeatherBB\Utils::hash($this->feather->request->getIp()))) {
+        if ($this->feather->user->is_guest || !isset($token) || $token != Utils::hash($this->feather->user->id.Utils::hash($this->feather->request->getIp()))) {
             $this->feather->url->redirect(Url::get('/'), 'Not logged in');
         }
 
@@ -83,7 +83,7 @@ public function logout($token)
             \FeatherBB\Model\Auth::set_last_visit($this->feather->user->id, $this->feather->user->logged);
         }
 
-        \FeatherBB\Model\Auth::feather_setcookie(1, \FeatherBB\Utils::hash(uniqid(rand(), true)), time() + 31536000);
+        \FeatherBB\Model\Auth::feather_setcookie(1, Utils::hash(uniqid(rand(), true)), time() + 31536000);
         $this->feather->hooks->fire('logout_end');
 
         redirect(Url::base(), __('Logout redirect'));
@@ -99,7 +99,7 @@ public function forget()
             // Validate the email address
             $email = strtolower(Utils::trim($this->feather->request->post('req_email')));
             if (!$this->feather->email->is_valid_email($email)) {
-                throw new \FeatherBB\Error(__('Invalid email'), 400);
+                throw new \FeatherBB\Core\Error(__('Invalid email'), 400);
             }
             $user = \FeatherBB\Model\Auth::get_user_from_email($email);
 
@@ -120,7 +120,7 @@ public function forget()
                 $mail_message = $this->feather->hooks->fire('mail_message_password_forgotten', $mail_message);
 
                 if ($user->last_email_sent != '' && (time() - $user->last_email_sent) < 3600 && (time() - $user->last_email_sent) >= 0) {
-                    throw new \FeatherBB\Error(sprintf(__('Email flood'), intval((3600 - (time() - $user->last_email_sent)) / 60)), 429);
+                    throw new \FeatherBB\Core\Error(sprintf(__('Email flood'), intval((3600 - (time() - $user->last_email_sent)) / 60)), 429);
                 }
 
                 // Generate a new password and a new password activation code
@@ -139,7 +139,7 @@ public function forget()
 
                 $this->feather->url->redirect(Url::get('/'), __('Forget mail').' <a href="mailto:'.Utils::escape($this->feather->forum_settings['o_admin_email']).'">'.Utils::escape($this->feather->forum_settings['o_admin_email']).'</a>.', 200);
             } else {
-                throw new \FeatherBB\Error(__('No email match').' '.Utils::escape($email).'.', 400);
+                throw new \FeatherBB\Core\Error(__('No email match').' '.Utils::escape($email).'.', 400);
             }
         }
 
diff --git a/featherbb/Controller/Delete.php b/featherbb/Controller/Delete.php
index 77de3bb5..47a74a92 100644
--- a/featherbb/Controller/Delete.php
+++ b/featherbb/Controller/Delete.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Delete
 {
@@ -25,7 +25,7 @@ public function __construct()
     public function deletepost($id)
     {
         if ($this->feather->user->g_read_board == '0') {
-            throw new \FeatherBB\Error(__('No view'), 403);
+            throw new \FeatherBB\Core\Error(__('No view'), 403);
         }
 
         // Fetch some informations about the post, the topic and the forum
@@ -47,11 +47,11 @@ public function deletepost($id)
                 $cur_post['poster_id'] != $this->feather->user->id ||
                 $cur_post['closed'] == '1') &&
                 !$is_admmod) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         if ($is_admmod && $this->feather->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         if ($this->feather->request()->isPost()) {
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index 167572b9..6f30bd3c 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Edit
 {
@@ -36,7 +36,7 @@ public function __autoload($class_name)
     public function editpost($id)
     {
         if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Error(__('No view'), 403);
+            throw new \FeatherBB\Core\Error(__('No view'), 403);
         }
 
         // Fetch some informations about the post, the topic and the forum
@@ -55,11 +55,11 @@ public function editpost($id)
 
         // Do we have permission to edit this post?
         if (($this->user->g_edit_posts == '0' || $cur_post['poster_id'] != $this->user->id || $cur_post['closed'] == '1') && !$is_admmod) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         // Start with a clean slate
diff --git a/featherbb/Controller/Help.php b/featherbb/Controller/Help.php
index 55c00654..5294b91b 100644
--- a/featherbb/Controller/Help.php
+++ b/featherbb/Controller/Help.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Help
 {
@@ -32,7 +32,7 @@ public function __autoload($class_name)
     public function display()
     {
         if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Error(__('No view'), 403);
+            throw new \FeatherBB\Core\Error(__('No view'), 403);
         }
 
         $this->feather->template->setPageInfo(array(
diff --git a/featherbb/Controller/Index.php b/featherbb/Controller/Index.php
index ca9b1d86..3c653aa5 100644
--- a/featherbb/Controller/Index.php
+++ b/featherbb/Controller/Index.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Index
 {
@@ -24,7 +24,7 @@ public function __construct()
     public function display()
     {
         if ($this->feather->user->g_read_board == '0') {
-            throw new \FeatherBB\Error(__('No view'), 403);
+            throw new \FeatherBB\Core\Error(__('No view'), 403);
         }
 
         $this->feather->template->setPageInfo(array(
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
index 1cf13de6..7ca848aa 100644
--- a/featherbb/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Install
 {
@@ -30,7 +30,7 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \FeatherBB\Model\install();
-        $this->available_langs = \FeatherBB\Lister::getLangs();
+        $this->available_langs = \FeatherBB\Core\Lister::getLangs();
         $this->feather->template->setStyle('FeatherBB');
     }
 
@@ -95,7 +95,7 @@ public function run()
                 }
 
                 // Validate language
-                if (!in_array($data['default_lang'], \FeatherBB\Lister::getLangs())) {
+                if (!in_array($data['default_lang'], \FeatherBB\Core\Lister::getLangs())) {
                     $this->errors[] = __('Error default language');
                 }
 
diff --git a/featherbb/Controller/Login.php b/featherbb/Controller/Login.php
index feaa8f55..e2594f2a 100644
--- a/featherbb/Controller/Login.php
+++ b/featherbb/Controller/Login.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Login
 {
diff --git a/featherbb/Controller/Misc.php b/featherbb/Controller/Misc.php
index a823e9bd..c318d095 100644
--- a/featherbb/Controller/Misc.php
+++ b/featherbb/Controller/Misc.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Misc
 {
@@ -25,7 +25,7 @@ public function __construct()
     public function rules()
     {
         if ($this->feather->forum_settings['o_rules'] == '0' || ($this->feather->user->is_guest && $this->feather->user->g_read_board == '0' && $this->feather->forum_settings['o_regs_allow'] == '0')) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         $this->feather->template->setPageInfo(array(
@@ -37,7 +37,7 @@ public function rules()
     public function markread()
     {
         if ($this->feather->user->is_guest) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         $this->model->update_last_visit();
@@ -51,7 +51,7 @@ public function markread()
     public function markforumread($id)
     {
         if ($this->feather->user->is_guest) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         $tracked_topics = get_tracked_topics();
@@ -64,7 +64,7 @@ public function markforumread($id)
     public function subscribeforum($id)
     {
         if ($this->feather->user->is_guest) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         $this->model->subscribe_forum($id);
@@ -73,7 +73,7 @@ public function subscribeforum($id)
     public function subscribetopic($id)
     {
         if ($this->feather->user->is_guest) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         $this->model->subscribe_topic($id);
@@ -82,7 +82,7 @@ public function subscribetopic($id)
     public function unsubscribeforum($id)
     {
         if ($this->feather->user->is_guest) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         $this->model->unsubscribe_forum($id);
@@ -91,7 +91,7 @@ public function unsubscribeforum($id)
     public function unsubscribetopic($id)
     {
         if ($this->feather->user->is_guest) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         $this->model->unsubscribe_topic($id);
@@ -100,17 +100,17 @@ public function unsubscribetopic($id)
     public function email($id)
     {
         if ($this->feather->user->is_guest || $this->feather->user->g_send_email == '0') {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         if ($id < 2) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         $mail = $this->model->get_info_mail($id);
 
         if ($mail['email_setting'] == 2 && !$this->feather->user->is_admmod) {
-            throw new \FeatherBB\Error(__('Form email disabled'), 403);
+            throw new \FeatherBB\Core\Error(__('Form email disabled'), 403);
         }
 
 
@@ -131,7 +131,7 @@ public function email($id)
     public function report($id)
     {
         if ($this->feather->user->is_guest) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         if ($this->feather->request()->isPost()) {
diff --git a/featherbb/Controller/Moderate.php b/featherbb/Controller/Moderate.php
index b6531167..e251488b 100644
--- a/featherbb/Controller/Moderate.php
+++ b/featherbb/Controller/Moderate.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Moderate
 {
@@ -36,7 +36,7 @@ public function __autoload($class_name)
     public function gethostpost($pid)
     {
         if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Error(__('No view'), 403);
+            throw new \FeatherBB\Core\Error(__('No view'), 403);
         }
 
         $this->model->display_ip_address_post($pid);
@@ -45,7 +45,7 @@ public function gethostpost($pid)
     public function gethostip($ip)
     {
         if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Error(__('No view'), 403);
+            throw new \FeatherBB\Core\Error(__('No view'), 403);
         }
 
         $this->model->display_ip_info($ip);
@@ -54,7 +54,7 @@ public function gethostip($ip)
     public function moderatetopic($id = null, $fid = null, $action = null, $param = null)
     {
         if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Error(__('No view'), 403);
+            throw new \FeatherBB\Core\Error(__('No view'), 403);
         }
 
         if ($action == 'get_host') {
@@ -66,7 +66,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         // Move one topic
@@ -77,7 +77,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                throw new \FeatherBB\Error(__('No topics selected'), 400);
+                throw new \FeatherBB\Core\Error(__('No topics selected'), 400);
             }
 
             $topics = implode(',', array_map('intval', array_keys($topics)));
@@ -216,7 +216,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
     public function display($id, $name = null, $page = null)
     {
         if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Error(__('No view'), 403);
+            throw new \FeatherBB\Core\Error(__('No view'), 403);
         }
 
         // Make sure that only admmods allowed access this page
@@ -224,7 +224,7 @@ public function display($id, $name = null, $page = null)
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         // Fetch some info about the forum
@@ -232,7 +232,7 @@ public function display($id, $name = null, $page = null)
 
         // Is this a redirect forum? In that case, abort!
         if ($cur_forum['redirect_url'] != '') {
-            throw new \FeatherBB\Error(__('Bad request'), '404');
+            throw new \FeatherBB\Core\Error(__('Bad request'), '404');
         }
 
         $sort_by = $this->model->forum_sort_by($cur_forum['sort_by']);
@@ -262,7 +262,7 @@ public function display($id, $name = null, $page = null)
     public function dealposts($fid)
     {
         if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Error(__('No view'), 403);
+            throw new \FeatherBB\Core\Error(__('No view'), 403);
         }
 
         // Make sure that only admmods allowed access this page
@@ -270,7 +270,7 @@ public function dealposts($fid)
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         // Move one or more topics
@@ -281,7 +281,7 @@ public function dealposts($fid)
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                throw new \FeatherBB\Error(__('No topics selected'), 400);
+                throw new \FeatherBB\Core\Error(__('No topics selected'), 400);
             }
 
             // Check if there are enough forums to move the topic
@@ -306,7 +306,7 @@ public function dealposts($fid)
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (count($topics) < 2) {
-                throw new \FeatherBB\Error(__('Not enough topics selected'), 400);
+                throw new \FeatherBB\Core\Error(__('Not enough topics selected'), 400);
             }
 
             $this->feather->template->setPageInfo(array(
@@ -322,7 +322,7 @@ public function dealposts($fid)
         elseif ($this->request->post('delete_topics') || $this->request->post('delete_topics_comply')) {
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                throw new \FeatherBB\Error(__('No topics selected'), 400);
+                throw new \FeatherBB\Core\Error(__('No topics selected'), 400);
             }
 
             if ($this->request->post('delete_topics_comply')) {
@@ -347,7 +347,7 @@ public function dealposts($fid)
             if ($this->request->post('open') || $this->request->post('close')) {
                 $topics = $this->request->post('topics') ? @array_map('intval', @array_keys($this->request->post('topics'))) : array();
                 if (empty($topics)) {
-                    throw new \FeatherBB\Error(__('No topics selected'), 400);
+                    throw new \FeatherBB\Core\Error(__('No topics selected'), 400);
                 }
 
                 $this->model->close_multiple_topics($action, $topics, $fid);
diff --git a/featherbb/Controller/Post.php b/featherbb/Controller/Post.php
index ae621805..ae386d79 100644
--- a/featherbb/Controller/Post.php
+++ b/featherbb/Controller/Post.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Post
 {
@@ -38,7 +38,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // If $_POST['username'] is filled, we are facing a bot
         if ($this->feather->request->post('username')) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         // Fetch some info about the topic and/or the forum
@@ -48,7 +48,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // Is someone trying to post into a redirect forum?
         if ($cur_posting['redirect_url'] != '') {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
@@ -60,7 +60,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
                 ($fid && (($cur_posting['post_topics'] == '' && $this->feather->user->g_post_topics == '0') || $cur_posting['post_topics'] == '0')) ||
                 (isset($cur_posting['closed']) && $cur_posting['closed'] == '1')) &&
                 !$is_admmod) {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         // Start with a clean slate
@@ -145,7 +145,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
             $action = __('Post new topic');
             $form = '<form id="post" method="post" action="'.Url::get('post/new-topic/'.$fid.'/').'" onsubmit="return process_form(this)">';
         } else {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         $url_forum = Url::url_friendly($cur_posting['forum_name']);
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
index 99e0029b..633db9d3 100644
--- a/featherbb/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Profile
 {
@@ -43,25 +43,25 @@ public function display($id, $section = null)
 
         if ($this->request->post('update_group_membership')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                throw new \FeatherBB\Error(__('No permission'), 403);
+                throw new \FeatherBB\Core\Error(__('No permission'), 403);
             }
 
             $this->model->update_group_membership($id, $this->feather);
         } elseif ($this->request->post('update_forums')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                throw new \FeatherBB\Error(__('No permission'), 403);
+                throw new \FeatherBB\Core\Error(__('No permission'), 403);
             }
 
             $this->model->update_mod_forums($id, $this->feather);
         } elseif ($this->request->post('ban')) {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-                throw new \FeatherBB\Error(__('No permission'), 403);
+                throw new \FeatherBB\Core\Error(__('No permission'), 403);
             }
 
             $this->model->ban_user($id);
         } elseif ($this->request->post('delete_user') || $this->request->post('delete_user_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                throw new \FeatherBB\Error(__('No permission'), 403);
+                throw new \FeatherBB\Core\Error(__('No permission'), 403);
             }
 
             $this->model->delete_user($id, $this->feather);
@@ -87,7 +87,7 @@ public function display($id, $section = null)
                                     ($this->user->g_mod_edit_users == '0' ||                         // mods aren't allowed to edit users
                                     $info['group_id'] == FEATHER_ADMIN ||                            // or the user is an admin
                                     $info['is_moderator'])))) {                                      // or the user is another mod
-                                    throw new \FeatherBB\Error(__('No permission'), 403);
+                                    throw new \FeatherBB\Core\Error(__('No permission'), 403);
             }
 
             $this->model->update_profile($id, $info, $section, $this->feather);
@@ -166,7 +166,7 @@ public function display($id, $section = null)
 
             } elseif ($section == 'personality') {
                 if ($this->config['o_avatars'] == '0' && $this->config['o_signatures'] == '0') {
-                    throw new \FeatherBB\Error(__('Bad request'), 404);
+                    throw new \FeatherBB\Core\Error(__('Bad request'), 404);
                 }
 
                 $avatar_field = '<span><a href="'.Url::get('user/'.$id.'/action/upload_avatar/').'">'.__('Change avatar').'</a></span>';
@@ -224,7 +224,7 @@ public function display($id, $section = null)
             } elseif ($section == 'admin') {
 
                 if (!$this->user->is_admmod || ($this->user->g_moderator == '1' && $this->user->g_mod_ban_users == '0')) {
-                    throw new \FeatherBB\Error(__('Bad request'), 404);
+                    throw new \FeatherBB\Core\Error(__('Bad request'), 404);
                 }
 
                 $this->feather->template->setPageInfo(array(
@@ -239,7 +239,7 @@ public function display($id, $section = null)
 
                 $this->feather->template->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_admin.php')->display();
             } else {
-                throw new \FeatherBB\Error(__('Bad request'), 404);
+                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
             }
         }
     }
@@ -253,9 +253,9 @@ public function action($id, $action)
 
         if ($action != 'change_pass' || !$this->request->get('key')) {
             if ($this->user->g_read_board == '0') {
-                throw new \FeatherBB\Error(__('No view'), 403);
+                throw new \FeatherBB\Core\Error(__('No view'), 403);
             } elseif ($this->user->g_view_users == '0' && ($this->user->is_guest || $this->user->id != $id)) {
-                throw new \FeatherBB\Error(__('No permission'), 403);
+                throw new \FeatherBB\Core\Error(__('No permission'), 403);
             }
         }
 
@@ -287,11 +287,11 @@ public function action($id, $action)
 
         } elseif ($action == 'upload_avatar' || $action == 'upload_avatar2') {
             if ($this->config['o_avatars'] == '0') {
-                throw new \FeatherBB\Error(__('Avatars disabled'), 400);
+                throw new \FeatherBB\Core\Error(__('Avatars disabled'), 400);
             }
 
             if ($this->user->id != $id && !$this->user->is_admmod) {
-                throw new \FeatherBB\Error(__('No permission'), 403);
+                throw new \FeatherBB\Core\Error(__('No permission'), 403);
             }
 
             if ($this->feather->request()->isPost()) {
@@ -310,7 +310,7 @@ public function action($id, $action)
 
         } elseif ($action == 'delete_avatar') {
             if ($this->user->id != $id && !$this->user->is_admmod) {
-                throw new \FeatherBB\Error(__('No permission'), 403);
+                throw new \FeatherBB\Core\Error(__('No permission'), 403);
             }
 
             $this->model->delete_avatar($id);
@@ -318,12 +318,12 @@ public function action($id, $action)
             redirect(Url::get('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
         } elseif ($action == 'promote') {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_promote_users == '0')) {
-                throw new \FeatherBB\Error(__('No permission'), 403);
+                throw new \FeatherBB\Core\Error(__('No permission'), 403);
             }
 
             $this->model->promote_user($id, $this->feather);
         } else {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
     }
 }
diff --git a/featherbb/Controller/Register.php b/featherbb/Controller/Register.php
index 4cc0ec70..dd94b107 100644
--- a/featherbb/Controller/Register.php
+++ b/featherbb/Controller/Register.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Register
 {
@@ -46,7 +46,7 @@ public function display()
         // Display an error message if new registrations are disabled
         // If $_REQUEST['username'] or $_REQUEST['password'] are filled, we are facing a bot
         if ($this->config['o_regs_allow'] == '0' || $this->request->post('username') || $this->request->post('password')) {
-            throw new \FeatherBB\Error(__('No new regs'), 403);
+            throw new \FeatherBB\Core\Error(__('No new regs'), 403);
         }
 
         $user['timezone'] = isset($user['timezone']) ? $user['timezone'] : $this->config['o_default_timezone'];
@@ -71,7 +71,7 @@ public function display()
                         'is_indexed' => true,
                         'errors' => $user['errors'],
                         'index_questions'    =>    $index_questions,
-                        'languages' => \FeatherBB\Lister::getLangs(),
+                        'languages' => \FeatherBB\Core\Lister::getLangs(),
                         'question' => array_keys($lang_antispam_questions),
                         'qencoded' => md5(array_keys($lang_antispam_questions)[$index_questions]),
                             )
@@ -95,7 +95,7 @@ public function rules()
 
         // Display an error message if new registrations are disabled
         if ($this->config['o_regs_allow'] == '0') {
-            throw new \FeatherBB\Error(__('No new regs'), 403);
+            throw new \FeatherBB\Core\Error(__('No new regs'), 403);
         }
 
         if ($this->config['o_rules'] != '1') {
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index 4914e977..d3d85aad 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Search
 {
@@ -35,9 +35,9 @@ public function __autoload($class_name)
     public function display()
     {
         if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Error(__('No view'), 403);
+            throw new \FeatherBB\Core\Error(__('No view'), 403);
         } elseif ($this->user->g_search == '0') {
-            throw new \FeatherBB\Error(__('No search permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No search permission'), 403);
         }
 
         // Figure out what to do :-)
diff --git a/featherbb/Controller/Userlist.php b/featherbb/Controller/Userlist.php
index 382ee614..60542e60 100644
--- a/featherbb/Controller/Userlist.php
+++ b/featherbb/Controller/Userlist.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Userlist
 {
@@ -25,9 +25,9 @@ public function __construct()
     public function display()
     {
         if ($this->feather->user->g_read_board == '0') {
-            throw new \FeatherBB\Error(__('No view'), 403);
+            throw new \FeatherBB\Core\Error(__('No view'), 403);
         } elseif ($this->feather->user->g_view_users == '0') {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         // Determine if we are allowed to view post counts
diff --git a/featherbb/Controller/Viewforum.php b/featherbb/Controller/Viewforum.php
index 0bd72b46..3e17d20a 100644
--- a/featherbb/Controller/Viewforum.php
+++ b/featherbb/Controller/Viewforum.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Viewforum
 {
@@ -29,11 +29,11 @@ public function __autoload($class_name)
     public function display($id, $name = null, $page = null)
     {
         if ($this->feather->user->g_read_board == '0') {
-            throw new \FeatherBB\Error(__('No view'), 403);
+            throw new \FeatherBB\Core\Error(__('No view'), 403);
         }
 
         if ($id < 1) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         // Fetch some informations about the forum
diff --git a/featherbb/Controller/Viewtopic.php b/featherbb/Controller/Viewtopic.php
index cad0c8fe..73b3efb2 100644
--- a/featherbb/Controller/Viewtopic.php
+++ b/featherbb/Controller/Viewtopic.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Viewtopic
 {
@@ -26,7 +26,7 @@ public function __construct()
     public function display($id = null, $name = null, $page = null, $pid = null)
     {
         if ($this->feather->user->g_read_board == '0') {
-            throw new \FeatherBB\Error(__('No view'), 403);
+            throw new \FeatherBB\Core\Error(__('No view'), 403);
         }
 
         // Antispam feature
diff --git a/featherbb/Core/AdminUtils.php b/featherbb/Core/AdminUtils.php
index 3f775741..615c0b19 100644
--- a/featherbb/Core/AdminUtils.php
+++ b/featherbb/Core/AdminUtils.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace FeatherBB;
+namespace FeatherBB\Core;
 
 class AdminUtils
 {
diff --git a/featherbb/Core/Cache.php b/featherbb/Core/Cache.php
index 98647dc7..d141dd20 100644
--- a/featherbb/Core/Cache.php
+++ b/featherbb/Core/Cache.php
@@ -10,7 +10,7 @@
 * Usage : $cache = new \FeatherBB\Cache(array('name' => , 'path' =>, 'extension' =>));
 */
 
-namespace FeatherBB;
+namespace FeatherBB\Core;
 
 class Cache
 {
diff --git a/featherbb/Core/Email.php b/featherbb/Core/Email.php
index 9eddb87a..af13c832 100644
--- a/featherbb/Core/Email.php
+++ b/featherbb/Core/Email.php
@@ -7,10 +7,10 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace FeatherBB;
+namespace FeatherBB\Core;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Email
 {
@@ -311,12 +311,12 @@ public function server_parse($socket, $expected_response)
         $server_response = '';
         while (substr($server_response, 3, 1) != ' ') {
             if (!($server_response = fgets($socket, 256))) {
-                throw new \FeatherBB\Error('Couldn\'t get mail server response codes. Please contact the forum administrator.', 500);
+                throw new \FeatherBB\Core\Error('Couldn\'t get mail server response codes. Please contact the forum administrator.', 500);
             }
         }
 
         if (!(substr($server_response, 0, 3) == $expected_response)) {
-            throw new \FeatherBB\Error('Unable to send email. Please contact the forum administrator with the following error message reported by the SMTP server: "' . $server_response . '"', 500);
+            throw new \FeatherBB\Core\Error('Unable to send email. Please contact the forum administrator with the following error message reported by the SMTP server: "' . $server_response . '"', 500);
         }
     }
 
@@ -348,7 +348,7 @@ public function smtp_mail($to, $subject, $message, $headers = '')
         }
 
         if (!($socket = fsockopen($smtp_host, $smtp_port, $errno, $errstr, 15))) {
-            throw new \FeatherBB\Error('Could not connect to smtp host "' . $this->config['o_smtp_host'] . '" (' . $errno . ') (' . $errstr . ')', 500);
+            throw new \FeatherBB\Core\Error('Could not connect to smtp host "' . $this->config['o_smtp_host'] . '" (' . $errno . ') (' . $errstr . ')', 500);
         }
 
         $this->server_parse($socket, '220');
diff --git a/featherbb/Core/Error.php b/featherbb/Core/Error.php
index 05281dba..984c3d8b 100644
--- a/featherbb/Core/Error.php
+++ b/featherbb/Core/Error.php
@@ -7,7 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace FeatherBB;
+namespace FeatherBB\Core;
+
+use \FeatherBB\Core\Utils;
 
 class Error extends \Exception
 {
@@ -34,7 +36,7 @@ protected function error($msg, $http_status = null, $no_back_link)
 
         if (!defined('FEATHER_HEADER')) {
             $this->feather->template->setPageInfo(array(
-                'title' => array(\FeatherBB\Utils::escape($this->feather->config['o_board_title']), __('Info')),
+                'title' => array(Utils::escape($this->feather->config['o_board_title']), __('Info')),
             ));
         }
 
diff --git a/featherbb/Core/Hooks.php b/featherbb/Core/Hooks.php
index 8cefd9b4..6c4a3a9d 100644
--- a/featherbb/Core/Hooks.php
+++ b/featherbb/Core/Hooks.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace FeatherBB;
+namespace FeatherBB\Core;
 
 class Hooks extends \Slim\Slim
 {
@@ -155,4 +155,4 @@ public function clearHooks($name = null)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/featherbb/Core/Lister.php b/featherbb/Core/Lister.php
index 2e879a7b..dbf39c4a 100644
--- a/featherbb/Core/Lister.php
+++ b/featherbb/Core/Lister.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace FeatherBB;
+namespace FeatherBB\Core;
 
 class Lister
 {
@@ -47,7 +47,7 @@ public static function getValidPlugins($folder = '')
             $relative_path = DIRECTORY_SEPARATOR.preg_replace("/" . preg_quote($feather_root, "/") . "/", '', $file_path);
             preg_match('/^(.+)\.php$/i', $relative_path, $class_name);
             $parts = explode(DIRECTORY_SEPARATOR, $class_name[1]);
-            $parts[1] = ucfirst($parts[1]); // Replace \plugins to \Plugins for convention
+            $parts[1] = ucfirst($parts[1]); // Replace \plugins to \Core\Plugins for convention
             $name_space = join($parts, "\\");
             // Check if plugin follows PSR-4 conventions and extends base forum plugin
             if (class_exists($name_space) && property_exists($name_space, 'isValidFBPlugin')) {
diff --git a/featherbb/Core/Plugin.php b/featherbb/Core/Plugin.php
index 2a74e4b6..2b2d186f 100644
--- a/featherbb/Core/Plugin.php
+++ b/featherbb/Core/Plugin.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher.
  */
 
-namespace FeatherBB;
+namespace FeatherBB\Core;
 
 use DB;
 
diff --git a/featherbb/Core/Search.php b/featherbb/Core/Search.php
index f6c0365b..28d3f33a 100644
--- a/featherbb/Core/Search.php
+++ b/featherbb/Core/Search.php
@@ -10,8 +10,10 @@
 // The contents of this file are very much inspired by the file functions_search.php
 // from the phpBB Group forum software phpBB2 (http://www.phpbb.com)
 
-namespace FeatherBB;
+namespace FeatherBB\Core;
+
 use DB;
+use \FeatherBB\Core\Utils;
 
 class Search
 {
@@ -351,4 +353,4 @@ public function strip_search_index($post_ids)
                     ->delete_many();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/featherbb/Core/Url.php b/featherbb/Core/Url.php
index cbd5493b..f72eed75 100644
--- a/featherbb/Core/Url.php
+++ b/featherbb/Core/Url.php
@@ -7,9 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace FeatherBB;
+namespace FeatherBB\Core;
 
-use FeatherBB\Utils;
+use FeatherBB\Core\Utils;
 
 class Url
 {
diff --git a/featherbb/Core/Utils.php b/featherbb/Core/Utils.php
index 8593e25d..938f8926 100644
--- a/featherbb/Core/Utils.php
+++ b/featherbb/Core/Utils.php
@@ -7,7 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace FeatherBB;
+namespace FeatherBB\Core;
 
 class Utils
 {
@@ -32,7 +32,7 @@ public static function get_microtime()
     // charset up until version 5.5.3 (where a special charset has to be used), they
     // need to be replaced, by question marks in this case.
     //
-    public function strip_bad_multibyte_chars($str)
+    public static function strip_bad_multibyte_chars($str)
     {
         $result = '';
         $length = self::strlen($str);
diff --git a/featherbb/Core/View.php b/featherbb/Core/View.php
index 99c70fef..54964107 100644
--- a/featherbb/Core/View.php
+++ b/featherbb/Core/View.php
@@ -7,10 +7,10 @@
 * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
 */
 
-namespace FeatherBB;
+namespace FeatherBB\Core;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class View
 {
diff --git a/featherbb/Helpers/functions.php b/featherbb/Helpers/functions.php
index 54867514..099abb9b 100644
--- a/featherbb/Helpers/functions.php
+++ b/featherbb/Helpers/functions.php
@@ -40,9 +40,9 @@ function check_username($username, $errors, $exclude_id = null)
     $username = preg_replace('%\s+%s', ' ', $username);
 
     // Validate username
-    if (\FeatherBB\Utils::strlen($username) < 2) {
+    if (\FeatherBB\Core\Utils::strlen($username) < 2) {
         $errors[] = __('Username too short');
-    } elseif (\FeatherBB\Utils::strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
+    } elseif (\FeatherBB\Core\Utils::strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
         $errors[] = __('Username too long');
     } elseif (!strcasecmp($username, 'Guest') || !utf8_strcasecmp($username, __('Guest'))) {
         $errors[] = __('Username guest');
@@ -62,11 +62,11 @@ function check_username($username, $errors, $exclude_id = null)
     // Check that the username (or a too similar username) is not already registered
     $query = (!is_null($exclude_id)) ? ' AND id!='.$exclude_id : '';
 
-    $result = \DB::for_table('online')->raw_query('SELECT username FROM '.$feather->forum_settings['db_prefix'].'users WHERE (UPPER(username)=UPPER(:username1) OR UPPER(username)=UPPER(:username2)) AND id>1'.$query, array(':username1' => $username, ':username2' => \FeatherBB\Utils::ucp_preg_replace('%[^\p{L}\p{N}]%u', '', $username)))->find_one();
+    $result = \DB::for_table('online')->raw_query('SELECT username FROM '.$feather->forum_settings['db_prefix'].'users WHERE (UPPER(username)=UPPER(:username1) OR UPPER(username)=UPPER(:username2)) AND id>1'.$query, array(':username1' => $username, ':username2' => \FeatherBB\Core\Utils::ucp_preg_replace('%[^\p{L}\p{N}]%u', '', $username)))->find_one();
 
     if ($result) {
         $busy = $result['username'];
-        $errors[] = __('Username dupe 1').' '.\FeatherBB\Utils::escape($busy).'. '.__('Username dupe 2');
+        $errors[] = __('Username dupe 1').' '.\FeatherBB\Core\Utils::escape($busy).'. '.__('Username dupe 2');
     }
 
     // Check username for any banned usernames
@@ -95,7 +95,7 @@ function generate_avatar_markup($user_id)
         $path = $feather->config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type;
 
         if (file_exists(FEATHER_ROOT.$path) && $img_size = getimagesize(FEATHER_ROOT.$path)) {
-            $avatar_markup = '<img src="'.\FeatherBB\Utils::escape($feather->url->base(true).'/'.$path.'?m='.filemtime(FEATHER_ROOT.$path)).'" '.$img_size[3].' alt="" />';
+            $avatar_markup = '<img src="'.\FeatherBB\Core\Utils::escape($feather->url->base(true).'/'.$path.'?m='.filemtime(FEATHER_ROOT.$path)).'" '.$img_size[3].' alt="" />';
             break;
         }
     }
@@ -118,7 +118,7 @@ function generate_page_title($page_title, $p = null)
     $page_title = array_reverse($page_title);
 
     if ($p > 1) {
-        $page_title[0] .= ' ('.sprintf(__('Page'), \FeatherBB\Utils::forum_number_format($p)).')';
+        $page_title[0] .= ' ('.sprintf(__('Page'), \FeatherBB\Core\Utils::forum_number_format($p)).')';
     }
 
     $crumbs = implode(__('Title separator'), $page_title);
@@ -296,7 +296,7 @@ function delete_post($post_id, $topic_id)
         ->find_one()
         ->delete();
 
-    $search = new \FeatherBB\Search();
+    $search = new \FeatherBB\Core\Search();
 
     $search->strip_search_index($post_id);
 
@@ -360,7 +360,7 @@ function censor_words($text)
     }
 
     if (!empty($search_for) && !empty($replace_with)) {
-        return substr(\FeatherBB\Utils::ucp_preg_replace($search_for, $replace_with, ' '.$text.' '), 1, -1);
+        return substr(\FeatherBB\Core\Utils::ucp_preg_replace($search_for, $replace_with, ' '.$text.' '), 1, -1);
     } else {
         return $text;
     }
@@ -386,7 +386,7 @@ function get_title($user)
 
     // If the user has a custom title
     if ($user['title'] != '') {
-        $user_title = \FeatherBB\Utils::escape($user['title']);
+        $user_title = \FeatherBB\Core\Utils::escape($user['title']);
     }
     // If the user is banned
     elseif (in_array(utf8_strtolower($user['username']), $ban_list)) {
@@ -394,7 +394,7 @@ function get_title($user)
     }
     // If the user group has a default user title
     elseif ($user['g_user_title'] != '') {
-        $user_title = \FeatherBB\Utils::escape($user['g_user_title']);
+        $user_title = \FeatherBB\Core\Utils::escape($user['g_user_title']);
     }
     // If the user is a guest
     elseif ($user['g_id'] == FEATHER_GUEST) {
diff --git a/featherbb/Middleware/Auth.php b/featherbb/Middleware/Auth.php
index 252f15aa..0932e19e 100644
--- a/featherbb/Middleware/Auth.php
+++ b/featherbb/Middleware/Auth.php
@@ -13,8 +13,8 @@
 
 namespace FeatherBB\Middleware;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Auth extends \Slim\Middleware
@@ -180,7 +180,7 @@ public function check_bans()
                 \DB::for_table('online')
                     ->where('ident', $this->app->user->username)
                     ->delete_many();
-                throw new \FeatherBB\Error(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower($this->app->utils->format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.Utils::escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.Utils::escape($this->app->forum_settings['o_admin_email']).'">'.Utils::escape($this->app->forum_settings['o_admin_email']).'</a>.', 403);
+                throw new \FeatherBB\Core\Error(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower($this->app->utils->format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.Utils::escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.Utils::escape($this->app->forum_settings['o_admin_email']).'">'.Utils::escape($this->app->forum_settings['o_admin_email']).'</a>.', 403);
             }
         }
 
@@ -267,7 +267,7 @@ public function call()
                      ->update_many('logged', time());
             }
 
-            $this->model->feather_setcookie(1, \FeatherBB\Utils::hash(uniqid(rand(), true)), $this->app->now + 31536000);
+            $this->model->feather_setcookie(1, \FeatherBB\Core\Utils::hash(uniqid(rand(), true)), $this->app->now + 31536000);
         }
 
         load_textdomain('featherbb', $this->app->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->app->user->language.'/common.mo');
diff --git a/featherbb/Middleware/Core.php b/featherbb/Middleware/Core.php
index 9b4905c8..65adf69c 100644
--- a/featherbb/Middleware/Core.php
+++ b/featherbb/Middleware/Core.php
@@ -12,7 +12,9 @@
  */
 
 namespace FeatherBB\Middleware;
+
 use DB;
+use FeatherBB\Core\Utils;
 
 class Core extends \Slim\Middleware
 {
@@ -178,7 +180,7 @@ public function call()
         $this->hydrate('forum_env', $this->forum_env);
         // Load FeatherBB utils class
         $this->app->container->singleton('utils', function () {
-            return new \FeatherBB\Utils();
+            return new Utils();
         });
         // Record start time
         $this->app->start = Utils::get_microtime();
@@ -189,25 +191,25 @@ public function call()
         // Load FeatherBB cache
         $this->app->container->singleton('cache', function ($container) {
             $path = $container->forum_env['FORUM_CACHE_DIR'];
-            return new \FeatherBB\Cache(array('name' => 'feather',
+            return new \FeatherBB\Core\Cache(array('name' => 'feather',
                                                'path' => $path,
                                                'extension' => '.cache'));
         });
         // Load FeatherBB view
         $this->app->container->singleton('template', function() {
-            return new \FeatherBB\View();
+            return new \FeatherBB\Core\View();
         });
         // Load FeatherBB url class
         $this->app->container->singleton('url', function () {
-            return new \FeatherBB\Url();
+            return new \FeatherBB\Core\Url();
         });
         // Load FeatherBB hooks
         $this->app->container->singleton('hooks', function () {
-            return new \FeatherBB\Hooks();
+            return new \FeatherBB\Core\Hooks();
         });
         // Load FeatherBB email class
         $this->app->container->singleton('email', function () {
-            return new \FeatherBB\Email();
+            return new \FeatherBB\Core\Email();
         });
 
         // TODO: move parser to autoload
@@ -257,7 +259,7 @@ public function call()
         extract($this->forum_settings); // Legacy
 
         // Run hooks of activated plugins
-        \FeatherBB\Plugin::runActivePlugins();
+        \FeatherBB\Core\Plugin::runActivePlugins();
 
         // Define time formats
         $forum_time_formats = array($this->forum_settings['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
diff --git a/featherbb/Model/Admin/Bans.php b/featherbb/Model/Admin/Bans.php
index a5908687..9e380167 100644
--- a/featherbb/Model/Admin/Bans.php
+++ b/featherbb/Model/Admin/Bans.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Bans
@@ -36,7 +36,7 @@ public function add_ban_info($id = null)
         if (is_numeric($id)) {
             $ban['user_id'] = $id;
             if ($ban['user_id'] < 2) {
-                throw new \FeatherBB\Error(__('Bad request'), 404);
+                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
             }
 
             $select_add_ban_info = array('group_id', 'username', 'email');
@@ -51,7 +51,7 @@ public function add_ban_info($id = null)
                 $ban['ban_user'] = $result['username'];
                 $ban['email'] = $result['email'];
             } else {
-                throw new \FeatherBB\Error(__('No user ID message'), 404);
+                throw new \FeatherBB\Core\Error(__('No user ID message'), 404);
             }
         } else {
             // Otherwise the username is in POST
@@ -73,7 +73,7 @@ public function add_ban_info($id = null)
                     $ban['ban_user'] = $result['username'];
                     $ban['email'] = $result['email'];
                 } else {
-                    throw new \FeatherBB\Error(__('No user message'), 404);
+                    throw new \FeatherBB\Core\Error(__('No user message'), 404);
                 }
             }
         }
@@ -81,14 +81,14 @@ public function add_ban_info($id = null)
         // Make sure we're not banning an admin or moderator
         if (isset($group_id)) {
             if ($group_id == FEATHER_ADMIN) {
-                throw new \FeatherBB\Error(sprintf(__('User is admin message'), Utils::escape($ban['ban_user'])), 403);
+                throw new \FeatherBB\Core\Error(sprintf(__('User is admin message'), Utils::escape($ban['ban_user'])), 403);
             }
 
             $is_moderator_group = DB::for_table('groups')->where('g_id', $group_id)
                                         ->find_one_col('g_moderator');
 
             if ($is_moderator_group) {
-                throw new \FeatherBB\Error(sprintf(__('User is mod message'), Utils::escape($ban['ban_user'])), 403);
+                throw new \FeatherBB\Core\Error(sprintf(__('User is mod message'), Utils::escape($ban['ban_user'])), 403);
             }
         }
 
@@ -133,7 +133,7 @@ public function edit_ban_info($id)
             $ban['message'] = $result['message'];
             $ban['expire'] = $result['expire'];
         } else {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         $diff = ($this->user->timezone + $this->user->dst) * 3600;
@@ -157,9 +157,9 @@ public function insert_ban()
         $this->hook->fire('insert_ban_start', $ban_user, $ban_ip, $ban_email, $ban_message, $ban_expire);
 
         if ($ban_user == '' && $ban_ip == '' && $ban_email == '') {
-            throw new \FeatherBB\Error(__('Must enter message'), 400);
+            throw new \FeatherBB\Core\Error(__('Must enter message'), 400);
         } elseif (strtolower($ban_user) == 'guest') {
-            throw new \FeatherBB\Error(__('Cannot ban guest message'), 400);
+            throw new \FeatherBB\Core\Error(__('Cannot ban guest message'), 400);
         }
 
         // Make sure we're not banning an admin or moderator
@@ -170,14 +170,14 @@ public function insert_ban()
 
             if ($group_id) {
                 if ($group_id == FEATHER_ADMIN) {
-                    throw new \FeatherBB\Error(sprintf(__('User is admin message'), Utils::escape($ban_user)), 403);
+                    throw new \FeatherBB\Core\Error(sprintf(__('User is admin message'), Utils::escape($ban_user)), 403);
                 }
 
                 $is_moderator_group = DB::for_table('groups')->where('g_id', $group_id)
                                             ->find_one_col('g_moderator');
 
                 if ($is_moderator_group) {
-                    throw new \FeatherBB\Error(sprintf(__('User is mod message'), Utils::escape($ban_user)), 403);
+                    throw new \FeatherBB\Core\Error(sprintf(__('User is mod message'), Utils::escape($ban_user)), 403);
                 }
             }
         }
@@ -196,7 +196,7 @@ public function insert_ban()
                         $octets[$c] = ltrim($octets[$c], "0");
 
                         if ($c > 7 || (!empty($octets[$c]) && !ctype_xdigit($octets[$c])) || intval($octets[$c], 16) > 65535) {
-                            throw new \FeatherBB\Error(__('Invalid IP message'), 400);
+                            throw new \FeatherBB\Core\Error(__('Invalid IP message'), 400);
                         }
                     }
 
@@ -209,7 +209,7 @@ public function insert_ban()
                         $octets[$c] = (strlen($octets[$c]) > 1) ? ltrim($octets[$c], "0") : $octets[$c];
 
                         if ($c > 3 || preg_match('%[^0-9]%', $octets[$c]) || intval($octets[$c]) > 255) {
-                            throw new \FeatherBB\Error(__('Invalid IP message'), 400);
+                            throw new \FeatherBB\Core\Error(__('Invalid IP message'), 400);
                         }
                     }
 
@@ -223,7 +223,7 @@ public function insert_ban()
 
         if ($ban_email != '' && !$this->email->is_valid_email($ban_email)) {
             if (!preg_match('%^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,63})$%', $ban_email)) {
-                throw new \FeatherBB\Error(__('Invalid e-mail message'), 400);
+                throw new \FeatherBB\Core\Error(__('Invalid e-mail message'), 400);
             }
         }
 
@@ -231,14 +231,14 @@ public function insert_ban()
             $ban_expire = strtotime($ban_expire.' GMT');
 
             if ($ban_expire == -1 || !$ban_expire) {
-                throw new \FeatherBB\Error(__('Invalid date message').' '.__('Invalid date reasons'), 400);
+                throw new \FeatherBB\Core\Error(__('Invalid date message').' '.__('Invalid date reasons'), 400);
             }
 
             $diff = ($this->user->timezone + $this->user->dst) * 3600;
             $ban_expire -= $diff;
 
             if ($ban_expire <= time()) {
-                throw new \FeatherBB\Error(__('Invalid date message').' '.__('Invalid date reasons'), 400);
+                throw new \FeatherBB\Core\Error(__('Invalid date message').' '.__('Invalid date reasons'), 400);
             }
         } else {
             $ban_expire = 'NULL';
@@ -323,7 +323,7 @@ public function find_ban($start_from = false)
 
             $expire_after = strtotime($expire_after);
             if ($expire_after === false || $expire_after == -1) {
-                throw new \FeatherBB\Error(__('Invalid date message'), 400);
+                throw new \FeatherBB\Core\Error(__('Invalid date message'), 400);
             }
 
             $result = $result->where_gt('b.expire', $expire_after);
@@ -333,7 +333,7 @@ public function find_ban($start_from = false)
 
             $expire_before = strtotime($expire_before);
             if ($expire_before === false || $expire_before == -1) {
-                throw new \FeatherBB\Error(__('Invalid date message'), 400);
+                throw new \FeatherBB\Core\Error(__('Invalid date message'), 400);
             }
 
             $result = $result->where_lt('b.expire', $expire_before);
diff --git a/featherbb/Model/Admin/Categories.php b/featherbb/Model/Admin/Categories.php
index 05bab0db..013eb599 100644
--- a/featherbb/Model/Admin/Categories.php
+++ b/featherbb/Model/Admin/Categories.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Categories
diff --git a/featherbb/Model/Admin/Censoring.php b/featherbb/Model/Admin/Censoring.php
index 97df6a01..6e2c8f5f 100644
--- a/featherbb/Model/Admin/Censoring.php
+++ b/featherbb/Model/Admin/Censoring.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Censoring
@@ -31,7 +31,7 @@ public function add_word()
         $replace_with = Utils::trim($this->request->post('new_replace_with'));
 
         if ($search_for == '') {
-            throw new \FeatherBB\Error(__('Must enter word message'), 400);
+            throw new \FeatherBB\Core\Error(__('Must enter word message'), 400);
         }
 
         $set_search_word = array('search_for' => $search_for,
@@ -59,7 +59,7 @@ public function update_word()
         $replace_with = Utils::trim($this->request->post('replace_with')[$id]);
 
         if ($search_for == '') {
-            throw new \FeatherBB\Error(__('Must enter word message'), 400);
+            throw new \FeatherBB\Core\Error(__('Must enter word message'), 400);
         }
 
         $set_search_word = array('search_for' => $search_for,
diff --git a/featherbb/Model/Admin/Forums.php b/featherbb/Model/Admin/Forums.php
index d31d4a3b..442f188e 100644
--- a/featherbb/Model/Admin/Forums.php
+++ b/featherbb/Model/Admin/Forums.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Forums
diff --git a/featherbb/Model/Admin/Groups.php b/featherbb/Model/Admin/Groups.php
index 61fefb6b..a1090320 100644
--- a/featherbb/Model/Admin/Groups.php
+++ b/featherbb/Model/Admin/Groups.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Groups
@@ -52,7 +52,7 @@ public function info_add_group($groups, $id)
         } else {
             // We are editing a group
             if (!isset($groups[$id])) {
-                throw new \FeatherBB\Error(__('Bad request'), 404);
+                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
             }
 
             $groups[$id] = $this->hook->fire('update_user_group', $groups[$id]);
@@ -127,7 +127,7 @@ public function add_edit_group($groups)
         // Set group title
         $title = Utils::trim($this->request->post('req_title'));
         if ($title == '') {
-            throw new \FeatherBB\Error(__('Must enter title message'), 400);
+            throw new \FeatherBB\Core\Error(__('Must enter title message'), 400);
         }
         $title = $this->hook->fire('add_edit_group_set_title', $title);
         // Set user title
@@ -203,7 +203,7 @@ public function add_edit_group($groups)
             // Creating a new group
             $title_exists = DB::for_table('groups')->where('g_title', $title)->find_one();
             if ($title_exists) {
-                throw new \FeatherBB\Error(sprintf(__('Title already exists message'), Utils::escape($title)), 400);
+                throw new \FeatherBB\Core\Error(sprintf(__('Title already exists message'), Utils::escape($title)), 400);
             }
 
             DB::for_table('groups')
@@ -238,7 +238,7 @@ public function add_edit_group($groups)
             // We are editing an existing group
             $title_exists = DB::for_table('groups')->where('g_title', $title)->where_not_equal('g_id', $this->request->post('group_id'))->find_one();
             if ($title_exists) {
-                throw new \FeatherBB\Error(sprintf(__('Title already exists message'), Utils::escape($title)), 400);
+                throw new \FeatherBB\Core\Error(sprintf(__('Title already exists message'), Utils::escape($title)), 400);
             }
             DB::for_table('groups')
                     ->find_one($this->request->post('group_id'))
@@ -273,12 +273,12 @@ public function set_default_group($groups)
 
         // Make sure it's not the admin or guest groups
         if ($group_id == FEATHER_ADMIN || $group_id == FEATHER_GUEST) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         // Make sure it's not a moderator group
         if ($groups[$group_id]['g_moderator'] != 0) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         DB::for_table('config')->where('conf_name', 'o_default_user_group')
diff --git a/featherbb/Model/Admin/Maintenance.php b/featherbb/Model/Admin/Maintenance.php
index 70d0bd25..c58eb640 100644
--- a/featherbb/Model/Admin/Maintenance.php
+++ b/featherbb/Model/Admin/Maintenance.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Maintenance
@@ -23,7 +23,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->search = new \FeatherBB\Search();
+        $this->search = new \FeatherBB\Core\Search();
     }
 
     public function rebuild()
@@ -33,7 +33,7 @@ public function rebuild()
 
         // Check per page is > 0
         if ($per_page < 1) {
-            throw new \FeatherBB\Error(__('Posts must be integer message'), 400);
+            throw new \FeatherBB\Core\Error(__('Posts must be integer message'), 400);
         }
 
         @set_time_limit(0);
@@ -222,7 +222,7 @@ public function get_info_prune($prune_sticky, $prune_from)
 
         $prune['days'] = Utils::trim($this->request->post('req_prune_days'));
         if ($prune['days'] == '' || preg_match('%[^0-9]%', $prune['days'])) {
-            throw new \FeatherBB\Error(__('Days must be integer message'), 400);
+            throw new \FeatherBB\Core\Error(__('Days must be integer message'), 400);
         }
 
         $prune['date'] = time() - ($prune['days'] * 86400);
@@ -253,7 +253,7 @@ public function get_info_prune($prune_sticky, $prune_from)
         $prune['num_topics'] = $query->count('id');
 
         if (!$prune['num_topics']) {
-            throw new \FeatherBB\Error(sprintf(__('No old topics message'), $prune['days']), 204);
+            throw new \FeatherBB\Core\Error(sprintf(__('No old topics message'), $prune['days']), 204);
         }
 
         $prune = $this->hook->fire('maintenance.get_info_prune.prune', $prune);
diff --git a/featherbb/Model/Admin/Options.php b/featherbb/Model/Admin/Options.php
index f0d06433..f70ae82c 100644
--- a/featherbb/Model/Admin/Options.php
+++ b/featherbb/Model/Admin/Options.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Options
@@ -93,7 +93,7 @@ public function update_options()
         $form = $this->hook->fire('options.update_options.form', $form);
 
         if ($form['board_title'] == '') {
-            throw new \FeatherBB\Error(__('Must enter title message'), 400);
+            throw new \FeatherBB\Core\Error(__('Must enter title message'), 400);
         }
 
         // Make sure base_url doesn't end with a slash
@@ -104,20 +104,20 @@ public function update_options()
         // Convert IDN to Punycode if needed
         if (preg_match('/[^\x00-\x7F]/', $form['base_url'])) {
             if (!function_exists('idn_to_ascii')) {
-                throw new \FeatherBB\Error(__('Base URL problem'), 400);
+                throw new \FeatherBB\Core\Error(__('Base URL problem'), 400);
             } else {
                 $form['base_url'] = idn_to_ascii($form['base_url']);
             }
         }
 
-        $languages = \FeatherBB\Lister::getLangs();
+        $languages = \FeatherBB\Core\Lister::getLangs();
         if (!in_array($form['default_lang'], $languages)) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
-        $styles = \FeatherBB\Lister::getStyles();
+        $styles = \FeatherBB\Core\Lister::getStyles();
         if (!in_array($form['default_style'], $styles)) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         if ($form['time_format'] == '') {
@@ -129,11 +129,11 @@ public function update_options()
         }
 
         if (!$this->email->is_valid_email($form['admin_email'])) {
-            throw new \FeatherBB\Error(__('Invalid e-mail message'), 400);
+            throw new \FeatherBB\Core\Error(__('Invalid e-mail message'), 400);
         }
 
         if (!$this->email->is_valid_email($form['webmaster_email'])) {
-            throw new \FeatherBB\Error(__('Invalid webmaster e-mail message'), 400);
+            throw new \FeatherBB\Core\Error(__('Invalid webmaster e-mail message'), 400);
         }
 
         if ($form['mailing_list'] != '') {
@@ -157,7 +157,7 @@ public function update_options()
             if ($smtp_pass1 == $smtp_pass2) {
                 $form['smtp_pass'] = $smtp_pass1;
             } else {
-                throw new \FeatherBB\Error(__('SMTP passwords did not match'), 400);
+                throw new \FeatherBB\Core\Error(__('SMTP passwords did not match'), 400);
             }
         }
 
@@ -196,23 +196,23 @@ public function update_options()
         }
 
         if ($form['feed_type'] < 0 || $form['feed_type'] > 2) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         if ($form['feed_ttl'] < 0) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         if ($form['report_method'] < 0 || $form['report_method'] > 2) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         if ($form['default_email_setting'] < 0 || $form['default_email_setting'] > 2) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         if ($form['timeout_online'] >= $form['timeout_visit']) {
-            throw new \FeatherBB\Error(__('Timeout error message'), 400);
+            throw new \FeatherBB\Core\Error(__('Timeout error message'), 400);
         }
 
         foreach ($form as $key => $input) {
@@ -254,7 +254,7 @@ public function clear_feed_cache()
 
     public function get_styles()
     {
-        $styles = \FeatherBB\Lister::getStyles();
+        $styles = \FeatherBB\Core\Lister::getStyles();
         $styles = $this->hook->fire('options.get_styles.styles', $styles);
 
         $output = '';
@@ -273,7 +273,7 @@ public function get_styles()
 
     public function get_langs()
     {
-        $langs = \FeatherBB\Lister::getLangs();
+        $langs = \FeatherBB\Core\Lister::getLangs();
         $langs = $this->hook->fire('options.get_langs.langs', $langs);
 
         $output = '';
diff --git a/featherbb/Model/Admin/Parser.php b/featherbb/Model/Admin/Parser.php
index 99616958..13f62002 100644
--- a/featherbb/Model/Admin/Parser.php
+++ b/featherbb/Model/Admin/Parser.php
@@ -10,8 +10,8 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Parser
diff --git a/featherbb/Model/Admin/Permissions.php b/featherbb/Model/Admin/Permissions.php
index 04e7f90c..88f4eadc 100644
--- a/featherbb/Model/Admin/Permissions.php
+++ b/featherbb/Model/Admin/Permissions.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Permissions
diff --git a/featherbb/Model/Admin/Reports.php b/featherbb/Model/Admin/Reports.php
index 6268332d..1ea607a1 100644
--- a/featherbb/Model/Admin/Reports.php
+++ b/featherbb/Model/Admin/Reports.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Reports
diff --git a/featherbb/Model/Admin/Statistics.php b/featherbb/Model/Admin/Statistics.php
index 0b3c5439..d4e43775 100644
--- a/featherbb/Model/Admin/Statistics.php
+++ b/featherbb/Model/Admin/Statistics.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Statistics
diff --git a/featherbb/Model/Admin/Users.php b/featherbb/Model/Admin/Users.php
index b7a32f6e..b8a8fe3d 100644
--- a/featherbb/Model/Admin/Users.php
+++ b/featherbb/Model/Admin/Users.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Users
@@ -144,7 +144,7 @@ public function move_users()
         $move['user_ids'] = $this->hook->fire('model.users.move_users.user_ids', $move['user_ids']);
 
         if (empty($move['user_ids'])) {
-            throw new \FeatherBB\Error(__('No users selected'), 404);
+            throw new \FeatherBB\Core\Error(__('No users selected'), 404);
         }
 
         // Are we trying to batch move any admins?
@@ -152,7 +152,7 @@ public function move_users()
                         ->where('group_id', FEATHER_ADMIN)
                         ->find_one();
         if ($is_admin) {
-            throw new \FeatherBB\Error(__('No move admins message'), 403);
+            throw new \FeatherBB\Core\Error(__('No move admins message'), 403);
         }
 
         // Fetch all user groups
@@ -173,7 +173,7 @@ public function move_users()
             if ( $this->request->post('new_group') && isset($move['all_groups'][$this->request->post('new_group')]) ) {
                 $new_group = $this->request->post('new_group');
             } else {
-                throw new \FeatherBB\Error(__('Invalid group message'), 400);
+                throw new \FeatherBB\Core\Error(__('Invalid group message'), 400);
             }
             $new_group = $this->hook->fire('model.users.move_users.new_group', $new_group);
 
@@ -265,7 +265,7 @@ public function delete_users()
         $user_ids = $this->hook->fire('model.users.delete_users.user_ids', $user_ids);
 
         if (empty($user_ids)) {
-            throw new \FeatherBB\Error(__('No users selected'), 404);
+            throw new \FeatherBB\Core\Error(__('No users selected'), 404);
         }
 
         // Are we trying to delete any admins?
@@ -273,7 +273,7 @@ public function delete_users()
             ->where('group_id', FEATHER_ADMIN)
             ->find_one();
         if ($is_admin) {
-            throw new \FeatherBB\Error(__('No delete admins message'), 403);
+            throw new \FeatherBB\Core\Error(__('No delete admins message'), 403);
         }
 
         if ($this->request->post('delete_users_comply')) {
@@ -429,7 +429,7 @@ public function ban_users()
         $user_ids = $this->hook->fire('model.users.ban_users.user_ids', $user_ids);
 
         if (empty($user_ids)) {
-            throw new \FeatherBB\Error(__('No users selected'), 404);
+            throw new \FeatherBB\Core\Error(__('No users selected'), 404);
         }
 
         // Are we trying to ban any admins?
@@ -437,7 +437,7 @@ public function ban_users()
             ->where('group_id', FEATHER_ADMIN)
             ->find_one();
         if ($is_admin) {
-            throw new \FeatherBB\Error(__('No ban admins message'), 403);
+            throw new \FeatherBB\Core\Error(__('No ban admins message'), 403);
         }
 
         // Also, we cannot ban moderators
@@ -447,7 +447,7 @@ public function ban_users()
             ->where_in('u.id', $user_ids)
             ->find_one();
         if ($is_mod) {
-            throw new \FeatherBB\Error(__('No ban mods message'), 403);
+            throw new \FeatherBB\Core\Error(__('No ban mods message'), 403);
         }
 
         if ($this->request->post('ban_users_comply')) {
@@ -461,14 +461,14 @@ public function ban_users()
                 $ban_expire = strtotime($ban_expire . ' GMT');
 
                 if ($ban_expire == -1 || !$ban_expire) {
-                    throw new \FeatherBB\Error(__('Invalid date message') . ' ' . __('Invalid date reasons'), 400);
+                    throw new \FeatherBB\Core\Error(__('Invalid date message') . ' ' . __('Invalid date reasons'), 400);
                 }
 
                 $diff = ($this->user->timezone + $this->user->dst) * 3600;
                 $ban_expire -= $diff;
 
                 if ($ban_expire <= time()) {
-                    throw new \FeatherBB\Error(__('Invalid date message') . ' ' . __('Invalid date reasons'), 400);
+                    throw new \FeatherBB\Core\Error(__('Invalid date message') . ' ' . __('Invalid date reasons'), 400);
                 }
             } else {
                 $ban_expire = 'NULL';
@@ -560,7 +560,7 @@ public function get_user_search()
         $search['query_str'][] = 'user_group='.$user_group;
 
         if (preg_match('%[^0-9]%', $posts_greater.$posts_less)) {
-            throw new \FeatherBB\Error(__('Non numeric message'), 400);
+            throw new \FeatherBB\Core\Error(__('Non numeric message'), 400);
         }
 
         $search['conditions'] = array();
@@ -571,7 +571,7 @@ public function get_user_search()
 
             $last_post_after = strtotime($last_post_after);
             if ($last_post_after === false || $last_post_after == -1) {
-                throw new \FeatherBB\Error(__('Invalid date time message'), 400);
+                throw new \FeatherBB\Core\Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.last_post>'.$last_post_after;
@@ -581,7 +581,7 @@ public function get_user_search()
 
             $last_post_before = strtotime($last_post_before);
             if ($last_post_before === false || $last_post_before == -1) {
-                throw new \FeatherBB\Error(__('Invalid date time message'), 400);
+                throw new \FeatherBB\Core\Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.last_post<'.$last_post_before;
@@ -591,7 +591,7 @@ public function get_user_search()
 
             $last_visit_after = strtotime($last_visit_after);
             if ($last_visit_after === false || $last_visit_after == -1) {
-                throw new \FeatherBB\Error(__('Invalid date time message'), 400);
+                throw new \FeatherBB\Core\Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.last_visit>'.$last_visit_after;
@@ -601,7 +601,7 @@ public function get_user_search()
 
             $last_visit_before = strtotime($last_visit_before);
             if ($last_visit_before === false || $last_visit_before == -1) {
-                throw new \FeatherBB\Error(__('Invalid date time message'), 400);
+                throw new \FeatherBB\Core\Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.last_visit<'.$last_visit_before;
@@ -611,7 +611,7 @@ public function get_user_search()
 
             $registered_after = strtotime($registered_after);
             if ($registered_after === false || $registered_after == -1) {
-                throw new \FeatherBB\Error(__('Invalid date time message'), 400);
+                throw new \FeatherBB\Core\Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.registered>'.$registered_after;
@@ -621,7 +621,7 @@ public function get_user_search()
 
             $registered_before = strtotime($registered_before);
             if ($registered_before === false || $registered_before == -1) {
-                throw new \FeatherBB\Error(__('Invalid date time message'), 400);
+                throw new \FeatherBB\Core\Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.registered<'.$registered_before;
diff --git a/featherbb/Model/Auth.php b/featherbb/Model/Auth.php
index aaa93d1c..44e030cf 100644
--- a/featherbb/Model/Auth.php
+++ b/featherbb/Model/Auth.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Auth
diff --git a/featherbb/Model/Cache.php b/featherbb/Model/Cache.php
index 3fa7eb70..e84d891f 100644
--- a/featherbb/Model/Cache.php
+++ b/featherbb/Model/Cache.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Cache
diff --git a/featherbb/Model/Debug.php b/featherbb/Model/Debug.php
index 544546f2..03c562d6 100644
--- a/featherbb/Model/Debug.php
+++ b/featherbb/Model/Debug.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Debug
diff --git a/featherbb/Model/Delete.php b/featherbb/Model/Delete.php
index caed6725..91716703 100644
--- a/featherbb/Model/Delete.php
+++ b/featherbb/Model/Delete.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Delete
@@ -50,7 +50,7 @@ public function get_info_delete($id)
         $query = $query->find_one();
 
         if (!$query) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         return $query;
diff --git a/featherbb/Model/Edit.php b/featherbb/Model/Edit.php
index fb61e1b6..4135e234 100644
--- a/featherbb/Model/Edit.php
+++ b/featherbb/Model/Edit.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Edit
@@ -23,7 +23,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->search = new \FeatherBB\Search();
+        $this->search = new \FeatherBB\Core\Search();
     }
 
     // Fetch some info about the post, the topic and the forum
@@ -52,7 +52,7 @@ public function get_info_edit($id)
         $cur_post = $cur_post->find_one();
 
         if (!$cur_post) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         return $cur_post;
diff --git a/featherbb/Model/Header.php b/featherbb/Model/Header.php
index 772e9e84..2ec6cb7d 100644
--- a/featherbb/Model/Header.php
+++ b/featherbb/Model/Header.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Header
diff --git a/featherbb/Model/Index.php b/featherbb/Model/Index.php
index d9c00120..1070644b 100644
--- a/featherbb/Model/Index.php
+++ b/featherbb/Model/Index.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Index
diff --git a/featherbb/Model/Install.php b/featherbb/Model/Install.php
index 396cee6e..57e23a75 100644
--- a/featherbb/Model/Install.php
+++ b/featherbb/Model/Install.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Install
@@ -395,7 +395,7 @@ public static function load_admin_user(array $data)
         return $user = array(
             'group_id' => 1,
             'username' => $data['username'],
-            'password' => \FeatherBB\Utils::hash($data['password']),
+            'password' => \FeatherBB\Core\Utils::hash($data['password']),
             'email' => $data['email'],
             'language' => $data['default_lang'],
             'style' => $data['default_style'],
diff --git a/featherbb/Model/Login.php b/featherbb/Model/Login.php
index df330410..8524300b 100644
--- a/featherbb/Model/Login.php
+++ b/featherbb/Model/Login.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Login
@@ -44,14 +44,14 @@ public function login()
         $authorized = false;
 
         if (!empty($user->password)) {
-            $form_password_hash = \FeatherBB\Utils::hash($form_password); // Will result in a SHA-1 hash
+            $form_password_hash = Utils::hash($form_password); // Will result in a SHA-1 hash
             $authorized = ($user->password == $form_password_hash);
         }
 
         $authorized = $this->hook->fire('authorized_login', $authorized);
 
         if (!$authorized) {
-            throw new \FeatherBB\Error(__('Wrong user/pass').' <a href="'.Url::get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
+            throw new \FeatherBB\Core\Error(__('Wrong user/pass').' <a href="'.Url::get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
         }
 
         // Update the status if this is the first time the user logged in
@@ -93,7 +93,7 @@ public function logout($id, $token)
     {
         $token = $this->hook->fire('logout_start', $token, $id);
 
-        if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != \FeatherBB\Utils::hash($this->user->id.\FeatherBB\Utils::hash($this->request->getIp()))) {
+        if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != Utils::hash($this->user->id.Utils::hash($this->request->getIp()))) {
             header('Location: '.Url::base());
             exit;
         }
@@ -114,7 +114,7 @@ public function logout($id, $token)
 
         $this->hook->fire('logout_end');
 
-        $this->auth->feather_setcookie(1, \FeatherBB\Utils::hash(uniqid(rand(), true)), time() + 31536000);
+        $this->auth->feather_setcookie(1, Utils::hash(uniqid(rand(), true)), time() + 31536000);
 
         redirect(Url::base(), __('Logout redirect'));
     }
@@ -166,7 +166,7 @@ public function password_forgotten()
                     // Loop through users we found
                     foreach($result as $cur_hit) {
                         if ($cur_hit->last_email_sent != '' && (time() - $cur_hit->last_email_sent) < 3600 && (time() - $cur_hit->last_email_sent) >= 0) {
-                            throw new \FeatherBB\Error(sprintf(__('Email flood'), intval((3600 - (time() - $cur_hit->last_email_sent)) / 60)), 429);
+                            throw new \FeatherBB\Core\Error(sprintf(__('Email flood'), intval((3600 - (time() - $cur_hit->last_email_sent)) / 60)), 429);
                         }
 
                         // Generate a new password and a new password activation code
@@ -174,7 +174,7 @@ public function password_forgotten()
                         $new_password_key = random_pass(8);
 
                         $query['update'] = array(
-                            'activate_string' => \FeatherBB\Utils::hash($new_password),
+                            'activate_string' => Utils::hash($new_password),
                             'activate_key'    => $new_password_key,
                             'last_email_sent' => time()
                         );
@@ -195,7 +195,7 @@ public function password_forgotten()
                         $this->email->feather_mail($email, $mail_subject, $cur_mail_message);
                     }
 
-                    throw new \FeatherBB\Error(__('Forget mail').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', 400);
+                    throw new \FeatherBB\Core\Error(__('Forget mail').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', 400);
                 } else {
                     $errors[] = __('No email match').' '.Utils::escape($email).'.';
                 }
diff --git a/featherbb/Model/Misc.php b/featherbb/Model/Misc.php
index 137177d6..2ed59014 100644
--- a/featherbb/Model/Misc.php
+++ b/featherbb/Model/Misc.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Misc
@@ -50,7 +50,7 @@ public function get_info_mail($recipient_id)
         $mail = $mail->find_one();
 
         if (!$mail) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         $mail['recipient'] = $mail['username'];
@@ -70,17 +70,17 @@ public function send_email($mail)
         $message = Utils::trim($this->request->post('req_message'));
 
         if ($subject == '') {
-            throw new \FeatherBB\Error(__('No email subject'), 400);
+            throw new \FeatherBB\Core\Error(__('No email subject'), 400);
         } elseif ($message == '') {
-            throw new \FeatherBB\Error(__('No email message'), 400);
+            throw new \FeatherBB\Core\Error(__('No email message'), 400);
         }
         // Here we use strlen() not Utils::strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         elseif (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            throw new \FeatherBB\Error(__('Too long email message'), 400);
+            throw new \FeatherBB\Core\Error(__('Too long email message'), 400);
         }
 
         if ($this->user->last_email_sent != '' && (time() - $this->user->last_email_sent) < $this->user->g_email_flood && (time() - $this->user->last_email_sent) >= 0) {
-            throw new \FeatherBB\Error(sprintf(__('Email flood'), $this->user->g_email_flood, $this->user->g_email_flood - (time() - $this->user->last_email_sent)), 429);
+            throw new \FeatherBB\Core\Error(sprintf(__('Email flood'), $this->user->g_email_flood, $this->user->g_email_flood - (time() - $this->user->last_email_sent)), 429);
         }
 
         // Load the "form email" template
@@ -142,13 +142,13 @@ public function insert_report($post_id)
         // Clean up reason from POST
         $reason = Utils::linebreaks(Utils::trim($this->request->post('req_reason')));
         if ($reason == '') {
-            throw new \FeatherBB\Error(__('No reason'), 400);
+            throw new \FeatherBB\Core\Error(__('No reason'), 400);
         } elseif (strlen($reason) > 65535) { // TEXT field can only hold 65535 bytes
-            throw new \FeatherBB\Error(__('Reason too long'), 400);
+            throw new \FeatherBB\Core\Error(__('Reason too long'), 400);
         }
 
         if ($this->user->last_report_sent != '' && (time() - $this->user->last_report_sent) < $this->user->g_report_flood && (time() - $this->user->last_report_sent) >= 0) {
-            throw new \FeatherBB\Error(sprintf(__('Report flood'), $this->user->g_report_flood, $this->user->g_report_flood - (time() - $this->user->last_report_sent)), 429);
+            throw new \FeatherBB\Core\Error(sprintf(__('Report flood'), $this->user->g_report_flood, $this->user->g_report_flood - (time() - $this->user->last_report_sent)), 429);
         }
 
         // Get the topic ID
@@ -158,7 +158,7 @@ public function insert_report($post_id)
         $topic = $topic->find_one();
 
         if (!$topic) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         // Get the subject and forum ID
@@ -169,7 +169,7 @@ public function insert_report($post_id)
         $report = $report->find_one();
 
         if (!$report) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         // Should we use the internal report handling?
@@ -249,7 +249,7 @@ public function get_info_report($post_id)
         $cur_post = $cur_post->find_one();
 
         if (!$cur_post) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         $cur_post = $this->hook->fire('get_info_report', $cur_post);
@@ -262,7 +262,7 @@ public function subscribe_topic($topic_id)
         $topic_id = $this->hook->fire('subscribe_topic_start', $topic_id);
 
         if ($this->config['o_topic_subscriptions'] != '1') {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         // Make sure the user can view the topic
@@ -282,7 +282,7 @@ public function subscribe_topic($topic_id)
         $authorized = $authorized->find_one();
 
         if (!$authorized) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         $is_subscribed = DB::for_table('topic_subscriptions')
@@ -292,7 +292,7 @@ public function subscribe_topic($topic_id)
         $is_subscribed = $is_subscribed->find_one();
 
         if ($is_subscribed) {
-            throw new \FeatherBB\Error(__('Already subscribed topic'), 400);
+            throw new \FeatherBB\Core\Error(__('Already subscribed topic'), 400);
         }
 
         $subscription['insert'] = array(
@@ -315,7 +315,7 @@ public function unsubscribe_topic($topic_id)
         $topic_id = $this->hook->fire('unsubscribe_topic_start', $topic_id);
 
         if ($this->config['o_topic_subscriptions'] != '1') {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         $is_subscribed = DB::for_table('topic_subscriptions')
@@ -325,7 +325,7 @@ public function unsubscribe_topic($topic_id)
         $is_subscribed = $is_subscribed->find_one();
 
         if (!$is_subscribed) {
-            throw new \FeatherBB\Error(__('Not subscribed topic'), 400);
+            throw new \FeatherBB\Core\Error(__('Not subscribed topic'), 400);
         }
 
         // Delete the subscription
@@ -343,7 +343,7 @@ public function unsubscribe_forum($forum_id)
         $forum_id = $this->hook->fire('unsubscribe_forum_start', $forum_id);
 
         if ($this->config['o_forum_subscriptions'] != '1') {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         $is_subscribed = DB::for_table('forum_subscriptions')
@@ -353,7 +353,7 @@ public function unsubscribe_forum($forum_id)
         $is_subscribed = $is_subscribed->find_one();
 
         if (!$is_subscribed) {
-            throw new \FeatherBB\Error(__('Not subscribed forum'), 400);
+            throw new \FeatherBB\Core\Error(__('Not subscribed forum'), 400);
         }
 
         // Delete the subscription
@@ -371,7 +371,7 @@ public function subscribe_forum($forum_id)
         $forum_id = $this->hook->fire('subscribe_forum_start', $forum_id);
 
         if ($this->config['o_forum_subscriptions'] != '1') {
-            throw new \FeatherBB\Error(__('No permission'), 403);
+            throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
         // Make sure the user can view the forum
@@ -390,7 +390,7 @@ public function subscribe_forum($forum_id)
         $authorized = $authorized->find_one();
 
         if (!$authorized) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         $is_subscribed = DB::for_table('forum_subscriptions')
@@ -400,7 +400,7 @@ public function subscribe_forum($forum_id)
         $is_subscribed = $is_subscribed->find_one();
 
         if ($is_subscribed) {
-            throw new \FeatherBB\Error(__('Already subscribed forum'), 400);
+            throw new \FeatherBB\Core\Error(__('Already subscribed forum'), 400);
         }
 
         // Insert the subscription
diff --git a/featherbb/Model/Moderate.php b/featherbb/Model/Moderate.php
index 71cbb619..571110b8 100644
--- a/featherbb/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Moderate
@@ -23,13 +23,13 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->search = new \FeatherBB\Search();
+        $this->search = new \FeatherBB\Core\Search();
     }
 
     public function display_ip_info($ip)
     {
         $ip = $this->hook->fire('display_ip_info', $ip);
-        throw new \FeatherBB\Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Url::get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        throw new \FeatherBB\Core\Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Url::get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function display_ip_address_post($pid)
@@ -42,12 +42,12 @@ public function display_ip_address_post($pid)
         $ip = $ip->find_one_col('poster_ip');
 
         if (!$ip) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         $ip = $this->hook->fire('display_ip_address_post', $ip);
 
-        throw new \FeatherBB\Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Url::get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        throw new \FeatherBB\Core\Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Url::get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function get_moderators($fid)
@@ -83,7 +83,7 @@ public function get_topic_info($fid, $tid)
         $cur_topic = $cur_topic->find_one();
 
         if (!$cur_topic) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         return $cur_topic;
@@ -95,12 +95,12 @@ public function delete_posts($tid, $fid, $p = null)
         $posts = $this->hook->fire('delete_posts_start', $posts, $tid, $fid);
 
         if (empty($posts)) {
-            throw new \FeatherBB\Error(__('No posts selected'), 404);
+            throw new \FeatherBB\Core\Error(__('No posts selected'), 404);
         }
 
         if ($this->request->post('delete_posts_comply')) {
             if (@preg_match('%[^0-9,]%', $posts)) {
-                throw new \FeatherBB\Error(__('Bad request'), 400);
+                throw new \FeatherBB\Core\Error(__('Bad request'), 400);
             }
 
             // Verify that the post IDs are valid
@@ -118,7 +118,7 @@ public function delete_posts($tid, $fid, $p = null)
             $result = $result->find_many();
 
             if (count($result) != substr_count($posts, ',') + 1) {
-                throw new \FeatherBB\Error(__('Bad request'), 400);
+                throw new \FeatherBB\Core\Error(__('Bad request'), 400);
             }
 
             // Delete the posts
@@ -170,17 +170,17 @@ public function split_posts($tid, $fid, $p = null)
         $posts = $this->request->post('posts') ? $this->request->post('posts') : array();
         $posts = $this->hook->fire('split_posts_start', $posts, $tid, $fid);
         if (empty($posts)) {
-            throw new \FeatherBB\Error(__('No posts selected'), 404);
+            throw new \FeatherBB\Core\Error(__('No posts selected'), 404);
         }
 
         if ($this->request->post('split_posts_comply')) {
             if (@preg_match('%[^0-9,]%', $posts)) {
-                throw new \FeatherBB\Error(__('Bad request'), 400);
+                throw new \FeatherBB\Core\Error(__('Bad request'), 400);
             }
 
             $move_to_forum = $this->request->post('move_to_forum') ? intval($this->request->post('move_to_forum')) : 0;
             if ($move_to_forum < 1) {
-                throw new \FeatherBB\Error(__('Bad request'), 400);
+                throw new \FeatherBB\Core\Error(__('Bad request'), 400);
             }
 
             // How many posts did we just split off?
@@ -196,7 +196,7 @@ public function split_posts($tid, $fid, $p = null)
             $result = $result->find_many();
 
             if (count($result) != $num_posts_splitted) {
-                throw new \FeatherBB\Error(__('Bad request'), 400);
+                throw new \FeatherBB\Core\Error(__('Bad request'), 400);
             }
 
             unset($result);
@@ -217,16 +217,16 @@ public function split_posts($tid, $fid, $p = null)
             $result = $result->find_one();
 
             if (!$result) {
-                throw new \FeatherBB\Error(__('Bad request'), 404);
+                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
             }
 
             // Check subject
             $new_subject = $this->request->post('new_subject') ? Utils::trim($this->request->post('new_subject')) : '';
 
             if ($new_subject == '') {
-                throw new \FeatherBB\Error(__('No subject'), 400);
+                throw new \FeatherBB\Core\Error(__('No subject'), 400);
             } elseif (Utils::strlen($new_subject) > 70) {
-                throw new \FeatherBB\Error(__('Too long subject'), 400);
+                throw new \FeatherBB\Core\Error(__('Too long subject'), 400);
             }
 
             // Get data from the new first post
@@ -493,13 +493,13 @@ public function move_topics_to($fid, $tfid = null, $param = null)
         $fid = $this->hook->fire('move_topics_to_start', $fid);
 
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         $topics = explode(',', $this->request->post('topics'));
         $move_to_forum = $this->request->post('move_to_forum') ? intval($this->request->post('move_to_forum')) : 0;
         if (empty($topics) || $move_to_forum < 1) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         // Verify that the topic IDs are valid
@@ -510,7 +510,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
         $result = $result->find_many();
 
         if (count($result) != count($topics)) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
 
@@ -530,7 +530,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
         $authorized = $authorized->find_one();
 
         if (!$authorized) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         // Delete any redirect topics if there are any (only if we moved/copied the topic back to where it was once moved from)
@@ -610,7 +610,7 @@ public function check_move_possible()
         $result = $result->find_many();
 
         if (count($result) < 2) {
-            throw new \FeatherBB\Error(__('Nowhere to move'), 403);
+            throw new \FeatherBB\Core\Error(__('Nowhere to move'), 403);
         }
     }
 
@@ -619,12 +619,12 @@ public function merge_topics($fid)
         $fid = $this->hook->fire('merge_topics_start', $fid);
 
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         $topics = explode(',', $this->request->post('topics'));
         if (count($topics) < 2) {
-            throw new \FeatherBB\Error(__('Not enough topics selected'), 400);
+            throw new \FeatherBB\Core\Error(__('Not enough topics selected'), 400);
         }
 
         // Verify that the topic IDs are valid (redirect links will point to the merged topic after the merge)
@@ -635,7 +635,7 @@ public function merge_topics($fid)
         $result = $result->find_many();
 
         if (count($result) != count($topics)) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         // The topic that we are merging into is the one with the smallest ID
@@ -743,7 +743,7 @@ public function delete_topics($topics, $fid)
         $this->hook->fire('delete_topics');
 
         if (@preg_match('%[^0-9,]%', $topics)) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         $topics_sql = explode(',', $topics);
@@ -756,7 +756,7 @@ public function delete_topics($topics, $fid)
         $result = $result->find_many();
 
         if (count($result) != substr_count($topics, ',') + 1) {
-            throw new \FeatherBB\Error(__('Bad request'), 400);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
         }
 
         // Verify that the posts are not by admins
@@ -767,7 +767,7 @@ public function delete_topics($topics, $fid)
             $authorized = $this->hook->fireDB('delete_topics_authorized', $authorized);
             $authorized = $authorized->find_many();
             if ($authorized) {
-                throw new \FeatherBB\Error(__('No permission'), 403);
+                throw new \FeatherBB\Core\Error(__('No permission'), 403);
             }
         }
 
@@ -841,7 +841,7 @@ public function get_forum_info($fid)
         $cur_forum = $cur_forum->find_one();
 
         if (!$cur_forum) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         return $cur_forum;
@@ -1042,7 +1042,7 @@ public function get_subject_tid($id)
         $subject = $subject->find_one_col('subject');
 
         if (!$subject) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         return $subject;
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
index c0e7b513..8a2e4373 100644
--- a/featherbb/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Post
@@ -24,7 +24,7 @@ public function __construct()
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
         $this->email = $this->feather->email;
-        $this->search = new \FeatherBB\Search();
+        $this->search = new \FeatherBB\Core\Search();
     }
 
     //  Get some info about the post
@@ -67,7 +67,7 @@ public function get_info_post($tid, $fid)
         $cur_posting = $cur_posting->find_one();
 
         if (!$cur_posting) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         $cur_posting = $this->hook->fire('get_info_post', $cur_posting);
@@ -763,7 +763,7 @@ public function get_quote_message($qid, $tid)
         $quote = $quote->find_one();
 
         if (!$quote) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         // If the message contains a code tag we have to split it up (text within [code][/code] shouldn't be touched)
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index e0a13956..8bd03ce2 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Profile
@@ -48,7 +48,7 @@ public function change_pass($id)
             $cur_user = $cur_user->find_one();
 
             if ($key == '' || $key != $cur_user['activate_key']) {
-                throw new \FeatherBB\Error(__('Pass key bad').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', 400);
+                throw new \FeatherBB\Core\Error(__('Pass key bad').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', 400);
             } else {
                 $query = DB::for_table('users')
                     ->where('id', $id)
@@ -68,7 +68,7 @@ public function change_pass($id)
             $id = $this->hook->fire('change_pass_key_not_id', $id);
 
             if (!$this->user->is_admmod) { // A regular user trying to change another user's password?
-                throw new \FeatherBB\Error(__('No permission'), 403);
+                throw new \FeatherBB\Core\Error(__('No permission'), 403);
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's password?
 
@@ -83,11 +83,11 @@ public function change_pass($id)
                 $user = $user->find_one();
 
                 if (!$user) {
-                    throw new \FeatherBB\Error(__('Bad request'), 404);
+                    throw new \FeatherBB\Core\Error(__('Bad request'), 404);
                 }
 
                 if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == FEATHER_ADMIN || $user['g_moderator'] == '1') {
-                    throw new \FeatherBB\Error(__('No permission'), 403);
+                    throw new \FeatherBB\Core\Error(__('No permission'), 403);
                 }
             }
         }
@@ -98,10 +98,10 @@ public function change_pass($id)
             $new_password2 = Utils::trim($this->request->post('req_new_password2'));
 
             if ($new_password1 != $new_password2) {
-                throw new \FeatherBB\Error(__('Pass not match'), 400);
+                throw new \FeatherBB\Core\Error(__('Pass not match'), 400);
             }
             if (Utils::strlen($new_password1) < 6) {
-                throw new \FeatherBB\Error(__('Pass too short'), 400);
+                throw new \FeatherBB\Core\Error(__('Pass too short'), 400);
             }
 
             $cur_user = DB::for_table('users')
@@ -112,7 +112,7 @@ public function change_pass($id)
             $authorized = false;
 
             if (!empty($cur_user['password'])) {
-                $old_password_hash = \FeatherBB\Utils::hash($old_password);
+                $old_password_hash = Utils::hash($old_password);
 
                 if ($cur_user['password'] == $old_password_hash || $this->user->is_admmod) {
                     $authorized = true;
@@ -120,10 +120,10 @@ public function change_pass($id)
             }
 
             if (!$authorized) {
-                throw new \FeatherBB\Error(__('Wrong pass'), 403);
+                throw new \FeatherBB\Core\Error(__('Wrong pass'), 403);
             }
 
-            $new_password_hash = \FeatherBB\Utils::hash($new_password1);
+            $new_password_hash = Utils::hash($new_password1);
 
             $update_password = DB::for_table('users')
                 ->where('id', $id)
@@ -151,7 +151,7 @@ public function change_email($id)
             $id = $this->hook->fire('change_email_not_id', $id);
 
             if (!$this->user->is_admmod) { // A regular user trying to change another user's email?
-                throw new \FeatherBB\Error(__('No permission'), 403);
+                throw new \FeatherBB\Core\Error(__('No permission'), 403);
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's email?
                 $user['select'] = array('u.group_id', 'g.g_moderator');
@@ -165,11 +165,11 @@ public function change_email($id)
                 $user = $user->find_one();
 
                 if (!$user) {
-                    throw new \FeatherBB\Error(__('Bad request'), 404);
+                    throw new \FeatherBB\Core\Error(__('Bad request'), 404);
                 }
 
                 if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == FEATHER_ADMIN || $user['g_moderator'] == '1') {
-                    throw new \FeatherBB\Error(__('No permission'), 403);
+                    throw new \FeatherBB\Core\Error(__('No permission'), 403);
                 }
             }
         }
@@ -184,7 +184,7 @@ public function change_email($id)
             $new_email_key = $new_email_key->find_one_col('activate_key');
 
             if ($key == '' || $key != $new_email_key) {
-                throw new \FeatherBB\Error(__('Email key bad').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', 400);
+                throw new \FeatherBB\Core\Error(__('Email key bad').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', 400);
             } else {
                 $update_mail = DB::for_table('users')
                     ->where('id', $id)
@@ -200,21 +200,21 @@ public function change_email($id)
         } elseif ($this->request->isPost()) {
             $this->hook->fire('change_email_post');
 
-            if (\FeatherBB\Utils::hash($this->request->post('req_password')) !== $this->user->password) {
-                throw new \FeatherBB\Error(__('Wrong pass'));
+            if (Utils::hash($this->request->post('req_password')) !== $this->user->password) {
+                throw new \FeatherBB\Core\Error(__('Wrong pass'));
             }
 
             // Validate the email address
             $new_email = strtolower(Utils::trim($this->request->post('req_new_email')));
             $new_email = $this->hook->fire('change_email_new_email', $new_email);
             if (!$this->email->is_valid_email($new_email)) {
-                throw new \FeatherBB\Error(__('Invalid email'), 400);
+                throw new \FeatherBB\Core\Error(__('Invalid email'), 400);
             }
 
             // Check if it's a banned email address
             if ($this->email->is_banned_email($new_email)) {
                 if ($this->config['p_allow_banned_email'] == '0') {
-                    throw new \FeatherBB\Error(__('Banned email'), 403);
+                    throw new \FeatherBB\Core\Error(__('Banned email'), 403);
                 } elseif ($this->config['o_mailing_list'] != '') {
                     // Load the "banned email change" template
                     $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/banned_email_change.tpl'));
@@ -247,7 +247,7 @@ public function change_email($id)
 
             if ($result) {
                 if ($this->config['p_allow_dupe_email'] == '0') {
-                    throw new \FeatherBB\Error(__('Dupe email'), 400);
+                    throw new \FeatherBB\Core\Error(__('Dupe email'), 400);
                 } elseif ($this->config['o_mailing_list'] != '') {
                     foreach($result as $cur_dupe) {
                         $dupe_list[] = $cur_dupe['username'];
@@ -310,7 +310,7 @@ public function change_email($id)
 
             $this->hook->fire('change_email_sent');
 
-            throw new \FeatherBB\Error(__('Activate email sent').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', true);
+            throw new \FeatherBB\Core\Error(__('Activate email sent').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', true);
         }
         $this->hook->fire('change_email');
     }
@@ -320,7 +320,7 @@ public function upload_avatar($id, $files_data)
         $files_data = $this->hook->fire('upload_avatar_start', $files_data, $id);
 
         if (!isset($files_data['req_file'])) {
-            throw new \FeatherBB\Error(__('No file'));
+            throw new \FeatherBB\Core\Error(__('No file'));
         }
 
         $uploaded_file = $files_data['req_file'];
@@ -330,25 +330,25 @@ public function upload_avatar($id, $files_data)
             switch ($uploaded_file['error']) {
                 case 1: // UPLOAD_ERR_INI_SIZE
                 case 2: // UPLOAD_ERR_FORM_SIZE
-                    throw new \FeatherBB\Error(__('Too large ini'));
+                    throw new \FeatherBB\Core\Error(__('Too large ini'));
                     break;
 
                 case 3: // UPLOAD_ERR_PARTIAL
-                    throw new \FeatherBB\Error(__('Partial upload'));
+                    throw new \FeatherBB\Core\Error(__('Partial upload'));
                     break;
 
                 case 4: // UPLOAD_ERR_NO_FILE
-                    throw new \FeatherBB\Error(__('No file'));
+                    throw new \FeatherBB\Core\Error(__('No file'));
                     break;
 
                 case 6: // UPLOAD_ERR_NO_TMP_DIR
-                    throw new \FeatherBB\Error(__('No tmp directory'));
+                    throw new \FeatherBB\Core\Error(__('No tmp directory'));
                     break;
 
                 default:
                     // No error occured, but was something actually uploaded?
                     if ($uploaded_file['size'] == 0) {
-                        throw new \FeatherBB\Error(__('No file'));
+                        throw new \FeatherBB\Core\Error(__('No file'));
                     }
                     break;
             }
@@ -360,17 +360,17 @@ public function upload_avatar($id, $files_data)
             // Preliminary file check, adequate in most cases
             $allowed_types = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/png', 'image/x-png');
             if (!in_array($uploaded_file['type'], $allowed_types)) {
-                throw new \FeatherBB\Error(__('Bad type'));
+                throw new \FeatherBB\Core\Error(__('Bad type'));
             }
 
             // Make sure the file isn't too big
             if ($uploaded_file['size'] > $this->config['o_avatars_size']) {
-                throw new \FeatherBB\Error(__('Too large').' '.Utils::forum_number_format($this->config['o_avatars_size']).' '.__('bytes').'.');
+                throw new \FeatherBB\Core\Error(__('Too large').' '.Utils::forum_number_format($this->config['o_avatars_size']).' '.__('bytes').'.');
             }
 
             // Move the file to the avatar directory. We do this before checking the width/height to circumvent open_basedir restrictions
             if (!@move_uploaded_file($uploaded_file['tmp_name'], FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp')) {
-                throw new \FeatherBB\Error(__('Move failed').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.');
+                throw new \FeatherBB\Core\Error(__('Move failed').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.');
             }
 
             list($width, $height, $type, ) = @getimagesize(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
@@ -385,13 +385,13 @@ public function upload_avatar($id, $files_data)
             } else {
                 // Invalid type
                 @unlink(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
-                throw new \FeatherBB\Error(__('Bad type'));
+                throw new \FeatherBB\Core\Error(__('Bad type'));
             }
 
             // Now check the width/height
             if (empty($width) || empty($height) || $width > $this->config['o_avatars_width'] || $height > $this->config['o_avatars_height']) {
                 @unlink(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
-                throw new \FeatherBB\Error(__('Too wide or high').' '.$this->config['o_avatars_width'].'x'.$this->config['o_avatars_height'].' '.__('pixels').'.');
+                throw new \FeatherBB\Core\Error(__('Too wide or high').' '.$this->config['o_avatars_width'].'x'.$this->config['o_avatars_height'].' '.__('pixels').'.');
             }
 
             // Delete any old avatars and put the new one in place
@@ -399,7 +399,7 @@ public function upload_avatar($id, $files_data)
             @rename(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp', FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.$extension);
             @chmod(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.$extension, 0644);
         } else {
-            throw new \FeatherBB\Error(__('Unknown failure'));
+            throw new \FeatherBB\Core\Error(__('Unknown failure'));
         }
 
         $uploaded_file = $this->hook->fire('upload_avatar', $uploaded_file);
@@ -581,7 +581,7 @@ public function promote_user($id)
         $next_group_id = $next_group_id->find_one_col('g.g_promote_next_group');
 
         if (!$next_group_id) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         // Update the user
@@ -614,7 +614,7 @@ public function delete_user($id)
         $username = $result['username'];
 
         if ($group_id == FEATHER_ADMIN) {
-            throw new \FeatherBB\Error(__('No delete admin message'));
+            throw new \FeatherBB\Core\Error(__('No delete admin message'));
         }
 
         if ($this->request->post('delete_user_comply')) {
@@ -753,7 +753,7 @@ public function fetch_user_group($id)
         $info = $info->find_one();
 
         if (!$info) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         return $info;
@@ -780,10 +780,10 @@ public function update_profile($id, $info, $section)
 
                 // Make sure we got a valid language string
                 if ($this->request->post('form_language')) {
-                    $languages = \FeatherBB\Lister::getLangs();
+                    $languages = \FeatherBB\Core\Lister::getLangs();
                     $form['language'] = Utils::trim($this->request->post('form_language'));
                     if (!in_array($form['language'], $languages)) {
-                        throw new \FeatherBB\Error(__('Bad request'), 404);
+                        throw new \FeatherBB\Core\Error(__('Bad request'), 404);
                     }
                 }
 
@@ -798,7 +798,7 @@ public function update_profile($id, $info, $section)
                             $errors = '';
                             $errors = check_username($form['username'], $errors, $id);
                             if (!empty($errors)) {
-                                throw new \FeatherBB\Error($errors[0]);
+                                throw new \FeatherBB\Core\Error($errors[0]);
                             }
 
                             $username_updated = true;
@@ -815,7 +815,7 @@ public function update_profile($id, $info, $section)
                     // Validate the email address
                     $form['email'] = strtolower(Utils::trim($this->request->post('req_email')));
                     if (!$this->email->is_valid_email($form['email'])) {
-                        throw new \FeatherBB\Error(__('Invalid email'));
+                        throw new \FeatherBB\Core\Error(__('Invalid email'));
                     }
                 }
 
@@ -836,14 +836,14 @@ public function update_profile($id, $info, $section)
                         $url = Url::is_valid($form['url']);
 
                         if ($url === false) {
-                            throw new \FeatherBB\Error(__('Invalid website URL'));
+                            throw new \FeatherBB\Core\Error(__('Invalid website URL'));
                         }
 
                         $form['url'] = $url['url'];
                     }
                 } else {
                     if (!empty($form['url'])) {
-                        throw new \FeatherBB\Error(__('Website not allowed'));
+                        throw new \FeatherBB\Core\Error(__('Website not allowed'));
                     }
 
                     $form['url'] = '';
@@ -860,7 +860,7 @@ public function update_profile($id, $info, $section)
                         $forbidden = array('member', 'moderator', 'administrator', 'banned', 'guest', utf8_strtolower(__('Member')), utf8_strtolower(__('Moderator')), utf8_strtolower(__('Administrator')), utf8_strtolower(__('Banned')), utf8_strtolower(__('Guest')));
 
                         if (in_array(utf8_strtolower($form['title']), $forbidden)) {
-                            throw new \FeatherBB\Error(__('Forbidden title'));
+                            throw new \FeatherBB\Core\Error(__('Forbidden title'));
                         }
                     }
                 }
@@ -880,7 +880,7 @@ public function update_profile($id, $info, $section)
 
                 // If the ICQ UIN contains anything other than digits it's invalid
                 if (preg_match('%[^0-9]%', $form['icq'])) {
-                    throw new \FeatherBB\Error(__('Bad ICQ'));
+                    throw new \FeatherBB\Core\Error(__('Bad ICQ'));
                 }
 
                 break;
@@ -896,9 +896,9 @@ public function update_profile($id, $info, $section)
 
                     // Validate signature
                     if (Utils::strlen($form['signature']) > $this->config['p_sig_length']) {
-                        throw new \FeatherBB\Error(sprintf(__('Sig too long'), $this->config['p_sig_length'], Utils::strlen($form['signature']) - $this->config['p_sig_length']));
+                        throw new \FeatherBB\Core\Error(sprintf(__('Sig too long'), $this->config['p_sig_length'], Utils::strlen($form['signature']) - $this->config['p_sig_length']));
                     } elseif (substr_count($form['signature'], "\n") > ($this->config['p_sig_lines']-1)) {
-                        throw new \FeatherBB\Error(sprintf(__('Sig too many lines'), $this->config['p_sig_lines']));
+                        throw new \FeatherBB\Core\Error(sprintf(__('Sig too many lines'), $this->config['p_sig_lines']));
                     } elseif ($form['signature'] && $this->config['p_sig_all_caps'] == '0' && Utils::is_all_uppercase($form['signature']) && !$this->user->is_admmod) {
                         $form['signature'] = utf8_ucwords(utf8_strtolower($form['signature']));
                     }
@@ -910,7 +910,7 @@ public function update_profile($id, $info, $section)
                         $form['signature'] = $this->feather->parser->preparse_bbcode($form['signature'], $errors, true);
 
                         if (count($errors) > 0) {
-                            throw new \FeatherBB\Error('<ul><li>'.implode('</li><li>', $errors).'</li></ul>');
+                            throw new \FeatherBB\Core\Error('<ul><li>'.implode('</li><li>', $errors).'</li></ul>');
                         }
                     }
                 }
@@ -950,10 +950,10 @@ public function update_profile($id, $info, $section)
 
                 // Make sure we got a valid style string
                 if ($this->request->post('form_style')) {
-                    $styles = \FeatherBB\Lister::getStyles();
+                    $styles = \FeatherBB\Core\Lister::getStyles();
                     $form['style'] = Utils::trim($this->request->post('form_style'));
                     if (!in_array($form['style'], $styles)) {
-                        throw new \FeatherBB\Error(__('Bad request'), 404);
+                        throw new \FeatherBB\Core\Error(__('Bad request'), 404);
                     }
                 }
 
@@ -976,7 +976,7 @@ public function update_profile($id, $info, $section)
             }
 
             default:
-                throw new \FeatherBB\Error(__('Bad request'), 404);
+                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         $form = $this->hook->fire('update_profile_form', $form, $section, $id, $info);
@@ -988,7 +988,7 @@ public function update_profile($id, $info, $section)
         }
 
         if (empty($temp)) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         $update_user = DB::for_table('users')
@@ -1100,7 +1100,7 @@ public function get_user_info($id)
         $user = $user->find_one();
 
         if (!$user) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         return $user;
diff --git a/featherbb/Model/Register.php b/featherbb/Model/Register.php
index c7f612ae..d5e58426 100644
--- a/featherbb/Model/Register.php
+++ b/featherbb/Model/Register.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Register
@@ -44,7 +44,7 @@ public function check_for_errors()
         $already_registered = $already_registered->find_one();
 
         if ($already_registered) {
-            throw new \FeatherBB\Error(__('Registration flood'), 429);
+            throw new \FeatherBB\Core\Error(__('Registration flood'), 429);
         }
 
 
@@ -121,7 +121,7 @@ public function check_for_errors()
         if ($this->request->post('language')) {
             $user['language'] = preg_replace('%[\.\\\/]%', '', $this->request->post('language'));
             if (!file_exists(FEATHER_ROOT.'featherbb/lang/'.$user['language'].'/common.po')) {
-                throw new \FeatherBB\Error(__('Bad request'), 500);
+                throw new \FeatherBB\Core\Error(__('Bad request'), 500);
             }
         } else {
             $user['language'] = $this->config['o_default_lang'];
@@ -140,7 +140,7 @@ public function insert_user($user)
         $now = time();
 
         $intial_group_id = ($this->config['o_regs_verify'] == '0') ? $this->config['o_default_user_group'] : FEATHER_UNVERIFIED;
-        $password_hash = \FeatherBB\Utils::hash($user['password1']);
+        $password_hash = Utils::hash($user['password1']);
 
         // Add the user
         $user['insert'] = array(
diff --git a/featherbb/Model/Search.php b/featherbb/Model/Search.php
index ce08b486..b9c2ccc2 100644
--- a/featherbb/Model/Search.php
+++ b/featherbb/Model/Search.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Search
@@ -23,7 +23,7 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
-        $this->search = new \FeatherBB\Search();
+        $this->search = new \FeatherBB\Core\Search();
     }
 
     public function get_search_results()
@@ -49,7 +49,7 @@ public function get_search_results()
         if ($this->request->get('search_id')) {
             $search_id = intval($this->request->get('search_id'));
             if ($search_id < 1) {
-                throw new \FeatherBB\Error(__('Bad request'), 400);
+                throw new \FeatherBB\Core\Error(__('Bad request'), 400);
             }
         }
         // If it's a regular search (keywords and/or author)
@@ -66,7 +66,7 @@ public function get_search_results()
             }
 
             if (!$keywords && !$author) {
-                throw new \FeatherBB\Error(__('No terms'), 400);
+                throw new \FeatherBB\Core\Error(__('No terms'), 400);
             }
 
             if ($author) {
@@ -81,21 +81,21 @@ public function get_search_results()
         elseif ($action == 'show_user_posts' || $action == 'show_user_topics' || $action == 'show_subscriptions') {
             $user_id = ($this->request->get('user_id')) ? intval($this->request->get('user_id')) : $this->user->id;
             if ($user_id < 2) {
-                throw new \FeatherBB\Error(__('Bad request'), 404);
+                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
             }
 
             // Subscribed topics can only be viewed by admins, moderators and the users themselves
             if ($action == 'show_subscriptions' && !$this->user->is_admmod && $user_id != $this->user->id) {
-                throw new \FeatherBB\Error(__('No permission'), 403);
+                throw new \FeatherBB\Core\Error(__('No permission'), 403);
             }
         } elseif ($action == 'show_recent') {
             $interval = $this->request->get('value') ? intval($this->request->get('value')) : 86400;
         } elseif ($action == 'show_replies') {
             if ($this->user->is_guest) {
-                throw new \FeatherBB\Error(__('Bad request'), 404);
+                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
             }
         } elseif ($action != 'show_new' && $action != 'show_unanswered') {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
 
@@ -122,7 +122,7 @@ public function get_search_results()
 
                 unset($temp);
             } else {
-                throw new \FeatherBB\Error(__('No hits'), 204);
+                throw new \FeatherBB\Core\Error(__('No hits'), 204);
             }
         } else {
             $keyword_results = $author_results = array();
@@ -133,7 +133,7 @@ public function get_search_results()
             if (!empty($author) || !empty($keywords)) {
                 // Flood protection
                 if ($this->user->last_search && (time() - $this->user->last_search) < $this->user->g_search_flood && (time() - $this->user->last_search) >= 0) {
-                    throw new \FeatherBB\Error(sprintf(__('Search flood'), $this->user->g_search_flood, $this->user->g_search_flood - (time() - $this->user->last_search)), 429);
+                    throw new \FeatherBB\Core\Error(sprintf(__('Search flood'), $this->user->g_search_flood, $this->user->g_search_flood - (time() - $this->user->last_search)), 429);
                 }
 
                 if (!$this->user->is_guest) {
@@ -182,7 +182,7 @@ public function get_search_results()
                     $keywords_array = $this->hook->fire('get_search_results_keywords_array', $keywords_array);
 
                     if (empty($keywords_array)) {
-                        throw new \FeatherBB\Error(__('No hits'), 400);
+                        throw new \FeatherBB\Core\Error(__('No hits'), 400);
                     }
 
                     // Should we search in message body or topic subject specifically?
@@ -319,7 +319,7 @@ public function get_search_results()
 
                 $num_hits = count($search_ids);
                 if (!$num_hits) {
-                    throw new \FeatherBB\Error(__('No hits'), 204);
+                    throw new \FeatherBB\Core\Error(__('No hits'), 204);
                 }
             } elseif ($action == 'show_new' || $action == 'show_recent' || $action == 'show_replies' || $action == 'show_user_posts' || $action == 'show_user_topics' || $action == 'show_subscriptions' || $action == 'show_unanswered') {
                 $search_type = array('action', $action);
@@ -336,7 +336,7 @@ public function get_search_results()
                 // If it's a search for new posts since last visit
                 if ($action == 'show_new') {
                     if ($this->user->is_guest) {
-                        throw new \FeatherBB\Error(__('No permission'), 403);
+                        throw new \FeatherBB\Core\Error(__('No permission'), 403);
                     }
 
                     $result = DB::for_table('topics')
@@ -360,7 +360,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        throw new \FeatherBB\Error(__('No new posts'), 204);
+                        throw new \FeatherBB\Core\Error(__('No new posts'), 204);
                     }
                 }
                 // If it's a search for recent posts (in a certain time interval)
@@ -385,7 +385,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        throw new \FeatherBB\Error(__('No recent posts'), 204);
+                        throw new \FeatherBB\Core\Error(__('No recent posts'), 204);
                     }
                 }
                 // If it's a search for topics in which the user has posted
@@ -410,7 +410,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        throw new \FeatherBB\Error(__('No user posts'), 204);
+                        throw new \FeatherBB\Core\Error(__('No user posts'), 204);
                     }
                 }
                 // If it's a search for posts by a specific user ID
@@ -433,7 +433,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        throw new \FeatherBB\Error(__('No user posts'), 404);
+                        throw new \FeatherBB\Core\Error(__('No user posts'), 404);
                     }
 
                     // Pass on the user ID so that we can later know whose posts we're searching for
@@ -457,7 +457,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        throw new \FeatherBB\Error(__('No user topics'), 404);
+                        throw new \FeatherBB\Core\Error(__('No user topics'), 404);
                     }
 
                     // Pass on the user ID so that we can later know whose topics we're searching for
@@ -466,7 +466,7 @@ public function get_search_results()
                 // If it's a search for subscribed topics
                 elseif ($action == 'show_subscriptions') {
                     if ($this->user->is_guest) {
-                        throw new \FeatherBB\Error(__('Bad request'), 404);
+                        throw new \FeatherBB\Core\Error(__('Bad request'), 404);
                     }
 
                     $result = DB::for_table('topics')
@@ -485,7 +485,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        throw new \FeatherBB\Error(__('No subscriptions'), 404);
+                        throw new \FeatherBB\Core\Error(__('No subscriptions'), 404);
                     }
 
                     // Pass on user ID so that we can later know whose subscriptions we're searching for
@@ -509,7 +509,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        throw new \FeatherBB\Error(__('No unanswered'), 404);
+                        throw new \FeatherBB\Core\Error(__('No unanswered'), 404);
                     }
                 }
 
@@ -521,7 +521,7 @@ public function get_search_results()
                 $pdo = DB::get_db();
                 $pdo = null;
             } else {
-                throw new \FeatherBB\Error(__('Bad request'), 404);
+                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
             }
 
 
@@ -657,7 +657,7 @@ public function get_search_results()
                     $subscriber_name = $subscriber_name->find_one_col('username');
 
                     if (!$subscriber_name) {
-                        throw new \FeatherBB\Error(__('Bad request'), 404);
+                        throw new \FeatherBB\Core\Error(__('Bad request'), 404);
                     }
 
                     $search['crumbs_text']['search_type'] = '<a href="'.Url::get('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), Utils::escape($subscriber_name)).'</a>';
diff --git a/featherbb/Model/Userlist.php b/featherbb/Model/Userlist.php
index 713e2e7c..008d7650 100644
--- a/featherbb/Model/Userlist.php
+++ b/featherbb/Model/Userlist.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Userlist
diff --git a/featherbb/Model/Viewforum.php b/featherbb/Model/Viewforum.php
index 9501d498..edda51d3 100644
--- a/featherbb/Model/Viewforum.php
+++ b/featherbb/Model/Viewforum.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Viewforum
@@ -62,7 +62,7 @@ public function get_info_forum($id)
         $cur_forum = $cur_forum->find_one();
 
         if (!$cur_forum) {
-            throw new \FeatherBB\Error(__('Bad request'), '404');
+            throw new \FeatherBB\Core\Error(__('Bad request'), '404');
         }
 
         $cur_forum = $this->hook->fire('get_info_forum', $cur_forum);
diff --git a/featherbb/Model/Viewtopic.php b/featherbb/Model/Viewtopic.php
index 80eb22bb..8a58da03 100644
--- a/featherbb/Model/Viewtopic.php
+++ b/featherbb/Model/Viewtopic.php
@@ -9,8 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 use DB;
 
 class Viewtopic
@@ -39,7 +39,7 @@ public function redirect_to_post($post_id)
         $result = $result->find_one();
 
         if (!$result) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         $post['topic_id'] = $result['topic_id'];
@@ -147,7 +147,7 @@ public function get_info_topic($id)
         $cur_topic = $cur_topic->find_one();
 
         if (!$cur_topic) {
-            throw new \FeatherBB\Error(__('Bad request'), 404);
+            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
 
         $cur_topic = $this->hook->fire('get_info_topic', $cur_topic);
@@ -246,7 +246,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
         }
 
         if (empty($post_ids)) {
-            throw new \FeatherBB\Error('The post table and topic table seem to be out of sync!', 500);
+            throw new \FeatherBB\Core\Error('The post table and topic table seem to be out of sync!', 500);
         }
 
         // Retrieve the posts (and their respective poster/online status)
diff --git a/featherbb/routes.php b/featherbb/routes.php
index 53e322b3..3dab676d 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -190,13 +190,13 @@
 
 // 404 not found
 $feather->notFound(function () use ($feather){
-    throw new \FeatherBB\Error('Page not found', 404);
+    throw new \FeatherBB\Core\Error('Page not found', 404);
 });
 
 $feather->error(function (\Exception $e) use ($feather) {
     $feather->response->setStatus($e->getCode());
     $feather->template->setPageInfo(array(
-        'title' => array(Utils::escape($feather->config['o_board_title']), __('Error')),
+        'title' => array(\FeatherBB\Core\Utils::escape($feather->config['o_board_title']), __('Error')),
         'msg_title' => __('Error'),
         'msg'    =>   $e->getMessage(),
         'no_back_link'    => false,
diff --git a/style/themes/FeatherBB/view/admin/bans/add_ban.php b/style/themes/FeatherBB/view/admin/bans/add_ban.php
index 4006193f..06649dcf 100644
--- a/style/themes/FeatherBB/view/admin/bans/add_ban.php
+++ b/style/themes/FeatherBB/view/admin/bans/add_ban.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/bans/admin_bans.php b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
index d4170b24..369867be 100644
--- a/style/themes/FeatherBB/view/admin/bans/admin_bans.php
+++ b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/bans/search_ban.php b/style/themes/FeatherBB/view/admin/bans/search_ban.php
index 99d516f2..57ba4dae 100644
--- a/style/themes/FeatherBB/view/admin/bans/search_ban.php
+++ b/style/themes/FeatherBB/view/admin/bans/search_ban.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/categories.php b/style/themes/FeatherBB/view/admin/categories.php
index 15f56eff..80819ea8 100644
--- a/style/themes/FeatherBB/view/admin/categories.php
+++ b/style/themes/FeatherBB/view/admin/categories.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/censoring.php b/style/themes/FeatherBB/view/admin/censoring.php
index fd9f0a6e..87230a58 100644
--- a/style/themes/FeatherBB/view/admin/censoring.php
+++ b/style/themes/FeatherBB/view/admin/censoring.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/forums/admin_forums.php b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
index 67a6b80a..360c3507 100644
--- a/style/themes/FeatherBB/view/admin/forums/admin_forums.php
+++ b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/forums/delete_forum.php b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
index 1e888093..091d527f 100644
--- a/style/themes/FeatherBB/view/admin/forums/delete_forum.php
+++ b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/forums/permissions.php b/style/themes/FeatherBB/view/admin/forums/permissions.php
index b7b502cb..a4cb1d8c 100644
--- a/style/themes/FeatherBB/view/admin/forums/permissions.php
+++ b/style/themes/FeatherBB/view/admin/forums/permissions.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/groups/add_edit_group.php b/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
index 854dc1cd..9f701a14 100644
--- a/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
+++ b/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/groups/admin_groups.php b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
index 36cd2107..62549376 100644
--- a/style/themes/FeatherBB/view/admin/groups/admin_groups.php
+++ b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
index d31dfbc4..88163680 100644
--- a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
+++ b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/groups/delete_group.php b/style/themes/FeatherBB/view/admin/groups/delete_group.php
index 1a2b306e..3cb568ff 100644
--- a/style/themes/FeatherBB/view/admin/groups/delete_group.php
+++ b/style/themes/FeatherBB/view/admin/groups/delete_group.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/index.php b/style/themes/FeatherBB/view/admin/index.php
index bfa3f7d0..25f055c7 100644
--- a/style/themes/FeatherBB/view/admin/index.php
+++ b/style/themes/FeatherBB/view/admin/index.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/loader.php b/style/themes/FeatherBB/view/admin/loader.php
index b1534f1d..38eed4f6 100644
--- a/style/themes/FeatherBB/view/admin/loader.php
+++ b/style/themes/FeatherBB/view/admin/loader.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
index b785bc2a..6ffc768d 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/maintenance/prune.php b/style/themes/FeatherBB/view/admin/maintenance/prune.php
index 491bfb47..daf063e9 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/prune.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/prune.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
index 45afc488..3d522863 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/menu.php b/style/themes/FeatherBB/view/admin/menu.php
index a03c60d1..ab40a824 100644
--- a/style/themes/FeatherBB/view/admin/menu.php
+++ b/style/themes/FeatherBB/view/admin/menu.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/options.php b/style/themes/FeatherBB/view/admin/options.php
index 93fbeacf..b0754807 100644
--- a/style/themes/FeatherBB/view/admin/options.php
+++ b/style/themes/FeatherBB/view/admin/options.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/parser.php b/style/themes/FeatherBB/view/admin/parser.php
index 6c3b1c91..f299acf5 100644
--- a/style/themes/FeatherBB/view/admin/parser.php
+++ b/style/themes/FeatherBB/view/admin/parser.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/permissions.php b/style/themes/FeatherBB/view/admin/permissions.php
index aa8a4c83..ab92bb7d 100644
--- a/style/themes/FeatherBB/view/admin/permissions.php
+++ b/style/themes/FeatherBB/view/admin/permissions.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/plugins.php b/style/themes/FeatherBB/view/admin/plugins.php
index 01c654d7..737267bc 100644
--- a/style/themes/FeatherBB/view/admin/plugins.php
+++ b/style/themes/FeatherBB/view/admin/plugins.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/reports.php b/style/themes/FeatherBB/view/admin/reports.php
index f51a1194..ea362803 100644
--- a/style/themes/FeatherBB/view/admin/reports.php
+++ b/style/themes/FeatherBB/view/admin/reports.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -32,7 +32,7 @@
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.Url::get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => Url::get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+									<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => Url::get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => Url::get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => Url::get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
@@ -82,7 +82,7 @@
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.Url::get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => Url::get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+									<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => Url::get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => Url::get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => Url::get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
diff --git a/style/themes/FeatherBB/view/admin/statistics.php b/style/themes/FeatherBB/view/admin/statistics.php
index 8eb426a3..df61d145 100644
--- a/style/themes/FeatherBB/view/admin/statistics.php
+++ b/style/themes/FeatherBB/view/admin/statistics.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/users/admin_users.php b/style/themes/FeatherBB/view/admin/users/admin_users.php
index e279aed8..302ca5cd 100644
--- a/style/themes/FeatherBB/view/admin/users/admin_users.php
+++ b/style/themes/FeatherBB/view/admin/users/admin_users.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/users/ban_users.php b/style/themes/FeatherBB/view/admin/users/ban_users.php
index 5b59cdc6..88ea985b 100644
--- a/style/themes/FeatherBB/view/admin/users/ban_users.php
+++ b/style/themes/FeatherBB/view/admin/users/ban_users.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/users/delete_users.php b/style/themes/FeatherBB/view/admin/users/delete_users.php
index 44e0fe0f..d44d22ae 100644
--- a/style/themes/FeatherBB/view/admin/users/delete_users.php
+++ b/style/themes/FeatherBB/view/admin/users/delete_users.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/users/find_users.php b/style/themes/FeatherBB/view/admin/users/find_users.php
index d5799c0a..3ea84027 100644
--- a/style/themes/FeatherBB/view/admin/users/find_users.php
+++ b/style/themes/FeatherBB/view/admin/users/find_users.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/users/move_users.php b/style/themes/FeatherBB/view/admin/users/move_users.php
index 898bd404..8abd1132 100644
--- a/style/themes/FeatherBB/view/admin/users/move_users.php
+++ b/style/themes/FeatherBB/view/admin/users/move_users.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/users/search_ip.php b/style/themes/FeatherBB/view/admin/users/search_ip.php
index 8e387a77..aa3167c7 100644
--- a/style/themes/FeatherBB/view/admin/users/search_ip.php
+++ b/style/themes/FeatherBB/view/admin/users/search_ip.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/users/show_users.php b/style/themes/FeatherBB/view/admin/users/show_users.php
index 73c8e659..479d4473 100644
--- a/style/themes/FeatherBB/view/admin/users/show_users.php
+++ b/style/themes/FeatherBB/view/admin/users/show_users.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/delete.php b/style/themes/FeatherBB/view/delete.php
index 4c06ef81..cd8bcb15 100644
--- a/style/themes/FeatherBB/view/delete.php
+++ b/style/themes/FeatherBB/view/delete.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/edit.php b/style/themes/FeatherBB/view/edit.php
index d9cef761..2792b4d8 100644
--- a/style/themes/FeatherBB/view/edit.php
+++ b/style/themes/FeatherBB/view/edit.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/error.php b/style/themes/FeatherBB/view/error.php
index 5ab7e7dd..d45f5470 100644
--- a/style/themes/FeatherBB/view/error.php
+++ b/style/themes/FeatherBB/view/error.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/footer.new.php b/style/themes/FeatherBB/view/footer.new.php
index e8b2b354..12828ed6 100644
--- a/style/themes/FeatherBB/view/footer.new.php
+++ b/style/themes/FeatherBB/view/footer.new.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/header.new.php b/style/themes/FeatherBB/view/header.new.php
index e609ae52..ac24b261 100644
--- a/style/themes/FeatherBB/view/header.new.php
+++ b/style/themes/FeatherBB/view/header.new.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -132,7 +132,7 @@ function process_form(the_form)
         echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.Url::get('admin/').'">'.__('Admin').'</a></li>'."\n";
     }
 
-    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.Url::get('auth/logout/token/'.\FeatherBB\Utils::hash($feather->user->id.\FeatherBB\Utils::hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.Url::get('auth/logout/token/'.Utils::hash($feather->user->id.Utils::hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
 }
 
 // // Are there any additional navlinks we should insert into the array before imploding it?
diff --git a/style/themes/FeatherBB/view/help.php b/style/themes/FeatherBB/view/help.php
index 085eee8c..4e4f1c95 100644
--- a/style/themes/FeatherBB/view/help.php
+++ b/style/themes/FeatherBB/view/help.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/index.php b/style/themes/FeatherBB/view/index.php
index b1a99b8a..aa1683f4 100644
--- a/style/themes/FeatherBB/view/index.php
+++ b/style/themes/FeatherBB/view/index.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/install.php b/style/themes/FeatherBB/view/install.php
index 816a41b7..20c80445 100644
--- a/style/themes/FeatherBB/view/install.php
+++ b/style/themes/FeatherBB/view/install.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/login/form.php b/style/themes/FeatherBB/view/login/form.php
index b88f1ce2..23944108 100644
--- a/style/themes/FeatherBB/view/login/form.php
+++ b/style/themes/FeatherBB/view/login/form.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/login/password_forgotten.php b/style/themes/FeatherBB/view/login/password_forgotten.php
index 232fe23a..49277515 100644
--- a/style/themes/FeatherBB/view/login/password_forgotten.php
+++ b/style/themes/FeatherBB/view/login/password_forgotten.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/misc/email.php b/style/themes/FeatherBB/view/misc/email.php
index e26229b5..ec8654a0 100644
--- a/style/themes/FeatherBB/view/misc/email.php
+++ b/style/themes/FeatherBB/view/misc/email.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/misc/report.php b/style/themes/FeatherBB/view/misc/report.php
index f59e1605..9781b066 100644
--- a/style/themes/FeatherBB/view/misc/report.php
+++ b/style/themes/FeatherBB/view/misc/report.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/misc/rules.php b/style/themes/FeatherBB/view/misc/rules.php
index 6cbeca3f..92290226 100644
--- a/style/themes/FeatherBB/view/misc/rules.php
+++ b/style/themes/FeatherBB/view/misc/rules.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/delete_posts.php b/style/themes/FeatherBB/view/moderate/delete_posts.php
index 1d0bd1fe..34b126c8 100644
--- a/style/themes/FeatherBB/view/moderate/delete_posts.php
+++ b/style/themes/FeatherBB/view/moderate/delete_posts.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/delete_topics.php b/style/themes/FeatherBB/view/moderate/delete_topics.php
index 5eb15a2c..81f36bb6 100644
--- a/style/themes/FeatherBB/view/moderate/delete_topics.php
+++ b/style/themes/FeatherBB/view/moderate/delete_topics.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/merge_topics.php b/style/themes/FeatherBB/view/moderate/merge_topics.php
index 5f17a4ff..66b105e4 100644
--- a/style/themes/FeatherBB/view/moderate/merge_topics.php
+++ b/style/themes/FeatherBB/view/moderate/merge_topics.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/moderator_forum.php b/style/themes/FeatherBB/view/moderate/moderator_forum.php
index 44438887..39b8f698 100644
--- a/style/themes/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/themes/FeatherBB/view/moderate/moderator_forum.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/move_topics.php b/style/themes/FeatherBB/view/moderate/move_topics.php
index 85f380ad..d040ea8e 100644
--- a/style/themes/FeatherBB/view/moderate/move_topics.php
+++ b/style/themes/FeatherBB/view/moderate/move_topics.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/posts_view.php b/style/themes/FeatherBB/view/moderate/posts_view.php
index 7e35720f..4baad445 100644
--- a/style/themes/FeatherBB/view/moderate/posts_view.php
+++ b/style/themes/FeatherBB/view/moderate/posts_view.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/split_posts.php b/style/themes/FeatherBB/view/moderate/split_posts.php
index 17e9b71a..2af3cdfb 100644
--- a/style/themes/FeatherBB/view/moderate/split_posts.php
+++ b/style/themes/FeatherBB/view/moderate/split_posts.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/post.php b/style/themes/FeatherBB/view/post.php
index eca06d53..1cd656c2 100644
--- a/style/themes/FeatherBB/view/post.php
+++ b/style/themes/FeatherBB/view/post.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/change_mail.php b/style/themes/FeatherBB/view/profile/change_mail.php
index e422d9cd..ec707365 100644
--- a/style/themes/FeatherBB/view/profile/change_mail.php
+++ b/style/themes/FeatherBB/view/profile/change_mail.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/change_pass.php b/style/themes/FeatherBB/view/profile/change_pass.php
index ccd7007e..56871dda 100644
--- a/style/themes/FeatherBB/view/profile/change_pass.php
+++ b/style/themes/FeatherBB/view/profile/change_pass.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/delete_user.php b/style/themes/FeatherBB/view/profile/delete_user.php
index b3c197fa..4a3155d6 100644
--- a/style/themes/FeatherBB/view/profile/delete_user.php
+++ b/style/themes/FeatherBB/view/profile/delete_user.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/menu.php b/style/themes/FeatherBB/view/profile/menu.php
index b063329c..e235212a 100644
--- a/style/themes/FeatherBB/view/profile/menu.php
+++ b/style/themes/FeatherBB/view/profile/menu.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/section_admin.php b/style/themes/FeatherBB/view/profile/section_admin.php
index 9fe4381b..45bee508 100644
--- a/style/themes/FeatherBB/view/profile/section_admin.php
+++ b/style/themes/FeatherBB/view/profile/section_admin.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/section_display.php b/style/themes/FeatherBB/view/profile/section_display.php
index 2b5357d0..2b2cdb15 100644
--- a/style/themes/FeatherBB/view/profile/section_display.php
+++ b/style/themes/FeatherBB/view/profile/section_display.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -24,7 +24,7 @@
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php
 
-    $styles = \FeatherBB\Lister::getStyles();
+    $styles = \FeatherBB\Core\Lister::getStyles();
 
     // Only display the style selection box if there's more than one style available
     if (count($styles) == 1) {
diff --git a/style/themes/FeatherBB/view/profile/section_essentials.php b/style/themes/FeatherBB/view/profile/section_essentials.php
index bfa14ed3..567125d6 100644
--- a/style/themes/FeatherBB/view/profile/section_essentials.php
+++ b/style/themes/FeatherBB/view/profile/section_essentials.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -212,7 +212,7 @@
 
 <?php
 
-    $languages = \FeatherBB\Lister::getLangs();
+    $languages = \FeatherBB\Core\Lister::getLangs();
 
     // Only display the language selection box if there's more than one language available
     if (count($languages) > 1) {
diff --git a/style/themes/FeatherBB/view/profile/section_messaging.php b/style/themes/FeatherBB/view/profile/section_messaging.php
index 351681f1..ad5804af 100644
--- a/style/themes/FeatherBB/view/profile/section_messaging.php
+++ b/style/themes/FeatherBB/view/profile/section_messaging.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/section_personal.php b/style/themes/FeatherBB/view/profile/section_personal.php
index d7807213..4669bec3 100644
--- a/style/themes/FeatherBB/view/profile/section_personal.php
+++ b/style/themes/FeatherBB/view/profile/section_personal.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/section_personality.php b/style/themes/FeatherBB/view/profile/section_personality.php
index c508cb4d..62aec4f5 100644
--- a/style/themes/FeatherBB/view/profile/section_personality.php
+++ b/style/themes/FeatherBB/view/profile/section_personality.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/section_privacy.php b/style/themes/FeatherBB/view/profile/section_privacy.php
index 3b6373c7..c1e52fe1 100644
--- a/style/themes/FeatherBB/view/profile/section_privacy.php
+++ b/style/themes/FeatherBB/view/profile/section_privacy.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/upload_avatar.php b/style/themes/FeatherBB/view/profile/upload_avatar.php
index 36c5f24e..3d5bd28c 100644
--- a/style/themes/FeatherBB/view/profile/upload_avatar.php
+++ b/style/themes/FeatherBB/view/profile/upload_avatar.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/view_profile.php b/style/themes/FeatherBB/view/profile/view_profile.php
index 4bbfda56..a922c1d2 100644
--- a/style/themes/FeatherBB/view/profile/view_profile.php
+++ b/style/themes/FeatherBB/view/profile/view_profile.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/register/email.php b/style/themes/FeatherBB/view/register/email.php
index 249fb275..ae10eda8 100644
--- a/style/themes/FeatherBB/view/register/email.php
+++ b/style/themes/FeatherBB/view/register/email.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/register/form.php b/style/themes/FeatherBB/view/register/form.php
index ca9c3eff..855e2f40 100644
--- a/style/themes/FeatherBB/view/register/form.php
+++ b/style/themes/FeatherBB/view/register/form.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/register/rules.php b/style/themes/FeatherBB/view/register/rules.php
index d20ff943..ec4d9265 100644
--- a/style/themes/FeatherBB/view/register/rules.php
+++ b/style/themes/FeatherBB/view/register/rules.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/search/footer.php b/style/themes/FeatherBB/view/search/footer.php
index 6254c7a8..ac3b8317 100644
--- a/style/themes/FeatherBB/view/search/footer.php
+++ b/style/themes/FeatherBB/view/search/footer.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/search/form.php b/style/themes/FeatherBB/view/search/form.php
index 048c9ce4..2bc7ff63 100644
--- a/style/themes/FeatherBB/view/search/form.php
+++ b/style/themes/FeatherBB/view/search/form.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/search/header.php b/style/themes/FeatherBB/view/search/header.php
index 2232ec0d..bfa18779 100644
--- a/style/themes/FeatherBB/view/search/header.php
+++ b/style/themes/FeatherBB/view/search/header.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/search/posts.php b/style/themes/FeatherBB/view/search/posts.php
index 0d3ab831..bae1bca9 100644
--- a/style/themes/FeatherBB/view/search/posts.php
+++ b/style/themes/FeatherBB/view/search/posts.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/search/topics.php b/style/themes/FeatherBB/view/search/topics.php
index c0afc167..1dbcc822 100644
--- a/style/themes/FeatherBB/view/search/topics.php
+++ b/style/themes/FeatherBB/view/search/topics.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/userlist.php b/style/themes/FeatherBB/view/userlist.php
index eaa39f76..8dbd2b78 100644
--- a/style/themes/FeatherBB/view/userlist.php
+++ b/style/themes/FeatherBB/view/userlist.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/viewforum.php b/style/themes/FeatherBB/view/viewforum.php
index 63f872e2..df256a0e 100644
--- a/style/themes/FeatherBB/view/viewforum.php
+++ b/style/themes/FeatherBB/view/viewforum.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/viewtopic.php b/style/themes/FeatherBB/view/viewtopic.php
index cc8466a7..f19df222 100644
--- a/style/themes/FeatherBB/view/viewtopic.php
+++ b/style/themes/FeatherBB/view/viewtopic.php
@@ -7,8 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 16175d8d..80315964 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -6,7 +6,7 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Plugins\\' => array('/plugins'),
-    'FeatherBB\\' => array($baseDir . '/featherbb/Core'),
+    'Plugins\\' => array($baseDir . '/plugins'),
+    'FeatherBB\\' => array($baseDir . '/featherbb'),
     '' => array($baseDir . '/'),
 );
diff --git a/vendor/composer/include_paths.php b/vendor/composer/include_paths.php
deleted file mode 100644
index 4fd23321..00000000
--- a/vendor/composer/include_paths.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-// include_paths.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    $vendorDir . '/phpunit/phpunit-mock-objects',
-    $vendorDir . '/phpunit/php-file-iterator',
-    $vendorDir . '/phpunit/phpunit',
-    $vendorDir . '/symfony/yaml',
-);
diff --git a/view/admin/reports.php b/view/admin/reports.php
index c86890e9..bbf7c18c 100644
--- a/view/admin/reports.php
+++ b/view/admin/reports.php
@@ -29,7 +29,7 @@
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+									<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
@@ -79,7 +79,7 @@
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?= \FeatherBB\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+									<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
 																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
 								</tr>
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
index dba0f449..3ca10929 100644
--- a/view/profile/section_display.php
+++ b/view/profile/section_display.php
@@ -21,7 +21,7 @@
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php
 
-    $styles = \FeatherBB\Lister::getStyles();
+    $styles = \FeatherBB\Core\Lister::getStyles();
 
     // Only display the style selection box if there's more than one style available
     if (count($styles) == 1) {
diff --git a/view/profile/section_essentials.php b/view/profile/section_essentials.php
index 98387144..4555a3c1 100644
--- a/view/profile/section_essentials.php
+++ b/view/profile/section_essentials.php
@@ -209,7 +209,7 @@
 
 <?php
 
-    $languages = \FeatherBB\Lister::getLangs();
+    $languages = \FeatherBB\Core\Lister::getLangs();
 
     // Only display the language selection box if there's more than one language available
     if (count($languages) > 1) {

From 7462d9c0ed5ea9f9ebfcf00cfe6531169cbdfd02 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 6 Sep 2015 05:15:05 +0200
Subject: [PATCH 312/353] Move Parser into Core folder to autoload

---
 cache/cache_parser_data.php                         | 2 +-
 featherbb/{Helpers/parser.php => Core/Parser.php}   | 4 ++--
 featherbb/{Helpers => Core/parser}/bbcd_compile.php | 0
 featherbb/{Helpers => Core/parser}/bbcd_source.php  | 0
 featherbb/Middleware/Core.php                       | 4 +---
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename featherbb/{Helpers/parser.php => Core/Parser.php} (99%)
 rename featherbb/{Helpers => Core/parser}/bbcd_compile.php (100%)
 rename featherbb/{Helpers => Core/parser}/bbcd_source.php (100%)

diff --git a/cache/cache_parser_data.php b/cache/cache_parser_data.php
index 5c246796..aff40266 100644
--- a/cache/cache_parser_data.php
+++ b/cache/cache_parser_data.php
@@ -1,4 +1,4 @@
-<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 05:08:39. DO NOT EDIT!!!
+<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 05:14:35. DO NOT EDIT!!!
 $pd = array (
   'newer_php_version' => true,
   'in_signature' => false,
diff --git a/featherbb/Helpers/parser.php b/featherbb/Core/Parser.php
similarity index 99%
rename from featherbb/Helpers/parser.php
rename to featherbb/Core/Parser.php
index 1e298343..5c7cf58b 100644
--- a/featherbb/Helpers/parser.php
+++ b/featherbb/Core/Parser.php
@@ -8,7 +8,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-namespace FeatherBB;
+namespace FeatherBB\Core;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER'))
@@ -36,7 +36,7 @@
 }
 
 if (!defined('PARSER_ROOT'))
-    define('PARSER_ROOT', dirname(__FILE__).'/');
+    define('PARSER_ROOT', dirname(__FILE__).'/parser/');
 
 
 class Parser
diff --git a/featherbb/Helpers/bbcd_compile.php b/featherbb/Core/parser/bbcd_compile.php
similarity index 100%
rename from featherbb/Helpers/bbcd_compile.php
rename to featherbb/Core/parser/bbcd_compile.php
diff --git a/featherbb/Helpers/bbcd_source.php b/featherbb/Core/parser/bbcd_source.php
similarity index 100%
rename from featherbb/Helpers/bbcd_source.php
rename to featherbb/Core/parser/bbcd_source.php
diff --git a/featherbb/Middleware/Core.php b/featherbb/Middleware/Core.php
index 65adf69c..a7536989 100644
--- a/featherbb/Middleware/Core.php
+++ b/featherbb/Middleware/Core.php
@@ -212,10 +212,8 @@ public function call()
             return new \FeatherBB\Core\Email();
         });
 
-        // TODO: move parser to autoload
-        require $this->forum_env['FEATHER_ROOT'].'featherbb/Helpers/parser.php';
         $this->app->container->singleton('parser', function () {
-            return new \FeatherBB\Parser();
+            return new \FeatherBB\Core\Parser();
         });
 
         // This is the very first hook fired

From 3ae38a793f2fb6403bfd3f7ebc970e5628fac167 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 6 Sep 2015 05:26:03 +0200
Subject: [PATCH 313/353] Clean useless core namespaces

---
 Plugins/Test.php                                     | 2 +-
 cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache | 2 +-
 cache/cache_parser_data.php                          | 2 +-
 featherbb/Core/Email.php                             | 3 ---
 featherbb/Core/Error.php                             | 2 --
 featherbb/Core/Search.php                            | 1 -
 featherbb/Core/Url.php                               | 2 --
 featherbb/Core/View.php                              | 3 ---
 8 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Plugins/Test.php b/Plugins/Test.php
index bbbe07ca..10280d9a 100644
--- a/Plugins/Test.php
+++ b/Plugins/Test.php
@@ -9,7 +9,7 @@
 
 namespace Plugins;
 
-use \FeatherBB\Core\Plugin as Plugin;
+use FeatherBB\Core\Plugin as Plugin;
 
 class Test extends Plugin
 {
diff --git a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
index 4ee85750..87507104 100644
--- a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
+++ b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
@@ -1 +1 @@
-{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1440702252,"expire":0,"data":"a:4:{i:1;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:2;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:3;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:4;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1441508919,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:23:\"Lighter than a feather.\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:11:\"deuh@oij.gt\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:17:\"style\/img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:26:\"http:\/\/localhost\/featherbb\";s:13:\"o_admin_email\";s:11:\"deuh@oij.gt\";s:17:\"o_webmaster_email\";s:11:\"deuh@oij.gt\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"0\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1440768048,"expire":0,"data":"a:2:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;}"}}
\ No newline at end of file
+{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1440702252,"expire":0,"data":"a:4:{i:1;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:2;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:3;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:4;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1441509895,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:23:\"Lighter than a feather.\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:11:\"deuh@oij.gt\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:17:\"style\/img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:26:\"http:\/\/localhost\/featherbb\";s:13:\"o_admin_email\";s:11:\"deuh@oij.gt\";s:17:\"o_webmaster_email\";s:11:\"deuh@oij.gt\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"0\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1440768048,"expire":0,"data":"a:2:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;}"}}
\ No newline at end of file
diff --git a/cache/cache_parser_data.php b/cache/cache_parser_data.php
index aff40266..02ac754f 100644
--- a/cache/cache_parser_data.php
+++ b/cache/cache_parser_data.php
@@ -1,4 +1,4 @@
-<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 05:14:35. DO NOT EDIT!!!
+<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 05:23:56. DO NOT EDIT!!!
 $pd = array (
   'newer_php_version' => true,
   'in_signature' => false,
diff --git a/featherbb/Core/Email.php b/featherbb/Core/Email.php
index af13c832..10575fb7 100644
--- a/featherbb/Core/Email.php
+++ b/featherbb/Core/Email.php
@@ -9,9 +9,6 @@
 
 namespace FeatherBB\Core;
 
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
-
 class Email
 {
     public function __construct()
diff --git a/featherbb/Core/Error.php b/featherbb/Core/Error.php
index 984c3d8b..1d39dda4 100644
--- a/featherbb/Core/Error.php
+++ b/featherbb/Core/Error.php
@@ -9,8 +9,6 @@
 
 namespace FeatherBB\Core;
 
-use \FeatherBB\Core\Utils;
-
 class Error extends \Exception
 {
     public function __construct($message, $code = 200, $no_back_link = false)
diff --git a/featherbb/Core/Search.php b/featherbb/Core/Search.php
index 28d3f33a..2d91d187 100644
--- a/featherbb/Core/Search.php
+++ b/featherbb/Core/Search.php
@@ -13,7 +13,6 @@
 namespace FeatherBB\Core;
 
 use DB;
-use \FeatherBB\Core\Utils;
 
 class Search
 {
diff --git a/featherbb/Core/Url.php b/featherbb/Core/Url.php
index f72eed75..5c3002ef 100644
--- a/featherbb/Core/Url.php
+++ b/featherbb/Core/Url.php
@@ -9,8 +9,6 @@
 
 namespace FeatherBB\Core;
 
-use FeatherBB\Core\Utils;
-
 class Url
 {
     protected static $url_replace = array(
diff --git a/featherbb/Core/View.php b/featherbb/Core/View.php
index 54964107..e44485b4 100644
--- a/featherbb/Core/View.php
+++ b/featherbb/Core/View.php
@@ -9,9 +9,6 @@
 
 namespace FeatherBB\Core;
 
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
-
 class View
 {
     protected $templatesDirectory,

From 240a933340701d9d994be83c888bfae1e21ca9ad Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 6 Sep 2015 06:02:24 +0200
Subject: [PATCH 314/353] Remove all FEATHER_ROOT globals

---
 ...5bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache |  2 +-
 cache/cache_parser_data.php                   |  2 +-
 featherbb/Controller/Admin/Options.php        |  5 ----
 featherbb/Controller/Admin/Parser.php         | 17 +++++--------
 featherbb/Controller/Admin/Plugins.php        |  9 ++-----
 featherbb/Controller/Auth.php                 |  4 +--
 featherbb/Controller/Edit.php                 | 13 +++-------
 featherbb/Controller/Help.php                 |  4 +--
 featherbb/Controller/Index.php                |  2 +-
 featherbb/Controller/Login.php                |  7 +-----
 featherbb/Controller/Moderate.php             | 13 +++-------
 featherbb/Controller/Profile.php              | 25 ++++++++-----------
 featherbb/Controller/Register.php             | 10 ++++----
 featherbb/Controller/Search.php               | 10 ++++----
 featherbb/Controller/Viewforum.php            |  4 +--
 featherbb/Core/Email.php                      |  2 +-
 featherbb/Core/Lister.php                     |  3 ++-
 featherbb/Core/parser/bbcd_compile.php        |  4 +--
 featherbb/Helpers/functions.php               | 23 +++++++++--------
 featherbb/Model/Admin/Forums.php              |  2 +-
 featherbb/Model/Admin/Parser.php              |  2 +-
 featherbb/Model/Login.php                     |  2 +-
 featherbb/Model/Misc.php                      |  4 +--
 featherbb/Model/Post.php                      | 14 +++++------
 featherbb/Model/Profile.php                   | 18 ++++++-------
 featherbb/Model/Register.php                  | 12 ++++-----
 style/themes/FeatherBB/view/help.php          |  6 ++---
 style/themes/FeatherBB/view/post.php          |  6 ++---
 view/help.php                                 | 10 +++-----
 view/post.php                                 |  6 ++---
 30 files changed, 101 insertions(+), 140 deletions(-)

diff --git a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
index 87507104..9855b626 100644
--- a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
+++ b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
@@ -1 +1 @@
-{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1440702252,"expire":0,"data":"a:4:{i:1;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:2;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:3;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:4;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1441509895,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:23:\"Lighter than a feather.\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:11:\"deuh@oij.gt\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:17:\"style\/img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:26:\"http:\/\/localhost\/featherbb\";s:13:\"o_admin_email\";s:11:\"deuh@oij.gt\";s:17:\"o_webmaster_email\";s:11:\"deuh@oij.gt\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"0\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1440768048,"expire":0,"data":"a:2:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;}"}}
\ No newline at end of file
+{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1440702252,"expire":0,"data":"a:4:{i:1;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:2;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:3;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:4;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1441512071,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:23:\"Lighter than a feather.\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:11:\"deuh@oij.gt\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:17:\"style\/img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:26:\"http:\/\/localhost\/featherbb\";s:13:\"o_admin_email\";s:11:\"deuh@oij.gt\";s:17:\"o_webmaster_email\";s:11:\"deuh@oij.gt\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"0\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1441510035,"expire":0,"data":"a:3:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;s:13:\"\\Plugins\\Test\";b:1;}"}}
\ No newline at end of file
diff --git a/cache/cache_parser_data.php b/cache/cache_parser_data.php
index 02ac754f..819b3f9e 100644
--- a/cache/cache_parser_data.php
+++ b/cache/cache_parser_data.php
@@ -1,4 +1,4 @@
-<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 05:23:56. DO NOT EDIT!!!
+<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 06:01:11. DO NOT EDIT!!!
 $pd = array (
   'newer_php_version' => true,
   'in_signature' => false,
diff --git a/featherbb/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
index 744ede53..b7cd6a72 100644
--- a/featherbb/Controller/Admin/Options.php
+++ b/featherbb/Controller/Admin/Options.php
@@ -26,11 +26,6 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/options.mo');
     }
 
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
-    }
-
     public function display()
     {
         if ($this->feather->request->isPost()) {
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
index e0b1fd83..5a2f6be2 100644
--- a/featherbb/Controller/Admin/Parser.php
+++ b/featherbb/Controller/Admin/Parser.php
@@ -26,25 +26,20 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/parser.mo');
     }
 
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
-    }
-
     public function display()
     {
         global $lang_admin_parser;
 
         // Legacy
-        require FEATHER_ROOT . 'featherbb/lang/' . $this->user->language . '/admin/parser.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . 'featherbb/lang/' . $this->user->language . '/admin/parser.php';
 
         // This is where the parser data lives and breathes.
-        $cache_file = FEATHER_ROOT.'cache/cache_parser_data.php';
+        $cache_file = $this->feather->forum_env['FEATHER_ROOT'].'cache/cache_parser_data.php';
 
         // If RESET button pushed, or no cache file, re-compile master bbcode source file.
         if ($this->request->post('reset') || !file_exists($cache_file)) {
-            require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_source.php');
-            require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_compile.php');
+            require_once($this->feather->forum_env['FEATHER_ROOT'].'featherbb/Core/Parser/bbcd_source.php');
+            require_once($this->feather->forum_env['FEATHER_ROOT'].'featherbb/Core/Parser/bbcd_compile.php');
             redirect(Url::get('admin/parser/'), $lang_admin_parser['reset_success']);
         }
 
@@ -68,7 +63,7 @@ public function display()
                         if (preg_match('/^[\w\-.]++$/', $name)) {            // If we have a valid filename?
                             if (preg_match('%^image/%', $f['type'])) {        // If we have an image file type?
                                 if ($f['size'] > 0 && $f['size'] <= $this->config['o_avatars_size']) {
-                                    if (move_uploaded_file($f['tmp_name'], FEATHER_ROOT .'style/img/smilies/'. $name)) {
+                                    if (move_uploaded_file($f['tmp_name'], $this->feather->forum_env['FEATHER_ROOT'] .'style/img/smilies/'. $name)) {
                                         redirect(Url::get('admin/parser/'), $lang_admin_parser['upload success']);
                                     } else { //  Error #1: 'Smiley upload failed. Unable to move to smiley folder.'.
                                         throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_1'], 500);
@@ -202,7 +197,7 @@ public function display()
                 }
             }
 
-            require_once('featherbb/Helpers/bbcd_compile.php'); // Compile $bbcd and save into $pd['bbcd']
+            require_once('featherbb/Core/parser/bbcd_compile.php'); // Compile $bbcd and save into $pd['bbcd']
             redirect(Url::get('admin/parser/'), $lang_admin_parser['save_success']);
         }
 
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
index 2ee70069..b33722a4 100644
--- a/featherbb/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -24,11 +24,6 @@ public function __construct()
         $this->request = $this->feather->request;
     }
 
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
-    }
-
     public function index()
     {
         // Update permissions
@@ -109,7 +104,7 @@ public function display()
         }
 
         // Make sure the file actually exists
-        if (!file_exists(FEATHER_ROOT.'plugins/'.$plugin)) {
+        if (!file_exists($this->feather->forum_env['FEATHER_ROOT'].'plugins/'.$plugin)) {
             throw new \FeatherBB\Core\Error(sprintf(__('No plugin message'), Utils::escape($plugin)), 400);
         }
 
@@ -121,7 +116,7 @@ public function display()
         // Attempt to load the plugin. We don't use @ here to suppress error messages,
         // because if we did and a parse error occurred in the plugin, we would only
         // get the "blank page of death"
-        include FEATHER_ROOT.'plugins/'.$plugin;
+        include $this->feather->forum_env['FEATHER_ROOT'].'plugins/'.$plugin;
         if (!defined('FEATHER_PLUGIN_LOADED')) {
             throw new \FeatherBB\Core\Error(sprintf(__('Plugin failed message'), Utils::escape($plugin)));
         }
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
index b74424ed..2c30e6fe 100644
--- a/featherbb/Controller/Auth.php
+++ b/featherbb/Controller/Auth.php
@@ -18,7 +18,7 @@ class Auth
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->feather->user->language.'/login.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/login.mo');
     }
 
     public function login()
@@ -105,7 +105,7 @@ public function forget()
 
             if ($user) {
                 // Load the "activate password" template
-                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->feather->user->language.'/mail_templates/activate_password.tpl'));
+                $mail_tpl = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/mail_templates/activate_password.tpl'));
                 $mail_tpl = $this->feather->hooks->fire('mail_tpl_password_forgotten', $mail_tpl);
 
                 // The first row contains the subject
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index 6f30bd3c..b09cd433 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -22,15 +22,10 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \FeatherBB\Model\edit();
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/prof_reg.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/post.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/bbeditor.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/register.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/post.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/bbeditor.mo');
     }
 
     public function editpost($id)
diff --git a/featherbb/Controller/Help.php b/featherbb/Controller/Help.php
index 5294b91b..dbd6dba1 100644
--- a/featherbb/Controller/Help.php
+++ b/featherbb/Controller/Help.php
@@ -21,12 +21,12 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/help.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/help.mo');
     }
 
     public function __autoload($class_name)
     {
-        require FEATHER_ROOT . $class_name . '.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
     }
 
     public function display()
diff --git a/featherbb/Controller/Index.php b/featherbb/Controller/Index.php
index 3c653aa5..b732e8c2 100644
--- a/featherbb/Controller/Index.php
+++ b/featherbb/Controller/Index.php
@@ -18,7 +18,7 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \FeatherBB\Model\Index();
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->feather->user->language.'/index.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/index.mo');
     }
 
     public function display()
diff --git a/featherbb/Controller/Login.php b/featherbb/Controller/Login.php
index e2594f2a..c2c986c8 100644
--- a/featherbb/Controller/Login.php
+++ b/featherbb/Controller/Login.php
@@ -24,12 +24,7 @@ public function __construct()
 
 
         $this->model = new \FeatherBB\Model\Login();
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/login.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/login.mo');
     }
 
     public function display()
diff --git a/featherbb/Controller/Moderate.php b/featherbb/Controller/Moderate.php
index e251488b..0fd5803b 100644
--- a/featherbb/Controller/Moderate.php
+++ b/featherbb/Controller/Moderate.php
@@ -22,15 +22,10 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \FeatherBB\Model\Moderate();
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/topic.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/forum.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/misc.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/post.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/topic.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/forum.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/misc.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/post.mo');
     }
 
     public function gethostpost($pid)
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
index 633db9d3..937fe818 100644
--- a/featherbb/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -22,14 +22,9 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \FeatherBB\Model\Profile();
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/profile.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/prof_reg.mo');
-    }
-
-    public function __autoload($class_name)
-    {
-        require FEATHER_ROOT . $class_name . '.php';
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/profile.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/register.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/prof_reg.mo');
     }
 
     public function display($id, $section = null)
@@ -37,9 +32,9 @@ public function display($id, $section = null)
         global $forum_time_formats, $forum_date_formats;
 
         // Include UTF-8 function
-        require FEATHER_ROOT.'featherbb/Helpers/utf8/substr_replace.php';
-        require FEATHER_ROOT.'featherbb/Helpers/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
-        require FEATHER_ROOT.'featherbb/Helpers/utf8/strcasecmp.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/utf8/substr_replace.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
+        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/utf8/strcasecmp.php';
 
         if ($this->request->post('update_group_membership')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
@@ -96,7 +91,7 @@ public function display($id, $section = null)
         $user = $this->model->get_user_info($id);
 
         if ($user['signature'] != '') {
-            require FEATHER_ROOT.'featherbb/Helpers/parser.php';
+            require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/parser.php';
             $parsed_signature = parse_signature($user['signature']);
         }
 
@@ -247,9 +242,9 @@ public function display($id, $section = null)
     public function action($id, $action)
     {
         // Include UTF-8 function
-        require FEATHER_ROOT.'featherbb/Helpers/utf8/substr_replace.php';
-        require FEATHER_ROOT.'featherbb/Helpers/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
-        require FEATHER_ROOT.'featherbb/Helpers/utf8/strcasecmp.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/utf8/substr_replace.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/utf8/ucwords.php'; // utf8_ucwords needs utf8_substr_replace
+        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/utf8/strcasecmp.php';
 
         if ($action != 'change_pass' || !$this->request->get('key')) {
             if ($this->user->g_read_board == '0') {
diff --git a/featherbb/Controller/Register.php b/featherbb/Controller/Register.php
index dd94b107..06bc5b02 100644
--- a/featherbb/Controller/Register.php
+++ b/featherbb/Controller/Register.php
@@ -22,14 +22,14 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \FeatherBB\Model\Register();
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/register.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/prof_reg.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/antispam.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/register.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/prof_reg.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/antispam.mo');
     }
 
     public function __autoload($class_name)
     {
-        require FEATHER_ROOT . $class_name . '.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
     }
 
     public function display()
@@ -40,7 +40,7 @@ public function display()
         }
 
         // Antispam feature
-        require FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/antispam.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
 
         // Display an error message if new registrations are disabled
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index d3d85aad..72453d5b 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -22,14 +22,14 @@ public function __construct()
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
         $this->model = new \FeatherBB\Model\search();
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/userlist.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/search.mo');
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/forum.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/userlist.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/search.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/forum.mo');
     }
 
     public function __autoload($class_name)
     {
-        require FEATHER_ROOT . $class_name . '.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
     }
 
     public function display()
@@ -48,7 +48,7 @@ public function display()
                 if (isset($search['is_result'])) {
 
                     if ($search['show_as'] == 'posts') {
-                        require FEATHER_ROOT.'featherbb/Helpers/parser.php';
+                        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/parser.php';
                     }
 
                     $this->feather->template->setPageInfo(array(
diff --git a/featherbb/Controller/Viewforum.php b/featherbb/Controller/Viewforum.php
index 3e17d20a..129bc36d 100644
--- a/featherbb/Controller/Viewforum.php
+++ b/featherbb/Controller/Viewforum.php
@@ -18,12 +18,12 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \FeatherBB\Model\Viewforum();
-        load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$this->feather->user->language.'/forum.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/forum.mo');
     }
 
     public function __autoload($class_name)
     {
-        require FEATHER_ROOT . $class_name . '.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
     }
 
     public function display($id, $name = null, $page = null)
diff --git a/featherbb/Core/Email.php b/featherbb/Core/Email.php
index 10575fb7..d3760129 100644
--- a/featherbb/Core/Email.php
+++ b/featherbb/Core/Email.php
@@ -15,7 +15,7 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->config = $this->feather->config;
-        require FEATHER_ROOT . 'featherbb/Helpers/utf8/utils/ascii.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . 'featherbb/Helpers/utf8/utils/ascii.php';
     }
 
     //
diff --git a/featherbb/Core/Lister.php b/featherbb/Core/Lister.php
index dbf39c4a..5c754df4 100644
--- a/featherbb/Core/Lister.php
+++ b/featherbb/Core/Lister.php
@@ -17,8 +17,9 @@ class Lister
     public static function getPluginFiles($folder = '')
     {
         $plugin_files = array();
+        $feather = \Slim\Slim::getInstance();
 
-        $plugins_dir = new \RecursiveDirectoryIterator(FEATHER_ROOT.'plugins/'.$folder);
+        $plugins_dir = new \RecursiveDirectoryIterator($feather->forum_env['FEATHER_ROOT'].'plugins/'.$folder);
         $iterator = new \RecursiveIteratorIterator($plugins_dir);
         $iterator->setMaxDepth(1);
         $php_files = new \RegexIterator($iterator, '/.+\.php$/i', \RecursiveRegexIterator::GET_MATCH);
diff --git a/featherbb/Core/parser/bbcd_compile.php b/featherbb/Core/parser/bbcd_compile.php
index 8035debb..29f07dfa 100644
--- a/featherbb/Core/parser/bbcd_compile.php
+++ b/featherbb/Core/parser/bbcd_compile.php
@@ -181,7 +181,7 @@
 $feather = \Slim\Slim::getInstance();
 // Validate and compute replacement texts for smilies array.
 $re_keys = array();                                    // Array of regex-safe smiley texts.
-$file_path = FEATHER_ROOT . 'style/img/smilies/';                // File system path to smilies.
+$file_path = $feather->forum_env['FEATHER_ROOT'] . 'style/img/smilies/';                // File system path to smilies.
 $url_path = $feather->request->getScriptName();                        // Convert abs URL to relative URL.
 $url_path = preg_replace('%^https?://[^/]++(.*)$%i', '$1', $url_path) . '/style/img/smilies/';
 foreach ($smilies as $smiley_text => $smiley_img) {    // Loop through all smilieys in array.
@@ -419,7 +419,7 @@ function file2title($file)
 $s .= ";\n";
 
 $s .= "?>";
-file_put_contents(FEATHER_ROOT.'cache/cache_parser_data.php', $s);
+file_put_contents($feather->forum_env['FEATHER_ROOT'].'cache/cache_parser_data.php', $s);
 
 // Clean up our global variables.
 unset($all_tags); unset($all_block_tags);
diff --git a/featherbb/Helpers/functions.php b/featherbb/Helpers/functions.php
index 099abb9b..7cae69c8 100644
--- a/featherbb/Helpers/functions.php
+++ b/featherbb/Helpers/functions.php
@@ -29,12 +29,13 @@ function get_admin_ids()
 function check_username($username, $errors, $exclude_id = null)
 {
     global $feather, $errors, $feather_bans;
+    $feather = \Slim\Slim::getInstance();
 
     // Include UTF-8 function
-    require_once FEATHER_ROOT.'featherbb/Helpers/utf8/strcasecmp.php';
+    require_once $feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/utf8/strcasecmp.php';
 
-    load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$feather->user->language.'/register.mo');
-    load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$feather->user->language.'/prof_reg.mo');
+    load_textdomain('featherbb', $feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$feather->user->language.'/register.mo');
+    load_textdomain('featherbb', $feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$feather->user->language.'/prof_reg.mo');
 
     // Convert multiple whitespace characters into one (to prevent people from registering with indistinguishable usernames)
     $username = preg_replace('%\s+%s', ' ', $username);
@@ -94,8 +95,8 @@ function generate_avatar_markup($user_id)
     foreach ($filetypes as $cur_type) {
         $path = $feather->config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type;
 
-        if (file_exists(FEATHER_ROOT.$path) && $img_size = getimagesize(FEATHER_ROOT.$path)) {
-            $avatar_markup = '<img src="'.\FeatherBB\Core\Utils::escape($feather->url->base(true).'/'.$path.'?m='.filemtime(FEATHER_ROOT.$path)).'" '.$img_size[3].' alt="" />';
+        if (file_exists($feather->forum_env['FEATHER_ROOT'].$path) && $img_size = getimagesize($feather->forum_env['FEATHER_ROOT'].$path)) {
+            $avatar_markup = '<img src="'.\FeatherBB\Core\Utils::escape($feather->url->base(true).'/'.$path.'?m='.filemtime($feather->forum_env['FEATHER_ROOT'].$path)).'" '.$img_size[3].' alt="" />';
             break;
         }
     }
@@ -225,14 +226,14 @@ function update_forum($forum_id)
 //
 function delete_avatar($user_id)
 {
-    global $feather_config;
+    $feather = \Slim\Slim::getInstance();
 
     $filetypes = array('jpg', 'gif', 'png');
 
     // Delete user avatar
     foreach ($filetypes as $cur_type) {
-        if (file_exists(FEATHER_ROOT.$feather_config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type)) {
-            @unlink(FEATHER_ROOT.$feather_config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type);
+        if (file_exists($feather->forum_env['FEATHER_ROOT'].$feather->config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type)) {
+            @unlink($feather->forum_env['FEATHER_ROOT'].$feather->config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type);
         }
     }
 }
@@ -414,8 +415,9 @@ function get_title($user)
 //
 function random_key($len, $readable = false, $hash = false)
 {
+    $feather = \Slim\Slim::getInstance();
     if (!function_exists('secure_random_bytes')) {
-        include FEATHER_ROOT.'featherbb/Helpers/srand.php';
+        include $feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/srand.php';
     }
 
     $key = secure_random_bytes($len);
@@ -465,7 +467,8 @@ function redirect($destination_url, $message = null)
 //
 function generate_stopwords_cache_id()
 {
-    $files = glob(FEATHER_ROOT.'featherbb/lang/*/stopwords.txt');
+    $feather = \Slim\Slim::getInstance();
+    $files = glob($feather->forum_env['FEATHER_ROOT'].'featherbb/lang/*/stopwords.txt');
     if ($files === false) {
         return 'cache_id_error';
     }
diff --git a/featherbb/Model/Admin/Forums.php b/featherbb/Model/Admin/Forums.php
index 442f188e..d54ebdb2 100644
--- a/featherbb/Model/Admin/Forums.php
+++ b/featherbb/Model/Admin/Forums.php
@@ -58,7 +58,7 @@ public function update_forum($forum_id, array $forum_data)
     public function delete_forum($forum_id)
     {
         // Load the maintenance.php model file for prune public function
-        require FEATHER_ROOT . 'model/admin/maintenance.php';
+        require $this->feather->forum_env['FEATHER_ROOT'] . 'model/admin/maintenance.php';
 
         $forum_id = $this->hook->fire('delete_forum_start', $forum_id);
 
diff --git a/featherbb/Model/Admin/Parser.php b/featherbb/Model/Admin/Parser.php
index 13f62002..b80f97a8 100644
--- a/featherbb/Model/Admin/Parser.php
+++ b/featherbb/Model/Admin/Parser.php
@@ -31,7 +31,7 @@ public function __construct()
     public function get_smiley_files()
     {
         $imgfiles = array();
-        $filelist = scandir(FEATHER_ROOT.'style/img/smilies');
+        $filelist = scandir($this->feather->forum_env['FEATHER_ROOT'].'style/img/smilies');
         $filelist = $this->hook->fire('parser.get_smiley_files.filelist', $filelist);
         foreach ($filelist as $file) {
             if (preg_match('/\.(?:png|gif|jpe?g)$/', $file)) {
diff --git a/featherbb/Model/Login.php b/featherbb/Model/Login.php
index 8524300b..e2def2b6 100644
--- a/featherbb/Model/Login.php
+++ b/featherbb/Model/Login.php
@@ -149,7 +149,7 @@ public function password_forgotten()
 
                 if ($result) {
                     // Load the "activate password" template
-                    $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/activate_password.tpl'));
+                    $mail_tpl = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/mail_templates/activate_password.tpl'));
                     $mail_tpl = $this->hook->fire('mail_tpl_password_forgotten', $mail_tpl);
 
                     // The first row contains the subject
diff --git a/featherbb/Model/Misc.php b/featherbb/Model/Misc.php
index 2ed59014..7263a121 100644
--- a/featherbb/Model/Misc.php
+++ b/featherbb/Model/Misc.php
@@ -84,7 +84,7 @@ public function send_email($mail)
         }
 
         // Load the "form email" template
-        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/form_email.tpl'));
+        $mail_tpl = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/mail_templates/form_email.tpl'));
         $mail_tpl = $this->hook->fire('send_email_mail_tpl', $mail_tpl);
 
         // The first row contains the subject
@@ -196,7 +196,7 @@ public function insert_report($post_id)
             // We send it to the complete mailing-list in one swoop
             if ($this->config['o_mailing_list'] != '') {
                 // Load the "new report" template
-                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/new_report.tpl'));
+                $mail_tpl = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/mail_templates/new_report.tpl'));
                 $mail_tpl = $this->hook->fire('insert_report_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
index 8a2e4373..733f7ed3 100644
--- a/featherbb/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -386,13 +386,13 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
             foreach($result as $cur_subscriber) {
                 // Is the subscription email for $cur_subscriber['language'] cached or not?
                 if (!isset($notification_emails[$cur_subscriber['language']])) {
-                    if (file_exists(FEATHER_ROOT.'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl')) {
+                    if (file_exists($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl')) {
                         // Load the "new reply" template
-                        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl'));
+                        $mail_tpl = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl'));
                         $mail_tpl = $this->hook->fire('send_notifications_reply_mail_tpl', $mail_tpl);
 
                         // Load the "new reply full" template (with post included)
-                        $mail_tpl_full = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_reply_full.tpl'));
+                        $mail_tpl_full = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_reply_full.tpl'));
                         $mail_tpl_full = $this->hook->fire('send_notifications_reply_mail_tpl_full', $mail_tpl_full);
 
                         // The first row contains the subject (it also starts with "Subject:")
@@ -595,13 +595,13 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
             foreach($result as $cur_subscriber) {
                 // Is the subscription email for $cur_subscriber['language'] cached or not?
                 if (!isset($notification_emails[$cur_subscriber['language']])) {
-                    if (file_exists(FEATHER_ROOT.'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_topic.tpl')) {
+                    if (file_exists($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_topic.tpl')) {
                         // Load the "new topic" template
-                        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_topic.tpl'));
+                        $mail_tpl = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_topic.tpl'));
                         $mail_tpl = $this->hook->fire('send_notifications_new_topic_mail_tpl', $mail_tpl);
 
                         // Load the "new topic full" template (with post included)
-                        $mail_tpl_full = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_topic_full.tpl'));
+                        $mail_tpl_full = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$cur_subscriber['language'].'/mail_templates/new_topic_full.tpl'));
 
                         // The first row contains the subject (it also starts with "Subject:")
                         $first_crlf = strpos($mail_tpl, "\n");
@@ -660,7 +660,7 @@ public function warn_banned_user($post, $new_pid)
         $this->hook->fire('warn_banned_user_start', $post, $new_pid);
 
         // Load the "banned email post" template
-        $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/banned_email_post.tpl'));
+        $mail_tpl = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/mail_templates/banned_email_post.tpl'));
         $mail_tpl = $this->hook->fire('warn_banned_user_mail_tpl', $mail_tpl);
 
         // The first row contains the subject
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index 8bd03ce2..17d59717 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -217,7 +217,7 @@ public function change_email($id)
                     throw new \FeatherBB\Core\Error(__('Banned email'), 403);
                 } elseif ($this->config['o_mailing_list'] != '') {
                     // Load the "banned email change" template
-                    $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/banned_email_change.tpl'));
+                    $mail_tpl = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/mail_templates/banned_email_change.tpl'));
                     $mail_tpl = $this->hook->fire('change_email_mail_tpl', $mail_tpl);
 
                     // The first row contains the subject
@@ -254,7 +254,7 @@ public function change_email($id)
                     }
 
                     // Load the "dupe email change" template
-                    $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/dupe_email_change.tpl'));
+                    $mail_tpl = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/mail_templates/dupe_email_change.tpl'));
                     $mail_tpl = $this->hook->fire('change_email_mail_dupe_tpl', $mail_tpl);
 
                     // The first row contains the subject
@@ -291,7 +291,7 @@ public function change_email($id)
             $user = $user->save();
 
             // Load the "activate email" template
-            $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/activate_email.tpl'));
+            $mail_tpl = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/mail_templates/activate_email.tpl'));
             $mail_tpl = $this->hook->fire('change_email_mail_activate_tpl', $mail_tpl);
 
             // The first row contains the subject
@@ -369,11 +369,11 @@ public function upload_avatar($id, $files_data)
             }
 
             // Move the file to the avatar directory. We do this before checking the width/height to circumvent open_basedir restrictions
-            if (!@move_uploaded_file($uploaded_file['tmp_name'], FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp')) {
+            if (!@move_uploaded_file($uploaded_file['tmp_name'], $this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.'.tmp')) {
                 throw new \FeatherBB\Core\Error(__('Move failed').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.');
             }
 
-            list($width, $height, $type, ) = @getimagesize(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
+            list($width, $height, $type, ) = @getimagesize($this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.'.tmp');
 
             // Determine type
             if ($type == IMAGETYPE_GIF) {
@@ -384,20 +384,20 @@ public function upload_avatar($id, $files_data)
                 $extension = '.png';
             } else {
                 // Invalid type
-                @unlink(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
+                @unlink($this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.'.tmp');
                 throw new \FeatherBB\Core\Error(__('Bad type'));
             }
 
             // Now check the width/height
             if (empty($width) || empty($height) || $width > $this->config['o_avatars_width'] || $height > $this->config['o_avatars_height']) {
-                @unlink(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp');
+                @unlink($this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.'.tmp');
                 throw new \FeatherBB\Core\Error(__('Too wide or high').' '.$this->config['o_avatars_width'].'x'.$this->config['o_avatars_height'].' '.__('pixels').'.');
             }
 
             // Delete any old avatars and put the new one in place
             delete_avatar($id);
-            @rename(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.'.tmp', FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.$extension);
-            @chmod(FEATHER_ROOT.$this->config['o_avatars_dir'].'/'.$id.$extension, 0644);
+            @rename($this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.'.tmp', $this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.$extension);
+            @chmod($this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.$extension, 0644);
         } else {
             throw new \FeatherBB\Core\Error(__('Unknown failure'));
         }
diff --git a/featherbb/Model/Register.php b/featherbb/Model/Register.php
index d5e58426..3a2ac0a5 100644
--- a/featherbb/Model/Register.php
+++ b/featherbb/Model/Register.php
@@ -71,7 +71,7 @@ public function check_for_errors()
         }
 
         // Antispam feature
-        require FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/antispam.php';
+        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/antispam.php';
         $question = $this->request->post('captcha_q') ? trim($this->request->post('captcha_q')) : '';
         $answer = $this->request->post('captcha') ? strtoupper(trim($this->request->post('captcha'))) : '';
         $lang_antispam_questions_array = array();
@@ -120,7 +120,7 @@ public function check_for_errors()
         // Make sure we got a valid language string
         if ($this->request->post('language')) {
             $user['language'] = preg_replace('%[\.\\\/]%', '', $this->request->post('language'));
-            if (!file_exists(FEATHER_ROOT.'featherbb/lang/'.$user['language'].'/common.po')) {
+            if (!file_exists($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$user['language'].'/common.po')) {
                 throw new \FeatherBB\Core\Error(__('Bad request'), 500);
             }
         } else {
@@ -181,7 +181,7 @@ public function insert_user($user)
             // If we previously found out that the email was banned
             if (isset($user['banned_email'])) {
                 // Load the "banned email register" template
-                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/banned_email_register.tpl'));
+                $mail_tpl = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/mail_templates/banned_email_register.tpl'));
                 $mail_tpl = $this->hook->fire('insert_user_banned_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
@@ -202,7 +202,7 @@ public function insert_user($user)
             // If we previously found out that the email was a dupe
             if (!empty($dupe_list)) {
                 // Load the "dupe email register" template
-                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/dupe_email_register.tpl'));
+                $mail_tpl = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/mail_templates/dupe_email_register.tpl'));
                 $mail_tpl = $this->hook->fire('insert_user_dupe_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
@@ -223,7 +223,7 @@ public function insert_user($user)
             // Should we alert people on the admin mailing list that a new user has registered?
             if ($this->config['o_regs_report'] == '1') {
                 // Load the "new user" template
-                $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/new_user.tpl'));
+                $mail_tpl = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/mail_templates/new_user.tpl'));
                 $mail_tpl = $this->hook->fire('insert_user_new_mail_tpl', $mail_tpl);
 
                 // The first row contains the subject
@@ -246,7 +246,7 @@ public function insert_user($user)
         // Must the user verify the registration or do we log him/her in right now?
         if ($this->config['o_regs_verify'] == '1') {
             // Load the "welcome" template
-            $mail_tpl = trim(file_get_contents(FEATHER_ROOT.'featherbb/lang/'.$this->user->language.'/mail_templates/welcome.tpl'));
+            $mail_tpl = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/mail_templates/welcome.tpl'));
             $mail_tpl = $this->hook->fire('insert_user_welcome_mail_tpl', $mail_tpl);
 
             // The first row contains the subject
diff --git a/style/themes/FeatherBB/view/help.php b/style/themes/FeatherBB/view/help.php
index 4e4f1c95..5390cf74 100644
--- a/style/themes/FeatherBB/view/help.php
+++ b/style/themes/FeatherBB/view/help.php
@@ -128,16 +128,14 @@
 <?php
 
 // Display the smiley set
-require FEATHER_ROOT.'featherbb/Helpers/parser.php';
-
 $smiley_groups = array();
 
-foreach ($pd['smilies'] as $smiley_text => $smiley_data) {
+foreach ($feather->parser->pd['smilies'] as $smiley_text => $smiley_data) {
     $smiley_groups[$smiley_data['file']][] = $smiley_text;
 }
 
 foreach ($smiley_groups as $smiley_img => $smiley_texts) {
-    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
+    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$feather->parser->pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
 }
 
 ?>
diff --git a/style/themes/FeatherBB/view/post.php b/style/themes/FeatherBB/view/post.php
index 1cd656c2..b901febd 100644
--- a/style/themes/FeatherBB/view/post.php
+++ b/style/themes/FeatherBB/view/post.php
@@ -55,10 +55,8 @@
 <?php
 
 } elseif ($feather->request->post('preview')) {
-    require_once FEATHER_ROOT.'featherbb/Helpers/parser.php';
-    $preview_message = parse_message($post['message'], $post['hide_smilies']);
-
-    ?>
+    $preview_message = $feather->parser->parse_message($post['message'], $post['hide_smilies']);
+?>
 <div id="postpreview" class="blockpost">
 	<h2><span><?php _e('Post preview') ?></span></h2>
 	<div class="box">
diff --git a/view/help.php b/view/help.php
index 1c659744..15dca5cf 100644
--- a/view/help.php
+++ b/view/help.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -124,18 +124,16 @@
 <?php
 
 // Display the smiley set
-require FEATHER_ROOT.'featherbb/Helpers/parser.php';
-
 $smiley_groups = array();
 
-foreach ($pd['smilies'] as $smiley_text => $smiley_data) {
+foreach ($feather->parser->pd['smilies'] as $smiley_text => $smiley_data) {
     $smiley_groups[$smiley_data['file']][] = $smiley_text;
 }
 
 foreach ($smiley_groups as $smiley_img => $smiley_texts) {
-    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
+    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$feather->parser->pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
 }
 
 ?>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/post.php b/view/post.php
index 17c888c4..e80ff3d2 100644
--- a/view/post.php
+++ b/view/post.php
@@ -52,10 +52,8 @@
 <?php
 
 } elseif ($feather->request->post('preview')) {
-    require_once FEATHER_ROOT.'featherbb/Helpers/parser.php';
-    $preview_message = parse_message($post['message'], $post['hide_smilies']);
-
-    ?>
+    $preview_message = $feather->parser->parse_message($post['message'], $post['hide_smilies']);
+?>
 <div id="postpreview" class="blockpost">
 	<h2><span><?php _e('Post preview') ?></span></h2>
 	<div class="box">

From 50b39656e92ba7c7e7bbf2903b9b4444403dbb47 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 6 Sep 2015 14:10:36 +0200
Subject: [PATCH 315/353] Restore BBCode editor toolbar

---
 cache/cache_parser_data.php                   |  2 +-
 featherbb/Controller/Admin/Plugins.php        |  3 +-
 style/imports/bbeditor.js                     | 30 +++++++++----------
 style/themes/FeatherBB/view/admin/plugins.php | 15 ++++++++++
 style/themes/FeatherBB/view/edit.php          |  6 ++--
 style/themes/FeatherBB/view/post.php          |  2 +-
 style/themes/FeatherBB/view/viewtopic.php     |  2 +-
 view/admin/plugins.php                        | 15 ++++++++++
 view/edit.php                                 |  6 ++--
 view/post.php                                 |  2 +-
 view/viewtopic.php                            |  2 +-
 11 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/cache/cache_parser_data.php b/cache/cache_parser_data.php
index 819b3f9e..e978c1fc 100644
--- a/cache/cache_parser_data.php
+++ b/cache/cache_parser_data.php
@@ -1,4 +1,4 @@
-<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 06:01:11. DO NOT EDIT!!!
+<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 02:08:51. DO NOT EDIT!!!
 $pd = array (
   'newer_php_version' => true,
   'in_signature' => false,
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
index b33722a4..a9258a1d 100644
--- a/featherbb/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -31,7 +31,8 @@ public function index()
         //     $this->model->update_permissions();
         // }
 
-        AdminUtils::generateAdminMenu('plugins');
+        // AdminUtils::generateAdminMenu('plugins');
+        $this->feather->template->addAsset('js', 'style/imports/common.js', array('type' => 'text/javascript'));
 
         $pluginsList = \FeatherBB\Core\Lister::getValidPlugins();
         // var_dump($pluginsList);
diff --git a/style/imports/bbeditor.js b/style/imports/bbeditor.js
index 4a38cc09..e125b746 100644
--- a/style/imports/bbeditor.js
+++ b/style/imports/bbeditor.js
@@ -22,30 +22,30 @@ var content;
 // Import dependencies
 document.write('<link href="'+baseUrl+'/style/imports/bbeditor.css" rel="stylesheet" type="text/css">');
 document.write('<link href="'+baseUrl+'/style/imports/colorPicker.css" rel="stylesheet" type="text/css">');
-document.write('<script src="'+baseUrl+'/js/colorPicker.js"  type="text/javascript"></script>');
+document.write('<script src="'+baseUrl+'/style/imports/colorPicker.js"  type="text/javascript"></script>');
 
 
 function postEditorToolbar(obj) {
 	// Toolbar buttons
 	document.write("<div class=\"toolbar\">");
-		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/img/bbeditor/bold.png\" name=\"btnBold\" title=\""+langBbeditor.btnBold+"\" onClick=\"doAddTags('[b]','[/b]','" + obj + "')\">");
-		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/img/bbeditor/italic.png\" name=\"btnItalic\" title=\""+langBbeditor.btnItalic+"\" onClick=\"doAddTags('[i]','[/i]','" + obj + "')\">");
-		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/img/bbeditor/underline.png\" name=\"btnUnderline\" title=\""+langBbeditor.btnUnderline+"\" onClick=\"doAddTags('[u]','[/u]','" + obj + "')\">");
-		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/img/bbeditor/eyedropper.png\" name=\"btnColor\" title=\""+langBbeditor.btnColor+"\" onClick=\"toggleColorpicker()\">");
+		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/style/img/bbeditor/bold.png\" name=\"btnBold\" title=\""+langBbeditor.btnBold+"\" onClick=\"doAddTags('[b]','[/b]','" + obj + "')\">");
+		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/style/img/bbeditor/italic.png\" name=\"btnItalic\" title=\""+langBbeditor.btnItalic+"\" onClick=\"doAddTags('[i]','[/i]','" + obj + "')\">");
+		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/style/img/bbeditor/underline.png\" name=\"btnUnderline\" title=\""+langBbeditor.btnUnderline+"\" onClick=\"doAddTags('[u]','[/u]','" + obj + "')\">");
+		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/style/img/bbeditor/eyedropper.png\" name=\"btnColor\" title=\""+langBbeditor.btnColor+"\" onClick=\"toggleColorpicker()\">");
 		document.write('<span class="toolbar-separator"></span>');
-		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/img/bbeditor/align-left.png\" name=\"btnLeft\" title=\""+langBbeditor.btnLeft+"\" onClick=\"doAddTags('[left]','[/left]','" + obj + "')\">");
-		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/img/bbeditor/align-right.png\" name=\"btnRight\" title=\""+langBbeditor.btnRight+"\" onClick=\"doAddTags('[right]','[/right]','" + obj + "')\">");
-		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/img/bbeditor/align-justify.png\" name=\"btnJustify\" title=\""+langBbeditor.btnJustify+"\" onClick=\"doAddTags('[justify]','[/justify]','" + obj + "')\">");
-		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/img/bbeditor/align-center.png\" name=\"btnCenter\" title=\""+langBbeditor.btnCenter+"\" onClick=\"doAddTags('[center]','[/center]','" + obj + "')\">");
+		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/style/img/bbeditor/align-left.png\" name=\"btnLeft\" title=\""+langBbeditor.btnLeft+"\" onClick=\"doAddTags('[left]','[/left]','" + obj + "')\">");
+		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/style/img/bbeditor/align-right.png\" name=\"btnRight\" title=\""+langBbeditor.btnRight+"\" onClick=\"doAddTags('[right]','[/right]','" + obj + "')\">");
+		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/style/img/bbeditor/align-justify.png\" name=\"btnJustify\" title=\""+langBbeditor.btnJustify+"\" onClick=\"doAddTags('[justify]','[/justify]','" + obj + "')\">");
+		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/style/img/bbeditor/align-center.png\" name=\"btnCenter\" title=\""+langBbeditor.btnCenter+"\" onClick=\"doAddTags('[center]','[/center]','" + obj + "')\">");
 		document.write('<span class="toolbar-separator"></span>');
-		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/img/bbeditor/link.png\" name=\"btnLink\" title=\""+langBbeditor.btnLink+"\" onClick=\"doURL('" + obj + "')\">");
-		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/img/bbeditor/file-image-o.png\" name=\"btnPicture\" title=\""+langBbeditor.btnPicture+"\" onClick=\"doImage('" + obj + "')\">");
+		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/style/img/bbeditor/link.png\" name=\"btnLink\" title=\""+langBbeditor.btnLink+"\" onClick=\"doURL('" + obj + "')\">");
+		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/style/img/bbeditor/file-image-o.png\" name=\"btnPicture\" title=\""+langBbeditor.btnPicture+"\" onClick=\"doImage('" + obj + "')\">");
 		document.write('<span class="toolbar-separator"></span>');
-		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/img/bbeditor/list-ol.png\" name=\"btnList\" title=\""+langBbeditor.btnList+"\" onClick=\"doList('[list=1]','[/list]','" + obj + "')\">");
-		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/img/bbeditor/list-ul.png\" name=\"btnList\" title=\""+langBbeditor.btnList+"\" onClick=\"doList('[list]','[/list]','" + obj + "')\">");
+		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/style/img/bbeditor/list-ol.png\" name=\"btnList\" title=\""+langBbeditor.btnList+"\" onClick=\"doList('[list=1]','[/list]','" + obj + "')\">");
+		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/style/img/bbeditor/list-ul.png\" name=\"btnList\" title=\""+langBbeditor.btnList+"\" onClick=\"doList('[list]','[/list]','" + obj + "')\">");
 		document.write('<span class="toolbar-separator"></span>');
-		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/img/bbeditor/quote-left.png\" name=\"btnQuote\" title=\""+langBbeditor.btnQuote+"\" onClick=\"doQuote('" + obj + "')\">");
-		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/img/bbeditor/code.png\" name=\"btnCode\" title=\""+langBbeditor.btnCode+"\" onClick=\"doAddTags('[code]','[/code]','" + obj + "')\">");
+		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/style/img/bbeditor/quote-left.png\" name=\"btnQuote\" title=\""+langBbeditor.btnQuote+"\" onClick=\"doQuote('" + obj + "')\">");
+		document.write("<img class=\"toolbar-icon\" src=\""+baseUrl+"/style/img/bbeditor/code.png\" name=\"btnCode\" title=\""+langBbeditor.btnCode+"\" onClick=\"doAddTags('[code]','[/code]','" + obj + "')\">");
 		// document.write("<i class=\"fa fa-smile-o toolbar-icon\" title=\"Smilies\" onClick=\"doSmiley('" + obj + "')\"></i>");
 	document.write("</div>");
 
diff --git a/style/themes/FeatherBB/view/admin/plugins.php b/style/themes/FeatherBB/view/admin/plugins.php
index 737267bc..074617d2 100644
--- a/style/themes/FeatherBB/view/admin/plugins.php
+++ b/style/themes/FeatherBB/view/admin/plugins.php
@@ -15,6 +15,21 @@
     exit;
 }
 ?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
 <div class="block">
     <h2>Plugins</h2>
     <div class="box">
diff --git a/style/themes/FeatherBB/view/edit.php b/style/themes/FeatherBB/view/edit.php
index 2792b4d8..44d6eb4b 100644
--- a/style/themes/FeatherBB/view/edit.php
+++ b/style/themes/FeatherBB/view/edit.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
@@ -75,7 +75,7 @@
     var baseUrl = '<?php echo Utils::escape(Url::base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
-<script src="<?php echo Url::base() ?>/js/bbeditor.js"></script>
+<script src="<?php echo Url::base() ?>/style/imports/bbeditor.js"></script>
 <div id="editform" class="blockform">
 	<h2><span><?php _e('Edit post') ?></span></h2>
 	<div class="box">
@@ -119,4 +119,4 @@
 			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/post.php b/style/themes/FeatherBB/view/post.php
index b901febd..36e6fa94 100644
--- a/style/themes/FeatherBB/view/post.php
+++ b/style/themes/FeatherBB/view/post.php
@@ -85,7 +85,7 @@
     var baseUrl = '<?php echo Utils::escape(Url::base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
-<script src="<?php echo Url::base() ?>/js/bbeditor.js"></script>
+<script src="<?php echo Url::base() ?>/style/imports/bbeditor.js"></script>
 
 <div id="postform" class="blockform">
 	<h2><span><?php echo $action ?></span></h2>
diff --git a/style/themes/FeatherBB/view/viewtopic.php b/style/themes/FeatherBB/view/viewtopic.php
index f19df222..f1b40f7f 100644
--- a/style/themes/FeatherBB/view/viewtopic.php
+++ b/style/themes/FeatherBB/view/viewtopic.php
@@ -161,7 +161,7 @@
     var baseUrl = '<?php echo Utils::escape(Url::base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
-<script src="<?php echo Url::base() ?>/js/bbeditor.js"></script>
+<script src="<?php echo Url::base() ?>/style/imports/bbeditor.js"></script>
 <script>postEditorToolbar('req_message');</script>
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
diff --git a/view/admin/plugins.php b/view/admin/plugins.php
index c09245ed..a6ec6472 100644
--- a/view/admin/plugins.php
+++ b/view/admin/plugins.php
@@ -12,6 +12,21 @@
     exit;
 }
 ?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
 <div class="block">
     <h2>Plugins</h2>
     <div class="box">
diff --git a/view/edit.php b/view/edit.php
index 990b9eec..df3bc126 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -72,7 +72,7 @@
     var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
-<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
+<script src="<?php echo Url::base() ?>/style/imports/bbeditor.js"></script>
 <div id="editform" class="blockform">
 	<h2><span><?php _e('Edit post') ?></span></h2>
 	<div class="box">
@@ -116,4 +116,4 @@
 			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/post.php b/view/post.php
index e80ff3d2..e5509137 100644
--- a/view/post.php
+++ b/view/post.php
@@ -82,7 +82,7 @@
     var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
-<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
+<script src="<?php echo Url::base() ?>/style/imports/bbeditor.js"></script>
 
 <div id="postform" class="blockform">
 	<h2><span><?php echo $action ?></span></h2>
diff --git a/view/viewtopic.php b/view/viewtopic.php
index b97809aa..c90e7fa1 100644
--- a/view/viewtopic.php
+++ b/view/viewtopic.php
@@ -158,7 +158,7 @@
     var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
         langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
 </script>
-<script src="<?php echo $feather->url->base() ?>/js/bbeditor.js"></script>
+<script src="<?php echo Url::base() ?>/style/imports/bbeditor.js"></script>
 <script>postEditorToolbar('req_message');</script>
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>

From 0d7d4d0e20a96ae6e0a4730fb4586fad8dee0479 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 6 Sep 2015 14:22:27 +0200
Subject: [PATCH 316/353] Remove old header and footer

---
 cache/cache_parser_data.php                |   2 +-
 featherbb/Core/View.php                    |   4 +-
 style/themes/FeatherBB/view/footer.new.php | 168 --------------
 style/themes/FeatherBB/view/footer.php     | 101 ++++++---
 style/themes/FeatherBB/view/header.new.php | 243 ---------------------
 style/themes/FeatherBB/view/header.php     | 150 +++++++++++--
 6 files changed, 199 insertions(+), 469 deletions(-)
 delete mode 100644 style/themes/FeatherBB/view/footer.new.php
 delete mode 100644 style/themes/FeatherBB/view/header.new.php

diff --git a/cache/cache_parser_data.php b/cache/cache_parser_data.php
index e978c1fc..022cd635 100644
--- a/cache/cache_parser_data.php
+++ b/cache/cache_parser_data.php
@@ -1,4 +1,4 @@
-<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 02:08:51. DO NOT EDIT!!!
+<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 02:22:10. DO NOT EDIT!!!
 $pd = array (
   'newer_php_version' => true,
   'in_signature' => false,
diff --git a/featherbb/Core/View.php b/featherbb/Core/View.php
index e44485b4..89424f65 100644
--- a/featherbb/Core/View.php
+++ b/featherbb/Core/View.php
@@ -234,13 +234,13 @@ protected function render($data = null, $nested = true)
         ob_start();
 
         if ($nested) {
-            require $this->getTemplatePathname('header.new.php');
+            require $this->getTemplatePathname('header.php');
         }
         foreach ($this->getTemplates() as $tpl) {
             require $tpl;
         }
         if ($nested) {
-            require $this->getTemplatePathname('footer.new.php');
+            require $this->getTemplatePathname('footer.php');
         }
         return ob_get_clean();
     }
diff --git a/style/themes/FeatherBB/view/footer.new.php b/style/themes/FeatherBB/view/footer.new.php
deleted file mode 100644
index 12828ed6..00000000
--- a/style/themes/FeatherBB/view/footer.new.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-</div>
-
-<div id="brdfooter" class="block">
-	<h2><span><?php _e('Board footer') ?></span></h2>
-	<div class="box">
-<?php
-
-if (isset($active_page) && ($active_page == 'viewforum' || $active_page == 'viewtopic') && $feather->user->is_admmod) {
-    echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
-
-    if ($active_page == 'viewforum') {
-        echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/forum/'.$fid.'/page/'.$page_number.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
-        echo "\t\t\t".'</dl>'."\n";
-    } elseif ($active_page == 'viewtopic') {
-        if (isset($pid)) {
-            $parameter = 'param/'.$pid.'/';
-        } elseif (isset($page_number) && $page_number != 1) {
-            $parameter = 'param/'.$page_number.'/';
-        } else {
-            $parameter = '';
-        }
-
-
-        echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/moderate/page/'.$page_number.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
-
-        if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
-        } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
-        }
-
-        if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
-        } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
-        }
-
-        echo "\t\t\t".'</dl>'."\n";
-    }
-
-    echo "\t\t\t".'<div class="clearer"></div>'."\n\t\t".'</div>'."\n";
-}
-
-?>
-		<div id="brdfooternav" class="inbox">
-
-<?php
-// Display the "Jump to" drop list
-if ($feather->forum_settings['o_quickjump'] == '1' && !empty($quickjump)) { ?>
-			<div class="conl">
-			<form id="qjump" method="get" action="">
-				<div><label><span><?php _e('Jump to') ?><br /></span></label>
-					<select name="id" onchange="window.location=('<?php echo Url::get('forum/') ?>'+this.options[this.selectedIndex].value)">
-<?php
-		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
-			echo "\t\t\t\t\t\t\t".'<optgroup label="'.Utils::escape($cat_data['cat_name']).'">'."\n";
-			foreach ($cat_data['cat_forums'] as $forum) {
-				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($fid == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
-			}
-			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
-		} ?>
-					</select>
-					<noscript><input type="submit" value="<?php _e('Go') ?>" accesskey="g" /></noscript>
-				</div>
-			</form>
-			</div>
-<?php } ?>
-
-			<div class="conr">
-<?php
-
-if ($active_page == 'index') {
-    if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
-    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
-    }
-} elseif ($active_page == 'viewforum') {
-    if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
-    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
-    }
-} elseif ($active_page == 'viewtopic') {
-    if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
-    } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
-    }
-}
-
-?>
-				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather->forum_settings['o_show_version'] == '1') ? ' '.$feather->forum_settings['o_cur_version'] : '')) ?></p>
-			</div>
-			<div class="clearer"></div>
-		</div>
-	</div>
-</div>
-<?php
-
-// Display debug info (if enabled/defined)
-if (!empty($exec_info)) { ?>
-	<p id="debugtime">[ <?= sprintf(__('Querytime'), round($exec_info['exec_time'], 6), $exec_info['nb_queries']).' - '.sprintf(__('Memory usage'), $exec_info['mem_usage']).' '.sprintf(__('Peak usage'), $exec_info['mem_peak_usage'])?>]</p>
-<? }
-if (!empty($queries_info)) { ?>
-	<div id="debug" class="blocktable">
-		<h2><span><?php _e('Debug table') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<table>
-					<thead>
-						<tr>
-							<th class="tcl" scope="col"><?php _e('Query times') ?></th>
-							<th class="tcr" scope="col"><?php _e('Query') ?></th>
-						</tr>
-					</thead>
-					<tbody>
-<?php foreach ($queries_info['raw'] as $time => $sql) {
-	echo "\t\t\t\t\t\t".'<tr>'."\n";
-	echo "\t\t\t\t\t\t\t".'<td class="tcl">'.Utils::escape(round($time, 8)).'</td>'."\n";
-	echo "\t\t\t\t\t\t\t".'<td class="tcr">'.Utils::escape($sql).'</td>'."\n";
-	echo "\t\t\t\t\t\t".'</tr>'."\n";
-} ?>
-						<tr>
-							<td class="tcl" colspan="2"><?= sprintf(__('Total query time'), round($queries_info['total_time'], 7)).' s' ?></td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-		</div>
-	</div>
-<?php } ?>
-</section>
-</body>
-<!-- JS -->
-<?php foreach ($assets['js'] as $script) {
-    echo '<script ';
-    foreach ($script['params'] as $key => $value) {
-        echo $key.'="'.$value.'" ';
-    }
-    echo 'src="'.Url::base().'/'.$script['file'].'"/></script>'."\n";
-} ?>
-</html>
diff --git a/style/themes/FeatherBB/view/footer.php b/style/themes/FeatherBB/view/footer.php
index 13713c40..12828ed6 100644
--- a/style/themes/FeatherBB/view/footer.php
+++ b/style/themes/FeatherBB/view/footer.php
@@ -7,6 +7,14 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
 ?>
 </div>
 
@@ -15,19 +23,19 @@
 	<div class="box">
 <?php
 
-if (isset($footer_style) && ($footer_style == 'viewforum' || $footer_style == 'viewtopic') && $is_admmod) {
+if (isset($active_page) && ($active_page == 'viewforum' || $active_page == 'viewtopic') && $feather->user->is_admmod) {
     echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
 
-    if ($footer_style == 'viewforum') {
+    if ($active_page == 'viewforum') {
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/forum/'.$fid.'/page/'.$page_number.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
-    } elseif ($footer_style == 'viewtopic') {
+    } elseif ($active_page == 'viewtopic') {
         if (isset($pid)) {
             $parameter = 'param/'.$pid.'/';
-        } elseif (isset($p) && $p != 1) {
-            $parameter = 'param/'.$p.'/';
+        } elseif (isset($page_number) && $page_number != 1) {
+            $parameter = 'param/'.$page_number.'/';
         } else {
             $parameter = '';
         }
@@ -36,20 +44,20 @@
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+        //echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/moderate/page/'.$page_number.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
 
         if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
         }
 
         if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
         }
 
         echo "\t\t\t".'</dl>'."\n";
@@ -72,7 +80,7 @@
 		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
 			echo "\t\t\t\t\t\t\t".'<optgroup label="'.Utils::escape($cat_data['cat_name']).'">'."\n";
 			foreach ($cat_data['cat_forums'] as $forum) {
-				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
+				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($fid == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
 			}
 			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
 		} ?>
@@ -86,23 +94,23 @@
 			<div class="conr">
 <?php
 
-if ($footer_style == 'index') {
+if ($active_page == 'index') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
-} elseif ($footer_style == 'viewforum') {
+} elseif ($active_page == 'viewforum') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
-} elseif ($footer_style == 'viewtopic') {
+} elseif ($active_page == 'viewtopic') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
     }
 }
 
@@ -116,18 +124,45 @@
 <?php
 
 // Display debug info (if enabled/defined)
-if ($feather->forum_env['FEATHER_SHOW_INFO']) {
-    $feather->debug->info();
-}
-// Display executed queries (if enabled)
-if ($feather->forum_env['FEATHER_SHOW_QUERIES']) {
-    $feather->debug->queries();
-}
-?>
-
+if (!empty($exec_info)) { ?>
+	<p id="debugtime">[ <?= sprintf(__('Querytime'), round($exec_info['exec_time'], 6), $exec_info['nb_queries']).' - '.sprintf(__('Memory usage'), $exec_info['mem_usage']).' '.sprintf(__('Peak usage'), $exec_info['mem_peak_usage'])?>]</p>
+<? }
+if (!empty($queries_info)) { ?>
+	<div id="debug" class="blocktable">
+		<h2><span><?php _e('Debug table') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<table>
+					<thead>
+						<tr>
+							<th class="tcl" scope="col"><?php _e('Query times') ?></th>
+							<th class="tcr" scope="col"><?php _e('Query') ?></th>
+						</tr>
+					</thead>
+					<tbody>
+<?php foreach ($queries_info['raw'] as $time => $sql) {
+	echo "\t\t\t\t\t\t".'<tr>'."\n";
+	echo "\t\t\t\t\t\t\t".'<td class="tcl">'.Utils::escape(round($time, 8)).'</td>'."\n";
+	echo "\t\t\t\t\t\t\t".'<td class="tcr">'.Utils::escape($sql).'</td>'."\n";
+	echo "\t\t\t\t\t\t".'</tr>'."\n";
+} ?>
+						<tr>
+							<td class="tcl" colspan="2"><?= sprintf(__('Total query time'), round($queries_info['total_time'], 7)).' s' ?></td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
+<?php } ?>
 </section>
-
-<script src="<?php echo Url::base() ?>/style/themes/FeatherBB/phone.min.js"></script>
-
 </body>
+<!-- JS -->
+<?php foreach ($assets['js'] as $script) {
+    echo '<script ';
+    foreach ($script['params'] as $key => $value) {
+        echo $key.'="'.$value.'" ';
+    }
+    echo 'src="'.Url::base().'/'.$script['file'].'"/></script>'."\n";
+} ?>
 </html>
diff --git a/style/themes/FeatherBB/view/header.new.php b/style/themes/FeatherBB/view/header.new.php
deleted file mode 100644
index ac24b261..00000000
--- a/style/themes/FeatherBB/view/header.new.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<!doctype html>
-<html lang="<?php _e('lang_identifier') ?>">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
-<?php if ($is_indexed) {
-    echo "\t".'<meta name="robots" content="noindex, follow">'."\n";
-} ?>
-    <title><?php echo generate_page_title($title, $page_number) ?></title>
-    <!-- Theme -->
-    <link rel="stylesheet" type="text/css" href="<?= Url::base() ?>/style/themes/<?= $style ?>/style.css">
-<?php
-
-foreach($assets as $type => $items) {
-    if ($type == 'js') {
-        continue;
-    }
-    echo "\t".'<!-- '.ucfirst($type).' -->'."\n";
-    foreach ($items as $item) {
-        echo "\t".'<link ';
-        foreach ($item['params'] as $key => $value) {
-            echo $key.'="'.$value.'" ';
-        }
-        echo 'href="'.Url::base().'/'.$item['file'].'">'."\n";
-    }
-}
-if ($admin_console) {
-    if (file_exists($feather->forum_env['FEATHER_ROOT'].'style/themes/'.$feather->user->style.'/base_admin.css')) {
-        echo "\t".'<link rel="stylesheet" type="text/css" href="'.Url::base().'/style/themes/'.$feather->user->style.'/base_admin.css" />'."\n";
-    } else {
-        echo "\t".'<link rel="stylesheet" type="text/css" href="'.Url::base().'/style/imports/base_admin.css" />'."\n";
-    }
-}
-if (isset($required_fields)) :
-    // Output JavaScript to validate form (make sure required fields are filled out)
-
-    ?>
-    <script type="text/javascript">
-        /* <![CDATA[ */
-        function process_form(the_form)
-        {
-            var required_fields = {
-                <?php
-                    // Output a JavaScript object with localised field names
-                    $tpl_temp = count($required_fields);
-                    foreach ($required_fields as $elem_orig => $elem_trans) {
-                        echo "\t\t\"".$elem_orig.'": "'.addslashes(str_replace('&#160;', ' ', $elem_trans));
-                        if (--$tpl_temp) {
-                            echo "\",\n";
-                        } else {
-                            echo "\"\n\t};\n";
-                        }
-                    }
-                    ?>
-                if (document.all || document.getElementById)
-            {
-                for (var i = 0; i < the_form.length; ++i)
-                {
-                    var elem = the_form.elements[i];
-                    if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
-                    {
-                        alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
-                        elem.focus();
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-        /* ]]> */
-    </script>
-    <?php
-endif;
-if (!empty($page_head)) :
-    echo implode("\n", $page_head)."\n";
-endif;
-?>
-</head>
-
-<body id="pun<?= $active_page ?>"<?= ($focus_element ? ' onload="document.getElementById(\''.$focus_element[0].'\').elements[\''.$focus_element[1].'\'].focus();"' : '')?>>
-<header>
-    <nav>
-        <div class="container">
-            <div class="phone-menu" id="phone-button">
-                <a class="button-phone"></a>
-            </div>
-            <div id="phone">
-                <div id="brdmenu" class="inbox">
-                    <ul>
-<?php
-echo "\t\t\t\t\t\t".'<li id="navindex"'.(($active_page == 'index') ? ' class="isactive"' : '').'><a href="'.Url::base().'/">'.__('Index').'</a></li>'."\n";
-
-if ($feather->user->g_read_board == '1' && $feather->user->g_view_users == '1') {
-    echo "\t\t\t\t\t\t".'<li id="navuserlist"'.(($active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.Url::get('userlist/').'">'.__('User list').'</a></li>'."\n";
-}
-
-if ($feather->forum_settings['o_rules'] == '1' && (!$feather->user->is_guest || $feather->user->g_read_board == '1' || $feather->forum_settings['o_regs_allow'] == '1')) {
-    echo "\t\t\t\t\t\t".'<li id="navrules"'.(($active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.Url::get('rules/').'">'.__('Rules').'</a></li>'."\n";
-}
-
-if ($feather->user->g_read_board == '1' && $feather->user->g_search == '1') {
-    echo "\t\t\t\t\t\t".'<li id="navsearch"'.(($active_page == 'search') ? ' class="isactive"' : '').'><a href="'.Url::get('search/').'">'.__('Search').'</a></li>'."\n";
-}
-
-if ($feather->user->is_guest) {
-    echo "\t\t\t\t\t\t".'<li id="navregister"'.(($active_page == 'register') ? ' class="isactive"' : '').'><a href="'.Url::get('register/').'">'.__('Register').'</a></li>'."\n";
-    echo "\t\t\t\t\t\t".'<li id="navlogin"'.(($active_page == 'login') ? ' class="isactive"' : '').'><a href="'.Url::get('auth/login/').'">'.__('Login').'</a></li>'."\n";
-} else {
-    echo "\t\t\t\t\t\t".'<li id="navprofile"'.(($active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.Url::get('user/'.$feather->user->id.'/').'">'.__('Profile').'</a></li>'."\n";
-
-    if ($feather->user->is_admmod) {
-        echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.Url::get('admin/').'">'.__('Admin').'</a></li>'."\n";
-    }
-
-    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.Url::get('auth/logout/token/'.Utils::hash($feather->user->id.Utils::hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
-}
-
-// // Are there any additional navlinks we should insert into the array before imploding it?
-// if ($feather->user->g_read_board == '1' && $feather->forum_settings['o_additional_navlinks'] != '') {
-//     if (preg_match_all('%([0-9]+)\s*=\s*(.*?)\n%s', $feather->forum_settings['o_additional_navlinks']."\n", $extra_links)) {
-//         // Insert any additional links into the $links array (at the correct index)
-//         $num_links = count($extra_links[1]);
-//         for ($i = 0; $i < $num_links; ++$i) {
-//             array_splice($links, $extra_links[1][$i], 0, array('<li id="navextra'.($i + 1).'">'.$extra_links[2][$i].'</li>'));
-//         }
-//     }
-// }
-?>
-                        </ul>
-                    </div>
-                <div class="navbar-right">
-                    <form method="get" action="/search" class="nav-search">
-                        <input type="hidden" name="action" value="search">
-                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php _e('Search') ?>">
-                    </form>
-                </div>
-            </div>
-        </div>
-    </nav>
-
-    <div class="container">
-        <div class="container-title-status">
-            <h1 class="title-site">
-                <a href="<?php echo Url::base() ?>" title="" class="site-name">
-                    <p><?php echo Utils::escape($feather->forum_settings['o_board_title']) ?></p>
-                </a>
-                <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
-            </h1>
-            <div class="status-avatar">
-                <div id="brdwelcome" class="inbox">
-
-<?php
-if ($feather->user->is_guest) { ?>
-                    <p class="conl"><?= __('Not logged in')?></p>
-<?php } else {
-    echo "\t\t\t\t\t".'<ul class="conl">';
-    echo "\t\t\t\t\t\t".'<li><span>'.__('Logged in as').' <strong>'.Utils::escape($feather->user->username).'</strong></span></li>'."\n";
-    echo "\t\t\t\t\t\t".'<li><span>'.sprintf(__('Last visit'), $feather->utils->format_time($feather->user->last_visit)).'</span></li>'."\n";
-
-    if ($feather->user->is_admmod) {
-        if ($feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2') {
-            if ($has_reports) {
-                echo "\t\t\t\t\t\t".'<li class="reportlink"><span><strong><a href="'.Url::get('admin/reports/').'">'.__('New reports').'</a></strong></span></li>'."\n";
-            }
-        }
-
-        if ($feather->forum_settings['o_maintenance'] == '1') {
-            echo "\t\t\t\t\t\t".'<li class="maintenancelink"><span><strong><a href="'.Url::get('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>'."\n";
-        }
-    }
-    echo "\t\t\t\t\t".'</ul>'."\n";
-}
-
-if ($feather->user->g_read_board == '1' && $feather->user->g_search == '1') {
-    echo "\t\t\t\t\t".'<ul class="conr">'."\n";
-    echo "\t\t\t\t\t\t".'<li><span>'.__('Topic searches').' ';
-    if (!$feather->user->is_guest) {
-        echo '<a href="'.Url::get('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a> | ';
-        echo '<a href="'.Url::get('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a> | ';
-    }
-    echo '<a href="'.Url::get('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a> | ';
-    echo '<a href="'.Url::get('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
-    echo '</li>'."\n";
-    echo "\t\t\t\t".'</ul>'."\n";
-} ?>
-                <div class="clearer"></div>
-                </div>
-            </div>
-            <div class="clear"></div>
-        </div>
-        <?php if ($feather->user->g_read_board == '1' && $feather->forum_settings['o_announcement'] == '1') : ?>
-        <div id="announce" class="block">
-            <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
-            <div class="box">
-                <div id="announce-block" class="inbox">
-                    <div class="usercontent"><?php echo $feather->forum_settings['o_announcement_message'] ?></div>
-                </div>
-            </div>
-        </div>
-    <?php endif; ?>
-        <?php if (!empty($flash->getMessages())) : ?>
-        <script type="text/javascript">
-            window.onload = function() {
-                var flashMessage = document.getElementById('flashmsg');
-                flashMessage.className = 'flashmsg '+flashMessage.getAttribute('data-type')+' show';
-                setTimeout(function () {
-                    flashMessage.className = 'flashmsg '+flashMessage.getAttribute('data-type');
-                }, 10000);
-                return false;
-            }
-        </script>
-        <?php foreach ($flash->getMessages() as $type => $message) { ?>
-        <div class="flashmsg info" data-type="<?= $type; ?>" id="flashmsg">
-            <h2><?php _e('Info') ?><span style="float:right;cursor:pointer" onclick="document.getElementById('flashmsg').className = 'flashmsg';">&times;</span></h2>
-            <p><?= Utils::escape($message) ?></p>
-        </div>
-        <?php } ?>
-        <?php endif; ?>
-    </div>
-</header>
-
-<section class="container">
-    <div id="brdmain">
diff --git a/style/themes/FeatherBB/view/header.php b/style/themes/FeatherBB/view/header.php
index 9e84eebb..c77a8454 100644
--- a/style/themes/FeatherBB/view/header.php
+++ b/style/themes/FeatherBB/view/header.php
@@ -7,20 +7,50 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php _e('lang_identifier') ?>" lang="<?php _e('lang_identifier') ?>" dir="<?php _e('lang_direction') ?>">
+<!doctype html>
+<html lang="<?php _e('lang_identifier') ?>">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
-<title><?php echo generate_page_title($page_title, $p) ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo Url::base() ?>/style/themes/<?php echo $feather->user->style.'/style.css' ?>" />
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
+<?php if ($is_indexed) {
+    echo "\t".'<meta name="robots" content="noindex, follow">'."\n";
+} ?>
+    <title><?php echo generate_page_title($title, $page_number) ?></title>
+    <!-- Theme -->
+    <link rel="stylesheet" type="text/css" href="<?= Url::base() ?>/style/themes/<?= $style ?>/style.css">
 <?php
 
-echo $allow_index;
-echo $admin_console;
-
+foreach($assets as $type => $items) {
+    if ($type == 'js') {
+        continue;
+    }
+    echo "\t".'<!-- '.ucfirst($type).' -->'."\n";
+    foreach ($items as $item) {
+        echo "\t".'<link ';
+        foreach ($item['params'] as $key => $value) {
+            echo $key.'="'.$value.'" ';
+        }
+        echo 'href="'.Url::base().'/'.$item['file'].'">'."\n";
+    }
+}
+if ($admin_console) {
+    if (file_exists($feather->forum_env['FEATHER_ROOT'].'style/themes/'.$feather->user->style.'/base_admin.css')) {
+        echo "\t".'<link rel="stylesheet" type="text/css" href="'.Url::base().'/style/themes/'.$feather->user->style.'/base_admin.css" />'."\n";
+    } else {
+        echo "\t".'<link rel="stylesheet" type="text/css" href="'.Url::base().'/style/imports/base_admin.css" />'."\n";
+    }
+}
 if (isset($required_fields)) :
     // Output JavaScript to validate form (make sure required fields are filled out)
 
@@ -67,17 +97,57 @@ function process_form(the_form)
 ?>
 </head>
 
-<body id="pun<?= $active_page ?>"<?= $focus_element; ?>>
-
+<body id="pun<?= $active_page ?>"<?= ($focus_element ? ' onload="document.getElementById(\''.$focus_element[0].'\').elements[\''.$focus_element[1].'\'].focus();"' : '')?>>
 <header>
-
     <nav>
         <div class="container">
             <div class="phone-menu" id="phone-button">
                 <a class="button-phone"></a>
             </div>
             <div id="phone">
-                <?php echo $navlinks ?>
+                <div id="brdmenu" class="inbox">
+                    <ul>
+<?php
+echo "\t\t\t\t\t\t".'<li id="navindex"'.(($active_page == 'index') ? ' class="isactive"' : '').'><a href="'.Url::base().'/">'.__('Index').'</a></li>'."\n";
+
+if ($feather->user->g_read_board == '1' && $feather->user->g_view_users == '1') {
+    echo "\t\t\t\t\t\t".'<li id="navuserlist"'.(($active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.Url::get('userlist/').'">'.__('User list').'</a></li>'."\n";
+}
+
+if ($feather->forum_settings['o_rules'] == '1' && (!$feather->user->is_guest || $feather->user->g_read_board == '1' || $feather->forum_settings['o_regs_allow'] == '1')) {
+    echo "\t\t\t\t\t\t".'<li id="navrules"'.(($active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.Url::get('rules/').'">'.__('Rules').'</a></li>'."\n";
+}
+
+if ($feather->user->g_read_board == '1' && $feather->user->g_search == '1') {
+    echo "\t\t\t\t\t\t".'<li id="navsearch"'.(($active_page == 'search') ? ' class="isactive"' : '').'><a href="'.Url::get('search/').'">'.__('Search').'</a></li>'."\n";
+}
+
+if ($feather->user->is_guest) {
+    echo "\t\t\t\t\t\t".'<li id="navregister"'.(($active_page == 'register') ? ' class="isactive"' : '').'><a href="'.Url::get('register/').'">'.__('Register').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogin"'.(($active_page == 'login') ? ' class="isactive"' : '').'><a href="'.Url::get('auth/login/').'">'.__('Login').'</a></li>'."\n";
+} else {
+    echo "\t\t\t\t\t\t".'<li id="navprofile"'.(($active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.Url::get('user/'.$feather->user->id.'/').'">'.__('Profile').'</a></li>'."\n";
+
+    if ($feather->user->is_admmod) {
+        echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.Url::get('admin/').'">'.__('Admin').'</a></li>'."\n";
+    }
+
+    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.Url::get('auth/logout/token/'.Utils::hash($feather->user->id.Utils::hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
+}
+
+// // Are there any additional navlinks we should insert into the array before imploding it?
+// if ($feather->user->g_read_board == '1' && $feather->forum_settings['o_additional_navlinks'] != '') {
+//     if (preg_match_all('%([0-9]+)\s*=\s*(.*?)\n%s', $feather->forum_settings['o_additional_navlinks']."\n", $extra_links)) {
+//         // Insert any additional links into the $links array (at the correct index)
+//         $num_links = count($extra_links[1]);
+//         for ($i = 0; $i < $num_links; ++$i) {
+//             array_splice($links, $extra_links[1][$i], 0, array('<li id="navextra'.($i + 1).'">'.$extra_links[2][$i].'</li>'));
+//         }
+//     }
+// }
+?>
+                        </ul>
+                    </div>
                 <div class="navbar-right">
                     <form method="get" action="/search" class="nav-search">
                         <input type="hidden" name="action" value="search">
@@ -97,19 +167,56 @@ function process_form(the_form)
                 <div id="brddesc"><?php echo htmlspecialchars_decode($feather->forum_settings['o_board_desc']) ?></div>
             </h1>
             <div class="status-avatar">
-                <?php echo $page_info ?>
+                <div id="brdwelcome" class="inbox">
+
+<?php
+if ($feather->user->is_guest) { ?>
+                    <p class="conl"><?= __('Not logged in')?></p>
+<?php } else {
+    echo "\t\t\t\t\t".'<ul class="conl">';
+    echo "\t\t\t\t\t\t".'<li><span>'.__('Logged in as').' <strong>'.Utils::escape($feather->user->username).'</strong></span></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li><span>'.sprintf(__('Last visit'), $feather->utils->format_time($feather->user->last_visit)).'</span></li>'."\n";
+
+    if ($feather->user->is_admmod) {
+        if ($feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2') {
+            if ($has_reports) {
+                echo "\t\t\t\t\t\t".'<li class="reportlink"><span><strong><a href="'.Url::get('admin/reports/').'">'.__('New reports').'</a></strong></span></li>'."\n";
+            }
+        }
+
+        if ($feather->forum_settings['o_maintenance'] == '1') {
+            echo "\t\t\t\t\t\t".'<li class="maintenancelink"><span><strong><a href="'.Url::get('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>'."\n";
+        }
+    }
+    echo "\t\t\t\t\t".'</ul>'."\n";
+}
+
+if ($feather->user->g_read_board == '1' && $feather->user->g_search == '1') {
+    echo "\t\t\t\t\t".'<ul class="conr">'."\n";
+    echo "\t\t\t\t\t\t".'<li><span>'.__('Topic searches').' ';
+    if (!$feather->user->is_guest) {
+        echo '<a href="'.Url::get('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a> | ';
+        echo '<a href="'.Url::get('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a> | ';
+    }
+    echo '<a href="'.Url::get('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a> | ';
+    echo '<a href="'.Url::get('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
+    echo '</li>'."\n";
+    echo "\t\t\t\t".'</ul>'."\n";
+} ?>
+                <div class="clearer"></div>
+                </div>
             </div>
             <div class="clear"></div>
         </div>
         <?php if ($feather->user->g_read_board == '1' && $feather->forum_settings['o_announcement'] == '1') : ?>
-            <div id="announce" class="block">
-                <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
-                <div class="box">
-                    <div id="announce-block" class="inbox">
-                        <div class="usercontent"><?php echo $feather->forum_settings['o_announcement_message'] ?></div>
-                    </div>
+        <div id="announce" class="block">
+            <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
+            <div class="box">
+                <div id="announce-block" class="inbox">
+                    <div class="usercontent"><?php echo $feather->forum_settings['o_announcement_message'] ?></div>
                 </div>
             </div>
+        </div>
         <?php endif; ?>
         <?php if (!empty($flash->getMessages())) : ?>
         <script type="text/javascript">
@@ -130,7 +237,6 @@ function process_form(the_form)
         <?php } ?>
         <?php endif; ?>
     </div>
-
 </header>
 
 <section class="container">

From 42fe6dd4135ed36cba268adcfab2b675d079449a Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 6 Sep 2015 14:39:03 +0200
Subject: [PATCH 317/353] Capitalize controllers in routes.php

---
 featherbb/routes.php                   | 120 ++++++++++++-------------
 style/themes/FeatherBB/view/delete.php |  18 ++--
 style/themes/FeatherBB/view/edit.php   |   7 +-
 3 files changed, 73 insertions(+), 72 deletions(-)

diff --git a/featherbb/routes.php b/featherbb/routes.php
index 433e60ee..3b0aca9d 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -11,17 +11,17 @@
 $feather->get('/', '\FeatherBB\Controller\index:display')->name('home');
 
 // Viewforum
-$feather->get('/forum/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\viewforum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('viewForum');
+$feather->get('/forum/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\Viewforum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('viewForum');
 
 // Viewtopic
 $feather->group('/topic', function() use ($feather) {
-    $feather->get('/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\viewtopic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('viewTopic');
-    $feather->get('/:id/action/:action(/)', '\FeatherBB\Controller\viewtopic:action')->conditions(array('id' => '[0-9]+'))->name('topicAction');
+    $feather->get('/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\Viewtopic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('viewTopic');
+    $feather->get('/:id/action/:action(/)', '\FeatherBB\Controller\Viewtopic:action')->conditions(array('id' => '[0-9]+'))->name('topicAction');
 });
-$feather->get('/post/:pid(/)', '\FeatherBB\Controller\viewtopic:viewpost')->conditions(array('pid' => '[0-9]+'))->name('viewPost');
+$feather->get('/post/:pid(/)', '\FeatherBB\Controller\Viewtopic:viewpost')->conditions(array('pid' => '[0-9]+'))->name('viewPost');
 
 // Userlist
-$feather->get('/userlist(/)', '\FeatherBB\Controller\userlist:display')->name('userList');
+$feather->get('/userlist(/)', '\FeatherBB\Controller\Userlist:display')->name('userList');
 
 // Auth routes
 $feather->group('/auth', function() use ($feather) {
@@ -32,54 +32,54 @@
             $feather->redirect($feather->urlFor('login'));
         }
     });
-    $feather->map('/login(/)', '\FeatherBB\Controller\auth:login')->via('GET', 'POST')->name('login');
-    $feather->map('/forget(/)', '\FeatherBB\Controller\auth:forget')->via('GET', 'POST')->name('resetPassword');
-    $feather->get('/logout/token/:token(/)', '\FeatherBB\Controller\auth:logout')->name('logout');
+    $feather->map('/login(/)', '\FeatherBB\Controller\Auth:login')->via('GET', 'POST')->name('login');
+    $feather->map('/forget(/)', '\FeatherBB\Controller\Auth:forget')->via('GET', 'POST')->name('resetPassword');
+    $feather->get('/logout/token/:token(/)', '\FeatherBB\Controller\Auth:logout')->name('logout');
 });
 
 // Register routes
 $feather->group('/register', function() use ($feather) {
-    $feather->get('(/)', '\FeatherBB\Controller\register:rules')->name('registerRules');
-    $feather->map('/agree(/)', '\FeatherBB\Controller\register:display')->via('GET', 'POST')->name('register');
-    $feather->get('/cancel(/)', '\FeatherBB\Controller\register:cancel')->name('registerCancel');
+    $feather->get('(/)', '\FeatherBB\Controller\Register:rules')->name('registerRules');
+    $feather->map('/agree(/)', '\FeatherBB\Controller\Register:display')->via('GET', 'POST')->name('register');
+    $feather->get('/cancel(/)', '\FeatherBB\Controller\Register:cancel')->name('registerCancel');
 });
 
 // Post routes
 $feather->group('/post', function() use ($feather) {
-    $feather->map('/new-topic/:fid(/)', '\FeatherBB\Controller\post:newpost')->conditions(array('fid' => '[0-9]+'))->via('GET', 'POST')->name('newTopic');
-    $feather->map('/reply/:tid(/)(/quote/:qid)(/)', '\FeatherBB\Controller\post:newreply')->conditions(array('tid' => '[0-9]+', 'qid' => '[0-9]+'))->via('GET', 'POST')->name('newReply');
+    $feather->map('/new-topic/:fid(/)', '\FeatherBB\Controller\Post:newpost')->conditions(array('fid' => '[0-9]+'))->via('GET', 'POST')->name('newTopic');
+    $feather->map('/reply/:tid(/)(/quote/:qid)(/)', '\FeatherBB\Controller\Post:newreply')->conditions(array('tid' => '[0-9]+', 'qid' => '[0-9]+'))->via('GET', 'POST')->name('newReply');
 });
 
 // Edit
-$feather->map('/edit/:id(/)', '\FeatherBB\Controller\edit:editpost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('editPost');
+$feather->map('/edit/:id(/)', '\FeatherBB\Controller\Edit:editpost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('editPost');
 
 // Delete
-$feather->map('/delete/:id(/)', '\FeatherBB\Controller\delete:deletepost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('deletePost');
+$feather->map('/delete/:id(/)', '\FeatherBB\Controller\Delete:deletepost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('deletePost');
 
 // Search routes
 $feather->group('/search', function() use ($feather) {
-    $feather->get('(/)', '\FeatherBB\Controller\search:display')->name('search');
-    $feather->get('/show/:show(/)', '\FeatherBB\Controller\search:quicksearches')->name('quickSearch');
+    $feather->get('(/)', '\FeatherBB\Controller\Search:display')->name('search');
+    $feather->get('/show/:show(/)', '\FeatherBB\Controller\Search:quicksearches')->name('quickSearch');
 });
 
 // Help
 $feather->get('/help(/)', '\FeatherBB\Controller\help:display')->name('help');
 
 // Misc
-$feather->get('/rules(/)', '\FeatherBB\Controller\misc:rules')->name('rules');
-$feather->get('/mark-read(/)', '\FeatherBB\Controller\misc:markread')->name('markRead');
-$feather->get('/mark-forum-read/:id(/)', '\FeatherBB\Controller\misc:markforumread')->conditions(array('id' => '[0-9]+'))->name('markForumRead');
-$feather->map('/email/:id(/)', '\FeatherBB\Controller\misc:email')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('email');
-$feather->map('/report/:id(/)', '\FeatherBB\Controller\misc:report')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('report');
-$feather->get('/subscribe/forum/:id(/)', '\FeatherBB\Controller\misc:subscribeforum')->conditions(array('id' => '[0-9]+'))->name('subscribeForum');
-$feather->get('/unsubscribe/forum/:id(/)', '\FeatherBB\Controller\misc:unsubscribeforum')->conditions(array('id' => '[0-9]+'))->name('unsubscribeForum');
-$feather->get('/subscribe/topic/:id(/)', '\FeatherBB\Controller\misc:subscribetopic')->conditions(array('id' => '[0-9]+'))->name('subscribeTopic');
-$feather->get('/unsubscribe/topic/:id(/)', '\FeatherBB\Controller\misc:unsubscribetopic')->conditions(array('id' => '[0-9]+'))->name('unsubscribeTopic');
+$feather->get('/rules(/)', '\FeatherBB\Controller\Misc:rules')->name('rules');
+$feather->get('/mark-read(/)', '\FeatherBB\Controller\Misc:markread')->name('markRead');
+$feather->get('/mark-forum-read/:id(/)', '\FeatherBB\Controller\Misc:markforumread')->conditions(array('id' => '[0-9]+'))->name('markForumRead');
+$feather->map('/email/:id(/)', '\FeatherBB\Controller\Misc:email')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('email');
+$feather->map('/report/:id(/)', '\FeatherBB\Controller\Misc:report')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('report');
+$feather->get('/subscribe/forum/:id(/)', '\FeatherBB\Controller\Misc:subscribeforum')->conditions(array('id' => '[0-9]+'))->name('subscribeForum');
+$feather->get('/unsubscribe/forum/:id(/)', '\FeatherBB\Controller\Misc:unsubscribeforum')->conditions(array('id' => '[0-9]+'))->name('unsubscribeForum');
+$feather->get('/subscribe/topic/:id(/)', '\FeatherBB\Controller\Misc:subscribetopic')->conditions(array('id' => '[0-9]+'))->name('subscribeTopic');
+$feather->get('/unsubscribe/topic/:id(/)', '\FeatherBB\Controller\Misc:unsubscribetopic')->conditions(array('id' => '[0-9]+'))->name('unsubscribeTopic');
 
 // Profile routes
 $feather->group('/user', function() use ($feather) {
-    $feather->map('/:id(/section/:section)(/)', '\FeatherBB\Controller\profile:display')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('profileSection');
-    $feather->map('/:id(/action/:action)(/)', '\FeatherBB\Controller\profile:action')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('profileAction');
+    $feather->map('/:id(/section/:section)(/)', '\FeatherBB\Controller\Profile:display')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('profileSection');
+    $feather->map('/:id(/action/:action)(/)', '\FeatherBB\Controller\Profile:action')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('profileAction');
 });
 
 /**
@@ -93,12 +93,12 @@
 
 // Moderate routes
 $feather->group('/moderate', $isAdmmod, function() use ($feather) {
-    $feather->get('/forum/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('moderateForum');
-    $feather->get('/get-host/post/:pid(/)', '\FeatherBB\Controller\moderate:gethostpost')->conditions(array('pid' => '[0-9]+'))->name('getHostPost');
-    $feather->get('/get-host/ip/:ip(/)', '\FeatherBB\Controller\moderate:gethostip')->name('getHostIp');
-    $feather->map('/topic/:id/forum/:fid/action/:action(/param/:param)(/)', '\FeatherBB\Controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST')->name('moderateTopic');
-    $feather->map('/topic/:id/forum/:fid/action/:action(/page/:param)(/)', '\FeatherBB\Controller\moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST')->name('moderateTopicPage');
-    $feather->post('/forum/:fid(/page/:page)(/)', '\FeatherBB\Controller\moderate:dealposts')->conditions(array('fid' => '[0-9]+', 'page' => '[0-9]+'))->name('dealPosts');
+    $feather->get('/forum/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\Moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('moderateForum');
+    $feather->get('/get-host/post/:pid(/)', '\FeatherBB\Controller\Moderate:gethostpost')->conditions(array('pid' => '[0-9]+'))->name('getHostPost');
+    $feather->get('/get-host/ip/:ip(/)', '\FeatherBB\Controller\Moderate:gethostip')->name('getHostIp');
+    $feather->map('/topic/:id/forum/:fid/action/:action(/param/:param)(/)', '\FeatherBB\Controller\Moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST')->name('moderateTopic');
+    $feather->map('/topic/:id/forum/:fid/action/:action(/page/:param)(/)', '\FeatherBB\Controller\Moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST')->name('moderateTopicPage');
+    $feather->post('/forum/:fid(/page/:page)(/)', '\FeatherBB\Controller\Moderate:dealposts')->conditions(array('fid' => '[0-9]+', 'page' => '[0-9]+'))->name('dealPosts');
 });
 
 // Admin routes
@@ -130,60 +130,60 @@
 
     // Admin categories
     $feather->group('/categories', $isAdmin, function() use ($feather) {
-        $feather->get('(/)', '\FeatherBB\Controller\Admin\categories:display')->name('adminCategories');
-        $feather->post('/add(/)', '\FeatherBB\Controller\Admin\categories:add_category')->name('addCategory');
-        $feather->post('/edit(/)', '\FeatherBB\Controller\Admin\categories:edit_categories')->name('editCategory');
-        $feather->post('/delete(/)', '\FeatherBB\Controller\Admin\categories:delete_category')->name('deleteCategory');
+        $feather->get('(/)', '\FeatherBB\Controller\Admin\Categories:display')->name('adminCategories');
+        $feather->post('/add(/)', '\FeatherBB\Controller\Admin\Categories:add_category')->name('addCategory');
+        $feather->post('/edit(/)', '\FeatherBB\Controller\Admin\Categories:edit_categories')->name('editCategory');
+        $feather->post('/delete(/)', '\FeatherBB\Controller\Admin\Categories:delete_category')->name('deleteCategory');
     });
 
     // Admin censoring
-    $feather->map('/censoring(/)', $isAdmin, '\FeatherBB\Controller\Admin\censoring:display')->via('GET', 'POST')->name('adminCensoring');
+    $feather->map('/censoring(/)', $isAdmin, '\FeatherBB\Controller\Admin\Censoring:display')->via('GET', 'POST')->name('adminCensoring');
 
     // Admin reports
-    $feather->map('/reports(/)', '\FeatherBB\Controller\Admin\reports:display')->via('GET', 'POST')->name('adminReports');
+    $feather->map('/reports(/)', '\FeatherBB\Controller\Admin\Reports:display')->via('GET', 'POST')->name('adminReports');
 
     // Admin permissions
-    $feather->map('/permissions(/)', $isAdmin, '\FeatherBB\Controller\Admin\permissions:display')->via('GET', 'POST')->name('adminPermissions');
+    $feather->map('/permissions(/)', $isAdmin, '\FeatherBB\Controller\Admin\Permissions:display')->via('GET', 'POST')->name('adminPermissions');
 
     // Admin statistics
-    $feather->get('/statistics(/)', '\FeatherBB\Controller\Admin\statistics:display')->name('statistics');
-    $feather->get('/phpinfo(/)', '\FeatherBB\Controller\Admin\statistics:phpinfo')->name('phpInfo');
+    $feather->get('/statistics(/)', '\FeatherBB\Controller\Admin\Statistics:display')->name('statistics');
+    $feather->get('/phpinfo(/)', '\FeatherBB\Controller\Admin\Statistics:phpinfo')->name('phpInfo');
 
     // Admin forums
     $feather->group('/forums', $isAdmin, function() use ($feather) {
-        $feather->map('(/)', '\FeatherBB\Controller\Admin\forums:display')->via('GET', 'POST')->name('adminForums');
-        $feather->post('/add(/)', '\FeatherBB\Controller\Admin\forums:add_forum')->name('addForum');
-        $feather->map('/edit/:id(/)', '\FeatherBB\Controller\Admin\forums:edit_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('editForum');
-        $feather->map('/delete/:id(/)', '\FeatherBB\Controller\Admin\forums:delete_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('deleteForum');
+        $feather->map('(/)', '\FeatherBB\Controller\Admin\Forums:display')->via('GET', 'POST')->name('adminForums');
+        $feather->post('/add(/)', '\FeatherBB\Controller\Admin\Forums:add_forum')->name('addForum');
+        $feather->map('/edit/:id(/)', '\FeatherBB\Controller\Admin\Forums:edit_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('editForum');
+        $feather->map('/delete/:id(/)', '\FeatherBB\Controller\Admin\Forums:delete_forum')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('deleteForum');
     });
 
     // Admin groups
     $feather->group('/groups', $isAdmin, function() use ($feather) {
-        $feather->map('(/)', '\FeatherBB\Controller\Admin\groups:display')->via('GET', 'POST')->name('adminGroups');
-        $feather->map('/add(/)', '\FeatherBB\Controller\Admin\groups:addedit')->via('GET', 'POST')->name('addGroup');
-        $feather->map('/edit/:id(/)', '\FeatherBB\Controller\Admin\groups:addedit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('editGroup');
-        $feather->map('/delete/:id(/)', '\FeatherBB\Controller\Admin\groups:delete')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('deleteGroup');
+        $feather->map('(/)', '\FeatherBB\Controller\Admin\Groups:display')->via('GET', 'POST')->name('adminGroups');
+        $feather->map('/add(/)', '\FeatherBB\Controller\Admin\Groups:addedit')->via('GET', 'POST')->name('addGroup');
+        $feather->map('/edit/:id(/)', '\FeatherBB\Controller\Admin\Groups:addedit')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('editGroup');
+        $feather->map('/delete/:id(/)', '\FeatherBB\Controller\Admin\Groups:delete')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('deleteGroup');
     });
 
     // Admin plugins
     $feather->group('/plugins', function() use ($feather) {
-        $feather->map('/(/)', '\FeatherBB\Controller\Admin\plugins:index')->via('GET', 'POST')->name('adminPlugins');
-        $feather->map('/activate(/)', '\FeatherBB\Controller\Admin\plugins:activate')->via('GET')->name('activatePlugin');
-        $feather->map('/deactivate(/)', '\FeatherBB\Controller\Admin\plugins:deactivate')->via('GET')->name('deactivatePlugin');
-        // $feather->map('/loader(/)', '\FeatherBB\Controller\Admin\plugins:display')->via('GET', 'POST');
+        $feather->map('/(/)', '\FeatherBB\Controller\Admin\Plugins:index')->via('GET', 'POST')->name('adminPlugins');
+        $feather->map('/activate(/)', '\FeatherBB\Controller\Admin\Plugins:activate')->via('GET')->name('activatePlugin');
+        $feather->map('/deactivate(/)', '\FeatherBB\Controller\Admin\Plugins:deactivate')->via('GET')->name('deactivatePlugin');
+        // $feather->map('/loader(/)', '\FeatherBB\Controller\Admin\Plugins:display')->via('GET', 'POST');
     });
 
     // Admin maintenance
-    $feather->map('/maintenance(/)', $isAdmin, '\FeatherBB\Controller\Admin\maintenance:display')->via('GET', 'POST')->name('adminMaintenance');
+    $feather->map('/maintenance(/)', $isAdmin, '\FeatherBB\Controller\Admin\Maintenance:display')->via('GET', 'POST')->name('adminMaintenance');
 
     // Admin parser
-    $feather->map('/parser(/)', $isAdmin, '\FeatherBB\Controller\Admin\parser:display')->via('GET', 'POST')->name('adminParser');
+    $feather->map('/parser(/)', $isAdmin, '\FeatherBB\Controller\Admin\Parser:display')->via('GET', 'POST')->name('adminParser');
 
     // Admin users
     $feather->group('/users', function() use ($feather) {
-        $feather->map('(/)', '\FeatherBB\Controller\Admin\users:display')->via('GET', 'POST')->name('adminUsers');
-        $feather->get('/ip-stats/id/:id(/)', '\FeatherBB\Controller\Admin\users:ipstats')->conditions(array('id' => '[0-9]+'))->name('usersIpStats');
-        $feather->get('/show-users/ip/:ip(/)', '\FeatherBB\Controller\Admin\users:showusers')->name('usersIpShow');
+        $feather->map('(/)', '\FeatherBB\Controller\Admin\Users:display')->via('GET', 'POST')->name('adminUsers');
+        $feather->get('/ip-stats/id/:id(/)', '\FeatherBB\Controller\Admin\Users:ipstats')->conditions(array('id' => '[0-9]+'))->name('usersIpStats');
+        $feather->get('/show-users/ip/:ip(/)', '\FeatherBB\Controller\Admin\Users:showusers')->name('usersIpShow');
     });
 
 });
diff --git a/style/themes/FeatherBB/view/delete.php b/style/themes/FeatherBB/view/delete.php
index 51b9efb2..035c9a9c 100644
--- a/style/themes/FeatherBB/view/delete.php
+++ b/style/themes/FeatherBB/view/delete.php
@@ -16,9 +16,9 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
+			<li><a href="<?= $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?= $feather->urlFor('viewForum', array('id'=>$cur_post['fid'], 'name'=>$feather->url->url_friendly($cur_post['forum_name']),'page'=>'1')) ?>"><?= $feather->utils->escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?= $feather->urlFor('viewPost', array('pid'=>$id.'/#p'.$id)) ?>"><?= $feather->utils->escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>
@@ -27,12 +27,12 @@
 <div class="blockform">
 	<h2><span><?php _e('Delete post') ?></span></h2>
 	<div class="box">
-		<form method="post" action="<?php echo $feather->url->get('delete/'.$id.'/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+		<form method="post" action="<?= $feather->urlFor('deletePost', array('id'=>$id)) ?>">
+			<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
 					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.$feather->utils->escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
-					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
+					<p><?= ($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
 				</div>
 			</div>
 			<p class="buttons"><input type="submit" name="delete" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
@@ -47,13 +47,13 @@
 				<div class="postbody">
 					<div class="postleft">
 						<dl>
-							<dt><strong><?php echo $feather->utils->escape($cur_post['poster']) ?></strong></dt>
-							<dd><span><?php echo $feather->utils->format_time($cur_post['posted']) ?></span></dd>
+							<dt><strong><?= $feather->utils->escape($cur_post['poster']) ?></strong></dt>
+							<dd><span><?= $feather->utils->format_time($cur_post['posted']) ?></span></dd>
 						</dl>
 					</div>
 					<div class="postright">
 						<div class="postmsg">
-							<?php echo $cur_post['message']."\n" ?>
+							<?= $cur_post['message']."\n" ?>
 						</div>
 					</div>
 				</div>
diff --git a/style/themes/FeatherBB/view/edit.php b/style/themes/FeatherBB/view/edit.php
index ea9c3abe..6dcc87c9 100644
--- a/style/themes/FeatherBB/view/edit.php
+++ b/style/themes/FeatherBB/view/edit.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -20,7 +20,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo $feather->utils->escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?= $feather->urlFor('viewForum', array('id'=>$cur_post['fid'], 'name'=>$feather->url->url_friendly($cur_post['forum_name']),'page'=>'1')) ?>"><?= $feather->utils->escape($cur_post['forum_name']) ?></a></li>
+            <!-- <li><span>»&#160;</span><a href="<?= $feather->urlFor('viewTopic', array('id'=>$cur_post['tid'], 'name'=>$feather->url->url_friendly($cur_post['subject']))) ?>"><?= $feather->utils->escape($cur_post['subject']) ?></a></li> -->
 			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
 		</ul>
@@ -116,4 +117,4 @@
 			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>

From 95f71587c3b6d335c76b4136ce595385d6019bae Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 6 Sep 2015 15:55:29 +0200
Subject: [PATCH 318/353] Fix conflicts

---
 ...5bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache |  2 +-
 cache/cache_parser_data.php                   |  2 +-
 featherbb/Controller/Admin/Categories.php     | 35 +++-------
 featherbb/Controller/Admin/Forums.php         | 52 +++------------
 featherbb/Controller/Admin/Index.php          | 16 +----
 featherbb/Controller/Admin/Parser.php         | 32 ++-------
 featherbb/Controller/Admin/Plugins.php        | 22 ++-----
 featherbb/Controller/Auth.php                 | 37 ++---------
 featherbb/Controller/Edit.php                 |  8 +--
 featherbb/Controller/Install.php              |  6 +-
 featherbb/Controller/Login.php                |  6 +-
 featherbb/Controller/Misc.php                 | 12 +---
 featherbb/Controller/Moderate.php             | 34 ++--------
 featherbb/Controller/Post.php                 |  6 +-
 featherbb/Controller/Profile.php              |  6 +-
 featherbb/Controller/Register.php             | 13 ----
 featherbb/Controller/Search.php               |  8 +--
 featherbb/Core/Url.php                        |  7 +-
 featherbb/Core/parser/bbcd_compile.php        |  4 --
 featherbb/Helpers/functions.php               | 14 ----
 featherbb/Model/Admin/Bans.php                | 12 +---
 featherbb/Model/Admin/Censoring.php           | 18 +----
 featherbb/Model/Admin/Groups.php              | 22 ++-----
 featherbb/Model/Admin/Maintenance.php         |  6 +-
 featherbb/Model/Admin/Options.php             |  6 +-
 featherbb/Model/Admin/Permissions.php         |  6 +-
 featherbb/Model/Admin/Reports.php             |  6 +-
 featherbb/Model/Admin/Users.php               | 18 +----
 featherbb/Model/Delete.php                    | 12 +---
 featherbb/Model/Login.php                     | 12 +---
 featherbb/Model/Misc.php                      | 38 ++---------
 featherbb/Model/Moderate.php                  | 30 ++-------
 featherbb/Model/Profile.php                   | 65 ++++---------------
 featherbb/Model/Register.php                  | 13 +---
 style/themes/FeatherBB/view/delete.php        | 33 ++--------
 style/themes/FeatherBB/view/edit.php          | 10 ---
 view/delete.php                               | 27 ++++----
 37 files changed, 121 insertions(+), 535 deletions(-)

diff --git a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
index 9855b626..ace76b35 100644
--- a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
+++ b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
@@ -1 +1 @@
-{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1440702252,"expire":0,"data":"a:4:{i:1;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:2;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:3;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:4;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1441512071,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:23:\"Lighter than a feather.\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:11:\"deuh@oij.gt\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:17:\"style\/img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:26:\"http:\/\/localhost\/featherbb\";s:13:\"o_admin_email\";s:11:\"deuh@oij.gt\";s:17:\"o_webmaster_email\";s:11:\"deuh@oij.gt\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"0\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1441510035,"expire":0,"data":"a:3:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;s:13:\"\\Plugins\\Test\";b:1;}"}}
\ No newline at end of file
+{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1441544494,"expire":0,"data":"a:4:{i:1;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:2;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:3;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:4;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1441512071,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:23:\"Lighter than a feather.\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:11:\"deuh@oij.gt\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:17:\"style\/img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:26:\"http:\/\/localhost\/featherbb\";s:13:\"o_admin_email\";s:11:\"deuh@oij.gt\";s:17:\"o_webmaster_email\";s:11:\"deuh@oij.gt\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"0\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1441510035,"expire":0,"data":"a:3:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;s:13:\"\\Plugins\\Test\";b:1;}"}}
\ No newline at end of file
diff --git a/cache/cache_parser_data.php b/cache/cache_parser_data.php
index 022cd635..1ab52462 100644
--- a/cache/cache_parser_data.php
+++ b/cache/cache_parser_data.php
@@ -1,4 +1,4 @@
-<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 02:22:10. DO NOT EDIT!!!
+<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 03:54:56. DO NOT EDIT!!!
 $pd = array (
   'newer_php_version' => true,
   'in_signature' => false,
diff --git a/featherbb/Controller/Admin/Categories.php b/featherbb/Controller/Admin/Categories.php
index 79e2e95e..706c6325 100644
--- a/featherbb/Controller/Admin/Categories.php
+++ b/featherbb/Controller/Admin/Categories.php
@@ -35,13 +35,13 @@ public function add_category()
     {
         $cat_name = Utils::trim($this->request->post('cat_name'));
         if ($cat_name == '') {
-            $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Must enter name message'));
+            Url::redirect($this->feather->urlFor('adminCategories'), __('Must enter name message'));
         }
 
         if ($this->model->add_category($cat_name)) {
-            $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Category added redirect'));
+            Url::redirect($this->feather->urlFor('adminCategories'), __('Category added redirect'));
         } else { //TODO, add error message
-            $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Category added redirect'));
+            Url::redirect($this->feather->urlFor('adminCategories'), __('Category added redirect'));
         }
     }
 
@@ -56,11 +56,7 @@ public function edit_categories()
                               'name' => Utils::escape($properties['name']),
                               'order' => (int) $properties['order'], );
             if ($category['name'] == '') {
-<<<<<<< HEAD
-                $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Must enter name message'));
-=======
-                redirect(Url::get('admin/categories/'), __('Must enter name message'));
->>>>>>> development
+                Url::redirect($this->feather->urlFor('adminCategories'), __('Must enter name message'));
             }
             $this->model->update_category($category);
         }
@@ -68,11 +64,8 @@ public function edit_categories()
         // Regenerate the quick jump cache
         $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Categories updated redirect'));
-=======
-        redirect(Url::get('admin/categories/'), __('Categories updated redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('adminCategories'), __('Categories updated redirect'));
+
     }
 
     public function delete_category()
@@ -84,23 +77,13 @@ public function delete_category()
         }
 
         if (intval($this->request->post('disclaimer')) != 1) {
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Delete category not validated'));
-        }
-
-        if ($this->model->delete_category($cat_to_delete)) {
-            $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Category deleted redirect'));
-        } else {
-            $this->feather->url->redirect($this->feather->urlFor('displayCategories'), __('Unable to delete category'));
-=======
-            redirect(Url::get('admin/categories/'), __('Delete category not validated'));
+            Url::redirect($this->feather->urlFor('adminCategories'), __('Delete category not validated'));
         }
 
         if ($this->model->delete_category($cat_to_delete)) {
-            redirect(Url::get('admin/categories/'), __('Category deleted redirect'));
+            Url::redirect($this->feather->urlFor('adminCategories'), __('Category deleted redirect'));
         } else {
-            redirect(Url::get('admin/categories/'), __('Unable to delete category'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('adminCategories'), __('Unable to delete category'));
         }
     }
 
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
index a29183e6..4e50e437 100644
--- a/featherbb/Controller/Admin/Forums.php
+++ b/featherbb/Controller/Admin/Forums.php
@@ -40,25 +40,16 @@ public function add_forum()
         $cat_id = (int) $this->request->post('cat');
 
         if ($cat_id < 1) {
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('adminForums'), __('Must be valid category'));
-=======
-            redirect(Url::get('admin/forums/'), __('Must be valid category'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('adminForums'), __('Must be valid category'));
         }
 
         if ($fid = $this->model->add_forum($cat_id, __('New forum'))) {
             // Regenerate the quick jump cache
             $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('editForum', array('id' => $fid)), __('Forum added redirect'));
-        } else {
-            $this->feather->url->redirect($this->feather->urlFor('adminForums'), __('Unable to add forum'));
-=======
-            redirect(Url::get('admin/forums/edit/'.$fid.'/'), __('Forum added redirect'));
+
+            Url::redirect($this->feather->urlFor('editForum', array('id' => $fid)), __('Forum added redirect'));
         } else {
-            redirect(Url::get('admin/forums/'), __('Unable to add forum'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('adminForums'), __('Unable to add forum'));
         }
     }
 
@@ -75,17 +66,10 @@ public function edit_forum($forum_id)
                                     'redirect_url' => Url::is_valid($this->request->post('redirect_url')) ? Utils::escape($this->request->post('redirect_url')) : NULL);
 
                 if ($forum_data['forum_name'] == '') {
-<<<<<<< HEAD
-                    $this->feather->url->redirect($this->feather->urlFor('editForum', array('id' => $forum_id)), __('Must enter name message'));
-                }
-                if ($forum_data['cat_id'] < 1) {
-                    $this->feather->url->redirect($this->feather->urlFor('editForum', array('id' => $forum_id)), __('Must be valid category'));
-=======
-                    redirect(Url::get('admin/forums/edit/'.$forum_id.'/'), __('Must enter name message'));
+                    Url::redirect($this->feather->urlFor('editForum', array('id' => $forum_id)), __('Must enter name message'));
                 }
                 if ($forum_data['cat_id'] < 1) {
-                    redirect(Url::get('admin/forums/edit/'.$forum_id.'/'), __('Must be valid category'));
->>>>>>> development
+                    Url::redirect($this->feather->urlFor('editForum', array('id' => $forum_id)), __('Must be valid category'));
                 }
 
                 $this->model->update_forum($forum_id, $forum_data);
@@ -121,11 +105,7 @@ public function edit_forum($forum_id)
                 // Regenerate the quick jump cache
                 $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
-<<<<<<< HEAD
-                $this->feather->url->redirect($this->feather->urlFor('editForum', array('id' => $forum_id)), __('Forum updated redirect'));
-=======
-                redirect(Url::get('admin/forums/edit/'.$forum_id.'/'), __('Forum updated redirect'));
->>>>>>> development
+                Url::redirect($this->feather->urlFor('editForum', array('id' => $forum_id)), __('Forum updated redirect'));
 
             } elseif ($this->request->post('revert_perms')) {
                 $this->model->delete_permissions($forum_id);
@@ -133,11 +113,7 @@ public function edit_forum($forum_id)
                 // Regenerate the quick jump cache
                 $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
-<<<<<<< HEAD
-                $this->feather->url->redirect($this->feather->urlFor('editForum', array('id' => $forum_id)), __('Perms reverted redirect'));
-=======
-                redirect(Url::get('admin/forums/edit/'.$forum_id.'/'), __('Perms reverted redirect'));
->>>>>>> development
+                Url::redirect($this->feather->urlFor('editForum', array('id' => $forum_id)), __('Perms reverted redirect'));
             }
 
         } else {
@@ -163,11 +139,7 @@ public function delete_forum($forum_id)
             // Regenerate the quick jump cache
             $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('adminForums'), __('Forum deleted redirect'));
-=======
-            redirect(Url::get('admin/forums/'), __('Forum deleted redirect'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('adminForums'), __('Forum deleted redirect'));
 
         } else { // If the user hasn't confirmed
 
@@ -195,11 +167,7 @@ public function edit_positions()
         // Regenerate the quick jump cache
         $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('adminForums'), __('Forums updated redirect'));
-=======
-        redirect(Url::get('admin/forums/'), __('Forums updated redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('adminForums'), __('Forums updated redirect'));
     }
 
     public function display()
diff --git a/featherbb/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
index 05685038..a65e0357 100644
--- a/featherbb/Controller/Admin/Index.php
+++ b/featherbb/Controller/Admin/Index.php
@@ -59,15 +59,9 @@ public function display($action = null)
             }
 
             if (version_compare($this->config['o_cur_version'], $latest_version, '>=')) {
-<<<<<<< HEAD
-                $this->feather->url->redirect($this->feather->urlFor('adminIndex'), __('Running latest version message'));
+                Url::redirect($this->feather->urlFor('adminIndex'), __('Running latest version message'));
             } else {
-                $this->feather->url->redirect($this->feather->urlFor('adminIndex'), sprintf(__('New version available message'), '<a href="http://featherbb.org/">FeatherBB.org</a>'));
-=======
-                redirect(Url::get('admin/'), __('Running latest version message'));
-            } else {
-                redirect(Url::get('admin/'), sprintf(__('New version available message'), '<a href="http://featherbb.org/">FeatherBB.org</a>'));
->>>>>>> development
+                Url::redirect($this->feather->urlFor('adminIndex'), sprintf(__('New version available message'), '<a href="http://featherbb.org/">FeatherBB.org</a>'));
             }
         }
         // Remove /install
@@ -75,11 +69,7 @@ public function display($action = null)
             $deleted = $this->remove_install_folder($this->feather->forum_env['FEATHER_ROOT'].'install');
 
             if ($deleted) {
-<<<<<<< HEAD
-                $this->feather->url->redirect($this->feather->urlFor('adminIndex'), __('Deleted install.php redirect'));
-=======
-                redirect(Url::get('admin/'), __('Deleted install.php redirect'));
->>>>>>> development
+                Url::redirect($this->feather->urlFor('adminIndex'), __('Deleted install.php redirect'));
             } else {
                 throw new \FeatherBB\Core\Error(__('Delete install.php failed'), 500);
             }
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
index f4f5670e..dd47ed46 100644
--- a/featherbb/Controller/Admin/Parser.php
+++ b/featherbb/Controller/Admin/Parser.php
@@ -34,26 +34,16 @@ public function display()
         require $this->feather->forum_env['FEATHER_ROOT'] . 'featherbb/lang/' . $this->user->language . '/admin/parser.php';
 
         // This is where the parser data lives and breathes.
-<<<<<<< HEAD
-        $cache_file = FEATHER_ROOT.'cache/cache_parser_data.php';
-
-        // If RESET button pushed, or no cache file, re-compile master bbcode source file.
-        if ($this->request->post('reset') || !file_exists($cache_file)) {
-            require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_source.php');
-            require_once(FEATHER_ROOT.'featherbb/Helpers/bbcd_compile.php');
-            $this->feather->url->redirect($this->feather->urlFor('adminParser'), $lang_admin_parser['reset_success']);
-=======
         $cache_file = $this->feather->forum_env['FEATHER_ROOT'].'cache/cache_parser_data.php';
 
         // If RESET button pushed, or no cache file, re-compile master bbcode source file.
         if ($this->request->post('reset') || !file_exists($cache_file)) {
-            require_once($this->feather->forum_env['FEATHER_ROOT'].'featherbb/Core/Parser/bbcd_source.php');
-            require_once($this->feather->forum_env['FEATHER_ROOT'].'featherbb/Core/Parser/bbcd_compile.php');
-            redirect(Url::get('admin/parser/'), $lang_admin_parser['reset_success']);
->>>>>>> development
+            require_once($this->feather->forum_env['FEATHER_ROOT'].'featherbb/Core/parser/bbcd_source.php');
+            require_once($this->feather->forum_env['FEATHER_ROOT'].'featherbb/Core/parser/bbcd_compile.php');
+            Url::redirect($this->feather->urlFor('adminParser'), $lang_admin_parser['reset_success']);
         }
 
-        // Load the current BBCode $pd array from featherbb/Helpers/parser_data.inc.php.
+        // Load the current BBCode $pd array from featherbb/Core/parser/parser_data.inc.php.
         require_once($cache_file);            // Fetch $pd compiled global regex data.
         $bbcd = $pd['bbcd'];                // Local scratch copy of $bbcd.
         $smilies = $pd['smilies'];            // Local scratch copy of $smilies.
@@ -73,13 +63,8 @@ public function display()
                         if (preg_match('/^[\w\-.]++$/', $name)) {            // If we have a valid filename?
                             if (preg_match('%^image/%', $f['type'])) {        // If we have an image file type?
                                 if ($f['size'] > 0 && $f['size'] <= $this->config['o_avatars_size']) {
-<<<<<<< HEAD
-                                    if (move_uploaded_file($f['tmp_name'], FEATHER_ROOT .'style/img/smilies/'. $name)) {
-                                        $this->feather->url->redirect($this->feather->urlFor('adminParser'), $lang_admin_parser['upload success']);
-=======
                                     if (move_uploaded_file($f['tmp_name'], $this->feather->forum_env['FEATHER_ROOT'] .'style/img/smilies/'. $name)) {
-                                        redirect(Url::get('admin/parser/'), $lang_admin_parser['upload success']);
->>>>>>> development
+                                        Url::redirect($this->feather->urlFor('adminParser'), $lang_admin_parser['upload success']);
                                     } else { //  Error #1: 'Smiley upload failed. Unable to move to smiley folder.'.
                                         throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_1'], 500);
                                     }
@@ -212,13 +197,8 @@ public function display()
                 }
             }
 
-<<<<<<< HEAD
-            require_once('featherbb/Helpers/bbcd_compile.php'); // Compile $bbcd and save into $pd['bbcd']
-            $this->feather->url->redirect($this->feather->urlFor('adminParser'), $lang_admin_parser['save_success']);
-=======
             require_once('featherbb/Core/parser/bbcd_compile.php'); // Compile $bbcd and save into $pd['bbcd']
-            redirect(Url::get('admin/parser/'), $lang_admin_parser['save_success']);
->>>>>>> development
+            Url::redirect($this->feather->urlFor('adminParser'), $lang_admin_parser['save_success']);
         }
 
         AdminUtils::generateAdminMenu('parser');
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
index f3e79bf7..e861d836 100644
--- a/featherbb/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -66,17 +66,10 @@ public function activate()
         try {
             $plugin->activate($class);
         } catch (\Exception $e) {
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('adminPlugins'), $e->getMessage());
+            Url::redirect($this->feather->urlFor('adminPlugins'), $e->getMessage());
         }
         // Plugin has been activated, confirm and redirect
-        $this->feather->url->redirect($this->feather->urlFor('adminPlugins'), 'Plugin "'.$class::$name.'" activated!');
-=======
-            redirect(Url::get('admin/plugins/'), $e->getMessage());
-        }
-        // Plugin has been activated, confirm and redirect
-        $this->feather->url->redirect(Url::get('admin/plugins/'), 'Plugin "'.$class::$name.'" activated!');
->>>>>>> development
+        Url::redirect($this->feather->urlFor('adminPlugins'), 'Plugin "'.$class::$name.'" activated!');
     }
 
     public function deactivate()
@@ -91,17 +84,10 @@ public function deactivate()
         try {
             $plugin->deactivate($class);
         } catch (\Exception $e) {
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('adminPlugins'), $this->feather->utils->escape($e->getMessage()));
-        }
-        // Plugin has been activated, confirm and redirect
-        $this->feather->url->redirect($this->feather->urlFor('adminPlugins'), array('warning', 'Plugin "'.$class::$name.'" deactivated!'));
-=======
-            redirect(Url::get('admin/plugins/'), Utils::escape($e->getMessage()));
+            Url::redirect($this->feather->urlFor('adminPlugins'), $this->feather->utils->escape($e->getMessage()));
         }
         // Plugin has been activated, confirm and redirect
-        $this->feather->url->redirect(Url::get('admin/plugins/'), array('warning', 'Plugin "'.$class::$name.'" deactivated!'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('adminPlugins'), array('warning', 'Plugin "'.$class::$name.'" deactivated!'));
     }
 
     public function display()
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
index a29528b1..06b7c542 100644
--- a/featherbb/Controller/Auth.php
+++ b/featherbb/Controller/Auth.php
@@ -24,11 +24,7 @@ public function __construct()
     public function login()
     {
         if (!$this->feather->user->is_guest) {
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('home'), 'Already logged in');
-=======
-            $this->feather->url->redirect(Url::get('/'), 'Already logged in');
->>>>>>> development
+            Url::redirect($this->feather->urlFor('home'), 'Already logged in');
         }
 
         if ($this->feather->request->isPost()) {
@@ -57,11 +53,7 @@ public function login()
                     $expire = $this->feather->hooks->fire('expire_login', $expire);
                     \FeatherBB\Model\Auth::feather_setcookie($user->id, $form_password_hash, $expire);
 
-<<<<<<< HEAD
-                    $this->feather->url->redirect($this->feather->urlFor('home'), __('Login redirect'));
-=======
-                    $this->feather->url->redirect(Url::base(), __('Login redirect'));
->>>>>>> development
+                    Url::redirect($this->feather->urlFor('home'), __('Login redirect'));
                 }
             }
             throw new \FeatherBB\Core\Error(__('Wrong user/pass').' <a href="'.Url::get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
@@ -80,13 +72,8 @@ public function logout($token)
     {
         $token = $this->feather->hooks->fire('logout_start', $token);
 
-<<<<<<< HEAD
         if ($this->feather->user->is_guest || !isset($token) || $token != \FeatherBB\Utils::feather_hash($this->feather->user->id.\FeatherBB\Utils::feather_hash($this->feather->request->getIp()))) {
-            $this->feather->url->redirect($this->feather->urlFor('home'), 'Not logged in');
-=======
-        if ($this->feather->user->is_guest || !isset($token) || $token != Utils::hash($this->feather->user->id.Utils::hash($this->feather->request->getIp()))) {
-            $this->feather->url->redirect(Url::get('/'), 'Not logged in');
->>>>>>> development
+            Url::redirect($this->feather->urlFor('home'), 'Not logged in');
         }
 
         \FeatherBB\Model\Auth::delete_online_by_id($this->feather->user->id);
@@ -99,21 +86,13 @@ public function logout($token)
         \FeatherBB\Model\Auth::feather_setcookie(1, Utils::hash(uniqid(rand(), true)), time() + 31536000);
         $this->feather->hooks->fire('logout_end');
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('home'), __('Logout redirect'));
-=======
-        redirect(Url::base(), __('Logout redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('home'), __('Logout redirect'));
     }
 
     public function forget()
     {
         if (!$this->feather->user->is_guest) {
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('home'), 'Already logged in');
-=======
-            $this->feather->url->redirect(Url::get('/'), 'Already logged in');
->>>>>>> development
+            Url::redirect($this->feather->urlFor('home'), 'Already logged in');
         }
 
         if ($this->feather->request->isPost()) {
@@ -158,11 +137,7 @@ public function forget()
 
                 $this->feather->email->feather_mail($email, $mail_subject, $cur_mail_message);
 
-<<<<<<< HEAD
-                $this->feather->url->redirect($this->feather->urlFor('home'), __('Forget mail').' <a href="mailto:'.$this->feather->utils->escape($this->feather->forum_settings['o_admin_email']).'">'.$this->feather->utils->escape($this->feather->forum_settings['o_admin_email']).'</a>.', 200);
-=======
-                $this->feather->url->redirect(Url::get('/'), __('Forget mail').' <a href="mailto:'.Utils::escape($this->feather->forum_settings['o_admin_email']).'">'.Utils::escape($this->feather->forum_settings['o_admin_email']).'</a>.', 200);
->>>>>>> development
+                Url::redirect($this->feather->urlFor('home'), __('Forget mail').' <a href="mailto:'.$this->feather->utils->escape($this->feather->forum_settings['o_admin_email']).'">'.$this->feather->utils->escape($this->feather->forum_settings['o_admin_email']).'</a>.', 200);
             } else {
                 throw new \FeatherBB\Core\Error(__('No email match').' '.Utils::escape($email).'.', 400);
             }
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index 8940e1d3..6b3c69ad 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -72,12 +72,8 @@ public function editpost($id)
                 // Edit the post
                 $this->model->edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod);
 
-<<<<<<< HEAD
-                // $this->feather->url->redirect($this->feather->urlFor('viewPost', array('pid' => $id)), __('Post redirect'));
-                $this->feather->url->redirect($this->feather->url->get('post/'.$id.'/#p'.$id), __('Post redirect'));
-=======
-                redirect(Url::get('post/'.$id.'/#p'.$id), __('Post redirect'));
->>>>>>> development
+                // Url::redirect($this->feather->urlFor('viewPost', array('pid' => $id)), __('Post redirect'));
+                Url::redirect($this->feather->url->get('post/'.$id.'/#p'.$id), __('Post redirect'));
             }
         } else {
             $post = '';
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
index f668bff2..59d72985 100644
--- a/featherbb/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -203,11 +203,7 @@ public function create_db(array $data)
         $flash->save();
 
         // Redirect to homepage
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('home'));
-=======
-        redirect(Url::get('/'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('home'));
     }
 
     public function write_config($array)
diff --git a/featherbb/Controller/Login.php b/featherbb/Controller/Login.php
index 61eb1374..b8621bbe 100644
--- a/featherbb/Controller/Login.php
+++ b/featherbb/Controller/Login.php
@@ -30,11 +30,7 @@ public function __construct()
     public function display()
     {
         if (!$this->user->is_guest) {
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('home'), 'Already logged in');
-=======
-            $this->feather->url->redirect(Url::get('/'), 'Already logged in');
->>>>>>> development
+            Url::redirect($this->feather->urlFor('home'), 'Already logged in');
         }
 
         $this->feather->template->setPageInfo(array(
diff --git a/featherbb/Controller/Misc.php b/featherbb/Controller/Misc.php
index 73268244..6f57d094 100644
--- a/featherbb/Controller/Misc.php
+++ b/featherbb/Controller/Misc.php
@@ -45,11 +45,7 @@ public function markread()
         // Reset tracked topics
         set_tracked_topics(null);
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('home'), __('Mark read redirect'));
-=======
-        redirect(Url::base(), __('Mark read redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('home'), __('Mark read redirect'));
     }
 
     public function markforumread($id)
@@ -62,11 +58,7 @@ public function markforumread($id)
         $tracked_topics['forums'][$id] = time();
         set_tracked_topics($tracked_topics);
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('viewForum', array('id' => $id)), __('Mark forum read redirect'));
-=======
-        redirect(Url::get('forum/'.$id.'/'), __('Mark forum read redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('viewForum', array('id' => $id)), __('Mark forum read redirect'));
     }
 
     public function subscribeforum($id)
diff --git a/featherbb/Controller/Moderate.php b/featherbb/Controller/Moderate.php
index cecf8264..12240985 100644
--- a/featherbb/Controller/Moderate.php
+++ b/featherbb/Controller/Moderate.php
@@ -94,46 +94,26 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         // Stick a topic
         if ($action == 'stick') {
             $this->model->stick_topic($id, $fid);
-
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Stick topic redirect'));
-=======
-            redirect(Url::get('topic/'.$id.'/'), __('Stick topic redirect'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Stick topic redirect'));
         }
 
 
         // Unstick a topic
         if ($action == 'unstick') {
             $this->model->unstick_topic($id, $fid);
-
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Unstick topic redirect'));
-=======
-            redirect(Url::get('topic/'.$id.'/'), __('Unstick topic redirect'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Unstick topic redirect'));
         }
 
         // Open a topic
         if ($action == 'open') {
             $this->model->open_topic($id, $fid);
-
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Open topic redirect'));
-=======
-            redirect(Url::get('topic/'.$id.'/'), __('Open topic redirect'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Open topic redirect'));
         }
 
         // Close a topic
         if ($action == 'close') {
             $this->model->close_topic($id, $fid);
-
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Close topic redirect'));
-=======
-            redirect(Url::get('topic/'.$id.'/'), __('Close topic redirect'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Close topic redirect'));
         }
 
         $cur_topic = $this->model->get_topic_info($fid, $id);
@@ -364,11 +344,7 @@ public function dealposts($fid)
                 $this->model->close_multiple_topics($action, $topics, $fid);
 
                 $redirect_msg = ($action) ? __('Close topics redirect') : __('Open topics redirect');
-<<<<<<< HEAD
-                $this->feather->url->redirect($this->feather->urlFor('moderateForum', array('id' => $fid)), $redirect_msg);
-=======
-                redirect(Url::get('moderate/forum/'.$fid.'/'), $redirect_msg);
->>>>>>> development
+                Url::redirect($this->feather->urlFor('moderateForum', array('id' => $fid)), $redirect_msg);
             }
         }
     }
diff --git a/featherbb/Controller/Post.php b/featherbb/Controller/Post.php
index 00605bb1..f34bad7a 100644
--- a/featherbb/Controller/Post.php
+++ b/featherbb/Controller/Post.php
@@ -123,11 +123,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             $this->model->increment_post_count($post, $new['tid']);
                         }
 
-<<<<<<< HEAD
-                    $this->feather->url->redirect($this->feather->url->get('post/'.$new['pid'].'/#p'.$new['pid']), __('Post redirect'));
-=======
-                    redirect(Url::get('post/'.$new['pid'].'/#p'.$new['pid']), __('Post redirect'));
->>>>>>> development
+                    Url::redirect(Url::get('post/'.$new['pid'].'/#p'.$new['pid']), __('Post redirect'));
                 }
         }
 
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
index a0d5889a..59be4842 100644
--- a/featherbb/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -310,11 +310,7 @@ public function action($id, $action)
 
             $this->model->delete_avatar($id);
 
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->url->get('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
-=======
-            redirect(Url::get('user/'.$id.'/section/personality/'), __('Avatar deleted redirect'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'personality')), __('Avatar deleted redirect'));
         } elseif ($action == 'promote') {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_promote_users == '0')) {
                 throw new \FeatherBB\Core\Error(__('No permission'), 403);
diff --git a/featherbb/Controller/Register.php b/featherbb/Controller/Register.php
index 559fa824..c12b5eff 100644
--- a/featherbb/Controller/Register.php
+++ b/featherbb/Controller/Register.php
@@ -80,23 +80,14 @@ public function display()
 
     public function cancel()
     {
-<<<<<<< HEAD
         $this->feather->redirect($this->feather->urlFor('home'));
-=======
-        redirect(Url::base());
->>>>>>> development
     }
 
     public function rules()
     {
         // If we are logged in, we shouldn't be here
         if (!$this->user->is_guest) {
-<<<<<<< HEAD
             $this->feather->redirect($this->feather->urlFor('home'));
-=======
-            header('Location: '.Url::base());
-            exit;
->>>>>>> development
         }
 
         // Display an error message if new registrations are disabled
@@ -105,11 +96,7 @@ public function rules()
         }
 
         if ($this->config['o_rules'] != '1') {
-<<<<<<< HEAD
             $this->feather->redirect($this->feather->urlFor('register'));
-=======
-            redirect(Url::get('register/agree/'));
->>>>>>> development
         }
 
         $this->feather->template->setPageInfo(array(
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index 94bd43f3..7b8d006b 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -74,11 +74,7 @@ public function display()
                     $this->feather->template->addTemplate('search/footer.php', 10)->display();
 
                 } else {
-<<<<<<< HEAD
-                    $this->feather->url->redirect($this->feather->urlFor('search'), __('No hits'));
-=======
-                    redirect(Url::get('search/'), __('No hits'));
->>>>>>> development
+                    Url::redirect($this->feather->urlFor('search'), __('No hits'));
                 }
         }
         // Display the form
@@ -98,7 +94,7 @@ public function quicksearches($show)
 <<<<<<< HEAD
         $this->feather->redirect($this->feather->urlFor('quickSearch', array('show' => '?action=show_'.$show)));
 =======
-        redirect(Url::get('search/?action=show_'.$show));
+        Url::redirect(Url::get('search/?action=show_'.$show));
 >>>>>>> development
     }
 }
diff --git a/featherbb/Core/Url.php b/featherbb/Core/Url.php
index 093ccbac..3546a99f 100644
--- a/featherbb/Core/Url.php
+++ b/featherbb/Core/Url.php
@@ -906,7 +906,7 @@ public static function is_valid($url)
     //
     // Display $message and redirect user to $destination_url
     //
-    public function redirect($destination_url, $message = null, $status = 302)
+    public static function redirect($destination_url, $message = null, $status = 302)
     {
         self::$feather = \Slim\Slim::getInstance();
 
@@ -915,11 +915,6 @@ public function redirect($destination_url, $message = null, $status = 302)
             $message = array('info', $message);
         // Add a flash message
         self::$feather->flash($message[0], $message[1]);
-
-<<<<<<< HEAD
-        $this->feather->redirect($destination_url.'/');
-=======
         self::$feather->redirect($destination_url);
->>>>>>> development
     }
 }
diff --git a/featherbb/Core/parser/bbcd_compile.php b/featherbb/Core/parser/bbcd_compile.php
index ae450a24..29f07dfa 100644
--- a/featherbb/Core/parser/bbcd_compile.php
+++ b/featherbb/Core/parser/bbcd_compile.php
@@ -419,11 +419,7 @@ function file2title($file)
 $s .= ";\n";
 
 $s .= "?>";
-<<<<<<< HEAD:featherbb/Helpers/bbcd_compile.php
-file_put_contents(FEATHER_ROOT.'cache/cache_parser_data.php', $s);
-=======
 file_put_contents($feather->forum_env['FEATHER_ROOT'].'cache/cache_parser_data.php', $s);
->>>>>>> development:featherbb/Core/parser/bbcd_compile.php
 
 // Clean up our global variables.
 unset($all_tags); unset($all_block_tags);
diff --git a/featherbb/Helpers/functions.php b/featherbb/Helpers/functions.php
index 7cae69c8..006e08c8 100644
--- a/featherbb/Helpers/functions.php
+++ b/featherbb/Helpers/functions.php
@@ -448,20 +448,6 @@ function random_pass($len)
 }
 
 
-//
-// Display $message and redirect user to $destination_url
-//
-function redirect($destination_url, $message = null)
-{
-    $feather = \Slim\Slim::getInstance();
-
-    // Add a flash message
-    $feather->flash('info', $message);
-
-    $feather->redirect($destination_url);
-}
-
-
 //
 // Generate a cache ID based on the last modification time for all stopwords files
 //
diff --git a/featherbb/Model/Admin/Bans.php b/featherbb/Model/Admin/Bans.php
index ccd7c9ad..db1f786a 100644
--- a/featherbb/Model/Admin/Bans.php
+++ b/featherbb/Model/Admin/Bans.php
@@ -278,11 +278,7 @@ public function insert_ban()
         // Regenerate the bans cache
         $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('adminBans'), __('Ban edited redirect'));
-=======
-        redirect(Url::get('admin/bans/'), __('Ban edited redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('adminBans'), __('Ban edited redirect'));
     }
 
     public function remove_ban($ban_id)
@@ -297,11 +293,7 @@ public function remove_ban($ban_id)
         // Regenerate the bans cache
         $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('adminBans'), __('Ban removed redirect'));
-=======
-        redirect(Url::get('admin/bans/'), __('Ban removed redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('adminBans'), __('Ban removed redirect'));
     }
 
     public function find_ban($start_from = false)
diff --git a/featherbb/Model/Admin/Censoring.php b/featherbb/Model/Admin/Censoring.php
index 889d1e68..db68b97f 100644
--- a/featherbb/Model/Admin/Censoring.php
+++ b/featherbb/Model/Admin/Censoring.php
@@ -48,11 +48,7 @@ public function add_word()
         $this->feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
         $this->feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('adminCensoring'), __('Word added redirect'));
-=======
-        redirect(Url::get('admin/censoring/'), __('Word added redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('adminCensoring'), __('Word added redirect'));
     }
 
     public function update_word()
@@ -80,11 +76,7 @@ public function update_word()
         $this->feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
         $this->feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('adminCensoring'), __('Word updated redirect'));
-=======
-        redirect(Url::get('admin/censoring/'), __('Word updated redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('adminCensoring'), __('Word updated redirect'));
     }
 
     public function remove_word()
@@ -100,11 +92,7 @@ public function remove_word()
         $this->feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
         $this->feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('adminCensoring'),  __('Word removed redirect'));
-=======
-        redirect(Url::get('admin/censoring/'),  __('Word removed redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('adminCensoring'),  __('Word removed redirect'));
     }
 
     public function get_words()
diff --git a/featherbb/Model/Admin/Groups.php b/featherbb/Model/Admin/Groups.php
index f75ce8b7..c7366a16 100644
--- a/featherbb/Model/Admin/Groups.php
+++ b/featherbb/Model/Admin/Groups.php
@@ -260,15 +260,9 @@ public function add_edit_group($groups)
         $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
 
         if ($this->request->post('mode') == 'edit') {
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('adminGroups'), __('Group edited redirect'));
+            Url::redirect($this->feather->urlFor('adminGroups'), __('Group edited redirect'));
         } else {
-            $this->feather->url->redirect($this->feather->urlFor('adminGroups'), __('Group added redirect'));
-=======
-            redirect(Url::get('admin/groups/'), __('Group edited redirect'));
-        } else {
-            redirect(Url::get('admin/groups/'), __('Group added redirect'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('adminGroups'), __('Group added redirect'));
         }
     }
 
@@ -293,11 +287,7 @@ public function set_default_group($groups)
         // Regenerate the config cache
         $this->feather->cache->store('config', \FeatherBB\Model\Cache::get_config());
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('adminGroups'), __('Default group redirect'));
-=======
-        redirect(Url::get('admin/groups/'), __('Default group redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('adminGroups'), __('Default group redirect'));
     }
 
     public function check_members($group_id)
@@ -340,11 +330,7 @@ public function delete_group($group_id)
         DB::for_table('groups')->where('g_promote_next_group', $group_id)
                                                    ->update_many('g_promote_next_group', 0);
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('adminGroups'), __('Group removed redirect'));
-=======
-        redirect(Url::get('admin/groups/'), __('Group removed redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('adminGroups'), __('Group removed redirect'));
     }
 
     public function get_group_title($group_id)
diff --git a/featherbb/Model/Admin/Maintenance.php b/featherbb/Model/Admin/Maintenance.php
index d7041642..1af97006 100644
--- a/featherbb/Model/Admin/Maintenance.php
+++ b/featherbb/Model/Admin/Maintenance.php
@@ -213,11 +213,7 @@ public function prune_comply($prune_from, $prune_sticky)
                     ->delete_many();
         }
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('adminMaintenance'), __('Posts pruned redirect'));
-=======
-        redirect(Url::get('admin/maintenance/'), __('Posts pruned redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('adminMaintenance'), __('Posts pruned redirect'));
     }
 
     public function get_info_prune($prune_sticky, $prune_from)
diff --git a/featherbb/Model/Admin/Options.php b/featherbb/Model/Admin/Options.php
index de113bac..5ac09518 100644
--- a/featherbb/Model/Admin/Options.php
+++ b/featherbb/Model/Admin/Options.php
@@ -232,11 +232,7 @@ public function update_options()
         $this->feather->cache->store('config', \FeatherBB\Model\Cache::get_config());
         $this->clear_feed_cache();
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('adminOptions'), __('Options updated redirect'));
-=======
-        redirect(Url::get('admin/options/'), __('Options updated redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('adminOptions'), __('Options updated redirect'));
     }
 
     public function clear_feed_cache()
diff --git a/featherbb/Model/Admin/Permissions.php b/featherbb/Model/Admin/Permissions.php
index 497e8b27..c5ccb3c4 100644
--- a/featherbb/Model/Admin/Permissions.php
+++ b/featherbb/Model/Admin/Permissions.php
@@ -47,10 +47,6 @@ public function update_permissions()
         $this->feather->cache->store('config', \FeatherBB\Model\Cache::get_config());
         // $this->clear_feed_cache();
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('adminPermissions'), __('Perms updated redirect'));
-=======
-        redirect(Url::get('admin/permissions/'), __('Perms updated redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('adminPermissions'), __('Perms updated redirect'));
     }
 }
diff --git a/featherbb/Model/Admin/Reports.php b/featherbb/Model/Admin/Reports.php
index 86065fa2..f57aa930 100644
--- a/featherbb/Model/Admin/Reports.php
+++ b/featherbb/Model/Admin/Reports.php
@@ -60,11 +60,7 @@ public function zap_report()
                 ->delete_many();
         }
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('adminReports'), __('Report zapped redirect'));
-=======
-        redirect(Url::get('admin/reports/'), __('Report zapped redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('adminReports'), __('Report zapped redirect'));
     }
 
     public function get_reports()
diff --git a/featherbb/Model/Admin/Users.php b/featherbb/Model/Admin/Users.php
index 2a32efd2..cff9cbdb 100644
--- a/featherbb/Model/Admin/Users.php
+++ b/featherbb/Model/Admin/Users.php
@@ -243,11 +243,7 @@ public function move_users()
             DB::for_table('users')->where_in('id', $move['user_ids'])
                                                       ->update_many('group_id', $new_group);
 
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('adminUsers'), __('Users move redirect'));
-=======
-            redirect(Url::get('admin/users/'), __('Users move redirect'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('adminUsers'), __('Users move redirect'));
         }
 
         $move = $this->hook->fire('model.users.move_users.move', $move);
@@ -412,11 +408,7 @@ public function delete_users()
 
             $stats = $this->feather->cache->retrieve('users_info');
 
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('adminUsers'), __('Users delete redirect'));
-=======
-            redirect(Url::get('admin/users/'), __('Users delete redirect'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('adminUsers'), __('Users delete redirect'));
         }
 
         return $user_ids;
@@ -535,11 +527,7 @@ public function ban_users()
                 // Regenerate the bans cache
                 $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
 
-<<<<<<< HEAD
-                $this->feather->url->redirect($this->feather->urlFor('adminUsers'), __('Users banned redirect'));
-=======
-                redirect(Url::get('admin/users/'), __('Users banned redirect'));
->>>>>>> development
+                Url::redirect($this->feather->urlFor('adminUsers'), __('Users banned redirect'));
             }
         }
         return $user_ids;
diff --git a/featherbb/Model/Delete.php b/featherbb/Model/Delete.php
index a355f7f9..9f612e4b 100644
--- a/featherbb/Model/Delete.php
+++ b/featherbb/Model/Delete.php
@@ -67,11 +67,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
             delete_topic($tid);
             update_forum($fid);
 
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('viewForum', array('id' => $fid)), __('Topic del redirect'));
-=======
-            redirect(Url::get('forum/'.$fid.'/'), __('Topic del redirect'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('viewForum', array('id' => $fid)), __('Topic del redirect'));
         } else {
             $this->hook->fire('handle_deletion', $tid, $fid, $id);
 
@@ -90,11 +86,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
 
             $post = $post->find_one();
 
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->url->get('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
-=======
-            redirect(Url::get('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
->>>>>>> development
+            Url::redirect(Url::get('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
         }
     }
 }
diff --git a/featherbb/Model/Login.php b/featherbb/Model/Login.php
index 7629e2d6..fd5322b6 100644
--- a/featherbb/Model/Login.php
+++ b/featherbb/Model/Login.php
@@ -86,11 +86,7 @@ public function login()
         $redirect_url = $this->request->post('redirect_url');
         $redirect_url = $this->hook->fire('redirect_url_login', $redirect_url);
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->utils->escape($redirect_url), __('Login redirect'));
-=======
-        redirect(Utils::escape($redirect_url), __('Login redirect'));
->>>>>>> development
+        Url::redirect(Utils::escape($redirect_url), __('Login redirect'));
     }
 
     public function logout($id, $token)
@@ -120,11 +116,7 @@ public function logout($id, $token)
 
         $this->auth->feather_setcookie(1, Utils::hash(uniqid(rand(), true)), time() + 31536000);
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('home'), __('Logout redirect'));
-=======
-        redirect(Url::base(), __('Logout redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('home'), __('Logout redirect'));
     }
 
     public function password_forgotten()
diff --git a/featherbb/Model/Misc.php b/featherbb/Model/Misc.php
index cf008aae..21f5a032 100644
--- a/featherbb/Model/Misc.php
+++ b/featherbb/Model/Misc.php
@@ -111,11 +111,7 @@ public function send_email($mail)
         // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after the email is sent) TODO
         //$redirect_url = validate_redirect($this->request->post('redirect_url'), 'index.php');
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('home'), __('Email sent redirect'));
-=======
-        redirect(Url::base(), __('Email sent redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('home'), __('Email sent redirect'));
     }
 
     public function get_redirect_url($recipient_id)
@@ -227,12 +223,8 @@ public function insert_report($post_id)
         $last_report_sent = $this->hook->fireDB('insert_last_report_sent', $last_report_sent);
         $last_report_sent = $last_report_sent->save();
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->url->get('post/'.$post_id.'/#p'.$post_id), __('Report redirect'));
-        // redirect($this->feather->url->get('forum/'.$report['forum_id'].'/'.$this->feather->url->url_friendly($report['subject']).'/'), __('Report redirect'));
-=======
-        redirect(Url::get('forum/'.$report['forum_id'].'/'.Url::url_friendly($report['subject']).'/'), __('Report redirect'));
->>>>>>> development
+        Url::redirect(Url::get('post/'.$post_id.'/#p'.$post_id), __('Report redirect'));
+        // Url::redirect($this->feather->url->get('forum/'.$report['forum_id'].'/'.$this->feather->url->url_friendly($report['subject']).'/'), __('Report redirect'));
     }
 
     public function get_info_report($post_id)
@@ -316,11 +308,7 @@ public function subscribe_topic($topic_id)
         $subscription = $this->hook->fireDB('subscribe_topic_query', $subscription);
         $subscription = $subscription->save();
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $topic_id)), __('Subscribe redirect'));
-=======
-        redirect(Url::get('topic/'.$topic_id.'/'), __('Subscribe redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('viewTopic', ['id' => $topic_id]), __('Subscribe redirect'));
     }
 
     public function unsubscribe_topic($topic_id)
@@ -348,11 +336,7 @@ public function unsubscribe_topic($topic_id)
         $delete = $this->hook->fireDB('unsubscribe_topic_query', $delete);
         $delete = $delete->delete_many();
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $topic_id)), __('Unsubscribe redirect'));
-=======
-        redirect(Url::get('topic/'.$topic_id.'/'), __('Unsubscribe redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('viewTopic', ['id' => $topic_id]), __('Unsubscribe redirect'));
     }
 
     public function unsubscribe_forum($forum_id)
@@ -380,11 +364,7 @@ public function unsubscribe_forum($forum_id)
         $delete = $this->hook->fireDB('unsubscribe_forum_query', $delete);
         $delete = $delete->delete_many();
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('viewForum', array('id' => $forum_id)), __('Unsubscribe redirect'));
-=======
-        redirect(Url::get('forum/'.$forum_id.'/'), __('Unsubscribe redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('viewForum', ['id' => $forum_id]), __('Unsubscribe redirect'));
     }
 
     public function subscribe_forum($forum_id)
@@ -435,10 +415,6 @@ public function subscribe_forum($forum_id)
         $subscription = $this->hook->fireDB('subscribe_forum_query', $subscription);
         $subscription = $subscription->save();
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('viewForum', array('id' => $forum_id)), __('Subscribe redirect'));
-=======
-        redirect(Url::get('forum/'.$forum_id.'/'), __('Subscribe redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('viewForum', ['id' => $forum_id]), __('Subscribe redirect'));
     }
 }
diff --git a/featherbb/Model/Moderate.php b/featherbb/Model/Moderate.php
index ee5b8d0a..1cddff72 100644
--- a/featherbb/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -157,11 +157,7 @@ public function delete_posts($tid, $fid, $p = null)
 
             update_forum($fid);
 
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $tid)), __('Delete posts redirect'));
-=======
-            redirect(Url::get('topic/'.$tid.'/'), __('Delete posts redirect'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('viewTopic', array('id' => $tid)), __('Delete posts redirect'));
         }
 
         $posts = $this->hook->fire('delete_posts', $posts);
@@ -322,11 +318,7 @@ public function split_posts($tid, $fid, $p = null)
             update_forum($fid);
             update_forum($move_to_forum);
 
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('viewTopic', array('id' => $new_tid)), __('Split posts redirect'));
-=======
-            redirect(Url::get('topic/'.$new_tid.'/'), __('Split posts redirect'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('viewTopic', array('id' => $new_tid)), __('Split posts redirect'));
         }
 
         $posts = $this->hook->fire('split_posts', $posts);
@@ -591,11 +583,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
 
         $redirect_msg = (count($topics) > 1) ? __('Move topics redirect') : __('Move topic redirect');
         $redirect_msg = $this->hook->fire('move_topics_to_redirect_message', $redirect_msg);
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('viewForum', array('id' => $move_to_forum)), $redirect_msg);
-=======
-        redirect(Url::get('forum/'.$move_to_forum.'/'), $redirect_msg);
->>>>>>> development
+        Url::redirect($this->feather->urlFor('viewForum', array('id' => $move_to_forum)), $redirect_msg);
     }
 
     public function check_move_possible()
@@ -747,11 +735,7 @@ public function merge_topics($fid)
 
         // Update the forum FROM which the topic was moved and redirect
         update_forum($fid);
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('viewForum', array('id' => $fid)), __('Merge topics redirect'));
-=======
-        redirect(Url::get('forum/'.$fid.'/'), __('Merge topics redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('viewForum', array('id' => $fid)), __('Merge topics redirect'));
     }
 
     public function delete_topics($topics, $fid)
@@ -835,11 +819,7 @@ public function delete_topics($topics, $fid)
 
         $this->hook->fire('delete_topics');
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('viewForum', array('id' => $fid)), __('Delete topics redirect'));
-=======
-        redirect(Url::get('forum/'.$fid.'/'), __('Delete topics redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('viewForum', array('id' => $fid)), __('Delete topics redirect'));
     }
 
     public function get_forum_info($fid)
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index 05c0b2fd..7b83b2ad 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -59,11 +59,7 @@ public function change_pass($id)
                 $query = $this->hook->fireDB('change_pass_activate_query', $query);
                 $query = $query->save();
 
-<<<<<<< HEAD
-                $this->feather->url->redirect($this->feather->urlFor('home'), __('Pass updated'));
-=======
-                $this->feather->url->redirect(Url::get('/'), __('Pass updated'));
->>>>>>> development
+                Url::redirect($this->feather->urlFor('home'), __('Pass updated'));
             }
         }
 
@@ -141,12 +137,7 @@ public function change_pass($id)
             }
 
             $this->hook->fire('change_pass');
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'essentials')), __('Pass updated redirect'));
-=======
-
-            redirect(Url::get('user/'.$id.'/section/essentials/'), __('Pass updated redirect'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'essentials')), __('Pass updated redirect'));
         }
     }
 
@@ -203,11 +194,7 @@ public function change_email($id)
                 $update_mail = $this->hook->fireDB('change_email_query', $update_mail);
                 $update_mail = $update_mail->save();
 
-<<<<<<< HEAD
-                $this->feather->url->redirect($this->feather->urlFor('home'), __('Email updated'));
-=======
-                $this->feather->url->redirect(Url::get('/'), __('Email updated'));
->>>>>>> development
+                Url::redirect($this->feather->urlFor('home'), __('Email updated'));
             }
         } elseif ($this->request->isPost()) {
             $this->hook->fire('change_email_post');
@@ -416,11 +403,7 @@ public function upload_avatar($id, $files_data)
 
         $uploaded_file = $this->hook->fire('upload_avatar', $uploaded_file);
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'personality')), __('Avatar upload redirect'));
-=======
-        redirect(Url::get('user/'.$id.'/section/personality/'), __('Avatar upload redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'personality')), __('Avatar upload redirect'));
     }
 
     public function update_group_membership($id)
@@ -487,11 +470,7 @@ public function update_group_membership($id)
 
         $id = $this->hook->fire('update_group_membership', $id);
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'admin')), __('Group membership redirect'));
-=======
-        redirect(Url::get('user/'.$id.'/section/admin/'), __('Group membership redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'admin')), __('Group membership redirect'));
     }
 
     public function get_username($id)
@@ -561,11 +540,7 @@ public function update_mod_forums($id)
 
         $id = $this->hook->fire('update_mod_forums', $id);
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'admin')), __('Update forums redirect'));
-=======
-        redirect(Url::get('user/'.$id.'/section/admin/'), __('Update forums redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'admin')), __('Update forums redirect'));
     }
 
     public function ban_user($id)
@@ -584,15 +559,9 @@ public function ban_user($id)
         $ban_id = $ban_id->find_one_col('id');
 
         if ($ban_id) {
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('editBan', array('id' => $ban_id)), __('Ban redirect'));
-        } else {
-            $this->feather->url->redirect($this->feather->urlFor('addBan', array('id' => $id)), __('Ban redirect'));
-=======
-            redirect(Url::get('admin/bans/edit/'.$ban_id.'/'), __('Ban redirect'));
+            Url::redirect($this->feather->urlFor('editBan', array('id' => $ban_id)), __('Ban redirect'));
         } else {
-            redirect(Url::get('admin/bans/add/'.$id.'/'), __('Ban redirect'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('addBan', array('id' => $id)), __('Ban redirect'));
         }
     }
 
@@ -624,11 +593,7 @@ public function promote_user($id)
 
         $pid = $this->hook->fire('promote_user', $pid);
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->url->get('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
-=======
-        redirect(Url::get('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
->>>>>>> development
+        Url::redirect($this->feather->url->get('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
     }
 
     public function delete_user($id)
@@ -768,11 +733,7 @@ public function delete_user($id)
 
             $this->hook->fire('delete_user');
 
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('home'), __('User delete redirect'));
-=======
-            redirect(Url::base(), __('User delete redirect'));
->>>>>>> development
+            Url::redirect($this->feather->urlFor('home'), __('User delete redirect'));
         }
     }
 
@@ -1123,11 +1084,7 @@ public function update_profile($id, $info, $section)
 
         $section = $this->hook->fireDB('update_profile', $section, $id);
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => $section)), __('Profile redirect'));
-=======
-        redirect(Url::get('user/'.$id.'/section/'.$section.'/'), __('Profile redirect'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => $section)), __('Profile redirect'));
     }
 
     public function get_user_info($id)
diff --git a/featherbb/Model/Register.php b/featherbb/Model/Register.php
index 777ebfed..c8f61145 100644
--- a/featherbb/Model/Register.php
+++ b/featherbb/Model/Register.php
@@ -265,22 +265,13 @@ public function insert_user($user)
 
             $this->email->feather_mail($user['email1'], $mail_subject, $mail_message);
 
-<<<<<<< HEAD
-            $this->feather->url->redirect($this->feather->urlFor('home'), __('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
-=======
-            redirect(Url::base(),__('Reg email').' <a href="mailto:'.feather_escape($this->config['o_admin_email']).'">'.feather_escape($this->config['o_admin_email']).'</a>.');
-
->>>>>>> development
+            Url::redirect($this->feather->urlFor('home'), __('Reg email').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.');
         }
 
         $this->auth->feather_setcookie($new_uid, $password_hash, time() + $this->config['o_timeout_visit']);
 
         $this->hook->fire('insert_user');
 
-<<<<<<< HEAD
-        $this->feather->url->redirect($this->feather->urlFor('home'), __('Reg complete'));
-=======
-        redirect(Url::base(), __('Reg complete'));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('home'), __('Reg complete'));
     }
 }
diff --git a/style/themes/FeatherBB/view/delete.php b/style/themes/FeatherBB/view/delete.php
index d66cd77d..cedbced2 100644
--- a/style/themes/FeatherBB/view/delete.php
+++ b/style/themes/FeatherBB/view/delete.php
@@ -6,12 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
-<<<<<<< HEAD
-=======
- 
+
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
->>>>>>> development
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -22,15 +19,9 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-<<<<<<< HEAD
-			<li><a href="<?= $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?= $feather->urlFor('viewForum', array('id'=>$cur_post['fid'], 'name'=>$feather->url->url_friendly($cur_post['forum_name']),'page'=>'1')) ?>"><?= $feather->utils->escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?= $feather->urlFor('viewPost', array('pid'=>$id.'/#p'.$id)) ?>"><?= $feather->utils->escape($cur_post['subject']) ?></a></li>
-=======
-			<li><a href="<?php echo Url::base() ?>>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('post/'.$id.'/#p'.$id) ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
->>>>>>> development
+			<li><a href="<?= Url::base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?= Url::get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?= Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?= Url::get('post/'.$id.'/#p'.$id) ?>"><?= Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>
@@ -39,21 +30,12 @@
 <div class="blockform">
 	<h2><span><?php _e('Delete post') ?></span></h2>
 	<div class="box">
-<<<<<<< HEAD
 		<form method="post" action="<?= $feather->urlFor('deletePost', array('id'=>$id)) ?>">
 			<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
 					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.$feather->utils->escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
 					<p><?= ($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
-=======
-		<form method="post" action="<?php echo Url::get('delete/'.$id.'/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.Utils::escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
-					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
->>>>>>> development
 				</div>
 			</div>
 			<p class="buttons"><input type="submit" name="delete" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
@@ -68,13 +50,8 @@
 				<div class="postbody">
 					<div class="postleft">
 						<dl>
-<<<<<<< HEAD
-							<dt><strong><?= $feather->utils->escape($cur_post['poster']) ?></strong></dt>
+							<dt><strong><?= Utils::escape($cur_post['poster']) ?></strong></dt>
 							<dd><span><?= $feather->utils->format_time($cur_post['posted']) ?></span></dd>
-=======
-							<dt><strong><?php echo Utils::escape($cur_post['poster']) ?></strong></dt>
-							<dd><span><?php echo $feather->utils->format_time($cur_post['posted']) ?></span></dd>
->>>>>>> development
 						</dl>
 					</div>
 					<div class="postright">
diff --git a/style/themes/FeatherBB/view/edit.php b/style/themes/FeatherBB/view/edit.php
index eddf22a1..44d6eb4b 100644
--- a/style/themes/FeatherBB/view/edit.php
+++ b/style/themes/FeatherBB/view/edit.php
@@ -7,12 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-<<<<<<< HEAD
-=======
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
->>>>>>> development
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -25,16 +22,9 @@
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-<<<<<<< HEAD
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?= $feather->urlFor('viewForum', array('id'=>$cur_post['fid'], 'name'=>$feather->url->url_friendly($cur_post['forum_name']),'page'=>'1')) ?>"><?= $feather->utils->escape($cur_post['forum_name']) ?></a></li>
-            <!-- <li><span>»&#160;</span><a href="<?= $feather->urlFor('viewTopic', array('id'=>$cur_post['tid'], 'name'=>$feather->url->url_friendly($cur_post['subject']))) ?>"><?= $feather->utils->escape($cur_post['subject']) ?></a></li> -->
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo $feather->utils->escape($cur_post['subject']) ?></a></li>
-=======
 			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo Url::get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
->>>>>>> development
 			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
 		</ul>
 	</div>
diff --git a/view/delete.php b/view/delete.php
index 43b5f372..cedbced2 100644
--- a/view/delete.php
+++ b/view/delete.php
@@ -7,18 +7,21 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
-	exit;
+    exit;
 }
 ?>
 
 <div class="linkst">
 	<div class="inbox">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
+			<li><a href="<?= Url::base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?= Url::get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?= Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?= Url::get('post/'.$id.'/#p'.$id) ?>"><?= Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>
@@ -27,12 +30,12 @@
 <div class="blockform">
 	<h2><span><?php _e('Delete post') ?></span></h2>
 	<div class="box">
-		<form method="post" action="<?php echo $feather->url->get('delete/'.$id.'/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+		<form method="post" action="<?= $feather->urlFor('deletePost', array('id'=>$id)) ?>">
+			<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
 			<div class="inform">
 				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.Utils::escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
-					<p><?php echo($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
+					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.$feather->utils->escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
+					<p><?= ($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
 				</div>
 			</div>
 			<p class="buttons"><input type="submit" name="delete" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
@@ -47,13 +50,13 @@
 				<div class="postbody">
 					<div class="postleft">
 						<dl>
-							<dt><strong><?php echo Utils::escape($cur_post['poster']) ?></strong></dt>
-							<dd><span><?php echo $feather->utils->format_time($cur_post['posted']) ?></span></dd>
+							<dt><strong><?= Utils::escape($cur_post['poster']) ?></strong></dt>
+							<dd><span><?= $feather->utils->format_time($cur_post['posted']) ?></span></dd>
 						</dl>
 					</div>
 					<div class="postright">
 						<div class="postmsg">
-							<?php echo $cur_post['message']."\n" ?>
+							<?= $cur_post['message']."\n" ?>
 						</div>
 					</div>
 				</div>
@@ -61,4 +64,4 @@
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>

From d0f242b9575308ea3ce59832f2dd327791571be6 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 6 Sep 2015 15:57:16 +0200
Subject: [PATCH 319/353] Fix forgotten conflict

---
 featherbb/Controller/Search.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index 7b8d006b..4501df2b 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -91,10 +91,6 @@ public function display()
 
     public function quicksearches($show)
     {
-<<<<<<< HEAD
-        $this->feather->redirect($this->feather->urlFor('quickSearch', array('show' => '?action=show_'.$show)));
-=======
-        Url::redirect(Url::get('search/?action=show_'.$show));
->>>>>>> development
+        Url::redirect($this->feather->urlFor('quickSearch', array('show' => '?action=show_'.$show)));
     }
 }

From c7046f765de9872de5fcecc5361c23d90e8ba4e1 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 6 Sep 2015 16:01:55 +0200
Subject: [PATCH 320/353] Get rid of old "redirect" function

---
 featherbb/Controller/Register.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/featherbb/Controller/Register.php b/featherbb/Controller/Register.php
index c12b5eff..f9b90d73 100644
--- a/featherbb/Controller/Register.php
+++ b/featherbb/Controller/Register.php
@@ -80,14 +80,14 @@ public function display()
 
     public function cancel()
     {
-        $this->feather->redirect($this->feather->urlFor('home'));
+        Url::redirect($this->feather->urlFor('home'));
     }
 
     public function rules()
     {
         // If we are logged in, we shouldn't be here
         if (!$this->user->is_guest) {
-            $this->feather->redirect($this->feather->urlFor('home'));
+            Url::redirect($this->feather->urlFor('home'));
         }
 
         // Display an error message if new registrations are disabled
@@ -96,7 +96,7 @@ public function rules()
         }
 
         if ($this->config['o_rules'] != '1') {
-            $this->feather->redirect($this->feather->urlFor('register'));
+            Url::redirect($this->feather->urlFor('register'));
         }
 
         $this->feather->template->setPageInfo(array(

From b23df12906903948d4a78a6e7a76ad92cb418d1c Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 16:18:51 +0200
Subject: [PATCH 321/353] Update copyright

---
 extern.php                                    | 60 ++++++++++---------
 featherbb/Controller/Admin/Bans.php           |  2 +-
 featherbb/Controller/Admin/Categories.php     |  2 +-
 featherbb/Controller/Admin/Censoring.php      |  2 +-
 featherbb/Controller/Admin/Forums.php         |  2 +-
 featherbb/Controller/Admin/Groups.php         |  2 +-
 featherbb/Controller/Admin/Index.php          |  2 +-
 featherbb/Controller/Admin/Maintenance.php    |  2 +-
 featherbb/Controller/Admin/Options.php        |  2 +-
 featherbb/Controller/Admin/Parser.php         |  2 +-
 featherbb/Controller/Admin/Permissions.php    |  2 +-
 featherbb/Controller/Admin/Plugins.php        |  2 +-
 featherbb/Controller/Admin/Reports.php        |  2 +-
 featherbb/Controller/Admin/Statistics.php     |  2 +-
 featherbb/Controller/Admin/Users.php          |  2 +-
 featherbb/Controller/Auth.php                 |  2 +-
 featherbb/Controller/Delete.php               |  2 +-
 featherbb/Controller/Edit.php                 |  2 +-
 featherbb/Controller/Help.php                 |  2 +-
 featherbb/Controller/Index.php                |  2 +-
 featherbb/Controller/Install.php              |  2 +-
 featherbb/Controller/Login.php                |  2 +-
 featherbb/Controller/Misc.php                 |  2 +-
 featherbb/Controller/Moderate.php             |  2 +-
 featherbb/Controller/Post.php                 |  2 +-
 featherbb/Controller/Profile.php              |  2 +-
 featherbb/Controller/Register.php             |  2 +-
 featherbb/Controller/Search.php               |  2 +-
 featherbb/Controller/Userlist.php             |  2 +-
 featherbb/Controller/Viewforum.php            |  2 +-
 featherbb/Controller/Viewtopic.php            |  2 +-
 featherbb/Core/AdminUtils.php                 |  2 +-
 featherbb/Core/Email.php                      |  2 +-
 featherbb/Core/Error.php                      |  2 +-
 featherbb/Core/Hooks.php                      |  2 +-
 featherbb/Core/Lister.php                     |  2 +-
 featherbb/Core/Parser.php                     |  2 +-
 featherbb/Core/Plugin.php                     |  2 +-
 featherbb/Core/Search.php                     |  2 +-
 featherbb/Core/Url.php                        |  2 +-
 featherbb/Core/Utils.php                      |  2 +-
 featherbb/Core/View.php                       |  2 +-
 featherbb/Core/parser/bbcd_compile.php        |  2 +-
 featherbb/Core/parser/bbcd_source.php         |  2 +-
 featherbb/Helpers/functions.php               |  2 +-
 featherbb/Middleware/Auth.php                 |  2 +-
 featherbb/Middleware/Core.php                 |  2 +-
 featherbb/Model/Admin/Bans.php                |  2 +-
 featherbb/Model/Admin/Categories.php          |  2 +-
 featherbb/Model/Admin/Censoring.php           |  2 +-
 featherbb/Model/Admin/Forums.php              |  2 +-
 featherbb/Model/Admin/Groups.php              |  2 +-
 featherbb/Model/Admin/Maintenance.php         |  2 +-
 featherbb/Model/Admin/Options.php             |  2 +-
 featherbb/Model/Admin/Parser.php              |  2 +-
 featherbb/Model/Admin/Permissions.php         |  2 +-
 featherbb/Model/Admin/Reports.php             |  2 +-
 featherbb/Model/Admin/Statistics.php          |  2 +-
 featherbb/Model/Admin/Users.php               |  2 +-
 featherbb/Model/Auth.php                      |  2 +-
 featherbb/Model/Cache.php                     |  2 +-
 featherbb/Model/Debug.php                     |  2 +-
 featherbb/Model/Delete.php                    |  2 +-
 featherbb/Model/Edit.php                      |  2 +-
 featherbb/Model/Header.php                    |  2 +-
 featherbb/Model/Index.php                     |  2 +-
 featherbb/Model/Install.php                   |  2 +-
 featherbb/Model/Login.php                     |  2 +-
 featherbb/Model/Misc.php                      |  2 +-
 featherbb/Model/Moderate.php                  |  2 +-
 featherbb/Model/Post.php                      |  2 +-
 featherbb/Model/Profile.php                   |  2 +-
 featherbb/Model/Register.php                  |  2 +-
 featherbb/Model/Search.php                    |  2 +-
 featherbb/Model/Userlist.php                  |  2 +-
 featherbb/Model/Viewforum.php                 |  2 +-
 featherbb/Model/Viewtopic.php                 |  2 +-
 featherbb/routes.php                          | 13 +---
 index.php                                     |  2 +-
 plugins/test/plugintest.php                   |  2 +-
 style/imports/bbeditor.js                     |  2 +-
 style/imports/common.js                       |  2 +-
 .../FeatherBB/view/admin/bans/add_ban.php     |  2 +-
 .../FeatherBB/view/admin/bans/admin_bans.php  |  2 +-
 .../FeatherBB/view/admin/bans/search_ban.php  |  2 +-
 .../FeatherBB/view/admin/categories.php       |  2 +-
 .../themes/FeatherBB/view/admin/censoring.php |  2 +-
 .../view/admin/forums/admin_forums.php        |  2 +-
 .../view/admin/forums/delete_forum.php        |  2 +-
 .../view/admin/forums/permissions.php         |  2 +-
 .../view/admin/groups/add_edit_group.php      |  2 +-
 .../view/admin/groups/admin_groups.php        |  2 +-
 .../view/admin/groups/confirm_delete.php      |  2 +-
 .../view/admin/groups/delete_group.php        |  2 +-
 style/themes/FeatherBB/view/admin/index.php   |  2 +-
 style/themes/FeatherBB/view/admin/loader.php  |  2 +-
 .../admin/maintenance/admin_maintenance.php   |  2 +-
 .../view/admin/maintenance/prune.php          |  2 +-
 .../view/admin/maintenance/rebuild.php        |  2 +-
 style/themes/FeatherBB/view/admin/menu.php    |  2 +-
 style/themes/FeatherBB/view/admin/options.php |  2 +-
 style/themes/FeatherBB/view/admin/parser.php  |  2 +-
 .../FeatherBB/view/admin/permissions.php      |  2 +-
 style/themes/FeatherBB/view/admin/plugins.php |  2 +-
 style/themes/FeatherBB/view/admin/reports.php |  2 +-
 .../FeatherBB/view/admin/statistics.php       |  2 +-
 .../view/admin/users/admin_users.php          |  2 +-
 .../FeatherBB/view/admin/users/ban_users.php  |  2 +-
 .../view/admin/users/delete_users.php         |  2 +-
 .../FeatherBB/view/admin/users/find_users.php |  2 +-
 .../FeatherBB/view/admin/users/move_users.php |  2 +-
 .../FeatherBB/view/admin/users/search_ip.php  |  2 +-
 .../FeatherBB/view/admin/users/show_users.php |  2 +-
 style/themes/FeatherBB/view/delete.php        |  2 +-
 style/themes/FeatherBB/view/edit.php          |  2 +-
 style/themes/FeatherBB/view/error.php         |  2 +-
 style/themes/FeatherBB/view/footer.php        |  2 +-
 style/themes/FeatherBB/view/header.php        |  2 +-
 style/themes/FeatherBB/view/help.php          |  2 +-
 style/themes/FeatherBB/view/index.php         |  2 +-
 style/themes/FeatherBB/view/install.php       |  2 +-
 style/themes/FeatherBB/view/login/form.php    |  2 +-
 .../view/login/password_forgotten.php         |  2 +-
 style/themes/FeatherBB/view/misc/email.php    |  2 +-
 style/themes/FeatherBB/view/misc/report.php   |  2 +-
 style/themes/FeatherBB/view/misc/rules.php    |  2 +-
 .../FeatherBB/view/moderate/delete_posts.php  |  2 +-
 .../FeatherBB/view/moderate/delete_topics.php |  2 +-
 .../FeatherBB/view/moderate/merge_topics.php  |  2 +-
 .../view/moderate/moderator_forum.php         |  2 +-
 .../FeatherBB/view/moderate/move_topics.php   |  2 +-
 .../FeatherBB/view/moderate/posts_view.php    |  2 +-
 .../FeatherBB/view/moderate/split_posts.php   |  2 +-
 style/themes/FeatherBB/view/post.php          |  2 +-
 .../FeatherBB/view/profile/change_mail.php    |  2 +-
 .../FeatherBB/view/profile/change_pass.php    |  2 +-
 .../FeatherBB/view/profile/delete_user.php    |  2 +-
 style/themes/FeatherBB/view/profile/menu.php  |  2 +-
 .../FeatherBB/view/profile/section_admin.php  |  2 +-
 .../view/profile/section_display.php          |  2 +-
 .../view/profile/section_essentials.php       |  2 +-
 .../view/profile/section_messaging.php        |  2 +-
 .../view/profile/section_personal.php         |  2 +-
 .../view/profile/section_personality.php      |  2 +-
 .../view/profile/section_privacy.php          |  2 +-
 .../FeatherBB/view/profile/upload_avatar.php  |  2 +-
 .../FeatherBB/view/profile/view_profile.php   |  2 +-
 .../themes/FeatherBB/view/register/email.php  |  2 +-
 style/themes/FeatherBB/view/register/form.php |  2 +-
 .../themes/FeatherBB/view/register/rules.php  |  2 +-
 style/themes/FeatherBB/view/search/footer.php |  2 +-
 style/themes/FeatherBB/view/search/form.php   |  2 +-
 style/themes/FeatherBB/view/search/header.php |  2 +-
 style/themes/FeatherBB/view/search/posts.php  |  2 +-
 style/themes/FeatherBB/view/search/topics.php |  2 +-
 style/themes/FeatherBB/view/userlist.php      |  2 +-
 style/themes/FeatherBB/view/viewforum.php     |  2 +-
 style/themes/FeatherBB/view/viewtopic.php     |  2 +-
 view/admin/bans/add_ban.php                   |  2 +-
 view/admin/bans/admin_bans.php                |  2 +-
 view/admin/bans/search_ban.php                |  2 +-
 view/admin/categories.php                     |  2 +-
 view/admin/censoring.php                      |  2 +-
 view/admin/forums/admin_forums.php            |  2 +-
 view/admin/forums/delete_forum.php            |  2 +-
 view/admin/forums/permissions.php             |  2 +-
 view/admin/groups/add_edit_group.php          |  2 +-
 view/admin/groups/admin_groups.php            |  2 +-
 view/admin/groups/confirm_delete.php          |  2 +-
 view/admin/groups/delete_group.php            |  2 +-
 view/admin/index.php                          |  2 +-
 view/admin/loader.php                         |  2 +-
 view/admin/maintenance/admin_maintenance.php  |  2 +-
 view/admin/maintenance/prune.php              |  2 +-
 view/admin/maintenance/rebuild.php            |  2 +-
 view/admin/menu.php                           |  2 +-
 view/admin/options.php                        |  2 +-
 view/admin/parser.php                         |  2 +-
 view/admin/permissions.php                    |  2 +-
 view/admin/plugins.php                        |  2 +-
 view/admin/reports.php                        |  2 +-
 view/admin/statistics.php                     |  2 +-
 view/admin/users/admin_users.php              |  2 +-
 view/admin/users/ban_users.php                |  2 +-
 view/admin/users/delete_users.php             |  2 +-
 view/admin/users/find_users.php               |  2 +-
 view/admin/users/move_users.php               |  2 +-
 view/admin/users/search_ip.php                |  2 +-
 view/admin/users/show_users.php               |  2 +-
 view/delete.php                               |  2 +-
 view/edit.php                                 |  2 +-
 view/error.php                                |  2 +-
 view/footer.php                               |  2 +-
 view/header.php                               |  2 +-
 view/help.php                                 |  2 +-
 view/index.php                                |  2 +-
 view/install.php                              |  2 +-
 view/login/form.php                           |  2 +-
 view/login/password_forgotten.php             |  2 +-
 view/message.php                              |  2 +-
 view/misc/email.php                           |  2 +-
 view/misc/report.php                          |  2 +-
 view/misc/rules.php                           |  2 +-
 view/moderate/delete_posts.php                |  2 +-
 view/moderate/delete_topics.php               |  2 +-
 view/moderate/merge_topics.php                |  2 +-
 view/moderate/moderator_forum.php             |  2 +-
 view/moderate/move_topics.php                 |  2 +-
 view/moderate/posts_view.php                  |  2 +-
 view/moderate/split_posts.php                 |  2 +-
 view/post.php                                 |  2 +-
 view/profile/change_mail.php                  |  2 +-
 view/profile/change_pass.php                  |  2 +-
 view/profile/delete_user.php                  |  2 +-
 view/profile/menu.php                         |  2 +-
 view/profile/section_admin.php                |  2 +-
 view/profile/section_display.php              |  2 +-
 view/profile/section_essentials.php           |  2 +-
 view/profile/section_messaging.php            |  2 +-
 view/profile/section_personal.php             |  2 +-
 view/profile/section_personality.php          |  2 +-
 view/profile/section_privacy.php              |  2 +-
 view/profile/upload_avatar.php                |  2 +-
 view/profile/view_profile.php                 |  2 +-
 view/register/email.php                       |  2 +-
 view/register/form.php                        |  2 +-
 view/register/rules.php                       |  2 +-
 view/search/footer.php                        |  2 +-
 view/search/form.php                          |  2 +-
 view/search/header.php                        |  2 +-
 view/search/posts.php                         |  2 +-
 view/search/topics.php                        |  2 +-
 view/userlist.php                             |  2 +-
 view/viewforum.php                            |  2 +-
 view/viewtopic.php                            |  2 +-
 235 files changed, 267 insertions(+), 272 deletions(-)

diff --git a/extern.php b/extern.php
index eb00e94b..e69aa6d4 100644
--- a/extern.php
+++ b/extern.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
@@ -55,28 +55,31 @@
 
 -----------------------------------------------------------------------------*/
 
+namespace FeatherBB;
+use DB;
+use FeatherBB\Utils;
+use FeatherBB\Url;
+
 define('FEATHER_QUIET_VISIT', 1);
 
-// Load Slim Framework
-require 'Slim/Slim.php';
-\Slim\Slim::registerAutoloader();
+// Start a session for flash messages
+session_cache_limiter(false);
+session_start();
+error_reporting(E_ALL); // Let's report everything for development
+ini_set('display_errors', 1);
 
-// Load FeatherBB
-require 'featherbb/Helpers/classes/autoload.class.php';
-\FeatherBB\Loader::registerAutoloader();
+// Load Slim Framework
+require 'vendor/autoload.php';
 
 // Instantiate Slim and add CSRF
 $feather = new \Slim\Slim();
-$feather->add(new \FeatherBB\Csrf());
+$feather->add(new \FeatherBB\Middleware\Csrf());
 
 $feather_settings = array('config_file' => 'featherbb/config.php',
     'cache_dir' => 'cache/',
     'debug' => 'all'); // 3 levels : false, info (only execution time and number of queries), and all (display info + queries)
-$feather->add(new \FeatherBB\Auth());
-$feather->add(new \FeatherBB\Core($feather_settings));
-
-load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$feather->user->language.'/common.mo');
-load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$feather->user->language.'/index.mo');
+$feather->add(new \FeatherBB\Middleware\Auth());
+$feather->add(new \FeatherBB\Middleware\Core($feather_settings));
 
 // The length at which topic subjects will be truncated (for HTML output)
 if (!defined('FORUM_EXTERN_MAX_SUBJECT_LENGTH')) {
@@ -87,7 +90,7 @@ function featherbb_write_cache_file($file, $content)
 {
     $fh = @fopen(FORUM_CACHE_DIR.$file, 'wb');
     if (!$fh) {
-        die('Unable to write cache file '.Utils::escape($file).' to cache directory. Please make sure PHP has write access to the directory \''.Utils::escape(FORUM_CACHE_DIR).'\'', __FILE__, __LINE__);
+        die('Unable to write cache file '.Utils::escape($file).' to cache directory. Please make sure PHP has write access to the directory \''.Utils::escape(FORUM_CACHE_DIR).'\'');
     }
 
     flock($fh, LOCK_EX);
@@ -205,7 +208,7 @@ function authenticate_user($user, $password, $password_is_hash = false)
     // Check if there's a user matching $user and $password
     $select_check_cookie = array('u.*', 'g.*', 'o.logged', 'o.idle');
 
-    $result = ORM::for_table('users')
+    $result = DB::for_table('users')
                 ->table_alias('u')
                 ->select_many($select_check_cookie)
                 ->inner_join('groups', array('u.group_id', '=', 'g.g_id'), 'g')
@@ -229,6 +232,9 @@ function authenticate_user($user, $password, $password_is_hash = false)
     } else {
         $feather->user->is_guest = false;
     }
+
+    load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$feather->user->language.'/common.mo');
+    load_textdomain('featherbb', FEATHER_ROOT.'featherbb/lang/'.$feather->user->language.'/index.mo');
 }
 
 // If we're a guest and we've sent a username/pass, we can try to authenticate using those details
@@ -334,10 +340,12 @@ function output_atom($feed)
     echo "\t".'<link href="'.Utils::escape($feed['link']).'"/>'."\n";
     echo "\t".'<updated>'.gmdate('Y-m-d\TH:i:s\Z', count($feed['items']) ? $feed['items'][0]['pubdate'] : time()).'</updated>'."\n";
 
+    $feather = \Slim\Slim::getInstance();
+
     if ($feather->forum_settings['o_show_version'] == '1') {
-        echo "\t".'<generator version="'.$feather->forum_settings['o_cur_version'].'">FluxBB</generator>'."\n";
+        echo "\t".'<generator version="'.$feather->forum_settings['o_cur_version'].'">FeatherBB</generator>'."\n";
     } else {
-        echo "\t".'<generator>FluxBB</generator>'."\n";
+        echo "\t".'<generator>FeatherBB</generator>'."\n";
     }
 
     echo "\t".'<id>'.Utils::escape($feed['link']).'</id>'."\n";
@@ -439,8 +447,6 @@ function output_html($feed)
 
 // Show recent discussions
 if ($action == 'feed') {
-    require FEATHER_ROOT.'featherbb/Helpers/parser.php';
-
     // Determine what type of feed to output
     $type = isset($_GET['type']) ? strtolower($_GET['type']) : 'html';
     if (!in_array($type, array('html', 'rss', 'atom', 'xml'))) {
@@ -484,7 +490,7 @@ function output_html($feed)
         // Setup the feed
         $feed = array(
             'title'        =>    $feather->forum_settings['o_board_title'].__('Title separator').$cur_topic['subject'],
-            'link'            =>    get('topic/'.$tid.'/'.url_friendly($cur_topic['subject']).'/'),
+            'link'            =>    Url::get('topic/'.$tid.'/'.Url::url_friendly($cur_topic['subject']).'/'),
             'description'        =>    sprintf(__('RSS description topic'), $cur_topic['subject']),
             'items'            =>    array(),
             'type'            =>    'posts'
@@ -508,7 +514,7 @@ function output_html($feed)
             $item = array(
                 'id'            =>    $cur_post['id'],
                 'title'            =>    $cur_topic['first_post_id'] == $cur_post['id'] ? $cur_topic['subject'] : __('RSS reply').$cur_topic['subject'],
-                'link'            =>    get('post/'.$cur_post['id'].'/#p'.$cur_post['id']),
+                'link'            =>    Url::get('post/'.$cur_post['id'].'/#p'.$cur_post['id']),
                 'description'        =>    $cur_post['message'],
                 'author'        =>    array(
                     'name'    => $cur_post['poster'],
@@ -521,7 +527,7 @@ function output_html($feed)
                     $item['author']['email'] = $cur_post['email'];
                 }
 
-                $item['author']['uri'] = get('user/'.$cur_post['poster_id'].'/');
+                $item['author']['uri'] = Url::get('user/'.$cur_post['poster_id'].'/');
             } elseif ($cur_post['poster_email'] != '' && !$feather->user->is_guest) {
                 $item['author']['email'] = $cur_post['poster_email'];
             }
@@ -626,7 +632,7 @@ function output_html($feed)
                 $item = array(
                     'id'            =>    $cur_topic['id'],
                     'title'            =>    $cur_topic['subject'],
-                    'link'            =>    get('topic/'.$cur_topic['id'].'/'.url_friendly($cur_topic['subject']).'/').($order_posted ? '' : '/action/new/'),
+                    'link'            =>    Url::get('topic/'.$cur_topic['id'].'/'.url_friendly($cur_topic['subject']).'/').($order_posted ? '' : '/action/new/'),
                     'description'    =>    $cur_topic['message'],
                     'author'        =>    array(
                         'name'    => $order_posted ? $cur_topic['poster'] : $cur_topic['last_poster']
@@ -639,7 +645,7 @@ function output_html($feed)
                         $item['author']['email'] = $cur_topic['email'];
                     }
 
-                    $item['author']['uri'] = get('user/'.$cur_topic['poster_id'].'/');
+                    $item['author']['uri'] = Url::get('user/'.$cur_topic['poster_id'].'/');
                 } elseif ($cur_topic['poster_email'] != '' && !$feather->user->is_guest) {
                     $item['author']['email'] = $cur_topic['poster_email'];
                 }
@@ -700,7 +706,7 @@ function output_html($feed)
 
     foreach ($result as $feather_user_online) {
         if ($feather_user_online['user_id'] > 1) {
-            $users[] = ($feather->user->g_view_users == '1') ? '<a href="'.get('user/'.$feather_user_online['user_id'].'/').'">'.Utils::escape($feather_user_online['ident']).'</a>' : Utils::escape($feather_user_online['ident']);
+            $users[] = ($feather->user->g_view_users == '1') ? '<a href="'.Url::get('user/'.$feather_user_online['user_id'].'/').'">'.Utils::escape($feather_user_online['ident']).'</a>' : Utils::escape($feather_user_online['ident']);
             ++$num_users;
         } else {
             ++$num_guests;
@@ -748,11 +754,11 @@ function output_html($feed)
     header('Pragma: public');
 
     echo sprintf(__('No of users'), Utils::forum_number_format($stats['total_users'])).'<br />'."\n";
-    echo sprintf(__('Newest user'), (($feather->user->g_view_users == '1') ? '<a href="'.get('user/'.$stats['last_user']['id'].'/').'">'.Utils::escape($stats['last_user']['username']).'</a>' : Utils::escape($stats['last_user']['username']))).'<br />'."\n";
+    echo sprintf(__('Newest user'), (($feather->user->g_view_users == '1') ? '<a href="'.Url::get('user/'.$stats['last_user']['id'].'/').'">'.Utils::escape($stats['last_user']['username']).'</a>' : Utils::escape($stats['last_user']['username']))).'<br />'."\n";
     echo sprintf(__('No of topics'), Utils::forum_number_format($stats['total_topics'])).'<br />'."\n";
     echo sprintf(__('No of posts'), Utils::forum_number_format($stats['total_posts'])).'<br />'."\n";
 
     exit;
 }
 // If we end up here, the script was called with some wacky parameters
-exit(__('Bad request'));
+exit(__('Bad request'));
\ No newline at end of file
diff --git a/featherbb/Controller/Admin/Bans.php b/featherbb/Controller/Admin/Bans.php
index 461e5f76..e2643509 100644
--- a/featherbb/Controller/Admin/Bans.php
+++ b/featherbb/Controller/Admin/Bans.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Admin/Categories.php b/featherbb/Controller/Admin/Categories.php
index 706c6325..3e4e8769 100644
--- a/featherbb/Controller/Admin/Categories.php
+++ b/featherbb/Controller/Admin/Categories.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher.
  */
diff --git a/featherbb/Controller/Admin/Censoring.php b/featherbb/Controller/Admin/Censoring.php
index 8438e36f..6ca15152 100644
--- a/featherbb/Controller/Admin/Censoring.php
+++ b/featherbb/Controller/Admin/Censoring.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
index 4e50e437..13f35bc7 100644
--- a/featherbb/Controller/Admin/Forums.php
+++ b/featherbb/Controller/Admin/Forums.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Admin/Groups.php b/featherbb/Controller/Admin/Groups.php
index 7bf2bf3f..154d130a 100644
--- a/featherbb/Controller/Admin/Groups.php
+++ b/featherbb/Controller/Admin/Groups.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
index a65e0357..98dc0217 100644
--- a/featherbb/Controller/Admin/Index.php
+++ b/featherbb/Controller/Admin/Index.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Admin/Maintenance.php b/featherbb/Controller/Admin/Maintenance.php
index 06fc2d48..07942596 100644
--- a/featherbb/Controller/Admin/Maintenance.php
+++ b/featherbb/Controller/Admin/Maintenance.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
index b7cd6a72..b68d3520 100644
--- a/featherbb/Controller/Admin/Options.php
+++ b/featherbb/Controller/Admin/Options.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
index dd47ed46..d3bc9a29 100644
--- a/featherbb/Controller/Admin/Parser.php
+++ b/featherbb/Controller/Admin/Parser.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Admin/Permissions.php b/featherbb/Controller/Admin/Permissions.php
index 78b17d0d..eafad9fe 100644
--- a/featherbb/Controller/Admin/Permissions.php
+++ b/featherbb/Controller/Admin/Permissions.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
index e861d836..703077ee 100644
--- a/featherbb/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Admin/Reports.php b/featherbb/Controller/Admin/Reports.php
index be6690b4..d5419dfe 100644
--- a/featherbb/Controller/Admin/Reports.php
+++ b/featherbb/Controller/Admin/Reports.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Admin/Statistics.php b/featherbb/Controller/Admin/Statistics.php
index ac76e62d..4104aea6 100644
--- a/featherbb/Controller/Admin/Statistics.php
+++ b/featherbb/Controller/Admin/Statistics.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Admin/Users.php b/featherbb/Controller/Admin/Users.php
index 532b7143..74b8b36e 100644
--- a/featherbb/Controller/Admin/Users.php
+++ b/featherbb/Controller/Admin/Users.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
index 06b7c542..ef516c06 100644
--- a/featherbb/Controller/Auth.php
+++ b/featherbb/Controller/Auth.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Delete.php b/featherbb/Controller/Delete.php
index 47a74a92..73556add 100644
--- a/featherbb/Controller/Delete.php
+++ b/featherbb/Controller/Delete.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index 6b3c69ad..905276f4 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Help.php b/featherbb/Controller/Help.php
index dbd6dba1..211dca7e 100644
--- a/featherbb/Controller/Help.php
+++ b/featherbb/Controller/Help.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Index.php b/featherbb/Controller/Index.php
index b732e8c2..b6cf4e54 100644
--- a/featherbb/Controller/Index.php
+++ b/featherbb/Controller/Index.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
index 59d72985..d1990071 100644
--- a/featherbb/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Login.php b/featherbb/Controller/Login.php
index b8621bbe..dfc4a063 100644
--- a/featherbb/Controller/Login.php
+++ b/featherbb/Controller/Login.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Misc.php b/featherbb/Controller/Misc.php
index 6f57d094..ec7d10f2 100644
--- a/featherbb/Controller/Misc.php
+++ b/featherbb/Controller/Misc.php
@@ -2,7 +2,7 @@
 
 /**
 * Copyright (C) 2015 FeatherBB
-* based on code by (C) 2008-2012 FluxBB
+* based on code by (C) 2008-2015 FluxBB
 * and Rickard Andersson (C) 2002-2008 PunBB
 * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
 */
diff --git a/featherbb/Controller/Moderate.php b/featherbb/Controller/Moderate.php
index 12240985..cb14f50d 100644
--- a/featherbb/Controller/Moderate.php
+++ b/featherbb/Controller/Moderate.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Post.php b/featherbb/Controller/Post.php
index f34bad7a..09a6e972 100644
--- a/featherbb/Controller/Post.php
+++ b/featherbb/Controller/Post.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
index 59be4842..ab308d08 100644
--- a/featherbb/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Register.php b/featherbb/Controller/Register.php
index c12b5eff..3178fe9d 100644
--- a/featherbb/Controller/Register.php
+++ b/featherbb/Controller/Register.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index 4501df2b..b3a8fb21 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Userlist.php b/featherbb/Controller/Userlist.php
index 60542e60..b7260bd0 100644
--- a/featherbb/Controller/Userlist.php
+++ b/featherbb/Controller/Userlist.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Viewforum.php b/featherbb/Controller/Viewforum.php
index 129bc36d..0a82d4f2 100644
--- a/featherbb/Controller/Viewforum.php
+++ b/featherbb/Controller/Viewforum.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Controller/Viewtopic.php b/featherbb/Controller/Viewtopic.php
index 73b3efb2..fae3a109 100644
--- a/featherbb/Controller/Viewtopic.php
+++ b/featherbb/Controller/Viewtopic.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Core/AdminUtils.php b/featherbb/Core/AdminUtils.php
index 615c0b19..7aff342b 100644
--- a/featherbb/Core/AdminUtils.php
+++ b/featherbb/Core/AdminUtils.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Core/Email.php b/featherbb/Core/Email.php
index d3760129..72f71c04 100644
--- a/featherbb/Core/Email.php
+++ b/featherbb/Core/Email.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Core/Error.php b/featherbb/Core/Error.php
index 1d39dda4..642dd14e 100644
--- a/featherbb/Core/Error.php
+++ b/featherbb/Core/Error.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Core/Hooks.php b/featherbb/Core/Hooks.php
index 6c4a3a9d..631ed34c 100644
--- a/featherbb/Core/Hooks.php
+++ b/featherbb/Core/Hooks.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Core/Lister.php b/featherbb/Core/Lister.php
index 5c754df4..055dc6fd 100644
--- a/featherbb/Core/Lister.php
+++ b/featherbb/Core/Lister.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Core/Parser.php b/featherbb/Core/Parser.php
index 5c7cf58b..89bcedab 100644
--- a/featherbb/Core/Parser.php
+++ b/featherbb/Core/Parser.php
@@ -3,7 +3,7 @@
 /**
  * Copyright (C) 2015 FeatherBB
  * Parser (C) 2011 Jeff Roberson (jmrware.com)
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Core/Plugin.php b/featherbb/Core/Plugin.php
index 2b2d186f..e1e66a50 100644
--- a/featherbb/Core/Plugin.php
+++ b/featherbb/Core/Plugin.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher.
  */
diff --git a/featherbb/Core/Search.php b/featherbb/Core/Search.php
index 2d91d187..3035f890 100644
--- a/featherbb/Core/Search.php
+++ b/featherbb/Core/Search.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Core/Url.php b/featherbb/Core/Url.php
index 3546a99f..a2a2aaf3 100644
--- a/featherbb/Core/Url.php
+++ b/featherbb/Core/Url.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Core/Utils.php b/featherbb/Core/Utils.php
index 938f8926..69b34aa0 100644
--- a/featherbb/Core/Utils.php
+++ b/featherbb/Core/Utils.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Core/View.php b/featherbb/Core/View.php
index 89424f65..feafdd7c 100644
--- a/featherbb/Core/View.php
+++ b/featherbb/Core/View.php
@@ -2,7 +2,7 @@
 
 /**
 * Copyright (C) 2015 FeatherBB
-* based on code by (C) 2008-2012 FluxBB
+* based on code by (C) 2008-2015 FluxBB
 * and Rickard Andersson (C) 2002-2008 PunBB
 * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
 */
diff --git a/featherbb/Core/parser/bbcd_compile.php b/featherbb/Core/parser/bbcd_compile.php
index 29f07dfa..971a51e4 100644
--- a/featherbb/Core/parser/bbcd_compile.php
+++ b/featherbb/Core/parser/bbcd_compile.php
@@ -3,7 +3,7 @@
 /**
  * Copyright (C) 2015 FeatherBB
  * Parser (C) 2011 Jeff Roberson (jmrware.com)
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Core/parser/bbcd_source.php b/featherbb/Core/parser/bbcd_source.php
index 145ab959..9a94f817 100644
--- a/featherbb/Core/parser/bbcd_source.php
+++ b/featherbb/Core/parser/bbcd_source.php
@@ -3,7 +3,7 @@
 /**
  * Copyright (C) 2015 FeatherBB
  * Parser (C) 2011 Jeff Roberson (jmrware.com)
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Helpers/functions.php b/featherbb/Helpers/functions.php
index 006e08c8..f8b80ddc 100644
--- a/featherbb/Helpers/functions.php
+++ b/featherbb/Helpers/functions.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Middleware/Auth.php b/featherbb/Middleware/Auth.php
index 0932e19e..709c9973 100644
--- a/featherbb/Middleware/Auth.php
+++ b/featherbb/Middleware/Auth.php
@@ -2,7 +2,7 @@
 /**
  *
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  *
diff --git a/featherbb/Middleware/Core.php b/featherbb/Middleware/Core.php
index a7536989..8d37afa2 100644
--- a/featherbb/Middleware/Core.php
+++ b/featherbb/Middleware/Core.php
@@ -2,7 +2,7 @@
 /**
  *
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  *
diff --git a/featherbb/Model/Admin/Bans.php b/featherbb/Model/Admin/Bans.php
index db1f786a..d3773bf2 100644
--- a/featherbb/Model/Admin/Bans.php
+++ b/featherbb/Model/Admin/Bans.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Admin/Categories.php b/featherbb/Model/Admin/Categories.php
index 013eb599..1051f2d4 100644
--- a/featherbb/Model/Admin/Categories.php
+++ b/featherbb/Model/Admin/Categories.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher.
  */
diff --git a/featherbb/Model/Admin/Censoring.php b/featherbb/Model/Admin/Censoring.php
index db68b97f..3d081080 100644
--- a/featherbb/Model/Admin/Censoring.php
+++ b/featherbb/Model/Admin/Censoring.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Admin/Forums.php b/featherbb/Model/Admin/Forums.php
index d54ebdb2..4e48cd4a 100644
--- a/featherbb/Model/Admin/Forums.php
+++ b/featherbb/Model/Admin/Forums.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Admin/Groups.php b/featherbb/Model/Admin/Groups.php
index c7366a16..08959620 100644
--- a/featherbb/Model/Admin/Groups.php
+++ b/featherbb/Model/Admin/Groups.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Admin/Maintenance.php b/featherbb/Model/Admin/Maintenance.php
index 1af97006..50bb0040 100644
--- a/featherbb/Model/Admin/Maintenance.php
+++ b/featherbb/Model/Admin/Maintenance.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Admin/Options.php b/featherbb/Model/Admin/Options.php
index 5ac09518..049603cb 100644
--- a/featherbb/Model/Admin/Options.php
+++ b/featherbb/Model/Admin/Options.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Admin/Parser.php b/featherbb/Model/Admin/Parser.php
index b80f97a8..d3c995ef 100644
--- a/featherbb/Model/Admin/Parser.php
+++ b/featherbb/Model/Admin/Parser.php
@@ -3,7 +3,7 @@
 /**
  * Copyright (C) 2015 FeatherBB
  * Parser (C) 2011 Jeff Roberson (jmrware.com)
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Admin/Permissions.php b/featherbb/Model/Admin/Permissions.php
index c5ccb3c4..eb266d9d 100644
--- a/featherbb/Model/Admin/Permissions.php
+++ b/featherbb/Model/Admin/Permissions.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Admin/Reports.php b/featherbb/Model/Admin/Reports.php
index f57aa930..26a0f22c 100644
--- a/featherbb/Model/Admin/Reports.php
+++ b/featherbb/Model/Admin/Reports.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Admin/Statistics.php b/featherbb/Model/Admin/Statistics.php
index d4e43775..d16c54fe 100644
--- a/featherbb/Model/Admin/Statistics.php
+++ b/featherbb/Model/Admin/Statistics.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Admin/Users.php b/featherbb/Model/Admin/Users.php
index cff9cbdb..70e3f04c 100644
--- a/featherbb/Model/Admin/Users.php
+++ b/featherbb/Model/Admin/Users.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Auth.php b/featherbb/Model/Auth.php
index 44e030cf..2393c60f 100644
--- a/featherbb/Model/Auth.php
+++ b/featherbb/Model/Auth.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Cache.php b/featherbb/Model/Cache.php
index e84d891f..d4b03c60 100644
--- a/featherbb/Model/Cache.php
+++ b/featherbb/Model/Cache.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Debug.php b/featherbb/Model/Debug.php
index 03c562d6..18704845 100644
--- a/featherbb/Model/Debug.php
+++ b/featherbb/Model/Debug.php
@@ -2,7 +2,7 @@
 
 /**
 * Copyright (C) 2015 FeatherBB
-* based on code by (C) 2008-2012 FluxBB
+* based on code by (C) 2008-2015 FluxBB
 * and Rickard Andersson (C) 2002-2008 PunBB
 * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
 */
diff --git a/featherbb/Model/Delete.php b/featherbb/Model/Delete.php
index 9f612e4b..9b1296fc 100644
--- a/featherbb/Model/Delete.php
+++ b/featherbb/Model/Delete.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Edit.php b/featherbb/Model/Edit.php
index 4135e234..ed6fca99 100644
--- a/featherbb/Model/Edit.php
+++ b/featherbb/Model/Edit.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Header.php b/featherbb/Model/Header.php
index 2ec6cb7d..0cdcf0a9 100644
--- a/featherbb/Model/Header.php
+++ b/featherbb/Model/Header.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Index.php b/featherbb/Model/Index.php
index 1070644b..d66b07ba 100644
--- a/featherbb/Model/Index.php
+++ b/featherbb/Model/Index.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Install.php b/featherbb/Model/Install.php
index 57e23a75..0a0ab407 100644
--- a/featherbb/Model/Install.php
+++ b/featherbb/Model/Install.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Login.php b/featherbb/Model/Login.php
index fd5322b6..ad6f11b1 100644
--- a/featherbb/Model/Login.php
+++ b/featherbb/Model/Login.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Misc.php b/featherbb/Model/Misc.php
index 21f5a032..d01eede8 100644
--- a/featherbb/Model/Misc.php
+++ b/featherbb/Model/Misc.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Moderate.php b/featherbb/Model/Moderate.php
index 1cddff72..a7174519 100644
--- a/featherbb/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
index 733f7ed3..2d30535d 100644
--- a/featherbb/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index 7b83b2ad..6702169e 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Register.php b/featherbb/Model/Register.php
index c8f61145..c8214516 100644
--- a/featherbb/Model/Register.php
+++ b/featherbb/Model/Register.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Search.php b/featherbb/Model/Search.php
index b9c2ccc2..5f42bdbe 100644
--- a/featherbb/Model/Search.php
+++ b/featherbb/Model/Search.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Userlist.php b/featherbb/Model/Userlist.php
index 008d7650..ff6195ae 100644
--- a/featherbb/Model/Userlist.php
+++ b/featherbb/Model/Userlist.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Viewforum.php b/featherbb/Model/Viewforum.php
index edda51d3..0f1997dc 100644
--- a/featherbb/Model/Viewforum.php
+++ b/featherbb/Model/Viewforum.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/Model/Viewtopic.php b/featherbb/Model/Viewtopic.php
index 8a58da03..38fe7857 100644
--- a/featherbb/Model/Viewtopic.php
+++ b/featherbb/Model/Viewtopic.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/featherbb/routes.php b/featherbb/routes.php
index a37bb553..9bcc6802 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
@@ -192,14 +192,3 @@
 $feather->notFound(function () use ($feather){
     throw new \FeatherBB\Core\Error('Page not found', 404);
 });
-
-$feather->error(function (\Exception $e) use ($feather) {
-    $feather->response->setStatus($e->getCode());
-    $feather->template->setPageInfo(array(
-        'title' => array(\FeatherBB\Core\Utils::escape($feather->config['o_board_title']), __('Error')),
-        'msg_title' => __('Error'),
-        'msg'    =>   $e->getMessage(),
-        'no_back_link'    => false,
-        ))->addTemplate('error.php')->display();
-    $feather->stop();
-});
diff --git a/index.php b/index.php
index 86637a57..d3e377b4 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/plugins/test/plugintest.php b/plugins/test/plugintest.php
index f1e51d2b..b75d97fc 100644
--- a/plugins/test/plugintest.php
+++ b/plugins/test/plugintest.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/imports/bbeditor.js b/style/imports/bbeditor.js
index e125b746..c8174cf2 100644
--- a/style/imports/bbeditor.js
+++ b/style/imports/bbeditor.js
@@ -1,6 +1,6 @@
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/imports/common.js b/style/imports/common.js
index 91cd00e4..82741f6d 100644
--- a/style/imports/common.js
+++ b/style/imports/common.js
@@ -1,6 +1,6 @@
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/bans/add_ban.php b/style/themes/FeatherBB/view/admin/bans/add_ban.php
index 06649dcf..f2550e6d 100644
--- a/style/themes/FeatherBB/view/admin/bans/add_ban.php
+++ b/style/themes/FeatherBB/view/admin/bans/add_ban.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/bans/admin_bans.php b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
index 369867be..b941e5a4 100644
--- a/style/themes/FeatherBB/view/admin/bans/admin_bans.php
+++ b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/bans/search_ban.php b/style/themes/FeatherBB/view/admin/bans/search_ban.php
index 57ba4dae..09de0138 100644
--- a/style/themes/FeatherBB/view/admin/bans/search_ban.php
+++ b/style/themes/FeatherBB/view/admin/bans/search_ban.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/categories.php b/style/themes/FeatherBB/view/admin/categories.php
index 80819ea8..92924652 100644
--- a/style/themes/FeatherBB/view/admin/categories.php
+++ b/style/themes/FeatherBB/view/admin/categories.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/censoring.php b/style/themes/FeatherBB/view/admin/censoring.php
index 87230a58..8e15e0ba 100644
--- a/style/themes/FeatherBB/view/admin/censoring.php
+++ b/style/themes/FeatherBB/view/admin/censoring.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/forums/admin_forums.php b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
index 360c3507..93fb4be7 100644
--- a/style/themes/FeatherBB/view/admin/forums/admin_forums.php
+++ b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/forums/delete_forum.php b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
index 091d527f..c9c6daee 100644
--- a/style/themes/FeatherBB/view/admin/forums/delete_forum.php
+++ b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/forums/permissions.php b/style/themes/FeatherBB/view/admin/forums/permissions.php
index a4cb1d8c..5ea0322f 100644
--- a/style/themes/FeatherBB/view/admin/forums/permissions.php
+++ b/style/themes/FeatherBB/view/admin/forums/permissions.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/groups/add_edit_group.php b/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
index 9f701a14..c0b9e0c6 100644
--- a/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
+++ b/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/groups/admin_groups.php b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
index 62549376..93e33305 100644
--- a/style/themes/FeatherBB/view/admin/groups/admin_groups.php
+++ b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
index 88163680..7b6002fa 100644
--- a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
+++ b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/groups/delete_group.php b/style/themes/FeatherBB/view/admin/groups/delete_group.php
index 3cb568ff..dfda0465 100644
--- a/style/themes/FeatherBB/view/admin/groups/delete_group.php
+++ b/style/themes/FeatherBB/view/admin/groups/delete_group.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/index.php b/style/themes/FeatherBB/view/admin/index.php
index 25f055c7..d824ca91 100644
--- a/style/themes/FeatherBB/view/admin/index.php
+++ b/style/themes/FeatherBB/view/admin/index.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/loader.php b/style/themes/FeatherBB/view/admin/loader.php
index 38eed4f6..5bcc17bb 100644
--- a/style/themes/FeatherBB/view/admin/loader.php
+++ b/style/themes/FeatherBB/view/admin/loader.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
index 6ffc768d..2bbf9693 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/maintenance/prune.php b/style/themes/FeatherBB/view/admin/maintenance/prune.php
index daf063e9..c4b67d17 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/prune.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/prune.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
index 3d522863..e85d7133 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/menu.php b/style/themes/FeatherBB/view/admin/menu.php
index ab40a824..f0e487a6 100644
--- a/style/themes/FeatherBB/view/admin/menu.php
+++ b/style/themes/FeatherBB/view/admin/menu.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/options.php b/style/themes/FeatherBB/view/admin/options.php
index b0754807..0ed86ebb 100644
--- a/style/themes/FeatherBB/view/admin/options.php
+++ b/style/themes/FeatherBB/view/admin/options.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/parser.php b/style/themes/FeatherBB/view/admin/parser.php
index f299acf5..d261d40d 100644
--- a/style/themes/FeatherBB/view/admin/parser.php
+++ b/style/themes/FeatherBB/view/admin/parser.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/permissions.php b/style/themes/FeatherBB/view/admin/permissions.php
index ab92bb7d..20b21a13 100644
--- a/style/themes/FeatherBB/view/admin/permissions.php
+++ b/style/themes/FeatherBB/view/admin/permissions.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/plugins.php b/style/themes/FeatherBB/view/admin/plugins.php
index 074617d2..ef629ad7 100644
--- a/style/themes/FeatherBB/view/admin/plugins.php
+++ b/style/themes/FeatherBB/view/admin/plugins.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/reports.php b/style/themes/FeatherBB/view/admin/reports.php
index ea362803..ece8b9c3 100644
--- a/style/themes/FeatherBB/view/admin/reports.php
+++ b/style/themes/FeatherBB/view/admin/reports.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/statistics.php b/style/themes/FeatherBB/view/admin/statistics.php
index df61d145..8103ac34 100644
--- a/style/themes/FeatherBB/view/admin/statistics.php
+++ b/style/themes/FeatherBB/view/admin/statistics.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/users/admin_users.php b/style/themes/FeatherBB/view/admin/users/admin_users.php
index 302ca5cd..56d8975c 100644
--- a/style/themes/FeatherBB/view/admin/users/admin_users.php
+++ b/style/themes/FeatherBB/view/admin/users/admin_users.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/users/ban_users.php b/style/themes/FeatherBB/view/admin/users/ban_users.php
index 88ea985b..1f3b0bd1 100644
--- a/style/themes/FeatherBB/view/admin/users/ban_users.php
+++ b/style/themes/FeatherBB/view/admin/users/ban_users.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/users/delete_users.php b/style/themes/FeatherBB/view/admin/users/delete_users.php
index d44d22ae..d8793896 100644
--- a/style/themes/FeatherBB/view/admin/users/delete_users.php
+++ b/style/themes/FeatherBB/view/admin/users/delete_users.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/users/find_users.php b/style/themes/FeatherBB/view/admin/users/find_users.php
index 3ea84027..2910b928 100644
--- a/style/themes/FeatherBB/view/admin/users/find_users.php
+++ b/style/themes/FeatherBB/view/admin/users/find_users.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/users/move_users.php b/style/themes/FeatherBB/view/admin/users/move_users.php
index 8abd1132..0b5c7803 100644
--- a/style/themes/FeatherBB/view/admin/users/move_users.php
+++ b/style/themes/FeatherBB/view/admin/users/move_users.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/users/search_ip.php b/style/themes/FeatherBB/view/admin/users/search_ip.php
index aa3167c7..146ffad4 100644
--- a/style/themes/FeatherBB/view/admin/users/search_ip.php
+++ b/style/themes/FeatherBB/view/admin/users/search_ip.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/admin/users/show_users.php b/style/themes/FeatherBB/view/admin/users/show_users.php
index 479d4473..cd1d0b2e 100644
--- a/style/themes/FeatherBB/view/admin/users/show_users.php
+++ b/style/themes/FeatherBB/view/admin/users/show_users.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/delete.php b/style/themes/FeatherBB/view/delete.php
index cedbced2..8198cfb5 100644
--- a/style/themes/FeatherBB/view/delete.php
+++ b/style/themes/FeatherBB/view/delete.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/edit.php b/style/themes/FeatherBB/view/edit.php
index 44d6eb4b..5e2cf033 100644
--- a/style/themes/FeatherBB/view/edit.php
+++ b/style/themes/FeatherBB/view/edit.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/error.php b/style/themes/FeatherBB/view/error.php
index d45f5470..20b50139 100644
--- a/style/themes/FeatherBB/view/error.php
+++ b/style/themes/FeatherBB/view/error.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/footer.php b/style/themes/FeatherBB/view/footer.php
index 12828ed6..446bd3de 100644
--- a/style/themes/FeatherBB/view/footer.php
+++ b/style/themes/FeatherBB/view/footer.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/header.php b/style/themes/FeatherBB/view/header.php
index c77a8454..be0e9b10 100644
--- a/style/themes/FeatherBB/view/header.php
+++ b/style/themes/FeatherBB/view/header.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/help.php b/style/themes/FeatherBB/view/help.php
index 5390cf74..8933210c 100644
--- a/style/themes/FeatherBB/view/help.php
+++ b/style/themes/FeatherBB/view/help.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/index.php b/style/themes/FeatherBB/view/index.php
index aa1683f4..0e9a9d66 100644
--- a/style/themes/FeatherBB/view/index.php
+++ b/style/themes/FeatherBB/view/index.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/install.php b/style/themes/FeatherBB/view/install.php
index 20c80445..597f6325 100644
--- a/style/themes/FeatherBB/view/install.php
+++ b/style/themes/FeatherBB/view/install.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/login/form.php b/style/themes/FeatherBB/view/login/form.php
index 23944108..0b7ba36e 100644
--- a/style/themes/FeatherBB/view/login/form.php
+++ b/style/themes/FeatherBB/view/login/form.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/login/password_forgotten.php b/style/themes/FeatherBB/view/login/password_forgotten.php
index 49277515..2add794d 100644
--- a/style/themes/FeatherBB/view/login/password_forgotten.php
+++ b/style/themes/FeatherBB/view/login/password_forgotten.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/misc/email.php b/style/themes/FeatherBB/view/misc/email.php
index ec8654a0..8facb42a 100644
--- a/style/themes/FeatherBB/view/misc/email.php
+++ b/style/themes/FeatherBB/view/misc/email.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/misc/report.php b/style/themes/FeatherBB/view/misc/report.php
index 9781b066..c0fe59dd 100644
--- a/style/themes/FeatherBB/view/misc/report.php
+++ b/style/themes/FeatherBB/view/misc/report.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/misc/rules.php b/style/themes/FeatherBB/view/misc/rules.php
index 92290226..ef53782b 100644
--- a/style/themes/FeatherBB/view/misc/rules.php
+++ b/style/themes/FeatherBB/view/misc/rules.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/moderate/delete_posts.php b/style/themes/FeatherBB/view/moderate/delete_posts.php
index 34b126c8..30b6f5d2 100644
--- a/style/themes/FeatherBB/view/moderate/delete_posts.php
+++ b/style/themes/FeatherBB/view/moderate/delete_posts.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/moderate/delete_topics.php b/style/themes/FeatherBB/view/moderate/delete_topics.php
index 81f36bb6..d2d42f97 100644
--- a/style/themes/FeatherBB/view/moderate/delete_topics.php
+++ b/style/themes/FeatherBB/view/moderate/delete_topics.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/moderate/merge_topics.php b/style/themes/FeatherBB/view/moderate/merge_topics.php
index 66b105e4..db46b0f2 100644
--- a/style/themes/FeatherBB/view/moderate/merge_topics.php
+++ b/style/themes/FeatherBB/view/moderate/merge_topics.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/moderate/moderator_forum.php b/style/themes/FeatherBB/view/moderate/moderator_forum.php
index 39b8f698..4537da88 100644
--- a/style/themes/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/themes/FeatherBB/view/moderate/moderator_forum.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/moderate/move_topics.php b/style/themes/FeatherBB/view/moderate/move_topics.php
index d040ea8e..0aae357c 100644
--- a/style/themes/FeatherBB/view/moderate/move_topics.php
+++ b/style/themes/FeatherBB/view/moderate/move_topics.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/moderate/posts_view.php b/style/themes/FeatherBB/view/moderate/posts_view.php
index 4baad445..b6fa23a3 100644
--- a/style/themes/FeatherBB/view/moderate/posts_view.php
+++ b/style/themes/FeatherBB/view/moderate/posts_view.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/moderate/split_posts.php b/style/themes/FeatherBB/view/moderate/split_posts.php
index 2af3cdfb..d880d14d 100644
--- a/style/themes/FeatherBB/view/moderate/split_posts.php
+++ b/style/themes/FeatherBB/view/moderate/split_posts.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/post.php b/style/themes/FeatherBB/view/post.php
index 36e6fa94..7f10729c 100644
--- a/style/themes/FeatherBB/view/post.php
+++ b/style/themes/FeatherBB/view/post.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/profile/change_mail.php b/style/themes/FeatherBB/view/profile/change_mail.php
index ec707365..799316e8 100644
--- a/style/themes/FeatherBB/view/profile/change_mail.php
+++ b/style/themes/FeatherBB/view/profile/change_mail.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/profile/change_pass.php b/style/themes/FeatherBB/view/profile/change_pass.php
index 56871dda..d31f3025 100644
--- a/style/themes/FeatherBB/view/profile/change_pass.php
+++ b/style/themes/FeatherBB/view/profile/change_pass.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/profile/delete_user.php b/style/themes/FeatherBB/view/profile/delete_user.php
index 4a3155d6..08102e37 100644
--- a/style/themes/FeatherBB/view/profile/delete_user.php
+++ b/style/themes/FeatherBB/view/profile/delete_user.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/profile/menu.php b/style/themes/FeatherBB/view/profile/menu.php
index e235212a..81133c15 100644
--- a/style/themes/FeatherBB/view/profile/menu.php
+++ b/style/themes/FeatherBB/view/profile/menu.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/profile/section_admin.php b/style/themes/FeatherBB/view/profile/section_admin.php
index 45bee508..5f74b9dc 100644
--- a/style/themes/FeatherBB/view/profile/section_admin.php
+++ b/style/themes/FeatherBB/view/profile/section_admin.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/profile/section_display.php b/style/themes/FeatherBB/view/profile/section_display.php
index 2b2cdb15..9f30fb1c 100644
--- a/style/themes/FeatherBB/view/profile/section_display.php
+++ b/style/themes/FeatherBB/view/profile/section_display.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/profile/section_essentials.php b/style/themes/FeatherBB/view/profile/section_essentials.php
index 567125d6..1fccfb03 100644
--- a/style/themes/FeatherBB/view/profile/section_essentials.php
+++ b/style/themes/FeatherBB/view/profile/section_essentials.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/profile/section_messaging.php b/style/themes/FeatherBB/view/profile/section_messaging.php
index ad5804af..4b311dca 100644
--- a/style/themes/FeatherBB/view/profile/section_messaging.php
+++ b/style/themes/FeatherBB/view/profile/section_messaging.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/profile/section_personal.php b/style/themes/FeatherBB/view/profile/section_personal.php
index 4669bec3..12691843 100644
--- a/style/themes/FeatherBB/view/profile/section_personal.php
+++ b/style/themes/FeatherBB/view/profile/section_personal.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/profile/section_personality.php b/style/themes/FeatherBB/view/profile/section_personality.php
index 62aec4f5..8af1c19e 100644
--- a/style/themes/FeatherBB/view/profile/section_personality.php
+++ b/style/themes/FeatherBB/view/profile/section_personality.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/profile/section_privacy.php b/style/themes/FeatherBB/view/profile/section_privacy.php
index c1e52fe1..ea09d312 100644
--- a/style/themes/FeatherBB/view/profile/section_privacy.php
+++ b/style/themes/FeatherBB/view/profile/section_privacy.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/profile/upload_avatar.php b/style/themes/FeatherBB/view/profile/upload_avatar.php
index 3d5bd28c..ec1f82b4 100644
--- a/style/themes/FeatherBB/view/profile/upload_avatar.php
+++ b/style/themes/FeatherBB/view/profile/upload_avatar.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/profile/view_profile.php b/style/themes/FeatherBB/view/profile/view_profile.php
index a922c1d2..d8a3638d 100644
--- a/style/themes/FeatherBB/view/profile/view_profile.php
+++ b/style/themes/FeatherBB/view/profile/view_profile.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/register/email.php b/style/themes/FeatherBB/view/register/email.php
index ae10eda8..9670d90c 100644
--- a/style/themes/FeatherBB/view/register/email.php
+++ b/style/themes/FeatherBB/view/register/email.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/register/form.php b/style/themes/FeatherBB/view/register/form.php
index 855e2f40..870e6acb 100644
--- a/style/themes/FeatherBB/view/register/form.php
+++ b/style/themes/FeatherBB/view/register/form.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/register/rules.php b/style/themes/FeatherBB/view/register/rules.php
index ec4d9265..1896824b 100644
--- a/style/themes/FeatherBB/view/register/rules.php
+++ b/style/themes/FeatherBB/view/register/rules.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/search/footer.php b/style/themes/FeatherBB/view/search/footer.php
index ac3b8317..3a763fce 100644
--- a/style/themes/FeatherBB/view/search/footer.php
+++ b/style/themes/FeatherBB/view/search/footer.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/search/form.php b/style/themes/FeatherBB/view/search/form.php
index 2bc7ff63..73c3daf3 100644
--- a/style/themes/FeatherBB/view/search/form.php
+++ b/style/themes/FeatherBB/view/search/form.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/search/header.php b/style/themes/FeatherBB/view/search/header.php
index bfa18779..6ab1ea5f 100644
--- a/style/themes/FeatherBB/view/search/header.php
+++ b/style/themes/FeatherBB/view/search/header.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/search/posts.php b/style/themes/FeatherBB/view/search/posts.php
index bae1bca9..4fad5086 100644
--- a/style/themes/FeatherBB/view/search/posts.php
+++ b/style/themes/FeatherBB/view/search/posts.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/search/topics.php b/style/themes/FeatherBB/view/search/topics.php
index 1dbcc822..e41e54ff 100644
--- a/style/themes/FeatherBB/view/search/topics.php
+++ b/style/themes/FeatherBB/view/search/topics.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/userlist.php b/style/themes/FeatherBB/view/userlist.php
index 8dbd2b78..cdd5ba13 100644
--- a/style/themes/FeatherBB/view/userlist.php
+++ b/style/themes/FeatherBB/view/userlist.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/viewforum.php b/style/themes/FeatherBB/view/viewforum.php
index df256a0e..38d4a16b 100644
--- a/style/themes/FeatherBB/view/viewforum.php
+++ b/style/themes/FeatherBB/view/viewforum.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/style/themes/FeatherBB/view/viewtopic.php b/style/themes/FeatherBB/view/viewtopic.php
index f1b40f7f..e56e8cd8 100644
--- a/style/themes/FeatherBB/view/viewtopic.php
+++ b/style/themes/FeatherBB/view/viewtopic.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/bans/add_ban.php b/view/admin/bans/add_ban.php
index e3ea3744..cb34e1b8 100644
--- a/view/admin/bans/add_ban.php
+++ b/view/admin/bans/add_ban.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/bans/admin_bans.php b/view/admin/bans/admin_bans.php
index 14b13968..085d8dab 100644
--- a/view/admin/bans/admin_bans.php
+++ b/view/admin/bans/admin_bans.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/bans/search_ban.php b/view/admin/bans/search_ban.php
index b49f56d0..93fd7bdd 100644
--- a/view/admin/bans/search_ban.php
+++ b/view/admin/bans/search_ban.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/categories.php b/view/admin/categories.php
index a0e85893..c4299564 100644
--- a/view/admin/categories.php
+++ b/view/admin/categories.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/censoring.php b/view/admin/censoring.php
index a73bab1e..190638fe 100644
--- a/view/admin/censoring.php
+++ b/view/admin/censoring.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/forums/admin_forums.php b/view/admin/forums/admin_forums.php
index 2f8a11cb..1d70ba75 100644
--- a/view/admin/forums/admin_forums.php
+++ b/view/admin/forums/admin_forums.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/forums/delete_forum.php b/view/admin/forums/delete_forum.php
index 4a2df3f1..c839019a 100644
--- a/view/admin/forums/delete_forum.php
+++ b/view/admin/forums/delete_forum.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/forums/permissions.php b/view/admin/forums/permissions.php
index 2320d98b..d461ea30 100644
--- a/view/admin/forums/permissions.php
+++ b/view/admin/forums/permissions.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/groups/add_edit_group.php b/view/admin/groups/add_edit_group.php
index 4641381b..de91d1eb 100644
--- a/view/admin/groups/add_edit_group.php
+++ b/view/admin/groups/add_edit_group.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/groups/admin_groups.php b/view/admin/groups/admin_groups.php
index 220ce676..74ebedd4 100644
--- a/view/admin/groups/admin_groups.php
+++ b/view/admin/groups/admin_groups.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/groups/confirm_delete.php b/view/admin/groups/confirm_delete.php
index 9eca30bf..b43d0b58 100644
--- a/view/admin/groups/confirm_delete.php
+++ b/view/admin/groups/confirm_delete.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/groups/delete_group.php b/view/admin/groups/delete_group.php
index b3dd67af..0205422f 100644
--- a/view/admin/groups/delete_group.php
+++ b/view/admin/groups/delete_group.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/index.php b/view/admin/index.php
index 4dcbbbbb..c836ab4a 100644
--- a/view/admin/index.php
+++ b/view/admin/index.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/loader.php b/view/admin/loader.php
index 6a61c22f..2a443eb0 100644
--- a/view/admin/loader.php
+++ b/view/admin/loader.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/maintenance/admin_maintenance.php b/view/admin/maintenance/admin_maintenance.php
index 0e70cca3..842dfade 100644
--- a/view/admin/maintenance/admin_maintenance.php
+++ b/view/admin/maintenance/admin_maintenance.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/maintenance/prune.php b/view/admin/maintenance/prune.php
index 78992fe8..7b4334ba 100644
--- a/view/admin/maintenance/prune.php
+++ b/view/admin/maintenance/prune.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/maintenance/rebuild.php b/view/admin/maintenance/rebuild.php
index 576d1ecf..cc688587 100644
--- a/view/admin/maintenance/rebuild.php
+++ b/view/admin/maintenance/rebuild.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/menu.php b/view/admin/menu.php
index da238ac6..dedcb9f7 100644
--- a/view/admin/menu.php
+++ b/view/admin/menu.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/options.php b/view/admin/options.php
index ab3d859e..e2b145c3 100644
--- a/view/admin/options.php
+++ b/view/admin/options.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/parser.php b/view/admin/parser.php
index 07894549..bfcf5133 100644
--- a/view/admin/parser.php
+++ b/view/admin/parser.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/permissions.php b/view/admin/permissions.php
index 1fe92218..370b1507 100644
--- a/view/admin/permissions.php
+++ b/view/admin/permissions.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/plugins.php b/view/admin/plugins.php
index a6ec6472..fde8d1f2 100644
--- a/view/admin/plugins.php
+++ b/view/admin/plugins.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/reports.php b/view/admin/reports.php
index bbf7c18c..f5f53dc0 100644
--- a/view/admin/reports.php
+++ b/view/admin/reports.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/statistics.php b/view/admin/statistics.php
index fd964fc2..5317a2ce 100644
--- a/view/admin/statistics.php
+++ b/view/admin/statistics.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/users/admin_users.php b/view/admin/users/admin_users.php
index 74a05472..57117eb0 100644
--- a/view/admin/users/admin_users.php
+++ b/view/admin/users/admin_users.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/users/ban_users.php b/view/admin/users/ban_users.php
index 8e06caff..e37ceaa8 100644
--- a/view/admin/users/ban_users.php
+++ b/view/admin/users/ban_users.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/users/delete_users.php b/view/admin/users/delete_users.php
index 1a4360c6..747697ab 100644
--- a/view/admin/users/delete_users.php
+++ b/view/admin/users/delete_users.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/users/find_users.php b/view/admin/users/find_users.php
index 959bc354..7c5cc513 100644
--- a/view/admin/users/find_users.php
+++ b/view/admin/users/find_users.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/users/move_users.php b/view/admin/users/move_users.php
index 118570af..05933bf0 100644
--- a/view/admin/users/move_users.php
+++ b/view/admin/users/move_users.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/users/search_ip.php b/view/admin/users/search_ip.php
index 0b62e017..a5f3f390 100644
--- a/view/admin/users/search_ip.php
+++ b/view/admin/users/search_ip.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/admin/users/show_users.php b/view/admin/users/show_users.php
index b84fdf10..85899359 100644
--- a/view/admin/users/show_users.php
+++ b/view/admin/users/show_users.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/delete.php b/view/delete.php
index cedbced2..8198cfb5 100644
--- a/view/delete.php
+++ b/view/delete.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/edit.php b/view/edit.php
index df3bc126..24b5b449 100644
--- a/view/edit.php
+++ b/view/edit.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/error.php b/view/error.php
index d638a206..8d4d01cb 100644
--- a/view/error.php
+++ b/view/error.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/footer.php b/view/footer.php
index 91b04b60..b6407884 100644
--- a/view/footer.php
+++ b/view/footer.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/header.php b/view/header.php
index e5de922f..b5aa27e8 100644
--- a/view/header.php
+++ b/view/header.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/help.php b/view/help.php
index 15dca5cf..a1924a10 100644
--- a/view/help.php
+++ b/view/help.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/index.php b/view/index.php
index 911d4782..f3046814 100644
--- a/view/index.php
+++ b/view/index.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/install.php b/view/install.php
index 91f02ba6..a9db4e72 100644
--- a/view/install.php
+++ b/view/install.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/login/form.php b/view/login/form.php
index bc18735a..e6a8210a 100644
--- a/view/login/form.php
+++ b/view/login/form.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/login/password_forgotten.php b/view/login/password_forgotten.php
index 432f9aee..b32ff1b6 100644
--- a/view/login/password_forgotten.php
+++ b/view/login/password_forgotten.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/message.php b/view/message.php
index e3d23d0e..69f4884b 100644
--- a/view/message.php
+++ b/view/message.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/misc/email.php b/view/misc/email.php
index 20449c8c..eebc5f9a 100644
--- a/view/misc/email.php
+++ b/view/misc/email.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/misc/report.php b/view/misc/report.php
index 55290e3e..a61dc8ca 100644
--- a/view/misc/report.php
+++ b/view/misc/report.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/misc/rules.php b/view/misc/rules.php
index feb662ad..163df1b7 100644
--- a/view/misc/rules.php
+++ b/view/misc/rules.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/moderate/delete_posts.php b/view/moderate/delete_posts.php
index 00b80920..78100a8d 100644
--- a/view/moderate/delete_posts.php
+++ b/view/moderate/delete_posts.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/moderate/delete_topics.php b/view/moderate/delete_topics.php
index d0ab1eed..46d56282 100644
--- a/view/moderate/delete_topics.php
+++ b/view/moderate/delete_topics.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/moderate/merge_topics.php b/view/moderate/merge_topics.php
index 820cedee..24a92aaf 100644
--- a/view/moderate/merge_topics.php
+++ b/view/moderate/merge_topics.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
index ecaf4c66..de25ede1 100644
--- a/view/moderate/moderator_forum.php
+++ b/view/moderate/moderator_forum.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/moderate/move_topics.php b/view/moderate/move_topics.php
index e72ae5cb..f184afcb 100644
--- a/view/moderate/move_topics.php
+++ b/view/moderate/move_topics.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/moderate/posts_view.php b/view/moderate/posts_view.php
index ad3aca09..d0c2d06d 100644
--- a/view/moderate/posts_view.php
+++ b/view/moderate/posts_view.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/moderate/split_posts.php b/view/moderate/split_posts.php
index 7c59b0b9..deace3ab 100644
--- a/view/moderate/split_posts.php
+++ b/view/moderate/split_posts.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/post.php b/view/post.php
index e5509137..a0463de8 100644
--- a/view/post.php
+++ b/view/post.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/profile/change_mail.php b/view/profile/change_mail.php
index 1e59ab54..5615524d 100644
--- a/view/profile/change_mail.php
+++ b/view/profile/change_mail.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/profile/change_pass.php b/view/profile/change_pass.php
index 1bacb173..ac61d979 100644
--- a/view/profile/change_pass.php
+++ b/view/profile/change_pass.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/profile/delete_user.php b/view/profile/delete_user.php
index 937a8cd1..831b29ab 100644
--- a/view/profile/delete_user.php
+++ b/view/profile/delete_user.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/profile/menu.php b/view/profile/menu.php
index a46fef80..e3714a6e 100644
--- a/view/profile/menu.php
+++ b/view/profile/menu.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/profile/section_admin.php b/view/profile/section_admin.php
index 1cb7ce4b..d1aa1aa3 100644
--- a/view/profile/section_admin.php
+++ b/view/profile/section_admin.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
index 3ca10929..b806efd2 100644
--- a/view/profile/section_display.php
+++ b/view/profile/section_display.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/profile/section_essentials.php b/view/profile/section_essentials.php
index 4555a3c1..6ea2940b 100644
--- a/view/profile/section_essentials.php
+++ b/view/profile/section_essentials.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/profile/section_messaging.php b/view/profile/section_messaging.php
index 606e9aaf..18ec791c 100644
--- a/view/profile/section_messaging.php
+++ b/view/profile/section_messaging.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/profile/section_personal.php b/view/profile/section_personal.php
index d78de6dd..75e5df5e 100644
--- a/view/profile/section_personal.php
+++ b/view/profile/section_personal.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/profile/section_personality.php b/view/profile/section_personality.php
index bdb908fd..b1c3416d 100644
--- a/view/profile/section_personality.php
+++ b/view/profile/section_personality.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/profile/section_privacy.php b/view/profile/section_privacy.php
index c630c7e4..d501cd49 100644
--- a/view/profile/section_privacy.php
+++ b/view/profile/section_privacy.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
index f2f87973..44de1b15 100644
--- a/view/profile/upload_avatar.php
+++ b/view/profile/upload_avatar.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/profile/view_profile.php b/view/profile/view_profile.php
index d30181fd..9e65b5f5 100644
--- a/view/profile/view_profile.php
+++ b/view/profile/view_profile.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/register/email.php b/view/register/email.php
index 6cb917e1..b15593b2 100644
--- a/view/register/email.php
+++ b/view/register/email.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/register/form.php b/view/register/form.php
index a8a98ade..6d3b36bb 100644
--- a/view/register/form.php
+++ b/view/register/form.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/register/rules.php b/view/register/rules.php
index 326c96ad..9eae40df 100644
--- a/view/register/rules.php
+++ b/view/register/rules.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/search/footer.php b/view/search/footer.php
index 0dd6fc5e..05e8d654 100644
--- a/view/search/footer.php
+++ b/view/search/footer.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/search/form.php b/view/search/form.php
index 16cd788a..8b47e40f 100644
--- a/view/search/form.php
+++ b/view/search/form.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/search/header.php b/view/search/header.php
index de5e1f0a..2299e454 100644
--- a/view/search/header.php
+++ b/view/search/header.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/search/posts.php b/view/search/posts.php
index 331c0732..39f20c24 100644
--- a/view/search/posts.php
+++ b/view/search/posts.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/search/topics.php b/view/search/topics.php
index 2611aa23..7549c3f3 100644
--- a/view/search/topics.php
+++ b/view/search/topics.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/userlist.php b/view/userlist.php
index 0faf497b..911df592 100644
--- a/view/userlist.php
+++ b/view/userlist.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/viewforum.php b/view/viewforum.php
index 84d94a28..79bd70a1 100644
--- a/view/viewforum.php
+++ b/view/viewforum.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
diff --git a/view/viewtopic.php b/view/viewtopic.php
index c90e7fa1..83087f66 100644
--- a/view/viewtopic.php
+++ b/view/viewtopic.php
@@ -2,7 +2,7 @@
 
 /**
  * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
+ * based on code by (C) 2008-2015 FluxBB
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */

From 6b74dcea2f9526801041ff4deb6bdb4ba6b7717f Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 18:05:25 +0200
Subject: [PATCH 322/353] Better permission handling

---
 featherbb/Controller/Delete.php    |  4 ---
 featherbb/Controller/Edit.php      |  4 ---
 featherbb/Controller/Help.php      |  4 ---
 featherbb/Controller/Index.php     |  4 ---
 featherbb/Controller/Moderate.php  | 20 ------------
 featherbb/Controller/Search.php    |  4 +--
 featherbb/Controller/Userlist.php  |  4 +--
 featherbb/Controller/Viewforum.php |  8 -----
 featherbb/Controller/Viewtopic.php |  4 ---
 featherbb/routes.php               | 50 ++++++++++++++++++------------
 10 files changed, 32 insertions(+), 74 deletions(-)

diff --git a/featherbb/Controller/Delete.php b/featherbb/Controller/Delete.php
index 73556add..111855d5 100644
--- a/featherbb/Controller/Delete.php
+++ b/featherbb/Controller/Delete.php
@@ -24,10 +24,6 @@ public function __construct()
 
     public function deletepost($id)
     {
-        if ($this->feather->user->g_read_board == '0') {
-            throw new \FeatherBB\Core\Error(__('No view'), 403);
-        }
-
         // Fetch some informations about the post, the topic and the forum
         $cur_post = $this->model->get_info_delete($id);
 
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index 905276f4..53f3dc27 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -30,10 +30,6 @@ public function __construct()
 
     public function editpost($id)
     {
-        if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Core\Error(__('No view'), 403);
-        }
-
         // Fetch some informations about the post, the topic and the forum
         $cur_post = $this->model->get_info_edit($id);
 
diff --git a/featherbb/Controller/Help.php b/featherbb/Controller/Help.php
index 211dca7e..c4cc6f71 100644
--- a/featherbb/Controller/Help.php
+++ b/featherbb/Controller/Help.php
@@ -31,10 +31,6 @@ public function __autoload($class_name)
 
     public function display()
     {
-        if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Core\Error(__('No view'), 403);
-        }
-
         $this->feather->template->setPageInfo(array(
             'title' => array(Utils::escape($this->config['o_board_title']), __('Help')),
             'active_page' => 'help',
diff --git a/featherbb/Controller/Index.php b/featherbb/Controller/Index.php
index b6cf4e54..10f97fab 100644
--- a/featherbb/Controller/Index.php
+++ b/featherbb/Controller/Index.php
@@ -23,10 +23,6 @@ public function __construct()
 
     public function display()
     {
-        if ($this->feather->user->g_read_board == '0') {
-            throw new \FeatherBB\Core\Error(__('No view'), 403);
-        }
-
         $this->feather->template->setPageInfo(array(
             'title' => array(Utils::escape($this->feather->forum_settings['o_board_title'])),
             'active_page' => 'index',
diff --git a/featherbb/Controller/Moderate.php b/featherbb/Controller/Moderate.php
index cb14f50d..23c7e1ca 100644
--- a/featherbb/Controller/Moderate.php
+++ b/featherbb/Controller/Moderate.php
@@ -30,28 +30,16 @@ public function __construct()
 
     public function gethostpost($pid)
     {
-        if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Core\Error(__('No view'), 403);
-        }
-
         $this->model->display_ip_address_post($pid);
     }
 
     public function gethostip($ip)
     {
-        if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Core\Error(__('No view'), 403);
-        }
-
         $this->model->display_ip_info($ip);
     }
 
     public function moderatetopic($id = null, $fid = null, $action = null, $param = null)
     {
-        if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Core\Error(__('No view'), 403);
-        }
-
         if ($action == 'get_host') {
             $this->model->display_ip_address();
         }
@@ -206,10 +194,6 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
     public function display($id, $name = null, $page = null)
     {
-        if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Core\Error(__('No view'), 403);
-        }
-
         // Make sure that only admmods allowed access this page
         $moderators = $this->model->get_moderators($id);
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
@@ -252,10 +236,6 @@ public function display($id, $name = null, $page = null)
 
     public function dealposts($fid)
     {
-        if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Core\Error(__('No view'), 403);
-        }
-
         // Make sure that only admmods allowed access this page
         $moderators = $this->model->get_moderators($fid);
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index b3a8fb21..b9d88490 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -34,9 +34,7 @@ public function __autoload($class_name)
 
     public function display()
     {
-        if ($this->user->g_read_board == '0') {
-            throw new \FeatherBB\Core\Error(__('No view'), 403);
-        } elseif ($this->user->g_search == '0') {
+        if ($this->user->g_search == '0') {
             throw new \FeatherBB\Core\Error(__('No search permission'), 403);
         }
 
diff --git a/featherbb/Controller/Userlist.php b/featherbb/Controller/Userlist.php
index b7260bd0..28eac044 100644
--- a/featherbb/Controller/Userlist.php
+++ b/featherbb/Controller/Userlist.php
@@ -24,9 +24,7 @@ public function __construct()
 
     public function display()
     {
-        if ($this->feather->user->g_read_board == '0') {
-            throw new \FeatherBB\Core\Error(__('No view'), 403);
-        } elseif ($this->feather->user->g_view_users == '0') {
+        if ($this->feather->user->g_view_users == '0') {
             throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
diff --git a/featherbb/Controller/Viewforum.php b/featherbb/Controller/Viewforum.php
index 0a82d4f2..de1abb7c 100644
--- a/featherbb/Controller/Viewforum.php
+++ b/featherbb/Controller/Viewforum.php
@@ -28,14 +28,6 @@ public function __autoload($class_name)
 
     public function display($id, $name = null, $page = null)
     {
-        if ($this->feather->user->g_read_board == '0') {
-            throw new \FeatherBB\Core\Error(__('No view'), 403);
-        }
-
-        if ($id < 1) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
-        }
-
         // Fetch some informations about the forum
         $cur_forum = $this->model->get_info_forum($id);
 
diff --git a/featherbb/Controller/Viewtopic.php b/featherbb/Controller/Viewtopic.php
index fae3a109..42dbae87 100644
--- a/featherbb/Controller/Viewtopic.php
+++ b/featherbb/Controller/Viewtopic.php
@@ -25,10 +25,6 @@ public function __construct()
 
     public function display($id = null, $name = null, $page = null, $pid = null)
     {
-        if ($this->feather->user->g_read_board == '0') {
-            throw new \FeatherBB\Core\Error(__('No view'), 403);
-        }
-
         // Antispam feature
         require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/antispam.php';
         $index_questions = rand(0, count($lang_antispam_questions)-1);
diff --git a/featherbb/routes.php b/featherbb/routes.php
index 9bcc6802..082fce00 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -7,21 +7,41 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
+
+/**
+ * Middleware to check if user is allowed to read the board.
+ */
+$canReadBoard = function () use ($feather) {
+    if ($feather->user->g_read_board == '0') {
+        throw new Error(__('No view'), 403);
+    }
+};
+
+/**
+ * Middleware to check if user is allowed to moderate, if he's not redirect to homepage.
+ */
+$isAdmmod = function() use ($feather) {
+    if(!$feather->user->is_admmod) {
+        $feather->url->redirect($feather->urlFor('home'), __('No permission'));
+    }
+};
+
 // Index
-$feather->get('/', '\FeatherBB\Controller\index:display')->name('home');
+$feather->get('/', $canReadBoard, '\FeatherBB\Controller\index:display')->name('home');
 
 // Viewforum
-$feather->get('/forum/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\Viewforum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('viewForum');
+$feather->get('/forum/:id(/:name)(/page/:page)(/)', $canReadBoard, '\FeatherBB\Controller\Viewforum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('viewForum');
 
 // Viewtopic
-$feather->group('/topic', function() use ($feather) {
+$feather->group('/topic', $canReadBoard, function() use ($feather) {
     $feather->get('/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\Viewtopic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('viewTopic');
     $feather->get('/:id/action/:action(/)', '\FeatherBB\Controller\Viewtopic:action')->conditions(array('id' => '[0-9]+'))->name('topicAction');
 });
 $feather->get('/post/:pid(/)', '\FeatherBB\Controller\Viewtopic:viewpost')->conditions(array('pid' => '[0-9]+'))->name('viewPost');
 
 // Userlist
-$feather->get('/userlist(/)', '\FeatherBB\Controller\Userlist:display')->name('userList');
+$feather->get('/userlist(/)', $canReadBoard, '\FeatherBB\Controller\Userlist:display')->name('userList');
 
 // Auth routes
 $feather->group('/auth', function() use ($feather) {
@@ -51,19 +71,19 @@
 });
 
 // Edit
-$feather->map('/edit/:id(/)', '\FeatherBB\Controller\Edit:editpost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('editPost');
+$feather->map('/edit/:id(/)', $canReadBoard, '\FeatherBB\Controller\Edit:editpost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('editPost');
 
 // Delete
-$feather->map('/delete/:id(/)', '\FeatherBB\Controller\Delete:deletepost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('deletePost');
+$feather->map('/delete/:id(/)', $canReadBoard, '\FeatherBB\Controller\Delete:deletepost')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('deletePost');
 
 // Search routes
-$feather->group('/search', function() use ($feather) {
+$feather->group('/search', $canReadBoard, function() use ($feather) {
     $feather->get('(/)', '\FeatherBB\Controller\Search:display')->name('search');
     $feather->get('/show/:show(/)', '\FeatherBB\Controller\Search:quicksearches')->name('quickSearch');
 });
 
 // Help
-$feather->get('/help(/)', '\FeatherBB\Controller\help:display')->name('help');
+$feather->get('/help(/)', $canReadBoard, '\FeatherBB\Controller\help:display')->name('help');
 
 // Misc
 $feather->get('/rules(/)', '\FeatherBB\Controller\Misc:rules')->name('rules');
@@ -74,7 +94,6 @@
 $feather->get('/subscribe/forum/:id(/)', '\FeatherBB\Controller\Misc:subscribeforum')->conditions(array('id' => '[0-9]+'))->name('subscribeForum');
 $feather->get('/unsubscribe/forum/:id(/)', '\FeatherBB\Controller\Misc:unsubscribeforum')->conditions(array('id' => '[0-9]+'))->name('unsubscribeForum');
 $feather->get('/subscribe/topic/:id(/)', '\FeatherBB\Controller\Misc:subscribetopic')->conditions(array('id' => '[0-9]+'))->name('subscribeTopic');
-$feather->get('/unsubscribe/topic/:id(/)', '\FeatherBB\Controller\Misc:unsubscribetopic')->conditions(array('id' => '[0-9]+'))->name('unsubscribeTopic');
 
 // Profile routes
 $feather->group('/user', function() use ($feather) {
@@ -82,17 +101,8 @@
     $feather->map('/:id(/action/:action)(/)', '\FeatherBB\Controller\Profile:action')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('profileAction');
 });
 
-/**
- * Middleware to check if user is allowed to moderate, if he's not redirect to homepage.
- */
-$isAdmmod = function() use ($feather) {
-    if(!$feather->user->is_admmod) {
-        $feather->url->redirect($feather->urlFor('home'), __('No permission'));
-    }
-};
-
 // Moderate routes
-$feather->group('/moderate', $isAdmmod, function() use ($feather) {
+$feather->group('/moderate', $isAdmmod, $canReadBoard, function() use ($feather) {
     $feather->get('/forum/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\Moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('moderateForum');
     $feather->get('/get-host/post/:pid(/)', '\FeatherBB\Controller\Moderate:gethostpost')->conditions(array('pid' => '[0-9]+'))->name('getHostPost');
     $feather->get('/get-host/ip/:ip(/)', '\FeatherBB\Controller\Moderate:gethostip')->name('getHostIp');
@@ -190,5 +200,5 @@
 
 // 404 not found
 $feather->notFound(function () use ($feather){
-    throw new \FeatherBB\Core\Error('Page not found', 404);
+    throw new Error('Page not found', 404);
 });

From 997685681fda6a866f3877e8141d1c912f652e48 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 18:14:13 +0200
Subject: [PATCH 323/353] Better permission handling

---
 featherbb/Controller/Misc.php | 30 +-----------------------------
 featherbb/routes.php          | 25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/featherbb/Controller/Misc.php b/featherbb/Controller/Misc.php
index ec7d10f2..20ced830 100644
--- a/featherbb/Controller/Misc.php
+++ b/featherbb/Controller/Misc.php
@@ -36,10 +36,6 @@ public function rules()
 
     public function markread()
     {
-        if ($this->feather->user->is_guest) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
-        }
-
         $this->model->update_last_visit();
 
         // Reset tracked topics
@@ -50,10 +46,6 @@ public function markread()
 
     public function markforumread($id)
     {
-        if ($this->feather->user->is_guest) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
-        }
-
         $tracked_topics = get_tracked_topics();
         $tracked_topics['forums'][$id] = time();
         set_tracked_topics($tracked_topics);
@@ -63,43 +55,27 @@ public function markforumread($id)
 
     public function subscribeforum($id)
     {
-        if ($this->feather->user->is_guest) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
-        }
-
         $this->model->subscribe_forum($id);
     }
 
     public function subscribetopic($id)
     {
-        if ($this->feather->user->is_guest) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
-        }
-
         $this->model->subscribe_topic($id);
     }
 
     public function unsubscribeforum($id)
     {
-        if ($this->feather->user->is_guest) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
-        }
-
         $this->model->unsubscribe_forum($id);
     }
 
     public function unsubscribetopic($id)
     {
-        if ($this->feather->user->is_guest) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
-        }
-
         $this->model->unsubscribe_topic($id);
     }
 
     public function email($id)
     {
-        if ($this->feather->user->is_guest || $this->feather->user->g_send_email == '0') {
+        if ($this->feather->user->g_send_email == '0') {
             throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
@@ -130,10 +106,6 @@ public function email($id)
 
     public function report($id)
     {
-        if ($this->feather->user->is_guest) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
-        }
-
         if ($this->feather->request()->isPost()) {
             $this->model->insert_report($id);
         }
diff --git a/featherbb/routes.php b/featherbb/routes.php
index 082fce00..07cd0f9d 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -18,12 +18,21 @@
     }
 };
 
+/**
+ * Middleware to check if user is allowed to read the board.
+ */
+$isGuest = function () use ($feather) {
+    if ($feather->user->is_guest) {
+        throw new Error(__('No permission'), 403);
+    }
+};
+
 /**
  * Middleware to check if user is allowed to moderate, if he's not redirect to homepage.
  */
 $isAdmmod = function() use ($feather) {
     if(!$feather->user->is_admmod) {
-        $feather->url->redirect($feather->urlFor('home'), __('No permission'));
+        throw new Error(__('No permission'), 403);
     }
 };
 
@@ -87,13 +96,13 @@
 
 // Misc
 $feather->get('/rules(/)', '\FeatherBB\Controller\Misc:rules')->name('rules');
-$feather->get('/mark-read(/)', '\FeatherBB\Controller\Misc:markread')->name('markRead');
-$feather->get('/mark-forum-read/:id(/)', '\FeatherBB\Controller\Misc:markforumread')->conditions(array('id' => '[0-9]+'))->name('markForumRead');
-$feather->map('/email/:id(/)', '\FeatherBB\Controller\Misc:email')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('email');
-$feather->map('/report/:id(/)', '\FeatherBB\Controller\Misc:report')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('report');
-$feather->get('/subscribe/forum/:id(/)', '\FeatherBB\Controller\Misc:subscribeforum')->conditions(array('id' => '[0-9]+'))->name('subscribeForum');
-$feather->get('/unsubscribe/forum/:id(/)', '\FeatherBB\Controller\Misc:unsubscribeforum')->conditions(array('id' => '[0-9]+'))->name('unsubscribeForum');
-$feather->get('/subscribe/topic/:id(/)', '\FeatherBB\Controller\Misc:subscribetopic')->conditions(array('id' => '[0-9]+'))->name('subscribeTopic');
+$feather->get('/mark-read(/)', $isGuest, '\FeatherBB\Controller\Misc:markread')->name('markRead');
+$feather->get('/mark-forum-read/:id(/)', $isGuest, '\FeatherBB\Controller\Misc:markforumread')->conditions(array('id' => '[0-9]+'))->name('markForumRead');
+$feather->map('/email/:id(/)', $isGuest, '\FeatherBB\Controller\Misc:email')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('email');
+$feather->map('/report/:id(/)', $isGuest, '\FeatherBB\Controller\Misc:report')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('report');
+$feather->get('/subscribe/forum/:id(/)', $isGuest, '\FeatherBB\Controller\Misc:subscribeforum')->conditions(array('id' => '[0-9]+'))->name('subscribeForum');
+$feather->get('/unsubscribe/forum/:id(/)', $isGuest, '\FeatherBB\Controller\Misc:unsubscribeforum')->conditions(array('id' => '[0-9]+'))->name('unsubscribeForum');
+$feather->get('/subscribe/topic/:id(/)', $isGuest, '\FeatherBB\Controller\Misc:subscribetopic')->conditions(array('id' => '[0-9]+'))->name('subscribeTopic');
 
 // Profile routes
 $feather->group('/user', function() use ($feather) {

From 4d82e4befdb484757caacdb64c29cd880cc093b2 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 18:17:37 +0200
Subject: [PATCH 324/353] Better permission handling

---
 featherbb/Controller/Admin/Statistics.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/featherbb/Controller/Admin/Statistics.php b/featherbb/Controller/Admin/Statistics.php
index 4104aea6..97a729d9 100644
--- a/featherbb/Controller/Admin/Statistics.php
+++ b/featherbb/Controller/Admin/Statistics.php
@@ -28,10 +28,6 @@ public function __construct()
 
     public function display()
     {
-        if (!$this->user->is_admmod) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
-        }
-
         AdminUtils::generateAdminMenu('index');
 
         $total = $this->model->get_total_size();

From e7ba3300b9b27023c6c1ab98bddab937404d8196 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 18:21:39 +0200
Subject: [PATCH 325/353] Oops

---
 featherbb/routes.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/featherbb/routes.php b/featherbb/routes.php
index 07cd0f9d..baaf2097 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -103,6 +103,7 @@
 $feather->get('/subscribe/forum/:id(/)', $isGuest, '\FeatherBB\Controller\Misc:subscribeforum')->conditions(array('id' => '[0-9]+'))->name('subscribeForum');
 $feather->get('/unsubscribe/forum/:id(/)', $isGuest, '\FeatherBB\Controller\Misc:unsubscribeforum')->conditions(array('id' => '[0-9]+'))->name('unsubscribeForum');
 $feather->get('/subscribe/topic/:id(/)', $isGuest, '\FeatherBB\Controller\Misc:subscribetopic')->conditions(array('id' => '[0-9]+'))->name('subscribeTopic');
+$feather->get('/unsubscribe/topic/:id(/)', $isGuest, '\FeatherBB\Controller\Misc:unsubscribetopic')->conditions(array('id' => '[0-9]+'))->name('unsubscribeTopic');
 
 // Profile routes
 $feather->group('/user', function() use ($feather) {

From f1393aba9841bba8175a0843e6907f735e078507 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 18:58:52 +0200
Subject: [PATCH 326/353] Add more functions to Utils

---
 featherbb/Core/Utils.php                | 20 ++++++
 featherbb/Core/parser/bbcd_source.php   | 10 ---
 featherbb/Helpers/functions.php         | 82 -------------------------
 featherbb/Model/Post.php                |  3 +-
 featherbb/Model/Profile.php             | 59 +++++++++++++++++-
 featherbb/Model/Register.php            |  3 +-
 featherbb/lang/English/admin/parser.php |  2 -
 style/themes/FeatherBB/view/header.php  |  2 +-
 view/header.php                         |  2 +-
 9 files changed, 84 insertions(+), 99 deletions(-)

diff --git a/featherbb/Core/Utils.php b/featherbb/Core/Utils.php
index 69b34aa0..84371167 100644
--- a/featherbb/Core/Utils.php
+++ b/featherbb/Core/Utils.php
@@ -198,4 +198,24 @@ public static function file_size($size)
 
         return sprintf(__('Size unit '.$units[$i]), round($size, 2));
     }
+
+    //
+    // Generate browser's title
+    //
+    public static function generate_page_title($page_title, $p = null)
+    {
+        if (!is_array($page_title)) {
+            $page_title = array($page_title);
+        }
+
+        $page_title = array_reverse($page_title);
+
+        if ($p > 1) {
+            $page_title[0] .= ' ('.sprintf(__('Page'), self::forum_number_format($p)).')';
+        }
+
+        $crumbs = implode(__('Title separator'), $page_title);
+
+        return $crumbs;
+    }
 }
diff --git a/featherbb/Core/parser/bbcd_source.php b/featherbb/Core/parser/bbcd_source.php
index 9a94f817..bea282e1 100644
--- a/featherbb/Core/parser/bbcd_source.php
+++ b/featherbb/Core/parser/bbcd_source.php
@@ -430,16 +430,6 @@
             )
         )
     ),
-    'dbug' => array(
-        'html_name'                => 'div',
-        'html_type'                => 'block',
-        'handlers'                => array(
-            'ATTRIB'            => array(
-                'format'        =>
-                    '</p><p class="debug" title="%a_str%">%c_str%</p><p>'
-            )
-        )
-    ),
     '_ROOT_' => array(
         'in_post'                => false,
         'in_sig'                => false,
diff --git a/featherbb/Helpers/functions.php b/featherbb/Helpers/functions.php
index f8b80ddc..37c066f2 100644
--- a/featherbb/Helpers/functions.php
+++ b/featherbb/Helpers/functions.php
@@ -23,65 +23,6 @@ function get_admin_ids()
 }
 
 
-//
-// Check username
-//
-function check_username($username, $errors, $exclude_id = null)
-{
-    global $feather, $errors, $feather_bans;
-    $feather = \Slim\Slim::getInstance();
-
-    // Include UTF-8 function
-    require_once $feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/utf8/strcasecmp.php';
-
-    load_textdomain('featherbb', $feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$feather->user->language.'/register.mo');
-    load_textdomain('featherbb', $feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$feather->user->language.'/prof_reg.mo');
-
-    // Convert multiple whitespace characters into one (to prevent people from registering with indistinguishable usernames)
-    $username = preg_replace('%\s+%s', ' ', $username);
-
-    // Validate username
-    if (\FeatherBB\Core\Utils::strlen($username) < 2) {
-        $errors[] = __('Username too short');
-    } elseif (\FeatherBB\Core\Utils::strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
-        $errors[] = __('Username too long');
-    } elseif (!strcasecmp($username, 'Guest') || !utf8_strcasecmp($username, __('Guest'))) {
-        $errors[] = __('Username guest');
-    } elseif (preg_match('%[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}%', $username) || preg_match('%((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))%', $username)) {
-        $errors[] = __('Username IP');
-    } elseif ((strpos($username, '[') !== false || strpos($username, ']') !== false) && strpos($username, '\'') !== false && strpos($username, '"') !== false) {
-        $errors[] = __('Username reserved chars');
-    } elseif (preg_match('%(?:\[/?(?:b|u|s|ins|del|em|i|h|colou?r|quote|code|img|url|email|list|\*|topic|post|forum|user)\]|\[(?:img|url|quote|list)=)%i', $username)) {
-        $errors[] = __('Username BBCode');
-    }
-
-    // Check username for any censored words
-    if ($feather->forum_settings['o_censoring'] == '1' && censor_words($username) != $username) {
-        $errors[] = __('Username censor');
-    }
-
-    // Check that the username (or a too similar username) is not already registered
-    $query = (!is_null($exclude_id)) ? ' AND id!='.$exclude_id : '';
-
-    $result = \DB::for_table('online')->raw_query('SELECT username FROM '.$feather->forum_settings['db_prefix'].'users WHERE (UPPER(username)=UPPER(:username1) OR UPPER(username)=UPPER(:username2)) AND id>1'.$query, array(':username1' => $username, ':username2' => \FeatherBB\Core\Utils::ucp_preg_replace('%[^\p{L}\p{N}]%u', '', $username)))->find_one();
-
-    if ($result) {
-        $busy = $result['username'];
-        $errors[] = __('Username dupe 1').' '.\FeatherBB\Core\Utils::escape($busy).'. '.__('Username dupe 2');
-    }
-
-    // Check username for any banned usernames
-    foreach ($feather_bans as $cur_ban) {
-        if ($cur_ban['username'] != '' && utf8_strtolower($username) == utf8_strtolower($cur_ban['username'])) {
-            $errors[] = __('Banned username');
-            break;
-        }
-    }
-
-    return $errors;
-}
-
-
 //
 // Outputs markup to display a user's avatar
 //
@@ -105,29 +46,6 @@ function generate_avatar_markup($user_id)
 }
 
 
-//
-// Generate browser's title
-//
-function generate_page_title($page_title, $p = null)
-{
-    $feather = \Slim\Slim::getInstance();
-
-    if (!is_array($page_title)) {
-        $page_title = array($page_title);
-    }
-
-    $page_title = array_reverse($page_title);
-
-    if ($p > 1) {
-        $page_title[0] .= ' ('.sprintf(__('Page'), \FeatherBB\Core\Utils::forum_number_format($p)).')';
-    }
-
-    $crumbs = implode(__('Title separator'), $page_title);
-
-    return $crumbs;
-}
-
-
 //
 // Save array of tracked topics in cookie
 //
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
index 2d30535d..8ce4ad44 100644
--- a/featherbb/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -86,7 +86,8 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
         if ($this->user->is_guest) {
 
             // It's a guest, so we have to validate the username
-            $errors = check_username(Utils::trim($this->request->post('req_username')), $errors);
+            $profile = new \FeatherBB\Model\Profile();
+            $errors = $profile->check_username(Utils::trim($this->request->post('req_username')), $errors);
 
             $errors = $this->hook->fire('check_errors_before_post_antispam', $errors);
 
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index 6702169e..83ec7770 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -795,7 +795,7 @@ public function update_profile($id, $info, $section)
 
                         if ($form['username'] != $info['old_username']) {
                             $errors = '';
-                            $errors = check_username($form['username'], $errors, $id);
+                            $errors = $this->check_username($form['username'], $errors, $id);
                             if (!empty($errors)) {
                                 throw new \FeatherBB\Core\Error($errors[0]);
                             }
@@ -1343,4 +1343,61 @@ public function get_forum_list($id)
 
         return $output;
     }
+
+    //
+    // Check username
+    //
+    public function check_username($username, $errors, $exclude_id = null)
+    {
+        global $errors, $feather_bans;
+
+        // Include UTF-8 function
+        require_once $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/utf8/strcasecmp.php';
+
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/register.mo');
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/prof_reg.mo');
+
+        // Convert multiple whitespace characters into one (to prevent people from registering with indistinguishable usernames)
+        $username = preg_replace('%\s+%s', ' ', $username);
+
+        // Validate username
+        if (Utils::strlen($username) < 2) {
+            $errors[] = __('Username too short');
+        } elseif (Utils::strlen($username) > 25) { // This usually doesn't happen since the form element only accepts 25 characters
+            $errors[] = __('Username too long');
+        } elseif (!strcasecmp($username, 'Guest') || !utf8_strcasecmp($username, __('Guest'))) {
+            $errors[] = __('Username guest');
+        } elseif (filter_var($username, FILTER_VALIDATE_IP)) {
+            $errors[] = __('Username IP');
+        } elseif ((strpos($username, '[') !== false || strpos($username, ']') !== false) && strpos($username, '\'') !== false && strpos($username, '"') !== false) {
+            $errors[] = __('Username reserved chars');
+        } elseif (preg_match('%(?:\[/?(?:b|u|s|ins|del|em|i|h|colou?r|quote|code|img|url|email|list|\*|topic|post|forum|user)\]|\[(?:img|url|quote|list)=)%i', $username)) {
+            $errors[] = __('Username BBCode');
+        }
+
+        // Check username for any censored words
+        if ($this->feather->forum_settings['o_censoring'] == '1' && censor_words($username) != $username) {
+            $errors[] = __('Username censor');
+        }
+
+        // Check that the username (or a too similar username) is not already registered
+        $query = (!is_null($exclude_id)) ? ' AND id!='.$exclude_id : '';
+
+        $result = \DB::for_table('online')->raw_query('SELECT username FROM '.$this->feather->forum_settings['db_prefix'].'users WHERE (UPPER(username)=UPPER(:username1) OR UPPER(username)=UPPER(:username2)) AND id>1'.$query, array(':username1' => $username, ':username2' => Utils::ucp_preg_replace('%[^\p{L}\p{N}]%u', '', $username)))->find_one();
+
+        if ($result) {
+            $busy = $result['username'];
+            $errors[] = __('Username dupe 1').' '.Utils::escape($busy).'. '.__('Username dupe 2');
+        }
+
+        // Check username for any banned usernames
+        foreach ($this->feather_bans as $cur_ban) {
+            if ($cur_ban['username'] != '' && utf8_strtolower($username) == utf8_strtolower($cur_ban['username'])) {
+                $errors[] = __('Banned username');
+                break;
+            }
+        }
+
+        return $errors;
+    }
 }
diff --git a/featherbb/Model/Register.php b/featherbb/Model/Register.php
index c8214516..70bd6c77 100644
--- a/featherbb/Model/Register.php
+++ b/featherbb/Model/Register.php
@@ -62,7 +62,8 @@ public function check_for_errors()
         }
 
         // Validate username and passwords
-        $user['errors'] = check_username($user['username'], $user['errors']);
+        $profile = new \FeatherBB\Model\Profile();
+        $user['errors'] = $profile->check_username($user['username'], $user['errors']);
 
         if (Utils::strlen($user['password1']) < 6) {
             $user['errors'][] = __('Pass too short');
diff --git a/featherbb/lang/English/admin/parser.php b/featherbb/lang/English/admin/parser.php
index e15237e9..2e254add 100644
--- a/featherbb/lang/English/admin/parser.php
+++ b/featherbb/lang/English/admin/parser.php
@@ -5,7 +5,6 @@
     'reset_success'            =>    'Parser Options, BBCodes and Smilies successfully reset to FluxBB default settings.',
     'save_success'            =>    'Parser changes successfully saved.',
     'upload success'        =>    'Smiley file upload successful.',
-    'upload_button'            =>    'Upload Smiley Image',
     'reset defaults'            =>    'Restore default settings',
 
 /* *********************************************************************** */
@@ -88,6 +87,5 @@
         'tt'            =>    'Teletype Text.',
         'center'        =>    'Centered Block.',
         'err'            =>    'Error codes generated by parser for invalid BBCode. [attrib=TITLE].',
-        'dbug'            =>    'Debug messages generated by parser. [attrib=TITLE].',
     ),
 );
diff --git a/style/themes/FeatherBB/view/header.php b/style/themes/FeatherBB/view/header.php
index be0e9b10..f00a531c 100644
--- a/style/themes/FeatherBB/view/header.php
+++ b/style/themes/FeatherBB/view/header.php
@@ -26,7 +26,7 @@
 <?php if ($is_indexed) {
     echo "\t".'<meta name="robots" content="noindex, follow">'."\n";
 } ?>
-    <title><?php echo generate_page_title($title, $page_number) ?></title>
+    <title><?php echo Utils::generate_page_title($title, $page_number) ?></title>
     <!-- Theme -->
     <link rel="stylesheet" type="text/css" href="<?= Url::base() ?>/style/themes/<?= $style ?>/style.css">
 <?php
diff --git a/view/header.php b/view/header.php
index b5aa27e8..fdbfa249 100644
--- a/view/header.php
+++ b/view/header.php
@@ -14,7 +14,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
-<title><?php echo generate_page_title($page_title, $p) ?></title>
+<title><?php echo Utils::generate_page_title($page_title, $p) ?></title>
 <link rel="stylesheet" type="text/css" href="<?php echo $feather->url->base() ?>/style/themes/<?php echo $feather->user->style.'.css' ?>" />
 <?php
 

From 3d60c8f5429308d1826f29a738ec47fd0903a872 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 19:05:38 +0200
Subject: [PATCH 327/353] Rename viewtopic and viewforum

---
 featherbb/Controller/{Viewforum.php => Forum.php}    |  8 ++++----
 featherbb/Controller/Misc.php                        |  2 +-
 featherbb/Controller/Moderate.php                    |  8 ++++----
 featherbb/Controller/{Viewtopic.php => Topic.php}    |  8 ++++----
 featherbb/Core/Url.php                               |  4 ++--
 featherbb/Model/Delete.php                           |  2 +-
 featherbb/Model/{Viewforum.php => Forum.php}         |  2 +-
 featherbb/Model/Login.php                            |  2 +-
 featherbb/Model/Misc.php                             | 10 +++++-----
 featherbb/Model/Moderate.php                         | 10 +++++-----
 featherbb/Model/{Viewtopic.php => Topic.php}         |  2 +-
 featherbb/lang/English/admin/options.po              |  2 +-
 featherbb/routes.php                                 | 12 ++++++------
 style/themes/FeatherBB/view/footer.php               | 10 +++++-----
 .../FeatherBB/view/{viewforum.php => forum.php}      |  0
 .../FeatherBB/view/{viewtopic.php => topic.php}      |  0
 view/footer.php                                      | 10 +++++-----
 17 files changed, 46 insertions(+), 46 deletions(-)
 rename featherbb/Controller/{Viewforum.php => Forum.php} (96%)
 rename featherbb/Controller/{Viewtopic.php => Topic.php} (97%)
 rename featherbb/Model/{Viewforum.php => Forum.php} (99%)
 rename featherbb/Model/{Viewtopic.php => Topic.php} (99%)
 rename style/themes/FeatherBB/view/{viewforum.php => forum.php} (100%)
 rename style/themes/FeatherBB/view/{viewtopic.php => topic.php} (100%)

diff --git a/featherbb/Controller/Viewforum.php b/featherbb/Controller/Forum.php
similarity index 96%
rename from featherbb/Controller/Viewforum.php
rename to featherbb/Controller/Forum.php
index de1abb7c..2096e98d 100644
--- a/featherbb/Controller/Viewforum.php
+++ b/featherbb/Controller/Forum.php
@@ -12,12 +12,12 @@
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
-class Viewforum
+class Forum
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \FeatherBB\Model\Viewforum();
+        $this->model = new \FeatherBB\Model\Forum();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/forum.mo');
     }
 
@@ -80,7 +80,7 @@ public function display($id, $name = null, $page = null)
 
         $this->feather->template->setPageInfo(array(
             'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), Utils::escape($cur_forum['forum_name'])),
-            'active_page' => 'viewforum',
+            'active_page' => 'Forum',
             'page_number'  =>  $p,
             'paging_links'  =>  $paging_links,
             'is_indexed' => true,
@@ -92,6 +92,6 @@ public function display($id, $name = null, $page = null)
             'start_from' => $start_from,
             'url_forum' => $url_forum,
             'forum_actions' => $forum_actions,
-        ))->addTemplate('viewforum.php')->display();
+        ))->addTemplate('Forum.php')->display();
     }
 }
diff --git a/featherbb/Controller/Misc.php b/featherbb/Controller/Misc.php
index 20ced830..7fc61d75 100644
--- a/featherbb/Controller/Misc.php
+++ b/featherbb/Controller/Misc.php
@@ -50,7 +50,7 @@ public function markforumread($id)
         $tracked_topics['forums'][$id] = time();
         set_tracked_topics($tracked_topics);
 
-        Url::redirect($this->feather->urlFor('viewForum', array('id' => $id)), __('Mark forum read redirect'));
+        Url::redirect($this->feather->urlFor('Forum', array('id' => $id)), __('Mark forum read redirect'));
     }
 
     public function subscribeforum($id)
diff --git a/featherbb/Controller/Moderate.php b/featherbb/Controller/Moderate.php
index 23c7e1ca..1578bdfc 100644
--- a/featherbb/Controller/Moderate.php
+++ b/featherbb/Controller/Moderate.php
@@ -82,26 +82,26 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         // Stick a topic
         if ($action == 'stick') {
             $this->model->stick_topic($id, $fid);
-            Url::redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Stick topic redirect'));
+            Url::redirect($this->feather->urlFor('Topic', array('id' => $id)), __('Stick topic redirect'));
         }
 
 
         // Unstick a topic
         if ($action == 'unstick') {
             $this->model->unstick_topic($id, $fid);
-            Url::redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Unstick topic redirect'));
+            Url::redirect($this->feather->urlFor('Topic', array('id' => $id)), __('Unstick topic redirect'));
         }
 
         // Open a topic
         if ($action == 'open') {
             $this->model->open_topic($id, $fid);
-            Url::redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Open topic redirect'));
+            Url::redirect($this->feather->urlFor('Topic', array('id' => $id)), __('Open topic redirect'));
         }
 
         // Close a topic
         if ($action == 'close') {
             $this->model->close_topic($id, $fid);
-            Url::redirect($this->feather->urlFor('viewTopic', array('id' => $id)), __('Close topic redirect'));
+            Url::redirect($this->feather->urlFor('Topic', array('id' => $id)), __('Close topic redirect'));
         }
 
         $cur_topic = $this->model->get_topic_info($fid, $id);
diff --git a/featherbb/Controller/Viewtopic.php b/featherbb/Controller/Topic.php
similarity index 97%
rename from featherbb/Controller/Viewtopic.php
rename to featherbb/Controller/Topic.php
index 42dbae87..e7c17191 100644
--- a/featherbb/Controller/Viewtopic.php
+++ b/featherbb/Controller/Topic.php
@@ -12,12 +12,12 @@
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
-class Viewtopic
+class Topic
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \FeatherBB\Model\Viewtopic();
+        $this->model = new \FeatherBB\Model\Topic();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/topic.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/post.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/bbeditor.mo');
@@ -105,7 +105,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
 
         $this->feather->template->setPageInfo(array(
             'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), Utils::escape($cur_topic['forum_name']), Utils::escape($cur_topic['subject'])),
-            'active_page' => 'viewtopic',
+            'active_page' => 'Topic',
             'page_number'  =>  $p,
             'paging_links'  =>  $paging_links,
             'is_indexed' => true,
@@ -125,7 +125,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
             'lang_bbeditor'    =>    $lang_bbeditor,
             'url_forum'        =>    $url_forum,
             'url_topic'        =>    $url_topic,
-        ))->addTemplate('viewtopic.php')->display();
+        ))->addTemplate('Topic.php')->display();
 
         // Increment "num_views" for topic
         $this->model->increment_views($id);
diff --git a/featherbb/Core/Url.php b/featherbb/Core/Url.php
index a2a2aaf3..c2b19e5c 100644
--- a/featherbb/Core/Url.php
+++ b/featherbb/Core/Url.php
@@ -597,7 +597,7 @@ public static function paginate($num_pages, $cur_page, $link, $args = null)
         $pages = array();
         $link_to_all = false;
 
-        // If $cur_page == -1, we link to all pages (used in viewforum.php)
+        // If $cur_page == -1, we link to all pages (used in Forum.php)
         if ($cur_page == -1) {
             $cur_page = 1;
             $link_to_all = true;
@@ -656,7 +656,7 @@ public static function paginate_old($num_pages, $cur_page, $link)
         $pages = array();
         $link_to_all = false;
 
-        // If $cur_page == -1, we link to all pages (used in viewforum.php)
+        // If $cur_page == -1, we link to all pages (used in Forum.php)
         if ($cur_page == -1) {
             $cur_page = 1;
             $link_to_all = true;
diff --git a/featherbb/Model/Delete.php b/featherbb/Model/Delete.php
index 9b1296fc..877509cd 100644
--- a/featherbb/Model/Delete.php
+++ b/featherbb/Model/Delete.php
@@ -67,7 +67,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
             delete_topic($tid);
             update_forum($fid);
 
-            Url::redirect($this->feather->urlFor('viewForum', array('id' => $fid)), __('Topic del redirect'));
+            Url::redirect($this->feather->urlFor('Forum', array('id' => $fid)), __('Topic del redirect'));
         } else {
             $this->hook->fire('handle_deletion', $tid, $fid, $id);
 
diff --git a/featherbb/Model/Viewforum.php b/featherbb/Model/Forum.php
similarity index 99%
rename from featherbb/Model/Viewforum.php
rename to featherbb/Model/Forum.php
index 0f1997dc..62705e93 100644
--- a/featherbb/Model/Viewforum.php
+++ b/featherbb/Model/Forum.php
@@ -13,7 +13,7 @@
 use FeatherBB\Core\Url;
 use DB;
 
-class Viewforum
+class Forum
 {
     public function __construct()
     {
diff --git a/featherbb/Model/Login.php b/featherbb/Model/Login.php
index ad6f11b1..a7f9c7b8 100644
--- a/featherbb/Model/Login.php
+++ b/featherbb/Model/Login.php
@@ -217,7 +217,7 @@ public function get_redirect_url()
 
         if (!isset($redirect_url)) {
             $redirect_url = Url::base();
-        } elseif (preg_match('%viewtopic\.php\?pid=(\d+)$%', $redirect_url, $matches)) { // TODO
+        } elseif (preg_match('%Topic\.php\?pid=(\d+)$%', $redirect_url, $matches)) { // TODO
             $redirect_url .= '#p'.$matches[1];
         }
 
diff --git a/featherbb/Model/Misc.php b/featherbb/Model/Misc.php
index d01eede8..799e63a0 100644
--- a/featherbb/Model/Misc.php
+++ b/featherbb/Model/Misc.php
@@ -126,7 +126,7 @@ public function get_redirect_url($recipient_id)
 
         if (!isset($redirect_url)) {
             $redirect_url = Url::get('user/'.$recipient_id.'/');
-        } elseif (preg_match('%viewtopic\.php\?pid=(\d+)$%', $redirect_url, $matches)) {
+        } elseif (preg_match('%Topic\.php\?pid=(\d+)$%', $redirect_url, $matches)) {
             $redirect_url .= '#p'.$matches[1];
         }
 
@@ -308,7 +308,7 @@ public function subscribe_topic($topic_id)
         $subscription = $this->hook->fireDB('subscribe_topic_query', $subscription);
         $subscription = $subscription->save();
 
-        Url::redirect($this->feather->urlFor('viewTopic', ['id' => $topic_id]), __('Subscribe redirect'));
+        Url::redirect($this->feather->urlFor('Topic', ['id' => $topic_id]), __('Subscribe redirect'));
     }
 
     public function unsubscribe_topic($topic_id)
@@ -336,7 +336,7 @@ public function unsubscribe_topic($topic_id)
         $delete = $this->hook->fireDB('unsubscribe_topic_query', $delete);
         $delete = $delete->delete_many();
 
-        Url::redirect($this->feather->urlFor('viewTopic', ['id' => $topic_id]), __('Unsubscribe redirect'));
+        Url::redirect($this->feather->urlFor('Topic', ['id' => $topic_id]), __('Unsubscribe redirect'));
     }
 
     public function unsubscribe_forum($forum_id)
@@ -364,7 +364,7 @@ public function unsubscribe_forum($forum_id)
         $delete = $this->hook->fireDB('unsubscribe_forum_query', $delete);
         $delete = $delete->delete_many();
 
-        Url::redirect($this->feather->urlFor('viewForum', ['id' => $forum_id]), __('Unsubscribe redirect'));
+        Url::redirect($this->feather->urlFor('Forum', ['id' => $forum_id]), __('Unsubscribe redirect'));
     }
 
     public function subscribe_forum($forum_id)
@@ -415,6 +415,6 @@ public function subscribe_forum($forum_id)
         $subscription = $this->hook->fireDB('subscribe_forum_query', $subscription);
         $subscription = $subscription->save();
 
-        Url::redirect($this->feather->urlFor('viewForum', ['id' => $forum_id]), __('Subscribe redirect'));
+        Url::redirect($this->feather->urlFor('Forum', ['id' => $forum_id]), __('Subscribe redirect'));
     }
 }
diff --git a/featherbb/Model/Moderate.php b/featherbb/Model/Moderate.php
index a7174519..ae760c4c 100644
--- a/featherbb/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -157,7 +157,7 @@ public function delete_posts($tid, $fid, $p = null)
 
             update_forum($fid);
 
-            Url::redirect($this->feather->urlFor('viewTopic', array('id' => $tid)), __('Delete posts redirect'));
+            Url::redirect($this->feather->urlFor('Topic', array('id' => $tid)), __('Delete posts redirect'));
         }
 
         $posts = $this->hook->fire('delete_posts', $posts);
@@ -318,7 +318,7 @@ public function split_posts($tid, $fid, $p = null)
             update_forum($fid);
             update_forum($move_to_forum);
 
-            Url::redirect($this->feather->urlFor('viewTopic', array('id' => $new_tid)), __('Split posts redirect'));
+            Url::redirect($this->feather->urlFor('Topic', array('id' => $new_tid)), __('Split posts redirect'));
         }
 
         $posts = $this->hook->fire('split_posts', $posts);
@@ -583,7 +583,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
 
         $redirect_msg = (count($topics) > 1) ? __('Move topics redirect') : __('Move topic redirect');
         $redirect_msg = $this->hook->fire('move_topics_to_redirect_message', $redirect_msg);
-        Url::redirect($this->feather->urlFor('viewForum', array('id' => $move_to_forum)), $redirect_msg);
+        Url::redirect($this->feather->urlFor('Forum', array('id' => $move_to_forum)), $redirect_msg);
     }
 
     public function check_move_possible()
@@ -735,7 +735,7 @@ public function merge_topics($fid)
 
         // Update the forum FROM which the topic was moved and redirect
         update_forum($fid);
-        Url::redirect($this->feather->urlFor('viewForum', array('id' => $fid)), __('Merge topics redirect'));
+        Url::redirect($this->feather->urlFor('Forum', array('id' => $fid)), __('Merge topics redirect'));
     }
 
     public function delete_topics($topics, $fid)
@@ -819,7 +819,7 @@ public function delete_topics($topics, $fid)
 
         $this->hook->fire('delete_topics');
 
-        Url::redirect($this->feather->urlFor('viewForum', array('id' => $fid)), __('Delete topics redirect'));
+        Url::redirect($this->feather->urlFor('Forum', array('id' => $fid)), __('Delete topics redirect'));
     }
 
     public function get_forum_info($fid)
diff --git a/featherbb/Model/Viewtopic.php b/featherbb/Model/Topic.php
similarity index 99%
rename from featherbb/Model/Viewtopic.php
rename to featherbb/Model/Topic.php
index 38fe7857..b6592048 100644
--- a/featherbb/Model/Viewtopic.php
+++ b/featherbb/Model/Topic.php
@@ -13,7 +13,7 @@
 use FeatherBB\Core\Url;
 use DB;
 
-class Viewtopic
+class Topic
 {
     public function __construct()
     {
diff --git a/featherbb/lang/English/admin/options.po b/featherbb/lang/English/admin/options.po
index 9df9a3d3..6c37772b 100644
--- a/featherbb/lang/English/admin/options.po
+++ b/featherbb/lang/English/admin/options.po
@@ -351,7 +351,7 @@ msgid "User has posted label"
 msgstr "User has posted earlier"
 
 msgid "User has posted help"
-msgstr "This feature displays a dot in front of topics in viewforum.php in case the currently logged in user has posted in that topic earlier. Disable if you are experiencing high server load."
+msgstr "This feature displays a dot in front of topics in Forum.php in case the currently logged in user has posted in that topic earlier. Disable if you are experiencing high server load."
 
 msgid "Topic views label"
 msgstr "Topic views"
diff --git a/featherbb/routes.php b/featherbb/routes.php
index baaf2097..c22adbfd 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -39,15 +39,15 @@
 // Index
 $feather->get('/', $canReadBoard, '\FeatherBB\Controller\index:display')->name('home');
 
-// Viewforum
-$feather->get('/forum/:id(/:name)(/page/:page)(/)', $canReadBoard, '\FeatherBB\Controller\Viewforum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('viewForum');
+// Forum
+$feather->get('/forum/:id(/:name)(/page/:page)(/)', $canReadBoard, '\FeatherBB\Controller\Forum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('Forum');
 
-// Viewtopic
+// Topic
 $feather->group('/topic', $canReadBoard, function() use ($feather) {
-    $feather->get('/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\Viewtopic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('viewTopic');
-    $feather->get('/:id/action/:action(/)', '\FeatherBB\Controller\Viewtopic:action')->conditions(array('id' => '[0-9]+'))->name('topicAction');
+    $feather->get('/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\Topic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('Topic');
+    $feather->get('/:id/action/:action(/)', '\FeatherBB\Controller\Topic:action')->conditions(array('id' => '[0-9]+'))->name('topicAction');
 });
-$feather->get('/post/:pid(/)', '\FeatherBB\Controller\Viewtopic:viewpost')->conditions(array('pid' => '[0-9]+'))->name('viewPost');
+$feather->get('/post/:pid(/)', '\FeatherBB\Controller\Topic:viewpost')->conditions(array('pid' => '[0-9]+'))->name('viewPost');
 
 // Userlist
 $feather->get('/userlist(/)', $canReadBoard, '\FeatherBB\Controller\Userlist:display')->name('userList');
diff --git a/style/themes/FeatherBB/view/footer.php b/style/themes/FeatherBB/view/footer.php
index 446bd3de..9a6660f6 100644
--- a/style/themes/FeatherBB/view/footer.php
+++ b/style/themes/FeatherBB/view/footer.php
@@ -23,15 +23,15 @@
 	<div class="box">
 <?php
 
-if (isset($active_page) && ($active_page == 'viewforum' || $active_page == 'viewtopic') && $feather->user->is_admmod) {
+if (isset($active_page) && ($active_page == 'Forum' || $active_page == 'Topic') && $feather->user->is_admmod) {
     echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
 
-    if ($active_page == 'viewforum') {
+    if ($active_page == 'Forum') {
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/forum/'.$fid.'/page/'.$page_number.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
-    } elseif ($active_page == 'viewtopic') {
+    } elseif ($active_page == 'Topic') {
         if (isset($pid)) {
             $parameter = 'param/'.$pid.'/';
         } elseif (isset($page_number) && $page_number != 1) {
@@ -100,13 +100,13 @@
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
-} elseif ($active_page == 'viewforum') {
+} elseif ($active_page == 'Forum') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.Url::base().'/extern.php?action=feed&amp;fid='.$fid.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
-} elseif ($active_page == 'viewtopic') {
+} elseif ($active_page == 'Topic') {
     if ($feather->forum_settings['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.Url::base().'/extern.php?action=feed&amp;tid='.$tid.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
     } elseif ($feather->forum_settings['o_feed_type'] == '2') {
diff --git a/style/themes/FeatherBB/view/viewforum.php b/style/themes/FeatherBB/view/forum.php
similarity index 100%
rename from style/themes/FeatherBB/view/viewforum.php
rename to style/themes/FeatherBB/view/forum.php
diff --git a/style/themes/FeatherBB/view/viewtopic.php b/style/themes/FeatherBB/view/topic.php
similarity index 100%
rename from style/themes/FeatherBB/view/viewtopic.php
rename to style/themes/FeatherBB/view/topic.php
diff --git a/view/footer.php b/view/footer.php
index b6407884..98c2aced 100644
--- a/view/footer.php
+++ b/view/footer.php
@@ -15,15 +15,15 @@
 	<div class="box">
 <?php
 
-if (isset($footer_style) && ($footer_style == 'viewforum' || $footer_style == 'viewtopic') && $is_admmod) {
+if (isset($footer_style) && ($footer_style == 'Forum' || $footer_style == 'Topic') && $is_admmod) {
     echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
 
-    if ($footer_style == 'viewforum') {
+    if ($footer_style == 'Forum') {
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
-    } elseif ($footer_style == 'viewtopic') {
+    } elseif ($footer_style == 'Topic') {
         if (isset($pid)) {
             $parameter = 'param/'.$pid.'/';
         } elseif (isset($p) && $p != 1) {
@@ -92,13 +92,13 @@
     } elseif ($feather_config['o_feed_type'] == '2') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
     }
-} elseif ($footer_style == 'viewforum') {
+} elseif ($footer_style == 'Forum') {
     if ($feather_config['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
     }
-} elseif ($footer_style == 'viewtopic') {
+} elseif ($footer_style == 'Topic') {
     if ($feather_config['o_feed_type'] == '1') {
         echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
     } elseif ($feather_config['o_feed_type'] == '2') {

From e02441fa3c87e1e84418aa00772c4bc80afb9683 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 6 Sep 2015 19:25:13 +0200
Subject: [PATCH 328/353] urlFor() for viewPost actions

---
 cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache | 2 +-
 cache/cache_parser_data.php                          | 2 +-
 featherbb/Controller/Edit.php                        | 3 +--
 featherbb/Controller/Post.php                        | 2 +-
 featherbb/Core/Parser.php                            | 2 +-
 featherbb/Model/Delete.php                           | 2 +-
 featherbb/Model/Index.php                            | 2 +-
 featherbb/Model/Misc.php                             | 5 ++---
 featherbb/Model/Moderate.php                         | 2 +-
 featherbb/Model/Post.php                             | 6 +++---
 featherbb/Model/Profile.php                          | 2 +-
 featherbb/Model/Viewforum.php                        | 2 +-
 featherbb/Model/Viewtopic.php                        | 6 ++----
 style/themes/FeatherBB/view/admin/reports.php        | 4 ++--
 style/themes/FeatherBB/view/delete.php               | 2 +-
 style/themes/FeatherBB/view/misc/report.php          | 6 +++---
 style/themes/FeatherBB/view/moderate/posts_view.php  | 6 +++---
 style/themes/FeatherBB/view/search/posts.php         | 8 ++++----
 style/themes/FeatherBB/view/search/topics.php        | 6 +++---
 style/themes/FeatherBB/view/viewtopic.php            | 2 +-
 20 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
index ace76b35..15b86da4 100644
--- a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
+++ b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
@@ -1 +1 @@
-{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1441544494,"expire":0,"data":"a:4:{i:1;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:2;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:3;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:4;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1441512071,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:23:\"Lighter than a feather.\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:11:\"deuh@oij.gt\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:17:\"style\/img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:26:\"http:\/\/localhost\/featherbb\";s:13:\"o_admin_email\";s:11:\"deuh@oij.gt\";s:17:\"o_webmaster_email\";s:11:\"deuh@oij.gt\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"0\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1441510035,"expire":0,"data":"a:3:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;s:13:\"\\Plugins\\Test\";b:1;}"}}
\ No newline at end of file
+{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1441544494,"expire":0,"data":"a:4:{i:1;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:2;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:3;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:4;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1441558865,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:23:\"Lighter than a feather.\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:11:\"deuh@oij.gt\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:17:\"style\/img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:26:\"http:\/\/localhost\/featherbb\";s:13:\"o_admin_email\";s:11:\"deuh@oij.gt\";s:17:\"o_webmaster_email\";s:11:\"deuh@oij.gt\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"0\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1441510035,"expire":0,"data":"a:3:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;s:13:\"\\Plugins\\Test\";b:1;}"}}
\ No newline at end of file
diff --git a/cache/cache_parser_data.php b/cache/cache_parser_data.php
index 1ab52462..9e5bbab7 100644
--- a/cache/cache_parser_data.php
+++ b/cache/cache_parser_data.php
@@ -1,4 +1,4 @@
-<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 03:54:56. DO NOT EDIT!!!
+<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 07:19:39. DO NOT EDIT!!!
 $pd = array (
   'newer_php_version' => true,
   'in_signature' => false,
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index 53f3dc27..52e022a2 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -68,8 +68,7 @@ public function editpost($id)
                 // Edit the post
                 $this->model->edit_post($id, $can_edit_subject, $post, $cur_post, $is_admmod);
 
-                // Url::redirect($this->feather->urlFor('viewPost', array('pid' => $id)), __('Post redirect'));
-                Url::redirect($this->feather->url->get('post/'.$id.'/#p'.$id), __('Post redirect'));
+                Url::redirect($this->feather->urlFor('viewPost', ['pid' => $id]).'#p'.$id, __('Post redirect'));
             }
         } else {
             $post = '';
diff --git a/featherbb/Controller/Post.php b/featherbb/Controller/Post.php
index 09a6e972..e7a13529 100644
--- a/featherbb/Controller/Post.php
+++ b/featherbb/Controller/Post.php
@@ -123,7 +123,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
                             $this->model->increment_post_count($post, $new['tid']);
                         }
 
-                    Url::redirect(Url::get('post/'.$new['pid'].'/#p'.$new['pid']), __('Post redirect'));
+                    Url::redirect($this->feather->urlFor('viewPost', ['pid' => $new['pid']]).'#p'.$new['pid'], __('Post redirect'));
                 }
         }
 
diff --git a/featherbb/Core/Parser.php b/featherbb/Core/Parser.php
index 89bcedab..3a693ec6 100644
--- a/featherbb/Core/Parser.php
+++ b/featherbb/Core/Parser.php
@@ -1087,7 +1087,7 @@ private function _parse_bbcode_callback($matches)
                         $attribute .= ' '.__('wrote'); // Append language-specific "wrote:".
                         if ($this->pd['config']['quote_links'])
                         {
-                            $attribute = ' <a href="'. $this->feather->url->get('post/'.$m[1].'/#p'.$m[1]) .'">'. $attribute .'</a>';
+                            $attribute = ' <a href="'. $this->feather->urlFor('viewPost', ['pid' => $m[1]]).'#p'.$m[1] .'">'. $attribute .'</a>';
                         }
                     }
                     else
diff --git a/featherbb/Model/Delete.php b/featherbb/Model/Delete.php
index 9b1296fc..8bfde46a 100644
--- a/featherbb/Model/Delete.php
+++ b/featherbb/Model/Delete.php
@@ -86,7 +86,7 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
 
             $post = $post->find_one();
 
-            Url::redirect(Url::get('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
+            Url::redirect($this->feather->urlFor('viewPost', ['pid' => $post['id']]).'#p'.$post['id'], __('Post del redirect'));
         }
     }
 }
diff --git a/featherbb/Model/Index.php b/featherbb/Model/Index.php
index d66b07ba..684c5c21 100644
--- a/featherbb/Model/Index.php
+++ b/featherbb/Model/Index.php
@@ -201,7 +201,7 @@ public function print_categories_forums()
 
             // If there is a last_post/last_poster
             if ($cur_forum->last_post != '') {
-                $cur_forum->last_post_formatted = '<a href="'.Url::get('post/'.$cur_forum->last_post_id.'/#p'.$cur_forum->last_post_id).'">'.$this->feather->utils->format_time($cur_forum->last_post).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_forum->last_poster).'</span>';
+                $cur_forum->last_post_formatted = '<a href="'.$this->feather->urlFor('viewPost', ['pid' => $cur_forum->last_post_id]).'#p'.$cur_forum->last_post_id.'">'.$this->feather->utils->format_time($cur_forum->last_post).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_forum->last_poster).'</span>';
             } elseif ($cur_forum->redirect_url != '') {
                 $cur_forum->last_post_formatted = '- - -';
             } else {
diff --git a/featherbb/Model/Misc.php b/featherbb/Model/Misc.php
index d01eede8..f6b11e3d 100644
--- a/featherbb/Model/Misc.php
+++ b/featherbb/Model/Misc.php
@@ -207,7 +207,7 @@ public function insert_report($post_id)
                 $mail_subject = str_replace('<forum_id>', $report['forum_id'], $mail_subject);
                 $mail_subject = str_replace('<topic_subject>', $report['subject'], $mail_subject);
                 $mail_message = str_replace('<username>', $this->user->username, $mail_message);
-                $mail_message = str_replace('<post_url>', Url::get('post/'.$post_id.'/#p'.$post_id), $mail_message);
+                $mail_message = str_replace('<post_url>', $this->feather->urlFor('viewPost', ['pid' => $post_id]).'#p'.$post_id, $mail_message);
                 $mail_message = str_replace('<reason>', $reason, $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
 
@@ -223,8 +223,7 @@ public function insert_report($post_id)
         $last_report_sent = $this->hook->fireDB('insert_last_report_sent', $last_report_sent);
         $last_report_sent = $last_report_sent->save();
 
-        Url::redirect(Url::get('post/'.$post_id.'/#p'.$post_id), __('Report redirect'));
-        // Url::redirect($this->feather->url->get('forum/'.$report['forum_id'].'/'.$this->feather->url->url_friendly($report['subject']).'/'), __('Report redirect'));
+        Url::redirect($this->feather->urlFor('viewPost', ['pid' => $post_id]).'#p'.$post_id, __('Report redirect'));
     }
 
     public function get_info_report($post_id)
diff --git a/featherbb/Model/Moderate.php b/featherbb/Model/Moderate.php
index a7174519..73060583 100644
--- a/featherbb/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -919,7 +919,7 @@ public function display_topics($fid, $sort_by, $start_from)
                 $url_topic = Url::url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_disp'] = '<a href="'.Url::get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.$this->feather->utils->format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_disp'] = '<a href="'.$this->feather->urlFor('viewPost', ['pid' => $cur_topic['last_post_id']]).'#p'.$cur_topic['last_post_id'].'">'.$this->feather->utils->format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['last_poster']).'</span>';
                     $cur_topic['ghost_topic'] = false;
                 } else {
                     $cur_topic['last_post_disp'] = '- - -';
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
index 2d30535d..4ca04c6b 100644
--- a/featherbb/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -408,7 +408,7 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
                         $mail_subject = str_replace('<topic_subject>', $cur_posting['subject'], $mail_subject);
                         $mail_message = str_replace('<topic_subject>', $cur_posting['subject'], $mail_message);
                         $mail_message = str_replace('<replier>', $post['username'], $mail_message);
-                        $mail_message = str_replace('<post_url>', Url::get('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
+                        $mail_message = str_replace('<post_url>', $this->feather->urlFor('viewPost', ['pid' => $new_pid]).'#p'.$new_pid, $mail_message);
                         $mail_message = str_replace('<unsubscribe_url>', Url::get('unsubscribe/topic/'.$tid.'/'), $mail_message);
                         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                         $mail_message = $this->hook->fire('send_notifications_reply_mail_message', $mail_message);
@@ -417,7 +417,7 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
                         $mail_message_full = str_replace('<topic_subject>', $cur_posting['subject'], $mail_message_full);
                         $mail_message_full = str_replace('<replier>', $post['username'], $mail_message_full);
                         $mail_message_full = str_replace('<message>', $cleaned_message, $mail_message_full);
-                        $mail_message_full = str_replace('<post_url>', Url::get('post/'.$new_pid.'/#p'.$new_pid), $mail_message_full);
+                        $mail_message_full = str_replace('<post_url>', $this->feather->urlFor('viewPost', ['pid' => $new_pid]).'#p'.$new_pid, $mail_message_full);
                         $mail_message_full = str_replace('<unsubscribe_url>', Url::get('unsubscribe/topic/'.$tid.'/'), $mail_message_full);
                         $mail_message_full = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message_full);
                         $mail_message_full = $this->hook->fire('send_notifications_reply_mail_message_full', $mail_message_full);
@@ -670,7 +670,7 @@ public function warn_banned_user($post, $new_pid)
 
         $mail_message = str_replace('<username>', $post['username'], $mail_message);
         $mail_message = str_replace('<email>', $post['email'], $mail_message);
-        $mail_message = str_replace('<post_url>', Url::get('post/'.$new_pid.'/#p'.$new_pid), $mail_message);
+        $mail_message = str_replace('<post_url>', $this->feather->urlFor('viewPost', ['pid' => $new_pid]).'#p'.$new_pid, $mail_message);
         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
         $mail_message = $this->hook->fire('warn_banned_user_mail_message', $mail_message);
 
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index 6702169e..71f64bf5 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -593,7 +593,7 @@ public function promote_user($id)
 
         $pid = $this->hook->fire('promote_user', $pid);
 
-        Url::redirect($this->feather->url->get('post/'.$pid.'/#p'.$pid), __('User promote redirect'));
+        Url::redirect($this->feather->urlFor('viewPost', ['pid' => $pid]).'#p'.$pid, __('User promote redirect'));
     }
 
     public function delete_user($id)
diff --git a/featherbb/Model/Viewforum.php b/featherbb/Model/Viewforum.php
index 0f1997dc..1bf629eb 100644
--- a/featherbb/Model/Viewforum.php
+++ b/featherbb/Model/Viewforum.php
@@ -189,7 +189,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 $url_subject = Url::url_friendly($cur_topic['subject']);
 
                 if (is_null($cur_topic['moved_to'])) {
-                    $cur_topic['last_post_formatted'] = '<a href="'.Url::get('post/'.$cur_topic['last_post_id'].'/#p'.$cur_topic['last_post_id']).'">'.$this->feather->utils->format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['last_poster']).'</span>';
+                    $cur_topic['last_post_formatted'] = '<a href="'.$this->feather->urlFor('viewPost', ['pid' => $cur_topic['last_post_id']]).'#p'.$cur_topic['last_post_id'].'">'.$this->feather->utils->format_time($cur_topic['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['last_poster']).'</span>';
                 } else {
                     $cur_topic['last_post_formatted'] = '- - -';
                 }
diff --git a/featherbb/Model/Viewtopic.php b/featherbb/Model/Viewtopic.php
index 38fe7857..b870bff0 100644
--- a/featherbb/Model/Viewtopic.php
+++ b/featherbb/Model/Viewtopic.php
@@ -80,8 +80,7 @@ public function handle_actions($topic_id, $action)
                 $first_new_post_id = $this->hook->fire('handle_actions_first_new', $first_new_post_id);
 
                 if ($first_new_post_id) {
-                    header('Location: '.Url::base().'/post/'.$first_new_post_id.'/#p'.$first_new_post_id);
-                    exit;
+                    Url::redirect($this->feather->urlFor('viewPost', ['pid' => $first_new_post_id]).'#p'.$first_new_post_id);
                 }
             }
 
@@ -98,8 +97,7 @@ public function handle_actions($topic_id, $action)
             $last_post_id = $this->hook->fire('handle_actions_last_post', $last_post_id);
 
             if ($last_post_id) {
-                header('Location: '.Url::base().'/post/'.$last_post_id.'/#p'.$last_post_id);
-                exit;
+                Url::redirect($this->feather->urlFor('viewPost', ['pid' => $last_post_id]).'#p'.$last_post_id);
             }
         }
 
diff --git a/style/themes/FeatherBB/view/admin/reports.php b/style/themes/FeatherBB/view/admin/reports.php
index ece8b9c3..3c3e3f59 100644
--- a/style/themes/FeatherBB/view/admin/reports.php
+++ b/style/themes/FeatherBB/view/admin/reports.php
@@ -34,7 +34,7 @@
 									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.Url::get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
 									<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => Url::get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => Url::get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => Url::get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+																						sprintf(__('Post ID'), $report['pid']) => $feather->urlFor('viewPost', ['pid' => $report['pid']]).'#p'.$report['pid'])) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?= $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
@@ -84,7 +84,7 @@
 									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.Url::get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
 									<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => Url::get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
 																						$report['subject'] => Url::get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => Url::get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+																						sprintf(__('Post ID'), $report['pid']) => $feather->urlFor('viewPost', ['pid' => $report['pid']]).'#p'.$report['pid'])) ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?></th>
diff --git a/style/themes/FeatherBB/view/delete.php b/style/themes/FeatherBB/view/delete.php
index 8198cfb5..6c95b195 100644
--- a/style/themes/FeatherBB/view/delete.php
+++ b/style/themes/FeatherBB/view/delete.php
@@ -21,7 +21,7 @@
 		<ul class="crumbs">
 			<li><a href="<?= Url::base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?= Url::get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?= Utils::escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?= Url::get('post/'.$id.'/#p'.$id) ?>"><?= Utils::escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?= $feather->urlFor('viewPost', ['pid' => $id]).'#p'.$id ?>"><?= Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>
diff --git a/style/themes/FeatherBB/view/misc/report.php b/style/themes/FeatherBB/view/misc/report.php
index c0fe59dd..45df92d6 100644
--- a/style/themes/FeatherBB/view/misc/report.php
+++ b/style/themes/FeatherBB/view/misc/report.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
@@ -21,7 +21,7 @@
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('post/'.$id.'/#p'.$id) ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('viewPost', ['pid' => $id]).'#p'.$id ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
 		</ul>
 	</div>
@@ -44,4 +44,4 @@
 			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/moderate/posts_view.php b/style/themes/FeatherBB/view/moderate/posts_view.php
index b6fa23a3..6c2a58bc 100644
--- a/style/themes/FeatherBB/view/moderate/posts_view.php
+++ b/style/themes/FeatherBB/view/moderate/posts_view.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
@@ -45,7 +45,7 @@
     echo ' blockpost1';
 }
     ?>">
-		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo Url::get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
+		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->urlFor('viewPost', ['pid' => $post['id']]).'#p'.$post['id'] ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
 		<div class="box">
 			<div class="inbox">
 				<div class="postbody">
@@ -95,4 +95,4 @@
 		<div class="clearer"></div>
 	</div>
 </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/style/themes/FeatherBB/view/search/posts.php b/style/themes/FeatherBB/view/search/posts.php
index 4fad5086..abd25f5e 100644
--- a/style/themes/FeatherBB/view/search/posts.php
+++ b/style/themes/FeatherBB/view/search/posts.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
@@ -25,7 +25,7 @@
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
     _e('Re').' ';
-} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo Url::get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo Url::get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
+} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo Url::get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->urlFor('viewPost', ['pid' => $cur_search['pid']]).'#p'.$cur_search['pid'] ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
 		<div class="postbody">
@@ -50,10 +50,10 @@
 			<div class="postfootright">
 				<ul>
 					<li><span><a href="<?php echo Url::get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
-					<li><span><a href="<?php echo Url::get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
+					<li><span><a href="<?php echo $feather->urlFor('viewPost', ['pid' => $cur_search['pid']]).'#p'.$cur_search['pid'] ?>"><?php _e('Go to post') ?></a></span></li>
 				</ul>
 			</div>
 		</div>
 	</div>
 </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/search/topics.php b/style/themes/FeatherBB/view/search/topics.php
index e41e54ff..57f69d42 100644
--- a/style/themes/FeatherBB/view/search/topics.php
+++ b/style/themes/FeatherBB/view/search/topics.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
@@ -28,5 +28,5 @@
 	</td>
 	<td class="tc2"><?php echo $forum ?></td>
 	<td class="tc3"><?php echo Utils::forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.Url::get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.$feather->utils->format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_search['last_poster']) ?></span></td>
-</tr>
\ No newline at end of file
+	<td class="tcr"><?php echo '<a href="'.$feather->urlFor('viewPost', ['pid' => $cur_search['last_post_id']]).'#p'.$cur_search['last_post_id'].'">'.$feather->utils->format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_search['last_poster']) ?></span></td>
+</tr>
diff --git a/style/themes/FeatherBB/view/viewtopic.php b/style/themes/FeatherBB/view/viewtopic.php
index e56e8cd8..1454befb 100644
--- a/style/themes/FeatherBB/view/viewtopic.php
+++ b/style/themes/FeatherBB/view/viewtopic.php
@@ -43,7 +43,7 @@
     echo ' blockpost1';
 }
     ?>">
-	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo Url::get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
+	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->urlFor('viewPost', ['pid' => $post['id']]).'#p'.$post['id'] ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
 	<div class="box">
 		<div class="inbox">
 			<div class="postbody">

From 013f9b139c8d512a8096f1ff9b3eae195f71d194 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 6 Sep 2015 20:37:37 +0200
Subject: [PATCH 329/353] More urlFor()

---
 ...5bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache |  2 +-
 cache/cache_parser_data.php                   | 53 ++-----------------
 featherbb/Controller/Auth.php                 |  6 +--
 featherbb/Controller/Forum.php                | 26 ++++-----
 featherbb/Controller/Post.php                 |  6 +--
 featherbb/Controller/Profile.php              |  6 +--
 featherbb/Controller/Topic.php                |  6 +--
 featherbb/Model/Forum.php                     | 14 ++---
 featherbb/routes.php                          |  3 +-
 9 files changed, 38 insertions(+), 84 deletions(-)

diff --git a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
index 15b86da4..024eaa12 100644
--- a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
+++ b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
@@ -1 +1 @@
-{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1441544494,"expire":0,"data":"a:4:{i:1;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:2;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:3;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:4;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1441558865,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:23:\"Lighter than a feather.\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:11:\"deuh@oij.gt\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:17:\"style\/img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:26:\"http:\/\/localhost\/featherbb\";s:13:\"o_admin_email\";s:11:\"deuh@oij.gt\";s:17:\"o_webmaster_email\";s:11:\"deuh@oij.gt\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"0\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1441510035,"expire":0,"data":"a:3:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;s:13:\"\\Plugins\\Test\";b:1;}"}}
\ No newline at end of file
+{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1441544494,"expire":0,"data":"a:4:{i:1;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:2;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:3;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:4;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1441562641,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:23:\"Lighter than a feather.\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:11:\"deuh@oij.gt\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:17:\"style\/img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:26:\"http:\/\/localhost\/featherbb\";s:13:\"o_admin_email\";s:11:\"deuh@oij.gt\";s:17:\"o_webmaster_email\";s:11:\"deuh@oij.gt\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"0\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1441510035,"expire":0,"data":"a:3:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;s:13:\"\\Plugins\\Test\";b:1;}"}}
\ No newline at end of file
diff --git a/cache/cache_parser_data.php b/cache/cache_parser_data.php
index 9e5bbab7..906def9a 100644
--- a/cache/cache_parser_data.php
+++ b/cache/cache_parser_data.php
@@ -1,4 +1,4 @@
-<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 07:19:39. DO NOT EDIT!!!
+<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 08:04:01. DO NOT EDIT!!!
 $pd = array (
   'newer_php_version' => true,
   'in_signature' => false,
@@ -73,7 +73,7 @@
   're_bbcode' => '% # re_bbcode Rev:20110220_1200
 # First, match opening tag of syntax: "[TAGNAME (= ("\')ATTRIBUTE("\') )]";
 \\[                              # Match opening bracket of outermost opening TAGNAME tag.
-(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err|dbug)\\s*+) # $1:
+(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err)\\s*+) # $1:
 (?>                             # Atomically group remainder of opening tag.
   (?:                           # Optional attribute.
     (=)\\s*+                     # $2: = Optional attribute\'s equals sign delimiter, ws.
@@ -112,7 +112,7 @@
   're_bbtag' => '%# re_bbtag Rev:20110220_1200
 # Match open or close BBtag.
 \\[/?+                           # Match opening bracket of outermost opening TAGNAME tag.
-(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err|dbug)\\s*+) #$1:
+(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err)\\s*+) #$1:
 (?:                             # Optional attribute.
   (=)\\s*+                       # $2: = Optional attribute\'s equals sign delimiter, ws.
   (?:                           # Group for 1-line attribute value alternatives.
@@ -284,7 +284,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'code' => 
@@ -343,7 +342,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'colour' => 
@@ -374,7 +372,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'del' => 
@@ -405,7 +402,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'email' => 
@@ -444,7 +440,6 @@
         '*' => true,
         'quote' => true,
         'url' => true,
-        'dbug' => true,
       ),
     ),
     'em' => 
@@ -475,7 +470,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'h' => 
@@ -506,7 +500,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'img' => 
@@ -566,7 +559,6 @@
         'large' => true,
         'small' => true,
         'err' => true,
-        'dbug' => true,
       ),
     ),
     'ins' => 
@@ -597,7 +589,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'i' => 
@@ -628,7 +619,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'table' => 
@@ -681,7 +671,6 @@
         'youtube' => true,
         'large' => true,
         'small' => true,
-        'dbug' => true,
       ),
       'tags_only' => true,
     ),
@@ -738,7 +727,6 @@
         'youtube' => true,
         'large' => true,
         'small' => true,
-        'dbug' => true,
       ),
       'tags_only' => true,
     ),
@@ -862,7 +850,6 @@
         'large' => true,
         'small' => true,
         'err' => true,
-        'dbug' => true,
       ),
       'tags_only' => true,
     ),
@@ -948,7 +935,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'sup' => 
@@ -979,7 +965,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     's' => 
@@ -1010,7 +995,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'tt' => 
@@ -1071,7 +1055,6 @@
         '*' => true,
         'quote' => true,
         'url' => true,
-        'dbug' => true,
       ),
     ),
     'u' => 
@@ -1102,7 +1085,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'center' => 
@@ -1133,7 +1115,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'right' => 
@@ -1164,7 +1145,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'left' => 
@@ -1195,7 +1175,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'justify' => 
@@ -1226,7 +1205,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'youtube' => 
@@ -1289,7 +1267,6 @@
         'large' => true,
         'small' => true,
         'err' => true,
-        'dbug' => true,
       ),
       'x_padding' => 20,
       'y_padding' => 45,
@@ -1322,7 +1299,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'small' => 
@@ -1353,7 +1329,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'err' => 
@@ -1384,28 +1359,6 @@
       array (
       ),
     ),
-    'dbug' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><p class="debug" title="%a_str%">
%c_str%
</p><p>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
     '_ROOT_' => 
     array (
       'depth' => 0,
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
index ef516c06..ca8a3a68 100644
--- a/featherbb/Controller/Auth.php
+++ b/featherbb/Controller/Auth.php
@@ -56,7 +56,7 @@ public function login()
                     Url::redirect($this->feather->urlFor('home'), __('Login redirect'));
                 }
             }
-            throw new \FeatherBB\Core\Error(__('Wrong user/pass').' <a href="'.Url::get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
+            throw new \FeatherBB\Core\Error(__('Wrong user/pass').' <a href="'.$this->feather->urlFor('resetPassword').'">'.__('Forgotten pass').'</a>', 403);
         } else {
             $this->feather->template->setPageInfo(array(
                                 'active_page' => 'login',
@@ -72,7 +72,7 @@ public function logout($token)
     {
         $token = $this->feather->hooks->fire('logout_start', $token);
 
-        if ($this->feather->user->is_guest || !isset($token) || $token != \FeatherBB\Utils::feather_hash($this->feather->user->id.\FeatherBB\Utils::feather_hash($this->feather->request->getIp()))) {
+        if ($this->feather->user->is_guest || !isset($token) || $token != Utils::hash($this->feather->user->id.Utils::hash($this->feather->request->getIp()))) {
             Url::redirect($this->feather->urlFor('home'), 'Not logged in');
         }
 
@@ -131,7 +131,7 @@ public function forget()
 
                 // Do the user specific replacements to the template
                 $cur_mail_message = str_replace('<username>', $user->username, $mail_message);
-                $cur_mail_message = str_replace('<activation_url>', Url::get('user/'.$user->id.'/action/change_pass/?key='.$new_password_key), $cur_mail_message);
+                $cur_mail_message = str_replace('<activation_url>', $this->feather->urlFor('profileAction', ['action' => 'change_pass']).'?key='.$new_password_key, $cur_mail_message);
                 $cur_mail_message = str_replace('<new_password>', $new_password, $cur_mail_message);
                 $cur_mail_message = $this->feather->hooks->fire('cur_mail_message_password_forgotten', $cur_mail_message);
 
diff --git a/featherbb/Controller/Forum.php b/featherbb/Controller/Forum.php
index 2096e98d..1409d258 100644
--- a/featherbb/Controller/Forum.php
+++ b/featherbb/Controller/Forum.php
@@ -26,10 +26,10 @@ public function __autoload($class_name)
         require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
     }
 
-    public function display($id, $name = null, $page = null)
+    public function display($fid, $name = null, $page = null)
     {
         // Fetch some informations about the forum
-        $cur_forum = $this->model->get_info_forum($id);
+        $cur_forum = $this->model->get_info_forum($fid);
 
         // Is this a redirect forum? In that case, redirect!
         if ($cur_forum['redirect_url'] != '') {
@@ -45,7 +45,7 @@ public function display($id, $name = null, $page = null)
 
         // Can we or can we not post new topics?
         if (($cur_forum['post_topics'] == '' && $this->feather->user->g_post_topics == '1') || $cur_forum['post_topics'] == '1' || $is_admmod) {
-            $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.Url::get('post/new-topic/'.$id.'/').'">'.__('Post topic').'</a></p>'."\n";
+            $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.$this->feather->urlFor('newTopic', ['fid' => $fid]).'">'.__('Post topic').'</a></p>'."\n";
         } else {
             $post_link = '';
         }
@@ -58,24 +58,24 @@ public function display($id, $name = null, $page = null)
         $url_forum = Url::url_friendly($cur_forum['forum_name']);
 
         // Generate paging links
-        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.Url::paginate($num_pages, $p, 'forum/'.$id.'/'.$url_forum.'/#');
+        $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.Url::paginate($num_pages, $p, 'forum/'.$fid.'/'.$url_forum.'/#');
 
-        $forum_actions = $this->model->get_forum_actions($id, $this->feather->forum_settings['o_forum_subscriptions'], $cur_forum['is_subscribed']);
+        $forum_actions = $this->model->get_forum_actions($fid, $this->feather->forum_settings['o_forum_subscriptions'], $cur_forum['is_subscribed']);
 
-        $this->feather->template->addAsset('canonical', Url::get('forum/'.$id.'/'.$url_forum.'/'));
+        $this->feather->template->addAsset('canonical', $this->feather->urlFor('Forum', ['id' => $fid, 'name' => $url_forum, 'page' => $p]));
         if ($num_pages > 1) {
             if ($p > 1) {
-                $this->feather->template->addAsset('prev', Url::get('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
+                $this->feather->template->addAsset('prev', $this->feather->urlFor('Forum', ['id' => $fid, 'name' => $url_forum, 'page' => intval($p-1)]));
             }
             if ($p < $num_pages) {
-                $this->feather->template->addAsset('next', Url::get('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
+                $this->feather->template->addAsset('next', $this->feather->urlFor('Forum', ['id' => $fid, 'name' => $url_forum, 'page' => intval($p+1)]));
             }
         }
 
         if ($this->feather->forum_settings['o_feed_type'] == '1') {
-            $this->feather->template->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=rss', array('title' => __('RSS forum feed')));
+            $this->feather->template->addAsset('feed', 'extern.php?action=feed&amp;fid='.$fid.'&amp;type=rss', array('title' => __('RSS forum feed')));
         } elseif ($this->feather->forum_settings['o_feed_type'] == '2') {
-            $this->feather->template->addAsset('feed', 'extern.php?action=feed&amp;fid='.$id.'&amp;type=atom', array('title' => __('Atom forum feed')));
+            $this->feather->template->addAsset('feed', 'extern.php?action=feed&amp;fid='.$fid.'&amp;type=atom', array('title' => __('Atom forum feed')));
         }
 
         $this->feather->template->setPageInfo(array(
@@ -84,9 +84,9 @@ public function display($id, $name = null, $page = null)
             'page_number'  =>  $p,
             'paging_links'  =>  $paging_links,
             'is_indexed' => true,
-            'id' => $id,
-            'fid' => $id,
-            'forum_data' => $this->model->print_topics($id, $sort_by, $start_from),
+            'id' => $fid,
+            'fid' => $fid,
+            'forum_data' => $this->model->print_topics($fid, $sort_by, $start_from),
             'cur_forum' => $cur_forum,
             'post_link' => $post_link,
             'start_from' => $start_from,
diff --git a/featherbb/Controller/Post.php b/featherbb/Controller/Post.php
index e7a13529..f3db764d 100644
--- a/featherbb/Controller/Post.php
+++ b/featherbb/Controller/Post.php
@@ -132,18 +132,18 @@ public function newpost($fid = null, $tid = null, $qid = null)
         // If a topic ID was specified in the url (it's a reply)
         if ($tid) {
             $action = __('Post a reply');
-            $form = '<form id="post" method="post" action="'.Url::get('post/reply/'.$tid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
+            $form = '<form id="post" method="post" action="'.$this->feather->urlFor('newReply', ['tid' => $tid]).'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
 
                 // If a quote ID was specified in the url
                 if (isset($qid)) {
                     $quote = $this->model->get_quote_message($qid, $tid);
-                    $form = '<form id="post" method="post" action="'.Url::get('post/reply/'.$tid.'/quote/'.$qid.'/').'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
+                    $form = '<form id="post" method="post" action="'.$this->feather->urlFor('newQuoteReply', ['pid' => $tid, 'qid' => $qid]).'" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">';
                 }
         }
         // If a forum ID was specified in the url (new topic)
         elseif ($fid) {
             $action = __('Post new topic');
-            $form = '<form id="post" method="post" action="'.Url::get('post/new-topic/'.$fid.'/').'" onsubmit="return process_form(this)">';
+            $form = '<form id="post" method="post" action="'.$this->feather->urlFor('newTopic', ['fid' => $fid]).'" onsubmit="return process_form(this)">';
         } else {
             throw new \FeatherBB\Core\Error(__('Bad request'), 404);
         }
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
index ab308d08..0051607e 100644
--- a/featherbb/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -164,13 +164,13 @@ public function display($id, $section = null)
                     throw new \FeatherBB\Core\Error(__('Bad request'), 404);
                 }
 
-                $avatar_field = '<span><a href="'.Url::get('user/'.$id.'/action/upload_avatar/').'">'.__('Change avatar').'</a></span>';
+                $avatar_field = '<span><a href="'.$this->feather->urlFor('profileAction', ['id' => $id, 'action' => 'upload_avatar']).'">'.__('Change avatar').'</a></span>';
 
                 $user_avatar = generate_avatar_markup($id);
                 if ($user_avatar) {
-                    $avatar_field .= ' <span><a href="'.Url::get('user/'.$id.'/action/delete_avatar/').'">'.__('Delete avatar').'</a></span>';
+                    $avatar_field .= ' <span><a href="'.$this->feather->urlFor('profileAction', ['id' => $id, 'action' => 'delete_avatar']).'">'.__('Delete avatar').'</a></span>';
                 } else {
-                    $avatar_field = '<span><a href="'.Url::get('user/'.$id.'/action/upload_avatar/').'">'.__('Upload avatar').'</a></span>';
+                    $avatar_field = '<span><a href="'.$this->feather->urlFor('profileAction', ['id' => $id, 'action' => 'upload_avatar']).'">'.__('Upload avatar').'</a></span>';
                 }
 
                 if ($user['signature'] != '') {
diff --git a/featherbb/Controller/Topic.php b/featherbb/Controller/Topic.php
index e7c17191..5671fbfa 100644
--- a/featherbb/Controller/Topic.php
+++ b/featherbb/Controller/Topic.php
@@ -87,13 +87,13 @@ public function display($id = null, $name = null, $page = null, $pid = null)
             'promptQuote' => __('promptQuote')
         );
 
-        $this->feather->template->addAsset('canonical', Url::get('forum/'.$id.'/'.$url_forum.'/'));
+        $this->feather->template->addAsset('canonical', $this->feather->urlFor('Forum', ['id' => $id, 'name' => $url_forum, 'page' => $p]));
         if ($num_pages > 1) {
             if ($p > 1) {
-                $this->feather->template->addAsset('prev', Url::get('forum/'.$id.'/'.$url_forum.'/page/'.($p - 1).'/'));
+                $this->feather->template->addAsset('prev', $this->feather->urlFor('Forum', ['id' => $id, 'name' => $url_forum, 'page' => intval($p-1)]));
             }
             if ($p < $num_pages) {
-                $this->feather->template->addAsset('next', Url::get('forum/'.$id.'/'.$url_forum.'/page/'.($p + 1).'/'));
+                $this->feather->template->addAsset('next', $this->feather->urlFor('Forum', ['id' => $id, 'name' => $url_forum, 'page' => intval($p+1)]));
             }
         }
 
diff --git a/featherbb/Model/Forum.php b/featherbb/Model/Forum.php
index 22c5466b..f2d2444b 100644
--- a/featherbb/Model/Forum.php
+++ b/featherbb/Model/Forum.php
@@ -105,13 +105,13 @@ public function get_forum_actions($forum_id, $subscriptions, $is_subscribed)
         if (!$this->user->is_guest) {
             if ($subscriptions == 1) {
                 if ($is_subscribed) {
-                    $forum_actions[] = '<span>'.__('Is subscribed').' - </span><a href="'.Url::get('unsubscribe/forum/'.$forum_id.'/').'">'.__('Unsubscribe').'</a>';
+                    $forum_actions[] = '<span>'.__('Is subscribed').' - </span><a href="'.$this->feather->urlFor('unsubscribeForum', ['id' => $forum_id]).'">'.__('Unsubscribe').'</a>';
                 } else {
-                    $forum_actions[] = '<a href="'.Url::get('subscribe/forum/'.$forum_id.'/').'">'.__('Subscribe').'</a>';
+                    $forum_actions[] = '<a href="'.$this->feather->urlFor('subscribeForum', ['id' => $forum_id]).'">'.__('Subscribe').'</a>';
                 }
             }
 
-            $forum_actions[] = '<a href="'.Url::get('mark-forum-read/'.$forum_id.'/').'">'.__('Mark forum read').'</a>';
+            $forum_actions[] = '<a href="'.$this->feather->urlFor('markForumRead', ['id' => $forum_id]).'">'.__('Mark forum read').'</a>';
         }
 
         $forum_actions = $this->hook->fire('get_page_head', $forum_actions);
@@ -204,13 +204,13 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_formatted'] = '<a href="'.Url::get('topic/'.$cur_topic['moved_to'].'/'.$url_subject.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->urlFor('Topic', ['id' => $cur_topic['moved_to'], 'name' => $url_subject, 'page' => 1]).'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_formatted'] = '<a href="'.Url::get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->urlFor('Topic', ['id' => $cur_topic['id'], 'name' => $url_subject, 'page' => 1]).'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_formatted'] = '<a href="'.Url::get('topic/'.$cur_topic['id'].'/'.$url_subject.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->urlFor('Topic', ['id' => $cur_topic['id'], 'name' => $url_subject, 'page' => 1]).'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
@@ -219,7 +219,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_formatted'] = '<strong>'.$cur_topic['subject_formatted'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.Url::get('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->urlFor('Topic', ['id' => $cur_topic['id'], 'action' => 'new']).'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
diff --git a/featherbb/routes.php b/featherbb/routes.php
index c22adbfd..9c481787 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -76,7 +76,8 @@
 // Post routes
 $feather->group('/post', function() use ($feather) {
     $feather->map('/new-topic/:fid(/)', '\FeatherBB\Controller\Post:newpost')->conditions(array('fid' => '[0-9]+'))->via('GET', 'POST')->name('newTopic');
-    $feather->map('/reply/:tid(/)(/quote/:qid)(/)', '\FeatherBB\Controller\Post:newreply')->conditions(array('tid' => '[0-9]+', 'qid' => '[0-9]+'))->via('GET', 'POST')->name('newReply');
+    $feather->map('/reply/:tid(/)', '\FeatherBB\Controller\Post:newreply')->conditions(array('tid' => '[0-9]+'))->via('GET', 'POST')->name('newReply');
+    $feather->map('/reply/:tid(/)(/quote/:qid)(/)', '\FeatherBB\Controller\Post:newreply')->conditions(array('tid' => '[0-9]+', 'qid' => '[0-9]+'))->via('GET', 'POST')->name('newQuoteReply');
 });
 
 // Edit

From 5019562d211e47f92e95f0cb8aa3a369ded5daa2 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 21:31:29 +0200
Subject: [PATCH 330/353] Big cleanup

---
 extern.php                                    |   13 +-
 featherbb/Controller/Admin/Categories.php     |    3 +-
 featherbb/Controller/Admin/Forums.php         |   11 +-
 featherbb/Controller/Auth.php                 |   34 +-
 featherbb/Controller/Delete.php               |    4 +-
 featherbb/Controller/Edit.php                 |    6 +-
 featherbb/Controller/Install.php              |    5 +-
 featherbb/Controller/Misc.php                 |    7 +-
 featherbb/Controller/Moderate.php             |    2 +-
 featherbb/Controller/Profile.php              |   13 +-
 featherbb/Controller/Search.php               |    4 -
 featherbb/Controller/Topic.php                |    9 +-
 featherbb/Core/Parser.php                     |    2 +-
 featherbb/Core/Random.php                     |  200 ++
 featherbb/Core/Search.php                     |    4 +-
 featherbb/Core/Track.php                      |   54 +
 featherbb/Core/Utils.php                      |  114 +-
 featherbb/Helpers/functions.php               |  388 ----
 featherbb/Helpers/srand.php                   |  149 --
 featherbb/Middleware/Auth.php                 |   14 +-
 featherbb/Middleware/Core.php                 |    1 -
 featherbb/Model/Admin/Bans.php                |    5 +-
 featherbb/Model/Admin/Censoring.php           |   13 +-
 featherbb/Model/Admin/Groups.php              |    5 +-
 featherbb/Model/Admin/Maintenance.php         |    4 +-
 featherbb/Model/Admin/Options.php             |    3 +-
 featherbb/Model/Admin/Permissions.php         |    3 +-
 featherbb/Model/Admin/Users.php               |   16 +-
 featherbb/Model/Auth.php                      |    3 +-
 featherbb/Model/Delete.php                    |  126 +-
 featherbb/Model/Edit.php                      |    4 +-
 featherbb/Model/Forum.php                     |   55 +-
 featherbb/Model/Index.php                     |    5 +-
 featherbb/Model/Install.php                   |    3 +-
 featherbb/Model/Login.php                     |   18 +-
 featherbb/Model/Moderate.php                  |   29 +-
 featherbb/Model/Post.php                      |   21 +-
 featherbb/Model/Profile.php                   |   57 +-
 featherbb/Model/Register.php                  |    7 +-
 featherbb/Model/Search.php                    |    7 +-
 featherbb/Model/Topic.php                     |   15 +-
 style/themes/FeatherBB/view/admin/options.php |    3 +-
 .../FeatherBB/view/admin/users/show_users.php |    4 +-
 style/themes/FeatherBB/view/header.php        |    3 +-
 style/themes/FeatherBB/view/userlist.php      |    2 +-
 view/admin/options.php                        | 1661 ++++++++---------
 46 files changed, 1557 insertions(+), 1552 deletions(-)
 create mode 100644 featherbb/Core/Random.php
 create mode 100644 featherbb/Core/Track.php
 delete mode 100644 featherbb/Helpers/functions.php
 delete mode 100644 featherbb/Helpers/srand.php

diff --git a/extern.php b/extern.php
index e69aa6d4..122992d1 100644
--- a/extern.php
+++ b/extern.php
@@ -57,8 +57,9 @@
 
 namespace FeatherBB;
 use DB;
-use FeatherBB\Utils;
-use FeatherBB\Url;
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Cache;
 
 define('FEATHER_QUIET_VISIT', 1);
 
@@ -227,7 +228,7 @@ function authenticate_user($user, $password, $password_is_hash = false)
 
     if (!isset($feather->user->id) ||
         ($password_is_hash && $password != $feather->user->password) ||
-        (!$password_is_hash && \FeatherBB\Core\Utils::hash($password) != $feather->user->password)) {
+        (!$password_is_hash && \FeatherBB\Core\Random::hash($password) != $feather->user->password)) {
         set_default_user();
     } else {
         $feather->user->is_guest = false;
@@ -484,7 +485,7 @@ function output_html($feed)
         }
 
         if ($feather->forum_settings['o_censoring'] == '1') {
-            $cur_topic['subject'] = censor_words($cur_topic['subject']);
+            $cur_topic['subject'] = Utils::censor($cur_topic['subject']);
         }
 
         // Setup the feed
@@ -624,7 +625,7 @@ function output_html($feed)
 
             foreach ($result as $cur_topic) {
                 if ($feather->forum_settings['o_censoring'] == '1') {
-                    $cur_topic['subject'] = censor_words($cur_topic['subject']);
+                    $cur_topic['subject'] = Utils::censor($cur_topic['subject']);
                 }
 
                 $cur_topic['message'] = parse_message($cur_topic['message'], $cur_topic['hide_smilies']);
@@ -734,7 +735,7 @@ function output_html($feed)
 elseif ($action == 'stats') {
 
     if (!$feather->cache->isCached('users_info')) {
-        $feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
+        $feather->cache->store('users_info', Cache::get_users_info());
     }
 
     $stats = $feather->cache->retrieve('users_info');
diff --git a/featherbb/Controller/Admin/Categories.php b/featherbb/Controller/Admin/Categories.php
index 3e4e8769..738c6803 100644
--- a/featherbb/Controller/Admin/Categories.php
+++ b/featherbb/Controller/Admin/Categories.php
@@ -12,6 +12,7 @@
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
+use FeatherBB\Model\Cache;
 
 class Categories
 {
@@ -62,7 +63,7 @@ public function edit_categories()
         }
 
         // Regenerate the quick jump cache
-        $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
+        $this->feather->cache->store('quickjump', Cache::get_quickjump());
 
         Url::redirect($this->feather->urlFor('adminCategories'), __('Categories updated redirect'));
 
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
index 13f35bc7..7f51062e 100644
--- a/featherbb/Controller/Admin/Forums.php
+++ b/featherbb/Controller/Admin/Forums.php
@@ -12,6 +12,7 @@
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
+use FeatherBB\Model\Cache;
 
 class Forums
 {
@@ -45,7 +46,7 @@ public function add_forum()
 
         if ($fid = $this->model->add_forum($cat_id, __('New forum'))) {
             // Regenerate the quick jump cache
-            $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
+            $this->feather->cache->store('quickjump', Cache::get_quickjump());
 
             Url::redirect($this->feather->urlFor('editForum', array('id' => $fid)), __('Forum added redirect'));
         } else {
@@ -103,7 +104,7 @@ public function edit_forum($forum_id)
                 }
 
                 // Regenerate the quick jump cache
-                $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
+                $this->feather->cache->store('quickjump', Cache::get_quickjump());
 
                 Url::redirect($this->feather->urlFor('editForum', array('id' => $forum_id)), __('Forum updated redirect'));
 
@@ -111,7 +112,7 @@ public function edit_forum($forum_id)
                 $this->model->delete_permissions($forum_id);
 
                 // Regenerate the quick jump cache
-                $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
+                $this->feather->cache->store('quickjump', Cache::get_quickjump());
 
                 Url::redirect($this->feather->urlFor('editForum', array('id' => $forum_id)), __('Perms reverted redirect'));
             }
@@ -137,7 +138,7 @@ public function delete_forum($forum_id)
         if($this->request->isPost()) {
             $this->model->delete_forum($forum_id);
             // Regenerate the quick jump cache
-            $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
+            $this->feather->cache->store('quickjump', Cache::get_quickjump());
 
             Url::redirect($this->feather->urlFor('adminForums'), __('Forum deleted redirect'));
 
@@ -165,7 +166,7 @@ public function edit_positions()
         }
 
         // Regenerate the quick jump cache
-        $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
+        $this->feather->cache->store('quickjump', Cache::get_quickjump());
 
         Url::redirect($this->feather->urlFor('adminForums'), __('Forums updated redirect'));
     }
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
index ef516c06..61ed04e6 100644
--- a/featherbb/Controller/Auth.php
+++ b/featherbb/Controller/Auth.php
@@ -11,6 +11,10 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Random;
+use FeatherBB\Core\Track;
+use FeatherBB\Model\Cache;
+use FeatherBB\Model\Auth as ModelAuth;
 use DB;
 
 class Auth
@@ -33,25 +37,25 @@ public function login()
             $form_password = Utils::trim($this->feather->request->post('req_password'));
             $save_pass = (bool) $this->feather->request->post('save_pass');
 
-            $user = \FeatherBB\Model\Auth::get_user_from_name($form_username);
+            $user = ModelAuth::get_user_from_name($form_username);
 
             if (!empty($user->password)) {
-                $form_password_hash = Utils::hash($form_password); // Will result in a SHA-1 hash
+                $form_password_hash = Random::hash($form_password); // Will result in a SHA-1 hash
                 if ($user->password == $form_password_hash) {
                     if ($user->group_id == FEATHER_UNVERIFIED) {
-                        \FeatherBB\Model\Auth::update_group($user->id, $this->feather->forum_settings['o_default_user_group']);
+                        ModelAuth::update_group($user->id, $this->feather->forum_settings['o_default_user_group']);
                         if (!$this->feather->cache->isCached('users_info')) {
-                            $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
+                            $this->feather->cache->store('users_info', Cache::get_users_info());
                         }
                     }
 
-                    \FeatherBB\Model\Auth::delete_online_by_ip($this->feather->request->getIp());
+                    ModelAuth::delete_online_by_ip($this->feather->request->getIp());
                     // Reset tracked topics
-                    set_tracked_topics(null);
+                    Track::set_tracked_topics(null);
 
                     $expire = ($save_pass) ? $this->feather->now + 1209600 : $this->feather->now + $this->feather->forum_settings['o_timeout_visit'];
                     $expire = $this->feather->hooks->fire('expire_login', $expire);
-                    \FeatherBB\Model\Auth::feather_setcookie($user->id, $form_password_hash, $expire);
+                    ModelAuth::feather_setcookie($user->id, $form_password_hash, $expire);
 
                     Url::redirect($this->feather->urlFor('home'), __('Login redirect'));
                 }
@@ -72,18 +76,18 @@ public function logout($token)
     {
         $token = $this->feather->hooks->fire('logout_start', $token);
 
-        if ($this->feather->user->is_guest || !isset($token) || $token != \FeatherBB\Utils::feather_hash($this->feather->user->id.\FeatherBB\Utils::feather_hash($this->feather->request->getIp()))) {
+        if ($this->feather->user->is_guest || !isset($token) || $token != Random::hash($this->feather->user->id.Random::hash($this->feather->request->getIp()))) {
             Url::redirect($this->feather->urlFor('home'), 'Not logged in');
         }
 
-        \FeatherBB\Model\Auth::delete_online_by_id($this->feather->user->id);
+        ModelAuth::delete_online_by_id($this->feather->user->id);
 
         // Update last_visit (make sure there's something to update it with)
         if (isset($this->feather->user->logged)) {
-            \FeatherBB\Model\Auth::set_last_visit($this->feather->user->id, $this->feather->user->logged);
+            ModelAuth::set_last_visit($this->feather->user->id, $this->feather->user->logged);
         }
 
-        \FeatherBB\Model\Auth::feather_setcookie(1, Utils::hash(uniqid(rand(), true)), time() + 31536000);
+        ModelAuth::feather_setcookie(1, Random::hash(uniqid(rand(), true)), time() + 31536000);
         $this->feather->hooks->fire('logout_end');
 
         Url::redirect($this->feather->urlFor('home'), __('Logout redirect'));
@@ -101,7 +105,7 @@ public function forget()
             if (!$this->feather->email->is_valid_email($email)) {
                 throw new \FeatherBB\Core\Error(__('Invalid email'), 400);
             }
-            $user = \FeatherBB\Model\Auth::get_user_from_email($email);
+            $user = ModelAuth::get_user_from_email($email);
 
             if ($user) {
                 // Load the "activate password" template
@@ -124,10 +128,10 @@ public function forget()
                 }
 
                 // Generate a new password and a new password activation code
-                $new_password = random_pass(12);
-                $new_password_key = random_pass(8);
+                $new_password = Random::pass(12);
+                $new_password_key = Random::pass(8);
 
-                \FeatherBB\Model\Auth::set_new_password($new_password, $new_password_key, $user->id);
+                ModelAuth::set_new_password($new_password, $new_password_key, $user->id);
 
                 // Do the user specific replacements to the template
                 $cur_mail_message = str_replace('<username>', $user->username, $mail_message);
diff --git a/featherbb/Controller/Delete.php b/featherbb/Controller/Delete.php
index 111855d5..c3a02c3e 100644
--- a/featherbb/Controller/Delete.php
+++ b/featherbb/Controller/Delete.php
@@ -28,7 +28,7 @@ public function deletepost($id)
         $cur_post = $this->model->get_info_delete($id);
 
         if ($this->feather->forum_settings['o_censoring'] == '1') {
-            $cur_post['subject'] = censor_words($cur_post['subject']);
+            $cur_post['subject'] = Utils::censor($cur_post['subject']);
         }
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
@@ -46,7 +46,7 @@ public function deletepost($id)
             throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
-        if ($is_admmod && $this->feather->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
+        if ($is_admmod && $this->feather->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], Utils::get_admin_ids())) {
             throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index 53f3dc27..f81b4ce5 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -40,8 +40,8 @@ public function editpost($id)
         $can_edit_subject = $id == $cur_post['first_post_id'];
 
         if ($this->config['o_censoring'] == '1') {
-            $cur_post['subject'] = censor_words($cur_post['subject']);
-            $cur_post['message'] = censor_words($cur_post['message']);
+            $cur_post['subject'] = Utils::censor($cur_post['subject']);
+            $cur_post['message'] = Utils::censor($cur_post['message']);
         }
 
         // Do we have permission to edit this post?
@@ -49,7 +49,7 @@ public function editpost($id)
             throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
-        if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], get_admin_ids())) {
+        if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], Utils::get_admin_ids())) {
             throw new \FeatherBB\Core\Error(__('No permission'), 403);
         }
 
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
index d1990071..c30e73bd 100644
--- a/featherbb/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Random;
 
 class Install
 {
@@ -153,8 +154,8 @@ public function create_config(array $data)
             }
         }
 
-        $config = array_merge($config, array('cookie_name' => mb_strtolower($this->feather->forum_env['FORUM_NAME']).'_cookie_'.random_key(7, false, true),
-                                             'cookie_seed' => random_key(16, false, true)));
+        $config = array_merge($config, array('cookie_name' => mb_strtolower($this->feather->forum_env['FORUM_NAME']).'_cookie_'.Random::key(7, false, true),
+                                             'cookie_seed' => Random::key(16, false, true)));
 
         // ... And write it on disk
         if ($this->write_config($config)) {
diff --git a/featherbb/Controller/Misc.php b/featherbb/Controller/Misc.php
index 7fc61d75..7956f807 100644
--- a/featherbb/Controller/Misc.php
+++ b/featherbb/Controller/Misc.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Track;
 
 class Misc
 {
@@ -39,7 +40,7 @@ public function markread()
         $this->model->update_last_visit();
 
         // Reset tracked topics
-        set_tracked_topics(null);
+        Track::set_tracked_topics(null);
 
         Url::redirect($this->feather->urlFor('home'), __('Mark read redirect'));
     }
@@ -48,7 +49,7 @@ public function markforumread($id)
     {
         $tracked_topics = get_tracked_topics();
         $tracked_topics['forums'][$id] = time();
-        set_tracked_topics($tracked_topics);
+        Track::set_tracked_topics($tracked_topics);
 
         Url::redirect($this->feather->urlFor('Forum', array('id' => $id)), __('Mark forum read redirect'));
     }
@@ -114,7 +115,7 @@ public function report($id)
         $cur_post = $this->model->get_info_report($id);
 
         if ($this->feather->forum_settings['o_censoring'] == '1') {
-            $cur_post['subject'] = censor_words($cur_post['subject']);
+            $cur_post['subject'] = Utils::censor($cur_post['subject']);
         }
 
         $this->feather->template->setPageInfo(array(
diff --git a/featherbb/Controller/Moderate.php b/featherbb/Controller/Moderate.php
index 1578bdfc..5efe0ddd 100644
--- a/featherbb/Controller/Moderate.php
+++ b/featherbb/Controller/Moderate.php
@@ -171,7 +171,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
                 }*/
 
             if ($this->config['o_censoring'] == '1') {
-                $cur_topic['subject'] = censor_words($cur_topic['subject']);
+                $cur_topic['subject'] = Utils::censor($cur_topic['subject']);
             }
 
             $this->feather->template->setPageInfo(array(
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
index ab308d08..70ad0eec 100644
--- a/featherbb/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Model\Delete;
 
 class Profile
 {
@@ -91,8 +92,7 @@ public function display($id, $section = null)
         $user = $this->model->get_user_info($id);
 
         if ($user['signature'] != '') {
-            require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/parser.php';
-            $parsed_signature = parse_signature($user['signature']);
+            $parsed_signature = $this->feather->parser->parse_signature($user['signature']);
         }
 
         // View or edit?
@@ -101,8 +101,7 @@ public function display($id, $section = null)
                 ($this->user->g_id != FEATHER_ADMIN &&                // or we aren't an admin and ...
                 ($this->user->g_mod_edit_users == '0' ||              // mods aren't allowed to edit users
                 $user['g_id'] == FEATHER_ADMIN ||                     // or the user is an admin
-                $user['g_moderator'] == '1')))) {
-            // or the user is another mod
+                $user['g_moderator'] == '1')))) {                     // or the user is another mod
                 $user_info = $this->model->parse_user_info($user);
 
             $this->feather->template->setPageInfo(array(
@@ -112,7 +111,7 @@ public function display($id, $section = null)
                 'id' => $id
             ));
 
-            $this->feather->template->addTemplate('profile/view_profile.php');
+            $this->feather->template->addTemplate('profile/view_profile.php')->display();
         } else {
             if (!$section || $section == 'essentials') {
                 $user_disp = $this->model->edit_essentials($id, $user);
@@ -166,7 +165,7 @@ public function display($id, $section = null)
 
                 $avatar_field = '<span><a href="'.Url::get('user/'.$id.'/action/upload_avatar/').'">'.__('Change avatar').'</a></span>';
 
-                $user_avatar = generate_avatar_markup($id);
+                $user_avatar = Utils::generate_avatar_markup($id);
                 if ($user_avatar) {
                     $avatar_field .= ' <span><a href="'.Url::get('user/'.$id.'/action/delete_avatar/').'">'.__('Delete avatar').'</a></span>';
                 } else {
@@ -308,7 +307,7 @@ public function action($id, $action)
                 throw new \FeatherBB\Core\Error(__('No permission'), 403);
             }
 
-            $this->model->delete_avatar($id);
+            Delete::avatar($id);
 
             Url::redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'personality')), __('Avatar deleted redirect'));
         } elseif ($action == 'promote') {
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index b9d88490..800c763e 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -45,10 +45,6 @@ public function display()
                 // We have results to display
                 if (isset($search['is_result'])) {
 
-                    if ($search['show_as'] == 'posts') {
-                        require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/parser.php';
-                    }
-
                     $this->feather->template->setPageInfo(array(
                         'title' => array(Utils::escape($this->config['o_board_title']), __('Search results')),
                         'active_page' => 'search',
diff --git a/featherbb/Controller/Topic.php b/featherbb/Controller/Topic.php
index e7c17191..7d88b99f 100644
--- a/featherbb/Controller/Topic.php
+++ b/featherbb/Controller/Topic.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Track;
 
 class Topic
 {
@@ -36,7 +37,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         $mods_array = ($cur_topic['moderators'] != '') ? unserialize($cur_topic['moderators']) : array();
         $is_admmod = ($this->feather->user->g_id == FEATHER_ADMIN || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
         if ($is_admmod) {
-            $admin_ids = get_admin_ids();
+            $admin_ids = Utils::get_admin_ids();
         }
 
         // Can we or can we not post replies?
@@ -44,9 +45,9 @@ public function display($id = null, $name = null, $page = null, $pid = null)
 
         // Add/update this topic in our list of tracked topics
         if (!$this->feather->user->is_guest) {
-            $tracked_topics = get_tracked_topics();
+            $tracked_topics = Track::get_tracked_topics();
             $tracked_topics['topics'][$id] = time();
-            set_tracked_topics($tracked_topics);
+            Track::set_tracked_topics($tracked_topics);
         }
 
         // Determine the post offset (based on $_GET['p'])
@@ -62,7 +63,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
         $paging_links = '<span class="pages-label">'.__('Pages').' </span>'.Url::paginate($num_pages, $p, 'topic/'.$id.'/'.$url_topic.'/#');
 
         if ($this->feather->forum_settings['o_censoring'] == '1') {
-            $cur_topic['subject'] = censor_words($cur_topic['subject']);
+            $cur_topic['subject'] = Utils::censor($cur_topic['subject']);
         }
 
         $quickpost = $this->model->is_quickpost($cur_topic['post_replies'], $cur_topic['closed'], $is_admmod);
diff --git a/featherbb/Core/Parser.php b/featherbb/Core/Parser.php
index 89bcedab..c3cb7dbf 100644
--- a/featherbb/Core/Parser.php
+++ b/featherbb/Core/Parser.php
@@ -70,7 +70,7 @@ public function parse_bbcode(&$text, $hide_smilies = 0)
     {
         if ($this->feather->config['o_censoring'] === '1')
         {
-            $text = censor_words($text);
+            $text = Utils::censor($text);
         }
         // Convert [&<>] characters to HTML entities (but preserve [""''] quotes).
         $text = htmlspecialchars($text, ENT_NOQUOTES);
diff --git a/featherbb/Core/Random.php b/featherbb/Core/Random.php
new file mode 100644
index 00000000..6a097e83
--- /dev/null
+++ b/featherbb/Core/Random.php
@@ -0,0 +1,200 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace FeatherBB\Core;
+
+class Random
+{
+    //
+    // Compute a hash of $str
+    //
+    public static function hash($str)
+    {
+        return sha1($str);
+    }
+
+    //
+    // Generate a random key of length $len
+    //
+    public static function key($len, $readable = false, $hash = false)
+    {
+        $key = self::secure_random_bytes($len);
+
+        if ($hash) {
+            return substr(bin2hex($key), 0, $len);
+        } elseif ($readable) {
+            $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+
+            $result = '';
+            for ($i = 0; $i < $len; ++$i) {
+                $result .= substr($chars, (ord($key[$i]) % strlen($chars)), 1);
+            }
+
+            return $result;
+        }
+
+        return $key;
+    }
+
+    //
+    // Generate a random password of length $len
+    // Compatibility wrapper for random_key
+    //
+    public static function pass($len)
+    {
+        return self::key($len, true);
+    }
+
+    /*
+     * Author:
+     * George Argyros <argyros.george@gmail.com>
+     *
+     * Copyright (c) 2012, George Argyros
+     * All rights reserved.
+     *
+     * Redistribution and use in source and binary forms, with or without
+     * modification, are permitted provided that the following conditions are met:
+     *    * Redistributions of source code must retain the above copyright
+     *      notice, this list of conditions and the following disclaimer.
+     *    * Redistributions in binary form must reproduce the above copyright
+     *      notice, this list of conditions and the following disclaimer in the
+     *      documentation and/or other materials provided with the distribution.
+     *    * Neither the name of the <organization> nor the
+     *      names of its contributors may be used to endorse or promote products
+     *      derived from this software without specific prior written permission.
+     *
+     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+     * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+     * DISCLAIMED. IN NO EVENT SHALL GEORGE ARGYROS BE LIABLE FOR ANY
+     * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+     * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+     * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+     * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+     * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+     * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     *
+     *
+     *
+     * The function is providing, at least at the systems tested :),
+     * $len bytes of entropy under any PHP installation or operating system.
+     * The execution time should be at most 10-20 ms in any system.
+     */
+    public static function secure_random_bytes($len = 10)
+    {
+        /*
+         * Our primary choice for a cryptographic strong randomness function is
+         * openssl_random_pseudo_bytes.
+         */
+        $SSLstr = '4'; // http://xkcd.com/221/
+        if (function_exists('openssl_random_pseudo_bytes') &&
+            (version_compare(PHP_VERSION, '5.3.4') >= 0 ||
+                substr(PHP_OS, 0, 3) !== 'WIN'))
+        {
+            $SSLstr = openssl_random_pseudo_bytes($len, $strong);
+            if ($strong) {
+                return $SSLstr;
+            }
+        }
+
+        /*
+         * If mcrypt extension is available then we use it to gather entropy from
+         * the operating system's PRNG. This is better than reading /dev/urandom
+         * directly since it avoids reading larger blocks of data than needed.
+         * Older versions of mcrypt_create_iv may be broken or take too much time
+         * to finish so we only use this function with PHP 5.3.7 and above.
+         * @see https://bugs.php.net/bug.php?id=55169
+         */
+        if (function_exists('mcrypt_create_iv') &&
+            (version_compare(PHP_VERSION, '5.3.7') >= 0 ||
+                substr(PHP_OS, 0, 3) !== 'WIN')) {
+            $str = mcrypt_create_iv($len, MCRYPT_DEV_URANDOM);
+            if ($str !== false) {
+                return $str;
+            }
+        }
+
+
+        /*
+         * No build-in crypto randomness function found. We collect any entropy
+         * available in the PHP core PRNGs along with some filesystem info and memory
+         * stats. To make this data cryptographically strong we add data either from
+         * /dev/urandom or if its unavailable, we gather entropy by measuring the
+         * time needed to compute a number of SHA-1 hashes.
+         */
+        $str = '';
+        $bits_per_round = 2; // bits of entropy collected in each clock drift round
+        $msec_per_round = 400; // expected running time of each round in microseconds
+        $hash_len = 20; // SHA-1 Hash length
+        $total = $len; // total bytes of entropy to collect
+
+        $handle = @fopen('/dev/urandom', 'rb');
+        if ($handle && function_exists('stream_set_read_buffer')) {
+            @stream_set_read_buffer($handle, 0);
+        }
+
+        do
+        {
+            $bytes = ($total > $hash_len)? $hash_len : $total;
+            $total -= $bytes;
+
+            //collect any entropy available from the PHP system and filesystem
+            $entropy = rand() . uniqid(mt_rand(), true) . $SSLstr;
+            $entropy .= implode('', @fstat(@fopen( __FILE__, 'r')));
+            $entropy .= memory_get_usage() . getmypid();
+            $entropy .= serialize($_ENV) . serialize($_SERVER);
+            if (function_exists('posix_times')) {
+                $entropy .= serialize(posix_times());
+            }
+            if (function_exists('zend_thread_id')) {
+                $entropy .= zend_thread_id();
+            }
+            if ($handle) {
+                $entropy .= @fread($handle, $bytes);
+            } else  {
+                // Measure the time that the operations will take on average
+                for ($i = 0; $i < 3; $i++)
+                {
+                    $c1 = microtime(true);
+                    $var = sha1(mt_rand());
+                    for ($j = 0; $j < 50; $j++) {
+                        $var = sha1($var);
+                    }
+                    $c2 = microtime(true);
+                    $entropy .= $c1 . $c2;
+                }
+
+                // Based on the above measurement determine the total rounds
+                // in order to bound the total running time.
+                $rounds = (int) ($msec_per_round * 50 / (int) (($c2 - $c1) * 1000000));
+
+                // Take the additional measurements. On average we can expect
+                // at least $bits_per_round bits of entropy from each measurement.
+                $iter = $bytes * (int) (ceil(8 / $bits_per_round));
+                for ($i = 0; $i < $iter; $i++) {
+                    $c1 = microtime();
+                    $var = sha1(mt_rand());
+                    for ($j = 0; $j < $rounds; $j++) {
+                        $var = sha1($var);
+                    }
+                    $c2 = microtime();
+                    $entropy .= $c1 . $c2;
+                }
+
+            }
+            // We assume sha1 is a deterministic extractor for the $entropy variable.
+            $str .= sha1($entropy, true);
+        } while ($len > strlen($str));
+
+        if ($handle) {
+            @fclose($handle);
+        }
+        return substr($str, 0, $len);
+    }
+}
\ No newline at end of file
diff --git a/featherbb/Core/Search.php b/featherbb/Core/Search.php
index 3035f890..4083c4c2 100644
--- a/featherbb/Core/Search.php
+++ b/featherbb/Core/Search.php
@@ -12,6 +12,8 @@
 
 namespace FeatherBB\Core;
 
+use FeatherBB\Model\Cache;
+
 use DB;
 
 class Search
@@ -94,7 +96,7 @@ public function validate_search_word($word, $idx)
 
         if (!isset($stopwords)) {
             if (!$this->feather->cache->isCached('stopwords')) {
-                $this->feather->cache->store('stopwords', \FeatherBB\Model\Cache::get_config(), '+1 week');
+                $this->feather->cache->store('stopwords', Cache::get_config(), '+1 week');
             }
             $stopwords = $this->feather->cache->retrieve('stopwords');
         }
diff --git a/featherbb/Core/Track.php b/featherbb/Core/Track.php
new file mode 100644
index 00000000..f8f68b8f
--- /dev/null
+++ b/featherbb/Core/Track.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace FeatherBB\Core;
+
+class Track
+{
+    //
+    // Save array of tracked topics in cookie
+    //
+    public static function set_tracked_topics($tracked_topics = null)
+    {
+        global $cookie_name;
+
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+
+        if (!empty($tracked_topics)) {
+            // Sort the arrays (latest read first)
+            arsort($tracked_topics['topics'], SORT_NUMERIC);
+            arsort($tracked_topics['forums'], SORT_NUMERIC);
+        } else {
+            $tracked_topics = array('topics' => array(), 'forums' => array());
+        }
+
+        return $feather->setCookie($cookie_name . '_track', json_encode($tracked_topics), time() + $feather->config['o_timeout_visit']);
+    }
+
+
+    //
+    // Extract array of tracked topics from cookie
+    //
+    public static function get_tracked_topics()
+    {
+        global $cookie_name;
+
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+
+        $cookie_raw = $feather->getCookie($cookie_name.'_track');
+
+        if (isset($cookie_raw)) {
+            $cookie_data = json_decode($cookie_raw, true);
+            return $cookie_data;
+        }
+        return array('topics' => array(), 'forums' => array());
+    }
+}
\ No newline at end of file
diff --git a/featherbb/Core/Utils.php b/featherbb/Core/Utils.php
index 84371167..a4a064c8 100644
--- a/featherbb/Core/Utils.php
+++ b/featherbb/Core/Utils.php
@@ -9,6 +9,8 @@
 
 namespace FeatherBB\Core;
 
+use FeatherBB\Model\Cache;
+
 class Utils
 {
     public function __construct()
@@ -176,15 +178,6 @@ public static function ucp_preg_replace($pattern, $replace, $subject, $callback
         return $replaced;
     }
 
-
-    //
-    // Compute a hash of $str
-    //
-    public static function hash($str)
-    {
-        return sha1($str);
-    }
-
     //
     // Converts the file size in bytes to a human readable file size
     //
@@ -218,4 +211,107 @@ public static function generate_page_title($page_title, $p = null)
 
         return $crumbs;
     }
+
+    //
+    // Determines the correct title for $user
+    // $user must contain the elements 'username', 'title', 'posts', 'g_id' and 'g_user_title'
+    //
+    public static function get_title($user)
+    {
+        global $feather_bans;
+        static $ban_list;
+
+        // If not already built in a previous call, build an array of lowercase banned usernames
+        if (empty($ban_list)) {
+            $ban_list = array();
+            foreach ($feather_bans as $cur_ban) {
+                $ban_list[] = utf8_strtolower($cur_ban['username']);
+            }
+        }
+
+        // If the user has a custom title
+        if ($user['title'] != '') {
+            $user_title = self::escape($user['title']);
+        }
+        // If the user is banned
+        elseif (in_array(utf8_strtolower($user['username']), $ban_list)) {
+            $user_title = __('Banned');
+        }
+        // If the user group has a default user title
+        elseif ($user['g_user_title'] != '') {
+            $user_title = self::escape($user['g_user_title']);
+        }
+        // If the user is a guest
+        elseif ($user['g_id'] == FEATHER_GUEST) {
+            $user_title = __('Guest');
+        }
+        // If nothing else helps, we assign the default
+        else {
+            $user_title = __('Member');
+        }
+
+        return $user_title;
+    }
+
+    //
+    // Replace censored words in $text
+    //
+    public static function censor($text)
+    {
+        static $search_for, $replace_with;
+
+        $feather = \Slim\Slim::getInstance();
+
+        if (!$feather->cache->isCached('search_for')) {
+            $feather->cache->store('search_for', Cache::get_censoring('search_for'));
+            $search_for = $feather->cache->retrieve('search_for');
+        }
+
+        if (!$feather->cache->isCached('replace_with')) {
+            $feather->cache->store('replace_with', Cache::get_censoring('replace_with'));
+            $replace_with = $feather->cache->retrieve('replace_with');
+        }
+
+        if (!empty($search_for) && !empty($replace_with)) {
+            return substr(self::ucp_preg_replace($search_for, $replace_with, ' '.$text.' '), 1, -1);
+        } else {
+            return $text;
+        }
+    }
+
+    //
+    // Fetch admin IDs
+    //
+    public static function get_admin_ids()
+    {
+        // Get Slim current session
+        $feather = \Slim\Slim::getInstance();
+        if (!$feather->cache->isCached('admin_ids')) {
+            $feather->cache->store('admin_ids', Cache::get_admin_ids());
+        }
+
+        return $feather->cache->retrieve('admin_ids');
+    }
+
+    //
+    // Outputs markup to display a user's avatar
+    //
+    public static function generate_avatar_markup($user_id)
+    {
+        $feather = \Slim\Slim::getInstance();
+
+        $filetypes = array('jpg', 'gif', 'png');
+        $avatar_markup = '';
+
+        foreach ($filetypes as $cur_type) {
+            $path = $feather->config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type;
+
+            if (file_exists($feather->forum_env['FEATHER_ROOT'].$path) && $img_size = getimagesize($feather->forum_env['FEATHER_ROOT'].$path)) {
+                $avatar_markup = '<img src="'.\FeatherBB\Core\Utils::escape($feather->url->base(true).'/'.$path.'?m='.filemtime($feather->forum_env['FEATHER_ROOT'].$path)).'" '.$img_size[3].' alt="" />';
+                break;
+            }
+        }
+
+        return $avatar_markup;
+    }
 }
diff --git a/featherbb/Helpers/functions.php b/featherbb/Helpers/functions.php
deleted file mode 100644
index 37c066f2..00000000
--- a/featherbb/Helpers/functions.php
+++ /dev/null
@@ -1,388 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-
-//
-// Fetch admin IDs
-//
-function get_admin_ids()
-{
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-    if (!$feather->cache->isCached('admin_ids')) {
-        $feather->cache->store('admin_ids', \FeatherBB\Model\Cache::get_admin_ids());
-    }
-
-    return $feather->cache->retrieve('admin_ids');
-}
-
-
-//
-// Outputs markup to display a user's avatar
-//
-function generate_avatar_markup($user_id)
-{
-    $feather = \Slim\Slim::getInstance();
-
-    $filetypes = array('jpg', 'gif', 'png');
-    $avatar_markup = '';
-
-    foreach ($filetypes as $cur_type) {
-        $path = $feather->config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type;
-
-        if (file_exists($feather->forum_env['FEATHER_ROOT'].$path) && $img_size = getimagesize($feather->forum_env['FEATHER_ROOT'].$path)) {
-            $avatar_markup = '<img src="'.\FeatherBB\Core\Utils::escape($feather->url->base(true).'/'.$path.'?m='.filemtime($feather->forum_env['FEATHER_ROOT'].$path)).'" '.$img_size[3].' alt="" />';
-            break;
-        }
-    }
-
-    return $avatar_markup;
-}
-
-
-//
-// Save array of tracked topics in cookie
-//
-function set_tracked_topics($tracked_topics = null)
-{
-    global $cookie_name;
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    if (!empty($tracked_topics)) {
-        // Sort the arrays (latest read first)
-        arsort($tracked_topics['topics'], SORT_NUMERIC);
-        arsort($tracked_topics['forums'], SORT_NUMERIC);
-    } else {
-        $tracked_topics = array('topics' => array(), 'forums' => array());
-    }
-
-    return $feather->setCookie($cookie_name . '_track', json_encode($tracked_topics), time() + $feather->config['o_timeout_visit']);
-}
-
-
-//
-// Extract array of tracked topics from cookie
-//
-function get_tracked_topics()
-{
-    global $cookie_name;
-
-    // Get Slim current session
-    $feather = \Slim\Slim::getInstance();
-
-    $cookie_raw = $feather->getCookie($cookie_name.'_track');
-
-    if (isset($cookie_raw)) {
-        $cookie_data = json_decode($cookie_raw, true);
-        return $cookie_data;
-    }
-    return array('topics' => array(), 'forums' => array());
-}
-
-
-//
-// Update posts, topics, last_post, last_post_id and last_poster for a forum
-//
-function update_forum($forum_id)
-{
-    $stats_query = \DB::for_table('topics')
-                    ->where('forum_id', $forum_id)
-                    ->select_expr('COUNT(id)', 'total_topics')
-                    ->select_expr('SUM(num_replies)', 'total_replies')
-                    ->find_one();
-
-    $num_topics = intval($stats_query['total_topics']);
-    $num_replies = intval($stats_query['total_replies']);
-
-    $num_posts = $num_replies + $num_topics; // $num_posts is only the sum of all replies (we have to add the topic posts)
-
-    $select_update_forum = array('last_post', 'last_post_id', 'last_poster');
-
-    $result = \DB::for_table('topics')->select_many($select_update_forum)
-        ->where('forum_id', $forum_id)
-        ->where_null('moved_to')
-        ->order_by_desc('last_post')
-        ->find_one();
-
-    if ($result) {
-        // There are topics in the forum
-        $insert_update_forum = array(
-            'num_topics' => $num_topics,
-            'num_posts'  => $num_posts,
-            'last_post'  => $result['last_post'],
-            'last_post_id'  => $result['last_post_id'],
-            'last_poster'  => $result['last_poster'],
-        );
-    } else {
-        // There are no topics
-        $insert_update_forum = array(
-            'num_topics' => $num_topics,
-            'num_posts'  => $num_posts,
-            'last_post'  => 'NULL',
-            'last_post_id'  => 'NULL',
-            'last_poster'  => 'NULL',
-        );
-    }
-        \DB::for_table('forums')
-            ->where('id', $forum_id)
-            ->find_one()
-            ->set($insert_update_forum)
-            ->save();
-}
-
-
-//
-// Deletes any avatars owned by the specified user ID
-//
-function delete_avatar($user_id)
-{
-    $feather = \Slim\Slim::getInstance();
-
-    $filetypes = array('jpg', 'gif', 'png');
-
-    // Delete user avatar
-    foreach ($filetypes as $cur_type) {
-        if (file_exists($feather->forum_env['FEATHER_ROOT'].$feather->config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type)) {
-            @unlink($feather->forum_env['FEATHER_ROOT'].$feather->config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type);
-        }
-    }
-}
-
-
-//
-// Delete a topic and all of its posts
-//
-function delete_topic($topic_id)
-{
-    // Delete the topic and any redirect topics
-    $where_delete_topic = array(
-            array('id' => $topic_id),
-            array('moved_to' => $topic_id)
-        );
-
-    \DB::for_table('topics')
-        ->where_any_is($where_delete_topic)
-        ->delete_many();
-
-    // Delete posts in topic
-    \DB::for_table('posts')
-        ->where('topic_id', $topic_id)
-        ->delete_many();
-
-    // Delete any subscriptions for this topic
-    \DB::for_table('topic_subscriptions')
-        ->where('topic_id', $topic_id)
-        ->delete_many();
-}
-
-
-//
-// Delete a single post
-//
-function delete_post($post_id, $topic_id)
-{
-    $result = \DB::for_table('posts')
-                  ->select_many('id', 'poster', 'posted')
-                  ->where('topic_id', $topic_id)
-                  ->order_by_desc('id')
-                  ->limit(2)
-                  ->find_many();
-
-    $i = 0;
-    foreach ($result as $cur_result) {
-        if ($i == 0) {
-            $last_id = $cur_result['id'];
-        }
-        else {
-            $second_last_id = $cur_result['id'];
-            $second_poster = $cur_result['poster'];
-            $second_posted = $cur_result['posted'];
-        }
-        ++$i;
-   }
-
-    // Delete the post
-    \DB::for_table('posts')
-        ->where('id', $post_id)
-        ->find_one()
-        ->delete();
-
-    $search = new \FeatherBB\Core\Search();
-
-    $search->strip_search_index($post_id);
-
-    // Count number of replies in the topic
-    $num_replies = \DB::for_table('posts')->where('topic_id', $topic_id)->count() - 1;
-
-    // If the message we deleted is the most recent in the topic (at the end of the topic)
-    if ($last_id == $post_id) {
-        // If there is a $second_last_id there is more than 1 reply to the topic
-        if (isset($second_last_id)) {
-             $update_topic = array(
-                'last_post'  => $second_posted,
-                'last_post_id'  => $second_last_id,
-                'last_poster'  => $second_poster,
-                'num_replies'  => $num_replies,
-            );
-            \DB::for_table('topics')
-                ->where('id', $topic_id)
-                ->find_one()
-                ->set($update_topic)
-                ->save();
-        } else {
-            // We deleted the only reply, so now last_post/last_post_id/last_poster is posted/id/poster from the topic itself
-            \DB::for_table('topics')
-                ->where('id', $topic_id)
-                ->find_one()
-                ->set_expr('last_post', 'posted')
-                ->set_expr('last_post_id', 'id')
-                ->set_expr('last_poster', 'poster')
-                ->set('num_replies', $num_replies)
-                ->save();
-        }
-    } else {
-        // Otherwise we just decrement the reply counter
-        \DB::for_table('topics')
-            ->where('id', $topic_id)
-            ->find_one()
-            ->set('num_replies', $num_replies)
-            ->save();
-    }
-}
-
-
-//
-// Replace censored words in $text
-//
-function censor_words($text)
-{
-    static $search_for, $replace_with;
-
-    $feather = \Slim\Slim::getInstance();
-
-    if (!$feather->cache->isCached('search_for')) {
-        $feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
-        $search_for = $feather->cache->retrieve('search_for');
-    }
-
-    if (!$feather->cache->isCached('replace_with')) {
-        $feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
-        $replace_with = $feather->cache->retrieve('replace_with');
-    }
-
-    if (!empty($search_for) && !empty($replace_with)) {
-        return substr(\FeatherBB\Core\Utils::ucp_preg_replace($search_for, $replace_with, ' '.$text.' '), 1, -1);
-    } else {
-        return $text;
-    }
-}
-
-
-//
-// Determines the correct title for $user
-// $user must contain the elements 'username', 'title', 'posts', 'g_id' and 'g_user_title'
-//
-function get_title($user)
-{
-    global $feather_bans;
-    static $ban_list;
-
-    // If not already built in a previous call, build an array of lowercase banned usernames
-    if (empty($ban_list)) {
-        $ban_list = array();
-        foreach ($feather_bans as $cur_ban) {
-            $ban_list[] = utf8_strtolower($cur_ban['username']);
-        }
-    }
-
-    // If the user has a custom title
-    if ($user['title'] != '') {
-        $user_title = \FeatherBB\Core\Utils::escape($user['title']);
-    }
-    // If the user is banned
-    elseif (in_array(utf8_strtolower($user['username']), $ban_list)) {
-        $user_title = __('Banned');
-    }
-    // If the user group has a default user title
-    elseif ($user['g_user_title'] != '') {
-        $user_title = \FeatherBB\Core\Utils::escape($user['g_user_title']);
-    }
-    // If the user is a guest
-    elseif ($user['g_id'] == FEATHER_GUEST) {
-        $user_title = __('Guest');
-    }
-    // If nothing else helps, we assign the default
-    else {
-        $user_title = __('Member');
-    }
-
-    return $user_title;
-}
-
-
-//
-// Generate a random key of length $len
-//
-function random_key($len, $readable = false, $hash = false)
-{
-    $feather = \Slim\Slim::getInstance();
-    if (!function_exists('secure_random_bytes')) {
-        include $feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/srand.php';
-    }
-
-    $key = secure_random_bytes($len);
-
-    if ($hash) {
-        return substr(bin2hex($key), 0, $len);
-    } elseif ($readable) {
-        $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-
-        $result = '';
-        for ($i = 0; $i < $len; ++$i) {
-            $result .= substr($chars, (ord($key[$i]) % strlen($chars)), 1);
-        }
-
-        return $result;
-    }
-
-    return $key;
-}
-
-//
-// Generate a random password of length $len
-// Compatibility wrapper for random_key
-//
-function random_pass($len)
-{
-    return random_key($len, true);
-}
-
-
-//
-// Generate a cache ID based on the last modification time for all stopwords files
-//
-function generate_stopwords_cache_id()
-{
-    $feather = \Slim\Slim::getInstance();
-    $files = glob($feather->forum_env['FEATHER_ROOT'].'featherbb/lang/*/stopwords.txt');
-    if ($files === false) {
-        return 'cache_id_error';
-    }
-
-    $hash = array();
-
-    foreach ($files as $file) {
-        $hash[] = $file;
-        $hash[] = filemtime($file);
-    }
-
-    return sha1(implode('|', $hash));
-}
diff --git a/featherbb/Helpers/srand.php b/featherbb/Helpers/srand.php
deleted file mode 100644
index 82dc007a..00000000
--- a/featherbb/Helpers/srand.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-/*
- * Author:
- * George Argyros <argyros.george@gmail.com>
- *
- * Copyright (c) 2012, George Argyros
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of the <organization> nor the
- *      names of its contributors may be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL GEORGE ARGYROS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- *
- * The function is providing, at least at the systems tested :),
- * $len bytes of entropy under any PHP installation or operating system.
- * The execution time should be at most 10-20 ms in any system.
- */
-function secure_random_bytes($len = 10)
-{
-
-   /*
-    * Our primary choice for a cryptographic strong randomness function is
-    * openssl_random_pseudo_bytes.
-    */
-   $SSLstr = '4'; // http://xkcd.com/221/
-   if (function_exists('openssl_random_pseudo_bytes') &&
-       (version_compare(PHP_VERSION, '5.3.4') >= 0 ||
-	substr(PHP_OS, 0, 3) !== 'WIN'))
-   {
-      $SSLstr = openssl_random_pseudo_bytes($len, $strong);
-      if ($strong) {
-         return $SSLstr;
-      }
-   }
-
-   /*
-    * If mcrypt extension is available then we use it to gather entropy from
-    * the operating system's PRNG. This is better than reading /dev/urandom
-    * directly since it avoids reading larger blocks of data than needed.
-    * Older versions of mcrypt_create_iv may be broken or take too much time
-    * to finish so we only use this function with PHP 5.3.7 and above.
-    * @see https://bugs.php.net/bug.php?id=55169
-    */
-   if (function_exists('mcrypt_create_iv') &&
-      (version_compare(PHP_VERSION, '5.3.7') >= 0 ||
-       substr(PHP_OS, 0, 3) !== 'WIN')) {
-      $str = mcrypt_create_iv($len, MCRYPT_DEV_URANDOM);
-      if ($str !== false) {
-         return $str;
-      }
-   }
-
-
-   /*
-    * No build-in crypto randomness function found. We collect any entropy
-    * available in the PHP core PRNGs along with some filesystem info and memory
-    * stats. To make this data cryptographically strong we add data either from
-    * /dev/urandom or if its unavailable, we gather entropy by measuring the
-    * time needed to compute a number of SHA-1 hashes.
-    */
-   $str = '';
-   $bits_per_round = 2; // bits of entropy collected in each clock drift round
-   $msec_per_round = 400; // expected running time of each round in microseconds
-   $hash_len = 20; // SHA-1 Hash length
-   $total = $len; // total bytes of entropy to collect
-
-   $handle = @fopen('/dev/urandom', 'rb');
-   if ($handle && function_exists('stream_set_read_buffer')) {
-      @stream_set_read_buffer($handle, 0);
-   }
-
-   do
-   {
-      $bytes = ($total > $hash_len)? $hash_len : $total;
-      $total -= $bytes;
-
-      //collect any entropy available from the PHP system and filesystem
-      $entropy = rand() . uniqid(mt_rand(), true) . $SSLstr;
-      $entropy .= implode('', @fstat(@fopen( __FILE__, 'r')));
-      $entropy .= memory_get_usage() . getmypid();
-      $entropy .= serialize($_ENV) . serialize($_SERVER);
-      if (function_exists('posix_times')) {
-        $entropy .= serialize(posix_times());
-      }
-      if (function_exists('zend_thread_id')) {
-        $entropy .= zend_thread_id();
-      }
-      if ($handle) {
-         $entropy .= @fread($handle, $bytes);
-      } else  {
-         // Measure the time that the operations will take on average
-         for ($i = 0; $i < 3; $i++)
-         {
-            $c1 = microtime(true);
-            $var = sha1(mt_rand());
-            for ($j = 0; $j < 50; $j++) {
-               $var = sha1($var);
-            }
-            $c2 = microtime(true);
-    	    $entropy .= $c1 . $c2;
-         }
-
-         // Based on the above measurement determine the total rounds
-         // in order to bound the total running time.
-         $rounds = (int) ($msec_per_round * 50 / (int) (($c2 - $c1) * 1000000));
-
-         // Take the additional measurements. On average we can expect
-         // at least $bits_per_round bits of entropy from each measurement.
-         $iter = $bytes * (int) (ceil(8 / $bits_per_round));
-         for ($i = 0; $i < $iter; $i++) {
-            $c1 = microtime();
-            $var = sha1(mt_rand());
-            for ($j = 0; $j < $rounds; $j++) {
-               $var = sha1($var);
-            }
-            $c2 = microtime();
-            $entropy .= $c1 . $c2;
-         }
-
-      }
-      // We assume sha1 is a deterministic extractor for the $entropy variable.
-      $str .= sha1($entropy, true);
-   } while ($len > strlen($str));
-
-   if ($handle) {
-      @fclose($handle);
-   }
-   return substr($str, 0, $len);
-}
diff --git a/featherbb/Middleware/Auth.php b/featherbb/Middleware/Auth.php
index 709c9973..e1a21546 100644
--- a/featherbb/Middleware/Auth.php
+++ b/featherbb/Middleware/Auth.php
@@ -14,7 +14,9 @@
 namespace FeatherBB\Middleware;
 
 use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
+use FeatherBB\Core\Random;
+use FeatherBB\Core\Track;
+use FeatherBB\Model\Cache;
 use DB;
 
 class Auth extends \Slim\Middleware
@@ -66,7 +68,7 @@ public function update_online()
                 }
 
                 // Reset tracked topics
-                set_tracked_topics(null);
+                Track::set_tracked_topics(null);
 
             } else {
                 // Special case: We've timed out, but no other user has browsed the forums since we timed out
@@ -85,7 +87,7 @@ public function update_online()
                 // Update tracked topics with the current expire time
                 $cookie_tracked_topics = $this->app->getCookie($this->app->forum_settings['cookie_name'].'_track');
                 if (isset($cookie_tracked_topics)) {
-                    set_tracked_topics(json_decode($cookie_tracked_topics, true));
+                    Track::set_tracked_topics(json_decode($cookie_tracked_topics, true));
                 }
             }
         } else {
@@ -186,7 +188,7 @@ public function check_bans()
 
         // If we removed any expired bans during our run-through, we need to regenerate the bans cache
         if ($bans_altered) {
-            $this->app->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
+            $this->app->cache->store('bans', Cache::get_bans());
         }
     }
 
@@ -267,14 +269,14 @@ public function call()
                      ->update_many('logged', time());
             }
 
-            $this->model->feather_setcookie(1, \FeatherBB\Core\Utils::hash(uniqid(rand(), true)), $this->app->now + 31536000);
+            $this->model->feather_setcookie(1, Random::hash(uniqid(rand(), true)), $this->app->now + 31536000);
         }
 
         load_textdomain('featherbb', $this->app->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->app->user->language.'/common.mo');
 
         // Load bans from cache
         if (!$this->app->cache->isCached('bans')) {
-            $this->app->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
+            $this->app->cache->store('bans', Cache::get_bans());
         }
         $feather_bans = $this->app->cache->retrieve('bans');
 
diff --git a/featherbb/Middleware/Core.php b/featherbb/Middleware/Core.php
index 8d37afa2..4901545d 100644
--- a/featherbb/Middleware/Core.php
+++ b/featherbb/Middleware/Core.php
@@ -44,7 +44,6 @@ public function __construct(array $data)
 
         // Load files
         require $this->forum_env['FEATHER_ROOT'].'featherbb/Helpers/utf8/utf8.php';
-        require $this->forum_env['FEATHER_ROOT'].'featherbb/Helpers/functions.php';
         require $this->forum_env['FEATHER_ROOT'].'featherbb/Helpers/l10n.php';
 
         // Force POSIX locale (to prevent functions such as strtolower() from messing up UTF-8 strings)
diff --git a/featherbb/Model/Admin/Bans.php b/featherbb/Model/Admin/Bans.php
index d3773bf2..eae0135a 100644
--- a/featherbb/Model/Admin/Bans.php
+++ b/featherbb/Model/Admin/Bans.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Model\Cache;
 use DB;
 
 class Bans
@@ -276,7 +277,7 @@ public function insert_ban()
         }
 
         // Regenerate the bans cache
-        $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
+        $this->feather->cache->store('bans', Cache::get_bans());
 
         Url::redirect($this->feather->urlFor('adminBans'), __('Ban edited redirect'));
     }
@@ -291,7 +292,7 @@ public function remove_ban($ban_id)
         $result = $result->delete();
 
         // Regenerate the bans cache
-        $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
+        $this->feather->cache->store('bans', Cache::get_bans());
 
         Url::redirect($this->feather->urlFor('adminBans'), __('Ban removed redirect'));
     }
diff --git a/featherbb/Model/Admin/Censoring.php b/featherbb/Model/Admin/Censoring.php
index 3d081080..0da405f2 100644
--- a/featherbb/Model/Admin/Censoring.php
+++ b/featherbb/Model/Admin/Censoring.php
@@ -12,6 +12,7 @@
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
+use FeatherBB\Model\Cache;
 
 class Censoring
 {
@@ -45,8 +46,8 @@ public function add_word()
             ->save();
 
         // Regenerate the censoring cache
-        $this->feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
-        $this->feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
+        $this->feather->cache->store('search_for', Cache::get_censoring('search_for'));
+        $this->feather->cache->store('replace_with', Cache::get_censoring('replace_with'));
 
         Url::redirect($this->feather->urlFor('adminCensoring'), __('Word added redirect'));
     }
@@ -73,8 +74,8 @@ public function update_word()
             ->save();
 
         // Regenerate the censoring cache
-        $this->feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
-        $this->feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
+        $this->feather->cache->store('search_for', Cache::get_censoring('search_for'));
+        $this->feather->cache->store('replace_with', Cache::get_censoring('replace_with'));
 
         Url::redirect($this->feather->urlFor('adminCensoring'), __('Word updated redirect'));
     }
@@ -89,8 +90,8 @@ public function remove_word()
         $result = $result->delete();
 
         // Regenerate the censoring cache
-        $this->feather->cache->store('search_for', \FeatherBB\Model\Cache::get_censoring('search_for'));
-        $this->feather->cache->store('replace_with', \FeatherBB\Model\Cache::get_censoring('replace_with'));
+        $this->feather->cache->store('search_for', Cache::get_censoring('search_for'));
+        $this->feather->cache->store('replace_with', Cache::get_censoring('replace_with'));
 
         Url::redirect($this->feather->urlFor('adminCensoring'),  __('Word removed redirect'));
     }
diff --git a/featherbb/Model/Admin/Groups.php b/featherbb/Model/Admin/Groups.php
index 08959620..52f66528 100644
--- a/featherbb/Model/Admin/Groups.php
+++ b/featherbb/Model/Admin/Groups.php
@@ -12,6 +12,7 @@
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
+use FeatherBB\Model\Cache;
 
 class Groups
 {
@@ -257,7 +258,7 @@ public function add_edit_group($groups)
         $group_id = $this->hook->fire('add_edit_group.group_id', $group_id);
 
         // Regenerate the quick jump cache
-        $this->feather->cache->store('quickjump', \FeatherBB\Model\Cache::get_quickjump());
+        $this->feather->cache->store('quickjump', Cache::get_quickjump());
 
         if ($this->request->post('mode') == 'edit') {
             Url::redirect($this->feather->urlFor('adminGroups'), __('Group edited redirect'));
@@ -285,7 +286,7 @@ public function set_default_group($groups)
                                                    ->update_many('conf_value', $group_id);
 
         // Regenerate the config cache
-        $this->feather->cache->store('config', \FeatherBB\Model\Cache::get_config());
+        $this->feather->cache->store('config', Cache::get_config());
 
         Url::redirect($this->feather->urlFor('adminGroups'), __('Default group redirect'));
     }
diff --git a/featherbb/Model/Admin/Maintenance.php b/featherbb/Model/Admin/Maintenance.php
index 50bb0040..8b1e35f4 100644
--- a/featherbb/Model/Admin/Maintenance.php
+++ b/featherbb/Model/Admin/Maintenance.php
@@ -183,13 +183,13 @@ public function prune_comply($prune_from, $prune_sticky)
             if (!empty($result)) {
                 foreach ($result as $row) {
                     $this->prune($row['id'], $prune_sticky, $prune_date);
-                    update_forum($row['id']);
+                    \FeatherBB\Model\Forum::update($row['id']);
                 }
             }
         } else {
             $prune_from = intval($prune_from);
             $this->prune($prune_from, $prune_sticky, $prune_date);
-            update_forum($prune_from);
+            \FeatherBB\Model\Forum::update($prune_from);
         }
 
         // Locate any "orphaned redirect topics" and delete them
diff --git a/featherbb/Model/Admin/Options.php b/featherbb/Model/Admin/Options.php
index 049603cb..e5794a07 100644
--- a/featherbb/Model/Admin/Options.php
+++ b/featherbb/Model/Admin/Options.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Model\Cache;
 use DB;
 
 class Options
@@ -229,7 +230,7 @@ public function update_options()
         }
 
         // Regenerate the config cache
-        $this->feather->cache->store('config', \FeatherBB\Model\Cache::get_config());
+        $this->feather->cache->store('config', Cache::get_config());
         $this->clear_feed_cache();
 
         Url::redirect($this->feather->urlFor('adminOptions'), __('Options updated redirect'));
diff --git a/featherbb/Model/Admin/Permissions.php b/featherbb/Model/Admin/Permissions.php
index eb266d9d..feb9150a 100644
--- a/featherbb/Model/Admin/Permissions.php
+++ b/featherbb/Model/Admin/Permissions.php
@@ -12,6 +12,7 @@
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
+use FeatherBB\Model\Cache;
 
 class Permissions
 {
@@ -44,7 +45,7 @@ public function update_permissions()
         }
 
         // Regenerate the config cache
-        $this->feather->cache->store('config', \FeatherBB\Model\Cache::get_config());
+        $this->feather->cache->store('config', Cache::get_config());
         // $this->clear_feed_cache();
 
         Url::redirect($this->feather->urlFor('adminPermissions'), __('Perms updated redirect'));
diff --git a/featherbb/Model/Admin/Users.php b/featherbb/Model/Admin/Users.php
index 70e3f04c..2ca2784f 100644
--- a/featherbb/Model/Admin/Users.php
+++ b/featherbb/Model/Admin/Users.php
@@ -11,6 +11,8 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Model\Delete;
+use FeatherBB\Model\Cache;
 use DB;
 
 class Users
@@ -374,12 +376,12 @@ public function delete_users()
                                         ->find_one_col('id');
 
                         if ($result2 == $cur_post['id']) {
-                            delete_topic($cur_post['topic_id']);
+                            \FeatherBB\Model\Delete::topic($cur_post['topic_id']);
                         } else {
-                            delete_post($cur_post['id'], $cur_post['topic_id']);
+                            \FeatherBB\Model\Delete::post($cur_post['id'], $cur_post['topic_id']);
                         }
 
-                        update_forum($cur_post['forum_id']);
+                        \FeatherBB\Model\Forum::update($cur_post['forum_id']);
                     }
                 }
             } else {
@@ -398,12 +400,12 @@ public function delete_users()
 
             // Delete user avatars
             foreach ($user_ids as $user_id) {
-                delete_avatar($user_id);
+                Delete::avatar($user_id);
             }
 
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
-                $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
+                $this->feather->cache->store('users_info', Cache::get_users_info());
             }
 
             $stats = $this->feather->cache->retrieve('users_info');
@@ -525,7 +527,7 @@ public function ban_users()
                 }
 
                 // Regenerate the bans cache
-                $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
+                $this->feather->cache->store('bans', Cache::get_bans());
 
                 Url::redirect($this->feather->urlFor('adminUsers'), __('Users banned redirect'));
             }
@@ -669,7 +671,7 @@ public function print_users($conditions, $order_by, $direction, $start_from)
 
         if ($result) {
             foreach ($result as $cur_user) {
-                $cur_user['user_title'] = get_title($cur_user);
+                $cur_user['user_title'] = Utils::get_title($cur_user);
 
                 // This script is a special case in that we want to display "Not verified" for non-verified users
                 if (($cur_user['g_id'] == '' || $cur_user['g_id'] == FEATHER_UNVERIFIED) && $cur_user['user_title'] != __('Banned')) {
diff --git a/featherbb/Model/Auth.php b/featherbb/Model/Auth.php
index 2393c60f..d69b4730 100644
--- a/featherbb/Model/Auth.php
+++ b/featherbb/Model/Auth.php
@@ -90,10 +90,11 @@ public static function get_user_from_email($email)
 
     public static function update_group($user_id, $group_id)
     {
+        self::$feather = \Slim\Slim::getInstance();
         $update_usergroup = DB::for_table('users')->where('id', $user_id)
             ->find_one()
             ->set('group_id', $group_id);
-        $update_usergroup = $this->feather->hooks->fireDB('update_usergroup_login', $update_usergroup);
+        $update_usergroup = self::$feather->hooks->fireDB('update_usergroup_login', $update_usergroup);
         return $update_usergroup->save();
     }
 
diff --git a/featherbb/Model/Delete.php b/featherbb/Model/Delete.php
index 877509cd..c039ec7c 100644
--- a/featherbb/Model/Delete.php
+++ b/featherbb/Model/Delete.php
@@ -64,16 +64,16 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
             $this->hook->fire('handle_deletion_topic_post', $tid, $fid);
 
             // Delete the topic and all of its posts
-            delete_topic($tid);
-            update_forum($fid);
+            self::topic($tid);
+            Forum::update($fid);
 
             Url::redirect($this->feather->urlFor('Forum', array('id' => $fid)), __('Topic del redirect'));
         } else {
             $this->hook->fire('handle_deletion', $tid, $fid, $id);
 
             // Delete just this one post
-            delete_post($id, $tid);
-            update_forum($fid);
+            self::post($id, $tid);
+            Forum::update($fid);
 
             // Redirect towards the previous post
             $post = DB::for_table('posts')
@@ -89,4 +89,122 @@ public function handle_deletion($is_topic_post, $id, $tid, $fid)
             Url::redirect(Url::get('post/'.$post['id'].'/#p'.$post['id']), __('Post del redirect'));
         }
     }
+
+    //
+    // Delete a topic and all of its posts
+    //
+    public static function topic($topic_id)
+    {
+        // Delete the topic and any redirect topics
+        $where_delete_topic = array(
+            array('id' => $topic_id),
+            array('moved_to' => $topic_id)
+        );
+
+        DB::for_table('topics')
+            ->where_any_is($where_delete_topic)
+            ->delete_many();
+
+        // Delete posts in topic
+        DB::for_table('posts')
+            ->where('topic_id', $topic_id)
+            ->delete_many();
+
+        // Delete any subscriptions for this topic
+        DB::for_table('topic_subscriptions')
+            ->where('topic_id', $topic_id)
+            ->delete_many();
+    }
+
+
+    //
+    // Delete a single post
+    //
+    public static function post($post_id, $topic_id)
+    {
+        $result = DB::for_table('posts')
+            ->select_many('id', 'poster', 'posted')
+            ->where('topic_id', $topic_id)
+            ->order_by_desc('id')
+            ->limit(2)
+            ->find_many();
+
+        $i = 0;
+        foreach ($result as $cur_result) {
+            if ($i == 0) {
+                $last_id = $cur_result['id'];
+            }
+            else {
+                $second_last_id = $cur_result['id'];
+                $second_poster = $cur_result['poster'];
+                $second_posted = $cur_result['posted'];
+            }
+            ++$i;
+        }
+
+        // Delete the post
+        DB::for_table('posts')
+            ->where('id', $post_id)
+            ->find_one()
+            ->delete();
+
+        $search = new \FeatherBB\Core\Search();
+
+        $search->strip_search_index($post_id);
+
+        // Count number of replies in the topic
+        $num_replies = DB::for_table('posts')->where('topic_id', $topic_id)->count() - 1;
+
+        // If the message we deleted is the most recent in the topic (at the end of the topic)
+        if ($last_id == $post_id) {
+            // If there is a $second_last_id there is more than 1 reply to the topic
+            if (isset($second_last_id)) {
+                $update_topic = array(
+                    'last_post'  => $second_posted,
+                    'last_post_id'  => $second_last_id,
+                    'last_poster'  => $second_poster,
+                    'num_replies'  => $num_replies,
+                );
+                DB::for_table('topics')
+                    ->where('id', $topic_id)
+                    ->find_one()
+                    ->set($update_topic)
+                    ->save();
+            } else {
+                // We deleted the only reply, so now last_post/last_post_id/last_poster is posted/id/poster from the topic itself
+                DB::for_table('topics')
+                    ->where('id', $topic_id)
+                    ->find_one()
+                    ->set_expr('last_post', 'posted')
+                    ->set_expr('last_post_id', 'id')
+                    ->set_expr('last_poster', 'poster')
+                    ->set('num_replies', $num_replies)
+                    ->save();
+            }
+        } else {
+            // Otherwise we just decrement the reply counter
+            DB::for_table('topics')
+                ->where('id', $topic_id)
+                ->find_one()
+                ->set('num_replies', $num_replies)
+                ->save();
+        }
+    }
+
+    //
+    // Deletes any avatars owned by the specified user ID
+    //
+    public static function avatar($user_id)
+    {
+        $feather = \Slim\Slim::getInstance();
+
+        $filetypes = array('jpg', 'gif', 'png');
+
+        // Delete user avatar
+        foreach ($filetypes as $cur_type) {
+            if (file_exists($feather->forum_env['FEATHER_ROOT'].$feather->config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type)) {
+                @unlink($feather->forum_env['FEATHER_ROOT'].$feather->config['o_avatars_dir'].'/'.$user_id.'.'.$cur_type);
+            }
+        }
+    }
 }
diff --git a/featherbb/Model/Edit.php b/featherbb/Model/Edit.php
index ed6fca99..fd2ef493 100644
--- a/featherbb/Model/Edit.php
+++ b/featherbb/Model/Edit.php
@@ -67,7 +67,7 @@ public function check_errors_before_edit($can_edit_subject, $errors)
             $subject = Utils::trim($this->request->post('req_subject'));
 
             if ($this->config['o_censoring'] == '1') {
-                $censored_subject = Utils::trim(censor_words($subject));
+                $censored_subject = Utils::trim(Utils::censor($subject));
             }
 
             if ($subject == '') {
@@ -101,7 +101,7 @@ public function check_errors_before_edit($can_edit_subject, $errors)
                 $errors[] = __('No message');
             } elseif ($this->config['o_censoring'] == '1') {
                 // Censor message to see if that causes problems
-                $censored_message = Utils::trim(censor_words($message));
+                $censored_message = Utils::trim(Utils::censor($message));
 
                 if ($censored_message == '') {
                     $errors[] = __('No message after censoring');
diff --git a/featherbb/Model/Forum.php b/featherbb/Model/Forum.php
index 62705e93..bf26a965 100644
--- a/featherbb/Model/Forum.php
+++ b/featherbb/Model/Forum.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Track;
 use DB;
 
 class Forum
@@ -126,7 +127,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
 
         // Get topic/forum tracking data
         if (!$this->user->is_guest) {
-            $tracked_topics = get_tracked_topics();
+            $tracked_topics = Track::get_tracked_topics();
         }
 
         // Retrieve a list of topic IDs, LIMIT is (really) expensive so we only fetch the IDs here then later fetch the remaining data
@@ -195,7 +196,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 }
 
                 if ($this->config['o_censoring'] == '1') {
-                    $cur_topic['subject'] = censor_words($cur_topic['subject']);
+                    $cur_topic['subject'] = Utils::censor($cur_topic['subject']);
                 }
 
                 if ($cur_topic['sticky'] == '1') {
@@ -257,4 +258,54 @@ public function print_topics($forum_id, $sort_by, $start_from)
 
         return $forum_data;
     }
+
+    //
+    // Update posts, topics, last_post, last_post_id and last_poster for a forum
+    //
+    public static function update($forum_id)
+    {
+        $stats_query = DB::for_table('topics')
+                            ->where('forum_id', $forum_id)
+                            ->select_expr('COUNT(id)', 'total_topics')
+                            ->select_expr('SUM(num_replies)', 'total_replies')
+                            ->find_one();
+
+        $num_topics = intval($stats_query['total_topics']);
+        $num_replies = intval($stats_query['total_replies']);
+
+        $num_posts = $num_replies + $num_topics; // $num_posts is only the sum of all replies (we have to add the topic posts)
+
+        $select_update_forum = array('last_post', 'last_post_id', 'last_poster');
+
+        $result = DB::for_table('topics')->select_many($select_update_forum)
+                    ->where('forum_id', $forum_id)
+                    ->where_null('moved_to')
+                    ->order_by_desc('last_post')
+                    ->find_one();
+
+        if ($result) {
+            // There are topics in the forum
+            $insert_update_forum = array(
+                'num_topics' => $num_topics,
+                'num_posts'  => $num_posts,
+                'last_post'  => $result['last_post'],
+                'last_post_id'  => $result['last_post_id'],
+                'last_poster'  => $result['last_poster'],
+            );
+        } else {
+            // There are no topics
+            $insert_update_forum = array(
+                'num_topics' => $num_topics,
+                'num_posts'  => $num_posts,
+                'last_post'  => 'NULL',
+                'last_post_id'  => 'NULL',
+                'last_poster'  => 'NULL',
+            );
+        }
+        DB::for_table('forums')
+            ->where('id', $forum_id)
+            ->find_one()
+            ->set($insert_update_forum)
+            ->save();
+    }
 }
diff --git a/featherbb/Model/Index.php b/featherbb/Model/Index.php
index d66b07ba..6bb64e9c 100644
--- a/featherbb/Model/Index.php
+++ b/featherbb/Model/Index.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Track;
 use DB;
 
 class Index
@@ -83,7 +84,7 @@ protected function get_new_posts()
         $query = $query->find_result_set();
 
         $forums = $new_topics = array();
-        $tracked_topics = get_tracked_topics();
+        $tracked_topics = Track::get_tracked_topics();
 
         foreach ($query as $cur_forum) {
             if (!isset($tracked_topics['forums'][$cur_forum->id]) || $tracked_topics['forums'][$cur_forum->id] < $cur_forum->last_post) {
@@ -241,7 +242,7 @@ public function collect_stats()
 
         // Collect some statistics from the database
         if (!$this->feather->cache->isCached('users_info')) {
-            $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
+            $this->feather->cache->store('users_info', Cache::get_users_info());
         }
 
         $stats = $this->feather->cache->retrieve('users_info');
diff --git a/featherbb/Model/Install.php b/featherbb/Model/Install.php
index 0a0ab407..c8461a2c 100644
--- a/featherbb/Model/Install.php
+++ b/featherbb/Model/Install.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Random;
 use DB;
 
 class Install
@@ -395,7 +396,7 @@ public static function load_admin_user(array $data)
         return $user = array(
             'group_id' => 1,
             'username' => $data['username'],
-            'password' => \FeatherBB\Core\Utils::hash($data['password']),
+            'password' => Random::hash($data['password']),
             'email' => $data['email'],
             'language' => $data['default_lang'],
             'style' => $data['default_style'],
diff --git a/featherbb/Model/Login.php b/featherbb/Model/Login.php
index a7f9c7b8..45032819 100644
--- a/featherbb/Model/Login.php
+++ b/featherbb/Model/Login.php
@@ -11,6 +11,8 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Random;
+use FeatherBB\Core\Track;
 use DB;
 
 class Login
@@ -44,7 +46,7 @@ public function login()
         $authorized = false;
 
         if (!empty($user->password)) {
-            $form_password_hash = Utils::hash($form_password); // Will result in a SHA-1 hash
+            $form_password_hash = Random::hash($form_password); // Will result in a SHA-1 hash
             $authorized = ($user->password == $form_password_hash);
         }
 
@@ -64,7 +66,7 @@ public function login()
 
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
-                $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
+                $this->feather->cache->store('users_info', Cache::get_users_info());
             }
 
             $stats = $this->feather->cache->retrieve('users_info');
@@ -80,7 +82,7 @@ public function login()
         $this->auth->feather_setcookie($user->id, $form_password_hash, $expire);
 
         // Reset tracked topics
-        set_tracked_topics(null);
+        Track:: set_tracked_topics(null);
 
         // Try to determine if the data in redirect_url is valid (if not, we redirect to index.php after login)
         $redirect_url = $this->request->post('redirect_url');
@@ -93,7 +95,7 @@ public function logout($id, $token)
     {
         $token = $this->hook->fire('logout_start', $token, $id);
 
-        if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != Utils::hash($this->user->id.Utils::hash($this->request->getIp()))) {
+        if ($this->user->is_guest || !isset($id) || $id != $this->user->id || !isset($token) || $token != Random::hash($this->user->id.Random::hash($this->request->getIp()))) {
             header('Location: '.Url::base());
             exit;
         }
@@ -114,7 +116,7 @@ public function logout($id, $token)
 
         $this->hook->fire('logout_end');
 
-        $this->auth->feather_setcookie(1, Utils::hash(uniqid(rand(), true)), time() + 31536000);
+        $this->auth->feather_setcookie(1, Random::hash(uniqid(rand(), true)), time() + 31536000);
 
         Url::redirect($this->feather->urlFor('home'), __('Logout redirect'));
     }
@@ -170,11 +172,11 @@ public function password_forgotten()
                         }
 
                         // Generate a new password and a new password activation code
-                        $new_password = random_pass(12);
-                        $new_password_key = random_pass(8);
+                        $new_password = Random::pass(12);
+                        $new_password_key = Random::pass(8);
 
                         $query['update'] = array(
-                            'activate_string' => Utils::hash($new_password),
+                            'activate_string' => Random::hash($new_password),
                             'activate_key'    => $new_password_key,
                             'last_email_sent' => time()
                         );
diff --git a/featherbb/Model/Moderate.php b/featherbb/Model/Moderate.php
index ae760c4c..ebbf9ede 100644
--- a/featherbb/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Track;
 use DB;
 
 class Moderate
@@ -111,7 +112,7 @@ public function delete_posts($tid, $fid, $p = null)
                 ->where('topic_id', $tid);
 
             if ($this->user->g_id != FEATHER_ADMIN) {
-                $result->where_not_in('poster_id', get_admin_ids());
+                $result->where_not_in('poster_id', Utils::get_admin_ids());
             }
 
             $result = $this->hook->fireDB('delete_posts_first_query', $result);
@@ -155,7 +156,7 @@ public function delete_posts($tid, $fid, $p = null)
             $update_topic = $this->hook->fireDB('delete_posts_update_topic_query', $update_topic);
             $update_topic = $update_topic->save();
 
-            update_forum($fid);
+            Forum::update($fid);
 
             Url::redirect($this->feather->urlFor('Topic', array('id' => $tid)), __('Delete posts redirect'));
         }
@@ -315,8 +316,8 @@ public function split_posts($tid, $fid, $p = null)
             $update_new_topic = $this->hook->fireDB('split_posts_update_new_topic_query', $update_new_topic);
             $update_new_topic = $update_new_topic->save();
 
-            update_forum($fid);
-            update_forum($move_to_forum);
+            Forum::update($fid);
+            Forum::update($move_to_forum);
 
             Url::redirect($this->feather->urlFor('Topic', array('id' => $new_tid)), __('Split posts redirect'));
         }
@@ -463,12 +464,12 @@ public function display_posts_view($tid, $start_from)
                     $cur_post->poster_disp = Utils::escape($cur_post->poster);
                 }
 
-                // get_title() requires that an element 'username' be present in the array
+                // Utils::get_title() requires that an element 'username' be present in the array
                 $cur_post->username = $cur_post->poster;
-                $cur_post->user_title = get_title($cur_post);
+                $cur_post->user_title = Utils::get_title($cur_post);
 
                 if ($this->config['o_censoring'] == '1') {
-                    $cur_post->user_title = censor_words($cur_post->user_title);
+                    $cur_post->user_title = Utils::censor($cur_post->user_title);
                 }
             }
             // If the poster is a guest (or a user that has been deleted)
@@ -578,8 +579,8 @@ public function move_topics_to($fid, $tfid = null, $param = null)
             }
         }
 
-        update_forum($fid); // Update the forum FROM which the topic was moved
-        update_forum($move_to_forum); // Update the forum TO which the topic was moved
+        Forum::update($fid); // Update the forum FROM which the topic was moved
+        Forum::update($move_to_forum); // Update the forum TO which the topic was moved
 
         $redirect_msg = (count($topics) > 1) ? __('Move topics redirect') : __('Move topic redirect');
         $redirect_msg = $this->hook->fire('move_topics_to_redirect_message', $redirect_msg);
@@ -734,7 +735,7 @@ public function merge_topics($fid)
         $this->hook->fire('merge_topics');
 
         // Update the forum FROM which the topic was moved and redirect
-        update_forum($fid);
+        Forum::update($fid);
         Url::redirect($this->feather->urlFor('Forum', array('id' => $fid)), __('Merge topics redirect'));
     }
 
@@ -763,7 +764,7 @@ public function delete_topics($topics, $fid)
         if ($this->user->g_id != FEATHER_ADMIN) {
             $authorized = DB::for_table('posts')
                             ->where_in('topic_id', $topics_sql)
-                            ->where('poster_id', get_admin_ids());
+                            ->where('poster_id', Utils::get_admin_ids());
             $authorized = $this->hook->fireDB('delete_topics_authorized', $authorized);
             $authorized = $authorized->find_many();
             if ($authorized) {
@@ -815,7 +816,7 @@ public function delete_topics($topics, $fid)
         $delete_posts = $this->hook->fireDB('delete_topics_delete_posts', $delete_posts);
         $delete_posts = $delete_posts->delete_many();
 
-        update_forum($fid);
+        Forum::update($fid);
 
         $this->hook->fire('delete_topics');
 
@@ -880,7 +881,7 @@ public function display_topics($fid, $sort_by, $start_from)
 
         // Get topic/forum tracking data
         if (!$this->user->is_guest) {
-            $tracked_topics = get_tracked_topics();
+            $tracked_topics = Track::get_tracked_topics();
         }
 
         // Retrieve a list of topic IDs, LIMIT is (really) expensive so we only fetch the IDs here then later fetch the remaining data
@@ -927,7 +928,7 @@ public function display_topics($fid, $sort_by, $start_from)
                 }
 
                 if ($this->config['o_censoring'] == '1') {
-                    $cur_topic['subject'] = censor_words($cur_topic['subject']);
+                    $cur_topic['subject'] = Utils::censor($cur_topic['subject']);
                 }
 
                 if ($cur_topic['sticky'] == '1') {
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
index 8ce4ad44..4d4cf334 100644
--- a/featherbb/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Track;
 use DB;
 
 class Post
@@ -115,7 +116,7 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
             $subject = $this->hook->fire('check_errors_before_new_topic_subject', $subject);
 
             if ($this->config['o_censoring'] == '1') {
-                $censored_subject = Utils::trim(censor_words($subject));
+                $censored_subject = Utils::trim(Utils::censor($subject));
                 $censored_subject = $this->hook->fire('check_errors_before_censored', $censored_subject);
             }
 
@@ -177,7 +178,7 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
                 $errors[] = __('No message');
             } elseif ($this->config['o_censoring'] == '1') {
                 // Censor message to see if that causes problems
-                $censored_message = Utils::trim(censor_words($message));
+                $censored_message = Utils::trim(Utils::censor($message));
 
                 if ($censored_message == '') {
                     $errors[] = __('No message after censoring');
@@ -330,7 +331,7 @@ public function insert_reply($post, $tid, $cur_posting, $is_subscribed)
 
         $this->search->update_search_index('post', $new['pid'], $post['message']);
 
-        update_forum($cur_posting['id']);
+        Forum::update($cur_posting['id']);
 
         $new = $this->hook->fireDB('insert_reply', $new);
 
@@ -375,7 +376,7 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
         if ($result) {
             $notification_emails = array();
 
-            $censored_message = Utils::trim(censor_words($post['message']));
+            $censored_message = Utils::trim(Utils::censor($post['message']));
 
             if ($this->config['o_censoring'] == '1') {
                 $cleaned_message = $this->email->bbcode2email($censored_message, -1);
@@ -547,7 +548,7 @@ public function insert_topic($post, $fid)
 
         $this->search->update_search_index('post', $new['pid'], $post['message'], $post['subject']);
 
-        update_forum($fid);
+        Forum::update($fid);
 
         $new = $this->hook->fireDB('insert_topic', $new);
 
@@ -583,8 +584,8 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
         if ($result) {
             $notification_emails = array();
 
-            $censored_message = Utils::trim(censor_words($post['message']));
-            $censored_subject = Utils::trim(censor_words($post['subject']));
+            $censored_message = Utils::trim(Utils::censor($post['message']));
+            $censored_subject = Utils::trim(Utils::censor($post['subject']));
 
             if ($this->config['o_censoring'] == '1') {
                 $cleaned_message = $this->email->bbcode2email($censored_message, -1);
@@ -704,9 +705,9 @@ public function increment_post_count($post, $new_tid)
             }
 
             // Topic tracking stuff...
-            $tracked_topics = get_tracked_topics();
+            $tracked_topics = Track::get_tracked_topics();
             $tracked_topics['topics'][$new_tid] = time();
-            set_tracked_topics($tracked_topics);
+            Track::set_tracked_topics($tracked_topics);
         } else {
             // Update the last_post field for guests
             $last_post = DB::for_table('online')
@@ -794,7 +795,7 @@ public function get_quote_message($qid, $tid)
         }
 
         if ($this->config['o_censoring'] == '1') {
-            $quote['message'] = censor_words($quote['message']);
+            $quote['message'] = Utils::censor($quote['message']);
         }
 
         $quote['message'] = Utils::escape($quote['message']);
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index 83ec7770..d9eac43b 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Random;
 use DB;
 
 class Profile
@@ -112,7 +113,7 @@ public function change_pass($id)
             $authorized = false;
 
             if (!empty($cur_user['password'])) {
-                $old_password_hash = Utils::hash($old_password);
+                $old_password_hash = Random::hash($old_password);
 
                 if ($cur_user['password'] == $old_password_hash || $this->user->is_admmod) {
                     $authorized = true;
@@ -123,7 +124,7 @@ public function change_pass($id)
                 throw new \FeatherBB\Core\Error(__('Wrong pass'), 403);
             }
 
-            $new_password_hash = Utils::hash($new_password1);
+            $new_password_hash = Random::hash($new_password1);
 
             $update_password = DB::for_table('users')
                 ->where('id', $id)
@@ -199,7 +200,7 @@ public function change_email($id)
         } elseif ($this->request->isPost()) {
             $this->hook->fire('change_email_post');
 
-            if (Utils::hash($this->request->post('req_password')) !== $this->user->password) {
+            if (Random::hash($this->request->post('req_password')) !== $this->user->password) {
                 throw new \FeatherBB\Core\Error(__('Wrong pass'));
             }
 
@@ -273,7 +274,7 @@ public function change_email($id)
             }
 
 
-            $new_email_key = random_pass(8);
+            $new_email_key = Random::pass(8);
             $new_email_key = $this->hook->fire('change_email_new_email_key', $new_email_key);
 
             // Update the user
@@ -394,7 +395,7 @@ public function upload_avatar($id, $files_data)
             }
 
             // Delete any old avatars and put the new one in place
-            delete_avatar($id);
+            Delete::avatar($id);
             @rename($this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.'.tmp', $this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.$extension);
             @chmod($this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.$extension, 0644);
         } else {
@@ -426,13 +427,13 @@ public function update_group_membership($id)
 
         // Regenerate the users info cache
         if (!$this->feather->cache->isCached('users_info')) {
-            $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
+            $this->feather->cache->store('users_info', Cache::get_users_info());
         }
 
         $stats = $this->feather->cache->retrieve('users_info');
 
         if ($old_group_id == FEATHER_ADMIN || $new_group_id == FEATHER_ADMIN) {
-            $this->feather->cache->store('admin_ids', \FeatherBB\Model\Cache::get_admin_ids());
+            $this->feather->cache->store('admin_ids', Cache::get_admin_ids());
         }
 
         $new_group_mod = DB::for_table('groups')
@@ -696,12 +697,12 @@ public function delete_user($id)
                         $result2 = $result2->find_one_col('id');
 
                         if ($result2 == $cur_post['id']) {
-                            delete_topic($cur_post['topic_id']);
+                            Delete::topic($cur_post['topic_id']);
                         } else {
-                            delete_post($cur_post['id'], $cur_post['topic_id']);
+                            Delete::post($cur_post['id'], $cur_post['topic_id']);
                         }
 
-                        update_forum($cur_post['forum_id']);
+                        Forum::update($cur_post['forum_id']);
                     }
                 }
             } else {
@@ -714,21 +715,21 @@ public function delete_user($id)
 
             // Delete the user
             $delete_user = DB::for_table('users')
-                ->where('id', $id);
+                            ->where('id', $id);
             $delete_user = $delete_user->delete_many();
 
             // Delete user avatar
-            delete_avatar($id);
+            Delete::avatar($id);
 
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
-                $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
+                $this->feather->cache->store('users_info', Cache::get_users_info());
             }
 
             $stats = $this->feather->cache->retrieve('users_info');
 
             if ($group_id == FEATHER_ADMIN) {
-                $this->feather->cache->store('admin_ids', \FeatherBB\Model\Cache::get_admin_ids());
+                $this->feather->cache->store('admin_ids', Cache::get_admin_ids());
             }
 
             $this->hook->fire('delete_user');
@@ -1071,14 +1072,14 @@ public function update_profile($id, $info, $section)
 
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
-                $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
+                $this->feather->cache->store('users_info', Cache::get_users_info());
             }
 
             $stats = $this->feather->cache->retrieve('users_info');
 
             // Check if the bans table was updated and regenerate the bans cache when needed
             if ($bans_updated) {
-                $this->feather->cache->store('bans', \FeatherBB\Model\Cache::get_bans());
+                $this->feather->cache->store('bans', Cache::get_bans());
             }
         }
 
@@ -1115,22 +1116,22 @@ public function parse_user_info($user)
         $user_info['personal'][] = '<dt>'.__('Username').'</dt>';
         $user_info['personal'][] = '<dd>'.Utils::escape($user['username']).'</dd>';
 
-        $user_title_field = get_title($user);
+        $user_title_field = Utils::get_title($user);
         $user_info['personal'][] = '<dt>'.__('Title').'</dt>';
-        $user_info['personal'][] = '<dd>'.(($this->config['o_censoring'] == '1') ? censor_words($user_title_field) : $user_title_field).'</dd>';
+        $user_info['personal'][] = '<dd>'.(($this->config['o_censoring'] == '1') ? Utils::censor($user_title_field) : $user_title_field).'</dd>';
 
         if ($user['realname'] != '') {
             $user_info['personal'][] = '<dt>'.__('Realname').'</dt>';
-            $user_info['personal'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? censor_words($user['realname']) : $user['realname']).'</dd>';
+            $user_info['personal'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? Utils::censor($user['realname']) : $user['realname']).'</dd>';
         }
 
         if ($user['location'] != '') {
             $user_info['personal'][] = '<dt>'.__('Location').'</dt>';
-            $user_info['personal'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? censor_words($user['location']) : $user['location']).'</dd>';
+            $user_info['personal'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? Utils::censor($user['location']) : $user['location']).'</dd>';
         }
 
         if ($user['url'] != '') {
-            $user['url'] = Utils::escape(($this->config['o_censoring'] == '1') ? censor_words($user['url']) : $user['url']);
+            $user['url'] = Utils::escape(($this->config['o_censoring'] == '1') ? Utils::censor($user['url']) : $user['url']);
             $user_info['personal'][] = '<dt>'.__('Website').'</dt>';
             $user_info['personal'][] = '<dd><span class="website"><a href="'.$user['url'].'" rel="nofollow">'.$user['url'].'</a></span></dd>';
         }
@@ -1149,7 +1150,7 @@ public function parse_user_info($user)
 
         if ($user['jabber'] != '') {
             $user_info['messaging'][] = '<dt>'.__('Jabber').'</dt>';
-            $user_info['messaging'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? censor_words($user['jabber']) : $user['jabber']).'</dd>';
+            $user_info['messaging'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? Utils::censor($user['jabber']) : $user['jabber']).'</dd>';
         }
 
         if ($user['icq'] != '') {
@@ -1159,21 +1160,21 @@ public function parse_user_info($user)
 
         if ($user['msn'] != '') {
             $user_info['messaging'][] = '<dt>'.__('MSN').'</dt>';
-            $user_info['messaging'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? censor_words($user['msn']) : $user['msn']).'</dd>';
+            $user_info['messaging'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? Utils::censor($user['msn']) : $user['msn']).'</dd>';
         }
 
         if ($user['aim'] != '') {
             $user_info['messaging'][] = '<dt>'.__('AOL IM').'</dt>';
-            $user_info['messaging'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? censor_words($user['aim']) : $user['aim']).'</dd>';
+            $user_info['messaging'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? Utils::censor($user['aim']) : $user['aim']).'</dd>';
         }
 
         if ($user['yahoo'] != '') {
             $user_info['messaging'][] = '<dt>'.__('Yahoo').'</dt>';
-            $user_info['messaging'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? censor_words($user['yahoo']) : $user['yahoo']).'</dd>';
+            $user_info['messaging'][] = '<dd>'.Utils::escape(($this->config['o_censoring'] == '1') ? Utils::censor($user['yahoo']) : $user['yahoo']).'</dd>';
         }
 
         if ($this->config['o_avatars'] == '1') {
-            $avatar_field = generate_avatar_markup($user['id']);
+            $avatar_field = Utils::generate_avatar_markup($user['id']);
             if ($avatar_field != '') {
                 $user_info['personality'][] = '<dt>'.__('Avatar').'</dt>';
                 $user_info['personality'][] = '<dd>'.$avatar_field.'</dd>';
@@ -1376,7 +1377,7 @@ public function check_username($username, $errors, $exclude_id = null)
         }
 
         // Check username for any censored words
-        if ($this->feather->forum_settings['o_censoring'] == '1' && censor_words($username) != $username) {
+        if ($this->feather->forum_settings['o_censoring'] == '1' && Utils::censor($username) != $username) {
             $errors[] = __('Username censor');
         }
 
@@ -1391,7 +1392,7 @@ public function check_username($username, $errors, $exclude_id = null)
         }
 
         // Check username for any banned usernames
-        foreach ($this->feather_bans as $cur_ban) {
+        foreach ($feather_bans as $cur_ban) {
             if ($cur_ban['username'] != '' && utf8_strtolower($username) == utf8_strtolower($cur_ban['username'])) {
                 $errors[] = __('Banned username');
                 break;
diff --git a/featherbb/Model/Register.php b/featherbb/Model/Register.php
index 70bd6c77..c1075ed2 100644
--- a/featherbb/Model/Register.php
+++ b/featherbb/Model/Register.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Random;
 use DB;
 
 class Register
@@ -54,7 +55,7 @@ public function check_for_errors()
         if ($this->config['o_regs_verify'] == '1') {
             $email2 = strtolower(Utils::trim($this->request->post('req_email2')));
 
-            $user['password1'] = random_pass(12);
+            $user['password1'] = Random::pass(12);
             $password2 = $user['password1'];
         } else {
             $user['password1'] = Utils::trim($this->request->post('req_password1'));
@@ -141,7 +142,7 @@ public function insert_user($user)
         $now = time();
 
         $intial_group_id = ($this->config['o_regs_verify'] == '0') ? $this->config['o_default_user_group'] : FEATHER_UNVERIFIED;
-        $password_hash = Utils::hash($user['password1']);
+        $password_hash = Random::hash($user['password1']);
 
         // Add the user
         $user['insert'] = array(
@@ -171,7 +172,7 @@ public function insert_user($user)
         if ($this->config['o_regs_verify'] == '0') {
             // Regenerate the users info cache
             if (!$this->feather->cache->isCached('users_info')) {
-                $this->feather->cache->store('users_info', \FeatherBB\Model\Cache::get_users_info());
+                $this->feather->cache->store('users_info', Cache::get_users_info());
             }
 
             $stats = $this->feather->cache->retrieve('users_info');
diff --git a/featherbb/Model/Search.php b/featherbb/Model/Search.php
index 5f42bdbe..b5746db6 100644
--- a/featherbb/Model/Search.php
+++ b/featherbb/Model/Search.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Track;
 use DB;
 
 class Search
@@ -696,7 +697,7 @@ public function display_search_results($search)
 
         // Get topic/forum tracking data
         if (!$this->user->is_guest) {
-            $tracked_topics = get_tracked_topics();
+            $tracked_topics = Track::get_tracked_topics();
         }
 
         $post_count = $topic_count = 0;
@@ -706,7 +707,7 @@ public function display_search_results($search)
             $url_topic = Url::url_friendly($cur_search['subject']);
 
             if ($this->config['o_censoring'] == '1') {
-                $cur_search['subject'] = censor_words($cur_search['subject']);
+                $cur_search['subject'] = Utils::censor($cur_search['subject']);
             }
 
             if ($search['show_as'] == 'posts') {
@@ -723,7 +724,7 @@ public function display_search_results($search)
                 }
 
                 if ($this->config['o_censoring'] == '1') {
-                    $cur_search['message'] = censor_words($cur_search['message']);
+                    $cur_search['message'] = Utils::censor($cur_search['message']);
                 }
 
                 $cur_search['message'] = $this->feather->parser->parse_message($cur_search['message'], $cur_search['hide_smilies']);
diff --git a/featherbb/Model/Topic.php b/featherbb/Model/Topic.php
index b6592048..021f4cbe 100644
--- a/featherbb/Model/Topic.php
+++ b/featherbb/Model/Topic.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Track;
 use DB;
 
 class Topic
@@ -69,7 +70,7 @@ public function handle_actions($topic_id, $action)
         if ($action == 'new') {
             if (!$this->user->is_guest) {
                 // We need to check if this topic has been viewed recently by the user
-                $tracked_topics = get_tracked_topics();
+                $tracked_topics = Track::get_tracked_topics();
                 $last_viewed = isset($tracked_topics['topics'][$topic_id]) ? $tracked_topics['topics'][$topic_id] : $this->user->last_visit;
 
                 $first_new_post_id = DB::for_table('posts')
@@ -280,10 +281,10 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                     $cur_post['username_formatted'] = Utils::escape($cur_post['username']);
                 }
 
-                $cur_post['user_title_formatted'] = get_title($cur_post);
+                $cur_post['user_title_formatted'] = Utils::get_title($cur_post);
 
                 if ($this->config['o_censoring'] == '1') {
-                    $cur_post['user_title_formatted'] = censor_words($cur_post['user_title_formatted']);
+                    $cur_post['user_title_formatted'] = Utils::censor($cur_post['user_title_formatted']);
                 }
 
                 // Format the online indicator
@@ -293,7 +294,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                     if (isset($avatar_cache[$cur_post['poster_id']])) {
                         $cur_post['user_avatar'] = $avatar_cache[$cur_post['poster_id']];
                     } else {
-                        $cur_post['user_avatar'] = $avatar_cache[$cur_post['poster_id']] = generate_avatar_markup($cur_post['poster_id']);
+                        $cur_post['user_avatar'] = $avatar_cache[$cur_post['poster_id']] = Utils::generate_avatar_markup($cur_post['poster_id']);
                     }
                 }
 
@@ -301,7 +302,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 if ($this->config['o_show_user_info'] == '1') {
                     if ($cur_post['location'] != '') {
                         if ($this->config['o_censoring'] == '1') {
-                            $cur_post['location'] = censor_words($cur_post['location']);
+                            $cur_post['location'] = Utils::censor($cur_post['location']);
                         }
 
                         $cur_post['user_info'][] = '<dd><span>'.__('From').' '.Utils::escape($cur_post['location']).'</span></dd>';
@@ -322,7 +323,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
 
                     if ($cur_post['url'] != '') {
                         if ($this->config['o_censoring'] == '1') {
-                            $cur_post['url'] = censor_words($cur_post['url']);
+                            $cur_post['url'] = Utils::censor($cur_post['url']);
                         }
 
                         $cur_post['user_contacts'][] = '<span class="website"><a href="'.Utils::escape($cur_post['url']).'" rel="nofollow">'.__('Website').'</a></span>';
@@ -346,7 +347,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
             // If the poster is a guest (or a user that has been deleted)
             else {
                 $cur_post['username_formatted'] = Utils::escape($cur_post['username']);
-                $cur_post['user_title_formatted'] = get_title($cur_post);
+                $cur_post['user_title_formatted'] = Utils::get_title($cur_post);
 
                 if ($this->user->is_admmod) {
                     $cur_post['user_info'][] = '<dd><span><a href="'.Url::get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.Utils::escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
diff --git a/style/themes/FeatherBB/view/admin/options.php b/style/themes/FeatherBB/view/admin/options.php
index 0ed86ebb..56c19e4f 100644
--- a/style/themes/FeatherBB/view/admin/options.php
+++ b/style/themes/FeatherBB/view/admin/options.php
@@ -9,6 +9,7 @@
 
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Random;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -678,7 +679,7 @@
 									<th scope="row"><?php _e('SMTP password label') ?></th>
 									<td>
 										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
-<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key(Utils::strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
+<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? Random::key(Utils::strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
 										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
 										<span><?php _e('SMTP password help') ?></span>
diff --git a/style/themes/FeatherBB/view/admin/users/show_users.php b/style/themes/FeatherBB/view/admin/users/show_users.php
index cd1d0b2e..85401a77 100644
--- a/style/themes/FeatherBB/view/admin/users/show_users.php
+++ b/style/themes/FeatherBB/view/admin/users/show_users.php
@@ -56,10 +56,10 @@
 				<tr>
 					<td class="tcl"><?php echo '<a href="'.Url::get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.Utils::escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
 					<td class="tc2"><a href="mailto:<?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
-					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
+					<td class="tc3"><?php echo Utils::get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
 					<td class="tc4"><?php echo Utils::forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
 					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? Utils::escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.Url::get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.Url::get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.Url::get('search/?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results show posts link').'</a>' ?></td>
 				</tr>
 <?php
 
diff --git a/style/themes/FeatherBB/view/header.php b/style/themes/FeatherBB/view/header.php
index f00a531c..b9927636 100644
--- a/style/themes/FeatherBB/view/header.php
+++ b/style/themes/FeatherBB/view/header.php
@@ -8,6 +8,7 @@
  */
 
 use FeatherBB\Core\Utils;
+use FeatherBB\Core\Random;
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
@@ -132,7 +133,7 @@ function process_form(the_form)
         echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.Url::get('admin/').'">'.__('Admin').'</a></li>'."\n";
     }
 
-    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.Url::get('auth/logout/token/'.Utils::hash($feather->user->id.Utils::hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.Url::get('auth/logout/token/'.Random::hash($feather->user->id.Random::hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
 }
 
 // // Are there any additional navlinks we should insert into the array before imploding it?
diff --git a/style/themes/FeatherBB/view/userlist.php b/style/themes/FeatherBB/view/userlist.php
index cdd5ba13..86df7bd5 100644
--- a/style/themes/FeatherBB/view/userlist.php
+++ b/style/themes/FeatherBB/view/userlist.php
@@ -91,7 +91,7 @@
                 ?>
 					<tr>
 						<td class="tcl"><?php echo '<a href="'.Url::get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
-						<td class="tc2"><?php echo get_title($user) ?></td>
+						<td class="tc2"><?php echo Utils::get_title($user) ?></td>
 	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
 	<?php endif;
                 ?>
diff --git a/view/admin/options.php b/view/admin/options.php
index e2b145c3..5337bc6e 100644
--- a/view/admin/options.php
+++ b/view/admin/options.php
@@ -6,844 +6,839 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
+use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Random;
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
-    exit;
+	exit;
 }
 ?>
 
-	<div class="blockform">
-		<h2><span><?php _e('Options head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/options/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-				<div class="inform">
-					<input type="hidden" name="form_sent" value="1" />
-					<fieldset>
-						<legend><?php _e('Essentials subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Board title label') ?></th>
-									<td>
-										<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo Utils::escape($feather->forum_settings['o_board_title']) ?>" />
-										<span><?php _e('Board title help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Board desc label') ?></th>
-									<td>
-										<textarea name="form_board_desc" cols="60" rows="3"><?php echo Utils::escape($feather->forum_settings['o_board_desc']) ?></textarea>
-										<span><?php _e('Board desc help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Base URL label') ?></th>
-									<td>
-										<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo Utils::escape($feather->forum_settings['o_base_url']) ?>" />
-										<span><?php _e('Base URL help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Timezone label') ?></th>
-									<td>
-										<select name="form_default_timezone">
-											<option value="-12"<?php if ($feather->forum_settings['o_default_timezone'] == -12) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-12:00') ?></option>
-											<option value="-11"<?php if ($feather->forum_settings['o_default_timezone'] == -11) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-11:00') ?></option>
-											<option value="-10"<?php if ($feather->forum_settings['o_default_timezone'] == -10) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-10:00') ?></option>
-											<option value="-9.5"<?php if ($feather->forum_settings['o_default_timezone'] == -9.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-09:30') ?></option>
-											<option value="-9"<?php if ($feather->forum_settings['o_default_timezone'] == -9) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-09:00') ?></option>
-											<option value="-8.5"<?php if ($feather->forum_settings['o_default_timezone'] == -8.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-08:30') ?></option>
-											<option value="-8"<?php if ($feather->forum_settings['o_default_timezone'] == -8) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-08:00') ?></option>
-											<option value="-7"<?php if ($feather->forum_settings['o_default_timezone'] == -7) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-07:00') ?></option>
-											<option value="-6"<?php if ($feather->forum_settings['o_default_timezone'] == -6) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-06:00') ?></option>
-											<option value="-5"<?php if ($feather->forum_settings['o_default_timezone'] == -5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-05:00') ?></option>
-											<option value="-4"<?php if ($feather->forum_settings['o_default_timezone'] == -4) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-04:00') ?></option>
-											<option value="-3.5"<?php if ($feather->forum_settings['o_default_timezone'] == -3.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-03:30') ?></option>
-											<option value="-3"<?php if ($feather->forum_settings['o_default_timezone'] == -3) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-03:00') ?></option>
-											<option value="-2"<?php if ($feather->forum_settings['o_default_timezone'] == -2) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-02:00') ?></option>
-											<option value="-1"<?php if ($feather->forum_settings['o_default_timezone'] == -1) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-01:00') ?></option>
-											<option value="0"<?php if ($feather->forum_settings['o_default_timezone'] == 0) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC') ?></option>
-											<option value="1"<?php if ($feather->forum_settings['o_default_timezone'] == 1) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+01:00') ?></option>
-											<option value="2"<?php if ($feather->forum_settings['o_default_timezone'] == 2) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+02:00') ?></option>
-											<option value="3"<?php if ($feather->forum_settings['o_default_timezone'] == 3) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+03:00') ?></option>
-											<option value="3.5"<?php if ($feather->forum_settings['o_default_timezone'] == 3.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+03:30') ?></option>
-											<option value="4"<?php if ($feather->forum_settings['o_default_timezone'] == 4) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+04:00') ?></option>
-											<option value="4.5"<?php if ($feather->forum_settings['o_default_timezone'] == 4.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+04:30') ?></option>
-											<option value="5"<?php if ($feather->forum_settings['o_default_timezone'] == 5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:00') ?></option>
-											<option value="5.5"<?php if ($feather->forum_settings['o_default_timezone'] == 5.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:30') ?></option>
-											<option value="5.75"<?php if ($feather->forum_settings['o_default_timezone'] == 5.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:45') ?></option>
-											<option value="6"<?php if ($feather->forum_settings['o_default_timezone'] == 6) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+06:00') ?></option>
-											<option value="6.5"<?php if ($feather->forum_settings['o_default_timezone'] == 6.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+06:30') ?></option>
-											<option value="7"<?php if ($feather->forum_settings['o_default_timezone'] == 7) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+07:00') ?></option>
-											<option value="8"<?php if ($feather->forum_settings['o_default_timezone'] == 8) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+08:00') ?></option>
-											<option value="8.75"<?php if ($feather->forum_settings['o_default_timezone'] == 8.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+08:45') ?></option>
-											<option value="9"<?php if ($feather->forum_settings['o_default_timezone'] == 9) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+09:00') ?></option>
-											<option value="9.5"<?php if ($feather->forum_settings['o_default_timezone'] == 9.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+09:30') ?></option>
-											<option value="10"<?php if ($feather->forum_settings['o_default_timezone'] == 10) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+10:00') ?></option>
-											<option value="10.5"<?php if ($feather->forum_settings['o_default_timezone'] == 10.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+10:30') ?></option>
-											<option value="11"<?php if ($feather->forum_settings['o_default_timezone'] == 11) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+11:00') ?></option>
-											<option value="11.5"<?php if ($feather->forum_settings['o_default_timezone'] == 11.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+11:30') ?></option>
-											<option value="12"<?php if ($feather->forum_settings['o_default_timezone'] == 12) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+12:00') ?></option>
-											<option value="12.75"<?php if ($feather->forum_settings['o_default_timezone'] == 12.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+12:45') ?></option>
-											<option value="13"<?php if ($feather->forum_settings['o_default_timezone'] == 13) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+13:00') ?></option>
-											<option value="14"<?php if ($feather->forum_settings['o_default_timezone'] == 14) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+14:00') ?></option>
-										</select>
-										<span><?php _e('Timezone help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('DST label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather->forum_settings['o_default_dst'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather->forum_settings['o_default_dst'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('DST help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Language label') ?></th>
-									<td>
-										<select name="form_default_lang">
-<?php
-        foreach ($languages as $temp) {
-            if ($feather->forum_settings['o_default_lang'] == $temp) {
-                echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
-            } else {
-                echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
-            }
-        }
+<div class="blockform">
+	<h2><span><?php _e('Options head') ?></span></h2>
+	<div class="box">
+		<form method="post" action="<?php echo Url::get('admin/options/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
+			<div class="inform">
+				<input type="hidden" name="form_sent" value="1" />
+				<fieldset>
+					<legend><?php _e('Essentials subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Board title label') ?></th>
+								<td>
+									<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo Utils::escape($feather->forum_settings['o_board_title']) ?>" />
+									<span><?php _e('Board title help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Board desc label') ?></th>
+								<td>
+									<textarea name="form_board_desc" cols="60" rows="3"><?php echo Utils::escape($feather->forum_settings['o_board_desc']) ?></textarea>
+									<span><?php _e('Board desc help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Base URL label') ?></th>
+								<td>
+									<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo Utils::escape($feather->forum_settings['o_base_url']) ?>" />
+									<span><?php _e('Base URL help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Timezone label') ?></th>
+								<td>
+									<select name="form_default_timezone">
+										<option value="-12"<?php if ($feather->forum_settings['o_default_timezone'] == -12) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-12:00') ?></option>
+										<option value="-11"<?php if ($feather->forum_settings['o_default_timezone'] == -11) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-11:00') ?></option>
+										<option value="-10"<?php if ($feather->forum_settings['o_default_timezone'] == -10) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-10:00') ?></option>
+										<option value="-9.5"<?php if ($feather->forum_settings['o_default_timezone'] == -9.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-09:30') ?></option>
+										<option value="-9"<?php if ($feather->forum_settings['o_default_timezone'] == -9) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-09:00') ?></option>
+										<option value="-8.5"<?php if ($feather->forum_settings['o_default_timezone'] == -8.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-08:30') ?></option>
+										<option value="-8"<?php if ($feather->forum_settings['o_default_timezone'] == -8) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-08:00') ?></option>
+										<option value="-7"<?php if ($feather->forum_settings['o_default_timezone'] == -7) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-07:00') ?></option>
+										<option value="-6"<?php if ($feather->forum_settings['o_default_timezone'] == -6) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-06:00') ?></option>
+										<option value="-5"<?php if ($feather->forum_settings['o_default_timezone'] == -5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-05:00') ?></option>
+										<option value="-4"<?php if ($feather->forum_settings['o_default_timezone'] == -4) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-04:00') ?></option>
+										<option value="-3.5"<?php if ($feather->forum_settings['o_default_timezone'] == -3.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-03:30') ?></option>
+										<option value="-3"<?php if ($feather->forum_settings['o_default_timezone'] == -3) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-03:00') ?></option>
+										<option value="-2"<?php if ($feather->forum_settings['o_default_timezone'] == -2) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-02:00') ?></option>
+										<option value="-1"<?php if ($feather->forum_settings['o_default_timezone'] == -1) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-01:00') ?></option>
+										<option value="0"<?php if ($feather->forum_settings['o_default_timezone'] == 0) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC') ?></option>
+										<option value="1"<?php if ($feather->forum_settings['o_default_timezone'] == 1) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+01:00') ?></option>
+										<option value="2"<?php if ($feather->forum_settings['o_default_timezone'] == 2) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+02:00') ?></option>
+										<option value="3"<?php if ($feather->forum_settings['o_default_timezone'] == 3) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+03:00') ?></option>
+										<option value="3.5"<?php if ($feather->forum_settings['o_default_timezone'] == 3.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+03:30') ?></option>
+										<option value="4"<?php if ($feather->forum_settings['o_default_timezone'] == 4) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+04:00') ?></option>
+										<option value="4.5"<?php if ($feather->forum_settings['o_default_timezone'] == 4.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+04:30') ?></option>
+										<option value="5"<?php if ($feather->forum_settings['o_default_timezone'] == 5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+05:00') ?></option>
+										<option value="5.5"<?php if ($feather->forum_settings['o_default_timezone'] == 5.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+05:30') ?></option>
+										<option value="5.75"<?php if ($feather->forum_settings['o_default_timezone'] == 5.75) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+05:45') ?></option>
+										<option value="6"<?php if ($feather->forum_settings['o_default_timezone'] == 6) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+06:00') ?></option>
+										<option value="6.5"<?php if ($feather->forum_settings['o_default_timezone'] == 6.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+06:30') ?></option>
+										<option value="7"<?php if ($feather->forum_settings['o_default_timezone'] == 7) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+07:00') ?></option>
+										<option value="8"<?php if ($feather->forum_settings['o_default_timezone'] == 8) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+08:00') ?></option>
+										<option value="8.75"<?php if ($feather->forum_settings['o_default_timezone'] == 8.75) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+08:45') ?></option>
+										<option value="9"<?php if ($feather->forum_settings['o_default_timezone'] == 9) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+09:00') ?></option>
+										<option value="9.5"<?php if ($feather->forum_settings['o_default_timezone'] == 9.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+09:30') ?></option>
+										<option value="10"<?php if ($feather->forum_settings['o_default_timezone'] == 10) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+10:00') ?></option>
+										<option value="10.5"<?php if ($feather->forum_settings['o_default_timezone'] == 10.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+10:30') ?></option>
+										<option value="11"<?php if ($feather->forum_settings['o_default_timezone'] == 11) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+11:00') ?></option>
+										<option value="11.5"<?php if ($feather->forum_settings['o_default_timezone'] == 11.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+11:30') ?></option>
+										<option value="12"<?php if ($feather->forum_settings['o_default_timezone'] == 12) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+12:00') ?></option>
+										<option value="12.75"<?php if ($feather->forum_settings['o_default_timezone'] == 12.75) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+12:45') ?></option>
+										<option value="13"<?php if ($feather->forum_settings['o_default_timezone'] == 13) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+13:00') ?></option>
+										<option value="14"<?php if ($feather->forum_settings['o_default_timezone'] == 14) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+14:00') ?></option>
+									</select>
+									<span><?php _e('Timezone help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('DST label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather->forum_settings['o_default_dst'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather->forum_settings['o_default_dst'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('DST help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Language label') ?></th>
+								<td>
+									<select name="form_default_lang">
+										<?php echo $languages; ?>
+									</select>
+									<span><?php _e('Language help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Default style label') ?></th>
+								<td>
+									<select name="form_default_style">
+										<?php echo $styles; ?>
+									</select>
+									<span><?php _e('Default style help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<?php
 
-?>
-										</select>
-										<span><?php _e('Language help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Default style label') ?></th>
-									<td>
-										<select name="form_default_style">
-											<?php echo $styles; ?>
-										</select>
-										<span><?php _e('Default style help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-    $diff = ($feather->user->timezone + $feather->user->dst) * 3600;
-    $timestamp = time() + $diff;
+			$diff = ($feather->user->timezone + $feather->user->dst) * 3600;
+			$timestamp = time() + $diff;
 
-?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Timeouts subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Time format label') ?></th>
-									<td>
-										<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo Utils::escape($feather->forum_settings['o_time_format']) ?>" />
-										<span><?php printf(__('Time format help'), gmdate($feather->forum_settings['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Date format label') ?></th>
-									<td>
-										<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo Utils::escape($feather->forum_settings['o_date_format']) ?>" />
-										<span><?php printf(__('Date format help'), gmdate($feather->forum_settings['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Visit timeout label') ?></th>
-									<td>
-										<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_visit'] ?>" />
-										<span><?php _e('Visit timeout help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Online timeout label') ?></th>
-									<td>
-										<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_online'] ?>" />
-										<span><?php _e('Online timeout help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Redirect time label') ?></th>
-									<td>
-										<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_redirect_delay'] ?>" />
-										<span><?php _e('Redirect time help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Display subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Version number label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather->forum_settings['o_show_version'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather->forum_settings['o_show_version'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Version number help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Info in posts label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather->forum_settings['o_show_user_info'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather->forum_settings['o_show_user_info'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Info in posts help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Post count label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather->forum_settings['o_show_post_count'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather->forum_settings['o_show_post_count'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Post count help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Smilies label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather->forum_settings['o_smilies'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather->forum_settings['o_smilies'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Smilies help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Smilies sigs label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather->forum_settings['o_smilies_sig'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather->forum_settings['o_smilies_sig'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Smilies sigs help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Clickable links label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather->forum_settings['o_make_links'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather->forum_settings['o_make_links'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Clickable links help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Topic review label') ?></th>
-									<td>
-										<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_topic_review'] ?>" />
-										<span><?php _e('Topic review help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Topics per page label') ?></th>
-									<td>
-										<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_topics_default'] ?>" />
-										<span><?php _e('Topics per page help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Posts per page label') ?></th>
-									<td>
-										<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_posts_default'] ?>" />
-										<span><?php _e('Posts per page help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Indent label') ?></th>
-									<td>
-										<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_indent_num_spaces'] ?>" />
-										<span><?php _e('Indent help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Quote depth label') ?></th>
-									<td>
-										<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_quote_depth'] ?>" />
-										<span><?php _e('Quote depth help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Features subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Quick post label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather->forum_settings['o_quickpost'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather->forum_settings['o_quickpost'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Quick post help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Users online label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather->forum_settings['o_users_online'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather->forum_settings['o_users_online'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Users online help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><a name="censoring"></a><?php _e('Censor words label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather->forum_settings['o_censoring'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.$feather->url->get('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><a name="signatures"></a><?php _e('Signatures label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather->forum_settings['o_signatures'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather->forum_settings['o_signatures'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Signatures help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('User has posted label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather->forum_settings['o_show_dot'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather->forum_settings['o_show_dot'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('User has posted help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Topic views label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather->forum_settings['o_topic_views'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather->forum_settings['o_topic_views'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Topic views help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Quick jump label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather->forum_settings['o_quickjump'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather->forum_settings['o_quickjump'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Quick jump help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('GZip label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather->forum_settings['o_gzip'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather->forum_settings['o_gzip'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('GZip help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Search all label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather->forum_settings['o_search_all_forums'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather->forum_settings['o_search_all_forums'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Search all help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Menu items label') ?></th>
-									<td>
-										<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo Utils::escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
-										<span><?php _e('Menu items help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Feed subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Default feed label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather->forum_settings['o_feed_type'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('None') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather->forum_settings['o_feed_type'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('RSS') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather->forum_settings['o_feed_type'] == '2') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Atom') ?></strong></label>
-										<span class="clearb"><?php _e('Default feed help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Feed TTL label') ?></th>
-									<td>
-										<select name="form_feed_ttl">
-											<option value="0"<?php if ($feather->forum_settings['o_feed_ttl'] == '0') {
-    echo ' selected="selected"';
-} ?>><?php _e('No cache') ?></option>
-											<?php echo $times ?>
-										</select>
-										<span><?php _e('Feed TTL help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Reports subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Reporting method label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather->forum_settings['o_report_method'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Internal') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather->forum_settings['o_report_method'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('By e-mail') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather->forum_settings['o_report_method'] == '2') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Both') ?></strong></label>
-										<span class="clearb"><?php _e('Reporting method help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Mailing list label') ?></th>
-									<td>
-										<textarea name="form_mailing_list" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_mailing_list']) ?></textarea>
-										<span><?php _e('Mailing list help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Avatars subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Use avatars label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather->forum_settings['o_avatars'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather->forum_settings['o_avatars'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Use avatars help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Upload directory label') ?></th>
-									<td>
-										<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo Utils::escape($feather->forum_settings['o_avatars_dir']) ?>" />
-										<span><?php _e('Upload directory help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max width label') ?></th>
-									<td>
-										<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_width'] ?>" />
-										<span><?php _e('Max width help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max height label') ?></th>
-									<td>
-										<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_height'] ?>" />
-										<span><?php _e('Max height help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max size label') ?></th>
-									<td>
-										<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
-										<span><?php _e('Max size help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('E-mail subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Admin e-mail label') ?></th>
-									<td>
-										<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo Utils::escape($feather->forum_settings['o_admin_email']) ?>" />
-										<span><?php _e('Admin e-mail help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
-									<td>
-										<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo Utils::escape($feather->forum_settings['o_webmaster_email']) ?>" />
-										<span><?php _e('Webmaster e-mail help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Forum subscriptions label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Forum subscriptions help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Topic subscriptions label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Topic subscriptions help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('SMTP address label') ?></th>
-									<td>
-										<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo Utils::escape($feather->forum_settings['o_smtp_host']) ?>" />
-										<span><?php _e('SMTP address help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('SMTP username label') ?></th>
-									<td>
-										<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo Utils::escape($feather->forum_settings['o_smtp_user']) ?>" />
-										<span><?php _e('SMTP username help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('SMTP password label') ?></th>
-									<td>
-										<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
-<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? random_key($feather->utils->strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
-										<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
-										<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
-										<span><?php _e('SMTP password help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('SMTP SSL label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather->forum_settings['o_smtp_ssl'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather->forum_settings['o_smtp_ssl'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('SMTP SSL help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Registration subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Allow new label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather->forum_settings['o_regs_allow'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather->forum_settings['o_regs_allow'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Allow new help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Verify label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather->forum_settings['o_regs_verify'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather->forum_settings['o_regs_verify'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Verify help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Report new label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather->forum_settings['o_regs_report'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather->forum_settings['o_regs_report'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Report new help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Use rules label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather->forum_settings['o_rules'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather->forum_settings['o_rules'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Use rules help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Rules label') ?></th>
-									<td>
-										<textarea name="form_rules_message" rows="10" cols="55"><?php echo Utils::escape($feather->forum_settings['o_rules_message']) ?></textarea>
-										<span><?php _e('Rules help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('E-mail default label') ?></th>
-									<td>
-										<span><?php _e('E-mail default help') ?></span>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather->forum_settings['o_default_email_setting'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<?php _e('Display e-mail label') ?></label>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather->forum_settings['o_default_email_setting'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<?php _e('Hide allow form label') ?></label>
-										<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather->forum_settings['o_default_email_setting'] == '2') {
-    echo ' checked="checked"';
-} ?> />&#160;<?php _e('Hide both label') ?></label>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Announcement subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Display announcement label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather->forum_settings['o_announcement'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather->forum_settings['o_announcement'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Display announcement help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Announcement message label') ?></th>
-									<td>
-										<textarea name="form_announcement_message" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_announcement_message']) ?></textarea>
-										<span><?php _e('Announcement message help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Maintenance subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><a name="maintenance"></a><?php _e('Maintenance mode label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather->forum_settings['o_maintenance'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather->forum_settings['o_maintenance'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Maintenance mode help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Maintenance message label') ?></th>
-									<td>
-										<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
-										<span><?php _e('Maintenance message help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-			</form>
-		</div>
+			?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Timeouts subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Time format label') ?></th>
+								<td>
+									<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo Utils::escape($feather->forum_settings['o_time_format']) ?>" />
+									<span><?php printf(__('Time format help'), gmdate($feather->forum_settings['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Date format label') ?></th>
+								<td>
+									<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo Utils::escape($feather->forum_settings['o_date_format']) ?>" />
+									<span><?php printf(__('Date format help'), gmdate($feather->forum_settings['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Visit timeout label') ?></th>
+								<td>
+									<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_visit'] ?>" />
+									<span><?php _e('Visit timeout help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Online timeout label') ?></th>
+								<td>
+									<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_online'] ?>" />
+									<span><?php _e('Online timeout help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Redirect time label') ?></th>
+								<td>
+									<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_redirect_delay'] ?>" />
+									<span><?php _e('Redirect time help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Display subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Version number label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather->forum_settings['o_show_version'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather->forum_settings['o_show_version'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Version number help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Info in posts label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather->forum_settings['o_show_user_info'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather->forum_settings['o_show_user_info'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Info in posts help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Post count label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather->forum_settings['o_show_post_count'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather->forum_settings['o_show_post_count'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Post count help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Smilies label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather->forum_settings['o_smilies'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather->forum_settings['o_smilies'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Smilies help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Smilies sigs label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather->forum_settings['o_smilies_sig'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather->forum_settings['o_smilies_sig'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Smilies sigs help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Clickable links label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather->forum_settings['o_make_links'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather->forum_settings['o_make_links'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Clickable links help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Topic review label') ?></th>
+								<td>
+									<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_topic_review'] ?>" />
+									<span><?php _e('Topic review help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Topics per page label') ?></th>
+								<td>
+									<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_topics_default'] ?>" />
+									<span><?php _e('Topics per page help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Posts per page label') ?></th>
+								<td>
+									<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_posts_default'] ?>" />
+									<span><?php _e('Posts per page help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Indent label') ?></th>
+								<td>
+									<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_indent_num_spaces'] ?>" />
+									<span><?php _e('Indent help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Quote depth label') ?></th>
+								<td>
+									<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_quote_depth'] ?>" />
+									<span><?php _e('Quote depth help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Features subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Quick post label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather->forum_settings['o_quickpost'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather->forum_settings['o_quickpost'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Quick post help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Users online label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather->forum_settings['o_users_online'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather->forum_settings['o_users_online'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Users online help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><a name="censoring"></a><?php _e('Censor words label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather->forum_settings['o_censoring'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.Url::get('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><a name="signatures"></a><?php _e('Signatures label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather->forum_settings['o_signatures'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather->forum_settings['o_signatures'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Signatures help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('User has posted label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather->forum_settings['o_show_dot'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather->forum_settings['o_show_dot'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('User has posted help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Topic views label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather->forum_settings['o_topic_views'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather->forum_settings['o_topic_views'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Topic views help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Quick jump label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather->forum_settings['o_quickjump'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather->forum_settings['o_quickjump'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Quick jump help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('GZip label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather->forum_settings['o_gzip'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather->forum_settings['o_gzip'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('GZip help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Search all label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather->forum_settings['o_search_all_forums'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather->forum_settings['o_search_all_forums'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Search all help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Menu items label') ?></th>
+								<td>
+									<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo Utils::escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
+									<span><?php _e('Menu items help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Feed subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Default feed label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather->forum_settings['o_feed_type'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('None') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather->forum_settings['o_feed_type'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('RSS') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather->forum_settings['o_feed_type'] == '2') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Atom') ?></strong></label>
+									<span class="clearb"><?php _e('Default feed help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Feed TTL label') ?></th>
+								<td>
+									<select name="form_feed_ttl">
+										<option value="0"<?php if ($feather->forum_settings['o_feed_ttl'] == '0') {
+											echo ' selected="selected"';
+										} ?>><?php _e('No cache') ?></option>
+										<?php echo $times ?>
+									</select>
+									<span><?php _e('Feed TTL help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Reports subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Reporting method label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather->forum_settings['o_report_method'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Internal') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather->forum_settings['o_report_method'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('By e-mail') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather->forum_settings['o_report_method'] == '2') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Both') ?></strong></label>
+									<span class="clearb"><?php _e('Reporting method help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Mailing list label') ?></th>
+								<td>
+									<textarea name="form_mailing_list" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_mailing_list']) ?></textarea>
+									<span><?php _e('Mailing list help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Avatars subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Use avatars label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather->forum_settings['o_avatars'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather->forum_settings['o_avatars'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Use avatars help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Upload directory label') ?></th>
+								<td>
+									<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo Utils::escape($feather->forum_settings['o_avatars_dir']) ?>" />
+									<span><?php _e('Upload directory help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Max width label') ?></th>
+								<td>
+									<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_width'] ?>" />
+									<span><?php _e('Max width help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Max height label') ?></th>
+								<td>
+									<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_height'] ?>" />
+									<span><?php _e('Max height help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Max size label') ?></th>
+								<td>
+									<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
+									<span><?php _e('Max size help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('E-mail subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Admin e-mail label') ?></th>
+								<td>
+									<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo Utils::escape($feather->forum_settings['o_admin_email']) ?>" />
+									<span><?php _e('Admin e-mail help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
+								<td>
+									<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo Utils::escape($feather->forum_settings['o_webmaster_email']) ?>" />
+									<span><?php _e('Webmaster e-mail help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Forum subscriptions label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Forum subscriptions help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Topic subscriptions label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Topic subscriptions help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('SMTP address label') ?></th>
+								<td>
+									<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo Utils::escape($feather->forum_settings['o_smtp_host']) ?>" />
+									<span><?php _e('SMTP address help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('SMTP username label') ?></th>
+								<td>
+									<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo Utils::escape($feather->forum_settings['o_smtp_user']) ?>" />
+									<span><?php _e('SMTP username help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('SMTP password label') ?></th>
+								<td>
+									<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
+									<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? Random::key(Utils::strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
+									<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
+									<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
+									<span><?php _e('SMTP password help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('SMTP SSL label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather->forum_settings['o_smtp_ssl'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather->forum_settings['o_smtp_ssl'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('SMTP SSL help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Registration subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Allow new label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather->forum_settings['o_regs_allow'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather->forum_settings['o_regs_allow'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Allow new help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Verify label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather->forum_settings['o_regs_verify'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather->forum_settings['o_regs_verify'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Verify help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Report new label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather->forum_settings['o_regs_report'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather->forum_settings['o_regs_report'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Report new help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Use rules label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather->forum_settings['o_rules'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather->forum_settings['o_rules'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Use rules help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Rules label') ?></th>
+								<td>
+									<textarea name="form_rules_message" rows="10" cols="55"><?php echo Utils::escape($feather->forum_settings['o_rules_message']) ?></textarea>
+									<span><?php _e('Rules help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('E-mail default label') ?></th>
+								<td>
+									<span><?php _e('E-mail default help') ?></span>
+									<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather->forum_settings['o_default_email_setting'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<?php _e('Display e-mail label') ?></label>
+									<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather->forum_settings['o_default_email_setting'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<?php _e('Hide allow form label') ?></label>
+									<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather->forum_settings['o_default_email_setting'] == '2') {
+											echo ' checked="checked"';
+										} ?> />&#160;<?php _e('Hide both label') ?></label>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Announcement subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Display announcement label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather->forum_settings['o_announcement'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather->forum_settings['o_announcement'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Display announcement help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Announcement message label') ?></th>
+								<td>
+									<textarea name="form_announcement_message" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_announcement_message']) ?></textarea>
+									<span><?php _e('Announcement message help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Maintenance subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><a name="maintenance"></a><?php _e('Maintenance mode label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather->forum_settings['o_maintenance'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather->forum_settings['o_maintenance'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Maintenance mode help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Maintenance message label') ?></th>
+								<td>
+									<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
+									<span><?php _e('Maintenance message help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
+		</form>
 	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
+<div class="clearer"></div>
+</div>

From 783f0dcec1abe06475a5c99c859a0897218c026c Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 21:43:09 +0200
Subject: [PATCH 331/353] Use Error instead of \FeatherBB\Core\Error

---
 ...5bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache |  2 +-
 cache/cache_parser_data.php                   | 53 +----------
 extern.php                                    |  1 +
 featherbb/Controller/Admin/Bans.php           |  3 +-
 featherbb/Controller/Admin/Categories.php     |  5 +-
 featherbb/Controller/Admin/Censoring.php      |  1 +
 featherbb/Controller/Admin/Forums.php         |  1 +
 featherbb/Controller/Admin/Groups.php         |  5 +-
 featherbb/Controller/Admin/Index.php          |  7 +-
 featherbb/Controller/Admin/Maintenance.php    |  1 +
 featherbb/Controller/Admin/Options.php        |  1 +
 featherbb/Controller/Admin/Parser.php         | 21 +++--
 featherbb/Controller/Admin/Permissions.php    |  1 +
 featherbb/Controller/Admin/Plugins.php        | 15 +--
 featherbb/Controller/Admin/Reports.php        |  1 +
 featherbb/Controller/Admin/Statistics.php     |  3 +-
 featherbb/Controller/Admin/Users.php          |  9 +-
 featherbb/Controller/Auth.php                 |  9 +-
 featherbb/Controller/Delete.php               |  5 +-
 featherbb/Controller/Edit.php                 |  5 +-
 featherbb/Controller/Forum.php                |  1 +
 featherbb/Controller/Help.php                 |  1 +
 featherbb/Controller/Index.php                |  1 +
 featherbb/Controller/Install.php              |  1 +
 featherbb/Controller/Login.php                |  1 +
 featherbb/Controller/Misc.php                 |  9 +-
 featherbb/Controller/Moderate.php             | 19 ++--
 featherbb/Controller/Post.php                 |  9 +-
 featherbb/Controller/Profile.php              | 31 ++++---
 featherbb/Controller/Register.php             |  5 +-
 featherbb/Controller/Search.php               |  3 +-
 featherbb/Controller/Topic.php                |  1 +
 featherbb/Controller/Userlist.php             |  3 +-
 featherbb/Core/Email.php                      |  6 +-
 featherbb/Core/Search.php                     |  4 +-
 featherbb/Middleware/Auth.php                 |  3 +-
 featherbb/Middleware/Core.php                 |  1 +
 featherbb/Model/Admin/Bans.php                | 35 +++----
 featherbb/Model/Admin/Categories.php          |  1 +
 featherbb/Model/Admin/Censoring.php           |  5 +-
 featherbb/Model/Admin/Forums.php              |  1 +
 featherbb/Model/Admin/Groups.php              | 13 +--
 featherbb/Model/Admin/Maintenance.php         |  7 +-
 featherbb/Model/Admin/Options.php             | 25 ++---
 featherbb/Model/Admin/Parser.php              |  1 +
 featherbb/Model/Admin/Permissions.php         |  1 +
 featherbb/Model/Admin/Reports.php             |  1 +
 featherbb/Model/Admin/Statistics.php          |  1 +
 featherbb/Model/Admin/Users.php               | 35 +++----
 featherbb/Model/Auth.php                      |  1 +
 featherbb/Model/Cache.php                     |  1 +
 featherbb/Model/Debug.php                     |  1 +
 featherbb/Model/Delete.php                    |  3 +-
 featherbb/Model/Edit.php                      |  3 +-
 featherbb/Model/Forum.php                     |  3 +-
 featherbb/Model/Header.php                    |  1 +
 featherbb/Model/Index.php                     |  1 +
 featherbb/Model/Install.php                   |  1 +
 featherbb/Model/Login.php                     |  7 +-
 featherbb/Model/Misc.php                      | 43 ++++-----
 featherbb/Model/Moderate.php                  | 55 +++++------
 featherbb/Model/Post.php                      |  5 +-
 featherbb/Model/Profile.php                   | 91 ++++++++++---------
 featherbb/Model/Register.php                  |  5 +-
 featherbb/Model/Search.php                    | 43 ++++-----
 featherbb/Model/Topic.php                     |  7 +-
 featherbb/Model/Userlist.php                  |  1 +
 .../FeatherBB/view/admin/bans/add_ban.php     |  1 +
 .../FeatherBB/view/admin/bans/admin_bans.php  |  1 +
 .../FeatherBB/view/admin/bans/search_ban.php  |  1 +
 .../FeatherBB/view/admin/categories.php       |  1 +
 .../themes/FeatherBB/view/admin/censoring.php |  1 +
 .../view/admin/forums/admin_forums.php        |  1 +
 .../view/admin/forums/delete_forum.php        |  1 +
 .../view/admin/forums/permissions.php         |  1 +
 .../view/admin/groups/add_edit_group.php      |  1 +
 .../view/admin/groups/admin_groups.php        |  1 +
 .../view/admin/groups/confirm_delete.php      |  1 +
 .../view/admin/groups/delete_group.php        |  1 +
 style/themes/FeatherBB/view/admin/index.php   |  1 +
 style/themes/FeatherBB/view/admin/loader.php  |  1 +
 .../admin/maintenance/admin_maintenance.php   |  1 +
 .../view/admin/maintenance/prune.php          |  1 +
 .../view/admin/maintenance/rebuild.php        |  1 +
 style/themes/FeatherBB/view/admin/menu.php    |  1 +
 style/themes/FeatherBB/view/admin/options.php |  1 +
 style/themes/FeatherBB/view/admin/parser.php  |  1 +
 .../FeatherBB/view/admin/permissions.php      |  1 +
 style/themes/FeatherBB/view/admin/plugins.php |  1 +
 style/themes/FeatherBB/view/admin/reports.php |  1 +
 .../FeatherBB/view/admin/statistics.php       |  1 +
 .../view/admin/users/admin_users.php          |  1 +
 .../FeatherBB/view/admin/users/ban_users.php  |  1 +
 .../view/admin/users/delete_users.php         |  1 +
 .../FeatherBB/view/admin/users/find_users.php |  1 +
 .../FeatherBB/view/admin/users/move_users.php |  1 +
 .../FeatherBB/view/admin/users/search_ip.php  |  1 +
 .../FeatherBB/view/admin/users/show_users.php |  1 +
 style/themes/FeatherBB/view/delete.php        |  1 +
 style/themes/FeatherBB/view/edit.php          |  1 +
 style/themes/FeatherBB/view/error.php         |  1 +
 style/themes/FeatherBB/view/footer.php        |  1 +
 style/themes/FeatherBB/view/forum.php         |  1 +
 style/themes/FeatherBB/view/header.php        |  1 +
 style/themes/FeatherBB/view/help.php          |  1 +
 style/themes/FeatherBB/view/index.php         |  1 +
 style/themes/FeatherBB/view/install.php       |  1 +
 style/themes/FeatherBB/view/login/form.php    |  1 +
 .../view/login/password_forgotten.php         |  1 +
 style/themes/FeatherBB/view/misc/email.php    |  1 +
 style/themes/FeatherBB/view/misc/report.php   |  1 +
 style/themes/FeatherBB/view/misc/rules.php    |  1 +
 .../FeatherBB/view/moderate/delete_posts.php  |  1 +
 .../FeatherBB/view/moderate/delete_topics.php |  1 +
 .../FeatherBB/view/moderate/merge_topics.php  |  1 +
 .../view/moderate/moderator_forum.php         |  1 +
 .../FeatherBB/view/moderate/move_topics.php   |  1 +
 .../FeatherBB/view/moderate/posts_view.php    |  1 +
 .../FeatherBB/view/moderate/split_posts.php   |  1 +
 style/themes/FeatherBB/view/post.php          |  1 +
 .../FeatherBB/view/profile/change_mail.php    |  1 +
 .../FeatherBB/view/profile/change_pass.php    |  1 +
 .../FeatherBB/view/profile/delete_user.php    |  1 +
 style/themes/FeatherBB/view/profile/menu.php  |  1 +
 .../FeatherBB/view/profile/section_admin.php  |  1 +
 .../view/profile/section_display.php          |  1 +
 .../view/profile/section_essentials.php       |  1 +
 .../view/profile/section_messaging.php        |  1 +
 .../view/profile/section_personal.php         |  1 +
 .../view/profile/section_personality.php      |  1 +
 .../view/profile/section_privacy.php          |  1 +
 .../FeatherBB/view/profile/upload_avatar.php  |  1 +
 .../FeatherBB/view/profile/view_profile.php   |  1 +
 .../themes/FeatherBB/view/register/email.php  |  1 +
 style/themes/FeatherBB/view/register/form.php |  1 +
 .../themes/FeatherBB/view/register/rules.php  |  1 +
 style/themes/FeatherBB/view/search/footer.php |  1 +
 style/themes/FeatherBB/view/search/form.php   |  1 +
 style/themes/FeatherBB/view/search/header.php |  1 +
 style/themes/FeatherBB/view/search/posts.php  |  1 +
 style/themes/FeatherBB/view/search/topics.php |  1 +
 style/themes/FeatherBB/view/topic.php         |  1 +
 style/themes/FeatherBB/view/userlist.php      |  1 +
 view/admin/options.php                        |  1 +
 view/delete.php                               |  1 +
 145 files changed, 408 insertions(+), 316 deletions(-)

diff --git a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
index ace76b35..c50c9931 100644
--- a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
+++ b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
@@ -1 +1 @@
-{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1441544494,"expire":0,"data":"a:4:{i:1;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:2;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:3;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:4;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1441512071,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:23:\"Lighter than a feather.\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:11:\"deuh@oij.gt\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:17:\"style\/img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:26:\"http:\/\/localhost\/featherbb\";s:13:\"o_admin_email\";s:11:\"deuh@oij.gt\";s:17:\"o_webmaster_email\";s:11:\"deuh@oij.gt\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"0\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1441510035,"expire":0,"data":"a:3:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;s:13:\"\\Plugins\\Test\";b:1;}"}}
\ No newline at end of file
+{"config":{"time":1441567686,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1441556741,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1441556741,"expire":0,"data":"a:2:{s:11:\"total_users\";i:5;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"6\";s:8:\"username\";s:3:\"mod\";}}"},"quickjump":{"time":1441556741,"expire":0,"data":"a:4:{i:1;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:2;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:3;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:4;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}}"},"admin_ids":{"time":1441556743,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"stopwords":{"time":1441567277,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"search_for":{"time":1441567784,"expire":0,"data":"a:1:{i:0;s:47:\"%(?<=[^\\p{L}\\p{N}])(feqszf)(?=[^\\p{L}\\p{N}])%iu\";}"},"replace_with":{"time":1441567784,"expire":0,"data":"a:1:{i:0;s:6:\"zefezf\";}"}}
\ No newline at end of file
diff --git a/cache/cache_parser_data.php b/cache/cache_parser_data.php
index 1ab52462..be63f1cb 100644
--- a/cache/cache_parser_data.php
+++ b/cache/cache_parser_data.php
@@ -1,4 +1,4 @@
-<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 03:54:56. DO NOT EDIT!!!
+<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 09:21:25. DO NOT EDIT!!!
 $pd = array (
   'newer_php_version' => true,
   'in_signature' => false,
@@ -73,7 +73,7 @@
   're_bbcode' => '% # re_bbcode Rev:20110220_1200
 # First, match opening tag of syntax: "[TAGNAME (= ("\')ATTRIBUTE("\') )]";
 \\[                              # Match opening bracket of outermost opening TAGNAME tag.
-(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err|dbug)\\s*+) # $1:
+(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err)\\s*+) # $1:
 (?>                             # Atomically group remainder of opening tag.
   (?:                           # Optional attribute.
     (=)\\s*+                     # $2: = Optional attribute\'s equals sign delimiter, ws.
@@ -112,7 +112,7 @@
   're_bbtag' => '%# re_bbtag Rev:20110220_1200
 # Match open or close BBtag.
 \\[/?+                           # Match opening bracket of outermost opening TAGNAME tag.
-(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err|dbug)\\s*+) #$1:
+(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err)\\s*+) #$1:
 (?:                             # Optional attribute.
   (=)\\s*+                       # $2: = Optional attribute\'s equals sign delimiter, ws.
   (?:                           # Group for 1-line attribute value alternatives.
@@ -284,7 +284,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'code' => 
@@ -343,7 +342,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'colour' => 
@@ -374,7 +372,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'del' => 
@@ -405,7 +402,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'email' => 
@@ -444,7 +440,6 @@
         '*' => true,
         'quote' => true,
         'url' => true,
-        'dbug' => true,
       ),
     ),
     'em' => 
@@ -475,7 +470,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'h' => 
@@ -506,7 +500,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'img' => 
@@ -566,7 +559,6 @@
         'large' => true,
         'small' => true,
         'err' => true,
-        'dbug' => true,
       ),
     ),
     'ins' => 
@@ -597,7 +589,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'i' => 
@@ -628,7 +619,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'table' => 
@@ -681,7 +671,6 @@
         'youtube' => true,
         'large' => true,
         'small' => true,
-        'dbug' => true,
       ),
       'tags_only' => true,
     ),
@@ -738,7 +727,6 @@
         'youtube' => true,
         'large' => true,
         'small' => true,
-        'dbug' => true,
       ),
       'tags_only' => true,
     ),
@@ -862,7 +850,6 @@
         'large' => true,
         'small' => true,
         'err' => true,
-        'dbug' => true,
       ),
       'tags_only' => true,
     ),
@@ -948,7 +935,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'sup' => 
@@ -979,7 +965,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     's' => 
@@ -1010,7 +995,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'tt' => 
@@ -1071,7 +1055,6 @@
         '*' => true,
         'quote' => true,
         'url' => true,
-        'dbug' => true,
       ),
     ),
     'u' => 
@@ -1102,7 +1085,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'center' => 
@@ -1133,7 +1115,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'right' => 
@@ -1164,7 +1145,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'left' => 
@@ -1195,7 +1175,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'justify' => 
@@ -1226,7 +1205,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'youtube' => 
@@ -1289,7 +1267,6 @@
         'large' => true,
         'small' => true,
         'err' => true,
-        'dbug' => true,
       ),
       'x_padding' => 20,
       'y_padding' => 45,
@@ -1322,7 +1299,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'small' => 
@@ -1353,7 +1329,6 @@
         'list' => true,
         '*' => true,
         'quote' => true,
-        'dbug' => true,
       ),
     ),
     'err' => 
@@ -1384,28 +1359,6 @@
       array (
       ),
     ),
-    'dbug' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><p class="debug" title="%a_str%">
%c_str%
</p><p>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
     '_ROOT_' => 
     array (
       'depth' => 0,
diff --git a/extern.php b/extern.php
index 122992d1..634c3604 100644
--- a/extern.php
+++ b/extern.php
@@ -57,6 +57,7 @@
 
 namespace FeatherBB;
 use DB;
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Cache;
diff --git a/featherbb/Controller/Admin/Bans.php b/featherbb/Controller/Admin/Bans.php
index e2643509..2bfb3e7f 100644
--- a/featherbb/Controller/Admin/Bans.php
+++ b/featherbb/Controller/Admin/Bans.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
@@ -26,7 +27,7 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/bans.mo');
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-            throw new \FeatherBB\Core\Error(__('No permission'), '403');
+            throw new Error(__('No permission'), '403');
         }
     }
 
diff --git a/featherbb/Controller/Admin/Categories.php b/featherbb/Controller/Admin/Categories.php
index 738c6803..aa7ff21d 100644
--- a/featherbb/Controller/Admin/Categories.php
+++ b/featherbb/Controller/Admin/Categories.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
@@ -49,7 +50,7 @@ public function add_category()
     public function edit_categories()
     {
         if (empty($this->request->post('cat'))) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), '400');
+            throw new Error(__('Bad request'), '400');
         }
 
         foreach ($this->request->post('cat') as $cat_id => $properties) {
@@ -74,7 +75,7 @@ public function delete_category()
         $cat_to_delete = (int) $this->request->post('cat_to_delete');
 
         if ($cat_to_delete < 1) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), '400');
+            throw new Error(__('Bad request'), '400');
         }
 
         if (intval($this->request->post('disclaimer')) != 1) {
diff --git a/featherbb/Controller/Admin/Censoring.php b/featherbb/Controller/Admin/Censoring.php
index 6ca15152..72fd3c11 100644
--- a/featherbb/Controller/Admin/Censoring.php
+++ b/featherbb/Controller/Admin/Censoring.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
index 7f51062e..b05b20ab 100644
--- a/featherbb/Controller/Admin/Forums.php
+++ b/featherbb/Controller/Admin/Forums.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
diff --git a/featherbb/Controller/Admin/Groups.php b/featherbb/Controller/Admin/Groups.php
index 154d130a..d91eca93 100644
--- a/featherbb/Controller/Admin/Groups.php
+++ b/featherbb/Controller/Admin/Groups.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
@@ -55,12 +56,12 @@ public function display()
     public function delete($id)
     {
         if ($id < 5) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 403);
+            throw new Error(__('Bad request'), 403);
         }
 
         // Make sure we don't remove the default group
         if ($id == $this->config['o_default_user_group']) {
-            throw new \FeatherBB\Core\Error(__('Cannot remove default message'), 403);
+            throw new Error(__('Cannot remove default message'), 403);
         }
 
         // Check if this group has any members
diff --git a/featherbb/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
index 98dc0217..eca9cec8 100644
--- a/featherbb/Controller/Admin/Index.php
+++ b/featherbb/Controller/Admin/Index.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
@@ -50,12 +51,12 @@ public function display($action = null)
         // Check for upgrade
         if ($action == 'check_upgrade') {
             if (!ini_get('allow_url_fopen')) {
-                throw new \FeatherBB\Core\Error(__('fopen disabled message'), 500);
+                throw new Error(__('fopen disabled message'), 500);
             }
 
             $latest_version = trim(@file_get_contents('http://featherbb.org/latest_version'));
             if (empty($latest_version)) {
-                throw new \FeatherBB\Core\Error(__('Upgrade check failed message'), 500);
+                throw new Error(__('Upgrade check failed message'), 500);
             }
 
             if (version_compare($this->config['o_cur_version'], $latest_version, '>=')) {
@@ -71,7 +72,7 @@ public function display($action = null)
             if ($deleted) {
                 Url::redirect($this->feather->urlFor('adminIndex'), __('Deleted install.php redirect'));
             } else {
-                throw new \FeatherBB\Core\Error(__('Delete install.php failed'), 500);
+                throw new Error(__('Delete install.php failed'), 500);
             }
         }
 
diff --git a/featherbb/Controller/Admin/Maintenance.php b/featherbb/Controller/Admin/Maintenance.php
index 07942596..86aa5081 100644
--- a/featherbb/Controller/Admin/Maintenance.php
+++ b/featherbb/Controller/Admin/Maintenance.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
diff --git a/featherbb/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
index b68d3520..04f7c503 100644
--- a/featherbb/Controller/Admin/Options.php
+++ b/featherbb/Controller/Admin/Options.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
index d3bc9a29..fe7d68d8 100644
--- a/featherbb/Controller/Admin/Parser.php
+++ b/featherbb/Controller/Admin/Parser.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
@@ -66,26 +67,26 @@ public function display()
                                     if (move_uploaded_file($f['tmp_name'], $this->feather->forum_env['FEATHER_ROOT'] .'style/img/smilies/'. $name)) {
                                         Url::redirect($this->feather->urlFor('adminParser'), $lang_admin_parser['upload success']);
                                     } else { //  Error #1: 'Smiley upload failed. Unable to move to smiley folder.'.
-                                        throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_1'], 500);
+                                        throw new Error($lang_admin_parser['upload_err_1'], 500);
                                     }
                                 } else { // Error #2: 'Smiley upload failed. File is too big.'
-                                    throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_2'], 400);
+                                    throw new Error($lang_admin_parser['upload_err_2'], 400);
                                 }
                             } else { // Error #3: 'Smiley upload failed. File type is not an image.'.
-                                throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_3'], 400);
+                                throw new Error($lang_admin_parser['upload_err_3'], 400);
                             }
                         } else { // Error #4: 'Smiley upload failed. Bad filename.'
-                            throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_4'], 400);
+                            throw new Error($lang_admin_parser['upload_err_4'], 400);
                         }
                         break;
                     case 1: // case 1 similar to case 2 so fall through...
-                    case 2: throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_2'], 400);    // File exceeds MAX_FILE_SIZE.
-                    case 3: throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_5'], 400);    // File only partially uploaded.
+                    case 2: throw new Error($lang_admin_parser['upload_err_2'], 400);    // File exceeds MAX_FILE_SIZE.
+                    case 3: throw new Error($lang_admin_parser['upload_err_5'], 400);    // File only partially uploaded.
                     //		case 4: break; // No error. Normal response when this form element left empty
-                    case 4: throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_6'], 400);    // No filename.
-                    case 6: throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_7'], 500);    // No temp folder.
-                    case 7: throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_8'], 500);    // Cannot write to disk.
-                    default: throw new \FeatherBB\Core\Error($lang_admin_parser['upload_err_9'], 500);        // Generic/unknown error
+                    case 4: throw new Error($lang_admin_parser['upload_err_6'], 400);    // No filename.
+                    case 6: throw new Error($lang_admin_parser['upload_err_7'], 500);    // No temp folder.
+                    case 7: throw new Error($lang_admin_parser['upload_err_8'], 500);    // Cannot write to disk.
+                    default: throw new Error($lang_admin_parser['upload_err_9'], 500);        // Generic/unknown error
                 }
             }
 
diff --git a/featherbb/Controller/Admin/Permissions.php b/featherbb/Controller/Admin/Permissions.php
index eafad9fe..cb3f8f0b 100644
--- a/featherbb/Controller/Admin/Permissions.php
+++ b/featherbb/Controller/Admin/Permissions.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
index 703077ee..db55b655 100644
--- a/featherbb/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
@@ -54,12 +55,12 @@ public function activate()
         // The plugin to load should be supplied via GET
         $class = $this->request->get('plugin') ? $this->request->get('plugin') : null;
         if (!$class) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         // Check if plugin follows PSR-4 conventions and extends base forum plugin
         if (!class_exists($class) || !property_exists($class, 'isValidFBPlugin')) {
-            throw new \FeatherBB\Core\Error(sprintf(__('No plugin message'), Utils::escape($class)), 400);
+            throw new Error(sprintf(__('No plugin message'), Utils::escape($class)), 400);
         }
 
         $plugin = new $class;
@@ -77,7 +78,7 @@ public function deactivate()
         // The plugin to load should be supplied via GET
         $class = $this->request->get('plugin') ? $this->request->get('plugin') : null;
         if (!$class) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         $plugin = new $class;
@@ -95,18 +96,18 @@ public function display()
         // The plugin to load should be supplied via GET
         $plugin = $this->request->get('plugin') ? $this->request->get('plugin') : '';
         if (!preg_match('%^AM?P_(\w*?)\.php$%i', $plugin)) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         // AP_ == Admins only, AMP_ == admins and moderators
         $prefix = substr($plugin, 0, strpos($plugin, '_'));
         if ($this->user->g_moderator == '1' && $prefix == 'AP') {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
+            throw new Error(__('No permission'), 403);
         }
 
         // Make sure the file actually exists
         if (!file_exists($this->feather->forum_env['FEATHER_ROOT'].'plugins/'.$plugin)) {
-            throw new \FeatherBB\Core\Error(sprintf(__('No plugin message'), Utils::escape($plugin)), 400);
+            throw new Error(sprintf(__('No plugin message'), Utils::escape($plugin)), 400);
         }
 
         // Construct REQUEST_URI if it isn't set TODO?
@@ -119,7 +120,7 @@ public function display()
         // get the "blank page of death"
         include $this->feather->forum_env['FEATHER_ROOT'].'plugins/'.$plugin;
         if (!defined('FEATHER_PLUGIN_LOADED')) {
-            throw new \FeatherBB\Core\Error(sprintf(__('Plugin failed message'), Utils::escape($plugin)));
+            throw new Error(sprintf(__('Plugin failed message'), Utils::escape($plugin)));
         }
 
         $this->feather->template->setPageInfo(array(
diff --git a/featherbb/Controller/Admin/Reports.php b/featherbb/Controller/Admin/Reports.php
index d5419dfe..241f90ea 100644
--- a/featherbb/Controller/Admin/Reports.php
+++ b/featherbb/Controller/Admin/Reports.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
diff --git a/featherbb/Controller/Admin/Statistics.php b/featherbb/Controller/Admin/Statistics.php
index 97a729d9..6aaf714d 100644
--- a/featherbb/Controller/Admin/Statistics.php
+++ b/featherbb/Controller/Admin/Statistics.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
@@ -51,7 +52,7 @@ public function phpinfo()
         // Show phpinfo() output
         // Is phpinfo() a disabled function?
         if (strpos(strtolower((string) ini_get('disable_functions')), 'phpinfo') !== false) {
-            throw new \FeatherBB\Core\Error(__('PHPinfo disabled message'), 404);
+            throw new Error(__('PHPinfo disabled message'), 404);
         }
 
         phpinfo();
diff --git a/featherbb/Controller/Admin/Users.php b/featherbb/Controller/Admin/Users.php
index 74b8b36e..8b76cae9 100644
--- a/featherbb/Controller/Admin/Users.php
+++ b/featherbb/Controller/Admin/Users.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
@@ -36,7 +37,7 @@ public function display()
         // Move multiple users to other user groups
         if ($this->request->post('move_users') || $this->request->post('move_users_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                throw new Error(__('No permission'), 403);
             }
 
             AdminUtils::generateAdminMenu('users');
@@ -54,7 +55,7 @@ public function display()
         // Delete multiple users
         if ($this->request->post('delete_users') || $this->request->post('delete_users_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                throw new Error(__('No permission'), 403);
             }
 
             AdminUtils::generateAdminMenu('users');
@@ -72,7 +73,7 @@ public function display()
         // Ban multiple users
         if ($this->request->post('ban_users') || $this->request->post('ban_users_comply')) {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-                throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                throw new Error(__('No permission'), 403);
             }
 
             AdminUtils::generateAdminMenu('users');
@@ -168,7 +169,7 @@ public function ipstats($id)
     public function showusers($ip)
     {
         if (!@preg_match('%^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$%', $ip) && !@preg_match('%^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$%', $ip)) {
-            throw new \FeatherBB\Core\Error(__('Bad IP message'), 400);
+            throw new Error(__('Bad IP message'), 400);
         }
 
         // Fetch user count
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
index 61ed04e6..9c7fe91c 100644
--- a/featherbb/Controller/Auth.php
+++ b/featherbb/Controller/Auth.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Random;
@@ -60,7 +61,7 @@ public function login()
                     Url::redirect($this->feather->urlFor('home'), __('Login redirect'));
                 }
             }
-            throw new \FeatherBB\Core\Error(__('Wrong user/pass').' <a href="'.Url::get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
+            throw new Error(__('Wrong user/pass').' <a href="'.Url::get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
         } else {
             $this->feather->template->setPageInfo(array(
                                 'active_page' => 'login',
@@ -103,7 +104,7 @@ public function forget()
             // Validate the email address
             $email = strtolower(Utils::trim($this->feather->request->post('req_email')));
             if (!$this->feather->email->is_valid_email($email)) {
-                throw new \FeatherBB\Core\Error(__('Invalid email'), 400);
+                throw new Error(__('Invalid email'), 400);
             }
             $user = ModelAuth::get_user_from_email($email);
 
@@ -124,7 +125,7 @@ public function forget()
                 $mail_message = $this->feather->hooks->fire('mail_message_password_forgotten', $mail_message);
 
                 if ($user->last_email_sent != '' && (time() - $user->last_email_sent) < 3600 && (time() - $user->last_email_sent) >= 0) {
-                    throw new \FeatherBB\Core\Error(sprintf(__('Email flood'), intval((3600 - (time() - $user->last_email_sent)) / 60)), 429);
+                    throw new Error(sprintf(__('Email flood'), intval((3600 - (time() - $user->last_email_sent)) / 60)), 429);
                 }
 
                 // Generate a new password and a new password activation code
@@ -143,7 +144,7 @@ public function forget()
 
                 Url::redirect($this->feather->urlFor('home'), __('Forget mail').' <a href="mailto:'.$this->feather->utils->escape($this->feather->forum_settings['o_admin_email']).'">'.$this->feather->utils->escape($this->feather->forum_settings['o_admin_email']).'</a>.', 200);
             } else {
-                throw new \FeatherBB\Core\Error(__('No email match').' '.Utils::escape($email).'.', 400);
+                throw new Error(__('No email match').' '.Utils::escape($email).'.', 400);
             }
         }
 
diff --git a/featherbb/Controller/Delete.php b/featherbb/Controller/Delete.php
index c3a02c3e..3768c242 100644
--- a/featherbb/Controller/Delete.php
+++ b/featherbb/Controller/Delete.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
@@ -43,11 +44,11 @@ public function deletepost($id)
                 $cur_post['poster_id'] != $this->feather->user->id ||
                 $cur_post['closed'] == '1') &&
                 !$is_admmod) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
+            throw new Error(__('No permission'), 403);
         }
 
         if ($is_admmod && $this->feather->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], Utils::get_admin_ids())) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
+            throw new Error(__('No permission'), 403);
         }
 
         if ($this->feather->request()->isPost()) {
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index f81b4ce5..e5a07025 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
@@ -46,11 +47,11 @@ public function editpost($id)
 
         // Do we have permission to edit this post?
         if (($this->user->g_edit_posts == '0' || $cur_post['poster_id'] != $this->user->id || $cur_post['closed'] == '1') && !$is_admmod) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
+            throw new Error(__('No permission'), 403);
         }
 
         if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], Utils::get_admin_ids())) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
+            throw new Error(__('No permission'), 403);
         }
 
         // Start with a clean slate
diff --git a/featherbb/Controller/Forum.php b/featherbb/Controller/Forum.php
index 2096e98d..bb99a5ef 100644
--- a/featherbb/Controller/Forum.php
+++ b/featherbb/Controller/Forum.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/featherbb/Controller/Help.php b/featherbb/Controller/Help.php
index c4cc6f71..b37142fe 100644
--- a/featherbb/Controller/Help.php
+++ b/featherbb/Controller/Help.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/featherbb/Controller/Index.php b/featherbb/Controller/Index.php
index 10f97fab..5cb121f3 100644
--- a/featherbb/Controller/Index.php
+++ b/featherbb/Controller/Index.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
index c30e73bd..9281e130 100644
--- a/featherbb/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Random;
diff --git a/featherbb/Controller/Login.php b/featherbb/Controller/Login.php
index dfc4a063..ebfd360c 100644
--- a/featherbb/Controller/Login.php
+++ b/featherbb/Controller/Login.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/featherbb/Controller/Misc.php b/featherbb/Controller/Misc.php
index 7956f807..03a8d074 100644
--- a/featherbb/Controller/Misc.php
+++ b/featherbb/Controller/Misc.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Track;
@@ -26,7 +27,7 @@ public function __construct()
     public function rules()
     {
         if ($this->feather->forum_settings['o_rules'] == '0' || ($this->feather->user->is_guest && $this->feather->user->g_read_board == '0' && $this->feather->forum_settings['o_regs_allow'] == '0')) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         $this->feather->template->setPageInfo(array(
@@ -77,17 +78,17 @@ public function unsubscribetopic($id)
     public function email($id)
     {
         if ($this->feather->user->g_send_email == '0') {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
+            throw new Error(__('No permission'), 403);
         }
 
         if ($id < 2) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         $mail = $this->model->get_info_mail($id);
 
         if ($mail['email_setting'] == 2 && !$this->feather->user->is_admmod) {
-            throw new \FeatherBB\Core\Error(__('Form email disabled'), 403);
+            throw new Error(__('Form email disabled'), 403);
         }
 
 
diff --git a/featherbb/Controller/Moderate.php b/featherbb/Controller/Moderate.php
index 5efe0ddd..41fcd564 100644
--- a/featherbb/Controller/Moderate.php
+++ b/featherbb/Controller/Moderate.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
@@ -49,7 +50,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
+            throw new Error(__('No permission'), 403);
         }
 
         // Move one topic
@@ -60,7 +61,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                throw new \FeatherBB\Core\Error(__('No topics selected'), 400);
+                throw new Error(__('No topics selected'), 400);
             }
 
             $topics = implode(',', array_map('intval', array_keys($topics)));
@@ -199,7 +200,7 @@ public function display($id, $name = null, $page = null)
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
+            throw new Error(__('No permission'), 403);
         }
 
         // Fetch some info about the forum
@@ -207,7 +208,7 @@ public function display($id, $name = null, $page = null)
 
         // Is this a redirect forum? In that case, abort!
         if ($cur_forum['redirect_url'] != '') {
-            throw new \FeatherBB\Core\Error(__('Bad request'), '404');
+            throw new Error(__('Bad request'), '404');
         }
 
         $sort_by = $this->model->forum_sort_by($cur_forum['sort_by']);
@@ -241,7 +242,7 @@ public function dealposts($fid)
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
         if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
+            throw new Error(__('No permission'), 403);
         }
 
         // Move one or more topics
@@ -252,7 +253,7 @@ public function dealposts($fid)
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                throw new \FeatherBB\Core\Error(__('No topics selected'), 400);
+                throw new Error(__('No topics selected'), 400);
             }
 
             // Check if there are enough forums to move the topic
@@ -277,7 +278,7 @@ public function dealposts($fid)
 
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (count($topics) < 2) {
-                throw new \FeatherBB\Core\Error(__('Not enough topics selected'), 400);
+                throw new Error(__('Not enough topics selected'), 400);
             }
 
             $this->feather->template->setPageInfo(array(
@@ -293,7 +294,7 @@ public function dealposts($fid)
         elseif ($this->request->post('delete_topics') || $this->request->post('delete_topics_comply')) {
             $topics = $this->request->post('topics') ? $this->request->post('topics') : array();
             if (empty($topics)) {
-                throw new \FeatherBB\Core\Error(__('No topics selected'), 400);
+                throw new Error(__('No topics selected'), 400);
             }
 
             if ($this->request->post('delete_topics_comply')) {
@@ -318,7 +319,7 @@ public function dealposts($fid)
             if ($this->request->post('open') || $this->request->post('close')) {
                 $topics = $this->request->post('topics') ? @array_map('intval', @array_keys($this->request->post('topics'))) : array();
                 if (empty($topics)) {
-                    throw new \FeatherBB\Core\Error(__('No topics selected'), 400);
+                    throw new Error(__('No topics selected'), 400);
                 }
 
                 $this->model->close_multiple_topics($action, $topics, $fid);
diff --git a/featherbb/Controller/Post.php b/featherbb/Controller/Post.php
index 09a6e972..106684e6 100644
--- a/featherbb/Controller/Post.php
+++ b/featherbb/Controller/Post.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
@@ -38,7 +39,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // If $_POST['username'] is filled, we are facing a bot
         if ($this->feather->request->post('username')) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         // Fetch some info about the topic and/or the forum
@@ -48,7 +49,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // Is someone trying to post into a redirect forum?
         if ($cur_posting['redirect_url'] != '') {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
@@ -60,7 +61,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
                 ($fid && (($cur_posting['post_topics'] == '' && $this->feather->user->g_post_topics == '0') || $cur_posting['post_topics'] == '0')) ||
                 (isset($cur_posting['closed']) && $cur_posting['closed'] == '1')) &&
                 !$is_admmod) {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
+            throw new Error(__('No permission'), 403);
         }
 
         // Start with a clean slate
@@ -145,7 +146,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
             $action = __('Post new topic');
             $form = '<form id="post" method="post" action="'.Url::get('post/new-topic/'.$fid.'/').'" onsubmit="return process_form(this)">';
         } else {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         $url_forum = Url::url_friendly($cur_posting['forum_name']);
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
index 70ad0eec..6b8078c1 100644
--- a/featherbb/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Model\Delete;
@@ -39,25 +40,25 @@ public function display($id, $section = null)
 
         if ($this->request->post('update_group_membership')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                throw new Error(__('No permission'), 403);
             }
 
             $this->model->update_group_membership($id, $this->feather);
         } elseif ($this->request->post('update_forums')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                throw new Error(__('No permission'), 403);
             }
 
             $this->model->update_mod_forums($id, $this->feather);
         } elseif ($this->request->post('ban')) {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
-                throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                throw new Error(__('No permission'), 403);
             }
 
             $this->model->ban_user($id);
         } elseif ($this->request->post('delete_user') || $this->request->post('delete_user_comply')) {
             if ($this->user->g_id > FEATHER_ADMIN) {
-                throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                throw new Error(__('No permission'), 403);
             }
 
             $this->model->delete_user($id, $this->feather);
@@ -83,7 +84,7 @@ public function display($id, $section = null)
                                     ($this->user->g_mod_edit_users == '0' ||                         // mods aren't allowed to edit users
                                     $info['group_id'] == FEATHER_ADMIN ||                            // or the user is an admin
                                     $info['is_moderator'])))) {                                      // or the user is another mod
-                                    throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                                    throw new Error(__('No permission'), 403);
             }
 
             $this->model->update_profile($id, $info, $section, $this->feather);
@@ -160,7 +161,7 @@ public function display($id, $section = null)
 
             } elseif ($section == 'personality') {
                 if ($this->config['o_avatars'] == '0' && $this->config['o_signatures'] == '0') {
-                    throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                    throw new Error(__('Bad request'), 404);
                 }
 
                 $avatar_field = '<span><a href="'.Url::get('user/'.$id.'/action/upload_avatar/').'">'.__('Change avatar').'</a></span>';
@@ -218,7 +219,7 @@ public function display($id, $section = null)
             } elseif ($section == 'admin') {
 
                 if (!$this->user->is_admmod || ($this->user->g_moderator == '1' && $this->user->g_mod_ban_users == '0')) {
-                    throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                    throw new Error(__('Bad request'), 404);
                 }
 
                 $this->feather->template->setPageInfo(array(
@@ -233,7 +234,7 @@ public function display($id, $section = null)
 
                 $this->feather->template->addTemplate('profile/menu.php', 5)->addTemplate('profile/section_admin.php')->display();
             } else {
-                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                throw new Error(__('Bad request'), 404);
             }
         }
     }
@@ -247,9 +248,9 @@ public function action($id, $action)
 
         if ($action != 'change_pass' || !$this->request->get('key')) {
             if ($this->user->g_read_board == '0') {
-                throw new \FeatherBB\Core\Error(__('No view'), 403);
+                throw new Error(__('No view'), 403);
             } elseif ($this->user->g_view_users == '0' && ($this->user->is_guest || $this->user->id != $id)) {
-                throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                throw new Error(__('No permission'), 403);
             }
         }
 
@@ -281,11 +282,11 @@ public function action($id, $action)
 
         } elseif ($action == 'upload_avatar' || $action == 'upload_avatar2') {
             if ($this->config['o_avatars'] == '0') {
-                throw new \FeatherBB\Core\Error(__('Avatars disabled'), 400);
+                throw new Error(__('Avatars disabled'), 400);
             }
 
             if ($this->user->id != $id && !$this->user->is_admmod) {
-                throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                throw new Error(__('No permission'), 403);
             }
 
             if ($this->feather->request()->isPost()) {
@@ -304,7 +305,7 @@ public function action($id, $action)
 
         } elseif ($action == 'delete_avatar') {
             if ($this->user->id != $id && !$this->user->is_admmod) {
-                throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                throw new Error(__('No permission'), 403);
             }
 
             Delete::avatar($id);
@@ -312,12 +313,12 @@ public function action($id, $action)
             Url::redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'personality')), __('Avatar deleted redirect'));
         } elseif ($action == 'promote') {
             if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_promote_users == '0')) {
-                throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                throw new Error(__('No permission'), 403);
             }
 
             $this->model->promote_user($id, $this->feather);
         } else {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
     }
 }
diff --git a/featherbb/Controller/Register.php b/featherbb/Controller/Register.php
index 3178fe9d..986fb2de 100644
--- a/featherbb/Controller/Register.php
+++ b/featherbb/Controller/Register.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
@@ -46,7 +47,7 @@ public function display()
         // Display an error message if new registrations are disabled
         // If $_REQUEST['username'] or $_REQUEST['password'] are filled, we are facing a bot
         if ($this->config['o_regs_allow'] == '0' || $this->request->post('username') || $this->request->post('password')) {
-            throw new \FeatherBB\Core\Error(__('No new regs'), 403);
+            throw new Error(__('No new regs'), 403);
         }
 
         $user['timezone'] = isset($user['timezone']) ? $user['timezone'] : $this->config['o_default_timezone'];
@@ -92,7 +93,7 @@ public function rules()
 
         // Display an error message if new registrations are disabled
         if ($this->config['o_regs_allow'] == '0') {
-            throw new \FeatherBB\Core\Error(__('No new regs'), 403);
+            throw new Error(__('No new regs'), 403);
         }
 
         if ($this->config['o_rules'] != '1') {
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index 800c763e..7fe3ca31 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
@@ -35,7 +36,7 @@ public function __autoload($class_name)
     public function display()
     {
         if ($this->user->g_search == '0') {
-            throw new \FeatherBB\Core\Error(__('No search permission'), 403);
+            throw new Error(__('No search permission'), 403);
         }
 
         // Figure out what to do :-)
diff --git a/featherbb/Controller/Topic.php b/featherbb/Controller/Topic.php
index 7d88b99f..667d8507 100644
--- a/featherbb/Controller/Topic.php
+++ b/featherbb/Controller/Topic.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Track;
diff --git a/featherbb/Controller/Userlist.php b/featherbb/Controller/Userlist.php
index 28eac044..ac2db1b9 100644
--- a/featherbb/Controller/Userlist.php
+++ b/featherbb/Controller/Userlist.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
@@ -25,7 +26,7 @@ public function __construct()
     public function display()
     {
         if ($this->feather->user->g_view_users == '0') {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
+            throw new Error(__('No permission'), 403);
         }
 
         // Determine if we are allowed to view post counts
diff --git a/featherbb/Core/Email.php b/featherbb/Core/Email.php
index 72f71c04..4a38265f 100644
--- a/featherbb/Core/Email.php
+++ b/featherbb/Core/Email.php
@@ -308,12 +308,12 @@ public function server_parse($socket, $expected_response)
         $server_response = '';
         while (substr($server_response, 3, 1) != ' ') {
             if (!($server_response = fgets($socket, 256))) {
-                throw new \FeatherBB\Core\Error('Couldn\'t get mail server response codes. Please contact the forum administrator.', 500);
+                throw new Error('Couldn\'t get mail server response codes. Please contact the forum administrator.', 500);
             }
         }
 
         if (!(substr($server_response, 0, 3) == $expected_response)) {
-            throw new \FeatherBB\Core\Error('Unable to send email. Please contact the forum administrator with the following error message reported by the SMTP server: "' . $server_response . '"', 500);
+            throw new Error('Unable to send email. Please contact the forum administrator with the following error message reported by the SMTP server: "' . $server_response . '"', 500);
         }
     }
 
@@ -345,7 +345,7 @@ public function smtp_mail($to, $subject, $message, $headers = '')
         }
 
         if (!($socket = fsockopen($smtp_host, $smtp_port, $errno, $errstr, 15))) {
-            throw new \FeatherBB\Core\Error('Could not connect to smtp host "' . $this->config['o_smtp_host'] . '" (' . $errno . ') (' . $errstr . ')', 500);
+            throw new Error('Could not connect to smtp host "' . $this->config['o_smtp_host'] . '" (' . $errno . ') (' . $errstr . ')', 500);
         }
 
         $this->server_parse($socket, '220');
diff --git a/featherbb/Core/Search.php b/featherbb/Core/Search.php
index 4083c4c2..3035f890 100644
--- a/featherbb/Core/Search.php
+++ b/featherbb/Core/Search.php
@@ -12,8 +12,6 @@
 
 namespace FeatherBB\Core;
 
-use FeatherBB\Model\Cache;
-
 use DB;
 
 class Search
@@ -96,7 +94,7 @@ public function validate_search_word($word, $idx)
 
         if (!isset($stopwords)) {
             if (!$this->feather->cache->isCached('stopwords')) {
-                $this->feather->cache->store('stopwords', Cache::get_config(), '+1 week');
+                $this->feather->cache->store('stopwords', \FeatherBB\Model\Cache::get_config(), '+1 week');
             }
             $stopwords = $this->feather->cache->retrieve('stopwords');
         }
diff --git a/featherbb/Middleware/Auth.php b/featherbb/Middleware/Auth.php
index e1a21546..2d1c1160 100644
--- a/featherbb/Middleware/Auth.php
+++ b/featherbb/Middleware/Auth.php
@@ -13,6 +13,7 @@
 
 namespace FeatherBB\Middleware;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Random;
 use FeatherBB\Core\Track;
@@ -182,7 +183,7 @@ public function check_bans()
                 \DB::for_table('online')
                     ->where('ident', $this->app->user->username)
                     ->delete_many();
-                throw new \FeatherBB\Core\Error(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower($this->app->utils->format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.Utils::escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.Utils::escape($this->app->forum_settings['o_admin_email']).'">'.Utils::escape($this->app->forum_settings['o_admin_email']).'</a>.', 403);
+                throw new Error(__('Ban message').' '.(($cur_ban['expire'] != '') ? __('Ban message 2').' '.strtolower($this->app->utils->format_time($cur_ban['expire'], true)).'. ' : '').(($cur_ban['message'] != '') ? __('Ban message 3').'<br /><br /><strong>'.Utils::escape($cur_ban['message']).'</strong><br /><br />' : '<br /><br />').__('Ban message 4').' <a href="mailto:'.Utils::escape($this->app->forum_settings['o_admin_email']).'">'.Utils::escape($this->app->forum_settings['o_admin_email']).'</a>.', 403);
             }
         }
 
diff --git a/featherbb/Middleware/Core.php b/featherbb/Middleware/Core.php
index 4901545d..81ed97df 100644
--- a/featherbb/Middleware/Core.php
+++ b/featherbb/Middleware/Core.php
@@ -14,6 +14,7 @@
 namespace FeatherBB\Middleware;
 
 use DB;
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 
 class Core extends \Slim\Middleware
diff --git a/featherbb/Model/Admin/Bans.php b/featherbb/Model/Admin/Bans.php
index eae0135a..5b2557e0 100644
--- a/featherbb/Model/Admin/Bans.php
+++ b/featherbb/Model/Admin/Bans.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Model\Cache;
@@ -37,7 +38,7 @@ public function add_ban_info($id = null)
         if (is_numeric($id)) {
             $ban['user_id'] = $id;
             if ($ban['user_id'] < 2) {
-                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                throw new Error(__('Bad request'), 404);
             }
 
             $select_add_ban_info = array('group_id', 'username', 'email');
@@ -52,7 +53,7 @@ public function add_ban_info($id = null)
                 $ban['ban_user'] = $result['username'];
                 $ban['email'] = $result['email'];
             } else {
-                throw new \FeatherBB\Core\Error(__('No user ID message'), 404);
+                throw new Error(__('No user ID message'), 404);
             }
         } else {
             // Otherwise the username is in POST
@@ -74,7 +75,7 @@ public function add_ban_info($id = null)
                     $ban['ban_user'] = $result['username'];
                     $ban['email'] = $result['email'];
                 } else {
-                    throw new \FeatherBB\Core\Error(__('No user message'), 404);
+                    throw new Error(__('No user message'), 404);
                 }
             }
         }
@@ -82,14 +83,14 @@ public function add_ban_info($id = null)
         // Make sure we're not banning an admin or moderator
         if (isset($group_id)) {
             if ($group_id == FEATHER_ADMIN) {
-                throw new \FeatherBB\Core\Error(sprintf(__('User is admin message'), Utils::escape($ban['ban_user'])), 403);
+                throw new Error(sprintf(__('User is admin message'), Utils::escape($ban['ban_user'])), 403);
             }
 
             $is_moderator_group = DB::for_table('groups')->where('g_id', $group_id)
                                         ->find_one_col('g_moderator');
 
             if ($is_moderator_group) {
-                throw new \FeatherBB\Core\Error(sprintf(__('User is mod message'), Utils::escape($ban['ban_user'])), 403);
+                throw new Error(sprintf(__('User is mod message'), Utils::escape($ban['ban_user'])), 403);
             }
         }
 
@@ -134,7 +135,7 @@ public function edit_ban_info($id)
             $ban['message'] = $result['message'];
             $ban['expire'] = $result['expire'];
         } else {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         $diff = ($this->user->timezone + $this->user->dst) * 3600;
@@ -158,9 +159,9 @@ public function insert_ban()
         $this->hook->fire('insert_ban_start', $ban_user, $ban_ip, $ban_email, $ban_message, $ban_expire);
 
         if ($ban_user == '' && $ban_ip == '' && $ban_email == '') {
-            throw new \FeatherBB\Core\Error(__('Must enter message'), 400);
+            throw new Error(__('Must enter message'), 400);
         } elseif (strtolower($ban_user) == 'guest') {
-            throw new \FeatherBB\Core\Error(__('Cannot ban guest message'), 400);
+            throw new Error(__('Cannot ban guest message'), 400);
         }
 
         // Make sure we're not banning an admin or moderator
@@ -171,14 +172,14 @@ public function insert_ban()
 
             if ($group_id) {
                 if ($group_id == FEATHER_ADMIN) {
-                    throw new \FeatherBB\Core\Error(sprintf(__('User is admin message'), Utils::escape($ban_user)), 403);
+                    throw new Error(sprintf(__('User is admin message'), Utils::escape($ban_user)), 403);
                 }
 
                 $is_moderator_group = DB::for_table('groups')->where('g_id', $group_id)
                                             ->find_one_col('g_moderator');
 
                 if ($is_moderator_group) {
-                    throw new \FeatherBB\Core\Error(sprintf(__('User is mod message'), Utils::escape($ban_user)), 403);
+                    throw new Error(sprintf(__('User is mod message'), Utils::escape($ban_user)), 403);
                 }
             }
         }
@@ -197,7 +198,7 @@ public function insert_ban()
                         $octets[$c] = ltrim($octets[$c], "0");
 
                         if ($c > 7 || (!empty($octets[$c]) && !ctype_xdigit($octets[$c])) || intval($octets[$c], 16) > 65535) {
-                            throw new \FeatherBB\Core\Error(__('Invalid IP message'), 400);
+                            throw new Error(__('Invalid IP message'), 400);
                         }
                     }
 
@@ -210,7 +211,7 @@ public function insert_ban()
                         $octets[$c] = (strlen($octets[$c]) > 1) ? ltrim($octets[$c], "0") : $octets[$c];
 
                         if ($c > 3 || preg_match('%[^0-9]%', $octets[$c]) || intval($octets[$c]) > 255) {
-                            throw new \FeatherBB\Core\Error(__('Invalid IP message'), 400);
+                            throw new Error(__('Invalid IP message'), 400);
                         }
                     }
 
@@ -224,7 +225,7 @@ public function insert_ban()
 
         if ($ban_email != '' && !$this->email->is_valid_email($ban_email)) {
             if (!preg_match('%^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,63})$%', $ban_email)) {
-                throw new \FeatherBB\Core\Error(__('Invalid e-mail message'), 400);
+                throw new Error(__('Invalid e-mail message'), 400);
             }
         }
 
@@ -232,14 +233,14 @@ public function insert_ban()
             $ban_expire = strtotime($ban_expire.' GMT');
 
             if ($ban_expire == -1 || !$ban_expire) {
-                throw new \FeatherBB\Core\Error(__('Invalid date message').' '.__('Invalid date reasons'), 400);
+                throw new Error(__('Invalid date message').' '.__('Invalid date reasons'), 400);
             }
 
             $diff = ($this->user->timezone + $this->user->dst) * 3600;
             $ban_expire -= $diff;
 
             if ($ban_expire <= time()) {
-                throw new \FeatherBB\Core\Error(__('Invalid date message').' '.__('Invalid date reasons'), 400);
+                throw new Error(__('Invalid date message').' '.__('Invalid date reasons'), 400);
             }
         } else {
             $ban_expire = 'NULL';
@@ -324,7 +325,7 @@ public function find_ban($start_from = false)
 
             $expire_after = strtotime($expire_after);
             if ($expire_after === false || $expire_after == -1) {
-                throw new \FeatherBB\Core\Error(__('Invalid date message'), 400);
+                throw new Error(__('Invalid date message'), 400);
             }
 
             $result = $result->where_gt('b.expire', $expire_after);
@@ -334,7 +335,7 @@ public function find_ban($start_from = false)
 
             $expire_before = strtotime($expire_before);
             if ($expire_before === false || $expire_before == -1) {
-                throw new \FeatherBB\Core\Error(__('Invalid date message'), 400);
+                throw new Error(__('Invalid date message'), 400);
             }
 
             $result = $result->where_lt('b.expire', $expire_before);
diff --git a/featherbb/Model/Admin/Categories.php b/featherbb/Model/Admin/Categories.php
index 1051f2d4..99dce50d 100644
--- a/featherbb/Model/Admin/Categories.php
+++ b/featherbb/Model/Admin/Categories.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
diff --git a/featherbb/Model/Admin/Censoring.php b/featherbb/Model/Admin/Censoring.php
index 0da405f2..1b36a0c6 100644
--- a/featherbb/Model/Admin/Censoring.php
+++ b/featherbb/Model/Admin/Censoring.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
@@ -32,7 +33,7 @@ public function add_word()
         $replace_with = Utils::trim($this->request->post('new_replace_with'));
 
         if ($search_for == '') {
-            throw new \FeatherBB\Core\Error(__('Must enter word message'), 400);
+            throw new Error(__('Must enter word message'), 400);
         }
 
         $set_search_word = array('search_for' => $search_for,
@@ -60,7 +61,7 @@ public function update_word()
         $replace_with = Utils::trim($this->request->post('replace_with')[$id]);
 
         if ($search_for == '') {
-            throw new \FeatherBB\Core\Error(__('Must enter word message'), 400);
+            throw new Error(__('Must enter word message'), 400);
         }
 
         $set_search_word = array('search_for' => $search_for,
diff --git a/featherbb/Model/Admin/Forums.php b/featherbb/Model/Admin/Forums.php
index 4e48cd4a..36588246 100644
--- a/featherbb/Model/Admin/Forums.php
+++ b/featherbb/Model/Admin/Forums.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
diff --git a/featherbb/Model/Admin/Groups.php b/featherbb/Model/Admin/Groups.php
index 52f66528..3ec86b00 100644
--- a/featherbb/Model/Admin/Groups.php
+++ b/featherbb/Model/Admin/Groups.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
@@ -53,7 +54,7 @@ public function info_add_group($groups, $id)
         } else {
             // We are editing a group
             if (!isset($groups[$id])) {
-                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                throw new Error(__('Bad request'), 404);
             }
 
             $groups[$id] = $this->hook->fire('update_user_group', $groups[$id]);
@@ -128,7 +129,7 @@ public function add_edit_group($groups)
         // Set group title
         $title = Utils::trim($this->request->post('req_title'));
         if ($title == '') {
-            throw new \FeatherBB\Core\Error(__('Must enter title message'), 400);
+            throw new Error(__('Must enter title message'), 400);
         }
         $title = $this->hook->fire('add_edit_group_set_title', $title);
         // Set user title
@@ -204,7 +205,7 @@ public function add_edit_group($groups)
             // Creating a new group
             $title_exists = DB::for_table('groups')->where('g_title', $title)->find_one();
             if ($title_exists) {
-                throw new \FeatherBB\Core\Error(sprintf(__('Title already exists message'), Utils::escape($title)), 400);
+                throw new Error(sprintf(__('Title already exists message'), Utils::escape($title)), 400);
             }
 
             DB::for_table('groups')
@@ -239,7 +240,7 @@ public function add_edit_group($groups)
             // We are editing an existing group
             $title_exists = DB::for_table('groups')->where('g_title', $title)->where_not_equal('g_id', $this->request->post('group_id'))->find_one();
             if ($title_exists) {
-                throw new \FeatherBB\Core\Error(sprintf(__('Title already exists message'), Utils::escape($title)), 400);
+                throw new Error(sprintf(__('Title already exists message'), Utils::escape($title)), 400);
             }
             DB::for_table('groups')
                     ->find_one($this->request->post('group_id'))
@@ -274,12 +275,12 @@ public function set_default_group($groups)
 
         // Make sure it's not the admin or guest groups
         if ($group_id == FEATHER_ADMIN || $group_id == FEATHER_GUEST) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         // Make sure it's not a moderator group
         if ($groups[$group_id]['g_moderator'] != 0) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         DB::for_table('config')->where('conf_name', 'o_default_user_group')
diff --git a/featherbb/Model/Admin/Maintenance.php b/featherbb/Model/Admin/Maintenance.php
index 8b1e35f4..5a2b5347 100644
--- a/featherbb/Model/Admin/Maintenance.php
+++ b/featherbb/Model/Admin/Maintenance.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
@@ -33,7 +34,7 @@ public function rebuild()
 
         // Check per page is > 0
         if ($per_page < 1) {
-            throw new \FeatherBB\Core\Error(__('Posts must be integer message'), 400);
+            throw new Error(__('Posts must be integer message'), 400);
         }
 
         @set_time_limit(0);
@@ -222,7 +223,7 @@ public function get_info_prune($prune_sticky, $prune_from)
 
         $prune['days'] = Utils::trim($this->request->post('req_prune_days'));
         if ($prune['days'] == '' || preg_match('%[^0-9]%', $prune['days'])) {
-            throw new \FeatherBB\Core\Error(__('Days must be integer message'), 400);
+            throw new Error(__('Days must be integer message'), 400);
         }
 
         $prune['date'] = time() - ($prune['days'] * 86400);
@@ -253,7 +254,7 @@ public function get_info_prune($prune_sticky, $prune_from)
         $prune['num_topics'] = $query->count('id');
 
         if (!$prune['num_topics']) {
-            throw new \FeatherBB\Core\Error(sprintf(__('No old topics message'), $prune['days']), 204);
+            throw new Error(sprintf(__('No old topics message'), $prune['days']), 204);
         }
 
         $prune = $this->hook->fire('maintenance.get_info_prune.prune', $prune);
diff --git a/featherbb/Model/Admin/Options.php b/featherbb/Model/Admin/Options.php
index e5794a07..195cbfd0 100644
--- a/featherbb/Model/Admin/Options.php
+++ b/featherbb/Model/Admin/Options.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Model\Cache;
@@ -94,7 +95,7 @@ public function update_options()
         $form = $this->hook->fire('options.update_options.form', $form);
 
         if ($form['board_title'] == '') {
-            throw new \FeatherBB\Core\Error(__('Must enter title message'), 400);
+            throw new Error(__('Must enter title message'), 400);
         }
 
         // Make sure base_url doesn't end with a slash
@@ -105,7 +106,7 @@ public function update_options()
         // Convert IDN to Punycode if needed
         if (preg_match('/[^\x00-\x7F]/', $form['base_url'])) {
             if (!function_exists('idn_to_ascii')) {
-                throw new \FeatherBB\Core\Error(__('Base URL problem'), 400);
+                throw new Error(__('Base URL problem'), 400);
             } else {
                 $form['base_url'] = idn_to_ascii($form['base_url']);
             }
@@ -113,12 +114,12 @@ public function update_options()
 
         $languages = \FeatherBB\Core\Lister::getLangs();
         if (!in_array($form['default_lang'], $languages)) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         $styles = \FeatherBB\Core\Lister::getStyles();
         if (!in_array($form['default_style'], $styles)) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         if ($form['time_format'] == '') {
@@ -130,11 +131,11 @@ public function update_options()
         }
 
         if (!$this->email->is_valid_email($form['admin_email'])) {
-            throw new \FeatherBB\Core\Error(__('Invalid e-mail message'), 400);
+            throw new Error(__('Invalid e-mail message'), 400);
         }
 
         if (!$this->email->is_valid_email($form['webmaster_email'])) {
-            throw new \FeatherBB\Core\Error(__('Invalid webmaster e-mail message'), 400);
+            throw new Error(__('Invalid webmaster e-mail message'), 400);
         }
 
         if ($form['mailing_list'] != '') {
@@ -158,7 +159,7 @@ public function update_options()
             if ($smtp_pass1 == $smtp_pass2) {
                 $form['smtp_pass'] = $smtp_pass1;
             } else {
-                throw new \FeatherBB\Core\Error(__('SMTP passwords did not match'), 400);
+                throw new Error(__('SMTP passwords did not match'), 400);
             }
         }
 
@@ -197,23 +198,23 @@ public function update_options()
         }
 
         if ($form['feed_type'] < 0 || $form['feed_type'] > 2) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         if ($form['feed_ttl'] < 0) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         if ($form['report_method'] < 0 || $form['report_method'] > 2) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         if ($form['default_email_setting'] < 0 || $form['default_email_setting'] > 2) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         if ($form['timeout_online'] >= $form['timeout_visit']) {
-            throw new \FeatherBB\Core\Error(__('Timeout error message'), 400);
+            throw new Error(__('Timeout error message'), 400);
         }
 
         foreach ($form as $key => $input) {
diff --git a/featherbb/Model/Admin/Parser.php b/featherbb/Model/Admin/Parser.php
index d3c995ef..63d87655 100644
--- a/featherbb/Model/Admin/Parser.php
+++ b/featherbb/Model/Admin/Parser.php
@@ -10,6 +10,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
diff --git a/featherbb/Model/Admin/Permissions.php b/featherbb/Model/Admin/Permissions.php
index feb9150a..02a93a8b 100644
--- a/featherbb/Model/Admin/Permissions.php
+++ b/featherbb/Model/Admin/Permissions.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
diff --git a/featherbb/Model/Admin/Reports.php b/featherbb/Model/Admin/Reports.php
index 26a0f22c..18b1f49c 100644
--- a/featherbb/Model/Admin/Reports.php
+++ b/featherbb/Model/Admin/Reports.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
diff --git a/featherbb/Model/Admin/Statistics.php b/featherbb/Model/Admin/Statistics.php
index d16c54fe..7071e1aa 100644
--- a/featherbb/Model/Admin/Statistics.php
+++ b/featherbb/Model/Admin/Statistics.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
diff --git a/featherbb/Model/Admin/Users.php b/featherbb/Model/Admin/Users.php
index 2ca2784f..78ca3c28 100644
--- a/featherbb/Model/Admin/Users.php
+++ b/featherbb/Model/Admin/Users.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model\Admin;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Model\Delete;
@@ -146,7 +147,7 @@ public function move_users()
         $move['user_ids'] = $this->hook->fire('model.users.move_users.user_ids', $move['user_ids']);
 
         if (empty($move['user_ids'])) {
-            throw new \FeatherBB\Core\Error(__('No users selected'), 404);
+            throw new Error(__('No users selected'), 404);
         }
 
         // Are we trying to batch move any admins?
@@ -154,7 +155,7 @@ public function move_users()
                         ->where('group_id', FEATHER_ADMIN)
                         ->find_one();
         if ($is_admin) {
-            throw new \FeatherBB\Core\Error(__('No move admins message'), 403);
+            throw new Error(__('No move admins message'), 403);
         }
 
         // Fetch all user groups
@@ -175,7 +176,7 @@ public function move_users()
             if ( $this->request->post('new_group') && isset($move['all_groups'][$this->request->post('new_group')]) ) {
                 $new_group = $this->request->post('new_group');
             } else {
-                throw new \FeatherBB\Core\Error(__('Invalid group message'), 400);
+                throw new Error(__('Invalid group message'), 400);
             }
             $new_group = $this->hook->fire('model.users.move_users.new_group', $new_group);
 
@@ -267,7 +268,7 @@ public function delete_users()
         $user_ids = $this->hook->fire('model.users.delete_users.user_ids', $user_ids);
 
         if (empty($user_ids)) {
-            throw new \FeatherBB\Core\Error(__('No users selected'), 404);
+            throw new Error(__('No users selected'), 404);
         }
 
         // Are we trying to delete any admins?
@@ -275,7 +276,7 @@ public function delete_users()
             ->where('group_id', FEATHER_ADMIN)
             ->find_one();
         if ($is_admin) {
-            throw new \FeatherBB\Core\Error(__('No delete admins message'), 403);
+            throw new Error(__('No delete admins message'), 403);
         }
 
         if ($this->request->post('delete_users_comply')) {
@@ -431,7 +432,7 @@ public function ban_users()
         $user_ids = $this->hook->fire('model.users.ban_users.user_ids', $user_ids);
 
         if (empty($user_ids)) {
-            throw new \FeatherBB\Core\Error(__('No users selected'), 404);
+            throw new Error(__('No users selected'), 404);
         }
 
         // Are we trying to ban any admins?
@@ -439,7 +440,7 @@ public function ban_users()
             ->where('group_id', FEATHER_ADMIN)
             ->find_one();
         if ($is_admin) {
-            throw new \FeatherBB\Core\Error(__('No ban admins message'), 403);
+            throw new Error(__('No ban admins message'), 403);
         }
 
         // Also, we cannot ban moderators
@@ -449,7 +450,7 @@ public function ban_users()
             ->where_in('u.id', $user_ids)
             ->find_one();
         if ($is_mod) {
-            throw new \FeatherBB\Core\Error(__('No ban mods message'), 403);
+            throw new Error(__('No ban mods message'), 403);
         }
 
         if ($this->request->post('ban_users_comply')) {
@@ -463,14 +464,14 @@ public function ban_users()
                 $ban_expire = strtotime($ban_expire . ' GMT');
 
                 if ($ban_expire == -1 || !$ban_expire) {
-                    throw new \FeatherBB\Core\Error(__('Invalid date message') . ' ' . __('Invalid date reasons'), 400);
+                    throw new Error(__('Invalid date message') . ' ' . __('Invalid date reasons'), 400);
                 }
 
                 $diff = ($this->user->timezone + $this->user->dst) * 3600;
                 $ban_expire -= $diff;
 
                 if ($ban_expire <= time()) {
-                    throw new \FeatherBB\Core\Error(__('Invalid date message') . ' ' . __('Invalid date reasons'), 400);
+                    throw new Error(__('Invalid date message') . ' ' . __('Invalid date reasons'), 400);
                 }
             } else {
                 $ban_expire = 'NULL';
@@ -562,7 +563,7 @@ public function get_user_search()
         $search['query_str'][] = 'user_group='.$user_group;
 
         if (preg_match('%[^0-9]%', $posts_greater.$posts_less)) {
-            throw new \FeatherBB\Core\Error(__('Non numeric message'), 400);
+            throw new Error(__('Non numeric message'), 400);
         }
 
         $search['conditions'] = array();
@@ -573,7 +574,7 @@ public function get_user_search()
 
             $last_post_after = strtotime($last_post_after);
             if ($last_post_after === false || $last_post_after == -1) {
-                throw new \FeatherBB\Core\Error(__('Invalid date time message'), 400);
+                throw new Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.last_post>'.$last_post_after;
@@ -583,7 +584,7 @@ public function get_user_search()
 
             $last_post_before = strtotime($last_post_before);
             if ($last_post_before === false || $last_post_before == -1) {
-                throw new \FeatherBB\Core\Error(__('Invalid date time message'), 400);
+                throw new Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.last_post<'.$last_post_before;
@@ -593,7 +594,7 @@ public function get_user_search()
 
             $last_visit_after = strtotime($last_visit_after);
             if ($last_visit_after === false || $last_visit_after == -1) {
-                throw new \FeatherBB\Core\Error(__('Invalid date time message'), 400);
+                throw new Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.last_visit>'.$last_visit_after;
@@ -603,7 +604,7 @@ public function get_user_search()
 
             $last_visit_before = strtotime($last_visit_before);
             if ($last_visit_before === false || $last_visit_before == -1) {
-                throw new \FeatherBB\Core\Error(__('Invalid date time message'), 400);
+                throw new Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.last_visit<'.$last_visit_before;
@@ -613,7 +614,7 @@ public function get_user_search()
 
             $registered_after = strtotime($registered_after);
             if ($registered_after === false || $registered_after == -1) {
-                throw new \FeatherBB\Core\Error(__('Invalid date time message'), 400);
+                throw new Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.registered>'.$registered_after;
@@ -623,7 +624,7 @@ public function get_user_search()
 
             $registered_before = strtotime($registered_before);
             if ($registered_before === false || $registered_before == -1) {
-                throw new \FeatherBB\Core\Error(__('Invalid date time message'), 400);
+                throw new Error(__('Invalid date time message'), 400);
             }
 
             $search['conditions'][] = 'u.registered<'.$registered_before;
diff --git a/featherbb/Model/Auth.php b/featherbb/Model/Auth.php
index d69b4730..cfaadba1 100644
--- a/featherbb/Model/Auth.php
+++ b/featherbb/Model/Auth.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
diff --git a/featherbb/Model/Cache.php b/featherbb/Model/Cache.php
index d4b03c60..e68c319d 100644
--- a/featherbb/Model/Cache.php
+++ b/featherbb/Model/Cache.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
diff --git a/featherbb/Model/Debug.php b/featherbb/Model/Debug.php
index 18704845..e9d45a42 100644
--- a/featherbb/Model/Debug.php
+++ b/featherbb/Model/Debug.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
diff --git a/featherbb/Model/Delete.php b/featherbb/Model/Delete.php
index c039ec7c..9773b101 100644
--- a/featherbb/Model/Delete.php
+++ b/featherbb/Model/Delete.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
@@ -50,7 +51,7 @@ public function get_info_delete($id)
         $query = $query->find_one();
 
         if (!$query) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         return $query;
diff --git a/featherbb/Model/Edit.php b/featherbb/Model/Edit.php
index fd2ef493..e7e615a2 100644
--- a/featherbb/Model/Edit.php
+++ b/featherbb/Model/Edit.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
@@ -52,7 +53,7 @@ public function get_info_edit($id)
         $cur_post = $cur_post->find_one();
 
         if (!$cur_post) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         return $cur_post;
diff --git a/featherbb/Model/Forum.php b/featherbb/Model/Forum.php
index bf26a965..4ef7a642 100644
--- a/featherbb/Model/Forum.php
+++ b/featherbb/Model/Forum.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Track;
@@ -63,7 +64,7 @@ public function get_info_forum($id)
         $cur_forum = $cur_forum->find_one();
 
         if (!$cur_forum) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), '404');
+            throw new Error(__('Bad request'), '404');
         }
 
         $cur_forum = $this->hook->fire('get_info_forum', $cur_forum);
diff --git a/featherbb/Model/Header.php b/featherbb/Model/Header.php
index 0cdcf0a9..ad7eb60a 100644
--- a/featherbb/Model/Header.php
+++ b/featherbb/Model/Header.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
diff --git a/featherbb/Model/Index.php b/featherbb/Model/Index.php
index 6bb64e9c..6ae9d900 100644
--- a/featherbb/Model/Index.php
+++ b/featherbb/Model/Index.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Track;
diff --git a/featherbb/Model/Install.php b/featherbb/Model/Install.php
index c8461a2c..84b161a3 100644
--- a/featherbb/Model/Install.php
+++ b/featherbb/Model/Install.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Random;
diff --git a/featherbb/Model/Login.php b/featherbb/Model/Login.php
index 45032819..ae9de1ef 100644
--- a/featherbb/Model/Login.php
+++ b/featherbb/Model/Login.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Random;
@@ -53,7 +54,7 @@ public function login()
         $authorized = $this->hook->fire('authorized_login', $authorized);
 
         if (!$authorized) {
-            throw new \FeatherBB\Core\Error(__('Wrong user/pass').' <a href="'.Url::get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
+            throw new Error(__('Wrong user/pass').' <a href="'.Url::get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
         }
 
         // Update the status if this is the first time the user logged in
@@ -168,7 +169,7 @@ public function password_forgotten()
                     // Loop through users we found
                     foreach($result as $cur_hit) {
                         if ($cur_hit->last_email_sent != '' && (time() - $cur_hit->last_email_sent) < 3600 && (time() - $cur_hit->last_email_sent) >= 0) {
-                            throw new \FeatherBB\Core\Error(sprintf(__('Email flood'), intval((3600 - (time() - $cur_hit->last_email_sent)) / 60)), 429);
+                            throw new Error(sprintf(__('Email flood'), intval((3600 - (time() - $cur_hit->last_email_sent)) / 60)), 429);
                         }
 
                         // Generate a new password and a new password activation code
@@ -197,7 +198,7 @@ public function password_forgotten()
                         $this->email->feather_mail($email, $mail_subject, $cur_mail_message);
                     }
 
-                    throw new \FeatherBB\Core\Error(__('Forget mail').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', 400);
+                    throw new Error(__('Forget mail').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', 400);
                 } else {
                     $errors[] = __('No email match').' '.Utils::escape($email).'.';
                 }
diff --git a/featherbb/Model/Misc.php b/featherbb/Model/Misc.php
index 799e63a0..a2928f98 100644
--- a/featherbb/Model/Misc.php
+++ b/featherbb/Model/Misc.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
@@ -50,7 +51,7 @@ public function get_info_mail($recipient_id)
         $mail = $mail->find_one();
 
         if (!$mail) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         $mail['recipient'] = $mail['username'];
@@ -70,17 +71,17 @@ public function send_email($mail)
         $message = Utils::trim($this->request->post('req_message'));
 
         if ($subject == '') {
-            throw new \FeatherBB\Core\Error(__('No email subject'), 400);
+            throw new Error(__('No email subject'), 400);
         } elseif ($message == '') {
-            throw new \FeatherBB\Core\Error(__('No email message'), 400);
+            throw new Error(__('No email message'), 400);
         }
         // Here we use strlen() not Utils::strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
         elseif (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            throw new \FeatherBB\Core\Error(__('Too long email message'), 400);
+            throw new Error(__('Too long email message'), 400);
         }
 
         if ($this->user->last_email_sent != '' && (time() - $this->user->last_email_sent) < $this->user->g_email_flood && (time() - $this->user->last_email_sent) >= 0) {
-            throw new \FeatherBB\Core\Error(sprintf(__('Email flood'), $this->user->g_email_flood, $this->user->g_email_flood - (time() - $this->user->last_email_sent)), 429);
+            throw new Error(sprintf(__('Email flood'), $this->user->g_email_flood, $this->user->g_email_flood - (time() - $this->user->last_email_sent)), 429);
         }
 
         // Load the "form email" template
@@ -142,13 +143,13 @@ public function insert_report($post_id)
         // Clean up reason from POST
         $reason = Utils::linebreaks(Utils::trim($this->request->post('req_reason')));
         if ($reason == '') {
-            throw new \FeatherBB\Core\Error(__('No reason'), 400);
+            throw new Error(__('No reason'), 400);
         } elseif (strlen($reason) > 65535) { // TEXT field can only hold 65535 bytes
-            throw new \FeatherBB\Core\Error(__('Reason too long'), 400);
+            throw new Error(__('Reason too long'), 400);
         }
 
         if ($this->user->last_report_sent != '' && (time() - $this->user->last_report_sent) < $this->user->g_report_flood && (time() - $this->user->last_report_sent) >= 0) {
-            throw new \FeatherBB\Core\Error(sprintf(__('Report flood'), $this->user->g_report_flood, $this->user->g_report_flood - (time() - $this->user->last_report_sent)), 429);
+            throw new Error(sprintf(__('Report flood'), $this->user->g_report_flood, $this->user->g_report_flood - (time() - $this->user->last_report_sent)), 429);
         }
 
         // Get the topic ID
@@ -158,7 +159,7 @@ public function insert_report($post_id)
         $topic = $topic->find_one();
 
         if (!$topic) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         // Get the subject and forum ID
@@ -169,7 +170,7 @@ public function insert_report($post_id)
         $report = $report->find_one();
 
         if (!$report) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         // Should we use the internal report handling?
@@ -250,7 +251,7 @@ public function get_info_report($post_id)
         $cur_post = $cur_post->find_one();
 
         if (!$cur_post) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         $cur_post = $this->hook->fire('get_info_report', $cur_post);
@@ -263,7 +264,7 @@ public function subscribe_topic($topic_id)
         $topic_id = $this->hook->fire('subscribe_topic_start', $topic_id);
 
         if ($this->config['o_topic_subscriptions'] != '1') {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
+            throw new Error(__('No permission'), 403);
         }
 
         // Make sure the user can view the topic
@@ -283,7 +284,7 @@ public function subscribe_topic($topic_id)
         $authorized = $authorized->find_one();
 
         if (!$authorized) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         $is_subscribed = DB::for_table('topic_subscriptions')
@@ -293,7 +294,7 @@ public function subscribe_topic($topic_id)
         $is_subscribed = $is_subscribed->find_one();
 
         if ($is_subscribed) {
-            throw new \FeatherBB\Core\Error(__('Already subscribed topic'), 400);
+            throw new Error(__('Already subscribed topic'), 400);
         }
 
         $subscription['insert'] = array(
@@ -316,7 +317,7 @@ public function unsubscribe_topic($topic_id)
         $topic_id = $this->hook->fire('unsubscribe_topic_start', $topic_id);
 
         if ($this->config['o_topic_subscriptions'] != '1') {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
+            throw new Error(__('No permission'), 403);
         }
 
         $is_subscribed = DB::for_table('topic_subscriptions')
@@ -326,7 +327,7 @@ public function unsubscribe_topic($topic_id)
         $is_subscribed = $is_subscribed->find_one();
 
         if (!$is_subscribed) {
-            throw new \FeatherBB\Core\Error(__('Not subscribed topic'), 400);
+            throw new Error(__('Not subscribed topic'), 400);
         }
 
         // Delete the subscription
@@ -344,7 +345,7 @@ public function unsubscribe_forum($forum_id)
         $forum_id = $this->hook->fire('unsubscribe_forum_start', $forum_id);
 
         if ($this->config['o_forum_subscriptions'] != '1') {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
+            throw new Error(__('No permission'), 403);
         }
 
         $is_subscribed = DB::for_table('forum_subscriptions')
@@ -354,7 +355,7 @@ public function unsubscribe_forum($forum_id)
         $is_subscribed = $is_subscribed->find_one();
 
         if (!$is_subscribed) {
-            throw new \FeatherBB\Core\Error(__('Not subscribed forum'), 400);
+            throw new Error(__('Not subscribed forum'), 400);
         }
 
         // Delete the subscription
@@ -372,7 +373,7 @@ public function subscribe_forum($forum_id)
         $forum_id = $this->hook->fire('subscribe_forum_start', $forum_id);
 
         if ($this->config['o_forum_subscriptions'] != '1') {
-            throw new \FeatherBB\Core\Error(__('No permission'), 403);
+            throw new Error(__('No permission'), 403);
         }
 
         // Make sure the user can view the forum
@@ -391,7 +392,7 @@ public function subscribe_forum($forum_id)
         $authorized = $authorized->find_one();
 
         if (!$authorized) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         $is_subscribed = DB::for_table('forum_subscriptions')
@@ -401,7 +402,7 @@ public function subscribe_forum($forum_id)
         $is_subscribed = $is_subscribed->find_one();
 
         if ($is_subscribed) {
-            throw new \FeatherBB\Core\Error(__('Already subscribed forum'), 400);
+            throw new Error(__('Already subscribed forum'), 400);
         }
 
         // Insert the subscription
diff --git a/featherbb/Model/Moderate.php b/featherbb/Model/Moderate.php
index ebbf9ede..929c9bd6 100644
--- a/featherbb/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Track;
@@ -30,7 +31,7 @@ public function __construct()
     public function display_ip_info($ip)
     {
         $ip = $this->hook->fire('display_ip_info', $ip);
-        throw new \FeatherBB\Core\Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Url::get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        throw new Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Url::get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function display_ip_address_post($pid)
@@ -43,12 +44,12 @@ public function display_ip_address_post($pid)
         $ip = $ip->find_one_col('poster_ip');
 
         if (!$ip) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         $ip = $this->hook->fire('display_ip_address_post', $ip);
 
-        throw new \FeatherBB\Core\Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Url::get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        throw new Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Url::get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
     }
 
     public function get_moderators($fid)
@@ -84,7 +85,7 @@ public function get_topic_info($fid, $tid)
         $cur_topic = $cur_topic->find_one();
 
         if (!$cur_topic) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         return $cur_topic;
@@ -96,12 +97,12 @@ public function delete_posts($tid, $fid, $p = null)
         $posts = $this->hook->fire('delete_posts_start', $posts, $tid, $fid);
 
         if (empty($posts)) {
-            throw new \FeatherBB\Core\Error(__('No posts selected'), 404);
+            throw new Error(__('No posts selected'), 404);
         }
 
         if ($this->request->post('delete_posts_comply')) {
             if (@preg_match('%[^0-9,]%', $posts)) {
-                throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+                throw new Error(__('Bad request'), 400);
             }
 
             // Verify that the post IDs are valid
@@ -119,7 +120,7 @@ public function delete_posts($tid, $fid, $p = null)
             $result = $result->find_many();
 
             if (count($result) != substr_count($posts, ',') + 1) {
-                throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+                throw new Error(__('Bad request'), 400);
             }
 
             // Delete the posts
@@ -171,17 +172,17 @@ public function split_posts($tid, $fid, $p = null)
         $posts = $this->request->post('posts') ? $this->request->post('posts') : array();
         $posts = $this->hook->fire('split_posts_start', $posts, $tid, $fid);
         if (empty($posts)) {
-            throw new \FeatherBB\Core\Error(__('No posts selected'), 404);
+            throw new Error(__('No posts selected'), 404);
         }
 
         if ($this->request->post('split_posts_comply')) {
             if (@preg_match('%[^0-9,]%', $posts)) {
-                throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+                throw new Error(__('Bad request'), 400);
             }
 
             $move_to_forum = $this->request->post('move_to_forum') ? intval($this->request->post('move_to_forum')) : 0;
             if ($move_to_forum < 1) {
-                throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+                throw new Error(__('Bad request'), 400);
             }
 
             // How many posts did we just split off?
@@ -197,7 +198,7 @@ public function split_posts($tid, $fid, $p = null)
             $result = $result->find_many();
 
             if (count($result) != $num_posts_splitted) {
-                throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+                throw new Error(__('Bad request'), 400);
             }
 
             unset($result);
@@ -218,16 +219,16 @@ public function split_posts($tid, $fid, $p = null)
             $result = $result->find_one();
 
             if (!$result) {
-                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                throw new Error(__('Bad request'), 404);
             }
 
             // Check subject
             $new_subject = $this->request->post('new_subject') ? Utils::trim($this->request->post('new_subject')) : '';
 
             if ($new_subject == '') {
-                throw new \FeatherBB\Core\Error(__('No subject'), 400);
+                throw new Error(__('No subject'), 400);
             } elseif (Utils::strlen($new_subject) > 70) {
-                throw new \FeatherBB\Core\Error(__('Too long subject'), 400);
+                throw new Error(__('Too long subject'), 400);
             }
 
             // Get data from the new first post
@@ -494,13 +495,13 @@ public function move_topics_to($fid, $tfid = null, $param = null)
         $fid = $this->hook->fire('move_topics_to_start', $fid);
 
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         $topics = explode(',', $this->request->post('topics'));
         $move_to_forum = $this->request->post('move_to_forum') ? intval($this->request->post('move_to_forum')) : 0;
         if (empty($topics) || $move_to_forum < 1) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         // Verify that the topic IDs are valid
@@ -511,7 +512,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
         $result = $result->find_many();
 
         if (count($result) != count($topics)) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
 
@@ -531,7 +532,7 @@ public function move_topics_to($fid, $tfid = null, $param = null)
         $authorized = $authorized->find_one();
 
         if (!$authorized) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         // Delete any redirect topics if there are any (only if we moved/copied the topic back to where it was once moved from)
@@ -611,7 +612,7 @@ public function check_move_possible()
         $result = $result->find_many();
 
         if (count($result) < 2) {
-            throw new \FeatherBB\Core\Error(__('Nowhere to move'), 403);
+            throw new Error(__('Nowhere to move'), 403);
         }
     }
 
@@ -620,12 +621,12 @@ public function merge_topics($fid)
         $fid = $this->hook->fire('merge_topics_start', $fid);
 
         if (@preg_match('%[^0-9,]%', $this->request->post('topics'))) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         $topics = explode(',', $this->request->post('topics'));
         if (count($topics) < 2) {
-            throw new \FeatherBB\Core\Error(__('Not enough topics selected'), 400);
+            throw new Error(__('Not enough topics selected'), 400);
         }
 
         // Verify that the topic IDs are valid (redirect links will point to the merged topic after the merge)
@@ -636,7 +637,7 @@ public function merge_topics($fid)
         $result = $result->find_many();
 
         if (count($result) != count($topics)) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         // The topic that we are merging into is the one with the smallest ID
@@ -744,7 +745,7 @@ public function delete_topics($topics, $fid)
         $this->hook->fire('delete_topics');
 
         if (@preg_match('%[^0-9,]%', $topics)) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         $topics_sql = explode(',', $topics);
@@ -757,7 +758,7 @@ public function delete_topics($topics, $fid)
         $result = $result->find_many();
 
         if (count($result) != substr_count($topics, ',') + 1) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+            throw new Error(__('Bad request'), 400);
         }
 
         // Verify that the posts are not by admins
@@ -768,7 +769,7 @@ public function delete_topics($topics, $fid)
             $authorized = $this->hook->fireDB('delete_topics_authorized', $authorized);
             $authorized = $authorized->find_many();
             if ($authorized) {
-                throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                throw new Error(__('No permission'), 403);
             }
         }
 
@@ -842,7 +843,7 @@ public function get_forum_info($fid)
         $cur_forum = $cur_forum->find_one();
 
         if (!$cur_forum) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         return $cur_forum;
@@ -1043,7 +1044,7 @@ public function get_subject_tid($id)
         $subject = $subject->find_one_col('subject');
 
         if (!$subject) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         return $subject;
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
index 4d4cf334..d196791a 100644
--- a/featherbb/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Track;
@@ -68,7 +69,7 @@ public function get_info_post($tid, $fid)
         $cur_posting = $cur_posting->find_one();
 
         if (!$cur_posting) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         $cur_posting = $this->hook->fire('get_info_post', $cur_posting);
@@ -765,7 +766,7 @@ public function get_quote_message($qid, $tid)
         $quote = $quote->find_one();
 
         if (!$quote) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         // If the message contains a code tag we have to split it up (text within [code][/code] shouldn't be touched)
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index d9eac43b..cda62d6e 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Random;
@@ -49,7 +50,7 @@ public function change_pass($id)
             $cur_user = $cur_user->find_one();
 
             if ($key == '' || $key != $cur_user['activate_key']) {
-                throw new \FeatherBB\Core\Error(__('Pass key bad').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', 400);
+                throw new Error(__('Pass key bad').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', 400);
             } else {
                 $query = DB::for_table('users')
                     ->where('id', $id)
@@ -69,7 +70,7 @@ public function change_pass($id)
             $id = $this->hook->fire('change_pass_key_not_id', $id);
 
             if (!$this->user->is_admmod) { // A regular user trying to change another user's password?
-                throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                throw new Error(__('No permission'), 403);
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's password?
 
@@ -84,11 +85,11 @@ public function change_pass($id)
                 $user = $user->find_one();
 
                 if (!$user) {
-                    throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                    throw new Error(__('Bad request'), 404);
                 }
 
                 if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == FEATHER_ADMIN || $user['g_moderator'] == '1') {
-                    throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                    throw new Error(__('No permission'), 403);
                 }
             }
         }
@@ -99,10 +100,10 @@ public function change_pass($id)
             $new_password2 = Utils::trim($this->request->post('req_new_password2'));
 
             if ($new_password1 != $new_password2) {
-                throw new \FeatherBB\Core\Error(__('Pass not match'), 400);
+                throw new Error(__('Pass not match'), 400);
             }
             if (Utils::strlen($new_password1) < 6) {
-                throw new \FeatherBB\Core\Error(__('Pass too short'), 400);
+                throw new Error(__('Pass too short'), 400);
             }
 
             $cur_user = DB::for_table('users')
@@ -121,7 +122,7 @@ public function change_pass($id)
             }
 
             if (!$authorized) {
-                throw new \FeatherBB\Core\Error(__('Wrong pass'), 403);
+                throw new Error(__('Wrong pass'), 403);
             }
 
             $new_password_hash = Random::hash($new_password1);
@@ -151,7 +152,7 @@ public function change_email($id)
             $id = $this->hook->fire('change_email_not_id', $id);
 
             if (!$this->user->is_admmod) { // A regular user trying to change another user's email?
-                throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                throw new Error(__('No permission'), 403);
             } elseif ($this->user->g_moderator == '1') {
                 // A moderator trying to change a user's email?
                 $user['select'] = array('u.group_id', 'g.g_moderator');
@@ -165,11 +166,11 @@ public function change_email($id)
                 $user = $user->find_one();
 
                 if (!$user) {
-                    throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                    throw new Error(__('Bad request'), 404);
                 }
 
                 if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == FEATHER_ADMIN || $user['g_moderator'] == '1') {
-                    throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                    throw new Error(__('No permission'), 403);
                 }
             }
         }
@@ -184,7 +185,7 @@ public function change_email($id)
             $new_email_key = $new_email_key->find_one_col('activate_key');
 
             if ($key == '' || $key != $new_email_key) {
-                throw new \FeatherBB\Core\Error(__('Email key bad').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', 400);
+                throw new Error(__('Email key bad').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', 400);
             } else {
                 $update_mail = DB::for_table('users')
                     ->where('id', $id)
@@ -201,20 +202,20 @@ public function change_email($id)
             $this->hook->fire('change_email_post');
 
             if (Random::hash($this->request->post('req_password')) !== $this->user->password) {
-                throw new \FeatherBB\Core\Error(__('Wrong pass'));
+                throw new Error(__('Wrong pass'));
             }
 
             // Validate the email address
             $new_email = strtolower(Utils::trim($this->request->post('req_new_email')));
             $new_email = $this->hook->fire('change_email_new_email', $new_email);
             if (!$this->email->is_valid_email($new_email)) {
-                throw new \FeatherBB\Core\Error(__('Invalid email'), 400);
+                throw new Error(__('Invalid email'), 400);
             }
 
             // Check if it's a banned email address
             if ($this->email->is_banned_email($new_email)) {
                 if ($this->config['p_allow_banned_email'] == '0') {
-                    throw new \FeatherBB\Core\Error(__('Banned email'), 403);
+                    throw new Error(__('Banned email'), 403);
                 } elseif ($this->config['o_mailing_list'] != '') {
                     // Load the "banned email change" template
                     $mail_tpl = trim(file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/mail_templates/banned_email_change.tpl'));
@@ -247,7 +248,7 @@ public function change_email($id)
 
             if ($result) {
                 if ($this->config['p_allow_dupe_email'] == '0') {
-                    throw new \FeatherBB\Core\Error(__('Dupe email'), 400);
+                    throw new Error(__('Dupe email'), 400);
                 } elseif ($this->config['o_mailing_list'] != '') {
                     foreach($result as $cur_dupe) {
                         $dupe_list[] = $cur_dupe['username'];
@@ -310,7 +311,7 @@ public function change_email($id)
 
             $this->hook->fire('change_email_sent');
 
-            throw new \FeatherBB\Core\Error(__('Activate email sent').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', true);
+            throw new Error(__('Activate email sent').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.', true);
         }
         $this->hook->fire('change_email');
     }
@@ -320,7 +321,7 @@ public function upload_avatar($id, $files_data)
         $files_data = $this->hook->fire('upload_avatar_start', $files_data, $id);
 
         if (!isset($files_data['req_file'])) {
-            throw new \FeatherBB\Core\Error(__('No file'));
+            throw new Error(__('No file'));
         }
 
         $uploaded_file = $files_data['req_file'];
@@ -330,25 +331,25 @@ public function upload_avatar($id, $files_data)
             switch ($uploaded_file['error']) {
                 case 1: // UPLOAD_ERR_INI_SIZE
                 case 2: // UPLOAD_ERR_FORM_SIZE
-                    throw new \FeatherBB\Core\Error(__('Too large ini'));
+                    throw new Error(__('Too large ini'));
                     break;
 
                 case 3: // UPLOAD_ERR_PARTIAL
-                    throw new \FeatherBB\Core\Error(__('Partial upload'));
+                    throw new Error(__('Partial upload'));
                     break;
 
                 case 4: // UPLOAD_ERR_NO_FILE
-                    throw new \FeatherBB\Core\Error(__('No file'));
+                    throw new Error(__('No file'));
                     break;
 
                 case 6: // UPLOAD_ERR_NO_TMP_DIR
-                    throw new \FeatherBB\Core\Error(__('No tmp directory'));
+                    throw new Error(__('No tmp directory'));
                     break;
 
                 default:
                     // No error occured, but was something actually uploaded?
                     if ($uploaded_file['size'] == 0) {
-                        throw new \FeatherBB\Core\Error(__('No file'));
+                        throw new Error(__('No file'));
                     }
                     break;
             }
@@ -360,17 +361,17 @@ public function upload_avatar($id, $files_data)
             // Preliminary file check, adequate in most cases
             $allowed_types = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/png', 'image/x-png');
             if (!in_array($uploaded_file['type'], $allowed_types)) {
-                throw new \FeatherBB\Core\Error(__('Bad type'));
+                throw new Error(__('Bad type'));
             }
 
             // Make sure the file isn't too big
             if ($uploaded_file['size'] > $this->config['o_avatars_size']) {
-                throw new \FeatherBB\Core\Error(__('Too large').' '.Utils::forum_number_format($this->config['o_avatars_size']).' '.__('bytes').'.');
+                throw new Error(__('Too large').' '.Utils::forum_number_format($this->config['o_avatars_size']).' '.__('bytes').'.');
             }
 
             // Move the file to the avatar directory. We do this before checking the width/height to circumvent open_basedir restrictions
             if (!@move_uploaded_file($uploaded_file['tmp_name'], $this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.'.tmp')) {
-                throw new \FeatherBB\Core\Error(__('Move failed').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.');
+                throw new Error(__('Move failed').' <a href="mailto:'.Utils::escape($this->config['o_admin_email']).'">'.Utils::escape($this->config['o_admin_email']).'</a>.');
             }
 
             list($width, $height, $type, ) = @getimagesize($this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.'.tmp');
@@ -385,13 +386,13 @@ public function upload_avatar($id, $files_data)
             } else {
                 // Invalid type
                 @unlink($this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.'.tmp');
-                throw new \FeatherBB\Core\Error(__('Bad type'));
+                throw new Error(__('Bad type'));
             }
 
             // Now check the width/height
             if (empty($width) || empty($height) || $width > $this->config['o_avatars_width'] || $height > $this->config['o_avatars_height']) {
                 @unlink($this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.'.tmp');
-                throw new \FeatherBB\Core\Error(__('Too wide or high').' '.$this->config['o_avatars_width'].'x'.$this->config['o_avatars_height'].' '.__('pixels').'.');
+                throw new Error(__('Too wide or high').' '.$this->config['o_avatars_width'].'x'.$this->config['o_avatars_height'].' '.__('pixels').'.');
             }
 
             // Delete any old avatars and put the new one in place
@@ -399,7 +400,7 @@ public function upload_avatar($id, $files_data)
             @rename($this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.'.tmp', $this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.$extension);
             @chmod($this->feather->forum_env['FEATHER_ROOT'].$this->config['o_avatars_dir'].'/'.$id.$extension, 0644);
         } else {
-            throw new \FeatherBB\Core\Error(__('Unknown failure'));
+            throw new Error(__('Unknown failure'));
         }
 
         $uploaded_file = $this->hook->fire('upload_avatar', $uploaded_file);
@@ -581,7 +582,7 @@ public function promote_user($id)
         $next_group_id = $next_group_id->find_one_col('g.g_promote_next_group');
 
         if (!$next_group_id) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         // Update the user
@@ -614,7 +615,7 @@ public function delete_user($id)
         $username = $result['username'];
 
         if ($group_id == FEATHER_ADMIN) {
-            throw new \FeatherBB\Core\Error(__('No delete admin message'));
+            throw new Error(__('No delete admin message'));
         }
 
         if ($this->request->post('delete_user_comply')) {
@@ -753,7 +754,7 @@ public function fetch_user_group($id)
         $info = $info->find_one();
 
         if (!$info) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         return $info;
@@ -783,7 +784,7 @@ public function update_profile($id, $info, $section)
                     $languages = \FeatherBB\Core\Lister::getLangs();
                     $form['language'] = Utils::trim($this->request->post('form_language'));
                     if (!in_array($form['language'], $languages)) {
-                        throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                        throw new Error(__('Bad request'), 404);
                     }
                 }
 
@@ -798,7 +799,7 @@ public function update_profile($id, $info, $section)
                             $errors = '';
                             $errors = $this->check_username($form['username'], $errors, $id);
                             if (!empty($errors)) {
-                                throw new \FeatherBB\Core\Error($errors[0]);
+                                throw new Error($errors[0]);
                             }
 
                             $username_updated = true;
@@ -815,7 +816,7 @@ public function update_profile($id, $info, $section)
                     // Validate the email address
                     $form['email'] = strtolower(Utils::trim($this->request->post('req_email')));
                     if (!$this->email->is_valid_email($form['email'])) {
-                        throw new \FeatherBB\Core\Error(__('Invalid email'));
+                        throw new Error(__('Invalid email'));
                     }
                 }
 
@@ -836,14 +837,14 @@ public function update_profile($id, $info, $section)
                         $url = Url::is_valid($form['url']);
 
                         if ($url === false) {
-                            throw new \FeatherBB\Core\Error(__('Invalid website URL'));
+                            throw new Error(__('Invalid website URL'));
                         }
 
                         $form['url'] = $url['url'];
                     }
                 } else {
                     if (!empty($form['url'])) {
-                        throw new \FeatherBB\Core\Error(__('Website not allowed'));
+                        throw new Error(__('Website not allowed'));
                     }
 
                     $form['url'] = '';
@@ -860,7 +861,7 @@ public function update_profile($id, $info, $section)
                         $forbidden = array('member', 'moderator', 'administrator', 'banned', 'guest', utf8_strtolower(__('Member')), utf8_strtolower(__('Moderator')), utf8_strtolower(__('Administrator')), utf8_strtolower(__('Banned')), utf8_strtolower(__('Guest')));
 
                         if (in_array(utf8_strtolower($form['title']), $forbidden)) {
-                            throw new \FeatherBB\Core\Error(__('Forbidden title'));
+                            throw new Error(__('Forbidden title'));
                         }
                     }
                 }
@@ -880,7 +881,7 @@ public function update_profile($id, $info, $section)
 
                 // If the ICQ UIN contains anything other than digits it's invalid
                 if (preg_match('%[^0-9]%', $form['icq'])) {
-                    throw new \FeatherBB\Core\Error(__('Bad ICQ'));
+                    throw new Error(__('Bad ICQ'));
                 }
 
                 break;
@@ -896,9 +897,9 @@ public function update_profile($id, $info, $section)
 
                     // Validate signature
                     if (Utils::strlen($form['signature']) > $this->config['p_sig_length']) {
-                        throw new \FeatherBB\Core\Error(sprintf(__('Sig too long'), $this->config['p_sig_length'], Utils::strlen($form['signature']) - $this->config['p_sig_length']));
+                        throw new Error(sprintf(__('Sig too long'), $this->config['p_sig_length'], Utils::strlen($form['signature']) - $this->config['p_sig_length']));
                     } elseif (substr_count($form['signature'], "\n") > ($this->config['p_sig_lines']-1)) {
-                        throw new \FeatherBB\Core\Error(sprintf(__('Sig too many lines'), $this->config['p_sig_lines']));
+                        throw new Error(sprintf(__('Sig too many lines'), $this->config['p_sig_lines']));
                     } elseif ($form['signature'] && $this->config['p_sig_all_caps'] == '0' && Utils::is_all_uppercase($form['signature']) && !$this->user->is_admmod) {
                         $form['signature'] = utf8_ucwords(utf8_strtolower($form['signature']));
                     }
@@ -910,7 +911,7 @@ public function update_profile($id, $info, $section)
                         $form['signature'] = $this->feather->parser->preparse_bbcode($form['signature'], $errors, true);
 
                         if (count($errors) > 0) {
-                            throw new \FeatherBB\Core\Error('<ul><li>'.implode('</li><li>', $errors).'</li></ul>');
+                            throw new Error('<ul><li>'.implode('</li><li>', $errors).'</li></ul>');
                         }
                     }
                 }
@@ -953,7 +954,7 @@ public function update_profile($id, $info, $section)
                     $styles = \FeatherBB\Core\Lister::getStyles();
                     $form['style'] = Utils::trim($this->request->post('form_style'));
                     if (!in_array($form['style'], $styles)) {
-                        throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                        throw new Error(__('Bad request'), 404);
                     }
                 }
 
@@ -976,7 +977,7 @@ public function update_profile($id, $info, $section)
             }
 
             default:
-                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                throw new Error(__('Bad request'), 404);
         }
 
         $form = $this->hook->fire('update_profile_form', $form, $section, $id, $info);
@@ -988,7 +989,7 @@ public function update_profile($id, $info, $section)
         }
 
         if (empty($temp)) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         $update_user = DB::for_table('users')
@@ -1101,7 +1102,7 @@ public function get_user_info($id)
         $user = $user->find_one();
 
         if (!$user) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         return $user;
diff --git a/featherbb/Model/Register.php b/featherbb/Model/Register.php
index c1075ed2..e2be3c78 100644
--- a/featherbb/Model/Register.php
+++ b/featherbb/Model/Register.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Random;
@@ -45,7 +46,7 @@ public function check_for_errors()
         $already_registered = $already_registered->find_one();
 
         if ($already_registered) {
-            throw new \FeatherBB\Core\Error(__('Registration flood'), 429);
+            throw new Error(__('Registration flood'), 429);
         }
 
 
@@ -123,7 +124,7 @@ public function check_for_errors()
         if ($this->request->post('language')) {
             $user['language'] = preg_replace('%[\.\\\/]%', '', $this->request->post('language'));
             if (!file_exists($this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$user['language'].'/common.po')) {
-                throw new \FeatherBB\Core\Error(__('Bad request'), 500);
+                throw new Error(__('Bad request'), 500);
             }
         } else {
             $user['language'] = $this->config['o_default_lang'];
diff --git a/featherbb/Model/Search.php b/featherbb/Model/Search.php
index b5746db6..1392ed52 100644
--- a/featherbb/Model/Search.php
+++ b/featherbb/Model/Search.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Track;
@@ -50,7 +51,7 @@ public function get_search_results()
         if ($this->request->get('search_id')) {
             $search_id = intval($this->request->get('search_id'));
             if ($search_id < 1) {
-                throw new \FeatherBB\Core\Error(__('Bad request'), 400);
+                throw new Error(__('Bad request'), 400);
             }
         }
         // If it's a regular search (keywords and/or author)
@@ -67,7 +68,7 @@ public function get_search_results()
             }
 
             if (!$keywords && !$author) {
-                throw new \FeatherBB\Core\Error(__('No terms'), 400);
+                throw new Error(__('No terms'), 400);
             }
 
             if ($author) {
@@ -82,21 +83,21 @@ public function get_search_results()
         elseif ($action == 'show_user_posts' || $action == 'show_user_topics' || $action == 'show_subscriptions') {
             $user_id = ($this->request->get('user_id')) ? intval($this->request->get('user_id')) : $this->user->id;
             if ($user_id < 2) {
-                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                throw new Error(__('Bad request'), 404);
             }
 
             // Subscribed topics can only be viewed by admins, moderators and the users themselves
             if ($action == 'show_subscriptions' && !$this->user->is_admmod && $user_id != $this->user->id) {
-                throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                throw new Error(__('No permission'), 403);
             }
         } elseif ($action == 'show_recent') {
             $interval = $this->request->get('value') ? intval($this->request->get('value')) : 86400;
         } elseif ($action == 'show_replies') {
             if ($this->user->is_guest) {
-                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                throw new Error(__('Bad request'), 404);
             }
         } elseif ($action != 'show_new' && $action != 'show_unanswered') {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
 
@@ -123,7 +124,7 @@ public function get_search_results()
 
                 unset($temp);
             } else {
-                throw new \FeatherBB\Core\Error(__('No hits'), 204);
+                throw new Error(__('No hits'), 204);
             }
         } else {
             $keyword_results = $author_results = array();
@@ -134,7 +135,7 @@ public function get_search_results()
             if (!empty($author) || !empty($keywords)) {
                 // Flood protection
                 if ($this->user->last_search && (time() - $this->user->last_search) < $this->user->g_search_flood && (time() - $this->user->last_search) >= 0) {
-                    throw new \FeatherBB\Core\Error(sprintf(__('Search flood'), $this->user->g_search_flood, $this->user->g_search_flood - (time() - $this->user->last_search)), 429);
+                    throw new Error(sprintf(__('Search flood'), $this->user->g_search_flood, $this->user->g_search_flood - (time() - $this->user->last_search)), 429);
                 }
 
                 if (!$this->user->is_guest) {
@@ -183,7 +184,7 @@ public function get_search_results()
                     $keywords_array = $this->hook->fire('get_search_results_keywords_array', $keywords_array);
 
                     if (empty($keywords_array)) {
-                        throw new \FeatherBB\Core\Error(__('No hits'), 400);
+                        throw new Error(__('No hits'), 400);
                     }
 
                     // Should we search in message body or topic subject specifically?
@@ -320,7 +321,7 @@ public function get_search_results()
 
                 $num_hits = count($search_ids);
                 if (!$num_hits) {
-                    throw new \FeatherBB\Core\Error(__('No hits'), 204);
+                    throw new Error(__('No hits'), 204);
                 }
             } elseif ($action == 'show_new' || $action == 'show_recent' || $action == 'show_replies' || $action == 'show_user_posts' || $action == 'show_user_topics' || $action == 'show_subscriptions' || $action == 'show_unanswered') {
                 $search_type = array('action', $action);
@@ -337,7 +338,7 @@ public function get_search_results()
                 // If it's a search for new posts since last visit
                 if ($action == 'show_new') {
                     if ($this->user->is_guest) {
-                        throw new \FeatherBB\Core\Error(__('No permission'), 403);
+                        throw new Error(__('No permission'), 403);
                     }
 
                     $result = DB::for_table('topics')
@@ -361,7 +362,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        throw new \FeatherBB\Core\Error(__('No new posts'), 204);
+                        throw new Error(__('No new posts'), 204);
                     }
                 }
                 // If it's a search for recent posts (in a certain time interval)
@@ -386,7 +387,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        throw new \FeatherBB\Core\Error(__('No recent posts'), 204);
+                        throw new Error(__('No recent posts'), 204);
                     }
                 }
                 // If it's a search for topics in which the user has posted
@@ -411,7 +412,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        throw new \FeatherBB\Core\Error(__('No user posts'), 204);
+                        throw new Error(__('No user posts'), 204);
                     }
                 }
                 // If it's a search for posts by a specific user ID
@@ -434,7 +435,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        throw new \FeatherBB\Core\Error(__('No user posts'), 404);
+                        throw new Error(__('No user posts'), 404);
                     }
 
                     // Pass on the user ID so that we can later know whose posts we're searching for
@@ -458,7 +459,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        throw new \FeatherBB\Core\Error(__('No user topics'), 404);
+                        throw new Error(__('No user topics'), 404);
                     }
 
                     // Pass on the user ID so that we can later know whose topics we're searching for
@@ -467,7 +468,7 @@ public function get_search_results()
                 // If it's a search for subscribed topics
                 elseif ($action == 'show_subscriptions') {
                     if ($this->user->is_guest) {
-                        throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                        throw new Error(__('Bad request'), 404);
                     }
 
                     $result = DB::for_table('topics')
@@ -486,7 +487,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        throw new \FeatherBB\Core\Error(__('No subscriptions'), 404);
+                        throw new Error(__('No subscriptions'), 404);
                     }
 
                     // Pass on user ID so that we can later know whose subscriptions we're searching for
@@ -510,7 +511,7 @@ public function get_search_results()
                     $num_hits = count($result);
 
                     if (!$num_hits) {
-                        throw new \FeatherBB\Core\Error(__('No unanswered'), 404);
+                        throw new Error(__('No unanswered'), 404);
                     }
                 }
 
@@ -522,7 +523,7 @@ public function get_search_results()
                 $pdo = DB::get_db();
                 $pdo = null;
             } else {
-                throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                throw new Error(__('Bad request'), 404);
             }
 
 
@@ -658,7 +659,7 @@ public function get_search_results()
                     $subscriber_name = $subscriber_name->find_one_col('username');
 
                     if (!$subscriber_name) {
-                        throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+                        throw new Error(__('Bad request'), 404);
                     }
 
                     $search['crumbs_text']['search_type'] = '<a href="'.Url::get('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), Utils::escape($subscriber_name)).'</a>';
diff --git a/featherbb/Model/Topic.php b/featherbb/Model/Topic.php
index 021f4cbe..4dd69ee6 100644
--- a/featherbb/Model/Topic.php
+++ b/featherbb/Model/Topic.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Track;
@@ -40,7 +41,7 @@ public function redirect_to_post($post_id)
         $result = $result->find_one();
 
         if (!$result) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         $post['topic_id'] = $result['topic_id'];
@@ -148,7 +149,7 @@ public function get_info_topic($id)
         $cur_topic = $cur_topic->find_one();
 
         if (!$cur_topic) {
-            throw new \FeatherBB\Core\Error(__('Bad request'), 404);
+            throw new Error(__('Bad request'), 404);
         }
 
         $cur_topic = $this->hook->fire('get_info_topic', $cur_topic);
@@ -247,7 +248,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
         }
 
         if (empty($post_ids)) {
-            throw new \FeatherBB\Core\Error('The post table and topic table seem to be out of sync!', 500);
+            throw new Error('The post table and topic table seem to be out of sync!', 500);
         }
 
         // Retrieve the posts (and their respective poster/online status)
diff --git a/featherbb/Model/Userlist.php b/featherbb/Model/Userlist.php
index ff6195ae..501a76a3 100644
--- a/featherbb/Model/Userlist.php
+++ b/featherbb/Model/Userlist.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Model;
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use DB;
diff --git a/style/themes/FeatherBB/view/admin/bans/add_ban.php b/style/themes/FeatherBB/view/admin/bans/add_ban.php
index f2550e6d..78875851 100644
--- a/style/themes/FeatherBB/view/admin/bans/add_ban.php
+++ b/style/themes/FeatherBB/view/admin/bans/add_ban.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/bans/admin_bans.php b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
index b941e5a4..5b38c90d 100644
--- a/style/themes/FeatherBB/view/admin/bans/admin_bans.php
+++ b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/bans/search_ban.php b/style/themes/FeatherBB/view/admin/bans/search_ban.php
index 09de0138..84805282 100644
--- a/style/themes/FeatherBB/view/admin/bans/search_ban.php
+++ b/style/themes/FeatherBB/view/admin/bans/search_ban.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/categories.php b/style/themes/FeatherBB/view/admin/categories.php
index 92924652..536c28bb 100644
--- a/style/themes/FeatherBB/view/admin/categories.php
+++ b/style/themes/FeatherBB/view/admin/categories.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/censoring.php b/style/themes/FeatherBB/view/admin/censoring.php
index 8e15e0ba..e34cf9c2 100644
--- a/style/themes/FeatherBB/view/admin/censoring.php
+++ b/style/themes/FeatherBB/view/admin/censoring.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/forums/admin_forums.php b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
index 93fb4be7..a2a62e78 100644
--- a/style/themes/FeatherBB/view/admin/forums/admin_forums.php
+++ b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/forums/delete_forum.php b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
index c9c6daee..5106e71c 100644
--- a/style/themes/FeatherBB/view/admin/forums/delete_forum.php
+++ b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/forums/permissions.php b/style/themes/FeatherBB/view/admin/forums/permissions.php
index 5ea0322f..c849775b 100644
--- a/style/themes/FeatherBB/view/admin/forums/permissions.php
+++ b/style/themes/FeatherBB/view/admin/forums/permissions.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/groups/add_edit_group.php b/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
index c0b9e0c6..42d96a27 100644
--- a/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
+++ b/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/groups/admin_groups.php b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
index 93e33305..45a7c6e0 100644
--- a/style/themes/FeatherBB/view/admin/groups/admin_groups.php
+++ b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
index 7b6002fa..53517245 100644
--- a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
+++ b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/groups/delete_group.php b/style/themes/FeatherBB/view/admin/groups/delete_group.php
index dfda0465..3ab303bb 100644
--- a/style/themes/FeatherBB/view/admin/groups/delete_group.php
+++ b/style/themes/FeatherBB/view/admin/groups/delete_group.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/index.php b/style/themes/FeatherBB/view/admin/index.php
index d824ca91..d120aa87 100644
--- a/style/themes/FeatherBB/view/admin/index.php
+++ b/style/themes/FeatherBB/view/admin/index.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/loader.php b/style/themes/FeatherBB/view/admin/loader.php
index 5bcc17bb..5fe88d92 100644
--- a/style/themes/FeatherBB/view/admin/loader.php
+++ b/style/themes/FeatherBB/view/admin/loader.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
index 2bbf9693..440dd1a8 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/maintenance/prune.php b/style/themes/FeatherBB/view/admin/maintenance/prune.php
index c4b67d17..320f0e33 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/prune.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/prune.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
index e85d7133..bcda1aea 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/menu.php b/style/themes/FeatherBB/view/admin/menu.php
index f0e487a6..62df5d37 100644
--- a/style/themes/FeatherBB/view/admin/menu.php
+++ b/style/themes/FeatherBB/view/admin/menu.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/options.php b/style/themes/FeatherBB/view/admin/options.php
index 56c19e4f..5bece908 100644
--- a/style/themes/FeatherBB/view/admin/options.php
+++ b/style/themes/FeatherBB/view/admin/options.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Random;
diff --git a/style/themes/FeatherBB/view/admin/parser.php b/style/themes/FeatherBB/view/admin/parser.php
index d261d40d..06d1c2ce 100644
--- a/style/themes/FeatherBB/view/admin/parser.php
+++ b/style/themes/FeatherBB/view/admin/parser.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/permissions.php b/style/themes/FeatherBB/view/admin/permissions.php
index 20b21a13..9d743bcb 100644
--- a/style/themes/FeatherBB/view/admin/permissions.php
+++ b/style/themes/FeatherBB/view/admin/permissions.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/plugins.php b/style/themes/FeatherBB/view/admin/plugins.php
index ef629ad7..3e87fcfa 100644
--- a/style/themes/FeatherBB/view/admin/plugins.php
+++ b/style/themes/FeatherBB/view/admin/plugins.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/reports.php b/style/themes/FeatherBB/view/admin/reports.php
index ece8b9c3..e1bb22ac 100644
--- a/style/themes/FeatherBB/view/admin/reports.php
+++ b/style/themes/FeatherBB/view/admin/reports.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/statistics.php b/style/themes/FeatherBB/view/admin/statistics.php
index 8103ac34..41671752 100644
--- a/style/themes/FeatherBB/view/admin/statistics.php
+++ b/style/themes/FeatherBB/view/admin/statistics.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/users/admin_users.php b/style/themes/FeatherBB/view/admin/users/admin_users.php
index 56d8975c..ffaf481a 100644
--- a/style/themes/FeatherBB/view/admin/users/admin_users.php
+++ b/style/themes/FeatherBB/view/admin/users/admin_users.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/users/ban_users.php b/style/themes/FeatherBB/view/admin/users/ban_users.php
index 1f3b0bd1..cb7ac203 100644
--- a/style/themes/FeatherBB/view/admin/users/ban_users.php
+++ b/style/themes/FeatherBB/view/admin/users/ban_users.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/users/delete_users.php b/style/themes/FeatherBB/view/admin/users/delete_users.php
index d8793896..bac8dc37 100644
--- a/style/themes/FeatherBB/view/admin/users/delete_users.php
+++ b/style/themes/FeatherBB/view/admin/users/delete_users.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/users/find_users.php b/style/themes/FeatherBB/view/admin/users/find_users.php
index 2910b928..79b8b988 100644
--- a/style/themes/FeatherBB/view/admin/users/find_users.php
+++ b/style/themes/FeatherBB/view/admin/users/find_users.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/users/move_users.php b/style/themes/FeatherBB/view/admin/users/move_users.php
index 0b5c7803..0fa30a9f 100644
--- a/style/themes/FeatherBB/view/admin/users/move_users.php
+++ b/style/themes/FeatherBB/view/admin/users/move_users.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/users/search_ip.php b/style/themes/FeatherBB/view/admin/users/search_ip.php
index 146ffad4..a00a7453 100644
--- a/style/themes/FeatherBB/view/admin/users/search_ip.php
+++ b/style/themes/FeatherBB/view/admin/users/search_ip.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/admin/users/show_users.php b/style/themes/FeatherBB/view/admin/users/show_users.php
index 85401a77..7a7d899e 100644
--- a/style/themes/FeatherBB/view/admin/users/show_users.php
+++ b/style/themes/FeatherBB/view/admin/users/show_users.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/delete.php b/style/themes/FeatherBB/view/delete.php
index 8198cfb5..192309ef 100644
--- a/style/themes/FeatherBB/view/delete.php
+++ b/style/themes/FeatherBB/view/delete.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/edit.php b/style/themes/FeatherBB/view/edit.php
index 5e2cf033..cdcff6e6 100644
--- a/style/themes/FeatherBB/view/edit.php
+++ b/style/themes/FeatherBB/view/edit.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/error.php b/style/themes/FeatherBB/view/error.php
index 20b50139..0386e45b 100644
--- a/style/themes/FeatherBB/view/error.php
+++ b/style/themes/FeatherBB/view/error.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/footer.php b/style/themes/FeatherBB/view/footer.php
index 9a6660f6..7c39d99b 100644
--- a/style/themes/FeatherBB/view/footer.php
+++ b/style/themes/FeatherBB/view/footer.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/forum.php b/style/themes/FeatherBB/view/forum.php
index 38d4a16b..a2b69062 100644
--- a/style/themes/FeatherBB/view/forum.php
+++ b/style/themes/FeatherBB/view/forum.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/header.php b/style/themes/FeatherBB/view/header.php
index b9927636..2c67117f 100644
--- a/style/themes/FeatherBB/view/header.php
+++ b/style/themes/FeatherBB/view/header.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Random;
 use FeatherBB\Core\Url;
diff --git a/style/themes/FeatherBB/view/help.php b/style/themes/FeatherBB/view/help.php
index 8933210c..473db405 100644
--- a/style/themes/FeatherBB/view/help.php
+++ b/style/themes/FeatherBB/view/help.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/index.php b/style/themes/FeatherBB/view/index.php
index 0e9a9d66..33b783f3 100644
--- a/style/themes/FeatherBB/view/index.php
+++ b/style/themes/FeatherBB/view/index.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/install.php b/style/themes/FeatherBB/view/install.php
index 597f6325..3b460ae6 100644
--- a/style/themes/FeatherBB/view/install.php
+++ b/style/themes/FeatherBB/view/install.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/login/form.php b/style/themes/FeatherBB/view/login/form.php
index 0b7ba36e..a01577ca 100644
--- a/style/themes/FeatherBB/view/login/form.php
+++ b/style/themes/FeatherBB/view/login/form.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/login/password_forgotten.php b/style/themes/FeatherBB/view/login/password_forgotten.php
index 2add794d..e9efa5f6 100644
--- a/style/themes/FeatherBB/view/login/password_forgotten.php
+++ b/style/themes/FeatherBB/view/login/password_forgotten.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/misc/email.php b/style/themes/FeatherBB/view/misc/email.php
index 8facb42a..154663eb 100644
--- a/style/themes/FeatherBB/view/misc/email.php
+++ b/style/themes/FeatherBB/view/misc/email.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/misc/report.php b/style/themes/FeatherBB/view/misc/report.php
index c0fe59dd..368dc3ee 100644
--- a/style/themes/FeatherBB/view/misc/report.php
+++ b/style/themes/FeatherBB/view/misc/report.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/misc/rules.php b/style/themes/FeatherBB/view/misc/rules.php
index ef53782b..715c87ba 100644
--- a/style/themes/FeatherBB/view/misc/rules.php
+++ b/style/themes/FeatherBB/view/misc/rules.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/moderate/delete_posts.php b/style/themes/FeatherBB/view/moderate/delete_posts.php
index 30b6f5d2..3c02238d 100644
--- a/style/themes/FeatherBB/view/moderate/delete_posts.php
+++ b/style/themes/FeatherBB/view/moderate/delete_posts.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/moderate/delete_topics.php b/style/themes/FeatherBB/view/moderate/delete_topics.php
index d2d42f97..eac877a5 100644
--- a/style/themes/FeatherBB/view/moderate/delete_topics.php
+++ b/style/themes/FeatherBB/view/moderate/delete_topics.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/moderate/merge_topics.php b/style/themes/FeatherBB/view/moderate/merge_topics.php
index db46b0f2..04f76801 100644
--- a/style/themes/FeatherBB/view/moderate/merge_topics.php
+++ b/style/themes/FeatherBB/view/moderate/merge_topics.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/moderate/moderator_forum.php b/style/themes/FeatherBB/view/moderate/moderator_forum.php
index 4537da88..e099ba2f 100644
--- a/style/themes/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/themes/FeatherBB/view/moderate/moderator_forum.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/moderate/move_topics.php b/style/themes/FeatherBB/view/moderate/move_topics.php
index 0aae357c..4d928407 100644
--- a/style/themes/FeatherBB/view/moderate/move_topics.php
+++ b/style/themes/FeatherBB/view/moderate/move_topics.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/moderate/posts_view.php b/style/themes/FeatherBB/view/moderate/posts_view.php
index b6fa23a3..863f81ab 100644
--- a/style/themes/FeatherBB/view/moderate/posts_view.php
+++ b/style/themes/FeatherBB/view/moderate/posts_view.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/moderate/split_posts.php b/style/themes/FeatherBB/view/moderate/split_posts.php
index d880d14d..0576d8ed 100644
--- a/style/themes/FeatherBB/view/moderate/split_posts.php
+++ b/style/themes/FeatherBB/view/moderate/split_posts.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/post.php b/style/themes/FeatherBB/view/post.php
index 7f10729c..70005c4f 100644
--- a/style/themes/FeatherBB/view/post.php
+++ b/style/themes/FeatherBB/view/post.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/profile/change_mail.php b/style/themes/FeatherBB/view/profile/change_mail.php
index 799316e8..b2ae287c 100644
--- a/style/themes/FeatherBB/view/profile/change_mail.php
+++ b/style/themes/FeatherBB/view/profile/change_mail.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/profile/change_pass.php b/style/themes/FeatherBB/view/profile/change_pass.php
index d31f3025..43e58cbd 100644
--- a/style/themes/FeatherBB/view/profile/change_pass.php
+++ b/style/themes/FeatherBB/view/profile/change_pass.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/profile/delete_user.php b/style/themes/FeatherBB/view/profile/delete_user.php
index 08102e37..ba3c89c6 100644
--- a/style/themes/FeatherBB/view/profile/delete_user.php
+++ b/style/themes/FeatherBB/view/profile/delete_user.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/profile/menu.php b/style/themes/FeatherBB/view/profile/menu.php
index 81133c15..44ced57c 100644
--- a/style/themes/FeatherBB/view/profile/menu.php
+++ b/style/themes/FeatherBB/view/profile/menu.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/profile/section_admin.php b/style/themes/FeatherBB/view/profile/section_admin.php
index 5f74b9dc..1f52d71c 100644
--- a/style/themes/FeatherBB/view/profile/section_admin.php
+++ b/style/themes/FeatherBB/view/profile/section_admin.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/profile/section_display.php b/style/themes/FeatherBB/view/profile/section_display.php
index 9f30fb1c..f730c49c 100644
--- a/style/themes/FeatherBB/view/profile/section_display.php
+++ b/style/themes/FeatherBB/view/profile/section_display.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/profile/section_essentials.php b/style/themes/FeatherBB/view/profile/section_essentials.php
index 1fccfb03..068230aa 100644
--- a/style/themes/FeatherBB/view/profile/section_essentials.php
+++ b/style/themes/FeatherBB/view/profile/section_essentials.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/profile/section_messaging.php b/style/themes/FeatherBB/view/profile/section_messaging.php
index 4b311dca..1a69120d 100644
--- a/style/themes/FeatherBB/view/profile/section_messaging.php
+++ b/style/themes/FeatherBB/view/profile/section_messaging.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/profile/section_personal.php b/style/themes/FeatherBB/view/profile/section_personal.php
index 12691843..cec3df76 100644
--- a/style/themes/FeatherBB/view/profile/section_personal.php
+++ b/style/themes/FeatherBB/view/profile/section_personal.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/profile/section_personality.php b/style/themes/FeatherBB/view/profile/section_personality.php
index 8af1c19e..5022ca52 100644
--- a/style/themes/FeatherBB/view/profile/section_personality.php
+++ b/style/themes/FeatherBB/view/profile/section_personality.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/profile/section_privacy.php b/style/themes/FeatherBB/view/profile/section_privacy.php
index ea09d312..9643f155 100644
--- a/style/themes/FeatherBB/view/profile/section_privacy.php
+++ b/style/themes/FeatherBB/view/profile/section_privacy.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/profile/upload_avatar.php b/style/themes/FeatherBB/view/profile/upload_avatar.php
index ec1f82b4..4d58d0a3 100644
--- a/style/themes/FeatherBB/view/profile/upload_avatar.php
+++ b/style/themes/FeatherBB/view/profile/upload_avatar.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/profile/view_profile.php b/style/themes/FeatherBB/view/profile/view_profile.php
index d8a3638d..e4576acd 100644
--- a/style/themes/FeatherBB/view/profile/view_profile.php
+++ b/style/themes/FeatherBB/view/profile/view_profile.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/register/email.php b/style/themes/FeatherBB/view/register/email.php
index 9670d90c..0713db15 100644
--- a/style/themes/FeatherBB/view/register/email.php
+++ b/style/themes/FeatherBB/view/register/email.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/register/form.php b/style/themes/FeatherBB/view/register/form.php
index 870e6acb..16373a11 100644
--- a/style/themes/FeatherBB/view/register/form.php
+++ b/style/themes/FeatherBB/view/register/form.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/register/rules.php b/style/themes/FeatherBB/view/register/rules.php
index 1896824b..2f061153 100644
--- a/style/themes/FeatherBB/view/register/rules.php
+++ b/style/themes/FeatherBB/view/register/rules.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/search/footer.php b/style/themes/FeatherBB/view/search/footer.php
index 3a763fce..ed429419 100644
--- a/style/themes/FeatherBB/view/search/footer.php
+++ b/style/themes/FeatherBB/view/search/footer.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/search/form.php b/style/themes/FeatherBB/view/search/form.php
index 73c3daf3..91b55fbb 100644
--- a/style/themes/FeatherBB/view/search/form.php
+++ b/style/themes/FeatherBB/view/search/form.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/search/header.php b/style/themes/FeatherBB/view/search/header.php
index 6ab1ea5f..c8d7fef8 100644
--- a/style/themes/FeatherBB/view/search/header.php
+++ b/style/themes/FeatherBB/view/search/header.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/search/posts.php b/style/themes/FeatherBB/view/search/posts.php
index 4fad5086..8a688a9a 100644
--- a/style/themes/FeatherBB/view/search/posts.php
+++ b/style/themes/FeatherBB/view/search/posts.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/search/topics.php b/style/themes/FeatherBB/view/search/topics.php
index e41e54ff..aa364bb4 100644
--- a/style/themes/FeatherBB/view/search/topics.php
+++ b/style/themes/FeatherBB/view/search/topics.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/topic.php b/style/themes/FeatherBB/view/topic.php
index e56e8cd8..85c2c1d0 100644
--- a/style/themes/FeatherBB/view/topic.php
+++ b/style/themes/FeatherBB/view/topic.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/style/themes/FeatherBB/view/userlist.php b/style/themes/FeatherBB/view/userlist.php
index 86df7bd5..3f39b480 100644
--- a/style/themes/FeatherBB/view/userlist.php
+++ b/style/themes/FeatherBB/view/userlist.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
diff --git a/view/admin/options.php b/view/admin/options.php
index 5337bc6e..bf31384c 100644
--- a/view/admin/options.php
+++ b/view/admin/options.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Random;
diff --git a/view/delete.php b/view/delete.php
index 8198cfb5..192309ef 100644
--- a/view/delete.php
+++ b/view/delete.php
@@ -7,6 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 

From ad14bf26229dd43f298ef4bf0d4da4378617902e Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 21:51:51 +0200
Subject: [PATCH 332/353] Optimize imports

---
 extern.php                                                 | 5 ++---
 featherbb/Controller/Admin/Bans.php                        | 4 ++--
 featherbb/Controller/Admin/Categories.php                  | 4 ++--
 featherbb/Controller/Admin/Censoring.php                   | 4 +---
 featherbb/Controller/Admin/Forums.php                      | 3 +--
 featherbb/Controller/Admin/Groups.php                      | 3 +--
 featherbb/Controller/Admin/Index.php                       | 4 ++--
 featherbb/Controller/Admin/Maintenance.php                 | 4 +---
 featherbb/Controller/Admin/Options.php                     | 4 +---
 featherbb/Controller/Admin/Parser.php                      | 4 ++--
 featherbb/Controller/Admin/Permissions.php                 | 4 +---
 featherbb/Controller/Admin/Plugins.php                     | 3 +--
 featherbb/Controller/Admin/Reports.php                     | 4 +---
 featherbb/Controller/Admin/Statistics.php                  | 3 +--
 featherbb/Controller/Admin/Users.php                       | 4 ++--
 featherbb/Controller/Auth.php                              | 7 +++----
 featherbb/Controller/Delete.php                            | 1 -
 featherbb/Controller/Edit.php                              | 2 +-
 featherbb/Controller/Forum.php                             | 3 +--
 featherbb/Controller/Help.php                              | 2 --
 featherbb/Controller/Index.php                             | 2 --
 featherbb/Controller/Install.php                           | 5 ++---
 featherbb/Controller/Login.php                             | 3 +--
 featherbb/Controller/Misc.php                              | 4 ++--
 featherbb/Controller/Moderate.php                          | 2 +-
 featherbb/Controller/Post.php                              | 2 +-
 featherbb/Controller/Profile.php                           | 2 +-
 featherbb/Controller/Register.php                          | 2 +-
 featherbb/Controller/Search.php                            | 2 +-
 featherbb/Controller/Topic.php                             | 5 ++---
 featherbb/Controller/Userlist.php                          | 2 +-
 featherbb/Middleware/Auth.php                              | 4 ++--
 featherbb/Middleware/Core.php                              | 1 -
 featherbb/Model/Admin/Bans.php                             | 4 ++--
 featherbb/Model/Admin/Categories.php                       | 3 ---
 featherbb/Model/Admin/Censoring.php                        | 4 ++--
 featherbb/Model/Admin/Forums.php                           | 3 ---
 featherbb/Model/Admin/Groups.php                           | 4 ++--
 featherbb/Model/Admin/Maintenance.php                      | 4 ++--
 featherbb/Model/Admin/Options.php                          | 4 ++--
 featherbb/Model/Admin/Parser.php                           | 5 -----
 featherbb/Model/Admin/Permissions.php                      | 4 +---
 featherbb/Model/Admin/Reports.php                          | 4 +---
 featherbb/Model/Admin/Statistics.php                       | 3 ---
 featherbb/Model/Admin/Users.php                            | 6 +++---
 featherbb/Model/Auth.php                                   | 3 ---
 featherbb/Model/Cache.php                                  | 3 ---
 featherbb/Model/Debug.php                                  | 4 +---
 featherbb/Model/Delete.php                                 | 3 +--
 featherbb/Model/Edit.php                                   | 3 +--
 featherbb/Model/Forum.php                                  | 6 +++---
 featherbb/Model/Header.php                                 | 3 ---
 featherbb/Model/Index.php                                  | 7 +++----
 featherbb/Model/Install.php                                | 5 +----
 featherbb/Model/Login.php                                  | 6 +++---
 featherbb/Model/Misc.php                                   | 4 ++--
 featherbb/Model/Moderate.php                               | 6 +++---
 featherbb/Model/Post.php                                   | 6 +++---
 featherbb/Model/Profile.php                                | 6 +++---
 featherbb/Model/Register.php                               | 6 +++---
 featherbb/Model/Search.php                                 | 6 +++---
 featherbb/Model/Topic.php                                  | 6 +++---
 featherbb/Model/Userlist.php                               | 4 +---
 style/themes/FeatherBB/view/admin/bans/add_ban.php         | 2 --
 style/themes/FeatherBB/view/admin/bans/admin_bans.php      | 4 +---
 style/themes/FeatherBB/view/admin/bans/search_ban.php      | 5 ++---
 style/themes/FeatherBB/view/admin/categories.php           | 5 ++---
 style/themes/FeatherBB/view/admin/censoring.php            | 5 ++---
 style/themes/FeatherBB/view/admin/forums/admin_forums.php  | 4 +---
 style/themes/FeatherBB/view/admin/forums/delete_forum.php  | 4 +---
 style/themes/FeatherBB/view/admin/forums/permissions.php   | 5 ++---
 .../themes/FeatherBB/view/admin/groups/add_edit_group.php  | 4 +---
 style/themes/FeatherBB/view/admin/groups/admin_groups.php  | 5 ++---
 .../themes/FeatherBB/view/admin/groups/confirm_delete.php  | 5 ++---
 style/themes/FeatherBB/view/admin/groups/delete_group.php  | 3 +--
 style/themes/FeatherBB/view/admin/index.php                | 4 +---
 style/themes/FeatherBB/view/admin/loader.php               | 4 ----
 .../FeatherBB/view/admin/maintenance/admin_maintenance.php | 4 +---
 style/themes/FeatherBB/view/admin/maintenance/prune.php    | 5 ++---
 style/themes/FeatherBB/view/admin/maintenance/rebuild.php  | 2 --
 style/themes/FeatherBB/view/admin/menu.php                 | 2 --
 style/themes/FeatherBB/view/admin/options.php              | 5 ++---
 style/themes/FeatherBB/view/admin/parser.php               | 5 ++---
 style/themes/FeatherBB/view/admin/permissions.php          | 4 +---
 style/themes/FeatherBB/view/admin/plugins.php              | 2 --
 style/themes/FeatherBB/view/admin/reports.php              | 3 +--
 style/themes/FeatherBB/view/admin/statistics.php           | 5 ++---
 style/themes/FeatherBB/view/admin/users/admin_users.php    | 4 +---
 style/themes/FeatherBB/view/admin/users/ban_users.php      | 4 +---
 style/themes/FeatherBB/view/admin/users/delete_users.php   | 4 +---
 style/themes/FeatherBB/view/admin/users/find_users.php     | 3 +--
 style/themes/FeatherBB/view/admin/users/move_users.php     | 5 ++---
 style/themes/FeatherBB/view/admin/users/search_ip.php      | 5 ++---
 style/themes/FeatherBB/view/admin/users/show_users.php     | 5 ++---
 style/themes/FeatherBB/view/delete.php                     | 3 +--
 style/themes/FeatherBB/view/edit.php                       | 3 +--
 style/themes/FeatherBB/view/error.php                      | 4 ----
 style/themes/FeatherBB/view/footer.php                     | 3 +--
 style/themes/FeatherBB/view/forum.php                      | 3 +--
 style/themes/FeatherBB/view/header.php                     | 3 +--
 style/themes/FeatherBB/view/help.php                       | 3 +--
 style/themes/FeatherBB/view/index.php                      | 2 --
 style/themes/FeatherBB/view/install.php                    | 4 ----
 style/themes/FeatherBB/view/login/form.php                 | 2 --
 style/themes/FeatherBB/view/login/password_forgotten.php   | 2 --
 style/themes/FeatherBB/view/misc/email.php                 | 3 +--
 style/themes/FeatherBB/view/misc/report.php                | 5 ++---
 style/themes/FeatherBB/view/misc/rules.php                 | 4 ----
 style/themes/FeatherBB/view/moderate/delete_posts.php      | 4 ----
 style/themes/FeatherBB/view/moderate/delete_topics.php     | 4 ----
 style/themes/FeatherBB/view/moderate/merge_topics.php      | 4 ----
 style/themes/FeatherBB/view/moderate/moderator_forum.php   | 5 ++---
 style/themes/FeatherBB/view/moderate/move_topics.php       | 4 ----
 style/themes/FeatherBB/view/moderate/posts_view.php        | 5 ++---
 style/themes/FeatherBB/view/moderate/split_posts.php       | 4 ----
 style/themes/FeatherBB/view/post.php                       | 3 +--
 style/themes/FeatherBB/view/profile/change_mail.php        | 4 +---
 style/themes/FeatherBB/view/profile/change_pass.php        | 4 +---
 style/themes/FeatherBB/view/profile/delete_user.php        | 5 ++---
 style/themes/FeatherBB/view/profile/menu.php               | 2 --
 style/themes/FeatherBB/view/profile/section_admin.php      | 4 +---
 style/themes/FeatherBB/view/profile/section_display.php    | 3 +--
 style/themes/FeatherBB/view/profile/section_essentials.php | 3 +--
 style/themes/FeatherBB/view/profile/section_messaging.php  | 5 ++---
 style/themes/FeatherBB/view/profile/section_personal.php   | 5 ++---
 .../themes/FeatherBB/view/profile/section_personality.php  | 5 ++---
 style/themes/FeatherBB/view/profile/section_privacy.php    | 5 ++---
 style/themes/FeatherBB/view/profile/upload_avatar.php      | 3 +--
 style/themes/FeatherBB/view/profile/view_profile.php       | 4 ----
 style/themes/FeatherBB/view/register/email.php             | 4 +---
 style/themes/FeatherBB/view/register/form.php              | 4 +---
 style/themes/FeatherBB/view/register/rules.php             | 4 +---
 style/themes/FeatherBB/view/search/footer.php              | 4 +---
 style/themes/FeatherBB/view/search/form.php                | 4 ----
 style/themes/FeatherBB/view/search/header.php              | 4 +---
 style/themes/FeatherBB/view/search/posts.php               | 5 ++---
 style/themes/FeatherBB/view/search/topics.php              | 5 ++---
 style/themes/FeatherBB/view/topic.php                      | 3 +--
 style/themes/FeatherBB/view/userlist.php                   | 5 ++---
 view/admin/options.php                                     | 5 ++---
 view/delete.php                                            | 3 +--
 141 files changed, 174 insertions(+), 374 deletions(-)

diff --git a/extern.php b/extern.php
index 634c3604..d1b652e3 100644
--- a/extern.php
+++ b/extern.php
@@ -57,10 +57,9 @@
 
 namespace FeatherBB;
 use DB;
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Cache;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 define('FEATHER_QUIET_VISIT', 1);
 
diff --git a/featherbb/Controller/Admin/Bans.php b/featherbb/Controller/Admin/Bans.php
index 2bfb3e7f..2286a19d 100644
--- a/featherbb/Controller/Admin/Bans.php
+++ b/featherbb/Controller/Admin/Bans.php
@@ -9,10 +9,10 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Bans
 {
diff --git a/featherbb/Controller/Admin/Categories.php b/featherbb/Controller/Admin/Categories.php
index aa7ff21d..f64c09eb 100644
--- a/featherbb/Controller/Admin/Categories.php
+++ b/featherbb/Controller/Admin/Categories.php
@@ -9,10 +9,10 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 use FeatherBB\Model\Cache;
 
 class Categories
diff --git a/featherbb/Controller/Admin/Censoring.php b/featherbb/Controller/Admin/Censoring.php
index 72fd3c11..3e131252 100644
--- a/featherbb/Controller/Admin/Censoring.php
+++ b/featherbb/Controller/Admin/Censoring.php
@@ -9,10 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
-use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Censoring
 {
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
index b05b20ab..81a25fc5 100644
--- a/featherbb/Controller/Admin/Forums.php
+++ b/featherbb/Controller/Admin/Forums.php
@@ -9,10 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 use FeatherBB\Model\Cache;
 
 class Forums
diff --git a/featherbb/Controller/Admin/Groups.php b/featherbb/Controller/Admin/Groups.php
index d91eca93..d799a691 100644
--- a/featherbb/Controller/Admin/Groups.php
+++ b/featherbb/Controller/Admin/Groups.php
@@ -9,10 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
-use FeatherBB\Core\AdminUtils;
-use FeatherBB\Core\Url;
 
 class Groups
 {
diff --git a/featherbb/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
index eca9cec8..e14386cc 100644
--- a/featherbb/Controller/Admin/Index.php
+++ b/featherbb/Controller/Admin/Index.php
@@ -9,10 +9,10 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Index
 {
diff --git a/featherbb/Controller/Admin/Maintenance.php b/featherbb/Controller/Admin/Maintenance.php
index 86aa5081..629381ad 100644
--- a/featherbb/Controller/Admin/Maintenance.php
+++ b/featherbb/Controller/Admin/Maintenance.php
@@ -9,10 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
-use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Maintenance
 {
diff --git a/featherbb/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
index 04f7c503..e920e58f 100644
--- a/featherbb/Controller/Admin/Options.php
+++ b/featherbb/Controller/Admin/Options.php
@@ -9,10 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
-use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Options
 {
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
index fe7d68d8..a7d3b6db 100644
--- a/featherbb/Controller/Admin/Parser.php
+++ b/featherbb/Controller/Admin/Parser.php
@@ -9,10 +9,10 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Parser
 {
diff --git a/featherbb/Controller/Admin/Permissions.php b/featherbb/Controller/Admin/Permissions.php
index cb3f8f0b..13befe38 100644
--- a/featherbb/Controller/Admin/Permissions.php
+++ b/featherbb/Controller/Admin/Permissions.php
@@ -9,10 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
-use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Permissions
 {
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
index db55b655..cede2d7d 100644
--- a/featherbb/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -10,9 +10,8 @@
 namespace FeatherBB\Controller\Admin;
 
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Plugins
 {
diff --git a/featherbb/Controller/Admin/Reports.php b/featherbb/Controller/Admin/Reports.php
index 241f90ea..8728bb6b 100644
--- a/featherbb/Controller/Admin/Reports.php
+++ b/featherbb/Controller/Admin/Reports.php
@@ -9,10 +9,8 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
-use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Reports
 {
diff --git a/featherbb/Controller/Admin/Statistics.php b/featherbb/Controller/Admin/Statistics.php
index 6aaf714d..a519b231 100644
--- a/featherbb/Controller/Admin/Statistics.php
+++ b/featherbb/Controller/Admin/Statistics.php
@@ -9,10 +9,9 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
-use FeatherBB\Core\AdminUtils;
-use FeatherBB\Core\Url;
 
 class Statistics
 {
diff --git a/featherbb/Controller/Admin/Users.php b/featherbb/Controller/Admin/Users.php
index 8b76cae9..4ea8a246 100644
--- a/featherbb/Controller/Admin/Users.php
+++ b/featherbb/Controller/Admin/Users.php
@@ -9,10 +9,10 @@
 
 namespace FeatherBB\Controller\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\AdminUtils;
+use FeatherBB\Core\Error;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Users
 {
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
index 9c7fe91c..84bc9d0d 100644
--- a/featherbb/Controller/Auth.php
+++ b/featherbb/Controller/Auth.php
@@ -10,13 +10,12 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Random;
 use FeatherBB\Core\Track;
-use FeatherBB\Model\Cache;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 use FeatherBB\Model\Auth as ModelAuth;
-use DB;
+use FeatherBB\Model\Cache;
 
 class Auth
 {
diff --git a/featherbb/Controller/Delete.php b/featherbb/Controller/Delete.php
index 3768c242..25ce0095 100644
--- a/featherbb/Controller/Delete.php
+++ b/featherbb/Controller/Delete.php
@@ -11,7 +11,6 @@
 
 use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 class Delete
 {
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index e5a07025..b4e43129 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -10,8 +10,8 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Edit
 {
diff --git a/featherbb/Controller/Forum.php b/featherbb/Controller/Forum.php
index bb99a5ef..361f117b 100644
--- a/featherbb/Controller/Forum.php
+++ b/featherbb/Controller/Forum.php
@@ -9,9 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Forum
 {
diff --git a/featherbb/Controller/Help.php b/featherbb/Controller/Help.php
index b37142fe..ad90bdbc 100644
--- a/featherbb/Controller/Help.php
+++ b/featherbb/Controller/Help.php
@@ -9,9 +9,7 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 class Help
 {
diff --git a/featherbb/Controller/Index.php b/featherbb/Controller/Index.php
index 5cb121f3..20bd93da 100644
--- a/featherbb/Controller/Index.php
+++ b/featherbb/Controller/Index.php
@@ -9,9 +9,7 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 class Index
 {
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
index 9281e130..e3c10fba 100644
--- a/featherbb/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -9,10 +9,9 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Random;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Install
 {
diff --git a/featherbb/Controller/Login.php b/featherbb/Controller/Login.php
index ebfd360c..dcb08df6 100644
--- a/featherbb/Controller/Login.php
+++ b/featherbb/Controller/Login.php
@@ -9,9 +9,8 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Login
 {
diff --git a/featherbb/Controller/Misc.php b/featherbb/Controller/Misc.php
index 03a8d074..af0673d0 100644
--- a/featherbb/Controller/Misc.php
+++ b/featherbb/Controller/Misc.php
@@ -10,9 +10,9 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Track;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Misc
 {
diff --git a/featherbb/Controller/Moderate.php b/featherbb/Controller/Moderate.php
index 41fcd564..21dad350 100644
--- a/featherbb/Controller/Moderate.php
+++ b/featherbb/Controller/Moderate.php
@@ -10,8 +10,8 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Moderate
 {
diff --git a/featherbb/Controller/Post.php b/featherbb/Controller/Post.php
index 106684e6..be61ec96 100644
--- a/featherbb/Controller/Post.php
+++ b/featherbb/Controller/Post.php
@@ -10,8 +10,8 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Post
 {
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
index 6b8078c1..e167956b 100644
--- a/featherbb/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -10,8 +10,8 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 use FeatherBB\Model\Delete;
 
 class Profile
diff --git a/featherbb/Controller/Register.php b/featherbb/Controller/Register.php
index 986fb2de..3643f762 100644
--- a/featherbb/Controller/Register.php
+++ b/featherbb/Controller/Register.php
@@ -10,8 +10,8 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Register
 {
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index 7fe3ca31..dc5bbc89 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -10,8 +10,8 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Search
 {
diff --git a/featherbb/Controller/Topic.php b/featherbb/Controller/Topic.php
index 667d8507..ebd60d83 100644
--- a/featherbb/Controller/Topic.php
+++ b/featherbb/Controller/Topic.php
@@ -9,10 +9,9 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Track;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Topic
 {
diff --git a/featherbb/Controller/Userlist.php b/featherbb/Controller/Userlist.php
index ac2db1b9..7c624bc0 100644
--- a/featherbb/Controller/Userlist.php
+++ b/featherbb/Controller/Userlist.php
@@ -10,8 +10,8 @@
 namespace FeatherBB\Controller;
 
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Userlist
 {
diff --git a/featherbb/Middleware/Auth.php b/featherbb/Middleware/Auth.php
index 2d1c1160..a14f14bf 100644
--- a/featherbb/Middleware/Auth.php
+++ b/featherbb/Middleware/Auth.php
@@ -13,12 +13,12 @@
 
 namespace FeatherBB\Middleware;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Random;
 use FeatherBB\Core\Track;
+use FeatherBB\Core\Utils;
 use FeatherBB\Model\Cache;
-use DB;
 
 class Auth extends \Slim\Middleware
 {
diff --git a/featherbb/Middleware/Core.php b/featherbb/Middleware/Core.php
index 81ed97df..4901545d 100644
--- a/featherbb/Middleware/Core.php
+++ b/featherbb/Middleware/Core.php
@@ -14,7 +14,6 @@
 namespace FeatherBB\Middleware;
 
 use DB;
-use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
 
 class Core extends \Slim\Middleware
diff --git a/featherbb/Model/Admin/Bans.php b/featherbb/Model/Admin/Bans.php
index 5b2557e0..10c783f6 100644
--- a/featherbb/Model/Admin/Bans.php
+++ b/featherbb/Model/Admin/Bans.php
@@ -9,11 +9,11 @@
 
 namespace FeatherBB\Model\Admin;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 use FeatherBB\Model\Cache;
-use DB;
 
 class Bans
 {
diff --git a/featherbb/Model/Admin/Categories.php b/featherbb/Model/Admin/Categories.php
index 99dce50d..8fffc41d 100644
--- a/featherbb/Model/Admin/Categories.php
+++ b/featherbb/Model/Admin/Categories.php
@@ -9,9 +9,6 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use DB;
 
 class Categories
diff --git a/featherbb/Model/Admin/Censoring.php b/featherbb/Model/Admin/Censoring.php
index 1b36a0c6..2b3ad072 100644
--- a/featherbb/Model/Admin/Censoring.php
+++ b/featherbb/Model/Admin/Censoring.php
@@ -9,10 +9,10 @@
 
 namespace FeatherBB\Model\Admin;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
-use DB;
+use FeatherBB\Core\Utils;
 use FeatherBB\Model\Cache;
 
 class Censoring
diff --git a/featherbb/Model/Admin/Forums.php b/featherbb/Model/Admin/Forums.php
index 36588246..b84acb31 100644
--- a/featherbb/Model/Admin/Forums.php
+++ b/featherbb/Model/Admin/Forums.php
@@ -9,9 +9,6 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use DB;
 
 class Forums
diff --git a/featherbb/Model/Admin/Groups.php b/featherbb/Model/Admin/Groups.php
index 3ec86b00..4aa853a9 100644
--- a/featherbb/Model/Admin/Groups.php
+++ b/featherbb/Model/Admin/Groups.php
@@ -9,10 +9,10 @@
 
 namespace FeatherBB\Model\Admin;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
-use DB;
+use FeatherBB\Core\Utils;
 use FeatherBB\Model\Cache;
 
 class Groups
diff --git a/featherbb/Model/Admin/Maintenance.php b/featherbb/Model/Admin/Maintenance.php
index 5a2b5347..d1aa2b26 100644
--- a/featherbb/Model/Admin/Maintenance.php
+++ b/featherbb/Model/Admin/Maintenance.php
@@ -9,10 +9,10 @@
 
 namespace FeatherBB\Model\Admin;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
-use DB;
+use FeatherBB\Core\Utils;
 
 class Maintenance
 {
diff --git a/featherbb/Model/Admin/Options.php b/featherbb/Model/Admin/Options.php
index 195cbfd0..9efda0ae 100644
--- a/featherbb/Model/Admin/Options.php
+++ b/featherbb/Model/Admin/Options.php
@@ -9,11 +9,11 @@
 
 namespace FeatherBB\Model\Admin;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 use FeatherBB\Model\Cache;
-use DB;
 
 class Options
 {
diff --git a/featherbb/Model/Admin/Parser.php b/featherbb/Model/Admin/Parser.php
index 63d87655..6a0e0cdf 100644
--- a/featherbb/Model/Admin/Parser.php
+++ b/featherbb/Model/Admin/Parser.php
@@ -10,11 +10,6 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
-use DB;
-
 class Parser
 {
     public function __construct()
diff --git a/featherbb/Model/Admin/Permissions.php b/featherbb/Model/Admin/Permissions.php
index 02a93a8b..ed31ad24 100644
--- a/featherbb/Model/Admin/Permissions.php
+++ b/featherbb/Model/Admin/Permissions.php
@@ -9,10 +9,8 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use DB;
+use FeatherBB\Core\Url;
 use FeatherBB\Model\Cache;
 
 class Permissions
diff --git a/featherbb/Model/Admin/Reports.php b/featherbb/Model/Admin/Reports.php
index 18b1f49c..d06ff7f0 100644
--- a/featherbb/Model/Admin/Reports.php
+++ b/featherbb/Model/Admin/Reports.php
@@ -9,10 +9,8 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use DB;
+use FeatherBB\Core\Url;
 
 class Reports
 {
diff --git a/featherbb/Model/Admin/Statistics.php b/featherbb/Model/Admin/Statistics.php
index 7071e1aa..8b172a36 100644
--- a/featherbb/Model/Admin/Statistics.php
+++ b/featherbb/Model/Admin/Statistics.php
@@ -9,9 +9,6 @@
 
 namespace FeatherBB\Model\Admin;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use DB;
 
 class Statistics
diff --git a/featherbb/Model/Admin/Users.php b/featherbb/Model/Admin/Users.php
index 78ca3c28..456b0f01 100644
--- a/featherbb/Model/Admin/Users.php
+++ b/featherbb/Model/Admin/Users.php
@@ -9,12 +9,12 @@
 
 namespace FeatherBB\Model\Admin;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
-use FeatherBB\Model\Delete;
+use FeatherBB\Core\Utils;
 use FeatherBB\Model\Cache;
-use DB;
+use FeatherBB\Model\Delete;
 
 class Users
 {
diff --git a/featherbb/Model/Auth.php b/featherbb/Model/Auth.php
index cfaadba1..7b5682e1 100644
--- a/featherbb/Model/Auth.php
+++ b/featherbb/Model/Auth.php
@@ -9,9 +9,6 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use DB;
 
 class Auth
diff --git a/featherbb/Model/Cache.php b/featherbb/Model/Cache.php
index e68c319d..76b2e200 100644
--- a/featherbb/Model/Cache.php
+++ b/featherbb/Model/Cache.php
@@ -9,9 +9,6 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use DB;
 
 class Cache
diff --git a/featherbb/Model/Debug.php b/featherbb/Model/Debug.php
index e9d45a42..f963e8ab 100644
--- a/featherbb/Model/Debug.php
+++ b/featherbb/Model/Debug.php
@@ -9,10 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use DB;
+use FeatherBB\Core\Utils;
 
 class Debug
 {
diff --git a/featherbb/Model/Delete.php b/featherbb/Model/Delete.php
index 9773b101..76245eab 100644
--- a/featherbb/Model/Delete.php
+++ b/featherbb/Model/Delete.php
@@ -9,10 +9,9 @@
 
 namespace FeatherBB\Model;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
-use DB;
 
 class Delete
 {
diff --git a/featherbb/Model/Edit.php b/featherbb/Model/Edit.php
index e7e615a2..d5ad7b2f 100644
--- a/featherbb/Model/Edit.php
+++ b/featherbb/Model/Edit.php
@@ -9,10 +9,9 @@
 
 namespace FeatherBB\Model;
 
+use DB;
 use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
-use DB;
 
 class Edit
 {
diff --git a/featherbb/Model/Forum.php b/featherbb/Model/Forum.php
index 4ef7a642..2f4688cb 100644
--- a/featherbb/Model/Forum.php
+++ b/featherbb/Model/Forum.php
@@ -9,11 +9,11 @@
 
 namespace FeatherBB\Model;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Track;
-use DB;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Forum
 {
diff --git a/featherbb/Model/Header.php b/featherbb/Model/Header.php
index ad7eb60a..e20f1b6c 100644
--- a/featherbb/Model/Header.php
+++ b/featherbb/Model/Header.php
@@ -9,9 +9,6 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use DB;
 
 class Header
diff --git a/featherbb/Model/Index.php b/featherbb/Model/Index.php
index 6ae9d900..0720e2fb 100644
--- a/featherbb/Model/Index.php
+++ b/featherbb/Model/Index.php
@@ -9,11 +9,10 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
-use FeatherBB\Core\Track;
 use DB;
+use FeatherBB\Core\Track;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Index
 {
diff --git a/featherbb/Model/Install.php b/featherbb/Model/Install.php
index 84b161a3..43f4e73d 100644
--- a/featherbb/Model/Install.php
+++ b/featherbb/Model/Install.php
@@ -9,11 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
-use FeatherBB\Core\Random;
 use DB;
+use FeatherBB\Core\Random;
 
 class Install
 {
diff --git a/featherbb/Model/Login.php b/featherbb/Model/Login.php
index ae9de1ef..4086281f 100644
--- a/featherbb/Model/Login.php
+++ b/featherbb/Model/Login.php
@@ -9,12 +9,12 @@
 
 namespace FeatherBB\Model;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Random;
 use FeatherBB\Core\Track;
-use DB;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Login
 {
diff --git a/featherbb/Model/Misc.php b/featherbb/Model/Misc.php
index a2928f98..27845eec 100644
--- a/featherbb/Model/Misc.php
+++ b/featherbb/Model/Misc.php
@@ -9,10 +9,10 @@
 
 namespace FeatherBB\Model;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
-use DB;
+use FeatherBB\Core\Utils;
 
 class Misc
 {
diff --git a/featherbb/Model/Moderate.php b/featherbb/Model/Moderate.php
index 929c9bd6..63c84ecb 100644
--- a/featherbb/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -9,11 +9,11 @@
 
 namespace FeatherBB\Model;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Track;
-use DB;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Moderate
 {
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
index d196791a..f586f28b 100644
--- a/featherbb/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -9,11 +9,11 @@
 
 namespace FeatherBB\Model;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Track;
-use DB;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Post
 {
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index cda62d6e..a417890e 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -9,11 +9,11 @@
 
 namespace FeatherBB\Model;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Random;
-use DB;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Profile
 {
diff --git a/featherbb/Model/Register.php b/featherbb/Model/Register.php
index e2be3c78..092ddd22 100644
--- a/featherbb/Model/Register.php
+++ b/featherbb/Model/Register.php
@@ -9,11 +9,11 @@
 
 namespace FeatherBB\Model;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Random;
-use DB;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Register
 {
diff --git a/featherbb/Model/Search.php b/featherbb/Model/Search.php
index 1392ed52..56e03d30 100644
--- a/featherbb/Model/Search.php
+++ b/featherbb/Model/Search.php
@@ -9,11 +9,11 @@
 
 namespace FeatherBB\Model;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Track;
-use DB;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Search
 {
diff --git a/featherbb/Model/Topic.php b/featherbb/Model/Topic.php
index 4dd69ee6..4eb8b1ba 100644
--- a/featherbb/Model/Topic.php
+++ b/featherbb/Model/Topic.php
@@ -9,11 +9,11 @@
 
 namespace FeatherBB\Model;
 
+use DB;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Track;
-use DB;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 class Topic
 {
diff --git a/featherbb/Model/Userlist.php b/featherbb/Model/Userlist.php
index 501a76a3..4c45581e 100644
--- a/featherbb/Model/Userlist.php
+++ b/featherbb/Model/Userlist.php
@@ -9,10 +9,8 @@
 
 namespace FeatherBB\Model;
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use DB;
+use FeatherBB\Core\Utils;
 
 class Userlist
 {
diff --git a/style/themes/FeatherBB/view/admin/bans/add_ban.php b/style/themes/FeatherBB/view/admin/bans/add_ban.php
index 78875851..07928c5c 100644
--- a/style/themes/FeatherBB/view/admin/bans/add_ban.php
+++ b/style/themes/FeatherBB/view/admin/bans/add_ban.php
@@ -7,9 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/bans/admin_bans.php b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
index 5b38c90d..831b0d4c 100644
--- a/style/themes/FeatherBB/view/admin/bans/admin_bans.php
+++ b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
@@ -6,9 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/admin/bans/search_ban.php b/style/themes/FeatherBB/view/admin/bans/search_ban.php
index 84805282..1f379e57 100644
--- a/style/themes/FeatherBB/view/admin/bans/search_ban.php
+++ b/style/themes/FeatherBB/view/admin/bans/search_ban.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/categories.php b/style/themes/FeatherBB/view/admin/categories.php
index 536c28bb..c8bcc748 100644
--- a/style/themes/FeatherBB/view/admin/categories.php
+++ b/style/themes/FeatherBB/view/admin/categories.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/censoring.php b/style/themes/FeatherBB/view/admin/censoring.php
index e34cf9c2..d9724649 100644
--- a/style/themes/FeatherBB/view/admin/censoring.php
+++ b/style/themes/FeatherBB/view/admin/censoring.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/forums/admin_forums.php b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
index a2a62e78..1e92de84 100644
--- a/style/themes/FeatherBB/view/admin/forums/admin_forums.php
+++ b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
@@ -7,9 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
+use FeatherBB\Core\Url;use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/forums/delete_forum.php b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
index 5106e71c..5c8d1519 100644
--- a/style/themes/FeatherBB/view/admin/forums/delete_forum.php
+++ b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
@@ -6,9 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/admin/forums/permissions.php b/style/themes/FeatherBB/view/admin/forums/permissions.php
index c849775b..e77fe3e1 100644
--- a/style/themes/FeatherBB/view/admin/forums/permissions.php
+++ b/style/themes/FeatherBB/view/admin/forums/permissions.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/groups/add_edit_group.php b/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
index 42d96a27..a7873c00 100644
--- a/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
+++ b/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
@@ -6,10 +6,8 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
+
 use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/groups/admin_groups.php b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
index 45a7c6e0..af3c5e52 100644
--- a/style/themes/FeatherBB/view/admin/groups/admin_groups.php
+++ b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
index 53517245..636e2b39 100644
--- a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
+++ b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/groups/delete_group.php b/style/themes/FeatherBB/view/admin/groups/delete_group.php
index 3ab303bb..a17bf83d 100644
--- a/style/themes/FeatherBB/view/admin/groups/delete_group.php
+++ b/style/themes/FeatherBB/view/admin/groups/delete_group.php
@@ -7,9 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/index.php b/style/themes/FeatherBB/view/admin/index.php
index d120aa87..49ea7007 100644
--- a/style/themes/FeatherBB/view/admin/index.php
+++ b/style/themes/FeatherBB/view/admin/index.php
@@ -6,9 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/admin/loader.php b/style/themes/FeatherBB/view/admin/loader.php
index 5fe88d92..d1296d7c 100644
--- a/style/themes/FeatherBB/view/admin/loader.php
+++ b/style/themes/FeatherBB/view/admin/loader.php
@@ -6,10 +6,6 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
index 440dd1a8..f9a7a6e7 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
@@ -6,9 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/admin/maintenance/prune.php b/style/themes/FeatherBB/view/admin/maintenance/prune.php
index 320f0e33..66326761 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/prune.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/prune.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
index bcda1aea..55b8913d 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
@@ -7,8 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/admin/menu.php b/style/themes/FeatherBB/view/admin/menu.php
index 62df5d37..1310d426 100644
--- a/style/themes/FeatherBB/view/admin/menu.php
+++ b/style/themes/FeatherBB/view/admin/menu.php
@@ -7,8 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/admin/options.php b/style/themes/FeatherBB/view/admin/options.php
index 5bece908..3d9fcca4 100644
--- a/style/themes/FeatherBB/view/admin/options.php
+++ b/style/themes/FeatherBB/view/admin/options.php
@@ -7,10 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Random;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/parser.php b/style/themes/FeatherBB/view/admin/parser.php
index 06d1c2ce..06b1614f 100644
--- a/style/themes/FeatherBB/view/admin/parser.php
+++ b/style/themes/FeatherBB/view/admin/parser.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/permissions.php b/style/themes/FeatherBB/view/admin/permissions.php
index 9d743bcb..332398dc 100644
--- a/style/themes/FeatherBB/view/admin/permissions.php
+++ b/style/themes/FeatherBB/view/admin/permissions.php
@@ -6,9 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/admin/plugins.php b/style/themes/FeatherBB/view/admin/plugins.php
index 3e87fcfa..36a6cffc 100644
--- a/style/themes/FeatherBB/view/admin/plugins.php
+++ b/style/themes/FeatherBB/view/admin/plugins.php
@@ -7,8 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/admin/reports.php b/style/themes/FeatherBB/view/admin/reports.php
index e1bb22ac..6537baf4 100644
--- a/style/themes/FeatherBB/view/admin/reports.php
+++ b/style/themes/FeatherBB/view/admin/reports.php
@@ -7,9 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/statistics.php b/style/themes/FeatherBB/view/admin/statistics.php
index 41671752..be364194 100644
--- a/style/themes/FeatherBB/view/admin/statistics.php
+++ b/style/themes/FeatherBB/view/admin/statistics.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/users/admin_users.php b/style/themes/FeatherBB/view/admin/users/admin_users.php
index ffaf481a..5c3200a9 100644
--- a/style/themes/FeatherBB/view/admin/users/admin_users.php
+++ b/style/themes/FeatherBB/view/admin/users/admin_users.php
@@ -6,9 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/admin/users/ban_users.php b/style/themes/FeatherBB/view/admin/users/ban_users.php
index cb7ac203..9fbd36d7 100644
--- a/style/themes/FeatherBB/view/admin/users/ban_users.php
+++ b/style/themes/FeatherBB/view/admin/users/ban_users.php
@@ -6,9 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/admin/users/delete_users.php b/style/themes/FeatherBB/view/admin/users/delete_users.php
index bac8dc37..7591e22b 100644
--- a/style/themes/FeatherBB/view/admin/users/delete_users.php
+++ b/style/themes/FeatherBB/view/admin/users/delete_users.php
@@ -6,9 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/admin/users/find_users.php b/style/themes/FeatherBB/view/admin/users/find_users.php
index 79b8b988..5056124d 100644
--- a/style/themes/FeatherBB/view/admin/users/find_users.php
+++ b/style/themes/FeatherBB/view/admin/users/find_users.php
@@ -7,9 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/users/move_users.php b/style/themes/FeatherBB/view/admin/users/move_users.php
index 0fa30a9f..0f23e353 100644
--- a/style/themes/FeatherBB/view/admin/users/move_users.php
+++ b/style/themes/FeatherBB/view/admin/users/move_users.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/users/search_ip.php b/style/themes/FeatherBB/view/admin/users/search_ip.php
index a00a7453..885ef9c7 100644
--- a/style/themes/FeatherBB/view/admin/users/search_ip.php
+++ b/style/themes/FeatherBB/view/admin/users/search_ip.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/admin/users/show_users.php b/style/themes/FeatherBB/view/admin/users/show_users.php
index 7a7d899e..56c7b933 100644
--- a/style/themes/FeatherBB/view/admin/users/show_users.php
+++ b/style/themes/FeatherBB/view/admin/users/show_users.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/delete.php b/style/themes/FeatherBB/view/delete.php
index 192309ef..6ea36ea3 100644
--- a/style/themes/FeatherBB/view/delete.php
+++ b/style/themes/FeatherBB/view/delete.php
@@ -7,9 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/edit.php b/style/themes/FeatherBB/view/edit.php
index cdcff6e6..808ac750 100644
--- a/style/themes/FeatherBB/view/edit.php
+++ b/style/themes/FeatherBB/view/edit.php
@@ -7,9 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/error.php b/style/themes/FeatherBB/view/error.php
index 0386e45b..8d4d01cb 100644
--- a/style/themes/FeatherBB/view/error.php
+++ b/style/themes/FeatherBB/view/error.php
@@ -7,10 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
-
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/footer.php b/style/themes/FeatherBB/view/footer.php
index 7c39d99b..5e741a0b 100644
--- a/style/themes/FeatherBB/view/footer.php
+++ b/style/themes/FeatherBB/view/footer.php
@@ -7,9 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/forum.php b/style/themes/FeatherBB/view/forum.php
index a2b69062..d054b873 100644
--- a/style/themes/FeatherBB/view/forum.php
+++ b/style/themes/FeatherBB/view/forum.php
@@ -7,9 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/header.php b/style/themes/FeatherBB/view/header.php
index 2c67117f..c71f7fa2 100644
--- a/style/themes/FeatherBB/view/header.php
+++ b/style/themes/FeatherBB/view/header.php
@@ -7,10 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Random;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/help.php b/style/themes/FeatherBB/view/help.php
index 473db405..3768c898 100644
--- a/style/themes/FeatherBB/view/help.php
+++ b/style/themes/FeatherBB/view/help.php
@@ -7,9 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/index.php b/style/themes/FeatherBB/view/index.php
index 33b783f3..67fc0e06 100644
--- a/style/themes/FeatherBB/view/index.php
+++ b/style/themes/FeatherBB/view/index.php
@@ -7,9 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/install.php b/style/themes/FeatherBB/view/install.php
index 3b460ae6..1c881cf2 100644
--- a/style/themes/FeatherBB/view/install.php
+++ b/style/themes/FeatherBB/view/install.php
@@ -7,10 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
-
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/login/form.php b/style/themes/FeatherBB/view/login/form.php
index a01577ca..0a6bc9f7 100644
--- a/style/themes/FeatherBB/view/login/form.php
+++ b/style/themes/FeatherBB/view/login/form.php
@@ -7,8 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/login/password_forgotten.php b/style/themes/FeatherBB/view/login/password_forgotten.php
index e9efa5f6..d2981dff 100644
--- a/style/themes/FeatherBB/view/login/password_forgotten.php
+++ b/style/themes/FeatherBB/view/login/password_forgotten.php
@@ -7,8 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/misc/email.php b/style/themes/FeatherBB/view/misc/email.php
index 154663eb..e2ed73e0 100644
--- a/style/themes/FeatherBB/view/misc/email.php
+++ b/style/themes/FeatherBB/view/misc/email.php
@@ -7,9 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/misc/report.php b/style/themes/FeatherBB/view/misc/report.php
index 368dc3ee..7db3284c 100644
--- a/style/themes/FeatherBB/view/misc/report.php
+++ b/style/themes/FeatherBB/view/misc/report.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/misc/rules.php b/style/themes/FeatherBB/view/misc/rules.php
index 715c87ba..163df1b7 100644
--- a/style/themes/FeatherBB/view/misc/rules.php
+++ b/style/themes/FeatherBB/view/misc/rules.php
@@ -7,10 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
-
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
diff --git a/style/themes/FeatherBB/view/moderate/delete_posts.php b/style/themes/FeatherBB/view/moderate/delete_posts.php
index 3c02238d..7e5b57df 100644
--- a/style/themes/FeatherBB/view/moderate/delete_posts.php
+++ b/style/themes/FeatherBB/view/moderate/delete_posts.php
@@ -6,10 +6,6 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/delete_topics.php b/style/themes/FeatherBB/view/moderate/delete_topics.php
index eac877a5..4823a5c5 100644
--- a/style/themes/FeatherBB/view/moderate/delete_topics.php
+++ b/style/themes/FeatherBB/view/moderate/delete_topics.php
@@ -6,10 +6,6 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/merge_topics.php b/style/themes/FeatherBB/view/moderate/merge_topics.php
index 04f76801..7b1ff2a9 100644
--- a/style/themes/FeatherBB/view/moderate/merge_topics.php
+++ b/style/themes/FeatherBB/view/moderate/merge_topics.php
@@ -6,10 +6,6 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/moderator_forum.php b/style/themes/FeatherBB/view/moderate/moderator_forum.php
index e099ba2f..1c8ee4b7 100644
--- a/style/themes/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/themes/FeatherBB/view/moderate/moderator_forum.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/move_topics.php b/style/themes/FeatherBB/view/moderate/move_topics.php
index 4d928407..3c8b979c 100644
--- a/style/themes/FeatherBB/view/moderate/move_topics.php
+++ b/style/themes/FeatherBB/view/moderate/move_topics.php
@@ -6,10 +6,6 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/posts_view.php b/style/themes/FeatherBB/view/moderate/posts_view.php
index 863f81ab..3c9e3f54 100644
--- a/style/themes/FeatherBB/view/moderate/posts_view.php
+++ b/style/themes/FeatherBB/view/moderate/posts_view.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/moderate/split_posts.php b/style/themes/FeatherBB/view/moderate/split_posts.php
index 0576d8ed..433ed3d3 100644
--- a/style/themes/FeatherBB/view/moderate/split_posts.php
+++ b/style/themes/FeatherBB/view/moderate/split_posts.php
@@ -6,10 +6,6 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/post.php b/style/themes/FeatherBB/view/post.php
index 70005c4f..45b3a039 100644
--- a/style/themes/FeatherBB/view/post.php
+++ b/style/themes/FeatherBB/view/post.php
@@ -7,9 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/change_mail.php b/style/themes/FeatherBB/view/profile/change_mail.php
index b2ae287c..065e6c9d 100644
--- a/style/themes/FeatherBB/view/profile/change_mail.php
+++ b/style/themes/FeatherBB/view/profile/change_mail.php
@@ -6,9 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/profile/change_pass.php b/style/themes/FeatherBB/view/profile/change_pass.php
index 43e58cbd..7525ae62 100644
--- a/style/themes/FeatherBB/view/profile/change_pass.php
+++ b/style/themes/FeatherBB/view/profile/change_pass.php
@@ -6,9 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/profile/delete_user.php b/style/themes/FeatherBB/view/profile/delete_user.php
index ba3c89c6..91ca44a9 100644
--- a/style/themes/FeatherBB/view/profile/delete_user.php
+++ b/style/themes/FeatherBB/view/profile/delete_user.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/menu.php b/style/themes/FeatherBB/view/profile/menu.php
index 44ced57c..9150ead0 100644
--- a/style/themes/FeatherBB/view/profile/menu.php
+++ b/style/themes/FeatherBB/view/profile/menu.php
@@ -7,8 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/profile/section_admin.php b/style/themes/FeatherBB/view/profile/section_admin.php
index 1f52d71c..c05d0638 100644
--- a/style/themes/FeatherBB/view/profile/section_admin.php
+++ b/style/themes/FeatherBB/view/profile/section_admin.php
@@ -7,9 +7,7 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
+use FeatherBB\Core\Url;use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/section_display.php b/style/themes/FeatherBB/view/profile/section_display.php
index f730c49c..7095926a 100644
--- a/style/themes/FeatherBB/view/profile/section_display.php
+++ b/style/themes/FeatherBB/view/profile/section_display.php
@@ -7,9 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/section_essentials.php b/style/themes/FeatherBB/view/profile/section_essentials.php
index 068230aa..ae9320dc 100644
--- a/style/themes/FeatherBB/view/profile/section_essentials.php
+++ b/style/themes/FeatherBB/view/profile/section_essentials.php
@@ -7,9 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/section_messaging.php b/style/themes/FeatherBB/view/profile/section_messaging.php
index 1a69120d..7ee8261d 100644
--- a/style/themes/FeatherBB/view/profile/section_messaging.php
+++ b/style/themes/FeatherBB/view/profile/section_messaging.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/section_personal.php b/style/themes/FeatherBB/view/profile/section_personal.php
index cec3df76..43a164fb 100644
--- a/style/themes/FeatherBB/view/profile/section_personal.php
+++ b/style/themes/FeatherBB/view/profile/section_personal.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/section_personality.php b/style/themes/FeatherBB/view/profile/section_personality.php
index 5022ca52..86d8b9c7 100644
--- a/style/themes/FeatherBB/view/profile/section_personality.php
+++ b/style/themes/FeatherBB/view/profile/section_personality.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/section_privacy.php b/style/themes/FeatherBB/view/profile/section_privacy.php
index 9643f155..7e567ee9 100644
--- a/style/themes/FeatherBB/view/profile/section_privacy.php
+++ b/style/themes/FeatherBB/view/profile/section_privacy.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/upload_avatar.php b/style/themes/FeatherBB/view/profile/upload_avatar.php
index 4d58d0a3..144720f4 100644
--- a/style/themes/FeatherBB/view/profile/upload_avatar.php
+++ b/style/themes/FeatherBB/view/profile/upload_avatar.php
@@ -7,9 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/profile/view_profile.php b/style/themes/FeatherBB/view/profile/view_profile.php
index e4576acd..f1445122 100644
--- a/style/themes/FeatherBB/view/profile/view_profile.php
+++ b/style/themes/FeatherBB/view/profile/view_profile.php
@@ -6,10 +6,6 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/register/email.php b/style/themes/FeatherBB/view/register/email.php
index 0713db15..dba4b807 100644
--- a/style/themes/FeatherBB/view/register/email.php
+++ b/style/themes/FeatherBB/view/register/email.php
@@ -6,10 +6,8 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
+
 use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/register/form.php b/style/themes/FeatherBB/view/register/form.php
index 16373a11..79bbdaae 100644
--- a/style/themes/FeatherBB/view/register/form.php
+++ b/style/themes/FeatherBB/view/register/form.php
@@ -6,10 +6,8 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
+
 use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/register/rules.php b/style/themes/FeatherBB/view/register/rules.php
index 2f061153..abc9af56 100644
--- a/style/themes/FeatherBB/view/register/rules.php
+++ b/style/themes/FeatherBB/view/register/rules.php
@@ -6,9 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/search/footer.php b/style/themes/FeatherBB/view/search/footer.php
index ed429419..32ab02e9 100644
--- a/style/themes/FeatherBB/view/search/footer.php
+++ b/style/themes/FeatherBB/view/search/footer.php
@@ -6,9 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/search/form.php b/style/themes/FeatherBB/view/search/form.php
index 91b55fbb..8ac06fcf 100644
--- a/style/themes/FeatherBB/view/search/form.php
+++ b/style/themes/FeatherBB/view/search/form.php
@@ -6,10 +6,6 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/search/header.php b/style/themes/FeatherBB/view/search/header.php
index c8d7fef8..70373636 100644
--- a/style/themes/FeatherBB/view/search/header.php
+++ b/style/themes/FeatherBB/view/search/header.php
@@ -6,9 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
diff --git a/style/themes/FeatherBB/view/search/posts.php b/style/themes/FeatherBB/view/search/posts.php
index 8a688a9a..d1103f1a 100644
--- a/style/themes/FeatherBB/view/search/posts.php
+++ b/style/themes/FeatherBB/view/search/posts.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/search/topics.php b/style/themes/FeatherBB/view/search/topics.php
index aa364bb4..759f8a98 100644
--- a/style/themes/FeatherBB/view/search/topics.php
+++ b/style/themes/FeatherBB/view/search/topics.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/topic.php b/style/themes/FeatherBB/view/topic.php
index 85c2c1d0..e8b6d799 100644
--- a/style/themes/FeatherBB/view/topic.php
+++ b/style/themes/FeatherBB/view/topic.php
@@ -7,9 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/style/themes/FeatherBB/view/userlist.php b/style/themes/FeatherBB/view/userlist.php
index 3f39b480..45e40349 100644
--- a/style/themes/FeatherBB/view/userlist.php
+++ b/style/themes/FeatherBB/view/userlist.php
@@ -6,10 +6,9 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
+
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/view/admin/options.php b/view/admin/options.php
index bf31384c..997c73a0 100644
--- a/view/admin/options.php
+++ b/view/admin/options.php
@@ -7,10 +7,9 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Random;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
diff --git a/view/delete.php b/view/delete.php
index 192309ef..6ea36ea3 100644
--- a/view/delete.php
+++ b/view/delete.php
@@ -7,9 +7,8 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-use FeatherBB\Core\Error;
-use FeatherBB\Core\Utils;
 use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {

From 2d929d510b5240943ec40c1ad8328a35a3684156 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Sun, 6 Sep 2015 21:58:31 +0200
Subject: [PATCH 333/353] Remove cache

---
 ...5bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache |    1 -
 cache/cache_parser_data.php                   | 1386 -----------------
 2 files changed, 1387 deletions(-)
 delete mode 100644 cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
 delete mode 100644 cache/cache_parser_data.php

diff --git a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
deleted file mode 100644
index c50c9931..00000000
--- a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
+++ /dev/null
@@ -1 +0,0 @@
-{"config":{"time":1441567686,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1441556741,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1441556741,"expire":0,"data":"a:2:{s:11:\"total_users\";i:5;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"6\";s:8:\"username\";s:3:\"mod\";}}"},"quickjump":{"time":1441556741,"expire":0,"data":"a:4:{i:1;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:2;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:3;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}i:4;a:2:{i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}}}i:2;a:3:{s:8:\"cat_name\";s:4:\"cat2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}}}"},"admin_ids":{"time":1441556743,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"stopwords":{"time":1441567277,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"search_for":{"time":1441567784,"expire":0,"data":"a:1:{i:0;s:47:\"%(?<=[^\\p{L}\\p{N}])(feqszf)(?=[^\\p{L}\\p{N}])%iu\";}"},"replace_with":{"time":1441567784,"expire":0,"data":"a:1:{i:0;s:6:\"zefezf\";}"}}
\ No newline at end of file
diff --git a/cache/cache_parser_data.php b/cache/cache_parser_data.php
deleted file mode 100644
index be63f1cb..00000000
--- a/cache/cache_parser_data.php
+++ /dev/null
@@ -1,1386 +0,0 @@
-<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 09:21:25. DO NOT EDIT!!!
-$pd = array (
-  'newer_php_version' => true,
-  'in_signature' => false,
-  'ipass' => 0,
-  'tag_stack' => 
-  array (
-    0 => '_ROOT_',
-  ),
-  'config' => 
-  array (
-    'textile' => true,
-    'quote_links' => true,
-    'quote_imgs' => false,
-    'valid_imgs' => true,
-    'click_imgs' => true,
-    'max_size' => 100000,
-    'max_width' => 800,
-    'max_height' => 600,
-    'def_width' => 240,
-    'def_height' => 180,
-    'smiley_size' => 100,
-  ),
-  're_smilies' => '/ # re_smilies Rev:20110220_1200
-# Match special smiley character sequences within BBCode content.
-(?<=^|[>\\s])                    # Only if preceeded by ">" or whitespace.
-(?:\\:\\)|\\=\\)|\\:\\||\\=\\||\\:\\(|\\=\\(|\\:D|\\=D|\\:o|\\:O|;\\)|\\:\\/|\\:P|\\:p|\\:lol\\:|\\:mad\\:|\\:rolleyes\\:|\\:cool\\:)
-(?=$|[\\[<\\s])                   # Only if followed by "<", "[" or whitespace.
-                                /Sx',
-  're_color' => '% # re_color Rev:20110220_1200
-# Match a valid CSS color value. #123, #123456, or "red", "blue", etc.
-^                               # Anchor to start of string.
-(                               # $1: Foreground color (required).
-  \\#(?:[0-9A-Fa-f]{3}){1,2}     # Either a "#" and a 3 or 6 digit hex number,
-| (?: maroon|red|orange|yellow| # or a recognized CSS color word.
-      olive|purple|fuchsia|white|
-      lime|green|navy|blue|aqua|
-      teal|black|silver|gray
-  )                             # End group of recognized color words.
-)                               # End $1. Foreground color.
-# Match optional CSS background color value. ;#123, ;#123456, or ;"red", "blue", etc.
-(?:                             # Begin group for optional background color
-  ;?+                           # foreground;background delimiter: e.g. "#123;#456".
-  ((?1))                        # $2: Background color. (Same regex as the first.)
-)?+                             # Background color spec is optional.
-$                               # Anchor to end of string.
-                                %ix',
-  're_textile' => '/ # re_textile Rev:20110220_1200
-# Match textile inline phrase: _em_ *strong* @tt@ ^super^ ~sub~ -del- +ins+
-([+\\-@*_\\^~])                   # $1: literal exposed start of phrase char, but
-(?<=                            # only if preceded by...
-  ^          [+\\-@*_]           # start of string (for _em_ *strong* -del- +ins+ @code)
-| \\s         [+\\-@*_]           # or whitespace   (for _em_ *strong* -del- +ins+ @code)
-| [A-Za-z0-9)}\\]>][\\^~]         # or alphanum or bracket (for ^superscript^ ~subscript~).
-)                               # only if preceded by whitespace or start of string.
-(                               # $2: Textile phrase contents.
-  [A-Za-z0-9({\\[<]              # First char following delim must be alphanum or bracket.
-  [^+\\-@*_\\^~\\n]*+              # "normal*" == Zero or more non-delim, non-newline.
-  (?>                           # Begin unrolling-the-loop. "(special normal*)*"
-    (?!                         # One of two conditions must be true for inside delim:
-      (?:(?<=[A-Za-z0-9)}\\]>][.,;:!?])(?=\\1(?:\\s|$)))
-    | (?:(?<=[A-Za-z0-9)}\\]>])(?=\\1(?:[\\s.,;:!?]|$)))
-    )[+\\-@*_\\^~]                # If so then not yet at phrase end. Match delim and
-    [^+\\-@*_\\^~\\n]*+            # more "normal*" non-delim, non-linefeeds.
-  )*+                           # Continue unrolling. "(special normal*)*"
-)                               # End $2: Textile phrase contents.
-(?>
-  (?:(?<=[A-Za-z0-9)}\\]>][.,;:!?])(?=\\1(?:\\s|$)))
-| (?:(?<=[A-Za-z0-9)}\\]>])(?=\\1(?:[\\s.,;:!?]|$)))
-)
-\\1                              # Match delim end of phrase, but only if
-                                /Smx',
-  're_bbcode' => '% # re_bbcode Rev:20110220_1200
-# First, match opening tag of syntax: "[TAGNAME (= ("\')ATTRIBUTE("\') )]";
-\\[                              # Match opening bracket of outermost opening TAGNAME tag.
-(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err)\\s*+) # $1:
-(?>                             # Atomically group remainder of opening tag.
-  (?:                           # Optional attribute.
-    (=)\\s*+                     # $2: = Optional attribute\'s equals sign delimiter, ws.
-    (?:                         # Group for 1-line attribute value alternatives.
-      \'([^\'\\r\\n\\\\]*+(?:\\\\.[^\'\\r\\n\\\\]*+)*+)\'  # Either $3: == single quoted,
-    | "([^"\\r\\n\\\\]*+(?:\\\\.[^"\\r\\n\\\\]*+)*+)"      # or     $4: == double quoted,
-    | ( [^[\\]\\r\\n]*+            # or $5: == un-or-any-quoted. "normal*" == non-"[]"
-        (?:                     # Begin "(special normal*)*" "Unrolling-the-loop" construct.
-          \\[[^[\\]\\r\\n]*+\\]      # Allow matching [square brackets] 1 level deep. "special".
-            [^[\\]\\r\\n]*+        # More "normal*" any non-"[]", non-newline characters.
-        )*+                     # End "(special normal*)*" "Unrolling-the-loop" construct.
-      )                         # End $5: Un-or-any-quoted attribute value.
-    )                           # End group of attribute values alternatives.
-    \\s*+                        # Optional whitespace following quoted values.
-  )?                            # End optional attribute group.
-  \\]                            # Match closing bracket of outermost opening TAGNAME tag.
-)                               # End atomic group with opening tag remainder.
-# Second, match the contents of the tag.
-(                               # $6: Non-trimmed contents of TAGNAME tag.
-  (?>                           # Atomic group for contents alternatives.
-    [^\\[]++                     # Option 1: Match non-tag chars (starting with non-"[").
-    (?:                         # Begin "(special normal*)*" "Unrolling-the-loop" construct.
-      (?!\\[/?+\\1[\\]=\\s])\\[      # "special" = "[" if not start of [TAGNAME*] or [/TAGNAME].
-      [^\\[]*+                   # More "normal*".
-    )*+                         # Zero or more "special normal*"s allowed for option 1.
-  | (?:                         # or Option 2: Match non-tag chars (starting with "[").
-      (?!\\[/?+\\1[\\]=\\s])\\[      # "special" = "[" if not start of [TAGNAME*] or [/TAGNAME].
-      [^\\[]*+                   # More "normal*".
-    )++                         # One or more "special normal*"s required for option 2.
-  | (?R)                        # Or option 3: recursively match nested [TAGNAME]..[/TAGNAME].
-  )*+                           # One of these three options as many times as necessary.
-)                               # End $6: Non-trimmed contents of TAGNAME tag.
-# Finally, match the closing tag.
-\\[/\\1\\s*+\\]                     # Match outermost closing [/  TAGNAME  ]
-                                %ix',
-  're_bbtag' => '%# re_bbtag Rev:20110220_1200
-# Match open or close BBtag.
-\\[/?+                           # Match opening bracket of outermost opening TAGNAME tag.
-(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err)\\s*+) #$1:
-(?:                             # Optional attribute.
-  (=)\\s*+                       # $2: = Optional attribute\'s equals sign delimiter, ws.
-  (?:                           # Group for 1-line attribute value alternatives.
-    \'([^\'\\r\\n\\\\]*+(?:\\\\.[^\'\\r\\n\\\\]*+)*+)\'  # Either $3: == single quoted,
-  | "([^"\\r\\n\\\\]*+(?:\\\\.[^"\\r\\n\\\\]*+)*+)"      # or     $4: == double quoted,
-  | ( [^[\\]\\r\\n]*+              # or $5: == un-or-any-quoted. "normal*" == non-"[]"
-      (?:                       # Begin "(special normal*)*" "Unrolling-the-loop" construct.
-        \\[[^[\\]\\r\\n]*+\\]        # Allow matching [square brackets] 1 level deep. "special".
-          [^[\\]\\r\\n]*+          # More "normal*" any non-"[]", non-newline characters.
-      )*+                       # End loop construct. See: "Mastering Regular Expressions".
-    )                           # End $5: Un-or-any-quoted attribute value.
-  )                             # End group of attribute values alternatives.
-  \\s*+                          # Optional whitespace following quoted values.
-)?                              # End optional attribute.
-\\]                              # Match closing bracket of outermost opening TAGNAME tag.
-                                %ix',
-  're_fixlist_1' => '%# re_fixlist_1 Rev:20110220_1200
-# Match and repair invalid characters at start of LIST tag (before first [*]).
-^                               # Anchor to start of subject text.
-(                               # $1: Substring with invalid chars to be enclosed.
-  \\s*+                          # Optional whitespace before first invalid char.
-  (?!\\[(?:\\*|/list)\\])          # Assert invalid char(s). (i.e. valid if [*] or [/list]).
-  [^[]*                         # (Normal*) Zero or more non-[.
-  (?:                           # Begin (special normal*)* "Unroll-the-loop- construct.
-    (?!\\[(?:\\*|/list)\\])        # If this [ is not the start of [*] or [/list], then
-    \\[                          # go ahead and match non-[*], non-[/list] left bracket.
-    [^[]*                       # More (normal*).
-  )*                            # End (special normal*)* "unroll-the-loop- construct.
-)                               # End $1: non-whitespace before first [*] (or [/list]).
-(?<!\\s)                         # Backtrack to exclude any trailing whitespace.
-(?=\\s*\\[(?:\\*|/list)\\])         # Done once we reach a [*] or [/list].
-								%ix',
-  're_fixlist_2' => '%# re_fixlist_2 Rev:20110220_1200
-# Match and repair invalid characters between [/*] and next [*] (or [/list]].
-\\[/\\*\\]                         # Match [/*] close tag.
-(                               # $1: Substring with invalid chars to be enclosed.
-  \\s*+                          # Optional whitespace before first invalid char.
-  (?!\\[(?:\\*|/list)\\])          # Assert invalid char(s). (i.e. valid if [*] or [/list]).
-  [^[]*                         # (Normal*) Zero or more non-[.
-  (?:                           # Begin (special normal*)* "Unroll-the-loop- construct.
-    (?!\\[(?:\\*|/list)\\])        # If this [ is not the start of [*] or [/list], then
-    \\[                          # go ahead and match non-[*], non-[/list] left bracket.
-    [^[]*                       # More (normal*).
-  )*                            # End (special normal*)* "unroll-the-loop- construct.
-)                               # End $1: non-whitespace before first [*] (or [/list]).
-(?<!\\s)                         # Backtrack to exclude any trailing whitespace.
-(?=\\s*\\[(?:\\*|/list)\\])         # Done once we reach a [*] or [/list].
-								%ix',
-  'smilies' => 
-  array (
-    ':)' => 
-    array (
-      'file' => 'smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/smile.png" alt="Smile" title="Smile" />',
-    ),
-    '=)' => 
-    array (
-      'file' => 'smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/smile.png" alt="Smile" title="Smile" />',
-    ),
-    ':|' => 
-    array (
-      'file' => 'neutral.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/neutral.png" alt="Neutral" title="Neutral" />',
-    ),
-    '=|' => 
-    array (
-      'file' => 'neutral.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/neutral.png" alt="Neutral" title="Neutral" />',
-    ),
-    ':(' => 
-    array (
-      'file' => 'sad.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/sad.png" alt="Sad" title="Sad" />',
-    ),
-    '=(' => 
-    array (
-      'file' => 'sad.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/sad.png" alt="Sad" title="Sad" />',
-    ),
-    ':D' => 
-    array (
-      'file' => 'big_smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/big_smile.png" alt="Big Smile" title="Big Smile" />',
-    ),
-    '=D' => 
-    array (
-      'file' => 'big_smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/big_smile.png" alt="Big Smile" title="Big Smile" />',
-    ),
-    ':o' => 
-    array (
-      'file' => 'yikes.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/yikes.png" alt="Yikes" title="Yikes" />',
-    ),
-    ':O' => 
-    array (
-      'file' => 'yikes.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/yikes.png" alt="Yikes" title="Yikes" />',
-    ),
-    ';)' => 
-    array (
-      'file' => 'wink.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/wink.png" alt="Wink" title="Wink" />',
-    ),
-    ':/' => 
-    array (
-      'file' => 'hmm.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/hmm.png" alt="Hmm" title="Hmm" />',
-    ),
-    ':P' => 
-    array (
-      'file' => 'tongue.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/tongue.png" alt="Tongue" title="Tongue" />',
-    ),
-    ':p' => 
-    array (
-      'file' => 'tongue.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/tongue.png" alt="Tongue" title="Tongue" />',
-    ),
-    ':lol:' => 
-    array (
-      'file' => 'lol.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/lol.png" alt="Lol" title="Lol" />',
-    ),
-    ':mad:' => 
-    array (
-      'file' => 'mad.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/mad.png" alt="Mad" title="Mad" />',
-    ),
-    ':rolleyes:' => 
-    array (
-      'file' => 'roll.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/roll.png" alt="Roll" title="Roll" />',
-    ),
-    ':cool:' => 
-    array (
-      'file' => 'cool.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/cool.png" alt="Cool" title="Cool" />',
-    ),
-  ),
-  'bbcd' => 
-  array (
-    'b' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<strong>
%c_str%
</strong>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'code' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><div class="codebox"><h4>Code: "%a_str%"</h4><pre>%c_str%</pre></div><p>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div class="codebox"><pre>%c_str%</pre></div><p>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'hidden',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'color' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'color',
-          'c_type' => 'text',
-          'format' => '
<span style="color: %a_str%;">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'colour' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'color',
-          'c_type' => 'text',
-          'format' => '
<span style="color: %a_str%;">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'del' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<del>
%c_str%
</del>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'email' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'email',
-          'c_type' => 'text',
-          'format' => '
<a href="mailto:%a_str%" rel="nofollow">
%c_str%
</a>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'email',
-          'format' => '
<a href="mailto:%c_str%" rel="nofollow">
%c_str%
</a>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'email' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'url' => true,
-      ),
-    ),
-    'em' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<em>
%c_str%
</em>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'h' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><h5>
%c_str%
</h5><p>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'img' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'width_height',
-          'c_type' => 'url',
-          'format' => '
<img src="%c_str%" alt="%a_str%" title="%a_str%" width="%w_str%" height="%h_str%" />
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'url',
-          'format' => '
<img src="%c_str%" alt="%c_str%" />
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'atomic',
-      'tags_excluded' => 
-      array (
-        'b' => true,
-        'code' => true,
-        'color' => true,
-        'colour' => true,
-        'del' => true,
-        'email' => true,
-        'em' => true,
-        'h' => true,
-        'ins' => true,
-        'i' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'sub' => true,
-        'sup' => true,
-        's' => true,
-        'tt' => true,
-        'url' => true,
-        'u' => true,
-        'center' => true,
-        'right' => true,
-        'left' => true,
-        'justify' => true,
-        'youtube' => true,
-        'large' => true,
-        'small' => true,
-        'err' => true,
-      ),
-    ),
-    'ins' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<ins>
%c_str%
</ins>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'i' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<em>
%c_str%
</em>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'table' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><table>
%c_str%
</table><p>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'b' => true,
-        'code' => true,
-        'color' => true,
-        'colour' => true,
-        'del' => true,
-        'email' => true,
-        'em' => true,
-        'h' => true,
-        'img' => true,
-        'ins' => true,
-        'i' => true,
-        'table' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'sub' => true,
-        'sup' => true,
-        's' => true,
-        'tt' => true,
-        'url' => true,
-        'u' => true,
-        'center' => true,
-        'right' => true,
-        'left' => true,
-        'justify' => true,
-        'youtube' => true,
-        'large' => true,
-        'small' => true,
-      ),
-      'tags_only' => true,
-    ),
-    'tr' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<tr>
%c_str%
</tr>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'parents' => 
-      array (
-        'table' => true,
-      ),
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'b' => true,
-        'code' => true,
-        'color' => true,
-        'colour' => true,
-        'del' => true,
-        'email' => true,
-        'em' => true,
-        'h' => true,
-        'img' => true,
-        'ins' => true,
-        'i' => true,
-        'table' => true,
-        'tr' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'sub' => true,
-        'sup' => true,
-        's' => true,
-        'tt' => true,
-        'url' => true,
-        'u' => true,
-        'center' => true,
-        'right' => true,
-        'left' => true,
-        'justify' => true,
-        'youtube' => true,
-        'large' => true,
-        'small' => true,
-      ),
-      'tags_only' => true,
-    ),
-    'th' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<th><p>
%c_str%
</p></th>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'parents' => 
-      array (
-        'tr' => true,
-      ),
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'td' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<td><p>
%c_str%
</p></td>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'parents' => 
-      array (
-        'tr' => true,
-      ),
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'list' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        1 => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><ol class="decimal">
%c_str%
</ol><p>
',
-        ),
-        'a' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><ol class="alpha">
%c_str%
</ol><p>
',
-        ),
-        '*' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><ul>
%c_str%
</ul><p>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><ul>
%c_str%
</ul><p>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'b' => true,
-        'code' => true,
-        'color' => true,
-        'colour' => true,
-        'del' => true,
-        'email' => true,
-        'em' => true,
-        'h' => true,
-        'img' => true,
-        'ins' => true,
-        'i' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'quote' => true,
-        'sub' => true,
-        'sup' => true,
-        's' => true,
-        'tt' => true,
-        'url' => true,
-        'u' => true,
-        'center' => true,
-        'right' => true,
-        'left' => true,
-        'justify' => true,
-        'youtube' => true,
-        'large' => true,
-        'small' => true,
-        'err' => true,
-      ),
-      'tags_only' => true,
-    ),
-    '*' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<li><p>
%c_str%
</p></li>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'parents' => 
-      array (
-        'list' => true,
-      ),
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'quote' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><div class="quotebox"><cite>%a_str%</cite><blockquote><div><p>
%c_str%
</p></div></blockquote></div><p>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div class="quotebox"><blockquote><div><p>
%c_str%
</p></div></blockquote></div><p>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'clip',
-      'tag_type' => 'zombie',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'sub' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<sub>
%c_str%
</sub>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'sup' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<sup>
%c_str%
</sup>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    's' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<span class="bbs">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'tt' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<tt>%c_str%</tt>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'hidden',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'url' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'url',
-          'c_type' => 'text',
-          'format' => '
<a href="%a_str%" rel="nofollow">
%c_str%
</a>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'url',
-          'format' => '
<a href="%c_str%" rel="nofollow">%c_str%</a>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'email' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'url' => true,
-      ),
-    ),
-    'u' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<span class="bbu">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'center' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div align="center"><p>
%c_str%
</p></div><p>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'right' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div align="right"><p>
%c_str%
</p></div><p>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'left' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div align="left"><p>
%c_str%
</p></div><p>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'justify' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div align="justify"><p>
%c_str%
</p></div><p>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'youtube' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'width_height',
-          'c_regex' => '%(?:^|\\bv[=/])(\\w{10,12})\\b%S',
-          'c_type' => 'text',
-          'format' => '
<object type="application/x-shockwave-flash" width="%w_str%" height="%h_str%" data="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1&amp;rel=0"><param name="movie" value="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1" /><param name="allowFullScreen" value="true" /></object>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'width_height',
-          'c_regex' => '%(?:^|\\bv[=/])(\\w{10,12})\\b%S',
-          'c_type' => 'width_height',
-          'format' => '
<object type="application/x-shockwave-flash" width="%w_str%" height="%h_str%" data="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1&amp;rel=0"><param name="movie" value="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1" /><param name="allowFullScreen" value="true" /></object>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => false,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'b' => true,
-        'code' => true,
-        'color' => true,
-        'colour' => true,
-        'del' => true,
-        'email' => true,
-        'em' => true,
-        'h' => true,
-        'img' => true,
-        'ins' => true,
-        'i' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'sub' => true,
-        'sup' => true,
-        's' => true,
-        'tt' => true,
-        'url' => true,
-        'u' => true,
-        'center' => true,
-        'right' => true,
-        'left' => true,
-        'justify' => true,
-        'youtube' => true,
-        'large' => true,
-        'small' => true,
-        'err' => true,
-      ),
-      'x_padding' => 20,
-      'y_padding' => 45,
-    ),
-    'large' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<span style="font-size: larger;">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'small' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<span style="font-size: smaller;">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'err' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
<span class="err" title="%a_str%">%c_str%</span>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<span class="err">%c_str%</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'hidden',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    '_ROOT_' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
<span class="err" title="_ROOT_">%c_str%</span>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => false,
-      'in_sig' => false,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-  ),
-);
-?>
\ No newline at end of file

From e5d3984c6707a8b69eab158609fbc9b5c57ca723 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Sun, 6 Sep 2015 23:25:13 +0200
Subject: [PATCH 334/353] Fix conflicts

---
 featherbb/Controller/Auth.php                       | 10 +---------
 style/themes/FeatherBB/view/misc/report.php         |  4 ----
 style/themes/FeatherBB/view/moderate/posts_view.php |  4 ----
 style/themes/FeatherBB/view/search/posts.php        |  4 ----
 style/themes/FeatherBB/view/search/topics.php       |  4 ----
 5 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
index d87ee971..2edd5655 100644
--- a/featherbb/Controller/Auth.php
+++ b/featherbb/Controller/Auth.php
@@ -60,11 +60,7 @@ public function login()
                     Url::redirect($this->feather->urlFor('home'), __('Login redirect'));
                 }
             }
-<<<<<<< HEAD
-            throw new \FeatherBB\Core\Error(__('Wrong user/pass').' <a href="'.$this->feather->urlFor('resetPassword').'">'.__('Forgotten pass').'</a>', 403);
-=======
-            throw new Error(__('Wrong user/pass').' <a href="'.Url::get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
->>>>>>> development
+            throw new Error(__('Wrong user/pass').' <a href="'.$this->feather->urlFor('resetPassword').'">'.__('Forgotten pass').'</a>', 403);
         } else {
             $this->feather->template->setPageInfo(array(
                                 'active_page' => 'login',
@@ -80,11 +76,7 @@ public function logout($token)
     {
         $token = $this->feather->hooks->fire('logout_start', $token);
 
-<<<<<<< HEAD
-        if ($this->feather->user->is_guest || !isset($token) || $token != Utils::hash($this->feather->user->id.Utils::hash($this->feather->request->getIp()))) {
-=======
         if ($this->feather->user->is_guest || !isset($token) || $token != Random::hash($this->feather->user->id.Random::hash($this->feather->request->getIp()))) {
->>>>>>> development
             Url::redirect($this->feather->urlFor('home'), 'Not logged in');
         }
 
diff --git a/style/themes/FeatherBB/view/misc/report.php b/style/themes/FeatherBB/view/misc/report.php
index 746c896c..491c686e 100644
--- a/style/themes/FeatherBB/view/misc/report.php
+++ b/style/themes/FeatherBB/view/misc/report.php
@@ -7,10 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-<<<<<<< HEAD
-use FeatherBB\Core\Utils;
-=======
->>>>>>> development
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Utils;
 
diff --git a/style/themes/FeatherBB/view/moderate/posts_view.php b/style/themes/FeatherBB/view/moderate/posts_view.php
index 1f81414e..34a82221 100644
--- a/style/themes/FeatherBB/view/moderate/posts_view.php
+++ b/style/themes/FeatherBB/view/moderate/posts_view.php
@@ -7,10 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-<<<<<<< HEAD
-use FeatherBB\Core\Utils;
-=======
->>>>>>> development
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Utils;
 
diff --git a/style/themes/FeatherBB/view/search/posts.php b/style/themes/FeatherBB/view/search/posts.php
index 208c628c..e116bff0 100644
--- a/style/themes/FeatherBB/view/search/posts.php
+++ b/style/themes/FeatherBB/view/search/posts.php
@@ -7,10 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-<<<<<<< HEAD
-use FeatherBB\Core\Utils;
-=======
->>>>>>> development
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Utils;
 
diff --git a/style/themes/FeatherBB/view/search/topics.php b/style/themes/FeatherBB/view/search/topics.php
index 0f5f6ec7..5489a0a8 100644
--- a/style/themes/FeatherBB/view/search/topics.php
+++ b/style/themes/FeatherBB/view/search/topics.php
@@ -7,10 +7,6 @@
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
 
-<<<<<<< HEAD
-use FeatherBB\Core\Utils;
-=======
->>>>>>> development
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Utils;
 

From 1d18e2495181507012a9c28194fd6e8b007c9d05 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 7 Sep 2015 01:56:16 +0200
Subject: [PATCH 335/353] New routes and more urlFor

---
 ...5bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache |    1 -
 cache/cache_parser_data.php                   | 1386 -----------------
 featherbb/Controller/Forum.php                |    6 +-
 featherbb/Controller/Topic.php                |    6 +-
 featherbb/Model/Forum.php                     |    8 +-
 featherbb/Model/Index.php                     |   13 +-
 featherbb/Model/Login.php                     |    4 +-
 featherbb/Model/Misc.php                      |    2 +-
 featherbb/Model/Moderate.php                  |   14 +-
 featherbb/Model/Post.php                      |   12 +-
 featherbb/Model/Profile.php                   |   24 +-
 featherbb/Model/Register.php                  |   14 +-
 featherbb/routes.php                          |    7 +-
 13 files changed, 57 insertions(+), 1440 deletions(-)
 delete mode 100644 cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
 delete mode 100644 cache/cache_parser_data.php

diff --git a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache b/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
deleted file mode 100644
index 024eaa12..00000000
--- a/cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache
+++ /dev/null
@@ -1 +0,0 @@
-{"config":{"time":1440702596,"expire":0,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:43:\"<p><span>Lighter than a feather.<\/span><\/p>\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:13:\"test@test.com\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:11:\"img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:29:\"http:\/\/192.168.0.14\/featherbb\";s:13:\"o_admin_email\";s:13:\"test@test.com\";s:17:\"o_webmaster_email\";s:13:\"test@test.com\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"1\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"bans":{"time":1440691168,"expire":0,"data":"a:1:{i:0;a:7:{s:2:\"id\";s:1:\"1\";s:8:\"username\";s:8:\"pr\u00e9fixe\";s:2:\"ip\";N;s:5:\"email\";N;s:7:\"message\";N;s:6:\"expire\";N;s:11:\"ban_creator\";s:1:\"2\";}}"},"users_info":{"time":1440602184,"expire":0,"data":"a:2:{s:11:\"total_users\";i:3;s:9:\"last_user\";a:2:{s:2:\"id\";s:1:\"4\";s:8:\"username\";s:8:\"pr\u00e9fixe\";}}"},"quickjump":{"time":1441544494,"expire":0,"data":"a:4:{i:1;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:2;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:3;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}i:4;a:3:{i:2;a:3:{s:8:\"cat_name\";s:5:\"Caca4\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:1:{i:0;a:3:{s:8:\"forum_id\";s:1:\"6\";s:10:\"forum_name\";s:4:\"osef\";s:8:\"position\";N;}}}i:3;a:3:{s:8:\"cat_name\";s:5:\"Caca2\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:2:{i:0;a:3:{s:8:\"forum_id\";s:1:\"3\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"2\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}}}i:1;a:3:{s:8:\"cat_name\";s:13:\"Test category\";s:12:\"cat_position\";N;s:10:\"cat_forums\";a:3:{i:0;a:3:{s:8:\"forum_id\";s:1:\"1\";s:10:\"forum_name\";s:10:\"Test forum\";s:8:\"position\";N;}i:1;a:3:{s:8:\"forum_id\";s:1:\"4\";s:10:\"forum_name\";s:9:\"New forum\";s:8:\"position\";N;}i:2;a:3:{s:8:\"forum_id\";s:1:\"5\";s:10:\"forum_name\";s:11:\"New forum 2\";s:8:\"position\";N;}}}}}"},"stopwords":{"time":1441562641,"expire":1,"data":"a:77:{s:13:\"o_cur_version\";s:5:\"1.0.0\";s:19:\"o_database_revision\";s:2:\"21\";s:22:\"o_searchindex_revision\";s:1:\"2\";s:17:\"o_parser_revision\";s:1:\"2\";s:13:\"o_board_title\";s:18:\"My FeatherBB Forum\";s:12:\"o_board_desc\";s:23:\"Lighter than a feather.\";s:18:\"o_default_timezone\";s:1:\"0\";s:13:\"o_time_format\";s:5:\"H:i:s\";s:13:\"o_date_format\";s:5:\"Y-m-d\";s:15:\"o_timeout_visit\";s:4:\"1800\";s:16:\"o_timeout_online\";s:3:\"300\";s:16:\"o_redirect_delay\";s:1:\"1\";s:14:\"o_show_version\";s:1:\"0\";s:16:\"o_show_user_info\";s:1:\"1\";s:17:\"o_show_post_count\";s:1:\"1\";s:12:\"o_signatures\";s:1:\"1\";s:9:\"o_smilies\";s:1:\"1\";s:13:\"o_smilies_sig\";s:1:\"1\";s:12:\"o_make_links\";s:1:\"1\";s:14:\"o_default_lang\";s:7:\"English\";s:15:\"o_default_style\";s:9:\"FeatherBB\";s:20:\"o_default_user_group\";s:1:\"4\";s:14:\"o_topic_review\";s:2:\"15\";s:21:\"o_disp_topics_default\";s:2:\"30\";s:20:\"o_disp_posts_default\";s:2:\"25\";s:19:\"o_indent_num_spaces\";s:1:\"4\";s:13:\"o_quote_depth\";s:1:\"3\";s:11:\"o_quickpost\";s:1:\"1\";s:14:\"o_users_online\";s:1:\"1\";s:11:\"o_censoring\";s:1:\"0\";s:10:\"o_show_dot\";s:1:\"0\";s:13:\"o_topic_views\";s:1:\"1\";s:11:\"o_quickjump\";s:1:\"1\";s:6:\"o_gzip\";s:1:\"0\";s:21:\"o_additional_navlinks\";s:0:\"\";s:15:\"o_report_method\";s:1:\"0\";s:13:\"o_regs_report\";s:1:\"0\";s:23:\"o_default_email_setting\";s:1:\"1\";s:14:\"o_mailing_list\";s:11:\"deuh@oij.gt\";s:9:\"o_avatars\";s:1:\"1\";s:13:\"o_avatars_dir\";s:17:\"style\/img\/avatars\";s:15:\"o_avatars_width\";s:2:\"60\";s:16:\"o_avatars_height\";s:2:\"60\";s:14:\"o_avatars_size\";s:5:\"10240\";s:19:\"o_search_all_forums\";s:1:\"1\";s:10:\"o_base_url\";s:26:\"http:\/\/localhost\/featherbb\";s:13:\"o_admin_email\";s:11:\"deuh@oij.gt\";s:17:\"o_webmaster_email\";s:11:\"deuh@oij.gt\";s:21:\"o_forum_subscriptions\";s:1:\"1\";s:21:\"o_topic_subscriptions\";s:1:\"1\";s:11:\"o_smtp_host\";N;s:11:\"o_smtp_user\";N;s:11:\"o_smtp_pass\";N;s:10:\"o_smtp_ssl\";s:1:\"0\";s:12:\"o_regs_allow\";s:1:\"1\";s:13:\"o_regs_verify\";s:1:\"0\";s:14:\"o_announcement\";s:1:\"0\";s:22:\"o_announcement_message\";s:29:\"Enter your announcement here.\";s:7:\"o_rules\";s:1:\"0\";s:15:\"o_rules_message\";s:21:\"Enter your rules here\";s:13:\"o_maintenance\";s:1:\"0\";s:21:\"o_maintenance_message\";s:83:\"The forums are temporarily down for maintenance. Please try again in a few minutes.\";s:13:\"o_default_dst\";s:1:\"0\";s:11:\"o_feed_type\";s:1:\"2\";s:10:\"o_feed_ttl\";s:1:\"0\";s:16:\"p_message_bbcode\";s:1:\"1\";s:17:\"p_message_img_tag\";s:1:\"0\";s:18:\"p_message_all_caps\";s:1:\"1\";s:18:\"p_subject_all_caps\";s:1:\"1\";s:14:\"p_sig_all_caps\";s:1:\"1\";s:12:\"p_sig_bbcode\";s:1:\"1\";s:13:\"p_sig_img_tag\";s:1:\"0\";s:12:\"p_sig_length\";s:3:\"400\";s:11:\"p_sig_lines\";s:1:\"4\";s:20:\"p_allow_banned_email\";s:1:\"1\";s:18:\"p_allow_dupe_email\";s:1:\"0\";s:19:\"p_force_guest_email\";s:1:\"1\";}"},"admin_ids":{"time":1440622239,"expire":0,"data":"a:1:{i:0;a:1:{s:2:\"id\";s:1:\"2\";}}"},"active_plugins":{"time":1441510035,"expire":0,"data":"a:3:{s:4:\"Test\";b:1;s:5:\"Test2\";b:1;s:13:\"\\Plugins\\Test\";b:1;}"}}
\ No newline at end of file
diff --git a/cache/cache_parser_data.php b/cache/cache_parser_data.php
deleted file mode 100644
index 906def9a..00000000
--- a/cache/cache_parser_data.php
+++ /dev/null
@@ -1,1386 +0,0 @@
-<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 08:04:01. DO NOT EDIT!!!
-$pd = array (
-  'newer_php_version' => true,
-  'in_signature' => false,
-  'ipass' => 0,
-  'tag_stack' => 
-  array (
-    0 => '_ROOT_',
-  ),
-  'config' => 
-  array (
-    'textile' => true,
-    'quote_links' => true,
-    'quote_imgs' => false,
-    'valid_imgs' => true,
-    'click_imgs' => true,
-    'max_size' => 100000,
-    'max_width' => 800,
-    'max_height' => 600,
-    'def_width' => 240,
-    'def_height' => 180,
-    'smiley_size' => 100,
-  ),
-  're_smilies' => '/ # re_smilies Rev:20110220_1200
-# Match special smiley character sequences within BBCode content.
-(?<=^|[>\\s])                    # Only if preceeded by ">" or whitespace.
-(?:\\:\\)|\\=\\)|\\:\\||\\=\\||\\:\\(|\\=\\(|\\:D|\\=D|\\:o|\\:O|;\\)|\\:\\/|\\:P|\\:p|\\:lol\\:|\\:mad\\:|\\:rolleyes\\:|\\:cool\\:)
-(?=$|[\\[<\\s])                   # Only if followed by "<", "[" or whitespace.
-                                /Sx',
-  're_color' => '% # re_color Rev:20110220_1200
-# Match a valid CSS color value. #123, #123456, or "red", "blue", etc.
-^                               # Anchor to start of string.
-(                               # $1: Foreground color (required).
-  \\#(?:[0-9A-Fa-f]{3}){1,2}     # Either a "#" and a 3 or 6 digit hex number,
-| (?: maroon|red|orange|yellow| # or a recognized CSS color word.
-      olive|purple|fuchsia|white|
-      lime|green|navy|blue|aqua|
-      teal|black|silver|gray
-  )                             # End group of recognized color words.
-)                               # End $1. Foreground color.
-# Match optional CSS background color value. ;#123, ;#123456, or ;"red", "blue", etc.
-(?:                             # Begin group for optional background color
-  ;?+                           # foreground;background delimiter: e.g. "#123;#456".
-  ((?1))                        # $2: Background color. (Same regex as the first.)
-)?+                             # Background color spec is optional.
-$                               # Anchor to end of string.
-                                %ix',
-  're_textile' => '/ # re_textile Rev:20110220_1200
-# Match textile inline phrase: _em_ *strong* @tt@ ^super^ ~sub~ -del- +ins+
-([+\\-@*_\\^~])                   # $1: literal exposed start of phrase char, but
-(?<=                            # only if preceded by...
-  ^          [+\\-@*_]           # start of string (for _em_ *strong* -del- +ins+ @code)
-| \\s         [+\\-@*_]           # or whitespace   (for _em_ *strong* -del- +ins+ @code)
-| [A-Za-z0-9)}\\]>][\\^~]         # or alphanum or bracket (for ^superscript^ ~subscript~).
-)                               # only if preceded by whitespace or start of string.
-(                               # $2: Textile phrase contents.
-  [A-Za-z0-9({\\[<]              # First char following delim must be alphanum or bracket.
-  [^+\\-@*_\\^~\\n]*+              # "normal*" == Zero or more non-delim, non-newline.
-  (?>                           # Begin unrolling-the-loop. "(special normal*)*"
-    (?!                         # One of two conditions must be true for inside delim:
-      (?:(?<=[A-Za-z0-9)}\\]>][.,;:!?])(?=\\1(?:\\s|$)))
-    | (?:(?<=[A-Za-z0-9)}\\]>])(?=\\1(?:[\\s.,;:!?]|$)))
-    )[+\\-@*_\\^~]                # If so then not yet at phrase end. Match delim and
-    [^+\\-@*_\\^~\\n]*+            # more "normal*" non-delim, non-linefeeds.
-  )*+                           # Continue unrolling. "(special normal*)*"
-)                               # End $2: Textile phrase contents.
-(?>
-  (?:(?<=[A-Za-z0-9)}\\]>][.,;:!?])(?=\\1(?:\\s|$)))
-| (?:(?<=[A-Za-z0-9)}\\]>])(?=\\1(?:[\\s.,;:!?]|$)))
-)
-\\1                              # Match delim end of phrase, but only if
-                                /Smx',
-  're_bbcode' => '% # re_bbcode Rev:20110220_1200
-# First, match opening tag of syntax: "[TAGNAME (= ("\')ATTRIBUTE("\') )]";
-\\[                              # Match opening bracket of outermost opening TAGNAME tag.
-(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err)\\s*+) # $1:
-(?>                             # Atomically group remainder of opening tag.
-  (?:                           # Optional attribute.
-    (=)\\s*+                     # $2: = Optional attribute\'s equals sign delimiter, ws.
-    (?:                         # Group for 1-line attribute value alternatives.
-      \'([^\'\\r\\n\\\\]*+(?:\\\\.[^\'\\r\\n\\\\]*+)*+)\'  # Either $3: == single quoted,
-    | "([^"\\r\\n\\\\]*+(?:\\\\.[^"\\r\\n\\\\]*+)*+)"      # or     $4: == double quoted,
-    | ( [^[\\]\\r\\n]*+            # or $5: == un-or-any-quoted. "normal*" == non-"[]"
-        (?:                     # Begin "(special normal*)*" "Unrolling-the-loop" construct.
-          \\[[^[\\]\\r\\n]*+\\]      # Allow matching [square brackets] 1 level deep. "special".
-            [^[\\]\\r\\n]*+        # More "normal*" any non-"[]", non-newline characters.
-        )*+                     # End "(special normal*)*" "Unrolling-the-loop" construct.
-      )                         # End $5: Un-or-any-quoted attribute value.
-    )                           # End group of attribute values alternatives.
-    \\s*+                        # Optional whitespace following quoted values.
-  )?                            # End optional attribute group.
-  \\]                            # Match closing bracket of outermost opening TAGNAME tag.
-)                               # End atomic group with opening tag remainder.
-# Second, match the contents of the tag.
-(                               # $6: Non-trimmed contents of TAGNAME tag.
-  (?>                           # Atomic group for contents alternatives.
-    [^\\[]++                     # Option 1: Match non-tag chars (starting with non-"[").
-    (?:                         # Begin "(special normal*)*" "Unrolling-the-loop" construct.
-      (?!\\[/?+\\1[\\]=\\s])\\[      # "special" = "[" if not start of [TAGNAME*] or [/TAGNAME].
-      [^\\[]*+                   # More "normal*".
-    )*+                         # Zero or more "special normal*"s allowed for option 1.
-  | (?:                         # or Option 2: Match non-tag chars (starting with "[").
-      (?!\\[/?+\\1[\\]=\\s])\\[      # "special" = "[" if not start of [TAGNAME*] or [/TAGNAME].
-      [^\\[]*+                   # More "normal*".
-    )++                         # One or more "special normal*"s required for option 2.
-  | (?R)                        # Or option 3: recursively match nested [TAGNAME]..[/TAGNAME].
-  )*+                           # One of these three options as many times as necessary.
-)                               # End $6: Non-trimmed contents of TAGNAME tag.
-# Finally, match the closing tag.
-\\[/\\1\\s*+\\]                     # Match outermost closing [/  TAGNAME  ]
-                                %ix',
-  're_bbtag' => '%# re_bbtag Rev:20110220_1200
-# Match open or close BBtag.
-\\[/?+                           # Match opening bracket of outermost opening TAGNAME tag.
-(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err)\\s*+) #$1:
-(?:                             # Optional attribute.
-  (=)\\s*+                       # $2: = Optional attribute\'s equals sign delimiter, ws.
-  (?:                           # Group for 1-line attribute value alternatives.
-    \'([^\'\\r\\n\\\\]*+(?:\\\\.[^\'\\r\\n\\\\]*+)*+)\'  # Either $3: == single quoted,
-  | "([^"\\r\\n\\\\]*+(?:\\\\.[^"\\r\\n\\\\]*+)*+)"      # or     $4: == double quoted,
-  | ( [^[\\]\\r\\n]*+              # or $5: == un-or-any-quoted. "normal*" == non-"[]"
-      (?:                       # Begin "(special normal*)*" "Unrolling-the-loop" construct.
-        \\[[^[\\]\\r\\n]*+\\]        # Allow matching [square brackets] 1 level deep. "special".
-          [^[\\]\\r\\n]*+          # More "normal*" any non-"[]", non-newline characters.
-      )*+                       # End loop construct. See: "Mastering Regular Expressions".
-    )                           # End $5: Un-or-any-quoted attribute value.
-  )                             # End group of attribute values alternatives.
-  \\s*+                          # Optional whitespace following quoted values.
-)?                              # End optional attribute.
-\\]                              # Match closing bracket of outermost opening TAGNAME tag.
-                                %ix',
-  're_fixlist_1' => '%# re_fixlist_1 Rev:20110220_1200
-# Match and repair invalid characters at start of LIST tag (before first [*]).
-^                               # Anchor to start of subject text.
-(                               # $1: Substring with invalid chars to be enclosed.
-  \\s*+                          # Optional whitespace before first invalid char.
-  (?!\\[(?:\\*|/list)\\])          # Assert invalid char(s). (i.e. valid if [*] or [/list]).
-  [^[]*                         # (Normal*) Zero or more non-[.
-  (?:                           # Begin (special normal*)* "Unroll-the-loop- construct.
-    (?!\\[(?:\\*|/list)\\])        # If this [ is not the start of [*] or [/list], then
-    \\[                          # go ahead and match non-[*], non-[/list] left bracket.
-    [^[]*                       # More (normal*).
-  )*                            # End (special normal*)* "unroll-the-loop- construct.
-)                               # End $1: non-whitespace before first [*] (or [/list]).
-(?<!\\s)                         # Backtrack to exclude any trailing whitespace.
-(?=\\s*\\[(?:\\*|/list)\\])         # Done once we reach a [*] or [/list].
-								%ix',
-  're_fixlist_2' => '%# re_fixlist_2 Rev:20110220_1200
-# Match and repair invalid characters between [/*] and next [*] (or [/list]].
-\\[/\\*\\]                         # Match [/*] close tag.
-(                               # $1: Substring with invalid chars to be enclosed.
-  \\s*+                          # Optional whitespace before first invalid char.
-  (?!\\[(?:\\*|/list)\\])          # Assert invalid char(s). (i.e. valid if [*] or [/list]).
-  [^[]*                         # (Normal*) Zero or more non-[.
-  (?:                           # Begin (special normal*)* "Unroll-the-loop- construct.
-    (?!\\[(?:\\*|/list)\\])        # If this [ is not the start of [*] or [/list], then
-    \\[                          # go ahead and match non-[*], non-[/list] left bracket.
-    [^[]*                       # More (normal*).
-  )*                            # End (special normal*)* "unroll-the-loop- construct.
-)                               # End $1: non-whitespace before first [*] (or [/list]).
-(?<!\\s)                         # Backtrack to exclude any trailing whitespace.
-(?=\\s*\\[(?:\\*|/list)\\])         # Done once we reach a [*] or [/list].
-								%ix',
-  'smilies' => 
-  array (
-    ':)' => 
-    array (
-      'file' => 'smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/smile.png" alt="Smile" title="Smile" />',
-    ),
-    '=)' => 
-    array (
-      'file' => 'smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/smile.png" alt="Smile" title="Smile" />',
-    ),
-    ':|' => 
-    array (
-      'file' => 'neutral.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/neutral.png" alt="Neutral" title="Neutral" />',
-    ),
-    '=|' => 
-    array (
-      'file' => 'neutral.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/neutral.png" alt="Neutral" title="Neutral" />',
-    ),
-    ':(' => 
-    array (
-      'file' => 'sad.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/sad.png" alt="Sad" title="Sad" />',
-    ),
-    '=(' => 
-    array (
-      'file' => 'sad.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/sad.png" alt="Sad" title="Sad" />',
-    ),
-    ':D' => 
-    array (
-      'file' => 'big_smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/big_smile.png" alt="Big Smile" title="Big Smile" />',
-    ),
-    '=D' => 
-    array (
-      'file' => 'big_smile.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/big_smile.png" alt="Big Smile" title="Big Smile" />',
-    ),
-    ':o' => 
-    array (
-      'file' => 'yikes.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/yikes.png" alt="Yikes" title="Yikes" />',
-    ),
-    ':O' => 
-    array (
-      'file' => 'yikes.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/yikes.png" alt="Yikes" title="Yikes" />',
-    ),
-    ';)' => 
-    array (
-      'file' => 'wink.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/wink.png" alt="Wink" title="Wink" />',
-    ),
-    ':/' => 
-    array (
-      'file' => 'hmm.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/hmm.png" alt="Hmm" title="Hmm" />',
-    ),
-    ':P' => 
-    array (
-      'file' => 'tongue.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/tongue.png" alt="Tongue" title="Tongue" />',
-    ),
-    ':p' => 
-    array (
-      'file' => 'tongue.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/tongue.png" alt="Tongue" title="Tongue" />',
-    ),
-    ':lol:' => 
-    array (
-      'file' => 'lol.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/lol.png" alt="Lol" title="Lol" />',
-    ),
-    ':mad:' => 
-    array (
-      'file' => 'mad.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/mad.png" alt="Mad" title="Mad" />',
-    ),
-    ':rolleyes:' => 
-    array (
-      'file' => 'roll.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/roll.png" alt="Roll" title="Roll" />',
-    ),
-    ':cool:' => 
-    array (
-      'file' => 'cool.png',
-      'html' => '<img width="15" height="15" src="/featherbb/style/img/smilies/cool.png" alt="Cool" title="Cool" />',
-    ),
-  ),
-  'bbcd' => 
-  array (
-    'b' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<strong>
%c_str%
</strong>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'code' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><div class="codebox"><h4>Code: "%a_str%"</h4><pre>%c_str%</pre></div><p>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div class="codebox"><pre>%c_str%</pre></div><p>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'hidden',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'color' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'color',
-          'c_type' => 'text',
-          'format' => '
<span style="color: %a_str%;">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'colour' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'color',
-          'c_type' => 'text',
-          'format' => '
<span style="color: %a_str%;">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'del' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<del>
%c_str%
</del>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'email' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'email',
-          'c_type' => 'text',
-          'format' => '
<a href="mailto:%a_str%" rel="nofollow">
%c_str%
</a>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'email',
-          'format' => '
<a href="mailto:%c_str%" rel="nofollow">
%c_str%
</a>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'email' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'url' => true,
-      ),
-    ),
-    'em' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<em>
%c_str%
</em>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'h' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><h5>
%c_str%
</h5><p>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'img' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'width_height',
-          'c_type' => 'url',
-          'format' => '
<img src="%c_str%" alt="%a_str%" title="%a_str%" width="%w_str%" height="%h_str%" />
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'url',
-          'format' => '
<img src="%c_str%" alt="%c_str%" />
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'atomic',
-      'tags_excluded' => 
-      array (
-        'b' => true,
-        'code' => true,
-        'color' => true,
-        'colour' => true,
-        'del' => true,
-        'email' => true,
-        'em' => true,
-        'h' => true,
-        'ins' => true,
-        'i' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'sub' => true,
-        'sup' => true,
-        's' => true,
-        'tt' => true,
-        'url' => true,
-        'u' => true,
-        'center' => true,
-        'right' => true,
-        'left' => true,
-        'justify' => true,
-        'youtube' => true,
-        'large' => true,
-        'small' => true,
-        'err' => true,
-      ),
-    ),
-    'ins' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<ins>
%c_str%
</ins>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'i' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<em>
%c_str%
</em>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'table' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><table>
%c_str%
</table><p>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'b' => true,
-        'code' => true,
-        'color' => true,
-        'colour' => true,
-        'del' => true,
-        'email' => true,
-        'em' => true,
-        'h' => true,
-        'img' => true,
-        'ins' => true,
-        'i' => true,
-        'table' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'sub' => true,
-        'sup' => true,
-        's' => true,
-        'tt' => true,
-        'url' => true,
-        'u' => true,
-        'center' => true,
-        'right' => true,
-        'left' => true,
-        'justify' => true,
-        'youtube' => true,
-        'large' => true,
-        'small' => true,
-      ),
-      'tags_only' => true,
-    ),
-    'tr' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<tr>
%c_str%
</tr>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'parents' => 
-      array (
-        'table' => true,
-      ),
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'b' => true,
-        'code' => true,
-        'color' => true,
-        'colour' => true,
-        'del' => true,
-        'email' => true,
-        'em' => true,
-        'h' => true,
-        'img' => true,
-        'ins' => true,
-        'i' => true,
-        'table' => true,
-        'tr' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'sub' => true,
-        'sup' => true,
-        's' => true,
-        'tt' => true,
-        'url' => true,
-        'u' => true,
-        'center' => true,
-        'right' => true,
-        'left' => true,
-        'justify' => true,
-        'youtube' => true,
-        'large' => true,
-        'small' => true,
-      ),
-      'tags_only' => true,
-    ),
-    'th' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<th><p>
%c_str%
</p></th>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'parents' => 
-      array (
-        'tr' => true,
-      ),
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'td' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<td><p>
%c_str%
</p></td>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'parents' => 
-      array (
-        'tr' => true,
-      ),
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'list' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        1 => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><ol class="decimal">
%c_str%
</ol><p>
',
-        ),
-        'a' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><ol class="alpha">
%c_str%
</ol><p>
',
-        ),
-        '*' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><ul>
%c_str%
</ul><p>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><ul>
%c_str%
</ul><p>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'b' => true,
-        'code' => true,
-        'color' => true,
-        'colour' => true,
-        'del' => true,
-        'email' => true,
-        'em' => true,
-        'h' => true,
-        'img' => true,
-        'ins' => true,
-        'i' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'quote' => true,
-        'sub' => true,
-        'sup' => true,
-        's' => true,
-        'tt' => true,
-        'url' => true,
-        'u' => true,
-        'center' => true,
-        'right' => true,
-        'left' => true,
-        'justify' => true,
-        'youtube' => true,
-        'large' => true,
-        'small' => true,
-        'err' => true,
-      ),
-      'tags_only' => true,
-    ),
-    '*' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<li><p>
%c_str%
</p></li>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'err',
-      'parents' => 
-      array (
-        'list' => true,
-      ),
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'quote' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 5,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
</p><div class="quotebox"><cite>%a_str%</cite><blockquote><div><p>
%c_str%
</p></div></blockquote></div><p>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div class="quotebox"><blockquote><div><p>
%c_str%
</p></div></blockquote></div><p>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'clip',
-      'tag_type' => 'zombie',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'sub' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<sub>
%c_str%
</sub>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'sup' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<sup>
%c_str%
</sup>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    's' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<span class="bbs">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'tt' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<tt>%c_str%</tt>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'hidden',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    'url' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'url',
-          'c_type' => 'text',
-          'format' => '
<a href="%a_str%" rel="nofollow">
%c_str%
</a>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'url',
-          'format' => '
<a href="%c_str%" rel="nofollow">%c_str%</a>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'email' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'url' => true,
-      ),
-    ),
-    'u' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<span class="bbu">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'center' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div align="center"><p>
%c_str%
</p></div><p>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'right' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div align="right"><p>
%c_str%
</p></div><p>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'left' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div align="left"><p>
%c_str%
</p></div><p>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'justify' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
</p><div align="justify"><p>
%c_str%
</p></div><p>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'youtube' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'width_height',
-          'c_regex' => '%(?:^|\\bv[=/])(\\w{10,12})\\b%S',
-          'c_type' => 'text',
-          'format' => '
<object type="application/x-shockwave-flash" width="%w_str%" height="%h_str%" data="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1&amp;rel=0"><param name="movie" value="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1" /><param name="allowFullScreen" value="true" /></object>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'width_height',
-          'c_regex' => '%(?:^|\\bv[=/])(\\w{10,12})\\b%S',
-          'c_type' => 'width_height',
-          'format' => '
<object type="application/x-shockwave-flash" width="%w_str%" height="%h_str%" data="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1&amp;rel=0"><param name="movie" value="http://www.youtube.com/v/%c_str%&amp;hl=en_US&amp;fs=1&amp;border=1" /><param name="allowFullScreen" value="true" /></object>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => false,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'b' => true,
-        'code' => true,
-        'color' => true,
-        'colour' => true,
-        'del' => true,
-        'email' => true,
-        'em' => true,
-        'h' => true,
-        'img' => true,
-        'ins' => true,
-        'i' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-        'sub' => true,
-        'sup' => true,
-        's' => true,
-        'tt' => true,
-        'url' => true,
-        'u' => true,
-        'center' => true,
-        'right' => true,
-        'left' => true,
-        'justify' => true,
-        'youtube' => true,
-        'large' => true,
-        'small' => true,
-        'err' => true,
-      ),
-      'x_padding' => 20,
-      'y_padding' => 45,
-    ),
-    'large' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<span style="font-size: larger;">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'small' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<span style="font-size: smaller;">
%c_str%
</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-        'code' => true,
-        'table' => true,
-        'tr' => true,
-        'th' => true,
-        'td' => true,
-        'list' => true,
-        '*' => true,
-        'quote' => true,
-      ),
-    ),
-    'err' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'ATTRIB' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
<span class="err" title="%a_str%">%c_str%</span>
',
-        ),
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'none',
-          'c_type' => 'text',
-          'format' => '
<span class="err">%c_str%</span>
',
-        ),
-      ),
-      'html_type' => 'inline',
-      'in_post' => true,
-      'in_sig' => true,
-      'nest_type' => 'fix',
-      'tag_type' => 'hidden',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-    '_ROOT_' => 
-    array (
-      'depth' => 0,
-      'depth_max' => 1,
-      'handlers' => 
-      array (
-        'NO_ATTRIB' => 
-        array (
-          'a_type' => 'text',
-          'c_type' => 'text',
-          'format' => '
<span class="err" title="_ROOT_">%c_str%</span>
',
-        ),
-      ),
-      'html_type' => 'block',
-      'in_post' => false,
-      'in_sig' => false,
-      'nest_type' => 'err',
-      'tag_type' => 'normal',
-      'tags_excluded' => 
-      array (
-      ),
-    ),
-  ),
-);
-?>
\ No newline at end of file
diff --git a/featherbb/Controller/Forum.php b/featherbb/Controller/Forum.php
index 236a00e4..ff66bbab 100644
--- a/featherbb/Controller/Forum.php
+++ b/featherbb/Controller/Forum.php
@@ -62,13 +62,13 @@ public function display($fid, $name = null, $page = null)
 
         $forum_actions = $this->model->get_forum_actions($fid, $this->feather->forum_settings['o_forum_subscriptions'], $cur_forum['is_subscribed']);
 
-        $this->feather->template->addAsset('canonical', $this->feather->urlFor('Forum', ['id' => $fid, 'name' => $url_forum, 'page' => $p]));
+        $this->feather->template->addAsset('canonical', $this->feather->urlFor('Forum', ['id' => $fid, 'name' => $url_forum]));
         if ($num_pages > 1) {
             if ($p > 1) {
-                $this->feather->template->addAsset('prev', $this->feather->urlFor('Forum', ['id' => $fid, 'name' => $url_forum, 'page' => intval($p-1)]));
+                $this->feather->template->addAsset('prev', $this->feather->urlFor('ForumPaginate', ['id' => $fid, 'name' => $url_forum, 'page' => intval($p-1)]));
             }
             if ($p < $num_pages) {
-                $this->feather->template->addAsset('next', $this->feather->urlFor('Forum', ['id' => $fid, 'name' => $url_forum, 'page' => intval($p+1)]));
+                $this->feather->template->addAsset('next', $this->feather->urlFor('ForumPaginate', ['id' => $fid, 'name' => $url_forum, 'page' => intval($p+1)]));
             }
         }
 
diff --git a/featherbb/Controller/Topic.php b/featherbb/Controller/Topic.php
index 4c50035d..a6232173 100644
--- a/featherbb/Controller/Topic.php
+++ b/featherbb/Controller/Topic.php
@@ -88,13 +88,13 @@ public function display($id = null, $name = null, $page = null, $pid = null)
             'promptQuote' => __('promptQuote')
         );
 
-        $this->feather->template->addAsset('canonical', $this->feather->urlFor('Forum', ['id' => $id, 'name' => $url_forum, 'page' => $p]));
+        $this->feather->template->addAsset('canonical', $this->feather->urlFor('Forum', ['id' => $id, 'name' => $url_forum]));
         if ($num_pages > 1) {
             if ($p > 1) {
-                $this->feather->template->addAsset('prev', $this->feather->urlFor('Forum', ['id' => $id, 'name' => $url_forum, 'page' => intval($p-1)]));
+                $this->feather->template->addAsset('prev', $this->feather->urlFor('ForumPaginate', ['id' => $id, 'name' => $url_forum, 'page' => intval($p-1)]));
             }
             if ($p < $num_pages) {
-                $this->feather->template->addAsset('next', $this->feather->urlFor('Forum', ['id' => $id, 'name' => $url_forum, 'page' => intval($p+1)]));
+                $this->feather->template->addAsset('next', $this->feather->urlFor('ForumPaginate', ['id' => $id, 'name' => $url_forum, 'page' => intval($p+1)]));
             }
         }
 
diff --git a/featherbb/Model/Forum.php b/featherbb/Model/Forum.php
index 119bb2ef..0f347298 100644
--- a/featherbb/Model/Forum.php
+++ b/featherbb/Model/Forum.php
@@ -206,13 +206,13 @@ public function print_topics($forum_id, $sort_by, $start_from)
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->urlFor('Topic', ['id' => $cur_topic['moved_to'], 'name' => $url_subject, 'page' => 1]).'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->urlFor('Topic', ['id' => $cur_topic['moved_to'], 'name' => $url_subject]).'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->urlFor('Topic', ['id' => $cur_topic['id'], 'name' => $url_subject, 'page' => 1]).'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->urlFor('Topic', ['id' => $cur_topic['id'], 'name' => $url_subject]).'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->urlFor('Topic', ['id' => $cur_topic['id'], 'name' => $url_subject, 'page' => 1]).'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_formatted'] = '<a href="'.$this->feather->urlFor('Topic', ['id' => $cur_topic['id'], 'name' => $url_subject]).'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
@@ -221,7 +221,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_formatted'] = '<strong>'.$cur_topic['subject_formatted'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->urlFor('Topic', ['id' => $cur_topic['id'], 'action' => 'new']).'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->urlFor('topicAction', ['id' => $cur_topic['id'], 'action' => 'new']).'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
diff --git a/featherbb/Model/Index.php b/featherbb/Model/Index.php
index f8693eb5..78fa98b9 100644
--- a/featherbb/Model/Index.php
+++ b/featherbb/Model/Index.php
@@ -52,7 +52,7 @@ public function get_forum_actions()
 
         // Display a "mark all as read" link
         if (!$this->user->is_guest) {
-            $forum_actions[] = '<a href="'.Url::get('mark-read/').'">'.__('Mark all as read').'</a>';
+            $forum_actions[] = '<a href="'.$this->feather->urlFor('markRead').'">'.__('Mark all as read').'</a>';
         }
 
         $forum_actions = $this->hook->fire('get_forum_actions', $forum_actions);
@@ -180,7 +180,7 @@ public function print_categories_forums()
             // Are there new posts since our last visit?
             if (isset($new_topics[$cur_forum->fid])) {
                 $cur_forum->item_status .= ' inew';
-                $forum_field_new = '<span class="newtext">[ <a href="'.Url::get('search/?action=show_new&amp;fid='.$cur_forum->fid).'">'.__('New posts').'</a> ]</span>';
+                $forum_field_new = '<span class="newtext">[ <a href="'.$this->feather->urlFor('quickSearch', ['show' => '?action=show_new&amp;fid='.$cur_forum->fid]).'">'.__('New posts').'</a> ]</span>';
                 $cur_forum->icon_type = 'icon icon-new';
             }
 
@@ -191,7 +191,8 @@ public function print_categories_forums()
                 $cur_forum->item_status .= ' iredirect';
                 $cur_forum->icon_type = 'icon';
             } else {
-                $cur_forum->forum_field = '<h3><a href="'.Url::get('forum/'.$cur_forum->fid.'/'.Url::url_friendly($cur_forum->forum_name)).'/'.'">'.Utils::escape($cur_forum->forum_name).'</a>'.(!empty($forum_field_new) ? ' '.$forum_field_new : '').'</h3>';
+                $forum_name = Url::url_friendly($cur_forum->forum_name);
+                $cur_forum->forum_field = '<h3><a href="'.$this->feather->urlFor('Forum', ['id' => $cur_forum->fid, 'name' => $forum_name]).'">'.Utils::escape($cur_forum->forum_name).'</a>'.(!empty($forum_field_new) ? ' '.$forum_field_new : '').'</h3>';
                 $cur_forum->num_topics_formatted = $cur_forum->num_topics;
                 $cur_forum->num_posts_formatted = $cur_forum->num_posts;
             }
@@ -215,7 +216,7 @@ public function print_categories_forums()
 
                 foreach ($mods_array as $mod_username => $mod_id) {
                     if ($this->user->g_view_users == '1') {
-                        $moderators[] = '<a href="'.Url::get('user/'.$mod_id.'/').'">'.Utils::escape($mod_username).'</a>';
+                        $moderators[] = '<a href="'.$this->feather->urlFor('userProfile', ['id' => $mod_id]).'">'.Utils::escape($mod_username).'</a>';
                     } else {
                         $moderators[] = Utils::escape($mod_username);
                     }
@@ -259,7 +260,7 @@ public function collect_stats()
         $stats['total_posts'] = intval($query['total_posts']);
 
         if ($this->user->g_view_users == '1') {
-            $stats['newest_user'] = '<a href="'.Url::get('user/'.$stats['last_user']['id']).'/">'.Utils::escape($stats['last_user']['username']).'</a>';
+            $stats['newest_user'] = '<a href="'.$this->feather->urlFor('userProfile', ['id' => $stats['last_user']['id']]).'">'.Utils::escape($stats['last_user']['username']).'</a>';
         } else {
             $stats['newest_user'] = Utils::escape($stats['last_user']['username']);
         }
@@ -294,7 +295,7 @@ public function fetch_users_online()
         foreach($query as $user_online) {
             if ($user_online->user_id > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $online['users'][] = "\n\t\t\t\t".'<dd><a href="'.Url::get('user/'.$user_online->user_id).'/">'.Utils::escape($user_online->ident).'</a>';
+                    $online['users'][] = "\n\t\t\t\t".'<dd><a href="'.$this->feather->urlFor('userProfile', ['id' => $user_online->user_id]).'">'.Utils::escape($user_online->ident).'</a>';
                 } else {
                     $online['users'][] = "\n\t\t\t\t".'<dd>'.Utils::escape($user_online->ident);
                 }
diff --git a/featherbb/Model/Login.php b/featherbb/Model/Login.php
index 4086281f..f9acc215 100644
--- a/featherbb/Model/Login.php
+++ b/featherbb/Model/Login.php
@@ -54,7 +54,7 @@ public function login()
         $authorized = $this->hook->fire('authorized_login', $authorized);
 
         if (!$authorized) {
-            throw new Error(__('Wrong user/pass').' <a href="'.Url::get('login/action/forget/').'">'.__('Forgotten pass').'</a>', 403);
+            throw new Error(__('Wrong user/pass').' <a href="'.$this->feather->urlFor('resetPassword').'">'.__('Forgotten pass').'</a>', 403);
         }
 
         // Update the status if this is the first time the user logged in
@@ -191,7 +191,7 @@ public function password_forgotten()
 
                         // Do the user specific replacements to the template
                         $cur_mail_message = str_replace('<username>', $cur_hit->username, $mail_message);
-                        $cur_mail_message = str_replace('<activation_url>', Url::get('user/'.$cur_hit->id.'/action/change_pass/?key='.$new_password_key), $cur_mail_message);
+                        $cur_mail_message = str_replace('<activation_url>', $this->feather->urlFor('profileAction', ['id' => $cur_hit->id, 'action' => 'change_pass']).'?key='.$new_password_key, $cur_mail_message);
                         $cur_mail_message = str_replace('<new_password>', $new_password, $cur_mail_message);
                         $cur_mail_message = $this->hook->fire('cur_mail_message_password_forgotten', $cur_mail_message);
 
diff --git a/featherbb/Model/Misc.php b/featherbb/Model/Misc.php
index 5708378d..0806a49d 100644
--- a/featherbb/Model/Misc.php
+++ b/featherbb/Model/Misc.php
@@ -126,7 +126,7 @@ public function get_redirect_url($recipient_id)
         }
 
         if (!isset($redirect_url)) {
-            $redirect_url = Url::get('user/'.$recipient_id.'/');
+            $redirect_url = $this->feather->urlFor('userProfile', ['id' => $recipient_id]);
         } elseif (preg_match('%Topic\.php\?pid=(\d+)$%', $redirect_url, $matches)) {
             $redirect_url .= '#p'.$matches[1];
         }
diff --git a/featherbb/Model/Moderate.php b/featherbb/Model/Moderate.php
index 1ba20e71..d448e3d8 100644
--- a/featherbb/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -31,7 +31,7 @@ public function __construct()
     public function display_ip_info($ip)
     {
         $ip = $this->hook->fire('display_ip_info', $ip);
-        throw new Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Url::get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        throw new Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.$this->feather->urlFor('usersIpShow', ['ip' => $ip]).'">'.__('Show more users').'</a>');
     }
 
     public function display_ip_address_post($pid)
@@ -49,7 +49,7 @@ public function display_ip_address_post($pid)
 
         $ip = $this->hook->fire('display_ip_address_post', $ip);
 
-        throw new Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Url::get('admin/users/show-users/ip/'.$ip.'/').'">'.__('Show more users').'</a>');
+        throw new Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.$this->feather->urlFor('usersIpShow', ['ip' => $ip]).'">'.__('Show more users').'</a>');
     }
 
     public function get_moderators($fid)
@@ -460,7 +460,7 @@ public function display_posts_view($tid, $start_from)
             // If the poster is a registered user
             if ($cur_post->poster_id > 1) {
                 if ($this->user->g_view_users == '1') {
-                    $cur_post->poster_disp = '<a href="'.Url::get('user/'.$cur_post->poster_id.'/').'">'.Utils::escape($cur_post->poster).'</a>';
+                    $cur_post->poster_disp = '<a href="'.$this->feather->urlFor('userProfile', ['id' => $cur_post->poster_id]).'">'.Utils::escape($cur_post->poster).'</a>';
                 } else {
                     $cur_post->poster_disp = Utils::escape($cur_post->poster);
                 }
@@ -938,13 +938,13 @@ public function display_topics($fid, $sort_by, $start_from)
                 }
 
                 if ($cur_topic['moved_to'] != 0) {
-                    $cur_topic['subject_disp'] = '<a href="'.Url::get('topic/'.$cur_topic['moved_to'].'/'.$url_topic.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->urlFor('Topic', ['id' => $cur_topic['moved_to'], 'name' => $url_topic]).'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="movedtext">'.__('Moved').'</span>';
                     $cur_topic['item_status'] .= ' imoved';
                 } elseif ($cur_topic['closed'] == '0') {
-                    $cur_topic['subject_disp'] = '<a href="'.Url::get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->urlFor('Topic', ['id' => $cur_topic['id'], 'name' => $url_topic]).'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                 } else {
-                    $cur_topic['subject_disp'] = '<a href="'.Url::get('topic/'.$cur_topic['id'].'/'.$url_topic.'/').'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
+                    $cur_topic['subject_disp'] = '<a href="'.$this->feather->urlFor('Topic', ['id' => $cur_topic['id'], 'name' => $url_topic]).'">'.Utils::escape($cur_topic['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_topic['poster']).'</span>';
                     $status_text[] = '<span class="closedtext">'.__('Closed').'</span>';
                     $cur_topic['item_status'] .= ' iclosed';
                 }
@@ -953,7 +953,7 @@ public function display_topics($fid, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_disp'] = '<strong>'.$cur_topic['subject_disp'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.Url::get('topic/'.$cur_topic['id'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->urlFor('Topic', ['id' => $cur_topic['id'], 'action' => 'new']).'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
index db72e391..b8edcbb5 100644
--- a/featherbb/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -412,7 +412,7 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
                         $mail_message = str_replace('<topic_subject>', $cur_posting['subject'], $mail_message);
                         $mail_message = str_replace('<replier>', $post['username'], $mail_message);
                         $mail_message = str_replace('<post_url>', $this->feather->urlFor('viewPost', ['pid' => $new_pid]).'#p'.$new_pid, $mail_message);
-                        $mail_message = str_replace('<unsubscribe_url>', Url::get('unsubscribe/topic/'.$tid.'/'), $mail_message);
+                        $mail_message = str_replace('<unsubscribe_url>', $this->feather->urlFor('unsubscribeTopic', ['id' => $tid]), $mail_message);
                         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                         $mail_message = $this->hook->fire('send_notifications_reply_mail_message', $mail_message);
 
@@ -421,7 +421,7 @@ public function send_notifications_reply($tid, $cur_posting, $new_pid, $post)
                         $mail_message_full = str_replace('<replier>', $post['username'], $mail_message_full);
                         $mail_message_full = str_replace('<message>', $cleaned_message, $mail_message_full);
                         $mail_message_full = str_replace('<post_url>', $this->feather->urlFor('viewPost', ['pid' => $new_pid]).'#p'.$new_pid, $mail_message_full);
-                        $mail_message_full = str_replace('<unsubscribe_url>', Url::get('unsubscribe/topic/'.$tid.'/'), $mail_message_full);
+                        $mail_message_full = str_replace('<unsubscribe_url>', $this->feather->urlFor('unsubscribeTopic', ['id' => $tid]), $mail_message_full);
                         $mail_message_full = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message_full);
                         $mail_message_full = $this->hook->fire('send_notifications_reply_mail_message_full', $mail_message_full);
 
@@ -619,8 +619,8 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
                         $mail_message = str_replace('<topic_subject>', $this->config['o_censoring'] == '1' ? $censored_subject : $post['subject'], $mail_message);
                         $mail_message = str_replace('<forum_name>', $cur_posting['forum_name'], $mail_message);
                         $mail_message = str_replace('<poster>', $post['username'], $mail_message);
-                        $mail_message = str_replace('<topic_url>', Url::get('topic/'.$new_tid.'/'), $mail_message);
-                        $mail_message = str_replace('<unsubscribe_url>', Url::get('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message);
+                        $mail_message = str_replace('<topic_url>', $this->feather->urlFor('Topic', ['id' => $new_tid]), $mail_message);
+                        $mail_message = str_replace('<unsubscribe_url>', $this->feather->urlFor('unsubscribeTopic', ['id' => $cur_posting['id']]), $mail_message);
                         $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                         $mail_message = $this->hook->fire('send_notifications_new_topic_mail_message', $mail_message);
 
@@ -629,8 +629,8 @@ public function send_notifications_new_topic($post, $cur_posting, $new_tid)
                         $mail_message_full = str_replace('<forum_name>', $cur_posting['forum_name'], $mail_message_full);
                         $mail_message_full = str_replace('<poster>', $post['username'], $mail_message_full);
                         $mail_message_full = str_replace('<message>', $cleaned_message, $mail_message_full);
-                        $mail_message_full = str_replace('<topic_url>', Url::get('topic/'.$new_tid.'/'), $mail_message_full);
-                        $mail_message_full = str_replace('<unsubscribe_url>', Url::get('unsubscribe/topic/'.$cur_posting['id'].'/'), $mail_message_full);
+                        $mail_message_full = str_replace('<topic_url>', $this->feather->urlFor('Topic', ['id' => $new_tid]), $mail_message_full);
+                        $mail_message_full = str_replace('<unsubscribe_url>', $this->feather->urlFor('unsubscribeTopic', ['id' => $tid]), $mail_message_full);
                         $mail_message_full = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message_full);
                         $mail_message_full = $this->hook->fire('send_notifications_new_topic_mail_message_full', $mail_message_full);
 
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index 9324a7b3..468674d2 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -229,7 +229,7 @@ public function change_email($id)
                     $mail_message = trim(substr($mail_tpl, $first_crlf));
                     $mail_message = str_replace('<username>', $this->user->username, $mail_message);
                     $mail_message = str_replace('<email>', $new_email, $mail_message);
-                    $mail_message = str_replace('<profile_url>', Url::get('user/'.$id.'/'), $mail_message);
+                    $mail_message = str_replace('<profile_url>', $this->feather->urlFor('userProfile', ['id' => $id]), $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                     $mail_message = $this->hook->fire('change_email_mail_message', $mail_message);
 
@@ -266,7 +266,7 @@ public function change_email($id)
                     $mail_message = trim(substr($mail_tpl, $first_crlf));
                     $mail_message = str_replace('<username>', $this->user->username, $mail_message);
                     $mail_message = str_replace('<dupe_list>', implode(', ', $dupe_list), $mail_message);
-                    $mail_message = str_replace('<profile_url>', Url::get('user/'.$id.'/'), $mail_message);
+                    $mail_message = str_replace('<profile_url>', $this->feather->urlFor('userProfile', ['id' => $id]), $mail_message);
                     $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                     $mail_message = $this->hook->fire('change_email_mail_dupe_message', $mail_message);
 
@@ -303,7 +303,7 @@ public function change_email($id)
             $mail_message = trim(substr($mail_tpl, $first_crlf));
             $mail_message = str_replace('<username>', $this->user->username, $mail_message);
             $mail_message = str_replace('<base_url>', Url::base(), $mail_message);
-            $mail_message = str_replace('<activation_url>', Url::get('user/'.$id.'/action/change_email/?key='.$new_email_key), $mail_message);
+            $mail_message = str_replace('<activation_url>', $this->feather->urlFor('profileAction', ['id' => $id, 'action' => 'change_email']).'?key='.$new_email_key, $mail_message);
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
             $mail_message = $this->hook->fire('change_email_mail_activate_message', $mail_message);
 
@@ -1140,7 +1140,7 @@ public function parse_user_info($user)
         if ($user['email_setting'] == '0' && !$this->user->is_guest && $this->user->g_send_email == '1') {
             $user['email_field'] = '<a href="mailto:'.Utils::escape($user['email']).'">'.Utils::escape($user['email']).'</a>';
         } elseif ($user['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-            $user['email_field'] = '<a href="'.Url::get('email/'.$user['id'].'/').'">'.__('Send email').'</a>';
+            $user['email_field'] = '<a href="'.$this->feather->urlFor('email', ['id' => $user['id']]).'">'.__('Send email').'</a>';
         } else {
             $user['email_field'] = '';
         }
@@ -1196,11 +1196,11 @@ public function parse_user_info($user)
         if ($this->user->g_search == '1') {
             $quick_searches = array();
             if ($user['num_posts'] > 0) {
-                $quick_searches[] = '<a href="'.Url::get('search/?action=show_user_topics&amp;user_id='.$user['id']).'">'.__('Show topics').'</a>';
-                $quick_searches[] = '<a href="'.Url::get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Show posts').'</a>';
+                $quick_searches[] = '<a href="'.$this->feather->urlFor('search').'?action=show_user_topics&amp;user_id='.$user['id'].'">'.__('Show topics').'</a>';
+                $quick_searches[] = '<a href="'.$this->feather->urlFor('search').'?action=show_user_posts&amp;user_id='.$user['id'].'">'.__('Show posts').'</a>';
             }
             if ($this->user->is_admmod && $this->config['o_topic_subscriptions'] == '1') {
-                $quick_searches[] = '<a href="'.Url::get('search/?action=show_subscriptions&amp;user_id='.$user['id']).'">'.__('Show subscriptions').'</a>';
+                $quick_searches[] = '<a href="'.$this->feather->urlFor('search').'?action=show_subscriptions&amp;user_id='.$user['id'].'">'.__('Show subscriptions').'</a>';
             }
 
             if (!empty($quick_searches)) {
@@ -1238,12 +1238,12 @@ public function edit_essentials($id, $user)
                 $user_disp['username_field'] = '<p>'.sprintf(__('Username info'), Utils::escape($user['username'])).'</p>'."\n";
             }
 
-            $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.Utils::escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.Url::get('email/'.$id.'/').'">'.__('Send email').'</a></span></p>'."\n";
+            $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.Utils::escape($user['email']).'" size="40" maxlength="80" /><br /></label><p><span class="email"><a href="'.$this->feather->urlFor('email', ['id' => $id]).'">'.__('Send email').'</a></span></p>'."\n";
         } else {
             $user_disp['username_field'] = '<p>'.__('Username').': '.Utils::escape($user['username']).'</p>'."\n";
 
             if ($this->config['o_regs_verify'] == '1') {
-                $user_disp['email_field'] = '<p>'.sprintf(__('Email info'), Utils::escape($user['email']).' - <a href="'.Url::get('user/'.$id.'/action/change_email/').'">'.__('Change email').'</a>').'</p>'."\n";
+                $user_disp['email_field'] = '<p>'.sprintf(__('Email info'), Utils::escape($user['email']).' - <a href="'.$this->feather->urlFor('profileAction', ['id' => $id, 'action' => 'change_email']).'">'.__('Change email').'</a>').'</p>'."\n";
             } else {
                 $user_disp['email_field'] = '<label class="required"><strong>'.__('Email').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_email" value="'.$user['email'].'" size="40" maxlength="80" /><br /></label>'."\n";
             }
@@ -1259,11 +1259,11 @@ public function edit_essentials($id, $user)
         }
 
         if ($this->user->g_search == '1' || $this->user->g_id == FEATHER_ADMIN) {
-            $posts_actions[] = '<a href="'.Url::get('search/?action=show_user_topics&amp;user_id='.$id).'">'.__('Show topics').'</a>';
-            $posts_actions[] = '<a href="'.Url::get('search/?action=show_user_posts&amp;user_id='.$id).'">'.__('Show posts').'</a>';
+            $posts_actions[] = '<a href="'.$this->feather->urlFor('search').'?action=show_user_topics&amp;user_id='.$id.'">'.__('Show topics').'</a>';
+            $posts_actions[] = '<a href="'.$this->feather->urlFor('search').'?action=show_user_posts&amp;user_id='.$id.'">'.__('Show posts').'</a>';
 
             if ($this->config['o_topic_subscriptions'] == '1') {
-                $posts_actions[] = '<a href="'.Url::get('search/?action=show_subscriptions&amp;user_id='.$id).'">'.__('Show subscriptions').'</a>';
+                $posts_actions[] = '<a href="'.$this->feather->urlFor('search').'?action=show_subscriptions&amp;user_id='.$id.'">'.__('Show subscriptions').'</a>';
             }
         }
 
diff --git a/featherbb/Model/Register.php b/featherbb/Model/Register.php
index 092ddd22..42962301 100644
--- a/featherbb/Model/Register.php
+++ b/featherbb/Model/Register.php
@@ -195,7 +195,7 @@ public function insert_user($user)
                 $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
                 $mail_message = str_replace('<email>', $user['email1'], $mail_message);
-                $mail_message = str_replace('<profile_url>', Url::get('user/'.$new_uid.'/'), $mail_message);
+                $mail_message = str_replace('<profile_url>', $this->feather->urlFor('userProfile', ['id' => $new_uid]), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                 $mail_message = $this->hook->fire('insert_user_banned_mail_message', $mail_message);
 
@@ -216,7 +216,7 @@ public function insert_user($user)
                 $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
                 $mail_message = str_replace('<dupe_list>', implode(', ', $dupe_list), $mail_message);
-                $mail_message = str_replace('<profile_url>', Url::get('user/'.$new_uid.'/'), $mail_message);
+                $mail_message = str_replace('<profile_url>', $this->feather->urlFor('userProfile', ['id' => $new_uid]), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                 $mail_message = $this->hook->fire('insert_user_dupe_mail_message', $mail_message);
 
@@ -236,9 +236,9 @@ public function insert_user($user)
 
                 $mail_message = trim(substr($mail_tpl, $first_crlf));
                 $mail_message = str_replace('<username>', $user['username'], $mail_message);
-                $mail_message = str_replace('<base_url>', Url::base().'/', $mail_message);
-                $mail_message = str_replace('<profile_url>', Url::get('user/'.$new_uid.'/'), $mail_message);
-                $mail_message = str_replace('<admin_url>', Url::get('user/'.$new_uid.'/section/admin/'), $mail_message);
+                $mail_message = str_replace('<base_url>', $this->feather->urlFor('home'), $mail_message);
+                $mail_message = str_replace('<profile_url>', $this->feather->urlFor('userProfile', ['id' => $new_uid]), $mail_message);
+                $mail_message = str_replace('<admin_url>', $this->feather->urlFor('profileSection', ['id' => $new_uid, 'section' => 'admin']), $mail_message);
                 $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
                 $mail_message = $this->hook->fire('insert_user_new_mail_message', $mail_message);
 
@@ -259,10 +259,10 @@ public function insert_user($user)
 
             $mail_message = trim(substr($mail_tpl, $first_crlf));
             $mail_subject = str_replace('<board_title>', $this->config['o_board_title'], $mail_subject);
-            $mail_message = str_replace('<base_url>', Url::base().'/', $mail_message);
+            $mail_message = str_replace('<base_url>', $this->feather->urlFor('home'), $mail_message);
             $mail_message = str_replace('<username>', $user['username'], $mail_message);
             $mail_message = str_replace('<password>', $user['password1'], $mail_message);
-            $mail_message = str_replace('<login_url>', Url::get('login/'), $mail_message);
+            $mail_message = str_replace('<login_url>', $this->feather->urlFor('login'), $mail_message);
             $mail_message = str_replace('<board_mailer>', $this->config['o_board_title'], $mail_message);
             $mail_message = $this->hook->fire('insert_user_welcome_mail_message', $mail_message);
 
diff --git a/featherbb/routes.php b/featherbb/routes.php
index 9c481787..ccdb7340 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -40,11 +40,13 @@
 $feather->get('/', $canReadBoard, '\FeatherBB\Controller\index:display')->name('home');
 
 // Forum
-$feather->get('/forum/:id(/:name)(/page/:page)(/)', $canReadBoard, '\FeatherBB\Controller\Forum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('Forum');
+$feather->get('/forum/:id(/:name)(/)', $canReadBoard, '\FeatherBB\Controller\Forum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('Forum');
+$feather->get('/forum/:id(/:name)(/page/:page)(/)', $canReadBoard, '\FeatherBB\Controller\Forum:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('ForumPaginate');
 
 // Topic
 $feather->group('/topic', $canReadBoard, function() use ($feather) {
-    $feather->get('/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\Topic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('Topic');
+    $feather->get('/:id(/:name)(/)', '\FeatherBB\Controller\Topic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('Topic');
+    $feather->get('/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\Topic:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('TopicPaginate');
     $feather->get('/:id/action/:action(/)', '\FeatherBB\Controller\Topic:action')->conditions(array('id' => '[0-9]+'))->name('topicAction');
 });
 $feather->get('/post/:pid(/)', '\FeatherBB\Controller\Topic:viewpost')->conditions(array('pid' => '[0-9]+'))->name('viewPost');
@@ -108,6 +110,7 @@
 
 // Profile routes
 $feather->group('/user', function() use ($feather) {
+    $feather->get('/:id(/)', '\FeatherBB\Controller\Profile:display')->conditions(array('id' => '[0-9]+'))->name('userProfile');
     $feather->map('/:id(/section/:section)(/)', '\FeatherBB\Controller\Profile:display')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('profileSection');
     $feather->map('/:id(/action/:action)(/)', '\FeatherBB\Controller\Profile:action')->conditions(array('id' => '[0-9]+'))->via('GET', 'POST')->name('profileAction');
 });

From 165b99680182e46c1187371dcad8ee72135465b3 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 7 Sep 2015 02:23:43 +0200
Subject: [PATCH 336/353] urlFor finished in controllers and models

---
 featherbb/Model/Search.php | 21 +++++++++++----------
 featherbb/Model/Topic.php  | 30 +++++++++++++++---------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/featherbb/Model/Search.php b/featherbb/Model/Search.php
index 56e03d30..27208e2f 100644
--- a/featherbb/Model/Search.php
+++ b/featherbb/Model/Search.php
@@ -573,7 +573,7 @@ public function get_search_results()
 
         // If we're on the new posts search, display a "mark all as read" link
         if (!$this->user->is_guest && $search_type[0] == 'action' && $search_type[1] == 'show_new') {
-            $search['forum_actions'][] = '<a href="'.Url::get('mark-read/').'">'.__('Mark all as read').'</a>';
+            $search['forum_actions'][] = '<a href="'.$this->feather->urlFor('markRead').'">'.__('Mark all as read').'</a>';
         }
 
         // Fetch results to display
@@ -647,9 +647,9 @@ public function get_search_results()
 
             if ($search_type[0] == 'action') {
                 if ($search_type[1] == 'show_user_topics') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.Url::get('search/?action=show_user_topics&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_topics'), Utils::escape($search['search_set'][0]['poster'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->urlFor('search').'?action=show_user_topics&amp;user_id='.$search_type[2].'">'.sprintf(__('Quick search show_user_topics'), Utils::escape($search['search_set'][0]['poster'])).'</a>';
                 } elseif ($search_type[1] == 'show_user_posts') {
-                    $search['crumbs_text']['search_type'] = '<a href="'.Url::get('search/?action=show_user_posts&amp;user_id='.$search_type[2]).'">'.sprintf(__('Quick search show_user_posts'), Utils::escape($search['search_set'][0]['pposter'])).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->urlFor('search').'?action=show_user_posts&amp;user_id='.$search_type[2].'">'.sprintf(__('Quick search show_user_posts'), Utils::escape($search['search_set'][0]['pposter'])).'</a>';
                 } elseif ($search_type[1] == 'show_subscriptions') {
                     // Fetch username of subscriber
                     $subscriber_id = $search_type[2];
@@ -662,10 +662,10 @@ public function get_search_results()
                         throw new Error(__('Bad request'), 404);
                     }
 
-                    $search['crumbs_text']['search_type'] = '<a href="'.Url::get('search/?action=show_subscription&amp;user_id='.$subscriber_id).'">'.sprintf(__('Quick search show_subscriptions'), Utils::escape($subscriber_name)).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->urlFor('search').'?action=show_subscription&amp;user_id='.$subscriber_id.'">'.sprintf(__('Quick search show_subscriptions'), Utils::escape($subscriber_name)).'</a>';
                 } else {
                     $search_url = str_replace('_', '/', $search_type[1]);
-                    $search['crumbs_text']['search_type'] = '<a href="'.Url::get('search/'.$search_url.'/').'">'.__('Quick search '.$search_type[1]).'</a>';
+                    $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->urlFor('search').$search_url.'">'.__('Quick search '.$search_type[1]).'</a>';
                 }
             } else {
                 $keywords = $author = '';
@@ -681,7 +681,7 @@ public function get_search_results()
                     $search['crumbs_text']['search_type'] = sprintf(__('By user show as '.$show_as), Utils::escape($author));
                 }
 
-                $search['crumbs_text']['search_type'] = '<a href="'.Url::get('search/?action=search&amp;keywords='.urlencode($keywords).'&amp;author='.urlencode($author).'&amp;forums='.$search_type[2].'&amp;search_in='.$search_type[3].'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir.'&amp;show_as='.$show_as).'">'.$search['crumbs_text']['search_type'].'</a>';
+                $search['crumbs_text']['search_type'] = '<a href="'.$this->feather->urlFor('search').'?action=search&amp;keywords='.urlencode($keywords).'&amp;author='.urlencode($author).'&amp;forums='.$search_type[2].'&amp;search_in='.$search_type[3].'&amp;sort_by='.$sort_by.'&amp;sort_dir='.$sort_dir.'&amp;show_as='.$show_as.'">'.$search['crumbs_text']['search_type'].'</a>';
             }
         }
 
@@ -704,7 +704,8 @@ public function display_search_results($search)
         $post_count = $topic_count = 0;
 
         foreach ($search['search_set'] as $cur_search) {
-            $forum = '<a href="'.Url::get('forum/'.$cur_search['forum_id'].'/'.Url::url_friendly($cur_search['forum_name']).'/').'">'.Utils::escape($cur_search['forum_name']).'</a>';
+            $forum_name = Url::url_friendly($cur_search['forum_name']);
+            $forum = '<a href="'.$this->feather->urlFor('Forum', ['id' => $cur_search['forum_id'], 'name' => $forum_name]).'">'.Utils::escape($cur_search['forum_name']).'</a>';
             $url_topic = Url::url_friendly($cur_search['subject']);
 
             if ($this->config['o_censoring'] == '1') {
@@ -732,7 +733,7 @@ public function display_search_results($search)
                 $pposter = Utils::escape($cur_search['pposter']);
 
                 if ($cur_search['poster_id'] > 1 && $this->user->g_view_users == '1') {
-                    $cur_search['pposter_disp'] = '<strong><a href="'.Url::get('user/'.$cur_search['poster_id'].'/').'">'.$pposter.'</a></strong>';
+                    $cur_search['pposter_disp'] = '<strong><a href="'.$this->feather->urlFor('userProfile', ['id' => $cur_search['poster_id']]).'">'.$pposter.'</a></strong>';
                 } else {
                     $cur_search['pposter_disp'] = '<strong>'.$pposter.'</strong>';
                 }
@@ -750,7 +751,7 @@ public function display_search_results($search)
                 $cur_search['item_status'] = ($topic_count % 2 == 0) ? 'roweven' : 'rowodd';
                 $cur_search['icon_type'] = 'icon';
 
-                $subject = '<a href="'.Url::get('topic/'.$cur_search['tid'].'/'.$url_topic.'/').'">'.Utils::escape($cur_search['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_search['poster']).'</span>';
+                $subject = '<a href="'.$this->feather->urlFor('Topic', ['id' => $cur_search['tid'], 'name' => $url_topic]).'">'.Utils::escape($cur_search['subject']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_search['poster']).'</span>';
 
                 if ($cur_search['sticky'] == '1') {
                     $cur_search['item_status'] .= ' isticky';
@@ -766,7 +767,7 @@ public function display_search_results($search)
                     $cur_search['item_status'] .= ' inew';
                     $cur_search['icon_type'] = 'icon icon-new';
                     $subject = '<strong>'.$subject.'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.Url::get('topic/'.$cur_search['tid'].'/action/new/').'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.$this->feather->urlFor('topicAction', ['id' => $cur_search['tid'], 'action' => 'new']).'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
diff --git a/featherbb/Model/Topic.php b/featherbb/Model/Topic.php
index 1de23db7..43e4e732 100644
--- a/featherbb/Model/Topic.php
+++ b/featherbb/Model/Topic.php
@@ -162,7 +162,7 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
 
         if ($closed == '0') {
             if (($post_replies == '' && $this->user->g_post_replies == '1') || $post_replies == '1' || $is_admmod) {
-                $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.Url::get('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a></p>'."\n";
+                $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.$this->feather->urlFor('newReply', ['tid' => $topic_id]).'">'.__('Post reply').'</a></p>'."\n";
             } else {
                 $post_link = '';
             }
@@ -170,7 +170,7 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
             $post_link = __('Topic closed');
 
             if ($is_admmod) {
-                $post_link .= ' / <a href="'.Url::get('post/reply/'.$topic_id.'/').'">'.__('Post reply').'</a>';
+                $post_link .= ' / <a href="'.$this->feather->urlFor('newReply', ['tid' => $topic_id]).'">'.__('Post reply').'</a>';
             }
 
             $post_link = "\t\t\t".'<p class="postlink conr">'.$post_link.'</p>'."\n";
@@ -208,9 +208,9 @@ public function get_subscraction($is_subscribed, $topic_id)
         if (!$this->user->is_guest && $this->config['o_topic_subscriptions'] == '1') {
             if ($is_subscribed) {
                 // I apologize for the variable naming here. It's a mix of subscription and action I guess :-)
-                $subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.__('Is subscribed').' - </span><a href="'.Url::get('unsubscribe/topic/'.$topic_id.'/').'">'.__('Unsubscribe').'</a></p>'."\n";
+                $subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.__('Is subscribed').' - </span><a href="'.$this->feather->urlFor('unsubscribeTopic', ['id' => $topic_id]).'">'.__('Unsubscribe').'</a></p>'."\n";
             } else {
-                $subscraction = "\t\t".'<p class="subscribelink clearb"><a href="'.Url::get('subscribe/topic/'.$topic_id.'/').'">'.__('Subscribe').'</a></p>'."\n";
+                $subscraction = "\t\t".'<p class="subscribelink clearb"><a href="'.$this->feather->urlFor('subscribeTopic', ['id' => $topic_id]).'">'.__('Subscribe').'</a></p>'."\n";
             }
         } else {
             $subscraction = '';
@@ -317,7 +317,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                     if ((($cur_post['email_setting'] == '0' && !$this->user->is_guest) || $this->user->is_admmod) && $this->user->g_send_email == '1') {
                         $cur_post['user_contacts'][] = '<span class="email"><a href="mailto:'.Utils::escape($cur_post['email']).'">'.__('Email').'</a></span>';
                     } elseif ($cur_post['email_setting'] == '1' && !$this->user->is_guest && $this->user->g_send_email == '1') {
-                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.Url::get('email/'.$cur_post['poster_id'].'/').'">'.__('Email').'</a></span>';
+                        $cur_post['user_contacts'][] = '<span class="email"><a href="'.$this->feather->urlFor('email', ['id' => $cur_post['poster_id']]).'">'.__('Email').'</a></span>';
                     }
 
                     if ($cur_post['url'] != '') {
@@ -336,7 +336,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 }
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="'.Url::get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.Utils::escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->urlFor('getHostPost', ['pid' => $cur_post['id']]).'" title="'.Utils::escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
 
                     if ($cur_post['admin_note'] != '') {
                         $cur_post['user_info'][] = '<dd><span>'.__('Note').' <strong>'.Utils::escape($cur_post['admin_note']).'</strong></span></dd>';
@@ -349,7 +349,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 $cur_post['user_title_formatted'] = Utils::get_title($cur_post);
 
                 if ($this->user->is_admmod) {
-                    $cur_post['user_info'][] = '<dd><span><a href="'.Url::get('moderate/get-host/post/'.$cur_post['id'].'/').'" title="'.Utils::escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
+                    $cur_post['user_info'][] = '<dd><span><a href="'.$this->feather->urlFor('getHostPost', ['pid' => $cur_post['id']]).'" title="'.Utils::escape($cur_post['poster_ip']).'">'.__('IP address logged').'</a></span></dd>';
                 }
 
                 if ($this->config['o_show_user_info'] == '1' && $cur_post['poster_email'] != '' && !$this->user->is_guest && $this->user->g_send_email == '1') {
@@ -360,30 +360,30 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
             // Generation post action array (quote, edit, delete etc.)
             if (!$is_admmod) {
                 if (!$this->user->is_guest) {
-                    $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.Url::get('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.$this->feather->urlFor('report', ['id' => $cur_post['id']]).'">'.__('Report').'</a></span></li>';
                 }
 
                 if ($cur_topic['closed'] == '0') {
                     if ($cur_post['poster_id'] == $this->user->id) {
                         if ((($start_from + $post_count) == 1 && $this->user->g_delete_topics == '1') || (($start_from + $post_count) > 1 && $this->user->g_delete_posts == '1')) {
-                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.Url::get('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
+                            $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.$this->feather->urlFor('deletePost', ['id' => $cur_post['id']]).'">'.__('Delete').'</a></span></li>';
                         }
                         if ($this->user->g_edit_posts == '1') {
-                            $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.Url::get('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
+                            $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.$this->feather->urlFor('editPost', ['id' => $cur_post['id']]).'">'.__('Edit').'</a></span></li>';
                         }
                     }
 
                     if (($cur_topic['post_replies'] == '' && $this->user->g_post_replies == '1') || $cur_topic['post_replies'] == '1') {
-                        $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.Url::get('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
+                        $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.$this->feather->urlFor('newQuoteReply', ['tid' => $topic_id, 'quote' => $cur_post['id']]).'">'.__('Quote').'</a></span></li>';
                     }
                 }
             } else {
-                $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.Url::get('report/'.$cur_post['id'].'/').'">'.__('Report').'</a></span></li>';
+                $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.$this->feather->urlFor('report', ['id' => $cur_post['id']]).'">'.__('Report').'</a></span></li>';
                 if ($this->user->g_id == FEATHER_ADMIN || !in_array($cur_post['poster_id'], $admin_ids)) {
-                    $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.Url::get('delete/'.$cur_post['id'].'/').'">'.__('Delete').'</a></span></li>';
-                    $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.Url::get('edit/'.$cur_post['id'].'/').'">'.__('Edit').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.$this->feather->urlFor('deletePost', ['id' => $cur_post['id']]).'">'.__('Delete').'</a></span></li>';
+                    $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.$this->feather->urlFor('editPost', ['id' => $cur_post['id']]).'">'.__('Edit').'</a></span></li>';
                 }
-                $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.Url::get('post/reply/'.$topic_id.'/quote/'.$cur_post['id'].'/').'">'.__('Quote').'</a></span></li>';
+                $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.$this->feather->urlFor('newQuoteReply', ['tid' => $topic_id, 'quote' => $cur_post['id']]).'">'.__('Quote').'</a></span></li>';
             }
 
             // Perform the main parsing of the message (BBCode, smilies, censor words etc)

From f42f622e2521d5d16722f6863027b6ba941b4fb3 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 7 Sep 2015 03:00:09 +0200
Subject: [PATCH 337/353] More urlFor and fixes

---
 featherbb/Controller/Admin/Index.php          |  3 +-
 featherbb/Controller/Admin/Maintenance.php    |  2 +-
 featherbb/Model/Admin/Categories.php          |  2 +-
 featherbb/Model/Admin/Forums.php              |  5 +---
 featherbb/routes.php                          |  2 +-
 .../FeatherBB/view/admin/bans/admin_bans.php  |  6 ++--
 .../FeatherBB/view/admin/bans/search_ban.php  | 28 +++++++++----------
 .../FeatherBB/view/admin/categories.php       | 20 ++++++-------
 .../themes/FeatherBB/view/admin/censoring.php |  6 ++--
 .../view/admin/forums/admin_forums.php        |  6 ++--
 .../view/admin/forums/delete_forum.php        |  4 +--
 .../view/admin/forums/permissions.php         |  4 +--
 .../view/admin/groups/admin_groups.php        |  8 +++---
 .../view/admin/groups/confirm_delete.php      |  6 ++--
 .../view/admin/groups/delete_group.php        |  2 +-
 style/themes/FeatherBB/view/admin/index.php   | 13 ++-------
 .../admin/maintenance/admin_maintenance.php   | 10 +++----
 .../view/admin/maintenance/prune.php          |  2 +-
 .../view/admin/maintenance/rebuild.php        |  4 +--
 style/themes/FeatherBB/view/admin/menu.php    | 26 ++++++++---------
 style/themes/FeatherBB/view/admin/options.php |  2 +-
 style/themes/FeatherBB/view/admin/parser.php  |  2 +-
 .../FeatherBB/view/admin/permissions.php      |  2 +-
 style/themes/FeatherBB/view/admin/reports.php |  2 +-
 .../view/admin/users/admin_users.php          |  4 +--
 .../FeatherBB/view/admin/users/find_users.php |  6 ++--
 .../FeatherBB/view/admin/users/move_users.php |  2 +-
 .../FeatherBB/view/admin/users/search_ip.php  |  8 +++---
 .../FeatherBB/view/admin/users/show_users.php |  8 +++---
 style/themes/FeatherBB/view/header.php        |  6 ++--
 view/admin/index.php                          | 11 ++------
 view/admin/options.php                        |  2 +-
 32 files changed, 98 insertions(+), 116 deletions(-)

diff --git a/featherbb/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
index e14386cc..d4164107 100644
--- a/featherbb/Controller/Admin/Index.php
+++ b/featherbb/Controller/Admin/Index.php
@@ -81,8 +81,7 @@ public function display($action = null)
         $this->feather->template->setPageInfo(array(
                             'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Index')),
                             'active_page' => 'admin',
-                            'admin_console' => true,
-                            'install_file_exists'    =>   is_dir($this->feather->forum_env['FEATHER_ROOT'].'install'),
+                            'admin_console' => true
                             )
                     )->addTemplate('admin/index.php')->display();
     }
diff --git a/featherbb/Controller/Admin/Maintenance.php b/featherbb/Controller/Admin/Maintenance.php
index 629381ad..fcdf496b 100644
--- a/featherbb/Controller/Admin/Maintenance.php
+++ b/featherbb/Controller/Admin/Maintenance.php
@@ -17,7 +17,7 @@ class Maintenance
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \FeatherBB\Model\Admin\maintenance();
+        $this->model = new \FeatherBB\Model\Admin\Maintenance();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/admin/maintenance.mo');
     }
 
diff --git a/featherbb/Model/Admin/Categories.php b/featherbb/Model/Admin/Categories.php
index 8fffc41d..0e2840a2 100644
--- a/featherbb/Model/Admin/Categories.php
+++ b/featherbb/Model/Admin/Categories.php
@@ -60,7 +60,7 @@ public function delete_category($cat_to_delete)
 
         foreach ($forums_in_cat as $forum) {
             // Prune all posts and topics
-            $this->maintenance = new \FeatherBB\Model\Admin\maintenance();
+            $this->maintenance = new \FeatherBB\Model\Admin\Maintenance();
             $this->maintenance->prune($forum->id, 1, -1);
 
             // Delete forum
diff --git a/featherbb/Model/Admin/Forums.php b/featherbb/Model/Admin/Forums.php
index b84acb31..2c3f91d4 100644
--- a/featherbb/Model/Admin/Forums.php
+++ b/featherbb/Model/Admin/Forums.php
@@ -55,13 +55,10 @@ public function update_forum($forum_id, array $forum_data)
 
     public function delete_forum($forum_id)
     {
-        // Load the maintenance.php model file for prune public function
-        require $this->feather->forum_env['FEATHER_ROOT'] . 'model/admin/maintenance.php';
-
         $forum_id = $this->hook->fire('delete_forum_start', $forum_id);
 
         // Prune all posts and topics
-        $this->maintenance = new \FeatherBB\Model\Admin\maintenance();
+        $this->maintenance = new \FeatherBB\Model\Admin\Maintenance();
         $this->maintenance->prune($forum_id, 1, -1);
 
         // Delete the forum
diff --git a/featherbb/routes.php b/featherbb/routes.php
index ccdb7340..90c22cc3 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -138,7 +138,7 @@
     };
 
     // Admin index
-    $feather->get('(/action/:action)(/)', '\FeatherBB\Controller\Admin\index:display');
+    $feather->get('(/action/:action)(/)', '\FeatherBB\Controller\Admin\index:display')->name('adminAction');
     $feather->get('/index(/)', '\FeatherBB\Controller\Admin\index:display')->name('adminIndex');
 
     // Admin bans
diff --git a/style/themes/FeatherBB/view/admin/bans/admin_bans.php b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
index 831b0d4c..fc833e72 100644
--- a/style/themes/FeatherBB/view/admin/bans/admin_bans.php
+++ b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
@@ -18,7 +18,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('New ban head') ?></span></h2>
 		<div class="box">
-			<form id="bans" method="post" action="<?php echo Url::get('admin/bans/add/') ?>">
+			<form id="bans" method="post" action="<?= $feather->urlFor('addBan') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
@@ -41,7 +41,7 @@
 
 		<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
 		<div class="box">
-			<form id="find_bans" method="get" action="<?php echo Url::get('admin/bans/') ?>">
+			<form id="find_bans" method="get" action="<?= $feather->urlFor('addBan') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
 				<div class="inform">
@@ -101,4 +101,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/admin/bans/search_ban.php b/style/themes/FeatherBB/view/admin/bans/search_ban.php
index 1f379e57..2e3622ff 100644
--- a/style/themes/FeatherBB/view/admin/bans/search_ban.php
+++ b/style/themes/FeatherBB/view/admin/bans/search_ban.php
@@ -19,12 +19,12 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo Url::get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+			<li><a href="<?= $feather->urlFor('adminIndex') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?= $feather->urlFor('addBan') ?>"><?php _e('Bans') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
+			<p class="pagelink"><?= $paging_links ?></p>
 		</div>
 		<div class="clearer"></div>
 	</div>
@@ -53,13 +53,13 @@
         foreach ($ban_data as $cur_ban) {
             ?>
 				<tr>
-					<td class="tcl"><?php echo($cur_ban['username'] != '') ? Utils::escape($cur_ban['username']) : '&#160;' ?></td>
-					<td class="tc2"><?php echo($cur_ban['email'] != '') ? Utils::escape($cur_ban['email']) : '&#160;' ?></td>
-					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? Utils::escape($cur_ban['ip']) : '&#160;' ?></td>
-					<td class="tc4"><?php echo $feather->utils->format_time($cur_ban['expire'], true) ?></td>
-					<td class="tc5"><?php echo($cur_ban['message'] != '') ? Utils::escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.Url::get('user/'.$cur_ban['ban_creator'].'/').'">'.Utils::escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
-					<td class="tcr"><?php echo '<a href="'.Url::get('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.Url::get('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
+					<td class="tcl"><?= ($cur_ban['username'] != '') ? Utils::escape($cur_ban['username']) : '&#160;' ?></td>
+					<td class="tc2"><?= ($cur_ban['email'] != '') ? Utils::escape($cur_ban['email']) : '&#160;' ?></td>
+					<td class="tc3"><?= ($cur_ban['ip'] != '') ? Utils::escape($cur_ban['ip']) : '&#160;' ?></td>
+					<td class="tc4"><?= $feather->utils->format_time($cur_ban['expire'], true) ?></td>
+					<td class="tc5"><?= ($cur_ban['message'] != '') ? Utils::escape($cur_ban['message']) : '&#160;' ?></td>
+					<td class="tc6"><?= ($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->urlFor('userProfile', ['id' => $cur_ban['ban_creator']]).'">'.Utils::escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
+					<td class="tcr"><?= '<a href="'.$feather->urlFor('editBan', ['id' => $cur_ban['id']]).'">'.__('Edit').'</a> | <a href="'.$feather->urlFor('deleteBan', ['id' => $cur_ban['id']]).'">'.__('Remove').'</a>' ?></td>
 				</tr>
 <?php
 
@@ -78,13 +78,13 @@
 <div class="linksb">
 	<div class="inbox crumbsplus">
 		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
+			<p class="pagelink"><?= $paging_links ?></p>
 		</div>
         <ul class="crumbs">
-            <li><a href="<?php echo Url::get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo Url::get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+            <li><a href="<?= $feather->urlFor('adminIndex') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+            <li><span>»&#160;</span><a href="<?= $feather->urlFor('adminBans') ?>"><?php _e('Bans') ?></a></li>
             <li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
         </ul>
 		<div class="clearer"></div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/admin/categories.php b/style/themes/FeatherBB/view/admin/categories.php
index c8bcc748..2596c3ee 100644
--- a/style/themes/FeatherBB/view/admin/categories.php
+++ b/style/themes/FeatherBB/view/admin/categories.php
@@ -19,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Add categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo Url::get('admin/categories/add/') ?>">
+			<form method="post" action="<?= $feather->urlFor('addCategory') ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('Add categories subhead') ?></legend>
@@ -28,9 +28,9 @@
 								<tr>
 									<th scope="row"><?php _e('Add category label') ?><div><input type="submit" value="<?php _e('Add new submit') ?>" tabindex="2" /></div></th>
 									<td>
-										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+										<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
 										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
-										<span><?php printf(__('Add category help'), '<a href="'.Url::get('admin/forums').'">'.__('Forums').'</a>') ?></span>
+										<span><?php printf(__('Add category help'), '<a href="'.$feather->urlFor('adminForums').'">'.__('Forums').'</a>') ?></span>
 									</td>
 								</tr>
 							</table>
@@ -42,8 +42,8 @@
 
 <?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo Url::get('admin/categories/delete') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<form method="post" action="<?= $feather->urlFor('deleteCategory') ?>">
+				<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('Delete categories subhead') ?></legend>
@@ -74,8 +74,8 @@
 
 <?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo Url::get('admin/categories/edit/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<form method="post" action="<?= $feather->urlFor('editCategory') ?>">
+				<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('Edit categories subhead') ?></legend>
@@ -93,8 +93,8 @@
     foreach ($cat_list as $cur_cat) {
         ?>
 								<tr>
-									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo Utils::escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
-									<td><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][order]" value="<?php echo $cur_cat['disp_position'] ?>" size="3" maxlength="3" /></td>
+									<td class="tcl"><input type="text" name="cat[<?= $cur_cat['id'] ?>][name]" value="<?= Utils::escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
+									<td><input type="text" name="cat[<?= $cur_cat['id'] ?>][order]" value="<?= $cur_cat['disp_position'] ?>" size="3" maxlength="3" /></td>
 								</tr>
 <?php
 
@@ -111,4 +111,4 @@
 		</div>
 <?php endif; ?>	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/admin/censoring.php b/style/themes/FeatherBB/view/admin/censoring.php
index d9724649..7d3e8071 100644
--- a/style/themes/FeatherBB/view/admin/censoring.php
+++ b/style/themes/FeatherBB/view/admin/censoring.php
@@ -19,13 +19,13 @@
 	<div class="blockform">
 		<h2><span><?php _e('Censoring head') ?></span></h2>
 		<div class="box">
-			<form id="censoring" method="post" action="<?php echo Url::get('admin/censoring/') ?>">
+			<form id="censoring" method="post" action="<?php echo $feather->urlFor('adminCensoring') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('Add word subhead') ?></legend>
 						<div class="infldset">
-							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.Url::get('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.Url::get('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
+							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.$feather->urlFor('adminOptions').'#censoring">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.$feather->urlFor('adminOptions').'#censoring">'.__('Options').'</a>')) ?></p>
 							<table>
 							<thead>
 								<tr>
@@ -84,4 +84,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/admin/forums/admin_forums.php b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
index 1e92de84..4aeb5236 100644
--- a/style/themes/FeatherBB/view/admin/forums/admin_forums.php
+++ b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
@@ -18,7 +18,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Add forum head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo Url::get('admin/forums/add') ?>">
+			<form method="post" action="<?php echo $feather->urlFor('addForum') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <?php
 if (!empty($cat_list)) {
@@ -67,7 +67,7 @@
     ?>
 		<h2 class="block2"><span><?php _e('Manage forums head') ?></span></h2>
 		<div class="box">
-			<form id="edforum" method="post" action="<?php echo Url::get('admin/forums/') ?>">
+			<form id="edforum" method="post" action="<?php echo $feather->urlFor('adminForums') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
 <?php
@@ -90,7 +90,7 @@
 	foreach ($cat_data['cat_forums'] as $forum) {
         ?>
 								<tr>
-									<td class="tcl"><a href="<?php echo Url::get('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo Url::get('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
+									<td class="tcl"><a href="<?php echo $feather->urlFor('editForum', ['id' => $forum['forum_id']]) ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->urlFor('deleteForum', ['id' => $forum['forum_id']]) ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
 									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
 									<td class="tcr"><strong><?php echo Utils::escape($forum['forum_name']) ?></strong></td>
 								</tr>
diff --git a/style/themes/FeatherBB/view/admin/forums/delete_forum.php b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
index 5c8d1519..18d973a5 100644
--- a/style/themes/FeatherBB/view/admin/forums/delete_forum.php
+++ b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
@@ -18,7 +18,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Confirm delete head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo Url::get('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
+			<form method="post" action="<?php echo $feather->urlFor('deleteForum', ['id' => $cur_forum['id']]) ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
@@ -34,4 +34,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/admin/forums/permissions.php b/style/themes/FeatherBB/view/admin/forums/permissions.php
index e77fe3e1..bbea0301 100644
--- a/style/themes/FeatherBB/view/admin/forums/permissions.php
+++ b/style/themes/FeatherBB/view/admin/forums/permissions.php
@@ -19,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Edit forum head') ?></span></h2>
 		<div class="box">
-			<form id="edit_forum" method="post" action="<?php echo Url::get('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
+			<form id="edit_forum" method="post" action="<?php echo $feather->urlFor('editForum', ['id' => $cur_forum['id']]) ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
 				<div class="inform">
@@ -137,4 +137,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/admin/groups/admin_groups.php b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
index af3c5e52..35ea6efb 100644
--- a/style/themes/FeatherBB/view/admin/groups/admin_groups.php
+++ b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
@@ -21,7 +21,7 @@
 		<div class="box">
 				<div class="inform">
 					<fieldset>
-                        <form id="groups" method="post" action="<?php echo Url::get('admin/groups/add/') ?>">
+                        <form id="groups" method="post" action="<?php echo $feather->urlFor('addGroup') ?>">
                         <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 						<legend><?php _e('Add group subhead') ?></legend>
 						<div class="infldset">
@@ -54,7 +54,7 @@
 				</div>
 				<div class="inform">
 					<fieldset>
-                        <form id="groups" method="post" action="<?php echo Url::get('admin/groups/') ?>">
+                        <form id="groups" method="post" action="<?php echo $feather->urlFor('adminGroups') ?>">
                         	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 						<legend><?php _e('Default group subhead') ?></legend>
 						<div class="infldset">
@@ -98,7 +98,7 @@
 							<table>
 <?php
 foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.Url::get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.Url::get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.Utils::escape($cur_group['g_title']).'</td></tr>'."\n";
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->urlFor('editGroup', ['id' => $cur_group['g_id']]).'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->urlFor('deleteGroup', ['id' => $cur_group['g_id']]).'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.Utils::escape($cur_group['g_title']).'</td></tr>'."\n";
 }
 
 ?>
@@ -110,4 +110,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
index 636e2b39..7c689045 100644
--- a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
+++ b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
@@ -19,10 +19,10 @@
 	<div class="blockform">
 		<h2><span><?php _e('Group delete head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo Url::get('admin/groups/delete/'.$id.'/') ?>">
+			<form method="post" action="<?php echo $feather->urlFor('deleteGroup', ['id' => $id]) ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
-				<input type="hidden" name="group_to_delete" value="<?php echo Url::get('admin/groups/delete/'.$id.'/') ?>" />
+				<input type="hidden" name="group_to_delete" value="<?php echo $feather->urlFor('deleteGroup', ['id' => $id]) ?>" />
 					<fieldset>
 						<legend><?php _e('Confirm delete subhead') ?></legend>
 						<div class="infldset">
@@ -36,4 +36,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/admin/groups/delete_group.php b/style/themes/FeatherBB/view/admin/groups/delete_group.php
index a17bf83d..3ec58a3c 100644
--- a/style/themes/FeatherBB/view/admin/groups/delete_group.php
+++ b/style/themes/FeatherBB/view/admin/groups/delete_group.php
@@ -19,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Delete group head') ?></span></h2>
 		<div class="box">
-			<form id="groups" method="post" action="<?php echo Url::get('admin/groups/delete/'.$id.'/') ?>">
+			<form id="groups" method="post" action="<?php echo $feather->urlFor('deleteGroup', ['id' => $id]) ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<fieldset>
diff --git a/style/themes/FeatherBB/view/admin/index.php b/style/themes/FeatherBB/view/admin/index.php
index 49ea7007..64ca7197 100644
--- a/style/themes/FeatherBB/view/admin/index.php
+++ b/style/themes/FeatherBB/view/admin/index.php
@@ -34,24 +34,17 @@
 			</div>
 		</div>
 
-<?php if ($install_file_exists) : ?>
-		<h2 class="block2"><span><?php _e('Alerts head') ?></span></h2>
-		<div id="adalerts" class="box">
-			<p><?php printf(__('Install file exists'), '<a href="'.Url::get('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
-		</div>
-<?php endif; ?>
-
 		<h2 class="block2"><span><?php _e('About head') ?></span></h2>
 		<div id="adstats" class="box">
 			<div class="inbox">
 				<dl>
 					<dt><?php _e('FeatherBB version label') ?></dt>
 					<dd>
-						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.Url::get('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
+						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.$feather->urlFor('adminAction', ['action' => 'check_upgrade']).'">'.__('Check for upgrade').'</a>') ?>
 					</dd>
 					<dt><?php _e('Server statistics label') ?></dt>
 					<dd>
-						<a href="<?php echo Url::get('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
+						<a href="<?php echo $feather->urlFor('statistics') ?>"><?php _e('View server statistics') ?></a>
 					</dd>
 					<dt><?php _e('Support label') ?></dt>
 					<dd>
@@ -62,4 +55,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
index f9a7a6e7..5e553e17 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
@@ -18,13 +18,13 @@
 	<div class="blockform">
 		<h2><span><?php _e('Maintenance head') ?></span></h2>
 		<div class="box">
-			<form method="get" action="<?php echo Url::get('admin/maintenance/') ?>">
+			<form method="get" action="<?php echo $feather->urlFor('adminMaintenance') ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="rebuild" />
 					<fieldset>
 						<legend><?php _e('Rebuild index subhead') ?></legend>
 						<div class="infldset">
-							<p><?php printf(__('Rebuild index info'), '<a href="'.Url::get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<p><?php printf(__('Rebuild index info'), '<a href="'.$feather->urlFor('adminOptions').'#maintenance">'.__('Maintenance mode').'</a>') ?></p>
 							<table class="aligntop">
 								<tr>
 									<th scope="row"><?php _e('Posts per cycle label') ?></th>
@@ -54,7 +54,7 @@
 				</div>
 			</form>
 
-			<form method="post" action="<?php echo Url::get('admin/maintenance/') ?>" onsubmit="return process_form(this)">
+			<form method="post" action="<?php echo $feather->urlFor('adminMaintenance') ?>" onsubmit="return process_form(this)">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
@@ -89,7 +89,7 @@
 									</td>
 								</tr>
 							</table>
-							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.Url::get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.$feather->urlFor('adminOptions').'#maintenance">'.__('Maintenance mode').'</a>') ?></p>
 							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php _e('Prune') ?>" tabindex="8" /></div>
 						</div>
 					</fieldset>
@@ -98,4 +98,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/admin/maintenance/prune.php b/style/themes/FeatherBB/view/admin/maintenance/prune.php
index 66326761..63b36d72 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/prune.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/prune.php
@@ -19,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Prune head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo Url::get('admin/maintenance/') ?>">
+			<form method="post" action="<?php echo $feather->urlFor('adminMaintenance') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 					<input type="hidden" name="action" value="prune" />
diff --git a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
index 55b8913d..4c319409 100644
--- a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
+++ b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
@@ -15,5 +15,5 @@
 }
 ?>
 <h1><?php _e('Rebuilding index info') ?></h1>
-<script type="text/javascript">window.location="<?= Url::get('admin/maintenance/').$query_str ?>"</script>
-<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.Url::get('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>
+<script type="text/javascript">window.location="<?= $feather->urlFor('adminMaintenance').$query_str ?>"</script>
+<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.$feather->urlFor('adminMaintenance').$query_str.'">'.__('Click here').'</a>')?></p>
diff --git a/style/themes/FeatherBB/view/admin/menu.php b/style/themes/FeatherBB/view/admin/menu.php
index 1310d426..a049613f 100644
--- a/style/themes/FeatherBB/view/admin/menu.php
+++ b/style/themes/FeatherBB/view/admin/menu.php
@@ -24,20 +24,20 @@
 					<li<?php if ($page == 'index') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo Url::get('admin/') ?>"><?php _e('Index') ?></a></li>
+    ?>><a href="<?php echo $feather->urlFor('adminIndex') ?>"><?php _e('Index') ?></a></li>
 					<li<?php if ($page == 'users') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo Url::get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+    ?>><a href="<?php echo $feather->urlFor('adminUsers') ?>"><?php _e('Users') ?></a></li>
 <?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo Url::get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+    ?>><a href="<?php echo $feather->urlFor('adminBans') ?>"><?php _e('Bans') ?></a></li>
 <?php endif;
     if ($is_admin || $feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo Url::get('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
+    ?>><a href="<?php echo $feather->urlFor('adminReports') ?>"><?php _e('Reports') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
@@ -53,39 +53,39 @@
 					<li<?php if ($page == 'options') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo Url::get('admin/options/') ?>"><?php _e('Options') ?></a></li>
+        ?>><a href="<?php echo $feather->urlFor('adminOptions') ?>"><?php _e('Options') ?></a></li>
 					<li<?php if ($page == 'permissions') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo Url::get('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
+        ?>><a href="<?php echo $feather->urlFor('adminPermissions') ?>"><?php _e('Permissions') ?></a></li>
 					<li<?php if ($page == 'categories') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo Url::get('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
+        ?>><a href="<?php echo $feather->urlFor('adminCategories') ?>"><?php _e('Categories') ?></a></li>
 					<li<?php if ($page == 'forums') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo Url::get('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
+        ?>><a href="<?php echo $feather->urlFor('adminForums') ?>"><?php _e('Forums') ?></a></li>
 					<li<?php if ($page == 'groups') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo Url::get('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
+        ?>><a href="<?php echo $feather->urlFor('adminGroups') ?>"><?php _e('User groups') ?></a></li>
 					<li<?php if ($page == 'plugins') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo Url::get('admin/plugins/') ?>"><?= 'Plugins'; ?></a></li>
+        ?>><a href="<?php echo $feather->urlFor('adminPlugins') ?>"><?= 'Plugins'; ?></a></li>
 					<li<?php if ($page == 'censoring') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo Url::get('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
+        ?>><a href="<?php echo $feather->urlFor('adminCensoring') ?>"><?php _e('Censoring') ?></a></li>
 					<li<?php if ($page == 'parser') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo Url::get('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
+        ?>><a href="<?php echo $feather->urlFor('adminParser') ?>"><?php _e('Parser') ?></a></li>
 					<li<?php if ($page == 'maintenance') {
     echo ' class="isactive"';
 }
-        ?>><a href="<?php echo Url::get('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
+        ?>><a href="<?php echo $feather->urlFor('adminMaintenance') ?>"><?php _e('Maintenance') ?></a></li>
 				</ul>
 			</div>
 		</div>
diff --git a/style/themes/FeatherBB/view/admin/options.php b/style/themes/FeatherBB/view/admin/options.php
index 3d9fcca4..ab110c2f 100644
--- a/style/themes/FeatherBB/view/admin/options.php
+++ b/style/themes/FeatherBB/view/admin/options.php
@@ -20,7 +20,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Options head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo Url::get('admin/options/') ?>">
+			<form method="post" action="<?php echo $feather->urlFor('adminOptions') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
diff --git a/style/themes/FeatherBB/view/admin/parser.php b/style/themes/FeatherBB/view/admin/parser.php
index 06b1614f..5d69da79 100644
--- a/style/themes/FeatherBB/view/admin/parser.php
+++ b/style/themes/FeatherBB/view/admin/parser.php
@@ -19,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php echo $lang_admin_parser['Parser head'] ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo Url::get('admin/parser/') ?>" enctype="multipart/form-data">
+			<form method="post" action="<?php echo $feather->urlFor('adminParser') ?>" enctype="multipart/form-data">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop">
 					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
diff --git a/style/themes/FeatherBB/view/admin/permissions.php b/style/themes/FeatherBB/view/admin/permissions.php
index 332398dc..9c08fbf3 100644
--- a/style/themes/FeatherBB/view/admin/permissions.php
+++ b/style/themes/FeatherBB/view/admin/permissions.php
@@ -18,7 +18,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Permissions head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?php echo Url::get('admin/permissions/') ?>">
+			<form method="post" action="<?php echo $feather->urlFor('adminPermissions') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 				<div class="inform">
diff --git a/style/themes/FeatherBB/view/admin/reports.php b/style/themes/FeatherBB/view/admin/reports.php
index 6f07c6df..b939c820 100644
--- a/style/themes/FeatherBB/view/admin/reports.php
+++ b/style/themes/FeatherBB/view/admin/reports.php
@@ -19,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('New reports head') ?></span></h2>
 		<div class="box">
-			<form method="post" action="<?= Url::get('admin/reports/') ?>">
+			<form method="post" action="<?= $feather->urlFor('adminReports') ?>">
 				<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
 <?php
 if (!empty($report_data)) {
diff --git a/style/themes/FeatherBB/view/admin/users/admin_users.php b/style/themes/FeatherBB/view/admin/users/admin_users.php
index 5c3200a9..95cd18d1 100644
--- a/style/themes/FeatherBB/view/admin/users/admin_users.php
+++ b/style/themes/FeatherBB/view/admin/users/admin_users.php
@@ -18,7 +18,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('User search head') ?></span></h2>
 		<div class="box">
-			<form id="find_user" method="get" action="<?php echo Url::get('admin/users/') ?>">
+			<form id="find_user" method="get" action="<?php echo $feather->urlFor('adminUsers') ?>">
 				<p class="submittop"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="1" /></p>
 				<div class="inform">
 					<fieldset>
@@ -152,7 +152,7 @@
 
 		<h2 class="block2"><span><?php _e('IP search head') ?></span></h2>
 		<div class="box">
-			<form method="get" action="<?php echo Url::get('admin/users/') ?>">
+			<form method="get" action="<?php echo $feather->urlFor('adminUsers') ?>">
 				<div class="inform">
 					<fieldset>
 						<legend><?php _e('IP search subhead') ?></legend>
diff --git a/style/themes/FeatherBB/view/admin/users/find_users.php b/style/themes/FeatherBB/view/admin/users/find_users.php
index 5056124d..2c21c47d 100644
--- a/style/themes/FeatherBB/view/admin/users/find_users.php
+++ b/style/themes/FeatherBB/view/admin/users/find_users.php
@@ -20,7 +20,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('adminUsers') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -31,7 +31,7 @@
 </div>
 
 
-<form id="search-users-form" action="<?php echo Url::get('admin/users/') ?>" method="post">
+<form id="search-users-form" action="<?php echo $feather->urlFor('adminUsers') ?>" method="post">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <div id="users2" class="blocktable">
 	<h2><span><?php _e('Results head') ?></span></h2>
@@ -94,7 +94,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('adminUsers') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/themes/FeatherBB/view/admin/users/move_users.php b/style/themes/FeatherBB/view/admin/users/move_users.php
index 0f23e353..29192afe 100644
--- a/style/themes/FeatherBB/view/admin/users/move_users.php
+++ b/style/themes/FeatherBB/view/admin/users/move_users.php
@@ -19,7 +19,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Move users') ?></span></h2>
 		<div class="box">
-			<form name="confirm_move_users" method="post" action="<?php echo Url::get('admin/users/') ?>">
+			<form name="confirm_move_users" method="post" action="<?php echo $feather->urlFor('adminUsers') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
 				<div class="inform">
diff --git a/style/themes/FeatherBB/view/admin/users/search_ip.php b/style/themes/FeatherBB/view/admin/users/search_ip.php
index 885ef9c7..17b4d3e6 100644
--- a/style/themes/FeatherBB/view/admin/users/search_ip.php
+++ b/style/themes/FeatherBB/view/admin/users/search_ip.php
@@ -19,8 +19,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo Url::get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->urlFor('adminIndex') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('adminUsers') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -73,8 +73,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo Url::get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->urlFor('adminIndex') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('adminUsers') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/themes/FeatherBB/view/admin/users/show_users.php b/style/themes/FeatherBB/view/admin/users/show_users.php
index 56c7b933..f05232e3 100644
--- a/style/themes/FeatherBB/view/admin/users/show_users.php
+++ b/style/themes/FeatherBB/view/admin/users/show_users.php
@@ -19,8 +19,8 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo Url::get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->urlFor('adminIndex') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('adminUsers') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -94,8 +94,8 @@
 			<p class="pagelink"><?php echo $paging_links ?></p>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo Url::get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><a href="<?php echo $feather->urlFor('adminIndex') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('adminUsers') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/themes/FeatherBB/view/header.php b/style/themes/FeatherBB/view/header.php
index c71f7fa2..ec83e837 100644
--- a/style/themes/FeatherBB/view/header.php
+++ b/style/themes/FeatherBB/view/header.php
@@ -130,7 +130,7 @@ function process_form(the_form)
     echo "\t\t\t\t\t\t".'<li id="navprofile"'.(($active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.Url::get('user/'.$feather->user->id.'/').'">'.__('Profile').'</a></li>'."\n";
 
     if ($feather->user->is_admmod) {
-        echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.Url::get('admin/').'">'.__('Admin').'</a></li>'."\n";
+        echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.$feather->urlFor('adminIndex').'">'.__('Admin').'</a></li>'."\n";
     }
 
     echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.Url::get('auth/logout/token/'.Random::hash($feather->user->id.Random::hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
@@ -181,12 +181,12 @@ function process_form(the_form)
     if ($feather->user->is_admmod) {
         if ($feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2') {
             if ($has_reports) {
-                echo "\t\t\t\t\t\t".'<li class="reportlink"><span><strong><a href="'.Url::get('admin/reports/').'">'.__('New reports').'</a></strong></span></li>'."\n";
+                echo "\t\t\t\t\t\t".'<li class="reportlink"><span><strong><a href="'.$feather->urlFor('adminReports').'">'.__('New reports').'</a></strong></span></li>'."\n";
             }
         }
 
         if ($feather->forum_settings['o_maintenance'] == '1') {
-            echo "\t\t\t\t\t\t".'<li class="maintenancelink"><span><strong><a href="'.Url::get('admin/maintenance/').'">'.__('Maintenance mode enabled').'</a></strong></span></li>'."\n";
+            echo "\t\t\t\t\t\t".'<li class="maintenancelink"><span><strong><a href="'.$feather->urlFor('adminMaintenance').'">'.__('Maintenance mode enabled').'</a></strong></span></li>'."\n";
         }
     }
     echo "\t\t\t\t\t".'</ul>'."\n";
diff --git a/view/admin/index.php b/view/admin/index.php
index c836ab4a..0dce299c 100644
--- a/view/admin/index.php
+++ b/view/admin/index.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
     exit;
@@ -32,13 +32,6 @@
 			</div>
 		</div>
 
-<?php if ($install_file_exists) : ?>
-		<h2 class="block2"><span><?php _e('Alerts head') ?></span></h2>
-		<div id="adalerts" class="box">
-			<p><?php printf(__('Install file exists'), '<a href="'.$feather->url->get('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
-		</div>
-<?php endif; ?>
-
 		<h2 class="block2"><span><?php _e('About head') ?></span></h2>
 		<div id="adstats" class="box">
 			<div class="inbox">
@@ -60,4 +53,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/admin/options.php b/view/admin/options.php
index 997c73a0..9a65cab3 100644
--- a/view/admin/options.php
+++ b/view/admin/options.php
@@ -20,7 +20,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Options head') ?></span></h2>
 	<div class="box">
-		<form method="post" action="<?php echo Url::get('admin/options/') ?>">
+		<form method="post" action="<?php echo $feather->urlFor('adminOptions') ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
 			<div class="inform">

From e83d76bc5dcbe1388d2439f5135a875b9738acee Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 7 Sep 2015 12:27:20 +0200
Subject: [PATCH 338/353] More urlFor in view

---
 featherbb/Controller/Admin/Plugins.php        | 16 +++++------
 featherbb/routes.php                          | 10 ++++---
 style/themes/FeatherBB/view/admin/menu.php    |  2 +-
 style/themes/FeatherBB/view/admin/options.php |  2 +-
 style/themes/FeatherBB/view/admin/plugins.php |  4 +--
 style/themes/FeatherBB/view/admin/reports.php | 27 ++++++++++++-------
 .../FeatherBB/view/admin/statistics.php       |  4 +--
 .../FeatherBB/view/admin/users/ban_users.php  |  4 +--
 .../view/admin/users/delete_users.php         |  4 +--
 .../FeatherBB/view/admin/users/find_users.php |  8 +++---
 .../FeatherBB/view/admin/users/search_ip.php  |  6 ++---
 .../FeatherBB/view/admin/users/show_users.php |  6 ++---
 style/themes/FeatherBB/view/delete.php        |  2 +-
 style/themes/FeatherBB/view/edit.php          | 14 +++++-----
 style/themes/FeatherBB/view/footer.php        | 18 ++++++-------
 style/themes/FeatherBB/view/forum.php         |  4 +--
 style/themes/FeatherBB/view/header.php        | 22 +++++++--------
 style/themes/FeatherBB/view/help.php          | 18 ++++++-------
 style/themes/FeatherBB/view/login/form.php    |  4 +--
 .../view/login/password_forgotten.php         |  2 +-
 style/themes/FeatherBB/view/misc/email.php    |  2 +-
 style/themes/FeatherBB/view/misc/report.php   |  4 +--
 .../view/moderate/moderator_forum.php         | 10 +++----
 .../FeatherBB/view/moderate/posts_view.php    |  8 +++---
 style/themes/FeatherBB/view/post.php          | 13 ++++-----
 .../FeatherBB/view/profile/change_mail.php    |  4 +--
 .../FeatherBB/view/profile/change_pass.php    |  4 +--
 .../FeatherBB/view/profile/delete_user.php    |  4 +--
 style/themes/FeatherBB/view/profile/menu.php  | 14 +++++-----
 .../FeatherBB/view/profile/section_admin.php  |  6 ++---
 .../view/profile/section_display.php          |  2 +-
 .../view/profile/section_essentials.php       |  6 ++---
 view/admin/options.php                        |  2 +-
 33 files changed, 134 insertions(+), 122 deletions(-)

diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
index cede2d7d..288c4078 100644
--- a/featherbb/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -49,27 +49,27 @@ public function index()
         )->addTemplate('admin/plugins.php')->display();
     }
 
-    public function activate()
+    public function activate($pluginName = null)
     {
         // The plugin to load should be supplied via GET
-        $class = $this->request->get('plugin') ? $this->request->get('plugin') : null;
-        if (!$class) {
+        // $pluginName = $this->request->get('plugin') ? $this->request->get('plugin') : null;
+        if (!$pluginName) {
             throw new Error(__('Bad request'), 400);
         }
 
         // Check if plugin follows PSR-4 conventions and extends base forum plugin
-        if (!class_exists($class) || !property_exists($class, 'isValidFBPlugin')) {
-            throw new Error(sprintf(__('No plugin message'), Utils::escape($class)), 400);
+        if (!class_exists($pluginName) || !property_exists($pluginName, 'isValidFBPlugin')) {
+            throw new Error(sprintf(__('No plugin message'), Utils::escape($pluginName)), 400);
         }
 
-        $plugin = new $class;
+        $plugin = new $pluginName;
         try {
-            $plugin->activate($class);
+            $plugin->activate($pluginName);
         } catch (\Exception $e) {
             Url::redirect($this->feather->urlFor('adminPlugins'), $e->getMessage());
         }
         // Plugin has been activated, confirm and redirect
-        Url::redirect($this->feather->urlFor('adminPlugins'), 'Plugin "'.$class::$name.'" activated!');
+        Url::redirect($this->feather->urlFor('adminPlugins'), 'Plugin "'.$pluginName::$name.'" activated!');
     }
 
     public function deactivate()
diff --git a/featherbb/routes.php b/featherbb/routes.php
index 90c22cc3..ddc68510 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -117,11 +117,12 @@
 
 // Moderate routes
 $feather->group('/moderate', $isAdmmod, $canReadBoard, function() use ($feather) {
-    $feather->get('/forum/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\Moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('moderateForum');
+    $feather->get('/forum/:id(/)', '\FeatherBB\Controller\Moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('moderateForum');
+    $feather->get('/forum/:id(/page/:page)(/)', '\FeatherBB\Controller\Moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('moderateForumPage');
     $feather->get('/get-host/post/:pid(/)', '\FeatherBB\Controller\Moderate:gethostpost')->conditions(array('pid' => '[0-9]+'))->name('getHostPost');
     $feather->get('/get-host/ip/:ip(/)', '\FeatherBB\Controller\Moderate:gethostip')->name('getHostIp');
     $feather->map('/topic/:id/forum/:fid/action/:action(/param/:param)(/)', '\FeatherBB\Controller\Moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST')->name('moderateTopic');
-    $feather->map('/topic/:id/forum/:fid/action/:action(/page/:param)(/)', '\FeatherBB\Controller\Moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST')->name('moderateTopicPage');
+    $feather->map('/topic/:id/forum/:fid/action/:action(/page/:page)(/)', '\FeatherBB\Controller\Moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'page' => '[0-9]+'))->via('GET', 'POST')->name('moderateTopicPage');
     $feather->post('/forum/:fid(/page/:page)(/)', '\FeatherBB\Controller\Moderate:dealposts')->conditions(array('fid' => '[0-9]+', 'page' => '[0-9]+'))->name('dealPosts');
 });
 
@@ -192,8 +193,9 @@
     // Admin plugins
     $feather->group('/plugins', function() use ($feather) {
         $feather->map('/(/)', '\FeatherBB\Controller\Admin\Plugins:index')->via('GET', 'POST')->name('adminPlugins');
-        $feather->map('/activate(/)', '\FeatherBB\Controller\Admin\Plugins:activate')->via('GET')->name('activatePlugin');
-        $feather->map('/deactivate(/)', '\FeatherBB\Controller\Admin\Plugins:deactivate')->via('GET')->name('deactivatePlugin');
+        $feather->map('/:name(/)', '\FeatherBB\Controller\Admin\Plugins:index')->via('GET', 'POST')->name('infoPlugin');
+        $feather->map('/activate/:name(/)', '\FeatherBB\Controller\Admin\Plugins:activate')->via('GET')->name('activatePlugin');
+        $feather->map('/deactivate/:name(/)', '\FeatherBB\Controller\Admin\Plugins:deactivate')->via('GET')->name('deactivatePlugin');
         // $feather->map('/loader(/)', '\FeatherBB\Controller\Admin\Plugins:display')->via('GET', 'POST');
     });
 
diff --git a/style/themes/FeatherBB/view/admin/menu.php b/style/themes/FeatherBB/view/admin/menu.php
index a049613f..8819d59b 100644
--- a/style/themes/FeatherBB/view/admin/menu.php
+++ b/style/themes/FeatherBB/view/admin/menu.php
@@ -103,7 +103,7 @@
 <?php
 
         foreach ($plugins as $plugin_name => $plugin) {
-            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.Url::get('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
+            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.$feather->urlFor('infoPlugin', ['name' => $plugin_name]).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
         }
 
         ?>
diff --git a/style/themes/FeatherBB/view/admin/options.php b/style/themes/FeatherBB/view/admin/options.php
index ab110c2f..6ff75535 100644
--- a/style/themes/FeatherBB/view/admin/options.php
+++ b/style/themes/FeatherBB/view/admin/options.php
@@ -416,7 +416,7 @@
 										<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
     echo ' checked="checked"';
 } ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.Url::get('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
+										<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.$feather->urlFor('adminCensoring').'">'.__('Censoring').'</a>') ?></span>
 									</td>
 								</tr>
 								<tr>
diff --git a/style/themes/FeatherBB/view/admin/plugins.php b/style/themes/FeatherBB/view/admin/plugins.php
index 36a6cffc..5b0cce67 100644
--- a/style/themes/FeatherBB/view/admin/plugins.php
+++ b/style/themes/FeatherBB/view/admin/plugins.php
@@ -48,9 +48,9 @@
                                 <strong><?= $class::$name; ?></strong>
                                 <div class="plugin-actions">
                                     <?php if (array_key_exists($class, $activePlugins)) { ?>
-                                        <a href="<?= Url::get('/admin/plugins/deactivate?plugin='.$class) ?>">Deactivate</a>
+                                        <a href="<?= $feather->urlFor('deactivatePlugin', ['name' => $class]) ?>">Deactivate</a>
                                     <?php } else { ?>
-                                        <a href="<?= Url::get('/admin/plugins/activate?plugin='.$class) ?>">Activate</a>
+                                        <a href="<?= $feather->urlFor('activatePlugin', ['name' => $class]) ?>">Activate</a>
                                     <?php } ?>
                                 </div>
                             </td>
diff --git a/style/themes/FeatherBB/view/admin/reports.php b/style/themes/FeatherBB/view/admin/reports.php
index b939c820..7bebced8 100644
--- a/style/themes/FeatherBB/view/admin/reports.php
+++ b/style/themes/FeatherBB/view/admin/reports.php
@@ -9,6 +9,7 @@
 
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Utils;
+use FeatherBB\Core\AdminUtils;
 
 // Make sure no one attempts to run this script "directly"
 if (!defined('FEATHER')) {
@@ -31,10 +32,14 @@
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.Url::get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => Url::get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => Url::get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => $feather->urlFor('viewPost', ['pid' => $report['pid']]).'#p'.$report['pid'])) ?></td>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->urlFor('userProfile', ['id' => $report['reported_by']]).'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location">
+                                        <?= AdminUtils::breadcrumbs_admin(array(
+                                            $report['forum_name'] => $feather->urlFor('Forum', ['id' => $report['forum_id'], 'name' => Url::url_friendly($report['forum_name'])]),
+											$report['subject'] => $feather->urlFor('Forum', ['id' => $report['topic_id'], 'name' => Url::url_friendly($report['subject'])]),
+											sprintf(__('Post ID'), $report['pid']) => $feather->urlFor('viewPost', ['pid' => $report['pid']]).'#p'.$report['pid']
+                                        )); ?>
+                                    </td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?= $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
@@ -77,14 +82,18 @@
         ?>
 				<div class="inform">
 					<fieldset>
-						<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.Url::get('user/'.$report['zapped_by_id'].'/').'">'.Utils::escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
+						<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->urlFor('userProfile', ['id' => $report['zapped_by_id']]).'">'.Utils::escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
 						<div class="infldset">
 							<table class="aligntop">
 								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.Url::get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => Url::get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => Url::get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => $feather->urlFor('viewPost', ['pid' => $report['pid']]).'#p'.$report['pid'])) ?></td>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->urlFor('userProfile', ['id' => $report['reported_by']]).'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location">
+                                        <?= AdminUtils::breadcrumbs_admin(array(
+                                            $report['forum_name'] => $feather->urlFor('Forum', ['id' => $report['forum_id'], 'name' => Url::url_friendly($report['forum_name'])]),
+											$report['subject'] => $feather->urlFor('Forum', ['id' => $report['topic_id'], 'name' => Url::url_friendly($report['subject'])]),
+											sprintf(__('Post ID'), $report['pid']) => $feather->urlFor('viewPost', ['pid' => $report['pid']]).'#p'.$report['pid']
+                                        )) ?>
+                                    </td>
 								</tr>
 								<tr>
 									<th scope="row"><?php _e('Reason') ?></th>
diff --git a/style/themes/FeatherBB/view/admin/statistics.php b/style/themes/FeatherBB/view/admin/statistics.php
index be364194..d8b24bb5 100644
--- a/style/themes/FeatherBB/view/admin/statistics.php
+++ b/style/themes/FeatherBB/view/admin/statistics.php
@@ -28,7 +28,7 @@
 <?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
 					<dd>
 						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
-						<?php printf(__('Environment data version'), phpversion(), '<a href="'.Url::get('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
+						<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->urlFor('phpinfo').'">'.__('Show info').'</a>') ?><br />
 						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
 					</dd>
 					<dt><?php _e('Database label') ?></dt>
@@ -42,4 +42,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/admin/users/ban_users.php b/style/themes/FeatherBB/view/admin/users/ban_users.php
index 9fbd36d7..935ff1fb 100644
--- a/style/themes/FeatherBB/view/admin/users/ban_users.php
+++ b/style/themes/FeatherBB/view/admin/users/ban_users.php
@@ -18,7 +18,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Ban users') ?></span></h2>
 		<div class="box">
-			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo Url::get('admin/users') ?>">
+			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo $feather->urlFor('adminUsers') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
@@ -57,4 +57,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/admin/users/delete_users.php b/style/themes/FeatherBB/view/admin/users/delete_users.php
index 7591e22b..bdb8a8ab 100644
--- a/style/themes/FeatherBB/view/admin/users/delete_users.php
+++ b/style/themes/FeatherBB/view/admin/users/delete_users.php
@@ -18,7 +18,7 @@
 	<div class="blockform">
 		<h2><span><?php _e('Delete users') ?></span></h2>
 		<div class="box">
-			<form name="confirm_del_users" method="post" action="<?php echo Url::get('admin/users') ?>">
+			<form name="confirm_del_users" method="post" action="<?php echo $feather->urlFor('adminUsers') ?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
 				<div class="inform">
@@ -38,4 +38,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/admin/users/find_users.php b/style/themes/FeatherBB/view/admin/users/find_users.php
index 2c21c47d..4e1f53fe 100644
--- a/style/themes/FeatherBB/view/admin/users/find_users.php
+++ b/style/themes/FeatherBB/view/admin/users/find_users.php
@@ -19,7 +19,7 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo Url::get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><a href="<?php echo $feather->urlFor('adminIndex') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('adminUsers') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
@@ -57,12 +57,12 @@
         foreach ($user_data as $user) {
             ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.Url::get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->urlFor('userProfile', ['id' => $user['id']]).'">'.Utils::escape($user['username']).'</a>' ?></td>
 					<td class="tc2"><a href="mailto:<?php echo Utils::escape($user['email']) ?>"><?php echo Utils::escape($user['email']) ?></a></td>
 					<td class="tc3"><?php echo $user['user_title'] ?></td>
 					<td class="tc4"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
 					<td class="tc5"><?php echo($user['admin_note'] != '') ? Utils::escape($user['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.Url::get('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.Url::get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->urlFor('usersIpStats', ['id' => $user['id']]).'">'.__('Results view IP link').'</a> | <a href="'.$feather->urlFor('search').'?action=show_user_posts&amp;user_id='.$user['id'].'">'.__('Results show posts link').'</a>' ?></td>
 <?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
 <?php endif;
             ?>
@@ -93,7 +93,7 @@
     ?>
 		</div>
 		<ul class="crumbs">
-			<li><a href="<?php echo Url::get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><a href="<?php echo $feather->urlFor('adminIndex') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('adminUsers') ?>"><?php _e('Users') ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
 		</ul>
diff --git a/style/themes/FeatherBB/view/admin/users/search_ip.php b/style/themes/FeatherBB/view/admin/users/search_ip.php
index 17b4d3e6..50be8522 100644
--- a/style/themes/FeatherBB/view/admin/users/search_ip.php
+++ b/style/themes/FeatherBB/view/admin/users/search_ip.php
@@ -48,10 +48,10 @@
         foreach ($ip_data as $ip) {
             ?>
 				<tr>
-					<td class="tcl"><a href="<?php echo Url::get('moderate/get-host/ip/'.Utils::escape($ip['poster_ip']).'/') ?>"><?php echo Utils::escape($ip['poster_ip']) ?></a></td>
+					<td class="tcl"><a href="<?php echo $feather->urlFor('getHostIp', ['ip' => Utils::escape($ip['poster_ip'])]) ?>"><?php echo Utils::escape($ip['poster_ip']) ?></a></td>
 					<td class="tc2"><?php echo $feather->utils->format_time($ip['last_used']) ?></td>
 					<td class="tc3"><?php echo $ip['used_times'] ?></td>
-					<td class="tcr"><a href="<?php echo Url::get('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
+					<td class="tcr"><a href="<?php echo $feather->urlFor('usersIpShow', ['id' => $ip['poster_ip']]) ?>"><?php _e('Results find more link') ?></a></td>
 				</tr>
 <?php
 
@@ -79,4 +79,4 @@
 		</ul>
 		<div class="clearer"></div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/admin/users/show_users.php b/style/themes/FeatherBB/view/admin/users/show_users.php
index f05232e3..4d04e7a4 100644
--- a/style/themes/FeatherBB/view/admin/users/show_users.php
+++ b/style/themes/FeatherBB/view/admin/users/show_users.php
@@ -54,12 +54,12 @@
             if (isset($info['user_data'][$cur_poster['poster_id']])) {
                 ?>
 				<tr>
-					<td class="tcl"><?php echo '<a href="'.Url::get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.Utils::escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
+					<td class="tcl"><?php echo '<a href="'.$feather->urlFor('userProfile', ['id' => $info['user_data'][$cur_poster['poster_id']]['id']]).'">'.Utils::escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
 					<td class="tc2"><a href="mailto:<?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
 					<td class="tc3"><?php echo Utils::get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
 					<td class="tc4"><?php echo Utils::forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
 					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? Utils::escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.Url::get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.Url::get('search/?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results show posts link').'</a>' ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->urlFor('usersIpStats', ['id' => $info['user_data'][$cur_poster['poster_id']]['id']]).'">'.__('Results view IP link').'</a> | <a href="'.$feather->urlFor('search').'?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
 				</tr>
 <?php
 
@@ -100,4 +100,4 @@
 		</ul>
 		<div class="clearer"></div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/delete.php b/style/themes/FeatherBB/view/delete.php
index d7701783..929490d5 100644
--- a/style/themes/FeatherBB/view/delete.php
+++ b/style/themes/FeatherBB/view/delete.php
@@ -20,7 +20,7 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?= Url::base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?= Url::get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?= Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?= $feather->urlFor('Forum', ['id' => $cur_post['fid'], 'name' => Url::url_friendly($cur_post['forum_name'])]) ?>"><?= Utils::escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?= $feather->urlFor('viewPost', ['pid' => $id]).'#p'.$id ?>"><?= Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
diff --git a/style/themes/FeatherBB/view/edit.php b/style/themes/FeatherBB/view/edit.php
index 808ac750..d6812466 100644
--- a/style/themes/FeatherBB/view/edit.php
+++ b/style/themes/FeatherBB/view/edit.php
@@ -23,8 +23,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('Forum', ['id' => $cur_post['fid'], 'name' => Url::url_friendly($cur_post['forum_name'])]) ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('Topic', ['id' => $cur_post['tid'], 'name' => Url::url_friendly($cur_post['subject'])]) ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
 		</ul>
 	</div>
@@ -79,7 +79,7 @@
 <div id="editform" class="blockform">
 	<h2><span><?php _e('Edit post') ?></span></h2>
 	<div class="box">
-		<form id="edit" method="post" action="<?php echo Url::get('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
+		<form id="edit" method="post" action="<?php echo $feather->urlFor('editPost', ['id' => $id]) ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -92,10 +92,10 @@
 						<script>postEditorToolbar('req_message');</script>
                         <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo Utils::escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo Url::get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo Url::get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo Url::get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo Url::get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->urlFor('help').'#bbcode' ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->urlFor('help').'#url' ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->urlFor('help').'#img' ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->urlFor('help').'#smilies' ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/style/themes/FeatherBB/view/footer.php b/style/themes/FeatherBB/view/footer.php
index 5e741a0b..990aa54a 100644
--- a/style/themes/FeatherBB/view/footer.php
+++ b/style/themes/FeatherBB/view/footer.php
@@ -29,13 +29,13 @@
     if ($active_page == 'Forum') {
         echo "\t\t\t".'<dl>'."\n";
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/forum/'.$fid.'/page/'.$page_number.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->urlFor('moderateForum', ['id' => $fid, 'page' => $page_number]).'">'.__('Moderate forum').'</a></span></dd>'."\n";
         echo "\t\t\t".'</dl>'."\n";
     } elseif ($active_page == 'Topic') {
         if (isset($pid)) {
-            $parameter = 'param/'.$pid.'/';
+            $parameter = $pid;
         } elseif (isset($page_number) && $page_number != 1) {
-            $parameter = 'param/'.$page_number.'/';
+            $parameter = $page_number;
         } else {
             $parameter = '';
         }
@@ -45,19 +45,19 @@
         echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
         // TODO: all
         //echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.Url::get('moderate/topic/'.$id.'/forum/'.$fid.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/moderate/page/'.$page_number.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->urlFor('moderateTopicPage', ['id' => $tid, 'fid' => $fid, 'action' => 'moderate', 'page' => $page_number]).'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.$feather->urlFor('moderateTopic', ['id' => $tid, 'fid' => $fid, 'action' => 'move', 'param' => $parameter]).'">'.__('Move topic').'</a></span></dd>'."\n";
 
         if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->urlFor('moderateTopic', ['id' => $tid, 'fid' => $fid, 'action' => 'open', 'param' => $parameter]).'">'.__('Open topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->urlFor('moderateTopic', ['id' => $tid, 'fid' => $fid, 'action' => 'close', 'param' => $parameter]).'">'.__('Close topic').'</a></span></dd>'."\n";
         }
 
         if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->urlFor('moderateTopic', ['id' => $tid, 'fid' => $fid, 'action' => 'unstick', 'param' => $parameter]).'">'.__('Unstick topic').'</a></span></dd>'."\n";
         } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.Url::get('moderate/topic/'.$tid.'/forum/'.$fid.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+            echo "\t\t\t\t".'<dd><span><a href="'.$feather->urlFor('moderateTopic', ['id' => $tid, 'fid' => $fid, 'action' => 'stick', 'param' => $parameter]).'">'.__('Stick topic').'</a></span></dd>'."\n";
         }
 
         echo "\t\t\t".'</dl>'."\n";
diff --git a/style/themes/FeatherBB/view/forum.php b/style/themes/FeatherBB/view/forum.php
index d054b873..38ebaf72 100644
--- a/style/themes/FeatherBB/view/forum.php
+++ b/style/themes/FeatherBB/view/forum.php
@@ -20,7 +20,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php Url::get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->urlFor('Forum', ['id' => $id, 'name' => $url_forum]) ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -95,7 +95,7 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php Url::get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->urlFor('Forum', ['id' => $id, 'name' => $url_forum]) ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
 		</ul>
 <?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
 		<div class="clearer"></div>
diff --git a/style/themes/FeatherBB/view/header.php b/style/themes/FeatherBB/view/header.php
index ec83e837..a4a7e1a2 100644
--- a/style/themes/FeatherBB/view/header.php
+++ b/style/themes/FeatherBB/view/header.php
@@ -112,28 +112,28 @@ function process_form(the_form)
 echo "\t\t\t\t\t\t".'<li id="navindex"'.(($active_page == 'index') ? ' class="isactive"' : '').'><a href="'.Url::base().'/">'.__('Index').'</a></li>'."\n";
 
 if ($feather->user->g_read_board == '1' && $feather->user->g_view_users == '1') {
-    echo "\t\t\t\t\t\t".'<li id="navuserlist"'.(($active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.Url::get('userlist/').'">'.__('User list').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navuserlist"'.(($active_page == 'userlist') ? ' class="isactive"' : '').'><a href="'.$feather->urlFor('userList').'">'.__('User list').'</a></li>'."\n";
 }
 
 if ($feather->forum_settings['o_rules'] == '1' && (!$feather->user->is_guest || $feather->user->g_read_board == '1' || $feather->forum_settings['o_regs_allow'] == '1')) {
-    echo "\t\t\t\t\t\t".'<li id="navrules"'.(($active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.Url::get('rules/').'">'.__('Rules').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navrules"'.(($active_page == 'rules') ? ' class="isactive"' : '').'><a href="'.$feather->urlFor('rules').'">'.__('Rules').'</a></li>'."\n";
 }
 
 if ($feather->user->g_read_board == '1' && $feather->user->g_search == '1') {
-    echo "\t\t\t\t\t\t".'<li id="navsearch"'.(($active_page == 'search') ? ' class="isactive"' : '').'><a href="'.Url::get('search/').'">'.__('Search').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navsearch"'.(($active_page == 'search') ? ' class="isactive"' : '').'><a href="'.$feather->urlFor('search').'">'.__('Search').'</a></li>'."\n";
 }
 
 if ($feather->user->is_guest) {
-    echo "\t\t\t\t\t\t".'<li id="navregister"'.(($active_page == 'register') ? ' class="isactive"' : '').'><a href="'.Url::get('register/').'">'.__('Register').'</a></li>'."\n";
-    echo "\t\t\t\t\t\t".'<li id="navlogin"'.(($active_page == 'login') ? ' class="isactive"' : '').'><a href="'.Url::get('auth/login/').'">'.__('Login').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navregister"'.(($active_page == 'register') ? ' class="isactive"' : '').'><a href="'.$feather->urlFor('register').'">'.__('Register').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogin"'.(($active_page == 'login') ? ' class="isactive"' : '').'><a href="'.$feather->urlFor('login').'">'.__('Login').'</a></li>'."\n";
 } else {
-    echo "\t\t\t\t\t\t".'<li id="navprofile"'.(($active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.Url::get('user/'.$feather->user->id.'/').'">'.__('Profile').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navprofile"'.(($active_page == 'profile') ? ' class="isactive"' : '').'><a href="'.$feather->urlFor('userProfile', ['id' => $feather->user->id]).'">'.__('Profile').'</a></li>'."\n";
 
     if ($feather->user->is_admmod) {
         echo "\t\t\t\t\t\t".'<li id="navadmin"'.(($active_page == 'admin') ? ' class="isactive"' : '').'><a href="'.$feather->urlFor('adminIndex').'">'.__('Admin').'</a></li>'."\n";
     }
 
-    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.Url::get('auth/logout/token/'.Random::hash($feather->user->id.Random::hash($feather->request->getIp()))).'/">'.__('Logout').'</a></li>'."\n";
+    echo "\t\t\t\t\t\t".'<li id="navlogout"><a href="'.$feather->urlFor('logout', ['token' => Random::hash($feather->user->id.Random::hash($feather->request->getIp()))]).'">'.__('Logout').'</a></li>'."\n";
 }
 
 // // Are there any additional navlinks we should insert into the array before imploding it?
@@ -196,11 +196,11 @@ function process_form(the_form)
     echo "\t\t\t\t\t".'<ul class="conr">'."\n";
     echo "\t\t\t\t\t\t".'<li><span>'.__('Topic searches').' ';
     if (!$feather->user->is_guest) {
-        echo '<a href="'.Url::get('search/show/replies/').'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a> | ';
-        echo '<a href="'.Url::get('search/show/new/').'" title="'.__('Show new posts').'">'.__('New posts header').'</a> | ';
+        echo '<a href="'.$feather->urlFor('quickSearch', ['show' => 'replies']).'" title="'.__('Show posted topics').'">'.__('Posted topics').'</a> | ';
+        echo '<a href="'.$feather->urlFor('quickSearch', ['show' => 'new']).'" title="'.__('Show new posts').'">'.__('New posts header').'</a> | ';
     }
-    echo '<a href="'.Url::get('search/show/recent/').'" title="'.__('Show active topics').'">'.__('Active topics').'</a> | ';
-    echo '<a href="'.Url::get('search/show/unanswered/').'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
+    echo '<a href="'.$feather->urlFor('quickSearch', ['show' => 'recent']).'" title="'.__('Show active topics').'">'.__('Active topics').'</a> | ';
+    echo '<a href="'.$feather->urlFor('quickSearch', ['show' => 'unanswered']).'" title="'.__('Show unanswered topics').'">'.__('Unanswered topics').'</a>';
     echo '</li>'."\n";
     echo "\t\t\t\t".'</ul>'."\n";
 } ?>
diff --git a/style/themes/FeatherBB/view/help.php b/style/themes/FeatherBB/view/help.php
index 3768c898..9feb774e 100644
--- a/style/themes/FeatherBB/view/help.php
+++ b/style/themes/FeatherBB/view/help.php
@@ -46,17 +46,17 @@
 		<p><?php _e('Links info') ?></p>
 		<p><a name="url"></a><code>[url=<?php echo Utils::escape(Url::base(true).'/') ?>]<?php echo Utils::escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape(Url::base(true).'/') ?>"><?php echo Utils::escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
 		<p><code>[url]<?php echo Utils::escape(Url::base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape(Url::base(true).'/') ?>"><?php echo Utils::escape(Url::base(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
+		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->urlFor('help') ?>"><?php _e('This help page') ?></a></samp></p>
 		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
 		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
-		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('topic/1/') ?>"><?php echo Url::get('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('post/1/#p1') ?>"><?php echo Url::get('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('forum/1/') ?>"><?php echo Url::get('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo Url::get('user/2/') ?>"><?php echo Url::get('user/2/') ?></a></samp></p>
+		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->urlFor('Topic', ['id' => '1']) ?>"><?php _e('Test topic') ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->urlFor('Topic', ['id' => '1']) ?>"><?php echo $feather->urlFor('Topic', ['id' => '1']) ?></a></samp></p>
+		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->urlFor('viewPost', ['pid' => '1']).'#1' ?>"><?php _e('Test post') ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->urlFor('viewPost', ['pid' => '1']).'#1' ?>"><?php echo $feather->urlFor('viewPost', ['pid' => '1']).'#1' ?></a></samp></p>
+		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->urlFor('Topic', ['id' => '1']) ?>"><?php _e('Test forum') ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->urlFor('Forum', ['id' => '1']) ?>"><?php echo $feather->urlFor('Forum', ['id' => '1']) ?></a></samp></p>
+		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->urlFor('userProfile', ['id' => '2']) ?>"><?php _e('Test user') ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->urlFor('userProfile', ['id' => '2']) ?>"><?php echo $feather->urlFor('userProfile', ['id' => '2']) ?></a></samp></p>
 	</div>
 	<div class="inbox">
 		<p><a name="img"></a><?php _e('Images info') ?></p>
diff --git a/style/themes/FeatherBB/view/login/form.php b/style/themes/FeatherBB/view/login/form.php
index 0a6bc9f7..e4d252cc 100644
--- a/style/themes/FeatherBB/view/login/form.php
+++ b/style/themes/FeatherBB/view/login/form.php
@@ -18,7 +18,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Login') ?></span></h2>
 	<div class="box">
-		<form id="login" method="post" action="<?php echo Url::get('auth/login') ?>" onsubmit="return process_form(this)">
+		<form id="login" method="post" action="<?php echo $feather->urlFor('login') ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -33,7 +33,7 @@
 						</div>
 
 						<p class="clearb"><?php _e('Login info') ?></p>
-						<p class="actions"><span><a href="<?php echo Url::get('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo Url::get('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
+						<p class="actions"><span><a href="<?php echo $feather->urlFor('register') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo $feather->urlFor('resetPassword') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
 					</div>
 				</fieldset>
 			</div>
diff --git a/style/themes/FeatherBB/view/login/password_forgotten.php b/style/themes/FeatherBB/view/login/password_forgotten.php
index d2981dff..36b78bc0 100644
--- a/style/themes/FeatherBB/view/login/password_forgotten.php
+++ b/style/themes/FeatherBB/view/login/password_forgotten.php
@@ -41,7 +41,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Request pass') ?></span></h2>
 	<div class="box">
-		<form id="request_pass" method="post" action="<?php echo Url::get('auth/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
+		<form id="request_pass" method="post" action="<?php echo $feather->urlFor('resetPassword') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/themes/FeatherBB/view/misc/email.php b/style/themes/FeatherBB/view/misc/email.php
index e2ed73e0..c373ff51 100644
--- a/style/themes/FeatherBB/view/misc/email.php
+++ b/style/themes/FeatherBB/view/misc/email.php
@@ -19,7 +19,7 @@
 <div id="emailform" class="blockform">
 	<h2><span><?php _e('Send email to') ?> <?php echo Utils::escape($mail['recipient']) ?></span></h2>
 	<div class="box">
-		<form id="email" method="post" action="<?php echo Url::get('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="email" method="post" action="<?php echo $feather->urlFor('email', ['id' => $id]) ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/themes/FeatherBB/view/misc/report.php b/style/themes/FeatherBB/view/misc/report.php
index 491c686e..6f7d1b36 100644
--- a/style/themes/FeatherBB/view/misc/report.php
+++ b/style/themes/FeatherBB/view/misc/report.php
@@ -20,7 +20,7 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('Forum', ['id' => $cur_post['fid'], 'name' => Url::url_friendly($cur_post['forum_name'])]) ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('viewPost', ['pid' => $id]).'#p'.$id ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
 		</ul>
@@ -30,7 +30,7 @@
 <div id="reportform" class="blockform">
 	<h2><span><?php _e('Report post') ?></span></h2>
 	<div class="box">
-		<form id="report" method="post" action="<?php echo Url::get('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="report" method="post" action="<?php echo $feather->urlFor('report', ['id' => $id]) ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/themes/FeatherBB/view/moderate/moderator_forum.php b/style/themes/FeatherBB/view/moderate/moderator_forum.php
index 1c8ee4b7..8f7130ac 100644
--- a/style/themes/FeatherBB/view/moderate/moderator_forum.php
+++ b/style/themes/FeatherBB/view/moderate/moderator_forum.php
@@ -21,7 +21,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('Forum', ['id' => $id, 'name' => $url_forum]) ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -31,7 +31,7 @@
 	</div>
 </div>
 
-<form method="post" action="<?php echo Url::get('moderate/forum/'.$id.'/') ?>">
+<form method="post" action="<?php echo $feather->urlFor('moderateForum', ['id' => $id]) ?>">
 <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 <input type="hidden" name="page" value="<?php echo Utils::escape($p) ?>" />
 <div id="vf" class="blocktable">
@@ -49,7 +49,7 @@
 				</tr>
 			</thead>
 			<tbody>
-			
+
 			<?php
             $topic_count = 0;
             $button_status = '';
@@ -95,10 +95,10 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('Forum', ['id' => $id, 'name' => $url_forum]) ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
 	</div>
 </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/style/themes/FeatherBB/view/moderate/posts_view.php b/style/themes/FeatherBB/view/moderate/posts_view.php
index 34a82221..0dee9a93 100644
--- a/style/themes/FeatherBB/view/moderate/posts_view.php
+++ b/style/themes/FeatherBB/view/moderate/posts_view.php
@@ -20,8 +20,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('Forum', ['id' => $fid, 'name' => $url_forum]) ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('Topic', ['id' => $id, 'name' => $url_topic]) ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="pagepost">
@@ -88,8 +88,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('Forum', ['id' => $fid, 'name' => $url_forum]) ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('Topic', ['id' => $id, 'name' => $url_topic]) ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
 		</ul>
 		<div class="clearer"></div>
diff --git a/style/themes/FeatherBB/view/post.php b/style/themes/FeatherBB/view/post.php
index 45b3a039..2c5eb63d 100644
--- a/style/themes/FeatherBB/view/post.php
+++ b/style/themes/FeatherBB/view/post.php
@@ -21,10 +21,10 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_posting['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('Forum', ['id' => $cur_posting['id'], 'name' => $url_forum]) ?>"><?php echo Utils::escape($cur_posting['forum_name']) ?></a></li>
 <?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo Utils::escape($feather->request->post('req_subject')) ?></li>
 <?php endif; ?>
-<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo Url::get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_posting['subject']) ?></a></li>
+<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('Topic', ['id' => $tid, 'name' => $url_topic]) ?>"><?php echo Utils::escape($cur_posting['subject']) ?></a></li>
 <?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
 		</ul>
 	</div>
@@ -122,10 +122,11 @@
                         <script>postEditorToolbar('req_message');</script>
 						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? Utils::linebreaks(Utils::trim(Utils::escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo Url::get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo Url::get('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo Url::get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo Url::get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+                            <li>ok</li>
+							<li><span><a href="<?php echo $feather->urlFor('help').'#bbcode' ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?>ok</a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->urlFor('help').'#url' ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->urlFor('help').'#img' ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->urlFor('help').'#smilies' ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/style/themes/FeatherBB/view/profile/change_mail.php b/style/themes/FeatherBB/view/profile/change_mail.php
index 065e6c9d..fa253247 100644
--- a/style/themes/FeatherBB/view/profile/change_mail.php
+++ b/style/themes/FeatherBB/view/profile/change_mail.php
@@ -18,7 +18,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Change email') ?></span></h2>
 	<div class="box">
-		<form id="change_email" method="post" action="<?php echo Url::get('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
+		<form id="change_email" method="post" action="<?php echo $feather->urlFor('profileAction', ['id' => $id, 'action' => 'change_email']) ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -34,4 +34,4 @@
 			<p class="buttons"><input type="submit" name="new_email" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/profile/change_pass.php b/style/themes/FeatherBB/view/profile/change_pass.php
index 7525ae62..413471e2 100644
--- a/style/themes/FeatherBB/view/profile/change_pass.php
+++ b/style/themes/FeatherBB/view/profile/change_pass.php
@@ -18,7 +18,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Change pass') ?></span></h2>
 	<div class="box">
-		<form id="change_pass" method="post" action="<?php echo Url::get('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
+		<form id="change_pass" method="post" action="<?php echo $feather->urlFor('profileAction', ['id' => $id, 'action' => 'change_pass']) ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
@@ -38,4 +38,4 @@
 			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/profile/delete_user.php b/style/themes/FeatherBB/view/profile/delete_user.php
index 91ca44a9..cc12bbf4 100644
--- a/style/themes/FeatherBB/view/profile/delete_user.php
+++ b/style/themes/FeatherBB/view/profile/delete_user.php
@@ -19,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Confirm delete user') ?></span></h2>
 	<div class="box">
-		<form id="confirm_del_user" method="post" action="<?php echo Url::get('user/'.$id.'/') ?>">
+		<form id="confirm_del_user" method="post" action="<?php echo $feather->urlFor('userProfile', ['id' => $id]) ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -36,4 +36,4 @@
 			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/profile/menu.php b/style/themes/FeatherBB/view/profile/menu.php
index 9150ead0..071db171 100644
--- a/style/themes/FeatherBB/view/profile/menu.php
+++ b/style/themes/FeatherBB/view/profile/menu.php
@@ -24,32 +24,32 @@
 					<li<?php if ($page == 'essentials') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo Url::get('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
+    ?>><a href="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'essentials']) ?>"><?php _e('Section essentials') ?></a></li>
 					<li<?php if ($page == 'personal') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo Url::get('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
+    ?>><a href="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'personal']) ?>"><?php _e('Section personal') ?></a></li>
 					<li<?php if ($page == 'messaging') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo Url::get('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
+    ?>><a href="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'messaging']) ?>"><?php _e('Section messaging') ?></a></li>
 <?php if ($feather->forum_settings['o_avatars'] == '1' || $feather->forum_settings['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo Url::get('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
+    ?>><a href="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'personality']) ?>"><?php _e('Section personality') ?></a></li>
 <?php endif;
     ?>					<li<?php if ($page == 'display') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo Url::get('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
+    ?>><a href="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'display']) ?>"><?php _e('Section display') ?></a></li>
 					<li<?php if ($page == 'privacy') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo Url::get('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
+    ?>><a href="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'privacy']) ?>"><?php _e('Section privacy') ?></a></li>
 <?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
     echo ' class="isactive"';
 }
-    ?>><a href="<?php echo Url::get('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
+    ?>><a href="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'admin']) ?>"><?php _e('Section admin') ?></a></li>
 <?php endif;
     ?>				</ul>
 			</div>
diff --git a/style/themes/FeatherBB/view/profile/section_admin.php b/style/themes/FeatherBB/view/profile/section_admin.php
index c05d0638..e3a5fd3e 100644
--- a/style/themes/FeatherBB/view/profile/section_admin.php
+++ b/style/themes/FeatherBB/view/profile/section_admin.php
@@ -6,7 +6,7 @@
  * and Rickard Andersson (C) 2002-2008 PunBB
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
- 
+
 use FeatherBB\Core\Url;use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
@@ -18,7 +18,7 @@
 	<div class="blockform">
 		<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section admin') ?></span></h2>
 		<div class="box">
-			<form id="profile7" method="post" action="<?php echo Url::get('user/'.$id.'/section/admin/') ?>">
+			<form id="profile7" method="post" action="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'admin'])?>">
 				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 				<div class="inform">
 				<input type="hidden" name="form_sent" value="1" />
@@ -86,4 +86,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/profile/section_display.php b/style/themes/FeatherBB/view/profile/section_display.php
index 7095926a..093d384a 100644
--- a/style/themes/FeatherBB/view/profile/section_display.php
+++ b/style/themes/FeatherBB/view/profile/section_display.php
@@ -19,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section display') ?></span></h2>
 	<div class="box">
-		<form id="profile5" method="post" action="<?php echo Url::get('user/'.$id.'/section/display/') ?>">
+		<form id="profile5" method="post" action="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'display']) ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php
diff --git a/style/themes/FeatherBB/view/profile/section_essentials.php b/style/themes/FeatherBB/view/profile/section_essentials.php
index ae9320dc..7091fa58 100644
--- a/style/themes/FeatherBB/view/profile/section_essentials.php
+++ b/style/themes/FeatherBB/view/profile/section_essentials.php
@@ -19,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section essentials') ?></span></h2>
 	<div class="box">
-		<form id="profile1" method="post" action="<?php echo Url::get('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
+		<form id="profile1" method="post" action="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'essentials']) ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -27,7 +27,7 @@
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo Url::get('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo $feather->urlFor('profileAction', ['id' => $id, 'action' => 'change_pass']) ?>"><?php _e('Change pass') ?></a></span></p>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
@@ -244,7 +244,7 @@
 				<fieldset>
 					<legend><?php _e('User activity') ?></legend>
 					<div class="infldset">
-						<p><?php printf(__('Registered info'), $feather->utils->format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.Url::get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.Utils::escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Registered info'), $feather->utils->format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->urlFor('usersIpShow', ['ip' => $user['registration_ip']]).'">'.Utils::escape($user['registration_ip']).'</a>)' : '')) ?></p>
 						<p><?php printf(__('Last post info'), $feather->utils->format_time($user['last_post'])) ?></p>
 						<p><?php printf(__('Last visit info'), $feather->utils->format_time($user['last_visit'])) ?></p>
 						<?php echo $user_disp['posts_field'] ?>
diff --git a/view/admin/options.php b/view/admin/options.php
index 9a65cab3..5425c51c 100644
--- a/view/admin/options.php
+++ b/view/admin/options.php
@@ -416,7 +416,7 @@
 									<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
 											echo ' checked="checked"';
 										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.Url::get('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
+									<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.$feather->urlFor('adminCensoring').'">'.__('Censoring').'</a>') ?></span>
 								</td>
 							</tr>
 							<tr>

From 159af5d90ade9bdf89c4081b55d6cea46a0be5c1 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 7 Sep 2015 12:41:21 +0200
Subject: [PATCH 339/353] Complete urlFor in all files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Except in extern.php file : it will probably be moved into the « API »
controller, and optionally another for feeds.
---
 .../view/profile/section_messaging.php         |  4 ++--
 .../view/profile/section_personal.php          |  4 ++--
 .../view/profile/section_personality.php       | 10 +++++-----
 .../FeatherBB/view/profile/section_privacy.php |  4 ++--
 .../FeatherBB/view/profile/upload_avatar.php   |  2 +-
 style/themes/FeatherBB/view/register/rules.php |  4 ++--
 style/themes/FeatherBB/view/search/footer.php  |  4 ++--
 style/themes/FeatherBB/view/search/header.php  |  2 +-
 style/themes/FeatherBB/view/search/posts.php   |  4 ++--
 style/themes/FeatherBB/view/topic.php          | 18 +++++++++---------
 style/themes/FeatherBB/view/userlist.php       |  4 ++--
 view/delete.php                                |  4 ++--
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/style/themes/FeatherBB/view/profile/section_messaging.php b/style/themes/FeatherBB/view/profile/section_messaging.php
index 7ee8261d..3353bf77 100644
--- a/style/themes/FeatherBB/view/profile/section_messaging.php
+++ b/style/themes/FeatherBB/view/profile/section_messaging.php
@@ -19,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section messaging') ?></span></h2>
 	<div class="box">
-		<form id="profile3" method="post" action="<?php echo Url::get('user/'.$id.'/section/messaging/') ?>">
+		<form id="profile3" method="post" action="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'messaging']) ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -39,4 +39,4 @@
 	</div>
 </div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/profile/section_personal.php b/style/themes/FeatherBB/view/profile/section_personal.php
index 43a164fb..cc9a5985 100644
--- a/style/themes/FeatherBB/view/profile/section_personal.php
+++ b/style/themes/FeatherBB/view/profile/section_personal.php
@@ -19,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personal') ?></span></h2>
 	<div class="box">
-		<form id="profile2" method="post" action="<?php echo Url::get('user/'.$id.'/section/personal/') ?>">
+		<form id="profile2" method="post" action="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'personal']) ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -39,4 +39,4 @@
 	</div>
 </div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/profile/section_personality.php b/style/themes/FeatherBB/view/profile/section_personality.php
index 86d8b9c7..7cae1d47 100644
--- a/style/themes/FeatherBB/view/profile/section_personality.php
+++ b/style/themes/FeatherBB/view/profile/section_personality.php
@@ -19,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personality') ?></span></h2>
 	<div class="box">
-		<form id="profile4" method="post" action="<?php echo Url::get('user/'.$id.'/section/personality/') ?>">
+		<form id="profile4" method="post" action="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'personality']) ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div><input type="hidden" name="form_sent" value="1" /></div>
 <?php if ($feather->forum_settings['o_avatars'] == '1'): ?>				<div class="inform">
@@ -42,10 +42,10 @@
 							<textarea name="signature" rows="4" cols="65"><?php echo Utils::escape($user['signature']) ?></textarea><br /></label>
 						</div>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo Url::get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo Url::get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo Url::get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo Url::get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->urlFor('help').'#bbcode' ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->urlFor('help').'#url' ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->urlFor('help').'#img' ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->urlFor('help').'#smilies' ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
 						</ul>
 						<?php echo $signature_preview ?>
 					</div>
diff --git a/style/themes/FeatherBB/view/profile/section_privacy.php b/style/themes/FeatherBB/view/profile/section_privacy.php
index 7e567ee9..f5116b47 100644
--- a/style/themes/FeatherBB/view/profile/section_privacy.php
+++ b/style/themes/FeatherBB/view/profile/section_privacy.php
@@ -19,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section privacy') ?></span></h2>
 	<div class="box">
-		<form id="profile6" method="post" action="<?php echo Url::get('user/'.$id.'/section/privacy/') ?>">
+		<form id="profile6" method="post" action="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'privacy']) ?>">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -62,4 +62,4 @@
 	</div>
 </div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/profile/upload_avatar.php b/style/themes/FeatherBB/view/profile/upload_avatar.php
index 144720f4..bf345613 100644
--- a/style/themes/FeatherBB/view/profile/upload_avatar.php
+++ b/style/themes/FeatherBB/view/profile/upload_avatar.php
@@ -19,7 +19,7 @@
 <div class="blockform">
 	<h2><span><?php _e('Upload avatar') ?></span></h2>
 	<div class="box">
-		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo Url::get('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
+		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo $feather->urlFor('profileAction', ['id' => $id, 'action' => 'upload_avatar2']) ?>" onsubmit="return process_form(this)">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
diff --git a/style/themes/FeatherBB/view/register/rules.php b/style/themes/FeatherBB/view/register/rules.php
index abc9af56..edc4d329 100644
--- a/style/themes/FeatherBB/view/register/rules.php
+++ b/style/themes/FeatherBB/view/register/rules.php
@@ -19,7 +19,7 @@
 <div id="rules" class="blockform">
 	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
 	<div class="box">
-		<form method="get" action="<?php echo Url::get('register/') ?>">
+		<form method="get" action="<?php echo $feather->urlFor('register') ?>">
 			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Rules legend') ?></legend>
@@ -31,4 +31,4 @@
 			<p class="buttons"><input type="submit" name="agree" value="<?php _e('Agree') ?>" /> <input type="submit" name="cancel" value="<?php _e('Cancel') ?>" /></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/search/footer.php b/style/themes/FeatherBB/view/search/footer.php
index 32ab02e9..4c6d7c16 100644
--- a/style/themes/FeatherBB/view/search/footer.php
+++ b/style/themes/FeatherBB/view/search/footer.php
@@ -33,10 +33,10 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('search') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
 <?php echo(!empty($search['forum_actions']) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $search['forum_actions']).'</p>'."\n" : '') ?>
 		<div class="clearer"></div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/style/themes/FeatherBB/view/search/header.php b/style/themes/FeatherBB/view/search/header.php
index 70373636..ebe54ae1 100644
--- a/style/themes/FeatherBB/view/search/header.php
+++ b/style/themes/FeatherBB/view/search/header.php
@@ -19,7 +19,7 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('search') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
 			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
 		</ul>
 		<div class="pagepost">
diff --git a/style/themes/FeatherBB/view/search/posts.php b/style/themes/FeatherBB/view/search/posts.php
index e116bff0..bd3735c3 100644
--- a/style/themes/FeatherBB/view/search/posts.php
+++ b/style/themes/FeatherBB/view/search/posts.php
@@ -25,7 +25,7 @@
 } ?>">
 <h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
     _e('Re').' ';
-} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo Url::get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->urlFor('viewPost', ['pid' => $cur_search['pid']]).'#p'.$cur_search['pid'] ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
+} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->urlFor('Topic', ['id' => $cur_search['tid'], 'name' => $url_topic]) ?>"><?php echo Utils::escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->urlFor('viewPost', ['pid' => $cur_search['pid']]).'#p'.$cur_search['pid'] ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
 <div class="box">
 	<div class="inbox">
 		<div class="postbody">
@@ -49,7 +49,7 @@
 		<div class="postfoot clearb">
 			<div class="postfootright">
 				<ul>
-					<li><span><a href="<?php echo Url::get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
+					<li><span><a href="<?php echo $feather->urlFor('Topic', ['id' => $cur_search['tid'], 'name' => $url_topic]) ?>"><?php _e('Go to topic') ?></a></span></li>
 					<li><span><a href="<?php echo $feather->urlFor('viewPost', ['pid' => $cur_search['pid']]).'#p'.$cur_search['pid'] ?>"><?php _e('Go to post') ?></a></span></li>
 				</ul>
 			</div>
diff --git a/style/themes/FeatherBB/view/topic.php b/style/themes/FeatherBB/view/topic.php
index b403ab00..9ce44971 100644
--- a/style/themes/FeatherBB/view/topic.php
+++ b/style/themes/FeatherBB/view/topic.php
@@ -21,8 +21,8 @@
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo Url::get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('Forum', ['id' => $cur_topic['forum_id'], 'name' => $url_forum]) ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->urlFor('Topic', ['id' => $id, 'name' => $url_topic]) ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 		<div class="pagepost">
 			<p class="pagelink conl"><?php echo $paging_links ?></p>
@@ -111,8 +111,8 @@
 		</div>
 		<ul class="crumbs">
 			<li><a href="<?php echo Url::base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo Url::get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo Url::get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('Forum', ['id' => $cur_topic['forum_id'], 'name' => $url_forum]) ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->urlFor('Topic', ['id' => $id, 'name' => $url_topic]) ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
 		</ul>
 <?php echo $subscraction ?>
 		<div class="clearer"></div>
@@ -129,7 +129,7 @@
 <div id="quickpost" class="blockform">
 	<h2><span><?php _e('Quick post') ?></span></h2>
 	<div class="box">
-		<form id="quickpostform" method="post" action="<?php echo Url::get('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+		<form id="quickpostform" method="post" action="<?php echo $feather->urlFor('newReply', ['tid' => $id]) ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
 			<div class="inform">
 				<fieldset>
@@ -166,13 +166,13 @@
 
 <textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
-							<li><span><a href="<?php echo Url::get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->urlFor('help').'#bbcode' ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo Url::get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->urlFor('help').'#url' ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo Url::get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->urlFor('help').'#img' ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
     ?></span></li>
-							<li><span><a href="<?php echo Url::get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
+							<li><span><a href="<?php echo $feather->urlFor('help').'#smilies' ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
     ?></span></li>
 						</ul>
 					</div>
diff --git a/style/themes/FeatherBB/view/userlist.php b/style/themes/FeatherBB/view/userlist.php
index 45e40349..6a267fa2 100644
--- a/style/themes/FeatherBB/view/userlist.php
+++ b/style/themes/FeatherBB/view/userlist.php
@@ -90,7 +90,7 @@
             foreach ($userlist_data as $user) {
                 ?>
 					<tr>
-						<td class="tcl"><?php echo '<a href="'.Url::get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
+						<td class="tcl"><?php echo '<a href="'.$feather->urlFor('userProfile', ['id' => $user['id']]).'">'.Utils::escape($user['username']).'</a>' ?></td>
 						<td class="tc2"><?php echo Utils::get_title($user) ?></td>
 	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
 	<?php endif;
@@ -115,4 +115,4 @@
 		<p class="pagelink"><?php echo $paging_links ?></p>
 		<div class="clearer"></div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/delete.php b/view/delete.php
index 6ea36ea3..b4d2a1e9 100644
--- a/view/delete.php
+++ b/view/delete.php
@@ -20,8 +20,8 @@
 	<div class="inbox">
 		<ul class="crumbs">
 			<li><a href="<?= Url::base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?= Url::get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?= Utils::escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?= Url::get('post/'.$id.'/#p'.$id) ?>"><?= Utils::escape($cur_post['subject']) ?></a></li>
+            <li><span>»&#160;</span><a href="<?= $feather->urlFor('Forum', ['id' => $cur_post['fid'], 'name' => Url::url_friendly($cur_post['forum_name'])]) ?>"><?= Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?= $feather->urlFor('viewPost', ['pid' => $id]).'#p'.$id ?>"><?= Utils::escape($cur_post['subject']) ?></a></li>
 			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
 		</ul>
 	</div>

From 6c5c12ac8399c868f7fe40795dd1ddb176779d55 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 7 Sep 2015 13:20:19 +0200
Subject: [PATCH 340/353] Use a fallback for default themes views
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now if themes don’t have a « view » folder, a fallback will load the
default views in FeatherBB core.
Otherwise, views will be overwritten by the current theme.
Of course, themes have to use the same architecture as the default
views folder.
---
 featherbb/Controller/Install.php              |   5 +-
 featherbb/Core/View.php                       |   4 +-
 .../View}/admin/bans/add_ban.php              |   0
 .../View}/admin/bans/admin_bans.php           |   0
 .../View}/admin/bans/search_ban.php           |   0
 .../View}/admin/categories.php                |   0
 .../View}/admin/censoring.php                 |   0
 .../View}/admin/forums/admin_forums.php       |   0
 .../View}/admin/forums/delete_forum.php       |   0
 .../View}/admin/forums/permissions.php        |   0
 .../View}/admin/groups/add_edit_group.php     |   0
 .../View}/admin/groups/admin_groups.php       |   0
 .../View}/admin/groups/confirm_delete.php     |   0
 .../View}/admin/groups/delete_group.php       |   0
 .../view => featherbb/View}/admin/index.php   |   0
 .../view => featherbb/View}/admin/loader.php  |   0
 .../admin/maintenance/admin_maintenance.php   |   0
 .../View}/admin/maintenance/prune.php         |   0
 .../View}/admin/maintenance/rebuild.php       |   0
 .../view => featherbb/View}/admin/menu.php    |   0
 .../view => featherbb/View}/admin/options.php |   0
 .../view => featherbb/View}/admin/parser.php  |   0
 .../View}/admin/permissions.php               |   0
 .../view => featherbb/View}/admin/plugins.php |   0
 .../view => featherbb/View}/admin/reports.php |   0
 .../View}/admin/statistics.php                |   0
 .../View}/admin/users/admin_users.php         |   0
 .../View}/admin/users/ban_users.php           |   0
 .../View}/admin/users/delete_users.php        |   0
 .../View}/admin/users/find_users.php          |   0
 .../View}/admin/users/move_users.php          |   0
 .../View}/admin/users/search_ip.php           |   0
 .../View}/admin/users/show_users.php          |   0
 .../view => featherbb/View}/delete.php        |   0
 .../view => featherbb/View}/edit.php          |   0
 .../view => featherbb/View}/error.php         |   0
 .../view => featherbb/View}/footer.php        |   0
 .../view => featherbb/View}/forum.php         |   0
 .../view => featherbb/View}/header.php        |   0
 .../view => featherbb/View}/help.php          |   0
 .../view => featherbb/View}/index.php         |   0
 .../view => featherbb/View}/install.php       |   0
 .../view => featherbb/View}/login/form.php    |   0
 .../View}/login/password_forgotten.php        |   0
 .../view => featherbb/View}/misc/email.php    |   0
 .../view => featherbb/View}/misc/report.php   |   0
 .../view => featherbb/View}/misc/rules.php    |   0
 .../View}/moderate/delete_posts.php           |   0
 .../View}/moderate/delete_topics.php          |   0
 .../View}/moderate/merge_topics.php           |   0
 .../View}/moderate/moderator_forum.php        |   0
 .../View}/moderate/move_topics.php            |   0
 .../View}/moderate/posts_view.php             |   0
 .../View}/moderate/split_posts.php            |   0
 .../view => featherbb/View}/post.php          |   0
 .../View}/profile/change_mail.php             |   0
 .../View}/profile/change_pass.php             |   0
 .../View}/profile/delete_user.php             |   0
 .../view => featherbb/View}/profile/menu.php  |   0
 .../View}/profile/section_admin.php           |   0
 .../View}/profile/section_display.php         |   0
 .../View}/profile/section_essentials.php      |   0
 .../View}/profile/section_messaging.php       |   0
 .../View}/profile/section_personal.php        |   0
 .../View}/profile/section_personality.php     |   0
 .../View}/profile/section_privacy.php         |   0
 .../View}/profile/upload_avatar.php           |   0
 .../View}/profile/view_profile.php            |   0
 .../View}/register/email.php                  |   0
 .../view => featherbb/View}/register/form.php |   0
 .../View}/register/rules.php                  |   0
 .../view => featherbb/View}/search/footer.php |   0
 .../view => featherbb/View}/search/form.php   |   0
 .../view => featherbb/View}/search/header.php |   0
 .../view => featherbb/View}/search/posts.php  |   0
 .../view => featherbb/View}/search/topics.php |   0
 .../view => featherbb/View}/topic.php         |   0
 .../view => featherbb/View}/userlist.php      |   0
 view/admin/bans/add_ban.php                   |  96 --
 view/admin/bans/admin_bans.php                | 102 ---
 view/admin/bans/search_ban.php                |  87 --
 view/admin/categories.php                     | 111 ---
 view/admin/censoring.php                      |  84 --
 view/admin/forums/admin_forums.php            | 114 ---
 view/admin/forums/delete_forum.php            |  35 -
 view/admin/forums/permissions.php             | 137 ---
 view/admin/groups/add_edit_group.php          | 311 -------
 view/admin/groups/admin_groups.php            | 110 ---
 view/admin/groups/confirm_delete.php          |  36 -
 view/admin/groups/delete_group.php            |  39 -
 view/admin/index.php                          |  63 --
 view/admin/loader.php                         |  17 -
 view/admin/maintenance/admin_maintenance.php  |  99 --
 view/admin/maintenance/prune.php              |  39 -
 view/admin/maintenance/rebuild.php            |  17 -
 view/admin/menu.php                           | 116 ---
 view/admin/options.php                        | 844 ------------------
 view/admin/parser.php                         | 299 -------
 view/admin/permissions.php                    | 189 ----
 view/admin/plugins.php                        |  72 --
 view/admin/reports.php                        | 116 ---
 view/admin/statistics.php                     |  42 -
 view/admin/users/admin_users.php              | 172 ----
 view/admin/users/ban_users.php                |  58 --
 view/admin/users/delete_users.php             |  39 -
 view/admin/users/find_users.php               | 100 ---
 view/admin/users/move_users.php               |  47 -
 view/admin/users/search_ip.php                |  79 --
 view/admin/users/show_users.php               | 100 ---
 view/delete.php                               |  67 --
 view/edit.php                                 | 119 ---
 view/error.php                                |  26 -
 view/footer.php                               | 134 ---
 view/header.php                               | 131 ---
 view/help.php                                 | 139 ---
 view/index.php                                | 111 ---
 view/install.php                              | 222 -----
 view/login/form.php                           |  42 -
 view/login/password_forgotten.php             |  57 --
 view/message.php                              |  25 -
 view/misc/email.php                           |  37 -
 view/misc/report.php                          |  44 -
 view/misc/rules.php                           |  23 -
 view/moderate/delete_posts.php                |  33 -
 view/moderate/delete_topics.php               |  34 -
 view/moderate/merge_topics.php                |  36 -
 view/moderate/moderator_forum.php             | 101 ---
 view/moderate/move_topics.php                 |  44 -
 view/moderate/posts_view.php                  |  95 --
 view/moderate/split_posts.php                 |  40 -
 view/post.php                                 | 211 -----
 view/profile/change_mail.php                  |  35 -
 view/profile/change_pass.php                  |  39 -
 view/profile/delete_user.php                  |  36 -
 view/profile/menu.php                         |  55 --
 view/profile/section_admin.php                |  87 --
 view/profile/section_display.php              | 101 ---
 view/profile/section_essentials.php           | 258 ------
 view/profile/section_messaging.php            |  39 -
 view/profile/section_personal.php             |  39 -
 view/profile/section_personality.php          |  56 --
 view/profile/section_privacy.php              |  62 --
 view/profile/upload_avatar.php                |  35 -
 view/profile/view_profile.php                 |  66 --
 view/register/email.php                       |  39 -
 view/register/form.php                        | 134 ---
 view/register/rules.php                       |  32 -
 view/search/footer.php                        |  40 -
 view/search/form.php                          |  79 --
 view/search/header.php                        |  48 -
 view/search/posts.php                         |  56 --
 view/search/topics.php                        |  29 -
 view/userlist.php                             | 115 ---
 view/viewforum.php                            | 100 ---
 view/viewtopic.php                            | 204 -----
 155 files changed, 5 insertions(+), 7329 deletions(-)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/bans/add_ban.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/bans/admin_bans.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/bans/search_ban.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/categories.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/censoring.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/forums/admin_forums.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/forums/delete_forum.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/forums/permissions.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/groups/add_edit_group.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/groups/admin_groups.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/groups/confirm_delete.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/groups/delete_group.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/index.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/loader.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/maintenance/admin_maintenance.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/maintenance/prune.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/maintenance/rebuild.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/menu.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/options.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/parser.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/permissions.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/plugins.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/reports.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/statistics.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/users/admin_users.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/users/ban_users.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/users/delete_users.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/users/find_users.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/users/move_users.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/users/search_ip.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/users/show_users.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/delete.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/edit.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/error.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/footer.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/forum.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/header.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/help.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/index.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/install.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/login/form.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/login/password_forgotten.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/misc/email.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/misc/report.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/misc/rules.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/moderate/delete_posts.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/moderate/delete_topics.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/moderate/merge_topics.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/moderate/moderator_forum.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/moderate/move_topics.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/moderate/posts_view.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/moderate/split_posts.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/post.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/change_mail.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/change_pass.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/delete_user.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/menu.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/section_admin.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/section_display.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/section_essentials.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/section_messaging.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/section_personal.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/section_personality.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/section_privacy.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/upload_avatar.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/view_profile.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/register/email.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/register/form.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/register/rules.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/search/footer.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/search/form.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/search/header.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/search/posts.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/search/topics.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/topic.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/userlist.php (100%)
 delete mode 100644 view/admin/bans/add_ban.php
 delete mode 100644 view/admin/bans/admin_bans.php
 delete mode 100644 view/admin/bans/search_ban.php
 delete mode 100644 view/admin/categories.php
 delete mode 100644 view/admin/censoring.php
 delete mode 100644 view/admin/forums/admin_forums.php
 delete mode 100644 view/admin/forums/delete_forum.php
 delete mode 100644 view/admin/forums/permissions.php
 delete mode 100644 view/admin/groups/add_edit_group.php
 delete mode 100644 view/admin/groups/admin_groups.php
 delete mode 100644 view/admin/groups/confirm_delete.php
 delete mode 100644 view/admin/groups/delete_group.php
 delete mode 100644 view/admin/index.php
 delete mode 100644 view/admin/loader.php
 delete mode 100644 view/admin/maintenance/admin_maintenance.php
 delete mode 100644 view/admin/maintenance/prune.php
 delete mode 100644 view/admin/maintenance/rebuild.php
 delete mode 100644 view/admin/menu.php
 delete mode 100644 view/admin/options.php
 delete mode 100644 view/admin/parser.php
 delete mode 100644 view/admin/permissions.php
 delete mode 100644 view/admin/plugins.php
 delete mode 100644 view/admin/reports.php
 delete mode 100644 view/admin/statistics.php
 delete mode 100644 view/admin/users/admin_users.php
 delete mode 100644 view/admin/users/ban_users.php
 delete mode 100644 view/admin/users/delete_users.php
 delete mode 100644 view/admin/users/find_users.php
 delete mode 100644 view/admin/users/move_users.php
 delete mode 100644 view/admin/users/search_ip.php
 delete mode 100644 view/admin/users/show_users.php
 delete mode 100644 view/delete.php
 delete mode 100644 view/edit.php
 delete mode 100644 view/error.php
 delete mode 100644 view/footer.php
 delete mode 100644 view/header.php
 delete mode 100644 view/help.php
 delete mode 100644 view/index.php
 delete mode 100644 view/install.php
 delete mode 100644 view/login/form.php
 delete mode 100644 view/login/password_forgotten.php
 delete mode 100644 view/message.php
 delete mode 100644 view/misc/email.php
 delete mode 100644 view/misc/report.php
 delete mode 100644 view/misc/rules.php
 delete mode 100644 view/moderate/delete_posts.php
 delete mode 100644 view/moderate/delete_topics.php
 delete mode 100644 view/moderate/merge_topics.php
 delete mode 100644 view/moderate/moderator_forum.php
 delete mode 100644 view/moderate/move_topics.php
 delete mode 100644 view/moderate/posts_view.php
 delete mode 100644 view/moderate/split_posts.php
 delete mode 100644 view/post.php
 delete mode 100644 view/profile/change_mail.php
 delete mode 100644 view/profile/change_pass.php
 delete mode 100644 view/profile/delete_user.php
 delete mode 100644 view/profile/menu.php
 delete mode 100644 view/profile/section_admin.php
 delete mode 100644 view/profile/section_display.php
 delete mode 100644 view/profile/section_essentials.php
 delete mode 100644 view/profile/section_messaging.php
 delete mode 100644 view/profile/section_personal.php
 delete mode 100644 view/profile/section_personality.php
 delete mode 100644 view/profile/section_privacy.php
 delete mode 100644 view/profile/upload_avatar.php
 delete mode 100644 view/profile/view_profile.php
 delete mode 100644 view/register/email.php
 delete mode 100644 view/register/form.php
 delete mode 100644 view/register/rules.php
 delete mode 100644 view/search/footer.php
 delete mode 100644 view/search/form.php
 delete mode 100644 view/search/header.php
 delete mode 100644 view/search/posts.php
 delete mode 100644 view/search/topics.php
 delete mode 100644 view/userlist.php
 delete mode 100644 view/viewforum.php
 delete mode 100644 view/viewtopic.php

diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
index e3c10fba..17f6038e 100644
--- a/featherbb/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -9,9 +9,10 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Core\Random;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Utils;
+use FeatherBB\Core\Random;
+use FeatherBB\Middleware\Core;
 
 class Install
 {
@@ -165,7 +166,7 @@ public function create_config(array $data)
 
     public function create_db(array $data)
     {
-        \FeatherBB\Core::init_db($data);
+        Core::init_db($data);
 
         // Load appropriate language
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$data['default_lang'].'/install.mo');
diff --git a/featherbb/Core/View.php b/featherbb/Core/View.php
index feafdd7c..a4931bf9 100644
--- a/featherbb/Core/View.php
+++ b/featherbb/Core/View.php
@@ -194,7 +194,7 @@ public function getTemplatePathname($file)
     {
         $pathname = $this->templatesDirectory . DIRECTORY_SEPARATOR . ltrim($file, DIRECTORY_SEPARATOR);
         if (!is_file($pathname)) {
-            $pathname = $this->app->forum_env['FEATHER_ROOT'] . 'view/' . ltrim($file, DIRECTORY_SEPARATOR); // Fallback on default view
+            $pathname = $this->app->forum_env['FEATHER_ROOT'] . 'featherbb/View/' . ltrim($file, DIRECTORY_SEPARATOR); // Fallback on default view
             if (!is_file($pathname)) {
                 throw new \RuntimeException("View cannot add template `$file` to stack because the template does not exist");
             }
@@ -251,7 +251,7 @@ protected function render($data = null, $nested = true)
 
     public function setStyle($style)
     {
-        if (!is_dir($this->app->forum_env['FEATHER_ROOT'].'style/themes/'.$style.'/view/')) {
+        if (!is_dir($this->app->forum_env['FEATHER_ROOT'].'style/themes/'.$style.'/')) {
             throw new \InvalidArgumentException('The style '.$style.' doesn\'t exist');
         }
         $this->data->set('style', (string) $style);
diff --git a/style/themes/FeatherBB/view/admin/bans/add_ban.php b/featherbb/View/admin/bans/add_ban.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/bans/add_ban.php
rename to featherbb/View/admin/bans/add_ban.php
diff --git a/style/themes/FeatherBB/view/admin/bans/admin_bans.php b/featherbb/View/admin/bans/admin_bans.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/bans/admin_bans.php
rename to featherbb/View/admin/bans/admin_bans.php
diff --git a/style/themes/FeatherBB/view/admin/bans/search_ban.php b/featherbb/View/admin/bans/search_ban.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/bans/search_ban.php
rename to featherbb/View/admin/bans/search_ban.php
diff --git a/style/themes/FeatherBB/view/admin/categories.php b/featherbb/View/admin/categories.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/categories.php
rename to featherbb/View/admin/categories.php
diff --git a/style/themes/FeatherBB/view/admin/censoring.php b/featherbb/View/admin/censoring.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/censoring.php
rename to featherbb/View/admin/censoring.php
diff --git a/style/themes/FeatherBB/view/admin/forums/admin_forums.php b/featherbb/View/admin/forums/admin_forums.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/forums/admin_forums.php
rename to featherbb/View/admin/forums/admin_forums.php
diff --git a/style/themes/FeatherBB/view/admin/forums/delete_forum.php b/featherbb/View/admin/forums/delete_forum.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/forums/delete_forum.php
rename to featherbb/View/admin/forums/delete_forum.php
diff --git a/style/themes/FeatherBB/view/admin/forums/permissions.php b/featherbb/View/admin/forums/permissions.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/forums/permissions.php
rename to featherbb/View/admin/forums/permissions.php
diff --git a/style/themes/FeatherBB/view/admin/groups/add_edit_group.php b/featherbb/View/admin/groups/add_edit_group.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/groups/add_edit_group.php
rename to featherbb/View/admin/groups/add_edit_group.php
diff --git a/style/themes/FeatherBB/view/admin/groups/admin_groups.php b/featherbb/View/admin/groups/admin_groups.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/groups/admin_groups.php
rename to featherbb/View/admin/groups/admin_groups.php
diff --git a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php b/featherbb/View/admin/groups/confirm_delete.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/groups/confirm_delete.php
rename to featherbb/View/admin/groups/confirm_delete.php
diff --git a/style/themes/FeatherBB/view/admin/groups/delete_group.php b/featherbb/View/admin/groups/delete_group.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/groups/delete_group.php
rename to featherbb/View/admin/groups/delete_group.php
diff --git a/style/themes/FeatherBB/view/admin/index.php b/featherbb/View/admin/index.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/index.php
rename to featherbb/View/admin/index.php
diff --git a/style/themes/FeatherBB/view/admin/loader.php b/featherbb/View/admin/loader.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/loader.php
rename to featherbb/View/admin/loader.php
diff --git a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php b/featherbb/View/admin/maintenance/admin_maintenance.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
rename to featherbb/View/admin/maintenance/admin_maintenance.php
diff --git a/style/themes/FeatherBB/view/admin/maintenance/prune.php b/featherbb/View/admin/maintenance/prune.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/maintenance/prune.php
rename to featherbb/View/admin/maintenance/prune.php
diff --git a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php b/featherbb/View/admin/maintenance/rebuild.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/maintenance/rebuild.php
rename to featherbb/View/admin/maintenance/rebuild.php
diff --git a/style/themes/FeatherBB/view/admin/menu.php b/featherbb/View/admin/menu.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/menu.php
rename to featherbb/View/admin/menu.php
diff --git a/style/themes/FeatherBB/view/admin/options.php b/featherbb/View/admin/options.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/options.php
rename to featherbb/View/admin/options.php
diff --git a/style/themes/FeatherBB/view/admin/parser.php b/featherbb/View/admin/parser.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/parser.php
rename to featherbb/View/admin/parser.php
diff --git a/style/themes/FeatherBB/view/admin/permissions.php b/featherbb/View/admin/permissions.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/permissions.php
rename to featherbb/View/admin/permissions.php
diff --git a/style/themes/FeatherBB/view/admin/plugins.php b/featherbb/View/admin/plugins.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/plugins.php
rename to featherbb/View/admin/plugins.php
diff --git a/style/themes/FeatherBB/view/admin/reports.php b/featherbb/View/admin/reports.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/reports.php
rename to featherbb/View/admin/reports.php
diff --git a/style/themes/FeatherBB/view/admin/statistics.php b/featherbb/View/admin/statistics.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/statistics.php
rename to featherbb/View/admin/statistics.php
diff --git a/style/themes/FeatherBB/view/admin/users/admin_users.php b/featherbb/View/admin/users/admin_users.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/users/admin_users.php
rename to featherbb/View/admin/users/admin_users.php
diff --git a/style/themes/FeatherBB/view/admin/users/ban_users.php b/featherbb/View/admin/users/ban_users.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/users/ban_users.php
rename to featherbb/View/admin/users/ban_users.php
diff --git a/style/themes/FeatherBB/view/admin/users/delete_users.php b/featherbb/View/admin/users/delete_users.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/users/delete_users.php
rename to featherbb/View/admin/users/delete_users.php
diff --git a/style/themes/FeatherBB/view/admin/users/find_users.php b/featherbb/View/admin/users/find_users.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/users/find_users.php
rename to featherbb/View/admin/users/find_users.php
diff --git a/style/themes/FeatherBB/view/admin/users/move_users.php b/featherbb/View/admin/users/move_users.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/users/move_users.php
rename to featherbb/View/admin/users/move_users.php
diff --git a/style/themes/FeatherBB/view/admin/users/search_ip.php b/featherbb/View/admin/users/search_ip.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/users/search_ip.php
rename to featherbb/View/admin/users/search_ip.php
diff --git a/style/themes/FeatherBB/view/admin/users/show_users.php b/featherbb/View/admin/users/show_users.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/users/show_users.php
rename to featherbb/View/admin/users/show_users.php
diff --git a/style/themes/FeatherBB/view/delete.php b/featherbb/View/delete.php
similarity index 100%
rename from style/themes/FeatherBB/view/delete.php
rename to featherbb/View/delete.php
diff --git a/style/themes/FeatherBB/view/edit.php b/featherbb/View/edit.php
similarity index 100%
rename from style/themes/FeatherBB/view/edit.php
rename to featherbb/View/edit.php
diff --git a/style/themes/FeatherBB/view/error.php b/featherbb/View/error.php
similarity index 100%
rename from style/themes/FeatherBB/view/error.php
rename to featherbb/View/error.php
diff --git a/style/themes/FeatherBB/view/footer.php b/featherbb/View/footer.php
similarity index 100%
rename from style/themes/FeatherBB/view/footer.php
rename to featherbb/View/footer.php
diff --git a/style/themes/FeatherBB/view/forum.php b/featherbb/View/forum.php
similarity index 100%
rename from style/themes/FeatherBB/view/forum.php
rename to featherbb/View/forum.php
diff --git a/style/themes/FeatherBB/view/header.php b/featherbb/View/header.php
similarity index 100%
rename from style/themes/FeatherBB/view/header.php
rename to featherbb/View/header.php
diff --git a/style/themes/FeatherBB/view/help.php b/featherbb/View/help.php
similarity index 100%
rename from style/themes/FeatherBB/view/help.php
rename to featherbb/View/help.php
diff --git a/style/themes/FeatherBB/view/index.php b/featherbb/View/index.php
similarity index 100%
rename from style/themes/FeatherBB/view/index.php
rename to featherbb/View/index.php
diff --git a/style/themes/FeatherBB/view/install.php b/featherbb/View/install.php
similarity index 100%
rename from style/themes/FeatherBB/view/install.php
rename to featherbb/View/install.php
diff --git a/style/themes/FeatherBB/view/login/form.php b/featherbb/View/login/form.php
similarity index 100%
rename from style/themes/FeatherBB/view/login/form.php
rename to featherbb/View/login/form.php
diff --git a/style/themes/FeatherBB/view/login/password_forgotten.php b/featherbb/View/login/password_forgotten.php
similarity index 100%
rename from style/themes/FeatherBB/view/login/password_forgotten.php
rename to featherbb/View/login/password_forgotten.php
diff --git a/style/themes/FeatherBB/view/misc/email.php b/featherbb/View/misc/email.php
similarity index 100%
rename from style/themes/FeatherBB/view/misc/email.php
rename to featherbb/View/misc/email.php
diff --git a/style/themes/FeatherBB/view/misc/report.php b/featherbb/View/misc/report.php
similarity index 100%
rename from style/themes/FeatherBB/view/misc/report.php
rename to featherbb/View/misc/report.php
diff --git a/style/themes/FeatherBB/view/misc/rules.php b/featherbb/View/misc/rules.php
similarity index 100%
rename from style/themes/FeatherBB/view/misc/rules.php
rename to featherbb/View/misc/rules.php
diff --git a/style/themes/FeatherBB/view/moderate/delete_posts.php b/featherbb/View/moderate/delete_posts.php
similarity index 100%
rename from style/themes/FeatherBB/view/moderate/delete_posts.php
rename to featherbb/View/moderate/delete_posts.php
diff --git a/style/themes/FeatherBB/view/moderate/delete_topics.php b/featherbb/View/moderate/delete_topics.php
similarity index 100%
rename from style/themes/FeatherBB/view/moderate/delete_topics.php
rename to featherbb/View/moderate/delete_topics.php
diff --git a/style/themes/FeatherBB/view/moderate/merge_topics.php b/featherbb/View/moderate/merge_topics.php
similarity index 100%
rename from style/themes/FeatherBB/view/moderate/merge_topics.php
rename to featherbb/View/moderate/merge_topics.php
diff --git a/style/themes/FeatherBB/view/moderate/moderator_forum.php b/featherbb/View/moderate/moderator_forum.php
similarity index 100%
rename from style/themes/FeatherBB/view/moderate/moderator_forum.php
rename to featherbb/View/moderate/moderator_forum.php
diff --git a/style/themes/FeatherBB/view/moderate/move_topics.php b/featherbb/View/moderate/move_topics.php
similarity index 100%
rename from style/themes/FeatherBB/view/moderate/move_topics.php
rename to featherbb/View/moderate/move_topics.php
diff --git a/style/themes/FeatherBB/view/moderate/posts_view.php b/featherbb/View/moderate/posts_view.php
similarity index 100%
rename from style/themes/FeatherBB/view/moderate/posts_view.php
rename to featherbb/View/moderate/posts_view.php
diff --git a/style/themes/FeatherBB/view/moderate/split_posts.php b/featherbb/View/moderate/split_posts.php
similarity index 100%
rename from style/themes/FeatherBB/view/moderate/split_posts.php
rename to featherbb/View/moderate/split_posts.php
diff --git a/style/themes/FeatherBB/view/post.php b/featherbb/View/post.php
similarity index 100%
rename from style/themes/FeatherBB/view/post.php
rename to featherbb/View/post.php
diff --git a/style/themes/FeatherBB/view/profile/change_mail.php b/featherbb/View/profile/change_mail.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/change_mail.php
rename to featherbb/View/profile/change_mail.php
diff --git a/style/themes/FeatherBB/view/profile/change_pass.php b/featherbb/View/profile/change_pass.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/change_pass.php
rename to featherbb/View/profile/change_pass.php
diff --git a/style/themes/FeatherBB/view/profile/delete_user.php b/featherbb/View/profile/delete_user.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/delete_user.php
rename to featherbb/View/profile/delete_user.php
diff --git a/style/themes/FeatherBB/view/profile/menu.php b/featherbb/View/profile/menu.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/menu.php
rename to featherbb/View/profile/menu.php
diff --git a/style/themes/FeatherBB/view/profile/section_admin.php b/featherbb/View/profile/section_admin.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/section_admin.php
rename to featherbb/View/profile/section_admin.php
diff --git a/style/themes/FeatherBB/view/profile/section_display.php b/featherbb/View/profile/section_display.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/section_display.php
rename to featherbb/View/profile/section_display.php
diff --git a/style/themes/FeatherBB/view/profile/section_essentials.php b/featherbb/View/profile/section_essentials.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/section_essentials.php
rename to featherbb/View/profile/section_essentials.php
diff --git a/style/themes/FeatherBB/view/profile/section_messaging.php b/featherbb/View/profile/section_messaging.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/section_messaging.php
rename to featherbb/View/profile/section_messaging.php
diff --git a/style/themes/FeatherBB/view/profile/section_personal.php b/featherbb/View/profile/section_personal.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/section_personal.php
rename to featherbb/View/profile/section_personal.php
diff --git a/style/themes/FeatherBB/view/profile/section_personality.php b/featherbb/View/profile/section_personality.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/section_personality.php
rename to featherbb/View/profile/section_personality.php
diff --git a/style/themes/FeatherBB/view/profile/section_privacy.php b/featherbb/View/profile/section_privacy.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/section_privacy.php
rename to featherbb/View/profile/section_privacy.php
diff --git a/style/themes/FeatherBB/view/profile/upload_avatar.php b/featherbb/View/profile/upload_avatar.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/upload_avatar.php
rename to featherbb/View/profile/upload_avatar.php
diff --git a/style/themes/FeatherBB/view/profile/view_profile.php b/featherbb/View/profile/view_profile.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/view_profile.php
rename to featherbb/View/profile/view_profile.php
diff --git a/style/themes/FeatherBB/view/register/email.php b/featherbb/View/register/email.php
similarity index 100%
rename from style/themes/FeatherBB/view/register/email.php
rename to featherbb/View/register/email.php
diff --git a/style/themes/FeatherBB/view/register/form.php b/featherbb/View/register/form.php
similarity index 100%
rename from style/themes/FeatherBB/view/register/form.php
rename to featherbb/View/register/form.php
diff --git a/style/themes/FeatherBB/view/register/rules.php b/featherbb/View/register/rules.php
similarity index 100%
rename from style/themes/FeatherBB/view/register/rules.php
rename to featherbb/View/register/rules.php
diff --git a/style/themes/FeatherBB/view/search/footer.php b/featherbb/View/search/footer.php
similarity index 100%
rename from style/themes/FeatherBB/view/search/footer.php
rename to featherbb/View/search/footer.php
diff --git a/style/themes/FeatherBB/view/search/form.php b/featherbb/View/search/form.php
similarity index 100%
rename from style/themes/FeatherBB/view/search/form.php
rename to featherbb/View/search/form.php
diff --git a/style/themes/FeatherBB/view/search/header.php b/featherbb/View/search/header.php
similarity index 100%
rename from style/themes/FeatherBB/view/search/header.php
rename to featherbb/View/search/header.php
diff --git a/style/themes/FeatherBB/view/search/posts.php b/featherbb/View/search/posts.php
similarity index 100%
rename from style/themes/FeatherBB/view/search/posts.php
rename to featherbb/View/search/posts.php
diff --git a/style/themes/FeatherBB/view/search/topics.php b/featherbb/View/search/topics.php
similarity index 100%
rename from style/themes/FeatherBB/view/search/topics.php
rename to featherbb/View/search/topics.php
diff --git a/style/themes/FeatherBB/view/topic.php b/featherbb/View/topic.php
similarity index 100%
rename from style/themes/FeatherBB/view/topic.php
rename to featherbb/View/topic.php
diff --git a/style/themes/FeatherBB/view/userlist.php b/featherbb/View/userlist.php
similarity index 100%
rename from style/themes/FeatherBB/view/userlist.php
rename to featherbb/View/userlist.php
diff --git a/view/admin/bans/add_ban.php b/view/admin/bans/add_ban.php
deleted file mode 100644
index cb34e1b8..00000000
--- a/view/admin/bans/add_ban.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-	exit;
-}
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('Ban advanced head') ?></span></h2>
-	<div class="box">
-		<form id="bans2" method="post" action="">
-			<div class="inform">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="mode" value="<?php echo $ban['mode'] ?>" />
-				<?php if ($ban['mode'] == 'edit'): ?>				<input type="hidden" name="ban_id" value="<?php echo $ban['id'] ?>" />
-				<?php endif; ?>
-				<?php if ($ban['mode'] == 'add' && isset($ban['user_id'])): ?><input type="hidden" name="ban_user_id" value="<?php echo $ban['user_id'] ?>" />
-				<?php endif; ?><fieldset>
-					<legend><?php _e('Ban advanced subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Username label') ?></th>
-								<td>
-									<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
-										echo Utils::escape($ban['ban_user']);
-									} ?>" tabindex="1" />
-									<span><?php _e('Username help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('IP label') ?></th>
-								<td>
-									<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
-										echo Utils::escape($ban['ip']);
-									} ?>" tabindex="2" />
-										<span><?php _e('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
-												printf(' '.__('IP help link'), '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.__('here').'</a>');
-											} ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('E-mail label') ?></th>
-								<td>
-									<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
-										echo Utils::escape($ban['email']);
-									} ?>" tabindex="3" />
-									<span><?php _e('E-mail help') ?></span>
-								</td>
-							</tr>
-						</table>
-						<p class="topspace"><strong class="warntext"><?php _e('Ban IP range info') ?></strong></p>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Message expiry subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Ban message label') ?></th>
-								<td>
-									<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
-										echo Utils::escape($ban['message']);
-									} ?>" tabindex="4" />
-									<span><?php _e('Ban message help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Expire date label') ?></th>
-								<td>
-									<input type="text" name="ban_expire" size="17" maxlength="10" value="<?php if (isset($ban['expire'])) {
-										echo $ban['expire'];
-									} ?>" tabindex="5" />
-									<span><?php _e('Expire date help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php _e('Save') ?>" tabindex="6" /></p>
-		</form>
-	</div>
-</div>
-<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/bans/admin_bans.php b/view/admin/bans/admin_bans.php
deleted file mode 100644
index 085d8dab..00000000
--- a/view/admin/bans/admin_bans.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('New ban head') ?></span></h2>
-		<div class="box">
-			<form id="bans" method="post" action="<?php echo $feather->url->get('admin/bans/add/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Add ban subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Username label') ?><div><input type="submit" name="add_ban" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
-									<td>
-										<input type="text" name="new_ban_user" size="25" maxlength="25" tabindex="1" />
-										<span><?php _e('Username advanced help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-
-		<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
-		<div class="box">
-			<form id="find_bans" method="get" action="<?php echo $feather->url->get('admin/bans/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Ban search subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Ban search info') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Username label') ?></th>
-									<td><input type="text" name="username" size="30" maxlength="25" tabindex="4" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('IP label') ?></th>
-									<td><input type="text" name="ip" size="30" maxlength="255" tabindex="5" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('E-mail label') ?></th>
-									<td><input type="text" name="email" size="30" maxlength="80" tabindex="6" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Message label') ?></th>
-									<td><input type="text" name="message" size="30" maxlength="255" tabindex="7" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Expire after label') ?></th>
-									<td><input type="text" name="expire_after" size="10" maxlength="10" tabindex="8" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Expire before label') ?></th>
-									<td><input type="text" name="expire_before" size="10" maxlength="10" tabindex="9" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Order by label') ?></th>
-									<td>
-										<select name="order_by" tabindex="10">
-											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
-											<option value="ip"><?php _e('Order by ip') ?></option>
-											<option value="email"><?php _e('Order by e-mail') ?></option>
-											<option value="expire"><?php _e('Order by expire') ?></option>
-										</select>
-                                        &#160;&#160;&#160;
-                                        <select name="direction" tabindex="11">
-											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
-											<option value="DESC"><?php _e('Descending') ?></option>
-										</select>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="12" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/bans/search_ban.php b/view/admin/bans/search_ban.php
deleted file mode 100644
index 93fd7bdd..00000000
--- a/view/admin/bans/search_ban.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-
-<div id="bans1" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results IP address head') ?></th>
-					<th class="tc4" scope="col"><?php _e('Results expire head') ?></th>
-					<th class="tc5" scope="col"><?php _e('Results message head') ?></th>
-					<th class="tc6" scope="col"><?php _e('Results banned by head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-
-        foreach ($ban_data as $cur_ban) {
-            ?>
-				<tr>
-					<td class="tcl"><?php echo($cur_ban['username'] != '') ? Utils::escape($cur_ban['username']) : '&#160;' ?></td>
-					<td class="tc2"><?php echo($cur_ban['email'] != '') ? Utils::escape($cur_ban['email']) : '&#160;' ?></td>
-					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? Utils::escape($cur_ban['ip']) : '&#160;' ?></td>
-					<td class="tc4"><?php echo $feather->utils->format_time($cur_ban['expire'], true) ?></td>
-					<td class="tc5"><?php echo($cur_ban['message'] != '') ? Utils::escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.Utils::escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
-				</tr>
-<?php
-
-        }
-        if (empty($ban_data)) {
-            echo "\t\t\t\t".'<tr><td class="tcl" colspan="7">'.__('No match').'</td></tr>'."\n";
-        }
-
-?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-        <ul class="crumbs">
-            <li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
-            <li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-        </ul>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/admin/categories.php b/view/admin/categories.php
deleted file mode 100644
index c4299564..00000000
--- a/view/admin/categories.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-	<div class="blockform">
-		<h2><span><?php _e('Add categories head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/categories/add/') ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Add categories subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Add category label') ?><div><input type="submit" value="<?php _e('Add new submit') ?>" tabindex="2" /></div></th>
-									<td>
-										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
-										<span><?php printf(__('Add category help'), '<a href="'.$feather->url->get('admin/forums').'">'.__('Forums').'</a>') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-
-<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/categories/delete') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Delete categories subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Delete category label') ?><div><input type="submit" value="<?php _e('Delete') ?>" tabindex="4" /></div></th>
-									<td>
-										<select name="cat_to_delete" tabindex="3">
-<?php
-
-    foreach ($cat_list as $cur_cat) {
-        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.Utils::escape($cur_cat['cat_name']).'</option>'."\n";
-    }
-
-?>
-										</select>
-										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php _e('Delete category disclaimer') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-<?php endif; ?>
-
-<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/categories/edit/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit categories subhead') ?></legend>
-						<div class="infldset">
-							<table id="categoryedit">
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php _e('Category name label') ?></th>
-									<th scope="col"><?php _e('Category position label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-
-    foreach ($cat_list as $cur_cat) {
-        ?>
-								<tr>
-									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo Utils::escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
-									<td><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][order]" value="<?php echo $cur_cat['disp_position'] ?>" size="3" maxlength="3" /></td>
-								</tr>
-<?php
-
-    }
-
-?>
-							</tbody>
-							</table>
-							<div class="fsetsubmit"><input type="submit" value="<?php _e('Update') ?>" /></div>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-<?php endif; ?>	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/censoring.php b/view/admin/censoring.php
deleted file mode 100644
index 190638fe..00000000
--- a/view/admin/censoring.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Censoring head') ?></span></h2>
-		<div class="box">
-			<form id="censoring" method="post" action="<?php echo $feather->url->get('admin/censoring/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Add word subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
-							<table>
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
-									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
-									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-								<tr>
-									<td class="tcl"><input type="text" name="new_search_for" size="24" maxlength="60" tabindex="1" /></td>
-									<td class="tc2"><input type="text" name="new_replace_with" size="24" maxlength="60" tabindex="2" /></td>
-									<td><input type="submit" name="add_word" value="<?php _e('Add') ?>" tabindex="3" /></td>
-								</tr>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit remove subhead') ?></legend>
-						<div class="infldset">
-<?php
-if (!empty($word_data)) {
-    ?>
-							<table>
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
-									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
-									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-
-    foreach ($word_data as $word) {
-        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.Utils::escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.Utils::escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
-    }
-
-    ?>
-							</tbody>
-							</table>
-<?php
-
-} else {
-    echo "\t\t\t\t\t\t\t".'<p>'.__('No words in list').'</p>'."\n";
-}
-
-?>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/forums/admin_forums.php b/view/admin/forums/admin_forums.php
deleted file mode 100644
index 1d70ba75..00000000
--- a/view/admin/forums/admin_forums.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Add forum head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/forums/add') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<?php
-if (!empty($cat_list)) {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Create new subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Add forum label') ?><div><input type="submit" value="<?php _e('Add forum') ?>" tabindex="2" /></div></th>
-									<td>
-										<select name="cat" tabindex="1">
-											<?php  foreach ($cat_list as $cat) {
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.Utils::escape($cat['cat_name']).'</option>'."\n";
-											} ?>
-										</select>
-										<span><?php _e('Add forum help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-} else {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('None') ?></legend>
-						<div class="infldset">
-							<p><?php _e('No categories exist') ?></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-}
-
-?>
-			</form>
-		</div>
-<?php
-if (!empty($forum_data)) {
-    ?>
-		<h2 class="block2"><span><?php _e('Manage forums head') ?></span></h2>
-		<div class="box">
-			<form id="edforum" method="post" action="<?php echo $feather->url->get('admin/forums/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
-<?php
-    foreach ($forum_data as $cat_id => $cat_data) {
-            ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Category subhead') ?> <?php echo Utils::escape($cat_data['cat_name']) ?></legend>
-						<div class="infldset">
-							<table>
-							<thead>
-								<tr>
-									<th class="tcl"><?php _e('Action') ?></th>
-									<th class="tc2"><?php _e('Position label') ?></th>
-									<th class="tcr"><?php _e('Forum label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-	foreach ($cat_data['cat_forums'] as $forum) {
-        ?>
-								<tr>
-									<td class="tcl"><a href="<?php echo $feather->url->get('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
-									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
-									<td class="tcr"><strong><?php echo Utils::escape($forum['forum_name']) ?></strong></td>
-								</tr>
-<?php
-    }
-    ?>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-	}
-?>
-				<p class="submitend"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
-<?php
-	}
-?>
diff --git a/view/admin/forums/delete_forum.php b/view/admin/forums/delete_forum.php
deleted file mode 100644
index c839019a..00000000
--- a/view/admin/forums/delete_forum.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Confirm delete head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Confirm delete subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Confirm delete info'), $cur_forum['forum_name']) ?></p>
-							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="del_forum_comply" value="<?php _e('Delete') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/forums/permissions.php b/view/admin/forums/permissions.php
deleted file mode 100644
index d461ea30..00000000
--- a/view/admin/forums/permissions.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Edit forum head') ?></span></h2>
-		<div class="box">
-			<form id="edit_forum" method="post" action="<?php echo $feather->url->get('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit details subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Forum name label') ?></th>
-									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo Utils::escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Forum description label') ?></th>
-									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo Utils::escape($cur_forum['forum_desc']) ?></textarea></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Category label') ?></th>
-									<td>
-										<select name="cat_id" tabindex="3">
-											<?php  foreach ($forum_data as $cat_id => $cat_data) {
-												$selected = ($cat_id == $cur_forum['cat_id']) ? 'selected="selected"' : '';
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.Utils::escape($cat_data['cat_name']).'</option>'."\n";
-											} ?>
-										</select>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Sort by label') ?></th>
-									<td>
-										<select name="sort_by" tabindex="4">
-											<option value="0"<?php if ($cur_forum['sort_by'] == '0') {
-    echo ' selected="selected"';
-} ?>><?php _e('Last post') ?></option>
-											<option value="1"<?php if ($cur_forum['sort_by'] == '1') {
-    echo ' selected="selected"';
-} ?>><?php _e('Topic start') ?></option>
-											<option value="2"<?php if ($cur_forum['sort_by'] == '2') {
-    echo ' selected="selected"';
-} ?>><?php _e('Subject') ?></option>
-										</select>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Redirect label') ?></th>
-									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.Utils::escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Group permissions subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Group permissions info'), '<a href="admin_groups.php">'.__('User groups').'</a>') ?></p>
-							<table id="forumperms">
-							<thead>
-								<tr>
-									<th class="atcl">&#160;</th>
-									<th><?php _e('Read forum label') ?></th>
-									<th><?php _e('Post replies label') ?></th>
-									<th><?php _e('Post topics label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-    foreach ($perm_data as $perm) {
-        ?>
-								<tr>
-									<th class="atcl"><?php echo Utils::escape($perm['g_title']) ?></th>
-									<td<?php if (!$perm['read_forum_def']) {
-    echo ' class="nodefault"';
-}
-        ?>>
-										<input type="hidden" name="read_forum_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['read_forum']) ? '1' : '0';
-        ?>" />
-										<input type="checkbox" name="read_forum_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['read_forum']) ? ' checked="checked"' : '';
-        ?><?php echo($perm['g_read_board'] == '0') ? ' disabled="disabled"' : '';
-        ?> tabindex="<?php echo $cur_index++ ?>" />
-									</td>
-									<td<?php if (!$perm['post_replies_def'] && $cur_forum['redirect_url'] == '') {
-    echo ' class="nodefault"';
-}
-        ?>>
-										<input type="hidden" name="post_replies_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['post_replies']) ? '1' : '0';
-        ?>" />
-										<input type="checkbox" name="post_replies_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['post_replies']) ? ' checked="checked"' : '';
-        ?><?php echo($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : '';
-        ?> tabindex="<?php echo $cur_index++ ?>" />
-									</td>
-									<td<?php if (!$perm['post_topics_def'] && $cur_forum['redirect_url'] == '') {
-    echo ' class="nodefault"';
-}
-        ?>>
-										<input type="hidden" name="post_topics_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['post_topics']) ? '1' : '0';
-        ?>" />
-										<input type="checkbox" name="post_topics_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['post_topics']) ? ' checked="checked"' : '';
-        ?><?php echo($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : '';
-        ?> tabindex="<?php echo $cur_index++ ?>" />
-									</td>
-								</tr>
-<?php
-
-    }
-
-?>
-							</tbody>
-							</table>
-							<div class="fsetsubmit"><input type="submit" name="revert_perms" value="<?php _e('Revert to default') ?>" tabindex="<?php echo $cur_index++ ?>" /></div>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/groups/add_edit_group.php b/view/admin/groups/add_edit_group.php
deleted file mode 100644
index de91d1eb..00000000
--- a/view/admin/groups/add_edit_group.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Group settings head') ?></span></h2>
-		<div class="box">
-			<form id="groups2" method="post" action="" onsubmit="return process_form(this)">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" /></p>
-				<div class="inform">
-					<input type="hidden" name="mode" value="<?php echo $group['mode'] ?>" />
-<?php if ($group['mode'] == 'edit'): ?>					<input type="hidden" name="group_id" value="<?php echo $id ?>" />
-<?php endif; ?><?php if ($group['mode'] == 'add'): ?>					<input type="hidden" name="base_group" value="<?php echo $group['base_group'] ?>" />
-<?php endif; ?>					<fieldset>
-						<legend><?php _e('Group settings subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Group settings info') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Group title label') ?></th>
-									<td>
-										<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
-    echo Utils::escape($group['info']['g_title']);
-} ?>" tabindex="1" />
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('User title label') ?></th>
-									<td>
-										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo Utils::escape($group['info']['g_user_title']) ?>" tabindex="2" />
-										<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Promote users label') ?></th>
-									<td>
-										<select name="promote_next_group" tabindex="3">
-											<option value="0"><?php _e('Disable promotion') ?></option>
-											<?php echo $group_list ?>
-										</select>
-										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo Utils::escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
-										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
-									</td>
-								</tr>
-<?php if ($group['mode'] != 'edit' || $feather->forum_settings['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
-									<th scope="row"> <?php _e('Mod privileges label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="5" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="moderator" value="0"<?php if ($group['info']['g_moderator'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="6" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Mod privileges help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Edit profile label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_edit_users" value="1"<?php if ($group['info']['g_mod_edit_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="7" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_edit_users" value="0"<?php if ($group['info']['g_mod_edit_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="8" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Edit profile help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Rename users label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_rename_users" value="1"<?php if ($group['info']['g_mod_rename_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="9" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_rename_users" value="0"<?php if ($group['info']['g_mod_rename_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="10" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Rename users help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Change passwords label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_change_passwords" value="1"<?php if ($group['info']['g_mod_change_passwords'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="11" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_change_passwords" value="0"<?php if ($group['info']['g_mod_change_passwords'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="12" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Change passwords help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Mod promote users label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_promote_users" value="1"<?php if ($group['info']['g_mod_promote_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="13" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_promote_users" value="0"<?php if ($group['info']['g_mod_promote_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="14" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Mod promote users help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Ban users label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_ban_users" value="1"<?php if ($group['info']['g_mod_ban_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="15" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_ban_users" value="0"<?php if ($group['info']['g_mod_ban_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="16" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Ban users help') ?></span>
-									</td>
-								</tr>
-<?php endif; endif; ?>								<tr>
-									<th scope="row"><?php _e('Read board label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="read_board" value="1"<?php if ($group['info']['g_read_board'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="17" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="read_board" value="0"<?php if ($group['info']['g_read_board'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="18" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Read board help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('View user info label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="view_users" value="1"<?php if ($group['info']['g_view_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="19" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="view_users" value="0"<?php if ($group['info']['g_view_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="20" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('View user info help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Post replies label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="post_replies" value="1"<?php if ($group['info']['g_post_replies'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="21" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="post_replies" value="0"<?php if ($group['info']['g_post_replies'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="22" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Post replies help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Post topics label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="post_topics" value="1"<?php if ($group['info']['g_post_topics'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="23" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="post_topics" value="0"<?php if ($group['info']['g_post_topics'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="24" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Post topics help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Edit posts label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="edit_posts" value="1"<?php if ($group['info']['g_edit_posts'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="25" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="edit_posts" value="0"<?php if ($group['info']['g_edit_posts'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="26" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Edit posts help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Delete posts label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="delete_posts" value="1"<?php if ($group['info']['g_delete_posts'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="27" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="delete_posts" value="0"<?php if ($group['info']['g_delete_posts'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="28" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Delete posts help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Delete topics label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="delete_topics" value="1"<?php if ($group['info']['g_delete_topics'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="29" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="delete_topics" value="0"<?php if ($group['info']['g_delete_topics'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="30" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Delete topics help') ?></span>
-									</td>
-								</tr>
-<?php endif; ?>								<tr>
-									<th scope="row"><?php _e('Post links label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="post_links" value="1"<?php if ($group['info']['g_post_links'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="31" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="post_links" value="0"<?php if ($group['info']['g_post_links'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="32" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Post links help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Set own title label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="set_title" value="1"<?php if ($group['info']['g_set_title'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="33" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="set_title" value="0"<?php if ($group['info']['g_set_title'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="34" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Set own title help') ?></span>
-									</td>
-								</tr>
-<?php endif; ?>								<tr>
-									<th scope="row"><?php _e('User search label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="search" value="1"<?php if ($group['info']['g_search'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="35" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="search" value="0"<?php if ($group['info']['g_search'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="36" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('User search help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('User list search label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="search_users" value="1"<?php if ($group['info']['g_search_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="37" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="search_users" value="0"<?php if ($group['info']['g_search_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="38" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('User list search help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Send e-mails label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="send_email" value="1"<?php if ($group['info']['g_send_email'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="39" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="send_email" value="0"<?php if ($group['info']['g_send_email'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="40" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Send e-mails help') ?></span>
-									</td>
-								</tr>
-<?php endif; ?>								<tr>
-									<th scope="row"><?php _e('Post flood label') ?></th>
-									<td>
-										<input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_post_flood'] ?>" tabindex="41" />
-										<span><?php _e('Post flood help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Search flood label') ?></th>
-									<td>
-										<input type="text" name="search_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_search_flood'] ?>" tabindex="42" />
-										<span><?php _e('Search flood help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('E-mail flood label') ?></th>
-									<td>
-										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_email_flood'] ?>" tabindex="43" />
-										<span><?php _e('E-mail flood help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Report flood label') ?></th>
-									<td>
-										<input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_report_flood'] ?>" tabindex="44" />
-										<span><?php _e('Report flood help') ?></span>
-									</td>
-								</tr>
-<?php endif; endif; ?>							</table>
-<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php _e('Moderator info') ?></p>
-<?php endif; ?>						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" tabindex="45" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/groups/admin_groups.php b/view/admin/groups/admin_groups.php
deleted file mode 100644
index 74ebedd4..00000000
--- a/view/admin/groups/admin_groups.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Add groups head') ?></span></h2>
-		<div class="box">
-				<div class="inform">
-					<fieldset>
-                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/add/') ?>">
-                        <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php _e('Add group subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('New group label') ?><div><input type="submit" name="add_group" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
-									<td>
-										<select id="base_group" name="base_group" tabindex="1">
-<?php
-
-foreach ($groups as $cur_group) {
-    if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
-        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
-        } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
-        }
-    }
-}
-
-?>
-										</select>
-										<span><?php _e('New group help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-                        </form>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/') ?>">
-                        	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php _e('Default group subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Default group label') ?><div><input type="submit" name="set_default_group" value="<?php _e('Save') ?>" tabindex="4" /></div></th>
-									<td>
-										<select id="default_group" name="default_group" tabindex="3">
-<?php
-
-foreach ($groups as $cur_group) {
-    if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
-        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
-        } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
-        }
-    }
-}
-
-?>
-										</select>
-										<span><?php _e('Default group help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-                        </form>
-					</fieldset>
-				</div>
-		</div>
-
-		<h2 class="block2"><span><?php _e('Existing groups head') ?></span></h2>
-		<div class="box">
-			<div class="fakeform">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit groups subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Edit groups info') ?></p>
-							<table>
-<?php
-foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.Utils::escape($cur_group['g_title']).'</td></tr>'."\n";
-}
-
-?>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/groups/confirm_delete.php b/view/admin/groups/confirm_delete.php
deleted file mode 100644
index b43d0b58..00000000
--- a/view/admin/groups/confirm_delete.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Group delete head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-				<input type="hidden" name="group_to_delete" value="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>" />
-					<fieldset>
-						<legend><?php _e('Confirm delete subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Confirm delete info'), Utils::escape($group_title)) ?></p>
-							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="del_group_comply" value="<?php _e('Delete') ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/groups/delete_group.php b/view/admin/groups/delete_group.php
deleted file mode 100644
index 0205422f..00000000
--- a/view/admin/groups/delete_group.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Delete group head') ?></span></h2>
-		<div class="box">
-			<form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Move users subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Move users info'), Utils::escape($group_info['title']), Utils::forum_number_format($group_info['members'])) ?></p>
-							<label><?php _e('Move users label') ?>
-							<select name="move_to_group">
-								<?= $group_list_delete; ?>
-							</select>
-							<br /></label>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="del_group" value="<?php _e('Delete group') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
diff --git a/view/admin/index.php b/view/admin/index.php
deleted file mode 100644
index c836ab4a..00000000
--- a/view/admin/index.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="block">
-		<h2><span><?php _e('Forum admin head') ?></span></h2>
-		<div id="adintro" class="box">
-			<div class="inbox">
-				<p><?php _e('Welcome to admin') ?></p>
-				<ul>
-					<li><span><?php _e('Welcome 1') ?></span></li>
-					<li><span><?php _e('Welcome 2') ?></span></li>
-					<li><span><?php _e('Welcome 3') ?></span></li>
-					<li><span><?php _e('Welcome 4') ?></span></li>
-					<li><span><?php _e('Welcome 5') ?></span></li>
-					<li><span><?php _e('Welcome 6') ?></span></li>
-					<li><span><?php _e('Welcome 7') ?></span></li>
-					<li><span><?php _e('Welcome 8') ?></span></li>
-					<li><span><?php _e('Welcome 9') ?></span></li>
-				</ul>
-			</div>
-		</div>
-
-<?php if ($install_file_exists) : ?>
-		<h2 class="block2"><span><?php _e('Alerts head') ?></span></h2>
-		<div id="adalerts" class="box">
-			<p><?php printf(__('Install file exists'), '<a href="'.$feather->url->get('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
-		</div>
-<?php endif; ?>
-
-		<h2 class="block2"><span><?php _e('About head') ?></span></h2>
-		<div id="adstats" class="box">
-			<div class="inbox">
-				<dl>
-					<dt><?php _e('FeatherBB version label') ?></dt>
-					<dd>
-						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.$feather->url->get('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
-					</dd>
-					<dt><?php _e('Server statistics label') ?></dt>
-					<dd>
-						<a href="<?php echo $feather->url->get('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
-					</dd>
-					<dt><?php _e('Support label') ?></dt>
-					<dd>
-						<a href="http://FeatherBB.org/forums/index.php"><?php _e('Forum label') ?></a> - <a href="http://gitter.im/featherbb/featherbb"><?php _e('IRC label') ?></a>
-					</dd>
-				</dl>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/loader.php b/view/admin/loader.php
deleted file mode 100644
index 2a443eb0..00000000
--- a/view/admin/loader.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/maintenance/admin_maintenance.php b/view/admin/maintenance/admin_maintenance.php
deleted file mode 100644
index 842dfade..00000000
--- a/view/admin/maintenance/admin_maintenance.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Maintenance head') ?></span></h2>
-		<div class="box">
-			<form method="get" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
-				<div class="inform">
-					<input type="hidden" name="action" value="rebuild" />
-					<fieldset>
-						<legend><?php _e('Rebuild index subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Rebuild index info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Posts per cycle label') ?></th>
-									<td>
-										<input type="text" name="i_per_page" size="7" maxlength="7" value="300" tabindex="1" />
-										<span><?php _e('Posts per cycle help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Starting post label') ?></th>
-									<td>
-										<input type="text" name="i_start_at" size="7" maxlength="7" value="<?php echo(isset($first_id)) ? $first_id : 0 ?>" tabindex="2" />
-										<span><?php _e('Starting post help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Empty index label') ?></th>
-									<td class="inputadmin">
-										<label><input type="checkbox" name="i_empty_index" value="1" tabindex="3" checked="checked" />&#160;&#160;<?php _e('Empty index help') ?></label>
-									</td>
-								</tr>
-							</table>
-							<p class="topspace"><?php _e('Rebuild completed info') ?></p>
-							<div class="fsetsubmit"><input type="submit" name="rebuild_index" value="<?php _e('Rebuild index') ?>" tabindex="4" /></div>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-
-			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>" onsubmit="return process_form(this)">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<input type="hidden" name="action" value="prune" />
-					<fieldset>
-						<legend><?php _e('Prune subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Days old label') ?></th>
-									<td>
-										<input type="text" name="req_prune_days" size="3" maxlength="3" tabindex="5" />
-										<span><?php _e('Days old help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Prune sticky label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="prune_sticky" value="1" tabindex="6" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="prune_sticky" value="0" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Prune sticky help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Prune from label') ?></th>
-									<td>
-										<select name="prune_from" tabindex="7">
-											<option value="all"><?php _e('All forums') ?></option>
-												<?php echo $categories; ?>
-											</optgroup>
-										</select>
-										<span><?php _e('Prune from help') ?></span>
-									</td>
-								</tr>
-							</table>
-							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
-							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php _e('Prune') ?>" tabindex="8" /></div>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/maintenance/prune.php b/view/admin/maintenance/prune.php
deleted file mode 100644
index 7b4334ba..00000000
--- a/view/admin/maintenance/prune.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Prune head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<input type="hidden" name="action" value="prune" />
-					<input type="hidden" name="prune_days" value="<?php echo $prune['days'] ?>" />
-					<input type="hidden" name="prune_sticky" value="<?php echo $prune_sticky ?>" />
-					<input type="hidden" name="prune_from" value="<?php echo $prune_from ?>" />
-					<fieldset>
-						<legend><?php _e('Confirm prune subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], Utils::forum_number_format($prune['num_topics'])) ?></p>
-							<p class="warntext"><?php _e('Confirm prune warn') ?></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="prune_comply" value="<?php _e('Prune') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/maintenance/rebuild.php b/view/admin/maintenance/rebuild.php
deleted file mode 100644
index cc688587..00000000
--- a/view/admin/maintenance/rebuild.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-<h1><?php _e('Rebuilding index info') ?></h1>
-<script type="text/javascript">window.location="<?= $feather->url->get('admin/maintenance/').$query_str ?>"</script>
-<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.$feather->url->get('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>
diff --git a/view/admin/menu.php b/view/admin/menu.php
deleted file mode 100644
index dedcb9f7..00000000
--- a/view/admin/menu.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="adminconsole" class="block2col">
-	<div id="adminmenu" class="blockmenu">
-		<h2><span><?php _e('Moderator menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-					<li<?php if ($page == 'index') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Index') ?></a></li>
-					<li<?php if ($page == 'users') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-<?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
-<?php endif;
-    if ($is_admin || $feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
-<?php endif;
-    ?>				</ul>
-			</div>
-		</div>
-<?php
-
-    if ($is_admin) {
-        ?>
-		<h2 class="block2"><span><?php _e('Admin menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-					<li<?php if ($page == 'options') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/options/') ?>"><?php _e('Options') ?></a></li>
-					<li<?php if ($page == 'permissions') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
-					<li<?php if ($page == 'categories') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
-					<li<?php if ($page == 'forums') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
-					<li<?php if ($page == 'groups') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
-					<li<?php if ($page == 'plugins') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/plugins/') ?>"><?= 'Plugins'; ?></a></li>
-					<li<?php if ($page == 'censoring') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
-					<li<?php if ($page == 'parser') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
-					<li<?php if ($page == 'maintenance') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
-				</ul>
-			</div>
-		</div>
-<?php
-
-    }
-
-    // Did we find any plugins?
-    if (!empty($plugins)) {
-        ?>
-		<h2 class="block2"><span><?php _e('Plugins menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-<?php
-
-        foreach ($plugins as $plugin_name => $plugin) {
-            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.$feather->url->get('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
-        }
-
-        ?>
-				</ul>
-			</div>
-		</div>
-<?php
-
-    }
-
-    ?>
-	</div>
diff --git a/view/admin/options.php b/view/admin/options.php
deleted file mode 100644
index 997c73a0..00000000
--- a/view/admin/options.php
+++ /dev/null
@@ -1,844 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-use FeatherBB\Core\Random;
-use FeatherBB\Core\Url;
-use FeatherBB\Core\Utils;
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-	exit;
-}
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('Options head') ?></span></h2>
-	<div class="box">
-		<form method="post" action="<?php echo Url::get('admin/options/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-			<div class="inform">
-				<input type="hidden" name="form_sent" value="1" />
-				<fieldset>
-					<legend><?php _e('Essentials subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Board title label') ?></th>
-								<td>
-									<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo Utils::escape($feather->forum_settings['o_board_title']) ?>" />
-									<span><?php _e('Board title help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Board desc label') ?></th>
-								<td>
-									<textarea name="form_board_desc" cols="60" rows="3"><?php echo Utils::escape($feather->forum_settings['o_board_desc']) ?></textarea>
-									<span><?php _e('Board desc help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Base URL label') ?></th>
-								<td>
-									<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo Utils::escape($feather->forum_settings['o_base_url']) ?>" />
-									<span><?php _e('Base URL help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Timezone label') ?></th>
-								<td>
-									<select name="form_default_timezone">
-										<option value="-12"<?php if ($feather->forum_settings['o_default_timezone'] == -12) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-12:00') ?></option>
-										<option value="-11"<?php if ($feather->forum_settings['o_default_timezone'] == -11) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-11:00') ?></option>
-										<option value="-10"<?php if ($feather->forum_settings['o_default_timezone'] == -10) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-10:00') ?></option>
-										<option value="-9.5"<?php if ($feather->forum_settings['o_default_timezone'] == -9.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-09:30') ?></option>
-										<option value="-9"<?php if ($feather->forum_settings['o_default_timezone'] == -9) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-09:00') ?></option>
-										<option value="-8.5"<?php if ($feather->forum_settings['o_default_timezone'] == -8.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-08:30') ?></option>
-										<option value="-8"<?php if ($feather->forum_settings['o_default_timezone'] == -8) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-08:00') ?></option>
-										<option value="-7"<?php if ($feather->forum_settings['o_default_timezone'] == -7) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-07:00') ?></option>
-										<option value="-6"<?php if ($feather->forum_settings['o_default_timezone'] == -6) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-06:00') ?></option>
-										<option value="-5"<?php if ($feather->forum_settings['o_default_timezone'] == -5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-05:00') ?></option>
-										<option value="-4"<?php if ($feather->forum_settings['o_default_timezone'] == -4) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-04:00') ?></option>
-										<option value="-3.5"<?php if ($feather->forum_settings['o_default_timezone'] == -3.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-03:30') ?></option>
-										<option value="-3"<?php if ($feather->forum_settings['o_default_timezone'] == -3) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-03:00') ?></option>
-										<option value="-2"<?php if ($feather->forum_settings['o_default_timezone'] == -2) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-02:00') ?></option>
-										<option value="-1"<?php if ($feather->forum_settings['o_default_timezone'] == -1) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-01:00') ?></option>
-										<option value="0"<?php if ($feather->forum_settings['o_default_timezone'] == 0) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC') ?></option>
-										<option value="1"<?php if ($feather->forum_settings['o_default_timezone'] == 1) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+01:00') ?></option>
-										<option value="2"<?php if ($feather->forum_settings['o_default_timezone'] == 2) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+02:00') ?></option>
-										<option value="3"<?php if ($feather->forum_settings['o_default_timezone'] == 3) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+03:00') ?></option>
-										<option value="3.5"<?php if ($feather->forum_settings['o_default_timezone'] == 3.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+03:30') ?></option>
-										<option value="4"<?php if ($feather->forum_settings['o_default_timezone'] == 4) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+04:00') ?></option>
-										<option value="4.5"<?php if ($feather->forum_settings['o_default_timezone'] == 4.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+04:30') ?></option>
-										<option value="5"<?php if ($feather->forum_settings['o_default_timezone'] == 5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+05:00') ?></option>
-										<option value="5.5"<?php if ($feather->forum_settings['o_default_timezone'] == 5.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+05:30') ?></option>
-										<option value="5.75"<?php if ($feather->forum_settings['o_default_timezone'] == 5.75) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+05:45') ?></option>
-										<option value="6"<?php if ($feather->forum_settings['o_default_timezone'] == 6) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+06:00') ?></option>
-										<option value="6.5"<?php if ($feather->forum_settings['o_default_timezone'] == 6.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+06:30') ?></option>
-										<option value="7"<?php if ($feather->forum_settings['o_default_timezone'] == 7) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+07:00') ?></option>
-										<option value="8"<?php if ($feather->forum_settings['o_default_timezone'] == 8) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+08:00') ?></option>
-										<option value="8.75"<?php if ($feather->forum_settings['o_default_timezone'] == 8.75) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+08:45') ?></option>
-										<option value="9"<?php if ($feather->forum_settings['o_default_timezone'] == 9) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+09:00') ?></option>
-										<option value="9.5"<?php if ($feather->forum_settings['o_default_timezone'] == 9.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+09:30') ?></option>
-										<option value="10"<?php if ($feather->forum_settings['o_default_timezone'] == 10) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+10:00') ?></option>
-										<option value="10.5"<?php if ($feather->forum_settings['o_default_timezone'] == 10.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+10:30') ?></option>
-										<option value="11"<?php if ($feather->forum_settings['o_default_timezone'] == 11) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+11:00') ?></option>
-										<option value="11.5"<?php if ($feather->forum_settings['o_default_timezone'] == 11.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+11:30') ?></option>
-										<option value="12"<?php if ($feather->forum_settings['o_default_timezone'] == 12) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+12:00') ?></option>
-										<option value="12.75"<?php if ($feather->forum_settings['o_default_timezone'] == 12.75) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+12:45') ?></option>
-										<option value="13"<?php if ($feather->forum_settings['o_default_timezone'] == 13) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+13:00') ?></option>
-										<option value="14"<?php if ($feather->forum_settings['o_default_timezone'] == 14) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+14:00') ?></option>
-									</select>
-									<span><?php _e('Timezone help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('DST label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather->forum_settings['o_default_dst'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather->forum_settings['o_default_dst'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('DST help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Language label') ?></th>
-								<td>
-									<select name="form_default_lang">
-										<?php echo $languages; ?>
-									</select>
-									<span><?php _e('Language help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Default style label') ?></th>
-								<td>
-									<select name="form_default_style">
-										<?php echo $styles; ?>
-									</select>
-									<span><?php _e('Default style help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<?php
-
-			$diff = ($feather->user->timezone + $feather->user->dst) * 3600;
-			$timestamp = time() + $diff;
-
-			?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Timeouts subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Time format label') ?></th>
-								<td>
-									<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo Utils::escape($feather->forum_settings['o_time_format']) ?>" />
-									<span><?php printf(__('Time format help'), gmdate($feather->forum_settings['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Date format label') ?></th>
-								<td>
-									<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo Utils::escape($feather->forum_settings['o_date_format']) ?>" />
-									<span><?php printf(__('Date format help'), gmdate($feather->forum_settings['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Visit timeout label') ?></th>
-								<td>
-									<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_visit'] ?>" />
-									<span><?php _e('Visit timeout help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Online timeout label') ?></th>
-								<td>
-									<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_online'] ?>" />
-									<span><?php _e('Online timeout help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Redirect time label') ?></th>
-								<td>
-									<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_redirect_delay'] ?>" />
-									<span><?php _e('Redirect time help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Display subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Version number label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather->forum_settings['o_show_version'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather->forum_settings['o_show_version'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Version number help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Info in posts label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather->forum_settings['o_show_user_info'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather->forum_settings['o_show_user_info'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Info in posts help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Post count label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather->forum_settings['o_show_post_count'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather->forum_settings['o_show_post_count'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Post count help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Smilies label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather->forum_settings['o_smilies'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather->forum_settings['o_smilies'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Smilies help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Smilies sigs label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather->forum_settings['o_smilies_sig'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather->forum_settings['o_smilies_sig'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Smilies sigs help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Clickable links label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather->forum_settings['o_make_links'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather->forum_settings['o_make_links'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Clickable links help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Topic review label') ?></th>
-								<td>
-									<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_topic_review'] ?>" />
-									<span><?php _e('Topic review help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Topics per page label') ?></th>
-								<td>
-									<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_topics_default'] ?>" />
-									<span><?php _e('Topics per page help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Posts per page label') ?></th>
-								<td>
-									<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_posts_default'] ?>" />
-									<span><?php _e('Posts per page help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Indent label') ?></th>
-								<td>
-									<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_indent_num_spaces'] ?>" />
-									<span><?php _e('Indent help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Quote depth label') ?></th>
-								<td>
-									<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_quote_depth'] ?>" />
-									<span><?php _e('Quote depth help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Features subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Quick post label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather->forum_settings['o_quickpost'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather->forum_settings['o_quickpost'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Quick post help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Users online label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather->forum_settings['o_users_online'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather->forum_settings['o_users_online'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Users online help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><a name="censoring"></a><?php _e('Censor words label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather->forum_settings['o_censoring'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.Url::get('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><a name="signatures"></a><?php _e('Signatures label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather->forum_settings['o_signatures'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather->forum_settings['o_signatures'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Signatures help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('User has posted label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather->forum_settings['o_show_dot'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather->forum_settings['o_show_dot'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('User has posted help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Topic views label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather->forum_settings['o_topic_views'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather->forum_settings['o_topic_views'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Topic views help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Quick jump label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather->forum_settings['o_quickjump'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather->forum_settings['o_quickjump'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Quick jump help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('GZip label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather->forum_settings['o_gzip'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather->forum_settings['o_gzip'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('GZip help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Search all label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather->forum_settings['o_search_all_forums'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather->forum_settings['o_search_all_forums'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Search all help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Menu items label') ?></th>
-								<td>
-									<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo Utils::escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
-									<span><?php _e('Menu items help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Feed subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Default feed label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather->forum_settings['o_feed_type'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('None') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather->forum_settings['o_feed_type'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('RSS') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather->forum_settings['o_feed_type'] == '2') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Atom') ?></strong></label>
-									<span class="clearb"><?php _e('Default feed help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Feed TTL label') ?></th>
-								<td>
-									<select name="form_feed_ttl">
-										<option value="0"<?php if ($feather->forum_settings['o_feed_ttl'] == '0') {
-											echo ' selected="selected"';
-										} ?>><?php _e('No cache') ?></option>
-										<?php echo $times ?>
-									</select>
-									<span><?php _e('Feed TTL help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Reports subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Reporting method label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather->forum_settings['o_report_method'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Internal') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather->forum_settings['o_report_method'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('By e-mail') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather->forum_settings['o_report_method'] == '2') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Both') ?></strong></label>
-									<span class="clearb"><?php _e('Reporting method help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Mailing list label') ?></th>
-								<td>
-									<textarea name="form_mailing_list" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_mailing_list']) ?></textarea>
-									<span><?php _e('Mailing list help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Avatars subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Use avatars label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather->forum_settings['o_avatars'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather->forum_settings['o_avatars'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Use avatars help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Upload directory label') ?></th>
-								<td>
-									<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo Utils::escape($feather->forum_settings['o_avatars_dir']) ?>" />
-									<span><?php _e('Upload directory help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Max width label') ?></th>
-								<td>
-									<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_width'] ?>" />
-									<span><?php _e('Max width help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Max height label') ?></th>
-								<td>
-									<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_height'] ?>" />
-									<span><?php _e('Max height help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Max size label') ?></th>
-								<td>
-									<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
-									<span><?php _e('Max size help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('E-mail subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Admin e-mail label') ?></th>
-								<td>
-									<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo Utils::escape($feather->forum_settings['o_admin_email']) ?>" />
-									<span><?php _e('Admin e-mail help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
-								<td>
-									<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo Utils::escape($feather->forum_settings['o_webmaster_email']) ?>" />
-									<span><?php _e('Webmaster e-mail help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Forum subscriptions label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Forum subscriptions help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Topic subscriptions label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Topic subscriptions help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('SMTP address label') ?></th>
-								<td>
-									<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo Utils::escape($feather->forum_settings['o_smtp_host']) ?>" />
-									<span><?php _e('SMTP address help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('SMTP username label') ?></th>
-								<td>
-									<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo Utils::escape($feather->forum_settings['o_smtp_user']) ?>" />
-									<span><?php _e('SMTP username help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('SMTP password label') ?></th>
-								<td>
-									<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
-									<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? Random::key(Utils::strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
-									<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
-									<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
-									<span><?php _e('SMTP password help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('SMTP SSL label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather->forum_settings['o_smtp_ssl'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather->forum_settings['o_smtp_ssl'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('SMTP SSL help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Registration subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Allow new label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather->forum_settings['o_regs_allow'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather->forum_settings['o_regs_allow'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Allow new help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Verify label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather->forum_settings['o_regs_verify'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather->forum_settings['o_regs_verify'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Verify help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Report new label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather->forum_settings['o_regs_report'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather->forum_settings['o_regs_report'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Report new help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Use rules label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather->forum_settings['o_rules'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather->forum_settings['o_rules'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Use rules help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Rules label') ?></th>
-								<td>
-									<textarea name="form_rules_message" rows="10" cols="55"><?php echo Utils::escape($feather->forum_settings['o_rules_message']) ?></textarea>
-									<span><?php _e('Rules help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('E-mail default label') ?></th>
-								<td>
-									<span><?php _e('E-mail default help') ?></span>
-									<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather->forum_settings['o_default_email_setting'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<?php _e('Display e-mail label') ?></label>
-									<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather->forum_settings['o_default_email_setting'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<?php _e('Hide allow form label') ?></label>
-									<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather->forum_settings['o_default_email_setting'] == '2') {
-											echo ' checked="checked"';
-										} ?> />&#160;<?php _e('Hide both label') ?></label>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Announcement subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Display announcement label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather->forum_settings['o_announcement'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather->forum_settings['o_announcement'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Display announcement help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Announcement message label') ?></th>
-								<td>
-									<textarea name="form_announcement_message" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_announcement_message']) ?></textarea>
-									<span><?php _e('Announcement message help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Maintenance subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><a name="maintenance"></a><?php _e('Maintenance mode label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather->forum_settings['o_maintenance'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather->forum_settings['o_maintenance'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Maintenance mode help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Maintenance message label') ?></th>
-								<td>
-									<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
-									<span><?php _e('Maintenance message help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-		</form>
-	</div>
-</div>
-<div class="clearer"></div>
-</div>
diff --git a/view/admin/parser.php b/view/admin/parser.php
deleted file mode 100644
index bfcf5133..00000000
--- a/view/admin/parser.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php echo $lang_admin_parser['Parser head'] ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/parser/') ?>" enctype="multipart/form-data">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop">
-					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
-					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
-				</p>
-				<div class="inform">
-					<input type="hidden" name="form_sent" value="1" />
-					<fieldset>
-						<legend><?php echo $lang_admin_parser['Config subhead'] ?></legend>
-						<div class="infldset">
-							<table class="aligntop" cellspacing="0">
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['textile'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[textile]" value="1"<?php if ($config['textile']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[textile]" value="0"<?php if (!$config['textile']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['textile help'] ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['quote_links'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[quote_links]" value="1"<?php if ($config['quote_links']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_links]" value="0"<?php if (!$config['quote_links']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['quote_links help'] ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['quote_imgs'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[quote_imgs]" value="1"<?php if ($config['quote_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_imgs]" value="0"<?php if (!$config['quote_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['quote_imgs help'] ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['click_imgs'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[click_imgs]" value="1"<?php if ($config['click_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[click_imgs]" value="0"<?php if (!$config['click_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['click_imgs help'] ?></span>
-									</td>
-								</tr>
-
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['valid_imgs'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[valid_imgs]" value="1"<?php if ($config['valid_imgs']) {
-    echo ' checked="checked"';
-} if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. Utils::escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php _e('Yes') ?></strong>
-										<input type="radio" name="config[valid_imgs]" value="0"<?php if (!$config['valid_imgs']) {
-    echo ' checked="checked"';
-} if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. Utils::escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td><?php echo $lang_admin_parser['valid_imgs help'] ?></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['max_size'] ?></th>
-									<td colspan="2">
-										<input type="text" name="config[max_size]" size="10" maxlength="8" value="<?php echo($config['max_size'])?>"<?php if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. Utils::escape($lang_admin_parser['unavailable']) .'"');
-} ?> />
-									</td>
-									<td><span><?php echo $lang_admin_parser['max_size help'] ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['def_xy'] ?></th>
-									<td>
-										<input type="text" name="config[def_width]" size="5" maxlength="5" value="<?php echo $config['def_width'] ?>" /> X:Width
-									</td>
-									<td>
-										<input type="text" name="config[def_height]" size="5" maxlength="5" value="<?php echo $config['def_height'] ?>" /> Y:Height
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['def_xy help'] ?></span>
-									</td>
-								</tr>
-
-
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['max_xy'] ?></th>
-									<td>
-										<input type="text" name="config[max_width]" size="5" maxlength="5" value="<?php echo $config['max_width'] ?>" /> X:Width
-									</td>
-									<td>
-										<input type="text" name="config[max_height]" size="5" maxlength="5" value="<?php echo $config['max_height'] ?>" /> Y:Height
-									</td>
-									<td><?php echo $lang_admin_parser['max_xy help'] ?></td>
-								</tr>
-
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['smiley_size'] ?></th>
-									<td colspan=2>
-										<input type="text" name="config[smiley_size]" size="5" maxlength="5" value="<?php echo $config['smiley_size'] .'%' ?>" />
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['smiley_size help'] ?></span>
-									</td>
-								</tr>
-
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php echo $lang_admin_parser['Smilies subhead'] ?></legend>
-						<div class="infldset">
-							<table cellspacing="0">
-							<thead>
-								<tr>
-									<th scope="col"><?php echo $lang_admin_parser['smiley_text_label'] ?></th>
-									<th scope="col"><?php echo $lang_admin_parser['smiley_file_label'] ?></th>
-									<th scope="col">:)</th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-    foreach ($smilies as $key => $value) {
-        $i++;
-        $oldfile = $value['file'];
-        ?>
-								<tr>
-									<td><input type="text" name="smiley_text[<?php echo($i);
-        ?>]" value="<?php echo(Utils::escape($key));
-        ?>" size="20" maxlength="80" /></td>
-									<td>
-										<select name="smiley_file[<?php echo($i);
-        ?>]">
-<?php
-        foreach ($smiley_files as $file) {
-            if ($file === $oldfile) {
-                echo("\t\t\t\t\t\t\t\t\t\t\t<option selected=\"selected\">" . $file . "</option>\n");
-            } else {
-                echo("\t\t\t\t\t\t\t\t\t\t\t<option>" . $file . "</option>\n");
-            }
-        }
-        ?>
-										</select>
-									</td>
-									<td>
-										<?php echo($value['html']);
-        ?>
-									</td>
-								</tr>
-<?php
-
-    }
-?>
-								<tr>
-									<td><input type="text" name="smiley_text[<?php echo(++$i); ?>]" value="" size="20" maxlength="80" /><br />New smiley text</td>
-									<td>
-										<select name="smiley_file[<?php echo($i); ?>]">
-											<option selected="selected">select new file</option>
-<?php
-        foreach ($smiley_files as $file) {
-            echo("\t\t\t\t\t\t\t\t\t\t\t<option>" . $file . "</option>\n");
-        }
-?>
-										</select><br /><?php echo($lang_admin_parser['New smiley image']); ?>
-									</td>
-									<td></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo($lang_admin_parser['smiley_upload']); ?></th>
- <?php if (ini_get('file_uploads')) {
-    ?>
-									<td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
-										<input type="file" name="new_smiley" id="upload_smiley" /></td>
-									<td><input type="submit" name="upload" value="<?php echo($lang_admin_parser['upload_button']);
-    ?>" /></td>
-<?php 
-} else {
-    ?>
-									<td colspan="2"><?php echo($lang_admin_parser['upload_off']);
-    ?></td>
-<?php 
-} ?>
-								</tr>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-
-
-
-				<div class="inform">
-					<fieldset>
-						<legend><?php echo $lang_admin_parser['BBCodes subhead'] ?></legend>
-						<div class="infldset">
-							<table cellspacing="0">
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php echo $lang_admin_parser['tagname_label'] ?></th>
-									<th class="tc3" scope="col"><?php echo $lang_admin_parser['in_post_label'] ?></th>
-									<th class="hidehead" scope="col"><?php echo $lang_admin_parser['in_sig_label'] ?></th>
-									<th class="tc2" scope="col"><?php echo $lang_admin_parser['depth_max'] ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-foreach ($bbcd as $tagname => $tagdata) {
-    if ($tagname == '_ROOT_') {
-        continue;
-    } // Skip last pseudo-tag
-    $title = isset($lang_admin_parser['tag_summary'][$tagname]) ?
-                $lang_admin_parser['tag_summary'][$tagname] : '';
-    ?>
-								<tr>
-									<th scope="row" title="<?php echo($title);
-    ?>"><?php echo('['. $tagname .']') ?></th>
-									<td>
-										<input type="radio" name="<?php echo($tagname) ?>_in_post" value="1"<?php if ($bbcd[$tagname]['in_post']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_post" value="0"<?php if (!$bbcd[$tagname]['in_post']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<input type="radio" name="<?php echo($tagname) ?>_in_sig" value="1"<?php if ($bbcd[$tagname]['in_sig']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_sig" value="0"<?php if (!$bbcd[$tagname]['in_sig']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<input type="text" size="10" name="<?php echo($tagname) ?>_depth_max" value="<?php echo($bbcd[$tagname]['depth_max']);
-    ?>" <?php if ($tagdata['html_type'] === 'inline' || $tagdata['tag_type'] === 'hidden') {
-    echo(' disabled="disabled" style="display: none;"');
-}
-    ?> />
-									</td>
-								</tr>
-<?php 
-} ?>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-
-
-				<p class="submitend">
-					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
-					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
-				</p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/permissions.php b/view/admin/permissions.php
deleted file mode 100644
index 370b1507..00000000
--- a/view/admin/permissions.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Permissions head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/permissions/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-				<div class="inform">
-					<input type="hidden" name="form_sent" value="1" />
-					<fieldset>
-						<legend><?php _e('Posting subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('BBCode label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather->forum_settings['p_message_bbcode'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather->forum_settings['p_message_bbcode'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('BBCode help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Image tag label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather->forum_settings['p_message_img_tag'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather->forum_settings['p_message_img_tag'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Image tag help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('All caps message label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather->forum_settings['p_message_all_caps'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather->forum_settings['p_message_all_caps'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('All caps message help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('All caps subject label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather->forum_settings['p_subject_all_caps'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather->forum_settings['p_subject_all_caps'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('All caps subject help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Require e-mail label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather->forum_settings['p_force_guest_email'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather->forum_settings['p_force_guest_email'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Require e-mail help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Signatures subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('BBCode sigs label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather->forum_settings['p_sig_bbcode'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather->forum_settings['p_sig_bbcode'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('BBCode sigs help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Image tag sigs label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather->forum_settings['p_sig_img_tag'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather->forum_settings['p_sig_img_tag'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Image tag sigs help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('All caps sigs label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather->forum_settings['p_sig_all_caps'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather->forum_settings['p_sig_all_caps'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('All caps sigs help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max sig length label') ?></th>
-									<td>
-										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather->forum_settings['p_sig_length'] ?>" />
-										<span class="clearb"><?php _e('Max sig length help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max sig lines label') ?></th>
-									<td>
-										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather->forum_settings['p_sig_lines'] ?>" />
-										<span class="clearb"><?php _e('Max sig lines help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Registration subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Banned e-mail label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather->forum_settings['p_allow_banned_email'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather->forum_settings['p_allow_banned_email'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Banned e-mail help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Duplicate e-mail label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Duplicate e-mail help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/plugins.php b/view/admin/plugins.php
deleted file mode 100644
index fde8d1f2..00000000
--- a/view/admin/plugins.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div class="block">
-    <h2>Plugins</h2>
-    <div class="box">
-        <div class="inbox">
-            <table class="table">
-                <caption>The following plugins are available</caption>
-                <thead>
-                    <tr>
-                        <th>Extension</th>
-                        <th>Description</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <?php foreach ($pluginsList as $plugin => $class) : ?>
-                        <tr>
-                            <td>
-                                <strong><?= $class::$name; ?></strong>
-                                <div class="plugin-actions">
-                                    <?php if (array_key_exists($class, $activePlugins)) { ?>
-                                        <a href="<?= $feather->url->get('/admin/plugins/deactivate?plugin='.$class) ?>">Deactivate</a>
-                                    <?php } else { ?>
-                                        <a href="<?= $feather->url->get('/admin/plugins/activate?plugin='.$class) ?>">Activate</a>
-                                    <?php } ?>
-                                </div>
-                            </td>
-                            <td>
-                                <?= $class::$description; ?>
-                                <div class="plugin-details">
-                                    Version <?= $class::$version; ?> |
-                                    By <?= $class::$author; ?>
-                                </div>
-                            </td>
-                        </tr>
-                    <?php endforeach; ?>
-                </tbody>
-            </table>
-            <p style="text-align:right"><?= count($pluginsList) ?> éléments</p>
-        </div>
-    </div>
-</div>
-
-	<div class="clearer"></div>
-</div>
diff --git a/view/admin/reports.php b/view/admin/reports.php
deleted file mode 100644
index f5f53dc0..00000000
--- a/view/admin/reports.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('New reports head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?= $feather->url->get('admin/reports/') ?>">
-				<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
-<?php
-if (!empty($report_data)) {
-    foreach ($report_data as $report) {
-        ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php printf(__('Report subhead'), $feather->utils->format_time($report['created'])) ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?= $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
-									<td><?= str_replace("\n", '<br />', Utils::escape($report['message'])) ?></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-    }
-} else {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('None') ?></legend>
-						<div class="infldset">
-							<p><?php _e('No new reports') ?></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-}
-
-?>
-			</form>
-		</div>
-	</div>
-
-	<div class="blockform block2">
-		<h2><span><?php _e('Last 10 head') ?></span></h2>
-		<div class="box">
-			<div class="fakeform">
-<?php
-
-if (!empty($report_zapped_data)) {
-    foreach ($report_zapped_data as $report) {
-        ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.Utils::escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Reason') ?></th>
-									<td><?= str_replace("\n", '<br />', Utils::escape($report['message'])) ?></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-    }
-} else {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('None') ?></legend>
-						<div class="infldset">
-							<p><?php _e('No zapped reports') ?></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-}
-
-?>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
diff --git a/view/admin/statistics.php b/view/admin/statistics.php
deleted file mode 100644
index 5317a2ce..00000000
--- a/view/admin/statistics.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="block">
-		<h2><span><?php _e('Server statistics head') ?></span></h2>
-		<div id="adstats" class="box">
-			<div class="inbox">
-				<dl>
-					<dt><?php _e('Server load label') ?></dt>
-					<dd>
-						<?php printf(__('Server load data')."\n", $server_load, $num_online) ?>
-					</dd>
-<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
-					<dd>
-						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
-						<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->url->get('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
-						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
-					</dd>
-					<dt><?php _e('Database label') ?></dt>
-					<dd>
-<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", Utils::forum_number_format($total_records)) ?>
-						<br /><?php printf(__('Database data size')."\n", $total_size) ?>
-<?php endif; ?>					</dd>
-<?php endif; ?>
-				</dl>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/users/admin_users.php b/view/admin/users/admin_users.php
deleted file mode 100644
index 57117eb0..00000000
--- a/view/admin/users/admin_users.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('User search head') ?></span></h2>
-		<div class="box">
-			<form id="find_user" method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
-				<p class="submittop"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="1" /></p>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('User search subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('User search info') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Username label') ?></th>
-									<td><input type="text" name="form[username]" size="25" maxlength="25" tabindex="2" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('E-mail address label') ?></th>
-									<td><input type="text" name="form[email]" size="30" maxlength="80" tabindex="3" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Title label') ?></th>
-									<td><input type="text" name="form[title]" size="30" maxlength="50" tabindex="4" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Real name label') ?></th>
-									<td><input type="text" name="form[realname]" size="30" maxlength="40" tabindex="5" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Website label') ?></th>
-									<td><input type="text" name="form[url]" size="35" maxlength="100" tabindex="6" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Jabber label') ?></th>
-									<td><input type="text" name="form[jabber]" size="30" maxlength="75" tabindex="7" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('ICQ label') ?></th>
-									<td><input type="text" name="form[icq]" size="12" maxlength="12" tabindex="8" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('MSN label') ?></th>
-									<td><input type="text" name="form[msn]" size="30" maxlength="50" tabindex="9" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('AOL label') ?></th>
-									<td><input type="text" name="form[aim]" size="20" maxlength="20" tabindex="10" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Yahoo label') ?></th>
-									<td><input type="text" name="form[yahoo]" size="20" maxlength="20" tabindex="11" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Location label') ?></th>
-									<td><input type="text" name="form[location]" size="30" maxlength="30" tabindex="12" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Signature label') ?></th>
-									<td><input type="text" name="form[signature]" size="35" maxlength="512" tabindex="13" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Admin note label') ?></th>
-									<td><input type="text" name="form[admin_note]" size="30" maxlength="30" tabindex="14" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Posts more than label') ?></th>
-									<td><input type="text" name="posts_greater" size="5" maxlength="8" tabindex="15" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Posts less than label') ?></th>
-									<td><input type="text" name="posts_less" size="5" maxlength="8" tabindex="16" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last post after label') ?></th>
-									<td><input type="text" name="last_post_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last post before label') ?></th>
-									<td><input type="text" name="last_post_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last visit after label') ?></th>
-									<td><input type="text" name="last_visit_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last visit before label') ?></th>
-									<td><input type="text" name="last_visit_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Registered after label') ?></th>
-									<td><input type="text" name="registered_after" size="24" maxlength="19" tabindex="19" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Registered before label') ?></th>
-									<td><input type="text" name="registered_before" size="24" maxlength="19" tabindex="20" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Order by label') ?></th>
-									<td>
-										<select name="order_by" tabindex="21">
-											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
-											<option value="email"><?php _e('Order by e-mail') ?></option>
-											<option value="num_posts"><?php _e('Order by posts') ?></option>
-											<option value="last_post"><?php _e('Order by last post') ?></option>
-											<option value="last_visit"><?php _e('Order by last visit') ?></option>
-											<option value="registered"><?php _e('Order by registered') ?></option>
-										</select>&#160;&#160;&#160;<select name="direction" tabindex="22">
-											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
-											<option value="DESC"><?php _e('Descending') ?></option>
-										</select>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('User group label') ?></th>
-									<td>
-										<select name="user_group" tabindex="23">
-											<option value="-1" selected="selected"><?php _e('All groups') ?></option>
-											<option value="0"><?php _e('Unverified users') ?></option>
-											<?php echo $group_list; ?>
-										</select>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="25" /></p>
-			</form>
-		</div>
-
-		<h2 class="block2"><span><?php _e('IP search head') ?></span></h2>
-		<div class="box">
-			<form method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('IP search subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('IP address label') ?><div><input type="submit" value="<?php _e('Find IP address') ?>" tabindex="26" /></div></th>
-									<td><input type="text" name="show_users" size="18" maxlength="15" tabindex="24" />
-									<span><?php _e('IP address help') ?></span></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/users/ban_users.php b/view/admin/users/ban_users.php
deleted file mode 100644
index e37ceaa8..00000000
--- a/view/admin/users/ban_users.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Ban users') ?></span></h2>
-		<div class="box">
-			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Message expiry subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Ban message label') ?></th>
-									<td>
-										<input type="text" name="ban_message" size="50" maxlength="255" tabindex="1" />
-										<span><?php _e('Ban message help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Expire date label') ?></th>
-									<td>
-										<input type="text" name="ban_expire" size="17" maxlength="10" tabindex="2" />
-										<span><?php _e('Expire date help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Ban IP label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="3" value="1" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="4" value="0" checked="checked" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Ban IP help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="ban_users_comply" value="<?php _e('Save') ?>" tabindex="3" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/users/delete_users.php b/view/admin/users/delete_users.php
deleted file mode 100644
index 747697ab..00000000
--- a/view/admin/users/delete_users.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Delete users') ?></span></h2>
-		<div class="box">
-			<form name="confirm_del_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Confirm delete legend') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Confirm delete info') ?></p>
-							<div class="rbox">
-								<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
-							</div>
-							<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="delete_users_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/users/find_users.php b/view/admin/users/find_users.php
deleted file mode 100644
index 7c5cc513..00000000
--- a/view/admin/users/find_users.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-
-<form id="search-users-form" action="<?php echo $feather->url->get('admin/users/') ?>" method="post">
-<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<div id="users2" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
-					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
-					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
-<?php if ($can_action): ?>					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
-<?php endif;
-    ?>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-    if (!empty($user_data)) {
-        foreach ($user_data as $user) {
-            ?>
-				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo Utils::escape($user['email']) ?>"><?php echo Utils::escape($user['email']) ?></a></td>
-					<td class="tc3"><?php echo $user['user_title'] ?></td>
-					<td class="tc4"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
-					<td class="tc5"><?php echo($user['admin_note'] != '') ? Utils::escape($user['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
-<?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
-<?php endif;
-            ?>
-				</tr>
-<?php
-
-        }
-    } else {
-        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('No match').'</td></tr>'."\n";
-    }
-
-    ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-<?php if ($can_action): ?>			<p class="conr modbuttons"><a href="#" onclick="return select_checkboxes('search-users-form', this, '<?php _e('Unselect all') ?>')"><?php _e('Select all') ?></a> <?php if ($can_ban) : ?><input type="submit" name="ban_users" value="<?php _e('Ban') ?>" /><?php endif;
-    if ($can_delete) : ?><input type="submit" name="delete_users" value="<?php _e('Delete') ?>" /><?php endif;
-    if ($can_move) : ?><input type="submit" name="move_users" value="<?php _e('Change group') ?>" /><?php endif;
-    ?></p>
-<?php endif;
-    ?>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
-</form>
diff --git a/view/admin/users/move_users.php b/view/admin/users/move_users.php
deleted file mode 100644
index 05933bf0..00000000
--- a/view/admin/users/move_users.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Move users') ?></span></h2>
-		<div class="box">
-			<form name="confirm_move_users" method="post" action="<?php echo $feather->url->get('admin/users/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Move users subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('New group label') ?></th>
-									<td>
-										<select name="new_group" tabindex="1">
-<?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo Utils::escape($group) ?></option>
-<?php endforeach;
-    ?>
-										</select>
-										<span><?php _e('New group help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="move_users_comply" value="<?php _e('Save') ?>" tabindex="2" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/users/search_ip.php b/view/admin/users/search_ip.php
deleted file mode 100644
index a5f3f390..00000000
--- a/view/admin/users/search_ip.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="users1" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results IP address head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results last used head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results times found head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results action head') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-        foreach ($ip_data as $ip) {
-            ?>
-				<tr>
-					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.Utils::escape($ip['poster_ip']).'/') ?>"><?php echo Utils::escape($ip['poster_ip']) ?></a></td>
-					<td class="tc2"><?php echo $feather->utils->format_time($ip['last_used']) ?></td>
-					<td class="tc3"><?php echo $ip['used_times'] ?></td>
-					<td class="tcr"><a href="<?php echo $feather->url->get('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
-				</tr>
-<?php
-
-        }
-        if (empty($ip_data)):
-            echo "\t\t\t\t".'<tr><td class="tcl" colspan="4">'.__('Results no posts found').'</td></tr>'."\n";
-        endif;
-
-    ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/admin/users/show_users.php b/view/admin/users/show_users.php
deleted file mode 100644
index 85899359..00000000
--- a/view/admin/users/show_users.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="users2" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
-					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
-					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-    if ($info['num_posts']) {
-
-        // Loop through users and print out some info
-        foreach ($info['posters'] as $cur_poster) {
-            if (isset($info['user_data'][$cur_poster['poster_id']])) {
-                ?>
-				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.Utils::escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
-					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
-					<td class="tc4"><?php echo Utils::forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
-					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? Utils::escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
-				</tr>
-<?php
-
-            } else {
-                ?>
-				<tr>
-					<td class="tcl"><?php echo Utils::escape($cur_poster['poster']) ?></td>
-					<td class="tc2">&#160;</td>
-					<td class="tc3"><?php _e('Results guest') ?></td>
-					<td class="tc4">&#160;</td>
-					<td class="tc5">&#160;</td>
-					<td class="tcr">&#160;</td>
-				</tr>
-<?php
-
-            }
-        }
-    } else {
-        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('Results no IP found').'</td></tr>'."\n";
-    }
-
-    ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/delete.php b/view/delete.php
deleted file mode 100644
index 6ea36ea3..00000000
--- a/view/delete.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-use FeatherBB\Core\Url;
-use FeatherBB\Core\Utils;
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?= Url::base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?= Url::get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?= Utils::escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?= Url::get('post/'.$id.'/#p'.$id) ?>"><?= Utils::escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<div class="blockform">
-	<h2><span><?php _e('Delete post') ?></span></h2>
-	<div class="box">
-		<form method="post" action="<?= $feather->urlFor('deletePost', array('id'=>$id)) ?>">
-			<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
-			<div class="inform">
-				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.$feather->utils->escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
-					<p><?= ($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
-				</div>
-			</div>
-			<p class="buttons"><input type="submit" name="delete" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
-
-<div id="postreview">
-	<div class="blockpost">
-		<div class="box">
-			<div class="inbox">
-				<div class="postbody">
-					<div class="postleft">
-						<dl>
-							<dt><strong><?= Utils::escape($cur_post['poster']) ?></strong></dt>
-							<dd><span><?= $feather->utils->format_time($cur_post['posted']) ?></span></dd>
-						</dl>
-					</div>
-					<div class="postright">
-						<div class="postmsg">
-							<?= $cur_post['message']."\n" ?>
-						</div>
-					</div>
-				</div>
-				<div class="clearer"></div>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/view/edit.php b/view/edit.php
deleted file mode 100644
index 24b5b449..00000000
--- a/view/edit.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-$cur_index = 1;
-
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<?php
-
-// If there are errors, we display them
-if (!empty($errors)) :
-?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('Post errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('Post errors info') ?></p>
-			<ul class="error-list">
-<?php
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-?>
-			</ul>
-		</div>
-	</div>
-</div>
-<?php
-elseif ($feather->request->post('preview')):
-?>
-<div id="postpreview" class="blockpost">
-	<h2><span><?php _e('Post preview') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postright">
-					<div class="postmsg">
-						<?php echo $preview_message."\n" ?>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-<?php
-endif;
-?>
-<!-- Init BBcode editor toolbar -->
-<script>
-    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
-        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
-</script>
-<script src="<?php echo Url::base() ?>/style/imports/bbeditor.js"></script>
-<div id="editform" class="blockform">
-	<h2><span><?php _e('Edit post') ?></span></h2>
-	<div class="box">
-		<form id="edit" method="post" action="<?php echo $feather->url->get('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Edit post legend') ?></legend>
-					<input type="hidden" name="form_sent" value="1" />
-					<div class="infldset txtarea">
-<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo Utils::escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
-						<script>postEditorToolbar('req_message');</script>
-                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo Utils::escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
-						</ul>
-					</div>
-				</fieldset>
-			</div>
-<?php
-if (!empty($checkboxes)):
-?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Options') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php
-endif;
-?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
diff --git a/view/error.php b/view/error.php
deleted file mode 100644
index 8d4d01cb..00000000
--- a/view/error.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="msg" class="block error">
-    <h2><span><?= $msg_title ?></span></h2>
-    <div class="box">
-        <div class="inbox">
-            <p><?php echo $msg ?></p>
-            <?php if (!$no_back_link) {
-                echo "\t\t\t".'<p><a href="javascript: history.go(-1)">'.__('Go back').'</a></p>';
-            } ?>
-        </div>
-    </div>
-</div>
diff --git a/view/footer.php b/view/footer.php
deleted file mode 100644
index 98c2aced..00000000
--- a/view/footer.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-?>
-</div>
-
-<div id="brdfooter" class="block">
-	<h2><span><?php _e('Board footer') ?></span></h2>
-	<div class="box">
-<?php
-
-if (isset($footer_style) && ($footer_style == 'Forum' || $footer_style == 'Topic') && $is_admmod) {
-    echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
-
-    if ($footer_style == 'Forum') {
-        echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
-        echo "\t\t\t".'</dl>'."\n";
-    } elseif ($footer_style == 'Topic') {
-        if (isset($pid)) {
-            $parameter = 'param/'.$pid.'/';
-        } elseif (isset($p) && $p != 1) {
-            $parameter = 'param/'.$p.'/';
-        } else {
-            $parameter = '';
-        }
-
-
-        echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
-
-        if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
-        } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
-        }
-
-        if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
-        } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
-        }
-
-        echo "\t\t\t".'</dl>'."\n";
-    }
-
-    echo "\t\t\t".'<div class="clearer"></div>'."\n\t\t".'</div>'."\n";
-}
-
-?>
-		<div id="brdfooternav" class="inbox">
-
-<?php
-// Display the "Jump to" drop list
-if ($feather_config['o_quickjump'] == '1' && !empty($quickjump)) { ?>
-			<div class="conl">
-			<form id="qjump" method="get" action="">
-				<div><label><span><?php _e('Jump to') ?><br /></span></label>
-					<select name="id" onchange="window.location=('<?php echo get('forum/') ?>'+this.options[this.selectedIndex].value)">
-<?php
-		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
-			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
-			foreach ($cat_data['cat_forums'] as $forum) {
-				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
-			}
-			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
-		} ?>
-					</select>
-					<noscript><input type="submit" value="<?php _e('Go') ?>" accesskey="g" /></noscript>
-				</div>
-			</form>
-			</div>
-<?php } ?>
-
-			<div class="conr">
-<?php
-
-if ($footer_style == 'index') {
-    if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
-    } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
-    }
-} elseif ($footer_style == 'Forum') {
-    if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
-    } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
-    }
-} elseif ($footer_style == 'Topic') {
-    if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
-    } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
-    }
-}
-
-?>
-				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
-			</div>
-			<div class="clearer"></div>
-		</div>
-	</div>
-</div>
-<?php
-
-// Display debug info (if enabled/defined)
-if ($feather->forum_env['FEATHER_SHOW_INFO']) {
-    $feather->debug->info();
-}
-
-// Display executed queries (if enabled)
-if ($feather->forum_env['FEATHER_SHOW_QUERIES']) {
-    $feather->debug->queries();
-}
-?>
-
-</section>
-
-<script src="<?php echo $feather->url->base() ?>/style/themes/FeatherBB/phone.min.js"></script>
-
-</body>
-</html>
diff --git a/view/header.php b/view/header.php
deleted file mode 100644
index fdbfa249..00000000
--- a/view/header.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php _e('lang_identifier') ?>" lang="<?php _e('lang_identifier') ?>" dir="<?php _e('lang_direction') ?>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
-<title><?php echo Utils::generate_page_title($page_title, $p) ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo $feather->url->base() ?>/style/themes/<?php echo $feather->user->style.'.css' ?>" />
-<?php
-
-echo $allow_index;
-echo $admin_console;
-
-if (isset($required_fields)) :
-    // Output JavaScript to validate form (make sure required fields are filled out)
-
-    ?>
-    <script type="text/javascript">
-        /* <![CDATA[ */
-        function process_form(the_form)
-        {
-            var required_fields = {
-                <?php
-                    // Output a JavaScript object with localised field names
-                    $tpl_temp = count($required_fields);
-                    foreach ($required_fields as $elem_orig => $elem_trans) {
-                        echo "\t\t\"".$elem_orig.'": "'.addslashes(str_replace('&#160;', ' ', $elem_trans));
-                        if (--$tpl_temp) {
-                            echo "\",\n";
-                        } else {
-                            echo "\"\n\t};\n";
-                        }
-                    }
-                    ?>
-                if (document.all || document.getElementById)
-            {
-                for (var i = 0; i < the_form.length; ++i)
-                {
-                    var elem = the_form.elements[i];
-                    if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
-                    {
-                        alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
-                        elem.focus();
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-        /* ]]> */
-    </script>
-    <?php
-endif;
-if (!empty($page_head)) :
-    echo implode("\n", $page_head)."\n";
-endif;
-?>
-</head>
-
-<body id="pun<?= $active_page ?>"<?= $focus_element; ?>>
-
-<header>
-
-    <nav>
-        <div class="container">
-            <div class="phone-menu" id="phone-button">
-                <a class="button-phone"></a>
-            </div>
-            <div id="phone">
-                <?php echo $navlinks ?>
-                <div class="navbar-right">
-                    <form method="get" action="/search" class="nav-search">
-                        <input type="hidden" name="action" value="search">
-                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php _e('Search') ?>">
-                    </form>
-                </div>
-            </div>
-        </div>
-    </nav>
-
-    <div class="container">
-        <div class="container-title-status">
-            <h1 class="title-site">
-                <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
-                    <p><?php echo feather_escape($feather_config['o_board_title']) ?></p>
-                </a>
-                <div id="brddesc"><?php echo htmlspecialchars_decode($feather_config['o_board_desc']) ?></div>
-            </h1>
-            <div class="status-avatar">
-                <?php echo $page_info ?>
-            </div>
-            <div class="clear"></div>
-        </div>
-        <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
-            <div id="announce" class="block">
-                <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
-                <div class="box">
-                    <div id="announce-block" class="inbox">
-                        <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
-                    </div>
-                </div>
-            </div>
-        <?php endif; ?>
-        <?php if (isset($flash['message'])) : ?>
-            <script type="text/javascript" src="<?=$feather->url->base();?>/js/common.js"></script>
-            <div id="msgflash" class="block">
-                <h2><span><?php _e('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
-                <div class="box">
-                    <div class="inbox">
-                        <p><?php echo feather_escape($flash['message']) ?></p>
-                    </div>
-                </div>
-            </div>
-            <script type="text/javascript">fadeIn('msgflash', 0);</script>
-        <?php endif; ?>
-    </div>
-
-</header>
-
-<section class="container">
-    <div id="brdmain">
diff --git a/view/help.php b/view/help.php
deleted file mode 100644
index a1924a10..00000000
--- a/view/help.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<h2><span><?php _e('BBCode') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><a name="bbcode"></a><?php _e('BBCode info 1') ?></p>
-		<p><?php _e('BBCode info 2') ?></p>
-	</div>
-</div>
-<h2><span><?php _e('Text style') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Text style info') ?></p>
-		<p><code>[b]<?php _e('Bold text') ?>[/b]</code> <?php _e('produces') ?> <samp><strong><?php _e('Bold text') ?></strong></samp></p>
-		<p><code>[u]<?php _e('Underlined text') ?>[/u]</code> <?php _e('produces') ?> <samp><span class="bbu"><?php _e('Underlined text') ?></span></samp></p>
-		<p><code>[i]<?php _e('Italic text') ?>[/i]</code> <?php _e('produces') ?> <samp><em><?php _e('Italic text') ?></em></samp></p>
-		<p><code>[s]<?php _e('Strike-through text') ?>[/s]</code> <?php _e('produces') ?> <samp><span class="bbs"><?php _e('Strike-through text') ?></span></samp></p>
-		<p><code>[del]<?php _e('Deleted text') ?>[/del]</code> <?php _e('produces') ?> <samp><del><?php _e('Deleted text') ?></del></samp></p>
-		<p><code>[ins]<?php _e('Inserted text') ?>[/ins]</code> <?php _e('produces') ?> <samp><ins><?php _e('Inserted text') ?></ins></samp></p>
-		<p><code>[em]<?php _e('Emphasised text') ?>[/em]</code> <?php _e('produces') ?> <samp><em><?php _e('Emphasised text') ?></em></samp></p>
-		<p><code>[color=#FF0000]<?php _e('Red text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: #ff0000"><?php _e('Red text') ?></span></samp></p>
-		<p><code>[color=blue]<?php _e('Blue text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: blue"><?php _e('Blue text') ?></span></samp></p>
-		<p><code>[h]<?php _e('Heading text') ?>[/h]</code> <?php _e('produces') ?></p> <div class="postmsg"><h5><?php _e('Heading text') ?></h5></div>
-	</div>
-</div>
-<h2><span><?php _e('Links and images') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo Utils::escape($feather->url->base(true).'/') ?>]<?php echo Utils::escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape($feather->url->base(true).'/') ?>"><?php echo Utils::escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo Utils::escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape($feather->url->base(true).'/') ?>"><?php echo Utils::escape($feather->url->base(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
-		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
-		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
-		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php echo $feather->url->get('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php echo $feather->url->get('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('forum/1/') ?>"><?php echo $feather->url->get('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php echo $feather->url->get('user/2/') ?></a></samp></p>
-	</div>
-	<div class="inbox">
-		<p><a name="img"></a><?php _e('Images info') ?></p>
-		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo Utils::escape($feather->url->base(true)) ?>/style/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo Utils::escape($feather->url->base(true)) ?>/style/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
-	</div>
-</div>
-<h2><span><?php _e('Quotes') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Quotes info') ?></p>
-		<p><code>[quote=James]<?php _e('Quote text') ?>[/quote]</code></p>
-		<p><?php _e('produces quote box') ?></p>
-		<div class="postmsg">
-			<div class="quotebox"><cite>James <?php _e('wrote') ?></cite><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
-		</div>
-		<p><?php _e('Quotes info 2') ?></p>
-		<p><code>[quote]<?php _e('Quote text') ?>[/quote]</code></p>
-		<p><?php _e('produces quote box') ?></p>
-		<div class="postmsg">
-			<div class="quotebox"><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
-		</div>
-		<p><?php _e('quote note') ?></p>
-	</div>
-</div>
-<h2><span><?php _e('Code') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Code info') ?></p>
-		<p><code>[code]<?php _e('Code text') ?>[/code]</code></p>
-		<p><?php _e('produces code box') ?></p>
-		<div class="postmsg">
-			<div class="codebox"><pre><code><?php _e('Code text') ?></code></pre></div>
-		</div>
-	</div>
-</div>
-<h2><span><?php _e('Lists') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><a name="lists"></a><?php _e('List info') ?></p>
-		<p><code>[list][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php _e('produces list') ?></span></p>
-		<div class="postmsg">
-			<ul><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ul>
-		</div>
-		<p><code>[list=1][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php _e('produces decimal list') ?></span></p>
-		<div class="postmsg">
-			<ol class="decimal"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
-		</div>
-		<p><code>[list=a][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php _e('produces alpha list') ?></span></p>
-		<div class="postmsg">
-			<ol class="alpha"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
-		</div>
-	</div>
-</div>
-<h2><span><?php _e('Nested tags') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Nested tags info') ?></p>
-		<p><code>[b][u]<?php _e('Bold, underlined text') ?>[/u][/b]</code> <?php _e('produces') ?> <samp><strong><span class="bbu"><?php _e('Bold, underlined text') ?></span></strong></samp></p>
-	</div>
-</div>
-<h2><span><?php _e('Smilies') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><a name="smilies"></a><?php _e('Smilies info') ?></p>
-<?php
-
-// Display the smiley set
-$smiley_groups = array();
-
-foreach ($feather->parser->pd['smilies'] as $smiley_text => $smiley_data) {
-    $smiley_groups[$smiley_data['file']][] = $smiley_text;
-}
-
-foreach ($smiley_groups as $smiley_img => $smiley_texts) {
-    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$feather->parser->pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
-}
-
-?>
-	</div>
-</div>
diff --git a/view/index.php b/view/index.php
deleted file mode 100644
index f3046814..00000000
--- a/view/index.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-if (empty($index_data)): ?>
-    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php _e('Empty board') ?></p></div></div></div>
-<?php endif;
-foreach ($index_data as $forum) {
-    if ($forum->cid != $cur_cat) :
-        if ($cur_cat != 0) :
-    ?>
-				</tbody>
-			</table>
-		</div>
-	</div>
-	</div>
-	<?php endif;
-    ?>
-	<div id="idx<?php echo $forum->cid ?>" class="blocktable">
-	<h2><span><?php echo Utils::escape($forum->cat_name) ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Forum') ?></th>
-					<th class="tc2" scope="col"><?php _e('Topics') ?></th>
-					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
-					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-	<?php
-    $cur_cat = $forum->cid;
-    endif;
-    ?>
-				<tr class="<?php echo $forum->item_status ?>">
-					<td class="tcl">
-						<div class="<?php echo $forum->icon_type ?>"><div class="nosize"><?php echo Utils::forum_number_format($forum->forum_count_formatted) ?></div></div>
-						<div class="tclcon">
-							<div>
-								<?php echo $forum->forum_field."\n".$forum->moderators_formatted ?>
-							</div>
-						</div>
-					</td>
-					<td class="tc2"><?php echo Utils::forum_number_format($forum->num_topics_formatted) ?></td>
-					<td class="tc3"><?php echo Utils::forum_number_format($forum->num_posts_formatted) ?></td>
-					<td class="tcr"><?php echo $forum->last_post_formatted ?></td>
-				</tr>
-	<?php
-
-}
-if ($cur_cat > 0) :
-    ?>
-					</tbody>
-			</table>
-		</div>
-	</div>
-	</div>
-<?php
-endif;
-if (!empty($forum_actions)) :
-?>
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<p class="subscribelink clearb"><?php echo implode(' - ', $forum_actions); ?></p>
-	</div>
-</div>
-<?php
-endif;
-?>
-<div id="brdstats" class="block">
-	<h2><span><?php _e('Board info') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<dl class="conr">
-				<dt><strong><?php _e('Board stats') ?></strong></dt>
-				<dd><span><?php printf(__('No of users'), '<strong>'.Utils::forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of topics'), '<strong>'.Utils::forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of posts'), '<strong>'.Utils::forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
-			</dl>
-			<dl class="conl">
-				<dt><strong><?php _e('User info') ?></strong></dt>
-				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
-				<?php if ($feather->forum_settings['o_users_online'] == 1) : ?>
-				<dd><span><?php printf(__('Users online'), '<strong>'.Utils::forum_number_format($online['num_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('Guests online'), '<strong>'.Utils::forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
-				<?php endif; ?>
-			</dl>
-			<?php
-            if ($feather->forum_settings['o_users_online'] == 1) :
-                if ($online['num_users'] > 0) {
-                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
-                } else {
-                    echo "\t\t\t".'<div class="clearer"></div>'."\n";
-                }
-            endif;
-            ?>
-		</div>
-	</div>
-</div>
diff --git a/view/install.php b/view/install.php
deleted file mode 100644
index a9db4e72..00000000
--- a/view/install.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title><?php _e('FeatherBB Installation') ?></title>
-    <link rel="stylesheet" type="text/css" href="style/themes/<?php echo $feather->forum_env['FORUM_NAME'] ?>.css" />
-</head>
-
-<body>
-    <div id="puninstall" class="pun">
-        <div class="top-box"><div><!-- Top Corners --></div></div>
-        <div class="punwrap">
-
-            <section class="container">
-                <div id="brdheader" class="block">
-                    <div class="box">
-                        <div id="brdtitle" class="inbox">
-                            <h1><span><?php _e('FeatherBB Installation') ?></span></h1>
-                            <div id="brddesc"><p><?php _e('Welcome') ?></p></div>
-                        </div>
-                    </div>
-                </div>
-            </section>
-
-            <section class="container">
-                <div id="brdmain">
-                    <?php if (count($languages) > 1): ?>
-                        <div class="blockform">
-                            <h2><span><?php _e('Choose install language') ?></span></h2>
-                            <div class="box">
-                                <form id="install" method="post" action="">
-                                    <input type="hidden" name="choose_lang" value="1">
-                                    <div class="inform">
-                                        <fieldset>
-                                            <legend><?php _e('Install language') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Choose install language info') ?></p>
-                                                <label><strong><?php _e('Install language') ?></strong>
-                                                    <br /><select name="install_lang">
-                                                        <?php
-
-                                                        foreach ($languages as $lang) {
-                                                            echo "\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').'>'.$lang.'</option>'."\n";
-                                                        }
-
-                                                        ?>
-                                                    </select>
-                                                    <br /></label>
-                                                </div>
-                                            </fieldset>
-                                        </div>
-                                        <p class="buttons"><input type="submit" value="<?php _e('Change language') ?>" /></p>
-                                    </form>
-                                </div>
-                            </div>
-                        <?php endif;
-                        ?>
-
-                        <div class="blockform">
-                            <h2><span><?php echo sprintf(__('Install'), FORUM_VERSION) ?></span></h2>
-                            <div class="box">
-                                <form id="install" method="post" action="">
-                                    <?php if (!empty($errors)): ?>
-                                        <div class="inform">
-                                            <div class="forminfo error-info">
-                                                <h3><?php _e('Errors') ?></h3>
-                                                <ul class="error-list">
-                                                    <?php
-                                                    $errors = (!is_array($errors)) ? array($errors) : $errors;
-                                                    foreach ($errors as $error) {
-                                                        echo "\t\t\t\t\t\t".'<li><strong>'.$error.'</strong></li>'."\n";
-                                                    }
-                                                    ?>
-                                                </ul>
-                                            </div>
-                                        </div>
-                                        <?php endif;?>
-
-                                    <div class="inform">
-                                        <div class="forminfo">
-                                            <h3><?php _e('Database setup') ?></h3>
-                                            <p><?php _e('Info 1') ?></p>
-                                        </div>
-                                        <fieldset>
-                                            <legend><?php _e('Select database') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 2') ?></p>
-                                                <label class="required"><strong><?php _e('Database type') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <select name="install[db_type]" required>
-                                                    <?php
-
-                                                    foreach ($supported_dbs as $id => $db_type) {
-                                                        echo "\t\t\t\t\t\t\t".'<option value="'.$id.'">'.$db_type.'</option>'."\n";
-                                                    }
-
-                                                    ?>
-                                                </select>
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <fieldset>
-                                            <legend><?php _e('Database hostname') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 3') ?></p>
-                                                <label class="required"><strong><?php _e('Database server hostname') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[db_host]" size="50" required />
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <fieldset>
-                                            <legend><?php _e('Database enter name') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 4') ?></p>
-                                                <label class="required"><strong><?php _e('Database name') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[db_name]" size="30" required />
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <fieldset>
-                                            <legend><?php _e('Database enter informations') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 5') ?></p>
-                                                <label class="conl"><?php _e('Database username') ?></label>
-                                                <input type="text" name="install[db_user]" size="30" />
-                                                <label class="conl"><?php _e('Database password') ?></label>
-                                                <input type="password" name="install[db_pass]" size="30" />
-                                                <div class="clearer"></div>
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <fieldset>
-                                            <legend><?php _e('Database enter prefix') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 6') ?></p>
-                                                <label><?php _e('Table prefix') ?></label>
-                                                <input type="text" name="install[db_prefix]" size="20" maxlength="30" />
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <div class="forminfo">
-                                            <h3><?php _e('Administration setup') ?></h3>
-                                            <p><?php _e('Info 7') ?></p>
-                                        </div>
-                                        <fieldset>
-                                            <legend><?php _e('Administration setup') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 8') ?></p>
-                                                <label class="required"><strong><?php _e('Administrator username') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[username]" size="25" maxlength="25" required />
-                                                <label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="password" name="install[password]" size="16" required />
-                                                <label class="conl required"><strong><?php _e('Confirm password') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="password" name="install[password_conf]" size="16" required />
-                                                <!-- <div class="clearer"></div> -->
-                                                <label class="required"><strong><?php _e('Administrator email') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[email]" size="50" maxlength="80" required />
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <div class="forminfo">
-                                            <h3><?php _e('Board setup') ?></h3>
-                                            <p><?php _e('Info 11') ?></p>
-                                        </div>
-                                        <fieldset>
-                                            <legend><?php _e('General information') ?></legend>
-                                            <div class="infldset">
-                                                <label class="required"><strong><?php _e('Board title') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[title]" value="<? echo $data['title'] ?>" size="60" maxlength="255" required />
-                                                <label><?php _e('Board description') ?></label>
-                                                <input type="text" name="install[description]" value="<? echo $data['description'] ?>" size="60" maxlength="255" required />
-                                                <label class="required"><strong><?php _e('Base URL') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[base_url]" value="<? echo $data['base_url'] ?>" size="60" maxlength="100" required />
-                                                <label class="required"><strong><?php _e('Default language') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <select name="install[default_lang]" required />
-                                                <?php
-                                                foreach ($languages as $lang) {
-                                                    echo "\t\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').' >'.$lang.'</option>'."\n";
-                                                }
-                                                ?>
-                                            </select>
-                                        </div>
-                                    </fieldset>
-                                </div>
-
-                                <p class="buttons"><input type="submit" value="<?php _e('Start install') ?>" /></p>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-            </section>
-        </div>
-        <div class="end-box"><div><!-- Bottom Corners --></div></div>
-    </div>
-</body>
-</html>
diff --git a/view/login/form.php b/view/login/form.php
deleted file mode 100644
index e6a8210a..00000000
--- a/view/login/form.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Login') ?></span></h2>
-	<div class="box">
-		<form id="login" method="post" action="<?php echo $feather->url->get('login/action/in/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Login legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="redirect_url" value="<?php echo Utils::escape($redirect_url) ?>" />
-						<label class="conl required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
-						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
-
-						<div class="rbox clearb">
-							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php _e('Remember me') ?><br /></label>
-						</div>
-
-						<p class="clearb"><?php _e('Login info') ?></p>
-						<p class="actions"><span><a href="<?php echo $feather->url->get('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo $feather->url->get('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="login" value="<?php _e('Login') ?>" tabindex="4" /></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/login/password_forgotten.php b/view/login/password_forgotten.php
deleted file mode 100644
index b32ff1b6..00000000
--- a/view/login/password_forgotten.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-// If there are errors, we display them
-if (!empty($errors)) {
-    ?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('New password errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('New passworderrors info') ?></p>
-			<ul class="error-list">
-<?php
-
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-    ?>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<?php
-
-}
-?>
-<div class="blockform">
-	<h2><span><?php _e('Request pass') ?></span></h2>
-	<div class="box">
-		<form id="request_pass" method="post" action="<?php echo $feather->url->get('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Request pass legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
-						<p><?php _e('Request pass info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="request_pass" value="<?php _e('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a><?php endif; ?></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/message.php b/view/message.php
deleted file mode 100644
index 69f4884b..00000000
--- a/view/message.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="msg" class="block error">
-	<h2><span><?= __('Error') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<p><?php echo $msg ?></p>
-<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php _e('Go back') ?></a></p>
-<?php endif;
-    ?>		</div>
-	</div>
-</div>
diff --git a/view/misc/email.php b/view/misc/email.php
deleted file mode 100644
index eebc5f9a..00000000
--- a/view/misc/email.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo Utils::escape($mail['recipient']) ?></span></h2>
-	<div class="box">
-		<form id="email" method="post" action="<?php echo $feather->url->get('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write email') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
-						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php _e('Email disclosure note') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
diff --git a/view/misc/report.php b/view/misc/report.php
deleted file mode 100644
index a61dc8ca..00000000
--- a/view/misc/report.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<div id="reportform" class="blockform">
-	<h2><span><?php _e('Report post') ?></span></h2>
-	<div class="box">
-		<form id="report" method="post" action="<?php echo $feather->url->get('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Reason desc') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('Reason') ?> <span><?php _e('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/misc/rules.php b/view/misc/rules.php
deleted file mode 100644
index 163df1b7..00000000
--- a/view/misc/rules.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="rules" class="block">
-	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
-	<div class="box">
-		<div id="rules-block" class="inbox">
-			<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
-		</div>
-	</div>
-</div>
diff --git a/view/moderate/delete_posts.php b/view/moderate/delete_posts.php
deleted file mode 100644
index 78100a8d..00000000
--- a/view/moderate/delete_posts.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Delete posts') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm delete legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<p><?php _e('Delete posts comply') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/moderate/delete_topics.php b/view/moderate/delete_topics.php
deleted file mode 100644
index 46d56282..00000000
--- a/view/moderate/delete_topics.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('Delete topics') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm delete legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Delete topics comply') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/moderate/merge_topics.php b/view/moderate/merge_topics.php
deleted file mode 100644
index 24a92aaf..00000000
--- a/view/moderate/merge_topics.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('Merge topics') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm merge legend') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1" /><?php _e('Leave redirect') ?><br /></label>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php _e('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
deleted file mode 100644
index de25ede1..00000000
--- a/view/moderate/moderator_forum.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<form method="post" action="<?php echo $feather->url->get('moderate/forum/'.$id.'/') ?>">
-<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<input type="hidden" name="page" value="<?php echo Utils::escape($p) ?>" />
-<div id="vf" class="blocktable">
-	<h2><span><?php echo Utils::escape($cur_forum['forum_name']) ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
-					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
-<?php endif; ?>					<th class="tcr"><?php _e('Last post') ?></th>
-					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-			
-			<?php
-            $topic_count = 0;
-            $button_status = '';
-            foreach ($topic_data as $topic) {
-                ++$topic_count;
-                ?>
-							<tr class="<?php echo $topic['item_status'] ?>">
-					<td class="tcl">
-						<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo Utils::forum_number_format($topic_count + $start_from) ?></div></div>
-						<div class="tclcon">
-							<div>
-								<?php echo $topic['subject_disp']."\n" ?>
-							</div>
-						</div>
-					</td>
-					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? Utils::forum_number_format($topic['num_replies']) : '-' ?></td>
-<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? Utils::forum_number_format($topic['num_views']) : '-' ?></td>
-<?php endif;
-                ?>					<td class="tcr"><?php echo $topic['last_post_disp'] ?></td>
-					<td class="tcmod"><input type="checkbox" name="topics[<?php echo $topic['id'] ?>]" value="1" /></td>
-				</tr>
-			<?php
-
-            }
-            if (empty($topic_data)):
-                $colspan = ($feather->forum_settings['o_topic_views'] == '1') ? 5 : 4;
-                $button_status = ' disabled="disabled"';
-                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
-            endif;
-            ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php _e('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php _e('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php _e('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php _e('Close') ?>"<?php echo $button_status ?> /></p>
-			<div class="clearer"></div>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
-</form>
\ No newline at end of file
diff --git a/view/moderate/move_topics.php b/view/moderate/move_topics.php
deleted file mode 100644
index f184afcb..00000000
--- a/view/moderate/move_topics.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="blockform">
-	<h2><span><?php echo($action == 'single') ? __('Move topic') : __('Move topics') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-			<input type="hidden" name="topics" value="<?php echo $topics ?>" />
-				<fieldset>
-					<legend><?php _e('Move legend') ?></legend>
-					<div class="infldset">
-						<label><?php _e('Move to') ?>
-						<br /><select name="move_to_forum">
-								<?php echo $list_forums ?>
-							</optgroup>
-						</select>
-						<br /></label>
-						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1"<?php if ($action == 'single') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Leave redirect') ?><br /></label>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php _e('Move') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/moderate/posts_view.php b/view/moderate/posts_view.php
deleted file mode 100644
index d0c2d06d..00000000
--- a/view/moderate/posts_view.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<form method="post" action="">
-<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<?php
-$post_count = 0; // Keep track of post numbers
-foreach ($post_data as $post) {
-    $post_count++;
-    ?>
-	<div id="p<?php echo $post['id'] ?>" class="blockpost<?php if ($post['id'] == $cur_topic['first_post_id']) {
-    echo ' firstpost';
-}
-    ?><?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($post_count == 1) {
-    echo ' blockpost1';
-}
-    ?>">
-		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<div class="postbody">
-					<div class="postleft">
-						<dl>
-							<dt><strong><?php echo $post['poster_disp'] ?></strong></dt>
-							<dd class="usertitle"><strong><?php echo $post['user_title'] ?></strong></dd>
-						</dl>
-					</div>
-					<div class="postright">
-						<h3 class="nosize"><?php _e('Message') ?></h3>
-						<div class="postmsg">
-							<?php echo $post['message']."\n" ?>
-	<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.Utils::escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
-}
-    ?>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="inbox">
-				<div class="postfoot clearb">
-					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.__('Select').'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.__('Cannot select first').'</p>' ?></div>
-				</div>
-			</div>
-		</div>
-	</div>
-<?php
-
-}
-?>
-
-<div class="postlinksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php _e('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /></p>
-			<div class="clearer"></div>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
-</form>
\ No newline at end of file
diff --git a/view/moderate/split_posts.php b/view/moderate/split_posts.php
deleted file mode 100644
index deace3ab..00000000
--- a/view/moderate/split_posts.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Split posts') ?></span></h2>
-	<div class="box">
-		<form id="subject" method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm split legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<label class="required"><strong><?php _e('New subject') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
-						<label><?php _e('Move to') ?>
-						<br /><select name="move_to_forum">
-								<?php echo $list_forums ?>
-							</optgroup>
-						</select>
-						<br /></label>
-						<p><?php _e('Split posts comply') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php _e('Split') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/post.php b/view/post.php
deleted file mode 100644
index a0463de8..00000000
--- a/view/post.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_posting['forum_name']) ?></a></li>
-<?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo Utils::escape($feather->request->post('req_subject')) ?></li>
-<?php endif; ?>
-<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_posting['subject']) ?></a></li>
-<?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<?php
-
-// If there are errors, we display them
-if (!empty($errors)) {
-    ?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('Post errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('Post errors info') ?></p>
-			<ul class="error-list">
-<?php
-
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-    ?>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<?php
-
-} elseif ($feather->request->post('preview')) {
-    $preview_message = $feather->parser->parse_message($post['message'], $post['hide_smilies']);
-?>
-<div id="postpreview" class="blockpost">
-	<h2><span><?php _e('Post preview') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postright">
-					<div class="postmsg">
-						<?php echo $preview_message."\n" ?>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<?php
-
-}
-
-
-$cur_index = 1;
-
-?>
-<!-- Init BBcode editor toolbar -->
-<script>
-    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
-        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
-</script>
-<script src="<?php echo Url::base() ?>/style/imports/bbeditor.js"></script>
-
-<div id="postform" class="blockform">
-	<h2><span><?php echo $action ?></span></h2>
-	<div class="box">
-		<?php echo $form."\n" ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write message legend') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-                                                <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<?php
-if ($feather->user->is_guest) {
-    $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-    $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
-    ?>
-						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
-    echo Utils::escape($post['username']);
-}
-    ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
-    echo Utils::escape($post['email']);
-}
-    ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<div class="clearer"></div>
-<?php
-
-}
-if ($fid): ?>
-						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
-    echo Utils::escape($post['subject']);
-} ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
-                        <script>postEditorToolbar('req_message');</script>
-						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? $feather->utils->linebreaks($feather->utils->trim(Utils::escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
-						</ul>
-					</div>
-				</fieldset>
-<?php
-if (!empty($checkboxes)) {
-    ?>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Options') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
-						</div>
-					</div>
-				</fieldset>
-<?php
-
-}
-
-?>
-			</div>
-			<?php if ($feather->user->is_guest) : ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Robot title') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Robot info')    ?></p>
-						<label class="required"><strong><?php
-                             $question = array_keys($lang_antispam_questions);
-                             $qencoded = md5($question[$index_questions]);
-                             echo sprintf(__('Robot question'), $question[$index_questions]);?>
-							 <span><?php _e('Required') ?></span></strong>
-							 <br />
-							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
-						</label>
-					</div>
-				</fieldset>
-			</div>
-			<?php endif; ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
-
-
-<?php
-if ($tid && $feather->forum_settings['o_topic_review'] != '0') :
-?>
-<div id="postreview">
-	<h2><span><?php _e('Topic review') ?></span></h2>
-
-	<?php
-    // Set background switching on
-    $post_count = 0;
-
-    foreach ($post_data as $post) {
-        ++$post_count;
-        ?>
-	<div class="blockpost">
-	<div class="box<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?>">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postleft">
-					<dl>
-						<dt><strong><?php echo Utils::escape($post['poster']) ?></strong></dt>
-						<dd><span><?php echo $feather->utils->format_time($post['posted']) ?></span></dd>
-					</dl>
-				</div>
-				<div class="postright">
-					<div class="postmsg">
-						<?php echo $post['message']."\n" ?>
-					</div>
-				</div>
-			</div>
-			<div class="clearer"></div>
-		</div>
-	</div>
-</div>
-	<?php
-
-    }
-    ?>
-
-</div>
-<?php endif;?>
diff --git a/view/profile/change_mail.php b/view/profile/change_mail.php
deleted file mode 100644
index 5615524d..00000000
--- a/view/profile/change_mail.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Change email') ?></span></h2>
-	<div class="box">
-		<form id="change_email" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Email legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('New email') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
-						<label class="required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
-						<p><?php _e('Email instructions') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="new_email" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/profile/change_pass.php b/view/profile/change_pass.php
deleted file mode 100644
index ac61d979..00000000
--- a/view/profile/change_pass.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Change pass') ?></span></h2>
-	<div class="box">
-		<form id="change_pass" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<input type="hidden" name="form_sent" value="1" />
-				<fieldset>
-					<legend><?php _e('Change pass legend') ?></legend>
-					<div class="infldset">
-<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php _e('Old pass') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="password" name="req_old_password" size="16" /><br /></label>
-<?php endif; ?>						<label class="conl required"><strong><?php _e('New pass') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="password" name="req_new_password1" size="16" /><br /></label>
-						<label class="conl required"><strong><?php _e('Confirm new pass') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="password" name="req_new_password2" size="16" /><br /></label>
-						<p class="clearb"><?php _e('Pass info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/profile/delete_user.php b/view/profile/delete_user.php
deleted file mode 100644
index 831b29ab..00000000
--- a/view/profile/delete_user.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Confirm delete user') ?></span></h2>
-	<div class="box">
-		<form id="confirm_del_user" method="post" action="<?php echo $feather->url->get('user/'.$id.'/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm delete legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Confirmation info').' <strong>'.Utils::escape($username).'</strong>.' ?></p>
-						<div class="rbox">
-							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
-						</div>
-						<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/profile/menu.php b/view/profile/menu.php
deleted file mode 100644
index e3714a6e..00000000
--- a/view/profile/menu.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="profile" class="block2col">
-	<div class="blockmenu">
-		<h2><span><?php _e('Profile menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-					<li<?php if ($page == 'essentials') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
-					<li<?php if ($page == 'personal') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
-					<li<?php if ($page == 'messaging') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
-<?php if ($feather->forum_settings['o_avatars'] == '1' || $feather->forum_settings['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
-<?php endif;
-    ?>					<li<?php if ($page == 'display') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
-					<li<?php if ($page == 'privacy') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
-<?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
-<?php endif;
-    ?>				</ul>
-			</div>
-		</div>
-	</div>
diff --git a/view/profile/section_admin.php b/view/profile/section_admin.php
deleted file mode 100644
index d1aa1aa3..00000000
--- a/view/profile/section_admin.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-	<div class="blockform">
-		<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section admin') ?></span></h2>
-		<div class="box">
-			<form id="profile7" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-				<input type="hidden" name="form_sent" value="1" />
-					<fieldset>
-<?php
-
-        if ($feather->user->g_moderator == '1') {
-            ?>
-						<legend><?php _e('Delete ban legend') ?></legend>
-						<div class="infldset">
-							<p><input type="submit" name="ban" value="<?php _e('Ban user') ?>" /></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-        } else {
-            if ($feather->user->id != $id) {
-                ?>
-						<legend><?php _e('Group membership legend') ?></legend>
-						<div class="infldset">
-							<select id="group_id" name="group_id">
-                                                            <?php echo $group_list ?>
-							</select>
-							<input type="submit" name="update_group_membership" value="<?php _e('Save') ?>" />
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-<?php
-
-            }
-
-            ?>
-						<legend><?php _e('Delete ban legend') ?></legend>
-						<div class="infldset">
-							<input type="submit" name="delete_user" value="<?php _e('Delete user') ?>" /> <input type="submit" name="ban" value="<?php _e('Ban user') ?>" />
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-            if ($user['g_moderator'] == '1' || $user['g_id'] == FEATHER_ADMIN) {
-                ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Set mods legend') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Moderator in info') ?></p>
-                                                        <?php echo $forum_list ?>
-								</div>
-							</div>
-							<br class="clearb" /><input type="submit" name="update_forums" value="<?php _e('Update forums') ?>" />
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-            }
-        }
-
-?>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
deleted file mode 100644
index b806efd2..00000000
--- a/view/profile/section_display.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section display') ?></span></h2>
-	<div class="box">
-		<form id="profile5" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div><input type="hidden" name="form_sent" value="1" /></div>
-<?php
-
-    $styles = \FeatherBB\Core\Lister::getStyles();
-
-    // Only display the style selection box if there's more than one style available
-    if (count($styles) == 1) {
-        echo "\t\t\t".'<div><input type="hidden" name="form_style" value="'.$styles[0].'" /></div>'."\n";
-    } elseif (count($styles) > 1) {
-        ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Style legend') ?></legend>
-					<div class="infldset">
-						<label><?php _e('Styles') ?><br />
-						<select name="form_style">
-<?php
-
-        foreach ($styles as $temp) {
-            if ($user['style'] == $temp) {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.str_replace('_', ' ', $temp).'</option>'."\n";
-            } else {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.str_replace('_', ' ', $temp).'</option>'."\n";
-            }
-        }
-
-        ?>
-						</select>
-						<br /></label>
-					</div>
-				</fieldset>
-			</div>
-<?php
-
-    }
-
-?>
-<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1' || $feather->forum_settings['o_signatures'] == '1' || $feather->forum_settings['o_avatars'] == '1' || ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1')): ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Post display legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Post display info') ?></p>
-						<div class="rbox">
-<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show smilies') ?><br /></label>
-<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show sigs') ?><br /></label>
-<?php endif; if ($feather->forum_settings['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show avatars') ?><br /></label>
-<?php endif; if ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show images') ?><br /></label>
-<?php endif; if ($feather->forum_settings['o_signatures'] == '1' && $feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show images sigs') ?><br /></label>
-<?php endif; ?>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Pagination legend') ?></legend>
-					<div class="infldset">
-						<label class="conl"><?php _e('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
-						<label class="conl"><?php _e('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
-						<p class="clearb"><?php _e('Paginate info') ?> <?php _e('Leave blank') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
diff --git a/view/profile/section_essentials.php b/view/profile/section_essentials.php
deleted file mode 100644
index 6ea2940b..00000000
--- a/view/profile/section_essentials.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section essentials') ?></span></h2>
-	<div class="box">
-		<form id="profile1" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Username and pass legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
-<?php endif; ?>						</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Email legend') ?></legend>
-					<div class="infldset">
-						<?php echo $user_disp['email_field'] ?>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Localisation legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Time zone info') ?></p>
-						<label><?php _e('Time zone')."\n" ?>
-						<br /><select name="form_timezone">
-							<option value="-12"<?php if ($user['timezone'] == -12) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-12:00') ?></option>
-							<option value="-11"<?php if ($user['timezone'] == -11) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-11:00') ?></option>
-							<option value="-10"<?php if ($user['timezone'] == -10) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-10:00') ?></option>
-							<option value="-9.5"<?php if ($user['timezone'] == -9.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-09:30') ?></option>
-							<option value="-9"<?php if ($user['timezone'] == -9) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-09:00') ?></option>
-							<option value="-8.5"<?php if ($user['timezone'] == -8.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-08:30') ?></option>
-							<option value="-8"<?php if ($user['timezone'] == -8) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-08:00') ?></option>
-							<option value="-7"<?php if ($user['timezone'] == -7) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-07:00') ?></option>
-							<option value="-6"<?php if ($user['timezone'] == -6) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-06:00') ?></option>
-							<option value="-5"<?php if ($user['timezone'] == -5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-05:00') ?></option>
-							<option value="-4"<?php if ($user['timezone'] == -4) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-04:00') ?></option>
-							<option value="-3.5"<?php if ($user['timezone'] == -3.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-03:30') ?></option>
-							<option value="-3"<?php if ($user['timezone'] == -3) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-03:00') ?></option>
-							<option value="-2"<?php if ($user['timezone'] == -2) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-02:00') ?></option>
-							<option value="-1"<?php if ($user['timezone'] == -1) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-01:00') ?></option>
-							<option value="0"<?php if ($user['timezone'] == 0) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC') ?></option>
-							<option value="1"<?php if ($user['timezone'] == 1) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+01:00') ?></option>
-							<option value="2"<?php if ($user['timezone'] == 2) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+02:00') ?></option>
-							<option value="3"<?php if ($user['timezone'] == 3) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+03:00') ?></option>
-							<option value="3.5"<?php if ($user['timezone'] == 3.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+03:30') ?></option>
-							<option value="4"<?php if ($user['timezone'] == 4) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+04:00') ?></option>
-							<option value="4.5"<?php if ($user['timezone'] == 4.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+04:30') ?></option>
-							<option value="5"<?php if ($user['timezone'] == 5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:00') ?></option>
-							<option value="5.5"<?php if ($user['timezone'] == 5.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:30') ?></option>
-							<option value="5.75"<?php if ($user['timezone'] == 5.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:45') ?></option>
-							<option value="6"<?php if ($user['timezone'] == 6) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+06:00') ?></option>
-							<option value="6.5"<?php if ($user['timezone'] == 6.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+06:30') ?></option>
-							<option value="7"<?php if ($user['timezone'] == 7) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+07:00') ?></option>
-							<option value="8"<?php if ($user['timezone'] == 8) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+08:00') ?></option>
-							<option value="8.75"<?php if ($user['timezone'] == 8.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+08:45') ?></option>
-							<option value="9"<?php if ($user['timezone'] == 9) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+09:00') ?></option>
-							<option value="9.5"<?php if ($user['timezone'] == 9.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+09:30') ?></option>
-							<option value="10"<?php if ($user['timezone'] == 10) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+10:00') ?></option>
-							<option value="10.5"<?php if ($user['timezone'] == 10.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+10:30') ?></option>
-							<option value="11"<?php if ($user['timezone'] == 11) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+11:00') ?></option>
-							<option value="11.5"<?php if ($user['timezone'] == 11.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+11:30') ?></option>
-							<option value="12"<?php if ($user['timezone'] == 12) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+12:00') ?></option>
-							<option value="12.75"<?php if ($user['timezone'] == 12.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+12:45') ?></option>
-							<option value="13"<?php if ($user['timezone'] == 13) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+13:00') ?></option>
-							<option value="14"<?php if ($user['timezone'] == 14) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+14:00') ?></option>
-						</select>
-						<br /></label>
-						<div class="rbox">
-							<label><input type="checkbox" name="form_dst" value="1"<?php if ($user['dst'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('DST') ?><br /></label>
-						</div>
-						<label><?php _e('Time format') ?>
-
-						<br /><select name="form_time_format">
-<?php
-                            foreach (array_unique($forum_time_formats) as $key => $time_format) {
-                                echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
-                                if ($user['time_format'] == $key) {
-                                    echo ' selected="selected"';
-                                }
-                                echo '>'. $feather->utils->format_time(time(), false, null, $time_format, true, true);
-                                if ($key == 0) {
-                                    echo ' ('.__('Default').')';
-                                }
-                                echo "</option>\n";
-                            }
-                            ?>
-						</select>
-						<br /></label>
-						<label><?php _e('Date format') ?>
-
-						<br /><select name="form_date_format">
-<?php
-                            foreach (array_unique($forum_date_formats) as $key => $date_format) {
-                                echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
-                                if ($user['date_format'] == $key) {
-                                    echo ' selected="selected"';
-                                }
-                                echo '>'. $feather->utils->format_time(time(), true, $date_format, null, false, true);
-                                if ($key == 0) {
-                                    echo ' ('.__('Default').')';
-                                }
-                                echo "</option>\n";
-                            }
-                            ?>
-						</select>
-						<br /></label>
-
-<?php
-
-    $languages = \FeatherBB\Core\Lister::getLangs();
-
-    // Only display the language selection box if there's more than one language available
-    if (count($languages) > 1) {
-        ?>
-						<label><?php _e('Language') ?>
-						<br /><select name="form_language">
-<?php
-
-        foreach ($languages as $temp) {
-            if ($user['language'] == $temp) {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
-            } else {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
-            }
-        }
-
-        ?>
-						</select>
-						<br /></label>
-<?php
-
-    }
-
-?>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('User activity') ?></legend>
-					<div class="infldset">
-						<p><?php printf(__('Registered info'), $feather->utils->format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.Utils::escape($user['registration_ip']).'</a>)' : '')) ?></p>
-						<p><?php printf(__('Last post info'), $feather->utils->format_time($user['last_post'])) ?></p>
-						<p><?php printf(__('Last visit info'), $feather->utils->format_time($user['last_visit'])) ?></p>
-						<?php echo $user_disp['posts_field'] ?>
-<?php if ($feather->user->is_admmod): ?>							<label><?php _e('Admin note') ?><br />
-						<input id="admin_note" type="text" name="admin_note" value="<?php echo Utils::escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
-<?php endif; ?>						</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
diff --git a/view/profile/section_messaging.php b/view/profile/section_messaging.php
deleted file mode 100644
index 18ec791c..00000000
--- a/view/profile/section_messaging.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section messaging') ?></span></h2>
-	<div class="box">
-		<form id="profile3" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Contact details legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo Utils::escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
-						<label><?php _e('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo Utils::escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo Utils::escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo Utils::escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/profile/section_personal.php b/view/profile/section_personal.php
deleted file mode 100644
index 75e5df5e..00000000
--- a/view/profile/section_personal.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personal') ?></span></h2>
-	<div class="box">
-		<form id="profile2" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Personal details legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo Utils::escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
-<?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo Utils::escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo Utils::escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
-<?php endif; ?>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/profile/section_personality.php b/view/profile/section_personality.php
deleted file mode 100644
index b1c3416d..00000000
--- a/view/profile/section_personality.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personality') ?></span></h2>
-	<div class="box">
-		<form id="profile4" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div><input type="hidden" name="form_sent" value="1" /></div>
-<?php if ($feather->forum_settings['o_avatars'] == '1'): ?>				<div class="inform">
-				<fieldset id="profileavatar">
-					<legend><?php _e('Avatar legend') ?></legend>
-					<div class="infldset">
-<?php if ($user_avatar): ?>							<div class="useravatar"><?php echo $user_avatar ?></div>
-<?php endif; ?>							<p><?php _e('Avatar info') ?></p>
-						<p class="clearb actions"><?php echo $avatar_field ?></p>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>				<div class="inform">
-				<fieldset>
-					<legend><?php _e('Signature legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Signature info') ?></p>
-						<div class="txtarea">
-							<label><?php printf(__('Sig max size'), Utils::forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
-							<textarea name="signature" rows="4" cols="65"><?php echo Utils::escape($user['signature']) ?></textarea><br /></label>
-						</div>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
-						</ul>
-						<?php echo $signature_preview ?>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
diff --git a/view/profile/section_privacy.php b/view/profile/section_privacy.php
deleted file mode 100644
index d501cd49..00000000
--- a/view/profile/section_privacy.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section privacy') ?></span></h2>
-	<div class="box">
-		<form id="profile6" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Privacy options legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<p><?php _e('Email setting info') ?></p>
-						<div class="rbox">
-							<label><input type="radio" name="form_email_setting" value="0"<?php if ($user['email_setting'] == '0') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Email setting 1') ?><br /></label>
-							<label><input type="radio" name="form_email_setting" value="1"<?php if ($user['email_setting'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Email setting 2') ?><br /></label>
-							<label><input type="radio" name="form_email_setting" value="2"<?php if ($user['email_setting'] == '2') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Email setting 3') ?><br /></label>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1' || $feather->forum_settings['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
-				<fieldset>
-					<legend><?php _e('Subscription legend') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Notify full') ?><br /></label>
-<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Auto notify full') ?><br /></label>
-<?php endif; ?>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
deleted file mode 100644
index 44de1b15..00000000
--- a/view/profile/upload_avatar.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-	exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Upload avatar') ?></span></h2>
-	<div class="box">
-		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo $feather->url->get('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Upload avatar legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
-						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php _e('Avatar desc'); echo ' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.Utils::forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.$feather->utils->file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="upload" value="<?php _e('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
diff --git a/view/profile/view_profile.php b/view/profile/view_profile.php
deleted file mode 100644
index 9e65b5f5..00000000
--- a/view/profile/view_profile.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="viewprofile" class="block">
-	<h2><span><?php _e('Profile') ?></span></h2>
-	<div class="box">
-		<div class="fakeform">
-			<div class="inform">
-				<fieldset>
-				<legend><?php _e('Section personal') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personal'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-<?php if (!empty($user_info['messaging'])): ?>			<div class="inform">
-				<fieldset>
-				<legend><?php _e('Section messaging') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['messaging'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; if (!empty($user_info['personality'])): ?>			<div class="inform">
-				<fieldset>
-				<legend><?php _e('Section personality') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personality'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>			<div class="inform">
-				<fieldset>
-				<legend><?php _e('User activity') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['activity'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/register/email.php b/view/register/email.php
deleted file mode 100644
index b15593b2..00000000
--- a/view/register/email.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo Utils::escape($recipient) ?></span></h2>
-	<div class="box">
-		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write email') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="redirect_url" value="<?php echo Utils::escape($redirect_url) ?>" />
-						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
-						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php _e('Email disclosure note') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/register/form.php b/view/register/form.php
deleted file mode 100644
index 6d3b36bb..00000000
--- a/view/register/form.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-// If there are errors, we display them
-if (!empty($errors)) {
-    ?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('Registration errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('Registration errors info') ?></p>
-			<ul class="error-list">
-<?php
-
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-    ?>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<?php
-
-}
-?>
-<div id="regform" class="blockform">
-	<h2><span><?php _e('Register') ?></span></h2>
-	<div class="box">
-		<form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
-		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<div class="forminfo">
-					<h3><?php _e('Important information') ?></h3>
-					<p><?php _e('Desc 1') ?></p>
-					<p><?php _e('Desc 2') ?></p>
-				</div>
-				<fieldset>
-					<legend><?php _e('Username legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="username" value="" />
-						<input type="hidden" name="password" value="" />
-						<label class="required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
-    echo Utils::escape($feather->request->post('req_user'));
-} ?>" size="25" maxlength="25" /><br /></label>
-					</div>
-				</fieldset>
-			</div>
-<?php if ($feather->forum_settings['o_regs_verify'] == '0'): ?>			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Pass legend') ?></legend>
-					<div class="infldset">
-						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
-    echo Utils::escape($feather->request->post('req_password1'));
-} ?>" size="16" /><br /></label>
-						<label class="conl required"><strong><?php _e('Confirm pass') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
-    echo Utils::escape($feather->request->post('req_password2'));
-} ?>" size="16" /><br /></label>
-						<p class="clearb"><?php _e('Pass info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>			<div class="inform">
-				<fieldset>
-					<legend><?php echo($feather->forum_settings['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
-					<div class="infldset">
-<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
-<?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
-    echo Utils::escape($feather->request->post('req_email1'));
-} ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
-    echo Utils::escape($feather->request->post('req_email2'));
-} ?>" size="50" maxlength="80" /><br /></label>
-<?php endif; ?>					</div>
-				</fieldset>
-			</div>
-<?php
-        // Only display the language selection box if there's more than one language available
-        if (count($languages) > 1) {
-            ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Localisation legend') ?></legend>
-					<div class="infldset">
-							<label><?php _e('Language') ?>
-							<br /><select name="language">
-<?php
-
-            foreach ($languages as $temp) {
-                if ($feather->forum_settings['o_default_lang'] == $temp) {
-                    echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
-                } else {
-                    echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
-                }
-            }
-
-            ?>
-							</select>
-							<br /></label>
-					</div>
-				</fieldset>
-			</div>
-<?php
-
-        }
-?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Robot title') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Robot info')    ?></p>
-						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php _e('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="register" value="<?php _e('Register') ?>" /></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/register/rules.php b/view/register/rules.php
deleted file mode 100644
index 9eae40df..00000000
--- a/view/register/rules.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div id="rules" class="blockform">
-	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
-	<div class="box">
-		<form method="get" action="<?php echo $feather->url->get('register/') ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Rules legend') ?></legend>
-					<div class="infldset">
-						<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="agree" value="<?php _e('Agree') ?>" /> <input type="submit" name="cancel" value="<?php _e('Cancel') ?>" /></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/search/footer.php b/view/search/footer.php
deleted file mode 100644
index 05e8d654..00000000
--- a/view/search/footer.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-if ($search['show_as'] == 'topics') :
-?>
-			</tbody>
-		</table>
-		</div>
-	</div>
-</div>
-
-<?php
-endif;
-?>
-
-<div class="postlinksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
-		</ul>
-<?php echo(!empty($search['forum_actions']) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $search['forum_actions']).'</p>'."\n" : '') ?>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/search/form.php b/view/search/form.php
deleted file mode 100644
index 8b47e40f..00000000
--- a/view/search/form.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div id="searchform" class="blockform">
-	<h2><span><?php _e('Search') ?></span></h2>
-	<div class="box">
-		<form id="search" method="get" action="">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Search criteria legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="action" value="search" />
-						<label class="conl"><?php _e('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
-						<label class="conl"><?php _e('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
-						<p class="clearb"><?php _e('Search info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Search in legend') ?></legend>
-					<div class="infldset">
-					<?php echo $forums ?>
-						<label class="conl"><?php _e('Search in')."\n" ?>
-						<br /><select id="search_in" name="search_in">
-							<option value="0"><?php _e('Message and subject') ?></option>
-							<option value="1"><?php _e('Message only') ?></option>
-							<option value="-1"><?php _e('Topic only') ?></option>
-						</select>
-						<br /></label>
-						<p class="clearl"><?php _e('Search in info') ?></p>
-<?php echo($feather->forum_settings['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Search results legend') ?></legend>
-					<div class="infldset">
-						<label class="conl"><?php _e('Sort by')."\n" ?>
-						<br /><select name="sort_by">
-							<option value="0"><?php _e('Sort by post time') ?></option>
-							<option value="1"><?php _e('Sort by author') ?></option>
-							<option value="2"><?php _e('Sort by subject') ?></option>
-							<option value="3"><?php _e('Sort by forum') ?></option>
-						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Sort order')."\n" ?>
-						<br /><select name="sort_dir">
-							<option value="DESC"><?php _e('Descending') ?></option>
-							<option value="ASC"><?php _e('Ascending') ?></option>
-						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Show as')."\n" ?>
-						<br /><select name="show_as">
-							<option value="topics"><?php _e('Show as topics') ?></option>
-							<option value="posts"><?php _e('Show as posts') ?></option>
-						</select>
-						<br /></label>
-						<p class="clearb"><?php _e('Search results info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/search/header.php b/view/search/header.php
deleted file mode 100644
index 2299e454..00000000
--- a/view/search/header.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<?php
-if ($search['show_as'] == 'topics') :
-?>
-<div id="vf" class="blocktable">
-	<h2><span><?php _e('Search results') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
-					<th class="tc2" scope="col"><?php _e('Forum') ?></th>
-					<th class="tc3" scope="col"><?php _e('Replies') ?></th>
-					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-endif;
diff --git a/view/search/posts.php b/view/search/posts.php
deleted file mode 100644
index 39f20c24..00000000
--- a/view/search/posts.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockpost<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($cur_search['pid'] == $cur_search['first_post_id']) {
-    echo ' firstpost';
-} ?><?php if ($post_count == 1) {
-    echo ' blockpost1';
-} ?><?php if ($cur_search['item_status'] != '') {
-    echo ' '.$cur_search['item_status'];
-} ?>">
-<h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
-    _e('Re').' ';
-} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
-<div class="box">
-	<div class="inbox">
-		<div class="postbody">
-			<div class="postleft">
-				<dl>
-					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.Utils::forum_number_format($cur_search['num_replies']) ?></span></dd>
-<?php endif; ?>
-					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
-				</dl>
-			</div>
-			<div class="postright">
-				<div class="postmsg">
-					<?php echo $cur_search['message']."\n" ?>
-				</div>
-			</div>
-			<div class="clearer"></div>
-		</div>
-	</div>
-	<div class="inbox">
-		<div class="postfoot clearb">
-			<div class="postfootright">
-				<ul>
-					<li><span><a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
-					<li><span><a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-</div>
-</div>
\ No newline at end of file
diff --git a/view/search/topics.php b/view/search/topics.php
deleted file mode 100644
index 7549c3f3..00000000
--- a/view/search/topics.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<tr class="<?php echo $cur_search['item_status'] ?>">
-	<td class="tcl">
-		<div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo Utils::forum_number_format($topic_count + $start_from) ?></div></div>
-		<div class="tclcon">
-			<div>
-				<?php echo $subject."\n" ?>
-			</div>
-		</div>
-	</td>
-	<td class="tc2"><?php echo $forum ?></td>
-	<td class="tc3"><?php echo Utils::forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.$feather->utils->format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_search['last_poster']) ?></span></td>
-</tr>
\ No newline at end of file
diff --git a/view/userlist.php b/view/userlist.php
deleted file mode 100644
index 911df592..00000000
--- a/view/userlist.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('User search') ?></span></h2>
-	<div class="box">
-		<form id="userlist" method="get" action="">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('User find legend') ?></legend>
-					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo Utils::escape($username) ?>" size="25" maxlength="25" /><br /></label>
-<?php endif; ?>						<label class="conl"><?php _e('User group')."\n" ?>
-						<br /><select name="show_group">
-							<option value="-1"<?php if ($show_group == -1) {
-    echo ' selected="selected"';
-} ?>><?php _e('All users') ?></option>
-<?php echo $dropdown_menu ?>
-						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Sort by')."\n" ?>
-						<br /><select name="sort_by">
-							<option value="username"<?php if ($sort_by == 'username') {
-    echo ' selected="selected"';
-} ?>><?php _e('Username') ?></option>
-							<option value="registered"<?php if ($sort_by == 'registered') {
-    echo ' selected="selected"';
-} ?>><?php _e('Registered') ?></option>
-<?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
-    echo ' selected="selected"';
-} ?>><?php _e('No of posts') ?></option>
-<?php endif; ?>						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Sort order')."\n" ?>
-						<br /><select name="sort_dir">
-							<option value="ASC"<?php if ($sort_dir == 'ASC') {
-    echo ' selected="selected"';
-} ?>><?php _e('Ascending') ?></option>
-							<option value="DESC"<?php if ($sort_dir == 'DESC') {
-    echo ' selected="selected"';
-} ?>><?php _e('Descending') ?></option>
-						</select>
-						<br /></label>
-						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? __('User search info').' ' : '').__('User sort info'); ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
-		</form>
-	</div>
-</div>
-
-<div class="linkst">
-	<div class="inbox">
-		<p class="pagelink"><?php echo $paging_links ?></p>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="users1" class="blocktable">
-	<h2><span><?php _e('User list') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Username') ?></th>
-					<th class="tc2" scope="col"><?php _e('Title') ?></th>
-<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Registered') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-			<?php
-            foreach ($userlist_data as $user) {
-                ?>
-					<tr>
-						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
-						<td class="tc2"><?php echo get_title($user) ?></td>
-	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
-	<?php endif;
-                ?>
-						<td class="tcr"><?php echo $feather->utils->format_time($user['registered'], true) ?></td>
-					</tr>
-			<?php
-
-            }
-            if (empty($userlist_data)) {
-                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.__('No hits').'</td></tr>'."\n";
-            }
-            ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox">
-		<p class="pagelink"><?php echo $paging_links ?></p>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/viewforum.php b/view/viewforum.php
deleted file mode 100644
index 79bd70a1..00000000
--- a/view/viewforum.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="vf" class="blocktable">
-	<h2><span><?php echo Utils::escape($cur_forum['forum_name']) ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
-					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-			<?php
-            $topic_count = 0;
-            foreach ($forum_data as $topic) {
-                ++$topic_count;
-                ?>
-					<tr class="<?php echo $topic['item_status'] ?>">
-						<td class="tcl">
-							<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo Utils::forum_number_format($topic_count + $start_from) ?></div></div>
-							<div class="tclcon">
-								<div>
-									<?php echo $topic['subject_formatted']."\n" ?>
-								</div>
-							</div>
-						</td>
-						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? Utils::forum_number_format($topic['num_replies']) : '-' ?></td>
-	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? Utils::forum_number_format($topic['num_views']) : '-' ?></td>
-	<?php endif;
-                ?>					<td class="tcr"><?php echo $topic['last_post_formatted'] ?></td>
-					</tr>
-			<?php
-
-            }
-            if (empty($forum_data)):
-            ?>
-					<tr class="rowodd inone">
-						<td class="tcl" colspan="<?php echo($feather->forum_settings['o_topic_views'] == 1) ? 4 : 3 ?>">
-							<div class="icon inone"><div class="nosize"><!-- --></div></div>
-							<div class="tclcon">
-								<div>
-									<strong><?php _e('Empty forum') ?></strong>
-								</div>
-							</div>
-						</td>
-					</tr>
-			<?php
-            endif;
-            ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
-		</ul>
-<?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
-		<div class="clearer"></div>
-	</div>
-</div>
diff --git a/view/viewtopic.php b/view/viewtopic.php
deleted file mode 100644
index 83087f66..00000000
--- a/view/viewtopic.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<?php
-$post_count = 1;
-foreach ($post_data as $post) {
-    ?>
-<div id="p<?php echo $post['id'] ?>" class="blockpost<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($post['id'] == $cur_topic['first_post_id']) {
-    echo ' firstpost';
-}
-    ?><?php if ($post_count == 1) {
-    echo ' blockpost1';
-}
-    ?>">
-	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postleft">
-					<dl>
-						<dt><strong><?php echo $post['username_formatted'] ?></strong></dt>
-						<dd class="usertitle"><strong><?php echo $post['user_title_formatted'] ?></strong></dd>
-<?php if ($post['user_avatar'] != '') {
-    echo "\t\t\t\t\t\t".'<dd class="postavatar">'.$post['user_avatar'].'</dd>'."\n";
-}
-    ?>
-<?php if (count($post['user_info'])) {
-    echo "\t\t\t\t\t\t".implode("\n\t\t\t\t\t\t", $post['user_info'])."\n";
-}
-    ?>
-<?php if (count($post['user_contacts'])) {
-    echo "\t\t\t\t\t\t".'<dd class="usercontacts">'.implode(' ', $post['user_contacts']).'</dd>'."\n";
-}
-    ?>
-					</dl>
-				</div>
-				<div class="postright">
-					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
-    _e('Re').' ';
-}
-    ?><?php echo Utils::escape($cur_topic['subject']) ?></h3>
-					<div class="postmsg">
-						<?php echo $post['message']."\n" ?>
-<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.Utils::escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
-}
-    ?>
-					</div>
-<?php if ($post['signature_formatted'] != '') {
-    echo "\t\t\t\t\t".'<div class="postsignature postmsg"><hr />'.$post['signature_formatted'].'</div>'."\n";
-}
-    ?>
-				</div>
-			</div>
-		</div>
-		<div class="inbox">
-			<div class="postfoot clearb">
-				<div class="postfootleft"><?php if ($post['poster_id'] > 1) {
-    echo '<p>'.$post['is_online_formatted'].'</p>';
-}
-    ?></div>
-<?php if (count($post['post_actions'])) {
-    echo "\t\t\t\t".'<div class="postfootright">'."\n\t\t\t\t\t".'<ul>'."\n\t\t\t\t\t\t".implode("\n\t\t\t\t\t\t", $post['post_actions'])."\n\t\t\t\t\t".'</ul>'."\n\t\t\t\t".'</div>'."\n";
-}
-    ?>
-			</div>
-		</div>
-	</div>
-</div>
-<?php
-    ++$post_count;
-}
-?>
-
-<div class="postlinksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
-		</ul>
-<?php echo $subscraction ?>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<?php
-
-// Display quick post if enabled
-if ($quickpost) {
-    $cur_index = 1;
-
-    ?>
-<div id="quickpost" class="blockform">
-	<h2><span><?php _e('Quick post') ?></span></h2>
-	<div class="box">
-		<form id="quickpostform" method="post" action="<?php echo $feather->url->get('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write message legend') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="pid" value="<?php echo Utils::escape($pid) ?>" />
-						<input type="hidden" name="page" value="<?php echo Utils::escape($page_number) ?>" />
-<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
-<?php endif;
-
-    if ($feather->user->is_guest) {
-        $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-        $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
-        ?>
-						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<div class="clearer"></div>
-<?php
-
-    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.__('Message').' <span>'.__('Required').'</span></strong><br />';
-    } else {
-        echo "\t\t\t\t\t\t".'<label>';
-    }
-
-    ?>
-<!-- Init BBcode editor toolbar -->
-<script>
-    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
-        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
-</script>
-<script src="<?php echo Url::base() ?>/style/imports/bbeditor.js"></script>
-<script>postEditorToolbar('req_message');</script>
-
-<textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
-    ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
-    ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
-    ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
-    ?></span></li>
-						</ul>
-					</div>
-				</fieldset>
-			</div>
-			<?php if ($feather->user->is_guest) : ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Robot title') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Robot info')    ?></p>
-						<label class="required"><strong><?php
-                             $question = array_keys($lang_antispam_questions);
-    $qencoded = md5($question[$index_questions]);
-    echo sprintf(__('Robot question'), $question[$index_questions]);
-    ?>
-							 <span><?php _e('Required') ?></span></strong>
-							 <br />
-							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
-						</label>
-					</div>
-				</fieldset>
-			</div>
-			<?php endif;
-    ?>
-			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php _e('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
-		</form>
-	</div>
-</div>
-<?php
-
-}

From 537fc9e0c4ea0776b737e0fe79b1c72bbec1f180 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 7 Sep 2015 13:25:02 +0200
Subject: [PATCH 341/353] Revert "Use a fallback for default themes views"

This reverts commit 6c5c12ac8399c868f7fe40795dd1ddb176779d55.
---
 featherbb/Controller/Install.php              |   5 +-
 featherbb/Core/View.php                       |   4 +-
 .../FeatherBB/view}/admin/bans/add_ban.php    |   0
 .../FeatherBB/view}/admin/bans/admin_bans.php |   0
 .../FeatherBB/view}/admin/bans/search_ban.php |   0
 .../FeatherBB/view}/admin/categories.php      |   0
 .../FeatherBB/view}/admin/censoring.php       |   0
 .../view}/admin/forums/admin_forums.php       |   0
 .../view}/admin/forums/delete_forum.php       |   0
 .../view}/admin/forums/permissions.php        |   0
 .../view}/admin/groups/add_edit_group.php     |   0
 .../view}/admin/groups/admin_groups.php       |   0
 .../view}/admin/groups/confirm_delete.php     |   0
 .../view}/admin/groups/delete_group.php       |   0
 .../themes/FeatherBB/view}/admin/index.php    |   0
 .../themes/FeatherBB/view}/admin/loader.php   |   0
 .../admin/maintenance/admin_maintenance.php   |   0
 .../view}/admin/maintenance/prune.php         |   0
 .../view}/admin/maintenance/rebuild.php       |   0
 .../themes/FeatherBB/view}/admin/menu.php     |   0
 .../themes/FeatherBB/view}/admin/options.php  |   0
 .../themes/FeatherBB/view}/admin/parser.php   |   0
 .../FeatherBB/view}/admin/permissions.php     |   0
 .../themes/FeatherBB/view}/admin/plugins.php  |   0
 .../themes/FeatherBB/view}/admin/reports.php  |   0
 .../FeatherBB/view}/admin/statistics.php      |   0
 .../view}/admin/users/admin_users.php         |   0
 .../FeatherBB/view}/admin/users/ban_users.php |   0
 .../view}/admin/users/delete_users.php        |   0
 .../view}/admin/users/find_users.php          |   0
 .../view}/admin/users/move_users.php          |   0
 .../FeatherBB/view}/admin/users/search_ip.php |   0
 .../view}/admin/users/show_users.php          |   0
 .../themes/FeatherBB/view}/delete.php         |   0
 .../themes/FeatherBB/view}/edit.php           |   0
 .../themes/FeatherBB/view}/error.php          |   0
 .../themes/FeatherBB/view}/footer.php         |   0
 .../themes/FeatherBB/view}/forum.php          |   0
 .../themes/FeatherBB/view}/header.php         |   0
 .../themes/FeatherBB/view}/help.php           |   0
 .../themes/FeatherBB/view}/index.php          |   0
 .../themes/FeatherBB/view}/install.php        |   0
 .../themes/FeatherBB/view}/login/form.php     |   0
 .../view}/login/password_forgotten.php        |   0
 .../themes/FeatherBB/view}/misc/email.php     |   0
 .../themes/FeatherBB/view}/misc/report.php    |   0
 .../themes/FeatherBB/view}/misc/rules.php     |   0
 .../FeatherBB/view}/moderate/delete_posts.php |   0
 .../view}/moderate/delete_topics.php          |   0
 .../FeatherBB/view}/moderate/merge_topics.php |   0
 .../view}/moderate/moderator_forum.php        |   0
 .../FeatherBB/view}/moderate/move_topics.php  |   0
 .../FeatherBB/view}/moderate/posts_view.php   |   0
 .../FeatherBB/view}/moderate/split_posts.php  |   0
 .../themes/FeatherBB/view}/post.php           |   0
 .../FeatherBB/view}/profile/change_mail.php   |   0
 .../FeatherBB/view}/profile/change_pass.php   |   0
 .../FeatherBB/view}/profile/delete_user.php   |   0
 .../themes/FeatherBB/view}/profile/menu.php   |   0
 .../FeatherBB/view}/profile/section_admin.php |   0
 .../view}/profile/section_display.php         |   0
 .../view}/profile/section_essentials.php      |   0
 .../view}/profile/section_messaging.php       |   0
 .../view}/profile/section_personal.php        |   0
 .../view}/profile/section_personality.php     |   0
 .../view}/profile/section_privacy.php         |   0
 .../FeatherBB/view}/profile/upload_avatar.php |   0
 .../FeatherBB/view}/profile/view_profile.php  |   0
 .../themes/FeatherBB/view}/register/email.php |   0
 .../themes/FeatherBB/view}/register/form.php  |   0
 .../themes/FeatherBB/view}/register/rules.php |   0
 .../themes/FeatherBB/view}/search/footer.php  |   0
 .../themes/FeatherBB/view}/search/form.php    |   0
 .../themes/FeatherBB/view}/search/header.php  |   0
 .../themes/FeatherBB/view}/search/posts.php   |   0
 .../themes/FeatherBB/view}/search/topics.php  |   0
 .../themes/FeatherBB/view}/topic.php          |   0
 .../themes/FeatherBB/view}/userlist.php       |   0
 view/admin/bans/add_ban.php                   |  96 ++
 view/admin/bans/admin_bans.php                | 102 +++
 view/admin/bans/search_ban.php                |  87 ++
 view/admin/categories.php                     | 111 +++
 view/admin/censoring.php                      |  84 ++
 view/admin/forums/admin_forums.php            | 114 +++
 view/admin/forums/delete_forum.php            |  35 +
 view/admin/forums/permissions.php             | 137 +++
 view/admin/groups/add_edit_group.php          | 311 +++++++
 view/admin/groups/admin_groups.php            | 110 +++
 view/admin/groups/confirm_delete.php          |  36 +
 view/admin/groups/delete_group.php            |  39 +
 view/admin/index.php                          |  63 ++
 view/admin/loader.php                         |  17 +
 view/admin/maintenance/admin_maintenance.php  |  99 ++
 view/admin/maintenance/prune.php              |  39 +
 view/admin/maintenance/rebuild.php            |  17 +
 view/admin/menu.php                           | 116 +++
 view/admin/options.php                        | 844 ++++++++++++++++++
 view/admin/parser.php                         | 299 +++++++
 view/admin/permissions.php                    | 189 ++++
 view/admin/plugins.php                        |  72 ++
 view/admin/reports.php                        | 116 +++
 view/admin/statistics.php                     |  42 +
 view/admin/users/admin_users.php              | 172 ++++
 view/admin/users/ban_users.php                |  58 ++
 view/admin/users/delete_users.php             |  39 +
 view/admin/users/find_users.php               | 100 +++
 view/admin/users/move_users.php               |  47 +
 view/admin/users/search_ip.php                |  79 ++
 view/admin/users/show_users.php               | 100 +++
 view/delete.php                               |  67 ++
 view/edit.php                                 | 119 +++
 view/error.php                                |  26 +
 view/footer.php                               | 134 +++
 view/header.php                               | 131 +++
 view/help.php                                 | 139 +++
 view/index.php                                | 111 +++
 view/install.php                              | 222 +++++
 view/login/form.php                           |  42 +
 view/login/password_forgotten.php             |  57 ++
 view/message.php                              |  25 +
 view/misc/email.php                           |  37 +
 view/misc/report.php                          |  44 +
 view/misc/rules.php                           |  23 +
 view/moderate/delete_posts.php                |  33 +
 view/moderate/delete_topics.php               |  34 +
 view/moderate/merge_topics.php                |  36 +
 view/moderate/moderator_forum.php             | 101 +++
 view/moderate/move_topics.php                 |  44 +
 view/moderate/posts_view.php                  |  95 ++
 view/moderate/split_posts.php                 |  40 +
 view/post.php                                 | 211 +++++
 view/profile/change_mail.php                  |  35 +
 view/profile/change_pass.php                  |  39 +
 view/profile/delete_user.php                  |  36 +
 view/profile/menu.php                         |  55 ++
 view/profile/section_admin.php                |  87 ++
 view/profile/section_display.php              | 101 +++
 view/profile/section_essentials.php           | 258 ++++++
 view/profile/section_messaging.php            |  39 +
 view/profile/section_personal.php             |  39 +
 view/profile/section_personality.php          |  56 ++
 view/profile/section_privacy.php              |  62 ++
 view/profile/upload_avatar.php                |  35 +
 view/profile/view_profile.php                 |  66 ++
 view/register/email.php                       |  39 +
 view/register/form.php                        | 134 +++
 view/register/rules.php                       |  32 +
 view/search/footer.php                        |  40 +
 view/search/form.php                          |  79 ++
 view/search/header.php                        |  48 +
 view/search/posts.php                         |  56 ++
 view/search/topics.php                        |  29 +
 view/userlist.php                             | 115 +++
 view/viewforum.php                            | 100 +++
 view/viewtopic.php                            | 204 +++++
 155 files changed, 7329 insertions(+), 5 deletions(-)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/bans/add_ban.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/bans/admin_bans.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/bans/search_ban.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/categories.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/censoring.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/forums/admin_forums.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/forums/delete_forum.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/forums/permissions.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/groups/add_edit_group.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/groups/admin_groups.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/groups/confirm_delete.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/groups/delete_group.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/index.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/loader.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/maintenance/admin_maintenance.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/maintenance/prune.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/maintenance/rebuild.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/menu.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/options.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/parser.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/permissions.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/plugins.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/reports.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/statistics.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/users/admin_users.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/users/ban_users.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/users/delete_users.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/users/find_users.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/users/move_users.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/users/search_ip.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/admin/users/show_users.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/delete.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/edit.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/error.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/footer.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/forum.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/header.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/help.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/index.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/install.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/login/form.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/login/password_forgotten.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/misc/email.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/misc/report.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/misc/rules.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/moderate/delete_posts.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/moderate/delete_topics.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/moderate/merge_topics.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/moderate/moderator_forum.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/moderate/move_topics.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/moderate/posts_view.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/moderate/split_posts.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/post.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/profile/change_mail.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/profile/change_pass.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/profile/delete_user.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/profile/menu.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/profile/section_admin.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/profile/section_display.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/profile/section_essentials.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/profile/section_messaging.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/profile/section_personal.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/profile/section_personality.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/profile/section_privacy.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/profile/upload_avatar.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/profile/view_profile.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/register/email.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/register/form.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/register/rules.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/search/footer.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/search/form.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/search/header.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/search/posts.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/search/topics.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/topic.php (100%)
 rename {featherbb/View => style/themes/FeatherBB/view}/userlist.php (100%)
 create mode 100644 view/admin/bans/add_ban.php
 create mode 100644 view/admin/bans/admin_bans.php
 create mode 100644 view/admin/bans/search_ban.php
 create mode 100644 view/admin/categories.php
 create mode 100644 view/admin/censoring.php
 create mode 100644 view/admin/forums/admin_forums.php
 create mode 100644 view/admin/forums/delete_forum.php
 create mode 100644 view/admin/forums/permissions.php
 create mode 100644 view/admin/groups/add_edit_group.php
 create mode 100644 view/admin/groups/admin_groups.php
 create mode 100644 view/admin/groups/confirm_delete.php
 create mode 100644 view/admin/groups/delete_group.php
 create mode 100644 view/admin/index.php
 create mode 100644 view/admin/loader.php
 create mode 100644 view/admin/maintenance/admin_maintenance.php
 create mode 100644 view/admin/maintenance/prune.php
 create mode 100644 view/admin/maintenance/rebuild.php
 create mode 100644 view/admin/menu.php
 create mode 100644 view/admin/options.php
 create mode 100644 view/admin/parser.php
 create mode 100644 view/admin/permissions.php
 create mode 100644 view/admin/plugins.php
 create mode 100644 view/admin/reports.php
 create mode 100644 view/admin/statistics.php
 create mode 100644 view/admin/users/admin_users.php
 create mode 100644 view/admin/users/ban_users.php
 create mode 100644 view/admin/users/delete_users.php
 create mode 100644 view/admin/users/find_users.php
 create mode 100644 view/admin/users/move_users.php
 create mode 100644 view/admin/users/search_ip.php
 create mode 100644 view/admin/users/show_users.php
 create mode 100644 view/delete.php
 create mode 100644 view/edit.php
 create mode 100644 view/error.php
 create mode 100644 view/footer.php
 create mode 100644 view/header.php
 create mode 100644 view/help.php
 create mode 100644 view/index.php
 create mode 100644 view/install.php
 create mode 100644 view/login/form.php
 create mode 100644 view/login/password_forgotten.php
 create mode 100644 view/message.php
 create mode 100644 view/misc/email.php
 create mode 100644 view/misc/report.php
 create mode 100644 view/misc/rules.php
 create mode 100644 view/moderate/delete_posts.php
 create mode 100644 view/moderate/delete_topics.php
 create mode 100644 view/moderate/merge_topics.php
 create mode 100644 view/moderate/moderator_forum.php
 create mode 100644 view/moderate/move_topics.php
 create mode 100644 view/moderate/posts_view.php
 create mode 100644 view/moderate/split_posts.php
 create mode 100644 view/post.php
 create mode 100644 view/profile/change_mail.php
 create mode 100644 view/profile/change_pass.php
 create mode 100644 view/profile/delete_user.php
 create mode 100644 view/profile/menu.php
 create mode 100644 view/profile/section_admin.php
 create mode 100644 view/profile/section_display.php
 create mode 100644 view/profile/section_essentials.php
 create mode 100644 view/profile/section_messaging.php
 create mode 100644 view/profile/section_personal.php
 create mode 100644 view/profile/section_personality.php
 create mode 100644 view/profile/section_privacy.php
 create mode 100644 view/profile/upload_avatar.php
 create mode 100644 view/profile/view_profile.php
 create mode 100644 view/register/email.php
 create mode 100644 view/register/form.php
 create mode 100644 view/register/rules.php
 create mode 100644 view/search/footer.php
 create mode 100644 view/search/form.php
 create mode 100644 view/search/header.php
 create mode 100644 view/search/posts.php
 create mode 100644 view/search/topics.php
 create mode 100644 view/userlist.php
 create mode 100644 view/viewforum.php
 create mode 100644 view/viewtopic.php

diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
index 17f6038e..e3c10fba 100644
--- a/featherbb/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -9,10 +9,9 @@
 
 namespace FeatherBB\Controller;
 
+use FeatherBB\Core\Random;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Utils;
-use FeatherBB\Core\Random;
-use FeatherBB\Middleware\Core;
 
 class Install
 {
@@ -166,7 +165,7 @@ public function create_config(array $data)
 
     public function create_db(array $data)
     {
-        Core::init_db($data);
+        \FeatherBB\Core::init_db($data);
 
         // Load appropriate language
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$data['default_lang'].'/install.mo');
diff --git a/featherbb/Core/View.php b/featherbb/Core/View.php
index a4931bf9..feafdd7c 100644
--- a/featherbb/Core/View.php
+++ b/featherbb/Core/View.php
@@ -194,7 +194,7 @@ public function getTemplatePathname($file)
     {
         $pathname = $this->templatesDirectory . DIRECTORY_SEPARATOR . ltrim($file, DIRECTORY_SEPARATOR);
         if (!is_file($pathname)) {
-            $pathname = $this->app->forum_env['FEATHER_ROOT'] . 'featherbb/View/' . ltrim($file, DIRECTORY_SEPARATOR); // Fallback on default view
+            $pathname = $this->app->forum_env['FEATHER_ROOT'] . 'view/' . ltrim($file, DIRECTORY_SEPARATOR); // Fallback on default view
             if (!is_file($pathname)) {
                 throw new \RuntimeException("View cannot add template `$file` to stack because the template does not exist");
             }
@@ -251,7 +251,7 @@ protected function render($data = null, $nested = true)
 
     public function setStyle($style)
     {
-        if (!is_dir($this->app->forum_env['FEATHER_ROOT'].'style/themes/'.$style.'/')) {
+        if (!is_dir($this->app->forum_env['FEATHER_ROOT'].'style/themes/'.$style.'/view/')) {
             throw new \InvalidArgumentException('The style '.$style.' doesn\'t exist');
         }
         $this->data->set('style', (string) $style);
diff --git a/featherbb/View/admin/bans/add_ban.php b/style/themes/FeatherBB/view/admin/bans/add_ban.php
similarity index 100%
rename from featherbb/View/admin/bans/add_ban.php
rename to style/themes/FeatherBB/view/admin/bans/add_ban.php
diff --git a/featherbb/View/admin/bans/admin_bans.php b/style/themes/FeatherBB/view/admin/bans/admin_bans.php
similarity index 100%
rename from featherbb/View/admin/bans/admin_bans.php
rename to style/themes/FeatherBB/view/admin/bans/admin_bans.php
diff --git a/featherbb/View/admin/bans/search_ban.php b/style/themes/FeatherBB/view/admin/bans/search_ban.php
similarity index 100%
rename from featherbb/View/admin/bans/search_ban.php
rename to style/themes/FeatherBB/view/admin/bans/search_ban.php
diff --git a/featherbb/View/admin/categories.php b/style/themes/FeatherBB/view/admin/categories.php
similarity index 100%
rename from featherbb/View/admin/categories.php
rename to style/themes/FeatherBB/view/admin/categories.php
diff --git a/featherbb/View/admin/censoring.php b/style/themes/FeatherBB/view/admin/censoring.php
similarity index 100%
rename from featherbb/View/admin/censoring.php
rename to style/themes/FeatherBB/view/admin/censoring.php
diff --git a/featherbb/View/admin/forums/admin_forums.php b/style/themes/FeatherBB/view/admin/forums/admin_forums.php
similarity index 100%
rename from featherbb/View/admin/forums/admin_forums.php
rename to style/themes/FeatherBB/view/admin/forums/admin_forums.php
diff --git a/featherbb/View/admin/forums/delete_forum.php b/style/themes/FeatherBB/view/admin/forums/delete_forum.php
similarity index 100%
rename from featherbb/View/admin/forums/delete_forum.php
rename to style/themes/FeatherBB/view/admin/forums/delete_forum.php
diff --git a/featherbb/View/admin/forums/permissions.php b/style/themes/FeatherBB/view/admin/forums/permissions.php
similarity index 100%
rename from featherbb/View/admin/forums/permissions.php
rename to style/themes/FeatherBB/view/admin/forums/permissions.php
diff --git a/featherbb/View/admin/groups/add_edit_group.php b/style/themes/FeatherBB/view/admin/groups/add_edit_group.php
similarity index 100%
rename from featherbb/View/admin/groups/add_edit_group.php
rename to style/themes/FeatherBB/view/admin/groups/add_edit_group.php
diff --git a/featherbb/View/admin/groups/admin_groups.php b/style/themes/FeatherBB/view/admin/groups/admin_groups.php
similarity index 100%
rename from featherbb/View/admin/groups/admin_groups.php
rename to style/themes/FeatherBB/view/admin/groups/admin_groups.php
diff --git a/featherbb/View/admin/groups/confirm_delete.php b/style/themes/FeatherBB/view/admin/groups/confirm_delete.php
similarity index 100%
rename from featherbb/View/admin/groups/confirm_delete.php
rename to style/themes/FeatherBB/view/admin/groups/confirm_delete.php
diff --git a/featherbb/View/admin/groups/delete_group.php b/style/themes/FeatherBB/view/admin/groups/delete_group.php
similarity index 100%
rename from featherbb/View/admin/groups/delete_group.php
rename to style/themes/FeatherBB/view/admin/groups/delete_group.php
diff --git a/featherbb/View/admin/index.php b/style/themes/FeatherBB/view/admin/index.php
similarity index 100%
rename from featherbb/View/admin/index.php
rename to style/themes/FeatherBB/view/admin/index.php
diff --git a/featherbb/View/admin/loader.php b/style/themes/FeatherBB/view/admin/loader.php
similarity index 100%
rename from featherbb/View/admin/loader.php
rename to style/themes/FeatherBB/view/admin/loader.php
diff --git a/featherbb/View/admin/maintenance/admin_maintenance.php b/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
similarity index 100%
rename from featherbb/View/admin/maintenance/admin_maintenance.php
rename to style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
diff --git a/featherbb/View/admin/maintenance/prune.php b/style/themes/FeatherBB/view/admin/maintenance/prune.php
similarity index 100%
rename from featherbb/View/admin/maintenance/prune.php
rename to style/themes/FeatherBB/view/admin/maintenance/prune.php
diff --git a/featherbb/View/admin/maintenance/rebuild.php b/style/themes/FeatherBB/view/admin/maintenance/rebuild.php
similarity index 100%
rename from featherbb/View/admin/maintenance/rebuild.php
rename to style/themes/FeatherBB/view/admin/maintenance/rebuild.php
diff --git a/featherbb/View/admin/menu.php b/style/themes/FeatherBB/view/admin/menu.php
similarity index 100%
rename from featherbb/View/admin/menu.php
rename to style/themes/FeatherBB/view/admin/menu.php
diff --git a/featherbb/View/admin/options.php b/style/themes/FeatherBB/view/admin/options.php
similarity index 100%
rename from featherbb/View/admin/options.php
rename to style/themes/FeatherBB/view/admin/options.php
diff --git a/featherbb/View/admin/parser.php b/style/themes/FeatherBB/view/admin/parser.php
similarity index 100%
rename from featherbb/View/admin/parser.php
rename to style/themes/FeatherBB/view/admin/parser.php
diff --git a/featherbb/View/admin/permissions.php b/style/themes/FeatherBB/view/admin/permissions.php
similarity index 100%
rename from featherbb/View/admin/permissions.php
rename to style/themes/FeatherBB/view/admin/permissions.php
diff --git a/featherbb/View/admin/plugins.php b/style/themes/FeatherBB/view/admin/plugins.php
similarity index 100%
rename from featherbb/View/admin/plugins.php
rename to style/themes/FeatherBB/view/admin/plugins.php
diff --git a/featherbb/View/admin/reports.php b/style/themes/FeatherBB/view/admin/reports.php
similarity index 100%
rename from featherbb/View/admin/reports.php
rename to style/themes/FeatherBB/view/admin/reports.php
diff --git a/featherbb/View/admin/statistics.php b/style/themes/FeatherBB/view/admin/statistics.php
similarity index 100%
rename from featherbb/View/admin/statistics.php
rename to style/themes/FeatherBB/view/admin/statistics.php
diff --git a/featherbb/View/admin/users/admin_users.php b/style/themes/FeatherBB/view/admin/users/admin_users.php
similarity index 100%
rename from featherbb/View/admin/users/admin_users.php
rename to style/themes/FeatherBB/view/admin/users/admin_users.php
diff --git a/featherbb/View/admin/users/ban_users.php b/style/themes/FeatherBB/view/admin/users/ban_users.php
similarity index 100%
rename from featherbb/View/admin/users/ban_users.php
rename to style/themes/FeatherBB/view/admin/users/ban_users.php
diff --git a/featherbb/View/admin/users/delete_users.php b/style/themes/FeatherBB/view/admin/users/delete_users.php
similarity index 100%
rename from featherbb/View/admin/users/delete_users.php
rename to style/themes/FeatherBB/view/admin/users/delete_users.php
diff --git a/featherbb/View/admin/users/find_users.php b/style/themes/FeatherBB/view/admin/users/find_users.php
similarity index 100%
rename from featherbb/View/admin/users/find_users.php
rename to style/themes/FeatherBB/view/admin/users/find_users.php
diff --git a/featherbb/View/admin/users/move_users.php b/style/themes/FeatherBB/view/admin/users/move_users.php
similarity index 100%
rename from featherbb/View/admin/users/move_users.php
rename to style/themes/FeatherBB/view/admin/users/move_users.php
diff --git a/featherbb/View/admin/users/search_ip.php b/style/themes/FeatherBB/view/admin/users/search_ip.php
similarity index 100%
rename from featherbb/View/admin/users/search_ip.php
rename to style/themes/FeatherBB/view/admin/users/search_ip.php
diff --git a/featherbb/View/admin/users/show_users.php b/style/themes/FeatherBB/view/admin/users/show_users.php
similarity index 100%
rename from featherbb/View/admin/users/show_users.php
rename to style/themes/FeatherBB/view/admin/users/show_users.php
diff --git a/featherbb/View/delete.php b/style/themes/FeatherBB/view/delete.php
similarity index 100%
rename from featherbb/View/delete.php
rename to style/themes/FeatherBB/view/delete.php
diff --git a/featherbb/View/edit.php b/style/themes/FeatherBB/view/edit.php
similarity index 100%
rename from featherbb/View/edit.php
rename to style/themes/FeatherBB/view/edit.php
diff --git a/featherbb/View/error.php b/style/themes/FeatherBB/view/error.php
similarity index 100%
rename from featherbb/View/error.php
rename to style/themes/FeatherBB/view/error.php
diff --git a/featherbb/View/footer.php b/style/themes/FeatherBB/view/footer.php
similarity index 100%
rename from featherbb/View/footer.php
rename to style/themes/FeatherBB/view/footer.php
diff --git a/featherbb/View/forum.php b/style/themes/FeatherBB/view/forum.php
similarity index 100%
rename from featherbb/View/forum.php
rename to style/themes/FeatherBB/view/forum.php
diff --git a/featherbb/View/header.php b/style/themes/FeatherBB/view/header.php
similarity index 100%
rename from featherbb/View/header.php
rename to style/themes/FeatherBB/view/header.php
diff --git a/featherbb/View/help.php b/style/themes/FeatherBB/view/help.php
similarity index 100%
rename from featherbb/View/help.php
rename to style/themes/FeatherBB/view/help.php
diff --git a/featherbb/View/index.php b/style/themes/FeatherBB/view/index.php
similarity index 100%
rename from featherbb/View/index.php
rename to style/themes/FeatherBB/view/index.php
diff --git a/featherbb/View/install.php b/style/themes/FeatherBB/view/install.php
similarity index 100%
rename from featherbb/View/install.php
rename to style/themes/FeatherBB/view/install.php
diff --git a/featherbb/View/login/form.php b/style/themes/FeatherBB/view/login/form.php
similarity index 100%
rename from featherbb/View/login/form.php
rename to style/themes/FeatherBB/view/login/form.php
diff --git a/featherbb/View/login/password_forgotten.php b/style/themes/FeatherBB/view/login/password_forgotten.php
similarity index 100%
rename from featherbb/View/login/password_forgotten.php
rename to style/themes/FeatherBB/view/login/password_forgotten.php
diff --git a/featherbb/View/misc/email.php b/style/themes/FeatherBB/view/misc/email.php
similarity index 100%
rename from featherbb/View/misc/email.php
rename to style/themes/FeatherBB/view/misc/email.php
diff --git a/featherbb/View/misc/report.php b/style/themes/FeatherBB/view/misc/report.php
similarity index 100%
rename from featherbb/View/misc/report.php
rename to style/themes/FeatherBB/view/misc/report.php
diff --git a/featherbb/View/misc/rules.php b/style/themes/FeatherBB/view/misc/rules.php
similarity index 100%
rename from featherbb/View/misc/rules.php
rename to style/themes/FeatherBB/view/misc/rules.php
diff --git a/featherbb/View/moderate/delete_posts.php b/style/themes/FeatherBB/view/moderate/delete_posts.php
similarity index 100%
rename from featherbb/View/moderate/delete_posts.php
rename to style/themes/FeatherBB/view/moderate/delete_posts.php
diff --git a/featherbb/View/moderate/delete_topics.php b/style/themes/FeatherBB/view/moderate/delete_topics.php
similarity index 100%
rename from featherbb/View/moderate/delete_topics.php
rename to style/themes/FeatherBB/view/moderate/delete_topics.php
diff --git a/featherbb/View/moderate/merge_topics.php b/style/themes/FeatherBB/view/moderate/merge_topics.php
similarity index 100%
rename from featherbb/View/moderate/merge_topics.php
rename to style/themes/FeatherBB/view/moderate/merge_topics.php
diff --git a/featherbb/View/moderate/moderator_forum.php b/style/themes/FeatherBB/view/moderate/moderator_forum.php
similarity index 100%
rename from featherbb/View/moderate/moderator_forum.php
rename to style/themes/FeatherBB/view/moderate/moderator_forum.php
diff --git a/featherbb/View/moderate/move_topics.php b/style/themes/FeatherBB/view/moderate/move_topics.php
similarity index 100%
rename from featherbb/View/moderate/move_topics.php
rename to style/themes/FeatherBB/view/moderate/move_topics.php
diff --git a/featherbb/View/moderate/posts_view.php b/style/themes/FeatherBB/view/moderate/posts_view.php
similarity index 100%
rename from featherbb/View/moderate/posts_view.php
rename to style/themes/FeatherBB/view/moderate/posts_view.php
diff --git a/featherbb/View/moderate/split_posts.php b/style/themes/FeatherBB/view/moderate/split_posts.php
similarity index 100%
rename from featherbb/View/moderate/split_posts.php
rename to style/themes/FeatherBB/view/moderate/split_posts.php
diff --git a/featherbb/View/post.php b/style/themes/FeatherBB/view/post.php
similarity index 100%
rename from featherbb/View/post.php
rename to style/themes/FeatherBB/view/post.php
diff --git a/featherbb/View/profile/change_mail.php b/style/themes/FeatherBB/view/profile/change_mail.php
similarity index 100%
rename from featherbb/View/profile/change_mail.php
rename to style/themes/FeatherBB/view/profile/change_mail.php
diff --git a/featherbb/View/profile/change_pass.php b/style/themes/FeatherBB/view/profile/change_pass.php
similarity index 100%
rename from featherbb/View/profile/change_pass.php
rename to style/themes/FeatherBB/view/profile/change_pass.php
diff --git a/featherbb/View/profile/delete_user.php b/style/themes/FeatherBB/view/profile/delete_user.php
similarity index 100%
rename from featherbb/View/profile/delete_user.php
rename to style/themes/FeatherBB/view/profile/delete_user.php
diff --git a/featherbb/View/profile/menu.php b/style/themes/FeatherBB/view/profile/menu.php
similarity index 100%
rename from featherbb/View/profile/menu.php
rename to style/themes/FeatherBB/view/profile/menu.php
diff --git a/featherbb/View/profile/section_admin.php b/style/themes/FeatherBB/view/profile/section_admin.php
similarity index 100%
rename from featherbb/View/profile/section_admin.php
rename to style/themes/FeatherBB/view/profile/section_admin.php
diff --git a/featherbb/View/profile/section_display.php b/style/themes/FeatherBB/view/profile/section_display.php
similarity index 100%
rename from featherbb/View/profile/section_display.php
rename to style/themes/FeatherBB/view/profile/section_display.php
diff --git a/featherbb/View/profile/section_essentials.php b/style/themes/FeatherBB/view/profile/section_essentials.php
similarity index 100%
rename from featherbb/View/profile/section_essentials.php
rename to style/themes/FeatherBB/view/profile/section_essentials.php
diff --git a/featherbb/View/profile/section_messaging.php b/style/themes/FeatherBB/view/profile/section_messaging.php
similarity index 100%
rename from featherbb/View/profile/section_messaging.php
rename to style/themes/FeatherBB/view/profile/section_messaging.php
diff --git a/featherbb/View/profile/section_personal.php b/style/themes/FeatherBB/view/profile/section_personal.php
similarity index 100%
rename from featherbb/View/profile/section_personal.php
rename to style/themes/FeatherBB/view/profile/section_personal.php
diff --git a/featherbb/View/profile/section_personality.php b/style/themes/FeatherBB/view/profile/section_personality.php
similarity index 100%
rename from featherbb/View/profile/section_personality.php
rename to style/themes/FeatherBB/view/profile/section_personality.php
diff --git a/featherbb/View/profile/section_privacy.php b/style/themes/FeatherBB/view/profile/section_privacy.php
similarity index 100%
rename from featherbb/View/profile/section_privacy.php
rename to style/themes/FeatherBB/view/profile/section_privacy.php
diff --git a/featherbb/View/profile/upload_avatar.php b/style/themes/FeatherBB/view/profile/upload_avatar.php
similarity index 100%
rename from featherbb/View/profile/upload_avatar.php
rename to style/themes/FeatherBB/view/profile/upload_avatar.php
diff --git a/featherbb/View/profile/view_profile.php b/style/themes/FeatherBB/view/profile/view_profile.php
similarity index 100%
rename from featherbb/View/profile/view_profile.php
rename to style/themes/FeatherBB/view/profile/view_profile.php
diff --git a/featherbb/View/register/email.php b/style/themes/FeatherBB/view/register/email.php
similarity index 100%
rename from featherbb/View/register/email.php
rename to style/themes/FeatherBB/view/register/email.php
diff --git a/featherbb/View/register/form.php b/style/themes/FeatherBB/view/register/form.php
similarity index 100%
rename from featherbb/View/register/form.php
rename to style/themes/FeatherBB/view/register/form.php
diff --git a/featherbb/View/register/rules.php b/style/themes/FeatherBB/view/register/rules.php
similarity index 100%
rename from featherbb/View/register/rules.php
rename to style/themes/FeatherBB/view/register/rules.php
diff --git a/featherbb/View/search/footer.php b/style/themes/FeatherBB/view/search/footer.php
similarity index 100%
rename from featherbb/View/search/footer.php
rename to style/themes/FeatherBB/view/search/footer.php
diff --git a/featherbb/View/search/form.php b/style/themes/FeatherBB/view/search/form.php
similarity index 100%
rename from featherbb/View/search/form.php
rename to style/themes/FeatherBB/view/search/form.php
diff --git a/featherbb/View/search/header.php b/style/themes/FeatherBB/view/search/header.php
similarity index 100%
rename from featherbb/View/search/header.php
rename to style/themes/FeatherBB/view/search/header.php
diff --git a/featherbb/View/search/posts.php b/style/themes/FeatherBB/view/search/posts.php
similarity index 100%
rename from featherbb/View/search/posts.php
rename to style/themes/FeatherBB/view/search/posts.php
diff --git a/featherbb/View/search/topics.php b/style/themes/FeatherBB/view/search/topics.php
similarity index 100%
rename from featherbb/View/search/topics.php
rename to style/themes/FeatherBB/view/search/topics.php
diff --git a/featherbb/View/topic.php b/style/themes/FeatherBB/view/topic.php
similarity index 100%
rename from featherbb/View/topic.php
rename to style/themes/FeatherBB/view/topic.php
diff --git a/featherbb/View/userlist.php b/style/themes/FeatherBB/view/userlist.php
similarity index 100%
rename from featherbb/View/userlist.php
rename to style/themes/FeatherBB/view/userlist.php
diff --git a/view/admin/bans/add_ban.php b/view/admin/bans/add_ban.php
new file mode 100644
index 00000000..cb34e1b8
--- /dev/null
+++ b/view/admin/bans/add_ban.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+	exit;
+}
+?>
+
+<div class="blockform">
+	<h2><span><?php _e('Ban advanced head') ?></span></h2>
+	<div class="box">
+		<form id="bans2" method="post" action="">
+			<div class="inform">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<input type="hidden" name="mode" value="<?php echo $ban['mode'] ?>" />
+				<?php if ($ban['mode'] == 'edit'): ?>				<input type="hidden" name="ban_id" value="<?php echo $ban['id'] ?>" />
+				<?php endif; ?>
+				<?php if ($ban['mode'] == 'add' && isset($ban['user_id'])): ?><input type="hidden" name="ban_user_id" value="<?php echo $ban['user_id'] ?>" />
+				<?php endif; ?><fieldset>
+					<legend><?php _e('Ban advanced subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Username label') ?></th>
+								<td>
+									<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
+										echo Utils::escape($ban['ban_user']);
+									} ?>" tabindex="1" />
+									<span><?php _e('Username help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('IP label') ?></th>
+								<td>
+									<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
+										echo Utils::escape($ban['ip']);
+									} ?>" tabindex="2" />
+										<span><?php _e('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
+												printf(' '.__('IP help link'), '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.__('here').'</a>');
+											} ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('E-mail label') ?></th>
+								<td>
+									<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
+										echo Utils::escape($ban['email']);
+									} ?>" tabindex="3" />
+									<span><?php _e('E-mail help') ?></span>
+								</td>
+							</tr>
+						</table>
+						<p class="topspace"><strong class="warntext"><?php _e('Ban IP range info') ?></strong></p>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Message expiry subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Ban message label') ?></th>
+								<td>
+									<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
+										echo Utils::escape($ban['message']);
+									} ?>" tabindex="4" />
+									<span><?php _e('Ban message help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Expire date label') ?></th>
+								<td>
+									<input type="text" name="ban_expire" size="17" maxlength="10" value="<?php if (isset($ban['expire'])) {
+										echo $ban['expire'];
+									} ?>" tabindex="5" />
+									<span><?php _e('Expire date help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php _e('Save') ?>" tabindex="6" /></p>
+		</form>
+	</div>
+</div>
+<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/bans/admin_bans.php b/view/admin/bans/admin_bans.php
new file mode 100644
index 00000000..085d8dab
--- /dev/null
+++ b/view/admin/bans/admin_bans.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('New ban head') ?></span></h2>
+		<div class="box">
+			<form id="bans" method="post" action="<?php echo $feather->url->get('admin/bans/add/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Add ban subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Username label') ?><div><input type="submit" name="add_ban" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
+									<td>
+										<input type="text" name="new_ban_user" size="25" maxlength="25" tabindex="1" />
+										<span><?php _e('Username advanced help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+
+		<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
+		<div class="box">
+			<form id="find_bans" method="get" action="<?php echo $feather->url->get('admin/bans/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Ban search subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Ban search info') ?></p>
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Username label') ?></th>
+									<td><input type="text" name="username" size="30" maxlength="25" tabindex="4" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('IP label') ?></th>
+									<td><input type="text" name="ip" size="30" maxlength="255" tabindex="5" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('E-mail label') ?></th>
+									<td><input type="text" name="email" size="30" maxlength="80" tabindex="6" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Message label') ?></th>
+									<td><input type="text" name="message" size="30" maxlength="255" tabindex="7" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Expire after label') ?></th>
+									<td><input type="text" name="expire_after" size="10" maxlength="10" tabindex="8" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Expire before label') ?></th>
+									<td><input type="text" name="expire_before" size="10" maxlength="10" tabindex="9" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Order by label') ?></th>
+									<td>
+										<select name="order_by" tabindex="10">
+											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
+											<option value="ip"><?php _e('Order by ip') ?></option>
+											<option value="email"><?php _e('Order by e-mail') ?></option>
+											<option value="expire"><?php _e('Order by expire') ?></option>
+										</select>
+                                        &#160;&#160;&#160;
+                                        <select name="direction" tabindex="11">
+											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
+											<option value="DESC"><?php _e('Descending') ?></option>
+										</select>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="12" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/bans/search_ban.php b/view/admin/bans/search_ban.php
new file mode 100644
index 00000000..93fd7bdd
--- /dev/null
+++ b/view/admin/bans/search_ban.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+
+<div id="bans1" class="blocktable">
+	<h2><span><?php _e('Results head') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results IP address head') ?></th>
+					<th class="tc4" scope="col"><?php _e('Results expire head') ?></th>
+					<th class="tc5" scope="col"><?php _e('Results message head') ?></th>
+					<th class="tc6" scope="col"><?php _e('Results banned by head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+
+        foreach ($ban_data as $cur_ban) {
+            ?>
+				<tr>
+					<td class="tcl"><?php echo($cur_ban['username'] != '') ? Utils::escape($cur_ban['username']) : '&#160;' ?></td>
+					<td class="tc2"><?php echo($cur_ban['email'] != '') ? Utils::escape($cur_ban['email']) : '&#160;' ?></td>
+					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? Utils::escape($cur_ban['ip']) : '&#160;' ?></td>
+					<td class="tc4"><?php echo $feather->utils->format_time($cur_ban['expire'], true) ?></td>
+					<td class="tc5"><?php echo($cur_ban['message'] != '') ? Utils::escape($cur_ban['message']) : '&#160;' ?></td>
+					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.Utils::escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
+				</tr>
+<?php
+
+        }
+        if (empty($ban_data)) {
+            echo "\t\t\t\t".'<tr><td class="tcl" colspan="7">'.__('No match').'</td></tr>'."\n";
+        }
+
+?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+        <ul class="crumbs">
+            <li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+            <li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+            <li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+        </ul>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/admin/categories.php b/view/admin/categories.php
new file mode 100644
index 00000000..c4299564
--- /dev/null
+++ b/view/admin/categories.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+	<div class="blockform">
+		<h2><span><?php _e('Add categories head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/categories/add/') ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Add categories subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Add category label') ?><div><input type="submit" value="<?php _e('Add new submit') ?>" tabindex="2" /></div></th>
+									<td>
+										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
+										<span><?php printf(__('Add category help'), '<a href="'.$feather->url->get('admin/forums').'">'.__('Forums').'</a>') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+
+<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/categories/delete') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Delete categories subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Delete category label') ?><div><input type="submit" value="<?php _e('Delete') ?>" tabindex="4" /></div></th>
+									<td>
+										<select name="cat_to_delete" tabindex="3">
+<?php
+
+    foreach ($cat_list as $cur_cat) {
+        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.Utils::escape($cur_cat['cat_name']).'</option>'."\n";
+    }
+
+?>
+										</select>
+										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php _e('Delete category disclaimer') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+<?php endif; ?>
+
+<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/categories/edit/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Edit categories subhead') ?></legend>
+						<div class="infldset">
+							<table id="categoryedit">
+							<thead>
+								<tr>
+									<th class="tcl" scope="col"><?php _e('Category name label') ?></th>
+									<th scope="col"><?php _e('Category position label') ?></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+
+    foreach ($cat_list as $cur_cat) {
+        ?>
+								<tr>
+									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo Utils::escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
+									<td><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][order]" value="<?php echo $cur_cat['disp_position'] ?>" size="3" maxlength="3" /></td>
+								</tr>
+<?php
+
+    }
+
+?>
+							</tbody>
+							</table>
+							<div class="fsetsubmit"><input type="submit" value="<?php _e('Update') ?>" /></div>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+<?php endif; ?>	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/censoring.php b/view/admin/censoring.php
new file mode 100644
index 00000000..190638fe
--- /dev/null
+++ b/view/admin/censoring.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Censoring head') ?></span></h2>
+		<div class="box">
+			<form id="censoring" method="post" action="<?php echo $feather->url->get('admin/censoring/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Add word subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
+							<table>
+							<thead>
+								<tr>
+									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
+									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
+									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
+								</tr>
+							</thead>
+							<tbody>
+								<tr>
+									<td class="tcl"><input type="text" name="new_search_for" size="24" maxlength="60" tabindex="1" /></td>
+									<td class="tc2"><input type="text" name="new_replace_with" size="24" maxlength="60" tabindex="2" /></td>
+									<td><input type="submit" name="add_word" value="<?php _e('Add') ?>" tabindex="3" /></td>
+								</tr>
+							</tbody>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Edit remove subhead') ?></legend>
+						<div class="infldset">
+<?php
+if (!empty($word_data)) {
+    ?>
+							<table>
+							<thead>
+								<tr>
+									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
+									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
+									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+
+    foreach ($word_data as $word) {
+        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.Utils::escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.Utils::escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
+    }
+
+    ?>
+							</tbody>
+							</table>
+<?php
+
+} else {
+    echo "\t\t\t\t\t\t\t".'<p>'.__('No words in list').'</p>'."\n";
+}
+
+?>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/forums/admin_forums.php b/view/admin/forums/admin_forums.php
new file mode 100644
index 00000000..1d70ba75
--- /dev/null
+++ b/view/admin/forums/admin_forums.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Add forum head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/forums/add') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<?php
+if (!empty($cat_list)) {
+    ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Create new subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Add forum label') ?><div><input type="submit" value="<?php _e('Add forum') ?>" tabindex="2" /></div></th>
+									<td>
+										<select name="cat" tabindex="1">
+											<?php  foreach ($cat_list as $cat) {
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.Utils::escape($cat['cat_name']).'</option>'."\n";
+											} ?>
+										</select>
+										<span><?php _e('Add forum help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+} else {
+    ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('None') ?></legend>
+						<div class="infldset">
+							<p><?php _e('No categories exist') ?></p>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+}
+
+?>
+			</form>
+		</div>
+<?php
+if (!empty($forum_data)) {
+    ?>
+		<h2 class="block2"><span><?php _e('Manage forums head') ?></span></h2>
+		<div class="box">
+			<form id="edforum" method="post" action="<?php echo $feather->url->get('admin/forums/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
+<?php
+    foreach ($forum_data as $cat_id => $cat_data) {
+            ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Category subhead') ?> <?php echo Utils::escape($cat_data['cat_name']) ?></legend>
+						<div class="infldset">
+							<table>
+							<thead>
+								<tr>
+									<th class="tcl"><?php _e('Action') ?></th>
+									<th class="tc2"><?php _e('Position label') ?></th>
+									<th class="tcr"><?php _e('Forum label') ?></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+	foreach ($cat_data['cat_forums'] as $forum) {
+        ?>
+								<tr>
+									<td class="tcl"><a href="<?php echo $feather->url->get('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
+									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
+									<td class="tcr"><strong><?php echo Utils::escape($forum['forum_name']) ?></strong></td>
+								</tr>
+<?php
+    }
+    ?>
+							</tbody>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
+	}
+?>
+				<p class="submitend"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
+<?php
+	}
+?>
diff --git a/view/admin/forums/delete_forum.php b/view/admin/forums/delete_forum.php
new file mode 100644
index 00000000..c839019a
--- /dev/null
+++ b/view/admin/forums/delete_forum.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Confirm delete head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Confirm delete subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Confirm delete info'), $cur_forum['forum_name']) ?></p>
+							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="del_forum_comply" value="<?php _e('Delete') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/forums/permissions.php b/view/admin/forums/permissions.php
new file mode 100644
index 00000000..d461ea30
--- /dev/null
+++ b/view/admin/forums/permissions.php
@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Edit forum head') ?></span></h2>
+		<div class="box">
+			<form id="edit_forum" method="post" action="<?php echo $feather->url->get('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Edit details subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Forum name label') ?></th>
+									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo Utils::escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Forum description label') ?></th>
+									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo Utils::escape($cur_forum['forum_desc']) ?></textarea></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Category label') ?></th>
+									<td>
+										<select name="cat_id" tabindex="3">
+											<?php  foreach ($forum_data as $cat_id => $cat_data) {
+												$selected = ($cat_id == $cur_forum['cat_id']) ? 'selected="selected"' : '';
+												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.Utils::escape($cat_data['cat_name']).'</option>'."\n";
+											} ?>
+										</select>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Sort by label') ?></th>
+									<td>
+										<select name="sort_by" tabindex="4">
+											<option value="0"<?php if ($cur_forum['sort_by'] == '0') {
+    echo ' selected="selected"';
+} ?>><?php _e('Last post') ?></option>
+											<option value="1"<?php if ($cur_forum['sort_by'] == '1') {
+    echo ' selected="selected"';
+} ?>><?php _e('Topic start') ?></option>
+											<option value="2"<?php if ($cur_forum['sort_by'] == '2') {
+    echo ' selected="selected"';
+} ?>><?php _e('Subject') ?></option>
+										</select>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Redirect label') ?></th>
+									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.Utils::escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Group permissions subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Group permissions info'), '<a href="admin_groups.php">'.__('User groups').'</a>') ?></p>
+							<table id="forumperms">
+							<thead>
+								<tr>
+									<th class="atcl">&#160;</th>
+									<th><?php _e('Read forum label') ?></th>
+									<th><?php _e('Post replies label') ?></th>
+									<th><?php _e('Post topics label') ?></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+    foreach ($perm_data as $perm) {
+        ?>
+								<tr>
+									<th class="atcl"><?php echo Utils::escape($perm['g_title']) ?></th>
+									<td<?php if (!$perm['read_forum_def']) {
+    echo ' class="nodefault"';
+}
+        ?>>
+										<input type="hidden" name="read_forum_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['read_forum']) ? '1' : '0';
+        ?>" />
+										<input type="checkbox" name="read_forum_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['read_forum']) ? ' checked="checked"' : '';
+        ?><?php echo($perm['g_read_board'] == '0') ? ' disabled="disabled"' : '';
+        ?> tabindex="<?php echo $cur_index++ ?>" />
+									</td>
+									<td<?php if (!$perm['post_replies_def'] && $cur_forum['redirect_url'] == '') {
+    echo ' class="nodefault"';
+}
+        ?>>
+										<input type="hidden" name="post_replies_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['post_replies']) ? '1' : '0';
+        ?>" />
+										<input type="checkbox" name="post_replies_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['post_replies']) ? ' checked="checked"' : '';
+        ?><?php echo($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : '';
+        ?> tabindex="<?php echo $cur_index++ ?>" />
+									</td>
+									<td<?php if (!$perm['post_topics_def'] && $cur_forum['redirect_url'] == '') {
+    echo ' class="nodefault"';
+}
+        ?>>
+										<input type="hidden" name="post_topics_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['post_topics']) ? '1' : '0';
+        ?>" />
+										<input type="checkbox" name="post_topics_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['post_topics']) ? ' checked="checked"' : '';
+        ?><?php echo($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : '';
+        ?> tabindex="<?php echo $cur_index++ ?>" />
+									</td>
+								</tr>
+<?php
+
+    }
+
+?>
+							</tbody>
+							</table>
+							<div class="fsetsubmit"><input type="submit" name="revert_perms" value="<?php _e('Revert to default') ?>" tabindex="<?php echo $cur_index++ ?>" /></div>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/groups/add_edit_group.php b/view/admin/groups/add_edit_group.php
new file mode 100644
index 00000000..de91d1eb
--- /dev/null
+++ b/view/admin/groups/add_edit_group.php
@@ -0,0 +1,311 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Group settings head') ?></span></h2>
+		<div class="box">
+			<form id="groups2" method="post" action="" onsubmit="return process_form(this)">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" /></p>
+				<div class="inform">
+					<input type="hidden" name="mode" value="<?php echo $group['mode'] ?>" />
+<?php if ($group['mode'] == 'edit'): ?>					<input type="hidden" name="group_id" value="<?php echo $id ?>" />
+<?php endif; ?><?php if ($group['mode'] == 'add'): ?>					<input type="hidden" name="base_group" value="<?php echo $group['base_group'] ?>" />
+<?php endif; ?>					<fieldset>
+						<legend><?php _e('Group settings subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Group settings info') ?></p>
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Group title label') ?></th>
+									<td>
+										<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
+    echo Utils::escape($group['info']['g_title']);
+} ?>" tabindex="1" />
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('User title label') ?></th>
+									<td>
+										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo Utils::escape($group['info']['g_user_title']) ?>" tabindex="2" />
+										<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('Promote users label') ?></th>
+									<td>
+										<select name="promote_next_group" tabindex="3">
+											<option value="0"><?php _e('Disable promotion') ?></option>
+											<?php echo $group_list ?>
+										</select>
+										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo Utils::escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
+										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
+									</td>
+								</tr>
+<?php if ($group['mode'] != 'edit' || $feather->forum_settings['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
+									<th scope="row"> <?php _e('Mod privileges label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="5" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="moderator" value="0"<?php if ($group['info']['g_moderator'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="6" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Mod privileges help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Edit profile label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_edit_users" value="1"<?php if ($group['info']['g_mod_edit_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="7" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_edit_users" value="0"<?php if ($group['info']['g_mod_edit_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="8" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Edit profile help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Rename users label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_rename_users" value="1"<?php if ($group['info']['g_mod_rename_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="9" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_rename_users" value="0"<?php if ($group['info']['g_mod_rename_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="10" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Rename users help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Change passwords label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_change_passwords" value="1"<?php if ($group['info']['g_mod_change_passwords'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="11" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_change_passwords" value="0"<?php if ($group['info']['g_mod_change_passwords'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="12" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Change passwords help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Mod promote users label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_promote_users" value="1"<?php if ($group['info']['g_mod_promote_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="13" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_promote_users" value="0"<?php if ($group['info']['g_mod_promote_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="14" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Mod promote users help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Ban users label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="mod_ban_users" value="1"<?php if ($group['info']['g_mod_ban_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="15" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="mod_ban_users" value="0"<?php if ($group['info']['g_mod_ban_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="16" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Ban users help') ?></span>
+									</td>
+								</tr>
+<?php endif; endif; ?>								<tr>
+									<th scope="row"><?php _e('Read board label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="read_board" value="1"<?php if ($group['info']['g_read_board'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="17" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="read_board" value="0"<?php if ($group['info']['g_read_board'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="18" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Read board help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('View user info label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="view_users" value="1"<?php if ($group['info']['g_view_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="19" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="view_users" value="0"<?php if ($group['info']['g_view_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="20" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('View user info help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Post replies label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="post_replies" value="1"<?php if ($group['info']['g_post_replies'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="21" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="post_replies" value="0"<?php if ($group['info']['g_post_replies'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="22" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post replies help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Post topics label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="post_topics" value="1"<?php if ($group['info']['g_post_topics'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="23" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="post_topics" value="0"<?php if ($group['info']['g_post_topics'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="24" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post topics help') ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('Edit posts label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="edit_posts" value="1"<?php if ($group['info']['g_edit_posts'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="25" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="edit_posts" value="0"<?php if ($group['info']['g_edit_posts'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="26" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Edit posts help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Delete posts label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="delete_posts" value="1"<?php if ($group['info']['g_delete_posts'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="27" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="delete_posts" value="0"<?php if ($group['info']['g_delete_posts'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="28" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Delete posts help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Delete topics label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="delete_topics" value="1"<?php if ($group['info']['g_delete_topics'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="29" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="delete_topics" value="0"<?php if ($group['info']['g_delete_topics'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="30" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Delete topics help') ?></span>
+									</td>
+								</tr>
+<?php endif; ?>								<tr>
+									<th scope="row"><?php _e('Post links label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="post_links" value="1"<?php if ($group['info']['g_post_links'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="31" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="post_links" value="0"<?php if ($group['info']['g_post_links'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="32" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Post links help') ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('Set own title label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="set_title" value="1"<?php if ($group['info']['g_set_title'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="33" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="set_title" value="0"<?php if ($group['info']['g_set_title'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="34" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Set own title help') ?></span>
+									</td>
+								</tr>
+<?php endif; ?>								<tr>
+									<th scope="row"><?php _e('User search label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="search" value="1"<?php if ($group['info']['g_search'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="35" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="search" value="0"<?php if ($group['info']['g_search'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="36" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('User search help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('User list search label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="search_users" value="1"<?php if ($group['info']['g_search_users'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="37" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="search_users" value="0"<?php if ($group['info']['g_search_users'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="38" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('User list search help') ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('Send e-mails label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="send_email" value="1"<?php if ($group['info']['g_send_email'] == '1') {
+    echo ' checked="checked"';
+} ?> tabindex="39" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="send_email" value="0"<?php if ($group['info']['g_send_email'] == '0') {
+    echo ' checked="checked"';
+} ?> tabindex="40" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Send e-mails help') ?></span>
+									</td>
+								</tr>
+<?php endif; ?>								<tr>
+									<th scope="row"><?php _e('Post flood label') ?></th>
+									<td>
+										<input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_post_flood'] ?>" tabindex="41" />
+										<span><?php _e('Post flood help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Search flood label') ?></th>
+									<td>
+										<input type="text" name="search_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_search_flood'] ?>" tabindex="42" />
+										<span><?php _e('Search flood help') ?></span>
+									</td>
+								</tr>
+<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+									<th scope="row"><?php _e('E-mail flood label') ?></th>
+									<td>
+										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_email_flood'] ?>" tabindex="43" />
+										<span><?php _e('E-mail flood help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Report flood label') ?></th>
+									<td>
+										<input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_report_flood'] ?>" tabindex="44" />
+										<span><?php _e('Report flood help') ?></span>
+									</td>
+								</tr>
+<?php endif; endif; ?>							</table>
+<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php _e('Moderator info') ?></p>
+<?php endif; ?>						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" tabindex="45" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/groups/admin_groups.php b/view/admin/groups/admin_groups.php
new file mode 100644
index 00000000..74ebedd4
--- /dev/null
+++ b/view/admin/groups/admin_groups.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Add groups head') ?></span></h2>
+		<div class="box">
+				<div class="inform">
+					<fieldset>
+                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/add/') ?>">
+                        <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+						<legend><?php _e('Add group subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('New group label') ?><div><input type="submit" name="add_group" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
+									<td>
+										<select id="base_group" name="base_group" tabindex="1">
+<?php
+
+foreach ($groups as $cur_group) {
+    if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
+        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
+        } else {
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
+        }
+    }
+}
+
+?>
+										</select>
+										<span><?php _e('New group help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+                        </form>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/') ?>">
+                        	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+						<legend><?php _e('Default group subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Default group label') ?><div><input type="submit" name="set_default_group" value="<?php _e('Save') ?>" tabindex="4" /></div></th>
+									<td>
+										<select id="default_group" name="default_group" tabindex="3">
+<?php
+
+foreach ($groups as $cur_group) {
+    if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
+        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
+        } else {
+            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
+        }
+    }
+}
+
+?>
+										</select>
+										<span><?php _e('Default group help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+                        </form>
+					</fieldset>
+				</div>
+		</div>
+
+		<h2 class="block2"><span><?php _e('Existing groups head') ?></span></h2>
+		<div class="box">
+			<div class="fakeform">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Edit groups subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Edit groups info') ?></p>
+							<table>
+<?php
+foreach ($groups as $cur_group) {
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.Utils::escape($cur_group['g_title']).'</td></tr>'."\n";
+}
+
+?>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/groups/confirm_delete.php b/view/admin/groups/confirm_delete.php
new file mode 100644
index 00000000..b43d0b58
--- /dev/null
+++ b/view/admin/groups/confirm_delete.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Group delete head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+				<input type="hidden" name="group_to_delete" value="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>" />
+					<fieldset>
+						<legend><?php _e('Confirm delete subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Confirm delete info'), Utils::escape($group_title)) ?></p>
+							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="del_group_comply" value="<?php _e('Delete') ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/groups/delete_group.php b/view/admin/groups/delete_group.php
new file mode 100644
index 00000000..0205422f
--- /dev/null
+++ b/view/admin/groups/delete_group.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Delete group head') ?></span></h2>
+		<div class="box">
+			<form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Move users subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Move users info'), Utils::escape($group_info['title']), Utils::forum_number_format($group_info['members'])) ?></p>
+							<label><?php _e('Move users label') ?>
+							<select name="move_to_group">
+								<?= $group_list_delete; ?>
+							</select>
+							<br /></label>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="del_group" value="<?php _e('Delete group') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
diff --git a/view/admin/index.php b/view/admin/index.php
new file mode 100644
index 00000000..c836ab4a
--- /dev/null
+++ b/view/admin/index.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="block">
+		<h2><span><?php _e('Forum admin head') ?></span></h2>
+		<div id="adintro" class="box">
+			<div class="inbox">
+				<p><?php _e('Welcome to admin') ?></p>
+				<ul>
+					<li><span><?php _e('Welcome 1') ?></span></li>
+					<li><span><?php _e('Welcome 2') ?></span></li>
+					<li><span><?php _e('Welcome 3') ?></span></li>
+					<li><span><?php _e('Welcome 4') ?></span></li>
+					<li><span><?php _e('Welcome 5') ?></span></li>
+					<li><span><?php _e('Welcome 6') ?></span></li>
+					<li><span><?php _e('Welcome 7') ?></span></li>
+					<li><span><?php _e('Welcome 8') ?></span></li>
+					<li><span><?php _e('Welcome 9') ?></span></li>
+				</ul>
+			</div>
+		</div>
+
+<?php if ($install_file_exists) : ?>
+		<h2 class="block2"><span><?php _e('Alerts head') ?></span></h2>
+		<div id="adalerts" class="box">
+			<p><?php printf(__('Install file exists'), '<a href="'.$feather->url->get('admin/action/remove_install_file/').'">'.__('Delete install file').'</a>') ?></p>
+		</div>
+<?php endif; ?>
+
+		<h2 class="block2"><span><?php _e('About head') ?></span></h2>
+		<div id="adstats" class="box">
+			<div class="inbox">
+				<dl>
+					<dt><?php _e('FeatherBB version label') ?></dt>
+					<dd>
+						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.$feather->url->get('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
+					</dd>
+					<dt><?php _e('Server statistics label') ?></dt>
+					<dd>
+						<a href="<?php echo $feather->url->get('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
+					</dd>
+					<dt><?php _e('Support label') ?></dt>
+					<dd>
+						<a href="http://FeatherBB.org/forums/index.php"><?php _e('Forum label') ?></a> - <a href="http://gitter.im/featherbb/featherbb"><?php _e('IRC label') ?></a>
+					</dd>
+				</dl>
+			</div>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/loader.php b/view/admin/loader.php
new file mode 100644
index 00000000..2a443eb0
--- /dev/null
+++ b/view/admin/loader.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/maintenance/admin_maintenance.php b/view/admin/maintenance/admin_maintenance.php
new file mode 100644
index 00000000..842dfade
--- /dev/null
+++ b/view/admin/maintenance/admin_maintenance.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Maintenance head') ?></span></h2>
+		<div class="box">
+			<form method="get" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
+				<div class="inform">
+					<input type="hidden" name="action" value="rebuild" />
+					<fieldset>
+						<legend><?php _e('Rebuild index subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Rebuild index info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Posts per cycle label') ?></th>
+									<td>
+										<input type="text" name="i_per_page" size="7" maxlength="7" value="300" tabindex="1" />
+										<span><?php _e('Posts per cycle help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Starting post label') ?></th>
+									<td>
+										<input type="text" name="i_start_at" size="7" maxlength="7" value="<?php echo(isset($first_id)) ? $first_id : 0 ?>" tabindex="2" />
+										<span><?php _e('Starting post help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Empty index label') ?></th>
+									<td class="inputadmin">
+										<label><input type="checkbox" name="i_empty_index" value="1" tabindex="3" checked="checked" />&#160;&#160;<?php _e('Empty index help') ?></label>
+									</td>
+								</tr>
+							</table>
+							<p class="topspace"><?php _e('Rebuild completed info') ?></p>
+							<div class="fsetsubmit"><input type="submit" name="rebuild_index" value="<?php _e('Rebuild index') ?>" tabindex="4" /></div>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+
+			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>" onsubmit="return process_form(this)">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<input type="hidden" name="action" value="prune" />
+					<fieldset>
+						<legend><?php _e('Prune subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Days old label') ?></th>
+									<td>
+										<input type="text" name="req_prune_days" size="3" maxlength="3" tabindex="5" />
+										<span><?php _e('Days old help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Prune sticky label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="prune_sticky" value="1" tabindex="6" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="prune_sticky" value="0" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Prune sticky help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Prune from label') ?></th>
+									<td>
+										<select name="prune_from" tabindex="7">
+											<option value="all"><?php _e('All forums') ?></option>
+												<?php echo $categories; ?>
+											</optgroup>
+										</select>
+										<span><?php _e('Prune from help') ?></span>
+									</td>
+								</tr>
+							</table>
+							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
+							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php _e('Prune') ?>" tabindex="8" /></div>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/maintenance/prune.php b/view/admin/maintenance/prune.php
new file mode 100644
index 00000000..7b4334ba
--- /dev/null
+++ b/view/admin/maintenance/prune.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Prune head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+					<input type="hidden" name="action" value="prune" />
+					<input type="hidden" name="prune_days" value="<?php echo $prune['days'] ?>" />
+					<input type="hidden" name="prune_sticky" value="<?php echo $prune_sticky ?>" />
+					<input type="hidden" name="prune_from" value="<?php echo $prune_from ?>" />
+					<fieldset>
+						<legend><?php _e('Confirm prune subhead') ?></legend>
+						<div class="infldset">
+							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], Utils::forum_number_format($prune['num_topics'])) ?></p>
+							<p class="warntext"><?php _e('Confirm prune warn') ?></p>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="prune_comply" value="<?php _e('Prune') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/maintenance/rebuild.php b/view/admin/maintenance/rebuild.php
new file mode 100644
index 00000000..cc688587
--- /dev/null
+++ b/view/admin/maintenance/rebuild.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+<h1><?php _e('Rebuilding index info') ?></h1>
+<script type="text/javascript">window.location="<?= $feather->url->get('admin/maintenance/').$query_str ?>"</script>
+<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.$feather->url->get('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>
diff --git a/view/admin/menu.php b/view/admin/menu.php
new file mode 100644
index 00000000..dedcb9f7
--- /dev/null
+++ b/view/admin/menu.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="adminconsole" class="block2col">
+	<div id="adminmenu" class="blockmenu">
+		<h2><span><?php _e('Moderator menu') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<ul>
+					<li<?php if ($page == 'index') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Index') ?></a></li>
+					<li<?php if ($page == 'users') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+<?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
+<?php endif;
+    if ($is_admin || $feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
+<?php endif;
+    ?>				</ul>
+			</div>
+		</div>
+<?php
+
+    if ($is_admin) {
+        ?>
+		<h2 class="block2"><span><?php _e('Admin menu') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<ul>
+					<li<?php if ($page == 'options') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/options/') ?>"><?php _e('Options') ?></a></li>
+					<li<?php if ($page == 'permissions') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
+					<li<?php if ($page == 'categories') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
+					<li<?php if ($page == 'forums') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
+					<li<?php if ($page == 'groups') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
+					<li<?php if ($page == 'plugins') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/plugins/') ?>"><?= 'Plugins'; ?></a></li>
+					<li<?php if ($page == 'censoring') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
+					<li<?php if ($page == 'parser') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
+					<li<?php if ($page == 'maintenance') {
+    echo ' class="isactive"';
+}
+        ?>><a href="<?php echo $feather->url->get('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
+				</ul>
+			</div>
+		</div>
+<?php
+
+    }
+
+    // Did we find any plugins?
+    if (!empty($plugins)) {
+        ?>
+		<h2 class="block2"><span><?php _e('Plugins menu') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<ul>
+<?php
+
+        foreach ($plugins as $plugin_name => $plugin) {
+            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.$feather->url->get('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
+        }
+
+        ?>
+				</ul>
+			</div>
+		</div>
+<?php
+
+    }
+
+    ?>
+	</div>
diff --git a/view/admin/options.php b/view/admin/options.php
new file mode 100644
index 00000000..997c73a0
--- /dev/null
+++ b/view/admin/options.php
@@ -0,0 +1,844 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+use FeatherBB\Core\Random;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+	exit;
+}
+?>
+
+<div class="blockform">
+	<h2><span><?php _e('Options head') ?></span></h2>
+	<div class="box">
+		<form method="post" action="<?php echo Url::get('admin/options/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
+			<div class="inform">
+				<input type="hidden" name="form_sent" value="1" />
+				<fieldset>
+					<legend><?php _e('Essentials subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Board title label') ?></th>
+								<td>
+									<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo Utils::escape($feather->forum_settings['o_board_title']) ?>" />
+									<span><?php _e('Board title help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Board desc label') ?></th>
+								<td>
+									<textarea name="form_board_desc" cols="60" rows="3"><?php echo Utils::escape($feather->forum_settings['o_board_desc']) ?></textarea>
+									<span><?php _e('Board desc help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Base URL label') ?></th>
+								<td>
+									<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo Utils::escape($feather->forum_settings['o_base_url']) ?>" />
+									<span><?php _e('Base URL help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Timezone label') ?></th>
+								<td>
+									<select name="form_default_timezone">
+										<option value="-12"<?php if ($feather->forum_settings['o_default_timezone'] == -12) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-12:00') ?></option>
+										<option value="-11"<?php if ($feather->forum_settings['o_default_timezone'] == -11) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-11:00') ?></option>
+										<option value="-10"<?php if ($feather->forum_settings['o_default_timezone'] == -10) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-10:00') ?></option>
+										<option value="-9.5"<?php if ($feather->forum_settings['o_default_timezone'] == -9.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-09:30') ?></option>
+										<option value="-9"<?php if ($feather->forum_settings['o_default_timezone'] == -9) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-09:00') ?></option>
+										<option value="-8.5"<?php if ($feather->forum_settings['o_default_timezone'] == -8.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-08:30') ?></option>
+										<option value="-8"<?php if ($feather->forum_settings['o_default_timezone'] == -8) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-08:00') ?></option>
+										<option value="-7"<?php if ($feather->forum_settings['o_default_timezone'] == -7) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-07:00') ?></option>
+										<option value="-6"<?php if ($feather->forum_settings['o_default_timezone'] == -6) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-06:00') ?></option>
+										<option value="-5"<?php if ($feather->forum_settings['o_default_timezone'] == -5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-05:00') ?></option>
+										<option value="-4"<?php if ($feather->forum_settings['o_default_timezone'] == -4) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-04:00') ?></option>
+										<option value="-3.5"<?php if ($feather->forum_settings['o_default_timezone'] == -3.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-03:30') ?></option>
+										<option value="-3"<?php if ($feather->forum_settings['o_default_timezone'] == -3) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-03:00') ?></option>
+										<option value="-2"<?php if ($feather->forum_settings['o_default_timezone'] == -2) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-02:00') ?></option>
+										<option value="-1"<?php if ($feather->forum_settings['o_default_timezone'] == -1) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC-01:00') ?></option>
+										<option value="0"<?php if ($feather->forum_settings['o_default_timezone'] == 0) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC') ?></option>
+										<option value="1"<?php if ($feather->forum_settings['o_default_timezone'] == 1) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+01:00') ?></option>
+										<option value="2"<?php if ($feather->forum_settings['o_default_timezone'] == 2) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+02:00') ?></option>
+										<option value="3"<?php if ($feather->forum_settings['o_default_timezone'] == 3) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+03:00') ?></option>
+										<option value="3.5"<?php if ($feather->forum_settings['o_default_timezone'] == 3.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+03:30') ?></option>
+										<option value="4"<?php if ($feather->forum_settings['o_default_timezone'] == 4) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+04:00') ?></option>
+										<option value="4.5"<?php if ($feather->forum_settings['o_default_timezone'] == 4.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+04:30') ?></option>
+										<option value="5"<?php if ($feather->forum_settings['o_default_timezone'] == 5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+05:00') ?></option>
+										<option value="5.5"<?php if ($feather->forum_settings['o_default_timezone'] == 5.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+05:30') ?></option>
+										<option value="5.75"<?php if ($feather->forum_settings['o_default_timezone'] == 5.75) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+05:45') ?></option>
+										<option value="6"<?php if ($feather->forum_settings['o_default_timezone'] == 6) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+06:00') ?></option>
+										<option value="6.5"<?php if ($feather->forum_settings['o_default_timezone'] == 6.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+06:30') ?></option>
+										<option value="7"<?php if ($feather->forum_settings['o_default_timezone'] == 7) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+07:00') ?></option>
+										<option value="8"<?php if ($feather->forum_settings['o_default_timezone'] == 8) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+08:00') ?></option>
+										<option value="8.75"<?php if ($feather->forum_settings['o_default_timezone'] == 8.75) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+08:45') ?></option>
+										<option value="9"<?php if ($feather->forum_settings['o_default_timezone'] == 9) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+09:00') ?></option>
+										<option value="9.5"<?php if ($feather->forum_settings['o_default_timezone'] == 9.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+09:30') ?></option>
+										<option value="10"<?php if ($feather->forum_settings['o_default_timezone'] == 10) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+10:00') ?></option>
+										<option value="10.5"<?php if ($feather->forum_settings['o_default_timezone'] == 10.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+10:30') ?></option>
+										<option value="11"<?php if ($feather->forum_settings['o_default_timezone'] == 11) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+11:00') ?></option>
+										<option value="11.5"<?php if ($feather->forum_settings['o_default_timezone'] == 11.5) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+11:30') ?></option>
+										<option value="12"<?php if ($feather->forum_settings['o_default_timezone'] == 12) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+12:00') ?></option>
+										<option value="12.75"<?php if ($feather->forum_settings['o_default_timezone'] == 12.75) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+12:45') ?></option>
+										<option value="13"<?php if ($feather->forum_settings['o_default_timezone'] == 13) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+13:00') ?></option>
+										<option value="14"<?php if ($feather->forum_settings['o_default_timezone'] == 14) {
+											echo ' selected="selected"';
+										} ?>><?php _e('UTC+14:00') ?></option>
+									</select>
+									<span><?php _e('Timezone help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('DST label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather->forum_settings['o_default_dst'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather->forum_settings['o_default_dst'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('DST help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Language label') ?></th>
+								<td>
+									<select name="form_default_lang">
+										<?php echo $languages; ?>
+									</select>
+									<span><?php _e('Language help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Default style label') ?></th>
+								<td>
+									<select name="form_default_style">
+										<?php echo $styles; ?>
+									</select>
+									<span><?php _e('Default style help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<?php
+
+			$diff = ($feather->user->timezone + $feather->user->dst) * 3600;
+			$timestamp = time() + $diff;
+
+			?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Timeouts subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Time format label') ?></th>
+								<td>
+									<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo Utils::escape($feather->forum_settings['o_time_format']) ?>" />
+									<span><?php printf(__('Time format help'), gmdate($feather->forum_settings['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Date format label') ?></th>
+								<td>
+									<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo Utils::escape($feather->forum_settings['o_date_format']) ?>" />
+									<span><?php printf(__('Date format help'), gmdate($feather->forum_settings['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Visit timeout label') ?></th>
+								<td>
+									<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_visit'] ?>" />
+									<span><?php _e('Visit timeout help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Online timeout label') ?></th>
+								<td>
+									<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_online'] ?>" />
+									<span><?php _e('Online timeout help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Redirect time label') ?></th>
+								<td>
+									<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_redirect_delay'] ?>" />
+									<span><?php _e('Redirect time help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Display subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Version number label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather->forum_settings['o_show_version'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather->forum_settings['o_show_version'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Version number help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Info in posts label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather->forum_settings['o_show_user_info'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather->forum_settings['o_show_user_info'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Info in posts help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Post count label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather->forum_settings['o_show_post_count'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather->forum_settings['o_show_post_count'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Post count help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Smilies label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather->forum_settings['o_smilies'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather->forum_settings['o_smilies'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Smilies help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Smilies sigs label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather->forum_settings['o_smilies_sig'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather->forum_settings['o_smilies_sig'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Smilies sigs help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Clickable links label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather->forum_settings['o_make_links'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather->forum_settings['o_make_links'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Clickable links help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Topic review label') ?></th>
+								<td>
+									<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_topic_review'] ?>" />
+									<span><?php _e('Topic review help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Topics per page label') ?></th>
+								<td>
+									<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_topics_default'] ?>" />
+									<span><?php _e('Topics per page help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Posts per page label') ?></th>
+								<td>
+									<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_posts_default'] ?>" />
+									<span><?php _e('Posts per page help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Indent label') ?></th>
+								<td>
+									<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_indent_num_spaces'] ?>" />
+									<span><?php _e('Indent help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Quote depth label') ?></th>
+								<td>
+									<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_quote_depth'] ?>" />
+									<span><?php _e('Quote depth help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Features subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Quick post label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather->forum_settings['o_quickpost'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather->forum_settings['o_quickpost'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Quick post help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Users online label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather->forum_settings['o_users_online'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather->forum_settings['o_users_online'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Users online help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><a name="censoring"></a><?php _e('Censor words label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather->forum_settings['o_censoring'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.Url::get('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><a name="signatures"></a><?php _e('Signatures label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather->forum_settings['o_signatures'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather->forum_settings['o_signatures'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Signatures help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('User has posted label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather->forum_settings['o_show_dot'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather->forum_settings['o_show_dot'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('User has posted help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Topic views label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather->forum_settings['o_topic_views'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather->forum_settings['o_topic_views'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Topic views help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Quick jump label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather->forum_settings['o_quickjump'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather->forum_settings['o_quickjump'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Quick jump help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('GZip label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather->forum_settings['o_gzip'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather->forum_settings['o_gzip'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('GZip help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Search all label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather->forum_settings['o_search_all_forums'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather->forum_settings['o_search_all_forums'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Search all help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Menu items label') ?></th>
+								<td>
+									<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo Utils::escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
+									<span><?php _e('Menu items help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Feed subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Default feed label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather->forum_settings['o_feed_type'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('None') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather->forum_settings['o_feed_type'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('RSS') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather->forum_settings['o_feed_type'] == '2') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Atom') ?></strong></label>
+									<span class="clearb"><?php _e('Default feed help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Feed TTL label') ?></th>
+								<td>
+									<select name="form_feed_ttl">
+										<option value="0"<?php if ($feather->forum_settings['o_feed_ttl'] == '0') {
+											echo ' selected="selected"';
+										} ?>><?php _e('No cache') ?></option>
+										<?php echo $times ?>
+									</select>
+									<span><?php _e('Feed TTL help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Reports subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Reporting method label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather->forum_settings['o_report_method'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Internal') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather->forum_settings['o_report_method'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('By e-mail') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather->forum_settings['o_report_method'] == '2') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Both') ?></strong></label>
+									<span class="clearb"><?php _e('Reporting method help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Mailing list label') ?></th>
+								<td>
+									<textarea name="form_mailing_list" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_mailing_list']) ?></textarea>
+									<span><?php _e('Mailing list help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Avatars subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Use avatars label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather->forum_settings['o_avatars'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather->forum_settings['o_avatars'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Use avatars help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Upload directory label') ?></th>
+								<td>
+									<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo Utils::escape($feather->forum_settings['o_avatars_dir']) ?>" />
+									<span><?php _e('Upload directory help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Max width label') ?></th>
+								<td>
+									<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_width'] ?>" />
+									<span><?php _e('Max width help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Max height label') ?></th>
+								<td>
+									<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_height'] ?>" />
+									<span><?php _e('Max height help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Max size label') ?></th>
+								<td>
+									<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
+									<span><?php _e('Max size help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('E-mail subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Admin e-mail label') ?></th>
+								<td>
+									<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo Utils::escape($feather->forum_settings['o_admin_email']) ?>" />
+									<span><?php _e('Admin e-mail help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
+								<td>
+									<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo Utils::escape($feather->forum_settings['o_webmaster_email']) ?>" />
+									<span><?php _e('Webmaster e-mail help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Forum subscriptions label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Forum subscriptions help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Topic subscriptions label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Topic subscriptions help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('SMTP address label') ?></th>
+								<td>
+									<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo Utils::escape($feather->forum_settings['o_smtp_host']) ?>" />
+									<span><?php _e('SMTP address help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('SMTP username label') ?></th>
+								<td>
+									<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo Utils::escape($feather->forum_settings['o_smtp_user']) ?>" />
+									<span><?php _e('SMTP username help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('SMTP password label') ?></th>
+								<td>
+									<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
+									<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? Random::key(Utils::strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
+									<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
+									<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
+									<span><?php _e('SMTP password help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('SMTP SSL label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather->forum_settings['o_smtp_ssl'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather->forum_settings['o_smtp_ssl'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('SMTP SSL help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Registration subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Allow new label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather->forum_settings['o_regs_allow'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather->forum_settings['o_regs_allow'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Allow new help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Verify label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather->forum_settings['o_regs_verify'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather->forum_settings['o_regs_verify'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Verify help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Report new label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather->forum_settings['o_regs_report'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather->forum_settings['o_regs_report'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Report new help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Use rules label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather->forum_settings['o_rules'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather->forum_settings['o_rules'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Use rules help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Rules label') ?></th>
+								<td>
+									<textarea name="form_rules_message" rows="10" cols="55"><?php echo Utils::escape($feather->forum_settings['o_rules_message']) ?></textarea>
+									<span><?php _e('Rules help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('E-mail default label') ?></th>
+								<td>
+									<span><?php _e('E-mail default help') ?></span>
+									<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather->forum_settings['o_default_email_setting'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<?php _e('Display e-mail label') ?></label>
+									<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather->forum_settings['o_default_email_setting'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<?php _e('Hide allow form label') ?></label>
+									<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather->forum_settings['o_default_email_setting'] == '2') {
+											echo ' checked="checked"';
+										} ?> />&#160;<?php _e('Hide both label') ?></label>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Announcement subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><?php _e('Display announcement label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather->forum_settings['o_announcement'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather->forum_settings['o_announcement'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Display announcement help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Announcement message label') ?></th>
+								<td>
+									<textarea name="form_announcement_message" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_announcement_message']) ?></textarea>
+									<span><?php _e('Announcement message help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Maintenance subhead') ?></legend>
+					<div class="infldset">
+						<table class="aligntop">
+							<tr>
+								<th scope="row"><a name="maintenance"></a><?php _e('Maintenance mode label') ?></th>
+								<td>
+									<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather->forum_settings['o_maintenance'] == '1') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+									<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather->forum_settings['o_maintenance'] == '0') {
+											echo ' checked="checked"';
+										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+									<span class="clearb"><?php _e('Maintenance mode help') ?></span>
+								</td>
+							</tr>
+							<tr>
+								<th scope="row"><?php _e('Maintenance message label') ?></th>
+								<td>
+									<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
+									<span><?php _e('Maintenance message help') ?></span>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</fieldset>
+			</div>
+			<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
+		</form>
+	</div>
+</div>
+<div class="clearer"></div>
+</div>
diff --git a/view/admin/parser.php b/view/admin/parser.php
new file mode 100644
index 00000000..bfcf5133
--- /dev/null
+++ b/view/admin/parser.php
@@ -0,0 +1,299 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php echo $lang_admin_parser['Parser head'] ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/parser/') ?>" enctype="multipart/form-data">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop">
+					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
+					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
+				</p>
+				<div class="inform">
+					<input type="hidden" name="form_sent" value="1" />
+					<fieldset>
+						<legend><?php echo $lang_admin_parser['Config subhead'] ?></legend>
+						<div class="infldset">
+							<table class="aligntop" cellspacing="0">
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['textile'] ?></th>
+									<td colspan="2">
+										<input type="radio" name="config[textile]" value="1"<?php if ($config['textile']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[textile]" value="0"<?php if (!$config['textile']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['textile help'] ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['quote_links'] ?></th>
+									<td colspan="2">
+										<input type="radio" name="config[quote_links]" value="1"<?php if ($config['quote_links']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_links]" value="0"<?php if (!$config['quote_links']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['quote_links help'] ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['quote_imgs'] ?></th>
+									<td colspan="2">
+										<input type="radio" name="config[quote_imgs]" value="1"<?php if ($config['quote_imgs']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_imgs]" value="0"<?php if (!$config['quote_imgs']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['quote_imgs help'] ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['click_imgs'] ?></th>
+									<td colspan="2">
+										<input type="radio" name="config[click_imgs]" value="1"<?php if ($config['click_imgs']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[click_imgs]" value="0"<?php if (!$config['click_imgs']) {
+    echo ' checked="checked"';
+} ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['click_imgs help'] ?></span>
+									</td>
+								</tr>
+
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['valid_imgs'] ?></th>
+									<td colspan="2">
+										<input type="radio" name="config[valid_imgs]" value="1"<?php if ($config['valid_imgs']) {
+    echo ' checked="checked"';
+} if (!ini_get('allow_url_fopen')) {
+    echo(' disabled="disabled" title="'. Utils::escape($lang_admin_parser['unavailable']) .'"');
+} ?> /> <strong><?php _e('Yes') ?></strong>
+										<input type="radio" name="config[valid_imgs]" value="0"<?php if (!$config['valid_imgs']) {
+    echo ' checked="checked"';
+} if (!ini_get('allow_url_fopen')) {
+    echo(' disabled="disabled" title="'. Utils::escape($lang_admin_parser['unavailable']) .'"');
+} ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td><?php echo $lang_admin_parser['valid_imgs help'] ?></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['max_size'] ?></th>
+									<td colspan="2">
+										<input type="text" name="config[max_size]" size="10" maxlength="8" value="<?php echo($config['max_size'])?>"<?php if (!ini_get('allow_url_fopen')) {
+    echo(' disabled="disabled" title="'. Utils::escape($lang_admin_parser['unavailable']) .'"');
+} ?> />
+									</td>
+									<td><span><?php echo $lang_admin_parser['max_size help'] ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['def_xy'] ?></th>
+									<td>
+										<input type="text" name="config[def_width]" size="5" maxlength="5" value="<?php echo $config['def_width'] ?>" /> X:Width
+									</td>
+									<td>
+										<input type="text" name="config[def_height]" size="5" maxlength="5" value="<?php echo $config['def_height'] ?>" /> Y:Height
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['def_xy help'] ?></span>
+									</td>
+								</tr>
+
+
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['max_xy'] ?></th>
+									<td>
+										<input type="text" name="config[max_width]" size="5" maxlength="5" value="<?php echo $config['max_width'] ?>" /> X:Width
+									</td>
+									<td>
+										<input type="text" name="config[max_height]" size="5" maxlength="5" value="<?php echo $config['max_height'] ?>" /> Y:Height
+									</td>
+									<td><?php echo $lang_admin_parser['max_xy help'] ?></td>
+								</tr>
+
+								<tr>
+									<th scope="row"><?php echo $lang_admin_parser['smiley_size'] ?></th>
+									<td colspan=2>
+										<input type="text" name="config[smiley_size]" size="5" maxlength="5" value="<?php echo $config['smiley_size'] .'%' ?>" />
+									</td>
+									<td>
+										<span><?php echo $lang_admin_parser['smiley_size help'] ?></span>
+									</td>
+								</tr>
+
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php echo $lang_admin_parser['Smilies subhead'] ?></legend>
+						<div class="infldset">
+							<table cellspacing="0">
+							<thead>
+								<tr>
+									<th scope="col"><?php echo $lang_admin_parser['smiley_text_label'] ?></th>
+									<th scope="col"><?php echo $lang_admin_parser['smiley_file_label'] ?></th>
+									<th scope="col">:)</th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+    foreach ($smilies as $key => $value) {
+        $i++;
+        $oldfile = $value['file'];
+        ?>
+								<tr>
+									<td><input type="text" name="smiley_text[<?php echo($i);
+        ?>]" value="<?php echo(Utils::escape($key));
+        ?>" size="20" maxlength="80" /></td>
+									<td>
+										<select name="smiley_file[<?php echo($i);
+        ?>]">
+<?php
+        foreach ($smiley_files as $file) {
+            if ($file === $oldfile) {
+                echo("\t\t\t\t\t\t\t\t\t\t\t<option selected=\"selected\">" . $file . "</option>\n");
+            } else {
+                echo("\t\t\t\t\t\t\t\t\t\t\t<option>" . $file . "</option>\n");
+            }
+        }
+        ?>
+										</select>
+									</td>
+									<td>
+										<?php echo($value['html']);
+        ?>
+									</td>
+								</tr>
+<?php
+
+    }
+?>
+								<tr>
+									<td><input type="text" name="smiley_text[<?php echo(++$i); ?>]" value="" size="20" maxlength="80" /><br />New smiley text</td>
+									<td>
+										<select name="smiley_file[<?php echo($i); ?>]">
+											<option selected="selected">select new file</option>
+<?php
+        foreach ($smiley_files as $file) {
+            echo("\t\t\t\t\t\t\t\t\t\t\t<option>" . $file . "</option>\n");
+        }
+?>
+										</select><br /><?php echo($lang_admin_parser['New smiley image']); ?>
+									</td>
+									<td></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo($lang_admin_parser['smiley_upload']); ?></th>
+ <?php if (ini_get('file_uploads')) {
+    ?>
+									<td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
+										<input type="file" name="new_smiley" id="upload_smiley" /></td>
+									<td><input type="submit" name="upload" value="<?php echo($lang_admin_parser['upload_button']);
+    ?>" /></td>
+<?php 
+} else {
+    ?>
+									<td colspan="2"><?php echo($lang_admin_parser['upload_off']);
+    ?></td>
+<?php 
+} ?>
+								</tr>
+							</tbody>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+
+
+
+				<div class="inform">
+					<fieldset>
+						<legend><?php echo $lang_admin_parser['BBCodes subhead'] ?></legend>
+						<div class="infldset">
+							<table cellspacing="0">
+							<thead>
+								<tr>
+									<th class="tcl" scope="col"><?php echo $lang_admin_parser['tagname_label'] ?></th>
+									<th class="tc3" scope="col"><?php echo $lang_admin_parser['in_post_label'] ?></th>
+									<th class="hidehead" scope="col"><?php echo $lang_admin_parser['in_sig_label'] ?></th>
+									<th class="tc2" scope="col"><?php echo $lang_admin_parser['depth_max'] ?></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+foreach ($bbcd as $tagname => $tagdata) {
+    if ($tagname == '_ROOT_') {
+        continue;
+    } // Skip last pseudo-tag
+    $title = isset($lang_admin_parser['tag_summary'][$tagname]) ?
+                $lang_admin_parser['tag_summary'][$tagname] : '';
+    ?>
+								<tr>
+									<th scope="row" title="<?php echo($title);
+    ?>"><?php echo('['. $tagname .']') ?></th>
+									<td>
+										<input type="radio" name="<?php echo($tagname) ?>_in_post" value="1"<?php if ($bbcd[$tagname]['in_post']) {
+    echo ' checked="checked"';
+}
+    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_post" value="0"<?php if (!$bbcd[$tagname]['in_post']) {
+    echo ' checked="checked"';
+}
+    ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<input type="radio" name="<?php echo($tagname) ?>_in_sig" value="1"<?php if ($bbcd[$tagname]['in_sig']) {
+    echo ' checked="checked"';
+}
+    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_sig" value="0"<?php if (!$bbcd[$tagname]['in_sig']) {
+    echo ' checked="checked"';
+}
+    ?> /> <strong><?php _e('No') ?></strong>
+									</td>
+									<td>
+										<input type="text" size="10" name="<?php echo($tagname) ?>_depth_max" value="<?php echo($bbcd[$tagname]['depth_max']);
+    ?>" <?php if ($tagdata['html_type'] === 'inline' || $tagdata['tag_type'] === 'hidden') {
+    echo(' disabled="disabled" style="display: none;"');
+}
+    ?> />
+									</td>
+								</tr>
+<?php 
+} ?>
+							</tbody>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+
+
+				<p class="submitend">
+					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
+					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
+				</p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/permissions.php b/view/admin/permissions.php
new file mode 100644
index 00000000..370b1507
--- /dev/null
+++ b/view/admin/permissions.php
@@ -0,0 +1,189 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Permissions head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?php echo $feather->url->get('admin/permissions/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
+				<div class="inform">
+					<input type="hidden" name="form_sent" value="1" />
+					<fieldset>
+						<legend><?php _e('Posting subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('BBCode label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather->forum_settings['p_message_bbcode'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather->forum_settings['p_message_bbcode'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('BBCode help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Image tag label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather->forum_settings['p_message_img_tag'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather->forum_settings['p_message_img_tag'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Image tag help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('All caps message label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather->forum_settings['p_message_all_caps'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather->forum_settings['p_message_all_caps'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('All caps message help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('All caps subject label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather->forum_settings['p_subject_all_caps'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather->forum_settings['p_subject_all_caps'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('All caps subject help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Require e-mail label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather->forum_settings['p_force_guest_email'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather->forum_settings['p_force_guest_email'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Require e-mail help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Signatures subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('BBCode sigs label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather->forum_settings['p_sig_bbcode'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather->forum_settings['p_sig_bbcode'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('BBCode sigs help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Image tag sigs label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather->forum_settings['p_sig_img_tag'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather->forum_settings['p_sig_img_tag'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Image tag sigs help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('All caps sigs label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather->forum_settings['p_sig_all_caps'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather->forum_settings['p_sig_all_caps'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('All caps sigs help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Max sig length label') ?></th>
+									<td>
+										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather->forum_settings['p_sig_length'] ?>" />
+										<span class="clearb"><?php _e('Max sig length help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Max sig lines label') ?></th>
+									<td>
+										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather->forum_settings['p_sig_lines'] ?>" />
+										<span class="clearb"><?php _e('Max sig lines help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Registration subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Banned e-mail label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather->forum_settings['p_allow_banned_email'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather->forum_settings['p_allow_banned_email'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Banned e-mail help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Duplicate e-mail label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '1') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '0') {
+    echo ' checked="checked"';
+} ?> />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Duplicate e-mail help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/plugins.php b/view/admin/plugins.php
new file mode 100644
index 00000000..fde8d1f2
--- /dev/null
+++ b/view/admin/plugins.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<div class="block">
+    <h2>Plugins</h2>
+    <div class="box">
+        <div class="inbox">
+            <table class="table">
+                <caption>The following plugins are available</caption>
+                <thead>
+                    <tr>
+                        <th>Extension</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php foreach ($pluginsList as $plugin => $class) : ?>
+                        <tr>
+                            <td>
+                                <strong><?= $class::$name; ?></strong>
+                                <div class="plugin-actions">
+                                    <?php if (array_key_exists($class, $activePlugins)) { ?>
+                                        <a href="<?= $feather->url->get('/admin/plugins/deactivate?plugin='.$class) ?>">Deactivate</a>
+                                    <?php } else { ?>
+                                        <a href="<?= $feather->url->get('/admin/plugins/activate?plugin='.$class) ?>">Activate</a>
+                                    <?php } ?>
+                                </div>
+                            </td>
+                            <td>
+                                <?= $class::$description; ?>
+                                <div class="plugin-details">
+                                    Version <?= $class::$version; ?> |
+                                    By <?= $class::$author; ?>
+                                </div>
+                            </td>
+                        </tr>
+                    <?php endforeach; ?>
+                </tbody>
+            </table>
+            <p style="text-align:right"><?= count($pluginsList) ?> éléments</p>
+        </div>
+    </div>
+</div>
+
+	<div class="clearer"></div>
+</div>
diff --git a/view/admin/reports.php b/view/admin/reports.php
new file mode 100644
index 00000000..f5f53dc0
--- /dev/null
+++ b/view/admin/reports.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('New reports head') ?></span></h2>
+		<div class="box">
+			<form method="post" action="<?= $feather->url->get('admin/reports/') ?>">
+				<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
+<?php
+if (!empty($report_data)) {
+    foreach ($report_data as $report) {
+        ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php printf(__('Report subhead'), $feather->utils->format_time($report['created'])) ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?= $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
+									<td><?= str_replace("\n", '<br />', Utils::escape($report['message'])) ?></td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+    }
+} else {
+    ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('None') ?></legend>
+						<div class="infldset">
+							<p><?php _e('No new reports') ?></p>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+}
+
+?>
+			</form>
+		</div>
+	</div>
+
+	<div class="blockform block2">
+		<h2><span><?php _e('Last 10 head') ?></span></h2>
+		<div class="box">
+			<div class="fakeform">
+<?php
+
+if (!empty($report_zapped_data)) {
+    foreach ($report_zapped_data as $report) {
+        ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.Utils::escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
+									<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
+																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
+																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Reason') ?></th>
+									<td><?= str_replace("\n", '<br />', Utils::escape($report['message'])) ?></td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+    }
+} else {
+    ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('None') ?></legend>
+						<div class="infldset">
+							<p><?php _e('No zapped reports') ?></p>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+}
+
+?>
+			</div>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
diff --git a/view/admin/statistics.php b/view/admin/statistics.php
new file mode 100644
index 00000000..5317a2ce
--- /dev/null
+++ b/view/admin/statistics.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="block">
+		<h2><span><?php _e('Server statistics head') ?></span></h2>
+		<div id="adstats" class="box">
+			<div class="inbox">
+				<dl>
+					<dt><?php _e('Server load label') ?></dt>
+					<dd>
+						<?php printf(__('Server load data')."\n", $server_load, $num_online) ?>
+					</dd>
+<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
+					<dd>
+						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
+						<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->url->get('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
+						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
+					</dd>
+					<dt><?php _e('Database label') ?></dt>
+					<dd>
+<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", Utils::forum_number_format($total_records)) ?>
+						<br /><?php printf(__('Database data size')."\n", $total_size) ?>
+<?php endif; ?>					</dd>
+<?php endif; ?>
+				</dl>
+			</div>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/users/admin_users.php b/view/admin/users/admin_users.php
new file mode 100644
index 00000000..57117eb0
--- /dev/null
+++ b/view/admin/users/admin_users.php
@@ -0,0 +1,172 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('User search head') ?></span></h2>
+		<div class="box">
+			<form id="find_user" method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
+				<p class="submittop"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="1" /></p>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('User search subhead') ?></legend>
+						<div class="infldset">
+							<p><?php _e('User search info') ?></p>
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Username label') ?></th>
+									<td><input type="text" name="form[username]" size="25" maxlength="25" tabindex="2" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('E-mail address label') ?></th>
+									<td><input type="text" name="form[email]" size="30" maxlength="80" tabindex="3" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Title label') ?></th>
+									<td><input type="text" name="form[title]" size="30" maxlength="50" tabindex="4" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Real name label') ?></th>
+									<td><input type="text" name="form[realname]" size="30" maxlength="40" tabindex="5" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Website label') ?></th>
+									<td><input type="text" name="form[url]" size="35" maxlength="100" tabindex="6" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Jabber label') ?></th>
+									<td><input type="text" name="form[jabber]" size="30" maxlength="75" tabindex="7" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('ICQ label') ?></th>
+									<td><input type="text" name="form[icq]" size="12" maxlength="12" tabindex="8" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('MSN label') ?></th>
+									<td><input type="text" name="form[msn]" size="30" maxlength="50" tabindex="9" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('AOL label') ?></th>
+									<td><input type="text" name="form[aim]" size="20" maxlength="20" tabindex="10" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Yahoo label') ?></th>
+									<td><input type="text" name="form[yahoo]" size="20" maxlength="20" tabindex="11" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Location label') ?></th>
+									<td><input type="text" name="form[location]" size="30" maxlength="30" tabindex="12" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Signature label') ?></th>
+									<td><input type="text" name="form[signature]" size="35" maxlength="512" tabindex="13" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Admin note label') ?></th>
+									<td><input type="text" name="form[admin_note]" size="30" maxlength="30" tabindex="14" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Posts more than label') ?></th>
+									<td><input type="text" name="posts_greater" size="5" maxlength="8" tabindex="15" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Posts less than label') ?></th>
+									<td><input type="text" name="posts_less" size="5" maxlength="8" tabindex="16" /></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Last post after label') ?></th>
+									<td><input type="text" name="last_post_after" size="24" maxlength="19" tabindex="17" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Last post before label') ?></th>
+									<td><input type="text" name="last_post_before" size="24" maxlength="19" tabindex="18" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Last visit after label') ?></th>
+									<td><input type="text" name="last_visit_after" size="24" maxlength="19" tabindex="17" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Last visit before label') ?></th>
+									<td><input type="text" name="last_visit_before" size="24" maxlength="19" tabindex="18" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Registered after label') ?></th>
+									<td><input type="text" name="registered_after" size="24" maxlength="19" tabindex="19" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Registered before label') ?></th>
+									<td><input type="text" name="registered_before" size="24" maxlength="19" tabindex="20" />
+									<span><?php _e('Date help') ?></span></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Order by label') ?></th>
+									<td>
+										<select name="order_by" tabindex="21">
+											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
+											<option value="email"><?php _e('Order by e-mail') ?></option>
+											<option value="num_posts"><?php _e('Order by posts') ?></option>
+											<option value="last_post"><?php _e('Order by last post') ?></option>
+											<option value="last_visit"><?php _e('Order by last visit') ?></option>
+											<option value="registered"><?php _e('Order by registered') ?></option>
+										</select>&#160;&#160;&#160;<select name="direction" tabindex="22">
+											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
+											<option value="DESC"><?php _e('Descending') ?></option>
+										</select>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('User group label') ?></th>
+									<td>
+										<select name="user_group" tabindex="23">
+											<option value="-1" selected="selected"><?php _e('All groups') ?></option>
+											<option value="0"><?php _e('Unverified users') ?></option>
+											<?php echo $group_list; ?>
+										</select>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="25" /></p>
+			</form>
+		</div>
+
+		<h2 class="block2"><span><?php _e('IP search head') ?></span></h2>
+		<div class="box">
+			<form method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('IP search subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('IP address label') ?><div><input type="submit" value="<?php _e('Find IP address') ?>" tabindex="26" /></div></th>
+									<td><input type="text" name="show_users" size="18" maxlength="15" tabindex="24" />
+									<span><?php _e('IP address help') ?></span></td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/users/ban_users.php b/view/admin/users/ban_users.php
new file mode 100644
index 00000000..e37ceaa8
--- /dev/null
+++ b/view/admin/users/ban_users.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Ban users') ?></span></h2>
+		<div class="box">
+			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Message expiry subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('Ban message label') ?></th>
+									<td>
+										<input type="text" name="ban_message" size="50" maxlength="255" tabindex="1" />
+										<span><?php _e('Ban message help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Expire date label') ?></th>
+									<td>
+										<input type="text" name="ban_expire" size="17" maxlength="10" tabindex="2" />
+										<span><?php _e('Expire date help') ?></span>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php _e('Ban IP label') ?></th>
+									<td>
+										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="3" value="1" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
+										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="4" value="0" checked="checked" />&#160;<strong><?php _e('No') ?></strong></label>
+										<span class="clearb"><?php _e('Ban IP help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="ban_users_comply" value="<?php _e('Save') ?>" tabindex="3" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/users/delete_users.php b/view/admin/users/delete_users.php
new file mode 100644
index 00000000..747697ab
--- /dev/null
+++ b/view/admin/users/delete_users.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Delete users') ?></span></h2>
+		<div class="box">
+			<form name="confirm_del_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Confirm delete legend') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Confirm delete info') ?></p>
+							<div class="rbox">
+								<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
+							</div>
+							<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
+						</div>
+					</fieldset>
+				</div>
+				<p class="buttons"><input type="submit" name="delete_users_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/users/find_users.php b/view/admin/users/find_users.php
new file mode 100644
index 00000000..7c5cc513
--- /dev/null
+++ b/view/admin/users/find_users.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+
+<form id="search-users-form" action="<?php echo $feather->url->get('admin/users/') ?>" method="post">
+<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<div id="users2" class="blocktable">
+	<h2><span><?php _e('Results head') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
+					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
+					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
+<?php if ($can_action): ?>					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
+<?php endif;
+    ?>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+    if (!empty($user_data)) {
+        foreach ($user_data as $user) {
+            ?>
+				<tr>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
+					<td class="tc2"><a href="mailto:<?php echo Utils::escape($user['email']) ?>"><?php echo Utils::escape($user['email']) ?></a></td>
+					<td class="tc3"><?php echo $user['user_title'] ?></td>
+					<td class="tc4"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
+					<td class="tc5"><?php echo($user['admin_note'] != '') ? Utils::escape($user['admin_note']) : '&#160;' ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
+<?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
+<?php endif;
+            ?>
+				</tr>
+<?php
+
+        }
+    } else {
+        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('No match').'</td></tr>'."\n";
+    }
+
+    ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+<?php if ($can_action): ?>			<p class="conr modbuttons"><a href="#" onclick="return select_checkboxes('search-users-form', this, '<?php _e('Unselect all') ?>')"><?php _e('Select all') ?></a> <?php if ($can_ban) : ?><input type="submit" name="ban_users" value="<?php _e('Ban') ?>" /><?php endif;
+    if ($can_delete) : ?><input type="submit" name="delete_users" value="<?php _e('Delete') ?>" /><?php endif;
+    if ($can_move) : ?><input type="submit" name="move_users" value="<?php _e('Change group') ?>" /><?php endif;
+    ?></p>
+<?php endif;
+    ?>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="clearer"></div>
+	</div>
+</div>
+</form>
diff --git a/view/admin/users/move_users.php b/view/admin/users/move_users.php
new file mode 100644
index 00000000..05933bf0
--- /dev/null
+++ b/view/admin/users/move_users.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+	<div class="blockform">
+		<h2><span><?php _e('Move users') ?></span></h2>
+		<div class="box">
+			<form name="confirm_move_users" method="post" action="<?php echo $feather->url->get('admin/users/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Move users subhead') ?></legend>
+						<div class="infldset">
+							<table class="aligntop">
+								<tr>
+									<th scope="row"><?php _e('New group label') ?></th>
+									<td>
+										<select name="new_group" tabindex="1">
+<?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo Utils::escape($group) ?></option>
+<?php endforeach;
+    ?>
+										</select>
+										<span><?php _e('New group help') ?></span>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</fieldset>
+				</div>
+				<p class="submitend"><input type="submit" name="move_users_comply" value="<?php _e('Save') ?>" tabindex="2" /></p>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/admin/users/search_ip.php b/view/admin/users/search_ip.php
new file mode 100644
index 00000000..a5f3f390
--- /dev/null
+++ b/view/admin/users/search_ip.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<div id="users1" class="blocktable">
+	<h2><span><?php _e('Results head') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Results IP address head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results last used head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results times found head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results action head') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+        foreach ($ip_data as $ip) {
+            ?>
+				<tr>
+					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.Utils::escape($ip['poster_ip']).'/') ?>"><?php echo Utils::escape($ip['poster_ip']) ?></a></td>
+					<td class="tc2"><?php echo $feather->utils->format_time($ip['last_used']) ?></td>
+					<td class="tc3"><?php echo $ip['used_times'] ?></td>
+					<td class="tcr"><a href="<?php echo $feather->url->get('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
+				</tr>
+<?php
+
+        }
+        if (empty($ip_data)):
+            echo "\t\t\t\t".'<tr><td class="tcl" colspan="4">'.__('Results no posts found').'</td></tr>'."\n";
+        endif;
+
+    ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/admin/users/show_users.php b/view/admin/users/show_users.php
new file mode 100644
index 00000000..85899359
--- /dev/null
+++ b/view/admin/users/show_users.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<div id="users2" class="blocktable">
+	<h2><span><?php _e('Results head') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
+					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
+					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
+					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
+					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
+					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+    if ($info['num_posts']) {
+
+        // Loop through users and print out some info
+        foreach ($info['posters'] as $cur_poster) {
+            if (isset($info['user_data'][$cur_poster['poster_id']])) {
+                ?>
+				<tr>
+					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.Utils::escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
+					<td class="tc2"><a href="mailto:<?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
+					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
+					<td class="tc4"><?php echo Utils::forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
+					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? Utils::escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
+					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
+				</tr>
+<?php
+
+            } else {
+                ?>
+				<tr>
+					<td class="tcl"><?php echo Utils::escape($cur_poster['poster']) ?></td>
+					<td class="tc2">&#160;</td>
+					<td class="tc3"><?php _e('Results guest') ?></td>
+					<td class="tc4">&#160;</td>
+					<td class="tc5">&#160;</td>
+					<td class="tcr">&#160;</td>
+				</tr>
+<?php
+
+            }
+        }
+    } else {
+        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('Results no IP found').'</td></tr>'."\n";
+    }
+
+    ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $paging_links ?></p>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+		</ul>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/delete.php b/view/delete.php
new file mode 100644
index 00000000..6ea36ea3
--- /dev/null
+++ b/view/delete.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Utils;
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox">
+		<ul class="crumbs">
+			<li><a href="<?= Url::base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?= Url::get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?= Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?= Url::get('post/'.$id.'/#p'.$id) ?>"><?= Utils::escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
+		</ul>
+	</div>
+</div>
+
+<div class="blockform">
+	<h2><span><?php _e('Delete post') ?></span></h2>
+	<div class="box">
+		<form method="post" action="<?= $feather->urlFor('deletePost', array('id'=>$id)) ?>">
+			<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
+			<div class="inform">
+				<div class="forminfo">
+					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.$feather->utils->escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
+					<p><?= ($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
+				</div>
+			</div>
+			<p class="buttons"><input type="submit" name="delete" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
+
+<div id="postreview">
+	<div class="blockpost">
+		<div class="box">
+			<div class="inbox">
+				<div class="postbody">
+					<div class="postleft">
+						<dl>
+							<dt><strong><?= Utils::escape($cur_post['poster']) ?></strong></dt>
+							<dd><span><?= $feather->utils->format_time($cur_post['posted']) ?></span></dd>
+						</dl>
+					</div>
+					<div class="postright">
+						<div class="postmsg">
+							<?= $cur_post['message']."\n" ?>
+						</div>
+					</div>
+				</div>
+				<div class="clearer"></div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/view/edit.php b/view/edit.php
new file mode 100644
index 00000000..24b5b449
--- /dev/null
+++ b/view/edit.php
@@ -0,0 +1,119 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+$cur_index = 1;
+
+?>
+
+<div class="linkst">
+	<div class="inbox">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
+		</ul>
+	</div>
+</div>
+
+<?php
+
+// If there are errors, we display them
+if (!empty($errors)) :
+?>
+<div id="posterror" class="block">
+	<h2><span><?php _e('Post errors') ?></span></h2>
+	<div class="box">
+		<div class="inbox error-info">
+			<p><?php _e('Post errors info') ?></p>
+			<ul class="error-list">
+<?php
+    foreach ($errors as $cur_error) {
+        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+    }
+?>
+			</ul>
+		</div>
+	</div>
+</div>
+<?php
+elseif ($feather->request->post('preview')):
+?>
+<div id="postpreview" class="blockpost">
+	<h2><span><?php _e('Post preview') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<div class="postbody">
+				<div class="postright">
+					<div class="postmsg">
+						<?php echo $preview_message."\n" ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<?php
+endif;
+?>
+<!-- Init BBcode editor toolbar -->
+<script>
+    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
+        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
+</script>
+<script src="<?php echo Url::base() ?>/style/imports/bbeditor.js"></script>
+<div id="editform" class="blockform">
+	<h2><span><?php _e('Edit post') ?></span></h2>
+	<div class="box">
+		<form id="edit" method="post" action="<?php echo $feather->url->get('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Edit post legend') ?></legend>
+					<input type="hidden" name="form_sent" value="1" />
+					<div class="infldset txtarea">
+<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo Utils::escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
+<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
+						<script>postEditorToolbar('req_message');</script>
+                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo Utils::escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
+						<ul class="bblinks">
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+						</ul>
+					</div>
+				</fieldset>
+			</div>
+<?php
+if (!empty($checkboxes)):
+?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Options') ?></legend>
+					<div class="infldset">
+						<div class="rbox">
+							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+<?php
+endif;
+?>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
diff --git a/view/error.php b/view/error.php
new file mode 100644
index 00000000..8d4d01cb
--- /dev/null
+++ b/view/error.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="msg" class="block error">
+    <h2><span><?= $msg_title ?></span></h2>
+    <div class="box">
+        <div class="inbox">
+            <p><?php echo $msg ?></p>
+            <?php if (!$no_back_link) {
+                echo "\t\t\t".'<p><a href="javascript: history.go(-1)">'.__('Go back').'</a></p>';
+            } ?>
+        </div>
+    </div>
+</div>
diff --git a/view/footer.php b/view/footer.php
new file mode 100644
index 00000000..98c2aced
--- /dev/null
+++ b/view/footer.php
@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+?>
+</div>
+
+<div id="brdfooter" class="block">
+	<h2><span><?php _e('Board footer') ?></span></h2>
+	<div class="box">
+<?php
+
+if (isset($footer_style) && ($footer_style == 'Forum' || $footer_style == 'Topic') && $is_admmod) {
+    echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
+
+    if ($footer_style == 'Forum') {
+        echo "\t\t\t".'<dl>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
+        echo "\t\t\t".'</dl>'."\n";
+    } elseif ($footer_style == 'Topic') {
+        if (isset($pid)) {
+            $parameter = 'param/'.$pid.'/';
+        } elseif (isset($p) && $p != 1) {
+            $parameter = 'param/'.$p.'/';
+        } else {
+            $parameter = '';
+        }
+
+
+        echo "\t\t\t".'<dl>'."\n";
+        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
+        // TODO: all
+        //echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
+        echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
+
+        if ($cur_topic['closed'] == '1') {
+            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
+        } else {
+            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
+        }
+
+        if ($cur_topic['sticky'] == '1') {
+            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
+        } else {
+            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
+        }
+
+        echo "\t\t\t".'</dl>'."\n";
+    }
+
+    echo "\t\t\t".'<div class="clearer"></div>'."\n\t\t".'</div>'."\n";
+}
+
+?>
+		<div id="brdfooternav" class="inbox">
+
+<?php
+// Display the "Jump to" drop list
+if ($feather_config['o_quickjump'] == '1' && !empty($quickjump)) { ?>
+			<div class="conl">
+			<form id="qjump" method="get" action="">
+				<div><label><span><?php _e('Jump to') ?><br /></span></label>
+					<select name="id" onchange="window.location=('<?php echo get('forum/') ?>'+this.options[this.selectedIndex].value)">
+<?php
+		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
+			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
+			foreach ($cat_data['cat_forums'] as $forum) {
+				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
+			}
+			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
+		} ?>
+					</select>
+					<noscript><input type="submit" value="<?php _e('Go') ?>" accesskey="g" /></noscript>
+				</div>
+			</form>
+			</div>
+<?php } ?>
+
+			<div class="conr">
+<?php
+
+if ($footer_style == 'index') {
+    if ($feather_config['o_feed_type'] == '1') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
+    } elseif ($feather_config['o_feed_type'] == '2') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
+    }
+} elseif ($footer_style == 'Forum') {
+    if ($feather_config['o_feed_type'] == '1') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
+    } elseif ($feather_config['o_feed_type'] == '2') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
+    }
+} elseif ($footer_style == 'Topic') {
+    if ($feather_config['o_feed_type'] == '1') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
+    } elseif ($feather_config['o_feed_type'] == '2') {
+        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
+    }
+}
+
+?>
+				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
+			</div>
+			<div class="clearer"></div>
+		</div>
+	</div>
+</div>
+<?php
+
+// Display debug info (if enabled/defined)
+if ($feather->forum_env['FEATHER_SHOW_INFO']) {
+    $feather->debug->info();
+}
+
+// Display executed queries (if enabled)
+if ($feather->forum_env['FEATHER_SHOW_QUERIES']) {
+    $feather->debug->queries();
+}
+?>
+
+</section>
+
+<script src="<?php echo $feather->url->base() ?>/style/themes/FeatherBB/phone.min.js"></script>
+
+</body>
+</html>
diff --git a/view/header.php b/view/header.php
new file mode 100644
index 00000000..fdbfa249
--- /dev/null
+++ b/view/header.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php _e('lang_identifier') ?>" lang="<?php _e('lang_identifier') ?>" dir="<?php _e('lang_direction') ?>">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
+<title><?php echo Utils::generate_page_title($page_title, $p) ?></title>
+<link rel="stylesheet" type="text/css" href="<?php echo $feather->url->base() ?>/style/themes/<?php echo $feather->user->style.'.css' ?>" />
+<?php
+
+echo $allow_index;
+echo $admin_console;
+
+if (isset($required_fields)) :
+    // Output JavaScript to validate form (make sure required fields are filled out)
+
+    ?>
+    <script type="text/javascript">
+        /* <![CDATA[ */
+        function process_form(the_form)
+        {
+            var required_fields = {
+                <?php
+                    // Output a JavaScript object with localised field names
+                    $tpl_temp = count($required_fields);
+                    foreach ($required_fields as $elem_orig => $elem_trans) {
+                        echo "\t\t\"".$elem_orig.'": "'.addslashes(str_replace('&#160;', ' ', $elem_trans));
+                        if (--$tpl_temp) {
+                            echo "\",\n";
+                        } else {
+                            echo "\"\n\t};\n";
+                        }
+                    }
+                    ?>
+                if (document.all || document.getElementById)
+            {
+                for (var i = 0; i < the_form.length; ++i)
+                {
+                    var elem = the_form.elements[i];
+                    if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
+                    {
+                        alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
+                        elem.focus();
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        /* ]]> */
+    </script>
+    <?php
+endif;
+if (!empty($page_head)) :
+    echo implode("\n", $page_head)."\n";
+endif;
+?>
+</head>
+
+<body id="pun<?= $active_page ?>"<?= $focus_element; ?>>
+
+<header>
+
+    <nav>
+        <div class="container">
+            <div class="phone-menu" id="phone-button">
+                <a class="button-phone"></a>
+            </div>
+            <div id="phone">
+                <?php echo $navlinks ?>
+                <div class="navbar-right">
+                    <form method="get" action="/search" class="nav-search">
+                        <input type="hidden" name="action" value="search">
+                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php _e('Search') ?>">
+                    </form>
+                </div>
+            </div>
+        </div>
+    </nav>
+
+    <div class="container">
+        <div class="container-title-status">
+            <h1 class="title-site">
+                <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
+                    <p><?php echo feather_escape($feather_config['o_board_title']) ?></p>
+                </a>
+                <div id="brddesc"><?php echo htmlspecialchars_decode($feather_config['o_board_desc']) ?></div>
+            </h1>
+            <div class="status-avatar">
+                <?php echo $page_info ?>
+            </div>
+            <div class="clear"></div>
+        </div>
+        <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
+            <div id="announce" class="block">
+                <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
+                <div class="box">
+                    <div id="announce-block" class="inbox">
+                        <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
+                    </div>
+                </div>
+            </div>
+        <?php endif; ?>
+        <?php if (isset($flash['message'])) : ?>
+            <script type="text/javascript" src="<?=$feather->url->base();?>/js/common.js"></script>
+            <div id="msgflash" class="block">
+                <h2><span><?php _e('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
+                <div class="box">
+                    <div class="inbox">
+                        <p><?php echo feather_escape($flash['message']) ?></p>
+                    </div>
+                </div>
+            </div>
+            <script type="text/javascript">fadeIn('msgflash', 0);</script>
+        <?php endif; ?>
+    </div>
+
+</header>
+
+<section class="container">
+    <div id="brdmain">
diff --git a/view/help.php b/view/help.php
new file mode 100644
index 00000000..a1924a10
--- /dev/null
+++ b/view/help.php
@@ -0,0 +1,139 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<h2><span><?php _e('BBCode') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><a name="bbcode"></a><?php _e('BBCode info 1') ?></p>
+		<p><?php _e('BBCode info 2') ?></p>
+	</div>
+</div>
+<h2><span><?php _e('Text style') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><?php _e('Text style info') ?></p>
+		<p><code>[b]<?php _e('Bold text') ?>[/b]</code> <?php _e('produces') ?> <samp><strong><?php _e('Bold text') ?></strong></samp></p>
+		<p><code>[u]<?php _e('Underlined text') ?>[/u]</code> <?php _e('produces') ?> <samp><span class="bbu"><?php _e('Underlined text') ?></span></samp></p>
+		<p><code>[i]<?php _e('Italic text') ?>[/i]</code> <?php _e('produces') ?> <samp><em><?php _e('Italic text') ?></em></samp></p>
+		<p><code>[s]<?php _e('Strike-through text') ?>[/s]</code> <?php _e('produces') ?> <samp><span class="bbs"><?php _e('Strike-through text') ?></span></samp></p>
+		<p><code>[del]<?php _e('Deleted text') ?>[/del]</code> <?php _e('produces') ?> <samp><del><?php _e('Deleted text') ?></del></samp></p>
+		<p><code>[ins]<?php _e('Inserted text') ?>[/ins]</code> <?php _e('produces') ?> <samp><ins><?php _e('Inserted text') ?></ins></samp></p>
+		<p><code>[em]<?php _e('Emphasised text') ?>[/em]</code> <?php _e('produces') ?> <samp><em><?php _e('Emphasised text') ?></em></samp></p>
+		<p><code>[color=#FF0000]<?php _e('Red text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: #ff0000"><?php _e('Red text') ?></span></samp></p>
+		<p><code>[color=blue]<?php _e('Blue text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: blue"><?php _e('Blue text') ?></span></samp></p>
+		<p><code>[h]<?php _e('Heading text') ?>[/h]</code> <?php _e('produces') ?></p> <div class="postmsg"><h5><?php _e('Heading text') ?></h5></div>
+	</div>
+</div>
+<h2><span><?php _e('Links and images') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><?php _e('Links info') ?></p>
+		<p><a name="url"></a><code>[url=<?php echo Utils::escape($feather->url->base(true).'/') ?>]<?php echo Utils::escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape($feather->url->base(true).'/') ?>"><?php echo Utils::escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
+		<p><code>[url]<?php echo Utils::escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape($feather->url->base(true).'/') ?>"><?php echo Utils::escape($feather->url->base(true).'/') ?></a></samp></p>
+		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
+		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
+		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
+		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
+		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php echo $feather->url->get('topic/1/') ?></a></samp></p>
+		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
+		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php echo $feather->url->get('post/1/#p1') ?></a></samp></p>
+		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
+		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('forum/1/') ?>"><?php echo $feather->url->get('forum/1/') ?></a></samp></p>
+		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
+		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php echo $feather->url->get('user/2/') ?></a></samp></p>
+	</div>
+	<div class="inbox">
+		<p><a name="img"></a><?php _e('Images info') ?></p>
+		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo Utils::escape($feather->url->base(true)) ?>/style/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo Utils::escape($feather->url->base(true)) ?>/style/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
+	</div>
+</div>
+<h2><span><?php _e('Quotes') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><?php _e('Quotes info') ?></p>
+		<p><code>[quote=James]<?php _e('Quote text') ?>[/quote]</code></p>
+		<p><?php _e('produces quote box') ?></p>
+		<div class="postmsg">
+			<div class="quotebox"><cite>James <?php _e('wrote') ?></cite><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
+		</div>
+		<p><?php _e('Quotes info 2') ?></p>
+		<p><code>[quote]<?php _e('Quote text') ?>[/quote]</code></p>
+		<p><?php _e('produces quote box') ?></p>
+		<div class="postmsg">
+			<div class="quotebox"><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
+		</div>
+		<p><?php _e('quote note') ?></p>
+	</div>
+</div>
+<h2><span><?php _e('Code') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><?php _e('Code info') ?></p>
+		<p><code>[code]<?php _e('Code text') ?>[/code]</code></p>
+		<p><?php _e('produces code box') ?></p>
+		<div class="postmsg">
+			<div class="codebox"><pre><code><?php _e('Code text') ?></code></pre></div>
+		</div>
+	</div>
+</div>
+<h2><span><?php _e('Lists') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><a name="lists"></a><?php _e('List info') ?></p>
+		<p><code>[list][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php _e('produces list') ?></span></p>
+		<div class="postmsg">
+			<ul><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ul>
+		</div>
+		<p><code>[list=1][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php _e('produces decimal list') ?></span></p>
+		<div class="postmsg">
+			<ol class="decimal"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
+		</div>
+		<p><code>[list=a][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
+		<br /><span><?php _e('produces alpha list') ?></span></p>
+		<div class="postmsg">
+			<ol class="alpha"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
+		</div>
+	</div>
+</div>
+<h2><span><?php _e('Nested tags') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><?php _e('Nested tags info') ?></p>
+		<p><code>[b][u]<?php _e('Bold, underlined text') ?>[/u][/b]</code> <?php _e('produces') ?> <samp><strong><span class="bbu"><?php _e('Bold, underlined text') ?></span></strong></samp></p>
+	</div>
+</div>
+<h2><span><?php _e('Smilies') ?></span></h2>
+<div class="box">
+	<div class="inbox">
+		<p><a name="smilies"></a><?php _e('Smilies info') ?></p>
+<?php
+
+// Display the smiley set
+$smiley_groups = array();
+
+foreach ($feather->parser->pd['smilies'] as $smiley_text => $smiley_data) {
+    $smiley_groups[$smiley_data['file']][] = $smiley_text;
+}
+
+foreach ($smiley_groups as $smiley_img => $smiley_texts) {
+    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$feather->parser->pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
+}
+
+?>
+	</div>
+</div>
diff --git a/view/index.php b/view/index.php
new file mode 100644
index 00000000..f3046814
--- /dev/null
+++ b/view/index.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+if (empty($index_data)): ?>
+    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php _e('Empty board') ?></p></div></div></div>
+<?php endif;
+foreach ($index_data as $forum) {
+    if ($forum->cid != $cur_cat) :
+        if ($cur_cat != 0) :
+    ?>
+				</tbody>
+			</table>
+		</div>
+	</div>
+	</div>
+	<?php endif;
+    ?>
+	<div id="idx<?php echo $forum->cid ?>" class="blocktable">
+	<h2><span><?php echo Utils::escape($forum->cat_name) ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Forum') ?></th>
+					<th class="tc2" scope="col"><?php _e('Topics') ?></th>
+					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
+					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+	<?php
+    $cur_cat = $forum->cid;
+    endif;
+    ?>
+				<tr class="<?php echo $forum->item_status ?>">
+					<td class="tcl">
+						<div class="<?php echo $forum->icon_type ?>"><div class="nosize"><?php echo Utils::forum_number_format($forum->forum_count_formatted) ?></div></div>
+						<div class="tclcon">
+							<div>
+								<?php echo $forum->forum_field."\n".$forum->moderators_formatted ?>
+							</div>
+						</div>
+					</td>
+					<td class="tc2"><?php echo Utils::forum_number_format($forum->num_topics_formatted) ?></td>
+					<td class="tc3"><?php echo Utils::forum_number_format($forum->num_posts_formatted) ?></td>
+					<td class="tcr"><?php echo $forum->last_post_formatted ?></td>
+				</tr>
+	<?php
+
+}
+if ($cur_cat > 0) :
+    ?>
+					</tbody>
+			</table>
+		</div>
+	</div>
+	</div>
+<?php
+endif;
+if (!empty($forum_actions)) :
+?>
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<p class="subscribelink clearb"><?php echo implode(' - ', $forum_actions); ?></p>
+	</div>
+</div>
+<?php
+endif;
+?>
+<div id="brdstats" class="block">
+	<h2><span><?php _e('Board info') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<dl class="conr">
+				<dt><strong><?php _e('Board stats') ?></strong></dt>
+				<dd><span><?php printf(__('No of users'), '<strong>'.Utils::forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of topics'), '<strong>'.Utils::forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('No of posts'), '<strong>'.Utils::forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
+			</dl>
+			<dl class="conl">
+				<dt><strong><?php _e('User info') ?></strong></dt>
+				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
+				<?php if ($feather->forum_settings['o_users_online'] == 1) : ?>
+				<dd><span><?php printf(__('Users online'), '<strong>'.Utils::forum_number_format($online['num_users']).'</strong>') ?></span></dd>
+				<dd><span><?php printf(__('Guests online'), '<strong>'.Utils::forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
+				<?php endif; ?>
+			</dl>
+			<?php
+            if ($feather->forum_settings['o_users_online'] == 1) :
+                if ($online['num_users'] > 0) {
+                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
+                } else {
+                    echo "\t\t\t".'<div class="clearer"></div>'."\n";
+                }
+            endif;
+            ?>
+		</div>
+	</div>
+</div>
diff --git a/view/install.php b/view/install.php
new file mode 100644
index 00000000..a9db4e72
--- /dev/null
+++ b/view/install.php
@@ -0,0 +1,222 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title><?php _e('FeatherBB Installation') ?></title>
+    <link rel="stylesheet" type="text/css" href="style/themes/<?php echo $feather->forum_env['FORUM_NAME'] ?>.css" />
+</head>
+
+<body>
+    <div id="puninstall" class="pun">
+        <div class="top-box"><div><!-- Top Corners --></div></div>
+        <div class="punwrap">
+
+            <section class="container">
+                <div id="brdheader" class="block">
+                    <div class="box">
+                        <div id="brdtitle" class="inbox">
+                            <h1><span><?php _e('FeatherBB Installation') ?></span></h1>
+                            <div id="brddesc"><p><?php _e('Welcome') ?></p></div>
+                        </div>
+                    </div>
+                </div>
+            </section>
+
+            <section class="container">
+                <div id="brdmain">
+                    <?php if (count($languages) > 1): ?>
+                        <div class="blockform">
+                            <h2><span><?php _e('Choose install language') ?></span></h2>
+                            <div class="box">
+                                <form id="install" method="post" action="">
+                                    <input type="hidden" name="choose_lang" value="1">
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Install language') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Choose install language info') ?></p>
+                                                <label><strong><?php _e('Install language') ?></strong>
+                                                    <br /><select name="install_lang">
+                                                        <?php
+
+                                                        foreach ($languages as $lang) {
+                                                            echo "\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').'>'.$lang.'</option>'."\n";
+                                                        }
+
+                                                        ?>
+                                                    </select>
+                                                    <br /></label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                        <p class="buttons"><input type="submit" value="<?php _e('Change language') ?>" /></p>
+                                    </form>
+                                </div>
+                            </div>
+                        <?php endif;
+                        ?>
+
+                        <div class="blockform">
+                            <h2><span><?php echo sprintf(__('Install'), FORUM_VERSION) ?></span></h2>
+                            <div class="box">
+                                <form id="install" method="post" action="">
+                                    <?php if (!empty($errors)): ?>
+                                        <div class="inform">
+                                            <div class="forminfo error-info">
+                                                <h3><?php _e('Errors') ?></h3>
+                                                <ul class="error-list">
+                                                    <?php
+                                                    $errors = (!is_array($errors)) ? array($errors) : $errors;
+                                                    foreach ($errors as $error) {
+                                                        echo "\t\t\t\t\t\t".'<li><strong>'.$error.'</strong></li>'."\n";
+                                                    }
+                                                    ?>
+                                                </ul>
+                                            </div>
+                                        </div>
+                                        <?php endif;?>
+
+                                    <div class="inform">
+                                        <div class="forminfo">
+                                            <h3><?php _e('Database setup') ?></h3>
+                                            <p><?php _e('Info 1') ?></p>
+                                        </div>
+                                        <fieldset>
+                                            <legend><?php _e('Select database') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 2') ?></p>
+                                                <label class="required"><strong><?php _e('Database type') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <select name="install[db_type]" required>
+                                                    <?php
+
+                                                    foreach ($supported_dbs as $id => $db_type) {
+                                                        echo "\t\t\t\t\t\t\t".'<option value="'.$id.'">'.$db_type.'</option>'."\n";
+                                                    }
+
+                                                    ?>
+                                                </select>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database hostname') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 3') ?></p>
+                                                <label class="required"><strong><?php _e('Database server hostname') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[db_host]" size="50" required />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database enter name') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 4') ?></p>
+                                                <label class="required"><strong><?php _e('Database name') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[db_name]" size="30" required />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database enter informations') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 5') ?></p>
+                                                <label class="conl"><?php _e('Database username') ?></label>
+                                                <input type="text" name="install[db_user]" size="30" />
+                                                <label class="conl"><?php _e('Database password') ?></label>
+                                                <input type="password" name="install[db_pass]" size="30" />
+                                                <div class="clearer"></div>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <fieldset>
+                                            <legend><?php _e('Database enter prefix') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 6') ?></p>
+                                                <label><?php _e('Table prefix') ?></label>
+                                                <input type="text" name="install[db_prefix]" size="20" maxlength="30" />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <div class="forminfo">
+                                            <h3><?php _e('Administration setup') ?></h3>
+                                            <p><?php _e('Info 7') ?></p>
+                                        </div>
+                                        <fieldset>
+                                            <legend><?php _e('Administration setup') ?></legend>
+                                            <div class="infldset">
+                                                <p><?php _e('Info 8') ?></p>
+                                                <label class="required"><strong><?php _e('Administrator username') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[username]" size="25" maxlength="25" required />
+                                                <label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="password" name="install[password]" size="16" required />
+                                                <label class="conl required"><strong><?php _e('Confirm password') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="password" name="install[password_conf]" size="16" required />
+                                                <!-- <div class="clearer"></div> -->
+                                                <label class="required"><strong><?php _e('Administrator email') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[email]" size="50" maxlength="80" required />
+                                            </div>
+                                        </fieldset>
+                                    </div>
+
+                                    <div class="inform">
+                                        <div class="forminfo">
+                                            <h3><?php _e('Board setup') ?></h3>
+                                            <p><?php _e('Info 11') ?></p>
+                                        </div>
+                                        <fieldset>
+                                            <legend><?php _e('General information') ?></legend>
+                                            <div class="infldset">
+                                                <label class="required"><strong><?php _e('Board title') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[title]" value="<? echo $data['title'] ?>" size="60" maxlength="255" required />
+                                                <label><?php _e('Board description') ?></label>
+                                                <input type="text" name="install[description]" value="<? echo $data['description'] ?>" size="60" maxlength="255" required />
+                                                <label class="required"><strong><?php _e('Base URL') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <input type="text" name="install[base_url]" value="<? echo $data['base_url'] ?>" size="60" maxlength="100" required />
+                                                <label class="required"><strong><?php _e('Default language') ?> <span><?php _e('Required') ?></span></strong></label>
+                                                <select name="install[default_lang]" required />
+                                                <?php
+                                                foreach ($languages as $lang) {
+                                                    echo "\t\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').' >'.$lang.'</option>'."\n";
+                                                }
+                                                ?>
+                                            </select>
+                                        </div>
+                                    </fieldset>
+                                </div>
+
+                                <p class="buttons"><input type="submit" value="<?php _e('Start install') ?>" /></p>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </div>
+        <div class="end-box"><div><!-- Bottom Corners --></div></div>
+    </div>
+</body>
+</html>
diff --git a/view/login/form.php b/view/login/form.php
new file mode 100644
index 00000000..e6a8210a
--- /dev/null
+++ b/view/login/form.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Login') ?></span></h2>
+	<div class="box">
+		<form id="login" method="post" action="<?php echo $feather->url->get('login/action/in/') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Login legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<input type="hidden" name="redirect_url" value="<?php echo Utils::escape($redirect_url) ?>" />
+						<label class="conl required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
+						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
+
+						<div class="rbox clearb">
+							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php _e('Remember me') ?><br /></label>
+						</div>
+
+						<p class="clearb"><?php _e('Login info') ?></p>
+						<p class="actions"><span><a href="<?php echo $feather->url->get('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo $feather->url->get('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="login" value="<?php _e('Login') ?>" tabindex="4" /></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/login/password_forgotten.php b/view/login/password_forgotten.php
new file mode 100644
index 00000000..b32ff1b6
--- /dev/null
+++ b/view/login/password_forgotten.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+// If there are errors, we display them
+if (!empty($errors)) {
+    ?>
+<div id="posterror" class="block">
+	<h2><span><?php _e('New password errors') ?></span></h2>
+	<div class="box">
+		<div class="inbox error-info">
+			<p><?php _e('New passworderrors info') ?></p>
+			<ul class="error-list">
+<?php
+
+    foreach ($errors as $cur_error) {
+        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+    }
+    ?>
+			</ul>
+		</div>
+	</div>
+</div>
+
+<?php
+
+}
+?>
+<div class="blockform">
+	<h2><span><?php _e('Request pass') ?></span></h2>
+	<div class="box">
+		<form id="request_pass" method="post" action="<?php echo $feather->url->get('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Request pass legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
+						<p><?php _e('Request pass info') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="request_pass" value="<?php _e('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a><?php endif; ?></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/message.php b/view/message.php
new file mode 100644
index 00000000..69f4884b
--- /dev/null
+++ b/view/message.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="msg" class="block error">
+	<h2><span><?= __('Error') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<p><?php echo $msg ?></p>
+<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php _e('Go back') ?></a></p>
+<?php endif;
+    ?>		</div>
+	</div>
+</div>
diff --git a/view/misc/email.php b/view/misc/email.php
new file mode 100644
index 00000000..eebc5f9a
--- /dev/null
+++ b/view/misc/email.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="emailform" class="blockform">
+	<h2><span><?php _e('Send email to') ?> <?php echo Utils::escape($mail['recipient']) ?></span></h2>
+	<div class="box">
+		<form id="email" method="post" action="<?php echo $feather->url->get('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Write email') ?></legend>
+					<div class="infldset txtarea">
+						<input type="hidden" name="form_sent" value="1" />
+						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
+						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
+						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
+						<p><?php _e('Email disclosure note') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
diff --git a/view/misc/report.php b/view/misc/report.php
new file mode 100644
index 00000000..a61dc8ca
--- /dev/null
+++ b/view/misc/report.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="linkst">
+	<div class="inbox">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
+		</ul>
+	</div>
+</div>
+
+<div id="reportform" class="blockform">
+	<h2><span><?php _e('Report post') ?></span></h2>
+	<div class="box">
+		<form id="report" method="post" action="<?php echo $feather->url->get('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Reason desc') ?></legend>
+					<div class="infldset txtarea">
+						<input type="hidden" name="form_sent" value="1" />
+						<label class="required"><strong><?php _e('Reason') ?> <span><?php _e('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/misc/rules.php b/view/misc/rules.php
new file mode 100644
index 00000000..163df1b7
--- /dev/null
+++ b/view/misc/rules.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="rules" class="block">
+	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
+	<div class="box">
+		<div id="rules-block" class="inbox">
+			<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
+		</div>
+	</div>
+</div>
diff --git a/view/moderate/delete_posts.php b/view/moderate/delete_posts.php
new file mode 100644
index 00000000..78100a8d
--- /dev/null
+++ b/view/moderate/delete_posts.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Delete posts') ?></span></h2>
+	<div class="box">
+		<form method="post" action="">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Confirm delete legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
+						<p><?php _e('Delete posts comply') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/moderate/delete_topics.php b/view/moderate/delete_topics.php
new file mode 100644
index 00000000..46d56282
--- /dev/null
+++ b/view/moderate/delete_topics.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="blockform">
+	<h2><span><?php _e('Delete topics') ?></span></h2>
+	<div class="box">
+		<form method="post" action="">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Confirm delete legend') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Delete topics comply') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/moderate/merge_topics.php b/view/moderate/merge_topics.php
new file mode 100644
index 00000000..24a92aaf
--- /dev/null
+++ b/view/moderate/merge_topics.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="blockform">
+	<h2><span><?php _e('Merge topics') ?></span></h2>
+	<div class="box">
+		<form method="post" action="">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Confirm merge legend') ?></legend>
+					<div class="infldset">
+						<div class="rbox">
+							<label><input type="checkbox" name="with_redirect" value="1" /><?php _e('Leave redirect') ?><br /></label>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php _e('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
new file mode 100644
index 00000000..de25ede1
--- /dev/null
+++ b/view/moderate/moderator_forum.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<form method="post" action="<?php echo $feather->url->get('moderate/forum/'.$id.'/') ?>">
+<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<input type="hidden" name="page" value="<?php echo Utils::escape($p) ?>" />
+<div id="vf" class="blocktable">
+	<h2><span><?php echo Utils::escape($cur_forum['forum_name']) ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
+					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php endif; ?>					<th class="tcr"><?php _e('Last post') ?></th>
+					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+			
+			<?php
+            $topic_count = 0;
+            $button_status = '';
+            foreach ($topic_data as $topic) {
+                ++$topic_count;
+                ?>
+							<tr class="<?php echo $topic['item_status'] ?>">
+					<td class="tcl">
+						<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo Utils::forum_number_format($topic_count + $start_from) ?></div></div>
+						<div class="tclcon">
+							<div>
+								<?php echo $topic['subject_disp']."\n" ?>
+							</div>
+						</div>
+					</td>
+					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? Utils::forum_number_format($topic['num_replies']) : '-' ?></td>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? Utils::forum_number_format($topic['num_views']) : '-' ?></td>
+<?php endif;
+                ?>					<td class="tcr"><?php echo $topic['last_post_disp'] ?></td>
+					<td class="tcmod"><input type="checkbox" name="topics[<?php echo $topic['id'] ?>]" value="1" /></td>
+				</tr>
+			<?php
+
+            }
+            if (empty($topic_data)):
+                $colspan = ($feather->forum_settings['o_topic_views'] == '1') ? 5 : 4;
+                $button_status = ' disabled="disabled"';
+                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
+            endif;
+            ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php _e('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php _e('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php _e('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php _e('Close') ?>"<?php echo $button_status ?> /></p>
+			<div class="clearer"></div>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
+		</ul>
+		<div class="clearer"></div>
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/view/moderate/move_topics.php b/view/moderate/move_topics.php
new file mode 100644
index 00000000..f184afcb
--- /dev/null
+++ b/view/moderate/move_topics.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="blockform">
+	<h2><span><?php echo($action == 'single') ? __('Move topic') : __('Move topics') ?></span></h2>
+	<div class="box">
+		<form method="post" action="">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+			<input type="hidden" name="topics" value="<?php echo $topics ?>" />
+				<fieldset>
+					<legend><?php _e('Move legend') ?></legend>
+					<div class="infldset">
+						<label><?php _e('Move to') ?>
+						<br /><select name="move_to_forum">
+								<?php echo $list_forums ?>
+							</optgroup>
+						</select>
+						<br /></label>
+						<div class="rbox">
+							<label><input type="checkbox" name="with_redirect" value="1"<?php if ($action == 'single') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Leave redirect') ?><br /></label>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php _e('Move') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/moderate/posts_view.php b/view/moderate/posts_view.php
new file mode 100644
index 00000000..d0c2d06d
--- /dev/null
+++ b/view/moderate/posts_view.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<form method="post" action="">
+<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<?php
+$post_count = 0; // Keep track of post numbers
+foreach ($post_data as $post) {
+    $post_count++;
+    ?>
+	<div id="p<?php echo $post['id'] ?>" class="blockpost<?php if ($post['id'] == $cur_topic['first_post_id']) {
+    echo ' firstpost';
+}
+    ?><?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($post_count == 1) {
+    echo ' blockpost1';
+}
+    ?>">
+		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<div class="postbody">
+					<div class="postleft">
+						<dl>
+							<dt><strong><?php echo $post['poster_disp'] ?></strong></dt>
+							<dd class="usertitle"><strong><?php echo $post['user_title'] ?></strong></dd>
+						</dl>
+					</div>
+					<div class="postright">
+						<h3 class="nosize"><?php _e('Message') ?></h3>
+						<div class="postmsg">
+							<?php echo $post['message']."\n" ?>
+	<?php if ($post['edited'] != '') {
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.Utils::escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
+}
+    ?>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="inbox">
+				<div class="postfoot clearb">
+					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.__('Select').'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.__('Cannot select first').'</p>' ?></div>
+				</div>
+			</div>
+		</div>
+	</div>
+<?php
+
+}
+?>
+
+<div class="postlinksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php _e('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /></p>
+			<div class="clearer"></div>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
+			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
+		</ul>
+		<div class="clearer"></div>
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/view/moderate/split_posts.php b/view/moderate/split_posts.php
new file mode 100644
index 00000000..deace3ab
--- /dev/null
+++ b/view/moderate/split_posts.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Split posts') ?></span></h2>
+	<div class="box">
+		<form id="subject" method="post" action="">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Confirm split legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
+						<label class="required"><strong><?php _e('New subject') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
+						<label><?php _e('Move to') ?>
+						<br /><select name="move_to_forum">
+								<?php echo $list_forums ?>
+							</optgroup>
+						</select>
+						<br /></label>
+						<p><?php _e('Split posts comply') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php _e('Split') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/post.php b/view/post.php
new file mode 100644
index 00000000..a0463de8
--- /dev/null
+++ b/view/post.php
@@ -0,0 +1,211 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="linkst">
+	<div class="inbox">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_posting['forum_name']) ?></a></li>
+<?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo Utils::escape($feather->request->post('req_subject')) ?></li>
+<?php endif; ?>
+<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_posting['subject']) ?></a></li>
+<?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
+		</ul>
+	</div>
+</div>
+
+<?php
+
+// If there are errors, we display them
+if (!empty($errors)) {
+    ?>
+<div id="posterror" class="block">
+	<h2><span><?php _e('Post errors') ?></span></h2>
+	<div class="box">
+		<div class="inbox error-info">
+			<p><?php _e('Post errors info') ?></p>
+			<ul class="error-list">
+<?php
+
+    foreach ($errors as $cur_error) {
+        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+    }
+    ?>
+			</ul>
+		</div>
+	</div>
+</div>
+
+<?php
+
+} elseif ($feather->request->post('preview')) {
+    $preview_message = $feather->parser->parse_message($post['message'], $post['hide_smilies']);
+?>
+<div id="postpreview" class="blockpost">
+	<h2><span><?php _e('Post preview') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<div class="postbody">
+				<div class="postright">
+					<div class="postmsg">
+						<?php echo $preview_message."\n" ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<?php
+
+}
+
+
+$cur_index = 1;
+
+?>
+<!-- Init BBcode editor toolbar -->
+<script>
+    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
+        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
+</script>
+<script src="<?php echo Url::base() ?>/style/imports/bbeditor.js"></script>
+
+<div id="postform" class="blockform">
+	<h2><span><?php echo $action ?></span></h2>
+	<div class="box">
+		<?php echo $form."\n" ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Write message legend') ?></legend>
+					<div class="infldset txtarea">
+						<input type="hidden" name="form_sent" value="1" />
+                                                <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+<?php
+if ($feather->user->is_guest) {
+    $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+    $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
+    ?>
+						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
+    echo Utils::escape($post['username']);
+}
+    ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
+    echo Utils::escape($post['email']);
+}
+    ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<div class="clearer"></div>
+<?php
+
+}
+if ($fid): ?>
+						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
+    echo Utils::escape($post['subject']);
+} ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
+                        <script>postEditorToolbar('req_message');</script>
+						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? $feather->utils->linebreaks($feather->utils->trim(Utils::escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
+						<ul class="bblinks">
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
+						</ul>
+					</div>
+				</fieldset>
+<?php
+if (!empty($checkboxes)) {
+    ?>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Options') ?></legend>
+					<div class="infldset">
+						<div class="rbox">
+							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
+						</div>
+					</div>
+				</fieldset>
+<?php
+
+}
+
+?>
+			</div>
+			<?php if ($feather->user->is_guest) : ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Robot title') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Robot info')    ?></p>
+						<label class="required"><strong><?php
+                             $question = array_keys($lang_antispam_questions);
+                             $qencoded = md5($question[$index_questions]);
+                             echo sprintf(__('Robot question'), $question[$index_questions]);?>
+							 <span><?php _e('Required') ?></span></strong>
+							 <br />
+							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
+						</label>
+					</div>
+				</fieldset>
+			</div>
+			<?php endif; ?>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
+
+
+<?php
+if ($tid && $feather->forum_settings['o_topic_review'] != '0') :
+?>
+<div id="postreview">
+	<h2><span><?php _e('Topic review') ?></span></h2>
+
+	<?php
+    // Set background switching on
+    $post_count = 0;
+
+    foreach ($post_data as $post) {
+        ++$post_count;
+        ?>
+	<div class="blockpost">
+	<div class="box<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?>">
+		<div class="inbox">
+			<div class="postbody">
+				<div class="postleft">
+					<dl>
+						<dt><strong><?php echo Utils::escape($post['poster']) ?></strong></dt>
+						<dd><span><?php echo $feather->utils->format_time($post['posted']) ?></span></dd>
+					</dl>
+				</div>
+				<div class="postright">
+					<div class="postmsg">
+						<?php echo $post['message']."\n" ?>
+					</div>
+				</div>
+			</div>
+			<div class="clearer"></div>
+		</div>
+	</div>
+</div>
+	<?php
+
+    }
+    ?>
+
+</div>
+<?php endif;?>
diff --git a/view/profile/change_mail.php b/view/profile/change_mail.php
new file mode 100644
index 00000000..5615524d
--- /dev/null
+++ b/view/profile/change_mail.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Change email') ?></span></h2>
+	<div class="box">
+		<form id="change_email" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Email legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<label class="required"><strong><?php _e('New email') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
+						<label class="required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
+						<p><?php _e('Email instructions') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="new_email" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/profile/change_pass.php b/view/profile/change_pass.php
new file mode 100644
index 00000000..ac61d979
--- /dev/null
+++ b/view/profile/change_pass.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Change pass') ?></span></h2>
+	<div class="box">
+		<form id="change_pass" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<input type="hidden" name="form_sent" value="1" />
+				<fieldset>
+					<legend><?php _e('Change pass legend') ?></legend>
+					<div class="infldset">
+<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php _e('Old pass') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input type="password" name="req_old_password" size="16" /><br /></label>
+<?php endif; ?>						<label class="conl required"><strong><?php _e('New pass') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input type="password" name="req_new_password1" size="16" /><br /></label>
+						<label class="conl required"><strong><?php _e('Confirm new pass') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input type="password" name="req_new_password2" size="16" /><br /></label>
+						<p class="clearb"><?php _e('Pass info') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/profile/delete_user.php b/view/profile/delete_user.php
new file mode 100644
index 00000000..831b29ab
--- /dev/null
+++ b/view/profile/delete_user.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Confirm delete user') ?></span></h2>
+	<div class="box">
+		<form id="confirm_del_user" method="post" action="<?php echo $feather->url->get('user/'.$id.'/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Confirm delete legend') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Confirmation info').' <strong>'.Utils::escape($username).'</strong>.' ?></p>
+						<div class="rbox">
+							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
+						</div>
+						<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/profile/menu.php b/view/profile/menu.php
new file mode 100644
index 00000000..e3714a6e
--- /dev/null
+++ b/view/profile/menu.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="profile" class="block2col">
+	<div class="blockmenu">
+		<h2><span><?php _e('Profile menu') ?></span></h2>
+		<div class="box">
+			<div class="inbox">
+				<ul>
+					<li<?php if ($page == 'essentials') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
+					<li<?php if ($page == 'personal') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
+					<li<?php if ($page == 'messaging') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
+<?php if ($feather->forum_settings['o_avatars'] == '1' || $feather->forum_settings['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
+<?php endif;
+    ?>					<li<?php if ($page == 'display') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
+					<li<?php if ($page == 'privacy') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
+<?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
+    echo ' class="isactive"';
+}
+    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
+<?php endif;
+    ?>				</ul>
+			</div>
+		</div>
+	</div>
diff --git a/view/profile/section_admin.php b/view/profile/section_admin.php
new file mode 100644
index 00000000..d1aa1aa3
--- /dev/null
+++ b/view/profile/section_admin.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+	<div class="blockform">
+		<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section admin') ?></span></h2>
+		<div class="box">
+			<form id="profile7" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>">
+				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+				<div class="inform">
+				<input type="hidden" name="form_sent" value="1" />
+					<fieldset>
+<?php
+
+        if ($feather->user->g_moderator == '1') {
+            ?>
+						<legend><?php _e('Delete ban legend') ?></legend>
+						<div class="infldset">
+							<p><input type="submit" name="ban" value="<?php _e('Ban user') ?>" /></p>
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+        } else {
+            if ($feather->user->id != $id) {
+                ?>
+						<legend><?php _e('Group membership legend') ?></legend>
+						<div class="infldset">
+							<select id="group_id" name="group_id">
+                                                            <?php echo $group_list ?>
+							</select>
+							<input type="submit" name="update_group_membership" value="<?php _e('Save') ?>" />
+						</div>
+					</fieldset>
+				</div>
+				<div class="inform">
+					<fieldset>
+<?php
+
+            }
+
+            ?>
+						<legend><?php _e('Delete ban legend') ?></legend>
+						<div class="infldset">
+							<input type="submit" name="delete_user" value="<?php _e('Delete user') ?>" /> <input type="submit" name="ban" value="<?php _e('Ban user') ?>" />
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+            if ($user['g_moderator'] == '1' || $user['g_id'] == FEATHER_ADMIN) {
+                ?>
+				<div class="inform">
+					<fieldset>
+						<legend><?php _e('Set mods legend') ?></legend>
+						<div class="infldset">
+							<p><?php _e('Moderator in info') ?></p>
+                                                        <?php echo $forum_list ?>
+								</div>
+							</div>
+							<br class="clearb" /><input type="submit" name="update_forums" value="<?php _e('Update forums') ?>" />
+						</div>
+					</fieldset>
+				</div>
+<?php
+
+            }
+        }
+
+?>
+			</form>
+		</div>
+	</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
new file mode 100644
index 00000000..b806efd2
--- /dev/null
+++ b/view/profile/section_display.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section display') ?></span></h2>
+	<div class="box">
+		<form id="profile5" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div><input type="hidden" name="form_sent" value="1" /></div>
+<?php
+
+    $styles = \FeatherBB\Core\Lister::getStyles();
+
+    // Only display the style selection box if there's more than one style available
+    if (count($styles) == 1) {
+        echo "\t\t\t".'<div><input type="hidden" name="form_style" value="'.$styles[0].'" /></div>'."\n";
+    } elseif (count($styles) > 1) {
+        ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Style legend') ?></legend>
+					<div class="infldset">
+						<label><?php _e('Styles') ?><br />
+						<select name="form_style">
+<?php
+
+        foreach ($styles as $temp) {
+            if ($user['style'] == $temp) {
+                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.str_replace('_', ' ', $temp).'</option>'."\n";
+            } else {
+                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.str_replace('_', ' ', $temp).'</option>'."\n";
+            }
+        }
+
+        ?>
+						</select>
+						<br /></label>
+					</div>
+				</fieldset>
+			</div>
+<?php
+
+    }
+
+?>
+<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1' || $feather->forum_settings['o_signatures'] == '1' || $feather->forum_settings['o_avatars'] == '1' || ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1')): ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Post display legend') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Post display info') ?></p>
+						<div class="rbox">
+<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Show smilies') ?><br /></label>
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Show sigs') ?><br /></label>
+<?php endif; if ($feather->forum_settings['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Show avatars') ?><br /></label>
+<?php endif; if ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Show images') ?><br /></label>
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1' && $feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Show images sigs') ?><br /></label>
+<?php endif; ?>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Pagination legend') ?></legend>
+					<div class="infldset">
+						<label class="conl"><?php _e('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
+						<label class="conl"><?php _e('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
+						<p class="clearb"><?php _e('Paginate info') ?> <?php _e('Leave blank') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
diff --git a/view/profile/section_essentials.php b/view/profile/section_essentials.php
new file mode 100644
index 00000000..6ea2940b
--- /dev/null
+++ b/view/profile/section_essentials.php
@@ -0,0 +1,258 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section essentials') ?></span></h2>
+	<div class="box">
+		<form id="profile1" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Username and pass legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<?php echo $user_disp['username_field'] ?>
+<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
+<?php endif; ?>						</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Email legend') ?></legend>
+					<div class="infldset">
+						<?php echo $user_disp['email_field'] ?>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Localisation legend') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Time zone info') ?></p>
+						<label><?php _e('Time zone')."\n" ?>
+						<br /><select name="form_timezone">
+							<option value="-12"<?php if ($user['timezone'] == -12) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-12:00') ?></option>
+							<option value="-11"<?php if ($user['timezone'] == -11) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-11:00') ?></option>
+							<option value="-10"<?php if ($user['timezone'] == -10) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-10:00') ?></option>
+							<option value="-9.5"<?php if ($user['timezone'] == -9.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-09:30') ?></option>
+							<option value="-9"<?php if ($user['timezone'] == -9) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-09:00') ?></option>
+							<option value="-8.5"<?php if ($user['timezone'] == -8.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-08:30') ?></option>
+							<option value="-8"<?php if ($user['timezone'] == -8) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-08:00') ?></option>
+							<option value="-7"<?php if ($user['timezone'] == -7) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-07:00') ?></option>
+							<option value="-6"<?php if ($user['timezone'] == -6) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-06:00') ?></option>
+							<option value="-5"<?php if ($user['timezone'] == -5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-05:00') ?></option>
+							<option value="-4"<?php if ($user['timezone'] == -4) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-04:00') ?></option>
+							<option value="-3.5"<?php if ($user['timezone'] == -3.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-03:30') ?></option>
+							<option value="-3"<?php if ($user['timezone'] == -3) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-03:00') ?></option>
+							<option value="-2"<?php if ($user['timezone'] == -2) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-02:00') ?></option>
+							<option value="-1"<?php if ($user['timezone'] == -1) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC-01:00') ?></option>
+							<option value="0"<?php if ($user['timezone'] == 0) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC') ?></option>
+							<option value="1"<?php if ($user['timezone'] == 1) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+01:00') ?></option>
+							<option value="2"<?php if ($user['timezone'] == 2) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+02:00') ?></option>
+							<option value="3"<?php if ($user['timezone'] == 3) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+03:00') ?></option>
+							<option value="3.5"<?php if ($user['timezone'] == 3.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+03:30') ?></option>
+							<option value="4"<?php if ($user['timezone'] == 4) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+04:00') ?></option>
+							<option value="4.5"<?php if ($user['timezone'] == 4.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+04:30') ?></option>
+							<option value="5"<?php if ($user['timezone'] == 5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+05:00') ?></option>
+							<option value="5.5"<?php if ($user['timezone'] == 5.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+05:30') ?></option>
+							<option value="5.75"<?php if ($user['timezone'] == 5.75) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+05:45') ?></option>
+							<option value="6"<?php if ($user['timezone'] == 6) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+06:00') ?></option>
+							<option value="6.5"<?php if ($user['timezone'] == 6.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+06:30') ?></option>
+							<option value="7"<?php if ($user['timezone'] == 7) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+07:00') ?></option>
+							<option value="8"<?php if ($user['timezone'] == 8) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+08:00') ?></option>
+							<option value="8.75"<?php if ($user['timezone'] == 8.75) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+08:45') ?></option>
+							<option value="9"<?php if ($user['timezone'] == 9) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+09:00') ?></option>
+							<option value="9.5"<?php if ($user['timezone'] == 9.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+09:30') ?></option>
+							<option value="10"<?php if ($user['timezone'] == 10) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+10:00') ?></option>
+							<option value="10.5"<?php if ($user['timezone'] == 10.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+10:30') ?></option>
+							<option value="11"<?php if ($user['timezone'] == 11) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+11:00') ?></option>
+							<option value="11.5"<?php if ($user['timezone'] == 11.5) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+11:30') ?></option>
+							<option value="12"<?php if ($user['timezone'] == 12) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+12:00') ?></option>
+							<option value="12.75"<?php if ($user['timezone'] == 12.75) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+12:45') ?></option>
+							<option value="13"<?php if ($user['timezone'] == 13) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+13:00') ?></option>
+							<option value="14"<?php if ($user['timezone'] == 14) {
+    echo ' selected="selected"';
+} ?>><?php _e('UTC+14:00') ?></option>
+						</select>
+						<br /></label>
+						<div class="rbox">
+							<label><input type="checkbox" name="form_dst" value="1"<?php if ($user['dst'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('DST') ?><br /></label>
+						</div>
+						<label><?php _e('Time format') ?>
+
+						<br /><select name="form_time_format">
+<?php
+                            foreach (array_unique($forum_time_formats) as $key => $time_format) {
+                                echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
+                                if ($user['time_format'] == $key) {
+                                    echo ' selected="selected"';
+                                }
+                                echo '>'. $feather->utils->format_time(time(), false, null, $time_format, true, true);
+                                if ($key == 0) {
+                                    echo ' ('.__('Default').')';
+                                }
+                                echo "</option>\n";
+                            }
+                            ?>
+						</select>
+						<br /></label>
+						<label><?php _e('Date format') ?>
+
+						<br /><select name="form_date_format">
+<?php
+                            foreach (array_unique($forum_date_formats) as $key => $date_format) {
+                                echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
+                                if ($user['date_format'] == $key) {
+                                    echo ' selected="selected"';
+                                }
+                                echo '>'. $feather->utils->format_time(time(), true, $date_format, null, false, true);
+                                if ($key == 0) {
+                                    echo ' ('.__('Default').')';
+                                }
+                                echo "</option>\n";
+                            }
+                            ?>
+						</select>
+						<br /></label>
+
+<?php
+
+    $languages = \FeatherBB\Core\Lister::getLangs();
+
+    // Only display the language selection box if there's more than one language available
+    if (count($languages) > 1) {
+        ?>
+						<label><?php _e('Language') ?>
+						<br /><select name="form_language">
+<?php
+
+        foreach ($languages as $temp) {
+            if ($user['language'] == $temp) {
+                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
+            } else {
+                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
+            }
+        }
+
+        ?>
+						</select>
+						<br /></label>
+<?php
+
+    }
+
+?>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('User activity') ?></legend>
+					<div class="infldset">
+						<p><?php printf(__('Registered info'), $feather->utils->format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.Utils::escape($user['registration_ip']).'</a>)' : '')) ?></p>
+						<p><?php printf(__('Last post info'), $feather->utils->format_time($user['last_post'])) ?></p>
+						<p><?php printf(__('Last visit info'), $feather->utils->format_time($user['last_visit'])) ?></p>
+						<?php echo $user_disp['posts_field'] ?>
+<?php if ($feather->user->is_admmod): ?>							<label><?php _e('Admin note') ?><br />
+						<input id="admin_note" type="text" name="admin_note" value="<?php echo Utils::escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
+<?php endif; ?>						</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
diff --git a/view/profile/section_messaging.php b/view/profile/section_messaging.php
new file mode 100644
index 00000000..18ec791c
--- /dev/null
+++ b/view/profile/section_messaging.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section messaging') ?></span></h2>
+	<div class="box">
+		<form id="profile3" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Contact details legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo Utils::escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
+						<label><?php _e('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
+						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo Utils::escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
+						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo Utils::escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
+						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo Utils::escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/profile/section_personal.php b/view/profile/section_personal.php
new file mode 100644
index 00000000..75e5df5e
--- /dev/null
+++ b/view/profile/section_personal.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personal') ?></span></h2>
+	<div class="box">
+		<form id="profile2" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Personal details legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo Utils::escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
+<?php if (isset($title_field)): ?>							<?php echo $title_field ?>
+<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo Utils::escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo Utils::escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/profile/section_personality.php b/view/profile/section_personality.php
new file mode 100644
index 00000000..b1c3416d
--- /dev/null
+++ b/view/profile/section_personality.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personality') ?></span></h2>
+	<div class="box">
+		<form id="profile4" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div><input type="hidden" name="form_sent" value="1" /></div>
+<?php if ($feather->forum_settings['o_avatars'] == '1'): ?>				<div class="inform">
+				<fieldset id="profileavatar">
+					<legend><?php _e('Avatar legend') ?></legend>
+					<div class="infldset">
+<?php if ($user_avatar): ?>							<div class="useravatar"><?php echo $user_avatar ?></div>
+<?php endif; ?>							<p><?php _e('Avatar info') ?></p>
+						<p class="clearb actions"><?php echo $avatar_field ?></p>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>				<div class="inform">
+				<fieldset>
+					<legend><?php _e('Signature legend') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Signature info') ?></p>
+						<div class="txtarea">
+							<label><?php printf(__('Sig max size'), Utils::forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
+							<textarea name="signature" rows="4" cols="65"><?php echo Utils::escape($user['signature']) ?></textarea><br /></label>
+						</div>
+						<ul class="bblinks">
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
+						</ul>
+						<?php echo $signature_preview ?>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
diff --git a/view/profile/section_privacy.php b/view/profile/section_privacy.php
new file mode 100644
index 00000000..d501cd49
--- /dev/null
+++ b/view/profile/section_privacy.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section privacy') ?></span></h2>
+	<div class="box">
+		<form id="profile6" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Privacy options legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<p><?php _e('Email setting info') ?></p>
+						<div class="rbox">
+							<label><input type="radio" name="form_email_setting" value="0"<?php if ($user['email_setting'] == '0') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Email setting 1') ?><br /></label>
+							<label><input type="radio" name="form_email_setting" value="1"<?php if ($user['email_setting'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Email setting 2') ?><br /></label>
+							<label><input type="radio" name="form_email_setting" value="2"<?php if ($user['email_setting'] == '2') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Email setting 3') ?><br /></label>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1' || $feather->forum_settings['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
+				<fieldset>
+					<legend><?php _e('Subscription legend') ?></legend>
+					<div class="infldset">
+						<div class="rbox">
+							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Notify full') ?><br /></label>
+<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
+    echo ' checked="checked"';
+} ?> /><?php _e('Auto notify full') ?><br /></label>
+<?php endif; ?>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
+		</form>
+	</div>
+</div>
+	<div class="clearer"></div>
+</div>
\ No newline at end of file
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
new file mode 100644
index 00000000..44de1b15
--- /dev/null
+++ b/view/profile/upload_avatar.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+	exit;
+}
+
+?>
+<div class="blockform">
+	<h2><span><?php _e('Upload avatar') ?></span></h2>
+	<div class="box">
+		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo $feather->url->get('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Upload avatar legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
+						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
+						<p><?php _e('Avatar desc'); echo ' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.Utils::forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.$feather->utils->file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="upload" value="<?php _e('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
diff --git a/view/profile/view_profile.php b/view/profile/view_profile.php
new file mode 100644
index 00000000..9e65b5f5
--- /dev/null
+++ b/view/profile/view_profile.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="viewprofile" class="block">
+	<h2><span><?php _e('Profile') ?></span></h2>
+	<div class="box">
+		<div class="fakeform">
+			<div class="inform">
+				<fieldset>
+				<legend><?php _e('Section personal') ?></legend>
+					<div class="infldset">
+						<dl>
+							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personal'])."\n" ?>
+						</dl>
+						<div class="clearer"></div>
+					</div>
+				</fieldset>
+			</div>
+<?php if (!empty($user_info['messaging'])): ?>			<div class="inform">
+				<fieldset>
+				<legend><?php _e('Section messaging') ?></legend>
+					<div class="infldset">
+						<dl>
+							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['messaging'])."\n" ?>
+						</dl>
+						<div class="clearer"></div>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; if (!empty($user_info['personality'])): ?>			<div class="inform">
+				<fieldset>
+				<legend><?php _e('Section personality') ?></legend>
+					<div class="infldset">
+						<dl>
+							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personality'])."\n" ?>
+						</dl>
+						<div class="clearer"></div>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; ?>			<div class="inform">
+				<fieldset>
+				<legend><?php _e('User activity') ?></legend>
+					<div class="infldset">
+						<dl>
+							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['activity'])."\n" ?>
+						</dl>
+						<div class="clearer"></div>
+					</div>
+				</fieldset>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/register/email.php b/view/register/email.php
new file mode 100644
index 00000000..b15593b2
--- /dev/null
+++ b/view/register/email.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div id="emailform" class="blockform">
+	<h2><span><?php _e('Send email to') ?> <?php echo Utils::escape($recipient) ?></span></h2>
+	<div class="box">
+		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Write email') ?></legend>
+					<div class="infldset txtarea">
+						<input type="hidden" name="form_sent" value="1" />
+						<input type="hidden" name="redirect_url" value="<?php echo Utils::escape($redirect_url) ?>" />
+						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
+						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
+						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
+						<p><?php _e('Email disclosure note') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/register/form.php b/view/register/form.php
new file mode 100644
index 00000000..6d3b36bb
--- /dev/null
+++ b/view/register/form.php
@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+// If there are errors, we display them
+if (!empty($errors)) {
+    ?>
+<div id="posterror" class="block">
+	<h2><span><?php _e('Registration errors') ?></span></h2>
+	<div class="box">
+		<div class="inbox error-info">
+			<p><?php _e('Registration errors info') ?></p>
+			<ul class="error-list">
+<?php
+
+    foreach ($errors as $cur_error) {
+        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
+    }
+    ?>
+			</ul>
+		</div>
+	</div>
+</div>
+
+<?php
+
+}
+?>
+<div id="regform" class="blockform">
+	<h2><span><?php _e('Register') ?></span></h2>
+	<div class="box">
+		<form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
+		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<div class="forminfo">
+					<h3><?php _e('Important information') ?></h3>
+					<p><?php _e('Desc 1') ?></p>
+					<p><?php _e('Desc 2') ?></p>
+				</div>
+				<fieldset>
+					<legend><?php _e('Username legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="form_sent" value="1" />
+						<input type="hidden" name="username" value="" />
+						<input type="hidden" name="password" value="" />
+						<label class="required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
+    echo Utils::escape($feather->request->post('req_user'));
+} ?>" size="25" maxlength="25" /><br /></label>
+					</div>
+				</fieldset>
+			</div>
+<?php if ($feather->forum_settings['o_regs_verify'] == '0'): ?>			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Pass legend') ?></legend>
+					<div class="infldset">
+						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
+    echo Utils::escape($feather->request->post('req_password1'));
+} ?>" size="16" /><br /></label>
+						<label class="conl required"><strong><?php _e('Confirm pass') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
+    echo Utils::escape($feather->request->post('req_password2'));
+} ?>" size="16" /><br /></label>
+						<p class="clearb"><?php _e('Pass info') ?></p>
+					</div>
+				</fieldset>
+			</div>
+<?php endif; ?>			<div class="inform">
+				<fieldset>
+					<legend><?php echo($feather->forum_settings['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
+					<div class="infldset">
+<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
+<?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
+    echo Utils::escape($feather->request->post('req_email1'));
+} ?>" size="50" maxlength="80" /><br /></label>
+<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
+						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
+    echo Utils::escape($feather->request->post('req_email2'));
+} ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>					</div>
+				</fieldset>
+			</div>
+<?php
+        // Only display the language selection box if there's more than one language available
+        if (count($languages) > 1) {
+            ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Localisation legend') ?></legend>
+					<div class="infldset">
+							<label><?php _e('Language') ?>
+							<br /><select name="language">
+<?php
+
+            foreach ($languages as $temp) {
+                if ($feather->forum_settings['o_default_lang'] == $temp) {
+                    echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
+                } else {
+                    echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
+                }
+            }
+
+            ?>
+							</select>
+							<br /></label>
+					</div>
+				</fieldset>
+			</div>
+<?php
+
+        }
+?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Robot title') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Robot info')    ?></p>
+						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php _e('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="register" value="<?php _e('Register') ?>" /></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/register/rules.php b/view/register/rules.php
new file mode 100644
index 00000000..9eae40df
--- /dev/null
+++ b/view/register/rules.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div id="rules" class="blockform">
+	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
+	<div class="box">
+		<form method="get" action="<?php echo $feather->url->get('register/') ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Rules legend') ?></legend>
+					<div class="infldset">
+						<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="agree" value="<?php _e('Agree') ?>" /> <input type="submit" name="cancel" value="<?php _e('Cancel') ?>" /></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/search/footer.php b/view/search/footer.php
new file mode 100644
index 00000000..05e8d654
--- /dev/null
+++ b/view/search/footer.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+if ($search['show_as'] == 'topics') :
+?>
+			</tbody>
+		</table>
+		</div>
+	</div>
+</div>
+
+<?php
+endif;
+?>
+
+<div class="postlinksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
+		</ul>
+<?php echo(!empty($search['forum_actions']) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $search['forum_actions']).'</p>'."\n" : '') ?>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/search/form.php b/view/search/form.php
new file mode 100644
index 00000000..8b47e40f
--- /dev/null
+++ b/view/search/form.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div id="searchform" class="blockform">
+	<h2><span><?php _e('Search') ?></span></h2>
+	<div class="box">
+		<form id="search" method="get" action="">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Search criteria legend') ?></legend>
+					<div class="infldset">
+						<input type="hidden" name="action" value="search" />
+						<label class="conl"><?php _e('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
+						<label class="conl"><?php _e('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
+						<p class="clearb"><?php _e('Search info') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Search in legend') ?></legend>
+					<div class="infldset">
+					<?php echo $forums ?>
+						<label class="conl"><?php _e('Search in')."\n" ?>
+						<br /><select id="search_in" name="search_in">
+							<option value="0"><?php _e('Message and subject') ?></option>
+							<option value="1"><?php _e('Message only') ?></option>
+							<option value="-1"><?php _e('Topic only') ?></option>
+						</select>
+						<br /></label>
+						<p class="clearl"><?php _e('Search in info') ?></p>
+<?php echo($feather->forum_settings['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
+					</div>
+				</fieldset>
+			</div>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Search results legend') ?></legend>
+					<div class="infldset">
+						<label class="conl"><?php _e('Sort by')."\n" ?>
+						<br /><select name="sort_by">
+							<option value="0"><?php _e('Sort by post time') ?></option>
+							<option value="1"><?php _e('Sort by author') ?></option>
+							<option value="2"><?php _e('Sort by subject') ?></option>
+							<option value="3"><?php _e('Sort by forum') ?></option>
+						</select>
+						<br /></label>
+						<label class="conl"><?php _e('Sort order')."\n" ?>
+						<br /><select name="sort_dir">
+							<option value="DESC"><?php _e('Descending') ?></option>
+							<option value="ASC"><?php _e('Ascending') ?></option>
+						</select>
+						<br /></label>
+						<label class="conl"><?php _e('Show as')."\n" ?>
+						<br /><select name="show_as">
+							<option value="topics"><?php _e('Show as topics') ?></option>
+							<option value="posts"><?php _e('Show as posts') ?></option>
+						</select>
+						<br /></label>
+						<p class="clearb"><?php _e('Search results info') ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/search/header.php b/view/search/header.php
new file mode 100644
index 00000000..2299e454
--- /dev/null
+++ b/view/search/header.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
+			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<?php
+if ($search['show_as'] == 'topics') :
+?>
+<div id="vf" class="blocktable">
+	<h2><span><?php _e('Search results') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
+					<th class="tc2" scope="col"><?php _e('Forum') ?></th>
+					<th class="tc3" scope="col"><?php _e('Replies') ?></th>
+					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+<?php
+endif;
diff --git a/view/search/posts.php b/view/search/posts.php
new file mode 100644
index 00000000..39f20c24
--- /dev/null
+++ b/view/search/posts.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="blockpost<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($cur_search['pid'] == $cur_search['first_post_id']) {
+    echo ' firstpost';
+} ?><?php if ($post_count == 1) {
+    echo ' blockpost1';
+} ?><?php if ($cur_search['item_status'] != '') {
+    echo ' '.$cur_search['item_status'];
+} ?>">
+<h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
+    _e('Re').' ';
+} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
+<div class="box">
+	<div class="inbox">
+		<div class="postbody">
+			<div class="postleft">
+				<dl>
+					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
+<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.Utils::forum_number_format($cur_search['num_replies']) ?></span></dd>
+<?php endif; ?>
+					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
+				</dl>
+			</div>
+			<div class="postright">
+				<div class="postmsg">
+					<?php echo $cur_search['message']."\n" ?>
+				</div>
+			</div>
+			<div class="clearer"></div>
+		</div>
+	</div>
+	<div class="inbox">
+		<div class="postfoot clearb">
+			<div class="postfootright">
+				<ul>
+					<li><span><a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
+					<li><span><a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/view/search/topics.php b/view/search/topics.php
new file mode 100644
index 00000000..7549c3f3
--- /dev/null
+++ b/view/search/topics.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<tr class="<?php echo $cur_search['item_status'] ?>">
+	<td class="tcl">
+		<div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo Utils::forum_number_format($topic_count + $start_from) ?></div></div>
+		<div class="tclcon">
+			<div>
+				<?php echo $subject."\n" ?>
+			</div>
+		</div>
+	</td>
+	<td class="tc2"><?php echo $forum ?></td>
+	<td class="tc3"><?php echo Utils::forum_number_format($cur_search['num_replies']) ?></td>
+	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.$feather->utils->format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_search['last_poster']) ?></span></td>
+</tr>
\ No newline at end of file
diff --git a/view/userlist.php b/view/userlist.php
new file mode 100644
index 00000000..911df592
--- /dev/null
+++ b/view/userlist.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+ 
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+?>
+
+<div class="blockform">
+	<h2><span><?php _e('User search') ?></span></h2>
+	<div class="box">
+		<form id="userlist" method="get" action="">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('User find legend') ?></legend>
+					<div class="infldset">
+<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo Utils::escape($username) ?>" size="25" maxlength="25" /><br /></label>
+<?php endif; ?>						<label class="conl"><?php _e('User group')."\n" ?>
+						<br /><select name="show_group">
+							<option value="-1"<?php if ($show_group == -1) {
+    echo ' selected="selected"';
+} ?>><?php _e('All users') ?></option>
+<?php echo $dropdown_menu ?>
+						</select>
+						<br /></label>
+						<label class="conl"><?php _e('Sort by')."\n" ?>
+						<br /><select name="sort_by">
+							<option value="username"<?php if ($sort_by == 'username') {
+    echo ' selected="selected"';
+} ?>><?php _e('Username') ?></option>
+							<option value="registered"<?php if ($sort_by == 'registered') {
+    echo ' selected="selected"';
+} ?>><?php _e('Registered') ?></option>
+<?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
+    echo ' selected="selected"';
+} ?>><?php _e('No of posts') ?></option>
+<?php endif; ?>						</select>
+						<br /></label>
+						<label class="conl"><?php _e('Sort order')."\n" ?>
+						<br /><select name="sort_dir">
+							<option value="ASC"<?php if ($sort_dir == 'ASC') {
+    echo ' selected="selected"';
+} ?>><?php _e('Ascending') ?></option>
+							<option value="DESC"<?php if ($sort_dir == 'DESC') {
+    echo ' selected="selected"';
+} ?>><?php _e('Descending') ?></option>
+						</select>
+						<br /></label>
+						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? __('User search info').' ' : '').__('User sort info'); ?></p>
+					</div>
+				</fieldset>
+			</div>
+			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
+		</form>
+	</div>
+</div>
+
+<div class="linkst">
+	<div class="inbox">
+		<p class="pagelink"><?php echo $paging_links ?></p>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<div id="users1" class="blocktable">
+	<h2><span><?php _e('User list') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Username') ?></th>
+					<th class="tc2" scope="col"><?php _e('Title') ?></th>
+<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Registered') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+			<?php
+            foreach ($userlist_data as $user) {
+                ?>
+					<tr>
+						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
+						<td class="tc2"><?php echo get_title($user) ?></td>
+	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
+	<?php endif;
+                ?>
+						<td class="tcr"><?php echo $feather->utils->format_time($user['registered'], true) ?></td>
+					</tr>
+			<?php
+
+            }
+            if (empty($userlist_data)) {
+                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.__('No hits').'</td></tr>'."\n";
+            }
+            ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox">
+		<p class="pagelink"><?php echo $paging_links ?></p>
+		<div class="clearer"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/view/viewforum.php b/view/viewforum.php
new file mode 100644
index 00000000..79bd70a1
--- /dev/null
+++ b/view/viewforum.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+<?php echo $post_link ?>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<div id="vf" class="blocktable">
+	<h2><span><?php echo Utils::escape($cur_forum['forum_name']) ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<table>
+			<thead>
+				<tr>
+					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
+					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
+<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
+<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+			<?php
+            $topic_count = 0;
+            foreach ($forum_data as $topic) {
+                ++$topic_count;
+                ?>
+					<tr class="<?php echo $topic['item_status'] ?>">
+						<td class="tcl">
+							<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo Utils::forum_number_format($topic_count + $start_from) ?></div></div>
+							<div class="tclcon">
+								<div>
+									<?php echo $topic['subject_formatted']."\n" ?>
+								</div>
+							</div>
+						</td>
+						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? Utils::forum_number_format($topic['num_replies']) : '-' ?></td>
+	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? Utils::forum_number_format($topic['num_views']) : '-' ?></td>
+	<?php endif;
+                ?>					<td class="tcr"><?php echo $topic['last_post_formatted'] ?></td>
+					</tr>
+			<?php
+
+            }
+            if (empty($forum_data)):
+            ?>
+					<tr class="rowodd inone">
+						<td class="tcl" colspan="<?php echo($feather->forum_settings['o_topic_views'] == 1) ? 4 : 3 ?>">
+							<div class="icon inone"><div class="nosize"><!-- --></div></div>
+							<div class="tclcon">
+								<div>
+									<strong><?php _e('Empty forum') ?></strong>
+								</div>
+							</div>
+						</td>
+					</tr>
+			<?php
+            endif;
+            ?>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
+<div class="linksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+<?php echo $post_link ?>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
+		</ul>
+<?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
+		<div class="clearer"></div>
+	</div>
+</div>
diff --git a/view/viewtopic.php b/view/viewtopic.php
new file mode 100644
index 00000000..83087f66
--- /dev/null
+++ b/view/viewtopic.php
@@ -0,0 +1,204 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+
+<div class="linkst">
+	<div class="inbox crumbsplus">
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
+		</ul>
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+<?php echo $post_link ?>
+		</div>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<?php
+$post_count = 1;
+foreach ($post_data as $post) {
+    ?>
+<div id="p<?php echo $post['id'] ?>" class="blockpost<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($post['id'] == $cur_topic['first_post_id']) {
+    echo ' firstpost';
+}
+    ?><?php if ($post_count == 1) {
+    echo ' blockpost1';
+}
+    ?>">
+	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<div class="postbody">
+				<div class="postleft">
+					<dl>
+						<dt><strong><?php echo $post['username_formatted'] ?></strong></dt>
+						<dd class="usertitle"><strong><?php echo $post['user_title_formatted'] ?></strong></dd>
+<?php if ($post['user_avatar'] != '') {
+    echo "\t\t\t\t\t\t".'<dd class="postavatar">'.$post['user_avatar'].'</dd>'."\n";
+}
+    ?>
+<?php if (count($post['user_info'])) {
+    echo "\t\t\t\t\t\t".implode("\n\t\t\t\t\t\t", $post['user_info'])."\n";
+}
+    ?>
+<?php if (count($post['user_contacts'])) {
+    echo "\t\t\t\t\t\t".'<dd class="usercontacts">'.implode(' ', $post['user_contacts']).'</dd>'."\n";
+}
+    ?>
+					</dl>
+				</div>
+				<div class="postright">
+					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
+    _e('Re').' ';
+}
+    ?><?php echo Utils::escape($cur_topic['subject']) ?></h3>
+					<div class="postmsg">
+						<?php echo $post['message']."\n" ?>
+<?php if ($post['edited'] != '') {
+    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.Utils::escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
+}
+    ?>
+					</div>
+<?php if ($post['signature_formatted'] != '') {
+    echo "\t\t\t\t\t".'<div class="postsignature postmsg"><hr />'.$post['signature_formatted'].'</div>'."\n";
+}
+    ?>
+				</div>
+			</div>
+		</div>
+		<div class="inbox">
+			<div class="postfoot clearb">
+				<div class="postfootleft"><?php if ($post['poster_id'] > 1) {
+    echo '<p>'.$post['is_online_formatted'].'</p>';
+}
+    ?></div>
+<?php if (count($post['post_actions'])) {
+    echo "\t\t\t\t".'<div class="postfootright">'."\n\t\t\t\t\t".'<ul>'."\n\t\t\t\t\t\t".implode("\n\t\t\t\t\t\t", $post['post_actions'])."\n\t\t\t\t\t".'</ul>'."\n\t\t\t\t".'</div>'."\n";
+}
+    ?>
+			</div>
+		</div>
+	</div>
+</div>
+<?php
+    ++$post_count;
+}
+?>
+
+<div class="postlinksb">
+	<div class="inbox crumbsplus">
+		<div class="pagepost">
+			<p class="pagelink conl"><?php echo $paging_links ?></p>
+<?php echo $post_link ?>
+		</div>
+		<ul class="crumbs">
+			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
+			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
+		</ul>
+<?php echo $subscraction ?>
+		<div class="clearer"></div>
+	</div>
+</div>
+
+<?php
+
+// Display quick post if enabled
+if ($quickpost) {
+    $cur_index = 1;
+
+    ?>
+<div id="quickpost" class="blockform">
+	<h2><span><?php _e('Quick post') ?></span></h2>
+	<div class="box">
+		<form id="quickpostform" method="post" action="<?php echo $feather->url->get('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
+			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Write message legend') ?></legend>
+					<div class="infldset txtarea">
+						<input type="hidden" name="form_sent" value="1" />
+						<input type="hidden" name="pid" value="<?php echo Utils::escape($pid) ?>" />
+						<input type="hidden" name="page" value="<?php echo Utils::escape($page_number) ?>" />
+<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
+<?php endif;
+
+    if ($feather->user->is_guest) {
+        $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
+        $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
+        ?>
+						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+						<div class="clearer"></div>
+<?php
+
+    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.__('Message').' <span>'.__('Required').'</span></strong><br />';
+    } else {
+        echo "\t\t\t\t\t\t".'<label>';
+    }
+
+    ?>
+<!-- Init BBcode editor toolbar -->
+<script>
+    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
+        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
+</script>
+<script src="<?php echo Url::base() ?>/style/imports/bbeditor.js"></script>
+<script>postEditorToolbar('req_message');</script>
+
+<textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
+						<ul class="bblinks">
+							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
+    ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
+    ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
+    ?></span></li>
+							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
+    ?></span></li>
+						</ul>
+					</div>
+				</fieldset>
+			</div>
+			<?php if ($feather->user->is_guest) : ?>
+			<div class="inform">
+				<fieldset>
+					<legend><?php _e('Robot title') ?></legend>
+					<div class="infldset">
+						<p><?php _e('Robot info')    ?></p>
+						<label class="required"><strong><?php
+                             $question = array_keys($lang_antispam_questions);
+    $qencoded = md5($question[$index_questions]);
+    echo sprintf(__('Robot question'), $question[$index_questions]);
+    ?>
+							 <span><?php _e('Required') ?></span></strong>
+							 <br />
+							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
+						</label>
+					</div>
+				</fieldset>
+			</div>
+			<?php endif;
+    ?>
+			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php _e('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
+		</form>
+	</div>
+</div>
+<?php
+
+}

From 585bea542b3434f4c185d0db128e3596c1a22ce1 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 7 Sep 2015 13:29:00 +0200
Subject: [PATCH 342/353] Use a fallback for default themes views
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now if themes don’t have a « view » folder, a fallback will load the
default views in FeatherBB core.
Otherwise, views will be overwritten by the current theme.
Of course, themes have to use the same architecture as the default
views folder.
---
 featherbb/Controller/Install.php              |  10 +-
 featherbb/Core/View.php                       |   4 +-
 .../View}/admin/bans/add_ban.php              |   0
 .../View}/admin/bans/admin_bans.php           |   0
 .../View}/admin/bans/search_ban.php           |   0
 .../View}/admin/categories.php                |   0
 .../View}/admin/censoring.php                 |   0
 .../View}/admin/forums/admin_forums.php       |   0
 .../View}/admin/forums/delete_forum.php       |   0
 .../View}/admin/forums/permissions.php        |   0
 .../View}/admin/groups/add_edit_group.php     |   0
 .../View}/admin/groups/admin_groups.php       |   0
 .../View}/admin/groups/confirm_delete.php     |   0
 .../View}/admin/groups/delete_group.php       |   0
 .../view => featherbb/View}/admin/index.php   |   0
 .../view => featherbb/View}/admin/loader.php  |   0
 .../admin/maintenance/admin_maintenance.php   |   0
 .../View}/admin/maintenance/prune.php         |   0
 .../View}/admin/maintenance/rebuild.php       |   0
 .../view => featherbb/View}/admin/menu.php    |   0
 .../view => featherbb/View}/admin/options.php |   0
 .../view => featherbb/View}/admin/parser.php  |   0
 .../View}/admin/permissions.php               |   0
 .../view => featherbb/View}/admin/plugins.php |   0
 .../view => featherbb/View}/admin/reports.php |   0
 .../View}/admin/statistics.php                |   0
 .../View}/admin/users/admin_users.php         |   0
 .../View}/admin/users/ban_users.php           |   0
 .../View}/admin/users/delete_users.php        |   0
 .../View}/admin/users/find_users.php          |   0
 .../View}/admin/users/move_users.php          |   0
 .../View}/admin/users/search_ip.php           |   0
 .../View}/admin/users/show_users.php          |   0
 .../view => featherbb/View}/delete.php        |   0
 .../view => featherbb/View}/edit.php          |   0
 .../view => featherbb/View}/error.php         |   0
 .../view => featherbb/View}/footer.php        |   0
 .../view => featherbb/View}/forum.php         |   0
 .../view => featherbb/View}/header.php        |   0
 .../view => featherbb/View}/help.php          |   0
 .../view => featherbb/View}/index.php         |   0
 .../view => featherbb/View}/install.php       |   0
 .../view => featherbb/View}/login/form.php    |   0
 .../View}/login/password_forgotten.php        |   0
 .../view => featherbb/View}/misc/email.php    |   0
 .../view => featherbb/View}/misc/report.php   |   0
 .../view => featherbb/View}/misc/rules.php    |   0
 .../View}/moderate/delete_posts.php           |   0
 .../View}/moderate/delete_topics.php          |   0
 .../View}/moderate/merge_topics.php           |   0
 .../View}/moderate/moderator_forum.php        |   0
 .../View}/moderate/move_topics.php            |   0
 .../View}/moderate/posts_view.php             |   0
 .../View}/moderate/split_posts.php            |   0
 .../view => featherbb/View}/post.php          |   0
 .../View}/profile/change_mail.php             |   0
 .../View}/profile/change_pass.php             |   0
 .../View}/profile/delete_user.php             |   0
 .../view => featherbb/View}/profile/menu.php  |   0
 .../View}/profile/section_admin.php           |   0
 .../View}/profile/section_display.php         |   0
 .../View}/profile/section_essentials.php      |   0
 .../View}/profile/section_messaging.php       |   0
 .../View}/profile/section_personal.php        |   0
 .../View}/profile/section_personality.php     |   0
 .../View}/profile/section_privacy.php         |   0
 .../View}/profile/upload_avatar.php           |   0
 .../View}/profile/view_profile.php            |   0
 .../View}/register/email.php                  |   0
 .../view => featherbb/View}/register/form.php |   0
 .../View}/register/rules.php                  |   0
 .../view => featherbb/View}/search/footer.php |   0
 .../view => featherbb/View}/search/form.php   |   0
 .../view => featherbb/View}/search/header.php |   0
 .../view => featherbb/View}/search/posts.php  |   0
 .../view => featherbb/View}/search/topics.php |   0
 .../view => featherbb/View}/topic.php         |   0
 .../view => featherbb/View}/userlist.php      |   0
 view/admin/bans/add_ban.php                   |  96 --
 view/admin/bans/admin_bans.php                | 102 ---
 view/admin/bans/search_ban.php                |  87 --
 view/admin/categories.php                     | 111 ---
 view/admin/censoring.php                      |  84 --
 view/admin/forums/admin_forums.php            | 114 ---
 view/admin/forums/delete_forum.php            |  35 -
 view/admin/forums/permissions.php             | 137 ---
 view/admin/groups/add_edit_group.php          | 311 -------
 view/admin/groups/admin_groups.php            | 110 ---
 view/admin/groups/confirm_delete.php          |  36 -
 view/admin/groups/delete_group.php            |  39 -
 view/admin/index.php                          |  56 --
 view/admin/loader.php                         |  17 -
 view/admin/maintenance/admin_maintenance.php  |  99 --
 view/admin/maintenance/prune.php              |  39 -
 view/admin/maintenance/rebuild.php            |  17 -
 view/admin/menu.php                           | 116 ---
 view/admin/options.php                        | 844 ------------------
 view/admin/parser.php                         | 299 -------
 view/admin/permissions.php                    | 189 ----
 view/admin/plugins.php                        |  72 --
 view/admin/reports.php                        | 116 ---
 view/admin/statistics.php                     |  42 -
 view/admin/users/admin_users.php              | 172 ----
 view/admin/users/ban_users.php                |  58 --
 view/admin/users/delete_users.php             |  39 -
 view/admin/users/find_users.php               | 100 ---
 view/admin/users/move_users.php               |  47 -
 view/admin/users/search_ip.php                |  79 --
 view/admin/users/show_users.php               | 100 ---
 view/delete.php                               |  67 --
 view/edit.php                                 | 119 ---
 view/error.php                                |  26 -
 view/footer.php                               | 134 ---
 view/header.php                               | 131 ---
 view/help.php                                 | 139 ---
 view/index.php                                | 111 ---
 view/install.php                              | 222 -----
 view/login/form.php                           |  42 -
 view/login/password_forgotten.php             |  57 --
 view/message.php                              |  25 -
 view/misc/email.php                           |  37 -
 view/misc/report.php                          |  44 -
 view/misc/rules.php                           |  23 -
 view/moderate/delete_posts.php                |  33 -
 view/moderate/delete_topics.php               |  34 -
 view/moderate/merge_topics.php                |  36 -
 view/moderate/moderator_forum.php             | 101 ---
 view/moderate/move_topics.php                 |  44 -
 view/moderate/posts_view.php                  |  95 --
 view/moderate/split_posts.php                 |  40 -
 view/post.php                                 | 211 -----
 view/profile/change_mail.php                  |  35 -
 view/profile/change_pass.php                  |  39 -
 view/profile/delete_user.php                  |  36 -
 view/profile/menu.php                         |  55 --
 view/profile/section_admin.php                |  87 --
 view/profile/section_display.php              | 101 ---
 view/profile/section_essentials.php           | 258 ------
 view/profile/section_messaging.php            |  39 -
 view/profile/section_personal.php             |  39 -
 view/profile/section_personality.php          |  56 --
 view/profile/section_privacy.php              |  62 --
 view/profile/upload_avatar.php                |  35 -
 view/profile/view_profile.php                 |  66 --
 view/register/email.php                       |  39 -
 view/register/form.php                        | 134 ---
 view/register/rules.php                       |  32 -
 view/search/footer.php                        |  40 -
 view/search/form.php                          |  79 --
 view/search/header.php                        |  48 -
 view/search/posts.php                         |  56 --
 view/search/topics.php                        |  29 -
 view/userlist.php                             | 115 ---
 view/viewforum.php                            | 100 ---
 view/viewtopic.php                            | 204 -----
 155 files changed, 8 insertions(+), 7324 deletions(-)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/bans/add_ban.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/bans/admin_bans.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/bans/search_ban.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/categories.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/censoring.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/forums/admin_forums.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/forums/delete_forum.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/forums/permissions.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/groups/add_edit_group.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/groups/admin_groups.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/groups/confirm_delete.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/groups/delete_group.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/index.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/loader.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/maintenance/admin_maintenance.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/maintenance/prune.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/maintenance/rebuild.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/menu.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/options.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/parser.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/permissions.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/plugins.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/reports.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/statistics.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/users/admin_users.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/users/ban_users.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/users/delete_users.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/users/find_users.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/users/move_users.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/users/search_ip.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/admin/users/show_users.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/delete.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/edit.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/error.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/footer.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/forum.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/header.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/help.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/index.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/install.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/login/form.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/login/password_forgotten.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/misc/email.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/misc/report.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/misc/rules.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/moderate/delete_posts.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/moderate/delete_topics.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/moderate/merge_topics.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/moderate/moderator_forum.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/moderate/move_topics.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/moderate/posts_view.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/moderate/split_posts.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/post.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/change_mail.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/change_pass.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/delete_user.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/menu.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/section_admin.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/section_display.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/section_essentials.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/section_messaging.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/section_personal.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/section_personality.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/section_privacy.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/upload_avatar.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/profile/view_profile.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/register/email.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/register/form.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/register/rules.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/search/footer.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/search/form.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/search/header.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/search/posts.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/search/topics.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/topic.php (100%)
 rename {style/themes/FeatherBB/view => featherbb/View}/userlist.php (100%)
 delete mode 100644 view/admin/bans/add_ban.php
 delete mode 100644 view/admin/bans/admin_bans.php
 delete mode 100644 view/admin/bans/search_ban.php
 delete mode 100644 view/admin/categories.php
 delete mode 100644 view/admin/censoring.php
 delete mode 100644 view/admin/forums/admin_forums.php
 delete mode 100644 view/admin/forums/delete_forum.php
 delete mode 100644 view/admin/forums/permissions.php
 delete mode 100644 view/admin/groups/add_edit_group.php
 delete mode 100644 view/admin/groups/admin_groups.php
 delete mode 100644 view/admin/groups/confirm_delete.php
 delete mode 100644 view/admin/groups/delete_group.php
 delete mode 100644 view/admin/index.php
 delete mode 100644 view/admin/loader.php
 delete mode 100644 view/admin/maintenance/admin_maintenance.php
 delete mode 100644 view/admin/maintenance/prune.php
 delete mode 100644 view/admin/maintenance/rebuild.php
 delete mode 100644 view/admin/menu.php
 delete mode 100644 view/admin/options.php
 delete mode 100644 view/admin/parser.php
 delete mode 100644 view/admin/permissions.php
 delete mode 100644 view/admin/plugins.php
 delete mode 100644 view/admin/reports.php
 delete mode 100644 view/admin/statistics.php
 delete mode 100644 view/admin/users/admin_users.php
 delete mode 100644 view/admin/users/ban_users.php
 delete mode 100644 view/admin/users/delete_users.php
 delete mode 100644 view/admin/users/find_users.php
 delete mode 100644 view/admin/users/move_users.php
 delete mode 100644 view/admin/users/search_ip.php
 delete mode 100644 view/admin/users/show_users.php
 delete mode 100644 view/delete.php
 delete mode 100644 view/edit.php
 delete mode 100644 view/error.php
 delete mode 100644 view/footer.php
 delete mode 100644 view/header.php
 delete mode 100644 view/help.php
 delete mode 100644 view/index.php
 delete mode 100644 view/install.php
 delete mode 100644 view/login/form.php
 delete mode 100644 view/login/password_forgotten.php
 delete mode 100644 view/message.php
 delete mode 100644 view/misc/email.php
 delete mode 100644 view/misc/report.php
 delete mode 100644 view/misc/rules.php
 delete mode 100644 view/moderate/delete_posts.php
 delete mode 100644 view/moderate/delete_topics.php
 delete mode 100644 view/moderate/merge_topics.php
 delete mode 100644 view/moderate/moderator_forum.php
 delete mode 100644 view/moderate/move_topics.php
 delete mode 100644 view/moderate/posts_view.php
 delete mode 100644 view/moderate/split_posts.php
 delete mode 100644 view/post.php
 delete mode 100644 view/profile/change_mail.php
 delete mode 100644 view/profile/change_pass.php
 delete mode 100644 view/profile/delete_user.php
 delete mode 100644 view/profile/menu.php
 delete mode 100644 view/profile/section_admin.php
 delete mode 100644 view/profile/section_display.php
 delete mode 100644 view/profile/section_essentials.php
 delete mode 100644 view/profile/section_messaging.php
 delete mode 100644 view/profile/section_personal.php
 delete mode 100644 view/profile/section_personality.php
 delete mode 100644 view/profile/section_privacy.php
 delete mode 100644 view/profile/upload_avatar.php
 delete mode 100644 view/profile/view_profile.php
 delete mode 100644 view/register/email.php
 delete mode 100644 view/register/form.php
 delete mode 100644 view/register/rules.php
 delete mode 100644 view/search/footer.php
 delete mode 100644 view/search/form.php
 delete mode 100644 view/search/header.php
 delete mode 100644 view/search/posts.php
 delete mode 100644 view/search/topics.php
 delete mode 100644 view/userlist.php
 delete mode 100644 view/viewforum.php
 delete mode 100644 view/viewtopic.php

diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
index e3c10fba..625c5770 100644
--- a/featherbb/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -9,9 +9,11 @@
 
 namespace FeatherBB\Controller;
 
-use FeatherBB\Core\Random;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Utils;
+use FeatherBB\Core\Lister;
+use FeatherBB\Core\Random;
+use FeatherBB\Middleware\Core;
 
 class Install
 {
@@ -31,7 +33,7 @@ public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
         $this->model = new \FeatherBB\Model\install();
-        $this->available_langs = \FeatherBB\Core\Lister::getLangs();
+        $this->available_langs = Lister::getLangs();
         $this->feather->template->setStyle('FeatherBB');
     }
 
@@ -96,7 +98,7 @@ public function run()
                 }
 
                 // Validate language
-                if (!in_array($data['default_lang'], \FeatherBB\Core\Lister::getLangs())) {
+                if (!in_array($data['default_lang'], Lister::getLangs())) {
                     $this->errors[] = __('Error default language');
                 }
 
@@ -165,7 +167,7 @@ public function create_config(array $data)
 
     public function create_db(array $data)
     {
-        \FeatherBB\Core::init_db($data);
+        Core::init_db($data);
 
         // Load appropriate language
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$data['default_lang'].'/install.mo');
diff --git a/featherbb/Core/View.php b/featherbb/Core/View.php
index feafdd7c..a4931bf9 100644
--- a/featherbb/Core/View.php
+++ b/featherbb/Core/View.php
@@ -194,7 +194,7 @@ public function getTemplatePathname($file)
     {
         $pathname = $this->templatesDirectory . DIRECTORY_SEPARATOR . ltrim($file, DIRECTORY_SEPARATOR);
         if (!is_file($pathname)) {
-            $pathname = $this->app->forum_env['FEATHER_ROOT'] . 'view/' . ltrim($file, DIRECTORY_SEPARATOR); // Fallback on default view
+            $pathname = $this->app->forum_env['FEATHER_ROOT'] . 'featherbb/View/' . ltrim($file, DIRECTORY_SEPARATOR); // Fallback on default view
             if (!is_file($pathname)) {
                 throw new \RuntimeException("View cannot add template `$file` to stack because the template does not exist");
             }
@@ -251,7 +251,7 @@ protected function render($data = null, $nested = true)
 
     public function setStyle($style)
     {
-        if (!is_dir($this->app->forum_env['FEATHER_ROOT'].'style/themes/'.$style.'/view/')) {
+        if (!is_dir($this->app->forum_env['FEATHER_ROOT'].'style/themes/'.$style.'/')) {
             throw new \InvalidArgumentException('The style '.$style.' doesn\'t exist');
         }
         $this->data->set('style', (string) $style);
diff --git a/style/themes/FeatherBB/view/admin/bans/add_ban.php b/featherbb/View/admin/bans/add_ban.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/bans/add_ban.php
rename to featherbb/View/admin/bans/add_ban.php
diff --git a/style/themes/FeatherBB/view/admin/bans/admin_bans.php b/featherbb/View/admin/bans/admin_bans.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/bans/admin_bans.php
rename to featherbb/View/admin/bans/admin_bans.php
diff --git a/style/themes/FeatherBB/view/admin/bans/search_ban.php b/featherbb/View/admin/bans/search_ban.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/bans/search_ban.php
rename to featherbb/View/admin/bans/search_ban.php
diff --git a/style/themes/FeatherBB/view/admin/categories.php b/featherbb/View/admin/categories.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/categories.php
rename to featherbb/View/admin/categories.php
diff --git a/style/themes/FeatherBB/view/admin/censoring.php b/featherbb/View/admin/censoring.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/censoring.php
rename to featherbb/View/admin/censoring.php
diff --git a/style/themes/FeatherBB/view/admin/forums/admin_forums.php b/featherbb/View/admin/forums/admin_forums.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/forums/admin_forums.php
rename to featherbb/View/admin/forums/admin_forums.php
diff --git a/style/themes/FeatherBB/view/admin/forums/delete_forum.php b/featherbb/View/admin/forums/delete_forum.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/forums/delete_forum.php
rename to featherbb/View/admin/forums/delete_forum.php
diff --git a/style/themes/FeatherBB/view/admin/forums/permissions.php b/featherbb/View/admin/forums/permissions.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/forums/permissions.php
rename to featherbb/View/admin/forums/permissions.php
diff --git a/style/themes/FeatherBB/view/admin/groups/add_edit_group.php b/featherbb/View/admin/groups/add_edit_group.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/groups/add_edit_group.php
rename to featherbb/View/admin/groups/add_edit_group.php
diff --git a/style/themes/FeatherBB/view/admin/groups/admin_groups.php b/featherbb/View/admin/groups/admin_groups.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/groups/admin_groups.php
rename to featherbb/View/admin/groups/admin_groups.php
diff --git a/style/themes/FeatherBB/view/admin/groups/confirm_delete.php b/featherbb/View/admin/groups/confirm_delete.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/groups/confirm_delete.php
rename to featherbb/View/admin/groups/confirm_delete.php
diff --git a/style/themes/FeatherBB/view/admin/groups/delete_group.php b/featherbb/View/admin/groups/delete_group.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/groups/delete_group.php
rename to featherbb/View/admin/groups/delete_group.php
diff --git a/style/themes/FeatherBB/view/admin/index.php b/featherbb/View/admin/index.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/index.php
rename to featherbb/View/admin/index.php
diff --git a/style/themes/FeatherBB/view/admin/loader.php b/featherbb/View/admin/loader.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/loader.php
rename to featherbb/View/admin/loader.php
diff --git a/style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php b/featherbb/View/admin/maintenance/admin_maintenance.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/maintenance/admin_maintenance.php
rename to featherbb/View/admin/maintenance/admin_maintenance.php
diff --git a/style/themes/FeatherBB/view/admin/maintenance/prune.php b/featherbb/View/admin/maintenance/prune.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/maintenance/prune.php
rename to featherbb/View/admin/maintenance/prune.php
diff --git a/style/themes/FeatherBB/view/admin/maintenance/rebuild.php b/featherbb/View/admin/maintenance/rebuild.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/maintenance/rebuild.php
rename to featherbb/View/admin/maintenance/rebuild.php
diff --git a/style/themes/FeatherBB/view/admin/menu.php b/featherbb/View/admin/menu.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/menu.php
rename to featherbb/View/admin/menu.php
diff --git a/style/themes/FeatherBB/view/admin/options.php b/featherbb/View/admin/options.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/options.php
rename to featherbb/View/admin/options.php
diff --git a/style/themes/FeatherBB/view/admin/parser.php b/featherbb/View/admin/parser.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/parser.php
rename to featherbb/View/admin/parser.php
diff --git a/style/themes/FeatherBB/view/admin/permissions.php b/featherbb/View/admin/permissions.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/permissions.php
rename to featherbb/View/admin/permissions.php
diff --git a/style/themes/FeatherBB/view/admin/plugins.php b/featherbb/View/admin/plugins.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/plugins.php
rename to featherbb/View/admin/plugins.php
diff --git a/style/themes/FeatherBB/view/admin/reports.php b/featherbb/View/admin/reports.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/reports.php
rename to featherbb/View/admin/reports.php
diff --git a/style/themes/FeatherBB/view/admin/statistics.php b/featherbb/View/admin/statistics.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/statistics.php
rename to featherbb/View/admin/statistics.php
diff --git a/style/themes/FeatherBB/view/admin/users/admin_users.php b/featherbb/View/admin/users/admin_users.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/users/admin_users.php
rename to featherbb/View/admin/users/admin_users.php
diff --git a/style/themes/FeatherBB/view/admin/users/ban_users.php b/featherbb/View/admin/users/ban_users.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/users/ban_users.php
rename to featherbb/View/admin/users/ban_users.php
diff --git a/style/themes/FeatherBB/view/admin/users/delete_users.php b/featherbb/View/admin/users/delete_users.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/users/delete_users.php
rename to featherbb/View/admin/users/delete_users.php
diff --git a/style/themes/FeatherBB/view/admin/users/find_users.php b/featherbb/View/admin/users/find_users.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/users/find_users.php
rename to featherbb/View/admin/users/find_users.php
diff --git a/style/themes/FeatherBB/view/admin/users/move_users.php b/featherbb/View/admin/users/move_users.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/users/move_users.php
rename to featherbb/View/admin/users/move_users.php
diff --git a/style/themes/FeatherBB/view/admin/users/search_ip.php b/featherbb/View/admin/users/search_ip.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/users/search_ip.php
rename to featherbb/View/admin/users/search_ip.php
diff --git a/style/themes/FeatherBB/view/admin/users/show_users.php b/featherbb/View/admin/users/show_users.php
similarity index 100%
rename from style/themes/FeatherBB/view/admin/users/show_users.php
rename to featherbb/View/admin/users/show_users.php
diff --git a/style/themes/FeatherBB/view/delete.php b/featherbb/View/delete.php
similarity index 100%
rename from style/themes/FeatherBB/view/delete.php
rename to featherbb/View/delete.php
diff --git a/style/themes/FeatherBB/view/edit.php b/featherbb/View/edit.php
similarity index 100%
rename from style/themes/FeatherBB/view/edit.php
rename to featherbb/View/edit.php
diff --git a/style/themes/FeatherBB/view/error.php b/featherbb/View/error.php
similarity index 100%
rename from style/themes/FeatherBB/view/error.php
rename to featherbb/View/error.php
diff --git a/style/themes/FeatherBB/view/footer.php b/featherbb/View/footer.php
similarity index 100%
rename from style/themes/FeatherBB/view/footer.php
rename to featherbb/View/footer.php
diff --git a/style/themes/FeatherBB/view/forum.php b/featherbb/View/forum.php
similarity index 100%
rename from style/themes/FeatherBB/view/forum.php
rename to featherbb/View/forum.php
diff --git a/style/themes/FeatherBB/view/header.php b/featherbb/View/header.php
similarity index 100%
rename from style/themes/FeatherBB/view/header.php
rename to featherbb/View/header.php
diff --git a/style/themes/FeatherBB/view/help.php b/featherbb/View/help.php
similarity index 100%
rename from style/themes/FeatherBB/view/help.php
rename to featherbb/View/help.php
diff --git a/style/themes/FeatherBB/view/index.php b/featherbb/View/index.php
similarity index 100%
rename from style/themes/FeatherBB/view/index.php
rename to featherbb/View/index.php
diff --git a/style/themes/FeatherBB/view/install.php b/featherbb/View/install.php
similarity index 100%
rename from style/themes/FeatherBB/view/install.php
rename to featherbb/View/install.php
diff --git a/style/themes/FeatherBB/view/login/form.php b/featherbb/View/login/form.php
similarity index 100%
rename from style/themes/FeatherBB/view/login/form.php
rename to featherbb/View/login/form.php
diff --git a/style/themes/FeatherBB/view/login/password_forgotten.php b/featherbb/View/login/password_forgotten.php
similarity index 100%
rename from style/themes/FeatherBB/view/login/password_forgotten.php
rename to featherbb/View/login/password_forgotten.php
diff --git a/style/themes/FeatherBB/view/misc/email.php b/featherbb/View/misc/email.php
similarity index 100%
rename from style/themes/FeatherBB/view/misc/email.php
rename to featherbb/View/misc/email.php
diff --git a/style/themes/FeatherBB/view/misc/report.php b/featherbb/View/misc/report.php
similarity index 100%
rename from style/themes/FeatherBB/view/misc/report.php
rename to featherbb/View/misc/report.php
diff --git a/style/themes/FeatherBB/view/misc/rules.php b/featherbb/View/misc/rules.php
similarity index 100%
rename from style/themes/FeatherBB/view/misc/rules.php
rename to featherbb/View/misc/rules.php
diff --git a/style/themes/FeatherBB/view/moderate/delete_posts.php b/featherbb/View/moderate/delete_posts.php
similarity index 100%
rename from style/themes/FeatherBB/view/moderate/delete_posts.php
rename to featherbb/View/moderate/delete_posts.php
diff --git a/style/themes/FeatherBB/view/moderate/delete_topics.php b/featherbb/View/moderate/delete_topics.php
similarity index 100%
rename from style/themes/FeatherBB/view/moderate/delete_topics.php
rename to featherbb/View/moderate/delete_topics.php
diff --git a/style/themes/FeatherBB/view/moderate/merge_topics.php b/featherbb/View/moderate/merge_topics.php
similarity index 100%
rename from style/themes/FeatherBB/view/moderate/merge_topics.php
rename to featherbb/View/moderate/merge_topics.php
diff --git a/style/themes/FeatherBB/view/moderate/moderator_forum.php b/featherbb/View/moderate/moderator_forum.php
similarity index 100%
rename from style/themes/FeatherBB/view/moderate/moderator_forum.php
rename to featherbb/View/moderate/moderator_forum.php
diff --git a/style/themes/FeatherBB/view/moderate/move_topics.php b/featherbb/View/moderate/move_topics.php
similarity index 100%
rename from style/themes/FeatherBB/view/moderate/move_topics.php
rename to featherbb/View/moderate/move_topics.php
diff --git a/style/themes/FeatherBB/view/moderate/posts_view.php b/featherbb/View/moderate/posts_view.php
similarity index 100%
rename from style/themes/FeatherBB/view/moderate/posts_view.php
rename to featherbb/View/moderate/posts_view.php
diff --git a/style/themes/FeatherBB/view/moderate/split_posts.php b/featherbb/View/moderate/split_posts.php
similarity index 100%
rename from style/themes/FeatherBB/view/moderate/split_posts.php
rename to featherbb/View/moderate/split_posts.php
diff --git a/style/themes/FeatherBB/view/post.php b/featherbb/View/post.php
similarity index 100%
rename from style/themes/FeatherBB/view/post.php
rename to featherbb/View/post.php
diff --git a/style/themes/FeatherBB/view/profile/change_mail.php b/featherbb/View/profile/change_mail.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/change_mail.php
rename to featherbb/View/profile/change_mail.php
diff --git a/style/themes/FeatherBB/view/profile/change_pass.php b/featherbb/View/profile/change_pass.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/change_pass.php
rename to featherbb/View/profile/change_pass.php
diff --git a/style/themes/FeatherBB/view/profile/delete_user.php b/featherbb/View/profile/delete_user.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/delete_user.php
rename to featherbb/View/profile/delete_user.php
diff --git a/style/themes/FeatherBB/view/profile/menu.php b/featherbb/View/profile/menu.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/menu.php
rename to featherbb/View/profile/menu.php
diff --git a/style/themes/FeatherBB/view/profile/section_admin.php b/featherbb/View/profile/section_admin.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/section_admin.php
rename to featherbb/View/profile/section_admin.php
diff --git a/style/themes/FeatherBB/view/profile/section_display.php b/featherbb/View/profile/section_display.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/section_display.php
rename to featherbb/View/profile/section_display.php
diff --git a/style/themes/FeatherBB/view/profile/section_essentials.php b/featherbb/View/profile/section_essentials.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/section_essentials.php
rename to featherbb/View/profile/section_essentials.php
diff --git a/style/themes/FeatherBB/view/profile/section_messaging.php b/featherbb/View/profile/section_messaging.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/section_messaging.php
rename to featherbb/View/profile/section_messaging.php
diff --git a/style/themes/FeatherBB/view/profile/section_personal.php b/featherbb/View/profile/section_personal.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/section_personal.php
rename to featherbb/View/profile/section_personal.php
diff --git a/style/themes/FeatherBB/view/profile/section_personality.php b/featherbb/View/profile/section_personality.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/section_personality.php
rename to featherbb/View/profile/section_personality.php
diff --git a/style/themes/FeatherBB/view/profile/section_privacy.php b/featherbb/View/profile/section_privacy.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/section_privacy.php
rename to featherbb/View/profile/section_privacy.php
diff --git a/style/themes/FeatherBB/view/profile/upload_avatar.php b/featherbb/View/profile/upload_avatar.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/upload_avatar.php
rename to featherbb/View/profile/upload_avatar.php
diff --git a/style/themes/FeatherBB/view/profile/view_profile.php b/featherbb/View/profile/view_profile.php
similarity index 100%
rename from style/themes/FeatherBB/view/profile/view_profile.php
rename to featherbb/View/profile/view_profile.php
diff --git a/style/themes/FeatherBB/view/register/email.php b/featherbb/View/register/email.php
similarity index 100%
rename from style/themes/FeatherBB/view/register/email.php
rename to featherbb/View/register/email.php
diff --git a/style/themes/FeatherBB/view/register/form.php b/featherbb/View/register/form.php
similarity index 100%
rename from style/themes/FeatherBB/view/register/form.php
rename to featherbb/View/register/form.php
diff --git a/style/themes/FeatherBB/view/register/rules.php b/featherbb/View/register/rules.php
similarity index 100%
rename from style/themes/FeatherBB/view/register/rules.php
rename to featherbb/View/register/rules.php
diff --git a/style/themes/FeatherBB/view/search/footer.php b/featherbb/View/search/footer.php
similarity index 100%
rename from style/themes/FeatherBB/view/search/footer.php
rename to featherbb/View/search/footer.php
diff --git a/style/themes/FeatherBB/view/search/form.php b/featherbb/View/search/form.php
similarity index 100%
rename from style/themes/FeatherBB/view/search/form.php
rename to featherbb/View/search/form.php
diff --git a/style/themes/FeatherBB/view/search/header.php b/featherbb/View/search/header.php
similarity index 100%
rename from style/themes/FeatherBB/view/search/header.php
rename to featherbb/View/search/header.php
diff --git a/style/themes/FeatherBB/view/search/posts.php b/featherbb/View/search/posts.php
similarity index 100%
rename from style/themes/FeatherBB/view/search/posts.php
rename to featherbb/View/search/posts.php
diff --git a/style/themes/FeatherBB/view/search/topics.php b/featherbb/View/search/topics.php
similarity index 100%
rename from style/themes/FeatherBB/view/search/topics.php
rename to featherbb/View/search/topics.php
diff --git a/style/themes/FeatherBB/view/topic.php b/featherbb/View/topic.php
similarity index 100%
rename from style/themes/FeatherBB/view/topic.php
rename to featherbb/View/topic.php
diff --git a/style/themes/FeatherBB/view/userlist.php b/featherbb/View/userlist.php
similarity index 100%
rename from style/themes/FeatherBB/view/userlist.php
rename to featherbb/View/userlist.php
diff --git a/view/admin/bans/add_ban.php b/view/admin/bans/add_ban.php
deleted file mode 100644
index cb34e1b8..00000000
--- a/view/admin/bans/add_ban.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-	exit;
-}
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('Ban advanced head') ?></span></h2>
-	<div class="box">
-		<form id="bans2" method="post" action="">
-			<div class="inform">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="mode" value="<?php echo $ban['mode'] ?>" />
-				<?php if ($ban['mode'] == 'edit'): ?>				<input type="hidden" name="ban_id" value="<?php echo $ban['id'] ?>" />
-				<?php endif; ?>
-				<?php if ($ban['mode'] == 'add' && isset($ban['user_id'])): ?><input type="hidden" name="ban_user_id" value="<?php echo $ban['user_id'] ?>" />
-				<?php endif; ?><fieldset>
-					<legend><?php _e('Ban advanced subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Username label') ?></th>
-								<td>
-									<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
-										echo Utils::escape($ban['ban_user']);
-									} ?>" tabindex="1" />
-									<span><?php _e('Username help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('IP label') ?></th>
-								<td>
-									<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
-										echo Utils::escape($ban['ip']);
-									} ?>" tabindex="2" />
-										<span><?php _e('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
-												printf(' '.__('IP help link'), '<a href="admin_users.php?ip_stats='.$ban['user_id'].'">'.__('here').'</a>');
-											} ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('E-mail label') ?></th>
-								<td>
-									<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
-										echo Utils::escape($ban['email']);
-									} ?>" tabindex="3" />
-									<span><?php _e('E-mail help') ?></span>
-								</td>
-							</tr>
-						</table>
-						<p class="topspace"><strong class="warntext"><?php _e('Ban IP range info') ?></strong></p>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Message expiry subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Ban message label') ?></th>
-								<td>
-									<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
-										echo Utils::escape($ban['message']);
-									} ?>" tabindex="4" />
-									<span><?php _e('Ban message help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Expire date label') ?></th>
-								<td>
-									<input type="text" name="ban_expire" size="17" maxlength="10" value="<?php if (isset($ban['expire'])) {
-										echo $ban['expire'];
-									} ?>" tabindex="5" />
-									<span><?php _e('Expire date help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php _e('Save') ?>" tabindex="6" /></p>
-		</form>
-	</div>
-</div>
-<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/bans/admin_bans.php b/view/admin/bans/admin_bans.php
deleted file mode 100644
index 085d8dab..00000000
--- a/view/admin/bans/admin_bans.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('New ban head') ?></span></h2>
-		<div class="box">
-			<form id="bans" method="post" action="<?php echo $feather->url->get('admin/bans/add/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Add ban subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Username label') ?><div><input type="submit" name="add_ban" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
-									<td>
-										<input type="text" name="new_ban_user" size="25" maxlength="25" tabindex="1" />
-										<span><?php _e('Username advanced help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-
-		<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
-		<div class="box">
-			<form id="find_bans" method="get" action="<?php echo $feather->url->get('admin/bans/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Ban search subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Ban search info') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Username label') ?></th>
-									<td><input type="text" name="username" size="30" maxlength="25" tabindex="4" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('IP label') ?></th>
-									<td><input type="text" name="ip" size="30" maxlength="255" tabindex="5" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('E-mail label') ?></th>
-									<td><input type="text" name="email" size="30" maxlength="80" tabindex="6" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Message label') ?></th>
-									<td><input type="text" name="message" size="30" maxlength="255" tabindex="7" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Expire after label') ?></th>
-									<td><input type="text" name="expire_after" size="10" maxlength="10" tabindex="8" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Expire before label') ?></th>
-									<td><input type="text" name="expire_before" size="10" maxlength="10" tabindex="9" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Order by label') ?></th>
-									<td>
-										<select name="order_by" tabindex="10">
-											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
-											<option value="ip"><?php _e('Order by ip') ?></option>
-											<option value="email"><?php _e('Order by e-mail') ?></option>
-											<option value="expire"><?php _e('Order by expire') ?></option>
-										</select>
-                                        &#160;&#160;&#160;
-                                        <select name="direction" tabindex="11">
-											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
-											<option value="DESC"><?php _e('Descending') ?></option>
-										</select>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="12" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/bans/search_ban.php b/view/admin/bans/search_ban.php
deleted file mode 100644
index 93fd7bdd..00000000
--- a/view/admin/bans/search_ban.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-
-<div id="bans1" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results IP address head') ?></th>
-					<th class="tc4" scope="col"><?php _e('Results expire head') ?></th>
-					<th class="tc5" scope="col"><?php _e('Results message head') ?></th>
-					<th class="tc6" scope="col"><?php _e('Results banned by head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-
-        foreach ($ban_data as $cur_ban) {
-            ?>
-				<tr>
-					<td class="tcl"><?php echo($cur_ban['username'] != '') ? Utils::escape($cur_ban['username']) : '&#160;' ?></td>
-					<td class="tc2"><?php echo($cur_ban['email'] != '') ? Utils::escape($cur_ban['email']) : '&#160;' ?></td>
-					<td class="tc3"><?php echo($cur_ban['ip'] != '') ? Utils::escape($cur_ban['ip']) : '&#160;' ?></td>
-					<td class="tc4"><?php echo $feather->utils->format_time($cur_ban['expire'], true) ?></td>
-					<td class="tc5"><?php echo($cur_ban['message'] != '') ? Utils::escape($cur_ban['message']) : '&#160;' ?></td>
-					<td class="tc6"><?php echo($cur_ban['ban_creator_username'] != '') ? '<a href="'.$feather->url->get('user/'.$cur_ban['ban_creator'].'/').'">'.Utils::escape($cur_ban['ban_creator_username']).'</a>' : __('Unknown') ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/bans/edit/'.$cur_ban['id'].'/').'">'.__('Edit').'</a> | <a href="'.$feather->url->get('admin/bans/delete/'.$cur_ban['id'].'/').'">'.__('Remove').'</a>' ?></td>
-				</tr>
-<?php
-
-        }
-        if (empty($ban_data)) {
-            echo "\t\t\t\t".'<tr><td class="tcl" colspan="7">'.__('No match').'</td></tr>'."\n";
-        }
-
-?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-        <ul class="crumbs">
-            <li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-            <li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
-            <li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-        </ul>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/admin/categories.php b/view/admin/categories.php
deleted file mode 100644
index c4299564..00000000
--- a/view/admin/categories.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-	<div class="blockform">
-		<h2><span><?php _e('Add categories head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/categories/add/') ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Add categories subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Add category label') ?><div><input type="submit" value="<?php _e('Add new submit') ?>" tabindex="2" /></div></th>
-									<td>
-										<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-										<input type="text" name="cat_name" size="35" maxlength="80" tabindex="1" />
-										<span><?php printf(__('Add category help'), '<a href="'.$feather->url->get('admin/forums').'">'.__('Forums').'</a>') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-
-<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Delete categories head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/categories/delete') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Delete categories subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Delete category label') ?><div><input type="submit" value="<?php _e('Delete') ?>" tabindex="4" /></div></th>
-									<td>
-										<select name="cat_to_delete" tabindex="3">
-<?php
-
-    foreach ($cat_list as $cur_cat) {
-        echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.Utils::escape($cur_cat['cat_name']).'</option>'."\n";
-    }
-
-?>
-										</select>
-										<span style="color: red;"><input type="checkbox" name="disclaimer" value="1"> <?php _e('Delete category disclaimer') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-<?php endif; ?>
-
-<?php if (!empty($cat_list)): ?>		<h2 class="block2"><span><?php _e('Edit categories head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/categories/edit/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit categories subhead') ?></legend>
-						<div class="infldset">
-							<table id="categoryedit">
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php _e('Category name label') ?></th>
-									<th scope="col"><?php _e('Category position label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-
-    foreach ($cat_list as $cur_cat) {
-        ?>
-								<tr>
-									<td class="tcl"><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][name]" value="<?php echo Utils::escape($cur_cat['cat_name']) ?>" size="35" maxlength="80" /></td>
-									<td><input type="text" name="cat[<?php echo $cur_cat['id'] ?>][order]" value="<?php echo $cur_cat['disp_position'] ?>" size="3" maxlength="3" /></td>
-								</tr>
-<?php
-
-    }
-
-?>
-							</tbody>
-							</table>
-							<div class="fsetsubmit"><input type="submit" value="<?php _e('Update') ?>" /></div>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-<?php endif; ?>	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/censoring.php b/view/admin/censoring.php
deleted file mode 100644
index 190638fe..00000000
--- a/view/admin/censoring.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Censoring head') ?></span></h2>
-		<div class="box">
-			<form id="censoring" method="post" action="<?php echo $feather->url->get('admin/censoring/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Add word subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Add word info').' '.($feather->forum_settings['o_censoring'] == '1' ? sprintf(__('Censoring enabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>') : sprintf(__('Censoring disabled'), '<a href="'.$feather->url->get('admin/options#censoring').'">'.__('Options').'</a>')) ?></p>
-							<table>
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
-									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
-									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-								<tr>
-									<td class="tcl"><input type="text" name="new_search_for" size="24" maxlength="60" tabindex="1" /></td>
-									<td class="tc2"><input type="text" name="new_replace_with" size="24" maxlength="60" tabindex="2" /></td>
-									<td><input type="submit" name="add_word" value="<?php _e('Add') ?>" tabindex="3" /></td>
-								</tr>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit remove subhead') ?></legend>
-						<div class="infldset">
-<?php
-if (!empty($word_data)) {
-    ?>
-							<table>
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php _e('Censored word label') ?></th>
-									<th class="tc2" scope="col"><?php _e('Replacement label') ?></th>
-									<th class="hidehead" scope="col"><?php _e('Action label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-
-    foreach ($word_data as $word) {
-        echo "\t\t\t\t\t\t\t\t".'<tr><td class="tcl"><input type="text" name="search_for['.$word['id'].']" value="'.Utils::escape($word['search_for']).'" size="24" maxlength="60" /></td><td class="tc2"><input type="text" name="replace_with['.$word['id'].']" value="'.Utils::escape($word['replace_with']).'" size="24" maxlength="60" /></td><td><input type="submit" name="update['.$word['id'].']" value="'.__('Update').'" />&#160;<input type="submit" name="remove['.$word['id'].']" value="'.__('Remove').'" /></td></tr>'."\n";
-    }
-
-    ?>
-							</tbody>
-							</table>
-<?php
-
-} else {
-    echo "\t\t\t\t\t\t\t".'<p>'.__('No words in list').'</p>'."\n";
-}
-
-?>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/forums/admin_forums.php b/view/admin/forums/admin_forums.php
deleted file mode 100644
index 1d70ba75..00000000
--- a/view/admin/forums/admin_forums.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Add forum head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/forums/add') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<?php
-if (!empty($cat_list)) {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Create new subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Add forum label') ?><div><input type="submit" value="<?php _e('Add forum') ?>" tabindex="2" /></div></th>
-									<td>
-										<select name="cat" tabindex="1">
-											<?php  foreach ($cat_list as $cat) {
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat['id'].'">'.Utils::escape($cat['cat_name']).'</option>'."\n";
-											} ?>
-										</select>
-										<span><?php _e('Add forum help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-} else {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('None') ?></legend>
-						<div class="infldset">
-							<p><?php _e('No categories exist') ?></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-}
-
-?>
-			</form>
-		</div>
-<?php
-if (!empty($forum_data)) {
-    ?>
-		<h2 class="block2"><span><?php _e('Manage forums head') ?></span></h2>
-		<div class="box">
-			<form id="edforum" method="post" action="<?php echo $feather->url->get('admin/forums/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="3" /></p>
-<?php
-    foreach ($forum_data as $cat_id => $cat_data) {
-            ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Category subhead') ?> <?php echo Utils::escape($cat_data['cat_name']) ?></legend>
-						<div class="infldset">
-							<table>
-							<thead>
-								<tr>
-									<th class="tcl"><?php _e('Action') ?></th>
-									<th class="tc2"><?php _e('Position label') ?></th>
-									<th class="tcr"><?php _e('Forum label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-	foreach ($cat_data['cat_forums'] as $forum) {
-        ?>
-								<tr>
-									<td class="tcl"><a href="<?php echo $feather->url->get('admin/forums/edit/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Edit link') ?></a> | <a href="<?php echo $feather->url->get('admin/forums/delete/'.$forum['forum_id'].'/') ?>" tabindex="<?php echo $cur_index++ ?>"><?php _e('Delete link') ?></a></td>
-									<td class="tc2"><input type="text" name="position[<?php echo $forum['forum_id'] ?>]" size="3" maxlength="3" value="<?php echo $forum['position'] ?>" tabindex="<?php echo $cur_index++ ?>" /></td>
-									<td class="tcr"><strong><?php echo Utils::escape($forum['forum_name']) ?></strong></td>
-								</tr>
-<?php
-    }
-    ?>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-	}
-?>
-				<p class="submitend"><input type="submit" name="update_positions" value="<?php _e('Update positions') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
-<?php
-	}
-?>
diff --git a/view/admin/forums/delete_forum.php b/view/admin/forums/delete_forum.php
deleted file mode 100644
index c839019a..00000000
--- a/view/admin/forums/delete_forum.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Confirm delete head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/forums/delete/'.$cur_forum['id'].'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Confirm delete subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Confirm delete info'), $cur_forum['forum_name']) ?></p>
-							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="del_forum_comply" value="<?php _e('Delete') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/forums/permissions.php b/view/admin/forums/permissions.php
deleted file mode 100644
index d461ea30..00000000
--- a/view/admin/forums/permissions.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Edit forum head') ?></span></h2>
-		<div class="box">
-			<form id="edit_forum" method="post" action="<?php echo $feather->url->get('admin/forums/edit/'.$cur_forum['id'].'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="6" /></p>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit details subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Forum name label') ?></th>
-									<td><input type="text" name="forum_name" size="35" maxlength="80" value="<?php echo Utils::escape($cur_forum['forum_name']) ?>" tabindex="1" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Forum description label') ?></th>
-									<td><textarea name="forum_desc" rows="3" cols="50" tabindex="2"><?php echo Utils::escape($cur_forum['forum_desc']) ?></textarea></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Category label') ?></th>
-									<td>
-										<select name="cat_id" tabindex="3">
-											<?php  foreach ($forum_data as $cat_id => $cat_data) {
-												$selected = ($cat_id == $cur_forum['cat_id']) ? 'selected="selected"' : '';
-												echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cat_id.'" '.$selected.'>'.Utils::escape($cat_data['cat_name']).'</option>'."\n";
-											} ?>
-										</select>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Sort by label') ?></th>
-									<td>
-										<select name="sort_by" tabindex="4">
-											<option value="0"<?php if ($cur_forum['sort_by'] == '0') {
-    echo ' selected="selected"';
-} ?>><?php _e('Last post') ?></option>
-											<option value="1"<?php if ($cur_forum['sort_by'] == '1') {
-    echo ' selected="selected"';
-} ?>><?php _e('Topic start') ?></option>
-											<option value="2"<?php if ($cur_forum['sort_by'] == '2') {
-    echo ' selected="selected"';
-} ?>><?php _e('Subject') ?></option>
-										</select>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Redirect label') ?></th>
-									<td><?php echo(!empty($cur_forum['num_topics'])) ? __('Redirect help') : '<input type="text" name="redirect_url" size="45" maxlength="100" value="'.Utils::escape($cur_forum['redirect_url']).'" tabindex="5" />'; ?></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Group permissions subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Group permissions info'), '<a href="admin_groups.php">'.__('User groups').'</a>') ?></p>
-							<table id="forumperms">
-							<thead>
-								<tr>
-									<th class="atcl">&#160;</th>
-									<th><?php _e('Read forum label') ?></th>
-									<th><?php _e('Post replies label') ?></th>
-									<th><?php _e('Post topics label') ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-    foreach ($perm_data as $perm) {
-        ?>
-								<tr>
-									<th class="atcl"><?php echo Utils::escape($perm['g_title']) ?></th>
-									<td<?php if (!$perm['read_forum_def']) {
-    echo ' class="nodefault"';
-}
-        ?>>
-										<input type="hidden" name="read_forum_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['read_forum']) ? '1' : '0';
-        ?>" />
-										<input type="checkbox" name="read_forum_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['read_forum']) ? ' checked="checked"' : '';
-        ?><?php echo($perm['g_read_board'] == '0') ? ' disabled="disabled"' : '';
-        ?> tabindex="<?php echo $cur_index++ ?>" />
-									</td>
-									<td<?php if (!$perm['post_replies_def'] && $cur_forum['redirect_url'] == '') {
-    echo ' class="nodefault"';
-}
-        ?>>
-										<input type="hidden" name="post_replies_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['post_replies']) ? '1' : '0';
-        ?>" />
-										<input type="checkbox" name="post_replies_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['post_replies']) ? ' checked="checked"' : '';
-        ?><?php echo($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : '';
-        ?> tabindex="<?php echo $cur_index++ ?>" />
-									</td>
-									<td<?php if (!$perm['post_topics_def'] && $cur_forum['redirect_url'] == '') {
-    echo ' class="nodefault"';
-}
-        ?>>
-										<input type="hidden" name="post_topics_old[<?php echo $perm['g_id'] ?>]" value="<?php echo($perm['post_topics']) ? '1' : '0';
-        ?>" />
-										<input type="checkbox" name="post_topics_new[<?php echo $perm['g_id'] ?>]" value="1"<?php echo($perm['post_topics']) ? ' checked="checked"' : '';
-        ?><?php echo($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : '';
-        ?> tabindex="<?php echo $cur_index++ ?>" />
-									</td>
-								</tr>
-<?php
-
-    }
-
-?>
-							</tbody>
-							</table>
-							<div class="fsetsubmit"><input type="submit" name="revert_perms" value="<?php _e('Revert to default') ?>" tabindex="<?php echo $cur_index++ ?>" /></div>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" tabindex="<?php echo $cur_index++ ?>" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/groups/add_edit_group.php b/view/admin/groups/add_edit_group.php
deleted file mode 100644
index de91d1eb..00000000
--- a/view/admin/groups/add_edit_group.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Group settings head') ?></span></h2>
-		<div class="box">
-			<form id="groups2" method="post" action="" onsubmit="return process_form(this)">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" /></p>
-				<div class="inform">
-					<input type="hidden" name="mode" value="<?php echo $group['mode'] ?>" />
-<?php if ($group['mode'] == 'edit'): ?>					<input type="hidden" name="group_id" value="<?php echo $id ?>" />
-<?php endif; ?><?php if ($group['mode'] == 'add'): ?>					<input type="hidden" name="base_group" value="<?php echo $group['base_group'] ?>" />
-<?php endif; ?>					<fieldset>
-						<legend><?php _e('Group settings subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Group settings info') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Group title label') ?></th>
-									<td>
-										<input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
-    echo Utils::escape($group['info']['g_title']);
-} ?>" tabindex="1" />
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('User title label') ?></th>
-									<td>
-										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo Utils::escape($group['info']['g_user_title']) ?>" tabindex="2" />
-										<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Promote users label') ?></th>
-									<td>
-										<select name="promote_next_group" tabindex="3">
-											<option value="0"><?php _e('Disable promotion') ?></option>
-											<?php echo $group_list ?>
-										</select>
-										<input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo Utils::escape($group['info']['g_promote_min_posts']) ?>" tabindex="4" />
-										<span><?php printf(__('Promote users help'), __('Disable promotion')) ?></span>
-									</td>
-								</tr>
-<?php if ($group['mode'] != 'edit' || $feather->forum_settings['o_default_user_group'] != $group['info']['g_id']): ?>								<tr>
-									<th scope="row"> <?php _e('Mod privileges label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="moderator" value="1"<?php if ($group['info']['g_moderator'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="5" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="moderator" value="0"<?php if ($group['info']['g_moderator'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="6" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Mod privileges help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Edit profile label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_edit_users" value="1"<?php if ($group['info']['g_mod_edit_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="7" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_edit_users" value="0"<?php if ($group['info']['g_mod_edit_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="8" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Edit profile help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Rename users label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_rename_users" value="1"<?php if ($group['info']['g_mod_rename_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="9" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_rename_users" value="0"<?php if ($group['info']['g_mod_rename_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="10" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Rename users help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Change passwords label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_change_passwords" value="1"<?php if ($group['info']['g_mod_change_passwords'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="11" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_change_passwords" value="0"<?php if ($group['info']['g_mod_change_passwords'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="12" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Change passwords help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Mod promote users label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_promote_users" value="1"<?php if ($group['info']['g_mod_promote_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="13" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_promote_users" value="0"<?php if ($group['info']['g_mod_promote_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="14" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Mod promote users help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Ban users label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="mod_ban_users" value="1"<?php if ($group['info']['g_mod_ban_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="15" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="mod_ban_users" value="0"<?php if ($group['info']['g_mod_ban_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="16" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Ban users help') ?></span>
-									</td>
-								</tr>
-<?php endif; endif; ?>								<tr>
-									<th scope="row"><?php _e('Read board label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="read_board" value="1"<?php if ($group['info']['g_read_board'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="17" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="read_board" value="0"<?php if ($group['info']['g_read_board'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="18" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Read board help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('View user info label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="view_users" value="1"<?php if ($group['info']['g_view_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="19" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="view_users" value="0"<?php if ($group['info']['g_view_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="20" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('View user info help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Post replies label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="post_replies" value="1"<?php if ($group['info']['g_post_replies'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="21" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="post_replies" value="0"<?php if ($group['info']['g_post_replies'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="22" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Post replies help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Post topics label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="post_topics" value="1"<?php if ($group['info']['g_post_topics'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="23" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="post_topics" value="0"<?php if ($group['info']['g_post_topics'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="24" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Post topics help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Edit posts label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="edit_posts" value="1"<?php if ($group['info']['g_edit_posts'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="25" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="edit_posts" value="0"<?php if ($group['info']['g_edit_posts'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="26" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Edit posts help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Delete posts label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="delete_posts" value="1"<?php if ($group['info']['g_delete_posts'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="27" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="delete_posts" value="0"<?php if ($group['info']['g_delete_posts'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="28" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Delete posts help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Delete topics label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="delete_topics" value="1"<?php if ($group['info']['g_delete_topics'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="29" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="delete_topics" value="0"<?php if ($group['info']['g_delete_topics'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="30" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Delete topics help') ?></span>
-									</td>
-								</tr>
-<?php endif; ?>								<tr>
-									<th scope="row"><?php _e('Post links label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="post_links" value="1"<?php if ($group['info']['g_post_links'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="31" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="post_links" value="0"<?php if ($group['info']['g_post_links'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="32" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Post links help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Set own title label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="set_title" value="1"<?php if ($group['info']['g_set_title'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="33" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="set_title" value="0"<?php if ($group['info']['g_set_title'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="34" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Set own title help') ?></span>
-									</td>
-								</tr>
-<?php endif; ?>								<tr>
-									<th scope="row"><?php _e('User search label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="search" value="1"<?php if ($group['info']['g_search'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="35" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="search" value="0"<?php if ($group['info']['g_search'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="36" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('User search help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('User list search label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="search_users" value="1"<?php if ($group['info']['g_search_users'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="37" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="search_users" value="0"<?php if ($group['info']['g_search_users'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="38" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('User list search help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('Send e-mails label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="send_email" value="1"<?php if ($group['info']['g_send_email'] == '1') {
-    echo ' checked="checked"';
-} ?> tabindex="39" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="send_email" value="0"<?php if ($group['info']['g_send_email'] == '0') {
-    echo ' checked="checked"';
-} ?> tabindex="40" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Send e-mails help') ?></span>
-									</td>
-								</tr>
-<?php endif; ?>								<tr>
-									<th scope="row"><?php _e('Post flood label') ?></th>
-									<td>
-										<input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_post_flood'] ?>" tabindex="41" />
-										<span><?php _e('Post flood help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Search flood label') ?></th>
-									<td>
-										<input type="text" name="search_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_search_flood'] ?>" tabindex="42" />
-										<span><?php _e('Search flood help') ?></span>
-									</td>
-								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
-									<th scope="row"><?php _e('E-mail flood label') ?></th>
-									<td>
-										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_email_flood'] ?>" tabindex="43" />
-										<span><?php _e('E-mail flood help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Report flood label') ?></th>
-									<td>
-										<input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_report_flood'] ?>" tabindex="44" />
-										<span><?php _e('Report flood help') ?></span>
-									</td>
-								</tr>
-<?php endif; endif; ?>							</table>
-<?php if ($group['info']['g_moderator'] == '1'): ?>							<p class="warntext"><?php _e('Moderator info') ?></p>
-<?php endif; ?>						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" tabindex="45" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/groups/admin_groups.php b/view/admin/groups/admin_groups.php
deleted file mode 100644
index 74ebedd4..00000000
--- a/view/admin/groups/admin_groups.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Add groups head') ?></span></h2>
-		<div class="box">
-				<div class="inform">
-					<fieldset>
-                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/add/') ?>">
-                        <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php _e('Add group subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('New group label') ?><div><input type="submit" name="add_group" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
-									<td>
-										<select id="base_group" name="base_group" tabindex="1">
-<?php
-
-foreach ($groups as $cur_group) {
-    if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
-        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
-        } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
-        }
-    }
-}
-
-?>
-										</select>
-										<span><?php _e('New group help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-                        </form>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-                        <form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/') ?>">
-                        	<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-						<legend><?php _e('Default group subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Default group label') ?><div><input type="submit" name="set_default_group" value="<?php _e('Save') ?>" tabindex="4" /></div></th>
-									<td>
-										<select id="default_group" name="default_group" tabindex="3">
-<?php
-
-foreach ($groups as $cur_group) {
-    if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
-        if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
-        } else {
-            echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
-        }
-    }
-}
-
-?>
-										</select>
-										<span><?php _e('Default group help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-                        </form>
-					</fieldset>
-				</div>
-		</div>
-
-		<h2 class="block2"><span><?php _e('Existing groups head') ?></span></h2>
-		<div class="box">
-			<div class="fakeform">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Edit groups subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Edit groups info') ?></p>
-							<table>
-<?php
-foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->url->get('admin/groups/edit/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->url->get('admin/groups/delete/'.$cur_group['g_id'].'/').'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.Utils::escape($cur_group['g_title']).'</td></tr>'."\n";
-}
-
-?>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/groups/confirm_delete.php b/view/admin/groups/confirm_delete.php
deleted file mode 100644
index b43d0b58..00000000
--- a/view/admin/groups/confirm_delete.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Group delete head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-				<input type="hidden" name="group_to_delete" value="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>" />
-					<fieldset>
-						<legend><?php _e('Confirm delete subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Confirm delete info'), Utils::escape($group_title)) ?></p>
-							<p class="warntext"><?php _e('Confirm delete warn') ?></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="del_group_comply" value="<?php _e('Delete') ?>" tabindex="1" /><a href="javascript:history.go(-1)" tabindex="2"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/groups/delete_group.php b/view/admin/groups/delete_group.php
deleted file mode 100644
index 0205422f..00000000
--- a/view/admin/groups/delete_group.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Delete group head') ?></span></h2>
-		<div class="box">
-			<form id="groups" method="post" action="<?php echo $feather->url->get('admin/groups/delete/'.$id.'/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Move users subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Move users info'), Utils::escape($group_info['title']), Utils::forum_number_format($group_info['members'])) ?></p>
-							<label><?php _e('Move users label') ?>
-							<select name="move_to_group">
-								<?= $group_list_delete; ?>
-							</select>
-							<br /></label>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="del_group" value="<?php _e('Delete group') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
diff --git a/view/admin/index.php b/view/admin/index.php
deleted file mode 100644
index 0dce299c..00000000
--- a/view/admin/index.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="block">
-		<h2><span><?php _e('Forum admin head') ?></span></h2>
-		<div id="adintro" class="box">
-			<div class="inbox">
-				<p><?php _e('Welcome to admin') ?></p>
-				<ul>
-					<li><span><?php _e('Welcome 1') ?></span></li>
-					<li><span><?php _e('Welcome 2') ?></span></li>
-					<li><span><?php _e('Welcome 3') ?></span></li>
-					<li><span><?php _e('Welcome 4') ?></span></li>
-					<li><span><?php _e('Welcome 5') ?></span></li>
-					<li><span><?php _e('Welcome 6') ?></span></li>
-					<li><span><?php _e('Welcome 7') ?></span></li>
-					<li><span><?php _e('Welcome 8') ?></span></li>
-					<li><span><?php _e('Welcome 9') ?></span></li>
-				</ul>
-			</div>
-		</div>
-
-		<h2 class="block2"><span><?php _e('About head') ?></span></h2>
-		<div id="adstats" class="box">
-			<div class="inbox">
-				<dl>
-					<dt><?php _e('FeatherBB version label') ?></dt>
-					<dd>
-						<?php printf(__('FeatherBB version data')."\n", $feather->forum_settings['o_cur_version'], '<a href="'.$feather->url->get('admin/action/check_upgrade/').'">'.__('Check for upgrade').'</a>') ?>
-					</dd>
-					<dt><?php _e('Server statistics label') ?></dt>
-					<dd>
-						<a href="<?php echo $feather->url->get('admin/statistics/') ?>"><?php _e('View server statistics') ?></a>
-					</dd>
-					<dt><?php _e('Support label') ?></dt>
-					<dd>
-						<a href="http://FeatherBB.org/forums/index.php"><?php _e('Forum label') ?></a> - <a href="http://gitter.im/featherbb/featherbb"><?php _e('IRC label') ?></a>
-					</dd>
-				</dl>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
diff --git a/view/admin/loader.php b/view/admin/loader.php
deleted file mode 100644
index 2a443eb0..00000000
--- a/view/admin/loader.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/maintenance/admin_maintenance.php b/view/admin/maintenance/admin_maintenance.php
deleted file mode 100644
index 842dfade..00000000
--- a/view/admin/maintenance/admin_maintenance.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Maintenance head') ?></span></h2>
-		<div class="box">
-			<form method="get" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
-				<div class="inform">
-					<input type="hidden" name="action" value="rebuild" />
-					<fieldset>
-						<legend><?php _e('Rebuild index subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Rebuild index info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Posts per cycle label') ?></th>
-									<td>
-										<input type="text" name="i_per_page" size="7" maxlength="7" value="300" tabindex="1" />
-										<span><?php _e('Posts per cycle help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Starting post label') ?></th>
-									<td>
-										<input type="text" name="i_start_at" size="7" maxlength="7" value="<?php echo(isset($first_id)) ? $first_id : 0 ?>" tabindex="2" />
-										<span><?php _e('Starting post help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Empty index label') ?></th>
-									<td class="inputadmin">
-										<label><input type="checkbox" name="i_empty_index" value="1" tabindex="3" checked="checked" />&#160;&#160;<?php _e('Empty index help') ?></label>
-									</td>
-								</tr>
-							</table>
-							<p class="topspace"><?php _e('Rebuild completed info') ?></p>
-							<div class="fsetsubmit"><input type="submit" name="rebuild_index" value="<?php _e('Rebuild index') ?>" tabindex="4" /></div>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-
-			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>" onsubmit="return process_form(this)">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<input type="hidden" name="action" value="prune" />
-					<fieldset>
-						<legend><?php _e('Prune subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Days old label') ?></th>
-									<td>
-										<input type="text" name="req_prune_days" size="3" maxlength="3" tabindex="5" />
-										<span><?php _e('Days old help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Prune sticky label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="prune_sticky" value="1" tabindex="6" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="prune_sticky" value="0" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Prune sticky help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Prune from label') ?></th>
-									<td>
-										<select name="prune_from" tabindex="7">
-											<option value="all"><?php _e('All forums') ?></option>
-												<?php echo $categories; ?>
-											</optgroup>
-										</select>
-										<span><?php _e('Prune from help') ?></span>
-									</td>
-								</tr>
-							</table>
-							<p class="topspace"><?php printf(__('Prune info'), '<a href="'.$feather->url->get('admin/options/#maintenance').'">'.__('Maintenance mode').'</a>') ?></p>
-							<div class="fsetsubmit"><input type="submit" name="prune" value="<?php _e('Prune') ?>" tabindex="8" /></div>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/maintenance/prune.php b/view/admin/maintenance/prune.php
deleted file mode 100644
index 7b4334ba..00000000
--- a/view/admin/maintenance/prune.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Prune head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/maintenance/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-					<input type="hidden" name="action" value="prune" />
-					<input type="hidden" name="prune_days" value="<?php echo $prune['days'] ?>" />
-					<input type="hidden" name="prune_sticky" value="<?php echo $prune_sticky ?>" />
-					<input type="hidden" name="prune_from" value="<?php echo $prune_from ?>" />
-					<fieldset>
-						<legend><?php _e('Confirm prune subhead') ?></legend>
-						<div class="infldset">
-							<p><?php printf(__('Confirm prune info'), $prune['days'], $prune['forum'], Utils::forum_number_format($prune['num_topics'])) ?></p>
-							<p class="warntext"><?php _e('Confirm prune warn') ?></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="prune_comply" value="<?php _e('Prune') ?>" /><a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/maintenance/rebuild.php b/view/admin/maintenance/rebuild.php
deleted file mode 100644
index cc688587..00000000
--- a/view/admin/maintenance/rebuild.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-<h1><?php _e('Rebuilding index info') ?></h1>
-<script type="text/javascript">window.location="<?= $feather->url->get('admin/maintenance/').$query_str ?>"</script>
-<p><?= sprintf(__('Javascript redirect failed'), '<a href="'.$feather->url->get('admin/maintenance/').$query_str.'">'.__('Click here').'</a>')?></p>
diff --git a/view/admin/menu.php b/view/admin/menu.php
deleted file mode 100644
index dedcb9f7..00000000
--- a/view/admin/menu.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="adminconsole" class="block2col">
-	<div id="adminmenu" class="blockmenu">
-		<h2><span><?php _e('Moderator menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-					<li<?php if ($page == 'index') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Index') ?></a></li>
-					<li<?php if ($page == 'users') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-<?php if ($is_admin || $feather->user->g_mod_ban_users == '1'): ?>					<li<?php if ($page == 'bans') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('admin/bans/') ?>"><?php _e('Bans') ?></a></li>
-<?php endif;
-    if ($is_admin || $feather->forum_settings['o_report_method'] == '0' || $feather->forum_settings['o_report_method'] == '2'): ?>					<li<?php if ($page == 'reports') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('admin/reports/') ?>"><?php _e('Reports') ?></a></li>
-<?php endif;
-    ?>				</ul>
-			</div>
-		</div>
-<?php
-
-    if ($is_admin) {
-        ?>
-		<h2 class="block2"><span><?php _e('Admin menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-					<li<?php if ($page == 'options') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/options/') ?>"><?php _e('Options') ?></a></li>
-					<li<?php if ($page == 'permissions') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/permissions/') ?>"><?php _e('Permissions') ?></a></li>
-					<li<?php if ($page == 'categories') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/categories/') ?>"><?php _e('Categories') ?></a></li>
-					<li<?php if ($page == 'forums') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/forums/') ?>"><?php _e('Forums') ?></a></li>
-					<li<?php if ($page == 'groups') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/groups/') ?>"><?php _e('User groups') ?></a></li>
-					<li<?php if ($page == 'plugins') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/plugins/') ?>"><?= 'Plugins'; ?></a></li>
-					<li<?php if ($page == 'censoring') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/censoring/') ?>"><?php _e('Censoring') ?></a></li>
-					<li<?php if ($page == 'parser') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/parser/') ?>"><?php _e('Parser') ?></a></li>
-					<li<?php if ($page == 'maintenance') {
-    echo ' class="isactive"';
-}
-        ?>><a href="<?php echo $feather->url->get('admin/maintenance/') ?>"><?php _e('Maintenance') ?></a></li>
-				</ul>
-			</div>
-		</div>
-<?php
-
-    }
-
-    // Did we find any plugins?
-    if (!empty($plugins)) {
-        ?>
-		<h2 class="block2"><span><?php _e('Plugins menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-<?php
-
-        foreach ($plugins as $plugin_name => $plugin) {
-            echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.$feather->url->get('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
-        }
-
-        ?>
-				</ul>
-			</div>
-		</div>
-<?php
-
-    }
-
-    ?>
-	</div>
diff --git a/view/admin/options.php b/view/admin/options.php
deleted file mode 100644
index 5425c51c..00000000
--- a/view/admin/options.php
+++ /dev/null
@@ -1,844 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-use FeatherBB\Core\Random;
-use FeatherBB\Core\Url;
-use FeatherBB\Core\Utils;
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-	exit;
-}
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('Options head') ?></span></h2>
-	<div class="box">
-		<form method="post" action="<?php echo $feather->urlFor('adminOptions') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-			<div class="inform">
-				<input type="hidden" name="form_sent" value="1" />
-				<fieldset>
-					<legend><?php _e('Essentials subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Board title label') ?></th>
-								<td>
-									<input type="text" name="form_board_title" size="50" maxlength="255" value="<?php echo Utils::escape($feather->forum_settings['o_board_title']) ?>" />
-									<span><?php _e('Board title help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Board desc label') ?></th>
-								<td>
-									<textarea name="form_board_desc" cols="60" rows="3"><?php echo Utils::escape($feather->forum_settings['o_board_desc']) ?></textarea>
-									<span><?php _e('Board desc help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Base URL label') ?></th>
-								<td>
-									<input type="text" name="form_base_url" size="50" maxlength="100" value="<?php echo Utils::escape($feather->forum_settings['o_base_url']) ?>" />
-									<span><?php _e('Base URL help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Timezone label') ?></th>
-								<td>
-									<select name="form_default_timezone">
-										<option value="-12"<?php if ($feather->forum_settings['o_default_timezone'] == -12) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-12:00') ?></option>
-										<option value="-11"<?php if ($feather->forum_settings['o_default_timezone'] == -11) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-11:00') ?></option>
-										<option value="-10"<?php if ($feather->forum_settings['o_default_timezone'] == -10) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-10:00') ?></option>
-										<option value="-9.5"<?php if ($feather->forum_settings['o_default_timezone'] == -9.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-09:30') ?></option>
-										<option value="-9"<?php if ($feather->forum_settings['o_default_timezone'] == -9) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-09:00') ?></option>
-										<option value="-8.5"<?php if ($feather->forum_settings['o_default_timezone'] == -8.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-08:30') ?></option>
-										<option value="-8"<?php if ($feather->forum_settings['o_default_timezone'] == -8) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-08:00') ?></option>
-										<option value="-7"<?php if ($feather->forum_settings['o_default_timezone'] == -7) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-07:00') ?></option>
-										<option value="-6"<?php if ($feather->forum_settings['o_default_timezone'] == -6) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-06:00') ?></option>
-										<option value="-5"<?php if ($feather->forum_settings['o_default_timezone'] == -5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-05:00') ?></option>
-										<option value="-4"<?php if ($feather->forum_settings['o_default_timezone'] == -4) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-04:00') ?></option>
-										<option value="-3.5"<?php if ($feather->forum_settings['o_default_timezone'] == -3.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-03:30') ?></option>
-										<option value="-3"<?php if ($feather->forum_settings['o_default_timezone'] == -3) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-03:00') ?></option>
-										<option value="-2"<?php if ($feather->forum_settings['o_default_timezone'] == -2) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-02:00') ?></option>
-										<option value="-1"<?php if ($feather->forum_settings['o_default_timezone'] == -1) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC-01:00') ?></option>
-										<option value="0"<?php if ($feather->forum_settings['o_default_timezone'] == 0) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC') ?></option>
-										<option value="1"<?php if ($feather->forum_settings['o_default_timezone'] == 1) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+01:00') ?></option>
-										<option value="2"<?php if ($feather->forum_settings['o_default_timezone'] == 2) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+02:00') ?></option>
-										<option value="3"<?php if ($feather->forum_settings['o_default_timezone'] == 3) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+03:00') ?></option>
-										<option value="3.5"<?php if ($feather->forum_settings['o_default_timezone'] == 3.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+03:30') ?></option>
-										<option value="4"<?php if ($feather->forum_settings['o_default_timezone'] == 4) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+04:00') ?></option>
-										<option value="4.5"<?php if ($feather->forum_settings['o_default_timezone'] == 4.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+04:30') ?></option>
-										<option value="5"<?php if ($feather->forum_settings['o_default_timezone'] == 5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+05:00') ?></option>
-										<option value="5.5"<?php if ($feather->forum_settings['o_default_timezone'] == 5.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+05:30') ?></option>
-										<option value="5.75"<?php if ($feather->forum_settings['o_default_timezone'] == 5.75) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+05:45') ?></option>
-										<option value="6"<?php if ($feather->forum_settings['o_default_timezone'] == 6) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+06:00') ?></option>
-										<option value="6.5"<?php if ($feather->forum_settings['o_default_timezone'] == 6.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+06:30') ?></option>
-										<option value="7"<?php if ($feather->forum_settings['o_default_timezone'] == 7) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+07:00') ?></option>
-										<option value="8"<?php if ($feather->forum_settings['o_default_timezone'] == 8) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+08:00') ?></option>
-										<option value="8.75"<?php if ($feather->forum_settings['o_default_timezone'] == 8.75) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+08:45') ?></option>
-										<option value="9"<?php if ($feather->forum_settings['o_default_timezone'] == 9) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+09:00') ?></option>
-										<option value="9.5"<?php if ($feather->forum_settings['o_default_timezone'] == 9.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+09:30') ?></option>
-										<option value="10"<?php if ($feather->forum_settings['o_default_timezone'] == 10) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+10:00') ?></option>
-										<option value="10.5"<?php if ($feather->forum_settings['o_default_timezone'] == 10.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+10:30') ?></option>
-										<option value="11"<?php if ($feather->forum_settings['o_default_timezone'] == 11) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+11:00') ?></option>
-										<option value="11.5"<?php if ($feather->forum_settings['o_default_timezone'] == 11.5) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+11:30') ?></option>
-										<option value="12"<?php if ($feather->forum_settings['o_default_timezone'] == 12) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+12:00') ?></option>
-										<option value="12.75"<?php if ($feather->forum_settings['o_default_timezone'] == 12.75) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+12:45') ?></option>
-										<option value="13"<?php if ($feather->forum_settings['o_default_timezone'] == 13) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+13:00') ?></option>
-										<option value="14"<?php if ($feather->forum_settings['o_default_timezone'] == 14) {
-											echo ' selected="selected"';
-										} ?>><?php _e('UTC+14:00') ?></option>
-									</select>
-									<span><?php _e('Timezone help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('DST label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_default_dst" value="1"<?php if ($feather->forum_settings['o_default_dst'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_default_dst" value="0"<?php if ($feather->forum_settings['o_default_dst'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('DST help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Language label') ?></th>
-								<td>
-									<select name="form_default_lang">
-										<?php echo $languages; ?>
-									</select>
-									<span><?php _e('Language help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Default style label') ?></th>
-								<td>
-									<select name="form_default_style">
-										<?php echo $styles; ?>
-									</select>
-									<span><?php _e('Default style help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<?php
-
-			$diff = ($feather->user->timezone + $feather->user->dst) * 3600;
-			$timestamp = time() + $diff;
-
-			?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Timeouts subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Time format label') ?></th>
-								<td>
-									<input type="text" name="form_time_format" size="25" maxlength="25" value="<?php echo Utils::escape($feather->forum_settings['o_time_format']) ?>" />
-									<span><?php printf(__('Time format help'), gmdate($feather->forum_settings['o_time_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Date format label') ?></th>
-								<td>
-									<input type="text" name="form_date_format" size="25" maxlength="25" value="<?php echo Utils::escape($feather->forum_settings['o_date_format']) ?>" />
-									<span><?php printf(__('Date format help'), gmdate($feather->forum_settings['o_date_format'], $timestamp), '<a href="http://www.php.net/manual/en/function.date.php">'.__('PHP manual').'</a>') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Visit timeout label') ?></th>
-								<td>
-									<input type="text" name="form_timeout_visit" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_visit'] ?>" />
-									<span><?php _e('Visit timeout help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Online timeout label') ?></th>
-								<td>
-									<input type="text" name="form_timeout_online" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_timeout_online'] ?>" />
-									<span><?php _e('Online timeout help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Redirect time label') ?></th>
-								<td>
-									<input type="text" name="form_redirect_delay" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_redirect_delay'] ?>" />
-									<span><?php _e('Redirect time help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Display subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Version number label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_show_version" value="1"<?php if ($feather->forum_settings['o_show_version'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_show_version" value="0"<?php if ($feather->forum_settings['o_show_version'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Version number help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Info in posts label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_show_user_info" value="1"<?php if ($feather->forum_settings['o_show_user_info'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_show_user_info" value="0"<?php if ($feather->forum_settings['o_show_user_info'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Info in posts help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Post count label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_show_post_count" value="1"<?php if ($feather->forum_settings['o_show_post_count'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_show_post_count" value="0"<?php if ($feather->forum_settings['o_show_post_count'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Post count help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Smilies label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_smilies" value="1"<?php if ($feather->forum_settings['o_smilies'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_smilies" value="0"<?php if ($feather->forum_settings['o_smilies'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Smilies help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Smilies sigs label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_smilies_sig" value="1"<?php if ($feather->forum_settings['o_smilies_sig'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_smilies_sig" value="0"<?php if ($feather->forum_settings['o_smilies_sig'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Smilies sigs help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Clickable links label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_make_links" value="1"<?php if ($feather->forum_settings['o_make_links'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_make_links" value="0"<?php if ($feather->forum_settings['o_make_links'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Clickable links help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Topic review label') ?></th>
-								<td>
-									<input type="text" name="form_topic_review" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_topic_review'] ?>" />
-									<span><?php _e('Topic review help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Topics per page label') ?></th>
-								<td>
-									<input type="text" name="form_disp_topics_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_topics_default'] ?>" />
-									<span><?php _e('Topics per page help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Posts per page label') ?></th>
-								<td>
-									<input type="text" name="form_disp_posts_default" size="3" maxlength="2" value="<?php echo $feather->forum_settings['o_disp_posts_default'] ?>" />
-									<span><?php _e('Posts per page help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Indent label') ?></th>
-								<td>
-									<input type="text" name="form_indent_num_spaces" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_indent_num_spaces'] ?>" />
-									<span><?php _e('Indent help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Quote depth label') ?></th>
-								<td>
-									<input type="text" name="form_quote_depth" size="3" maxlength="3" value="<?php echo $feather->forum_settings['o_quote_depth'] ?>" />
-									<span><?php _e('Quote depth help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Features subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Quick post label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_quickpost" value="1"<?php if ($feather->forum_settings['o_quickpost'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_quickpost" value="0"<?php if ($feather->forum_settings['o_quickpost'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Quick post help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Users online label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_users_online" value="1"<?php if ($feather->forum_settings['o_users_online'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_users_online" value="0"<?php if ($feather->forum_settings['o_users_online'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Users online help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><a name="censoring"></a><?php _e('Censor words label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_censoring" value="1"<?php if ($feather->forum_settings['o_censoring'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.$feather->urlFor('adminCensoring').'">'.__('Censoring').'</a>') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><a name="signatures"></a><?php _e('Signatures label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_signatures" value="1"<?php if ($feather->forum_settings['o_signatures'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_signatures" value="0"<?php if ($feather->forum_settings['o_signatures'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Signatures help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('User has posted label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_show_dot" value="1"<?php if ($feather->forum_settings['o_show_dot'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_show_dot" value="0"<?php if ($feather->forum_settings['o_show_dot'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('User has posted help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Topic views label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_topic_views" value="1"<?php if ($feather->forum_settings['o_topic_views'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_topic_views" value="0"<?php if ($feather->forum_settings['o_topic_views'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Topic views help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Quick jump label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_quickjump" value="1"<?php if ($feather->forum_settings['o_quickjump'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_quickjump" value="0"<?php if ($feather->forum_settings['o_quickjump'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Quick jump help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('GZip label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_gzip" value="1"<?php if ($feather->forum_settings['o_gzip'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_gzip" value="0"<?php if ($feather->forum_settings['o_gzip'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('GZip help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Search all label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_search_all_forums" value="1"<?php if ($feather->forum_settings['o_search_all_forums'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_search_all_forums" value="0"<?php if ($feather->forum_settings['o_search_all_forums'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Search all help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Menu items label') ?></th>
-								<td>
-									<textarea name="form_additional_navlinks" rows="3" cols="55"><?php echo Utils::escape($feather->forum_settings['o_additional_navlinks']) ?></textarea>
-									<span><?php _e('Menu items help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Feed subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Default feed label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_feed_type" value="0"<?php if ($feather->forum_settings['o_feed_type'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('None') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_feed_type" value="1"<?php if ($feather->forum_settings['o_feed_type'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('RSS') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_feed_type" value="2"<?php if ($feather->forum_settings['o_feed_type'] == '2') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Atom') ?></strong></label>
-									<span class="clearb"><?php _e('Default feed help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Feed TTL label') ?></th>
-								<td>
-									<select name="form_feed_ttl">
-										<option value="0"<?php if ($feather->forum_settings['o_feed_ttl'] == '0') {
-											echo ' selected="selected"';
-										} ?>><?php _e('No cache') ?></option>
-										<?php echo $times ?>
-									</select>
-									<span><?php _e('Feed TTL help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Reports subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Reporting method label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_report_method" value="0"<?php if ($feather->forum_settings['o_report_method'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Internal') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_report_method" value="1"<?php if ($feather->forum_settings['o_report_method'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('By e-mail') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_report_method" value="2"<?php if ($feather->forum_settings['o_report_method'] == '2') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Both') ?></strong></label>
-									<span class="clearb"><?php _e('Reporting method help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Mailing list label') ?></th>
-								<td>
-									<textarea name="form_mailing_list" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_mailing_list']) ?></textarea>
-									<span><?php _e('Mailing list help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Avatars subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Use avatars label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_avatars" value="1"<?php if ($feather->forum_settings['o_avatars'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_avatars" value="0"<?php if ($feather->forum_settings['o_avatars'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Use avatars help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Upload directory label') ?></th>
-								<td>
-									<input type="text" name="form_avatars_dir" size="35" maxlength="50" value="<?php echo Utils::escape($feather->forum_settings['o_avatars_dir']) ?>" />
-									<span><?php _e('Upload directory help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Max width label') ?></th>
-								<td>
-									<input type="text" name="form_avatars_width" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_width'] ?>" />
-									<span><?php _e('Max width help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Max height label') ?></th>
-								<td>
-									<input type="text" name="form_avatars_height" size="5" maxlength="5" value="<?php echo $feather->forum_settings['o_avatars_height'] ?>" />
-									<span><?php _e('Max height help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Max size label') ?></th>
-								<td>
-									<input type="text" name="form_avatars_size" size="6" maxlength="6" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
-									<span><?php _e('Max size help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('E-mail subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Admin e-mail label') ?></th>
-								<td>
-									<input type="text" name="form_admin_email" size="50" maxlength="80" value="<?php echo Utils::escape($feather->forum_settings['o_admin_email']) ?>" />
-									<span><?php _e('Admin e-mail help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Webmaster e-mail label') ?></th>
-								<td>
-									<input type="text" name="form_webmaster_email" size="50" maxlength="80" value="<?php echo Utils::escape($feather->forum_settings['o_webmaster_email']) ?>" />
-									<span><?php _e('Webmaster e-mail help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Forum subscriptions label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_forum_subscriptions" value="1"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_forum_subscriptions" value="0"<?php if ($feather->forum_settings['o_forum_subscriptions'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Forum subscriptions help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Topic subscriptions label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_topic_subscriptions" value="1"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_topic_subscriptions" value="0"<?php if ($feather->forum_settings['o_topic_subscriptions'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Topic subscriptions help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('SMTP address label') ?></th>
-								<td>
-									<input type="text" name="form_smtp_host" size="30" maxlength="100" value="<?php echo Utils::escape($feather->forum_settings['o_smtp_host']) ?>" />
-									<span><?php _e('SMTP address help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('SMTP username label') ?></th>
-								<td>
-									<input type="text" name="form_smtp_user" size="25" maxlength="50" value="<?php echo Utils::escape($feather->forum_settings['o_smtp_user']) ?>" />
-									<span><?php _e('SMTP username help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('SMTP password label') ?></th>
-								<td>
-									<label><input type="checkbox" name="form_smtp_change_pass" value="1" />&#160;<?php _e('SMTP change password help') ?></label>
-									<?php $smtp_pass = !empty($feather->forum_settings['o_smtp_pass']) ? Random::key(Utils::strlen($feather->forum_settings['o_smtp_pass']), true) : ''; ?>
-									<input type="password" name="form_smtp_pass1" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
-									<input type="password" name="form_smtp_pass2" size="25" maxlength="50" value="<?php echo $smtp_pass ?>" />
-									<span><?php _e('SMTP password help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('SMTP SSL label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_smtp_ssl" value="1"<?php if ($feather->forum_settings['o_smtp_ssl'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_smtp_ssl" value="0"<?php if ($feather->forum_settings['o_smtp_ssl'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('SMTP SSL help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Registration subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Allow new label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_regs_allow" value="1"<?php if ($feather->forum_settings['o_regs_allow'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_regs_allow" value="0"<?php if ($feather->forum_settings['o_regs_allow'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Allow new help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Verify label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_regs_verify" value="1"<?php if ($feather->forum_settings['o_regs_verify'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_regs_verify" value="0"<?php if ($feather->forum_settings['o_regs_verify'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Verify help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Report new label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_regs_report" value="1"<?php if ($feather->forum_settings['o_regs_report'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_regs_report" value="0"<?php if ($feather->forum_settings['o_regs_report'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Report new help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Use rules label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_rules" value="1"<?php if ($feather->forum_settings['o_rules'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_rules" value="0"<?php if ($feather->forum_settings['o_rules'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Use rules help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Rules label') ?></th>
-								<td>
-									<textarea name="form_rules_message" rows="10" cols="55"><?php echo Utils::escape($feather->forum_settings['o_rules_message']) ?></textarea>
-									<span><?php _e('Rules help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('E-mail default label') ?></th>
-								<td>
-									<span><?php _e('E-mail default help') ?></span>
-									<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_0" value="0"<?php if ($feather->forum_settings['o_default_email_setting'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<?php _e('Display e-mail label') ?></label>
-									<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_1" value="1"<?php if ($feather->forum_settings['o_default_email_setting'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<?php _e('Hide allow form label') ?></label>
-									<label><input type="radio" name="form_default_email_setting" id="form_default_email_setting_2" value="2"<?php if ($feather->forum_settings['o_default_email_setting'] == '2') {
-											echo ' checked="checked"';
-										} ?> />&#160;<?php _e('Hide both label') ?></label>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Announcement subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><?php _e('Display announcement label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_announcement" value="1"<?php if ($feather->forum_settings['o_announcement'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_announcement" value="0"<?php if ($feather->forum_settings['o_announcement'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Display announcement help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Announcement message label') ?></th>
-								<td>
-									<textarea name="form_announcement_message" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_announcement_message']) ?></textarea>
-									<span><?php _e('Announcement message help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Maintenance subhead') ?></legend>
-					<div class="infldset">
-						<table class="aligntop">
-							<tr>
-								<th scope="row"><a name="maintenance"></a><?php _e('Maintenance mode label') ?></th>
-								<td>
-									<label class="conl"><input type="radio" name="form_maintenance" value="1"<?php if ($feather->forum_settings['o_maintenance'] == '1') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-									<label class="conl"><input type="radio" name="form_maintenance" value="0"<?php if ($feather->forum_settings['o_maintenance'] == '0') {
-											echo ' checked="checked"';
-										} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-									<span class="clearb"><?php _e('Maintenance mode help') ?></span>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row"><?php _e('Maintenance message label') ?></th>
-								<td>
-									<textarea name="form_maintenance_message" rows="5" cols="55"><?php echo Utils::escape($feather->forum_settings['o_maintenance_message']) ?></textarea>
-									<span><?php _e('Maintenance message help') ?></span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</fieldset>
-			</div>
-			<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-		</form>
-	</div>
-</div>
-<div class="clearer"></div>
-</div>
diff --git a/view/admin/parser.php b/view/admin/parser.php
deleted file mode 100644
index bfcf5133..00000000
--- a/view/admin/parser.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php echo $lang_admin_parser['Parser head'] ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/parser/') ?>" enctype="multipart/form-data">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop">
-					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
-					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
-				</p>
-				<div class="inform">
-					<input type="hidden" name="form_sent" value="1" />
-					<fieldset>
-						<legend><?php echo $lang_admin_parser['Config subhead'] ?></legend>
-						<div class="infldset">
-							<table class="aligntop" cellspacing="0">
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['textile'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[textile]" value="1"<?php if ($config['textile']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[textile]" value="0"<?php if (!$config['textile']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['textile help'] ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['quote_links'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[quote_links]" value="1"<?php if ($config['quote_links']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_links]" value="0"<?php if (!$config['quote_links']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['quote_links help'] ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['quote_imgs'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[quote_imgs]" value="1"<?php if ($config['quote_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[quote_imgs]" value="0"<?php if (!$config['quote_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['quote_imgs help'] ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['click_imgs'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[click_imgs]" value="1"<?php if ($config['click_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="config[click_imgs]" value="0"<?php if (!$config['click_imgs']) {
-    echo ' checked="checked"';
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['click_imgs help'] ?></span>
-									</td>
-								</tr>
-
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['valid_imgs'] ?></th>
-									<td colspan="2">
-										<input type="radio" name="config[valid_imgs]" value="1"<?php if ($config['valid_imgs']) {
-    echo ' checked="checked"';
-} if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. Utils::escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php _e('Yes') ?></strong>
-										<input type="radio" name="config[valid_imgs]" value="0"<?php if (!$config['valid_imgs']) {
-    echo ' checked="checked"';
-} if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. Utils::escape($lang_admin_parser['unavailable']) .'"');
-} ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td><?php echo $lang_admin_parser['valid_imgs help'] ?></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['max_size'] ?></th>
-									<td colspan="2">
-										<input type="text" name="config[max_size]" size="10" maxlength="8" value="<?php echo($config['max_size'])?>"<?php if (!ini_get('allow_url_fopen')) {
-    echo(' disabled="disabled" title="'. Utils::escape($lang_admin_parser['unavailable']) .'"');
-} ?> />
-									</td>
-									<td><span><?php echo $lang_admin_parser['max_size help'] ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['def_xy'] ?></th>
-									<td>
-										<input type="text" name="config[def_width]" size="5" maxlength="5" value="<?php echo $config['def_width'] ?>" /> X:Width
-									</td>
-									<td>
-										<input type="text" name="config[def_height]" size="5" maxlength="5" value="<?php echo $config['def_height'] ?>" /> Y:Height
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['def_xy help'] ?></span>
-									</td>
-								</tr>
-
-
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['max_xy'] ?></th>
-									<td>
-										<input type="text" name="config[max_width]" size="5" maxlength="5" value="<?php echo $config['max_width'] ?>" /> X:Width
-									</td>
-									<td>
-										<input type="text" name="config[max_height]" size="5" maxlength="5" value="<?php echo $config['max_height'] ?>" /> Y:Height
-									</td>
-									<td><?php echo $lang_admin_parser['max_xy help'] ?></td>
-								</tr>
-
-								<tr>
-									<th scope="row"><?php echo $lang_admin_parser['smiley_size'] ?></th>
-									<td colspan=2>
-										<input type="text" name="config[smiley_size]" size="5" maxlength="5" value="<?php echo $config['smiley_size'] .'%' ?>" />
-									</td>
-									<td>
-										<span><?php echo $lang_admin_parser['smiley_size help'] ?></span>
-									</td>
-								</tr>
-
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php echo $lang_admin_parser['Smilies subhead'] ?></legend>
-						<div class="infldset">
-							<table cellspacing="0">
-							<thead>
-								<tr>
-									<th scope="col"><?php echo $lang_admin_parser['smiley_text_label'] ?></th>
-									<th scope="col"><?php echo $lang_admin_parser['smiley_file_label'] ?></th>
-									<th scope="col">:)</th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-    foreach ($smilies as $key => $value) {
-        $i++;
-        $oldfile = $value['file'];
-        ?>
-								<tr>
-									<td><input type="text" name="smiley_text[<?php echo($i);
-        ?>]" value="<?php echo(Utils::escape($key));
-        ?>" size="20" maxlength="80" /></td>
-									<td>
-										<select name="smiley_file[<?php echo($i);
-        ?>]">
-<?php
-        foreach ($smiley_files as $file) {
-            if ($file === $oldfile) {
-                echo("\t\t\t\t\t\t\t\t\t\t\t<option selected=\"selected\">" . $file . "</option>\n");
-            } else {
-                echo("\t\t\t\t\t\t\t\t\t\t\t<option>" . $file . "</option>\n");
-            }
-        }
-        ?>
-										</select>
-									</td>
-									<td>
-										<?php echo($value['html']);
-        ?>
-									</td>
-								</tr>
-<?php
-
-    }
-?>
-								<tr>
-									<td><input type="text" name="smiley_text[<?php echo(++$i); ?>]" value="" size="20" maxlength="80" /><br />New smiley text</td>
-									<td>
-										<select name="smiley_file[<?php echo($i); ?>]">
-											<option selected="selected">select new file</option>
-<?php
-        foreach ($smiley_files as $file) {
-            echo("\t\t\t\t\t\t\t\t\t\t\t<option>" . $file . "</option>\n");
-        }
-?>
-										</select><br /><?php echo($lang_admin_parser['New smiley image']); ?>
-									</td>
-									<td></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php echo($lang_admin_parser['smiley_upload']); ?></th>
- <?php if (ini_get('file_uploads')) {
-    ?>
-									<td><input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
-										<input type="file" name="new_smiley" id="upload_smiley" /></td>
-									<td><input type="submit" name="upload" value="<?php echo($lang_admin_parser['upload_button']);
-    ?>" /></td>
-<?php 
-} else {
-    ?>
-									<td colspan="2"><?php echo($lang_admin_parser['upload_off']);
-    ?></td>
-<?php 
-} ?>
-								</tr>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-
-
-
-				<div class="inform">
-					<fieldset>
-						<legend><?php echo $lang_admin_parser['BBCodes subhead'] ?></legend>
-						<div class="infldset">
-							<table cellspacing="0">
-							<thead>
-								<tr>
-									<th class="tcl" scope="col"><?php echo $lang_admin_parser['tagname_label'] ?></th>
-									<th class="tc3" scope="col"><?php echo $lang_admin_parser['in_post_label'] ?></th>
-									<th class="hidehead" scope="col"><?php echo $lang_admin_parser['in_sig_label'] ?></th>
-									<th class="tc2" scope="col"><?php echo $lang_admin_parser['depth_max'] ?></th>
-								</tr>
-							</thead>
-							<tbody>
-<?php
-foreach ($bbcd as $tagname => $tagdata) {
-    if ($tagname == '_ROOT_') {
-        continue;
-    } // Skip last pseudo-tag
-    $title = isset($lang_admin_parser['tag_summary'][$tagname]) ?
-                $lang_admin_parser['tag_summary'][$tagname] : '';
-    ?>
-								<tr>
-									<th scope="row" title="<?php echo($title);
-    ?>"><?php echo('['. $tagname .']') ?></th>
-									<td>
-										<input type="radio" name="<?php echo($tagname) ?>_in_post" value="1"<?php if ($bbcd[$tagname]['in_post']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_post" value="0"<?php if (!$bbcd[$tagname]['in_post']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<input type="radio" name="<?php echo($tagname) ?>_in_sig" value="1"<?php if ($bbcd[$tagname]['in_sig']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('Yes') ?></strong>   <input type="radio" name="<?php echo($tagname) ?>_in_sig" value="0"<?php if (!$bbcd[$tagname]['in_sig']) {
-    echo ' checked="checked"';
-}
-    ?> /> <strong><?php _e('No') ?></strong>
-									</td>
-									<td>
-										<input type="text" size="10" name="<?php echo($tagname) ?>_depth_max" value="<?php echo($bbcd[$tagname]['depth_max']);
-    ?>" <?php if ($tagdata['html_type'] === 'inline' || $tagdata['tag_type'] === 'hidden') {
-    echo(' disabled="disabled" style="display: none;"');
-}
-    ?> />
-									</td>
-								</tr>
-<?php 
-} ?>
-							</tbody>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-
-
-				<p class="submitend">
-					<input type="submit" name="save" value="<?php _e('Save changes') ?>" />
-					<input type="submit" name="reset" value="<?php echo $lang_admin_parser['reset defaults'] ?>" />
-				</p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/permissions.php b/view/admin/permissions.php
deleted file mode 100644
index 370b1507..00000000
--- a/view/admin/permissions.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Permissions head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?php echo $feather->url->get('admin/permissions/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<p class="submittop"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-				<div class="inform">
-					<input type="hidden" name="form_sent" value="1" />
-					<fieldset>
-						<legend><?php _e('Posting subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('BBCode label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="1"<?php if ($feather->forum_settings['p_message_bbcode'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_bbcode]" value="0"<?php if ($feather->forum_settings['p_message_bbcode'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('BBCode help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Image tag label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="1"<?php if ($feather->forum_settings['p_message_img_tag'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_img_tag]" value="0"<?php if ($feather->forum_settings['p_message_img_tag'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Image tag help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('All caps message label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="1"<?php if ($feather->forum_settings['p_message_all_caps'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[message_all_caps]" value="0"<?php if ($feather->forum_settings['p_message_all_caps'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('All caps message help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('All caps subject label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="1"<?php if ($feather->forum_settings['p_subject_all_caps'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[subject_all_caps]" value="0"<?php if ($feather->forum_settings['p_subject_all_caps'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('All caps subject help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Require e-mail label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="1"<?php if ($feather->forum_settings['p_force_guest_email'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[force_guest_email]" value="0"<?php if ($feather->forum_settings['p_force_guest_email'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Require e-mail help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Signatures subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('BBCode sigs label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="1"<?php if ($feather->forum_settings['p_sig_bbcode'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_bbcode]" value="0"<?php if ($feather->forum_settings['p_sig_bbcode'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('BBCode sigs help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Image tag sigs label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="1"<?php if ($feather->forum_settings['p_sig_img_tag'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_img_tag]" value="0"<?php if ($feather->forum_settings['p_sig_img_tag'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Image tag sigs help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('All caps sigs label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="1"<?php if ($feather->forum_settings['p_sig_all_caps'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[sig_all_caps]" value="0"<?php if ($feather->forum_settings['p_sig_all_caps'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('All caps sigs help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max sig length label') ?></th>
-									<td>
-										<input type="text" name="form[sig_length]" size="5" maxlength="5" value="<?php echo $feather->forum_settings['p_sig_length'] ?>" />
-										<span class="clearb"><?php _e('Max sig length help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Max sig lines label') ?></th>
-									<td>
-										<input type="text" name="form[sig_lines]" size="3" maxlength="3" value="<?php echo $feather->forum_settings['p_sig_lines'] ?>" />
-										<span class="clearb"><?php _e('Max sig lines help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Registration subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Banned e-mail label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="1"<?php if ($feather->forum_settings['p_allow_banned_email'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_banned_email]" value="0"<?php if ($feather->forum_settings['p_allow_banned_email'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Banned e-mail help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Duplicate e-mail label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '1') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($feather->forum_settings['p_allow_dupe_email'] == '0') {
-    echo ' checked="checked"';
-} ?> />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Duplicate e-mail help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="save" value="<?php _e('Save changes') ?>" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/plugins.php b/view/admin/plugins.php
deleted file mode 100644
index fde8d1f2..00000000
--- a/view/admin/plugins.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div class="block">
-    <h2>Plugins</h2>
-    <div class="box">
-        <div class="inbox">
-            <table class="table">
-                <caption>The following plugins are available</caption>
-                <thead>
-                    <tr>
-                        <th>Extension</th>
-                        <th>Description</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <?php foreach ($pluginsList as $plugin => $class) : ?>
-                        <tr>
-                            <td>
-                                <strong><?= $class::$name; ?></strong>
-                                <div class="plugin-actions">
-                                    <?php if (array_key_exists($class, $activePlugins)) { ?>
-                                        <a href="<?= $feather->url->get('/admin/plugins/deactivate?plugin='.$class) ?>">Deactivate</a>
-                                    <?php } else { ?>
-                                        <a href="<?= $feather->url->get('/admin/plugins/activate?plugin='.$class) ?>">Activate</a>
-                                    <?php } ?>
-                                </div>
-                            </td>
-                            <td>
-                                <?= $class::$description; ?>
-                                <div class="plugin-details">
-                                    Version <?= $class::$version; ?> |
-                                    By <?= $class::$author; ?>
-                                </div>
-                            </td>
-                        </tr>
-                    <?php endforeach; ?>
-                </tbody>
-            </table>
-            <p style="text-align:right"><?= count($pluginsList) ?> éléments</p>
-        </div>
-    </div>
-</div>
-
-	<div class="clearer"></div>
-</div>
diff --git a/view/admin/reports.php b/view/admin/reports.php
deleted file mode 100644
index f5f53dc0..00000000
--- a/view/admin/reports.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('New reports head') ?></span></h2>
-		<div class="box">
-			<form method="post" action="<?= $feather->url->get('admin/reports/') ?>">
-				<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
-<?php
-if (!empty($report_data)) {
-    foreach ($report_data as $report) {
-        ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php printf(__('Report subhead'), $feather->utils->format_time($report['created'])) ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?= $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
-									<td><?= str_replace("\n", '<br />', Utils::escape($report['message'])) ?></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-    }
-} else {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('None') ?></legend>
-						<div class="infldset">
-							<p><?php _e('No new reports') ?></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-}
-
-?>
-			</form>
-		</div>
-	</div>
-
-	<div class="blockform block2">
-		<h2><span><?php _e('Last 10 head') ?></span></h2>
-		<div class="box">
-			<div class="fakeform">
-<?php
-
-if (!empty($report_zapped_data)) {
-    foreach ($report_zapped_data as $report) {
-        ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->url->get('user/'.$report['zapped_by_id'].'/').'">'.Utils::escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->url->get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
-									<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => $feather->url->get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
-																						$report['subject'] => $feather->url->get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
-																						sprintf(__('Post ID'), $report['pid']) => $feather->url->get('post/'.$report['pid'].'/#p'.$report['pid']))) ?></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Reason') ?></th>
-									<td><?= str_replace("\n", '<br />', Utils::escape($report['message'])) ?></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-    }
-} else {
-    ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('None') ?></legend>
-						<div class="infldset">
-							<p><?php _e('No zapped reports') ?></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-}
-
-?>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
diff --git a/view/admin/statistics.php b/view/admin/statistics.php
deleted file mode 100644
index 5317a2ce..00000000
--- a/view/admin/statistics.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="block">
-		<h2><span><?php _e('Server statistics head') ?></span></h2>
-		<div id="adstats" class="box">
-			<div class="inbox">
-				<dl>
-					<dt><?php _e('Server load label') ?></dt>
-					<dd>
-						<?php printf(__('Server load data')."\n", $server_load, $num_online) ?>
-					</dd>
-<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
-					<dd>
-						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
-						<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->url->get('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
-						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
-					</dd>
-					<dt><?php _e('Database label') ?></dt>
-					<dd>
-<?php if (isset($total_records) && isset($total_size)): ?>						<?php printf(__('Database data rows')."\n", Utils::forum_number_format($total_records)) ?>
-						<br /><?php printf(__('Database data size')."\n", $total_size) ?>
-<?php endif; ?>					</dd>
-<?php endif; ?>
-				</dl>
-			</div>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/users/admin_users.php b/view/admin/users/admin_users.php
deleted file mode 100644
index 57117eb0..00000000
--- a/view/admin/users/admin_users.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('User search head') ?></span></h2>
-		<div class="box">
-			<form id="find_user" method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
-				<p class="submittop"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="1" /></p>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('User search subhead') ?></legend>
-						<div class="infldset">
-							<p><?php _e('User search info') ?></p>
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Username label') ?></th>
-									<td><input type="text" name="form[username]" size="25" maxlength="25" tabindex="2" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('E-mail address label') ?></th>
-									<td><input type="text" name="form[email]" size="30" maxlength="80" tabindex="3" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Title label') ?></th>
-									<td><input type="text" name="form[title]" size="30" maxlength="50" tabindex="4" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Real name label') ?></th>
-									<td><input type="text" name="form[realname]" size="30" maxlength="40" tabindex="5" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Website label') ?></th>
-									<td><input type="text" name="form[url]" size="35" maxlength="100" tabindex="6" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Jabber label') ?></th>
-									<td><input type="text" name="form[jabber]" size="30" maxlength="75" tabindex="7" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('ICQ label') ?></th>
-									<td><input type="text" name="form[icq]" size="12" maxlength="12" tabindex="8" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('MSN label') ?></th>
-									<td><input type="text" name="form[msn]" size="30" maxlength="50" tabindex="9" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('AOL label') ?></th>
-									<td><input type="text" name="form[aim]" size="20" maxlength="20" tabindex="10" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Yahoo label') ?></th>
-									<td><input type="text" name="form[yahoo]" size="20" maxlength="20" tabindex="11" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Location label') ?></th>
-									<td><input type="text" name="form[location]" size="30" maxlength="30" tabindex="12" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Signature label') ?></th>
-									<td><input type="text" name="form[signature]" size="35" maxlength="512" tabindex="13" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Admin note label') ?></th>
-									<td><input type="text" name="form[admin_note]" size="30" maxlength="30" tabindex="14" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Posts more than label') ?></th>
-									<td><input type="text" name="posts_greater" size="5" maxlength="8" tabindex="15" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Posts less than label') ?></th>
-									<td><input type="text" name="posts_less" size="5" maxlength="8" tabindex="16" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last post after label') ?></th>
-									<td><input type="text" name="last_post_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last post before label') ?></th>
-									<td><input type="text" name="last_post_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last visit after label') ?></th>
-									<td><input type="text" name="last_visit_after" size="24" maxlength="19" tabindex="17" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Last visit before label') ?></th>
-									<td><input type="text" name="last_visit_before" size="24" maxlength="19" tabindex="18" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Registered after label') ?></th>
-									<td><input type="text" name="registered_after" size="24" maxlength="19" tabindex="19" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Registered before label') ?></th>
-									<td><input type="text" name="registered_before" size="24" maxlength="19" tabindex="20" />
-									<span><?php _e('Date help') ?></span></td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Order by label') ?></th>
-									<td>
-										<select name="order_by" tabindex="21">
-											<option value="username" selected="selected"><?php _e('Order by username') ?></option>
-											<option value="email"><?php _e('Order by e-mail') ?></option>
-											<option value="num_posts"><?php _e('Order by posts') ?></option>
-											<option value="last_post"><?php _e('Order by last post') ?></option>
-											<option value="last_visit"><?php _e('Order by last visit') ?></option>
-											<option value="registered"><?php _e('Order by registered') ?></option>
-										</select>&#160;&#160;&#160;<select name="direction" tabindex="22">
-											<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
-											<option value="DESC"><?php _e('Descending') ?></option>
-										</select>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('User group label') ?></th>
-									<td>
-										<select name="user_group" tabindex="23">
-											<option value="-1" selected="selected"><?php _e('All groups') ?></option>
-											<option value="0"><?php _e('Unverified users') ?></option>
-											<?php echo $group_list; ?>
-										</select>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="find_user" value="<?php _e('Submit search') ?>" tabindex="25" /></p>
-			</form>
-		</div>
-
-		<h2 class="block2"><span><?php _e('IP search head') ?></span></h2>
-		<div class="box">
-			<form method="get" action="<?php echo $feather->url->get('admin/users/') ?>">
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('IP search subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('IP address label') ?><div><input type="submit" value="<?php _e('Find IP address') ?>" tabindex="26" /></div></th>
-									<td><input type="text" name="show_users" size="18" maxlength="15" tabindex="24" />
-									<span><?php _e('IP address help') ?></span></td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/users/ban_users.php b/view/admin/users/ban_users.php
deleted file mode 100644
index e37ceaa8..00000000
--- a/view/admin/users/ban_users.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Ban users') ?></span></h2>
-		<div class="box">
-			<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Message expiry subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('Ban message label') ?></th>
-									<td>
-										<input type="text" name="ban_message" size="50" maxlength="255" tabindex="1" />
-										<span><?php _e('Ban message help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Expire date label') ?></th>
-									<td>
-										<input type="text" name="ban_expire" size="17" maxlength="10" tabindex="2" />
-										<span><?php _e('Expire date help') ?></span>
-									</td>
-								</tr>
-								<tr>
-									<th scope="row"><?php _e('Ban IP label') ?></th>
-									<td>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="3" value="1" checked="checked" />&#160;<strong><?php _e('Yes') ?></strong></label>
-										<label class="conl"><input type="radio" name="ban_the_ip" tabindex="4" value="0" checked="checked" />&#160;<strong><?php _e('No') ?></strong></label>
-										<span class="clearb"><?php _e('Ban IP help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="ban_users_comply" value="<?php _e('Save') ?>" tabindex="3" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/users/delete_users.php b/view/admin/users/delete_users.php
deleted file mode 100644
index 747697ab..00000000
--- a/view/admin/users/delete_users.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Delete users') ?></span></h2>
-		<div class="box">
-			<form name="confirm_del_users" method="post" action="<?php echo $feather->url->get('admin/users') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Confirm delete legend') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Confirm delete info') ?></p>
-							<div class="rbox">
-								<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
-							</div>
-							<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
-						</div>
-					</fieldset>
-				</div>
-				<p class="buttons"><input type="submit" name="delete_users_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/users/find_users.php b/view/admin/users/find_users.php
deleted file mode 100644
index 7c5cc513..00000000
--- a/view/admin/users/find_users.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-
-<form id="search-users-form" action="<?php echo $feather->url->get('admin/users/') ?>" method="post">
-<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<div id="users2" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
-					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
-					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
-<?php if ($can_action): ?>					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
-<?php endif;
-    ?>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-    if (!empty($user_data)) {
-        foreach ($user_data as $user) {
-            ?>
-				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo Utils::escape($user['email']) ?>"><?php echo Utils::escape($user['email']) ?></a></td>
-					<td class="tc3"><?php echo $user['user_title'] ?></td>
-					<td class="tc4"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
-					<td class="tc5"><?php echo($user['admin_note'] != '') ? Utils::escape($user['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.$feather->url->get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
-<?php if ($can_action): ?>					<td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
-<?php endif;
-            ?>
-				</tr>
-<?php
-
-        }
-    } else {
-        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('No match').'</td></tr>'."\n";
-    }
-
-    ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-<?php if ($can_action): ?>			<p class="conr modbuttons"><a href="#" onclick="return select_checkboxes('search-users-form', this, '<?php _e('Unselect all') ?>')"><?php _e('Select all') ?></a> <?php if ($can_ban) : ?><input type="submit" name="ban_users" value="<?php _e('Ban') ?>" /><?php endif;
-    if ($can_delete) : ?><input type="submit" name="delete_users" value="<?php _e('Delete') ?>" /><?php endif;
-    if ($can_move) : ?><input type="submit" name="move_users" value="<?php _e('Change group') ?>" /><?php endif;
-    ?></p>
-<?php endif;
-    ?>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
-</form>
diff --git a/view/admin/users/move_users.php b/view/admin/users/move_users.php
deleted file mode 100644
index 05933bf0..00000000
--- a/view/admin/users/move_users.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="blockform">
-		<h2><span><?php _e('Move users') ?></span></h2>
-		<div class="box">
-			<form name="confirm_move_users" method="post" action="<?php echo $feather->url->get('admin/users/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<input type="hidden" name="users" value="<?php echo implode(',', $move['user_ids']) ?>" />
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Move users subhead') ?></legend>
-						<div class="infldset">
-							<table class="aligntop">
-								<tr>
-									<th scope="row"><?php _e('New group label') ?></th>
-									<td>
-										<select name="new_group" tabindex="1">
-<?php foreach ($move['all_groups'] as $gid => $group) : ?>											<option value="<?php echo $gid ?>"><?php echo Utils::escape($group) ?></option>
-<?php endforeach;
-    ?>
-										</select>
-										<span><?php _e('New group help') ?></span>
-									</td>
-								</tr>
-							</table>
-						</div>
-					</fieldset>
-				</div>
-				<p class="submitend"><input type="submit" name="move_users_comply" value="<?php _e('Save') ?>" tabindex="2" /></p>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/admin/users/search_ip.php b/view/admin/users/search_ip.php
deleted file mode 100644
index a5f3f390..00000000
--- a/view/admin/users/search_ip.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="users1" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results IP address head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results last used head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results times found head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results action head') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-        foreach ($ip_data as $ip) {
-            ?>
-				<tr>
-					<td class="tcl"><a href="<?php echo $feather->url->get('moderate/get-host/ip/'.Utils::escape($ip['poster_ip']).'/') ?>"><?php echo Utils::escape($ip['poster_ip']) ?></a></td>
-					<td class="tc2"><?php echo $feather->utils->format_time($ip['last_used']) ?></td>
-					<td class="tc3"><?php echo $ip['used_times'] ?></td>
-					<td class="tcr"><a href="<?php echo $feather->url->get('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
-				</tr>
-<?php
-
-        }
-        if (empty($ip_data)):
-            echo "\t\t\t\t".'<tr><td class="tcl" colspan="4">'.__('Results no posts found').'</td></tr>'."\n";
-        endif;
-
-    ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/admin/users/show_users.php b/view/admin/users/show_users.php
deleted file mode 100644
index 85899359..00000000
--- a/view/admin/users/show_users.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="users2" class="blocktable">
-	<h2><span><?php _e('Results head') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Results username head') ?></th>
-					<th class="tc2" scope="col"><?php _e('Results e-mail head') ?></th>
-					<th class="tc3" scope="col"><?php _e('Results title head') ?></th>
-					<th class="tc4" scope="col"><?php _e('Results posts head') ?></th>
-					<th class="tc5" scope="col"><?php _e('Results admin note head') ?></th>
-					<th class="tcr" scope="col"><?php _e('Results actions head') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-    if ($info['num_posts']) {
-
-        // Loop through users and print out some info
-        foreach ($info['posters'] as $cur_poster) {
-            if (isset($info['user_data'][$cur_poster['poster_id']])) {
-                ?>
-				<tr>
-					<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.Utils::escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
-					<td class="tc2"><a href="mailto:<?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
-					<td class="tc3"><?php echo get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
-					<td class="tc4"><?php echo Utils::forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
-					<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? Utils::escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
-					<td class="tcr"><?php echo '<a href="'.$feather->url->get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
-				</tr>
-<?php
-
-            } else {
-                ?>
-				<tr>
-					<td class="tcl"><?php echo Utils::escape($cur_poster['poster']) ?></td>
-					<td class="tc2">&#160;</td>
-					<td class="tc3"><?php _e('Results guest') ?></td>
-					<td class="tc4">&#160;</td>
-					<td class="tc5">&#160;</td>
-					<td class="tcr">&#160;</td>
-				</tr>
-<?php
-
-            }
-        }
-    } else {
-        echo "\t\t\t\t".'<tr><td class="tcl" colspan="6">'.__('Results no IP found').'</td></tr>'."\n";
-    }
-
-    ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/delete.php b/view/delete.php
deleted file mode 100644
index b4d2a1e9..00000000
--- a/view/delete.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-use FeatherBB\Core\Url;
-use FeatherBB\Core\Utils;
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?= Url::base() ?>"><?php _e('Index') ?></a></li>
-            <li><span>»&#160;</span><a href="<?= $feather->urlFor('Forum', ['id' => $cur_post['fid'], 'name' => Url::url_friendly($cur_post['forum_name'])]) ?>"><?= Utils::escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?= $feather->urlFor('viewPost', ['pid' => $id]).'#p'.$id ?>"><?= Utils::escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<div class="blockform">
-	<h2><span><?php _e('Delete post') ?></span></h2>
-	<div class="box">
-		<form method="post" action="<?= $feather->urlFor('deletePost', array('id'=>$id)) ?>">
-			<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
-			<div class="inform">
-				<div class="forminfo">
-					<h3><span><?php printf($is_topic_post ? __('Topic by') : __('Reply by'), '<strong>'.$feather->utils->escape($cur_post['poster']).'</strong>', $feather->utils->format_time($cur_post['posted'])) ?></span></h3>
-					<p><?= ($is_topic_post) ? '<strong>'.__('Topic warning').'</strong>' : '<strong>'.__('Warning').'</strong>' ?><br /><?php _e('Delete info') ?></p>
-				</div>
-			</div>
-			<p class="buttons"><input type="submit" name="delete" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
-
-<div id="postreview">
-	<div class="blockpost">
-		<div class="box">
-			<div class="inbox">
-				<div class="postbody">
-					<div class="postleft">
-						<dl>
-							<dt><strong><?= Utils::escape($cur_post['poster']) ?></strong></dt>
-							<dd><span><?= $feather->utils->format_time($cur_post['posted']) ?></span></dd>
-						</dl>
-					</div>
-					<div class="postright">
-						<div class="postmsg">
-							<?= $cur_post['message']."\n" ?>
-						</div>
-					</div>
-				</div>
-				<div class="clearer"></div>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/view/edit.php b/view/edit.php
deleted file mode 100644
index 24b5b449..00000000
--- a/view/edit.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-$cur_index = 1;
-
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$cur_post['tid'].'/'.$feather->url->url_friendly($cur_post['subject']).'/') ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Edit post') ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<?php
-
-// If there are errors, we display them
-if (!empty($errors)) :
-?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('Post errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('Post errors info') ?></p>
-			<ul class="error-list">
-<?php
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-?>
-			</ul>
-		</div>
-	</div>
-</div>
-<?php
-elseif ($feather->request->post('preview')):
-?>
-<div id="postpreview" class="blockpost">
-	<h2><span><?php _e('Post preview') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postright">
-					<div class="postmsg">
-						<?php echo $preview_message."\n" ?>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-<?php
-endif;
-?>
-<!-- Init BBcode editor toolbar -->
-<script>
-    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
-        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
-</script>
-<script src="<?php echo Url::base() ?>/style/imports/bbeditor.js"></script>
-<div id="editform" class="blockform">
-	<h2><span><?php _e('Edit post') ?></span></h2>
-	<div class="box">
-		<form id="edit" method="post" action="<?php echo $feather->url->get('edit/'.$id.'/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Edit post legend') ?></legend>
-					<input type="hidden" name="form_sent" value="1" />
-					<div class="infldset txtarea">
-<?php if ($can_edit_subject): ?>						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" value="<?php echo Utils::escape($feather->request->post('req_subject') ? $feather->request->post('req_subject') : $cur_post['subject']) ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
-						<script>postEditorToolbar('req_message');</script>
-                        <textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo Utils::escape($feather->request->post('req_message') ? $post['message'] : $cur_post['message']) ?></textarea><br /></label>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
-						</ul>
-					</div>
-				</fieldset>
-			</div>
-<?php
-if (!empty($checkboxes)):
-?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Options') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php
-endif;
-?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
diff --git a/view/error.php b/view/error.php
deleted file mode 100644
index 8d4d01cb..00000000
--- a/view/error.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="msg" class="block error">
-    <h2><span><?= $msg_title ?></span></h2>
-    <div class="box">
-        <div class="inbox">
-            <p><?php echo $msg ?></p>
-            <?php if (!$no_back_link) {
-                echo "\t\t\t".'<p><a href="javascript: history.go(-1)">'.__('Go back').'</a></p>';
-            } ?>
-        </div>
-    </div>
-</div>
diff --git a/view/footer.php b/view/footer.php
deleted file mode 100644
index 98c2aced..00000000
--- a/view/footer.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-?>
-</div>
-
-<div id="brdfooter" class="block">
-	<h2><span><?php _e('Board footer') ?></span></h2>
-	<div class="box">
-<?php
-
-if (isset($footer_style) && ($footer_style == 'Forum' || $footer_style == 'Topic') && $is_admmod) {
-    echo "\t\t".'<div id="modcontrols" class="inbox">'."\n";
-
-    if ($footer_style == 'Forum') {
-        echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/forum/'.$forum_id.'/page/'.$p.'/').'">'.__('Moderate forum').'</a></span></dd>'."\n";
-        echo "\t\t\t".'</dl>'."\n";
-    } elseif ($footer_style == 'Topic') {
-        if (isset($pid)) {
-            $parameter = 'param/'.$pid.'/';
-        } elseif (isset($p) && $p != 1) {
-            $parameter = 'param/'.$p.'/';
-        } else {
-            $parameter = '';
-        }
-
-
-        echo "\t\t\t".'<dl>'."\n";
-        echo "\t\t\t\t".'<dt><strong>'.__('Mod controls').'</strong></dt>'."\n";
-        // TODO: all
-        //echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/param/'.$p).'">'.__('Moderate topic').'</a>'.($num_pages > 1 ? ' (<a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/'.$parameter.'/all/').'">'.__('All').'</a>)' : '').'</span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/moderate/page/'.$p.'/').'">'.__('Moderate topic').'</a></span></dd>'."\n";
-        echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/move/'.$parameter).'">'.__('Move topic').'</a></span></dd>'."\n";
-
-        if ($cur_topic['closed'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/open/'.$parameter).'">'.__('Open topic').'</a></span></dd>'."\n";
-        } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/close/'.$parameter).'">'.__('Close topic').'</a></span></dd>'."\n";
-        }
-
-        if ($cur_topic['sticky'] == '1') {
-            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/unstick/'.$parameter).'">'.__('Unstick topic').'</a></span></dd>'."\n";
-        } else {
-            echo "\t\t\t\t".'<dd><span><a href="'.get('moderate/topic/'.$id.'/forum/'.$forum_id.'/action/stick/'.$parameter).'">'.__('Stick topic').'</a></span></dd>'."\n";
-        }
-
-        echo "\t\t\t".'</dl>'."\n";
-    }
-
-    echo "\t\t\t".'<div class="clearer"></div>'."\n\t\t".'</div>'."\n";
-}
-
-?>
-		<div id="brdfooternav" class="inbox">
-
-<?php
-// Display the "Jump to" drop list
-if ($feather_config['o_quickjump'] == '1' && !empty($quickjump)) { ?>
-			<div class="conl">
-			<form id="qjump" method="get" action="">
-				<div><label><span><?php _e('Jump to') ?><br /></span></label>
-					<select name="id" onchange="window.location=('<?php echo get('forum/') ?>'+this.options[this.selectedIndex].value)">
-<?php
-		foreach ($quickjump[(int) $feather->user->g_id] as $cat_id => $cat_data) {
-			echo "\t\t\t\t\t\t\t".'<optgroup label="'.feather_escape($cat_data['cat_name']).'">'."\n";
-			foreach ($cat_data['cat_forums'] as $forum) {
-				echo "\t\t\t\t\t\t\t\t".'<option value="'.$forum['forum_id'].'/'.$feather->url->url_friendly($forum['forum_name']).'"'.($forum_id == 2 ? ' selected="selected"' : '').'>'.$forum['forum_name'].'</option>'."\n";
-			}
-			echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
-		} ?>
-					</select>
-					<noscript><input type="submit" value="<?php _e('Go') ?>" accesskey="g" /></noscript>
-				</div>
-			</form>
-			</div>
-<?php } ?>
-
-			<div class="conr">
-<?php
-
-if ($footer_style == 'index') {
-    if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=rss">'.__('RSS active topics feed').'</a></span></p>'."\n";
-    } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;type=atom">'.__('Atom active topics feed').'</a></span></p>'."\n";
-    }
-} elseif ($footer_style == 'Forum') {
-    if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=rss">'.__('RSS forum feed').'</a></span></p>'."\n";
-    } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;fid='.$forum_id.'&amp;type=atom">'.__('Atom forum feed').'</a></span></p>'."\n";
-    }
-} elseif ($footer_style == 'Topic') {
-    if ($feather_config['o_feed_type'] == '1') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="rss"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=rss">'.__('RSS topic feed').'</a></span></p>'."\n";
-    } elseif ($feather_config['o_feed_type'] == '2') {
-        echo "\t\t\t\t".'<p id="feedlinks"><span class="atom"><a href="'.$feather->url->base().'/extern.php?action=feed&amp;tid='.$id.'&amp;type=atom">'.__('Atom topic feed').'</a></span></p>'."\n";
-    }
-}
-
-?>
-				<p id="poweredby"><?php printf(__('Powered by'), '<a href="http://featherbb.org/">FeatherBB</a>'.(($feather_config['o_show_version'] == '1') ? ' '.$feather_config['o_cur_version'] : '')) ?></p>
-			</div>
-			<div class="clearer"></div>
-		</div>
-	</div>
-</div>
-<?php
-
-// Display debug info (if enabled/defined)
-if ($feather->forum_env['FEATHER_SHOW_INFO']) {
-    $feather->debug->info();
-}
-
-// Display executed queries (if enabled)
-if ($feather->forum_env['FEATHER_SHOW_QUERIES']) {
-    $feather->debug->queries();
-}
-?>
-
-</section>
-
-<script src="<?php echo $feather->url->base() ?>/style/themes/FeatherBB/phone.min.js"></script>
-
-</body>
-</html>
diff --git a/view/header.php b/view/header.php
deleted file mode 100644
index fdbfa249..00000000
--- a/view/header.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php _e('lang_identifier') ?>" lang="<?php _e('lang_identifier') ?>" dir="<?php _e('lang_direction') ?>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
-<title><?php echo Utils::generate_page_title($page_title, $p) ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo $feather->url->base() ?>/style/themes/<?php echo $feather->user->style.'.css' ?>" />
-<?php
-
-echo $allow_index;
-echo $admin_console;
-
-if (isset($required_fields)) :
-    // Output JavaScript to validate form (make sure required fields are filled out)
-
-    ?>
-    <script type="text/javascript">
-        /* <![CDATA[ */
-        function process_form(the_form)
-        {
-            var required_fields = {
-                <?php
-                    // Output a JavaScript object with localised field names
-                    $tpl_temp = count($required_fields);
-                    foreach ($required_fields as $elem_orig => $elem_trans) {
-                        echo "\t\t\"".$elem_orig.'": "'.addslashes(str_replace('&#160;', ' ', $elem_trans));
-                        if (--$tpl_temp) {
-                            echo "\",\n";
-                        } else {
-                            echo "\"\n\t};\n";
-                        }
-                    }
-                    ?>
-                if (document.all || document.getElementById)
-            {
-                for (var i = 0; i < the_form.length; ++i)
-                {
-                    var elem = the_form.elements[i];
-                    if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
-                    {
-                        alert('"' + required_fields[elem.name] + '" <?php _e('required field') ?>');
-                        elem.focus();
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-        /* ]]> */
-    </script>
-    <?php
-endif;
-if (!empty($page_head)) :
-    echo implode("\n", $page_head)."\n";
-endif;
-?>
-</head>
-
-<body id="pun<?= $active_page ?>"<?= $focus_element; ?>>
-
-<header>
-
-    <nav>
-        <div class="container">
-            <div class="phone-menu" id="phone-button">
-                <a class="button-phone"></a>
-            </div>
-            <div id="phone">
-                <?php echo $navlinks ?>
-                <div class="navbar-right">
-                    <form method="get" action="/search" class="nav-search">
-                        <input type="hidden" name="action" value="search">
-                        <input type="text" name="keywords" size="20" maxlength="100" placeholder="<?php _e('Search') ?>">
-                    </form>
-                </div>
-            </div>
-        </div>
-    </nav>
-
-    <div class="container">
-        <div class="container-title-status">
-            <h1 class="title-site">
-                <a href="<?php echo $feather->url->base() ?>" title="" class="site-name">
-                    <p><?php echo feather_escape($feather_config['o_board_title']) ?></p>
-                </a>
-                <div id="brddesc"><?php echo htmlspecialchars_decode($feather_config['o_board_desc']) ?></div>
-            </h1>
-            <div class="status-avatar">
-                <?php echo $page_info ?>
-            </div>
-            <div class="clear"></div>
-        </div>
-        <?php if ($feather->user->g_read_board == '1' && $feather_config['o_announcement'] == '1') : ?>
-            <div id="announce" class="block">
-                <div class="hd"><h2><span><?php _e('Announcement') ?></span></h2></div>
-                <div class="box">
-                    <div id="announce-block" class="inbox">
-                        <div class="usercontent"><?php echo $feather_config['o_announcement_message'] ?></div>
-                    </div>
-                </div>
-            </div>
-        <?php endif; ?>
-        <?php if (isset($flash['message'])) : ?>
-            <script type="text/javascript" src="<?=$feather->url->base();?>/js/common.js"></script>
-            <div id="msgflash" class="block">
-                <h2><span><?php _e('Info') ?></span><span style="float:right;cursor:pointer" onclick="fadeOut('msgflash', 9);">&times;</span></h2>
-                <div class="box">
-                    <div class="inbox">
-                        <p><?php echo feather_escape($flash['message']) ?></p>
-                    </div>
-                </div>
-            </div>
-            <script type="text/javascript">fadeIn('msgflash', 0);</script>
-        <?php endif; ?>
-    </div>
-
-</header>
-
-<section class="container">
-    <div id="brdmain">
diff --git a/view/help.php b/view/help.php
deleted file mode 100644
index a1924a10..00000000
--- a/view/help.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<h2><span><?php _e('BBCode') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><a name="bbcode"></a><?php _e('BBCode info 1') ?></p>
-		<p><?php _e('BBCode info 2') ?></p>
-	</div>
-</div>
-<h2><span><?php _e('Text style') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Text style info') ?></p>
-		<p><code>[b]<?php _e('Bold text') ?>[/b]</code> <?php _e('produces') ?> <samp><strong><?php _e('Bold text') ?></strong></samp></p>
-		<p><code>[u]<?php _e('Underlined text') ?>[/u]</code> <?php _e('produces') ?> <samp><span class="bbu"><?php _e('Underlined text') ?></span></samp></p>
-		<p><code>[i]<?php _e('Italic text') ?>[/i]</code> <?php _e('produces') ?> <samp><em><?php _e('Italic text') ?></em></samp></p>
-		<p><code>[s]<?php _e('Strike-through text') ?>[/s]</code> <?php _e('produces') ?> <samp><span class="bbs"><?php _e('Strike-through text') ?></span></samp></p>
-		<p><code>[del]<?php _e('Deleted text') ?>[/del]</code> <?php _e('produces') ?> <samp><del><?php _e('Deleted text') ?></del></samp></p>
-		<p><code>[ins]<?php _e('Inserted text') ?>[/ins]</code> <?php _e('produces') ?> <samp><ins><?php _e('Inserted text') ?></ins></samp></p>
-		<p><code>[em]<?php _e('Emphasised text') ?>[/em]</code> <?php _e('produces') ?> <samp><em><?php _e('Emphasised text') ?></em></samp></p>
-		<p><code>[color=#FF0000]<?php _e('Red text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: #ff0000"><?php _e('Red text') ?></span></samp></p>
-		<p><code>[color=blue]<?php _e('Blue text') ?>[/color]</code> <?php _e('produces') ?> <samp><span style="color: blue"><?php _e('Blue text') ?></span></samp></p>
-		<p><code>[h]<?php _e('Heading text') ?>[/h]</code> <?php _e('produces') ?></p> <div class="postmsg"><h5><?php _e('Heading text') ?></h5></div>
-	</div>
-</div>
-<h2><span><?php _e('Links and images') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Links info') ?></p>
-		<p><a name="url"></a><code>[url=<?php echo Utils::escape($feather->url->base(true).'/') ?>]<?php echo Utils::escape($feather->forum_settings['o_board_title']) ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape($feather->url->base(true).'/') ?>"><?php echo Utils::escape($feather->forum_settings['o_board_title']) ?></a></samp></p>
-		<p><code>[url]<?php echo Utils::escape($feather->url->base(true).'/') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo Utils::escape($feather->url->base(true).'/') ?>"><?php echo Utils::escape($feather->url->base(true).'/') ?></a></samp></p>
-		<p><code>[url=/help/]<?php _e('This help page') ?>[/url]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('/help') ?>"><?php _e('This help page') ?></a></samp></p>
-		<p><code>[email]myname@example.com[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com">myname@example.com</a></samp></p>
-		<p><code>[email=myname@example.com]<?php _e('My email address') ?>[/email]</code> <?php _e('produces') ?> <samp><a href="mailto:myname@example.com"><?php _e('My email address') ?></a></samp></p>
-		<p><code>[topic=1]<?php _e('Test topic') ?>[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test topic') ?></a></samp></p>
-		<p><code>[topic]1[/topic]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php echo $feather->url->get('topic/1/') ?></a></samp></p>
-		<p><code>[post=1]<?php _e('Test post') ?>[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php _e('Test post') ?></a></samp></p>
-		<p><code>[post]1[/post]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('post/1/#p1') ?>"><?php echo $feather->url->get('post/1/#p1') ?></a></samp></p>
-		<p><code>[forum=1]<?php _e('Test forum') ?>[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('topic/1/') ?>"><?php _e('Test forum') ?></a></samp></p>
-		<p><code>[forum]1[/forum]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('forum/1/') ?>"><?php echo $feather->url->get('forum/1/') ?></a></samp></p>
-		<p><code>[user=2]<?php _e('Test user') ?>[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php _e('Test user') ?></a></samp></p>
-		<p><code>[user]2[/user]</code> <?php _e('produces') ?> <samp><a href="<?php echo $feather->url->get('user/2/') ?>"><?php echo $feather->url->get('user/2/') ?></a></samp></p>
-	</div>
-	<div class="inbox">
-		<p><a name="img"></a><?php _e('Images info') ?></p>
-		<p><code>[img=<?php _e('FeatherBB bbcode test') ?>]<?php echo Utils::escape($feather->url->base(true)) ?>/style/img/logo.png[/img]</code> <?php _e('produces') ?> <samp><img style="height: 21px" src="<?php echo Utils::escape($feather->url->base(true)) ?>/style/img/logo.png" alt="<?php _e('FeatherBB bbcode test') ?>" /></samp></p>
-	</div>
-</div>
-<h2><span><?php _e('Quotes') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Quotes info') ?></p>
-		<p><code>[quote=James]<?php _e('Quote text') ?>[/quote]</code></p>
-		<p><?php _e('produces quote box') ?></p>
-		<div class="postmsg">
-			<div class="quotebox"><cite>James <?php _e('wrote') ?></cite><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
-		</div>
-		<p><?php _e('Quotes info 2') ?></p>
-		<p><code>[quote]<?php _e('Quote text') ?>[/quote]</code></p>
-		<p><?php _e('produces quote box') ?></p>
-		<div class="postmsg">
-			<div class="quotebox"><blockquote><div><p><?php _e('Quote text') ?></p></div></blockquote></div>
-		</div>
-		<p><?php _e('quote note') ?></p>
-	</div>
-</div>
-<h2><span><?php _e('Code') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Code info') ?></p>
-		<p><code>[code]<?php _e('Code text') ?>[/code]</code></p>
-		<p><?php _e('produces code box') ?></p>
-		<div class="postmsg">
-			<div class="codebox"><pre><code><?php _e('Code text') ?></code></pre></div>
-		</div>
-	</div>
-</div>
-<h2><span><?php _e('Lists') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><a name="lists"></a><?php _e('List info') ?></p>
-		<p><code>[list][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php _e('produces list') ?></span></p>
-		<div class="postmsg">
-			<ul><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ul>
-		</div>
-		<p><code>[list=1][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php _e('produces decimal list') ?></span></p>
-		<div class="postmsg">
-			<ol class="decimal"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
-		</div>
-		<p><code>[list=a][*]<?php _e('List text 1') ?>[/*][*]<?php _e('List text 2') ?>[/*][*]<?php _e('List text 3') ?>[/*][/list]</code>
-		<br /><span><?php _e('produces alpha list') ?></span></p>
-		<div class="postmsg">
-			<ol class="alpha"><li><p><?php _e('List text 1') ?></p></li><li><p><?php _e('List text 2') ?></p></li><li><p><?php _e('List text 3') ?></p></li></ol>
-		</div>
-	</div>
-</div>
-<h2><span><?php _e('Nested tags') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><?php _e('Nested tags info') ?></p>
-		<p><code>[b][u]<?php _e('Bold, underlined text') ?>[/u][/b]</code> <?php _e('produces') ?> <samp><strong><span class="bbu"><?php _e('Bold, underlined text') ?></span></strong></samp></p>
-	</div>
-</div>
-<h2><span><?php _e('Smilies') ?></span></h2>
-<div class="box">
-	<div class="inbox">
-		<p><a name="smilies"></a><?php _e('Smilies info') ?></p>
-<?php
-
-// Display the smiley set
-$smiley_groups = array();
-
-foreach ($feather->parser->pd['smilies'] as $smiley_text => $smiley_data) {
-    $smiley_groups[$smiley_data['file']][] = $smiley_text;
-}
-
-foreach ($smiley_groups as $smiley_img => $smiley_texts) {
-    echo "\t\t<p><code>". implode('</code> ' .__('and'). ' <code>', $smiley_texts).'</code> <span>' .__('produces'). '</span> <samp>'.$feather->parser->pd['smilies'][$smiley_texts[0]]['html'] .'</samp></p>'."\n";
-}
-
-?>
-	</div>
-</div>
diff --git a/view/index.php b/view/index.php
deleted file mode 100644
index f3046814..00000000
--- a/view/index.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-if (empty($index_data)): ?>
-    <div id="idx0" class="block"><div class="box"><div class="inbox"><p><?php _e('Empty board') ?></p></div></div></div>
-<?php endif;
-foreach ($index_data as $forum) {
-    if ($forum->cid != $cur_cat) :
-        if ($cur_cat != 0) :
-    ?>
-				</tbody>
-			</table>
-		</div>
-	</div>
-	</div>
-	<?php endif;
-    ?>
-	<div id="idx<?php echo $forum->cid ?>" class="blocktable">
-	<h2><span><?php echo Utils::escape($forum->cat_name) ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Forum') ?></th>
-					<th class="tc2" scope="col"><?php _e('Topics') ?></th>
-					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
-					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-	<?php
-    $cur_cat = $forum->cid;
-    endif;
-    ?>
-				<tr class="<?php echo $forum->item_status ?>">
-					<td class="tcl">
-						<div class="<?php echo $forum->icon_type ?>"><div class="nosize"><?php echo Utils::forum_number_format($forum->forum_count_formatted) ?></div></div>
-						<div class="tclcon">
-							<div>
-								<?php echo $forum->forum_field."\n".$forum->moderators_formatted ?>
-							</div>
-						</div>
-					</td>
-					<td class="tc2"><?php echo Utils::forum_number_format($forum->num_topics_formatted) ?></td>
-					<td class="tc3"><?php echo Utils::forum_number_format($forum->num_posts_formatted) ?></td>
-					<td class="tcr"><?php echo $forum->last_post_formatted ?></td>
-				</tr>
-	<?php
-
-}
-if ($cur_cat > 0) :
-    ?>
-					</tbody>
-			</table>
-		</div>
-	</div>
-	</div>
-<?php
-endif;
-if (!empty($forum_actions)) :
-?>
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<p class="subscribelink clearb"><?php echo implode(' - ', $forum_actions); ?></p>
-	</div>
-</div>
-<?php
-endif;
-?>
-<div id="brdstats" class="block">
-	<h2><span><?php _e('Board info') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<dl class="conr">
-				<dt><strong><?php _e('Board stats') ?></strong></dt>
-				<dd><span><?php printf(__('No of users'), '<strong>'.Utils::forum_number_format($stats['total_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of topics'), '<strong>'.Utils::forum_number_format($stats['total_topics']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('No of posts'), '<strong>'.Utils::forum_number_format($stats['total_posts']).'</strong>') ?></span></dd>
-			</dl>
-			<dl class="conl">
-				<dt><strong><?php _e('User info') ?></strong></dt>
-				<dd><span><?php printf(__('Newest user'), $stats['newest_user']) ?></span></dd>
-				<?php if ($feather->forum_settings['o_users_online'] == 1) : ?>
-				<dd><span><?php printf(__('Users online'), '<strong>'.Utils::forum_number_format($online['num_users']).'</strong>') ?></span></dd>
-				<dd><span><?php printf(__('Guests online'), '<strong>'.Utils::forum_number_format($online['num_guests']).'</strong>') ?></span></dd>
-				<?php endif; ?>
-			</dl>
-			<?php
-            if ($feather->forum_settings['o_users_online'] == 1) :
-                if ($online['num_users'] > 0) {
-                    echo "\t\t\t".'<dl id="onlinelist" class="clearb">'."\n\t\t\t\t".'<dt><strong>'.__('Online').' </strong></dt>'."\t\t\t\t".implode(',</dd> ', $online['users']).'</dd>'."\n\t\t\t".'</dl>'."\n";
-                } else {
-                    echo "\t\t\t".'<div class="clearer"></div>'."\n";
-                }
-            endif;
-            ?>
-		</div>
-	</div>
-</div>
diff --git a/view/install.php b/view/install.php
deleted file mode 100644
index a9db4e72..00000000
--- a/view/install.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title><?php _e('FeatherBB Installation') ?></title>
-    <link rel="stylesheet" type="text/css" href="style/themes/<?php echo $feather->forum_env['FORUM_NAME'] ?>.css" />
-</head>
-
-<body>
-    <div id="puninstall" class="pun">
-        <div class="top-box"><div><!-- Top Corners --></div></div>
-        <div class="punwrap">
-
-            <section class="container">
-                <div id="brdheader" class="block">
-                    <div class="box">
-                        <div id="brdtitle" class="inbox">
-                            <h1><span><?php _e('FeatherBB Installation') ?></span></h1>
-                            <div id="brddesc"><p><?php _e('Welcome') ?></p></div>
-                        </div>
-                    </div>
-                </div>
-            </section>
-
-            <section class="container">
-                <div id="brdmain">
-                    <?php if (count($languages) > 1): ?>
-                        <div class="blockform">
-                            <h2><span><?php _e('Choose install language') ?></span></h2>
-                            <div class="box">
-                                <form id="install" method="post" action="">
-                                    <input type="hidden" name="choose_lang" value="1">
-                                    <div class="inform">
-                                        <fieldset>
-                                            <legend><?php _e('Install language') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Choose install language info') ?></p>
-                                                <label><strong><?php _e('Install language') ?></strong>
-                                                    <br /><select name="install_lang">
-                                                        <?php
-
-                                                        foreach ($languages as $lang) {
-                                                            echo "\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').'>'.$lang.'</option>'."\n";
-                                                        }
-
-                                                        ?>
-                                                    </select>
-                                                    <br /></label>
-                                                </div>
-                                            </fieldset>
-                                        </div>
-                                        <p class="buttons"><input type="submit" value="<?php _e('Change language') ?>" /></p>
-                                    </form>
-                                </div>
-                            </div>
-                        <?php endif;
-                        ?>
-
-                        <div class="blockform">
-                            <h2><span><?php echo sprintf(__('Install'), FORUM_VERSION) ?></span></h2>
-                            <div class="box">
-                                <form id="install" method="post" action="">
-                                    <?php if (!empty($errors)): ?>
-                                        <div class="inform">
-                                            <div class="forminfo error-info">
-                                                <h3><?php _e('Errors') ?></h3>
-                                                <ul class="error-list">
-                                                    <?php
-                                                    $errors = (!is_array($errors)) ? array($errors) : $errors;
-                                                    foreach ($errors as $error) {
-                                                        echo "\t\t\t\t\t\t".'<li><strong>'.$error.'</strong></li>'."\n";
-                                                    }
-                                                    ?>
-                                                </ul>
-                                            </div>
-                                        </div>
-                                        <?php endif;?>
-
-                                    <div class="inform">
-                                        <div class="forminfo">
-                                            <h3><?php _e('Database setup') ?></h3>
-                                            <p><?php _e('Info 1') ?></p>
-                                        </div>
-                                        <fieldset>
-                                            <legend><?php _e('Select database') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 2') ?></p>
-                                                <label class="required"><strong><?php _e('Database type') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <select name="install[db_type]" required>
-                                                    <?php
-
-                                                    foreach ($supported_dbs as $id => $db_type) {
-                                                        echo "\t\t\t\t\t\t\t".'<option value="'.$id.'">'.$db_type.'</option>'."\n";
-                                                    }
-
-                                                    ?>
-                                                </select>
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <fieldset>
-                                            <legend><?php _e('Database hostname') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 3') ?></p>
-                                                <label class="required"><strong><?php _e('Database server hostname') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[db_host]" size="50" required />
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <fieldset>
-                                            <legend><?php _e('Database enter name') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 4') ?></p>
-                                                <label class="required"><strong><?php _e('Database name') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[db_name]" size="30" required />
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <fieldset>
-                                            <legend><?php _e('Database enter informations') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 5') ?></p>
-                                                <label class="conl"><?php _e('Database username') ?></label>
-                                                <input type="text" name="install[db_user]" size="30" />
-                                                <label class="conl"><?php _e('Database password') ?></label>
-                                                <input type="password" name="install[db_pass]" size="30" />
-                                                <div class="clearer"></div>
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <fieldset>
-                                            <legend><?php _e('Database enter prefix') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 6') ?></p>
-                                                <label><?php _e('Table prefix') ?></label>
-                                                <input type="text" name="install[db_prefix]" size="20" maxlength="30" />
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <div class="forminfo">
-                                            <h3><?php _e('Administration setup') ?></h3>
-                                            <p><?php _e('Info 7') ?></p>
-                                        </div>
-                                        <fieldset>
-                                            <legend><?php _e('Administration setup') ?></legend>
-                                            <div class="infldset">
-                                                <p><?php _e('Info 8') ?></p>
-                                                <label class="required"><strong><?php _e('Administrator username') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[username]" size="25" maxlength="25" required />
-                                                <label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="password" name="install[password]" size="16" required />
-                                                <label class="conl required"><strong><?php _e('Confirm password') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="password" name="install[password_conf]" size="16" required />
-                                                <!-- <div class="clearer"></div> -->
-                                                <label class="required"><strong><?php _e('Administrator email') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[email]" size="50" maxlength="80" required />
-                                            </div>
-                                        </fieldset>
-                                    </div>
-
-                                    <div class="inform">
-                                        <div class="forminfo">
-                                            <h3><?php _e('Board setup') ?></h3>
-                                            <p><?php _e('Info 11') ?></p>
-                                        </div>
-                                        <fieldset>
-                                            <legend><?php _e('General information') ?></legend>
-                                            <div class="infldset">
-                                                <label class="required"><strong><?php _e('Board title') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[title]" value="<? echo $data['title'] ?>" size="60" maxlength="255" required />
-                                                <label><?php _e('Board description') ?></label>
-                                                <input type="text" name="install[description]" value="<? echo $data['description'] ?>" size="60" maxlength="255" required />
-                                                <label class="required"><strong><?php _e('Base URL') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[base_url]" value="<? echo $data['base_url'] ?>" size="60" maxlength="100" required />
-                                                <label class="required"><strong><?php _e('Default language') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <select name="install[default_lang]" required />
-                                                <?php
-                                                foreach ($languages as $lang) {
-                                                    echo "\t\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$lang.'" '.($data['default_lang'] == $lang ? 'selected' : '').' >'.$lang.'</option>'."\n";
-                                                }
-                                                ?>
-                                            </select>
-                                        </div>
-                                    </fieldset>
-                                </div>
-
-                                <p class="buttons"><input type="submit" value="<?php _e('Start install') ?>" /></p>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-            </section>
-        </div>
-        <div class="end-box"><div><!-- Bottom Corners --></div></div>
-    </div>
-</body>
-</html>
diff --git a/view/login/form.php b/view/login/form.php
deleted file mode 100644
index e6a8210a..00000000
--- a/view/login/form.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Login') ?></span></h2>
-	<div class="box">
-		<form id="login" method="post" action="<?php echo $feather->url->get('login/action/in/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Login legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="redirect_url" value="<?php echo Utils::escape($redirect_url) ?>" />
-						<label class="conl required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
-						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
-
-						<div class="rbox clearb">
-							<label><input type="checkbox" name="save_pass" value="1" tabindex="3" /><?php _e('Remember me') ?><br /></label>
-						</div>
-
-						<p class="clearb"><?php _e('Login info') ?></p>
-						<p class="actions"><span><a href="<?php echo $feather->url->get('register/') ?>" tabindex="5"><?php _e('Not registered') ?></a></span> <span><a href="<?php echo $feather->url->get('login/action/forget/') ?>" tabindex="6"><?php _e('Forgotten pass') ?></a></span></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="login" value="<?php _e('Login') ?>" tabindex="4" /></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/login/password_forgotten.php b/view/login/password_forgotten.php
deleted file mode 100644
index b32ff1b6..00000000
--- a/view/login/password_forgotten.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-// If there are errors, we display them
-if (!empty($errors)) {
-    ?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('New password errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('New passworderrors info') ?></p>
-			<ul class="error-list">
-<?php
-
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-    ?>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<?php
-
-}
-?>
-<div class="blockform">
-	<h2><span><?php _e('Request pass') ?></span></h2>
-	<div class="box">
-		<form id="request_pass" method="post" action="<?php echo $feather->url->get('login/action/forget/') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Request pass legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
-						<p><?php _e('Request pass info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="request_pass" value="<?php _e('Submit') ?>" /><?php if (empty($errors)): ?> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a><?php endif; ?></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/message.php b/view/message.php
deleted file mode 100644
index 69f4884b..00000000
--- a/view/message.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="msg" class="block error">
-	<h2><span><?= __('Error') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<p><?php echo $msg ?></p>
-<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php _e('Go back') ?></a></p>
-<?php endif;
-    ?>		</div>
-	</div>
-</div>
diff --git a/view/misc/email.php b/view/misc/email.php
deleted file mode 100644
index eebc5f9a..00000000
--- a/view/misc/email.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo Utils::escape($mail['recipient']) ?></span></h2>
-	<div class="box">
-		<form id="email" method="post" action="<?php echo $feather->url->get('email/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write email') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
-						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php _e('Email disclosure note') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
diff --git a/view/misc/report.php b/view/misc/report.php
deleted file mode 100644
index a61dc8ca..00000000
--- a/view/misc/report.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_post['fid'].'/'.$feather->url->url_friendly($cur_post['forum_name']).'/') ?>"><?php echo Utils::escape($cur_post['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('post/'.$id.'/#p'.$id) ?>"><?php echo Utils::escape($cur_post['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Report post') ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<div id="reportform" class="blockform">
-	<h2><span><?php _e('Report post') ?></span></h2>
-	<div class="box">
-		<form id="report" method="post" action="<?php echo $feather->url->get('report/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Reason desc') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('Reason') ?> <span><?php _e('Required') ?></span></strong><br /><textarea name="req_reason" rows="5" cols="60"></textarea><br /></label>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/misc/rules.php b/view/misc/rules.php
deleted file mode 100644
index 163df1b7..00000000
--- a/view/misc/rules.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="rules" class="block">
-	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
-	<div class="box">
-		<div id="rules-block" class="inbox">
-			<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
-		</div>
-	</div>
-</div>
diff --git a/view/moderate/delete_posts.php b/view/moderate/delete_posts.php
deleted file mode 100644
index 78100a8d..00000000
--- a/view/moderate/delete_posts.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Delete posts') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm delete legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<p><?php _e('Delete posts comply') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="delete_posts_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/moderate/delete_topics.php b/view/moderate/delete_topics.php
deleted file mode 100644
index 46d56282..00000000
--- a/view/moderate/delete_topics.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('Delete topics') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm delete legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Delete topics comply') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="delete_topics_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/moderate/merge_topics.php b/view/moderate/merge_topics.php
deleted file mode 100644
index 24a92aaf..00000000
--- a/view/moderate/merge_topics.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('Merge topics') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm merge legend') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1" /><?php _e('Leave redirect') ?><br /></label>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="merge_topics_comply" value="<?php _e('Merge') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/moderate/moderator_forum.php b/view/moderate/moderator_forum.php
deleted file mode 100644
index de25ede1..00000000
--- a/view/moderate/moderator_forum.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<form method="post" action="<?php echo $feather->url->get('moderate/forum/'.$id.'/') ?>">
-<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<input type="hidden" name="page" value="<?php echo Utils::escape($p) ?>" />
-<div id="vf" class="blocktable">
-	<h2><span><?php echo Utils::escape($cur_forum['forum_name']) ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
-					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
-<?php endif; ?>					<th class="tcr"><?php _e('Last post') ?></th>
-					<th class="tcmod" scope="col"><?php _e('Select') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-			
-			<?php
-            $topic_count = 0;
-            $button_status = '';
-            foreach ($topic_data as $topic) {
-                ++$topic_count;
-                ?>
-							<tr class="<?php echo $topic['item_status'] ?>">
-					<td class="tcl">
-						<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo Utils::forum_number_format($topic_count + $start_from) ?></div></div>
-						<div class="tclcon">
-							<div>
-								<?php echo $topic['subject_disp']."\n" ?>
-							</div>
-						</div>
-					</td>
-					<td class="tc2"><?php echo(!$topic['ghost_topic']) ? Utils::forum_number_format($topic['num_replies']) : '-' ?></td>
-<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(!$topic['ghost_topic']) ? Utils::forum_number_format($topic['num_views']) : '-' ?></td>
-<?php endif;
-                ?>					<td class="tcr"><?php echo $topic['last_post_disp'] ?></td>
-					<td class="tcmod"><input type="checkbox" name="topics[<?php echo $topic['id'] ?>]" value="1" /></td>
-				</tr>
-			<?php
-
-            }
-            if (empty($topic_data)):
-                $colspan = ($feather->forum_settings['o_topic_views'] == '1') ? 5 : 4;
-                $button_status = ' disabled="disabled"';
-                echo "\t\t\t\t\t".'<tr><td class="tcl" colspan="'.$colspan.'">'.__('Empty forum').'</td></tr>'."\n";
-            endif;
-            ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="move_topics" value="<?php _e('Move') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_topics" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /> <input type="submit" name="merge_topics" value="<?php _e('Merge') ?>"<?php echo $button_status ?> /> <input type="submit" name="open" value="<?php _e('Open') ?>"<?php echo $button_status ?> /> <input type="submit" name="close" value="<?php _e('Close') ?>"<?php echo $button_status ?> /></p>
-			<div class="clearer"></div>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
-</form>
\ No newline at end of file
diff --git a/view/moderate/move_topics.php b/view/moderate/move_topics.php
deleted file mode 100644
index f184afcb..00000000
--- a/view/moderate/move_topics.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="blockform">
-	<h2><span><?php echo($action == 'single') ? __('Move topic') : __('Move topics') ?></span></h2>
-	<div class="box">
-		<form method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-			<input type="hidden" name="topics" value="<?php echo $topics ?>" />
-				<fieldset>
-					<legend><?php _e('Move legend') ?></legend>
-					<div class="infldset">
-						<label><?php _e('Move to') ?>
-						<br /><select name="move_to_forum">
-								<?php echo $list_forums ?>
-							</optgroup>
-						</select>
-						<br /></label>
-						<div class="rbox">
-							<label><input type="checkbox" name="with_redirect" value="1"<?php if ($action == 'single') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Leave redirect') ?><br /></label>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="move_topics_to" value="<?php _e('Move') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/moderate/posts_view.php b/view/moderate/posts_view.php
deleted file mode 100644
index d0c2d06d..00000000
--- a/view/moderate/posts_view.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<form method="post" action="">
-<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<?php
-$post_count = 0; // Keep track of post numbers
-foreach ($post_data as $post) {
-    $post_count++;
-    ?>
-	<div id="p<?php echo $post['id'] ?>" class="blockpost<?php if ($post['id'] == $cur_topic['first_post_id']) {
-    echo ' firstpost';
-}
-    ?><?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($post_count == 1) {
-    echo ' blockpost1';
-}
-    ?>">
-		<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<div class="postbody">
-					<div class="postleft">
-						<dl>
-							<dt><strong><?php echo $post['poster_disp'] ?></strong></dt>
-							<dd class="usertitle"><strong><?php echo $post['user_title'] ?></strong></dd>
-						</dl>
-					</div>
-					<div class="postright">
-						<h3 class="nosize"><?php _e('Message') ?></h3>
-						<div class="postmsg">
-							<?php echo $post['message']."\n" ?>
-	<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.Utils::escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
-}
-    ?>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="inbox">
-				<div class="postfoot clearb">
-					<div class="postfootright"><?php echo($post['id'] != $cur_topic['first_post_id']) ? '<p class="multidelete"><label><strong>'.__('Select').'</strong>&#160;<input type="checkbox" name="posts['.$post['id'].']" value="1" /></label></p>' : '<p>'.__('Cannot select first').'</p>' ?></div>
-				</div>
-			</div>
-		</div>
-	</div>
-<?php
-
-}
-?>
-
-<div class="postlinksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-			<p class="conr modbuttons"><input type="submit" name="split_posts" value="<?php _e('Split') ?>"<?php echo $button_status ?> /> <input type="submit" name="delete_posts" value="<?php _e('Delete') ?>"<?php echo $button_status ?> /></p>
-			<div class="clearer"></div>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$fid.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Moderate') ?></strong></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
-</form>
\ No newline at end of file
diff --git a/view/moderate/split_posts.php b/view/moderate/split_posts.php
deleted file mode 100644
index deace3ab..00000000
--- a/view/moderate/split_posts.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Split posts') ?></span></h2>
-	<div class="box">
-		<form id="subject" method="post" action="">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm split legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
-						<label class="required"><strong><?php _e('New subject') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="new_subject" size="80" maxlength="70" /><br /></label>
-						<label><?php _e('Move to') ?>
-						<br /><select name="move_to_forum">
-								<?php echo $list_forums ?>
-							</optgroup>
-						</select>
-						<br /></label>
-						<p><?php _e('Split posts comply') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="split_posts_comply" value="<?php _e('Split') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/post.php b/view/post.php
deleted file mode 100644
index a0463de8..00000000
--- a/view/post.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="linkst">
-	<div class="inbox">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_posting['id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_posting['forum_name']) ?></a></li>
-<?php if ($feather->request->post('req_subject')): ?>			<li><span>»&#160;</span><?php echo Utils::escape($feather->request->post('req_subject')) ?></li>
-<?php endif; ?>
-<?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('topic/'.$tid.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_posting['subject']) ?></a></li>
-<?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
-		</ul>
-	</div>
-</div>
-
-<?php
-
-// If there are errors, we display them
-if (!empty($errors)) {
-    ?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('Post errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('Post errors info') ?></p>
-			<ul class="error-list">
-<?php
-
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-    ?>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<?php
-
-} elseif ($feather->request->post('preview')) {
-    $preview_message = $feather->parser->parse_message($post['message'], $post['hide_smilies']);
-?>
-<div id="postpreview" class="blockpost">
-	<h2><span><?php _e('Post preview') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postright">
-					<div class="postmsg">
-						<?php echo $preview_message."\n" ?>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<?php
-
-}
-
-
-$cur_index = 1;
-
-?>
-<!-- Init BBcode editor toolbar -->
-<script>
-    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
-        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
-</script>
-<script src="<?php echo Url::base() ?>/style/imports/bbeditor.js"></script>
-
-<div id="postform" class="blockform">
-	<h2><span><?php echo $action ?></span></h2>
-	<div class="box">
-		<?php echo $form."\n" ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write message legend') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-                                                <input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-<?php
-if ($feather->user->is_guest) {
-    $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-    $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
-    ?>
-						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" value="<?php if ($feather->request->post('req_username')) {
-    echo Utils::escape($post['username']);
-}
-    ?>" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" value="<?php if ($feather->request->post($email_form_name)) {
-    echo Utils::escape($post['email']);
-}
-    ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<div class="clearer"></div>
-<?php
-
-}
-if ($fid): ?>
-						<label class="required"><strong><?php _e('Subject') ?> <span><?php _e('Required') ?></span></strong><br /><input class="longinput" type="text" name="req_subject" value="<?php if ($feather->request->post('req_subject')) {
-    echo Utils::escape($post['subject']);
-} ?>" size="80" maxlength="70" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-<?php endif; ?>						<label class="required"><strong><?php _e('Message') ?> <span><?php _e('Required') ?></span></strong><br />
-                        <script>postEditorToolbar('req_message');</script>
-						<textarea name="req_message" id="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo($feather->request->post('req_message')) ? $feather->utils->linebreaks($feather->utils->trim(Utils::escape($feather->request->post('req_message')))) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open (this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off'); ?></span></li>
-						</ul>
-					</div>
-				</fieldset>
-<?php
-if (!empty($checkboxes)) {
-    ?>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Options') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<?php echo implode("\n\t\t\t\t\t\t\t", $checkboxes)."\n" ?>
-						</div>
-					</div>
-				</fieldset>
-<?php
-
-}
-
-?>
-			</div>
-			<?php if ($feather->user->is_guest) : ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Robot title') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Robot info')    ?></p>
-						<label class="required"><strong><?php
-                             $question = array_keys($lang_antispam_questions);
-                             $qencoded = md5($question[$index_questions]);
-                             echo sprintf(__('Robot question'), $question[$index_questions]);?>
-							 <span><?php _e('Required') ?></span></strong>
-							 <br />
-							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
-						</label>
-					</div>
-				</fieldset>
-			</div>
-			<?php endif; ?>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
-
-
-<?php
-if ($tid && $feather->forum_settings['o_topic_review'] != '0') :
-?>
-<div id="postreview">
-	<h2><span><?php _e('Topic review') ?></span></h2>
-
-	<?php
-    // Set background switching on
-    $post_count = 0;
-
-    foreach ($post_data as $post) {
-        ++$post_count;
-        ?>
-	<div class="blockpost">
-	<div class="box<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?>">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postleft">
-					<dl>
-						<dt><strong><?php echo Utils::escape($post['poster']) ?></strong></dt>
-						<dd><span><?php echo $feather->utils->format_time($post['posted']) ?></span></dd>
-					</dl>
-				</div>
-				<div class="postright">
-					<div class="postmsg">
-						<?php echo $post['message']."\n" ?>
-					</div>
-				</div>
-			</div>
-			<div class="clearer"></div>
-		</div>
-	</div>
-</div>
-	<?php
-
-    }
-    ?>
-
-</div>
-<?php endif;?>
diff --git a/view/profile/change_mail.php b/view/profile/change_mail.php
deleted file mode 100644
index 5615524d..00000000
--- a/view/profile/change_mail.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Change email') ?></span></h2>
-	<div class="box">
-		<form id="change_email" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_email') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Email legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label class="required"><strong><?php _e('New email') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_new_email" size="50" maxlength="80" /><br /></label>
-						<label class="required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="16" /><br /></label>
-						<p><?php _e('Email instructions') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="new_email" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/profile/change_pass.php b/view/profile/change_pass.php
deleted file mode 100644
index ac61d979..00000000
--- a/view/profile/change_pass.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Change pass') ?></span></h2>
-	<div class="box">
-		<form id="change_pass" method="post" action="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<input type="hidden" name="form_sent" value="1" />
-				<fieldset>
-					<legend><?php _e('Change pass legend') ?></legend>
-					<div class="infldset">
-<?php if (!$feather->user->is_admmod): ?>						<label class="required"><strong><?php _e('Old pass') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="password" name="req_old_password" size="16" /><br /></label>
-<?php endif; ?>						<label class="conl required"><strong><?php _e('New pass') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="password" name="req_new_password1" size="16" /><br /></label>
-						<label class="conl required"><strong><?php _e('Confirm new pass') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="password" name="req_new_password2" size="16" /><br /></label>
-						<p class="clearb"><?php _e('Pass info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/profile/delete_user.php b/view/profile/delete_user.php
deleted file mode 100644
index 831b29ab..00000000
--- a/view/profile/delete_user.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Confirm delete user') ?></span></h2>
-	<div class="box">
-		<form id="confirm_del_user" method="post" action="<?php echo $feather->url->get('user/'.$id.'/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Confirm delete legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Confirmation info').' <strong>'.Utils::escape($username).'</strong>.' ?></p>
-						<div class="rbox">
-							<label><input type="checkbox" name="delete_posts" value="1" checked="checked" /><?php _e('Delete posts') ?><br /></label>
-						</div>
-						<p class="warntext"><strong><?php _e('Delete warning') ?></strong></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="delete_user_comply" value="<?php _e('Delete') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/profile/menu.php b/view/profile/menu.php
deleted file mode 100644
index e3714a6e..00000000
--- a/view/profile/menu.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="profile" class="block2col">
-	<div class="blockmenu">
-		<h2><span><?php _e('Profile menu') ?></span></h2>
-		<div class="box">
-			<div class="inbox">
-				<ul>
-					<li<?php if ($page == 'essentials') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>"><?php _e('Section essentials') ?></a></li>
-					<li<?php if ($page == 'personal') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>"><?php _e('Section personal') ?></a></li>
-					<li<?php if ($page == 'messaging') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>"><?php _e('Section messaging') ?></a></li>
-<?php if ($feather->forum_settings['o_avatars'] == '1' || $feather->forum_settings['o_signatures'] == '1'): ?>					<li<?php if ($page == 'personality') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>"><?php _e('Section personality') ?></a></li>
-<?php endif;
-    ?>					<li<?php if ($page == 'display') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>"><?php _e('Section display') ?></a></li>
-					<li<?php if ($page == 'privacy') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>"><?php _e('Section privacy') ?></a></li>
-<?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
-    echo ' class="isactive"';
-}
-    ?>><a href="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>"><?php _e('Section admin') ?></a></li>
-<?php endif;
-    ?>				</ul>
-			</div>
-		</div>
-	</div>
diff --git a/view/profile/section_admin.php b/view/profile/section_admin.php
deleted file mode 100644
index d1aa1aa3..00000000
--- a/view/profile/section_admin.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-	<div class="blockform">
-		<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section admin') ?></span></h2>
-		<div class="box">
-			<form id="profile7" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/admin/') ?>">
-				<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-				<div class="inform">
-				<input type="hidden" name="form_sent" value="1" />
-					<fieldset>
-<?php
-
-        if ($feather->user->g_moderator == '1') {
-            ?>
-						<legend><?php _e('Delete ban legend') ?></legend>
-						<div class="infldset">
-							<p><input type="submit" name="ban" value="<?php _e('Ban user') ?>" /></p>
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-        } else {
-            if ($feather->user->id != $id) {
-                ?>
-						<legend><?php _e('Group membership legend') ?></legend>
-						<div class="infldset">
-							<select id="group_id" name="group_id">
-                                                            <?php echo $group_list ?>
-							</select>
-							<input type="submit" name="update_group_membership" value="<?php _e('Save') ?>" />
-						</div>
-					</fieldset>
-				</div>
-				<div class="inform">
-					<fieldset>
-<?php
-
-            }
-
-            ?>
-						<legend><?php _e('Delete ban legend') ?></legend>
-						<div class="infldset">
-							<input type="submit" name="delete_user" value="<?php _e('Delete user') ?>" /> <input type="submit" name="ban" value="<?php _e('Ban user') ?>" />
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-            if ($user['g_moderator'] == '1' || $user['g_id'] == FEATHER_ADMIN) {
-                ?>
-				<div class="inform">
-					<fieldset>
-						<legend><?php _e('Set mods legend') ?></legend>
-						<div class="infldset">
-							<p><?php _e('Moderator in info') ?></p>
-                                                        <?php echo $forum_list ?>
-								</div>
-							</div>
-							<br class="clearb" /><input type="submit" name="update_forums" value="<?php _e('Update forums') ?>" />
-						</div>
-					</fieldset>
-				</div>
-<?php
-
-            }
-        }
-
-?>
-			</form>
-		</div>
-	</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/profile/section_display.php b/view/profile/section_display.php
deleted file mode 100644
index b806efd2..00000000
--- a/view/profile/section_display.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section display') ?></span></h2>
-	<div class="box">
-		<form id="profile5" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/display/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div><input type="hidden" name="form_sent" value="1" /></div>
-<?php
-
-    $styles = \FeatherBB\Core\Lister::getStyles();
-
-    // Only display the style selection box if there's more than one style available
-    if (count($styles) == 1) {
-        echo "\t\t\t".'<div><input type="hidden" name="form_style" value="'.$styles[0].'" /></div>'."\n";
-    } elseif (count($styles) > 1) {
-        ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Style legend') ?></legend>
-					<div class="infldset">
-						<label><?php _e('Styles') ?><br />
-						<select name="form_style">
-<?php
-
-        foreach ($styles as $temp) {
-            if ($user['style'] == $temp) {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.str_replace('_', ' ', $temp).'</option>'."\n";
-            } else {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.str_replace('_', ' ', $temp).'</option>'."\n";
-            }
-        }
-
-        ?>
-						</select>
-						<br /></label>
-					</div>
-				</fieldset>
-			</div>
-<?php
-
-    }
-
-?>
-<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1' || $feather->forum_settings['o_signatures'] == '1' || $feather->forum_settings['o_avatars'] == '1' || ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1')): ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Post display legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Post display info') ?></p>
-						<div class="rbox">
-<?php if ($feather->forum_settings['o_smilies'] == '1' || $feather->forum_settings['o_smilies_sig'] == '1'): ?>								<label><input type="checkbox" name="form_show_smilies" value="1"<?php if ($user['show_smilies'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show smilies') ?><br /></label>
-<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>								<label><input type="checkbox" name="form_show_sig" value="1"<?php if ($user['show_sig'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show sigs') ?><br /></label>
-<?php endif; if ($feather->forum_settings['o_avatars'] == '1'): ?>								<label><input type="checkbox" name="form_show_avatars" value="1"<?php if ($user['show_avatars'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show avatars') ?><br /></label>
-<?php endif; if ($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img" value="1"<?php if ($user['show_img'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show images') ?><br /></label>
-<?php endif; if ($feather->forum_settings['o_signatures'] == '1' && $feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1'): ?>								<label><input type="checkbox" name="form_show_img_sig" value="1"<?php if ($user['show_img_sig'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Show images sigs') ?><br /></label>
-<?php endif; ?>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Pagination legend') ?></legend>
-					<div class="infldset">
-						<label class="conl"><?php _e('Topics per page') ?><br /><input type="text" name="form_disp_topics" value="<?php echo $user['disp_topics'] ?>" size="6" maxlength="2" /><br /></label>
-						<label class="conl"><?php _e('Posts per page') ?><br /><input type="text" name="form_disp_posts" value="<?php echo $user['disp_posts'] ?>" size="6" maxlength="2" /><br /></label>
-						<p class="clearb"><?php _e('Paginate info') ?> <?php _e('Leave blank') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
diff --git a/view/profile/section_essentials.php b/view/profile/section_essentials.php
deleted file mode 100644
index 6ea2940b..00000000
--- a/view/profile/section_essentials.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section essentials') ?></span></h2>
-	<div class="box">
-		<form id="profile1" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/essentials/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Username and pass legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo $feather->url->get('user/'.$id.'/action/change_pass/') ?>"><?php _e('Change pass') ?></a></span></p>
-<?php endif; ?>						</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Email legend') ?></legend>
-					<div class="infldset">
-						<?php echo $user_disp['email_field'] ?>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Localisation legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Time zone info') ?></p>
-						<label><?php _e('Time zone')."\n" ?>
-						<br /><select name="form_timezone">
-							<option value="-12"<?php if ($user['timezone'] == -12) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-12:00') ?></option>
-							<option value="-11"<?php if ($user['timezone'] == -11) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-11:00') ?></option>
-							<option value="-10"<?php if ($user['timezone'] == -10) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-10:00') ?></option>
-							<option value="-9.5"<?php if ($user['timezone'] == -9.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-09:30') ?></option>
-							<option value="-9"<?php if ($user['timezone'] == -9) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-09:00') ?></option>
-							<option value="-8.5"<?php if ($user['timezone'] == -8.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-08:30') ?></option>
-							<option value="-8"<?php if ($user['timezone'] == -8) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-08:00') ?></option>
-							<option value="-7"<?php if ($user['timezone'] == -7) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-07:00') ?></option>
-							<option value="-6"<?php if ($user['timezone'] == -6) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-06:00') ?></option>
-							<option value="-5"<?php if ($user['timezone'] == -5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-05:00') ?></option>
-							<option value="-4"<?php if ($user['timezone'] == -4) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-04:00') ?></option>
-							<option value="-3.5"<?php if ($user['timezone'] == -3.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-03:30') ?></option>
-							<option value="-3"<?php if ($user['timezone'] == -3) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-03:00') ?></option>
-							<option value="-2"<?php if ($user['timezone'] == -2) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-02:00') ?></option>
-							<option value="-1"<?php if ($user['timezone'] == -1) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC-01:00') ?></option>
-							<option value="0"<?php if ($user['timezone'] == 0) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC') ?></option>
-							<option value="1"<?php if ($user['timezone'] == 1) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+01:00') ?></option>
-							<option value="2"<?php if ($user['timezone'] == 2) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+02:00') ?></option>
-							<option value="3"<?php if ($user['timezone'] == 3) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+03:00') ?></option>
-							<option value="3.5"<?php if ($user['timezone'] == 3.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+03:30') ?></option>
-							<option value="4"<?php if ($user['timezone'] == 4) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+04:00') ?></option>
-							<option value="4.5"<?php if ($user['timezone'] == 4.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+04:30') ?></option>
-							<option value="5"<?php if ($user['timezone'] == 5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:00') ?></option>
-							<option value="5.5"<?php if ($user['timezone'] == 5.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:30') ?></option>
-							<option value="5.75"<?php if ($user['timezone'] == 5.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+05:45') ?></option>
-							<option value="6"<?php if ($user['timezone'] == 6) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+06:00') ?></option>
-							<option value="6.5"<?php if ($user['timezone'] == 6.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+06:30') ?></option>
-							<option value="7"<?php if ($user['timezone'] == 7) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+07:00') ?></option>
-							<option value="8"<?php if ($user['timezone'] == 8) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+08:00') ?></option>
-							<option value="8.75"<?php if ($user['timezone'] == 8.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+08:45') ?></option>
-							<option value="9"<?php if ($user['timezone'] == 9) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+09:00') ?></option>
-							<option value="9.5"<?php if ($user['timezone'] == 9.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+09:30') ?></option>
-							<option value="10"<?php if ($user['timezone'] == 10) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+10:00') ?></option>
-							<option value="10.5"<?php if ($user['timezone'] == 10.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+10:30') ?></option>
-							<option value="11"<?php if ($user['timezone'] == 11) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+11:00') ?></option>
-							<option value="11.5"<?php if ($user['timezone'] == 11.5) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+11:30') ?></option>
-							<option value="12"<?php if ($user['timezone'] == 12) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+12:00') ?></option>
-							<option value="12.75"<?php if ($user['timezone'] == 12.75) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+12:45') ?></option>
-							<option value="13"<?php if ($user['timezone'] == 13) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+13:00') ?></option>
-							<option value="14"<?php if ($user['timezone'] == 14) {
-    echo ' selected="selected"';
-} ?>><?php _e('UTC+14:00') ?></option>
-						</select>
-						<br /></label>
-						<div class="rbox">
-							<label><input type="checkbox" name="form_dst" value="1"<?php if ($user['dst'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('DST') ?><br /></label>
-						</div>
-						<label><?php _e('Time format') ?>
-
-						<br /><select name="form_time_format">
-<?php
-                            foreach (array_unique($forum_time_formats) as $key => $time_format) {
-                                echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
-                                if ($user['time_format'] == $key) {
-                                    echo ' selected="selected"';
-                                }
-                                echo '>'. $feather->utils->format_time(time(), false, null, $time_format, true, true);
-                                if ($key == 0) {
-                                    echo ' ('.__('Default').')';
-                                }
-                                echo "</option>\n";
-                            }
-                            ?>
-						</select>
-						<br /></label>
-						<label><?php _e('Date format') ?>
-
-						<br /><select name="form_date_format">
-<?php
-                            foreach (array_unique($forum_date_formats) as $key => $date_format) {
-                                echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
-                                if ($user['date_format'] == $key) {
-                                    echo ' selected="selected"';
-                                }
-                                echo '>'. $feather->utils->format_time(time(), true, $date_format, null, false, true);
-                                if ($key == 0) {
-                                    echo ' ('.__('Default').')';
-                                }
-                                echo "</option>\n";
-                            }
-                            ?>
-						</select>
-						<br /></label>
-
-<?php
-
-    $languages = \FeatherBB\Core\Lister::getLangs();
-
-    // Only display the language selection box if there's more than one language available
-    if (count($languages) > 1) {
-        ?>
-						<label><?php _e('Language') ?>
-						<br /><select name="form_language">
-<?php
-
-        foreach ($languages as $temp) {
-            if ($user['language'] == $temp) {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
-            } else {
-                echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
-            }
-        }
-
-        ?>
-						</select>
-						<br /></label>
-<?php
-
-    }
-
-?>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('User activity') ?></legend>
-					<div class="infldset">
-						<p><?php printf(__('Registered info'), $feather->utils->format_time($user['registered'], true).(($feather->user->is_admmod) ? ' (<a href="'.$feather->url->get('admin/users/show-users/ip/'.$user['registration_ip'].'/').'">'.Utils::escape($user['registration_ip']).'</a>)' : '')) ?></p>
-						<p><?php printf(__('Last post info'), $feather->utils->format_time($user['last_post'])) ?></p>
-						<p><?php printf(__('Last visit info'), $feather->utils->format_time($user['last_visit'])) ?></p>
-						<?php echo $user_disp['posts_field'] ?>
-<?php if ($feather->user->is_admmod): ?>							<label><?php _e('Admin note') ?><br />
-						<input id="admin_note" type="text" name="admin_note" value="<?php echo Utils::escape($user['admin_note']) ?>" size="30" maxlength="30" /><br /></label>
-<?php endif; ?>						</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
diff --git a/view/profile/section_messaging.php b/view/profile/section_messaging.php
deleted file mode 100644
index 18ec791c..00000000
--- a/view/profile/section_messaging.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section messaging') ?></span></h2>
-	<div class="box">
-		<form id="profile3" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/messaging/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Contact details legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Jabber') ?><br /><input id="jabber" type="text" name="form_jabber" value="<?php echo Utils::escape($user['jabber']) ?>" size="40" maxlength="75" /><br /></label>
-						<label><?php _e('ICQ') ?><br /><input id="icq" type="text" name="form_icq" value="<?php echo $user['icq'] ?>" size="12" maxlength="12" /><br /></label>
-						<label><?php _e('MSN') ?><br /><input id="msn" type="text" name="form_msn" value="<?php echo Utils::escape($user['msn']) ?>" size="40" maxlength="50" /><br /></label>
-						<label><?php _e('AOL IM') ?><br /><input id="aim" type="text" name="form_aim" value="<?php echo Utils::escape($user['aim']) ?>" size="20" maxlength="30" /><br /></label>
-						<label><?php _e('Yahoo') ?><br /><input id="yahoo" type="text" name="form_yahoo" value="<?php echo Utils::escape($user['yahoo']) ?>" size="20" maxlength="30" /><br /></label>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/profile/section_personal.php b/view/profile/section_personal.php
deleted file mode 100644
index 75e5df5e..00000000
--- a/view/profile/section_personal.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personal') ?></span></h2>
-	<div class="box">
-		<form id="profile2" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personal/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Personal details legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo Utils::escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
-<?php if (isset($title_field)): ?>							<?php echo $title_field ?>
-<?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo Utils::escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo Utils::escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
-<?php endif; ?>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/profile/section_personality.php b/view/profile/section_personality.php
deleted file mode 100644
index b1c3416d..00000000
--- a/view/profile/section_personality.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section personality') ?></span></h2>
-	<div class="box">
-		<form id="profile4" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/personality/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div><input type="hidden" name="form_sent" value="1" /></div>
-<?php if ($feather->forum_settings['o_avatars'] == '1'): ?>				<div class="inform">
-				<fieldset id="profileavatar">
-					<legend><?php _e('Avatar legend') ?></legend>
-					<div class="infldset">
-<?php if ($user_avatar): ?>							<div class="useravatar"><?php echo $user_avatar ?></div>
-<?php endif; ?>							<p><?php _e('Avatar info') ?></p>
-						<p class="clearb actions"><?php echo $avatar_field ?></p>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; if ($feather->forum_settings['o_signatures'] == '1'): ?>				<div class="inform">
-				<fieldset>
-					<legend><?php _e('Signature legend') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Signature info') ?></p>
-						<div class="txtarea">
-							<label><?php printf(__('Sig max size'), Utils::forum_number_format($feather->forum_settings['p_sig_length']), $feather->forum_settings['p_sig_lines']) ?><br />
-							<textarea name="signature" rows="4" cols="65"><?php echo Utils::escape($user['signature']) ?></textarea><br /></label>
-						</div>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_sig_bbcode'] == '1' && $feather->forum_settings['p_sig_img_tag'] == '1') ? __('on') : __('off'); ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies_sig'] == '1') ? __('on') : __('off'); ?></span></li>
-						</ul>
-						<?php echo $signature_preview ?>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
diff --git a/view/profile/section_privacy.php b/view/profile/section_privacy.php
deleted file mode 100644
index d501cd49..00000000
--- a/view/profile/section_privacy.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php echo Utils::escape($user['username']).' - '.__('Section privacy') ?></span></h2>
-	<div class="box">
-		<form id="profile6" method="post" action="<?php echo $feather->url->get('user/'.$id.'/section/privacy/') ?>">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Privacy options legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<p><?php _e('Email setting info') ?></p>
-						<div class="rbox">
-							<label><input type="radio" name="form_email_setting" value="0"<?php if ($user['email_setting'] == '0') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Email setting 1') ?><br /></label>
-							<label><input type="radio" name="form_email_setting" value="1"<?php if ($user['email_setting'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Email setting 2') ?><br /></label>
-							<label><input type="radio" name="form_email_setting" value="2"<?php if ($user['email_setting'] == '2') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Email setting 3') ?><br /></label>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php if ($feather->forum_settings['o_forum_subscriptions'] == '1' || $feather->forum_settings['o_topic_subscriptions'] == '1'): ?>				<div class="inform">
-				<fieldset>
-					<legend><?php _e('Subscription legend') ?></legend>
-					<div class="infldset">
-						<div class="rbox">
-							<label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['notify_with_post'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Notify full') ?><br /></label>
-<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1'): ?>								<label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {
-    echo ' checked="checked"';
-} ?> /><?php _e('Auto notify full') ?><br /></label>
-<?php endif; ?>
-						</div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>				<p class="buttons"><input type="submit" name="update" value="<?php _e('Submit') ?>" /> <?php _e('Instructions') ?></p>
-		</form>
-	</div>
-</div>
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/view/profile/upload_avatar.php b/view/profile/upload_avatar.php
deleted file mode 100644
index 44de1b15..00000000
--- a/view/profile/upload_avatar.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-	exit;
-}
-
-?>
-<div class="blockform">
-	<h2><span><?php _e('Upload avatar') ?></span></h2>
-	<div class="box">
-		<form id="upload_avatar" method="post" enctype="multipart/form-data" action="<?php echo $feather->url->get('user/'.$id.'/action/upload_avatar2/') ?>" onsubmit="return process_form(this)">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Upload avatar legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
-						<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
-						<p><?php _e('Avatar desc'); echo ' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.Utils::forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.$feather->utils->file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="upload" value="<?php _e('Upload') ?>" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
diff --git a/view/profile/view_profile.php b/view/profile/view_profile.php
deleted file mode 100644
index 9e65b5f5..00000000
--- a/view/profile/view_profile.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div id="viewprofile" class="block">
-	<h2><span><?php _e('Profile') ?></span></h2>
-	<div class="box">
-		<div class="fakeform">
-			<div class="inform">
-				<fieldset>
-				<legend><?php _e('Section personal') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personal'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-<?php if (!empty($user_info['messaging'])): ?>			<div class="inform">
-				<fieldset>
-				<legend><?php _e('Section messaging') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['messaging'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; if (!empty($user_info['personality'])): ?>			<div class="inform">
-				<fieldset>
-				<legend><?php _e('Section personality') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['personality'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>			<div class="inform">
-				<fieldset>
-				<legend><?php _e('User activity') ?></legend>
-					<div class="infldset">
-						<dl>
-							<?php echo implode("\n\t\t\t\t\t\t\t", $user_info['activity'])."\n" ?>
-						</dl>
-						<div class="clearer"></div>
-					</div>
-				</fieldset>
-			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/register/email.php b/view/register/email.php
deleted file mode 100644
index b15593b2..00000000
--- a/view/register/email.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div id="emailform" class="blockform">
-	<h2><span><?php _e('Send email to') ?> <?php echo Utils::escape($recipient) ?></span></h2>
-	<div class="box">
-		<form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write email') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="redirect_url" value="<?php echo Utils::escape($redirect_url) ?>" />
-						<label class="required"><strong><?php _e('Email subject') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input class="longinput" type="text" name="req_subject" size="75" maxlength="70" tabindex="1" /><br /></label>
-						<label class="required"><strong><?php _e('Email message') ?> <span><?php _e('Required') ?></span></strong><br />
-						<textarea name="req_message" rows="10" cols="75" tabindex="2"></textarea><br /></label>
-						<p><?php _e('Email disclosure note') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="submit" value="<?php _e('Submit') ?>" tabindex="3" accesskey="s" /> <a href="javascript:history.go(-1)"><?php _e('Go back') ?></a></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/register/form.php b/view/register/form.php
deleted file mode 100644
index 6d3b36bb..00000000
--- a/view/register/form.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-// If there are errors, we display them
-if (!empty($errors)) {
-    ?>
-<div id="posterror" class="block">
-	<h2><span><?php _e('Registration errors') ?></span></h2>
-	<div class="box">
-		<div class="inbox error-info">
-			<p><?php _e('Registration errors info') ?></p>
-			<ul class="error-list">
-<?php
-
-    foreach ($errors as $cur_error) {
-        echo "\t\t\t\t".'<li><strong>'.$cur_error.'</strong></li>'."\n";
-    }
-    ?>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<?php
-
-}
-?>
-<div id="regform" class="blockform">
-	<h2><span><?php _e('Register') ?></span></h2>
-	<div class="box">
-		<form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
-		<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<div class="forminfo">
-					<h3><?php _e('Important information') ?></h3>
-					<p><?php _e('Desc 1') ?></p>
-					<p><?php _e('Desc 2') ?></p>
-				</div>
-				<fieldset>
-					<legend><?php _e('Username legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="username" value="" />
-						<input type="hidden" name="password" value="" />
-						<label class="required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if ($feather->request->post('req_user')) {
-    echo Utils::escape($feather->request->post('req_user'));
-} ?>" size="25" maxlength="25" /><br /></label>
-					</div>
-				</fieldset>
-			</div>
-<?php if ($feather->forum_settings['o_regs_verify'] == '0'): ?>			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Pass legend') ?></legend>
-					<div class="infldset">
-						<label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if ($feather->request->post('req_password1')) {
-    echo Utils::escape($feather->request->post('req_password1'));
-} ?>" size="16" /><br /></label>
-						<label class="conl required"><strong><?php _e('Confirm pass') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if ($feather->request->post('req_password2')) {
-    echo Utils::escape($feather->request->post('req_password2'));
-} ?>" size="16" /><br /></label>
-						<p class="clearb"><?php _e('Pass info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-<?php endif; ?>			<div class="inform">
-				<fieldset>
-					<legend><?php echo($feather->forum_settings['o_regs_verify'] == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
-					<div class="infldset">
-<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<p><?php _e('Email info') ?></p>
-<?php endif; ?>						<label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="text" name="req_email1" value="<?php if ($feather->request->post('req_email1')) {
-    echo Utils::escape($feather->request->post('req_email1'));
-} ?>" size="50" maxlength="80" /><br /></label>
-<?php if ($feather->forum_settings['o_regs_verify'] == '1'): ?>						<label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
-						<input type="text" name="req_email2" value="<?php if ($feather->request->post('req_email2')) {
-    echo Utils::escape($feather->request->post('req_email2'));
-} ?>" size="50" maxlength="80" /><br /></label>
-<?php endif; ?>					</div>
-				</fieldset>
-			</div>
-<?php
-        // Only display the language selection box if there's more than one language available
-        if (count($languages) > 1) {
-            ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Localisation legend') ?></legend>
-					<div class="infldset">
-							<label><?php _e('Language') ?>
-							<br /><select name="language">
-<?php
-
-            foreach ($languages as $temp) {
-                if ($feather->forum_settings['o_default_lang'] == $temp) {
-                    echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'" selected="selected">'.$temp.'</option>'."\n";
-                } else {
-                    echo "\t\t\t\t\t\t\t\t".'<option value="'.$temp.'">'.$temp.'</option>'."\n";
-                }
-            }
-
-            ?>
-							</select>
-							<br /></label>
-					</div>
-				</fieldset>
-			</div>
-<?php
-
-        }
-?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Robot title') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Robot info')    ?></p>
-						<label class="required"><strong><?php echo sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php _e('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /></label>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="register" value="<?php _e('Register') ?>" /></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/register/rules.php b/view/register/rules.php
deleted file mode 100644
index 9eae40df..00000000
--- a/view/register/rules.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div id="rules" class="blockform">
-	<div class="hd"><h2><span><?php _e('Forum rules') ?></span></h2></div>
-	<div class="box">
-		<form method="get" action="<?php echo $feather->url->get('register/') ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Rules legend') ?></legend>
-					<div class="infldset">
-						<div class="usercontent"><?php echo $feather->forum_settings['o_rules_message'] ?></div>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="agree" value="<?php _e('Agree') ?>" /> <input type="submit" name="cancel" value="<?php _e('Cancel') ?>" /></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/search/footer.php b/view/search/footer.php
deleted file mode 100644
index 05e8d654..00000000
--- a/view/search/footer.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-if ($search['show_as'] == 'topics') :
-?>
-			</tbody>
-		</table>
-		</div>
-	</div>
-</div>
-
-<?php
-endif;
-?>
-
-<div class="postlinksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
-		</ul>
-<?php echo(!empty($search['forum_actions']) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $search['forum_actions']).'</p>'."\n" : '') ?>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/search/form.php b/view/search/form.php
deleted file mode 100644
index 8b47e40f..00000000
--- a/view/search/form.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div id="searchform" class="blockform">
-	<h2><span><?php _e('Search') ?></span></h2>
-	<div class="box">
-		<form id="search" method="get" action="">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Search criteria legend') ?></legend>
-					<div class="infldset">
-						<input type="hidden" name="action" value="search" />
-						<label class="conl"><?php _e('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" /><br /></label>
-						<label class="conl"><?php _e('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
-						<p class="clearb"><?php _e('Search info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Search in legend') ?></legend>
-					<div class="infldset">
-					<?php echo $forums ?>
-						<label class="conl"><?php _e('Search in')."\n" ?>
-						<br /><select id="search_in" name="search_in">
-							<option value="0"><?php _e('Message and subject') ?></option>
-							<option value="1"><?php _e('Message only') ?></option>
-							<option value="-1"><?php _e('Topic only') ?></option>
-						</select>
-						<br /></label>
-						<p class="clearl"><?php _e('Search in info') ?></p>
-<?php echo($feather->forum_settings['o_search_all_forums'] == '1' || $feather->user->is_admmod ? '<p>'.__('Search multiple forums info').'</p>' : '') ?>
-					</div>
-				</fieldset>
-			</div>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Search results legend') ?></legend>
-					<div class="infldset">
-						<label class="conl"><?php _e('Sort by')."\n" ?>
-						<br /><select name="sort_by">
-							<option value="0"><?php _e('Sort by post time') ?></option>
-							<option value="1"><?php _e('Sort by author') ?></option>
-							<option value="2"><?php _e('Sort by subject') ?></option>
-							<option value="3"><?php _e('Sort by forum') ?></option>
-						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Sort order')."\n" ?>
-						<br /><select name="sort_dir">
-							<option value="DESC"><?php _e('Descending') ?></option>
-							<option value="ASC"><?php _e('Ascending') ?></option>
-						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Show as')."\n" ?>
-						<br /><select name="show_as">
-							<option value="topics"><?php _e('Show as topics') ?></option>
-							<option value="posts"><?php _e('Show as posts') ?></option>
-						</select>
-						<br /></label>
-						<p class="clearb"><?php _e('Search results info') ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/search/header.php b/view/search/header.php
deleted file mode 100644
index 2299e454..00000000
--- a/view/search/header.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('search/') ?>"><?php echo $search['crumbs_text']['show_as'] ?></a></li>
-			<li><span>»&#160;</span><strong><?php echo $search['crumbs_text']['search_type'] ?></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $search['paging_links'] ?></p>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<?php
-if ($search['show_as'] == 'topics') :
-?>
-<div id="vf" class="blocktable">
-	<h2><span><?php _e('Search results') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
-					<th class="tc2" scope="col"><?php _e('Forum') ?></th>
-					<th class="tc3" scope="col"><?php _e('Replies') ?></th>
-					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-<?php
-endif;
diff --git a/view/search/posts.php b/view/search/posts.php
deleted file mode 100644
index 39f20c24..00000000
--- a/view/search/posts.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="blockpost<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($cur_search['pid'] == $cur_search['first_post_id']) {
-    echo ' firstpost';
-} ?><?php if ($post_count == 1) {
-    echo ' blockpost1';
-} ?><?php if ($cur_search['item_status'] != '') {
-    echo ' '.$cur_search['item_status'];
-} ?>">
-<h2><span><span class="conr">#<?php echo($search['start_from'] + $post_count) ?></span> <span><?php if ($cur_search['pid'] != $cur_search['first_post_id']) {
-    _e('Re').' ';
-} ?><?php echo $forum ?></span> <span>»&#160;<a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_search['subject']) ?></a></span> <span>»&#160;<a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php echo $feather->utils->format_time($cur_search['pposted']) ?></a></span></span></h2>
-<div class="box">
-	<div class="inbox">
-		<div class="postbody">
-			<div class="postleft">
-				<dl>
-					<dt><?php echo $cur_search['pposter_disp'] ?></dt>
-<?php if ($cur_search['pid'] == $cur_search['first_post_id']) : ?>						<dd><span><?php _e('Replies').' '.Utils::forum_number_format($cur_search['num_replies']) ?></span></dd>
-<?php endif; ?>
-					<dd><div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo $cur_search['icon_text'] ?></div></div></dd>
-				</dl>
-			</div>
-			<div class="postright">
-				<div class="postmsg">
-					<?php echo $cur_search['message']."\n" ?>
-				</div>
-			</div>
-			<div class="clearer"></div>
-		</div>
-	</div>
-	<div class="inbox">
-		<div class="postfoot clearb">
-			<div class="postfootright">
-				<ul>
-					<li><span><a href="<?php echo $feather->url->get('topic/'.$cur_search['tid'].'/'.$url_topic.'/') ?>"><?php _e('Go to topic') ?></a></span></li>
-					<li><span><a href="<?php echo $feather->url->get('post/'.$cur_search['pid'].'/#p'.$cur_search['pid']) ?>"><?php _e('Go to post') ?></a></span></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-</div>
-</div>
\ No newline at end of file
diff --git a/view/search/topics.php b/view/search/topics.php
deleted file mode 100644
index 7549c3f3..00000000
--- a/view/search/topics.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<tr class="<?php echo $cur_search['item_status'] ?>">
-	<td class="tcl">
-		<div class="<?php echo $cur_search['icon_type'] ?>"><div class="nosize"><?php echo Utils::forum_number_format($topic_count + $start_from) ?></div></div>
-		<div class="tclcon">
-			<div>
-				<?php echo $subject."\n" ?>
-			</div>
-		</div>
-	</td>
-	<td class="tc2"><?php echo $forum ?></td>
-	<td class="tc3"><?php echo Utils::forum_number_format($cur_search['num_replies']) ?></td>
-	<td class="tcr"><?php echo '<a href="'.$feather->url->get('post/'.$cur_search['last_post_id'].'/#p'.$cur_search['last_post_id']).'">'.$feather->utils->format_time($cur_search['last_post']).'</a> <span class="byuser">'.__('by').' '.Utils::escape($cur_search['last_poster']) ?></span></td>
-</tr>
\ No newline at end of file
diff --git a/view/userlist.php b/view/userlist.php
deleted file mode 100644
index 911df592..00000000
--- a/view/userlist.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
- 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-<div class="blockform">
-	<h2><span><?php _e('User search') ?></span></h2>
-	<div class="box">
-		<form id="userlist" method="get" action="">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('User find legend') ?></legend>
-					<div class="infldset">
-<?php if ($feather->user->g_search_users == '1'): ?>						<label class="conl"><?php _e('Username') ?><br /><input type="text" name="username" value="<?php echo Utils::escape($username) ?>" size="25" maxlength="25" /><br /></label>
-<?php endif; ?>						<label class="conl"><?php _e('User group')."\n" ?>
-						<br /><select name="show_group">
-							<option value="-1"<?php if ($show_group == -1) {
-    echo ' selected="selected"';
-} ?>><?php _e('All users') ?></option>
-<?php echo $dropdown_menu ?>
-						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Sort by')."\n" ?>
-						<br /><select name="sort_by">
-							<option value="username"<?php if ($sort_by == 'username') {
-    echo ' selected="selected"';
-} ?>><?php _e('Username') ?></option>
-							<option value="registered"<?php if ($sort_by == 'registered') {
-    echo ' selected="selected"';
-} ?>><?php _e('Registered') ?></option>
-<?php if ($show_post_count): ?>							<option value="num_posts"<?php if ($sort_by == 'num_posts') {
-    echo ' selected="selected"';
-} ?>><?php _e('No of posts') ?></option>
-<?php endif; ?>						</select>
-						<br /></label>
-						<label class="conl"><?php _e('Sort order')."\n" ?>
-						<br /><select name="sort_dir">
-							<option value="ASC"<?php if ($sort_dir == 'ASC') {
-    echo ' selected="selected"';
-} ?>><?php _e('Ascending') ?></option>
-							<option value="DESC"<?php if ($sort_dir == 'DESC') {
-    echo ' selected="selected"';
-} ?>><?php _e('Descending') ?></option>
-						</select>
-						<br /></label>
-						<p class="clearb"><?php echo($feather->user->g_search_users == '1' ? __('User search info').' ' : '').__('User sort info'); ?></p>
-					</div>
-				</fieldset>
-			</div>
-			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
-		</form>
-	</div>
-</div>
-
-<div class="linkst">
-	<div class="inbox">
-		<p class="pagelink"><?php echo $paging_links ?></p>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="users1" class="blocktable">
-	<h2><span><?php _e('User list') ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Username') ?></th>
-					<th class="tc2" scope="col"><?php _e('Title') ?></th>
-<?php if ($show_post_count): ?>					<th class="tc3" scope="col"><?php _e('Posts') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Registered') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-			<?php
-            foreach ($userlist_data as $user) {
-                ?>
-					<tr>
-						<td class="tcl"><?php echo '<a href="'.$feather->url->get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
-						<td class="tc2"><?php echo get_title($user) ?></td>
-	<?php if ($show_post_count): ?>					<td class="tc3"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
-	<?php endif;
-                ?>
-						<td class="tcr"><?php echo $feather->utils->format_time($user['registered'], true) ?></td>
-					</tr>
-			<?php
-
-            }
-            if (empty($userlist_data)) {
-                echo "\t\t\t".'<tr>'."\n\t\t\t\t\t".'<td class="tcl" colspan="'.(($show_post_count) ? 4 : 3).'">'.__('No hits').'</td></tr>'."\n";
-            }
-            ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox">
-		<p class="pagelink"><?php echo $paging_links ?></p>
-		<div class="clearer"></div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/view/viewforum.php b/view/viewforum.php
deleted file mode 100644
index 79bd70a1..00000000
--- a/view/viewforum.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<div id="vf" class="blocktable">
-	<h2><span><?php echo Utils::escape($cur_forum['forum_name']) ?></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<table>
-			<thead>
-				<tr>
-					<th class="tcl" scope="col"><?php _e('Topic') ?></th>
-					<th class="tc2" scope="col"><?php _e('Replies') ?></th>
-<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<th class="tc3" scope="col"><?php _e('Views') ?></th>
-<?php endif; ?>					<th class="tcr" scope="col"><?php _e('Last post') ?></th>
-				</tr>
-			</thead>
-			<tbody>
-			<?php
-            $topic_count = 0;
-            foreach ($forum_data as $topic) {
-                ++$topic_count;
-                ?>
-					<tr class="<?php echo $topic['item_status'] ?>">
-						<td class="tcl">
-							<div class="<?php echo $topic['icon_type'] ?>"><div class="nosize"><?php echo Utils::forum_number_format($topic_count + $start_from) ?></div></div>
-							<div class="tclcon">
-								<div>
-									<?php echo $topic['subject_formatted']."\n" ?>
-								</div>
-							</div>
-						</td>
-						<td class="tc2"><?php echo(is_null($topic['moved_to'])) ? Utils::forum_number_format($topic['num_replies']) : '-' ?></td>
-	<?php if ($feather->forum_settings['o_topic_views'] == '1'): ?>					<td class="tc3"><?php echo(is_null($topic['moved_to'])) ? Utils::forum_number_format($topic['num_views']) : '-' ?></td>
-	<?php endif;
-                ?>					<td class="tcr"><?php echo $topic['last_post_formatted'] ?></td>
-					</tr>
-			<?php
-
-            }
-            if (empty($forum_data)):
-            ?>
-					<tr class="rowodd inone">
-						<td class="tcl" colspan="<?php echo($feather->forum_settings['o_topic_views'] == 1) ? 4 : 3 ?>">
-							<div class="icon inone"><div class="nosize"><!-- --></div></div>
-							<div class="tclcon">
-								<div>
-									<strong><?php _e('Empty forum') ?></strong>
-								</div>
-							</div>
-						</td>
-					</tr>
-			<?php
-            endif;
-            ?>
-			</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<div class="linksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php $feather->url->get('forum/'.$id.'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_forum['forum_name']) ?></a></strong></li>
-		</ul>
-<?php echo(!empty($forum_actions) ? "\t\t".'<p class="subscribelink clearb">'.implode(' - ', $forum_actions).'</p>'."\n" : '') ?>
-		<div class="clearer"></div>
-	</div>
-</div>
diff --git a/view/viewtopic.php b/view/viewtopic.php
deleted file mode 100644
index 83087f66..00000000
--- a/view/viewtopic.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-
-?>
-
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
-		</ul>
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<?php
-$post_count = 1;
-foreach ($post_data as $post) {
-    ?>
-<div id="p<?php echo $post['id'] ?>" class="blockpost<?php echo($post_count % 2 == 0) ? ' roweven' : ' rowodd' ?><?php if ($post['id'] == $cur_topic['first_post_id']) {
-    echo ' firstpost';
-}
-    ?><?php if ($post_count == 1) {
-    echo ' blockpost1';
-}
-    ?>">
-	<h2><span><span class="conr">#<?php echo($start_from + $post_count) ?></span> <a href="<?php echo $feather->url->get('post/'.$post['id'].'/#p'.$post['id']) ?>"><?php echo $feather->utils->format_time($post['posted']) ?></a></span></h2>
-	<div class="box">
-		<div class="inbox">
-			<div class="postbody">
-				<div class="postleft">
-					<dl>
-						<dt><strong><?php echo $post['username_formatted'] ?></strong></dt>
-						<dd class="usertitle"><strong><?php echo $post['user_title_formatted'] ?></strong></dd>
-<?php if ($post['user_avatar'] != '') {
-    echo "\t\t\t\t\t\t".'<dd class="postavatar">'.$post['user_avatar'].'</dd>'."\n";
-}
-    ?>
-<?php if (count($post['user_info'])) {
-    echo "\t\t\t\t\t\t".implode("\n\t\t\t\t\t\t", $post['user_info'])."\n";
-}
-    ?>
-<?php if (count($post['user_contacts'])) {
-    echo "\t\t\t\t\t\t".'<dd class="usercontacts">'.implode(' ', $post['user_contacts']).'</dd>'."\n";
-}
-    ?>
-					</dl>
-				</div>
-				<div class="postright">
-					<h3><?php if ($post['id'] != $cur_topic['first_post_id']) {
-    _e('Re').' ';
-}
-    ?><?php echo Utils::escape($cur_topic['subject']) ?></h3>
-					<div class="postmsg">
-						<?php echo $post['message']."\n" ?>
-<?php if ($post['edited'] != '') {
-    echo "\t\t\t\t\t\t".'<p class="postedit"><em>'.__('Last edit').' '.Utils::escape($post['edited_by']).' ('.$feather->utils->format_time($post['edited']).')</em></p>'."\n";
-}
-    ?>
-					</div>
-<?php if ($post['signature_formatted'] != '') {
-    echo "\t\t\t\t\t".'<div class="postsignature postmsg"><hr />'.$post['signature_formatted'].'</div>'."\n";
-}
-    ?>
-				</div>
-			</div>
-		</div>
-		<div class="inbox">
-			<div class="postfoot clearb">
-				<div class="postfootleft"><?php if ($post['poster_id'] > 1) {
-    echo '<p>'.$post['is_online_formatted'].'</p>';
-}
-    ?></div>
-<?php if (count($post['post_actions'])) {
-    echo "\t\t\t\t".'<div class="postfootright">'."\n\t\t\t\t\t".'<ul>'."\n\t\t\t\t\t\t".implode("\n\t\t\t\t\t\t", $post['post_actions'])."\n\t\t\t\t\t".'</ul>'."\n\t\t\t\t".'</div>'."\n";
-}
-    ?>
-			</div>
-		</div>
-	</div>
-</div>
-<?php
-    ++$post_count;
-}
-?>
-
-<div class="postlinksb">
-	<div class="inbox crumbsplus">
-		<div class="pagepost">
-			<p class="pagelink conl"><?php echo $paging_links ?></p>
-<?php echo $post_link ?>
-		</div>
-		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->base() ?>/"><?php _e('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('forum/'.$cur_topic['forum_id'].'/'.$url_forum.'/') ?>"><?php echo Utils::escape($cur_topic['forum_name']) ?></a></li>
-			<li><span>»&#160;</span><strong><a href="<?php echo $feather->url->get('topic/'.$id.'/'.$url_topic.'/') ?>"><?php echo Utils::escape($cur_topic['subject']) ?></a></strong></li>
-		</ul>
-<?php echo $subscraction ?>
-		<div class="clearer"></div>
-	</div>
-</div>
-
-<?php
-
-// Display quick post if enabled
-if ($quickpost) {
-    $cur_index = 1;
-
-    ?>
-<div id="quickpost" class="blockform">
-	<h2><span><?php _e('Quick post') ?></span></h2>
-	<div class="box">
-		<form id="quickpostform" method="post" action="<?php echo $feather->url->get('post/reply/'.$id.'/') ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
-			<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Write message legend') ?></legend>
-					<div class="infldset txtarea">
-						<input type="hidden" name="form_sent" value="1" />
-						<input type="hidden" name="pid" value="<?php echo Utils::escape($pid) ?>" />
-						<input type="hidden" name="page" value="<?php echo Utils::escape($page_number) ?>" />
-<?php if ($feather->forum_settings['o_topic_subscriptions'] == '1' && ($feather->user->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>						<input type="hidden" name="subscribe" value="1" />
-<?php endif;
-
-    if ($feather->user->is_guest) {
-        $email_label = ($feather->forum_settings['p_force_guest_email'] == '1') ? '<strong>'.__('Email').' <span>'.__('Required').'</span></strong>' : __('Email');
-        $email_form_name = ($feather->forum_settings['p_force_guest_email'] == '1') ? 'req_email' : 'email';
-        ?>
-						<label class="conl required"><strong><?php _e('Guest name') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<label class="conl<?php echo($feather->forum_settings['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
-						<div class="clearer"></div>
-<?php
-
-    echo "\t\t\t\t\t\t".'<label class="required"><strong>'.__('Message').' <span>'.__('Required').'</span></strong><br />';
-    } else {
-        echo "\t\t\t\t\t\t".'<label>';
-    }
-
-    ?>
-<!-- Init BBcode editor toolbar -->
-<script>
-    var baseUrl = '<?php echo Utils::escape($feather->url->base(true)); ?>',
-        langBbeditor = <?= json_encode($lang_bbeditor, JSON_PRETTY_PRINT); ?>;
-</script>
-<script src="<?php echo Url::base() ?>/style/imports/bbeditor.js"></script>
-<script>postEditorToolbar('req_message');</script>
-
-<textarea name="req_message" id="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
-						<ul class="bblinks">
-							<li><span><a href="<?php echo $feather->url->get('help/#bbcode') ?>" onclick="window.open(this.href); return false;"><?php _e('BBCode') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1') ? __('on') : __('off');
-    ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#url') ?>" onclick="window.open(this.href); return false;"><?php _e('url tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->user->g_post_links == '1') ? __('on') : __('off');
-    ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#img') ?>" onclick="window.open(this.href); return false;"><?php _e('img tag') ?></a> <?php echo($feather->forum_settings['p_message_bbcode'] == '1' && $feather->forum_settings['p_message_img_tag'] == '1') ? __('on') : __('off');
-    ?></span></li>
-							<li><span><a href="<?php echo $feather->url->get('help/#smilies') ?>" onclick="window.open(this.href); return false;"><?php _e('Smilies') ?></a> <?php echo($feather->forum_settings['o_smilies'] == '1') ? __('on') : __('off');
-    ?></span></li>
-						</ul>
-					</div>
-				</fieldset>
-			</div>
-			<?php if ($feather->user->is_guest) : ?>
-			<div class="inform">
-				<fieldset>
-					<legend><?php _e('Robot title') ?></legend>
-					<div class="infldset">
-						<p><?php _e('Robot info')    ?></p>
-						<label class="required"><strong><?php
-                             $question = array_keys($lang_antispam_questions);
-    $qencoded = md5($question[$index_questions]);
-    echo sprintf(__('Robot question'), $question[$index_questions]);
-    ?>
-							 <span><?php _e('Required') ?></span></strong>
-							 <br />
-							 <input	name="captcha" id="captcha"	type="text"	size="10" maxlength="30" /><input name="captcha_q" value="<?php echo $qencoded ?>" type="hidden" /><br />
-						</label>
-					</div>
-				</fieldset>
-			</div>
-			<?php endif;
-    ?>
-			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php _e('Submit') ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php _e('Preview') ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
-		</form>
-	</div>
-</div>
-<?php
-
-}

From efd06b02ee7ea19e20e1e7393a63b4740a616f19 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 7 Sep 2015 15:08:05 +0200
Subject: [PATCH 343/353] Restore message.php view file

---
 featherbb/View/message.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 featherbb/View/message.php

diff --git a/featherbb/View/message.php b/featherbb/View/message.php
new file mode 100644
index 00000000..69f4884b
--- /dev/null
+++ b/featherbb/View/message.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2015 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('FEATHER')) {
+    exit;
+}
+
+?>
+<div id="msg" class="block error">
+	<h2><span><?= __('Error') ?></span></h2>
+	<div class="box">
+		<div class="inbox">
+			<p><?php echo $msg ?></p>
+<?php if (!$no_back_link): ?>			<p><a href="javascript: history.go(-1)"><?php _e('Go back') ?></a></p>
+<?php endif;
+    ?>		</div>
+	</div>
+</div>

From d7ee689300f090a6875b96c30338332f6258a411 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Mon, 7 Sep 2015 23:01:03 +0200
Subject: [PATCH 344/353] New plugins management

Inspired by Flarum.
---
 Plugins/Test.php                              |  49 ---
 featherbb/Controller/Admin/Plugins.php        |  60 +--
 featherbb/Core/Lister.php                     |  49 +--
 featherbb/Core/Plugin.php                     | 185 ++------
 featherbb/Middleware/Core.php                 |  11 +-
 featherbb/View/admin/loader.php               |  17 -
 featherbb/View/admin/plugins.php              |  31 +-
 featherbb/lang/English/admin/plugins.mo       | Bin 0 -> 712 bytes
 featherbb/lang/English/admin/plugins.po       |  36 ++
 featherbb/routes.php                          |   7 +-
 plugins/test/bootstrap.php                    |   5 +
 plugins/test/composer.json                    |   7 +
 plugins/test/featherbb.json                   |   9 +
 plugins/test/plugintest.php                   |  44 --
 plugins/test/src/Test.php                     |  28 ++
 plugins/test/vendor/autoload.php              |   7 +
 plugins/test/vendor/composer/ClassLoader.php  | 413 ++++++++++++++++++
 plugins/test/vendor/composer/LICENSE          |  21 +
 .../vendor/composer/autoload_classmap.php     |   9 +
 .../vendor/composer/autoload_namespaces.php   |   9 +
 .../test/vendor/composer/autoload_psr4.php    |  10 +
 .../test/vendor/composer/autoload_real.php    |  50 +++
 plugins/test/vendor/composer/installed.json   |   1 +
 23 files changed, 703 insertions(+), 355 deletions(-)
 delete mode 100644 Plugins/Test.php
 delete mode 100644 featherbb/View/admin/loader.php
 create mode 100644 featherbb/lang/English/admin/plugins.mo
 create mode 100644 featherbb/lang/English/admin/plugins.po
 create mode 100644 plugins/test/bootstrap.php
 create mode 100644 plugins/test/composer.json
 create mode 100644 plugins/test/featherbb.json
 delete mode 100644 plugins/test/plugintest.php
 create mode 100644 plugins/test/src/Test.php
 create mode 100644 plugins/test/vendor/autoload.php
 create mode 100644 plugins/test/vendor/composer/ClassLoader.php
 create mode 100644 plugins/test/vendor/composer/LICENSE
 create mode 100644 plugins/test/vendor/composer/autoload_classmap.php
 create mode 100644 plugins/test/vendor/composer/autoload_namespaces.php
 create mode 100644 plugins/test/vendor/composer/autoload_psr4.php
 create mode 100644 plugins/test/vendor/composer/autoload_real.php
 create mode 100644 plugins/test/vendor/composer/installed.json

diff --git a/Plugins/Test.php b/Plugins/Test.php
deleted file mode 100644
index 10280d9a..00000000
--- a/Plugins/Test.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2012 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-namespace Plugins;
-
-use FeatherBB\Core\Plugin as Plugin;
-
-class Test extends Plugin
-{
-    public static $name = 'A Test plugin';
-    public static $description = "Just a useless plugin to check everything is all right! And it seems so ;)";
-
-    public function runHooks()
-    {
-        $this->hooks->bind('get_forum_actions', function ($forum_actions) {
-           $forum_actions[] = '<a href="' . get_link('mark-read/') . '">Test1</a>';
-           return $forum_actions;
-        });
-
-        // $this->hooks->bind('get_forum_actions', function ($forum_actions) {
-        //     $forum_actions[] = '<a href="' . get_link('mark-read/') . '">Test2</a>';
-        //     return $forum_actions;
-        // });
-    }
-
-    public function run()
-    {
-        $this->hooks->bind('get_forum_actions', function ($forum_actions) {
-           $forum_actions[] = '<a href="' . $this->feather->url->get('mark-read/') . '">Test1</a>';
-           return $forum_actions;
-        });
-
-        $this->hooks->bind('get_forum_actions', function ($forum_actions) {
-            $forum_actions[] = '<a href="' . $this->feather->url->get('mark-read/') . '">Test2</a>';
-            return $forum_actions;
-        });
-    }
-
-    public static function test()
-    {
-        echo 'test';
-    }
-}
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
index 288c4078..50c1d70a 100644
--- a/featherbb/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -9,9 +9,11 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\Lister;
 use FeatherBB\Core\Error;
-use FeatherBB\Core\Url;
 use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
+use FeatherBB\Core\Plugin as PluginManager;
 
 class Plugins
 {
@@ -22,72 +24,50 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
+        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/plugins.mo');
     }
 
     public function index()
     {
-        // Update permissions
-        // if ($this->feather->request->isPost()) {
-        //     $this->model->update_permissions();
-        // }
-
         // AdminUtils::generateAdminMenu('plugins');
         $this->feather->template->addAsset('js', 'style/imports/common.js', array('type' => 'text/javascript'));
 
-        $pluginsList = \FeatherBB\Core\Lister::getValidPlugins();
-        // var_dump($pluginsList);
+        $plugins = Lister::getPlugins();
+        // var_dump($plugins);
         $activePlugins = $this->feather->cache->isCached('active_plugins') ? $this->feather->cache->retrieve('active_plugins') : array();
         // var_dump($activePlugins);
+        // $this->feather->cache->delete('active_plugins');
 
         $this->feather->template->setPageInfo(array(
                 'admin_console' => true,
                 'active_page' => 'admin',
-                'pluginsList'    =>    $pluginsList,
+                'plugins'    =>    $plugins,
                 'activePlugins'    =>    $activePlugins,
-                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), 'Plugins'),
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Extension')),
             )
         )->addTemplate('admin/plugins.php')->display();
     }
 
-    public function activate($pluginName = null)
+    public function activate($plugin = null)
     {
-        // The plugin to load should be supplied via GET
-        // $pluginName = $this->request->get('plugin') ? $this->request->get('plugin') : null;
-        if (!$pluginName) {
-            throw new Error(__('Bad request'), 400);
-        }
+        if (!$plugin) throw new Error(__('Bad request'), 400);
 
-        // Check if plugin follows PSR-4 conventions and extends base forum plugin
-        if (!class_exists($pluginName) || !property_exists($pluginName, 'isValidFBPlugin')) {
-            throw new Error(sprintf(__('No plugin message'), Utils::escape($pluginName)), 400);
-        }
+        $manager = new PluginManager();
+        $manager->activate($plugin);
 
-        $plugin = new $pluginName;
-        try {
-            $plugin->activate($pluginName);
-        } catch (\Exception $e) {
-            Url::redirect($this->feather->urlFor('adminPlugins'), $e->getMessage());
-        }
         // Plugin has been activated, confirm and redirect
-        Url::redirect($this->feather->urlFor('adminPlugins'), 'Plugin "'.$pluginName::$name.'" activated!');
+        Url::redirect($this->feather->urlFor('adminPlugins'), 'Plugin activated!');
     }
 
-    public function deactivate()
+    public function deactivate($plugin = null)
     {
-        // The plugin to load should be supplied via GET
-        $class = $this->request->get('plugin') ? $this->request->get('plugin') : null;
-        if (!$class) {
-            throw new Error(__('Bad request'), 400);
-        }
+        if (!$plugin) throw new Error(__('Bad request'), 400);
+
+        $manager = new PluginManager();
+        $manager->deactivate($plugin);
 
-        $plugin = new $class;
-        try {
-            $plugin->deactivate($class);
-        } catch (\Exception $e) {
-            Url::redirect($this->feather->urlFor('adminPlugins'), $this->feather->utils->escape($e->getMessage()));
-        }
         // Plugin has been activated, confirm and redirect
-        Url::redirect($this->feather->urlFor('adminPlugins'), array('warning', 'Plugin "'.$class::$name.'" deactivated!'));
+        Url::redirect($this->feather->urlFor('adminPlugins'), array('warning', 'Plugin deactivated!'));
     }
 
     public function display()
diff --git a/featherbb/Core/Lister.php b/featherbb/Core/Lister.php
index 055dc6fd..16341e03 100644
--- a/featherbb/Core/Lister.php
+++ b/featherbb/Core/Lister.php
@@ -11,54 +11,21 @@
 
 class Lister
 {
-    /**
-     * Get all php files in plugin folder.
-     */
-    public static function getPluginFiles($folder = '')
-    {
-        $plugin_files = array();
-        $feather = \Slim\Slim::getInstance();
-
-        $plugins_dir = new \RecursiveDirectoryIterator($feather->forum_env['FEATHER_ROOT'].'plugins/'.$folder);
-        $iterator = new \RecursiveIteratorIterator($plugins_dir);
-        $iterator->setMaxDepth(1);
-        $php_files = new \RegexIterator($iterator, '/.+\.php$/i', \RecursiveRegexIterator::GET_MATCH);
-
-        foreach ($php_files as $file) {
-            $plugin_files[] = $file[0];
-        }
-
-        return $plugin_files;
-    }
-
     /**
      * Get all valid plugin files.
      */
-    public static function getValidPlugins($folder = '')
+    public static function getPlugins()
     {
-        $valid_plugins = array();
-
-        $plugin_files = self::getPluginFiles($folder);
-
+        $plugins = array();
         $feather = \Slim\Slim::getInstance();
-        $feather_root = $feather->forum_env['FEATHER_ROOT'];
 
-        foreach ($plugin_files as $key => $file_path) {
-            // Remove forum base path
-            $relative_path = DIRECTORY_SEPARATOR.preg_replace("/" . preg_quote($feather_root, "/") . "/", '', $file_path);
-            preg_match('/^(.+)\.php$/i', $relative_path, $class_name);
-            $parts = explode(DIRECTORY_SEPARATOR, $class_name[1]);
-            $parts[1] = ucfirst($parts[1]); // Replace \plugins to \Core\Plugins for convention
-            $name_space = join($parts, "\\");
-            // Check if plugin follows PSR-4 conventions and extends base forum plugin
-            if (class_exists($name_space) && property_exists($name_space, 'isValidFBPlugin')) {
-                $class = new $name_space;
-                $valid_plugins[end($parts)] =  $name_space;
-            }
-        }
+        foreach (glob($feather->forum_env['FEATHER_ROOT'].'plugins/*/featherbb.json') as $plugin_file)
+		{
+            $plugins[] =  json_decode(file_get_contents($plugin_file));
+		}
 
-        ksort($valid_plugins);
-        return $valid_plugins;
+        natcasesort($plugins);
+        return $plugins;
     }
 
     /**
diff --git a/featherbb/Core/Plugin.php b/featherbb/Core/Plugin.php
index e1e66a50..6574b1df 100644
--- a/featherbb/Core/Plugin.php
+++ b/featherbb/Core/Plugin.php
@@ -13,46 +13,6 @@
 
 class Plugin
 {
-    /**
-     * Ensure daughter plugin classes (users ones) are extending
-     * this default class
-     *
-     * @var boolval
-     */
-    public static $isValidFBPlugin = true;
-
-    /**
-     * @var string
-     */
-    public static $name;
-
-    /**
-     * @var string
-     */
-    public static $version;
-
-    /**
-     * @var string
-     */
-    public static $author;
-
-    /**
-     * @var string
-     */
-    public static $description;
-
-    /**
-     * @var string
-     */
-    public static $updateUrl;
-
-    /**
-     * Structure of database table to create.
-     *
-     * @var array
-     */
-    protected $databaseScheme = array();
-
     /**
      * @var object
      */
@@ -73,141 +33,86 @@ public function __construct()
         $this->hooks = $this->feather->hooks;
     }
 
-    /**
-     * Execute hooks of activated plugins
-     */
-    public static function runActivePlugins()
+    public function getActivePlugins()
     {
-        $feather = \Slim\Slim::getInstance();
-        $activePlugins = $feather->cache->isCached('active_plugins') ? $feather->cache->retrieve('active_plugins') : array();
-        // $activePlugins = array();
-        // var_dump($activePlugins);
-
-        foreach ($activePlugins as $name => $plugin) {
-            if (class_exists($name)) {
-                $newPlugin = new $name();
-                $newPlugin->run();
-            }
-        }
-        return true;
+        $activePlugins = $this->feather->cache->isCached('active_plugins') ? $this->feather->cache->retrieve('active_plugins') : array();
+
+        return $activePlugins;
     }
 
     /**
-     * Activate a plugin based on class name
+     * Run activated plugins
      */
-    public function activate($pluginName)
+    public function loadPlugins()
     {
-        // TODO: Allow creation of new tables in database
-        // \FeatherBB\Core::init_db($data);;
-        // $feather = \Slim\Slim::getInstance();
-        // // Handle db prefix
-        // $db_prefix = $feather->forum_settings['db_prefix']
-        // // Create tables
-        // foreach ($this->getDatabaseScheme() as $table => $sql) {
-        //     if (!$this->createTable($db_prefix.$table, $sql)) {
-        //         // Error handling
-        //         $this->errors[] = 'A problem was encountered while creating table '.$table;
-        //     }
-        // }
-        // // Populate tables with default values
-        // foreach ($this->loadMockData() as $group_name => $group_data) {
-        //     $this->model->addData('groups', $group_data);
-        // }
-
-        $activePlugins = $this->feather->cache->isCached('active_plugins') ? $this->feather->cache->retrieve('active_plugins') : array();
+        $activePlugins = $this->getActivePlugins();
 
-        // Check if plugin isn't already activated
-        if (!array_key_exists($pluginName, $activePlugins)) {
-            $activePlugins[$pluginName] = true;
-            $this->feather->cache->store('active_plugins', $activePlugins);
-        } else {
-            throw new \Exception('Plugin "'.$pluginName::$name.'" already activated', 1);
+        foreach ($activePlugins as $plugin) {
+            if ($class = $this->load($plugin)) {
+                $class->run();
+            }
         }
     }
 
     /**
-     * Deactivate a plugin based on class name
+     * Activate a plugin
      */
-    public function deactivate($pluginName)
+    public function activate($plugin)
     {
-        $activePlugins = $this->feather->cache->isCached('active_plugins') ? $this->feather->cache->retrieve('active_plugins') : array();
+        $activePlugins = $this->getActivePlugins();
+
+        // Check if plugin is not yet activated
+        if (!in_array($plugin, $activePlugins)) {
+            $activePlugins[] = $plugin;
+
+            $class = $this->load($plugin);
+            $class->install();
 
-        // Check if plugin is actually activated
-        if (array_key_exists($pluginName, $activePlugins)) {
-            unset($activePlugins[$pluginName]);
             $this->feather->cache->store('active_plugins', $activePlugins);
-        } else {
-            throw new \Exception("Plugin ".$pluginName::$name." not yet activated", 1);
         }
     }
 
-    /**
-     * Run an activated plugin
-     */
-    public function run()
-    {
-        $this->runHooks();
-    }
-
-    protected function runHooks()
+    public function install()
     {
-        // Daughter classes may configure hooks in this function
+        // Daughter classes may override this method for custom install
     }
 
     /**
-     * Getters
+     * Deactivate a plugin
      */
-
-    public function getInfos()
-    {
-        return array(
-            'name' => $this->name,
-            'version' => $this->version,
-            'author' => $this->author,
-            'description' => $this->description,
-        );
-    }
-
-    public static function getName()
+    public function deactivate($plugin)
     {
-        return self::$name;
-    }
+        $activePlugins = $this->getActivePlugins();
 
-    public function getVersion()
-    {
-        return $this->version;
+        // Check if plugin is actually activated
+        if (($k = array_search($plugin, $activePlugins)) !== false) {
+            unset($activePlugins[$k]);
+            $this->feather->cache->store('active_plugins', $activePlugins);
+        }
     }
 
-    public function getAuthor()
+    public function uninstall($plugin)
     {
-        return $this->author;
-    }
+        // Daughter classes may override this method for custom uninstall
+        $this->deactivate($plugin);
 
-    public function getDescription()
-    {
-        return $this->description;
+        $class = $this->load($plugin);
+        $class->uninstall();
     }
 
-    protected function getDatabaseScheme()
+    public function run()
     {
-        return $this->databaseScheme;
+        // Daughter classes may override this method for custom run
     }
 
-
-    protected function createTable($table_name, $sql)
+    protected function load($plugin)
     {
-        $db = DB::get_db();
-        $req = preg_replace('/%t%/', '`'.$table_name.'`', $sql);
-        return $db->exec($req);
+        if (file_exists($file = $this->feather->forum_env['FEATHER_ROOT'].'plugins/'.$plugin.'/bootstrap.php')) {
+            $className = require $file;
+            $class = new $className();
+            return $class;
+        }
+        return false;
     }
 
-    // protected function addData($table_name, array $data)
-    // {
-    //     return (bool) DB::for_table($table_name)
-    //                     ->create()
-    //                     ->set($data)
-    //                     ->save();
-    // }
-
-
 }
diff --git a/featherbb/Middleware/Core.php b/featherbb/Middleware/Core.php
index 4901545d..0e8884d4 100644
--- a/featherbb/Middleware/Core.php
+++ b/featherbb/Middleware/Core.php
@@ -15,6 +15,7 @@
 
 use DB;
 use FeatherBB\Core\Utils;
+use FeatherBB\Core\Plugin as PluginManager;
 
 class Core extends \Slim\Middleware
 {
@@ -120,6 +121,12 @@ public static function init_db(array $config, $log_queries = false)
         ));
     }
 
+    public static function loadPlugins()
+    {
+        $manager = new PluginManager();
+        $manager->loadPlugins();
+    }
+
     // Getters / setters for Slim container (avoid magic get error)
 
     public function set_forum_env($key, $value = null)
@@ -255,8 +262,8 @@ public function call()
         $this->app->config = $this->forum_settings; // Legacy
         extract($this->forum_settings); // Legacy
 
-        // Run hooks of activated plugins
-        \FeatherBB\Core\Plugin::runActivePlugins();
+        // Run activated plugins
+        self::loadPlugins();
 
         // Define time formats
         $forum_time_formats = array($this->forum_settings['o_time_format'], 'H:i:s', 'H:i', 'g:i:s a', 'g:i a');
diff --git a/featherbb/View/admin/loader.php b/featherbb/View/admin/loader.php
deleted file mode 100644
index d1296d7c..00000000
--- a/featherbb/View/admin/loader.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
-    exit;
-}
-?>
-
-	<div class="clearer"></div>
-</div>
\ No newline at end of file
diff --git a/featherbb/View/admin/plugins.php b/featherbb/View/admin/plugins.php
index 5b0cce67..7c6acbef 100644
--- a/featherbb/View/admin/plugins.php
+++ b/featherbb/View/admin/plugins.php
@@ -18,13 +18,9 @@
 <div class="linkst">
 	<div class="inbox crumbsplus">
 		<ul class="crumbs">
-			<li><a href="<?php echo $feather->url->get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?php echo $feather->url->get('admin/users/') ?>"><?php _e('Users') ?></a></li>
-			<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
+			<li><a href="<?= $feather->urlFor('adminIndex') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
+			<li><span>»&#160;</span><a href="<?= $feather->urlFor('adminPlugins') ?>"><strong><?php _e('Extension') ?></strong></a></li>
 		</ul>
-		<div class="pagepost">
-			<p class="pagelink"><?php echo $paging_links ?></p>
-		</div>
 		<div class="clearer"></div>
 	</div>
 </div>
@@ -34,38 +30,37 @@
     <div class="box">
         <div class="inbox">
             <table class="table">
-                <caption>The following plugins are available</caption>
+                <caption><?php _e('Available plugins') ?></caption>
                 <thead>
                     <tr>
-                        <th>Extension</th>
-                        <th>Description</th>
+                        <th><?php _e('Extension') ?></th>
+                        <th><?php _e('Description') ?></th>
                     </tr>
                 </thead>
                 <tbody>
-                    <?php foreach ($pluginsList as $plugin => $class) : ?>
+                    <?php foreach ($plugins as $plugin) : ?>
                         <tr>
                             <td>
-                                <strong><?= $class::$name; ?></strong>
+                                <strong><?= $plugin->title; ?></strong> <small><?= $plugin->version; ?></small>
                                 <div class="plugin-actions">
-                                    <?php if (array_key_exists($class, $activePlugins)) { ?>
-                                        <a href="<?= $feather->urlFor('deactivatePlugin', ['name' => $class]) ?>">Deactivate</a>
+                                    <?php if (in_array($plugin->name, $activePlugins)) { ?>
+                                        <a href="<?= $feather->urlFor('deactivatePlugin', ['name' => $plugin->name]) ?>"><?php _e('Deactivate') ?></a>
                                     <?php } else { ?>
-                                        <a href="<?= $feather->urlFor('activatePlugin', ['name' => $class]) ?>">Activate</a>
+                                        <a href="<?= $feather->urlFor('activatePlugin', ['name' => $plugin->name]) ?>"><?php _e('Activate') ?></a>
                                     <?php } ?>
                                 </div>
                             </td>
                             <td>
-                                <?= $class::$description; ?>
+                                <?= $plugin->description; ?>
                                 <div class="plugin-details">
-                                    Version <?= $class::$version; ?> |
-                                    By <?= $class::$author; ?>
+                                    By <?= $plugin->author->name; ?>
                                 </div>
                             </td>
                         </tr>
                     <?php endforeach; ?>
                 </tbody>
             </table>
-            <p style="text-align:right"><?= count($pluginsList) ?> éléments</p>
+            <p style="text-align:right"><?= count($plugins) ?> éléments</p>
         </div>
     </div>
 </div>
diff --git a/featherbb/lang/English/admin/plugins.mo b/featherbb/lang/English/admin/plugins.mo
new file mode 100644
index 0000000000000000000000000000000000000000..3f9f846d4ec511f412b0bbf6cc86333397b2441c
GIT binary patch
literal 712
zcmbV}y>1gh5XTRakZ_0s8k!V~XrNew5ruWe5s5#Lr9_<If+%Rl=ka-?^{%tKHsL|i
zQSboNl+@7j095om01f}mVTYQLe){k1eC=v}+}=D-U^`$JyahMF2N3Nmh_P?r7WfWQ
z@Ds$mU*J0U4YtA7mD;}v&A}ZI>!(+f<R0`C8tc!YvHl}8)_;P=`p<v;FHn>w8(<S`
zfomWdLKi(_{@V7-pq3Ok*<X^<G}0{QdQmCklOEG5*kfNhH4n;~q<<FJ_;?x`A4u!u
z*dYDll<S2fEeF=kd?pM!!S$WT?bsB@&V3{9c0}_*JI$Rv;WEhKSiWW#`(<Ll6sGJB
z4$}NZA-fJP?qv_}%LMM^OJ1s&y1F_fA7tUkcum1NBps5e7F4k;m}dWU6i;b9Q|8&E
z9x)m<tgH6Yqv28ia(=V%DD7H<|Do&qIfe#43lHa-lxd4{O3riW92W!Gy3C8yC+uY3
zly<C4m5J6!h4n)+!6tnppR-|CzcIHwRzWlyt;Q2XYFECp3s-Wto{@=qNU~l}F=a8a
UTHALRv09NJ$AVUi`=5pV0SwW-?f?J)

literal 0
HcmV?d00001

diff --git a/featherbb/lang/English/admin/plugins.po b/featherbb/lang/English/admin/plugins.po
new file mode 100644
index 00000000..b10b1c93
--- /dev/null
+++ b/featherbb/lang/English/admin/plugins.po
@@ -0,0 +1,36 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: FeatherBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: FeatherBB <admin@featherbb.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Available plugins"
+msgstr "The following plugins are available"
+
+msgid "Extension"
+msgstr "Extension"
+
+msgid "Description"
+msgstr "Description"
+
+msgid "Activate"
+msgstr "Activate"
+
+msgid "Deactivate"
+msgstr "Deactivate"
+
+msgid "Install"
+msgstr "Install"
+
+msgid "Uninstall"
+msgstr "Uninstall"
diff --git a/featherbb/routes.php b/featherbb/routes.php
index ddc68510..9435c1e5 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -192,11 +192,10 @@
 
     // Admin plugins
     $feather->group('/plugins', function() use ($feather) {
-        $feather->map('/(/)', '\FeatherBB\Controller\Admin\Plugins:index')->via('GET', 'POST')->name('adminPlugins');
+        $feather->map('(/)', '\FeatherBB\Controller\Admin\Plugins:index')->via('GET', 'POST')->name('adminPlugins');
         $feather->map('/:name(/)', '\FeatherBB\Controller\Admin\Plugins:index')->via('GET', 'POST')->name('infoPlugin');
-        $feather->map('/activate/:name(/)', '\FeatherBB\Controller\Admin\Plugins:activate')->via('GET')->name('activatePlugin');
-        $feather->map('/deactivate/:name(/)', '\FeatherBB\Controller\Admin\Plugins:deactivate')->via('GET')->name('deactivatePlugin');
-        // $feather->map('/loader(/)', '\FeatherBB\Controller\Admin\Plugins:display')->via('GET', 'POST');
+        $feather->get('/activate/:name(/)', '\FeatherBB\Controller\Admin\Plugins:activate')->conditions(array('name' => '[a-zA-Z\-]+'))->name('activatePlugin');
+        $feather->get('/deactivate/:name(/)', '\FeatherBB\Controller\Admin\Plugins:deactivate')->conditions(array('name' => '[a-zA-Z\-]+'))->name('deactivatePlugin');
     });
 
     // Admin maintenance
diff --git a/plugins/test/bootstrap.php b/plugins/test/bootstrap.php
new file mode 100644
index 00000000..1b122146
--- /dev/null
+++ b/plugins/test/bootstrap.php
@@ -0,0 +1,5 @@
+<?php
+
+require __DIR__.'/vendor/autoload.php';
+
+return 'FeatherBB\Plugins\Test';
diff --git a/plugins/test/composer.json b/plugins/test/composer.json
new file mode 100644
index 00000000..5772b3d3
--- /dev/null
+++ b/plugins/test/composer.json
@@ -0,0 +1,7 @@
+{
+    "autoload": {
+        "psr-4": {
+            "FeatherBB\\Plugins\\": "src/"
+        }
+    }
+}
diff --git a/plugins/test/featherbb.json b/plugins/test/featherbb.json
new file mode 100644
index 00000000..4aa51d8b
--- /dev/null
+++ b/plugins/test/featherbb.json
@@ -0,0 +1,9 @@
+{
+    "name": "test",
+    "title": "Test plugin",
+    "description": "Just a useless plugin to check everything is all right.",
+    "version": "0.1.0",
+    "author": {
+        "name": "beaver"
+    }
+}
diff --git a/plugins/test/plugintest.php b/plugins/test/plugintest.php
deleted file mode 100644
index b75d97fc..00000000
--- a/plugins/test/plugintest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-namespace plugin;
-
-class plugintest
-{
-
-    public function __construct()
-    {
-        $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-        $this->hook = $this->feather->hooks;
-
-        $this->hook->bind('get_forum_actions', function ($forum_actions) {
-            $forum_actions[] = '<a href="' . $this->feather->url->get('mark-read/') . '">Test1</a>';
-            return $forum_actions;
-        });
-
-        $this->hook->bind('get_forum_actions', function ($forum_actions) {
-            $forum_actions[] = '<a href="' . $this->feather->url->get('mark-read/') . '">Test2</a>';
-            return $forum_actions;
-        });
-
-        $this->hook->bind('query_fetch_users_online', function ($query) {
-            $query = $query->limit(50);
-            return $query;
-        });
-
-        /*$this->hook->bind('query_fetch_users_online', function ($query) {
-            $query = $query->offset(50);
-            return $query;
-        });*/
-    }
-}
diff --git a/plugins/test/src/Test.php b/plugins/test/src/Test.php
new file mode 100644
index 00000000..eb8e7574
--- /dev/null
+++ b/plugins/test/src/Test.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Copyright (C) 2015 FeatherBB
+ * based on code by (C) 2008-2012 FluxBB
+ * and Rickard Andersson (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
+
+namespace FeatherBB\Plugins;
+
+use FeatherBB\Core\Plugin as BasePlugin;
+
+class Test extends BasePlugin
+{
+    public function run()
+    {
+        $this->hooks->bind('get_forum_actions', function ($forum_actions) {
+           $forum_actions[] = '<a href="' . $this->feather->url->get('mark-read/') . '">Test1</a>';
+           return $forum_actions;
+        });
+
+        $this->hooks->bind('get_forum_actions', function ($forum_actions) {
+            $forum_actions[] = '<a href="' . $this->feather->url->get('mark-read/') . '">Test2</a>';
+            return $forum_actions;
+        });
+    }
+}
diff --git a/plugins/test/vendor/autoload.php b/plugins/test/vendor/autoload.php
new file mode 100644
index 00000000..37a72436
--- /dev/null
+++ b/plugins/test/vendor/autoload.php
@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer' . '/autoload_real.php';
+
+return ComposerAutoloaderInitc204b6b3f64b0fff63ff500918413ad3::getLoader();
diff --git a/plugins/test/vendor/composer/ClassLoader.php b/plugins/test/vendor/composer/ClassLoader.php
new file mode 100644
index 00000000..5e1469e8
--- /dev/null
+++ b/plugins/test/vendor/composer/ClassLoader.php
@@ -0,0 +1,413 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0 class loader
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+ *
+ *     $loader = new \Composer\Autoload\ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (eg. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class ClassLoader
+{
+    // PSR-4
+    private $prefixLengthsPsr4 = array();
+    private $prefixDirsPsr4 = array();
+    private $fallbackDirsPsr4 = array();
+
+    // PSR-0
+    private $prefixesPsr0 = array();
+    private $fallbackDirsPsr0 = array();
+
+    private $useIncludePath = false;
+    private $classMap = array();
+
+    private $classMapAuthoritative = false;
+
+    public function getPrefixes()
+    {
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
+        }
+
+        return array();
+    }
+
+    public function getPrefixesPsr4()
+    {
+        return $this->prefixDirsPsr4;
+    }
+
+    public function getFallbackDirs()
+    {
+        return $this->fallbackDirsPsr0;
+    }
+
+    public function getFallbackDirsPsr4()
+    {
+        return $this->fallbackDirsPsr4;
+    }
+
+    public function getClassMap()
+    {
+        return $this->classMap;
+    }
+
+    /**
+     * @param array $classMap Class to filename map
+     */
+    public function addClassMap(array $classMap)
+    {
+        if ($this->classMap) {
+            $this->classMap = array_merge($this->classMap, $classMap);
+        } else {
+            $this->classMap = $classMap;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix, either
+     * appending or prepending to the ones previously set for this prefix.
+     *
+     * @param string       $prefix  The prefix
+     * @param array|string $paths   The PSR-0 root directories
+     * @param bool         $prepend Whether to prepend the directories
+     */
+    public function add($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            if ($prepend) {
+                $this->fallbackDirsPsr0 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr0
+                );
+            } else {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $this->fallbackDirsPsr0,
+                    (array) $paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+            return;
+        }
+        if ($prepend) {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixesPsr0[$first][$prefix]
+            );
+        } else {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $this->prefixesPsr0[$first][$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace, either
+     * appending or prepending to the ones previously set for this namespace.
+     *
+     * @param string       $prefix  The prefix/namespace, with trailing '\\'
+     * @param array|string $paths   The PSR-0 base directories
+     * @param bool         $prepend Whether to prepend the directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function addPsr4($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                $this->fallbackDirsPsr4 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr4
+                );
+            } else {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $this->fallbackDirsPsr4,
+                    (array) $paths
+                );
+            }
+        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $this->prefixDirsPsr4[$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix,
+     * replacing any others previously set for this prefix.
+     *
+     * @param string       $prefix The prefix
+     * @param array|string $paths  The PSR-0 base directories
+     */
+    public function set($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr0 = (array) $paths;
+        } else {
+            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace,
+     * replacing any others previously set for this namespace.
+     *
+     * @param string       $prefix The prefix/namespace, with trailing '\\'
+     * @param array|string $paths  The PSR-4 base directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function setPsr4($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr4 = (array) $paths;
+        } else {
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Turns on searching the include path for class files.
+     *
+     * @param bool $useIncludePath
+     */
+    public function setUseIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return bool
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param  string    $class The name of the class
+     * @return bool|null True if loaded, null otherwise
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            includeFile($file);
+
+            return true;
+        }
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|false The path if found, false otherwise
+     */
+    public function findFile($class)
+    {
+        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
+        if ('\\' == $class[0]) {
+            $class = substr($class, 1);
+        }
+
+        // class map lookup
+        if (isset($this->classMap[$class])) {
+            return $this->classMap[$class];
+        }
+        if ($this->classMapAuthoritative) {
+            return false;
+        }
+
+        $file = $this->findFileWithExtension($class, '.php');
+
+        // Search for Hack files if we are running on HHVM
+        if ($file === null && defined('HHVM_VERSION')) {
+            $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if ($file === null) {
+            // Remember that this class does not exist.
+            return $this->classMap[$class] = false;
+        }
+
+        return $file;
+    }
+
+    private function findFileWithExtension($class, $ext)
+    {
+        // PSR-4 lookup
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+        $first = $class[0];
+        if (isset($this->prefixLengthsPsr4[$first])) {
+            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-4 fallback dirs
+        foreach ($this->fallbackDirsPsr4 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 lookup
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+        } else {
+            // PEAR-like class name
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+        }
+
+        if (isset($this->prefixesPsr0[$first])) {
+            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($dirs as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-0 fallback dirs
+        foreach ($this->fallbackDirsPsr0 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 include paths.
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+            return $file;
+        }
+    }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+    include $file;
+}
diff --git a/plugins/test/vendor/composer/LICENSE b/plugins/test/vendor/composer/LICENSE
new file mode 100644
index 00000000..c8d57af8
--- /dev/null
+++ b/plugins/test/vendor/composer/LICENSE
@@ -0,0 +1,21 @@
+
+Copyright (c) 2015 Nils Adermann, Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/plugins/test/vendor/composer/autoload_classmap.php b/plugins/test/vendor/composer/autoload_classmap.php
new file mode 100644
index 00000000..7a91153b
--- /dev/null
+++ b/plugins/test/vendor/composer/autoload_classmap.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/plugins/test/vendor/composer/autoload_namespaces.php b/plugins/test/vendor/composer/autoload_namespaces.php
new file mode 100644
index 00000000..b7fc0125
--- /dev/null
+++ b/plugins/test/vendor/composer/autoload_namespaces.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/plugins/test/vendor/composer/autoload_psr4.php b/plugins/test/vendor/composer/autoload_psr4.php
new file mode 100644
index 00000000..d3a0fa31
--- /dev/null
+++ b/plugins/test/vendor/composer/autoload_psr4.php
@@ -0,0 +1,10 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+    'FeatherBB\\Plugins\\' => array($baseDir . '/src'),
+);
diff --git a/plugins/test/vendor/composer/autoload_real.php b/plugins/test/vendor/composer/autoload_real.php
new file mode 100644
index 00000000..38af767a
--- /dev/null
+++ b/plugins/test/vendor/composer/autoload_real.php
@@ -0,0 +1,50 @@
+<?php
+
+// autoload_real.php @generated by Composer
+
+class ComposerAutoloaderInitc204b6b3f64b0fff63ff500918413ad3
+{
+    private static $loader;
+
+    public static function loadClassLoader($class)
+    {
+        if ('Composer\Autoload\ClassLoader' === $class) {
+            require __DIR__ . '/ClassLoader.php';
+        }
+    }
+
+    public static function getLoader()
+    {
+        if (null !== self::$loader) {
+            return self::$loader;
+        }
+
+        spl_autoload_register(array('ComposerAutoloaderInitc204b6b3f64b0fff63ff500918413ad3', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        spl_autoload_unregister(array('ComposerAutoloaderInitc204b6b3f64b0fff63ff500918413ad3', 'loadClassLoader'));
+
+        $map = require __DIR__ . '/autoload_namespaces.php';
+        foreach ($map as $namespace => $path) {
+            $loader->set($namespace, $path);
+        }
+
+        $map = require __DIR__ . '/autoload_psr4.php';
+        foreach ($map as $namespace => $path) {
+            $loader->setPsr4($namespace, $path);
+        }
+
+        $classMap = require __DIR__ . '/autoload_classmap.php';
+        if ($classMap) {
+            $loader->addClassMap($classMap);
+        }
+
+        $loader->register(true);
+
+        return $loader;
+    }
+}
+
+function composerRequirec204b6b3f64b0fff63ff500918413ad3($file)
+{
+    require $file;
+}
diff --git a/plugins/test/vendor/composer/installed.json b/plugins/test/vendor/composer/installed.json
new file mode 100644
index 00000000..fe51488c
--- /dev/null
+++ b/plugins/test/vendor/composer/installed.json
@@ -0,0 +1 @@
+[]

From edee8b89e60cdb8a0dbfc4bafbe85c92f920a236 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Mon, 7 Sep 2015 23:57:52 +0200
Subject: [PATCH 345/353] Fix missing space (yeah, I'm a maniac)

---
 featherbb/View/footer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/featherbb/View/footer.php b/featherbb/View/footer.php
index 990aa54a..643aa8f9 100644
--- a/featherbb/View/footer.php
+++ b/featherbb/View/footer.php
@@ -125,7 +125,7 @@
 
 // Display debug info (if enabled/defined)
 if (!empty($exec_info)) { ?>
-	<p id="debugtime">[ <?= sprintf(__('Querytime'), round($exec_info['exec_time'], 6), $exec_info['nb_queries']).' - '.sprintf(__('Memory usage'), $exec_info['mem_usage']).' '.sprintf(__('Peak usage'), $exec_info['mem_peak_usage'])?>]</p>
+	<p id="debugtime">[ <?= sprintf(__('Querytime'), round($exec_info['exec_time'], 6), $exec_info['nb_queries']).' - '.sprintf(__('Memory usage'), $exec_info['mem_usage']).' '.sprintf(__('Peak usage'), $exec_info['mem_peak_usage'])?> ]</p>
 <? }
 if (!empty($queries_info)) { ?>
 	<div id="debug" class="blocktable">

From 4e084cb2883038d7c784dd2bff55071d40fda4d8 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Tue, 8 Sep 2015 18:57:01 +0200
Subject: [PATCH 346/353] Get rid of legacy constants

---
 featherbb/Controller/Admin/Bans.php           |  2 +-
 featherbb/Controller/Admin/Users.php          | 10 +--
 featherbb/Controller/Auth.php                 |  2 +-
 featherbb/Controller/Delete.php               |  4 +-
 featherbb/Controller/Edit.php                 |  4 +-
 featherbb/Controller/Forum.php                |  2 +-
 featherbb/Controller/Login.php                | 83 -------------------
 featherbb/Controller/Moderate.php             |  6 +-
 featherbb/Controller/Post.php                 |  2 +-
 featherbb/Controller/Profile.php              | 18 ++--
 featherbb/Controller/Search.php               | 52 ++++++------
 featherbb/Controller/Topic.php                |  2 +-
 featherbb/Core/Parser.php                     |  6 --
 featherbb/Core/Search.php                     |  2 +-
 featherbb/Core/Utils.php                      |  3 +-
 featherbb/Middleware/Core.php                 | 15 ++--
 featherbb/Model/Admin/Bans.php                |  4 +-
 featherbb/Model/Admin/Forums.php              |  4 +-
 featherbb/Model/Admin/Groups.php              | 12 +--
 featherbb/Model/Admin/Options.php             |  8 +-
 featherbb/Model/Admin/Users.php               | 14 ++--
 featherbb/Model/Cache.php                     |  8 +-
 featherbb/Model/Edit.php                      |  4 +-
 featherbb/Model/Login.php                     |  2 +-
 featherbb/Model/Misc.php                      |  2 +-
 featherbb/Model/Moderate.php                  |  4 +-
 featherbb/Model/Post.php                      |  4 +-
 featherbb/Model/Profile.php                   | 30 +++----
 featherbb/Model/Register.php                  |  2 +-
 featherbb/Model/Search.php                    |  4 +-
 featherbb/Model/Topic.php                     |  4 +-
 featherbb/Model/Userlist.php                  |  6 +-
 featherbb/View/admin/bans/add_ban.php         |  2 +-
 featherbb/View/admin/bans/admin_bans.php      |  2 +-
 featherbb/View/admin/bans/search_ban.php      |  2 +-
 featherbb/View/admin/categories.php           |  2 +-
 featherbb/View/admin/censoring.php            |  2 +-
 featherbb/View/admin/forums/admin_forums.php  |  2 +-
 featherbb/View/admin/forums/delete_forum.php  |  2 +-
 featherbb/View/admin/forums/permissions.php   |  2 +-
 .../View/admin/groups/add_edit_group.php      | 16 ++--
 featherbb/View/admin/groups/admin_groups.php  |  8 +-
 .../View/admin/groups/confirm_delete.php      |  2 +-
 featherbb/View/admin/groups/delete_group.php  |  2 +-
 featherbb/View/admin/index.php                |  2 +-
 .../admin/maintenance/admin_maintenance.php   |  2 +-
 featherbb/View/admin/maintenance/prune.php    |  2 +-
 featherbb/View/admin/maintenance/rebuild.php  |  2 +-
 featherbb/View/admin/menu.php                 |  2 +-
 featherbb/View/admin/options.php              |  2 +-
 featherbb/View/admin/parser.php               |  2 +-
 featherbb/View/admin/permissions.php          |  2 +-
 featherbb/View/admin/plugins.php              |  2 +-
 featherbb/View/admin/reports.php              |  2 +-
 featherbb/View/admin/statistics.php           |  6 +-
 featherbb/View/admin/users/admin_users.php    |  2 +-
 featherbb/View/admin/users/ban_users.php      |  2 +-
 featherbb/View/admin/users/delete_users.php   |  2 +-
 featherbb/View/admin/users/find_users.php     |  2 +-
 featherbb/View/admin/users/move_users.php     |  2 +-
 featherbb/View/admin/users/search_ip.php      |  2 +-
 featherbb/View/admin/users/show_users.php     |  2 +-
 featherbb/View/delete.php                     |  2 +-
 featherbb/View/edit.php                       |  2 +-
 featherbb/View/error.php                      |  2 +-
 featherbb/View/footer.php                     |  2 +-
 featherbb/View/forum.php                      |  2 +-
 featherbb/View/header.php                     |  2 +-
 featherbb/View/help.php                       |  2 +-
 featherbb/View/index.php                      |  2 +-
 featherbb/View/install.php                    |  4 +-
 featherbb/View/login/form.php                 |  2 +-
 featherbb/View/login/password_forgotten.php   |  2 +-
 featherbb/View/message.php                    |  2 +-
 featherbb/View/misc/email.php                 |  2 +-
 featherbb/View/misc/report.php                |  2 +-
 featherbb/View/misc/rules.php                 |  2 +-
 featherbb/View/moderate/delete_posts.php      |  2 +-
 featherbb/View/moderate/delete_topics.php     |  2 +-
 featherbb/View/moderate/merge_topics.php      |  2 +-
 featherbb/View/moderate/moderator_forum.php   |  2 +-
 featherbb/View/moderate/move_topics.php       |  2 +-
 featherbb/View/moderate/posts_view.php        |  2 +-
 featherbb/View/moderate/split_posts.php       |  2 +-
 featherbb/View/post.php                       |  2 +-
 featherbb/View/profile/change_mail.php        |  2 +-
 featherbb/View/profile/change_pass.php        |  2 +-
 featherbb/View/profile/delete_user.php        |  2 +-
 featherbb/View/profile/menu.php               |  4 +-
 featherbb/View/profile/section_admin.php      |  4 +-
 featherbb/View/profile/section_display.php    |  2 +-
 featherbb/View/profile/section_essentials.php |  4 +-
 featherbb/View/profile/section_messaging.php  |  2 +-
 featherbb/View/profile/section_personal.php   |  4 +-
 .../View/profile/section_personality.php      |  2 +-
 featherbb/View/profile/section_privacy.php    |  2 +-
 featherbb/View/profile/upload_avatar.php      |  2 +-
 featherbb/View/profile/view_profile.php       |  2 +-
 featherbb/View/register/email.php             |  2 +-
 featherbb/View/register/form.php              |  2 +-
 featherbb/View/register/rules.php             |  2 +-
 featherbb/View/search/footer.php              |  2 +-
 featherbb/View/search/form.php                |  6 +-
 featherbb/View/search/header.php              |  2 +-
 featherbb/View/search/posts.php               |  2 +-
 featherbb/View/search/topics.php              |  2 +-
 featherbb/View/topic.php                      |  2 +-
 featherbb/View/userlist.php                   |  2 +-
 featherbb/routes.php                          |  6 +-
 plugins/test/src/Test.php                     | 16 ++--
 110 files changed, 224 insertions(+), 313 deletions(-)
 delete mode 100644 featherbb/Controller/Login.php

diff --git a/featherbb/Controller/Admin/Bans.php b/featherbb/Controller/Admin/Bans.php
index 2286a19d..6a5e2c01 100644
--- a/featherbb/Controller/Admin/Bans.php
+++ b/featherbb/Controller/Admin/Bans.php
@@ -26,7 +26,7 @@ public function __construct()
         $this->model = new \FeatherBB\Model\Admin\Bans();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/bans.mo');
 
-        if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
+        if ($this->user->g_id != $this->feather->forum_env['FEATHER_ADMIN'] && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Users.php b/featherbb/Controller/Admin/Users.php
index 4ea8a246..bc7acdfa 100644
--- a/featherbb/Controller/Admin/Users.php
+++ b/featherbb/Controller/Admin/Users.php
@@ -36,7 +36,7 @@ public function display()
     {
         // Move multiple users to other user groups
         if ($this->request->post('move_users') || $this->request->post('move_users_comply')) {
-            if ($this->user->g_id > FEATHER_ADMIN) {
+            if ($this->user->g_id > $this->feather->forum_env['FEATHER_ADMIN']) {
                 throw new Error(__('No permission'), 403);
             }
 
@@ -54,7 +54,7 @@ public function display()
 
         // Delete multiple users
         if ($this->request->post('delete_users') || $this->request->post('delete_users_comply')) {
-            if ($this->user->g_id > FEATHER_ADMIN) {
+            if ($this->user->g_id > $this->feather->forum_env['FEATHER_ADMIN']) {
                 throw new Error(__('No permission'), 403);
             }
 
@@ -72,7 +72,7 @@ public function display()
 
         // Ban multiple users
         if ($this->request->post('ban_users') || $this->request->post('ban_users_comply')) {
-            if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
+            if ($this->user->g_id != $this->feather->forum_env['FEATHER_ADMIN'] && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
                 throw new Error(__('No permission'), 403);
             }
 
@@ -107,8 +107,8 @@ public function display()
             $paging_links = '<span class="pages-label">' . __('Pages') . ' </span>' . Url::paginate_old($num_pages, $p, '?find_user=&amp;'.implode('&amp;', $search['query_str']));
 
             // Some helper variables for permissions
-            $can_delete = $can_move = $this->user->g_id == FEATHER_ADMIN;
-            $can_ban = $this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && $this->user->g_mod_ban_users == '1');
+            $can_delete = $can_move = $this->user->g_id == $this->feather->forum_env['FEATHER_ADMIN'];
+            $can_ban = $this->user->g_id == $this->feather->forum_env['FEATHER_ADMIN'] || ($this->user->g_moderator == '1' && $this->user->g_mod_ban_users == '1');
             $can_action = ($can_delete || $can_ban || $can_move) && $num_users > 0;
             $this->feather->template->addAsset('js', 'style/imports/common.js', array('type' => 'text/javascript'));
 
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
index 2edd5655..3d4b4235 100644
--- a/featherbb/Controller/Auth.php
+++ b/featherbb/Controller/Auth.php
@@ -42,7 +42,7 @@ public function login()
             if (!empty($user->password)) {
                 $form_password_hash = Random::hash($form_password); // Will result in a SHA-1 hash
                 if ($user->password == $form_password_hash) {
-                    if ($user->group_id == FEATHER_UNVERIFIED) {
+                    if ($user->group_id == $this->feather->forum_env['FEATHER_UNVERIFIED']) {
                         ModelAuth::update_group($user->id, $this->feather->forum_settings['o_default_user_group']);
                         if (!$this->feather->cache->isCached('users_info')) {
                             $this->feather->cache->store('users_info', Cache::get_users_info());
diff --git a/featherbb/Controller/Delete.php b/featherbb/Controller/Delete.php
index 25ce0095..dea96fb7 100644
--- a/featherbb/Controller/Delete.php
+++ b/featherbb/Controller/Delete.php
@@ -33,7 +33,7 @@ public function deletepost($id)
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
         $mods_array = ($cur_post['moderators'] != '') ? unserialize($cur_post['moderators']) : array();
-        $is_admmod = ($this->feather->user->g_id == FEATHER_ADMIN || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
+        $is_admmod = ($this->feather->user->g_id == $this->feather->forum_env['FEATHER_ADMIN'] || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
 
         $is_topic_post = ($id == $cur_post['first_post_id']) ? true : false;
 
@@ -46,7 +46,7 @@ public function deletepost($id)
             throw new Error(__('No permission'), 403);
         }
 
-        if ($is_admmod && $this->feather->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], Utils::get_admin_ids())) {
+        if ($is_admmod && $this->feather->user->g_id != $this->feather->forum_env['FEATHER_ADMIN'] && in_array($cur_post['poster_id'], Utils::get_admin_ids())) {
             throw new Error(__('No permission'), 403);
         }
 
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index d2e29261..bc1f5f22 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -36,7 +36,7 @@ public function editpost($id)
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
         $mods_array = ($cur_post['moderators'] != '') ? unserialize($cur_post['moderators']) : array();
-        $is_admmod = ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && array_key_exists($this->user->username, $mods_array))) ? true : false;
+        $is_admmod = ($this->user->g_id == $this->feather->forum_env['FEATHER_ADMIN'] || ($this->user->g_moderator == '1' && array_key_exists($this->user->username, $mods_array))) ? true : false;
 
         $can_edit_subject = $id == $cur_post['first_post_id'];
 
@@ -50,7 +50,7 @@ public function editpost($id)
             throw new Error(__('No permission'), 403);
         }
 
-        if ($is_admmod && $this->user->g_id != FEATHER_ADMIN && in_array($cur_post['poster_id'], Utils::get_admin_ids())) {
+        if ($is_admmod && $this->user->g_id != $this->feather->forum_env['FEATHER_ADMIN'] && in_array($cur_post['poster_id'], Utils::get_admin_ids())) {
             throw new Error(__('No permission'), 403);
         }
 
diff --git a/featherbb/Controller/Forum.php b/featherbb/Controller/Forum.php
index ff66bbab..a5162890 100644
--- a/featherbb/Controller/Forum.php
+++ b/featherbb/Controller/Forum.php
@@ -39,7 +39,7 @@ public function display($fid, $name = null, $page = null)
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
         $mods_array = ($cur_forum['moderators'] != '') ? unserialize($cur_forum['moderators']) : array();
-        $is_admmod = ($this->feather->user->g_id == FEATHER_ADMIN || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
+        $is_admmod = ($this->feather->user->g_id == $this->feather->forum_env['FEATHER_ADMIN'] || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
 
         $sort_by = $this->model->sort_forum_by($cur_forum['sort_by']);
 
diff --git a/featherbb/Controller/Login.php b/featherbb/Controller/Login.php
deleted file mode 100644
index dcb08df6..00000000
--- a/featherbb/Controller/Login.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2015 FeatherBB
- * based on code by (C) 2008-2015 FluxBB
- * and Rickard Andersson (C) 2002-2008 PunBB
- * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- */
-
-namespace FeatherBB\Controller;
-
-use FeatherBB\Core\Url;
-use FeatherBB\Core\Utils;
-
-class Login
-{
-    public function __construct()
-    {
-        $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
-
-
-        $this->model = new \FeatherBB\Model\Login();
-        load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/login.mo');
-    }
-
-    public function display()
-    {
-        if (!$this->user->is_guest) {
-            Url::redirect($this->feather->urlFor('home'), 'Already logged in');
-        }
-
-        $this->feather->template->setPageInfo(array(
-                            'redirect_url'    =>    $redirect_url,
-                            'active_page' => 'login',
-                            'title' => array(Utils::escape($this->config['o_board_title']), __('Login')),
-                            'required_fields' => array('req_username' => __('Username'), 'req_password' => __('Password')),
-                            'focus_element' => array('login', 'req_username'),
-                            )
-                    )->addTemplate('login/form.php')->display();
-    }
-
-    public function logmein()
-    {
-        define('FEATHER_QUIET_VISIT', 1);
-
-        if (!$this->user->is_guest) {
-            header('Location: '.Url::base());
-            exit;
-        }
-
-        $this->model->login();
-    }
-
-    public function logmeout($id, $token)
-    {
-        define('FEATHER_QUIET_VISIT', 1);
-
-        $this->model->logout($id, $token);
-    }
-
-    public function forget()
-    {
-        define('FEATHER_QUIET_VISIT', 1);
-
-        if (!$this->user->is_guest) {
-            header('Location: '.Url::base());
-            exit;
-        }
-
-        $this->feather->template->setPageInfo(array(
-                'errors'    =>    $this->model->password_forgotten(),
-                'active_page' => 'login',
-                'title' => array(Utils::escape($this->config['o_board_title']), __('Request pass')),
-                'required_fields' => array('req_email' => __('Email')),
-                'focus_element' => array('request_pass', 'req_email'),
-            )
-        )->addTemplate('login/password_forgotten.php')->display();
-    }
-}
diff --git a/featherbb/Controller/Moderate.php b/featherbb/Controller/Moderate.php
index 21dad350..39c174e8 100644
--- a/featherbb/Controller/Moderate.php
+++ b/featherbb/Controller/Moderate.php
@@ -49,7 +49,7 @@ public function moderatetopic($id = null, $fid = null, $action = null, $param =
         $moderators = $this->model->get_moderators($id);
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
-        if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
+        if ($this->user->g_id != $this->feather->forum_env['FEATHER_ADMIN'] && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
             throw new Error(__('No permission'), 403);
         }
 
@@ -199,7 +199,7 @@ public function display($id, $name = null, $page = null)
         $moderators = $this->model->get_moderators($id);
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
-        if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
+        if ($this->user->g_id != $this->feather->forum_env['FEATHER_ADMIN'] && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
             throw new Error(__('No permission'), 403);
         }
 
@@ -241,7 +241,7 @@ public function dealposts($fid)
         $moderators = $this->model->get_moderators($fid);
         $mods_array = ($moderators != '') ? unserialize($moderators) : array();
 
-        if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
+        if ($this->user->g_id != $this->feather->forum_env['FEATHER_ADMIN'] && ($this->user->g_moderator == '0' || !array_key_exists($this->user->username, $mods_array))) {
             throw new Error(__('No permission'), 403);
         }
 
diff --git a/featherbb/Controller/Post.php b/featherbb/Controller/Post.php
index eb48f155..dee54e57 100644
--- a/featherbb/Controller/Post.php
+++ b/featherbb/Controller/Post.php
@@ -54,7 +54,7 @@ public function newpost($fid = null, $tid = null, $qid = null)
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
         $mods_array = ($cur_posting['moderators'] != '') ? unserialize($cur_posting['moderators']) : array();
-        $is_admmod = ($this->feather->user->g_id == FEATHER_ADMIN || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
+        $is_admmod = ($this->feather->user->g_id == $this->feather->forum_env['FEATHER_ADMIN'] || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
 
         // Do we have permission to post?
         if ((($tid && (($cur_posting['post_replies'] == '' && $this->feather->user->g_post_replies == '0') || $cur_posting['post_replies'] == '0')) ||
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
index 8951b3e2..73d238ad 100644
--- a/featherbb/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -39,25 +39,25 @@ public function display($id, $section = null)
         require $this->feather->forum_env['FEATHER_ROOT'].'featherbb/Helpers/utf8/strcasecmp.php';
 
         if ($this->request->post('update_group_membership')) {
-            if ($this->user->g_id > FEATHER_ADMIN) {
+            if ($this->user->g_id > $this->feather->forum_env['FEATHER_ADMIN']) {
                 throw new Error(__('No permission'), 403);
             }
 
             $this->model->update_group_membership($id, $this->feather);
         } elseif ($this->request->post('update_forums')) {
-            if ($this->user->g_id > FEATHER_ADMIN) {
+            if ($this->user->g_id > $this->feather->forum_env['FEATHER_ADMIN']) {
                 throw new Error(__('No permission'), 403);
             }
 
             $this->model->update_mod_forums($id, $this->feather);
         } elseif ($this->request->post('ban')) {
-            if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
+            if ($this->user->g_id != $this->feather->forum_env['FEATHER_ADMIN'] && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
                 throw new Error(__('No permission'), 403);
             }
 
             $this->model->ban_user($id);
         } elseif ($this->request->post('delete_user') || $this->request->post('delete_user_comply')) {
-            if ($this->user->g_id > FEATHER_ADMIN) {
+            if ($this->user->g_id > $this->feather->forum_env['FEATHER_ADMIN']) {
                 throw new Error(__('No permission'), 403);
             }
 
@@ -80,9 +80,9 @@ public function display($id, $section = null)
 
             if ($this->user->id != $id &&                                                            // If we aren't the user (i.e. editing your own profile)
                                     (!$this->user->is_admmod ||                                      // and we are not an admin or mod
-                                    ($this->user->g_id != FEATHER_ADMIN &&                           // or we aren't an admin and ...
+                                    ($this->user->g_id != $this->feather->forum_env['FEATHER_ADMIN'] &&                           // or we aren't an admin and ...
                                     ($this->user->g_mod_edit_users == '0' ||                         // mods aren't allowed to edit users
-                                    $info['group_id'] == FEATHER_ADMIN ||                            // or the user is an admin
+                                    $info['group_id'] == $this->feather->forum_env['FEATHER_ADMIN'] ||                            // or the user is an admin
                                     $info['is_moderator'])))) {                                      // or the user is another mod
                                     throw new Error(__('No permission'), 403);
             }
@@ -99,9 +99,9 @@ public function display($id, $section = null)
         // View or edit?
         if ($this->user->id != $id &&                                 // If we aren't the user (i.e. editing your own profile)
                 (!$this->user->is_admmod ||                           // and we are not an admin or mod
-                ($this->user->g_id != FEATHER_ADMIN &&                // or we aren't an admin and ...
+                ($this->user->g_id != $this->feather->forum_env['FEATHER_ADMIN'] &&                // or we aren't an admin and ...
                 ($this->user->g_mod_edit_users == '0' ||              // mods aren't allowed to edit users
-                $user['g_id'] == FEATHER_ADMIN ||                     // or the user is an admin
+                $user['g_id'] == $this->feather->forum_env['FEATHER_ADMIN'] ||                     // or the user is an admin
                 $user['g_moderator'] == '1')))) {                     // or the user is another mod
                 $user_info = $this->model->parse_user_info($user);
 
@@ -312,7 +312,7 @@ public function action($id, $action)
 
             Url::redirect($this->feather->urlFor('profileSection', array('id' => $id, 'section' => 'personality')), __('Avatar deleted redirect'));
         } elseif ($action == 'promote') {
-            if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_promote_users == '0')) {
+            if ($this->user->g_id != $this->feather->forum_env['FEATHER_ADMIN'] && ($this->user->g_moderator != '1' || $this->user->g_mod_promote_users == '0')) {
                 throw new Error(__('No permission'), 403);
             }
 
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
index dc5bbc89..2541decc 100644
--- a/featherbb/Controller/Search.php
+++ b/featherbb/Controller/Search.php
@@ -22,16 +22,12 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \FeatherBB\Model\search();
+        $this->model = new \FeatherBB\Model\Search();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/userlist.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/search.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/forum.mo');
     }
 
-    public function __autoload($class_name)
-    {
-        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
-    }
 
     public function display()
     {
@@ -43,34 +39,35 @@ public function display()
         if ($this->request->get('action') || ($this->request->get('search_id'))) {
 
             $search = $this->model->get_search_results();
-                // We have results to display
-                if (isset($search['is_result'])) {
-
-                    $this->feather->template->setPageInfo(array(
-                        'title' => array(Utils::escape($this->config['o_board_title']), __('Search results')),
-                        'active_page' => 'search',
-                    ));
 
-                    $this->model->display_search_results($search, $this->feather);
+            // We have results to display
+            if (isset($search['is_result'])) {
 
-                    $this->feather->template->setPageInfo(array(
-                        'search' => $search,
-                    ));
+                $this->feather->template->setPageInfo(array(
+                    'title' => array(Utils::escape($this->config['o_board_title']), __('Search results')),
+                    'active_page' => 'search',
+                ));
 
-                    $this->feather->template->addTemplate('search/header.php', 1);
+                $this->model->display_search_results($search, $this->feather);
 
-                    if ($search['show_as'] == 'posts') {
-                        $this->feather->template->addTemplate('search/posts.php', 5);
-                    }
-                    else {
-                        $this->feather->template->addTemplate('search/topics.php', 5);
-                    }
+                $this->feather->template->setPageInfo(array(
+                    'search' => $search,
+                ));
 
-                    $this->feather->template->addTemplate('search/footer.php', 10)->display();
+                $this->feather->template->addTemplate('search/header.php', 1);
 
-                } else {
-                    Url::redirect($this->feather->urlFor('search'), __('No hits'));
+                if ($search['show_as'] == 'posts') {
+                    $this->feather->template->addTemplate('search/posts.php', 5);
                 }
+                else {
+                    $this->feather->template->addTemplate('search/topics.php', 5);
+                }
+
+                $this->feather->template->addTemplate('search/footer.php', 10)->display();
+
+            } else {
+                Url::redirect($this->feather->urlFor('search'), __('No hits'));
+            }
         }
         // Display the form
         else {
@@ -86,6 +83,7 @@ public function display()
 
     public function quicksearches($show)
     {
-        Url::redirect($this->feather->urlFor('quickSearch', array('show' => '?action=show_'.$show)));
+        // Url::redirect($this->feather->urlFor('search', array('show' => '?action=show_'.$show)));
+        $this->feather->redirect($this->feather->urlFor('search').'?action=show_'.$show);
     }
 }
diff --git a/featherbb/Controller/Topic.php b/featherbb/Controller/Topic.php
index a6232173..a0197281 100644
--- a/featherbb/Controller/Topic.php
+++ b/featherbb/Controller/Topic.php
@@ -35,7 +35,7 @@ public function display($id = null, $name = null, $page = null, $pid = null)
 
         // Sort out who the moderators are and if we are currently a moderator (or an admin)
         $mods_array = ($cur_topic['moderators'] != '') ? unserialize($cur_topic['moderators']) : array();
-        $is_admmod = ($this->feather->user->g_id == FEATHER_ADMIN || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
+        $is_admmod = ($this->feather->user->g_id == $this->feather->forum_env['FEATHER_ADMIN'] || ($this->feather->user->g_moderator == '1' && array_key_exists($this->feather->user->username, $mods_array))) ? true : false;
         if ($is_admmod) {
             $admin_ids = Utils::get_admin_ids();
         }
diff --git a/featherbb/Core/Parser.php b/featherbb/Core/Parser.php
index 116306f4..cf5a8926 100644
--- a/featherbb/Core/Parser.php
+++ b/featherbb/Core/Parser.php
@@ -10,12 +10,6 @@
 
 namespace FeatherBB\Core;
 
-// Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER'))
-    exit;
-
-define('FEATHER_PARSER', 1);
-
 // !!!! AVOIDING PCRE STACK OVERFLOWS WHICH SEG-FAULT CRASH APACHE/PHP !!!!
 // By default, PHP sets up pcre.recursion_limit way too high (100000). According
 // to PCRE documentation, a sensible value for this parameter is the stacksize
diff --git a/featherbb/Core/Search.php b/featherbb/Core/Search.php
index 3035f890..2c2165d0 100644
--- a/featherbb/Core/Search.php
+++ b/featherbb/Core/Search.php
@@ -114,7 +114,7 @@ public function validate_search_word($word, $idx)
 
         // Check the word is within the min/max length
         $num_chars = Utils::strlen($word);
-        return $num_chars >= FEATHER_SEARCH_MIN_WORD && $num_chars <= FEATHER_SEARCH_MAX_WORD;
+        return $num_chars >= $this->feather->forum_env['FEATHER_SEARCH_MIN_WORD'] && $num_chars <= $this->feather->forum_env['FEATHER_SEARCH_MAX_WORD'];
     }
 
 
diff --git a/featherbb/Core/Utils.php b/featherbb/Core/Utils.php
index a4a064c8..a9b388c8 100644
--- a/featherbb/Core/Utils.php
+++ b/featherbb/Core/Utils.php
@@ -218,6 +218,7 @@ public static function generate_page_title($page_title, $p = null)
     //
     public static function get_title($user)
     {
+        $feather = \Slim\Slim::getInstance();
         global $feather_bans;
         static $ban_list;
 
@@ -242,7 +243,7 @@ public static function get_title($user)
             $user_title = self::escape($user['g_user_title']);
         }
         // If the user is a guest
-        elseif ($user['g_id'] == FEATHER_GUEST) {
+        elseif ($user['g_id'] == $feather->forum_env['FEATHER_GUEST']) {
             $user_title = __('Guest');
         }
         // If nothing else helps, we assign the default
diff --git a/featherbb/Middleware/Core.php b/featherbb/Middleware/Core.php
index 0e8884d4..d2ba9565 100644
--- a/featherbb/Middleware/Core.php
+++ b/featherbb/Middleware/Core.php
@@ -41,7 +41,7 @@ public function __construct(array $data)
         $this->forum_env['FEATHER_SHOW_INFO'] = ($data['debug'] == 'info' || $data['debug'] == 'all');
         // Populate forum_env
         $this->forum_env = array_merge(self::load_default_forum_env(), $this->forum_env);
-        $this->env_to_globals($this->forum_env); // Legacy
+        // $this->env_to_globals($this->forum_env); // Legacy
 
         // Load files
         require $this->forum_env['FEATHER_ROOT'].'featherbb/Helpers/utf8/utf8.php';
@@ -54,7 +54,6 @@ public function __construct(array $data)
     public static function load_default_forum_env()
     {
         return array(
-                'FEATHER' => true, // Legacy
                 'FEATHER_ROOT' => '',
                 'FORUM_CONFIG_FILE' => 'featherbb/config.php',
                 'FORUM_CACHE_DIR' => 'cache/',
@@ -147,12 +146,12 @@ public function set_forum_settings($key, $value = null)
     }
 
     // Legacy function, to ensure backward compatibility with globals
-    public function env_to_globals(array $vars)
-    {
-        foreach ($vars as $key => $value) {
-            define($key, $value);
-        }
-    }
+    // public function env_to_globals(array $vars)
+    // {
+    //     foreach ($vars as $key => $value) {
+    //         define($key, $value);
+    //     }
+    // }
 
     public function hydrate($name, array $data)
     {
diff --git a/featherbb/Model/Admin/Bans.php b/featherbb/Model/Admin/Bans.php
index 10c783f6..fcc24152 100644
--- a/featherbb/Model/Admin/Bans.php
+++ b/featherbb/Model/Admin/Bans.php
@@ -82,7 +82,7 @@ public function add_ban_info($id = null)
 
         // Make sure we're not banning an admin or moderator
         if (isset($group_id)) {
-            if ($group_id == FEATHER_ADMIN) {
+            if ($group_id == $this->feather->forum_env['FEATHER_ADMIN']) {
                 throw new Error(sprintf(__('User is admin message'), Utils::escape($ban['ban_user'])), 403);
             }
 
@@ -171,7 +171,7 @@ public function insert_ban()
                             ->find_one_col('group_id');
 
             if ($group_id) {
-                if ($group_id == FEATHER_ADMIN) {
+                if ($group_id == $this->feather->forum_env['FEATHER_ADMIN']) {
                     throw new Error(sprintf(__('User is admin message'), Utils::escape($ban_user)), 403);
                 }
 
diff --git a/featherbb/Model/Admin/Forums.php b/featherbb/Model/Admin/Forums.php
index 2c3f91d4..283565ec 100644
--- a/featherbb/Model/Admin/Forums.php
+++ b/featherbb/Model/Admin/Forums.php
@@ -157,7 +157,7 @@ public function get_permissions($forum_id)
                         ->table_alias('g')
                         ->select_many($select_permissions)
                         ->left_outer_join('forum_perms', 'g.g_id=fp.group_id AND fp.forum_id='.$forum_id, 'fp') // Workaround
-                        ->where_not_equal('g.g_id', FEATHER_ADMIN)
+                        ->where_not_equal('g.g_id', $this->feather->forum_env['FEATHER_ADMIN'])
                         ->order_by_asc('g.g_id');
         $permissions = $this->hook->fireDB('get_permissions_query', $permissions);
         $permissions = $permissions->find_many();
@@ -187,7 +187,7 @@ public function get_default_group_permissions($fetch_admin = true)
                     ->select_many($select_get_default_group_permissions);
 
         if (!$fetch_admin) {
-            $result->where_not_equal('g_id', FEATHER_ADMIN);
+            $result->where_not_equal('g_id', $this->feather->forum_env['FEATHER_ADMIN']);
         }
 
         $result = $result->order_by_asc('g_id');
diff --git a/featherbb/Model/Admin/Groups.php b/featherbb/Model/Admin/Groups.php
index 4aa853a9..df5ced46 100644
--- a/featherbb/Model/Admin/Groups.php
+++ b/featherbb/Model/Admin/Groups.php
@@ -73,7 +73,7 @@ public function get_group_list($groups, $group)
         $output = '';
 
         foreach ($groups as $cur_group) {
-            if (($cur_group['g_id'] != $group['info']['g_id'] || $group['mode'] == 'add') && $cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
+            if (($cur_group['g_id'] != $group['info']['g_id'] || $group['mode'] == 'add') && $cur_group['g_id'] != $this->feather->forum_env['FEATHER_ADMIN'] && $cur_group['g_id'] != $this->feather->forum_env['FEATHER_GUEST']) {
                 if ($cur_group['g_id'] == $group['info']['g_promote_next_group']) {
                     $output .= "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
                 } else {
@@ -92,7 +92,7 @@ public function get_group_list_delete($group_id)
 
         $select_get_group_list_delete = array('g_id', 'g_title');
         $result = DB::for_table('groups')->select_many($select_get_group_list_delete)
-                        ->where_not_equal('g_id', FEATHER_GUEST)
+                        ->where_not_equal('g_id', $this->feather->forum_env['FEATHER_GUEST'])
                         ->where_not_equal('g_id', $group_id)
                         ->order_by('g_title');
         $result = $this->hook->fireDB('get_group_list_delete', $result);
@@ -101,7 +101,7 @@ public function get_group_list_delete($group_id)
         $output = '';
 
         foreach ($result as $cur_group) {
-            if ($cur_group['g_id'] == FEATHER_MEMBER) {
+            if ($cur_group['g_id'] == $this->feather->forum_env['FEATHER_MEMBER']) {
                 // Pre-select the pre-defined Members group
                 $output .= "\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
             } else {
@@ -124,7 +124,7 @@ public function add_edit_group($groups)
         $group_id = $this->hook->fire('add_edit_group_start', $group_id);
 
         // Is this the admin group? (special rules apply)
-        $is_admin_group = ($this->request->post('group_id') && $this->request->post('group_id') == FEATHER_ADMIN) ? true : false;
+        $is_admin_group = ($this->request->post('group_id') && $this->request->post('group_id') == $this->feather->forum_env['FEATHER_ADMIN']) ? true : false;
 
         // Set group title
         $title = Utils::trim($this->request->post('req_title'));
@@ -140,7 +140,7 @@ public function add_edit_group($groups)
         $promote_min_posts = $this->request->post('promote_min_posts') ? intval($this->request->post('promote_min_posts')) : '0';
         if ($this->request->post('promote_next_group') &&
                 isset($groups[$this->request->post('promote_next_group')]) &&
-                !in_array($this->request->post('promote_next_group'), array(FEATHER_ADMIN, FEATHER_GUEST)) &&
+                !in_array($this->request->post('promote_next_group'), array($this->feather->forum_env['FEATHER_ADMIN'], $this->feather->forum_env['FEATHER_GUEST'])) &&
                 ($this->request->post('group_id') || $this->request->post('promote_next_group') != $this->request->post('group_id'))) {
             $promote_next_group = $this->request->post('promote_next_group');
         } else {
@@ -274,7 +274,7 @@ public function set_default_group($groups)
         $group_id = $this->hook->fire('set_default_group.group_id', $group_id);
 
         // Make sure it's not the admin or guest groups
-        if ($group_id == FEATHER_ADMIN || $group_id == FEATHER_GUEST) {
+        if ($group_id == $this->feather->forum_env['FEATHER_ADMIN'] || $group_id == $this->feather->forum_env['FEATHER_GUEST']) {
             throw new Error(__('Bad request'), 404);
         }
 
diff --git a/featherbb/Model/Admin/Options.php b/featherbb/Model/Admin/Options.php
index 9efda0ae..5f7ebfed 100644
--- a/featherbb/Model/Admin/Options.php
+++ b/featherbb/Model/Admin/Options.php
@@ -239,16 +239,16 @@ public function update_options()
 
     public function clear_feed_cache()
     {
-        $d = dir(FORUM_CACHE_DIR);
+        $d = dir($this->feather->forum_env['FORUM_CACHE_DIR']);
         $d = $this->hook->fire('options.clear_feed_cache.directory', $d);
         while (($entry = $d->read()) !== false) {
             if (substr($entry, 0, 10) == 'cache_feed' && substr($entry, -4) == '.php') {
-                @unlink(FORUM_CACHE_DIR.$entry);
+                @unlink($this->feather->forum_env['FORUM_CACHE_DIR'].$entry);
             }
             if (function_exists('opcache_invalidate')) {
-                opcache_invalidate(FORUM_CACHE_DIR.$entry, true);
+                opcache_invalidate($this->feather->forum_env['FORUM_CACHE_DIR'].$entry, true);
             } elseif (function_exists('apc_delete_file')) {
-                @apc_delete_file(FORUM_CACHE_DIR.$entry);
+                @apc_delete_file($this->feather->forum_env['FORUM_CACHE_DIR'].$entry);
             }
         }
         $d->close();
diff --git a/featherbb/Model/Admin/Users.php b/featherbb/Model/Admin/Users.php
index 456b0f01..6f56d61c 100644
--- a/featherbb/Model/Admin/Users.php
+++ b/featherbb/Model/Admin/Users.php
@@ -152,7 +152,7 @@ public function move_users()
 
         // Are we trying to batch move any admins?
         $is_admin = DB::for_table('users')->where_in('id', $move['user_ids'])
-                        ->where('group_id', FEATHER_ADMIN)
+                        ->where('group_id', $this->feather->forum_env['FEATHER_ADMIN'])
                         ->find_one();
         if ($is_admin) {
             throw new Error(__('No move admins message'), 403);
@@ -160,7 +160,7 @@ public function move_users()
 
         // Fetch all user groups
         $select_user_groups = array('g_id', 'g_title');
-        $where_not_in = array(FEATHER_GUEST, FEATHER_ADMIN);
+        $where_not_in = array($this->feather->forum_env['FEATHER_GUEST'], $this->feather->forum_env['FEATHER_ADMIN']);
 
         $result = DB::for_table('groups')->select_many($select_user_groups)
             ->where_not_in('g_id', $where_not_in)
@@ -214,7 +214,7 @@ public function move_users()
 
             $user_groups = $this->hook->fire('model.users.move_users.user_groups', $user_groups);
 
-            if (!empty($user_groups) && $new_group != FEATHER_ADMIN && $new_group_mod != '1') {
+            if (!empty($user_groups) && $new_group != $this->feather->forum_env['FEATHER_ADMIN'] && $new_group_mod != '1') {
                 // Fetch forum list and clean up their moderator list
                 $select_mods = array('id', 'moderators');
                 $result = DB::for_table('forums')
@@ -273,7 +273,7 @@ public function delete_users()
 
         // Are we trying to delete any admins?
         $is_admin = DB::for_table('users')->where_in('id', $user_ids)
-            ->where('group_id', FEATHER_ADMIN)
+            ->where('group_id', $this->feather->forum_env['FEATHER_ADMIN'])
             ->find_one();
         if ($is_admin) {
             throw new Error(__('No delete admins message'), 403);
@@ -437,7 +437,7 @@ public function ban_users()
 
         // Are we trying to ban any admins?
         $is_admin = DB::for_table('users')->where_in('id', $user_ids)
-            ->where('group_id', FEATHER_ADMIN)
+            ->where('group_id', $this->feather->forum_env['FEATHER_ADMIN'])
             ->find_one();
         if ($is_admin) {
             throw new Error(__('No ban admins message'), 403);
@@ -675,7 +675,7 @@ public function print_users($conditions, $order_by, $direction, $start_from)
                 $cur_user['user_title'] = Utils::get_title($cur_user);
 
                 // This script is a special case in that we want to display "Not verified" for non-verified users
-                if (($cur_user['g_id'] == '' || $cur_user['g_id'] == FEATHER_UNVERIFIED) && $cur_user['user_title'] != __('Banned')) {
+                if (($cur_user['g_id'] == '' || $cur_user['g_id'] == $this->feather->forum_env['FEATHER_UNVERIFIED']) && $cur_user['user_title'] != __('Banned')) {
                     $cur_user['user_title'] = '<span class="warntext">'.__('Not verified').'</span>';
                 }
 
@@ -693,7 +693,7 @@ public function get_group_list()
 
         $select_get_group_list = array('g_id', 'g_title');
         $result = DB::for_table('groups')->select_many($select_get_group_list)
-                        ->where_not_equal('g_id', FEATHER_GUEST)
+                        ->where_not_equal('g_id', $this->feather->forum_env['FEATHER_GUEST'])
                         ->order_by('g_title');
 
         foreach ($result as $cur_group) {
diff --git a/featherbb/Model/Cache.php b/featherbb/Model/Cache.php
index 76b2e200..0ab77d74 100644
--- a/featherbb/Model/Cache.php
+++ b/featherbb/Model/Cache.php
@@ -50,14 +50,15 @@ public static function get_censoring($select_censoring = 'search_for')
 
     public static function get_users_info()
     {
+        $feather = \Slim\Slim::getInstance();
         $stats = array();
         $select_get_users_info = array('id', 'username');
         $stats['total_users'] = DB::for_table('users')
-                                    ->where_not_equal('group_id', FEATHER_UNVERIFIED)
+                                    ->where_not_equal('group_id', $feather->forum_env['FEATHER_UNVERIFIED'])
                                     ->where_not_equal('id', 1)
                                     ->count();
         $stats['last_user'] = DB::for_table('users')->select_many($select_get_users_info)
-                            ->where_not_equal('group_id', FEATHER_UNVERIFIED)
+                            ->where_not_equal('group_id', $feather->forum_env['FEATHER_UNVERIFIED'])
                             ->order_by_desc('registered')
                             ->limit(1)
                             ->find_array()[0];
@@ -66,9 +67,10 @@ public static function get_users_info()
 
     public static function get_admin_ids()
     {
+        $feather = \Slim\Slim::getInstance();
         return DB::for_table('users')
                 ->select('id')
-                ->where('group_id', FEATHER_ADMIN)
+                ->where('group_id', $feather->forum_env['FEATHER_ADMIN'])
                 ->find_array();
     }
 
diff --git a/featherbb/Model/Edit.php b/featherbb/Model/Edit.php
index d5ad7b2f..d16ede0d 100644
--- a/featherbb/Model/Edit.php
+++ b/featherbb/Model/Edit.php
@@ -85,8 +85,8 @@ public function check_errors_before_edit($can_edit_subject, $errors)
         $message = Utils::linebreaks(Utils::trim($this->request->post('req_message')));
 
         // Here we use strlen() not Utils::strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
-        if (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            $errors[] = sprintf(__('Too long message'), Utils::forum_number_format(FEATHER_MAX_POSTSIZE));
+        if (strlen($message) > $this->feather->forum_env['FEATHER_MAX_POSTSIZE']) {
+            $errors[] = sprintf(__('Too long message'), Utils::forum_number_format($this->feather->forum_env['FEATHER_MAX_POSTSIZE']));
         } elseif ($this->config['p_message_all_caps'] == '0' && Utils::is_all_uppercase($message) && !$this->user->is_admmod) {
             $errors[] = __('All caps message');
         }
diff --git a/featherbb/Model/Login.php b/featherbb/Model/Login.php
index f9acc215..c228624d 100644
--- a/featherbb/Model/Login.php
+++ b/featherbb/Model/Login.php
@@ -58,7 +58,7 @@ public function login()
         }
 
         // Update the status if this is the first time the user logged in
-        if ($user->group_id == FEATHER_UNVERIFIED) {
+        if ($user->group_id == $this->feather->forum_env['FEATHER_UNVERIFIED']) {
             $update_usergroup = DB::for_table('users')->where('id', $user->id)
                 ->find_one()
                 ->set('group_id', $this->config['o_default_user_group']);
diff --git a/featherbb/Model/Misc.php b/featherbb/Model/Misc.php
index 0806a49d..2f374c07 100644
--- a/featherbb/Model/Misc.php
+++ b/featherbb/Model/Misc.php
@@ -76,7 +76,7 @@ public function send_email($mail)
             throw new Error(__('No email message'), 400);
         }
         // Here we use strlen() not Utils::strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
-        elseif (strlen($message) > FEATHER_MAX_POSTSIZE) {
+        elseif (strlen($message) > $this->feather->forum_env['FEATHER_MAX_POSTSIZE']) {
             throw new Error(__('Too long email message'), 400);
         }
 
diff --git a/featherbb/Model/Moderate.php b/featherbb/Model/Moderate.php
index d448e3d8..c8d13af7 100644
--- a/featherbb/Model/Moderate.php
+++ b/featherbb/Model/Moderate.php
@@ -112,7 +112,7 @@ public function delete_posts($tid, $fid, $p = null)
                 ->where_in('id', $posts_array)
                 ->where('topic_id', $tid);
 
-            if ($this->user->g_id != FEATHER_ADMIN) {
+            if ($this->user->g_id != $this->feather->forum_env['FEATHER_ADMIN']) {
                 $result->where_not_in('poster_id', Utils::get_admin_ids());
             }
 
@@ -762,7 +762,7 @@ public function delete_topics($topics, $fid)
         }
 
         // Verify that the posts are not by admins
-        if ($this->user->g_id != FEATHER_ADMIN) {
+        if ($this->user->g_id != $this->feather->forum_env['FEATHER_ADMIN']) {
             $authorized = DB::for_table('posts')
                             ->where_in('topic_id', $topics_sql)
                             ->where('poster_id', Utils::get_admin_ids());
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
index b8edcbb5..2038e0ac 100644
--- a/featherbb/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -161,8 +161,8 @@ public function check_errors_before_post($fid, $tid, $qid, $pid, $page, $errors)
         $message = $this->hook->fire('check_errors_before_post_message', $message);
 
         // Here we use strlen() not Utils::strlen() as we want to limit the post to FEATHER_MAX_POSTSIZE bytes, not characters
-        if (strlen($message) > FEATHER_MAX_POSTSIZE) {
-            $errors[] = sprintf(__('Too long message'), Utils::forum_number_format(FEATHER_MAX_POSTSIZE));
+        if (strlen($message) > $this->feather->forum_env['FEATHER_MAX_POSTSIZE']) {
+            $errors[] = sprintf(__('Too long message'), Utils::forum_number_format($this->feather->forum_env['FEATHER_MAX_POSTSIZE']));
         } elseif ($this->config['p_message_all_caps'] == '0' && Utils::is_all_uppercase($message) && !$this->user->is_admmod) {
             $errors[] = __('All caps message');
         }
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index 468674d2..5a24c19f 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -88,7 +88,7 @@ public function change_pass($id)
                     throw new Error(__('Bad request'), 404);
                 }
 
-                if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == FEATHER_ADMIN || $user['g_moderator'] == '1') {
+                if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == $this->feather->forum_env['FEATHER_ADMIN'] || $user['g_moderator'] == '1') {
                     throw new Error(__('No permission'), 403);
                 }
             }
@@ -169,7 +169,7 @@ public function change_email($id)
                     throw new Error(__('Bad request'), 404);
                 }
 
-                if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == FEATHER_ADMIN || $user['g_moderator'] == '1') {
+                if ($this->user->g_mod_edit_users == '0' || $this->user->g_mod_change_passwords == '0' || $user['group_id'] == $this->feather->forum_env['FEATHER_ADMIN'] || $user['g_moderator'] == '1') {
                     throw new Error(__('No permission'), 403);
                 }
             }
@@ -433,7 +433,7 @@ public function update_group_membership($id)
 
         $stats = $this->feather->cache->retrieve('users_info');
 
-        if ($old_group_id == FEATHER_ADMIN || $new_group_id == FEATHER_ADMIN) {
+        if ($old_group_id == $this->feather->forum_env['FEATHER_ADMIN'] || $new_group_id == $this->feather->forum_env['FEATHER_ADMIN']) {
             $this->feather->cache->store('admin_ids', Cache::get_admin_ids());
         }
 
@@ -443,7 +443,7 @@ public function update_group_membership($id)
         $new_group_mod = $new_group_mod->find_one_col('g_moderator');
 
         // If the user was a moderator or an administrator, we remove him/her from the moderator list in all forums as well
-        if ($new_group_id != FEATHER_ADMIN && $new_group_mod != '1') {
+        if ($new_group_id != $this->feather->forum_env['FEATHER_ADMIN'] && $new_group_mod != '1') {
 
             // Loop through all forums
             $result = $this->loop_mod_forums();
@@ -614,7 +614,7 @@ public function delete_user($id)
         $group_id = $result['group_id'];
         $username = $result['username'];
 
-        if ($group_id == FEATHER_ADMIN) {
+        if ($group_id == $this->feather->forum_env['FEATHER_ADMIN']) {
             throw new Error(__('No delete admin message'));
         }
 
@@ -625,7 +625,7 @@ public function delete_user($id)
             $group_mod = $this->hook->fireDB('delete_user_group_mod', $group_mod);
             $group_mod = $group_mod->find_one_col('g_moderator');
 
-            if ($group_id == FEATHER_ADMIN || $group_mod == '1') {
+            if ($group_id == $this->feather->forum_env['FEATHER_ADMIN'] || $group_mod == '1') {
 
                 // Loop through all forums
                 $result = $this->loop_mod_forums();
@@ -729,7 +729,7 @@ public function delete_user($id)
 
             $stats = $this->feather->cache->retrieve('users_info');
 
-            if ($group_id == FEATHER_ADMIN) {
+            if ($group_id == $this->feather->forum_env['FEATHER_ADMIN']) {
                 $this->feather->cache->store('admin_ids', Cache::get_admin_ids());
             }
 
@@ -792,7 +792,7 @@ public function update_profile($id, $info, $section)
                     $form['admin_note'] = Utils::trim($this->request->post('admin_note'));
 
                     // Are we allowed to change usernames?
-                    if ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && $this->user->g_mod_rename_users == '1')) {
+                    if ($this->user->g_id == $this->feather->forum_env['FEATHER_ADMIN'] || ($this->user->g_moderator == '1' && $this->user->g_mod_rename_users == '1')) {
                         $form['username'] = Utils::trim($this->request->post('req_username'));
 
                         if ($form['username'] != $info['old_username']) {
@@ -807,7 +807,7 @@ public function update_profile($id, $info, $section)
                     }
 
                     // We only allow administrators to update the post count
-                    if ($this->user->g_id == FEATHER_ADMIN) {
+                    if ($this->user->g_id == $this->feather->forum_env['FEATHER_ADMIN']) {
                         $form['num_posts'] = intval($this->request->post('num_posts'));
                     }
                 }
@@ -850,7 +850,7 @@ public function update_profile($id, $info, $section)
                     $form['url'] = '';
                 }
 
-                if ($this->user->g_id == FEATHER_ADMIN) {
+                if ($this->user->g_id == $this->feather->forum_env['FEATHER_ADMIN']) {
                     $form['title'] = Utils::trim($this->request->post('title'));
                 } elseif ($this->user->g_set_title == '1') {
                     $form['title'] = Utils::trim($this->request->post('title'));
@@ -1048,7 +1048,7 @@ public function update_profile($id, $info, $section)
             $group_mod = $this->hook->fireDB('update_profile_group_mod', $group_mod);
             $group_mod = $group_mod->find_one_col('g_moderator');
 
-            if ($group_id == FEATHER_ADMIN || $group_mod == '1') {
+            if ($group_id == $this->feather->forum_env['FEATHER_ADMIN'] || $group_mod == '1') {
 
                 // Loop through all forums
                 $result = $this->loop_mod_forums();
@@ -1232,7 +1232,7 @@ public function edit_essentials($id, $user)
         $user_disp = $this->hook->fire('edit_essentials_start', $user_disp, $id, $user);
 
         if ($this->user->is_admmod) {
-            if ($this->user->g_id == FEATHER_ADMIN || $this->user->g_mod_rename_users == '1') {
+            if ($this->user->g_id == $this->feather->forum_env['FEATHER_ADMIN'] || $this->user->g_mod_rename_users == '1') {
                 $user_disp['username_field'] = '<label class="required"><strong>'.__('Username').' <span>'.__('Required').'</span></strong><br /><input type="text" name="req_username" value="'.Utils::escape($user['username']).'" size="25" maxlength="25" /><br /></label>'."\n";
             } else {
                 $user_disp['username_field'] = '<p>'.sprintf(__('Username info'), Utils::escape($user['username'])).'</p>'."\n";
@@ -1252,13 +1252,13 @@ public function edit_essentials($id, $user)
         $user_disp['posts_field'] = '';
         $posts_actions = array();
 
-        if ($this->user->g_id == FEATHER_ADMIN) {
+        if ($this->user->g_id == $this->feather->forum_env['FEATHER_ADMIN']) {
             $user_disp['posts_field'] .= '<label>'.__('Posts').'<br /><input type="text" name="num_posts" value="'.$user['num_posts'].'" size="8" maxlength="8" /><br /></label>';
         } elseif ($this->config['o_show_post_count'] == '1' || $this->user->is_admmod) {
             $posts_actions[] = sprintf(__('Posts info'), Utils::forum_number_format($user['num_posts']));
         }
 
-        if ($this->user->g_search == '1' || $this->user->g_id == FEATHER_ADMIN) {
+        if ($this->user->g_search == '1' || $this->user->g_id == $this->feather->forum_env['FEATHER_ADMIN']) {
             $posts_actions[] = '<a href="'.$this->feather->urlFor('search').'?action=show_user_topics&amp;user_id='.$id.'">'.__('Show topics').'</a>';
             $posts_actions[] = '<a href="'.$this->feather->urlFor('search').'?action=show_user_posts&amp;user_id='.$id.'">'.__('Show posts').'</a>';
 
@@ -1284,7 +1284,7 @@ public function get_group_list($user)
 
         $result = DB::for_table('groups')
             ->select_many($result['select'])
-            ->where_not_equal('g_id', FEATHER_GUEST)
+            ->where_not_equal('g_id', $this->feather->forum_env['FEATHER_GUEST'])
             ->order_by('g_title');
         $result = $this->hook->fireDB('get_group_list_query', $result);
         $result = $result->find_many();
diff --git a/featherbb/Model/Register.php b/featherbb/Model/Register.php
index 42962301..10abe41c 100644
--- a/featherbb/Model/Register.php
+++ b/featherbb/Model/Register.php
@@ -142,7 +142,7 @@ public function insert_user($user)
         // Insert the new user into the database. We do this now to get the last inserted ID for later use
         $now = time();
 
-        $intial_group_id = ($this->config['o_regs_verify'] == '0') ? $this->config['o_default_user_group'] : FEATHER_UNVERIFIED;
+        $intial_group_id = ($this->config['o_regs_verify'] == '0') ? $this->config['o_default_user_group'] : $this->feather->forum_env['FEATHER_UNVERIFIED'];
         $password_hash = Random::hash($user['password1']);
 
         // Add the user
diff --git a/featherbb/Model/Search.php b/featherbb/Model/Search.php
index 27208e2f..45c9be90 100644
--- a/featherbb/Model/Search.php
+++ b/featherbb/Model/Search.php
@@ -59,7 +59,7 @@ public function get_search_results()
             $keywords = ($this->request->get('keywords')) ? utf8_strtolower(Utils::trim($this->request->get('keywords'))) : null;
             $author = ($this->request->get('author')) ? utf8_strtolower(Utils::trim($this->request->get('author'))) : null;
 
-            if (preg_match('%^[\*\%]+$%', $keywords) || (Utils::strlen(str_replace(array('*', '%'), '', $keywords)) < FEATHER_SEARCH_MIN_WORD && !$this->search->is_cjk($keywords))) {
+            if (preg_match('%^[\*\%]+$%', $keywords) || (Utils::strlen(str_replace(array('*', '%'), '', $keywords)) < $this->feather->forum_env['FEATHER_SEARCH_MIN_WORD'] && !$this->search->is_cjk($keywords))) {
                 $keywords = '';
             }
 
@@ -321,7 +321,7 @@ public function get_search_results()
 
                 $num_hits = count($search_ids);
                 if (!$num_hits) {
-                    throw new Error(__('No hits'), 204);
+                    throw new Error(__('No hits'), 400);
                 }
             } elseif ($action == 'show_new' || $action == 'show_recent' || $action == 'show_replies' || $action == 'show_user_posts' || $action == 'show_user_topics' || $action == 'show_subscriptions' || $action == 'show_unanswered') {
                 $search_type = array('action', $action);
diff --git a/featherbb/Model/Topic.php b/featherbb/Model/Topic.php
index 43e4e732..c2b5e093 100644
--- a/featherbb/Model/Topic.php
+++ b/featherbb/Model/Topic.php
@@ -329,7 +329,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                     }
                 }
 
-                if ($this->user->g_id == FEATHER_ADMIN || ($this->user->g_moderator == '1' && $this->user->g_mod_promote_users == '1')) {
+                if ($this->user->g_id == $this->feather->forum_env['FEATHER_ADMIN'] || ($this->user->g_moderator == '1' && $this->user->g_mod_promote_users == '1')) {
                     if ($cur_post['g_promote_next_group']) {
                         $cur_post['user_info'][] = '<dd><span><a href="'.Url::base().'/user/'.$cur_post['poster_id'].'/action/promote/pid/'.$cur_post['id'].'">'.__('Promote user').'</a></span></dd>';
                     }
@@ -379,7 +379,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                 }
             } else {
                 $cur_post['post_actions'][] = '<li class="postreport"><span><a href="'.$this->feather->urlFor('report', ['id' => $cur_post['id']]).'">'.__('Report').'</a></span></li>';
-                if ($this->user->g_id == FEATHER_ADMIN || !in_array($cur_post['poster_id'], $admin_ids)) {
+                if ($this->user->g_id == $this->feather->forum_env['FEATHER_ADMIN'] || !in_array($cur_post['poster_id'], $admin_ids)) {
                     $cur_post['post_actions'][] = '<li class="postdelete"><span><a href="'.$this->feather->urlFor('deletePost', ['id' => $cur_post['id']]).'">'.__('Delete').'</a></span></li>';
                     $cur_post['post_actions'][] = '<li class="postedit"><span><a href="'.$this->feather->urlFor('editPost', ['id' => $cur_post['id']]).'">'.__('Edit').'</a></span></li>';
                 }
diff --git a/featherbb/Model/Userlist.php b/featherbb/Model/Userlist.php
index 4c45581e..892ba202 100644
--- a/featherbb/Model/Userlist.php
+++ b/featherbb/Model/Userlist.php
@@ -31,7 +31,7 @@ public function fetch_user_count($username, $show_group)
         // Fetch user count
         $num_users = DB::for_table('users')->table_alias('u')
                         ->where_gt('u.id', 1)
-                        ->where_not_equal('u.group_id', FEATHER_UNVERIFIED);
+                        ->where_not_equal('u.group_id', $this->feather->forum_env['FEATHER_UNVERIFIED']);
 
         if ($username != '') {
             $num_users = $num_users->where_like('u.username', str_replace('*', '%', $username));
@@ -58,7 +58,7 @@ public function generate_dropdown_menu($show_group)
 
         $result = DB::for_table('groups')
                         ->select_many($result['select'])
-                        ->where_not_equal('g_id', FEATHER_GUEST)
+                        ->where_not_equal('g_id', $this->feather->forum_env['FEATHER_GUEST'])
                         ->order_by('g_id');
         $result = $this->hook->fireDB('generate_dropdown_menu_query', $result);
         $result = $result->find_many();
@@ -88,7 +88,7 @@ public function print_users($username, $start_from, $sort_by, $sort_dir, $show_g
                     ->select('u.id')
                     ->table_alias('u')
                     ->where_gt('u.id', 1)
-                    ->where_not_equal('u.group_id', FEATHER_UNVERIFIED);
+                    ->where_not_equal('u.group_id', $this->feather->forum_env['FEATHER_UNVERIFIED']);
 
         if ($username != '') {
             $result = $result->where_like('u.username', str_replace('*', '%', $username));
diff --git a/featherbb/View/admin/bans/add_ban.php b/featherbb/View/admin/bans/add_ban.php
index 07928c5c..2f991f6c 100644
--- a/featherbb/View/admin/bans/add_ban.php
+++ b/featherbb/View/admin/bans/add_ban.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
 	exit;
 }
 ?>
diff --git a/featherbb/View/admin/bans/admin_bans.php b/featherbb/View/admin/bans/admin_bans.php
index fc833e72..ff51f23d 100644
--- a/featherbb/View/admin/bans/admin_bans.php
+++ b/featherbb/View/admin/bans/admin_bans.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/bans/search_ban.php b/featherbb/View/admin/bans/search_ban.php
index 2e3622ff..00ca5b1f 100644
--- a/featherbb/View/admin/bans/search_ban.php
+++ b/featherbb/View/admin/bans/search_ban.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/categories.php b/featherbb/View/admin/categories.php
index 2596c3ee..9e745d57 100644
--- a/featherbb/View/admin/categories.php
+++ b/featherbb/View/admin/categories.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/admin/censoring.php b/featherbb/View/admin/censoring.php
index 7d3e8071..f46644e2 100644
--- a/featherbb/View/admin/censoring.php
+++ b/featherbb/View/admin/censoring.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/forums/admin_forums.php b/featherbb/View/admin/forums/admin_forums.php
index 4aeb5236..9e1c5c59 100644
--- a/featherbb/View/admin/forums/admin_forums.php
+++ b/featherbb/View/admin/forums/admin_forums.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/forums/delete_forum.php b/featherbb/View/admin/forums/delete_forum.php
index 18d973a5..00ad7882 100644
--- a/featherbb/View/admin/forums/delete_forum.php
+++ b/featherbb/View/admin/forums/delete_forum.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/forums/permissions.php b/featherbb/View/admin/forums/permissions.php
index bbea0301..e7fb0ebf 100644
--- a/featherbb/View/admin/forums/permissions.php
+++ b/featherbb/View/admin/forums/permissions.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/groups/add_edit_group.php b/featherbb/View/admin/groups/add_edit_group.php
index a7873c00..f31dc1a3 100644
--- a/featherbb/View/admin/groups/add_edit_group.php
+++ b/featherbb/View/admin/groups/add_edit_group.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
@@ -42,10 +42,10 @@
 									<th scope="row"><?php _e('User title label') ?></th>
 									<td>
 										<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo Utils::escape($group['info']['g_user_title']) ?>" tabindex="2" />
-										<span><?php printf(__('User title help'), ($group['info']['g_id'] != FEATHER_GUEST ? __('Member') : __('Guest'))) ?></span>
+										<span><?php printf(__('User title help'), ($group['info']['g_id'] != $feather->forum_env['FEATHER_GUEST'] ? __('Member') : __('Guest'))) ?></span>
 									</td>
 								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_ADMIN): if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+<?php if ($group['info']['g_id'] != $feather->forum_env['FEATHER_ADMIN']): if ($group['info']['g_id'] != $feather->forum_env['FEATHER_GUEST']): ?>								<tr>
 									<th scope="row"><?php _e('Promote users label') ?></th>
 									<td>
 										<select name="promote_next_group" tabindex="3">
@@ -176,7 +176,7 @@
 										<span class="clearb"><?php _e('Post topics help') ?></span>
 									</td>
 								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+<?php if ($group['info']['g_id'] != $feather->forum_env['FEATHER_GUEST']): ?>								<tr>
 									<th scope="row"><?php _e('Edit posts label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="edit_posts" value="1"<?php if ($group['info']['g_edit_posts'] == '1') {
@@ -224,7 +224,7 @@
 										<span class="clearb"><?php _e('Post links help') ?></span>
 									</td>
 								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+<?php if ($group['info']['g_id'] != $feather->forum_env['FEATHER_GUEST']): ?>								<tr>
 									<th scope="row"><?php _e('Set own title label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="set_title" value="1"<?php if ($group['info']['g_set_title'] == '1') {
@@ -260,7 +260,7 @@
 										<span class="clearb"><?php _e('User list search help') ?></span>
 									</td>
 								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+<?php if ($group['info']['g_id'] != $feather->forum_env['FEATHER_GUEST']): ?>								<tr>
 									<th scope="row"><?php _e('Send e-mails label') ?></th>
 									<td>
 										<label class="conl"><input type="radio" name="send_email" value="1"<?php if ($group['info']['g_send_email'] == '1') {
@@ -286,7 +286,7 @@
 										<span><?php _e('Search flood help') ?></span>
 									</td>
 								</tr>
-<?php if ($group['info']['g_id'] != FEATHER_GUEST): ?>								<tr>
+<?php if ($group['info']['g_id'] != $feather->forum_env['FEATHER_GUEST']): ?>								<tr>
 									<th scope="row"><?php _e('E-mail flood label') ?></th>
 									<td>
 										<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['info']['g_email_flood'] ?>" tabindex="43" />
@@ -310,4 +310,4 @@
 		</div>
 	</div>
 	<div class="clearer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/featherbb/View/admin/groups/admin_groups.php b/featherbb/View/admin/groups/admin_groups.php
index 35ea6efb..a456cb46 100644
--- a/featherbb/View/admin/groups/admin_groups.php
+++ b/featherbb/View/admin/groups/admin_groups.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
@@ -33,7 +33,7 @@
 <?php
 
 foreach ($groups as $cur_group) {
-    if ($cur_group['g_id'] != FEATHER_ADMIN && $cur_group['g_id'] != FEATHER_GUEST) {
+    if ($cur_group['g_id'] != $feather->forum_env['FEATHER_ADMIN'] && $cur_group['g_id'] != $feather->forum_env['FEATHER_GUEST']) {
         if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
         } else {
@@ -66,7 +66,7 @@
 <?php
 
 foreach ($groups as $cur_group) {
-    if ($cur_group['g_id'] > FEATHER_GUEST && $cur_group['g_moderator'] == 0) {
+    if ($cur_group['g_id'] > $feather->forum_env['FEATHER_GUEST'] && $cur_group['g_moderator'] == 0) {
         if ($cur_group['g_id'] == $feather->forum_settings['o_default_user_group']) {
             echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.Utils::escape($cur_group['g_title']).'</option>'."\n";
         } else {
@@ -98,7 +98,7 @@
 							<table>
 <?php
 foreach ($groups as $cur_group) {
-    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->urlFor('editGroup', ['id' => $cur_group['g_id']]).'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > FEATHER_MEMBER) ? ' | <a href="'.$feather->urlFor('deleteGroup', ['id' => $cur_group['g_id']]).'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.Utils::escape($cur_group['g_title']).'</td></tr>'."\n";
+    echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="'.$feather->urlFor('editGroup', ['id' => $cur_group['g_id']]).'" tabindex="'.$cur_index++.'">'.__('Edit link').'</a>'.(($cur_group['g_id'] > $feather->forum_env['FEATHER_MEMBER']) ? ' | <a href="'.$feather->urlFor('deleteGroup', ['id' => $cur_group['g_id']]).'" tabindex="'.$cur_index++.'">'.__('Delete link').'</a>' : '').'</th><td>'.Utils::escape($cur_group['g_title']).'</td></tr>'."\n";
 }
 
 ?>
diff --git a/featherbb/View/admin/groups/confirm_delete.php b/featherbb/View/admin/groups/confirm_delete.php
index 7c689045..542bc9c6 100644
--- a/featherbb/View/admin/groups/confirm_delete.php
+++ b/featherbb/View/admin/groups/confirm_delete.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/groups/delete_group.php b/featherbb/View/admin/groups/delete_group.php
index 3ec58a3c..3ca3e5dd 100644
--- a/featherbb/View/admin/groups/delete_group.php
+++ b/featherbb/View/admin/groups/delete_group.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/index.php b/featherbb/View/admin/index.php
index 64ca7197..f10055ab 100644
--- a/featherbb/View/admin/index.php
+++ b/featherbb/View/admin/index.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/maintenance/admin_maintenance.php b/featherbb/View/admin/maintenance/admin_maintenance.php
index 5e553e17..e2e32e7d 100644
--- a/featherbb/View/admin/maintenance/admin_maintenance.php
+++ b/featherbb/View/admin/maintenance/admin_maintenance.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/maintenance/prune.php b/featherbb/View/admin/maintenance/prune.php
index 63b36d72..e261453a 100644
--- a/featherbb/View/admin/maintenance/prune.php
+++ b/featherbb/View/admin/maintenance/prune.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/maintenance/rebuild.php b/featherbb/View/admin/maintenance/rebuild.php
index 4c319409..48867bbb 100644
--- a/featherbb/View/admin/maintenance/rebuild.php
+++ b/featherbb/View/admin/maintenance/rebuild.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/menu.php b/featherbb/View/admin/menu.php
index 8819d59b..b806aa2e 100644
--- a/featherbb/View/admin/menu.php
+++ b/featherbb/View/admin/menu.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/admin/options.php b/featherbb/View/admin/options.php
index 6ff75535..fb385eaf 100644
--- a/featherbb/View/admin/options.php
+++ b/featherbb/View/admin/options.php
@@ -12,7 +12,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/parser.php b/featherbb/View/admin/parser.php
index 5d69da79..3473d261 100644
--- a/featherbb/View/admin/parser.php
+++ b/featherbb/View/admin/parser.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/permissions.php b/featherbb/View/admin/permissions.php
index 9c08fbf3..18055342 100644
--- a/featherbb/View/admin/permissions.php
+++ b/featherbb/View/admin/permissions.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/plugins.php b/featherbb/View/admin/plugins.php
index 7c6acbef..f09471a0 100644
--- a/featherbb/View/admin/plugins.php
+++ b/featherbb/View/admin/plugins.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/reports.php b/featherbb/View/admin/reports.php
index 7bebced8..d525a5de 100644
--- a/featherbb/View/admin/reports.php
+++ b/featherbb/View/admin/reports.php
@@ -12,7 +12,7 @@
 use FeatherBB\Core\AdminUtils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/statistics.php b/featherbb/View/admin/statistics.php
index d8b24bb5..e4727eff 100644
--- a/featherbb/View/admin/statistics.php
+++ b/featherbb/View/admin/statistics.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
@@ -25,10 +25,10 @@
 					<dd>
 						<?php printf(__('Server load data')."\n", $server_load, $num_online) ?>
 					</dd>
-<?php if ($feather->user->g_id == FEATHER_ADMIN): ?>					<dt><?php _e('Environment label') ?></dt>
+<?php if ($feather->user->g_id == $feather->forum_env['FEATHER_ADMIN']): ?>					<dt><?php _e('Environment label') ?></dt>
 					<dd>
 						<?php printf(__('Environment data OS'), PHP_OS) ?><br />
-						<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->urlFor('phpinfo').'">'.__('Show info').'</a>') ?><br />
+						<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->urlFor('phpInfo').'">'.__('Show info').'</a>') ?><br />
 						<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
 					</dd>
 					<dt><?php _e('Database label') ?></dt>
diff --git a/featherbb/View/admin/users/admin_users.php b/featherbb/View/admin/users/admin_users.php
index 95cd18d1..7c8d4dce 100644
--- a/featherbb/View/admin/users/admin_users.php
+++ b/featherbb/View/admin/users/admin_users.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/users/ban_users.php b/featherbb/View/admin/users/ban_users.php
index 935ff1fb..05ece53b 100644
--- a/featherbb/View/admin/users/ban_users.php
+++ b/featherbb/View/admin/users/ban_users.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/users/delete_users.php b/featherbb/View/admin/users/delete_users.php
index bdb8a8ab..2d8b422c 100644
--- a/featherbb/View/admin/users/delete_users.php
+++ b/featherbb/View/admin/users/delete_users.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/users/find_users.php b/featherbb/View/admin/users/find_users.php
index 4e1f53fe..b217751c 100644
--- a/featherbb/View/admin/users/find_users.php
+++ b/featherbb/View/admin/users/find_users.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/users/move_users.php b/featherbb/View/admin/users/move_users.php
index 29192afe..cb2257b4 100644
--- a/featherbb/View/admin/users/move_users.php
+++ b/featherbb/View/admin/users/move_users.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/users/search_ip.php b/featherbb/View/admin/users/search_ip.php
index 50be8522..ee81c9b8 100644
--- a/featherbb/View/admin/users/search_ip.php
+++ b/featherbb/View/admin/users/search_ip.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/admin/users/show_users.php b/featherbb/View/admin/users/show_users.php
index 4d04e7a4..51160325 100644
--- a/featherbb/View/admin/users/show_users.php
+++ b/featherbb/View/admin/users/show_users.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/delete.php b/featherbb/View/delete.php
index 929490d5..2c1e3435 100644
--- a/featherbb/View/delete.php
+++ b/featherbb/View/delete.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/edit.php b/featherbb/View/edit.php
index d6812466..2bb782fa 100644
--- a/featherbb/View/edit.php
+++ b/featherbb/View/edit.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/error.php b/featherbb/View/error.php
index 8d4d01cb..1a34c6f9 100644
--- a/featherbb/View/error.php
+++ b/featherbb/View/error.php
@@ -8,7 +8,7 @@
  */
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/footer.php b/featherbb/View/footer.php
index 990aa54a..fdd8225f 100644
--- a/featherbb/View/footer.php
+++ b/featherbb/View/footer.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/forum.php b/featherbb/View/forum.php
index 38ebaf72..c832a5cd 100644
--- a/featherbb/View/forum.php
+++ b/featherbb/View/forum.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/header.php b/featherbb/View/header.php
index a4a7e1a2..9cf86daa 100644
--- a/featherbb/View/header.php
+++ b/featherbb/View/header.php
@@ -12,7 +12,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/help.php b/featherbb/View/help.php
index 9feb774e..429dd13b 100644
--- a/featherbb/View/help.php
+++ b/featherbb/View/help.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/index.php b/featherbb/View/index.php
index 67fc0e06..eeda6b44 100644
--- a/featherbb/View/index.php
+++ b/featherbb/View/index.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/install.php b/featherbb/View/install.php
index 1c881cf2..b83b8d82 100644
--- a/featherbb/View/install.php
+++ b/featherbb/View/install.php
@@ -8,7 +8,7 @@
  */
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
@@ -72,7 +72,7 @@
                         ?>
 
                         <div class="blockform">
-                            <h2><span><?php echo sprintf(__('Install'), FORUM_VERSION) ?></span></h2>
+                            <h2><span><?php echo sprintf(__('Install'), $feather->forum_env['FORUM_VERSION']) ?></span></h2>
                             <div class="box">
                                 <form id="install" method="post" action="">
                                     <?php if (!empty($errors)): ?>
diff --git a/featherbb/View/login/form.php b/featherbb/View/login/form.php
index e4d252cc..2bb93bac 100644
--- a/featherbb/View/login/form.php
+++ b/featherbb/View/login/form.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/login/password_forgotten.php b/featherbb/View/login/password_forgotten.php
index 36b78bc0..c33b428a 100644
--- a/featherbb/View/login/password_forgotten.php
+++ b/featherbb/View/login/password_forgotten.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/message.php b/featherbb/View/message.php
index 69f4884b..49132724 100644
--- a/featherbb/View/message.php
+++ b/featherbb/View/message.php
@@ -8,7 +8,7 @@
  */
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/misc/email.php b/featherbb/View/misc/email.php
index c373ff51..c8b40c81 100644
--- a/featherbb/View/misc/email.php
+++ b/featherbb/View/misc/email.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/misc/report.php b/featherbb/View/misc/report.php
index 6f7d1b36..2258cd96 100644
--- a/featherbb/View/misc/report.php
+++ b/featherbb/View/misc/report.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/View/misc/rules.php b/featherbb/View/misc/rules.php
index 163df1b7..524ba5a4 100644
--- a/featherbb/View/misc/rules.php
+++ b/featherbb/View/misc/rules.php
@@ -8,7 +8,7 @@
  */
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/moderate/delete_posts.php b/featherbb/View/moderate/delete_posts.php
index 7e5b57df..cba924ac 100644
--- a/featherbb/View/moderate/delete_posts.php
+++ b/featherbb/View/moderate/delete_posts.php
@@ -8,7 +8,7 @@
  */
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/moderate/delete_topics.php b/featherbb/View/moderate/delete_topics.php
index 4823a5c5..19d946d1 100644
--- a/featherbb/View/moderate/delete_topics.php
+++ b/featherbb/View/moderate/delete_topics.php
@@ -8,7 +8,7 @@
  */
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/moderate/merge_topics.php b/featherbb/View/moderate/merge_topics.php
index 7b1ff2a9..57d3f8b0 100644
--- a/featherbb/View/moderate/merge_topics.php
+++ b/featherbb/View/moderate/merge_topics.php
@@ -8,7 +8,7 @@
  */
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/moderate/moderator_forum.php b/featherbb/View/moderate/moderator_forum.php
index 8f7130ac..7d119927 100644
--- a/featherbb/View/moderate/moderator_forum.php
+++ b/featherbb/View/moderate/moderator_forum.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/moderate/move_topics.php b/featherbb/View/moderate/move_topics.php
index 3c8b979c..1531a352 100644
--- a/featherbb/View/moderate/move_topics.php
+++ b/featherbb/View/moderate/move_topics.php
@@ -8,7 +8,7 @@
  */
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/moderate/posts_view.php b/featherbb/View/moderate/posts_view.php
index 0dee9a93..e58d7437 100644
--- a/featherbb/View/moderate/posts_view.php
+++ b/featherbb/View/moderate/posts_view.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/moderate/split_posts.php b/featherbb/View/moderate/split_posts.php
index 433ed3d3..70884029 100644
--- a/featherbb/View/moderate/split_posts.php
+++ b/featherbb/View/moderate/split_posts.php
@@ -8,7 +8,7 @@
  */
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/post.php b/featherbb/View/post.php
index 2c5eb63d..d93a06f4 100644
--- a/featherbb/View/post.php
+++ b/featherbb/View/post.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/profile/change_mail.php b/featherbb/View/profile/change_mail.php
index fa253247..7d36ed3e 100644
--- a/featherbb/View/profile/change_mail.php
+++ b/featherbb/View/profile/change_mail.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/profile/change_pass.php b/featherbb/View/profile/change_pass.php
index 413471e2..50a1a265 100644
--- a/featherbb/View/profile/change_pass.php
+++ b/featherbb/View/profile/change_pass.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/profile/delete_user.php b/featherbb/View/profile/delete_user.php
index cc12bbf4..be15d0cb 100644
--- a/featherbb/View/profile/delete_user.php
+++ b/featherbb/View/profile/delete_user.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/profile/menu.php b/featherbb/View/profile/menu.php
index 071db171..758c5270 100644
--- a/featherbb/View/profile/menu.php
+++ b/featherbb/View/profile/menu.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
@@ -46,7 +46,7 @@
     echo ' class="isactive"';
 }
     ?>><a href="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'privacy']) ?>"><?php _e('Section privacy') ?></a></li>
-<?php if ($feather->user->g_id == FEATHER_ADMIN || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
+<?php if ($feather->user->g_id == $feather->forum_env['FEATHER_ADMIN'] || ($feather->user->g_moderator == '1' && $feather->user->g_mod_ban_users == '1')): ?>					<li<?php if ($page == 'admin') {
     echo ' class="isactive"';
 }
     ?>><a href="<?php echo $feather->urlFor('profileSection', ['id' => $id, 'section' => 'admin']) ?>"><?php _e('Section admin') ?></a></li>
diff --git a/featherbb/View/profile/section_admin.php b/featherbb/View/profile/section_admin.php
index e3a5fd3e..c7544975 100644
--- a/featherbb/View/profile/section_admin.php
+++ b/featherbb/View/profile/section_admin.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
@@ -62,7 +62,7 @@
 				</div>
 <?php
 
-            if ($user['g_moderator'] == '1' || $user['g_id'] == FEATHER_ADMIN) {
+            if ($user['g_moderator'] == '1' || $user['g_id'] == $feather->forum_env['FEATHER_ADMIN']) {
                 ?>
 				<div class="inform">
 					<fieldset>
diff --git a/featherbb/View/profile/section_display.php b/featherbb/View/profile/section_display.php
index 093d384a..5714357a 100644
--- a/featherbb/View/profile/section_display.php
+++ b/featherbb/View/profile/section_display.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/profile/section_essentials.php b/featherbb/View/profile/section_essentials.php
index 7091fa58..a6221285 100644
--- a/featherbb/View/profile/section_essentials.php
+++ b/featherbb/View/profile/section_essentials.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
@@ -27,7 +27,7 @@
 					<div class="infldset">
 						<input type="hidden" name="form_sent" value="1" />
 						<?php echo $user_disp['username_field'] ?>
-<?php if ($feather->user->id == $id || $feather->user->g_id == FEATHER_ADMIN || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo $feather->urlFor('profileAction', ['id' => $id, 'action' => 'change_pass']) ?>"><?php _e('Change pass') ?></a></span></p>
+<?php if ($feather->user->id == $id || $feather->user->g_id == $feather->forum_env['FEATHER_ADMIN'] || ($user['g_moderator'] == '0' && $feather->user->g_mod_change_passwords == '1')): ?>							<p class="actions"><span><a href="<?php echo $feather->urlFor('profileAction', ['id' => $id, 'action' => 'change_pass']) ?>"><?php _e('Change pass') ?></a></span></p>
 <?php endif; ?>						</div>
 				</fieldset>
 			</div>
diff --git a/featherbb/View/profile/section_messaging.php b/featherbb/View/profile/section_messaging.php
index 3353bf77..76e31e42 100644
--- a/featherbb/View/profile/section_messaging.php
+++ b/featherbb/View/profile/section_messaging.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/profile/section_personal.php b/featherbb/View/profile/section_personal.php
index cc9a5985..36fae4e7 100644
--- a/featherbb/View/profile/section_personal.php
+++ b/featherbb/View/profile/section_personal.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
@@ -29,7 +29,7 @@
 						<label><?php _e('Realname') ?><br /><input type="text" name="form_realname" value="<?php echo Utils::escape($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
 <?php if (isset($title_field)): ?>							<?php echo $title_field ?>
 <?php endif; ?>							<label><?php _e('Location') ?><br /><input type="text" name="form_location" value="<?php echo Utils::escape($user['location']) ?>" size="30" maxlength="30" /><br /></label>
-<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == FEATHER_ADMIN) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo Utils::escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php if ($feather->user->g_post_links == '1' || $feather->user->g_id == $feather->forum_env['FEATHER_ADMIN']) : ?>							<label><?php _e('Website') ?><br /><input type="text" name="form_url" value="<?php echo Utils::escape($user['url']) ?>" size="50" maxlength="80" /><br /></label>
 <?php endif; ?>
 					</div>
 				</fieldset>
diff --git a/featherbb/View/profile/section_personality.php b/featherbb/View/profile/section_personality.php
index 7cae1d47..91f05972 100644
--- a/featherbb/View/profile/section_personality.php
+++ b/featherbb/View/profile/section_personality.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/profile/section_privacy.php b/featherbb/View/profile/section_privacy.php
index f5116b47..267116f3 100644
--- a/featherbb/View/profile/section_privacy.php
+++ b/featherbb/View/profile/section_privacy.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/profile/upload_avatar.php b/featherbb/View/profile/upload_avatar.php
index bf345613..4fb0838e 100644
--- a/featherbb/View/profile/upload_avatar.php
+++ b/featherbb/View/profile/upload_avatar.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
 	exit;
 }
 
diff --git a/featherbb/View/profile/view_profile.php b/featherbb/View/profile/view_profile.php
index f1445122..2cdca354 100644
--- a/featherbb/View/profile/view_profile.php
+++ b/featherbb/View/profile/view_profile.php
@@ -8,7 +8,7 @@
  */
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/register/email.php b/featherbb/View/register/email.php
index dba4b807..8daa2bed 100644
--- a/featherbb/View/register/email.php
+++ b/featherbb/View/register/email.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/register/form.php b/featherbb/View/register/form.php
index 79bbdaae..935a8264 100644
--- a/featherbb/View/register/form.php
+++ b/featherbb/View/register/form.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/register/rules.php b/featherbb/View/register/rules.php
index edc4d329..dcc1c52d 100644
--- a/featherbb/View/register/rules.php
+++ b/featherbb/View/register/rules.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/search/footer.php b/featherbb/View/search/footer.php
index 4c6d7c16..8262a99d 100644
--- a/featherbb/View/search/footer.php
+++ b/featherbb/View/search/footer.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/search/form.php b/featherbb/View/search/form.php
index 8ac06fcf..721469f8 100644
--- a/featherbb/View/search/form.php
+++ b/featherbb/View/search/form.php
@@ -8,7 +8,7 @@
  */
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
@@ -16,7 +16,7 @@
 <div id="searchform" class="blockform">
 	<h2><span><?php _e('Search') ?></span></h2>
 	<div class="box">
-		<form id="search" method="get" action="">
+		<form id="search" method="get" action="<?= $feather->urlFor('search') ?>">
 			<div class="inform">
 				<fieldset>
 					<legend><?php _e('Search criteria legend') ?></legend>
@@ -76,4 +76,4 @@
 			<p class="buttons"><input type="submit" name="search" value="<?php _e('Submit') ?>" accesskey="s" /></p>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/featherbb/View/search/header.php b/featherbb/View/search/header.php
index ebe54ae1..b731fd2b 100644
--- a/featherbb/View/search/header.php
+++ b/featherbb/View/search/header.php
@@ -10,7 +10,7 @@
 use FeatherBB\Core\Url;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/search/posts.php b/featherbb/View/search/posts.php
index bd3735c3..0e2d0946 100644
--- a/featherbb/View/search/posts.php
+++ b/featherbb/View/search/posts.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/search/topics.php b/featherbb/View/search/topics.php
index 5489a0a8..0d8ea253 100644
--- a/featherbb/View/search/topics.php
+++ b/featherbb/View/search/topics.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/topic.php b/featherbb/View/topic.php
index 9ce44971..4c05f87f 100644
--- a/featherbb/View/topic.php
+++ b/featherbb/View/topic.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 
diff --git a/featherbb/View/userlist.php b/featherbb/View/userlist.php
index 6a267fa2..44774d0e 100644
--- a/featherbb/View/userlist.php
+++ b/featherbb/View/userlist.php
@@ -11,7 +11,7 @@
 use FeatherBB\Core\Utils;
 
 // Make sure no one attempts to run this script "directly"
-if (!defined('FEATHER')) {
+if (!isset($feather)) {
     exit;
 }
 ?>
diff --git a/featherbb/routes.php b/featherbb/routes.php
index 9435c1e5..a03bc2cb 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -133,14 +133,14 @@
      * Middleware to check if user is admin.
      */
     $isAdmin = function() use ($feather) {
-        if($feather->user->g_id != FEATHER_ADMIN) {
+        if($feather->user->g_id != $feather->forum_env['FEATHER_ADMIN']) {
             $feather->url->redirect($feather->urlFor('home'), __('No permission'));
         }
     };
 
     // Admin index
-    $feather->get('(/action/:action)(/)', '\FeatherBB\Controller\Admin\index:display')->name('adminAction');
-    $feather->get('/index(/)', '\FeatherBB\Controller\Admin\index:display')->name('adminIndex');
+    $feather->get('(/action/:action)(/)', '\FeatherBB\Controller\Admin\Index:display')->name('adminAction');
+    $feather->get('/index(/)', '\FeatherBB\Controller\Admin\Index:display')->name('adminIndex');
 
     // Admin bans
     $feather->group('/bans', function() use ($feather) {
diff --git a/plugins/test/src/Test.php b/plugins/test/src/Test.php
index eb8e7574..4a898f80 100644
--- a/plugins/test/src/Test.php
+++ b/plugins/test/src/Test.php
@@ -15,14 +15,14 @@ class Test extends BasePlugin
 {
     public function run()
     {
-        $this->hooks->bind('get_forum_actions', function ($forum_actions) {
-           $forum_actions[] = '<a href="' . $this->feather->url->get('mark-read/') . '">Test1</a>';
-           return $forum_actions;
-        });
+        $this->hooks->bind('get_forum_actions', [$this, 'addMarkRead']);
 
-        $this->hooks->bind('get_forum_actions', function ($forum_actions) {
-            $forum_actions[] = '<a href="' . $this->feather->url->get('mark-read/') . '">Test2</a>';
-            return $forum_actions;
-        });
+    }
+
+    public function addMarkRead($forum_actions)
+    {
+        $forum_actions[] = '<a href="' . $this->feather->url->get('mark-read/') . '">Test1</a>';
+        $forum_actions[] = '<a href="' . $this->feather->url->get('mark-read/') . '">Test2</a>';
+        return $forum_actions;
     }
 }

From 8f4d30a51bf2df6d006020d3ee26044cb00f8be3 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Tue, 8 Sep 2015 19:20:48 +0200
Subject: [PATCH 347/353] Restore left menu in admin/plugins

---
 featherbb/Controller/Admin/Bans.php        |  5 -----
 featherbb/Controller/Admin/Categories.php  |  5 -----
 featherbb/Controller/Admin/Censoring.php   |  5 -----
 featherbb/Controller/Admin/Forums.php      |  5 -----
 featherbb/Controller/Admin/Groups.php      |  5 -----
 featherbb/Controller/Admin/Index.php       |  5 -----
 featherbb/Controller/Admin/Permissions.php |  5 -----
 featherbb/Controller/Admin/Plugins.php     | 17 ++++++++++-------
 featherbb/Controller/Admin/Reports.php     |  5 -----
 featherbb/Controller/Admin/Users.php       |  5 -----
 featherbb/Controller/Forum.php             |  5 -----
 featherbb/Controller/Help.php              |  5 -----
 featherbb/Controller/Register.php          |  5 -----
 featherbb/View/admin/plugins.php           | 14 ++------------
 14 files changed, 12 insertions(+), 79 deletions(-)

diff --git a/featherbb/Controller/Admin/Bans.php b/featherbb/Controller/Admin/Bans.php
index 6a5e2c01..da6d0b7a 100644
--- a/featherbb/Controller/Admin/Bans.php
+++ b/featherbb/Controller/Admin/Bans.php
@@ -31,11 +31,6 @@ public function __construct()
         }
     }
 
-    public function __autoload($class_name)
-    {
-        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
-    }
-
     public function display()
     {
         // Display bans
diff --git a/featherbb/Controller/Admin/Categories.php b/featherbb/Controller/Admin/Categories.php
index f64c09eb..6368ba76 100644
--- a/featherbb/Controller/Admin/Categories.php
+++ b/featherbb/Controller/Admin/Categories.php
@@ -28,11 +28,6 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/categories.mo');
     }
 
-    public function __autoload($class_name)
-    {
-        require $this->feather->forum_env['FEATHER_ROOT'].$class_name.'.php';
-    }
-
     public function add_category()
     {
         $cat_name = Utils::trim($this->request->post('cat_name'));
diff --git a/featherbb/Controller/Admin/Censoring.php b/featherbb/Controller/Admin/Censoring.php
index 3e131252..0edd1c2a 100644
--- a/featherbb/Controller/Admin/Censoring.php
+++ b/featherbb/Controller/Admin/Censoring.php
@@ -25,11 +25,6 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/censoring.mo');
     }
 
-    public function __autoload($class_name)
-    {
-        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
-    }
-
     public function display()
     {
         // Add a censor word
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
index 81a25fc5..f81052ca 100644
--- a/featherbb/Controller/Admin/Forums.php
+++ b/featherbb/Controller/Admin/Forums.php
@@ -27,11 +27,6 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/forums.mo');
     }
 
-    public function __autoload($class_name)
-    {
-        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
-    }
-
     //
     // CRUD
     //
diff --git a/featherbb/Controller/Admin/Groups.php b/featherbb/Controller/Admin/Groups.php
index d799a691..58356e31 100644
--- a/featherbb/Controller/Admin/Groups.php
+++ b/featherbb/Controller/Admin/Groups.php
@@ -26,11 +26,6 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/groups.mo');
     }
 
-    public function __autoload($class_name)
-    {
-        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
-    }
-
     public function display()
     {
         $groups = $this->model->fetch_groups();
diff --git a/featherbb/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
index d4164107..3bf3c2bd 100644
--- a/featherbb/Controller/Admin/Index.php
+++ b/featherbb/Controller/Admin/Index.php
@@ -26,11 +26,6 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/index.mo');
     }
 
-    public function __autoload($class_name)
-    {
-        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
-    }
-
     public function remove_install_folder($directory)
     {
         foreach(glob("{$directory}/*") as $file)
diff --git a/featherbb/Controller/Admin/Permissions.php b/featherbb/Controller/Admin/Permissions.php
index 13befe38..f31194d4 100644
--- a/featherbb/Controller/Admin/Permissions.php
+++ b/featherbb/Controller/Admin/Permissions.php
@@ -25,11 +25,6 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/permissions.mo');
     }
 
-    public function __autoload($class_name)
-    {
-        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
-    }
-
     public function display()
     {
         // Update permissions
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
index 50c1d70a..c5a8ea74 100644
--- a/featherbb/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -9,6 +9,7 @@
 
 namespace FeatherBB\Controller\Admin;
 
+use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Lister;
 use FeatherBB\Core\Error;
 use FeatherBB\Core\Utils;
@@ -32,18 +33,20 @@ public function index()
         // AdminUtils::generateAdminMenu('plugins');
         $this->feather->template->addAsset('js', 'style/imports/common.js', array('type' => 'text/javascript'));
 
-        $plugins = Lister::getPlugins();
-        // var_dump($plugins);
+        $availablePlugins = Lister::getPlugins();
+        // var_dump($availablePlugins);
         $activePlugins = $this->feather->cache->isCached('active_plugins') ? $this->feather->cache->retrieve('active_plugins') : array();
         // var_dump($activePlugins);
         // $this->feather->cache->delete('active_plugins');
 
+        AdminUtils::generateAdminMenu('plugins');
+
         $this->feather->template->setPageInfo(array(
-                'admin_console' => true,
-                'active_page' => 'admin',
-                'plugins'    =>    $plugins,
-                'activePlugins'    =>    $activePlugins,
-                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Extension')),
+            'admin_console' => true,
+            'active_page' => 'admin',
+            'availablePlugins'    =>    $availablePlugins,
+            'activePlugins'    =>    $activePlugins,
+            'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Extension')),
             )
         )->addTemplate('admin/plugins.php')->display();
     }
diff --git a/featherbb/Controller/Admin/Reports.php b/featherbb/Controller/Admin/Reports.php
index 8728bb6b..5fb094e2 100644
--- a/featherbb/Controller/Admin/Reports.php
+++ b/featherbb/Controller/Admin/Reports.php
@@ -25,11 +25,6 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/reports.mo');
     }
 
-    public function __autoload($class_name)
-    {
-        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
-    }
-
     public function display()
     {
         // Zap a report
diff --git a/featherbb/Controller/Admin/Users.php b/featherbb/Controller/Admin/Users.php
index bc7acdfa..38ee1570 100644
--- a/featherbb/Controller/Admin/Users.php
+++ b/featherbb/Controller/Admin/Users.php
@@ -27,11 +27,6 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/users.mo');
     }
 
-    public function __autoload($class_name)
-    {
-        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
-    }
-
     public function display()
     {
         // Move multiple users to other user groups
diff --git a/featherbb/Controller/Forum.php b/featherbb/Controller/Forum.php
index a5162890..f6f60c03 100644
--- a/featherbb/Controller/Forum.php
+++ b/featherbb/Controller/Forum.php
@@ -21,11 +21,6 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->feather->user->language.'/forum.mo');
     }
 
-    public function __autoload($class_name)
-    {
-        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
-    }
-
     public function display($fid, $name = null, $page = null)
     {
         // Fetch some informations about the forum
diff --git a/featherbb/Controller/Help.php b/featherbb/Controller/Help.php
index ad90bdbc..84108dd5 100644
--- a/featherbb/Controller/Help.php
+++ b/featherbb/Controller/Help.php
@@ -23,11 +23,6 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/help.mo');
     }
 
-    public function __autoload($class_name)
-    {
-        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
-    }
-
     public function display()
     {
         $this->feather->template->setPageInfo(array(
diff --git a/featherbb/Controller/Register.php b/featherbb/Controller/Register.php
index e9199df6..d3c8d1c5 100644
--- a/featherbb/Controller/Register.php
+++ b/featherbb/Controller/Register.php
@@ -28,11 +28,6 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/antispam.mo');
     }
 
-    public function __autoload($class_name)
-    {
-        require $this->feather->forum_env['FEATHER_ROOT'] . $class_name . '.php';
-    }
-
     public function display()
     {
         if (!$this->user->is_guest) {
diff --git a/featherbb/View/admin/plugins.php b/featherbb/View/admin/plugins.php
index f09471a0..ebb2417d 100644
--- a/featherbb/View/admin/plugins.php
+++ b/featherbb/View/admin/plugins.php
@@ -15,16 +15,6 @@
 }
 ?>
 
-<div class="linkst">
-	<div class="inbox crumbsplus">
-		<ul class="crumbs">
-			<li><a href="<?= $feather->urlFor('adminIndex') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
-			<li><span>»&#160;</span><a href="<?= $feather->urlFor('adminPlugins') ?>"><strong><?php _e('Extension') ?></strong></a></li>
-		</ul>
-		<div class="clearer"></div>
-	</div>
-</div>
-
 <div class="block">
     <h2>Plugins</h2>
     <div class="box">
@@ -38,7 +28,7 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <?php foreach ($plugins as $plugin) : ?>
+                    <?php foreach ($availablePlugins as $plugin) : ?>
                         <tr>
                             <td>
                                 <strong><?= $plugin->title; ?></strong> <small><?= $plugin->version; ?></small>
@@ -60,7 +50,7 @@
                     <?php endforeach; ?>
                 </tbody>
             </table>
-            <p style="text-align:right"><?= count($plugins) ?> éléments</p>
+            <p style="text-align:right"><?= count($availablePlugins) ?> éléments</p>
         </div>
     </div>
 </div>

From 6de0b65b05bd27a5d076c73b1c0b97dd853cdc45 Mon Sep 17 00:00:00 2001
From: beaver <bladerunner.vs@gmail.com>
Date: Wed, 9 Sep 2015 00:00:04 +0200
Subject: [PATCH 348/353] Small clean up (yeah, I'm a maniac too)

---
 featherbb/Controller/Admin/Forums.php      |  2 +-
 featherbb/Controller/Admin/Groups.php      |  2 +-
 featherbb/Controller/Admin/Index.php       | 35 +++----------------
 featherbb/Controller/Admin/Options.php     |  2 +-
 featherbb/Controller/Admin/Parser.php      |  3 +-
 featherbb/Controller/Admin/Permissions.php |  2 +-
 featherbb/Controller/Admin/Plugins.php     | 39 ----------------------
 featherbb/Controller/Admin/Reports.php     |  8 +++--
 featherbb/Controller/Admin/Statistics.php  |  2 +-
 featherbb/Controller/Edit.php              |  2 +-
 featherbb/Controller/Install.php           |  2 +-
 featherbb/Model/Admin/Reports.php          | 12 ++-----
 featherbb/routes.php                       |  2 +-
 13 files changed, 23 insertions(+), 90 deletions(-)

diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
index f81052ca..5e7a832c 100644
--- a/featherbb/Controller/Admin/Forums.php
+++ b/featherbb/Controller/Admin/Forums.php
@@ -23,7 +23,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \FeatherBB\Model\Admin\forums();
+        $this->model = new \FeatherBB\Model\Admin\Forums();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/forums.mo');
     }
 
diff --git a/featherbb/Controller/Admin/Groups.php b/featherbb/Controller/Admin/Groups.php
index 58356e31..3056f809 100644
--- a/featherbb/Controller/Admin/Groups.php
+++ b/featherbb/Controller/Admin/Groups.php
@@ -22,7 +22,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \FeatherBB\Model\Admin\groups();
+        $this->model = new \FeatherBB\Model\Admin\Groups();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/groups.mo');
     }
 
diff --git a/featherbb/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
index 3bf3c2bd..419b69af 100644
--- a/featherbb/Controller/Admin/Index.php
+++ b/featherbb/Controller/Admin/Index.php
@@ -26,21 +26,6 @@ public function __construct()
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/index.mo');
     }
 
-    public function remove_install_folder($directory)
-    {
-        foreach(glob("{$directory}/*") as $file)
-        {
-            if(is_dir($file)) {
-                $this->remove_install_folder($file);
-            } else {
-                unlink($file);
-            }
-        }
-        $deleted = rmdir($directory);
-
-        return $deleted;
-    }
-
     public function display($action = null)
     {
         // Check for upgrade
@@ -60,24 +45,14 @@ public function display($action = null)
                 Url::redirect($this->feather->urlFor('adminIndex'), sprintf(__('New version available message'), '<a href="http://featherbb.org/">FeatherBB.org</a>'));
             }
         }
-        // Remove /install
-        elseif ($action == 'remove_install_file') {
-            $deleted = $this->remove_install_folder($this->feather->forum_env['FEATHER_ROOT'].'install');
-
-            if ($deleted) {
-                Url::redirect($this->feather->urlFor('adminIndex'), __('Deleted install.php redirect'));
-            } else {
-                throw new Error(__('Delete install.php failed'), 500);
-            }
-        }
 
         AdminUtils::generateAdminMenu('index');
 
         $this->feather->template->setPageInfo(array(
-                            'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Index')),
-                            'active_page' => 'admin',
-                            'admin_console' => true
-                            )
-                    )->addTemplate('admin/index.php')->display();
+                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Index')),
+                'active_page' => 'admin',
+                'admin_console' => true
+            )
+        )->addTemplate('admin/index.php')->display();
     }
 }
diff --git a/featherbb/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
index e920e58f..dce5531d 100644
--- a/featherbb/Controller/Admin/Options.php
+++ b/featherbb/Controller/Admin/Options.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \FeatherBB\Model\Admin\options();
+        $this->model = new \FeatherBB\Model\Admin\Options();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/options.mo');
     }
 
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
index a7d3b6db..842ae80b 100644
--- a/featherbb/Controller/Admin/Parser.php
+++ b/featherbb/Controller/Admin/Parser.php
@@ -23,7 +23,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \FeatherBB\Model\Admin\parser();
+        $this->model = new \FeatherBB\Model\Admin\Parser();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/parser.mo');
     }
 
@@ -53,7 +53,6 @@ public function display()
 
         if ($this->request->post('form_sent')) {
 
-
             // Upload new smiley image to style/img/smilies
             if ($this->request->post('upload') && isset($_FILES['new_smiley']) && isset($_FILES['new_smiley']['error'])) {
                 $f = $_FILES['new_smiley'];
diff --git a/featherbb/Controller/Admin/Permissions.php b/featherbb/Controller/Admin/Permissions.php
index f31194d4..f97a6e45 100644
--- a/featherbb/Controller/Admin/Permissions.php
+++ b/featherbb/Controller/Admin/Permissions.php
@@ -21,7 +21,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \FeatherBB\Model\Admin\permissions();
+        $this->model = new \FeatherBB\Model\Admin\Permissions();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/permissions.mo');
     }
 
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
index c5a8ea74..f86675e3 100644
--- a/featherbb/Controller/Admin/Plugins.php
+++ b/featherbb/Controller/Admin/Plugins.php
@@ -73,43 +73,4 @@ public function deactivate($plugin = null)
         Url::redirect($this->feather->urlFor('adminPlugins'), array('warning', 'Plugin deactivated!'));
     }
 
-    public function display()
-    {
-        // The plugin to load should be supplied via GET
-        $plugin = $this->request->get('plugin') ? $this->request->get('plugin') : '';
-        if (!preg_match('%^AM?P_(\w*?)\.php$%i', $plugin)) {
-            throw new Error(__('Bad request'), 400);
-        }
-
-        // AP_ == Admins only, AMP_ == admins and moderators
-        $prefix = substr($plugin, 0, strpos($plugin, '_'));
-        if ($this->user->g_moderator == '1' && $prefix == 'AP') {
-            throw new Error(__('No permission'), 403);
-        }
-
-        // Make sure the file actually exists
-        if (!file_exists($this->feather->forum_env['FEATHER_ROOT'].'plugins/'.$plugin)) {
-            throw new Error(sprintf(__('No plugin message'), Utils::escape($plugin)), 400);
-        }
-
-        // Construct REQUEST_URI if it isn't set TODO?
-        if (!isset($_SERVER['REQUEST_URI'])) {
-            $_SERVER['REQUEST_URI'] = (isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : '').'?'.(isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '');
-        }
-
-        // Attempt to load the plugin. We don't use @ here to suppress error messages,
-        // because if we did and a parse error occurred in the plugin, we would only
-        // get the "blank page of death"
-        include $this->feather->forum_env['FEATHER_ROOT'].'plugins/'.$plugin;
-        if (!defined('FEATHER_PLUGIN_LOADED')) {
-            throw new Error(sprintf(__('Plugin failed message'), Utils::escape($plugin)));
-        }
-
-        $this->feather->template->setPageInfo(array(
-                'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), str_replace('_', ' ', substr($plugin, strpos($plugin, '_') + 1, -4))),
-                'active_page' => 'admin',
-                'admin_console' => true,
-            )
-        )->addTemplate('admin/loader.php')->display();
-    }
 }
diff --git a/featherbb/Controller/Admin/Reports.php b/featherbb/Controller/Admin/Reports.php
index 5fb094e2..f941f23b 100644
--- a/featherbb/Controller/Admin/Reports.php
+++ b/featherbb/Controller/Admin/Reports.php
@@ -11,6 +11,7 @@
 
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Utils;
+use FeatherBB\Core\Url;
 
 class Reports
 {
@@ -21,7 +22,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \FeatherBB\Model\Admin\reports();
+        $this->model = new \FeatherBB\Model\Admin\Reports();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/reports.mo');
     }
 
@@ -29,7 +30,10 @@ public function display()
     {
         // Zap a report
         if ($this->feather->request->isPost()) {
-            $this->model->zap_report();
+            $zap_id = intval(key($this->request->post('zap_id')));
+            $user_id = $this->user->id;
+            $this->model->zap_report($zap_id, $user_id);
+            Url::redirect($this->feather->urlFor('adminReports'), __('Report zapped redirect'));
         }
 
         AdminUtils::generateAdminMenu('reports');
diff --git a/featherbb/Controller/Admin/Statistics.php b/featherbb/Controller/Admin/Statistics.php
index a519b231..0d659503 100644
--- a/featherbb/Controller/Admin/Statistics.php
+++ b/featherbb/Controller/Admin/Statistics.php
@@ -22,7 +22,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \FeatherBB\Model\Admin\statistics();
+        $this->model = new \FeatherBB\Model\Admin\Statistics();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/index.mo');
     }
 
diff --git a/featherbb/Controller/Edit.php b/featherbb/Controller/Edit.php
index bc1f5f22..efe742a9 100644
--- a/featherbb/Controller/Edit.php
+++ b/featherbb/Controller/Edit.php
@@ -22,7 +22,7 @@ public function __construct()
         $this->config = $this->feather->config;
         $this->user = $this->feather->user;
         $this->request = $this->feather->request;
-        $this->model = new \FeatherBB\Model\edit();
+        $this->model = new \FeatherBB\Model\Edit();
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/register.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/prof_reg.mo');
         load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/post.mo');
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
index 625c5770..6e9d9ce7 100644
--- a/featherbb/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -32,7 +32,7 @@ class Install
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->model = new \FeatherBB\Model\install();
+        $this->model = new \FeatherBB\Model\Install();
         $this->available_langs = Lister::getLangs();
         $this->feather->template->setStyle('FeatherBB');
     }
diff --git a/featherbb/Model/Admin/Reports.php b/featherbb/Model/Admin/Reports.php
index d06ff7f0..3d9e8f4e 100644
--- a/featherbb/Model/Admin/Reports.php
+++ b/featherbb/Model/Admin/Reports.php
@@ -10,30 +10,24 @@
 namespace FeatherBB\Model\Admin;
 
 use DB;
-use FeatherBB\Core\Url;
 
 class Reports
 {
     public function __construct()
     {
         $this->feather = \Slim\Slim::getInstance();
-        $this->start = $this->feather->start;
-        $this->config = $this->feather->config;
-        $this->user = $this->feather->user;
-        $this->request = $this->feather->request;
         $this->hook = $this->feather->hooks;
     }
 
-    public function zap_report()
+    public function zap_report($zap_id, $user_id)
     {
-        $zap_id = intval(key($this->request->post('zap_id')));
         $zap_id = $this->hook->fire('reports.zap_report.zap_id', $zap_id);
 
         $result = DB::for_table('reports')->where('id', $zap_id);
         $result = $this->hook->fireDB('reports.zap_report.query', $result);
         $result = $result->find_one_col('zapped');
 
-        $set_zap_report = array('zapped' => time(), 'zapped_by' => $this->user->id);
+        $set_zap_report = array('zapped' => time(), 'zapped_by' => $user_id);
         $set_zap_report = $this->hook->fire('reports.zap_report.set_zap_report', $set_zap_report);
 
         // Update report to indicate it has been zapped
@@ -59,7 +53,7 @@ public function zap_report()
                 ->delete_many();
         }
 
-        Url::redirect($this->feather->urlFor('adminReports'), __('Report zapped redirect'));
+        return true;
     }
 
     public function get_reports()
diff --git a/featherbb/routes.php b/featherbb/routes.php
index a03bc2cb..d6018ba0 100644
--- a/featherbb/routes.php
+++ b/featherbb/routes.php
@@ -191,7 +191,7 @@
     });
 
     // Admin plugins
-    $feather->group('/plugins', function() use ($feather) {
+    $feather->group('/plugins', $isAdmin, function() use ($feather) {
         $feather->map('(/)', '\FeatherBB\Controller\Admin\Plugins:index')->via('GET', 'POST')->name('adminPlugins');
         $feather->map('/:name(/)', '\FeatherBB\Controller\Admin\Plugins:index')->via('GET', 'POST')->name('infoPlugin');
         $feather->get('/activate/:name(/)', '\FeatherBB\Controller\Admin\Plugins:activate')->conditions(array('name' => '[a-zA-Z\-]+'))->name('activatePlugin');

From 742f824e024f21ae165b00ede7755585ea3b1340 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 9 Sep 2015 19:13:24 +0200
Subject: [PATCH 349/353] Remove useless dependencies

---
 vendor/bin/phpunit                            |    1 -
 vendor/sebastian/comparator/.gitignore        |    6 -
 vendor/sebastian/comparator/.travis.yml       |   25 -
 vendor/sebastian/comparator/LICENSE           |   33 -
 vendor/sebastian/comparator/README.md         |   41 -
 vendor/sebastian/comparator/build.xml         |   34 -
 .../sebastian/comparator/build/travis-ci.xml  |   11 -
 vendor/sebastian/comparator/composer.json     |   44 -
 vendor/sebastian/comparator/phpunit.xml.dist  |   21 -
 .../comparator/src/ArrayComparator.php        |  136 --
 .../sebastian/comparator/src/Comparator.php   |   68 -
 .../comparator/src/ComparisonFailure.php      |  129 --
 .../comparator/src/DOMNodeComparator.php      |  110 --
 .../comparator/src/DateTimeComparator.php     |   80 -
 .../comparator/src/DoubleComparator.php       |   60 -
 .../comparator/src/ExceptionComparator.php    |   51 -
 vendor/sebastian/comparator/src/Factory.php   |  107 --
 .../comparator/src/MockObjectComparator.php   |   45 -
 .../comparator/src/NumericComparator.php      |   72 -
 .../comparator/src/ObjectComparator.php       |  109 --
 .../comparator/src/ResourceComparator.php     |   56 -
 .../comparator/src/ScalarComparator.php       |   94 -
 .../src/SplObjectStorageComparator.php        |   73 -
 .../comparator/src/TypeComparator.php         |   63 -
 .../comparator/tests/ArrayComparatorTest.php  |  163 --
 .../tests/DOMNodeComparatorTest.php           |  162 --
 .../tests/DateTimeComparatorTest.php          |  216 ---
 .../comparator/tests/DoubleComparatorTest.php |  134 --
 .../tests/ExceptionComparatorTest.php         |  136 --
 .../comparator/tests/FactoryTest.php          |  115 --
 .../tests/MockObjectComparatorTest.php        |  166 --
 .../tests/NumericComparatorTest.php           |  122 --
 .../comparator/tests/ObjectComparatorTest.php |  150 --
 .../tests/ResourceComparatorTest.php          |  120 --
 .../comparator/tests/ScalarComparatorTest.php |  158 --
 .../tests/SplObjectStorageComparatorTest.php  |  137 --
 .../comparator/tests/TypeComparatorTest.php   |  104 -
 .../comparator/tests/_files/Author.php        |   28 -
 .../comparator/tests/_files/Book.php          |   21 -
 .../tests/_files/ClassWithToString.php        |   19 -
 .../comparator/tests/_files/SampleClass.php   |   29 -
 .../comparator/tests/_files/Struct.php        |   25 -
 .../comparator/tests/_files/TestClass.php     |   14 -
 .../tests/_files/TestClassComparator.php      |   14 -
 .../sebastian/comparator/tests/autoload.php   |   38 -
 .../sebastian/comparator/tests/bootstrap.php  |    7 -
 vendor/sebastian/diff/.gitignore              |   10 -
 vendor/sebastian/diff/.travis.yml             |   16 -
 vendor/sebastian/diff/LICENSE                 |   33 -
 vendor/sebastian/diff/README.md               |  126 --
 vendor/sebastian/diff/build.xml               |   26 -
 vendor/sebastian/diff/composer.json           |   33 -
 vendor/sebastian/diff/phpunit.xml.dist        |   17 -
 vendor/sebastian/diff/src/Chunk.php           |  110 --
 vendor/sebastian/diff/src/Diff.php            |   81 -
 vendor/sebastian/diff/src/Differ.php          |  256 ---
 .../diff/src/LCS/LongestCommonSubsequence.php |   33 -
 ...LongestCommonSubsequenceImplementation.php |   98 -
 ...LongestCommonSubsequenceImplementation.php |   79 -
 vendor/sebastian/diff/src/Line.php            |   62 -
 vendor/sebastian/diff/src/Parser.php          |  105 -
 vendor/sebastian/diff/tests/DifferTest.php    |  Bin 11371 -> 0 bytes
 .../LCS/TimeEfficientImplementationTest.php   |  175 --
 vendor/sebastian/diff/tests/ParserTest.php    |   62 -
 .../sebastian/diff/tests/fixtures/patch.txt   |    9 -
 .../sebastian/diff/tests/fixtures/patch2.txt  |   21 -
 vendor/sebastian/environment/.gitignore       |    5 -
 vendor/sebastian/environment/.travis.yml      |   16 -
 vendor/sebastian/environment/LICENSE          |   33 -
 vendor/sebastian/environment/README.md        |   72 -
 vendor/sebastian/environment/build.xml        |   26 -
 vendor/sebastian/environment/composer.json    |   29 -
 vendor/sebastian/environment/phpunit.xml.dist |   20 -
 vendor/sebastian/environment/src/Console.php  |   81 -
 vendor/sebastian/environment/src/Runtime.php  |  192 --
 .../environment/tests/ConsoleTest.php         |   60 -
 .../environment/tests/RuntimeTest.php         |  112 --
 vendor/sebastian/exporter/.gitignore          |    9 -
 vendor/sebastian/exporter/.travis.yml         |   23 -
 vendor/sebastian/exporter/LICENSE             |   33 -
 vendor/sebastian/exporter/README.md           |  171 --
 vendor/sebastian/exporter/build.xml           |   27 -
 vendor/sebastian/exporter/composer.json       |   47 -
 vendor/sebastian/exporter/phpunit.xml.dist    |   21 -
 vendor/sebastian/exporter/src/Exporter.php    |  296 ---
 .../sebastian/exporter/tests/ExporterTest.php |  333 ----
 vendor/sebastian/recursion-context/.gitignore |    9 -
 .../sebastian/recursion-context/.travis.yml   |   21 -
 vendor/sebastian/recursion-context/LICENSE    |   33 -
 vendor/sebastian/recursion-context/README.md  |   13 -
 vendor/sebastian/recursion-context/build.xml  |   27 -
 .../sebastian/recursion-context/composer.json |   36 -
 .../recursion-context/phpunit.xml.dist        |   20 -
 .../recursion-context/src/Context.php         |  153 --
 .../recursion-context/src/Exception.php       |   17 -
 .../src/InvalidArgumentException.php          |   17 -
 .../recursion-context/tests/ContextTest.php   |  144 --
 vendor/sebastian/version/.gitattributes       |    1 -
 vendor/sebastian/version/.gitignore           |    1 -
 vendor/sebastian/version/LICENSE              |   33 -
 vendor/sebastian/version/README.md            |   37 -
 vendor/sebastian/version/composer.json        |   21 -
 vendor/sebastian/version/src/Version.php      |   82 -
 vendor/symfony/yaml/.gitignore                |    3 -
 vendor/symfony/yaml/CHANGELOG.md              |    8 -
 vendor/symfony/yaml/Dumper.php                |   73 -
 vendor/symfony/yaml/Escaper.php               |   97 -
 .../symfony/yaml/Exception/DumpException.php  |   23 -
 .../yaml/Exception/ExceptionInterface.php     |   23 -
 .../symfony/yaml/Exception/ParseException.php |  148 --
 .../yaml/Exception/RuntimeException.php       |   23 -
 vendor/symfony/yaml/Inline.php                |  546 ------
 vendor/symfony/yaml/LICENSE                   |   19 -
 vendor/symfony/yaml/Parser.php                |  697 -------
 vendor/symfony/yaml/README.md                 |   21 -
 vendor/symfony/yaml/Tests/DumperTest.php      |  236 ---
 .../yaml/Tests/Fixtures/YtsAnchorAlias.yml    |   31 -
 .../yaml/Tests/Fixtures/YtsBasicTests.yml     |  202 --
 .../yaml/Tests/Fixtures/YtsBlockMapping.yml   |   51 -
 .../Tests/Fixtures/YtsDocumentSeparator.yml   |   85 -
 .../yaml/Tests/Fixtures/YtsErrorTests.yml     |   25 -
 .../Tests/Fixtures/YtsFlowCollections.yml     |   60 -
 .../yaml/Tests/Fixtures/YtsFoldedScalars.yml  |  176 --
 .../Tests/Fixtures/YtsNullsAndEmpties.yml     |   45 -
 .../Fixtures/YtsSpecificationExamples.yml     | 1697 -----------------
 .../yaml/Tests/Fixtures/YtsTypeTransfers.yml  |  244 ---
 .../yaml/Tests/Fixtures/embededPhp.yml        |    1 -
 .../yaml/Tests/Fixtures/escapedCharacters.yml |  147 --
 vendor/symfony/yaml/Tests/Fixtures/index.yml  |   18 -
 .../yaml/Tests/Fixtures/sfComments.yml        |   73 -
 .../symfony/yaml/Tests/Fixtures/sfCompact.yml |  159 --
 .../yaml/Tests/Fixtures/sfMergeKey.yml        |   45 -
 .../symfony/yaml/Tests/Fixtures/sfObjects.yml |   11 -
 .../symfony/yaml/Tests/Fixtures/sfQuotes.yml  |   33 -
 .../symfony/yaml/Tests/Fixtures/sfTests.yml   |  135 --
 .../Tests/Fixtures/unindentedCollections.yml  |   82 -
 vendor/symfony/yaml/Tests/InlineTest.php      |  384 ----
 .../symfony/yaml/Tests/ParseExceptionTest.php |   41 -
 vendor/symfony/yaml/Tests/ParserTest.php      |  755 --------
 vendor/symfony/yaml/Tests/YamlTest.php        |   37 -
 vendor/symfony/yaml/Unescaper.php             |  146 --
 vendor/symfony/yaml/Yaml.php                  |  105 -
 vendor/symfony/yaml/composer.json             |   33 -
 vendor/symfony/yaml/phpunit.xml.dist          |   28 -
 144 files changed, 13936 deletions(-)
 delete mode 100644 vendor/bin/phpunit
 delete mode 100644 vendor/sebastian/comparator/.gitignore
 delete mode 100644 vendor/sebastian/comparator/.travis.yml
 delete mode 100644 vendor/sebastian/comparator/LICENSE
 delete mode 100644 vendor/sebastian/comparator/README.md
 delete mode 100644 vendor/sebastian/comparator/build.xml
 delete mode 100644 vendor/sebastian/comparator/build/travis-ci.xml
 delete mode 100644 vendor/sebastian/comparator/composer.json
 delete mode 100644 vendor/sebastian/comparator/phpunit.xml.dist
 delete mode 100644 vendor/sebastian/comparator/src/ArrayComparator.php
 delete mode 100644 vendor/sebastian/comparator/src/Comparator.php
 delete mode 100644 vendor/sebastian/comparator/src/ComparisonFailure.php
 delete mode 100644 vendor/sebastian/comparator/src/DOMNodeComparator.php
 delete mode 100644 vendor/sebastian/comparator/src/DateTimeComparator.php
 delete mode 100644 vendor/sebastian/comparator/src/DoubleComparator.php
 delete mode 100644 vendor/sebastian/comparator/src/ExceptionComparator.php
 delete mode 100644 vendor/sebastian/comparator/src/Factory.php
 delete mode 100644 vendor/sebastian/comparator/src/MockObjectComparator.php
 delete mode 100644 vendor/sebastian/comparator/src/NumericComparator.php
 delete mode 100644 vendor/sebastian/comparator/src/ObjectComparator.php
 delete mode 100644 vendor/sebastian/comparator/src/ResourceComparator.php
 delete mode 100644 vendor/sebastian/comparator/src/ScalarComparator.php
 delete mode 100644 vendor/sebastian/comparator/src/SplObjectStorageComparator.php
 delete mode 100644 vendor/sebastian/comparator/src/TypeComparator.php
 delete mode 100644 vendor/sebastian/comparator/tests/ArrayComparatorTest.php
 delete mode 100644 vendor/sebastian/comparator/tests/DOMNodeComparatorTest.php
 delete mode 100644 vendor/sebastian/comparator/tests/DateTimeComparatorTest.php
 delete mode 100644 vendor/sebastian/comparator/tests/DoubleComparatorTest.php
 delete mode 100644 vendor/sebastian/comparator/tests/ExceptionComparatorTest.php
 delete mode 100644 vendor/sebastian/comparator/tests/FactoryTest.php
 delete mode 100644 vendor/sebastian/comparator/tests/MockObjectComparatorTest.php
 delete mode 100644 vendor/sebastian/comparator/tests/NumericComparatorTest.php
 delete mode 100644 vendor/sebastian/comparator/tests/ObjectComparatorTest.php
 delete mode 100644 vendor/sebastian/comparator/tests/ResourceComparatorTest.php
 delete mode 100644 vendor/sebastian/comparator/tests/ScalarComparatorTest.php
 delete mode 100644 vendor/sebastian/comparator/tests/SplObjectStorageComparatorTest.php
 delete mode 100644 vendor/sebastian/comparator/tests/TypeComparatorTest.php
 delete mode 100644 vendor/sebastian/comparator/tests/_files/Author.php
 delete mode 100644 vendor/sebastian/comparator/tests/_files/Book.php
 delete mode 100644 vendor/sebastian/comparator/tests/_files/ClassWithToString.php
 delete mode 100644 vendor/sebastian/comparator/tests/_files/SampleClass.php
 delete mode 100644 vendor/sebastian/comparator/tests/_files/Struct.php
 delete mode 100644 vendor/sebastian/comparator/tests/_files/TestClass.php
 delete mode 100644 vendor/sebastian/comparator/tests/_files/TestClassComparator.php
 delete mode 100644 vendor/sebastian/comparator/tests/autoload.php
 delete mode 100644 vendor/sebastian/comparator/tests/bootstrap.php
 delete mode 100644 vendor/sebastian/diff/.gitignore
 delete mode 100644 vendor/sebastian/diff/.travis.yml
 delete mode 100644 vendor/sebastian/diff/LICENSE
 delete mode 100644 vendor/sebastian/diff/README.md
 delete mode 100644 vendor/sebastian/diff/build.xml
 delete mode 100644 vendor/sebastian/diff/composer.json
 delete mode 100644 vendor/sebastian/diff/phpunit.xml.dist
 delete mode 100644 vendor/sebastian/diff/src/Chunk.php
 delete mode 100644 vendor/sebastian/diff/src/Diff.php
 delete mode 100644 vendor/sebastian/diff/src/Differ.php
 delete mode 100644 vendor/sebastian/diff/src/LCS/LongestCommonSubsequence.php
 delete mode 100644 vendor/sebastian/diff/src/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php
 delete mode 100644 vendor/sebastian/diff/src/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php
 delete mode 100644 vendor/sebastian/diff/src/Line.php
 delete mode 100644 vendor/sebastian/diff/src/Parser.php
 delete mode 100644 vendor/sebastian/diff/tests/DifferTest.php
 delete mode 100644 vendor/sebastian/diff/tests/LCS/TimeEfficientImplementationTest.php
 delete mode 100644 vendor/sebastian/diff/tests/ParserTest.php
 delete mode 100644 vendor/sebastian/diff/tests/fixtures/patch.txt
 delete mode 100644 vendor/sebastian/diff/tests/fixtures/patch2.txt
 delete mode 100644 vendor/sebastian/environment/.gitignore
 delete mode 100644 vendor/sebastian/environment/.travis.yml
 delete mode 100644 vendor/sebastian/environment/LICENSE
 delete mode 100644 vendor/sebastian/environment/README.md
 delete mode 100644 vendor/sebastian/environment/build.xml
 delete mode 100644 vendor/sebastian/environment/composer.json
 delete mode 100644 vendor/sebastian/environment/phpunit.xml.dist
 delete mode 100644 vendor/sebastian/environment/src/Console.php
 delete mode 100644 vendor/sebastian/environment/src/Runtime.php
 delete mode 100644 vendor/sebastian/environment/tests/ConsoleTest.php
 delete mode 100644 vendor/sebastian/environment/tests/RuntimeTest.php
 delete mode 100644 vendor/sebastian/exporter/.gitignore
 delete mode 100644 vendor/sebastian/exporter/.travis.yml
 delete mode 100644 vendor/sebastian/exporter/LICENSE
 delete mode 100644 vendor/sebastian/exporter/README.md
 delete mode 100644 vendor/sebastian/exporter/build.xml
 delete mode 100644 vendor/sebastian/exporter/composer.json
 delete mode 100644 vendor/sebastian/exporter/phpunit.xml.dist
 delete mode 100644 vendor/sebastian/exporter/src/Exporter.php
 delete mode 100644 vendor/sebastian/exporter/tests/ExporterTest.php
 delete mode 100644 vendor/sebastian/recursion-context/.gitignore
 delete mode 100644 vendor/sebastian/recursion-context/.travis.yml
 delete mode 100644 vendor/sebastian/recursion-context/LICENSE
 delete mode 100644 vendor/sebastian/recursion-context/README.md
 delete mode 100644 vendor/sebastian/recursion-context/build.xml
 delete mode 100644 vendor/sebastian/recursion-context/composer.json
 delete mode 100644 vendor/sebastian/recursion-context/phpunit.xml.dist
 delete mode 100644 vendor/sebastian/recursion-context/src/Context.php
 delete mode 100644 vendor/sebastian/recursion-context/src/Exception.php
 delete mode 100644 vendor/sebastian/recursion-context/src/InvalidArgumentException.php
 delete mode 100644 vendor/sebastian/recursion-context/tests/ContextTest.php
 delete mode 100644 vendor/sebastian/version/.gitattributes
 delete mode 100644 vendor/sebastian/version/.gitignore
 delete mode 100644 vendor/sebastian/version/LICENSE
 delete mode 100644 vendor/sebastian/version/README.md
 delete mode 100644 vendor/sebastian/version/composer.json
 delete mode 100644 vendor/sebastian/version/src/Version.php
 delete mode 100644 vendor/symfony/yaml/.gitignore
 delete mode 100644 vendor/symfony/yaml/CHANGELOG.md
 delete mode 100644 vendor/symfony/yaml/Dumper.php
 delete mode 100644 vendor/symfony/yaml/Escaper.php
 delete mode 100644 vendor/symfony/yaml/Exception/DumpException.php
 delete mode 100644 vendor/symfony/yaml/Exception/ExceptionInterface.php
 delete mode 100644 vendor/symfony/yaml/Exception/ParseException.php
 delete mode 100644 vendor/symfony/yaml/Exception/RuntimeException.php
 delete mode 100644 vendor/symfony/yaml/Inline.php
 delete mode 100644 vendor/symfony/yaml/LICENSE
 delete mode 100644 vendor/symfony/yaml/Parser.php
 delete mode 100644 vendor/symfony/yaml/README.md
 delete mode 100644 vendor/symfony/yaml/Tests/DumperTest.php
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsBlockMapping.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsErrorTests.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsFlowCollections.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsFoldedScalars.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsNullsAndEmpties.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/YtsTypeTransfers.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/embededPhp.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/escapedCharacters.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/index.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/sfComments.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/sfCompact.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/sfMergeKey.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/sfObjects.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/sfQuotes.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/sfTests.yml
 delete mode 100644 vendor/symfony/yaml/Tests/Fixtures/unindentedCollections.yml
 delete mode 100644 vendor/symfony/yaml/Tests/InlineTest.php
 delete mode 100644 vendor/symfony/yaml/Tests/ParseExceptionTest.php
 delete mode 100644 vendor/symfony/yaml/Tests/ParserTest.php
 delete mode 100644 vendor/symfony/yaml/Tests/YamlTest.php
 delete mode 100644 vendor/symfony/yaml/Unescaper.php
 delete mode 100644 vendor/symfony/yaml/Yaml.php
 delete mode 100644 vendor/symfony/yaml/composer.json
 delete mode 100644 vendor/symfony/yaml/phpunit.xml.dist

diff --git a/vendor/bin/phpunit b/vendor/bin/phpunit
deleted file mode 100644
index 2c489303..00000000
--- a/vendor/bin/phpunit
+++ /dev/null
@@ -1 +0,0 @@
-../phpunit/phpunit/phpunit
\ No newline at end of file
diff --git a/vendor/sebastian/comparator/.gitignore b/vendor/sebastian/comparator/.gitignore
deleted file mode 100644
index c2990fc6..00000000
--- a/vendor/sebastian/comparator/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/build/coverage
-/composer.lock
-/composer.phar
-/phpunit.xml
-/.idea
-/vendor
diff --git a/vendor/sebastian/comparator/.travis.yml b/vendor/sebastian/comparator/.travis.yml
deleted file mode 100644
index 082370fe..00000000
--- a/vendor/sebastian/comparator/.travis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-language: php
-
-sudo: false
-
-install:
-  - travis_retry composer install --no-interaction --prefer-source
-
-script: ./vendor/bin/phpunit --configuration ./build/travis-ci.xml
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-notifications:
-  email: false
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
-    on_success: always
-    on_failure: always
-    on_start: false
diff --git a/vendor/sebastian/comparator/LICENSE b/vendor/sebastian/comparator/LICENSE
deleted file mode 100644
index 334b637a..00000000
--- a/vendor/sebastian/comparator/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Comparator
-
-Copyright (c) 2002-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/comparator/README.md b/vendor/sebastian/comparator/README.md
deleted file mode 100644
index faea412b..00000000
--- a/vendor/sebastian/comparator/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-[![Build Status](https://travis-ci.org/sebastianbergmann/comparator.svg?branch=master)](https://travis-ci.org/sebastianbergmann/comparator)
-
-# Comparator
-
-This component provides the functionality to compare PHP values for equality.
-
-## Installation
-
-To add Comparator as a local, per-project dependency to your project, simply add a dependency on `sebastian/comparator` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Comparator 1.2:
-
-```JSON
-{
-    "require": {
-        "sebastian/comparator": "~1.2"
-    }
-}
-```
-
-## Usage
-
-```php
-<?php
-use SebastianBergmann\Comparator\Factory;
-use SebastianBergmann\Comparator\ComparisonFailure;
-
-$date1 = new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York'));
-$date2 = new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/Chicago'));
-
-$factory = new Factory;
-$comparator = $factory->getComparatorFor($date1, $date2);
-
-try {
-    $comparator->assertEquals($date1, $date2);
-    print "Dates match";
-}
-
-catch (ComparisonFailure $failure) {
-    print "Dates don't match";
-}
-```
-
diff --git a/vendor/sebastian/comparator/build.xml b/vendor/sebastian/comparator/build.xml
deleted file mode 100644
index 552ebce6..00000000
--- a/vendor/sebastian/comparator/build.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="comparator">
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/vendor"/>
-  <delete file="${basedir}/composer.lock"/>
- </target>
-
- <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
-  </exec>
- </target>
-
- <target name="phpab" description="Generate autoloader script">
-  <exec executable="phpab">
-   <arg value="--output" />
-   <arg path="tests/autoload.php" />
-   <arg path="tests" />
-  </exec>
- </target>
-</project>
diff --git a/vendor/sebastian/comparator/build/travis-ci.xml b/vendor/sebastian/comparator/build/travis-ci.xml
deleted file mode 100644
index 751a3bc3..00000000
--- a/vendor/sebastian/comparator/build/travis-ci.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.2/phpunit.xsd"
-         bootstrap="../tests/bootstrap.php"
-         backupGlobals="false"
-         verbose="true">
-  <testsuite name="Comparator">
-    <directory suffix="Test.php">../tests</directory>
-  </testsuite>
-</phpunit>
-
diff --git a/vendor/sebastian/comparator/composer.json b/vendor/sebastian/comparator/composer.json
deleted file mode 100644
index 79f0803f..00000000
--- a/vendor/sebastian/comparator/composer.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": "sebastian/comparator",
-    "description": "Provides the functionality to compare PHP values for equality",
-    "keywords": ["comparator","compare","equality"],
-    "homepage": "http://www.github.com/sebastianbergmann/comparator",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de"
-        },
-        {
-            "name": "Jeff Welch",
-            "email": "whatthejeff@gmail.com"
-        },
-        {
-            "name": "Volker Dusch",
-            "email": "github@wallbash.com"
-        },
-        {
-            "name": "Bernhard Schussek",
-            "email": "bschussek@2bepublished.at"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3",
-        "sebastian/diff": "~1.2",
-        "sebastian/exporter": "~1.2"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.4"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.2.x-dev"
-        }
-    }
-}
-
diff --git a/vendor/sebastian/comparator/phpunit.xml.dist b/vendor/sebastian/comparator/phpunit.xml.dist
deleted file mode 100644
index e1eaf2c8..00000000
--- a/vendor/sebastian/comparator/phpunit.xml.dist
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         bootstrap="tests/bootstrap.php"
-         backupGlobals="false"
-         verbose="true">
-  <testsuite name="Comparator">
-    <directory suffix="Test.php">tests</directory>
-  </testsuite>
-
-  <logging>
-    <log type="coverage-html" target="build/coverage"/>
-  </logging>
-
-  <filter>
-    <whitelist processUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">src</directory>
-    </whitelist>
-  </filter>
-</phpunit>
-
diff --git a/vendor/sebastian/comparator/src/ArrayComparator.php b/vendor/sebastian/comparator/src/ArrayComparator.php
deleted file mode 100644
index 80f1cdce..00000000
--- a/vendor/sebastian/comparator/src/ArrayComparator.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares arrays for equality.
- */
-class ArrayComparator extends Comparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return is_array($expected) && is_array($actual);
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @param  array             $processed
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = array())
-    {
-        if ($canonicalize) {
-            sort($expected);
-            sort($actual);
-        }
-
-        $remaining = $actual;
-        $expString = $actString = "Array (\n";
-        $equal     = true;
-
-        foreach ($expected as $key => $value) {
-            unset($remaining[$key]);
-
-            if (!array_key_exists($key, $actual)) {
-                $expString .= sprintf(
-                    "    %s => %s\n",
-                    $this->exporter->export($key),
-                    $this->exporter->shortenedExport($value)
-                );
-
-                $equal = false;
-
-                continue;
-            }
-
-            try {
-                $comparator = $this->factory->getComparatorFor($value, $actual[$key]);
-                $comparator->assertEquals($value, $actual[$key], $delta, $canonicalize, $ignoreCase, $processed);
-
-                $expString .= sprintf(
-                    "    %s => %s\n",
-                    $this->exporter->export($key),
-                    $this->exporter->shortenedExport($value)
-                );
-                $actString .= sprintf(
-                    "    %s => %s\n",
-                    $this->exporter->export($key),
-                    $this->exporter->shortenedExport($actual[$key])
-                );
-            } catch (ComparisonFailure $e) {
-                $expString .= sprintf(
-                    "    %s => %s\n",
-                    $this->exporter->export($key),
-                    $e->getExpectedAsString()
-                    ? $this->indent($e->getExpectedAsString())
-                    : $this->exporter->shortenedExport($e->getExpected())
-                );
-
-                $actString .= sprintf(
-                    "    %s => %s\n",
-                    $this->exporter->export($key),
-                    $e->getActualAsString()
-                    ? $this->indent($e->getActualAsString())
-                    : $this->exporter->shortenedExport($e->getActual())
-                );
-
-                $equal = false;
-            }
-        }
-
-        foreach ($remaining as $key => $value) {
-            $actString .= sprintf(
-                "    %s => %s\n",
-                $this->exporter->export($key),
-                $this->exporter->shortenedExport($value)
-            );
-
-            $equal = false;
-        }
-
-        $expString .= ')';
-        $actString .= ')';
-
-        if (!$equal) {
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                $expString,
-                $actString,
-                false,
-                'Failed asserting that two arrays are equal.'
-            );
-        }
-    }
-
-    protected function indent($lines)
-    {
-        return trim(str_replace("\n", "\n    ", $lines));
-    }
-}
diff --git a/vendor/sebastian/comparator/src/Comparator.php b/vendor/sebastian/comparator/src/Comparator.php
deleted file mode 100644
index ef126a41..00000000
--- a/vendor/sebastian/comparator/src/Comparator.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-use SebastianBergmann\Exporter\Exporter;
-
-/**
- * Abstract base class for comparators which compare values for equality.
- */
-abstract class Comparator
-{
-    /**
-     * @var Factory
-     */
-    protected $factory;
-
-    /**
-     * @var Exporter
-     */
-    protected $exporter;
-
-    public function __construct()
-    {
-        $this->exporter = new Exporter;
-    }
-
-    /**
-     * @param Factory $factory
-     */
-    public function setFactory(Factory $factory)
-    {
-        $this->factory = $factory;
-    }
-
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    abstract public function accepts($expected, $actual);
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    abstract public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false);
-}
diff --git a/vendor/sebastian/comparator/src/ComparisonFailure.php b/vendor/sebastian/comparator/src/ComparisonFailure.php
deleted file mode 100644
index 2c254538..00000000
--- a/vendor/sebastian/comparator/src/ComparisonFailure.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-use SebastianBergmann\Diff\Differ;
-
-/**
- * Thrown when an assertion for string equality failed.
- */
-class ComparisonFailure extends \RuntimeException
-{
-    /**
-     * Expected value of the retrieval which does not match $actual.
-     * @var mixed
-     */
-    protected $expected;
-
-    /**
-     * Actually retrieved value which does not match $expected.
-     * @var mixed
-     */
-    protected $actual;
-
-    /**
-     * The string representation of the expected value
-     * @var string
-     */
-    protected $expectedAsString;
-
-    /**
-     * The string representation of the actual value
-     * @var string
-     */
-    protected $actualAsString;
-
-    /**
-     * @var bool
-     */
-    protected $identical;
-
-    /**
-     * Optional message which is placed in front of the first line
-     * returned by toString().
-     * @var string
-     */
-    protected $message;
-
-    /**
-     * Initialises with the expected value and the actual value.
-     *
-     * @param mixed  $expected         Expected value retrieved.
-     * @param mixed  $actual           Actual value retrieved.
-     * @param string $expectedAsString
-     * @param string $actualAsString
-     * @param bool   $identical
-     * @param string $message          A string which is prefixed on all returned lines
-     *                                 in the difference output.
-     */
-    public function __construct($expected, $actual, $expectedAsString, $actualAsString, $identical = false, $message = '')
-    {
-        $this->expected         = $expected;
-        $this->actual           = $actual;
-        $this->expectedAsString = $expectedAsString;
-        $this->actualAsString   = $actualAsString;
-        $this->message          = $message;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getActual()
-    {
-        return $this->actual;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getExpected()
-    {
-        return $this->expected;
-    }
-
-    /**
-     * @return string
-     */
-    public function getActualAsString()
-    {
-        return $this->actualAsString;
-    }
-
-    /**
-     * @return string
-     */
-    public function getExpectedAsString()
-    {
-        return $this->expectedAsString;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDiff()
-    {
-        if (!$this->actualAsString && !$this->expectedAsString) {
-            return '';
-        }
-
-        $differ = new Differ("\n--- Expected\n+++ Actual\n");
-
-        return $differ->diff($this->expectedAsString, $this->actualAsString);
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->message . $this->getDiff();
-    }
-}
diff --git a/vendor/sebastian/comparator/src/DOMNodeComparator.php b/vendor/sebastian/comparator/src/DOMNodeComparator.php
deleted file mode 100644
index 4c8a39d0..00000000
--- a/vendor/sebastian/comparator/src/DOMNodeComparator.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-use DOMDocument;
-use DOMNode;
-
-/**
- * Compares DOMNode instances for equality.
- */
-class DOMNodeComparator extends ObjectComparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return $expected instanceof DOMNode && $actual instanceof DOMNode;
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        $expectedAsString = $this->nodeToText($expected, true, $ignoreCase);
-        $actualAsString   = $this->nodeToText($actual, true, $ignoreCase);
-
-        if ($expectedAsString !== $actualAsString) {
-            if ($expected instanceof DOMDocument) {
-                $type = 'documents';
-            } else {
-                $type = 'nodes';
-            }
-
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                $expectedAsString,
-                $actualAsString,
-                false,
-                sprintf("Failed asserting that two DOM %s are equal.\n", $type)
-            );
-        }
-    }
-
-    /**
-     * Returns the normalized, whitespace-cleaned, and indented textual
-     * representation of a DOMNode.
-     *
-     * @param  DOMNode $node
-     * @param  bool    $canonicalize
-     * @param  bool    $ignoreCase
-     * @return string
-     */
-    private function nodeToText(DOMNode $node, $canonicalize, $ignoreCase)
-    {
-        if ($canonicalize) {
-            $document = new DOMDocument;
-            $document->loadXML($node->C14N());
-
-            $node = $document;
-        }
-
-        if ($node instanceof DOMDocument) {
-            $document = $node;
-        } else {
-            $document = $node->ownerDocument;
-        }
-
-        $document->formatOutput = true;
-        $document->normalizeDocument();
-
-        if ($node instanceof DOMDocument) {
-            $text = $node->saveXML();
-        } else {
-            $text = $document->saveXML($node);
-        }
-
-        if ($ignoreCase) {
-            $text = strtolower($text);
-        }
-
-        return $text;
-    }
-}
diff --git a/vendor/sebastian/comparator/src/DateTimeComparator.php b/vendor/sebastian/comparator/src/DateTimeComparator.php
deleted file mode 100644
index f7bcd233..00000000
--- a/vendor/sebastian/comparator/src/DateTimeComparator.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares DateTimeInterface instances for equality.
- */
-class DateTimeComparator extends ObjectComparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return ($expected instanceof \DateTime || $expected instanceof \DateTimeInterface) &&
-            ($actual instanceof \DateTime || $actual instanceof \DateTimeInterface);
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        $delta = new \DateInterval(sprintf('PT%sS', abs($delta)));
-
-        $expectedLower = clone $expected;
-        $expectedUpper = clone $expected;
-
-        if ($actual < $expectedLower->sub($delta) ||
-            $actual > $expectedUpper->add($delta)) {
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                $this->dateTimeToString($expected),
-                $this->dateTimeToString($actual),
-                false,
-                'Failed asserting that two DateTime objects are equal.'
-            );
-        }
-    }
-
-    /**
-     * Returns an ISO 8601 formatted string representation of a datetime or
-     * 'Invalid DateTimeInterface object' if the provided DateTimeInterface was not properly
-     * initialized.
-     *
-     * @param  \DateTimeInterface $datetime
-     * @return string
-     */
-    protected function dateTimeToString($datetime)
-    {
-        $string = $datetime->format(\DateTime::ISO8601);
-
-        return $string ? $string : 'Invalid DateTimeInterface object';
-    }
-}
diff --git a/vendor/sebastian/comparator/src/DoubleComparator.php b/vendor/sebastian/comparator/src/DoubleComparator.php
deleted file mode 100644
index 051f6680..00000000
--- a/vendor/sebastian/comparator/src/DoubleComparator.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares doubles for equality.
- */
-class DoubleComparator extends NumericComparator
-{
-    /**
-     * Smallest value available in PHP.
-     *
-     * @var float
-     */
-    const EPSILON = 0.0000000001;
-
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return (is_double($expected) || is_double($actual)) && is_numeric($expected) && is_numeric($actual);
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        if ($delta == 0) {
-            $delta = self::EPSILON;
-        }
-
-        parent::assertEquals($expected, $actual, $delta, $canonicalize, $ignoreCase);
-    }
-}
diff --git a/vendor/sebastian/comparator/src/ExceptionComparator.php b/vendor/sebastian/comparator/src/ExceptionComparator.php
deleted file mode 100644
index 52336464..00000000
--- a/vendor/sebastian/comparator/src/ExceptionComparator.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares Exception instances for equality.
- */
-class ExceptionComparator extends ObjectComparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return $expected instanceof \Exception && $actual instanceof \Exception;
-    }
-
-    /**
-     * Converts an object to an array containing all of its private, protected
-     * and public properties.
-     *
-     * @param  object $object
-     * @return array
-     */
-    protected function toArray($object)
-    {
-        $array = parent::toArray($object);
-
-        unset(
-            $array['file'],
-            $array['line'],
-            $array['trace'],
-            $array['string'],
-            $array['xdebug_message']
-        );
-
-        return $array;
-    }
-}
diff --git a/vendor/sebastian/comparator/src/Factory.php b/vendor/sebastian/comparator/src/Factory.php
deleted file mode 100644
index ed3d5e14..00000000
--- a/vendor/sebastian/comparator/src/Factory.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Factory for comparators which compare values for equality.
- */
-class Factory
-{
-    /**
-     * @var Comparator[]
-     */
-    private $comparators = array();
-
-    /**
-     * @var Factory
-     */
-    private static $instance;
-
-    /**
-     * Constructs a new factory.
-     */
-    public function __construct()
-    {
-        $this->register(new TypeComparator);
-        $this->register(new ScalarComparator);
-        $this->register(new NumericComparator);
-        $this->register(new DoubleComparator);
-        $this->register(new ArrayComparator);
-        $this->register(new ResourceComparator);
-        $this->register(new ObjectComparator);
-        $this->register(new ExceptionComparator);
-        $this->register(new SplObjectStorageComparator);
-        $this->register(new DOMNodeComparator);
-        $this->register(new MockObjectComparator);
-        $this->register(new DateTimeComparator);
-    }
-
-    /**
-     * @return Factory
-     */
-    public static function getInstance()
-    {
-        if (self::$instance === null) {
-            self::$instance = new self;
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * Returns the correct comparator for comparing two values.
-     *
-     * @param  mixed      $expected The first value to compare
-     * @param  mixed      $actual   The second value to compare
-     * @return Comparator
-     */
-    public function getComparatorFor($expected, $actual)
-    {
-        foreach ($this->comparators as $comparator) {
-            if ($comparator->accepts($expected, $actual)) {
-                return $comparator;
-            }
-        }
-    }
-
-    /**
-     * Registers a new comparator.
-     *
-     * This comparator will be returned by getInstance() if its accept() method
-     * returns TRUE for the compared values. It has higher priority than the
-     * existing comparators, meaning that its accept() method will be tested
-     * before those of the other comparators.
-     *
-     * @param Comparator $comparator The registered comparator
-     */
-    public function register(Comparator $comparator)
-    {
-        array_unshift($this->comparators, $comparator);
-
-        $comparator->setFactory($this);
-    }
-
-    /**
-     * Unregisters a comparator.
-     *
-     * This comparator will no longer be returned by getInstance().
-     *
-     * @param Comparator $comparator The unregistered comparator
-     */
-    public function unregister(Comparator $comparator)
-    {
-        foreach ($this->comparators as $key => $_comparator) {
-            if ($comparator === $_comparator) {
-                unset($this->comparators[$key]);
-            }
-        }
-    }
-}
diff --git a/vendor/sebastian/comparator/src/MockObjectComparator.php b/vendor/sebastian/comparator/src/MockObjectComparator.php
deleted file mode 100644
index a16903c6..00000000
--- a/vendor/sebastian/comparator/src/MockObjectComparator.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares PHPUnit_Framework_MockObject_MockObject instances for equality.
- */
-class MockObjectComparator extends ObjectComparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return $expected instanceof \PHPUnit_Framework_MockObject_MockObject && $actual instanceof \PHPUnit_Framework_MockObject_MockObject;
-    }
-
-    /**
-     * Converts an object to an array containing all of its private, protected
-     * and public properties.
-     *
-     * @param  object $object
-     * @return array
-     */
-    protected function toArray($object)
-    {
-        $array = parent::toArray($object);
-
-        unset($array['__phpunit_invocationMocker']);
-
-        return $array;
-    }
-}
\ No newline at end of file
diff --git a/vendor/sebastian/comparator/src/NumericComparator.php b/vendor/sebastian/comparator/src/NumericComparator.php
deleted file mode 100644
index 90890c08..00000000
--- a/vendor/sebastian/comparator/src/NumericComparator.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares numerical values for equality.
- */
-class NumericComparator extends ScalarComparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        // all numerical values, but not if one of them is a double
-        // or both of them are strings
-        return is_numeric($expected) && is_numeric($actual) &&
-               !(is_double($expected) || is_double($actual)) &&
-               !(is_string($expected) && is_string($actual));
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        if (is_infinite($actual) && is_infinite($expected)) {
-            return;
-        }
-
-        if ((is_infinite($actual) xor is_infinite($expected)) ||
-            (is_nan($actual) or is_nan($expected)) ||
-            abs($actual - $expected) > $delta) {
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                '',
-                '',
-                false,
-                sprintf(
-                    'Failed asserting that %s matches expected %s.',
-                    $this->exporter->export($actual),
-                    $this->exporter->export($expected)
-                )
-            );
-        }
-    }
-}
diff --git a/vendor/sebastian/comparator/src/ObjectComparator.php b/vendor/sebastian/comparator/src/ObjectComparator.php
deleted file mode 100644
index 08ffb677..00000000
--- a/vendor/sebastian/comparator/src/ObjectComparator.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares objects for equality.
- */
-class ObjectComparator extends ArrayComparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return is_object($expected) && is_object($actual);
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @param  array             $processed
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = array())
-    {
-        if (get_class($actual) !== get_class($expected)) {
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                $this->exporter->export($expected),
-                $this->exporter->export($actual),
-                false,
-                sprintf(
-                    '%s is not instance of expected class "%s".',
-                    $this->exporter->export($actual),
-                    get_class($expected)
-                )
-            );
-        }
-
-        // don't compare twice to allow for cyclic dependencies
-        if (in_array(array($actual, $expected), $processed, true) ||
-            in_array(array($expected, $actual), $processed, true)) {
-            return;
-        }
-
-        $processed[] = array($actual, $expected);
-
-        // don't compare objects if they are identical
-        // this helps to avoid the error "maximum function nesting level reached"
-        // CAUTION: this conditional clause is not tested
-        if ($actual !== $expected) {
-            try {
-                parent::assertEquals(
-                    $this->toArray($expected),
-                    $this->toArray($actual),
-                    $delta,
-                    $canonicalize,
-                    $ignoreCase,
-                    $processed
-                );
-            } catch (ComparisonFailure $e) {
-                throw new ComparisonFailure(
-                    $expected,
-                    $actual,
-                    // replace "Array" with "MyClass object"
-                    substr_replace($e->getExpectedAsString(), get_class($expected) . ' Object', 0, 5),
-                    substr_replace($e->getActualAsString(), get_class($actual) . ' Object', 0, 5),
-                    false,
-                    'Failed asserting that two objects are equal.'
-                );
-            }
-        }
-    }
-
-    /**
-     * Converts an object to an array containing all of its private, protected
-     * and public properties.
-     *
-     * @param  object $object
-     * @return array
-     */
-    protected function toArray($object)
-    {
-        return $this->exporter->toArray($object);
-    }
-}
diff --git a/vendor/sebastian/comparator/src/ResourceComparator.php b/vendor/sebastian/comparator/src/ResourceComparator.php
deleted file mode 100644
index 877cc7da..00000000
--- a/vendor/sebastian/comparator/src/ResourceComparator.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares resources for equality.
- */
-class ResourceComparator extends Comparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return is_resource($expected) && is_resource($actual);
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        if ($actual != $expected) {
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                $this->exporter->export($expected),
-                $this->exporter->export($actual)
-            );
-        }
-    }
-}
diff --git a/vendor/sebastian/comparator/src/ScalarComparator.php b/vendor/sebastian/comparator/src/ScalarComparator.php
deleted file mode 100644
index df5a7464..00000000
--- a/vendor/sebastian/comparator/src/ScalarComparator.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares scalar or NULL values for equality.
- */
-class ScalarComparator extends Comparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     * @since  Method available since Release 3.6.0
-     */
-    public function accepts($expected, $actual)
-    {
-        return ((is_scalar($expected) xor null === $expected) &&
-               (is_scalar($actual) xor null === $actual))
-               // allow comparison between strings and objects featuring __toString()
-               || (is_string($expected) && is_object($actual) && method_exists($actual, '__toString'))
-               || (is_object($expected) && method_exists($expected, '__toString') && is_string($actual));
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        $expectedToCompare = $expected;
-        $actualToCompare   = $actual;
-
-        // always compare as strings to avoid strange behaviour
-        // otherwise 0 == 'Foobar'
-        if (is_string($expected) || is_string($actual)) {
-            $expectedToCompare = (string) $expectedToCompare;
-            $actualToCompare   = (string) $actualToCompare;
-
-            if ($ignoreCase) {
-                $expectedToCompare = strtolower($expectedToCompare);
-                $actualToCompare   = strtolower($actualToCompare);
-            }
-        }
-
-        if ($expectedToCompare != $actualToCompare) {
-            if (is_string($expected) && is_string($actual)) {
-                throw new ComparisonFailure(
-                    $expected,
-                    $actual,
-                    $this->exporter->export($expected),
-                    $this->exporter->export($actual),
-                    false,
-                    'Failed asserting that two strings are equal.'
-                );
-            }
-
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                // no diff is required
-                '',
-                '',
-                false,
-                sprintf(
-                    'Failed asserting that %s matches expected %s.',
-                    $this->exporter->export($actual),
-                    $this->exporter->export($expected)
-                )
-            );
-        }
-    }
-}
diff --git a/vendor/sebastian/comparator/src/SplObjectStorageComparator.php b/vendor/sebastian/comparator/src/SplObjectStorageComparator.php
deleted file mode 100644
index a1ec1198..00000000
--- a/vendor/sebastian/comparator/src/SplObjectStorageComparator.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares \SplObjectStorage instances for equality.
- */
-class SplObjectStorageComparator extends Comparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return $expected instanceof \SplObjectStorage && $actual instanceof \SplObjectStorage;
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        foreach ($actual as $object) {
-            if (!$expected->contains($object)) {
-                throw new ComparisonFailure(
-                    $expected,
-                    $actual,
-                    $this->exporter->export($expected),
-                    $this->exporter->export($actual),
-                    false,
-                    'Failed asserting that two objects are equal.'
-                );
-            }
-        }
-
-        foreach ($expected as $object) {
-            if (!$actual->contains($object)) {
-                throw new ComparisonFailure(
-                    $expected,
-                    $actual,
-                    $this->exporter->export($expected),
-                    $this->exporter->export($actual),
-                    false,
-                    'Failed asserting that two objects are equal.'
-                );
-            }
-        }
-    }
-}
diff --git a/vendor/sebastian/comparator/src/TypeComparator.php b/vendor/sebastian/comparator/src/TypeComparator.php
deleted file mode 100644
index 6fe20779..00000000
--- a/vendor/sebastian/comparator/src/TypeComparator.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares values for type equality.
- */
-class TypeComparator extends Comparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return true;
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        if (gettype($expected) != gettype($actual)) {
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                // we don't need a diff
-                '',
-                '',
-                false,
-                sprintf(
-                    '%s does not match expected type "%s".',
-                    $this->exporter->shortenedExport($actual),
-                    gettype($expected)
-                )
-            );
-        }
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/ArrayComparatorTest.php b/vendor/sebastian/comparator/tests/ArrayComparatorTest.php
deleted file mode 100644
index ee44615b..00000000
--- a/vendor/sebastian/comparator/tests/ArrayComparatorTest.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * @coversDefaultClass SebastianBergmann\Comparator\ArrayComparator
- *
- */
-class ArrayComparatorTest extends \PHPUnit_Framework_TestCase
-{
-    private $comparator;
-
-    protected function setUp()
-    {
-        $this->comparator = new ArrayComparator;
-        $this->comparator->setFactory(new Factory);
-    }
-
-    public function acceptsFailsProvider()
-    {
-        return array(
-          array(array(), null),
-          array(null, array()),
-          array(null, null)
-        );
-    }
-
-    public function assertEqualsSucceedsProvider()
-    {
-        return array(
-          array(
-            array('a' => 1, 'b' => 2),
-            array('b' => 2, 'a' => 1)
-          ),
-          array(
-            array(1),
-            array('1')
-          ),
-          array(
-            array(3, 2, 1),
-            array(2, 3, 1),
-            0,
-            true
-          ),
-          array(
-            array(2.3),
-            array(2.5),
-            0.5
-          ),
-          array(
-            array(array(2.3)),
-            array(array(2.5)),
-            0.5
-          ),
-          array(
-            array(new Struct(2.3)),
-            array(new Struct(2.5)),
-            0.5
-          ),
-        );
-    }
-
-    public function assertEqualsFailsProvider()
-    {
-        return array(
-          array(
-            array(),
-            array(0 => 1)
-          ),
-          array(
-            array(0 => 1),
-            array()
-          ),
-          array(
-            array(0 => null),
-            array()
-          ),
-          array(
-            array(0 => 1, 1 => 2),
-            array(0 => 1, 1 => 3)
-          ),
-          array(
-            array('a', 'b' => array(1, 2)),
-            array('a', 'b' => array(2, 1))
-          ),
-          array(
-            array(2.3),
-            array(4.2),
-            0.5
-          ),
-          array(
-            array(array(2.3)),
-            array(array(4.2)),
-            0.5
-          ),
-          array(
-            array(new Struct(2.3)),
-            array(new Struct(4.2)),
-            0.5
-          )
-        );
-    }
-
-    /**
-     * @covers  ::accepts
-     */
-    public function testAcceptsSucceeds()
-    {
-        $this->assertTrue(
-          $this->comparator->accepts(array(), array())
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsFailsProvider
-     */
-    public function testAcceptsFails($expected, $actual)
-    {
-        $this->assertFalse(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsSucceedsProvider
-     */
-    public function testAssertEqualsSucceeds($expected, $actual, $delta = 0.0, $canonicalize = false)
-    {
-        $exception = null;
-
-        try {
-            $this->comparator->assertEquals($expected, $actual, $delta, $canonicalize);
-        }
-
-        catch (ComparisonFailure $exception) {
-        }
-
-        $this->assertNull($exception, 'Unexpected ComparisonFailure');
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsFailsProvider
-     */
-    public function testAssertEqualsFails($expected, $actual,$delta = 0.0, $canonicalize = false)
-    {
-        $this->setExpectedException(
-          'SebastianBergmann\\Comparator\\ComparisonFailure',
-          'Failed asserting that two arrays are equal'
-        );
-        $this->comparator->assertEquals($expected, $actual, $delta, $canonicalize);
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/DOMNodeComparatorTest.php b/vendor/sebastian/comparator/tests/DOMNodeComparatorTest.php
deleted file mode 100644
index a769b84c..00000000
--- a/vendor/sebastian/comparator/tests/DOMNodeComparatorTest.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-use DOMNode;
-use DOMDocument;
-
-/**
- * @coversDefaultClass SebastianBergmann\Comparator\DOMNodeComparator
- *
- */
-class DOMNodeComparatorTest extends \PHPUnit_Framework_TestCase
-{
-    private $comparator;
-
-    protected function setUp()
-    {
-        $this->comparator = new DOMNodeComparator;
-    }
-
-    public function acceptsSucceedsProvider()
-    {
-        $document = new DOMDocument;
-        $node = new DOMNode;
-
-        return array(
-          array($document, $document),
-          array($node, $node),
-          array($document, $node),
-          array($node, $document)
-        );
-    }
-
-    public function acceptsFailsProvider()
-    {
-        $document = new DOMDocument;
-
-        return array(
-          array($document, null),
-          array(null, $document),
-          array(null, null)
-        );
-    }
-
-    public function assertEqualsSucceedsProvider()
-    {
-        return array(
-          array(
-            $this->createDOMDocument('<root></root>'),
-            $this->createDOMDocument('<root/>')
-          ),
-          array(
-            $this->createDOMDocument('<root attr="bar"></root>'),
-            $this->createDOMDocument('<root attr="bar"/>')
-          ),
-          array(
-            $this->createDOMDocument('<root><foo attr="bar"></foo></root>'),
-            $this->createDOMDocument('<root><foo attr="bar"/></root>')
-          ),
-          array(
-            $this->createDOMDocument("<root>\n  <child/>\n</root>"),
-            $this->createDOMDocument('<root><child/></root>')
-          ),
-        );
-    }
-
-    public function assertEqualsFailsProvider()
-    {
-        return array(
-          array(
-            $this->createDOMDocument('<root></root>'),
-            $this->createDOMDocument('<bar/>')
-          ),
-          array(
-            $this->createDOMDocument('<foo attr1="bar"/>'),
-            $this->createDOMDocument('<foo attr1="foobar"/>')
-          ),
-          array(
-            $this->createDOMDocument('<foo> bar </foo>'),
-            $this->createDOMDocument('<foo />')
-          ),
-          array(
-            $this->createDOMDocument('<foo xmlns="urn:myns:bar"/>'),
-            $this->createDOMDocument('<foo xmlns="urn:notmyns:bar"/>')
-          ),
-          array(
-            $this->createDOMDocument('<foo> bar </foo>'),
-            $this->createDOMDocument('<foo> bir </foo>')
-          )
-        );
-    }
-
-    private function createDOMDocument($content)
-    {
-        $document = new DOMDocument;
-        $document->preserveWhiteSpace = false;
-        $document->loadXML($content);
-
-        return $document;
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsSucceedsProvider
-     */
-    public function testAcceptsSucceeds($expected, $actual)
-    {
-        $this->assertTrue(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsFailsProvider
-     */
-    public function testAcceptsFails($expected, $actual)
-    {
-        $this->assertFalse(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsSucceedsProvider
-     */
-    public function testAssertEqualsSucceeds($expected, $actual)
-    {
-        $exception = null;
-
-        try {
-            $this->comparator->assertEquals($expected, $actual);
-        }
-
-        catch (ComparisonFailure $exception) {
-        }
-
-        $this->assertNull($exception, 'Unexpected ComparisonFailure');
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsFailsProvider
-     */
-    public function testAssertEqualsFails($expected, $actual)
-    {
-        $this->setExpectedException(
-          'SebastianBergmann\\Comparator\\ComparisonFailure',
-          'Failed asserting that two DOM'
-        );
-        $this->comparator->assertEquals($expected, $actual);
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/DateTimeComparatorTest.php b/vendor/sebastian/comparator/tests/DateTimeComparatorTest.php
deleted file mode 100644
index 9abcff76..00000000
--- a/vendor/sebastian/comparator/tests/DateTimeComparatorTest.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-use DateTime;
-use DateTimeImmutable;
-use DateTimeZone;
-
-/**
- * @coversDefaultClass SebastianBergmann\Comparator\DateTimeComparator
- *
- */
-class DateTimeComparatorTest extends \PHPUnit_Framework_TestCase
-{
-    private $comparator;
-
-    protected function setUp()
-    {
-        $this->comparator = new DateTimeComparator;
-    }
-
-    public function acceptsFailsProvider()
-    {
-        $datetime = new DateTime;
-
-        return array(
-          array($datetime, null),
-          array(null, $datetime),
-          array(null, null)
-        );
-    }
-
-    public function assertEqualsSucceedsProvider()
-    {
-        return array(
-          array(
-            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York'))
-          ),
-          array(
-            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-29 04:13:25', new DateTimeZone('America/New_York')),
-            10
-          ),
-          array(
-            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-29 04:14:40', new DateTimeZone('America/New_York')),
-            65
-          ),
-          array(
-            new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-29', new DateTimeZone('America/New_York'))
-          ),
-          array(
-            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/Chicago'))
-          ),
-          array(
-            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-29 03:13:49', new DateTimeZone('America/Chicago')),
-            15
-          ),
-          array(
-            new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-29 23:00:00', new DateTimeZone('America/Chicago'))
-          ),
-          array(
-            new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-29 23:01:30', new DateTimeZone('America/Chicago')),
-            100
-          ),
-          array(
-            new DateTime('@1364616000'),
-            new DateTime('2013-03-29 23:00:00', new DateTimeZone('America/Chicago'))
-          ),
-          array(
-            new DateTime('2013-03-29T05:13:35-0500'),
-            new DateTime('2013-03-29T04:13:35-0600')
-          )
-        );
-    }
-
-    public function assertEqualsFailsProvider()
-    {
-        return array(
-          array(
-            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/New_York'))
-          ),
-          array(
-            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/New_York')),
-            3500
-          ),
-          array(
-            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-29 05:13:35', new DateTimeZone('America/New_York')),
-            3500
-          ),
-          array(
-            new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-30', new DateTimeZone('America/New_York'))
-          ),
-          array(
-            new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
-            43200
-          ),
-          array(
-            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/Chicago')),
-          ),
-          array(
-            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/Chicago')),
-            3500
-          ),
-          array(
-            new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
-            new DateTime('2013-03-30', new DateTimeZone('America/Chicago'))
-          ),
-          array(
-            new DateTime('2013-03-29T05:13:35-0600'),
-            new DateTime('2013-03-29T04:13:35-0600')
-          ),
-          array(
-            new DateTime('2013-03-29T05:13:35-0600'),
-            new DateTime('2013-03-29T05:13:35-0500')
-          ),
-        );
-    }
-
-    /**
-     * @covers  ::accepts
-     */
-    public function testAcceptsSucceeds()
-    {
-        $this->assertTrue(
-          $this->comparator->accepts(
-            new DateTime,
-            new DateTime
-          )
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsFailsProvider
-     */
-    public function testAcceptsFails($expected, $actual)
-    {
-        $this->assertFalse(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsSucceedsProvider
-     */
-    public function testAssertEqualsSucceeds($expected, $actual, $delta = 0.0)
-    {
-        $exception = null;
-
-        try {
-            $this->comparator->assertEquals($expected, $actual, $delta);
-        }
-
-        catch (ComparisonFailure $exception) {
-        }
-
-        $this->assertNull($exception, 'Unexpected ComparisonFailure');
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsFailsProvider
-     */
-    public function testAssertEqualsFails($expected, $actual, $delta = 0.0)
-    {
-        $this->setExpectedException(
-          'SebastianBergmann\\Comparator\\ComparisonFailure',
-          'Failed asserting that two DateTime objects are equal.'
-        );
-        $this->comparator->assertEquals($expected, $actual, $delta);
-    }
-
-    /**
-     * @requires PHP 5.5
-     * @covers   ::accepts
-     */
-    public function testAcceptsDateTimeInterface()
-    {
-        $this->assertTrue($this->comparator->accepts(new DateTime, new DateTimeImmutable));
-    }
-
-    /**
-     * @requires PHP 5.5
-     * @covers   ::assertEquals
-     */
-    public function testSupportsDateTimeInterface()
-    {
-        $this->comparator->assertEquals(
-          new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
-          new DateTimeImmutable('2013-03-29 04:13:35', new DateTimeZone('America/New_York'))
-        );
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/DoubleComparatorTest.php b/vendor/sebastian/comparator/tests/DoubleComparatorTest.php
deleted file mode 100644
index 6b898bab..00000000
--- a/vendor/sebastian/comparator/tests/DoubleComparatorTest.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * @coversDefaultClass SebastianBergmann\Comparator\DoubleComparator
- *
- */
-class DoubleComparatorTest extends \PHPUnit_Framework_TestCase
-{
-    private $comparator;
-
-    protected function setUp()
-    {
-        $this->comparator = new DoubleComparator;
-    }
-
-    public function acceptsSucceedsProvider()
-    {
-        return array(
-          array(0, 5.0),
-          array(5.0, 0),
-          array('5', 4.5),
-          array(1.2e3, 7E-10),
-          array(3, acos(8)),
-          array(acos(8), 3),
-          array(acos(8), acos(8))
-        );
-    }
-
-    public function acceptsFailsProvider()
-    {
-        return array(
-          array(5, 5),
-          array('4.5', 5),
-          array(0x539, 02471),
-          array(5.0, false),
-          array(null, 5.0)
-        );
-    }
-
-    public function assertEqualsSucceedsProvider()
-    {
-        return array(
-          array(2.3, 2.3),
-          array('2.3', 2.3),
-          array(5.0, 5),
-          array(5, 5.0),
-          array(5.0, '5'),
-          array(1.2e3, 1200),
-          array(2.3, 2.5, 0.5),
-          array(3, 3.05, 0.05),
-          array(1.2e3, 1201, 1),
-          array((string)(1/3), 1 - 2/3),
-          array(1/3, (string)(1 - 2/3))
-        );
-    }
-
-    public function assertEqualsFailsProvider()
-    {
-        return array(
-          array(2.3, 4.2),
-          array('2.3', 4.2),
-          array(5.0, '4'),
-          array(5.0, 6),
-          array(1.2e3, 1201),
-          array(2.3, 2.5, 0.2),
-          array(3, 3.05, 0.04),
-          array(3, acos(8)),
-          array(acos(8), 3),
-          array(acos(8), acos(8))
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsSucceedsProvider
-     */
-    public function testAcceptsSucceeds($expected, $actual)
-    {
-        $this->assertTrue(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsFailsProvider
-     */
-    public function testAcceptsFails($expected, $actual)
-    {
-        $this->assertFalse(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsSucceedsProvider
-     */
-    public function testAssertEqualsSucceeds($expected, $actual, $delta = 0.0)
-    {
-        $exception = null;
-
-        try {
-            $this->comparator->assertEquals($expected, $actual, $delta);
-        }
-
-        catch (ComparisonFailure $exception) {
-        }
-
-        $this->assertNull($exception, 'Unexpected ComparisonFailure');
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsFailsProvider
-     */
-    public function testAssertEqualsFails($expected, $actual, $delta = 0.0)
-    {
-        $this->setExpectedException(
-          'SebastianBergmann\\Comparator\\ComparisonFailure', 'matches expected'
-        );
-        $this->comparator->assertEquals($expected, $actual, $delta);
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/ExceptionComparatorTest.php b/vendor/sebastian/comparator/tests/ExceptionComparatorTest.php
deleted file mode 100644
index fa8cc0a3..00000000
--- a/vendor/sebastian/comparator/tests/ExceptionComparatorTest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-use \Exception;
-use \RuntimeException;
-
-/**
- * @coversDefaultClass SebastianBergmann\Comparator\ExceptionComparator
- *
- */
-class ExceptionComparatorTest extends \PHPUnit_Framework_TestCase
-{
-    private $comparator;
-
-    protected function setUp()
-    {
-        $this->comparator = new ExceptionComparator;
-        $this->comparator->setFactory(new Factory);
-    }
-
-    public function acceptsSucceedsProvider()
-    {
-        return array(
-          array(new Exception, new Exception),
-          array(new RuntimeException, new RuntimeException),
-          array(new Exception, new RuntimeException)
-        );
-    }
-
-    public function acceptsFailsProvider()
-    {
-        return array(
-          array(new Exception, null),
-          array(null, new Exception),
-          array(null, null)
-        );
-    }
-
-    public function assertEqualsSucceedsProvider()
-    {
-        $exception1 = new Exception;
-        $exception2 = new Exception;
-
-        $exception3 = new RunTimeException('Error', 100);
-        $exception4 = new RunTimeException('Error', 100);
-
-        return array(
-          array($exception1, $exception1),
-          array($exception1, $exception2),
-          array($exception3, $exception3),
-          array($exception3, $exception4)
-        );
-    }
-
-    public function assertEqualsFailsProvider()
-    {
-        $typeMessage = 'not instance of expected class';
-        $equalMessage = 'Failed asserting that two objects are equal.';
-
-        $exception1 = new Exception('Error', 100);
-        $exception2 = new Exception('Error', 101);
-        $exception3 = new Exception('Errors', 101);
-
-        $exception4 = new RunTimeException('Error', 100);
-        $exception5 = new RunTimeException('Error', 101);
-
-        return array(
-          array($exception1, $exception2, $equalMessage),
-          array($exception1, $exception3, $equalMessage),
-          array($exception1, $exception4, $typeMessage),
-          array($exception2, $exception3, $equalMessage),
-          array($exception4, $exception5, $equalMessage)
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsSucceedsProvider
-     */
-    public function testAcceptsSucceeds($expected, $actual)
-    {
-        $this->assertTrue(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsFailsProvider
-     */
-    public function testAcceptsFails($expected, $actual)
-    {
-        $this->assertFalse(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsSucceedsProvider
-     */
-    public function testAssertEqualsSucceeds($expected, $actual)
-    {
-        $exception = null;
-
-        try {
-            $this->comparator->assertEquals($expected, $actual);
-        }
-
-        catch (ComparisonFailure $exception) {
-        }
-
-        $this->assertNull($exception, 'Unexpected ComparisonFailure');
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsFailsProvider
-     */
-    public function testAssertEqualsFails($expected, $actual, $message)
-    {
-        $this->setExpectedException(
-          'SebastianBergmann\\Comparator\\ComparisonFailure', $message
-        );
-        $this->comparator->assertEquals($expected, $actual);
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/FactoryTest.php b/vendor/sebastian/comparator/tests/FactoryTest.php
deleted file mode 100644
index cb58c20c..00000000
--- a/vendor/sebastian/comparator/tests/FactoryTest.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * @coversDefaultClass SebastianBergmann\Comparator\Factory
- *
- */
-class FactoryTest extends \PHPUnit_Framework_TestCase
-{
-    public function instanceProvider()
-    {
-        $tmpfile = tmpfile();
-
-        return array(
-            array(NULL, NULL, 'SebastianBergmann\\Comparator\\ScalarComparator'),
-            array(NULL, TRUE, 'SebastianBergmann\\Comparator\\ScalarComparator'),
-            array(TRUE, NULL, 'SebastianBergmann\\Comparator\\ScalarComparator'),
-            array(TRUE, TRUE, 'SebastianBergmann\\Comparator\\ScalarComparator'),
-            array(FALSE, FALSE, 'SebastianBergmann\\Comparator\\ScalarComparator'),
-            array(TRUE, FALSE, 'SebastianBergmann\\Comparator\\ScalarComparator'),
-            array(FALSE, TRUE, 'SebastianBergmann\\Comparator\\ScalarComparator'),
-            array('', '', 'SebastianBergmann\\Comparator\\ScalarComparator'),
-            array('0', '0', 'SebastianBergmann\\Comparator\\ScalarComparator'),
-            array('0', 0, 'SebastianBergmann\\Comparator\\NumericComparator'),
-            array(0, '0', 'SebastianBergmann\\Comparator\\NumericComparator'),
-            array(0, 0, 'SebastianBergmann\\Comparator\\NumericComparator'),
-            array(1.0, 0, 'SebastianBergmann\\Comparator\\DoubleComparator'),
-            array(0, 1.0, 'SebastianBergmann\\Comparator\\DoubleComparator'),
-            array(1.0, 1.0, 'SebastianBergmann\\Comparator\\DoubleComparator'),
-            array(array(1), array(1), 'SebastianBergmann\\Comparator\\ArrayComparator'),
-            array($tmpfile, $tmpfile, 'SebastianBergmann\\Comparator\\ResourceComparator'),
-            array(new \stdClass, new \stdClass, 'SebastianBergmann\\Comparator\\ObjectComparator'),
-            array(new \DateTime, new \DateTime, 'SebastianBergmann\\Comparator\\DateTimeComparator'),
-            array(new \SplObjectStorage, new \SplObjectStorage, 'SebastianBergmann\\Comparator\\SplObjectStorageComparator'),
-            array(new \Exception, new \Exception, 'SebastianBergmann\\Comparator\\ExceptionComparator'),
-            array(new \DOMDocument, new \DOMDocument, 'SebastianBergmann\\Comparator\\DOMNodeComparator'),
-            // mixed types
-            array($tmpfile, array(1), 'SebastianBergmann\\Comparator\\TypeComparator'),
-            array(array(1), $tmpfile, 'SebastianBergmann\\Comparator\\TypeComparator'),
-            array($tmpfile, '1', 'SebastianBergmann\\Comparator\\TypeComparator'),
-            array('1', $tmpfile, 'SebastianBergmann\\Comparator\\TypeComparator'),
-            array($tmpfile, new \stdClass, 'SebastianBergmann\\Comparator\\TypeComparator'),
-            array(new \stdClass, $tmpfile, 'SebastianBergmann\\Comparator\\TypeComparator'),
-            array(new \stdClass, array(1), 'SebastianBergmann\\Comparator\\TypeComparator'),
-            array(array(1), new \stdClass, 'SebastianBergmann\\Comparator\\TypeComparator'),
-            array(new \stdClass, '1', 'SebastianBergmann\\Comparator\\TypeComparator'),
-            array('1', new \stdClass, 'SebastianBergmann\\Comparator\\TypeComparator'),
-            array(new ClassWithToString, '1', 'SebastianBergmann\\Comparator\\ScalarComparator'),
-            array('1', new ClassWithToString, 'SebastianBergmann\\Comparator\\ScalarComparator'),
-            array(1.0, new \stdClass, 'SebastianBergmann\\Comparator\\TypeComparator'),
-            array(new \stdClass, 1.0, 'SebastianBergmann\\Comparator\\TypeComparator'),
-            array(1.0, array(1), 'SebastianBergmann\\Comparator\\TypeComparator'),
-            array(array(1), 1.0, 'SebastianBergmann\\Comparator\\TypeComparator'),
-        );
-    }
-
-    /**
-     * @dataProvider instanceProvider
-     * @covers       ::getComparatorFor
-     * @covers       ::__construct
-     */
-    public function testGetComparatorFor($a, $b, $expected)
-    {
-        $factory = new Factory;
-        $actual = $factory->getComparatorFor($a, $b);
-        $this->assertInstanceOf($expected, $actual);
-    }
-
-    /**
-     * @covers ::register
-     */
-    public function testRegister()
-    {
-        $comparator = new TestClassComparator;
-
-        $factory = new Factory;
-        $factory->register($comparator);
-
-        $a = new TestClass;
-        $b = new TestClass;
-        $expected = 'SebastianBergmann\\Comparator\\TestClassComparator';
-        $actual = $factory->getComparatorFor($a, $b);
-
-        $factory->unregister($comparator);
-        $this->assertInstanceOf($expected, $actual);
-    }
-
-    /**
-     * @covers ::unregister
-     */
-    public function testUnregister()
-    {
-        $comparator = new TestClassComparator;
-
-        $factory = new Factory;
-        $factory->register($comparator);
-        $factory->unregister($comparator);
-
-        $a = new TestClass;
-        $b = new TestClass;
-        $expected = 'SebastianBergmann\\Comparator\\ObjectComparator';
-        $actual = $factory->getComparatorFor($a, $b);
-
-        $this->assertInstanceOf($expected, $actual);
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/MockObjectComparatorTest.php b/vendor/sebastian/comparator/tests/MockObjectComparatorTest.php
deleted file mode 100644
index 7910ad7a..00000000
--- a/vendor/sebastian/comparator/tests/MockObjectComparatorTest.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * @coversDefaultClass SebastianBergmann\Comparator\MockObjectComparator
- *
- */
-class MockObjectComparatorTest extends \PHPUnit_Framework_TestCase
-{
-    private $comparator;
-
-    protected function setUp()
-    {
-        $this->comparator = new MockObjectComparator;
-        $this->comparator->setFactory(new Factory);
-    }
-
-    public function acceptsSucceedsProvider()
-    {
-        $testmock = $this->getMock('SebastianBergmann\\Comparator\\TestClass');
-        $stdmock = $this->getMock('stdClass');
-
-        return array(
-          array($testmock, $testmock),
-          array($stdmock, $stdmock),
-          array($stdmock, $testmock)
-        );
-    }
-
-    public function acceptsFailsProvider()
-    {
-        $stdmock = $this->getMock('stdClass');
-
-        return array(
-          array($stdmock, null),
-          array(null, $stdmock),
-          array(null, null)
-        );
-    }
-
-    public function assertEqualsSucceedsProvider()
-    {
-        // cyclic dependencies
-        $book1 = $this->getMock('SebastianBergmann\\Comparator\\Book', null);
-        $book1->author = $this->getMock('SebastianBergmann\\Comparator\\Author', null, array('Terry Pratchett'));
-        $book1->author->books[] = $book1;
-        $book2 = $this->getMock('SebastianBergmann\\Comparator\\Book', null);
-        $book2->author = $this->getMock('SebastianBergmann\\Comparator\\Author', null, array('Terry Pratchett'));
-        $book2->author->books[] = $book2;
-
-        $object1 = $this->getMock('SebastianBergmann\\Comparator\\SampleClass', null, array(4, 8, 15));
-        $object2 = $this->getMock('SebastianBergmann\\Comparator\\SampleClass', null, array(4, 8, 15));
-
-        return array(
-          array($object1, $object1),
-          array($object1, $object2),
-          array($book1, $book1),
-          array($book1, $book2),
-          array(
-            $this->getMock('SebastianBergmann\\Comparator\\Struct', null, array(2.3)),
-            $this->getMock('SebastianBergmann\\Comparator\\Struct', null, array(2.5)),
-            0.5
-          )
-        );
-    }
-
-    public function assertEqualsFailsProvider()
-    {
-        $typeMessage = 'is not instance of expected class';
-        $equalMessage = 'Failed asserting that two objects are equal.';
-
-        // cyclic dependencies
-        $book1 = $this->getMock('SebastianBergmann\\Comparator\\Book', null);
-        $book1->author = $this->getMock('SebastianBergmann\\Comparator\\Author', null, array('Terry Pratchett'));
-        $book1->author->books[] = $book1;
-        $book2 = $this->getMock('SebastianBergmann\\Comparator\\Book', null);
-        $book2->author = $this->getMock('SebastianBergmann\\Comparator\\Author', null, array('Terry Pratch'));
-        $book2->author->books[] = $book2;
-
-        $book3 = $this->getMock('SebastianBergmann\\Comparator\\Book', null);
-        $book3->author = 'Terry Pratchett';
-        $book4 = $this->getMock('stdClass');
-        $book4->author = 'Terry Pratchett';
-
-        $object1 = $this->getMock('SebastianBergmann\\Comparator\\SampleClass', null, array(4, 8, 15));
-        $object2 = $this->getMock('SebastianBergmann\\Comparator\\SampleClass', null, array(16, 23, 42));
-
-        return array(
-          array(
-            $this->getMock('SebastianBergmann\\Comparator\\SampleClass', null, array(4, 8, 15)),
-            $this->getMock('SebastianBergmann\\Comparator\\SampleClass', null, array(16, 23, 42)),
-            $equalMessage
-          ),
-          array($object1, $object2, $equalMessage),
-          array($book1, $book2, $equalMessage),
-          array($book3, $book4, $typeMessage),
-          array(
-            $this->getMock('SebastianBergmann\\Comparator\\Struct', null, array(2.3)),
-            $this->getMock('SebastianBergmann\\Comparator\\Struct', null, array(4.2)),
-            $equalMessage,
-            0.5
-          )
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsSucceedsProvider
-     */
-    public function testAcceptsSucceeds($expected, $actual)
-    {
-        $this->assertTrue(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsFailsProvider
-     */
-    public function testAcceptsFails($expected, $actual)
-    {
-        $this->assertFalse(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsSucceedsProvider
-     */
-    public function testAssertEqualsSucceeds($expected, $actual, $delta = 0.0)
-    {
-        $exception = null;
-
-        try {
-            $this->comparator->assertEquals($expected, $actual, $delta);
-        }
-
-        catch (ComparisonFailure $exception) {
-        }
-
-        $this->assertNull($exception, 'Unexpected ComparisonFailure');
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsFailsProvider
-     */
-    public function testAssertEqualsFails($expected, $actual, $message, $delta = 0.0)
-    {
-        $this->setExpectedException(
-          'SebastianBergmann\\Comparator\\ComparisonFailure', $message
-        );
-        $this->comparator->assertEquals($expected, $actual, $delta);
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/NumericComparatorTest.php b/vendor/sebastian/comparator/tests/NumericComparatorTest.php
deleted file mode 100644
index fec7d00a..00000000
--- a/vendor/sebastian/comparator/tests/NumericComparatorTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * @coversDefaultClass SebastianBergmann\Comparator\NumericComparator
- *
- */
-class NumericComparatorTest extends \PHPUnit_Framework_TestCase
-{
-    private $comparator;
-
-    protected function setUp()
-    {
-        $this->comparator = new NumericComparator;
-    }
-
-    public function acceptsSucceedsProvider()
-    {
-        return array(
-          array(5, 10),
-          array(8, '0'),
-          array('10', 0),
-          array(0x74c3b00c, 42),
-          array(0755, 0777)
-        );
-    }
-
-    public function acceptsFailsProvider()
-    {
-        return array(
-          array('5', '10'),
-          array(8, 5.0),
-          array(5.0, 8),
-          array(10, null),
-          array(false, 12)
-        );
-    }
-
-    public function assertEqualsSucceedsProvider()
-    {
-        return array(
-          array(1337, 1337),
-          array('1337', 1337),
-          array(0x539, 1337),
-          array(02471, 1337),
-          array(1337, 1338, 1),
-          array('1337', 1340, 5),
-        );
-    }
-
-    public function assertEqualsFailsProvider()
-    {
-        return array(
-          array(1337, 1338),
-          array('1338', 1337),
-          array(0x539, 1338),
-          array(1337, 1339, 1),
-          array('1337', 1340, 2),
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsSucceedsProvider
-     */
-    public function testAcceptsSucceeds($expected, $actual)
-    {
-        $this->assertTrue(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsFailsProvider
-     */
-    public function testAcceptsFails($expected, $actual)
-    {
-        $this->assertFalse(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsSucceedsProvider
-     */
-    public function testAssertEqualsSucceeds($expected, $actual, $delta = 0.0)
-    {
-        $exception = null;
-
-        try {
-            $this->comparator->assertEquals($expected, $actual, $delta);
-        }
-
-        catch (ComparisonFailure $exception) {
-        }
-
-        $this->assertNull($exception, 'Unexpected ComparisonFailure');
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsFailsProvider
-     */
-    public function testAssertEqualsFails($expected, $actual, $delta = 0.0)
-    {
-        $this->setExpectedException(
-          'SebastianBergmann\\Comparator\\ComparisonFailure', 'matches expected'
-        );
-        $this->comparator->assertEquals($expected, $actual, $delta);
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/ObjectComparatorTest.php b/vendor/sebastian/comparator/tests/ObjectComparatorTest.php
deleted file mode 100644
index a9582325..00000000
--- a/vendor/sebastian/comparator/tests/ObjectComparatorTest.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-use stdClass;
-
-/**
- * @coversDefaultClass SebastianBergmann\Comparator\ObjectComparator
- *
- */
-class ObjectComparatorTest extends \PHPUnit_Framework_TestCase
-{
-    private $comparator;
-
-    protected function setUp()
-    {
-        $this->comparator = new ObjectComparator;
-        $this->comparator->setFactory(new Factory);
-    }
-
-    public function acceptsSucceedsProvider()
-    {
-        return array(
-          array(new TestClass, new TestClass),
-          array(new stdClass, new stdClass),
-          array(new stdClass, new TestClass)
-        );
-    }
-
-    public function acceptsFailsProvider()
-    {
-        return array(
-          array(new stdClass, null),
-          array(null, new stdClass),
-          array(null, null)
-        );
-    }
-
-    public function assertEqualsSucceedsProvider()
-    {
-        // cyclic dependencies
-        $book1 = new Book;
-        $book1->author = new Author('Terry Pratchett');
-        $book1->author->books[] = $book1;
-        $book2 = new Book;
-        $book2->author = new Author('Terry Pratchett');
-        $book2->author->books[] = $book2;
-
-        $object1 = new SampleClass(4, 8, 15);
-        $object2 = new SampleClass(4, 8, 15);
-
-        return array(
-          array($object1, $object1),
-          array($object1, $object2),
-          array($book1, $book1),
-          array($book1, $book2),
-          array(new Struct(2.3), new Struct(2.5), 0.5)
-        );
-    }
-
-    public function assertEqualsFailsProvider()
-    {
-        $typeMessage = 'is not instance of expected class';
-        $equalMessage = 'Failed asserting that two objects are equal.';
-
-        // cyclic dependencies
-        $book1 = new Book;
-        $book1->author = new Author('Terry Pratchett');
-        $book1->author->books[] = $book1;
-        $book2 = new Book;
-        $book2->author = new Author('Terry Pratch');
-        $book2->author->books[] = $book2;
-
-        $book3 = new Book;
-        $book3->author = 'Terry Pratchett';
-        $book4 = new stdClass;
-        $book4->author = 'Terry Pratchett';
-
-        $object1 = new SampleClass( 4,  8, 15);
-        $object2 = new SampleClass(16, 23, 42);
-
-        return array(
-          array(new SampleClass(4, 8, 15), new SampleClass(16, 23, 42), $equalMessage),
-          array($object1, $object2, $equalMessage),
-          array($book1, $book2, $equalMessage),
-          array($book3, $book4, $typeMessage),
-          array(new Struct(2.3), new Struct(4.2), $equalMessage, 0.5)
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsSucceedsProvider
-     */
-    public function testAcceptsSucceeds($expected, $actual)
-    {
-        $this->assertTrue(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsFailsProvider
-     */
-    public function testAcceptsFails($expected, $actual)
-    {
-        $this->assertFalse(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsSucceedsProvider
-     */
-    public function testAssertEqualsSucceeds($expected, $actual, $delta = 0.0)
-    {
-        $exception = null;
-
-        try {
-            $this->comparator->assertEquals($expected, $actual, $delta);
-        }
-
-        catch (ComparisonFailure $exception) {
-        }
-
-        $this->assertNull($exception, 'Unexpected ComparisonFailure');
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsFailsProvider
-     */
-    public function testAssertEqualsFails($expected, $actual, $message, $delta = 0.0)
-    {
-        $this->setExpectedException(
-          'SebastianBergmann\\Comparator\\ComparisonFailure', $message
-        );
-        $this->comparator->assertEquals($expected, $actual, $delta);
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/ResourceComparatorTest.php b/vendor/sebastian/comparator/tests/ResourceComparatorTest.php
deleted file mode 100644
index a9e9e955..00000000
--- a/vendor/sebastian/comparator/tests/ResourceComparatorTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * @coversDefaultClass SebastianBergmann\Comparator\ResourceComparator
- *
- */
-class ResourceComparatorTest extends \PHPUnit_Framework_TestCase
-{
-    private $comparator;
-
-    protected function setUp()
-    {
-        $this->comparator = new ResourceComparator;
-    }
-
-    public function acceptsSucceedsProvider()
-    {
-        $tmpfile1 = tmpfile();
-        $tmpfile2 = tmpfile();
-
-        return array(
-          array($tmpfile1, $tmpfile1),
-          array($tmpfile2, $tmpfile2),
-          array($tmpfile1, $tmpfile2)
-        );
-    }
-
-    public function acceptsFailsProvider()
-    {
-        $tmpfile1 = tmpfile();
-
-        return array(
-          array($tmpfile1, null),
-          array(null, $tmpfile1),
-          array(null, null)
-        );
-    }
-
-    public function assertEqualsSucceedsProvider()
-    {
-        $tmpfile1 = tmpfile();
-        $tmpfile2 = tmpfile();
-
-        return array(
-          array($tmpfile1, $tmpfile1),
-          array($tmpfile2, $tmpfile2)
-        );
-    }
-
-    public function assertEqualsFailsProvider()
-    {
-        $tmpfile1 = tmpfile();
-        $tmpfile2 = tmpfile();
-
-        return array(
-          array($tmpfile1, $tmpfile2),
-          array($tmpfile2, $tmpfile1)
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsSucceedsProvider
-     */
-    public function testAcceptsSucceeds($expected, $actual)
-    {
-        $this->assertTrue(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsFailsProvider
-     */
-    public function testAcceptsFails($expected, $actual)
-    {
-        $this->assertFalse(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsSucceedsProvider
-     */
-    public function testAssertEqualsSucceeds($expected, $actual)
-    {
-        $exception = null;
-
-        try {
-            $this->comparator->assertEquals($expected, $actual);
-        }
-
-        catch (ComparisonFailure $exception) {
-        }
-
-        $this->assertNull($exception, 'Unexpected ComparisonFailure');
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsFailsProvider
-     */
-    public function testAssertEqualsFails($expected, $actual)
-    {
-        $this->setExpectedException('SebastianBergmann\\Comparator\\ComparisonFailure');
-        $this->comparator->assertEquals($expected, $actual);
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/ScalarComparatorTest.php b/vendor/sebastian/comparator/tests/ScalarComparatorTest.php
deleted file mode 100644
index e5156aa3..00000000
--- a/vendor/sebastian/comparator/tests/ScalarComparatorTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * @coversDefaultClass SebastianBergmann\Comparator\ScalarComparator
- *
- */
-class ScalarComparatorTest extends \PHPUnit_Framework_TestCase
-{
-    private $comparator;
-
-    protected function setUp()
-    {
-        $this->comparator = new ScalarComparator;
-    }
-
-    public function acceptsSucceedsProvider()
-    {
-        return array(
-          array("string", "string"),
-          array(new ClassWithToString, "string"),
-          array("string", new ClassWithToString),
-          array("string", null),
-          array(false, "string"),
-          array(false, true),
-          array(null, false),
-          array(null, null),
-          array("10", 10),
-          array("", false),
-          array("1", true),
-          array(1, true),
-          array(0, false),
-          array(0.1, "0.1")
-        );
-    }
-
-    public function acceptsFailsProvider()
-    {
-        return array(
-          array(array(), array()),
-          array("string", array()),
-          array(new ClassWithToString, new ClassWithToString),
-          array(false, new ClassWithToString),
-          array(tmpfile(), tmpfile())
-        );
-    }
-
-    public function assertEqualsSucceedsProvider()
-    {
-        return array(
-          array("string", "string"),
-          array(new ClassWithToString, new ClassWithToString),
-          array("string representation", new ClassWithToString),
-          array(new ClassWithToString, "string representation"),
-          array("string", "STRING", true),
-          array("STRING", "string", true),
-          array("String Representation", new ClassWithToString, true),
-          array(new ClassWithToString, "String Representation", true),
-          array("10", 10),
-          array("", false),
-          array("1", true),
-          array(1, true),
-          array(0, false),
-          array(0.1, "0.1"),
-          array(false, null),
-          array(false, false),
-          array(true, true),
-          array(null, null)
-        );
-    }
-
-    public function assertEqualsFailsProvider()
-    {
-        $stringException = 'Failed asserting that two strings are equal.';
-        $otherException = 'matches expected';
-
-        return array(
-          array("string", "other string", $stringException),
-          array("string", "STRING", $stringException),
-          array("STRING", "string", $stringException),
-          array("string", "other string", $stringException),
-          // https://github.com/sebastianbergmann/phpunit/issues/1023
-          array('9E6666666','9E7777777', $stringException),
-          array(new ClassWithToString, "does not match", $otherException),
-          array("does not match", new ClassWithToString, $otherException),
-          array(0, 'Foobar', $otherException),
-          array('Foobar', 0, $otherException),
-          array("10", 25, $otherException),
-          array("1", false, $otherException),
-          array("", true, $otherException),
-          array(false, true, $otherException),
-          array(true, false, $otherException),
-          array(null, true, $otherException),
-          array(0, true, $otherException)
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsSucceedsProvider
-     */
-    public function testAcceptsSucceeds($expected, $actual)
-    {
-        $this->assertTrue(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsFailsProvider
-     */
-    public function testAcceptsFails($expected, $actual)
-    {
-        $this->assertFalse(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsSucceedsProvider
-     */
-    public function testAssertEqualsSucceeds($expected, $actual, $ignoreCase = false)
-    {
-        $exception = null;
-
-        try {
-            $this->comparator->assertEquals($expected, $actual, 0.0, false, $ignoreCase);
-        }
-
-        catch (ComparisonFailure $exception) {
-        }
-
-        $this->assertNull($exception, 'Unexpected ComparisonFailure');
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsFailsProvider
-     */
-    public function testAssertEqualsFails($expected, $actual, $message)
-    {
-        $this->setExpectedException(
-          'SebastianBergmann\\Comparator\\ComparisonFailure', $message
-        );
-        $this->comparator->assertEquals($expected, $actual);
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/SplObjectStorageComparatorTest.php b/vendor/sebastian/comparator/tests/SplObjectStorageComparatorTest.php
deleted file mode 100644
index 766dd2df..00000000
--- a/vendor/sebastian/comparator/tests/SplObjectStorageComparatorTest.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-use SplObjectStorage;
-use stdClass;
-
-/**
- * @coversDefaultClass SebastianBergmann\Comparator\SplObjectStorageComparator
- *
- */
-class SplObjectStorageComparatorTest extends \PHPUnit_Framework_TestCase
-{
-    private $comparator;
-
-    protected function setUp()
-    {
-        $this->comparator = new SplObjectStorageComparator;
-    }
-
-    public function acceptsFailsProvider()
-    {
-        return array(
-          array(new SplObjectStorage, new stdClass),
-          array(new stdClass, new SplObjectStorage),
-          array(new stdClass, new stdClass)
-        );
-    }
-
-    public function assertEqualsSucceedsProvider()
-    {
-        $object1 = new stdClass();
-        $object2 = new stdClass();
-
-        $storage1 = new SplObjectStorage();
-        $storage2 = new SplObjectStorage();
-
-        $storage3 = new SplObjectStorage();
-        $storage3->attach($object1);
-        $storage3->attach($object2);
-
-        $storage4 = new SplObjectStorage();
-        $storage4->attach($object2);
-        $storage4->attach($object1);
-
-        return array(
-          array($storage1, $storage1),
-          array($storage1, $storage2),
-          array($storage3, $storage3),
-          array($storage3, $storage4)
-        );
-    }
-
-    public function assertEqualsFailsProvider()
-    {
-        $object1 = new stdClass;
-        $object2 = new stdClass;
-
-        $storage1 = new SplObjectStorage;
-
-        $storage2 = new SplObjectStorage;
-        $storage2->attach($object1);
-
-        $storage3 = new SplObjectStorage;
-        $storage3->attach($object2);
-        $storage3->attach($object1);
-
-        return array(
-          array($storage1, $storage2),
-          array($storage1, $storage3),
-          array($storage2, $storage3),
-        );
-    }
-
-    /**
-     * @covers  ::accepts
-     */
-    public function testAcceptsSucceeds()
-    {
-        $this->assertTrue(
-          $this->comparator->accepts(
-            new SplObjectStorage,
-            new SplObjectStorage
-          )
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsFailsProvider
-     */
-    public function testAcceptsFails($expected, $actual)
-    {
-        $this->assertFalse(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsSucceedsProvider
-     */
-    public function testAssertEqualsSucceeds($expected, $actual)
-    {
-        $exception = null;
-
-        try {
-            $this->comparator->assertEquals($expected, $actual);
-        }
-
-        catch (ComparisonFailure $exception) {
-        }
-
-        $this->assertNull($exception, 'Unexpected ComparisonFailure');
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsFailsProvider
-     */
-    public function testAssertEqualsFails($expected, $actual)
-    {
-        $this->setExpectedException(
-          'SebastianBergmann\\Comparator\\ComparisonFailure',
-          'Failed asserting that two objects are equal.'
-        );
-        $this->comparator->assertEquals($expected, $actual);
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/TypeComparatorTest.php b/vendor/sebastian/comparator/tests/TypeComparatorTest.php
deleted file mode 100644
index bb51f8a1..00000000
--- a/vendor/sebastian/comparator/tests/TypeComparatorTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-use stdClass;
-
-/**
- * @coversDefaultClass SebastianBergmann\Comparator\TypeComparator
- *
- */
-class TypeComparatorTest extends \PHPUnit_Framework_TestCase
-{
-    private $comparator;
-
-    protected function setUp()
-    {
-        $this->comparator = new TypeComparator;
-    }
-
-    public function acceptsSucceedsProvider()
-    {
-        return array(
-          array(true, 1),
-          array(false, array(1)),
-          array(null, new stdClass),
-          array(1.0, 5),
-          array("", "")
-        );
-    }
-
-    public function assertEqualsSucceedsProvider()
-    {
-        return array(
-          array(true, true),
-          array(true, false),
-          array(false, false),
-          array(null, null),
-          array(new stdClass, new stdClass),
-          array(0, 0),
-          array(1.0, 2.0),
-          array("hello", "world"),
-          array("", ""),
-          array(array(), array(1,2,3))
-        );
-    }
-
-    public function assertEqualsFailsProvider()
-    {
-        return array(
-          array(true, null),
-          array(null, false),
-          array(1.0, 0),
-          array(new stdClass, array()),
-          array("1", 1)
-        );
-    }
-
-    /**
-     * @covers       ::accepts
-     * @dataProvider acceptsSucceedsProvider
-     */
-    public function testAcceptsSucceeds($expected, $actual)
-    {
-        $this->assertTrue(
-          $this->comparator->accepts($expected, $actual)
-        );
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsSucceedsProvider
-     */
-    public function testAssertEqualsSucceeds($expected, $actual)
-    {
-        $exception = null;
-
-        try {
-            $this->comparator->assertEquals($expected, $actual);
-        }
-
-        catch (ComparisonFailure $exception) {
-        }
-
-        $this->assertNull($exception, 'Unexpected ComparisonFailure');
-    }
-
-    /**
-     * @covers       ::assertEquals
-     * @dataProvider assertEqualsFailsProvider
-     */
-    public function testAssertEqualsFails($expected, $actual)
-    {
-        $this->setExpectedException('SebastianBergmann\\Comparator\\ComparisonFailure', 'does not match expected type');
-        $this->comparator->assertEquals($expected, $actual);
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/_files/Author.php b/vendor/sebastian/comparator/tests/_files/Author.php
deleted file mode 100644
index ae698c3c..00000000
--- a/vendor/sebastian/comparator/tests/_files/Author.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * An author.
- *
- */
-class Author
-{
-    // the order of properties is important for testing the cycle!
-    public $books = array();
-
-    private $name = '';
-
-    public function __construct($name)
-    {
-        $this->name = $name;
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/_files/Book.php b/vendor/sebastian/comparator/tests/_files/Book.php
deleted file mode 100644
index 6171bc33..00000000
--- a/vendor/sebastian/comparator/tests/_files/Book.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * A book.
- *
- */
-class Book
-{
-    // the order of properties is important for testing the cycle!
-    public $author = null;
-}
diff --git a/vendor/sebastian/comparator/tests/_files/ClassWithToString.php b/vendor/sebastian/comparator/tests/_files/ClassWithToString.php
deleted file mode 100644
index e8e03bc7..00000000
--- a/vendor/sebastian/comparator/tests/_files/ClassWithToString.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-class ClassWithToString
-{
-    public function __toString()
-    {
-        return 'string representation';
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/_files/SampleClass.php b/vendor/sebastian/comparator/tests/_files/SampleClass.php
deleted file mode 100644
index 6079dd34..00000000
--- a/vendor/sebastian/comparator/tests/_files/SampleClass.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * A sample class.
- *
- */
-class SampleClass
-{
-    public $a;
-    protected $b;
-    protected $c;
-
-    public function __construct($a, $b, $c)
-    {
-        $this->a = $a;
-        $this->b = $b;
-        $this->c = $c;
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/_files/Struct.php b/vendor/sebastian/comparator/tests/_files/Struct.php
deleted file mode 100644
index 79ec559a..00000000
--- a/vendor/sebastian/comparator/tests/_files/Struct.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * A struct.
- *
- */
-class Struct
-{
-    public $var;
-
-    public function __construct($var)
-    {
-        $this->var = $var;
-    }
-}
diff --git a/vendor/sebastian/comparator/tests/_files/TestClass.php b/vendor/sebastian/comparator/tests/_files/TestClass.php
deleted file mode 100644
index e4c9b78c..00000000
--- a/vendor/sebastian/comparator/tests/_files/TestClass.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-class TestClass {
-}
diff --git a/vendor/sebastian/comparator/tests/_files/TestClassComparator.php b/vendor/sebastian/comparator/tests/_files/TestClassComparator.php
deleted file mode 100644
index 52aac3fd..00000000
--- a/vendor/sebastian/comparator/tests/_files/TestClassComparator.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-class TestClassComparator extends ObjectComparator {
-}
diff --git a/vendor/sebastian/comparator/tests/autoload.php b/vendor/sebastian/comparator/tests/autoload.php
deleted file mode 100644
index f4d9bbcc..00000000
--- a/vendor/sebastian/comparator/tests/autoload.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-// @codingStandardsIgnoreFile
-// @codeCoverageIgnoreStart
-// this is an autogenerated file - do not edit
-spl_autoload_register(
-    function($class) {
-        static $classes = null;
-        if ($classes === null) {
-            $classes = array(
-                'sebastianbergmann\\comparator\\arraycomparatortest' => '/ArrayComparatorTest.php',
-                'sebastianbergmann\\comparator\\author' => '/_files/Author.php',
-                'sebastianbergmann\\comparator\\book' => '/_files/Book.php',
-                'sebastianbergmann\\comparator\\classwithtostring' => '/_files/ClassWithToString.php',
-                'sebastianbergmann\\comparator\\datetimecomparatortest' => '/DateTimeComparatorTest.php',
-                'sebastianbergmann\\comparator\\domnodecomparatortest' => '/DOMNodeComparatorTest.php',
-                'sebastianbergmann\\comparator\\doublecomparatortest' => '/DoubleComparatorTest.php',
-                'sebastianbergmann\\comparator\\exceptioncomparatortest' => '/ExceptionComparatorTest.php',
-                'sebastianbergmann\\comparator\\factorytest' => '/FactoryTest.php',
-                'sebastianbergmann\\comparator\\mockobjectcomparatortest' => '/MockObjectComparatorTest.php',
-                'sebastianbergmann\\comparator\\numericcomparatortest' => '/NumericComparatorTest.php',
-                'sebastianbergmann\\comparator\\objectcomparatortest' => '/ObjectComparatorTest.php',
-                'sebastianbergmann\\comparator\\resourcecomparatortest' => '/ResourceComparatorTest.php',
-                'sebastianbergmann\\comparator\\sampleclass' => '/_files/SampleClass.php',
-                'sebastianbergmann\\comparator\\scalarcomparatortest' => '/ScalarComparatorTest.php',
-                'sebastianbergmann\\comparator\\splobjectstoragecomparatortest' => '/SplObjectStorageComparatorTest.php',
-                'sebastianbergmann\\comparator\\struct' => '/_files/Struct.php',
-                'sebastianbergmann\\comparator\\testclass' => '/_files/TestClass.php',
-                'sebastianbergmann\\comparator\\testclasscomparator' => '/_files/TestClassComparator.php',
-                'sebastianbergmann\\comparator\\typecomparatortest' => '/TypeComparatorTest.php'
-            );
-        }
-        $cn = strtolower($class);
-        if (isset($classes[$cn])) {
-            require __DIR__ . $classes[$cn];
-        }
-    }
-);
-// @codeCoverageIgnoreEnd
diff --git a/vendor/sebastian/comparator/tests/bootstrap.php b/vendor/sebastian/comparator/tests/bootstrap.php
deleted file mode 100644
index 8f1c57c3..00000000
--- a/vendor/sebastian/comparator/tests/bootstrap.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-require __DIR__ . '/../vendor/autoload.php';
-require __DIR__ . '/autoload.php';
-
-ini_set('precision', 14);
-ini_set('serialize_precision', 14);
-
diff --git a/vendor/sebastian/diff/.gitignore b/vendor/sebastian/diff/.gitignore
deleted file mode 100644
index d571f240..00000000
--- a/vendor/sebastian/diff/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.idea
-phpunit.xml
-composer.lock
-composer.phar
-vendor/
-cache.properties
-build/SebastianBergmann
-build/LICENSE
-build/README.md
-build/*.tgz
diff --git a/vendor/sebastian/diff/.travis.yml b/vendor/sebastian/diff/.travis.yml
deleted file mode 100644
index c5ea677f..00000000
--- a/vendor/sebastian/diff/.travis.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-language: php
-
-install:
-  - travis_retry composer install --no-interaction --prefer-source
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-notifications:
-  email: false
-  irc: "irc.freenode.org#phpunit"
diff --git a/vendor/sebastian/diff/LICENSE b/vendor/sebastian/diff/LICENSE
deleted file mode 100644
index 0941c065..00000000
--- a/vendor/sebastian/diff/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Diff
-
-Copyright (c) 2002-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/diff/README.md b/vendor/sebastian/diff/README.md
deleted file mode 100644
index 921957bf..00000000
--- a/vendor/sebastian/diff/README.md
+++ /dev/null
@@ -1,126 +0,0 @@
-# Diff
-
-Diff implementation for PHP, factored out of PHPUnit into a stand-alone component.
-
-## Installation
-
-To add this package as a local, per-project dependency to your project, simply add a dependency on `sebastian/diff` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Diff:
-
-    {
-        "require": {
-            "sebastian/diff": "*"
-        }
-    }
-
-### Usage
-
-The `Differ` class can be used to generate a textual representation of the difference between two strings:
-
-```php
-use SebastianBergmann\Diff\Differ;
-
-$differ = new Differ;
-print $differ->diff('foo', 'bar');
-```
-
-The code above yields the output below:
-
-    --- Original
-    +++ New
-    @@ @@
-    -foo
-    +bar
-
-The `Parser` class can be used to parse a unified diff into an object graph:
-
-```php
-use SebastianBergmann\Diff\Parser;
-use SebastianBergmann\Git;
-
-$git = new Git('/usr/local/src/money');
-
-$diff = $git->getDiff(
-  '948a1a07768d8edd10dcefa8315c1cbeffb31833',
-  'c07a373d2399f3e686234c4f7f088d635eb9641b'
-);
-
-$parser = new Parser;
-
-print_r($parser->parse($diff));
-```
-
-The code above yields the output below:
-
-    Array
-    (
-        [0] => SebastianBergmann\Diff\Diff Object
-            (
-                [from:SebastianBergmann\Diff\Diff:private] => a/tests/MoneyTest.php
-                [to:SebastianBergmann\Diff\Diff:private] => b/tests/MoneyTest.php
-                [chunks:SebastianBergmann\Diff\Diff:private] => Array
-                    (
-                        [0] => SebastianBergmann\Diff\Chunk Object
-                            (
-                                [start:SebastianBergmann\Diff\Chunk:private] => 87
-                                [startRange:SebastianBergmann\Diff\Chunk:private] => 7
-                                [end:SebastianBergmann\Diff\Chunk:private] => 87
-                                [endRange:SebastianBergmann\Diff\Chunk:private] => 7
-                                [lines:SebastianBergmann\Diff\Chunk:private] => Array
-                                    (
-                                        [0] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>      * @covers SebastianBergmann\Money\Money::add
-                                            )
-
-                                        [1] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>      * @covers SebastianBergmann\Money\Money::newMoney
-                                            )
-
-                                        [2] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>      */
-                                            )
-
-                                        [3] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 2
-                                                [content:SebastianBergmann\Diff\Line:private] =>     public function testAnotherMoneyWithSameCurrencyObjectCanBeAdded()
-                                            )
-
-                                        [4] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 1
-                                                [content:SebastianBergmann\Diff\Line:private] =>     public function testAnotherMoneyObjectWithSameCurrencyCanBeAdded()
-                                            )
-
-                                        [5] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>     {
-                                            )
-
-                                        [6] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>         $a = new Money(1, new Currency('EUR'));
-                                            )
-
-                                        [7] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>         $b = new Money(2, new Currency('EUR'));
-                                            )
-
-                                    )
-
-                            )
-
-                    )
-
-            )
-
-    )
diff --git a/vendor/sebastian/diff/build.xml b/vendor/sebastian/diff/build.xml
deleted file mode 100644
index 7366087d..00000000
--- a/vendor/sebastian/diff/build.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="diff">
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/vendor"/>
-  <delete file="${basedir}/composer.lock"/>
- </target>
-
- <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
-  </exec>
- </target>
-</project>
diff --git a/vendor/sebastian/diff/composer.json b/vendor/sebastian/diff/composer.json
deleted file mode 100644
index 3c04952d..00000000
--- a/vendor/sebastian/diff/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "sebastian/diff",
-    "description": "Diff implementation",
-    "keywords": ["diff"],
-    "homepage": "http://www.github.com/sebastianbergmann/diff",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de"
-        },
-        {
-            "name": "Kore Nordmann",
-            "email": "mail@kore-nordmann.de"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.2"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.3-dev"
-        }
-    }
-}
diff --git a/vendor/sebastian/diff/phpunit.xml.dist b/vendor/sebastian/diff/phpunit.xml.dist
deleted file mode 100644
index 387a9b3d..00000000
--- a/vendor/sebastian/diff/phpunit.xml.dist
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.2/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         verbose="true">
-  <testsuite name="Diff">
-    <directory suffix="Test.php">tests</directory>
-  </testsuite>
-
-  <filter>
-    <whitelist processUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">src</directory>
-    </whitelist>
-  </filter>
-</phpunit>
-
diff --git a/vendor/sebastian/diff/src/Chunk.php b/vendor/sebastian/diff/src/Chunk.php
deleted file mode 100644
index 79d13fc8..00000000
--- a/vendor/sebastian/diff/src/Chunk.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff;
-
-/**
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Kore Nordmann <mail@kore-nordmann.de>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-class Chunk
-{
-    /**
-     * @var int
-     */
-    private $start;
-
-    /**
-     * @var int
-     */
-    private $startRange;
-
-    /**
-     * @var int
-     */
-    private $end;
-    /**
-     * @var int
-     */
-    private $endRange;
-
-    /**
-     * @var array
-     */
-    private $lines;
-
-    /**
-     * @param int   $start
-     * @param int   $startRange
-     * @param int   $end
-     * @param int   $endRange
-     * @param array $lines
-     */
-    public function __construct($start = 0, $startRange = 1, $end = 0, $endRange = 1, array $lines = array())
-    {
-        $this->start      = (int) $start;
-        $this->startRange = (int) $startRange;
-        $this->end        = (int) $end;
-        $this->endRange   = (int) $endRange;
-        $this->lines      = $lines;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStart()
-    {
-        return $this->start;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStartRange()
-    {
-        return $this->startRange;
-    }
-
-    /**
-     * @return int
-     */
-    public function getEnd()
-    {
-        return $this->end;
-    }
-
-    /**
-     * @return int
-     */
-    public function getEndRange()
-    {
-        return $this->endRange;
-    }
-
-    /**
-     * @return array
-     */
-    public function getLines()
-    {
-        return $this->lines;
-    }
-
-    /**
-     * @param array $lines
-     */
-    public function setLines(array $lines)
-    {
-        $this->lines = $lines;
-    }
-}
diff --git a/vendor/sebastian/diff/src/Diff.php b/vendor/sebastian/diff/src/Diff.php
deleted file mode 100644
index 45aaae6f..00000000
--- a/vendor/sebastian/diff/src/Diff.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff;
-
-/**
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Kore Nordmann <mail@kore-nordmann.de>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-class Diff
-{
-    /**
-     * @var string
-     */
-    private $from;
-
-    /**
-     * @var string
-     */
-    private $to;
-
-    /**
-     * @var Chunk[]
-     */
-    private $chunks;
-
-    /**
-     * @param string  $from
-     * @param string  $to
-     * @param Chunk[] $chunks
-     */
-    public function __construct($from, $to, array $chunks = array())
-    {
-        $this->from   = $from;
-        $this->to     = $to;
-        $this->chunks = $chunks;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFrom()
-    {
-        return $this->from;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTo()
-    {
-        return $this->to;
-    }
-
-    /**
-     * @return Chunk[]
-     */
-    public function getChunks()
-    {
-        return $this->chunks;
-    }
-
-    /**
-     * @param Chunk[] $chunks
-     */
-    public function setChunks(array $chunks)
-    {
-        $this->chunks = $chunks;
-    }
-}
diff --git a/vendor/sebastian/diff/src/Differ.php b/vendor/sebastian/diff/src/Differ.php
deleted file mode 100644
index 76630ed2..00000000
--- a/vendor/sebastian/diff/src/Differ.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff;
-
-use SebastianBergmann\Diff\LCS\LongestCommonSubsequence;
-use SebastianBergmann\Diff\LCS\TimeEfficientImplementation;
-use SebastianBergmann\Diff\LCS\MemoryEfficientImplementation;
-
-/**
- * Diff implementation.
- *
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Kore Nordmann <mail@kore-nordmann.de>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-class Differ
-{
-    /**
-     * @var string
-     */
-    private $header;
-
-    /**
-     * @param string $header
-     */
-    public function __construct($header = "--- Original\n+++ New\n")
-    {
-        $this->header = $header;
-    }
-
-    /**
-     * Returns the diff between two arrays or strings as string.
-     *
-     * @param  array|string             $from
-     * @param  array|string             $to
-     * @param  LongestCommonSubsequence $lcs
-     * @return string
-     */
-    public function diff($from, $to, LongestCommonSubsequence $lcs = null)
-    {
-        if (!is_array($from) && !is_string($from)) {
-            $from = (string) $from;
-        }
-
-        if (!is_array($to) && !is_string($to)) {
-            $to = (string) $to;
-        }
-
-        $buffer = $this->header;
-        $diff   = $this->diffToArray($from, $to, $lcs);
-
-        $inOld = false;
-        $i     = 0;
-        $old   = array();
-
-        foreach ($diff as $line) {
-            if ($line[1] ===  0 /* OLD */) {
-                if ($inOld === false) {
-                    $inOld = $i;
-                }
-            } elseif ($inOld !== false) {
-                if (($i - $inOld) > 5) {
-                    $old[$inOld] = $i - 1;
-                }
-
-                $inOld = false;
-            }
-
-            ++$i;
-        }
-
-        $start = isset($old[0]) ? $old[0] : 0;
-        $end   = count($diff);
-
-        if ($tmp = array_search($end, $old)) {
-            $end = $tmp;
-        }
-
-        $newChunk = true;
-
-        for ($i = $start; $i < $end; $i++) {
-            if (isset($old[$i])) {
-                $buffer  .= "\n";
-                $newChunk = true;
-                $i        = $old[$i];
-            }
-
-            if ($newChunk) {
-                $buffer  .= "@@ @@\n";
-                $newChunk = false;
-            }
-
-            if ($diff[$i][1] === 1 /* ADDED */) {
-                $buffer .= '+' . $diff[$i][0] . "\n";
-            } elseif ($diff[$i][1] === 2 /* REMOVED */) {
-                $buffer .= '-' . $diff[$i][0] . "\n";
-            } else {
-                $buffer .= ' ' . $diff[$i][0] . "\n";
-            }
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * Returns the diff between two arrays or strings as array.
-     *
-     * Each array element contains two elements:
-     *   - [0] => string $token
-     *   - [1] => 2|1|0
-     *
-     * - 2: REMOVED: $token was removed from $from
-     * - 1: ADDED: $token was added to $from
-     * - 0: OLD: $token is not changed in $to
-     *
-     * @param  array|string             $from
-     * @param  array|string             $to
-     * @param  LongestCommonSubsequence $lcs
-     * @return array
-     */
-    public function diffToArray($from, $to, LongestCommonSubsequence $lcs = null)
-    {
-        preg_match_all('(\r\n|\r|\n)', $from, $fromMatches);
-        preg_match_all('(\r\n|\r|\n)', $to, $toMatches);
-
-        if (is_string($from)) {
-            $from = preg_split('(\r\n|\r|\n)', $from);
-        }
-
-        if (is_string($to)) {
-            $to = preg_split('(\r\n|\r|\n)', $to);
-        }
-
-        $start      = array();
-        $end        = array();
-        $fromLength = count($from);
-        $toLength   = count($to);
-        $length     = min($fromLength, $toLength);
-
-        for ($i = 0; $i < $length; ++$i) {
-            if ($from[$i] === $to[$i]) {
-                $start[] = $from[$i];
-                unset($from[$i], $to[$i]);
-            } else {
-                break;
-            }
-        }
-
-        $length -= $i;
-
-        for ($i = 1; $i < $length; ++$i) {
-            if ($from[$fromLength - $i] === $to[$toLength - $i]) {
-                array_unshift($end, $from[$fromLength - $i]);
-                unset($from[$fromLength - $i], $to[$toLength - $i]);
-            } else {
-                break;
-            }
-        }
-
-        if ($lcs === null) {
-            $lcs = $this->selectLcsImplementation($from, $to);
-        }
-
-        $common = $lcs->calculate(array_values($from), array_values($to));
-        $diff   = array();
-
-        if (isset($fromMatches[0]) && $toMatches[0] &&
-            count($fromMatches[0]) === count($toMatches[0]) &&
-            $fromMatches[0] !== $toMatches[0]) {
-            $diff[] = array(
-              '#Warning: Strings contain different line endings!', 0
-            );
-        }
-
-        foreach ($start as $token) {
-            $diff[] = array($token, 0 /* OLD */);
-        }
-
-        reset($from);
-        reset($to);
-
-        foreach ($common as $token) {
-            while ((($fromToken = reset($from)) !== $token)) {
-                $diff[] = array(array_shift($from), 2 /* REMOVED */);
-            }
-
-            while ((($toToken = reset($to)) !== $token)) {
-                $diff[] = array(array_shift($to), 1 /* ADDED */);
-            }
-
-            $diff[] = array($token, 0 /* OLD */);
-
-            array_shift($from);
-            array_shift($to);
-        }
-
-        while (($token = array_shift($from)) !== null) {
-            $diff[] = array($token, 2 /* REMOVED */);
-        }
-
-        while (($token = array_shift($to)) !== null) {
-            $diff[] = array($token, 1 /* ADDED */);
-        }
-
-        foreach ($end as $token) {
-            $diff[] = array($token, 0 /* OLD */);
-        }
-
-        return $diff;
-    }
-
-    /**
-     * @param  array $from
-     * @param  array $to
-     * @return LongestCommonSubsequence
-     */
-    private function selectLcsImplementation(array $from, array $to)
-    {
-        // We do not want to use the time-efficient implementation if its memory
-        // footprint will probably exceed this value. Note that the footprint
-        // calculation is only an estimation for the matrix and the LCS method
-        // will typically allocate a bit more memory than this.
-        $memoryLimit = 100 * 1024 * 1024;
-
-        if ($this->calculateEstimatedFootprint($from, $to) > $memoryLimit) {
-            return new MemoryEfficientImplementation;
-        }
-
-        return new TimeEfficientImplementation;
-    }
-
-    /**
-     * Calculates the estimated memory footprint for the DP-based method.
-     *
-     * @param  array $from
-     * @param  array $to
-     * @return integer
-     */
-    private function calculateEstimatedFootprint(array $from, array $to)
-    {
-        $itemSize = PHP_INT_SIZE == 4 ? 76 : 144;
-
-        return $itemSize * pow(min(count($from), count($to)), 2);
-    }
-}
diff --git a/vendor/sebastian/diff/src/LCS/LongestCommonSubsequence.php b/vendor/sebastian/diff/src/LCS/LongestCommonSubsequence.php
deleted file mode 100644
index 80364745..00000000
--- a/vendor/sebastian/diff/src/LCS/LongestCommonSubsequence.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff\LCS;
-
-/**
- * Interface for implementations of longest common subsequence calculation.
- *
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Kore Nordmann <mail@kore-nordmann.de>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-interface LongestCommonSubsequence
-{
-    /**
-     * Calculates the longest common subsequence of two arrays.
-     *
-     * @param  array $from
-     * @param  array $to
-     * @return array
-     */
-    public function calculate(array $from, array $to);
-}
diff --git a/vendor/sebastian/diff/src/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php b/vendor/sebastian/diff/src/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php
deleted file mode 100644
index 6213607a..00000000
--- a/vendor/sebastian/diff/src/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff\LCS;
-
-/**
- * Memory-efficient implementation of longest common subsequence calculation.
- *
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Denes Lados <lados.denes@gmail.com>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-class MemoryEfficientImplementation implements LongestCommonSubsequence
-{
-    /**
-     * Calculates the longest common subsequence of two arrays.
-     *
-     * @param  array $from
-     * @param  array $to
-     * @return array
-     */
-    public function calculate(array $from, array $to)
-    {
-        $cFrom = count($from);
-        $cTo   = count($to);
-
-        if ($cFrom == 0) {
-            return array();
-        } elseif ($cFrom == 1) {
-            if (in_array($from[0], $to)) {
-                return array($from[0]);
-            } else {
-                return array();
-            }
-        } else {
-            $i         = intval($cFrom / 2);
-            $fromStart = array_slice($from, 0, $i);
-            $fromEnd   = array_slice($from, $i);
-            $llB       = $this->length($fromStart, $to);
-            $llE       = $this->length(array_reverse($fromEnd), array_reverse($to));
-            $jMax      = 0;
-            $max       = 0;
-
-            for ($j = 0; $j <= $cTo; $j++) {
-                $m = $llB[$j] + $llE[$cTo - $j];
-
-                if ($m >= $max) {
-                    $max  = $m;
-                    $jMax = $j;
-                }
-            }
-
-            $toStart = array_slice($to, 0, $jMax);
-            $toEnd   = array_slice($to, $jMax);
-
-            return array_merge(
-                $this->calculate($fromStart, $toStart),
-                $this->calculate($fromEnd, $toEnd)
-            );
-        }
-    }
-
-    /**
-     * @param array $from
-     * @param array $to
-     * @return array
-     */
-    private function length(array $from, array $to)
-    {
-        $current = array_fill(0, count($to) + 1, 0);
-        $cFrom   = count($from);
-        $cTo     = count($to);
-
-        for ($i = 0; $i < $cFrom; $i++) {
-            $prev = $current;
-
-            for ($j = 0; $j < $cTo; $j++) {
-                if ($from[$i] == $to[$j]) {
-                    $current[$j + 1] = $prev[$j] + 1;
-                } else {
-                    $current[$j + 1] = max($current[$j], $prev[$j + 1]);
-                }
-            }
-        }
-
-        return $current;
-    }
-}
diff --git a/vendor/sebastian/diff/src/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php b/vendor/sebastian/diff/src/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php
deleted file mode 100644
index b569586d..00000000
--- a/vendor/sebastian/diff/src/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff\LCS;
-
-/**
- * Time-efficient implementation of longest common subsequence calculation.
- *
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Kore Nordmann <mail@kore-nordmann.de>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-class TimeEfficientImplementation implements LongestCommonSubsequence
-{
-    /**
-     * Calculates the longest common subsequence of two arrays.
-     *
-     * @param  array $from
-     * @param  array $to
-     * @return array
-     */
-    public function calculate(array $from, array $to)
-    {
-        $common     = array();
-        $fromLength = count($from);
-        $toLength   = count($to);
-        $width      = $fromLength + 1;
-        $matrix     = new \SplFixedArray($width * ($toLength + 1));
-
-        for ($i = 0; $i <= $fromLength; ++$i) {
-            $matrix[$i] = 0;
-        }
-
-        for ($j = 0; $j <= $toLength; ++$j) {
-            $matrix[$j * $width] = 0;
-        }
-
-        for ($i = 1; $i <= $fromLength; ++$i) {
-            for ($j = 1; $j <= $toLength; ++$j) {
-                $o = ($j * $width) + $i;
-                $matrix[$o] = max(
-                    $matrix[$o - 1],
-                    $matrix[$o - $width],
-                    $from[$i - 1] === $to[$j - 1] ? $matrix[$o - $width - 1] + 1 : 0
-                );
-            }
-        }
-
-        $i = $fromLength;
-        $j = $toLength;
-
-        while ($i > 0 && $j > 0) {
-            if ($from[$i-1] === $to[$j-1]) {
-                $common[] = $from[$i-1];
-                --$i;
-                --$j;
-            } else {
-                $o = ($j * $width) + $i;
-                if ($matrix[$o - $width] > $matrix[$o - 1]) {
-                    --$j;
-                } else {
-                    --$i;
-                }
-            }
-        }
-
-        return array_reverse($common);
-    }
-}
diff --git a/vendor/sebastian/diff/src/Line.php b/vendor/sebastian/diff/src/Line.php
deleted file mode 100644
index 28c66aa2..00000000
--- a/vendor/sebastian/diff/src/Line.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff;
-
-/**
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Kore Nordmann <mail@kore-nordmann.de>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-class Line
-{
-    const ADDED = 1;
-    const REMOVED = 2;
-    const UNCHANGED = 3;
-
-    /**
-     * @var int
-     */
-    private $type;
-
-    /**
-     * @var string
-     */
-    private $content;
-
-    /**
-     * @param int    $type
-     * @param string $content
-     */
-    public function __construct($type = self::UNCHANGED, $content = '')
-    {
-        $this->type    = $type;
-        $this->content = $content;
-    }
-
-    /**
-     * @return string
-     */
-    public function getContent()
-    {
-        return $this->content;
-    }
-
-    /**
-     * @return int
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-}
diff --git a/vendor/sebastian/diff/src/Parser.php b/vendor/sebastian/diff/src/Parser.php
deleted file mode 100644
index 79e2413e..00000000
--- a/vendor/sebastian/diff/src/Parser.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff;
-
-/**
- * Unified diff parser.
- *
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Kore Nordmann <mail@kore-nordmann.de>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-class Parser
-{
-    /**
-     * @param  string $string
-     * @return Diff[]
-     */
-    public function parse($string)
-    {
-        $lines     = preg_split('(\r\n|\r|\n)', $string);
-        $lineCount = count($lines);
-        $diffs     = array();
-        $diff      = null;
-        $collected = array();
-
-        for ($i = 0; $i < $lineCount; ++$i) {
-            if (preg_match('(^---\\s+(?P<file>\\S+))', $lines[$i], $fromMatch) &&
-                preg_match('(^\\+\\+\\+\\s+(?P<file>\\S+))', $lines[$i + 1], $toMatch)) {
-                if ($diff !== null) {
-                    $this->parseFileDiff($diff, $collected);
-                    $diffs[]   = $diff;
-                    $collected = array();
-                }
-
-                $diff = new Diff($fromMatch['file'], $toMatch['file']);
-                ++$i;
-            } else {
-                if (preg_match('/^(?:diff --git |index [\da-f\.]+|[+-]{3} [ab])/', $lines[$i])) {
-                    continue;
-                }
-                $collected[] = $lines[$i];
-            }
-        }
-
-        if (count($collected) && ($diff !== null)) {
-            $this->parseFileDiff($diff, $collected);
-            $diffs[] = $diff;
-        }
-
-        return $diffs;
-    }
-
-    /**
-     * @param Diff  $diff
-     * @param array $lines
-     */
-    private function parseFileDiff(Diff $diff, array $lines)
-    {
-        $chunks = array();
-
-        foreach ($lines as $line) {
-            if (preg_match('/^@@\s+-(?P<start>\d+)(?:,\s*(?P<startrange>\d+))?\s+\+(?P<end>\d+)(?:,\s*(?P<endrange>\d+))?\s+@@/', $line, $match)) {
-                $chunk = new Chunk(
-                    $match['start'],
-                    isset($match['startrange']) ? max(1, $match['startrange']) : 1,
-                    $match['end'],
-                    isset($match['endrange']) ? max(1, $match['endrange']) : 1
-                );
-
-                $chunks[] = $chunk;
-                $diffLines = array();
-                continue;
-            }
-
-            if (preg_match('/^(?P<type>[+ -])?(?P<line>.*)/', $line, $match)) {
-                $type = Line::UNCHANGED;
-
-                if ($match['type'] == '+') {
-                    $type = Line::ADDED;
-                } elseif ($match['type'] == '-') {
-                    $type = Line::REMOVED;
-                }
-
-                $diffLines[] = new Line($type, $match['line']);
-
-                if (isset($chunk)) {
-                    $chunk->setLines($diffLines);
-                }
-            }
-        }
-
-        $diff->setChunks($chunks);
-    }
-}
diff --git a/vendor/sebastian/diff/tests/DifferTest.php b/vendor/sebastian/diff/tests/DifferTest.php
deleted file mode 100644
index a786325bc1b8beae1133a7e459df7563585fa218..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11371
zcmeHNZExC05YAWpD^@5{NPq-GAgRgqk|tEGl$IzV_X(+5>?K$Qo3odsxhVhrW_E33
zgN<<tSL^OvskrNTdFEwzW_Nq``*bu_jt&%ZKzbw7B|~$}2>ec|!-+j4e8k9=IUK@(
z{+&LsL!d<BlD<#w*nqm+q!#(WoQDauEOO@hW9J}vW|{oZVDCMikG3P^4QJyq(e3H8
zV?K;Hp_W0$rp_!EG+RU4nNV)pR)tK*jKbKX$({t?_2<jZ*Sij?7clvVa`Hr7Vwf&>
z%)yK^gFKmh1k_-HYtI~=fg(eoK2j8mPM8aZusL)ec^{2zE6NNM-h8^b2jt&AIzazq
zJKw+cn9DB#OIv&o?2a(^uP^WVU)aQUo;$;#shiB=pC@3$1YU$isoXtt!V-BEeN0_f
z1cNyUh_D}=S%$j;ukxZ0cy!wW^4rdr?jM~i@*AnQL&FzWS7J~N4|cDSt_BW4{-Xnk
zIX(yE{E<2y25;y{{7xP7k#a_M4e%p#JjSVGbEachhBHgYs1ld)`)O%kFiCVMco!p9
zeJ`0ovjri?h@d3={<;hVGL%jTbsYK({Ore6DDps&bNLzb!g?UPL&u&ZeByTS!JwSp
zIQFAyFh@%E{}qtv_9Js#gal7QB1qtxhSv1#3q+WS9}{UsDtNLyzt09RcjoTpkQhSa
zEt@*b^;54qL{OL1`oL}>XPCo`dlx(tQFE=k(S$8Y?*`7TNJqjCw-X`=Dast)`Ey3c
zZYj(d4zLWg=bDlTj*wXqagSh%0@~kCNe4gPn@<N0v+bv|;U7(d9w6RG7KFoy6KO;7
z-)P|ft?R(bg0jh#U_nt%)`A68|MAser8iQOVg2=BLC<n7{8KB!0+6-C?^WqF>T{~s
zE@v*cC!ZLFqABX<y~~W{{sn72G!5a-rL=c>f7k1NA)h)ISDo8Es9jPUbPis>6RDQL
zM{F&M5#IB2a(>>os<dyF2YstpiO_mIm#nI#J-SyRdxJe$pix$|Xij4~hTij(xn1b>
zo!*FAqJOxsj62ah38QZiX^h#js;@AkTCI{U^!cVm#{j-uCSTc8-|`JoVXVGv&~md-
zQY)k$XHo&1(*ky;(T)!T5*}YF5P~Pt@gYl4;>G86y1g6fK+B_Ppx$Mu@klAe`B>7G
zM6jTO`W?!?Qg~4cg<Zk!Cy=CV<2W>NvoVLn@+hkB1*MdODFrk!Q3&LNDk%bJ3tk(&
z2v7LNw|ptL9mZ#lCHvu0B=H1abO`e;VR-&Yq^QfrLrwEGCHv8gMpAsFBuM58>>H3=
zY*yxJAgLh3m)TKA1T4~mq{!F;Ujp!iVHD^C#5tG6AU&YZV9_AnBz-$J(Ye>x3X(pj
z&tMa3iG)Oi31meEHx(y3m^*$gqo^@w$Yd3;MJy0zp|r^8=IjdcX+5(-e#m52tW_Xv
zD^`U-Zqq7M6TvTIwJoc%=ingZh)mH+Fl>vK83xOoi6NG3)(K^?kpq#D@p;8a>xJf<
z{GYFb#gyhJzMGTT7nhQ6S`^bj3<L^&sRt7<Hd%4ffKX^`%ldM6>&?bEhrF#!qyqtO
zlwqxo_lcOlk?fKP-?p}=gF!5VL@aS`L4*;2>y?=_C<r1M3a(KRrC!{&0!26kuq68>
z0nK(i18`t1lHS4Jh5ecDi45!2+?DeMYiU;z-mk!FCHE1q7cuGB{EHdipgDzo!`azc
zr+ckXP1RmZt=8^p^%JeQVryK~8rqAiH5yuRX9d{~9t9TLt_ITVv2n<MaQs(8O=07<
z#{_5m0aG)DNgvIu?{2Y85u0blX`&UENL|#L!i*K71>KIz;jXLLHZ>LCAJ>wRgvf8H
z^}vv)fhMo;l;nXUcV9sRU?;gXAP&SIqxe({#-_!DbB+V&B!~DKh>Kc1EyPH+!{J;Y
z0NzRlE{Nfl3GSmr5`gwPJgTY|+pp-@l}Yy&M8fac5CIx|1fqKG5H)g!=+%$g#-~~H
z4bx1mWtnF!B+fL?PP5H3b)B{J7o_$76Ky!`$1Fy2=F6#{gNX*ISyt6L{E?83b2j%)
zt@-N_fs?A?xV7>J=_DVJu++jM3ft+ghvXH1AJMzqA%bF(hkir^O@s|=t>{QLUTf8p
zHxyee(ChcK*^8~<Sih+~*-}&ch8A)jvb;34VMO_8YQu<fQfr~o!e&G+kol;!VJGFF
z)-EjBIViQT4TpLr9tDms@G3NV4_PP_yn8u#D~Piz?-Zg?uc^n-I#g@Nq;{$`RjpP(
zY_-(W*6B(89VyouwHln&z*V$&0+GPbM21GqXMii~s#<A~vRXM7xAA2RB6KKyi+FuX
z{2MYhD=G+TRZa!xYI@Khd&7u0zZZhR@T-?dFuL+hfIq1;L3XRsk|0(xkg_*v;w8fg
f7rK20|7X`bZYu2tuj1qh&Z7zi{7c?DzbbzN(hb7J

diff --git a/vendor/sebastian/diff/tests/LCS/TimeEfficientImplementationTest.php b/vendor/sebastian/diff/tests/LCS/TimeEfficientImplementationTest.php
deleted file mode 100644
index babc4076..00000000
--- a/vendor/sebastian/diff/tests/LCS/TimeEfficientImplementationTest.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff\LCS;
-
-use PHPUnit_Framework_TestCase;
-
-/**
- * Some of these tests are volontary stressfull, in order to give some approximative benchmark hints.
- */
-class TimeEfficientImplementationTest extends PHPUnit_Framework_TestCase
-{
-    private $implementation;
-    private $memory_limit;
-    private $stress_sizes = array(1, 2, 3, 100, 500, 1000, 2000);
-
-    protected function setUp()
-    {
-        $this->memory_limit = ini_get('memory_limit');
-        ini_set('memory_limit', '256M');
-
-        $this->implementation = new TimeEfficientImplementation;
-    }
-
-    protected function tearDown()
-    {
-        ini_set('memory_limit', $this->memory_limit);
-    }
-
-    public function testBothEmpty()
-    {
-        $from   = array();
-        $to     = array();
-        $common = $this->implementation->calculate($from, $to);
-
-        $this->assertEquals(array(), $common);
-    }
-
-    public function testIsStrictComparison()
-    {
-        $from = array(
-            false, 0, 0.0, '', null, array(),
-            true, 1, 1.0, 'foo', array('foo', 'bar'), array('foo' => 'bar')
-        );
-        $to = $from;
-        $common = $this->implementation->calculate($from, $to);
-
-        $this->assertEquals($from, $common);
-
-        $to = array(
-            false, false, false, false, false, false,
-            true, true, true, true, true, true
-        );
-        $expected = array(
-            false,
-            true,
-        );
-        $common = $this->implementation->calculate($from, $to);
-
-        $this->assertEquals($expected, $common);
-    }
-
-    public function testEqualSequences()
-    {
-        foreach ($this->stress_sizes as $size) {
-            $range  = range(1, $size);
-            $from   = $range;
-            $to     = $range;
-            $common = $this->implementation->calculate($from, $to);
-
-            $this->assertEquals($range, $common);
-        }
-    }
-
-    public function testDistinctSequences()
-    {
-        $from  = array('A');
-        $to    = array('B');
-        $common = $this->implementation->calculate($from, $to);
-        $this->assertEquals(array(), $common);
-
-        $from  = array('A', 'B', 'C');
-        $to    = array('D', 'E', 'F');
-        $common = $this->implementation->calculate($from, $to);
-        $this->assertEquals(array(), $common);
-
-        foreach ($this->stress_sizes as $size) {
-            $from  = range(1, $size);
-            $to    = range($size + 1, $size * 2);
-            $common = $this->implementation->calculate($from, $to);
-            $this->assertEquals(array(), $common);
-        }
-    }
-
-    public function testCommonSubsequence()
-    {
-        $from     = array('A',      'C',      'E', 'F', 'G'     );
-        $to       = array('A', 'B',      'D', 'E',           'H');
-        $expected = array('A',                'E'               );
-        $common   = $this->implementation->calculate($from, $to);
-        $this->assertEquals($expected, $common);
-
-        $from     = array('A',      'C',      'E', 'F', 'G'     );
-        $to       = array(     'B', 'C', 'D', 'E', 'F',      'H');
-        $expected = array('C',                'E', 'F'          );
-        $common   = $this->implementation->calculate($from, $to);
-        $this->assertEquals($expected, $common);
-
-        foreach ($this->stress_sizes as $size) {
-            $from     = $size < 2 ? array(1) : range(1, $size + 1, 2);
-            $to       = $size < 3 ? array(1) : range(1, $size + 1, 3);
-            $expected = $size < 6 ? array(1) : range(1, $size + 1, 6);
-            $common   = $this->implementation->calculate($from, $to);
-
-            $this->assertEquals($expected, $common);
-        }
-    }
-
-    public function testSingleElementSubsequenceAtStart()
-    {
-        foreach ($this->stress_sizes as $size) {
-            $from   = range(1, $size);
-            $to     = array_slice($from, 0, 1);
-            $common = $this->implementation->calculate($from, $to);
-
-            $this->assertEquals($to, $common);
-        }
-    }
-
-    public function testSingleElementSubsequenceAtMiddle()
-    {
-        foreach ($this->stress_sizes as $size) {
-            $from   = range(1, $size);
-            $to     = array_slice($from, (int) $size / 2, 1);
-            $common = $this->implementation->calculate($from, $to);
-
-            $this->assertEquals($to, $common);
-        }
-    }
-
-    public function testSingleElementSubsequenceAtEnd()
-    {
-        foreach ($this->stress_sizes as $size) {
-            $from   = range(1, $size);
-            $to     = array_slice($from, $size - 1, 1);
-            $common = $this->implementation->calculate($from, $to);
-
-            $this->assertEquals($to, $common);
-        }
-    }
-
-    public function testReversedSequences()
-    {
-        $from     = array('A', 'B');
-        $to       = array('B', 'A');
-        $expected = array('A');
-        $common   = $this->implementation->calculate($from, $to);
-        $this->assertEquals($expected, $common);
-
-        foreach ($this->stress_sizes as $size) {
-            $from   = range(1, $size);
-            $to     = array_reverse($from);
-            $common = $this->implementation->calculate($from, $to);
-
-            $this->assertEquals(array(1), $common);
-        }
-    }
-}
diff --git a/vendor/sebastian/diff/tests/ParserTest.php b/vendor/sebastian/diff/tests/ParserTest.php
deleted file mode 100644
index 3a7b9720..00000000
--- a/vendor/sebastian/diff/tests/ParserTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff;
-
-use PHPUnit_Framework_TestCase;
-
-class ParserTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var Parser
-     */
-    private $parser;
-
-    protected function setUp()
-    {
-        $this->parser = new Parser;
-    }
-
-    public function testParse()
-    {
-        $content = file_get_contents(__DIR__ . '/fixtures/patch.txt');
-
-        $diffs = $this->parser->parse($content);
-
-        $this->assertCount(1, $diffs);
-
-        $chunks = $diffs[0]->getChunks();
-        $this->assertCount(1, $chunks);
-
-        $this->assertEquals(20, $chunks[0]->getStart());
-
-        $this->assertCount(5, $chunks[0]->getLines());
-    }
-
-    public function testParseWithMultipleChunks()
-    {
-        $content = file_get_contents(__DIR__ . '/fixtures/patch2.txt');
-
-        $diffs = $this->parser->parse($content);
-
-        $this->assertCount(1, $diffs);
-
-        $chunks = $diffs[0]->getChunks();
-        $this->assertCount(3, $chunks);
-
-        $this->assertEquals(20, $chunks[0]->getStart());
-        $this->assertEquals(320, $chunks[1]->getStart());
-        $this->assertEquals(600, $chunks[2]->getStart());
-
-        $this->assertCount(5, $chunks[0]->getLines());
-        $this->assertCount(5, $chunks[1]->getLines());
-        $this->assertCount(5, $chunks[2]->getLines());
-    }
-}
diff --git a/vendor/sebastian/diff/tests/fixtures/patch.txt b/vendor/sebastian/diff/tests/fixtures/patch.txt
deleted file mode 100644
index 144b61d0..00000000
--- a/vendor/sebastian/diff/tests/fixtures/patch.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Foo.php b/Foo.php
-index abcdefg..abcdefh 100644
---- a/Foo.php
-+++ b/Foo.php
-@@ -20,4 +20,5 @@ class Foo
-     const ONE = 1;
-     const TWO = 2;
-+    const THREE = 3;
-     const FOUR = 4;
diff --git a/vendor/sebastian/diff/tests/fixtures/patch2.txt b/vendor/sebastian/diff/tests/fixtures/patch2.txt
deleted file mode 100644
index 41fbc959..00000000
--- a/vendor/sebastian/diff/tests/fixtures/patch2.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Foo.php b/Foo.php
-index abcdefg..abcdefh 100644
---- a/Foo.php
-+++ b/Foo.php
-@@ -20,4 +20,5 @@ class Foo
-     const ONE = 1;
-     const TWO = 2;
-+    const THREE = 3;
-     const FOUR = 4;
-
-@@ -320,4 +320,5 @@ class Foo
-     const A = 'A';
-     const B = 'B';
-+    const C = 'C';
-     const D = 'D';
-
-@@ -600,4 +600,5 @@ class Foo
-     public function doSomething() {
-
-+        return 'foo';
-     }
diff --git a/vendor/sebastian/environment/.gitignore b/vendor/sebastian/environment/.gitignore
deleted file mode 100644
index 57948548..00000000
--- a/vendor/sebastian/environment/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/.idea
-/vendor
-/composer.lock
-/composer.phar
-/phpunit.xml
diff --git a/vendor/sebastian/environment/.travis.yml b/vendor/sebastian/environment/.travis.yml
deleted file mode 100644
index 76a9bde4..00000000
--- a/vendor/sebastian/environment/.travis.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-language: php
-
-before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-notifications:
-  email: false
diff --git a/vendor/sebastian/environment/LICENSE b/vendor/sebastian/environment/LICENSE
deleted file mode 100644
index 08539af4..00000000
--- a/vendor/sebastian/environment/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Environment
-
-Copyright (c) 2014-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/environment/README.md b/vendor/sebastian/environment/README.md
deleted file mode 100644
index 5f3cb3b9..00000000
--- a/vendor/sebastian/environment/README.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# Environment
-
-This component provides functionality that helps writing PHP code that has runtime-specific (PHP / HHVM) execution paths.
-
-[![Latest Stable Version](https://poser.pugx.org/sebastian/environment/v/stable.png)](https://packagist.org/packages/sebastian/environment)
-[![Build Status](https://travis-ci.org/sebastianbergmann/environment.png?branch=master)](https://travis-ci.org/sebastianbergmann/environment)
-
-## Installation
-
-To add Environment as a local, per-project dependency to your project, simply add a dependency on `sebastian/environment` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Environment 1.0:
-
-    {
-        "require": {
-            "sebastian/environment": "1.0.*"
-        }
-    }
-
-## Usage
-
-```php
-<?php
-use SebastianBergmann\Environment\Runtime;
-
-$runtime = new Runtime;
-
-var_dump($runtime->getNameWithVersion());
-var_dump($runtime->getName());
-var_dump($runtime->getVersion());
-var_dump($runtime->getBinary());
-var_dump($runtime->isHHVM());
-var_dump($runtime->isPHP());
-var_dump($runtime->hasXdebug());
-var_dump($runtime->canCollectCodeCoverage());
-```
-
-### Output on PHP
-
-    $ php --version
-    PHP 5.5.8 (cli) (built: Jan  9 2014 08:33:30)
-    Copyright (c) 1997-2013 The PHP Group
-    Zend Engine v2.5.0, Copyright (c) 1998-2013 Zend Technologies
-        with Xdebug v2.2.3, Copyright (c) 2002-2013, by Derick Rethans
-
-
-    $ php example.php
-    string(9) "PHP 5.5.8"
-    string(3) "PHP"
-    string(5) "5.5.8"
-    string(14) "'/usr/bin/php'"
-    bool(false)
-    bool(true)
-    bool(true)
-    bool(true)
-
-### Output on HHVM
-
-    $ hhvm --version
-    HipHop VM 2.4.0-dev (rel)
-    Compiler: heads/master-0-ga98e57cabee7e7f0d14493ab17d5c7ab0157eb98
-    Repo schema: 8d6e69287c41c1f09bb4d327421720d1922cfc67
-
-
-    $ hhvm example.php
-    string(14) "HHVM 2.4.0-dev"
-    string(4) "HHVM"
-    string(9) "2.4.0-dev"
-    string(42) "'/usr/local/src/hhvm/hphp/hhvm/hhvm' --php"
-    bool(true)
-    bool(false)
-    bool(false)
-    bool(true)
-
diff --git a/vendor/sebastian/environment/build.xml b/vendor/sebastian/environment/build.xml
deleted file mode 100644
index 92fb1c54..00000000
--- a/vendor/sebastian/environment/build.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="environment">
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/vendor"/>
-  <delete file="${basedir}/composer.lock"/>
- </target>
-
- <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
-  </exec>
- </target>
-</project>
diff --git a/vendor/sebastian/environment/composer.json b/vendor/sebastian/environment/composer.json
deleted file mode 100644
index fd3ec7dc..00000000
--- a/vendor/sebastian/environment/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "name": "sebastian/environment",
-    "description": "Provides functionality to handle HHVM/PHP environments",
-    "keywords": ["environment","hhvm","xdebug"],
-    "homepage": "http://www.github.com/sebastianbergmann/environment",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.4"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.3.x-dev"
-        }
-    }
-}
diff --git a/vendor/sebastian/environment/phpunit.xml.dist b/vendor/sebastian/environment/phpunit.xml.dist
deleted file mode 100644
index 75148fde..00000000
--- a/vendor/sebastian/environment/phpunit.xml.dist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         checkForUnintentionallyCoveredCode="true"
-         verbose="true">
- <testsuites>
-  <testsuite name="Environment">
-   <directory>tests</directory>
-  </testsuite>
- </testsuites>
- <filter>
-  <whitelist addUncoveredFilesFromWhitelist="true">
-   <directory>src</directory>
-  </whitelist>
- </filter>
-</phpunit>
diff --git a/vendor/sebastian/environment/src/Console.php b/vendor/sebastian/environment/src/Console.php
deleted file mode 100644
index 9f15d547..00000000
--- a/vendor/sebastian/environment/src/Console.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/*
- * This file is part of the Environment package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Environment;
-
-/**
- */
-class Console
-{
-    const STDIN  = 0;
-    const STDOUT = 1;
-    const STDERR = 2;
-
-    /**
-     * Returns true if STDOUT supports colorization.
-     *
-     * This code has been copied and adapted from
-     * Symfony\Component\Console\Output\OutputStream.
-     *
-     * @return bool
-     */
-    public function hasColorSupport()
-    {
-        if (DIRECTORY_SEPARATOR == '\\') {
-            return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI');
-        }
-
-        if (!defined('STDOUT')) {
-            return false;
-        }
-
-        return $this->isInteractive(STDOUT);
-    }
-
-    /**
-     * Returns the number of columns of the terminal.
-     *
-     * @return int
-     */
-    public function getNumberOfColumns()
-    {
-        // Windows terminals have a fixed size of 80
-        // but one column is used for the cursor.
-        if (DIRECTORY_SEPARATOR == '\\') {
-            return 79;
-        }
-
-        if (!$this->isInteractive(self::STDIN)) {
-            return 80;
-        }
-
-        if (preg_match('#\d+ (\d+)#', shell_exec('stty size'), $match) === 1) {
-            return (int) $match[1];
-        }
-
-        if (preg_match('#columns = (\d+);#', shell_exec('stty'), $match) === 1) {
-            return (int) $match[1];
-        }
-
-        return 80;
-    }
-
-    /**
-     * Returns if the file descriptor is an interactive terminal or not.
-     *
-     * @param int|resource $fileDescriptor
-     *
-     * @return bool
-     */
-    public function isInteractive($fileDescriptor = self::STDOUT)
-    {
-        return function_exists('posix_isatty') && @posix_isatty($fileDescriptor);
-    }
-}
diff --git a/vendor/sebastian/environment/src/Runtime.php b/vendor/sebastian/environment/src/Runtime.php
deleted file mode 100644
index f12071a6..00000000
--- a/vendor/sebastian/environment/src/Runtime.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/*
- * This file is part of the Environment package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Environment;
-
-/**
- * Utility class for HHVM/PHP environment handling.
- */
-class Runtime
-{
-    /**
-     * @var string
-     */
-    private static $binary;
-
-    /**
-     * Returns true when Xdebug is supported or
-     * the runtime used is PHPDBG (PHP >= 7.0).
-     *
-     * @return bool
-     */
-    public function canCollectCodeCoverage()
-    {
-        return $this->hasXdebug() || $this->hasPHPDBGCodeCoverage();
-    }
-
-    /**
-     * Returns the path to the binary of the current runtime.
-     * Appends ' --php' to the path when the runtime is HHVM.
-     *
-     * @return string
-     */
-    public function getBinary()
-    {
-        // HHVM
-        if (self::$binary === null && $this->isHHVM()) {
-            if ((self::$binary = getenv('PHP_BINARY')) === false) {
-                self::$binary = PHP_BINARY;
-            }
-
-            self::$binary = escapeshellarg(self::$binary) . ' --php';
-        }
-
-        // PHP >= 5.4.0
-        if (self::$binary === null && defined('PHP_BINARY')) {
-            self::$binary = escapeshellarg(PHP_BINARY);
-        }
-
-        // PHP < 5.4.0
-        if (self::$binary === null) {
-            if (PHP_SAPI == 'cli' && isset($_SERVER['_'])) {
-                if (strpos($_SERVER['_'], 'phpunit') !== false) {
-                    $file = file($_SERVER['_']);
-
-                    if (strpos($file[0], ' ') !== false) {
-                        $tmp          = explode(' ', $file[0]);
-                        self::$binary = escapeshellarg(trim($tmp[1]));
-                    } else {
-                        self::$binary = escapeshellarg(ltrim(trim($file[0]), '#!'));
-                    }
-                } elseif (strpos(basename($_SERVER['_']), 'php') !== false) {
-                    self::$binary = escapeshellarg($_SERVER['_']);
-                }
-            }
-        }
-
-        if (self::$binary === null) {
-            $possibleBinaryLocations = array(
-                PHP_BINDIR . '/php',
-                PHP_BINDIR . '/php-cli.exe',
-                PHP_BINDIR . '/php.exe'
-            );
-
-            foreach ($possibleBinaryLocations as $binary) {
-                if (is_readable($binary)) {
-                    self::$binary = escapeshellarg($binary);
-                    break;
-                }
-            }
-        }
-
-        if (self::$binary === null) {
-            self::$binary = 'php';
-        }
-
-        return self::$binary;
-    }
-
-    /**
-     * @return string
-     */
-    public function getNameWithVersion()
-    {
-        return $this->getName() . ' ' . $this->getVersion();
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        if ($this->isHHVM()) {
-            return 'HHVM';
-        } elseif ($this->isPHPDBG()) {
-            return 'PHPDBG';
-        } else {
-            return 'PHP';
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getVendorUrl()
-    {
-        if ($this->isHHVM()) {
-            return 'http://hhvm.com/';
-        } else {
-            return 'http://php.net/';
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getVersion()
-    {
-        if ($this->isHHVM()) {
-            return HHVM_VERSION;
-        } else {
-            return PHP_VERSION;
-        }
-    }
-
-    /**
-     * Returns true when the runtime used is PHP and Xdebug is loaded.
-     *
-     * @return bool
-     */
-    public function hasXdebug()
-    {
-        return ($this->isPHP() || $this->isHHVM()) && extension_loaded('xdebug');
-    }
-
-    /**
-     * Returns true when the runtime used is HHVM.
-     *
-     * @return bool
-     */
-    public function isHHVM()
-    {
-        return defined('HHVM_VERSION');
-    }
-
-    /**
-     * Returns true when the runtime used is PHP without the PHPDBG SAPI.
-     *
-     * @return bool
-     */
-    public function isPHP()
-    {
-        return !$this->isHHVM() && !$this->isPHPDBG();
-    }
-
-    /**
-     * Returns true when the runtime used is PHP with the PHPDBG SAPI.
-     *
-     * @return bool
-     */
-    public function isPHPDBG()
-    {
-        return PHP_SAPI === 'phpdbg' && !$this->isHHVM();
-    }
-
-    /**
-     * Returns true when the runtime used is PHP with the PHPDBG SAPI
-     * and the phpdbg_*_oplog() functions are available (PHP >= 7.0).
-     *
-     * @return bool
-     */
-    public function hasPHPDBGCodeCoverage()
-    {
-        return $this->isPHPDBG() && function_exists('phpdbg_start_oplog');
-    }
-}
diff --git a/vendor/sebastian/environment/tests/ConsoleTest.php b/vendor/sebastian/environment/tests/ConsoleTest.php
deleted file mode 100644
index 6b40172b..00000000
--- a/vendor/sebastian/environment/tests/ConsoleTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/*
- * This file is part of the Environment package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Environment;
-
-use PHPUnit_Framework_TestCase;
-
-class ConsoleTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var \SebastianBergmann\Environment\Console
-     */
-    private $console;
-
-    protected function setUp()
-    {
-        $this->console = new Console;
-    }
-
-    /**
-     * @covers \SebastianBergmann\Environment\Console::isInteractive
-     */
-    public function testCanDetectIfStdoutIsInteractiveByDefault()
-    {
-        $this->assertInternalType('boolean', $this->console->isInteractive());
-    }
-
-    /**
-     * @covers \SebastianBergmann\Environment\Console::isInteractive
-     */
-    public function testCanDetectIfFileDescriptorIsInteractive()
-    {
-        $this->assertInternalType('boolean', $this->console->isInteractive(STDOUT));
-    }
-
-    /**
-     * @covers \SebastianBergmann\Environment\Console::hasColorSupport
-     * @uses   \SebastianBergmann\Environment\Console::isInteractive
-     */
-    public function testCanDetectColorSupport()
-    {
-        $this->assertInternalType('boolean', $this->console->hasColorSupport());
-    }
-
-    /**
-     * @covers \SebastianBergmann\Environment\Console::getNumberOfColumns
-     * @uses   \SebastianBergmann\Environment\Console::isInteractive
-     */
-    public function testCanDetectNumberOfColumns()
-    {
-        $this->assertInternalType('integer', $this->console->getNumberOfColumns());
-    }
-}
diff --git a/vendor/sebastian/environment/tests/RuntimeTest.php b/vendor/sebastian/environment/tests/RuntimeTest.php
deleted file mode 100644
index 8ea83730..00000000
--- a/vendor/sebastian/environment/tests/RuntimeTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/*
- * This file is part of the Environment package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Environment;
-
-use PHPUnit_Framework_TestCase;
-
-class RuntimeTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var \SebastianBergmann\Environment\Runtime
-     */
-    private $env;
-
-    protected function setUp()
-    {
-        $this->env = new Runtime;
-    }
-
-    /**
-     * @covers \SebastianBergmann\Environment\Runtime::canCollectCodeCoverage
-     * @uses   \SebastianBergmann\Environment\Runtime::hasXdebug
-     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
-     * @uses   \SebastianBergmann\Environment\Runtime::isPHP
-     */
-    public function testAbilityToCollectCodeCoverageCanBeAssessed()
-    {
-        $this->assertInternalType('boolean', $this->env->canCollectCodeCoverage());
-    }
-
-    /**
-     * @covers \SebastianBergmann\Environment\Runtime::getBinary
-     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
-     */
-    public function testBinaryCanBeRetrieved()
-    {
-        $this->assertInternalType('string', $this->env->getBinary());
-    }
-
-    /**
-     * @covers \SebastianBergmann\Environment\Runtime::isHHVM
-     */
-    public function testCanBeDetected()
-    {
-        $this->assertInternalType('boolean', $this->env->isHHVM());
-    }
-
-    /**
-     * @covers \SebastianBergmann\Environment\Runtime::isPHP
-     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
-     */
-    public function testCanBeDetected2()
-    {
-        $this->assertInternalType('boolean', $this->env->isPHP());
-    }
-
-    /**
-     * @covers \SebastianBergmann\Environment\Runtime::hasXdebug
-     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
-     * @uses   \SebastianBergmann\Environment\Runtime::isPHP
-     */
-    public function testXdebugCanBeDetected()
-    {
-        $this->assertInternalType('boolean', $this->env->hasXdebug());
-    }
-
-    /**
-     * @covers \SebastianBergmann\Environment\Runtime::getNameWithVersion
-     * @uses   \SebastianBergmann\Environment\Runtime::getName
-     * @uses   \SebastianBergmann\Environment\Runtime::getVersion
-     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
-     * @uses   \SebastianBergmann\Environment\Runtime::isPHP
-     */
-    public function testNameAndVersionCanBeRetrieved()
-    {
-        $this->assertInternalType('string', $this->env->getNameWithVersion());
-    }
-
-    /**
-     * @covers \SebastianBergmann\Environment\Runtime::getName
-     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
-     */
-    public function testNameCanBeRetrieved()
-    {
-        $this->assertInternalType('string', $this->env->getName());
-    }
-
-    /**
-     * @covers \SebastianBergmann\Environment\Runtime::getVersion
-     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
-     */
-    public function testVersionCanBeRetrieved()
-    {
-        $this->assertInternalType('string', $this->env->getVersion());
-    }
-
-    /**
-     * @covers \SebastianBergmann\Environment\Runtime::getVendorUrl
-     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
-     */
-    public function testVendorUrlCanBeRetrieved()
-    {
-        $this->assertInternalType('string', $this->env->getVendorUrl());
-    }
-}
diff --git a/vendor/sebastian/exporter/.gitignore b/vendor/sebastian/exporter/.gitignore
deleted file mode 100644
index 3beb10f9..00000000
--- a/vendor/sebastian/exporter/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.idea
-phpunit.xml
-composer.lock
-composer.phar
-vendor/
-cache.properties
-build/LICENSE
-build/README.md
-build/*.tgz
diff --git a/vendor/sebastian/exporter/.travis.yml b/vendor/sebastian/exporter/.travis.yml
deleted file mode 100644
index 657519b1..00000000
--- a/vendor/sebastian/exporter/.travis.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-language: php
-
-before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-notifications:
-  email: false
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
-    on_success: always
-    on_failure: always
-    on_start: false
-
diff --git a/vendor/sebastian/exporter/LICENSE b/vendor/sebastian/exporter/LICENSE
deleted file mode 100644
index 55a13d47..00000000
--- a/vendor/sebastian/exporter/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Exporter
-
-Copyright (c) 2002-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/exporter/README.md b/vendor/sebastian/exporter/README.md
deleted file mode 100644
index 9a40a77b..00000000
--- a/vendor/sebastian/exporter/README.md
+++ /dev/null
@@ -1,171 +0,0 @@
-Exporter
-========
-
-[![Build Status](https://secure.travis-ci.org/sebastianbergmann/exporter.png?branch=master)](https://travis-ci.org/sebastianbergmann/exporter)
-
-This component provides the functionality to export PHP variables for visualization.
-
-## Usage
-
-Exporting:
-
-```php
-<?php
-use SebastianBergmann\Exporter\Exporter;
-
-$exporter = new Exporter;
-
-/*
-Exception Object &0000000078de0f0d000000002003a261 (
-    'message' => ''
-    'string' => ''
-    'code' => 0
-    'file' => '/home/sebastianbergmann/test.php'
-    'line' => 34
-    'trace' => Array &0 ()
-    'previous' => null
-)
-*/
-
-print $exporter->export(new Exception);
-```
-
-## Data Types
-
-Exporting simple types:
-
-```php
-<?php
-use SebastianBergmann\Exporter\Exporter;
-
-$exporter = new Exporter;
-
-// 46
-print $exporter->export(46);
-
-// 4.0
-print $exporter->export(4.0);
-
-// 'hello, world!'
-print $exporter->export('hello, world!');
-
-// false
-print $exporter->export(false);
-
-// NAN
-print $exporter->export(acos(8));
-
-// -INF
-print $exporter->export(log(0));
-
-// null
-print $exporter->export(null);
-
-// resource(13) of type (stream)
-print $exporter->export(fopen('php://stderr', 'w'));
-
-// Binary String: 0x000102030405
-print $exporter->export(chr(0) . chr(1) . chr(2) . chr(3) . chr(4) . chr(5));
-```
-
-Exporting complex types:
-
-```php
-<?php
-use SebastianBergmann\Exporter\Exporter;
-
-$exporter = new Exporter;
-
-/*
-Array &0 (
-    0 => Array &1 (
-        0 => 1
-        1 => 2
-        2 => 3
-    )
-    1 => Array &2 (
-        0 => ''
-        1 => 0
-        2 => false
-    )
-)
-*/
-
-print $exporter->export(array(array(1,2,3), array("",0,FALSE)));
-
-/*
-Array &0 (
-    'self' => Array &1 (
-        'self' => Array &1
-    )
-)
-*/
-
-$array = array();
-$array['self'] = &$array;
-print $exporter->export($array);
-
-/*
-stdClass Object &0000000003a66dcc0000000025e723e2 (
-    'self' => stdClass Object &0000000003a66dcc0000000025e723e2
-)
-*/
-
-$obj = new stdClass();
-$obj->self = $obj;
-print $exporter->export($obj);
-```
-
-Compact exports:
-
-```php
-<?php
-use SebastianBergmann\Exporter\Exporter;
-
-$exporter = new Exporter;
-
-// Array ()
-print $exporter->shortenedExport(array());
-
-// Array (...)
-print $exporter->shortenedExport(array(1,2,3,4,5));
-
-// stdClass Object ()
-print $exporter->shortenedExport(new stdClass);
-
-// Exception Object (...)
-print $exporter->shortenedExport(new Exception);
-
-// this\nis\na\nsuper\nlong\nstring\nt...\nspace
-print $exporter->shortenedExport(
-<<<LONG_STRING
-this
-is
-a
-super
-long
-string
-that
-wraps
-a
-lot
-and
-eats
-up
-a
-lot
-of
-space
-LONG_STRING
-);
-```
-
-## Installation
-
-To add Exporter as a local, per-project dependency to your project, simply add a dependency on `sebastian/exporter` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Exporter 1.0:
-
-    {
-        "require": {
-            "sebastian/exporter": "1.0.*"
-        }
-    }
diff --git a/vendor/sebastian/exporter/build.xml b/vendor/sebastian/exporter/build.xml
deleted file mode 100644
index e66a71a6..00000000
--- a/vendor/sebastian/exporter/build.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="exporter">
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/vendor"/>
-  <delete file="${basedir}/composer.lock"/>
- </target>
-
- <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
-  </exec>
- </target>
-</project>
-
diff --git a/vendor/sebastian/exporter/composer.json b/vendor/sebastian/exporter/composer.json
deleted file mode 100644
index 723596e1..00000000
--- a/vendor/sebastian/exporter/composer.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "name": "sebastian/exporter",
-    "description": "Provides the functionality to export PHP variables for visualization",
-    "keywords": ["exporter","export"],
-    "homepage": "http://www.github.com/sebastianbergmann/exporter",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de"
-        },
-        {
-            "name": "Jeff Welch",
-            "email": "whatthejeff@gmail.com"
-        },
-        {
-            "name": "Volker Dusch",
-            "email": "github@wallbash.com"
-        },
-        {
-            "name": "Adam Harvey",
-            "email": "aharvey@php.net"
-        },
-        {
-            "name": "Bernhard Schussek",
-            "email": "bschussek@2bepublished.at"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3",
-        "sebastian/recursion-context": "~1.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.4"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.2.x-dev"
-        }
-    }
-}
-
diff --git a/vendor/sebastian/exporter/phpunit.xml.dist b/vendor/sebastian/exporter/phpunit.xml.dist
deleted file mode 100644
index 8d85af64..00000000
--- a/vendor/sebastian/exporter/phpunit.xml.dist
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         checkForUnintentionallyCoveredCode="true"
-         forceCoversAnnotation="true"
-         verbose="true">
- <testsuites>
-  <testsuite name="exporter">
-   <directory>tests</directory>
-  </testsuite>
- </testsuites>
- <filter>
-  <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
-   <directory>src</directory>
-  </whitelist>
- </filter>
-</phpunit>
-
diff --git a/vendor/sebastian/exporter/src/Exporter.php b/vendor/sebastian/exporter/src/Exporter.php
deleted file mode 100644
index a9f5157c..00000000
--- a/vendor/sebastian/exporter/src/Exporter.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-/*
- * This file is part of the Exporter package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Exporter;
-
-use SebastianBergmann\RecursionContext\Context;
-
-/**
- * A nifty utility for visualizing PHP variables.
- *
- * <code>
- * <?php
- * use SebastianBergmann\Exporter\Exporter;
- *
- * $exporter = new Exporter;
- * print $exporter->export(new Exception);
- * </code>
- */
-class Exporter
-{
-    /**
-     * Exports a value as a string
-     *
-     * The output of this method is similar to the output of print_r(), but
-     * improved in various aspects:
-     *
-     *  - NULL is rendered as "null" (instead of "")
-     *  - TRUE is rendered as "true" (instead of "1")
-     *  - FALSE is rendered as "false" (instead of "")
-     *  - Strings are always quoted with single quotes
-     *  - Carriage returns and newlines are normalized to \n
-     *  - Recursion and repeated rendering is treated properly
-     *
-     * @param  mixed  $value
-     * @param  int    $indentation The indentation level of the 2nd+ line
-     * @return string
-     */
-    public function export($value, $indentation = 0)
-    {
-        return $this->recursiveExport($value, $indentation);
-    }
-
-    /**
-     * @param  mixed   $data
-     * @param  Context $context
-     * @return string
-     */
-    public function shortenedRecursiveExport(&$data, Context $context = null)
-    {
-        $result   = array();
-        $exporter = new self();
-
-        if (!$context) {
-            $context = new Context;
-        }
-
-        $context->add($data);
-
-        foreach ($data as $key => $value) {
-            if (is_array($value)) {
-                if ($context->contains($data[$key]) !== false) {
-                    $result[] = '*RECURSION*';
-                }
-
-                else {
-                    $result[] = sprintf(
-                        'array(%s)',
-                        $this->shortenedRecursiveExport($data[$key], $context)
-                    );
-                }
-            }
-
-            else {
-                $result[] = $exporter->shortenedExport($value);
-            }
-        }
-
-        return implode(', ', $result);
-    }
-
-    /**
-     * Exports a value into a single-line string
-     *
-     * The output of this method is similar to the output of
-     * SebastianBergmann\Exporter\Exporter::export. This method guarantees
-     * thought that the result contains now newlines.
-     *
-     * Newlines are replaced by the visible string '\n'. Contents of arrays
-     * and objects (if any) are replaced by '...'.
-     *
-     * @param  mixed  $value
-     * @return string
-     * @see    SebastianBergmann\Exporter\Exporter::export
-     */
-    public function shortenedExport($value)
-    {
-        if (is_string($value)) {
-            $string = $this->export($value);
-
-            if (strlen($string) > 40) {
-                $string = substr($string, 0, 30) . '...' . substr($string, -7);
-            }
-
-            return str_replace("\n", '\n', $string);
-        }
-
-        if (is_object($value)) {
-            return sprintf(
-                '%s Object (%s)',
-                get_class($value),
-                count($this->toArray($value)) > 0 ? '...' : ''
-            );
-        }
-
-        if (is_array($value)) {
-            return sprintf(
-                'Array (%s)',
-                count($value) > 0 ? '...' : ''
-            );
-        }
-
-        return $this->export($value);
-    }
-
-    /**
-     * Converts an object to an array containing all of its private, protected
-     * and public properties.
-     *
-     * @param  mixed $value
-     * @return array
-     */
-    public function toArray($value)
-    {
-        if (!is_object($value)) {
-            return (array) $value;
-        }
-
-        $array = array();
-
-        foreach ((array) $value as $key => $val) {
-            // properties are transformed to keys in the following way:
-            // private   $property => "\0Classname\0property"
-            // protected $property => "\0*\0property"
-            // public    $property => "property"
-            if (preg_match('/^\0.+\0(.+)$/', $key, $matches)) {
-                $key = $matches[1];
-            }
-
-            // See https://github.com/php/php-src/commit/5721132
-            if ($key === "\0gcdata") {
-                continue;
-            }
-
-            $array[$key] = $val;
-        }
-
-        // Some internal classes like SplObjectStorage don't work with the
-        // above (fast) mechanism nor with reflection in Zend.
-        // Format the output similarly to print_r() in this case
-        if ($value instanceof \SplObjectStorage) {
-            // However, the fast method does work in HHVM, and exposes the
-            // internal implementation. Hide it again.
-            if (property_exists('\SplObjectStorage', '__storage')) {
-                unset($array['__storage']);
-            } elseif (property_exists('\SplObjectStorage', 'storage')) {
-                unset($array['storage']);
-            }
-
-            if (property_exists('\SplObjectStorage', '__key')) {
-                unset($array['__key']);
-            }
-
-            foreach ($value as $key => $val) {
-                $array[spl_object_hash($val)] = array(
-                    'obj' => $val,
-                    'inf' => $value->getInfo(),
-                );
-            }
-        }
-
-        return $array;
-    }
-
-    /**
-     * Recursive implementation of export
-     *
-     * @param  mixed                                       $value       The value to export
-     * @param  int                                         $indentation The indentation level of the 2nd+ line
-     * @param  \SebastianBergmann\RecursionContext\Context $processed   Previously processed objects
-     * @return string
-     * @see    SebastianBergmann\Exporter\Exporter::export
-     */
-    protected function recursiveExport(&$value, $indentation, $processed = null)
-    {
-        if ($value === null) {
-            return 'null';
-        }
-
-        if ($value === true) {
-            return 'true';
-        }
-
-        if ($value === false) {
-            return 'false';
-        }
-
-        if (is_float($value) && floatval(intval($value)) === $value) {
-            return "$value.0";
-        }
-
-        if (is_resource($value)) {
-            return sprintf(
-                'resource(%d) of type (%s)',
-                $value,
-                get_resource_type($value)
-            );
-        }
-
-        if (is_string($value)) {
-            // Match for most non printable chars somewhat taking multibyte chars into account
-            if (preg_match('/[^\x09-\x0d\x20-\xff]/', $value)) {
-                return 'Binary String: 0x' . bin2hex($value);
-            }
-
-            return "'" .
-            str_replace(array("\r\n", "\n\r", "\r"), array("\n", "\n", "\n"), $value) .
-            "'";
-        }
-
-        $whitespace = str_repeat(' ', 4 * $indentation);
-
-        if (!$processed) {
-            $processed = new Context;
-        }
-
-        if (is_array($value)) {
-            if (($key = $processed->contains($value)) !== false) {
-                return 'Array &' . $key;
-            }
-
-            $key    = $processed->add($value);
-            $values = '';
-
-            if (count($value) > 0) {
-                foreach ($value as $k => $v) {
-                    $values .= sprintf(
-                        '%s    %s => %s' . "\n",
-                        $whitespace,
-                        $this->recursiveExport($k, $indentation),
-                        $this->recursiveExport($value[$k], $indentation + 1, $processed)
-                    );
-                }
-
-                $values = "\n" . $values . $whitespace;
-            }
-
-            return sprintf('Array &%s (%s)', $key, $values);
-        }
-
-        if (is_object($value)) {
-            $class = get_class($value);
-
-            if ($hash = $processed->contains($value)) {
-                return sprintf('%s Object &%s', $class, $hash);
-            }
-
-            $hash   = $processed->add($value);
-            $values = '';
-            $array  = $this->toArray($value);
-
-            if (count($array) > 0) {
-                foreach ($array as $k => $v) {
-                    $values .= sprintf(
-                        '%s    %s => %s' . "\n",
-                        $whitespace,
-                        $this->recursiveExport($k, $indentation),
-                        $this->recursiveExport($v, $indentation + 1, $processed)
-                    );
-                }
-
-                $values = "\n" . $values . $whitespace;
-            }
-
-            return sprintf('%s Object &%s (%s)', $class, $hash, $values);
-        }
-
-        return var_export($value, true);
-    }
-}
diff --git a/vendor/sebastian/exporter/tests/ExporterTest.php b/vendor/sebastian/exporter/tests/ExporterTest.php
deleted file mode 100644
index 6b590bfb..00000000
--- a/vendor/sebastian/exporter/tests/ExporterTest.php
+++ /dev/null
@@ -1,333 +0,0 @@
-<?php
-/*
- * This file is part of the Exporter package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Exporter;
-
-/**
- * @covers SebastianBergmann\Exporter\Exporter
- */
-class ExporterTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var Exporter
-     */
-    private $exporter;
-
-    protected function setUp()
-    {
-        $this->exporter = new Exporter;
-    }
-
-    public function exportProvider()
-    {
-        $obj2 = new \stdClass;
-        $obj2->foo = 'bar';
-
-        $obj3 = (object)array(1,2,"Test\r\n",4,5,6,7,8);
-
-        $obj = new \stdClass;
-        //@codingStandardsIgnoreStart
-        $obj->null = null;
-        //@codingStandardsIgnoreEnd
-        $obj->boolean = true;
-        $obj->integer = 1;
-        $obj->double = 1.2;
-        $obj->string = '1';
-        $obj->text = "this\nis\na\nvery\nvery\nvery\nvery\nvery\nvery\rlong\n\rtext";
-        $obj->object = $obj2;
-        $obj->objectagain = $obj2;
-        $obj->array = array('foo' => 'bar');
-        $obj->self = $obj;
-
-        $storage = new \SplObjectStorage;
-        $storage->attach($obj2);
-        $storage->foo = $obj2;
-
-        return array(
-            array(null, 'null'),
-            array(true, 'true'),
-            array(false, 'false'),
-            array(1, '1'),
-            array(1.0, '1.0'),
-            array(1.2, '1.2'),
-            array(fopen('php://memory', 'r'), 'resource(%d) of type (stream)'),
-            array('1', "'1'"),
-            array(array(array(1,2,3), array(3,4,5)),
-        <<<EOF
-Array &0 (
-    0 => Array &1 (
-        0 => 1
-        1 => 2
-        2 => 3
-    )
-    1 => Array &2 (
-        0 => 3
-        1 => 4
-        2 => 5
-    )
-)
-EOF
-            ),
-            // \n\r and \r is converted to \n
-            array("this\nis\na\nvery\nvery\nvery\nvery\nvery\nvery\rlong\n\rtext",
-            <<<EOF
-'this
-is
-a
-very
-very
-very
-very
-very
-very
-long
-text'
-EOF
-            ),
-            array(new \stdClass, 'stdClass Object &%x ()'),
-            array($obj,
-            <<<EOF
-stdClass Object &%x (
-    'null' => null
-    'boolean' => true
-    'integer' => 1
-    'double' => 1.2
-    'string' => '1'
-    'text' => 'this
-is
-a
-very
-very
-very
-very
-very
-very
-long
-text'
-    'object' => stdClass Object &%x (
-        'foo' => 'bar'
-    )
-    'objectagain' => stdClass Object &%x
-    'array' => Array &%d (
-        'foo' => 'bar'
-    )
-    'self' => stdClass Object &%x
-)
-EOF
-            ),
-            array(array(), 'Array &%d ()'),
-            array($storage,
-            <<<EOF
-SplObjectStorage Object &%x (
-    'foo' => stdClass Object &%x (
-        'foo' => 'bar'
-    )
-    '%x' => Array &0 (
-        'obj' => stdClass Object &%x
-        'inf' => null
-    )
-)
-EOF
-            ),
-            array($obj3,
-            <<<EOF
-stdClass Object &%x (
-    0 => 1
-    1 => 2
-    2 => 'Test\n'
-    3 => 4
-    4 => 5
-    5 => 6
-    6 => 7
-    7 => 8
-)
-EOF
-            ),
-            array(
-                chr(0) . chr(1) . chr(2) . chr(3) . chr(4) . chr(5),
-                'Binary String: 0x000102030405'
-            ),
-            array(
-                implode('', array_map('chr', range(0x0e, 0x1f))),
-                'Binary String: 0x0e0f101112131415161718191a1b1c1d1e1f'
-            ),
-            array(
-                chr(0x00) . chr(0x09),
-                'Binary String: 0x0009'
-            ),
-            array(
-                '',
-                "''"
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider exportProvider
-     */
-    public function testExport($value, $expected)
-    {
-        $this->assertStringMatchesFormat(
-            $expected,
-            $this->trimNewline($this->exporter->export($value))
-        );
-    }
-
-    public function testExport2()
-    {
-        if (PHP_VERSION === '5.3.3') {
-            $this->markTestSkipped('Skipped due to "Nesting level too deep - recursive dependency?" fatal error');
-        }
-
-        $obj = new \stdClass;
-        $obj->foo = 'bar';
-
-        $array = array(
-            0 => 0,
-            'null' => null,
-            'boolean' => true,
-            'integer' => 1,
-            'double' => 1.2,
-            'string' => '1',
-            'text' => "this\nis\na\nvery\nvery\nvery\nvery\nvery\nvery\rlong\n\rtext",
-            'object' => $obj,
-            'objectagain' => $obj,
-            'array' => array('foo' => 'bar'),
-        );
-
-        $array['self'] = &$array;
-
-        $expected = <<<EOF
-Array &%d (
-    0 => 0
-    'null' => null
-    'boolean' => true
-    'integer' => 1
-    'double' => 1.2
-    'string' => '1'
-    'text' => 'this
-is
-a
-very
-very
-very
-very
-very
-very
-long
-text'
-    'object' => stdClass Object &%x (
-        'foo' => 'bar'
-    )
-    'objectagain' => stdClass Object &%x
-    'array' => Array &%d (
-        'foo' => 'bar'
-    )
-    'self' => Array &%d (
-        0 => 0
-        'null' => null
-        'boolean' => true
-        'integer' => 1
-        'double' => 1.2
-        'string' => '1'
-        'text' => 'this
-is
-a
-very
-very
-very
-very
-very
-very
-long
-text'
-        'object' => stdClass Object &%x
-        'objectagain' => stdClass Object &%x
-        'array' => Array &%d (
-            'foo' => 'bar'
-        )
-        'self' => Array &%d
-    )
-)
-EOF;
-
-        $this->assertStringMatchesFormat(
-            $expected,
-            $this->trimNewline($this->exporter->export($array))
-        );
-    }
-
-    public function shortenedExportProvider()
-    {
-        $obj = new \stdClass;
-        $obj->foo = 'bar';
-
-        $array = array(
-            'foo' => 'bar',
-        );
-
-        return array(
-            array(null, 'null'),
-            array(true, 'true'),
-            array(1, '1'),
-            array(1.0, '1.0'),
-            array(1.2, '1.2'),
-            array('1', "'1'"),
-            // \n\r and \r is converted to \n
-            array("this\nis\na\nvery\nvery\nvery\nvery\nvery\nvery\rlong\n\rtext", "'this\\nis\\na\\nvery\\nvery\\nvery\\nvery...g\\ntext'"),
-            array(new \stdClass, 'stdClass Object ()'),
-            array($obj, 'stdClass Object (...)'),
-            array(array(), 'Array ()'),
-            array($array, 'Array (...)'),
-        );
-    }
-
-    /**
-     * @dataProvider shortenedExportProvider
-     */
-    public function testShortenedExport($value, $expected)
-    {
-        $this->assertSame(
-            $expected,
-            $this->trimNewline($this->exporter->shortenedExport($value))
-        );
-    }
-
-    public function provideNonBinaryMultibyteStrings()
-    {
-        return array(
-            array(implode('', array_map('chr', range(0x09, 0x0d))), 5),
-            array(implode('', array_map('chr', range(0x20, 0x7f))), 96),
-            array(implode('', array_map('chr', range(0x80, 0xff))), 128),
-        );
-    }
-
-
-    /**
-     * @dataProvider provideNonBinaryMultibyteStrings
-     */
-    public function testNonBinaryStringExport($value, $expectedLength)
-    {
-        $this->assertRegExp(
-            "~'.{{$expectedLength}}'\$~s",
-            $this->exporter->export($value)
-        );
-    }
-
-    public function testNonObjectCanBeReturnedAsArray()
-    {
-        $this->assertEquals(array(true), $this->exporter->toArray(true));
-    }
-
-    private function trimNewline($string)
-    {
-        return preg_replace('/[ ]*\n/', "\n", $string);
-    }
-}
diff --git a/vendor/sebastian/recursion-context/.gitignore b/vendor/sebastian/recursion-context/.gitignore
deleted file mode 100644
index 3beb10f9..00000000
--- a/vendor/sebastian/recursion-context/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.idea
-phpunit.xml
-composer.lock
-composer.phar
-vendor/
-cache.properties
-build/LICENSE
-build/README.md
-build/*.tgz
diff --git a/vendor/sebastian/recursion-context/.travis.yml b/vendor/sebastian/recursion-context/.travis.yml
deleted file mode 100644
index c5952a11..00000000
--- a/vendor/sebastian/recursion-context/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: php
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-sudo: false
-
-before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-
-script: ./vendor/bin/phpunit
-
-notifications:
-  email: false
-  irc: "irc.freenode.org#phpunit"
diff --git a/vendor/sebastian/recursion-context/LICENSE b/vendor/sebastian/recursion-context/LICENSE
deleted file mode 100644
index f8c30c27..00000000
--- a/vendor/sebastian/recursion-context/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Recursion Context
-
-Copyright (c) 2002-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/recursion-context/README.md b/vendor/sebastian/recursion-context/README.md
deleted file mode 100644
index bd43985c..00000000
--- a/vendor/sebastian/recursion-context/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Recursion Context
-
-...
-
-## Installation
-
-To add Recursion Context as a local, per-project dependency to your project, simply add a dependency on `sebastian/recursion-context` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Recursion Context 1.0:
-
-    {
-        "require": {
-            "sebastian/recursion-context": "~1.0"
-        }
-    }
diff --git a/vendor/sebastian/recursion-context/build.xml b/vendor/sebastian/recursion-context/build.xml
deleted file mode 100644
index b4fd1935..00000000
--- a/vendor/sebastian/recursion-context/build.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="recursion-context">
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/vendor"/>
-  <delete file="${basedir}/composer.lock"/>
- </target>
-
- <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
-  </exec>
- </target>
-</project>
-
diff --git a/vendor/sebastian/recursion-context/composer.json b/vendor/sebastian/recursion-context/composer.json
deleted file mode 100644
index fed033d2..00000000
--- a/vendor/sebastian/recursion-context/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "sebastian/recursion-context",
-    "description": "Provides functionality to recursively process PHP variables",
-    "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de"
-        },
-        {
-            "name": "Jeff Welch",
-            "email": "whatthejeff@gmail.com"
-        },
-        {
-            "name": "Adam Harvey",
-            "email": "aharvey@php.net"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.4"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
diff --git a/vendor/sebastian/recursion-context/phpunit.xml.dist b/vendor/sebastian/recursion-context/phpunit.xml.dist
deleted file mode 100644
index 757e3e60..00000000
--- a/vendor/sebastian/recursion-context/phpunit.xml.dist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         checkForUnintentionallyCoveredCode="true"
-         forceCoversAnnotation="true"
-         verbose="true">
-<testsuites>
-  <testsuite name="recursion-context">
-   <directory>tests</directory>
-  </testsuite>
- </testsuites>
- <filter>
-  <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
-   <directory>src</directory>
-  </whitelist>
- </filter>
-</phpunit>
diff --git a/vendor/sebastian/recursion-context/src/Context.php b/vendor/sebastian/recursion-context/src/Context.php
deleted file mode 100644
index 06bf6ce8..00000000
--- a/vendor/sebastian/recursion-context/src/Context.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/*
- * This file is part of the Recursion Context package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\RecursionContext;
-
-/**
- * A context containing previously processed arrays and objects
- * when recursively processing a value.
- */
-final class Context
-{
-    /**
-     * @var array[]
-     */
-    private $arrays;
-
-    /**
-     * @var \SplObjectStorage
-     */
-    private $objects;
-
-    /**
-     * Initialises the context
-     */
-    public function __construct()
-    {
-        $this->arrays  = array();
-        $this->objects = new \SplObjectStorage;
-    }
-
-    /**
-     * Adds a value to the context.
-     *
-     * @param  array|object             $value The value to add.
-     * @return int|string               The ID of the stored value, either as
-     *                                        a string or integer.
-     * @throws InvalidArgumentException Thrown if $value is not an array or
-     *                                        object
-     */
-    public function add(&$value)
-    {
-        if (is_array($value)) {
-            return $this->addArray($value);
-        }
-
-        else if (is_object($value)) {
-            return $this->addObject($value);
-        }
-
-        throw new InvalidArgumentException(
-            'Only arrays and objects are supported'
-        );
-    }
-
-    /**
-     * Checks if the given value exists within the context.
-     *
-     * @param  array|object             $value The value to check.
-     * @return int|string|false         The string or integer ID of the stored
-     *                                        value if it has already been seen, or
-     *                                        false if the value is not stored.
-     * @throws InvalidArgumentException Thrown if $value is not an array or
-     *                                        object
-     */
-    public function contains(&$value)
-    {
-        if (is_array($value)) {
-            return $this->containsArray($value);
-        }
-
-        else if (is_object($value)) {
-            return $this->containsObject($value);
-        }
-
-        throw new InvalidArgumentException(
-            'Only arrays and objects are supported'
-        );
-    }
-
-    /**
-     * @param  array    $array
-     * @return bool|int
-     */
-    private function addArray(array &$array)
-    {
-        $key = $this->containsArray($array);
-
-        if ($key !== false) {
-            return $key;
-        }
-
-        $this->arrays[] = &$array;
-
-        return count($this->arrays) - 1;
-    }
-
-    /**
-     * @param  object $object
-     * @return string
-     */
-    private function addObject($object)
-    {
-        if (!$this->objects->contains($object)) {
-            $this->objects->attach($object);
-        }
-
-        return spl_object_hash($object);
-    }
-
-    /**
-     * @param  array     $array
-     * @return int|false
-     */
-    private function containsArray(array &$array)
-    {
-        $keys = array_keys($this->arrays, $array, true);
-        $hash = '_Key_' . hash('sha512', microtime(true));
-
-        foreach ($keys as $key) {
-            $this->arrays[$key][$hash] = $hash;
-
-            if (isset($array[$hash]) && $array[$hash] === $hash) {
-                unset($this->arrays[$key][$hash]);
-
-                return $key;
-            }
-
-            unset($this->arrays[$key][$hash]);
-        }
-
-        return false;
-    }
-
-    /**
-     * @param  object       $value
-     * @return string|false
-     */
-    private function containsObject($value)
-    {
-        if ($this->objects->contains($value)) {
-            return spl_object_hash($value);
-        }
-
-        return false;
-    }
-}
diff --git a/vendor/sebastian/recursion-context/src/Exception.php b/vendor/sebastian/recursion-context/src/Exception.php
deleted file mode 100644
index 4a1557ba..00000000
--- a/vendor/sebastian/recursion-context/src/Exception.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/*
- * This file is part of the Recursion Context package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\RecursionContext;
-
-/**
- */
-interface Exception
-{
-}
diff --git a/vendor/sebastian/recursion-context/src/InvalidArgumentException.php b/vendor/sebastian/recursion-context/src/InvalidArgumentException.php
deleted file mode 100644
index 032c5043..00000000
--- a/vendor/sebastian/recursion-context/src/InvalidArgumentException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/*
- * This file is part of the Recursion Context package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\RecursionContext;
-
-/**
- */
-final class InvalidArgumentException extends \InvalidArgumentException implements Exception
-{
-}
diff --git a/vendor/sebastian/recursion-context/tests/ContextTest.php b/vendor/sebastian/recursion-context/tests/ContextTest.php
deleted file mode 100644
index 8e8cc56f..00000000
--- a/vendor/sebastian/recursion-context/tests/ContextTest.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/*
- * This file is part of the Recursion Context package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\RecursionContext;
-
-use PHPUnit_Framework_TestCase;
-
-/**
- * @covers SebastianBergmann\RecursionContext\Context
- */
-class ContextTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var \SebastianBergmann\RecursionContext\Context
-     */
-    private $context;
-
-    protected function setUp()
-    {
-        $this->context = new Context();
-    }
-
-    public function failsProvider()
-    {
-        return array(
-            array(true),
-            array(false),
-            array(null),
-            array('string'),
-            array(1),
-            array(1.5),
-            array(fopen('php://memory', 'r'))
-        );
-    }
-
-    public function valuesProvider()
-    {
-        $obj2 = new \stdClass();
-        $obj2->foo = 'bar';
-
-        $obj3 = (object) array(1,2,"Test\r\n",4,5,6,7,8);
-
-        $obj = new \stdClass();
-        //@codingStandardsIgnoreStart
-        $obj->null = null;
-        //@codingStandardsIgnoreEnd
-        $obj->boolean = true;
-        $obj->integer = 1;
-        $obj->double = 1.2;
-        $obj->string = '1';
-        $obj->text = "this\nis\na\nvery\nvery\nvery\nvery\nvery\nvery\rlong\n\rtext";
-        $obj->object = $obj2;
-        $obj->objectagain = $obj2;
-        $obj->array = array('foo' => 'bar');
-        $obj->array2 = array(1,2,3,4,5,6);
-        $obj->array3 = array($obj, $obj2, $obj3);
-        $obj->self = $obj;
-
-        $storage = new \SplObjectStorage();
-        $storage->attach($obj2);
-        $storage->foo = $obj2;
-
-        return array(
-            array($obj, spl_object_hash($obj)),
-            array($obj2, spl_object_hash($obj2)),
-            array($obj3, spl_object_hash($obj3)),
-            array($storage, spl_object_hash($storage)),
-            array($obj->array, 0),
-            array($obj->array2, 0),
-            array($obj->array3, 0)
-        );
-    }
-
-    /**
-     * @covers       SebastianBergmann\RecursionContext\Context::add
-     * @uses         SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @dataProvider failsProvider
-     */
-    public function testAddFails($value)
-    {
-        $this->setExpectedException(
-          'SebastianBergmann\\RecursionContext\\Exception',
-          'Only arrays and objects are supported'
-        );
-        $this->context->add($value);
-    }
-
-    /**
-     * @covers       SebastianBergmann\RecursionContext\Context::contains
-     * @uses         SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @dataProvider failsProvider
-     */
-    public function testContainsFails($value)
-    {
-        $this->setExpectedException(
-          'SebastianBergmann\\RecursionContext\\Exception',
-          'Only arrays and objects are supported'
-        );
-        $this->context->contains($value);
-    }
-
-    /**
-     * @covers       SebastianBergmann\RecursionContext\Context::add
-     * @dataProvider valuesProvider
-     */
-    public function testAdd($value, $key)
-    {
-        $this->assertEquals($key, $this->context->add($value));
-
-        // Test we get the same key on subsequent adds
-        $this->assertEquals($key, $this->context->add($value));
-    }
-
-    /**
-     * @covers       SebastianBergmann\RecursionContext\Context::contains
-     * @uses         SebastianBergmann\RecursionContext\Context::add
-     * @depends      testAdd
-     * @dataProvider valuesProvider
-     */
-    public function testContainsFound($value, $key)
-    {
-        $this->context->add($value);
-        $this->assertEquals($key, $this->context->contains($value));
-
-        // Test we get the same key on subsequent calls
-        $this->assertEquals($key, $this->context->contains($value));
-    }
-
-    /**
-     * @covers       SebastianBergmann\RecursionContext\Context::contains
-     * @dataProvider valuesProvider
-     */
-    public function testContainsNotFound($value)
-    {
-        $this->assertFalse($this->context->contains($value));
-    }
-}
diff --git a/vendor/sebastian/version/.gitattributes b/vendor/sebastian/version/.gitattributes
deleted file mode 100644
index 461090b7..00000000
--- a/vendor/sebastian/version/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.php diff=php
diff --git a/vendor/sebastian/version/.gitignore b/vendor/sebastian/version/.gitignore
deleted file mode 100644
index a09c56df..00000000
--- a/vendor/sebastian/version/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/.idea
diff --git a/vendor/sebastian/version/LICENSE b/vendor/sebastian/version/LICENSE
deleted file mode 100644
index 5b79c41f..00000000
--- a/vendor/sebastian/version/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Version
-
-Copyright (c) 2013-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/version/README.md b/vendor/sebastian/version/README.md
deleted file mode 100644
index be6b687b..00000000
--- a/vendor/sebastian/version/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Version
-
-**Version** is a library that helps with managing the version number of Git-hosted PHP projects.
-
-## Installation
-
-Simply add a dependency on `sebastian/version` to your project's `composer.json` file if you use [Composer](http://getcomposer.org/) to manage the dependencies of your project.
-
-## Usage
-
-The constructor of the `SebastianBergmann\Version` class expects two parameters:
-
-* `$release` is the version number of the latest release (`X.Y.Z`, for instance) or the name of the release series (`X.Y`) when no release has been made from that branch / for that release series yet.
-* `$path` is the path to the directory (or a subdirectory thereof) where the sourcecode of the project can be found. Simply passing `__DIR__` here usually suffices.
-
-Apart from the constructor, the `SebastianBergmann\Version` class has a single public method: `getVersion()`.
-
-Here is a contrived example that shows the basic usage:
-
-    <?php
-    $version = new SebastianBergmann\Version(
-      '3.7.10', '/usr/local/src/phpunit'
-    );
-
-    var_dump($version->getVersion());
-    ?>
-
-    string(18) "3.7.10-17-g00f3408"
-
-When a new release is prepared, the string that is passed to the constructor as the first argument needs to be updated.
-
-### How SebastianBergmann\Version::getVersion() works
-
-* If `$path` is not (part of) a Git repository and `$release` is in `X.Y.Z` format then `$release` is returned as-is.
-* If `$path` is not (part of) a Git repository and `$release` is in `X.Y` format then `$release` is returned suffixed with `-dev`.
-* If `$path` is (part of) a Git repository and `$release` is in `X.Y.Z` format then the output of `git describe --tags` is returned as-is.
-* If `$path` is (part of) a Git repository and `$release` is in `X.Y` format then a string is returned that begins with `X.Y` and ends with information from `git describe --tags`.
diff --git a/vendor/sebastian/version/composer.json b/vendor/sebastian/version/composer.json
deleted file mode 100644
index 39d65697..00000000
--- a/vendor/sebastian/version/composer.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "name": "sebastian/version",
-    "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-    "homepage": "https://github.com/sebastianbergmann/version",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de",
-            "role": "lead"
-        }
-    ],
-    "support": {
-        "issues": "https://github.com/sebastianbergmann/version/issues"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    }
-}
diff --git a/vendor/sebastian/version/src/Version.php b/vendor/sebastian/version/src/Version.php
deleted file mode 100644
index 3cb3e092..00000000
--- a/vendor/sebastian/version/src/Version.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/*
- * This file is part of the Version package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann;
-
-/**
- * @since Class available since Release 1.0.0
- */
-class Version
-{
-    private $path;
-    private $release;
-    private $version;
-
-    /**
-     * @param string $release
-     * @param string $path
-     */
-    public function __construct($release, $path)
-    {
-        $this->release = $release;
-        $this->path    = $path;
-    }
-
-    /**
-     * @return string
-     */
-    public function getVersion()
-    {
-        if ($this->version === null) {
-            if (count(explode('.', $this->release)) == 3) {
-                $this->version = $this->release;
-            } else {
-                $this->version = $this->release . '-dev';
-            }
-
-            $git = $this->getGitInformation($this->path);
-
-            if ($git) {
-                if (count(explode('.', $this->release)) == 3) {
-                    $this->version = $git;
-                } else {
-                    $git = explode('-', $git);
-
-                    $this->version = $this->release . '-' . end($git);
-                }
-            }
-        }
-
-        return $this->version;
-    }
-
-    /**
-     * @param  string      $path
-     * @return bool|string
-     */
-    private function getGitInformation($path)
-    {
-        if (!is_dir($path . DIRECTORY_SEPARATOR . '.git')) {
-            return false;
-        }
-
-        $dir = getcwd();
-        chdir($path);
-        $returnCode = 1;
-        $result     = @exec('git describe --tags 2>&1', $output, $returnCode);
-        chdir($dir);
-
-        if ($returnCode !== 0) {
-            return false;
-        }
-
-        return $result;
-    }
-}
diff --git a/vendor/symfony/yaml/.gitignore b/vendor/symfony/yaml/.gitignore
deleted file mode 100644
index c49a5d8d..00000000
--- a/vendor/symfony/yaml/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/yaml/CHANGELOG.md b/vendor/symfony/yaml/CHANGELOG.md
deleted file mode 100644
index 096cf654..00000000
--- a/vendor/symfony/yaml/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-CHANGELOG
-=========
-
-2.1.0
------
-
- * Yaml::parse() does not evaluate loaded files as PHP files by default
-   anymore (call Yaml::enablePhpParsing() to get back the old behavior)
diff --git a/vendor/symfony/yaml/Dumper.php b/vendor/symfony/yaml/Dumper.php
deleted file mode 100644
index 39cdcfc5..00000000
--- a/vendor/symfony/yaml/Dumper.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Yaml;
-
-/**
- * Dumper dumps PHP variables to YAML strings.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Dumper
-{
-    /**
-     * The amount of spaces to use for indentation of nested nodes.
-     *
-     * @var int
-     */
-    protected $indentation = 4;
-
-    /**
-     * Sets the indentation.
-     *
-     * @param int $num The amount of spaces to use for indentation of nested nodes.
-     */
-    public function setIndentation($num)
-    {
-        $this->indentation = (int) $num;
-    }
-
-    /**
-     * Dumps a PHP value to YAML.
-     *
-     * @param mixed $input                  The PHP value
-     * @param int   $inline                 The level where you switch to inline YAML
-     * @param int   $indent                 The level of indentation (used internally)
-     * @param bool  $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
-     * @param bool  $objectSupport          true if object support is enabled, false otherwise
-     *
-     * @return string The YAML representation of the PHP value
-     */
-    public function dump($input, $inline = 0, $indent = 0, $exceptionOnInvalidType = false, $objectSupport = false)
-    {
-        $output = '';
-        $prefix = $indent ? str_repeat(' ', $indent) : '';
-
-        if ($inline <= 0 || !is_array($input) || empty($input)) {
-            $output .= $prefix.Inline::dump($input, $exceptionOnInvalidType, $objectSupport);
-        } else {
-            $isAHash = array_keys($input) !== range(0, count($input) - 1);
-
-            foreach ($input as $key => $value) {
-                $willBeInlined = $inline - 1 <= 0 || !is_array($value) || empty($value);
-
-                $output .= sprintf('%s%s%s%s',
-                    $prefix,
-                    $isAHash ? Inline::dump($key, $exceptionOnInvalidType, $objectSupport).':' : '-',
-                    $willBeInlined ? ' ' : "\n",
-                    $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + $this->indentation, $exceptionOnInvalidType, $objectSupport)
-                ).($willBeInlined ? "\n" : '');
-            }
-        }
-
-        return $output;
-    }
-}
diff --git a/vendor/symfony/yaml/Escaper.php b/vendor/symfony/yaml/Escaper.php
deleted file mode 100644
index ac325a2c..00000000
--- a/vendor/symfony/yaml/Escaper.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Yaml;
-
-/**
- * Escaper encapsulates escaping rules for single and double-quoted
- * YAML strings.
- *
- * @author Matthew Lewinski <matthew@lewinski.org>
- */
-class Escaper
-{
-    // Characters that would cause a dumped string to require double quoting.
-    const REGEX_CHARACTER_TO_ESCAPE = "[\\x00-\\x1f]|\xc2\x85|\xc2\xa0|\xe2\x80\xa8|\xe2\x80\xa9";
-
-    // Mapping arrays for escaping a double quoted string. The backslash is
-    // first to ensure proper escaping because str_replace operates iteratively
-    // on the input arrays. This ordering of the characters avoids the use of strtr,
-    // which performs more slowly.
-    private static $escapees = array('\\', '\\\\', '\\"', '"',
-                                     "\x00",  "\x01",  "\x02",  "\x03",  "\x04",  "\x05",  "\x06",  "\x07",
-                                     "\x08",  "\x09",  "\x0a",  "\x0b",  "\x0c",  "\x0d",  "\x0e",  "\x0f",
-                                     "\x10",  "\x11",  "\x12",  "\x13",  "\x14",  "\x15",  "\x16",  "\x17",
-                                     "\x18",  "\x19",  "\x1a",  "\x1b",  "\x1c",  "\x1d",  "\x1e",  "\x1f",
-                                     "\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9",);
-    private static $escaped = array('\\\\', '\\"', '\\\\', '\\"',
-                                     '\\0',   '\\x01', '\\x02', '\\x03', '\\x04', '\\x05', '\\x06', '\\a',
-                                     '\\b',   '\\t',   '\\n',   '\\v',   '\\f',   '\\r',   '\\x0e', '\\x0f',
-                                     '\\x10', '\\x11', '\\x12', '\\x13', '\\x14', '\\x15', '\\x16', '\\x17',
-                                     '\\x18', '\\x19', '\\x1a', '\\e',   '\\x1c', '\\x1d', '\\x1e', '\\x1f',
-                                     '\\N', '\\_', '\\L', '\\P',);
-
-    /**
-     * Determines if a PHP value would require double quoting in YAML.
-     *
-     * @param string $value A PHP value
-     *
-     * @return bool True if the value would require double quotes.
-     */
-    public static function requiresDoubleQuoting($value)
-    {
-        return preg_match('/'.self::REGEX_CHARACTER_TO_ESCAPE.'/u', $value);
-    }
-
-    /**
-     * Escapes and surrounds a PHP value with double quotes.
-     *
-     * @param string $value A PHP value
-     *
-     * @return string The quoted, escaped string
-     */
-    public static function escapeWithDoubleQuotes($value)
-    {
-        return sprintf('"%s"', str_replace(self::$escapees, self::$escaped, $value));
-    }
-
-    /**
-     * Determines if a PHP value would require single quoting in YAML.
-     *
-     * @param string $value A PHP value
-     *
-     * @return bool True if the value would require single quotes.
-     */
-    public static function requiresSingleQuoting($value)
-    {
-        // Determines if a PHP value is entirely composed of a value that would
-        // require single quoting in YAML.
-        if (in_array(strtolower($value), array('null', '~', 'true', 'false', 'y', 'n', 'yes', 'no', 'on', 'off'))) {
-            return true;
-        }
-
-        // Determines if the PHP value contains any single characters that would
-        // cause it to require single quoting in YAML.
-        return preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ \- ? | < > = ! % @ ` ]/x', $value);
-    }
-
-    /**
-     * Escapes and surrounds a PHP value with single quotes.
-     *
-     * @param string $value A PHP value
-     *
-     * @return string The quoted, escaped string
-     */
-    public static function escapeWithSingleQuotes($value)
-    {
-        return sprintf("'%s'", str_replace('\'', '\'\'', $value));
-    }
-}
diff --git a/vendor/symfony/yaml/Exception/DumpException.php b/vendor/symfony/yaml/Exception/DumpException.php
deleted file mode 100644
index 9b3e6de0..00000000
--- a/vendor/symfony/yaml/Exception/DumpException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Yaml\Exception;
-
-/**
- * Exception class thrown when an error occurs during dumping.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
- */
-class DumpException extends RuntimeException
-{
-}
diff --git a/vendor/symfony/yaml/Exception/ExceptionInterface.php b/vendor/symfony/yaml/Exception/ExceptionInterface.php
deleted file mode 100644
index 92e5c2ea..00000000
--- a/vendor/symfony/yaml/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Yaml\Exception;
-
-/**
- * Exception interface for all exceptions thrown by the component.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/symfony/yaml/Exception/ParseException.php b/vendor/symfony/yaml/Exception/ParseException.php
deleted file mode 100644
index 0447dff1..00000000
--- a/vendor/symfony/yaml/Exception/ParseException.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Yaml\Exception;
-
-/**
- * Exception class thrown when an error occurs during parsing.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
- */
-class ParseException extends RuntimeException
-{
-    private $parsedFile;
-    private $parsedLine;
-    private $snippet;
-    private $rawMessage;
-
-    /**
-     * Constructor.
-     *
-     * @param string     $message    The error message
-     * @param int        $parsedLine The line where the error occurred
-     * @param int        $snippet    The snippet of code near the problem
-     * @param string     $parsedFile The file name where the error occurred
-     * @param \Exception $previous   The previous exception
-     */
-    public function __construct($message, $parsedLine = -1, $snippet = null, $parsedFile = null, \Exception $previous = null)
-    {
-        $this->parsedFile = $parsedFile;
-        $this->parsedLine = $parsedLine;
-        $this->snippet = $snippet;
-        $this->rawMessage = $message;
-
-        $this->updateRepr();
-
-        parent::__construct($this->message, 0, $previous);
-    }
-
-    /**
-     * Gets the snippet of code near the error.
-     *
-     * @return string The snippet of code
-     */
-    public function getSnippet()
-    {
-        return $this->snippet;
-    }
-
-    /**
-     * Sets the snippet of code near the error.
-     *
-     * @param string $snippet The code snippet
-     */
-    public function setSnippet($snippet)
-    {
-        $this->snippet = $snippet;
-
-        $this->updateRepr();
-    }
-
-    /**
-     * Gets the filename where the error occurred.
-     *
-     * This method returns null if a string is parsed.
-     *
-     * @return string The filename
-     */
-    public function getParsedFile()
-    {
-        return $this->parsedFile;
-    }
-
-    /**
-     * Sets the filename where the error occurred.
-     *
-     * @param string $parsedFile The filename
-     */
-    public function setParsedFile($parsedFile)
-    {
-        $this->parsedFile = $parsedFile;
-
-        $this->updateRepr();
-    }
-
-    /**
-     * Gets the line where the error occurred.
-     *
-     * @return int The file line
-     */
-    public function getParsedLine()
-    {
-        return $this->parsedLine;
-    }
-
-    /**
-     * Sets the line where the error occurred.
-     *
-     * @param int $parsedLine The file line
-     */
-    public function setParsedLine($parsedLine)
-    {
-        $this->parsedLine = $parsedLine;
-
-        $this->updateRepr();
-    }
-
-    private function updateRepr()
-    {
-        $this->message = $this->rawMessage;
-
-        $dot = false;
-        if ('.' === substr($this->message, -1)) {
-            $this->message = substr($this->message, 0, -1);
-            $dot = true;
-        }
-
-        if (null !== $this->parsedFile) {
-            if (PHP_VERSION_ID >= 50400) {
-                $jsonOptions = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
-            } else {
-                $jsonOptions = 0;
-            }
-            $this->message .= sprintf(' in %s', json_encode($this->parsedFile, $jsonOptions));
-        }
-
-        if ($this->parsedLine >= 0) {
-            $this->message .= sprintf(' at line %d', $this->parsedLine);
-        }
-
-        if ($this->snippet) {
-            $this->message .= sprintf(' (near "%s")', $this->snippet);
-        }
-
-        if ($dot) {
-            $this->message .= '.';
-        }
-    }
-}
diff --git a/vendor/symfony/yaml/Exception/RuntimeException.php b/vendor/symfony/yaml/Exception/RuntimeException.php
deleted file mode 100644
index 3573bf15..00000000
--- a/vendor/symfony/yaml/Exception/RuntimeException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Yaml\Exception;
-
-/**
- * Exception class thrown when an error occurs during parsing.
- *
- * @author Romain Neutron <imprec@gmail.com>
- *
- * @api
- */
-class RuntimeException extends \RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/yaml/Inline.php b/vendor/symfony/yaml/Inline.php
deleted file mode 100644
index 6e3877bf..00000000
--- a/vendor/symfony/yaml/Inline.php
+++ /dev/null
@@ -1,546 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Yaml;
-
-use Symfony\Component\Yaml\Exception\ParseException;
-use Symfony\Component\Yaml\Exception\DumpException;
-
-/**
- * Inline implements a YAML parser/dumper for the YAML inline syntax.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Inline
-{
-    const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
-
-    private static $exceptionOnInvalidType = false;
-    private static $objectSupport = false;
-    private static $objectForMap = false;
-
-    /**
-     * Converts a YAML string to a PHP array.
-     *
-     * @param string $value                  A YAML string
-     * @param bool   $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
-     * @param bool   $objectSupport          true if object support is enabled, false otherwise
-     * @param bool   $objectForMap           true if maps should return a stdClass instead of array()
-     * @param array  $references             Mapping of variable names to values
-     *
-     * @return array A PHP array representing the YAML string
-     *
-     * @throws ParseException
-     */
-    public static function parse($value, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false, $references = array())
-    {
-        self::$exceptionOnInvalidType = $exceptionOnInvalidType;
-        self::$objectSupport = $objectSupport;
-        self::$objectForMap = $objectForMap;
-
-        $value = trim($value);
-
-        if ('' === $value) {
-            return '';
-        }
-
-        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
-            $mbEncoding = mb_internal_encoding();
-            mb_internal_encoding('ASCII');
-        }
-
-        $i = 0;
-        switch ($value[0]) {
-            case '[':
-                $result = self::parseSequence($value, $i, $references);
-                ++$i;
-                break;
-            case '{':
-                $result = self::parseMapping($value, $i, $references);
-                ++$i;
-                break;
-            default:
-                $result = self::parseScalar($value, null, array('"', "'"), $i, true, $references);
-        }
-
-        // some comments are allowed at the end
-        if (preg_replace('/\s+#.*$/A', '', substr($value, $i))) {
-            throw new ParseException(sprintf('Unexpected characters near "%s".', substr($value, $i)));
-        }
-
-        if (isset($mbEncoding)) {
-            mb_internal_encoding($mbEncoding);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Dumps a given PHP variable to a YAML string.
-     *
-     * @param mixed $value                  The PHP variable to convert
-     * @param bool  $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
-     * @param bool  $objectSupport          true if object support is enabled, false otherwise
-     *
-     * @return string The YAML string representing the PHP array
-     *
-     * @throws DumpException When trying to dump PHP resource
-     */
-    public static function dump($value, $exceptionOnInvalidType = false, $objectSupport = false)
-    {
-        switch (true) {
-            case is_resource($value):
-                if ($exceptionOnInvalidType) {
-                    throw new DumpException(sprintf('Unable to dump PHP resources in a YAML file ("%s").', get_resource_type($value)));
-                }
-
-                return 'null';
-            case is_object($value):
-                if ($objectSupport) {
-                    return '!!php/object:'.serialize($value);
-                }
-
-                if ($exceptionOnInvalidType) {
-                    throw new DumpException('Object support when dumping a YAML file has been disabled.');
-                }
-
-                return 'null';
-            case is_array($value):
-                return self::dumpArray($value, $exceptionOnInvalidType, $objectSupport);
-            case null === $value:
-                return 'null';
-            case true === $value:
-                return 'true';
-            case false === $value:
-                return 'false';
-            case ctype_digit($value):
-                return is_string($value) ? "'$value'" : (int) $value;
-            case is_numeric($value):
-                $locale = setlocale(LC_NUMERIC, 0);
-                if (false !== $locale) {
-                    setlocale(LC_NUMERIC, 'C');
-                }
-                if (is_float($value)) {
-                    $repr = (string) $value;
-                    if (is_infinite($value)) {
-                        $repr = str_ireplace('INF', '.Inf', $repr);
-                    } elseif (floor($value) == $value && $repr == $value) {
-                        // Preserve float data type since storing a whole number will result in integer value.
-                        $repr = '!!float '.$repr;
-                    }
-                } else {
-                    $repr = is_string($value) ? "'$value'" : (string) $value;
-                }
-                if (false !== $locale) {
-                    setlocale(LC_NUMERIC, $locale);
-                }
-
-                return $repr;
-            case '' == $value:
-                return "''";
-            case Escaper::requiresDoubleQuoting($value):
-                return Escaper::escapeWithDoubleQuotes($value);
-            case Escaper::requiresSingleQuoting($value):
-            case preg_match(self::getHexRegex(), $value):
-            case preg_match(self::getTimestampRegex(), $value):
-                return Escaper::escapeWithSingleQuotes($value);
-            default:
-                return $value;
-        }
-    }
-
-    /**
-     * Dumps a PHP array to a YAML string.
-     *
-     * @param array $value                  The PHP array to dump
-     * @param bool  $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
-     * @param bool  $objectSupport          true if object support is enabled, false otherwise
-     *
-     * @return string The YAML string representing the PHP array
-     */
-    private static function dumpArray($value, $exceptionOnInvalidType, $objectSupport)
-    {
-        // array
-        $keys = array_keys($value);
-        $keysCount = count($keys);
-        if ((1 === $keysCount && '0' == $keys[0])
-            || ($keysCount > 1 && array_reduce($keys, function ($v, $w) { return (int) $v + $w; }, 0) === $keysCount * ($keysCount - 1) / 2)
-        ) {
-            $output = array();
-            foreach ($value as $val) {
-                $output[] = self::dump($val, $exceptionOnInvalidType, $objectSupport);
-            }
-
-            return sprintf('[%s]', implode(', ', $output));
-        }
-
-        // mapping
-        $output = array();
-        foreach ($value as $key => $val) {
-            $output[] = sprintf('%s: %s', self::dump($key, $exceptionOnInvalidType, $objectSupport), self::dump($val, $exceptionOnInvalidType, $objectSupport));
-        }
-
-        return sprintf('{ %s }', implode(', ', $output));
-    }
-
-    /**
-     * Parses a scalar to a YAML string.
-     *
-     * @param string $scalar
-     * @param string $delimiters
-     * @param array  $stringDelimiters
-     * @param int    &$i
-     * @param bool   $evaluate
-     * @param array  $references
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException When malformed inline YAML string is parsed
-     */
-    public static function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true, $references = array())
-    {
-        if (in_array($scalar[$i], $stringDelimiters)) {
-            // quoted scalar
-            $output = self::parseQuotedScalar($scalar, $i);
-
-            if (null !== $delimiters) {
-                $tmp = ltrim(substr($scalar, $i), ' ');
-                if (!in_array($tmp[0], $delimiters)) {
-                    throw new ParseException(sprintf('Unexpected characters (%s).', substr($scalar, $i)));
-                }
-            }
-        } else {
-            // "normal" string
-            if (!$delimiters) {
-                $output = substr($scalar, $i);
-                $i += strlen($output);
-
-                // remove comments
-                if (false !== $strpos = strpos($output, ' #')) {
-                    $output = rtrim(substr($output, 0, $strpos));
-                }
-            } elseif (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
-                $output = $match[1];
-                $i += strlen($output);
-            } else {
-                throw new ParseException(sprintf('Malformed inline YAML string (%s).', $scalar));
-            }
-
-            if ($evaluate) {
-                $output = self::evaluateScalar($output, $references);
-            }
-        }
-
-        return $output;
-    }
-
-    /**
-     * Parses a quoted scalar to YAML.
-     *
-     * @param string $scalar
-     * @param int    &$i
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException When malformed inline YAML string is parsed
-     */
-    private static function parseQuotedScalar($scalar, &$i)
-    {
-        if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) {
-            throw new ParseException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i)));
-        }
-
-        $output = substr($match[0], 1, strlen($match[0]) - 2);
-
-        $unescaper = new Unescaper();
-        if ('"' == $scalar[$i]) {
-            $output = $unescaper->unescapeDoubleQuotedString($output);
-        } else {
-            $output = $unescaper->unescapeSingleQuotedString($output);
-        }
-
-        $i += strlen($match[0]);
-
-        return $output;
-    }
-
-    /**
-     * Parses a sequence to a YAML string.
-     *
-     * @param string $sequence
-     * @param int    &$i
-     * @param array  $references
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException When malformed inline YAML string is parsed
-     */
-    private static function parseSequence($sequence, &$i = 0, $references = array())
-    {
-        $output = array();
-        $len = strlen($sequence);
-        ++$i;
-
-        // [foo, bar, ...]
-        while ($i < $len) {
-            switch ($sequence[$i]) {
-                case '[':
-                    // nested sequence
-                    $output[] = self::parseSequence($sequence, $i, $references);
-                    break;
-                case '{':
-                    // nested mapping
-                    $output[] = self::parseMapping($sequence, $i, $references);
-                    break;
-                case ']':
-                    return $output;
-                case ',':
-                case ' ':
-                    break;
-                default:
-                    $isQuoted = in_array($sequence[$i], array('"', "'"));
-                    $value = self::parseScalar($sequence, array(',', ']'), array('"', "'"), $i, true, $references);
-
-                    // the value can be an array if a reference has been resolved to an array var
-                    if (!is_array($value) && !$isQuoted && false !== strpos($value, ': ')) {
-                        // embedded mapping?
-                        try {
-                            $pos = 0;
-                            $value = self::parseMapping('{'.$value.'}', $pos, $references);
-                        } catch (\InvalidArgumentException $e) {
-                            // no, it's not
-                        }
-                    }
-
-                    $output[] = $value;
-
-                    --$i;
-            }
-
-            ++$i;
-        }
-
-        throw new ParseException(sprintf('Malformed inline YAML string %s', $sequence));
-    }
-
-    /**
-     * Parses a mapping to a YAML string.
-     *
-     * @param string $mapping
-     * @param int    &$i
-     * @param array  $references
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException When malformed inline YAML string is parsed
-     */
-    private static function parseMapping($mapping, &$i = 0, $references = array())
-    {
-        $output = array();
-        $len = strlen($mapping);
-        ++$i;
-
-        // {foo: bar, bar:foo, ...}
-        while ($i < $len) {
-            switch ($mapping[$i]) {
-                case ' ':
-                case ',':
-                    ++$i;
-                    continue 2;
-                case '}':
-                    if (self::$objectForMap) {
-                        return (object) $output;
-                    }
-
-                    return $output;
-            }
-
-            // key
-            $key = self::parseScalar($mapping, array(':', ' '), array('"', "'"), $i, false);
-
-            // value
-            $done = false;
-
-            while ($i < $len) {
-                switch ($mapping[$i]) {
-                    case '[':
-                        // nested sequence
-                        $value = self::parseSequence($mapping, $i, $references);
-                        // Spec: Keys MUST be unique; first one wins.
-                        // Parser cannot abort this mapping earlier, since lines
-                        // are processed sequentially.
-                        if (!isset($output[$key])) {
-                            $output[$key] = $value;
-                        }
-                        $done = true;
-                        break;
-                    case '{':
-                        // nested mapping
-                        $value = self::parseMapping($mapping, $i, $references);
-                        // Spec: Keys MUST be unique; first one wins.
-                        // Parser cannot abort this mapping earlier, since lines
-                        // are processed sequentially.
-                        if (!isset($output[$key])) {
-                            $output[$key] = $value;
-                        }
-                        $done = true;
-                        break;
-                    case ':':
-                    case ' ':
-                        break;
-                    default:
-                        $value = self::parseScalar($mapping, array(',', '}'), array('"', "'"), $i, true, $references);
-                        // Spec: Keys MUST be unique; first one wins.
-                        // Parser cannot abort this mapping earlier, since lines
-                        // are processed sequentially.
-                        if (!isset($output[$key])) {
-                            $output[$key] = $value;
-                        }
-                        $done = true;
-                        --$i;
-                }
-
-                ++$i;
-
-                if ($done) {
-                    continue 2;
-                }
-            }
-        }
-
-        throw new ParseException(sprintf('Malformed inline YAML string %s', $mapping));
-    }
-
-    /**
-     * Evaluates scalars and replaces magic values.
-     *
-     * @param string $scalar
-     * @param array  $references
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException when object parsing support was disabled and the parser detected a PHP object or when a reference could not be resolved
-     */
-    private static function evaluateScalar($scalar, $references = array())
-    {
-        $scalar = trim($scalar);
-        $scalarLower = strtolower($scalar);
-
-        if (0 === strpos($scalar, '*')) {
-            if (false !== $pos = strpos($scalar, '#')) {
-                $value = substr($scalar, 1, $pos - 2);
-            } else {
-                $value = substr($scalar, 1);
-            }
-
-            // an unquoted *
-            if (false === $value || '' === $value) {
-                throw new ParseException('A reference must contain at least one character.');
-            }
-
-            if (!array_key_exists($value, $references)) {
-                throw new ParseException(sprintf('Reference "%s" does not exist.', $value));
-            }
-
-            return $references[$value];
-        }
-
-        switch (true) {
-            case 'null' === $scalarLower:
-            case '' === $scalar:
-            case '~' === $scalar:
-                return;
-            case 'true' === $scalarLower:
-                return true;
-            case 'false' === $scalarLower:
-                return false;
-            // Optimise for returning strings.
-            case $scalar[0] === '+' || $scalar[0] === '-' || $scalar[0] === '.' || $scalar[0] === '!' || is_numeric($scalar[0]):
-                switch (true) {
-                    case 0 === strpos($scalar, '!str'):
-                        return (string) substr($scalar, 5);
-                    case 0 === strpos($scalar, '! '):
-                        return (int) self::parseScalar(substr($scalar, 2));
-                    case 0 === strpos($scalar, '!!php/object:'):
-                        if (self::$objectSupport) {
-                            return unserialize(substr($scalar, 13));
-                        }
-
-                        if (self::$exceptionOnInvalidType) {
-                            throw new ParseException('Object support when parsing a YAML file has been disabled.');
-                        }
-
-                        return;
-                    case 0 === strpos($scalar, '!!float '):
-                        return (float) substr($scalar, 8);
-                    case ctype_digit($scalar):
-                        $raw = $scalar;
-                        $cast = (int) $scalar;
-
-                        return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
-                    case '-' === $scalar[0] && ctype_digit(substr($scalar, 1)):
-                        $raw = $scalar;
-                        $cast = (int) $scalar;
-
-                        return '0' == $scalar[1] ? octdec($scalar) : (((string) $raw === (string) $cast) ? $cast : $raw);
-                    case is_numeric($scalar):
-                    case preg_match(self::getHexRegex(), $scalar):
-                        return '0x' === $scalar[0].$scalar[1] ? hexdec($scalar) : (float) $scalar;
-                    case '.inf' === $scalarLower:
-                    case '.nan' === $scalarLower:
-                        return -log(0);
-                    case '-.inf' === $scalarLower:
-                        return log(0);
-                    case preg_match('/^(-|\+)?[0-9,]+(\.[0-9]+)?$/', $scalar):
-                        return (float) str_replace(',', '', $scalar);
-                    case preg_match(self::getTimestampRegex(), $scalar):
-                        return strtotime($scalar);
-                }
-            default:
-                return (string) $scalar;
-        }
-    }
-
-    /**
-     * Gets a regex that matches a YAML date.
-     *
-     * @return string The regular expression
-     *
-     * @see http://www.yaml.org/spec/1.2/spec.html#id2761573
-     */
-    private static function getTimestampRegex()
-    {
-        return <<<EOF
-        ~^
-        (?P<year>[0-9][0-9][0-9][0-9])
-        -(?P<month>[0-9][0-9]?)
-        -(?P<day>[0-9][0-9]?)
-        (?:(?:[Tt]|[ \t]+)
-        (?P<hour>[0-9][0-9]?)
-        :(?P<minute>[0-9][0-9])
-        :(?P<second>[0-9][0-9])
-        (?:\.(?P<fraction>[0-9]*))?
-        (?:[ \t]*(?P<tz>Z|(?P<tz_sign>[-+])(?P<tz_hour>[0-9][0-9]?)
-        (?::(?P<tz_minute>[0-9][0-9]))?))?)?
-        $~x
-EOF;
-    }
-
-    /**
-     * Gets a regex that matches a YAML number in hexadecimal notation.
-     *
-     * @return string
-     */
-    private static function getHexRegex()
-    {
-        return '~^0x[0-9a-f]++$~i';
-    }
-}
diff --git a/vendor/symfony/yaml/LICENSE b/vendor/symfony/yaml/LICENSE
deleted file mode 100644
index 43028bc6..00000000
--- a/vendor/symfony/yaml/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/symfony/yaml/Parser.php b/vendor/symfony/yaml/Parser.php
deleted file mode 100644
index 2de62e58..00000000
--- a/vendor/symfony/yaml/Parser.php
+++ /dev/null
@@ -1,697 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Yaml;
-
-use Symfony\Component\Yaml\Exception\ParseException;
-
-/**
- * Parser parses YAML strings to convert them to PHP arrays.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Parser
-{
-    const FOLDED_SCALAR_PATTERN = '(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?';
-
-    private $offset = 0;
-    private $lines = array();
-    private $currentLineNb = -1;
-    private $currentLine = '';
-    private $refs = array();
-
-    /**
-     * Constructor.
-     *
-     * @param int $offset The offset of YAML document (used for line numbers in error messages)
-     */
-    public function __construct($offset = 0)
-    {
-        $this->offset = $offset;
-    }
-
-    /**
-     * Parses a YAML string to a PHP value.
-     *
-     * @param string $value                  A YAML string
-     * @param bool   $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
-     * @param bool   $objectSupport          true if object support is enabled, false otherwise
-     * @param bool   $objectForMap           true if maps should return a stdClass instead of array()
-     *
-     * @return mixed A PHP value
-     *
-     * @throws ParseException If the YAML is not valid
-     */
-    public function parse($value, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
-    {
-        if (!preg_match('//u', $value)) {
-            throw new ParseException('The YAML value does not appear to be valid UTF-8.');
-        }
-        $this->currentLineNb = -1;
-        $this->currentLine = '';
-        $value = $this->cleanup($value);
-        $this->lines = explode("\n", $value);
-
-        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
-            $mbEncoding = mb_internal_encoding();
-            mb_internal_encoding('UTF-8');
-        }
-
-        $data = array();
-        $context = null;
-        $allowOverwrite = false;
-        while ($this->moveToNextLine()) {
-            if ($this->isCurrentLineEmpty()) {
-                continue;
-            }
-
-            // tab?
-            if ("\t" === $this->currentLine[0]) {
-                throw new ParseException('A YAML file cannot contain tabs as indentation.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
-            }
-
-            $isRef = $mergeNode = false;
-            if (preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+?))?\s*$#u', $this->currentLine, $values)) {
-                if ($context && 'mapping' == $context) {
-                    throw new ParseException('You cannot define a sequence item when in a mapping');
-                }
-                $context = 'sequence';
-
-                if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
-                    $isRef = $matches['ref'];
-                    $values['value'] = $matches['value'];
-                }
-
-                // array
-                if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
-                    $c = $this->getRealCurrentLineNb() + 1;
-                    $parser = new self($c);
-                    $parser->refs = &$this->refs;
-                    $data[] = $parser->parse($this->getNextEmbedBlock(null, true), $exceptionOnInvalidType, $objectSupport, $objectForMap);
-                } else {
-                    if (isset($values['leadspaces'])
-                        && preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\{\[].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $values['value'], $matches)
-                    ) {
-                        // this is a compact notation element, add to next block and parse
-                        $c = $this->getRealCurrentLineNb();
-                        $parser = new self($c);
-                        $parser->refs = &$this->refs;
-
-                        $block = $values['value'];
-                        if ($this->isNextLineIndented()) {
-                            $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + strlen($values['leadspaces']) + 1);
-                        }
-
-                        $data[] = $parser->parse($block, $exceptionOnInvalidType, $objectSupport, $objectForMap);
-                    } else {
-                        $data[] = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap);
-                    }
-                }
-            } elseif (preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\[\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values) && (false === strpos($values['key'], ' #') || in_array($values['key'][0], array('"', "'")))) {
-                if ($context && 'sequence' == $context) {
-                    throw new ParseException('You cannot define a mapping item when in a sequence');
-                }
-                $context = 'mapping';
-
-                // force correct settings
-                Inline::parse(null, $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs);
-                try {
-                    $key = Inline::parseScalar($values['key']);
-                } catch (ParseException $e) {
-                    $e->setParsedLine($this->getRealCurrentLineNb() + 1);
-                    $e->setSnippet($this->currentLine);
-
-                    throw $e;
-                }
-
-                if ('<<' === $key) {
-                    $mergeNode = true;
-                    $allowOverwrite = true;
-                    if (isset($values['value']) && 0 === strpos($values['value'], '*')) {
-                        $refName = substr($values['value'], 1);
-                        if (!array_key_exists($refName, $this->refs)) {
-                            throw new ParseException(sprintf('Reference "%s" does not exist.', $refName), $this->getRealCurrentLineNb() + 1, $this->currentLine);
-                        }
-
-                        $refValue = $this->refs[$refName];
-
-                        if (!is_array($refValue)) {
-                            throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
-                        }
-
-                        foreach ($refValue as $key => $value) {
-                            if (!isset($data[$key])) {
-                                $data[$key] = $value;
-                            }
-                        }
-                    } else {
-                        if (isset($values['value']) && $values['value'] !== '') {
-                            $value = $values['value'];
-                        } else {
-                            $value = $this->getNextEmbedBlock();
-                        }
-                        $c = $this->getRealCurrentLineNb() + 1;
-                        $parser = new self($c);
-                        $parser->refs = &$this->refs;
-                        $parsed = $parser->parse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap);
-
-                        if (!is_array($parsed)) {
-                            throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
-                        }
-
-                        if (isset($parsed[0])) {
-                            // If the value associated with the merge key is a sequence, then this sequence is expected to contain mapping nodes
-                            // and each of these nodes is merged in turn according to its order in the sequence. Keys in mapping nodes earlier
-                            // in the sequence override keys specified in later mapping nodes.
-                            foreach ($parsed as $parsedItem) {
-                                if (!is_array($parsedItem)) {
-                                    throw new ParseException('Merge items must be arrays.', $this->getRealCurrentLineNb() + 1, $parsedItem);
-                                }
-
-                                foreach ($parsedItem as $key => $value) {
-                                    if (!isset($data[$key])) {
-                                        $data[$key] = $value;
-                                    }
-                                }
-                            }
-                        } else {
-                            // If the value associated with the key is a single mapping node, each of its key/value pairs is inserted into the
-                            // current mapping, unless the key already exists in it.
-                            foreach ($parsed as $key => $value) {
-                                if (!isset($data[$key])) {
-                                    $data[$key] = $value;
-                                }
-                            }
-                        }
-                    }
-                } elseif (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
-                    $isRef = $matches['ref'];
-                    $values['value'] = $matches['value'];
-                }
-
-                if ($mergeNode) {
-                    // Merge keys
-                } elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
-                    // hash
-                    // if next line is less indented or equal, then it means that the current value is null
-                    if (!$this->isNextLineIndented() && !$this->isNextLineUnIndentedCollection()) {
-                        // Spec: Keys MUST be unique; first one wins.
-                        // But overwriting is allowed when a merge node is used in current block.
-                        if ($allowOverwrite || !isset($data[$key])) {
-                            $data[$key] = null;
-                        }
-                    } else {
-                        $c = $this->getRealCurrentLineNb() + 1;
-                        $parser = new self($c);
-                        $parser->refs = &$this->refs;
-                        $value = $parser->parse($this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport, $objectForMap);
-                        // Spec: Keys MUST be unique; first one wins.
-                        // But overwriting is allowed when a merge node is used in current block.
-                        if ($allowOverwrite || !isset($data[$key])) {
-                            $data[$key] = $value;
-                        }
-                    }
-                } else {
-                    $value = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap);
-                    // Spec: Keys MUST be unique; first one wins.
-                    // But overwriting is allowed when a merge node is used in current block.
-                    if ($allowOverwrite || !isset($data[$key])) {
-                        $data[$key] = $value;
-                    }
-                }
-            } else {
-                // multiple documents are not supported
-                if ('---' === $this->currentLine) {
-                    throw new ParseException('Multiple documents are not supported.');
-                }
-
-                // 1-liner optionally followed by newline(s)
-                if (is_string($value) && $this->lines[0] === trim($value)) {
-                    try {
-                        $value = Inline::parse($this->lines[0], $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs);
-                    } catch (ParseException $e) {
-                        $e->setParsedLine($this->getRealCurrentLineNb() + 1);
-                        $e->setSnippet($this->currentLine);
-
-                        throw $e;
-                    }
-
-                    if (is_array($value)) {
-                        $first = reset($value);
-                        if (is_string($first) && 0 === strpos($first, '*')) {
-                            $data = array();
-                            foreach ($value as $alias) {
-                                $data[] = $this->refs[substr($alias, 1)];
-                            }
-                            $value = $data;
-                        }
-                    }
-
-                    if (isset($mbEncoding)) {
-                        mb_internal_encoding($mbEncoding);
-                    }
-
-                    return $value;
-                }
-
-                switch (preg_last_error()) {
-                    case PREG_INTERNAL_ERROR:
-                        $error = 'Internal PCRE error.';
-                        break;
-                    case PREG_BACKTRACK_LIMIT_ERROR:
-                        $error = 'pcre.backtrack_limit reached.';
-                        break;
-                    case PREG_RECURSION_LIMIT_ERROR:
-                        $error = 'pcre.recursion_limit reached.';
-                        break;
-                    case PREG_BAD_UTF8_ERROR:
-                        $error = 'Malformed UTF-8 data.';
-                        break;
-                    case PREG_BAD_UTF8_OFFSET_ERROR:
-                        $error = 'Offset doesn\'t correspond to the begin of a valid UTF-8 code point.';
-                        break;
-                    default:
-                        $error = 'Unable to parse.';
-                }
-
-                throw new ParseException($error, $this->getRealCurrentLineNb() + 1, $this->currentLine);
-            }
-
-            if ($isRef) {
-                $this->refs[$isRef] = end($data);
-            }
-        }
-
-        if (isset($mbEncoding)) {
-            mb_internal_encoding($mbEncoding);
-        }
-
-        return empty($data) ? null : $data;
-    }
-
-    /**
-     * Returns the current line number (takes the offset into account).
-     *
-     * @return int The current line number
-     */
-    private function getRealCurrentLineNb()
-    {
-        return $this->currentLineNb + $this->offset;
-    }
-
-    /**
-     * Returns the current line indentation.
-     *
-     * @return int The current line indentation
-     */
-    private function getCurrentLineIndentation()
-    {
-        return strlen($this->currentLine) - strlen(ltrim($this->currentLine, ' '));
-    }
-
-    /**
-     * Returns the next embed block of YAML.
-     *
-     * @param int  $indentation The indent level at which the block is to be read, or null for default
-     * @param bool $inSequence  True if the enclosing data structure is a sequence
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException When indentation problem are detected
-     */
-    private function getNextEmbedBlock($indentation = null, $inSequence = false)
-    {
-        $oldLineIndentation = $this->getCurrentLineIndentation();
-
-        if (!$this->moveToNextLine()) {
-            return;
-        }
-
-        if (null === $indentation) {
-            $newIndent = $this->getCurrentLineIndentation();
-
-            $unindentedEmbedBlock = $this->isStringUnIndentedCollectionItem($this->currentLine);
-
-            if (!$this->isCurrentLineEmpty() && 0 === $newIndent && !$unindentedEmbedBlock) {
-                throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
-            }
-        } else {
-            $newIndent = $indentation;
-        }
-
-        $data = array();
-        if ($this->getCurrentLineIndentation() >= $newIndent) {
-            $data[] = substr($this->currentLine, $newIndent);
-        } else {
-            $this->moveToPreviousLine();
-
-            return;
-        }
-
-        if ($inSequence && $oldLineIndentation === $newIndent && isset($data[0][0]) && '-' === $data[0][0]) {
-            // the previous line contained a dash but no item content, this line is a sequence item with the same indentation
-            // and therefore no nested list or mapping
-            $this->moveToPreviousLine();
-
-            return;
-        }
-
-        $isItUnindentedCollection = $this->isStringUnIndentedCollectionItem($this->currentLine);
-
-        // Comments must not be removed inside a string block (ie. after a line ending with "|")
-        $removeCommentsPattern = '~'.self::FOLDED_SCALAR_PATTERN.'$~';
-        $removeComments = !preg_match($removeCommentsPattern, $this->currentLine);
-
-        while ($this->moveToNextLine()) {
-            $indent = $this->getCurrentLineIndentation();
-
-            if ($indent === $newIndent) {
-                $removeComments = !preg_match($removeCommentsPattern, $this->currentLine);
-            }
-
-            if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem($this->currentLine) && $newIndent === $indent) {
-                $this->moveToPreviousLine();
-                break;
-            }
-
-            if ($this->isCurrentLineBlank()) {
-                $data[] = substr($this->currentLine, $newIndent);
-                continue;
-            }
-
-            if ($removeComments && $this->isCurrentLineComment()) {
-                continue;
-            }
-
-            if ($indent >= $newIndent) {
-                $data[] = substr($this->currentLine, $newIndent);
-            } elseif (0 == $indent) {
-                $this->moveToPreviousLine();
-
-                break;
-            } else {
-                throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
-            }
-        }
-
-        return implode("\n", $data);
-    }
-
-    /**
-     * Moves the parser to the next line.
-     *
-     * @return bool
-     */
-    private function moveToNextLine()
-    {
-        if ($this->currentLineNb >= count($this->lines) - 1) {
-            return false;
-        }
-
-        $this->currentLine = $this->lines[++$this->currentLineNb];
-
-        return true;
-    }
-
-    /**
-     * Moves the parser to the previous line.
-     */
-    private function moveToPreviousLine()
-    {
-        $this->currentLine = $this->lines[--$this->currentLineNb];
-    }
-
-    /**
-     * Parses a YAML value.
-     *
-     * @param string $value                  A YAML value
-     * @param bool   $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
-     * @param bool   $objectSupport          True if object support is enabled, false otherwise
-     * @param bool   $objectForMap           true if maps should return a stdClass instead of array()
-     *
-     * @return mixed A PHP value
-     *
-     * @throws ParseException When reference does not exist
-     */
-    private function parseValue($value, $exceptionOnInvalidType, $objectSupport, $objectForMap)
-    {
-        if (0 === strpos($value, '*')) {
-            if (false !== $pos = strpos($value, '#')) {
-                $value = substr($value, 1, $pos - 2);
-            } else {
-                $value = substr($value, 1);
-            }
-
-            if (!array_key_exists($value, $this->refs)) {
-                throw new ParseException(sprintf('Reference "%s" does not exist.', $value), $this->currentLine);
-            }
-
-            return $this->refs[$value];
-        }
-
-        if (preg_match('/^'.self::FOLDED_SCALAR_PATTERN.'$/', $value, $matches)) {
-            $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
-
-            return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs($modifiers));
-        }
-
-        try {
-            return Inline::parse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs);
-        } catch (ParseException $e) {
-            $e->setParsedLine($this->getRealCurrentLineNb() + 1);
-            $e->setSnippet($this->currentLine);
-
-            throw $e;
-        }
-    }
-
-    /**
-     * Parses a folded scalar.
-     *
-     * @param string $separator   The separator that was used to begin this folded scalar (| or >)
-     * @param string $indicator   The indicator that was used to begin this folded scalar (+ or -)
-     * @param int    $indentation The indentation that was used to begin this folded scalar
-     *
-     * @return string The text value
-     */
-    private function parseFoldedScalar($separator, $indicator = '', $indentation = 0)
-    {
-        $notEOF = $this->moveToNextLine();
-        if (!$notEOF) {
-            return '';
-        }
-
-        $isCurrentLineBlank = $this->isCurrentLineBlank();
-        $text = '';
-
-        // leading blank lines are consumed before determining indentation
-        while ($notEOF && $isCurrentLineBlank) {
-            // newline only if not EOF
-            if ($notEOF = $this->moveToNextLine()) {
-                $text .= "\n";
-                $isCurrentLineBlank = $this->isCurrentLineBlank();
-            }
-        }
-
-        // determine indentation if not specified
-        if (0 === $indentation) {
-            if (preg_match('/^ +/', $this->currentLine, $matches)) {
-                $indentation = strlen($matches[0]);
-            }
-        }
-
-        if ($indentation > 0) {
-            $pattern = sprintf('/^ {%d}(.*)$/', $indentation);
-
-            while (
-                $notEOF && (
-                    $isCurrentLineBlank ||
-                    preg_match($pattern, $this->currentLine, $matches)
-                )
-            ) {
-                if ($isCurrentLineBlank) {
-                    $text .= substr($this->currentLine, $indentation);
-                } else {
-                    $text .= $matches[1];
-                }
-
-                // newline only if not EOF
-                if ($notEOF = $this->moveToNextLine()) {
-                    $text .= "\n";
-                    $isCurrentLineBlank = $this->isCurrentLineBlank();
-                }
-            }
-        } elseif ($notEOF) {
-            $text .= "\n";
-        }
-
-        if ($notEOF) {
-            $this->moveToPreviousLine();
-        }
-
-        // replace all non-trailing single newlines with spaces in folded blocks
-        if ('>' === $separator) {
-            preg_match('/(\n*)$/', $text, $matches);
-            $text = preg_replace('/(?<!\n)\n(?!\n)/', ' ', rtrim($text, "\n"));
-            $text .= $matches[1];
-        }
-
-        // deal with trailing newlines as indicated
-        if ('' === $indicator) {
-            $text = preg_replace('/\n+$/', "\n", $text);
-        } elseif ('-' === $indicator) {
-            $text = preg_replace('/\n+$/', '', $text);
-        }
-
-        return $text;
-    }
-
-    /**
-     * Returns true if the next line is indented.
-     *
-     * @return bool Returns true if the next line is indented, false otherwise
-     */
-    private function isNextLineIndented()
-    {
-        $currentIndentation = $this->getCurrentLineIndentation();
-        $EOF = !$this->moveToNextLine();
-
-        while (!$EOF && $this->isCurrentLineEmpty()) {
-            $EOF = !$this->moveToNextLine();
-        }
-
-        if ($EOF) {
-            return false;
-        }
-
-        $ret = false;
-        if ($this->getCurrentLineIndentation() > $currentIndentation) {
-            $ret = true;
-        }
-
-        $this->moveToPreviousLine();
-
-        return $ret;
-    }
-
-    /**
-     * Returns true if the current line is blank or if it is a comment line.
-     *
-     * @return bool Returns true if the current line is empty or if it is a comment line, false otherwise
-     */
-    private function isCurrentLineEmpty()
-    {
-        return $this->isCurrentLineBlank() || $this->isCurrentLineComment();
-    }
-
-    /**
-     * Returns true if the current line is blank.
-     *
-     * @return bool Returns true if the current line is blank, false otherwise
-     */
-    private function isCurrentLineBlank()
-    {
-        return '' == trim($this->currentLine, ' ');
-    }
-
-    /**
-     * Returns true if the current line is a comment line.
-     *
-     * @return bool Returns true if the current line is a comment line, false otherwise
-     */
-    private function isCurrentLineComment()
-    {
-        //checking explicitly the first char of the trim is faster than loops or strpos
-        $ltrimmedLine = ltrim($this->currentLine, ' ');
-
-        return $ltrimmedLine[0] === '#';
-    }
-
-    /**
-     * Cleanups a YAML string to be parsed.
-     *
-     * @param string $value The input YAML string
-     *
-     * @return string A cleaned up YAML string
-     */
-    private function cleanup($value)
-    {
-        $value = str_replace(array("\r\n", "\r"), "\n", $value);
-
-        // strip YAML header
-        $count = 0;
-        $value = preg_replace('#^\%YAML[: ][\d\.]+.*\n#u', '', $value, -1, $count);
-        $this->offset += $count;
-
-        // remove leading comments
-        $trimmedValue = preg_replace('#^(\#.*?\n)+#s', '', $value, -1, $count);
-        if ($count == 1) {
-            // items have been removed, update the offset
-            $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
-            $value = $trimmedValue;
-        }
-
-        // remove start of the document marker (---)
-        $trimmedValue = preg_replace('#^\-\-\-.*?\n#s', '', $value, -1, $count);
-        if ($count == 1) {
-            // items have been removed, update the offset
-            $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
-            $value = $trimmedValue;
-
-            // remove end of the document marker (...)
-            $value = preg_replace('#\.\.\.\s*$#', '', $value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Returns true if the next line starts unindented collection.
-     *
-     * @return bool Returns true if the next line starts unindented collection, false otherwise
-     */
-    private function isNextLineUnIndentedCollection()
-    {
-        $currentIndentation = $this->getCurrentLineIndentation();
-        $notEOF = $this->moveToNextLine();
-
-        while ($notEOF && $this->isCurrentLineEmpty()) {
-            $notEOF = $this->moveToNextLine();
-        }
-
-        if (false === $notEOF) {
-            return false;
-        }
-
-        $ret = false;
-        if (
-            $this->getCurrentLineIndentation() == $currentIndentation
-            &&
-            $this->isStringUnIndentedCollectionItem($this->currentLine)
-        ) {
-            $ret = true;
-        }
-
-        $this->moveToPreviousLine();
-
-        return $ret;
-    }
-
-    /**
-     * Returns true if the string is un-indented collection item.
-     *
-     * @return bool Returns true if the string is un-indented collection item, false otherwise
-     */
-    private function isStringUnIndentedCollectionItem()
-    {
-        return (0 === strpos($this->currentLine, '- '));
-    }
-}
diff --git a/vendor/symfony/yaml/README.md b/vendor/symfony/yaml/README.md
deleted file mode 100644
index 85a97867..00000000
--- a/vendor/symfony/yaml/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Yaml Component
-==============
-
-YAML implements most of the YAML 1.2 specification.
-
-```php
-use Symfony\Component\Yaml\Yaml;
-
-$array = Yaml::parse(file_get_contents(filename));
-
-print Yaml::dump($array);
-```
-
-Resources
----------
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/Yaml/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/yaml/Tests/DumperTest.php b/vendor/symfony/yaml/Tests/DumperTest.php
deleted file mode 100644
index b103b9a1..00000000
--- a/vendor/symfony/yaml/Tests/DumperTest.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Yaml\Tests;
-
-use Symfony\Component\Yaml\Parser;
-use Symfony\Component\Yaml\Dumper;
-
-class DumperTest extends \PHPUnit_Framework_TestCase
-{
-    protected $parser;
-    protected $dumper;
-    protected $path;
-
-    protected $array = array(
-        '' => 'bar',
-        'foo' => '#bar',
-        'foo\'bar' => array(),
-        'bar' => array(1, 'foo'),
-        'foobar' => array(
-            'foo' => 'bar',
-            'bar' => array(1, 'foo'),
-            'foobar' => array(
-                'foo' => 'bar',
-                'bar' => array(1, 'foo'),
-            ),
-        ),
-    );
-
-    protected function setUp()
-    {
-        $this->parser = new Parser();
-        $this->dumper = new Dumper();
-        $this->path = __DIR__.'/Fixtures';
-    }
-
-    protected function tearDown()
-    {
-        $this->parser = null;
-        $this->dumper = null;
-        $this->path = null;
-        $this->array = null;
-    }
-
-    public function testSetIndentation()
-    {
-        $this->dumper->setIndentation(7);
-
-        $expected = <<<EOF
-'': bar
-foo: '#bar'
-'foo''bar': {  }
-bar:
-       - 1
-       - foo
-foobar:
-       foo: bar
-       bar:
-              - 1
-              - foo
-       foobar:
-              foo: bar
-              bar:
-                     - 1
-                     - foo
-
-EOF;
-        $this->assertEquals($expected, $this->dumper->dump($this->array, 4, 0));
-    }
-
-    public function testSpecifications()
-    {
-        $files = $this->parser->parse(file_get_contents($this->path.'/index.yml'));
-        foreach ($files as $file) {
-            $yamls = file_get_contents($this->path.'/'.$file.'.yml');
-
-            // split YAMLs documents
-            foreach (preg_split('/^---( %YAML\:1\.0)?/m', $yamls) as $yaml) {
-                if (!$yaml) {
-                    continue;
-                }
-
-                $test = $this->parser->parse($yaml);
-                if (isset($test['dump_skip']) && $test['dump_skip']) {
-                    continue;
-                } elseif (isset($test['todo']) && $test['todo']) {
-                    // TODO
-                } else {
-                    eval('$expected = '.trim($test['php']).';');
-                    $this->assertSame($expected, $this->parser->parse($this->dumper->dump($expected, 10)), $test['test']);
-                }
-            }
-        }
-    }
-
-    public function testInlineLevel()
-    {
-        $expected = <<<EOF
-{ '': bar, foo: '#bar', 'foo''bar': {  }, bar: [1, foo], foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } } }
-EOF;
-        $this->assertEquals($expected, $this->dumper->dump($this->array, -10), '->dump() takes an inline level argument');
-        $this->assertEquals($expected, $this->dumper->dump($this->array, 0), '->dump() takes an inline level argument');
-
-        $expected = <<<EOF
-'': bar
-foo: '#bar'
-'foo''bar': {  }
-bar: [1, foo]
-foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } }
-
-EOF;
-        $this->assertEquals($expected, $this->dumper->dump($this->array, 1), '->dump() takes an inline level argument');
-
-        $expected = <<<EOF
-'': bar
-foo: '#bar'
-'foo''bar': {  }
-bar:
-    - 1
-    - foo
-foobar:
-    foo: bar
-    bar: [1, foo]
-    foobar: { foo: bar, bar: [1, foo] }
-
-EOF;
-        $this->assertEquals($expected, $this->dumper->dump($this->array, 2), '->dump() takes an inline level argument');
-
-        $expected = <<<EOF
-'': bar
-foo: '#bar'
-'foo''bar': {  }
-bar:
-    - 1
-    - foo
-foobar:
-    foo: bar
-    bar:
-        - 1
-        - foo
-    foobar:
-        foo: bar
-        bar: [1, foo]
-
-EOF;
-        $this->assertEquals($expected, $this->dumper->dump($this->array, 3), '->dump() takes an inline level argument');
-
-        $expected = <<<EOF
-'': bar
-foo: '#bar'
-'foo''bar': {  }
-bar:
-    - 1
-    - foo
-foobar:
-    foo: bar
-    bar:
-        - 1
-        - foo
-    foobar:
-        foo: bar
-        bar:
-            - 1
-            - foo
-
-EOF;
-        $this->assertEquals($expected, $this->dumper->dump($this->array, 4), '->dump() takes an inline level argument');
-        $this->assertEquals($expected, $this->dumper->dump($this->array, 10), '->dump() takes an inline level argument');
-    }
-
-    public function testObjectSupportEnabled()
-    {
-        $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, false, true);
-
-        $this->assertEquals('{ foo: !!php/object:O:30:"Symfony\Component\Yaml\Tests\A":1:{s:1:"a";s:3:"foo";}, bar: 1 }', $dump, '->dump() is able to dump objects');
-    }
-
-    public function testObjectSupportDisabledButNoExceptions()
-    {
-        $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1));
-
-        $this->assertEquals('{ foo: null, bar: 1 }', $dump, '->dump() does not dump objects when disabled');
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\DumpException
-     */
-    public function testObjectSupportDisabledWithExceptions()
-    {
-        $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, true, false);
-    }
-
-    /**
-     * @dataProvider getEscapeSequences
-     */
-    public function testEscapedEscapeSequencesInQuotedScalar($input, $expected)
-    {
-        $this->assertEquals($expected, $this->dumper->dump($input));
-    }
-
-    public function getEscapeSequences()
-    {
-        return array(
-            'null' => array("\t\\0", '"\t\\\\0"'),
-            'bell' => array("\t\\a", '"\t\\\\a"'),
-            'backspace' => array("\t\\b", '"\t\\\\b"'),
-            'horizontal-tab' => array("\t\\t", '"\t\\\\t"'),
-            'line-feed' => array("\t\\n", '"\t\\\\n"'),
-            'vertical-tab' => array("\t\\v", '"\t\\\\v"'),
-            'form-feed' => array("\t\\f", '"\t\\\\f"'),
-            'carriage-return' => array("\t\\r", '"\t\\\\r"'),
-            'escape' => array("\t\\e", '"\t\\\\e"'),
-            'space' => array("\t\\ ", '"\t\\\\ "'),
-            'double-quote' => array("\t\\\"", '"\t\\\\\\""'),
-            'slash' => array("\t\\/", '"\t\\\\/"'),
-            'backslash' => array("\t\\\\", '"\t\\\\\\\\"'),
-            'next-line' => array("\t\\N", '"\t\\\\N"'),
-            'non-breaking-space' => array("\t\\�", '"\t\\\\�"'),
-            'line-separator' => array("\t\\L", '"\t\\\\L"'),
-            'paragraph-separator' => array("\t\\P", '"\t\\\\P"'),
-        );
-    }
-}
-
-class A
-{
-    public $a = 'foo';
-}
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml
deleted file mode 100644
index 5f9c9427..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml
+++ /dev/null
@@ -1,31 +0,0 @@
---- %YAML:1.0
-test: Simple Alias Example
-brief: >
-    If you need to refer to the same item of data twice,
-    you can give that item an alias.  The alias is a plain
-    string, starting with an ampersand.  The item may then
-    be referred to by the alias throughout your document
-    by using an asterisk before the name of the alias.
-    This is called an anchor.
-yaml: |
-    - &showell Steve
-    - Clark
-    - Brian
-    - Oren
-    - *showell
-php: |
-    array('Steve', 'Clark', 'Brian', 'Oren', 'Steve')
-
----
-test: Alias of a Mapping
-brief: >
-    An alias can be used on any item of data, including
-    sequences, mappings, and other complex data types.
-yaml: |
-    - &hello
-        Meat: pork
-        Starch: potato
-    - banana
-    - *hello
-php: |
-    array(array('Meat'=>'pork', 'Starch'=>'potato'), 'banana', array('Meat'=>'pork', 'Starch'=>'potato'))
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml
deleted file mode 100644
index dfd93021..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml
+++ /dev/null
@@ -1,202 +0,0 @@
---- %YAML:1.0
-test: Simple Sequence
-brief: |
-    You can specify a list in YAML by placing each
-    member of the list on a new line with an opening
-    dash. These lists are called sequences.
-yaml: |
-    - apple
-    - banana
-    - carrot
-php: |
-    array('apple', 'banana', 'carrot')
----
-test: Sequence With Item Being Null In The Middle
-brief: |
-    You can specify a list in YAML by placing each
-    member of the list on a new line with an opening
-    dash. These lists are called sequences.
-yaml: |
-    - apple
-    -
-    - carrot
-php: |
-    array('apple', null, 'carrot')
----
-test: Sequence With Last Item Being Null
-brief: |
-    You can specify a list in YAML by placing each
-    member of the list on a new line with an opening
-    dash. These lists are called sequences.
-yaml: |
-    - apple
-    - banana
-    -
-php: |
-    array('apple', 'banana', null)
----
-test: Nested Sequences
-brief: |
-    You can include a sequence within another
-    sequence by giving the sequence an empty
-    dash, followed by an indented list.
-yaml: |
-    -
-     - foo
-     - bar
-     - baz
-php: |
-    array(array('foo', 'bar', 'baz'))
----
-test: Mixed Sequences
-brief: |
-    Sequences can contain any YAML data,
-    including strings and other sequences.
-yaml: |
-    - apple
-    -
-     - foo
-     - bar
-     - x123
-    - banana
-    - carrot
-php: |
-    array('apple', array('foo', 'bar', 'x123'), 'banana', 'carrot')
----
-test: Deeply Nested Sequences
-brief: |
-    Sequences can be nested even deeper, with each
-    level of indentation representing a level of
-    depth.
-yaml: |
-    -
-     -
-      - uno
-      - dos
-php: |
-    array(array(array('uno', 'dos')))
----
-test: Simple Mapping
-brief: |
-    You can add a keyed list (also known as a dictionary or
-    hash) to your document by placing each member of the
-    list on a new line, with a colon separating the key
-    from its value.  In YAML, this type of list is called
-    a mapping.
-yaml: |
-    foo: whatever
-    bar: stuff
-php: |
-    array('foo' => 'whatever', 'bar' => 'stuff')
----
-test: Sequence in a Mapping
-brief: |
-    A value in a mapping can be a sequence.
-yaml: |
-    foo: whatever
-    bar:
-     - uno
-     - dos
-php: |
-    array('foo' => 'whatever', 'bar' => array('uno', 'dos'))
----
-test: Nested Mappings
-brief: |
-    A value in a mapping can be another mapping.
-yaml: |
-    foo: whatever
-    bar:
-     fruit: apple
-     name: steve
-     sport: baseball
-php: |
-    array(
-      'foo' => 'whatever',
-      'bar' => array(
-         'fruit' => 'apple',
-         'name' => 'steve',
-         'sport' => 'baseball'
-       )
-    )
----
-test: Mixed Mapping
-brief: |
-    A mapping can contain any assortment
-    of mappings and sequences as values.
-yaml: |
-    foo: whatever
-    bar:
-     -
-       fruit: apple
-       name: steve
-       sport: baseball
-     - more
-     -
-       python: rocks
-       perl: papers
-       ruby: scissorses
-php: |
-    array(
-      'foo' => 'whatever',
-      'bar' => array(
-        array(
-            'fruit' => 'apple',
-            'name' => 'steve',
-            'sport' => 'baseball'
-        ),
-        'more',
-        array(
-            'python' => 'rocks',
-            'perl' => 'papers',
-            'ruby' => 'scissorses'
-        )
-      )
-    )
----
-test: Mapping-in-Sequence Shortcut
-todo: true
-brief: |
-     If you are adding a mapping to a sequence, you
-     can place the mapping on the same line as the
-     dash as a shortcut.
-yaml: |
-     - work on YAML.py:
-        - work on Store
-php: |
-    array(array('work on YAML.py' => array('work on Store')))
----
-test: Sequence-in-Mapping Shortcut
-todo: true
-brief: |
-     The dash in a sequence counts as indentation, so
-     you can add a sequence inside of a mapping without
-     needing spaces as indentation.
-yaml: |
-     allow:
-     - 'localhost'
-     - '%.sourceforge.net'
-     - '%.freepan.org'
-php: |
-     array('allow' => array('localhost', '%.sourceforge.net', '%.freepan.org'))
----
-todo: true
-test: Merge key
-brief: |
-     A merge key ('<<') can be used in a mapping to insert other mappings.  If
-     the value associated with the merge key is a mapping, each of its key/value
-     pairs is inserted into the current mapping.
-yaml: |
-     mapping:
-       name: Joe
-       job: Accountant
-       <<:
-         age: 38
-php: |
-     array(
-       'mapping' =>
-       array(
-         'name' => 'Joe',
-         'job' => 'Accountant',
-         'age' => 38
-       )
-     )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsBlockMapping.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsBlockMapping.yml
deleted file mode 100644
index f7ca469b..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/YtsBlockMapping.yml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-test: One Element Mapping
-brief: |
-    A mapping with one key/value pair
-yaml: |
-    foo: bar
-php: |
-    array('foo' => 'bar')
----
-test: Multi Element Mapping
-brief: |
-    More than one key/value pair
-yaml: |
-    red: baron
-    white: walls
-    blue: berries
-php: |
-    array(
-     'red' => 'baron',
-     'white' => 'walls',
-     'blue' => 'berries',
-    )
----
-test: Values aligned
-brief: |
-    Often times human editors of documents will align the values even
-    though YAML emitters generally don't.
-yaml: |
-    red:   baron
-    white: walls
-    blue:  berries
-php: |
-    array(
-     'red' => 'baron',
-     'white' => 'walls',
-     'blue' => 'berries',
-    )
----
-test: Colons aligned
-brief: |
-    Spaces can come before the ': ' key/value separator.
-yaml: |
-    red   : baron
-    white : walls
-    blue  : berries
-php: |
-    array(
-     'red' => 'baron',
-     'white' => 'walls',
-     'blue' => 'berries',
-    )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml
deleted file mode 100644
index f8501ddc..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml
+++ /dev/null
@@ -1,85 +0,0 @@
---- %YAML:1.0
-test: Trailing Document Separator
-todo: true
-brief: >
-    You can separate YAML documents
-    with a string of three dashes.
-yaml: |
-    - foo: 1
-      bar: 2
-    ---
-    more: stuff
-python: |
-    [
-        [ { 'foo': 1, 'bar': 2 } ],
-        { 'more': 'stuff' }
-    ]
-ruby: |
-    [ { 'foo' => 1, 'bar' => 2 } ]
-
----
-test: Leading Document Separator
-todo: true
-brief: >
-    You can explicity give an opening
-    document separator to your YAML stream.
-yaml: |
-    ---
-    - foo: 1
-      bar: 2
-    ---
-    more: stuff
-python: |
-    [
-        [ {'foo': 1, 'bar': 2}],
-        {'more': 'stuff'}
-    ]
-ruby: |
-    [ { 'foo' => 1, 'bar' => 2 } ]
-
----
-test: YAML Header
-todo: true
-brief: >
-    The opening separator can contain directives
-    to the YAML parser, such as the version
-    number.
-yaml: |
-    --- %YAML:1.0
-    foo: 1
-    bar: 2
-php: |
-    array('foo' => 1, 'bar' => 2)
-documents: 1
-
----
-test: Red Herring Document Separator
-brief: >
-    Separators included in blocks or strings
-    are treated as blocks or strings, as the
-    document separator should have no indentation
-    preceding it.
-yaml: |
-    foo: |
-        ---
-php: |
-    array('foo' => "---\n")
-
----
-test: Multiple Document Separators in Block
-brief: >
-    This technique allows you to embed other YAML
-    documents within literal blocks.
-yaml: |
-    foo: |
-        ---
-        foo: bar
-        ---
-        yo: baz
-    bar: |
-        fooness
-php: |
-    array(
-       'foo' => "---\nfoo: bar\n---\nyo: baz\n",
-       'bar' => "fooness\n"
-    )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsErrorTests.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsErrorTests.yml
deleted file mode 100644
index e8506fcb..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/YtsErrorTests.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-test: Missing value for hash item
-todo: true
-brief: |
-    Third item in this hash doesn't have a value
-yaml: |
-    okay: value
-    also okay: ~
-    causes error because no value specified
-    last key: value okay here too
-python-error: causes error because no value specified
-
----
-test: Not indenting enough
-brief: |
-    There was a bug in PyYaml where it was off by one
-    in the indentation check.  It was allowing the YAML
-    below.
-# This is actually valid YAML now. Someone should tell showell.
-yaml: |
-    foo:
-    firstline: 1
-    secondline: 2
-php: |
-  array('foo' => null, 'firstline' => 1, 'secondline' => 2)
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsFlowCollections.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsFlowCollections.yml
deleted file mode 100644
index 03090e4a..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/YtsFlowCollections.yml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-test: Simple Inline Array
-brief: >
-    Sequences can be contained on a
-    single line, using the inline syntax.
-    Separate each entry with commas and
-    enclose in square brackets.
-yaml: |
-    seq: [ a, b, c ]
-php: |
-    array('seq' => array('a', 'b', 'c'))
----
-test: Simple Inline Hash
-brief: >
-    Mapping can also be contained on
-    a single line, using the inline
-    syntax.  Each key-value pair is
-    separated by a colon, with a comma
-    between each entry in the mapping.
-    Enclose with curly braces.
-yaml: |
-    hash: { name: Steve, foo: bar }
-php: |
-    array('hash' => array('name' => 'Steve', 'foo' => 'bar'))
----
-test: Multi-line Inline Collections
-todo: true
-brief: >
-    Both inline sequences and inline mappings
-    can span multiple lines, provided that you
-    indent the additional lines.
-yaml: |
-    languages: [ Ruby,
-                 Perl,
-                 Python ]
-    websites: { YAML: yaml.org,
-                Ruby: ruby-lang.org,
-                Python: python.org,
-                Perl: use.perl.org }
-php: |
-    array(
-      'languages' => array('Ruby', 'Perl', 'Python'),
-      'websites' => array(
-        'YAML' => 'yaml.org',
-        'Ruby' => 'ruby-lang.org',
-        'Python' => 'python.org',
-        'Perl' => 'use.perl.org'
-      )
-    )
----
-test: Commas in Values (not in the spec!)
-todo: true
-brief: >
-    List items in collections are delimited by commas, but
-    there must be a space after each comma.  This allows you
-    to add numbers without quoting.
-yaml: |
-    attendances: [ 45,123, 70,000, 17,222 ]
-php: |
-    array('attendances' => array(45123, 70000, 17222))
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsFoldedScalars.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsFoldedScalars.yml
deleted file mode 100644
index a14735a5..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/YtsFoldedScalars.yml
+++ /dev/null
@@ -1,176 +0,0 @@
---- %YAML:1.0
-test: Single ending newline
-brief: >
-    A pipe character, followed by an indented
-    block of text is treated as a literal
-    block, in which newlines are preserved
-    throughout the block, including the final
-    newline.
-yaml: |
-    ---
-    this: |
-        Foo
-        Bar
-php: |
-    array('this' => "Foo\nBar\n")
----
-test: The '+' indicator
-brief: >
-    The '+' indicator says to keep newlines at the end of text
-    blocks.
-yaml: |
-    normal: |
-      extra new lines not kept
-
-    preserving: |+
-      extra new lines are kept
-
-
-    dummy: value
-php: |
-    array(
-        'normal' => "extra new lines not kept\n",
-        'preserving' => "extra new lines are kept\n\n\n",
-        'dummy' => 'value'
-    )
----
-test: Three trailing newlines in literals
-brief: >
-    To give you more control over how space
-    is preserved in text blocks, YAML has
-    the keep '+' and chomp '-' indicators.
-    The keep indicator will preserve all
-    ending newlines, while the chomp indicator
-    will strip all ending newlines.
-yaml: |
-    clipped: |
-        This has one newline.
-
-
-
-    same as "clipped" above: "This has one newline.\n"
-
-    stripped: |-
-        This has no newline.
-
-
-
-    same as "stripped" above: "This has no newline."
-
-    kept: |+
-        This has four newlines.
-
-
-
-    same as "kept" above: "This has four newlines.\n\n\n\n"
-php: |
-    array(
-      'clipped' => "This has one newline.\n",
-      'same as "clipped" above' => "This has one newline.\n",
-      'stripped' => 'This has no newline.',
-      'same as "stripped" above' => 'This has no newline.',
-      'kept' => "This has four newlines.\n\n\n\n",
-      'same as "kept" above' => "This has four newlines.\n\n\n\n"
-    )
----
-test: Extra trailing newlines with spaces
-todo: true
-brief: >
-    Normally, only a single newline is kept
-    from the end of a literal block, unless the
-    keep '+' character is used in combination
-    with the pipe.  The following example
-    will preserve all ending whitespace
-    since the last line of both literal blocks
-    contains spaces which extend past the indentation
-    level.
-yaml: |
-    ---
-    this: |
-        Foo
-
-
-    kept: |+
-        Foo
-
-
-php: |
-    array('this' => "Foo\n\n  \n",
-      'kept' => "Foo\n\n  \n" )
-
----
-test: Folded Block in a Sequence
-brief: >
-    A greater-then character, followed by an indented
-    block of text is treated as a folded block, in
-    which lines of text separated by a single newline
-    are concatenated as a single line.
-yaml: |
-    ---
-    - apple
-    - banana
-    - >
-        can't you see
-        the beauty of yaml?
-        hmm
-    - dog
-php: |
-    array(
-        'apple',
-        'banana',
-        "can't you see the beauty of yaml? hmm\n",
-        'dog'
-    )
----
-test: Folded Block as a Mapping Value
-brief: >
-    Both literal and folded blocks can be
-    used in collections, as values in a
-    sequence or a mapping.
-yaml: |
-    ---
-    quote: >
-        Mark McGwire's
-        year was crippled
-        by a knee injury.
-    source: espn
-php: |
-    array(
-        'quote' => "Mark McGwire's year was crippled by a knee injury.\n",
-        'source' => 'espn'
-    )
----
-test: Three trailing newlines in folded blocks
-brief: >
-    The keep and chomp indicators can also
-    be applied to folded blocks.
-yaml: |
-    clipped: >
-        This has one newline.
-
-
-
-    same as "clipped" above: "This has one newline.\n"
-
-    stripped: >-
-        This has no newline.
-
-
-
-    same as "stripped" above: "This has no newline."
-
-    kept: >+
-        This has four newlines.
-
-
-
-    same as "kept" above: "This has four newlines.\n\n\n\n"
-php: |
-    array(
-      'clipped' => "This has one newline.\n",
-      'same as "clipped" above' => "This has one newline.\n",
-      'stripped' => 'This has no newline.',
-      'same as "stripped" above' => 'This has no newline.',
-      'kept' => "This has four newlines.\n\n\n\n",
-      'same as "kept" above' => "This has four newlines.\n\n\n\n"
-    )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsNullsAndEmpties.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsNullsAndEmpties.yml
deleted file mode 100644
index 9a5300f2..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/YtsNullsAndEmpties.yml
+++ /dev/null
@@ -1,45 +0,0 @@
---- %YAML:1.0
-test: Empty Sequence
-brief: >
-    You can represent the empty sequence
-    with an empty inline sequence.
-yaml: |
-    empty: []
-php: |
-    array('empty' => array())
----
-test: Empty Mapping
-brief: >
-    You can represent the empty mapping
-    with an empty inline mapping.
-yaml: |
-    empty: {}
-php: |
-    array('empty' => array())
----
-test: Empty Sequence as Entire Document
-yaml: |
-    []
-php: |
-    array()
----
-test: Empty Mapping as Entire Document
-yaml: |
-    {}
-php: |
-    array()
----
-test: Null as Document
-yaml: |
-    ~
-php: |
-    null
----
-test: Empty String
-brief: >
-    You can represent an empty string
-    with a pair of quotes.
-yaml: |
-    ''
-php: |
-    ''
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml
deleted file mode 100644
index 0a8b5def..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml
+++ /dev/null
@@ -1,1697 +0,0 @@
---- %YAML:1.0
-test: Sequence of scalars
-spec: 2.1
-yaml: |
-  - Mark McGwire
-  - Sammy Sosa
-  - Ken Griffey
-php: |
-  array('Mark McGwire', 'Sammy Sosa', 'Ken Griffey')
----
-test: Mapping of scalars to scalars
-spec: 2.2
-yaml: |
-  hr:  65
-  avg: 0.278
-  rbi: 147
-php: |
-  array('hr' => 65, 'avg' => 0.278, 'rbi' => 147)
----
-test: Mapping of scalars to sequences
-spec: 2.3
-yaml: |
-    american:
-       - Boston Red Sox
-       - Detroit Tigers
-       - New York Yankees
-    national:
-       - New York Mets
-       - Chicago Cubs
-       - Atlanta Braves
-php: |
-    array('american' =>
-        array( 'Boston Red Sox', 'Detroit Tigers',
-          'New York Yankees' ),
-      'national' =>
-        array( 'New York Mets', 'Chicago Cubs',
-          'Atlanta Braves' )
-    )
----
-test: Sequence of mappings
-spec: 2.4
-yaml: |
-    -
-      name: Mark McGwire
-      hr:   65
-      avg:  0.278
-    -
-      name: Sammy Sosa
-      hr:   63
-      avg:  0.288
-php: |
-    array(
-      array('name' => 'Mark McGwire', 'hr' => 65, 'avg' => 0.278),
-      array('name' => 'Sammy Sosa', 'hr' => 63, 'avg' => 0.288)
-    )
----
-test: Legacy A5
-todo: true
-spec: legacy_A5
-yaml: |
-    ?
-        - New York Yankees
-        - Atlanta Braves
-    :
-      - 2001-07-02
-      - 2001-08-12
-      - 2001-08-14
-    ?
-        - Detroit Tigers
-        - Chicago Cubs
-    :
-      - 2001-07-23
-perl-busted: >
-    YAML.pm will be able to emulate this behavior soon. In this regard
-    it may be somewhat more correct than Python's native behaviour which
-    can only use tuples as mapping keys. PyYAML will also need to figure
-    out some clever way to roundtrip structured keys.
-python: |
-    [
-    {
-        ('New York Yankees', 'Atlanta Braves'):
-            [yaml.timestamp('2001-07-02'),
-             yaml.timestamp('2001-08-12'),
-             yaml.timestamp('2001-08-14')],
-        ('Detroit Tigers', 'Chicago Cubs'):
-        [yaml.timestamp('2001-07-23')]
-    }
-    ]
-ruby: |
-    {
-      [ 'New York Yankees', 'Atlanta Braves' ] =>
-        [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ), Date.new( 2001, 8, 14 ) ],
-      [ 'Detroit Tigers', 'Chicago Cubs' ] =>
-        [ Date.new( 2001, 7, 23 ) ]
-    }
-syck: |
-  struct test_node seq1[] = {
-      { T_STR, 0, "New York Yankees" },
-      { T_STR, 0, "Atlanta Braves" },
-      end_node
-  };
-  struct test_node seq2[] = {
-      { T_STR, 0, "2001-07-02" },
-      { T_STR, 0, "2001-08-12" },
-      { T_STR, 0, "2001-08-14" },
-      end_node
-  };
-  struct test_node seq3[] = {
-      { T_STR, 0, "Detroit Tigers" },
-      { T_STR, 0, "Chicago Cubs" },
-      end_node
-  };
-  struct test_node seq4[] = {
-      { T_STR, 0, "2001-07-23" },
-      end_node
-  };
-  struct test_node map[] = {
-      { T_SEQ, 0, 0, seq1 },
-      { T_SEQ, 0, 0, seq2 },
-      { T_SEQ, 0, 0, seq3 },
-      { T_SEQ, 0, 0, seq4 },
-      end_node
-  };
-  struct test_node stream[] = {
-      { T_MAP, 0, 0, map },
-      end_node
-  };
-
----
-test: Sequence of sequences
-spec: 2.5
-yaml: |
-  - [ name         , hr , avg   ]
-  - [ Mark McGwire , 65 , 0.278 ]
-  - [ Sammy Sosa   , 63 , 0.288 ]
-php: |
-  array(
-    array( 'name', 'hr', 'avg' ),
-    array( 'Mark McGwire', 65, 0.278 ),
-    array( 'Sammy Sosa', 63, 0.288 )
-  )
----
-test: Mapping of mappings
-todo: true
-spec: 2.6
-yaml: |
-  Mark McGwire: {hr: 65, avg: 0.278}
-  Sammy Sosa: {
-      hr: 63,
-      avg: 0.288
-    }
-php: |
-  array(
-    'Mark McGwire' =>
-      array( 'hr' => 65, 'avg' => 0.278 ),
-    'Sammy Sosa' =>
-      array( 'hr' => 63, 'avg' => 0.288 )
-  )
----
-test: Two documents in a stream each with a leading comment
-todo: true
-spec: 2.7
-yaml: |
-  # Ranking of 1998 home runs
-  ---
-  - Mark McGwire
-  - Sammy Sosa
-  - Ken Griffey
-
-  # Team ranking
-  ---
-  - Chicago Cubs
-  - St Louis Cardinals
-ruby: |
-  y = YAML::Stream.new
-  y.add( [ 'Mark McGwire', 'Sammy Sosa', 'Ken Griffey' ] )
-  y.add( [ 'Chicago Cubs', 'St Louis Cardinals' ] )
-documents: 2
-
----
-test: Play by play feed from a game
-todo: true
-spec: 2.8
-yaml: |
-  ---
-  time: 20:03:20
-  player: Sammy Sosa
-  action: strike (miss)
-  ...
-  ---
-  time: 20:03:47
-  player: Sammy Sosa
-  action: grand slam
-  ...
-perl: |
-  [ 'Mark McGwire', 'Sammy Sosa', 'Ken Griffey' ]
-documents: 2
-
----
-test: Single document with two comments
-spec: 2.9
-yaml: |
-  hr: # 1998 hr ranking
-    - Mark McGwire
-    - Sammy Sosa
-  rbi:
-    # 1998 rbi ranking
-    - Sammy Sosa
-    - Ken Griffey
-php: |
-  array(
-    'hr' => array( 'Mark McGwire', 'Sammy Sosa' ),
-    'rbi' => array( 'Sammy Sosa', 'Ken Griffey' )
-  )
----
-test: Node for Sammy Sosa appears twice in this document
-spec: 2.10
-yaml: |
-   ---
-   hr:
-      - Mark McGwire
-      # Following node labeled SS
-      - &SS Sammy Sosa
-   rbi:
-      - *SS # Subsequent occurrence
-      - Ken Griffey
-php: |
-   array(
-      'hr' =>
-         array('Mark McGwire', 'Sammy Sosa'),
-      'rbi' =>
-         array('Sammy Sosa', 'Ken Griffey')
-   )
----
-test: Mapping between sequences
-todo: true
-spec: 2.11
-yaml: |
-   ? # PLAY SCHEDULE
-     - Detroit Tigers
-     - Chicago Cubs
-   :
-     - 2001-07-23
-
-   ? [ New York Yankees,
-       Atlanta Braves ]
-   : [ 2001-07-02, 2001-08-12,
-       2001-08-14 ]
-ruby: |
-   {
-      [ 'Detroit Tigers', 'Chicago Cubs' ] => [ Date.new( 2001, 7, 23 ) ],
-      [ 'New York Yankees', 'Atlanta Braves' ] => [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ), Date.new( 2001, 8, 14 ) ]
-   }
-syck: |
-  struct test_node seq1[] = {
-      { T_STR, 0, "New York Yankees" },
-      { T_STR, 0, "Atlanta Braves" },
-      end_node
-  };
-  struct test_node seq2[] = {
-      { T_STR, 0, "2001-07-02" },
-      { T_STR, 0, "2001-08-12" },
-      { T_STR, 0, "2001-08-14" },
-      end_node
-  };
-  struct test_node seq3[] = {
-      { T_STR, 0, "Detroit Tigers" },
-      { T_STR, 0, "Chicago Cubs" },
-      end_node
-  };
-  struct test_node seq4[] = {
-      { T_STR, 0, "2001-07-23" },
-      end_node
-  };
-  struct test_node map[] = {
-      { T_SEQ, 0, 0, seq3 },
-      { T_SEQ, 0, 0, seq4 },
-      { T_SEQ, 0, 0, seq1 },
-      { T_SEQ, 0, 0, seq2 },
-      end_node
-  };
-  struct test_node stream[] = {
-      { T_MAP, 0, 0, map },
-      end_node
-  };
-
----
-test: Sequence key shortcut
-spec: 2.12
-yaml: |
-  ---
-  # products purchased
-  - item    : Super Hoop
-    quantity: 1
-  - item    : Basketball
-    quantity: 4
-  - item    : Big Shoes
-    quantity: 1
-php: |
-  array (
-    array (
-      'item' => 'Super Hoop',
-      'quantity' => 1,
-    ),
-    array (
-      'item' => 'Basketball',
-      'quantity' => 4,
-    ),
-    array (
-      'item' => 'Big Shoes',
-      'quantity' => 1,
-    )
-  )
-perl: |
-  [
-     { item => 'Super Hoop', quantity => 1 },
-     { item => 'Basketball', quantity => 4 },
-     { item => 'Big Shoes',  quantity => 1 }
-  ]
-
-ruby: |
-  [
-     { 'item' => 'Super Hoop', 'quantity' => 1 },
-     { 'item' => 'Basketball', 'quantity' => 4 },
-     { 'item' => 'Big Shoes', 'quantity' => 1 }
-  ]
-python: |
-  [
-       { 'item': 'Super Hoop', 'quantity': 1 },
-       { 'item': 'Basketball', 'quantity': 4 },
-       { 'item': 'Big Shoes',  'quantity': 1 }
-  ]
-syck: |
-  struct test_node map1[] = {
-      { T_STR, 0, "item" },
-          { T_STR, 0, "Super Hoop" },
-      { T_STR, 0, "quantity" },
-          { T_STR, 0, "1" },
-      end_node
-  };
-  struct test_node map2[] = {
-      { T_STR, 0, "item" },
-          { T_STR, 0, "Basketball" },
-      { T_STR, 0, "quantity" },
-          { T_STR, 0, "4" },
-      end_node
-  };
-  struct test_node map3[] = {
-      { T_STR, 0, "item" },
-          { T_STR, 0, "Big Shoes" },
-      { T_STR, 0, "quantity" },
-          { T_STR, 0, "1" },
-      end_node
-  };
-  struct test_node seq[] = {
-      { T_MAP, 0, 0, map1 },
-      { T_MAP, 0, 0, map2 },
-      { T_MAP, 0, 0, map3 },
-      end_node
-  };
-  struct test_node stream[] = {
-      { T_SEQ, 0, 0, seq },
-      end_node
-  };
-
-
----
-test: Literal perserves newlines
-todo: true
-spec: 2.13
-yaml: |
-  # ASCII Art
-  --- |
-    \//||\/||
-    // ||  ||_
-perl: |
-  "\\//||\\/||\n// ||  ||_\n"
-ruby: |
-  "\\//||\\/||\n// ||  ||_\n"
-python: |
-    [
-        flushLeft(
-        """
-        \//||\/||
-        // ||  ||_
-        """
-        )
-    ]
-syck: |
-  struct test_node stream[] = {
-      { T_STR, 0, "\\//||\\/||\n// ||  ||_\n" },
-      end_node
-  };
-
----
-test: Folded treats newlines as a space
-todo: true
-spec: 2.14
-yaml: |
-  ---
-    Mark McGwire's
-    year was crippled
-    by a knee injury.
-perl: |
-  "Mark McGwire's year was crippled by a knee injury."
-ruby: |
-  "Mark McGwire's year was crippled by a knee injury."
-python: |
-    [ "Mark McGwire's year was crippled by a knee injury." ]
-syck: |
-  struct test_node stream[] = {
-      { T_STR, 0, "Mark McGwire's year was crippled by a knee injury." },
-      end_node
-  };
-
----
-test: Newlines preserved for indented and blank lines
-todo: true
-spec: 2.15
-yaml: |
-  --- >
-   Sammy Sosa completed another
-   fine season with great stats.
-
-     63 Home Runs
-     0.288 Batting Average
-
-   What a year!
-perl: |
-  "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n"
-ruby: |
-  "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n"
-python: |
-    [
-        flushLeft(
-        """
-        Sammy Sosa completed another fine season with great stats.
-
-          63 Home Runs
-          0.288 Batting Average
-
-        What a year!
-        """
-        )
-    ]
-syck: |
-  struct test_node stream[] = {
-      { T_STR, 0, "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n" },
-      end_node
-  };
-
-
----
-test: Indentation determines scope
-spec: 2.16
-yaml: |
-  name: Mark McGwire
-  accomplishment: >
-     Mark set a major league
-     home run record in 1998.
-  stats: |
-     65 Home Runs
-     0.278 Batting Average
-php: |
-  array(
-    'name' => 'Mark McGwire',
-    'accomplishment' => "Mark set a major league home run record in 1998.\n",
-    'stats' => "65 Home Runs\n0.278 Batting Average\n"
-  )
----
-test: Quoted scalars
-todo: true
-spec: 2.17
-yaml: |
-  unicode: "Sosa did fine.\u263A"
-  control: "\b1998\t1999\t2000\n"
-  hexesc:  "\x0D\x0A is \r\n"
-
-  single: '"Howdy!" he cried.'
-  quoted: ' # not a ''comment''.'
-  tie-fighter: '|\-*-/|'
-ruby: |
-  {
-    "tie-fighter" => "|\\-*-/|",
-    "control"=>"\0101998\t1999\t2000\n",
-    "unicode"=>"Sosa did fine." + ["263A".hex ].pack('U*'),
-    "quoted"=>" # not a 'comment'.",
-    "single"=>"\"Howdy!\" he cried.",
-    "hexesc"=>"\r\n is \r\n"
-  }
----
-test: Multiline flow scalars
-todo: true
-spec: 2.18
-yaml: |
-  plain:
-    This unquoted scalar
-    spans many lines.
-
-  quoted: "So does this
-    quoted scalar.\n"
-ruby: |
-  {
-    'plain' => 'This unquoted scalar spans many lines.',
-    'quoted' => "So does this quoted scalar.\n"
-  }
----
-test: Integers
-spec: 2.19
-yaml: |
-  canonical: 12345
-  decimal: +12,345
-  octal: 014
-  hexadecimal: 0xC
-php: |
-  array(
-    'canonical' => 12345,
-    'decimal' => 12345,
-    'octal' => 014,
-    'hexadecimal' => 0xC
-  )
----
-# FIX: spec shows parens around -inf and NaN
-test: Floating point
-spec: 2.20
-yaml: |
-  canonical: 1.23015e+3
-  exponential: 12.3015e+02
-  fixed: 1,230.15
-  negative infinity: -.inf
-  not a number: .NaN
-  float as whole number: !!float 1
-php: |
-  array(
-    'canonical' => 1230.15,
-    'exponential' => 1230.15,
-    'fixed' => 1230.15,
-    'negative infinity' => log(0),
-    'not a number' => -log(0),
-    'float as whole number' => (float) 1
-  )
----
-test: Miscellaneous
-spec: 2.21
-yaml: |
-  null: ~
-  true: true
-  false: false
-  string: '12345'
-php: |
-  array(
-    '' => null,
-    1 => true,
-    0 => false,
-    'string' => '12345'
-  )
----
-test: Timestamps
-todo: true
-spec: 2.22
-yaml: |
-  canonical: 2001-12-15T02:59:43.1Z
-  iso8601:  2001-12-14t21:59:43.10-05:00
-  spaced:  2001-12-14 21:59:43.10 -05:00
-  date:   2002-12-14 # Time is noon UTC
-php: |
-  array(
-    'canonical' => YAML::mktime( 2001, 12, 15, 2, 59, 43, 0.10 ),
-    'iso8601' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
-    'spaced' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
-    'date' => Date.new( 2002, 12, 14 )
-  )
----
-test: legacy Timestamps test
-todo: true
-spec: legacy D4
-yaml: |
-    canonical: 2001-12-15T02:59:43.00Z
-    iso8601:  2001-02-28t21:59:43.00-05:00
-    spaced:  2001-12-14 21:59:43.00 -05:00
-    date:   2002-12-14
-php: |
-   array(
-     'canonical' => Time::utc( 2001, 12, 15, 2, 59, 43, 0 ),
-     'iso8601' => YAML::mktime( 2001, 2, 28, 21, 59, 43, 0, "-05:00" ),
-     'spaced' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0, "-05:00" ),
-     'date' => Date.new( 2002, 12, 14 )
-   )
----
-test: Various explicit families
-todo: true
-spec: 2.23
-yaml: |
-  not-date: !str 2002-04-28
-  picture: !binary |
-   R0lGODlhDAAMAIQAAP//9/X
-   17unp5WZmZgAAAOfn515eXv
-   Pz7Y6OjuDg4J+fn5OTk6enp
-   56enmleECcgggoBADs=
-
-  application specific tag: !!something |
-   The semantics of the tag
-   above may be different for
-   different documents.
-
-ruby-setup: |
-  YAML.add_private_type( "something" ) do |type, val|
-    "SOMETHING: #{val}"
-  end
-ruby: |
-  {
-    'not-date' => '2002-04-28',
-    'picture' => "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236i^\020' \202\n\001\000;",
-    'application specific tag' => "SOMETHING: The semantics of the tag\nabove may be different for\ndifferent documents.\n"
-  }
----
-test: Application specific family
-todo: true
-spec: 2.24
-yaml: |
-  # Establish a tag prefix
-  --- !clarkevans.com,2002/graph/^shape
-    # Use the prefix: shorthand for
-    # !clarkevans.com,2002/graph/circle
-  - !^circle
-    center: &ORIGIN {x: 73, 'y': 129}
-    radius: 7
-  - !^line # !clarkevans.com,2002/graph/line
-    start: *ORIGIN
-    finish: { x: 89, 'y': 102 }
-  - !^label
-    start: *ORIGIN
-    color: 0xFFEEBB
-    value: Pretty vector drawing.
-ruby-setup: |
-  YAML.add_domain_type( "clarkevans.com,2002", 'graph/shape' ) { |type, val|
-    if Array === val
-      val << "Shape Container"
-      val
-    else
-      raise YAML::Error, "Invalid graph of class #{ val.class }: " + val.inspect
-    end
-  }
-  one_shape_proc = Proc.new { |type, val|
-    scheme, domain, type = type.split( /:/, 3 )
-    if val.is_a? ::Hash
-      val['TYPE'] = "Shape: #{type}"
-      val
-    else
-      raise YAML::Error, "Invalid graph of class #{ val.class }: " + val.inspect
-    end
-  }
-  YAML.add_domain_type( "clarkevans.com,2002", 'graph/circle', &one_shape_proc )
-  YAML.add_domain_type( "clarkevans.com,2002", 'graph/line', &one_shape_proc )
-  YAML.add_domain_type( "clarkevans.com,2002", 'graph/label', &one_shape_proc )
-ruby: |
-  [
-    {
-      "radius" => 7,
-      "center"=>
-      {
-        "x" => 73,
-        "y" => 129
-      },
-      "TYPE" => "Shape: graph/circle"
-    }, {
-      "finish" =>
-      {
-        "x" => 89,
-        "y" => 102
-      },
-      "TYPE" => "Shape: graph/line",
-      "start" =>
-      {
-        "x" => 73,
-        "y" => 129
-      }
-    }, {
-      "TYPE" => "Shape: graph/label",
-      "value" => "Pretty vector drawing.",
-      "start" =>
-      {
-        "x" => 73,
-        "y" => 129
-      },
-      "color" => 16772795
-    },
-    "Shape Container"
-  ]
-# ---
-# test: Unordered set
-# spec: 2.25
-# yaml: |
-#   # sets are represented as a
-#   # mapping where each key is
-#   # associated with the empty string
-#   --- !set
-#   ? Mark McGwire
-#   ? Sammy Sosa
-#   ? Ken Griff
----
-test: Ordered mappings
-todo: true
-spec: 2.26
-yaml: |
-  # ordered maps are represented as
-  # a sequence of mappings, with
-  # each mapping having one key
-  --- !omap
-  - Mark McGwire: 65
-  - Sammy Sosa: 63
-  - Ken Griffy: 58
-ruby: |
-  YAML::Omap[
-    'Mark McGwire', 65,
-    'Sammy Sosa', 63,
-    'Ken Griffy', 58
-  ]
----
-test: Invoice
-dump_skip: true
-spec: 2.27
-yaml: |
-  --- !clarkevans.com,2002/^invoice
-  invoice: 34843
-  date   : 2001-01-23
-  bill-to: &id001
-      given  : Chris
-      family : Dumars
-      address:
-          lines: |
-              458 Walkman Dr.
-              Suite #292
-          city    : Royal Oak
-          state   : MI
-          postal  : 48046
-  ship-to: *id001
-  product:
-      -
-        sku         : BL394D
-        quantity    : 4
-        description : Basketball
-        price       : 450.00
-      -
-        sku         : BL4438H
-        quantity    : 1
-        description : Super Hoop
-        price       : 2392.00
-  tax  : 251.42
-  total: 4443.52
-  comments: >
-    Late afternoon is best.
-    Backup contact is Nancy
-    Billsmer @ 338-4338.
-php: |
-  array(
-     'invoice' => 34843, 'date' => mktime(0, 0, 0, 1, 23, 2001),
-     'bill-to' =>
-      array( 'given' => 'Chris', 'family' => 'Dumars', 'address' => array( 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak', 'state' => 'MI', 'postal' => 48046 ) )
-     , 'ship-to' =>
-      array( 'given' => 'Chris', 'family' => 'Dumars', 'address' => array( 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak', 'state' => 'MI', 'postal' => 48046 ) )
-     , 'product' =>
-       array(
-        array( 'sku' => 'BL394D', 'quantity' => 4, 'description' => 'Basketball', 'price' => 450.00 ),
-        array( 'sku' => 'BL4438H', 'quantity' => 1, 'description' => 'Super Hoop', 'price' => 2392.00 )
-      ),
-     'tax' => 251.42, 'total' => 4443.52,
-     'comments' => "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.\n"
-  )
----
-test: Log file
-todo: true
-spec: 2.28
-yaml: |
-  ---
-  Time: 2001-11-23 15:01:42 -05:00
-  User: ed
-  Warning: >
-    This is an error message
-    for the log file
-  ---
-  Time: 2001-11-23 15:02:31 -05:00
-  User: ed
-  Warning: >
-    A slightly different error
-    message.
-  ---
-  Date: 2001-11-23 15:03:17 -05:00
-  User: ed
-  Fatal: >
-    Unknown variable "bar"
-  Stack:
-    - file: TopClass.py
-      line: 23
-      code: |
-        x = MoreObject("345\n")
-    - file: MoreClass.py
-      line: 58
-      code: |-
-        foo = bar
-ruby: |
-  y = YAML::Stream.new
-  y.add( { 'Time' => YAML::mktime( 2001, 11, 23, 15, 01, 42, 00, "-05:00" ),
-           'User' => 'ed', 'Warning' => "This is an error message for the log file\n" } )
-  y.add( { 'Time' => YAML::mktime( 2001, 11, 23, 15, 02, 31, 00, "-05:00" ),
-           'User' => 'ed', 'Warning' => "A slightly different error message.\n" } )
-  y.add( { 'Date' => YAML::mktime( 2001, 11, 23, 15, 03, 17, 00, "-05:00" ),
-           'User' => 'ed', 'Fatal' => "Unknown variable \"bar\"\n",
-           'Stack' => [
-           { 'file' => 'TopClass.py', 'line' => 23, 'code' => "x = MoreObject(\"345\\n\")\n" },
-           { 'file' => 'MoreClass.py', 'line' => 58, 'code' => "foo = bar" } ] } )
-documents: 3
-
----
-test: Throwaway comments
-yaml: |
-   ### These are four throwaway comment  ###
-
-   ### lines (the second line is empty). ###
-   this: |   # Comments may trail lines.
-      contains three lines of text.
-      The third one starts with a
-      # character. This isn't a comment.
-
-   # These are three throwaway comment
-   # lines (the first line is empty).
-php: |
-   array(
-     'this' => "contains three lines of text.\nThe third one starts with a\n# character. This isn't a comment.\n"
-   )
----
-test: Document with a single value
-todo: true
-yaml: |
-   --- >
-   This YAML stream contains a single text value.
-   The next stream is a log file - a sequence of
-   log entries. Adding an entry to the log is a
-   simple matter of appending it at the end.
-ruby: |
-   "This YAML stream contains a single text value. The next stream is a log file - a sequence of log entries. Adding an entry to the log is a simple matter of appending it at the end.\n"
----
-test: Document stream
-todo: true
-yaml: |
-   ---
-   at: 2001-08-12 09:25:00.00 Z
-   type: GET
-   HTTP: '1.0'
-   url: '/index.html'
-   ---
-   at: 2001-08-12 09:25:10.00 Z
-   type: GET
-   HTTP: '1.0'
-   url: '/toc.html'
-ruby: |
-   y = YAML::Stream.new
-   y.add( {
-      'at' => Time::utc( 2001, 8, 12, 9, 25, 00 ),
-      'type' => 'GET',
-      'HTTP' => '1.0',
-      'url' => '/index.html'
-   } )
-   y.add( {
-      'at' => Time::utc( 2001, 8, 12, 9, 25, 10 ),
-      'type' => 'GET',
-      'HTTP' => '1.0',
-      'url' => '/toc.html'
-   } )
-documents: 2
-
----
-test: Top level mapping
-yaml: |
-   # This stream is an example of a top-level mapping.
-   invoice : 34843
-   date    : 2001-01-23
-   total   : 4443.52
-php: |
-   array(
-      'invoice' => 34843,
-      'date' => mktime(0, 0, 0, 1, 23, 2001),
-      'total' => 4443.52
-   )
----
-test: Single-line documents
-todo: true
-yaml: |
-  # The following is a sequence of three documents.
-  # The first contains an empty mapping, the second
-  # an empty sequence, and the last an empty string.
-  --- {}
-  --- [ ]
-  --- ''
-ruby: |
-  y = YAML::Stream.new
-  y.add( {} )
-  y.add( [] )
-  y.add( '' )
-documents: 3
-
----
-test: Document with pause
-todo: true
-yaml: |
-  # A communication channel based on a YAML stream.
-  ---
-  sent at: 2002-06-06 11:46:25.10 Z
-  payload: Whatever
-  # Receiver can process this as soon as the following is sent:
-  ...
-  # Even if the next message is sent long after:
-  ---
-  sent at: 2002-06-06 12:05:53.47 Z
-  payload: Whatever
-  ...
-ruby: |
-  y = YAML::Stream.new
-  y.add(
-    { 'sent at' => YAML::mktime( 2002, 6, 6, 11, 46, 25, 0.10 ),
-      'payload' => 'Whatever' }
-  )
-  y.add(
-    { "payload" => "Whatever", "sent at" => YAML::mktime( 2002, 6, 6, 12, 5, 53, 0.47 ) }
-  )
-documents: 2
-
----
-test: Explicit typing
-yaml: |
-   integer: 12
-   also int: ! "12"
-   string: !str 12
-php: |
-   array( 'integer' => 12, 'also int' => 12, 'string' => '12' )
----
-test: Private types
-todo: true
-yaml: |
-  # Both examples below make use of the 'x-private:ball'
-  # type family URI, but with different semantics.
-  ---
-  pool: !!ball
-    number: 8
-    color: black
-  ---
-  bearing: !!ball
-    material: steel
-ruby: |
-  y = YAML::Stream.new
-  y.add( { 'pool' =>
-    YAML::PrivateType.new( 'ball',
-      { 'number' => 8, 'color' => 'black' } ) }
-  )
-  y.add( { 'bearing' =>
-    YAML::PrivateType.new( 'ball',
-      { 'material' => 'steel' } ) }
-  )
-documents: 2
-
----
-test: Type family under yaml.org
-yaml: |
-  # The URI is 'tag:yaml.org,2002:str'
-  - !str a Unicode string
-php: |
-  array( 'a Unicode string' )
----
-test: Type family under perl.yaml.org
-todo: true
-yaml: |
-  # The URI is 'tag:perl.yaml.org,2002:Text::Tabs'
-  - !perl/Text::Tabs {}
-ruby: |
-  [ YAML::DomainType.new( 'perl.yaml.org,2002', 'Text::Tabs', {} ) ]
----
-test: Type family under clarkevans.com
-todo: true
-yaml: |
-  # The URI is 'tag:clarkevans.com,2003-02:timesheet'
-  - !clarkevans.com,2003-02/timesheet {}
-ruby: |
-  [ YAML::DomainType.new( 'clarkevans.com,2003-02', 'timesheet', {} ) ]
----
-test: URI Escaping
-todo: true
-yaml: |
-  same:
-    - !domain.tld,2002/type\x30 value
-    - !domain.tld,2002/type0 value
-  different: # As far as the YAML parser is concerned
-    - !domain.tld,2002/type%30 value
-    - !domain.tld,2002/type0 value
-ruby-setup: |
-  YAML.add_domain_type( "domain.tld,2002", "type0" ) { |type, val|
-    "ONE: #{val}"
-  }
-  YAML.add_domain_type( "domain.tld,2002", "type%30" ) { |type, val|
-    "TWO: #{val}"
-  }
-ruby: |
-  { 'same' => [ 'ONE: value', 'ONE: value' ], 'different' => [ 'TWO: value', 'ONE: value' ] }
----
-test: URI Prefixing
-todo: true
-yaml: |
-  # 'tag:domain.tld,2002:invoice' is some type family.
-  invoice: !domain.tld,2002/^invoice
-    # 'seq' is shorthand for 'tag:yaml.org,2002:seq'.
-    # This does not effect '^customer' below
-    # because it is does not specify a prefix.
-    customers: !seq
-      # '^customer' is shorthand for the full
-      # notation 'tag:domain.tld,2002:customer'.
-      - !^customer
-        given : Chris
-        family : Dumars
-ruby-setup: |
-  YAML.add_domain_type( "domain.tld,2002", /(invoice|customer)/ ) { |type, val|
-    if val.is_a? ::Hash
-      scheme, domain, type = type.split( /:/, 3 )
-      val['type'] = "domain #{type}"
-      val
-    else
-      raise YAML::Error, "Not a Hash in domain.tld/invoice: " + val.inspect
-    end
-  }
-ruby: |
-  { "invoice"=> { "customers"=> [ { "given"=>"Chris", "type"=>"domain customer", "family"=>"Dumars" } ], "type"=>"domain invoice" } }
-
----
-test: Overriding anchors
-yaml: |
-  anchor : &A001 This scalar has an anchor.
-  override : &A001 >
-   The alias node below is a
-   repeated use of this value.
-  alias : *A001
-php: |
-  array( 'anchor' => 'This scalar has an anchor.',
-    'override' => "The alias node below is a repeated use of this value.\n",
-    'alias' => "The alias node below is a repeated use of this value.\n" )
----
-test: Flow and block formatting
-todo: true
-yaml: |
-  empty: []
-  flow: [ one, two, three # May span lines,
-           , four,           # indentation is
-             five ]          # mostly ignored.
-  block:
-   - First item in top sequence
-   -
-    - Subordinate sequence entry
-   - >
-     A folded sequence entry
-   - Sixth item in top sequence
-ruby: |
-  { 'empty' => [], 'flow' => [ 'one', 'two', 'three', 'four', 'five' ],
-    'block' => [ 'First item in top sequence', [ 'Subordinate sequence entry' ],
-    "A folded sequence entry\n", 'Sixth item in top sequence' ] }
----
-test: Complete mapping test
-todo: true
-yaml: |
- empty: {}
- flow: { one: 1, two: 2 }
- spanning: { one: 1,
-    two: 2 }
- block:
-  first : First entry
-  second:
-   key: Subordinate mapping
-  third:
-   - Subordinate sequence
-   - { }
-   - Previous mapping is empty.
-   - A key: value pair in a sequence.
-     A second: key:value pair.
-   - The previous entry is equal to the following one.
-   -
-     A key: value pair in a sequence.
-     A second: key:value pair.
-  !float 12 : This key is a float.
-  ? >
-   ?
-  : This key had to be protected.
-  "\a" : This key had to be escaped.
-  ? >
-   This is a
-   multi-line
-   folded key
-  : Whose value is
-    also multi-line.
-  ? this also works as a key
-  : with a value at the next line.
-  ?
-   - This key
-   - is a sequence
-  :
-   - With a sequence value.
-  ?
-   This: key
-   is a: mapping
-  :
-   with a: mapping value.
-ruby: |
-  { 'empty' => {}, 'flow' => { 'one' => 1, 'two' => 2 },
-    'spanning' => { 'one' => 1, 'two' => 2 },
-    'block' => { 'first' => 'First entry', 'second' =>
-    { 'key' => 'Subordinate mapping' }, 'third' =>
-      [ 'Subordinate sequence', {}, 'Previous mapping is empty.',
-        { 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' },
-        'The previous entry is equal to the following one.',
-        { 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' } ],
-    12.0 => 'This key is a float.', "?\n" => 'This key had to be protected.',
-    "\a" => 'This key had to be escaped.',
-    "This is a multi-line folded key\n" => "Whose value is also multi-line.",
-    'this also works as a key' => 'with a value at the next line.',
-    [ 'This key', 'is a sequence' ] => [ 'With a sequence value.' ] } }
-  # Couldn't recreate map exactly, so we'll do a detailed check to be sure it's entact
-  obj_y['block'].keys.each { |k|
-    if Hash === k
-      v = obj_y['block'][k]
-      if k['This'] == 'key' and k['is a'] == 'mapping' and v['with a'] == 'mapping value.'
-         obj_r['block'][k] = v
-      end
-    end
-  }
----
-test: Literal explicit indentation
-yaml: |
-   # Explicit indentation must
-   # be given in all the three
-   # following cases.
-   leading spaces: |2
-         This value starts with four spaces.
-
-   leading line break: |2
-
-     This value starts with a line break.
-
-   leading comment indicator: |2
-     # first line starts with a
-     # character.
-
-   # Explicit indentation may
-   # also be given when it is
-   # not required.
-   redundant: |2
-     This value is indented 2 spaces.
-php: |
-   array(
-      'leading spaces' => "    This value starts with four spaces.\n",
-      'leading line break' => "\nThis value starts with a line break.\n",
-      'leading comment indicator' => "# first line starts with a\n# character.\n",
-      'redundant' => "This value is indented 2 spaces.\n"
-   )
----
-test: Chomping and keep modifiers
-yaml: |
-    clipped: |
-        This has one newline.
-
-    same as "clipped" above: "This has one newline.\n"
-
-    stripped: |-
-        This has no newline.
-
-    same as "stripped" above: "This has no newline."
-
-    kept: |+
-        This has two newlines.
-
-    same as "kept" above: "This has two newlines.\n\n"
-php: |
-    array(
-      'clipped' => "This has one newline.\n",
-      'same as "clipped" above' => "This has one newline.\n",
-      'stripped' => 'This has no newline.',
-      'same as "stripped" above' => 'This has no newline.',
-      'kept' => "This has two newlines.\n\n",
-      'same as "kept" above' => "This has two newlines.\n\n"
-    )
----
-test: Literal combinations
-todo: true
-yaml: |
-   empty: |
-
-   literal: |
-    The \ ' " characters may be
-    freely used. Leading white
-       space is significant.
-
-    Line breaks are significant.
-    Thus this value contains one
-    empty line and ends with a
-    single line break, but does
-    not start with one.
-
-   is equal to: "The \\ ' \" characters may \
-    be\nfreely used. Leading white\n   space \
-    is significant.\n\nLine breaks are \
-    significant.\nThus this value contains \
-    one\nempty line and ends with a\nsingle \
-    line break, but does\nnot start with one.\n"
-
-   # Comments may follow a block
-   # scalar value. They must be
-   # less indented.
-
-   # Modifiers may be combined in any order.
-   indented and chomped: |2-
-       This has no newline.
-
-   also written as: |-2
-       This has no newline.
-
-   both are equal to: "  This has no newline."
-php: |
-   array(
-     'empty' => '',
-     'literal' => "The \\ ' \" characters may be\nfreely used. Leading white\n   space " +
-       "is significant.\n\nLine breaks are significant.\nThus this value contains one\n" +
-       "empty line and ends with a\nsingle line break, but does\nnot start with one.\n",
-     'is equal to' => "The \\ ' \" characters may be\nfreely used. Leading white\n   space " +
-       "is significant.\n\nLine breaks are significant.\nThus this value contains one\n" +
-       "empty line and ends with a\nsingle line break, but does\nnot start with one.\n",
-     'indented and chomped' => '  This has no newline.',
-     'also written as' => '  This has no newline.',
-     'both are equal to' => '  This has no newline.'
-   )
----
-test: Folded combinations
-todo: true
-yaml: |
-   empty: >
-
-   one paragraph: >
-    Line feeds are converted
-    to spaces, so this value
-    contains no line breaks
-    except for the final one.
-
-   multiple paragraphs: >2
-
-     An empty line, either
-     at the start or in
-     the value:
-
-     Is interpreted as a
-     line break. Thus this
-     value contains three
-     line breaks.
-
-   indented text: >
-       This is a folded
-       paragraph followed
-       by a list:
-        * first entry
-        * second entry
-       Followed by another
-       folded paragraph,
-       another list:
-
-        * first entry
-
-        * second entry
-
-       And a final folded
-       paragraph.
-
-   above is equal to: |
-       This is a folded paragraph followed by a list:
-        * first entry
-        * second entry
-       Followed by another folded paragraph, another list:
-
-        * first entry
-
-        * second entry
-
-       And a final folded paragraph.
-
-   # Explicit comments may follow
-   # but must be less indented.
-php: |
-   array(
-     'empty' => '',
-     'one paragraph' => 'Line feeds are converted to spaces, so this value'.
-       " contains no line breaks except for the final one.\n",
-     'multiple paragraphs' => "\nAn empty line, either at the start or in the value:\n".
-       "Is interpreted as a line break. Thus this value contains three line breaks.\n",
-     'indented text' => "This is a folded paragraph followed by a list:\n".
-       " * first entry\n * second entry\nFollowed by another folded paragraph, ".
-       "another list:\n\n * first entry\n\n * second entry\n\nAnd a final folded paragraph.\n",
-     'above is equal to' => "This is a folded paragraph followed by a list:\n".
-       " * first entry\n * second entry\nFollowed by another folded paragraph, ".
-       "another list:\n\n * first entry\n\n * second entry\n\nAnd a final folded paragraph.\n"
-   )
----
-test: Single quotes
-todo: true
-yaml: |
-   empty: ''
-   second: '! : \ etc. can be used freely.'
-   third: 'a single quote '' must be escaped.'
-   span: 'this contains
-         six spaces
-
-         and one
-         line break'
-   is same as: "this contains six spaces\nand one line break"
-php: |
-   array(
-     'empty' => '',
-     'second' => '! : \\ etc. can be used freely.',
-     'third' => "a single quote ' must be escaped.",
-     'span' => "this contains six spaces\nand one line break",
-     'is same as' => "this contains six spaces\nand one line break"
-   )
----
-test: Double quotes
-todo: true
-yaml: |
-   empty: ""
-   second: "! : etc. can be used freely."
-   third: "a \" or a \\ must be escaped."
-   fourth: "this value ends with an LF.\n"
-   span: "this contains
-     four  \
-         spaces"
-   is equal to: "this contains four  spaces"
-php: |
-   array(
-     'empty' => '',
-     'second' => '! : etc. can be used freely.',
-     'third' => 'a " or a \\ must be escaped.',
-     'fourth' => "this value ends with an LF.\n",
-     'span' => "this contains four  spaces",
-     'is equal to' => "this contains four  spaces"
-   )
----
-test: Unquoted strings
-todo: true
-yaml: |
-   first: There is no unquoted empty string.
-
-   second: 12          ## This is an integer.
-
-   third: !str 12      ## This is a string.
-
-   span: this contains
-         six spaces
-
-         and one
-         line break
-
-   indicators: this has no comments.
-               #:foo and bar# are
-               both text.
-
-   flow: [ can span
-              lines, # comment
-              like
-              this ]
-
-   note: { one-line keys: but multi-line values }
-
-php: |
-   array(
-     'first' => 'There is no unquoted empty string.',
-     'second' => 12,
-     'third' => '12',
-     'span' => "this contains six spaces\nand one line break",
-     'indicators' => "this has no comments. #:foo and bar# are both text.",
-     'flow' => [ 'can span lines', 'like this' ],
-     'note' => { 'one-line keys' => 'but multi-line values' }
-   )
----
-test: Spanning sequences
-todo: true
-yaml: |
-   # The following are equal seqs
-   # with different identities.
-   flow: [ one, two ]
-   spanning: [ one,
-        two ]
-   block:
-     - one
-     - two
-php: |
-   array(
-     'flow' => [ 'one', 'two' ],
-     'spanning' => [ 'one', 'two' ],
-     'block' => [ 'one', 'two' ]
-   )
----
-test: Flow mappings
-yaml: |
-   # The following are equal maps
-   # with different identities.
-   flow: { one: 1, two: 2 }
-   block:
-       one: 1
-       two: 2
-php: |
-   array(
-     'flow' => array( 'one' => 1, 'two' => 2 ),
-     'block' => array( 'one' => 1, 'two' => 2 )
-   )
----
-test: Representations of 12
-todo: true
-yaml: |
-   - 12 # An integer
-   # The following scalars
-   # are loaded to the
-   # string value '1' '2'.
-   - !str 12
-   - '12'
-   - "12"
-   - "\
-     1\
-     2\
-     "
-   # Strings containing paths and regexps can be unquoted:
-   - /foo/bar
-   - d:/foo/bar
-   - foo/bar
-   - /a.*b/
-php: |
-   array( 12, '12', '12', '12', '12', '/foo/bar', 'd:/foo/bar', 'foo/bar', '/a.*b/' )
----
-test: "Null"
-todo: true
-yaml: |
-   canonical: ~
-
-   english: null
-
-   # This sequence has five
-   # entries, two with values.
-   sparse:
-     - ~
-     - 2nd entry
-     - Null
-     - 4th entry
-     -
-
-   four: This mapping has five keys,
-         only two with values.
-
-php: |
-   array (
-     'canonical' => null,
-     'english' => null,
-     'sparse' => array( null, '2nd entry', null, '4th entry', null ]),
-     'four' => 'This mapping has five keys, only two with values.'
-   )
----
-test: Omap
-todo: true
-yaml: |
-   # Explicitly typed dictionary.
-   Bestiary: !omap
-     - aardvark: African pig-like ant eater. Ugly.
-     - anteater: South-American ant eater. Two species.
-     - anaconda: South-American constrictor snake. Scary.
-     # Etc.
-ruby: |
-   {
-     'Bestiary' => YAML::Omap[
-       'aardvark', 'African pig-like ant eater. Ugly.',
-       'anteater', 'South-American ant eater. Two species.',
-       'anaconda', 'South-American constrictor snake. Scary.'
-     ]
-   }
-
----
-test: Pairs
-todo: true
-yaml: |
-  # Explicitly typed pairs.
-  tasks: !pairs
-    - meeting: with team.
-    - meeting: with boss.
-    - break: lunch.
-    - meeting: with client.
-ruby: |
-  {
-    'tasks' => YAML::Pairs[
-      'meeting', 'with team.',
-      'meeting', 'with boss.',
-      'break', 'lunch.',
-      'meeting', 'with client.'
-    ]
-  }
-
----
-test: Set
-todo: true
-yaml: |
-  # Explicitly typed set.
-  baseball players: !set
-    Mark McGwire:
-    Sammy Sosa:
-    Ken Griffey:
-ruby: |
-  {
-    'baseball players' => YAML::Set[
-      'Mark McGwire', nil,
-      'Sammy Sosa', nil,
-      'Ken Griffey', nil
-    ]
-  }
-
----
-test: Boolean
-yaml: |
-   false: used as key
-   logical:  true
-   answer: false
-php: |
-   array(
-     false => 'used as key',
-     'logical' => true,
-     'answer' => false
-   )
----
-test: Integer
-yaml: |
-   canonical: 12345
-   decimal: +12,345
-   octal: 014
-   hexadecimal: 0xC
-php: |
-   array(
-     'canonical' => 12345,
-     'decimal' => 12345,
-     'octal' => 12,
-     'hexadecimal' => 12
-   )
----
-test: Float
-yaml: |
-   canonical: 1.23015e+3
-   exponential: 12.3015e+02
-   fixed: 1,230.15
-   negative infinity: -.inf
-   not a number: .NaN
-php: |
-  array(
-    'canonical' => 1230.15,
-    'exponential' => 1230.15,
-    'fixed' => 1230.15,
-    'negative infinity' => log(0),
-    'not a number' => -log(0)
-  )
----
-test: Timestamp
-todo: true
-yaml: |
-   canonical:       2001-12-15T02:59:43.1Z
-   valid iso8601:   2001-12-14t21:59:43.10-05:00
-   space separated: 2001-12-14 21:59:43.10 -05:00
-   date (noon UTC): 2002-12-14
-ruby: |
-   array(
-     'canonical' => YAML::mktime( 2001, 12, 15, 2, 59, 43, 0.10 ),
-     'valid iso8601' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
-     'space separated' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
-     'date (noon UTC)' => Date.new( 2002, 12, 14 )
-   )
----
-test: Binary
-todo: true
-yaml: |
-   canonical: !binary "\
-    R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOfn515eXvPz7Y6OjuDg4J+fn5\
-    OTk6enp56enmlpaWNjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++f/++f/+\
-    +f/++f/++f/++f/++f/++SH+Dk1hZGUgd2l0aCBHSU1QACwAAAAADAAMAAAFLC\
-    AgjoEwnuNAFOhpEMTRiggcz4BNJHrv/zCFcLiwMWYNG84BwwEeECcgggoBADs="
-   base64: !binary |
-    R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOfn515eXvPz7Y6OjuDg4J+fn5
-    OTk6enp56enmlpaWNjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++f/++f/+
-    +f/++f/++f/++f/++f/++SH+Dk1hZGUgd2l0aCBHSU1QACwAAAAADAAMAAAFLC
-    AgjoEwnuNAFOhpEMTRiggcz4BNJHrv/zCFcLiwMWYNG84BwwEeECcgggoBADs=
-   description: >
-    The binary value above is a tiny arrow
-    encoded as a gif image.
-ruby-setup: |
-   arrow_gif = "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236iiiccc\243\243\243\204\204\204\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371!\376\016Made with GIMP\000,\000\000\000\000\f\000\f\000\000\005,  \216\2010\236\343@\024\350i\020\304\321\212\010\034\317\200M$z\357\3770\205p\270\2601f\r\e\316\001\303\001\036\020' \202\n\001\000;"
-ruby: |
-   {
-     'canonical' => arrow_gif,
-     'base64' => arrow_gif,
-     'description' => "The binary value above is a tiny arrow encoded as a gif image.\n"
-   }
-
----
-test: Merge key
-todo: true
-yaml: |
-  ---
-  - &CENTER { x: 1, y: 2 }
-  - &LEFT { x: 0, y: 2 }
-  - &BIG { r: 10 }
-  - &SMALL { r: 1 }
-
-  # All the following maps are equal:
-
-  - # Explicit keys
-    x: 1
-    y: 2
-    r: 10
-    label: center/big
-
-  - # Merge one map
-    << : *CENTER
-    r: 10
-    label: center/big
-
-  - # Merge multiple maps
-    << : [ *CENTER, *BIG ]
-    label: center/big
-
-  - # Override
-    << : [ *BIG, *LEFT, *SMALL ]
-    x: 1
-    label: center/big
-
-ruby-setup: |
-  center = { 'x' => 1, 'y' => 2 }
-  left = { 'x' => 0, 'y' => 2 }
-  big = { 'r' => 10 }
-  small = { 'r' => 1 }
-  node1 = { 'x' => 1, 'y' => 2, 'r' => 10, 'label' => 'center/big' }
-  node2 = center.dup
-  node2.update( { 'r' => 10, 'label' => 'center/big' } )
-  node3 = big.dup
-  node3.update( center )
-  node3.update( { 'label' => 'center/big' } )
-  node4 = small.dup
-  node4.update( left )
-  node4.update( big )
-  node4.update( { 'x' => 1, 'label' => 'center/big' } )
-
-ruby: |
-  [
-    center, left, big, small, node1, node2, node3, node4
-  ]
-
----
-test: Default key
-todo: true
-yaml: |
-   ---     # Old schema
-   link with:
-     - library1.dll
-     - library2.dll
-   ---     # New schema
-   link with:
-     - = : library1.dll
-       version: 1.2
-     - = : library2.dll
-       version: 2.3
-ruby: |
-   y = YAML::Stream.new
-   y.add( { 'link with' => [ 'library1.dll', 'library2.dll' ] } )
-   obj_h = Hash[ 'version' => 1.2 ]
-   obj_h.default = 'library1.dll'
-   obj_h2 = Hash[ 'version' => 2.3 ]
-   obj_h2.default = 'library2.dll'
-   y.add( { 'link with' => [ obj_h, obj_h2 ] } )
-documents: 2
-
----
-test: Special keys
-todo: true
-yaml: |
-   "!": These three keys
-   "&": had to be quoted
-   "=": and are normal strings.
-   # NOTE: the following node should NOT be serialized this way.
-   encoded node :
-    !special '!' : '!type'
-    !special|canonical '&' : 12
-    = : value
-   # The proper way to serialize the above node is as follows:
-   node : !!type &12 value
-ruby: |
-   { '!' => 'These three keys', '&' => 'had to be quoted',
-     '=' => 'and are normal strings.',
-     'encoded node' => YAML::PrivateType.new( 'type', 'value' ),
-     'node' => YAML::PrivateType.new( 'type', 'value' ) }
diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsTypeTransfers.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsTypeTransfers.yml
deleted file mode 100644
index aac4e680..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/YtsTypeTransfers.yml
+++ /dev/null
@@ -1,244 +0,0 @@
---- %YAML:1.0
-test: Strings
-brief: >
-    Any group of characters beginning with an
-    alphabetic or numeric character is a string,
-    unless it belongs to one of the groups below
-    (such as an Integer or Time).
-yaml: |
-    String
-php: |
-    'String'
----
-test: String characters
-brief: >
-    A string can contain any alphabetic or
-    numeric character, along with many
-    punctuation characters, including the
-    period, dash, space, quotes, exclamation, and
-    question mark.
-yaml: |
-    - What's Yaml?
-    - It's for writing data structures in plain text.
-    - And?
-    - And what? That's not good enough for you?
-    - No, I mean, "And what about Yaml?"
-    - Oh, oh yeah. Uh.. Yaml for Ruby.
-php: |
-    array(
-      "What's Yaml?",
-      "It's for writing data structures in plain text.",
-      "And?",
-      "And what? That's not good enough for you?",
-      "No, I mean, \"And what about Yaml?\"",
-      "Oh, oh yeah. Uh.. Yaml for Ruby."
-    )
----
-test: Indicators in Strings
-brief: >
-    Be careful using indicators in strings.  In particular,
-    the comma, colon, and pound sign must be used carefully.
-yaml: |
-    the colon followed by space is an indicator: but is a string:right here
-    same for the pound sign: here we have it#in a string
-    the comma can, honestly, be used in most cases: [ but not in, inline collections ]
-php: |
-    array(
-      'the colon followed by space is an indicator' => 'but is a string:right here',
-      'same for the pound sign' => 'here we have it#in a string',
-      'the comma can, honestly, be used in most cases' => array('but not in', 'inline collections')
-    )
----
-test: Forcing Strings
-brief: >
-    Any YAML type can be forced into a string using the
-    explicit !str method.
-yaml: |
-    date string: !str 2001-08-01
-    number string: !str 192
-php: |
-    array(
-      'date string' => '2001-08-01',
-      'number string' => '192'
-    )
----
-test: Single-quoted Strings
-brief: >
-    You can also enclose your strings within single quotes,
-    which allows use of slashes, colons, and other indicators
-    freely.  Inside single quotes, you can represent a single
-    quote in your string by using two single quotes next to
-    each other.
-yaml: |
-    all my favorite symbols: '#:!/%.)'
-    a few i hate: '&(*'
-    why do i hate them?: 'it''s very hard to explain'
-    entities: '&pound; me'
-php: |
-    array(
-      'all my favorite symbols' => '#:!/%.)',
-      'a few i hate' => '&(*',
-      'why do i hate them?' => 'it\'s very hard to explain',
-      'entities' => '&pound; me'
-    )
----
-test: Double-quoted Strings
-brief: >
-    Enclosing strings in double quotes allows you
-    to use escapings to represent ASCII and
-    Unicode characters.
-yaml: |
-    i know where i want my line breaks: "one here\nand another here\n"
-php: |
-    array(
-      'i know where i want my line breaks' => "one here\nand another here\n"
-    )
----
-test: Multi-line Quoted Strings
-todo: true
-brief: >
-    Both single- and double-quoted strings may be
-    carried on to new lines in your YAML document.
-    They must be indented a step and indentation
-    is interpreted as a single space.
-yaml: |
-    i want a long string: "so i'm going to
-      let it go on and on to other lines
-      until i end it with a quote."
-php: |
-    array('i want a long string' => "so i'm going to ".
-         "let it go on and on to other lines ".
-         "until i end it with a quote."
-    )
-
----
-test: Plain scalars
-todo: true
-brief: >
-    Unquoted strings may also span multiple lines, if they
-    are free of YAML space indicators and indented.
-yaml: |
-    - My little toe is broken in two places;
-    - I'm crazy to have skied this way;
-    - I'm not the craziest he's seen, since there was always the German guy
-      who skied for 3 hours on a broken shin bone (just below the kneecap);
-    - Nevertheless, second place is respectable, and he doesn't
-      recommend going for the record;
-    - He's going to put my foot in plaster for a month;
-    - This would impair my skiing ability somewhat for the
-      duration, as can be imagined.
-php: |
-    array(
-      "My little toe is broken in two places;",
-      "I'm crazy to have skied this way;",
-      "I'm not the craziest he's seen, since there was always ".
-         "the German guy who skied for 3 hours on a broken shin ".
-         "bone (just below the kneecap);",
-      "Nevertheless, second place is respectable, and he doesn't ".
-         "recommend going for the record;",
-      "He's going to put my foot in plaster for a month;",
-      "This would impair my skiing ability somewhat for the duration, ".
-         "as can be imagined."
-    )
----
-test: 'Null'
-brief: >
-    You can use the tilde '~' character for a null value.
-yaml: |
-    name: Mr. Show
-    hosted by: Bob and David
-    date of next season: ~
-php: |
-    array(
-      'name' => 'Mr. Show',
-      'hosted by' => 'Bob and David',
-      'date of next season' => null
-    )
----
-test: Boolean
-brief: >
-    You can use 'true' and 'false' for Boolean values.
-yaml: |
-    Is Gus a Liar?: true
-    Do I rely on Gus for Sustenance?: false
-php: |
-    array(
-      'Is Gus a Liar?' => true,
-      'Do I rely on Gus for Sustenance?' => false
-    )
----
-test: Integers
-dump_skip: true
-brief: >
-    An integer is a series of numbers, optionally
-    starting with a positive or negative sign.  Integers
-    may also contain commas for readability.
-yaml: |
-    zero: 0
-    simple: 12
-    one-thousand: 1,000
-    negative one-thousand: -1,000
-php: |
-    array(
-      'zero' => 0,
-      'simple' => 12,
-      'one-thousand' => 1000,
-      'negative one-thousand' => -1000
-    )
----
-test: Integers as Map Keys
-brief: >
-    An integer can be used a dictionary key.
-yaml: |
-    1: one
-    2: two
-    3: three
-php: |
-    array(
-        1 => 'one',
-        2 => 'two',
-        3 => 'three'
-    )
----
-test: Floats
-dump_skip: true
-brief: >
-     Floats are represented by numbers with decimals,
-     allowing for scientific notation, as well as
-     positive and negative infinity and "not a number."
-yaml: |
-     a simple float: 2.00
-     larger float: 1,000.09
-     scientific notation: 1.00009e+3
-php: |
-     array(
-       'a simple float' => 2.0,
-       'larger float' => 1000.09,
-       'scientific notation' => 1000.09
-     )
----
-test: Time
-todo: true
-brief: >
-    You can represent timestamps by using
-    ISO8601 format, or a variation which
-    allows spaces between the date, time and
-    time zone.
-yaml: |
-    iso8601: 2001-12-14t21:59:43.10-05:00
-    space separated: 2001-12-14 21:59:43.10 -05:00
-php: |
-    array(
-      'iso8601' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
-      'space separated' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" )
-    )
----
-test: Date
-todo: true
-brief: >
-    A date can be represented by its year,
-    month and day in ISO8601 order.
-yaml: |
-    1976-07-31
-php: |
-    date( 1976, 7, 31 )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/embededPhp.yml b/vendor/symfony/yaml/Tests/Fixtures/embededPhp.yml
deleted file mode 100644
index ec456ed0..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/embededPhp.yml
+++ /dev/null
@@ -1 +0,0 @@
-value: <?php echo 1 + 2 + 3 ?>
diff --git a/vendor/symfony/yaml/Tests/Fixtures/escapedCharacters.yml b/vendor/symfony/yaml/Tests/Fixtures/escapedCharacters.yml
deleted file mode 100644
index 09bf86e7..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/escapedCharacters.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-test: outside double quotes
-yaml: |
-    \0 \ \a \b \n
-php: |
-    "\\0 \\ \\a \\b \\n"
----
-test: null
-yaml: |
-    "\0"
-php: |
-    "\x00"
----
-test: bell
-yaml: |
-    "\a"
-php: |
-    "\x07"
----
-test: backspace
-yaml: |
-    "\b"
-php: |
-    "\x08"
----
-test: horizontal tab (1)
-yaml: |
-    "\t"
-php: |
-    "\x09"
----
-test: horizontal tab (2)
-yaml: |
-    "\	"
-php: |
-    "\x09"
----
-test: line feed
-yaml: |
-    "\n"
-php: |
-    "\x0a"
----
-test: vertical tab
-yaml: |
-    "\v"
-php: |
-    "\x0b"
----
-test: form feed
-yaml: |
-    "\f"
-php: |
-    "\x0c"
----
-test: carriage return
-yaml: |
-    "\r"
-php: |
-    "\x0d"
----
-test: escape
-yaml: |
-    "\e"
-php: |
-   "\x1b"
----
-test: space
-yaml: |
-    "\ "
-php: |
-    "\x20"
----
-test: slash
-yaml: |
-    "\/"
-php: |
-    "\x2f"
----
-test: backslash
-yaml: |
-    "\\"
-php: |
-    "\\"
----
-test: Unicode next line
-yaml: |
-    "\N"
-php: |
-    "\xc2\x85"
----
-test: Unicode non-breaking space
-yaml: |
-    "\_"
-php: |
-    "\xc2\xa0"
----
-test: Unicode line separator
-yaml: |
-    "\L"
-php: |
-    "\xe2\x80\xa8"
----
-test: Unicode paragraph separator
-yaml: |
-    "\P"
-php: |
-    "\xe2\x80\xa9"
----
-test: Escaped 8-bit Unicode
-yaml: |
-    "\x42"
-php: |
-    "B"
----
-test: Escaped 16-bit Unicode
-yaml: |
-    "\u20ac"
-php: |
-    "\xe2\x82\xac"
----
-test: Escaped 32-bit Unicode
-yaml: |
-    "\U00000043"
-php: |
-    "C"
----
-test: Example 5.13 Escaped Characters
-note: |
-    Currently throws an error parsing first line. Maybe Symfony Yaml doesn't support
-    continuation of string across multiple lines? Keeping test here but disabled.
-todo: true
-yaml: |
-    "Fun with \\
-    \" \a \b \e \f \
-    \n \r \t \v \0 \
-    \  \_ \N \L \P \
-    \x41 \u0041 \U00000041"
-php: |
-    "Fun with \x5C\n\x22 \x07 \x08 \x1B \x0C\n\x0A \x0D \x09 \x0B \x00\n\x20 \xA0 \x85 \xe2\x80\xa8 \xe2\x80\xa9\nA A A"
----
-test: Double quotes with a line feed
-yaml: |
-   { double: "some value\n \"some quoted string\" and 'some single quotes one'" }
-php: |
-    array(
-        'double' => "some value\n \"some quoted string\" and 'some single quotes one'"
-    )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/index.yml b/vendor/symfony/yaml/Tests/Fixtures/index.yml
deleted file mode 100644
index 3216a89e..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/index.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-- escapedCharacters
-- sfComments
-- sfCompact
-- sfTests
-- sfObjects
-- sfMergeKey
-- sfQuotes
-- YtsAnchorAlias
-- YtsBasicTests
-- YtsBlockMapping
-- YtsDocumentSeparator
-- YtsErrorTests
-- YtsFlowCollections
-- YtsFoldedScalars
-- YtsNullsAndEmpties
-- YtsSpecificationExamples
-- YtsTypeTransfers
-- unindentedCollections
diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml b/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml
deleted file mode 100644
index 6a7ffeca..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml
+++ /dev/null
@@ -1,73 +0,0 @@
---- %YAML:1.0
-test: Comments at the end of a line
-brief: >
-    Comments at the end of a line
-yaml: |
-    ex1: "foo # bar"
-    ex2: "foo # bar" # comment
-    ex3: 'foo # bar' # comment
-    ex4: foo # comment
-php: |
-    array('ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo')
----
-test: Comments in the middle
-brief: >
-  Comments in the middle
-yaml: |
-    foo:
-    # some comment
-    # some comment
-      bar: foo
-    # some comment
-    # some comment
-php: |
-    array('foo' => array('bar' => 'foo'))
----
-test: Comments on a hash line
-brief: >
-  Comments on a hash line
-yaml: |
-    foo:   # a comment
-      foo: bar # a comment
-php: |
-    array('foo' => array('foo' => 'bar'))
----
-test: 'Value starting with a #'
-brief: >
-  'Value starting with a #'
-yaml: |
-    foo:   '#bar'
-php: |
-    array('foo' => '#bar')
----
-test: Document starting with a comment and a separator
-brief: >
-  Commenting before document start is allowed
-yaml: |
-    # document comment
-    ---
-    foo: bar # a comment
-php: |
-    array('foo' => 'bar')
----
-test: Comment containing a colon on a hash line
-brief: >
-    Comment containing a colon on a scalar line
-yaml: 'foo # comment: this is also part of the comment'
-php: |
-    'foo'
----
-test: 'Hash key containing a #'
-brief: >
-    'Hash key containing a #'
-yaml: 'foo#bar: baz'
-php: |
-    array('foo#bar' => 'baz')
----
-test: 'Hash key ending with a space and a #'
-brief: >
-    'Hash key ending with a space and a #'
-yaml: |
-    'foo #': baz
-php: |
-    array('foo #' => 'baz')
diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfCompact.yml b/vendor/symfony/yaml/Tests/Fixtures/sfCompact.yml
deleted file mode 100644
index 1339d23a..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/sfCompact.yml
+++ /dev/null
@@ -1,159 +0,0 @@
---- %YAML:1.0
-test: Compact notation
-brief: |
-    Compact notation for sets of mappings with single element
-yaml: |
-  ---
-  # products purchased
-  - item    : Super Hoop
-  - item    : Basketball
-    quantity: 1
-  - item:
-      name: Big Shoes
-      nick: Biggies
-    quantity: 1
-php: |
-  array (
-    array (
-      'item' => 'Super Hoop',
-    ),
-    array (
-      'item' => 'Basketball',
-      'quantity' => 1,
-    ),
-    array (
-      'item' => array(
-        'name' => 'Big Shoes',
-        'nick' => 'Biggies'
-      ),
-      'quantity' => 1
-    )
-  )
----
-test: Compact notation combined with inline notation
-brief: |
-    Combinations of compact and inline notation are allowed
-yaml: |
-  ---
-  items:
-    - { item: Super Hoop, quantity: 1 }
-    - [ Basketball, Big Shoes ]
-php: |
-  array (
-    'items' => array (
-      array (
-        'item' => 'Super Hoop',
-        'quantity' => 1,
-      ),
-      array (
-        'Basketball',
-        'Big Shoes'
-      )
-    )
-  )
---- %YAML:1.0
-test: Compact notation
-brief: |
-    Compact notation for sets of mappings with single element
-yaml: |
-  ---
-  # products purchased
-  - item    : Super Hoop
-  - item    : Basketball
-    quantity: 1
-  - item:
-      name: Big Shoes
-      nick: Biggies
-    quantity: 1
-php: |
-  array (
-    array (
-      'item' => 'Super Hoop',
-    ),
-    array (
-      'item' => 'Basketball',
-      'quantity' => 1,
-    ),
-    array (
-      'item' => array(
-        'name' => 'Big Shoes',
-        'nick' => 'Biggies'
-      ),
-      'quantity' => 1
-    )
-  )
----
-test: Compact notation combined with inline notation
-brief: |
-    Combinations of compact and inline notation are allowed
-yaml: |
-  ---
-  items:
-    - { item: Super Hoop, quantity: 1 }
-    - [ Basketball, Big Shoes ]
-php: |
-  array (
-    'items' => array (
-      array (
-        'item' => 'Super Hoop',
-        'quantity' => 1,
-      ),
-      array (
-        'Basketball',
-        'Big Shoes'
-      )
-    )
-  )
---- %YAML:1.0
-test: Compact notation
-brief: |
-    Compact notation for sets of mappings with single element
-yaml: |
-  ---
-  # products purchased
-  - item    : Super Hoop
-  - item    : Basketball
-    quantity: 1
-  - item:
-      name: Big Shoes
-      nick: Biggies
-    quantity: 1
-php: |
-  array (
-    array (
-      'item' => 'Super Hoop',
-    ),
-    array (
-      'item' => 'Basketball',
-      'quantity' => 1,
-    ),
-    array (
-      'item' => array(
-        'name' => 'Big Shoes',
-        'nick' => 'Biggies'
-      ),
-      'quantity' => 1
-    )
-  )
----
-test: Compact notation combined with inline notation
-brief: |
-    Combinations of compact and inline notation are allowed
-yaml: |
-  ---
-  items:
-    - { item: Super Hoop, quantity: 1 }
-    - [ Basketball, Big Shoes ]
-php: |
-  array (
-    'items' => array (
-      array (
-        'item' => 'Super Hoop',
-        'quantity' => 1,
-      ),
-      array (
-        'Basketball',
-        'Big Shoes'
-      )
-    )
-  )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfMergeKey.yml b/vendor/symfony/yaml/Tests/Fixtures/sfMergeKey.yml
deleted file mode 100644
index fd991017..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/sfMergeKey.yml
+++ /dev/null
@@ -1,45 +0,0 @@
---- %YAML:1.0
-test: Simple In Place Substitution
-brief: >
-    If you want to reuse an entire alias, only overwriting what is different
-    you can use a << in place substitution. This is not part of the official
-    YAML spec, but a widely implemented extension. See the following URL for
-    details: http://yaml.org/type/merge.html
-yaml: |
-    foo: &foo
-        a: Steve
-        b: Clark
-        c: Brian
-    bar:
-        a: before
-        d: other
-        <<: *foo
-        b: new
-        x: Oren
-        c:
-            foo: bar
-            foo: ignore
-            bar: foo
-    duplicate:
-        foo: bar
-        foo: ignore
-    foo2: &foo2
-        a: Ballmer
-    ding: &dong [ fi, fei, fo, fam]
-    check:
-        <<:
-            - *foo
-            - *dong
-        isit: tested
-    head:
-        <<: [ *foo , *dong , *foo2 ]
-php: |
-    array(
-        'foo' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian'),
-        'bar' => array('a' => 'before', 'd' => 'other', 'b' => 'new', 'c' => array('foo' => 'bar', 'bar' => 'foo'), 'x' => 'Oren'),
-        'duplicate' => array('foo' => 'bar'),
-        'foo2' => array('a' => 'Ballmer'),
-        'ding' => array('fi', 'fei', 'fo', 'fam'),
-        'check' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'fi', 'fei', 'fo', 'fam', 'isit' => 'tested'),
-        'head' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'fi', 'fei', 'fo', 'fam')
-    )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfObjects.yml b/vendor/symfony/yaml/Tests/Fixtures/sfObjects.yml
deleted file mode 100644
index ee124b24..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/sfObjects.yml
+++ /dev/null
@@ -1,11 +0,0 @@
---- %YAML:1.0
-test: Objects
-brief: >
-    Comments at the end of a line
-yaml: |
-    ex1: "foo # bar"
-    ex2: "foo # bar" # comment
-    ex3: 'foo # bar' # comment
-    ex4: foo # comment
-php: |
-    array('ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo')
diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfQuotes.yml b/vendor/symfony/yaml/Tests/Fixtures/sfQuotes.yml
deleted file mode 100644
index 741f1bef..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/sfQuotes.yml
+++ /dev/null
@@ -1,33 +0,0 @@
---- %YAML:1.0
-test: Some characters at the beginning of a string must be escaped
-brief: >
-    Some characters at the beginning of a string must be escaped
-yaml: |
-    foo: | bar
-php: |
-    array('foo' => '| bar')
----
-test: A key can be a quoted string
-brief: >
-  A key can be a quoted string
-yaml: |
-    "foo1": bar
-    'foo2': bar
-    "foo \" bar": bar
-    'foo '' bar': bar
-    'foo3: ': bar
-    "foo4: ": bar
-    foo5: { "foo \" bar: ": bar, 'foo '' bar: ': bar }
-php: |
-    array(
-      'foo1' => 'bar',
-      'foo2' => 'bar',
-      'foo " bar' => 'bar',
-      'foo \' bar' => 'bar',
-      'foo3: ' => 'bar',
-      'foo4: ' => 'bar',
-      'foo5' => array(
-        'foo " bar: ' => 'bar',
-        'foo \' bar: ' => 'bar',
-      ),
-    )
diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfTests.yml b/vendor/symfony/yaml/Tests/Fixtures/sfTests.yml
deleted file mode 100644
index 7a54f163..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/sfTests.yml
+++ /dev/null
@@ -1,135 +0,0 @@
---- %YAML:1.0
-test: Multiple quoted string on one line
-brief: >
-    Multiple quoted string on one line
-yaml: |
-    stripped_title: { name: "foo bar", help: "bar foo" }
-php: |
-    array('stripped_title' => array('name' => 'foo bar', 'help' => 'bar foo'))
----
-test: Empty sequence
-yaml: |
-    foo: [ ]
-php: |
-    array('foo' => array())
----
-test: Empty value
-yaml: |
-    foo:
-php: |
-    array('foo' => null)
----
-test: Inline string parsing
-brief: >
-    Inline string parsing
-yaml: |
-    test: ['complex: string', 'another [string]']
-php: |
-    array('test' => array('complex: string', 'another [string]'))
----
-test: Boolean
-brief: >
-    Boolean
-yaml: |
-    - false
-    - true
-    - null
-    - ~
-    - 'false'
-    - 'true'
-    - 'null'
-    - '~'
-php: |
-    array(
-      false,
-      true,
-      null,
-      null,
-      'false',
-      'true',
-      'null',
-      '~',
-    )
----
-test: Empty lines in folded blocks
-brief: >
-  Empty lines in folded blocks
-yaml: |
-  foo:
-    bar: |
-      foo
-
-
-        
-      bar
-php: |
-  array('foo' => array('bar' => "foo\n\n\n  \nbar\n"))
----
-test: IP addresses
-brief: >
-  IP addresses
-yaml: |
-  foo: 10.0.0.2
-php: |
-  array('foo' => '10.0.0.2')
----
-test: A sequence with an embedded mapping
-brief: >
-  A sequence with an embedded mapping
-yaml: |
-  - foo
-  - bar: { bar: foo }
-php: |
-  array('foo', array('bar' => array('bar' => 'foo')))
----
-test: A sequence with an unordered array
-brief: >
-  A sequence with an unordered array
-yaml: |
-  1: foo
-  0: bar
-php: |
-  array(1 => 'foo', 0 => 'bar')
----
-test: Octal
-brief: as in spec example 2.19, octal value is converted
-yaml: |
-  foo: 0123
-php: |
-  array('foo' => 83)
----
-test: Octal strings
-brief: Octal notation in a string must remain a string
-yaml: |
-  foo: "0123"
-php: |
-  array('foo' => '0123')
----
-test: Octal strings
-brief: Octal notation in a string must remain a string
-yaml: |
-  foo: '0123'
-php: |
-  array('foo' => '0123')
----
-test: Octal strings
-brief: Octal notation in a string must remain a string
-yaml: |
-  foo: |
-    0123
-php: |
-  array('foo' => "0123\n")
----
-test: Document as a simple hash
-brief: Document as a simple hash
-yaml: |
-  { foo: bar }
-php: |
-  array('foo' => 'bar')
----
-test: Document as a simple array
-brief: Document as a simple array
-yaml: |
-  [ foo, bar ]
-php: |
-  array('foo', 'bar')
diff --git a/vendor/symfony/yaml/Tests/Fixtures/unindentedCollections.yml b/vendor/symfony/yaml/Tests/Fixtures/unindentedCollections.yml
deleted file mode 100644
index 0c96108e..00000000
--- a/vendor/symfony/yaml/Tests/Fixtures/unindentedCollections.yml
+++ /dev/null
@@ -1,82 +0,0 @@
---- %YAML:1.0
-test: Unindented collection
-brief: >
-    Unindented collection
-yaml: |
-    collection:
-    - item1
-    - item2
-    - item3
-php: |
-    array('collection' => array('item1', 'item2', 'item3'))
----
-test: Nested unindented collection (two levels)
-brief: >
-    Nested unindented collection
-yaml: |
-    collection:
-        key:
-        - a
-        - b
-        - c
-php: |
-    array('collection' => array('key' => array('a', 'b', 'c')))
----
-test: Nested unindented collection (three levels)
-brief: >
-    Nested unindented collection
-yaml: |
-    collection:
-        key:
-            subkey:
-            - one
-            - two
-            - three
-php: |
-    array('collection' => array('key' => array('subkey' => array('one', 'two', 'three'))))
----
-test: Key/value after unindented collection (1)
-brief: >
-    Key/value after unindented collection (1)
-yaml: |
-    collection:
-        key:
-        - a
-        - b
-        - c
-    foo: bar
-php: |
-    array('collection' => array('key' => array('a', 'b', 'c')), 'foo' => 'bar')
----
-test: Key/value after unindented collection (at the same level)
-brief: >
-    Key/value after unindented collection
-yaml: |
-    collection:
-        key:
-        - a
-        - b
-        - c
-        foo: bar
-php: |
-    array('collection' => array('key' => array('a', 'b', 'c'), 'foo' => 'bar'))
----
-test: Shortcut Key after unindented collection
-brief: >
-    Key/value after unindented collection
-yaml: |
-    collection:
-    - key: foo
-      foo: bar
-php: |
-    array('collection' => array(array('key' => 'foo', 'foo' => 'bar')))
----
-test: Shortcut Key after unindented collection with custom spaces
-brief: >
-    Key/value after unindented collection
-yaml: |
-    collection:
-    -  key: foo
-       foo: bar
-php: |
-    array('collection' => array(array('key' => 'foo', 'foo' => 'bar')))
diff --git a/vendor/symfony/yaml/Tests/InlineTest.php b/vendor/symfony/yaml/Tests/InlineTest.php
deleted file mode 100644
index 0776e4fa..00000000
--- a/vendor/symfony/yaml/Tests/InlineTest.php
+++ /dev/null
@@ -1,384 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Yaml\Tests;
-
-use Symfony\Component\Yaml\Inline;
-
-class InlineTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider getTestsForParse
-     */
-    public function testParse($yaml, $value)
-    {
-        $this->assertSame($value, Inline::parse($yaml), sprintf('::parse() converts an inline YAML to a PHP structure (%s)', $yaml));
-    }
-
-    /**
-     * @dataProvider getTestsForParseWithMapObjects
-     */
-    public function testParseWithMapObjects($yaml, $value)
-    {
-        $actual = Inline::parse($yaml, false, false, true);
-
-        $this->assertSame(serialize($value), serialize($actual));
-    }
-
-    /**
-     * @dataProvider getTestsForDump
-     */
-    public function testDump($yaml, $value)
-    {
-        $this->assertEquals($yaml, Inline::dump($value), sprintf('::dump() converts a PHP structure to an inline YAML (%s)', $yaml));
-
-        $this->assertSame($value, Inline::parse(Inline::dump($value)), 'check consistency');
-    }
-
-    public function testDumpNumericValueWithLocale()
-    {
-        $locale = setlocale(LC_NUMERIC, 0);
-        if (false === $locale) {
-            $this->markTestSkipped('Your platform does not support locales.');
-        }
-
-        try {
-            $requiredLocales = array('fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252');
-            if (false === setlocale(LC_NUMERIC, $requiredLocales)) {
-                $this->markTestSkipped('Could not set any of required locales: '.implode(', ', $requiredLocales));
-            }
-
-            $this->assertEquals('1.2', Inline::dump(1.2));
-            $this->assertContains('fr', strtolower(setlocale(LC_NUMERIC, 0)));
-            setlocale(LC_NUMERIC, $locale);
-        } catch (\Exception $e) {
-            setlocale(LC_NUMERIC, $locale);
-            throw $e;
-        }
-    }
-
-    public function testHashStringsResemblingExponentialNumericsShouldNotBeChangedToINF()
-    {
-        $value = '686e444';
-
-        $this->assertSame($value, Inline::parse(Inline::dump($value)));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testParseScalarWithIncorrectlyQuotedStringShouldThrowException()
-    {
-        $value = "'don't do somthin' like that'";
-        Inline::parse($value);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testParseScalarWithIncorrectlyDoubleQuotedStringShouldThrowException()
-    {
-        $value = '"don"t do somthin" like that"';
-        Inline::parse($value);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testParseInvalidMappingKeyShouldThrowException()
-    {
-        $value = '{ "foo " bar": "bar" }';
-        Inline::parse($value);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testParseInvalidMappingShouldThrowException()
-    {
-        Inline::parse('[foo] bar');
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testParseInvalidSequenceShouldThrowException()
-    {
-        Inline::parse('{ foo: bar } bar');
-    }
-
-    public function testParseScalarWithCorrectlyQuotedStringShouldReturnString()
-    {
-        $value = "'don''t do somthin'' like that'";
-        $expect = "don't do somthin' like that";
-
-        $this->assertSame($expect, Inline::parseScalar($value));
-    }
-
-    /**
-     * @dataProvider getDataForParseReferences
-     */
-    public function testParseReferences($yaml, $expected)
-    {
-        $this->assertSame($expected, Inline::parse($yaml, false, false, false, array('var' => 'var-value')));
-    }
-
-    public function getDataForParseReferences()
-    {
-        return array(
-            'scalar' => array('*var', 'var-value'),
-            'list' => array('[ *var ]', array('var-value')),
-            'list-in-list' => array('[[ *var ]]', array(array('var-value'))),
-            'map-in-list' => array('[ { key: *var } ]', array(array('key' => 'var-value'))),
-            'embedded-mapping-in-list' => array('[ key: *var ]', array(array('key' => 'var-value'))),
-            'map' => array('{ key: *var }', array('key' => 'var-value')),
-            'list-in-map' => array('{ key: [*var] }', array('key' => array('var-value'))),
-            'map-in-map' => array('{ foo: { bar: *var } }', array('foo' => array('bar' => 'var-value'))),
-        );
-    }
-
-    public function testParseMapReferenceInSequence()
-    {
-        $foo = array(
-            'a' => 'Steve',
-            'b' => 'Clark',
-            'c' => 'Brian',
-        );
-        $this->assertSame(array($foo), Inline::parse('[*foo]', false, false, false, array('foo' => $foo)));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage A reference must contain at least one character.
-     */
-    public function testParseUnquotedAsterisk()
-    {
-        Inline::parse('{ foo: * }');
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage A reference must contain at least one character.
-     */
-    public function testParseUnquotedAsteriskFollowedByAComment()
-    {
-        Inline::parse('{ foo: * #foo }');
-    }
-
-    public function getTestsForParse()
-    {
-        return array(
-            array('', ''),
-            array('null', null),
-            array('false', false),
-            array('true', true),
-            array('12', 12),
-            array('-12', -12),
-            array('"quoted string"', 'quoted string'),
-            array("'quoted string'", 'quoted string'),
-            array('12.30e+02', 12.30e+02),
-            array('0x4D2', 0x4D2),
-            array('02333', 02333),
-            array('.Inf', -log(0)),
-            array('-.Inf', log(0)),
-            array("'686e444'", '686e444'),
-            array('686e444', 646e444),
-            array('123456789123456789123456789123456789', '123456789123456789123456789123456789'),
-            array('"foo\r\nbar"', "foo\r\nbar"),
-            array("'foo#bar'", 'foo#bar'),
-            array("'foo # bar'", 'foo # bar'),
-            array("'#cfcfcf'", '#cfcfcf'),
-            array('::form_base.html.twig', '::form_base.html.twig'),
-
-            // Pre-YAML-1.2 booleans
-            array("'y'", 'y'),
-            array("'n'", 'n'),
-            array("'yes'", 'yes'),
-            array("'no'", 'no'),
-            array("'on'", 'on'),
-            array("'off'", 'off'),
-
-            array('2007-10-30', mktime(0, 0, 0, 10, 30, 2007)),
-            array('2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)),
-            array('2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)),
-            array('1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)),
-            array('1730-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 1730)),
-
-            array('"a \\"string\\" with \'quoted strings inside\'"', 'a "string" with \'quoted strings inside\''),
-            array("'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''),
-
-            // sequences
-            // urls are no key value mapping. see #3609. Valid yaml "key: value" mappings require a space after the colon
-            array('[foo, http://urls.are/no/mappings, false, null, 12]', array('foo', 'http://urls.are/no/mappings', false, null, 12)),
-            array('[  foo  ,   bar , false  ,  null     ,  12  ]', array('foo', 'bar', false, null, 12)),
-            array('[\'foo,bar\', \'foo bar\']', array('foo,bar', 'foo bar')),
-
-            // mappings
-            array('{foo:bar,bar:foo,false:false,null:null,integer:12}', array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
-            array('{ foo  : bar, bar : foo,  false  :   false,  null  :   null,  integer :  12  }', array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
-            array('{foo: \'bar\', bar: \'foo: bar\'}', array('foo' => 'bar', 'bar' => 'foo: bar')),
-            array('{\'foo\': \'bar\', "bar": \'foo: bar\'}', array('foo' => 'bar', 'bar' => 'foo: bar')),
-            array('{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', array('foo\'' => 'bar', 'bar"' => 'foo: bar')),
-            array('{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', array('foo: ' => 'bar', 'bar: ' => 'foo: bar')),
-
-            // nested sequences and mappings
-            array('[foo, [bar, foo]]', array('foo', array('bar', 'foo'))),
-            array('[foo, {bar: foo}]', array('foo', array('bar' => 'foo'))),
-            array('{ foo: {bar: foo} }', array('foo' => array('bar' => 'foo'))),
-            array('{ foo: [bar, foo] }', array('foo' => array('bar', 'foo'))),
-
-            array('[  foo, [  bar, foo  ]  ]', array('foo', array('bar', 'foo'))),
-
-            array('[{ foo: {bar: foo} }]', array(array('foo' => array('bar' => 'foo')))),
-
-            array('[foo, [bar, [foo, [bar, foo]], foo]]', array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo'))),
-
-            array('[foo, {bar: foo, foo: [foo, {bar: foo}]}, [foo, {bar: foo}]]', array('foo', array('bar' => 'foo', 'foo' => array('foo', array('bar' => 'foo'))), array('foo', array('bar' => 'foo')))),
-
-            array('[foo, bar: { foo: bar }]', array('foo', '1' => array('bar' => array('foo' => 'bar')))),
-            array('[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', array('foo', '@foo.baz', array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, '@service_container')),
-        );
-    }
-
-    public function getTestsForParseWithMapObjects()
-    {
-        return array(
-            array('', ''),
-            array('null', null),
-            array('false', false),
-            array('true', true),
-            array('12', 12),
-            array('-12', -12),
-            array('"quoted string"', 'quoted string'),
-            array("'quoted string'", 'quoted string'),
-            array('12.30e+02', 12.30e+02),
-            array('0x4D2', 0x4D2),
-            array('02333', 02333),
-            array('.Inf', -log(0)),
-            array('-.Inf', log(0)),
-            array("'686e444'", '686e444'),
-            array('686e444', 646e444),
-            array('123456789123456789123456789123456789', '123456789123456789123456789123456789'),
-            array('"foo\r\nbar"', "foo\r\nbar"),
-            array("'foo#bar'", 'foo#bar'),
-            array("'foo # bar'", 'foo # bar'),
-            array("'#cfcfcf'", '#cfcfcf'),
-            array('::form_base.html.twig', '::form_base.html.twig'),
-
-            array('2007-10-30', mktime(0, 0, 0, 10, 30, 2007)),
-            array('2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)),
-            array('2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)),
-            array('1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)),
-            array('1730-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 1730)),
-
-            array('"a \\"string\\" with \'quoted strings inside\'"', 'a "string" with \'quoted strings inside\''),
-            array("'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''),
-
-            // sequences
-            // urls are no key value mapping. see #3609. Valid yaml "key: value" mappings require a space after the colon
-            array('[foo, http://urls.are/no/mappings, false, null, 12]', array('foo', 'http://urls.are/no/mappings', false, null, 12)),
-            array('[  foo  ,   bar , false  ,  null     ,  12  ]', array('foo', 'bar', false, null, 12)),
-            array('[\'foo,bar\', \'foo bar\']', array('foo,bar', 'foo bar')),
-
-            // mappings
-            array('{foo:bar,bar:foo,false:false,null:null,integer:12}', (object) array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
-            array('{ foo  : bar, bar : foo,  false  :   false,  null  :   null,  integer :  12  }', (object) array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
-            array('{foo: \'bar\', bar: \'foo: bar\'}', (object) array('foo' => 'bar', 'bar' => 'foo: bar')),
-            array('{\'foo\': \'bar\', "bar": \'foo: bar\'}', (object) array('foo' => 'bar', 'bar' => 'foo: bar')),
-            array('{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', (object) array('foo\'' => 'bar', "bar\"" => 'foo: bar')),
-            array('{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', (object) array('foo: ' => 'bar', "bar: " => 'foo: bar')),
-
-            // nested sequences and mappings
-            array('[foo, [bar, foo]]', array('foo', array('bar', 'foo'))),
-            array('[foo, {bar: foo}]', array('foo', (object) array('bar' => 'foo'))),
-            array('{ foo: {bar: foo} }', (object) array('foo' => (object) array('bar' => 'foo'))),
-            array('{ foo: [bar, foo] }', (object) array('foo' => array('bar', 'foo'))),
-
-            array('[  foo, [  bar, foo  ]  ]', array('foo', array('bar', 'foo'))),
-
-            array('[{ foo: {bar: foo} }]', array((object) array('foo' => (object) array('bar' => 'foo')))),
-
-            array('[foo, [bar, [foo, [bar, foo]], foo]]', array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo'))),
-
-            array('[foo, {bar: foo, foo: [foo, {bar: foo}]}, [foo, {bar: foo}]]', array('foo', (object) array('bar' => 'foo', 'foo' => array('foo', (object) array('bar' => 'foo'))), array('foo', (object) array('bar' => 'foo')))),
-
-            array('[foo, bar: { foo: bar }]', array('foo', '1' => (object) array('bar' => (object) array('foo' => 'bar')))),
-            array('[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', array('foo', '@foo.baz', (object) array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, '@service_container')),
-
-            array('{}', new \stdClass()),
-            array('{ foo  : bar, bar : {}  }', (object) array('foo' => 'bar', 'bar' => new \stdClass())),
-            array('{ foo  : [], bar : {}  }', (object) array('foo' => array(), 'bar' => new \stdClass())),
-            array('{foo: \'bar\', bar: {} }', (object) array('foo' => 'bar', 'bar' => new \stdClass())),
-            array('{\'foo\': \'bar\', "bar": {}}', (object) array('foo' => 'bar', 'bar' => new \stdClass())),
-            array('{\'foo\': \'bar\', "bar": \'{}\'}', (object) array('foo' => 'bar', 'bar' => '{}')),
-
-            array('[foo, [{}, {}]]', array('foo', array(new \stdClass(), new \stdClass()))),
-            array('[foo, [[], {}]]', array('foo', array(array(), new \stdClass()))),
-            array('[foo, [[{}, {}], {}]]', array('foo', array(array(new \stdClass(), new \stdClass()), new \stdClass()))),
-            array('[foo, {bar: {}}]', array('foo', '1' => (object) array('bar' => new \stdClass()))),
-        );
-    }
-
-    public function getTestsForDump()
-    {
-        return array(
-            array('null', null),
-            array('false', false),
-            array('true', true),
-            array('12', 12),
-            array("'quoted string'", 'quoted string'),
-            array('!!float 1230', 12.30e+02),
-            array('1234', 0x4D2),
-            array('1243', 02333),
-            array('.Inf', -log(0)),
-            array('-.Inf', log(0)),
-            array("'686e444'", '686e444'),
-            array('"foo\r\nbar"', "foo\r\nbar"),
-            array("'foo#bar'", 'foo#bar'),
-            array("'foo # bar'", 'foo # bar'),
-            array("'#cfcfcf'", '#cfcfcf'),
-
-            array("'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''),
-
-            array("'-dash'", '-dash'),
-            array("'-'", '-'),
-
-            // Pre-YAML-1.2 booleans
-            array("'y'", 'y'),
-            array("'n'", 'n'),
-            array("'yes'", 'yes'),
-            array("'no'", 'no'),
-            array("'on'", 'on'),
-            array("'off'", 'off'),
-
-            // sequences
-            array('[foo, bar, false, null, 12]', array('foo', 'bar', false, null, 12)),
-            array('[\'foo,bar\', \'foo bar\']', array('foo,bar', 'foo bar')),
-
-            // mappings
-            array('{ foo: bar, bar: foo, \'false\': false, \'null\': null, integer: 12 }', array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
-            array('{ foo: bar, bar: \'foo: bar\' }', array('foo' => 'bar', 'bar' => 'foo: bar')),
-
-            // nested sequences and mappings
-            array('[foo, [bar, foo]]', array('foo', array('bar', 'foo'))),
-
-            array('[foo, [bar, [foo, [bar, foo]], foo]]', array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo'))),
-
-            array('{ foo: { bar: foo } }', array('foo' => array('bar' => 'foo'))),
-
-            array('[foo, { bar: foo }]', array('foo', array('bar' => 'foo'))),
-
-            array('[foo, { bar: foo, foo: [foo, { bar: foo }] }, [foo, { bar: foo }]]', array('foo', array('bar' => 'foo', 'foo' => array('foo', array('bar' => 'foo'))), array('foo', array('bar' => 'foo')))),
-
-            array('[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', array('foo', '@foo.baz', array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, '@service_container')),
-        );
-    }
-}
diff --git a/vendor/symfony/yaml/Tests/ParseExceptionTest.php b/vendor/symfony/yaml/Tests/ParseExceptionTest.php
deleted file mode 100644
index 0a9db257..00000000
--- a/vendor/symfony/yaml/Tests/ParseExceptionTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Yaml\Tests;
-
-use Symfony\Component\Yaml\Exception\ParseException;
-
-class ParseExceptionTest extends \PHPUnit_Framework_TestCase
-{
-    public function testGetMessage()
-    {
-        $exception = new ParseException('Error message', 42, 'foo: bar', '/var/www/featherbb/config.yml');
-        if (PHP_VERSION_ID >= 50400) {
-            $message = 'Error message in "/var/www/featherbb/config.yml" at line 42 (near "foo: bar")';
-        } else {
-            $message = 'Error message in "\\/var\\/www\\/app\\/config.yml" at line 42 (near "foo: bar")';
-        }
-
-        $this->assertEquals($message, $exception->getMessage());
-    }
-
-    public function testGetMessageWithUnicodeInFilename()
-    {
-        $exception = new ParseException('Error message', 42, 'foo: bar', 'äöü.yml');
-        if (PHP_VERSION_ID >= 50400) {
-            $message = 'Error message in "äöü.yml" at line 42 (near "foo: bar")';
-        } else {
-            $message = 'Error message in "\u00e4\u00f6\u00fc.yml" at line 42 (near "foo: bar")';
-        }
-
-        $this->assertEquals($message, $exception->getMessage());
-    }
-}
diff --git a/vendor/symfony/yaml/Tests/ParserTest.php b/vendor/symfony/yaml/Tests/ParserTest.php
deleted file mode 100644
index f434d558..00000000
--- a/vendor/symfony/yaml/Tests/ParserTest.php
+++ /dev/null
@@ -1,755 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Yaml\Tests;
-
-use Symfony\Component\Yaml\Yaml;
-use Symfony\Component\Yaml\Parser;
-
-class ParserTest extends \PHPUnit_Framework_TestCase
-{
-    protected $parser;
-
-    protected function setUp()
-    {
-        $this->parser = new Parser();
-    }
-
-    protected function tearDown()
-    {
-        $this->parser = null;
-    }
-
-    /**
-     * @dataProvider getDataFormSpecifications
-     */
-    public function testSpecifications($file, $expected, $yaml, $comment)
-    {
-        $this->assertEquals($expected, var_export($this->parser->parse($yaml), true), $comment);
-    }
-
-    public function getDataFormSpecifications()
-    {
-        $parser = new Parser();
-        $path = __DIR__.'/Fixtures';
-
-        $tests = array();
-        $files = $parser->parse(file_get_contents($path.'/index.yml'));
-        foreach ($files as $file) {
-            $yamls = file_get_contents($path.'/'.$file.'.yml');
-
-            // split YAMLs documents
-            foreach (preg_split('/^---( %YAML\:1\.0)?/m', $yamls) as $yaml) {
-                if (!$yaml) {
-                    continue;
-                }
-
-                $test = $parser->parse($yaml);
-                if (isset($test['todo']) && $test['todo']) {
-                    // TODO
-                } else {
-                    eval('$expected = '.trim($test['php']).';');
-
-                    $tests[] = array($file, var_export($expected, true), $test['yaml'], $test['test']);
-                }
-            }
-        }
-
-        return $tests;
-    }
-
-    public function testTabsInYaml()
-    {
-        // test tabs in YAML
-        $yamls = array(
-            "foo:\n	bar",
-            "foo:\n 	bar",
-            "foo:\n	 bar",
-            "foo:\n 	 bar",
-        );
-
-        foreach ($yamls as $yaml) {
-            try {
-                $content = $this->parser->parse($yaml);
-
-                $this->fail('YAML files must not contain tabs');
-            } catch (\Exception $e) {
-                $this->assertInstanceOf('\Exception', $e, 'YAML files must not contain tabs');
-                $this->assertEquals('A YAML file cannot contain tabs as indentation at line 2 (near "'.strpbrk($yaml, "\t").'").', $e->getMessage(), 'YAML files must not contain tabs');
-            }
-        }
-    }
-
-    public function testEndOfTheDocumentMarker()
-    {
-        $yaml = <<<EOF
---- %YAML:1.0
-foo
-...
-EOF;
-
-        $this->assertEquals('foo', $this->parser->parse($yaml));
-    }
-
-    public function getBlockChompingTests()
-    {
-        $tests = array();
-
-        $yaml = <<<'EOF'
-foo: |-
-    one
-    two
-bar: |-
-    one
-    two
-
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo",
-            'bar' => "one\ntwo",
-        );
-        $tests['Literal block chomping strip with single trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |-
-    one
-    two
-
-bar: |-
-    one
-    two
-
-
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo",
-            'bar' => "one\ntwo",
-        );
-        $tests['Literal block chomping strip with multiple trailing newlines'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-{}
-
-
-EOF;
-        $expected = array();
-        $tests['Literal block chomping strip with multiple trailing newlines after a 1-liner'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |-
-    one
-    two
-bar: |-
-    one
-    two
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo",
-            'bar' => "one\ntwo",
-        );
-        $tests['Literal block chomping strip without trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |
-    one
-    two
-bar: |
-    one
-    two
-
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo\n",
-            'bar' => "one\ntwo\n",
-        );
-        $tests['Literal block chomping clip with single trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |
-    one
-    two
-
-bar: |
-    one
-    two
-
-
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo\n",
-            'bar' => "one\ntwo\n",
-        );
-        $tests['Literal block chomping clip with multiple trailing newlines'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |
-    one
-    two
-bar: |
-    one
-    two
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo\n",
-            'bar' => "one\ntwo",
-        );
-        $tests['Literal block chomping clip without trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |+
-    one
-    two
-bar: |+
-    one
-    two
-
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo\n",
-            'bar' => "one\ntwo\n",
-        );
-        $tests['Literal block chomping keep with single trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |+
-    one
-    two
-
-bar: |+
-    one
-    two
-
-
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo\n\n",
-            'bar' => "one\ntwo\n\n",
-        );
-        $tests['Literal block chomping keep with multiple trailing newlines'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |+
-    one
-    two
-bar: |+
-    one
-    two
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo\n",
-            'bar' => "one\ntwo",
-        );
-        $tests['Literal block chomping keep without trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >-
-    one
-    two
-bar: >-
-    one
-    two
-
-EOF;
-        $expected = array(
-            'foo' => 'one two',
-            'bar' => 'one two',
-        );
-        $tests['Folded block chomping strip with single trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >-
-    one
-    two
-
-bar: >-
-    one
-    two
-
-
-EOF;
-        $expected = array(
-            'foo' => 'one two',
-            'bar' => 'one two',
-        );
-        $tests['Folded block chomping strip with multiple trailing newlines'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >-
-    one
-    two
-bar: >-
-    one
-    two
-EOF;
-        $expected = array(
-            'foo' => 'one two',
-            'bar' => 'one two',
-        );
-        $tests['Folded block chomping strip without trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >
-    one
-    two
-bar: >
-    one
-    two
-
-EOF;
-        $expected = array(
-            'foo' => "one two\n",
-            'bar' => "one two\n",
-        );
-        $tests['Folded block chomping clip with single trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >
-    one
-    two
-
-bar: >
-    one
-    two
-
-
-EOF;
-        $expected = array(
-            'foo' => "one two\n",
-            'bar' => "one two\n",
-        );
-        $tests['Folded block chomping clip with multiple trailing newlines'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >
-    one
-    two
-bar: >
-    one
-    two
-EOF;
-        $expected = array(
-            'foo' => "one two\n",
-            'bar' => 'one two',
-        );
-        $tests['Folded block chomping clip without trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >+
-    one
-    two
-bar: >+
-    one
-    two
-
-EOF;
-        $expected = array(
-            'foo' => "one two\n",
-            'bar' => "one two\n",
-        );
-        $tests['Folded block chomping keep with single trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >+
-    one
-    two
-
-bar: >+
-    one
-    two
-
-
-EOF;
-        $expected = array(
-            'foo' => "one two\n\n",
-            'bar' => "one two\n\n",
-        );
-        $tests['Folded block chomping keep with multiple trailing newlines'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >+
-    one
-    two
-bar: >+
-    one
-    two
-EOF;
-        $expected = array(
-            'foo' => "one two\n",
-            'bar' => 'one two',
-        );
-        $tests['Folded block chomping keep without trailing newline'] = array($expected, $yaml);
-
-        return $tests;
-    }
-
-    /**
-     * @dataProvider getBlockChompingTests
-     */
-    public function testBlockChomping($expected, $yaml)
-    {
-        $this->assertSame($expected, $this->parser->parse($yaml));
-    }
-
-    /**
-     * Regression test for issue #7989.
-     *
-     * @see https://github.com/symfony/symfony/issues/7989
-     */
-    public function testBlockLiteralWithLeadingNewlines()
-    {
-        $yaml = <<<'EOF'
-foo: |-
-
-
-    bar
-
-EOF;
-        $expected = array(
-            'foo' => "\n\nbar",
-        );
-
-        $this->assertSame($expected, $this->parser->parse($yaml));
-    }
-
-    public function testObjectSupportEnabled()
-    {
-        $input = <<<EOF
-foo: !!php/object:O:30:"Symfony\Component\Yaml\Tests\B":1:{s:1:"b";s:3:"foo";}
-bar: 1
-EOF;
-        $this->assertEquals(array('foo' => new B(), 'bar' => 1), $this->parser->parse($input, false, true), '->parse() is able to parse objects');
-    }
-
-    public function testObjectSupportDisabledButNoExceptions()
-    {
-        $input = <<<EOF
-foo: !!php/object:O:30:"Symfony\Tests\Component\Yaml\B":1:{s:1:"b";s:3:"foo";}
-bar: 1
-EOF;
-
-        $this->assertEquals(array('foo' => null, 'bar' => 1), $this->parser->parse($input), '->parse() does not parse objects');
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testObjectsSupportDisabledWithExceptions()
-    {
-        $this->parser->parse('foo: !!php/object:O:30:"Symfony\Tests\Component\Yaml\B":1:{s:1:"b";s:3:"foo";}', true, false);
-    }
-
-    public function testNonUtf8Exception()
-    {
-        if (!function_exists('iconv')) {
-            $this->markTestSkipped('Exceptions for non-utf8 charsets require the iconv() function.');
-
-            return;
-        }
-
-        $yamls = array(
-            iconv('UTF-8', 'ISO-8859-1', "foo: 'äöüß'"),
-            iconv('UTF-8', 'ISO-8859-15', "euro: '€'"),
-            iconv('UTF-8', 'CP1252', "cp1252: '©ÉÇáñ'"),
-        );
-
-        foreach ($yamls as $yaml) {
-            try {
-                $this->parser->parse($yaml);
-
-                $this->fail('charsets other than UTF-8 are rejected.');
-            } catch (\Exception $e) {
-                $this->assertInstanceOf('Symfony\Component\Yaml\Exception\ParseException', $e, 'charsets other than UTF-8 are rejected.');
-            }
-        }
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testUnindentedCollectionException()
-    {
-        $yaml = <<<EOF
-
-collection:
--item1
--item2
--item3
-
-EOF;
-
-        $this->parser->parse($yaml);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testShortcutKeyUnindentedCollectionException()
-    {
-        $yaml = <<<EOF
-
-collection:
--  key: foo
-  foo: bar
-
-EOF;
-
-        $this->parser->parse($yaml);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage Multiple documents are not supported.
-     */
-    public function testMultipleDocumentsNotSupportedException()
-    {
-        Yaml::parse(<<<EOL
-# Ranking of 1998 home runs
----
-- Mark McGwire
-- Sammy Sosa
-- Ken Griffey
-
-# Team ranking
----
-- Chicago Cubs
-- St Louis Cardinals
-EOL
-        );
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testSequenceInAMapping()
-    {
-        Yaml::parse(<<<EOF
-yaml:
-  hash: me
-  - array stuff
-EOF
-        );
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testMappingInASequence()
-    {
-        Yaml::parse(<<<EOF
-yaml:
-  - array stuff
-  hash: me
-EOF
-        );
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage missing colon
-     */
-    public function testScalarInSequence()
-    {
-        Yaml::parse(<<<EOF
-foo:
-    - bar
-"missing colon"
-    foo: bar
-EOF
-        );
-    }
-
-    /**
-     * > It is an error for two equal keys to appear in the same mapping node.
-     * > In such a case the YAML processor may continue, ignoring the second
-     * > `key: value` pair and issuing an appropriate warning. This strategy
-     * > preserves a consistent information model for one-pass and random access
-     * > applications.
-     *
-     * @see http://yaml.org/spec/1.2/spec.html#id2759572
-     * @see http://yaml.org/spec/1.1/#id932806
-     *
-     * @covers \Symfony\Component\Yaml\Parser::parse
-     */
-    public function testMappingDuplicateKeyBlock()
-    {
-        $input = <<<EOD
-parent:
-    child: first
-    child: duplicate
-parent:
-    child: duplicate
-    child: duplicate
-EOD;
-        $expected = array(
-            'parent' => array(
-                'child' => 'first',
-            ),
-        );
-        $this->assertSame($expected, Yaml::parse($input));
-    }
-
-    /**
-     * @covers \Symfony\Component\Yaml\Inline::parseMapping
-     */
-    public function testMappingDuplicateKeyFlow()
-    {
-        $input = <<<EOD
-parent: { child: first, child: duplicate }
-parent: { child: duplicate, child: duplicate }
-EOD;
-        $expected = array(
-            'parent' => array(
-                'child' => 'first',
-            ),
-        );
-        $this->assertSame($expected, Yaml::parse($input));
-    }
-
-    public function testEmptyValue()
-    {
-        $input = <<<EOF
-hash:
-EOF;
-
-        $this->assertEquals(array('hash' => null), Yaml::parse($input));
-    }
-
-    public function testStringBlockWithComments()
-    {
-        $this->assertEquals(array('content' => <<<EOT
-# comment 1
-header
-
-    # comment 2
-    <body>
-        <h1>title</h1>
-    </body>
-
-footer # comment3
-EOT
-        ), Yaml::parse(<<<EOF
-content: |
-    # comment 1
-    header
-
-        # comment 2
-        <body>
-            <h1>title</h1>
-        </body>
-
-    footer # comment3
-EOF
-        ));
-    }
-
-    public function testFoldedStringBlockWithComments()
-    {
-        $this->assertEquals(array(array('content' => <<<EOT
-# comment 1
-header
-
-    # comment 2
-    <body>
-        <h1>title</h1>
-    </body>
-
-footer # comment3
-EOT
-        )), Yaml::parse(<<<EOF
--
-    content: |
-        # comment 1
-        header
-
-            # comment 2
-            <body>
-                <h1>title</h1>
-            </body>
-
-        footer # comment3
-EOF
-        ));
-    }
-
-    public function testNestedFoldedStringBlockWithComments()
-    {
-        $this->assertEquals(array(array(
-            'title' => 'some title',
-            'content' => <<<EOT
-# comment 1
-header
-
-    # comment 2
-    <body>
-        <h1>title</h1>
-    </body>
-
-footer # comment3
-EOT
-        )), Yaml::parse(<<<EOF
--
-    title: some title
-    content: |
-        # comment 1
-        header
-
-            # comment 2
-            <body>
-                <h1>title</h1>
-            </body>
-
-        footer # comment3
-EOF
-        ));
-    }
-
-    public function testReferenceResolvingInInlineStrings()
-    {
-        $this->assertEquals(array(
-            'var' => 'var-value',
-            'scalar' => 'var-value',
-            'list' => array('var-value'),
-            'list_in_list' => array(array('var-value')),
-            'map_in_list' => array(array('key' => 'var-value')),
-            'embedded_mapping' => array(array('key' => 'var-value')),
-            'map' => array('key' => 'var-value'),
-            'list_in_map' => array('key' => array('var-value')),
-            'map_in_map' => array('foo' => array('bar' => 'var-value')),
-        ), Yaml::parse(<<<EOF
-var:  &var var-value
-scalar: *var
-list: [ *var ]
-list_in_list: [[ *var ]]
-map_in_list: [ { key: *var } ]
-embedded_mapping: [ key: *var ]
-map: { key: *var }
-list_in_map: { key: [*var] }
-map_in_map: { foo: { bar: *var } }
-EOF
-        ));
-    }
-
-    public function testYamlDirective()
-    {
-        $yaml = <<<EOF
-%YAML 1.2
----
-foo: 1
-bar: 2
-EOF;
-        $this->assertEquals(array('foo' => 1, 'bar' => 2), $this->parser->parse($yaml));
-    }
-}
-
-class B
-{
-    public $b = 'foo';
-}
diff --git a/vendor/symfony/yaml/Tests/YamlTest.php b/vendor/symfony/yaml/Tests/YamlTest.php
deleted file mode 100644
index 8db65e39..00000000
--- a/vendor/symfony/yaml/Tests/YamlTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Yaml\Tests;
-
-use Symfony\Component\Yaml\Yaml;
-
-class YamlTest extends \PHPUnit_Framework_TestCase
-{
-    public function testParseAndDump()
-    {
-        $data = array('lorem' => 'ipsum', 'dolor' => 'sit');
-        $yml = Yaml::dump($data);
-        $parsed = Yaml::parse($yml);
-        $this->assertEquals($data, $parsed);
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacyParseFromFile()
-    {
-        $filename = __DIR__.'/Fixtures/index.yml';
-        $contents = file_get_contents($filename);
-        $parsedByFilename = Yaml::parse($filename);
-        $parsedByContents = Yaml::parse($contents);
-        $this->assertEquals($parsedByFilename, $parsedByContents);
-    }
-}
diff --git a/vendor/symfony/yaml/Unescaper.php b/vendor/symfony/yaml/Unescaper.php
deleted file mode 100644
index 93206f92..00000000
--- a/vendor/symfony/yaml/Unescaper.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Yaml;
-
-/**
- * Unescaper encapsulates unescaping rules for single and double-quoted
- * YAML strings.
- *
- * @author Matthew Lewinski <matthew@lewinski.org>
- */
-class Unescaper
-{
-    /**
-     * Parser and Inline assume UTF-8 encoding, so escaped Unicode characters
-     * must be converted to that encoding.
-     *
-     * @deprecated since version 2.5, to be removed in 3.0
-     * @internal
-     */
-    const ENCODING = 'UTF-8';
-
-    /**
-     * Regex fragment that matches an escaped character in a double quoted string.
-     */
-    const REGEX_ESCAPED_CHARACTER = "\\\\([0abt\tnvfre \\\"\\/\\\\N_LP]|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})";
-
-    /**
-     * Unescapes a single quoted string.
-     *
-     * @param string $value A single quoted string.
-     *
-     * @return string The unescaped string.
-     */
-    public function unescapeSingleQuotedString($value)
-    {
-        return str_replace('\'\'', '\'', $value);
-    }
-
-    /**
-     * Unescapes a double quoted string.
-     *
-     * @param string $value A double quoted string.
-     *
-     * @return string The unescaped string.
-     */
-    public function unescapeDoubleQuotedString($value)
-    {
-        $self = $this;
-        $callback = function ($match) use ($self) {
-            return $self->unescapeCharacter($match[0]);
-        };
-
-        // evaluate the string
-        return preg_replace_callback('/'.self::REGEX_ESCAPED_CHARACTER.'/u', $callback, $value);
-    }
-
-    /**
-     * Unescapes a character that was found in a double-quoted string.
-     *
-     * @param string $value An escaped character
-     *
-     * @return string The unescaped character
-     */
-    public function unescapeCharacter($value)
-    {
-        switch ($value{1}) {
-            case '0':
-                return "\x0";
-            case 'a':
-                return "\x7";
-            case 'b':
-                return "\x8";
-            case 't':
-                return "\t";
-            case "\t":
-                return "\t";
-            case 'n':
-                return "\n";
-            case 'v':
-                return "\xB";
-            case 'f':
-                return "\xC";
-            case 'r':
-                return "\r";
-            case 'e':
-                return "\x1B";
-            case ' ':
-                return ' ';
-            case '"':
-                return '"';
-            case '/':
-                return '/';
-            case '\\':
-                return '\\';
-            case 'N':
-                // U+0085 NEXT LINE
-                return "\xC2\x85";
-            case '_':
-                // U+00A0 NO-BREAK SPACE
-                return "\xC2\xA0";
-            case 'L':
-                // U+2028 LINE SEPARATOR
-                return "\xE2\x80\xA8";
-            case 'P':
-                // U+2029 PARAGRAPH SEPARATOR
-                return "\xE2\x80\xA9";
-            case 'x':
-                return self::utf8chr(hexdec(substr($value, 2, 2)));
-            case 'u':
-                return self::utf8chr(hexdec(substr($value, 2, 4)));
-            case 'U':
-                return self::utf8chr(hexdec(substr($value, 2, 8)));
-        }
-    }
-
-    /**
-     * Get the UTF-8 character for the given code point.
-     *
-     * @param int $c The unicode code point
-     *
-     * @return string The corresponding UTF-8 character
-     */
-    private static function utf8chr($c)
-    {
-        if (0x80 > $c %= 0x200000) {
-            return chr($c);
-        }
-        if (0x800 > $c) {
-            return chr(0xC0 | $c >> 6).chr(0x80 | $c & 0x3F);
-        }
-        if (0x10000 > $c) {
-            return chr(0xE0 | $c >> 12).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
-        }
-
-        return chr(0xF0 | $c >> 18).chr(0x80 | $c >> 12 & 0x3F).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
-    }
-}
diff --git a/vendor/symfony/yaml/Yaml.php b/vendor/symfony/yaml/Yaml.php
deleted file mode 100644
index b6def517..00000000
--- a/vendor/symfony/yaml/Yaml.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Yaml;
-
-use Symfony\Component\Yaml\Exception\ParseException;
-
-/**
- * Yaml offers convenience methods to load and dump YAML.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
- */
-class Yaml
-{
-    /**
-     * Parses YAML into a PHP array.
-     *
-     * The parse method, when supplied with a YAML stream (string or file),
-     * will do its best to convert YAML in a file into a PHP array.
-     *
-     *  Usage:
-     *  <code>
-     *   $array = Yaml::parse(file_get_contents('config.yml'));
-     *   print_r($array);
-     *  </code>
-     *
-     * As this method accepts both plain strings and file names as an input,
-     * you must validate the input before calling this method. Passing a file
-     * as an input is a deprecated feature and will be removed in 3.0.
-     *
-     * Note: the ability to pass file names to the Yaml::parse method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.
-     *
-     * @param string $input                  Path to a YAML file or a string containing YAML
-     * @param bool   $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
-     * @param bool   $objectSupport          True if object support is enabled, false otherwise
-     * @param bool   $objectForMap           True if maps should return a stdClass instead of array()
-     *
-     * @return array The YAML converted to a PHP array
-     *
-     * @throws ParseException If the YAML is not valid
-     *
-     * @api
-     */
-    public static function parse($input, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
-    {
-        // if input is a file, process it
-        $file = '';
-        if (strpos($input, "\n") === false && is_file($input)) {
-            @trigger_error('The ability to pass file names to the '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.', E_USER_DEPRECATED);
-
-            if (false === is_readable($input)) {
-                throw new ParseException(sprintf('Unable to parse "%s" as the file is not readable.', $input));
-            }
-
-            $file = $input;
-            $input = file_get_contents($file);
-        }
-
-        $yaml = new Parser();
-
-        try {
-            return $yaml->parse($input, $exceptionOnInvalidType, $objectSupport, $objectForMap);
-        } catch (ParseException $e) {
-            if ($file) {
-                $e->setParsedFile($file);
-            }
-
-            throw $e;
-        }
-    }
-
-    /**
-     * Dumps a PHP array to a YAML string.
-     *
-     * The dump method, when supplied with an array, will do its best
-     * to convert the array into friendly YAML.
-     *
-     * @param array $array                  PHP array
-     * @param int   $inline                 The level where you switch to inline YAML
-     * @param int   $indent                 The amount of spaces to use for indentation of nested nodes.
-     * @param bool  $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
-     * @param bool  $objectSupport          true if object support is enabled, false otherwise
-     *
-     * @return string A YAML string representing the original PHP array
-     *
-     * @api
-     */
-    public static function dump($array, $inline = 2, $indent = 4, $exceptionOnInvalidType = false, $objectSupport = false)
-    {
-        $yaml = new Dumper();
-        $yaml->setIndentation($indent);
-
-        return $yaml->dump($array, $inline, 0, $exceptionOnInvalidType, $objectSupport);
-    }
-}
diff --git a/vendor/symfony/yaml/composer.json b/vendor/symfony/yaml/composer.json
deleted file mode 100644
index b07b439c..00000000
--- a/vendor/symfony/yaml/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "symfony/yaml",
-    "type": "library",
-    "description": "Symfony Yaml Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9"
-    },
-    "require-dev": {
-        "symfony/phpunit-bridge": "~2.7"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\Yaml\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/yaml/phpunit.xml.dist b/vendor/symfony/yaml/phpunit.xml.dist
deleted file mode 100644
index 418b2c6c..00000000
--- a/vendor/symfony/yaml/phpunit.xml.dist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony Yaml Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./vendor</directory>
-                <directory>./Tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>

From 286d82d057a759ab2e17bb99aa5f1ceed1c377ac Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 9 Sep 2015 19:27:36 +0200
Subject: [PATCH 350/353] Add cache

---
 .gitignore     | 3 ++-
 cache/.gitkeep | 0
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 cache/.gitkeep

diff --git a/.gitignore b/.gitignore
index e656a543..9d3eb268 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
-cache/
 featherbb/config.php
 .idea/
 nbproject/
 lang/French
 .htaccess
 composer.lock
+cache/*.php
+cache/*.cache
\ No newline at end of file
diff --git a/cache/.gitkeep b/cache/.gitkeep
new file mode 100644
index 00000000..e69de29b

From 41bac006ed09a3dcaa4df4069a3c4a248f91022b Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 9 Sep 2015 19:37:09 +0200
Subject: [PATCH 351/353] Add cache

---
 featherbb/Controller/Install.php | 40 ++++++++++++++++----------------
 featherbb/View/install.php       |  6 ++---
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
index 6e9d9ce7..79679ed9 100644
--- a/featherbb/Controller/Install.php
+++ b/featherbb/Controller/Install.php
@@ -18,10 +18,10 @@
 class Install
 {
     protected $supported_dbs = array('mysql' => 'MySQL',
-                                     'pgsql' => 'PostgreSQL',
-                                     'sqlite' => 'SQLite',
-                                     'sqlite3' => 'SQLite3',
-                                    );
+        'pgsql' => 'PostgreSQL',
+        'sqlite' => 'SQLite',
+        'sqlite3' => 'SQLite3',
+    );
     protected $available_langs;
     protected $optional_fields = array('db_user', 'db_pass', 'db_prefix');
     protected $install_lang = 'English';
@@ -56,7 +56,7 @@ public function run()
                 // Handle empty fields
                 if (empty($value)) {
                     // If the field is required, or if user and pass are missing even though mysql or pgsql are selected as DB
-                    if (!in_array($field, $this->optional_fields) || (in_array($field, array('db_user', 'db_pass')) && in_array($data['db_type'], array('mysql', 'pgsql')))) {
+                    if (!in_array($field, $this->optional_fields) || (in_array($field, array('db_user')) && in_array($data['db_type'], array('mysql', 'pgsql')))) {
                         $missing_fields[] = $field;
                     }
                 }
@@ -121,11 +121,11 @@ public function run()
             // End validation and check errors
             if (!empty($this->errors)) {
                 $this->feather->template->setPageInfo(array(
-                                                        'languages' => $this->available_langs,
-                                                        'supported_dbs' => $this->supported_dbs,
-                                                        'data' => $data,
-                                                        'errors' => $this->errors,
-                                                    ))->addTemplate('install.php')->display(false);
+                    'languages' => $this->available_langs,
+                    'supported_dbs' => $this->supported_dbs,
+                    'data' => $data,
+                    'errors' => $this->errors,
+                ))->addTemplate('install.php')->display(false);
             } else {
                 $data['default_style'] = $this->default_style;
                 $data['avatars'] = in_array(strtolower(@ini_get('file_uploads')), array('on', 'true', '1')) ? 1 : 0;
@@ -134,15 +134,15 @@ public function run()
         } else {
             $base_url = str_replace('index.php', '', $this->feather->request->getUrl().$this->feather->request->getRootUri());
             $data = array('title' => __('My FeatherBB Forum'),
-                          'description' => __('Description'),
-                          'base_url' => $base_url,
-                          'default_lang' => $this->install_lang);
-          $this->feather->template->setPageInfo(array(
-                                                  'languages' => $this->available_langs,
-                                                  'supported_dbs' => $this->supported_dbs,
-                                                  'data' => $data,
-                                                  'alerts' => array(),
-                                              ))->addTemplate('install.php')->display(false);
+                'description' => __('Description'),
+                'base_url' => $base_url,
+                'default_lang' => $this->install_lang);
+            $this->feather->template->setPageInfo(array(
+                'languages' => $this->available_langs,
+                'supported_dbs' => $this->supported_dbs,
+                'data' => $data,
+                'alerts' => array(),
+            ))->addTemplate('install.php')->display(false);
         }
     }
 
@@ -157,7 +157,7 @@ public function create_config(array $data)
         }
 
         $config = array_merge($config, array('cookie_name' => mb_strtolower($this->feather->forum_env['FORUM_NAME']).'_cookie_'.Random::key(7, false, true),
-                                             'cookie_seed' => Random::key(16, false, true)));
+            'cookie_seed' => Random::key(16, false, true)));
 
         // ... And write it on disk
         if ($this->write_config($config)) {
diff --git a/featherbb/View/install.php b/featherbb/View/install.php
index b83b8d82..6e7f41f1 100644
--- a/featherbb/View/install.php
+++ b/featherbb/View/install.php
@@ -192,11 +192,11 @@
                                             <legend><?php _e('General information') ?></legend>
                                             <div class="infldset">
                                                 <label class="required"><strong><?php _e('Board title') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[title]" value="<? echo $data['title'] ?>" size="60" maxlength="255" required />
+                                                <input type="text" name="install[title]" value="<?php echo $data['title'] ?>" size="60" maxlength="255" required />
                                                 <label><?php _e('Board description') ?></label>
-                                                <input type="text" name="install[description]" value="<? echo $data['description'] ?>" size="60" maxlength="255" required />
+                                                <input type="text" name="install[description]" value="<?php echo $data['description'] ?>" size="60" maxlength="255" required />
                                                 <label class="required"><strong><?php _e('Base URL') ?> <span><?php _e('Required') ?></span></strong></label>
-                                                <input type="text" name="install[base_url]" value="<? echo $data['base_url'] ?>" size="60" maxlength="100" required />
+                                                <input type="text" name="install[base_url]" value="<?php echo $data['base_url'] ?>" size="60" maxlength="100" required />
                                                 <label class="required"><strong><?php _e('Default language') ?> <span><?php _e('Required') ?></span></strong></label>
                                                 <select name="install[default_lang]" required />
                                                 <?php

From 2cc0f2d89cdf3c1cfa89326b4652d3799b72a956 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 9 Sep 2015 19:51:23 +0200
Subject: [PATCH 352/353] Update readme for Beta 3

---
 readme.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/readme.md b/readme.md
index 779bef7f..555fe8f8 100644
--- a/readme.md
+++ b/readme.md
@@ -16,6 +16,19 @@ This is __FeatherBB v1.0.0 Beta__. It is intended for testing purposes only and
 for use in a production environment. Please report all the bugs you may encounter to
 the forums or in the GitHub bug tracker.
 
+### Beta 3 (2015-09-09)
+* Plugin system and some hooks [[beaver](http://github.com/beaver-dev)] [[adaur](http://github.com/adaur)] 
+* New architecture ready for Composer [[beaver](http://github.com/beaver-dev)]
+* New template system [[capkokoon](http://github.com/capkokoon)] [[adaur](http://github.com/adaur)]
+* Gettext implemented [[adaur](http://github.com/adaur)]
+* Dynamic URLs within code [[beaver](http://github.com/beaver-dev)]
+* Better permission handling [[adaur](http://github.com/adaur)]
+* OOP parser [[adaur](http://github.com/adaur)]
+* Major namespaces cleanup [[adaur](http://github.com/adaur)]
+* New caching system [[capkokoon](http://github.com/capkokoon)]
+* New error handler [[capkokoon](http://github.com/capkokoon)]
+* Static functions files converted to OOP [[capkokoon](http://github.com/capkokoon)] [[beaver](http://github.com/beaver-dev)] [[adaur](http://github.com/adaur)]
+
 ### Beta 2 (2015-08-11)
 
 * New DB Layer [[adaur](http://github.com/adaur)]

From 812ff983e6c226f950db7e99e413af5085c57197 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 9 Sep 2015 19:54:56 +0200
Subject: [PATCH 353/353] Update readme for Beta 3

---
 readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/readme.md b/readme.md
index 555fe8f8..bd0b5412 100644
--- a/readme.md
+++ b/readme.md
@@ -27,6 +27,7 @@ the forums or in the GitHub bug tracker.
 * Major namespaces cleanup [[adaur](http://github.com/adaur)]
 * New caching system [[capkokoon](http://github.com/capkokoon)]
 * New error handler [[capkokoon](http://github.com/capkokoon)]
+* New installer [[capkokoon](http://github.com/capkokoon)]
 * Static functions files converted to OOP [[capkokoon](http://github.com/capkokoon)] [[beaver](http://github.com/beaver-dev)] [[adaur](http://github.com/adaur)]
 
 ### Beta 2 (2015-08-11)